- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin website branch, master, updated. 428436cbeafa619378f7b11011f2b473cdc0a45f
by Marc Delisle 28 Dec '10

28 Dec '10

The branch, master has been updated via 428436cbeafa619378f7b11011f2b473cdc0a45f (commit) from 52a41610c7a33534b485fad57038caf731a7256c (commit) - Log ----------------------------------------------------------------- commit 428436cbeafa619378f7b11011f2b473cdc0a45f Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Dec 28 08:09:15 2010 -0500 Fixed release of pmamhomme theme ----------------------------------------------------------------------- Summary of changes: data/themes.py | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/data/themes.py b/data/themes.py index 78da03e..e3b1952 100644 --- a/data/themes.py +++ b/data/themes.py @@ -188,6 +188,12 @@ THEMES = { 'support' : '3.3', 'info': u'Clean, modern and easy to use phpMyAdmin theme.', 'author': 'Mike Homme', + }, + 'pmahomme-1.0b' : { + 'name': 'pmamhomme', + 'support' : '3.3', + 'info': u'Clean, modern and easy to use phpMyAdmin theme.', + 'author': 'Mike Homme', } } TEMPLATE = { hooks/post-receive -- phpMyAdmin website

1 0

[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