The branch, master has been updated via 555c04b4a1bb91780aa21bff2b420eb6171a995d (commit) via eb0ea6b20d0b98192d1af3c02a55fd82e0a45f4e (commit) via b4a46962e950c46e25a1f72f009d5af6fe12c1cc (commit) via 742ca4841b2cbc40647970a912e2e0e3ffdca68a (commit) via e8f0a023f3b90e4f0d973fec5eebb286be712a13 (commit) via 83a73a2a8e8514e100fe26d8c4704c830f686525 (commit) via ad687ae58fc0e516150531e053aa786baf6f75e7 (commit) via a9bb12a8b9f8c6bf26cb315e15e064268e418e83 (commit) via 1e7e0704e79bc19a8f2c29bea4e94f7dd8d27022 (commit) via bcb528ad5ea8dd6d28b81fba83726f6b41ac38b5 (commit) via 1b41e9cb8779288de454445b552471660e2fbd23 (commit) via 98f390d4827da63293937ca5ddfdead4fb731945 (commit) via 5b9b1cb613b300a7e9397c7ff5295b75073dc1db (commit) via 50a4191ae99488e95020d38aadbbf29b0e5b4af9 (commit) via e8539bd778bc77548d97ff866e40f2319c2fe702 (commit) via f897eaeb3caf33fb0ffae1d424346966b3df3a71 (commit) via 0358007018029af939ffd62e6ac42b597dcf83d3 (commit) via e880d4ffde0f940f526a5e9e4f4f9ca228b4e081 (commit) via 5ec068f346756d1e19c345cb5f661eb7d1f2423a (commit) via 821814ff50f2c1a4a237d2aca3c28f2c0b58b3c0 (commit) from 064e875f10b0244a15da56c4ca590d516c51f6b6 (commit)
- Log ----------------------------------------------------------------- commit 555c04b4a1bb91780aa21bff2b420eb6171a995d Merge: e8f0a023f3b90e4f0d973fec5eebb286be712a13 eb0ea6b20d0b98192d1af3c02a55fd82e0a45f4e Author: Michal Čihař mcihar@novell.com Date: Mon May 9 14:17:54 2011 +0200
Merge branch 'QA_3_4'
Conflicts: po/hi.po po/hu.po po/ja.po po/zh_CN.po
commit e8f0a023f3b90e4f0d973fec5eebb286be712a13 Author: gergo314 gergo314@gmail.com Date: Mon May 9 14:12:23 2011 +0200
Translation update done using Pootle.
commit 83a73a2a8e8514e100fe26d8c4704c830f686525 Author: gergo314 gergo314@gmail.com Date: Mon May 9 14:12:08 2011 +0200
Translation update done using Pootle.
commit ad687ae58fc0e516150531e053aa786baf6f75e7 Author: gergo314 gergo314@gmail.com Date: Mon May 9 14:11:50 2011 +0200
Translation update done using Pootle.
commit a9bb12a8b9f8c6bf26cb315e15e064268e418e83 Author: gergo314 gergo314@gmail.com Date: Mon May 9 14:09:32 2011 +0200
Translation update done using Pootle.
commit 1e7e0704e79bc19a8f2c29bea4e94f7dd8d27022 Author: gergo314 gergo314@gmail.com Date: Mon May 9 14:08:54 2011 +0200
Translation update done using Pootle.
commit bcb528ad5ea8dd6d28b81fba83726f6b41ac38b5 Author: gergo314 gergo314@gmail.com Date: Mon May 9 14:07:46 2011 +0200
Translation update done using Pootle.
commit 1b41e9cb8779288de454445b552471660e2fbd23 Author: gergo314 gergo314@gmail.com Date: Mon May 9 14:07:36 2011 +0200
Translation update done using Pootle.
commit 98f390d4827da63293937ca5ddfdead4fb731945 Author: gergo314 gergo314@gmail.com Date: Mon May 9 12:54:02 2011 +0200
Translation update done using Pootle.
commit 5b9b1cb613b300a7e9397c7ff5295b75073dc1db Author: gergo314 gergo314@gmail.com Date: Mon May 9 12:53:57 2011 +0200
Translation update done using Pootle.
commit 50a4191ae99488e95020d38aadbbf29b0e5b4af9 Author: gergo314 gergo314@gmail.com Date: Mon May 9 12:53:35 2011 +0200
Translation update done using Pootle.
commit e8539bd778bc77548d97ff866e40f2319c2fe702 Author: gergo314 gergo314@gmail.com Date: Mon May 9 12:53:26 2011 +0200
Translation update done using Pootle.
commit f897eaeb3caf33fb0ffae1d424346966b3df3a71 Author: gergo314 gergo314@gmail.com Date: Mon May 9 12:53:02 2011 +0200
Translation update done using Pootle.
commit 0358007018029af939ffd62e6ac42b597dcf83d3 Author: gergo314 gergo314@gmail.com Date: Mon May 9 12:52:38 2011 +0200
Translation update done using Pootle.
commit e880d4ffde0f940f526a5e9e4f4f9ca228b4e081 Author: gergo314 gergo314@gmail.com Date: Mon May 9 12:52:30 2011 +0200
Translation update done using Pootle.
commit 5ec068f346756d1e19c345cb5f661eb7d1f2423a Author: gergo314 gergo314@gmail.com Date: Mon May 9 12:52:20 2011 +0200
Translation update done using Pootle.
commit 821814ff50f2c1a4a237d2aca3c28f2c0b58b3c0 Author: gergo314 gergo314@gmail.com Date: Mon May 9 12:51:25 2011 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes: po/af.po | 4 +- po/ar.po | 4 +- po/az.po | 4 +- po/be.po | 4 +- po/be@latin.po | 4 +- po/bg.po | 4 +- po/bn.po | 4 +- po/bs.po | 4 +- po/ca.po | 4 +- po/cs.po | 4 +- po/cy.po | 4 +- po/da.po | 4 +- po/de.po | 4 +- po/el.po | 4 +- po/en_GB.po | 4 +- po/es.po | 4 +- po/et.po | 4 +- po/eu.po | 4 +- po/fa.po | 4 +- po/fi.po | 4 +- po/fr.po | 4 +- po/gl.po | 4 +- po/he.po | 4 +- po/hi.po | 2 +- po/hr.po | 4 +- po/hu.po | 68 ++++++++++++++++++++++++++++++++++++++-------------- po/id.po | 4 +- po/it.po | 4 +- po/ja.po | 59 +++++++++++++++++++++++++++++++++++++++++++-- po/ka.po | 4 +- po/ko.po | 4 +- po/lt.po | 4 +- po/lv.po | 4 +- po/mk.po | 4 +- po/ml.po | 4 +- po/mn.po | 4 +- po/ms.po | 4 +- po/nb.po | 4 +- po/nl.po | 4 +- po/phpmyadmin.pot | 4 +- po/pl.po | 4 +- po/pt.po | 4 +- po/pt_BR.po | 4 +- po/ro.po | 4 +- po/ru.po | 4 +- po/si.po | 4 +- po/sk.po | 4 +- po/sl.po | 4 +- po/sq.po | 4 +- po/sr.po | 4 +- po/sr@latin.po | 4 +- po/sv.po | 4 +- po/ta.po | 4 +- po/te.po | 4 +- po/th.po | 4 +- po/tr.po | 4 +- po/tt.po | 4 +- po/ug.po | 4 +- po/uk.po | 4 +- po/ur.po | 4 +- po/uz.po | 4 +- po/uz@latin.po | 4 +- po/zh_CN.po | 2 +- po/zh_TW.po | 4 +- 64 files changed, 227 insertions(+), 144 deletions(-)
diff --git a/po/af.po b/po/af.po index 65decbb..6b364ad 100644 --- a/po/af.po +++ b/po/af.po @@ -1,9 +1,9 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.0-rc3-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.0\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2011-05-05 13:15+0200\n" +"POT-Creation-Date: 2011-05-09 07:40+0200\n" "PO-Revision-Date: 2010-03-30 23:04+0200\n" "Last-Translator: Michal michal@cihar.com\n" "Language-Team: afrikaans af@li.org\n" diff --git a/po/ar.po b/po/ar.po index 455677d..0a7a0f4 100644 --- a/po/ar.po +++ b/po/ar.po @@ -1,9 +1,9 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.0-rc3-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.0\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2011-05-05 13:15+0200\n" +"POT-Creation-Date: 2011-05-09 07:40+0200\n" "PO-Revision-Date: 2011-04-21 13:56+0200\n" "Last-Translator: u4504712@anu.edu.au\n" "Language-Team: arabic ar@li.org\n" diff --git a/po/az.po b/po/az.po index 226ef2d..b310f83 100644 --- a/po/az.po +++ b/po/az.po @@ -1,9 +1,9 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.0-rc3-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.0\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2011-05-05 13:15+0200\n" +"POT-Creation-Date: 2011-05-09 07:40+0200\n" "PO-Revision-Date: 2010-03-12 09:11+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: azerbaijani az@li.org\n" diff --git a/po/be.po b/po/be.po index 84aec25..aa6f2d6 100644 --- a/po/be.po +++ b/po/be.po @@ -1,9 +1,9 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.0-rc3-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.0\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2011-05-05 13:15+0200\n" +"POT-Creation-Date: 2011-05-09 07:40+0200\n" "PO-Revision-Date: 2010-03-12 09:12+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: belarusian_cyrillic be@li.org\n" diff --git a/po/be larusian_cyrillic be@li.org\n"