The branch, TESTING has been updated via 54a2982f4b30fb36cf220c15527a6440aac4696c (commit) via 8b48c1998d9f898a17b810ccaa396ae4da863176 (commit) via 4f2251417ce9944a22cef94ae72c6fa88f6037e2 (commit) via b8c45c434a6fecef3c5f065df8e649d86c546123 (commit) from 28b03f9fe9160b6b667df70da861f0ecfffd6c7f (commit)
- Log ----------------------------------------------------------------- commit 54a2982f4b30fb36cf220c15527a6440aac4696c Merge: 28b03f9fe9160b6b667df70da861f0ecfffd6c7f 8b48c1998d9f898a17b810ccaa396ae4da863176 Author: Marc Delisle marc@infomarc.info Date: Tue Jun 7 08:16:23 2011 -0400
Merge branch 'MAINT_3_4_2' into TESTING
-----------------------------------------------------------------------
Summary of changes: ChangeLog | 2 +- Documentation.html | 4 ++-- README | 2 +- libraries/Config.class.php | 2 +- po/af.po | 2 +- po/ar.po | 2 +- po/az.po | 2 +- po/be.po | 2 +- po/be@latin.po | 2 +- po/bg.po | 2 +- po/bn.po | 2 +- po/bs.po | 2 +- po/ca.po | 2 +- po/cs.po | 2 +- po/cy.po | 2 +- po/da.po | 2 +- po/de.po | 2 +- po/el.po | 2 +- po/en_GB.po | 2 +- po/es.po | 2 +- po/et.po | 2 +- po/eu.po | 2 +- po/fa.po | 2 +- po/fi.po | 2 +- po/fr.po | 2 +- po/gl.po | 2 +- po/he.po | 2 +- po/hi.po | 2 +- po/hr.po | 2 +- po/hu.po | 2 +- po/id.po | 2 +- po/it.po | 2 +- po/ja.po | 2 +- po/ka.po | 2 +- po/ko.po | 2 +- po/lt.po | 2 +- po/lv.po | 2 +- po/mk.po | 2 +- po/ml.po | 2 +- po/mn.po | 2 +- po/ms.po | 2 +- po/nb.po | 2 +- po/nl.po | 2 +- po/pl.po | 2 +- po/pt.po | 2 +- po/pt_BR.po | 2 +- po/ro.po | 2 +- po/ru.po | 2 +- po/si.po | 18 +++++++++--------- po/sk.po | 13 +++++++++---- po/sl.po | 2 +- po/sq.po | 2 +- po/sr.po | 2 +- po/sr@latin.po | 2 +- po/sv.po | 2 +- po/ta.po | 2 +- po/te.po | 2 +- po/th.po | 2 +- po/tr.po | 2 +- po/tt.po | 2 +- po/ug.po | 2 +- po/uk.po | 2 +- po/ur.po | 2 +- po/uz.po | 2 +- po/uz@latin.po | 2 +- po/zh_CN.po | 2 +- po/zh_TW.po | 4 ++-- 67 files changed, 85 insertions(+), 80 deletions(-)
diff --git a/ChangeLog b/ChangeLog index d2e8041..78fbb43 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,7 @@ phpMyAdmin - ChangeLog ======================
-3.4.2.0 (not yet released) +3.4.2.0 (2011-06-07) - bug #3301249 [interface] Iconic table operations does not remove inline edit label - bug #3303869 [interface] Unnecessary scrolling on Databases page - patch #3303813 [setup] Define a label that was missing diff --git a/Documentation.html b/Documentation.html index 20a49e7..3531ef6 100644 --- a/Documentation.html +++ b/Documentation.html @@ -9,7 +9,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <link rel="icon" href="./favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>phpMyAdmin 3.4.2-rc1 - Documentation</title> + <title>phpMyAdmin 3.4.2 - Documentation</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head>
@@ -17,7 +17,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <div id="header"> <h1> <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a> - 3.4.2-rc1 + 3.4.2 Documentation </h1> </div> diff --git a/README b/README index b8f1712..a652994 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme ===================
-Version 3.4.2-rc1 +Version 3.4.2
A set of PHP-scripts to manage MySQL over the web.
diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 2e3a01f..67c8ed1 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -96,7 +96,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '3.4.2-rc1'); + $this->set('PMA_VERSION', '3.4.2'); /** * @deprecated */ diff --git a/po/af.po b/po/af.po index 09ae816..e28bb58 100644 --- a/po/af.po +++ b/po/af.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-03-30 23:04+0200\n" diff --git a/po/ar.po b/po/ar.po index b68dfd6..e9bd465 100644 --- a/po/ar.po +++ b/po/ar.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-04-21 13:56+0200\n" diff --git a/po/az.po b/po/az.po index 4e27c17..a0aa29e 100644 --- a/po/az.po +++ b/po/az.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-03-12 09:11+0100\n" diff --git a/po/be.po b/po/be.po index f4643bb..827547e 100644 --- a/po/be.po +++ b/po/be.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-03-12 09:12+0100\n" diff --git a/po/be@latin.po b/po/be@latin.po index 90b0b6c..71269b4 100644 --- a/po/be@latin.po +++ b/po/be@latin.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-03-30 23:09+0200\n" diff --git a/po/bg.po b/po/bg.po index 3a4a626..5506756 100644 --- a/po/bg.po +++ b/po/bg.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-03-22 12:51+0200\n" diff --git a/po/bn.po b/po/bn.po index 61a29d1..6851ce7 100644 --- a/po/bn.po +++ b/po/bn.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-10-21 01:36+0200\n" diff --git a/po/bs.po b/po/bs.po index a57e04b..d0b2bf2 100644 --- a/po/bs.po +++ b/po/bs.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-03-12 09:12+0100\n" diff --git a/po/ca.po b/po/ca.po index 81e1ccc..f9a08e7 100644 --- a/po/ca.po +++ b/po/ca.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-02-23 09:57+0200\n" diff --git a/po/cs.po b/po/cs.po index 667f2c4..e3dd226 100644 --- a/po/cs.po +++ b/po/cs.po @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-02-10 14:03+0100\n" diff --git a/po/cy.po b/po/cy.po index feabb4f..c68480b 100644 --- a/po/cy.po +++ b/po/cy.po @@ -4,7 +4,7 @@ # FIRST AUTHOR EMAIL@ADDRESS, YEAR. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-06-07 20:23+0200\n" diff --git a/po/da.po b/po/da.po index 5f805fa..6e44fde 100644 --- a/po/da.po +++ b/po/da.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-03-07 01:17+0200\n" diff --git a/po/de.po b/po/de.po index 5064229..9b505d2 100644 --- a/po/de.po +++ b/po/de.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-04-23 04:28+0200\n" diff --git a/po/el.po b/po/el.po index d55d96d..3610fcc 100644 --- a/po/el.po +++ b/po/el.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-04-05 11:15+0200\n" diff --git a/po/en_GB.po b/po/en_GB.po index e28622c..a5d899e 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-02-10 16:24+0200\n" diff --git a/po/es.po b/po/es.po index a18f7bd..914754c 100644 --- a/po/es.po +++ b/po/es.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-04-02 11:10+0200\n" diff --git a/po/et.po b/po/et.po index adac59e..14c8e96 100644 --- a/po/et.po +++ b/po/et.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-03-12 09:14+0100\n" diff --git a/po/eu.po b/po/eu.po index 3a61fc6..33546e3 100644 --- a/po/eu.po +++ b/po/eu.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-07-21 14:53+0200\n" diff --git a/po/fa.po b/po/fa.po index fd8ba5c..7ddf128 100644 --- a/po/fa.po +++ b/po/fa.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-05-19 03:54+0200\n" diff --git a/po/fi.po b/po/fi.po index 9fcc488..a52bb00 100644 --- a/po/fi.po +++ b/po/fi.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-11-26 21:29+0200\n" diff --git a/po/fr.po b/po/fr.po index 653f984..4825272 100644 --- a/po/fr.po +++ b/po/fr.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-02-10 19:23+0200\n" diff --git a/po/gl.po b/po/gl.po index 6b104b4..dcc97ab 100644 --- a/po/gl.po +++ b/po/gl.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-07-21 14:50+0200\n" diff --git a/po/he.po b/po/he.po index f842cef..b7f8de9 100644 --- a/po/he.po +++ b/po/he.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-03-02 20:17+0200\n" diff --git a/po/hi.po b/po/hi.po index 7ca8a1a..6e86b9a 100644 --- a/po/hi.po +++ b/po/hi.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-04-24 00:23+0200\n" diff --git a/po/hr.po b/po/hr.po index 2b0575a..ba20f43 100644 --- a/po/hr.po +++ b/po/hr.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-07-21 14:54+0200\n" diff --git a/po/hu.po b/po/hu.po index 78ed360..b55a68a 100644 --- a/po/hu.po +++ b/po/hu.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-05-05 12:49+0200\n" diff --git a/po/id.po b/po/id.po index 32c8a74..ed58c6f 100644 --- a/po/id.po +++ b/po/id.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-04-16 22:04+0200\n" diff --git a/po/it.po b/po/it.po index 96d7317..2af36a1 100644 --- a/po/it.po +++ b/po/it.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-04-05 14:27+0200\n" diff --git a/po/ja.po b/po/ja.po index 773ea18..11ac138 100644 --- a/po/ja.po +++ b/po/ja.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-05-05 11:38+0200\n" diff --git a/po/ka.po b/po/ka.po index 5dd025e..a7a99dd 100644 --- a/po/ka.po +++ b/po/ka.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-03-12 09:14+0100\n" diff --git a/po/ko.po b/po/ko.po index eb3a115..a430a0a 100644 --- a/po/ko.po +++ b/po/ko.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-06-16 18:18+0200\n" diff --git a/po/lt.po b/po/lt.po index 367b741..1771e49 100644 --- a/po/lt.po +++ b/po/lt.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-04-05 15:52+0200\n" diff --git a/po/lv.po b/po/lv.po index 4c8fa6d..2c0b05a 100644 --- a/po/lv.po +++ b/po/lv.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-03-12 09:16+0100\n" diff --git a/po/mk.po b/po/mk.po index 94ae16c..388d6ca 100644 --- a/po/mk.po +++ b/po/mk.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-03-12 09:16+0100\n" diff --git a/po/ml.po b/po/ml.po index 720b194..8193aeb 100644 --- a/po/ml.po +++ b/po/ml.po @@ -3,7 +3,7 @@ # This file is distributed under the same license as the phpMyAdmin package. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-02-10 14:03+0100\n" diff --git a/po/mn.po b/po/mn.po index f764803..b7a3776 100644 --- a/po/mn.po +++ b/po/mn.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-03-12 09:17+0100\n" diff --git a/po/ms.po b/po/ms.po index 4855d8d..35218d8 100644 --- a/po/ms.po +++ b/po/ms.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-03-12 09:17+0100\n" diff --git a/po/nb.po b/po/nb.po index d6ac9be..0ad295e 100644 --- a/po/nb.po +++ b/po/nb.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-03-07 11:21+0200\n" diff --git a/po/nl.po b/po/nl.po index 5f608f0..ed47655 100644 --- a/po/nl.po +++ b/po/nl.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-03-16 20:18+0200\n" diff --git a/po/pl.po b/po/pl.po index 20f5289..ac39790 100644 --- a/po/pl.po +++ b/po/pl.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-02-24 16:21+0200\n" diff --git a/po/pt.po b/po/pt.po index f85e312..15949fc 100644 --- a/po/pt.po +++ b/po/pt.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-03-26 03:23+0200\n" diff --git a/po/pt_BR.po b/po/pt_BR.po index ef38447..6635ca2 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-04-14 17:44+0200\n" diff --git a/po/ro.po b/po/ro.po index 1f6b9b8..dce5a04 100644 --- a/po/ro.po +++ b/po/ro.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-07-22 02:28+0200\n" diff --git a/po/ru.po b/po/ru.po index 2a52927..94b8017 100644 --- a/po/ru.po +++ b/po/ru.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-03-13 21:17+0200\n" diff --git a/po/si.po b/po/si.po index 3987dbd..5b15c7f 100644 --- a/po/si.po +++ b/po/si.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-05-04 14:56+0200\n" @@ -1131,7 +1131,7 @@ msgstr "නොසලකන්න"
#: js/messages.php:101 msgid "Select referenced key" -msgstr "" +msgstr "සම්බන්දිත මූලය තෝරන්න"
# ප්රාථමික මූලය = Primary key. Source: Glossary of Information Technology # Terms - ICTA @@ -1722,7 +1722,7 @@ msgstr "දෘඪාංග සත්යාපනය අසමත් විය
#: libraries/auth/swekey/swekey.auth.lib.php:166 msgid "No valid authentication key plugged" -msgstr "" +msgstr "වලංගු සත්යාපන යතුරක් සම්බන්ද කර නැත"
#: libraries/auth/swekey/swekey.auth.lib.php:202 msgid "Authenticating..." @@ -1738,11 +1738,11 @@ msgstr "PBMS සම්බන්ධතාවය අසමත් විය:"
#: libraries/blobstreaming.lib.php:312 msgid "PBMS get BLOB info failed:" -msgstr "" +msgstr "PBMS BLOB තොරතුරු ලබාගැනීම අසමත් විය:"
#: libraries/blobstreaming.lib.php:320 msgid "get BLOB Content-Type failed" -msgstr "" +msgstr "BLOB අන්තර්ගත-ප්රකාරය ලබාගැනීම අසමත් විය:"
#: libraries/blobstreaming.lib.php:347 msgid "View image" @@ -1750,7 +1750,7 @@ msgstr "දසුන නරඹන්න"
#: libraries/blobstreaming.lib.php:351 msgid "Play audio" -msgstr "" +msgstr "Play audio"
#: libraries/blobstreaming.lib.php:356 msgid "View video" @@ -2225,12 +2225,12 @@ msgstr ""%s" සඳහා %s දිගුව අවශ්යය" #: libraries/config/FormDisplay.class.php:755 #, php-format msgid "import will not work, missing function (%s)" -msgstr "" +msgstr "ආනයන අකර්මන්යයි, (%s) ක්රියාවලිය නොමැත"
#: libraries/config/FormDisplay.class.php:759 #, php-format msgid "export will not work, missing function (%s)" -msgstr "" +msgstr "අපනයන අකර්මන්යයි, (%s) ක්රියාවලිය නොමැත"
#: libraries/config/FormDisplay.class.php:766 msgid "SQL Validator is disabled" @@ -2247,7 +2247,7 @@ msgstr "උපරිම %s"
#: libraries/config/FormDisplay.tpl.php:173 msgid "This setting is disabled, it will not be applied to your configuration" -msgstr "" +msgstr "මෙම සිටුවම අක්රීය කර ඇත, ඔබගේ වින්යාස සඳහා එය නොයෙදෙනු ඇත"
#: libraries/config/FormDisplay.tpl.php:173 libraries/relation.lib.php:89 #: libraries/relation.lib.php:96 pmd_relation_new.php:68 diff --git a/po/sk.po b/po/sk.po index acd929c..9658b97 100644 --- a/po/sk.po +++ b/po/sk.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-07-22 02:26+0200\n" @@ -7117,6 +7117,8 @@ msgid "" "Your preferences will be saved for current session only. Storing them " "permanently requires %sphpMyAdmin configuration storage%s." msgstr "" +"Vaše nastavenia budú uložené len počas tohto prihlásenia. Pre trvalé " +"nastavenie potrebujete nastaviť %smiesto uloženia phpMyAdmin konfigurácie%s."
#: libraries/user_preferences.lib.php:142 #, fuzzy @@ -7577,11 +7579,11 @@ msgstr "Importovať súbory"
#: prefs_manage.php:245 msgid "Import from browser's storage" -msgstr "" +msgstr "Načítať z pamäte prehliadača"
#: prefs_manage.php:248 msgid "Settings will be imported from your browser's local storage." -msgstr "" +msgstr "Nastavenia budú načítané z lokálneho úložišťa vášho prehliadača."
#: prefs_manage.php:254 msgid "You have no saved settings!" @@ -7602,10 +7604,12 @@ msgid "" "You can set more settings by modifying config.inc.php, eg. by using %sSetup " "script%s." msgstr "" +"Ďalšie nastavenia môžete urobiť úpravou config.inc.php, napr. použitím " +"%sNastavovacieho skriptu%s."
#: prefs_manage.php:302 msgid "Save to browser's storage" -msgstr "" +msgstr "Uložiť do úložiska prehliadača"
#: prefs_manage.php:306 msgid "Settings will be saved in your browser's local storage." @@ -7618,6 +7622,7 @@ msgstr "Súčasné nastavenia budú prepísané!" #: prefs_manage.php:323 msgid "You can reset all your settings and restore them to default values." msgstr "" +"Môžete vymazať všetky vaše nastavenia a vrátiť sa k východziím hodnotám."
#: querywindow.php:93 msgid "Import files" diff --git a/po/sl.po b/po/sl.po index 0b21869..fec32cf 100644 --- a/po/sl.po +++ b/po/sl.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-03-24 22:38+0200\n" diff --git a/po/sq.po b/po/sq.po index 6ae5a04..0b3c6dd 100644 --- a/po/sq.po +++ b/po/sq.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-07-21 14:51+0200\n" diff --git a/po/sr.po b/po/sr.po index a28ddee..e4683dd 100644 --- a/po/sr.po +++ b/po/sr.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-04-06 18:43+0200\n" diff --git a/po/sr@latin.po b/po/sr@latin.po index 0de0bc9..db8630f 100644 --- a/po/sr@latin.po +++ b/po/sr@latin.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-12-02 14:49+0200\n" diff --git a/po/sv.po b/po/sv.po index 898de4b..ca9e8a6 100644 --- a/po/sv.po +++ b/po/sv.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-02-16 21:42+0200\n" diff --git a/po/ta.po b/po/ta.po index 51533ed..e93f1de 100644 --- a/po/ta.po +++ b/po/ta.po @@ -4,7 +4,7 @@ # FIRST AUTHOR EMAIL@ADDRESS, YEAR. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-04-16 10:43+0200\n" diff --git a/po/te.po b/po/te.po index 609a869..3f9cc3f 100644 --- a/po/te.po +++ b/po/te.po @@ -4,7 +4,7 @@ # FIRST AUTHOR EMAIL@ADDRESS, YEAR. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-04-07 17:06+0200\n" diff --git a/po/th.po b/po/th.po index c1a9124..b5e2065 100644 --- a/po/th.po +++ b/po/th.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-03-12 09:19+0100\n" diff --git a/po/tr.po b/po/tr.po index cc21272..999905a 100644 --- a/po/tr.po +++ b/po/tr.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-04-17 19:11+0200\n" diff --git a/po/tt.po b/po/tt.po index ce2142a..b8e9dd5 100644 --- a/po/tt.po +++ b/po/tt.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-07-22 02:25+0200\n" diff --git a/po/ug.po b/po/ug.po index b2380ce..45c2b0e 100644 --- a/po/ug.po +++ b/po/ug.po @@ -4,7 +4,7 @@ # FIRST AUTHOR EMAIL@ADDRESS, YEAR. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-08-26 11:59+0200\n" diff --git a/po/uk.po b/po/uk.po index 87e0e82..f2b06fe 100644 --- a/po/uk.po +++ b/po/uk.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-12-28 22:26+0200\n" diff --git a/po/ur.po b/po/ur.po index 894cd7e..949b622 100644 --- a/po/ur.po +++ b/po/ur.po @@ -4,7 +4,7 @@ # FIRST AUTHOR EMAIL@ADDRESS, YEAR. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-04-23 08:37+0200\n" diff --git a/po/uz.po b/po/uz.po index 9e99a4c..0d0869a 100644 --- a/po/uz.po +++ b/po/uz.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-07-22 02:31+0200\n" diff --git a/po/uz@latin.po b/po/uz@latin.po index 272541d..4deafde 100644 --- a/po/uz@latin.po +++ b/po/uz@latin.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-07-22 02:30+0200\n" diff --git a/po/zh_CN.po b/po/zh_CN.po index 5ab9a62..eeeced8 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-03-04 09:47+0200\n" diff --git a/po/zh_TW.po b/po/zh_TW.po index 26b1a81..5001869 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -1,8 +1,8 @@ msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2011-06-02 08:33+0200\n" +"POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-05-31 09:47+0800\n" "Last-Translator: Finjon Kiang (http://twpug.net)%5Cn" "Language-Team: chinese_traditional zh_TW@li.org\n"
hooks/post-receive
-
Marc Delisle