Git

git@phpmyadmin.net

13 participants
38233 discussions

[Phpmyadmin-git] [SCM] phpMyAdmin themes branch, master, updated. c809b67c412253abebdec82bceccaadf6fbd6ae5
by Marc Delisle 28 Dec '10

28 Dec '10

The branch, master has been updated via c809b67c412253abebdec82bceccaadf6fbd6ae5 (commit) from da9c73a68fbb487ef5e4156e1c9e2ac0ac6a990c (commit) - Log ----------------------------------------------------------------- commit c809b67c412253abebdec82bceccaadf6fbd6ae5 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Dec 28 07:41:53 2010 -0500 bug #3141350, Extra blank line ----------------------------------------------------------------------- Summary of changes: pmahomme/info.inc.php | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/pmahomme/info.inc.php b/pmahomme/info.inc.php index 30c1b7c..ae9d6d5 100644 --- a/pmahomme/info.inc.php +++ b/pmahomme/info.inc.php @@ -8,4 +8,3 @@ Theme created by Mike Homme http://www.mikehomme.com $theme_name = 'pmamhomme'; $theme_full_version = '1.0'; ?> - hooks/post-receive -- phpMyAdmin themes

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin localized documentation branch, master, updated. 87380142ee1059382e595ce1cfbc8051035a1742
by Michal Čihař 28 Dec '10

28 Dec '10

The branch, master has been updated via 87380142ee1059382e595ce1cfbc8051035a1742 (commit) from 6c40714cc667b19f4a1f9acc2e6b87f19b855fbe (commit) - Log ----------------------------------------------------------------- commit 87380142ee1059382e595ce1cfbc8051035a1742 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Dec 28 11:15:45 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/tr.po | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/po/tr.po b/po/tr.po index a85b6c6..9d2a582 100644 --- a/po/tr.po +++ b/po/tr.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs VERSION\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-12-19 11:54+0100\n" -"PO-Revision-Date: 2010-12-27 19:07+0200\n" +"PO-Revision-Date: 2010-12-28 11:15+0200\n" "Last-Translator: Burak Yavuz <hitowerdigit(a)hotmail.com>\n" "Language-Team: none\n" "Language: tr\n" @@ -732,6 +732,9 @@ msgid "" "has read and write access to it. <a href=\"#faq1_26\">FAQ 1.26</a> can help " "with this." msgstr "" +"Diğer platformlarda, basitçe klasör oluşturun ve web sunucunuzun buna okuma " +"ve yazmaya erişimi olduğundan emin olun. <a href=\"#faq1_26\">SSS 1.26</a> " +"bununla ilgili olarak yardımcı olabilir." #. type: Content of: <html><body><div><ol><li><ul><li> #: ../phpmyadmin/Documentation.html:270 hooks/post-receive -- phpMyAdmin localized documentation

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA1-1209-gfa255cf
by Michal Čihař 28 Dec '10

28 Dec '10

The branch, master has been updated via fa255cf2b4b95fb75eeaeb1da88e0f2f8b680481 (commit) from d45821d563798cf319b863205e95e67e809dc863 (commit) - Log ----------------------------------------------------------------- commit fa255cf2b4b95fb75eeaeb1da88e0f2f8b680481 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Dec 28 11:17:02 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/tr.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/po/tr.po b/po/tr.po index df136a8..52ac430 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-beta1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-12-27 07:14-0500\n" -"PO-Revision-Date: 2010-12-27 16:09+0200\n" +"PO-Revision-Date: 2010-12-28 11:17+0200\n" "Last-Translator: Burak Yavuz <hitowerdigit(a)hotmail.com>\n" "Language-Team: turkish <tr(a)li.org>\n" "Language: tr\n" @@ -2070,7 +2070,7 @@ msgstr "Gönderme işi için ayarladığınız dizine ulaşılamıyor" #: libraries/common.lib.php:2983 msgid "There are no files to upload" -msgstr "" +msgstr "Göndermek için hiç dosya yok" #: libraries/config.values.php:95 libraries/export/htmlword.php:24 #: libraries/export/latex.php:41 libraries/export/odt.php:33 hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin localized documentation branch, master, updated. 6c40714cc667b19f4a1f9acc2e6b87f19b855fbe
by Michal Čihař 27 Dec '10

27 Dec '10

