[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_3-3294-g11b52ec

Marc Delisle lem9 at users.sourceforge.net
Fri May 14 19:41:13 CEST 2010


The branch, master has been updated
       via  11b52ec3eb2470840f14ac67ad621029320b5515 (commit)
      from  9735acdda4bf0055bfc534bc0ed603ef9880a0d9 (commit)


- Log -----------------------------------------------------------------
commit 11b52ec3eb2470840f14ac67ad621029320b5515
Author: Marc Delisle <marc at infomarc.info>
Date:   Fri May 14 13:41:01 2010 -0400

    refresh po

-----------------------------------------------------------------------

Summary of changes:
 po/af.po          |  230 +++++++++++++++++++++++------------------------
 po/ar.po          |  224 +++++++++++++++++++++++-----------------------
 po/az.po          |  230 +++++++++++++++++++++++------------------------
 po/be.po          |  257 +++++++++++++++++++++++++++--------------------------
 po/be at latin.po    |  245 +++++++++++++++++++++++++-------------------------
 po/bg.po          |  230 +++++++++++++++++++++++------------------------
 po/bn.po          |  252 ++++++++++++++++++++++++++-------------------------
 po/bs.po          |  230 +++++++++++++++++++++++------------------------
 po/ca.po          |  251 ++++++++++++++++++++++++++-------------------------
 po/cs.po          |  249 ++++++++++++++++++++++++++-------------------------
 po/da.po          |  245 +++++++++++++++++++++++++-------------------------
 po/de.po          |  250 ++++++++++++++++++++++++++-------------------------
 po/el.po          |  251 ++++++++++++++++++++++++++-------------------------
 po/en_GB.po       |  248 ++++++++++++++++++++++++++-------------------------
 po/es.po          |  251 ++++++++++++++++++++++++++-------------------------
 po/et.po          |  253 ++++++++++++++++++++++++++--------------------------
 po/eu.po          |  230 +++++++++++++++++++++++------------------------
 po/fa.po          |  230 +++++++++++++++++++++++------------------------
 po/fi.po          |  249 ++++++++++++++++++++++++++-------------------------
 po/fr.po          |  249 ++++++++++++++++++++++++++-------------------------
 po/gl.po          |  251 ++++++++++++++++++++++++++-------------------------
 po/he.po          |  230 +++++++++++++++++++++++------------------------
 po/hi.po          |  224 +++++++++++++++++++++++-----------------------
 po/hr.po          |  257 +++++++++++++++++++++++++++--------------------------
 po/hu.po          |  249 ++++++++++++++++++++++++++-------------------------
 po/id.po          |  230 +++++++++++++++++++++++------------------------
 po/it.po          |  247 ++++++++++++++++++++++++++-------------------------
 po/ja.po          |  243 +++++++++++++++++++++++++-------------------------
 po/ka.po          |  248 ++++++++++++++++++++++++++-------------------------
 po/ko.po          |  230 +++++++++++++++++++++++------------------------
 po/lt.po          |  230 +++++++++++++++++++++++------------------------
 po/lv.po          |  230 +++++++++++++++++++++++------------------------
 po/mk.po          |  230 +++++++++++++++++++++++------------------------
 po/mn.po          |  224 +++++++++++++++++++++++-----------------------
 po/ms.po          |  230 +++++++++++++++++++++++------------------------
 po/nb.po          |  249 ++++++++++++++++++++++++++-------------------------
 po/nl.po          |  251 ++++++++++++++++++++++++++-------------------------
 po/phpmyadmin.pot |  224 +++++++++++++++++++++++-----------------------
 po/pl.po          |  249 ++++++++++++++++++++++++++-------------------------
 po/pt.po          |  232 ++++++++++++++++++++++++------------------------
 po/pt_BR.po       |  253 ++++++++++++++++++++++++++--------------------------
 po/ro.po          |  252 ++++++++++++++++++++++++++-------------------------
 po/ru.po          |  251 ++++++++++++++++++++++++++-------------------------
 po/si.po          |  252 ++++++++++++++++++++++++++-------------------------
 po/sk.po          |  257 +++++++++++++++++++++++++++--------------------------
 po/sl.po          |  249 ++++++++++++++++++++++++++-------------------------
 po/sq.po          |  230 +++++++++++++++++++++++------------------------
 po/sr.po          |  253 ++++++++++++++++++++++++++--------------------------
 po/sr at latin.po    |  253 ++++++++++++++++++++++++++--------------------------
 po/sv.po          |  249 ++++++++++++++++++++++++++-------------------------
 po/ta.po          |  224 +++++++++++++++++++++++-----------------------
 po/te.po          |  228 +++++++++++++++++++++++------------------------
 po/th.po          |  230 +++++++++++++++++++++++------------------------
 po/tr.po          |  249 ++++++++++++++++++++++++++-------------------------
 po/tt.po          |  232 ++++++++++++++++++++++++------------------------
 po/uk.po          |  224 +++++++++++++++++++++++-----------------------
 po/ur.po          |  226 +++++++++++++++++++++++-----------------------
 po/uz.po          |  249 ++++++++++++++++++++++++++-------------------------
 po/uz at latin.po    |  250 ++++++++++++++++++++++++++-------------------------
 po/zh_CN.po       |  243 +++++++++++++++++++++++++-------------------------
 po/zh_TW.po       |  230 +++++++++++++++++++++++------------------------
 61 files changed, 7378 insertions(+), 7318 deletions(-)

diff --git a/po/af.po b/po/af.po
index f4ac2b6..cc114aa 100644
--- a/po/af.po
+++ b/po/af.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-14 07:48-0400\n"
+"POT-Creation-Date: 2010-05-14 13:39-0400\n"
 "PO-Revision-Date: 2010-03-30 23:04+0200\n"
 "Last-Translator: Michal <michal at cihar.com>\n"
 "Language-Team: afrikaans <af at li.org>\n"
@@ -944,10 +944,10 @@ msgid ""
 "file and import will resume."
 msgstr ""
 
-#: import.php:426
+#: import.php:426 libraries/messages.inc.php:1102
 msgid ""
 "However on last run no data has been parsed, this usually means phpMyAdmin "
-"won"
+"won't be able to finish this import unless you increase php time limits."
 msgstr ""
 
 #: index.php:190 libraries/messages.inc.php:549
@@ -6172,12 +6172,6 @@ msgstr ""
 msgid "Thread %s was successfully killed."
 msgstr ""
 
-#: libraries/messages.inc.php:1102
-msgid ""
-"However on last run no data has been parsed, this usually means phpMyAdmin "
-"won't be able to finish this import unless you increase php time limits."
-msgstr ""
-
 #: libraries/messages.inc.php:1105 pmd_pdf.php:94
 msgid "to/from page"
 msgstr ""
@@ -6608,7 +6602,8 @@ msgstr "Geen"
 msgid "Filter"
 msgstr ""
 
-#: navigation.php:319 setup/lib/messages.inc.php:42
+#: navigation.php:319 setup/frames/index.inc.php:218
+#: setup/lib/messages.inc.php:42
 msgid "Clear"
 msgstr ""
 
@@ -6693,6 +6688,115 @@ msgstr ""
 msgid "Configuration: %s"
 msgstr ""
 
+#: setup/frames/config.inc.php:25 setup/frames/index.inc.php:152
+#: setup/lib/messages.inc.php:45
+msgid "Configuration file"
+msgstr ""
+
+#: setup/frames/config.inc.php:38 setup/frames/index.inc.php:212
+#: setup/lib/messages.inc.php:65
+msgid "Download"
+msgstr ""
+
+#: setup/frames/index.inc.php:58 setup/lib/messages.inc.php:164
+msgid ""
+"You are not using a secure connection; all data (including potentially "
+"sensitive information, like passwords) is transferred unencrypted!"
+msgstr ""
+
+#: setup/frames/index.inc.php:87 setup/frames/menu.inc.php:17
+#: setup/lib/messages.inc.php:219
+msgid "Overview"
+msgstr ""
+
+#: setup/frames/index.inc.php:95 setup/lib/messages.inc.php:337
+msgid "Show hidden messages (#MSG_COUNT)"
+msgstr ""
+
+#: setup/frames/index.inc.php:135 setup/lib/messages.inc.php:213
+msgid "There are no configured servers"
+msgstr ""
+
+#: setup/frames/index.inc.php:143 setup/lib/messages.inc.php:212
+msgid "New server"
+msgstr ""
+
+#: setup/frames/index.inc.php:172 setup/lib/messages.inc.php:50
+msgid "Default language"
+msgstr ""
+
+#: setup/frames/index.inc.php:182 setup/lib/messages.inc.php:187
+msgid "let the user choose"
+msgstr ""
+
+#: setup/frames/index.inc.php:193 setup/lib/messages.inc.php:216
+msgid "- none -"
+msgstr ""
+
+#: setup/frames/index.inc.php:196 setup/lib/messages.inc.php:51
+msgid "Default server"
+msgstr ""
+
+#: setup/frames/index.inc.php:206 setup/lib/messages.inc.php:66
+msgid "End of line"
+msgstr ""
+
+#: setup/frames/index.inc.php:211 setup/lib/messages.inc.php:61
+msgid "Display"
+msgstr ""
+
+#: setup/frames/index.inc.php:215 setup/lib/messages.inc.php:190
+#, fuzzy
+msgid "Load"
+msgstr "Local"
+
+#: setup/frames/index.inc.php:226 setup/lib/messages.inc.php:152
+#, fuzzy
+msgid "phpMyAdmin homepage"
+msgstr "phpMyAdmin dokumentasie"
+
+#: setup/frames/index.inc.php:227 setup/lib/messages.inc.php:64
+msgid "Donate"
+msgstr ""
+
+#: setup/frames/index.inc.php:228 setup/lib/messages.inc.php:370
+msgid "Check for latest version"
+msgstr ""
+
+#: setup/frames/menu.inc.php:18 setup/lib/messages.inc.php:137
+msgid "Features"
+msgstr ""
+
+#: setup/frames/menu.inc.php:19 setup/lib/messages.inc.php:113
+msgid "Navigation frame"
+msgstr ""
+
+#: setup/frames/menu.inc.php:20 setup/lib/messages.inc.php:118
+msgid "Main frame"
+msgstr ""
+
+#: setup/frames/servers.inc.php:28 setup/lib/messages.inc.php:272
+msgid "Edit server"
+msgstr ""
+
+#: setup/frames/servers.inc.php:37 setup/lib/messages.inc.php:241
+#, fuzzy
+msgid "Add a new server"
+msgstr "Voeg 'n nuwe gebruiker by"
+
+#: setup/lib/FormDisplay.tpl.php:182 setup/lib/messages.inc.php:328
+#, php-format
+msgid "Set value: %s"
+msgstr ""
+
+#: setup/lib/FormDisplay.tpl.php:187 setup/lib/messages.inc.php:234
+msgid "Restore default value"
+msgstr ""
+
+#: setup/lib/form_processing.lib.php:43 setup/lib/messages.inc.php:377
+msgid "Warning"
+msgstr ""
+
 #: setup/lib/messages.inc.php:16
 msgid "Allow character set conversion"
 msgstr ""
@@ -6831,10 +6935,6 @@ msgstr ""
 msgid "Compress on the fly"
 msgstr ""
 
-#: setup/lib/messages.inc.php:45
-msgid "Configuration file"
-msgstr ""
-
 #: setup/lib/messages.inc.php:46
 msgid ""
 "Whether a warning ("Are your really sure...") should be displayed "
@@ -6853,14 +6953,6 @@ msgstr ""
 msgid "Default character set"
 msgstr ""
 
-#: setup/lib/messages.inc.php:50
-msgid "Default language"
-msgstr ""
-
-#: setup/lib/messages.inc.php:51
-msgid "Default server"
-msgstr ""
-
 #: setup/lib/messages.inc.php:52
 msgid "Tab that is displayed when entering a database"
 msgstr ""
@@ -6899,10 +6991,6 @@ msgstr ""
 msgid "Display databases as a list"
 msgstr ""
 
-#: setup/lib/messages.inc.php:61
-msgid "Display"
-msgstr ""
-
 #: setup/lib/messages.inc.php:62
 msgid "Show server listing as a list instead of a drop down"
 msgstr ""
@@ -6911,18 +6999,6 @@ msgstr ""
 msgid "Display servers as a list"
 msgstr ""
 
-#: setup/lib/messages.inc.php:64
-msgid "Donate"
-msgstr ""
-
-#: setup/lib/messages.inc.php:65
-msgid "Download"
-msgstr ""
-
-#: setup/lib/messages.inc.php:66
-msgid "End of line"
-msgstr ""
-
 #: setup/lib/messages.inc.php:67
 msgid "Could not connect to MySQL server"
 msgstr ""
@@ -7097,10 +7173,6 @@ msgstr "Databasis statistieke"
 msgid "Customize appearance of the navigation frame"
 msgstr ""
 
-#: setup/lib/messages.inc.php:113
-msgid "Navigation frame"
-msgstr ""
-
 #: setup/lib/messages.inc.php:114
 msgid "Servers display options"
 msgstr ""
@@ -7109,10 +7181,6 @@ msgstr ""
 msgid "Tables display options"
 msgstr ""
 
-#: setup/lib/messages.inc.php:118
-msgid "Main frame"
-msgstr ""
-
 #: setup/lib/messages.inc.php:119
 msgid "Settings that didn't fit enywhere else"
 msgstr ""
@@ -7189,10 +7257,6 @@ msgstr ""
 msgid "Customize export options"
 msgstr ""
 
-#: setup/lib/messages.inc.php:137
-msgid "Features"
-msgstr ""
-
 #: setup/lib/messages.inc.php:138
 msgid "Customize import defaults"
 msgstr ""
@@ -7260,11 +7324,6 @@ msgid ""
 "system."
 msgstr ""
 
-#: setup/lib/messages.inc.php:152
-#, fuzzy
-msgid "phpMyAdmin homepage"
-msgstr "phpMyAdmin dokumentasie"
-
 #: setup/lib/messages.inc.php:153
 msgid "Extra parameters for iconv"
 msgstr ""
@@ -7308,12 +7367,6 @@ msgstr ""
 msgid "Insecure connection"
 msgstr ""
 
-#: setup/lib/messages.inc.php:164
-msgid ""
-"You are not using a secure connection; all data (including potentially "
-"sensitive information, like passwords) is transferred unencrypted!"
-msgstr ""
-
 #: setup/lib/messages.inc.php:165
 #, php-format
 msgid ""
@@ -7409,10 +7462,6 @@ msgstr ""
 msgid "Enable highlighting"
 msgstr ""
 
-#: setup/lib/messages.inc.php:187
-msgid "let the user choose"
-msgstr ""
-
 #: setup/lib/messages.inc.php:188
 msgid "Use less graphically intense tabs"
 msgstr ""
@@ -7421,11 +7470,6 @@ msgstr ""
 msgid "Light tabs"
 msgstr ""
 
-#: setup/lib/messages.inc.php:190
-#, fuzzy
-msgid "Load"
-msgstr "Local"
-
 #: setup/lib/messages.inc.php:191
 msgid ""
 "If TRUE, logout deletes cookies for all servers; when set to FALSE, logout "
@@ -7527,14 +7571,6 @@ msgstr ""
 msgid "Iconic navigation bar"
 msgstr ""
 
-#: setup/lib/messages.inc.php:212
-msgid "New server"
-msgstr ""
-
-#: setup/lib/messages.inc.php:213
-msgid "There are no configured servers"
-msgstr ""
-
 #: setup/lib/messages.inc.php:214
 msgid "use GZip output buffering for increased speed in HTTP transfers"
 msgstr ""
@@ -7543,10 +7579,6 @@ msgstr ""
 msgid "GZip output buffering"
 msgstr ""
 
-#: setup/lib/messages.inc.php:216
-msgid "- none -"
-msgstr ""
-
 #: setup/lib/messages.inc.php:217
 msgid ""
 "[kbd]SMART[/kbd] - i.e. descending order for fields of type TIME, DATE, "
@@ -7557,10 +7589,6 @@ msgstr ""
 msgid "Default sorting order"
 msgstr ""
 
-#: setup/lib/messages.inc.php:219
-msgid "Overview"
-msgstr ""
-
 #: setup/lib/messages.inc.php:220
 msgid "Use persistent connections to MySQL databases"
 msgstr ""
@@ -7615,10 +7643,6 @@ msgstr ""
 msgid "Recoding engine"
 msgstr ""
 
-#: setup/lib/messages.inc.php:234
-msgid "Restore default value"
-msgstr ""
-
 #: setup/lib/messages.inc.php:235
 msgid "Try to revert erroneous fields to their default values"
 msgstr ""
@@ -7649,11 +7673,6 @@ msgstr ""
 msgid "You allow for connecting to the server without a password."
 msgstr ""
 
-#: setup/lib/messages.inc.php:241
-#, fuzzy
-msgid "Add a new server"
-msgstr "Voeg 'n nuwe gebruiker by"
-
 #: setup/lib/messages.inc.php:242
 msgid "Leave blank if not used"
 msgstr ""
@@ -7795,10 +7814,6 @@ msgid ""
 "to."
 msgstr ""
 
-#: setup/lib/messages.inc.php:272
-msgid "Edit server"
-msgstr ""
-
 #: setup/lib/messages.inc.php:273
 msgid "What PHP extension to use; you should use mysqli if supported"
 msgstr ""
@@ -8048,11 +8063,6 @@ msgstr ""
 msgid "Verbose name of this server"
 msgstr ""
 
-#: setup/lib/messages.inc.php:328
-#, php-format
-msgid "Set value: %s"
-msgstr ""
-
 #: setup/lib/messages.inc.php:329
 msgid ""
 "Whether a user should be displayed a "show all (records)" button"
@@ -8090,10 +8100,6 @@ msgstr ""
 msgid "Show function fields"
 msgstr ""
 
-#: setup/lib/messages.inc.php:337
-msgid "Show hidden messages (#MSG_COUNT)"
-msgstr ""
-
 #: setup/lib/messages.inc.php:338
 msgid ""
 "Shows link to [a at http://php.net/manual/function.phpinfo.php]phpinfo()[/a] "
@@ -8224,10 +8230,6 @@ msgstr ""
 msgid "Got invalid version string from server"
 msgstr ""
 
-#: setup/lib/messages.inc.php:370
-msgid "Check for latest version"
-msgstr ""
-
 #: setup/lib/messages.inc.php:371
 #, php-format
 msgid ""
@@ -8259,10 +8261,6 @@ msgid ""
 "Neither URL wrapper nor CURL is available. Version check is not possible."
 msgstr ""
 
-#: setup/lib/messages.inc.php:377
-msgid "Warning"
-msgstr ""
-
 #: setup/lib/messages.inc.php:378
 msgid ""
 "Enable [a at http://en.wikipedia.org/wiki/ZIP_(file_format)]ZIP[/a] compression "
diff --git a/po/ar.po b/po/ar.po
index 2e43f35..92acac0 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-14 07:48-0400\n"
+"POT-Creation-Date: 2010-05-14 13:39-0400\n"
 "PO-Revision-Date: 2010-03-12 09:11+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: arabic <ar at li.org>\n"
@@ -933,10 +933,10 @@ msgid ""
 "file and import will resume."
 msgstr ""
 
-#: import.php:426
+#: import.php:426 libraries/messages.inc.php:1102
 msgid ""
 "However on last run no data has been parsed, this usually means phpMyAdmin "
-"won"
+"won't be able to finish this import unless you increase php time limits."
 msgstr ""
 
 #: index.php:190 libraries/messages.inc.php:549
@@ -6116,12 +6116,6 @@ msgstr ""
 msgid "Thread %s was successfully killed."
 msgstr "تم إيقاف العمليّة %s بنجاح."
 
-#: libraries/messages.inc.php:1102
-msgid ""
-"However on last run no data has been parsed, this usually means phpMyAdmin "
-"won't be able to finish this import unless you increase php time limits."
-msgstr ""
-
 #: libraries/messages.inc.php:1105 pmd_pdf.php:94
 msgid "to/from page"
 msgstr ""
@@ -6568,7 +6562,8 @@ msgstr "لا شيء"
 msgid "Filter"
 msgstr ""
 
-#: navigation.php:319 setup/lib/messages.inc.php:42
+#: navigation.php:319 setup/frames/index.inc.php:218
+#: setup/lib/messages.inc.php:42
 msgid "Clear"
 msgstr ""
 
@@ -6657,6 +6652,112 @@ msgstr "اتصالات"
 msgid "Configuration: %s"
 msgstr ""
 
+#: setup/frames/config.inc.php:25 setup/frames/index.inc.php:152
+#: setup/lib/messages.inc.php:45
+msgid "Configuration file"
+msgstr ""
+
+#: setup/frames/config.inc.php:38 setup/frames/index.inc.php:212
+#: setup/lib/messages.inc.php:65
+msgid "Download"
+msgstr "نزل"
+
+#: setup/frames/index.inc.php:58 setup/lib/messages.inc.php:164
+msgid ""
+"You are not using a secure connection; all data (including potentially "
+"sensitive information, like passwords) is transferred unencrypted!"
+msgstr ""
+
+#: setup/frames/index.inc.php:87 setup/frames/menu.inc.php:17
+#: setup/lib/messages.inc.php:219
+msgid "Overview"
+msgstr ""
+
+#: setup/frames/index.inc.php:95 setup/lib/messages.inc.php:337
+msgid "Show hidden messages (#MSG_COUNT)"
+msgstr ""
+
+#: setup/frames/index.inc.php:135 setup/lib/messages.inc.php:213
+msgid "There are no configured servers"
+msgstr ""
+
+#: setup/frames/index.inc.php:143 setup/lib/messages.inc.php:212
+msgid "New server"
+msgstr "خادم جديد"
+
+#: setup/frames/index.inc.php:172 setup/lib/messages.inc.php:50
+msgid "Default language"
+msgstr ""
+
+#: setup/frames/index.inc.php:182 setup/lib/messages.inc.php:187
+msgid "let the user choose"
+msgstr ""
+
+#: setup/frames/index.inc.php:193 setup/lib/messages.inc.php:216
+msgid "- none -"
+msgstr "- لا شيء -"
+
+#: setup/frames/index.inc.php:196 setup/lib/messages.inc.php:51
+msgid "Default server"
+msgstr ""
+
+#: setup/frames/index.inc.php:206 setup/lib/messages.inc.php:66
+msgid "End of line"
+msgstr ""
+
+#: setup/frames/index.inc.php:211 setup/lib/messages.inc.php:61
+msgid "Display"
+msgstr ""
+
+#: setup/frames/index.inc.php:215 setup/lib/messages.inc.php:190
+msgid "Load"
+msgstr ""
+
+#: setup/frames/index.inc.php:226 setup/lib/messages.inc.php:152
+msgid "phpMyAdmin homepage"
+msgstr ""
+
+#: setup/frames/index.inc.php:227 setup/lib/messages.inc.php:64
+msgid "Donate"
+msgstr "تبرع"
+
+#: setup/frames/index.inc.php:228 setup/lib/messages.inc.php:370
+msgid "Check for latest version"
+msgstr ""
+
+#: setup/frames/menu.inc.php:18 setup/lib/messages.inc.php:137
+msgid "Features"
+msgstr ""
+
+#: setup/frames/menu.inc.php:19 setup/lib/messages.inc.php:113
+msgid "Navigation frame"
+msgstr ""
+
+#: setup/frames/menu.inc.php:20 setup/lib/messages.inc.php:118
+msgid "Main frame"
+msgstr ""
+
+#: setup/frames/servers.inc.php:28 setup/lib/messages.inc.php:272
+msgid "Edit server"
+msgstr ""
+
+#: setup/frames/servers.inc.php:37 setup/lib/messages.inc.php:241
+msgid "Add a new server"
+msgstr ""
+
+#: setup/lib/FormDisplay.tpl.php:182 setup/lib/messages.inc.php:328
+#, php-format
+msgid "Set value: %s"
+msgstr ""
+
+#: setup/lib/FormDisplay.tpl.php:187 setup/lib/messages.inc.php:234
+msgid "Restore default value"
+msgstr ""
+
+#: setup/lib/form_processing.lib.php:43 setup/lib/messages.inc.php:377
+msgid "Warning"
+msgstr "تحذير"
+
 #: setup/lib/messages.inc.php:16
 msgid "Allow character set conversion"
 msgstr ""
@@ -6795,10 +6896,6 @@ msgstr ""
 msgid "Compress on the fly"
 msgstr ""
 
-#: setup/lib/messages.inc.php:45
-msgid "Configuration file"
-msgstr ""
-
 #: setup/lib/messages.inc.php:46
 msgid ""
 "Whether a warning ("Are your really sure...") should be displayed "
@@ -6817,14 +6914,6 @@ msgstr ""
 msgid "Default character set"
 msgstr ""
 
-#: setup/lib/messages.inc.php:50
-msgid "Default language"
-msgstr ""
-
-#: setup/lib/messages.inc.php:51
-msgid "Default server"
-msgstr ""
-
 #: setup/lib/messages.inc.php:52
 msgid "Tab that is displayed when entering a database"
 msgstr ""
@@ -6863,10 +6952,6 @@ msgstr ""
 msgid "Display databases as a list"
 msgstr ""
 
-#: setup/lib/messages.inc.php:61
-msgid "Display"
-msgstr ""
-
 #: setup/lib/messages.inc.php:62
 msgid "Show server listing as a list instead of a drop down"
 msgstr ""
@@ -6875,18 +6960,6 @@ msgstr ""
 msgid "Display servers as a list"
 msgstr ""
 
-#: setup/lib/messages.inc.php:64
-msgid "Donate"
-msgstr "تبرع"
-
-#: setup/lib/messages.inc.php:65
-msgid "Download"
-msgstr "نزل"
-
-#: setup/lib/messages.inc.php:66
-msgid "End of line"
-msgstr ""
-
 #: setup/lib/messages.inc.php:67
 msgid "Could not connect to MySQL server"
 msgstr ""
@@ -7059,10 +7132,6 @@ msgstr ""
 msgid "Customize appearance of the navigation frame"
 msgstr ""
 
-#: setup/lib/messages.inc.php:113
-msgid "Navigation frame"
-msgstr ""
-
 #: setup/lib/messages.inc.php:114
 msgid "Servers display options"
 msgstr ""
@@ -7071,10 +7140,6 @@ msgstr ""
 msgid "Tables display options"
 msgstr ""
 
-#: setup/lib/messages.inc.php:118
-msgid "Main frame"
-msgstr ""
-
 #: setup/lib/messages.inc.php:119
 msgid "Settings that didn't fit enywhere else"
 msgstr ""
@@ -7150,10 +7215,6 @@ msgstr ""
 msgid "Customize export options"
 msgstr ""
 
-#: setup/lib/messages.inc.php:137
-msgid "Features"
-msgstr ""
-
 #: setup/lib/messages.inc.php:138
 msgid "Customize import defaults"
 msgstr ""
@@ -7218,10 +7279,6 @@ msgid ""
 "system."
 msgstr ""
 
-#: setup/lib/messages.inc.php:152
-msgid "phpMyAdmin homepage"
-msgstr ""
-
 #: setup/lib/messages.inc.php:153
 msgid "Extra parameters for iconv"
 msgstr ""
@@ -7265,12 +7322,6 @@ msgstr ""
 msgid "Insecure connection"
 msgstr ""
 
-#: setup/lib/messages.inc.php:164
-msgid ""
-"You are not using a secure connection; all data (including potentially "
-"sensitive information, like passwords) is transferred unencrypted!"
-msgstr ""
-
 #: setup/lib/messages.inc.php:165
 #, php-format
 msgid ""
@@ -7366,10 +7417,6 @@ msgstr ""
 msgid "Enable highlighting"
 msgstr ""
 
-#: setup/lib/messages.inc.php:187
-msgid "let the user choose"
-msgstr ""
-
 #: setup/lib/messages.inc.php:188
 msgid "Use less graphically intense tabs"
 msgstr ""
@@ -7378,10 +7425,6 @@ msgstr ""
 msgid "Light tabs"
 msgstr ""
 
-#: setup/lib/messages.inc.php:190
-msgid "Load"
-msgstr ""
-
 #: setup/lib/messages.inc.php:191
 msgid ""
 "If TRUE, logout deletes cookies for all servers; when set to FALSE, logout "
@@ -7483,14 +7526,6 @@ msgstr ""
 msgid "Iconic navigation bar"
 msgstr ""
 
-#: setup/lib/messages.inc.php:212
-msgid "New server"
-msgstr "خادم جديد"
-
-#: setup/lib/messages.inc.php:213
-msgid "There are no configured servers"
-msgstr ""
-
 #: setup/lib/messages.inc.php:214
 msgid "use GZip output buffering for increased speed in HTTP transfers"
 msgstr ""
@@ -7499,10 +7534,6 @@ msgstr ""
 msgid "GZip output buffering"
 msgstr ""
 
-#: setup/lib/messages.inc.php:216
-msgid "- none -"
-msgstr "- لا شيء -"
-
 #: setup/lib/messages.inc.php:217
 msgid ""
 "[kbd]SMART[/kbd] - i.e. descending order for fields of type TIME, DATE, "
@@ -7513,10 +7544,6 @@ msgstr ""
 msgid "Default sorting order"
 msgstr ""
 
-#: setup/lib/messages.inc.php:219
-msgid "Overview"
-msgstr ""
-
 #: setup/lib/messages.inc.php:220
 msgid "Use persistent connections to MySQL databases"
 msgstr ""
@@ -7571,10 +7598,6 @@ msgstr ""
 msgid "Recoding engine"
 msgstr ""
 
-#: setup/lib/messages.inc.php:234
-msgid "Restore default value"
-msgstr ""
-
 #: setup/lib/messages.inc.php:235
 msgid "Try to revert erroneous fields to their default values"
 msgstr ""
@@ -7605,10 +7628,6 @@ msgstr ""
 msgid "You allow for connecting to the server without a password."
 msgstr ""
 
-#: setup/lib/messages.inc.php:241
-msgid "Add a new server"
-msgstr ""
-
 #: setup/lib/messages.inc.php:242
 msgid "Leave blank if not used"
 msgstr ""
@@ -7749,10 +7768,6 @@ msgid ""
 "to."
 msgstr ""
 
-#: setup/lib/messages.inc.php:272
-msgid "Edit server"
-msgstr ""
-
 #: setup/lib/messages.inc.php:273
 msgid "What PHP extension to use; you should use mysqli if supported"
 msgstr ""
@@ -7996,11 +8011,6 @@ msgstr ""
 msgid "Verbose name of this server"
 msgstr ""
 
-#: setup/lib/messages.inc.php:328
-#, php-format
-msgid "Set value: %s"
-msgstr ""
-
 #: setup/lib/messages.inc.php:329
 msgid ""
 "Whether a user should be displayed a "show all (records)" button"
@@ -8037,10 +8047,6 @@ msgstr ""
 msgid "Show function fields"
 msgstr ""
 
-#: setup/lib/messages.inc.php:337
-msgid "Show hidden messages (#MSG_COUNT)"
-msgstr ""
-
 #: setup/lib/messages.inc.php:338
 msgid ""
 "Shows link to [a at http://php.net/manual/function.phpinfo.php]phpinfo()[/a] "
@@ -8169,10 +8175,6 @@ msgstr ""
 msgid "Got invalid version string from server"
 msgstr ""
 
-#: setup/lib/messages.inc.php:370
-msgid "Check for latest version"
-msgstr ""
-
 #: setup/lib/messages.inc.php:371
 #, php-format
 msgid ""
@@ -8204,10 +8206,6 @@ msgid ""
 "Neither URL wrapper nor CURL is available. Version check is not possible."
 msgstr ""
 
-#: setup/lib/messages.inc.php:377
-msgid "Warning"
-msgstr "تحذير"
-
 #: setup/lib/messages.inc.php:378
 msgid ""
 "Enable [a at http://en.wikipedia.org/wiki/ZIP_(file_format)]ZIP[/a] compression "
diff --git a/po/az.po b/po/az.po
index e7beefe..3612225 100644
--- a/po/az.po
+++ b/po/az.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-14 07:48-0400\n"
+"POT-Creation-Date: 2010-05-14 13:39-0400\n"
 "PO-Revision-Date: 2010-03-12 09:11+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: azerbaijani <az at li.org>\n"
@@ -943,10 +943,10 @@ msgid ""
 "file and import will resume."
 msgstr ""
 
-#: import.php:426
+#: import.php:426 libraries/messages.inc.php:1102
 msgid ""
 "However on last run no data has been parsed, this usually means phpMyAdmin "
-"won"
+"won't be able to finish this import unless you increase php time limits."
 msgstr ""
 
 #: index.php:190 libraries/messages.inc.php:549
@@ -6211,12 +6211,6 @@ msgstr ""
 msgid "Thread %s was successfully killed."
 msgstr "Thread %s uğurla söndürüldü (killed)."
 
-#: libraries/messages.inc.php:1102
-msgid ""
-"However on last run no data has been parsed, this usually means phpMyAdmin "
-"won't be able to finish this import unless you increase php time limits."
-msgstr ""
-
 #: libraries/messages.inc.php:1105 pmd_pdf.php:94
 msgid "to/from page"
 msgstr ""
@@ -6671,7 +6665,8 @@ msgstr "Heç biri"
 msgid "Filter"
 msgstr ""
 
-#: navigation.php:319 setup/lib/messages.inc.php:42
+#: navigation.php:319 setup/frames/index.inc.php:218
+#: setup/lib/messages.inc.php:42
 msgid "Clear"
 msgstr ""
 
@@ -6758,6 +6753,115 @@ msgstr "Elaqeler"
 msgid "Configuration: %s"
 msgstr ""
 
+#: setup/frames/config.inc.php:25 setup/frames/index.inc.php:152
+#: setup/lib/messages.inc.php:45
+msgid "Configuration file"
+msgstr ""
+
+#: setup/frames/config.inc.php:38 setup/frames/index.inc.php:212
+#: setup/lib/messages.inc.php:65
+msgid "Download"
+msgstr ""
+
+#: setup/frames/index.inc.php:58 setup/lib/messages.inc.php:164
+msgid ""
+"You are not using a secure connection; all data (including potentially "
+"sensitive information, like passwords) is transferred unencrypted!"
+msgstr ""
+
+#: setup/frames/index.inc.php:87 setup/frames/menu.inc.php:17
+#: setup/lib/messages.inc.php:219
+msgid "Overview"
+msgstr ""
+
+#: setup/frames/index.inc.php:95 setup/lib/messages.inc.php:337
+msgid "Show hidden messages (#MSG_COUNT)"
+msgstr ""
+
+#: setup/frames/index.inc.php:135 setup/lib/messages.inc.php:213
+msgid "There are no configured servers"
+msgstr ""
+
+#: setup/frames/index.inc.php:143 setup/lib/messages.inc.php:212
+msgid "New server"
+msgstr ""
+
+#: setup/frames/index.inc.php:172 setup/lib/messages.inc.php:50
+msgid "Default language"
+msgstr ""
+
+#: setup/frames/index.inc.php:182 setup/lib/messages.inc.php:187
+msgid "let the user choose"
+msgstr ""
+
+#: setup/frames/index.inc.php:193 setup/lib/messages.inc.php:216
+msgid "- none -"
+msgstr ""
+
+#: setup/frames/index.inc.php:196 setup/lib/messages.inc.php:51
+msgid "Default server"
+msgstr ""
+
+#: setup/frames/index.inc.php:206 setup/lib/messages.inc.php:66
+msgid "End of line"
+msgstr ""
+
+#: setup/frames/index.inc.php:211 setup/lib/messages.inc.php:61
+msgid "Display"
+msgstr ""
+
+#: setup/frames/index.inc.php:215 setup/lib/messages.inc.php:190
+#, fuzzy
+msgid "Load"
+msgstr "Yerli"
+
+#: setup/frames/index.inc.php:226 setup/lib/messages.inc.php:152
+#, fuzzy
+msgid "phpMyAdmin homepage"
+msgstr "phpMyAdmin dokumentasiyası (etraflı me'lumat üçün)"
+
+#: setup/frames/index.inc.php:227 setup/lib/messages.inc.php:64
+msgid "Donate"
+msgstr ""
+
+#: setup/frames/index.inc.php:228 setup/lib/messages.inc.php:370
+msgid "Check for latest version"
+msgstr ""
+
+#: setup/frames/menu.inc.php:18 setup/lib/messages.inc.php:137
+msgid "Features"
+msgstr ""
+
+#: setup/frames/menu.inc.php:19 setup/lib/messages.inc.php:113
+msgid "Navigation frame"
+msgstr ""
+
+#: setup/frames/menu.inc.php:20 setup/lib/messages.inc.php:118
+msgid "Main frame"
+msgstr ""
+
+#: setup/frames/servers.inc.php:28 setup/lib/messages.inc.php:272
+msgid "Edit server"
+msgstr ""
+
+#: setup/frames/servers.inc.php:37 setup/lib/messages.inc.php:241
+#, fuzzy
+msgid "Add a new server"
+msgstr "Yeni İstifadeçi elave Et"
+
+#: setup/lib/FormDisplay.tpl.php:182 setup/lib/messages.inc.php:328
+#, php-format
+msgid "Set value: %s"
+msgstr ""
+
+#: setup/lib/FormDisplay.tpl.php:187 setup/lib/messages.inc.php:234
+msgid "Restore default value"
+msgstr ""
+
+#: setup/lib/form_processing.lib.php:43 setup/lib/messages.inc.php:377
+msgid "Warning"
+msgstr ""
+
 #: setup/lib/messages.inc.php:16
 msgid "Allow character set conversion"
 msgstr ""
@@ -6897,10 +7001,6 @@ msgstr ""
 msgid "Compress on the fly"
 msgstr ""
 
-#: setup/lib/messages.inc.php:45
-msgid "Configuration file"
-msgstr ""
-
 #: setup/lib/messages.inc.php:46
 msgid ""
 "Whether a warning ("Are your really sure...") should be displayed "
@@ -6919,14 +7019,6 @@ msgstr ""
 msgid "Default character set"
 msgstr ""
 
-#: setup/lib/messages.inc.php:50
-msgid "Default language"
-msgstr ""
-
-#: setup/lib/messages.inc.php:51
-msgid "Default server"
-msgstr ""
-
 #: setup/lib/messages.inc.php:52
 msgid "Tab that is displayed when entering a database"
 msgstr ""
@@ -6965,10 +7057,6 @@ msgstr ""
 msgid "Display databases as a list"
 msgstr ""
 
-#: setup/lib/messages.inc.php:61
-msgid "Display"
-msgstr ""
-
 #: setup/lib/messages.inc.php:62
 msgid "Show server listing as a list instead of a drop down"
 msgstr ""
@@ -6977,18 +7065,6 @@ msgstr ""
 msgid "Display servers as a list"
 msgstr ""
 
-#: setup/lib/messages.inc.php:64
-msgid "Donate"
-msgstr ""
-
-#: setup/lib/messages.inc.php:65
-msgid "Download"
-msgstr ""
-
-#: setup/lib/messages.inc.php:66
-msgid "End of line"
-msgstr ""
-
 #: setup/lib/messages.inc.php:67
 msgid "Could not connect to MySQL server"
 msgstr ""
@@ -7168,10 +7244,6 @@ msgstr "Me'lumat bazası eksport variantları"
 msgid "Customize appearance of the navigation frame"
 msgstr ""
 
-#: setup/lib/messages.inc.php:113
-msgid "Navigation frame"
-msgstr ""
-
 #: setup/lib/messages.inc.php:114
 msgid "Servers display options"
 msgstr ""
@@ -7180,10 +7252,6 @@ msgstr ""
 msgid "Tables display options"
 msgstr ""
 
-#: setup/lib/messages.inc.php:118
-msgid "Main frame"
-msgstr ""
-
 #: setup/lib/messages.inc.php:119
 msgid "Settings that didn't fit enywhere else"
 msgstr ""
@@ -7261,10 +7329,6 @@ msgstr ""
 msgid "Customize export options"
 msgstr "Me'lumat bazası eksport variantları"
 
-#: setup/lib/messages.inc.php:137
-msgid "Features"
-msgstr ""
-
 #: setup/lib/messages.inc.php:138
 msgid "Customize import defaults"
 msgstr ""
@@ -7333,11 +7397,6 @@ msgid ""
 "system."
 msgstr ""
 
-#: setup/lib/messages.inc.php:152
-#, fuzzy
-msgid "phpMyAdmin homepage"
-msgstr "phpMyAdmin dokumentasiyası (etraflı me'lumat üçün)"
-
 #: setup/lib/messages.inc.php:153
 msgid "Extra parameters for iconv"
 msgstr ""
@@ -7381,12 +7440,6 @@ msgstr ""
 msgid "Insecure connection"
 msgstr ""
 
-#: setup/lib/messages.inc.php:164
-msgid ""
-"You are not using a secure connection; all data (including potentially "
-"sensitive information, like passwords) is transferred unencrypted!"
-msgstr ""
-
 #: setup/lib/messages.inc.php:165
 #, php-format
 msgid ""
@@ -7482,10 +7535,6 @@ msgstr ""
 msgid "Enable highlighting"
 msgstr ""
 
-#: setup/lib/messages.inc.php:187
-msgid "let the user choose"
-msgstr ""
-
 #: setup/lib/messages.inc.php:188
 msgid "Use less graphically intense tabs"
 msgstr ""
@@ -7494,11 +7543,6 @@ msgstr ""
 msgid "Light tabs"
 msgstr ""
 
-#: setup/lib/messages.inc.php:190
-#, fuzzy
-msgid "Load"
-msgstr "Yerli"
-
 #: setup/lib/messages.inc.php:191
 msgid ""
 "If TRUE, logout deletes cookies for all servers; when set to FALSE, logout "
@@ -7601,14 +7645,6 @@ msgstr ""
 msgid "Iconic navigation bar"
 msgstr ""
 
-#: setup/lib/messages.inc.php:212
-msgid "New server"
-msgstr ""
-
-#: setup/lib/messages.inc.php:213
-msgid "There are no configured servers"
-msgstr ""
-
 #: setup/lib/messages.inc.php:214
 msgid "use GZip output buffering for increased speed in HTTP transfers"
 msgstr ""
@@ -7617,10 +7653,6 @@ msgstr ""
 msgid "GZip output buffering"
 msgstr ""
 
-#: setup/lib/messages.inc.php:216
-msgid "- none -"
-msgstr ""
-
 #: setup/lib/messages.inc.php:217
 msgid ""
 "[kbd]SMART[/kbd] - i.e. descending order for fields of type TIME, DATE, "
@@ -7631,10 +7663,6 @@ msgstr ""
 msgid "Default sorting order"
 msgstr ""
 
-#: setup/lib/messages.inc.php:219
-msgid "Overview"
-msgstr ""
-
 #: setup/lib/messages.inc.php:220
 msgid "Use persistent connections to MySQL databases"
 msgstr ""
@@ -7689,10 +7717,6 @@ msgstr ""
 msgid "Recoding engine"
 msgstr ""
 
-#: setup/lib/messages.inc.php:234
-msgid "Restore default value"
-msgstr ""
-
 #: setup/lib/messages.inc.php:235
 msgid "Try to revert erroneous fields to their default values"
 msgstr ""
@@ -7723,11 +7747,6 @@ msgstr ""
 msgid "You allow for connecting to the server without a password."
 msgstr ""
 
-#: setup/lib/messages.inc.php:241
-#, fuzzy
-msgid "Add a new server"
-msgstr "Yeni İstifadeçi elave Et"
-
 #: setup/lib/messages.inc.php:242
 msgid "Leave blank if not used"
 msgstr ""
@@ -7870,10 +7889,6 @@ msgid ""
 "to."
 msgstr ""
 
-#: setup/lib/messages.inc.php:272
-msgid "Edit server"
-msgstr ""
-
 #: setup/lib/messages.inc.php:273
 msgid "What PHP extension to use; you should use mysqli if supported"
 msgstr ""
@@ -8124,11 +8139,6 @@ msgstr ""
 msgid "Verbose name of this server"
 msgstr ""
 
-#: setup/lib/messages.inc.php:328
-#, php-format
-msgid "Set value: %s"
-msgstr ""
-
 #: setup/lib/messages.inc.php:329
 msgid ""
 "Whether a user should be displayed a "show all (records)" button"
@@ -8166,10 +8176,6 @@ msgstr ""
 msgid "Show function fields"
 msgstr ""
 
-#: setup/lib/messages.inc.php:337
-msgid "Show hidden messages (#MSG_COUNT)"
-msgstr ""
-
 #: setup/lib/messages.inc.php:338
 msgid ""
 "Shows link to [a at http://php.net/manual/function.phpinfo.php]phpinfo()[/a] "
@@ -8301,10 +8307,6 @@ msgstr ""
 msgid "Got invalid version string from server"
 msgstr ""
 
-#: setup/lib/messages.inc.php:370
-msgid "Check for latest version"
-msgstr ""
-
 #: setup/lib/messages.inc.php:371
 #, php-format
 msgid ""
@@ -8336,10 +8338,6 @@ msgid ""
 "Neither URL wrapper nor CURL is available. Version check is not possible."
 msgstr ""
 
-#: setup/lib/messages.inc.php:377
-msgid "Warning"
-msgstr ""
-
 #: setup/lib/messages.inc.php:378
 msgid ""
 "Enable [a at http://en.wikipedia.org/wiki/ZIP_(file_format)]ZIP[/a] compression "
diff --git a/po/be.po b/po/be.po
index 1ab265f..de77944 100644
--- a/po/be.po
+++ b/po/be.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-14 07:48-0400\n"
+"POT-Creation-Date: 2010-05-14 13:39-0400\n"
 "PO-Revision-Date: 2010-03-12 09:12+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: belarusian_cyrillic <be at li.org>\n"
@@ -960,15 +960,10 @@ msgstr ""
 "Выйшаў дазволены час выкананьня скрыпта. Калі вы хочаце завершыць "
 "імпартаваньне, калі ласка, загрузіце файл зноў і імпартаваньне ўзнавіцца."
 
-#: import.php:426
-#, fuzzy
-#| msgid ""
-#| "However on last run no data has been parsed, this usually means "
-#| "phpMyAdmin won't be able to finish this import unless you increase php "
-#| "time limits."
+#: import.php:426 libraries/messages.inc.php:1102
 msgid ""
 "However on last run no data has been parsed, this usually means phpMyAdmin "
-"won"
+"won't be able to finish this import unless you increase php time limits."
 msgstr ""
 "Аднак, падчас апошняга выкананьня ніякія дадзеныя былі апрацаваныя. Гэта "
 "звычайна значыць, што phpMyAdmin ня зможа скончыць гэтае імпартаваньня, калі "
@@ -6447,15 +6442,6 @@ msgstr "Патокі"
 msgid "Thread %s was successfully killed."
 msgstr "Паток %s быў пасьпяхова спынены."
 
-#: libraries/messages.inc.php:1102
-msgid ""
-"However on last run no data has been parsed, this usually means phpMyAdmin "
-"won't be able to finish this import unless you increase php time limits."
-msgstr ""
-"Аднак, падчас апошняга выкананьня ніякія дадзеныя былі апрацаваныя. Гэта "
-"звычайна значыць, што phpMyAdmin ня зможа скончыць гэтае імпартаваньня, калі "
-"вы не павялічыце ліміты выкананьня php-скрыптоў."
-
 #: libraries/messages.inc.php:1105 pmd_pdf.php:94
 msgid "to/from page"
 msgstr "старонка"
@@ -6934,7 +6920,8 @@ msgstr "Няма"
 msgid "Filter"
 msgstr "Файлы"
 
-#: navigation.php:319 setup/lib/messages.inc.php:42
+#: navigation.php:319 setup/frames/index.inc.php:218
+#: setup/lib/messages.inc.php:42
 #, fuzzy
 msgid "Clear"
 msgstr "Каляндар"
@@ -7025,6 +7012,118 @@ msgstr "максымум адначасовых злучэньняў"
 msgid "Configuration: %s"
 msgstr ""
 
+#: setup/frames/config.inc.php:25 setup/frames/index.inc.php:152
+#: setup/lib/messages.inc.php:45
+msgid "Configuration file"
+msgstr ""
+
+#: setup/frames/config.inc.php:38 setup/frames/index.inc.php:212
+#: setup/lib/messages.inc.php:65
+msgid "Download"
+msgstr ""
+
+#: setup/frames/index.inc.php:58 setup/lib/messages.inc.php:164
+msgid ""
+"You are not using a secure connection; all data (including potentially "
+"sensitive information, like passwords) is transferred unencrypted!"
+msgstr ""
+
+#: setup/frames/index.inc.php:87 setup/frames/menu.inc.php:17
+#: setup/lib/messages.inc.php:219
+msgid "Overview"
+msgstr ""
+
+#: setup/frames/index.inc.php:95 setup/lib/messages.inc.php:337
+msgid "Show hidden messages (#MSG_COUNT)"
+msgstr ""
+
+#: setup/frames/index.inc.php:135 setup/lib/messages.inc.php:213
+msgid "There are no configured servers"
+msgstr ""
+
+#: setup/frames/index.inc.php:143 setup/lib/messages.inc.php:212
+#, fuzzy
+msgid "New server"
+msgstr "Вэб-сэрвэр"
+
+#: setup/frames/index.inc.php:172 setup/lib/messages.inc.php:50
+msgid "Default language"
+msgstr ""
+
+#: setup/frames/index.inc.php:182 setup/lib/messages.inc.php:187
+msgid "let the user choose"
+msgstr ""
+
+#: setup/frames/index.inc.php:193 setup/lib/messages.inc.php:216
+msgid "- none -"
+msgstr ""
+
+#: setup/frames/index.inc.php:196 setup/lib/messages.inc.php:51
+msgid "Default server"
+msgstr ""
+
+#: setup/frames/index.inc.php:206 setup/lib/messages.inc.php:66
+msgid "End of line"
+msgstr ""
+
+#: setup/frames/index.inc.php:211 setup/lib/messages.inc.php:61
+msgid "Display"
+msgstr ""
+
+#: setup/frames/index.inc.php:215 setup/lib/messages.inc.php:190
+#, fuzzy
+msgid "Load"
+msgstr "Лякальны"
+
+#: setup/frames/index.inc.php:226 setup/lib/messages.inc.php:152
+#, fuzzy
+msgid "phpMyAdmin homepage"
+msgstr "Дакумэнтацыя па phpMyAdmin"
+
+#: setup/frames/index.inc.php:227 setup/lib/messages.inc.php:64
+#, fuzzy
+msgid "Donate"
+msgstr "Дадзеныя"
+
+#: setup/frames/index.inc.php:228 setup/lib/messages.inc.php:370
+msgid "Check for latest version"
+msgstr ""
+
+#: setup/frames/menu.inc.php:18 setup/lib/messages.inc.php:137
+msgid "Features"
+msgstr ""
+
+#: setup/frames/menu.inc.php:19 setup/lib/messages.inc.php:113
+msgid "Navigation frame"
+msgstr ""
+
+#: setup/frames/menu.inc.php:20 setup/lib/messages.inc.php:118
+msgid "Main frame"
+msgstr ""
+
+#: setup/frames/servers.inc.php:28 setup/lib/messages.inc.php:272
+#, fuzzy
+msgid "Edit server"
+msgstr "Вэб-сэрвэр"
+
+#: setup/frames/servers.inc.php:37 setup/lib/messages.inc.php:241
+#, fuzzy
+msgid "Add a new server"
+msgstr "Дадаць новага карыстальніка"
+
+#: setup/lib/FormDisplay.tpl.php:182 setup/lib/messages.inc.php:328
+#, php-format
+msgid "Set value: %s"
+msgstr ""
+
+#: setup/lib/FormDisplay.tpl.php:187 setup/lib/messages.inc.php:234
+msgid "Restore default value"
+msgstr ""
+
+#: setup/lib/form_processing.lib.php:43 setup/lib/messages.inc.php:377
+msgid "Warning"
+msgstr ""
+
 #: setup/lib/messages.inc.php:16
 msgid "Allow character set conversion"
 msgstr ""
@@ -7164,10 +7263,6 @@ msgstr ""
 msgid "Compress on the fly"
 msgstr ""
 
-#: setup/lib/messages.inc.php:45
-msgid "Configuration file"
-msgstr ""
-
 #: setup/lib/messages.inc.php:46
 msgid ""
 "Whether a warning ("Are your really sure...") should be displayed "
@@ -7186,14 +7281,6 @@ msgstr ""
 msgid "Default character set"
 msgstr ""
 
-#: setup/lib/messages.inc.php:50
-msgid "Default language"
-msgstr ""
-
-#: setup/lib/messages.inc.php:51
-msgid "Default server"
-msgstr ""
-
 #: setup/lib/messages.inc.php:52
 msgid "Tab that is displayed when entering a database"
 msgstr ""
@@ -7235,10 +7322,6 @@ msgstr ""
 msgid "Display databases as a list"
 msgstr ""
 
-#: setup/lib/messages.inc.php:61
-msgid "Display"
-msgstr ""
-
 #: setup/lib/messages.inc.php:62
 msgid "Show server listing as a list instead of a drop down"
 msgstr ""
@@ -7247,19 +7330,6 @@ msgstr ""
 msgid "Display servers as a list"
 msgstr ""
 
-#: setup/lib/messages.inc.php:64
-#, fuzzy
-msgid "Donate"
-msgstr "Дадзеныя"
-
-#: setup/lib/messages.inc.php:65
-msgid "Download"
-msgstr ""
-
-#: setup/lib/messages.inc.php:66
-msgid "End of line"
-msgstr ""
-
 #: setup/lib/messages.inc.php:67
 msgid "Could not connect to MySQL server"
 msgstr ""
@@ -7441,10 +7511,6 @@ msgstr "Налады экспарту базы дадзеных"
 msgid "Customize appearance of the navigation frame"
 msgstr ""
 
-#: setup/lib/messages.inc.php:113
-msgid "Navigation frame"
-msgstr ""
-
 #: setup/lib/messages.inc.php:114
 #, fuzzy
 msgid "Servers display options"
@@ -7455,10 +7521,6 @@ msgstr "Налады экспарту базы дадзеных"
 msgid "Tables display options"
 msgstr "Налады экспарту базы дадзеных"
 
-#: setup/lib/messages.inc.php:118
-msgid "Main frame"
-msgstr ""
-
 #: setup/lib/messages.inc.php:119
 msgid "Settings that didn't fit enywhere else"
 msgstr ""
@@ -7537,10 +7599,6 @@ msgstr ""
 msgid "Customize export options"
 msgstr "Налады экспарту базы дадзеных"
 
-#: setup/lib/messages.inc.php:137
-msgid "Features"
-msgstr ""
-
 #: setup/lib/messages.inc.php:138
 #, fuzzy
 msgid "Customize import defaults"
@@ -7610,11 +7668,6 @@ msgid ""
 "system."
 msgstr ""
 
-#: setup/lib/messages.inc.php:152
-#, fuzzy
-msgid "phpMyAdmin homepage"
-msgstr "Дакумэнтацыя па phpMyAdmin"
-
 #: setup/lib/messages.inc.php:153
 msgid "Extra parameters for iconv"
 msgstr ""
@@ -7662,12 +7715,6 @@ msgstr ""
 msgid "Insecure connection"
 msgstr ""
 
-#: setup/lib/messages.inc.php:164
-msgid ""
-"You are not using a secure connection; all data (including potentially "
-"sensitive information, like passwords) is transferred unencrypted!"
-msgstr ""
-
 #: setup/lib/messages.inc.php:165
 #, php-format
 msgid ""
@@ -7766,10 +7813,6 @@ msgstr ""
 msgid "Enable highlighting"
 msgstr ""
 
-#: setup/lib/messages.inc.php:187
-msgid "let the user choose"
-msgstr ""
-
 #: setup/lib/messages.inc.php:188
 msgid "Use less graphically intense tabs"
 msgstr ""
@@ -7778,11 +7821,6 @@ msgstr ""
 msgid "Light tabs"
 msgstr ""
 
-#: setup/lib/messages.inc.php:190
-#, fuzzy
-msgid "Load"
-msgstr "Лякальны"
-
 #: setup/lib/messages.inc.php:191
 msgid ""
 "If TRUE, logout deletes cookies for all servers; when set to FALSE, logout "
@@ -7886,15 +7924,6 @@ msgstr ""
 msgid "Iconic navigation bar"
 msgstr ""
 
-#: setup/lib/messages.inc.php:212
-#, fuzzy
-msgid "New server"
-msgstr "Вэб-сэрвэр"
-
-#: setup/lib/messages.inc.php:213
-msgid "There are no configured servers"
-msgstr ""
-
 #: setup/lib/messages.inc.php:214
 msgid "use GZip output buffering for increased speed in HTTP transfers"
 msgstr ""
@@ -7903,10 +7932,6 @@ msgstr ""
 msgid "GZip output buffering"
 msgstr ""
 
-#: setup/lib/messages.inc.php:216
-msgid "- none -"
-msgstr ""
-
 #: setup/lib/messages.inc.php:217
 msgid ""
 "[kbd]SMART[/kbd] - i.e. descending order for fields of type TIME, DATE, "
@@ -7917,10 +7942,6 @@ msgstr ""
 msgid "Default sorting order"
 msgstr ""
 
-#: setup/lib/messages.inc.php:219
-msgid "Overview"
-msgstr ""
-
 #: setup/lib/messages.inc.php:220
 msgid "Use persistent connections to MySQL databases"
 msgstr ""
@@ -7975,10 +7996,6 @@ msgstr ""
 msgid "Recoding engine"
 msgstr ""
 
-#: setup/lib/messages.inc.php:234
-msgid "Restore default value"
-msgstr ""
-
 #: setup/lib/messages.inc.php:235
 msgid "Try to revert erroneous fields to their default values"
 msgstr ""
@@ -8010,11 +8027,6 @@ msgstr ""
 msgid "You allow for connecting to the server without a password."
 msgstr ""
 
-#: setup/lib/messages.inc.php:241
-#, fuzzy
-msgid "Add a new server"
-msgstr "Дадаць новага карыстальніка"
-
 #: setup/lib/messages.inc.php:242
 msgid "Leave blank if not used"
 msgstr ""
@@ -8162,11 +8174,6 @@ msgid ""
 "to."
 msgstr ""
 
-#: setup/lib/messages.inc.php:272
-#, fuzzy
-msgid "Edit server"
-msgstr "Вэб-сэрвэр"
-
 #: setup/lib/messages.inc.php:273
 msgid "What PHP extension to use; you should use mysqli if supported"
 msgstr ""
@@ -8418,11 +8425,6 @@ msgstr ""
 msgid "Verbose name of this server"
 msgstr ""
 
-#: setup/lib/messages.inc.php:328
-#, php-format
-msgid "Set value: %s"
-msgstr ""
-
 #: setup/lib/messages.inc.php:329
 msgid ""
 "Whether a user should be displayed a "show all (records)" button"
@@ -8460,10 +8462,6 @@ msgstr ""
 msgid "Show function fields"
 msgstr ""
 
-#: setup/lib/messages.inc.php:337
-msgid "Show hidden messages (#MSG_COUNT)"
-msgstr ""
-
 #: setup/lib/messages.inc.php:338
 msgid ""
 "Shows link to [a at http://php.net/manual/function.phpinfo.php]phpinfo()[/a] "
@@ -8597,10 +8595,6 @@ msgstr ""
 msgid "Got invalid version string from server"
 msgstr ""
 
-#: setup/lib/messages.inc.php:370
-msgid "Check for latest version"
-msgstr ""
-
 #: setup/lib/messages.inc.php:371
 #, php-format
 msgid ""
@@ -8632,10 +8626,6 @@ msgid ""
 "Neither URL wrapper nor CURL is available. Version check is not possible."
 msgstr ""
 
-#: setup/lib/messages.inc.php:377
-msgid "Warning"
-msgstr ""
-
 #: setup/lib/messages.inc.php:378
 msgid ""
 "Enable [a at http://en.wikipedia.org/wiki/ZIP_(file_format)]ZIP[/a] compression "
@@ -8697,6 +8687,19 @@ msgid "Description"
 msgstr "Апісаньне"
 
 #, fuzzy
+#~| msgid ""
+#~| "However on last run no data has been parsed, this usually means "
+#~| "phpMyAdmin won't be able to finish this import unless you increase php "
+#~| "time limits."
+#~ msgid ""
+#~ "However on last run no data has been parsed, this usually means "
+#~ "phpMyAdmin won"
+#~ msgstr ""
+#~ "Аднак, падчас апошняга выкананьня ніякія дадзеныя былі апрацаваныя. Гэта "
+#~ "звычайна значыць, што phpMyAdmin ня зможа скончыць гэтае імпартаваньня, "
+#~ "калі вы не павялічыце ліміты выкананьня php-скрыптоў."
+
+#, fuzzy
 #~| msgid "None"
 #~ msgctxt "None action"
 #~ msgid "None"
diff --git a/po/be at latin.po b/po/be at latin.po
index 8eb27a5..7d3e7b4 100644
--- a/po/be at latin.po
+++ b/po/be at latin.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-14 07:48-0400\n"
+"POT-Creation-Date: 2010-05-14 13:39-0400\n"
 "PO-Revision-Date: 2010-03-30 23:09+0200\n"
 "Last-Translator: Michal <michal at cihar.com>\n"
 "Language-Team: belarusian_latin <be at latin@li.org>\n"
@@ -953,15 +953,10 @@ msgstr ""
 "Vyjšaŭ dazvoleny čas vykanańnia skrypta. Kali vy chočacie zavieršyć "
 "impartavańnie, kali łaska, zahruzicie fajł znoŭ i impartavańnie ŭznavicca."
 
-#: import.php:426
-#, fuzzy
-#| msgid ""
-#| "However on last run no data has been parsed, this usually means "
-#| "phpMyAdmin won't be able to finish this import unless you increase php "
-#| "time limits."
+#: import.php:426 libraries/messages.inc.php:1102
 msgid ""
 "However on last run no data has been parsed, this usually means phpMyAdmin "
-"won"
+"won't be able to finish this import unless you increase php time limits."
 msgstr ""
 "Adnak, padčas apošniaha vykanańnia nijakija dadzienyja byli apracavanyja. "
 "Heta zvyčajna značyć, što phpMyAdmin nia zmoža skončyć hetaje impartavańnia, "
@@ -6418,15 +6413,6 @@ msgstr "Patoki"
 msgid "Thread %s was successfully killed."
 msgstr "Patok %s byŭ paśpiachova spynieny."
 
-#: libraries/messages.inc.php:1102
-msgid ""
-"However on last run no data has been parsed, this usually means phpMyAdmin "
-"won't be able to finish this import unless you increase php time limits."
-msgstr ""
-"Adnak, padčas apošniaha vykanańnia nijakija dadzienyja byli apracavanyja. "
-"Heta zvyčajna značyć, što phpMyAdmin nia zmoža skončyć hetaje impartavańnia, "
-"kali vy nie pavialičycie limity vykanańnia php-skryptoŭ."
-
 #: libraries/messages.inc.php:1105 pmd_pdf.php:94
 msgid "to/from page"
 msgstr "staronka"
@@ -6903,7 +6889,8 @@ msgstr "Nijakaja"
 msgid "Filter"
 msgstr ""
 
-#: navigation.php:319 setup/lib/messages.inc.php:42
+#: navigation.php:319 setup/frames/index.inc.php:218
+#: setup/lib/messages.inc.php:42
 msgid "Clear"
 msgstr ""
 
@@ -6994,6 +6981,112 @@ msgstr "maksymum adnačasovych złučeńniaŭ"
 msgid "Configuration: %s"
 msgstr ""
 
+#: setup/frames/config.inc.php:25 setup/frames/index.inc.php:152
+#: setup/lib/messages.inc.php:45
+msgid "Configuration file"
+msgstr ""
+
+#: setup/frames/config.inc.php:38 setup/frames/index.inc.php:212
+#: setup/lib/messages.inc.php:65
+msgid "Download"
+msgstr ""
+
+#: setup/frames/index.inc.php:58 setup/lib/messages.inc.php:164
+msgid ""
+"You are not using a secure connection; all data (including potentially "
+"sensitive information, like passwords) is transferred unencrypted!"
+msgstr ""
+
+#: setup/frames/index.inc.php:87 setup/frames/menu.inc.php:17
+#: setup/lib/messages.inc.php:219
+msgid "Overview"
+msgstr ""
+
+#: setup/frames/index.inc.php:95 setup/lib/messages.inc.php:337
+msgid "Show hidden messages (#MSG_COUNT)"
+msgstr ""
+
+#: setup/frames/index.inc.php:135 setup/lib/messages.inc.php:213
+msgid "There are no configured servers"
+msgstr ""
+
+#: setup/frames/index.inc.php:143 setup/lib/messages.inc.php:212
+msgid "New server"
+msgstr ""
+
+#: setup/frames/index.inc.php:172 setup/lib/messages.inc.php:50
+msgid "Default language"
+msgstr ""
+
+#: setup/frames/index.inc.php:182 setup/lib/messages.inc.php:187
+msgid "let the user choose"
+msgstr ""
+
+#: setup/frames/index.inc.php:193 setup/lib/messages.inc.php:216
+msgid "- none -"
+msgstr ""
+
+#: setup/frames/index.inc.php:196 setup/lib/messages.inc.php:51
+msgid "Default server"
+msgstr ""
+
+#: setup/frames/index.inc.php:206 setup/lib/messages.inc.php:66
+msgid "End of line"
+msgstr ""
+
+#: setup/frames/index.inc.php:211 setup/lib/messages.inc.php:61
+msgid "Display"
+msgstr ""
+
+#: setup/frames/index.inc.php:215 setup/lib/messages.inc.php:190
+msgid "Load"
+msgstr ""
+
+#: setup/frames/index.inc.php:226 setup/lib/messages.inc.php:152
+msgid "phpMyAdmin homepage"
+msgstr ""
+
+#: setup/frames/index.inc.php:227 setup/lib/messages.inc.php:64
+msgid "Donate"
+msgstr ""
+
+#: setup/frames/index.inc.php:228 setup/lib/messages.inc.php:370
+msgid "Check for latest version"
+msgstr ""
+
+#: setup/frames/menu.inc.php:18 setup/lib/messages.inc.php:137
+msgid "Features"
+msgstr ""
+
+#: setup/frames/menu.inc.php:19 setup/lib/messages.inc.php:113
+msgid "Navigation frame"
+msgstr ""
+
+#: setup/frames/menu.inc.php:20 setup/lib/messages.inc.php:118
+msgid "Main frame"
+msgstr ""
+
+#: setup/frames/servers.inc.php:28 setup/lib/messages.inc.php:272
+msgid "Edit server"
+msgstr ""
+
+#: setup/frames/servers.inc.php:37 setup/lib/messages.inc.php:241
+msgid "Add a new server"
+msgstr ""
+
+#: setup/lib/FormDisplay.tpl.php:182 setup/lib/messages.inc.php:328
+#, php-format
+msgid "Set value: %s"
+msgstr ""
+
+#: setup/lib/FormDisplay.tpl.php:187 setup/lib/messages.inc.php:234
+msgid "Restore default value"
+msgstr ""
+
+#: setup/lib/form_processing.lib.php:43 setup/lib/messages.inc.php:377
+msgid "Warning"
+msgstr ""
+
 #: setup/lib/messages.inc.php:16
 msgid "Allow character set conversion"
 msgstr ""
@@ -7132,10 +7225,6 @@ msgstr ""
 msgid "Compress on the fly"
 msgstr ""
 
-#: setup/lib/messages.inc.php:45
-msgid "Configuration file"
-msgstr ""
-
 #: setup/lib/messages.inc.php:46
 msgid ""
 "Whether a warning ("Are your really sure...") should be displayed "
@@ -7154,14 +7243,6 @@ msgstr ""
 msgid "Default character set"
 msgstr ""
 
-#: setup/lib/messages.inc.php:50
-msgid "Default language"
-msgstr ""
-
-#: setup/lib/messages.inc.php:51
-msgid "Default server"
-msgstr ""
-
 #: setup/lib/messages.inc.php:52
 msgid "Tab that is displayed when entering a database"
 msgstr ""
@@ -7200,10 +7281,6 @@ msgstr ""
 msgid "Display databases as a list"
 msgstr ""
 
-#: setup/lib/messages.inc.php:61
-msgid "Display"
-msgstr ""
-
 #: setup/lib/messages.inc.php:62
 msgid "Show server listing as a list instead of a drop down"
 msgstr ""
@@ -7212,18 +7289,6 @@ msgstr ""
 msgid "Display servers as a list"
 msgstr ""
 
-#: setup/lib/messages.inc.php:64
-msgid "Donate"
-msgstr ""
-
-#: setup/lib/messages.inc.php:65
-msgid "Download"
-msgstr ""
-
-#: setup/lib/messages.inc.php:66
-msgid "End of line"
-msgstr ""
-
 #: setup/lib/messages.inc.php:67
 msgid "Could not connect to MySQL server"
 msgstr ""
@@ -7396,10 +7461,6 @@ msgstr ""
 msgid "Customize appearance of the navigation frame"
 msgstr ""
 
-#: setup/lib/messages.inc.php:113
-msgid "Navigation frame"
-msgstr ""
-
 #: setup/lib/messages.inc.php:114
 msgid "Servers display options"
 msgstr ""
@@ -7408,10 +7469,6 @@ msgstr ""
 msgid "Tables display options"
 msgstr ""
 
-#: setup/lib/messages.inc.php:118
-msgid "Main frame"
-msgstr ""
-
 #: setup/lib/messages.inc.php:119
 msgid "Settings that didn't fit enywhere else"
 msgstr ""
@@ -7488,10 +7545,6 @@ msgstr ""
 msgid "Customize export options"
 msgstr ""
 
-#: setup/lib/messages.inc.php:137
-msgid "Features"
-msgstr ""
-
 #: setup/lib/messages.inc.php:138
 msgid "Customize import defaults"
 msgstr ""
@@ -7556,10 +7609,6 @@ msgid ""
 "system."
 msgstr ""
 
-#: setup/lib/messages.inc.php:152
-msgid "phpMyAdmin homepage"
-msgstr ""
-
 #: setup/lib/messages.inc.php:153
 msgid "Extra parameters for iconv"
 msgstr ""
@@ -7603,12 +7652,6 @@ msgstr ""
 msgid "Insecure connection"
 msgstr ""
 
-#: setup/lib/messages.inc.php:164
-msgid ""
-"You are not using a secure connection; all data (including potentially "
-"sensitive information, like passwords) is transferred unencrypted!"
-msgstr ""
-
 #: setup/lib/messages.inc.php:165
 #, php-format
 msgid ""
@@ -7704,10 +7747,6 @@ msgstr ""
 msgid "Enable highlighting"
 msgstr ""
 
-#: setup/lib/messages.inc.php:187
-msgid "let the user choose"
-msgstr ""
-
 #: setup/lib/messages.inc.php:188
 msgid "Use less graphically intense tabs"
 msgstr ""
@@ -7716,10 +7755,6 @@ msgstr ""
 msgid "Light tabs"
 msgstr ""
 
-#: setup/lib/messages.inc.php:190
-msgid "Load"
-msgstr ""
-
 #: setup/lib/messages.inc.php:191
 msgid ""
 "If TRUE, logout deletes cookies for all servers; when set to FALSE, logout "
@@ -7821,14 +7856,6 @@ msgstr ""
 msgid "Iconic navigation bar"
 msgstr ""
 
-#: setup/lib/messages.inc.php:212
-msgid "New server"
-msgstr ""
-
-#: setup/lib/messages.inc.php:213
-msgid "There are no configured servers"
-msgstr ""
-
 #: setup/lib/messages.inc.php:214
 msgid "use GZip output buffering for increased speed in HTTP transfers"
 msgstr ""
@@ -7837,10 +7864,6 @@ msgstr ""
 msgid "GZip output buffering"
 msgstr ""
 
-#: setup/lib/messages.inc.php:216
-msgid "- none -"
-msgstr ""
-
 #: setup/lib/messages.inc.php:217
 msgid ""
 "[kbd]SMART[/kbd] - i.e. descending order for fields of type TIME, DATE, "
@@ -7851,10 +7874,6 @@ msgstr ""
 msgid "Default sorting order"
 msgstr ""
 
-#: setup/lib/messages.inc.php:219
-msgid "Overview"
-msgstr ""
-
 #: setup/lib/messages.inc.php:220
 msgid "Use persistent connections to MySQL databases"
 msgstr ""
@@ -7909,10 +7928,6 @@ msgstr ""
 msgid "Recoding engine"
 msgstr ""
 
-#: setup/lib/messages.inc.php:234
-msgid "Restore default value"
-msgstr ""
-
 #: setup/lib/messages.inc.php:235
 msgid "Try to revert erroneous fields to their default values"
 msgstr ""
@@ -7943,10 +7958,6 @@ msgstr ""
 msgid "You allow for connecting to the server without a password."
 msgstr ""
 
-#: setup/lib/messages.inc.php:241
-msgid "Add a new server"
-msgstr ""
-
 #: setup/lib/messages.inc.php:242
 msgid "Leave blank if not used"
 msgstr ""
@@ -8087,10 +8098,6 @@ msgid ""
 "to."
 msgstr ""
 
-#: setup/lib/messages.inc.php:272
-msgid "Edit server"
-msgstr ""
-
 #: setup/lib/messages.inc.php:273
 msgid "What PHP extension to use; you should use mysqli if supported"
 msgstr ""
@@ -8336,11 +8343,6 @@ msgstr ""
 msgid "Verbose name of this server"
 msgstr ""
 
-#: setup/lib/messages.inc.php:328
-#, php-format
-msgid "Set value: %s"
-msgstr ""
-
 #: setup/lib/messages.inc.php:329
 msgid ""
 "Whether a user should be displayed a "show all (records)" button"
@@ -8377,10 +8379,6 @@ msgstr ""
 msgid "Show function fields"
 msgstr ""
 
-#: setup/lib/messages.inc.php:337
-msgid "Show hidden messages (#MSG_COUNT)"
-msgstr ""
-
 #: setup/lib/messages.inc.php:338
 msgid ""
 "Shows link to [a at http://php.net/manual/function.phpinfo.php]phpinfo()[/a] "
@@ -8509,10 +8507,6 @@ msgstr ""
 msgid "Got invalid version string from server"
 msgstr ""
 
-#: setup/lib/messages.inc.php:370
-msgid "Check for latest version"
-msgstr ""
-
 #: setup/lib/messages.inc.php:371
 #, php-format
 msgid ""
@@ -8544,10 +8538,6 @@ msgid ""
 "Neither URL wrapper nor CURL is available. Version check is not possible."
 msgstr ""
 
-#: setup/lib/messages.inc.php:377
-msgid "Warning"
-msgstr ""
-
 #: setup/lib/messages.inc.php:378
 msgid ""
 "Enable [a at http://en.wikipedia.org/wiki/ZIP_(file_format)]ZIP[/a] compression "
@@ -8609,6 +8599,19 @@ msgid "Description"
 msgstr "Apisańnie"
 
 #, fuzzy
+#~| msgid ""
+#~| "However on last run no data has been parsed, this usually means "
+#~| "phpMyAdmin won't be able to finish this import unless you increase php "
+#~| "time limits."
+#~ msgid ""
+#~ "However on last run no data has been parsed, this usually means "
+#~ "phpMyAdmin won"
+#~ msgstr ""
+#~ "Adnak, padčas apošniaha vykanańnia nijakija dadzienyja byli apracavanyja. "
+#~ "Heta zvyčajna značyć, što phpMyAdmin nia zmoža skončyć hetaje "
+#~ "impartavańnia, kali vy nie pavialičycie limity vykanańnia php-skryptoŭ."
+
+#, fuzzy
 #~| msgid "None"
 #~ msgctxt "None action"
 #~ msgid "None"
diff --git a/po/bg.po b/po/bg.po
index 5841877..fee88a3 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-14 07:48-0400\n"
+"POT-Creation-Date: 2010-05-14 13:39-0400\n"
 "PO-Revision-Date: 2010-03-12 09:12+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: bulgarian <bg at li.org>\n"
@@ -944,10 +944,10 @@ msgid ""
 "file and import will resume."
 msgstr ""
 
-#: import.php:426
+#: import.php:426 libraries/messages.inc.php:1102
 msgid ""
 "However on last run no data has been parsed, this usually means phpMyAdmin "
-"won"
+"won't be able to finish this import unless you increase php time limits."
 msgstr ""
 
 #: index.php:190 libraries/messages.inc.php:549
@@ -6237,12 +6237,6 @@ msgstr "Нишки"
 msgid "Thread %s was successfully killed."
 msgstr "Нишка %s беше успешно отстранена."
 
-#: libraries/messages.inc.php:1102
-msgid ""
-"However on last run no data has been parsed, this usually means phpMyAdmin "
-"won't be able to finish this import unless you increase php time limits."
-msgstr ""
-
 #: libraries/messages.inc.php:1105 pmd_pdf.php:94
 msgid "to/from page"
 msgstr ""
@@ -6706,7 +6700,8 @@ msgstr "Няма"
 msgid "Filter"
 msgstr ""
 
-#: navigation.php:319 setup/lib/messages.inc.php:42
+#: navigation.php:319 setup/frames/index.inc.php:218
+#: setup/lib/messages.inc.php:42
 #, fuzzy
 msgid "Clear"
 msgstr "Календар"
@@ -6794,6 +6789,115 @@ msgstr "Максимален брой на едновременните коне
 msgid "Configuration: %s"
 msgstr ""
 
+#: setup/frames/config.inc.php:25 setup/frames/index.inc.php:152
+#: setup/lib/messages.inc.php:45
+msgid "Configuration file"
+msgstr ""
+
+#: setup/frames/config.inc.php:38 setup/frames/index.inc.php:212
+#: setup/lib/messages.inc.php:65
+msgid "Download"
+msgstr ""
+
+#: setup/frames/index.inc.php:58 setup/lib/messages.inc.php:164
+msgid ""
+"You are not using a secure connection; all data (including potentially "
+"sensitive information, like passwords) is transferred unencrypted!"
+msgstr ""
+
+#: setup/frames/index.inc.php:87 setup/frames/menu.inc.php:17
+#: setup/lib/messages.inc.php:219
+msgid "Overview"
+msgstr ""
+
+#: setup/frames/index.inc.php:95 setup/lib/messages.inc.php:337
+msgid "Show hidden messages (#MSG_COUNT)"
+msgstr ""
+
+#: setup/frames/index.inc.php:135 setup/lib/messages.inc.php:213
+msgid "There are no configured servers"
+msgstr ""
+
+#: setup/frames/index.inc.php:143 setup/lib/messages.inc.php:212
+msgid "New server"
+msgstr ""
+
+#: setup/frames/index.inc.php:172 setup/lib/messages.inc.php:50
+msgid "Default language"
+msgstr ""
+
+#: setup/frames/index.inc.php:182 setup/lib/messages.inc.php:187
+msgid "let the user choose"
+msgstr ""
+
+#: setup/frames/index.inc.php:193 setup/lib/messages.inc.php:216
+msgid "- none -"
+msgstr ""
+
+#: setup/frames/index.inc.php:196 setup/lib/messages.inc.php:51
+msgid "Default server"
+msgstr ""
+
+#: setup/frames/index.inc.php:206 setup/lib/messages.inc.php:66
+msgid "End of line"
+msgstr ""
+
+#: setup/frames/index.inc.php:211 setup/lib/messages.inc.php:61
+msgid "Display"
+msgstr ""
+
+#: setup/frames/index.inc.php:215 setup/lib/messages.inc.php:190
+#, fuzzy
+msgid "Load"
+msgstr "Локален"
+
+#: setup/frames/index.inc.php:226 setup/lib/messages.inc.php:152
+#, fuzzy
+msgid "phpMyAdmin homepage"
+msgstr "phpMyAdmin документация"
+
+#: setup/frames/index.inc.php:227 setup/lib/messages.inc.php:64
+msgid "Donate"
+msgstr ""
+
+#: setup/frames/index.inc.php:228 setup/lib/messages.inc.php:370
+msgid "Check for latest version"
+msgstr ""
+
+#: setup/frames/menu.inc.php:18 setup/lib/messages.inc.php:137
+msgid "Features"
+msgstr ""
+
+#: setup/frames/menu.inc.php:19 setup/lib/messages.inc.php:113
+msgid "Navigation frame"
+msgstr ""
+
+#: setup/frames/menu.inc.php:20 setup/lib/messages.inc.php:118
+msgid "Main frame"
+msgstr ""
+
+#: setup/frames/servers.inc.php:28 setup/lib/messages.inc.php:272
+msgid "Edit server"
+msgstr ""
+
+#: setup/frames/servers.inc.php:37 setup/lib/messages.inc.php:241
+#, fuzzy
+msgid "Add a new server"
+msgstr "Добавяне на нов потребител."
+
+#: setup/lib/FormDisplay.tpl.php:182 setup/lib/messages.inc.php:328
+#, php-format
+msgid "Set value: %s"
+msgstr ""
+
+#: setup/lib/FormDisplay.tpl.php:187 setup/lib/messages.inc.php:234
+msgid "Restore default value"
+msgstr ""
+
+#: setup/lib/form_processing.lib.php:43 setup/lib/messages.inc.php:377
+msgid "Warning"
+msgstr ""
+
 #: setup/lib/messages.inc.php:16
 msgid "Allow character set conversion"
 msgstr ""
@@ -6933,10 +7037,6 @@ msgstr ""
 msgid "Compress on the fly"
 msgstr ""
 
-#: setup/lib/messages.inc.php:45
-msgid "Configuration file"
-msgstr ""
-
 #: setup/lib/messages.inc.php:46
 msgid ""
 "Whether a warning ("Are your really sure...") should be displayed "
@@ -6955,14 +7055,6 @@ msgstr ""
 msgid "Default character set"
 msgstr ""
 
-#: setup/lib/messages.inc.php:50
-msgid "Default language"
-msgstr ""
-
-#: setup/lib/messages.inc.php:51
-msgid "Default server"
-msgstr ""
-
 #: setup/lib/messages.inc.php:52
 msgid "Tab that is displayed when entering a database"
 msgstr ""
@@ -7002,10 +7094,6 @@ msgstr ""
 msgid "Display databases as a list"
 msgstr ""
 
-#: setup/lib/messages.inc.php:61
-msgid "Display"
-msgstr ""
-
 #: setup/lib/messages.inc.php:62
 msgid "Show server listing as a list instead of a drop down"
 msgstr ""
@@ -7014,18 +7102,6 @@ msgstr ""
 msgid "Display servers as a list"
 msgstr ""
 
-#: setup/lib/messages.inc.php:64
-msgid "Donate"
-msgstr ""
-
-#: setup/lib/messages.inc.php:65
-msgid "Download"
-msgstr ""
-
-#: setup/lib/messages.inc.php:66
-msgid "End of line"
-msgstr ""
-
 #: setup/lib/messages.inc.php:67
 msgid "Could not connect to MySQL server"
 msgstr ""
@@ -7205,10 +7281,6 @@ msgstr "Опции за експортиране на база от данни"
 msgid "Customize appearance of the navigation frame"
 msgstr ""
 
-#: setup/lib/messages.inc.php:113
-msgid "Navigation frame"
-msgstr ""
-
 #: setup/lib/messages.inc.php:114
 msgid "Servers display options"
 msgstr ""
@@ -7217,10 +7289,6 @@ msgstr ""
 msgid "Tables display options"
 msgstr ""
 
-#: setup/lib/messages.inc.php:118
-msgid "Main frame"
-msgstr ""
-
 #: setup/lib/messages.inc.php:119
 msgid "Settings that didn't fit enywhere else"
 msgstr ""
@@ -7298,10 +7366,6 @@ msgstr ""
 msgid "Customize export options"
 msgstr "Опции за експортиране на база от данни"
 
-#: setup/lib/messages.inc.php:137
-msgid "Features"
-msgstr ""
-
 #: setup/lib/messages.inc.php:138
 msgid "Customize import defaults"
 msgstr ""
@@ -7370,11 +7434,6 @@ msgid ""
 "system."
 msgstr ""
 
-#: setup/lib/messages.inc.php:152
-#, fuzzy
-msgid "phpMyAdmin homepage"
-msgstr "phpMyAdmin документация"
-
 #: setup/lib/messages.inc.php:153
 msgid "Extra parameters for iconv"
 msgstr ""
@@ -7418,12 +7477,6 @@ msgstr ""
 msgid "Insecure connection"
 msgstr ""
 
-#: setup/lib/messages.inc.php:164
-msgid ""
-"You are not using a secure connection; all data (including potentially "
-"sensitive information, like passwords) is transferred unencrypted!"
-msgstr ""
-
 #: setup/lib/messages.inc.php:165
 #, php-format
 msgid ""
@@ -7521,10 +7574,6 @@ msgstr ""
 msgid "Enable highlighting"
 msgstr ""
 
-#: setup/lib/messages.inc.php:187
-msgid "let the user choose"
-msgstr ""
-
 #: setup/lib/messages.inc.php:188
 msgid "Use less graphically intense tabs"
 msgstr ""
@@ -7533,11 +7582,6 @@ msgstr ""
 msgid "Light tabs"
 msgstr ""
 
-#: setup/lib/messages.inc.php:190
-#, fuzzy
-msgid "Load"
-msgstr "Локален"
-
 #: setup/lib/messages.inc.php:191
 msgid ""
 "If TRUE, logout deletes cookies for all servers; when set to FALSE, logout "
@@ -7640,14 +7684,6 @@ msgstr ""
 msgid "Iconic navigation bar"
 msgstr ""
 
-#: setup/lib/messages.inc.php:212
-msgid "New server"
-msgstr ""
-
-#: setup/lib/messages.inc.php:213
-msgid "There are no configured servers"
-msgstr ""
-
 #: setup/lib/messages.inc.php:214
 msgid "use GZip output buffering for increased speed in HTTP transfers"
 msgstr ""
@@ -7656,10 +7692,6 @@ msgstr ""
 msgid "GZip output buffering"
 msgstr ""
 
-#: setup/lib/messages.inc.php:216
-msgid "- none -"
-msgstr ""
-
 #: setup/lib/messages.inc.php:217
 msgid ""
 "[kbd]SMART[/kbd] - i.e. descending order for fields of type TIME, DATE, "
@@ -7670,10 +7702,6 @@ msgstr ""
 msgid "Default sorting order"
 msgstr ""
 
-#: setup/lib/messages.inc.php:219
-msgid "Overview"
-msgstr ""
-
 #: setup/lib/messages.inc.php:220
 msgid "Use persistent connections to MySQL databases"
 msgstr ""
@@ -7728,10 +7756,6 @@ msgstr ""
 msgid "Recoding engine"
 msgstr ""
 
-#: setup/lib/messages.inc.php:234
-msgid "Restore default value"
-msgstr ""
-
 #: setup/lib/messages.inc.php:235
 msgid "Try to revert erroneous fields to their default values"
 msgstr ""
@@ -
7762,11 +7786,6 @@ msgstr ""
 msgid "You allow for connecting to the server without a password."
 msgstr ""
 
-#: setup/lib/messages.inc.php:241
-#, fuzzy
-msgid "Add a new server"
-msgstr "Добавяне на нов потребител."
-
 #: setup/lib/messages.inc.php:242
 msgid "Leave blank if not used"
 msgstr ""
@@ -7910,10 +7929,6 @@ msgid ""
 "to."
 msgstr ""
 
-#: setup/lib/messages.inc.php:272
-msgid "Edit server"
-msgstr ""
-
 #: setup/lib/messages.inc.php:273
 msgid "What PHP extension to use; you should use mysqli if supported"
 msgstr ""
@@ -8164,11 +8179,6 @@ msgstr ""
 msgid "Verbose name of this server"
 msgstr ""
 
-#: setup/lib/messages.inc.php:328
-#, php-format
-msgid "Set value: %s"
-msgstr ""
-
 #: setup/lib/messages.inc.php:329
 msgid ""
 "Whether a user should be displayed a "show all (records)" button"
@@ -8206,10 +8216,6 @@ msgstr ""
 msgid "Show function fields"
 msgstr ""
 
-#: setup/lib/messages.inc.php:337
-msgid "Show hidden messages (#MSG_COUNT)"
-msgstr ""
-
 #: setup/lib/messages.inc.php:338
 msgid ""
 "Shows link to [a at http://php.net/manual/function.phpinfo.php]phpinfo()[/a] "
@@ -8342,10 +8348,6 @@ msgstr ""
 msgid "Got invalid version string from server"
 msgstr ""
 
-#: setup/lib/messages.inc.php:370
-msgid "Check for latest version"
-msgstr ""
-
 #: setup/lib/messages.inc.php:371
 #, php-format
 msgid ""
@@ -8377,10 +8379,6 @@ msgid ""
 "Neither URL wrapper nor CURL is available. Version check is not possible."
 msgstr ""
 
-#: setup/lib/messages.inc.php:377
-msgid "Warning"
-msgstr ""
-
 #: setup/lib/messages.inc.php:378
 msgid ""
 "Enable [a at http://en.wikipedia.org/wiki/ZIP_(file_format)]ZIP[/a] compression "
diff --git a/po/bn.po b/po/bn.po
index b33bda5..a6d97ff 100644
--- a/po/bn.po
+++ b/po/bn.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-14 07:48-0400\n"
+"POT-Creation-Date: 2010-05-14 13:39-0400\n"
 "PO-Revision-Date: 2010-03-12 09:11+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: bangla <bn at li.org>\n"
@@ -951,15 +951,10 @@ msgstr ""
 "Script timeout passed, if you want to finish import, please resubmit same "
 "file and import will resume."
 
-#: import.php:426
-#, fuzzy
-#| msgid ""
-#| "However on last run no data has been parsed, this usually means "
-#| "phpMyAdmin won't be able to finish this import unless you increase php "
-#| "time limits."
+#: import.php:426 libraries/messages.inc.php:1102
 msgid ""
 "However on last run no data has been parsed, this usually means phpMyAdmin "
-"won"
+"won't be able to finish this import unless you increase php time limits."
 msgstr ""
 "However on last run no data has been parsed, this usually means phpMyAdmin "
 "won't be able to finish this import unless you increase php time limits."
@@ -6376,14 +6371,6 @@ msgstr "Threads"
 msgid "Thread %s was successfully killed."
 msgstr "Thread %s was successfully killed."
 
-#: libraries/messages.inc.php:1102
-msgid ""
-"However on last run no data has been parsed, this usually means phpMyAdmin "
-"won't be able to finish this import unless you increase php time limits."
-msgstr ""
-"However on last run no data has been parsed, this usually means phpMyAdmin "
-"won't be able to finish this import unless you increase php time limits."
-
 #: libraries/messages.inc.php:1105 pmd_pdf.php:94
 msgid "to/from page"
 msgstr ""
@@ -6853,7 +6840,8 @@ msgstr "কোনটিই নয়"
 msgid "Filter"
 msgstr "ক্ষেত্রসমূহ"
 
-#: navigation.php:319 setup/lib/messages.inc.php:42
+#: navigation.php:319 setup/frames/index.inc.php:218
+#: setup/lib/messages.inc.php:42
 #, fuzzy
 msgid "Clear"
 msgstr "ক্যালেন্ডার"
@@ -6941,6 +6929,116 @@ msgstr "max. concurrent connections"
 msgid "Configuration: %s"
 msgstr ""
 
+#: setup/frames/config.inc.php:25 setup/frames/index.inc.php:152
+#: setup/lib/messages.inc.php:45
+msgid "Configuration file"
+msgstr ""
+
+#: setup/frames/config.inc.php:38 setup/frames/index.inc.php:212
+#: setup/lib/messages.inc.php:65
+msgid "Download"
+msgstr ""
+
+#: setup/frames/index.inc.php:58 setup/lib/messages.inc.php:164
+msgid ""
+"You are not using a secure connection; all data (including potentially "
+"sensitive information, like passwords) is transferred unencrypted!"
+msgstr ""
+
+#: setup/frames/index.inc.php:87 setup/frames/menu.inc.php:17
+#: setup/lib/messages.inc.php:219
+msgid "Overview"
+msgstr ""
+
+#: setup/frames/index.inc.php:95 setup/lib/messages.inc.php:337
+msgid "Show hidden messages (#MSG_COUNT)"
+msgstr ""
+
+#: setup/frames/index.inc.php:135 setup/lib/messages.inc.php:213
+msgid "There are no configured servers"
+msgstr ""
+
+#: setup/frames/index.inc.php:143 setup/lib/messages.inc.php:212
+msgid "New server"
+msgstr ""
+
+#: setup/frames/index.inc.php:172 setup/lib/messages.inc.php:50
+msgid "Default language"
+msgstr ""
+
+#: setup/frames/index.inc.php:182 setup/lib/messages.inc.php:187
+msgid "let the user choose"
+msgstr ""
+
+#: setup/frames/index.inc.php:193 setup/lib/messages.inc.php:216
+msgid "- none -"
+msgstr ""
+
+#: setup/frames/index.inc.php:196 setup/lib/messages.inc.php:51
+msgid "Default server"
+msgstr ""
+
+#: setup/frames/index.inc.php:206 setup/lib/messages.inc.php:66
+msgid "End of line"
+msgstr ""
+
+#: setup/frames/index.inc.php:211 setup/lib/messages.inc.php:61
+msgid "Display"
+msgstr ""
+
+#: setup/frames/index.inc.php:215 setup/lib/messages.inc.php:190
+#, fuzzy
+msgid "Load"
+msgstr "লোকাল"
+
+#: setup/frames/index.inc.php:226 setup/lib/messages.inc.php:152
+#, fuzzy
+msgid "phpMyAdmin homepage"
+msgstr "phpMyAdmin documentation"
+
+#: setup/frames/index.inc.php:227 setup/lib/messages.inc.php:64
+#, fuzzy
+msgid "Donate"
+msgstr "ডাটা"
+
+#: setup/frames/index.inc.php:228 setup/lib/messages.inc.php:370
+msgid "Check for latest version"
+msgstr ""
+
+#: setup/frames/menu.inc.php:18 setup/lib/messages.inc.php:137
+msgid "Features"
+msgstr ""
+
+#: setup/frames/menu.inc.php:19 setup/lib/messages.inc.php:113
+msgid "Navigation frame"
+msgstr ""
+
+#: setup/frames/menu.inc.php:20 setup/lib/messages.inc.php:118
+msgid "Main frame"
+msgstr ""
+
+#: setup/frames/servers.inc.php:28 setup/lib/messages.inc.php:272
+msgid "Edit server"
+msgstr ""
+
+#: setup/frames/servers.inc.php:37 setup/lib/messages.inc.php:241
+#, fuzzy
+msgid "Add a new server"
+msgstr "একটি নতুন ইউজার যোগ করুন"
+
+#: setup/lib/FormDisplay.tpl.php:182 setup/lib/messages.inc.php:328
+#, php-format
+msgid "Set value: %s"
+msgstr ""
+
+#: setup/lib/FormDisplay.tpl.php:187 setup/lib/messages.inc.php:234
+msgid "Restore default value"
+msgstr ""
+
+#: setup/lib/form_processing.lib.php:43 setup/lib/messages.inc.php:377
+msgid "Warning"
+msgstr ""
+
 #: setup/lib/messages.inc.php:16
 msgid "Allow character set conversion"
 msgstr ""
@@ -7080,10 +7178,6 @@ msgstr ""
 msgid "Compress on the fly"
 msgstr ""
 
-#: setup/lib/messages.inc.php:45
-msgid "Configuration file"
-msgstr ""
-
 #: setup/lib/messages.inc.php:46
 msgid ""
 "Whether a warning ("Are your really sure...") should be displayed "
@@ -7102,14 +7196,6 @@ msgstr ""
 msgid "Default character set"
 msgstr ""
 
-#: setup/lib/messages.inc.php:50
-msgid "Default language"
-msgstr ""
-
-#: setup/lib/messages.inc.php:51
-msgid "Default server"
-msgstr ""
-
 #: setup/lib/messages.inc.php:52
 msgid "Tab that is displayed when entering a database"
 msgstr ""
@@ -7151,10 +7237,6 @@ msgstr ""
 msgid "Display databases as a list"
 msgstr ""
 
-#: setup/lib/messages.inc.php:61
-msgid "Display"
-msgstr ""
-
 #: setup/lib/messages.inc.php:62
 msgid "Show server listing as a list instead of a drop down"
 msgstr ""
@@ -7163,19 +7245,6 @@ msgstr ""
 msgid "Display servers as a list"
 msgstr ""
 
-#: setup/lib/messages.inc.php:64
-#, fuzzy
-msgid "Donate"
-msgstr "ডাটা"
-
-#: setup/lib/messages.inc.php:65
-msgid "Download"
-msgstr ""
-
-#: setup/lib/messages.inc.php:66
-msgid "End of line"
-msgstr ""
-
 #: setup/lib/messages.inc.php:67
 msgid "Could not connect to MySQL server"
 msgstr ""
@@ -7357,10 +7426,6 @@ msgstr "ডাটাবেজ এক্সপোটঁ করার সুবি
 msgid "Customize appearance of the navigation frame"
 msgstr ""
 
-#: setup/lib/messages.inc.php:113
-msgid "Navigation frame"
-msgstr ""
-
 #: setup/lib/messages.inc.php:114
 #, fuzzy
 msgid "Servers display options"
@@ -7371,10 +7436,6 @@ msgstr "ডাটাবেজ এক্সপোটঁ করার সুবি
 msgid "Tables display options"
 msgstr "ডাটাবেজ এক্সপোটঁ করার সুবিধাসমূহ"
 
-#: setup/lib/messages.inc.php:118
-msgid "Main frame"
-msgstr ""
-
 #: setup/lib/messages.inc.php:119
 msgid "Settings that didn't fit enywhere else"
 msgstr ""
@@ -7453,10 +7514,6 @@ msgstr ""
 msgid "Customize export options"
 msgstr "ডাটাবেজ এক্সপোটঁ করার সুবিধাসমূহ"
 
-#: setup/lib/messages.inc.php:137
-msgid "Features"
-msgstr ""
-
 #: setup/lib/messages.inc.php:138
 #, fuzzy
 msgid "Customize import defaults"
@@ -7526,11 +7583,6 @@ msgid ""
 "system."
 msgstr ""
 
-#: setup/lib/messages.inc.php:152
-#, fuzzy
-msgid "phpMyAdmin homepage"
-msgstr "phpMyAdmin documentation"
-
 #: setup/lib/messages.inc.php:153
 msgid "Extra parameters for iconv"
 msgstr ""
@@ -7578,12 +7630,6 @@ msgstr ""
 msgid "Insecure connection"
 msgstr ""
 
-#: setup/lib/messages.inc.php:164
-msgid ""
-"You are not using a secure connection; all data (including potentially "
-"sensitive information, like passwords) is transferred unencrypted!"
-msgstr ""
-
 #: setup/lib/messages.inc.php:165
 #, php-format
 msgid ""
@@ -7682,10 +7728,6 @@ msgstr ""
 msgid "Enable highlighting"
 msgstr ""
 
-#: setup/lib/messages.inc.php:187
-msgid "let the user choose"
-msgstr ""
-
 #: setup/lib/messages.inc.php:188
 msgid "Use less graphically intense tabs"
 msgstr ""
@@ -7694,11 +7736,6 @@ msgstr ""
 msgid "Light tabs"
 msgstr ""
 
-#: setup/lib/messages.inc.php:190
-#, fuzzy
-msgid "Load"
-msgstr "লোকাল"
-
 #: setup/lib/messages.inc.php:191
 msgid ""
 "If TRUE, logout deletes cookies for all servers; when set to FALSE, logout "
@@ -7802,14 +7839,6 @@ msgstr ""
 msgid "Iconic navigation bar"
 msgstr ""
 
-#: setup/lib/messages.inc.php:212
-msgid "New server"
-msgstr ""
-
-#: setup/lib/messages.inc.php:213
-msgid "There are no configured servers"
-msgstr ""
-
 #: setup/lib/messages.inc.php:214
 msgid "use GZip output buffering for increased speed in HTTP transfers"
 msgstr ""
@@ -7818,10 +7847,6 @@ msgstr ""
 msgid "GZip output buffering"
 msgstr ""
 
-#: setup/lib/messages.inc.php:216
-msgid "- none -"
-msgstr ""
-
 #: setup/lib/messages.inc.php:217
 msgid ""
 "[kbd]SMART[/kbd] - i.e. descending order for fields of type TIME, DATE, "
@@ -7832,10 +7857,6 @@ msgstr ""
 msgid "Default sorting order"
 msgstr ""
 
-#: setup/lib/messages.inc.php:219
-msgid "Overview"
-msgstr ""
-
 #: setup/lib/messages.inc.php:220
 msgid "Use persistent connections to MySQL databases"
 msgstr ""
@@ -7890,10 +7911,6 @@ msgstr ""
 msgid "Recoding engine"
 msgstr ""
 
-#: setup/lib/messages.inc.php:234
-msgid "Restore default value"
-msgstr ""
-
 #: setup/lib/messages.inc.php:235
 msgid "Try to revert erroneous fields to their default values"
 msgstr ""
@@ -7925,11 +7942,6 @@ msgstr ""
 msgid "You allow for connecting to the server without a password."
 msgstr ""
 
-#: setup/lib/messages.inc.php:241
-#, fuzzy
-msgid "Add a new server"
-msgstr "একটি নতুন ইউজার যোগ করুন"
-
 #: setup/lib/messages.inc.php:242
 msgid "Leave blank if not used"
 msgstr ""
@@ -8073,10 +8085,6 @@ msgid ""
 "to."
 msgstr ""
 
-#: setup/lib/messages.inc.php:272
-msgid "Edit server"
-msgstr ""
-
 #: setup/lib/messages.inc.php:273
 msgid "What PHP extension to use; you should use mysqli if supported"
 msgstr ""
@@ -8328,11 +8336,6 @@ msgstr ""
 msgid "Verbose name of this server"
 msgstr ""
 
-#: setup/lib/messages.inc.php:328
-#, php-format
-msgid "Set value: %s"
-msgstr ""
-
 #: setup/lib/messages.inc.php:329
 msgid ""
 "Whether a user should be displayed a "show all (records)" button"
@@ -8370,10 +8373,6 @@ msgstr ""
 msgid "Show function fields"
 msgstr ""
 
-#: setup/lib/messages.inc.php:337
-msgid "Show hidden messages (#MSG_COUNT)"
-msgstr ""
-
 #: setup/lib/messages.inc.php:338
 msgid ""
 "Shows link to [a at http://php.net/manual/function.phpinfo.php]phpinfo()[/a] "
@@ -8507,10 +8506,6 @@ msgstr ""
 msgid "Got invalid version string from server"
 msgstr ""
 
-#: setup/lib/messages.inc.php:370
-msgid "Check for latest version"
-msgstr ""
-
 #: setup/lib/messages.inc.php:371
 #, php-format
 msgid ""
@@ -8542,10 +8537,6 @@ msgid ""
 "Neither URL wrapper nor CURL is available. Version check is not possible."
 msgstr ""
 
-#: setup/lib/messages.inc.php:377
-msgid "Warning"
-msgstr ""
-
 #: setup/lib/messages.inc.php:378
 msgid ""
 "Enable [a at http://en.wikipedia.org/wiki/ZIP_(file_format)]ZIP[/a] compression "
@@ -8607,6 +8598,19 @@ msgid "Description"
 msgstr "বর্ণনা"
 
 #, fuzzy
+#~| msgid ""
+#~| "However on last run no data has been parsed, this usually means "
+#~| "phpMyAdmin won't be able to finish this import unless you increase php "
+#~| "time limits."
+#~ msgid ""
+#~ "However on last run no data has been parsed, this usually means "
+#~ "phpMyAdmin won"
+#~ msgstr ""
+#~ "However on last run no data has been parsed, this usually means "
+#~ "phpMyAdmin won't be able to finish this import unless you increase php "
+#~ "time limits."
+
+#, fuzzy
 #~| msgid "None"
 #~ msgctxt "None action"
 #~ msgid "None"
diff --git a/po/bs.po b/po/bs.po
index b6c7cb4..9129814 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-14 07:48-0400\n"
+"POT-Creation-Date: 2010-05-14 13:39-0400\n"
 "PO-Revision-Date: 2010-03-12 09:12+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: bosnian <bs at li.org>\n"
@@ -945,10 +945,10 @@ msgid ""
 "file and import will resume."
 msgstr ""
 
-#: import.php:426
+#: import.php:426 libraries/messages.inc.php:1102
 msgid ""
 "However on last run no data has been parsed, this usually means phpMyAdmin "
-"won"
+"won't be able to finish this import unless you increase php time limits."
 msgstr ""
 
 #: index.php:190 libraries/messages.inc.php:549
@@ -6205,12 +6205,6 @@ msgstr ""
 msgid "Thread %s was successfully killed."
 msgstr "Proces %s je uspješno prekinut."
 
-#: libraries/messages.inc.php:1102
-msgid ""
-"However on last run no data has been parsed, this usually means phpMyAdmin "
-"won't be able to finish this import unless you increase php time limits."
-msgstr ""
-
 #: libraries/messages.inc.php:1105 pmd_pdf.php:94
 msgid "to/from page"
 msgstr ""
@@ -6665,7 +6659,8 @@ msgstr "nema"
 msgid "Filter"
 msgstr ""
 
-#: navigation.php:319 setup/lib/messages.inc.php:42
+#: navigation.php:319 setup/frames/index.inc.php:218
+#: setup/lib/messages.inc.php:42
 msgid "Clear"
 msgstr ""
 
@@ -6752,6 +6747,115 @@ msgstr "Konekcije"
 msgid "Configuration: %s"
 msgstr ""
 
+#: setup/frames/config.inc.php:25 setup/frames/index.inc.php:152
+#: setup/lib/messages.inc.php:45
+msgid "Configuration file"
+msgstr ""
+
+#: setup/frames/config.inc.php:38 setup/frames/index.inc.php:212
+#: setup/lib/messages.inc.php:65
+msgid "Download"
+msgstr ""
+
+#: setup/frames/index.inc.php:58 setup/lib/messages.inc.php:164
+msgid ""
+"You are not using a secure connection; all data (including potentially "
+"sensitive information, like passwords) is transferred unencrypted!"
+msgstr ""
+
+#: setup/frames/index.inc.php:87 setup/frames/menu.inc.php:17
+#: setup/lib/messages.inc.php:219
+msgid "Overview"
+msgstr ""
+
+#: setup/frames/index.inc.php:95 setup/lib/messages.inc.php:337
+msgid "Show hidden messages (#MSG_COUNT)"
+msgstr ""
+
+#: setup/frames/index.inc.php:135 setup/lib/messages.inc.php:213
+msgid "There are no configured servers"
+msgstr ""
+
+#: setup/frames/index.inc.php:143 setup/lib/messages.inc.php:212
+msgid "New server"
+msgstr ""
+
+#: setup/frames/index.inc.php:172 setup/lib/messages.inc.php:50
+msgid "Default language"
+msgstr ""
+
+#: setup/frames/index.inc.php:182 setup/lib/messages.inc.php:187
+msgid "let the user choose"
+msgstr ""
+
+#: setup/frames/index.inc.php:193 setup/lib/messages.inc.php:216
+msgid "- none -"
+msgstr ""
+
+#: setup/frames/index.inc.php:196 setup/lib/messages.inc.php:51
+msgid "Default server"
+msgstr ""
+
+#: setup/frames/index.inc.php:206 setup/lib/messages.inc.php:66
+msgid "End of line"
+msgstr ""
+
+#: setup/frames/index.inc.php:211 setup/lib/messages.inc.php:61
+msgid "Display"
+msgstr ""
+
+#: setup/frames/index.inc.php:215 setup/lib/messages.inc.php:190
+#, fuzzy
+msgid "Load"
+msgstr "Lokalni"
+
+#: setup/frames/index.inc.php:226 setup/lib/messages.inc.php:152
+#, fuzzy
+msgid "phpMyAdmin homepage"
+msgstr "phpMyAdmin dokumentacija"
+
+#: setup/frames/index.inc.php:227 setup/lib/messages.inc.php:64
+msgid "Donate"
+msgstr ""
+
+#: setup/frames/index.inc.php:228 setup/lib/messages.inc.php:370
+msgid "Check for latest version"
+msgstr ""
+
+#: setup/frames/menu.inc.php:18 setup/lib/messages.inc.php:137
+msgid "Features"
+msgstr ""
+
+#: setup/frames/menu.inc.php:19 setup/lib/messages.inc.php:113
+msgid "Navigation frame"
+msgstr ""
+
+#: setup/frames/menu.inc.php:20 setup/lib/messages.inc.php:118
+msgid "Main frame"
+msgstr ""
+
+#: setup/frames/servers.inc.php:28 setup/lib/messages.inc.php:272
+msgid "Edit server"
+msgstr ""
+
+#: setup/frames/servers.inc.php:37 setup/lib/messages.inc.php:241
+#, fuzzy
+msgid "Add a new server"
+msgstr "Dodaj novog korisnika"
+
+#: setup/lib/FormDisplay.tpl.php:182 setup/lib/messages.inc.php:328
+#, php-format
+msgid "Set value: %s"
+msgstr ""
+
+#: setup/lib/FormDisplay.tpl.php:187 setup/lib/messages.inc.php:234
+msgid "Restore default value"
+msgstr ""
+
+#: setup/lib/form_processing.lib.php:43 setup/lib/messages.inc.php:377
+msgid "Warning"
+msgstr ""
+
 #: setup/lib/messages.inc.php:16
 msgid "Allow character set conversion"
 msgstr ""
@@ -6891,10 +6995,6 @@ msgstr ""
 msgid "Compress on the fly"
 msgstr ""
 
-#: setup/lib/messages.inc.php:45
-msgid "Configuration file"
-msgstr ""
-
 #: setup/lib/messages.inc.php:46
 msgid ""
 "Whether a warning ("Are your really sure...") should be displayed "
@@ -6913,14 +7013,6 @@ msgstr ""
 msgid "Default character set"
 msgstr ""
 
-#: setup/lib/messages.inc.php:50
-msgid "Default language"
-msgstr ""
-
-#: setup/lib/messages.inc.php:51
-msgid "Default server"
-msgstr ""
-
 #: setup/lib/messages.inc.php:52
 msgid "Tab that is displayed when entering a database"
 msgstr ""
@@ -6959,10 +7051,6 @@ msgstr ""
 msgid "Display databases as a list"
 msgstr ""
 
-#: setup/lib/messages.inc.php:61
-msgid "Display"
-msgstr ""
-
 #: setup/lib/messages.inc.php:62
 msgid "Show server listing as a list instead of a drop down"
 msgstr ""
@@ -6971,18 +7059,6 @@ msgstr ""
 msgid "Display servers as a list"
 msgstr ""
 
-#: setup/lib/messages.inc.php:64
-msgid "Donate"
-msgstr ""
-
-#: setup/lib/messages.inc.php:65
-msgid "Download"
-msgstr ""
-
-#: setup/lib/messages.inc.php:66
-msgid "End of line"
-msgstr ""
-
 #: setup/lib/messages.inc.php:67
 msgid "Could not connect to MySQL server"
 msgstr ""
@@ -7162,10 +7238,6 @@ msgstr "Opcije za izvoz baze"
 msgid "Customize appearance of the navigation frame"
 msgstr ""
 
-#: setup/lib/messages.inc.php:113
-msgid "Navigation frame"
-msgstr ""
-
 #: setup/lib/messages.inc.php:114
 msgid "Servers display options"
 msgstr ""
@@ -7174,10 +7246,6 @@ msgstr ""
 msgid "Tables display options"
 msgstr ""
 
-#: setup/lib/messages.inc.php:118
-msgid "Main frame"
-msgstr ""
-
 #: setup/lib/messages.inc.php:119
 msgid "Settings that didn't fit enywhere else"
 msgstr ""
@@ -7255,10 +7323,6 @@ msgstr ""
 msgid "Customize export options"
 msgstr "Opcije za izvoz baze"
 
-#: setup/lib/messages.inc.php:137
-msgid "Features"
-msgstr ""
-
 #: setup/lib/messages.inc.php:138
 msgid "Customize import defaults"
 msgstr ""
@@ -7327,11 +7391,6 @@ msgid ""
 "system."
 msgstr ""
 
-#: setup/lib/messages.inc.php:152
-#, fuzzy
-msgid "phpMyAdmin homepage"
-msgstr "phpMyAdmin dokumentacija"
-
 #: setup/lib/messages.inc.php:153
 msgid "Extra parameters for iconv"
 msgstr ""
@@ -7375,12 +7434,6 @@ msgstr ""
 msgid "Insecure connection"
 msgstr ""
 
-#: setup/lib/messages.inc.php:164
-msgid ""
-"You are not using a secure connection; all data (including potentially "
-"sensitive information, like passwords) is transferred unencrypted!"
-msgstr ""
-
 #: setup/lib/messages.inc.php:165
 #, php-format
 msgid ""
@@ -7476,10 +7529,6 @@ msgstr ""
 msgid "Enable highlighting"
 msgstr ""
 
-#: setup/lib/messages.inc.php:187
-msgid "let the user choose"
-msgstr ""
-
 #: setup/lib/messages.inc.php:188
 msgid "Use less graphically intense tabs"
 msgstr ""
@@ -7488,11 +7537,6 @@ msgstr ""
 msgid "Light tabs"
 msgstr ""
 
-#: setup/lib/messages.inc.php:190
-#, fuzzy
-msgid "Load"
-msgstr "Lokalni"
-
 #: setup/lib/messages.inc.php:191
 msgid ""
 "If TRUE, logout deletes cookies for all servers; when set to FALSE, logout "
@@ -7595,14 +7639,6 @@ msgstr ""
 msgid "Iconic navigation bar"
 msgstr ""
 
-#: setup/lib/messages.inc.php:212
-msgid "New server"
-msgstr ""
-
-#: setup/lib/messages.inc.php:213
-msgid "There are no configured servers"
-msgstr ""
-
 #: setup/lib/messages.inc.php:214
 msgid "use GZip output buffering for increased speed in HTTP transfers"
 msgstr ""
@@ -7611,10 +7647,6 @@ msgstr ""
 msgid "GZip output buffering"
 msgstr ""
 
-#: setup/lib/messages.inc.php:216
-msgid "- none -"
-msgstr ""
-
 #: setup/lib/messages.inc.php:217
 msgid ""
 "[kbd]SMART[/kbd] - i.e. descending order for fields of type TIME, DATE, "
@@ -7625,10 +7657,6 @@ msgstr ""
 msgid "Default sorting order"
 msgstr ""
 
-#: setup/lib/messages.inc.php:219
-msgid "Overview"
-msgstr ""
-
 #: setup/lib/messages.inc.php:220
 msgid "Use persistent connections to MySQL databases"
 msgstr ""
@@ -7683,10 +7711,6 @@ msgstr ""
 msgid "Recoding engine"
 msgstr ""
 
-#: setup/lib/messages.inc.php:234
-msgid "Restore default value"
-msgstr ""
-
 #: setup/lib/messages.inc.php:235
 msgid "Try to revert erroneous fields to their default values"
 msgstr ""
@@ -7717,11 +7741,6 @@ msgstr ""
 msgid "You allow for connecting to the server without a password."
 msgstr ""
 
-#: setup/lib/messages.inc.php:241
-#, fuzzy
-msgid "Add a new server"
-msgstr "Dodaj novog korisnika"
-
 #: setup/lib/messages.inc.php:242
 msgid "Leave blank if not used"
 msgstr ""
@@ -7864,10 +7883,6 @@ msgid ""
 "to."
 msgstr ""
 
-#: setup/lib/messages.inc.php:272
-msgid "Edit server"
-msgstr ""
-
 #: setup/lib/messages.inc.php:273
 msgid "What PHP extension to use; you should use mysqli if supported"
 msgstr ""
@@ -8117,11 +8132,6 @@ msgstr ""
 msgid "Verbose name of this server"
 msgstr ""
 
-#: setup/lib/messages.inc.php:328
-#, php-format
-msgid "Set value: %s"
-msgstr ""
-
 #: setup/lib/messages.inc.php:329
 msgid ""
 "Whether a user should be displayed a "show all (records)" button"
@@ -8159,10 +8169,6 @@ msgstr ""
 msgid "Show function fields"
 msgstr ""
 
-#: setup/lib/messages.inc.php:337
-msgid "Show hidden messages (#MSG_COUNT)"
-msgstr ""
-
 #: setup/lib/messages.inc.php:338
 msgid ""
 "Shows link to [a at http://php.net/manual/function.phpinfo.php]phpinfo()[/a] "
@@ -8294,10 +8300,6 @@ msgstr ""
 msgid "Got invalid version string from server"
 msgstr ""
 
-#: setup/lib/messages.inc.php:370
-msgid "Check for latest version"
-msgstr ""
-
 #: setup/lib/messages.inc.php:371
 #, php-format
 msgid ""
@@ -8329,10 +8331,6 @@ msgid ""
 "Neither URL wrapper nor CURL is available. Version check is not possible."
 msgstr ""
 
-#: setup/lib/messages.inc.php:377
-msgid "Warning"
-msgstr ""
-
 #: setup/lib/messages.inc.php:378
 msgid ""
 "Enable [a at http://en.wikipedia.org/wiki/ZIP_(file_format)]ZIP[/a] compression "
diff --git a/po/ca.po b/po/ca.po
index 1c8a68d..bdc85ec 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-14 07:48-0400\n"
+"POT-Creation-Date: 2010-05-14 13:39-0400\n"
 "PO-Revision-Date: 2010-03-12 09:13+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: catalan <ca at li.org>\n"
@@ -945,15 +945,10 @@ msgstr ""
 "Temps exaurit de l'arxiu d'ordres, si voleu finalitzar l'importació, torneu "
 "a enviar el mateix arxiu a importar i el procés continuarà."
 
-#: import.php:426
-#, fuzzy
-#| msgid ""
-#| "However on last run no data has been parsed, this usually means "
-#| "phpMyAdmin won't be able to finish this import unless you increase php "
-#| "time limits."
+#: import.php:426 libraries/messages.inc.php:1102
 msgid ""
 "However on last run no data has been parsed, this usually means phpMyAdmin "
-"won"
+"won't be able to finish this import unless you increase php time limits."
 msgstr ""
 "Però a la darrera importació no s'han processat dades, el que normalment "
 "indica que phpMyAdmin no ha pogut finalitzar aquesta importació a menys que "
@@ -6454,15 +6449,6 @@ msgstr "Fils"
 msgid "Thread %s was successfully killed."
 msgstr "Fil %s cancel.lat correctament."
 
-#: libraries/messages.inc.php:1102
-msgid ""
-"However on last run no data has been parsed, this usually means phpMyAdmin "
-"won't be able to finish this import unless you increase php time limits."
-msgstr ""
-"Però a la darrera importació no s'han processat dades, el que normalment "
-"indica que phpMyAdmin no ha pogut finalitzar aquesta importació a menys que "
-"incrementeu els límits de temps de php."
-
 #: libraries/messages.inc.php:1105 pmd_pdf.php:94
 msgid "to/from page"
 msgstr "plana a/de"
@@ -6933,7 +6919,8 @@ msgstr "Res"
 msgid "Filter"
 msgstr "Filtre"
 
-#: navigation.php:319 setup/lib/messages.inc.php:42
+#: navigation.php:319 setup/frames/index.inc.php:218
+#: setup/lib/messages.inc.php:42
 msgid "Clear"
 msgstr "Neteja"
 
@@ -7041,6 +7028,115 @@ msgstr "Connexió insegura"
 msgid "Configuration: %s"
 msgstr "Arxiu de configuració"
 
+#: setup/frames/config.inc.php:25 setup/frames/index.inc.php:152
+#: setup/lib/messages.inc.php:45
+msgid "Configuration file"
+msgstr "Arxiu de configuració"
+
+#: setup/frames/config.inc.php:38 setup/frames/index.inc.php:212
+#: setup/lib/messages.inc.php:65
+msgid "Download"
+msgstr "Descarrega"
+
+#: setup/frames/index.inc.php:58 setup/lib/messages.inc.php:164
+msgid ""
+"You are not using a secure connection; all data (including potentially "
+"sensitive information, like passwords) is transferred unencrypted!"
+msgstr ""
+"No estàs fent servir una connexió segura; totes les dades (incloent "
+"informació potencialment sensible, com les contrasenyes) s'estàn transferint "
+"sense xifrar!"
+
+#: setup/frames/index.inc.php:87 setup/frames/menu.inc.php:17
+#: setup/lib/messages.inc.php:219
+msgid "Overview"
+msgstr "Vista global"
+
+#: setup/frames/index.inc.php:95 setup/lib/messages.inc.php:337
+msgid "Show hidden messages (#MSG_COUNT)"
+msgstr "Mostra missatges ocults (#MSG_COUNT)"
+
+#: setup/frames/index.inc.php:135 setup/lib/messages.inc.php:213
+msgid "There are no configured servers"
+msgstr "No hi ha servidors configurats"
+
+#: setup/frames/index.inc.php:143 setup/lib/messages.inc.php:212
+msgid "New server"
+msgstr "Nou servidor"
+
+#: setup/frames/index.inc.php:172 setup/lib/messages.inc.php:50
+msgid "Default language"
+msgstr "Idioma predeterminat"
+
+#: setup/frames/index.inc.php:182 setup/lib/messages.inc.php:187
+msgid "let the user choose"
+msgstr "deixa triar a l'usuari"
+
+#: setup/frames/index.inc.php:193 setup/lib/messages.inc.php:216
+msgid "- none -"
+msgstr "- cap -"
+
+#: setup/frames/index.inc.php:196 setup/lib/messages.inc.php:51
+msgid "Default server"
+msgstr "Servidor predeterminat"
+
+#: setup/frames/index.inc.php:206 setup/lib/messages.inc.php:66
+msgid "End of line"
+msgstr "Fi de linia"
+
+#: setup/frames/index.inc.php:211 setup/lib/messages.inc.php:61
+msgid "Display"
+msgstr "Mostra"
+
+#: setup/frames/index.inc.php:215 setup/lib/messages.inc.php:190
+msgid "Load"
+msgstr "Carregar"
+
+#: setup/frames/index.inc.php:226 setup/lib/messages.inc.php:152
+msgid "phpMyAdmin homepage"
+msgstr "pàgina principal de phpMyAdmin"
+
+#: setup/frames/index.inc.php:227 setup/lib/messages.inc.php:64
+msgid "Donate"
+msgstr "Donacions"
+
+#: setup/frames/index.inc.php:228 setup/lib/messages.inc.php:370
+msgid "Check for latest version"
+msgstr "Comprova la darrera versió"
+
+#: setup/frames/menu.inc.php:18 setup/lib/messages.inc.php:137
+msgid "Features"
+msgstr "Propietats"
+
+#: setup/frames/menu.inc.php:19 setup/lib/messages.inc.php:113
+msgid "Navigation frame"
+msgstr "Marc de navegació"
+
+#: setup/frames/menu.inc.php:20 setup/lib/messages.inc.php:118
+msgid "Main frame"
+msgstr "Marc principal"
+
+#: setup/frames/servers.inc.php:28 setup/lib/messages.inc.php:272
+msgid "Edit server"
+msgstr "Editar servidor"
+
+#: setup/frames/servers.inc.php:37 setup/lib/messages.inc.php:241
+msgid "Add a new server"
+msgstr "Afegir un nou servidor"
+
+#: setup/lib/FormDisplay.tpl.php:182 setup/lib/messages.inc.php:328
+#, php-format
+msgid "Set value: %s"
+msgstr "Estableix valor: %s"
+
+#: setup/lib/FormDisplay.tpl.php:187 setup/lib/messages.inc.php:234
+msgid "Restore default value"
+msgstr "Restaura el valor per defecte"
+
+#: setup/lib/form_processing.lib.php:43 setup/lib/messages.inc.php:377
+msgid "Warning"
+msgstr "Atenció"
+
 #: setup/lib/messages.inc.php:16
 msgid "Allow character set conversion"
 msgstr "Permet la conversió de jocs de caràcters"
@@ -7208,10 +7304,6 @@ msgstr ""
 msgid "Compress on the fly"
 msgstr "Compressió al vol"
 
-#: setup/lib/messages.inc.php:45
-msgid "Configuration file"
-msgstr "Arxiu de configuració"
-
 #: setup/lib/messages.inc.php:46
 msgid ""
 "Whether a warning ("Are your really sure...") should be displayed "
@@ -7232,14 +7324,6 @@ msgstr "Joc de caràcters predeterminat usat per a conversions"
 msgid "Default character set"
 msgstr "Joc de caràcters predeterminat"
 
-#: setup/lib/messages.inc.php:50
-msgid "Default language"
-msgstr "Idioma predeterminat"
-
-#: setup/lib/messages.inc.php:51
-msgid "Default server"
-msgstr "Servidor predeterminat"
-
 #: setup/lib/messages.inc.php:52
 msgid "Tab that is displayed when entering a database"
 msgstr "Pestanya que es mostra al entrar a una base de dades"
@@ -7281,10 +7365,6 @@ msgstr "Mostra les bases de dades com a llista en lloc de llista desplegable"
 msgid "Display databases as a list"
 msgstr "Mostra bases de dades com a llista"
 
-#: setup/lib/messages.inc.php:61
-msgid "Display"
-msgstr "Mostra"
-
 #: setup/lib/messages.inc.php:62
 msgid "Show server listing as a list instead of a drop down"
 msgstr "Mostra els servidors com a llista en lloc de llista desplegable"
@@ -7293,18 +7373,6 @@ msgstr "Mostra els servidors com a llista en lloc de llista desplegable"
 msgid "Display servers as a list"
 msgstr "Mostra servidors com a llista"
 
-#: setup/lib/messages.inc.php:64
-msgid "Donate"
-msgstr "Donacions"
-
-#: setup/lib/messages.inc.php:65
-msgid "Download"
-msgstr "Descarrega"
-
-#: setup/lib/messages.inc.php:66
-msgid "End of line"
-msgstr "Fi de linia"
-
 #: setup/lib/messages.inc.php:67
 msgid "Could not connect to MySQL server"
 msgstr "No es pot connectar al servidor MySQL"
@@ -7485,10 +7553,6 @@ msgstr "Opcions de visualització de les bases de dades"
 msgid "Customize appearance of the navigation frame"
 msgstr "Configura l'aspecte del marc de navegació"
 
-#: setup/lib/messages.inc.php:113
-msgid "Navigation frame"
-msgstr "Marc de navegació"
-
 #: setup/lib/messages.inc.php:114
 msgid "Servers display options"
 msgstr "Opcions de visualització dels servidors"
@@ -7497,10 +7561,6 @@ msgstr "Opcions de visualització dels servidors"
 msgid "Tables display options"
 msgstr "Opcions de visualització de les taules"
 
-#: setup/lib/messages.inc.php:118
-msgid "Main frame"
-msgstr "Marc principal"
-
 #: setup/lib/messages.inc.php:119
 msgid "Settings that didn't fit enywhere else"
 msgstr "Paràmetres que no encaixaven en cap altre lloc"
@@ -7583,10 +7643,6 @@ msgstr "Configuració"
 msgid "Customize export options"
 msgstr "Configurar valors d'expotació predeterminats"
 
-#: setup/lib/messages.inc.php:137
-msgid "Features"
-msgstr "Propietats"
-
 #: setup/lib/messages.inc.php:138
 msgid "Customize import defaults"
 msgstr "Configurar valors d'importació predeterminats"
@@ -7659,10 +7715,6 @@ msgstr ""
 "desempaquetat amb GZip[/a] mecessita les funcions (%s) que no estàn "
 "disponibles en aquest sistema."
 
-#: setup/lib/messages.inc.php:152
-msgid "phpMyAdmin homepage"
-msgstr "pàgina principal de phpMyAdmin"
-
 #: setup/lib/messages.inc.php:153
 msgid "Extra parameters for iconv"
 msgstr "Paràmetres adiccionals per iconv"
@@ -7713,15 +7765,6 @@ msgstr "Importació parcial: saltar consultes"
 msgid "Insecure connection"
 msgstr "Connexió insegura"
 
-#: setup/lib/messages.inc.php:164
-msgid ""
-"You are not using a secure connection; all data (including potentially "
-"sensitive information, like passwords) is transferred unencrypted!"
-msgstr ""
-"No estàs fent servir una connexió segura; totes les dades (incloent "
-"informació potencialment sensible, com les contrasenyes) s'estàn transferint "
-"sense xifrar!"
-
 #: setup/lib/messages.inc.php:165
 #, php-format
 msgid ""
@@ -7823,10 +7866,6 @@ msgstr "Resalta el servidor sota el cursor del ratolí"
 msgid "Enable highlighting"
 msgstr "Activa resaltat"
 
-#: setup/lib/messages.inc.php:187
-msgid "let the user choose"
-msgstr "deixa triar a l'usuari"
-
 #: setup/lib/messages.inc.php:188
 msgid "Use less graphically intense tabs"
 msgstr "Ús de pestanyes amb menys contingut gràfic"
@@ -7835,10 +7874,6 @@ msgstr "Ús de pestanyes amb menys contingut gràfic"
 msgid "Light tabs"
 msgstr "Pestanyes lleugeres"
 
-#: setup/lib/messages.inc.php:190
-msgid "Load"
-msgstr "Carregar"
-
 #: setup/lib/messages.inc.php:191
 msgid ""
 "If TRUE, logout deletes cookies for all servers; when set to FALSE, logout "
@@ -7961,14 +7996,6 @@ msgstr "Usa només icones, només text o bé ambdós"
 msgid "Iconic navigation bar"
 msgstr "Barra de navegació amb icones"
 
-#: setup/lib/messages.inc.php:212
-msgid "New server"
-msgstr "Nou servidor"
-
-#: setup/lib/messages.inc.php:213
-msgid "There are no configured servers"
-msgstr "No hi ha servidors configurats"
-
 #: setup/lib/messages.inc.php:214
 msgid "use GZip output buffering for increased speed in HTTP transfers"
 msgstr ""
@@ -7979,10 +8006,6 @@ msgstr ""
 msgid "GZip output buffering"
 msgstr "Memòria cau de sortida per GZip"
 
-#: setup/lib/messages.inc.php:216
-msgid "- none -"
-msgstr "- cap -"
-
 #: setup/lib/messages.inc.php:217
 msgid ""
 "[kbd]SMART[/kbd] - i.e. descending order for fields of type TIME, DATE, "
@@ -7995,10 +8018,6 @@ msgstr ""
 msgid "Default sorting order"
 msgstr "Ordre de clasificació predeterminat"
 
-#: setup/lib/messages.inc.php:219
-msgid "Overview"
-msgstr "Vista global"
-
 #: setup/lib/messages.inc.php:220
 msgid "Use persistent connections to MySQL databases"
 msgstr "Utilitza connexions persistents a bases de dades MySQL"
@@ -8057,10 +8076,6 @@ msgstr ""
 msgid "Recoding engine"
 msgstr "Motor d'enregistrament"
 
-#: setup/lib/messages.inc.php:234
-msgid "Restore default value"
-msgstr "Restaura el valor per defecte"
-
 #: setup/lib/messages.inc.php:235
 msgid "Try to revert erroneous fields to their default values"
 msgstr "Intenta tornar als valors predeterminats dels camps erronis"
@@ -8097,10 +8112,6 @@ msgstr "Hauries d'utilitzar mysqli per raons de rendiment"
 msgid "You allow for connecting to the server without a password."
 msgstr "Estàs permetent connexions al servidor sense contrasenya."
 
-#: setup/lib/messages.inc.php:241
-msgid "Add a new server"
-msgstr "Afegir un nou servidor"
-
 #: setup/lib/messages.inc.php:242
 msgid "Leave blank if not used"
 msgstr "Deixa en blanc si no l'utilitzes"
@@ -8261,10 +8272,6 @@ msgstr ""
 "pertany a un proveïdor ISP amb gran nombre d'usuaris connectats, inclós tu "
 "mateix."
 
-#: setup/lib/messages.inc.php:272
-msgid "Edit server"
-msgstr "Editar servidor"
-
 #: setup/lib/messages.inc.php:273
 msgid "What PHP extension to use; you should use mysqli if supported"
 msgstr ""
@@ -8546,11 +8553,6 @@ msgstr ""
 msgid "Verbose name of this server"
 msgstr "Nom explicatiu d'aquest servidor"
 
-#: setup/lib/messages.inc.php:328
-#, php-format
-msgid "Set value: %s"
-msgstr "Estableix valor: %s"
-
 #: setup/lib/messages.inc.php:329
 msgid ""
 "Whether a user should be displayed a "show all (records)" button"
@@ -8592,10 +8594,6 @@ msgstr "Mostra els camps de funcio en modes edició/inserció"
 msgid "Show function fields"
 msgstr "Mostra els camps de funció"
 
-#: setup/lib/messages.inc.php:337
-msgid "Show hidden messages (#MSG_COUNT)"
-msgstr "Mostra missatges ocults (#MSG_COUNT)"
-
 #: setup/lib/messages.inc.php:338
 msgid ""
 "Shows link to [a at http://php.net/manual/function.phpinfo.php]phpinfo()[/a] "
@@ -8746,10 +8744,6 @@ msgstr ""
 msgid "Got invalid version string from server"
 msgstr "S'ha obtingut un text de versió incorrecte des del servidor"
 
-#: setup/lib/messages.inc.php:370
-msgid "Check for latest version"
-msgstr "Comprova la darrera versió"
-
 #: setup/lib/messages.inc.php:371
 #, php-format
 msgid ""
@@ -8788,10 +8782,6 @@ msgid ""
 "Neither URL wrapper nor CURL is available. Version check is not possible."
 msgstr "No hi ha un intèrpret URL o CURL. No es pot comprovar la versió."
 
-#: setup/lib/messages.inc.php:377
-msgid "Warning"
-msgstr "Atenció"
-
 #: setup/lib/messages.inc.php:378
 msgid ""
 "Enable [a at http://en.wikipedia.org/wiki/ZIP_(file_format)]ZIP[/a] compression "
@@ -8861,6 +8851,19 @@ msgid "Description"
 msgstr "Descripció"
 
 #, fuzzy
+#~| msgid ""
+#~| "However on last run no data has been parsed, this usually means "
+#~| "phpMyAdmin won't be able to finish this import unless you increase php "
+#~| "time limits."
+#~ msgid ""
+#~ "However on last run no data has been parsed, this usually means "
+#~ "phpMyAdmin won"
+#~ msgstr ""
+#~ "Però a la darrera importació no s'han processat dades, el que normalment "
+#~ "indica que phpMyAdmin no ha pogut finalitzar aquesta importació a menys "
+#~ "que incrementeu els límits de temps de php."
+
+#, fuzzy
 #~| msgid "None"
 #~ msgctxt "None action"
 #~ msgid "None"
diff --git a/po/cs.po b/po/cs.po
index 6910b76..809cc54 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-14 07:48-0400\n"
+"POT-Creation-Date: 2010-05-14 13:39-0400\n"
 "PO-Revision-Date: 2010-05-10 14:24+0200\n"
 "Last-Translator: Michal <michal at cihar.com>\n"
 "Language-Team: czech <cs at li.org>\n"
@@ -942,15 +942,10 @@ msgstr ""
 "Limit pro běh importu vypršel, prosím odešlete formulář znovu se stejným "
 "souborem a import bude pokračovat."
 
-#: import.php:426
-#, fuzzy
-#| msgid ""
-#| "However on last run no data has been parsed, this usually means "
-#| "phpMyAdmin won't be able to finish this import unless you increase php "
-#| "time limits."
+#: import.php:426 libraries/messages.inc.php:1102
 msgid ""
 "However on last run no data has been parsed, this usually means phpMyAdmin "
-"won"
+"won't be able to finish this import unless you increase php time limits."
 msgstr ""
 "Bohužel během posledního pokusu nebyla žádná data načtena. Toto obvykle "
 "znamená, že phpMyAdmin nebude schopen načíst tento soubor, pokud nezvýšíte "
@@ -6323,15 +6318,6 @@ msgstr "Počet vláken"
 msgid "Thread %s was successfully killed."
 msgstr "Vlákno %s bylo úspěšně zabito."
 
-#: libraries/messages.inc.php:1102
-msgid ""
-"However on last run no data has been parsed, this usually means phpMyAdmin "
-"won't be able to finish this import unless you increase php time limits."
-msgstr ""
-"Bohužel během posledního pokusu nebyla žádná data načtena. Toto obvykle "
-"znamená, že phpMyAdmin nebude schopen načíst tento soubor, pokud nezvýšíte "
-"časové limity v PHP."
-
 #: libraries/messages.inc.php:1105 pmd_pdf.php:94
 msgid "to/from page"
 msgstr "do/ze stránky"
@@ -6799,7 +6785,8 @@ msgstr "Žádná"
 msgid "Filter"
 msgstr "Filtr"
 
-#: navigation.php:319 setup/lib/messages.inc.php:42
+#: navigation.php:319 setup/frames/index.inc.php:218
+#: setup/lib/messages.inc.php:42
 msgid "Clear"
 msgstr "Vyčistit"
 
@@ -6882,6 +6869,114 @@ msgstr "Současné připojení"
 msgid "Configuration: %s"
 msgstr "Konfigurace: %s"
 
+#: setup/frames/config.inc.php:25 setup/frames/index.inc.php:152
+#: setup/lib/messages.inc.php:45
+msgid "Configuration file"
+msgstr "Konfigurační soubor"
+
+#: setup/frames/config.inc.php:38 setup/frames/index.inc.php:212
+#: setup/lib/messages.inc.php:65
+msgid "Download"
+msgstr "Stáhnout"
+
+#: setup/frames/index.inc.php:58 setup/lib/messages.inc.php:164
+msgid ""
+"You are not using a secure connection; all data (including potentially "
+"sensitive information, like passwords) is transferred unencrypted!"
+msgstr ""
+"Nepoužíváte zabezpečené připojení, všechna data (včetně citlivých údajů jako "
+"jsou hesla) se posílají nešifrovaně!"
+
+#: setup/frames/index.inc.php:87 setup/frames/menu.inc.php:17
+#: setup/lib/messages.inc.php:219
+msgid "Overview"
+msgstr "Přehled"
+
+#: setup/frames/index.inc.php:95 setup/lib/messages.inc.php:337
+msgid "Show hidden messages (#MSG_COUNT)"
+msgstr "Zobrazit skyté zprávy (#MSG_COUNT)"
+
+#: setup/frames/index.inc.php:135 setup/lib/messages.inc.php:213
+msgid "There are no configured servers"
+msgstr "Žádné servery nejsou nastaveny"
+
+#: setup/frames/index.inc.php:143 setup/lib/messages.inc.php:212
+msgid "New server"
+msgstr "Nový server"
+
+#: setup/frames/index.inc.php:172 setup/lib/messages.inc.php:50
+msgid "Default language"
+msgstr "Výchozí jazyk"
+
+#: setup/frames/index.inc.php:182 setup/lib/messages.inc.php:187
+msgid "let the user choose"
+msgstr "Nechat uživatele, aby si vybral"
+
+#: setup/frames/index.inc.php:193 setup/lib/messages.inc.php:216
+msgid "- none -"
+msgstr "- žádný -"
+
+#: setup/frames/index.inc.php:196 setup/lib/messages.inc.php:51
+msgid "Default server"
+msgstr "Výchozí server"
+
+#: setup/frames/index.inc.php:206 setup/lib/messages.inc.php:66
+msgid "End of line"
+msgstr "Konec řádku"
+
+#: setup/frames/index.inc.php:211 setup/lib/messages.inc.php:61
+msgid "Display"
+msgstr "Zobrazit"
+
+#: setup/frames/index.inc.php:215 setup/lib/messages.inc.php:190
+msgid "Load"
+msgstr "Nahrát"
+
+#: setup/frames/index.inc.php:226 setup/lib/messages.inc.php:152
+msgid "phpMyAdmin homepage"
+msgstr "Domovská stránka phpMyAdmina"
+
+#: setup/frames/index.inc.php:227 setup/lib/messages.inc.php:64
+msgid "Donate"
+msgstr "Přispějte"
+
+#: setup/frames/index.inc.php:228 setup/lib/messages.inc.php:370
+msgid "Check for latest version"
+msgstr "Zkontrolovat nejnovější verzi"
+
+#: setup/frames/menu.inc.php:18 setup/lib/messages.inc.php:137
+msgid "Features"
+msgstr "Funkce"
+
+#: setup/frames/menu.inc.php:19 setup/lib/messages.inc.php:113
+msgid "Navigation frame"
+msgstr "Navigační rám"
+
+#: setup/frames/menu.inc.php:20 setup/lib/messages.inc.php:118
+msgid "Main frame"
+msgstr "Hlavní rám"
+
+#: setup/frames/servers.inc.php:28 setup/lib/messages.inc.php:272
+msgid "Edit server"
+msgstr "Upravit server"
+
+#: setup/frames/servers.inc.php:37 setup/lib/messages.inc.php:241
+msgid "Add a new server"
+msgstr "Přidat nový server"
+
+#: setup/lib/FormDisplay.tpl.php:182 setup/lib/messages.inc.php:328
+#, php-format
+msgid "Set value: %s"
+msgstr "Nastavena hodnota: %s"
+
+#: setup/lib/FormDisplay.tpl.php:187 setup/lib/messages.inc.php:234
+msgid "Restore default value"
+msgstr "Obnovit výchozí hodnotu"
+
+#: setup/lib/form_processing.lib.php:43 setup/lib/messages.inc.php:377
+msgid "Warning"
+msgstr "Varování"
+
 #: setup/lib/messages.inc.php:16
 msgid "Allow character set conversion"
 msgstr "Povolit převod znakových sad"
@@ -7048,10 +7143,6 @@ msgstr ""
 msgid "Compress on the fly"
 msgstr "Komprimovat za letu"
 
-#: setup/lib/messages.inc.php:45
-msgid "Configuration file"
-msgstr "Konfigurační soubor"
-
 #: setup/lib/messages.inc.php:46
 msgid ""
 "Whether a warning ("Are your really sure...") should be displayed "
@@ -7072,14 +7163,6 @@ msgstr "Výchozí znaková sada používaná pro převody"
 msgid "Default character set"
 msgstr "Výchozí znaková sada"
 
-#: setup/lib/messages.inc.php:50
-msgid "Default language"
-msgstr "Výchozí jazyk"
-
-#: setup/lib/messages.inc.php:51
-msgid "Default server"
-msgstr "Výchozí server"
-
 #: setup/lib/messages.inc.php:52
 msgid "Tab that is displayed when entering a database"
 msgstr "Panel, který je zobrazen při přístupu k databázi"
@@ -7121,10 +7204,6 @@ msgstr "Zobrazit přehled databází jako seznam namísto rozbalovacího menu"
 msgid "Display databases as a list"
 msgstr "Zabrazit databáze jako seznam"
 
-#: setup/lib/messages.inc.php:61
-msgid "Display"
-msgstr "Zobrazit"
-
 #: setup/lib/messages.inc.php:62
 msgid "Show server listing as a list instead of a drop down"
 msgstr "Zobrazit přehled serverů jako seznam namísto rozbalovacího menu"
@@ -7133,18 +7212,6 @@ msgstr "Zobrazit přehled serverů jako seznam namísto rozbalovacího menu"
 msgid "Display servers as a list"
 msgstr "Zobrazit servery jako seznam"
 
-#: setup/lib/messages.inc.php:64
-msgid "Donate"
-msgstr "Přispějte"
-
-#: setup/lib/messages.inc.php:65
-msgid "Download"
-msgstr "Stáhnout"
-
-#: setup/lib/messages.inc.php:66
-msgid "End of line"
-msgstr "Konec řádku"
-
 #: setup/lib/messages.inc.php:67
 msgid "Could not connect to MySQL server"
 msgstr "Nepodařilo se připojit k MySQL serveru"
@@ -7325,10 +7392,6 @@ msgstr "Nastavení zobrazení databází"
 msgid "Customize appearance of the navigation frame"
 msgstr "Přizpůsobí vzhled navigačního rámu"
 
-#: setup/lib/messages.inc.php:113
-msgid "Navigation frame"
-msgstr "Navigační rám"
-
 #: setup/lib/messages.inc.php:114
 msgid "Servers display options"
 msgstr "Nastavení zobrazení serverů"
@@ -7337,10 +7400,6 @@ msgstr "Nastavení zobrazení serverů"
 msgid "Tables display options"
 msgstr "Nastavení zobrazení tabulek"
 
-#: setup/lib/messages.inc.php:118
-msgid "Main frame"
-msgstr "Hlavní rám"
-
 #: setup/lib/messages.inc.php:119
 msgid "Settings that didn't fit enywhere else"
 msgstr "Nastavení, která nelze zařadit jinam"
@@ -7423,10 +7482,6 @@ msgstr "Přizpůsobení"
 msgid "Customize export options"
 msgstr "Přizpůsobení exportu"
 
-#: setup/lib/messages.inc.php:137
-msgid "Features"
-msgstr "Funkce"
-
 #: setup/lib/messages.inc.php:138
 msgid "Customize import defaults"
 msgstr "Přizpůsobení výchozího nastavení importu"
@@ -7498,10 +7553,6 @@ msgstr ""
 "[a@?page=form&formset=features#tab_Import_export]GZip komprese a "
 "dekomprese[/a] vyžaduje funkce (%s) které nejsou dostupné na tomto systému."
 
-#: setup/lib/messages.inc.php:152
-msgid "phpMyAdmin homepage"
-msgstr "Domovská stránka phpMyAdmina"
-
 #: setup/lib/messages.inc.php:153
 msgid "Extra parameters for iconv"
 msgstr "Další parametry pro iconv"
@@ -7552,14 +7603,6 @@ msgstr "Částečný import: přeskočit dotazy"
 msgid "Insecure connection"
 msgstr "Nezabezpečené připojení"
 
-#: setup/lib/messages.inc.php:164
-msgid ""
-"You are not using a secure connection; all data (including potentially "
-"sensitive information, like passwords) is transferred unencrypted!"
-msgstr ""
-"Nepoužíváte zabezpečené připojení, všechna data (včetně citlivých údajů jako "
-"jsou hesla) se posílají nešifrovaně!"
-
 #: setup/lib/messages.inc.php:165
 #, php-format
 msgid ""
@@ -7661,10 +7704,6 @@ msgstr "Zvýrazní server pod kurzorem myši"
 msgid "Enable highlighting"
 msgstr "Povolit zvýrazňování"
 
-#: setup/lib/messages.inc.php:187
-msgid "let the user choose"
-msgstr "Nechat uživatele, aby si vybral"
-
 #: setup/lib/messages.inc.php:188
 msgid "Use less graphically intense tabs"
 msgstr "Použije graficky méně náročné panely"
@@ -7673,10 +7712,6 @@ msgstr "Použije graficky méně náročné panely"
 msgid "Light tabs"
 msgstr "Odlehčené panely"
 
-#: setup/lib/messages.inc.php:190
-msgid "Load"
-msgstr "Nahrát"
-
 #: setup/lib/messages.inc.php:191
 msgid ""
 "If TRUE, logout deletes cookies for all servers; when set to FALSE, logout "
@@ -7797,14 +7832,6 @@ msgstr "Zda se mají zobrazit pouze ikony, nebo pouze text, případně obojí"
 msgid "Iconic navigation bar"
 msgstr "Ikony v navigační liště"
 
-#: setup/lib/messages.inc.php:212
-msgid "New server"
-msgstr "Nový server"
-
-#: setup/lib/messages.inc.php:213
-msgid "There are no configured servers"
-msgstr "Žádné servery nejsou nastaveny"
-
 #: setup/lib/messages.inc.php:214
 msgid "use GZip output buffering for increased speed in HTTP transfers"
 msgstr "Použije mezipaměť pro GZip výstup, čímž zvýší rychlost HTTP přenosů"
@@ -7813,10 +7840,6 @@ msgstr "Použije mezipaměť pro GZip výstup, čímž zvýší rychlost HTTP p
 msgid "GZip output buffering"
 msgstr "Mezipaměť pro GZip výstup"
 
-#: setup/lib/messages.inc.php:216
-msgid "- none -"
-msgstr "- žádný -"
-
 #: setup/lib/messages.inc.php:217
 msgid ""
 "[kbd]SMART[/kbd] - i.e. descending order for fields of type TIME, DATE, "
@@ -7829,10 +7852,6 @@ msgstr ""
 msgid "Default sorting order"
 msgstr "Výchozí pořadí řazení"
 
-#: setup/lib/messages.inc.php:219
-msgid "Overview"
-msgstr "Přehled"
-
 #: setup/lib/messages.inc.php:220
 msgid "Use persistent connections to MySQL databases"
 msgstr "Použije trvalé (persistentní) připojení k MySQL databázi"
@@ -7890,10 +7909,6 @@ msgstr "Vybere, které funkce budou použity pro konverzi znakových sad"
 msgid "Recoding engine"
 msgstr "Nástroje pro konverzi znakových sad"
 
-#: setup/lib/messages.inc.php:234
-msgid "Restore default value"
-msgstr "Obnovit výchozí hodnotu"
-
 #: setup/lib/messages.inc.php:235
 msgid "Try to revert erroneous fields to their default values"
 msgstr "Zkusit vrátit původní hodnoty chybných políček"
@@ -7929,10 +7944,6 @@ msgstr "Měl byste použít mysqli z výkonostních důvodů"
 msgid "You allow for connecting to the server without a password."
 msgstr "Dovolujete připojit se k serveru bez hesla."
 
-#: setup/lib/messages.inc.php:241
-msgid "Add a new server"
-msgstr "Přidat nový server"
-
 #: setup/lib/messages.inc.php:242
 msgid "Leave blank if not used"
 msgstr "Pokud tuto volbu nepoužíváte, nechte ji prázdnou"
@@ -8093,10 +8104,6 @@ msgstr ""
 "spolehlivé, pokud je vaše IP adresa dynamicky přidělována poskytovatelem "
 "spolu s mnoha dalšími uživateli."
 
-#: setup/lib/messages.inc.php:272
-msgid "Edit server"
-msgstr "Upravit server"
-
 #: setup/lib/messages.inc.php:273
 msgid "What PHP extension to use; you should use mysqli if supported"
 msgstr "Které rozšíření PHP se má použít, použijte mysqli, pokud je to možné"
@@ -8370,11 +8377,6 @@ msgstr ""
 msgid "Verbose name of this server"
 msgstr "Dlouhé jméno tohoto serveru"
 
-#: setup/lib/messages.inc.php:328
-#, php-format
-msgid "Set value: %s"
-msgstr "Nastavena hodnota: %s"
-
 #: setup/lib/messages.inc.php:329
 msgid ""
 "Whether a user should be displayed a "show all (records)" button"
@@ -8415,10 +8417,6 @@ msgstr "Zobrazí seznam funkcí v editačním režimu"
 msgid "Show function fields"
 msgstr "Zobrazit seznam fukncí"
 
-#: setup/lib/messages.inc.php:337
-msgid "Show hidden messages (#MSG_COUNT)"
-msgstr "Zobrazit skyté zprávy (#MSG_COUNT)"
-
 #: setup/lib/messages.inc.php:338
 msgid ""
 "Shows link to [a at http://php.net/manual/function.phpinfo.php]phpinfo()[/a] "
@@ -8567,10 +8565,6 @@ msgstr ""
 msgid "Got invalid version string from server"
 msgstr "Server odpověděl chybným textem verze"
 
-#: setup/lib/messages.inc.php:370
-msgid "Check for latest version"
-msgstr "Zkontrolovat nejnovější verzi"
-
 #: setup/lib/messages.inc.php:371
 #, php-format
 msgid ""
@@ -8607,10 +8601,6 @@ msgid ""
 msgstr ""
 "Není dostupný přístup na URL ani CURL, proto není možné kontrolovat verzi."
 
-#: setup/lib/messages.inc.php:377
-msgid "Warning"
-msgstr "Varování"
-
 #: setup/lib/messages.inc.php:378
 msgid ""
 "Enable [a at http://en.wikipedia.org/wiki/ZIP_(file_format)]ZIP[/a] compression "
@@ -8667,3 +8657,16 @@ msgstr "Vytvořit index na  %s sloupcích"
 msgctxt "for MIME transformation"
 msgid "Description"
 msgstr "Popis"
+
+#, fuzzy
+#~| msgid ""
+#~| "However on last run no data has been parsed, this usually means "
+#~| "phpMyAdmin won't be able to finish this import unless you increase php "
+#~| "time limits."
+#~ msgid ""
+#~ "However on last run no data has been parsed, this usually means "
+#~ "phpMyAdmin won"
+#~ msgstr ""
+#~ "Bohužel během posledního pokusu nebyla žádná data načtena. Toto obvykle "
+#~ "znamená, že phpMyAdmin nebude schopen načíst tento soubor, pokud "
+#~ "nezvýšíte časové limity v PHP."
diff --git a/po/da.po b/po/da.po
index ba3fc10..f0c7029 100644
--- a/po/da.po
+++ b/po/da.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-14 07:48-0400\n"
+"POT-Creation-Date: 2010-05-14 13:39-0400\n"
 "PO-Revision-Date: 2010-03-12 09:13+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: danish <da at li.org>\n"
@@ -945,15 +945,10 @@ msgstr ""
 "Script timeout nået, hvis du vil afslutte importen, indsend venligst samme "
 "fil igen og importen vil fortsætte hvor den slap."
 
-#: import.php:426
-#, fuzzy
-#| msgid ""
-#| "However on last run no data has been parsed, this usually means "
-#| "phpMyAdmin won't be able to finish this import unless you increase php "
-#| "time limits."
+#: import.php:426 libraries/messages.inc.php:1102
 msgid ""
 "However on last run no data has been parsed, this usually means phpMyAdmin "
-"won"
+"won't be able to finish this import unless you increase php time limits."
 msgstr ""
 "Desværre blev der ikke parset nogen data ved sidste kørsel, dette betyder "
 "normalt at phpMyAdmin ikke vil være i stand til at gennemføre importen med "
@@ -6337,15 +6332,6 @@ msgstr "Tråde"
 msgid "Thread %s was successfully killed."
 msgstr "Tråd %s blev stoppet."
 
-#: libraries/messages.inc.php:1102
-msgid ""
-"However on last run no data has been parsed, this usually means phpMyAdmin "
-"won't be able to finish this import unless you increase php time limits."
-msgstr ""
-"Desværre blev der ikke parset nogen data ved sidste kørsel, dette betyder "
-"normalt at phpMyAdmin ikke vil være i stand til at gennemføre importen med "
-"mindre du forøger PHP-tidsbegrænsningerne."
-
 #: libraries/messages.inc.php:1105 pmd_pdf.php:94
 msgid "to/from page"
 msgstr "til/fra side"
@@ -6815,7 +6801,8 @@ msgstr "Ingen"
 msgid "Filter"
 msgstr ""
 
-#: navigation.php:319 setup/lib/messages.inc.php:42
+#: navigation.php:319 setup/frames/index.inc.php:218
+#: setup/lib/messages.inc.php:42
 msgid "Clear"
 msgstr ""
 
@@ -6904,6 +6891,112 @@ msgstr "maks. samtidige forbindelser"
 msgid "Configuration: %s"
 msgstr ""
 
+#: setup/frames/config.inc.php:25 setup/frames/index.inc.php:152
+#: setup/lib/messages.inc.php:45
+msgid "Configuration file"
+msgstr ""
+
+#: setup/frames/config.inc.php:38 setup/frames/index.inc.php:212
+#: setup/lib/messages.inc.php:65
+msgid "Download"
+msgstr ""
+
+#: setup/frames/index.inc.php:58 setup/lib/messages.inc.php:164
+msgid ""
+"You are not using a secure connection; all data (including potentially "
+"sensitive information, like passwords) is transferred unencrypted!"
+msgstr ""
+
+#: setup/frames/index.inc.php:87 setup/frames/menu.inc.php:17
+#: setup/lib/messages.inc.php:219
+msgid "Overview"
+msgstr ""
+
+#: setup/frames/index.inc.php:95 setup/lib/messages.inc.php:337
+msgid "Show hidden messages (#MSG_COUNT)"
+msgstr ""
+
+#: setup/frames/index.inc.php:135 setup/lib/messages.inc.php:213
+msgid "There are no configured servers"
+msgstr ""
+
+#: setup/frames/index.inc.php:143 setup/lib/messages.inc.php:212
+msgid "New server"
+msgstr ""
+
+#: setup/frames/index.inc.php:172 setup/lib/messages.inc.php:50
+msgid "Default language"
+msgstr ""
+
+#: setup/frames/index.inc.php:182 setup/lib/messages.inc.php:187
+msgid "let the user choose"
+msgstr ""
+
+#: setup/frames/index.inc.php:193 setup/lib/messages.inc.php:216
+msgid "- none -"
+msgstr ""
+
+#: setup/frames/index.inc.php:196 setup/lib/messages.inc.php:51
+msgid "Default server"
+msgstr ""
+
+#: setup/frames/index.inc.php:206 setup/lib/messages.inc.php:66
+msgid "End of line"
+msgstr ""
+
+#: setup/frames/index.inc.php:211 setup/lib/messages.inc.php:61
+msgid "Display"
+msgstr ""
+
+#: setup/frames/index.inc.php:215 setup/lib/messages.inc.php:190
+msgid "Load"
+msgstr ""
+
+#: setup/frames/index.inc.php:226 setup/lib/messages.inc.php:152
+msgid "phpMyAdmin homepage"
+msgstr ""
+
+#: setup/frames/index.inc.php:227 setup/lib/messages.inc.php:64
+msgid "Donate"
+msgstr ""
+
+#: setup/frames/index.inc.php:228 setup/lib/messages.inc.php:370
+msgid "Check for latest version"
+msgstr ""
+
+#: setup/frames/menu.inc.php:18 setup/lib/messages.inc.php:137
+msgid "Features"
+msgstr ""
+
+#: setup/frames/menu.inc.php:19 setup/lib/messages.inc.php:113
+msgid "Navigation frame"
+msgstr ""
+
+#: setup/frames/menu.inc.php:20 setup/lib/messages.inc.php:118
+msgid "Main frame"
+msgstr ""
+
+#: setup/frames/servers.inc.php:28 setup/lib/messages.inc.php:272
+msgid "Edit server"
+msgstr ""
+
+#: setup/frames/servers.inc.php:37 setup/lib/messages.inc.php:241
+msgid "Add a new server"
+msgstr ""
+
+#: setup/lib/FormDisplay.tpl.php:182 setup/lib/messages.inc.php:328
+#, php-format
+msgid "Set value: %s"
+msgstr ""
+
+#: setup/lib/FormDisplay.tpl.php:187 setup/lib/messages.inc.php:234
+msgid "Restore default value"
+msgstr ""
+
+#: setup/lib/form_processing.lib.php:43 setup/lib/messages.inc.php:377
+msgid "Warning"
+msgstr ""
+
 #: setup/lib/messages.inc.php:16
 msgid "Allow character set conversion"
 msgstr ""
@@ -7042,10 +7135,6 @@ msgstr ""
 msgid "Compress on the fly"
 msgstr ""
 
-#: setup/lib/messages.inc.php:45
-msgid "Configuration file"
-msgstr ""
-
 #: setup/lib/messages.inc.php:46
 msgid ""
 "Whether a warning ("Are your really sure...") should be displayed "
@@ -7064,14 +7153,6 @@ msgstr ""
 msgid "Default character set"
 msgstr ""
 
-#: setup/lib/messages.inc.php:50
-msgid "Default language"
-msgstr ""
-
-#: setup/lib/messages.inc.php:51
-msgid "Default server"
-msgstr ""
-
 #: setup/lib/messages.inc.php:52
 msgid "Tab that is displayed when entering a database"
 msgstr ""
@@ -7110,10 +7191,6 @@ msgstr ""
 msgid "Display databases as a list"
 msgstr ""
 
-#: setup/lib/messages.inc.php:61
-msgid "Display"
-msgstr ""
-
 #: setup/lib/messages.inc.php:62
 msgid "Show server listing as a list instead of a drop down"
 msgstr ""
@@ -7122,18 +7199,6 @@ msgstr ""
 msgid "Display servers as a list"
 msgstr ""
 
-#: setup/lib/messages.inc.php:64
-msgid "Donate"
-msgstr ""
-
-#: setup/lib/messages.inc.php:65
-msgid "Download"
-msgstr ""
-
-#: setup/lib/messages.inc.php:66
-msgid "End of line"
-msgstr ""
-
 #: setup/lib/messages.inc.php:67
 msgid "Could not connect to MySQL server"
 msgstr ""
@@ -7306,10 +7371,6 @@ msgstr ""
 msgid "Customize appearance of the navigation frame"
 msgstr ""
 
-#: setup/lib/messages.inc.php:113
-msgid "Navigation frame"
-msgstr ""
-
 #: setup/lib/messages.inc.php:114
 msgid "Servers display options"
 msgstr ""
@@ -7318,10 +7379,6 @@ msgstr ""
 msgid "Tables display options"
 msgstr ""
 
-#: setup/lib/messages.inc.php:118
-msgid "Main frame"
-msgstr ""
-
 #: setup/lib/messages.inc.php:119
 msgid "Settings that didn't fit enywhere else"
 msgstr ""
@@ -7397,10 +7454,6 @@ msgstr ""
 msgid "Customize export options"
 msgstr ""
 
-#: setup/lib/messages.inc.php:137
-msgid "Features"
-msgstr ""
-
 #: setup/lib/messages.inc.php:138
 msgid "Customize import defaults"
 msgstr ""
@@ -7465,10 +7518,6 @@ msgid ""
 "system."
 msgstr ""
 
-#: setup/lib/messages.inc.php:152
-msgid "phpMyAdmin homepage"
-msgstr ""
-
 #: setup/lib/messages.inc.php:153
 msgid "Extra parameters for iconv"
 msgstr ""
@@ -7512,12 +7561,6 @@ msgstr ""
 msgid "Insecure connection"
 msgstr ""
 
-#: setup/lib/messages.inc.php:164
-msgid ""
-"You are not using a secure connection; all data (including potentially "
-"sensitive information, like passwords) is transferred unencrypted!"
-msgstr ""
-
 #: setup/lib/messages.inc.php:165
 #, php-format
 msgid ""
@@ -7613,10 +7656,6 @@ msgstr ""
 msgid "Enable highlighting"
 msgstr ""
 
-#: setup/lib/messages.inc.php:187
-msgid "let the user choose"
-msgstr ""
-
 #: setup/lib/messages.inc.php:188
 msgid "Use less graphically intense tabs"
 msgstr ""
@@ -7625,10 +7664,6 @@ msgstr ""
 msgid "Light tabs"
 msgstr ""
 
-#: setup/lib/messages.inc.php:190
-msgid "Load"
-msgstr ""
-
 #: setup/lib/messages.inc.php:191
 msgid ""
 "If TRUE, logout deletes cookies for all servers; when set to FALSE, logout "
@@ -7730,14 +7765,6 @@ msgstr ""
 msgid "Iconic navigation bar"
 msgstr ""
 
-#: setup/lib/messages.inc.php:212
-msgid "New server"
-msgstr ""
-
-#: setup/lib/messages.inc.php:213
-msgid "There are no configured servers"
-msgstr ""
-
 #: setup/lib/messages.inc.php:214
 msgid "use GZip output buffering for increased speed in HTTP transfers"
 msgstr ""
@@ -7746,10 +7773,6 @@ msgstr ""
 msgid "GZip output buffering"
 msgstr ""
 
-#: setup/lib/messages.inc.php:216
-msgid "- none -"
-msgstr ""
-
 #: setup/lib/messages.inc.php:217
 msgid ""
 "[kbd]SMART[/kbd] - i.e. descending order for fields of type TIME, DATE, "
@@ -7760,10 +7783,6 @@ msgstr ""
 msgid "Default sorting order"
 msgstr ""
 
-#: setup/lib/messages.inc.php:219
-msgid "Overview"
-msgstr ""
-
 #: setup/lib/messages.inc.php:220
 msgid "Use persistent connections to MySQL databases"
 msgstr ""
@@ -7818,10 +7837,6 @@ msgstr ""
 msgid "Recoding engine"
 msgstr ""
 
-#: setup/lib/messages.inc.php:234
-msgid "Restore default value"
-msgstr ""
-
 #: setup/lib/messages.inc.php:235
 msgid "Try to revert erroneous fields to their default values"
 msgstr ""
@@ -7852,10 +7867,6 @@ msgstr ""
 msgid "You allow for connecting to the server without a password."
 msgstr ""
 
-#: setup/lib/messages.inc.php:241
-msgid "Add a new server"
-msgstr ""
-
 #: setup/lib/messages.inc.php:242
 msgid "Leave blank if not used"
 msgstr ""
@@ -7996,10 +8007,6 @@ msgid ""
 "to."
 msgstr ""
 
-#: setup/lib/messages.inc.php:272
-msgid "Edit server"
-msgstr ""
-
 #: setup/lib/messages.inc.php:273
 msgid "What PHP extension to use; you should use mysqli if supported"
 msgstr ""
@@ -8245,11 +8252,6 @@ msgstr ""
 msgid "Verbose name of this server"
 msgstr ""
 
-#: setup/lib/messages.inc.php:328
-#, php-format
-msgid "Set value: %s"
-msgstr ""
-
 #: setup/lib/messages.inc.php:329
 msgid ""
 "Whether a user should be displayed a "show all (records)" button"
@@ -8286,10 +8288,6 @@ msgstr ""
 msgid "Show function fields"
 msgstr ""
 
-#: setup/lib/messages.inc.php:337
-msgid "Show hidden messages (#MSG_COUNT)"
-msgstr ""
-
 #: setup/lib/messages.inc.php:338
 msgid ""
 "Shows link to [a at http://php.net/manual/function.phpinfo.php]phpinfo()[/a] "
@@ -8418,10 +8416,6 @@ msgstr ""
 msgid "Got invalid version string from server"
 msgstr ""
 
-#: setup/lib/messages.inc.php:370
-msgid "Check for latest version"
-msgstr ""
-
 #: setup/lib/messages.inc.php:371
 #, php-format
 msgid ""
@@ -8453,10 +8447,6 @@ msgid ""
 "Neither URL wrapper nor CURL is available. Version check is not possible."
 msgstr ""
 
-#: setup/lib/messages.inc.php:377
-msgid "Warning"
-msgstr ""
-
 #: setup/lib/messages.inc.php:378
 msgid ""
 "Enable [a at http://en.wikipedia.org/wiki/ZIP_(file_format)]ZIP[/a] compression "
@@ -8518,6 +8508,19 @@ msgid "Description"
 msgstr "Beskrivelse"
 
 #, fuzzy
+#~| msgid ""
+#~| "However on last run no data has been parsed, this usually means "
+#~| "phpMyAdmin won't be able to finish this import unless you increase php "
+#~| "time limits."
+#~ msgid ""
+#~ "However on last run no data has been parsed, this usually means "
+#~ "phpMyAdmin won"
+#~ msgstr ""
+#~ "Desværre blev der ikke parset nogen data ved sidste kørsel, dette betyder "
+#~ "normalt at phpMyAdmin ikke vil være i stand til at gennemføre importen "
+#~ "med mindre du forøger PHP-tidsbegrænsningerne."
+
+#, fuzzy
 #~| msgid "None"
 #~ msgctxt "None action"
 #~ msgid "None"
diff --git a/po/de.po b/po/de.po
index 32b19c6..af46c81 100644
--- a/po/de.po
+++ b/po/de.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-14 07:48-0400\n"
+"POT-Creation-Date: 2010-05-14 13:39-0400\n"
 "PO-Revision-Date: 2010-05-11 15:22+0200\n"
 "Last-Translator:  <osw at ldism.de>\n"
 "Language-Team: german <de at li.org>\n"
@@ -945,15 +945,10 @@ msgstr ""
 "Das Ausführungszeitlimit wurde erreicht. Wenn Sie die Datei erneut "
 "abschicken, wird der Import fortgesetzt."
 
-#: import.php:426
-#, fuzzy
-#| msgid ""
-#| "However on last run no data has been parsed, this usually means "
-#| "phpMyAdmin won't be able to finish this import unless you increase php "
-#| "time limits."
+#: import.php:426 libraries/messages.inc.php:1102
 msgid ""
 "However on last run no data has been parsed, this usually means phpMyAdmin "
-"won"
+"won't be able to finish this import unless you increase php time limits."
 msgstr ""
 "Allerdings wurden hierbei keine Daten eingelesen. Das bedeutet in der Regel, "
 "dass phpMyAdmin nicht in der Lage sein wird, den Import zu beenden, sofern "
@@ -6419,15 +6414,6 @@ msgstr "Prozesse"
 msgid "Thread %s was successfully killed."
 msgstr "Der Prozess %s wurde erfolgreich abgebrochen."
 
-#: libraries/messages.inc.php:1102
-msgid ""
-"However on last run no data has been parsed, this usually means phpMyAdmin "
-"won't be able to finish this import unless you increase php time limits."
-msgstr ""
-"Allerdings wurden hierbei keine Daten eingelesen. Das bedeutet in der Regel, "
-"dass phpMyAdmin nicht in der Lage sein wird, den Import zu beenden, sofern "
-"nicht die Ausführungszeitbeschränkungen von php gelockert werden."
-
 #: libraries/messages.inc.php:1105 pmd_pdf.php:94
 msgid "to/from page"
 msgstr "nach/von Seite"
@@ -6908,7 +6894,8 @@ msgstr "keine"
 msgid "Filter"
 msgstr "Dateien"
 
-#: navigation.php:319 setup/lib/messages.inc.php:42
+#: navigation.php:319 setup/frames/index.inc.php:218
+#: setup/lib/messages.inc.php:42
 msgid "Clear"
 msgstr "Werte löschen"
 
@@ -7000,6 +6987,114 @@ msgstr "Unsichere Verbindung"
 msgid "Configuration: %s"
 msgstr "Konfiguration"
 
+#: setup/frames/config.inc.php:25 setup/frames/index.inc.php:152
+#: setup/lib/messages.inc.php:45
+msgid "Configuration file"
+msgstr "Konfigurationsdatei"
+
+#: setup/frames/config.inc.php:38 setup/frames/index.inc.php:212
+#: setup/lib/messages.inc.php:65
+msgid "Download"
+msgstr "Download"
+
+#: setup/frames/index.inc.php:58 setup/lib/messages.inc.php:164
+msgid ""
+"You are not using a secure connection; all data (including potentially "
+"sensitive information, like passwords) is transferred unencrypted!"
+msgstr ""
+"Sie benutzen keine sichere Verbindung. Alle Daten (einschließlich sensitive "
+"Information wie Passwörter) werden unverschlüsselt übertragen!"
+
+#: setup/frames/index.inc.php:87 setup/frames/menu.inc.php:17
+#: setup/lib/messages.inc.php:219
+msgid "Overview"
+msgstr "Übersicht"
+
+#: setup/frames/index.inc.php:95 setup/lib/messages.inc.php:337
+msgid "Show hidden messages (#MSG_COUNT)"
+msgstr "Ausgeblendete Nachrichten anzeigen (#MSG_COUNT)"
+
+#: setup/frames/index.inc.php:135 setup/lib/messages.inc.php:213
+msgid "There are no configured servers"
+msgstr "Es sind keine Server konfiguriert"
+
+#: setup/frames/index.inc.php:143 setup/lib/messages.inc.php:212
+msgid "New server"
+msgstr "Neuer Server"
+
+#: setup/frames/index.inc.php:172 setup/lib/messages.inc.php:50
+msgid "Default language"
+msgstr "Voreingestellte Sprache"
+
+#: setup/frames/index.inc.php:182 setup/lib/messages.inc.php:187
+msgid "let the user choose"
+msgstr "lass den Benutzer entscheiden"
+
+#: setup/frames/index.inc.php:193 setup/lib/messages.inc.php:216
+msgid "- none -"
+msgstr "- kein -"
+
+#: setup/frames/index.inc.php:196 setup/lib/messages.inc.php:51
+msgid "Default server"
+msgstr "Standardserver"
+
+#: setup/frames/index.inc.php:206 setup/lib/messages.inc.php:66
+msgid "End of line"
+msgstr "Zeilenenden"
+
+#: setup/frames/index.inc.php:211 setup/lib/messages.inc.php:61
+msgid "Display"
+msgstr "Anzeige"
+
+#: setup/frames/index.inc.php:215 setup/lib/messages.inc.php:190
+msgid "Load"
+msgstr "Laden"
+
+#: setup/frames/index.inc.php:226 setup/lib/messages.inc.php:152
+msgid "phpMyAdmin homepage"
+msgstr "phpMyAdmin-Homepage"
+
+#: setup/frames/index.inc.php:227 setup/lib/messages.inc.php:64
+msgid "Donate"
+msgstr "Spenden"
+
+#: setup/frames/index.inc.php:228 setup/lib/messages.inc.php:370
+msgid "Check for latest version"
+msgstr "Auf neue Version prüfen"
+
+#: setup/frames/menu.inc.php:18 setup/lib/messages.inc.php:137
+msgid "Features"
+msgstr "Features"
+
+#: setup/frames/menu.inc.php:19 setup/lib/messages.inc.php:113
+msgid "Navigation frame"
+msgstr "Navigationsframe"
+
+#: setup/frames/menu.inc.php:20 setup/lib/messages.inc.php:118
+msgid "Main frame"
+msgstr "Hauptframe"
+
+#: setup/frames/servers.inc.php:28 setup/lib/messages.inc.php:272
+msgid "Edit server"
+msgstr "Server editieren"
+
+#: setup/frames/servers.inc.php:37 setup/lib/messages.inc.php:241
+msgid "Add a new server"
+msgstr "Server hinzufügen"
+
+#: setup/lib/FormDisplay.tpl.php:182 setup/lib/messages.inc.php:328
+#, php-format
+msgid "Set value: %s"
+msgstr "Setze Wert: %s"
+
+#: setup/lib/FormDisplay.tpl.php:187 setup/lib/messages.inc.php:234
+msgid "Restore default value"
+msgstr "Standard wiederherstellen"
+
+#: setup/lib/form_processing.lib.php:43 setup/lib/messages.inc.php:377
+msgid "Warning"
+msgstr "Warnung"
+
 #: setup/lib/messages.inc.php:16
 msgid "Allow character set conversion"
 msgstr "Zeichensatzkonvertierung erlauben."
@@ -7167,10 +7262,6 @@ msgstr ""
 msgid "Compress on the fly"
 msgstr "On the fly komprimieren"
 
-#: setup/lib/messages.inc.php:45
-msgid "Configuration file"
-msgstr "Konfigurationsdatei"
-
 #: setup/lib/messages.inc.php:46
 msgid ""
 "Whether a warning ("Are your really sure...") should be displayed "
@@ -7191,14 +7282,6 @@ msgstr "Standardzeichensatz bei Konvertierung"
 msgid "Default character set"
 msgstr "Standardzeichensatz"
 
-#: setup/lib/messages.inc.php:50
-msgid "Default language"
-msgstr "Voreingestellte Sprache"
-
-#: setup/lib/messages.inc.php:51
-msgid "Default server"
-msgstr "Standardserver"
-
 #: setup/lib/messages.inc.php:52
 msgid "Tab that is displayed when entering a database"
 msgstr "Angezeigter Reiter beim Öffnen einer Datenbank"
@@ -7240,10 +7323,6 @@ msgstr "Datenbanken als Liste statt Dropdownfeld anzeigen"
 msgid "Display databases as a list"
 msgstr "Datenbanken als Liste anzeigen"
 
-#: setup/lib/messages.inc.php:61
-msgid "Display"
-msgstr "Anzeige"
-
 #: setup/lib/messages.inc.php:62
 msgid "Show server listing as a list instead of a drop down"
 msgstr "Server als Liste statt Dropdownfeld anzeigen"
@@ -7252,18 +7331,6 @@ msgstr "Server als Liste statt Dropdownfeld anzeigen"
 msgid "Display servers as a list"
 msgstr "Server als Liste anzeigen"
 
-#: setup/lib/messages.inc.php:64
-msgid "Donate"
-msgstr "Spenden"
-
-#: setup/lib/messages.inc.php:65
-msgid "Download"
-msgstr "Download"
-
-#: setup/lib/messages.inc.php:66
-msgid "End of line"
-msgstr "Zeilenenden"
-
 #: setup/lib/messages.inc.php:67
 msgid "Could not connect to MySQL server"
 msgstr "Verbindungsaufbau zu MySQL-Server schlug fehl"
@@ -7444,10 +7511,6 @@ msgstr "Anzeigeoptionen für Datenbank"
 msgid "Customize appearance of the navigation frame"
 msgstr "Aussehen der Navigation anpassen"
 
-#: setup/lib/messages.inc.php:113
-msgid "Navigation frame"
-msgstr "Navigationsframe"
-
 #: setup/lib/messages.inc.php:114
 msgid "Servers display options"
 msgstr "Anzeigeoptionen für Server"
@@ -7456,10 +7519,6 @@ msgstr "Anzeigeoptionen für Server"
 msgid "Tables display options"
 msgstr "Anzeigeoptionen für Tabellen"
 
-#: setup/lib/messages.inc.php:118
-msgid "Main frame"
-msgstr "Hauptframe"
-
 #: setup/lib/messages.inc.php:119
 msgid "Settings that didn't fit enywhere else"
 msgstr "Einstellungen welche in keine andere Kategorie passten"
@@ -7542,10 +7601,6 @@ msgstr "Anpassung"
 msgid "Customize export options"
 msgstr "Exportoptionen anpassen"
 
-#: setup/lib/messages.inc.php:137
-msgid "Features"
-msgstr "Features"
-
 #: setup/lib/messages.inc.php:138
 msgid "Customize import defaults"
 msgstr "Importeinstellungen anpassen"
@@ -7618,10 +7673,6 @@ msgstr ""
 "Dekompression[/a] benötigt Funktionen (%s), welche auf diesem System nicht "
 "verfügbar sind."
 
-#: setup/lib/messages.inc.php:152
-msgid "phpMyAdmin homepage"
-msgstr "phpMyAdmin-Homepage"
-
 #: setup/lib/messages.inc.php:153
 msgid "Extra parameters for iconv"
 msgstr "Extra Parameter für iconv"
@@ -7670,14 +7721,6 @@ msgstr "Teilimport: Überspringe Anfragen"
 msgid "Insecure connection"
 msgstr "Unsichere Verbindung"
 
-#: setup/lib/messages.inc.php:164
-msgid ""
-"You are not using a secure connection; all data (including potentially "
-"sensitive information, like passwords) is transferred unencrypted!"
-msgstr ""
-"Sie benutzen keine sichere Verbindung. Alle Daten (einschließlich sensitive "
-"Information wie Passwörter) werden unverschlüsselt übertragen!"
-
 #: setup/lib/messages.inc.php:165
 #, php-format
 msgid ""
@@ -7784,10 +7827,6 @@ msgstr "Zeile unter Mauscursor hervorheben"
 msgid "Enable highlighting"
 msgstr ""
 
-#: setup/lib/messages.inc.php:187
-msgid "let the user choose"
-msgstr "lass den Benutzer entscheiden"
-
 #: setup/lib/messages.inc.php:188
 msgid "Use less graphically intense tabs"
 msgstr ""
@@ -7796,10 +7835,6 @@ msgstr ""
 msgid "Light tabs"
 msgstr ""
 
-#: setup/lib/messages.inc.php:190
-msgid "Load"
-msgstr "Laden"
-
 #: setup/lib/messages.inc.php:191
 msgid ""
 "If TRUE, logout deletes cookies for all servers; when set to FALSE, logout "
@@ -7907,14 +7942,6 @@ msgstr ""
 msgid "Iconic navigation bar"
 msgstr ""
 
-#: setup/lib/messages.inc.php:212
-msgid "New server"
-msgstr "Neuer Server"
-
-#: setup/lib/messages.inc.php:213
-msgid "There are no configured servers"
-msgstr "Es sind keine Server konfiguriert"
-
 #: setup/lib/messages.inc.php:214
 msgid "use GZip output buffering for increased speed in HTTP transfers"
 msgstr ""
@@ -7923,10 +7950,6 @@ msgstr ""
 msgid "GZip output buffering"
 msgstr "GZip Ausgabepufferung"
 
-#: setup/lib/messages.inc.php:216
-msgid "- none -"
-msgstr "- kein -"
-
 #: setup/lib/messages.inc.php:217
 msgid ""
 "[kbd]SMART[/kbd] - i.e. descending order for fields of type TIME, DATE, "
@@ -7937,10 +7960,6 @@ msgstr ""
 msgid "Default sorting order"
 msgstr ""
 
-#: setup/lib/messages.inc.php:219
-msgid "Overview"
-msgstr "Übersicht"
-
 #: setup/lib/messages.inc.php:220
 msgid "Use persistent connections to MySQL databases"
 msgstr ""
@@ -7995,10 +8014,6 @@ msgstr ""
 msgid "Recoding engine"
 msgstr "Umwandlungs Engine"
 
-#: setup/lib/messages.inc.php:234
-msgid "Restore default value"
-msgstr "Standard wiederherstellen"
-
 #: setup/lib/messages.inc.php:235
 msgid "Try to revert erroneous fields to their default values"
 msgstr "Versuche fehlerhafte Werte auf den Standardwert zu setzen"
@@ -8035,10 +8050,6 @@ msgstr "Sie sollten mysqli wegen der Performance benutzen"
 msgid "You allow for connecting to the server without a password."
 msgstr "Sie erlauben Verbindungen mit dem Server ohne Passwort."
 
-#: setup/lib/messages.inc.php:241
-msgid "Add a new server"
-msgstr "Server hinzufügen"
-
 #: setup/lib/messages.inc.php:242
 msgid "Leave blank if not used"
 msgstr ""
@@ -8190,10 +8201,6 @@ msgstr ""
 "Basierter Schutz kann unzuverlässig sein, wenn die IP einem ISP gehört, mit "
 "dem tausende Benutzer, einschließlich Ihnen, verbunden sind."
 
-#: setup/lib/messages.inc.php:272
-msgid "Edit server"
-msgstr "Server editieren"
-
 #: setup/lib/messages.inc.php:273
 msgid "What PHP extension to use; you should use mysqli if supported"
 msgstr ""
@@ -8448,11 +8455,6 @@ msgstr ""
 msgid "Verbose name of this server"
 msgstr "Serverbezeichnung"
 
-#: setup/lib/messages.inc.php:328
-#, php-format
-msgid "Set value: %s"
-msgstr "Setze Wert: %s"
-
 #: setup/lib/messages.inc.php:329
 msgid ""
 "Whether a user should be displayed a "show all (records)" button"
@@ -8489,10 +8491,6 @@ msgstr ""
 msgid "Show function fields"
 msgstr ""
 
-#: setup/lib/messages.inc.php:337
-msgid "Show hidden messages (#MSG_COUNT)"
-msgstr "Ausgeblendete Nachrichten anzeigen (#MSG_COUNT)"
-
 #: setup/lib/messages.inc.php:338
 msgid ""
 "Shows link to [a at http://php.net/manual
/function.phpinfo.php]phpinfo()[/a] "
@@ -8624,10 +8622,6 @@ msgstr ""
 msgid "Got invalid version string from server"
 msgstr "Ungültige Versionsinformation erhalten"
 
-#: setup/lib/messages.inc.php:370
-msgid "Check for latest version"
-msgstr "Auf neue Version prüfen"
-
 #: setup/lib/messages.inc.php:371
 #, php-format
 msgid ""
@@ -8668,10 +8662,6 @@ msgstr ""
 "Weder URL Wrapper noch CURL sind verfügbar. Versionsüberprüfung ist nicht "
 "möglich."
 
-#: setup/lib/messages.inc.php:377
-msgid "Warning"
-msgstr "Warnung"
-
 #: setup/lib/messages.inc.php:378
 #, fuzzy
 msgid ""
@@ -8740,3 +8730,17 @@ msgstr "Index über %s Spalten anlegen"
 msgctxt "for MIME transformation"
 msgid "Description"
 msgstr "Beschreibung"
+
+#, fuzzy
+#~| msgid ""
+#~| "However on last run no data has been parsed, this usually means "
+#~| "phpMyAdmin won't be able to finish this import unless you increase php "
+#~| "time limits."
+#~ msgid ""
+#~ "However on last run no data has been parsed, this usually means "
+#~ "phpMyAdmin won"
+#~ msgstr ""
+#~ "Allerdings wurden hierbei keine Daten eingelesen. Das bedeutet in der "
+#~ "Regel, dass phpMyAdmin nicht in der Lage sein wird, den Import zu "
+#~ "beenden, sofern nicht die Ausführungszeitbeschränkungen von php gelockert "
+#~ "werden."
diff --git a/po/el.po b/po/el.po
index 436a3cb..d7fd964 100644
--- a/po/el.po
+++ b/po/el.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-14 07:48-0400\n"
+"POT-Creation-Date: 2010-05-14 13:39-0400\n"
 "PO-Revision-Date: 2010-03-30 23:16+0200\n"
 "Last-Translator: Michal <michal at cihar.com>\n"
 "Language-Team: greek <el at li.org>\n"
@@ -949,15 +949,10 @@ msgstr ""
 "Το χρονικό όριο του κώδικα εξαντλήθηκε. Αν θέλετε να τελειώσετε την "
 "εισαγωγή, επανυποβάλτε το ίδιο αρχείο και η εισαγωγή θα συνεχίσει."
 
-#: import.php:426
-#, fuzzy
-#| msgid ""
-#| "However on last run no data has been parsed, this usually means "
-#| "phpMyAdmin won't be able to finish this import unless you increase php "
-#| "time limits."
+#: import.php:426 libraries/messages.inc.php:1102
 msgid ""
 "However on last run no data has been parsed, this usually means phpMyAdmin "
-"won"
+"won't be able to finish this import unless you increase php time limits."
 msgstr ""
 "Ωστόσο, στην τελευταία εκτέλεση δεν αναλύθηκαν δεδομένα. Αυτό συνήθως "
 "σημαίνει ότι το phpMyAdmin δεν θα μπορέσει να τελειώσει την εισαγωγή εκτός "
@@ -6512,15 +6507,6 @@ msgstr "Διεργασίες"
 msgid "Thread %s was successfully killed."
 msgstr "Η λειτουργία %s διεκόπη."
 
-#: libraries/messages.inc.php:1102
-msgid ""
-"However on last run no data has been parsed, this usually means phpMyAdmin "
-"won't be able to finish this import unless you increase php time limits."
-msgstr ""
-"Ωστόσο, στην τελευταία εκτέλεση δεν αναλύθηκαν δεδομένα. Αυτό συνήθως "
-"σημαίνει ότι το phpMyAdmin δεν θα μπορέσει να τελειώσει την εισαγωγή εκτός "
-"και αν αυξήσετε τα χρονικά όρια της php."
-
 #: libraries/messages.inc.php:1105 pmd_pdf.php:94
 msgid "to/from page"
 msgstr "από/προς τη σελίδα"
@@ -7001,7 +6987,8 @@ msgstr "Καμία"
 msgid "Filter"
 msgstr "Φίλτρο"
 
-#: navigation.php:319 setup/lib/messages.inc.php:42
+#: navigation.php:319 setup/frames/index.inc.php:218
+#: setup/lib/messages.inc.php:42
 msgid "Clear"
 msgstr "Καθάρισμα"
 
@@ -7113,6 +7100,115 @@ msgstr "Μη ασφαλής σύνδεση"
 msgid "Configuration: %s"
 msgstr "Αρχείο ρυθμίσεων"
 
+#: setup/frames/config.inc.php:25 setup/frames/index.inc.php:152
+#: setup/lib/messages.inc.php:45
+msgid "Configuration file"
+msgstr "Αρχείο ρυθμίσεων"
+
+#: setup/frames/config.inc.php:38 setup/frames/index.inc.php:212
+#: setup/lib/messages.inc.php:65
+msgid "Download"
+msgstr "Λήψη"
+
+#: setup/frames/index.inc.php:58 setup/lib/messages.inc.php:164
+msgid ""
+"You are not using a secure connection; all data (including potentially "
+"sensitive information, like passwords) is transferred unencrypted!"
+msgstr ""
+"Δεν χρησιμοποιείτε ασφαλή σύνδεση: όλα τα δεδομένα (ακόμα και δυνητικά "
+"ευαίσθητες πληροφορίες, όπως οι κωδικοί πρόσβασης) διακινούνται "
+"ακρυπτογράφητα!"
+
+#: setup/frames/index.inc.php:87 setup/frames/menu.inc.php:17
+#: setup/lib/messages.inc.php:219
+msgid "Overview"
+msgstr "Επισκόπηση"
+
+#: setup/frames/index.inc.php:95 setup/lib/messages.inc.php:337
+msgid "Show hidden messages (#MSG_COUNT)"
+msgstr "Εμφάνιση κρυφών μηνυμάτων (#MSG_COUNT)"
+
+#: setup/frames/index.inc.php:135 setup/lib/messages.inc.php:213
+msgid "There are no configured servers"
+msgstr "Δεν υπάρχουν ρυθμισμένοι διακομιστές"
+
+#: setup/frames/index.inc.php:143 setup/lib/messages.inc.php:212
+msgid "New server"
+msgstr "Νέος διακομιστής"
+
+#: setup/frames/index.inc.php:172 setup/lib/messages.inc.php:50
+msgid "Default language"
+msgstr "Προεπιλεγμένη γλώσσα"
+
+#: setup/frames/index.inc.php:182 setup/lib/messages.inc.php:187
+msgid "let the user choose"
+msgstr "Δικαίωμα επιλογής στο χρήστη"
+
+#: setup/frames/index.inc.php:193 setup/lib/messages.inc.php:216
+msgid "- none -"
+msgstr "- καμία -"
+
+#: setup/frames/index.inc.php:196 setup/lib/messages.inc.php:51
+msgid "Default server"
+msgstr "Προεπιλεγμένος διακομιστής"
+
+#: setup/frames/index.inc.php:206 setup/lib/messages.inc.php:66
+msgid "End of line"
+msgstr "Τέλος γραμμής"
+
+#: setup/frames/index.inc.php:211 setup/lib/messages.inc.php:61
+msgid "Display"
+msgstr "Προβολή"
+
+#: setup/frames/index.inc.php:215 setup/lib/messages.inc.php:190
+msgid "Load"
+msgstr "Φόρτωση"
+
+#: setup/frames/index.inc.php:226 setup/lib/messages.inc.php:152
+msgid "phpMyAdmin homepage"
+msgstr "Ιστοσελίδα phpMyAdmin"
+
+#: setup/frames/index.inc.php:227 setup/lib/messages.inc.php:64
+msgid "Donate"
+msgstr "Δωρεά"
+
+#: setup/frames/index.inc.php:228 setup/lib/messages.inc.php:370
+msgid "Check for latest version"
+msgstr "Έλεγχος για τελευταία έκδοση"
+
+#: setup/frames/menu.inc.php:18 setup/lib/messages.inc.php:137
+msgid "Features"
+msgstr "Χαρακτηριστικά"
+
+#: setup/frames/menu.inc.php:19 setup/lib/messages.inc.php:113
+msgid "Navigation frame"
+msgstr "Πλαίσιο πλοήγησης"
+
+#: setup/frames/menu.inc.php:20 setup/lib/messages.inc.php:118
+msgid "Main frame"
+msgstr "Βασικό πλαίσιο"
+
+#: setup/frames/servers.inc.php:28 setup/lib/messages.inc.php:272
+msgid "Edit server"
+msgstr "Επεξεργασία διακομιστή"
+
+#: setup/frames/servers.inc.php:37 setup/lib/messages.inc.php:241
+msgid "Add a new server"
+msgstr "Προσθήκη ενός νέου διακομιστή"
+
+#: setup/lib/FormDisplay.tpl.php:182 setup/lib/messages.inc.php:328
+#, php-format
+msgid "Set value: %s"
+msgstr "Ορισμός τιμής: %s"
+
+#: setup/lib/FormDisplay.tpl.php:187 setup/lib/messages.inc.php:234
+msgid "Restore default value"
+msgstr "Επαναφορά προεπιλεγμένης τιμής"
+
+#: setup/lib/form_processing.lib.php:43 setup/lib/messages.inc.php:377
+msgid "Warning"
+msgstr "Προειδοποίηση"
+
 #: setup/lib/messages.inc.php:16
 msgid "Allow character set conversion"
 msgstr "Άδεια μετατροπής συνόλου χαρακτήρων"
@@ -7282,10 +7378,6 @@ msgstr ""
 msgid "Compress on the fly"
 msgstr "Άμεση συμπίεση"
 
-#: setup/lib/messages.inc.php:45
-msgid "Configuration file"
-msgstr "Αρχείο ρυθμίσεων"
-
 #: setup/lib/messages.inc.php:46
 msgid ""
 "Whether a warning ("Are your really sure...") should be displayed "
@@ -7306,14 +7398,6 @@ msgstr "Προεπιλεγμένο σύνολο χαρακτήρων για με
 msgid "Default character set"
 msgstr "Προεπιλεγμένο σύνολο χαρακτήρων"
 
-#: setup/lib/messages.inc.php:50
-msgid "Default language"
-msgstr "Προεπιλεγμένη γλώσσα"
-
-#: setup/lib/messages.inc.php:51
-msgid "Default server"
-msgstr "Προεπιλεγμένος διακομιστής"
-
 #: setup/lib/messages.inc.php:52
 msgid "Tab that is displayed when entering a database"
 msgstr "Προβαλόμενη καρτέλα κατά το άνοιγμα της βάσης δεδομένων"
@@ -7355,10 +7439,6 @@ msgstr "Εμφάνιση λίστας βάσεων δεδομένων ως λί
 msgid "Display databases as a list"
 msgstr "Προβολή βάσεων δεδομένων ως λίστα"
 
-#: setup/lib/messages.inc.php:61
-msgid "Display"
-msgstr "Προβολή"
-
 #: setup/lib/messages.inc.php:62
 msgid "Show server listing as a list instead of a drop down"
 msgstr "Εμφάνιση λίστας διακομιστών ως λίστα και όχι ως αναδυόμενο μενού"
@@ -7367,18 +7447,6 @@ msgstr "Εμφάνιση λίστας διακομιστών ως λίστα κ
 msgid "Display servers as a list"
 msgstr "Προβολή διακομιστών ως λίστα"
 
-#: setup/lib/messages.inc.php:64
-msgid "Donate"
-msgstr "Δωρεά"
-
-#: setup/lib/messages.inc.php:65
-msgid "Download"
-msgstr "Λήψη"
-
-#: setup/lib/messages.inc.php:66
-msgid "End of line"
-msgstr "Τέλος γραμμής"
-
 #: setup/lib/messages.inc.php:67
 msgid "Could not connect to MySQL server"
 msgstr "Αδύνατη η σύνδεση στο διακομιστή MySQL"
@@ -7563,10 +7631,6 @@ msgstr "Επιλογές προβολής βάσεων δεδομένων"
 msgid "Customize appearance of the navigation frame"
 msgstr "Προσαρμογή εμφάνισης του πλαισίου πλοήγησης"
 
-#: setup/lib/messages.inc.php:113
-msgid "Navigation frame"
-msgstr "Πλαίσιο πλοήγησης"
-
 #: setup/lib/messages.inc.php:114
 msgid "Servers display options"
 msgstr "Επιλογές προβολής διακομιστών"
@@ -7575,10 +7639,6 @@ msgstr "Επιλογές προβολής διακομιστών"
 msgid "Tables display options"
 msgstr "Επιλογές προβολής πινάκων"
 
-#: setup/lib/messages.inc.php:118
-msgid "Main frame"
-msgstr "Βασικό πλαίσιο"
-
 #: setup/lib/messages.inc.php:119
 msgid "Settings that didn't fit enywhere else"
 msgstr "Ρυθμίσεις που δεν ανήκουν κάπου αλλού"
@@ -7661,10 +7721,6 @@ msgstr "Προσαρμογή"
 msgid "Customize export options"
 msgstr "Προσαρμογή επιλογών εξαγωγής"
 
-#: setup/lib/messages.inc.php:137
-msgid "Features"
-msgstr "Χαρακτηριστικά"
-
 #: setup/lib/messages.inc.php:138
 msgid "Customize import defaults"
 msgstr "Προσαρμογή επιλογών εισαγωγής"
@@ -7737,10 +7793,6 @@ msgstr ""
 "αποσυμπίεση GZip[/a] απαιτεί λειτουργίες (%s) που δεν είναι διαθέσιμες σε "
 "αυτό το σύστημα."
 
-#: setup/lib/messages.inc.php:152
-msgid "phpMyAdmin homepage"
-msgstr "Ιστοσελίδα phpMyAdmin"
-
 #: setup/lib/messages.inc.php:153
 msgid "Extra parameters for iconv"
 msgstr "Επιπλέον παράμετροι για την iconv"
@@ -7792,15 +7844,6 @@ msgstr "Μερική εισαγωγή: παράβλεψη ερωτημάτων"
 msgid "Insecure connection"
 msgstr "Μη ασφαλής σύνδεση"
 
-#: setup/lib/messages.inc.php:164
-msgid ""
-"You are not using a secure connection; all data (including potentially "
-"sensitive information, like passwords) is transferred unencrypted!"
-msgstr ""
-"Δεν χρησιμοποιείτε ασφαλή σύνδεση: όλα τα δεδομένα (ακόμα και δυνητικά "
-"ευαίσθητες πληροφορίες, όπως οι κωδικοί πρόσβασης) διακινούνται "
-"ακρυπτογράφητα!"
-
 #: setup/lib/messages.inc.php:165
 #, php-format
 msgid ""
@@ -7903,10 +7946,6 @@ msgstr "Επισήμανση διακομιστή με τον δείκτη το
 msgid "Enable highlighting"
 msgstr "Ενεργοποίηση επισήμανσης"
 
-#: setup/lib/messages.inc.php:187
-msgid "let the user choose"
-msgstr "Δικαίωμα επιλογής στο χρήστη"
-
 #: setup/lib/messages.inc.php:188
 msgid "Use less graphically intense tabs"
 msgstr "Χρήση καρτελών με λιγότερα γραφικά"
@@ -7915,10 +7954,6 @@ msgstr "Χρήση καρτελών με λιγότερα γραφικά"
 msgid "Light tabs"
 msgstr "Απλές καρτέλες"
 
-#: setup/lib/messages.inc.php:190
-msgid "Load"
-msgstr "Φόρτωση"
-
 #: setup/lib/messages.inc.php:191
 msgid ""
 "If TRUE, logout deletes cookies for all servers; when set to FALSE, logout "
@@ -8041,14 +8076,6 @@ msgstr "Χρήση μόνο εικονιδίων, μόνο κειμένου ή 
 msgid "Iconic navigation bar"
 msgstr "Γραμμή πλοήγησης με εικονίδια"
 
-#: setup/lib/messages.inc.php:212
-msgid "New server"
-msgstr "Νέος διακομιστής"
-
-#: setup/lib/messages.inc.php:213
-msgid "There are no configured servers"
-msgstr "Δεν υπάρχουν ρυθμισμένοι διακομιστές"
-
 #: setup/lib/messages.inc.php:214
 msgid "use GZip output buffering for increased speed in HTTP transfers"
 msgstr ""
@@ -8058,10 +8085,6 @@ msgstr ""
 msgid "GZip output buffering"
 msgstr "Εξαγόμενο GZip buffering"
 
-#: setup/lib/messages.inc.php:216
-msgid "- none -"
-msgstr "- καμία -"
-
 #: setup/lib/messages.inc.php:217
 msgid ""
 "[kbd]SMART[/kbd] - i.e. descending order for fields of type TIME, DATE, "
@@ -8074,10 +8097,6 @@ msgstr ""
 msgid "Default sorting order"
 msgstr "Προεπιλεγμένη ταξινόμηση"
 
-#: setup/lib/messages.inc.php:219
-msgid "Overview"
-msgstr "Επισκόπηση"
-
 #: setup/lib/messages.inc.php:220
 msgid "Use persistent connections to MySQL databases"
 msgstr "Χρήση εξαναγκασμένων συνδέσεων στις βάσεις δεδομένων MySQL"
@@ -8137,10 +8156,6 @@ msgstr ""
 msgid "Recoding engine"
 msgstr "Μηχανή επανακωδικοποίησης"
 
-#: setup/lib/messages.inc.php:234
-msgid "Restore default value"
-msgstr "Επαναφορά προεπιλεγμένης τιμής"
-
 #: setup/lib/messages.inc.php:235
 msgid "Try to revert erroneous fields to their default values"
 msgstr "Δοκιμή μετατροπής εσφαλμένων πεδίων στις προεπιλεγμένες τιμές τους"
@@ -8176,10 +8191,6 @@ msgstr "Πρέπει να χρησιμοποιείτε την mysqli για λό
 msgid "You allow for connecting to the server without a password."
 msgstr "Επιτρέπετε την σύνδεση στο διακομιστή χωρίς κωδικό πρόσβασης."
 
-#: setup/lib/messages.inc.php:241
-msgid "Add a new server"
-msgstr "Προσθήκη ενός νέου διακομιστή"
-
 #: setup/lib/messages.inc.php:242
 msgid "Leave blank if not used"
 msgstr "Αφήστε το άδειο αν δεν χρησιμοποιηθεί"
@@ -8342,10 +8353,6 @@ msgstr ""
 "βασισμένη στις ΙΡ προστασία δεν είναι αξιόπιστη αν ο πάροχός έχει χιλιάδες "
 "χρήστες που συνδέονται."
 
-#: setup/lib/messages.inc.php:272
-msgid "Edit server"
-msgstr "Επεξεργασία διακομιστή"
-
 #: setup/lib/messages.inc.php:273
 msgid "What PHP extension to use; you should use mysqli if supported"
 msgstr ""
@@ -8628,11 +8635,6 @@ msgstr ""
 msgid "Verbose name of this server"
 msgstr "Φιλοχρηστικό όνομα διακομιστή"
 
-#: setup/lib/messages.inc.php:328
-#, php-format
-msgid "Set value: %s"
-msgstr "Ορισμός τιμής: %s"
-
 #: setup/lib/messages.inc.php:329
 msgid ""
 "Whether a user should be displayed a "show all (records)" button"
@@ -8673,10 +8675,6 @@ msgstr "Προβολή των πεδίων συναρτήσεων σε κατά
 msgid "Show function fields"
 msgstr "Εμφάνιση πεδίων συναρτήσεων"
 
-#: setup/lib/messages.inc.php:337
-msgid "Show hidden messages (#MSG_COUNT)"
-msgstr "Εμφάνιση κρυφών μηνυμάτων (#MSG_COUNT)"
-
 #: setup/lib/messages.inc.php:338
 msgid ""
 "Shows link to [a at http://php.net/manual/function.phpinfo.php]phpinfo()[/a] "
@@ -8831,10 +8829,6 @@ msgstr ""
 msgid "Got invalid version string from server"
 msgstr "Ελήφθει μη έγκυρη έκδοση από τον διακομιστή"
 
-#: setup/lib/messages.inc.php:370
-msgid "Check for latest version"
-msgstr "Έλεγχος για τελευταία έκδοση"
-
 #: setup/lib/messages.inc.php:371
 #, php-format
 msgid ""
@@ -8875,10 +8869,6 @@ msgstr ""
 "Ούτε διεύθυνση URL ούτε CURL είναι διαθέσιμα. Ο έλεγχος της έκδοσης δεν "
 "είναι δυνατό να γίνει."
 
-#: setup/lib/messages.inc.php:377
-msgid "Warning"
-msgstr "Προειδοποίηση"
-
 #: setup/lib/messages.inc.php:378
 msgid ""
 "Enable [a at http://en.wikipedia.org/wiki/ZIP_(file_format)]ZIP[/a] compression "
@@ -8948,6 +8938,19 @@ msgid "Description"
 msgstr "Περιγραφή"
 
 #, fuzzy
+#~| msgid ""
+#~| "However on last run no data has been parsed, this usually means "
+#~| "phpMyAdmin won't be able to finish this import unless you increase php "
+#~| "time limits."
+#~ msgid ""
+#~ "However on last run no data has been parsed, this usually means "
+#~ "phpMyAdmin won"
+#~ msgstr ""
+#~ "Ωστόσο, στην τελευταία εκτέλεση δεν αναλύθηκαν δεδομένα. Αυτό συνήθως "
+#~ "σημαίνει ότι το phpMyAdmin δεν θα μπορέσει να τελειώσει την εισαγωγή "
+#~ "εκτός και αν αυξήσετε τα χρονικά όρια της php."
+
+#, fuzzy
 #~| msgid "None"
 #~ msgctxt "None action"
 #~ msgid "None"
diff --git a/po/en_GB.po b/po/en_GB.po
index 4f4ca98..0fd368b 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-14 07:48-0400\n"
+"POT-Creation-Date: 2010-05-14 13:39-0400\n"
 "PO-Revision-Date: 2010-05-10 14:24+0200\n"
 "Last-Translator: Michal <michal at cihar.com>\n"
 "Language-Team: english-gb <en_GB at li.org>\n"
@@ -940,15 +940,10 @@ msgstr ""
 "Script timeout passed, if you want to finish import, please resubmit same "
 "file and import will resume."
 
-#: import.php:426
-#, fuzzy
-#| msgid ""
-#| "However on last run no data has been parsed, this usually means "
-#| "phpMyAdmin won't be able to finish this import unless you increase php "
-#| "time limits."
+#: import.php:426 libraries/messages.inc.php:1102
 msgid ""
 "However on last run no data has been parsed, this usually means phpMyAdmin "
-"won"
+"won't be able to finish this import unless you increase php time limits."
 msgstr ""
 "However on last run no data has been parsed, this usually means phpMyAdmin "
 "won't be able to finish this import unless you increase php time limits."
@@ -6332,14 +6327,6 @@ msgstr "Threads"
 msgid "Thread %s was successfully killed."
 msgstr "Thread %s was successfully killed."
 
-#: libraries/messages.inc.php:1102
-msgid ""
-"However on last run no data has been parsed, this usually means phpMyAdmin "
-"won't be able to finish this import unless you increase php time limits."
-msgstr ""
-"However on last run no data has been parsed, this usually means phpMyAdmin "
-"won't be able to finish this import unless you increase php time limits."
-
 #: libraries/messages.inc.php:1105 pmd_pdf.php:94
 msgid "to/from page"
 msgstr "to/from page"
@@ -6808,7 +6795,8 @@ msgstr "None"
 msgid "Filter"
 msgstr "Filter"
 
-#: navigation.php:319 setup/lib/messages.inc.php:42
+#: navigation.php:319 setup/frames/index.inc.php:218
+#: setup/lib/messages.inc.php:42
 msgid "Clear"
 msgstr "Clear"
 
@@ -6888,6 +6876,114 @@ msgstr "Current connection"
 msgid "Configuration: %s"
 msgstr "Configuration: %s"
 
+#: setup/frames/config.inc.php:25 setup/frames/index.inc.php:152
+#: setup/lib/messages.inc.php:45
+msgid "Configuration file"
+msgstr "Configuration file"
+
+#: setup/frames/config.inc.php:38 setup/frames/index.inc.php:212
+#: setup/lib/messages.inc.php:65
+msgid "Download"
+msgstr "Download"
+
+#: setup/frames/index.inc.php:58 setup/lib/messages.inc.php:164
+msgid ""
+"You are not using a secure connection; all data (including potentially "
+"sensitive information, like passwords) is transferred unencrypted!"
+msgstr ""
+"You are not using a secure connection; all data (including potentially "
+"sensitive information, like passwords) is transferred unencrypted!"
+
+#: setup/frames/index.inc.php:87 setup/frames/menu.inc.php:17
+#: setup/lib/messages.inc.php:219
+msgid "Overview"
+msgstr "Overview"
+
+#: setup/frames/index.inc.php:95 setup/lib/messages.inc.php:337
+msgid "Show hidden messages (#MSG_COUNT)"
+msgstr "Show hidden messages (#MSG_COUNT)"
+
+#: setup/frames/index.inc.php:135 setup/lib/messages.inc.php:213
+msgid "There are no configured servers"
+msgstr "There are no configured servers"
+
+#: setup/frames/index.inc.php:143 setup/lib/messages.inc.php:212
+msgid "New server"
+msgstr "New server"
+
+#: setup/frames/index.inc.php:172 setup/lib/messages.inc.php:50
+msgid "Default language"
+msgstr "Default language"
+
+#: setup/frames/index.inc.php:182 setup/lib/messages.inc.php:187
+msgid "let the user choose"
+msgstr "let the user choose"
+
+#: setup/frames/index.inc.php:193 setup/lib/messages.inc.php:216
+msgid "- none -"
+msgstr "- none -"
+
+#: setup/frames/index.inc.php:196 setup/lib/messages.inc.php:51
+msgid "Default server"
+msgstr "Default server"
+
+#: setup/frames/index.inc.php:206 setup/lib/messages.inc.php:66
+msgid "End of line"
+msgstr "End of line"
+
+#: setup/frames/index.inc.php:211 setup/lib/messages.inc.php:61
+msgid "Display"
+msgstr "Display"
+
+#: setup/frames/index.inc.php:215 setup/lib/messages.inc.php:190
+msgid "Load"
+msgstr "Load"
+
+#: setup/frames/index.inc.php:226 setup/lib/messages.inc.php:152
+msgid "phpMyAdmin homepage"
+msgstr "phpMyAdmin homepage"
+
+#: setup/frames/index.inc.php:227 setup/lib/messages.inc.php:64
+msgid "Donate"
+msgstr "Donate"
+
+#: setup/frames/index.inc.php:228 setup/lib/messages.inc.php:370
+msgid "Check for latest version"
+msgstr "Check for latest version"
+
+#: setup/frames/menu.inc.php:18 setup/lib/messages.inc.php:137
+msgid "Features"
+msgstr "Features"
+
+#: setup/frames/menu.inc.php:19 setup/lib/messages.inc.php:113
+msgid "Navigation frame"
+msgstr "Navigation frame"
+
+#: setup/frames/menu.inc.php:20 setup/lib/messages.inc.php:118
+msgid "Main frame"
+msgstr "Main frame"
+
+#: setup/frames/servers.inc.php:28 setup/lib/messages.inc.php:272
+msgid "Edit server"
+msgstr "Edit server"
+
+#: setup/frames/servers.inc.php:37 setup/lib/messages.inc.php:241
+msgid "Add a new server"
+msgstr "Add a new server"
+
+#: setup/lib/FormDisplay.tpl.php:182 setup/lib/messages.inc.php:328
+#, php-format
+msgid "Set value: %s"
+msgstr "Set value: %s"
+
+#: setup/lib/FormDisplay.tpl.php:187 setup/lib/messages.inc.php:234
+msgid "Restore default value"
+msgstr "Restore default value"
+
+#: setup/lib/form_processing.lib.php:43 setup/lib/messages.inc.php:377
+msgid "Warning"
+msgstr "Warning"
+
 #: setup/lib/messages.inc.php:16
 msgid "Allow character set conversion"
 msgstr "Allow character set conversion"
@@ -7051,10 +7147,6 @@ msgstr ""
 msgid "Compress on the fly"
 msgstr "Compress on the fly"
 
-#: setup/lib/messages.inc.php:45
-msgid "Configuration file"
-msgstr "Configuration file"
-
 #: setup/lib/messages.inc.php:46
 msgid ""
 "Whether a warning ("Are your really sure...") should be displayed "
@@ -7075,14 +7167,6 @@ msgstr "Default character set used for conversions"
 msgid "Default character set"
 msgstr "Default character set"
 
-#: setup/lib/messages.inc.php:50
-msgid "Default language"
-msgstr "Default language"
-
-#: setup/lib/messages.inc.php:51
-msgid "Default server"
-msgstr "Default server"
-
 #: setup/lib/messages.inc.php:52
 msgid "Tab that is displayed when entering a database"
 msgstr "Tab that is displayed when entering a database"
@@ -7123,10 +7207,6 @@ msgstr "Show database listing as a list instead of a drop down"
 msgid "Display databases as a list"
 msgstr "Display databases as a list"
 
-#: setup/lib/messages.inc.php:61
-msgid "Display"
-msgstr "Display"
-
 #: setup/lib/messages.inc.php:62
 msgid "Show server listing as a list instead of a drop down"
 msgstr "Show server listing as a list instead of a drop down"
@@ -7135,18 +7215,6 @@ msgstr "Show server listing as a list instead of a drop down"
 msgid "Display servers as a list"
 msgstr "Display servers as a list"
 
-#: setup/lib/messages.inc.php:64
-msgid "Donate"
-msgstr "Donate"
-
-#: setup/lib/messages.inc.php:65
-msgid "Download"
-msgstr "Download"
-
-#: setup/lib/messages.inc.php:66
-msgid "End of line"
-msgstr "End of line"
-
 #: setup/lib/messages.inc.php:67
 msgid "Could not connect to MySQL server"
 msgstr "Could not connect to MySQL server"
@@ -7325,10 +7393,6 @@ msgstr "Databases display options"
 msgid "Customize appearance of the navigation frame"
 msgstr "Customise appearance of the navigation frame"
 
-#: setup/lib/messages.inc.php:113
-msgid "Navigation frame"
-msgstr "Navigation frame"
-
 #: setup/lib/messages.inc.php:114
 msgid "Servers display options"
 msgstr "Servers display options"
@@ -7337,10 +7401,6 @@ msgstr "Servers display options"
 msgid "Tables display options"
 msgstr "Tables display options"
 
-#: setup/lib/messages.inc.php:118
-msgid "Main frame"
-msgstr "Main frame"
-
 #: setup/lib/messages.inc.php:119
 msgid "Settings that didn't fit enywhere else"
 msgstr "Settings that didn't fit enywhere else"
@@ -7424,10 +7484,6 @@ msgstr "Customisation"
 msgid "Customize export options"
 msgstr "Customise export options"
 
-#: setup/lib/messages.inc.php:137
-msgid "Features"
-msgstr "Features"
-
 #: setup/lib/messages.inc.php:138
 msgid "Customize import defaults"
 msgstr "Customise import defaults"
@@ -7499,10 +7555,6 @@ msgstr ""
 "decompression[/a] requires functions (%s) which are unavailable on this "
 "system."
 
-#: setup/lib/messages.inc.php:152
-msgid "phpMyAdmin homepage"
-msgstr "phpMyAdmin homepage"
-
 #: setup/lib/messages.inc.php:153
 msgid "Extra parameters for iconv"
 msgstr "Extra parameters for iconv"
@@ -7553,14 +7605,6 @@ msgstr "Partial import: skip queries"
 msgid "Insecure connection"
 msgstr "Insecure connection"
 
-#: setup/lib/messages.inc.php:164
-msgid ""
-"You are not using a secure connection; all data (including potentially "
-"sensitive information, like passwords) is transferred unencrypted!"
-msgstr ""
-"You are not using a secure connection; all data (including potentially "
-"sensitive information, like passwords) is transferred unencrypted!"
-
 #: setup/lib/messages.inc.php:165
 #, php-format
 msgid ""
@@ -7662,10 +7706,6 @@ msgstr "Highlight server under the mouse cursor"
 msgid "Enable highlighting"
 msgstr "Enable highlighting"
 
-#: setup/lib/messages.inc.php:187
-msgid "let the user choose"
-msgstr "let the user choose"
-
 #: setup/lib/messages.inc.php:188
 msgid "Use less graphically intense tabs"
 msgstr "Use less graphically intense tabs"
@@ -7674,10 +7714,6 @@ msgstr "Use less graphically intense tabs"
 msgid "Light tabs"
 msgstr "Light tabs"
 
-#: setup/lib/messages.inc.php:190
-msgid "Load"
-msgstr "Load"
-
 #: setup/lib/messages.inc.php:191
 msgid ""
 "If TRUE, logout deletes cookies for all servers; when set to FALSE, logout "
@@ -7796,14 +7832,6 @@ msgstr "Use only icons, only text or both"
 msgid "Iconic navigation bar"
 msgstr "Iconic navigation bar"
 
-#: setup/lib/messages.inc.php:212
-msgid "New server"
-msgstr "New server"
-
-#: setup/lib/messages.inc.php:213
-msgid "There are no configured servers"
-msgstr "There are no configured servers"
-
 #: setup/lib/messages.inc.php:214
 msgid "use GZip output buffering for increased speed in HTTP transfers"
 msgstr "use GZip output buffering for increased speed in HTTP transfers"
@@ -7812,10 +7840,6 @@ msgstr "use GZip output buffering for increased speed in HTTP transfers"
 msgid "GZip output buffering"
 msgstr "GZip output buffering"
 
-#: setup/lib/messages.inc.php:216
-msgid "- none -"
-msgstr "- none -"
-
 #: setup/lib/messages.inc.php:217
 msgid ""
 "[kbd]SMART[/kbd] - i.e. descending order for fields of type TIME, DATE, "
@@ -7828,10 +7852,6 @@ msgstr ""
 msgid "Default sorting order"
 msgstr "Default sorting order"
 
-#: setup/lib/messages.inc.php:219
-msgid "Overview"
-msgstr "Overview"
-
 #: setup/lib/messages.inc.php:220
 msgid "Use persistent connections to MySQL databases"
 msgstr "Use persistent connections to MySQL databases"
@@ -7888,10 +7908,6 @@ msgstr "Select which functions will be used for character set conversion"
 msgid "Recoding engine"
 msgstr "Recoding engine"
 
-#: setup/lib/messages.inc.php:234
-msgid "Restore default value"
-msgstr "Restore default value"
-
 #: setup/lib/messages.inc.php:235
 msgid "Try to revert erroneous fields to their default values"
 msgstr "Try to revert erroneous fields to their default values"
@@ -7927,10 +7943,6 @@ msgstr "You should use mysqli for performance reasons"
 msgid "You allow for connecting to the server without a password."
 msgstr "You allow for connecting to the server without a password."
 
-#: setup/lib/messages.inc.php:241
-msgid "Add a new server"
-msgstr "Add a new server"
-
 #: setup/lib/messages.inc.php:242
 msgid "Leave blank if not used"
 msgstr "Leave blank if not used"
@@ -8090,10 +8102,6 @@ msgstr ""
 "IP belongs to an ISP where thousands of users, including you, are connected "
 "to."
 
-#: setup/lib/messages.inc.php:272
-msgid "Edit server"
-msgstr "Edit server"
-
 #: setup/lib/messages.inc.php:273
 msgid "What PHP extension to use; you should use mysqli if supported"
 msgstr "What PHP extension to use; you should use mysqli if supported"
@@ -8365,11 +8373,6 @@ msgstr ""
 msgid "Verbose name of this server"
 msgstr "Verbose name of this server"
 
-#: setup/lib/messages.inc.php:328
-#, php-format
-msgid "Set value: %s"
-msgstr "Set value: %s"
-
 #: setup/lib/messages.inc.php:329
 msgid ""
 "Whether a user should be displayed a "show all (records)" button"
@@ -8410,10 +8413,6 @@ msgstr "Display the function fields in edit/insert mode"
 msgid "Show function fields"
 msgstr "Show function fields"
 
-#: setup/lib/messages.inc.php:337
-msgid "Show hidden messages (#MSG_COUNT)"
-msgstr "Show hidden messages (#MSG_COUNT)"
-
 #: setup/lib/messages.inc.php:338
 msgid ""
 "Shows link to [a at http://php.net/manual/function.phpinfo.php]phpinfo()[/a] "
@@ -8563,10 +8562,6 @@ msgstr ""
 msgid "Got invalid version string from server"
 msgstr "Got invalid version string from server"
 
-#: setup/lib/messages.inc.php:370
-msgid "Check for latest version"
-msgstr "Check for latest version"
-
 #: setup/lib/messages.inc.php:371
 #, php-format
 msgid ""
@@ -8603,10 +8598,6 @@ msgid ""
 msgstr ""
 "Neither URL wrapper nor CURL is available. Version check is not possible."
 
-#: setup/lib/messages.inc.php:377
-msgid "Warning"
-msgstr "Warning"
-
 #: setup/lib/messages.inc.php:378
 msgid ""
 "Enable [a at http://en.wikipedia.org/wiki/ZIP_(file_format)]ZIP[/a] compression "
@@ -8663,3 +8654,16 @@ msgstr "Create an index on  %s columns"
 msgctxt "for MIME transformation"
 msgid "Description"
 msgstr "Description"
+
+#, fuzzy
+#~| msgid ""
+#~| "However on last run no data has been parsed, this usually means "
+#~| "phpMyAdmin won't be able to finish this import unless you increase php "
+#~| "time limits."
+#~ msgid ""
+#~ "However on last run no data has been parsed, this usually means "
+#~ "phpMyAdmin won"
+#~ msgstr ""
+#~ "However on last run no data has been parsed, this usually means "
+#~ "phpMyAdmin won't be able to finish this import unless you increase php "
+#~ "time limits."
diff --git a/po/es.po b/po/es.po
index 7f81352..34b5b97 100644
--- a/po/es.po
+++ b/po/es.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-14 07:48-0400\n"
+"POT-Creation-Date: 2010-05-14 13:39-0400\n"
 "PO-Revision-Date: 2010-03-12 11:23+0200\n"
 "Last-Translator: Michal <michal at cihar.com>\n"
 "Language-Team: spanish <es at li.org>\n"
@@ -959,15 +959,10 @@ msgstr ""
 "Se ha agotado el tiempo de ejecución del script; si desea completar la "
 "importación, por favor, reenvíe el mismo archivo y la importación continuará."
 
-#: import.php:426
-#, fuzzy
-#| msgid ""
-#| "However on last run no data has been parsed, this usually means "
-#| "phpMyAdmin won't be able to finish this import unless you increase php "
-#| "time limits."
+#: import.php:426 libraries/messages.inc.php:1102
 msgid ""
 "However on last run no data has been parsed, this usually means phpMyAdmin "
-"won"
+"won't be able to finish this import unless you increase php time limits."
 msgstr ""
 "Sin embargo, en la ejecución más reciente no se procesaron datos.  Esto "
 "usualmente significa que phpMyAdmin no será capaz de completar esta "
@@ -6513,15 +6508,6 @@ msgstr "Procesos"
 msgid "Thread %s was successfully killed."
 msgstr "El proceso %s fue destruido exitosamente."
 
-#: libraries/messages.inc.php:1102
-msgid ""
-"However on last run no data has been parsed, this usually means phpMyAdmin "
-"won't be able to finish this import unless you increase php time limits."
-msgstr ""
-"Sin embargo, en la ejecución más reciente no se procesaron datos.  Esto "
-"usualmente significa que phpMyAdmin no será capaz de completar esta "
-"importación a menos que usted incremente el tiempo de ejecución de php."
-
 #: libraries/messages.inc.php:1105 pmd_pdf.php:94
 msgid "to/from page"
 msgstr "página de/a la"
@@ -7001,7 +6987,8 @@ msgstr "Ninguna"
 msgid "Filter"
 msgstr "Archivos"
 
-#: navigation.php:319 setup/lib/messages.inc.php:42
+#: navigation.php:319 setup/frames/index.inc.php:218
+#: setup/lib/messages.inc.php:42
 msgid "Clear"
 msgstr "Limpiar"
 
@@ -7091,6 +7078,115 @@ msgstr "Conexión insegura"
 msgid "Configuration: %s"
 msgstr "Archivo de configuración"
 
+#: setup/frames/config.inc.php:25 setup/frames/index.inc.php:152
+#: setup/lib/messages.inc.php:45
+msgid "Configuration file"
+msgstr "Archivo de configuración"
+
+#: setup/frames/config.inc.php:38 setup/frames/index.inc.php:212
+#: setup/lib/messages.inc.php:65
+msgid "Download"
+msgstr "Descargar"
+
+#: setup/frames/index.inc.php:58 setup/lib/messages.inc.php:164
+msgid ""
+"You are not using a secure connection; all data (including potentially "
+"sensitive information, like passwords) is transferred unencrypted!"
+msgstr ""
+"Usted no está usando una conexión segura; ¡todos los datos (incluyendo "
+"información potencialmente sensible, como las contraseñas) se transfieren "
+"sin encriptar!"
+
+#: setup/frames/index.inc.php:87 setup/frames/menu.inc.php:17
+#: setup/lib/messages.inc.php:219
+msgid "Overview"
+msgstr "Vista general"
+
+#: setup/frames/index.inc.php:95 setup/lib/messages.inc.php:337
+msgid "Show hidden messages (#MSG_COUNT)"
+msgstr "Mostrar mensajes ocultos (#MSG_COUNT)"
+
+#: setup/frames/index.inc.php:135 setup/lib/messages.inc.php:213
+msgid "There are no configured servers"
+msgstr "No existen servidores configurados"
+
+#: setup/frames/index.inc.php:143 setup/lib/messages.inc.php:212
+msgid "New server"
+msgstr "Nuevo servidor"
+
+#: setup/frames/index.inc.php:172 setup/lib/messages.inc.php:50
+msgid "Default language"
+msgstr "Idioma predeterminado"
+
+#: setup/frames/index.inc.php:182 setup/lib/messages.inc.php:187
+msgid "let the user choose"
+msgstr "permita que el usuario pueda escoger"
+
+#: setup/frames/index.inc.php:193 setup/lib/messages.inc.php:216
+msgid "- none -"
+msgstr "- ninguno -"
+
+#: setup/frames/index.inc.php:196 setup/lib/messages.inc.php:51
+msgid "Default server"
+msgstr "Servidor predeterminado"
+
+#: setup/frames/index.inc.php:206 setup/lib/messages.inc.php:66
+msgid "End of line"
+msgstr "Final de la línea"
+
+#: setup/frames/index.inc.php:211 setup/lib/messages.inc.php:61
+msgid "Display"
+msgstr "Mostrar"
+
+#: setup/frames/index.inc.php:215 setup/lib/messages.inc.php:190
+msgid "Load"
+msgstr "Cargar"
+
+#: setup/frames/index.inc.php:226 setup/lib/messages.inc.php:152
+msgid "phpMyAdmin homepage"
+msgstr "Página de inicio de phpMyAdmin"
+
+#: setup/frames/index.inc.php:227 setup/lib/messages.inc.php:64
+msgid "Donate"
+msgstr "Donación"
+
+#: setup/frames/index.inc.php:228 setup/lib/messages.inc.php:370
+msgid "Check for latest version"
+msgstr "Buscar si existe una versión más reciente"
+
+#: setup/frames/menu.inc.php:18 setup/lib/messages.inc.php:137
+msgid "Features"
+msgstr "Hallazgos"
+
+#: setup/frames/menu.inc.php:19 setup/lib/messages.inc.php:113
+msgid "Navigation frame"
+msgstr "Página con los elementos de navegación"
+
+#: setup/frames/menu.inc.php:20 setup/lib/messages.inc.php:118
+msgid "Main frame"
+msgstr "Página principal"
+
+#: setup/frames/servers.inc.php:28 setup/lib/messages.inc.php:272
+msgid "Edit server"
+msgstr "Editar los parámetros del servidor"
+
+#: setup/frames/servers.inc.php:37 setup/lib/messages.inc.php:241
+msgid "Add a new server"
+msgstr "Añadir un nuevo servidor"
+
+#: setup/lib/FormDisplay.tpl.php:182 setup/lib/messages.inc.php:328
+#, php-format
+msgid "Set value: %s"
+msgstr "Fijar el valor: %s"
+
+#: setup/lib/FormDisplay.tpl.php:187 setup/lib/messages.inc.php:234
+msgid "Restore default value"
+msgstr "Restaurar los valores predeterminados"
+
+#: setup/lib/form_processing.lib.php:43 setup/lib/messages.inc.php:377
+msgid "Warning"
+msgstr "Advertencia"
+
 #: setup/lib/messages.inc.php:16
 msgid "Allow character set conversion"
 msgstr ""
@@ -7258,10 +7354,6 @@ msgstr ""
 msgid "Compress on the fly"
 msgstr "Comprimir sobre la marcha"
 
-#: setup/lib/messages.inc.php:45
-msgid "Configuration file"
-msgstr "Archivo de configuración"
-
 #: setup/lib/messages.inc.php:46
 msgid ""
 "Whether a warning ("Are your really sure...") should be displayed "
@@ -7282,14 +7374,6 @@ msgstr "Juego de caracteres predeterminado usado para conversiones"
 msgid "Default character set"
 msgstr "Juego de caracteres predeterminado"
 
-#: setup/lib/messages.inc.php:50
-msgid "Default language"
-msgstr "Idioma predeterminado"
-
-#: setup/lib/messages.inc.php:51
-msgid "Default server"
-msgstr "Servidor predeterminado"
-
 #: setup/lib/messages.inc.php:52
 msgid "Tab that is displayed when entering a database"
 msgstr "Ceja que se muestra cuando ingresa una base de datos"
@@ -7332,10 +7416,6 @@ msgstr "Muestra los servidores en una lista en lugar de un drop down"
 msgid "Display databases as a list"
 msgstr "Mostrar las bases de datos como una lista"
 
-#: setup/lib/messages.inc.php:61
-msgid "Display"
-msgstr "Mostrar"
-
 #: setup/lib/messages.inc.php:62
 msgid "Show server listing as a list instead of a drop down"
 msgstr "Muestra los servidores en una lista en lugar de un drop down"
@@ -7344,18 +7424,6 @@ msgstr "Muestra los servidores en una lista en lugar de un drop down"
 msgid "Display servers as a list"
 msgstr "Muestra los servidores en una lista"
 
-#: setup/lib/messages.inc.php:64
-msgid "Donate"
-msgstr "Donación"
-
-#: setup/lib/messages.inc.php:65
-msgid "Download"
-msgstr "Descargar"
-
-#: setup/lib/messages.inc.php:66
-msgid "End of line"
-msgstr "Final de la línea"
-
 #: setup/lib/messages.inc.php:67
 msgid "Could not connect to MySQL server"
 msgstr "No pudo conectarse con un servidor MySQL"
@@ -7544,10 +7612,6 @@ msgstr ""
 "Cambiar la apariencia predefinida de la página que contiene los elementos de "
 "navegación"
 
-#: setup/lib/messages.inc.php:113
-msgid "Navigation frame"
-msgstr "Página con los elementos de navegación"
-
 #: setup/lib/messages.inc.php:114
 msgid "Servers display options"
 msgstr "Opciones para visualizar los servidores"
@@ -7556,10 +7620,6 @@ msgstr "Opciones para visualizar los servidores"
 msgid "Tables display options"
 msgstr "Opciones para visualizar las tablas"
 
-#: setup/lib/messages.inc.php:118
-msgid "Main frame"
-msgstr "Página principal"
-
 #: setup/lib/messages.inc.php:119
 msgid "Settings that didn't fit enywhere else"
 msgstr "Parámetros que no encajaban en otra parte"
@@ -7644,10 +7704,6 @@ msgstr "Cambiar los valores predeterminados"
 msgid "Customize export options"
 msgstr "Personalizar las opciones para la exportación"
 
-#: setup/lib/messages.inc.php:137
-msgid "Features"
-msgstr "Hallazgos"
-
 #: setup/lib/messages.inc.php:138
 msgid "Customize import defaults"
 msgstr "Personalizar los parámetros de importación predeterminados"
@@ -7720,10 +7776,6 @@ msgstr ""
 "descompresión GZip[/a] requiere funciones (%s) que no están disponibles en "
 "este sistema."
 
-#: setup/lib/messages.inc.php:152
-msgid "phpMyAdmin homepage"
-msgstr "Página de inicio de phpMyAdmin"
-
 #: setup/lib/messages.inc.php:153
 msgid "Extra parameters for iconv"
 msgstr "Parámetros adicionales para iconv"
@@ -7774,15 +7826,6 @@ msgstr "Importación parcial: saltarse las consultas"
 msgid "Insecure connection"
 msgstr "Conexión insegura"
 
-#: setup/lib/messages.inc.php:164
-msgid ""
-"You are not using a secure connection; all data (including potentially "
-"sensitive information, like passwords) is transferred unencrypted!"
-msgstr ""
-"Usted no está usando una conexión segura; ¡todos los datos (incluyendo "
-"información potencialmente sensible, como las contraseñas) se transfieren "
-"sin encriptar!"
-
 #: setup/lib/messages.inc.php:165
 #, php-format
 msgid ""
@@ -7884,10 +7927,6 @@ msgstr ""
 msgid "Enable highlighting"
 msgstr "Permitir destacar"
 
-#: setup/lib/messages.inc.php:187
-msgid "let the user choose"
-msgstr "permita que el usuario pueda escoger"
-
 #: setup/lib/messages.inc.php:188
 msgid "Use less graphically intense tabs"
 msgstr "Use cejas con menor intensidad gráfica"
@@ -7896,10 +7935,6 @@ msgstr "Use cejas con menor intensidad gráfica"
 msgid "Light tabs"
 msgstr "Cejas claras"
 
-#: setup/lib/messages.inc.php:190
-msgid "Load"
-msgstr "Cargar"
-
 #: setup/lib/messages.inc.php:191
 msgid ""
 "If TRUE, logout deletes cookies for all servers; when set to FALSE, logout "
@@ -8019,14 +8054,6 @@ msgstr "Use solamente íconos, solamente texto o ambos"
 msgid "Iconic navigation bar"
 msgstr "Barra de navegación mediante íconos"
 
-#: setup/lib/messages.inc.php:212
-msgid "New server"
-msgstr "Nuevo servidor"
-
-#: setup/lib/messages.inc.php:213
-msgid "There are no configured servers"
-msgstr "No existen servidores configurados"
-
 #: setup/lib/messages.inc.php:214
 msgid "use GZip output buffering for increased speed in HTTP transfers"
 msgstr ""
@@ -8035,10 +8062,6 @@ msgstr ""
 msgid "GZip output buffering"
 msgstr ""
 
-#: setup/lib/messages.inc.php:216
-msgid "- none -"
-msgstr "- ninguno -"
-
 #: setup/lib/messages.inc.php:217
 msgid ""
 "[kbd]SMART[/kbd] - i.e. descending order for fields of type TIME, DATE, "
@@ -8049,10 +8072,6 @@ msgstr ""
 msgid "Default sorting order"
 msgstr "Orden de despliegue predeterminado"
 
-#: setup/lib/messages.inc.php:219
-msgid "Overview"
-msgstr "Vista general"
-
 #: setup/lib/messages.inc.php:220
 msgid "Use persistent connections to MySQL databases"
 msgstr "Use conexiones persistentes para las bases de datos MySQL"
@@ -8109,10 +8128,6 @@ msgstr ""
 msgid "Recoding engine"
 msgstr "Motor de recodificación"
 
-#: setup/lib/messages.inc.php:234
-msgid "Restore default value"
-msgstr "Restaurar los valores predeterminados"
-
 #: setup/lib/messages.inc.php:235
 msgid "Try to revert erroneous fields to their default values"
 msgstr "Trate de revertir los campos erróneos a sus valores predeterminados"
@@ -8151,10 +8166,6 @@ msgstr "Usted debe utilizar mysqli por razones de mantenimiento"
 msgid "You allow for connecting to the server without a password."
 msgstr ""
 
-#: setup/lib/messages.inc.php:241
-msgid "Add a new server"
-msgstr "Añadir un nuevo servidor"
-
 #: setup/lib/messages.inc.php:242
 msgid "Leave blank if not used"
 msgstr "Deje en blanco si no necesita usarlo"
@@ -8311,10 +8322,6 @@ msgstr ""
 "fallar si su IP pertenece a un ISP donde miles de usuarios, incluyendo usted "
 "se encuentran conectados."
 
-#: setup/lib/messages.inc.php:272
-msgid "Edit server"
-msgstr "Editar los parámetros del servidor"
-
 #: setup/lib/messages.inc.php:273
 msgid "What PHP extension to use; you should use mysqli if supported"
 msgstr ""
@@ -8587,11 +8594,6 @@ msgstr "Nombre del servidor donde el servidor SQL se está ejecutando"
 msgid "Verbose name of this server"
 msgstr "Nombre del servidor, forma extendida"
 
-#: setup/lib/messages.inc.php:328
-#, php-format
-msgid "Set value: %s"
-msgstr "Fijar el valor: %s"
-
 #: setup/lib/messages.inc.php:329
 msgid ""
 "Whether a user should be displayed a "show all (records)" button"
@@ -8629,10 +8631,6 @@ msgstr ""
 msgid "Show function fields"
 msgstr "Mostrar los campos de elección"
 
-#: setup/lib/messages.inc.php:337
-msgid "Show hidden messages (#MSG_COUNT)"
-msgstr "Mostrar mensajes ocultos (#MSG_COUNT)"
-
 #: setup/lib/messages.inc.php:338
 msgid ""
 "Shows link to [a at http://php.net/manual/function.phpinfo.php]phpinfo()[/a] "
@@ -8764,10 +8762,6 @@ msgstr ""
 msgid "Got invalid version string from server"
 msgstr "El servidor envió una cifra incorrecta para la versión"
 
-#: setup/lib/messages.inc.php:370
-msgid "Check for latest version"
-msgstr "Buscar si existe una versión más reciente"
-
 #: setup/lib/messages.inc.php:371
 #, php-format
 msgid ""
@@ -8807,10 +8801,6 @@ msgid ""
 msgstr ""
 "No está disponible URL wrapper ni CURL. No es posible conocer la versión."
 
-#: setup/lib/messages.inc.php:377
-msgid "Warning"
-msgstr "Advertencia"
-
 #: setup/lib/messages.inc.php:378
 msgid ""
 "Enable [a at http://en.wikipedia.org/wiki/ZIP_(file_format)]ZIP[/a] compression "
@@ -8880,6 +8870,19 @@ msgid "Description"
 msgstr "Descripción"
 
 #, fuzzy
+#~| msgid ""
+#~| "However on last run no data has been parsed, this usually means "
+#~| "phpMyAdmin won't be able to finish this import unless you increase php "
+#~| "time limits."
+#~ msgid ""
+#~ "However on last run no data has been parsed, this usually means "
+#~ "phpMyAdmin won"
+#~ msgstr ""
+#~ "Sin embargo, en la ejecución más reciente no se procesaron datos.  Esto "
+#~ "usualmente significa que phpMyAdmin no será capaz de completar esta "
+#~ "importación a menos que usted incremente el tiempo de ejecución de php."
+
+#, fuzzy
 #~| msgid "None"
 #~ msgctxt "None action"
 #~ msgid "None"
diff --git a/po/et.po b/po/et.po
index c85904e..96d9d4d 100644
--- a/po/et.po
+++ b/po/et.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-14 07:48-0400\n"
+"POT-Creation-Date: 2010-05-14 13:39-0400\n"
 "PO-Revision-Date: 2010-03-12 09:14+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: estonian <et at li.org>\n"
@@ -952,15 +952,10 @@ msgstr ""
 "Skripti ajalimiit on ületatud, kui soovid importimist jätkata, palun lae "
 "sama fail uuesti ja import jätkub."
 
-#: import.php:426
-#, fuzzy
-#| msgid ""
-#| "However on last run no data has been parsed, this usually means "
-#| "phpMyAdmin won't be able to finish this import unless you increase php "
-#| "time limits."
+#: import.php:426 libraries/messages.inc.php:1102
 msgid ""
 "However on last run no data has been parsed, this usually means phpMyAdmin "
-"won"
+"won't be able to finish this import unless you increase php time limits."
 msgstr ""
 "Kuigi viimasel laadimisel andmeid ei töödeldud, see tähendab enamasti et "
 "phpMyAdmin pole võimeline Importi lõpetama, kui sa php skripti aega ei "
@@ -6354,15 +6349,6 @@ msgstr "Lõimud"
 msgid "Thread %s was successfully killed."
 msgstr "Protsess %s katkestati edukalt."
 
-#: libraries/messages.inc.php:1102
-msgid ""
-"However on last run no data has been parsed, this usually means phpMyAdmin "
-"won't be able to finish this import unless you increase php time limits."
-msgstr ""
-"Kuigi viimasel laadimisel andmeid ei töödeldud, see tähendab enamasti et "
-"phpMyAdmin pole võimeline Importi lõpetama, kui sa php skripti aega ei "
-"pikenda."
-
 #: libraries/messages.inc.php:1105 pmd_pdf.php:94
 msgid "to/from page"
 msgstr "Kuhu/Kust leht"
@@ -6833,7 +6819,8 @@ msgstr "Pole"
 msgid "Filter"
 msgstr "Väljade arv"
 
-#: navigation.php:319 setup/lib/messages.inc.php:42
+#: navigation.php:319 setup/frames/index.inc.php:218
+#: setup/lib/messages.inc.php:42
 #, fuzzy
 msgid "Clear"
 msgstr "Kalender"
@@ -6924,6 +6911,116 @@ msgstr "maks. parallel ühendusi"
 msgid "Configuration: %s"
 msgstr ""
 
+#: setup/frames/config.inc.php:25 setup/frames/index.inc.php:152
+#: setup/lib/messages.inc.php:45
+msgid "Configuration file"
+msgstr ""
+
+#: setup/frames/config.inc.php:38 setup/frames/index.inc.php:212
+#: setup/lib/messages.inc.php:65
+msgid "Download"
+msgstr ""
+
+#: setup/frames/index.inc.php:58 setup/lib/messages.inc.php:164
+msgid ""
+"You are not using a secure connection; all data (including potentially "
+"sensitive information, like passwords) is transferred unencrypted!"
+msgstr ""
+
+#: setup/frames/index.inc.php:87 setup/frames/menu.inc.php:17
+#: setup/lib/messages.inc.php:219
+msgid "Overview"
+msgstr ""
+
+#: setup/frames/index.inc.php:95 setup/lib/messages.inc.php:337
+msgid "Show hidden messages (#MSG_COUNT)"
+msgstr ""
+
+#: setup/frames/index.inc.php:135 setup/lib/messages.inc.php:213
+msgid "There are no configured servers"
+msgstr ""
+
+#: setup/frames/index.inc.php:143 setup/lib/messages.inc.php:212
+msgid "New server"
+msgstr ""
+
+#: setup/frames/index.inc.php:172 setup/lib/messages.inc.php:50
+msgid "Default language"
+msgstr ""
+
+#: setup/frames/index.inc.php:182 setup/lib/messages.inc.php:187
+msgid "let the user choose"
+msgstr ""
+
+#: setup/frames/index.inc.php:193 setup/lib/messages.inc.php:216
+msgid "- none -"
+msgstr ""
+
+#: setup/frames/index.inc.php:196 setup/lib/messages.inc.php:51
+msgid "Default server"
+msgstr ""
+
+#: setup/frames/index.inc.php:206 setup/lib/messages.inc.php:66
+msgid "End of line"
+msgstr ""
+
+#: setup/frames/index.inc.php:211 setup/lib/messages.inc.php:61
+msgid "Display"
+msgstr ""
+
+#: setup/frames/index.inc.php:215 setup/lib/messages.inc.php:190
+#, fuzzy
+msgid "Load"
+msgstr "Lokaalne"
+
+#: setup/frames/index.inc.php:226 setup/lib/messages.inc.php:152
+#, fuzzy
+msgid "phpMyAdmin homepage"
+msgstr "phpMyAdmini dokumentatsioon"
+
+#: setup/frames/index.inc.php:227 setup/lib/messages.inc.php:64
+#, fuzzy
+msgid "Donate"
+msgstr "Andmed"
+
+#: setup/frames/index.inc.php:228 setup/lib/messages.inc.php:370
+msgid "Check for latest version"
+msgstr ""
+
+#: setup/frames/menu.inc.php:18 setup/lib/messages.inc.php:137
+msgid "Features"
+msgstr ""
+
+#: setup/frames/menu.inc.php:19 setup/lib/messages.inc.php:113
+msgid "Navigation frame"
+msgstr ""
+
+#: setup/frames/menu.inc.php:20 setup/lib/messages.inc.php:118
+msgid "Main frame"
+msgstr ""
+
+#: setup/frames/servers.inc.php:28 setup/lib/messages.inc.php:272
+msgid "Edit server"
+msgstr ""
+
+#: setup/frames/servers.inc.php:37 setup/lib/messages.inc.php:241
+#, fuzzy
+msgid "Add a new server"
+msgstr "Lisa uus kasutaja"
+
+#: setup/lib/FormDisplay.tpl.php:182 setup/lib/messages.inc.php:328
+#, php-format
+msgid "Set value: %s"
+msgstr ""
+
+#: setup/lib/FormDisplay.tpl.php:187 setup/lib/messages.inc.php:234
+msgid "Restore default value"
+msgstr ""
+
+#: setup/lib/form_processing.lib.php:43 setup/lib/messages.inc.php:377
+msgid "Warning"
+msgstr ""
+
 #: setup/lib/messages.inc.php:16
 msgid "Allow character set conversion"
 msgstr ""
@@ -7063,10 +7160,6 @@ msgstr ""
 msgid "Compress on the fly"
 msgstr ""
 
-#: setup/lib/messages.inc.php:45
-msgid "Configuration file"
-msgstr ""
-
 #: setup/lib/messages.inc.php:46
 msgid ""
 "Whether a warning ("Are your really sure...") should be displayed "
@@ -7085,14 +7178,6 @@ msgstr ""
 msgid "Default character set"
 msgstr ""
 
-#: setup/lib/messages.inc.php:50
-msgid "Default language"
-msgstr ""
-
-#: setup/lib/messages.inc.php:51
-msgid "Default server"
-msgstr ""
-
 #: setup/lib/messages.inc.php:52
 msgid "Tab that is displayed when entering a database"
 msgstr ""
@@ -7134,10 +7219,6 @@ msgstr ""
 msgid "Display databases as a list"
 msgstr ""
 
-#: setup/lib/messages.inc.php:61
-msgid "Display"
-msgstr ""
-
 #: setup/lib/messages.inc.php:62
 msgid "Show server listing as a list instead of a drop down"
 msgstr ""
@@ -7146,19 +7227,6 @@ msgstr ""
 msgid "Display servers as a list"
 msgstr ""
 
-#: setup/lib/messages.inc.php:64
-#, fuzzy
-msgid "Donate"
-msgstr "Andmed"
-
-#: setup/lib/messages.inc.php:65
-msgid "Download"
-msgstr ""
-
-#: setup/lib/messages.inc.php:66
-msgid "End of line"
-msgstr ""
-
 #: setup/lib/messages.inc.php:67
 msgid "Could not connect to MySQL server"
 msgstr ""
@@ -7340,10 +7408,6 @@ msgstr "Andmebaasi eksportimise seaded"
 msgid "Customize appearance of the navigation frame"
 msgstr ""
 
-#: setup/lib/messages.inc.php:113
-msgid "Navigation frame"
-msgstr ""
-
 #: setup/lib/messages.inc.php:114
 #, fuzzy
 msgid "Servers display options"
@@ -7354,10 +7418,6 @@ msgstr "Andmebaasi eksportimise seaded"
 msgid "Tables display options"
 msgstr "Andmebaasi eksportimise seaded"
 
-#: setup/lib/messages.inc.php:118
-msgid "Main frame"
-msgstr ""
-
 #: setup/lib/messages.inc.php:119
 msgid "Settings that didn't fit enywhere else"
 msgstr ""
@@ -7436,10 +7496,6 @@ msgstr ""
 msgid "Customize export options"
 msgstr "Andmebaasi eksportimise seaded"
 
-#: setup/lib/messages.inc.php:137
-msgid "Features"
-msgstr ""
-
 #: setup/lib/messages.inc.php:138
 #, fuzzy
 msgid "Customize import defaults"
@@ -7509,11 +7565,6 @@ msgid ""
 "system."
 msgstr ""
 
-#: setup/lib/messages.inc.php:152
-#, fuzzy
-msgid "phpMyAdmin homepage"
-msgstr "phpMyAdmini dokumentatsioon"
-
 #: setup/lib/messages.inc.php:153
 msgid "Extra parameters for iconv"
 msgstr ""
@@ -7561,12 +7612,6 @@ msgstr ""
 msgid "Insecure connection"
 msgstr ""
 
-#: setup/lib/messages.inc.php:164
-msgid ""
-"You are not using a secure connection; all data (including potentially "
-"sensitive information, like passwords) is transferred unencrypted!"
-msgstr ""
-
 #: setup/lib/messages.inc.php:165
 #, php-format
 msgid ""
@@ -7665,10 +7710,6 @@ msgstr ""
 msgid "Enable highlighting"
 msgstr ""
 
-#: setup/lib/messages.inc.php:187
-msgid "let the user choose"
-msgstr ""
-
 #: setup/lib/messages.inc.php:188
 msgid "Use less graphically intense tabs"
 msgstr ""
@@ -7677,11 +7718,6 @@ msgstr ""
 msgid "Light tabs"
 msgstr ""
 
-#: setup/lib/messages.inc.php:190
-#, fuzzy
-msgid "Load"
-msgstr "Lokaalne"
-
 #: setup/lib/messages.inc.php:191
 msgid ""
 "If TRUE, logout deletes cookies for all servers; when set to FALSE, logout "
@@ -7785,14 +7821,6 @@ msgstr ""
 msgid "Iconic navigation bar"
 msgstr ""
 
-#: setup/lib/messages.inc.php:212
-msgid "New server"
-msgstr ""
-
-#: setup/lib/messages.inc.php:213
-msgid "There are no configured servers"
-msgstr ""
-
 #: setup/lib/messages.inc.php:214
 msgid "use GZip output buffering for increased speed in HTTP transfers"
 msgstr ""
@@ -7801,10 +7829,6 @@ msgstr ""
 msgid "GZip output buffering"
 msgstr ""
 
-#: setup/lib/messages.inc.php:216
-msgid "- none -"
-msgstr ""
-
 #: setup/lib/messages.inc.php:217
 msgid ""
 "[kbd]SMART[/kbd] - i.e. descending order for fields of type TIME, DATE, "
@@ -7815,10 +7839,6 @@ msgstr ""
 msgid "Default sorting order"
 msgstr ""
 
-#: setup/lib/messages.inc.php:219
-msgid "Overview"
-msgstr ""
-
 #: setup/lib/messages.inc.php:220
 msgid "Use persistent connections to MySQL databases"
 msgstr ""
@@ -7873,10 +7893,6 @@ msgstr ""
 msgid "Recoding engine"
 msgstr ""
 
-#: setup/lib/messages.inc.php:234
-msgid "Restore default value"
-msgstr ""
-
 #: setup/lib/messages.inc.php:235
 msgid "Try to revert erroneous fields to their default values"
 msgstr ""
@@ -7908,11 +7924,6 @@ msgstr ""
 msgid "You allow for connecting to the server without a password."
 msgstr ""
 
-#: setup/lib/messages.inc.php:241
-#, fuzzy
-msgid "Add a new server"
-msgstr "Lisa uus kasutaja"
-
 #: setup/lib/messages.inc.php:242
 msgid "Leave blank if not used"
 msgstr ""
@@ -8056,10 +8067,6 @@ msgid ""
 "to."
 msgstr ""
 
-#: setup/lib/messages.inc.php:272
-msgid "Edit server"
-msgstr ""
-
 #: setup/lib/messages.inc.php:273
 msgid "What PHP extension to use; you should use mysqli if supported"
 msgstr ""
@@ -8311,11 +8318,6 @@ msgstr ""
 msgid "Verbose name of this server"
 msgstr ""
 
-#: setup/lib/messages.inc.php:328
-#, php-format
-msgid "Set value: %s"
-msgstr ""
-
 #: setup/lib/messages.inc.php:329
 msgid ""
 "Whether a user should be displayed a "show all (records)" button"
@@ -8353,10 +8355,6 @@ msgstr ""
 msgid "Show function fields"
 msgstr ""
 
-#: setup/lib/messages.inc.php:337
-msgid "Show hidden messages (#MSG_COUNT)"
-msgstr ""
-
 #: setup/lib/messages.inc.php:338
 msgid ""
 "Shows link to [a at http://php.net/manual/function.phpinfo.php]phpinfo()[/a] "
@@ -8490,10 +8488,6 @@ msgstr ""
 msgid "Got invalid version string from server"
 msgstr ""
 
-#: setup/lib/messages.inc.php:370
-msgid "Check for latest version"
-msgstr ""
-
 #: setup/lib/messages.inc.php:371
 #, php-format
 msgid ""
@@ -8525,10 +8519,6 @@ msgid ""
 "Neither URL wrapper nor CURL is available. Version check is not possible."
 msgstr ""
 
-#: setup/lib/messages.inc.php:377
-msgid "Warning"
-msgstr ""
-
 #: setup/lib/messages.inc.php:378
 msgid ""
 "Enable [a at http://en.wikipedia.org/wiki/ZIP_(file_format)]ZIP[/a] compression "
@@ -8590,6 +8580,19 @@ msgid "Description"
 msgstr "Kirjeldus"
 
 #, fuzzy
+#~| msgid ""
+#~| "However on last run no data has been parsed, this usually means "
+#~| "phpMyAdmin won't be able to finish this import unless you increase php "
+#~| "time limits."
+#~ msgid ""
+#~ "However on last run no data has been parsed, this usually means "
+#~ "phpMyAdmin won"
+#~ msgstr ""
+#~ "Kuigi viimasel laadimisel andmeid ei töödeldud, see tähendab enamasti et "
+#~ "phpMyAdmin pole võimeline Importi lõpetama, kui sa php skripti aega ei "
+#~ "pikenda."
+
+#, fuzzy
 #~| msgid "None"
 #~ msgctxt "None action"
 #~ msgid "None"
diff --git a/po/eu.po b/po/eu.po
index 522d46a..9af2a4a 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-14 07:48-0400\n"
+"POT-Creation-Date: 2010-05-14 13:39-0400\n"
 "PO-Revision-Date: 2010-03-31 10:40+0200\n"
 "Last-Translator:  <hey_neken at mundurat.net>\n"
 "Language-Team: basque <eu at li.org>\n"
@@ -947,10 +947,10 @@ msgid ""
 "file and import will resume."
 msgstr ""
 
-#: import.php:426
+#: import.php:426 libraries/messages.inc.php:1102
 msgid ""
 "However on last run no data has been parsed, this usually means phpMyAdmin "
-"won"
+"won't be able to finish this import unless you increase php time limits."
 msgstr ""
 
 #: index.php:190 libraries/messages.inc.php:549
@@ -6226,12 +6226,6 @@ msgstr ""
 msgid "Thread %s was successfully killed."
 msgstr "%s haria arrakastaz ezabatu da."
 
-#: libraries/messages.inc.php:1102
-msgid ""
-"However on last run no data has been parsed, this usually means phpMyAdmin "
-"won't be able to finish this import unless you increase php time limits."
-msgstr ""
-
 #: libraries/messages.inc.php:1105 pmd_pdf.php:94
 msgid "to/from page"
 msgstr ""
@@ -6692,7 +6686,8 @@ msgstr "Batez"
 msgid "Filter"
 msgstr ""
 
-#: navigation.php:319 setup/lib/messages.inc.php:42
+#: navigation.php:319 setup/frames/index.inc.php:218
+#: setup/lib/messages.inc.php:42
 msgid "Clear"
 msgstr ""
 
@@ -6779,6 +6774,115 @@ msgstr "Konexioak"
 msgid "Configuration: %s"
 msgstr ""
 
+#: setup/frames/config.inc.php:25 setup/frames/index.inc.php:152
+#: setup/lib/messages.inc.php:45
+msgid "Configuration file"
+msgstr ""
+
+#: setup/frames/config.inc.php:38 setup/frames/index.inc.php:212
+#: setup/lib/messages.inc.php:65
+msgid "Download"
+msgstr ""
+
+#: setup/frames/index.inc.php:58 setup/lib/messages.inc.php:164
+msgid ""
+"You are not using a secure connection; all data (including potentially "
+"sensitive information, like passwords) is transferred unencrypted!"
+msgstr ""
+
+#: setup/frames/index.inc.php:87 setup/frames/menu.inc.php:17
+#: setup/lib/messages.inc.php:219
+msgid "Overview"
+msgstr ""
+
+#: setup/frames/index.inc.php:95 setup/lib/messages.inc.php:337
+msgid "Show hidden messages (#MSG_COUNT)"
+msgstr ""
+
+#: setup/frames/index.inc.php:135 setup/lib/messages.inc.php:213
+msgid "There are no configured servers"
+msgstr ""
+
+#: setup/frames/index.inc.php:143 setup/lib/messages.inc.php:212
+msgid "New server"
+msgstr ""
+
+#: setup/frames/index.inc.php:172 setup/lib/messages.inc.php:50
+msgid "Default language"
+msgstr ""
+
+#: setup/frames/index.inc.php:182 setup/lib/messages.inc.php:187
+msgid "let the user choose"
+msgstr ""
+
+#: setup/frames/index.inc.php:193 setup/lib/messages.inc.php:216
+msgid "- none -"
+msgstr ""
+
+#: setup/frames/index.inc.php:196 setup/lib/messages.inc.php:51
+msgid "Default server"
+msgstr ""
+
+#: setup/frames/index.inc.php:206 setup/lib/messages.inc.php:66
+msgid "End of line"
+msgstr ""
+
+#: setup/frames/index.inc.php:211 setup/lib/messages.inc.php:61
+msgid "Display"
+msgstr ""
+
+#: setup/frames/index.inc.php:215 setup/lib/messages.inc.php:190
+#, fuzzy
+msgid "Load"
+msgstr "Lokal"
+
+#: setup/frames/index.inc.php:226 setup/lib/messages.inc.php:152
+#, fuzzy
+msgid "phpMyAdmin homepage"
+msgstr "phpMyAdmin dokumentazioa"
+
+#: setup/frames/index.inc.php:227 setup/lib/messages.inc.php:64
+msgid "Donate"
+msgstr ""
+
+#: setup/frames/index.inc.php:228 setup/lib/messages.inc.php:370
+msgid "Check for latest version"
+msgstr ""
+
+#: setup/frames/menu.inc.php:18 setup/lib/messages.inc.php:137
+msgid "Features"
+msgstr ""
+
+#: setup/frames/menu.inc.php:19 setup/lib/messages.inc.php:113
+msgid "Navigation frame"
+msgstr ""
+
+#: setup/frames/menu.inc.php:20 setup/lib/messages.inc.php:118
+msgid "Main frame"
+msgstr ""
+
+#: setup/frames/servers.inc.php:28 setup/lib/messages.inc.php:272
+msgid "Edit server"
+msgstr ""
+
+#: setup/frames/servers.inc.php:37 setup/lib/messages.inc.php:241
+#, fuzzy
+msgid "Add a new server"
+msgstr "Erabiltzaile berria gehitu"
+
+#: setup/lib/FormDisplay.tpl.php:182 setup/lib/messages.inc.php:328
+#, php-format
+msgid "Set value: %s"
+msgstr ""
+
+#: setup/lib/FormDisplay.tpl.php:187 setup/lib/messages.inc.php:234
+msgid "Restore default value"
+msgstr ""
+
+#: setup/lib/form_processing.lib.php:43 setup/lib/messages.inc.php:377
+msgid "Warning"
+msgstr ""
+
 #: setup/lib/messages.inc.php:16
 msgid "Allow character set conversion"
 msgstr ""
@@ -6918,10 +7022,6 @@ msgstr ""
 msgid "Compress on the fly"
 msgstr ""
 
-#: setup/lib/messages.inc.php:45
-msgid "Configuration file"
-msgstr ""
-
 #: setup/lib/messages.inc.php:46
 msgid ""
 "Whether a warning ("Are your really sure...") should be displayed "
@@ -6940,14 +7040,6 @@ msgstr ""
 msgid "Default character set"
 msgstr ""
 
-#: setup/lib/messages.inc.php:50
-msgid "Default language"
-msgstr ""
-
-#: setup/lib/messages.inc.php:51
-msgid "Default server"
-msgstr ""
-
 #: setup/lib/messages.inc.php:52
 msgid "Tab that is displayed when entering a database"
 msgstr ""
@@ -6986,10 +7078,6 @@ msgstr ""
 msgid "Display databases as a list"
 msgstr ""
 
-#: setup/lib/messages.inc.php:61
-msgid "Display"
-msgstr ""
-
 #: setup/lib/messages.inc.php:62
 msgid "Show server listing as a list instead of a drop down"
 msgstr ""
@@ -6998,18 +7086,6 @@ msgstr ""
 msgid "Display servers as a list"
 msgstr ""
 
-#: setup/lib/messages.inc.php:64
-msgid "Donate"
-msgstr ""
-
-#: setup/lib/messages.inc.php:65
-msgid "Download"
-msgstr ""
-
-#: setup/lib/messages.inc.php:66
-msgid "End of line"
-msgstr ""
-
 #: setup/lib/messages.inc.php:67
 msgid "Could not connect to MySQL server"
 msgstr ""
@@ -7189,10 +7265,6 @@ msgstr "Datu-basea esportatzeko aukerak"
 msgid "Customize appearance of the navigation frame"
 msgstr ""
 
-#: setup/lib/messages.inc.php:113
-msgid "Navigation frame"
-msgstr ""
-
 #: setup/lib/messages.inc.php:114
 msgid "Servers display options"
 msgstr ""
@@ -7201,10 +7273,6 @@ msgstr ""
 msgid "Tables display options"
 msgstr ""
 
-#: setup/lib/messages.inc.php:118
-msgid "Main frame"
-msgstr ""
-
 #: setup/lib/messages.inc.php:119
 msgid "Settings that didn't fit enywhere else"
 msgstr ""
@@ -7282,10 +7350,6 @@ msgstr ""
 msgid "Customize export options"
 msgstr "Datu-basea esportatzeko aukerak"
 
-#: setup/lib/messages.inc.php:137
-msgid "Features"
-msgstr ""
-
 #: setup/lib/messages.inc.php:138
 msgid "Customize import defaults"
 msgstr ""
@@ -7354,11 +7418,6 @@ msgid ""
 "system."
 msgstr ""
 
-#: setup/lib/messages.inc.php:152
-#, fuzzy
-msgid "phpMyAdmin homepage"
-msgstr "phpMyAdmin dokumentazioa"
-
 #: setup/lib/messages.inc.php:153
 msgid "Extra parameters for iconv"
 msgstr ""
@@ -7402,12 +7461,6 @@ msgstr ""
 msgid "Insecure connection"
 msgstr ""
 
-#: setup/lib/messages.inc.php:164
-msgid ""
-"You are not using a secure connection; all data (including potentially "
-"sensitive information, like passwords) is transferred unencrypted!"
-msgstr ""
-
 #: setup/lib/messages.inc.php:165
 #, php-format
 msgid ""
@@ -7503,10 +7556,6 @@ msgstr ""
 msgid "Enable highlighting"
 msgstr ""
 
-#: setup/lib/messages.inc.php:187
-msgid "let the user choose"
-msgstr ""
-
 #: setup/lib/messages.inc.php:188
 msgid "Use less graphically intense tabs"
 msgstr ""
@@ -7515,11 +7564,6 @@ msgstr ""
 msgid "Light tabs"
 msgstr ""
 
-#: setup/lib/messages.inc.php:190
-#, fuzzy
-msgid "Load"
-msgstr "Lokal"
-
 #: setup/lib/messages.inc.php:191
 msgid ""
 "If TRUE, logout deletes cookies for all servers; when set to FALSE, logout "
@@ -7622,14 +7666,6 @@ msgstr ""
 msgid "Iconic navigation bar"
 msgstr ""
 
-#: setup/lib/messages.inc.php:212
-msgid "New server"
-msgstr ""
-
-#: setup/lib/messages.inc.php:213
-msgid "There are no configured servers"
-msgstr ""
-
 #: setup/lib/messages.inc.php:214
 msgid "use GZip output buffering for increased speed in HTTP transfers"
 msgstr ""
@@ -7638,10 +7674,6 @@ msgstr ""
 msgid "GZip output buffering"
 msgstr ""
 
-#: setup/lib/messages.inc.php:216
-msgid "- none -"
-msgstr ""
-
 #: setup/lib/messages.inc.php:217
 msgid ""
 "[kbd]SMART[/kbd] - i.e. descending order for fields of type TIME, DATE, "
@@ -7652,10 +7684,6 @@ msgstr ""
 msgid "Default sorting order"
 msgstr ""
 
-#: setup/lib/messages.inc.php:219
-msgid "Overview"
-msgstr ""
-
 #: setup/lib/messages.inc.php:220
 msgid "Use persistent connections to MySQL databases"
 msgstr ""
@@ -7710,10 +7738,6 @@ msgstr ""
 msgid "Recoding engine"
 msgstr ""
 
-#: setup/lib/messages.inc.php:234
-msgid "Restore default value"
-msgstr ""
-
 #: setup/lib/messages.inc.php:235
 msgid "Try to revert erroneous fields to their default values"
 msgstr ""
@@ -7744,11 +7768,6 @@ msgstr ""
 msgid "You allow for connecting to the server without a password."
 msgstr ""
 
-#: setup/lib/messages.inc.php:241
-#, fuzzy
-msgid "Add a new server"
-msgstr "Erabiltzaile berria gehitu"
-
 #: setup/lib/messages.inc.php:242
 msgid "Leave blank if not used"
 msgstr ""
@@ -7891,10 +7910,6 @@ msgid ""
 "to."
 msgstr ""
 
-#: setup/lib/messages.inc.php:272
-msgid "Edit server"
-msgstr ""
-
 #: setup/lib/messages.inc.php:273
 msgid "What PHP extension to use; you should use mysqli if supported"
 msgstr ""
@@ -8144,11 +8159,6 @@ msgstr ""
 msgid "Verbose name of this server"
 msgstr ""
 
-#: setup/lib/messages.inc.php:328
-#, php-format
-msgid "Set value: %s"
-msgstr ""
-
 #: setup/lib/messages.inc.php:329
 msgid ""
 "Whether a user should be displayed a "show all (records)" button"
@@ -8186,10 +8196,6 @@ msgstr ""
 msgid "Show function fields"
 msgstr ""
 
-#: setup/lib/messages.inc.php:337
-msgid "Show hidden messages (#MSG_COUNT)"
-msgstr ""
-
 #: setup/lib/messages.inc.php:338
 msgid ""
 "Shows link to [a at http://php.net/manual/function.phpinfo.php]phpinfo()[/a] "
@@ -8321,10 +8327,6 @@ msgstr ""
 msgid "Got invalid version string from server"
 msgstr ""
 
-#: setup/lib/messages.inc.php:370
-msgid "Check for latest version"
-msgstr ""
-
 #: setup/lib/messages.inc.php:371
 #, php-format
 msgid ""
@@ -8356,10 +8358,6 @@ msgid ""
 "Nei
ther URL wrapper nor CURL is available. Version check is not possible."
 msgstr ""
 
-#: setup/lib/messages.inc.php:377
-msgid "Warning"
-msgstr ""
-
 #: setup/lib/messages.inc.php:378
 msgid ""
 "Enable [a at http://en.wikipedia.org/wiki/ZIP_(file_format)]ZIP[/a] compression "
diff --git a/po/fa.po b/po/fa.po
index 5c71527..292917b 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-14 07:48-0400\n"
+"POT-Creation-Date: 2010-05-14 13:39-0400\n"
 "PO-Revision-Date: 2010-03-12 09:17+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: persian <fa at li.org>\n"
@@ -942,10 +942,10 @@ msgid ""
 "file and import will resume."
 msgstr ""
 
-#: import.php:426
+#: import.php:426 libraries/messages.inc.php:1102
 msgid ""
 "However on last run no data has been parsed, this usually means phpMyAdmin "
-"won"
+"won't be able to finish this import unless you increase php time limits."
 msgstr ""
 
 #: index.php:190 libraries/messages.inc.php:549
@@ -6153,12 +6153,6 @@ msgstr ""
 msgid "Thread %s was successfully killed."
 msgstr ""
 
-#: libraries/messages.inc.php:1102
-msgid ""
-"However on last run no data has been parsed, this usually means phpMyAdmin "
-"won't be able to finish this import unless you increase php time limits."
-msgstr ""
-
 #: libraries/messages.inc.php:1105 pmd_pdf.php:94
 msgid "to/from page"
 msgstr ""
@@ -6589,7 +6583,8 @@ msgstr "خير"
 msgid "Filter"
 msgstr ""
 
-#: navigation.php:319 setup/lib/messages.inc.php:42
+#: navigation.php:319 setup/frames/index.inc.php:218
+#: setup/lib/messages.inc.php:42
 #, fuzzy
 msgid "Clear"
 msgstr "تقویم"
@@ -6674,6 +6669,115 @@ msgstr ""
 msgid "Configuration: %s"
 msgstr ""
 
+#: setup/frames/config.inc.php:25 setup/frames/index.inc.php:152
+#: setup/lib/messages.inc.php:45
+msgid "Configuration file"
+msgstr ""
+
+#: setup/frames/config.inc.php:38 setup/frames/index.inc.php:212
+#: setup/lib/messages.inc.php:65
+msgid "Download"
+msgstr ""
+
+#: setup/frames/index.inc.php:58 setup/lib/messages.inc.php:164
+msgid ""
+"You are not using a secure connection; all data (including potentially "
+"sensitive information, like passwords) is transferred unencrypted!"
+msgstr ""
+
+#: setup/frames/index.inc.php:87 setup/frames/menu.inc.php:17
+#: setup/lib/messages.inc.php:219
+msgid "Overview"
+msgstr ""
+
+#: setup/frames/index.inc.php:95 setup/lib/messages.inc.php:337
+msgid "Show hidden messages (#MSG_COUNT)"
+msgstr ""
+
+#: setup/frames/index.inc.php:135 setup/lib/messages.inc.php:213
+msgid "There are no configured servers"
+msgstr ""
+
+#: setup/frames/index.inc.php:143 setup/lib/messages.inc.php:212
+msgid "New server"
+msgstr ""
+
+#: setup/frames/index.inc.php:172 setup/lib/messages.inc.php:50
+msgid "Default language"
+msgstr ""
+
+#: setup/frames/index.inc.php:182 setup/lib/messages.inc.php:187
+msgid "let the user choose"
+msgstr ""
+
+#: setup/frames/index.inc.php:193 setup/lib/messages.inc.php:216
+msgid "- none -"
+msgstr ""
+
+#: setup/frames/index.inc.php:196 setup/lib/messages.inc.php:51
+msgid "Default server"
+msgstr ""
+
+#: setup/frames/index.inc.php:206 setup/lib/messages.inc.php:66
+msgid "End of line"
+msgstr ""
+
+#: setup/frames/index.inc.php:211 setup/lib/messages.inc.php:61
+msgid "Display"
+msgstr ""
+
+#: setup/frames/index.inc.php:215 setup/lib/messages.inc.php:190
+#, fuzzy
+msgid "Load"
+msgstr "محلی"
+
+#: setup/frames/index.inc.php:226 setup/lib/messages.inc.php:152
+#, fuzzy
+msgid "phpMyAdmin homepage"
+msgstr "مستندات phpMyAdmin"
+
+#: setup/frames/index.inc.php:227 setup/lib/messages.inc.php:64
+msgid "Donate"
+msgstr ""
+
+#: setup/frames/index.inc.php:228 setup/lib/messages.inc.php:370
+msgid "Check for latest version"
+msgstr ""
+
+#: setup/frames/menu.inc.php:18 setup/lib/messages.inc.php:137
+msgid "Features"
+msgstr ""
+
+#: setup/frames/menu.inc.php:19 setup/lib/messages.inc.php:113
+msgid "Navigation frame"
+msgstr ""
+
+#: setup/frames/menu.inc.php:20 setup/lib/messages.inc.php:118
+msgid "Main frame"
+msgstr ""
+
+#: setup/frames/servers.inc.php:28 setup/lib/messages.inc.php:272
+msgid "Edit server"
+msgstr ""
+
+#: setup/frames/servers.inc.php:37 setup/lib/messages.inc.php:241
+#, fuzzy
+msgid "Add a new server"
+msgstr "افزودن يك كاربر جديد"
+
+#: setup/lib/FormDisplay.tpl.php:182 setup/lib/messages.inc.php:328
+#, php-format
+msgid "Set value: %s"
+msgstr ""
+
+#: setup/lib/FormDisplay.tpl.php:187 setup/lib/messages.inc.php:234
+msgid "Restore default value"
+msgstr ""
+
+#: setup/lib/form_processing.lib.php:43 setup/lib/messages.inc.php:377
+msgid "Warning"
+msgstr ""
+
 #: setup/lib/messages.inc.php:16
 msgid "Allow character set conversion"
 msgstr ""
@@ -6812,10 +6916,6 @@ msgstr ""
 msgid "Compress on the fly"
 msgstr ""
 
-#: setup/lib/messages.inc.php:45
-msgid "Configuration file"
-msgstr ""
-
 #: setup/lib/messages.inc.php:46
 msgid ""
 "Whether a warning ("Are your really sure...") should be displayed "
@@ -6834,14 +6934,6 @@ msgstr ""
 msgid "Default character set"
 msgstr ""
 
-#: setup/lib/messages.inc.php:50
-msgid "Default language"
-msgstr ""
-
-#: setup/lib/messages.inc.php:51
-msgid "Default server"
-msgstr ""
-
 #: setup/lib/messages.inc.php:52
 msgid "Tab that is displayed when entering a database"
 msgstr ""
@@ -6880,10 +6972,6 @@ msgstr ""
 msgid "Display databases as a list"
 msgstr ""
 
-#: setup/lib/messages.inc.php:61
-msgid "Display"
-msgstr ""
-
 #: setup/lib/messages.inc.php:62
 msgid "Show server listing as a list instead of a drop down"
 msgstr ""
@@ -6892,18 +6980,6 @@ msgstr ""
 msgid "Display servers as a list"
 msgstr ""
 
-#: setup/lib/messages.inc.php:64
-msgid "Donate"
-msgstr ""
-
-#: setup/lib/messages.inc.php:65
-msgid "Download"
-msgstr ""
-
-#: setup/lib/messages.inc.php:66
-msgid "End of line"
-msgstr ""
-
 #: setup/lib/messages.inc.php:67
 msgid "Could not connect to MySQL server"
 msgstr ""
@@ -7078,10 +7154,6 @@ msgstr "آمار پايگاههاي داده"
 msgid "Customize appearance of the navigation frame"
 msgstr ""
 
-#: setup/lib/messages.inc.php:113
-msgid "Navigation frame"
-msgstr ""
-
 #: setup/lib/messages.inc.php:114
 msgid "Servers display options"
 msgstr ""
@@ -7090,10 +7162,6 @@ msgstr ""
 msgid "Tables display options"
 msgstr ""
 
-#: setup/lib/messages.inc.php:118
-msgid "Main frame"
-msgstr ""
-
 #: setup/lib/messages.inc.php:119
 msgid "Settings that didn't fit enywhere else"
 msgstr ""
@@ -7170,10 +7238,6 @@ msgstr ""
 msgid "Customize export options"
 msgstr ""
 
-#: setup/lib/messages.inc.php:137
-msgid "Features"
-msgstr ""
-
 #: setup/lib/messages.inc.php:138
 msgid "Customize import defaults"
 msgstr ""
@@ -7241,11 +7305,6 @@ msgid ""
 "system."
 msgstr ""
 
-#: setup/lib/messages.inc.php:152
-#, fuzzy
-msgid "phpMyAdmin homepage"
-msgstr "مستندات phpMyAdmin"
-
 #: setup/lib/messages.inc.php:153
 msgid "Extra parameters for iconv"
 msgstr ""
@@ -7289,12 +7348,6 @@ msgstr ""
 msgid "Insecure connection"
 msgstr ""
 
-#: setup/lib/messages.inc.php:164
-msgid ""
-"You are not using a secure connection; all data (including potentially "
-"sensitive information, like passwords) is transferred unencrypted!"
-msgstr ""
-
 #: setup/lib/messages.inc.php:165
 #, php-format
 msgid ""
@@ -7390,10 +7443,6 @@ msgstr ""
 msgid "Enable highlighting"
 msgstr ""
 
-#: setup/lib/messages.inc.php:187
-msgid "let the user choose"
-msgstr ""
-
 #: setup/lib/messages.inc.php:188
 msgid "Use less graphically intense tabs"
 msgstr ""
@@ -7402,11 +7451,6 @@ msgstr ""
 msgid "Light tabs"
 msgstr ""
 
-#: setup/lib/messages.inc.php:190
-#, fuzzy
-msgid "Load"
-msgstr "محلی"
-
 #: setup/lib/messages.inc.php:191
 msgid ""
 "If TRUE, logout deletes cookies for all servers; when set to FALSE, logout "
@@ -7508,14 +7552,6 @@ msgstr ""
 msgid "Iconic navigation bar"
 msgstr ""
 
-#: setup/lib/messages.inc.php:212
-msgid "New server"
-msgstr ""
-
-#: setup/lib/messages.inc.php:213
-msgid "There are no configured servers"
-msgstr ""
-
 #: setup/lib/messages.inc.php:214
 msgid "use GZip output buffering for increased speed in HTTP transfers"
 msgstr ""
@@ -7524,10 +7560,6 @@ msgstr ""
 msgid "GZip output buffering"
 msgstr ""
 
-#: setup/lib/messages.inc.php:216
-msgid "- none -"
-msgstr ""
-
 #: setup/lib/messages.inc.php:217
 msgid ""
 "[kbd]SMART[/kbd] - i.e. descending order for fields of type TIME, DATE, "
@@ -7538,10 +7570,6 @@ msgstr ""
 msgid "Default sorting order"
 msgstr ""
 
-#: setup/lib/messages.inc.php:219
-msgid "Overview"
-msgstr ""
-
 #: setup/lib/messages.inc.php:220
 msgid "Use persistent connections to MySQL databases"
 msgstr ""
@@ -7596,10 +7624,6 @@ msgstr ""
 msgid "Recoding engine"
 msgstr ""
 
-#: setup/lib/messages.inc.php:234
-msgid "Restore default value"
-msgstr ""
-
 #: setup/lib/messages.inc.php:235
 msgid "Try to revert erroneous fields to their default values"
 msgstr ""
@@ -7630,11 +7654,6 @@ msgstr ""
 msgid "You allow for connecting to the server without a password."
 msgstr ""
 
-#: setup/lib/messages.inc.php:241
-#, fuzzy
-msgid "Add a new server"
-msgstr "افزودن يك كاربر جديد"
-
 #: setup/lib/messages.inc.php:242
 msgid "Leave blank if not used"
 msgstr ""
@@ -7776,10 +7795,6 @@ msgid ""
 "to."
 msgstr ""
 
-#: setup/lib/messages.inc.php:272
-msgid "Edit server"
-msgstr ""
-
 #: setup/lib/messages.inc.php:273
 msgid "What PHP extension to use; you should use mysqli if supported"
 msgstr ""
@@ -8026,11 +8041,6 @@ msgstr ""
 msgid "Verbose name of this server"
 msgstr ""
 
-#: setup/lib/messages.inc.php:328
-#, php-format
-msgid "Set value: %s"
-msgstr ""
-
 #: setup/lib/messages.inc.php:329
 msgid ""
 "Whether a user should be displayed a "show all (records)" button"
@@ -8068,10 +8078,6 @@ msgstr ""
 msgid "Show function fields"
 msgstr ""
 
-#: setup/lib/messages.inc.php:337
-msgid "Show hidden messages (#MSG_COUNT)"
-msgstr ""
-
 #: setup/lib/messages.inc.php:338
 msgid ""
 "Shows link to [a at http://php.net/manual/function.phpinfo.php]phpinfo()[/a] "
@@ -8202,10 +8208,6 @@ msgstr ""
 msgid "Got invalid version string from server"
 msgstr ""
 
-#: setup/lib/messages.inc.php:370
-msgid "Check for latest version"
-msgstr ""
-
 #: setup/lib/messages.inc.php:371
 #, php-format
 msgid ""
@@ -8237,10 +8239,6 @@ msgid ""
 "Neither URL wrapper nor CURL is available. Version check is not possible."
 msgstr ""
 
-#: setup/lib/messages.inc.php:377
-msgid "Warning"
-msgstr ""
-
 #: setup/lib/messages.inc.php:378
 msgid ""
 "Enable [a at http://en.wikipedia.org/wiki/ZIP_(file_format)]ZIP[/a] compression "
diff --git a/po/fi.po b/po/fi.po
index 6ec13b7..5ec7c36 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-14 07:48-0400\n"
+"POT-Creation-Date: 2010-05-14 13:39-0400\n"
 "PO-Revision-Date: 2010-04-30 18:08+0200\n"
 "Last-Translator:  <kajouni at gmail.com>\n"
 "Language-Team: finnish <fi at li.org>\n"
@@ -947,15 +947,10 @@ msgstr ""
 "Skriptin suoritus aikakatkaistiin. Jos haluat suorittaa tuonnin loppuun, "
 "lähetä sama tiedosto uudestaan, ja tuonti jatkuu."
 
-#: import.php:426
-#, fuzzy
-#| msgid ""
-#| "However on last run no data has been parsed, this usually means "
-#| "phpMyAdmin won't be able to finish this import unless you increase php "
-#| "time limits."
+#: import.php:426 libraries/messages.inc.php:1102
 msgid ""
 "However on last run no data has been parsed, this usually means phpMyAdmin "
-"won"
+"won't be able to finish this import unless you increase php time limits."
 msgstr ""
 "Viimeisellä suorituskerralla ei kuitenkaan jäsennelty mitään tietoja. Tämä "
 "tarkoittaa yleensä sitä, että phpMyAdmin ei voi ajaa tätä tuontia loppuun "
@@ -6440,15 +6435,6 @@ msgstr "Säikeet"
 msgid "Thread %s was successfully killed."
 msgstr "Säikeen %s lopetus onnistui."
 
-#: libraries/messages.inc.php:1102
-msgid ""
-"However on last run no data has been parsed, this usually means phpMyAdmin "
-"won't be able to finish this import unless you increase php time limits."
-msgstr ""
-"Viimeisellä suorituskerralla ei kuitenkaan jäsennelty mitään tietoja. Tämä "
-"tarkoittaa yleensä sitä, että phpMyAdmin ei voi ajaa tätä tuontia loppuun "
-"asti ellei PHP:n suoritusaikarajaa nosteta."
-
 #: libraries/messages.inc.php:1105 pmd_pdf.php:94
 msgid "to/from page"
 msgstr "Sivulta/sivulle"
@@ -6921,7 +6907,8 @@ msgstr "Ei mitään"
 msgid "Filter"
 msgstr "Suodatin"
 
-#: navigation.php:319 setup/lib/messages.inc.php:42
+#: navigation.php:319 setup/frames/index.inc.php:218
+#: setup/lib/messages.inc.php:42
 msgid "Clear"
 msgstr "Tyhjennä"
 
@@ -7027,6 +7014,114 @@ msgstr "Salaamaton yhteys"
 msgid "Configuration: %s"
 msgstr "Asetustiedosto"
 
+#: setup/frames/config.inc.php:25 setup/frames/index.inc.php:152
+#: setup/lib/messages.inc.php:45
+msgid "Configuration file"
+msgstr "Asetustiedosto"
+
+#: setup/frames/config.inc.php:38 setup/frames/index.inc.php:212
+#: setup/lib/messages.inc.php:65
+msgid "Download"
+msgstr "Lataa koneelle"
+
+#: setup/frames/index.inc.php:58 setup/lib/messages.inc.php:164
+msgid ""
+"You are not using a secure connection; all data (including potentially "
+"sensitive information, like passwords) is transferred unencrypted!"
+msgstr ""
+"Käytössäsi ei ole salattua yhteyttä; kaikki tiedot (mukaan lukien "
+"mahdollisesti arkaa tietoa kuten salasanoja) siirretään salaamattomana!"
+
+#: setup/frames/index.inc.php:87 setup/frames/menu.inc.php:17
+#: setup/lib/messages.inc.php:219
+msgid "Overview"
+msgstr "Yleiskatsaus"
+
+#: setup/frames/index.inc.php:95 setup/lib/messages.inc.php:337
+msgid "Show hidden messages (#MSG_COUNT)"
+msgstr "Näytä piilotetut sanomat (#MSG_COUNT)"
+
+#: setup/frames/index.inc.php:135 setup/lib/messages.inc.php:213
+msgid "There are no configured servers"
+msgstr "Palvelimia ei ole määritelty"
+
+#: setup/frames/index.inc.php:143 setup/lib/messages.inc.php:212
+msgid "New server"
+msgstr "Uusi palvelin"
+
+#: setup/frames/index.inc.php:172 setup/lib/messages.inc.php:50
+msgid "Default language"
+msgstr "Oletuskieli"
+
+#: setup/frames/index.inc.php:182 setup/lib/messages.inc.php:187
+msgid "let the user choose"
+msgstr "anna käyttäjän valita"
+
+#: setup/frames/index.inc.php:193 setup/lib/messages.inc.php:216
+msgid "- none -"
+msgstr "- ei mitään -"
+
+#: setup/frames/index.inc.php:196 setup/lib/messages.inc.php:51
+msgid "Default server"
+msgstr "Oletuspalvelin"
+
+#: setup/frames/index.inc.php:206 setup/lib/messages.inc.php:66
+msgid "End of line"
+msgstr "Rivin loppu"
+
+#: setup/frames/index.inc.php:211 setup/lib/messages.inc.php:61
+msgid "Display"
+msgstr "Näytä"
+
+#: setup/frames/index.inc.php:215 setup/lib/messages.inc.php:190
+msgid "Load"
+msgstr "Lataa asetukset"
+
+#: setup/frames/index.inc.php:226 setup/lib/messages.inc.php:152
+msgid "phpMyAdmin homepage"
+msgstr "phpMyAdminin verkkosivut"
+
+#: setup/frames/index.inc.php:227 setup/lib/messages.inc.php:64
+msgid "Donate"
+msgstr "Lahjoita"
+
+#: setup/frames/index.inc.php:228 setup/lib/messages.inc.php:370
+msgid "Check for latest version"
+msgstr "Tarkista uusin versio"
+
+#: setup/frames/menu.inc.php:18 setup/lib/messages.inc.php:137
+msgid "Features"
+msgstr "Ominaisuudet"
+
+#: setup/frames/menu.inc.php:19 setup/lib/messages.inc.php:113
+msgid "Navigation frame"
+msgstr "Navigointikehys"
+
+#: setup/frames/menu.inc.php:20 setup/lib/messages.inc.php:118
+msgid "Main frame"
+msgstr "Pääkehys"
+
+#: setup/frames/servers.inc.php:28 setup/lib/messages.inc.php:272
+msgid "Edit server"
+msgstr "Muokkaa palvelinta"
+
+#: setup/frames/servers.inc.php:37 setup/lib/messages.inc.php:241
+msgid "Add a new server"
+msgstr "Lisää uusi palvelin"
+
+#: setup/lib/FormDisplay.tpl.php:182 setup/lib/messages.inc.php:328
+#, php-format
+msgid "Set value: %s"
+msgstr "Aseta arvo: %s"
+
+#: setup/lib/FormDisplay.tpl.php:187 setup/lib/messages.inc.php:234
+msgid "Restore default value"
+msgstr "Palauta oletusarvo"
+
+#: setup/lib/form_processing.lib.php:43 setup/lib/messages.inc.php:377
+msgid "Warning"
+msgstr "Varoitus"
+
 #: setup/lib/messages.inc.php:16
 msgid "Allow character set conversion"
 msgstr "Salli merkistömuunnos"
@@ -7192,10 +7287,6 @@ msgstr ""
 msgid "Compress on the fly"
 msgstr "Pakkaa lennossa"
 
-#: setup/lib/messages.inc.php:45
-msgid "Configuration file"
-msgstr "Asetustiedosto"
-
 #: setup/lib/messages.inc.php:46
 msgid ""
 "Whether a warning ("Are your really sure...") should be displayed "
@@ -7216,14 +7307,6 @@ msgstr "Muunnoksissa käytettävä oletusmerkistö"
 msgid "Default character set"
 msgstr "Oletusmerkistö"
 
-#: setup/lib/messages.inc.php:50
-msgid "Default language"
-msgstr "Oletuskieli"
-
-#: setup/lib/messages.inc.php:51
-msgid "Default server"
-msgstr "Oletuspalvelin"
-
 #: setup/lib/messages.inc.php:52
 msgid "Tab that is displayed when entering a database"
 msgstr "Tietokantaa syötettäessä näytettävä välilehti"
@@ -7265,10 +7348,6 @@ msgstr "Näyttää tietokannat luettelona eikä pudotusvalikkona"
 msgid "Display databases as a list"
 msgstr "Näytä tietokannat luettelona"
 
-#: setup/lib/messages.inc.php:61
-msgid "Display"
-msgstr "Näytä"
-
 #: setup/lib/messages.inc.php:62
 msgid "Show server listing as a list instead of a drop down"
 msgstr "Näytä palvelimet luettelona eikä pudotusvalikkona"
@@ -7277,18 +7356,6 @@ msgstr "Näytä palvelimet luettelona eikä pudotusvalikkona"
 msgid "Display servers as a list"
 msgstr "Näytä palvelimet luettelona"
 
-#: setup/lib/messages.inc.php:64
-msgid "Donate"
-msgstr "Lahjoita"
-
-#: setup/lib/messages.inc.php:65
-msgid "Download"
-msgstr "Lataa koneelle"
-
-#: setup/lib/messages.inc.php:66
-msgid "End of line"
-msgstr "Rivin loppu"
-
 #: setup/lib/messages.inc.php:67
 msgid "Could not connect to MySQL server"
 msgstr "MySQL-palvelimeen ei voitu yhdistää"
@@ -7468,10 +7535,6 @@ msgstr "Tietokantojen näyttöasetukset"
 msgid "Customize appearance of the navigation frame"
 msgstr "Mukauta navigointikehyksen näkymää"
 
-#: setup/lib/messages.inc.php:113
-msgid "Navigation frame"
-msgstr "Navigointikehys"
-
 #: setup/lib/messages.inc.php:114
 msgid "Servers display options"
 msgstr "Palvelinten näyttöasetukset"
@@ -7480,10 +7543,6 @@ msgstr "Palvelinten näyttöasetukset"
 msgid "Tables display options"
 msgstr "Taulujen näyttöasetukset"
 
-#: setup/lib/messages.inc.php:118
-msgid "Main frame"
-msgstr "Pääkehys"
-
 #: setup/lib/messages.inc.php:119
 msgid "Settings that didn't fit enywhere else"
 msgstr "Asetukset, jotka eivät sovi muualle"
@@ -7566,10 +7625,6 @@ msgstr "Mukauttaminen"
 msgid "Customize export options"
 msgstr "Mukauta viennin oletusasetuksia"
 
-#: setup/lib/messages.inc.php:137
-msgid "Features"
-msgstr "Ominaisuudet"
-
 #: setup/lib/messages.inc.php:138
 msgid "Customize import defaults"
 msgstr "Mukauta tuonnin oletusasetuksia"
@@ -7641,10 +7696,6 @@ msgstr ""
 "purkuun[/a] tarvitaan funktioita (%s), jotka eivät ole käytettävissä tässä "
 "järjestelmässä."
 
-#: setup/lib/messages.inc.php:152
-msgid "phpMyAdmin homepage"
-msgstr "phpMyAdminin verkkosivut"
-
 #: setup/lib/messages.inc.php:153
 msgid "Extra parameters for iconv"
 msgstr "Iconv-laajennuksen lisäparametrit"
@@ -7695,14 +7746,6 @@ msgstr "Osittainen tuonti: ohita kyselyjä"
 msgid "Insecure connection"
 msgstr "Salaamaton yhteys"
 
-#: setup/lib/messages.inc.php:164
-msgid ""
-"You are not using a secure connection; all data (including potentially "
-"sensitive information, like passwords) is transferred unencrypted!"
-msgstr ""
-"Käytössäsi ei ole salattua yhteyttä; kaikki tiedot (mukaan lukien "
-"mahdollisesti arkaa tietoa kuten salasanoja) siirretään salaamattomana!"
-
 #: setup/lib/messages.inc.php:165
 #, php-format
 msgid ""
@@ -7804,10 +7847,6 @@ msgstr "Korosta kohdistimen alla oleva palvelin"
 msgid "Enable highlighting"
 msgstr "Käytä korostusta"
 
-#: setup/lib/messages.inc.php:187
-msgid "let the user choose"
-msgstr "anna käyttäjän valita"
-
 #: setup/lib/messages.inc.php:188
 msgid "Use less graphically intense tabs"
 msgstr "Käytä pelkistettyjä välilehtiä"
@@ -7816,10 +7855,6 @@ msgstr "Käytä pelkistettyjä välilehtiä"
 msgid "Light tabs"
 msgstr "Kevyet välilehdet"
 
-#: setup/lib/messages.inc.php:190
-msgid "Load"
-msgstr "Lataa asetukset"
-
 #: setup/lib/messages.inc.php:191
 msgid ""
 "If TRUE, logout deletes cookies for all servers; when set to FALSE, logout "
@@ -7941,14 +7976,6 @@ msgstr "Käytä vain kuvakkeita, vain tekstiä tai molempia"
 msgid "Iconic navigation bar"
 msgstr "Navigointipalkki, jossa kuvakkeet"
 
-#: setup/lib/messages.inc.php:212
-msgid "New server"
-msgstr "Uusi palvelin"
-
-#: setup/lib/messages.inc.php:213
-msgid "There are no configured servers"
-msgstr "Palvelimia ei ole määritelty"
-
 #: setup/lib/messages.inc.php:214
 msgid "use GZip output buffering for increased speed in HTTP transfers"
 msgstr "käytä Gzip-ulostulon puskurointia nopeuttaaksesi HTTP-siirtoja"
@@ -7957,10 +7984,6 @@ msgstr "käytä Gzip-ulostulon puskurointia nopeuttaaksesi HTTP-siirtoja"
 msgid "GZip output buffering"
 msgstr "GZip-ulostulon puskurointi"
 
-#: setup/lib/messages.inc.php:216
-msgid "- none -"
-msgstr "- ei mitään -"
-
 #: setup/lib/messages.inc.php:217
 msgid ""
 "[kbd]SMART[/kbd] - i.e. descending order for fields of type TIME, DATE, "
@@ -7973,10 +7996,6 @@ msgstr ""
 msgid "Default sorting order"
 msgstr "Oletuslajittelujärjestys"
 
-#: setup/lib/messages.inc.php:219
-msgid "Overview"
-msgstr "Yleiskatsaus"
-
 #: setup/lib/messages.inc.php:220
 msgid "Use persistent connections to MySQL databases"
 msgstr "Käytä MySQL-tietokantojen jatkuvia yhteyksiä"
@@ -8034,10 +8053,6 @@ msgstr "Valitse, mitä funktioita käytetään merkistömuunnoksessa"
 msgid "Recoding engine"
 msgstr "Merkistön uudelleenkoodaus"
 
-#: setup/lib/messages.inc.php:234
-msgid "Restore default value"
-msgstr "Palauta oletusarvo"
-
 #: setup/lib/messages.inc.php:235
 msgid "Try to revert erroneous fields to their default values"
 msgstr "Yritä palauttaa virheelliset kentät oletusarvoilleen"
@@ -8074,10 +8089,6 @@ msgstr "Suorituskykysyistä tulisi käyttää mysqli-laajennusta."
 msgid "You allow for connecting to the server without a password."
 msgstr "Sallit yhteyden muodostamisen palvelimeen ilman salasanaa."
 
-#: setup/lib/messages.inc.php:241
-msgid "Add a new server"
-msgstr "Lisää uusi palvelin"
-
 #: setup/lib/messages.inc.php:242
 msgid "Leave blank if not used"
 msgstr "Jätä tyhjäksi, jos tätä ei käytetä"
@@ -8239,10 +8250,6 @@ msgstr ""
 "palveluntarjoajalle, johon sinun lisäksesi tuhannet käyttäjät ovat "
 "yhteydessä."
 
-#: setup/lib/messages.inc.php:272
-msgid "Edit server"
-msgstr "Muokkaa palvelinta"
-
 #: setup/lib/messages.inc.php:273
 msgid "What PHP extension to use; you should use mysqli if supported"
 msgstr ""
@@ -8522,11 +8529,6 @@ msgstr ""
 msgid "Verbose name of this server"
 msgstr "Tämän palvelimen yksityiskohtainen nimi"
 
-#: setup/lib/messages.inc.php:328
-#, php-format
-msgid "Set value: %s"
-msgstr "Aseta arvo: %s"
-
 #: setup/lib/messages.inc.php:329
 msgid ""
 "Whether a user should be displayed a "show all (records)" button"
@@ -8566,10 +8568,6 @@ msgstr "Näytä funktiokentät muokkaus- ja liäsystilassa"
 msgid "Show function fields"
 msgstr "Näytä funktiokentät"
 
-#: setup/lib/messages.inc.php:337
-msgid "Show hidden messages (#MSG_COUNT)"
-msgstr "Näytä piilotetut sanomat (#MSG_COUNT)"
-
 #: setup/lib/messages.inc.php:338
 msgid ""
 "Shows link to [a at http://php.net/manual/function.phpinfo.php]phpinfo()[/a] "
@@ -8720,10 +8718,6 @@ msgstr ""
 msgid "Got invalid version string from server"
 msgstr "Palvelimelta saatiin virheellinen versiomerkkijono."
 
-#: setup/lib/messages.inc.php:370
-msgid "Check for latest version"
-msgstr "Tarkista uusin versio"
-
 #: setup/lib/messages.inc.php:371
 #, php-format
 msgid ""
@@ -8763,10 +8757,6 @@ msgid ""
 msgstr ""
 "Versiota ei voi tarkistaa, koska URL- tai CURL-käärettä ei ole saatavilla."
 
-#: setup/lib/messages.inc.php:377
-msgid "Warning"
-msgstr "Varoitus"
-
 #: setup/lib/messages.inc.php:378
 msgid ""
 "Enable [a at http://en.wikipedia.org/wiki/ZIP_(file_format)]ZIP[/a] compression "
@@ -8838,6 +8828,19 @@ msgid "Description"
 msgstr "Kuvaus"
 
 #, fuzzy
+#~| msgid ""
+#~| "However on last run no data has been parsed, this usually means "
+#~| "phpMyAdmin won't be able to finish this import unless you increase php "
+#~| "time limits."
+#~ msgid ""
+#~ "However on last run no data has been parsed, this usually means "
+#~ "phpMyAdmin won"
+#~ msgstr ""
+#~ "Viimeisellä suorituskerralla ei kuitenkaan jäsennelty mitään tietoja. "
+#~ "Tämä tarkoittaa yleensä sitä, että phpMyAdmin ei voi ajaa tätä tuontia "
+#~ "loppuun asti ellei PHP:n suoritusaikarajaa nosteta."
+
+#, fuzzy
 #~| msgid "None"
 #~ msgctxt "None action"
 #~ msgid "None"
diff --git a/po/fr.po b/po/fr.po
index 4b3eb83..970bce3 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-14 07:48-0400\n"
+"POT-Creation-Date: 2010-05-14 13:39-0400\n"
 "PO-Revision-Date: 2010-05-12 18:01+0200\n"
 "Last-Translator: Marc <marc at infomarc.info>\n"
 "Language-Team: french <fr at li.org>\n"
@@ -947,15 +947,10 @@ msgstr ""
 "La limite de temps a été atteinte; si vous voulez terminer l'importation, "
 "soumettez à nouveau le même fichier et l'importation continuera."
 
-#: import.php:426
-#, fuzzy
-#| msgid ""
-#| "However on last run no data has been parsed, this usually means "
-#| "phpMyAdmin won't be able to finish this import unless you increase php "
-#| "time limits."
+#: import.php:426 libraries/messages.inc.php:1102
 msgid ""
 "However on last run no data has been parsed, this usually means phpMyAdmin "
-"won"
+"won't be able to finish this import unless you increase php time limits."
 msgstr ""
 "Cependant lors du dernier traitement, aucune section n'a été analysée; ceci "
 "signifie que phpMyAdmin ne pourra terminer cette importation, à moins que la "
@@ -6419,15 +6414,6 @@ msgstr "Fils d'exécution"
 msgid "Thread %s was successfully killed."
 msgstr "Le processus %s a été éliminé."
 
-#: libraries/messages.inc.php:1102
-msgid ""
-"However on last run no data has been parsed, this usually means phpMyAdmin "
-"won't be able to finish this import unless you increase php time limits."
-msgstr ""
-"Cependant lors du dernier traitement, aucune section n'a été analysée; ceci "
-"signifie que phpMyAdmin ne pourra terminer cette importation, à moins que la "
-"limite de temps de PHP ne soit augmentée."
-
 #: libraries/messages.inc.php:1105 pmd_pdf.php:94
 msgid "to/from page"
 msgstr "de/vers la page"
@@ -6900,7 +6886,8 @@ msgstr "aucune"
 msgid "Filter"
 msgstr "Filtre"
 
-#: navigation.php:319 setup/lib/messages.inc.php:42
+#: navigation.php:319 setup/frames/index.inc.php:218
+#: setup/lib/messages.inc.php:42
 msgid "Clear"
 msgstr "Vider"
 
@@ -6983,6 +6970,114 @@ msgstr "Connexion actuelle"
 msgid "Configuration: %s"
 msgstr "Configuration : %s"
 
+#: setup/frames/config.inc.php:25 setup/frames/index.inc.php:152
+#: setup/lib/messages.inc.php:45
+msgid "Configuration file"
+msgstr "Fichier de configuration"
+
+#: setup/frames/config.inc.php:38 setup/frames/index.inc.php:212
+#: setup/lib/messages.inc.php:65
+msgid "Download"
+msgstr "Télécharger"
+
+#: setup/frames/index.inc.php:58 setup/lib/messages.inc.php:164
+msgid ""
+"You are not using a secure connection; all data (including potentially "
+"sensitive information, like passwords) is transferred unencrypted!"
+msgstr ""
+"Votre connexion n'est pas sécurisée; toutes les données sont transférées non-"
+"encryptées!"
+
+#: setup/frames/index.inc.php:87 setup/frames/menu.inc.php:17
+#: setup/lib/messages.inc.php:219
+msgid "Overview"
+msgstr "Survol"
+
+#: setup/frames/index.inc.php:95 setup/lib/messages.inc.php:337
+msgid "Show hidden messages (#MSG_COUNT)"
+msgstr "Afficher les messages cachés (#MSG_COUNT)"
+
+#: setup/frames/index.inc.php:135 setup/lib/messages.inc.php:213
+msgid "There are no configured servers"
+msgstr "Aucun serveur n'est configuré."
+
+#: setup/frames/index.inc.php:143 setup/lib/messages.inc.php:212
+msgid "New server"
+msgstr "Nouveau serveur"
+
+#: setup/frames/index.inc.php:172 setup/lib/messages.inc.php:50
+msgid "Default language"
+msgstr "Langue par défaut"
+
+#: setup/frames/index.inc.php:182 setup/lib/messages.inc.php:187
+msgid "let the user choose"
+msgstr "laisser l'utilisateur choisir"
+
+#: setup/frames/index.inc.php:193 setup/lib/messages.inc.php:216
+msgid "- none -"
+msgstr "- aucun -"
+
+#: setup/frames/index.inc.php:196 setup/lib/messages.inc.php:51
+msgid "Default server"
+msgstr "Serveur par défaut"
+
+#: setup/frames/index.inc.php:206 setup/lib/messages.inc.php:66
+msgid "End of line"
+msgstr "Fin de ligne"
+
+#: setup/frames/index.inc.php:211 setup/lib/messages.inc.php:61
+msgid "Display"
+msgstr "Afficher"
+
+#: setup/frames/index.inc.php:215 setup/lib/messages.inc.php:190
+msgid "Load"
+msgstr "Charger"
+
+#: setup/frames/index.inc.php:226 setup/lib/messages.inc.php:152
+msgid "phpMyAdmin homepage"
+msgstr "Site de phpMyAdmin"
+
+#: setup/frames/index.inc.php:227 setup/lib/messages.inc.php:64
+msgid "Donate"
+msgstr "Faire un don"
+
+#: setup/frames/index.inc.php:228 setup/lib/messages.inc.php:370
+msgid "Check for latest version"
+msgstr "Vérifier la présence d'une nouvelle version"
+
+#: setup/frames/menu.inc.php:18 setup/lib/messages.inc.php:137
+msgid "Features"
+msgstr "Fonctionnalités"
+
+#: setup/frames/menu.inc.php:19 setup/lib/messages.inc.php:113
+msgid "Navigation frame"
+msgstr "Panneau de navigation"
+
+#: setup/frames/menu.inc.php:20 setup/lib/messages.inc.php:118
+msgid "Main frame"
+msgstr "Panneau principal"
+
+#: setup/frames/servers.inc.php:28 setup/lib/messages.inc.php:272
+msgid "Edit server"
+msgstr "Modifier serveur"
+
+#: setup/frames/servers.inc.php:37 setup/lib/messages.inc.php:241
+msgid "Add a new server"
+msgstr "Ajouter un serveur"
+
+#: setup/lib/FormDisplay.tpl.php:182 setup/lib/messages.inc.php:328
+#, php-format
+msgid "Set value: %s"
+msgstr "Assigner la valeur: %s"
+
+#: setup/lib/FormDisplay.tpl.php:187 setup/lib/messages.inc.php:234
+msgid "Restore default value"
+msgstr "Ramener la valeur par défaut"
+
+#: setup/lib/form_processing.lib.php:43 setup/lib/messages.inc.php:377
+msgid "Warning"
+msgstr "Avertissement"
+
 #: setup/lib/messages.inc.php:16
 msgid "Allow character set conversion"
 msgstr "Active la conversion des caractères"
@@ -7148,10 +7243,6 @@ msgstr ""
 msgid "Compress on the fly"
 msgstr "Compression à la volée"
 
-#: setup/lib/messages.inc.php:45
-msgid "Configuration file"
-msgstr "Fichier de configuration"
-
 #: setup/lib/messages.inc.php:46
 msgid ""
 "Whether a warning ("Are your really sure...") should be displayed "
@@ -7172,14 +7263,6 @@ msgstr "Utilisé pour les conversions"
 msgid "Default character set"
 msgstr "Jeu de caractères par défaut"
 
-#: setup/lib/messages.inc.php:50
-msgid "Default language"
-msgstr "Langue par défaut"
-
-#: setup/lib/messages.inc.php:51
-msgid "Default server"
-msgstr "Serveur par défaut"
-
 #: setup/lib/messages.inc.php:52
 msgid "Tab that is displayed when entering a database"
 msgstr "L'onglet affiché lors de l'entrée dans une base de données"
@@ -7220,10 +7303,6 @@ msgstr "...au lieu d'un menu déroulant"
 msgid "Display databases as a list"
 msgstr "Affiche les bases de données sous forme de liste"
 
-#: setup/lib/messages.inc.php:61
-msgid "Display"
-msgstr "Afficher"
-
 #: setup/lib/messages.inc.php:62
 msgid "Show server listing as a list instead of a drop down"
 msgstr "...au lieu d'un menu déroulant"
@@ -7232,18 +7311,6 @@ msgstr "...au lieu d'un menu déroulant"
 msgid "Display servers as a list"
 msgstr "Affiche les serveurs sous forme de liste"
 
-#: setup/lib/messages.inc.php:64
-msgid "Donate"
-msgstr "Faire un don"
-
-#: setup/lib/messages.inc.php:65
-msgid "Download"
-msgstr "Télécharger"
-
-#: setup/lib/messages.inc.php:66
-msgid "End of line"
-msgstr "Fin de ligne"
-
 #: setup/lib/messages.inc.php:67
 msgid "Could not connect to MySQL server"
 msgstr "Connexion au serveur MySQL impossible."
@@ -7427,10 +7494,6 @@ msgstr "Options d'affichage des bases de données"
 msgid "Customize appearance of the navigation frame"
 msgstr "Personnaliser l'apparence du panneau de navigation"
 
-#: setup/lib/messages.inc.php:113
-msgid "Navigation frame"
-msgstr "Panneau de navigation"
-
 #: setup/lib/messages.inc.php:114
 msgid "Servers display options"
 msgstr "Options d'affichage des serveurs"
@@ -7439,10 +7502,6 @@ msgstr "Options d'affichage des serveurs"
 msgid "Tables display options"
 msgstr "Options d'affichage des tables"
 
-#: setup/lib/messages.inc.php:118
-msgid "Main frame"
-msgstr "Panneau principal"
-
 #: setup/lib/messages.inc.php:119
 msgid "Settings that didn't fit enywhere else"
 msgstr "Réglages divers"
@@ -7527,10 +7586,6 @@ msgstr "Personnalisation"
 msgid "Customize export options"
 msgstr "Personnaliser les valeurs pour exportation"
 
-#: setup/lib/messages.inc.php:137
-msgid "Features"
-msgstr "Fonctionnalités"
-
 #: setup/lib/messages.inc.php:138
 msgid "Customize import defaults"
 msgstr "Personnaliser les valeurs pour importation"
@@ -7602,10 +7657,6 @@ msgstr ""
 "décompression GZip[/a] requièrent des fonctions (%s) non disponibles sur ce "
 "serveur."
 
-#: setup/lib/messages.inc.php:152
-msgid "phpMyAdmin homepage"
-msgstr "Site de phpMyAdmin"
-
 #: setup/lib/messages.inc.php:153
 msgid "Extra parameters for iconv"
 msgstr "Paramètres pour iconv"
@@ -7656,14 +7707,6 @@ msgstr "Nombre de requêtes à ignorer"
 msgid "Insecure connection"
 msgstr "Connexion non sécurisée"
 
-#: setup/lib/messages.inc.php:164
-msgid ""
-"You are not using a secure connection; all data (including potentially "
-"sensitive information, like passwords) is transferred unencrypted!"
-msgstr ""
-"Votre connexion n'est pas sécurisée; toutes les données sont transférées non-"
-"encryptées!"
-
 #: setup/lib/messages.inc.php:165
 #, php-format
 msgid ""
@@ -7765,10 +7808,6 @@ msgstr "...dans le panneau de navigation"
 msgid "Enable highlighting"
 msgstr "Active la surbrillance"
 
-#: setup/lib/messages.inc.php:187
-msgid "let the user choose"
-msgstr "laisser l'utilisateur choisir"
-
 #: setup/lib/messages.inc.php:188
 msgid "Use less graphically intense tabs"
 msgstr "Utiliser des onglets moins intenses graphiquement"
@@ -7777,10 +7816,6 @@ msgstr "Utiliser des onglets moins intenses graphiquement"
 msgid "Light tabs"
 msgstr "Onglets légers"
 
-#: setup/lib/messages.inc.php:190
-msgid "Load"
-msgstr "Charger"
-
 #: setup/lib/messages.inc.php:191
 msgid ""
 "If TRUE, logout deletes cookies for all servers; when set to FALSE, logout "
@@ -7899,14 +7934,6 @@ msgstr "Utiliser les icônes (true), du texte (false) ou les deux (both)"
 msgid "Iconic navigation bar"
 msgstr "Apparence de la barre de navigation"
 
-#: setup/lib/messages.inc.php:212
-msgid "New server"
-msgstr "Nouveau serveur"
-
-#: setup/lib/messages.inc.php:213
-msgid "There are no configured servers"
-msgstr "Aucun serveur n'est configuré."
-
 #: setup/lib/messages.inc.php:214
 msgid "use GZip output buffering for increased speed in HTTP transfers"
 msgstr "sert à augmenter la vitesse des transferts HTTP"
@@ -7915,10 +7942,6 @@ msgstr "sert à augmenter la vitesse des transferts HTTP"
 msgid "GZip output buffering"
 msgstr "Tampon de sortie GZip"
 
-#: setup/lib/messages.inc.php:216
-msgid "- none -"
-msgstr "- aucun -"
-
 #: setup/lib/messages.inc.php:217
 msgid ""
 "[kbd]SMART[/kbd] - i.e. descending order for fields of type TIME, DATE, "
@@ -7931,10 +7954,6 @@ msgstr ""
 msgid "Default sorting order"
 msgstr "Ordre de tri par défaut"
 
-#: setup/lib/messages.inc.php:219
-msgid "Overview"
-msgstr "Survol"
-
 #: setup/lib/messages.inc.php:220
 msgid "Use persistent connections to MySQL databases"
 msgstr "...au serveur MySQL"
@@ -7993,10 +8012,6 @@ msgstr ""
 msgid "Recoding engine"
 msgstr "Moteur de conversion"
 
-#: setup/lib/messages.inc.php:234
-msgid "Restore default value"
-msgstr "Ramener la valeur par défaut"
-
 #: setup/lib/messages.inc.php:235
 msgid "Try to revert erroneous fields to their default values"
 msgstr "Tenter de ramener les champs en erreur à leur valeur par défaut"
@@ -8034,10 +8049,6 @@ msgstr "Il est recommandé d'utiliser mysqli"
 msgid "You allow for connecting to the server without a password."
 msgstr "Vous permettez les connexions au serveur sans mot de passe."
 
-#: setup/lib/messages.inc.php:241
-msgid "Add a new server"
-msgstr "Ajouter un serveur"
-
 #: setup/lib/messages.inc.php:242
 msgid "Leave blank if not used"
 msgstr "Laisser vide si non utilisé"
@@ -8197,10 +8208,6 @@ msgstr ""
 "serveur[/a] et [a@?page=form&formset=features#tab_Security]serveurs "
 "mandataires de confiance[/a]."
 
-#: setup/lib/messages.inc.php:272
-msgid "Edit server"
-msgstr "Modifier serveur"
-
 #: setup/lib/messages.inc.php:273
 msgid "What PHP extension to use; you should use mysqli if supported"
 msgstr "Quelle extension PHP utiliser (prenez mysqli si possible)"
@@ -8475,11 +8482,6 @@ msgstr ""
 msgid "Verbose name of this server"
 msgstr "Nom à afficher pour ce serveur"
 
-#: setup/lib/messages.inc.php:328
-#, php-format
-msgid "Set value: %s"
-msgstr "Assigner la valeur: %s"
-
 #: setup/lib/messages.inc.php:329
 msgid ""
 "Whether a user should be displayed a "show all (records)" button"
@@ -8519,10 +8521,6 @@ msgstr "En insertion/édition, montrer la colonne contenant les fonctions"
 msgid "Show function fields"
 msgstr "Montrer les fonctions"
 
-#: setup/lib/messages.inc.php:337
-msgid "Show hidden messages (#MSG_COUNT)"
-msgstr "Afficher les messages cachés (#MSG_COUNT)"
-
 #: setup/lib/messages.inc.php:338
 msgid ""
 "Shows link to [a at http://php.net/manual/function.phpinfo.php]phpinfo()[/a] "
@@ -8671,10 +8669,6 @@ msgstr "Échec lors de la vérification de version."
 msgid "Got invalid version string from server"
 msgstr "Un numéro de version invalide a été reçu du serveur."
 
-#: setup/lib/messages.inc.php:370
-msgid "Check for latest version"
-msgstr "Vérifier la présence d'une nouvelle version"
-
 #: setup/lib/messages.inc.php:371
 #, php-format
 msgid ""
@@ -8712,10 +8706,6 @@ msgstr ""
 "Ni CURL ni \"URL wrapper\" ne sont disponibles; impossible de chercher une "
 "nouvelle version."
 
-#: setup/lib/messages.inc.php:377
-msgid "Warning"
-msgstr "Avertissement"
-
 #: setup/lib/messages.inc.php:378
 msgid ""
 "Enable [a at http://en.wikipedia.org/wiki/ZIP_(file_format)]ZIP[/a] compression "
@@ -8772,3 +8762,16 @@ msgstr "Créer un index sur  %s colonnes"
 msgctxt "for MIME transformation"
 msgid "Description"
 msgstr "Description"
+
+#, fuzzy
+#~| msgid ""
+#~| "However on last run no data has been parsed, this usually means "
+#~| "phpMyAdmin won't be able to finish this import unless you increase php "
+#~| "time limits."
+#~ msgid ""
+#~ "However on last run no data has been parsed, this usually means "
+#~ "phpMyAdmin won"
+#~ msgstr ""
+#~ "Cependant lors du dernier traitement, aucune section n'a été analysée; "
+#~ "ceci signifie que phpMyAdmin ne pourra terminer cette importation, à "
+#~ "moins que la limite de temps de PHP ne soit augmentée."
diff --git a/po/gl.po b/po/gl.po
index 93ef7d6..3bd134c 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-14 07:48-0400\n"
+"POT-Creation-Date: 2010-05-14 13:39-0400\n"
 "PO-Revision-Date: 2010-03-12 09:14+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: galician <gl at li.org>\n"
@@ -946,15 +946,10 @@ msgstr ""
 "Ultrapasouse o tempo de espera do guión. Se quere rematar a importación, "
 "volva a enviar o mesmo ficheiro e a importación continuará."
 
-#: import.php:426
-#, fuzzy
-#| msgid ""
-#| "However on last run no data has been parsed, this usually means "
-#| "phpMyAdmin won't be able to finish this import unless you increase php "
-#| "time limits."
+#: import.php:426 libraries/messages.inc.php:1102
 msgid ""
 "However on last run no data has been parsed, this usually means phpMyAdmin "
-"won"
+"won't be able to finish this import unless you increase php time limits."
 msgstr ""
 "Porén, na última executación non se examinou nada de datos, o que "
 "normalmente significa que o phpMyAdmin non poderá rematar esta importación a "
@@ -6462,15 +6457,6 @@ msgstr "Fíos"
 msgid "Thread %s was successfully killed."
 msgstr "Finalizouse o fío %s."
 
-#: libraries/messages.inc.php:1102
-msgid ""
-"However on last run no data has been parsed, this usually means phpMyAdmin "
-"won't be able to finish this import unless you increase php time limits."
-msgstr ""
-"Porén, na última executación non se examinou nada de datos, o que "
-"normalmente significa que o phpMyAdmin non poderá rematar esta importación a "
-"non ser que lle incrementen os limites de tempo de php."
-
 #: libraries/messages.inc.php:1105 pmd_pdf.php:94
 msgid "to/from page"
 msgstr "até/desde a páxina"
@@ -6939,7 +6925,8 @@ msgstr "Ningunha"
 msgid "Filter"
 msgstr "Filtro"
 
-#: navigation.php:319 setup/lib/messages.inc.php:42
+#: navigation.php:319 setup/frames/index.inc.php:218
+#: setup/lib/messages.inc.php:42
 msgid "Clear"
 msgstr "Limpar"
 
@@ -7048,6 +7035,115 @@ msgstr "A conexión non é segura"
 msgid "Configuration: %s"
 msgstr "Ficheiro de configuración"
 
+#: setup/frames/config.inc.php:25 setup/frames/index.inc.php:152
+#: setup/lib/messages.inc.php:45
+msgid "Configuration file"
+msgstr "Ficheiro de configuración"
+
+#: setup/frames/config.inc.php:38 setup/frames/index.inc.php:212
+#: setup/lib/messages.inc.php:65
+msgid "Download"
+msgstr "Descargar"
+
+#: setup/frames/index.inc.php:58 setup/lib/messages.inc.php:164
+msgid ""
+"You are not using a secure connection; all data (including potentially "
+"sensitive information, like passwords) is transferred unencrypted!"
+msgstr ""
+"Non está a empregar unha conexión segura; todos os datos (incluída "
+"información potencialmente sensíbel, como os contrasinais) transfírense sen "
+"cifrar!"
+
+#: setup/frames/index.inc.php:87 setup/frames/menu.inc.php:17
+#: setup/lib/messages.inc.php:219
+msgid "Overview"
+msgstr "Vista xeral"
+
+#: setup/frames/index.inc.php:95 setup/lib/messages.inc.php:337
+msgid "Show hidden messages (#MSG_COUNT)"
+msgstr "Mostrar as mensaxes acochadas (#MSG_COUNT)"
+
+#: setup/frames/index.inc.php:135 setup/lib/messages.inc.php:213
+msgid "There are no configured servers"
+msgstr "Non hai ningún servidor configurado"
+
+#: setup/frames/index.inc.php:143 setup/lib/messages.inc.php:212
+msgid "New server"
+msgstr "Novo servidor"
+
+#: setup/frames/index.inc.php:172 setup/lib/messages.inc.php:50
+msgid "Default language"
+msgstr "Lingua por omisión"
+
+#: setup/frames/index.inc.php:182 setup/lib/messages.inc.php:187
+msgid "let the user choose"
+msgstr "que o escolla o usuario"
+
+#: setup/frames/index.inc.php:193 setup/lib/messages.inc.php:216
+msgid "- none -"
+msgstr "- ningún -"
+
+#: setup/frames/index.inc.php:196 setup/lib/messages.inc.php:51
+msgid "Default server"
+msgstr "Servidor por omisión"
+
+#: setup/frames/index.inc.php:206 setup/lib/messages.inc.php:66
+msgid "End of line"
+msgstr "Fin da liña"
+
+#: setup/frames/index.inc.php:211 setup/lib/messages.inc.php:61
+msgid "Display"
+msgstr "Mostrar"
+
+#: setup/frames/index.inc.php:215 setup/lib/messages.inc.php:190
+msgid "Load"
+msgstr "Cargar"
+
+#: setup/frames/index.inc.php:226 setup/lib/messages.inc.php:152
+msgid "phpMyAdmin homepage"
+msgstr "Páxina web do phpMyAdmin"
+
+#: setup/frames/index.inc.php:227 setup/lib/messages.inc.php:64
+msgid "Donate"
+msgstr "Doar"
+
+#: setup/frames/index.inc.php:228 setup/lib/messages.inc.php:370
+msgid "Check for latest version"
+msgstr "Comprobar cal é a última versión"
+
+#: setup/frames/menu.inc.php:18 setup/lib/messages.inc.php:137
+msgid "Features"
+msgstr "Funcionalidades"
+
+#: setup/frames/menu.inc.php:19 setup/lib/messages.inc.php:113
+msgid "Navigation frame"
+msgstr "Moldura de navegación"
+
+#: setup/frames/menu.inc.php:20 setup/lib/messages.inc.php:118
+msgid "Main frame"
+msgstr "Moldura principal"
+
+#: setup/frames/servers.inc.php:28 setup/lib/messages.inc.php:272
+msgid "Edit server"
+msgstr "Modificar o servidor"
+
+#: setup/frames/servers.inc.php:37 setup/lib/messages.inc.php:241
+msgid "Add a new server"
+msgstr "Engadir un servidor novo"
+
+#: setup/lib/FormDisplay.tpl.php:182 setup/lib/messages.inc.php:328
+#, php-format
+msgid "Set value: %s"
+msgstr "Poñer como valor: %s"
+
+#: setup/lib/FormDisplay.tpl.php:187 setup/lib/messages.inc.php:234
+msgid "Restore default value"
+msgstr "Volver ao valor por omisión"
+
+#: setup/lib/form_processing.lib.php:43 setup/lib/messages.inc.php:377
+msgid "Warning"
+msgstr "Advertencia"
+
 #: setup/lib/messages.inc.php:16
 msgid "Allow character set conversion"
 msgstr "Permitir a conversión do conxunto de caracteres"
@@ -7215,10 +7311,6 @@ msgstr ""
 msgid "Compress on the fly"
 msgstr "Comprimir ao voo"
 
-#: setup/lib/messages.inc.php:45
-msgid "Configuration file"
-msgstr "Ficheiro de configuración"
-
 #: setup/lib/messages.inc.php:46
 msgid ""
 "Whether a warning ("Are your really sure...") should be displayed "
@@ -7239,14 +7331,6 @@ msgstr "Conxunto de caracteres por omisión empregado para as conversións"
 msgid "Default character set"
 msgstr "Conxunto de caracteres por omisión"
 
-#: setup/lib/messages.inc.php:50
-msgid "Default language"
-msgstr "Lingua por omisión"
-
-#: setup/lib/messages.inc.php:51
-msgid "Default server"
-msgstr "Servidor por omisión"
-
 #: setup/lib/messages.inc.php:52
 msgid "Tab that is displayed when entering a database"
 msgstr "O separador que aparece cando se entra nunha base de datos"
@@ -7290,10 +7374,6 @@ msgstr ""
 msgid "Display databases as a list"
 msgstr "Mostrar as bases de datos nunha listaxe"
 
-#: setup/lib/messages.inc.php:61
-msgid "Display"
-msgstr "Mostrar"
-
 #: setup/lib/messages.inc.php:62
 msgid "Show server listing as a list instead of a drop down"
 msgstr ""
@@ -7304,18 +7384,6 @@ msgstr ""
 msgid "Display servers as a list"
 msgstr "Mostrar os servidores nunha listaxe"
 
-#: setup/lib/messages.inc.php:64
-msgid "Donate"
-msgstr "Doar"
-
-#: setup/lib/messages.inc.php:65
-msgid "Download"
-msgstr "Descargar"
-
-#: setup/lib/messages.inc.php:66
-msgid "End of line"
-msgstr "Fin da liña"
-
 #: setup/lib/messages.inc.php:67
 msgid "Could not connect to MySQL server"
 msgstr "Non se puido conectar co servidor de MySQL"
@@ -7505,10 +7573,6 @@ msgstr "Opcións de exhibición das bases de datos"
 msgid "Customize appearance of the navigation frame"
 msgstr "Personalizar a aparencia da moldura de navegación"
 
-#: setup/lib/messages.inc.php:113
-msgid "Navigation frame"
-msgstr "Moldura de navegación"
-
 #: setup/lib/messages.inc.php:114
 msgid "Servers display options"
 msgstr "Opcións de exhibición dos servidores"
@@ -7517,10 +7581,6 @@ msgstr "Opcións de exhibición dos servidores"
 msgid "Tables display options"
 msgstr "Opcións de exhibición das táboas"
 
-#: setup/lib/messages.inc.php:118
-msgid "Main frame"
-msgstr "Moldura principal"
-
 #: setup/lib/messages.inc.php:119
 msgid "Settings that didn't fit enywhere else"
 msgstr "Configuracións que non cadraban noutra parte"
@@ -7605,10 +7665,6 @@ msgstr "Personalización"
 msgid "Customize export options"
 msgstr "Personalizar as opcións de exportación"
 
-#: setup/lib/messages.inc.php:137
-msgid "Features"
-msgstr "Funcionalidades"
-
 #: setup/lib/messages.inc.php:138
 msgid "Customize import defaults"
 msgstr "Personalizar as opcións de importación por omisión"
@@ -7681,10 +7737,6 @@ msgstr ""
 "descompresión con GZip[/a] require funcións (%s) que non están dispoñíbeis "
 "neste sistema."
 
-#: setup/lib/messages.inc.php:152
-msgid "phpMyAdmin homepage"
-msgstr "Páxina web do phpMyAdmin"
-
 #: setup/lib/messages.inc.php:153
 msgid "Extra parameters for iconv"
 msgstr "Parámetros extra para iconv"
@@ -7735,15 +7787,6 @@ msgstr "Importación parcial: ignorar as procuras"
 msgid "Insecure connection"
 msgstr "A conexión non é segura"
 
-#: setup/lib/messages.inc.php:164
-msgid ""
-"You are not using a secure connection; all data (including potentially "
-"sensitive information, like passwords) is transferred unencrypted!"
-msgstr ""
-"Non está a empregar unha conexión segura; todos os datos (incluída "
-"información potencialmente sensíbel, como os contrasinais) transfírense sen "
-"cifrar!"
-
 #: setup/lib/messages.inc.php:165
 #, php-format
 msgid ""
@@ -7845,10 +7888,6 @@ msgstr "Resaltar o servidor que estea por baixo do cursor do rato"
 msgid "Enable highlighting"
 msgstr "Activar o resaltado"
 
-#: setup/lib/messages.inc.php:187
-msgid "let the user choose"
-msgstr "que o escolla o usuario"
-
 #: setup/lib/messages.inc.php:188
 msgid "Use less graphically intense tabs"
 msgstr "Empregar separadores con menos carga gráfica"
@@ -7857,10 +7896,6 @@ msgstr "Empregar separadores con menos carga gráfica"
 msgid "Light tabs"
 msgstr "Separadores lixeiros"
 
-#: setup/lib/messages.inc.php:190
-msgid "Load"
-msgstr "Cargar"
-
 #: setup/lib/messages.inc.php:191
 msgid ""
 "If TRUE, logout deletes cookies for all servers; when set to FALSE, logout "
@@ -7984,14 +8019,6 @@ msgstr "Empregar só iconas, só texto ou ambos os dous"
 msgid "Iconic navigation bar"
 msgstr "Barra de navegación por iconas"
 
-#: setup/lib/messages.inc.php:212
-msgid "New server"
-msgstr "Novo servidor"
-
-#: setup/lib/messages.inc.php:213
-msgid "There are no configured servers"
-msgstr "Non hai ningún servidor configurado"
-
 #: setup/lib/messages.inc.php:214
 msgid "use GZip output buffering for increased speed in HTTP transfers"
 msgstr ""
@@ -8002,10 +8029,6 @@ msgstr ""
 msgid "GZip output buffering"
 msgstr "Búfer para a saída de GZip"
 
-#: setup/lib/messages.inc.php:216
-msgid "- none -"
-msgstr "- ningún -"
-
 #: setup/lib/messages.inc.php:217
 msgid ""
 "[kbd]SMART[/kbd] - i.e. descending order for fields of type TIME, DATE, "
@@ -8018,10 +8041,6 @@ msgstr ""
 msgid "Default sorting order"
 msgstr "Ordenación por omisión"
 
-#: setup/lib/messages.inc.php:219
-msgid "Overview"
-msgstr "Vista xeral"
-
 #: setup/lib/messages.inc.php:220
 msgid "Use persistent connections to MySQL databases"
 msgstr "Empregar conexións persistentes coas bases de datos MySQL"
@@ -8081,10 +8100,6 @@ msgstr ""
 msgid "Recoding engine"
 msgstr "Motor de recodificación"
 
-#: setup/lib/messages.inc.php:234
-msgid "Restore default value"
-msgstr "Volver ao valor por omisión"
-
 #: setup/lib/messages.inc.php:235
 msgid "Try to revert erroneous fields to their default values"
 msgstr "Tentar restaurar os campos erróneos aos seus valores por omisión"
@@ -8121,10 +8136,6 @@ msgstr "Debería empregar mysqli por razóns de desempeño"
 msgid "You allow for connecting to the server without a password."
 msgstr "Permite ligar co servidor sen contrasinal."
 
-#: setup/lib/messages.inc.php:241
-msgid "Add a new server"
-msgstr "Engadir un servidor novo"
-
 #: setup/lib/messages.inc.php:242
 msgid "Leave blank if not used"
 msgstr "Déixeo en branco se non o vai empregar"
@@ -8286,10 +8297,6 @@ msgstr ""
 "fiar se o IP pertence a un ISP ao que estean ligados miles de usuarios, como "
 "vostede."
 
-#: setup/lib/messages.inc.php:272
-msgid "Edit server"
-msgstr "Modificar o servidor"
-
 #: setup/lib/messages.inc.php:273
 msgid "What PHP extension to use; you should use mysqli if supported"
 msgstr ""
@@ -8572,11 +8579,6 @@ msgstr ""
 msgid "Verbose name of this server"
 msgstr "Nome longo deste servidor"
 
-#: setup/lib/messages.inc.php:328
-#, php-format
-msgid "Set value: %s"
-msgstr "Poñer como valor: %s"
-
 #: setup/lib/messages.inc.php:329
 msgid ""
 "Whether a user should be displayed a "show all (records)" button"
@@ -8619,10 +8621,6 @@ msgstr "Mostrar os campos de función no modo editar/inserir"
 msgid "Show function fields"
 msgstr "Mostrar os campos de función"
 
-#: setup/lib/messages.inc.php:337
-msgid "Show hidden messages (#MSG_COUNT)"
-msgstr "Mostrar as mensaxes acochadas (#MSG_COUNT)"
-
 #: setup/lib/messages.inc.php:338
 msgid ""
 "Shows link to [a at http://php.net/manual/function.phpinfo.php]phpinfo()[/a] "
@@ -8775,10 +8773,6 @@ msgstr ""
 msgid "Got invalid version string from server"
 msgstr "Recibiuse unha cadea de versión do servidor que non é válida"
 
-#: setup/lib/messages.inc.php:370
-msgid "Check for latest version"
-msgstr "Comprobar cal é a última versión"
-
 #: setup/lib/messages.inc.php:371
 #, php-format
 msgid ""
@@ -8819,10 +8813,6 @@ msgstr ""
 "Non se dispón do envoltorio URL ou de CURL. Non é posíbel comprobar a "
 "versión.."
 
-#: setup/lib/messages.inc.php:377
-msgid "Warning"
-msgstr "Advertencia"
-
 #: setup/lib/messages.inc.php:378
 msgid ""
 "Enable [a at http://en.wikipedia.org/wiki/ZIP_(file_format)]ZIP[/a] compression "
@@ -8892,6 +8882,19 @@ msgid "Description"
 msgstr "Descrición"
 
 #, fuzzy
+#~| msgid ""
+#~| "However on last run no data has been parsed, this usually means "
+#~| "phpMyAdmin won't be able to finish this import unless you increase php "
+#~| "time limits."
+#~ msgid ""
+#~ "However on last run no data has been parsed, this usually means "
+#~ "phpMyAdmin won"
+#~ msgstr ""
+#~ "Porén, na última executación non se examinou nada de datos, o que "
+#~ "normalmente significa que o phpMyAdmin non poderá rematar esta "
+#~ "importación a non ser que lle incrementen os limites de tempo de php."
+
+#, fuzzy
 #~| msgid "None"
 #~ msgctxt "None action"
 #~ msgid "None"
diff --git a/po/he.po b/po/he.po
index a1ade6c..30425e0 100644
--- a/po/he.po
+++ b/po/he.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-14 07:48-0400\n"
+"POT-Creation-Date: 2010-05-14 13:39-0400\n"
 "PO-Revision-Date: 2010-03-12 09:15+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: hebrew <he at li.org>\n"
@@ -935,10 +935,10 @@ msgid ""
 "file and import will resume."
 msgstr ""
 
-#: import.php:426
+#: import.php:426 libraries/messages.inc.php:1102
 msgid ""
 "However on last run no data has been parsed, this usually means phpMyAdmin "
-"won"
+"won't be able to finish this import unless you increase php time limits."
 msgstr ""
 
 #: index.php:190 libraries/messages.inc.php:549
@@ -6165,12 +6165,6 @@ msgstr ""
 msgid "Thread %s was successfully killed."
 msgstr ""
 
-#: libraries/messages.inc.php:1102
-msgid ""
-"However on last run no data has been parsed, this usually means phpMyAdmin "
-"won't be able to finish this import unless you increase php time limits."
-msgstr ""
-
 #: libraries/messages.inc.php:1105 pmd_pdf.php:94
 msgid "to/from page"
 msgstr ""
@@ -6601,7 +6595,8 @@ msgstr "ללא"
 msgid "Filter"
 msgstr ""
 
-#: navigation.php:319 setup/lib/messages.inc.php:42
+#: navigation.php:319 setup/frames/index.inc.php:218
+#: setup/lib/messages.inc.php:42
 #, fuzzy
 msgid "Clear"
 msgstr "לוח שנה"
@@ -6688,6 +6683,115 @@ msgstr "חיבורים"
 msgid "Configuration: %s"
 msgstr ""
 
+#: setup/frames/config.inc.php:25 setup/frames/index.inc.php:152
+#: setup/lib/messages.inc.php:45
+msgid "Configuration file"
+msgstr ""
+
+#: setup/frames/config.inc.php:38 setup/frames/index.inc.php:212
+#: setup/lib/messages.inc.php:65
+msgid "Download"
+msgstr ""
+
+#: setup/frames/index.inc.php:58 setup/lib/messages.inc.php:164
+msgid ""
+"You are not using a secure connection; all data (including potentially "
+"sensitive information, like passwords) is transferred unencrypted!"
+msgstr ""
+
+#: setup/frames/index.inc.php:87 setup/frames/menu.inc.php:17
+#: setup/lib/messages.inc.php:219
+msgid "Overview"
+msgstr ""
+
+#: setup/frames/index.inc.php:95 setup/lib/messages.inc.php:337
+msgid "Show hidden messages (#MSG_COUNT)"
+msgstr ""
+
+#: setup/frames/index.inc.php:135 setup/lib/messages.inc.php:213
+msgid "There are no configured servers"
+msgstr ""
+
+#: setup/frames/index.inc.php:143 setup/lib/messages.inc.php:212
+msgid "New server"
+msgstr ""
+
+#: setup/frames/index.inc.php:172 setup/lib/messages.inc.php:50
+msgid "Default language"
+msgstr ""
+
+#: setup/frames/index.inc.php:182 setup/lib/messages.inc.php:187
+msgid "let the user choose"
+msgstr ""
+
+#: setup/frames/index.inc.php:193 setup/lib/messages.inc.php:216
+msgid "- none -"
+msgstr ""
+
+#: setup/frames/index.inc.php:196 setup/lib/messages.inc.php:51
+msgid "Default server"
+msgstr ""
+
+#: setup/frames/index.inc.php:206 setup/lib/messages.inc.php:66
+msgid "End of line"
+msgstr ""
+
+#: setup/frames/index.inc.php:211 setup/lib/messages.inc.php:61
+msgid "Display"
+msgstr ""
+
+#: setup/frames/index.inc.php:215 setup/lib/messages.inc.php:190
+#, fuzzy
+msgid "Load"
+msgstr "מקומי"
+
+#: setup/frames/index.inc.php:226 setup/lib/messages.inc.php:152
+#, fuzzy
+msgid "phpMyAdmin homepage"
+msgstr "תיעוד phpMyAdmin"
+
+#: setup/frames/index.inc.php:227 setup/lib/messages.inc.php:64
+msgid "Donate"
+msgstr ""
+
+#: setup/frames/index.inc.php:228 setup/lib/messages.inc.php:370
+msgid "Check for latest version"
+msgstr ""
+
+#: setup/frames/menu.inc.php:18 setup/lib/messages.inc.php:137
+msgid "Features"
+msgstr ""
+
+#: setup/frames/menu.inc.php:19 setup/lib/messages.inc.php:113
+msgid "Navigation frame"
+msgstr ""
+
+#: setup/frames/menu.inc.php:20 setup/lib/messages.inc.php:118
+msgid "Main frame"
+msgstr ""
+
+#: setup/frames/servers.inc.php:28 setup/lib/messages.inc.php:272
+msgid "Edit server"
+msgstr ""
+
+#: setup/frames/servers.inc.php:37 setup/lib/messages.inc.php:241
+#, fuzzy
+msgid "Add a new server"
+msgstr "הוספת משתמש חדש"
+
+#: setup/lib/FormDisplay.tpl.php:182 setup/lib/messages.inc.php:328
+#, php-format
+msgid "Set value: %s"
+msgstr ""
+
+#: setup/lib/FormDisplay.tpl.php:187 setup/lib/messages.inc.php:234
+msgid "Restore default value"
+msgstr ""
+
+#: setup/lib/form_processing.lib.php:43 setup/lib/messages.inc.php:377
+msgid "Warning"
+msgstr ""
+
 #: setup/lib/messages.inc.php:16
 msgid "Allow character set conversion"
 msgstr ""
@@ -6827,10 +6931,6 @@ msgstr ""
 msgid "Compress on the fly"
 msgstr ""
 
-#: setup/lib/messages.inc.php:45
-msgid "Configuration file"
-msgstr ""
-
 #: setup/lib/messages.inc.php:46
 msgid ""
 "Whether a warning ("Are your really sure...") should be displayed "
@@ -6849,14 +6949,6 @@ msgstr ""
 msgid "Default character set"
 msgstr ""
 
-#: setup/lib/messages.inc.php:50
-msgid "Default language"
-msgstr ""
-
-#: setup/lib/messages.inc.php:51
-msgid "Default server"
-msgstr ""
-
 #: setup/lib/messages.inc.php:52
 msgid "Tab that is displayed when entering a database"
 msgstr ""
@@ -6896,10 +6988,6 @@ msgstr ""
 msgid "Display databases as a list"
 msgstr ""
 
-#: setup/lib/messages.inc.php:61
-msgid "Display"
-msgstr ""
-
 #: setup/lib/messages.inc.php:62
 msgid "Show server listing as a list instead of a drop down"
 msgstr ""
@@ -6908,18 +6996,6 @@ msgstr ""
 msgid "Display servers as a list"
 msgstr ""
 
-#: setup/lib/messages.inc.php:64
-msgid "Donate"
-msgstr ""
-
-#: setup/lib/messages.inc.php:65
-msgid "Download"
-msgstr ""
-
-#: setup/lib/messages.inc.php:66
-msgid "End of line"
-msgstr ""
-
 #: setup/lib/messages.inc.php:67
 msgid "Could not connect to MySQL server"
 msgstr ""
@@ -7099,10 +7175,6 @@ msgstr "אפשרויות ייצוא מאגר נתונים"
 msgid "Customize appearance of the navigation frame"
 msgstr ""
 
-#: setup/lib/messages.inc.php:113
-msgid "Navigation frame"
-msgstr ""
-
 #: setup/lib/messages.inc.php:114
 msgid "Servers display options"
 msgstr ""
@@ -7111,10 +7183,6 @@ msgstr ""
 msgid "Tables display options"
 msgstr ""
 
-#: setup/lib/messages.inc.php:118
-msgid "Main frame"
-msgstr ""
-
 #: setup/lib/messages.inc.php:119
 msgid "Settings that didn't fit enywhere else"
 msgstr ""
@@ -7192,10 +7260,6 @@ msgstr ""
 msgid "Customize export options"
 msgstr "אפשרויות ייצוא מאגר נתונים"
 
-#: setup/lib/messages.inc.php:137
-msgid "Features"
-msgstr ""
-
 #: setup/lib/messages.inc.php:138
 msgid "Customize import defaults"
 msgstr ""
@@ -7264,11 +7328,6 @@ msgid ""
 "system."
 msgstr ""
 
-#: setup/lib/messages.inc.php:152
-#, fuzzy
-msgid "phpMyAdmin homepage"
-msgstr "תיעוד phpMyAdmin"
-
 #: setup/lib/messages.inc.php:153
 msgid "Extra parameters for iconv"
 msgstr ""
@@ -7312,12 +7371,6 @@ msgstr ""
 msgid "Insecure connection"
 msgstr ""
 
-#: setup/lib/messages.inc.php:164
-msgid ""
-"You are not using a secure connection; all data (including potentially "
-"sensitive information, like passwords) is transferred unencrypted!"
-msgstr ""
-
 #: setup/lib/messages.inc.php:165
 #, php-format
 msgid ""
@@ -7413,10 +7466,6 @@ msgstr ""
 msgid "Enable highlighting"
 msgstr ""
 
-#: setup/lib/messages.inc.php:187
-msgid "let the user choose"
-msgstr ""
-
 #: setup/lib/messages.inc.php:188
 msgid "Use less graphically intense tabs"
 msgstr ""
@@ -7425,11 +7474,6 @@ msgstr ""
 msgid "Light tabs"
 msgstr ""
 
-#: setup/lib/messages.inc.php:190
-#, fuzzy
-msgid "Load"
-msgstr "מקומי"
-
 #: setup/lib/messages.inc.php:191
 msgid ""
 "If TRUE, logout deletes cookies for all servers; when set to FALSE, logout "
@@ -7532,14 +7576,6 @@ msgstr ""
 msgid "Iconic navigation bar"
 msgstr ""
 
-#: setup/lib/messages.inc.php:212
-msgid "New server"
-msgstr ""
-
-#: setup/lib/messages.inc.php:213
-msgid "There are no configured servers"
-msgstr ""
-
 #: setup/lib/messages.inc.php:214
 msgid "use GZip output buffering for increased speed in HTTP transfers"
 msgstr ""
@@ -7548,10 +7584,6 @@ msgstr ""
 msgid "GZip output buffering"
 msgstr ""
 
-#: setup/lib/messages.inc.php:216
-msgid "- none -"
-msgstr ""
-
 #: setup/lib/messages.inc.php:217
 msgid ""
 "[kbd]SMART[/kbd] - i.e. descending order for fields of type TIME, DATE, "
@@ -7562,10 +7594,6 @@ msgstr ""
 msgid "Default sorting order"
 msgstr ""
 
-#: setup/lib/messages.inc.php:219
-msgid "Overview"
-msgstr ""
-
 #: setup/lib/messages.inc.php:220
 msgid "Use persistent connections to MySQL databases"
 msgstr ""
@@ -7620,10 +7648,6 @@ msgstr ""
 msgid "Recoding engine"
 msgstr ""
 
-#: setup/lib/messages.inc.php:234
-msgid "Restore default value"
-msgstr ""
-
 #: setup/lib/messages.inc.php:235
 msgid "Try to revert erroneous fields to their default values"
 msgstr ""
@@ -7655,11 +7679,6 @@ msgstr ""
 msgid "You allow for connecting to the server without a password."
 msgstr ""
 
-#: setup/lib/messages.inc.php:241
-#, fuzzy
-msgid "Add a new server"
-msgstr "הוספת משתמש חדש"
-
 #: setup/lib/messages.inc.php:242
 msgid "Leave blank if not used"
 msgstr ""
@@ -7803,10 +7822,6 @@ msgid ""
 "to."
 msgstr ""
 
-#: setup/lib/messages.inc.php:272
-msgid "Edit server"
-msgstr ""
-
 #: setup/lib/messages.inc.php:273
 msgid "What PHP extension to use; you should use mysqli if supported"
 msgstr ""
@@ -8056,11 +8071,6 @@ msgstr ""
 msgid "Verbose name of this server"
 msgstr ""
 
-#: setup/lib/messages.inc.php:328
-#, php-format
-msgid "Set value: %s"
-msgstr ""
-
 #: setup/lib/messages.inc.php:329
 msgid ""
 "Whether a user should be displayed a "show all (records)" button"
@@ -8098,10 +8108,6 @@ msgstr ""
 msgid "Show function fields"
 msgstr ""
 
-#: setup/lib/messages.inc.php:337
-msgid "Show hidden messages (#MSG_COUNT)"
-msgstr ""
-
 #: setup/lib/messages.inc.php:338
 msgid ""
 "Shows link to [a at http://php.net/manual/function.phpinfo.php]phpinfo()[/a] "
@@ -8233,10 +8239,6 @@ msgstr ""
 msgid "Got invalid version string from server"
 msgstr ""
 
-#: setup/lib/messages.inc.php:370
-msgid "Check for latest version"
-msgstr ""
-
 #: setup/lib/messages.inc.php:371
 #, php-format
 msgid ""
@@ -8268,10 +8270,6 @@ msgid ""
 "Neither URL wrapper nor CURL is available. Version check is not possible."
 msgstr ""
 
-#: setup/lib/messages.inc.php:377
-msgid "Warning"
-msgstr ""
-
 #: setup/lib/messages.inc.php:378
 msgid ""
 "Enable [a at http://en.wikipedia.org/wiki/ZIP_(file_format)]ZIP[/a] compression "
diff --git a/po/hi.po b/po/hi.po
index 780e4a7..46c7215 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-14 07:48-0400\n"
+"POT-Creation-Date: 2010-05-14 13:39-0400\n"
 "PO-Revision-Date: 2010-05-14 08:22+0200\n"
 "Last-Translator:  <u4663530 at anu.edu.au>\n"
 "Language-Team: hindi <hi at li.org>\n"
@@ -928,10 +928,10 @@ msgid ""
 "file and import will resume."
 msgstr ""
 
-#: import.php:426
+#: import.php:426 libraries/messages.inc.php:1102
 msgid ""
 "However on last run no data has been parsed, this usually means phpMyAdmin "
-"won"
+"won't be able to finish this import unless you increase php time limits."
 msgstr ""
 
 #: index.php:190 libraries/messages.inc.php:549
@@ -6060,12 +6060,6 @@ msgstr ""
 msgid "Thread %s was successfully killed."
 msgstr "Thread %s को सफलता से मारा गया।"
 
-#: libraries/messages.inc.php:1102
-msgid ""
-"However on last run no data has been parsed, this usually means phpMyAdmin "
-"won't be able to finish this import unless you increase php time limits."
-msgstr ""
-
 #: libraries/messages.inc.php:1105 pmd_pdf.php:94
 msgid "to/from page"
 msgstr ""
@@ -6491,7 +6485,8 @@ msgstr "नहीं"
 msgid "Filter"
 msgstr ""
 
-#: navigation.php:319 setup/lib/messages.inc.php:42
+#: navigation.php:319 setup/frames/index.inc.php:218
+#: setup/lib/messages.inc.php:42
 msgid "Clear"
 msgstr ""
 
@@ -6575,6 +6570,112 @@ msgstr ""
 msgid "Configuration: %s"
 msgstr ""
 
+#: setup/frames/config.inc.php:25 setup/frames/index.inc.php:152
+#: setup/lib/messages.inc.php:45
+msgid "Configuration file"
+msgstr ""
+
+#: setup/frames/config.inc.php:38 setup/frames/index.inc.php:212
+#: setup/lib/messages.inc.php:65
+msgid "Download"
+msgstr ""
+
+#: setup/frames/index.inc.php:58 setup/lib/messages.inc.php:164
+msgid ""
+"You are not using a secure connection; all data (including potentially "
+"sensitive information, like passwords) is transferred unencrypted!"
+msgstr ""
+
+#: setup/frames/index.inc.php:87 setup/frames/menu.inc.php:17
+#: setup/lib/messages.inc.php:219
+msgid "Overview"
+msgstr ""
+
+#: setup/frames/index.inc.php:95 setup/lib/messages.inc.php:337
+msgid "Show hidden messages (#MSG_COUNT)"
+msgstr ""
+
+#: setup/frames/index.inc.php:135 setup/lib/messages.inc.php:213
+msgid "There are no configured servers"
+msgstr ""
+
+#: setup/frames/index.inc.php:143 setup/lib/messages.inc.php:212
+msgid "New server"
+msgstr ""
+
+#: setup/frames/index.inc.php:172 setup/lib/messages.inc.php:50
+msgid "Default language"
+msgstr ""
+
+#: setup/frames/index.inc.php:182 setup/lib/messages.inc.php:187
+msgid "let the user choose"
+msgstr ""
+
+#: setup/frames/index.inc.php:193 setup/lib/messages.inc.php:216
+msgid "- none -"
+msgstr ""
+
+#: setup/frames/index.inc.php:196 setup/lib/messages.inc.php:51
+msgid "Default server"
+msgstr ""
+
+#: setup/frames/index.inc.php:206 setup/lib/messages.inc.php:66
+msgid "End of line"
+msgstr ""
+
+#: setup/frames/index.inc.php:211 setup/lib/messages.inc.php:61
+msgid "Display"
+msgstr ""
+
+#: setup/frames/index.inc.php:215 setup/lib/messages.inc.php:190
+msgid "Load"
+msgstr ""
+
+#: setup/frames/index.inc.php:226 setup/lib/messages.inc.php:152
+msgid "phpMyAdmin homepage"
+msgstr ""
+
+#: setup/frames/index.inc.php:227 setup/lib/messages.inc.php:64
+msgid "Donate"
+msgstr ""
+
+#: setup/frames/index.inc.php:228 setup/lib/messages.inc.php:370
+msgid "Check for latest version"
+msgstr ""
+
+#: setup/frames/menu.inc.php:18 setup/lib/messages.inc.php:137
+msgid "Features"
+msgstr ""
+
+#: setup/frames/menu.inc.php:19 setup/lib/messages.inc.php:113
+msgid "Navigation frame"
+msgstr ""
+
+#: setup/frames/menu.inc.php:20 setup/lib/messages.inc.php:118
+msgid "Main frame"
+msgstr ""
+
+#: setup/frames/servers.inc.php:28 setup/lib/messages.inc.php:272
+msgid "Edit server"
+msgstr ""
+
+#: setup/frames/servers.inc.php:37 setup/lib/messages.inc.php:241
+msgid "Add a new server"
+msgstr ""
+
+#: setup/lib/FormDisplay.tpl.php:182 setup/lib/messages.inc.php:328
+#, php-format
+msgid "Set value: %s"
+msgstr ""
+
+#: setup/lib/FormDisplay.tpl.php:187 setup/lib/messages.inc.php:234
+msgid "Restore default value"
+msgstr ""
+
+#: setup/lib/form_processing.lib.php:43 setup/lib/messages.inc.php:377
+msgid "Warning"
+msgstr ""
+
 #: setup/lib/messages.inc.php:16
 msgid "Allow character set conversion"
 msgstr ""
@@ -6713,10 +6814,6 @@ msgstr ""
 msgid "Compress on the fly"
 msgstr ""
 
-#: setup/lib/messages.inc.php:45
-msgid "Configuration file"
-msgstr ""
-
 #: setup/lib/messages.inc.php:46
 msgid ""
 "Whether a warning ("Are your really sure...") should be displayed "
@@ -6735,14 +6832,6 @@ msgstr ""
 msgid "Default character set"
 msgstr ""
 
-#: setup/lib/messages.inc.php:50
-msgid "Default language"
-msgstr ""
-
-#: setup/lib/messages.inc.php:51
-msgid "Default server"
-msgstr ""
-
 #: setup/lib/messages.inc.php:52
 msgid "Tab that is displayed when entering a database"
 msgstr ""
@@ -6781,10 +6870,6 @@ msgstr ""
 msgid "Display databases as a list"
 msgstr ""
 
-#: setup/lib/messages.inc.php:61
-msgid "Display"
-msgstr ""
-
 #: setup/lib/messages.inc.php:62
 msgid "Show server listing as a list instead of a drop down"
 msgstr ""
@@ -6793,18 +6878,6 @@ msgstr ""
 msgid "Display servers as a list"
 msgstr ""
 
-#: setup/lib/messages.inc.php:64
-msgid "Donate"
-msgstr ""
-
-#: setup/lib/messages.inc.php:65
-msgid "Download"
-msgstr ""
-
-#: setup/lib/messages.inc.php:66
-msgid "End of line"
-msgstr ""
-
 #: setup/lib/messages.inc.php:67
 msgid "Could not connect to MySQL server"
 msgstr ""
@@ -6977,10 +7050,6 @@ msgstr ""
 msgid "Customize appearance of the navigation frame"
 msgstr ""
 
-#: setup/lib/messages.inc.php:113
-msgid "Navigation frame"
-msgstr ""
-
 #: setup/lib/messages.inc.php:114
 msgid "Servers display options"
 msgstr ""
@@ -6989,10 +7058,6 @@ msgstr ""
 msgid "Tables display options"
 msgstr ""
 
-#: setup/lib/messages.inc.php:118
-msgid "Main frame"
-msgstr ""
-
 #: setup/lib/messages.inc.php:119
 msgid "Settings that didn't fit enywhere else"
 msgstr ""
@@ -7068,10 +7133,6 @@ msgstr ""
 msgid "Customize export options"
 msgstr ""
 
-#: setup/lib/messages.inc.php:137
-msgid "Features"
-msgstr ""
-
 #: setup/lib/messages.inc.php:138
 msgid "Customize import defaults"
 msgstr ""
@@ -7136,10 +7197,6 @@ msgid ""
 "system."
 msgstr ""
 
-#: setup/lib/messages.inc.php:152
-msgid "phpMyAdmin homepage"
-msgstr ""
-
 #: setup/lib/messages.inc.php:153
 msgid "Extra parameters for iconv"
 msgstr ""
@@ -7183,12 +7240,6 @@ msgstr ""
 msgid "Insecure connection"
 msgstr ""
 
-#: setup/lib/messages.inc.php:164
-msgid ""
-"You are not using a secure connection; all data (including potentially "
-"sensitive information, like passwords) is transferred unencrypted!"
-msgstr ""
-
 #: setup/lib/messages.inc.php:165
 #, php-format
 msgid ""
@@ -7284,10 +7335,6 @@ msgstr ""
 msgid "Enable highlighting"
 msgstr ""
 
-#: setup/lib/messages.inc.php:187
-msgid "let the user choose"
-msgstr ""
-
 #: setup/lib/messages.inc.php:188
 msgid "Use less graphically intense tabs"
 msgstr ""
@@ -7296,10 +7343,6 @@ msgstr ""
 msgid "Light tabs"
 msgstr ""
 
-#: setup/lib/messages.inc.php:190
-msgid "Load"
-msgstr ""
-
 #: setup/lib/messages.inc.php:191
 msgid ""
 "If TRUE, logout deletes cookies for all servers; when set to FALSE, logout "
@@ -7401,14 +7444,6 @@ msgstr ""
 msgid "Iconic navigation bar"
 msgstr ""
 
-#: setup/lib/messages.inc.php:212
-msgid "New server"
-msgstr ""
-
-#: setup/lib/messages.inc.php:213
-msgid "There are no configured servers"
-msgstr ""
-
 #: setup/lib/messages.inc.php:214
 msgid "use GZip output buffering for increased speed in HTTP transfers"
 msgstr ""
@@ -7417,10 +7452,6 @@ msgstr ""
 msgid "GZip output buffering"
 msgstr ""
 
-#: setup/lib/messages.inc.php:216
-msgid "- none -"
-msgstr ""
-
 #: setup/lib/messages.inc.php:217
 msgid ""
 "[kbd]SMART[/kbd] - i.e. descending order for fields of type TIME, DATE, "
@@ -7431,10 +7462,6 @@ msgstr ""
 msgid "Default sorting order"
 msgstr ""
 
-#: setup/lib/messages.inc.php:219
-msgid "Overview"
-msgstr ""
-
 #: setup/lib/messages.inc.php:220
 msgid "Use persistent connections to MySQL databases"
 msgstr ""
@@ -7489,10 +7516,6 @@ msgstr ""
 msgid "Recoding engine"
 msgstr ""
 
-#: setup/lib/messages.inc.php:234
-msgid "Restore default value"
-msgstr ""
-
 #: setup/lib/messages.inc.php:235
 msgid "Try to revert erroneous fields to their default values"
 msgstr ""
@@ -7523,10 +7546,6 @@ msgstr ""
 msgid "You allow for connecting to the server without a password."
 msgstr ""
 
-#: setup/lib/messages.inc.php:241
-msgid "Add a new server"
-msgstr ""
-
 #: setup/lib/messages.inc.php:242
 msgid "Leave blan
k if not used"
 msgstr ""
@@ -7667,10 +7686,6 @@ msgid ""
 "to."
 msgstr ""
 
-#: setup/lib/messages.inc.php:272
-msgid "Edit server"
-msgstr ""
-
 #: setup/lib/messages.inc.php:273
 msgid "What PHP extension to use; you should use mysqli if supported"
 msgstr ""
@@ -7912,11 +7927,6 @@ msgstr ""
 msgid "Verbose name of this server"
 msgstr ""
 
-#: setup/lib/messages.inc.php:328
-#, php-format
-msgid "Set value: %s"
-msgstr ""
-
 #: setup/lib/messages.inc.php:329
 msgid ""
 "Whether a user should be displayed a "show all (records)" button"
@@ -7953,10 +7963,6 @@ msgstr ""
 msgid "Show function fields"
 msgstr ""
 
-#: setup/lib/messages.inc.php:337
-msgid "Show hidden messages (#MSG_COUNT)"
-msgstr ""
-
 #: setup/lib/messages.inc.php:338
 msgid ""
 "Shows link to [a at http://php.net/manual/function.phpinfo.php]phpinfo()[/a] "
@@ -8085,10 +8091,6 @@ msgstr ""
 msgid "Got invalid version string from server"
 msgstr ""
 
-#: setup/lib/messages.inc.php:370
-msgid "Check for latest version"
-msgstr ""
-
 #: setup/lib/messages.inc.php:371
 #, php-format
 msgid ""
@@ -8120,10 +8122,6 @@ msgid ""
 "Neither URL wrapper nor CURL is available. Version check is not possible."
 msgstr ""
 
-#: setup/lib/messages.inc.php:377
-msgid "Warning"
-msgstr ""
-
 #: setup/lib/messages.inc.php:378
 msgid ""
 "Enable [a at http://en.wikipedia.org/wiki/ZIP_(file_format)]ZIP[/a] compression "
diff --git a/po/hr.po b/po/hr.po
index 199d67b..cbb2805 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-14 07:48-0400\n"
+"POT-Creation-Date: 2010-05-14 13:39-0400\n"
 "PO-Revision-Date: 2010-03-12 09:13+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: croatian <hr at li.org>\n"
@@ -955,15 +955,10 @@ msgstr ""
 "Vrijeme za skriptu je isteklo. Ako želite završiti uvoz, ponovo podnesite "
 "istu datoteku i uvoz će nastaviti."
 
-#: import.php:426
-#, fuzzy
-#| msgid ""
-#| "However on last run no data has been parsed, this usually means "
-#| "phpMyAdmin won't be able to finish this import unless you increase php "
-#| "time limits."
+#: import.php:426 libraries/messages.inc.php:1102
 msgid ""
 "However on last run no data has been parsed, this usually means phpMyAdmin "
-"won"
+"won't be able to finish this import unless you increase php time limits."
 msgstr ""
 "Ipak, pri posljednjem prijelazu nikakvi podaci nisu bili raščlanjeni. To "
 "znači da phpMyAdmin neće biti u mogućnosti završiti ovaj uvoz sve dok ne "
@@ -6424,15 +6419,6 @@ msgstr "Grane"
 msgid "Thread %s was successfully killed."
 msgstr "Grana %s uspješno je prekinuta."
 
-#: libraries/messages.inc.php:1102
-msgid ""
-"However on last run no data has been parsed, this usually means phpMyAdmin "
-"won't be able to finish this import unless you increase php time limits."
-msgstr ""
-"Ipak, pri posljednjem prijelazu nikakvi podaci nisu bili raščlanjeni. To "
-"znači da phpMyAdmin neće biti u mogućnosti završiti ovaj uvoz sve dok ne "
-"povećate vremenska ograničenja unutar php."
-
 #: libraries/messages.inc.php:1105 pmd_pdf.php:94
 msgid "to/from page"
 msgstr "stranica od / prema"
@@ -6910,7 +6896,8 @@ msgstr "bez kompresije"
 msgid "Filter"
 msgstr "Datoteke"
 
-#: navigation.php:319 setup/lib/messages.inc.php:42
+#: navigation.php:319 setup/frames/index.inc.php:218
+#: setup/lib/messages.inc.php:42
 #, fuzzy
 msgid "Clear"
 msgstr "Kalendar"
@@ -7001,6 +6988,118 @@ msgstr "najv. uzastopnih veza"
 msgid "Configuration: %s"
 msgstr ""
 
+#: setup/frames/config.inc.php:25 setup/frames/index.inc.php:152
+#: setup/lib/messages.inc.php:45
+msgid "Configuration file"
+msgstr ""
+
+#: setup/frames/config.inc.php:38 setup/frames/index.inc.php:212
+#: setup/lib/messages.inc.php:65
+msgid "Download"
+msgstr ""
+
+#: setup/frames/index.inc.php:58 setup/lib/messages.inc.php:164
+msgid ""
+"You are not using a secure connection; all data (including potentially "
+"sensitive information, like passwords) is transferred unencrypted!"
+msgstr ""
+
+#: setup/frames/index.inc.php:87 setup/frames/menu.inc.php:17
+#: setup/lib/messages.inc.php:219
+msgid "Overview"
+msgstr ""
+
+#: setup/frames/index.inc.php:95 setup/lib/messages.inc.php:337
+msgid "Show hidden messages (#MSG_COUNT)"
+msgstr ""
+
+#: setup/frames/index.inc.php:135 setup/lib/messages.inc.php:213
+msgid "There are no configured servers"
+msgstr ""
+
+#: setup/frames/index.inc.php:143 setup/lib/messages.inc.php:212
+#, fuzzy
+msgid "New server"
+msgstr "Web poslužitelj"
+
+#: setup/frames/index.inc.php:172 setup/lib/messages.inc.php:50
+msgid "Default language"
+msgstr ""
+
+#: setup/frames/index.inc.php:182 setup/lib/messages.inc.php:187
+msgid "let the user choose"
+msgstr ""
+
+#: setup/frames/index.inc.php:193 setup/lib/messages.inc.php:216
+msgid "- none -"
+msgstr ""
+
+#: setup/frames/index.inc.php:196 setup/lib/messages.inc.php:51
+msgid "Default server"
+msgstr ""
+
+#: setup/frames/index.inc.php:206 setup/lib/messages.inc.php:66
+msgid "End of line"
+msgstr ""
+
+#: setup/frames/index.inc.php:211 setup/lib/messages.inc.php:61
+msgid "Display"
+msgstr ""
+
+#: setup/frames/index.inc.php:215 setup/lib/messages.inc.php:190
+#, fuzzy
+msgid "Load"
+msgstr "Lokalno"
+
+#: setup/frames/index.inc.php:226 setup/lib/messages.inc.php:152
+#, fuzzy
+msgid "phpMyAdmin homepage"
+msgstr "phpMyAdmin dokumentacija"
+
+#: setup/frames/index.inc.php:227 setup/lib/messages.inc.php:64
+#, fuzzy
+msgid "Donate"
+msgstr "Podaci"
+
+#: setup/frames/index.inc.php:228 setup/lib/messages.inc.php:370
+msgid "Check for latest version"
+msgstr ""
+
+#: setup/frames/menu.inc.php:18 setup/lib/messages.inc.php:137
+msgid "Features"
+msgstr ""
+
+#: setup/frames/menu.inc.php:19 setup/lib/messages.inc.php:113
+msgid "Navigation frame"
+msgstr ""
+
+#: setup/frames/menu.inc.php:20 setup/lib/messages.inc.php:118
+msgid "Main frame"
+msgstr ""
+
+#: setup/frames/servers.inc.php:28 setup/lib/messages.inc.php:272
+#, fuzzy
+msgid "Edit server"
+msgstr "Web poslužitelj"
+
+#: setup/frames/servers.inc.php:37 setup/lib/messages.inc.php:241
+#, fuzzy
+msgid "Add a new server"
+msgstr "Dodaj novog korisnika"
+
+#: setup/lib/FormDisplay.tpl.php:182 setup/lib/messages.inc.php:328
+#, php-format
+msgid "Set value: %s"
+msgstr ""
+
+#: setup/lib/FormDisplay.tpl.php:187 setup/lib/messages.inc.php:234
+msgid "Restore default value"
+msgstr ""
+
+#: setup/lib/form_processing.lib.php:43 setup/lib/messages.inc.php:377
+msgid "Warning"
+msgstr ""
+
 #: setup/lib/messages.inc.php:16
 msgid "Allow character set conversion"
 msgstr ""
@@ -7140,10 +7239,6 @@ msgstr ""
 msgid "Compress on the fly"
 msgstr ""
 
-#: setup/lib/messages.inc.php:45
-msgid "Configuration file"
-msgstr ""
-
 #: setup/lib/messages.inc.php:46
 msgid ""
 "Whether a warning ("Are your really sure...") should be displayed "
@@ -7162,14 +7257,6 @@ msgstr ""
 msgid "Default character set"
 msgstr ""
 
-#: setup/lib/messages.inc.php:50
-msgid "Default language"
-msgstr ""
-
-#: setup/lib/messages.inc.php:51
-msgid "Default server"
-msgstr ""
-
 #: setup/lib/messages.inc.php:52
 msgid "Tab that is displayed when entering a database"
 msgstr ""
@@ -7211,10 +7298,6 @@ msgstr ""
 msgid "Display databases as a list"
 msgstr ""
 
-#: setup/lib/messages.inc.php:61
-msgid "Display"
-msgstr ""
-
 #: setup/lib/messages.inc.php:62
 msgid "Show server listing as a list instead of a drop down"
 msgstr ""
@@ -7223,19 +7306,6 @@ msgstr ""
 msgid "Display servers as a list"
 msgstr ""
 
-#: setup/lib/messages.inc.php:64
-#, fuzzy
-msgid "Donate"
-msgstr "Podaci"
-
-#: setup/lib/messages.inc.php:65
-msgid "Download"
-msgstr ""
-
-#: setup/lib/messages.inc.php:66
-msgid "End of line"
-msgstr ""
-
 #: setup/lib/messages.inc.php:67
 msgid "Could not connect to MySQL server"
 msgstr ""
@@ -7417,10 +7487,6 @@ msgstr "Opcije izvoza baze podataka"
 msgid "Customize appearance of the navigation frame"
 msgstr ""
 
-#: setup/lib/messages.inc.php:113
-msgid "Navigation frame"
-msgstr ""
-
 #: setup/lib/messages.inc.php:114
 #, fuzzy
 msgid "Servers display options"
@@ -7431,10 +7497,6 @@ msgstr "Opcije izvoza baze podataka"
 msgid "Tables display options"
 msgstr "Opcije izvoza baze podataka"
 
-#: setup/lib/messages.inc.php:118
-msgid "Main frame"
-msgstr ""
-
 #: setup/lib/messages.inc.php:119
 msgid "Settings that didn't fit enywhere else"
 msgstr ""
@@ -7513,10 +7575,6 @@ msgstr ""
 msgid "Customize export options"
 msgstr "Opcije izvoza baze podataka"
 
-#: setup/lib/messages.inc.php:137
-msgid "Features"
-msgstr ""
-
 #: setup/lib/messages.inc.php:138
 #, fuzzy
 msgid "Customize import defaults"
@@ -7586,11 +7644,6 @@ msgid ""
 "system."
 msgstr ""
 
-#: setup/lib/messages.inc.php:152
-#, fuzzy
-msgid "phpMyAdmin homepage"
-msgstr "phpMyAdmin dokumentacija"
-
 #: setup/lib/messages.inc.php:153
 msgid "Extra parameters for iconv"
 msgstr ""
@@ -7638,12 +7691,6 @@ msgstr ""
 msgid "Insecure connection"
 msgstr ""
 
-#: setup/lib/messages.inc.php:164
-msgid ""
-"You are not using a secure connection; all data (including potentially "
-"sensitive information, like passwords) is transferred unencrypted!"
-msgstr ""
-
 #: setup/lib/messages.inc.php:165
 #, php-format
 msgid ""
@@ -7742,10 +7789,6 @@ msgstr ""
 msgid "Enable highlighting"
 msgstr ""
 
-#: setup/lib/messages.inc.php:187
-msgid "let the user choose"
-msgstr ""
-
 #: setup/lib/messages.inc.php:188
 msgid "Use less graphically intense tabs"
 msgstr ""
@@ -7754,11 +7797,6 @@ msgstr ""
 msgid "Light tabs"
 msgstr ""
 
-#: setup/lib/messages.inc.php:190
-#, fuzzy
-msgid "Load"
-msgstr "Lokalno"
-
 #: setup/lib/messages.inc.php:191
 msgid ""
 "If TRUE, logout deletes cookies for all servers; when set to FALSE, logout "
@@ -7862,15 +7900,6 @@ msgstr ""
 msgid "Iconic navigation bar"
 msgstr ""
 
-#: setup/lib/messages.inc.php:212
-#, fuzzy
-msgid "New server"
-msgstr "Web poslužitelj"
-
-#: setup/lib/messages.inc.php:213
-msgid "There are no configured servers"
-msgstr ""
-
 #: setup/lib/messages.inc.php:214
 msgid "use GZip output buffering for increased speed in HTTP transfers"
 msgstr ""
@@ -7879,10 +7908,6 @@ msgstr ""
 msgid "GZip output buffering"
 msgstr ""
 
-#: setup/lib/messages.inc.php:216
-msgid "- none -"
-msgstr ""
-
 #: setup/lib/messages.inc.php:217
 msgid ""
 "[kbd]SMART[/kbd] - i.e. descending order for fields of type TIME, DATE, "
@@ -7893,10 +7918,6 @@ msgstr ""
 msgid "Default sorting order"
 msgstr ""
 
-#: setup/lib/messages.inc.php:219
-msgid "Overview"
-msgstr ""
-
 #: setup/lib/messages.inc.php:220
 msgid "Use persistent connections to MySQL databases"
 msgstr ""
@@ -7951,10 +7972,6 @@ msgstr ""
 msgid "Recoding engine"
 msgstr ""
 
-#: setup/lib/messages.inc.php:234
-msgid "Restore default value"
-msgstr ""
-
 #: setup/lib/messages.inc.php:235
 msgid "Try to revert erroneous fields to their default values"
 msgstr ""
@@ -7986,11 +8003,6 @@ msgstr ""
 msgid "You allow for connecting to the server without a password."
 msgstr ""
 
-#: setup/lib/messages.inc.php:241
-#, fuzzy
-msgid "Add a new server"
-msgstr "Dodaj novog korisnika"
-
 #: setup/lib/messages.inc.php:242
 msgid "Leave blank if not used"
 msgstr ""
@@ -8134,11 +8146,6 @@ msgid ""
 "to."
 msgstr ""
 
-#: setup/lib/messages.inc.php:272
-#, fuzzy
-msgid "Edit server"
-msgstr "Web poslužitelj"
-
 #: setup/lib/messages.inc.php:273
 msgid "What PHP extension to use; you should use mysqli if supported"
 msgstr ""
@@ -8390,11 +8397,6 @@ msgstr ""
 msgid "Verbose name of this server"
 msgstr ""
 
-#: setup/lib/messages.inc.php:328
-#, php-format
-msgid "Set value: %s"
-msgstr ""
-
 #: setup/lib/messages.inc.php:329
 msgid ""
 "Whether a user should be displayed a "show all (records)" button"
@@ -8432,10 +8434,6 @@ msgstr ""
 msgid "Show function fields"
 msgstr ""
 
-#: setup/lib/messages.inc.php:337
-msgid "Show hidden messages (#MSG_COUNT)"
-msgstr ""
-
 #: setup/lib/messages.inc.php:338
 msgid ""
 "Shows link to [a at http://php.net/manual/function.phpinfo.php]phpinfo()[/a] "
@@ -8569,10 +8567,6 @@ msgstr ""
 msgid "Got invalid version string from server"
 msgstr ""
 
-#: setup/lib/messages.inc.php:370
-msgid "Check for latest version"
-msgstr ""
-
 #: setup/lib/messages.inc.php:371
 #, php-format
 msgid ""
@@ -8604,10 +8598,6 @@ msgid ""
 "Neither URL wrapper nor CURL is available. Version check is not possible."
 msgstr ""
 
-#: setup/lib/messages.inc.php:377
-msgid "Warning"
-msgstr ""
-
 #: setup/lib/messages.inc.php:378
 msgid ""
 "Enable [a at http://en.wikipedia.org/wiki/ZIP_(file_format)]ZIP[/a] compression "
@@ -8669,6 +8659,19 @@ msgid "Description"
 msgstr "Opis"
 
 #, fuzzy
+#~| msgid ""
+#~| "However on last run no data has been parsed, this usually means "
+#~| "phpMyAdmin won't be able to finish this import unless you increase php "
+#~| "time limits."
+#~ msgid ""
+#~ "However on last run no data has been parsed, this usually means "
+#~ "phpMyAdmin won"
+#~ msgstr ""
+#~ "Ipak, pri posljednjem prijelazu nikakvi podaci nisu bili raščlanjeni. To "
+#~ "znači da phpMyAdmin neće biti u mogućnosti završiti ovaj uvoz sve dok ne "
+#~ "povećate vremenska ograničenja unutar php."
+
+#, fuzzy
 #~| msgid "None"
 #~ msgctxt "None action"
 #~ msgid "None"
diff --git a/po/hu.po b/po/hu.po
index 25754b6..fae3406 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-14 07:48-0400\n"
+"POT-Creation-Date: 2010-05-14 13:39-0400\n"
 "PO-Revision-Date: 2010-03-12 09:15+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: hungarian <hu at li.org>\n"
@@ -955,15 +955,10 @@ msgstr ""
 "Script időtúllépés történt, ha be akarja fejezni az importálást, akkor "
 "küldje újra ugyanazt a fájlt és az importálás folytatódni fog."
 
-#: import.php:426
-#, fuzzy
-#| msgid ""
-#| "However on last run no data has been parsed, this usually means "
-#| "phpMyAdmin won't be able to finish this import unless you increase php "
-#| "time limits."
+#: import.php:426 libraries/messages.inc.php:1102
 msgid ""
 "However on last run no data has been parsed, this usually means phpMyAdmin "
-"won"
+"won't be able to finish this import unless you increase php time limits."
 msgstr ""
 "Az utolsó futáskor azonban nem került adat elemzésre, ami általában azt "
 "jelenti, hogy a phpMyAdmin nem tudja befejezni ezt az importálást, ha Ön nem "
@@ -6451,15 +6446,6 @@ msgstr "Szálak"
 msgid "Thread %s was successfully killed."
 msgstr "Sikerült leállítani a(z) %s. szálat."
 
-#: libraries/messages.inc.php:1102
-msgid ""
-"However on last run no data has been parsed, this usually means phpMyAdmin "
-"won't be able to finish this import unless you increase php time limits."
-msgstr ""
-"Az utolsó futáskor azonban nem került adat elemzésre, ami általában azt "
-"jelenti, hogy a phpMyAdmin nem tudja befejezni ezt az importálást, ha Ön nem "
-"növeli meg a PHP időkorlátozását."
-
 #: libraries/messages.inc.php:1105 pmd_pdf.php:94
 msgid "to/from page"
 msgstr "oldalra/-ról"
@@ -6943,7 +6929,8 @@ msgstr "Nincs"
 msgid "Filter"
 msgstr "Fájlok"
 
-#: navigation.php:319 setup/lib/messages.inc.php:42
+#: navigation.php:319 setup/frames/index.inc.php:218
+#: setup/lib/messages.inc.php:42
 msgid "Clear"
 msgstr "Törlés"
 
@@ -7042,6 +7029,114 @@ msgstr "Veszélyes kapcsolat"
 msgid "Configuration: %s"
 msgstr "Konfigurációs fájl"
 
+#: setup/frames/config.inc.php:25 setup/frames/index.inc.php:152
+#: setup/lib/messages.inc.php:45
+msgid "Configuration file"
+msgstr "Konfigurációs fájl"
+
+#: setup/frames/config.inc.php:38 setup/frames/index.inc.php:212
+#: setup/lib/messages.inc.php:65
+msgid "Download"
+msgstr "Letöltés"
+
+#: setup/frames/index.inc.php:58 setup/lib/messages.inc.php:164
+msgid ""
+"You are not using a secure connection; all data (including potentially "
+"sensitive information, like passwords) is transferred unencrypted!"
+msgstr ""
+"Ön nem biztonságos kapcsolatot használ, valamennyi adat (beleértve a "
+"bizalmasakat, mint a jelszavak) átvitele titkosítatlanul történik!"
+
+#: setup/frames/index.inc.php:87 setup/frames/menu.inc.php:17
+#: setup/lib/messages.inc.php:219
+msgid "Overview"
+msgstr "Áttekintés"
+
+#: setup/frames/index.inc.php:95 setup/lib/messages.inc.php:337
+msgid "Show hidden messages (#MSG_COUNT)"
+msgstr "A rejtett üzenetek megjelenítése (#MSG_COUNT)"
+
+#: setup/frames/index.inc.php:135 setup/lib/messages.inc.php:213
+msgid "There are no configured servers"
+msgstr "Nincsenek konfigurált szerverek"
+
+#: setup/frames/index.inc.php:143 setup/lib/messages.inc.php:212
+msgid "New server"
+msgstr "Új szerver"
+
+#: setup/frames/index.inc.php:172 setup/lib/messages.inc.php:50
+msgid "Default language"
+msgstr "Alapértelmezett nyelv"
+
+#: setup/frames/index.inc.php:182 setup/lib/messages.inc.php:187
+msgid "let the user choose"
+msgstr "válassza ki a felhasználó"
+
+#: setup/frames/index.inc.php:193 setup/lib/messages.inc.php:216
+msgid "- none -"
+msgstr "- nincs -"
+
+#: setup/frames/index.inc.php:196 setup/lib/messages.inc.php:51
+msgid "Default server"
+msgstr "Alapértelmezett szerver"
+
+#: setup/frames/index.inc.php:206 setup/lib/messages.inc.php:66
+msgid "End of line"
+msgstr "Sorvége"
+
+#: setup/frames/index.inc.php:211 setup/lib/messages.inc.php:61
+msgid "Display"
+msgstr "Nézet"
+
+#: setup/frames/index.inc.php:215 setup/lib/messages.inc.php:190
+msgid "Load"
+msgstr "Betöltés"
+
+#: setup/frames/index.inc.php:226 setup/lib/messages.inc.php:152
+msgid "phpMyAdmin homepage"
+msgstr "phpMyAdmin honlap"
+
+#: setup/frames/index.inc.php:227 setup/lib/messages.inc.php:64
+msgid "Donate"
+msgstr "Adományozás"
+
+#: setup/frames/index.inc.php:228 setup/lib/messages.inc.php:370
+msgid "Check for latest version"
+msgstr "Új verzió ellenőrzése"
+
+#: setup/frames/menu.inc.php:18 setup/lib/messages.inc.php:137
+msgid "Features"
+msgstr "Funkciók"
+
+#: setup/frames/menu.inc.php:19 setup/lib/messages.inc.php:113
+msgid "Navigation frame"
+msgstr "Navigációs keret"
+
+#: setup/frames/menu.inc.php:20 setup/lib/messages.inc.php:118
+msgid "Main frame"
+msgstr "Főkeret"
+
+#: setup/frames/servers.inc.php:28 setup/lib/messages.inc.php:272
+msgid "Edit server"
+msgstr "Szerver módosítása"
+
+#: setup/frames/servers.inc.php:37 setup/lib/messages.inc.php:241
+msgid "Add a new server"
+msgstr "Új szerver hozzáadása"
+
+#: setup/lib/FormDisplay.tpl.php:182 setup/lib/messages.inc.php:328
+#, php-format
+msgid "Set value: %s"
+msgstr "Adja meg az értéket: %s"
+
+#: setup/lib/FormDisplay.tpl.php:187 setup/lib/messages.inc.php:234
+msgid "Restore default value"
+msgstr "Alapértelmezett érték visszaállítása"
+
+#: setup/lib/form_processing.lib.php:43 setup/lib/messages.inc.php:377
+msgid "Warning"
+msgstr "Figyelmeztetés"
+
 #: setup/lib/messages.inc.php:16
 msgid "Allow character set conversion"
 msgstr "Karakterkészlet-konvertálás engedélyezése"
@@ -7213,10 +7308,6 @@ msgstr ""
 msgid "Compress on the fly"
 msgstr "Menet közbeni tömörítés"
 
-#: setup/lib/messages.inc.php:45
-msgid "Configuration file"
-msgstr "Konfigurációs fájl"
-
 #: setup/lib/messages.inc.php:46
 msgid ""
 "Whether a warning ("Are your really sure...") should be displayed "
@@ -7237,14 +7328,6 @@ msgstr "A konvertálások alapértelmezett karakterkészlete"
 msgid "Default character set"
 msgstr "Alapértelmezett karakterkészlet"
 
-#: setup/lib/messages.inc.php:50
-msgid "Default language"
-msgstr "Alapértelmezett nyelv"
-
-#: setup/lib/messages.inc.php:51
-msgid "Default server"
-msgstr "Alapértelmezett szerver"
-
 #: setup/lib/messages.inc.php:52
 msgid "Tab that is displayed when entering a database"
 msgstr "Az adatbázisba belépéskor megjelenített fül"
@@ -7286,10 +7369,6 @@ msgstr "Az adatbázisok legördülő helyett listaként történő megjeleníté
 msgid "Display databases as a list"
 msgstr "Az adatbázisok megjelenítése listaként"
 
-#: setup/lib/messages.inc.php:61
-msgid "Display"
-msgstr "Nézet"
-
 #: setup/lib/messages.inc.php:62
 msgid "Show server listing as a list instead of a drop down"
 msgstr "A szerverek legördülő helyett listaként történő megjelenítése"
@@ -7298,18 +7377,6 @@ msgstr "A szerverek legördülő helyett listaként történő megjelenítése"
 msgid "Display servers as a list"
 msgstr "A szerverek megjelenítése listaként"
 
-#: setup/lib/messages.inc.php:64
-msgid "Donate"
-msgstr "Adományozás"
-
-#: setup/lib/messages.inc.php:65
-msgid "Download"
-msgstr "Letöltés"
-
-#: setup/lib/messages.inc.php:66
-msgid "End of line"
-msgstr "Sorvége"
-
 #: setup/lib/messages.inc.php:67
 msgid "Could not connect to MySQL server"
 msgstr "Nem lehetett kapcsolódni a MySQL-szerverhez"
@@ -7497,10 +7564,6 @@ msgstr "Az adatbázisok megjelenítésének beállításai"
 msgid "Customize appearance of the navigation frame"
 msgstr "A navigációs keret megjelenésének testreszabása"
 
-#: setup/lib/messages.inc.php:113
-msgid "Navigation frame"
-msgstr "Navigációs keret"
-
 #: setup/lib/messages.inc.php:114
 msgid "Servers display options"
 msgstr "A szerverek megjelenítésének beállításai"
@@ -7509,10 +7572,6 @@ msgstr "A szerverek megjelenítésének beállításai"
 msgid "Tables display options"
 msgstr "A táblák megjelenítésének beállításai"
 
-#: setup/lib/messages.inc.php:118
-msgid "Main frame"
-msgstr "Főkeret"
-
 #: setup/lib/messages.inc.php:119
 msgid "Settings that didn't fit enywhere else"
 msgstr "A sehova sem illő beállítások"
@@ -7597,10 +7656,6 @@ msgstr "Testreszabás"
 msgid "Customize export options"
 msgstr "Exportálás beállításainak testreszabása"
 
-#: setup/lib/messages.inc.php:137
-msgid "Features"
-msgstr "Funkciók"
-
 #: setup/lib/messages.inc.php:138
 msgid "Customize import defaults"
 msgstr "Importálás alapértelmezéseinek testreszabása"
@@ -7673,10 +7728,6 @@ msgstr ""
 "tömörítéshez és kibontáshoz[/a] olyan függvényekre (%s) van szükség, melyek "
 "ezen a rendszeren nem elérhetőek."
 
-#: setup/lib/messages.inc.php:152
-msgid "phpMyAdmin homepage"
-msgstr "phpMyAdmin honlap"
-
 #: setup/lib/messages.inc.php:153
 msgid "Extra parameters for iconv"
 msgstr "Az iconv funkció extra paraméterei"
@@ -7727,14 +7778,6 @@ msgstr "Részleges importálás: lekérdezések kihagyása"
 msgid "Insecure connection"
 msgstr "Veszélyes kapcsolat"
 
-#: setup/lib/messages.inc.php:164
-msgid ""
-"You are not using a secure connection; all data (including potentially "
-"sensitive information, like passwords) is transferred unencrypted!"
-msgstr ""
-"Ön nem biztonságos kapcsolatot használ, valamennyi adat (beleértve a "
-"bizalmasakat, mint a jelszavak) átvitele titkosítatlanul történik!"
-
 #: setup/lib/messages.inc.php:165
 #, php-format
 msgid ""
@@ -7836,10 +7879,6 @@ msgstr "A szerver kiemelése az egérmutató alatt"
 msgid "Enable highlighting"
 msgstr "A szövegkiemelés engedélyezése"
 
-#: setup/lib/messages.inc.php:187
-msgid "let the user choose"
-msgstr "válassza ki a felhasználó"
-
 #: setup/lib/messages.inc.php:188
 msgid "Use less graphically intense tabs"
 msgstr "Grafikusan kevésbé kiemelt fülek használata"
@@ -7848,10 +7887,6 @@ msgstr "Grafikusan kevésbé kiemelt fülek használata"
 msgid "Light tabs"
 msgstr "Világos fülek"
 
-#: setup/lib/messages.inc.php:190
-msgid "Load"
-msgstr "Betöltés"
-
 #: setup/lib/messages.inc.php:191
 msgid ""
 "If TRUE, logout deletes cookies for all servers; when set to FALSE, logout "
@@ -7975,14 +8010,6 @@ msgstr "Csak ikonok, csak szöveg, vagy mindkettő használata"
 msgid "Iconic navigation bar"
 msgstr "Navigációs sáv ikonokkal"
 
-#: setup/lib/messages.inc.php:212
-msgid "New server"
-msgstr "Új szerver"
-
-#: setup/lib/messages.inc.php:213
-msgid "There are no configured servers"
-msgstr "Nincsenek konfigurált szerverek"
-
 #: setup/lib/messages.inc.php:214
 msgid "use GZip output buffering for increased speed in HTTP transfers"
 msgstr ""
@@ -7992,10 +8019,6 @@ msgstr ""
 msgid "GZip output buffering"
 msgstr "GZip-kimenet pufferelése"
 
-#: setup/lib/messages.inc.php:216
-msgid "- none -"
-msgstr "- nincs -"
-
 #: setup/lib/messages.inc.php:217
 msgid ""
 "[kbd]SMART[/kbd] - i.e. descending order for fields of type TIME, DATE, "
@@ -8008,10 +8031,6 @@ msgstr ""
 msgid "Default sorting order"
 msgstr "Alapértelmezett rendezési mód"
 
-#: setup/lib/messages.inc.php:219
-msgid "Overview"
-msgstr "Áttekintés"
-
 #: setup/lib/messages.inc.php:220
 msgid "Use persistent connections to MySQL databases"
 msgstr "Állandó kapcsolatok használata a MySQL adatbázisokhoz"
@@ -8069,10 +8088,6 @@ msgstr "Válassza ki a karakterkészlet-konvertáláshoz használandó funkciók
 msgid "Recoding engine"
 msgstr "Átkódoló motor"
 
-#: setup/lib/messages.inc.php:234
-msgid "Restore default value"
-msgstr "Alapértelmezett érték visszaállítása"
-
 #: setup/lib/messages.inc.php:235
 msgid "Try to revert erroneous fields to their default values"
 msgstr "A hibás mezők alapértelmezett értékei visszaállításának megkísérlése"
@@ -8109,10 +8124,6 @@ msgstr "Teljesítmény okokból használja a mysqli kiterjesztést"
 msgid "You allow for connecting to the server without a password."
 msgstr "Ön engedélyezi a jelszó nélküli csatlakozást a szerverhez."
 
-#: setup/lib/messages.inc.php:241
-msgid "Add a new server"
-msgstr "Új szerver hozzáadása"
-
 #: setup/lib/messages.inc.php:242
 msgid "Leave blank if not used"
 msgstr "Hagyja üresen, ha nem használja"
@@ -8275,10 +8286,6 @@ msgstr ""
 "internetszolgáltatóhoz tartozik, ahol több ezer felhasználó, köztük Ön is, "
 "csatlakozik az internethez."
 
-#: setup/lib/messages.inc.php:272
-msgid "Edit server"
-msgstr "Szerver módosítása"
-
 #: setup/lib/messages.inc.php:273
 msgid "What PHP extension to use; you should use mysqli if supported"
 msgstr ""
@@ -8561,11 +8568,6 @@ msgstr ""
 msgid "Verbose name of this server"
 msgstr "A szerver részletes neve"
 
-#: setup/lib/messages.inc.php:328
-#, php-format
-msgid "Set value: %s"
-msgstr "Adja meg az értéket: %s"
-
 #: setup/lib/messages.inc.php:329
 msgid ""
 "Whether a user should be displayed a "show all (records)" button"
@@ -8607,10 +8609,6 @@ msgstr "Szerkesztés/beszúrás módban a függvénymezők megjelenítése"
 msgid "Show function fields"
 msgstr "A függvénymezők megjelenítése"
 
-#: setup/lib/messages.inc.php:337
-msgid "Show hidden messages (#MSG_COUNT)"
-msgstr "A rejtett üzenetek megjelenítése (#MSG_COUNT)"
-
 #: setup/lib/messages.inc.php:338
 msgid ""
 "Shows link to [a at http://php.net/manual/function.phpinfo.php]phpinfo()[/a] "
@@ -8764,10 +8762,6 @@ msgstr ""
 msgid "Got invalid version string from server"
 msgstr "Érvénytelen verzió karakterlánc érkezett a szerverről"
 
-#: setup/lib/messages.inc.php:370
-msgid "Check for latest version"
-msgstr "Új verzió ellenőrzése"
-
 #: setup/lib/messages.inc.php:371
 #, php-format
 msgid ""
@@ -8808,10 +8802,6 @@ msgstr ""
 "Nem érhető el sem az URL wrapper, sem a CURL. A verzió-ellenőrzés nem "
 "lehetséges."
 
-#: setup/lib/messages.inc.php:377
-msgid "Warning"
-msgstr "Figyelmeztetés"
-
 #: setup/lib/messages.inc.php:378
 msgid ""
 "Enable [a at http://en.wikipedia.org/wiki/ZIP_(file_format)]ZIP[/a] compression "
@@ -8883,6 +8873,19 @@ msgid "Description"
 msgstr "Leírás"
 
 #, fuzzy
+#~| msgid ""
+#~| "However on last run no data has been parsed, this usually means "
+#~| "phpMyAdmin won't be able to finish this import unless you increase php "
+#~| "time limits."
+#~ msgid ""
+#~ "However on last run no data has been parsed, this usually means "
+#~ "phpMyAdmin won"
+#~ msgstr ""
+#~ "Az utolsó futáskor azonban nem került adat elemzésre, ami általában azt "
+#~ "jelenti, hogy a phpMyAdmin nem tudja befejezni ezt az importálást, ha Ön "
+#~ "nem növeli meg a PHP időkorlátozását."
+
+#, fuzzy
 #~| msgid "None"
 #~ msgctxt "None action"
 #~ msgid "None"
diff --git a/po/id.po b/po/id.po
index a1466f8..81ba17b 100644
--- a/po/id.po
+++ b/po/id.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-14 07:48-0400\n"
+"POT-Creation-Date: 2010-05-14 13:39-0400\n"
 "PO-Revision-Date: 2010-04-17 21:14+0200\n"
 "Last-Translator: Azhari Harahap <azhari.harahap at yahoo.com>\n"
 "Language-Team: indonesian <id at li.org>\n"
@@ -942,10 +942,10 @@ msgid ""
 "file and import will resume."
 msgstr ""
 
-#: import.php:426
+#: import.php:426 libraries/messages.inc.php:1102
 msgid ""
 "However on last run no data has been parsed, this usually means phpMyAdmin "
-"won"
+"won't be able to finish this import unless you increase php time limits."
 msgstr ""
 
 #: index.php:190 libraries/messages.inc.php:549
@@ -6242,12 +6242,6 @@ msgstr ""
 msgid "Thread %s was successfully killed."
 msgstr "Sukses hentikan Thread %s."
 
-#: libraries/messages.inc.php:1102
-msgid ""
-"However on last run no data has been parsed, this usually means phpMyAdmin "
-"won't be able to finish this import unless you increase php time limits."
-msgstr ""
-
 #: libraries/messages.inc.php:1105 pmd_pdf.php:94
 msgid "to/from page"
 msgstr ""
@@ -6716,7 +6710,8 @@ msgstr "tanpa"
 msgid "Filter"
 msgstr ""
 
-#: navigation.php:319 setup/lib/messages.inc.php:42
+#: navigation.php:319 setup/frames/index.inc.php:218
+#: setup/lib/messages.inc.php:42
 #, fuzzy
 msgid "Clear"
 msgstr "Kalender"
@@ -6807,6 +6802,115 @@ msgstr "Koneksi"
 msgid "Configuration: %s"
 msgstr ""
 
+#: setup/frames/config.inc.php:25 setup/frames/index.inc.php:152
+#: setup/lib/messages.inc.php:45
+msgid "Configuration file"
+msgstr ""
+
+#: setup/frames/config.inc.php:38 setup/frames/index.inc.php:212
+#: setup/lib/messages.inc.php:65
+msgid "Download"
+msgstr ""
+
+#: setup/frames/index.inc.php:58 setup/lib/messages.inc.php:164
+msgid ""
+"You are not using a secure connection; all data (including potentially "
+"sensitive information, like passwords) is transferred unencrypted!"
+msgstr ""
+
+#: setup/frames/index.inc.php:87 setup/frames/menu.inc.php:17
+#: setup/lib/messages.inc.php:219
+msgid "Overview"
+msgstr ""
+
+#: setup/frames/index.inc.php:95 setup/lib/messages.inc.php:337
+msgid "Show hidden messages (#MSG_COUNT)"
+msgstr ""
+
+#: setup/frames/index.inc.php:135 setup/lib/messages.inc.php:213
+msgid "There are no configured servers"
+msgstr ""
+
+#: setup/frames/index.inc.php:143 setup/lib/messages.inc.php:212
+msgid "New server"
+msgstr ""
+
+#: setup/frames/index.inc.php:172 setup/lib/messages.inc.php:50
+msgid "Default language"
+msgstr ""
+
+#: setup/frames/index.inc.php:182 setup/lib/messages.inc.php:187
+msgid "let the user choose"
+msgstr ""
+
+#: setup/frames/index.inc.php:193 setup/lib/messages.inc.php:216
+msgid "- none -"
+msgstr ""
+
+#: setup/frames/index.inc.php:196 setup/lib/messages.inc.php:51
+msgid "Default server"
+msgstr ""
+
+#: setup/frames/index.inc.php:206 setup/lib/messages.inc.php:66
+msgid "End of line"
+msgstr ""
+
+#: setup/frames/index.inc.php:211 setup/lib/messages.inc.php:61
+msgid "Display"
+msgstr ""
+
+#: setup/frames/index.inc.php:215 setup/lib/messages.inc.php:190
+#, fuzzy
+msgid "Load"
+msgstr "Lokal"
+
+#: setup/frames/index.inc.php:226 setup/lib/messages.inc.php:152
+#, fuzzy
+msgid "phpMyAdmin homepage"
+msgstr "Dokumentasi phpMyAdmin"
+
+#: setup/frames/index.inc.php:227 setup/lib/messages.inc.php:64
+msgid "Donate"
+msgstr ""
+
+#: setup/frames/index.inc.php:228 setup/lib/messages.inc.php:370
+msgid "Check for latest version"
+msgstr ""
+
+#: setup/frames/menu.inc.php:18 setup/lib/messages.inc.php:137
+msgid "Features"
+msgstr ""
+
+#: setup/frames/menu.inc.php:19 setup/lib/messages.inc.php:113
+msgid "Navigation frame"
+msgstr ""
+
+#: setup/frames/menu.inc.php:20 setup/lib/messages.inc.php:118
+msgid "Main frame"
+msgstr ""
+
+#: setup/frames/servers.inc.php:28 setup/lib/messages.inc.php:272
+msgid "Edit server"
+msgstr ""
+
+#: setup/frames/servers.inc.php:37 setup/lib/messages.inc.php:241
+#, fuzzy
+msgid "Add a new server"
+msgstr "Menambahkan pengguna baru"
+
+#: setup/lib/FormDisplay.tpl.php:182 setup/lib/messages.inc.php:328
+#, php-format
+msgid "Set value: %s"
+msgstr ""
+
+#: setup/lib/FormDisplay.tpl.php:187 setup/lib/messages.inc.php:234
+msgid "Restore default value"
+msgstr ""
+
+#: setup/lib/form_processing.lib.php:43 setup/lib/messages.inc.php:377
+msgid "Warning"
+msgstr "Peringatan"
+
 #: setup/lib/messages.inc.php:16
 msgid "Allow character set conversion"
 msgstr ""
@@ -6946,10 +7050,6 @@ msgstr ""
 msgid "Compress on the fly"
 msgstr ""
 
-#: setup/lib/messages.inc.php:45
-msgid "Configuration file"
-msgstr ""
-
 #: setup/lib/messages.inc.php:46
 msgid ""
 "Whether a warning ("Are your really sure...") should be displayed "
@@ -6968,14 +7068,6 @@ msgstr ""
 msgid "Default character set"
 msgstr ""
 
-#: setup/lib/messages.inc.php:50
-msgid "Default language"
-msgstr ""
-
-#: setup/lib/messages.inc.php:51
-msgid "Default server"
-msgstr ""
-
 #: setup/lib/messages.inc.php:52
 msgid "Tab that is displayed when entering a database"
 msgstr ""
@@ -7015,10 +7107,6 @@ msgstr ""
 msgid "Display databases as a list"
 msgstr ""
 
-#: setup/lib/messages.inc.php:61
-msgid "Display"
-msgstr ""
-
 #: setup/lib/messages.inc.php:62
 msgid "Show server listing as a list instead of a drop down"
 msgstr ""
@@ -7027,18 +7115,6 @@ msgstr ""
 msgid "Display servers as a list"
 msgstr ""
 
-#: setup/lib/messages.inc.php:64
-msgid "Donate"
-msgstr ""
-
-#: setup/lib/messages.inc.php:65
-msgid "Download"
-msgstr ""
-
-#: setup/lib/messages.inc.php:66
-msgid "End of line"
-msgstr ""
-
 #: setup/lib/messages.inc.php:67
 msgid "Could not connect to MySQL server"
 msgstr ""
@@ -7218,10 +7294,6 @@ msgstr "Pilihan cara untuk mengekspor Database"
 msgid "Customize appearance of the navigation frame"
 msgstr ""
 
-#: setup/lib/messages.inc.php:113
-msgid "Navigation frame"
-msgstr ""
-
 #: setup/lib/messages.inc.php:114
 msgid "Servers display options"
 msgstr ""
@@ -7230,10 +7302,6 @@ msgstr ""
 msgid "Tables display options"
 msgstr ""
 
-#: setup/lib/messages.inc.php:118
-msgid "Main frame"
-msgstr ""
-
 #: setup/lib/messages.inc.php:119
 msgid "Settings that didn't fit enywhere else"
 msgstr ""
@@ -7311,10 +7379,6 @@ msgstr ""
 msgid "Customize export options"
 msgstr "Pilihan cara untuk mengekspor Database"
 
-#: setup/lib/messages.inc.php:137
-msgid "Features"
-msgstr ""
-
 #: setup/lib/messages.inc.php:138
 msgid "Customize import defaults"
 msgstr ""
@@ -7383,11 +7447,6 @@ msgid ""
 "system."
 msgstr ""
 
-#: setup/lib/messages.inc.php:152
-#, fuzzy
-msgid "phpMyAdmin homepage"
-msgstr "Dokumentasi phpMyAdmin"
-
 #: setup/lib/messages.inc.php:153
 msgid "Extra parameters for iconv"
 msgstr ""
@@ -7431,12 +7490,6 @@ msgstr ""
 msgid "Insecure connection"
 msgstr ""
 
-#: setup/lib/messages.inc.php:164
-msgid ""
-"You are not using a secure connection; all data (including potentially "
-"sensitive information, like passwords) is transferred unencrypted!"
-msgstr ""
-
 #: setup/lib/messages.inc.php:165
 #, php-format
 msgid ""
@@ -7532,10 +7585,6 @@ msgstr ""
 msgid "Enable highlighting"
 msgstr ""
 
-#: setup/lib/messages.inc.php:187
-msgid "let the user choose"
-msgstr ""
-
 #: setup/lib/messages.inc.php:188
 msgid "Use less graphically intense tabs"
 msgstr ""
@@ -7544,11 +7593,6 @@ msgstr ""
 msgid "Light tabs"
 msgstr ""
 
-#: setup/lib/messages.inc.php:190
-#, fuzzy
-msgid "Load"
-msgstr "Lokal"
-
 #: setup/lib/messages.inc.php:191
 msgid ""
 "If TRUE, logout deletes cookies for all servers; when set to FALSE, logout "
@@ -7651,14 +7695,6 @@ msgstr ""
 msgid "Iconic navigation bar"
 msgstr ""
 
-#: setup/lib/messages.inc.php:212
-msgid "New server"
-msgstr ""
-
-#: setup/lib/messages.inc.php:213
-msgid "There are no configured servers"
-msgstr ""
-
 #: setup/lib/messages.inc.php:214
 msgid "use GZip output buffering for increased speed in HTTP transfers"
 msgstr ""
@@ -7667,10 +7703,6 @@ msgstr ""
 msgid "GZip output buffering"
 msgstr ""
 
-#: setup/lib/messages.inc.php:216
-msgid "- none -"
-msgstr ""
-
 #: setup/lib/messages.inc.php:217
 msgid ""
 "[kbd]SMART[/kbd] - i.e. descending order for fields of type TIME, DATE, "
@@ -7681,10 +7713,6 @@ msgstr ""
 msgid "Default sorting order"
 msgstr ""
 
-#: setup/lib/messages.inc.php:219
-msgid "Overview"
-msgstr ""
-
 #: setup/lib/messages.inc.php:220
 msgid "Use persistent connections to MySQL databases"
 msgstr ""
@@ -7739,10 +7767,6 @@ msgstr ""
 msgid "Recoding engine"
 msgstr ""
 
-#: setup/lib/messages.inc.php:234
-msgid "Restore default value"
-msgstr ""
-
 #: setup/lib/messages.inc.php:235
 msgid "Try to revert erroneous fields to their default values"
 msgstr ""
@@ -7774,11 +7798,6 @@ msgstr ""
 msgid "You allow for connecting to the server without a password."
 msgstr ""
 
-#: setup/lib/messages.inc.php:241
-#, fuzzy
-msgid "Add a new server"
-msgstr "Menambahkan pengguna baru"
-
 #: setup/lib/messages.inc.php:242
 msgid "Leave blank if not used"
 msgstr ""
@@ -7922,10 +7941,6 @@ msgid ""
 "to."
 msgstr ""
 
-#: setup/lib/messages.inc.php:272
-msgid "Edit server"
-msgstr ""
-
 #: setup/lib/messages.inc.php:273
 msgid "What PHP extension to use; you should use mysqli if supported"
 msgstr ""
@@ -8176,11 +8191,6 @@ msgstr ""
 msgid "Verbose name of this server"
 msgstr ""
 
-#: setup/lib/messages.inc.php:328
-#, php-format
-msgid "Set value: %s"
-msgstr ""
-
 #: setup/lib/messages.inc.php:329
 msgid ""
 "Whether a user should be displayed a "show all (records)" button"
@@ -8218,10 +8228,6 @@ msgstr ""
 msgid "Show function fields"
 msgstr ""
 
-#: setup/lib/messages.inc.php:337
-msgid "Show hidden messages (#MSG_COUNT)"
-msgstr ""
-
 #: setup/lib/messages.inc.php:338
 msgid ""
 "Shows link to [a at http://php.net/manual/function.phpinfo.php]phpinfo()[/a] "
@@ -8353,10 +8359,6 @@ msgstr ""
 msgid "Got invalid version string from server"
 msgstr ""
 
-#: setup/lib/messages.inc.php:370
-msgid "Check for latest version"
-msgstr ""
-
 #: setup/lib/messages.inc.php:371
 #, php-format
 msgid ""
@@ -8388,10 +8390,6 @@ msgid ""
 "Neither URL wrapper nor CURL is available. Version check is not possible."
 msgstr ""
 
-#: setup/lib/messages.inc.php:377
-msgid "Warning"
-msgstr "Peringatan"
-
 #: setup/lib/messages.inc.php:378
 msgid ""
 "Enable [a at http://en.wikipedia.org/wiki/ZIP_(file_format)]ZIP[/a] compression "
diff --git a/po/it.po b/po/it.po
index f1366fb..c49961b 100644
--- a/po/it.po
+++ b/po/it.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-14 07:48-0400\n"
+"POT-Creation-Date: 2010-05-14 13:39-0400\n"
 "PO-Revision-Date: 2010-04-11 11:19+0200\n"
 "Last-Translator: Fabio <fantonifabio at tiscali.it>\n"
 "Language-Team: italian <it at li.org>\n"
@@ -961,15 +961,10 @@ msgstr ""
 "Superato il tempo limite dello script, se vuoi finire l'importazione inoltra "
 "nuovamente il file e il processo riprenderà."
 
-#: import.php:426
-#, fuzzy
-#| msgid ""
-#| "However on last run no data has been parsed, this usually means "
-#| "phpMyAdmin won't be able to finish this import unless you increase php "
-#| "time limits."
+#: import.php:426 libraries/messages.inc.php:1102
 msgid ""
 "However on last run no data has been parsed, this usually means phpMyAdmin "
-"won"
+"won't be able to finish this import unless you increase php time limits."
 msgstr ""
 "Nell'ultima esecuzione nessun dato è stato processato, questo, solitamente, "
 "vuole dire che che phpMyAdmin non è in grado di ultimare l'operazione fino a "
@@ -6466,15 +6461,6 @@ msgstr "Processi"
 msgid "Thread %s was successfully killed."
 msgstr "Il thread %s è stato terminato con successo."
 
-#: libraries/messages.inc.php:1102
-msgid ""
-"However on last run no data has been parsed, this usually means phpMyAdmin "
-"won't be able to finish this import unless you increase php time limits."
-msgstr ""
-"Nell'ultima esecuzione nessun dato è stato processato, questo, solitamente, "
-"vuole dire che che phpMyAdmin non è in grado di ultimare l'operazione fino a "
-"che non verrà aumentato il parametro php time limits."
-
 #: libraries/messages.inc.php:1105 pmd_pdf.php:94
 msgid "to/from page"
 msgstr "da/per pagina"
@@ -6954,7 +6940,8 @@ msgstr "Nessuno"
 msgid "Filter"
 msgstr "File"
 
-#: navigation.php:319 setup/lib/messages.inc.php:42
+#: navigation.php:319 setup/frames/index.inc.php:218
+#: setup/lib/messages.inc.php:42
 #, fuzzy
 msgid "Clear"
 msgstr "Calendario"
@@ -7047,6 +7034,113 @@ msgstr "Connessione non sicura"
 msgid "Configuration: %s"
 msgstr "Configurazione"
 
+#: setup/frames/config.inc.php:25 setup/frames/index.inc.php:152
+#: setup/lib/messages.inc.php:45
+msgid "Configuration file"
+msgstr "File di configurazione"
+
+#: setup/frames/config.inc.php:38 setup/frames/index.inc.php:212
+#: setup/lib/messages.inc.php:65
+msgid "Download"
+msgstr "Scarica"
+
+#: setup/frames/index.inc.php:58 setup/lib/messages.inc.php:164
+msgid ""
+"You are not using a secure connection; all data (including potentially "
+"sensitive information, like passwords) is transferred unencrypted!"
+msgstr ""
+
+#: setup/frames/index.inc.php:87 setup/frames/menu.inc.php:17
+#: setup/lib/messages.inc.php:219
+msgid "Overview"
+msgstr "Panoramica"
+
+#: setup/frames/index.inc.php:95 setup/lib/messages.inc.php:337
+msgid "Show hidden messages (#MSG_COUNT)"
+msgstr ""
+
+#: setup/frames/index.inc.php:135 setup/lib/messages.inc.php:213
+msgid "There are no configured servers"
+msgstr "Non ci sono server configurati"
+
+#: setup/frames/index.inc.php:143 setup/lib/messages.inc.php:212
+msgid "New server"
+msgstr "Nuovo server"
+
+#: setup/frames/index.inc.php:172 setup/lib/messages.inc.php:50
+msgid "Default language"
+msgstr "Lingua predefinita"
+
+#: setup/frames/index.inc.php:182 setup/lib/messages.inc.php:187
+msgid "let the user choose"
+msgstr ""
+
+#: setup/frames/index.inc.php:193 setup/lib/messages.inc.php:216
+msgid "- none -"
+msgstr "- nessuno -"
+
+#: setup/frames/index.inc.php:196 setup/lib/messages.inc.php:51
+msgid "Default server"
+msgstr "Server predefinito"
+
+#: setup/frames/index.inc.php:206 setup/lib/messages.inc.php:66
+msgid "End of line"
+msgstr ""
+
+#: setup/frames/index.inc.php:211 setup/lib/messages.inc.php:61
+msgid "Display"
+msgstr "Visualizza"
+
+#: setup/frames/index.inc.php:215 setup/lib/messages.inc.php:190
+msgid "Load"
+msgstr "Carica"
+
+#: setup/frames/index.inc.php:226 setup/lib/messages.inc.php:152
+#, fuzzy
+msgid "phpMyAdmin homepage"
+msgstr "Documentazione di phpMyAdmin"
+
+#: setup/frames/index.inc.php:227 setup/lib/messages.inc.php:64
+msgid "Donate"
+msgstr "Dona"
+
+#: setup/frames/index.inc.php:228 setup/lib/messages.inc.php:370
+msgid "Check for latest version"
+msgstr "Controlla l'ultima versione"
+
+#: setup/frames/menu.inc.php:18 setup/lib/messages.inc.php:137
+msgid "Features"
+msgstr "Caratteristiche"
+
+#: setup/frames/menu.inc.php:19 setup/lib/messages.inc.php:113
+msgid "Navigation frame"
+msgstr "Frame di navigazione"
+
+#: setup/frames/menu.inc.php:20 setup/lib/messages.inc.php:118
+msgid "Main frame"
+msgstr ""
+
+#: setup/frames/servers.inc.php:28 setup/lib/messages.inc.php:272
+msgid "Edit server"
+msgstr "Modifica server"
+
+#: setup/frames/servers.inc.php:37 setup/lib/messages.inc.php:241
+msgid "Add a new server"
+msgstr "Aggiungi un nuovo server"
+
+#: setup/lib/FormDisplay.tpl.php:182 setup/lib/messages.inc.php:328
+#, php-format
+msgid "Set value: %s"
+msgstr "Imposta valore: %s"
+
+#: setup/lib/FormDisplay.tpl.php:187 setup/lib/messages.inc.php:234
+msgid "Restore default value"
+msgstr "Ripristinare valori predefiniti"
+
+#: setup/lib/form_processing.lib.php:43 setup/lib/messages.inc.php:377
+msgid "Warning"
+msgstr "Attenzione"
+
 #: setup/lib/messages.inc.php:16
 msgid "Allow character set conversion"
 msgstr ""
@@ -7186,10 +7280,6 @@ msgstr ""
 msgid "Compress on the fly"
 msgstr ""
 
-#: setup/lib/messages.inc.php:45
-msgid "Configuration file"
-msgstr "File di configurazione"
-
 #: setup/lib/messages.inc.php:46
 msgid ""
 "Whether a warning ("Are your really sure...") should be displayed "
@@ -7208,14 +7298,6 @@ msgstr ""
 msgid "Default character set"
 msgstr ""
 
-#: setup/lib/messages.inc.php:50
-msgid "Default language"
-msgstr "Lingua predefinita"
-
-#: setup/lib/messages.inc.php:51
-msgid "Default server"
-msgstr "Server predefinito"
-
 #: setup/lib/messages.inc.php:52
 msgid "Tab that is displayed when entering a database"
 msgstr ""
@@ -7257,10 +7339,6 @@ msgstr ""
 msgid "Display databases as a list"
 msgstr ""
 
-#: setup/lib/messages.inc.php:61
-msgid "Display"
-msgstr "Visualizza"
-
 #: setup/lib/messages.inc.php:62
 msgid "Show server listing as a list instead of a drop down"
 msgstr ""
@@ -7269,18 +7347,6 @@ msgstr ""
 msgid "Display servers as a list"
 msgstr ""
 
-#: setup/lib/messages.inc.php:64
-msgid "Donate"
-msgstr "Dona"
-
-#: setup/lib/messages.inc.php:65
-msgid "Download"
-msgstr "Scarica"
-
-#: setup/lib/messages.inc.php:66
-msgid "End of line"
-msgstr ""
-
 #: setup/lib/messages.inc.php:67
 msgid "Could not connect to MySQL server"
 msgstr ""
@@ -7466,10 +7532,6 @@ msgstr "Opzioni di visualizzazione tabelle"
 msgid "Customize appearance of the navigation frame"
 msgstr ""
 
-#: setup/lib/messages.inc.php:113
-msgid "Navigation frame"
-msgstr "Frame di navigazione"
-
 #: setup/lib/messages.inc.php:114
 #, fuzzy
 msgid "Servers display options"
@@ -7479,10 +7541,6 @@ msgstr "Opzioni di visualizzazione tabelle"
 msgid "Tables display options"
 msgstr "Opzioni di visualizzazione tabelle"
 
-#: setup/lib/messages.inc.php:118
-msgid "Main frame"
-msgstr ""
-
 #: setup/lib/messages.inc.php:119
 msgid "Settings that didn't fit enywhere else"
 msgstr ""
@@ -7559,10 +7617,6 @@ msgstr "Personalizzazione"
 msgid "Customize export options"
 msgstr "Personalizza le opzioni di esportazione"
 
-#: setup/lib/messages.inc.php:137
-msgid "Features"
-msgstr "Caratteristiche"
-
 #: setup/lib/messages.inc.php:138
 #, fuzzy
 msgid "Customize import defaults"
@@ -7631,11 +7685,6 @@ msgid ""
 "system."
 msgstr ""
 
-#: setup/lib/messages.inc.php:152
-#, fuzzy
-msgid "phpMyAdmin homepage"
-msgstr "Documentazione di phpMyAdmin"
-
 #: setup/lib/messages.inc.php:153
 msgid "Extra parameters for iconv"
 msgstr ""
@@ -7683,12 +7732,6 @@ msgstr ""
 msgid "Insecure connection"
 msgstr "Connessione non sicura"
 
-#: setup/lib/messages.inc.php:164
-msgid ""
-"You are not using a secure connection; all data (including potentially "
-"sensitive information, like passwords) is transferred unencrypted!"
-msgstr ""
-
 #: setup/lib/messages.inc.php:165
 #, php-format
 msgid ""
@@ -7786,10 +7829,6 @@ msgstr ""
 msgid "Enable highlighting"
 msgstr ""
 
-#: setup/lib/messages.inc.php:187
-msgid "let the user choose"
-msgstr ""
-
 #: setup/lib/messages.inc.php:188
 msgid "Use less graphically intense tabs"
 msgstr ""
@@ -7798,10 +7837,6 @@ msgstr ""
 msgid "Light tabs"
 msgstr ""
 
-#: setup/lib/messages.inc.php:190
-msgid "Load"
-msgstr "Carica"
-
 #: setup/lib/messages.inc.php:191
 msgid ""
 "If TRUE, logout deletes cookies for all servers; when set to FALSE, logout "
@@ -7907,14 +7942,6 @@ msgstr ""
 msgid "Iconic navigation bar"
 msgstr ""
 
-#: setup/lib/messages.inc.php:212
-msgid "New server"
-msgstr "Nuovo server"
-
-#: setup/lib/messages.inc.php:213
-msgid "There are no configured servers"
-msgstr "Non ci sono server configurati"
-
 #: setup/lib/messages.inc.php:214
 msgid "use GZip output buffering for increased speed in HTTP transfers"
 msgstr ""
@@ -7923,10 +7950,6 @@ msgstr ""
 msgid "GZip output buffering"
 msgstr ""
 
-#: setup/lib/messages.inc.php:216
-msgid "- none -"
-msgstr "- nessuno -"
-
 #: setup/lib/messages.inc.php:217
 msgid ""
 "[kbd]SMART[/kbd] - i.e. descending order for fields of type TIME, DATE, "
@@ -7937,10 +7960,6 @@ msgstr ""
 msgid "Default sorting order"
 msgstr ""
 
-#: setup/lib/messages.inc.php:219
-msgid "Overview"
-msgstr "Panoramica"
-
 #: setup/lib/messages.inc.php:220
 msgid "Use persistent connections to MySQL databases"
 msgstr ""
@@ -7995,10 +8014,6 @@ msgstr ""
 msgid "Recoding engine"
 msgstr ""
 
-#: setup/lib/messages.inc.php:234
-msgid "Restore default value"
-msgstr "Ripristinare valori predefiniti"
-
 #: setup/lib/messages.inc.php:235
 msgid "Try to revert erroneous fields to their default values"
 msgstr ""
@@ -8030,10 +8045,6 @@ msgstr ""
 msgid "You allow for connecting to the server without a password."
 msgstr ""
 
-#: setup/lib/messages.inc.php:241
-msgid "Add a new server"
-msgstr "Aggiungi un nuovo server"
-
 #: setup/lib/messages.inc.php:242
 msgid "Leave blank if not used"
 msgstr ""
@@ -8179,10 +8190,6 @@ msgid ""
 "to."
 msgstr ""
 
-#: setup/lib/messages.inc.php:272
-msgid "Edit server"
-msgstr "Modifica server"
-
 #: setup/lib/messages.inc.php:273
 msgid "What PHP extension to use; you should use mysqli if supported"
 msgstr ""
@@ -8435,11 +8442,6 @@ msgstr ""
 msgid "Verbose name of this server"
 msgstr ""
 
-#: setup/lib/messages.inc.php:328
-#, php-format
-msgid "Set value: %s"
-msgstr "Imposta valore: %s"
-
 #: setup/lib/messages.inc.php:329
 msgid ""
 "Whether a user should be displayed a "show all (records)" button"
@@ -8476,10 +8478,6 @@ msgstr ""
 msgid "Show function fields"
 msgstr ""
 
-#: setup/lib/messages.inc.php:337
-msgid "Show hidden messages (#MSG_COUNT)"
-msgstr ""
-
 #: setup/lib/messages.inc.php:338
 msgid ""
 "Shows link to [a at http://php.net/manual/function.phpinfo.php]phpinfo()[/a] "
@@ -8612,10 +8610,6 @@ msgstr ""
 msgid "Got invalid version string from server"
 msgstr ""
 
-#: setup/lib/messages.inc.php:370
-msgid "Check for latest version"
-msgstr "Controlla l'ultima versione"
-
 #: setup/lib/messages.inc.php:371
 #, php-format
 msgid ""
@@ -8647,10 +8641,6 @@ msgid ""
 "Neither URL wrapper nor CURL is available. Version check is not possible."
 msgstr ""
 
-#: setup/lib/messages.inc.php:377
-msgid "Warning"
-msgstr "Attenzione"
-
 #: setup/lib/messages.inc.php:378
 msgid ""
 "Enable [a at http://en.wikipedia.org/wiki/ZIP_(file_format)]ZIP[/a] compression "
@@ -8712,6 +8702,19 @@ msgid "Description"
 msgstr "Descrizione"
 
 #, fuzzy
+#~| msgid ""
+#~| "However on last run no data has been parsed, this usually means "
+#~| "phpMyAdmin won't be able to finish this import unless you increase php "
+#~| "time limits."
+#~ msgid ""
+#~ "However on last run no data has been parsed, this usually means "
+#~ "phpMyAdmin won"
+#~ msgstr ""
+#~ "Nell'ultima esecuzione nessun dato è stato processato, questo, "
+#~ "solitamente, vuole dire che che phpMyAdmin non è in grado di ultimare "
+#~ "l'operazione fino a che non verrà aumentato il parametro php time limits."
+
+#, fuzzy
 #~| msgid "None"
 #~ msgctxt "None action"
 #~ msgid "None"
diff --git a/po/ja.po b/po/ja.po
index e037093..2cc27ce 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-14 07:48-0400\n"
+"POT-Creation-Date: 2010-05-14 13:39-0400\n"
 "PO-Revision-Date: 2010-03-12 11:22+0200\n"
 "Last-Translator: Michal <michal at cihar.com>\n"
 "Language-Team: japanese <jp at li.org>\n"
@@ -947,15 +947,10 @@ msgstr ""
 "スクリプトがタイムアウトしました。インポートを完了させたいのであれば同じファ"
 "イルを再送信すればインポートが再開されます"
 
-#: import.php:426
-#, fuzzy
-#| msgid ""
-#| "However on last run no data has been parsed, this usually means "
-#| "phpMyAdmin won't be able to finish this import unless you increase php "
-#| "time limits."
+#: import.php:426 libraries/messages.inc.php:1102
 msgid ""
 "However on last run no data has been parsed, this usually means phpMyAdmin "
-"won"
+"won't be able to finish this import unless you increase php time limits."
 msgstr ""
 "ただし、最後に実行したときはまったくデータを解析できませんでした。ふつうは "
 "PHP の時間制限を伸ばさない限りこのデータのインポートはできません"
@@ -6322,14 +6317,6 @@ msgstr "スレッド"
 msgid "Thread %s was successfully killed."
 msgstr "スレッド %s は正常終了しました"
 
-#: libraries/messages.inc.php:1102
-msgid ""
-"However on last run no data has been parsed, this usually means phpMyAdmin "
-"won't be able to finish this import unless you increase php time limits."
-msgstr ""
-"ただし、最後に実行したときはまったくデータを解析できませんでした。ふつうは "
-"PHP の時間制限を伸ばさない限りこのデータのインポートはできません"
-
 #: libraries/messages.inc.php:1105 pmd_pdf.php:94
 msgid "to/from page"
 msgstr "開始/終了ページ"
@@ -6795,7 +6782,8 @@ msgstr "なし"
 msgid "Filter"
 msgstr ""
 
-#: navigation.php:319 setup/lib/messages.inc.php:42
+#: navigation.php:319 setup/frames/index.inc.php:218
+#: setup/lib/messages.inc.php:42
 msgid "Clear"
 msgstr ""
 
@@ -6885,6 +6873,112 @@ msgstr "最大同時接続数"
 msgid "Configuration: %s"
 msgstr "設定"
 
+#: setup/frames/config.inc.php:25 setup/frames/index.inc.php:152
+#: setup/lib/messages.inc.php:45
+msgid "Configuration file"
+msgstr ""
+
+#: setup/frames/config.inc.php:38 setup/frames/index.inc.php:212
+#: setup/lib/messages.inc.php:65
+msgid "Download"
+msgstr ""
+
+#: setup/frames/index.inc.php:58 setup/lib/messages.inc.php:164
+msgid ""
+"You are not using a secure connection; all data (including potentially "
+"sensitive information, like passwords) is transferred unencrypted!"
+msgstr ""
+
+#: setup/frames/index.inc.php:87 setup/frames/menu.inc.php:17
+#: setup/lib/messages.inc.php:219
+msgid "Overview"
+msgstr ""
+
+#: setup/frames/index.inc.php:95 setup/lib/messages.inc.php:337
+msgid "Show hidden messages (#MSG_COUNT)"
+msgstr ""
+
+#: setup/frames/index.inc.php:135 setup/lib/messages.inc.php:213
+msgid "There are no configured servers"
+msgstr ""
+
+#: setup/frames/index.inc.php:143 setup/lib/messages.inc.php:212
+msgid "New server"
+msgstr ""
+
+#: setup/frames/index.inc.php:172 setup/lib/messages.inc.php:50
+msgid "Default language"
+msgstr ""
+
+#: setup/frames/index.inc.php:182 setup/lib/messages.inc.php:187
+msgid "let the user choose"
+msgstr ""
+
+#: setup/frames/index.inc.php:193 setup/lib/messages.inc.php:216
+msgid "- none -"
+msgstr ""
+
+#: setup/frames/index.inc.php:196 setup/lib/messages.inc.php:51
+msgid "Default server"
+msgstr ""
+
+#: setup/frames/index.inc.php:206 setup/lib/messages.inc.php:66
+msgid "End of line"
+msgstr ""
+
+#: setup/frames/index.inc.php:211 setup/lib/messages.inc.php:61
+msgid "Display"
+msgstr ""
+
+#: setup/frames/index.inc.php:215 setup/lib/messages.inc.php:190
+msgid "Load"
+msgstr ""
+
+#: setup/frames/index.inc.php:226 setup/lib/messages.inc.php:152
+msgid "phpMyAdmin homepage"
+msgstr ""
+
+#: setup/frames/index.inc.php:227 setup/lib/messages.inc.php:64
+msgid "Donate"
+msgstr ""
+
+#: setup/frames/index.inc.php:228 setup/lib/messages.inc.php:370
+msgid "Check for latest version"
+msgstr ""
+
+#: setup/frames/menu.inc.php:18 setup/lib/messages.inc.php:137
+msgid "Features"
+msgstr ""
+
+#: setup/frames/menu.inc.php:19 setup/lib/messages.inc.php:113
+msgid "Navigation frame"
+msgstr ""
+
+#: setup/frames/menu.inc.php:20 setup/lib/messages.inc.php:118
+msgid "Main frame"
+msgstr ""
+
+#: setup/frames/servers.inc.php:28 setup/lib/messages.inc.php:272
+msgid "Edit server"
+msgstr ""
+
+#: setup/frames/servers.inc.php:37 setup/lib/messages.inc.php:241
+msgid "Add a new server"
+msgstr ""
+
+#: setup/lib/FormDisplay.tpl.php:182 setup/lib/messages.inc.php:328
+#, php-format
+msgid "Set value: %s"
+msgstr ""
+
+#: setup/lib/FormDisplay.tpl.php:187 setup/lib/messages.inc.php:234
+msgid "Restore default value"
+msgstr ""
+
+#: setup/lib/form_processing.lib.php:43 setup/lib/messages.inc.php:377
+msgid "Warning"
+msgstr ""
+
 #: setup/lib/messages.inc.php:16
 msgid "Allow character set conversion"
 msgstr ""
@@ -7023,10 +7117,6 @@ msgstr ""
 msgid "Compress on the fly"
 msgstr ""
 
-#: setup/lib/messages.inc.php:45
-msgid "Configuration file"
-msgstr ""
-
 #: setup/lib/messages.inc.php:46
 msgid ""
 "Whether a warning ("Are your really sure...") should be displayed "
@@ -7045,14 +7135,6 @@ msgstr ""
 msgid "Default character set"
 msgstr ""
 
-#: setup/lib/messages.inc.php:50
-msgid "Default language"
-msgstr ""
-
-#: setup/lib/messages.inc.php:51
-msgid "Default server"
-msgstr ""
-
 #: setup/lib/messages.inc.php:52
 msgid "Tab that is displayed when entering a database"
 msgstr ""
@@ -7091,10 +7173,6 @@ msgstr ""
 msgid "Display databases as a list"
 msgstr ""
 
-#: setup/lib/messages.inc.php:61
-msgid "Display"
-msgstr ""
-
 #: setup/lib/messages.inc.php:62
 msgid "Show server listing as a list instead of a drop down"
 msgstr ""
@@ -7103,18 +7181,6 @@ msgstr ""
 msgid "Display servers as a list"
 msgstr ""
 
-#: setup/lib/messages.inc.php:64
-msgid "Donate"
-msgstr ""
-
-#: setup/lib/messages.inc.php:65
-msgid "Download"
-msgstr ""
-
-#: setup/lib/messages.inc.php:66
-msgid "End of line"
-msgstr ""
-
 #: setup/lib/messages.inc.php:67
 msgid "Could not connect to MySQL server"
 msgstr ""
@@ -7287,10 +7353,6 @@ msgstr ""
 msgid "Customize appearance of the navigation frame"
 msgstr ""
 
-#: setup/lib/messages.inc.php:113
-msgid "Navigation frame"
-msgstr ""
-
 #: setup/lib/messages.inc.php:114
 msgid "Servers display options"
 msgstr ""
@@ -7299,10 +7361,6 @@ msgstr ""
 msgid "Tables display options"
 msgstr ""
 
-#: setup/lib/messages.inc.php:118
-msgid "Main frame"
-msgstr ""
-
 #: setup/lib/messages.inc.php:119
 msgid "Settings that didn't fit enywhere else"
 msgstr ""
@@ -7379,10 +7437,6 @@ msgstr ""
 msgid "Customize export options"
 msgstr ""
 
-#: setup/lib/messages.inc.php:137
-msgid "Features"
-msgstr ""
-
 #: setup/lib/messages.inc.php:138
 msgid "Customize import defaults"
 msgstr ""
@@ -7448,10 +7502,6 @@ msgid ""
 "system."
 msgstr ""
 
-#: setup/lib/messages.inc.php:152
-msgid "phpMyAdmin homepage"
-msgstr ""
-
 #: setup/lib/messages.inc.php:153
 msgid "Extra parameters for iconv"
 msgstr ""
@@ -7495,12 +7545,6 @@ msgstr ""
 msgid "Insecure connection"
 msgstr ""
 
-#: setup/lib/messages.inc.php:164
-msgid ""
-"You are not using a secure connection; all data (including potentially "
-"sensitive information, like passwords) is transferred unencrypted!"
-msgstr ""
-
 #: setup/lib/messages.inc.php:165
 #, php-format
 msgid ""
@@ -7596,10 +7640,6 @@ msgstr ""
 msgid "Enable highlighting"
 msgstr ""
 
-#: setup/lib/messages.inc.php:187
-msgid "let the user choose"
-msgstr ""
-
 #: setup/lib/messages.inc.php:188
 msgid "Use less graphically intense tabs"
 msgstr ""
@@ -7608,10 +7648,6 @@ msgstr ""
 msgid "Light tabs"
 msgstr ""
 
-#: setup/lib/messages.inc.php:190
-msgid "Load"
-msgstr ""
-
 #: setup/lib/messages.inc.php:191
 msgid ""
 "If TRUE, logout deletes cookies for all servers; when set to FALSE, logout "
@@ -7716,14 +7752,6 @@ msgstr ""
 msgid "Iconic navigation bar"
 msgstr ""
 
-#: setup/lib/messages.inc.php:212
-msgid "New server"
-msgstr ""
-
-#: setup/lib/messages.inc.php:213
-msgid "There are no configured servers"
-msgstr ""
-
 #: setup/lib/messages.inc.php:214
 msgid "use GZip output buffering for increased speed in HTTP transfers"
 msgstr ""
@@ -7732,10 +7760,6 @@ msgstr ""
 msgid "GZip output buffering"
 msgstr ""
 
-#: setup/lib/messages.inc.php:216
-msgid "- none -"
-msgstr ""
-
 #: setup/lib/messages.inc.php:217
 msgid ""
 "[kbd]SMART[/kbd] - i.e. descending order for fields of type TIME, DATE, "
@@ -7746,10 +7770,6 @@ msgstr ""
 msgid "Default sorting order"
 msgstr ""
 
-#: setup/lib/messages.inc.php:219
-msgid "Overview"
-msgstr ""
-
 #: setup/lib/messages.inc.php:220
 msgid "Use persistent connections to MySQL databases"
 msgstr ""
@@ -7804,10 +7824,6 @@ msgstr ""
 msgid "Recoding engine"
 msgstr ""
 
-#: setup/lib/messages.inc.php:234
-msgid "Restore default value"
-msgstr ""
-
 #: setup/lib/messages.inc.php:235
 msgid "Try to revert erroneous fields to their default values"
 msgstr ""
@@ -7838,10 +7854,6 @@ msgstr ""
 msgid "You allow for connecting to the server without a password."
 msgstr ""
 
-#: setup/lib/messages.inc.php:241
-msgid "Add a new server"
-msgstr ""
-
 #: setup/lib/messages.inc.php:242
 msgid "Leave blank if not used"
 msgstr ""
@@ -7982,10 +7994,6 @@ msgid ""
 "to."
 msgstr ""
 
-#: setup/lib/messages.inc.php:272
-msgid "Edit server"
-msgstr ""
-
 #: setup/lib/messages.inc.php:273
 msgid "What PHP extension to use; you should use mysqli if supported"
 msgstr ""
@@ -8231,11 +8239,6 @@ msgstr ""
 msgid "Verbose name of this server"
 msgstr ""
 
-#: setup/lib/messages.inc.php:328
-#, php-format
-msgid "Set value: %s"
-msgstr ""
-
 #: setup/lib/messages.inc.php:329
 msgid ""
 "Whether a user should be displayed a "show all (records)" button"
@@ -8272,10 +8275,6 @@ msgstr ""
 msgid "Show function fields"
 msgstr ""
 
-#: setup/lib/messages.inc.php:337
-msgid "Show hidden messages (#MSG_COUNT)"
-msgstr ""
-
 #: setup/lib/messages.inc.php:338
 msgid ""
 "Shows link to [a at http://php.net/manual/function.phpinfo.php]phpinfo()[/a] "
@@ -8404,10 +8403,6 @@ msgstr ""
 msgid "Got invalid version string from server"
 msgstr ""
 
-#: setup/lib/messages.inc.php:370
-msgid "Check for latest version"
-msgstr ""
-
 #: setup/lib/messages.inc.php:371
 #, php-format
 msgid ""
@@ -8439,10 +8434,6 @@ msgid ""
 "Neither URL wrapper nor CURL is available. Version check is not possible."
 msgstr ""
 
-#: setup/lib/messages.inc.php:377
-msgid "Warning"
-msgstr ""
-
 #: setup/lib/messages.inc.php:378
 msgid ""
 "Enable [a at http://en.wikipedia.org/wiki/ZIP_(file_format)]ZIP[/a] compression "
@@ -8504,6 +8495,18 @@ msgid "Description"
 msgstr "説明"
 
 #, fuzzy
+#~| msgid ""
+#~| "However on last run no data has been parsed, this usually means "
+#~| "phpMyAdmin won't be able to finish this import unless you increase php "
+#~| "time limits."
+#~ msgid ""
+#~ "However on last run no data has been parsed, this usually means "
+#~ "phpMyAdmin won"
+#~ msgstr ""
+#~ "ただし、最後に実行したときはまったくデータを解析できませんでした。ふつう"
+#~ "は PHP の時間制限を伸ばさない限りこのデータのインポートはできません"
+
+#, fuzzy
 #~| msgid "None"
 #~ msgctxt "None action"
 #~ msgid "None"
diff --git a/po/ka.po b/po/ka.po
index 7a37cd8..fe21f92 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-14 07:48-0400\n"
+"POT-Creation-Date: 2010-05-14 13:39-0400\n"
 "PO-Revision-Date: 2010-03-12 09:14+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: georgian <ka at li.org>\n"
@@ -952,15 +952,10 @@ msgstr ""
 "Script timeout passed, if you want to finish import, please resubmit same "
 "file and import will resume."
 
-#: import.php:426
-#, fuzzy
-#| msgid ""
-#| "However on last run no data has been parsed, this usually means "
-#| "phpMyAdmin won't be able to finish this import unless you increase php "
-#| "time limits."
+#: import.php:426 libraries/messages.inc.php:1102
 msgid ""
 "However on last run no data has been parsed, this usually means phpMyAdmin "
-"won"
+"won't be able to finish this import unless you increase php time limits."
 msgstr ""
 "However on last run no data has been parsed, this usually means phpMyAdmin "
 "won't be able to finish this import unless you increase php time limits."
@@ -6410,14 +6405,6 @@ msgstr "Threads"
 msgid "Thread %s was successfully killed."
 msgstr "Thread %s was successfully killed."
 
-#: libraries/messages.inc.php:1102
-msgid ""
-"However on last run no data has been parsed, this usually means phpMyAdmin "
-"won't be able to finish this import unless you increase php time limits."
-msgstr ""
-"However on last run no data has been parsed, this usually means phpMyAdmin "
-"won't be able to finish this import unless you increase php time limits."
-
 #: libraries/messages.inc.php:1105 pmd_pdf.php:94
 msgid "to/from page"
 msgstr "to/from page"
@@ -6891,7 +6878,8 @@ msgstr "არაა"
 msgid "Filter"
 msgstr "ფაილები"
 
-#: navigation.php:319 setup/lib/messages.inc.php:42
+#: navigation.php:319 setup/frames/index.inc.php:218
+#: setup/lib/messages.inc.php:42
 msgid "Clear"
 msgstr "გაწმენდა"
 
@@ -6980,6 +6968,114 @@ msgstr "დაუცველი კავშირი"
 msgid "Configuration: %s"
 msgstr "კონფიგურაციის ფაილი"
 
+#: setup/frames/config.inc.php:25 setup/frames/index.inc.php:152
+#: setup/lib/messages.inc.php:45
+msgid "Configuration file"
+msgstr "კონფიგურაციის ფაილი"
+
+#: setup/frames/config.inc.php:38 setup/frames/index.inc.php:212
+#: setup/lib/messages.inc.php:65
+msgid "Download"
+msgstr "ჩამოტვირთვა"
+
+#: setup/frames/index.inc.php:58 setup/lib/messages.inc.php:164
+msgid ""
+"You are not using a secure connection; all data (including potentially "
+"sensitive information, like passwords) is transferred unencrypted!"
+msgstr ""
+"You are not using a secure connection; all data (including potentially "
+"sensitive information, like passwords) is transferred unencrypted!"
+
+#: setup/frames/index.inc.php:87 setup/frames/menu.inc.php:17
+#: setup/lib/messages.inc.php:219
+msgid "Overview"
+msgstr "განხილვა"
+
+#: setup/frames/index.inc.php:95 setup/lib/messages.inc.php:337
+msgid "Show hidden messages (#MSG_COUNT)"
+msgstr "ფარული შეტყობინებების ჩვენება (#MSG_COUNT)"
+
+#: setup/frames/index.inc.php:135 setup/lib/messages.inc.php:213
+msgid "There are no configured servers"
+msgstr "There are no configured servers"
+
+#: setup/frames/index.inc.php:143 setup/lib/messages.inc.php:212
+msgid "New server"
+msgstr "ახალი სერვერი"
+
+#: setup/frames/index.inc.php:172 setup/lib/messages.inc.php:50
+msgid "Default language"
+msgstr "ნაგულისხმები ენა"
+
+#: setup/frames/index.inc.php:182 setup/lib/messages.inc.php:187
+msgid "let the user choose"
+msgstr "let the user choose"
+
+#: setup/frames/index.inc.php:193 setup/lib/messages.inc.php:216
+msgid "- none -"
+msgstr "- არაა -"
+
+#: setup/frames/index.inc.php:196 setup/lib/messages.inc.php:51
+msgid "Default server"
+msgstr "ნაგულისხმები სერვერი"
+
+#: setup/frames/index.inc.php:206 setup/lib/messages.inc.php:66
+msgid "End of line"
+msgstr "სტრიქონის დასასრული"
+
+#: setup/frames/index.inc.php:211 setup/lib/messages.inc.php:61
+msgid "Display"
+msgstr "ჩვენება"
+
+#: setup/frames/index.inc.php:215 setup/lib/messages.inc.php:190
+msgid "Load"
+msgstr "ჩატვირთვა"
+
+#: setup/frames/index.inc.php:226 setup/lib/messages.inc.php:152
+msgid "phpMyAdmin homepage"
+msgstr "phpMyAdmin-ის სათაო გვერდი"
+
+#: setup/frames/index.inc.php:227 setup/lib/messages.inc.php:64
+msgid "Donate"
+msgstr "შემოწირულობა"
+
+#: setup/frames/index.inc.php:228 setup/lib/messages.inc.php:370
+msgid "Check for latest version"
+msgstr "უკანასკნელ ვერსიაზე შემოწმება"
+
+#: setup/frames/menu.inc.php:18 setup/lib/messages.inc.php:137
+msgid "Features"
+msgstr "Features"
+
+#: setup/frames/menu.inc.php:19 setup/lib/messages.inc.php:113
+msgid "Navigation frame"
+msgstr "ნავიგაციის ჩარჩო"
+
+#: setup/frames/menu.inc.php:20 setup/lib/messages.inc.php:118
+msgid "Main frame"
+msgstr "მთავარი ჩარჩო"
+
+#: setup/frames/servers.inc.php:28 setup/lib/messages.inc.php:272
+msgid "Edit server"
+msgstr "სერვერის რედაქტირება"
+
+#: setup/frames/servers.inc.php:37 setup/lib/messages.inc.php:241
+msgid "Add a new server"
+msgstr "ახალი სერვერის დამატება"
+
+#: setup/lib/FormDisplay.tpl.php:182 setup/lib/messages.inc.php:328
+#, php-format
+msgid "Set value: %s"
+msgstr "Set value: %s"
+
+#: setup/lib/FormDisplay.tpl.php:187 setup/lib/messages.inc.php:234
+msgid "Restore default value"
+msgstr "Restore default value"
+
+#: setup/lib/form_processing.lib.php:43 setup/lib/messages.inc.php:377
+msgid "Warning"
+msgstr "Warning"
+
 #: setup/lib/messages.inc.php:16
 msgid "Allow character set conversion"
 msgstr "Allow character set conversion"
@@ -7143,10 +7239,6 @@ msgstr ""
 msgid "Compress on the fly"
 msgstr "Compress on the fly"
 
-#: setup/lib/messages.inc.php:45
-msgid "Configuration file"
-msgstr "კონფიგურაციის ფაილი"
-
 #: setup/lib/messages.inc.php:46
 msgid ""
 "Whether a warning ("Are your really sure...") should be displayed "
@@ -7167,14 +7259,6 @@ msgstr "Default character set used for conversions"
 msgid "Default character set"
 msgstr "Default character set"
 
-#: setup/lib/messages.inc.php:50
-msgid "Default language"
-msgstr "ნაგულისხმები ენა"
-
-#: setup/lib/messages.inc.php:51
-msgid "Default server"
-msgstr "ნაგულისხმები სერვერი"
-
 #: setup/lib/messages.inc.php:52
 msgid "Tab that is displayed when entering a database"
 msgstr "Tab that is displayed when entering a database"
@@ -7215,10 +7299,6 @@ msgstr "Show database listing as a list instead of a drop down"
 msgid "Display databases as a list"
 msgstr "მონაცემთა ბაზების სიის სახით ჩვენება"
 
-#: setup/lib/messages.inc.php:61
-msgid "Display"
-msgstr "ჩვენება"
-
 #: setup/lib/messages.inc.php:62
 msgid "Show server listing as a list instead of a drop down"
 msgstr "Show server listing as a list instead of a drop down"
@@ -7227,18 +7307,6 @@ msgstr "Show server listing as a list instead of a drop down"
 msgid "Display servers as a list"
 msgstr "სერვერების სიის სახით ჩვენება"
 
-#: setup/lib/messages.inc.php:64
-msgid "Donate"
-msgstr "შემოწირულობა"
-
-#: setup/lib/messages.inc.php:65
-msgid "Download"
-msgstr "ჩამოტვირთვა"
-
-#: setup/lib/messages.inc.php:66
-msgid "End of line"
-msgstr "სტრიქონის დასასრული"
-
 #: setup/lib/messages.inc.php:67
 msgid "Could not connect to MySQL server"
 msgstr "MySQL სერვერთან დაკავშირება ვერ მოხერხდა"
@@ -7417,10 +7485,6 @@ msgstr "მონაცემთა ბაზის ჩვენების პ
 msgid "Customize appearance of the navigation frame"
 msgstr "Customize appearance of the navigation frame"
 
-#: setup/lib/messages.inc.php:113
-msgid "Navigation frame"
-msgstr "ნავიგაციის ჩარჩო"
-
 #: setup/lib/messages.inc.php:114
 msgid "Servers display options"
 msgstr "სერვერის ჩვენების პარამეტრები"
@@ -7429,10 +7493,6 @@ msgstr "სერვერის ჩვენების პარამეტ
 msgid "Tables display options"
 msgstr "ცხრილების ჩვენების პარამეტრები"
 
-#: setup/lib/messages.inc.php:118
-msgid "Main frame"
-msgstr "მთავარი ჩარჩო"
-
 #: setup/lib/messages.inc.php:119
 msgid "Settings that didn't fit enywhere else"
 msgstr "Settings that didn't fit enywhere else"
@@ -7515,10 +7575,6 @@ msgstr "Customization"
 msgid "Customize export options"
 msgstr "Customize export options"
 
-#: setup/lib/messages.inc.php:137
-msgid "Features"
-msgstr "Features"
-
 #: setup/lib/messages.inc.php:138
 msgid "Customize import defaults"
 msgstr "Customize import defaults"
@@ -7590,10 +7646,6 @@ msgstr ""
 "decompression[/a] requires functions (%s) which are unavailable on this "
 "system."
 
-#: setup/lib/messages.inc.php:152
-msgid "phpMyAdmin homepage"
-msgstr "phpMyAdmin-ის სათაო გვერდი"
-
 #: setup/lib/messages.inc.php:153
 msgid "Extra parameters for iconv"
 msgstr "Extra parameters for iconv"
@@ -7644,14 +7696,6 @@ msgstr "Partial import: skip queries"
 msgid "Insecure connection"
 msgstr "დაუცველი კავშირი"
 
-#: setup/lib/messages.inc.php:164
-msgid ""
-"You are not using a secure connection; all data (including potentially "
-"sensitive information, like passwords) is transferred unencrypted!"
-msgstr ""
-"You are not using a secure connection; all data (including potentially "
-"sensitive information, like passwords) is transferred unencrypted!"
-
 #: setup/lib/messages.inc.php:165
 #, php-format
 msgid ""
@@ -7753,10 +7797,6 @@ msgstr "Highlight server under the mouse cursor"
 msgid "Enable highlighting"
 msgstr "Enable highlighting"
 
-#: setup/lib/messages.inc.php:187
-msgid "let the user choose"
-msgstr "let the user choose"
-
 #: setup/lib/messages.inc.php:188
 msgid "Use less graphically intense tabs"
 msgstr "Use less graphically intense tabs"
@@ -7765,10 +7805,6 @@ msgstr "Use less graphically intense tabs"
 msgid "Light tabs"
 msgstr "Light tabs"
 
-#: setup/lib/messages.inc.php:190
-msgid "Load"
-msgstr "ჩატვირთვა"
-
 #: setup/lib/messages.inc.php:191
 msgid ""
 "If TRUE, logout deletes cookies for all servers; when set to FALSE, logout "
@@ -7887,14 +7923,6 @@ msgstr "Use only icons, only text or both"
 msgid "Iconic navigation bar"
 msgstr "Iconic navigation bar"
 
-#: setup/lib/messages.inc.php:212
-msgid "New server"
-msgstr "ახალი სერვერი"
-
-#: setup/lib/messages.inc.php:213
-msgid "There are no configured servers"
-msgstr "There are no configured servers"
-
 #: setup/lib/messages.inc.php:214
 msgid "use GZip output buffering for increased speed in HTTP transfers"
 msgstr "use GZip output buffering for increased speed in HTTP transfers"
@@ -7903,10 +7931,6 @@ msgstr "use GZip output buffering for increased speed in HTTP transfers"
 msgid "GZip output buffering"
 msgstr "GZip output buffering"
 
-#: setup/lib/messages.inc.php:216
-msgid "- none -"
-msgstr "- არაა -"
-
 #: setup/lib/messages.inc.php:217
 msgid ""
 "[kbd]SMART[/kbd] - i.e. descending order for fields of type TIME, DATE, "
@@ -7919,10 +7943,6 @@ msgstr ""
 msgid "Default sorting order"
 msgstr "Default sorting order"
 
-#: setup/lib/messages.inc.php:219
-msgid "Overview"
-msgstr "განხილვა"
-
 #: setup/lib/messages.inc.php:220
 msgid "Use persistent connections to MySQL databases"
 msgstr "Use persistent connections to MySQL databases"
@@ -7979,10 +7999,6 @@ msgstr "Select which functions will be used for character set conversion"
 msgid "Recoding engine"
 msgstr "Recoding engine"
 
-#: setup/lib/messages.inc.php:234
-msgid "Restore default value"
-msgstr "Restore default value"
-
 #: setup/lib/messages.inc.php:235
 msgid "Try to revert erroneous fields to their default values"
 msgstr "Try to revert erroneous fields to their default values"
@@ -8018,10 +8034,6 @@ msgstr "You should use mysqli for performance reasons"
 msgid "You allow for connecting to the server without a password."
 msgstr ""
 
-#: setup/lib/messages.inc.php:241
-msgid "Add a new server"
-msgstr "ახალი სერვერის დამატება"
-
 #: setup/lib/messages.inc.php:242
 msgid "Leave blank if not used"
 msgstr "Leave blank if not used"
@@ -8181,10 +8193,6 @@ msgstr ""
 "IP belongs to an ISP where thousands of users, including you, are connected "
 "to."
 
-#: setup/lib/messages.inc.php:272
-msgid "Edit server"
-msgstr "სერვერის რედაქტირება"
-
 #: setup/lib/messages.inc.php:273
 msgid "What PHP extension to use; you should use mysqli if supported"
 msgstr "What PHP extension to use; you should use mysqli if supported"
@@ -8458,11 +8466,6 @@ msgstr ""
 msgid "Verbose name of this server"
 msgstr "Verbose name of this server"
 
-#: setup/lib/messages.inc.php:328
-#, php-format
-msgid "Set value: %s"
-msgstr "Set value: %s"
-
 #: setup/lib/messages.inc.php:329
 msgid ""
 "Whether a user should be displayed a "show all (records)" button"
@@ -8503,10 +8506,6 @@ msgstr "Display the function fields in edit/insert mode"
 msgid "Show function fields"
 msgstr "ფუნქციების ველების ჩვენება"
 
-#: setup/lib/messages.inc.php:337
-msgid "Show hidden messages (#MSG_COUNT)"
-msgstr "ფარული შეტყობინებების ჩვენება (#MSG_COUNT)"
-
 #: setup/lib/messages.inc.php:338
 msgid ""
 "Shows link to [a at http://php.net/manual/function.phpinfo.php]phpinfo()[/a] "
@@ -8656,10 +8655,6 @@ msgstr ""
 msgid "Got invalid version string from server"
 msgstr "Got invalid version string from server"
 
-#: setup/lib/messages.inc.php:370
-msgid "Check for latest version"
-msgstr "უკანასკნელ ვერსიაზე შემოწმებ
ა"
-
 #: setup/lib/messages.inc.php:371
 #, php-format
 msgid ""
@@ -8699,10 +8694,6 @@ msgid ""
 msgstr ""
 "Neither URL wrapper nor CURL is available. Version check is not possible."
 
-#: setup/lib/messages.inc.php:377
-msgid "Warning"
-msgstr "Warning"
-
 #: setup/lib/messages.inc.php:378
 msgid ""
 "Enable [a at http://en.wikipedia.org/wiki/ZIP_(file_format)]ZIP[/a] compression "
@@ -8772,6 +8763,19 @@ msgid "Description"
 msgstr "აღწერილობა"
 
 #, fuzzy
+#~| msgid ""
+#~| "However on last run no data has been parsed, this usually means "
+#~| "phpMyAdmin won't be able to finish this import unless you increase php "
+#~| "time limits."
+#~ msgid ""
+#~ "However on last run no data has been parsed, this usually means "
+#~ "phpMyAdmin won"
+#~ msgstr ""
+#~ "However on last run no data has been parsed, this usually means "
+#~ "phpMyAdmin won't be able to finish this import unless you increase php "
+#~ "time limits."
+
+#, fuzzy
 #~| msgid "None"
 #~ msgctxt "None action"
 #~ msgid "None"
diff --git a/po/ko.po b/po/ko.po
index 013eef7..33e875a 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-14 07:48-0400\n"
+"POT-Creation-Date: 2010-05-14 13:39-0400\n"
 "PO-Revision-Date: 2010-03-12 09:16+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: korean <ko at li.org>\n"
@@ -944,10 +944,10 @@ msgid ""
 "file and import will resume."
 msgstr ""
 
-#: import.php:426
+#: import.php:426 libraries/messages.inc.php:1102
 msgid ""
 "However on last run no data has been parsed, this usually means phpMyAdmin "
-"won"
+"won't be able to finish this import unless you increase php time limits."
 msgstr ""
 
 #: index.php:190 libraries/messages.inc.php:549
@@ -6161,12 +6161,6 @@ msgstr ""
 msgid "Thread %s was successfully killed."
 msgstr "쓰레드 %s 를 죽였습니다."
 
-#: libraries/messages.inc.php:1102
-msgid ""
-"However on last run no data has been parsed, this usually means phpMyAdmin "
-"won't be able to finish this import unless you increase php time limits."
-msgstr ""
-
 #: libraries/messages.inc.php:1105 pmd_pdf.php:94
 msgid "to/from page"
 msgstr ""
@@ -6599,7 +6593,8 @@ msgstr "없음"
 msgid "Filter"
 msgstr ""
 
-#: navigation.php:319 setup/lib/messages.inc.php:42
+#: navigation.php:319 setup/frames/index.inc.php:218
+#: setup/lib/messages.inc.php:42
 msgid "Clear"
 msgstr ""
 
@@ -6686,6 +6681,115 @@ msgstr "연결 수"
 msgid "Configuration: %s"
 msgstr ""
 
+#: setup/frames/config.inc.php:25 setup/frames/index.inc.php:152
+#: setup/lib/messages.inc.php:45
+msgid "Configuration file"
+msgstr ""
+
+#: setup/frames/config.inc.php:38 setup/frames/index.inc.php:212
+#: setup/lib/messages.inc.php:65
+msgid "Download"
+msgstr ""
+
+#: setup/frames/index.inc.php:58 setup/lib/messages.inc.php:164
+msgid ""
+"You are not using a secure connection; all data (including potentially "
+"sensitive information, like passwords) is transferred unencrypted!"
+msgstr ""
+
+#: setup/frames/index.inc.php:87 setup/frames/menu.inc.php:17
+#: setup/lib/messages.inc.php:219
+msgid "Overview"
+msgstr ""
+
+#: setup/frames/index.inc.php:95 setup/lib/messages.inc.php:337
+msgid "Show hidden messages (#MSG_COUNT)"
+msgstr ""
+
+#: setup/frames/index.inc.php:135 setup/lib/messages.inc.php:213
+msgid "There are no configured servers"
+msgstr ""
+
+#: setup/frames/index.inc.php:143 setup/lib/messages.inc.php:212
+msgid "New server"
+msgstr ""
+
+#: setup/frames/index.inc.php:172 setup/lib/messages.inc.php:50
+msgid "Default language"
+msgstr ""
+
+#: setup/frames/index.inc.php:182 setup/lib/messages.inc.php:187
+msgid "let the user choose"
+msgstr ""
+
+#: setup/frames/index.inc.php:193 setup/lib/messages.inc.php:216
+msgid "- none -"
+msgstr ""
+
+#: setup/frames/index.inc.php:196 setup/lib/messages.inc.php:51
+msgid "Default server"
+msgstr ""
+
+#: setup/frames/index.inc.php:206 setup/lib/messages.inc.php:66
+msgid "End of line"
+msgstr ""
+
+#: setup/frames/index.inc.php:211 setup/lib/messages.inc.php:61
+msgid "Display"
+msgstr ""
+
+#: setup/frames/index.inc.php:215 setup/lib/messages.inc.php:190
+#, fuzzy
+msgid "Load"
+msgstr "Local"
+
+#: setup/frames/index.inc.php:226 setup/lib/messages.inc.php:152
+#, fuzzy
+msgid "phpMyAdmin homepage"
+msgstr "phpMyAdmin 설명서"
+
+#: setup/frames/index.inc.php:227 setup/lib/messages.inc.php:64
+msgid "Donate"
+msgstr ""
+
+#: setup/frames/index.inc.php:228 setup/lib/messages.inc.php:370
+msgid "Check for latest version"
+msgstr ""
+
+#: setup/frames/menu.inc.php:18 setup/lib/messages.inc.php:137
+msgid "Features"
+msgstr ""
+
+#: setup/frames/menu.inc.php:19 setup/lib/messages.inc.php:113
+msgid "Navigation frame"
+msgstr ""
+
+#: setup/frames/menu.inc.php:20 setup/lib/messages.inc.php:118
+msgid "Main frame"
+msgstr ""
+
+#: setup/frames/servers.inc.php:28 setup/lib/messages.inc.php:272
+msgid "Edit server"
+msgstr ""
+
+#: setup/frames/servers.inc.php:37 setup/lib/messages.inc.php:241
+#, fuzzy
+msgid "Add a new server"
+msgstr "새 사용자 추가"
+
+#: setup/lib/FormDisplay.tpl.php:182 setup/lib/messages.inc.php:328
+#, php-format
+msgid "Set value: %s"
+msgstr ""
+
+#: setup/lib/FormDisplay.tpl.php:187 setup/lib/messages.inc.php:234
+msgid "Restore default value"
+msgstr ""
+
+#: setup/lib/form_processing.lib.php:43 setup/lib/messages.inc.php:377
+msgid "Warning"
+msgstr ""
+
 #: setup/lib/messages.inc.php:16
 msgid "Allow character set conversion"
 msgstr ""
@@ -6825,10 +6929,6 @@ msgstr ""
 msgid "Compress on the fly"
 msgstr ""
 
-#: setup/lib/messages.inc.php:45
-msgid "Configuration file"
-msgstr ""
-
 #: setup/lib/messages.inc.php:46
 msgid ""
 "Whether a warning ("Are your really sure...") should be displayed "
@@ -6847,14 +6947,6 @@ msgstr ""
 msgid "Default character set"
 msgstr ""
 
-#: setup/lib/messages.inc.php:50
-msgid "Default language"
-msgstr ""
-
-#: setup/lib/messages.inc.php:51
-msgid "Default server"
-msgstr ""
-
 #: setup/lib/messages.inc.php:52
 msgid "Tab that is displayed when entering a database"
 msgstr ""
@@ -6893,10 +6985,6 @@ msgstr ""
 msgid "Display databases as a list"
 msgstr ""
 
-#: setup/lib/messages.inc.php:61
-msgid "Display"
-msgstr ""
-
 #: setup/lib/messages.inc.php:62
 msgid "Show server listing as a list instead of a drop down"
 msgstr ""
@@ -6905,18 +6993,6 @@ msgstr ""
 msgid "Display servers as a list"
 msgstr ""
 
-#: setup/lib/messages.inc.php:64
-msgid "Donate"
-msgstr ""
-
-#: setup/lib/messages.inc.php:65
-msgid "Download"
-msgstr ""
-
-#: setup/lib/messages.inc.php:66
-msgid "End of line"
-msgstr ""
-
 #: setup/lib/messages.inc.php:67
 msgid "Could not connect to MySQL server"
 msgstr ""
@@ -7096,10 +7172,6 @@ msgstr "데이터베이스 사용량 통계"
 msgid "Customize appearance of the navigation frame"
 msgstr ""
 
-#: setup/lib/messages.inc.php:113
-msgid "Navigation frame"
-msgstr ""
-
 #: setup/lib/messages.inc.php:114
 msgid "Servers display options"
 msgstr ""
@@ -7108,10 +7180,6 @@ msgstr ""
 msgid "Tables display options"
 msgstr ""
 
-#: setup/lib/messages.inc.php:118
-msgid "Main frame"
-msgstr ""
-
 #: setup/lib/messages.inc.php:119
 msgid "Settings that didn't fit enywhere else"
 msgstr ""
@@ -7188,10 +7256,6 @@ msgstr ""
 msgid "Customize export options"
 msgstr ""
 
-#: setup/lib/messages.inc.php:137
-msgid "Features"
-msgstr ""
-
 #: setup/lib/messages.inc.php:138
 msgid "Customize import defaults"
 msgstr ""
@@ -7260,11 +7324,6 @@ msgid ""
 "system."
 msgstr ""
 
-#: setup/lib/messages.inc.php:152
-#, fuzzy
-msgid "phpMyAdmin homepage"
-msgstr "phpMyAdmin 설명서"
-
 #: setup/lib/messages.inc.php:153
 msgid "Extra parameters for iconv"
 msgstr ""
@@ -7308,12 +7367,6 @@ msgstr ""
 msgid "Insecure connection"
 msgstr ""
 
-#: setup/lib/messages.inc.php:164
-msgid ""
-"You are not using a secure connection; all data (including potentially "
-"sensitive information, like passwords) is transferred unencrypted!"
-msgstr ""
-
 #: setup/lib/messages.inc.php:165
 #, php-format
 msgid ""
@@ -7409,10 +7462,6 @@ msgstr ""
 msgid "Enable highlighting"
 msgstr ""
 
-#: setup/lib/messages.inc.php:187
-msgid "let the user choose"
-msgstr ""
-
 #: setup/lib/messages.inc.php:188
 msgid "Use less graphically intense tabs"
 msgstr ""
@@ -7421,11 +7470,6 @@ msgstr ""
 msgid "Light tabs"
 msgstr ""
 
-#: setup/lib/messages.inc.php:190
-#, fuzzy
-msgid "Load"
-msgstr "Local"
-
 #: setup/lib/messages.inc.php:191
 msgid ""
 "If TRUE, logout deletes cookies for all servers; when set to FALSE, logout "
@@ -7528,14 +7572,6 @@ msgstr ""
 msgid "Iconic navigation bar"
 msgstr ""
 
-#: setup/lib/messages.inc.php:212
-msgid "New server"
-msgstr ""
-
-#: setup/lib/messages.inc.php:213
-msgid "There are no configured servers"
-msgstr ""
-
 #: setup/lib/messages.inc.php:214
 msgid "use GZip output buffering for increased speed in HTTP transfers"
 msgstr ""
@@ -7544,10 +7580,6 @@ msgstr ""
 msgid "GZip output buffering"
 msgstr ""
 
-#: setup/lib/messages.inc.php:216
-msgid "- none -"
-msgstr ""
-
 #: setup/lib/messages.inc.php:217
 msgid ""
 "[kbd]SMART[/kbd] - i.e. descending order for fields of type TIME, DATE, "
@@ -7558,10 +7590,6 @@ msgstr ""
 msgid "Default sorting order"
 msgstr ""
 
-#: setup/lib/messages.inc.php:219
-msgid "Overview"
-msgstr ""
-
 #: setup/lib/messages.inc.php:220
 msgid "Use persistent connections to MySQL databases"
 msgstr ""
@@ -7616,10 +7644,6 @@ msgstr ""
 msgid "Recoding engine"
 msgstr ""
 
-#: setup/lib/messages.inc.php:234
-msgid "Restore default value"
-msgstr ""
-
 #: setup/lib/messages.inc.php:235
 msgid "Try to revert erroneous fields to their default values"
 msgstr ""
@@ -7650,11 +7674,6 @@ msgstr ""
 msgid "You allow for connecting to the server without a password."
 msgstr ""
 
-#: setup/lib/messages.inc.php:241
-#, fuzzy
-msgid "Add a new server"
-msgstr "새 사용자 추가"
-
 #: setup/lib/messages.inc.php:242
 msgid "Leave blank if not used"
 msgstr ""
@@ -7797,10 +7816,6 @@ msgid ""
 "to."
 msgstr ""
 
-#: setup/lib/messages.inc.php:272
-msgid "Edit server"
-msgstr ""
-
 #: setup/lib/messages.inc.php:273
 msgid "What PHP extension to use; you should use mysqli if supported"
 msgstr ""
@@ -8050,11 +8065,6 @@ msgstr ""
 msgid "Verbose name of this server"
 msgstr ""
 
-#: setup/lib/messages.inc.php:328
-#, php-format
-msgid "Set value: %s"
-msgstr ""
-
 #: setup/lib/messages.inc.php:329
 msgid ""
 "Whether a user should be displayed a "show all (records)" button"
@@ -8092,10 +8102,6 @@ msgstr ""
 msgid "Show function fields"
 msgstr ""
 
-#: setup/lib/messages.inc.php:337
-msgid "Show hidden messages (#MSG_COUNT)"
-msgstr ""
-
 #: setup/lib/messages.inc.php:338
 msgid ""
 "Shows link to [a at http://php.net/manual/function.phpinfo.php]phpinfo()[/a] "
@@ -8226,10 +8232,6 @@ msgstr ""
 msgid "Got invalid version string from server"
 msgstr ""
 
-#: setup/lib/messages.inc.php:370
-msgid "Check for latest version"
-msgstr ""
-
 #: setup/lib/messages.inc.php:371
 #, php-format
 msgid ""
@@ -8261,10 +8263,6 @@ msgid ""
 "Neither URL wrapper nor CURL is available. Version check is not possible."
 msgstr ""
 
-#: setup/lib/messages.inc.php:377
-msgid "Warning"
-msgstr ""
-
 #: setup/lib/messages.inc.php:378
 msgid ""
 "Enable [a at http://en.wikipedia.org/wiki/ZIP_(file_format)]ZIP[/a] compression "
diff --git a/po/lt.po b/po/lt.po
index 1d09209..cc92301 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-14 07:48-0400\n"
+"POT-Creation-Date: 2010-05-14 13:39-0400\n"
 "PO-Revision-Date: 2010-04-16 19:52+0200\n"
 "Last-Translator: Rytis <rytis.s at gmail.com>\n"
 "Language-Team: lithuanian <lt at li.org>\n"
@@ -941,10 +941,10 @@ msgid ""
 "file and import will resume."
 msgstr ""
 
-#: import.php:426
+#: import.php:426 libraries/messages.inc.php:1102
 msgid ""
 "However on last run no data has been parsed, this usually means phpMyAdmin "
-"won"
+"won't be able to finish this import unless you increase php time limits."
 msgstr ""
 
 #: index.php:190 libraries/messages.inc.php:549
@@ -6250,12 +6250,6 @@ msgstr ""
 msgid "Thread %s was successfully killed."
 msgstr "%s buvo sėkmingai išjungtas."
 
-#: libraries/messages.inc.php:1102
-msgid ""
-"However on last run no data has been parsed, this usually means phpMyAdmin "
-"won't be able to finish this import unless you increase php time limits."
-msgstr ""
-
 #: libraries/messages.inc.php:1105 pmd_pdf.php:94
 msgid "to/from page"
 msgstr ""
@@ -6716,7 +6710,8 @@ msgstr "Nėra"
 msgid "Filter"
 msgstr "Filtras"
 
-#: navigation.php:319 setup/lib/messages.inc.php:42
+#: navigation.php:319 setup/frames/index.inc.php:218
+#: setup/lib/messages.inc.php:42
 msgid "Clear"
 msgstr "Išvalyti"
 
@@ -6806,6 +6801,115 @@ msgstr "Nesaugus susijungimas"
 msgid "Configuration: %s"
 msgstr "Nustatymų failas"
 
+#: setup/frames/config.inc.php:25 setup/frames/index.inc.php:152
+#: setup/lib/messages.inc.php:45
+msgid "Configuration file"
+msgstr "Nustatymų failas"
+
+#: setup/frames/config.inc.php:38 setup/frames/index.inc.php:212
+#: setup/lib/messages.inc.php:65
+msgid "Download"
+msgstr "Parsisiųsti"
+
+#: setup/frames/index.inc.php:58 setup/lib/messages.inc.php:164
+msgid ""
+"You are not using a secure connection; all data (including potentially "
+"sensitive information, like passwords) is transferred unencrypted!"
+msgstr ""
+
+#: setup/frames/index.inc.php:87 setup/frames/menu.inc.php:17
+#: setup/lib/messages.inc.php:219
+msgid "Overview"
+msgstr "Apžvalga"
+
+#: setup/frames/index.inc.php:95 setup/lib/messages.inc.php:337
+msgid "Show hidden messages (#MSG_COUNT)"
+msgstr ""
+
+#: setup/frames/index.inc.php:135 setup/lib/messages.inc.php:213
+msgid "There are no configured servers"
+msgstr ""
+
+#: setup/frames/index.inc.php:143 setup/lib/messages.inc.php:212
+msgid "New server"
+msgstr "Naujas serveris"
+
+#: setup/frames/index.inc.php:172 setup/lib/messages.inc.php:50
+msgid "Default language"
+msgstr "Įprastinė kalba"
+
+#: setup/frames/index.inc.php:182 setup/lib/messages.inc.php:187
+msgid "let the user choose"
+msgstr "leisti vartotojui pasirinkti"
+
+#: setup/frames/index.inc.php:193 setup/lib/messages.inc.php:216
+msgid "- none -"
+msgstr ""
+
+#: setup/frames/index.inc.php:196 setup/lib/messages.inc.php:51
+msgid "Default server"
+msgstr "Įprastinis serveris"
+
+#: setup/frames/index.inc.php:206 setup/lib/messages.inc.php:66
+msgid "End of line"
+msgstr "Eilutės galas"
+
+#: setup/frames/index.inc.php:211 setup/lib/messages.inc.php:61
+msgid "Display"
+msgstr "Rodymas"
+
+#: setup/frames/index.inc.php:215 setup/lib/messages.inc.php:190
+#, fuzzy
+msgid "Load"
+msgstr "Lokali darbinė stotis"
+
+#: setup/frames/index.inc.php:226 setup/lib/messages.inc.php:152
+msgid "phpMyAdmin homepage"
+msgstr "phpMyAdmin tinklapis"
+
+#: setup/frames/index.inc.php:227 setup/lib/messages.inc.php:64
+msgid "Donate"
+msgstr "Paremti"
+
+#: setup/frames/index.inc.php:228 setup/lib/messages.inc.php:370
+msgid "Check for latest version"
+msgstr ""
+
+#: setup/frames/menu.inc.php:18 setup/lib/messages.inc.php:137
+msgid "Features"
+msgstr "Funkcijos"
+
+#: setup/frames/menu.inc.php:19 setup/lib/messages.inc.php:113
+msgid "Navigation frame"
+msgstr ""
+
+#: setup/frames/menu.inc.php:20 setup/lib/messages.inc.php:118
+msgid "Main frame"
+msgstr ""
+
+#: setup/frames/servers.inc.php:28 setup/lib/messages.inc.php:272
+#, fuzzy
+msgid "Edit server"
+msgstr "Naujas serveris"
+
+#: setup/frames/servers.inc.php:37 setup/lib/messages.inc.php:241
+#, fuzzy
+msgid "Add a new server"
+msgstr "Sukurti naują vartotoją"
+
+#: setup/lib/FormDisplay.tpl.php:182 setup/lib/messages.inc.php:328
+#, php-format
+msgid "Set value: %s"
+msgstr ""
+
+#: setup/lib/FormDisplay.tpl.php:187 setup/lib/messages.inc.php:234
+msgid "Restore default value"
+msgstr ""
+
+#: setup/lib/form_processing.lib.php:43 setup/lib/messages.inc.php:377
+msgid "Warning"
+msgstr "Perspėjimas"
+
 #: setup/lib/messages.inc.php:16
 msgid "Allow character set conversion"
 msgstr ""
@@ -6944,10 +7048,6 @@ msgstr ""
 msgid "Compress on the fly"
 msgstr ""
 
-#: setup/lib/messages.inc.php:45
-msgid "Configuration file"
-msgstr "Nustatymų failas"
-
 #: setup/lib/messages.inc.php:46
 msgid ""
 "Whether a warning ("Are your really sure...") should be displayed "
@@ -6966,14 +7066,6 @@ msgstr ""
 msgid "Default character set"
 msgstr ""
 
-#: setup/lib/messages.inc.php:50
-msgid "Default language"
-msgstr "Įprastinė kalba"
-
-#: setup/lib/messages.inc.php:51
-msgid "Default server"
-msgstr "Įprastinis serveris"
-
 #: setup/lib/messages.inc.php:52
 msgid "Tab that is displayed when entering a database"
 msgstr ""
@@ -7015,10 +7107,6 @@ msgstr ""
 msgid "Display databases as a list"
 msgstr "Rodyti duomenų bazes kaip sąrašą"
 
-#: setup/lib/messages.inc.php:61
-msgid "Display"
-msgstr "Rodymas"
-
 #: setup/lib/messages.inc.php:62
 msgid "Show server listing as a list instead of a drop down"
 msgstr ""
@@ -7027,18 +7115,6 @@ msgstr ""
 msgid "Display servers as a list"
 msgstr "Rodyti serverius kaip sąrašą"
 
-#: setup/lib/messages.inc.php:64
-msgid "Donate"
-msgstr "Paremti"
-
-#: setup/lib/messages.inc.php:65
-msgid "Download"
-msgstr "Parsisiųsti"
-
-#: setup/lib/messages.inc.php:66
-msgid "End of line"
-msgstr "Eilutės galas"
-
 #: setup/lib/messages.inc.php:67
 msgid "Could not connect to MySQL server"
 msgstr "Nepavyko prisijungti prie MySQL serverio"
@@ -7215,10 +7291,6 @@ msgstr "Duomenų bazių rodymo nustatymai"
 msgid "Customize appearance of the navigation frame"
 msgstr ""
 
-#: setup/lib/messages.inc.php:113
-msgid "Navigation frame"
-msgstr ""
-
 #: setup/lib/messages.inc.php:114
 #, fuzzy
 msgid "Servers display options"
@@ -7228,10 +7300,6 @@ msgstr "Lentelių rodymo nustatymai"
 msgid "Tables display options"
 msgstr "Lentelių rodymo nustatymai"
 
-#: setup/lib/messages.inc.php:118
-msgid "Main frame"
-msgstr ""
-
 #: setup/lib/messages.inc.php:119
 msgid "Settings that didn't fit enywhere else"
 msgstr ""
@@ -7309,10 +7377,6 @@ msgstr ""
 msgid "Customize export options"
 msgstr "Duombazės eksportavimo parinktys"
 
-#: setup/lib/messages.inc.php:137
-msgid "Features"
-msgstr "Funkcijos"
-
 #: setup/lib/messages.inc.php:138
 #, fuzzy
 msgid "Customize import defaults"
@@ -7380,10 +7444,6 @@ msgid ""
 "system."
 msgstr ""
 
-#: setup/lib/messages.inc.php:152
-msgid "phpMyAdmin homepage"
-msgstr "phpMyAdmin tinklapis"
-
 #: setup/lib/messages.inc.php:153
 msgid "Extra parameters for iconv"
 msgstr ""
@@ -7432,12 +7492,6 @@ msgstr "Dalinis importas: praleisti užklausas"
 msgid "Insecure connection"
 msgstr "Nesaugus susijungimas"
 
-#: setup/lib/messages.inc.php:164
-msgid ""
-"You are not using a secure connection; all data (including potentially "
-"sensitive information, like passwords) is transferred unencrypted!"
-msgstr ""
-
 #: setup/lib/messages.inc.php:165
 #, php-format
 msgid ""
@@ -7538,10 +7592,6 @@ msgstr "Paryškinti eilutę po pelės žymekliu"
 msgid "Enable highlighting"
 msgstr ""
 
-#: setup/lib/messages.inc.php:187
-msgid "let the user choose"
-msgstr "leisti vartotojui pasirinkti"
-
 #: setup/lib/messages.inc.php:188
 msgid "Use less graphically intense tabs"
 msgstr ""
@@ -7550,11 +7600,6 @@ msgstr ""
 msgid "Light tabs"
 msgstr ""
 
-#: setup/lib/messages.inc.php:190
-#, fuzzy
-msgid "Load"
-msgstr "Lokali darbinė stotis"
-
 #: setup/lib/messages.inc.php:191
 msgid ""
 "If TRUE, logout deletes cookies for all servers; when set to FALSE, logout "
@@ -7658,14 +7703,6 @@ msgstr ""
 msgid "Iconic navigation bar"
 msgstr ""
 
-#: setup/lib/messages.inc.php:212
-msgid "New server"
-msgstr "Naujas serveris"
-
-#: setup/lib/messages.inc.php:213
-msgid "There are no configured servers"
-msgstr ""
-
 #: setup/lib/messages.inc.php:214
 msgid "use GZip output buffering for increased speed in HTTP transfers"
 msgstr ""
@@ -7674,10 +7711,6 @@ msgstr ""
 msgid "GZip output buffering"
 msgstr ""
 
-#: setup/lib/messages.inc.php:216
-msgid "- none -"
-msgstr ""
-
 #: setup/lib/messages.inc.php:217
 msgid ""
 "[kbd]SMART[/kbd] - i.e. descending order for fields of type TIME, DATE, "
@@ -7688,10 +7721,6 @@ msgstr ""
 msgid "Default sorting order"
 msgstr ""
 
-#: setup/lib/messages.inc.php:219
-msgid "Overview"
-msgstr "Apžvalga"
-
 #: setup/lib/messages.inc.php:220
 msgid "Use persistent connections to MySQL databases"
 msgstr ""
@@ -7746,10 +7775,6 @@ msgstr ""
 msgid "Recoding engine"
 msgstr ""
 
-#: setup/lib/messages.inc.php:234
-msgid "Restore default value"
-msgstr ""
-
 #: setup/lib/messages.inc.php:235
 msgid "Try to revert erroneous fields to their default values"
 msgstr ""
@@ -7780,11 +7805,6 @@ msgstr ""
 msgid "You allow for connecting to the server without a password."
 msgstr ""
 
-#: setup/lib/messages.inc.php:241
-#, fuzzy
-msgid "Add a new server"
-msgstr "Sukurti naują vartotoją"
-
 #: setup/lib/messages.inc.php:242
 msgid "Leave blank if not used"
 msgstr "Palikite tuščią, jei nenaudojamas"
@@ -7929,11 +7949,6 @@ msgid ""
 "to."
 msgstr ""
 
-#: setup/lib/messages.inc.php:272
-#, fuzzy
-msgid "Edit server"
-msgstr "Naujas serveris"
-
 #: setup/lib/messages.inc.php:273
 msgid "What PHP extension to use; you should use mysqli if supported"
 msgstr ""
@@ -8184,11 +8199,6 @@ msgstr ""
 msgid "Verbose name of this server"
 msgstr ""
 
-#: setup/lib/messages.inc.php:328
-#, php-format
-msgid "Set value: %s"
-msgstr ""
-
 #: setup/lib/messages.inc.php:329
 msgid ""
 "Whether a user should be displayed a "show all (records)" button"
@@ -8226,10 +8236,6 @@ msgstr ""
 msgid "Show function fields"
 msgstr ""
 
-#: setup/lib/messages.inc.php:337
-msgid "Show hidden messages (#MSG_COUNT)"
-msgstr ""
-
 #: setup/lib/messages.inc.php:338
 msgid ""
 "Shows link to [a at http://php.net/manual/function.phpinfo.php]phpinfo()[/a] "
@@ -8361,10 +8367,6 @@ msgstr ""
 msgid "Got invalid version string from server"
 msgstr ""
 
-#: setup/lib/messages.inc.php:370
-msgid "Check for latest version"
-msgstr ""
-
 #: setup/lib/messages.inc.php:371
 #, php-format
 msgid ""
@@ -8396,10 +8398,6 @@ msgid ""
 "Neither URL wrapper nor CURL is available. Version check is not possible."
 msgstr ""
 
-#: setup/lib/messages.inc.php:377
-msgid "Warning"
-msgstr "Perspėjimas"
-
 #: setup/lib/messages.inc.php:378
 msgid ""
 "Enable [a at http://en.wikipedia.org/wiki/ZIP_(file_format)]ZIP[/a] compression "
diff --git a/po/lv.po b/po/lv.po
index 499488d..647966a 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-14 07:48-0400\n"
+"POT-Creation-Date: 2010-05-14 13:39-0400\n"
 "PO-Revision-Date: 2010-03-12 09:16+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: latvian <lv at li.org>\n"
@@ -941,10 +941,10 @@ msgid ""
 "file and import will resume."
 msgstr ""
 
-#: import.php:426
+#: import.php:426 libraries/messages.inc.php:1102
 msgid ""
 "However on last run no data has been parsed, this usually means phpMyAdmin "
-"won"
+"won't be able to finish this import unless you increase php time limits."
 msgstr ""
 
 #: index.php:190 libraries/messages.inc.php:549
@@ -6213,12 +6213,6 @@ msgstr ""
 msgid "Thread %s was successfully killed."
 msgstr "Process %s tika veiksmīgi nogalināts."
 
-#: libraries/messages.inc.php:1102
-msgid ""
-"However on last run no data has been parsed, this usually means phpMyAdmin "
-"won't be able to finish this import unless you increase php time limits."
-msgstr ""
-
 #: libraries/messages.inc.php:1105 pmd_pdf.php:94
 msgid "to/from page"
 msgstr ""
@@ -6678,7 +6672,8 @@ msgstr "Nav"
 msgid "Filter"
 msgstr ""
 
-#: navigation.php:319 setup/lib/messages.inc.php:42
+#: navigation.php:319 setup/frames/index.inc.php:218
+#: setup/lib/messages.inc.php:42
 #, fuzzy
 msgid "Clear"
 msgstr "Kalendārs"
@@ -6767,6 +6762,115 @@ msgstr "Konekcijas"
 msgid "Configuration: %s"
 msgstr ""
 
+#: setup/frames/config.inc.php:25 setup/frames/index.inc.php:152
+#: setup/lib/messages.inc.php:45
+msgid "Configuration file"
+msgstr ""
+
+#: setup/frames/config.inc.php:38 setup/frames/index.inc.php:212
+#: setup/lib/messages.inc.php:65
+msgid "Download"
+msgstr ""
+
+#: setup/frames/index.inc.php:58 setup/lib/messages.inc.php:164
+msgid ""
+"You are not using a secure connection; all data (including potentially "
+"sensitive information, like passwords) is transferred unencrypted!"
+msgstr ""
+
+#: setup/frames/index.inc.php:87 setup/frames/menu.inc.php:17
+#: setup/lib/messages.inc.php:219
+msgid "Overview"
+msgstr ""
+
+#: setup/frames/index.inc.php:95 setup/lib/messages.inc.php:337
+msgid "Show hidden messages (#MSG_COUNT)"
+msgstr ""
+
+#: setup/frames/index.inc.php:135 setup/lib/messages.inc.php:213
+msgid "There are no configured servers"
+msgstr ""
+
+#: setup/frames/index.inc.php:143 setup/lib/messages.inc.php:212
+msgid "New server"
+msgstr ""
+
+#: setup/frames/index.inc.php:172 setup/lib/messages.inc.php:50
+msgid "Default language"
+msgstr ""
+
+#: setup/frames/index.inc.php:182 setup/lib/messages.inc.php:187
+msgid "let the user choose"
+msgstr ""
+
+#: setup/frames/index.inc.php:193 setup/lib/messages.inc.php:216
+msgid "- none -"
+msgstr ""
+
+#: setup/frames/index.inc.php:196 setup/lib/messages.inc.php:51
+msgid "Default server"
+msgstr ""
+
+#: setup/frames/index.inc.php:206 setup/lib/messages.inc.php:66
+msgid "End of line"
+msgstr ""
+
+#: setup/frames/index.inc.php:211 setup/lib/messages.inc.php:61
+msgid "Display"
+msgstr ""
+
+#: setup/frames/index.inc.php:215 setup/lib/messages.inc.php:190
+#, fuzzy
+msgid "Load"
+msgstr "Lokāls"
+
+#: setup/frames/index.inc.php:226 setup/lib/messages.inc.php:152
+#, fuzzy
+msgid "phpMyAdmin homepage"
+msgstr "phpMyAdmin dokumentācija"
+
+#: setup/frames/index.inc.php:227 setup/lib/messages.inc.php:64
+msgid "Donate"
+msgstr ""
+
+#: setup/frames/index.inc.php:228 setup/lib/messages.inc.php:370
+msgid "Check for latest version"
+msgstr ""
+
+#: setup/frames/menu.inc.php:18 setup/lib/messages.inc.php:137
+msgid "Features"
+msgstr ""
+
+#: setup/frames/menu.inc.php:19 setup/lib/messages.inc.php:113
+msgid "Navigation frame"
+msgstr ""
+
+#: setup/frames/menu.inc.php:20 setup/lib/messages.inc.php:118
+msgid "Main frame"
+msgstr ""
+
+#: setup/frames/servers.inc.php:28 setup/lib/messages.inc.php:272
+msgid "Edit server"
+msgstr ""
+
+#: setup/frames/servers.inc.php:37 setup/lib/messages.inc.php:241
+#, fuzzy
+msgid "Add a new server"
+msgstr "Pievienot jaunu lietotāju"
+
+#: setup/lib/FormDisplay.tpl.php:182 setup/lib/messages.inc.php:328
+#, php-format
+msgid "Set value: %s"
+msgstr ""
+
+#: setup/lib/FormDisplay.tpl.php:187 setup/lib/messages.inc.php:234
+msgid "Restore default value"
+msgstr ""
+
+#: setup/lib/form_processing.lib.php:43 setup/lib/messages.inc.php:377
+msgid "Warning"
+msgstr ""
+
 #: setup/lib/messages.inc.php:16
 msgid "Allow character set conversion"
 msgstr ""
@@ -6906,10 +7010,6 @@ msgstr ""
 msgid "Compress on the fly"
 msgstr ""
 
-#: setup/lib/messages.inc.php:45
-msgid "Configuration file"
-msgstr ""
-
 #: setup/lib/messages.inc.php:46
 msgid ""
 "Whether a warning ("Are your really sure...") should be displayed "
@@ -6928,14 +7028,6 @@ msgstr ""
 msgid "Default character set"
 msgstr ""
 
-#: setup/lib/messages.inc.php:50
-msgid "Default language"
-msgstr ""
-
-#: setup/lib/messages.inc.php:51
-msgid "Default server"
-msgstr ""
-
 #: setup/lib/messages.inc.php:52
 msgid "Tab that is displayed when entering a database"
 msgstr ""
@@ -6975,10 +7067,6 @@ msgstr ""
 msgid "Display databases as a list"
 msgstr ""
 
-#: setup/lib/messages.inc.php:61
-msgid "Display"
-msgstr ""
-
 #: setup/lib/messages.inc.php:62
 msgid "Show server listing as a list instead of a drop down"
 msgstr ""
@@ -6987,18 +7075,6 @@ msgstr ""
 msgid "Display servers as a list"
 msgstr ""
 
-#: setup/lib/messages.inc.php:64
-msgid "Donate"
-msgstr ""
-
-#: setup/lib/messages.inc.php:65
-msgid "Download"
-msgstr ""
-
-#: setup/lib/messages.inc.php:66
-msgid "End of line"
-msgstr ""
-
 #: setup/lib/messages.inc.php:67
 msgid "Could not connect to MySQL server"
 msgstr ""
@@ -7178,10 +7254,6 @@ msgstr "Datubāzu eksporta opcijas"
 msgid "Customize appearance of the navigation frame"
 msgstr ""
 
-#: setup/lib/messages.inc.php:113
-msgid "Navigation frame"
-msgstr ""
-
 #: setup/lib/messages.inc.php:114
 msgid "Servers display options"
 msgstr ""
@@ -7190,10 +7262,6 @@ msgstr ""
 msgid "Tables display options"
 msgstr ""
 
-#: setup/lib/messages.inc.php:118
-msgid "Main frame"
-msgstr ""
-
 #: setup/lib/messages.inc.php:119
 msgid "Settings that didn't fit enywhere else"
 msgstr ""
@@ -7271,10 +7339,6 @@ msgstr ""
 msgid "Customize export options"
 msgstr "Datubāzu eksporta opcijas"
 
-#: setup/lib/messages.inc.php:137
-msgid "Features"
-msgstr ""
-
 #: setup/lib/messages.inc.php:138
 msgid "Customize import defaults"
 msgstr ""
@@ -7343,11 +7407,6 @@ msgid ""
 "system."
 msgstr ""
 
-#: setup/lib/messages.inc.php:152
-#, fuzzy
-msgid "phpMyAdmin homepage"
-msgstr "phpMyAdmin dokumentācija"
-
 #: setup/lib/messages.inc.php:153
 msgid "Extra parameters for iconv"
 msgstr ""
@@ -7391,12 +7450,6 @@ msgstr ""
 msgid "Insecure connection"
 msgstr ""
 
-#: setup/lib/messages.inc.php:164
-msgid ""
-"You are not using a secure connection; all data (including potentially "
-"sensitive information, like passwords) is transferred unencrypted!"
-msgstr ""
-
 #: setup/lib/messages.inc.php:165
 #, php-format
 msgid ""
@@ -7492,10 +7545,6 @@ msgstr ""
 msgid "Enable highlighting"
 msgstr ""
 
-#: setup/lib/messages.inc.php:187
-msgid "let the user choose"
-msgstr ""
-
 #: setup/lib/messages.inc.php:188
 msgid "Use less graphically intense tabs"
 msgstr ""
@@ -7504,11 +7553,6 @@ msgstr ""
 msgid "Light tabs"
 msgstr ""
 
-#: setup/lib/messages.inc.php:190
-#, fuzzy
-msgid "Load"
-msgstr "Lokāls"
-
 #: setup/lib/messages.inc.php:191
 msgid ""
 "If TRUE, logout deletes cookies for all servers; when set to FALSE, logout "
@@ -7611,14 +7655,6 @@ msgstr ""
 msgid "Iconic navigation bar"
 msgstr ""
 
-#: setup/lib/messages.inc.php:212
-msgid "New server"
-msgstr ""
-
-#: setup/lib/messages.inc.php:213
-msgid "There are no configured servers"
-msgstr ""
-
 #: setup/lib/messages.inc.php:214
 msgid "use GZip output buffering for increased speed in HTTP transfers"
 msgstr ""
@@ -7627,10 +7663,6 @@ msgstr ""
 msgid "GZip output buffering"
 msgstr ""
 
-#: setup/lib/messages.inc.php:216
-msgid "- none -"
-msgstr ""
-
 #: setup/lib/messages.inc.php:217
 msgid ""
 "[kbd]SMART[/kbd] - i.e. descending order for fields of type TIME, DATE, "
@@ -7641,10 +7673,6 @@ msgstr ""
 msgid "Default sorting order"
 msgstr ""
 
-#: setup/lib/messages.inc.php:219
-msgid "Overview"
-msgstr ""
-
 #: setup/lib/messages.inc.php:220
 msgid "Use persistent connections to MySQL databases"
 msgstr ""
@@ -7699,10 +7727,6 @@ msgstr ""
 msgid "Recoding engine"
 msgstr ""
 
-#: setup/lib/messages.inc.php:234
-msgid "Restore default value"
-msgstr ""
-
 #: setup/lib/messages.inc.php:235
 msgid "Try to revert erroneous fields to their default values"
 msgstr ""
@@ -7733,11 +7757,6 @@ msgstr ""
 msgid "You allow for connecting to the server without a password."
 msgstr ""
 
-#: setup/lib/messages.inc.php:241
-#, fuzzy
-msgid "Add a new server"
-msgstr "Pievienot jaunu lietotāju"
-
 #: setup/lib/messages.inc.php:242
 msgid "Leave blank if not used"
 msgstr ""
@@ -7881,10 +7900,6 @@ msgid ""
 "to."
 msgstr ""
 
-#: setup/lib/messages.inc.php:272
-msgid "Edit server"
-msgstr ""
-
 #: setup/lib/messages.inc.php:273
 msgid "What PHP extension to use; you should use mysqli if supported"
 msgstr ""
@@ -8134,11 +8149,6 @@ msgstr ""
 msgid "Verbose name of this server"
 msgstr ""
 
-#: setup/lib/messages.inc.php:328
-#, php-format
-msgid "Set value: %s"
-msgstr ""
-
 #: setup/lib/messages.inc.php:329
 msgid ""
 "Whether a user should be displayed a "show all (records)" button"
@@ -8176,10 +8186,6 @@ msgstr ""
 msgid "Show function fields"
 msgstr ""
 
-#: setup/lib/messages.inc.php:337
-msgid "Show hidden messages (#MSG_COUNT)"
-msgstr ""
-
 #: setup/lib/messages.inc.php:338
 msgid ""
 "Shows link to [a at http://php.net/manual/function.phpinfo.php]phpinfo()[/a] "
@@ -8311,10 +8317,6 @@ msgstr ""
 msgid "Got invalid version string from server"
 msgstr ""
 
-#: setup/lib/messages.inc.php:370
-msgid "Check for latest version"
-msgstr ""
-
 #: setup/lib/messages.inc.php:371
 #, php-format
 msgid ""
@@ -8346,10 +8348,6 @@ msgid ""
 "Neither URL wrapper nor CURL is available. Version check is not possible."
 msgstr ""
 
-#: setup/lib/messages.inc.php:377
-msgid "Warning"
-msgstr ""
-
 #: setup/lib/messages.inc.php:378
 msgid ""
 "Enable [a at http://en.wikipedia.org/wiki/ZIP_(file_format)]ZIP[/a] compression "
diff --git a/po/mk.po b/po/mk.po
index 6acdba5..789fb7e 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-14 07:48-0400\n"
+"POT-Creation-Date: 2010-05-14 13:39-0400\n"
 "PO-Revision-Date: 2010-03-12 09:16+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: macedonian_cyrillic <mk at li.org>\n"
@@ -941,10 +941,10 @@ msgid ""
 "file and import will resume."
 msgstr ""
 
-#: import.php:426
+#: import.php:426 libraries/messages.inc.php:1102
 msgid ""
 "However on last run no data has been parsed, this usually means phpMyAdmin "
-"won"
+"won't be able to finish this import unless you increase php time limits."
 msgstr ""
 
 #: index.php:190 libraries/messages.inc.php:549
@@ -6248,12 +6248,6 @@ msgstr ""
 msgid "Thread %s was successfully killed."
 msgstr "Процесот %s е успешно прекинат."
 
-#: libraries/messages.inc.php:1102
-msgid ""
-"However on last run no data has been parsed, this usually means phpMyAdmin "
-"won't be able to finish this import unless you increase php time limits."
-msgstr ""
-
 #: libraries/messages.inc.php:1105 pmd_pdf.php:94
 msgid "to/from page"
 msgstr ""
@@ -6722,7 +6716,8 @@ msgstr "нема"
 msgid "Filter"
 msgstr ""
 
-#: navigation.php:319 setup/lib/messages.inc.php:42
+#: navigation.php:319 setup/frames/index.inc.php:218
+#: setup/lib/messages.inc.php:42
 #, fuzzy
 msgid "Clear"
 msgstr "Календар"
@@ -6811,6 +6806,115 @@ msgstr "Конекции"
 msgid "Configuration: %s"
 msgstr ""
 
+#: setup/frames/config.inc.php:25 setup/frames/index.inc.php:152
+#: setup/lib/messages.inc.php:45
+msgid "Configuration file"
+msgstr ""
+
+#: setup/frames/config.inc.php:38 setup/frames/index.inc.php:212
+#: setup/lib/messages.inc.php:65
+msgid "Download"
+msgstr ""
+
+#: setup/frames/index.inc.php:58 setup/lib/messages.inc.php:164
+msgid ""
+"You are not using a secure connection; all data (including potentially "
+"sensitive information, like passwords) is transferred unencrypted!"
+msgstr ""
+
+#: setup/frames/index.inc.php:87 setup/frames/menu.inc.php:17
+#: setup/lib/messages.inc.php:219
+msgid "Overview"
+msgstr ""
+
+#: setup/frames/index.inc.php:95 setup/lib/messages.inc.php:337
+msgid "Show hidden messages (#MSG_COUNT)"
+msgstr ""
+
+#: setup/frames/index.inc.php:135 setup/lib/messages.inc.php:213
+msgid "There are no configured servers"
+msgstr ""
+
+#: setup/frames/index.inc.php:143 setup/lib/messages.inc.php:212
+msgid "New server"
+msgstr ""
+
+#: setup/frames/index.inc.php:172 setup/lib/messages.inc.php:50
+msgid "Default language"
+msgstr ""
+
+#: setup/frames/index.inc.php:182 setup/lib/messages.inc.php:187
+msgid "let the user choose"
+msgstr ""
+
+#: setup/frames/index.inc.php:193 setup/lib/messages.inc.php:216
+msgid "- none -"
+msgstr ""
+
+#: setup/frames/index.inc.php:196 setup/lib/messages.inc.php:51
+msgid "Default server"
+msgstr ""
+
+#: setup/frames/index.inc.php:206 setup/lib/messages.inc.php:66
+msgid "End of line"
+msgstr ""
+
+#: setup/frames/index.inc.php:211 setup/lib/messages.inc.php:61
+msgid "Display"
+msgstr ""
+
+#: setup/frames/index.inc.php:215 setup/lib/messages.inc.php:190
+#, fuzzy
+msgid "Load"
+msgstr "Локален"
+
+#: setup/frames/index.inc.php:226 setup/lib/messages.inc.php:152
+#, fuzzy
+msgid "phpMyAdmin homepage"
+msgstr "phpMyAdmin документација"
+
+#: setup/frames/index.inc.php:227 setup/lib/messages.inc.php:64
+msgid "Donate"
+msgstr ""
+
+#: setup/frames/index.inc.php:228 setup/lib/messages.inc.php:370
+msgid "Check for latest version"
+msgstr ""
+
+#: setup/frames/menu.inc.php:18 setup/lib/messages.inc.php:137
+msgid "Features"
+msgstr ""
+
+#: setup/frames/menu.inc.php:19 setup/lib/messages.inc.php:113
+msgid "Navigation frame"
+msgstr ""
+
+#: setup/frames/menu.inc.php:20 setup/lib/messages.inc.php:118
+msgid "Main frame"
+msgstr ""
+
+#: setup/frames/servers.inc.php:28 setup/lib/messages.inc.php:272
+msgid "Edit server"
+msgstr ""
+
+#: setup/frames/servers.inc.php:37 setup/lib/messages.inc.php:241
+#, fuzzy
+msgid "Add a new server"
+msgstr "Додади нов корисник"
+
+#: setup/lib/FormDisplay.tpl.php:182 setup/lib/messages.inc.php:328
+#, php-format
+msgid "Set value: %s"
+msgstr ""
+
+#: setup/lib/FormDisplay.tpl.php:187 setup/lib/messages.inc.php:234
+msgid "Restore default value"
+msgstr ""
+
+#: setup/lib/form_processing.lib.php:43 setup/lib/messages.inc.php:377
+msgid "Warning"
+msgstr ""
+
 #: setup/lib/messages.inc.php:16
 msgid "Allow character set conversion"
 msgstr ""
@@ -6950,10 +7054,6 @@ msgstr ""
 msgid "Compress on the fly"
 msgstr ""
 
-#: setup/lib/messages.inc.php:45
-msgid "Configuration file"
-msgstr ""
-
 #: setup/lib/messages.inc.php:46
 msgid ""
 "Whether a warning ("Are your really sure...") should be displayed "
@@ -6972,14 +7072,6 @@ msgstr ""
 msgid "Default character set"
 msgstr ""
 
-#: setup/lib/messages.inc.php:50
-msgid "Default language"
-msgstr ""
-
-#: setup/lib/messages.inc.php:51
-msgid "Default server"
-msgstr ""
-
 #: setup/lib/messages.inc.php:52
 msgid "Tab that is displayed when entering a database"
 msgstr ""
@@ -7019,10 +7111,6 @@ msgstr ""
 msgid "Display databases as a list"
 msgstr ""
 
-#: setup/lib/messages.inc.php:61
-msgid "Display"
-msgstr ""
-
 #: setup/lib/messages.inc.php:62
 msgid "Show server listing as a list instead of a drop down"
 msgstr ""
@@ -7031,18 +7119,6 @@ msgstr ""
 msgid "Display servers as a list"
 msgstr ""
 
-#: setup/lib/messages.inc.php:64
-msgid "Donate"
-msgstr ""
-
-#: setup/lib/messages.inc.php:65
-msgid "Download"
-msgstr ""
-
-#: setup/lib/messages.inc.php:66
-msgid "End of line"
-msgstr ""
-
 #: setup/lib/messages.inc.php:67
 msgid "Could not connect to MySQL server"
 msgstr ""
@@ -7222,10 +7298,6 @@ msgstr "Опции за извоз на бази на податоци"
 msgid "Customize appearance of the navigation frame"
 msgstr ""
 
-#: setup/lib/messages.inc.php:113
-msgid "Navigation frame"
-msgstr ""
-
 #: setup/lib/messages.inc.php:114
 msgid "Servers display options"
 msgstr ""
@@ -7234,10 +7306,6 @@ msgstr ""
 msgid "Tables display options"
 msgstr ""
 
-#: setup/lib/messages.inc.php:118
-msgid "Main frame"
-msgstr ""
-
 #: setup/lib/messages.inc.php:119
 msgid "Settings that didn't fit enywhere else"
 msgstr ""
@@ -7315,10 +7383,6 @@ msgstr ""
 msgid "Customize export options"
 msgstr "Опции за извоз на бази на податоци"
 
-#: setup/lib/messages.inc.php:137
-msgid "Features"
-msgstr ""
-
 #: setup/lib/messages.inc.php:138
 msgid "Customize import defaults"
 msgstr ""
@@ -7387,11 +7451,6 @@ msgid ""
 "system."
 msgstr ""
 
-#: setup/lib/messages.inc.php:152
-#, fuzzy
-msgid "phpMyAdmin homepage"
-msgstr "phpMyAdmin документација"
-
 #: setup/lib/messages.inc.php:153
 msgid "Extra parameters for iconv"
 msgstr ""
@@ -7435,12 +7494,6 @@ msgstr ""
 msgid "Insecure connection"
 msgstr ""
 
-#: setup/lib/messages.inc.php:164
-msgid ""
-"You are not using a secure connection; all data (including potentially "
-"sensitive information, like passwords) is transferred unencrypted!"
-msgstr ""
-
 #: setup/lib/messages.inc.php:165
 #, php-format
 msgid ""
@@ -7536,10 +7589,6 @@ msgstr ""
 msgid "Enable highlighting"
 msgstr ""
 
-#: setup/lib/messages.inc.php:187
-msgid "let the user choose"
-msgstr ""
-
 #: setup/lib/messages.inc.php:188
 msgid "Use less graphically intense tabs"
 msgstr ""
@@ -7548,11 +7597,6 @@ msgstr ""
 msgid "Light tabs"
 msgstr ""
 
-#: setup/lib/messages.inc.php:190
-#, fuzzy
-msgid "Load"
-msgstr "Локален"
-
 #: setup/lib/messages.inc.php:191
 msgid ""
 "If TRUE, logout deletes cookies for all servers; when set to FALSE, logout "
@@ -7655,14 +7699,6 @@ msgstr ""
 msgid "Iconic navigation bar"
 msgstr ""
 
-#: setup/lib/messages.inc.php:212
-msgid "New server"
-msgstr ""
-
-#: setup/lib/messages.inc.php:213
-msgid "There are no configured servers"
-msgstr ""
-
 #: setup/lib/messages.inc.php:214
 msgid "use GZip output buffering for increased speed in HTTP transfers"
 msgstr ""
@@ -7671,10 +7707,6 @@ msgstr ""
 msgid "GZip output buffering"
 msgstr ""
 
-#: setup/lib/messages.inc.php:216
-msgid "- none -"
-msgstr ""
-
 #: setup/lib/messages.inc.php:217
 msgid ""
 "[kbd]SMART[/kbd] - i.e. descending order for fields of type TIME, DATE, "
@@ -7685,10 +7717,6 @@ msgstr ""
 msgid "Default sorting order"
 msgstr ""
 
-#: setup/lib/messages.inc.php:219
-msgid "Overview"
-msgstr ""
-
 #: setup/lib/messages.inc.php:220
 msgid "Use persistent connections to MySQL databases"
 msgstr ""
@@ -7743,10 +7771,6 @@ msgstr ""
 msgid "Recoding engine"
 msgstr ""
 
-#: setup/lib/messages.inc.php:234
-msgid "Restore default value"
-msgstr ""
-
 #: setup/lib/messages.inc.php:235
 msgid "Try to revert erroneous fields to their default values"
 msgstr ""
@@ -7778,11 +7802,6 @@ msgstr ""
 msgid "You allow for connecting to the server without a password."
 msgstr ""
 
-#: setup/lib/messages.inc.php:241
-#, fuzzy
-msgid "Add a new server"
-msgstr "Додади нов корисник"
-
 #: setup/lib/messages.inc.php:242
 msgid "Leave blank if not used"
 msgstr ""
@@ -7926,10 +7945,6 @@ msgid ""
 "to."
 msgstr ""
 
-#: setup/lib/messages.inc.php:272
-msgid "Edit server"
-msgstr ""
-
 #: setup/lib/messages.inc.php:273
 msgid "What PHP extension to use; you should use mysqli if supported"
 msgstr ""
@@ -8180,11 +8195,6 @@ msgstr ""
 msgid "Verbose name of this server"
 msgstr ""
 
-#: setup/lib/messages.inc.php:328
-#, php-format
-msgid "Set value: %s"
-msgstr ""
-
 #: setup/lib/messages.inc.php:329
 msgid ""
 "Whether a user should be displayed a "show all (records)" button"
@@ -8222,10 +8232,6 @@ msgstr ""
 msgid "Show function fields"
 msgstr ""
 
-#: setup/lib/messages.inc.php:337
-msgid "Show hidden messages (#MSG_COUNT)"
-msgstr ""
-
 #: setup/lib/messages.inc.php:338
 msgid ""
 "Shows link to [a at http://php.net/manual/function.phpinfo.php]phpinfo()[/a] "
@@ -8357,10 +8363,6 @@ msgstr ""
 msgid "Got invalid version string from server"
 msgstr ""
 
-#: setup/lib/messages.inc.php:370
-msgid "Check for latest version"
-msgstr ""
-
 #: setup/lib/messages.inc.php:371
 #, php-format
 msgid ""
@@ -8392,10 +8394,6 @@ msgid ""
 "Neither URL wrapper nor CURL is available. Version check is not possible."
 msgstr ""
 
-#: setup/lib/messages.inc.php:377
-msgid "Warning"
-msgstr ""
-
 #: setup/lib/messages.inc.php:378
 msgid ""
 "Enable [a at http://en.wikipedia.org/wiki/ZIP_(file_format)]ZIP[/a] compression "
diff --git a/po/mn.po b/po/mn.po
index c691a6f..1c63124 100644
--- a/po/mn.po
+++ b/po/mn.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-14 07:48-0400\n"
+"POT-Creation-Date: 2010-05-14 13:39-0400\n"
 "PO-Revision-Date: 2010-03-12 09:17+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: mongolian <mn at li.org>\n"
@@ -932,10 +932,10 @@ msgid ""
 "file and import will resume."
 msgstr ""
 
-#: import.php:426
+#: import.php:426 libraries/messages.inc.php:1102
 msgid ""
 "However on last run no data has been parsed, this usually means phpMyAdmin "
-"won"
+"won't be able to finish this import unless you increase php time limits."
 msgstr ""
 
 #: index.php:190 libraries/messages.inc.php:549
@@ -6209,12 +6209,6 @@ msgstr "Thread-үүд"
 msgid "Thread %s was successfully killed."
 msgstr "Thread %s нь устгагдав."
 
-#: libraries/messages.inc.php:1102
-msgid ""
-"However on last run no data has been parsed, this usually means phpMyAdmin "
-"won't be able to finish this import unless you increase php time limits."
-msgstr ""
-
 #: libraries/messages.inc.php:1105 pmd_pdf.php:94
 msgid "to/from page"
 msgstr "хаанаас/хаашаа хуудас"
@@ -6672,7 +6666,8 @@ msgstr "Байхгүй"
 msgid "Filter"
 msgstr ""
 
-#: navigation.php:319 setup/lib/messages.inc.php:42
+#: navigation.php:319 setup/frames/index.inc.php:218
+#: setup/lib/messages.inc.php:42
 msgid "Clear"
 msgstr ""
 
@@ -6761,6 +6756,112 @@ msgstr "ХИ. давхацсан холболтууд"
 msgid "Configuration: %s"
 msgstr ""
 
+#: setup/frames/config.inc.php:25 setup/frames/index.inc.php:152
+#: setup/lib/messages.inc.php:45
+msgid "Configuration file"
+msgstr ""
+
+#: setup/frames/config.inc.php:38 setup/frames/index.inc.php:212
+#: setup/lib/messages.inc.php:65
+msgid "Download"
+msgstr ""
+
+#: setup/frames/index.inc.php:58 setup/lib/messages.inc.php:164
+msgid ""
+"You are not using a secure connection; all data (including potentially "
+"sensitive information, like passwords) is transferred unencrypted!"
+msgstr ""
+
+#: setup/frames/index.inc.php:87 setup/frames/menu.inc.php:17
+#: setup/lib/messages.inc.php:219
+msgid "Overview"
+msgstr ""
+
+#: setup/frames/index.inc.php:95 setup/lib/messages.inc.php:337
+msgid "Show hidden messages (#MSG_COUNT)"
+msgstr ""
+
+#: setup/frames/index.inc.php:135 setup/lib/messages.inc.php:213
+msgid "There are no configured servers"
+msgstr ""
+
+#: setup/frames/index.inc.php:143 setup/lib/messages.inc.php:212
+msgid "New server"
+msgstr ""
+
+#: setup/frames/index.inc.php:172 setup/lib/messages.inc.php:50
+msgid "Default language"
+msgstr ""
+
+#: setup/frames/index.inc.php:182 setup/lib/messages.inc.php:187
+msgid "let the user choose"
+msgstr ""
+
+#: setup/frames/index.inc.php:193 setup/lib/messages.inc.php:216
+msgid "- none -"
+msgstr ""
+
+#: setup/frames/index.inc.php:196 setup/lib/messages.inc.php:51
+msgid "Default server"
+msgstr ""
+
+#: setup/frames/index.inc.php:206 setup/lib/messages.inc.php:66
+msgid "End of line"
+msgstr ""
+
+#: setup/frames/index.inc.php:211 setup/lib/messages.inc.php:61
+msgid "Display"
+msgstr ""
+
+#: setup/frames/index.inc.php:215 setup/lib/messages.inc.php:190
+msgid "Load"
+msgstr ""
+
+#: setup/frames/index.inc.php:226 setup/lib/messages.inc.php:152
+msgid "phpMyAdmin homepage"
+msgstr ""
+
+#: setup/frames/index.inc.php:227 setup/lib/messages.inc.php:64
+msgid "Donate"
+msgstr ""
+
+#: setup/frames/index.inc.php:228 setup/lib/messages.inc.php:370
+msgid "Check for latest version"
+msgstr ""
+
+#: setup/frames/menu.inc.php:18 setup/lib/messages.inc.php:137
+msgid "Features"
+msgstr ""
+
+#: setup/frames/menu.inc.php:19 setup/lib/messages.inc.php:113
+msgid "Navigation frame"
+msgstr ""
+
+#: setup/frames/menu.inc.php:20 setup/lib/messages.inc.php:118
+msgid "Main frame"
+msgstr ""
+
+#: setup/frames/servers.inc.php:28 setup/lib/messages.inc.php:272
+msgid "Edit server"
+msgstr ""
+
+#: setup/frames/servers.inc.php:37 setup/lib/messages.inc.php:241
+msgid "Add a new server"
+msgstr ""
+
+#: setup/lib/FormDisplay.tpl.php:182 setup/lib/messages.inc.php:328
+#, php-format
+msgid "Set value: %s"
+msgstr ""
+
+#: setup/lib/FormDisplay.tpl.php:187 setup/lib/messages.inc.php:234
+msgid "Restore default value"
+msgstr ""
+
+#: setup/lib/form_processing.lib.php:43 setup/lib/messages.inc.php:377
+msgid "Warning"
+msgstr ""
+
 #: setup/lib/messages.inc.php:16
 msgid "Allow character set conversion"
 msgstr ""
@@ -6899,10 +7000,6 @@ msgstr ""
 msgid "Compress on the fly"
 msgstr ""
 
-#: setup/lib/messages.inc.php:45
-msgid "Configuration file"
-msgstr ""
-
 #: setup/lib/messages.inc.php:46
 msgid ""
 "Whether a warning ("Are your really sure...") should be displayed "
@@ -6921,14 +7018,6 @@ msgstr ""
 msgid "Default character set"
 msgstr ""
 
-#: setup/lib/messages.inc.php:50
-msgid "Default language"
-msgstr ""
-
-#: setup/lib/messages.inc.php:51
-msgid "Default server"
-msgstr ""
-
 #: setup/lib/messages.inc.php:52
 msgid "Tab that is displayed when entering a database"
 msgstr ""
@@ -6967,10 +7056,6 @@ msgstr ""
 msgid "Display databases as a list"
 msgstr ""
 
-#: setup/lib/messages.inc.php:61
-msgid "Display"
-msgstr ""
-
 #: setup/lib/messages.inc.php:62
 msgid "Show server listing as a list instead of a drop down"
 msgstr ""
@@ -6979,18 +7064,6 @@ msgstr ""
 msgid "Display servers as a list"
 msgstr ""
 
-#: setup/lib/messages.inc.php:64
-msgid "Donate"
-msgstr ""
-
-#: setup/lib/messages.inc.php:65
-msgid "Download"
-msgstr ""
-
-#: setup/lib/messages.inc.php:66
-msgid "End of line"
-msgstr ""
-
 #: setup/lib/messages.inc.php:67
 msgid "Could not connect to MySQL server"
 msgstr ""
@@ -7163,10 +7236,6 @@ msgstr ""
 msgid "Customize appearance of the navigation frame"
 msgstr ""
 
-#: setup/lib/messages.inc.php:113
-msgid "Navigation frame"
-msgstr ""
-
 #: setup/lib/messages.inc.php:114
 msgid "Servers display options"
 msgstr ""
@@ -7175,10 +7244,6 @@ msgstr ""
 msgid "Tables display options"
 msgstr ""
 
-#: setup/lib/messages.inc.php:118
-msgid "Main frame"
-msgstr ""
-
 #: setup/lib/messages.inc.php:119
 msgid "Settings that didn't fit enywhere else"
 msgstr ""
@@ -7254,10 +7319,6 @@ msgstr ""
 msgid "Customize export options"
 msgstr ""
 
-#: setup/lib/messages.inc.php:137
-msgid "Features"
-msgstr ""
-
 #: setup/lib/messages.inc.php:138
 msgid "Customize import defaults"
 msgstr ""
@@ -7322,10 +7383,6 @@ msgid ""
 "system."
 msgstr ""
 
-#: setup/lib/messages.inc.php:152
-msgid "phpMyAdmin homepage"
-msgstr ""
-
 #: setup/lib/messages.inc.php:153
 msgid "Extra parameters for iconv"
 msgstr ""
@@ -7369,12 +7426,6 @@ msgstr ""
 msgid "Insecure connection"
 msgstr ""
 
-#: setup/lib/messages.inc.php:164
-msgid ""
-"You are not using a secure connection; all data (including potentially "
-"sensitive information, like passwords) is transferred unencrypted!"
-msgstr ""
-
 #: setup/lib/messages.inc.php:165
 #, php-format
 msgid ""
@@ -7470,10 +7521,6 @@ msgstr ""
 msgid "Enable highlighting"
 msgstr ""
 
-#: setup/lib/messages.inc.php:187
-msgid "let the user choose"
-msgstr ""
-
 #: setup/lib/messages.inc.php:188
 msgid "Use less graphically intense tabs"
 msgstr ""
@@ -7482,10 +7529,6 @@ msgstr ""
 msgid "Light tabs"
 msgstr ""
 
-#: setup/lib/messages.inc.php:190
-msgid "Load"
-msgstr ""
-
 #: setup/lib/messages.inc.php:191
 msgid ""
 "If TRUE, logout deletes cookies for all servers; when set to FALSE, logout "
@@ -7587,14 +7630,6 @@ msgstr ""
 msgid "Iconic navigation bar"
 msgstr ""
 
-#: setup/lib/messages.inc.php:212
-msgid "New server"
-msgstr ""
-
-#: setup/lib/messages.inc.php:213
-msgid "There are no configured servers"
-msgstr ""
-
 #: setup/lib/messages.inc.php:214
 msgid "use GZip output buffering for increased speed in HTTP transfers"
 msgstr ""
@@ -7603,10 +7638,6 @@ msgstr ""
 msgid "GZip output buffering"
 msgstr ""
 
-#: setup/lib/messages.inc.php:216
-msgid "- none -"
-msgstr ""
-
 #: setup/lib/messages.inc.php:217
 msgid ""
 "[kbd]SMART[/kbd] - i.e. descending order for fields of type TIME, DATE, "
@@ -7617,10 +7648,6 @@ msgstr ""
 msgid "Default sorting order"
 msgstr ""
 
-#: setup/lib/messages.inc.php:219
-msgid "Overview"
-msgstr ""
-
 #: setup/lib/messages.inc.php:220
 msgid "Use persistent connections to MySQL databases"
 msgstr ""
@@ -7675,10 +7702,6 @@ msgstr ""
 msgid "Recoding engine"
 msgstr ""
 
-#: setup/lib/messages.inc.php:234
-msgid "Restore default value"
-msgstr ""
-
 #: setup/lib/messages.inc.php:235
 msgid "Try to revert erroneous fields to their default values"
 msgstr ""
@@ -7709,10 +7732,6 @@ msgstr ""
 msgid "You allow for connecting to the server without a password."
 msgstr ""
 
-#: setup/lib/messages.inc.php:241
-msgid "Add a new server"
-msgstr ""
-
 #: setup/lib/messages.inc.php:242
 msgid "Leave blank if not used"
 msgstr ""
@@ -7853,10 +7872,6 @@ msgid ""
 "to."
 msgstr ""
 
-#: setup/lib/messages.inc.php:272
-msgid "Edit server"
-msgstr ""
-
 #: setup/lib/messages.inc.php:273
 msgid "What PHP extension to use; you should use mysqli if supported"
 msgstr ""
@@ -8102,11 +8117,6 @@ msgstr ""
 msgid "Verbose name of this server"
 msgstr ""
 
-#: setup/lib/messages.inc.php:328
-#, php-format
-msgid "Set value: %s"
-msgstr ""
-
 #: setup/lib/messages.inc.php:329
 msgid ""
 "Whether a user should be displayed a "show all (records)" button"
@@ -8143,10 +8153,6 @@ msgstr ""
 msgid "Show function fields"
 msgstr ""
 
-#: setup/lib/messages.inc.php:337
-msgid "Show hidden messages (#MSG_COUNT)"
-msgstr ""
-
 #: setup/lib/messages.inc.php:338
 msgid ""
 "Shows link to [a at http://php.net/manual/function.phpinfo.php]phpinfo()[/a] "
@@ -8275,10 +8281,6 @@ msgstr ""
 msgid "Got invalid version string from server"
 msgstr ""
 
-#: setup/lib/messages.inc.php:370
-msgid "Check for latest version"
-msgstr ""
-
 #: setup/lib/messages.inc.php:371
 #, php-format
 msgid ""
@@ -8310,10 +8312,6 @@ msgid ""
 "Neither URL wrapper nor CURL is available. Version check is not possible."
 msgstr ""
 
-#: setup/lib/messages.inc.php:377
-msgid "Warning"
-msgstr ""
-
 #: setup/lib/messages.inc.php:378
 msgid ""
 "Enable [a at http://en.wikipedia.org/wiki/ZIP_(file_format)]ZIP[/a] compression "
diff --git a/po/ms.po b/po/ms.po
index 9763511..a6cc46e 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-14 07:48-0400\n"
+"POT-Creation-Date: 2010-05-14 13:39-0400\n"
 "PO-Revision-Date: 2010-03-12 09:17+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: malay <ms at li.org>\n"
@@ -941,10 +941,10 @@ msgid ""
 "file and import will resume."
 msgstr ""
 
-#: import.php:426
+#: import.php:426 libraries/messages.inc.php:1102
 msgid ""
 "However on last run no data has been parsed, this usually means phpMyAdmin "
-"won"
+"won't be able to finish this import unless you increase php time limits."
 msgstr ""
 
 #: index.php:190 libraries/messages.inc.php:549
@@ -6178,12 +6178,6 @@ msgstr ""
 msgid "Thread %s was successfully killed."
 msgstr "Bebenang %s telah berjaya dimatikan."
 
-#: libraries/messages.inc.php:1102
-msgid ""
-"However on last run no data has been parsed, this usually means phpMyAdmin "
-"won't be able to finish this import unless you increase php time limits."
-msgstr ""
-
 #: libraries/messages.inc.php:1105 pmd_pdf.php:94
 msgid "to/from page"
 msgstr ""
@@ -6616,7 +6610,8 @@ msgstr "Tiada"
 msgid "Filter"
 msgstr ""
 
-#: navigation.php:319 setup/lib/messages.inc.php:42
+#: navigation.php:319 setup/frames/index.inc.php:218
+#: setup/lib/messages.inc.php:42
 msgid "Clear"
 msgstr ""
 
@@ -6703,6 +6698,115 @@ msgstr "Hubungan"
 msgid "Configuration: %s"
 msgstr ""
 
+#: setup/frames/config.inc.php:25 setup/frames/index.inc.php:152
+#: setup/lib/messages.inc.php:45
+msgid "Configuration file"
+msgstr ""
+
+#: setup/frames/config.inc.php:38 setup/frames/index.inc.php:212
+#: setup/lib/messages.inc.php:65
+msgid "Download"
+msgstr ""
+
+#: setup/frames/index.inc.php:58 setup/lib/messages.inc.php:164
+msgid ""
+"You are not using a secure connection; all data (including potentially "
+"sensitive information, like passwords) is transferred unencrypted!"
+msgstr ""
+
+#: setup/frames/index.inc.php:87 setup/frames/menu.inc.php:17
+#: setup/lib/messages.inc.php:219
+msgid "Overview"
+msgstr ""
+
+#: setup/frames/index.inc.php:95 setup/lib/messages.inc.php:337
+msgid "Show hidden messages (#MSG_COUNT)"
+msgstr ""
+
+#: setup/frames/index.inc.php:135 setup/lib/messages.inc.php:213
+msgid "There are no configured servers"
+msgstr ""
+
+#: setup/frames/index.inc.php:143 setup/lib/messages.inc.php:212
+msgid "New server"
+msgstr ""
+
+#: setup/frames/index.inc.php:172 setup/lib/messages.inc.php:50
+msgid "Default language"
+msgstr ""
+
+#: setup/frames/index.inc.php:182 setup/lib/messages.inc.php:187
+msgid "let the user choose"
+msgstr ""
+
+#: setup/frames/index.inc.php:193 setup/lib/messages.inc.php:216
+msgid "- none -"
+msgstr ""
+
+#: setup/frames/index.inc.php:196 setup/lib/messages.inc.php:51
+msgid "Default server"
+msgstr ""
+
+#: setup/frames/index.inc.php:206 setup/lib/messages.inc.php:66
+msgid "End of line"
+msgstr ""
+
+#: setup/frames/index.inc.php:211 setup/lib/messages.inc.php:61
+msgid "Display"
+msgstr ""
+
+#: setup/frames/index.inc.php:215 setup/lib/messages.inc.php:190
+#, fuzzy
+msgid "Load"
+msgstr "Local"
+
+#: setup/frames/index.inc.php:226 setup/lib/messages.inc.php:152
+#, fuzzy
+msgid "phpMyAdmin homepage"
+msgstr "Dokumentasi phpMyAdmin"
+
+#: setup/frames/index.inc.php:227 setup/lib/messages.inc.php:64
+msgid "Donate"
+msgstr ""
+
+#: setup/frames/index.inc.php:228 setup/lib/messages.inc.php:370
+msgid "Check for latest version"
+msgstr ""
+
+#: setup/frames/menu.inc.php:18 setup/lib/messages.inc.php:137
+msgid "Features"
+msgstr ""
+
+#: setup/frames/menu.inc.php:19 setup/lib/messages.inc.php:113
+msgid "Navigation frame"
+msgstr ""
+
+#: setup/frames/menu.inc.php:20 setup/lib/messages.inc.php:118
+msgid "Main frame"
+msgstr ""
+
+#: setup/frames/servers.inc.php:28 setup/lib/messages.inc.php:272
+msgid "Edit server"
+msgstr ""
+
+#: setup/frames/servers.inc.php:37 setup/lib/messages.inc.php:241
+#, fuzzy
+msgid "Add a new server"
+msgstr "Tambah Pengguna Baru"
+
+#: setup/lib/FormDisplay.tpl.php:182 setup/lib/messages.inc.php:328
+#, php-format
+msgid "Set value: %s"
+msgstr ""
+
+#: setup/lib/FormDisplay.tpl.php:187 setup/lib/messages.inc.php:234
+msgid "Restore default value"
+msgstr ""
+
+#: setup/lib/form_processing.lib.php:43 setup/lib/messages.inc.php:377
+msgid "Warning"
+msgstr ""
+
 #: setup/lib/messages.inc.php:16
 msgid "Allow character set conversion"
 msgstr ""
@@ -6842,10 +6946,6 @@ msgstr ""
 msgid "Compress on the fly"
 msgstr ""
 
-#: setup/lib/messages.inc.php:45
-msgid "Configuration file"
-msgstr ""
-
 #: setup/lib/messages.inc.php:46
 msgid ""
 "Whether a warning ("Are your really sure...") should be displayed "
@@ -6864,14 +6964,6 @@ msgstr ""
 msgid "Default character set"
 msgstr ""
 
-#: setup/lib/messages.inc.php:50
-msgid "Default language"
-msgstr ""
-
-#: setup/lib/messages.inc.php:51
-msgid "Default server"
-msgstr ""
-
 #: setup/lib/messages.inc.php:52
 msgid "Tab that is displayed when entering a database"
 msgstr ""
@@ -6910,10 +7002,6 @@ msgstr ""
 msgid "Display databases as a list"
 msgstr ""
 
-#: setup/lib/messages.inc.php:61
-msgid "Display"
-msgstr ""
-
 #: setup/lib/messages.inc.php:62
 msgid "Show server listing as a list instead of a drop down"
 msgstr ""
@@ -6922,18 +7010,6 @@ msgstr ""
 msgid "Display servers as a list"
 msgstr ""
 
-#: setup/lib/messages.inc.php:64
-msgid "Donate"
-msgstr ""
-
-#: setup/lib/messages.inc.php:65
-msgid "Download"
-msgstr ""
-
-#: setup/lib/messages.inc.php:66
-msgid "End of line"
-msgstr ""
-
 #: setup/lib/messages.inc.php:67
 msgid "Could not connect to MySQL server"
 msgstr ""
@@ -7108,10 +7184,6 @@ msgstr "Statistik pangkalan data"
 msgid "Customize appearance of the navigation frame"
 msgstr ""
 
-#: setup/lib/messages.inc.php:113
-msgid "Navigation frame"
-msgstr ""
-
 #: setup/lib/messages.inc.php:114
 msgid "Servers display options"
 msgstr ""
@@ -7120,10 +7192,6 @@ msgstr ""
 msgid "Tables display options"
 msgstr ""
 
-#: setup/lib/messages.inc.php:118
-msgid "Main frame"
-msgstr ""
-
 #: setup/lib/messages.inc.php:119
 msgid "Settings that didn't fit enywhere else"
 msgstr ""
@@ -7200,10 +7268,6 @@ msgstr ""
 msgid "Customize export options"
 msgstr ""
 
-#: setup/lib/messages.inc.php:137
-msgid "Features"
-msgstr ""
-
 #: setup/lib/messages.inc.php:138
 msgid "Customize import defaults"
 msgstr ""
@@ -7272,11 +7336,6 @@ msgid ""
 "system."
 msgstr ""
 
-#: setup/lib/messages.inc.php:152
-#, fuzzy
-msgid "phpMyAdmin homepage"
-msgstr "Dokumentasi phpMyAdmin"
-
 #: setup/lib/messages.inc.php:153
 msgid "Extra parameters for iconv"
 msgstr ""
@@ -7320,12 +7379,6 @@ msgstr ""
 msgid "Insecure connection"
 msgstr ""
 
-#: setup/lib/messages.inc.php:164
-msgid ""
-"You are not using a secure connection; all data (including potentially "
-"sensitive information, like passwords) is transferred unencrypted!"
-msgstr ""
-
 #: setup/lib/messages.inc.php:165
 #, php-format
 msgid ""
@@ -7421,10 +7474,6 @@ msgstr ""
 msgid "Enable highlighting"
 msgstr ""
 
-#: setup/lib/messages.inc.php:187
-msgid "let the user choose"
-msgstr ""
-
 #: setup/lib/messages.inc.php:188
 msgid "Use less graphically intense tabs"
 msgstr ""
@@ -7433,11 +7482,6 @@ msgstr ""
 msgid "Light tabs"
 msgstr ""
 
-#: setup/lib/messages.inc.php:190
-#, fuzzy
-msgid "Load"
-msgstr "Local"
-
 #: setup/lib/messages.inc.php:191
 msgid ""
 "If TRUE, logout deletes cookies for all servers; when set to FALSE, logout "
@@ -7539,14 +7583,6 @@ msgstr ""
 msgid "Iconic navigation bar"
 msgstr ""
 
-#: setup/lib/messages.inc.php:212
-msgid "New server"
-msgstr ""
-
-#: setup/lib/messages.inc.php:213
-msgid "There are no configured servers"
-msgstr ""
-
 #: setup/lib/messages.inc.php:214
 msgid "use GZip output buffering for increased speed in HTTP transfers"
 msgstr ""
@@ -7555,10 +7591,6 @@ msgstr ""
 msgid "GZip output buffering"
 msgstr ""
 
-#: setup/lib/messages.inc.php:216
-msgid "- none -"
-msgstr ""
-
 #: setup/lib/messages.inc.php:217
 msgid ""
 "[kbd]SMART[/kbd] - i.e. descending order for fields of type TIME, DATE, "
@@ -7569,10 +7601,6 @@ msgstr ""
 msgid "Default sorting order"
 msgstr ""
 
-#: setup/lib/messages.inc.php:219
-msgid "Overview"
-msgstr ""
-
 #: setup/lib/messages.inc.php:220
 msgid "Use persistent connections to MySQL databases"
 msgstr ""
@@ -7627,10 +7655,6 @@ msgstr ""
 msgid "Recoding engine"
 msgstr ""
 
-#: setup/lib/messages.inc.php:234
-msgid "Restore default value"
-msgstr ""
-
 #: setup/lib/messages.inc.php:235
 msgid "Try to revert erroneous fields to their default values"
 msgstr ""
@@ -7661,11 +7685,6 @@ msgstr ""
 msgid "You allow for connecting to the server without a password."
 msgstr ""
 
-#: setup/lib/messages.inc.php:241
-#, fuzzy
-msgid "Add a new server"
-msgstr "Tambah Pengguna Baru"
-
 #: setup/lib/messages.inc.php:242
 msgid "Leave blank if not used"
 msgstr ""
@@ -7808,10 +7827,6 @@ msgid ""
 "to."
 msgstr ""
 
-#: setup/lib/messages.inc.php:272
-msgid "Edit server"
-msgstr ""
-
 #: setup/lib/messages.inc.php:273
 msgid "What PHP extension to use; you should use mysqli if supported"
 msgstr ""
@@ -8061,11 +8076,6 @@ msgstr ""
 msgid "Verbose name of this server"
 msgstr ""
 
-#: setup/lib/messages.inc.php:328
-#, php-format
-msgid "Set value: %s"
-msgstr ""
-
 #: setup/lib/messages.inc.php:329
 msgid ""
 "Whether a user should be displayed a "show all (records)" button"
@@ -8103,10 +8113,6 @@ msgstr ""
 msgid "Show function fields"
 msgstr ""
 
-#: setup/lib/messages.inc.php:337
-msgid "Show hidden messages (#MSG_COUNT)"
-msgstr ""
-
 #: setup/lib/messages.inc.php:338
 msgid ""
 "Shows link to [a at http://php.net/manual/function.phpinfo.php]phpinfo()[/a] "
@@ -8237,10 +8243,6 @@ msgstr ""
 msgid "Got invalid version string from server"
 msgstr ""
 
-#: setup/lib/messages.inc.php:370
-msgid "Check for latest version"
-msgstr ""
-
 #: setup/lib/messages.inc.php:371
 #, php-format
 msgid ""
@@ -8272,10 +8274,6 @@ msgid ""
 "Neither URL wrapper nor CURL is available. Version check is not possible."
 msgstr ""
 
-#: setup/lib/messages.inc.php:377
-msgid "Warning"
-msgstr ""
-
 #: setup/lib/messages.inc.php:378
 msgid ""
 "Enable [a at http://en.wikipedia.org/wiki/ZIP_(file_format)]ZIP[/a] compression "
diff --git a/po/nb.po b/po/nb.po
index 8825b4e..a8d57ff 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-14 07:48-0400\n"
+"POT-Creation-Date: 2010-05-14 13:39-0400\n"
 "PO-Revision-Date: 2010-05-11 08:13+0200\n"
 "Last-Translator:  <sven.erik.andersen at gmail.com>\n"
 "Language-Team: norwegian <no at li.org>\n"
@@ -939,15 +939,10 @@ msgstr ""
 "Skripttidsabrudd passert, hvis du ønsker å fortsette importen kan du "
 "gjennopplaste fila og importeringen vil fortsette."
 
-#: import.php:426
-#, fuzzy
-#| msgid ""
-#| "However on last run no data has been parsed, this usually means "
-#| "phpMyAdmin won't be able to finish this import unless you increase php "
-#| "time limits."
+#: import.php:426 libraries/messages.inc.php:1102
 msgid ""
 "However on last run no data has been parsed, this usually means phpMyAdmin "
-"won"
+"won't be able to finish this import unless you increase php time limits."
 msgstr ""
 "Men under den siste kjøringen så ble ingen data lest, dette betyr vanligvis "
 "at phpMyAdmin ikke vil være istand til å fullføre importeringen uten at du "
@@ -6346,15 +6341,6 @@ msgstr "Tråder"
 msgid "Thread %s was successfully killed."
 msgstr "Tråd %s ble avsluttet med suksess."
 
-#: libraries/messages.inc.php:1102
-msgid ""
-"However on last run no data has been parsed, this usually means phpMyAdmin "
-"won't be able to finish this import unless you increase php time limits."
-msgstr ""
-"Men under den siste kjøringen så ble ingen data lest, dette betyr vanligvis "
-"at phpMyAdmin ikke vil være istand til å fullføre importeringen uten at du "
-"øker php tidsgrensen."
-
 #: libraries/messages.inc.php:1105 pmd_pdf.php:94
 msgid "to/from page"
 msgstr "til/fra side"
@@ -6820,7 +6806,8 @@ msgstr "Ingen"
 msgid "Filter"
 msgstr "Filter"
 
-#: navigation.php:319 setup/lib/messages.inc.php:42
+#: navigation.php:319 setup/frames/index.inc.php:218
+#: setup/lib/messages.inc.php:42
 msgid "Clear"
 msgstr "Fjern"
 
@@ -6903,6 +6890,114 @@ msgstr "Nåværende tilkobling"
 msgid "Configuration: %s"
 msgstr "Konfigurasjon: %s"
 
+#: setup/frames/config.inc.php:25 setup/frames/index.inc.php:152
+#: setup/lib/messages.inc.php:45
+msgid "Configuration file"
+msgstr "Konfigurasjonsfil"
+
+#: setup/frames/config.inc.php:38 setup/frames/index.inc.php:212
+#: setup/lib/messages.inc.php:65
+msgid "Download"
+msgstr "Last ned"
+
+#: setup/frames/index.inc.php:58 setup/lib/messages.inc.php:164
+msgid ""
+"You are not using a secure connection; all data (including potentially "
+"sensitive information, like passwords) is transferred unencrypted!"
+msgstr ""
+"Du bruker ikke en sikker tilkobling, all data (inkludert sensitive, slik som "
+"passorder) blir overført ukryptert!"
+
+#: setup/frames/index.inc.php:87 setup/frames/menu.inc.php:17
+#: setup/lib/messages.inc.php:219
+msgid "Overview"
+msgstr "Oversikt"
+
+#: setup/frames/index.inc.php:95 setup/lib/messages.inc.php:337
+msgid "Show hidden messages (#MSG_COUNT)"
+msgstr "Vis skjulte meldinger (#MSG_COUNT)"
+
+#: setup/frames/index.inc.php:135 setup/lib/messages.inc.php:213
+msgid "There are no configured servers"
+msgstr "Der finnes ingen konfigurerte tjenere"
+
+#: setup/frames/index.inc.php:143 setup/lib/messages.inc.php:212
+msgid "New server"
+msgstr "Ny tjener"
+
+#: setup/frames/index.inc.php:172 setup/lib/messages.inc.php:50
+msgid "Default language"
+msgstr "Standard språk"
+
+#: setup/frames/index.inc.php:182 setup/lib/messages.inc.php:187
+msgid "let the user choose"
+msgstr "la brukeren bestemme"
+
+#: setup/frames/index.inc.php:193 setup/lib/messages.inc.php:216
+msgid "- none -"
+msgstr "- ingen -"
+
+#: setup/frames/index.inc.php:196 setup/lib/messages.inc.php:51
+msgid "Default server"
+msgstr "Standard tjener"
+
+#: setup/frames/index.inc.php:206 setup/lib/messages.inc.php:66
+msgid "End of line"
+msgstr "Linjeslutt"
+
+#: setup/frames/index.inc.php:211 setup/lib/messages.inc.php:61
+msgid "Display"
+msgstr "Vis"
+
+#: setup/frames/index.inc.php:215 setup/lib/messages.inc.php:190
+msgid "Load"
+msgstr "Last"
+
+#: setup/frames/index.inc.php:226 setup/lib/messages.inc.php:152
+msgid "phpMyAdmin homepage"
+msgstr "phpMyAdmin hjemmeside"
+
+#: setup/frames/index.inc.php:227 setup/lib/messages.inc.php:64
+msgid "Donate"
+msgstr "Doner"
+
+#: setup/frames/index.inc.php:228 setup/lib/messages.inc.php:370
+msgid "Check for latest version"
+msgstr "Sjekk for siste versjon"
+
+#: setup/frames/menu.inc.php:18 setup/lib/messages.inc.php:137
+msgid "Features"
+msgstr "Egenskaper"
+
+#: setup/frames/menu.inc.php:19 setup/lib/messages.inc.php:113
+msgid "Navigation frame"
+msgstr "Navigasjonsramme"
+
+#: setup/frames/menu.inc.php:20 setup/lib/messages.inc.php:118
+msgid "Main frame"
+msgstr "Hovedramme"
+
+#: setup/frames/servers.inc.php:28 setup/lib/messages.inc.php:272
+msgid "Edit server"
+msgstr "Rediger tjener"
+
+#: setup/frames/servers.inc.php:37 setup/lib/messages.inc.php:241
+msgid "Add a new server"
+msgstr "Legg til en ny tjener"
+
+#: setup/lib/FormDisplay.tpl.php:182 setup/lib/messages.inc.php:328
+#, php-format
+msgid "Set value: %s"
+msgstr "Sett verdi: %s"
+
+#: setup/lib/FormDisplay.tpl.php:187 setup/lib/messages.inc.php:234
+msgid "Restore default value"
+msgstr "Gjennopprett standard verdi"
+
+#: setup/lib/form_processing.lib.php:43 setup/lib/messages.inc.php:377
+msgid "Warning"
+msgstr "Advarsel"
+
 #: setup/lib/messages.inc.php:16
 msgid "Allow character set conversion"
 msgstr "Tillat karaktertegnsettkonvertering"
@@ -7068,10 +7163,6 @@ msgstr ""
 msgid "Compress on the fly"
 msgstr "Komprimer direkte"
 
-#: setup/lib/messages.inc.php:45
-msgid "Configuration file"
-msgstr "Konfigurasjonsfil"
-
 #: setup/lib/messages.inc.php:46
 msgid ""
 "Whether a warning ("Are your really sure...") should be displayed "
@@ -7092,14 +7183,6 @@ msgstr "Standard karaktertegnsett brukt ved konverteringer"
 msgid "Default character set"
 msgstr "Standard karaktertegnsett"
 
-#: setup/lib/messages.inc.php:50
-msgid "Default language"
-msgstr "Standard språk"
-
-#: setup/lib/messages.inc.php:51
-msgid "Default server"
-msgstr "Standard tjener"
-
 #: setup/lib/messages.inc.php:52
 msgid "Tab that is displayed when entering a database"
 msgstr "Fanen som vises når en database tas i bruk"
@@ -7141,10 +7224,6 @@ msgstr "Vis databaser som en liste istedet for en nedfallsliste"
 msgid "Display databases as a list"
 msgstr "Vis databaser som en liste"
 
-#: setup/lib/messages.inc.php:61
-msgid "Display"
-msgstr "Vis"
-
 #: setup/lib/messages.inc.php:62
 msgid "Show server listing as a list instead of a drop down"
 msgstr "Vis tjenere som en liste istedet for en nedfallsliste"
@@ -7153,18 +7232,6 @@ msgstr "Vis tjenere som en liste istedet for en nedfallsliste"
 msgid "Display servers as a list"
 msgstr "Vis tjenere som en liste"
 
-#: setup/lib/messages.inc.php:64
-msgid "Donate"
-msgstr "Doner"
-
-#: setup/lib/messages.inc.php:65
-msgid "Download"
-msgstr "Last ned"
-
-#: setup/lib/messages.inc.php:66
-msgid "End of line"
-msgstr "Linjeslutt"
-
 #: setup/lib/messages.inc.php:67
 msgid "Could not connect to MySQL server"
 msgstr "Kunne ikke koble til MySQL tjener"
@@ -7343,10 +7410,6 @@ msgstr "Databasevisningsinnstillinger"
 msgid "Customize appearance of the navigation frame"
 msgstr "Endre utseendet til navigasjonsrammen"
 
-#: setup/lib/messages.inc.php:113
-msgid "Navigation frame"
-msgstr "Navigasjonsramme"
-
 #: setup/lib/messages.inc.php:114
 msgid "Servers display options"
 msgstr "Tjenervisningsinnstillinger"
@@ -7355,10 +7418,6 @@ msgstr "Tjenervisningsinnstillinger"
 msgid "Tables display options"
 msgstr "Tabellvisningsinnstillinger"
 
-#: setup/lib/messages.inc.php:118
-msgid "Main frame"
-msgstr "Hovedramme"
-
 #: setup/lib/messages.inc.php:119
 msgid "Settings that didn't fit enywhere else"
 msgstr "Innstillinger som ikke passer andre steder"
@@ -7442,10 +7501,6 @@ msgstr "Tilpasning"
 msgid "Customize export options"
 msgstr "Endre eksportstandarder"
 
-#: setup/lib/messages.inc.php:137
-msgid "Features"
-msgstr "Egenskaper"
-
 #: setup/lib/messages.inc.php:138
 msgid "Customize import defaults"
 msgstr "Endre importstandarder"
@@ -7518,10 +7573,6 @@ msgstr ""
 "dekomprimering[/a] trenger funksjoner (%s) som ikke er tilgjengelig på dette "
 "systemet."
 
-#: setup/lib/messages.inc.php:152
-msgid "phpMyAdmin homepage"
-msgstr "phpMyAdmin hjemmeside"
-
 #: setup/lib/messages.inc.php:153
 msgid "Extra parameters for iconv"
 msgstr "Ekstra parametre for iconv"
@@ -7572,14 +7623,6 @@ msgstr "Delvis import: hopp over spørringer"
 msgid "Insecure connection"
 msgstr "Usikker tilkobling"
 
-#: setup/lib/messages.inc.php:164
-msgid ""
-"You are not using a secure connection; all data (including potentially "
-"sensitive information, like passwords) is transferred unencrypted!"
-msgstr ""
-"Du bruker ikke en sikker tilkobling, all data (inkludert sensitive, slik som "
-"passorder) blir overført ukryptert!"
-
 #: setup/lib/messages.inc.php:165
 #, php-format
 msgid ""
@@ -7681,10 +7724,6 @@ msgstr "Uthev tjener under musmarkøren"
 msgid "Enable highlighting"
 msgstr "Aktiver utheving"
 
-#: setup/lib/messages.inc.php:187
-msgid "let the user choose"
-msgstr "la brukeren bestemme"
-
 #: setup/lib/messages.inc.php:188
 msgid "Use less graphically intense tabs"
 msgstr "Bruk mindre grafisk tunge faner"
@@ -7693,10 +7732,6 @@ msgstr "Bruk mindre grafisk tunge faner"
 msgid "Light tabs"
 msgstr "Hurtigfaner"
 
-#: setup/lib/messages.inc.php:190
-msgid "Load"
-msgstr "Last"
-
 #: setup/lib/messages.inc.php:191
 msgid ""
 "If TRUE, logout deletes cookies for all servers; when set to FALSE, logout "
@@ -7816,14 +7851,6 @@ msgstr "Bruk bare ikoner, bare tekst eller begge deler"
 msgid "Iconic navigation bar"
 msgstr "Ikonnavigasjonsmeny"
 
-#: setup/lib/messages.inc.php:212
-msgid "New server"
-msgstr "Ny tjener"
-
-#: setup/lib/messages.inc.php:213
-msgid "There are no configured servers"
-msgstr "Der finnes ingen konfigurerte tjenere"
-
 #: setup/lib/messages.inc.php:214
 msgid "use GZip output buffering for increased speed in HTTP transfers"
 msgstr "Bruk GZip utbuffring for økt hastighet i HTTP overføringer"
@@ -7832,10 +7859,6 @@ msgstr "Bruk GZip utbuffring for økt hastighet i HTTP overføringer"
 msgid "GZip output buffering"
 msgstr "GZip utbuffring"
 
-#: setup/lib/messages.inc.php:216
-msgid "- none -"
-msgstr "- ingen -"
-
 #: setup/lib/messages.inc.php:217
 msgid ""
 "[kbd]SMART[/kbd] - i.e. descending order for fields of type TIME, DATE, "
@@ -7848,10 +7871,6 @@ msgstr ""
 msgid "Default sorting order"
 msgstr "Standard sorteringsrekkefølge"
 
-#: setup/lib/messages.inc.php:219
-msgid "Overview"
-msgstr "Oversikt"
-
 #: setup/lib/messages.inc.php:220
 msgid "Use persistent connections to MySQL databases"
 msgstr "Bruk vedvarende forbindelser til MySQL databasen"
@@ -7909,10 +7928,6 @@ msgstr ""
 msgid "Recoding engine"
 msgstr "Rekodingsmotor"
 
-#: setup/lib/messages.inc.php:234
-msgid "Restore default value"
-msgstr "Gjennopprett standard verdi"
-
 #: setup/lib/messages.inc.php:235
 msgid "Try to revert erroneous fields to their default values"
 msgstr "Forsøk å reverser felter med feil til standard verdier"
@@ -7948,10 +7963,6 @@ msgstr "Du bør bruke mysqli for bedre ytelse"
 msgid "You allow for connecting to the server without a password."
 msgstr "Du tillater tilkobling til tjeneren uten passord."
 
-#: setup/lib/messages.inc.php:241
-msgid "Add a new server"
-msgstr "Legg til en ny tjener"
-
 #: setup/lib/messages.inc.php:242
 msgid "Leave blank if not used"
 msgstr "La stå tom hvis ikke brukt"
@@ -8110,10 +8121,6 @@ msgstr ""
 "Merk at IP-basert beskyttelse ikke er så god hvis din IP tilhører en "
 "Internettilbyder som har tusenvis av brukere, inkludert deg, tilknyttet."
 
-#: setup/lib/messages.inc.php:272
-msgid "Edit server"
-msgstr "Rediger tjener"
-
 #: setup/lib/messages.inc.php:273
 msgid "What PHP extension to use; you should use mysqli if supported"
 msgstr "Hvilken PHP modul som skal brukes, bruk mysqli hvis støttet"
@@ -8383,11 +8390,6 @@ msgstr ""
 msgid "Verbose name of this server"
 msgstr "Fult navn for denne tjeneren"
 
-#: setup/lib/messages.inc.php:328
-#, php-format
-msgid "Set value: %s"
-msgstr "Sett verdi: %s"
-
 #: setup/lib/messages.inc.php:329
 msgid ""
 "Whether a user should be displayed a "show all (records)" button"
@@ -8427,10 +8429,6 @@ msgstr "Vis funksjonsfelter i rediger/sett inn modus"
 msgid "Show function fields"
 msgstr "Vis funksjonsfelter"
 
-#: setup/lib/messages.inc.php:337
-msgid "Show hidden messages (#MSG_COUNT)"
-msgstr "Vis skjulte meldinger (#MSG_COUNT)"
-
 #: setup/lib/messages.inc.php:338
 msgid ""
 "Shows link to [a at http://php.net/manual/function.phpinfo.php]phpinfo()[/a] "
@@ -8579,10 +8577,6 @@ msgstr ""
 msgid "Got invalid version string from server"
 msgstr "Mottok ugyldig versjonsstreng fra tjeneren"
 
-#: setup/lib/messages.inc.php:370
-msgid "Check for latest version"
-msgstr "Sjekk for siste versjon"
-
 #: setup/lib/messages.inc.php:371
 #, php-format
 msgid ""
@@ -8620,10 +8614,6 @@ msgstr ""
 "Hverken URL wrapper eller CURL er t
ilgjengelig. Versjonskontroll er ikke "
 "mulig."
 
-#: setup/lib/messages.inc.php:377
-msgid "Warning"
-msgstr "Advarsel"
-
 #: setup/lib/messages.inc.php:378
 msgid ""
 "Enable [a at http://en.wikipedia.org/wiki/ZIP_(file_format)]ZIP[/a] compression "
@@ -8681,5 +8671,18 @@ msgctxt "for MIME transformation"
 msgid "Description"
 msgstr "Beskrivelse"
 
+#, fuzzy
+#~| msgid ""
+#~| "However on last run no data has been parsed, this usually means "
+#~| "phpMyAdmin won't be able to finish this import unless you increase php "
+#~| "time limits."
+#~ msgid ""
+#~ "However on last run no data has been parsed, this usually means "
+#~ "phpMyAdmin won"
+#~ msgstr ""
+#~ "Men under den siste kjøringen så ble ingen data lest, dette betyr "
+#~ "vanligvis at phpMyAdmin ikke vil være istand til å fullføre importeringen "
+#~ "uten at du øker php tidsgrensen."
+
 #~ msgid "encoding conversion"
 #~ msgstr "kodingskonvertering"
diff --git a/po/nl.po b/po/nl.po
index 72a8617..e19c1cf 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-14 07:48-0400\n"
+"POT-Creation-Date: 2010-05-14 13:39-0400\n"
 "PO-Revision-Date: 2010-03-26 15:46+0200\n"
 "Last-Translator:  <rink at initfour.nl>\n"
 "Language-Team: dutch <nl at li.org>\n"
@@ -950,15 +950,10 @@ msgstr ""
 "De maximale uitvoertijd is verstreken, indien u de import wil afmaken kunt u "
 "het bestand opnieuw invoeren."
 
-#: import.php:426
-#, fuzzy
-#| msgid ""
-#| "However on last run no data has been parsed, this usually means "
-#| "phpMyAdmin won't be able to finish this import unless you increase php "
-#| "time limits."
+#: import.php:426 libraries/messages.inc.php:1102
 msgid ""
 "However on last run no data has been parsed, this usually means phpMyAdmin "
-"won"
+"won't be able to finish this import unless you increase php time limits."
 msgstr ""
 "Tijdens de laatste poging is er geen vooruitgang geboekt, meestal betekend "
 "dit dat phpMyAdmin dit niet af kan maken tenzij de tijdsrestricties van PHP "
@@ -6476,15 +6471,6 @@ msgstr "Threads"
 msgid "Thread %s was successfully killed."
 msgstr "Thread %s is succesvol afgesloten."
 
-#: libraries/messages.inc.php:1102
-msgid ""
-"However on last run no data has been parsed, this usually means phpMyAdmin "
-"won't be able to finish this import unless you increase php time limits."
-msgstr ""
-"Tijdens de laatste poging is er geen vooruitgang geboekt, meestal betekend "
-"dit dat phpMyAdmin dit niet af kan maken tenzij de tijdsrestricties van PHP "
-"worden versoepeld."
-
 #: libraries/messages.inc.php:1105 pmd_pdf.php:94
 msgid "to/from page"
 msgstr "Van/tot pagina"
@@ -6961,7 +6947,8 @@ msgstr "Geen"
 msgid "Filter"
 msgstr "Filter"
 
-#: navigation.php:319 setup/lib/messages.inc.php:42
+#: navigation.php:319 setup/frames/index.inc.php:218
+#: setup/lib/messages.inc.php:42
 msgid "Clear"
 msgstr "Clear"
 
@@ -7067,6 +7054,115 @@ msgstr "Onveilige verbinding"
 msgid "Configuration: %s"
 msgstr "Configuratiebestand"
 
+#: setup/frames/config.inc.php:25 setup/frames/index.inc.php:152
+#: setup/lib/messages.inc.php:45
+msgid "Configuration file"
+msgstr "Configuratiebestand"
+
+#: setup/frames/config.inc.php:38 setup/frames/index.inc.php:212
+#: setup/lib/messages.inc.php:65
+msgid "Download"
+msgstr "Download"
+
+#: setup/frames/index.inc.php:58 setup/lib/messages.inc.php:164
+msgid ""
+"You are not using a secure connection; all data (including potentially "
+"sensitive information, like passwords) is transferred unencrypted!"
+msgstr ""
+"U gebruikt een verbinding die niet beveiligd is. Alle gegevens (inclusief "
+"potentieel gevoelige informatie zoals wachtwoorden) worden onversleuteld "
+"verzonden!"
+
+#: setup/frames/index.inc.php:87 setup/frames/menu.inc.php:17
+#: setup/lib/messages.inc.php:219
+msgid "Overview"
+msgstr "Overzicht"
+
+#: setup/frames/index.inc.php:95 setup/lib/messages.inc.php:337
+msgid "Show hidden messages (#MSG_COUNT)"
+msgstr "Toon verborgen berichten (#MSG_COUNT)"
+
+#: setup/frames/index.inc.php:135 setup/lib/messages.inc.php:213
+msgid "There are no configured servers"
+msgstr "Er zijn momenteel geen servers geconfigureerd"
+
+#: setup/frames/index.inc.php:143 setup/lib/messages.inc.php:212
+msgid "New server"
+msgstr "Nieuwe server"
+
+#: setup/frames/index.inc.php:172 setup/lib/messages.inc.php:50
+msgid "Default language"
+msgstr "Standaard taal"
+
+#: setup/frames/index.inc.php:182 setup/lib/messages.inc.php:187
+msgid "let the user choose"
+msgstr "laat de gebruiker kiezen"
+
+#: setup/frames/index.inc.php:193 setup/lib/messages.inc.php:216
+msgid "- none -"
+msgstr "- geen -"
+
+#: setup/frames/index.inc.php:196 setup/lib/messages.inc.php:51
+msgid "Default server"
+msgstr "Standaard server"
+
+#: setup/frames/index.inc.php:206 setup/lib/messages.inc.php:66
+msgid "End of line"
+msgstr "Regeleinde"
+
+#: setup/frames/index.inc.php:211 setup/lib/messages.inc.php:61
+msgid "Display"
+msgstr "Toon"
+
+#: setup/frames/index.inc.php:215 setup/lib/messages.inc.php:190
+msgid "Load"
+msgstr "Laden"
+
+#: setup/frames/index.inc.php:226 setup/lib/messages.inc.php:152
+msgid "phpMyAdmin homepage"
+msgstr "phpMyAdmin homepage"
+
+#: setup/frames/index.inc.php:227 setup/lib/messages.inc.php:64
+msgid "Donate"
+msgstr "Doneer"
+
+#: setup/frames/index.inc.php:228 setup/lib/messages.inc.php:370
+msgid "Check for latest version"
+msgstr "Controleer de meest recente versie"
+
+#: setup/frames/menu.inc.php:18 setup/lib/messages.inc.php:137
+msgid "Features"
+msgstr "Opties"
+
+#: setup/frames/menu.inc.php:19 setup/lib/messages.inc.php:113
+msgid "Navigation frame"
+msgstr "Navigatieframe"
+
+#: setup/frames/menu.inc.php:20 setup/lib/messages.inc.php:118
+msgid "Main frame"
+msgstr "Hoofdframe"
+
+#: setup/frames/servers.inc.php:28 setup/lib/messages.inc.php:272
+msgid "Edit server"
+msgstr "Wijzig server"
+
+#: setup/frames/servers.inc.php:37 setup/lib/messages.inc.php:241
+msgid "Add a new server"
+msgstr "Een server toevoegen"
+
+#: setup/lib/FormDisplay.tpl.php:182 setup/lib/messages.inc.php:328
+#, php-format
+msgid "Set value: %s"
+msgstr "Zet waarde op: %s"
+
+#: setup/lib/FormDisplay.tpl.php:187 setup/lib/messages.inc.php:234
+msgid "Restore default value"
+msgstr "Herstel standaard waarde"
+
+#: setup/lib/form_processing.lib.php:43 setup/lib/messages.inc.php:377
+msgid "Warning"
+msgstr "Waarschuwing"
+
 #: setup/lib/messages.inc.php:16
 msgid "Allow character set conversion"
 msgstr "Karakterset converteringen toestaan"
@@ -7237,10 +7333,6 @@ msgstr ""
 msgid "Compress on the fly"
 msgstr "Comprimeer direct"
 
-#: setup/lib/messages.inc.php:45
-msgid "Configuration file"
-msgstr "Configuratiebestand"
-
 #: setup/lib/messages.inc.php:46
 msgid ""
 "Whether a warning ("Are your really sure...") should be displayed "
@@ -7261,14 +7353,6 @@ msgstr "Standaard karakterset gebruikt voor converteringen"
 msgid "Default character set"
 msgstr "Standaard karakterset"
 
-#: setup/lib/messages.inc.php:50
-msgid "Default language"
-msgstr "Standaard taal"
-
-#: setup/lib/messages.inc.php:51
-msgid "Default server"
-msgstr "Standaard server"
-
 #: setup/lib/messages.inc.php:52
 msgid "Tab that is displayed when entering a database"
 msgstr "Het tabblad dat wordt getoond na het openen van een database"
@@ -7307,10 +7391,6 @@ msgstr "Toon een database overzicht als een lijst in plaats van een afrolmenu"
 msgid "Display databases as a list"
 msgstr "Toon databases als een lijst"
 
-#: setup/lib/messages.inc.php:61
-msgid "Display"
-msgstr "Toon"
-
 #: setup/lib/messages.inc.php:62
 msgid "Show server listing as a list instead of a drop down"
 msgstr "Toon een server overzicht als een lijst in plaats van een afrolmenu"
@@ -7319,18 +7399,6 @@ msgstr "Toon een server overzicht als een lijst in plaats van een afrolmenu"
 msgid "Display servers as a list"
 msgstr "Toon servers als een lijst"
 
-#: setup/lib/messages.inc.php:64
-msgid "Donate"
-msgstr "Doneer"
-
-#: setup/lib/messages.inc.php:65
-msgid "Download"
-msgstr "Download"
-
-#: setup/lib/messages.inc.php:66
-msgid "End of line"
-msgstr "Regeleinde"
-
 #: setup/lib/messages.inc.php:67
 msgid "Could not connect to MySQL server"
 msgstr "Er kan geen verbinding worden gemaakt met de server"
@@ -7517,10 +7585,6 @@ msgstr "Weergave opties voor databases"
 msgid "Customize appearance of the navigation frame"
 msgstr "Weergave opties voor het navigatieframe"
 
-#: setup/lib/messages.inc.php:113
-msgid "Navigation frame"
-msgstr "Navigatieframe"
-
 #: setup/lib/messages.inc.php:114
 msgid "Servers display options"
 msgstr "Weergave opties voor servers"
@@ -7529,10 +7593,6 @@ msgstr "Weergave opties voor servers"
 msgid "Tables display options"
 msgstr "Weergave opties voor tabellen"
 
-#: setup/lib/messages.inc.php:118
-msgid "Main frame"
-msgstr "Hoofdframe"
-
 #: setup/lib/messages.inc.php:119
 msgid "Settings that didn't fit enywhere else"
 msgstr "Instellingen die onder geen andere categorie pasten"
@@ -7615,10 +7675,6 @@ msgstr "Aanpassingen"
 msgid "Customize export options"
 msgstr "Aanpassen export opties"
 
-#: setup/lib/messages.inc.php:137
-msgid "Features"
-msgstr "Opties"
-
 #: setup/lib/messages.inc.php:138
 msgid "Customize import defaults"
 msgstr "Aanpassen importeer standaarden"
@@ -7690,10 +7746,6 @@ msgstr ""
 "decompressie[/a] vereisen de functies (%s) welke niet beschikbaar zijn op "
 "dit systeem."
 
-#: setup/lib/messages.inc.php:152
-msgid "phpMyAdmin homepage"
-msgstr "phpMyAdmin homepage"
-
 #: setup/lib/messages.inc.php:153
 msgid "Extra parameters for iconv"
 msgstr "Extra parameters voor iconv"
@@ -7744,15 +7796,6 @@ msgstr "Gedeeltelijke import: queries overslaan"
 msgid "Insecure connection"
 msgstr "Onveilige verbinding"
 
-#: setup/lib/messages.inc.php:164
-msgid ""
-"You are not using a secure connection; all data (including potentially "
-"sensitive information, like passwords) is transferred unencrypted!"
-msgstr ""
-"U gebruikt een verbinding die niet beveiligd is. Alle gegevens (inclusief "
-"potentieel gevoelige informatie zoals wachtwoorden) worden onversleuteld "
-"verzonden!"
-
 #: setup/lib/messages.inc.php:165
 #, php-format
 msgid ""
@@ -7854,10 +7897,6 @@ msgstr "Markeer server onder de muispijl"
 msgid "Enable highlighting"
 msgstr "Markeren inschakelen"
 
-#: setup/lib/messages.inc.php:187
-msgid "let the user choose"
-msgstr "laat de gebruiker kiezen"
-
 #: setup/lib/messages.inc.php:188
 msgid "Use less graphically intense tabs"
 msgstr "Gebruik grafisch minder intensieve tabbladen"
@@ -7866,10 +7905,6 @@ msgstr "Gebruik grafisch minder intensieve tabbladen"
 msgid "Light tabs"
 msgstr "Lichte tabbladen"
 
-#: setup/lib/messages.inc.php:190
-msgid "Load"
-msgstr "Laden"
-
 #: setup/lib/messages.inc.php:191
 msgid ""
 "If TRUE, logout deletes cookies for all servers; when set to FALSE, logout "
@@ -7993,14 +8028,6 @@ msgstr "Gebruik enkel iconen, enkel tekst of beide"
 msgid "Iconic navigation bar"
 msgstr "Icoon gebruik in navigatie balk"
 
-#: setup/lib/messages.inc.php:212
-msgid "New server"
-msgstr "Nieuwe server"
-
-#: setup/lib/messages.inc.php:213
-msgid "There are no configured servers"
-msgstr "Er zijn momenteel geen servers geconfigureerd"
-
 #: setup/lib/messages.inc.php:214
 msgid "use GZip output buffering for increased speed in HTTP transfers"
 msgstr "gebruik GZip uitvoer buffering voor het versnellen van HTTP verkeer"
@@ -8009,10 +8036,6 @@ msgstr "gebruik GZip uitvoer buffering voor het versnellen van HTTP verkeer"
 msgid "GZip output buffering"
 msgstr "GZip uitvoer buffering"
 
-#: setup/lib/messages.inc.php:216
-msgid "- none -"
-msgstr "- geen -"
-
 #: setup/lib/messages.inc.php:217
 msgid ""
 "[kbd]SMART[/kbd] - i.e. descending order for fields of type TIME, DATE, "
@@ -8025,10 +8048,6 @@ msgstr ""
 msgid "Default sorting order"
 msgstr "Standaard sorteer volgorde"
 
-#: setup/lib/messages.inc.php:219
-msgid "Overview"
-msgstr "Overzicht"
-
 #: setup/lib/messages.inc.php:220
 msgid "Use persistent connections to MySQL databases"
 msgstr "Gebruik persistente connecties voor MySQL databases"
@@ -8088,10 +8107,6 @@ msgstr ""
 msgid "Recoding engine"
 msgstr "Hercoderings engine"
 
-#: setup/lib/messages.inc.php:234
-msgid "Restore default value"
-msgstr "Herstel standaard waarde"
-
 #: setup/lib/messages.inc.php:235
 msgid "Try to revert erroneous fields to their default values"
 msgstr ""
@@ -8131,10 +8146,6 @@ msgstr ""
 "U staat het toe dat een gebruiker die geen wachtwoord heeft ingesteld kan "
 "inloggen"
 
-#: setup/lib/messages.inc.php:241
-msgid "Add a new server"
-msgstr "Een server toevoegen"
-
 #: setup/lib/messages.inc.php:242
 msgid "Leave blank if not used"
 msgstr "Laat dit veld leeg indien u het niet wenst te gebruiken"
@@ -8294,10 +8305,6 @@ msgstr ""
 "betrouwbaar wanneer uw IP-adres uit het netwerk van uw provider komt, waar "
 "ook vele andere klanten gebruik van maken."
 
-#: setup/lib/messages.inc.php:272
-msgid "Edit server"
-msgstr "Wijzig server"
-
 #: setup/lib/messages.inc.php:273
 msgid "What PHP extension to use; you should use mysqli if supported"
 msgstr ""
@@ -8585,11 +8592,6 @@ msgstr ""
 msgid "Verbose name of this server"
 msgstr "Uitgebreide naam voor deze server"
 
-#: setup/lib/messages.inc.php:328
-#, php-format
-msgid "Set value: %s"
-msgstr "Zet waarde op: %s"
-
 #: setup/lib/messages.inc.php:329
 msgid ""
 "Whether a user should be displayed a "show all (records)" button"
@@ -8630,10 +8632,6 @@ msgstr "Toon de functie velden tijdens het wijzigen/invoegen"
 msgid "Show function fields"
 msgstr "Toon functie velden"
 
-#: setup/lib/messages.inc.php:337
-msgid "Show hidden messages (#MSG_COUNT)"
-msgstr "Toon verborgen berichten (#MSG_COUNT)"
-
 #: setup/lib/messages.inc.php:338
 msgid ""
 "Shows link to [a at http://php.net/manual/function.phpinfo.php]phpinfo()[/a] "
@@ -8787,10 +8785,6 @@ msgstr ""
 msgid "Got invalid version string from server"
 msgstr "Een ongeldige versiecode was ontvangen van de server"
 
-#: setup/lib/messages.inc.php:370
-msgid "Check for latest version"
-msgstr "Controleer de meest recente versie"
-
 #: setup/lib/messages.inc.php:371
 #, php-format
 msgid ""
@@ -8831,10 +8825,6 @@ msgstr ""
 "Zowel de URL-wrapper als CURL zijn niet aanwezig. Versie controle is niet "
 "mogelijk."
 
-#: setup/lib/messages.inc.php:377
-msgid "Warning"
-msgstr "Waarschuwing"
-
 #: setup/lib/messages.inc.php:378
 msgid ""
 "Enable [a at http://en.wikipedia.org/wiki/ZIP_(file_format)]ZIP[/a] compression "
@@ -8904,6 +8894,19 @@ msgid "Description"
 msgstr "Beschrijving"
 
 #, fuzzy
+#~| msgid ""
+#~| "However on last run no data has been parsed, this usually means "
+#~| "phpMyAdmin won't be able to finish this import unless you increase php "
+#~| "time limits."
+#~ msgid ""
+#~ "However on last run no data has been parsed, this usually means "
+#~ "phpMyAdmin won"
+#~ msgstr ""
+#~ "Tijdens de laatste poging is er geen vooruitgang geboekt, meestal "
+#~ "betekend dit dat phpMyAdmin dit niet af kan maken tenzij de "
+#~ "tijdsrestricties van PHP worden versoepeld."
+
+#, fuzzy
 #~| msgid "None"
 #~ msgctxt "None action"
 #~ msgid "None"
diff --git a/po/phpmyadmin.pot b/po/phpmyadmin.pot
index 5f8eb9d..f68dc74 100644
--- 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 at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-14 07:48-0400\n"
+"POT-Creation-Date: 2010-05-14 13:39-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -926,10 +926,10 @@ msgid ""
 "file and import will resume."
 msgstr ""
 
-#: import.php:426
+#: import.php:426 libraries/messages.inc.php:1102
 msgid ""
 "However on last run no data has been parsed, this usually means phpMyAdmin "
-"won"
+"won't be able to finish this import unless you increase php time limits."
 msgstr ""
 
 #: index.php:190 libraries/messages.inc.php:549
@@ -5996,12 +5996,6 @@ msgstr ""
 msgid "Thread %s was successfully killed."
 msgstr ""
 
-#: libraries/messages.inc.php:1102
-msgid ""
-"However on last run no data has been parsed, this usually means phpMyAdmin "
-"won't be able to finish this import unless you increase php time limits."
-msgstr ""
-
 #: libraries/messages.inc.php:1105 pmd_pdf.php:94
 msgid "to/from page"
 msgstr ""
@@ -6425,7 +6419,8 @@ msgstr ""
 msgid "Filter"
 msgstr ""
 
-#: navigation.php:319 setup/lib/messages.inc.php:42
+#: navigation.php:319 setup/frames/index.inc.php:218
+#: setup/lib/messages.inc.php:42
 msgid "Clear"
 msgstr ""
 
@@ -6500,6 +6495,112 @@ msgstr ""
 msgid "Configuration: %s"
 msgstr ""
 
+#: setup/frames/config.inc.php:25 setup/frames/index.inc.php:152
+#: setup/lib/messages.inc.php:45
+msgid "Configuration file"
+msgstr ""
+
+#: setup/frames/config.inc.php:38 setup/frames/index.inc.php:212
+#: setup/lib/messages.inc.php:65
+msgid "Download"
+msgstr ""
+
+#: setup/frames/index.inc.php:58 setup/lib/messages.inc.php:164
+msgid ""
+"You are not using a secure connection; all data (including potentially "
+"sensitive information, like passwords) is transferred unencrypted!"
+msgstr ""
+
+#: setup/frames/index.inc.php:87 setup/frames/menu.inc.php:17
+#: setup/lib/messages.inc.php:219
+msgid "Overview"
+msgstr ""
+
+#: setup/frames/index.inc.php:95 setup/lib/messages.inc.php:337
+msgid "Show hidden messages (#MSG_COUNT)"
+msgstr ""
+
+#: setup/frames/index.inc.php:135 setup/lib/messages.inc.php:213
+msgid "There are no configured servers"
+msgstr ""
+
+#: setup/frames/index.inc.php:143 setup/lib/messages.inc.php:212
+msgid "New server"
+msgstr ""
+
+#: setup/frames/index.inc.php:172 setup/lib/messages.inc.php:50
+msgid "Default language"
+msgstr ""
+
+#: setup/frames/index.inc.php:182 setup/lib/messages.inc.php:187
+msgid "let the user choose"
+msgstr ""
+
+#: setup/frames/index.inc.php:193 setup/lib/messages.inc.php:216
+msgid "- none -"
+msgstr ""
+
+#: setup/frames/index.inc.php:196 setup/lib/messages.inc.php:51
+msgid "Default server"
+msgstr ""
+
+#: setup/frames/index.inc.php:206 setup/lib/messages.inc.php:66
+msgid "End of line"
+msgstr ""
+
+#: setup/frames/index.inc.php:211 setup/lib/messages.inc.php:61
+msgid "Display"
+msgstr ""
+
+#: setup/frames/index.inc.php:215 setup/lib/messages.inc.php:190
+msgid "Load"
+msgstr ""
+
+#: setup/frames/index.inc.php:226 setup/lib/messages.inc.php:152
+msgid "phpMyAdmin homepage"
+msgstr ""
+
+#: setup/frames/index.inc.php:227 setup/lib/messages.inc.php:64
+msgid "Donate"
+msgstr ""
+
+#: setup/frames/index.inc.php:228 setup/lib/messages.inc.php:370
+msgid "Check for latest version"
+msgstr ""
+
+#: setup/frames/menu.inc.php:18 setup/lib/messages.inc.php:137
+msgid "Features"
+msgstr ""
+
+#: setup/frames/menu.inc.php:19 setup/lib/messages.inc.php:113
+msgid "Navigation frame"
+msgstr ""
+
+#: setup/frames/menu.inc.php:20 setup/lib/messages.inc.php:118
+msgid "Main frame"
+msgstr ""
+
+#: setup/frames/servers.inc.php:28 setup/lib/messages.inc.php:272
+msgid "Edit server"
+msgstr ""
+
+#: setup/frames/servers.inc.php:37 setup/lib/messages.inc.php:241
+msgid "Add a new server"
+msgstr ""
+
+#: setup/lib/FormDisplay.tpl.php:182 setup/lib/messages.inc.php:328
+#, possible-php-format
+msgid "Set value: %s"
+msgstr ""
+
+#: setup/lib/FormDisplay.tpl.php:187 setup/lib/messages.inc.php:234
+msgid "Restore default value"
+msgstr ""
+
+#: setup/lib/form_processing.lib.php:43 setup/lib/messages.inc.php:377
+msgid "Warning"
+msgstr ""
+
 #: setup/lib/messages.inc.php:16
 msgid "Allow character set conversion"
 msgstr ""
@@ -6638,10 +6739,6 @@ msgstr ""
 msgid "Compress on the fly"
 msgstr ""
 
-#: setup/lib/messages.inc.php:45
-msgid "Configuration file"
-msgstr ""
-
 #: setup/lib/messages.inc.php:46
 msgid ""
 "Whether a warning ("Are your really sure...") should be displayed "
@@ -6660,14 +6757,6 @@ msgstr ""
 msgid "Default character set"
 msgstr ""
 
-#: setup/lib/messages.inc.php:50
-msgid "Default language"
-msgstr ""
-
-#: setup/lib/messages.inc.php:51
-msgid "Default server"
-msgstr ""
-
 #: setup/lib/messages.inc.php:52
 msgid "Tab that is displayed when entering a database"
 msgstr ""
@@ -6706,10 +6795,6 @@ msgstr ""
 msgid "Display databases as a list"
 msgstr ""
 
-#: setup/lib/messages.inc.php:61
-msgid "Display"
-msgstr ""
-
 #: setup/lib/messages.inc.php:62
 msgid "Show server listing as a list instead of a drop down"
 msgstr ""
@@ -6718,18 +6803,6 @@ msgstr ""
 msgid "Display servers as a list"
 msgstr ""
 
-#: setup/lib/messages.inc.php:64
-msgid "Donate"
-msgstr ""
-
-#: setup/lib/messages.inc.php:65
-msgid "Download"
-msgstr ""
-
-#: setup/lib/messages.inc.php:66
-msgid "End of line"
-msgstr ""
-
 #: setup/lib/messages.inc.php:67
 msgid "Could not connect to MySQL server"
 msgstr ""
@@ -6902,10 +6975,6 @@ msgstr ""
 msgid "Customize appearance of the navigation frame"
 msgstr ""
 
-#: setup/lib/messages.inc.php:113
-msgid "Navigation frame"
-msgstr ""
-
 #: setup/lib/messages.inc.php:114
 msgid "Servers display options"
 msgstr ""
@@ -6914,10 +6983,6 @@ msgstr ""
 msgid "Tables display options"
 msgstr ""
 
-#: setup/lib/messages.inc.php:118
-msgid "Main frame"
-msgstr ""
-
 #: setup/lib/messages.inc.php:119
 msgid "Settings that didn't fit enywhere else"
 msgstr ""
@@ -6993,10 +7058,6 @@ msgstr ""
 msgid "Customize export options"
 msgstr ""
 
-#: setup/lib/messages.inc.php:137
-msgid "Features"
-msgstr ""
-
 #: setup/lib/messages.inc.php:138
 msgid "Customize import defaults"
 msgstr ""
@@ -7061,10 +7122,6 @@ msgid ""
 "system."
 msgstr ""
 
-#: setup/lib/messages.inc.php:152
-msgid "phpMyAdmin homepage"
-msgstr ""
-
 #: setup/lib/messages.inc.php:153
 msgid "Extra parameters for iconv"
 msgstr ""
@@ -7108,12 +7165,6 @@ msgstr ""
 msgid "Insecure connection"
 msgstr ""
 
-#: setup/lib/messages.inc.php:164
-msgid ""
-"You are not using a secure connection; all data (including potentially "
-"sensitive information, like passwords) is transferred unencrypted!"
-msgstr ""
-
 #: setup/lib/messages.inc.php:165
 #, possible-php-format
 msgid ""
@@ -7209,10 +7260,6 @@ msgstr ""
 msgid "Enable highlighting"
 msgstr ""
 
-#: setup/lib/messages.inc.php:187
-msgid "let the user choose"
-msgstr ""
-
 #: setup/lib/messages.inc.php:188
 msgid "Use less graphically intense tabs"
 msgstr ""
@@ -7221,10 +7268,6 @@ msgstr ""
 msgid "Light tabs"
 msgstr ""
 
-#: setup/lib/messages.inc.php:190
-msgid "Load"
-msgstr ""
-
 #: setup/lib/messages.inc.php:191
 msgid ""
 "If TRUE, logout deletes cookies for all servers; when set to FALSE, logout "
@@ -7326,14 +7369,6 @@ msgstr ""
 msgid "Iconic navigation bar"
 msgstr ""
 
-#: setup/lib/messages.inc.php:212
-msgid "New server"
-msgstr ""
-
-#: setup/lib/messages.inc.php:213
-msgid "There are no configured servers"
-msgstr ""
-
 #: setup/lib/messages.inc.php:214
 msgid "use GZip output buffering for increased speed in HTTP transfers"
 msgstr ""
@@ -7342,10 +7377,6 @@ msgstr ""
 msgid "GZip output buffering"
 msgstr ""
 
-#: setup/lib/messages.inc.php:216
-msgid "- none -"
-msgstr ""
-
 #: setup/lib/messages.inc.php:217
 msgid ""
 "[kbd]SMART[/kbd] - i.e. descending order for fields of type TIME, DATE, "
@@ -7356,10 +7387,6 @@ msgstr ""
 msgid "Default sorting order"
 msgstr ""
 
-#: setup/lib/messages.inc.php:219
-msgid "Overview"
-msgstr ""
-
 #: setup/lib/messages.inc.php:220
 msgid "Use persistent connections to MySQL databases"
 msgstr ""
@@ -7414,10 +7441,6 @@ msgstr ""
 msgid "Recoding engine"
 msgstr ""
 
-#: setup/lib/messages.inc.php:234
-msgid "Restore default value"
-msgstr ""
-
 #: setup/lib/messages.inc.php:235
 msgid "Try to revert erroneous fields to their default values"
 msgstr ""
@@ -7448,10 +7471,6 @@ msgstr ""
 msgid "You allow for connecting to the server without a password."
 msgstr ""
 
-#: setup/lib/messages.inc.php:241
-msgid "Add a new server"
-msgstr ""
-
 #: setup/lib/messages.inc.php:242
 msgid "Leave blank if not used"
 msgstr ""
@@ -7592,10 +7611,6 @@ msgid ""
 "to."
 msgstr ""
 
-#: setup/lib/messages.inc.php:272
-msgid "Edit server"
-msgstr ""
-
 #: setup/lib/messages.inc.php:273
 msgid "What PHP extension to use; you should use mysqli if supported"
 msgstr ""
@@ -7837,11 +7852,6 @@ msgstr ""
 msgid "Verbose name of this server"
 msgstr ""
 
-#: setup/lib/messages.inc.php:328
-#, possible-php-format
-msgid "Set value: %s"
-msgstr ""
-
 #: setup/lib/messages.inc.php:329
 msgid ""
 "Whether a user should be displayed a "show all (records)" button"
@@ -7878,10 +7888,6 @@ msgstr ""
 msgid "Show function fields"
 msgstr ""
 
-#: setup/lib/messages.inc.php:337
-msgid "Show hidden messages (#MSG_COUNT)"
-msgstr ""
-
 #: setup/lib/messages.inc.php:338
 msgid ""
 "Shows link to [a at http://php.net/manual/function.phpinfo.php]phpinfo()[/a] "
@@ -8010,10 +8016,6 @@ msgstr ""
 msgid "Got invalid version string from server"
 msgstr ""
 
-#: setup/lib/messages.inc.php:370
-msgid "Check for latest version"
-msgstr ""
-
 #: setup/lib/messages.inc.php:371
 #, possible-php-format
 msgid ""
@@ -8045,10 +8047,6 @@ msgid ""
 "Neither URL wrapper nor CURL is available. Version check is not possible."
 msgstr ""
 
-#: setup/lib/messages.inc.php:377
-msgid "Warning"
-msgstr ""
-
 #: setup/lib/messages.inc.php:378
 msgid ""
 "Enable [a at http://en.wikipedia.org/wiki/ZIP_(file_format)]ZIP[/a] compression "
diff --git a/po/pl.po b/po/pl.po
index 8057c95..e860cd2 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-14 07:48-0400\n"
+"POT-Creation-Date: 2010-05-14 13:39-0400\n"
 "PO-Revision-Date: 2010-03-12 09:17+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: polish <pl at li.org>\n"
@@ -953,15 +953,10 @@ msgstr ""
 "Limit czasu wykonania skryptu minął; aby ukończyć import, proszę przedłożyć "
 "ten sam plik a import zostanie wznowiony."
 
-#: import.php:426
-#, fuzzy
-#| msgid ""
-#| "However on last run no data has been parsed, this usually means "
-#| "phpMyAdmin won't be able to finish this import unless you increase php "
-#| "time limits."
+#: import.php:426 libraries/messages.inc.php:1102
 msgid ""
 "However on last run no data has been parsed, this usually means phpMyAdmin "
-"won"
+"won't be able to finish this import unless you increase php time limits."
 msgstr ""
 "Jednakże, podczas ostatniego uruchomienia nie zostały przetworzone żadne "
 "dane, co zwykle oznacza, że phpMyAdmin nie będzie w stanie ukończyć tego "
@@ -6424,15 +6419,6 @@ msgstr "Wątki"
 msgid "Thread %s was successfully killed."
 msgstr "Wątek %s został pomyślnie unicestwiony."
 
-#: libraries/messages.inc.php:1102
-msgid ""
-"However on last run no data has been parsed, this usually means phpMyAdmin "
-"won't be able to finish this import unless you increase php time limits."
-msgstr ""
-"Jednakże, podczas ostatniego uruchomienia nie zostały przetworzone żadne "
-"dane, co zwykle oznacza, że phpMyAdmin nie będzie w stanie ukończyć tego "
-"importu bez zwiększenia limitów czasowych PHP."
-
 #: libraries/messages.inc.php:1105 pmd_pdf.php:94
 msgid "to/from page"
 msgstr "od/do strony"
@@ -6907,7 +6893,8 @@ msgstr "Brak"
 msgid "Filter"
 msgstr "Pliki"
 
-#: navigation.php:319 setup/lib/messages.inc.php:42
+#: navigation.php:319 setup/frames/index.inc.php:218
+#: setup/lib/messages.inc.php:42
 msgid "Clear"
 msgstr "Wyczyść"
 
@@ -6998,6 +6985,114 @@ msgstr "Niezabezpieczone połączenie"
 msgid "Configuration: %s"
 msgstr "Konfiguracja"
 
+#: setup/frames/config.inc.php:25 setup/frames/index.inc.php:152
+#: setup/lib/messages.inc.php:45
+msgid "Configuration file"
+msgstr "Plik konfiguracyjny"
+
+#: setup/frames/config.inc.php:38 setup/frames/index.inc.php:212
+#: setup/lib/messages.inc.php:65
+msgid "Download"
+msgstr "Ściągnij"
+
+#: setup/frames/index.inc.php:58 setup/lib/messages.inc.php:164
+msgid ""
+"You are not using a secure connection; all data (including potentially "
+"sensitive information, like passwords) is transferred unencrypted!"
+msgstr ""
+"W przypadku używania niezabezpieczonego połączenia, wszystkie dane (w tym "
+"niejawne, jak hasło) są przesyłanie w formie niezaszyfrowanej!"
+
+#: setup/frames/index.inc.php:87 setup/frames/menu.inc.php:17
+#: setup/lib/messages.inc.php:219
+msgid "Overview"
+msgstr "Opcje podstawowe"
+
+#: setup/frames/index.inc.php:95 setup/lib/messages.inc.php:337
+msgid "Show hidden messages (#MSG_COUNT)"
+msgstr "Pokaż ukryte wiadomości (#MSG_COUNT)"
+
+#: setup/frames/index.inc.php:135 setup/lib/messages.inc.php:213
+msgid "There are no configured servers"
+msgstr "Brak skonfigurowanych serwerów"
+
+#: setup/frames/index.inc.php:143 setup/lib/messages.inc.php:212
+msgid "New server"
+msgstr "Nowy serwer"
+
+#: setup/frames/index.inc.php:172 setup/lib/messages.inc.php:50
+msgid "Default language"
+msgstr "Domyślny język"
+
+#: setup/frames/index.inc.php:182 setup/lib/messages.inc.php:187
+msgid "let the user choose"
+msgstr "wybór pozostawiony użytkownikowi"
+
+#: setup/frames/index.inc.php:193 setup/lib/messages.inc.php:216
+msgid "- none -"
+msgstr "- brak -"
+
+#: setup/frames/index.inc.php:196 setup/lib/messages.inc.php:51
+msgid "Default server"
+msgstr "Domyślny serwer"
+
+#: setup/frames/index.inc.php:206 setup/lib/messages.inc.php:66
+msgid "End of line"
+msgstr "Koniec linii"
+
+#: setup/frames/index.inc.php:211 setup/lib/messages.inc.php:61
+msgid "Display"
+msgstr "Pokaż"
+
+#: setup/frames/index.inc.php:215 setup/lib/messages.inc.php:190
+msgid "Load"
+msgstr "Załaduj"
+
+#: setup/frames/index.inc.php:226 setup/lib/messages.inc.php:152
+msgid "phpMyAdmin homepage"
+msgstr "Strona główna phpMyAdmina"
+
+#: setup/frames/index.inc.php:227 setup/lib/messages.inc.php:64
+msgid "Donate"
+msgstr "Przekazanie darowizny"
+
+#: setup/frames/index.inc.php:228 setup/lib/messages.inc.php:370
+msgid "Check for latest version"
+msgstr "Sprawdź, czy jest nowsza wersja"
+
+#: setup/frames/menu.inc.php:18 setup/lib/messages.inc.php:137
+msgid "Features"
+msgstr "Funkcje"
+
+#: setup/frames/menu.inc.php:19 setup/lib/messages.inc.php:113
+msgid "Navigation frame"
+msgstr "Ramka nawigacji"
+
+#: setup/frames/menu.inc.php:20 setup/lib/messages.inc.php:118
+msgid "Main frame"
+msgstr "Główna ramka"
+
+#: setup/frames/servers.inc.php:28 setup/lib/messages.inc.php:272
+msgid "Edit server"
+msgstr "Edytuj serwer"
+
+#: setup/frames/servers.inc.php:37 setup/lib/messages.inc.php:241
+msgid "Add a new server"
+msgstr "Dodaj nowy serwer"
+
+#: setup/lib/FormDisplay.tpl.php:182 setup/lib/messages.inc.php:328
+#, php-format
+msgid "Set value: %s"
+msgstr "Ustaw wartość: %s"
+
+#: setup/lib/FormDisplay.tpl.php:187 setup/lib/messages.inc.php:234
+msgid "Restore default value"
+msgstr "Przywróć wartość domyślną"
+
+#: setup/lib/form_processing.lib.php:43 setup/lib/messages.inc.php:377
+msgid "Warning"
+msgstr "Ostrzeżenie"
+
 #: setup/lib/messages.inc.php:16
 msgid "Allow character set conversion"
 msgstr "Pozwalaj na konwersję kodowania napisów"
@@ -7160,10 +7255,6 @@ msgstr ""
 msgid "Compress on the fly"
 msgstr "Kompresuj w locie"
 
-#: setup/lib/messages.inc.php:45
-msgid "Configuration file"
-msgstr "Plik konfiguracyjny"
-
 #: setup/lib/messages.inc.php:46
 msgid ""
 "Whether a warning ("Are your really sure...") should be displayed "
@@ -7184,14 +7275,6 @@ msgstr "Domyślne kodowanie napisów używane przy konwersjach"
 msgid "Default character set"
 msgstr "Domyślne kodowanie napisów"
 
-#: setup/lib/messages.inc.php:50
-msgid "Default language"
-msgstr "Domyślny język"
-
-#: setup/lib/messages.inc.php:51
-msgid "Default server"
-msgstr "Domyślny serwer"
-
 #: setup/lib/messages.inc.php:52
 msgid "Tab that is displayed when entering a database"
 msgstr ""
@@ -7235,10 +7318,6 @@ msgstr ""
 msgid "Display databases as a list"
 msgstr ""
 
-#: setup/lib/messages.inc.php:61
-msgid "Display"
-msgstr "Pokaż"
-
 #: setup/lib/messages.inc.php:62
 msgid "Show server listing as a list instead of a drop down"
 msgstr ""
@@ -7247,18 +7326,6 @@ msgstr ""
 msgid "Display servers as a list"
 msgstr ""
 
-#: setup/lib/messages.inc.php:64
-msgid "Donate"
-msgstr "Przekazanie darowizny"
-
-#: setup/lib/messages.inc.php:65
-msgid "Download"
-msgstr "Ściągnij"
-
-#: setup/lib/messages.inc.php:66
-msgid "End of line"
-msgstr "Koniec linii"
-
 #: setup/lib/messages.inc.php:67
 msgid "Could not connect to MySQL server"
 msgstr "Nie można połączyć się z serwerem MySQL"
@@ -7442,10 +7509,6 @@ msgstr "Opcje eksportu bazy danych"
 msgid "Customize appearance of the navigation frame"
 msgstr ""
 
-#: setup/lib/messages.inc.php:113
-msgid "Navigation frame"
-msgstr "Ramka nawigacji"
-
 #: setup/lib/messages.inc.php:114
 #, fuzzy
 msgid "Servers display options"
@@ -7456,10 +7519,6 @@ msgstr "Opcje eksportu bazy danych"
 msgid "Tables display options"
 msgstr "Opcje eksportu bazy danych"
 
-#: setup/lib/messages.inc.php:118
-msgid "Main frame"
-msgstr "Główna ramka"
-
 #: setup/lib/messages.inc.php:119
 msgid "Settings that didn't fit enywhere else"
 msgstr ""
@@ -7538,10 +7597,6 @@ msgstr "Indywidualizacja"
 msgid "Customize export options"
 msgstr "Indywidualizacja opcji eksportu"
 
-#: setup/lib/messages.inc.php:137
-msgid "Features"
-msgstr "Funkcje"
-
 #: setup/lib/messages.inc.php:138
 msgid "Customize import defaults"
 msgstr "Indywidualizacja opcji importu"
@@ -7610,10 +7665,6 @@ msgstr ""
 "[a@?page=form&formset=features#tab_Import_export](De)kompresja gzip[/a] "
 "wymaga funkcji (%s) która nie jest dostępna w tym systemie."
 
-#: setup/lib/messages.inc.php:152
-msgid "phpMyAdmin homepage"
-msgstr "Strona główna phpMyAdmina"
-
 #: setup/lib/messages.inc.php:153
 msgid "Extra parameters for iconv"
 msgstr "Dodatkowe parametry dla iconv"
@@ -7664,14 +7715,6 @@ msgstr ""
 msgid "Insecure connection"
 msgstr "Niezabezpieczone połączenie"
 
-#: setup/lib/messages.inc.php:164
-msgid ""
-"You are not using a secure connection; all data (including potentially "
-"sensitive information, like passwords) is transferred unencrypted!"
-msgstr ""
-"W przypadku używania niezabezpieczonego połączenia, wszystkie dane (w tym "
-"niejawne, jak hasło) są przesyłanie w formie niezaszyfrowanej!"
-
 #: setup/lib/messages.inc.php:165
 #, php-format
 msgid ""
@@ -7772,10 +7815,6 @@ msgstr ""
 msgid "Enable highlighting"
 msgstr ""
 
-#: setup/lib/messages.inc.php:187
-msgid "let the user choose"
-msgstr "wybór pozostawiony użytkownikowi"
-
 #: setup/lib/messages.inc.php:188
 msgid "Use less graphically intense tabs"
 msgstr ""
@@ -7784,10 +7823,6 @@ msgstr ""
 msgid "Light tabs"
 msgstr ""
 
-#: setup/lib/messages.inc.php:190
-msgid "Load"
-msgstr "Załaduj"
-
 #: setup/lib/messages.inc.php:191
 msgid ""
 "If TRUE, logout deletes cookies for all servers; when set to FALSE, logout "
@@ -7911,14 +7946,6 @@ msgstr ""
 msgid "Iconic navigation bar"
 msgstr ""
 
-#: setup/lib/messages.inc.php:212
-msgid "New server"
-msgstr "Nowy serwer"
-
-#: setup/lib/messages.inc.php:213
-msgid "There are no configured servers"
-msgstr "Brak skonfigurowanych serwerów"
-
 #: setup/lib/messages.inc.php:214
 msgid "use GZip output buffering for increased speed in HTTP transfers"
 msgstr ""
@@ -7928,10 +7955,6 @@ msgstr ""
 msgid "GZip output buffering"
 msgstr "Kompresja wyjścia GZip"
 
-#: setup/lib/messages.inc.php:216
-msgid "- none -"
-msgstr "- brak -"
-
 #: setup/lib/messages.inc.php:217
 msgid ""
 "[kbd]SMART[/kbd] - i.e. descending order for fields of type TIME, DATE, "
@@ -7942,10 +7965,6 @@ msgstr ""
 msgid "Default sorting order"
 msgstr ""
 
-#: setup/lib/messages.inc.php:219
-msgid "Overview"
-msgstr "Opcje podstawowe"
-
 #: setup/lib/messages.inc.php:220
 msgid "Use persistent connections to MySQL databases"
 msgstr "Czy użyć trwałych połączeń do baz danych MySQL"
@@ -8000,10 +8019,6 @@ msgstr "Które funckje będą użyte do konwersji kodowania napisów"
 msgid "Recoding engine"
 msgstr "Mechanizm konwersji kodowania napisów"
 
-#: setup/lib/messages.inc.php:234
-msgid "Restore default value"
-msgstr "Przywróć wartość domyślną"
-
 #: setup/lib/messages.inc.php:235
 msgid "Try to revert erroneous fields to their default values"
 msgstr "Spróbuj przywrócić błędne pola do ich domyślnych wartości"
@@ -8040,10 +8055,6 @@ msgstr "Z powodów wydajnościowych powinien być uzywany mysqli."
 msgid "You allow for connecting to the server without a password."
 msgstr ""
 
-#: setup/lib/messages.inc.php:241
-msgid "Add a new server"
-msgstr "Dodaj nowy serwer"
-
 #: setup/lib/messages.inc.php:242
 msgid "Leave blank if not used"
 msgstr "Należy pozostawić puste jeśli nie jest używane"
@@ -8194,10 +8205,6 @@ msgstr ""
 "a]. Jednakże ochrona oparta na adresy IP może nie być wiarygodna, jeżeli "
 "używany IP należy do ISP, do którego podłączonych jest tysiące użytkowników."
 
-#: setup/lib/messages.inc.php:272
-msgid "Edit server"
-msgstr "Edytuj serwer"
-
 #: setup/lib/messages.inc.php:273
 msgid "What PHP extension to use; you should use mysqli if supported"
 msgstr ""
@@ -8459,11 +8466,6 @@ msgstr ""
 msgid "Verbose name of this server"
 msgstr ""
 
-#: setup/lib/messages.inc.php:328
-#, php-format
-msgid "Set value: %s"
-msgstr "Ustaw wartość: %s"
-
 #: setup/lib/messages.inc.php:329
 msgid ""
 "Whether a user should be displayed a "show all (records)" button"
@@ -8500,10 +8502,6 @@ msgstr ""
 msgid "Show function fields"
 msgstr ""
 
-#: setup/lib/messages.inc.php:337
-msgid "Show hidden messages (#MSG_COUNT)"
-msgstr "Pokaż ukryte wiadomości (#MSG_COUNT)"
-
 #: setup/lib/messages.inc.php:338
 msgid ""
 "Shows link to [a at http://php.net/manual/function.phpinfo.php]phpinfo()[/a] "
@@ -8636,10 +8634,6 @@ msgstr ""
 msgid "Got invalid version string from server"
 msgstr "Otrzymano od serwera nieprawidłowy numer wersji"
 
-#: setup/lib/messages.inc.php:370
-msgid "Check for latest version"
-msgstr "Sprawdź, czy jest nowsza wersja"
-
 #: setup/lib/messages.inc.php:371
 #, php-format
 msgid ""
@@ -8679,10 +8673,6 @@ msgid ""
 msgstr ""
 "URL wrapper ani CURL nie są dostępnie. Sprawdzenie wersji jest niemożliwe."
 
-#: setup/lib/messages.inc.php:377
-msgid "Warning"
-msgstr "Ostrzeżenie"
-
 #: setup/lib/messages.inc.php:378
 msgid ""
 "Enable [a at http://en.wikipedia.org/wiki/ZIP_(file_format)]ZIP[/a] compression "
@@ -8750,6 +8740,19 @@ msgid "Description"
 msgstr "Opis"
 
 #, fuzzy
+#~| msgid ""
+#~| "However on last run no data has been parsed, this usually means "
+#~| "phpMyAdmin won't be able to finish this import unless you increase php "
+#~| "time limits."
+#~ msgid ""
+#~ "However on last run no data has been parsed, this usually means "
+#~ "phpMyAdmin won"
+#~ msgstr ""
+#~ "Jednakże, podczas ostatniego uruchomienia nie zostały przetworzone żadne "
+#~ "dane, co zwykle oznacza, że phpMyAdmin nie będzie w stanie ukończyć tego "
+#~ "importu bez zwiększenia limitów czasowych PHP."
+
+#, fuzzy
 #~| msgid "None"
 #~ msgctxt "None action"
 #~ msgid "None"
diff --git a/po/pt.po b/po/pt.po
index bfbcfbc..3467118 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-14 07:48-0400\n"
+"POT-Creation-Date: 2010-05-14 13:39-0400\n"
 "PO-Revision-Date: 2010-03-12 09:17+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: portuguese <pt at li.org>\n"
@@ -946,10 +946,10 @@ msgid ""
 "file and import will resume."
 msgstr ""
 
-#: import.php:426
+#: import.php:426 libraries/messages.inc.php:1102
 msgid ""
 "However on last run no data has been parsed, this usually means phpMyAdmin "
-"won"
+"won't be able to finish this import unless you increase php time limits."
 msgstr ""
 
 #: index.php:190 libraries/messages.inc.php:549
@@ -6227,12 +6227,6 @@ msgstr ""
 msgid "Thread %s was successfully killed."
 msgstr ""
 
-#: libraries/messages.inc.php:1102
-msgid ""
-"However on last run no data has been parsed, this usually means phpMyAdmin "
-"won't be able to finish this import unless you increase php time limits."
-msgstr ""
-
 #: libraries/messages.inc.php:1105 pmd_pdf.php:94
 msgid "to/from page"
 msgstr ""
@@ -6668,7 +6662,8 @@ msgstr "Nenhum"
 msgid "Filter"
 msgstr "Qtd Campos"
 
-#: navigation.php:319 setup/lib/messages.inc.php:42
+#: navigation.php:319 setup/frames/index.inc.php:218
+#: setup/lib/messages.inc.php:42
 msgid "Clear"
 msgstr ""
 
@@ -6755,6 +6750,116 @@ msgstr "Ligações"
 msgid "Configuration: %s"
 msgstr ""
 
+#: setup/frames/config.inc.php:25 setup/frames/index.inc.php:152
+#: setup/lib/messages.inc.php:45
+msgid "Configuration file"
+msgstr ""
+
+#: setup/frames/config.inc.php:38 setup/frames/index.inc.php:212
+#: setup/lib/messages.inc.php:65
+msgid "Download"
+msgstr ""
+
+#: setup/frames/index.inc.php:58 setup/lib/messages.inc.php:164
+msgid ""
+"You are not using a secure connection; all data (including potentially "
+"sensitive information, like passwords) is transferred unencrypted!"
+msgstr ""
+
+#: setup/frames/index.inc.php:87 setup/frames/menu.inc.php:17
+#: setup/lib/messages.inc.php:219
+msgid "Overview"
+msgstr ""
+
+#: setup/frames/index.inc.php:95 setup/lib/messages.inc.php:337
+msgid "Show hidden messages (#MSG_COUNT)"
+msgstr ""
+
+#: setup/frames/index.inc.php:135 setup/lib/messages.inc.php:213
+msgid "There are no configured servers"
+msgstr ""
+
+#: setup/frames/index.inc.php:143 setup/lib/messages.inc.php:212
+msgid "New server"
+msgstr ""
+
+#: setup/frames/index.inc.php:172 setup/lib/messages.inc.php:50
+msgid "Default language"
+msgstr ""
+
+#: setup/frames/index.inc.php:182 setup/lib/messages.inc.php:187
+msgid "let the user choose"
+msgstr ""
+
+#: setup/frames/index.inc.php:193 setup/lib/messages.inc.php:216
+msgid "- none -"
+msgstr ""
+
+#: setup/frames/index.inc.php:196 setup/lib/messages.inc.php:51
+msgid "Default server"
+msgstr ""
+
+#: setup/frames/index.inc.php:206 setup/lib/messages.inc.php:66
+msgid "End of line"
+msgstr ""
+
+#: setup/frames/index.inc.php:211 setup/lib/messages.inc.php:61
+msgid "Display"
+msgstr ""
+
+#: setup/frames/index.inc.php:215 setup/lib/messages.inc.php:190
+#, fuzzy
+msgid "Load"
+msgstr "Local"
+
+#: setup/frames/index.inc.php:226 setup/lib/messages.inc.php:152
+#, fuzzy
+msgid "phpMyAdmin homepage"
+msgstr "Documentação do phpMyAdmin"
+
+#: setup/frames/index.inc.php:227 setup/lib/messages.inc.php:64
+#, fuzzy
+msgid "Donate"
+msgstr "Dados"
+
+#: setup/frames/index.inc.php:228 setup/lib/messages.inc.php:370
+msgid "Check for latest version"
+msgstr ""
+
+#: setup/frames/menu.inc.php:18 setup/lib/messages.inc.php:137
+msgid "Features"
+msgstr ""
+
+#: setup/frames/menu.inc.php:19 setup/lib/messages.inc.php:113
+msgid "Navigation frame"
+msgstr ""
+
+#: setup/frames/menu.inc.php:20 setup/lib/messages.inc.php:118
+msgid "Main frame"
+msgstr ""
+
+#: setup/frames/servers.inc.php:28 setup/lib/messages.inc.php:272
+msgid "Edit server"
+msgstr ""
+
+#: setup/frames/servers.inc.php:37 setup/lib/messages.inc.php:241
+#, fuzzy
+msgid "Add a new server"
+msgstr "Acrescenta um utilizador"
+
+#: setup/lib/FormDisplay.tpl.php:182 setup/lib/messages.inc.php:328
+#, php-format
+msgid "Set value: %s"
+msgstr ""
+
+#: setup/lib/FormDisplay.tpl.php:187 setup/lib/messages.inc.php:234
+msgid "Restore default value"
+msgstr ""
+
+#: setup/lib/form_processing.lib.php:43 setup/lib/messages.inc.php:377
+msgid "Warning"
+msgstr ""
+
 #: setup/lib/messages.inc.php:16
 msgid "Allow character set conversion"
 msgstr ""
@@ -6894,10 +6999,6 @@ msgstr ""
 msgid "Compress on the fly"
 msgstr ""
 
-#: setup/lib/messages.inc.php:45
-msgid "Configuration file"
-msgstr ""
-
 #: setup/lib/messages.inc.php:46
 msgid ""
 "Whether a warning ("Are your really sure...") should be displayed "
@@ -6916,14 +7017,6 @@ msgstr ""
 msgid "Default character set"
 msgstr ""
 
-#: setup/lib/messages.inc.php:50
-msgid "Default language"
-msgstr ""
-
-#: setup/lib/messages.inc.php:51
-msgid "Default server"
-msgstr ""
-
 #: setup/lib/messages.inc.php:52
 msgid "Tab that is displayed when entering a database"
 msgstr ""
@@ -6963,10 +7056,6 @@ msgstr ""
 msgid "Display databases as a list"
 msgstr ""
 
-#: setup/lib/messages.inc.php:61
-msgid "Display"
-msgstr ""
-
 #: setup/lib/messages.inc.php:62
 msgid "Show server listing as a list instead of a drop down"
 msgstr ""
@@ -6975,19 +7064,6 @@ msgstr ""
 msgid "Display servers as a list"
 msgstr ""
 
-#: setup/lib/messages.inc.php:64
-#, fuzzy
-msgid "Donate"
-msgstr "Dados"
-
-#: setup/lib/messages.inc.php:65
-msgid "Download"
-msgstr ""
-
-#: setup/lib/messages.inc.php:66
-msgid "End of line"
-msgstr ""
-
 #: setup/lib/messages.inc.php:67
 msgid "Could not connect to MySQL server"
 msgstr ""
@@ -7169,10 +7245,6 @@ msgstr "Opções de exportação da Base de Dados"
 msgid "Customize appearance of the navigation frame"
 msgstr ""
 
-#: setup/lib/messages.inc.php:113
-msgid "Navigation frame"
-msgstr ""
-
 #: setup/lib/messages.inc.php:114
 #, fuzzy
 msgid "Servers display options"
@@ -7183,10 +7255,6 @@ msgstr "Opções de exportação da Base de Dados"
 msgid "Tables display options"
 msgstr "Opções de exportação da Base de Dados"
 
-#: setup/lib/messages.inc.php:118
-msgid "Main frame"
-msgstr ""
-
 #: setup/lib/messages.inc.php:119
 msgid "Settings that didn't fit enywhere else"
 msgstr ""
@@ -7265,10 +7333,6 @@ msgstr ""
 msgid "Customize export options"
 msgstr "Opções de exportação da Base de Dados"
 
-#: setup/lib/messages.inc.php:137
-msgid "Features"
-msgstr ""
-
 #: setup/lib/messages.inc.php:138
 #, fuzzy
 msgid "Customize import defaults"
@@ -7338,11 +7402,6 @@ msgid ""
 "system."
 msgstr ""
 
-#: setup/lib/messages.inc.php:152
-#, fuzzy
-msgid "phpMyAdmin homepage"
-msgstr "Documentação do phpMyAdmin"
-
 #: setup/lib/messages.inc.php:153
 msgid "Extra parameters for iconv"
 msgstr ""
@@ -7386,12 +7445,6 @@ msgstr ""
 msgid "Insecure connection"
 msgstr ""
 
-#: setup/lib/messages.inc.php:164
-msgid ""
-"You are not using a secure connection; all data (including potentially "
-"sensitive information, like passwords) is transferred unencrypted!"
-msgstr ""
-
 #: setup/lib/messages.inc.php:165
 #, php-format
 msgid ""
@@ -7488,10 +7541,6 @@ msgstr ""
 msgid "Enable highlighting"
 msgstr ""
 
-#: setup/lib/messages.inc.php:187
-msgid "let the user choose"
-msgstr ""
-
 #: setup/lib/messages.inc.php:188
 msgid "Use less graphically intense tabs"
 msgstr ""
@@ -7500,11 +7549,6 @@ msgstr ""
 msgid "Light tabs"
 msgstr ""
 
-#: setup/lib/messages.inc.php:190
-#, fuzzy
-msgid "Load"
-msgstr "Local"
-
 #: setup/lib/messages.inc.php:191
 msgid ""
 "If TRUE, logout deletes cookies for all servers; when set to FALSE, logout "
@@ -7608,14 +7652,6 @@ msgstr ""
 msgid "Iconic navigation bar"
 msgstr ""
 
-#: setup/lib/messages.inc.php:212
-msgid "New server"
-msgstr ""
-
-#: setup/lib/messages.inc.php:213
-msgid "There are no configured servers"
-msgstr ""
-
 #: setup/lib/messages.inc.php:214
 msgid "use GZip output buffering for increased speed in HTTP transfers"
 msgstr ""
@@ -7624,10 +7660,6 @@ msgstr ""
 msgid "GZip output buffering"
 msgstr ""
 
-#: setup/lib/messages.inc.php:216
-msgid "- none -"
-msgstr ""
-
 #: setup/lib/messages.inc.php:217
 msgid ""
 "[kbd]SMART[/kbd] - i.e. descending order for fields of type TIME, DATE, "
@@ -7638,10 +7670,6 @@ msgstr ""
 msgid "Default sorting order"
 msgstr ""
 
-#: setup/lib/messages.inc.php:219
-msgid "Overview"
-msgstr ""
-
 #: setup/lib/messages.inc.php:220
 msgid "Use persistent connections to MySQL databases"
 msgstr ""
@@ -7696,10 +7724,6 @@ msgstr ""
 msgid "Recoding engine"
 msgstr ""
 
-#: setup/lib/messages.inc.php:234
-msgid "Restore default value"
-msgstr ""
-
 #: setup/lib/messages.inc.php:235
 msgid "Try to revert erroneous fields to their default values"
 msgstr ""
@@ -7730,11 +7754,6 @@ msgstr ""
 msgid "You allow for connecting to the server without a password."
 msgstr ""
 
-#: setup/lib/messages.inc.php:241
-#, fuzzy
-msgid "Add a new server"
-msgstr "Acrescenta um utilizador"
-
 #: setup/lib/messages.inc.php:242
 msgid "Leave blank if not used"
 msgstr ""
@@ -7877,10 +7896,6 @@ msgid ""
 "to."
 msgstr ""
 
-#: setup/lib/messages.inc.php:272
-msgid "Edit server"
-msgstr ""
-
 #: setup/lib/messages.inc.php:273
 msgid "What PHP extension to use; you should use mysqli if supported"
 msgstr ""
@@ -8131,11 +8146,6 @@ msgstr ""
 msgid "Verbose name of this server"
 msgstr ""
 
-#: setup/lib/messages.inc.php:328
-#, php-format
-msgid "Set value: %s"
-msgstr ""
-
 #: setup/lib/messages.inc.php:329
 msgid ""
 "Whether a user should be displayed a "show all (records)" button"
@@ -8173,10 +8183,6 @@ msgstr ""
 msgid "Show function fields"
 msgstr ""
 
-#: setup/lib/messages.inc.php:337
-msgid "Show hidden messages (#MSG_COUNT)"
-msgstr ""
-
 #: setup/lib/messages.inc.php:338
 msgid ""
 "Shows link to [a at http://php.net/manual/function.phpinfo.php]phpinfo()[/a] "
@@ -8309,10 +8315,6 @@ msgstr ""
 msgid "Got invalid version string from server"
 msgstr ""
 
-#: setup/lib/messages.inc.php:370
-msgid "Check for latest version"
-msgstr ""
-
 #: setup/lib/messages.inc.php:371
 #, php-format
 msgid ""
@@ -8344,10 +8346,6 @@ msgid ""
 "Neither URL wrapper nor CURL is available. Version check is not possible."
 msgstr ""
 
-#: setup/lib/messages.inc.php:377
-msgid "Warning"
-msgstr ""
-
 #: setup/lib/messages.inc.php:378
 msgid ""
 "Enable [a at http://en.wikipedia.org/wiki/ZIP_(file_format)]ZIP[/a] compression "
diff --git a/po/pt_BR.po b/po/pt_BR.po
index ac51df5..0c4be01 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-14 07:48-0400\n"
+"POT-Creation-Date: 2010-05-14 13:39-0400\n"
 "PO-Revision-Date: 2010-03-21 05:17+0200\n"
 "Last-Translator: Maurício Meneghini Fauth <mauriciofauth at gmail.com>\n"
 "Language-Team: brazilian_portuguese <pt_BR at li.org>\n"
@@ -954,15 +954,10 @@ msgstr ""
 "Script passou do tempo limite, se você deseja terminar a importação, reenvie "
 "o mesmo arquivo que a importação será resumida."
 
-#: import.php:426
-#, fuzzy
-#| msgid ""
-#| "However on last run no data has been parsed, this usually means "
-#| "phpMyAdmin won't be able to finish this import unless you increase php "
-#| "time limits."
+#: import.php:426 libraries/messages.inc.php:1102
 msgid ""
 "However on last run no data has been parsed, this usually means phpMyAdmin "
-"won"
+"won't be able to finish this import unless you increase php time limits."
 msgstr ""
 "Entretanto na última vez nenhum dado foi passado, isso normalmente significa "
 "que o phpMyAdmin não é capaz de finalizar essa importação à menos que você "
@@ -6383,15 +6378,6 @@ msgstr "Processos"
 msgid "Thread %s was successfully killed."
 msgstr "Processo %s foi morto com sucesso."
 
-#: libraries/messages.inc.php:1102
-msgid ""
-"However on last run no data has been parsed, this usually means phpMyAdmin "
-"won't be able to finish this import unless you increase php time limits."
-msgstr ""
-"Entretanto na última vez nenhum dado foi passado, isso normalmente significa "
-"que o phpMyAdmin não é capaz de finalizar essa importação à menos que você "
-"aumente o tempo limite do PHP."
-
 #: libraries/messages.inc.php:1105 pmd_pdf.php:94
 msgid "to/from page"
 msgstr "página de/para"
@@ -6863,7 +6849,8 @@ msgstr "Nenhum"
 msgid "Filter"
 msgstr "Filtro"
 
-#: navigation.php:319 setup/lib/messages.inc.php:42
+#: navigation.php:319 setup/frames/index.inc.php:218
+#: setup/lib/messages.inc.php:42
 msgid "Clear"
 msgstr "Limpar"
 
@@ -6954,6 +6941,116 @@ msgstr "máx. de conexões concorrentes"
 msgid "Configuration: %s"
 msgstr "Configuração"
 
+#: setup/frames/config.inc.php:25 setup/frames/index.inc.php:152
+#: setup/lib/messages.inc.php:45
+msgid "Configuration file"
+msgstr ""
+
+#: setup/frames/config.inc.php:38 setup/frames/index.inc.php:212
+#: setup/lib/messages.inc.php:65
+msgid "Download"
+msgstr ""
+
+#: setup/frames/index.inc.php:58 setup/lib/messages.inc.php:164
+msgid ""
+"You are not using a secure connection; all data (including potentially "
+"sensitive information, like passwords) is transferred unencrypted!"
+msgstr ""
+
+#: setup/frames/index.inc.php:87 setup/frames/menu.inc.php:17
+#: setup/lib/messages.inc.php:219
+msgid "Overview"
+msgstr ""
+
+#: setup/frames/index.inc.php:95 setup/lib/messages.inc.php:337
+msgid "Show hidden messages (#MSG_COUNT)"
+msgstr ""
+
+#: setup/frames/index.inc.php:135 setup/lib/messages.inc.php:213
+msgid "There are no configured servers"
+msgstr ""
+
+#: setup/frames/index.inc.php:143 setup/lib/messages.inc.php:212
+msgid "New server"
+msgstr ""
+
+#: setup/frames/index.inc.php:172 setup/lib/messages.inc.php:50
+msgid "Default language"
+msgstr ""
+
+#: setup/frames/index.inc.php:182 setup/lib/messages.inc.php:187
+msgid "let the user choose"
+msgstr ""
+
+#: setup/frames/index.inc.php:193 setup/lib/messages.inc.php:216
+msgid "- none -"
+msgstr ""
+
+#: setup/frames/index.inc.php:196 setup/lib/messages.inc.php:51
+msgid "Default server"
+msgstr ""
+
+#: setup/frames/index.inc.php:206 setup/lib/messages.inc.php:66
+msgid "End of line"
+msgstr ""
+
+#: setup/frames/index.inc.php:211 setup/lib/messages.inc.php:61
+msgid "Display"
+msgstr ""
+
+#: setup/frames/index.inc.php:215 setup/lib/messages.inc.php:190
+#, fuzzy
+msgid "Load"
+msgstr "Local"
+
+#: setup/frames/index.inc.php:226 setup/lib/messages.inc.php:152
+#, fuzzy
+msgid "phpMyAdmin homepage"
+msgstr "Documentação do phpMyAdmin "
+
+#: setup/frames/index.inc.php:227 setup/lib/messages.inc.php:64
+#, fuzzy
+msgid "Donate"
+msgstr "Dados"
+
+#: setup/frames/index.inc.php:228 setup/lib/messages.inc.php:370
+msgid "Check for latest version"
+msgstr ""
+
+#: setup/frames/menu.inc.php:18 setup/lib/messages.inc.php:137
+msgid "Features"
+msgstr ""
+
+#: setup/frames/menu.inc.php:19 setup/lib/messages.inc.php:113
+msgid "Navigation frame"
+msgstr ""
+
+#: setup/frames/menu.inc.php:20 setup/lib/messages.inc.php:118
+msgid "Main frame"
+msgstr ""
+
+#: setup/frames/servers.inc.php:28 setup/lib/messages.inc.php:272
+msgid "Edit server"
+msgstr ""
+
+#: setup/frames/servers.inc.php:37 setup/lib/messages.inc.php:241
+#, fuzzy
+msgid "Add a new server"
+msgstr "Adicionar novo usuário"
+
+#: setup/lib/FormDisplay.tpl.php:182 setup/lib/messages.inc.php:328
+#, php-format
+msgid "Set value: %s"
+msgstr ""
+
+#: setup/lib/FormDisplay.tpl.php:187 setup/lib/messages.inc.php:234
+msgid "Restore default value"
+msgstr ""
+
+#: setup/lib/form_processing.lib.php:43 setup/lib/messages.inc.php:377
+msgid "Warning"
+msgstr ""
+
 #: setup/lib/messages.inc.php:16
 msgid "Allow character set conversion"
 msgstr ""
@@ -7093,10 +7190,6 @@ msgstr ""
 msgid "Compress on the fly"
 msgstr ""
 
-#: setup/lib/messages.inc.php:45
-msgid "Configuration file"
-msgstr ""
-
 #: setup/lib/messages.inc.php:46
 msgid ""
 "Whether a warning ("Are your really sure...") should be displayed "
@@ -7115,14 +7208,6 @@ msgstr ""
 msgid "Default character set"
 msgstr ""
 
-#: setup/lib/messages.inc.php:50
-msgid "Default language"
-msgstr ""
-
-#: setup/lib/messages.inc.php:51
-msgid "Default server"
-msgstr ""
-
 #: setup/lib/messages.inc.php:52
 msgid "Tab that is displayed when entering a database"
 msgstr ""
@@ -7164,10 +7249,6 @@ msgstr ""
 msgid "Display databases as a list"
 msgstr ""
 
-#: setup/lib/messages.inc.php:61
-msgid "Display"
-msgstr ""
-
 #: setup/lib/messages.inc.php:62
 msgid "Show server listing as a list instead of a drop down"
 msgstr ""
@@ -7176,19 +7257,6 @@ msgstr ""
 msgid "Display servers as a list"
 msgstr ""
 
-#: setup/lib/messages.inc.php:64
-#, fuzzy
-msgid "Donate"
-msgstr "Dados"
-
-#: setup/lib/messages.inc.php:65
-msgid "Download"
-msgstr ""
-
-#: setup/lib/messages.inc.php:66
-msgid "End of line"
-msgstr ""
-
 #: setup/lib/messages.inc.php:67
 msgid "Could not connect to MySQL server"
 msgstr ""
@@ -7370,10 +7438,6 @@ msgstr "Opções de exportação do Banco de Dados"
 msgid "Customize appearance of the navigation frame"
 msgstr ""
 
-#: setup/lib/messages.inc.php:113
-msgid "Navigation frame"
-msgstr ""
-
 #: setup/lib/messages.inc.php:114
 #, fuzzy
 msgid "Servers display options"
@@ -7384,10 +7448,6 @@ msgstr "Opções de exportação do Banco de Dados"
 msgid "Tables display options"
 msgstr "Opções de exportação do Banco de Dados"
 
-#: setup/lib/messages.inc.php:118
-msgid "Main frame"
-msgstr ""
-
 #: setup/lib/messages.inc.php:119
 msgid "Settings that didn't fit enywhere else"
 msgstr ""
@@ -7466,10 +7526,6 @@ msgstr ""
 msgid "Customize export options"
 msgstr "Opções de exportação do Banco de Dados"
 
-#: setup/lib/messages.inc.php:137
-msgid "Features"
-msgstr ""
-
 #: setup/lib/messages.inc.php:138
 #, fuzzy
 msgid "Customize import defaults"
@@ -7539,11 +7595,6 @@ msgid ""
 "system."
 msgstr ""
 
-#: setup/lib/messages.inc.php:152
-#, fuzzy
-msgid "phpMyAdmin homepage"
-msgstr "Documentação do phpMyAdmin "
-
 #: setup/lib/messages.inc.php:153
 msgid "Extra parameters for iconv"
 msgstr ""
@@ -7591,12 +7642,6 @@ msgstr ""
 msgid "Insecure connection"
 msgstr ""
 
-#: setup/lib/messages.inc.php:164
-msgid ""
-"You are not using a secure connection; all data (including potentially "
-"sensitive information, like passwords) is transferred unencrypted!"
-msgstr ""
-
 #: setup/lib/messages.inc.php:165
 #, php-format
 msgid ""
@@ -7695,10 +7740,6 @@ msgstr ""
 msgid "Enable highlighting"
 msgstr ""
 
-#: setup/lib/messages.inc.php:187
-msgid "let the user choose"
-msgstr ""
-
 #: setup/lib/messages.inc.php:188
 msgid "Use less graphically intense tabs"
 msgstr ""
@@ -7707,11 +7748,6 @@ msgstr ""
 msgid "Light tabs"
 msgstr ""
 
-#: setup/lib/messages.inc.php:190
-#, fuzzy
-msgid "Load"
-msgstr "Local"
-
 #: setup/lib/messages.inc.php:191
 msgid ""
 "If TRUE, logout deletes cookies for all servers; when set to FALSE, logout "
@@ -7815,14 +7851,6 @@ msgstr ""
 msgid "Iconic navigation bar"
 msgstr ""
 
-#: setup/lib/messages.inc.php:212
-msgid "New server"
-msgstr ""
-
-#: setup/lib/messages.inc.php:213
-msgid "There are no configured servers"
-msgstr ""
-
 #: setup/lib/messages.inc.php:214
 msgid "use GZip output buffering for increased speed in HTTP transfers"
 msgstr ""
@@ -7831,10 +7859,6 @@ msgstr ""
 msgid "GZip output buffering"
 msgstr ""
 
-#: setup/lib/messages.inc.php:216
-msgid "- none -"
-msgstr ""
-
 #: setup/lib/messages.inc.php:217
 msgid ""
 "[kbd]SMART[/kbd] - i.e. descending order for fields of type TIME, DATE, "
@@ -7845,10 +7869,6 @@ msgstr ""
 msgid "Default sorting order"
 msgstr ""
 
-#: setup/lib/messages.inc.php:219
-msgid "Overview"
-msgstr ""
-
 #: setup/lib/messages.inc.php:220
 msgid "Use persistent connections to MySQL databases"
 msgstr ""
@@ -7903,10 +7923,6 @@ msgstr ""
 msgid "Recoding engine"
 msgstr ""
 
-#: setup/lib/messages.inc.php:234
-msgid "Restore default value"
-msgstr ""
-
 #: setup/lib/messages.inc.php:235
 msgid "Try to revert erroneous fields to their default values"
 msgstr ""
@@ -7938,11 +7954,6 @@ msgstr ""
 msgid "You allow for connecting to the server without a password."
 msgstr ""
 
-#: setup/lib/messages.inc.php:241
-#, fuzzy
-msgid "Add a new server"
-msgstr "Adicionar novo usuário"
-
 #: setup/lib/messages.inc.php:242
 msgid "Leave blank if not used"
 msgstr ""
@@ -8090,10 +8101,6 @@ msgid ""
 "to."
 msgstr ""
 
-#: setup/lib/messages.inc.php:272
-msgid "Edit server"
-msgstr ""
-
 #: setup/lib/messages.inc.php:273
 msgid "What PHP extension to use; you should use mysqli if supported"
 msgstr ""
@@ -8345,11 +8352,6 @@ msgstr ""
 msgid "Verbose name of this server"
 msgstr ""
 
-#: setup/lib/messages.inc.php:328
-#, php-format
-msgid "Set value: %s"
-msgstr ""
-
 #: setup/lib/messages.inc.php:329
 msgid ""
 "Whether a user should be displayed a "show all (records)" button"
@@ -8387,10 +8389,6 @@ msgstr ""
 msgid "Show function fields"
 msgstr ""
 
-#: setup/lib/messages.inc.php:337
-msgid "Show hidden messages (#MSG_COUNT)"
-msgstr ""
-
 #: setup/lib/messages.inc.php:338
 msgid ""
 "Shows link to [a at http://php.net/manual/function.phpinfo.php]phpinfo()[/a] "
@@ -8524,10 +8522,6 @@ msgstr ""
 msgid "Got invalid version string from server"
 msgstr ""
 
-#: setup/lib/messages.inc.php:370
-msgid "Check for latest version"
-msgstr ""
-
 #: setup/lib/messages.inc.php:371
 #, php-format
 msgid ""
@@ -8559,10 +8553,6 @@ msgid ""
 "Neither URL wrapper nor CURL is available. Version check is not possible."
 msgstr ""
 
-#: setup/lib/messages.inc.php:377
-msgid "Warning"
-msgstr ""
-
 #: setup/lib/messages.inc.php:378
 msgid ""
 "Enable [a at http://en.wikipedia.org/wiki/ZIP_(file_format)]ZIP[/a] compression "
@@ -8624,6 +8614,19 @@ msgid "Description"
 msgstr "Descrição"
 
 #, fuzzy
+#~| msgid ""
+#~| "However on last run no data has been parsed, this usually means "
+#~| "phpMyAdmin won't be able to finish this import unless you increase php "
+#~| "time limits."
+#~ msgid ""
+#~ "However on last run no data has been parsed, this usually means "
+#~ "phpMyAdmin won"
+#~ msgstr ""
+#~ "Entretanto na última vez nenhum dado foi passado, isso normalmente "
+#~ "significa que o phpMyAdmin não é capaz de finalizar essa importação à "
+#~ "menos que você aumente o tempo limite do PHP."
+
+#, fuzzy
 #~| msgid "None"
 #~ msgctxt "None action"
 #~ msgid "None"
diff --git a/po/ro.po b/po/ro.po
index 10ea177..162e29b 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-14 07:48-0400\n"
+"POT-Creation-Date: 2010-05-14 13:39-0400\n"
 "PO-Revision-Date: 2010-03-13 00:41+0200\n"
 "Last-Translator: <ronaldinia at yahoo.com>\n"
 "Language-Team: romanian <ro at li.org>\n"
@@ -958,15 +958,10 @@ msgstr ""
 "Script timeout passed, if you want to finish import, please resubmit same "
 "file and import will resume."
 
-#: import.php:426
-#, fuzzy
-#| msgid ""
-#| "However on last run no data has been parsed, this usually means "
-#| "phpMyAdmin won't be able to finish this import unless you increase php "
-#| "time limits."
+#: import.php:426 libraries/messages.inc.php:1102
 msgid ""
 "However on last run no data has been parsed, this usually means phpMyAdmin "
-"won"
+"won't be able to finish this import unless you increase php time limits."
 msgstr ""
 "However on last run no data has been parsed, this usually means phpMyAdmin "
 "won't be able to finish this import unless you increase php time limits."
@@ -6424,14 +6419,6 @@ msgstr "Fire"
 msgid "Thread %s was successfully killed."
 msgstr "Firul de execuție %s a fost oprit cu succes."
 
-#: libraries/messages.inc.php:1102
-msgid ""
-"However on last run no data has been parsed, this usually means phpMyAdmin "
-"won't be able to finish this import unless you increase php time limits."
-msgstr ""
-"However on last run no data has been parsed, this usually means phpMyAdmin "
-"won't be able to finish this import unless you increase php time limits."
-
 #: libraries/messages.inc.php:1105 pmd_pdf.php:94
 msgid "to/from page"
 msgstr "în/din pagină"
@@ -6907,7 +6894,8 @@ msgstr "Nici unul(a)"
 msgid "Filter"
 msgstr "Fișiere"
 
-#: navigation.php:319 setup/lib/messages.inc.php:42
+#: navigation.php:319 setup/frames/index.inc.php:218
+#: setup/lib/messages.inc.php:42
 #, fuzzy
 msgid "Clear"
 msgstr "Calendar"
@@ -6995,6 +6983,116 @@ msgstr "Comprimă conexiunea"
 msgid "Configuration: %s"
 msgstr ""
 
+#: setup/frames/config.inc.php:25 setup/frames/index.inc.php:152
+#: setup/lib/messages.inc.php:45
+msgid "Configuration file"
+msgstr ""
+
+#: setup/frames/config.inc.php:38 setup/frames/index.inc.php:212
+#: setup/lib/messages.inc.php:65
+msgid "Download"
+msgstr "Descarcă"
+
+#: setup/frames/index.inc.php:58 setup/lib/messages.inc.php:164
+msgid ""
+"You are not using a secure connection; all data (including potentially "
+"sensitive information, like passwords) is transferred unencrypted!"
+msgstr ""
+
+#: setup/frames/index.inc.php:87 setup/frames/menu.inc.php:17
+#: setup/lib/messages.inc.php:219
+msgid "Overview"
+msgstr ""
+
+#: setup/frames/index.inc.php:95 setup/lib/messages.inc.php:337
+msgid "Show hidden messages (#MSG_COUNT)"
+msgstr ""
+
+#: setup/frames/index.inc.php:135 setup/lib/messages.inc.php:213
+msgid "There are no configured servers"
+msgstr ""
+
+#: setup/frames/index.inc.php:143 setup/lib/messages.inc.php:212
+#, fuzzy
+msgid "New server"
+msgstr "Server Web"
+
+#: setup/frames/index.inc.php:172 setup/lib/messages.inc.php:50
+msgid "Default language"
+msgstr ""
+
+#: setup/frames/index.inc.php:182 setup/lib/messages.inc.php:187
+msgid "let the user choose"
+msgstr ""
+
+#: setup/frames/index.inc.php:193 setup/lib/messages.inc.php:216
+msgid "- none -"
+msgstr ""
+
+#: setup/frames/index.inc.php:196 setup/lib/messages.inc.php:51
+msgid "Default server"
+msgstr ""
+
+#: setup/frames/index.inc.php:206 setup/lib/messages.inc.php:66
+msgid "End of line"
+msgstr ""
+
+#: setup/frames/index.inc.php:211 setup/lib/messages.inc.php:61
+msgid "Display"
+msgstr "Afișează"
+
+#: setup/frames/index.inc.php:215 setup/lib/messages.inc.php:190
+#, fuzzy
+msgid "Load"
+msgstr "Local"
+
+#: setup/frames/index.inc.php:226 setup/lib/messages.inc.php:152
+#, fuzzy
+msgid "phpMyAdmin homepage"
+msgstr "Documentație phpMyAdmin"
+
+#: setup/frames/index.inc.php:227 setup/lib/messages.inc.php:64
+#, fuzzy
+msgid "Donate"
+msgstr "Date"
+
+#: setup/frames/index.inc.php:228 setup/lib/messages.inc.php:370
+msgid "Check for latest version"
+msgstr ""
+
+#: setup/frames/menu.inc.php:18 setup/lib/messages.inc.php:137
+msgid "Features"
+msgstr "Funcționalități"
+
+#: setup/frames/menu.inc.php:19 setup/lib/messages.inc.php:113
+msgid "Navigation frame"
+msgstr ""
+
+#: setup/frames/menu.inc.php:20 setup/lib/messages.inc.php:118
+msgid "Main frame"
+msgstr "Cadrul principal"
+
+#: setup/frames/servers.inc.php:28 setup/lib/messages.inc.php:272
+msgid "Edit server"
+msgstr "Redactează serverul"
+
+#: setup/frames/servers.inc.php:37 setup/lib/messages.inc.php:241
+msgid "Add a new server"
+msgstr "Adaugă un server nou"
+
+#: setup/lib/FormDisplay.tpl.php:182 setup/lib/messages.inc.php:328
+#, php-format
+msgid "Set value: %s"
+msgstr ""
+
+#: setup/lib/FormDisplay.tpl.php:187 setup/lib/messages.inc.php:234
+msgid "Restore default value"
+msgstr ""
+
+#: setup/lib/form_processing.lib.php:43 setup/lib/messages.inc.php:377
+msgid "Warning"
+msgstr ""
+
 #: setup/lib/messages.inc.php:16
 msgid "Allow character set conversion"
 msgstr ""
@@ -7134,10 +7232,6 @@ msgstr ""
 msgid "Compress on the fly"
 msgstr ""
 
-#: setup/lib/messages.inc.php:45
-msgid "Configuration file"
-msgstr ""
-
 #: setup/lib/messages.inc.php:46
 msgid ""
 "Whether a warning ("Are your really sure...") should be displayed "
@@ -7156,14 +7250,6 @@ msgstr ""
 msgid "Default character set"
 msgstr ""
 
-#: setup/lib/messages.inc.php:50
-msgid "Default language"
-msgstr ""
-
-#: setup/lib/messages.inc.php:51
-msgid "Default server"
-msgstr ""
-
 #: setup/lib/messages.inc.php:52
 msgid "Tab that is displayed when entering a database"
 msgstr ""
@@ -7205,10 +7291,6 @@ msgstr ""
 msgid "Display databases as a list"
 msgstr ""
 
-#: setup/lib/messages.inc.php:61
-msgid "Display"
-msgstr "Afișează"
-
 #: setup/lib/messages.inc.php:62
 msgid "Show server listing as a list instead of a drop down"
 msgstr ""
@@ -7217,19 +7299,6 @@ msgstr ""
 msgid "Display servers as a list"
 msgstr ""
 
-#: setup/lib/messages.inc.php:64
-#, fuzzy
-msgid "Donate"
-msgstr "Date"
-
-#: setup/lib/messages.inc.php:65
-msgid "Download"
-msgstr "Descarcă"
-
-#: setup/lib/messages.inc.php:66
-msgid "End of line"
-msgstr ""
-
 #: setup/lib/messages.inc.php:67
 #, fuzzy
 msgid "Could not connect to MySQL server"
@@ -7411,10 +7480,6 @@ msgstr "Opțiuni de afișare a bazelor de date"
 msgid "Customize appearance of the navigation frame"
 msgstr "Personalizează aspectul cadrului de navigare"
 
-#: setup/lib/messages.inc.php:113
-msgid "Navigation frame"
-msgstr ""
-
 #: setup/lib/messages.inc.php:114
 #, fuzzy
 msgid "Servers display options"
@@ -7424,10 +7489,6 @@ msgstr "Opțiuni de afișare a tabelelor"
 msgid "Tables display options"
 msgstr "Opțiuni de afișare a tabelelor"
 
-#: setup/lib/messages.inc.php:118
-msgid "Main frame"
-msgstr "Cadrul principal"
-
 #: setup/lib/messages.inc.php:119
 msgid "Settings that didn't fit enywhere else"
 msgstr ""
@@ -7506,10 +7567,6 @@ msgstr "Personalizare"
 msgid "Customize export options"
 msgstr "Opțiuni de exportare a bazei de date"
 
-#: setup/lib/messages.inc.php:137
-msgid "Features"
-msgstr "Funcționalități"
-
 #: setup/lib/messages.inc.php:138
 #, fuzzy
 msgid "Customize import defaults"
@@ -7579,11 +7636,6 @@ msgid ""
 "system."
 msgstr ""
 
-#: setup/lib/messages.inc.php:152
-#, fuzzy
-msgid "phpMyAdmin homepage"
-msgstr "Documentație phpMyAdmin"
-
 #: setup/lib/messages.inc.php:153
 msgid "Extra parameters for iconv"
 msgstr ""
@@ -7632,12 +7684,6 @@ msgstr ""
 msgid "Insecure connection"
 msgstr "Comprimă conexiunea"
 
-#: setup/lib/messages.inc.php:164
-msgid ""
-"You are not using a secure connection; all data (including potentially "
-"sensitive information, like passwords) is transferred unencrypted!"
-msgstr ""
-
 #: setup/lib/messages.inc.php:165
 #, php-format
 msgid ""
@@ -7736,10 +7782,6 @@ msgstr ""
 msgid "Enable highlighting"
 msgstr ""
 
-#: setup/lib/messages.inc.php:187
-msgid "let the user choose"
-msgstr ""
-
 #: setup/lib/messages.inc.php:188
 msgid "Use less graphically intense tabs"
 msgstr ""
@@ -7748,11 +7790,6 @@ msgstr ""
 msgid "Light tabs"
 msgstr ""
 
-#: setup/lib/messages.inc.php:190
-#, fuzzy
-msgid "Load"
-msgstr "Local"
-
 #: setup/lib/messages.inc.php:191
 msgid ""
 "If TRUE, logout deletes cookies for all servers; when set to FALSE, logout "
@@ -7857,15 +7894,6 @@ msgstr ""
 msgid "Iconic navigation bar"
 msgstr ""
 
-#: setup/lib/messages.inc.php:212
-#, fuzzy
-msgid "New server"
-msgstr "Server Web"
-
-#: setup/lib/messages.inc.php:213
-msgid "There are no configured servers"
-msgstr ""
-
 #: setup/lib/messages.inc.php:214
 msgid "use GZip output buffering for increased speed in HTTP transfers"
 msgstr ""
@@ -7874,10 +7902,6 @@ msgstr ""
 msgid "GZip output buffering"
 msgstr ""
 
-#: setup/lib/messages.inc.php:216
-msgid "- none -"
-msgstr ""
-
 #: setup/lib/messages.inc.php:217
 msgid ""
 "[kbd]SMART[/kbd] - i.e. descending order for fields of type TIME, DATE, "
@@ -7888,10 +7912,6 @@ msgstr ""
 msgid "Default sorting order"
 msgstr ""
 
-#: setup/lib/messages.inc.php:219
-msgid "Overview"
-msgstr ""
-
 #: setup/lib/messages.inc.php:220
 msgid "Use persistent connections to MySQL databases"
 msgstr ""
@@ -7946,10 +7966,6 @@ msgstr ""
 msgid "Recoding engine"
 msgstr ""
 
-#: setup/lib/messages.inc.php:234
-msgid "Restore default value"
-msgstr ""
-
 #: setup/lib/messages.inc.php:235
 msgid "Try to revert erroneous fields to their default values"
 msgstr ""
@@ -7981,10 +7997,6 @@ msgstr ""
 msgid "You allow for connecting to the server without a password."
 msgstr ""
 
-#: setup/lib/messages.inc.php:241
-msgid "Add a new server"
-msgstr "Adaugă un server nou"
-
 #: setup/lib/messages.inc.php:242
 msgid "Leave blank if not used"
 msgstr ""
@@ -8129,10 +8141,6 @@ msgid ""
 "to."
 msgstr ""
 
-#: setup/lib/messages.inc.php:272
-msgid "Edit server"
-msgstr "Redactează serverul"
-
 #: setup/lib/messages.inc.php:273
 msgid "What PHP extension to use; you should use mysqli if supported"
 msgstr ""
@@ -8381,11 +8389,6 @@ msgstr ""
 msgid "Verbose name of this server"
 msgstr ""
 
-#: setup/lib/messages.inc.php:328
-#, php-format
-msgid "Set value: %s"
-msgstr ""
-
 #: setup/lib/messages.inc.php:329
 msgid ""
 "Whether a user should be displayed a "show all (records)" button"
@@ -8423,10 +8426,6 @@ msgstr ""
 msgid "Show function fields"
 msgstr ""
 
-#: setup/lib/messages.inc.php:337
-msgid "Show hidden messages (#MSG_COUNT)"
-msgstr ""
-
 #: setup/lib/messages.inc.php:338
 msgid ""
 "Shows link to [a at http://php.net/manual/function.phpinfo.php]phpinfo()[/a] "
@@ -8559,10 +8558,6 @@ msgstr ""
 msgid "Got invalid version string from server"
 msgstr ""
 
-#: setup/lib/messages.inc.php:370
-msgid "Check for latest version"
-msgstr ""
-
 #: setup/lib/messages.inc.php:371
 #, php-format
 msgid ""
@@ -8594,10 +8589,6 @@ msgid ""
 "Neither URL wrapper nor CURL is available. Version check is not possible."
 msgstr ""
 
-#: setup/lib/messages.inc.php:377
-msgid "Warning"
-msgstr ""
-
 #: setup/lib/messages.inc.php:378
 msgid ""
 "Enable [a at http://en.wikipedia.org/wiki/ZIP_(file_format)]ZIP[/a] compression "
@@ -8659,6 +8650,19 @@ msgid "Description"
 msgstr "Descriere"
 
 #, fuzzy
+#~| msgid ""
+#~| "However on last run no data has been parsed, this usually means "
+#~| "phpMyAdmin won't be able to finish this import unless you increase php "
+#~| "time limits."
+#~ msgid ""
+#~ "However on last run no data has been parsed, this usually means "
+#~ "phpMyAdmin won"
+#~ msgstr ""
+#~ "However on last run no data has been parsed, thi
s usually means "
+#~ "phpMyAdmin won't be able to finish this import unless you increase php "
+#~ "time limits."
+
+#, fuzzy
 #~| msgid "None"
 #~ msgctxt "None action"
 #~ msgid "None"
diff --git a/po/ru.po b/po/ru.po
index 1ff5274..5fca855 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-14 07:48-0400\n"
+"POT-Creation-Date: 2010-05-14 13:39-0400\n"
 "PO-Revision-Date: 2010-03-30 23:23+0200\n"
 "Last-Translator: Michal <michal at cihar.com>\n"
 "Language-Team: russian <ru at li.org>\n"
@@ -953,15 +953,10 @@ msgstr ""
 "его выбрав тот же файл, и процесс продолжится с того места на котором "
 "остановился."
 
-#: import.php:426
-#, fuzzy
-#| msgid ""
-#| "However on last run no data has been parsed, this usually means "
-#| "phpMyAdmin won't be able to finish this import unless you increase php "
-#| "time limits."
+#: import.php:426 libraries/messages.inc.php:1102
 msgid ""
 "However on last run no data has been parsed, this usually means phpMyAdmin "
-"won"
+"won't be able to finish this import unless you increase php time limits."
 msgstr ""
 "Несмотря на последний запуск, данные не были обработаны. Как правило это "
 "означает, что phpMyAdmin не сможет завершить процесс импорта до тех пор, "
@@ -6474,15 +6469,6 @@ msgstr "Потоки"
 msgid "Thread %s was successfully killed."
 msgstr "Процесс %s был успешно завершен."
 
-#: libraries/messages.inc.php:1102
-msgid ""
-"However on last run no data has been parsed, this usually means phpMyAdmin "
-"won't be able to finish this import unless you increase php time limits."
-msgstr ""
-"Несмотря на последний запуск, данные не были обработаны. Как правило это "
-"означает, что phpMyAdmin не сможет завершить процесс импорта до тех пор, "
-"пока не будет увеличено ограничение времени выполнения php-сценариев."
-
 #: libraries/messages.inc.php:1105 pmd_pdf.php:94
 msgid "to/from page"
 msgstr "Страница"
@@ -6961,7 +6947,8 @@ msgstr "Нет"
 msgid "Filter"
 msgstr "Фильтр"
 
-#: navigation.php:319 setup/lib/messages.inc.php:42
+#: navigation.php:319 setup/frames/index.inc.php:218
+#: setup/lib/messages.inc.php:42
 msgid "Clear"
 msgstr "Очистить"
 
@@ -7068,6 +7055,115 @@ msgstr "Небезопасное соединение"
 msgid "Configuration: %s"
 msgstr "Конфигурационный файл"
 
+#: setup/frames/config.inc.php:25 setup/frames/index.inc.php:152
+#: setup/lib/messages.inc.php:45
+msgid "Configuration file"
+msgstr "Конфигурационный файл"
+
+#: setup/frames/config.inc.php:38 setup/frames/index.inc.php:212
+#: setup/lib/messages.inc.php:65
+msgid "Download"
+msgstr "Скачать"
+
+#: setup/frames/index.inc.php:58 setup/lib/messages.inc.php:164
+msgid ""
+"You are not using a secure connection; all data (including potentially "
+"sensitive information, like passwords) is transferred unencrypted!"
+msgstr ""
+"Вы используете обычное, небезопасное соединение; все данные (включая "
+"потенциально критическую информацию, вроде паролей) передаются в "
+"незашифрованном виде!"
+
+#: setup/frames/index.inc.php:87 setup/frames/menu.inc.php:17
+#: setup/lib/messages.inc.php:219
+msgid "Overview"
+msgstr "Обзор"
+
+#: setup/frames/index.inc.php:95 setup/lib/messages.inc.php:337
+msgid "Show hidden messages (#MSG_COUNT)"
+msgstr "Показать скрытые сообщения (#MSG_COUNT)"
+
+#: setup/frames/index.inc.php:135 setup/lib/messages.inc.php:213
+msgid "There are no configured servers"
+msgstr "Отсутствуют настроенные сервера"
+
+#: setup/frames/index.inc.php:143 setup/lib/messages.inc.php:212
+msgid "New server"
+msgstr "Новый сервер"
+
+#: setup/frames/index.inc.php:172 setup/lib/messages.inc.php:50
+msgid "Default language"
+msgstr "Язык по умолчанию"
+
+#: setup/frames/index.inc.php:182 setup/lib/messages.inc.php:187
+msgid "let the user choose"
+msgstr "Предоставить выбор пользователю"
+
+#: setup/frames/index.inc.php:193 setup/lib/messages.inc.php:216
+msgid "- none -"
+msgstr "- не выбран -"
+
+#: setup/frames/index.inc.php:196 setup/lib/messages.inc.php:51
+msgid "Default server"
+msgstr "Сервер по умолчанию"
+
+#: setup/frames/index.inc.php:206 setup/lib/messages.inc.php:66
+msgid "End of line"
+msgstr "Конец строки"
+
+#: setup/frames/index.inc.php:211 setup/lib/messages.inc.php:61
+msgid "Display"
+msgstr "Показать"
+
+#: setup/frames/index.inc.php:215 setup/lib/messages.inc.php:190
+msgid "Load"
+msgstr "Загрузить"
+
+#: setup/frames/index.inc.php:226 setup/lib/messages.inc.php:152
+msgid "phpMyAdmin homepage"
+msgstr "Домашняя страница phpMyAdmin"
+
+#: setup/frames/index.inc.php:227 setup/lib/messages.inc.php:64
+msgid "Donate"
+msgstr "Пожертвование"
+
+#: setup/frames/index.inc.php:228 setup/lib/messages.inc.php:370
+msgid "Check for latest version"
+msgstr "Проверить обновление"
+
+#: setup/frames/menu.inc.php:18 setup/lib/messages.inc.php:137
+msgid "Features"
+msgstr "Настройки"
+
+#: setup/frames/menu.inc.php:19 setup/lib/messages.inc.php:113
+msgid "Navigation frame"
+msgstr "Фрейм навигации"
+
+#: setup/frames/menu.inc.php:20 setup/lib/messages.inc.php:118
+msgid "Main frame"
+msgstr "Основной фрейм"
+
+#: setup/frames/servers.inc.php:28 setup/lib/messages.inc.php:272
+msgid "Edit server"
+msgstr "Редактировать сервер"
+
+#: setup/frames/servers.inc.php:37 setup/lib/messages.inc.php:241
+msgid "Add a new server"
+msgstr "Добавить новый сервер"
+
+#: setup/lib/FormDisplay.tpl.php:182 setup/lib/messages.inc.php:328
+#, php-format
+msgid "Set value: %s"
+msgstr "Установить значение: %s"
+
+#: setup/lib/FormDisplay.tpl.php:187 setup/lib/messages.inc.php:234
+msgid "Restore default value"
+msgstr "Восстановить изначальное значение"
+
+#: setup/lib/form_processing.lib.php:43 setup/lib/messages.inc.php:377
+msgid "Warning"
+msgstr "Предупреждение"
+
 #: setup/lib/messages.inc.php:16
 msgid "Allow character set conversion"
 msgstr "Разрешить перекодирование"
@@ -7237,10 +7333,6 @@ msgstr ""
 msgid "Compress on the fly"
 msgstr "Архивирование на лету"
 
-#: setup/lib/messages.inc.php:45
-msgid "Configuration file"
-msgstr "Конфигурационный файл"
-
 #: setup/lib/messages.inc.php:46
 msgid ""
 "Whether a warning ("Are your really sure...") should be displayed "
@@ -7259,14 +7351,6 @@ msgstr "Кодировка по умолчанию используемая пр
 msgid "Default character set"
 msgstr "Кодировка по умолчанию"
 
-#: setup/lib/messages.inc.php:50
-msgid "Default language"
-msgstr "Язык по умолчанию"
-
-#: setup/lib/messages.inc.php:51
-msgid "Default server"
-msgstr "Сервер по умолчанию"
-
 #: setup/lib/messages.inc.php:52
 msgid "Tab that is displayed when entering a database"
 msgstr "Вкладка отображаемая при выборе базы данных"
@@ -7309,10 +7393,6 @@ msgstr ""
 msgid "Display databases as a list"
 msgstr "Отображать базы данных списком"
 
-#: setup/lib/messages.inc.php:61
-msgid "Display"
-msgstr "Показать"
-
 #: setup/lib/messages.inc.php:62
 msgid "Show server listing as a list instead of a drop down"
 msgstr ""
@@ -7323,18 +7403,6 @@ msgstr ""
 msgid "Display servers as a list"
 msgstr "Выводить серверы списком"
 
-#: setup/lib/messages.inc.php:64
-msgid "Donate"
-msgstr "Пожертвование"
-
-#: setup/lib/messages.inc.php:65
-msgid "Download"
-msgstr "Скачать"
-
-#: setup/lib/messages.inc.php:66
-msgid "End of line"
-msgstr "Конец строки"
-
 #: setup/lib/messages.inc.php:67
 msgid "Could not connect to MySQL server"
 msgstr "Невозможно соединиться с сервером MySQL"
@@ -7525,10 +7593,6 @@ msgstr "Параметры отображения списка баз данны
 msgid "Customize appearance of the navigation frame"
 msgstr "Настройки отображения фрейма навигации"
 
-#: setup/lib/messages.inc.php:113
-msgid "Navigation frame"
-msgstr "Фрейм навигации"
-
 #: setup/lib/messages.inc.php:114
 msgid "Servers display options"
 msgstr "Параметры отображения списка серверов"
@@ -7537,10 +7601,6 @@ msgstr "Параметры отображения списка серверов"
 msgid "Tables display options"
 msgstr "Параметры отображения списка таблиц"
 
-#: setup/lib/messages.inc.php:118
-msgid "Main frame"
-msgstr "Основной фрейм"
-
 #: setup/lib/messages.inc.php:119
 msgid "Settings that didn't fit enywhere else"
 msgstr "Настройки не попадающие в другие разделы"
@@ -7623,10 +7683,6 @@ msgstr "Модификация"
 msgid "Customize export options"
 msgstr "Модифицировать параметры экспорта"
 
-#: setup/lib/messages.inc.php:137
-msgid "Features"
-msgstr "Настройки"
-
 #: setup/lib/messages.inc.php:138
 msgid "Customize import defaults"
 msgstr "Модифицировать изначальлные настройки импорта"
@@ -7699,10 +7755,6 @@ msgstr ""
 "GZip архивов[/a] требует наличия функций (%s), которые недоступны на данной "
 "системе."
 
-#: setup/lib/messages.inc.php:152
-msgid "phpMyAdmin homepage"
-msgstr "Домашняя страница phpMyAdmin"
-
 #: setup/lib/messages.inc.php:153
 msgid "Extra parameters for iconv"
 msgstr "Добавочные параметры iconv"
@@ -7753,15 +7805,6 @@ msgstr "Частичный импорт: пропуск запросов"
 msgid "Insecure connection"
 msgstr "Небезопасное соединение"
 
-#: setup/lib/messages.inc.php:164
-msgid ""
-"You are not using a secure connection; all data (including potentially "
-"sensitive information, like passwords) is transferred unencrypted!"
-msgstr ""
-"Вы используете обычное, небезопасное соединение; все данные (включая "
-"потенциально критическую информацию, вроде паролей) передаются в "
-"незашифрованном виде!"
-
 #: setup/lib/messages.inc.php:165
 #, php-format
 msgid ""
@@ -7863,10 +7906,6 @@ msgstr "Подсвечивать сервер при наведении курс
 msgid "Enable highlighting"
 msgstr "Включить подсветку"
 
-#: setup/lib/messages.inc.php:187
-msgid "let the user choose"
-msgstr "Предоставить выбор пользователю"
-
 #: setup/lib/messages.inc.php:188
 msgid "Use less graphically intense tabs"
 msgstr "Выводить вкладки менее насыщенные графическими элементами"
@@ -7875,10 +7914,6 @@ msgstr "Выводить вкладки менее насыщенные граф
 msgid "Light tabs"
 msgstr "Облегченные вкладки"
 
-#: setup/lib/messages.inc.php:190
-msgid "Load"
-msgstr "Загрузить"
-
 #: setup/lib/messages.inc.php:191
 msgid ""
 "If TRUE, logout deletes cookies for all servers; when set to FALSE, logout "
@@ -8002,14 +8037,6 @@ msgstr "Использовать только иконки, только тек
 msgid "Iconic navigation bar"
 msgstr "Иконки в строке навигации"
 
-#: setup/lib/messages.inc.php:212
-msgid "New server"
-msgstr "Новый сервер"
-
-#: setup/lib/messages.inc.php:213
-msgid "There are no configured servers"
-msgstr "Отсутствуют настроенные сервера"
-
 #: setup/lib/messages.inc.php:214
 msgid "use GZip output buffering for increased speed in HTTP transfers"
 msgstr ""
@@ -8019,10 +8046,6 @@ msgstr ""
 msgid "GZip output buffering"
 msgstr "Буферизация вывода GZip"
 
-#: setup/lib/messages.inc.php:216
-msgid "- none -"
-msgstr "- не выбран -"
-
 #: setup/lib/messages.inc.php:217
 msgid ""
 "[kbd]SMART[/kbd] - i.e. descending order for fields of type TIME, DATE, "
@@ -8035,10 +8058,6 @@ msgstr ""
 msgid "Default sorting order"
 msgstr "Порядок сортировки"
 
-#: setup/lib/messages.inc.php:219
-msgid "Overview"
-msgstr "Обзор"
-
 #: setup/lib/messages.inc.php:220
 msgid "Use persistent connections to MySQL databases"
 msgstr "Использовать постоянные соединения с базами данных MySQL"
@@ -8098,10 +8117,6 @@ msgstr "Выберите функцию, которая будет исполь
 msgid "Recoding engine"
 msgstr "Механизм перекодирования"
 
-#: setup/lib/messages.inc.php:234
-msgid "Restore default value"
-msgstr "Восстановить изначальное значение"
-
 #: setup/lib/messages.inc.php:235
 msgid "Try to revert erroneous fields to their default values"
 msgstr ""
@@ -8139,10 +8154,6 @@ msgstr "По причине улучшения производительнос
 msgid "You allow for connecting to the server without a password."
 msgstr "Вы разрешаете соединение с сервером без пароля."
 
-#: setup/lib/messages.inc.php:241
-msgid "Add a new server"
-msgstr "Добавить новый сервер"
-
 #: setup/lib/messages.inc.php:242
 msgid "Leave blank if not used"
 msgstr "Оставьте поле пустым, если не используете данную функцию"
@@ -8302,10 +8313,6 @@ msgstr ""
 "если ваш IP не является выделенным и кроме вас принадлежит тысячам "
 "пользователей того же Интернет Провайдера."
 
-#: setup/lib/messages.inc.php:272
-msgid "Edit server"
-msgstr "Редактировать сервер"
-
 #: setup/lib/messages.inc.php:273
 msgid "What PHP extension to use; you should use mysqli if supported"
 msgstr ""
@@ -8593,11 +8600,6 @@ msgstr ""
 msgid "Verbose name of this server"
 msgstr "Пользовательское имя сервера"
 
-#: setup/lib/messages.inc.php:328
-#, php-format
-msgid "Set value: %s"
-msgstr "Установить значение: %s"
-
 #: setup/lib/messages.inc.php:329
 msgid ""
 "Whether a user should be displayed a "show all (records)" button"
@@ -8638,10 +8640,6 @@ msgstr "Выводить поля функций в режиме редакти
 msgid "Show function fields"
 msgstr "Выводить поля функций"
 
-#: setup/lib/messages.inc.php:337
-msgid "Show hidden messages (#MSG_COUNT)"
-msgstr "Показать скрытые сообщения (#MSG_COUNT)"
-
 #: setup/lib/messages.inc.php:338
 msgid ""
 "Shows link to [a at http://php.net/manual/function.phpinfo.php]phpinfo()[/a] "
@@ -8794,10 +8792,6 @@ msgstr ""
 msgid "Got invalid version string from server"
 msgstr "От сервера получена некорректная строка версии"
 
-#: setup/lib/messages.inc.php:370
-msgid "Check for latest version"
-msgstr "Проверить обновление"
-
 #: setup/lib/messages.inc.php:371
 #, php-format
 msgid ""
@@ -8837,10 +8831,6 @@ msgid ""
 msgstr ""
 "Недоступны обработчик URL протокола или CURL. Проверка версии невозможна."
 
-#: setup/lib/messages.inc.php:377
-msgid "Warning"
-msgstr "Предупреждение"
-
 #: setup/lib/messages.inc.php:378
 msgid ""
 "Enable [a at http://en.wikipedia.org/wiki/ZIP_(file_format)]ZIP[/a] compression "
@@ -8911,6 +8901,19 @@ msgid "Description"
 msgstr "Описание"
 
 #, fuzzy
+#~| msgid ""
+#~| "However on last run no data has been parsed, this usually means "
+#~| "phpMyAdmin won't be able to finish this import unless you increase php "
+#~| "time limits."
+#~ msgid ""
+#~ "However on last run no data has been parsed, this usually means "
+#~ "phpMyAdmin won"
+#~ msgstr ""
+#~ "Несмотря на последний запуск, данные не были обработаны. Как правило это "
+#~ "означает, что phpMyAdmin не сможет завершить процесс импорта до тех пор, "
+#~ "пока не будет увеличено ограничение времени выполнения php-сценариев."
+
+#, fuzzy
 #~| msgid "None"
 #~ msgctxt "None action"
 #~ msgid "None"
diff --git a/po/si.po b/po/si.po
index 2a0610c..4998298 100644
--- a/po/si.po
+++ b/po/si.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-14 07:48-0400\n"
+"POT-Creation-Date: 2010-05-14 13:39-0400\n"
 "PO-Revision-Date: 2010-03-30 23:09+0200\n"
 "Last-Translator: Michal <michal at cihar.com>\n"
 "Language-Team: sinhala <si at li.org>\n"
@@ -952,15 +952,10 @@ msgstr ""
 "Script timeout passed, if you want to finish import, please resubmit same "
 "file and import will resume."
 
-#: import.php:426
-#, fuzzy
-#| msgid ""
-#| "However on last run no data has been parsed, this usually means "
-#| "phpMyAdmin won't be able to finish this import unless you increase php "
-#| "time limits."
+#: import.php:426 libraries/messages.inc.php:1102
 msgid ""
 "However on last run no data has been parsed, this usually means phpMyAdmin "
-"won"
+"won't be able to finish this import unless you increase php time limits."
 msgstr ""
 "However on last run no data has been parsed, this usually means phpMyAdmin "
 "won't be able to finish this import unless you increase php time limits."
@@ -6366,14 +6361,6 @@ msgstr "ත්‍රෙඩයන්"
 msgid "Thread %s was successfully killed."
 msgstr "Thread %s was successfully killed."
 
-#: libraries/messages.inc.php:1102
-msgid ""
-"However on last run no data has been parsed, this usually means phpMyAdmin "
-"won't be able to finish this import unless you increase php time limits."
-msgstr ""
-"However on last run no data has been parsed, this usually means phpMyAdmin "
-"won't be able to finish this import unless you increase php time limits."
-
 #: libraries/messages.inc.php:1105 pmd_pdf.php:94
 msgid "to/from page"
 msgstr ""
@@ -6839,7 +6826,8 @@ msgstr "කිසිවක් නැත"
 msgid "Filter"
 msgstr "ක්ෂේත්‍ර"
 
-#: navigation.php:319 setup/lib/messages.inc.php:42
+#: navigation.php:319 setup/frames/index.inc.php:218
+#: setup/lib/messages.inc.php:42
 #, fuzzy
 msgid "Clear"
 msgstr "දින දර්ශනය"
@@ -6927,6 +6915,116 @@ msgstr "max. concurrent connections"
 msgid "Configuration: %s"
 msgstr ""
 
+#: setup/frames/config.inc.php:25 setup/frames/index.inc.php:152
+#: setup/lib/messages.inc.php:45
+msgid "Configuration file"
+msgstr ""
+
+#: setup/frames/config.inc.php:38 setup/frames/index.inc.php:212
+#: setup/lib/messages.inc.php:65
+msgid "Download"
+msgstr ""
+
+#: setup/frames/index.inc.php:58 setup/lib/messages.inc.php:164
+msgid ""
+"You are not using a secure connection; all data (including potentially "
+"sensitive information, like passwords) is transferred unencrypted!"
+msgstr ""
+
+#: setup/frames/index.inc.php:87 setup/frames/menu.inc.php:17
+#: setup/lib/messages.inc.php:219
+msgid "Overview"
+msgstr ""
+
+#: setup/frames/index.inc.php:95 setup/lib/messages.inc.php:337
+msgid "Show hidden messages (#MSG_COUNT)"
+msgstr ""
+
+#: setup/frames/index.inc.php:135 setup/lib/messages.inc.php:213
+msgid "There are no configured servers"
+msgstr ""
+
+#: setup/frames/index.inc.php:143 setup/lib/messages.inc.php:212
+msgid "New server"
+msgstr ""
+
+#: setup/frames/index.inc.php:172 setup/lib/messages.inc.php:50
+msgid "Default language"
+msgstr ""
+
+#: setup/frames/index.inc.php:182 setup/lib/messages.inc.php:187
+msgid "let the user choose"
+msgstr ""
+
+#: setup/frames/index.inc.php:193 setup/lib/messages.inc.php:216
+msgid "- none -"
+msgstr ""
+
+#: setup/frames/index.inc.php:196 setup/lib/messages.inc.php:51
+msgid "Default server"
+msgstr ""
+
+#: setup/frames/index.inc.php:206 setup/lib/messages.inc.php:66
+msgid "End of line"
+msgstr ""
+
+#: setup/frames/index.inc.php:211 setup/lib/messages.inc.php:61
+msgid "Display"
+msgstr ""
+
+#: setup/frames/index.inc.php:215 setup/lib/messages.inc.php:190
+#, fuzzy
+msgid "Load"
+msgstr "ස්වදේශී"
+
+#: setup/frames/index.inc.php:226 setup/lib/messages.inc.php:152
+#, fuzzy
+msgid "phpMyAdmin homepage"
+msgstr "phpMyAdmin ලියකියවිලි"
+
+#: setup/frames/index.inc.php:227 setup/lib/messages.inc.php:64
+#, fuzzy
+msgid "Donate"
+msgstr "දත්ත"
+
+#: setup/frames/index.inc.php:228 setup/lib/messages.inc.php:370
+msgid "Check for latest version"
+msgstr ""
+
+#: setup/frames/menu.inc.php:18 setup/lib/messages.inc.php:137
+msgid "Features"
+msgstr ""
+
+#: setup/frames/menu.inc.php:19 setup/lib/messages.inc.php:113
+msgid "Navigation frame"
+msgstr ""
+
+#: setup/frames/menu.inc.php:20 setup/lib/messages.inc.php:118
+msgid "Main frame"
+msgstr ""
+
+#: setup/frames/servers.inc.php:28 setup/lib/messages.inc.php:272
+msgid "Edit server"
+msgstr ""
+
+#: setup/frames/servers.inc.php:37 setup/lib/messages.inc.php:241
+#, fuzzy
+msgid "Add a new server"
+msgstr "නව භාවිතා කරන්නේක් එක් කරන්න"
+
+#: setup/lib/FormDisplay.tpl.php:182 setup/lib/messages.inc.php:328
+#, php-format
+msgid "Set value: %s"
+msgstr ""
+
+#: setup/lib/FormDisplay.tpl.php:187 setup/lib/messages.inc.php:234
+msgid "Restore default value"
+msgstr ""
+
+#: setup/lib/form_processing.lib.php:43 setup/lib/messages.inc.php:377
+msgid "Warning"
+msgstr ""
+
 #: setup/lib/messages.inc.php:16
 msgid "Allow character set conversion"
 msgstr ""
@@ -7066,10 +7164,6 @@ msgstr ""
 msgid "Compress on the fly"
 msgstr ""
 
-#: setup/lib/messages.inc.php:45
-msgid "Configuration file"
-msgstr ""
-
 #: setup/lib/messages.inc.php:46
 msgid ""
 "Whether a warning ("Are your really sure...") should be displayed "
@@ -7088,14 +7182,6 @@ msgstr ""
 msgid "Default character set"
 msgstr ""
 
-#: setup/lib/messages.inc.php:50
-msgid "Default language"
-msgstr ""
-
-#: setup/lib/messages.inc.php:51
-msgid "Default server"
-msgstr ""
-
 #: setup/lib/messages.inc.php:52
 msgid "Tab that is displayed when entering a database"
 msgstr ""
@@ -7137,10 +7223,6 @@ msgstr ""
 msgid "Display databases as a list"
 msgstr ""
 
-#: setup/lib/messages.inc.php:61
-msgid "Display"
-msgstr ""
-
 #: setup/lib/messages.inc.php:62
 msgid "Show server listing as a list instead of a drop down"
 msgstr ""
@@ -7149,19 +7231,6 @@ msgstr ""
 msgid "Display servers as a list"
 msgstr ""
 
-#: setup/lib/messages.inc.php:64
-#, fuzzy
-msgid "Donate"
-msgstr "දත්ත"
-
-#: setup/lib/messages.inc.php:65
-msgid "Download"
-msgstr ""
-
-#: setup/lib/messages.inc.php:66
-msgid "End of line"
-msgstr ""
-
 #: setup/lib/messages.inc.php:67
 msgid "Could not connect to MySQL server"
 msgstr ""
@@ -7343,10 +7412,6 @@ msgstr "දත්තගබඩා අපනයන විකල්ප"
 msgid "Customize appearance of the navigation frame"
 msgstr ""
 
-#: setup/lib/messages.inc.php:113
-msgid "Navigation frame"
-msgstr ""
-
 #: setup/lib/messages.inc.php:114
 #, fuzzy
 msgid "Servers display options"
@@ -7357,10 +7422,6 @@ msgstr "දත්තගබඩා අපනයන විකල්ප"
 msgid "Tables display options"
 msgstr "දත්තගබඩා අපනයන විකල්ප"
 
-#: setup/lib/messages.inc.php:118
-msgid "Main frame"
-msgstr ""
-
 #: setup/lib/messages.inc.php:119
 msgid "Settings that didn't fit enywhere else"
 msgstr ""
@@ -7439,10 +7500,6 @@ msgstr ""
 msgid "Customize export options"
 msgstr "දත්තගබඩා අපනයන විකල්ප"
 
-#: setup/lib/messages.inc.php:137
-msgid "Features"
-msgstr ""
-
 #: setup/lib/messages.inc.php:138
 #, fuzzy
 msgid "Customize import defaults"
@@ -7512,11 +7569,6 @@ msgid ""
 "system."
 msgstr ""
 
-#: setup/lib/messages.inc.php:152
-#, fuzzy
-msgid "phpMyAdmin homepage"
-msgstr "phpMyAdmin ලියකියවිලි"
-
 #: setup/lib/messages.inc.php:153
 msgid "Extra parameters for iconv"
 msgstr ""
@@ -7564,12 +7616,6 @@ msgstr ""
 msgid "Insecure connection"
 msgstr ""
 
-#: setup/lib/messages.inc.php:164
-msgid ""
-"You are not using a secure connection; all data (including potentially "
-"sensitive information, like passwords) is transferred unencrypted!"
-msgstr ""
-
 #: setup/lib/messages.inc.php:165
 #, php-format
 msgid ""
@@ -7668,10 +7714,6 @@ msgstr ""
 msgid "Enable highlighting"
 msgstr ""
 
-#: setup/lib/messages.inc.php:187
-msgid "let the user choose"
-msgstr ""
-
 #: setup/lib/messages.inc.php:188
 msgid "Use less graphically intense tabs"
 msgstr ""
@@ -7680,11 +7722,6 @@ msgstr ""
 msgid "Light tabs"
 msgstr ""
 
-#: setup/lib/messages.inc.php:190
-#, fuzzy
-msgid "Load"
-msgstr "ස්වදේශී"
-
 #: setup/lib/messages.inc.php:191
 msgid ""
 "If TRUE, logout deletes cookies for all servers; when set to FALSE, logout "
@@ -7788,14 +7825,6 @@ msgstr ""
 msgid "Iconic navigation bar"
 msgstr ""
 
-#: setup/lib/messages.inc.php:212
-msgid "New server"
-msgstr ""
-
-#: setup/lib/messages.inc.php:213
-msgid "There are no configured servers"
-msgstr ""
-
 #: setup/lib/messages.inc.php:214
 msgid "use GZip output buffering for increased speed in HTTP transfers"
 msgstr ""
@@ -7804,10 +7833,6 @@ msgstr ""
 msgid "GZip output buffering"
 msgstr ""
 
-#: setup/lib/messages.inc.php:216
-msgid "- none -"
-msgstr ""
-
 #: setup/lib/messages.inc.php:217
 msgid ""
 "[kbd]SMART[/kbd] - i.e. descending order for fields of type TIME, DATE, "
@@ -7818,10 +7843,6 @@ msgstr ""
 msgid "Default sorting order"
 msgstr ""
 
-#: setup/lib/messages.inc.php:219
-msgid "Overview"
-msgstr ""
-
 #: setup/lib/messages.inc.php:220
 msgid "Use persistent connections to MySQL databases"
 msgstr ""
@@ -7876,10 +7897,6 @@ msgstr ""
 msgid "Recoding engine"
 msgstr ""
 
-#: setup/lib/messages.inc.php:234
-msgid "Restore default value"
-msgstr ""
-
 #: setup/lib/messages.inc.php:235
 msgid "Try to revert erroneous fields to their default values"
 msgstr ""
@@ -7911,11 +7928,6 @@ msgstr ""
 msgid "You allow for connecting to the server without a password."
 msgstr ""
 
-#: setup/lib/messages.inc.php:241
-#, fuzzy
-msgid "Add a new server"
-msgstr "නව භාවිතා කරන්නේක් එක් කරන්න"
-
 #: setup/lib/messages.inc.php:242
 msgid "Leave blank if not used"
 msgstr ""
@@ -8059,10 +8071,6 @@ msgid ""
 "to."
 msgstr ""
 
-#: setup/lib/messages.inc.php:272
-msgid "Edit server"
-msgstr ""
-
 #: setup/lib/messages.inc.php:273
 msgid "What PHP extension to use; you should use mysqli if supported"
 msgstr ""
@@ -8314,11 +8322,6 @@ msgstr ""
 msgid "Verbose name of this server"
 msgstr ""
 
-#: setup/lib/messages.inc.php:328
-#, php-format
-msgid "Set value: %s"
-msgstr ""
-
 #: setup/lib/messages.inc.php:329
 msgid ""
 "Whether a user should be displayed a "show all (records)" button"
@@ -8356,10 +8359,6 @@ msgstr ""
 msgid "Show function fields"
 msgstr ""
 
-#: setup/lib/messages.inc.php:337
-msgid "Show hidden messages (#MSG_COUNT)"
-msgstr ""
-
 #: setup/lib/messages.inc.php:338
 msgid ""
 "Shows link to [a at http://php.net/manual/function.phpinfo.php]phpinfo()[/a] "
@@ -8493,10 +8492,6 @@ msgstr ""
 msgid "Got invalid version string from server"
 msgstr ""
 
-#: setup/lib/messages.inc.php:370
-msgid "Check for latest version"
-msgstr ""
-
 #: setup/lib/messages.inc.php:371
 #, php-format
 msgid ""
@@ -8528,10 +8523,6 @@ msgid ""
 "Neither URL wrapper nor CURL is available. Version check is not possible."
 msgstr ""
 
-#: setup/lib/messages.inc.php:377
-msgid "Warning"
-msgstr ""
-
 #: setup/lib/messages.inc.php:378
 msgid ""
 "Enable [a at http://en.wikipedia.org/wiki/ZIP_(file_format)]ZIP[/a] compression "
@@ -8593,6 +8584,19 @@ msgid "Description"
 msgstr "විස්තරය"
 
 #, fuzzy
+#~| msgid ""
+#~| "However on last run no data has been parsed, this usually means "
+#~| "phpMyAdmin won't be able to finish this import unless you increase php "
+#~| "time limits."
+#~ msgid ""
+#~ "However on last run no data has been parsed, this usually means "
+#~ "phpMyAdmin won"
+#~ msgstr ""
+#~ "However on last run no data has been parsed, this usually means "
+#~ "phpMyAdmin won't be able to finish this import unless you increase php "
+#~ "time limits."
+
+#, fuzzy
 #~| msgid "None"
 #~ msgctxt "None action"
 #~ msgid "None"
diff --git a/po/sk.po b/po/sk.po
index 7ac82f8..31ed446 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-14 07:48-0400\n"
+"POT-Creation-Date: 2010-05-14 13:39-0400\n"
 "PO-Revision-Date: 2010-03-30 23:47+0200\n"
 "Last-Translator: Michal <michal at cihar.com>\n"
 "Language-Team: slovak <sk at li.org>\n"
@@ -954,15 +954,10 @@ msgstr ""
 "Časový limit behu skriptu vypršal. Ak chcete import súboru dokončiť, "
 "odošlite znova formulár a import bude pokračovať."
 
-#: import.php:426
-#, fuzzy
-#| msgid ""
-#| "However on last run no data has been parsed, this usually means "
-#| "phpMyAdmin won't be able to finish this import unless you increase php "
-#| "time limits."
+#: import.php:426 libraries/messages.inc.php:1102
 msgid ""
 "However on last run no data has been parsed, this usually means phpMyAdmin "
-"won"
+"won't be able to finish this import unless you increase php time limits."
 msgstr ""
 "Avšak pri poslednom pokuse neboli prijaté žiadne dáta, čo obvykle znamená, "
 "že phpMyAdmin nebude schopný dokončiť tento import, pokiaľ nebude zvýšený "
@@ -6379,15 +6374,6 @@ msgstr "Počet vlákien"
 msgid "Thread %s was successfully killed."
 msgstr "Vlákno %s bol úspešne zabité."
 
-#: libraries/messages.inc.php:1102
-msgid ""
-"However on last run no data has been parsed, this usually means phpMyAdmin "
-"won't be able to finish this import unless you increase php time limits."
-msgstr ""
-"Avšak pri poslednom pokuse neboli prijaté žiadne dáta, čo obvykle znamená, "
-"že phpMyAdmin nebude schopný dokončiť tento import, pokiaľ nebude zvýšený "
-"časový limit behu skriptu v php."
-
 #: libraries/messages.inc.php:1105 pmd_pdf.php:94
 msgid "to/from page"
 msgstr ""
@@ -6851,7 +6837,8 @@ msgstr "Žiadny"
 msgid "Filter"
 msgstr "Filter"
 
-#: navigation.php:319 setup/lib/messages.inc.php:42
+#: navigation.php:319 setup/frames/index.inc.php:218
+#: setup/lib/messages.inc.php:42
 #, fuzzy
 msgid "Clear"
 msgstr "Kalendár"
@@ -6958,6 +6945,118 @@ msgstr "max. súčasných pripojení"
 msgid "Configuration: %s"
 msgstr "Konfiguračný súbor"
 
+#: setup/frames/config.inc.php:25 setup/frames/index.inc.php:152
+#: setup/lib/messages.inc.php:45
+msgid "Configuration file"
+msgstr "Konfiguračný súbor"
+
+#: setup/frames/config.inc.php:38 setup/frames/index.inc.php:212
+#: setup/lib/messages.inc.php:65
+#, fuzzy
+msgid "Download"
+msgstr "Stiahnuť súbor"
+
+#: setup/frames/index.inc.php:58 setup/lib/messages.inc.php:164
+msgid ""
+"You are not using a secure connection; all data (including potentially "
+"sensitive information, like passwords) is transferred unencrypted!"
+msgstr ""
+
+#: setup/frames/index.inc.php:87 setup/frames/menu.inc.php:17
+#: setup/lib/messages.inc.php:219
+msgid "Overview"
+msgstr ""
+
+#: setup/frames/index.inc.php:95 setup/lib/messages.inc.php:337
+msgid "Show hidden messages (#MSG_COUNT)"
+msgstr ""
+
+#: setup/frames/index.inc.php:135 setup/lib/messages.inc.php:213
+msgid "There are no configured servers"
+msgstr ""
+
+#: setup/frames/index.inc.php:143 setup/lib/messages.inc.php:212
+#, fuzzy
+msgid "New server"
+msgstr "Webový server"
+
+#: setup/frames/index.inc.php:172 setup/lib/messages.inc.php:50
+msgid "Default language"
+msgstr "Predvolený jazyk"
+
+#: setup/frames/index.inc.php:182 setup/lib/messages.inc.php:187
+msgid "let the user choose"
+msgstr ""
+
+#: setup/frames/index.inc.php:193 setup/lib/messages.inc.php:216
+msgid "- none -"
+msgstr ""
+
+#: setup/frames/index.inc.php:196 setup/lib/messages.inc.php:51
+msgid "Default server"
+msgstr "Predvolený server"
+
+#: setup/frames/index.inc.php:206 setup/lib/messages.inc.php:66
+msgid "End of line"
+msgstr ""
+
+#: setup/frames/index.inc.php:211 setup/lib/messages.inc.php:61
+msgid "Display"
+msgstr "Zobraziť"
+
+#: setup/frames/index.inc.php:215 setup/lib/messages.inc.php:190
+#, fuzzy
+msgid "Load"
+msgstr "Lokálny"
+
+#: setup/frames/index.inc.php:226 setup/lib/messages.inc.php:152
+#, fuzzy
+msgid "phpMyAdmin homepage"
+msgstr "phpMyAdmin Dokumentácia"
+
+#: setup/frames/index.inc.php:227 setup/lib/messages.inc.php:64
+msgid "Donate"
+msgstr ""
+
+#: setup/frames/index.inc.php:228 setup/lib/messages.inc.php:370
+msgid "Check for latest version"
+msgstr ""
+
+#: setup/frames/menu.inc.php:18 setup/lib/messages.inc.php:137
+msgid "Features"
+msgstr ""
+
+#: setup/frames/menu.inc.php:19 setup/lib/messages.inc.php:113
+msgid "Navigation frame"
+msgstr ""
+
+#: setup/frames/menu.inc.php:20 setup/lib/messages.inc.php:118
+msgid "Main frame"
+msgstr ""
+
+#: setup/frames/servers.inc.php:28 setup/lib/messages.inc.php:272
+#, fuzzy
+msgid "Edit server"
+msgstr "Webový server"
+
+#: setup/frames/servers.inc.php:37 setup/lib/messages.inc.php:241
+#, fuzzy
+msgid "Add a new server"
+msgstr "Pridať nového používateľa"
+
+#: setup/lib/FormDisplay.tpl.php:182 setup/lib/messages.inc.php:328
+#, php-format
+msgid "Set value: %s"
+msgstr ""
+
+#: setup/lib/FormDisplay.tpl.php:187 setup/lib/messages.inc.php:234
+msgid "Restore default value"
+msgstr ""
+
+#: setup/lib/form_processing.lib.php:43 setup/lib/messages.inc.php:377
+msgid "Warning"
+msgstr ""
+
 #: setup/lib/messages.inc.php:16
 msgid "Allow character set conversion"
 msgstr ""
@@ -7099,10 +7198,6 @@ msgstr ""
 msgid "Compress on the fly"
 msgstr ""
 
-#: setup/lib/messages.inc.php:45
-msgid "Configuration file"
-msgstr "Konfiguračný súbor"
-
 #: setup/lib/messages.inc.php:46
 msgid ""
 "Whether a warning ("Are your really sure...") should be displayed "
@@ -7121,14 +7216,6 @@ msgstr ""
 msgid "Default character set"
 msgstr ""
 
-#: setup/lib/messages.inc.php:50
-msgid "Default language"
-msgstr "Predvolený jazyk"
-
-#: setup/lib/messages.inc.php:51
-msgid "Default server"
-msgstr "Predvolený server"
-
 #: setup/lib/messages.inc.php:52
 msgid "Tab that is displayed when entering a database"
 msgstr ""
@@ -7169,10 +7256,6 @@ msgstr ""
 msgid "Display databases as a list"
 msgstr ""
 
-#: setup/lib/messages.inc.php:61
-msgid "Display"
-msgstr "Zobraziť"
-
 #: setup/lib/messages.inc.php:62
 msgid "Show server listing as a list instead of a drop down"
 msgstr ""
@@ -7181,19 +7264,6 @@ msgstr ""
 msgid "Display servers as a list"
 msgstr ""
 
-#: setup/lib/messages.inc.php:64
-msgid "Donate"
-msgstr ""
-
-#: setup/lib/messages.inc.php:65
-#, fuzzy
-msgid "Download"
-msgstr "Stiahnuť súbor"
-
-#: setup/lib/messages.inc.php:66
-msgid "End of line"
-msgstr ""
-
 #: setup/lib/messages.inc.php:67
 #, fuzzy
 msgid "Could not connect to MySQL server"
@@ -7374,10 +7444,6 @@ msgstr "Nastavenia exportu databáz"
 msgid "Customize appearance of the navigation frame"
 msgstr ""
 
-#: setup/lib/messages.inc.php:113
-msgid "Navigation frame"
-msgstr ""
-
 #: setup/lib/messages.inc.php:114
 msgid "Servers display options"
 msgstr ""
@@ -7386,10 +7452,6 @@ msgstr ""
 msgid "Tables display options"
 msgstr ""
 
-#: setup/lib/messages.inc.php:118
-msgid "Main frame"
-msgstr ""
-
 #: setup/lib/messages.inc.php:119
 msgid "Settings that didn't fit enywhere else"
 msgstr ""
@@ -7467,10 +7529,6 @@ msgstr ""
 msgid "Customize export options"
 msgstr "Nastavenia exportu databáz"
 
-#: setup/lib/messages.inc.php:137
-msgid "Features"
-msgstr ""
-
 #: setup/lib/messages.inc.php:138
 msgid "Customize import defaults"
 msgstr ""
@@ -7539,11 +7597,6 @@ msgid ""
 "system."
 msgstr ""
 
-#: setup/lib/messages.inc.php:152
-#, fuzzy
-msgid "phpMyAdmin homepage"
-msgstr "phpMyAdmin Dokumentácia"
-
 #: setup/lib/messages.inc.php:153
 msgid "Extra parameters for iconv"
 msgstr ""
@@ -7591,12 +7644,6 @@ msgstr ""
 msgid "Insecure connection"
 msgstr ""
 
-#: setup/lib/messages.inc.php:164
-msgid ""
-"You are not using a secure connection; all data (including potentially "
-"sensitive information, like passwords) is transferred unencrypted!"
-msgstr ""
-
 #: setup/lib/messages.inc.php:165
 #, php-format
 msgid ""
@@ -7694,10 +7741,6 @@ msgstr ""
 msgid "Enable highlighting"
 msgstr ""
 
-#: setup/lib/messages.inc.php:187
-msgid "let the user choose"
-msgstr ""
-
 #: setup/lib/messages.inc.php:188
 msgid "Use less graphically intense tabs"
 msgstr ""
@@ -7706,11 +7749,6 @@ msgstr ""
 msgid "Light tabs"
 msgstr ""
 
-#: setup/lib/messages.inc.php:190
-#, fuzzy
-msgid "Load"
-msgstr "Lokálny"
-
 #: setup/lib/messages.inc.php:191
 msgid ""
 "If TRUE, logout deletes cookies for all servers; when set to FALSE, logout "
@@ -7813,15 +7851,6 @@ msgstr ""
 msgid "Iconic navigation bar"
 msgstr ""
 
-#: setup/lib/messages.inc.php:212
-#, fuzzy
-msgid "New server"
-msgstr "Webový server"
-
-#: setup/lib/messages.inc.php:213
-msgid "There are no configured servers"
-msgstr ""
-
 #: setup/lib/messages.inc.php:214
 msgid "use GZip output buffering for increased speed in HTTP transfers"
 msgstr ""
@@ -7830,10 +7859,6 @@ msgstr ""
 msgid "GZip output buffering"
 msgstr ""
 
-#: setup/lib/messages.inc.php:216
-msgid "- none -"
-msgstr ""
-
 #: setup/lib/messages.inc.php:217
 msgid ""
 "[kbd]SMART[/kbd] - i.e. descending order for fields of type TIME, DATE, "
@@ -7844,10 +7869,6 @@ msgstr ""
 msgid "Default sorting order"
 msgstr ""
 
-#: setup/lib/messages.inc.php:219
-msgid "Overview"
-msgstr ""
-
 #: setup/lib/messages.inc.php:220
 msgid "Use persistent connections to MySQL databases"
 msgstr ""
@@ -7902,10 +7923,6 @@ msgstr ""
 msgid "Recoding engine"
 msgstr ""
 
-#: setup/lib/messages.inc.php:234
-msgid "Restore default value"
-msgstr ""
-
 #: setup/lib/messages.inc.php:235
 msgid "Try to revert erroneous fields to their default values"
 msgstr ""
@@ -7937,11 +7954,6 @@ msgstr ""
 msgid "You allow for connecting to the server without a password."
 msgstr ""
 
-#: setup/lib/messages.inc.php:241
-#, fuzzy
-msgid "Add a new server"
-msgstr "Pridať nového používateľa"
-
 #: setup/lib/messages.inc.php:242
 msgid "Leave blank if not used"
 msgstr ""
@@ -8086,11 +8098,6 @@ msgid ""
 "to."
 msgstr ""
 
-#: setup/lib/messages.inc.php:272
-#, fuzzy
-msgid "Edit server"
-msgstr "Webový server"
-
 #: setup/lib/messages.inc.php:273
 msgid "What PHP extension to use; you should use mysqli if supported"
 msgstr ""
@@ -8342,11 +8349,6 @@ msgstr ""
 msgid "Verbose name of this server"
 msgstr ""
 
-#: setup/lib/messages.inc.php:328
-#, php-format
-msgid "Set value: %s"
-msgstr ""
-
 #: setup/lib/messages.inc.php:329
 msgid ""
 "Whether a user should be displayed a "show all (records)" button"
@@ -8384,10 +8386,6 @@ msgstr ""
 msgid "Show function fields"
 msgstr ""
 
-#: setup/lib/messages.inc.php:337
-msgid "Show hidden messages (#MSG_COUNT)"
-msgstr ""
-
 #: setup/lib/messages.inc.php:338
 msgid ""
 "Shows link to [a at http://php.net/manual/function.phpinfo.php]phpinfo()[/a] "
@@ -8520,10 +8518,6 @@ msgstr ""
 msgid "Got invalid version string from server"
 msgstr ""
 
-#: setup/lib/messages.inc.php:370
-msgid "Check for latest version"
-msgstr ""
-
 #: setup/lib/messages.inc.php:371
 #, php-format
 msgid ""
@@ -8555,10 +8549,6 @@ msgid ""
 "Neither URL wrapper nor CURL is available. Version check is not possible."
 msgstr ""
 
-#: setup/lib/messages.inc.php:377
-msgid "Warning"
-msgstr ""
-
 #: setup/lib/messages.inc.php:378
 msgid ""
 "Enable [a at http://en.wikipedia.org/wiki/ZIP_(file_format)]ZIP[/a] compression "
@@ -8620,6 +8610,19 @@ msgid "Description"
 msgstr "Popis"
 
 #, fuzzy
+#~| msgid ""
+#~| "However on last run no data has been parsed, this usually means "
+#~| "phpMyAdmin won't be able to finish this import unless you increase php "
+#~| "time limits."
+#~ msgid ""
+#~ "However on last run no data has been parsed, this usually means "
+#~ "phpMyAdmin won"
+#~ msgstr ""
+#~ "Avšak pri poslednom pokuse neboli prijaté žiadne dáta, čo obvykle "
+#~ "znamená, že phpMyAdmin nebude schopný dokončiť tento import, pokiaľ "
+#~ "nebude zvýšený časový limit behu skriptu v php."
+
+#, fuzzy
 #~| msgid "None"
 #~ msgctxt "None action"
 #~ msgid "None"
diff --git a/po/sl.po b/po/sl.po
index 45ea505..d75afdf 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-14 07:48-0400\n"
+"POT-Creation-Date: 2010-05-14 13:39-0400\n"
 "PO-Revision-Date: 2010-05-07 23:30+0200\n"
 "Last-Translator:  <dbc334 at gmail.com>\n"
 "Language-Team: slovenian <sl at li.org>\n"
@@ -940,15 +940,10 @@ msgstr ""
 "Časovna omejitev skripta je potekla; če želite končati uvoz, prosimo, "
 "ponovno pošljite isto datoteko in uvoz se bo nadaljeval."
 
-#: import.php:426
-#, fuzzy
-#| msgid ""
-#| "However on last run no data has been parsed, this usually means "
-#| "phpMyAdmin won't be able to finish this import unless you increase php "
-#| "time limits."
+#: import.php:426 libraries/messages.inc.php:1102
 msgid ""
 "However on last run no data has been parsed, this usually means phpMyAdmin "
-"won"
+"won't be able to finish this import unless you increase php time limits."
 msgstr ""
 "Kakor koli, ob zadnjem zagonu ni bilo razčlenjenih nič podatkov, kar po "
 "navadi pomeni, da phpMyAdmin ne bo mogel dokončati tega uvoza, razen če "
@@ -6203,15 +6198,6 @@ msgstr "Niti"
 msgid "Thread %s was successfully killed."
 msgstr "Nit %s je bila prekinjena."
 
-#: libraries/messages.inc.php:1102
-msgid ""
-"However on last run no data has been parsed, this usually means phpMyAdmin "
-"won't be able to finish this import unless you increase php time limits."
-msgstr ""
-"Kakor koli, ob zadnjem zagonu ni bilo razčlenjenih nič podatkov, kar po "
-"navadi pomeni, da phpMyAdmin ne bo mogel dokončati tega uvoza, razen če "
-"povečate vaše časovne omejitve PHP."
-
 #: libraries/messages.inc.php:1105 pmd_pdf.php:94
 msgid "to/from page"
 msgstr ""
@@ -6672,7 +6658,8 @@ msgstr "Brez"
 msgid "Filter"
 msgstr "Filtriranje"
 
-#: navigation.php:319 setup/lib/messages.inc.php:42
+#: navigation.php:319 setup/frames/index.inc.php:218
+#: setup/lib/messages.inc.php:42
 msgid "Clear"
 msgstr "Počisti"
 
@@ -6749,6 +6736,114 @@ msgstr "Trenutna povezava"
 msgid "Configuration: %s"
 msgstr "Konfiguracija: %s"
 
+#: setup/frames/config.inc.php:25 setup/frames/index.inc.php:152
+#: setup/lib/messages.inc.php:45
+msgid "Configuration file"
+msgstr "Konfiguracijska datoteka"
+
+#: setup/frames/config.inc.php:38 setup/frames/index.inc.php:212
+#: setup/lib/messages.inc.php:65
+msgid "Download"
+msgstr "Prenesi"
+
+#: setup/frames/index.inc.php:58 setup/lib/messages.inc.php:164
+msgid ""
+"You are not using a secure connection; all data (including potentially "
+"sensitive information, like passwords) is transferred unencrypted!"
+msgstr ""
+"Ne uporabljate varne povezave; vsi podatki (vključno z morebitnimi "
+"občutljivimi informacijami, kot so gesla) se prenašajo nešifrirani!"
+
+#: setup/frames/index.inc.php:87 setup/frames/menu.inc.php:17
+#: setup/lib/messages.inc.php:219
+msgid "Overview"
+msgstr "Pregled"
+
+#: setup/frames/index.inc.php:95 setup/lib/messages.inc.php:337
+msgid "Show hidden messages (#MSG_COUNT)"
+msgstr "Prikaži skrita sporočila (#MSG_COUNT)"
+
+#: setup/frames/index.inc.php:135 setup/lib/messages.inc.php:213
+msgid "There are no configured servers"
+msgstr "Ni konfiguriranih strežnikov"
+
+#: setup/frames/index.inc.php:143 setup/lib/messages.inc.php:212
+msgid "New server"
+msgstr "Nov strežnik"
+
+#: setup/frames/index.inc.php:172 setup/lib/messages.inc.php:50
+msgid "Default language"
+msgstr "Privzet jezik"
+
+#: setup/frames/index.inc.php:182 setup/lib/messages.inc.php:187
+msgid "let the user choose"
+msgstr "naj uporabnik izbere"
+
+#: setup/frames/index.inc.php:193 setup/lib/messages.inc.php:216
+msgid "- none -"
+msgstr "- noben -"
+
+#: setup/frames/index.inc.php:196 setup/lib/messages.inc.php:51
+msgid "Default server"
+msgstr "Privzet strežnik"
+
+#: setup/frames/index.inc.php:206 setup/lib/messages.inc.php:66
+msgid "End of line"
+msgstr "Konec vrstice"
+
+#: setup/frames/index.inc.php:211 setup/lib/messages.inc.php:61
+msgid "Display"
+msgstr "Prikaži"
+
+#: setup/frames/index.inc.php:215 setup/lib/messages.inc.php:190
+msgid "Load"
+msgstr "Naloži"
+
+#: setup/frames/index.inc.php:226 setup/lib/messages.inc.php:152
+msgid "phpMyAdmin homepage"
+msgstr "Domača stran phpMyAdmin"
+
+#: setup/frames/index.inc.php:227 setup/lib/messages.inc.php:64
+msgid "Donate"
+msgstr "Daruj"
+
+#: setup/frames/index.inc.php:228 setup/lib/messages.inc.php:370
+msgid "Check for latest version"
+msgstr "Preveri za najnovejšo različico"
+
+#: setup/frames/menu.inc.php:18 setup/lib/messages.inc.php:137
+msgid "Features"
+msgstr "Lastnosti"
+
+#: setup/frames/menu.inc.php:19 setup/lib/messages.inc.php:113
+msgid "Navigation frame"
+msgstr "Navigacijski okvir"
+
+#: setup/frames/menu.inc.php:20 setup/lib/messages.inc.php:118
+msgid "Main frame"
+msgstr "Glavni okvir"
+
+#: setup/frames/servers.inc.php:28 setup/lib/messages.inc.php:272
+msgid "Edit server"
+msgstr "Uredi strežnik"
+
+#: setup/frames/servers.inc.php:37 setup/lib/messages.inc.php:241
+msgid "Add a new server"
+msgstr "Dodaj nov strežnik"
+
+#: setup/lib/FormDisplay.tpl.php:182 setup/lib/messages.inc.php:328
+#, php-format
+msgid "Set value: %s"
+msgstr ""
+
+#: setup/lib/FormDisplay.tpl.php:187 setup/lib/messages.inc.php:234
+msgid "Restore default value"
+msgstr ""
+
+#: setup/lib/form_processing.lib.php:43 setup/lib/messages.inc.php:377
+msgid "Warning"
+msgstr "Opozorilo"
+
 #: setup/lib/messages.inc.php:16
 msgid "Allow character set conversion"
 msgstr "Omogoči pretvarjanje nabora znakov"
@@ -6897,10 +6992,6 @@ msgstr ""
 msgid "Compress on the fly"
 msgstr ""
 
-#: setup/lib/messages.inc.php:45
-msgid "Configuration file"
-msgstr "Konfiguracijska datoteka"
-
 #: setup/lib/messages.inc.php:46
 msgid ""
 "Whether a warning ("Are your really sure...") should be displayed "
@@ -6921,14 +7012,6 @@ msgstr "Privzet nabor znakov uporabljen za pretvorbe"
 msgid "Default character set"
 msgstr "Privzet nabor znakov"
 
-#: setup/lib/messages.inc.php:50
-msgid "Default language"
-msgstr "Privzet jezik"
-
-#: setup/lib/messages.inc.php:51
-msgid "Default server"
-msgstr "Privzet strežnik"
-
 #: setup/lib/messages.inc.php:52
 msgid "Tab that is displayed when entering a database"
 msgstr "Zavihek, ki se prikaže ob odprtju podatkovne zbirke"
@@ -6970,10 +7053,6 @@ msgstr "Prikaži naštete zbirke podatkov kot seznam namesto spustnega menija"
 msgid "Display databases as a list"
 msgstr "Prikaži zbirke podatkov kot seznam"
 
-#: setup/lib/messages.inc.php:61
-msgid "Display"
-msgstr "Prikaži"
-
 #: setup/lib/messages.inc.php:62
 msgid "Show server listing as a list instead of a drop down"
 msgstr "Prikaži naštete strežnike kot seznam namesto spustnega menija"
@@ -6982,18 +7061,6 @@ msgstr "Prikaži naštete strežnike kot seznam namesto spustnega menija"
 msgid "Display servers as a list"
 msgstr "Prikaži strežnike kot seznam"
 
-#: setup/lib/messages.inc.php:64
-msgid "Donate"
-msgstr "Daruj"
-
-#: setup/lib/messages.inc.php:65
-msgid "Download"
-msgstr "Prenesi"
-
-#: setup/lib/messages.inc.php:66
-msgid "End of line"
-msgstr "Konec vrstice"
-
 #: setup/lib/messages.inc.php:67
 msgid "Could not connect to MySQL server"
 msgstr "Ne morem se povezati s strežnikom MySQL"
@@ -7169,10 +7236,6 @@ msgstr "Možnosti prikaza podatkovnih zbirk"
 msgid "Customize appearance of the navigation frame"
 msgstr "Prilagodite prikaz navigacijskega okvirja"
 
-#: setup/lib/messages.inc.php:113
-msgid "Navigation frame"
-msgstr "Navigacijski okvir"
-
 #: setup/lib/messages.inc.php:114
 msgid "Servers display options"
 msgstr "Možnosti prikaza strežnikov"
@@ -7181,10 +7244,6 @@ msgstr "Možnosti prikaza strežnikov"
 msgid "Tables display options"
 msgstr "Možnosti prikaza tabel"
 
-#: setup/lib/messages.inc.php:118
-msgid "Main frame"
-msgstr "Glavni okvir"
-
 #: setup/lib/messages.inc.php:119
 msgid "Settings that didn't fit enywhere else"
 msgstr "Nastavitve, ki se ne uvrščajo nikamor drugam"
@@ -7266,10 +7325,6 @@ msgstr "Prilagoditev"
 msgid "Customize export options"
 msgstr "Prilagodi možnosti izvoza"
 
-#: setup/lib/messages.inc.php:137
-msgid "Features"
-msgstr "Lastnosti"
-
 #: setup/lib/messages.inc.php:138
 msgid "Customize import defaults"
 msgstr "Prilagodi privzete možnosti uvoza"
@@ -7340,10 +7395,6 @@ msgstr ""
 "[a@?page=form&formset=features#tab_Import_export]Stiskanje in "
 "razpenjanje GZip[/a] zahteva funkcije (%s), ki na tem sistemu niso na voljo."
 
-#: setup/lib/messages.inc.php:152
-msgid "phpMyAdmin homepage"
-msgstr "Domača stran phpMyAdmin"
-
 #: setup/lib/messages.inc.php:153
 msgid "Extra parameters for iconv"
 msgstr "Dodatni parametri za iconv"
@@ -7394,14 +7445,6 @@ msgstr "Delni uvoz: preskoči poizvedbe"
 msgid "Insecure connection"
 msgstr "Nezavarovana povezava"
 
-#: setup/lib/messages.inc.php:164
-msgid ""
-"You are not using a secure connection; all data (including potentially "
-"sensitive information, like passwords) is transferred unencrypted!"
-msgstr ""
-"Ne uporabljate varne povezave; vsi podatki (vključno z morebitnimi "
-"občutljivimi informacijami, kot so gesla) se prenašajo nešifrirani!"
-
 #: setup/lib/messages.inc.php:165
 #, php-format
 msgid ""
@@ -7503,10 +7546,6 @@ msgstr "Poudari strežnik pod miškinim kazalcem"
 msgid "Enable highlighting"
 msgstr "Omogoči poudarjanje"
 
-#: setup/lib/messages.inc.php:187
-msgid "let the user choose"
-msgstr "naj uporabnik izbere"
-
 #: setup/lib/messages.inc.php:188
 msgid "Use less graphically intense tabs"
 msgstr "Uporabi grafično manj zahtevne zavihke"
@@ -7515,10 +7554,6 @@ msgstr "Uporabi grafično manj zahtevne zavihke"
 msgid "Light tabs"
 msgstr "Lahki zavihki"
 
-#: setup/lib/messages.inc.php:190
-msgid "Load"
-msgstr "Naloži"
-
 #: setup/lib/messages.inc.php:191
 msgid ""
 "If TRUE, logout deletes cookies for all servers; when set to FALSE, logout "
@@ -7627,14 +7662,6 @@ msgstr "Uporabi samo ikone, samo besedilo ali oboje"
 msgid "Iconic navigation bar"
 msgstr ""
 
-#: setup/lib/messages.inc.php:212
-msgid "New server"
-msgstr "Nov strežnik"
-
-#: setup/lib/messages.inc.php:213
-msgid "There are no configured servers"
-msgstr "Ni konfiguriranih strežnikov"
-
 #: setup/lib/messages.inc.php:214
 msgid "use GZip output buffering for increased speed in HTTP transfers"
 msgstr "Uporabi izhod medpomnjenja GZip za povečano hitrost v prenosih HTTP"
@@ -7643,10 +7670,6 @@ msgstr "Uporabi izhod medpomnjenja GZip za povečano hitrost v prenosih HTTP"
 msgid "GZip output buffering"
 msgstr "Izhod medpomnjenja GZip"
 
-#: setup/lib/messages.inc.php:216
-msgid "- none -"
-msgstr "- noben -"
-
 #: setup/lib/messages.inc.php:217
 msgid ""
 "[kbd]SMART[/kbd] - i.e. descending order for fields of type TIME, DATE, "
@@ -7659,10 +7682,6 @@ msgstr ""
 msgid "Default sorting order"
 msgstr "Privzet vrstni red"
 
-#: setup/lib/messages.inc.php:219
-msgid "Overview"
-msgstr "Pregled"
-
 #: setup/lib/messages.inc.php:220
 msgid "Use persistent connections to MySQL databases"
 msgstr "Uporabi vztrajne povezave s podatkovnimi zbirkami MySQL"
@@ -7717,10 +7736,6 @@ msgstr ""
 msgid "Recoding engine"
 msgstr ""
 
-#: setup/lib/messages.inc.php:234
-msgid "Restore default value"
-msgstr ""
-
 #: setup/lib/messages.inc.php:235
 msgid "Try to revert erroneous fields to their default values"
 msgstr ""
@@ -7751,10 +7766,6 @@ msgstr ""
 msgid "You allow for connecting to the server without a password."
 msgstr ""
 
-#: setup/lib/messages.inc.php:241
-msgid "Add a new server"
-msgstr "Dodaj nov strežnik"
-
 #: setup/lib/messages.inc.php:242
 msgid "Leave blank if not used"
 msgstr ""
@@ -7897,10 +7908,6 @@ msgid ""
 "to."
 msgstr ""
 
-#: setup/lib/messages.inc.php:272
-msgid "Edit server"
-msgstr "Uredi strežnik"
-
 #: setup/lib/messages.inc.php:273
 msgid "What PHP extension to use; you should use mysqli if supported"
 msgstr ""
@@ -8142,11 +8149,6 @@ msgstr ""
 msgid "Verbose name of this server"
 msgstr ""
 
-#: setup/lib/messages.inc.php:328
-#, php-format
-msgid "Set value: %s"
-msgstr ""
-
 #: setup/lib/messages.inc.php:329
 msgid ""
 "Whether a user should be displayed a "show all (records)" button"
@@ -8183,10 +8185,6 @@ msgstr ""
 msgid "Show function fields"
 msgstr ""
 
-#: setup/lib/messages.inc.php:337
-msgid "Show hidden messages (#MSG_COUNT)"
-msgstr "Prikaži skrita sporočila (#MSG_COUNT)"
-
 #: setup/lib/messages.inc.php:338
 msgid ""
 "Shows link to [a at http://php.net/manual/function.phpinfo.php]phpinfo()[/a] "
@@ -8322,10 +8320,6 @@ msgstr ""
 msgid "Got invalid version string from server"
 msgstr "Od strežnika sem dobil neveljavno besedilo različice"
 
-#: setup/lib/messages.inc.php:370
-msgid "Check for latest version"
-msgstr "Preveri za najnovejšo različico"
-
 #: setup/lib/messages.inc.php:371
 #, php-format
 msgid ""
@@ -8361,10 +8355,6 @@ msgid ""
 "Neither URL wrapper nor CURL is available. Version check is not possible."
 msgstr "Na voljo ni ne vmesnik URL ne CURL. Preverjanje različice ni mogoče."
 
-#: setup/lib/messages.inc.php:377
-msgid "Warning"
-msgstr "Opozorilo"
-
 #: setup/lib/messages.inc.php:378
 msgid ""
 "Enable [a at http://en.wikipedia.org/wiki/ZIP_(file_format)]ZIP[/a] compression "
@@ -8421,3 +8411,16 @@ msgstr "Ustvari indeks na  %s stolpcih"
 msgctxt "for MIME transformation"
 msgid "Description"
 msgstr "Opis"
+
+#, fuzzy
+#~| msgid ""
+#~| "However on last run no data has been parsed, this usually means "
+#~| "phpMyAdmin won't be able to finish this import unless you increase php "
+#~| "time limits."
+#~ msgid ""
+#~ "However on last run no data has been parsed, this usually means "
+#~ "phpMyAdmin won"
+#~ msgstr ""
+#~ "Kakor koli, ob zadnjem zagonu ni bilo razčlenjenih nič podatkov, kar po "
+#~ "navadi pomeni, da phpMyAdmin ne bo mogel dokončati tega uvoza, razen če "
+#~ "povečate vaše časovne omejitve PHP."
diff --git a/po/sq.po b/po/sq.po
index 6d8bf1b..2df8824 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-14 07:48-0400\n"
+"POT-Creation-Date: 2010-05-14 13:39-0400\n"
 "PO-Revision-Date: 2010-03-30 23:08+0200\n"
 "Last-Translator: Michal <michal at cihar.com>\n"
 "Language-Team: albanian <sq at li.org>\n"
@@ -945,10 +945,10 @@ msgid ""
 "file and import will resume."
 msgstr ""
 
-#: import.php:426
+#: import.php:426 libraries/messages.inc.php:1102
 msgid ""
 "However on last run no data has been parsed, this usually means phpMyAdmin "
-"won"
+"won't be able to finish this import unless you increase php time limits."
 msgstr ""
 
 #: index.php:190 libraries/messages.inc.php:549
@@ -6218,12 +6218,6 @@ msgstr ""
 msgid "Thread %s was successfully killed."
 msgstr "Thread %s u përfundua me sukses."
 
-#: libraries/messages.inc.php:1102
-msgid ""
-"However on last run no data has been parsed, this usually means phpMyAdmin "
-"won't be able to finish this import unless you increase php time limits."
-msgstr ""
-
 #: libraries/messages.inc.php:1105 pmd_pdf.php:94
 msgid "to/from page"
 msgstr ""
@@ -6685,7 +6679,8 @@ msgstr "Asnjë lloj"
 msgid "Filter"
 msgstr ""
 
-#: navigation.php:319 setup/lib/messages.inc.php:42
+#: navigation.php:319 setup/frames/index.inc.php:218
+#: setup/lib/messages.inc.php:42
 #, fuzzy
 msgid "Clear"
 msgstr "Kalendari"
@@ -6773,6 +6768,115 @@ msgstr "Lidhje"
 msgid "Configuration: %s"
 msgstr ""
 
+#: setup/frames/config.inc.php:25 setup/frames/index.inc.php:152
+#: setup/lib/messages.inc.php:45
+msgid "Configuration file"
+msgstr ""
+
+#: setup/frames/config.inc.php:38 setup/frames/index.inc.php:212
+#: setup/lib/messages.inc.php:65
+msgid "Download"
+msgstr ""
+
+#: setup/frames/index.inc.php:58 setup/lib/messages.inc.php:164
+msgid ""
+"You are not using a secure connection; all data (including potentially "
+"sensitive information, like passwords) is transferred unencrypted!"
+msgstr ""
+
+#: setup/frames/index.inc.php:87 setup/frames/menu.inc.php:17
+#: setup/lib/messages.inc.php:219
+msgid "Overview"
+msgstr ""
+
+#: setup/frames/index.inc.php:95 setup/lib/messages.inc.php:337
+msgid "Show hidden messages (#MSG_COUNT)"
+msgstr ""
+
+#: setup/frames/index.inc.php:135 setup/lib/messages.inc.php:213
+msgid "There are no configured servers"
+msgstr ""
+
+#: setup/frames/index.inc.php:143 setup/lib/messages.inc.php:212
+msgid "New server"
+msgstr ""
+
+#: setup/frames/index.inc.php:172 setup/lib/messages.inc.php:50
+msgid "Default language"
+msgstr ""
+
+#: setup/frames/index.inc.php:182 setup/lib/messages.inc.php:187
+msgid "let the user choose"
+msgstr ""
+
+#: setup/frames/index.inc.php:193 setup/lib/messages.inc.php:216
+msgid "- none -"
+msgstr ""
+
+#: setup/frames/index.inc.php:196 setup/lib/messages.inc.php:51
+msgid "Default server"
+msgstr ""
+
+#: setup/frames/index.inc.php:206 setup/lib/messages.inc.php:66
+msgid "End of line"
+msgstr ""
+
+#: setup/frames/index.inc.php:211 setup/lib/messages.inc.php:61
+msgid "Display"
+msgstr ""
+
+#: setup/frames/index.inc.php:215 setup/lib/messages.inc.php:190
+#, fuzzy
+msgid "Load"
+msgstr "Lokal"
+
+#: setup/frames/index.inc.php:226 setup/lib/messages.inc.php:152
+#, fuzzy
+msgid "phpMyAdmin homepage"
+msgstr "Dokumente të phpMyAdmin"
+
+#: setup/frames/index.inc.php:227 setup/lib/messages.inc.php:64
+msgid "Donate"
+msgstr ""
+
+#: setup/frames/index.inc.php:228 setup/lib/messages.inc.php:370
+msgid "Check for latest version"
+msgstr ""
+
+#: setup/frames/menu.inc.php:18 setup/lib/messages.inc.php:137
+msgid "Features"
+msgstr ""
+
+#: setup/frames/menu.inc.php:19 setup/lib/messages.inc.php:113
+msgid "Navigation frame"
+msgstr ""
+
+#: setup/frames/menu.inc.php:20 setup/lib/messages.inc.php:118
+msgid "Main frame"
+msgstr ""
+
+#: setup/frames/servers.inc.php:28 setup/lib/messages.inc.php:272
+msgid "Edit server"
+msgstr ""
+
+#: setup/frames/servers.inc.php:37 setup/lib/messages.inc.php:241
+#, fuzzy
+msgid "Add a new server"
+msgstr "Shto një përdorues të ri"
+
+#: setup/lib/FormDisplay.tpl.php:182 setup/lib/messages.inc.php:328
+#, php-format
+msgid "Set value: %s"
+msgstr ""
+
+#: setup/lib/FormDisplay.tpl.php:187 setup/lib/messages.inc.php:234
+msgid "Restore default value"
+msgstr ""
+
+#: setup/lib/form_processing.lib.php:43 setup/lib/messages.inc.php:377
+msgid "Warning"
+msgstr ""
+
 #: setup/lib/messages.inc.php:16
 msgid "Allow character set conversion"
 msgstr ""
@@ -6912,10 +7016,6 @@ msgstr ""
 msgid "Compress on the fly"
 msgstr ""
 
-#: setup/lib/messages.inc.php:45
-msgid "Configuration file"
-msgstr ""
-
 #: setup/lib/messages.inc.php:46
 msgid ""
 "Whether a warning ("Are your really sure...") should be displayed "
@@ -6934,14 +7034,6 @@ msgstr ""
 msgid "Default character set"
 msgstr ""
 
-#: setup/lib/messages.inc.php:50
-msgid "Default language"
-msgstr ""
-
-#: setup/lib/messages.inc.php:51
-msgid "Default server"
-msgstr ""
-
 #: setup/lib/messages.inc.php:52
 msgid "Tab that is displayed when entering a database"
 msgstr ""
@@ -6981,10 +7073,6 @@ msgstr ""
 msgid "Display databases as a list"
 msgstr ""
 
-#: setup/lib/messages.inc.php:61
-msgid "Display"
-msgstr ""
-
 #: setup/lib/messages.inc.php:62
 msgid "Show server listing as a list instead of a drop down"
 msgstr ""
@@ -6993,18 +7081,6 @@ msgstr ""
 msgid "Display servers as a list"
 msgstr ""
 
-#: setup/lib/messages.inc.php:64
-msgid "Donate"
-msgstr ""
-
-#: setup/lib/messages.inc.php:65
-msgid "Download"
-msgstr ""
-
-#: setup/lib/messages.inc.php:66
-msgid "End of line"
-msgstr ""
-
 #: setup/lib/messages.inc.php:67
 msgid "Could not connect to MySQL server"
 msgstr ""
@@ -7184,10 +7260,6 @@ msgstr "Opcione të eksportimit të databazës"
 msgid "Customize appearance of the navigation frame"
 msgstr ""
 
-#: setup/lib/messages.inc.php:113
-msgid "Navigation frame"
-msgstr ""
-
 #: setup/lib/messages.inc.php:114
 msgid "Servers display options"
 msgstr ""
@@ -7196,10 +7268,6 @@ msgstr ""
 msgid "Tables display options"
 msgstr ""
 
-#: setup/lib/messages.inc.php:118
-msgid "Main frame"
-msgstr ""
-
 #: setup/lib/messages.inc.php:119
 msgid "Settings that didn't fit enywhere else"
 msgstr ""
@@ -7277,10 +7345,6 @@ msgstr ""
 msgid "Customize export options"
 msgstr "Opcione të eksportimit të databazës"
 
-#: setup/lib/messages.inc.php:137
-msgid "Features"
-msgstr ""
-
 #: setup/lib/messages.inc.php:138
 msgid "Customize import defaults"
 msgstr ""
@@ -7349,11 +7413,6 @@ msgid ""
 "system."
 msgstr ""
 
-#: setup/lib/messages.inc.php:152
-#, fuzzy
-msgid "phpMyAdmin homepage"
-msgstr "Dokumente të phpMyAdmin"
-
 #: setup/lib/messages.inc.php:153
 msgid "Extra parameters for iconv"
 msgstr ""
@@ -7397,12 +7456,6 @@ msgstr ""
 msgid "Insecure connection"
 msgstr ""
 
-#: setup/lib/messages.inc.php:164
-msgid ""
-"You are not using a secure connection; all data (including potentially "
-"sensitive information, like passwords) is transferred unencrypted!"
-msgstr ""
-
 #: setup/lib/messages.inc.php:165
 #, php-format
 msgid ""
@@ -7498,10 +7551,6 @@ msgstr ""
 msgid "Enable highlighting"
 msgstr ""
 
-#: setup/lib/messages.inc.php:187
-msgid "let the user choose"
-msgstr ""
-
 #: setup/lib/messages.inc.php:188
 msgid "Use less graphically intense tabs"
 msgstr ""
@@ -7510,11 +7559,6 @@ msgstr ""
 msgid "Light tabs"
 msgstr ""
 
-#: setup/lib/messages.inc.php:190
-#, fuzzy
-msgid "Load"
-msgstr "Lokal"
-
 #: setup/lib/messages.inc.php:191
 msgid ""
 "If TRUE, logout deletes cookies for all servers; when set to FALSE, logout "
@@ -7617,14 +7661,6 @@ msgstr ""
 msgid "Iconic navigation bar"
 msgstr ""
 
-#: setup/lib/messages.inc.php:212
-msgid "New server"
-msgstr ""
-
-#: setup/lib/messages.inc.php:213
-msgid "There are no configured servers"
-msgstr ""
-
 #: setup/lib/messages.inc.php:214
 msgid "use GZip output buffering for increased speed in HTTP transfers"
 msgstr ""
@@ -7633,10 +7669,6 @@ msgstr ""
 msgid "GZip output buffering"
 msgstr ""
 
-#: setup/lib/messages.inc.php:216
-msgid "- none -"
-msgstr ""
-
 #: setup/lib/messages.inc.php:217
 msgid ""
 "[kbd]SMART[/kbd] - i.e. descending order for fields of type TIME, DATE, "
@@ -7647,10 +7679,6 @@ msgstr ""
 msgid "Default sorting order"
 msgstr ""
 
-#: setup/lib/messages.inc.php:219
-msgid "Overview"
-msgstr ""
-
 #: setup/lib/messages.inc.php:220
 msgid "Use persistent connections to MySQL databases"
 msgstr ""
@@ -7705,10 +7733,6 @@ msgstr ""
 msgid "Recoding engine"
 msgstr ""
 
-#: setup/lib/messages.inc.php:234
-msgid "Restore default value"
-msgstr ""
-
 #: setup/lib/messages.inc.php:235
 msgid "Try to revert erroneous fields to their default values"
 msgstr ""
@@ -7739,11 +7763,6 @@ msgstr ""
 msgid "You allow for connecting to the server without a password."
 msgstr ""
 
-#: setup/lib/messages.inc.php:241
-#, fuzzy
-msgid "Add a new server"
-msgstr "Shto një përdorues të ri"
-
 #: setup/lib/messages.inc.php:242
 msgid "Leave blank if not used"
 msgstr ""
@@ -7887,10 +7906,6 @@ msgid ""
 "to."
 msgstr ""
 
-#: setup/lib/messages.inc.php:272
-msgid "Edit server"
-msgstr ""
-
 #: setup/lib/messages.inc.php:273
 msgid "What PHP extension to use; you should use mysqli if supported"
 msgstr ""
@@ -8140,11 +8155,6 @@ msgstr ""
 msgid "Verbose name of this server"
 msgstr ""
 
-#: setup/lib/messages.inc.php:328
-#, php-format
-msgid "Set value: %s"
-msgstr ""
-
 #: setup/lib/messages.inc.php:329
 msgid ""
 "Whether a user should be displayed a "show all (records)" button"
@@ -8182,10 +8192,6 @@ msgstr ""
 msgid "Show function fields"
 msgstr ""
 
-#: setup/lib/messages.inc.php:337
-msgid "Show hidden messages (#MSG_COUNT)"
-msgstr ""
-
 #: setup/lib/messages.inc.php:338
 msgid ""
 "Shows link to [a at http://php.net/manual/function.phpinfo.php]phpinfo()[/a] "
@@ -8317,10 +8323,6 @@ msgstr ""
 msgid "Got invalid version string from server"
 msgstr ""
 
-#: setup/lib/messages.inc.php:370
-msgid "Check for latest version"
-msgstr ""
-
 #: setup/lib/messages.inc.php:371
 #, php-format
 msgid ""
@@ -8352,10 +8354,6 @@ msgid ""
 "Neither URL wrapper nor CURL is available. Version check is not possible."
 msgstr ""
 
-#: setup/lib/messages.inc.php:377
-msgid "Warning"
-msgstr ""
-
 #: setup/lib/messages.inc.php:378
 msgid ""
 "Enable [a at http://en.wikipedia.org/wiki/ZIP_(file_format)]ZIP[/a] compression "
diff --git a/po/sr.po b/po/sr.po
index e64d133..8b35d73 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-14 07:48-0400\n"
+"POT-Creation-Date: 2010-05-14 13:39-0400\n"
 "PO-Revision-Date: 2010-03-30 23:47+0200\n"
 "Last-Translator: Michal <michal at cihar.com>\n"
 "Language-Team: serbian_cyrillic <sr at li.org>\n"
@@ -955,15 +955,10 @@ msgstr ""
 "Време извршења скрипта је истекло, ако желите да довршите увоз, молимо "
 "пошаљите исту датотеку и увоз ће се наставити."
 
-#: import.php:426
-#, fuzzy
-#| msgid ""
-#| "However on last run no data has been parsed, this usually means "
-#| "phpMyAdmin won't be able to finish this import unless you increase php "
-#| "time limits."
+#: import.php:426 libraries/messages.inc.php:1102
 msgid ""
 "However on last run no data has been parsed, this usually means phpMyAdmin "
-"won"
+"won't be able to finish this import unless you increase php time limits."
 msgstr ""
 "Међутим, при последњем покретању подаци нису били обрађени, што обично значи "
 "да phpMyAdmin неће бити у могућности да заврши овај увоз осим ако не "
@@ -6367,15 +6362,6 @@ msgstr "Нити"
 msgid "Thread %s was successfully killed."
 msgstr "Процес %s је успешно прекинут."
 
-#: libraries/messages.inc.php:1102
-msgid ""
-"However on last run no data has been parsed, this usually means phpMyAdmin "
-"won't be able to finish this import unless you increase php time limits."
-msgstr ""
-"Међутим, при последњем покретању подаци нису били обрађени, што обично значи "
-"да phpMyAdmin неће бити у могућности да заврши овај увоз осим ако не "
-"повећате временска ограничења у PHP-у"
-
 #: libraries/messages.inc.php:1105 pmd_pdf.php:94
 msgid "to/from page"
 msgstr "од/до странице"
@@ -6845,7 +6831,8 @@ msgstr "нема"
 msgid "Filter"
 msgstr "Датотеке"
 
-#: navigation.php:319 setup/lib/messages.inc.php:42
+#: navigation.php:319 setup/frames/index.inc.php:218
+#: setup/lib/messages.inc.php:42
 #, fuzzy
 msgid "Clear"
 msgstr "Календар"
@@ -6934,6 +6921,116 @@ msgstr "макс. истовремених веза"
 msgid "Configuration: %s"
 msgstr ""
 
+#: setup/frames/config.inc.php:25 setup/frames/index.inc.php:152
+#: setup/lib/messages.inc.php:45
+msgid "Configuration file"
+msgstr ""
+
+#: setup/frames/config.inc.php:38 setup/frames/index.inc.php:212
+#: setup/lib/messages.inc.php:65
+msgid "Download"
+msgstr ""
+
+#: setup/frames/index.inc.php:58 setup/lib/messages.inc.php:164
+msgid ""
+"You are not using a secure connection; all data (including potentially "
+"sensitive information, like passwords) is transferred unencrypted!"
+msgstr ""
+
+#: setup/frames/index.inc.php:87 setup/frames/menu.inc.php:17
+#: setup/lib/messages.inc.php:219
+msgid "Overview"
+msgstr ""
+
+#: setup/frames/index.inc.php:95 setup/lib/messages.inc.php:337
+msgid "Show hidden messages (#MSG_COUNT)"
+msgstr ""
+
+#: setup/frames/index.inc.php:135 setup/lib/messages.inc.php:213
+msgid "There are no configured servers"
+msgstr ""
+
+#: setup/frames/index.inc.php:143 setup/lib/messages.inc.php:212
+msgid "New server"
+msgstr ""
+
+#: setup/frames/index.inc.php:172 setup/lib/messages.inc.php:50
+msgid "Default language"
+msgstr ""
+
+#: setup/frames/index.inc.php:182 setup/lib/messages.inc.php:187
+msgid "let the user choose"
+msgstr ""
+
+#: setup/frames/index.inc.php:193 setup/lib/messages.inc.php:216
+msgid "- none -"
+msgstr ""
+
+#: setup/frames/index.inc.php:196 setup/lib/messages.inc.php:51
+msgid "Default server"
+msgstr ""
+
+#: setup/frames/index.inc.php:206 setup/lib/messages.inc.php:66
+msgid "End of line"
+msgstr ""
+
+#: setup/frames/index.inc.php:211 setup/lib/messages.inc.php:61
+msgid "Display"
+msgstr ""
+
+#: setup/frames/index.inc.php:215 setup/lib/messages.inc.php:190
+#, fuzzy
+msgid "Load"
+msgstr "Локални"
+
+#: setup/frames/index.inc.php:226 setup/lib/messages.inc.php:152
+#, fuzzy
+msgid "phpMyAdmin homepage"
+msgstr "phpMyAdmin документација"
+
+#: setup/frames/index.inc.php:227 setup/lib/messages.inc.php:64
+#, fuzzy
+msgid "Donate"
+msgstr "Подаци"
+
+#: setup/frames/index.inc.php:228 setup/lib/messages.inc.php:370
+msgid "Check for latest version"
+msgstr ""
+
+#: setup/frames/menu.inc.php:18 setup/lib/messages.inc.php:137
+msgid "Features"
+msgstr ""
+
+#: setup/frames/menu.inc.php:19 setup/lib/messages.inc.php:113
+msgid "Navigation frame"
+msgstr ""
+
+#: setup/frames/menu.inc.php:20 setup/lib/messages.inc.php:118
+msgid "Main frame"
+msgstr ""
+
+#: setup/frames/servers.inc.php:28 setup/lib/messages.inc.php:272
+msgid "Edit server"
+msgstr ""
+
+#: setup/frames/servers.inc.php:37 setup/lib/messages.inc.php:241
+#, fuzzy
+msgid "Add a new server"
+msgstr "Додај новог корисника"
+
+#: setup/lib/FormDisplay.tpl.php:182 setup/lib/messages.inc.php:328
+#, php-format
+msgid "Set value: %s"
+msgstr ""
+
+#: setup/lib/FormDisplay.tpl.php:187 setup/lib/messages.inc.php:234
+msgid "Restore default value"
+msgstr ""
+
+#: setup/lib/form_processing.lib.php:43 setup/lib/messages.inc.php:377
+msgid "Warning"
+msgstr ""
+
 #: setup/lib/messages.inc.php:16
 msgid "Allow character set conversion"
 msgstr ""
@@ -7073,10 +7170,6 @@ msgstr ""
 msgid "Compress on the fly"
 msgstr ""
 
-#: setup/lib/messages.inc.php:45
-msgid "Configuration file"
-msgstr ""
-
 #: setup/lib/messages.inc.php:46
 msgid ""
 "Whether a warning ("Are your really sure...") should be displayed "
@@ -7095,14 +7188,6 @@ msgstr ""
 msgid "Default character set"
 msgstr ""
 
-#: setup/lib/messages.inc.php:50
-msgid "Default language"
-msgstr ""
-
-#: setup/lib/messages.inc.php:51
-msgid "Default server"
-msgstr ""
-
 #: setup/lib/messages.inc.php:52
 msgid "Tab that is displayed when entering a database"
 msgstr ""
@@ -7144,10 +7229,6 @@ msgstr ""
 msgid "Display databases as a list"
 msgstr ""
 
-#: setup/lib/messages.inc.php:61
-msgid "Display"
-msgstr ""
-
 #: setup/lib/messages.inc.php:62
 msgid "Show server listing as a list instead of a drop down"
 msgstr ""
@@ -7156,19 +7237,6 @@ msgstr ""
 msgid "Display servers as a list"
 msgstr ""
 
-#: setup/lib/messages.inc.php:64
-#, fuzzy
-msgid "Donate"
-msgstr "Подаци"
-
-#: setup/lib/messages.inc.php:65
-msgid "Download"
-msgstr ""
-
-#: setup/lib/messages.inc.php:66
-msgid "End of line"
-msgstr ""
-
 #: setup/lib/messages.inc.php:67
 msgid "Could not connect to MySQL server"
 msgstr ""
@@ -7350,10 +7418,6 @@ msgstr "Опције за извоз базе"
 msgid "Customize appearance of the navigation frame"
 msgstr ""
 
-#: setup/lib/messages.inc.php:113
-msgid "Navigation frame"
-msgstr ""
-
 #: setup/lib/messages.inc.php:114
 #, fuzzy
 msgid "Servers display options"
@@ -7364,10 +7428,6 @@ msgstr "Опције за извоз базе"
 msgid "Tables display options"
 msgstr "Опције за извоз базе"
 
-#: setup/lib/messages.inc.php:118
-msgid "Main frame"
-msgstr ""
-
 #: setup/lib/messages.inc.php:119
 msgid "Settings that didn't fit enywhere else"
 msgstr ""
@@ -7446,10 +7506,6 @@ msgstr ""
 msgid "Customize export options"
 msgstr "Опције за извоз базе"
 
-#: setup/lib/messages.inc.php:137
-msgid "Features"
-msgstr ""
-
 #: setup/lib/messages.inc.php:138
 #, fuzzy
 msgid "Customize import defaults"
@@ -7519,11 +7575,6 @@ msgid ""
 "system."
 msgstr ""
 
-#: setup/lib/messages.inc.php:152
-#, fuzzy
-msgid "phpMyAdmin homepage"
-msgstr "phpMyAdmin документација"
-
 #: setup/lib/messages.inc.php:153
 msgid "Extra parameters for iconv"
 msgstr ""
@@ -7571,12 +7622,6 @@ msgstr ""
 msgid "Insecure connection"
 msgstr ""
 
-#: setup/lib/messages.inc.php:164
-msgid ""
-"You are not using a secure connection; all data (including potentially "
-"sensitive information, like passwords) is transferred unencrypted!"
-msgstr ""
-
 #: setup/lib/messages.inc.php:165
 #, php-format
 msgid ""
@@ -7675,10 +7720,6 @@ msgstr ""
 msgid "Enable highlighting"
 msgstr ""
 
-#: setup/lib/messages.inc.php:187
-msgid "let the user choose"
-msgstr ""
-
 #: setup/lib/messages.inc.php:188
 msgid "Use less graphically intense tabs"
 msgstr ""
@@ -7687,11 +7728,6 @@ msgstr ""
 msgid "Light tabs"
 msgstr ""
 
-#: setup/lib/messages.inc.php:190
-#, fuzzy
-msgid "Load"
-msgstr "Локални"
-
 #: setup/lib/messages.inc.php:191
 msgid ""
 "If TRUE, logout deletes cookies for all servers; when set to FALSE, logout "
@@ -7795,14 +7831,6 @@ msgstr ""
 msgid "Iconic navigation bar"
 msgstr ""
 
-#: setup/lib/messages.inc.php:212
-msgid "New server"
-msgstr ""
-
-#: setup/lib/messages.inc.php:213
-msgid "There are no configured servers"
-msgstr ""
-
 #: setup/lib/messages.inc.php:214
 msgid "use GZip output buffering for increased speed in HTTP transfers"
 msgstr ""
@@ -7811,10 +7839,6 @@ msgstr ""
 msgid "GZip output buffering"
 msgstr ""
 
-#: setup/lib/messages.inc.php:216
-msgid "- none -"
-msgstr ""
-
 #: setup/lib/messages.inc.php:217
 msgid ""
 "[kbd]SMART[/kbd] - i.e. descending order for fields of type TIME, DATE, "
@@ -7825,10 +7849,6 @@ msgstr ""
 msgid "Default sorting order"
 msgstr ""
 
-#: setup/lib/messages.inc.php:219
-msgid "Overview"
-msgstr ""
-
 #: setup/lib/messages.inc.php:220
 msgid "Use persistent connections to MySQL databases"
 msgstr ""
@@ -7883,10 +7903,6 @@ msgstr ""
 msgid "Recoding engine"
 msgstr ""
 
-#: setup/lib/messages.inc.php:234
-msgid "Restore default value"
-msgstr ""
-
 #: setup/lib/messages.inc.php:235
 msgid "Try to revert erroneous fields to their default values"
 msgstr ""
@@ -7918,11 +7934,6 @@ msgstr ""
 msgid "You allow for connecting to the server without a password."
 msgstr ""
 
-#: setup/lib/messages.inc.php:241
-#, fuzzy
-msgid "Add a new server"
-msgstr "Додај новог корисника"
-
 #: setup/lib/messages.inc.php:242
 msgid "Leave blank if not used"
 msgstr ""
@@ -8066,10 +8077,6 @@ msgid ""
 "to."
 msgstr ""
 
-#: setup/lib/messages.inc.php:272
-msgid "Edit server"
-msgstr ""
-
 #: setup/lib/messages.inc.php:273
 msgid "What PHP extension to use; you should use mysqli if supported"
 msgstr ""
@@ -8321,11 +8328,6 @@ msgstr ""
 msgid "Verbose name of this server"
 msgstr ""
 
-#: setup/lib/messages.inc.php:328
-#, php-format
-msgid "Set value: %s"
-msgstr ""
-
 #: setup/lib/messages.inc.php:329
 msgid ""
 "Whether a user should be displayed a "show all (records)" button"
@@ -8363,10 +8365,6 @@ msgstr ""
 msgid "Show function fields"
 msgstr ""
 
-#: setup/lib/messages.inc.php:337
-msgid "Show hidden messages (#MSG_COUNT)"
-msgstr ""
-
 #: setup/lib/messages.inc.php:338
 msgid ""
 "Shows link to [a at http://php.net/manual/function.phpinfo.php]phpinfo()[/a] "
@@ -8500,10 +8498,6 @@ msgstr ""
 msgid "Got invalid version string from server"
 msgstr ""
 
-#: setup/lib/messages.inc.php:370
-msgid "Check for latest version"
-msgstr ""
-
 #: setup/lib/messages.inc.php:371
 #, php-format
 msgid ""
@@ -8535,10 +8529,6 @@ msgid ""
 "Neither URL wrapper nor CURL is available. Version check is not possible."
 msgstr ""
 
-#: setup/lib/messages.inc.php:377
-msgid "Warning"
-msgstr ""
-
 #: setup/lib/messages.inc.php:378
 msgid ""
 "Enable [a at http://en.wikipedia.org/
wiki/ZIP_(file_format)]ZIP[/a] compression "
@@ -8600,6 +8590,19 @@ msgid "Description"
 msgstr "Опис"
 
 #, fuzzy
+#~| msgid ""
+#~| "However on last run no data has been parsed, this usually means "
+#~| "phpMyAdmin won't be able to finish this import unless you increase php "
+#~| "time limits."
+#~ msgid ""
+#~ "However on last run no data has been parsed, this usually means "
+#~ "phpMyAdmin won"
+#~ msgstr ""
+#~ "Међутим, при последњем покретању подаци нису били обрађени, што обично "
+#~ "значи да phpMyAdmin неће бити у могућности да заврши овај увоз осим ако "
+#~ "не повећате временска ограничења у PHP-у"
+
+#, fuzzy
 #~| msgid "None"
 #~ msgctxt "None action"
 #~ msgid "None"
diff --git a/po/sr at latin.po b/po/sr at latin.po
index f6247f4..07f8935 100644
--- a/po/sr at latin.po
+++ b/po/sr at latin.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-14 07:48-0400\n"
+"POT-Creation-Date: 2010-05-14 13:39-0400\n"
 "PO-Revision-Date: 2010-03-30 23:47+0200\n"
 "Last-Translator: Michal <michal at cihar.com>\n"
 "Language-Team: serbian_latin <sr at latin@li.org>\n"
@@ -955,15 +955,10 @@ msgstr ""
 "Vreme izvršenja skripta je isteklo, ako želite da dovršite uvoz, molimo "
 "pošaljite istu datoteku i uvoz će se nastaviti."
 
-#: import.php:426
-#, fuzzy
-#| msgid ""
-#| "However on last run no data has been parsed, this usually means "
-#| "phpMyAdmin won't be able to finish this import unless you increase php "
-#| "time limits."
+#: import.php:426 libraries/messages.inc.php:1102
 msgid ""
 "However on last run no data has been parsed, this usually means phpMyAdmin "
-"won"
+"won't be able to finish this import unless you increase php time limits."
 msgstr ""
 "Međutim, pri poslednjem pokretanju podaci nisu bili obrađeni, što obično "
 "znači da phpMyAdmin neće biti u mogućnosti da završi ovaj uvoz osim ako ne "
@@ -6371,15 +6366,6 @@ msgstr "Niti"
 msgid "Thread %s was successfully killed."
 msgstr "Proces %s je uspešno prekinut."
 
-#: libraries/messages.inc.php:1102
-msgid ""
-"However on last run no data has been parsed, this usually means phpMyAdmin "
-"won't be able to finish this import unless you increase php time limits."
-msgstr ""
-"Međutim, pri poslednjem pokretanju podaci nisu bili obrađeni, što obično "
-"znači da phpMyAdmin neće biti u mogućnosti da završi ovaj uvoz osim ako ne "
-"povećate vremenska ograničenja u PHP-u"
-
 #: libraries/messages.inc.php:1105 pmd_pdf.php:94
 msgid "to/from page"
 msgstr "od/do stranice"
@@ -6850,7 +6836,8 @@ msgstr "nema"
 msgid "Filter"
 msgstr "Datoteke"
 
-#: navigation.php:319 setup/lib/messages.inc.php:42
+#: navigation.php:319 setup/frames/index.inc.php:218
+#: setup/lib/messages.inc.php:42
 #, fuzzy
 msgid "Clear"
 msgstr "Kalendar"
@@ -6939,6 +6926,116 @@ msgstr "maks. istovremenih veza"
 msgid "Configuration: %s"
 msgstr ""
 
+#: setup/frames/config.inc.php:25 setup/frames/index.inc.php:152
+#: setup/lib/messages.inc.php:45
+msgid "Configuration file"
+msgstr ""
+
+#: setup/frames/config.inc.php:38 setup/frames/index.inc.php:212
+#: setup/lib/messages.inc.php:65
+msgid "Download"
+msgstr ""
+
+#: setup/frames/index.inc.php:58 setup/lib/messages.inc.php:164
+msgid ""
+"You are not using a secure connection; all data (including potentially "
+"sensitive information, like passwords) is transferred unencrypted!"
+msgstr ""
+
+#: setup/frames/index.inc.php:87 setup/frames/menu.inc.php:17
+#: setup/lib/messages.inc.php:219
+msgid "Overview"
+msgstr ""
+
+#: setup/frames/index.inc.php:95 setup/lib/messages.inc.php:337
+msgid "Show hidden messages (#MSG_COUNT)"
+msgstr ""
+
+#: setup/frames/index.inc.php:135 setup/lib/messages.inc.php:213
+msgid "There are no configured servers"
+msgstr ""
+
+#: setup/frames/index.inc.php:143 setup/lib/messages.inc.php:212
+msgid "New server"
+msgstr ""
+
+#: setup/frames/index.inc.php:172 setup/lib/messages.inc.php:50
+msgid "Default language"
+msgstr ""
+
+#: setup/frames/index.inc.php:182 setup/lib/messages.inc.php:187
+msgid "let the user choose"
+msgstr ""
+
+#: setup/frames/index.inc.php:193 setup/lib/messages.inc.php:216
+msgid "- none -"
+msgstr ""
+
+#: setup/frames/index.inc.php:196 setup/lib/messages.inc.php:51
+msgid "Default server"
+msgstr ""
+
+#: setup/frames/index.inc.php:206 setup/lib/messages.inc.php:66
+msgid "End of line"
+msgstr ""
+
+#: setup/frames/index.inc.php:211 setup/lib/messages.inc.php:61
+msgid "Display"
+msgstr ""
+
+#: setup/frames/index.inc.php:215 setup/lib/messages.inc.php:190
+#, fuzzy
+msgid "Load"
+msgstr "Lokalni"
+
+#: setup/frames/index.inc.php:226 setup/lib/messages.inc.php:152
+#, fuzzy
+msgid "phpMyAdmin homepage"
+msgstr "phpMyAdmin dokumentacija"
+
+#: setup/frames/index.inc.php:227 setup/lib/messages.inc.php:64
+#, fuzzy
+msgid "Donate"
+msgstr "Podaci"
+
+#: setup/frames/index.inc.php:228 setup/lib/messages.inc.php:370
+msgid "Check for latest version"
+msgstr ""
+
+#: setup/frames/menu.inc.php:18 setup/lib/messages.inc.php:137
+msgid "Features"
+msgstr ""
+
+#: setup/frames/menu.inc.php:19 setup/lib/messages.inc.php:113
+msgid "Navigation frame"
+msgstr ""
+
+#: setup/frames/menu.inc.php:20 setup/lib/messages.inc.php:118
+msgid "Main frame"
+msgstr ""
+
+#: setup/frames/servers.inc.php:28 setup/lib/messages.inc.php:272
+msgid "Edit server"
+msgstr ""
+
+#: setup/frames/servers.inc.php:37 setup/lib/messages.inc.php:241
+#, fuzzy
+msgid "Add a new server"
+msgstr "Dodaj novog korisnika"
+
+#: setup/lib/FormDisplay.tpl.php:182 setup/lib/messages.inc.php:328
+#, php-format
+msgid "Set value: %s"
+msgstr ""
+
+#: setup/lib/FormDisplay.tpl.php:187 setup/lib/messages.inc.php:234
+msgid "Restore default value"
+msgstr ""
+
+#: setup/lib/form_processing.lib.php:43 setup/lib/messages.inc.php:377
+msgid "Warning"
+msgstr ""
+
 #: setup/lib/messages.inc.php:16
 msgid "Allow character set conversion"
 msgstr ""
@@ -7078,10 +7175,6 @@ msgstr ""
 msgid "Compress on the fly"
 msgstr ""
 
-#: setup/lib/messages.inc.php:45
-msgid "Configuration file"
-msgstr ""
-
 #: setup/lib/messages.inc.php:46
 msgid ""
 "Whether a warning ("Are your really sure...") should be displayed "
@@ -7100,14 +7193,6 @@ msgstr ""
 msgid "Default character set"
 msgstr ""
 
-#: setup/lib/messages.inc.php:50
-msgid "Default language"
-msgstr ""
-
-#: setup/lib/messages.inc.php:51
-msgid "Default server"
-msgstr ""
-
 #: setup/lib/messages.inc.php:52
 msgid "Tab that is displayed when entering a database"
 msgstr ""
@@ -7149,10 +7234,6 @@ msgstr ""
 msgid "Display databases as a list"
 msgstr ""
 
-#: setup/lib/messages.inc.php:61
-msgid "Display"
-msgstr ""
-
 #: setup/lib/messages.inc.php:62
 msgid "Show server listing as a list instead of a drop down"
 msgstr ""
@@ -7161,19 +7242,6 @@ msgstr ""
 msgid "Display servers as a list"
 msgstr ""
 
-#: setup/lib/messages.inc.php:64
-#, fuzzy
-msgid "Donate"
-msgstr "Podaci"
-
-#: setup/lib/messages.inc.php:65
-msgid "Download"
-msgstr ""
-
-#: setup/lib/messages.inc.php:66
-msgid "End of line"
-msgstr ""
-
 #: setup/lib/messages.inc.php:67
 msgid "Could not connect to MySQL server"
 msgstr ""
@@ -7355,10 +7423,6 @@ msgstr "Opcije za izvoz baze"
 msgid "Customize appearance of the navigation frame"
 msgstr ""
 
-#: setup/lib/messages.inc.php:113
-msgid "Navigation frame"
-msgstr ""
-
 #: setup/lib/messages.inc.php:114
 #, fuzzy
 msgid "Servers display options"
@@ -7369,10 +7433,6 @@ msgstr "Opcije za izvoz baze"
 msgid "Tables display options"
 msgstr "Opcije za izvoz baze"
 
-#: setup/lib/messages.inc.php:118
-msgid "Main frame"
-msgstr ""
-
 #: setup/lib/messages.inc.php:119
 msgid "Settings that didn't fit enywhere else"
 msgstr ""
@@ -7451,10 +7511,6 @@ msgstr ""
 msgid "Customize export options"
 msgstr "Opcije za izvoz baze"
 
-#: setup/lib/messages.inc.php:137
-msgid "Features"
-msgstr ""
-
 #: setup/lib/messages.inc.php:138
 #, fuzzy
 msgid "Customize import defaults"
@@ -7524,11 +7580,6 @@ msgid ""
 "system."
 msgstr ""
 
-#: setup/lib/messages.inc.php:152
-#, fuzzy
-msgid "phpMyAdmin homepage"
-msgstr "phpMyAdmin dokumentacija"
-
 #: setup/lib/messages.inc.php:153
 msgid "Extra parameters for iconv"
 msgstr ""
@@ -7576,12 +7627,6 @@ msgstr ""
 msgid "Insecure connection"
 msgstr ""
 
-#: setup/lib/messages.inc.php:164
-msgid ""
-"You are not using a secure connection; all data (including potentially "
-"sensitive information, like passwords) is transferred unencrypted!"
-msgstr ""
-
 #: setup/lib/messages.inc.php:165
 #, php-format
 msgid ""
@@ -7680,10 +7725,6 @@ msgstr ""
 msgid "Enable highlighting"
 msgstr ""
 
-#: setup/lib/messages.inc.php:187
-msgid "let the user choose"
-msgstr ""
-
 #: setup/lib/messages.inc.php:188
 msgid "Use less graphically intense tabs"
 msgstr ""
@@ -7692,11 +7733,6 @@ msgstr ""
 msgid "Light tabs"
 msgstr ""
 
-#: setup/lib/messages.inc.php:190
-#, fuzzy
-msgid "Load"
-msgstr "Lokalni"
-
 #: setup/lib/messages.inc.php:191
 msgid ""
 "If TRUE, logout deletes cookies for all servers; when set to FALSE, logout "
@@ -7800,14 +7836,6 @@ msgstr ""
 msgid "Iconic navigation bar"
 msgstr ""
 
-#: setup/lib/messages.inc.php:212
-msgid "New server"
-msgstr ""
-
-#: setup/lib/messages.inc.php:213
-msgid "There are no configured servers"
-msgstr ""
-
 #: setup/lib/messages.inc.php:214
 msgid "use GZip output buffering for increased speed in HTTP transfers"
 msgstr ""
@@ -7816,10 +7844,6 @@ msgstr ""
 msgid "GZip output buffering"
 msgstr ""
 
-#: setup/lib/messages.inc.php:216
-msgid "- none -"
-msgstr ""
-
 #: setup/lib/messages.inc.php:217
 msgid ""
 "[kbd]SMART[/kbd] - i.e. descending order for fields of type TIME, DATE, "
@@ -7830,10 +7854,6 @@ msgstr ""
 msgid "Default sorting order"
 msgstr ""
 
-#: setup/lib/messages.inc.php:219
-msgid "Overview"
-msgstr ""
-
 #: setup/lib/messages.inc.php:220
 msgid "Use persistent connections to MySQL databases"
 msgstr ""
@@ -7888,10 +7908,6 @@ msgstr ""
 msgid "Recoding engine"
 msgstr ""
 
-#: setup/lib/messages.inc.php:234
-msgid "Restore default value"
-msgstr ""
-
 #: setup/lib/messages.inc.php:235
 msgid "Try to revert erroneous fields to their default values"
 msgstr ""
@@ -7923,11 +7939,6 @@ msgstr ""
 msgid "You allow for connecting to the server without a password."
 msgstr ""
 
-#: setup/lib/messages.inc.php:241
-#, fuzzy
-msgid "Add a new server"
-msgstr "Dodaj novog korisnika"
-
 #: setup/lib/messages.inc.php:242
 msgid "Leave blank if not used"
 msgstr ""
@@ -8071,10 +8082,6 @@ msgid ""
 "to."
 msgstr ""
 
-#: setup/lib/messages.inc.php:272
-msgid "Edit server"
-msgstr ""
-
 #: setup/lib/messages.inc.php:273
 msgid "What PHP extension to use; you should use mysqli if supported"
 msgstr ""
@@ -8326,11 +8333,6 @@ msgstr ""
 msgid "Verbose name of this server"
 msgstr ""
 
-#: setup/lib/messages.inc.php:328
-#, php-format
-msgid "Set value: %s"
-msgstr ""
-
 #: setup/lib/messages.inc.php:329
 msgid ""
 "Whether a user should be displayed a "show all (records)" button"
@@ -8368,10 +8370,6 @@ msgstr ""
 msgid "Show function fields"
 msgstr ""
 
-#: setup/lib/messages.inc.php:337
-msgid "Show hidden messages (#MSG_COUNT)"
-msgstr ""
-
 #: setup/lib/messages.inc.php:338
 msgid ""
 "Shows link to [a at http://php.net/manual/function.phpinfo.php]phpinfo()[/a] "
@@ -8505,10 +8503,6 @@ msgstr ""
 msgid "Got invalid version string from server"
 msgstr ""
 
-#: setup/lib/messages.inc.php:370
-msgid "Check for latest version"
-msgstr ""
-
 #: setup/lib/messages.inc.php:371
 #, php-format
 msgid ""
@@ -8540,10 +8534,6 @@ msgid ""
 "Neither URL wrapper nor CURL is available. Version check is not possible."
 msgstr ""
 
-#: setup/lib/messages.inc.php:377
-msgid "Warning"
-msgstr ""
-
 #: setup/lib/messages.inc.php:378
 msgid ""
 "Enable [a at http://en.wikipedia.org/wiki/ZIP_(file_format)]ZIP[/a] compression "
@@ -8605,6 +8595,19 @@ msgid "Description"
 msgstr "Opis"
 
 #, fuzzy
+#~| msgid ""
+#~| "However on last run no data has been parsed, this usually means "
+#~| "phpMyAdmin won't be able to finish this import unless you increase php "
+#~| "time limits."
+#~ msgid ""
+#~ "However on last run no data has been parsed, this usually means "
+#~ "phpMyAdmin won"
+#~ msgstr ""
+#~ "Međutim, pri poslednjem pokretanju podaci nisu bili obrađeni, što obično "
+#~ "znači da phpMyAdmin neće biti u mogućnosti da završi ovaj uvoz osim ako "
+#~ "ne povećate vremenska ograničenja u PHP-u"
+
+#, fuzzy
 #~| msgid "None"
 #~ msgctxt "None action"
 #~ msgid "None"
diff --git a/po/sv.po b/po/sv.po
index 3e19a71..e193242 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-14 07:48-0400\n"
+"POT-Creation-Date: 2010-05-14 13:39-0400\n"
 "PO-Revision-Date: 2010-03-12 09:19+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: swedish <sv at li.org>\n"
@@ -951,15 +951,10 @@ msgstr ""
 "Skriptets tidsbegränsning har överskridits. Om du vill slutföra importen, "
 "importera samma fil igen så kommer importen att återupptas."
 
-#: import.php:426
-#, fuzzy
-#| msgid ""
-#| "However on last run no data has been parsed, this usually means "
-#| "phpMyAdmin won't be able to finish this import unless you increase php "
-#| "time limits."
+#: import.php:426 libraries/messages.inc.php:1102
 msgid ""
 "However on last run no data has been parsed, this usually means phpMyAdmin "
-"won"
+"won't be able to finish this import unless you increase php time limits."
 msgstr ""
 "Dock blev inga data bearbetade i senaste körningen. Detta betyder vanligtvis "
 "att phpMyAdmin inte kan slutföra denna import såvida du inte ökar PHP:s "
@@ -6420,15 +6415,6 @@ msgstr "Trådar"
 msgid "Thread %s was successfully killed."
 msgstr "Tråd %s dödades med framgång."
 
-#: libraries/messages.inc.php:1102
-msgid ""
-"However on last run no data has been parsed, this usually means phpMyAdmin "
-"won't be able to finish this import unless you increase php time limits."
-msgstr ""
-"Dock blev inga data bearbetade i senaste körningen. Detta betyder vanligtvis "
-"att phpMyAdmin inte kan slutföra denna import såvida du inte ökar PHP:s "
-"tidsbegränsningar."
-
 #: libraries/messages.inc.php:1105 pmd_pdf.php:94
 msgid "to/from page"
 msgstr "till/från sida"
@@ -6901,7 +6887,8 @@ msgstr "Inget"
 msgid "Filter"
 msgstr "Filter"
 
-#: navigation.php:319 setup/lib/messages.inc.php:42
+#: navigation.php:319 setup/frames/index.inc.php:218
+#: setup/lib/messages.inc.php:42
 msgid "Clear"
 msgstr "Nollställ"
 
@@ -7000,6 +6987,114 @@ msgstr "Osäker anslutning"
 msgid "Configuration: %s"
 msgstr "Konfigurationsfil"
 
+#: setup/frames/config.inc.php:25 setup/frames/index.inc.php:152
+#: setup/lib/messages.inc.php:45
+msgid "Configuration file"
+msgstr "Konfigurationsfil"
+
+#: setup/frames/config.inc.php:38 setup/frames/index.inc.php:212
+#: setup/lib/messages.inc.php:65
+msgid "Download"
+msgstr "Ladda ner"
+
+#: setup/frames/index.inc.php:58 setup/lib/messages.inc.php:164
+msgid ""
+"You are not using a secure connection; all data (including potentially "
+"sensitive information, like passwords) is transferred unencrypted!"
+msgstr ""
+"Du använder inte en säker anslutning; all data (inklusive potentiellt "
+"känslig information, som lösenord) överförs okrypterat!"
+
+#: setup/frames/index.inc.php:87 setup/frames/menu.inc.php:17
+#: setup/lib/messages.inc.php:219
+msgid "Overview"
+msgstr "Översikt"
+
+#: setup/frames/index.inc.php:95 setup/lib/messages.inc.php:337
+msgid "Show hidden messages (#MSG_COUNT)"
+msgstr "Visa dolda meddelanden (#MSG_COUNT)"
+
+#: setup/frames/index.inc.php:135 setup/lib/messages.inc.php:213
+msgid "There are no configured servers"
+msgstr "Det finns inga konfigurerade servrar"
+
+#: setup/frames/index.inc.php:143 setup/lib/messages.inc.php:212
+msgid "New server"
+msgstr "Ny server"
+
+#: setup/frames/index.inc.php:172 setup/lib/messages.inc.php:50
+msgid "Default language"
+msgstr "Förvalt språk"
+
+#: setup/frames/index.inc.php:182 setup/lib/messages.inc.php:187
+msgid "let the user choose"
+msgstr "låt användaren välja"
+
+#: setup/frames/index.inc.php:193 setup/lib/messages.inc.php:216
+msgid "- none -"
+msgstr "- ingen -"
+
+#: setup/frames/index.inc.php:196 setup/lib/messages.inc.php:51
+msgid "Default server"
+msgstr "Förvald server"
+
+#: setup/frames/index.inc.php:206 setup/lib/messages.inc.php:66
+msgid "End of line"
+msgstr "Radslut"
+
+#: setup/frames/index.inc.php:211 setup/lib/messages.inc.php:61
+msgid "Display"
+msgstr "Visa"
+
+#: setup/frames/index.inc.php:215 setup/lib/messages.inc.php:190
+msgid "Load"
+msgstr "Ladda"
+
+#: setup/frames/index.inc.php:226 setup/lib/messages.inc.php:152
+msgid "phpMyAdmin homepage"
+msgstr "phpMyAdmin:s hemsida"
+
+#: setup/frames/index.inc.php:227 setup/lib/messages.inc.php:64
+msgid "Donate"
+msgstr "Donera"
+
+#: setup/frames/index.inc.php:228 setup/lib/messages.inc.php:370
+msgid "Check for latest version"
+msgstr "Kontrollera senaste version"
+
+#: setup/frames/menu.inc.php:18 setup/lib/messages.inc.php:137
+msgid "Features"
+msgstr "Funktioner"
+
+#: setup/frames/menu.inc.php:19 setup/lib/messages.inc.php:113
+msgid "Navigation frame"
+msgstr "Navigeringsram"
+
+#: setup/frames/menu.inc.php:20 setup/lib/messages.inc.php:118
+msgid "Main frame"
+msgstr "Huvudram"
+
+#: setup/frames/servers.inc.php:28 setup/lib/messages.inc.php:272
+msgid "Edit server"
+msgstr "Ändra server"
+
+#: setup/frames/servers.inc.php:37 setup/lib/messages.inc.php:241
+msgid "Add a new server"
+msgstr "Lägg till en ny server"
+
+#: setup/lib/FormDisplay.tpl.php:182 setup/lib/messages.inc.php:328
+#, php-format
+msgid "Set value: %s"
+msgstr "Ange värde: %s"
+
+#: setup/lib/FormDisplay.tpl.php:187 setup/lib/messages.inc.php:234
+msgid "Restore default value"
+msgstr "Återställ standardvärde"
+
+#: setup/lib/form_processing.lib.php:43 setup/lib/messages.inc.php:377
+msgid "Warning"
+msgstr "Varning"
+
 #: setup/lib/messages.inc.php:16
 msgid "Allow character set conversion"
 msgstr "Tillåt omvandling av teckenuppsättning"
@@ -7166,10 +7261,6 @@ msgstr ""
 msgid "Compress on the fly"
 msgstr "Komprimera i farten"
 
-#: setup/lib/messages.inc.php:45
-msgid "Configuration file"
-msgstr "Konfigurationsfil"
-
 #: setup/lib/messages.inc.php:46
 msgid ""
 "Whether a warning ("Are your really sure...") should be displayed "
@@ -7190,14 +7281,6 @@ msgstr "Standard teckenuppsättning som används för omvandlingar"
 msgid "Default character set"
 msgstr "Standard teckenuppsättning"
 
-#: setup/lib/messages.inc.php:50
-msgid "Default language"
-msgstr "Förvalt språk"
-
-#: setup/lib/messages.inc.php:51
-msgid "Default server"
-msgstr "Förvald server"
-
 #: setup/lib/messages.inc.php:52
 msgid "Tab that is displayed when entering a database"
 msgstr "Flik som visas när man går till en databas"
@@ -7238,10 +7321,6 @@ msgstr "Visa databaslista som en lista istället för en listkontroll"
 msgid "Display databases as a list"
 msgstr "Visa databaser som en lista"
 
-#: setup/lib/messages.inc.php:61
-msgid "Display"
-msgstr "Visa"
-
 #: setup/lib/messages.inc.php:62
 msgid "Show server listing as a list instead of a drop down"
 msgstr "Visa serverlista som en lista istället för en listkontroll"
@@ -7250,18 +7329,6 @@ msgstr "Visa serverlista som en lista istället för en listkontroll"
 msgid "Display servers as a list"
 msgstr "Visa servrar som en lista"
 
-#: setup/lib/messages.inc.php:64
-msgid "Donate"
-msgstr "Donera"
-
-#: setup/lib/messages.inc.php:65
-msgid "Download"
-msgstr "Ladda ner"
-
-#: setup/lib/messages.inc.php:66
-msgid "End of line"
-msgstr "Radslut"
-
 #: setup/lib/messages.inc.php:67
 msgid "Could not connect to MySQL server"
 msgstr "Kunde inte ansluta till MySQL-server"
@@ -7440,10 +7507,6 @@ msgstr "Visningsalternativ för databaser"
 msgid "Customize appearance of the navigation frame"
 msgstr "Anpassa navigeringsramens utseende"
 
-#: setup/lib/messages.inc.php:113
-msgid "Navigation frame"
-msgstr "Navigeringsram"
-
 #: setup/lib/messages.inc.php:114
 msgid "Servers display options"
 msgstr "Visningsalternativ för servrar"
@@ -7452,10 +7515,6 @@ msgstr "Visningsalternativ för servrar"
 msgid "Tables display options"
 msgstr "Visningsalternativ för tabeller"
 
-#: setup/lib/messages.inc.php:118
-msgid "Main frame"
-msgstr "Huvudram"
-
 #: setup/lib/messages.inc.php:119
 msgid "Settings that didn't fit enywhere else"
 msgstr "Inställningar som inte passade någon annan stans"
@@ -7538,10 +7597,6 @@ msgstr "Anpassning"
 msgid "Customize export options"
 msgstr "Anpassa export"
 
-#: setup/lib/messages.inc.php:137
-msgid "Features"
-msgstr "Funktioner"
-
 #: setup/lib/messages.inc.php:138
 msgid "Customize import defaults"
 msgstr "Anpassa import"
@@ -7613,10 +7668,6 @@ msgstr ""
 "dekomprimering[/a] erfordrar funktioner (%s) som inte är tillgängliga på "
 "detta system."
 
-#: setup/lib/messages.inc.php:152
-msgid "phpMyAdmin homepage"
-msgstr "phpMyAdmin:s hemsida"
-
 #: setup/lib/messages.inc.php:153
 msgid "Extra parameters for iconv"
 msgstr "Extra parameterar för iconv"
@@ -7667,14 +7718,6 @@ msgstr "Partiell import: hoppa över frågor"
 msgid "Insecure connection"
 msgstr "Osäker anslutning"
 
-#: setup/lib/messages.inc.php:164
-msgid ""
-"You are not using a secure connection; all data (including potentially "
-"sensitive information, like passwords) is transferred unencrypted!"
-msgstr ""
-"Du använder inte en säker anslutning; all data (inklusive potentiellt "
-"känslig information, som lösenord) överförs okrypterat!"
-
 #: setup/lib/messages.inc.php:165
 #, php-format
 msgid ""
@@ -7776,10 +7819,6 @@ msgstr "Framhäv server under muspekaren"
 msgid "Enable highlighting"
 msgstr "Aktivera framhävning"
 
-#: setup/lib/messages.inc.php:187
-msgid "let the user choose"
-msgstr "låt användaren välja"
-
 #: setup/lib/messages.inc.php:188
 msgid "Use less graphically intense tabs"
 msgstr "Använd mindre grafiskt intensiva flikar"
@@ -7788,10 +7827,6 @@ msgstr "Använd mindre grafiskt intensiva flikar"
 msgid "Light tabs"
 msgstr "Lätta flikar"
 
-#: setup/lib/messages.inc.php:190
-msgid "Load"
-msgstr "Ladda"
-
 #: setup/lib/messages.inc.php:191
 msgid ""
 "If TRUE, logout deletes cookies for all servers; when set to FALSE, logout "
@@ -7911,14 +7946,6 @@ msgstr "Använd endast ikoner, endast text eller båda"
 msgid "Iconic navigation bar"
 msgstr "Ikonbaserad navigeringslist"
 
-#: setup/lib/messages.inc.php:212
-msgid "New server"
-msgstr "Ny server"
-
-#: setup/lib/messages.inc.php:213
-msgid "There are no configured servers"
-msgstr "Det finns inga konfigurerade servrar"
-
 #: setup/lib/messages.inc.php:214
 msgid "use GZip output buffering for increased speed in HTTP transfers"
 msgstr "Använd GZip buffring av utdata för ökad hastighet i HTTP-överföringar"
@@ -7927,10 +7954,6 @@ msgstr "Använd GZip buffring av utdata för ökad hastighet i HTTP-överföring
 msgid "GZip output buffering"
 msgstr "GZip buffring av utdata"
 
-#: setup/lib/messages.inc.php:216
-msgid "- none -"
-msgstr "- ingen -"
-
 #: setup/lib/messages.inc.php:217
 msgid ""
 "[kbd]SMART[/kbd] - i.e. descending order for fields of type TIME, DATE, "
@@ -7943,10 +7966,6 @@ msgstr ""
 msgid "Default sorting order"
 msgstr "Standard sorteringsordning"
 
-#: setup/lib/messages.inc.php:219
-msgid "Overview"
-msgstr "Översikt"
-
 #: setup/lib/messages.inc.php:220
 msgid "Use persistent connections to MySQL databases"
 msgstr "Använd persistenta anslutningar till MySQL-databaser"
@@ -8005,10 +8024,6 @@ msgstr ""
 msgid "Recoding engine"
 msgstr "Omvandlingsmotor"
 
-#: setup/lib/messages.inc.php:234
-msgid "Restore default value"
-msgstr "Återställ standardvärde"
-
 #: setup/lib/messages.inc.php:235
 msgid "Try to revert erroneous fields to their default values"
 msgstr "Försök återställa felaktiga fält till deras standardvärden"
@@ -8045,10 +8060,6 @@ msgstr "Du bör använda mysqli av prestandaanledningar"
 msgid "You allow for connecting to the server without a password."
 msgstr "Du tillåter anslutning till servern utan lösenord."
 
-#: setup/lib/messages.inc.php:241
-msgid "Add a new server"
-msgstr "Lägg till en ny server"
-
 #: setup/lib/messages.inc.php:242
 msgid "Leave blank if not used"
 msgstr "Lämna tomt om inte används"
@@ -8209,10 +8220,6 @@ msgstr ""
 "IP-baserat skydd inte pålitligt om din IP-adress hör till en ISP som "
 "tusentals användare, inklusive du, är ansluten till."
 
-#: setup/lib/messages.inc.php:272
-msgid "Edit server"
-msgstr "Ändra server"
-
 #: setup/lib/messages.inc.php:273
 msgid "What PHP extension to use; you should use mysqli if supported"
 msgstr ""
@@ -8488,11 +8495,6 @@ msgstr ""
 msgid "Verbose name of this server"
 msgstr "Beskrivande namn för denna server"
 
-#: setup/lib/messages.inc.php:328
-#, php-format
-msgid "Set value: %s"
-msgstr "Ange värde: %s"
-
 #: setup/lib/messages.inc.php:329
 msgid ""
 "Whether a user should be displayed a "show all (records)" button"
@@ -8532,10 +8534,6 @@ msgstr "Visa funktionsfälten i ändra/infoga-läge"
 msgid "Show function fields"
 msgstr "Visa funktionsfält"
 
-#: setup/lib/messages.inc.php:337
-msgid "Show hidden messages (#MSG_COUNT)"
-msgstr "Visa dolda meddelanden (#MSG_COUNT)"
-
 #: setup/lib/messages.inc.php:338
 msgid ""
 "Shows link to [a at http://php.net/manual/function.phpinfo.php]phpinfo()[/a] "
@@ -8685,10 +8683,6 @@ msgstr ""
 msgid "Got invalid version string from server"
 msgstr "Fick ogiltig versionssträng från server"
 
-#: setup/lib/messages.inc.php:370
-msgid "Check for latest version"
-msgstr "Kontrollera senaste version"
-
 #: setup/lib/messages.inc.php:371
 #, php-format
 msgid ""
@@ -8729,10 +8723,6 @@ msgstr ""
 "Varken URL-wrapper eller CURL är tillgänglig. Versionskontroll är inte "
 "möjlig."
 
-#: setup/lib/messages.inc.php:377
-msgid "Warning"
-msgstr "Varning"
-
 #: setup/lib/messages.inc.php:378
 msgid ""
 "Enable [a at http://en.wikipedia.org/wiki/ZIP_(file_format)]ZIP[/a] compression "
@@ -8802,6 +8792,19 @@ msgid "Description"
 msgstr "Beskrivning"
 
 #, fuzzy
+#~| msgid ""
+#~| "However on last run no data has been parsed, this usually means "
+#~| "phpMyAdmin won't be able to finish this import unless you increase php "
+#~| "time limits."
+#~ msgid ""
+#~ "However on last run no data has been parsed, this usually means "
+#~ "phpMyAdmin won"
+#~ msgstr ""
+#~ "Dock blev inga data bearbetade i senaste körningen. Detta betyder "
+#~ "vanligtvis att phpMyAdmin inte kan slutföra denna import såvida du inte "
+#~ "ökar PHP:s tidsbegränsningar."
+
+#, fuzzy
 #~| msgid "None"
 #~ msgctxt "None action"
 #~ msgid "None"
diff --git a/po/ta.po b/po/ta.po
index 6794fe9..d0d0597 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-14 07:48-0400\n"
+"POT-Creation-Date: 2010-05-14 13:39-0400\n"
 "PO-Revision-Date: 2010-04-16 10:43+0200\n"
 "Last-Translator: Sutharshan <sutharshan02 at gmail.com>\n"
 "Language-Team: Tamil <ta at li.org>\n"
@@ -926,10 +926,10 @@ msgid ""
 "file and import will resume."
 msgstr ""
 
-#: import.php:426
+#: import.php:426 libraries/messages.inc.php:1102
 msgid ""
 "However on last run no data has been parsed, this usually means phpMyAdmin "
-"won"
+"won't be able to finish this import unless you increase php time limits."
 msgstr ""
 
 #: index.php:190 libraries/messages.inc.php:549
@@ -6039,12 +6039,6 @@ msgstr ""
 msgid "Thread %s was successfully killed."
 msgstr ""
 
-#: libraries/messages.inc.php:1102
-msgid ""
-"However on last run no data has been parsed, this usually means phpMyAdmin "
-"won't be able to finish this import unless you increase php time limits."
-msgstr ""
-
 #: libraries/messages.inc.php:1105 pmd_pdf.php:94
 msgid "to/from page"
 msgstr ""
@@ -6468,7 +6462,8 @@ msgstr ""
 msgid "Filter"
 msgstr ""
 
-#: navigation.php:319 setup/lib/messages.inc.php:42
+#: navigation.php:319 setup/frames/index.inc.php:218
+#: setup/lib/messages.inc.php:42
 msgid "Clear"
 msgstr ""
 
@@ -6543,6 +6538,112 @@ msgstr ""
 msgid "Configuration: %s"
 msgstr ""
 
+#: setup/frames/config.inc.php:25 setup/frames/index.inc.php:152
+#: setup/lib/messages.inc.php:45
+msgid "Configuration file"
+msgstr ""
+
+#: setup/frames/config.inc.php:38 setup/frames/index.inc.php:212
+#: setup/lib/messages.inc.php:65
+msgid "Download"
+msgstr ""
+
+#: setup/frames/index.inc.php:58 setup/lib/messages.inc.php:164
+msgid ""
+"You are not using a secure connection; all data (including potentially "
+"sensitive information, like passwords) is transferred unencrypted!"
+msgstr ""
+
+#: setup/frames/index.inc.php:87 setup/frames/menu.inc.php:17
+#: setup/lib/messages.inc.php:219
+msgid "Overview"
+msgstr ""
+
+#: setup/frames/index.inc.php:95 setup/lib/messages.inc.php:337
+msgid "Show hidden messages (#MSG_COUNT)"
+msgstr ""
+
+#: setup/frames/index.inc.php:135 setup/lib/messages.inc.php:213
+msgid "There are no configured servers"
+msgstr ""
+
+#: setup/frames/index.inc.php:143 setup/lib/messages.inc.php:212
+msgid "New server"
+msgstr ""
+
+#: setup/frames/index.inc.php:172 setup/lib/messages.inc.php:50
+msgid "Default language"
+msgstr ""
+
+#: setup/frames/index.inc.php:182 setup/lib/messages.inc.php:187
+msgid "let the user choose"
+msgstr ""
+
+#: setup/frames/index.inc.php:193 setup/lib/messages.inc.php:216
+msgid "- none -"
+msgstr ""
+
+#: setup/frames/index.inc.php:196 setup/lib/messages.inc.php:51
+msgid "Default server"
+msgstr ""
+
+#: setup/frames/index.inc.php:206 setup/lib/messages.inc.php:66
+msgid "End of line"
+msgstr ""
+
+#: setup/frames/index.inc.php:211 setup/lib/messages.inc.php:61
+msgid "Display"
+msgstr ""
+
+#: setup/frames/index.inc.php:215 setup/lib/messages.inc.php:190
+msgid "Load"
+msgstr ""
+
+#: setup/frames/index.inc.php:226 setup/lib/messages.inc.php:152
+msgid "phpMyAdmin homepage"
+msgstr ""
+
+#: setup/frames/index.inc.php:227 setup/lib/messages.inc.php:64
+msgid "Donate"
+msgstr ""
+
+#: setup/frames/index.inc.php:228 setup/lib/messages.inc.php:370
+msgid "Check for latest version"
+msgstr "புதிய பதிப்பை பார்வையிடவும்"
+
+#: setup/frames/menu.inc.php:18 setup/lib/messages.inc.php:137
+msgid "Features"
+msgstr ""
+
+#: setup/frames/menu.inc.php:19 setup/lib/messages.inc.php:113
+msgid "Navigation frame"
+msgstr ""
+
+#: setup/frames/menu.inc.php:20 setup/lib/messages.inc.php:118
+msgid "Main frame"
+msgstr ""
+
+#: setup/frames/servers.inc.php:28 setup/lib/messages.inc.php:272
+msgid "Edit server"
+msgstr ""
+
+#: setup/frames/servers.inc.php:37 setup/lib/messages.inc.php:241
+msgid "Add a new server"
+msgstr ""
+
+#: setup/lib/FormDisplay.tpl.php:182 setup/lib/messages.inc.php:328
+#, php-format
+msgid "Set value: %s"
+msgstr ""
+
+#: setup/lib/FormDisplay.tpl.php:187 setup/lib/messages.inc.php:234
+msgid "Restore default value"
+msgstr ""
+
+#: setup/lib/form_processing.lib.php:43 setup/lib/messages.inc.php:377
+msgid "Warning"
+msgstr "எச்சரிக்கை"
+
 #: setup/lib/messages.inc.php:16
 msgid "Allow character set conversion"
 msgstr ""
@@ -6681,10 +6782,6 @@ msgstr ""
 msgid "Compress on the fly"
 msgstr ""
 
-#: setup/lib/messages.inc.php:45
-msgid "Configuration file"
-msgstr ""
-
 #: setup/lib/messages.inc.php:46
 msgid ""
 "Whether a warning ("Are your really sure...") should be displayed "
@@ -6703,14 +6800,6 @@ msgstr ""
 msgid "Default character set"
 msgstr ""
 
-#: setup/lib/messages.inc.php:50
-msgid "Default language"
-msgstr ""
-
-#: setup/lib/messages.inc.php:51
-msgid "Default server"
-msgstr ""
-
 #: setup/lib/messages.inc.php:52
 msgid "Tab that is displayed when entering a database"
 msgstr ""
@@ -6749,10 +6838,6 @@ msgstr ""
 msgid "Display databases as a list"
 msgstr ""
 
-#: setup/lib/messages.inc.php:61
-msgid "Display"
-msgstr ""
-
 #: setup/lib/messages.inc.php:62
 msgid "Show server listing as a list instead of a drop down"
 msgstr ""
@@ -6761,18 +6846,6 @@ msgstr ""
 msgid "Display servers as a list"
 msgstr ""
 
-#: setup/lib/messages.inc.php:64
-msgid "Donate"
-msgstr ""
-
-#: setup/lib/messages.inc.php:65
-msgid "Download"
-msgstr ""
-
-#: setup/lib/messages.inc.php:66
-msgid "End of line"
-msgstr ""
-
 #: setup/lib/messages.inc.php:67
 msgid "Could not connect to MySQL server"
 msgstr ""
@@ -6945,10 +7018,6 @@ msgstr ""
 msgid "Customize appearance of the navigation frame"
 msgstr ""
 
-#: setup/lib/messages.inc.php:113
-msgid "Navigation frame"
-msgstr ""
-
 #: setup/lib/messages.inc.php:114
 msgid "Servers display options"
 msgstr ""
@@ -6957,10 +7026,6 @@ msgstr ""
 msgid "Tables display options"
 msgstr ""
 
-#: setup/lib/messages.inc.php:118
-msgid "Main frame"
-msgstr ""
-
 #: setup/lib/messages.inc.php:119
 msgid "Settings that didn't fit enywhere else"
 msgstr ""
@@ -7036,10 +7101,6 @@ msgstr ""
 msgid "Customize export options"
 msgstr ""
 
-#: setup/lib/messages.inc.php:137
-msgid "Features"
-msgstr ""
-
 #: setup/lib/messages.inc.php:138
 msgid "Customize import defaults"
 msgstr ""
@@ -7104,10 +7165,6 @@ msgid ""
 "system."
 msgstr ""
 
-#: setup/lib/messages.inc.php:152
-msgid "phpMyAdmin homepage"
-msgstr ""
-
 #: setup/lib/messages.inc.php:153
 msgid "Extra parameters for iconv"
 msgstr ""
@@ -7151,12 +7208,6 @@ msgstr ""
 msgid "Insecure connection"
 msgstr ""
 
-#: setup/lib/messages.inc.php:164
-msgid ""
-"You are not using a secure connection; all data (including potentially "
-"sensitive information, like passwords) is transferred unencrypted!"
-msgstr ""
-
 #: setup/lib/messages.inc.php:165
 #, php-format
 msgid ""
@@ -7252,10 +7303,6 @@ msgstr ""
 msgid "Enable highlighting"
 msgstr ""
 
-#: setup/lib/messages.inc.php:187
-msgid "let the user choose"
-msgstr ""
-
 #: setup/lib/messages.inc.php:188
 msgid "Use less graphically intense tabs"
 msgstr ""
@@ -7264,10 +7311,6 @@ msgstr ""
 msgid "Light tabs"
 msgstr ""
 
-#: setup/lib/messages.inc.php:190
-msgid "Load"
-msgstr ""
-
 #: setup/lib/messages.inc.php:191
 msgid ""
 "If TRUE, logout deletes cookies for all servers; when set to FALSE, logout "
@@ -7369,14 +7412,6 @@ msgstr ""
 msgid "Iconic navigation bar"
 msgstr ""
 
-#: setup/lib/messages.inc.php:212
-msgid "New server"
-msgstr ""
-
-#: setup/lib/messages.inc.php:213
-msgid "There are no configured servers"
-msgstr ""
-
 #: setup/lib/messages.inc.php:214
 msgid "use GZip output buffering for increased speed in HTTP transfers"
 msgstr ""
@@ -7385,10 +7420,6 @@ msgstr ""
 msgid "GZip output buffering"
 msgstr ""
 
-#: setup/lib/messages.inc.php:216
-msgid "- none -"
-msgstr ""
-
 #: setup/lib/messages.inc.php:217
 msgid ""
 "[kbd]SMART[/kbd] - i.e. descending order for fields of type TIME, DATE, "
@@ -7399,10 +7430,6 @@ msgstr ""
 msgid "Default sorting order"
 msgstr ""
 
-#: setup/lib/messages.inc.php:219
-msgid "Overview"
-msgstr ""
-
 #: setup/lib/messages.inc.php:220
 msgid "Use persistent connections to MySQL databases"
 msgstr ""
@@ -7457,10 +7484,6 @@ msgstr ""
 msgid "Recoding engine"
 msgstr ""
 
-#: setup/lib/messages.inc.php:234
-msgid "Restore default value"
-msgstr ""
-
 #: setup/lib/messages.inc.php:235
 msgid "Try to revert erroneous fields to their default values"
 msgstr ""
@@ -7491,10 +7514,6 @@ msgstr ""
 msgid "You allow for connecting to the server without a password."
 msgstr ""
 
-#: setup/lib/messages.inc.php:241
-msgid "Add a new server"
-msgstr ""
-
 #: setup/lib/messages.inc.php:242
 msgid "Leave blank if not used"
 msgstr ""
@@ -7635,10 +7654,6 @@ msgid ""
 "to."
 msgstr ""
 
-#: setup/lib/messages.inc.php:272
-msgid "Edit server"
-msgstr ""
-
 #: setup/lib/messages.inc.php:273
 msgid "What PHP extension to use; you should use mysqli if supported"
 msgstr ""
@@ -7880,11 +7895,6 @@ msgstr ""
 msgid "Verbose name of this server"
 msgstr ""
 
-#: setup/lib/messages.inc.php:328
-#, php-format
-msgid "Set value: %s"
-msgstr ""
-
 #: setup/lib/messages.inc.php:329
 msgid ""
 "Whether a user should be displayed a "show all (records)" button"
@@ -7921,10 +7931,6 @@ msgstr ""
 msgid "Show function fields"
 msgstr ""
 
-#: setup/lib/messages.inc.php:337
-msgid "Show hidden messages (#MSG_COUNT)"
-msgstr ""
-
 #: setup/lib/messages.inc.php:338
 msgid ""
 "Shows link to [a at http://php.net/manual/function.phpinfo.php]phpinfo()[/a] "
@@ -8053,10 +8059,6 @@ msgstr ""
 msgid "Got invalid version string from server"
 msgstr ""
 
-#: setup/lib/messages.inc.php:370
-msgid "Check for latest version"
-msgstr "புதிய பதிப்பை பார்வையிடவும்"
-
 #: setup/lib/messages.inc.php:371
 #, php-format
 msgid ""
@@ -8088,10 +8090,6 @@ msgid ""
 "Neither URL wrapper nor CURL is available. Version check is not possible."
 msgstr ""
 
-#: setup/lib/messages.inc.php:377
-msgid "Warning"
-msgstr "எச்சரிக்கை"
-
 #: setup/lib/messages.inc.php:378
 msgid ""
 "Enable [a at http://en.wikipedia.org/wiki/ZIP_(file_format)]ZIP[/a] compression "
diff --git a/po/te.po b/po/te.po
index 5b6466f..c28a960 100644
--- a/po/te.po
+++ b/po/te.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-14 07:48-0400\n"
+"POT-Creation-Date: 2010-05-14 13:39-0400\n"
 "PO-Revision-Date: 2010-04-02 12:04+0200\n"
 "Last-Translator:  <veeven at gmail.com>\n"
 "Language-Team: Telugu <te at li.org>\n"
@@ -941,10 +941,10 @@ msgid ""
 "file and import will resume."
 msgstr ""
 
-#: import.php:426
+#: import.php:426 libraries/messages.inc.php:1102
 msgid ""
 "However on last run no data has been parsed, this usually means phpMyAdmin "
-"won"
+"won't be able to finish this import unless you increase php time limits."
 msgstr ""
 
 #: index.php:190 libraries/messages.inc.php:549
@@ -6110,12 +6110,6 @@ msgstr ""
 msgid "Thread %s was successfully killed."
 msgstr ""
 
-#: libraries/messages.inc.php:1102
-msgid ""
-"However on last run no data has been parsed, this usually means phpMyAdmin "
-"won't be able to finish this import unless you increase php time limits."
-msgstr ""
-
 #: libraries/messages.inc.php:1105 pmd_pdf.php:94
 msgid "to/from page"
 msgstr ""
@@ -6544,7 +6538,8 @@ msgstr "కాదు"
 msgid "Filter"
 msgstr ""
 
-#: navigation.php:319 setup/lib/messages.inc.php:42
+#: navigation.php:319 setup/frames/index.inc.php:218
+#: setup/lib/messages.inc.php:42
 msgid "Clear"
 msgstr ""
 
@@ -6629,6 +6624,114 @@ msgstr "అనుసంధానాలు"
 msgid "Configuration: %s"
 msgstr "సేవకి స్వరూపణం"
 
+#: setup/frames/config.inc.php:25 setup/frames/index.inc.php:152
+#: setup/lib/messages.inc.php:45
+msgid "Configuration file"
+msgstr ""
+
+# మొదటి అనువాదము
+#: setup/frames/config.inc.php:38 setup/frames/index.inc.php:212
+#: setup/lib/messages.inc.php:65
+msgid "Download"
+msgstr "దించుకొనుము"
+
+#: setup/frames/index.inc.php:58 setup/lib/messages.inc.php:164
+msgid ""
+"You are not using a secure connection; all data (including potentially "
+"sensitive information, like passwords) is transferred unencrypted!"
+msgstr ""
+
+#: setup/frames/index.inc.php:87 setup/frames/menu.inc.php:17
+#: setup/lib/messages.inc.php:219
+msgid "Overview"
+msgstr ""
+
+#: setup/frames/index.inc.php:95 setup/lib/messages.inc.php:337
+msgid "Show hidden messages (#MSG_COUNT)"
+msgstr ""
+
+#: setup/frames/index.inc.php:135 setup/lib/messages.inc.php:213
+msgid "There are no configured servers"
+msgstr ""
+
+#: setup/frames/index.inc.php:143 setup/lib/messages.inc.php:212
+msgid "New server"
+msgstr ""
+
+#: setup/frames/index.inc.php:172 setup/lib/messages.inc.php:50
+msgid "Default language"
+msgstr ""
+
+#: setup/frames/index.inc.php:182 setup/lib/messages.inc.php:187
+msgid "let the user choose"
+msgstr ""
+
+#: setup/frames/index.inc.php:193 setup/lib/messages.inc.php:216
+msgid "- none -"
+msgstr "- ఏమీలేదు -"
+
+#: setup/frames/index.inc.php:196 setup/lib/messages.inc.php:51
+msgid "Default server"
+msgstr ""
+
+# మొదటి అనువాదము
+#: setup/frames/index.inc.php:206 setup/lib/messages.inc.php:66
+msgid "End of line"
+msgstr "వాక్యాంతము"
+
+#: setup/frames/index.inc.php:211 setup/lib/messages.inc.php:61
+msgid "Display"
+msgstr ""
+
+#: setup/frames/index.inc.php:215 setup/lib/messages.inc.php:190
+msgid "Load"
+msgstr ""
+
+#: setup/frames/index.inc.php:226 setup/lib/messages.inc.php:152
+msgid "phpMyAdmin homepage"
+msgstr ""
+
+#: setup/frames/index.inc.php:227 setup/lib/messages.inc.php:64
+msgid "Donate"
+msgstr ""
+
+#: setup/frames/index.inc.php:228 setup/lib/messages.inc.php:370
+msgid "Check for latest version"
+msgstr ""
+
+#: setup/frames/menu.inc.php:18 setup/lib/messages.inc.php:137
+msgid "Features"
+msgstr ""
+
+#: setup/frames/menu.inc.php:19 setup/lib/messages.inc.php:113
+msgid "Navigation frame"
+msgstr ""
+
+#: setup/frames/menu.inc.php:20 setup/lib/messages.inc.php:118
+msgid "Main frame"
+msgstr ""
+
+#: setup/frames/servers.inc.php:28 setup/lib/messages.inc.php:272
+msgid "Edit server"
+msgstr ""
+
+#: setup/frames/servers.inc.php:37 setup/lib/messages.inc.php:241
+msgid "Add a new server"
+msgstr ""
+
+#: setup/lib/FormDisplay.tpl.php:182 setup/lib/messages.inc.php:328
+#, php-format
+msgid "Set value: %s"
+msgstr ""
+
+#: setup/lib/FormDisplay.tpl.php:187 setup/lib/messages.inc.php:234
+msgid "Restore default value"
+msgstr ""
+
+#: setup/lib/form_processing.lib.php:43 setup/lib/messages.inc.php:377
+msgid "Warning"
+msgstr "హెచ్చరిక"
+
 #: setup/lib/messages.inc.php:16
 msgid "Allow character set conversion"
 msgstr ""
@@ -6767,10 +6870,6 @@ msgstr ""
 msgid "Compress on the fly"
 msgstr ""
 
-#: setup/lib/messages.inc.php:45
-msgid "Configuration file"
-msgstr ""
-
 #: setup/lib/messages.inc.php:46
 msgid ""
 "Whether a warning ("Are your really sure...") should be displayed "
@@ -6789,14 +6888,6 @@ msgstr ""
 msgid "Default character set"
 msgstr ""
 
-#: setup/lib/messages.inc.php:50
-msgid "Default language"
-msgstr ""
-
-#: setup/lib/messages.inc.php:51
-msgid "Default server"
-msgstr ""
-
 #: setup/lib/messages.inc.php:52
 msgid "Tab that is displayed when entering a database"
 msgstr ""
@@ -6835,10 +6926,6 @@ msgstr ""
 msgid "Display databases as a list"
 msgstr ""
 
-#: setup/lib/messages.inc.php:61
-msgid "Display"
-msgstr ""
-
 #: setup/lib/messages.inc.php:62
 msgid "Show server listing as a list instead of a drop down"
 msgstr ""
@@ -6847,20 +6934,6 @@ msgstr ""
 msgid "Display servers as a list"
 msgstr ""
 
-#: setup/lib/messages.inc.php:64
-msgid "Donate"
-msgstr ""
-
-# మొదటి అనువాదము
-#: setup/lib/messages.inc.php:65
-msgid "Download"
-msgstr "దించుకొనుము"
-
-# మొదటి అనువాదము
-#: setup/lib/messages.inc.php:66
-msgid "End of line"
-msgstr "వాక్యాంతము"
-
 #: setup/lib/messages.inc.php:67
 msgid "Could not connect to MySQL server"
 msgstr ""
@@ -7033,10 +7106,6 @@ msgstr ""
 msgid "Customize appearance of the navigation frame"
 msgstr ""
 
-#: setup/lib/messages.inc.php:113
-msgid "Navigation frame"
-msgstr ""
-
 #: setup/lib/messages.inc.php:114
 msgid "Servers display options"
 msgstr ""
@@ -7045,10 +7114,6 @@ msgstr ""
 msgid "Tables display options"
 msgstr ""
 
-#: setup/lib/messages.inc.php:118
-msgid "Main frame"
-msgstr ""
-
 #: setup/lib/messages.inc.php:119
 msgid "Settings that didn't fit enywhere else"
 msgstr ""
@@ -7124,10 +7189,6 @@ msgstr ""
 msgid "Customize export options"
 msgstr ""
 
-#: setup/lib/messages.inc.php:137
-msgid "Features"
-msgstr ""
-
 #: setup/lib/messages.inc.php:138
 msgid "Customize import defaults"
 msgstr ""
@@ -7192,10 +7253,6 @@ msgid ""
 "system."
 msgstr ""
 
-#: setup/lib/messages.inc.php:152
-msgid "phpMyAdmin homepage"
-msgstr ""
-
 #: setup/lib/messages.inc.php:153
 msgid "Extra parameters for iconv"
 msgstr ""
@@ -7239,12 +7296,6 @@ msgstr ""
 msgid "Insecure connection"
 msgstr ""
 
-#: setup/lib/messages.inc.php:164
-msgid ""
-"You are not using a secure connection; all data (including potentially "
-"sensitive information, like passwords) is transferred unencrypted!"
-msgstr ""
-
 #: setup/lib/messages.inc.php:165
 #, php-format
 msgid ""
@@ -7340,10 +7391,6 @@ msgstr ""
 msgid "Enable highlighting"
 msgstr ""
 
-#: setup/lib/messages.inc.php:187
-msgid "let the user choose"
-msgstr ""
-
 #: setup/lib/messages.inc.php:188
 msgid "Use less graphically intense tabs"
 msgstr ""
@@ -7352,10 +7399,6 @@ msgstr ""
 msgid "Light tabs"
 msgstr ""
 
-#: setup/lib/messages.inc.php:190
-msgid "Load"
-msgstr ""
-
 #: setup/lib/messages.inc.php:191
 msgid ""
 "If TRUE, logout deletes cookies for all servers; when set to FALSE, logout "
@@ -7457,14 +7500,6 @@ msgstr ""
 msgid "Iconic navigation bar"
 msgstr ""
 
-#: setup/lib/messages.inc.php:212
-msgid "New server"
-msgstr ""
-
-#: setup/lib/messages.inc.php:213
-msgid "There are no configured servers"
-msgstr ""
-
 #: setup/lib/messages.inc.php:214
 msgid "use GZip output buffering for increased speed in HTTP transfers"
 msgstr ""
@@ -7473,10 +7508,6 @@ msgstr ""
 msgid "GZip output buffering"
 msgstr ""
 
-#: setup/lib/messages.inc.php:216
-msgid "- none -"
-msgstr "- ఏమీలేదు -"
-
 #: setup/lib/messages.inc.php:217
 msgid ""
 "[kbd]SMART[/kbd] - i.e. descending order for fields of type TIME, DATE, "
@@ -7487,10 +7518,6 @@ msgstr ""
 msgid "Default sorting order"
 msgstr ""
 
-#: setup/lib/messages.inc.php:219
-msgid "Overview"
-msgstr ""
-
 #: setup/lib/messages.inc.php:220
 msgid "Use persistent connections to MySQL databases"
 msgstr ""
@@ -7545,10 +7572,6 @@ msgstr ""
 msgid "Recoding engine"
 msgstr ""
 
-#: setup/lib/messages.inc.php:234
-msgid "Restore default value"
-msgstr ""
-
 #: setup/lib/messages.inc.php:235
 msgid "Try to revert erroneous fields to their default values"
 msgstr ""
@@ -7579,10 +7602,6 @@ msgstr ""
 msgid "You allow for connecting to the server without a password."
 msgstr ""
 
-#: setup/lib/messages.inc.php:241
-msgid "Add a new server"
-msgstr ""
-
 #: setup/lib/messages.inc.php:242
 msgid "Leave blank if not used"
 msgstr ""
@@ -7723,10 +7742,6 @@ msgid ""
 "to."
 msgstr ""
 
-#: setup/lib/messages.inc.php:272
-msgid "Edit server"
-msgstr ""
-
 #: setup/lib/messages.inc.php:273
 msgid "What PHP extension to use; you should use mysqli if supported"
 msgstr ""
@@ -7968,11 +7983,6 @@ msgstr ""
 msgid "Verbose name of this server"
 msgstr ""
 
-#: setup/lib/messages.inc.php:328
-#, php-format
-msgid "Set value: %s"
-msgstr ""
-
 #: setup/lib/messages.inc.php:329
 msgid ""
 "Whether a user should be displayed a "show all (records)" button"
@@ -8009,10 +8019,6 @@ msgstr ""
 msgid "Show function fields"
 msgstr ""
 
-#: setup/lib/messages.inc.php:337
-msgid "Show hidden messages (#MSG_COUNT)"
-msgstr ""
-
 #: setup/lib/messages.inc.php:338
 msgid ""
 "Shows link to [a at http://php.net/manual/function.phpinfo.php]phpinfo()[/a] "
@@ -8142,10 +8148,6 @@ msgstr ""
 msgid "Got invalid version string from server"
 msgstr ""
 
-#: setup/lib/messages.inc.php:370
-msgid "Check for latest version"
-msgstr ""
-
 #: setup/lib/messages.inc.php:371
 #, php-format
 msgid ""
@@ -8177,10 +8179,6 @@ msgid ""
 "Neither URL wrapper nor CURL is available. Version check is not possible."
 msgstr ""
 
-#: setup/lib/messages.inc.php:377
-msgid "Warning"
-msgstr "హెచ్చరిక"
-
 #: setup/lib/messages.inc.php:378
 msgid ""
 "Enable [a at http://en.wikipedia.org/wiki/ZIP_(file_format)]ZIP[/a] compression "
diff --git a/po/th.po b/po/th.po
index e0ff774..b9e9c1a 100644
--- a/po/th.po
+++ b/po/th.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-14 07:48-0400\n"
+"POT-Creation-Date: 2010-05-14 13:39-0400\n"
 "PO-Revision-Date: 2010-03-12 09:19+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: thai <th at li.org>\n"
@@ -938,10 +938,10 @@ msgid ""
 "file and import will resume."
 msgstr ""
 
-#: import.php:426
+#: import.php:426 libraries/messages.inc.php:1102
 msgid ""
 "However on last run no data has been parsed, this usually means phpMyAdmin "
-"won"
+"won't be able to finish this import unless you increase php time limits."
 msgstr ""
 
 #: index.php:190 libraries/messages.inc.php:549
@@ -6162,12 +6162,6 @@ msgstr ""
 msgid "Thread %s was successfully killed."
 msgstr "เธรด %s ถูกทำลายเรียบร้อยแล้ว."
 
-#: libraries/messages.inc.php:1102
-msgid ""
-"However on last run no data has been parsed, this usually means phpMyAdmin "
-"won't be able to finish this import unless you increase php time limits."
-msgstr ""
-
 #: libraries/messages.inc.php:1105 pmd_pdf.php:94
 msgid "to/from page"
 msgstr ""
@@ -6604,7 +6598,8 @@ msgstr "ไม่มี"
 msgid "Filter"
 msgstr ""
 
-#: navigation.php:319 setup/lib/messages.inc.php:42
+#: navigation.php:319 setup/frames/index.inc.php:218
+#: setup/lib/messages.inc.php:42
 #, fuzzy
 msgid "Clear"
 msgstr "ปฏิทิน"
@@ -6692,6 +6687,115 @@ msgstr "การเชื่อมต่อ"
 msgid "Configuration: %s"
 msgstr ""
 
+#: setup/frames/config.inc.php:25 setup/frames/index.inc.php:152
+#: setup/lib/messages.inc.php:45
+msgid "Configuration file"
+msgstr ""
+
+#: setup/frames/config.inc.php:38 setup/frames/index.inc.php:212
+#: setup/lib/messages.inc.php:65
+msgid "Download"
+msgstr ""
+
+#: setup/frames/index.inc.php:58 setup/lib/messages.inc.php:164
+msgid ""
+"You are not using a secure connection; all data (including potentially "
+"sensitive information, like passwords) is transferred unencrypted!"
+msgstr ""
+
+#: setup/frames/index.inc.php:87 setup/frames/menu.inc.php:17
+#: setup/lib/messages.inc.php:219
+msgid "Overview"
+msgstr ""
+
+#: setup/frames/index.inc.php:95 setup/lib/messages.inc.php:337
+msgid "Show hidden messages (#MSG_COUNT)"
+msgstr ""
+
+#: setup/frames/index.inc.php:135 setup/lib/messages.inc.php:213
+msgid "There are no configured servers"
+msgstr ""
+
+#: setup/frames/index.inc.php:143 setup/lib/messages.inc.php:212
+msgid "New server"
+msgstr ""
+
+#: setup/frames/index.inc.php:172 setup/lib/messages.inc.php:50
+msgid "Default language"
+msgstr ""
+
+#: setup/frames/index.inc.php:182 setup/lib/messages.inc.php:187
+msgid "let the user choose"
+msgstr ""
+
+#: setup/frames/index.inc.php:193 setup/lib/messages.inc.php:216
+msgid "- none -"
+msgstr ""
+
+#: setup/frames/index.inc.php:196 setup/lib/messages.inc.php:51
+msgid "Default server"
+msgstr ""
+
+#: setup/frames/index.inc.php:206 setup/lib/messages.inc.php:66
+msgid "End of line"
+msgstr ""
+
+#: setup/frames/index.inc.php:211 setup/lib/messages.inc.php:61
+msgid "Display"
+msgstr ""
+
+#: setup/frames/index.inc.php:215 setup/lib/messages.inc.php:190
+#, fuzzy
+msgid "Load"
+msgstr "โลคอล"
+
+#: setup/frames/index.inc.php:226 setup/lib/messages.inc.php:152
+#, fuzzy
+msgid "phpMyAdmin homepage"
+msgstr "เอกสารการใช้ phpMyAdmin"
+
+#: setup/frames/index.inc.php:227 setup/lib/messages.inc.php:64
+msgid "Donate"
+msgstr ""
+
+#: setup/frames/index.inc.php:228 setup/lib/messages.inc.php:370
+msgid "Check for latest version"
+msgstr ""
+
+#: setup/frames/menu.inc.php:18 setup/lib/messages.inc.php:137
+msgid "Features"
+msgstr ""
+
+#: setup/frames/menu.inc.php:19 setup/lib/messages.inc.php:113
+msgid "Navigation frame"
+msgstr ""
+
+#: setup/frames/menu.inc.php:20 setup/lib/messages.inc.php:118
+msgid "Main frame"
+msgstr ""
+
+#: setup/frames/servers.inc.php:28 setup/lib/messages.inc.php:272
+msgid "Edit server"
+msgstr ""
+
+#: setup/frames/servers.inc.php:37 setup/lib/messages.inc.php:241
+#, fuzzy
+msgid "Add a new server"
+msgstr "เพิ่มผู้ใช้ใหม่"
+
+#: setup/lib/FormDisplay.tpl.php:182 setup/lib/messages.inc.php:328
+#, php-format
+msgid "Set value: %s"
+msgstr ""
+
+#: setup/lib/FormDisplay.tpl.php:187 setup/lib/messages.inc.php:234
+msgid "Restore default value"
+msgstr ""
+
+#: setup/lib/form_processing.lib.php:43 setup/lib/messages.inc.php:377
+msgid "Warning"
+msgstr ""
+
 #: setup/lib/messages.inc.php:16
 msgid "Allow character set conversion"
 msgstr ""
@@ -6831,10 +6935,6 @@ msgstr ""
 msgid "Compress on the fly"
 msgstr ""
 
-#: setup/lib/messages.inc.php:45
-msgid "Configuration file"
-msgstr ""
-
 #: setup/lib/messages.inc.php:46
 msgid ""
 "Whether a warning ("Are your really sure...") should be displayed "
@@ -6853,14 +6953,6 @@ msgstr ""
 msgid "Default character set"
 msgstr ""
 
-#: setup/lib/messages.inc.php:50
-msgid "Default language"
-msgstr ""
-
-#: setup/lib/messages.inc.php:51
-msgid "Default server"
-msgstr ""
-
 #: setup/lib/messages.inc.php:52
 msgid "Tab that is displayed when entering a database"
 msgstr ""
@@ -6900,10 +6992,6 @@ msgstr ""
 msgid "Display databases as a list"
 msgstr ""
 
-#: setup/lib/messages.inc.php:61
-msgid "Display"
-msgstr ""
-
 #: setup/lib/messages.inc.php:62
 msgid "Show server listing as a list instead of a drop down"
 msgstr ""
@@ -6912,18 +7000,6 @@ msgstr ""
 msgid "Display servers as a list"
 msgstr ""
 
-#: setup/lib/messages.inc.php:64
-msgid "Donate"
-msgstr ""
-
-#: setup/lib/messages.inc.php:65
-msgid "Download"
-msgstr ""
-
-#: setup/lib/messages.inc.php:66
-msgid "End of line"
-msgstr ""
-
 #: setup/lib/messages.inc.php:67
 msgid "Could not connect to MySQL server"
 msgstr ""
@@ -7103,10 +7179,6 @@ msgstr "สถิติฐานข้อมูล"
 msgid "Customize appearance of the navigation frame"
 msgstr ""
 
-#: setup/lib/messages.inc.php:113
-msgid "Navigation frame"
-msgstr ""
-
 #: setup/lib/messages.inc.php:114
 msgid "Servers display options"
 msgstr ""
@@ -7115,10 +7187,6 @@ msgstr ""
 msgid "Tables display options"
 msgstr ""
 
-#: setup/lib/messages.inc.php:118
-msgid "Main frame"
-msgstr ""
-
 #: setup/lib/messages.inc.php:119
 msgid "Settings that didn't fit enywhere else"
 msgstr ""
@@ -7195,10 +7263,6 @@ msgstr ""
 msgid "Customize export options"
 msgstr ""
 
-#: setup/lib/messages.inc.php:137
-msgid "Features"
-msgstr ""
-
 #: setup/lib/messages.inc.php:138
 msgid "Customize import defaults"
 msgstr ""
@@ -7267,11 +7331,6 @@ msgid ""
 "system."
 msgstr ""
 
-#: setup/lib/messages.inc.php:152
-#, fuzzy
-msgid "phpMyAdmin homepage"
-msgstr "เอกสารการใช้ phpMyAdmin"
-
 #: setup/lib/messages.inc.php:153
 msgid "Extra parameters for iconv"
 msgstr ""
@@ -7315,12 +7374,6 @@ msgstr ""
 msgid "Insecure connection"
 msgstr ""
 
-#: setup/lib/messages.inc.php:164
-msgid ""
-"You are not using a secure connection; all data (including potentially "
-"sensitive information, like passwords) is transferred unencrypted!"
-msgstr ""
-
 #: setup/lib/messages.inc.php:165
 #, php-format
 msgid ""
@@ -7416,10 +7469,6 @@ msgstr ""
 msgid "Enable highlighting"
 msgstr ""
 
-#: setup/lib/messages.inc.php:187
-msgid "let the user choose"
-msgstr ""
-
 #: setup/lib/messages.inc.php:188
 msgid "Use less graphically intense tabs"
 msgstr ""
@@ -7428,11 +7477,6 @@ msgstr ""
 msgid "Light tabs"
 msgstr ""
 
-#: setup/lib/messages.inc.php:190
-#, fuzzy
-msgid "Load"
-msgstr "โลคอล"
-
 #: setup/lib/messages.inc.php:191
 msgid ""
 "If TRUE, logout deletes cookies for all servers; when set to FALSE, logout "
@@ -7535,14 +7579,6 @@ msgstr ""
 msgid "Iconic navigation bar"
 msgstr ""
 
-#: setup/lib/messages.inc.php:212
-msgid "New server"
-msgstr ""
-
-#: setup/lib/messages.inc.php:213
-msgid "There are no configured servers"
-msgstr ""
-
 #: setup/lib/messages.inc.php:214
 msgid "use GZip output buffering for increased speed in HTTP transfers"
 msgstr ""
@@ -7551,10 +7587,6 @@ msgstr ""
 msgid "GZip output buffering"
 msgstr ""
 
-#: setup/lib/messages.inc.php:216
-msgid "- none -"
-msgstr ""
-
 #: setup/lib/messages.inc.php:217
 msgid ""
 "[kbd]SMART[/kbd] - i.e. descending order for fields of type TIME, DATE, "
@@ -7565,10 +7597,6 @@ msgstr ""
 msgid "Default sorting order"
 msgstr ""
 
-#: setup/lib/messages.inc.php:219
-msgid "Overview"
-msgstr ""
-
 #: setup/lib/messages.inc.php:220
 msgid "Use persistent connections to MySQL databases"
 msgstr ""
@@ -7623,10 +7651,6 @@ msgstr ""
 msgid "Recoding engine"
 msgstr ""
 
-#: setup/lib/messages.inc.php:234
-msgid "Restore default value"
-msgstr ""
-
 #: setup/lib/messages.inc.php:235
 msgid "Try to revert erroneous fields to their default values"
 msgstr ""
@@ -7657,11 +7681,6 @@ msgstr ""
 msgid "You allow for connecting to the server without a password."
 msgstr ""
 
-#: setup/lib/messages.inc.php:241
-#, fuzzy
-msgid "Add a new server"
-msgstr "เพิ่มผู้ใช้ใหม่"
-
 #: setup/lib/messages.inc.php:242
 msgid "Leave blank if not used"
 msgstr ""
@@ -7805,10 +7824,6 @@ msgid ""
 "to."
 msgstr ""
 
-#: setup/lib/messages.inc.php:272
-msgid "Edit server"
-msgstr ""
-
 #: setup/lib/messages.inc.php:273
 msgid "What PHP extension to use; you should use mysqli if supported"
 msgstr ""
@@ -8058,11 +8073,6 @@ msgstr ""
 msgid "Verbose name of this server"
 msgstr ""
 
-#: setup/lib/messages.inc.php:328
-#, php-format
-msgid "Set value: %s"
-msgstr ""
-
 #: setup/lib/messages.inc.php:329
 msgid ""
 "Whether a user should be displayed a "show all (records)" button"
@@ -8100,10 +8110,6 @@ msgstr ""
 msgid "Show function fields"
 msgstr ""
 
-#: setup/lib/messages.inc.php:337
-msgid "Show hidden messages (#MSG_COUNT)"
-msgstr ""
-
 #: setup/lib/messages.inc.php:338
 msgid ""
 "Shows link to [a at http://php.net/manual/function.phpinfo.php]phpinfo()[/a] "
@@ -8235,10 +8241,6 @@ msgstr ""
 msgid "Got invalid version string from server"
 msgstr ""
 
-#: setup/lib/messages.inc.php:370
-msgid "Check for latest version"
-msgstr ""
-
 #: setup/lib/messages.inc.php:371
 #, php-format
 msgid ""
@@ -8270,10 +8272,6 @@ msgid ""
 "Neither URL wrapper nor CURL is available. Version check is not possible."
 msgstr ""
 
-#: setup/lib/messages.inc.php:377
-msgid "Warning"
-msgstr ""
-
 #: setup/lib/messages.inc.php:378
 msgid ""
 "Enable [a at http://en.wikipedia.org/wiki/ZIP_(file_format)]ZIP[/a] compression "
diff --git a/po/tr.po b/po/tr.po
index 0e22b0e..8ba0156 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-14 07:48-0400\n"
+"POT-Creation-Date: 2010-05-14 13:39-0400\n"
 "PO-Revision-Date: 2010-04-03 11:44+0200\n"
 "Last-Translator:  <hitowerdigit at hotmail.com>\n"
 "Language-Team: turkish <tr at li.org>\n"
@@ -948,15 +948,10 @@ msgstr ""
 "Küçük program zaman aşımı geçti, eğer içeri aktarmayı bitirmek istiyorsanız, "
 "lütfen aynı dosyayı yeniden gönderin ve içeri aktarma devam edecektir."
 
-#: import.php:426
-#, fuzzy
-#| msgid ""
-#| "However on last run no data has been parsed, this usually means "
-#| "phpMyAdmin won't be able to finish this import unless you increase php "
-#| "time limits."
+#: import.php:426 libraries/messages.inc.php:1102
 msgid ""
 "However on last run no data has been parsed, this usually means phpMyAdmin "
-"won"
+"won't be able to finish this import unless you increase php time limits."
 msgstr ""
 "Ancak son çalıştırmada hiç veri ayrıştırılmadı, bu genellikle, php zaman "
 "sınırlarını arttırmadığınız sürece phpMyAdmin'in bu içeri aktarmayı "
@@ -6441,15 +6436,6 @@ msgstr "İşlemler"
 msgid "Thread %s was successfully killed."
 msgstr "%s işlemi başarılı olarak sonlandırıldı."
 
-#: libraries/messages.inc.php:1102
-msgid ""
-"However on last run no data has been parsed, this usually means phpMyAdmin "
-"won't be able to finish this import unless you increase php time limits."
-msgstr ""
-"Ancak son çalıştırmada hiç veri ayrıştırılmadı, bu genellikle, php zaman "
-"sınırlarını arttırmadığınız sürece phpMyAdmin'in bu içeri aktarmayı "
-"biteremeyeceği anlamına gelir."
-
 #: libraries/messages.inc.php:1105 pmd_pdf.php:94
 msgid "to/from page"
 msgstr "sayfadan/sayfaya"
@@ -6926,7 +6912,8 @@ msgstr "Hiçbiri"
 msgid "Filter"
 msgstr "Süzgeç"
 
-#: navigation.php:319 setup/lib/messages.inc.php:42
+#: navigation.php:319 setup/frames/index.inc.php:218
+#: setup/lib/messages.inc.php:42
 msgid "Clear"
 msgstr "Temizle"
 
@@ -7033,6 +7020,114 @@ msgstr "Güvensiz bağlantı"
 msgid "Configuration: %s"
 msgstr "Yapılandırma dosyası"
 
+#: setup/frames/config.inc.php:25 setup/frames/index.inc.php:152
+#: setup/lib/messages.inc.php:45
+msgid "Configuration file"
+msgstr "Yapılandırma dosyası"
+
+#: setup/frames/config.inc.php:38 setup/frames/index.inc.php:212
+#: setup/lib/messages.inc.php:65
+msgid "Download"
+msgstr "İndir"
+
+#: setup/frames/index.inc.php:58 setup/lib/messages.inc.php:164
+msgid ""
+"You are not using a secure connection; all data (including potentially "
+"sensitive information, like passwords) is transferred unencrypted!"
+msgstr ""
+"Güvenli bağlantı kullanmıyorsunuz; tüm veri (parola gibi hassas olabilecek "
+"bilgiler dahil) şifresiz olarak aktarılır!"
+
+#: setup/frames/index.inc.php:87 setup/frames/menu.inc.php:17
+#: setup/lib/messages.inc.php:219
+msgid "Overview"
+msgstr "Genel Bakış"
+
+#: setup/frames/index.inc.php:95 setup/lib/messages.inc.php:337
+msgid "Show hidden messages (#MSG_COUNT)"
+msgstr "Gizli mesajları göster (#MSG_COUNT)"
+
+#: setup/frames/index.inc.php:135 setup/lib/messages.inc.php:213
+msgid "There are no configured servers"
+msgstr "Yapılandırılmış sunucular yok"
+
+#: setup/frames/index.inc.php:143 setup/lib/messages.inc.php:212
+msgid "New server"
+msgstr "Yeni sunucu"
+
+#: setup/frames/index.inc.php:172 setup/lib/messages.inc.php:50
+msgid "Default language"
+msgstr "Varsayılan dil"
+
+#: setup/frames/index.inc.php:182 setup/lib/messages.inc.php:187
+msgid "let the user choose"
+msgstr "kullanıcı seçsin"
+
+#: setup/frames/index.inc.php:193 setup/lib/messages.inc.php:216
+msgid "- none -"
+msgstr "- yok -"
+
+#: setup/frames/index.inc.php:196 setup/lib/messages.inc.php:51
+msgid "Default server"
+msgstr "Varsayılan sunucu"
+
+#: setup/frames/index.inc.php:206 setup/lib/messages.inc.php:66
+msgid "End of line"
+msgstr "Satır sonu"
+
+#: setup/frames/index.inc.php:211 setup/lib/messages.inc.php:61
+msgid "Display"
+msgstr "Görüntüle"
+
+#: setup/frames/index.inc.php:215 setup/lib/messages.inc.php:190
+msgid "Load"
+msgstr "Yükle"
+
+#: setup/frames/index.inc.php:226 setup/lib/messages.inc.php:152
+msgid "phpMyAdmin homepage"
+msgstr "phpMyAdmin ana sayfası"
+
+#: setup/frames/index.inc.php:227 setup/lib/messages.inc.php:64
+msgid "Donate"
+msgstr "Bağış"
+
+#: setup/frames/index.inc.php:228 setup/lib/messages.inc.php:370
+msgid "Check for latest version"
+msgstr "Son sürümü kontrol et"
+
+#: setup/frames/menu.inc.php:18 setup/lib/messages.inc.php:137
+msgid "Features"
+msgstr "Özellikler"
+
+#: setup/frames/menu.inc.php:19 setup/lib/messages.inc.php:113
+msgid "Navigation frame"
+msgstr "Rehber çerçevesi"
+
+#: setup/frames/menu.inc.php:20 setup/lib/messages.inc.php:118
+msgid "Main frame"
+msgstr "Ana çerçeve"
+
+#: setup/frames/servers.inc.php:28 setup/lib/messages.inc.php:272
+msgid "Edit server"
+msgstr "Sunucuyu düzenle"
+
+#: setup/frames/servers.inc.php:37 setup/lib/messages.inc.php:241
+msgid "Add a new server"
+msgstr "Yeni sunucu ekle"
+
+#: setup/lib/FormDisplay.tpl.php:182 setup/lib/messages.inc.php:328
+#, php-format
+msgid "Set value: %s"
+msgstr "Ayar değeri: %s"
+
+#: setup/lib/FormDisplay.tpl.php:187 setup/lib/messages.inc.php:234
+msgid "Restore default value"
+msgstr "Varsayılan değeri geri yükle"
+
+#: setup/lib/form_processing.lib.php:43 setup/lib/messages.inc.php:377
+msgid "Warning"
+msgstr "Uyarı"
+
 #: setup/lib/messages.inc.php:16
 msgid "Allow character set conversion"
 msgstr "Karakter grubu dönüştürmeye izin ver"
@@ -7201,10 +7296,6 @@ msgstr ""
 msgid "Compress on the fly"
 msgstr "Anında sıkıştır"
 
-#: setup/lib/messages.inc.php:45
-msgid "Configuration file"
-msgstr "Yapılandırma dosyası"
-
 #: setup/lib/messages.inc.php:46
 msgid ""
 "Whether a warning ("Are your really sure...") should be displayed "
@@ -7225,14 +7316,6 @@ msgstr "Dönüştürmeler için kullanılan varsayılan karakter grubu"
 msgid "Default character set"
 msgstr "Varsayılan karakter grubu"
 
-#: setup/lib/messages.inc.php:50
-msgid "Default language"
-msgstr "Varsayılan dil"
-
-#: setup/lib/messages.inc.php:51
-msgid "Default server"
-msgstr "Varsayılan sunucu"
-
 #: setup/lib/messages.inc.php:52
 msgid "Tab that is displayed when entering a database"
 msgstr "Veritabanı girildiğinde görüntülenen sekme"
@@ -7274,10 +7357,6 @@ msgstr "Veritabanı listelemeyi aşağı açılır menü yerine liste olarak gö
 msgid "Display databases as a list"
 msgstr "Veritabanlarını liste olarak görüntüle"
 
-#: setup/lib/messages.inc.php:61
-msgid "Display"
-msgstr "Görüntüle"
-
 #: setup/lib/messages.inc.php:62
 msgid "Show server listing as a list instead of a drop down"
 msgstr "Sunucu listelemeyi aşağı açılır menü yerine liste olarak gösterir"
@@ -7286,18 +7365,6 @@ msgstr "Sunucu listelemeyi aşağı açılır menü yerine liste olarak gösteri
 msgid "Display servers as a list"
 msgstr "Sunucuları liste olarak görüntüle"
 
-#: setup/lib/messages.inc.php:64
-msgid "Donate"
-msgstr "Bağış"
-
-#: setup/lib/messages.inc.php:65
-msgid "Download"
-msgstr "İndir"
-
-#: setup/lib/messages.inc.php:66
-msgid "End of line"
-msgstr "Satır sonu"
-
 #: setup/lib/messages.inc.php:67
 msgid "Could not connect to MySQL server"
 msgstr "MySQL sunucusuna bağlanamadı"
@@ -7479,10 +7546,6 @@ msgstr "Veritabanlarının görüntü seçenekleri"
 msgid "Customize appearance of the navigation frame"
 msgstr "Rehber çerçevesinin görünümünü özelleştirir"
 
-#: setup/lib/messages.inc.php:113
-msgid "Navigation frame"
-msgstr "Rehber çerçevesi"
-
 #: setup/lib/messages.inc.php:114
 msgid "Servers display options"
 msgstr "Sunucuların görüntü seçenekleri"
@@ -7491,10 +7554,6 @@ msgstr "Sunucuların görüntü seçenekleri"
 msgid "Tables display options"
 msgstr "Tabloların görüntü seçenekleri"
 
-#: setup/lib/messages.inc.php:118
-msgid "Main frame"
-msgstr "Ana çerçeve"
-
 #: setup/lib/messages.inc.php:119
 msgid "Settings that didn't fit enywhere else"
 msgstr "Başka hiçbir yere uymayan ayarlar"
@@ -7577,10 +7636,6 @@ msgstr "Özelleştirme"
 msgid "Customize export options"
 msgstr "Dışarı aktarma seçeneklerini özelleştir"
 
-#: setup/lib/messages.inc.php:137
-msgid "Features"
-msgstr "Özellikler"
-
 #: setup/lib/messages.inc.php:138
 msgid "Customize import defaults"
 msgstr "İçeri aktarma varsayılanlarını özelleştir"
@@ -7651,10 +7706,6 @@ msgstr ""
 "[a@?page=form&formset=features#tab_Import_export]GZip sıkıştırması ve "
 "açması[/a] bu sistemde mevcut olmayan işlevleri (%s) gerektirir."
 
-#: setup/lib/messages.inc.php:152
-msgid "phpMyAdmin homepage"
-msgstr "phpMyAdmin ana sayfası"
-
 #: setup/lib/messages.inc.php:153
 msgid "Extra parameters for iconv"
 msgstr "Iconv için ilave parametreler"
@@ -7705,14 +7756,6 @@ msgstr "Kısmi içeri aktarma: sorguları atla"
 msgid "Insecure connection"
 msgstr "Güvensiz bağlantı"
 
-#: setup/lib/messages.inc.php:164
-msgid ""
-"You are not using a secure connection; all data (including potentially "
-"sensitive information, like passwords) is transferred unencrypted!"
-msgstr ""
-"Güvenli bağlantı kullanmıyorsunuz; tüm veri (parola gibi hassas olabilecek "
-"bilgiler dahil) şifresiz olarak aktarılır!"
-
 #: setup/lib/messages.inc.php:165
 #, php-format
 msgid ""
@@ -7816,10 +7859,6 @@ msgstr "Fare imleci altında sunucuyu vurgula"
 msgid "Enable highlighting"
 msgstr "Vurgulamalar etkin"
 
-#: setup/lib/messages.inc.php:187
-msgid "let the user choose"
-msgstr "kullanıcı seçsin"
-
 #: setup/lib/messages.inc.php:188
 msgid "Use less graphically intense tabs"
 msgstr "Az grafiksel yoğunlukta sekmeler kullanılır"
@@ -7828,10 +7867,6 @@ msgstr "Az grafiksel yoğunlukta sekmeler kullanılır"
 msgid "Light tabs"
 msgstr "Hafif sekmeler"
 
-#: setup/lib/messages.inc.php:190
-msgid "Load"
-msgstr "Yükle"
-
 #: setup/lib/messages.inc.php:191
 msgid ""
 "If TRUE, logout deletes cookies for all servers; when set to FALSE, logout "
@@ -7955,14 +7990,6 @@ msgstr "Sadece simgeleri, sadece metni veya her ikisinide kullanır"
 msgid "Iconic navigation bar"
 msgstr "Simgesel rehber çubuğu"
 
-#: setup/lib/messages.inc.php:212
-msgid "New server"
-msgstr "Yeni sunucu"
-
-#: setup/lib/messages.inc.php:213
-msgid "There are no configured servers"
-msgstr "Yapılandırılmış sunucular yok"
-
 #: setup/lib/messages.inc.php:214
 msgid "use GZip output buffering for increased speed in HTTP transfers"
 msgstr ""
@@ -7972,10 +7999,6 @@ msgstr ""
 msgid "GZip output buffering"
 msgstr "GZip çıktı arabelleklem
e"
 
-#: setup/lib/messages.inc.php:216
-msgid "- none -"
-msgstr "- yok -"
-
 #: setup/lib/messages.inc.php:217
 msgid ""
 "[kbd]SMART[/kbd] - i.e. descending order for fields of type TIME, DATE, "
@@ -7988,10 +8011,6 @@ msgstr ""
 msgid "Default sorting order"
 msgstr "Varsayılan sıralama düzeni"
 
-#: setup/lib/messages.inc.php:219
-msgid "Overview"
-msgstr "Genel Bakış"
-
 #: setup/lib/messages.inc.php:220
 msgid "Use persistent connections to MySQL databases"
 msgstr "MySQL veritabanlarına sürekli bağlantı kullanımı"
@@ -8049,10 +8068,6 @@ msgstr "Karakter grubu dönüştürme için kullanılacak olan işlevleri seçin
 msgid "Recoding engine"
 msgstr "Kaydetme motoru"
 
-#: setup/lib/messages.inc.php:234
-msgid "Restore default value"
-msgstr "Varsayılan değeri geri yükle"
-
 #: setup/lib/messages.inc.php:235
 msgid "Try to revert erroneous fields to their default values"
 msgstr "Hatalı alanları varsayılan değerlerine döndürmeyi dene"
@@ -8089,10 +8104,6 @@ msgstr "Verim almak için mysqli kullanmalısınız"
 msgid "You allow for connecting to the server without a password."
 msgstr "Sunucuya parolasız bağlanmaya izin verdiniz."
 
-#: setup/lib/messages.inc.php:241
-msgid "Add a new server"
-msgstr "Yeni sunucu ekle"
-
 #: setup/lib/messages.inc.php:242
 msgid "Leave blank if not used"
 msgstr "Eğer kullanılmayacaksa boş bırakın"
@@ -8253,10 +8264,6 @@ msgstr ""
 "tabanlı koruma eğer IP'niz, sizinde dahil olduğunuz binlerce kullanıcıya "
 "sahip ve bağlı olduğunuz bir ISS'e aitse güvenilir olmayabilir ."
 
-#: setup/lib/messages.inc.php:272
-msgid "Edit server"
-msgstr "Sunucuyu düzenle"
-
 #: setup/lib/messages.inc.php:273
 msgid "What PHP extension to use; you should use mysqli if supported"
 msgstr ""
@@ -8537,11 +8544,6 @@ msgstr ""
 msgid "Verbose name of this server"
 msgstr "Sunucunun fazladan adı"
 
-#: setup/lib/messages.inc.php:328
-#, php-format
-msgid "Set value: %s"
-msgstr "Ayar değeri: %s"
-
 #: setup/lib/messages.inc.php:329
 msgid ""
 "Whether a user should be displayed a "show all (records)" button"
@@ -8583,10 +8585,6 @@ msgstr "İşlev alanlarını düzenle/ekle modunda görüntüler"
 msgid "Show function fields"
 msgstr "İşlev alanlarını göster"
 
-#: setup/lib/messages.inc.php:337
-msgid "Show hidden messages (#MSG_COUNT)"
-msgstr "Gizli mesajları göster (#MSG_COUNT)"
-
 #: setup/lib/messages.inc.php:338
 msgid ""
 "Shows link to [a at http://php.net/manual/function.phpinfo.php]phpinfo()[/a] "
@@ -8740,10 +8738,6 @@ msgstr ""
 msgid "Got invalid version string from server"
 msgstr "Sunucudan geçersiz sürüm dizgisi alındı"
 
-#: setup/lib/messages.inc.php:370
-msgid "Check for latest version"
-msgstr "Son sürümü kontrol et"
-
 #: setup/lib/messages.inc.php:371
 #, php-format
 msgid ""
@@ -8782,10 +8776,6 @@ msgid ""
 "Neither URL wrapper nor CURL is available. Version check is not possible."
 msgstr "Ne URL ne de CURL mevcut. Sürüm kontrolü mümkün değil."
 
-#: setup/lib/messages.inc.php:377
-msgid "Warning"
-msgstr "Uyarı"
-
 #: setup/lib/messages.inc.php:378
 msgid ""
 "Enable [a at http://en.wikipedia.org/wiki/ZIP_(file_format)]ZIP[/a] compression "
@@ -8855,6 +8845,19 @@ msgid "Description"
 msgstr "Açıklama"
 
 #, fuzzy
+#~| msgid ""
+#~| "However on last run no data has been parsed, this usually means "
+#~| "phpMyAdmin won't be able to finish this import unless you increase php "
+#~| "time limits."
+#~ msgid ""
+#~ "However on last run no data has been parsed, this usually means "
+#~ "phpMyAdmin won"
+#~ msgstr ""
+#~ "Ancak son çalıştırmada hiç veri ayrıştırılmadı, bu genellikle, php zaman "
+#~ "sınırlarını arttırmadığınız sürece phpMyAdmin'in bu içeri aktarmayı "
+#~ "biteremeyeceği anlamına gelir."
+
+#, fuzzy
 #~| msgid "None"
 #~ msgctxt "None action"
 #~ msgid "None"
diff --git a/po/tt.po b/po/tt.po
index 67eb16d..31e164e 100644
--- a/po/tt.po
+++ b/po/tt.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-14 07:48-0400\n"
+"POT-Creation-Date: 2010-05-14 13:39-0400\n"
 "PO-Revision-Date: 2010-03-30 23:14+0200\n"
 "Last-Translator: Michal <michal at cihar.com>\n"
 "Language-Team: tatarish <tt at li.org>\n"
@@ -946,10 +946,10 @@ msgid ""
 "file and import will resume."
 msgstr ""
 
-#: import.php:426
+#: import.php:426 libraries/messages.inc.php:1102
 msgid ""
 "However on last run no data has been parsed, this usually means phpMyAdmin "
-"won"
+"won't be able to finish this import unless you increase php time limits."
 msgstr ""
 
 #: index.php:190 libraries/messages.inc.php:549
@@ -6239,12 +6239,6 @@ msgstr "Ceplär"
 msgid "Thread %s was successfully killed."
 msgstr "%s cebe uñışlı üterelgän buldı."
 
-#: libraries/messages.inc.php:1102
-msgid ""
-"However on last run no data has been parsed, this usually means phpMyAdmin "
-"won't be able to finish this import unless you increase php time limits."
-msgstr ""
-
 #: libraries/messages.inc.php:1105 pmd_pdf.php:94
 msgid "to/from page"
 msgstr ""
@@ -6705,7 +6699,8 @@ msgstr "Buş"
 msgid "Filter"
 msgstr "Alan"
 
-#: navigation.php:319 setup/lib/messages.inc.php:42
+#: navigation.php:319 setup/frames/index.inc.php:218
+#: setup/lib/messages.inc.php:42
 #, fuzzy
 msgid "Clear"
 msgstr "Täqwim"
@@ -6794,6 +6789,116 @@ msgstr "Totaşular"
 msgid "Configuration: %s"
 msgstr ""
 
+#: setup/frames/config.inc.php:25 setup/frames/index.inc.php:152
+#: setup/lib/messages.inc.php:45
+msgid "Configuration file"
+msgstr ""
+
+#: setup/frames/config.inc.php:38 setup/frames/index.inc.php:212
+#: setup/lib/messages.inc.php:65
+msgid "Download"
+msgstr ""
+
+#: setup/frames/index.inc.php:58 setup/lib/messages.inc.php:164
+msgid ""
+"You are not using a secure connection; all data (including potentially "
+"sensitive information, like passwords) is transferred unencrypted!"
+msgstr ""
+
+#: setup/frames/index.inc.php:87 setup/frames/menu.inc.php:17
+#: setup/lib/messages.inc.php:219
+msgid "Overview"
+msgstr ""
+
+#: setup/frames/index.inc.php:95 setup/lib/messages.inc.php:337
+msgid "Show hidden messages (#MSG_COUNT)"
+msgstr ""
+
+#: setup/frames/index.inc.php:135 setup/lib/messages.inc.php:213
+msgid "There are no configured servers"
+msgstr ""
+
+#: setup/frames/index.inc.php:143 setup/lib/messages.inc.php:212
+msgid "New server"
+msgstr ""
+
+#: setup/frames/index.inc.php:172 setup/lib/messages.inc.php:50
+msgid "Default language"
+msgstr ""
+
+#: setup/frames/index.inc.php:182 setup/lib/messages.inc.php:187
+msgid "let the user choose"
+msgstr ""
+
+#: setup/frames/index.inc.php:193 setup/lib/messages.inc.php:216
+msgid "- none -"
+msgstr ""
+
+#: setup/frames/index.inc.php:196 setup/lib/messages.inc.php:51
+msgid "Default server"
+msgstr ""
+
+#: setup/frames/index.inc.php:206 setup/lib/messages.inc.php:66
+msgid "End of line"
+msgstr ""
+
+#: setup/frames/index.inc.php:211 setup/lib/messages.inc.php:61
+msgid "Display"
+msgstr ""
+
+#: setup/frames/index.inc.php:215 setup/lib/messages.inc.php:190
+#, fuzzy
+msgid "Load"
+msgstr "Cirle"
+
+#: setup/frames/index.inc.php:226 setup/lib/messages.inc.php:152
+#, fuzzy
+msgid "phpMyAdmin homepage"
+msgstr "phpMyAdmin qullanması"
+
+#: setup/frames/index.inc.php:227 setup/lib/messages.inc.php:64
+#, fuzzy
+msgid "Donate"
+msgstr "Eçtälek"
+
+#: setup/frames/index.inc.php:228 setup/lib/messages.inc.php:370
+msgid "Check for latest version"
+msgstr ""
+
+#: setup/frames/menu.inc.php:18 setup/lib/messages.inc.php:137
+msgid "Features"
+msgstr ""
+
+#: setup/frames/menu.inc.php:19 setup/lib/messages.inc.php:113
+msgid "Navigation frame"
+msgstr ""
+
+#: setup/frames/menu.inc.php:20 setup/lib/messages.inc.php:118
+msgid "Main frame"
+msgstr ""
+
+#: setup/frames/servers.inc.php:28 setup/lib/messages.inc.php:272
+msgid "Edit server"
+msgstr ""
+
+#: setup/frames/servers.inc.php:37 setup/lib/messages.inc.php:241
+#, fuzzy
+msgid "Add a new server"
+msgstr "Yaña qullanuçı östäw"
+
+#: setup/lib/FormDisplay.tpl.php:182 setup/lib/messages.inc.php:328
+#, php-format
+msgid "Set value: %s"
+msgstr ""
+
+#: setup/lib/FormDisplay.tpl.php:187 setup/lib/messages.inc.php:234
+msgid "Restore default value"
+msgstr ""
+
+#: setup/lib/form_processing.lib.php:43 setup/lib/messages.inc.php:377
+msgid "Warning"
+msgstr ""
+
 #: setup/lib/messages.inc.php:16
 msgid "Allow character set conversion"
 msgstr ""
@@ -6933,10 +7038,6 @@ msgstr ""
 msgid "Compress on the fly"
 msgstr ""
 
-#: setup/lib/messages.inc.php:45
-msgid "Configuration file"
-msgstr ""
-
 #: setup/lib/messages.inc.php:46
 msgid ""
 "Whether a warning ("Are your really sure...") should be displayed "
@@ -6955,14 +7056,6 @@ msgstr ""
 msgid "Default character set"
 msgstr ""
 
-#: setup/lib/messages.inc.php:50
-msgid "Default language"
-msgstr ""
-
-#: setup/lib/messages.inc.php:51
-msgid "Default server"
-msgstr ""
-
 #: setup/lib/messages.inc.php:52
 msgid "Tab that is displayed when entering a database"
 msgstr ""
@@ -7004,10 +7097,6 @@ msgstr ""
 msgid "Display databases as a list"
 msgstr ""
 
-#: setup/lib/messages.inc.php:61
-msgid "Display"
-msgstr ""
-
 #: setup/lib/messages.inc.php:62
 msgid "Show server listing as a list instead of a drop down"
 msgstr ""
@@ -7016,19 +7105,6 @@ msgstr ""
 msgid "Display servers as a list"
 msgstr ""
 
-#: setup/lib/messages.inc.php:64
-#, fuzzy
-msgid "Donate"
-msgstr "Eçtälek"
-
-#: setup/lib/messages.inc.php:65
-msgid "Download"
-msgstr ""
-
-#: setup/lib/messages.inc.php:66
-msgid "End of line"
-msgstr ""
-
 #: setup/lib/messages.inc.php:67
 msgid "Could not connect to MySQL server"
 msgstr ""
@@ -7210,10 +7286,6 @@ msgstr "Biremlek saqlaw köyläneşe"
 msgid "Customize appearance of the navigation frame"
 msgstr ""
 
-#: setup/lib/messages.inc.php:113
-msgid "Navigation frame"
-msgstr ""
-
 #: setup/lib/messages.inc.php:114
 #, fuzzy
 msgid "Servers display options"
@@ -7224,10 +7296,6 @@ msgstr "Biremlek saqlaw köyläneşe"
 msgid "Tables display options"
 msgstr "Biremlek saqlaw köyläneşe"
 
-#: setup/lib/messages.inc.php:118
-msgid "Main frame"
-msgstr ""
-
 #: setup/lib/messages.inc.php:119
 msgid "Settings that didn't fit enywhere else"
 msgstr ""
@@ -7306,10 +7374,6 @@ msgstr ""
 msgid "Customize export options"
 msgstr "Biremlek saqlaw köyläneşe"
 
-#: setup/lib/messages.inc.php:137
-msgid "Features"
-msgstr ""
-
 #: setup/lib/messages.inc.php:138
 #, fuzzy
 msgid "Customize import defaults"
@@ -7379,11 +7443,6 @@ msgid ""
 "system."
 msgstr ""
 
-#: setup/lib/messages.inc.php:152
-#, fuzzy
-msgid "phpMyAdmin homepage"
-msgstr "phpMyAdmin qullanması"
-
 #: setup/lib/messages.inc.php:153
 msgid "Extra parameters for iconv"
 msgstr ""
@@ -7427,12 +7486,6 @@ msgstr ""
 msgid "Insecure connection"
 msgstr ""
 
-#: setup/lib/messages.inc.php:164
-msgid ""
-"You are not using a secure connection; all data (including potentially "
-"sensitive information, like passwords) is transferred unencrypted!"
-msgstr ""
-
 #: setup/lib/messages.inc.php:165
 #, php-format
 msgid ""
@@ -7531,10 +7584,6 @@ msgstr ""
 msgid "Enable highlighting"
 msgstr ""
 
-#: setup/lib/messages.inc.php:187
-msgid "let the user choose"
-msgstr ""
-
 #: setup/lib/messages.inc.php:188
 msgid "Use less graphically intense tabs"
 msgstr ""
@@ -7543,11 +7592,6 @@ msgstr ""
 msgid "Light tabs"
 msgstr ""
 
-#: setup/lib/messages.inc.php:190
-#, fuzzy
-msgid "Load"
-msgstr "Cirle"
-
 #: setup/lib/messages.inc.php:191
 msgid ""
 "If TRUE, logout deletes cookies for all servers; when set to FALSE, logout "
@@ -7651,14 +7695,6 @@ msgstr ""
 msgid "Iconic navigation bar"
 msgstr ""
 
-#: setup/lib/messages.inc.php:212
-msgid "New server"
-msgstr ""
-
-#: setup/lib/messages.inc.php:213
-msgid "There are no configured servers"
-msgstr ""
-
 #: setup/lib/messages.inc.php:214
 msgid "use GZip output buffering for increased speed in HTTP transfers"
 msgstr ""
@@ -7667,10 +7703,6 @@ msgstr ""
 msgid "GZip output buffering"
 msgstr ""
 
-#: setup/lib/messages.inc.php:216
-msgid "- none -"
-msgstr ""
-
 #: setup/lib/messages.inc.php:217
 msgid ""
 "[kbd]SMART[/kbd] - i.e. descending order for fields of type TIME, DATE, "
@@ -7681,10 +7713,6 @@ msgstr ""
 msgid "Default sorting order"
 msgstr ""
 
-#: setup/lib/messages.inc.php:219
-msgid "Overview"
-msgstr ""
-
 #: setup/lib/messages.inc.php:220
 msgid "Use persistent connections to MySQL databases"
 msgstr ""
@@ -7739,10 +7767,6 @@ msgstr ""
 msgid "Recoding engine"
 msgstr ""
 
-#: setup/lib/messages.inc.php:234
-msgid "Restore default value"
-msgstr ""
-
 #: setup/lib/messages.inc.php:235
 msgid "Try to revert erroneous fields to their default values"
 msgstr ""
@@ -7774,11 +7798,6 @@ msgstr ""
 msgid "You allow for connecting to the server without a password."
 msgstr ""
 
-#: setup/lib/messages.inc.php:241
-#, fuzzy
-msgid "Add a new server"
-msgstr "Yaña qullanuçı östäw"
-
 #: setup/lib/messages.inc.php:242
 msgid "Leave blank if not used"
 msgstr ""
@@ -7922,10 +7941,6 @@ msgid ""
 "to."
 msgstr ""
 
-#: setup/lib/messages.inc.php:272
-msgid "Edit server"
-msgstr ""
-
 #: setup/lib/messages.inc.php:273
 msgid "What PHP extension to use; you should use mysqli if supported"
 msgstr ""
@@ -8177,11 +8192,6 @@ msgstr ""
 msgid "Verbose name of this server"
 msgstr ""
 
-#: setup/lib/messages.inc.php:328
-#, php-format
-msgid "Set value: %s"
-msgstr ""
-
 #: setup/lib/messages.inc.php:329
 msgid ""
 "Whether a user should be displayed a "show all (records)" button"
@@ -8219,10 +8229,6 @@ msgstr ""
 msgid "Show function fields"
 msgstr ""
 
-#: setup/lib/messages.inc.php:337
-msgid "Show hidden messages (#MSG_COUNT)"
-msgstr ""
-
 #: setup/lib/messages.inc.php:338
 msgid ""
 "Shows link to [a at http://php.net/manual/function.phpinfo.php]phpinfo()[/a] "
@@ -8356,10 +8362,6 @@ msgstr ""
 msgid "Got invalid version string from server"
 msgstr ""
 
-#: setup/lib/messages.inc.php:370
-msgid "Check for latest version"
-msgstr ""
-
 #: setup/lib/messages.inc.php:371
 #, php-format
 msgid ""
@@ -8391,10 +8393,6 @@ msgid ""
 "Neither URL wrapper nor CURL is available. Version check is not possible."
 msgstr ""
 
-#: setup/lib/messages.inc.php:377
-msgid "Warning"
-msgstr ""
-
 #: setup/lib/messages.inc.php:378
 msgid ""
 "Enable [a at http://en.wikipedia.org/wiki/ZIP_(file_format)]ZIP[/a] compression "
diff --git a/po/uk.po b/po/uk.po
index c6527e4..5d6a78b 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-14 07:48-0400\n"
+"POT-Creation-Date: 2010-05-14 13:39-0400\n"
 "PO-Revision-Date: 2010-03-12 09:19+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: ukrainian <uk at li.org>\n"
@@ -931,10 +931,10 @@ msgid ""
 "file and import will resume."
 msgstr ""
 
-#: import.php:426
+#: import.php:426 libraries/messages.inc.php:1102
 msgid ""
 "However on last run no data has been parsed, this usually means phpMyAdmin "
-"won"
+"won't be able to finish this import unless you increase php time limits."
 msgstr ""
 
 #: index.php:190 libraries/messages.inc.php:549
@@ -6132,12 +6132,6 @@ msgstr ""
 msgid "Thread %s was successfully killed."
 msgstr "Процес %s припинено."
 
-#: libraries/messages.inc.php:1102
-msgid ""
-"However on last run no data has been parsed, this usually means phpMyAdmin "
-"won't be able to finish this import unless you increase php time limits."
-msgstr ""
-
 #: libraries/messages.inc.php:1105 pmd_pdf.php:94
 msgid "to/from page"
 msgstr ""
@@ -6588,7 +6582,8 @@ msgstr "Немає"
 msgid "Filter"
 msgstr ""
 
-#: navigation.php:319 setup/lib/messages.inc.php:42
+#: navigation.php:319 setup/frames/index.inc.php:218
+#: setup/lib/messages.inc.php:42
 msgid "Clear"
 msgstr ""
 
@@ -6677,6 +6672,112 @@ msgstr "З'єднань"
 msgid "Configuration: %s"
 msgstr ""
 
+#: setup/frames/config.inc.php:25 setup/frames/index.inc.php:152
+#: setup/lib/messages.inc.php:45
+msgid "Configuration file"
+msgstr ""
+
+#: setup/frames/config.inc.php:38 setup/frames/index.inc.php:212
+#: setup/lib/messages.inc.php:65
+msgid "Download"
+msgstr ""
+
+#: setup/frames/index.inc.php:58 setup/lib/messages.inc.php:164
+msgid ""
+"You are not using a secure connection; all data (including potentially "
+"sensitive information, like passwords) is transferred unencrypted!"
+msgstr ""
+
+#: setup/frames/index.inc.php:87 setup/frames/menu.inc.php:17
+#: setup/lib/messages.inc.php:219
+msgid "Overview"
+msgstr ""
+
+#: setup/frames/index.inc.php:95 setup/lib/messages.inc.php:337
+msgid "Show hidden messages (#MSG_COUNT)"
+msgstr ""
+
+#: setup/frames/index.inc.php:135 setup/lib/messages.inc.php:213
+msgid "There are no configured servers"
+msgstr ""
+
+#: setup/frames/index.inc.php:143 setup/lib/messages.inc.php:212
+msgid "New server"
+msgstr ""
+
+#: setup/frames/index.inc.php:172 setup/lib/messages.inc.php:50
+msgid "Default language"
+msgstr ""
+
+#: setup/frames/index.inc.php:182 setup/lib/messages.inc.php:187
+msgid "let the user choose"
+msgstr ""
+
+#: setup/frames/index.inc.php:193 setup/lib/messages.inc.php:216
+msgid "- none -"
+msgstr ""
+
+#: setup/frames/index.inc.php:196 setup/lib/messages.inc.php:51
+msgid "Default server"
+msgstr ""
+
+#: setup/frames/index.inc.php:206 setup/lib/messages.inc.php:66
+msgid "End of line"
+msgstr ""
+
+#: setup/frames/index.inc.php:211 setup/lib/messages.inc.php:61
+msgid "Display"
+msgstr ""
+
+#: setup/frames/index.inc.php:215 setup/lib/messages.inc.php:190
+msgid "Load"
+msgstr ""
+
+#: setup/frames/index.inc.php:226 setup/lib/messages.inc.php:152
+msgid "phpMyAdmin homepage"
+msgstr ""
+
+#: setup/frames/index.inc.php:227 setup/lib/messages.inc.php:64
+msgid "Donate"
+msgstr ""
+
+#: setup/frames/index.inc.php:228 setup/lib/messages.inc.php:370
+msgid "Check for latest version"
+msgstr ""
+
+#: setup/frames/menu.inc.php:18 setup/lib/messages.inc.php:137
+msgid "Features"
+msgstr ""
+
+#: setup/frames/menu.inc.php:19 setup/lib/messages.inc.php:113
+msgid "Navigation frame"
+msgstr ""
+
+#: setup/frames/menu.inc.php:20 setup/lib/messages.inc.php:118
+msgid "Main frame"
+msgstr ""
+
+#: setup/frames/servers.inc.php:28 setup/lib/messages.inc.php:272
+msgid "Edit server"
+msgstr ""
+
+#: setup/frames/servers.inc.php:37 setup/lib/messages.inc.php:241
+msgid "Add a new server"
+msgstr ""
+
+#: setup/lib/FormDisplay.tpl.php:182 setup/lib/messages.inc.php:328
+#, php-format
+msgid "Set value: %s"
+msgstr ""
+
+#: setup/lib/FormDisplay.tpl.php:187 setup/lib/messages.inc.php:234
+msgid "Restore default value"
+msgstr ""
+
+#: setup/lib/form_processing.lib.php:43 setup/lib/messages.inc.php:377
+msgid "Warning"
+msgstr ""
+
 #: setup/lib/messages.inc.php:16
 msgid "Allow character set conversion"
 msgstr ""
@@ -6815,10 +6916,6 @@ msgstr ""
 msgid "Compress on the fly"
 msgstr ""
 
-#: setup/lib/messages.inc.php:45
-msgid "Configuration file"
-msgstr ""
-
 #: setup/lib/messages.inc.php:46
 msgid ""
 "Whether a warning ("Are your really sure...") should be displayed "
@@ -6837,14 +6934,6 @@ msgstr ""
 msgid "Default character set"
 msgstr ""
 
-#: setup/lib/messages.inc.php:50
-msgid "Default language"
-msgstr ""
-
-#: setup/lib/messages.inc.php:51
-msgid "Default server"
-msgstr ""
-
 #: setup/lib/messages.inc.php:52
 msgid "Tab that is displayed when entering a database"
 msgstr ""
@@ -6883,10 +6972,6 @@ msgstr ""
 msgid "Display databases as a list"
 msgstr ""
 
-#: setup/lib/messages.inc.php:61
-msgid "Display"
-msgstr ""
-
 #: setup/lib/messages.inc.php:62
 msgid "Show server listing as a list instead of a drop down"
 msgstr ""
@@ -6895,18 +6980,6 @@ msgstr ""
 msgid "Display servers as a list"
 msgstr ""
 
-#: setup/lib/messages.inc.php:64
-msgid "Donate"
-msgstr ""
-
-#: setup/lib/messages.inc.php:65
-msgid "Download"
-msgstr ""
-
-#: setup/lib/messages.inc.php:66
-msgid "End of line"
-msgstr ""
-
 #: setup/lib/messages.inc.php:67
 msgid "Could not connect to MySQL server"
 msgstr ""
@@ -7079,10 +7152,6 @@ msgstr ""
 msgid "Customize appearance of the navigation frame"
 msgstr ""
 
-#: setup/lib/messages.inc.php:113
-msgid "Navigation frame"
-msgstr ""
-
 #: setup/lib/messages.inc.php:114
 msgid "Servers display options"
 msgstr ""
@@ -7091,10 +7160,6 @@ msgstr ""
 msgid "Tables display options"
 msgstr ""
 
-#: setup/lib/messages.inc.php:118
-msgid "Main frame"
-msgstr ""
-
 #: setup/lib/messages.inc.php:119
 msgid "Settings that didn't fit enywhere else"
 msgstr ""
@@ -7170,10 +7235,6 @@ msgstr ""
 msgid "Customize export options"
 msgstr ""
 
-#: setup/lib/messages.inc.php:137
-msgid "Features"
-msgstr ""
-
 #: setup/lib/messages.inc.php:138
 msgid "Customize import defaults"
 msgstr ""
@@ -7238,10 +7299,6 @@ msgid ""
 "system."
 msgstr ""
 
-#: setup/lib/messages.inc.php:152
-msgid "phpMyAdmin homepage"
-msgstr ""
-
 #: setup/lib/messages.inc.php:153
 msgid "Extra parameters for iconv"
 msgstr ""
@@ -7285,12 +7342,6 @@ msgstr ""
 msgid "Insecure connection"
 msgstr ""
 
-#: setup/lib/messages.inc.php:164
-msgid ""
-"You are not using a secure connection; all data (including potentially "
-"sensitive information, like passwords) is transferred unencrypted!"
-msgstr ""
-
 #: setup/lib/messages.inc.php:165
 #, php-format
 msgid ""
@@ -7386,10 +7437,6 @@ msgstr ""
 msgid "Enable highlighting"
 msgstr ""
 
-#: setup/lib/messages.inc.php:187
-msgid "let the user choose"
-msgstr ""
-
 #: setup/lib/messages.inc.php:188
 msgid "Use less graphically intense tabs"
 msgstr ""
@@ -7398,10 +7445,6 @@ msgstr ""
 msgid "Light tabs"
 msgstr ""
 
-#: setup/lib/messages.inc.php:190
-msgid "Load"
-msgstr ""
-
 #: setup/lib/messages.inc.php:191
 msgid ""
 "If TRUE, logout deletes cookies for all servers; when set to FALSE, logout "
@@ -7503,14 +7546,6 @@ msgstr ""
 msgid "Iconic navigation bar"
 msgstr ""
 
-#: setup/lib/messages.inc.php:212
-msgid "New server"
-msgstr ""
-
-#: setup/lib/messages.inc.php:213
-msgid "There are no configured servers"
-msgstr ""
-
 #: setup/lib/messages.inc.php:214
 msgid "use GZip output buffering for increased speed in HTTP transfers"
 msgstr ""
@@ -7519,10 +7554,6 @@ msgstr ""
 msgid "GZip output buffering"
 msgstr ""
 
-#: setup/lib/messages.inc.php:216
-msgid "- none -"
-msgstr ""
-
 #: setup/lib/messages.inc.php:217
 msgid ""
 "[kbd]SMART[/kbd] - i.e. descending order for fields of type TIME, DATE, "
@@ -7533,10 +7564,6 @@ msgstr ""
 msgid "Default sorting order"
 msgstr ""
 
-#: setup/lib/messages.inc.php:219
-msgid "Overview"
-msgstr ""
-
 #: setup/lib/messages.inc.php:220
 msgid "Use persistent connections to MySQL databases"
 msgstr ""
@@ -7591,10 +7618,6 @@ msgstr ""
 msgid "Recoding engine"
 msgstr ""
 
-#: setup/lib/messages.inc.php:234
-msgid "Restore default value"
-msgstr ""
-
 #: setup/lib/messages.inc.php:235
 msgid "Try to revert erroneous fields to their default values"
 msgstr ""
@@ -7625,10 +7648,6 @@ msgstr ""
 msgid "You allow for connecting to the server without a password."
 msgstr ""
 
-#: setup/lib/messages.inc.php:241
-msgid "Add a new server"
-msgstr ""
-
 #: setup/lib/messages.inc.php:242
 msgid "Leave blank if not used"
 msgstr ""
@@ -7769,10 +7788,6 @@ msgid ""
 "to."
 msgstr ""
 
-#: setup/lib/messages.inc.php:272
-msgid "Edit server"
-msgstr ""
-
 #: setup/lib/messages.inc.php:273
 msgid "What PHP extension to use; you should use mysqli if supported"
 msgstr ""
@@ -8016,11 +8031,6 @@ msgstr ""
 msgid "Verbose name of this server"
 msgstr ""
 
-#: setup/lib/messages.inc.php:328
-#, php-format
-msgid "Set value: %s"
-msgstr ""
-
 #: setup/lib/messages.inc.php:329
 msgid ""
 "Whether a user should be displayed a "show all (records)" button"
@@ -8057,10 +8067,6 @@ msgstr ""
 msgid "Show function fields"
 msgstr ""
 
-#: setup/lib/messages.inc.php:337
-msgid "Show hidden messages (#MSG_COUNT)"
-msgstr ""
-
 #: setup/lib/messages.inc.php:338
 msgid ""
 "Shows link to [a at http://php.net/manual/function.phpinfo.php]phpinfo()[/a] "
@@ -8189,10 +8195,6 @@ msgstr ""
 msgid "Got invalid version string from server"
 msgstr ""
 
-#: setup/lib/messages.inc.php:370
-msgid "Check for latest version"
-msgstr ""
-
 #: setup/lib/messages.inc.php:371
 #, php-format
 msgid ""
@@ -8224,10 +8226,6 @@ msgid ""
 "Neither URL wrapper nor CURL is available. Version check is not possible."
 msgstr ""
 
-#: setup/lib/messages.inc.php:377
-msgid "Warning"
-msgstr ""
-
 #: setup/lib/messages.inc.php:378
 msgid ""
 "Enable [a at http://en.wikipedia.org/wiki/ZIP_(file_format)]ZIP[/a] compression "
diff --git a/po/ur.po b/po/ur.po
index 68d7036..5e45a20 100644
--- a/po/ur.po
+++ b/po/ur.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-14 07:48-0400\n"
+"POT-Creation-Date: 2010-05-14 13:39-0400\n"
 "PO-Revision-Date: 2010-05-14 12:35+0200\n"
 "Last-Translator:  <monymirza at gmail.com>\n"
 "Language-Team: Urdu <ur at li.org>\n"
-"Language: ur\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ur\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.1\n"
 
@@ -926,10 +926,10 @@ msgid ""
 "file and import will resume."
 msgstr ""
 
-#: import.php:426
+#: import.php:426 libraries/messages.inc.php:1102
 msgid ""
 "However on last run no data has been parsed, this usually means phpMyAdmin "
-"won"
+"won't be able to finish this import unless you increase php time limits."
 msgstr ""
 
 #: index.php:190 libraries/messages.inc.php:549
@@ -5996,12 +5996,6 @@ msgstr ""
 msgid "Thread %s was successfully killed."
 msgstr ""
 
-#: libraries/messages.inc.php:1102
-msgid ""
-"However on last run no data has been parsed, this usually means phpMyAdmin "
-"won't be able to finish this import unless you increase php time limits."
-msgstr ""
-
 #: libraries/messages.inc.php:1105 pmd_pdf.php:94
 msgid "to/from page"
 msgstr ""
@@ -6425,7 +6419,8 @@ msgstr ""
 msgid "Filter"
 msgstr ""
 
-#: navigation.php:319 setup/lib/messages.inc.php:42
+#: navigation.php:319 setup/frames/index.inc.php:218
+#: setup/lib/messages.inc.php:42
 msgid "Clear"
 msgstr ""
 
@@ -6500,6 +6495,112 @@ msgstr ""
 msgid "Configuration: %s"
 msgstr ""
 
+#: setup/frames/config.inc.php:25 setup/frames/index.inc.php:152
+#: setup/lib/messages.inc.php:45
+msgid "Configuration file"
+msgstr ""
+
+#: setup/frames/config.inc.php:38 setup/frames/index.inc.php:212
+#: setup/lib/messages.inc.php:65
+msgid "Download"
+msgstr ""
+
+#: setup/frames/index.inc.php:58 setup/lib/messages.inc.php:164
+msgid ""
+"You are not using a secure connection; all data (including potentially "
+"sensitive information, like passwords) is transferred unencrypted!"
+msgstr ""
+
+#: setup/frames/index.inc.php:87 setup/frames/menu.inc.php:17
+#: setup/lib/messages.inc.php:219
+msgid "Overview"
+msgstr ""
+
+#: setup/frames/index.inc.php:95 setup/lib/messages.inc.php:337
+msgid "Show hidden messages (#MSG_COUNT)"
+msgstr ""
+
+#: setup/frames/index.inc.php:135 setup/lib/messages.inc.php:213
+msgid "There are no configured servers"
+msgstr ""
+
+#: setup/frames/index.inc.php:143 setup/lib/messages.inc.php:212
+msgid "New server"
+msgstr ""
+
+#: setup/frames/index.inc.php:172 setup/lib/messages.inc.php:50
+msgid "Default language"
+msgstr ""
+
+#: setup/frames/index.inc.php:182 setup/lib/messages.inc.php:187
+msgid "let the user choose"
+msgstr ""
+
+#: setup/frames/index.inc.php:193 setup/lib/messages.inc.php:216
+msgid "- none -"
+msgstr ""
+
+#: setup/frames/index.inc.php:196 setup/lib/messages.inc.php:51
+msgid "Default server"
+msgstr ""
+
+#: setup/frames/index.inc.php:206 setup/lib/messages.inc.php:66
+msgid "End of line"
+msgstr ""
+
+#: setup/frames/index.inc.php:211 setup/lib/messages.inc.php:61
+msgid "Display"
+msgstr ""
+
+#: setup/frames/index.inc.php:215 setup/lib/messages.inc.php:190
+msgid "Load"
+msgstr ""
+
+#: setup/frames/index.inc.php:226 setup/lib/messages.inc.php:152
+msgid "phpMyAdmin homepage"
+msgstr ""
+
+#: setup/frames/index.inc.php:227 setup/lib/messages.inc.php:64
+msgid "Donate"
+msgstr ""
+
+#: setup/frames/index.inc.php:228 setup/lib/messages.inc.php:370
+msgid "Check for latest version"
+msgstr ""
+
+#: setup/frames/menu.inc.php:18 setup/lib/messages.inc.php:137
+msgid "Features"
+msgstr ""
+
+#: setup/frames/menu.inc.php:19 setup/lib/messages.inc.php:113
+msgid "Navigation frame"
+msgstr ""
+
+#: setup/frames/menu.inc.php:20 setup/lib/messages.inc.php:118
+msgid "Main frame"
+msgstr ""
+
+#: setup/frames/servers.inc.php:28 setup/lib/messages.inc.php:272
+msgid "Edit server"
+msgstr ""
+
+#: setup/frames/servers.inc.php:37 setup/lib/messages.inc.php:241
+msgid "Add a new server"
+msgstr ""
+
+#: setup/lib/FormDisplay.tpl.php:182 setup/lib/messages.inc.php:328
+#, php-format
+msgid "Set value: %s"
+msgstr ""
+
+#: setup/lib/FormDisplay.tpl.php:187 setup/lib/messages.inc.php:234
+msgid "Restore default value"
+msgstr ""
+
+#: setup/lib/form_processing.lib.php:43 setup/lib/messages.inc.php:377
+msgid "Warning"
+msgstr ""
+
 #: setup/lib/messages.inc.php:16
 msgid "Allow character set conversion"
 msgstr ""
@@ -6638,10 +6739,6 @@ msgstr ""
 msgid "Compress on the fly"
 msgstr ""
 
-#: setup/lib/messages.inc.php:45
-msgid "Configuration file"
-msgstr ""
-
 #: setup/lib/messages.inc.php:46
 msgid ""
 "Whether a warning ("Are your really sure...") should be displayed "
@@ -6660,14 +6757,6 @@ msgstr ""
 msgid "Default character set"
 msgstr ""
 
-#: setup/lib/messages.inc.php:50
-msgid "Default language"
-msgstr ""
-
-#: setup/lib/messages.inc.php:51
-msgid "Default server"
-msgstr ""
-
 #: setup/lib/messages.inc.php:52
 msgid "Tab that is displayed when entering a database"
 msgstr ""
@@ -6706,10 +6795,6 @@ msgstr ""
 msgid "Display databases as a list"
 msgstr ""
 
-#: setup/lib/messages.inc.php:61
-msgid "Display"
-msgstr ""
-
 #: setup/lib/messages.inc.php:62
 msgid "Show server listing as a list instead of a drop down"
 msgstr ""
@@ -6718,18 +6803,6 @@ msgstr ""
 msgid "Display servers as a list"
 msgstr ""
 
-#: setup/lib/messages.inc.php:64
-msgid "Donate"
-msgstr ""
-
-#: setup/lib/messages.inc.php:65
-msgid "Download"
-msgstr ""
-
-#: setup/lib/messages.inc.php:66
-msgid "End of line"
-msgstr ""
-
 #: setup/lib/messages.inc.php:67
 msgid "Could not connect to MySQL server"
 msgstr ""
@@ -6902,10 +6975,6 @@ msgstr ""
 msgid "Customize appearance of the navigation frame"
 msgstr ""
 
-#: setup/lib/messages.inc.php:113
-msgid "Navigation frame"
-msgstr ""
-
 #: setup/lib/messages.inc.php:114
 msgid "Servers display options"
 msgstr ""
@@ -6914,10 +6983,6 @@ msgstr ""
 msgid "Tables display options"
 msgstr ""
 
-#: setup/lib/messages.inc.php:118
-msgid "Main frame"
-msgstr ""
-
 #: setup/lib/messages.inc.php:119
 msgid "Settings that didn't fit enywhere else"
 msgstr ""
@@ -6993,10 +7058,6 @@ msgstr ""
 msgid "Customize export options"
 msgstr ""
 
-#: setup/lib/messages.inc.php:137
-msgid "Features"
-msgstr ""
-
 #: setup/lib/messages.inc.php:138
 msgid "Customize import defaults"
 msgstr ""
@@ -7061,10 +7122,6 @@ msgid ""
 "system."
 msgstr ""
 
-#: setup/lib/messages.inc.php:152
-msgid "phpMyAdmin homepage"
-msgstr ""
-
 #: setup/lib/messages.inc.php:153
 msgid "Extra parameters for iconv"
 msgstr ""
@@ -7108,12 +7165,6 @@ msgstr ""
 msgid "Insecure connection"
 msgstr ""
 
-#: setup/lib/messages.inc.php:164
-msgid ""
-"You are not using a secure connection; all data (including potentially "
-"sensitive information, like passwords) is transferred unencrypted!"
-msgstr ""
-
 #: setup/lib/messages.inc.php:165
 #, php-format
 msgid ""
@@ -7209,10 +7260,6 @@ msgstr ""
 msgid "Enable highlighting"
 msgstr ""
 
-#: setup/lib/messages.inc.php:187
-msgid "let the user choose"
-msgstr ""
-
 #: setup/lib/messages.inc.php:188
 msgid "Use less graphically intense tabs"
 msgstr ""
@@ -7221,10 +7268,6 @@ msgstr ""
 msgid "Light tabs"
 msgstr ""
 
-#: setup/lib/messages.inc.php:190
-msgid "Load"
-msgstr ""
-
 #: setup/lib/messages.inc.php:191
 msgid ""
 "If TRUE, logout deletes cookies for all servers; when set to FALSE, logout "
@@ -7326,14 +7369,6 @@ msgstr ""
 msgid "Iconic navigation bar"
 msgstr ""
 
-#: setup/lib/messages.inc.php:212
-msgid "New server"
-msgstr ""
-
-#: setup/lib/messages.inc.php:213
-msgid "There are no configured servers"
-msgstr ""
-
 #: setup/lib/messages.inc.php:214
 msgid "use GZip output buffering for increased speed in HTTP transfers"
 msgstr ""
@@ -7342,10 +7377,6 @@ msgstr ""
 msgid "GZip output buffering"
 msgstr ""
 
-#: setup/lib/messages.inc.php:216
-msgid "- none -"
-msgstr ""
-
 #: setup/lib/messages.inc.php:217
 msgid ""
 "[kbd]SMART[/kbd] - i.e. descending order for fields of type TIME, DATE, "
@@ -7356,10 +7387,6 @@ msgstr ""
 msgid "Default sorting order"
 msgstr ""
 
-#: setup/lib/messages.inc.php:219
-msgid "Overview"
-msgstr ""
-
 #: setup/lib/messages.inc.php:220
 msgid "Use persistent connections to MySQL databases"
 msgstr ""
@@ -7414,10 +7441,6 @@ msgstr ""
 msgid "Recoding engine"
 msgstr ""
 
-#: setup/lib/messages.inc.php:234
-msgid "Restore default value"
-msgstr ""
-
 #: setup/lib/messages.inc.php:235
 msgid "Try to revert erroneous fields to their default values"
 msgstr ""
@@ -7448,10 +7471,6 @@ msgstr ""
 msgid "You allow for connecting to the server without a password."
 msgstr ""
 
-#: setup/lib/messages.inc.php:241
-msgid "Add a new server"
-msgstr ""
-
 #: setup/lib/messages.inc.php:242
 msgid "Leave blank if not used"
 msgstr ""
@@ -7592,10 +7611,6 @@ msgid ""
 "to."
 msgstr ""
 
-#: setup/lib/messages.inc.php:272
-msgid "Edit server"
-msgstr ""
-
 #: setup/lib/messages.inc.php:273
 msgid "What PHP extension to use; you should use mysqli if supported"
 msgstr ""
@@ -7837,11 +7852,6 @@ msgstr ""
 msgid "Verbose name of this server"
 msgstr ""
 
-#: setup/lib/messages.inc.php:328
-#, php-format
-msgid "Set value: %s"
-msgstr ""
-
 #: setup/lib/messages.inc.php:329
 msgid ""
 "Whether a user should be displayed a "show all (records)" button"
@@ -7878,10 +7888,6 @@ msgstr ""
 msgid "Show function fields"
 msgstr ""
 
-#: setup/lib/messages.inc.php:337
-msgid "Show hidden messages (#MSG_COUNT)"
-msgstr ""
-
 #: setup/lib/messages.inc.php:338
 msgid ""
 "Shows link to [a at http://php.net/manual/function.phpinfo.php]phpinfo()[/a] "
@@ -8010,10 +8016,6 @@ msgstr ""
 msgid "Got invalid version string from server"
 msgstr ""
 
-#: setup/lib/messages.inc.php:370
-msgid "Check for latest version"
-msgstr ""
-
 #: setup/lib/messages.inc.php:371
 #, php-format
 msgid ""
@@ -8045,10 +8047,6 @@ msgid ""
 "Neither URL wrapper nor CURL is available. Version check is not possible."
 msgstr ""
 
-#: setup/lib/messages.inc.php:377
-msgid "Warning"
-msgstr ""
-
 #: setup/lib/messages.inc.php:378
 msgid ""
 "Enable [a at http://en.wikipedia.org/wiki/ZIP_(file_format)]ZIP[/a] compression "
diff --git a/po/uz.po b/po/uz.po
index 453463e..27e5e04 100644
--- a/po/uz.po
+++ b/po/uz.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-14 07:48-0400\n"
+"POT-Creation-Date: 2010-05-14 13:39-0400\n"
 "PO-Revision-Date: 2010-03-12 09:20+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: uzbek_cyrillic <uz at li.org>\n"
@@ -949,15 +949,10 @@ msgstr ""
 "ўша файлни танлаган ҳолда уни қайта ишга туширинг ва жараён узилган жойдан "
 "бошлаб давом этади."
 
-#: import.php:426
-#, fuzzy
-#| msgid ""
-#| "However on last run no data has been parsed, this usually means "
-#| "phpMyAdmin won't be able to finish this import unless you increase php "
-#| "time limits."
+#: import.php:426 libraries/messages.inc.php:1102
 msgid ""
 "However on last run no data has been parsed, this usually means phpMyAdmin "
-"won"
+"won't be able to finish this import unless you increase php time limits."
 msgstr ""
 "Охирги ишга тушириш бўлишига қарамасдан, маълумотлар қайта ишланмади. "
 "Одатда, бу ҳол, php-сценарийлар учун ажратилган вақт оширилмагунча "
@@ -6481,15 +6476,6 @@ msgstr "Оқимлар"
 msgid "Thread %s was successfully killed."
 msgstr " \"%s\" жараёни муваффақиятли якунланди."
 
-#: libraries/messages.inc.php:1102
-msgid ""
-"However on last run no data has been parsed, this usually means phpMyAdmin "
-"won't be able to finish this import unless you increase php time limits."
-msgstr ""
-"Охирги ишга тушириш бўлишига қарамасдан, маълумотлар қайта ишланмади. "
-"Одатда, бу ҳол, php-сценарийлар учун ажратилган вақт оширилмагунча "
-"phpMyAdmin дастури импорт жараёнини якунла олмаслигини билдиради."
-
 #: libraries/messages.inc.php:1105 pmd_pdf.php:94
 msgid "to/from page"
 msgstr "Саҳифа"
@@ -6968,7 +6954,8 @@ msgstr "Йўқ"
 msgid "Filter"
 msgstr "Фильтр"
 
-#: navigation.php:319 setup/lib/messages.inc.php:42
+#: navigation.php:319 setup/frames/index.inc.php:218
+#: setup/lib/messages.inc.php:42
 msgid "Clear"
 msgstr "Тозалаш"
 
@@ -7074,6 +7061,114 @@ msgstr "Нохавфсиз уланиш"
 msgid "Configuration: %s"
 msgstr "Конфигурацион файл"
 
+#: setup/frames/config.inc.php:25 setup/frames/index.inc.php:152
+#: setup/lib/messages.inc.php:45
+msgid "Configuration file"
+msgstr "Конфигурацион файл"
+
+#: setup/frames/config.inc.php:38 setup/frames/index.inc.php:212
+#: setup/lib/messages.inc.php:65
+msgid "Download"
+msgstr "Юклаб олиш"
+
+#: setup/frames/index.inc.php:58 setup/lib/messages.inc.php:164
+msgid ""
+"You are not using a secure connection; all data (including potentially "
+"sensitive information, like passwords) is transferred unencrypted!"
+msgstr ""
+"Сизнинг уланишингиз хавфсиз эмас; барча маълумотлар (шу жумладан, сирли "
+"маълумотлар, масалан, пароллар) шифрланмаган ҳолда узатилади!"
+
+#: setup/frames/index.inc.php:87 setup/frames/menu.inc.php:17
+#: setup/lib/messages.inc.php:219
+msgid "Overview"
+msgstr "Кўриб чиқиш"
+
+#: setup/frames/index.inc.php:95 setup/lib/messages.inc.php:337
+msgid "Show hidden messages (#MSG_COUNT)"
+msgstr "Яширин хабарларни кўрсатиш (#MSG_COUNT)"
+
+#: setup/frames/index.inc.php:135 setup/lib/messages.inc.php:213
+msgid "There are no configured servers"
+msgstr "Биронта ҳам конфигурацияланган сервер мавжуд эмас"
+
+#: setup/frames/index.inc.php:143 setup/lib/messages.inc.php:212
+msgid "New server"
+msgstr "Янги сервер"
+
+#: setup/frames/index.inc.php:172 setup/lib/messages.inc.php:50
+msgid "Default language"
+msgstr "Тил"
+
+#: setup/frames/index.inc.php:182 setup/lib/messages.inc.php:187
+msgid "let the user choose"
+msgstr "фойдаланувчига танлаш имконини бериш"
+
+#: setup/frames/index.inc.php:193 setup/lib/messages.inc.php:216
+msgid "- none -"
+msgstr "- йўқ -"
+
+#: setup/frames/index.inc.php:196 setup/lib/messages.inc.php:51
+msgid "Default server"
+msgstr "Сервер"
+
+#: setup/frames/index.inc.php:206 setup/lib/messages.inc.php:66
+msgid "End of line"
+msgstr "Сатр охири"
+
+#: setup/frames/index.inc.php:211 setup/lib/messages.inc.php:61
+msgid "Display"
+msgstr "Кўрсатиш"
+
+#: setup/frames/index.inc.php:215 setup/lib/messages.inc.php:190
+msgid "Load"
+msgstr "Юклаш"
+
+#: setup/frames/index.inc.php:226 setup/lib/messages.inc.php:152
+msgid "phpMyAdmin homepage"
+msgstr "phpMyAdmin сайти"
+
+#: setup/frames/index.inc.php:227 setup/lib/messages.inc.php:64
+msgid "Donate"
+msgstr "Садақа"
+
+#: setup/frames/index.inc.php:228 setup/lib/messages.inc.php:370
+msgid "Check for latest version"
+msgstr "Охирги версияни текшириш"
+
+#: setup/frames/menu.inc.php:18 setup/lib/messages.inc.php:137
+msgid "Features"
+msgstr "Функциялар"
+
+#: setup/frames/menu.inc.php:19 setup/lib/messages.inc.php:113
+msgid "Navigation frame"
+msgstr "Навигация панели"
+
+#: setup/frames/menu.inc.php:20 setup/lib/messages.inc.php:118
+msgid "Main frame"
+msgstr "Асосий рамка"
+
+#: setup/frames/servers.inc.php:28 setup/lib/messages.inc.php:272
+msgid "Edit server"
+msgstr "Серверларни таҳрирлаш"
+
+#: setup/frames/servers.inc.php:37 setup/lib/messages.inc.php:241
+msgid "Add a new server"
+msgstr "Янги фойдаланувчи қўшиш"
+
+#: setup/lib/FormDisplay.tpl.php:182 setup/lib/messages.inc.php:328
+#, php-format
+msgid "Set value: %s"
+msgstr "Қуйидаги қийматни ўрнатиш: \"%s\""
+
+#: setup/lib/FormDisplay.tpl.php:187 setup/lib/messages.inc.php:234
+msgid "Restore default value"
+msgstr "Асл қийматларни тиклаш"
+
+#: setup/lib/form_processing.lib.php:43 setup/lib/messages.inc.php:377
+msgid "Warning"
+msgstr "Огоҳлантириш"
+
 #: setup/lib/messages.inc.php:16
 msgid "Allow character set conversion"
 msgstr "Кодировка корвертациясига рухсат бериш"
@@ -7243,10 +7338,6 @@ msgstr ""
 msgid "Compress on the fly"
 msgstr "Бирйўла қисиш"
 
-#: setup/lib/messages.inc.php:45
-msgid "Configuration file"
-msgstr "Конфигурацион файл"
-
 #: setup/lib/messages.inc.php:46
 msgid ""
 "Whether a warning ("Are your really sure...") should be displayed "
@@ -7267,14 +7358,6 @@ msgstr "Конвертация вақтида ишлатиладиган код
 msgid "Default character set"
 msgstr "Кодировка"
 
-#: setup/lib/messages.inc.php:50
-msgid "Default language"
-msgstr "Тил"
-
-#: setup/lib/messages.inc.php:51
-msgid "Default server"
-msgstr "Сервер"
-
 #: setup/lib/messages.inc.php:52
 msgid "Tab that is displayed when entering a database"
 msgstr "Маълумотлар базасига киришда кўрсатиладиган ёрлиқ"
@@ -7317,10 +7400,6 @@ msgstr ""
 msgid "Display databases as a list"
 msgstr "Маълумотлар базасини рўйхат шаклида кўрсатиш"
 
-#: setup/lib/messages.inc.php:61
-msgid "Display"
-msgstr "Кўрсатиш"
-
 #: setup/lib/messages.inc.php:62
 msgid "Show server listing as a list instead of a drop down"
 msgstr ""
@@ -7331,18 +7410,6 @@ msgstr ""
 msgid "Display servers as a list"
 msgstr "Серверлар рўйхатини кўрсатиш"
 
-#: setup/lib/messages.inc.php:64
-msgid "Donate"
-msgstr "Садақа"
-
-#: setup/lib/messages.inc.php:65
-msgid "Download"
-msgstr "Юклаб олиш"
-
-#: setup/lib/messages.inc.php:66
-msgid "End of line"
-msgstr "Сатр охири"
-
 #: setup/lib/messages.inc.php:67
 msgid "Could not connect to MySQL server"
 msgstr "MySQL-серверга уланиб бўлмади"
@@ -7531,10 +7598,6 @@ msgstr "Маълумотлар базаларини кўрсатиш афзал
 msgid "Customize appearance of the navigation frame"
 msgstr "Навигация панели кўринишини созлаш"
 
-#: setup/lib/messages.inc.php:113
-msgid "Navigation frame"
-msgstr "Навигация панели"
-
 #: setup/lib/messages.inc.php:114
 msgid "Servers display options"
 msgstr "Серверлар кўринишини созлаш"
@@ -7543,10 +7606,6 @@ msgstr "Серверлар кўринишини созлаш"
 msgid "Tables display options"
 msgstr "Жадваллар кўринишини созлаш"
 
-#: setup/lib/messages.inc.php:118
-msgid "Main frame"
-msgstr "Асосий рамка"
-
 #: setup/lib/messages.inc.php:119
 msgid "Settings that didn't fit enywhere else"
 msgstr "Бошқа жойга сиғмаган созланишлар"
@@ -7630,10 +7689,6 @@ msgstr "Мослашлар"
 msgid "Customize export options"
 msgstr "Экспорт танловларини мослаштириш"
 
-#: setup/lib/messages.inc.php:137
-msgid "Features"
-msgstr "Функциялар"
-
 #: setup/lib/messages.inc.php:138
 msgid "Customize import defaults"
 msgstr "Импорт танловларини мослаштириш"
@@ -7706,10 +7761,6 @@ msgstr ""
 "тиклаш[/a] учун махсус функциялар (\"%s\") керак, лекин улар тизимингизда "
 "топилмади."
 
-#: setup/lib/messages.inc.php:152
-msgid "phpMyAdmin homepage"
-msgstr "phpMyAdmin сайти"
-
 #: setup/lib/messages.inc.php:153
 msgid "Extra parameters for iconv"
 msgstr "iconv учун қўшимча параметрлар"
@@ -7760,14 +7811,6 @@ msgstr "Қисман импорт: сўровларга эътибор берм
 msgid "Insecure connection"
 msgstr "Нохавфсиз уланиш"
 
-#: setup/lib/messages.inc.php:164
-msgid ""
-"You are not using a secure connection; all data (including potentially "
-"sensitive information, like passwords) is transferred unencrypted!"
-msgstr ""
-"Сизнинг уланишингиз хавфсиз эмас; барча маълумотлар (шу жумладан, сирли "
-"маълумотлар, масалан, пароллар) шифрланмаган ҳолда узатилади!"
-
 #: setup/lib/messages.inc.php:165
 #, php-format
 msgid ""
@@ -7870,10 +7913,6 @@ msgstr "Сичқонча курсори турган серверни белги
 msgid "Enable highlighting"
 msgstr "Белгилашни ёқиш"
 
-#: setup/lib/messages.inc.php:187
-msgid "let the user choose"
-msgstr "фойдаланувчига танлаш имконини бериш"
-
 #: setup/lib/messages.inc.php:188
 msgid "Use less graphically intense tabs"
 msgstr "Камроқ графикали ёрлиқларни ишлатиш"
@@ -7882,10 +7921,6 @@ msgstr "Камроқ графикали ёрлиқларни ишлатиш"
 msgid "Light tabs"
 msgstr "Енгил ёрлиқлар"
 
-#: setup/lib/messages.inc.php:190
-msgid "Load"
-msgstr "Юклаш"
-
 #: setup/lib/messages.inc.php:191
 msgid ""
 "If TRUE, logout deletes cookies for all servers; when set to FALSE, logout "
@@ -8006,14 +8041,6 @@ msgstr "Фақат пиктограмма, фақат матн ёки ҳар и
 msgid "Iconic navigation bar"
 msgstr "Пиктограммали навигация менюси"
 
-#: setup/lib/messages.inc.php:212
-msgid "New server"
-msgstr "Янги сервер"
-
-#: setup/lib/messages.inc.php:213
-msgid "There are no configured servers"
-msgstr "Биронта ҳам конфигурацияланган сервер мавжуд эмас"
-
 #: setup/lib/messages.inc.php:214
 msgid "use GZip output buffering for increased speed in HTTP transfers"
 msgstr ""
@@ -8024,10 +8051,6 @@ msgstr ""
 msgid "GZip output buffering"
 msgstr "GZip буферизация"
 
-#: setup/lib/messages.inc.php:216
-msgid "- none -"
-msgstr "- йўқ -"
-
 #: setup/lib/messages.inc.php:217
 msgid ""
 "[kbd]SMART[/kbd] - i.e. descending order for fields of type TIME, DATE, "
@@ -8040,10 +8063,6 @@ msgstr ""
 msgid "Default sorting order"
 msgstr "Асл тартиблаш қоидаси"
 
-#: setup/lib/messages.inc.php:219
-msgid "Overview"
-msgstr "Кўриб чиқиш"
-
 #: setup/lib/messages.inc.php:220
 msgid "Use persistent connections to MySQL databases"
 msgstr "MySQL маълумотлар базаларида доимий уланишлардан фойдаланиш"
@@ -8102,10 +8121,6 @@ msgstr ""
 msgid "Recoding engine"
 msgstr "Кодировкалаш функцияси"
 
-#: setup/lib/messages.inc.php:234
-msgid "Restore default value"
-msgstr "Асл қийматларни тиклаш"
-
 #: setup/lib/messages.inc.php:235
 msgid "Try to revert erroneous fields to their default values"
 msgstr "Янглиш майдонларни асл қийматига қайтаришга уриниш"
@@ -8144,10 +8159,6 @@ msgstr "Унумдорликни ошириш мақсадида \"mysqli\"да
 msgid "You allow for connecting to the server without a password."
 msgstr "Серверга паролсиз уланишга рухсат берасизми?"
 
-#: setup/lib/messages.inc.php:241
-msgid "Add a new server"
-msgstr "Янги фойдаланувчи қўшиш"
-
 #: setup/lib/messages.inc.php:242
 msgid "Leave blank if not used"
 msgstr "Агар ишлатилмаса бўш қолдиринг"
@@ -8310,10 +8321,6 @@ msgstr ""
 "минглаб фойдаланувчилар уланган провайдерга тегишли бўлса, IP-адресга "
 "асосланган ҳимоя усули ишонарли бўлмаслиги мумкин."
 
-#: setup/lib/messages.inc.php:272
-msgid "Edit server"
-msgstr "Серверларни таҳрирлаш"
-
 #: setup/lib/messages.inc.php:273
 msgid "What PHP extension to use; you should use mysqli if supported"
 msgstr ""
@@ -8596,11 +8603,6 @@ msgstr "MySQL сервери ишлаётган хост сервер номи"
 msgid "Verbose name of this server"
 msgstr "Ушбу сервернинг кенгайтирилган номи"
 
-#: setup/lib/messages.inc.php:328
-#, php-format
-msgid "Set value: %s"
-msgstr "Қуйидаги қийматни ўрнатиш: \"%s\""
-
 #: setup/lib/messages.inc.php:329
 msgid ""
 "Whether a user should be displayed a "show all (records)" button"
@@ -8639,10 +8641,6 @@ msgstr "Таҳрирлаш/қўйиш режимида функциялар ма
 msgid "Show function fields"
 msgstr "Фукнциялармайдонини кўрсатиш"
 
-#: setup/lib/messages.inc.php:337
-msgid "Show hidden messages (#MSG_COUNT)"
-msgstr "Яширин хабарларни кўрсатиш (#MSG_COUNT)"
-
 #: setup/lib/messages.inc.php:338
 msgid ""
 "Shows link to [a at http://php.net/manual/function.phpinfo.php]phpinfo()[/a] "
@@ -8796,10 +8794,6 @@ msgstr ""
 msgid "Got invalid version string from server"
 msgstr "Сервердар версия ҳақида ноўрин маълумот олинди"
 
-#: setup/lib/messages.inc.php:370
-msgid "Check for latest version"
-msgstr "Охирги версияни текшириш"
-
 #: setup/lib/messages.inc.php:371
 #, php-format
 msgid ""
@@ -8839,10 +8833,6 @@ msgid ""
 "Neither URL wrapper nor CURL is available. Version check is not possible."
 msgstr "На URL қодоқлагич ва на CURL мавжуд. Версияни текшириб бўлмади."
 
-#: setup/lib/messages.inc.php:377
-msgid "Warning"
-msgstr "Огоҳлантириш"
-
 #: setup/lib/messages.inc.php:378
 msgid ""
 "Enable [a at http://en.wikipedia.org/wiki/ZIP_(file_format)]ZIP[/a] compression "
@@ -8912,6 +8902,19 @@ msgid "Description"
 msgstr "Тавсифи"
 
 #, fuzzy
+#~| msgid ""
+#~| "However on last run no data has been parsed, this usually means "
+#~| "phpMyAdmin won't be able to finish this import unless you increase php "
+#~| "time limits."
+#~ msgid ""
+#~ "However on last run no data has been parsed, this usually means "
+#~ "phpMyAdmin won"
+#~ msgstr ""
+#~ "Охирги ишга тушириш бўлишига қарамасдан, маълумотлар қайта ишланмади. "
+#~ "Одатда, бу ҳол, php-сценарийлар учун ажратилган вақт оширилмагунча "
+#~ "phpMyAdmin дастури импорт жараёнини якунла олмаслигини билдиради."
+
+#, fuzzy
 #~| msgid "None"
 #~ msgctxt "None action"
 #~ msgid "None"
diff --git a/po/uz at latin.po b/po/uz at latin.po
index 1cbdb1a..7bbb525 100644
--- a/po/uz at latin.po
+++ b/po/uz at latin.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-14 07:48-0400\n"
+"POT-Creation-Date: 2010-05-14 13:39-0400\n"
 "PO-Revision-Date: 2010-03-12 09:20+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: uzbek_latin <uz at latin@li.org>\n"
@@ -951,15 +951,10 @@ msgstr ""
 "unda o‘sha faylni tanlagan holda uni qayta ishga tushiring va jarayon "
 "uzilgan joydan boshlab davom etadi."
 
-#: import.php:426
-#, fuzzy
-#| msgid ""
-#| "However on last run no data has been parsed, this usually means "
-#| "phpMyAdmin won't be able to finish this import unless you increase php "
-#| "time limits."
+#: import.php:426 libraries/messages.inc.php:1102
 msgid ""
 "However on last run no data has been parsed, this usually means phpMyAdmin "
-"won"
+"won't be able to finish this import unless you increase php time limits."
 msgstr ""
 "Oxirgi ishga tushirish bo‘lishiga qaramasdan, ma`lumotlar qayta ishlanmadi. "
 "Odatda, bu hol, php-ssenariylar uchun ajratilgan vaqt oshirilmaguncha "
@@ -6523,15 +6518,6 @@ msgstr "Oqimlar"
 msgid "Thread %s was successfully killed."
 msgstr " \"%s\" jarayoni muvaffaqiyatli yakunlandi."
 
-#: libraries/messages.inc.php:1102
-msgid ""
-"However on last run no data has been parsed, this usually means phpMyAdmin "
-"won't be able to finish this import unless you increase php time limits."
-msgstr ""
-"Oxirgi ishga tushirish bo‘lishiga qaramasdan, ma`lumotlar qayta ishlanmadi. "
-"Odatda, bu hol, php-ssenariylar uchun ajratilgan vaqt oshirilmaguncha "
-"phpMyAdmin dasturi import jarayonini yakunla olmasligini bildiradi."
-
 #: libraries/messages.inc.php:1105 pmd_pdf.php:94
 msgid "to/from page"
 msgstr "Sahifa"
@@ -7017,7 +7003,8 @@ msgstr "Yo‘q"
 msgid "Filter"
 msgstr "Filtr"
 
-#: navigation.php:319 setup/lib/messages.inc.php:42
+#: navigation.php:319 setup/frames/index.inc.php:218
+#: setup/lib/messages.inc.php:42
 msgid "Clear"
 msgstr "Tozalash"
 
@@ -7127,6 +7114,114 @@ msgstr "Noxavfsiz ulanish"
 msgid "Configuration: %s"
 msgstr "Konfiguratsion fayl"
 
+#: setup/frames/config.inc.php:25 setup/frames/index.inc.php:152
+#: setup/lib/messages.inc.php:45
+msgid "Configuration file"
+msgstr "Konfiguratsion fayl"
+
+#: setup/frames/config.inc.php:38 setup/frames/index.inc.php:212
+#: setup/lib/messages.inc.php:65
+msgid "Download"
+msgstr "Yuklab olish"
+
+#: setup/frames/index.inc.php:58 setup/lib/messages.inc.php:164
+msgid ""
+"You are not using a secure connection; all data (including potentially "
+"sensitive information, like passwords) is transferred unencrypted!"
+msgstr ""
+"Sizning ulanishingiz xavfsiz emas; barcha ma`lumotlar (shu jumladan, sirli "
+"ma`lumotlar, masalan, parollar) shifrlanmagan holda uzatiladi!"
+
+#: setup/frames/index.inc.php:87 setup/frames/menu.inc.php:17
+#: setup/lib/messages.inc.php:219
+msgid "Overview"
+msgstr "Ko‘rib chiqish"
+
+#: setup/frames/index.inc.php:95 setup/lib/messages.inc.php:337
+msgid "Show hidden messages (#MSG_COUNT)"
+msgstr "Yashirin xabarlarni ko‘rsatish (#MSG_COUNT)"
+
+#: setup/frames/index.inc.php:135 setup/lib/messages.inc.php:213
+msgid "There are no configured servers"
+msgstr "Bironta ham konfiguratsiyalangan server mavjud emas"
+
+#: setup/frames/index.inc.php:143 setup/lib/messages.inc.php:212
+msgid "New server"
+msgstr "Yangi server"
+
+#: setup/frames/index.inc.php:172 setup/lib/messages.inc.php:50
+msgid "Default language"
+msgstr "Til"
+
+#: setup/frames/index.inc.php:182 setup/lib/messages.inc.php:187
+msgid "let the user choose"
+msgstr "foydalanuvchiga tanlash imkonini berish"
+
+#: setup/frames/index.inc.php:193 setup/lib/messages.inc.php:216
+msgid "- none -"
+msgstr "- yo‘q -"
+
+#: setup/frames/index.inc.php:196 setup/lib/messages.inc.php:51
+msgid "Default server"
+msgstr "Server"
+
+#: setup/frames/index.inc.php:206 setup/lib/messages.inc.php:66
+msgid "End of line"
+msgstr "Satr oxiri"
+
+#: setup/frames/index.inc.php:211 setup/lib/messages.inc.php:61
+msgid "Display"
+msgstr "Ko‘rsatish"
+
+#: setup/frames/index.inc.php:215 setup/lib/messages.inc.php:190
+msgid "Load"
+msgstr "Yuklash"
+
+#: setup/frames/index.inc.php:226 setup/lib/messages.inc.php:152
+msgid "phpMyAdmin homepage"
+msgstr "phpMyAdmin sayti"
+
+#: setup/frames/index.inc.php:227 setup/lib/messages.inc.php:64
+msgid "Donate"
+msgstr "Sadaqa"
+
+#: setup/frames/index.inc.php:228 setup/lib/messages.inc.php:370
+msgid "Check for latest version"
+msgstr "Oxirgi versiyani tekshirish"
+
+#: setup/frames/menu.inc.php:18 setup/lib/messages.inc.php:137
+msgid "Features"
+msgstr "Funksiyalar"
+
+#: setup/frames/menu.inc.php:19 setup/lib/messages.inc.php:113
+msgid "Navigation frame"
+msgstr "Navigatsiya paneli"
+
+#: setup/frames/menu.inc.php:20 setup/lib/messages.inc.php:118
+msgid "Main frame"
+msgstr "Asosiy ramka"
+
+#: setup/frames/servers.inc.php:28 setup/lib/messages.inc.php:272
+msgid "Edit server"
+msgstr "Serverlarni tahrirlash"
+
+#: setup/frames/servers.inc.php:37 setup/lib/messages.inc.php:241
+msgid "Add a new server"
+msgstr "Yangi foydalanuvchi qo‘shish"
+
+#: setup/lib/FormDisplay.tpl.php:182 setup/lib/messages.inc.php:328
+#, php-format
+msgid "Set value: %s"
+msgstr "Quyidagi qiymatni o‘rnatish: \"%s\""
+
+#: setup/lib/FormDisplay.tpl.php:187 setup/lib/messages.inc.php:234
+msgid "Restore default value"
+msgstr "Asl qiymatlarni tiklash"
+
+#: setup/lib/form_processing.lib.php:43 setup/lib/messages.inc.php:377
+msgid "Warning"
+msgstr "Ogohlantirish"
+
 #: setup/lib/messages.inc.php:16
 msgid "Allow character set conversion"
 msgstr "Kodirovka korvertatsiyasiga ruxsat berish"
@@ -7297,10 +7392,6 @@ msgstr ""
 msgid "Compress on the fly"
 msgstr "Biryo‘la qisish"
 
-#: setup/lib/messages.inc.php:45
-msgid "Configuration file"
-msgstr "Konfiguratsion fayl"
-
 #: setup/lib/messages.inc.php:46
 msgid ""
 "Whether a warning ("Are your really sure...") should be displayed "
@@ -7321,14 +7412,6 @@ msgstr "Konvertatsiya vaqtida ishlatiladigan kodirovka"
 msgid "Default character set"
 msgstr "Kodirovka"
 
-#: setup/lib/messages.inc.php:50
-msgid "Default language"
-msgstr "Til"
-
-#: setup/lib/messages.inc.php:51
-msgid "Default server"
-msgstr "Server"
-
 #: setup/lib/messages.inc.php:52
 msgid "Tab that is displayed when entering a database"
 msgstr "Ma`lumotlar bazasiga kirishda ko‘rsatiladigan yorliq"
@@ -7372,10 +7455,6 @@ msgstr ""
 msgid "Display databases as a list"
 msgstr "Ma`lumotlar bazasini ro‘yxat shaklida ko‘rsatish"
 
-#: setup/lib/messages.inc.php:61
-msgid "Display"
-msgstr "Ko‘rsatish"
-
 #: setup/lib/messages.inc.php:62
 msgid "Show server listing as a list instead of a drop down"
 msgstr ""
@@ -7386,18 +7465,6 @@ msgstr ""
 msgid "Display servers as a list"
 msgstr "Serverlar ro‘yxatini ko‘rsatish"
 
-#: setup/lib/messages.inc.php:64
-msgid "Donate"
-msgstr "Sadaqa"
-
-#: setup/lib/messages.inc.php:65
-msgid "Download"
-msgstr "Yuklab olish"
-
-#: setup/lib/messages.inc.php:66
-msgid "End of line"
-msgstr "Satr oxiri"
-
 #: setup/lib/messages.inc.php:67
 msgid "Could not connect to MySQL server"
 msgstr "MySQL-serverga ulanib bo‘lmadi"
@@ -7586,10 +7653,6 @@ msgstr "Ma`lumotlar bazalarini ko‘rsatish afzalliklari"
 msgid "Customize appearance of the navigation frame"
 msgstr "Navigatsiya paneli ko‘rinishini sozlash"
 
-#: setup/lib/messages.inc.php:113
-msgid "Navigation frame"
-msgstr "Navigatsiya paneli"
-
 #: setup/lib/messages.inc.php:114
 msgid "Servers display options"
 msgstr "Serverlar ko‘rinishini sozlash"
@@ -7598,10 +7661,6 @@ msgstr "Serverlar ko‘rinishini sozlash"
 msgid "Tables display options"
 msgstr "Jadvallar ko‘rinishini sozlash"
 
-#: setup/lib/messages.inc.php:118
-msgid "Main frame"
-msgstr "Asosiy ramka"
-
 #: setup/lib/messages.inc.php:119
 msgid "Settings that didn't fit enywhere else"
 msgstr "Boshqa joyga sig‘magan sozlanishlar"
@@ -7685,10 +7744,6 @@ msgstr "Moslashlar"
 msgid "Customize export options"
 msgstr "Eksport tanlovlarini moslashtirish"
 
-#: setup/lib/messages.inc.php:137
-msgid "Features"
-msgstr "Funksiyalar"
-
 #: setup/lib/messages.inc.php:138
 msgid "Customize import defaults"
 msgstr "Import tanlovlarini moslashtirish"
@@ -7761,10 +7816,6 @@ msgstr ""
 "va tiklash[/a] uchun maxsus funksiyalar (\"%s\") kerak, lekin ular "
 "tizimingizda topilmadi."
 
-#: setup/lib/messages.inc.php:152
-msgid "phpMyAdmin homepage"
-msgstr "phpMyAdmin sayti"
-
 #: setup/lib/messages.inc.php:153
 msgid "Extra parameters for iconv"
 msgstr "iconv uchun qo‘shimcha parametrlar"
@@ -7815,14 +7866,6 @@ msgstr "Qisman import: so‘rovlarga e`tibor bermaslik"
 msgid "Insecure connection"
 msgstr "Noxavfsiz ulanish"
 
-#: setup/lib/messages.inc.php:164
-msgid ""
-"You are not using a secure connection; all data (including potentially "
-"sensitive information, like passwords) is transferred unencrypted!"
-msgstr ""
-"Sizning ulanishingiz xavfsiz emas; barcha ma`lumotlar (shu jumladan, sirli "
-"ma`lumotlar, masalan, parollar) shifrlanmagan holda uzatiladi!"
-
 #: setup/lib/messages.inc.php:165
 #, php-format
 msgid ""
@@ -7926,10 +7969,6 @@ msgstr "Sichqoncha kursori turgan serverni belgilash"
 msgid "Enable highlighting"
 msgstr "Belgilashni yoqish"
 
-#: setup/lib/messages.inc.php:187
-msgid "let the user choose"
-msgstr "foydalanuvchiga tanlash imkonini berish"
-
 #: setup/lib/messages.inc.php:188
 msgid "Use less graphically intense tabs"
 msgstr "Kamroq grafikali yorliqlarni ishlatish"
@@ -7938,10 +7977,6 @@ msgstr "Kamroq grafikali yorliqlarni ishlatish"
 msgid "Light tabs"
 msgstr "Yengil yorliqlar"
 
-#: setup/lib/messages.inc.php:190
-msgid "Load"
-msgstr "Yuklash"
-
 #: setup/lib/messages.inc.php:191
 msgid ""
 "If TRUE, logout deletes cookies for all servers; when set to FALSE, logout "
@@ -8065,14 +8100,6 @@ msgstr "Faqat piktogramma, faqat matn yoki har ikkisini ishlatish"
 msgid "Iconic navigation bar"
 msgstr "Piktogrammali navigatsiya menyusi"
 
-#: setup/lib/messages.inc.php:212
-msgid "New server"
-msgstr "Yangi server"
-
-#: setup/lib/messages.inc.php:213
-msgid "There are no configured servers"
-msgstr "Bironta ham konfiguratsiyalangan server mavjud emas"
-
 #: setup/lib/messages.inc.php:214
 msgid "use GZip output buffering for increased speed in HTTP transfers"
 msgstr ""
@@ -8083,10 +8110,6 @@ msgstr ""
 msgid "GZip output buffering"
 msgstr "GZip buferizatsiya"
 
-#: setup/lib/messages.inc.php:216
-msgid "- none -"
-msgstr "- yo‘q -"
-
 #: setup/lib/messages.inc.php:217
 msgid ""
 "[kbd]SMART[/kbd] - i.e. descending order for fields of type TIME, DATE, "
@@ -8099,10 +8122,6 @@ msgstr ""
 msgid "Default sorting order"
 msgstr "Asl tartiblash qoidasi"
 
-#: setup/lib/messages.inc.php:219
-msgid "Overview"
-msgstr "Ko‘rib chiqish"
-
 #: setup/lib/messages.inc.php:220
 msgid "Use persistent connections to MySQL databases"
 msgstr "MySQL ma`lumotlar bazalarida doimiy ulanishlardan foydalanish"
@@ -8161,10 +8180,6 @@ msgstr ""
 msgid "Recoding engine"
 msgstr "Kodirovkalash funksiyasi"
 
-#: setup/lib/messages.inc.php:234
-msgid "Restore default value"
-msgstr "Asl qiymatlarni tiklash"
-
 #: setup/lib/messages.inc.php:235
 msgid "Try to revert erroneous fields to their default values"
 msgstr "Yanglish maydonlarni asl qiymatiga qaytarishga urinish"
@@ -8204,10 +8219,6 @@ msgstr "Unumdorlikni oshirish maqsadida \"mysqli\"dan foydalaning"
 msgid "You allow for connecting to the server without a password."
 msgstr "Serverga parolsiz ulanishga ruxsat berasizmi?"
 
-#: setup/lib/messages.inc.php:241
-msgid "Add a new server"
-msgstr "Yangi foydalanuvchi qo‘shish"
-
 #: setup/lib/messages.inc.php:242
 msgid "Leave blank if not used"
 msgstr "Agar ishlatilmasa bo‘sh qoldiring"
@@ -8372,10 +8383,6 @@ msgstr ""
 "foydalanuvchilar ulangan provayderga tegishli bo‘lsa, IP-adresga asoslangan "
 "himoya usuli ishonarli bo‘lmasligi mumkin."
 
-#: setup/lib/messages.inc.php:272
-msgid "Edit server"
-msgstr "Serverlarni tahrirlash"
-
 #: setup/lib/messages.inc.php:273
 msgid "What PHP extension to use; you should use mysqli if supported"
 msgstr ""
@@ -8659,11 +8666,6 @@ msgstr "MySQL serveri ishlayotgan xost server nomi"
 msgid "Verbose name of this server"
 msgstr "Ushbu serverning kengaytirilgan nomi"
 
-#: setup/lib/messages.inc.php:328
-#, php-format
-msgid "Set value: %s"
-msgstr "Quyidagi qiymatni o‘rnatish: \"%s\""
-
 #: setup/lib/messages.inc.php:329
 msgid ""
 "Whether a user should be displayed a "show all (records)" button"
@@ -8703,10 +8705,6 @@ msgstr "Tahrirlash/qo‘yish rejimida funksiyalar maydonini ko‘rsatish"
 msgid "Show function fields"
 msgstr "Fuknsiyalarmaydonini ko‘rsatish"
 
-#: setup/lib/messages.inc.php:337
-msgid "Show hidden messages (#MSG_COUNT)"
-msgstr "Yashirin xabarlarni ko‘rsatish (#MSG_COUNT)"
-
 #: setup/lib/messages.inc.php:338
 msgid ""
 "Shows link to [a at http://php.net/manual/function.phpinfo.php]phpinfo()[/a] "
@@ -8864,10 +8862,6 @@ msgstr ""
 msgid "Got invalid version string from server"
 msgstr "Serverdar versiya haqida noo‘rin ma`lumot olindi"
 
-#: setup/lib/messages.inc.php:370
-msgid "Check for latest version"
-msgstr "Oxirgi versiyani tekshirish"
-
 #: setup/lib/messages.inc.php:371
 #, php-format
 msgid ""
@@ -8907,10 +8901,6 @@ msgid ""
 "Neither URL wrapper nor CURL is available. Version check is not possible."
 msgstr "Na URL qodoqlagich va na CURL mavjud. Versiyani tekshirib bo‘lmadi."
 
-#: setup/lib/messages.inc.php:377
-msgid "Warning"
-msgstr "Ogohlantirish"
-
 #: setup/lib/messages.inc.php:378
 msgid ""
 "Enable [a at http://en.wikipedia.org/wiki/ZIP_(file_format)]ZIP[/a] compression "
@@ -8980,6 +8970,20 @@ msgid "Description"
 msgstr "Tavsifi"
 
 #, fuzzy
+#~| msgid ""
+#~| "However on last run no data has been parsed, this usually means "
+#~| "phpMyAdmin won't be able to finish this import unless you increase php "
+#~| "time limits."
+#~ msgid ""
+#~ "However on last run no data has been parsed, this usually means "
+#~ "phpMyAdmin won"
+#~ msgstr ""
+#~ "Oxirgi ishga tushirish bo‘lishiga qaramasdan, ma`lumotlar qayta "
+#~ "ishlanmadi. Odatda, bu hol, php-ssenariylar uchun ajratilgan vaqt "
+#~ "oshirilmaguncha phpMyAdmin dasturi import jarayonini yakunla olmasligini "
+#~ "bildiradi."
+
+#, fuzzy
 #~| msgid "None"
 #~ msgctxt "None action"
 #~ msgid "None"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 2a8648e..c73b08f 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-14 07:48-0400\n"
+"POT-Creation-Date: 2010-05-14 13:39-0400\n"
 "PO-Revision-Date: 2010-05-12 06:17+0200\n"
 "Last-Translator: shanyan baishui <Siramizu at gmail.com>\n"
 "Language-Team: chinese_simplified <zh_CN at li.org>\n"
@@ -928,15 +928,10 @@ msgid ""
 "file and import will resume."
 msgstr "脚本超时,如果你要完成导入,请重新提交相同的文件,导入将会继续进行。"
 
-#: import.php:426
-#, fuzzy
-#| msgid ""
-#| "However on last run no data has been parsed, this usually means "
-#| "phpMyAdmin won't be able to finish this import unless you increase php "
-#| "time limits."
+#: import.php:426 libraries/messages.inc.php:1102
 msgid ""
 "However on last run no data has been parsed, this usually means phpMyAdmin "
-"won"
+"won't be able to finish this import unless you increase php time limits."
 msgstr ""
 "在最后一次执行时没有数据被解析,建议您增加 PHP 运行时间限制,否则 phpMyAdmin "
 "将无法完成导入操作。"
@@ -6159,14 +6154,6 @@ msgstr "线程"
 msgid "Thread %s was successfully killed."
 msgstr "已杀死线程 %s 。"
 
-#: libraries/messages.inc.php:1102
-msgid ""
-"However on last run no data has been parsed, this usually means phpMyAdmin "
-"won't be able to finish this import unless you increase php time limits."
-msgstr ""
-"在最后一次执行时没有数据被解析,建议您增加 PHP 运行时间限制,否则 phpMyAdmin "
-"将无法完成导入操作。"
-
 #: libraries/messages.inc.php:1105 pmd_pdf.php:94
 msgid "to/from page"
 msgstr "到/从 页"
@@ -6614,7 +6601,8 @@ msgstr "无"
 msgid "Filter"
 msgstr "快速搜索"
 
-#: navigation.php:319 setup/lib/messages.inc.php:42
+#: navigation.php:319 setup/frames/index.inc.php:218
+#: setup/lib/messages.inc.php:42
 msgid "Clear"
 msgstr "清除"
 
@@ -6691,6 +6679,112 @@ msgstr "当前连接"
 msgid "Configuration: %s"
 msgstr "配置: %s"
 
+#: setup/frames/config.inc.php:25 setup/frames/index.inc.php:152
+#: setup/lib/messages.inc.php:45
+msgid "Configuration file"
+msgstr "配置文件"
+
+#: setup/frames/config.inc.php:38 setup/frames/index.inc.php:212
+#: setup/lib/messages.inc.php:65
+msgid "Download"
+msgstr "下载"
+
+#: setup/frames/index.inc.php:58 setup/lib/messages.inc.php:164
+msgid ""
+"You are not using a secure connection; all data (including potentially "
+"sensitive information, like passwords) is transferred unencrypted!"
+msgstr "你现在没有使用安全连接,所有数据(包括敏感信息,如密码)均为明文传输!"
+
+#: setup/frames/index.inc.php:87 setup/frames/menu.inc.php:17
+#: setup/lib/messages.inc.php:219
+msgid "Overview"
+msgstr "概要"
+
+#: setup/frames/index.inc.php:95 setup/lib/messages.inc.php:337
+msgid "Show hidden messages (#MSG_COUNT)"
+msgstr "显示隐藏信息 (#MSG_COUNT)"
+
+#: setup/frames/index.inc.php:135 setup/lib/messages.inc.php:213
+msgid "There are no configured servers"
+msgstr "没有配置好的服务器"
+
+#: setup/frames/index.inc.php:143 setup/lib/messages.inc.php:212
+msgid "New server"
+msgstr "新建服务器"
+
+#: setup/frames/index.inc.php:172 setup/lib/messages.inc.php:50
+msgid "Default language"
+msgstr "默认语言"
+
+#: setup/frames/index.inc.php:182 setup/lib/messages.inc.php:187
+msgid "let the user choose"
+msgstr "让用户选择"
+
+#: setup/frames/index.inc.php:193 setup/lib/messages.inc.php:216
+msgid "- none -"
+msgstr "- 无 -"
+
+#: setup/frames/index.inc.php:196 setup/lib/messages.inc.php:51
+msgid "Default server"
+msgstr "默认服务器"
+
+#: setup/frames/index.inc.php:206 setup/lib/messages.inc.php:66
+msgid "End of line"
+msgstr "换行符"
+
+#: setup/frames/index.inc.php:211 setup/lib/messages.inc.php:61
+msgid "Display"
+msgstr "显示"
+
+#: setup/frames/index.inc.php:215 setup/lib/messages.inc.php:190
+msgid "Load"
+msgstr "加载"
+
+#: setup/frames/index.inc.php:226 setup/lib/messages.inc.php:152
+msgid "phpMyAdmin homepage"
+msgstr "phpMyAdmin 主页 (外链,英文)"
+
+#: setup/frames/index.inc.php:227 setup/lib/messages.inc.php:64
+msgid "Donate"
+msgstr "捐助 (外链,英文)"
+
+#: setup/frames/index.inc.php:228 setup/lib/messages.inc.php:370
+msgid "Check for latest version"
+msgstr "检查更新"
+
+#: setup/frames/menu.inc.php:18 setup/lib/messages.inc.php:137
+msgid "Features"
+msgstr "功能"
+
+#: setup/frames/menu.inc.php:19 setup/lib/messages.inc.php:113
+msgid "Navigation frame"
+msgstr "导航框架"
+
+#: setup/frames/menu.inc.php:20 setup/lib/messages.inc.php:118
+msgid "Main frame"
+msgstr "主框架"
+
+#: setup/frames/servers.inc.php:28 setup/lib/messages.inc.php:272
+msgid "Edit server"
+msgstr "编辑服务器"
+
+#: setup/frames/servers.inc.php:37 setup/lib/messages.inc.php:241
+msgid "Add a new server"
+msgstr "添加服务器"
+
+#: setup/lib/FormDisplay.tpl.php:182 setup/lib/messages.inc.php:328
+#, php-format
+msgid "Set value: %s"
+msgstr "设置值: %s"
+
+#: setup/lib/FormDisplay.tpl.php:187 setup/lib/messages.inc.php:234
+msgid "Restore default value"
+msgstr "还原默认值"
+
+#: setup/lib/form_processing.lib.php:43 setup/lib/messages.inc.php:377
+msgid "Warning"
+msgstr "警告"
+
 #: setup/lib/messages.inc.php:16
 msgid "Allow character set conversion"
 msgstr "允许转换字符集"
@@ -6845,10 +6939,6 @@ msgstr ""
 msgid "Compress on the fly"
 msgstr "实时压缩"
 
-#: setup/lib/messages.inc.php:45
-msgid "Configuration file"
-msgstr "配置文件"
-
 #: setup/lib/messages.inc.php:46
 msgid ""
 "Whether a warning ("Are your really sure...") should be displayed "
@@ -6867,14 +6957,6 @@ msgstr "转换时的默认字符集"
 msgid "Default character set"
 msgstr "默认字符集"
 
-#: setup/lib/messages.inc.php:50
-msgid "Default language"
-msgstr "默认语言"
-
-#: setup/lib/messages.inc.php:51
-msgid "Default server"
-msgstr "默认服务器"
-
 #: setup/lib/messages.inc.php:52
 msgid "Tab that is displayed when entering a database"
 msgstr "在进入数据库标签时默认显示的页面"
@@ -6915,10 +6997,6 @@ msgstr "直接显示数据库列表而不使用下拉框"
 msgid "Display databases as a list"
 msgstr "显示数据库为列表"
 
-#: setup/lib/messages.inc.php:61
-msgid "Display"
-msgstr "显示"
-
 #: setup/lib/messages.inc.php:62
 msgid "Show server listing as a list instead of a drop down"
 msgstr "直接显示服务器列表而不使用下拉框"
@@ -6927,18 +7005,6 @@ msgstr "直接显示服务器列表而不使用下拉框"
 msgid "Display servers as a list"
 msgstr "显示服务器为列表"
 
-#: setup/lib/messages.inc.php:64
-msgid "Donate"
-msgstr "捐助 (外链,英文)"
-
-#: setup/lib/messages.inc.php:65
-msgid "Download"
-msgstr "下载"
-
-#: setup/lib/messages.inc.php:66
-msgid "End of line"
-msgstr "换行符"
-
 #: setup/lib/messages.inc.php:67
 msgid "Could not connect to MySQL server"
 msgstr "无法连接到 MySQL 服务器"
@@ -7115,10 +7181,6 @@ msgstr "数据库显示选项"
 msgid "Customize appearance of the navigation frame"
 msgstr "自定义导航框架"
 
-#: setup/lib/messages.inc.php:113
-msgid "Navigation frame"
-msgstr "导航框架"
-
 #: setup/lib/messages.inc.php:114
 msgid "Servers display options"
 msgstr "服务器显示选项"
@@ -7127,10 +7189,6 @@ msgstr "服务器显示选项"
 msgid "Tables display options"
 msgstr "数据表显示选项"
 
-#: setup/lib/messages.inc.php:118
-msgid "Main frame"
-msgstr "主框架"
-
 #: setup/lib/messages.inc.php:119
 msgid "Settings that didn't fit enywhere else"
 msgstr "其他设置"
@@ -7208,10 +7266,6 @@ msgstr "自定义"
 msgid "Customize export options"
 msgstr "自定义导出选项"
 
-#: setup/lib/messages.inc.php:137
-msgid "Features"
-msgstr "功能"
-
 #: setup/lib/messages.inc.php:138
 msgid "Customize import defaults"
 msgstr "自定义导入选项"
@@ -7282,10 +7336,6 @@ msgstr ""
 "此系统目前不支持 [a@?page=form&formset=features#tab_Import_export]GZip 压"
 "缩和解压缩[/a]所必须的 (%s) 函数。"
 
-#: setup/lib/messages.inc.php:152
-msgid "phpMyAdmin homepage"
-msgstr "phpMyAdmin 主页 (外链,英文)"
-
 #: setup/lib/messages.inc.php:153
 msgid "Extra parameters for iconv"
 msgstr "iconv 的额外参数"
@@ -7334,12 +7384,6 @@ msgstr "部分导入:跳过查询"
 msgid "Insecure connection"
 msgstr "非安全连接"
 
-#: setup/lib/messages.inc.php:164
-msgid ""
-"You are not using a secure connection; all data (including potentially "
-"sensitive information, like passwords) is transferred unencrypted!"
-msgstr "你现在没有使用安全连接,所有数据(包括敏感信息,如密码)均为明文传输!"
-
 #: setup/lib/messages.inc.php:165
 #, php-format
 msgid ""
@@ -7435,10 +7479,6 @@ msgstr "高亮显示鼠标所在位置的服务器"
 msgid "Enable highlighting"
 msgstr "启用高亮"
 
-#: setup/lib/messages.inc.php:187
-msgid "let the user choose"
-msgstr "让用户选择"
-
 #: setup/lib/messages.inc.php:188
 msgid "Use less graphically intense tabs"
 msgstr "不在标签上使用背景"
@@ -7447,10 +7487,6 @@ msgstr "不在标签上使用背景"
 msgid "Light tabs"
 msgstr "简化标签"
 
-#: setup/lib/messages.inc.php:190
-msgid "Load"
-msgstr "加载"
-
 #: setup/lib/messages.inc.php:191
 msgid ""
 "If TRUE, logout deletes cookies for all servers; when set to FALSE, logout "
@@ -7561,14 +7597,6 @@ msgstr "仅使用图标、文本或都使用"
 msgid "Iconic navigation bar"
 msgstr "导航条显示"
 
-#: setup/lib/messages.inc.php:212
-msgid "New server"
-msgstr "新建服务器"
-
-#: setup/lib/messages.inc.php:213
-msgid "There are no configured servers"
-msgstr "没有配置好的服务器"
-
 #: setup/lib/messages.inc.php:214
 msgid "use GZip output buffering for increased speed in HTTP transfers"
 msgstr "使用 GZip 输出缓冲以加快 HTTP 传输速度"
@@ -7577,10 +7605,6 @@ msgstr "使用 GZip 输出缓冲以加快 HTTP 传输速度"
 msgid "GZip output buffering"
 msgstr "GZip 输出缓冲"
 
-#: setup/lib/messages.inc.php:216
-msgid "- none -"
-msgstr "- 无 -"
-
 #: setup/lib/messages.inc.php:217
 msgid ""
 "[kbd]SMART[/kbd] - i.e. descending order for fields of type TIME, DATE, "
@@ -7593,10 +7617,6 @@ msgstr ""
 msgid "Default sorting order"
 msgstr "默认排序"
 
-#: setup/lib/messages.inc.php:219
-msgid "Overview"
-msgstr "概要"
-
 #: setup/lib/messages.inc.php:220
 msgid "Use persistent connections to MySQL databases"
 msgstr "在连接到 MySQL 数据库时使用持久连接"
@@ -7653,10 +7673,6 @@ msgstr "选择进行字符集转换时使用的函数"
 msgid "Recoding engine"
 msgstr "记录引擎"
 
-#: setup/lib/messages.inc.php:234
-msgid "Restore default value"
-msgstr "还原默认值"
-
 #: setup/lib/messages.inc.php:235
 msgid "Try to revert erroneous fields to their default values"
 msgstr "尝试恢复错误参数为默认值"
@@ -7692,10 +7708,6 @@ msgstr "您可以使用 mysqli 以获得更高的性能"
 msgid "You
 allow for connecting to the server without a password."
 msgstr "该服务器现在允许空密码登录。"
 
-#: setup/lib/messages.inc.php:241
-msgid "Add a new server"
-msgstr "添加服务器"
-
 #: setup/lib/messages.inc.php:242
 msgid "Leave blank if not used"
 msgstr "不使用请留空"
@@ -7849,10 +7861,6 @@ msgstr ""
 "formset=features#tab_Security]可信代理表[/a]。但如果您和许多人使用同一个IP地"
 "址,该措施的安全性将下降。"
 
-#: setup/lib/messages.inc.php:272
-msgid "Edit server"
-msgstr "编辑服务器"
-
 #: setup/lib/messages.inc.php:273
 msgid "What PHP extension to use; you should use mysqli if supported"
 msgstr "要使用的 PHP 扩展,如果支持,推荐使用 mysqli。"
@@ -8103,11 +8111,6 @@ msgstr "一个好记的名字。留空将显示主机名。"
 msgid "Verbose name of this server"
 msgstr "服务器名称"
 
-#: setup/lib/messages.inc.php:328
-#, php-format
-msgid "Set value: %s"
-msgstr "设置值: %s"
-
 #: setup/lib/messages.inc.php:329
 msgid ""
 "Whether a user should be displayed a "show all (records)" button"
@@ -8146,10 +8149,6 @@ msgstr "在编辑/插入模式中显示函数列"
 msgid "Show function fields"
 msgstr "显示函数列"
 
-#: setup/lib/messages.inc.php:337
-msgid "Show hidden messages (#MSG_COUNT)"
-msgstr "显示隐藏信息 (#MSG_COUNT)"
-
 #: setup/lib/messages.inc.php:338
 msgid ""
 "Shows link to [a at http://php.net/manual/function.phpinfo.php]phpinfo()[/a] "
@@ -8289,10 +8288,6 @@ msgstr "读取版本信息失败。您可能尚未接入网络或更新服务器
 msgid "Got invalid version string from server"
 msgstr "从服务器获得版本错误"
 
-#: setup/lib/messages.inc.php:370
-msgid "Check for latest version"
-msgstr "检查更新"
-
 #: setup/lib/messages.inc.php:371
 #, php-format
 msgid ""
@@ -8326,10 +8321,6 @@ msgid ""
 "Neither URL wrapper nor CURL is available. Version check is not possible."
 msgstr "URL 协议和 CURL 都不可用,无法检查新版本。"
 
-#: setup/lib/messages.inc.php:377
-msgid "Warning"
-msgstr "警告"
-
 #: setup/lib/messages.inc.php:378
 msgid ""
 "Enable [a at http://en.wikipedia.org/wiki/ZIP_(file_format)]ZIP[/a] compression "
@@ -8386,3 +8377,15 @@ msgstr "在第 %s 个字段创建索引"
 msgctxt "for MIME transformation"
 msgid "Description"
 msgstr "说明"
+
+#, fuzzy
+#~| msgid ""
+#~| "However on last run no data has been parsed, this usually means "
+#~| "phpMyAdmin won't be able to finish this import unless you increase php "
+#~| "time limits."
+#~ msgid ""
+#~ "However on last run no data has been parsed, this usually means "
+#~ "phpMyAdmin won"
+#~ msgstr ""
+#~ "在最后一次执行时没有数据被解析,建议您增加 PHP 运行时间限制,否则 "
+#~ "phpMyAdmin 将无法完成导入操作。"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index b1b3d01..83d5dcf 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-14 07:48-0400\n"
+"POT-Creation-Date: 2010-05-14 13:39-0400\n"
 "PO-Revision-Date: 2010-03-12 09:15+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: chinese_traditional <zh_TW at li.org>\n"
@@ -935,10 +935,10 @@ msgid ""
 "file and import will resume."
 msgstr ""
 
-#: import.php:426
+#: import.php:426 libraries/messages.inc.php:1102
 msgid ""
 "However on last run no data has been parsed, this usually means phpMyAdmin "
-"won"
+"won't be able to finish this import unless you increase php time limits."
 msgstr ""
 
 #: index.php:190 libraries/messages.inc.php:549
@@ -6166,12 +6166,6 @@ msgstr "線程"
 msgid "Thread %s was successfully killed."
 msgstr "指令 %s 已成功中止."
 
-#: libraries/messages.inc.php:1102
-msgid ""
-"However on last run no data has been parsed, this usually means phpMyAdmin "
-"won't be able to finish this import unless you increase php time limits."
-msgstr ""
-
 #: libraries/messages.inc.php:1105 pmd_pdf.php:94
 msgid "to/from page"
 msgstr ""
@@ -6616,7 +6610,8 @@ msgstr "不適用"
 msgid "Filter"
 msgstr ""
 
-#: navigation.php:319 setup/lib/messages.inc.php:42
+#: navigation.php:319 setup/frames/index.inc.php:218
+#: setup/lib/messages.inc.php:42
 #, fuzzy
 msgid "Clear"
 msgstr "日曆"
@@ -6704,6 +6699,115 @@ msgstr "最大連線數目"
 msgid "Configuration: %s"
 msgstr ""
 
+#: setup/frames/config.inc.php:25 setup/frames/index.inc.php:152
+#: setup/lib/messages.inc.php:45
+msgid "Configuration file"
+msgstr ""
+
+#: setup/frames/config.inc.php:38 setup/frames/index.inc.php:212
+#: setup/lib/messages.inc.php:65
+msgid "Download"
+msgstr ""
+
+#: setup/frames/index.inc.php:58 setup/lib/messages.inc.php:164
+msgid ""
+"You are not using a secure connection; all data (including potentially "
+"sensitive information, like passwords) is transferred unencrypted!"
+msgstr ""
+
+#: setup/frames/index.inc.php:87 setup/frames/menu.inc.php:17
+#: setup/lib/messages.inc.php:219
+msgid "Overview"
+msgstr ""
+
+#: setup/frames/index.inc.php:95 setup/lib/messages.inc.php:337
+msgid "Show hidden messages (#MSG_COUNT)"
+msgstr ""
+
+#: setup/frames/index.inc.php:135 setup/lib/messages.inc.php:213
+msgid "There are no configured servers"
+msgstr ""
+
+#: setup/frames/index.inc.php:143 setup/lib/messages.inc.php:212
+msgid "New server"
+msgstr ""
+
+#: setup/frames/index.inc.php:172 setup/lib/messages.inc.php:50
+msgid "Default language"
+msgstr ""
+
+#: setup/frames/index.inc.php:182 setup/lib/messages.inc.php:187
+msgid "let the user choose"
+msgstr ""
+
+#: setup/frames/index.inc.php:193 setup/lib/messages.inc.php:216
+msgid "- none -"
+msgstr ""
+
+#: setup/frames/index.inc.php:196 setup/lib/messages.inc.php:51
+msgid "Default server"
+msgstr ""
+
+#: setup/frames/index.inc.php:206 setup/lib/messages.inc.php:66
+msgid "End of line"
+msgstr ""
+
+#: setup/frames/index.inc.php:211 setup/lib/messages.inc.php:61
+msgid "Display"
+msgstr ""
+
+#: setup/frames/index.inc.php:215 setup/lib/messages.inc.php:190
+#, fuzzy
+msgid "Load"
+msgstr "本地"
+
+#: setup/frames/index.inc.php:226 setup/lib/messages.inc.php:152
+#, fuzzy
+msgid "phpMyAdmin homepage"
+msgstr "phpMyAdmin 說明文件"
+
+#: setup/frames/index.inc.php:227 setup/lib/messages.inc.php:64
+msgid "Donate"
+msgstr ""
+
+#: setup/frames/index.inc.php:228 setup/lib/messages.inc.php:370
+msgid "Check for latest version"
+msgstr ""
+
+#: setup/frames/menu.inc.php:18 setup/lib/messages.inc.php:137
+msgid "Features"
+msgstr ""
+
+#: setup/frames/menu.inc.php:19 setup/lib/messages.inc.php:113
+msgid "Navigation frame"
+msgstr ""
+
+#: setup/frames/menu.inc.php:20 setup/lib/messages.inc.php:118
+msgid "Main frame"
+msgstr ""
+
+#: setup/frames/servers.inc.php:28 setup/lib/messages.inc.php:272
+msgid "Edit server"
+msgstr ""
+
+#: setup/frames/servers.inc.php:37 setup/lib/messages.inc.php:241
+#, fuzzy
+msgid "Add a new server"
+msgstr "新增使用者"
+
+#: setup/lib/FormDisplay.tpl.php:182 setup/lib/messages.inc.php:328
+#, php-format
+msgid "Set value: %s"
+msgstr ""
+
+#: setup/lib/FormDisplay.tpl.php:187 setup/lib/messages.inc.php:234
+msgid "Restore default value"
+msgstr ""
+
+#: setup/lib/form_processing.lib.php:43 setup/lib/messages.inc.php:377
+msgid "Warning"
+msgstr ""
+
 #: setup/lib/messages.inc.php:16
 msgid "Allow character set conversion"
 msgstr ""
@@ -6843,10 +6947,6 @@ msgstr ""
 msgid "Compress on the fly"
 msgstr ""
 
-#: setup/lib/messages.inc.php:45
-msgid "Configuration file"
-msgstr ""
-
 #: setup/lib/messages.inc.php:46
 msgid ""
 "Whether a warning ("Are your really sure...") should be displayed "
@@ -6865,14 +6965,6 @@ msgstr ""
 msgid "Default character set"
 msgstr ""
 
-#: setup/lib/messages.inc.php:50
-msgid "Default language"
-msgstr ""
-
-#: setup/lib/messages.inc.php:51
-msgid "Default server"
-msgstr ""
-
 #: setup/lib/messages.inc.php:52
 msgid "Tab that is displayed when entering a database"
 msgstr ""
@@ -6912,10 +7004,6 @@ msgstr ""
 msgid "Display databases as a list"
 msgstr ""
 
-#: setup/lib/messages.inc.php:61
-msgid "Display"
-msgstr ""
-
 #: setup/lib/messages.inc.php:62
 msgid "Show server listing as a list instead of a drop down"
 msgstr ""
@@ -6924,18 +7012,6 @@ msgstr ""
 msgid "Display servers as a list"
 msgstr ""
 
-#: setup/lib/messages.inc.php:64
-msgid "Donate"
-msgstr ""
-
-#: setup/lib/messages.inc.php:65
-msgid "Download"
-msgstr ""
-
-#: setup/lib/messages.inc.php:66
-msgid "End of line"
-msgstr ""
-
 #: setup/lib/messages.inc.php:67
 msgid "Could not connect to MySQL server"
 msgstr ""
@@ -7115,10 +7191,6 @@ msgstr "資料庫輸出選項"
 msgid "Customize appearance of the navigation frame"
 msgstr ""
 
-#: setup/lib/messages.inc.php:113
-msgid "Navigation frame"
-msgstr ""
-
 #: setup/lib/messages.inc.php:114
 msgid "Servers display options"
 msgstr ""
@@ -7127,10 +7199,6 @@ msgstr ""
 msgid "Tables display options"
 msgstr ""
 
-#: setup/lib/messages.inc.php:118
-msgid "Main frame"
-msgstr ""
-
 #: setup/lib/messages.inc.php:119
 msgid "Settings that didn't fit enywhere else"
 msgstr ""
@@ -7208,10 +7276,6 @@ msgstr ""
 msgid "Customize export options"
 msgstr "資料庫輸出選項"
 
-#: setup/lib/messages.inc.php:137
-msgid "Features"
-msgstr ""
-
 #: setup/lib/messages.inc.php:138
 msgid "Customize import defaults"
 msgstr ""
@@ -7280,11 +7344,6 @@ msgid ""
 "system."
 msgstr ""
 
-#: setup/lib/messages.inc.php:152
-#, fuzzy
-msgid "phpMyAdmin homepage"
-msgstr "phpMyAdmin 說明文件"
-
 #: setup/lib/messages.inc.php:153
 msgid "Extra parameters for iconv"
 msgstr ""
@@ -7328,12 +7387,6 @@ msgstr ""
 msgid "Insecure connection"
 msgstr ""
 
-#: setup/lib/messages.inc.php:164
-msgid ""
-"You are not using a secure connection; all data (including potentially "
-"sensitive information, like passwords) is transferred unencrypted!"
-msgstr ""
-
 #: setup/lib/messages.inc.php:165
 #, php-format
 msgid ""
@@ -7430,10 +7483,6 @@ msgstr ""
 msgid "Enable highlighting"
 msgstr ""
 
-#: setup/lib/messages.inc.php:187
-msgid "let the user choose"
-msgstr ""
-
 #: setup/lib/messages.inc.php:188
 msgid "Use less graphically intense tabs"
 msgstr ""
@@ -7442,11 +7491,6 @@ msgstr ""
 msgid "Light tabs"
 msgstr ""
 
-#: setup/lib/messages.inc.php:190
-#, fuzzy
-msgid "Load"
-msgstr "本地"
-
 #: setup/lib/messages.inc.php:191
 msgid ""
 "If TRUE, logout deletes cookies for all servers; when set to FALSE, logout "
@@ -7549,14 +7593,6 @@ msgstr ""
 msgid "Iconic navigation bar"
 msgstr ""
 
-#: setup/lib/messages.inc.php:212
-msgid "New server"
-msgstr ""
-
-#: setup/lib/messages.inc.php:213
-msgid "There are no configured servers"
-msgstr ""
-
 #: setup/lib/messages.inc.php:214
 msgid "use GZip output buffering for increased speed in HTTP transfers"
 msgstr ""
@@ -7565,10 +7601,6 @@ msgstr ""
 msgid "GZip output buffering"
 msgstr ""
 
-#: setup/lib/messages.inc.php:216
-msgid "- none -"
-msgstr ""
-
 #: setup/lib/messages.inc.php:217
 msgid ""
 "[kbd]SMART[/kbd] - i.e. descending order for fields of type TIME, DATE, "
@@ -7579,10 +7611,6 @@ msgstr ""
 msgid "Default sorting order"
 msgstr ""
 
-#: setup/lib/messages.inc.php:219
-msgid "Overview"
-msgstr ""
-
 #: setup/lib/messages.inc.php:220
 msgid "Use persistent connections to MySQL databases"
 msgstr ""
@@ -7637,10 +7665,6 @@ msgstr ""
 msgid "Recoding engine"
 msgstr ""
 
-#: setup/lib/messages.inc.php:234
-msgid "Restore default value"
-msgstr ""
-
 #: setup/lib/messages.inc.php:235
 msgid "Try to revert erroneous fields to their default values"
 msgstr ""
@@ -7672,11 +7696,6 @@ msgstr ""
 msgid "You allow for connecting to the server without a password."
 msgstr ""
 
-#: setup/lib/messages.inc.php:241
-#, fuzzy
-msgid "Add a new server"
-msgstr "新增使用者"
-
 #: setup/lib/messages.inc.php:242
 msgid "Leave blank if not used"
 msgstr ""
@@ -7820,10 +7839,6 @@ msgid ""
 "to."
 msgstr ""
 
-#: setup/lib/messages.inc.php:272
-msgid "Edit server"
-msgstr ""
-
 #: setup/lib/messages.inc.php:273
 msgid "What PHP extension to use; you should use mysqli if supported"
 msgstr ""
@@ -8074,11 +8089,6 @@ msgstr ""
 msgid "Verbose name of this server"
 msgstr ""
 
-#: setup/lib/messages.inc.php:328
-#, php-format
-msgid "Set value: %s"
-msgstr ""
-
 #: setup/lib/messages.inc.php:329
 msgid ""
 "Whether a user should be displayed a "show all (records)" button"
@@ -8116,10 +8126,6 @@ msgstr ""
 msgid "Show function fields"
 msgstr ""
 
-#: setup/lib/messages.inc.php:337
-msgid "Show hidden messages (#MSG_COUNT)"
-msgstr ""
-
 #: setup/lib/messages.inc.php:338
 msgid ""
 "Shows link to [a at http://php.net/manual/function.phpinfo.php]phpinfo()[/a] "
@@ -8252,10 +8258,6 @@ msgstr ""
 msgid "Got invalid version string from server"
 msgstr ""
 
-#: setup/lib/messages.inc.php:370
-msgid "Check for latest version"
-msgstr ""
-
 #: setup/lib/messages.inc.php:371
 #, php-format
 msgid ""
@@ -8287,10 +8289,6 @@ msgid ""
 "Neither URL wrapper nor CURL is available. Version check is not possible."
 msgstr ""
 
-#: setup/lib/messages.inc.php:377
-msgid "Warning"
-msgstr ""
-
 #: setup/lib/messages.inc.php:378
 msgid ""
 "Enable [a at http://en.wikipedia.org/wiki/ZIP_(file_format)]ZIP[/a] compression "


hooks/post-receive
-- 
phpMyAdmin




More information about the Git mailing list