diff --git a/ChangeLog b/ChangeLog index bd423ebf52..f9ec21d789 100644 --- a/ChangeLog +++ b/ChangeLog @@ -49,6 +49,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA + [lang] Turkish update, thanks to Burak Yavuz + rfe #2963310 [interface] Focus TEXTAREA "sql_query" on click on "SQL" link + [lang] Uzbek update, thanks to Orzu Samarqandiy ++ rfe #2958013 [import] After import, also list uploaded filename, thanks + to Pavel Konnikov and Herman van Rink 3.3.2.0 (not yet released) - patch #2969449 [core] Name for MERGE engine varies depending on the @@ -57,6 +59,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA - bug #2967366 [Structure] Some results of Propose table structure are shown in hex - bug #2967565 [insert] UNHEX not selected by default when inserting BINARY +- [navi] Changed link to git repository on main page +- bug #2972232 [menu] Import menu tab not present on main page 3.3.1.0 (2010-03-16) - bug #2941037 [core] Database structure not sorted by table correctly @@ -69,6 +73,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA thanks to Dieter Adriaenssens - ruleant - bug #2961198 [parser] Querying a table named "data" - bug #2931429 [structure] Editing long triggers +- bug #2970769 [structure] Incorrect reference to mootools-more.js 3.3.0.0 (2010-03-07) + rfe #2308632 [edit] Use hex for (var)binary fields, diff --git a/Documentation.html b/Documentation.html index bb1c27d96c..4c5157ddeb 100644 --- a/Documentation.html +++ b/Documentation.html @@ -1115,7 +1115,7 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE $cfg['Servers'][$i]['tracking_version_drop_view'] boolean
- Whether a DROP VIEW IF EXISTS statement will added as first line to the log when creating a view. Default value is true. + Whether a DROP VIEW IF EXISTS statement will be added as first line to the log when creating a view. Default value is true.

@@ -1124,7 +1124,7 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE $cfg['Servers'][$i]['tracking_version_drop_table'] boolean
- Whether a DROP TABLE IF EXISTS statement will added as first line to the log when creating a table. Default value is true. + Whether a DROP TABLE IF EXISTS statement will be added as first line to the log when creating a table. Default value is true.

@@ -1132,7 +1132,7 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE $cfg['Servers'][$i]['tracking_version_drop_database'] boolean
- Whether a DROP DATABASE IF EXISTS statement will added as first line to the log when creating a database. Default value is true. + Whether a DROP DATABASE IF EXISTS statement will be added as first line to the log when creating a database. Default value is true.