The branch, master has been updated via 6c40714cc667b19f4a1f9acc2e6b87f19b855fbe (commit) via 96aa26f41dd2c227c2f04f6206b6a784a4d0f879 (commit) via 9e845b4b111ffabaaf4d8f453a40091d97831cf9 (commit) via fb7c3d7316400fadb73e476139ff7a3d2db9ef12 (commit) via 4889e87bcc9b6530b46cdf9e4960c48dab8acfa9 (commit) via 4cabe4dfe2d84dc194b92e0dbc94f3653ff0546d (commit) via 760935cc31476eb1fe4c0cc72a2e8d98fcd31e96 (commit) via b6302e5ebacad60e12d4e8a59daf4d558b7b057a (commit) via edb9ba40fb968868acf55d9448174974b6061d81 (commit) via 65fafad05d3dfdbd1300c7a2cb0e089937d0e16e (commit) via 7529c64fdc86e2b8c7df5d507f184f6113e850b9 (commit) via ebfeafbd7027ce6700aebdd92e0f2e750e175a42 (commit) via 1a15d0805386250989d3360bda3e85424b82b007 (commit) from 7468f132438a52a510e85ab194ebc76c5ef479a5 (commit) - Log ----------------------------------------------------------------- commit 6c40714cc667b19f4a1f9acc2e6b87f19b855fbe Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Mon Dec 27 19:07:39 2010 +0200 Translation update done using Pootle. commit 96aa26f41dd2c227c2f04f6206b6a784a4d0f879 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Mon Dec 27 19:05:35 2010 +0200 Translation update done using Pootle. commit 9e845b4b111ffabaaf4d8f453a40091d97831cf9 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Mon Dec 27 19:05:08 2010 +0200 Translation update done using Pootle. commit fb7c3d7316400fadb73e476139ff7a3d2db9ef12 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Mon Dec 27 19:02:56 2010 +0200 Translation update done using Pootle. commit 4889e87bcc9b6530b46cdf9e4960c48dab8acfa9 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Mon Dec 27 19:02:07 2010 +0200 Translation update done using Pootle. commit 4cabe4dfe2d84dc194b92e0dbc94f3653ff0546d Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Mon Dec 27 19:00:01 2010 +0200 Translation update done using Pootle. commit 760935cc31476eb1fe4c0cc72a2e8d98fcd31e96 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Mon Dec 27 18:58:37 2010 +0200 Translation update done using Pootle. commit b6302e5ebacad60e12d4e8a59daf4d558b7b057a Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Mon Dec 27 18:35:26 2010 +0200 Translation update done using Pootle. commit edb9ba40fb968868acf55d9448174974b6061d81 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Mon Dec 27 18:33:18 2010 +0200 Translation update done using Pootle. commit 65fafad05d3dfdbd1300c7a2cb0e089937d0e16e Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Mon Dec 27 18:31:11 2010 +0200 Translation update done using Pootle. commit 7529c64fdc86e2b8c7df5d507f184f6113e850b9 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Mon Dec 27 17:00:00 2010 +0200 Translation update done using Pootle. commit ebfeafbd7027ce6700aebdd92e0f2e750e175a42 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Mon Dec 27 16:59:24 2010 +0200 Translation update done using Pootle. commit 1a15d0805386250989d3360bda3e85424b82b007 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Mon Dec 27 15:13:24 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/tr.po | 58 ++++++++++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 48 insertions(+), 10 deletions(-) diff --git a/po/tr.po b/po/tr.po index 62f3e79..a85b6c6 100644 --- a/po/tr.po +++ b/po/tr.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs VERSION\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-12-19 11:54+0100\n" -"PO-Revision-Date: 2010-12-26 00:07+0200\n" +"PO-Revision-Date: 2010-12-27 19:07+0200\n" "Last-Translator: Burak Yavuz <hitowerdigit(a)hotmail.com>\n" "Language-Team: none\n" "Language: tr\n" @@ -579,12 +579,11 @@ msgid "" "\"#faq1_26\"><abbr title=\"Frequently Asked Questions\">FAQ</abbr> 1.26</a> " "for suggestions." msgstr "" -"Ensure that all the scripts have the appropriate owner (eğer PHP güvenli " -"kipte çalışıyorsa, is running in safe mode, having some scripts with an " -"owner different from the owner of other scripts will be a problem). Öneriler " -"için <a href=\"#faq4_2\"> <abbr title=\"Sıkça Sorulan Sorular\">SSS</abbr> " -"4.2</a> ve <a href=\"#faq1_26\"><abbr title=\"Sıkça Sorulan Sorular\">SSS</abbr> " -"1.26</a>'ya bakın." +"Tüm betiklerin kendine özgü sahibi olduğundan emin olun (eğer PHP güvenli " +"kipte çalışıyorsa, sahibi diğer betiklerin sahibinden farklı olan bazı " +"betikler sorun olacaktır). Öneriler için <a href=\"#faq4_2\"> <abbr " +"title=\"Sıkça Sorulan Sorular\">SSS</abbr> 4.2</a> ve <a href=\"#faq1_26\"><abbr " +"title=\"Sıkça Sorulan Sorular\">SSS</abbr> 1.26</a>'ya bakın." #. type: Content of: <html><body><div><ol><li> #: ../phpmyadmin/Documentation.html:212 @@ -595,6 +594,12 @@ msgid "" "graphical installation. Creating a <tt>config.inc.php</tt> is still a quick " "way to get started and needed for some advanced features." msgstr "" +"Şimdi kurulumunuzu yapılandırmalısınız. Bunun kullanılabileceği iki yöntem " +"vardır. Geleneksel olarak kullanıcılar <tt>config.inc.php</tt> dosyasını " +"elle düzenlerler, ama artık grafiksel kurulumu tercih edenler için sihirbaz " +"stilinde kur betiği sağlanmıştır. <tt>Config.inc.php</tt> dosyası oluşturmak " +"başlamak için gereken hala hızlı bir yoldur ve bazı gelişmiş özellikler " +"için gereklidir." #. type: Content of: <html><body><div><ol><li><ul><li> #: ../phpmyadmin/Documentation.html:217 @@ -609,6 +614,17 @@ msgid "" "tt>. You'll need a few directives to get going, a simple configuration may " "look like this:" msgstr "" +"Elle dosya oluşturmak için basitçe ana (en üst seviyede) phpMyAdmin dizini " +"(<tt>index.php</tt> dosyasını içeren yerde) içinde <tt>config.inc.php</tt> " +"(küçük yapılandırma dosyasına sahip olmak için " +"<tt>config.sample.inc.php</tt> dosyasını kopyalayabilirsiniz) dosyası " +"oluşturmak için metin düzenleycinizi kullanın. phpMyAdmin ilk " +"<tt>libraries/config.default.php</tt> dosyasını yükler ve sonra " +"<tt>config.inc.php</tt> dosyasında bulduğu herşeyle birlikte bu değerleri " +"geçersiz kılar. Eğer varsayılan değer belirli ayar için tamamsa, " +"<tt>config.inc.php</tt> dosyası içine dahil etmeye gerek yoktur. İlerlemek " +"için birkaç yönergeye ihtiyanız olacaktır, bunun gibi basit bir " +"yapılandırma:" #. type: Content of: <html><body><div><ol><li><ul><li><pre> #: ../phpmyadmin/Documentation.html:229 @@ -633,7 +649,7 @@ msgstr "" #. type: Content of: <html><body><div><ol><li><ul><li> #: ../phpmyadmin/Documentation.html:237 msgid "Or, if you prefer to not be prompted every time you log in:" -msgstr "" +msgstr "Veya oturum açtığınız her seferde sormamasını tercih ediyorsanız:" #. type: Content of: <html><body><div><ol><li><ul><li><pre> #: ../phpmyadmin/Documentation.html:239 @@ -663,6 +679,8 @@ msgid "" "For a full explanation of possible configuration values, see the <a href=" "\"#config\">Configuration Section</a> of this document." msgstr "" +"Olası yapılandırma değerlerinin tam açıklaması için bu belgenin <a " +"href=\"#config\">Yapılandırma Bölümü</a>'ne bakın." #. type: Content of: <html><body><div><ol><li><ul><li> #: ../phpmyadmin/Documentation.html:250 @@ -672,6 +690,10 @@ msgid "" "<tt>config</tt> in the phpMyAdmin directory. This is a security measure. On " "a Linux/Unix system you can use the following commands:" msgstr "" +"<tt>Config.inc.php</tt> dosyasını elle düzenlemek yerine <a " +"href=\"setup/\">Kur Betiği</a>'ni kullanabilirsiniz. Öncelikle phpMyAdmin " +"dizini içinde elle <tt>config</tt> klasörü oluşturmalısınız. Bu güvenlik " +"tedbiridir. Linux/Unix sisteminde aşağıdaki komutları kullanabilirsiniz:" #. type: Content of: <html><body><div><ol><li><ul><li><pre> #: ../phpmyadmin/Documentation.html:257 @@ -690,6 +712,7 @@ msgstr "" #: ../phpmyadmin/Documentation.html:261 msgid "And to edit an existing configuration, copy it over first:" msgstr "" +"Ve mevcut yapılandırma dosyasını düzenlemek için, önce üzerine kopyalayın:" #. type: Content of: <html><body><div><ol><li><ul><li><pre> #: ../phpmyadmin/Documentation.html:263 @@ -698,6 +721,9 @@ msgid "" "cp config.inc.php config/ # copy current configuration for editing\n" "chmod o+w config/config.inc.php # give it world writable permissions\n" msgstr "" +"cp config.inc.php config/ # düzenlemek için şu anki yapılandırma " +"dosyasını kopyalayın\n" +"chmod o+w config/config.inc.php # herkese yazma yetkilerini verin\n" #. type: Content of: <html><body><div><ol><li><ul><li> #: ../phpmyadmin/Documentation.html:266 @@ -11720,11 +11746,11 @@ msgstr "phpMyAdmin - Benioku\n" #. type: Plain text #: ../phpmyadmin/README:5 msgid "A set of PHP-scripts to manage MySQL over the web." -msgstr "" +msgstr "Web üzerinde MySQL'i yönetmek için bir dizi PHP betiği." #. type: Title - #: ../phpmyadmin/README:7 -#, fuzzy, no-wrap +#, no-wrap msgid "Version 3.4.0-beta1\n" msgstr "Sürüm 3.4.0-dev\n" @@ -11750,6 +11776,18 @@ msgid "" " Sebastian Mendel <cybot_tm_at_users.sourceforge.net>\n" " [check Documentation.txt/.html file for more details]\n" msgstr "" +"Telif Hakkı (C) 1998-2000\n" +" Tobias Ratschiller <tobias_at_ratschiller.com>\n" +"Telif Hakkı (C) 2001-2010\n" +" Marc Delisle <marc_at_infomarc.info>\n" +" Olivier Müller <om_at_omnis.ch>\n" +" Robin Johnson <robbat2_at_users.sourceforge.net>\n" +" Alexander M. Turek <me_at_derrabus.de>\n" +" Michal Čihař <michal_at_cihar.com>\n" +" Garvin Hicking <me_at_supergarv.de>\n" +" Michael Keck <mkkeck_at_users.sourceforge.net>\n" +" Sebastian Mendel <cybot_tm_at_users.sourceforge.net>\n" +" [daha fazla ayrıntı için Documentation.txt/.html dosyasını kontrol edin]\n" #. type: Title ~ #: ../phpmyadmin/README:38 hooks/post-receive -- phpMyAdmin localized documentation

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA1-1208-gd45821d
by Michal Čihař 27 Dec '10

27 Dec '10

