The branch, master has been updated via 5c21f8577e6a995dd8d99f64cdfd01d5f4c39de6 (commit) via e1e2282d8d2b0e703439a855d3b244ebfb89a2cc (commit) via f17408ae6df7aaddeb109651eab8b409834c4c4f (commit) via 87a2410c5e7171f04b46b090fc8204dbb9df6035 (commit) via a47939f338d313b551936d45618a03e4b365dba4 (commit) via 54bf831f77f3d0c4de280e75202d42d894875e21 (commit) via 1e7d4211dcf5a1251a570ff23b81af510cfdcb72 (commit) via c24cd3fac00ab907a72c55e29778b33ef903e925 (commit) via 85bbe04a83f3a4e1f9bae1611214653b77136f28 (commit) via fe90f254c292f81bf04de5fe596caf66aec6b047 (commit) via 0d31a33cc958ef4126168226a4458826b5853efd (commit) from e2228eed7795063c9007b46177d20a07d285a021 (commit)

- Log ----------------------------------------------------------------- commit 5c21f8577e6a995dd8d99f64cdfd01d5f4c39de6 Merge: e2228ee e1e2282 Author: Michal Čihař mcihar@suse.cz Date: Thu Dec 1 12:04:47 2011 +0100

Merge remote-tracking branch 'pootle/master'

commit e1e2282d8d2b0e703439a855d3b244ebfb89a2cc Merge: f17408a 0b04f90 Author: Pootle server pootle@cihar.com Date: Thu Dec 1 02:40:14 2011 +0100

Merge remote-tracking branch 'origin/master'

commit f17408ae6df7aaddeb109651eab8b409834c4c4f Author: Burak Yavuz hitowerdigit@hotmail.com Date: Wed Nov 30 22:40:52 2011 +0200

Translation update done using Pootle.

commit 87a2410c5e7171f04b46b090fc8204dbb9df6035 Author: Burak Yavuz hitowerdigit@hotmail.com Date: Wed Nov 30 22:29:34 2011 +0200

Translation update done using Pootle.

commit a47939f338d313b551936d45618a03e4b365dba4 Author: Matías Bellone matiasbellone@gmail.com Date: Wed Nov 30 22:12:20 2011 +0200

Translation update done using Pootle.

commit 54bf831f77f3d0c4de280e75202d42d894875e21 Author: Matías Bellone matiasbellone@gmail.com Date: Wed Nov 30 22:12:03 2011 +0200

Translation update done using Pootle.

commit 1e7d4211dcf5a1251a570ff23b81af510cfdcb72 Author: Marc Delisle marc@infomarc.info Date: Wed Nov 30 21:52:09 2011 +0200

Translation update done using Pootle.

commit c24cd3fac00ab907a72c55e29778b33ef903e925 Author: dannybeckett daniel.beckett@gmail.com Date: Wed Nov 30 21:51:46 2011 +0200

Translation update done using Pootle.

commit 85bbe04a83f3a4e1f9bae1611214653b77136f28 Merge: fe90f25 5e090e3 Author: Pootle server pootle@cihar.com Date: Wed Nov 30 18:40:15 2011 +0100

Merge remote-tracking branch 'origin/master'

commit fe90f254c292f81bf04de5fe596caf66aec6b047 Author: Domen dbc334@gmail.com Date: Wed Nov 30 18:28:03 2011 +0200

Translation update done using Pootle.

commit 0d31a33cc958ef4126168226a4458826b5853efd Author: Domen dbc334@gmail.com Date: Wed Nov 30 18:27:18 2011 +0200

Translation update done using Pootle.

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

Summary of changes: po/es.po | 7 ++++--- po/fr.po | 7 ++++--- po/sl.po | 11 ++++++----- po/tr.po | 7 ++++--- 4 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/po/es.po b/po/es.po index 615ff00..f3375eb 100644 --- a/po/es.po +++ b/po/es.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-11-30 14:18+0100\n" -"PO-Revision-Date: 2011-11-20 19:31+0200\n" +"PO-Revision-Date: 2011-11-30 22:12+0200\n" "Last-Translator: Matías Bellone matiasbellone@gmail.com\n" "Language-Team: spanish es@li.org\n" "Language: es\n" @@ -4744,12 +4744,13 @@ msgid "" "Limits number of table preferences which are stored in database, the oldest " "records are automatically removed" msgstr "" +"Limita la cantidad de preferencias sobre tablas que serán almacenadas en la " +"base de datos, las más antiguas serán eliminadas automáticamente"