diff --git a/import.php b/import.php index 7aa6088fb9..7f06ceb74e 100644 --- a/import.php +++ b/import.php @@ -411,9 +411,11 @@ if (!empty($id_bookmark) && $action_bookmark == 2) { $message->addParam($executed_queries); $message->addString($import_notice); + $message->addString('(' . $_FILES['import_file']['name'] . ')'); } else { $message = PMA_Message::success('strImportSuccessfullyFinished'); $message->addParam($executed_queries); + $message->addString('(' . $_FILES['import_file']['name'] . ')'); } } } diff --git a/libraries/config.default.php b/libraries/config.default.php index 3f56bd1d4d..653fc53a1f 100644 --- a/libraries/config.default.php +++ b/libraries/config.default.php @@ -446,7 +446,7 @@ $cfg['Servers'][$i]['tracking_default_statements'] = 'CREATE TABLE,ALTER TABLE,D 'CREATE DATABASE,ALTER DATABASE,DROP DATABASE'; /** - * Whether a DROP VIEW IF EXISTS statement will added as first line to the log when creating a view. + * Whether a DROP VIEW IF EXISTS statement will be added as first line to the log when creating a view. * * @global bool $cfg['Servers'][$i]['tracking_add_drop_view'] */ @@ -454,7 +454,7 @@ $cfg['Servers'][$i]['tracking_default_statements'] = 'CREATE TABLE,ALTER TABLE,D $cfg['Servers'][$i]['tracking_add_drop_view'] = true; /** - * Whether a DROP TABLE IF EXISTS statement will added as first line to the log when creating a table. + * Whether a DROP TABLE IF EXISTS statement will be added as first line to the log when creating a table. * * @global bool $cfg['Servers'][$i]['tracking_add_drop_table'] */ @@ -462,7 +462,7 @@ $cfg['Servers'][$i]['tracking_add_drop_view'] = true; $cfg['Servers'][$i]['tracking_add_drop_table'] = true; /** - * Whether a DROP DATABASE IF EXISTS statement will added as first line to the log when creating a database. + * Whether a DROP DATABASE IF EXISTS statement will be added as first line to the log when creating a database. * * @global bool $cfg['Servers'][$i]['tracking_add_drop_database'] */ @@ -470,7 +470,7 @@ $cfg['Servers'][$i]['tracking_add_drop_table'] = true; $cfg['Servers'][$i]['tracking_add_drop_database'] = true; /** - * Whether a DROP DATABASE IF EXISTS statement will added as first line to the log when creating a database. + * Whether a DROP DATABASE IF EXISTS statement will be added as first line to the log when creating a database. * * @global bool $cfg['Servers'][$i]['tracking_version_drop_database'] */ diff --git a/libraries/server_links.inc.php b/libraries/server_links.inc.php index 1366baa7bd..40479d2c45 100644 --- a/libraries/server_links.inc.php +++ b/libraries/server_links.inc.php @@ -87,9 +87,9 @@ $tabs['import']['icon'] = 'b_import.png'; $tabs['import']['link'] = 'server_import.php'; $tabs['import']['text'] = $strImport; -$tabs['import']['icon'] = 's_sync.png'; -$tabs['import']['link'] = 'server_synchronize.php'; -$tabs['import']['text'] = $strSynchronize; +$tabs['synchronize']['icon'] = 's_sync.png'; +$tabs['synchronize']['link'] = 'server_synchronize.php'; +$tabs['synchronize']['text'] = $strSynchronize; echo PMA_generate_html_tabs($tabs, array()); unset($tabs); diff --git a/main.php b/main.php index 7f6ba61e33..ef9c6b588b 100644 --- a/main.php +++ b/main.php @@ -239,8 +239,8 @@ PMA_printListItem($strHomepageOfficial, 'li_pma_homepage', 'http://www.phpMyAdmi ?>
  • [ChangeLog] - [Subversion] + [Git] [Lists] diff --git a/po/af.po b/po/af.po index e98437ea1a..0778890275 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@lists.sourceforge.net\n" -"POT-Creation-Date: 2010-03-12 09:48+0100\n" +"POT-Creation-Date: 2010-03-19 00:28+0100\n" "PO-Revision-Date: 2010-03-12 09:11+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: afrikaans \n" diff --git a/po/ar.po b/po/ar.po index 8841edd8c5..06f29cbc91 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@lists.sourceforge.net\n" -"POT-Creation-Date: 2010-03-12 09:48+0100\n" +"POT-Creation-Date: 2010-03-19 00:28+0100\n" "PO-Revision-Date: 2010-03-12 09:11+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: arabic \n" diff --git a/po/az.po b/po/az.po index dc78413ca9..cc49af5210 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@lists.sourceforge.net\n" -"POT-Creation-Date: 2010-03-12 09:48+0100\n" +"POT-Creation-Date: 2010-03-19 00:28+0100\n" "PO-Revision-Date: 2010-03-12 09:11+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: azerbaijani \n" diff --git a/po/be.po b/po/be.po index cdb519b95f..4a5450a39d 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@lists.sourceforge.net\n" -"POT-Creation-Date: 2010-03-12 09:48+0100\n" +"POT-Creation-Date: 2010-03-19 00:28+0100\n" "PO-Revision-Date: 2010-03-12 09:12+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: belarusian_cyrillic \n" diff --git a/po/be@latin.po b/po/be@latin.po index bca822016b..1ad797b3a8 100644 --- a/po/be@latin.po +++ b/po/be@latin.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2010-03-12 09:48+0100\n" +"POT-Creation-Date: 2010-03-19 00:28+0100\n" "PO-Revision-Date: 2010-03-12 09:12+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: belarusian_latin \n" diff --git a/po/bg.po b/po/bg.po index 2233220e64..c39fc8bc2b 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@lists.sourceforge.net\n" -"POT-Creation-Date: 2010-03-12 09:48+0100\n" +"POT-Creation-Date: 2010-03-19 00:28+0100\n" "PO-Revision-Date: 2010-03-12 09:12+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: bulgarian \n" diff --git a/po/bn.po b/po/bn.po index 03a673d071..61e782bf9b 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@lists.sourceforge.net\n" -"POT-Creation-Date: 2010-03-12 09:48+0100\n" +"POT-Creation-Date: 2010-03-19 00:28+0100\n" "PO-Revision-Date: 2010-03-12 09:11+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: bangla \n" diff --git a/po/bs.po b/po/bs.po index bf25893ffe..eadc1bbc1c 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@lists.sourceforge.net\n" -"POT-Creation-Date: 2010-03-12 09:48+0100\n" +"POT-Creation-Date: 2010-03-19 00:28+0100\n" "PO-Revision-Date: 2010-03-12 09:12+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: bosnian \n" diff --git a/po/ca.po b/po/ca.po index c0628f291e..fb755c3eba 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@lists.sourceforge.net\n" -"POT-Creation-Date: 2010-03-12 09:48+0100\n" +"POT-Creation-Date: 2010-03-19 00:28+0100\n" "PO-Revision-Date: 2010-03-12 09:13+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: catalan \n" diff --git a/po/cs.po b/po/cs.po index f8cc01426a..2fbbe24b7c 100644 --- a/po/cs.po +++ b/po/cs.po @@ -3,14 +3,14 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2010-03-12 09:48+0100\n" +"POT-Creation-Date: 2010-03-19 00:28+0100\n" "PO-Revision-Date: 2010-03-19 01:24+0200\n" "Last-Translator: Michal \n" "Language-Team: czech \n" -"Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: cs\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" "X-Generator: Pootle 2.0.1\n" diff --git a/po/da.po b/po/da.po index 650bbc4e93..b7d933743c 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@lists.sourceforge.net\n" -"POT-Creation-Date: 2010-03-12 09:48+0100\n" +"POT-Creation-Date: 2010-03-19 00:28+0100\n" "PO-Revision-Date: 2010-03-12 09:13+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: danish \n" diff --git a/po/de.po b/po/de.po index 947dbb2742..741b7a5b1b 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@lists.sourceforge.net\n" -"POT-Creation-Date: 2010-03-12 09:48+0100\n" +"POT-Creation-Date: 2010-03-19 00:28+0100\n" "PO-Revision-Date: 2010-03-12 11:16+0200\n" "Last-Translator: Michal \n" "Language-Team: german \n" diff --git a/po/el.po b/po/el.po index d3f6b67f52..d53fa27c74 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@lists.sourceforge.net\n" -"POT-Creation-Date: 2010-03-12 09:48+0100\n" +"POT-Creation-Date: 2010-03-19 00:28+0100\n" "PO-Revision-Date: 2010-03-12 09:14+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: greek \n" diff --git a/po/en_GB.po b/po/en_GB.po index 2e76dc0c38..e38c7459c0 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@lists.sourceforge.net\n" -"POT-Creation-Date: 2010-03-12 09:48+0100\n" +"POT-Creation-Date: 2010-03-19 00:28+0100\n" "PO-Revision-Date: 2010-03-12 11:13+0200\n" "Last-Translator: Michal \n" "Language-Team: english-gb \n" diff --git a/po/es.po b/po/es.po index 5fdbaa44cd..5a81a8ac08 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@lists.sourceforge.net\n" -"POT-Creation-Date: 2010-03-12 09:48+0100\n" +"POT-Creation-Date: 2010-03-19 00:28+0100\n" "PO-Revision-Date: 2010-03-12 11:23+0200\n" "Last-Translator: Michal \n" "Language-Team: spanish \n" diff --git a/po/et.po b/po/et.po index e4156672e1..7e65148393 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@lists.sourceforge.net\n" -"POT-Creation-Date: 2010-03-12 09:48+0100\n" +"POT-Creation-Date: 2010-03-19 00:28+0100\n" "PO-Revision-Date: 2010-03-12 09:14+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: estonian \n" diff --git a/po/eu.po b/po/eu.po index 8c46e06f30..dd765ac6ce 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@lists.sourceforge.net\n" -"POT-Creation-Date: 2010-03-12 09:48+0100\n" +"POT-Creation-Date: 2010-03-19 00:28+0100\n" "PO-Revision-Date: 2010-03-12 09:12+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: basque \n" diff --git a/po/fa.po b/po/fa.po index 38b5839fd4..52628541a2 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@lists.sourceforge.net\n" -"POT-Creation-Date: 2010-03-12 09:48+0100\n" +"POT-Creation-Date: 2010-03-19 00:28+0100\n" "PO-Revision-Date: 2010-03-12 09:17+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: persian \n" diff --git a/po/fi.po b/po/fi.po index d9795f1778..8c9fb5f352 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@lists.sourceforge.net\n" -"POT-Creation-Date: 2010-03-12 09:48+0100\n" +"POT-Creation-Date: 2010-03-19 00:28+0100\n" "PO-Revision-Date: 2010-03-12 09:14+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: finnish \n" diff --git a/po/fr.po b/po/fr.po index 41d07e95c7..f6c77c0fa5 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@lists.sourceforge.net\n" -"POT-Creation-Date: 2010-03-12 09:48+0100\n" +"POT-Creation-Date: 2010-03-19 00:28+0100\n" "PO-Revision-Date: 2010-03-12 17:49+0200\n" "Last-Translator: \n" "Language-Team: french \n" diff --git a/po/gl.po b/po/gl.po index d6b1da4607..eee37b99be 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@lists.sourceforge.net\n" -"POT-Creation-Date: 2010-03-12 09:48+0100\n" +"POT-Creation-Date: 2010-03-19 00:28+0100\n" "PO-Revision-Date: 2010-03-12 09:14+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: galician \n" diff --git a/po/he.po b/po/he.po index ab0d8b89f8..63f930cd44 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@lists.sourceforge.net\n" -"POT-Creation-Date: 2010-03-12 09:48+0100\n" +"POT-Creation-Date: 2010-03-19 00:28+0100\n" "PO-Revision-Date: 2010-03-12 09:15+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: hebrew \n" diff --git a/po/hi.po b/po/hi.po index 3228816683..f1a96f6099 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@lists.sourceforge.net\n" -"POT-Creation-Date: 2010-03-12 09:48+0100\n" +"POT-Creation-Date: 2010-03-19 00:28+0100\n" "PO-Revision-Date: 2010-03-12 09:15+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: hindi \n" diff --git a/po/hr.po b/po/hr.po index f278e83db3..3f8e93f828 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@lists.sourceforge.net\n" -"POT-Creation-Date: 2010-03-12 09:48+0100\n" +"POT-Creation-Date: 2010-03-19 00:28+0100\n" "PO-Revision-Date: 2010-03-12 09:13+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: croatian \n" diff --git a/po/hu.po b/po/hu.po index 9d12bb5fc1..79453c6d99 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@lists.sourceforge.net\n" -"POT-Creation-Date: 2010-03-12 09:48+0100\n" +"POT-Creation-Date: 2010-03-19 00:28+0100\n" "PO-Revision-Date: 2010-03-12 09:15+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: hungarian \n" diff --git a/po/id.po b/po/id.po index db292b09e7..c031a7ddf4 100644 --- a/po/id.po +++ b/po/id.po @@ -3,14 +3,14 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2010-03-12 09:48+0100\n" +"POT-Creation-Date: 2010-03-19 00:28+0100\n" "PO-Revision-Date: 2010-03-18 17:15+0200\n" "Last-Translator: Azhari Harahap \n" "Language-Team: indonesian \n" -"Language: id\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: id\n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Pootle 2.0.1\n" @@ -348,8 +348,8 @@ msgid "" "May be approximate. See [a@./Documentation.html#faq3_11@Documentation]FAQ " "3.11[/a]" msgstr "" -"Kemungkinan hanya perkiraan saja. Lihat " -"[a@./Documentation.html#faq3_11@Dokumentasi]FAQ 3.11[/a]" +"Kemungkinan hanya perkiraan saja. Lihat [a@./Documentation." +"html#faq3_11@Dokumentasi]FAQ 3.11[/a]" #: libraries/messages.inc.php:70 #, php-format diff --git a/po/it.po b/po/it.po index b78bf8b9a1..4d74005537 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@lists.sourceforge.net\n" -"POT-Creation-Date: 2010-03-12 09:48+0100\n" +"POT-Creation-Date: 2010-03-19 00:28+0100\n" "PO-Revision-Date: 2010-03-12 09:16+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: italian \n" diff --git a/po/ja.po b/po/ja.po index 2212a9eb26..62fbd7312e 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@lists.sourceforge.net\n" -"POT-Creation-Date: 2010-03-12 09:48+0100\n" +"POT-Creation-Date: 2010-03-19 00:28+0100\n" "PO-Revision-Date: 2010-03-12 11:22+0200\n" "Last-Translator: Michal \n" "Language-Team: japanese \n" diff --git a/po/ka.po b/po/ka.po index a4d113dd82..50d5e221f3 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@lists.sourceforge.net\n" -"POT-Creation-Date: 2010-03-12 09:48+0100\n" +"POT-Creation-Date: 2010-03-19 00:28+0100\n" "PO-Revision-Date: 2010-03-12 09:14+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: georgian \n" diff --git a/po/ko.po b/po/ko.po index 870a635b02..f08643db44 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@lists.sourceforge.net\n" -"POT-Creation-Date: 2010-03-12 09:48+0100\n" +"POT-Creation-Date: 2010-03-19 00:28+0100\n" "PO-Revision-Date: 2010-03-12 09:16+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: korean \n" diff --git a/po/lt.po b/po/lt.po index ff2dfb2426..fe4cb83ecf 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@lists.sourceforge.net\n" -"POT-Creation-Date: 2010-03-12 09:48+0100\n" +"POT-Creation-Date: 2010-03-19 00:28+0100\n" "PO-Revision-Date: 2010-03-12 09:16+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: lithuanian \n" diff --git a/po/lv.po b/po/lv.po index a53e6aaa63..7cbae74b64 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@lists.sourceforge.net\n" -"POT-Creation-Date: 2010-03-12 09:48+0100\n" +"POT-Creation-Date: 2010-03-19 00:28+0100\n" "PO-Revision-Date: 2010-03-12 09:16+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: latvian \n" diff --git a/po/mk.po b/po/mk.po index 74f2a7e223..55dc5b5dd0 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@lists.sourceforge.net\n" -"POT-Creation-Date: 2010-03-12 09:48+0100\n" +"POT-Creation-Date: 2010-03-19 00:28+0100\n" "PO-Revision-Date: 2010-03-12 09:16+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: macedonian_cyrillic \n" diff --git a/po/mn.po b/po/mn.po index 70b9927b6e..69443fee2e 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@lists.sourceforge.net\n" -"POT-Creation-Date: 2010-03-12 09:48+0100\n" +"POT-Creation-Date: 2010-03-19 00:28+0100\n" "PO-Revision-Date: 2010-03-12 09:17+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: mongolian \n" diff --git a/po/ms.po b/po/ms.po index 6de951d05e..1611a755e7 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@lists.sourceforge.net\n" -"POT-Creation-Date: 2010-03-12 09:48+0100\n" +"POT-Creation-Date: 2010-03-19 00:28+0100\n" "PO-Revision-Date: 2010-03-12 09:17+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: malay \n" diff --git a/po/nb.po b/po/nb.po index 05b35681d6..5126a9264b 100644 --- a/po/nb.po +++ b/po/nb.po @@ -3,14 +3,14 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2010-03-12 09:48+0100\n" +"POT-Creation-Date: 2010-03-19 00:28+0100\n" "PO-Revision-Date: 2010-03-17 16:27+0200\n" "Last-Translator: \n" "Language-Team: norwegian \n" -"Language: nb\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: nb\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.1\n" @@ -3012,9 +3012,8 @@ msgid "" "Enable advanced features in configuration file (config.inc.php), for example by starting from config.sample.inc.php." msgstr "" -"Slå på avansert funksjonalitet i konfigurasjonsfila " -"(config.inc.php), f.eks. med eksempel fra " -"config.sample.inc.php." +"Slå på avansert funksjonalitet i konfigurasjonsfila (config.inc.php), f.eks. med eksempel fra config.sample.inc.php." #: libraries/messages.inc.php:668 msgid "Quick steps to setup advanced features:" diff --git a/po/nl.po b/po/nl.po index e4e16179a0..a00ecc74bc 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@lists.sourceforge.net\n" -"POT-Creation-Date: 2010-03-12 09:48+0100\n" +"POT-Creation-Date: 2010-03-19 00:28+0100\n" "PO-Revision-Date: 2010-03-12 12:22+0200\n" "Last-Translator: \n" "Language-Team: dutch \n" diff --git a/po/phpmyadmin.pot b/po/phpmyadmin.pot index 12864878d1..5ef50c8371 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@lists.sourceforge.net\n" -"POT-Creation-Date: 2010-03-12 09:48+0100\n" +"POT-Creation-Date: 2010-03-19 00:28+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/po/pl.po b/po/pl.po index 3efb97c2bc..1db7b8a63c 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@lists.sourceforge.net\n" -"POT-Creation-Date: 2010-03-12 09:48+0100\n" +"POT-Creation-Date: 2010-03-19 00:28+0100\n" "PO-Revision-Date: 2010-03-12 09:17+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: polish \n" diff --git a/po/pt.po b/po/pt.po index b8f6d4c1f6..c290536231 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@lists.sourceforge.net\n" -"POT-Creation-Date: 2010-03-12 09:48+0100\n" +"POT-Creation-Date: 2010-03-19 00:28+0100\n" "PO-Revision-Date: 2010-03-12 09:17+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: portuguese \n" diff --git a/po/pt_BR.po b/po/pt_BR.po index 3778af16ac..883a3c5e40 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@lists.sourceforge.net\n" -"POT-Creation-Date: 2010-03-12 09:48+0100\n" +"POT-Creation-Date: 2010-03-19 00:28+0100\n" "PO-Revision-Date: 2010-03-12 09:47+0200\n" "Last-Translator: Maurício Meneghini Fauth \n" "Language-Team: brazilian_portuguese \n" diff --git a/po/ro.po b/po/ro.po index a85f673663..1c796455b3 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@lists.sourceforge.net\n" -"POT-Creation-Date: 2010-03-12 09:48+0100\n" +"POT-Creation-Date: 2010-03-19 00:28+0100\n" "PO-Revision-Date: 2010-03-13 00:41+0200\n" "Last-Translator: \n" "Language-Team: romanian \n" diff --git a/po/ru.po b/po/ru.po index cbaf6dafe2..8df6fc1d86 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@lists.sourceforge.net\n" -"POT-Creation-Date: 2010-03-12 09:48+0100\n" +"POT-Creation-Date: 2010-03-19 00:28+0100\n" "PO-Revision-Date: 2010-03-12 09:18+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: russian \n" diff --git a/po/si.po b/po/si.po index b991e143c5..2d7d18eb60 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@lists.sourceforge.net\n" -"POT-Creation-Date: 2010-03-12 09:48+0100\n" +"POT-Creation-Date: 2010-03-19 00:28+0100\n" "PO-Revision-Date: 2010-03-12 09:18+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: sinhala \n" diff --git a/po/sk.po b/po/sk.po index caae51f1e7..017cbc07af 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@lists.sourceforge.net\n" -"POT-Creation-Date: 2010-03-12 09:48+0100\n" +"POT-Creation-Date: 2010-03-19 00:28+0100\n" "PO-Revision-Date: 2010-03-12 09:18+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: slovak \n" diff --git a/po/sl.po b/po/sl.po index 2cec417a2e..f9a3f82341 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@lists.sourceforge.net\n" -"POT-Creation-Date: 2010-03-12 09:48+0100\n" +"POT-Creation-Date: 2010-03-19 00:28+0100\n" "PO-Revision-Date: 2010-03-12 09:19+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: slovenian \n" diff --git a/po/sq.po b/po/sq.po index a1bfe24416..dbe30d45d8 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@lists.sourceforge.net\n" -"POT-Creation-Date: 2010-03-12 09:48+0100\n" +"POT-Creation-Date: 2010-03-19 00:28+0100\n" "PO-Revision-Date: 2010-03-12 09:11+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: albanian \n" diff --git a/po/sr.po b/po/sr.po index f20535acad..1709ba46ed 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@lists.sourceforge.net\n" -"POT-Creation-Date: 2010-03-12 09:48+0100\n" +"POT-Creation-Date: 2010-03-19 00:28+0100\n" "PO-Revision-Date: 2010-03-12 09:18+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: serbian_cyrillic \n" diff --git a/po/sr@latin.po b/po/sr@latin.po index a26cbdd49e..f32fa5cef4 100644 --- a/po/sr@latin.po +++ b/po/sr@latin.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2010-03-12 09:48+0100\n" +"POT-Creation-Date: 2010-03-19 00:28+0100\n" "PO-Revision-Date: 2010-03-12 09:18+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: serbian_latin \n" diff --git a/po/sv.po b/po/sv.po index 2bc65235b9..6f1f54364b 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@lists.sourceforge.net\n" -"POT-Creation-Date: 2010-03-12 09:48+0100\n" +"POT-Creation-Date: 2010-03-19 00:28+0100\n" "PO-Revision-Date: 2010-03-12 09:19+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: swedish \n" diff --git a/po/te.po b/po/te.po index 7949cdbd4f..f9d8c562a8 100644 --- a/po/te.po +++ b/po/te.po @@ -4,7 +4,7 @@ # FIRST AUTHOR , YEAR. msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2010-03-12 09:48+0100\n" "PO-Revision-Date: 2010-03-19 01:30+0200\n" diff --git a/po/th.po b/po/th.po index 952d89a444..d95b79c679 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@lists.sourceforge.net\n" -"POT-Creation-Date: 2010-03-12 09:48+0100\n" +"POT-Creation-Date: 2010-03-19 00:28+0100\n" "PO-Revision-Date: 2010-03-12 09:19+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: thai \n" diff --git a/po/tr.po b/po/tr.po index 7fd7ddc519..e11373ed71 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@lists.sourceforge.net\n" -"POT-Creation-Date: 2010-03-12 09:48+0100\n" +"POT-Creation-Date: 2010-03-19 00:28+0100\n" "PO-Revision-Date: 2010-03-12 09:19+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: turkish \n" diff --git a/po/tt.po b/po/tt.po index 89381fdf80..b5f54c4ff6 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@lists.sourceforge.net\n" -"POT-Creation-Date: 2010-03-12 09:48+0100\n" +"POT-Creation-Date: 2010-03-19 00:28+0100\n" "PO-Revision-Date: 2010-03-12 09:19+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: tatarish \n" diff --git a/po/uk.po b/po/uk.po index 01930d8c66..89871f4a0c 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@lists.sourceforge.net\n" -"POT-Creation-Date: 2010-03-12 09:48+0100\n" +"POT-Creation-Date: 2010-03-19 00:28+0100\n" "PO-Revision-Date: 2010-03-12 09:19+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: ukrainian \n" diff --git a/po/uz.po b/po/uz.po index 6a351f996e..789ec4da3e 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@lists.sourceforge.net\n" -"POT-Creation-Date: 2010-03-12 09:48+0100\n" +"POT-Creation-Date: 2010-03-19 00:28+0100\n" "PO-Revision-Date: 2010-03-12 09:20+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: uzbek_cyrillic \n" diff --git a/po/uz@latin.po b/po/uz@latin.po index 5c3f8e78ae..614f8ea945 100644 --- a/po/uz@latin.po +++ b/po/uz@latin.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2010-03-12 09:48+0100\n" +"POT-Creation-Date: 2010-03-19 00:28+0100\n" "PO-Revision-Date: 2010-03-12 09:20+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: uzbek_latin \n" diff --git a/po/zh_CN.po b/po/zh_CN.po index b0d04bb454..ca41112562 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@lists.sourceforge.net\n" -"POT-Creation-Date: 2010-03-12 09:48+0100\n" +"POT-Creation-Date: 2010-03-19 00:28+0100\n" "PO-Revision-Date: 2010-03-18 06:49+0200\n" "Last-Translator: shanyan baishui \n" "Language-Team: chinese_simplified \n" diff --git a/po/zh_TW.po b/po/zh_TW.po index 7ca3393854..3d147f5685 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@lists.sourceforge.net\n" -"POT-Creation-Date: 2010-03-12 09:48+0100\n" +"POT-Creation-Date: 2010-03-19 00:28+0100\n" "PO-Revision-Date: 2010-03-12 09:15+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: chinese_traditional \n" diff --git a/scripts/create-release.sh b/scripts/create-release.sh index 8c321be4d9..88ea4429d5 100755 --- a/scripts/create-release.sh +++ b/scripts/create-release.sh @@ -35,37 +35,6 @@ shift branch=$1 shift -# Create working copy -mkdir -p release -workdir=release/phpMyAdmin-$version -if [ -d $workdir ] ; then - echo "Working directory '$workdir' already exists, please move it out of way" - exit 1 -fi -git clone --local . $workdir -cd $workdir - -# Checkout branch -git checkout $branch - -# Check release version -if ! grep -q "'PMA_VERSION', '$version'" libraries/Config.class.php ; then - echo "There seems to be wrong version in libraries/Config.class.php!" - exit 2 -fi -if ! grep -q "phpMyAdmin $version - Documentation" Documentation.html ; then - echo "There seems to be wrong version in Documentation.html" - exit 2 -fi -if ! grep -q "phpMyAdmin $version - Official translators" translators.html ; then - echo "There seems to be wrong version in translators.html" - exit 2 -fi -if ! grep -q "Version $version\$" README ; then - echo "There seems to be wrong version in README" - exit 2 -fi - cat < RELEASE-DATE-${version} @@ -216,8 +215,8 @@ cat <