The branch, master has been updated via d45821d563798cf319b863205e95e67e809dc863 (commit) via bd0459356555470feb340923ff427a8663390a5d (commit) via f29403e5c7e5fb7b868cd8bc3208030f37b06a01 (commit) via a72b13995710bb51622d292bb4ec91170cb8ea61 (commit) via bc5145c4d2e338a03107aa491a4899f6ddb65225 (commit) via b8a972d981d663112c7aebc9c945030667a63c38 (commit) via a96db881dddd31c6859db86e0bffc0cadbaf5636 (commit) via 3836138506b88dbd657cd7e2d0ec1952a2a9930b (commit) via 6c68d0864edd5a95be12e480844ba79cc158999b (commit) via dafac6caea3c7b1b2bdd491a66a80e81249a32a4 (commit) via e480e17e5ea9d5438f6ac3ca9d7f069a1215a7d8 (commit) via 3f133dabfac471178960d748a38c486798e8ac4b (commit) from 83b84c7925a30ab7e69bcfd01a2c8ff110b5be0a (commit) - Log ----------------------------------------------------------------- commit d45821d563798cf319b863205e95e67e809dc863 Merge: 83b84c7925a30ab7e69bcfd01a2c8ff110b5be0a bd0459356555470feb340923ff427a8663390a5d Author: Michal Čihař <michal(a)cihar.com> Date: Mon Dec 27 17:31:28 2010 +0100 Merge remote branch 'pootle/master' Conflicts: po/tr.po commit bd0459356555470feb340923ff427a8663390a5d Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Mon Dec 27 16:09:25 2010 +0200 Translation update done using Pootle. commit f29403e5c7e5fb7b868cd8bc3208030f37b06a01 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Mon Dec 27 15:20:50 2010 +0200 Translation update done using Pootle. commit a72b13995710bb51622d292bb4ec91170cb8ea61 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Mon Dec 27 15:20:35 2010 +0200 Translation update done using Pootle. commit bc5145c4d2e338a03107aa491a4899f6ddb65225 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Mon Dec 27 15:20:01 2010 +0200 Translation update done using Pootle. commit b8a972d981d663112c7aebc9c945030667a63c38 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Mon Dec 27 15:18:52 2010 +0200 Translation update done using Pootle. commit a96db881dddd31c6859db86e0bffc0cadbaf5636 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Mon Dec 27 15:17:08 2010 +0200 Translation update done using Pootle. commit 3836138506b88dbd657cd7e2d0ec1952a2a9930b Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Mon Dec 27 15:16:53 2010 +0200 Translation update done using Pootle. commit 6c68d0864edd5a95be12e480844ba79cc158999b Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Mon Dec 27 15:16:45 2010 +0200 Translation update done using Pootle. commit dafac6caea3c7b1b2bdd491a66a80e81249a32a4 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Mon Dec 27 15:16:26 2010 +0200 Translation update done using Pootle. commit e480e17e5ea9d5438f6ac3ca9d7f069a1215a7d8 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Mon Dec 27 15:16:12 2010 +0200 Translation update done using Pootle. commit 3f133dabfac471178960d748a38c486798e8ac4b Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Mon Dec 27 15:15:49 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/tr.po | 29 +++++++++++++---------------- 1 files changed, 13 insertions(+), 16 deletions(-) diff --git a/po/tr.po b/po/tr.po index 8a624f0..df136a8 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-beta1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-12-27 07:14-0500\n" -"PO-Revision-Date: 2010-12-23 23:46+0200\n" +"PO-Revision-Date: 2010-12-27 16:09+0200\n" "Last-Translator: Burak Yavuz <hitowerdigit(a)hotmail.com>\n" "Language-Team: turkish <tr(a)li.org>\n" +"Language: tr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: tr\n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Pootle 2.0.5\n" @@ -949,7 +949,7 @@ msgstr "İzleme verisi siliniyor" #: js/messages.php:36 msgid "Dropping Primary Key/Index" -msgstr "Birincil Anaktar/İndeks Kaldırılıyor" +msgstr "Birincil Anahtar/İndeks Kaldırılıyor" #: js/messages.php:37 msgid "This operation could take a long time. Proceed anyway?" @@ -1034,7 +1034,7 @@ msgstr "Sütun Kaldırılıyor" #: js/messages.php:67 msgid "Adding Primary Key" -msgstr "Birincil Anaktar Ekleniyor" +msgstr "Birincil Anahtar Ekleniyor" #: js/messages.php:68 libraries/relation.lib.php:81 pmd_general.php:388 #: pmd_general.php:545 pmd_general.php:593 pmd_general.php:669 @@ -1084,13 +1084,12 @@ msgstr "Sıralı Düzenleme" #: js/messages.php:89 msgid "Hide search criteria" -msgstr "" +msgstr "Arama kriterini gizle" #: js/messages.php:90 -#, fuzzy #| msgid "Show query chart" msgid "Show search criteria" -msgstr "Sorgu çizelgesini göster" +msgstr "Arama kriterini göster" #: js/messages.php:93 tbl_change.php:294 tbl_indexes.php:198 #: tbl_indexes.php:223 @@ -1107,7 +1106,7 @@ msgstr "Dış Anahtarı seç" #: js/messages.php:98 msgid "Please select the primary key or a unique key" -msgstr "Lütfen birincil anaktarı veya benzersiz anahtarı seçin" +msgstr "Lütfen birincil anahtarı veya benzersiz anahtarı seçin" #: js/messages.php:99 pmd_general.php:89 tbl_relation.php:545 msgid "Choose column to display" @@ -1439,7 +1438,7 @@ msgstr "İndeksler" #: tbl_structure.php:154 tbl_structure.php:158 tbl_structure.php:564 #: tbl_tracking.php:316 msgid "Unique" -msgstr "Eşsiz" +msgstr "Benzersiz" #: libraries/Index.class.php:444 tbl_tracking.php:317 msgid "Packed" @@ -7935,7 +7934,7 @@ msgstr "" "İfadeler çalıştırılırken sunucu tarafından disk üzerindeki geçici tablo " "sayıları otomatik olarak oluşturuldu. Eğer Created_tmp_disk_tables değeri " "büyük ise, geçici tabloların disk tabanlı yerine bellek tabanlı olamasına " -"sebep olmak için tmp_table_size değerini arttırmak isteyebilirsiniz." +"sebep olmak için tmp_table_size değerini arttırmak isteyebilirsiniz." #: server_status.php:49 msgid "How many temporary files mysqld has created." @@ -9644,24 +9643,22 @@ msgid "Browse distinct values" msgstr "Belirgin değerlere gözat" #: tbl_structure.php:165 tbl_structure.php:166 -#, fuzzy #| msgid "Adding Primary Key" msgid "Add primary key" -msgstr "Birincil Anaktar Ekleniyor" +msgstr "Birincil anahtar ekle" #: tbl_structure.php:167 tbl_structure.php:168 -#, fuzzy #| msgid "Apply index(s)" msgid "Add index" -msgstr "İndeks(leri)i uygula" +msgstr "İndeks ekle" #: tbl_structure.php:169 tbl_structure.php:170 msgid "Add unique index" -msgstr "" +msgstr "Benzersiz indeks ekle" #: tbl_structure.php:171 tbl_structure.php:172 msgid "Add FULLTEXT index" -msgstr "" +msgstr "FULLTEXT indeks ekle" #: tbl_structure.php:384 msgctxt "None for default" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA1-1196-g83b84c7
by Marc Delisle 27 Dec '10

27 Dec '10