#: libraries/config/messages.inc.php:403 -#, fuzzy #| msgid "Maximum number of tables displayed in table list" msgid "Maximal number of table preferences to store" -msgstr "Número máximo de tablas mostradas en una lista de tablas" +msgstr "Número máximo de preferencias sobre tablas a almacenar"

#: libraries/config/messages.inc.php:404 msgid "Try to connect without password" diff --git a/po/fr.po b/po/fr.po index f79e71e..1e6885f 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-11-30 14:18+0100\n" -"PO-Revision-Date: 2011-11-23 17:16+0200\n" +"PO-Revision-Date: 2011-11-30 21:51+0200\n" "Last-Translator: Marc Delisle marc@infomarc.info\n" "Language-Team: french fr@li.org\n" "Language: fr\n" @@ -4709,12 +4709,13 @@ msgid "" "Limits number of table preferences which are stored in database, the oldest " "records are automatically removed" msgstr "" +"Limite le nombre de préférences de tables qui sont stockées dans la base de " +"données, les entrées les plus anciennes sont automatiquement effacées"

#: libraries/config/messages.inc.php:403 -#, fuzzy #| msgid "Maximum number of tables displayed in table list" msgid "Maximal number of table preferences to store" -msgstr "Nombre maximum de tables affichées dans la liste des tables" +msgstr "Nombre maximum de préférences de tables à conserver"

#: libraries/config/messages.inc.php:404 msgid "Try to connect without password" diff --git a/po/sl.po b/po/sl.po index 849d1cf..4ea2f5e 100644 --- a/po/sl.po +++ b/po/sl.po @@ -4,15 +4,15 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-11-30 14:18+0100\n" -"PO-Revision-Date: 2011-11-21 22:01+0200\n" +"PO-Revision-Date: 2011-11-30 18:27+0200\n" "Last-Translator: Domen dbc334@gmail.com\n" "Language-Team: slovenian sl@li.org\n" "Language: sl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n" -"%100==4 ? 2 : 3);\n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || " +"n%100==4 ? 2 : 3);\n" "X-Generator: Pootle 2.1.6\n"

#: browse_foreigners.php:35 browse_foreigners.php:53 js/messages.php:329 @@ -4687,12 +4687,13 @@ msgid "" "Limits number of table preferences which are stored in database, the oldest " "records are automatically removed" msgstr "" +"Omeji število nastavitev tabel, ki so shranjene v zbirki podatkov; " +"najstarejši zapisi bodo samodejno odstranjeni"

#: libraries/config/messages.inc.php:403 -#, fuzzy #| msgid "Maximum number of tables displayed in table list" msgid "Maximal number of table preferences to store" -msgstr "Največje število tabel prikazanih na seznamu tabel" +msgstr "Največje število shranjenih nastavitev tabel"

#: libraries/config/messages.inc.php:404 msgid "Try to connect without password" diff --git a/po/tr.po b/po/tr.po index 49b0074..7e4a48d 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-11-30 14:18+0100\n" -"PO-Revision-Date: 2011-11-21 19:24+0200\n" +"PO-Revision-Date: 2011-11-30 22:29+0200\n" "Last-Translator: Burak Yavuz hitowerdigit@hotmail.com\n" "Language-Team: turkish tr@li.org\n" "Language: tr\n" @@ -4690,12 +4690,13 @@ msgid "" "Limits number of table preferences which are stored in database, the oldest " "records are automatically removed" msgstr "" +"Veritabanında depolanan tablo tercihlerinin sayısını sınırlandırır, en eski " +"kayıtlar otomatik olarak kaldırılır."

#: libraries/config/messages.inc.php:403 -#, fuzzy #| msgid "Maximum number of tables displayed in table list" msgid "Maximal number of table preferences to store" -msgstr "Tablo listesinde görüntülenecek olan en fazla tablo sayısıdır" +msgstr "Depolamak için en fazla tablo tercihleri sayısıdır"

#: libraries/config/messages.inc.php:404 msgid "Try to connect without password"

hooks/post-receive