The branch, master has been updated via 83b84c7925a30ab7e69bcfd01a2c8ff110b5be0a (commit) from 6c0e5fd7107e7d6719f8cd770a5d04da0c001c84 (commit) - Log ----------------------------------------------------------------- commit 83b84c7925a30ab7e69bcfd01a2c8ff110b5be0a Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Dec 27 09:14:17 2010 -0500 Add a space after the icon ----------------------------------------------------------------------- Summary of changes: js/sql.js | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/js/sql.js b/js/sql.js index 7e85e46..d9ecdea 100644 --- a/js/sql.js +++ b/js/sql.js @@ -75,7 +75,7 @@ function appendInlineAnchor(disp_mode) { .addClass('inline_edit_anchor') .find('a').attr('href', '#') .find('span') - .text(PMA_messages['strInlineEdit']) + .text(' ' + PMA_messages['strInlineEdit']) .prepend($img_object); $cloned_tr.insertAfter($this_tr); @@ -99,7 +99,7 @@ function appendInlineAnchor(disp_mode) { $cloned_anchor.addClass('inline_edit_anchor') .find('a').attr('href', '#') .find('span') - .text(PMA_messages['strInlineEdit']) + .text(' ' + PMA_messages['strInlineEdit']) .prepend($img_object); $this_td.after($cloned_anchor); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA1-1195-g6c0e5fd
by Marc Delisle 27 Dec '10

27 Dec '10

The branch, master has been updated via 6c0e5fd7107e7d6719f8cd770a5d04da0c001c84 (commit) from 5b4938bae5705661e1d5a8a87fbd49b8d8323a0c (commit) - Log ----------------------------------------------------------------- commit 6c0e5fd7107e7d6719f8cd770a5d04da0c001c84 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Dec 27 09:07:05 2010 -0500 Inline edit icon ----------------------------------------------------------------------- Summary of changes: js/sql.js | 4 ++++ themes/darkblue_orange/img/b_inline_edit.png | Bin 0 -> 369 bytes themes/original/img/b_inline_edit.png | Bin 0 -> 369 bytes 3 files changed, 4 insertions(+), 0 deletions(-) create mode 100644 themes/darkblue_orange/img/b_inline_edit.png create mode 100644 themes/original/img/b_inline_edit.png diff --git a/js/sql.js b/js/sql.js index 5a359c5..7e85e46 100644 --- a/js/sql.js +++ b/js/sql.js @@ -68,6 +68,8 @@ function appendInlineAnchor(disp_mode) { var $cloned_tr = $this_tr.clone(); var $img_object = $cloned_tr.find('img:first').attr('title', PMA_messages['strInlineEdit']); + var img_src = $img_object.attr('src').replace(/b_edit/,'b_inline_edit'); + $img_object.attr('src', img_src); $cloned_tr.find('td') .addClass('inline_edit_anchor') @@ -91,6 +93,8 @@ function appendInlineAnchor(disp_mode) { var $cloned_anchor = $this_td.clone(); var $img_object = $cloned_anchor.find('img').attr('title', PMA_messages['strInlineEdit']); + var img_src = $img_object.attr('src').replace(/b_edit/,'b_inline_edit'); + $img_object.attr('src', img_src); $cloned_anchor.addClass('inline_edit_anchor') .find('a').attr('href', '#') diff --git a/themes/darkblue_orange/img/b_inline_edit.png b/themes/darkblue_orange/img/b_inline_edit.png new file mode 100644 index 0000000..98977eb Binary files /dev/null and b/themes/darkblue_orange/img/b_inline_edit.png differ diff --git a/themes/original/img/b_inline_edit.png b/themes/original/img/b_inline_edit.png new file mode 100644 index 0000000..98977eb Binary files /dev/null and b/themes/original/img/b_inline_edit.png differ hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA1-1194-g5b4938b
by Marc Delisle 27 Dec '10

27 Dec '10

The branch, master has been updated via 5b4938bae5705661e1d5a8a87fbd49b8d8323a0c (commit) via ab393d3f820ab03bb484a0bb673f1c4caf9d3596 (commit) from 8a8986d9da55d2ef7951f7fcb59ec7a01f9a8b63 (commit) - Log ----------------------------------------------------------------- commit 5b4938bae5705661e1d5a8a87fbd49b8d8323a0c Merge: ab393d3f820ab03bb484a0bb673f1c4caf9d3596 8a8986d9da55d2ef7951f7fcb59ec7a01f9a8b63 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Dec 27 08:30:15 2010 -0500 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit ab393d3f820ab03bb484a0bb673f1c4caf9d3596 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Dec 27 08:29:31 2010 -0500 Bug #3141327 (Foreign key input options) ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/relation.lib.php | 55 +++++++++++++++++++++++++------------------ 2 files changed, 33 insertions(+), 23 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1e7c645..da67ab5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -127,6 +127,7 @@ - [interface] Use less noisy message and remove disable link on server charts and database statistics. + rfe #3141330 [relation] When displaying results, show a link to the foreign table even when phpMyAdmin configuration storage is not active +- bug #3141327 [relation] Foreign key input options 3.3.10.0 (not yet released) diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php index 74800fe..960e890 100644 --- a/libraries/relation.lib.php +++ b/libraries/relation.lib.php @@ -840,7 +840,9 @@ function PMA__foreignDropdownBuild($foreign, $data, $mode) { $reloptions = array(); - if ($mode == 'id-content') { + // id-only is a special mode used when no foreign display column + // is available + if ($mode == 'id-content' || $mode == 'id-only') { // sort for id-content if ($GLOBALS['cfg']['NaturalOrder']) { uksort($foreign, 'strnatcasecmp'); @@ -857,7 +859,6 @@ function PMA__foreignDropdownBuild($foreign, $data, $mode) } foreach ($foreign as $key => $value) { - if (PMA_strlen($value) <= $GLOBALS['cfg']['LimitChars']) { $vtitle = ''; $value = htmlspecialchars($value); @@ -866,7 +867,7 @@ function PMA__foreignDropdownBuild($foreign, $data, $mode) $value = htmlspecialchars(substr($value, 0, $GLOBALS['cfg']['LimitChars']) . '...'); } - $reloption = ' <option value="' . htmlspecialchars($key) . '"'; + $reloption = '<option value="' . htmlspecialchars($key) . '"'; if ($vtitle != '') { $reloption .= ' title="' . $vtitle . '"'; } @@ -876,9 +877,11 @@ function PMA__foreignDropdownBuild($foreign, $data, $mode) } if ($mode == 'content-id') { - $reloptions[] = $reloption . '>' . $value . ' - ' . htmlspecialchars($key) . '</option>' . "\n"; - } else { - $reloptions[] = $reloption . '>' . htmlspecialchars($key) . ' - ' . $value . '</option>' . "\n"; + $reloptions[] = $reloption . '>' . $value . ' - ' . htmlspecialchars($key) . '</option>'; + } elseif ($mode == 'id-content') { + $reloptions[] = $reloption . '>' . htmlspecialchars($key) . ' - ' . $value . '</option>'; + } elseif ($mode == 'id-only') { + $reloptions[] = $reloption . '>' . htmlspecialchars($key) . '</option>'; } } // end foreach @@ -925,33 +928,39 @@ function PMA_foreignDropdown($disp_row, $foreign_field, $foreign_display, $data, // put the dropdown sections in correct order $top = array(); - $bot = array(); - if (PMA_isValid($GLOBALS['cfg']['ForeignKeyDropdownOrder'], 'array')) { - if (PMA_isValid($GLOBALS['cfg']['ForeignKeyDropdownOrder'][0])) { - $top = PMA__foreignDropdownBuild($foreign, $data, - $GLOBALS['cfg']['ForeignKeyDropdownOrder'][0]); - } - if (PMA_isValid($GLOBALS['cfg']['ForeignKeyDropdownOrder'][1])) { - $bot = PMA__foreignDropdownBuild($foreign, $data, - $GLOBALS['cfg']['ForeignKeyDropdownOrder'][1]); + $bottom = array(); + if ($foreign_display) { + if (PMA_isValid($GLOBALS['cfg']['ForeignKeyDropdownOrder'], 'array')) { + if (PMA_isValid($GLOBALS['cfg']['ForeignKeyDropdownOrder'][0])) { + $top = PMA__foreignDropdownBuild($foreign, $data, + $GLOBALS['cfg']['ForeignKeyDropdownOrder'][0]); + } + if (PMA_isValid($GLOBALS['cfg']['ForeignKeyDropdownOrder'][1])) { + $bottom = PMA__foreignDropdownBuild($foreign, $data, + $GLOBALS['cfg']['ForeignKeyDropdownOrder'][1]); + } + } else { + $top = PMA__foreignDropdownBuild($foreign, $data, 'id-content'); + $bottom = PMA__foreignDropdownBuild($foreign, $data, 'content-id'); } } else { - $top = PMA__foreignDropdownBuild($foreign, $data, 'id-content'); - $bot = PMA__foreignDropdownBuild($foreign, $data, 'content-id'); + $top = PMA__foreignDropdownBuild($foreign, $data, 'id-only'); } // beginning of dropdown - $ret = '<option value=""> </option>' . "\n"; - + $ret = '<option value=""> </option>'; $top_count = count($top); if ($max == -1 || $top_count < $max) { $ret .= implode('', $top); - if ($top_count > 0) { - $ret .= ' <option value=""> </option>' . "\n"; - $ret .= ' <option value=""> </option>' . "\n"; + if ($foreign_display && $top_count > 0) { + // this empty option is to visually mark the beginning of the + // second series of values (bottom) + $ret .= '<option value=""> </option>'; } } - $ret .= implode('', $bot); + if ($foreign_display) { + $ret .= implode('', $bottom); + } return $ret; } // end of 'PMA_foreignDropdown()' function hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA1-1192-g8a8986d
by Michal Čihař 27 Dec '10

27 Dec '10

The branch, master has been updated via 8a8986d9da55d2ef7951f7fcb59ec7a01f9a8b63 (commit) from 62e17e3193e483dc0f4d90c0cb22cafd95068359 (commit) - Log ----------------------------------------------------------------- commit 8a8986d9da55d2ef7951f7fcb59ec7a01f9a8b63 Author: Michal Čihař <michal(a)cihar.com> Date: Mon Dec 27 14:20:35 2010 +0100 Update php-gettext to 1.0.11. There are two changes: - fix possible wrong result of npgettext - cosmetical renaming of some variables ----------------------------------------------------------------------- Summary of changes: libraries/php-gettext/gettext.inc | 78 +++++++++++++++++++------------------ libraries/php-gettext/gettext.php | 10 ++++- 2 files changed, 48 insertions(+), 40 deletions(-) mode change 100644 => 100755 libraries/php-gettext/gettext.php diff --git a/libraries/php-gettext/gettext.inc b/libraries/php-gettext/gettext.inc index 399a0f2..00b9666 100644 --- a/libraries/php-gettext/gettext.inc +++ b/libraries/php-gettext/gettext.inc @@ -32,7 +32,6 @@ LC_MESSAGES 5 LC_ALL 6 */ - // LC_MESSAGES is not available if php-gettext is not loaded // while the other constants are already available from session extension. if (!defined('LC_MESSAGES')) { @@ -229,7 +228,9 @@ function _setlocale($category, $locale) { } // Allow locale to be changed on the go for one translation domain. global $text_domains, $default_domain; - unset($text_domains[$default_domain]->l10n); + if (array_key_exists($default_domain, $text_domains)) { + unset($text_domains[$default_domain]->l10n); + } return $CURRENTLOCALE; } } @@ -288,9 +289,9 @@ function __($msgid) { /** * Plural version of gettext. */ -function _ngettext($single, $plural, $number) { +function _ngettext($singular, $plural, $number) { $l10n = _get_reader(); - return _encode($l10n->ngettext($single, $plural, $number)); + return _encode($l10n->ngettext($singular, $plural, $number)); } /** @@ -304,9 +305,9 @@ function _dgettext($domain, $msgid) { /** * Plural version of dgettext. */ -function _dngettext($domain, $single, $plural, $number) { +function _dngettext($domain, $singular, $plural, $number) { $l10n = _get_reader($domain); - return _encode($l10n->ngettext($single, $plural, $number)); + return _encode($l10n->ngettext($singular, $plural, $number)); } /** @@ -319,9 +320,9 @@ function _dcgettext($domain, $msgid, $category) { /** * Plural version of dcgettext. */ -function _dcngettext($domain, $single, $plural, $number, $category) { +function _dcngettext($domain, $singular, $plural, $number, $category) { $l10n = _get_reader($domain, $category); - return _encode($l10n->ngettext($single, $plural, $number)); + return _encode($l10n->ngettext($singular, $plural, $number)); } /** @@ -405,29 +406,29 @@ function T_($msgid) { if (_check_locale_and_function()) return _($msgid); return __($msgid); } -function T_ngettext($single, $plural, $number) { +function T_ngettext($singular, $plural, $number) { if (_check_locale_and_function()) - return ngettext($single, $plural, $number); - else return _ngettext($single, $plural, $number); + return ngettext($singular, $plural, $number); + else return _ngettext($singular, $plural, $number); } function T_dgettext($domain, $msgid) { if (_check_locale_and_function()) return dgettext($domain, $msgid); else return _dgettext($domain, $msgid); } -function T_dngettext($domain, $single, $plural, $number) { +function T_dngettext($domain, $singular, $plural, $number) { if (_check_locale_and_function()) - return dngettext($domain, $single, $plural, $number); - else return _dngettext($domain, $single, $plural, $number); + return dngettext($domain, $singular, $plural, $number); + else return _dngettext($domain, $singular, $plural, $number); } function T_dcgettext($domain, $msgid, $category) { if (_check_locale_and_function()) return dcgettext($domain, $msgid, $category); else return _dcgettext($domain, $msgid, $category); } -function T_dcngettext($domain, $single, $plural, $number, $category) { +function T_dcngettext($domain, $singular, $plural, $number, $category) { if (_check_locale_and_function()) - return dcngettext($domain, $single, $plural, $number, $category); - else return _dcngettext($domain, $single, $plural, $number, $category); + return dcngettext($domain, $singular, $plural, $number, $category); + else return _dcngettext($domain, $singular, $plural, $number, $category); } function T_pgettext($context, $msgid) { @@ -451,26 +452,27 @@ function T_dcpgettext($domain, $context, $msgid, $category) { return _dcpgettext($domain, $context, $msgid, $category); } -function T_npgettext($context, $singular, $plural) { +function T_npgettext($context, $singular, $plural, $number) { if (_check_locale_and_function('npgettext')) - return npgettext($context, $single, $plural, $number); + return npgettext($context, $singular, $plural, $number); else - return _npgettext($context, $single, $plural, $number); + return _npgettext($context, $singular, $plural, $number); } -function T_dnpgettext($domain, $context, $singular, $plural) { +function T_dnpgettext($domain, $context, $singular, $plural, $number) { if (_check_locale_and_function('dnpgettext')) - return dnpgettext($domain, $context, $single, $plural, $number); + return dnpgettext($domain, $context, $singular, $plural, $number); else - return _dnpgettext($domain, $context, $single, $plural, $number); + return _dnpgettext($domain, $context, $singular, $plural, $number); } -function T_dcnpgettext($domain, $context, $singular, $plural, $category) { +function T_dcnpgettext($domain, $context, $singular, $plural, + $number, $category) { if (_check_locale_and_function('dcnpgettext')) - return dcnpgettext($domain, $context, $single, + return dcnpgettext($domain, $context, $singular, $plural, $number, $category); else - return _dcnpgettext($domain, $context, $single, + return _dcnpgettext($domain, $context, $singular, $plural, $number, $category); } @@ -494,39 +496,39 @@ if (!function_exists('gettext')) { function _($msgid) { return __($msgid); } - function ngettext($single, $plural, $number) { - return _ngettext($single, $plural, $number); + function ngettext($singular, $plural, $number) { + return _ngettext($singular, $plural, $number); } function dgettext($domain, $msgid) { return _dgettext($domain, $msgid); } - function dngettext($domain, $single, $plural, $number) { - return _dngettext($domain, $single, $plural, $number); + function dngettext($domain, $singular, $plural, $number) { + return _dngettext($domain, $singular, $plural, $number); } function dcgettext($domain, $msgid, $category) { return _dcgettext($domain, $msgid, $category); } - function dcngettext($domain, $single, $plural, $number, $category) { - return _dcngettext($domain, $single, $plural, $number, $category); + function dcngettext($domain, $singular, $plural, $number, $category) { + return _dcngettext($domain, $singular, $plural, $number, $category); } function pgettext($context, $msgid) { return _pgettext($context, $msgid); } - function npgettext($context, $single, $plural, $number) { - return _npgettext($context, $single, $plural, $number); + function npgettext($context, $singular, $plural, $number) { + return _npgettext($context, $singular, $plural, $number); } function dpgettext($domain, $context, $msgid) { return _dpgettext($domain, $context, $msgid); } - function dnpgettext($domain, $context, $single, $plural, $number) { - return _dnpgettext($domain, $context, $single, $plural, $number); + function dnpgettext($domain, $context, $singular, $plural, $number) { + return _dnpgettext($domain, $context, $singular, $plural, $number); } function dcpgettext($domain, $context, $msgid, $category) { return _dcpgettext($domain, $context, $msgid, $category); } - function dcnpgettext($domain, $context, $single, $plural, + function dcnpgettext($domain, $context, $singular, $plural, $number, $category) { - return _dcnpgettext($domain, $context, $single, $plural, + return _dcnpgettext($domain, $context, $singular, $plural, $number, $category); } } diff --git a/libraries/php-gettext/gettext.php b/libraries/php-gettext/gettext.php old mode 100644 new mode 100755 index 80d2497..5064047 --- a/libraries/php-gettext/gettext.php +++ b/libraries/php-gettext/gettext.php @@ -418,8 +418,14 @@ class gettext_reader { } function npgettext($context, $singular, $plural, $number) { - $singular = $context . chr(4) . $singular; - return $this->ngettext($singular, $plural, $number); + $key = $context . chr(4) . $singular; + $ret = $this->ngettext($key, $plural, $number); + if (strpos($ret, "\004") !== FALSE) { + return $singular; + } else { + return $ret; + } + } } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA1-1191-g62e17e3
by Michal Čihař 27 Dec '10

27 Dec '10

The branch, master has been updated via 62e17e3193e483dc0f4d90c0cb22cafd95068359 (commit) via e1594091584c0244af087fe0a040c4afd2567686 (commit) via 52dabea3a30d555fcaf2ebc264d817beaf02e3c1 (commit) via 6a505f123f28b56032b816934cca66bf106d4fd2 (commit) via bc04ce72187fb6b8a870dc8967a414692cf61448 (commit) via 7661ea07a7eb316e5fa374457e62e59d194405c6 (commit) via 97ff4126a185cb3a0a09e559c5c6273f984bc2be (commit) via 506631f04a58bc5d2918e89982ea07e18fe6f514 (commit) via 04279941304b5f9572f5c92919d41e2ed48e894b (commit) via 51449c580587a18dcb75c7e228ab0c18c72f5399 (commit) via 329432edeba2106ff4ab792b6c9264b74c6f60e3 (commit) via f61dff6e8827e17b15577c3de0b2dc1792d71810 (commit) via f3aa1a2ace92f0b4205de3c373b1e449b866d3be (commit) via 53cb832151ae20e5e2b85950b88e570f0b0badfb (commit) via 12279aaebe0ffedcc066566fdc739daec090f777 (commit) via e4d77ec99e11ee207ee6bcf788e207d42c10f056 (commit) via 834f4b8dd6735e0e92fa7a0e1148e1e9767b6fbd (commit) via eb307c0f202e312e80201471c4784457a36f50da (commit) via fe14cb0f8ad78897e9035c255415a14d102e9f74 (commit) via 6d9e57cbd1c6a2ae9e3fc17ff74c5250eceec798 (commit) via 587e029831a772f3c1a62e94a8ebfff4315df379 (commit) via 6f5170c418aac1bff7c1acde04cabce6984aef46 (commit) via 129e29b906f70ccc83cbc48345b4b7d4e91c5b03 (commit) via 8a41d38a74a4e10c382665e59deedf5b4228db8c (commit) via af173c6cc38e9cff870957defdad386e905f229b (commit) via aacc14b0c3619a780fd0ae41ed4dbc847bfc0a5a (commit) via cf488bc416835f72ecaaa2dd19cd9a2778ae3626 (commit) via 5d537db2245dd9822a3f75e6cf7d16dcf1be906e (commit) via af4caf710544301deabc6db7def393cc2aeaac04 (commit) via 976b9d90d7bb7a51c4b808549a17aaf560f35b9e (commit) via 64d3cc1542f5d87746f63ae334c394d376921509 (commit) via bbc6eaadb25d48dbcd62bc67857a5ebd71956dab (commit) via 788a1feb0d69a2b97044dab2e230bac31db5a900 (commit) via 83b8cbea00232c497d537c46f3aa45c60b00166a (commit) via cea623a412d1531620ff9da3234e1504909be829 (commit) via 141fcf91a6adf86aeffa75447060cfeb2d3bfe05 (commit) via 9260acdc24f4fc481e10bcce1ac58dd973e3c5d5 (commit) via 517996369f91c49d4ccc3a53115599d681632a57 (commit) via 4f7018e58e15c0a4c0a0671ae8bd6c23ba7e0764 (commit) via 13b9bf62a0a9b198d6fbeef01f9bd46a814b7322 (commit) via e419185d28c7a5f35b7db45b32f9b680c598cc9a (commit) via 6c0206cbc1fd7e6cb9a10f90587672858148f634 (commit) via 37b10cdf2246eea40294c7f37c8076f224a360a5 (commit) from 0bc06b2a1aee28051387e98bf357ff75b8c621a0 (commit) - Log ----------------------------------------------------------------- commit 62e17e3193e483dc0f4d90c0cb22cafd95068359 Author: Michal Čihař <michal(a)cihar.com> Date: Mon Dec 27 13:17:09 2010 +0100 Czech translation update. commit e1594091584c0244af087fe0a040c4afd2567686 Merge: 0bc06b2a1aee28051387e98bf357ff75b8c621a0 52dabea3a30d555fcaf2ebc264d817beaf02e3c1 Author: Michal Čihař <michal(a)cihar.com> Date: Mon Dec 27 13:16:39 2010 +0100 Merge remote branch 'pootle/master' Conflicts: po/en_GB.po po/fr.po commit 52dabea3a30d555fcaf2ebc264d817beaf02e3c1 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Dec 27 14:11:44 2010 +0200 Translation update done using Pootle. commit 6a505f123f28b56032b816934cca66bf106d4fd2 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Dec 27 14:10:29 2010 +0200 Translation update done using Pootle. commit bc04ce72187fb6b8a870dc8967a414692cf61448 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Dec 27 14:10:04 2010 +0200 Translation update done using Pootle. commit 7661ea07a7eb316e5fa374457e62e59d194405c6 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Dec 27 14:09:49 2010 +0200 Translation update done using Pootle. commit 97ff4126a185cb3a0a09e559c5c6273f984bc2be Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Dec 27 14:09:02 2010 +0200 Translation update done using Pootle. commit 506631f04a58bc5d2918e89982ea07e18fe6f514 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Dec 27 14:08:28 2010 +0200 Translation update done using Pootle. commit 04279941304b5f9572f5c92919d41e2ed48e894b Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Dec 27 14:07:59 2010 +0200 Translation update done using Pootle. commit 51449c580587a18dcb75c7e228ab0c18c72f5399 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Dec 27 14:07:34 2010 +0200 Translation update done using Pootle. commit 329432edeba2106ff4ab792b6c9264b74c6f60e3 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Dec 27 14:07:05 2010 +0200 Translation update done using Pootle. commit f61dff6e8827e17b15577c3de0b2dc1792d71810 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Dec 27 14:06:50 2010 +0200 Translation update done using Pootle. commit f3aa1a2ace92f0b4205de3c373b1e449b866d3be Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Dec 27 14:06:35 2010 +0200 Translation update done using Pootle. commit 53cb832151ae20e5e2b85950b88e570f0b0badfb Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Dec 27 14:05:49 2010 +0200 Translation update done using Pootle. commit 12279aaebe0ffedcc066566fdc739daec090f777 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Dec 27 14:05:37 2010 +0200 Translation update done using Pootle. commit e4d77ec99e11ee207ee6bcf788e207d42c10f056 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Dec 27 14:05:06 2010 +0200 Translation update done using Pootle. commit 834f4b8dd6735e0e92fa7a0e1148e1e9767b6fbd Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Dec 27 14:04:28 2010 +0200 Translation update done using Pootle. commit eb307c0f202e312e80201471c4784457a36f50da Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Dec 27 14:04:04 2010 +0200 Translation update done using Pootle. commit fe14cb0f8ad78897e9035c255415a14d102e9f74 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Dec 27 14:02:35 2010 +0200 Translation update done using Pootle. commit 6d9e57cbd1c6a2ae9e3fc17ff74c5250eceec798 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Dec 27 14:02:22 2010 +0200 Translation update done using Pootle. commit 587e029831a772f3c1a62e94a8ebfff4315df379 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Dec 27 14:02:16 2010 +0200 Translation update done using Pootle. commit 6f5170c418aac1bff7c1acde04cabce6984aef46 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Dec 27 14:02:04 2010 +0200 Translation update done using Pootle. commit 129e29b906f70ccc83cbc48345b4b7d4e91c5b03 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Dec 27 14:01:50 2010 +0200 Translation update done using Pootle. commit 8a41d38a74a4e10c382665e59deedf5b4228db8c Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Dec 27 14:01:14 2010 +0200 Translation update done using Pootle. commit af173c6cc38e9cff870957defdad386e905f229b Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Dec 27 14:01:09 2010 +0200 Translation update done using Pootle. commit aacc14b0c3619a780fd0ae41ed4dbc847bfc0a5a Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Dec 27 14:00:52 2010 +0200 Translation update done using Pootle. commit cf488bc416835f72ecaaa2dd19cd9a2778ae3626 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Dec 27 14:00:34 2010 +0200 Translation update done using Pootle. commit 5d537db2245dd9822a3f75e6cf7d16dcf1be906e Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Dec 27 13:59:57 2010 +0200 Translation update done using Pootle. commit af4caf710544301deabc6db7def393cc2aeaac04 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Dec 27 13:59:08 2010 +0200 Translation update done using Pootle. commit 976b9d90d7bb7a51c4b808549a17aaf560f35b9e Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Dec 27 13:58:44 2010 +0200 Translation update done using Pootle. commit 64d3cc1542f5d87746f63ae334c394d376921509 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Dec 27 13:55:37 2010 +0200 Translation update done using Pootle. commit bbc6eaadb25d48dbcd62bc67857a5ebd71956dab Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Dec 27 13:47:44 2010 +0200 Translation update done using Pootle. commit 788a1feb0d69a2b97044dab2e230bac31db5a900 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Dec 27 13:47:33 2010 +0200 Translation update done using Pootle. commit 83b8cbea00232c497d537c46f3aa45c60b00166a Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Dec 27 13:47:25 2010 +0200 Translation update done using Pootle. commit cea623a412d1531620ff9da3234e1504909be829 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Dec 27 13:47:14 2010 +0200 Translation update done using Pootle. commit 141fcf91a6adf86aeffa75447060cfeb2d3bfe05 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Dec 27 13:47:01 2010 +0200 Translation update done using Pootle. commit 9260acdc24f4fc481e10bcce1ac58dd973e3c5d5 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Dec 27 13:46:44 2010 +0200 Translation update done using Pootle. commit 517996369f91c49d4ccc3a53115599d681632a57 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Dec 27 13:46:00 2010 +0200 Translation update done using Pootle. commit 4f7018e58e15c0a4c0a0671ae8bd6c23ba7e0764 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Dec 27 13:45:55 2010 +0200 Translation update done using Pootle. commit 13b9bf62a0a9b198d6fbeef01f9bd46a814b7322 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Dec 27 13:45:49 2010 +0200 Translation update done using Pootle. commit e419185d28c7a5f35b7db45b32f9b680c598cc9a Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Dec 27 13:45:43 2010 +0200 Translation update done using Pootle. commit 6c0206cbc1fd7e6cb9a10f90587672858148f634 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Dec 27 13:45:29 2010 +0200 Translation update done using Pootle. commit 37b10cdf2246eea40294c7f37c8076f224a360a5 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Dec 27 13:45:21 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/cs.po | 44 ++++++++++++------------ po/en_GB.po | 19 ++++------ po/fr.po | 103 +++++++++++++++++++++++++++++------------------------------ 3 files changed, 81 insertions(+), 85 deletions(-) diff --git a/po/cs.po b/po/cs.po index 1e5eae5..c84d308 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-beta1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-12-27 07:14-0500\n" -"PO-Revision-Date: 2010-12-26 15:51+0100\n" +"PO-Revision-Date: 2010-12-27 13:17+0100\n" "Last-Translator: Michal Čihař <michal(a)cihar.com>\n" "Language-Team: czech <cs(a)li.org>\n" "MIME-Version: 1.0\n" @@ -617,8 +617,8 @@ msgstr "Sledování není zapnuté." #: db_structure.php:372 libraries/display_tbl.lib.php:1942 #, php-format msgid "" -"This view has at least this number of rows. Please refer to %sdocumentation%" -"s." +"This view has at least this number of rows. Please refer to %sdocumentation" +"%s." msgstr "" "Tento pohled má alespoň tolik řádek. Podrobnosti naleznete v %sdokumentaci%s." @@ -840,8 +840,8 @@ msgstr "Výpis byl uložen do souboru %s." #: import.php:58 #, php-format msgid "" -"You probably tried to upload too large file. Please refer to %sdocumentation%" -"s for ways to workaround this limit." +"You probably tried to upload too large file. Please refer to %sdocumentation" +"%s for ways to workaround this limit." msgstr "" "Pravděpodobně jste se pokusili nahrát příliš velký soubor. Přečtěte si " "prosím %sdokumentaci%s, jak toto omezení obejít." @@ -1606,8 +1606,8 @@ msgstr "Vítejte v %s" #: libraries/auth/config.auth.lib.php:106 #, php-format msgid "" -"You probably did not create a configuration file. You might want to use the %" -"1$ssetup script%2$s to create one." +"You probably did not create a configuration file. You might want to use the " +"%1$ssetup script%2$s to create one." msgstr "" "Pravděpodobná příčina je, že nemáte vytvořený konfigurační soubor. Pro jeho " "vytvoření by se vám mohl hodit %1$snastavovací skript%2$s." @@ -2078,7 +2078,7 @@ msgstr "Adresář určený pro upload souborů nemohl být otevřen" #: libraries/common.lib.php:2983 msgid "There are no files to upload" -msgstr "" +msgstr "Nebyl zvolen žádný soubor pro nahrání" #: libraries/config.values.php:95 libraries/export/htmlword.php:24 #: libraries/export/latex.php:41 libraries/export/odt.php:33 @@ -4535,8 +4535,8 @@ msgstr ", @TABLE@ bude nahrazen jménem tabulky" #, php-format msgid "" "This value is interpreted using %1$sstrftime%2$s, so you can use time " -"formatting strings. Additionally the following transformations will happen: %" -"3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details." +"formatting strings. Additionally the following transformations will happen: " +"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details." msgstr "" "Tato hodnota je interpretována pomocí %1$sstrftime%2$s, takže můžete použít " "libovolné řetězce pro formátování data a času. Dále budou provedena " @@ -6464,8 +6464,8 @@ msgid "" "For a list of available transformation options and their MIME type " "transformations, click on %stransformation descriptions%s" msgstr "" -"Pro seznam dostupných parametrů transformací a jejich MIME typů klikněte na %" -"spopisy transformací%s" +"Pro seznam dostupných parametrů transformací a jejich MIME typů klikněte na " +"%spopisy transformací%s" #: libraries/tbl_properties.inc.php:143 msgid "Transformation options" @@ -6506,8 +6506,8 @@ msgid "" "No description is available for this transformation.<br />Please ask the " "author what %s does." msgstr "" -"Pro tuto transformaci není dostupný žádný popis.<br />Zeptejte se autora co %" -"s dělá." +"Pro tuto transformaci není dostupný žádný popis.<br />Zeptejte se autora co " +"%s dělá." #: libraries/tbl_properties.inc.php:725 server_engines.php:56 #: tbl_operations.php:352 @@ -7126,8 +7126,8 @@ msgid "" "You can set more settings by modifying config.inc.php, eg. by using %sSetup " "script%s." msgstr "" -"Více věcí můžete nastavit úpravou config.inc.php, např. použitím %" -"sNastavovacího skriptu%s." +"Více věcí můžete nastavit úpravou config.inc.php, např. použitím " +"%sNastavovacího skriptu%s." #: prefs_manage.php:302 msgid "Save to browser's storage" @@ -7575,8 +7575,8 @@ msgstr "Odstranit databáze se stejnými jmény jako uživatelé." msgid "" "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege " "tables. The content of these tables may differ from the privileges the " -"server uses, if they have been changed manually. In this case, you should %" -"sreload the privileges%s before you continue." +"server uses, if they have been changed manually. In this case, you should " +"%sreload the privileges%s before you continue." msgstr "" "Poznámka: phpMyAdmin získává oprávnění přímo z tabulek MySQL. Obsah těchto " "tabulek se může lišit od oprávnění, která server právě používá, pokud byly " @@ -9047,8 +9047,8 @@ msgid "" "If using cookie authentication and %sLogin cookie store%s is not 0, %sLogin " "cookie validity%s must be set to a value less or equal to it." msgstr "" -"Při použití přihlašování přes cookies a při %sUkládádání přihlašovaci cookie%" -"s vyšší než 0 musí být %sPlatnost přihlašovací cookie%s nastavena na vyšší " +"Při použití přihlašování přes cookies a při %sUkládádání přihlašovaci cookie" +"%s vyšší než 0 musí být %sPlatnost přihlašovací cookie%s nastavena na vyšší " "hodnotu než je tato." #: setup/lib/index.lib.php:266 @@ -9059,8 +9059,8 @@ msgid "" "protection may not be reliable if your IP belongs to an ISP where thousands " "of users, including you, are connected to." msgstr "" -"Pokud to považujete za nutné, použijte další možnosti zabezpečení - %" -"somezení počítačů%s a %sseznam důvěryhodných proxy%s. Nicméně zabezpečení " +"Pokud to považujete za nutné, použijte další možnosti zabezpečení - " +"%somezení počítačů%s a %sseznam důvěryhodných proxy%s. Nicméně zabezpečení " "založené na IP adresách nemusí být spolehlivé, pokud je vaše IP adresa " "dynamicky přidělována poskytovatelem spolu s mnoha dalšími uživateli." diff --git a/po/en_GB.po b/po/en_GB.po index 3179533..d814082 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-beta1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-12-27 07:14-0500\n" -"PO-Revision-Date: 2010-12-15 19:14+0200\n" +"PO-Revision-Date: 2010-12-27 13:46+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: english-gb <en_GB(a)li.org>\n" +"Language: en_GB\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: en_GB\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.5\n" @@ -1083,13 +1083,12 @@ msgstr "Inline Edit" #: js/messages.php:89 msgid "Hide search criteria" -msgstr "" +msgstr "Hide search criteria" #: js/messages.php:90 -#, fuzzy #| msgid "Show query chart" msgid "Show search criteria" -msgstr "Show query chart" +msgstr "Show search criteria" #: js/messages.php:93 tbl_change.php:294 tbl_indexes.php:198 #: tbl_indexes.php:223 @@ -9572,24 +9571,22 @@ msgid "Browse distinct values" msgstr "Browse distinct values" #: tbl_structure.php:165 tbl_structure.php:166 -#, fuzzy #| msgid "Adding Primary Key" msgid "Add primary key" -msgstr "Adding Primary Key" +msgstr "Add primary key" #: tbl_structure.php:167 tbl_structure.php:168 -#, fuzzy #| msgid "Apply index(s)" msgid "Add index" -msgstr "Apply index(s)" +msgstr "Add index" #: tbl_structure.php:169 tbl_structure.php:170 msgid "Add unique index" -msgstr "" +msgstr "Add unique index" #: tbl_structure.php:171 tbl_structure.php:172 msgid "Add FULLTEXT index" -msgstr "" +msgstr "Add FULLTEXT index" #: tbl_structure.php:384 msgctxt "None for default" diff --git a/po/fr.po b/po/fr.po index e87b217..b133a8c 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-beta1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-12-27 07:14-0500\n" -"PO-Revision-Date: 2010-12-15 19:13+0200\n" +"PO-Revision-Date: 2010-12-27 14:11+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: french <fr(a)li.org>\n" +"Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Pootle 2.0.5\n" @@ -230,7 +230,7 @@ msgstr "Imprimer" #: db_export.php:30 msgid "View dump (schema) of database" -msgstr "Schéma et données de la base" +msgstr "Voir une exportation (schéma) de la base de données" #: db_export.php:34 db_printview.php:94 db_qbe.php:98 db_tracking.php:47 #: export.php:371 navigation.php:308 @@ -564,7 +564,7 @@ msgstr "Effectuer une nouvelle recherche dans la base de données" #: db_search.php:299 msgid "Word(s) or value(s) to search for (wildcard: \"%\"):" -msgstr "Mot ou valeur à rechercher (passe-partout: «%») :" +msgstr "Mot(s) ou valeur(s) à rechercher (passe-partout: «%») :" #: db_search.php:304 msgid "Find:" @@ -821,7 +821,7 @@ msgid "" "File %s already exists on server, change filename or check overwrite option." msgstr "" "Le fichier %s existe déjà sur le serveur, veuillez changer le nom, ou cocher " -"l'option «écraser»." +"l'option d'écrasement des fichiers existants." #: export.php:311 export.php:315 #, php-format @@ -1095,16 +1095,14 @@ msgid "Inline Edit" msgstr "Édition en place" #: js/messages.php:89 -#, fuzzy #| msgid "Hide query chart" msgid "Hide search criteria" -msgstr "Cacher le graphique des requêtes" +msgstr "Cacher les critères de recherche" #: js/messages.php:90 -#, fuzzy #| msgid "Show query chart" msgid "Show search criteria" -msgstr "Afficher le graphique des requêtes" +msgstr "Afficher les critères de recherche" #: js/messages.php:93 tbl_change.php:294 tbl_indexes.php:198 #: tbl_indexes.php:223 @@ -1864,7 +1862,7 @@ msgstr "Indice de serveur invalide: %s" #, php-format msgid "Invalid hostname for server %1$s. Please review your configuration." msgstr "" -"Nom d'hôte (hostname) invalide pour le serveur %1$s. Veuillez vérifier votre " +"Nom d'hôte invalide pour le serveur %1$s. Veuillez vérifier votre " "configuration." #: libraries/common.inc.php:637 libraries/config/messages.inc.php:482 @@ -2252,7 +2250,7 @@ msgid "" "If enabled user can enter any MySQL server in login form for cookie auth" msgstr "" "Si activé, permet d'entrer un nom de serveur MySQL sur le panneau de " -"connexion (mode cookie)" +"connexion en mode cookie" #: libraries/config/messages.inc.php:18 msgid "Allow login to any MySQL server" @@ -2266,7 +2264,7 @@ msgid "" msgstr "" "Activer ceci permet à une page située dans un domaine différent d'appeler " "phpMyAdmin à l'intérieur d'un cadre et représente un trou potentiel de " -"sécurité pour les attaques de script inter-cadre (cross-frame)." +"sécurité pour les attaques de script inter-cadre" #: libraries/config/messages.inc.php:20 msgid "Allow third party framing" @@ -2333,7 +2331,7 @@ msgstr "Édition des colonnes CHAR" #: libraries/config/messages.inc.php:32 msgid "Number of columns for CHAR/VARCHAR textareas" -msgstr "Nombre de colonnes pour les textareas CHAR/VARCHAR)" +msgstr "Nombre de colonnes pour les textareas CHAR/VARCHAR" #: libraries/config/messages.inc.php:33 msgid "CHAR textarea columns" @@ -2341,7 +2339,7 @@ msgstr "Taille horizontale pour un textarea contenant un CHAR" #: libraries/config/messages.inc.php:34 msgid "Number of rows for CHAR/VARCHAR textareas" -msgstr "Nombre de lignes pour les textareas CHAR/VARCHAR)" +msgstr "Nombre de lignes pour les textareas CHAR/VARCHAR" #: libraries/config/messages.inc.php:35 msgid "CHAR textarea rows" @@ -2373,12 +2371,12 @@ msgid "" "Whether a warning ("Are your really sure...") should be displayed " "when you're about to lose data" msgstr "" -"Un message devrait-il s'afficher quand vous êtes sur le point de perdre des " -"données" +"Un message (Êtes-vous certain...) devrait-il s'afficher quand vous êtes sur " +"le point de perdre des données" #: libraries/config/messages.inc.php:41 msgid "Confirm DROP queries" -msgstr "Confirmer les requêtes de suppression (DROP)" +msgstr "Confirmer les requêtes de suppression DROP" #: libraries/config/messages.inc.php:42 msgid "Debug SQL" @@ -2426,11 +2424,11 @@ msgstr "Onglet par défaut pour tables" #: libraries/config/messages.inc.php:52 msgid "Show binary contents as HEX by default" -msgstr "Montrer par défaut le contenu binaire en hexadécimal (HEX)" +msgstr "Montrer par défaut le contenu binaire en hexadécimal" #: libraries/config/messages.inc.php:53 libraries/display_tbl.lib.php:597 msgid "Show binary contents as HEX" -msgstr "Montrer le contenu binaire en hexadécimal (HEX)" +msgstr "Montrer le contenu binaire en hexadécimal" #: libraries/config/messages.inc.php:54 msgid "Show database listing as a list instead of a drop down" @@ -2536,8 +2534,7 @@ msgstr "Remplacer NULL par" #: libraries/config/messages.inc.php:74 libraries/config/messages.inc.php:80 msgid "Remove CRLF characters within columns" -msgstr "" -"Enlève les caractères de fin de ligne (CRLF) à l'intérieur des colonnes" +msgstr "Enlève les caractères de fin de ligne à l'intérieur des colonnes" #: libraries/config/messages.inc.php:75 libraries/config/messages.inc.php:240 #: libraries/config/messages.inc.php:248 libraries/import/csv.php:61 @@ -3153,7 +3150,9 @@ msgstr "Séparateur pour l'arborescence des bases de données" msgid "" "Only light version; display databases in a tree (determined by the separator " "defined below)" -msgstr "En affichage léger; déterminé par le séparateur)" +msgstr "" +"En affichage léger; afficher les bases de données en arborescence (déterminé " +"par le séparateur défini plus bas)" #: libraries/config/messages.inc.php:271 msgid "Display databases in a tree" @@ -3246,7 +3245,7 @@ msgid "" "Define whether the previous login should be recalled or not in cookie " "authentication mode" msgstr "" -"Sur le panneau de connexion (mode cookie ), le nom du précédent utilisateur " +"Sur le panneau de connexion du mode cookie, le nom du précédent utilisateur " "devrait-il apparaître?" #: libraries/config/messages.inc.php:290 @@ -3260,10 +3259,10 @@ msgid "" "and will be deleted as soon as you close the browser window. This is " "recommended for non-trusted environments." msgstr "" -"Définit combien de secondes le cookie de connexion sera conservé dans le " -"fureteur. La valeur par défaut de 0 signifie qu'il ne sera conservé que pour " -"la session; ceci est recommandé si l'environnement n'est pas digne de " -"confiance." +"Définit pendant combien de temps (en secondes) le cookie de connexion sera " +"conservé dans le fureteur. La valeur par défaut de 0 signifie qu'il ne sera " +"conservé que pour la session; ceci est recommandé si l'environnement n'est " +"pas digne de confiance." #: libraries/config/messages.inc.php:292 msgid "Login cookie store" @@ -3271,11 +3270,12 @@ msgstr "Stockage du cookie" #: libraries/config/messages.inc.php:293 msgid "Define how long (in seconds) a login cookie is valid" -msgstr "Le nombre de secondes pendant lequel la connexion demeure valide" +msgstr "" +"Définit pendant combien de temps (en secondes) la connexion demeure valide" #: libraries/config/messages.inc.php:294 msgid "Login cookie validity" -msgstr "Durée de validité de la connexion (mode cookie)" +msgstr "Durée de validité de la connexion en mode cookie" #: libraries/config/messages.inc.php:295 msgid "Double size of textarea for LONGTEXT columns" @@ -3378,7 +3378,7 @@ msgstr "Ordre naturel" #: libraries/config/messages.inc.php:316 libraries/config/messages.inc.php:326 msgid "Use only icons, only text or both" -msgstr "Utiliser les icônes (true), du texte (false) ou les deux (both)" +msgstr "Afficher seulement des icônes, seulement du texte ou les deux" #: libraries/config/messages.inc.php:317 msgid "Iconic navigation bar" @@ -3444,8 +3444,8 @@ msgid "" "(lost by window close)." msgstr "" "Activer si vous désirez un historique permanent (nécessite le stockage de " -"configurations phpMyAdmin. Si désactivé, utilise Javascript pour afficher un " -"historique temporaire (sera perdu à la fermeture de la fenêtre)." +"configurations phpMyAdmin). Si désactivé, utilise Javascript pour afficher " +"un historique temporaire (sera perdu à la fermeture de la fenêtre)." #: libraries/config/messages.inc.php:331 msgid "Permanent query history" @@ -3544,9 +3544,7 @@ msgstr "Permettre une connexion à root" #: libraries/config/messages.inc.php:356 msgid "HTTP Basic Auth Realm name to display when doing HTTP Auth" -msgstr "" -"Domaine de protection (realm) à afficher lors d'une authentification HTTP " -"Basic" +msgstr "Domaine de protection à afficher lors d'une authentification HTTP Basic" #: libraries/config/messages.inc.php:357 msgid "HTTP Realm" @@ -3600,7 +3598,7 @@ msgstr "Table pour informations sur les colonnes" #: libraries/config/messages.inc.php:366 msgid "Compress connection to MySQL server" -msgstr "(connexion au serveur MySQL)" +msgstr "Comprime la connexion au serveur MySQL" #: libraries/config/messages.inc.php:367 msgid "Compress connection" @@ -3665,7 +3663,7 @@ msgstr "Empêcher l'accès à INFORMATION_SCHEMA" #: libraries/config/messages.inc.php:379 msgid "What PHP extension to use; you should use mysqli if supported" -msgstr "Quelle extension PHP utiliser (prenez mysqli si possible)" +msgstr "Quelle extension PHP utiliser; vous devriez choisir mysqli si possible" #: libraries/config/messages.inc.php:380 msgid "PHP extension to use" @@ -3720,10 +3718,11 @@ msgid "" "alphabetical order." msgstr "" "Vous pouvez utiliser ces caractères passepartout MySQL (% et _), avec un " -"caractère d'échappement si vous les employez de manière littérale («ma" -"\\_base» et non «ma_base»). Ainsi vous pouvez trier la liste des bases de " -"données en entrant leurs noms et en utilisant [kbd]*[/kbd] en fin de liste " -"pour montrer le reste des noms de base de données en ordre alphabétique." +"caractère d'échappement si vous les employez de manière littérale, par " +"exemple «ma\\_base» et non «ma_base». Ainsi vous pouvez trier la liste des " +"bases de données en entrant leurs noms et en utilisant [kbd]*[/kbd] en fin " +"de liste pour montrer le reste des noms de base de données en ordre " +"alphabétique." #: libraries/config/messages.inc.php:391 msgid "Show only listed databases" @@ -4433,7 +4432,7 @@ msgstr "Le serveur ne répond pas" #: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysqli.dbi.lib.php:411 msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "" -"(ou l'interface de connexion (socket) vers le serveur MySQL local n'est pas " +"(ou l'interface de connexion vers le serveur MySQL local n'est pas " "correctement configurée)" #: libraries/dbi/mysql.dbi.lib.php:366 tbl_structure.php:700 @@ -4706,8 +4705,9 @@ msgid "" "however it can break transactions.)</i>" msgstr "" "Permettre l'interruption de l'importation si la limite de temps configurée " -"dans PHP est sur le point d'être atteinte. Ceci pourrait aider à importer " -"des fichiers volumineux, au détriment du respect des transactions." +"dans PHP est sur le point d'être atteinte. <i>(Ceci pourrait aider à " +"importer des fichiers volumineux, au détriment du respect des " +"transactions.)</i>" #: libraries/display_import.lib.php:228 msgid "Number of rows to skip, starting from the first row:" @@ -4969,7 +4969,7 @@ msgid "" "The default pointer size in bytes, to be used by CREATE TABLE for MyISAM " "tables when no MAX_ROWS option is specified." msgstr "" -"La taille du pointeur (en octets) qui servira lors d'un CREATE TABLE sur une " +"La taille en octets du pointeur qui servira lors d'un CREATE TABLE sur une " "table MyISAM si aucune option MAX_ROWS n'est indiquée." #: libraries/engines/myisam.lib.php:27 @@ -6491,7 +6491,8 @@ msgid "" "installed the necessary PHP extensions as described in the %sdocumentation%s." msgstr "" "Le validateur SQL n'a pas pu être initialisé. Vérifiez que les extensions " -"PHP nécessaires ont bien été installées (voir la %sdocumentation%s)." +"PHP nécessaires ont bien été installées tel que décrit dans la %" +"sdocumentation%s." #: libraries/tbl_links.inc.php:106 libraries/tbl_links.inc.php:107 msgid "Table seems to be empty!" @@ -9721,24 +9722,22 @@ msgid "Browse distinct values" msgstr "Affiche les valeurs distinctes" #: tbl_structure.php:165 tbl_structure.php:166 -#, fuzzy #| msgid "Adding Primary Key" msgid "Add primary key" -msgstr "Ajout de clé primaire" +msgstr "Ajouter une clé primaire" #: tbl_structure.php:167 tbl_structure.php:168 -#, fuzzy #| msgid "Apply index(s)" msgid "Add index" -msgstr "Appliquer des index" +msgstr "Ajouter un index" #: tbl_structure.php:169 tbl_structure.php:170 msgid "Add unique index" -msgstr "" +msgstr "Ajouter un index unique" #: tbl_structure.php:171 tbl_structure.php:172 msgid "Add FULLTEXT index" -msgstr "" +msgstr "Ajouter un index FULLTEXT" #: tbl_structure.php:384 msgctxt "None for default" hooks/post-receive -- phpMyAdmin

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git