Git

Download

git@phpmyadmin.net

11 participants
38616 discussions

[Phpmyadmin-git] [SCM] phpMyAdmin localized documentation branch, master, updated. 233bbeda8f86355455d70eb9170731f83ef45165
by Michal Čihař 13 Sep '10

13 Sep '10

The branch, master has been updated via 233bbeda8f86355455d70eb9170731f83ef45165 (commit) via fbc6e3beae2e43a6950719015cbe5144b0c39c4f (commit) via ddcb3ba24b5e5ca6709d8375bb7aa60da6ba5e79 (commit) via 72890f37fad1ff9b86c0cf1eeb41225c06c25f1f (commit) via 0bc24887d034743330662e4799d03b7370542039 (commit) via a65c7ef84547f9ef7d2be2c485c5905be76ca42b (commit) via 6e8bde34ebc8f7c2833dd1a1c7b815e94db29c77 (commit) via 39639646a53e974a0ae965dd0724a639d0a38f7c (commit) via b9d57f166d093776b1b9a1cd3cd8f98998a6e3ad (commit) via ea70e04959765956c0099aaba720099cbaef2dea (commit) via d0322b6a01ba3258938d47096fbfdadfe1e12ed5 (commit) via ca921b3795653e58da9550238c839dc404364584 (commit) via 4f0005bdfa3417406f80af1d0b90de39ecd2d967 (commit) via 43c5fa0383ae7d0a6d297ec340fc89bec98689fd (commit) via 998d4af46be17d9ac4cbd8334baaca6e54f10107 (commit) via 72c19cbf0f81f94f8406a703995f1bfa3fb7cac9 (commit) via b1c9e2d035ea09f4f0593d69103d7be48a5819be (commit) via 8591c025ab1c80922bc8d9fe58679b0d113e4999 (commit) via 3029aa954e654ed268e104e7f33a899f6bc23ee8 (commit) via f8d79443f3330db91eb15a71aa870f8be54de666 (commit) via 3542699cb1eddd87b5236724b038ee8637b15591 (commit) via e9b1e133300fe0d4fbee8b56ef03d9d46160d977 (commit) via 795d19d6ebb027abbcaa14a72b5a69bf4acefc9c (commit) via 0fe8f663934db85ce7a47f8000039724caf77af3 (commit) via 6f7a26a1275cee7ce2e091f60a2ea74859b72197 (commit) via 1b720a9512aa59beb224c10f30a92089bce9e891 (commit) via 614fbc11828575d2195d56198a6697d8591e0d50 (commit) via 9974ac2823e19e3bb4b9afb876e3cb49278eebbd (commit) via faa3c2908e67f56442aa9c4bede0610e1e4d8d2e (commit) via a2e1dbb563c29f50681366bd1a0301961331196a (commit) via 61696a86b593569612dc5b746ecd67b3226fd8ca (commit) via 3c863b7fb4aa66d91b5a82e91053db81efcf79ec (commit) via ae76643ab40a8a6fd48f07abb8b4aaab1bc8d7ec (commit) via ecddfbd616319434b517e38d38309daaf6206560 (commit) from 2f9c367a74b99ad6a77af141f523a973e473b600 (commit) - Log ----------------------------------------------------------------- commit 233bbeda8f86355455d70eb9170731f83ef45165 Author: Michal Čihař <mcihar(a)novell.com> Date: Mon Sep 13 14:05:49 2010 +0200 Regenerate translated docs. commit fbc6e3beae2e43a6950719015cbe5144b0c39c4f Author: Domen <dbc334(a)gmail.com> Date: Sat Sep 11 16:21:10 2010 +0200 Translation update done using Pootle. commit ddcb3ba24b5e5ca6709d8375bb7aa60da6ba5e79 Author: Domen <dbc334(a)gmail.com> Date: Sat Sep 11 16:20:52 2010 +0200 Translation update done using Pootle. commit 72890f37fad1ff9b86c0cf1eeb41225c06c25f1f Author: Domen <dbc334(a)gmail.com> Date: Sat Sep 11 16:20:04 2010 +0200 Translation update done using Pootle. commit 0bc24887d034743330662e4799d03b7370542039 Author: Domen <dbc334(a)gmail.com> Date: Sat Sep 11 16:17:11 2010 +0200 Translation update done using Pootle. commit a65c7ef84547f9ef7d2be2c485c5905be76ca42b Author: Domen <dbc334(a)gmail.com> Date: Sat Sep 11 16:15:19 2010 +0200 Translation update done using Pootle. commit 6e8bde34ebc8f7c2833dd1a1c7b815e94db29c77 Author: Domen <dbc334(a)gmail.com> Date: Sat Sep 11 16:15:07 2010 +0200 Translation update done using Pootle. commit 39639646a53e974a0ae965dd0724a639d0a38f7c Author: Domen <dbc334(a)gmail.com> Date: Sat Sep 11 16:14:51 2010 +0200 Translation update done using Pootle. commit b9d57f166d093776b1b9a1cd3cd8f98998a6e3ad Author: Domen <dbc334(a)gmail.com> Date: Sat Sep 11 16:14:27 2010 +0200 Translation update done using Pootle. commit ea70e04959765956c0099aaba720099cbaef2dea Author: Domen <dbc334(a)gmail.com> Date: Sat Sep 11 16:14:17 2010 +0200 Translation update done using Pootle. commit d0322b6a01ba3258938d47096fbfdadfe1e12ed5 Author: Domen <dbc334(a)gmail.com> Date: Sat Sep 11 16:14:07 2010 +0200 Translation update done using Pootle. commit ca921b3795653e58da9550238c839dc404364584 Author: Domen <dbc334(a)gmail.com> Date: Sat Sep 11 16:13:51 2010 +0200 Translation update done using Pootle. commit 4f0005bdfa3417406f80af1d0b90de39ecd2d967 Author: Domen <dbc334(a)gmail.com> Date: Sat Sep 11 16:13:44 2010 +0200 Translation update done using Pootle. commit 43c5fa0383ae7d0a6d297ec340fc89bec98689fd Author: Domen <dbc334(a)gmail.com> Date: Sat Sep 11 16:13:38 2010 +0200 Translation update done using Pootle. commit 998d4af46be17d9ac4cbd8334baaca6e54f10107 Author: Domen <dbc334(a)gmail.com> Date: Sat Sep 11 16:13:32 2010 +0200 Translation update done using Pootle. commit 72c19cbf0f81f94f8406a703995f1bfa3fb7cac9 Author: Domen <dbc334(a)gmail.com> Date: Sat Sep 11 16:13:09 2010 +0200 Translation update done using Pootle. commit b1c9e2d035ea09f4f0593d69103d7be48a5819be Author: Domen <dbc334(a)gmail.com> Date: Sat Sep 11 16:13:01 2010 +0200 Translation update done using Pootle. commit 8591c025ab1c80922bc8d9fe58679b0d113e4999 Author: Domen <dbc334(a)gmail.com> Date: Sat Sep 11 16:12:52 2010 +0200 Translation update done using Pootle. commit 3029aa954e654ed268e104e7f33a899f6bc23ee8 Author: Domen <dbc334(a)gmail.com> Date: Sat Sep 11 16:12:42 2010 +0200 Translation update done using Pootle. commit f8d79443f3330db91eb15a71aa870f8be54de666 Author: Domen <dbc334(a)gmail.com> Date: Sat Sep 11 16:08:35 2010 +0200 Translation update done using Pootle. commit 3542699cb1eddd87b5236724b038ee8637b15591 Author: Domen <dbc334(a)gmail.com> Date: Sat Sep 11 16:08:06 2010 +0200 Translation update done using Pootle. commit e9b1e133300fe0d4fbee8b56ef03d9d46160d977 Author: Domen <dbc334(a)gmail.com> Date: Sat Sep 11 16:07:54 2010 +0200 Translation update done using Pootle. commit 795d19d6ebb027abbcaa14a72b5a69bf4acefc9c Author: Domen <dbc334(a)gmail.com> Date: Sat Sep 11 16:05:05 2010 +0200 Translation update done using Pootle. commit 0fe8f663934db85ce7a47f8000039724caf77af3 Author: Domen <dbc334(a)gmail.com> Date: Sat Sep 11 16:03:05 2010 +0200 Translation update done using Pootle. commit 6f7a26a1275cee7ce2e091f60a2ea74859b72197 Author: Domen <dbc334(a)gmail.com> Date: Sat Sep 11 16:01:53 2010 +0200 Translation update done using Pootle. commit 1b720a9512aa59beb224c10f30a92089bce9e891 Author: Domen <dbc334(a)gmail.com> Date: Sat Sep 11 16:01:26 2010 +0200 Translation update done using Pootle. commit 614fbc11828575d2195d56198a6697d8591e0d50 Author: Domen <dbc334(a)gmail.com> Date: Sat Sep 11 16:00:50 2010 +0200 Translation update done using Pootle. commit 9974ac2823e19e3bb4b9afb876e3cb49278eebbd Author: Domen <dbc334(a)gmail.com> Date: Sat Sep 11 16:00:37 2010 +0200 Translation update done using Pootle. commit faa3c2908e67f56442aa9c4bede0610e1e4d8d2e Author: Domen <dbc334(a)gmail.com> Date: Sat Sep 11 16:00:29 2010 +0200 Translation update done using Pootle. commit a2e1dbb563c29f50681366bd1a0301961331196a Author: Domen <dbc334(a)gmail.com> Date: Sat Sep 11 15:58:41 2010 +0200 Translation update done using Pootle. commit 61696a86b593569612dc5b746ecd67b3226fd8ca Author: Domen <dbc334(a)gmail.com> Date: Sat Sep 11 15:58:05 2010 +0200 Translation update done using Pootle. commit 3c863b7fb4aa66d91b5a82e91053db81efcf79ec Author: Domen <dbc334(a)gmail.com> Date: Sat Sep 11 15:55:54 2010 +0200 Translation update done using Pootle. commit ae76643ab40a8a6fd48f07abb8b4aaab1bc8d7ec Author: Domen <dbc334(a)gmail.com> Date: Sat Sep 11 15:55:11 2010 +0200 Translation update done using Pootle. commit ecddfbd616319434b517e38d38309daaf6206560 Author: Domen <dbc334(a)gmail.com> Date: Sat Sep 11 15:53:22 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: output/{en_GB => sl}/INSTALL | 4 +- output/{en_GB => sl}/README | 54 +++++++++++----------- output/{it => sl}/TODO | 4 +- output/sl/index.html | 3 + po/sl.po | 100 +++++++++++++++++++++++++++--------------- 5 files changed, 98 insertions(+), 67 deletions(-) copy output/{en_GB => sl}/INSTALL (60%) copy output/{en_GB => sl}/README (64%) copy output/{it => sl}/TODO (73%) diff --git a/output/en_GB/INSTALL b/output/sl/INSTALL similarity index 60% copy from output/en_GB/INSTALL copy to output/sl/INSTALL index 56c8948..fbc6613 100644 --- a/output/en_GB/INSTALL +++ b/output/sl/INSTALL @@ -1,5 +1,5 @@ -phpMyAdmin - Installation -------------------------- +phpMyAdmin - Namestitev +----------------------- Please have a look to the Documentation.txt or Documentation.html files. diff --git a/output/en_GB/README b/output/sl/README similarity index 64% copy from output/en_GB/README copy to output/sl/README index 62569da..a9bcaab 100644 --- a/output/en_GB/README +++ b/output/sl/README @@ -1,5 +1,5 @@ -phpMyAdmin - Readme -=================== +phpMyAdmin - Beri me +==================== A set of PHP-scripts to manage MySQL over the web. @@ -34,46 +34,46 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -Requirements -~~~~~~~~~~~~ +Zahteve +~~~~~~~ -* PHP 5.2 or later -* MySQL 5.0 or later -* a web-browser (doh!) +* PHP 5.2 ali novejši +* MySQL 5.0 ali novejši +* spletni brskalnik (očitno!) -Summary -~~~~~~~ +Povzetek +~~~~~~~~ phpMyAdmin is intended to handle the administration of MySQL over the web. For a summary of features, please see the Documentation.txt/.html file. -Download -~~~~~~~~ +Prenesi +~~~~~~~ -You can get the newest version at http://www.phpmyadmin.net/. +Najnovejšo različico lahko dobite na http://www.phpmyadmin.net/. -More Information -~~~~~~~~~~~~~~~~ +Več informacij +~~~~~~~~~~~~~~~ -Please see the Documentation.txt/.html file. +Prosimo, oglejte si datoteko Documentation.txt/.html. -Support +Podpora ~~~~~~~ -See reference about support forums under http://www.phpmyadmin.net/ +Oglejte si sklice o podpornih forumih na http://www.phpmyadmin.net/ -Enjoy! -~~~~~~ +Uživajte! +~~~~~~~~~~ -The phpMyAdmin Devel team +Skupina razvijalcev phpMyAdmin -PS: - Please, don't send us e-mails with question like "How do I compile - PHP with MySQL-support". We just don't have the time to be your - free helpdesk. - Please send your questions to the appropriate mailing-lists / forums. - Before contacting us, please read the Documentation.html (esp. the - FAQ part). +Pripis: + Prosimo, ne pošiljajte nam e-pošt z vprašanji, kot je "Kako prevedem + PHP s podporo MySQL". Preprosto nimamo časa, da bi bili vaša + brezplačna pomoč uporabnikom. + Prosimo, naslovite vaša vprašanja na primerne poštne sezname / forume. + Preden stopite v stik z nami, prosimo, preberite Documentation.html + (še posebej del FAQ). diff --git a/output/it/TODO b/output/sl/TODO similarity index 73% copy from output/it/TODO copy to output/sl/TODO index 7e96527..81f156b 100644 --- a/output/it/TODO +++ b/output/sl/TODO @@ -1,5 +1,5 @@ -phpMyAdmin - Todo -================= +phpMyAdmin - Seznam opravil +=========================== We are currently using the Sourceforge Tracker as Todo list: diff --git a/output/sl/index.html b/output/sl/index.html index d711032..690dbf9 100644 --- a/output/sl/index.html +++ b/output/sl/index.html @@ -10,6 +10,9 @@ <h1>phpMyAdmin Slovenian Documentation</h1> <p>Documents translated to Slovenian:</p> <ul> +<li><a href="INSTALL">INSTALL</a></li> +<li><a href="README">README</a></li> +<li><a href="TODO">TODO</a></li> <li><a href="translators.html">Prevajalci</a></li> </ul> </body> diff --git a/po/sl.po b/po/sl.po index 0b26b9a..cd1dfba 100644 --- a/po/sl.po +++ b/po/sl.po @@ -8,15 +8,15 @@ msgstr "" "Project-Id-Version: phpMyAdmin documentation VERSION\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-09-08 13:44+0300\n" -"PO-Revision-Date: 2010-08-29 12:09+0200\n" +"PO-Revision-Date: 2010-09-11 16:21+0200\n" "Last-Translator: Domen <dbc334(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "Language: sl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n" -"%100==4 ? 2 : 3);\n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || " +"n%100==4 ? 2 : 3);\n" "X-Generator: Pootle 2.0.5\n" #. type: Content of: <html><head><title> @@ -180,6 +180,8 @@ msgid "" "You need GD2 support in PHP to display inline thumbnails of JPEGs ("" "image/jpeg: inline") with their original aspect ratio" msgstr "" +"Za prikaz sličic JPEG v vrstici ("image/jpeg: inline") z njihovim " +"izvirnim razmerjem potrebujete v PHP podporo GD2." #. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:74 @@ -190,6 +192,11 @@ msgid "" "<b>required</b> for 64–bit machines. Not using mcrypt will cause " "phpMyAdmin to load pages significantly slower." msgstr "" +"Ko uporabljate <a href=\"#authentication_modes\">način overitve</a> " +""cookie", je razširitev <a " +"href=\"http://www.php.net/mcrypt\"><tt>mcrypt</tt></a> močno proporočljiva za " +"večino uporabnikov in <b>potrebna</b> za 64–bitne naprave. Brez " +"uporabe mcrypt bo phpMyAdmin nalagal strani občutno počasneje." #. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:81 @@ -197,6 +204,8 @@ msgid "" "To support upload progress bars, see <a href=\"#faq2_9\"> <abbr title=" "\"Frequently Asked Questions\">FAQ</abbr> 2.9</a>." msgstr "" +"Za podporo vrstice napredka pri nalaganju si oglejte <a href=\"#faq2_9\"> " +"<abbr title=\"Frequently Asked Questions\">FAQ</abbr> 2.9</a>." #. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:83 @@ -230,6 +239,11 @@ msgid "" "MySQL user who can read/write only the desired database. It's up to you to " "look up the appropriate part in the MySQL manual." msgstr "" +"phpMyAdmin lahko upravlja s celotnim strežnikom MySQL (potrebuje super-" +"uporabnika), kakor tudi s posamezno zbirko podatkov. Za izvedbo slednjega " +"potrebujete ustrezno nastavljenega uporabnika MySQL, ki lahko bere/piše samo " +"v želeno zbirko podatkov. Na vas je, da poiščete ustrezni del v priročniku " +"MySQL." #. type: Content of: <html><body><div><h3> #: ../phpmyadmin/Documentation.html:101 @@ -391,7 +405,7 @@ msgstr "" #. type: Content of: <html><body><div><h4> #: ../phpmyadmin/Documentation.html:149 msgid "A word about users:" -msgstr "" +msgstr "Beseda o uporabnikih:" #. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:150 @@ -412,36 +426,41 @@ msgid "" "support (<tt>--with-bz2</tt>). Proper support may also need changes in " "<tt>php.ini</tt>." msgstr "" +"<sup>1)</sup> phpMyAdmin lahko stisne (v formate Zip, GZip -RFC 1952- ali " +"Bzip2) izpise in izvoze <abbr title=\"comma separated values\">CSV</abbr>, če " +"uporabljate PHP s podporo Zlib (<tt>--with-zlib</tt>) in/ali podporo Bzip2 " +"(<tt>--with-bz2</tt>). Primerna podpora morda zahteva tudi spremembe v " +"<tt>php.ini</tt>." #. type: Content of: <html><body><div><h2> #: ../phpmyadmin/Documentation.html:165 msgid "Installation" -msgstr "" +msgstr "Namestitev" #. type: Content of: <html><body><div><ol><li> #: ../phpmyadmin/Documentation.html:167 msgid "<a href=\"#quick_install\">Quick Install</a>" -msgstr "" +msgstr "<a href=\"#quick_install\">Hitra namestitev</a>" #. type: Content of: <html><body><div><ol><li> #: ../phpmyadmin/Documentation.html:168 msgid "<a href=\"#setup_script\">Setup script usage</a>" -msgstr "" +msgstr "<a href=\"#setup_script\">Uporaba namestitvenega skripta</a>" #. type: Content of: <html><body><div><ol><li> #: ../phpmyadmin/Documentation.html:169 msgid "<a href=\"#linked-tables\">phpMyAdmin configuration storage</a>" -msgstr "" +msgstr "<a href=\"#linked-tables\">Hramba konfiguracije phpMyAdmin</a>" #. type: Content of: <html><body><div><ol><li> #: ../phpmyadmin/Documentation.html:170 msgid "<a href=\"#upgrading\">Upgrading from an older version</a>" -msgstr "" +msgstr "<a href=\"#upgrading\">Nadgrajevanje starejše različice</a>" #. type: Content of: <html><body><div><ol><li> #: ../phpmyadmin/Documentation.html:171 msgid "<a href=\"#authentication_modes\">Using authentication modes</a>" -msgstr "" +msgstr "<a href=\"#authentication_modes\">Uporaba načinov overitve</a>" #. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:175 @@ -451,11 +470,15 @@ msgid "" "the MySQL databases properly. phpMyAdmin's "Privileges" page can " "be used for this." msgstr "" +"phpMyAdmin ne uporablja posebnih varnostnih metod na strežniku zbirke " +"podatkov MySQL. Še vedno ostaja delo sistemskega administratorja, da " +"pravilno dodeli dovoljenja zbirkam podatkov MySQL. Za to se lahko uporabi " +"tudi stran "Privilegiji" v phpMyAdminu." #. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:182 msgid "Warning for <acronym title=\"Apple Macintosh\">Mac</acronym> users:" -msgstr "" +msgstr "Opozorilo za uporabnike <acronym title=\"Apple Macintosh\">Mac</acronym>:" #. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:183 @@ -478,7 +501,7 @@ msgstr "" #. type: Content of: <html><body><div><h3> #: ../phpmyadmin/Documentation.html:192 msgid "Quick Install" -msgstr "" +msgstr "Hitra namestitev" #. type: Content of: <html><body><div><ol><li> #: ../phpmyadmin/Documentation.html:193 @@ -11564,9 +11587,9 @@ msgstr "-->" #. type: Title - #: ../phpmyadmin/INSTALL:2 -#, fuzzy, no-wrap +#, no-wrap msgid "phpMyAdmin - Installation\n" -msgstr "Dokumentacija phpMyAdmin" +msgstr "phpMyAdmin - Namestitev\n" #. type: Plain text #: ../phpmyadmin/INSTALL:6 @@ -11578,9 +11601,9 @@ msgstr "" #. type: Title = #: ../phpmyadmin/TODO:2 -#, fuzzy, no-wrap +#, no-wrap msgid "phpMyAdmin - Todo\n" -msgstr "Domača stran phpMyAdmin" +msgstr "phpMyAdmin - Seznam opravil\n" #. type: Plain text #: ../phpmyadmin/TODO:5 @@ -11600,9 +11623,9 @@ msgstr "" #. type: Title = #: ../phpmyadmin/README:2 -#, fuzzy, no-wrap +#, no-wrap msgid "phpMyAdmin - Readme\n" -msgstr "Domača stran phpMyAdmin" +msgstr "phpMyAdmin - Beri me\n" #. type: Plain text #: ../phpmyadmin/README:5 @@ -11640,31 +11663,30 @@ msgstr "" #. type: Title ~ #: ../phpmyadmin/README:38 -#, fuzzy, no-wrap +#, no-wrap msgid "Requirements\n" -msgstr "Zahteve" +msgstr "Zahteve\n" #. type: Plain text #: ../phpmyadmin/README:41 msgid "PHP 5.2 or later" -msgstr "" +msgstr "PHP 5.2 ali novejši" #. type: Plain text #: ../phpmyadmin/README:42 -#, fuzzy msgid "MySQL 5.0 or later" -msgstr "Združljivo z MySQL 4.0" +msgstr "MySQL 5.0 ali novejši" #. type: Plain text #: ../phpmyadmin/README:43 msgid "a web-browser (doh!)" -msgstr "" +msgstr "spletni brskalnik (očitno!)" #. type: Title ~ #: ../phpmyadmin/README:45 #, no-wrap msgid "Summary\n" -msgstr "" +msgstr "Povzetek\n" #. type: Plain text #: ../phpmyadmin/README:49 @@ -11675,48 +11697,47 @@ msgstr "" #. type: Title ~ #: ../phpmyadmin/README:51 -#, fuzzy, no-wrap +#, no-wrap msgid "Download\n" -msgstr "Prenesi" +msgstr "Prenesi\n" #. type: Plain text #: ../phpmyadmin/README:54 msgid "You can get the newest version at http://www.phpmyadmin.net/." -msgstr "" +msgstr "Najnovejšo različico lahko dobite na http://www.phpmyadmin.net/." #. type: Title ~ #: ../phpmyadmin/README:56 -#, fuzzy, no-wrap +#, no-wrap msgid "More Information\n" -msgstr "Podatki" +msgstr "Več informacij\n" #. type: Plain text #: ../phpmyadmin/README:59 msgid "Please see the Documentation.txt/.html file." -msgstr "" +msgstr "Prosimo, oglejte si datoteko Documentation.txt/.html." #. type: Title ~ #: ../phpmyadmin/README:61 #, no-wrap msgid "Support\n" -msgstr "" +msgstr "Podpora\n" #. type: Plain text #: ../phpmyadmin/README:64 msgid "See reference about support forums under http://www.phpmyadmin.net/" -msgstr "" +msgstr "Oglejte si sklice o podpornih forumih na http://www.phpmyadmin.net/" #. type: Title ~ #: ../phpmyadmin/README:67 #, no-wrap msgid "Enjoy!\n" -msgstr "" +msgstr "Uživajte!\n" #. type: Plain text #: ../phpmyadmin/README:70 -#, fuzzy msgid "The phpMyAdmin Devel team" -msgstr "Nastavitve za razvijalce phpMyAdmin" +msgstr "Skupina razvijalcev phpMyAdmin" #. type: Plain text #: ../phpmyadmin/README:79 @@ -11730,6 +11751,13 @@ msgid "" " Before contacting us, please read the Documentation.html (esp. the\n" " FAQ part).\n" msgstr "" +"Pripis: \n" +" Prosimo, ne pošiljajte nam e-pošt z vprašanji, kot je \"Kako prevedem\n" +" PHP s podporo MySQL\". Preprosto nimamo časa, da bi bili vaša\n" +" brezplačna pomoč uporabnikom.\n" +" Prosimo, naslovite vaša vprašanja na primerne poštne sezname / forume.\n" +" Preden stopite v stik z nami, prosimo, preberite Documentation.html\n" +" (še posebej del FAQ).\n" #~ msgid "Documentation version:" #~ msgstr "Različica dokumentacije:" hooks/post-receive -- phpMyAdmin localized documentation

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_7-10093-g8c5f758
by Marc Delisle 13 Sep '10

13 Sep '10

The branch, master has been updated via 8c5f758e4ad5c2708eabdeae4f1dd81efaddf591 (commit) from ae04356ed298c86901fb4948596b8c0c7fe1f449 (commit) - Log ----------------------------------------------------------------- commit 8c5f758e4ad5c2708eabdeae4f1dd81efaddf591 Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Sep 12 18:58:38 2010 -0400 bug #3057481 Unchecking ignore does not work for duplicated insert rows ----------------------------------------------------------------------- Summary of changes: js/tbl_change.js | 47 ++++++++++++++++++++++++++++++++++++++++++----- tbl_change.php | 29 ++++++++++++++++------------- 2 files changed, 58 insertions(+), 18 deletions(-) diff --git a/js/tbl_change.js b/js/tbl_change.js index 4a4e444..52d8432 100644 --- a/js/tbl_change.js +++ b/js/tbl_change.js @@ -222,8 +222,6 @@ function Validator(urlField, multi_edit,theType){ } } } - - dt.className=""; } /* End of datetime validation*/ @@ -261,6 +259,20 @@ function unNullify(urlField, multi_edit) $(document).ready(function() { /** + * Handles all current checkboxes for Null + * + */ + $('.checkbox_null').bind('click', function(e) { + nullify( + // use hidden fields populated by tbl_change.php + $(this).siblings('.nullify_code').val(), + $(this).closest('tr').find('input:hidden').first().val(), + $(this).siblings('.hashed_field').val(), + $(this).siblings('.multi_edit').val() + ); + }); + + /** * Submission of data to be inserted into table * * @uses PMA_ajaxShowMessage() @@ -302,7 +314,7 @@ $(document).ready(function() { }) // end submission of data to be inserted into table /** - * Restart Insertion form + * Continue Insertion form */ $("#insert_rows").live('change', function(event) { event.preventDefault(); @@ -352,8 +364,33 @@ $(document).ready(function() { /** generate the new name i.e. funcs[multi_edit][11][foobarbaz] */ var new_name = name_parts[0] + '[' + new_row_index + ']' + name_parts[1]; + var hashed_field = name_parts[1].match(/\[(.+)\]/)[1]; $(this).attr('name', new_name); - $(this).attr('value', ''); + + $(this).filter('.textfield') + .attr('value', '') + .unbind('change') + .attr('onchange', null) + .bind('change', function(e) { + Validator( + hashed_field, + new_row_index, + $(this).closest('tr').find('span.column_type').html() + ); + }) + .end(); + + $(this).filter('.checkbox_null') + .bind('click', function(e) { + nullify( + $(this).siblings('.nullify_code').val(), + $(this).closest('tr').find('input:hidden').first().val(), + hashed_field, + '[multi_edit][' + new_row_index + ']' + ); + }) + .end(); + }); //Insert/Clone the ignore checkboxes @@ -378,7 +415,7 @@ $(document).ready(function() { $(last_checkbox) .clone() - .attr({'id':new_name, 'name': new_name}) + .attr({'id':new_name, 'name': new_name, 'checked': true}) .add('label[for^=insert_ignore]:last') .clone() .attr('for', new_name) diff --git a/tbl_change.php b/tbl_change.php index 6d2e957..3e4d814 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -431,8 +431,8 @@ foreach ($rows as $row_id => $vrow) { <input type="hidden" name="fields_name<?php echo $field_name_appendix; ?>" value="<?php echo $field['Field_html']; ?>"/> </td> <?php if ($cfg['ShowFieldTypesInDataEditView']) { ?> - <td align="center"<?php echo $field['wrap']; ?>> - <?php echo $field['pma_type']; ?> + <td align="center"<?php echo $field['wrap']; ?>><span class="column_type"> + <?php echo $field['pma_type']; ?></span> </td> <?php } //End if @@ -614,32 +614,35 @@ foreach ($rows as $row_id => $vrow) { } echo ' />' . "\n"; - echo ' <input type="checkbox" tabindex="' . ($tabindex + $tabindex_for_null) . '"' + echo ' <input type="checkbox" class="checkbox_null" tabindex="' . ($tabindex + $tabindex_for_null) . '"' . ' name="fields_null' . $field_name_appendix . '"'; if ($real_null_value && !$field['first_timestamp']) { echo ' checked="checked"'; } - echo ' id="field_' . ($idindex) . '_2"'; - $onclick = ' onclick="if (this.checked) {nullify('; + echo ' id="field_' . ($idindex) . '_2" />'; + + // nullify_code is needed by the js nullify() function if (strstr($field['True_Type'], 'enum')) { if (strlen($field['Type']) > 20) { - $onclick .= '1, '; + $nullify_code = '1'; } else { - $onclick .= '2, '; + $nullify_code = '2'; } } elseif (strstr($field['True_Type'], 'set')) { - $onclick .= '3, '; + $nullify_code = '3'; } elseif ($foreigners && isset($foreigners[$field['Field']]) && $foreignData['foreign_link'] == false) { // foreign key in a drop-down - $onclick .= '4, '; + $nullify_code = '4'; } elseif ($foreigners && isset($foreigners[$field['Field']]) && $foreignData['foreign_link'] == true) { // foreign key with a browsing icon - $onclick .= '6, '; + $nullify_code = '6'; } else { - $onclick .= '5, '; + $nullify_code = '5'; } - $onclick .= '\'' . PMA_escapeJsString($field['Field_html']) . '\', \'' . $field['Field_md5'] . '\', \'' . PMA_escapeJsString($vkey) . '\'); this.checked = true}; return true" />' . "\n"; - echo $onclick; + // to be able to generate calls to nullify() in jQuery + echo '<input type="hidden" class="nullify_code" name="nullify_code' . $field_name_appendix . '" value="' . $nullify_code . '" />'; + echo '<input type="hidden" class="hashed_field" name="hashed_field' . $field_name_appendix . '" value="' . $field['Field_md5'] . '" />'; + echo '<input type="hidden" class="multi_edit" name="multi_edit' . $field_name_appendix . '" value="' . PMA_escapeJsString($vkey) . '" />'; } echo ' </td>' . "\n"; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_7-10092-gae04356
by Dieter Adriaenssens 11 Sep '10

11 Sep '10

The branch, master has been updated via ae04356ed298c86901fb4948596b8c0c7fe1f449 (commit) via adaa35a87feeaf079d4178bb471073e0e19a75b6 (commit) from e539a03ef938fb5df7950603bc196d2506c2c9b4 (commit) - Log ----------------------------------------------------------------- commit ae04356ed298c86901fb4948596b8c0c7fe1f449 Merge: e539a03ef938fb5df7950603bc196d2506c2c9b4 adaa35a87feeaf079d4178bb471073e0e19a75b6 Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net> Date: Sat Sep 11 16:34:16 2010 +0200 Merge branch 'QA_3_3' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/PHPExcel/PHPExcel.php | 4 +- libraries/PHPExcel/PHPExcel/Autoloader.php | 2 +- .../PHPExcel/PHPExcel/CachedObjectStorage/APC.php | 45 +++- .../PHPExcel/CachedObjectStorage/CacheBase.php | 35 ++- .../PHPExcel/CachedObjectStorage/DiscISAM.php | 28 ++- .../PHPExcel/CachedObjectStorage/ICache.php | 9 +- .../PHPExcel/CachedObjectStorage/Memcache.php | 53 +++- .../PHPExcel/CachedObjectStorage/Memory.php | 2 +- .../PHPExcel/CachedObjectStorage/MemoryGZip.php | 2 +- .../CachedObjectStorage/MemorySerialized.php | 2 +- .../PHPExcel/CachedObjectStorage/PHPTemp.php | 26 ++- .../PHPExcel/CachedObjectStorage/Wincache.php | 58 +++- libraries/PHPExcel/PHPExcel/Calculation.php | 105 +++++-- .../PHPExcel/PHPExcel/Calculation/Exception.php | 2 +- .../PHPExcel/Calculation/ExceptionHandler.php | 2 +- .../PHPExcel/Calculation/FormulaParser.php | 2 +- .../PHPExcel/PHPExcel/Calculation/FormulaToken.php | 2 +- .../PHPExcel/PHPExcel/Calculation/Function.php | 2 +- .../PHPExcel/PHPExcel/Calculation/Functions.php | 175 ++++++------- libraries/PHPExcel/PHPExcel/Cell.php | 296 ++++++++++---------- .../PHPExcel/PHPExcel/Cell/AdvancedValueBinder.php | 2 +- libraries/PHPExcel/PHPExcel/Cell/DataType.php | 2 +- .../PHPExcel/PHPExcel/Cell/DataValidation.php | 2 +- .../PHPExcel/PHPExcel/Cell/DefaultValueBinder.php | 2 +- libraries/PHPExcel/PHPExcel/Cell/Hyperlink.php | 2 +- libraries/PHPExcel/PHPExcel/Cell/IValueBinder.php | 2 +- libraries/PHPExcel/PHPExcel/Comment.php | 2 +- libraries/PHPExcel/PHPExcel/DocumentProperties.php | 93 ++++--- libraries/PHPExcel/PHPExcel/DocumentSecurity.php | 2 +- libraries/PHPExcel/PHPExcel/HashTable.php | 2 +- libraries/PHPExcel/PHPExcel/IComparable.php | 2 +- libraries/PHPExcel/PHPExcel/IOFactory.php | 2 +- libraries/PHPExcel/PHPExcel/NamedRange.php | 2 +- libraries/PHPExcel/PHPExcel/Reader/CSV.php | 2 +- .../PHPExcel/PHPExcel/Reader/DefaultReadFilter.php | 2 +- .../PHPExcel/PHPExcel/Reader/Excel2003XML.php | 7 +- libraries/PHPExcel/PHPExcel/Reader/Excel2007.php | 55 +++- libraries/PHPExcel/PHPExcel/Reader/Excel5.php | 77 +++--- .../PHPExcel/PHPExcel/Reader/Excel5/Escher.php | 2 +- libraries/PHPExcel/PHPExcel/Reader/IReadFilter.php | 2 +- libraries/PHPExcel/PHPExcel/Reader/IReader.php | 2 +- libraries/PHPExcel/PHPExcel/Reader/OOCalc.php | 15 +- libraries/PHPExcel/PHPExcel/Reader/SYLK.php | 2 +- libraries/PHPExcel/PHPExcel/Reader/Serialized.php | 2 +- libraries/PHPExcel/PHPExcel/ReferenceHelper.php | 161 ++++++++--- libraries/PHPExcel/PHPExcel/RichText.php | 2 +- .../PHPExcel/PHPExcel/RichText/ITextElement.php | 2 +- libraries/PHPExcel/PHPExcel/RichText/Run.php | 2 +- .../PHPExcel/PHPExcel/RichText/TextElement.php | 2 +- libraries/PHPExcel/PHPExcel/Settings.php | 2 +- libraries/PHPExcel/PHPExcel/Shared/CodePage.php | 2 +- libraries/PHPExcel/PHPExcel/Shared/Date.php | 2 +- libraries/PHPExcel/PHPExcel/Shared/Drawing.php | 2 +- libraries/PHPExcel/PHPExcel/Shared/Escher.php | 2 +- .../PHPExcel/Shared/Escher/DgContainer.php | 2 +- .../Shared/Escher/DgContainer/SpgrContainer.php | 2 +- .../DgContainer/SpgrContainer/SpContainer.php | 2 +- .../PHPExcel/Shared/Escher/DggContainer.php | 28 ++- .../Shared/Escher/DggContainer/BstoreContainer.php | 2 +- .../Escher/DggContainer/BstoreContainer/BSE.php | 2 +- .../DggContainer/BstoreContainer/BSE/Blip.php | 2 +- libraries/PHPExcel/PHPExcel/Shared/Excel5.php | 2 +- libraries/PHPExcel/PHPExcel/Shared/File.php | 21 +- libraries/PHPExcel/PHPExcel/Shared/Font.php | 2 +- .../PHPExcel/Shared/OLE/ChainedBlockStream.php | 2 +- libraries/PHPExcel/PHPExcel/Shared/OLERead.php | 2 +- .../PHPExcel/PHPExcel/Shared/PasswordHasher.php | 2 +- libraries/PHPExcel/PHPExcel/Shared/String.php | 4 +- libraries/PHPExcel/PHPExcel/Shared/XMLWriter.php | 11 +- .../PHPExcel/PHPExcel/Shared/ZipStreamWrapper.php | 2 +- .../PHPExcel/Shared/trend/bestFitClass.php | 2 +- .../Shared/trend/exponentialBestFitClass.php | 2 +- .../PHPExcel/Shared/trend/linearBestFitClass.php | 2 +- .../Shared/trend/logarithmicBestFitClass.php | 2 +- .../Shared/trend/polynomialBestFitClass.php | 2 +- .../PHPExcel/Shared/trend/powerBestFitClass.php | 2 +- libraries/PHPExcel/PHPExcel/Style.php | 4 +- libraries/PHPExcel/PHPExcel/Style/Alignment.php | 4 +- libraries/PHPExcel/PHPExcel/Style/Border.php | 4 +- libraries/PHPExcel/PHPExcel/Style/Borders.php | 4 +- libraries/PHPExcel/PHPExcel/Style/Color.php | 4 +- libraries/PHPExcel/PHPExcel/Style/Conditional.php | 2 +- libraries/PHPExcel/PHPExcel/Style/Fill.php | 4 +- libraries/PHPExcel/PHPExcel/Style/Font.php | 4 +- libraries/PHPExcel/PHPExcel/Style/NumberFormat.php | 4 +- libraries/PHPExcel/PHPExcel/Style/Protection.php | 2 +- libraries/PHPExcel/PHPExcel/Worksheet.php | 15 +- .../PHPExcel/PHPExcel/Worksheet/BaseDrawing.php | 2 +- .../PHPExcel/PHPExcel/Worksheet/CellIterator.php | 2 +- .../PHPExcel/Worksheet/ColumnDimension.php | 2 +- libraries/PHPExcel/PHPExcel/Worksheet/Drawing.php | 2 +- .../PHPExcel/PHPExcel/Worksheet/Drawing/Shadow.php | 2 +- .../PHPExcel/PHPExcel/Worksheet/HeaderFooter.php | 2 +- .../PHPExcel/Worksheet/HeaderFooterDrawing.php | 2 +- .../PHPExcel/PHPExcel/Worksheet/MemoryDrawing.php | 2 +- .../PHPExcel/PHPExcel/Worksheet/PageMargins.php | 2 +- .../PHPExcel/PHPExcel/Worksheet/PageSetup.php | 213 ++++++++++++--- .../PHPExcel/PHPExcel/Worksheet/Protection.php | 2 +- libraries/PHPExcel/PHPExcel/Worksheet/Row.php | 2 +- .../PHPExcel/PHPExcel/Worksheet/RowDimension.php | 2 +- .../PHPExcel/PHPExcel/Worksheet/RowIterator.php | 2 +- .../PHPExcel/PHPExcel/Worksheet/SheetView.php | 2 +- libraries/PHPExcel/PHPExcel/WorksheetIterator.php | 2 +- libraries/PHPExcel/PHPExcel/Writer/CSV.php | 5 +- libraries/PHPExcel/PHPExcel/Writer/Excel2007.php | 5 +- .../PHPExcel/Writer/Excel2007/Comments.php | 2 +- .../PHPExcel/Writer/Excel2007/ContentTypes.php | 2 +- .../PHPExcel/Writer/Excel2007/DocProps.php | 2 +- .../PHPExcel/PHPExcel/Writer/Excel2007/Drawing.php | 2 +- .../PHPExcel/PHPExcel/Writer/Excel2007/Rels.php | 2 +- .../PHPExcel/Writer/Excel2007/StringTable.php | 2 +- .../PHPExcel/PHPExcel/Writer/Excel2007/Style.php | 2 +- .../PHPExcel/PHPExcel/Writer/Excel2007/Theme.php | 2 +- .../PHPExcel/Writer/Excel2007/Workbook.php | 2 +- .../PHPExcel/Writer/Excel2007/Worksheet.php | 15 +- .../PHPExcel/Writer/Excel2007/WriterPart.php | 2 +- libraries/PHPExcel/PHPExcel/Writer/Excel5.php | 285 ++++++++++++++++++- .../PHPExcel/PHPExcel/Writer/Excel5/BIFFwriter.php | 2 +- .../PHPExcel/PHPExcel/Writer/Excel5/Escher.php | 9 +- libraries/PHPExcel/PHPExcel/Writer/Excel5/Font.php | 2 +- .../PHPExcel/PHPExcel/Writer/Excel5/Parser.php | 20 ++- .../PHPExcel/PHPExcel/Writer/Excel5/Workbook.php | 172 +++--------- .../PHPExcel/PHPExcel/Writer/Excel5/Worksheet.php | 211 ++++++--------- libraries/PHPExcel/PHPExcel/Writer/Excel5/Xf.php | 2 +- libraries/PHPExcel/PHPExcel/Writer/HTML.php | 11 +- libraries/PHPExcel/PHPExcel/Writer/IWriter.php | 2 +- libraries/PHPExcel/PHPExcel/Writer/PDF.php | 2 +- libraries/PHPExcel/PHPExcel/Writer/Serialized.php | 6 +- 129 files changed, 1563 insertions(+), 917 deletions(-) diff --git a/ChangeLog b/ChangeLog index d15366e..f31420a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -115,6 +115,7 @@ 3.3.8.0 (not yet released) - bug #3059311 [import] BIGINT field type added to table analysis +- [core] Update library PHPExcel to version 1.7.4 3.3.7.0 (2010-09-07) - patch #3050492 [PDF scratchboard] Cannot drag table box to the edge after diff --git a/libraries/PHPExcel/PHPExcel.php b/libraries/PHPExcel/PHPExcel.php index 8b9c71f..c54d421 100644 --- a/libraries/PHPExcel/PHPExcel.php +++ b/libraries/PHPExcel/PHPExcel.php @@ -22,7 +22,7 @@ * @package PHPExcel * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ @@ -434,7 +434,7 @@ class PHPExcel // update the cellXfs foreach ($pSheet->getCellCollection(false) as $cellID) { - $cell = $sheet->getCell($cellID); + $cell = $pSheet->getCell($cellID); $cell->setXfIndex( $cell->getXfIndex() + $countCellXfs ); } diff --git a/libraries/PHPExcel/PHPExcel/Autoloader.php b/libraries/PHPExcel/PHPExcel/Autoloader.php index 3821d74..e66ce60 100644 --- a/libraries/PHPExcel/PHPExcel/Autoloader.php +++ b/libraries/PHPExcel/PHPExcel/Autoloader.php @@ -22,7 +22,7 @@ * @package PHPExcel * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ class PHPExcel_Autoloader diff --git a/libraries/PHPExcel/PHPExcel/CachedObjectStorage/APC.php b/libraries/PHPExcel/PHPExcel/CachedObjectStorage/APC.php index 62e3a14..dae46c2 100644 --- a/libraries/PHPExcel/PHPExcel/CachedObjectStorage/APC.php +++ b/libraries/PHPExcel/PHPExcel/CachedObjectStorage/APC.php @@ -22,7 +22,7 @@ * @package PHPExcel_CachedObjectStorage * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ @@ -45,7 +45,7 @@ class PHPExcel_CachedObjectStorage_APC extends PHPExcel_CachedObjectStorage_Cach if (!apc_store($this->_cachePrefix.$this->_currentObjectID.'.cache',serialize($this->_currentObject),$this->_cacheTime)) { $this->__destruct(); - throw new Exception('Failed to store cell in APC'); + throw new Exception('Failed to store cell '.$cellID.' in APC'); } $this->_currentObjectID = $this->_currentObject = null; } // function _storeData() @@ -90,7 +90,7 @@ class PHPExcel_CachedObjectStorage_APC extends PHPExcel_CachedObjectStorage_Cach if ($success === false) { // Entry no longer exists in APC, so clear it from the cache array parent::deleteCacheData($pCoord); - throw new Exception('Cell entry no longer exists in APC'); + throw new Exception('Cell entry '.$cellID.' no longer exists in APC'); } return true; } @@ -117,7 +117,7 @@ class PHPExcel_CachedObjectStorage_APC extends PHPExcel_CachedObjectStorage_Cach if ($obj === false) { // Entry no longer exists in APC, so clear it from the cache array parent::deleteCacheData($pCoord); - throw new Exception('Cell entry no longer exists in APC'); + throw new Exception('Cell entry '.$cellID.' no longer exists in APC'); } } else { // Return null if requested entry doesn't exist in cache @@ -150,6 +150,35 @@ class PHPExcel_CachedObjectStorage_APC extends PHPExcel_CachedObjectStorage_Cach } // function deleteCacheData() + /** + * Clone the cell collection + * + * @return void + */ + public function copyCellCollection(PHPExcel_Worksheet $parent) { + parent::copyCellCollection($parent); + // Get a new id for the new file name + $baseUnique = $this->_getUniqueID(); + $newCachePrefix = substr(md5($baseUnique),0,8).'.'; + $cacheList = $this->getCellList(); + foreach($cacheList as $cellID) { + if ($cellID != $this->_currentObjectID) { + $obj = apc_fetch($this->_cachePrefix.$cellID.'.cache'); + if ($obj === false) { + // Entry no longer exists in APC, so clear it from the cache array + parent::deleteCacheData($cellID); + throw new Exception('Cell entry '.$cellID.' no longer exists in APC'); + } + if (!apc_store($newCachePrefix.$cellID.'.cache',$obj,$this->_cacheTime)) { + $this->__destruct(); + throw new Exception('Failed to store cell '.$cellID.' in APC'); + } + } + } + $this->_cachePrefix = $newCachePrefix; + } // function copyCellCollection() + + public function unsetWorksheetCells() { if(!is_null($this->_currentObject)) { $this->_currentObject->detach(); @@ -170,12 +199,8 @@ class PHPExcel_CachedObjectStorage_APC extends PHPExcel_CachedObjectStorage_Cach $cacheTime = (isset($arguments['cacheTime'])) ? $arguments['cacheTime'] : 600; if (is_null($this->_cachePrefix)) { - if (function_exists('posix_getpid')) { - $baseUnique = posix_getpid(); - } else { - $baseUnique = mt_rand(); - } - $this->_cachePrefix = substr(md5(uniqid($baseUnique,true)),0,8).'.'; + $baseUnique = $this->_getUniqueID(); + $this->_cachePrefix = substr(md5($baseUnique),0,8).'.'; $this->_cacheTime = $cacheTime; parent::__construct($parent); diff --git a/libraries/PHPExcel/PHPExcel/CachedObjectStorage/CacheBase.php b/libraries/PHPExcel/PHPExcel/CachedObjectStorage/CacheBase.php index 9871d90..208ed02 100644 --- a/libraries/PHPExcel/PHPExcel/CachedObjectStorage/CacheBase.php +++ b/libraries/PHPExcel/PHPExcel/CachedObjectStorage/CacheBase.php @@ -22,7 +22,7 @@ * @package PHPExcel_CachedObjectStorage * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ @@ -116,7 +116,7 @@ class PHPExcel_CachedObjectStorage_CacheBase { $this->_currentObjectID = $this->_currentObject = null; } - if (isset($this->_cellCache[$pCoord])) { + if (is_object($this->_cellCache[$pCoord])) { $this->_cellCache[$pCoord]->detach(); unset($this->_cellCache[$pCoord]); } @@ -141,13 +141,34 @@ class PHPExcel_CachedObjectStorage_CacheBase { public function getSortedCellList() { $sortKeys = array(); foreach ($this->_cellCache as $coord => $value) { - preg_match('/^(\w+)(\d+)$/U',$coord,$matches); - list(,$colNum,$rowNum) = $matches; - $sortKeys[$coord] = str_pad($rowNum . str_pad($colNum,3,'@',STR_PAD_LEFT),12,'0',STR_PAD_LEFT); + list($colNum,$rowNum) = sscanf($coord,'%[A-Z]%d'); + $sortKeys[sprintf('%09d%3s',$rowNum,$colNum)] = $coord; } - asort($sortKeys); + ksort($sortKeys); - return array_keys($sortKeys); + return array_values($sortKeys); } // function sortCellList() + + protected function _getUniqueID() { + if (function_exists('posix_getpid')) { + $baseUnique = posix_getpid(); + } else { + $baseUnique = mt_rand(); + } + return uniqid($baseUnique,true); + } + + /** + * Clone the cell collection + * + * @return void + */ + public function copyCellCollection(PHPExcel_Worksheet $parent) { + $this->_parent = $parent; + if ((!is_null($this->_currentObject)) && (is_object($this->_currentObject))) { + $this->_currentObject->attach($parent); + } + } // function copyCellCollection() + } diff --git a/libraries/PHPExcel/PHPExcel/CachedObjectStorage/DiscISAM.php b/libraries/PHPExcel/PHPExcel/CachedObjectStorage/DiscISAM.php index e685607..dff52fa 100644 --- a/libraries/PHPExcel/PHPExcel/CachedObjectStorage/DiscISAM.php +++ b/libraries/PHPExcel/PHPExcel/CachedObjectStorage/DiscISAM.php @@ -22,7 +22,7 @@ * @package PHPExcel_CachedObjectStorage * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ @@ -103,6 +103,24 @@ class PHPExcel_CachedObjectStorage_DiscISAM extends PHPExcel_CachedObjectStorage } // function getCacheData() + /** + * Clone the cell collection + * + * @return void + */ + public function copyCellCollection(PHPExcel_Worksheet $parent) { + parent::copyCellCollection($parent); + // Get a new id for the new file name + $baseUnique = $this->_getUniqueID(); + $newFileName = sys_get_temp_dir().'/PHPExcel.'.$baseUnique.'.cache'; + // Copy the existing cell cache file + copy ($this->_fileName,$newFileName); + $this->_fileName = $newFileName; + // Open the copied cell cache file + $this->_fileHandle = fopen($this->_fileName,'a+'); + } // function copyCellCollection() + + public function unsetWorksheetCells() { if(!is_null($this->_currentObject)) { $this->_currentObject->detach(); @@ -121,12 +139,8 @@ class PHPExcel_CachedObjectStorage_DiscISAM extends PHPExcel_CachedObjectStorage public function __construct(PHPExcel_Worksheet $parent) { parent::__construct($parent); if (is_null($this->_fileHandle)) { - if (function_exists('posix_getpid')) { - $baseUnique = posix_getpid(); - } else { - $baseUnique = mt_rand(); - } - $this->_fileName = sys_get_temp_dir().'/PHPExcel.'.uniqid($baseUnique,true).'.cache'; + $baseUnique = $this->_getUniqueID(); + $this->_fileName = sys_get_temp_dir().'/PHPExcel.'.$baseUnique.'.cache'; $this->_fileHandle = fopen($this->_fileName,'a+'); } } // function __construct() diff --git a/libraries/PHPExcel/PHPExcel/CachedObjectStorage/ICache.php b/libraries/PHPExcel/PHPExcel/CachedObjectStorage/ICache.php index f3282aa..4731b8e 100644 --- a/libraries/PHPExcel/PHPExcel/CachedObjectStorage/ICache.php +++ b/libraries/PHPExcel/PHPExcel/CachedObjectStorage/ICache.php @@ -22,7 +22,7 @@ * @package PHPExcel_CachedObjectStorage * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ @@ -94,4 +94,11 @@ interface PHPExcel_CachedObjectStorage_ICache */ public function getSortedCellList(); + /** + * Clone the cell collection + * + * @return void + */ + public function copyCellCollection(PHPExcel_Worksheet $parent); + } diff --git a/libraries/PHPExcel/PHPExcel/CachedObjectStorage/Memcache.php b/libraries/PHPExcel/PHPExcel/CachedObjectStorage/Memcache.php index f1fc43c..74df8e8 100644 --- a/libraries/PHPExcel/PHPExcel/CachedObjectStorage/Memcache.php +++ b/libraries/PHPExcel/PHPExcel/CachedObjectStorage/Memcache.php @@ -22,7 +22,7 @@ * @package PHPExcel_CachedObjectStorage * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ @@ -49,7 +49,7 @@ class PHPExcel_CachedObjectStorage_Memcache extends PHPExcel_CachedObjectStorage if (!$this->_memcache->replace($this->_cachePrefix.$this->_currentObjectID.'.cache',$obj,NULL,$this->_cacheTime)) { if (!$this->_memcache->add($this->_cachePrefix.$this->_currentObjectID.'.cache',$obj,NULL,$this->_cacheTime)) { $this->__destruct(); - throw new Exception('Failed to store cell in Memcache'); + throw new Exception('Failed to store cell '.$cellID.' in MemCache'); } } $this->_currentObjectID = $this->_currentObject = null; @@ -90,12 +90,12 @@ class PHPExcel_CachedObjectStorage_Memcache extends PHPExcel_CachedObjectStorage if ($this->_currentObjectID == $pCoord) { return true; } - // Check if the requested entry still exists in apc + // Check if the requested entry still exists in Memcache $success = $this->_memcache->get($this->_cachePrefix.$pCoord.'.cache'); if ($success === false) { // Entry no longer exists in Memcache, so clear it from the cache array parent::deleteCacheData($pCoord); - throw new Exception('Cell entry no longer exists in Memcache'); + throw new Exception('Cell entry '.$cellID.' no longer exists in MemCache'); } return true; } @@ -122,7 +122,7 @@ class PHPExcel_CachedObjectStorage_Memcache extends PHPExcel_CachedObjectStorage if ($obj === false) { // Entry no longer exists in Memcache, so clear it from the cache array parent::deleteCacheData($pCoord); - throw new Exception('Cell entry no longer exists in Memcache'); + throw new Exception('Cell entry '.$cellID.' no longer exists in MemCache'); } } else { // Return null if requested entry doesn't exist in cache @@ -155,6 +155,35 @@ class PHPExcel_CachedObjectStorage_Memcache extends PHPExcel_CachedObjectStorage } // function deleteCacheData() + /** + * Clone the cell collection + * + * @return void + */ + public function copyCellCollection(PHPExcel_Worksheet $parent) { + parent::copyCellCollection($parent); + // Get a new id for the new file name + $baseUnique = $this->_getUniqueID(); + $newCachePrefix = substr(md5($baseUnique),0,8).'.'; + $cacheList = $this->getCellList(); + foreach($cacheList as $cellID) { + if ($cellID != $this->_currentObjectID) { + $obj = $this->_memcache->get($this->_cachePrefix.$cellID.'.cache'); + if ($obj === false) { + // Entry no longer exists in Memcache, so clear it from the cache array + parent::deleteCacheData($cellID); + throw new Exception('Cell entry '.$cellID.' no longer exists in MemCache'); + } + if (!$this->_memcache->add($newCachePrefix.$cellID.'.cache',$obj,NULL,$this->_cacheTime)) { + $this->__destruct(); + throw new Exception('Failed to store cell '.$cellID.' in MemCache'); + } + } + } + $this->_cachePrefix = $newCachePrefix; + } // function copyCellCollection() + + public function unsetWorksheetCells() { if(!is_null($this->_currentObject)) { $this->_currentObject->detach(); @@ -177,17 +206,13 @@ class PHPExcel_CachedObjectStorage_Memcache extends PHPExcel_CachedObjectStorage $cacheTime = (isset($arguments['cacheTime'])) ? $arguments['cacheTime'] : 600; if (is_null($this->_cachePrefix)) { - if (function_exists('posix_getpid')) { - $baseUnique = posix_getpid(); - } else { - $baseUnique = mt_rand(); - } - $this->_cachePrefix = substr(md5(uniqid($baseUnique,true)),0,8).'.'; + $baseUnique = $this->_getUniqueID(); + $this->_cachePrefix = substr(md5($baseUnique),0,8).'.'; // Set a new Memcache object and connect to the Memcache server $this->_memcache = new Memcache(); - if (!$this->_memcache->addServer($memcacheServer, $memcachePort, false, 50, 5, 5, true, array($this, 'failureCallback')) { - throw new Exception('Could not connect to Memcache server at '.$memcacheServer.':'.$memcachePort); + if (!$this->_memcache->addServer($memcacheServer, $memcachePort, false, 50, 5, 5, true, array($this, 'failureCallback'))) { + throw new Exception('Could not connect to MemCache server at '.$memcacheServer.':'.$memcachePort); } $this->_cacheTime = $cacheTime; @@ -197,7 +222,7 @@ class PHPExcel_CachedObjectStorage_Memcache extends PHPExcel_CachedObjectStorage public function failureCallback($host, $port) { - throw new Exception('memcache '.$host.':'.$port' failed'); + throw new Exception('memcache '.$host.':'.$port.' failed'); } diff --git a/libraries/PHPExcel/PHPExcel/CachedObjectStorage/Memory.php b/libraries/PHPExcel/PHPExcel/CachedObjectStorage/Memory.php index be0fade..4b59b91 100644 --- a/libraries/PHPExcel/PHPExcel/CachedObjectStorage/Memory.php +++ b/libraries/PHPExcel/PHPExcel/CachedObjectStorage/Memory.php @@ -22,7 +22,7 @@ * @package PHPExcel_CachedObjectStorage * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/CachedObjectStorage/MemoryGZip.php b/libraries/PHPExcel/PHPExcel/CachedObjectStorage/MemoryGZip.php index c281389..394faf2 100644 --- a/libraries/PHPExcel/PHPExcel/CachedObjectStorage/MemoryGZip.php +++ b/libraries/PHPExcel/PHPExcel/CachedObjectStorage/MemoryGZip.php @@ -22,7 +22,7 @@ * @package PHPExcel_CachedObjectStorage * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/CachedObjectStorage/MemorySerialized.php b/libraries/PHPExcel/PHPExcel/CachedObjectStorage/MemorySerialized.php index 9c29ea2..0b5b997 100644 --- a/libraries/PHPExcel/PHPExcel/CachedObjectStorage/MemorySerialized.php +++ b/libraries/PHPExcel/PHPExcel/CachedObjectStorage/MemorySerialized.php @@ -22,7 +22,7 @@ * @package PHPExcel_CachedObjectStorage * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/CachedObjectStorage/PHPTemp.php b/libraries/PHPExcel/PHPExcel/CachedObjectStorage/PHPTemp.php index 98cd952..54810d8 100644 --- a/libraries/PHPExcel/PHPExcel/CachedObjectStorage/PHPTemp.php +++ b/libraries/PHPExcel/PHPExcel/CachedObjectStorage/PHPTemp.php @@ -22,7 +22,7 @@ * @package PHPExcel_CachedObjectStorage * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ @@ -38,6 +38,8 @@ class PHPExcel_CachedObjectStorage_PHPTemp extends PHPExcel_CachedObjectStorage_ private $_fileHandle = null; + private $_memoryCacheSize = null; + private function _storeData() { $this->_currentObject->detach(); @@ -102,6 +104,24 @@ class PHPExcel_CachedObjectStorage_PHPTemp extends PHPExcel_CachedObjectStorage_ } // function getCacheData() + /** + * Clone the cell collection + * + * @return void + */ + public function copyCellCollection(PHPExcel_Worksheet $parent) { + parent::copyCellCollection($parent); + // Open a new stream for the cell cache data + $newFileHandle = fopen('php://temp/maxmemory:'.$this->_memoryCacheSize,'a+'); + // Copy the existing cell cache data to the new stream + fseek($this->_fileHandle,0); + while (!feof($this->_fileHandle)) { + fwrite($newFileHandle,fread($this->_fileHandle, 1024)); + } + $this->_fileHandle = $newFileHandle; + } // function copyCellCollection() + + public function unsetWorksheetCells() { if(!is_null($this->_currentObject)) { $this->_currentObject->detach(); @@ -118,11 +138,11 @@ class PHPExcel_CachedObjectStorage_PHPTemp extends PHPExcel_CachedObjectStorage_ public function __construct(PHPExcel_Worksheet $parent, $memoryCacheSize = '1MB') { - $memoryCacheSize = (isset($arguments['memoryCacheSize'])) ? $arguments['memoryCacheSize'] : '1MB'; + $this->_memoryCacheSize = (isset($arguments['memoryCacheSize'])) ? $arguments['memoryCacheSize'] : '1MB'; parent::__construct($parent); if (is_null($this->_fileHandle)) { - $this->_fileHandle = fopen('php://temp/maxmemory:'.$memoryCacheSize,'a+'); + $this->_fileHandle = fopen('php://temp/maxmemory:'.$this->_memoryCacheSize,'a+'); } } // function __construct() diff --git a/libraries/PHPExcel/PHPExcel/CachedObjectStorage/Wincache.php b/libraries/PHPExcel/PHPExcel/CachedObjectStorage/Wincache.php index d759d7c..aa075be 100644 --- a/libraries/PHPExcel/PHPExcel/CachedObjectStorage/Wincache.php +++ b/libraries/PHPExcel/PHPExcel/CachedObjectStorage/Wincache.php @@ -22,7 +22,7 @@ * @package PHPExcel_CachedObjectStorage * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ @@ -45,9 +45,15 @@ class PHPExcel_CachedObjectStorage_Wincache extends PHPExcel_CachedObjectStorage $obj = serialize($this->_currentObject); if (wincache_ucache_exists($this->_cachePrefix.$this->_currentObjectID.'.cache')) { - wincache_ucache_set($this->_cachePrefix.$this->_currentObjectID.'.cache', $obj, $this->_cacheTime); + if (!wincache_ucache_set($this->_cachePrefix.$this->_currentObjectID.'.cache', $obj, $this->_cacheTime)) { + $this->__destruct(); + throw new Exception('Failed to store cell '.$cellID.' in WinCache'); + } } else { - wincache_ucache_add($this->_cachePrefix.$this->_currentObjectID.'.cache', $obj, $this->_cacheTime); + if (!wincache_ucache_add($this->_cachePrefix.$this->_currentObjectID.'.cache', $obj, $this->_cacheTime)) { + $this->__destruct(); + throw new Exception('Failed to store cell '.$cellID.' in WinCache'); + } } $this->_currentObjectID = $this->_currentObject = null; @@ -93,7 +99,7 @@ class PHPExcel_CachedObjectStorage_Wincache extends PHPExcel_CachedObjectStorage if ($success === false) { // Entry no longer exists in Wincache, so clear it from the cache array parent::deleteCacheData($pCoord); - throw new Exception('Cell entry no longer exists in Wincache'); + throw new Exception('Cell entry '.$cellID.' no longer exists in WinCache'); } return true; } @@ -120,9 +126,9 @@ class PHPExcel_CachedObjectStorage_Wincache extends PHPExcel_CachedObjectStorage $success = false; $obj = wincache_ucache_get($this->_cachePrefix.$pCoord.'.cache', $success); if ($success === false) { - // Entry no longer exists in Wincache, so clear it from the cache array + // Entry no longer exists in WinCache, so clear it from the cache array parent::deleteCacheData($pCoord); - throw new Exception('Cell entry no longer exists in Wincache'); + throw new Exception('Cell entry '.$cellID.' no longer exists in WinCache'); } } else { // Return null if requested entry doesn't exist in cache @@ -155,13 +161,43 @@ class PHPExcel_CachedObjectStorage_Wincache extends PHPExcel_CachedObjectStorage } // function deleteCacheData() + /** + * Clone the cell collection + * + * @return void + */ + public function copyCellCollection(PHPExcel_Worksheet $parent) { + parent::copyCellCollection($parent); + // Get a new id for the new file name + $baseUnique = $this->_getUniqueID(); + $newCachePrefix = substr(md5($baseUnique),0,8).'.'; + $cacheList = $this->getCellList(); + foreach($cacheList as $cellID) { + if ($cellID != $this->_currentObjectID) { + $success = false; + $obj = wincache_ucache_get($this->_cachePrefix.$cellID.'.cache', $success); + if ($success === false) { + // Entry no longer exists in WinCache, so clear it from the cache array + parent::deleteCacheData($cellID); + throw new Exception('Cell entry '.$cellID.' no longer exists in Wincache'); + } + if (!wincache_ucache_add($newCachePrefix.$cellID.'.cache', $obj, $this->_cacheTime)) { + $this->__destruct(); + throw new Exception('Failed to store cell '.$cellID.' in Wincache'); + } + } + } + $this->_cachePrefix = $newCachePrefix; + } // function copyCellCollection() + + public function unsetWorksheetCells() { if(!is_null($this->_currentObject)) { $this->_currentObject->detach(); $this->_currentObject = $this->_currentObjectID = null; } - // Flush the Wincache cache + // Flush the WinCache cache $this->__destruct(); $this->_cellCache = array(); @@ -175,12 +211,8 @@ class PHPExcel_CachedObjectStorage_Wincache extends PHPExcel_CachedObjectStorage $cacheTime = (isset($arguments['cacheTime'])) ? $arguments['cacheTime'] : 600; if (is_null($this->_cachePrefix)) { - if (function_exists('posix_getpid')) { - $baseUnique = posix_getpid(); - } else { - $baseUnique = mt_rand(); - } - $this->_cachePrefix = substr(md5(uniqid($baseUnique,true)),0,8).'.'; + $baseUnique = $this->_getUniqueID(); + $this->_cachePrefix = substr(md5($baseUnique),0,8).'.'; $this->_cacheTime = $cacheTime; parent::__construct($parent); diff --git a/libraries/PHPExcel/PHPExcel/Calculation.php b/libraries/PHPExcel/PHPExcel/Calculation.php index 6e8499e..e32891a 100644 --- a/libraries/PHPExcel/PHPExcel/Calculation.php +++ b/libraries/PHPExcel/PHPExcel/Calculation.php @@ -22,7 +22,7 @@ * @package PHPExcel_Calculation * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ @@ -2248,7 +2248,7 @@ class PHPExcel_Calculation { } $this->debugLogStack[] = $wsTitle.'!'.$cellID; // Parse the formula onto the token stack and calculate the value - $cellValue = $this->_processTokenStack($this->_parseFormula($formula), $cellID, $pCell); + $cellValue = $this->_processTokenStack($this->_parseFormula($formula, $pCell), $cellID, $pCell); array_pop($this->debugLogStack); // Save to calculation cache @@ -2462,31 +2462,24 @@ class PHPExcel_Calculation { $value = array_pop($testArray); } - switch (gettype($value)) { - case 'double' : - case 'float' : - $typeString = 'a floating point number'; - break; - case 'integer' : - $typeString = 'an integer number'; - break; - case 'boolean' : - $typeString = 'a boolean'; - break; - case 'array' : - $typeString = 'a matrix'; - break; - case 'string' : - if ($value == '') { - return 'an empty string'; - } elseif ($value{0} == '#') { - return 'a '.$value.' error'; - } else { - $typeString = 'a string'; - } - break; - case 'NULL' : - return 'a null value'; + if (is_null($value)) { + return 'a null value'; + } elseif (is_float($value)) { + $typeString = 'a floating point number'; + } elseif(is_int($value)) { + $typeString = 'an integer number'; + } elseif(is_bool($value)) { + $typeString = 'a boolean'; + } elseif(is_array($value)) { + $typeString = 'a matrix'; + } else { + if ($value == '') { + return 'an empty string'; + } elseif ($value{0} == '#') { + return 'a '.$value.' error'; + } else { + $typeString = 'a string'; + } } return $typeString.' with a value of '.self::_showValue($value); } // function _showTypeDetails() @@ -2548,11 +2541,15 @@ class PHPExcel_Calculation { // Convert infix to postfix notation - private function _parseFormula($formula) { + private function _parseFormula($formula, PHPExcel_Cell $pCell = null) { if (($formula = self::_convertMatrixReferences(trim($formula))) === false) { return false; } + // If we're using cell caching, then $pCell may well be flushed back to the cache (which detaches the parent worksheet), + // so we store the parent worksheet so that we can re-attach it when necessary + $pCellParent = (!is_null($pCell)) ? $pCell->getParent() : null; + // Binary Operators // These operators always work on two values // Array key is the operator, the value indicates whether this is a left or right associative operator @@ -2774,12 +2771,56 @@ class PHPExcel_Calculation { // echo 'Element '.$val.' is a Cell reference<br />'; // Watch for this case-change when modifying to allow cell references in different worksheets... // Should only be applied to the actual cell column, not the worksheet name + + // If the last entry on the stack was a : operator, then we have a cell range reference + $testPrevOp = $stack->last(1); + if ($testPrevOp['value'] == ':') { + // If we have a worksheet reference, then we're playing with a 3D reference + if ($matches[2] == '') { + // Otherwise, we 'inherit' the worksheet reference from the start cell reference + // The start of the cell range reference should be the last entry in $output + $startCellRef = $output[count($output)-1]['value']; + preg_match('/^'.self::CALCULATION_REGEXP_CELLREF.'$/i', $startCellRef, $startMatches); + if ($startMatches[2] > '') { + $val = $startMatches[2].'!'.$val; + } + } + } $cellRef = strtoupper($val); -// $output[] = $cellRef; + $output[] = array('type' => 'Cell Reference', 'value' => $val, 'reference' => $cellRef); // $expectingOperator = false; } else { // it's a variable, constant, string, number or boolean // echo 'Element is a Variable, Constant, String, Number or Boolean<br />'; + // If the last entry on the stack was a : operator, then we may have a row or column range reference + $testPrevOp = $stack->last(1); + if ($testPrevOp['value'] == ':') { + $startRowColRef = $output[count($output)-1]['value']; + $rangeWS1 = ''; + if (strpos('!',$startRowColRef) !== false) { + list($rangeWS1,$startRowColRef) = explode('!',$startRowColRef); + } + if ($rangeWS1 != '') $rangeWS1 .= '!'; + $rangeWS2 = $rangeWS1; + if (strpos('!',$val) !== false) { + list($rangeWS2,$val) = explode('!',$val); + } + if ($rangeWS2 != '') $rangeWS2 .= '!'; + if ((is_integer($startRowColRef)) && (ctype_digit($val)) && + ($startRowColRef <= 1048576) && ($val <= 1048576)) { + // Row range + $endRowColRef = (!is_null($pCellParent)) ? $pCellParent->getHighestColumn() : 'XFD'; // Max 16,384 columns for Excel2007 + $output[count($output)-1]['value'] = $rangeWS1.'A'.$startRowColRef; + $val = $rangeWS2.$endRowColRef.$val; + } elseif ((ctype_alpha($startRowColRef)) && (ctype_alpha($val)) && + (strlen($startRowColRef) <= 3) && (strlen($val) <= 3)) { + // Column range + $endRowColRef = (!is_null($pCellParent)) ? $pCellParent->getHighestRow() : 1048576; // Max 1,048,576 rows for Excel2007 + $output[count($output)-1]['value'] = $rangeWS1.strtoupper($startRowColRef).'1'; + $val = $rangeWS2.$val.$endRowColRef; + } + } + $localeConstant = false; if ($opCharacter == '"') { // echo 'Element is a String<br />'; @@ -2808,6 +2849,8 @@ class PHPExcel_Calculation { } $index += $length; + } elseif ($opCharacter == '$') { // absolute row or column range + $index++; } elseif ($opCharacter == ')') { // miscellaneous error checking if ($expectingOperand) { $output[] = array('type' => 'Null Value', 'value' => self::$_ExcelConstants['NULL'], 'reference' => NULL); @@ -3067,7 +3110,7 @@ class PHPExcel_Calculation { return $this->_raiseFormulaError('Unable to access Cell Reference'); } $this->_writeDebug('Evaluation Result for cells '.$cellRef.' in worksheet '.$matches[2].' is '.self::_showTypeDetails($cellValue)); - $cellRef = $matches[2].'!'.$cellRef; +// $cellRef = $matches[2].'!'.$cellRef; } else { // echo '$cellRef='.$cellRef.' in current worksheet<br />'; $this->_writeDebug('Evaluating Cell Range '.$cellRef.' in current worksheet'); @@ -3101,7 +3144,7 @@ class PHPExcel_Calculation { return $this->_raiseFormulaError('Unable to access Cell Reference'); } $this->_writeDebug('Evaluation Result for cell '.$cellRef.' in worksheet '.$matches[2].' is '.self::_showTypeDetails($cellValue)); - $cellRef = $matches[2].'!'.$cellRef; +// $cellRef = $matches[2].'!'.$cellRef; } else { // echo '$cellRef='.$cellRef.' in current worksheet<br />'; $this->_writeDebug('Evaluating Cell '.$cellRef.' in current worksheet'); diff --git a/libraries/PHPExcel/PHPExcel/Calculation/Exception.php b/libraries/PHPExcel/PHPExcel/Calculation/Exception.php index 8e77b9d..b94f3f4 100644 --- a/libraries/PHPExcel/PHPExcel/Calculation/Exception.php +++ b/libraries/PHPExcel/PHPExcel/Calculation/Exception.php @@ -22,7 +22,7 @@ * @package PHPExcel_Calculation * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Calculation/ExceptionHandler.php b/libraries/PHPExcel/PHPExcel/Calculation/ExceptionHandler.php index 9956167..7050260 100644 --- a/libraries/PHPExcel/PHPExcel/Calculation/ExceptionHandler.php +++ b/libraries/PHPExcel/PHPExcel/Calculation/ExceptionHandler.php @@ -22,7 +22,7 @@ * @package PHPExcel_Calculation * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ /** diff --git a/libraries/PHPExcel/PHPExcel/Calculation/FormulaParser.php b/libraries/PHPExcel/PHPExcel/Calculation/FormulaParser.php index 8fcde41..271aa75 100644 --- a/libraries/PHPExcel/PHPExcel/Calculation/FormulaParser.php +++ b/libraries/PHPExcel/PHPExcel/Calculation/FormulaParser.php @@ -22,7 +22,7 @@ * @package PHPExcel_Calculation * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Calculation/FormulaToken.php b/libraries/PHPExcel/PHPExcel/Calculation/FormulaToken.php index 69d7f42..8c1396e 100644 --- a/libraries/PHPExcel/PHPExcel/Calculation/FormulaToken.php +++ b/libraries/PHPExcel/PHPExcel/Calculation/FormulaToken.php @@ -22,7 +22,7 @@ * @package PHPExcel_Calculation * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Calculation/Function.php b/libraries/PHPExcel/PHPExcel/Calculation/Function.php index 783e533..81dfc99 100644 --- a/libraries/PHPExcel/PHPExcel/Calculation/Function.php +++ b/libraries/PHPExcel/PHPExcel/Calculation/Function.php @@ -22,7 +22,7 @@ * @package PHPExcel_Calculation * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Calculation/Functions.php b/libraries/PHPExcel/PHPExcel/Calculation/Functions.php index 8ce3cfd..805f483 100644 --- a/libraries/PHPExcel/PHPExcel/Calculation/Functions.php +++ b/libraries/PHPExcel/PHPExcel/Calculation/Functions.php @@ -22,7 +22,7 @@ * @package PHPExcel_Calculation * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ @@ -1885,7 +1885,7 @@ class PHPExcel_Calculation_Functions { } // Return - if (($aCount > 0) && ($returnValue > 0)) { + if (($aCount > 0) && ($returnValue >= 0)) { return sqrt($returnValue / $aCount); } } @@ -1937,7 +1937,7 @@ class PHPExcel_Calculation_Functions { } // Return - if (($aCount > 0) && ($returnValue > 0)) { + if (($aCount > 0) && ($returnValue >= 0)) { return sqrt($returnValue / $aCount); } } @@ -1984,7 +1984,7 @@ class PHPExcel_Calculation_Functions { } // Return - if (($aCount > 0) && ($returnValue > 0)) { + if (($aCount > 0) && ($returnValue >= 0)) { return sqrt($returnValue / $aCount); } } @@ -2036,7 +2036,7 @@ class PHPExcel_Calculation_Functions { } // Return - if (($aCount > 0) && ($returnValue > 0)) { + if (($aCount > 0) && ($returnValue >= 0)) { return sqrt($returnValue / $aCount); } } @@ -5691,7 +5691,7 @@ class PHPExcel_Calculation_Functions { * @return string Version information */ public static function VERSION() { - return 'PHPExcel 1.7.3c, 2010-06-01'; + return 'PHPExcel 1.7.4, 2010-08-26'; } // function VERSION() @@ -11139,112 +11139,101 @@ class PHPExcel_Calculation_Functions { * @return integer The relative position of the found item */ public static function MATCH($lookup_value, $lookup_array, $match_type=1) { - - // flatten the lookup_array $lookup_array = self::flattenArray($lookup_array); - - // flatten lookup_value since it may be a cell reference to a value or the value itself $lookup_value = self::flattenSingleValue($lookup_value); - - // MATCH is not case sensitive + $match_type = (is_null($match_type)) ? 1 : (int) self::flattenSingleValue($match_type); + // MATCH is not case sensitive $lookup_value = strtolower($lookup_value); - /* - echo "--------------------<br>looking for $lookup_value in <br>"; - print_r($lookup_array); - echo "<br>"; - //return 1; - /**/ - - // ** - // check inputs - // ** - // lookup_value type has to be number, text, or logical values - if (!is_numeric($lookup_value) && !is_string($lookup_value) && !is_bool($lookup_value)){ - // error: lookup_array should contain only number, text, or logical values - //echo "error: lookup_array should contain only number, text, or logical values<br>"; + // lookup_value type has to be number, text, or logical values + if ((!is_numeric($lookup_value)) && (!is_string($lookup_value)) && (!is_bool($lookup_value))) { return self::$_errorCodes['na']; } - // match_type is 0, 1 or -1 - if ($match_type!==0 && $match_type!==-1 && $match_type!==1){ - // error: wrong value for match_type - //echo "error: wrong value for match_type<br>"; + // match_type is 0, 1 or -1 + if (($match_type !== 0) && ($match_type !== -1) && ($match_type !== 1)) { return self::$_errorCodes['na']; } - // lookup_array should not be empty - if (sizeof($lookup_array)<=0){ - // error: empty range - //echo "error: empty range ".sizeof($lookup_array)."<br>"; + // lookup_array should not be empty + $lookupArraySize = count($lookup_array); + if ($lookupArraySize <= 0) { return self::$_errorCodes['na']; } - // lookup_array should contain only number, text, or logical values - for ($i=0;$i<sizeof($lookup_array);++$i){ - // check the type of the value - if (!is_numeric($lookup_array[$i]) && !is_string($lookup_array[$i]) && !is_bool($lookup_array[$i])){ - // error: lookup_array should contain only number, text, or logical values - //echo "error: lookup_array should contain only number, text, or logical values<br>"; + // lookup_array should contain only number, text, or logical values, or empty (null) cells + foreach($lookup_array as $i => $lookupArrayValue) { + // check the type of the value + if ((!is_numeric($lookupArrayValue)) && (!is_string($lookupArrayValue)) && + (!is_bool($lookupArrayValue)) && (!is_null($lookupArrayValue))) { return self::$_errorCodes['na']; } - // convert tpo lowercase - if (is_string($lookup_array[$i])) - $lookup_array[$i] = strtolower($lookup_array[$i]); + // convert strings to lowercase for case-insensitive testing + if (is_string($lookupArrayValue)) { + $lookup_array[$i] = strtolower($lookupArrayValue); + } + if ((is_null($lookupArrayValue)) && (($match_type == 1) || ($match_type == -1))) { + $lookup_array = array_slice($lookup_array,0,$i-1); + } } // if match_type is 1 or -1, the list has to be ordered - if($match_type==1 || $match_type==-1){ - // ** - // iniitialization - // store the last value - $iLastValue=$lookup_array[0]; - // ** - // loop on the cells - for ($i=0;$i<sizeof($lookup_array);++$i){ - // check ascending order - if(($match_type==1 && $lookup_array[$i]<$iLastValue) - // OR check descending order - || ($match_type==-1 && $lookup_array[$i]>$iLastValue)){ - // error: list is not ordered correctly - //echo "error: list is not ordered correctly<br>"; - return self::$_errorCodes['na']; - } - } + if ($match_type == 1) { + asort($lookup_array); + $keySet = array_keys($lookup_array); + } elseif($match_type == -1) { + arsort($lookup_array); + $keySet = array_keys($lookup_array); } + // ** // find the match // ** // loop on the cells - for ($i=0; $i < sizeof($lookup_array); ++$i){ - // if match_type is 0 <=> find the first value that is exactly equal to lookup_value - if ($match_type==0 && $lookup_array[$i]==$lookup_value){ - // this is the exact match - return $i+1; - } - // if match_type is -1 <=> find the smallest value that is greater than or equal to lookup_value - if ($match_type==-1 && $lookup_array[$i] < $lookup_value){ - if ($i<1){ +// var_dump($lookup_array); +// echo '<br />'; + foreach($lookup_array as $i => $lookupArrayValue) { + if (($match_type == 0) && ($lookupArrayValue == $lookup_value)) { + // exact match + return ++$i; + } elseif (($match_type == -1) && ($lookupArrayValue <= $lookup_value)) { +// echo '$i = '.$i.' => '; +// var_dump($lookupArrayValue); +// echo '<br />'; +// echo 'Keyset = '; +// var_dump($keySet); +// echo '<br />'; + $i = array_search($i,$keySet); +// echo '$i='.$i.'<br />'; + // if match_type is -1 <=> find the smallest value that is greater than or equal to lookup_value + if ($i < 1){ // 1st cell was allready smaller than the lookup_value break; - } - else + } else { // the previous cell was the match - return $i; - } - // if match_type is 1 <=> find the largest value that is less than or equal to lookup_value - if ($match_type==1 && $lookup_array[$i] > $lookup_value){ - if ($i<1){ + return $keySet[$i-1]+1; + } + } elseif (($match_type == 1) && ($lookupArrayValue >= $lookup_value)) { +// echo '$i = '.$i.' => '; +// var_dump($lookupArrayValue); +// echo '<br />'; +// echo 'Keyset = '; +// var_dump($keySet); +// echo '<br />'; + $i = array_search($i,$keySet); +// echo '$i='.$i.'<br />'; + // if match_type is 1 <=> find the largest value that is less than or equal to lookup_value + if ($i < 1){ // 1st cell was allready bigger than the lookup_value break; - } - else + } else { // the previous cell was the match - return $i; + return $keySet[$i-1]+1; + } } } - // unsuccessful in finding a match, return #N/A error value - //echo "unsuccessful in finding a match<br>"; + + // unsuccessful in finding a match, return #N/A error value return self::$_errorCodes['na']; } // function MATCH() @@ -11378,25 +11367,19 @@ class PHPExcel_Calculation_Functions { } $value = self::flattenSingleValue($value); - switch (gettype($value)) { - case 'double' : - case 'float' : - case 'integer' : + if ((is_float($value)) || (is_int($value))) { return 1; - break; - case 'boolean' : + } elseif(is_bool($value)) { return 4; - break; - case 'array' : + } elseif(is_array($value)) { return 64; break; - case 'string' : - // Errors - if ((strlen($value) > 0) && ($value{0} == '#')) { - return 16; - } - return 2; - break; + } elseif(is_string($value)) { + // Errors + if ((strlen($value) > 0) && ($value{0} == '#')) { + return 16; + } + return 2; } return 0; } // function TYPE() diff --git a/libraries/PHPExcel/PHPExcel/Cell.php b/libraries/PHPExcel/PHPExcel/Cell.php index f8ebf86..b805b8d 100644 --- a/libraries/PHPExcel/PHPExcel/Cell.php +++ b/libraries/PHPExcel/PHPExcel/Cell.php @@ -22,7 +22,7 @@ * @package PHPExcel_Cell * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ @@ -91,6 +91,13 @@ class PHPExcel_Cell */ private $_xfIndex; + /** + * Attributes of the formula + * + * + */ + private $_formulaAttributes; + /** * Send notification to the cache controller @@ -98,6 +105,7 @@ class PHPExcel_Cell **/ public function notifyCacheController() { $this->_parent->getCellCacheController()->updateCacheData($this); + return $this; } public function detach() { @@ -112,11 +120,11 @@ class PHPExcel_Cell /** * Create a new Cell * - * @param string $pColumn - * @param int $pRow - * @param mixed $pValue - * @param string $pDataType - * @param PHPExcel_Worksheet $pSheet + * @param string $pColumn + * @param int $pRow + * @param mixed $pValue + * @param string $pDataType + * @param PHPExcel_Worksheet $pSheet * @throws Exception */ public function __construct($pColumn = 'A', $pRow = 1, $pValue = null, $pDataType = null, PHPExcel_Worksheet $pSheet = null) @@ -189,7 +197,7 @@ class PHPExcel_Cell * * This clears the cell formula. * - * @param mixed $pValue Value + * @param mixed $pValue Value * @return PHPExcel_Cell */ public function setValue($pValue = null) @@ -203,7 +211,7 @@ class PHPExcel_Cell /** * Set cell value (with explicit data type given) * - * @param mixed $pValue Value + * @param mixed $pValue Value * @param string $pDataType Explicit data type * @return PHPExcel_Cell * @throws Exception @@ -242,8 +250,7 @@ class PHPExcel_Cell // set the datatype $this->_dataType = $pDataType; - $this->notifyCacheController(); - return $this; + return $this->notifyCacheController(); } /** @@ -254,7 +261,7 @@ class PHPExcel_Cell public function getCalculatedValue($resetLog=true) { // echo 'Cell '.$this->getCoordinate().' value is a '.$this->_dataType.' with a value of '.$this->getValue().'<br />'; - if (!is_null($this->_calculatedValue) && $this->_dataType == PHPExcel_Cell_DataType::TYPE_FORMULA) { + if ($this->_dataType == PHPExcel_Cell_DataType::TYPE_FORMULA) { try { // echo 'Cell value for '.$this->getCoordinate().' is a formula: Calculating value<br />'; $result = PHPExcel_Calculation::getInstance()->calculateCellValue($this,$resetLog); @@ -262,28 +269,23 @@ class PHPExcel_Cell } catch ( Exception $ex ) { // echo 'Calculation Exception: '.$ex->getMessage().'<br />'; $result = '#N/A'; - throw(new Exception($ex->getMessage())); + throw(new Exception($this->getParent()->getTitle().'!'.$this->getCoordinate().' -> '.$ex->getMessage())); } - if ((is_string($result)) && ($result == '#Not Yet Implemented')) { + if ($result === '#Not Yet Implemented') { // echo 'Returning fallback value of '.$this->_calculatedValue.' for cell '.$this->getCoordinate().'<br />'; return $this->_calculatedValue; // Fallback if calculation engine does not support the formula. - } else { -// echo 'Returning calculated value of '.$result.' for cell '.$this->getCoordinate().'<br />'; - return $result; } +// echo 'Returning calculated value of '.$result.' for cell '.$this->getCoordinate().'<br />'; + return $result; } if (is_null($this->_value)) { // echo 'Cell '.$this->getCoordinate().' has no value, formula or otherwise<br />'; return null; - } else if ($this->_dataType != PHPExcel_Cell_DataType::TYPE_FORMULA) { -// echo 'Cell value for '.$this->getCoordinate().' is not a formula: Returning data value of '.$this->_value.'<br />'; - return $this->_value; - } else { -// echo 'Cell value is a formula: Calculating value<br />'; - return PHPExcel_Calculation::getInstance()->calculateCellValue($this,$resetLog); } +// echo 'Cell value for '.$this->getCoordinate().' is not a formula: Returning data value of '.$this->_value.'<br />'; + return $this->_value; } /** @@ -298,8 +300,7 @@ class PHPExcel_Cell $this->_calculatedValue = $pValue; } - $this->notifyCacheController(); - return $this; + return $this->notifyCacheController(); } /** @@ -332,8 +333,7 @@ class PHPExcel_Cell { $this->_dataType = $pDataType; - $this->notifyCacheController(); - return $this; + return $this->notifyCacheController(); } /** @@ -361,15 +361,14 @@ class PHPExcel_Cell throw new Exception('Cannot get data validation for cell that is not bound to a worksheet'); } - $dataValidation = $this->_parent->getDataValidation($this->getCoordinate()); - return $dataValidation; + return $this->_parent->getDataValidation($this->getCoordinate()); } /** * Set Data validation * - * @param PHPExcel_Cell_DataValidation $pDataValidation - * @throws Exception + * @param PHPExcel_Cell_DataValidation $pDataValidation + * @throws Exception * @return PHPExcel_Cell */ public function setDataValidation(PHPExcel_Cell_DataValidation $pDataValidation = null) @@ -380,45 +379,43 @@ class PHPExcel_Cell $this->_parent->setDataValidation($this->getCoordinate(), $pDataValidation); - $this->notifyCacheController(); - return $this; + return $this->notifyCacheController(); } - /** - * Has Hyperlink - * - * @return boolean - */ - public function hasHyperlink() - { + /** + * Has Hyperlink + * + * @return boolean + */ + public function hasHyperlink() + { if (!isset($this->_parent)) { throw new Exception('Cannot check for hyperlink when cell is not bound to a worksheet'); } return $this->_parent->hyperlinkExists($this->getCoordinate()); - } - - /** - * Get Hyperlink - * - * @throws Exception - * @return PHPExcel_Cell_Hyperlink - */ - public function getHyperlink() - { + } + + /** + * Get Hyperlink + * + * @throws Exception + * @return PHPExcel_Cell_Hyperlink + */ + public function getHyperlink() + { if (!isset($this->_parent)) { throw new Exception('Cannot get hyperlink for cell that is not bound to a worksheet'); } - $hyperlink = $this->_parent->getHyperlink($this->getCoordinate()); - return $hyperlink; - } + return $this->_parent->getHyperlink($this->getCoordinate()); + } /** * Set Hyperlink * - * @param PHPExcel_Cell_Hyperlink $pHyperlink - * @throws Exception + * @param PHPExcel_Cell_Hyperlink $pHyperlink + * @throws Exception * @return PHPExcel_Cell */ public function setHyperlink(PHPExcel_Cell_Hyperlink $pHyperlink = null) @@ -429,9 +426,8 @@ class PHPExcel_Cell $this->_parent->setHyperlink($this->getCoordinate(), $pHyperlink); - $this->notifyCacheController(); - return $this; - } + return $this->notifyCacheController(); + } /** * Get parent @@ -451,94 +447,63 @@ class PHPExcel_Cell public function rebindParent(PHPExcel_Worksheet $parent) { $this->_parent = $parent; - $this->notifyCacheController(); - return $this; + return $this->notifyCacheController(); } /** * Is cell in a specific range? * - * @param string $pRange Cell range (e.g. A1:A1) - * @return boolean + * @param string $pRange Cell range (e.g. A1:A1) + * @return boolean */ public function isInRange($pRange = 'A1:A1') { - // Uppercase coordinate - $pRange = strtoupper($pRange); - - // Extract range - $rangeA = ''; - $rangeB = ''; - if (strpos($pRange, ':') === false) { - $rangeA = $pRange; - $rangeB = $pRange; - } else { - list($rangeA, $rangeB) = explode(':', $pRange); - } - - // Calculate range outer borders - $rangeStart = PHPExcel_Cell::coordinateFromString($rangeA); - $rangeEnd = PHPExcel_Cell::coordinateFromString($rangeB); + list($rangeStart,$rangeEnd) = PHPExcel_Cell::rangeBoundaries($pRange); - // Translate column into index - $rangeStart[0] = PHPExcel_Cell::columnIndexFromString($rangeStart[0]) - 1; - $rangeEnd[0] = PHPExcel_Cell::columnIndexFromString($rangeEnd[0]) - 1; - - // Translate properties - $myColumn = PHPExcel_Cell::columnIndexFromString($this->getColumn()) - 1; - $myRow = $this->getRow(); + // Translate properties + $myColumn = PHPExcel_Cell::columnIndexFromString($this->getColumn()) - 1; + $myRow = $this->getRow(); // Verify if cell is in range - return ( - ($rangeStart[0] <= $myColumn && $rangeEnd[0] >= $myColumn) && - ($rangeStart[1] <= $myRow && $rangeEnd[1] >= $myRow) - ); + return (($rangeStart[0] <= $myColumn) && ($rangeEnd[0] >= $myColumn) && + ($rangeStart[1] <= $myRow) && ($rangeEnd[1] >= $myRow) + ); } /** * Coordinate from string * - * @param string $pCoordinateString - * @return array Array containing column and row (indexes 0 and 1) + * @param string $pCoordinateString + * @return array Array containing column and row (indexes 0 and 1) * @throws Exception */ public static function coordinateFromString($pCoordinateString = 'A1') { if (strpos($pCoordinateString,':') !== false) { throw new Exception('Cell coordinate string can not be a range of cells.'); - } else if ($pCoordinateString == '') { throw new Exception('Cell coordinate can not be zero-length string.'); - } else if (preg_match("/([$]?[A-Z]+)([$]?\d+)/", $pCoordinateString, $matches)) { list(, $column, $row) = $matches; return array($column, $row); - } else { throw new Exception('Invalid cell coordinate.'); - } } /** * Make string coordinate absolute * - * @param string $pCoordinateString - * @return string Absolute coordinate + * @param string $pCoordinateString + * @return string Absolute coordinate * @throws Exception */ public static function absoluteCoordinate($pCoordinateString = 'A1') { if (strpos($pCoordinateString,':') === false && strpos($pCoordinateString,',') === false) { - // Return value - $returnValue = ''; - // Create absolute coordinate list($column, $row) = PHPExcel_Cell::coordinateFromString($pCoordinateString); - $returnValue = '$' . $column . '$' . $row; - - // Return - return $returnValue; + return '$' . $column . '$' . $row; } else { throw new Exception("Coordinate string should not be a cell range."); } @@ -547,8 +512,8 @@ class PHPExcel_Cell /** * Split range into coordinate strings * - * @param string $pRange - * @return array Array containg one or more arrays containing one or two coordinate strings + * @param string $pRange + * @return array Array containg one or more arrays containing one or two coordinate strings */ public static function splitRange($pRange = 'A1:A1') { @@ -562,7 +527,7 @@ class PHPExcel_Cell /** * Build range from coordinate strings * - * @param array $pRange Array containg one or more arrays containing one or two coordinate strings + * @param array $pRange Array containg one or more arrays containing one or two coordinate strings * @return string String representation of $pRange * @throws Exception */ @@ -584,67 +549,76 @@ class PHPExcel_Cell } /** - * Calculate range dimension + * Calculate range boundaries * - * @param string $pRange Cell range (e.g. A1:A1) - * @return array Range dimension (width, height) + * @param string $pRange Cell range (e.g. A1:A1) + * @return array Range coordinates (Start Cell, End Cell) where Start Cell and End Cell are arrays (Column Number, Row Number) */ - public static function rangeDimension($pRange = 'A1:A1') + public static function rangeBoundaries($pRange = 'A1:A1') { // Uppercase coordinate $pRange = strtoupper($pRange); - // Extract range - $rangeA = ''; - $rangeB = ''; - if (strpos($pRange, ':') === false) { - $rangeA = $pRange; - $rangeB = $pRange; - } else { - list($rangeA, $rangeB) = explode(':', $pRange); - } + // Extract range + if (strpos($pRange, ':') === false) { + $rangeA = $rangeB = $pRange; + } else { + list($rangeA, $rangeB) = explode(':', $pRange); + } - // Calculate range outer borders - $rangeStart = PHPExcel_Cell::coordinateFromString($rangeA); - $rangeEnd = PHPExcel_Cell::coordinateFromString($rangeB); + // Calculate range outer borders + $rangeStart = PHPExcel_Cell::coordinateFromString($rangeA); + $rangeEnd = PHPExcel_Cell::coordinateFromString($rangeB); - // Translate column into index - $rangeStart[0] = PHPExcel_Cell::columnIndexFromString($rangeStart[0]); - $rangeEnd[0] = PHPExcel_Cell::columnIndexFromString($rangeEnd[0]); + // Translate column into index + $rangeStart[0] = PHPExcel_Cell::columnIndexFromString($rangeStart[0]); + $rangeEnd[0] = PHPExcel_Cell::columnIndexFromString($rangeEnd[0]); - return array( ($rangeEnd[0] - $rangeStart[0] + 1), ($rangeEnd[1] - $rangeStart[1] + 1) ); + return array($rangeStart, $rangeEnd); + } + + /** + * Calculate range dimension + * + * @param string $pRange Cell range (e.g. A1:A1) + * @return array Range dimension (width, height) + */ + public static function rangeDimension($pRange = 'A1:A1') + { + // Calculate range outer borders + list($rangeStart,$rangeEnd) = PHPExcel_Cell::rangeBoundaries($pRange); + + return array( ($rangeEnd[0] - $rangeStart[0] + 1), ($rangeEnd[1] - $rangeStart[1] + 1) ); } /** * Calculate range boundaries * - * @param string $pRange Cell range (e.g. A1:A1) - * @return array Range boundaries (staring Column, starting Row, Final Column, Final Row) + * @param string $pRange Cell range (e.g. A1:A1) + * @return array Range boundaries (staring Column, starting Row, Final Column, Final Row) */ public static function getRangeBoundaries($pRange = 'A1:A1') { // Uppercase coordinate $pRange = strtoupper($pRange); - // Extract range - $rangeA = ''; - $rangeB = ''; - if (strpos($pRange, ':') === false) { - $rangeA = $pRange; - $rangeB = $pRange; - } else { - list($rangeA, $rangeB) = explode(':', $pRange); - } + // Extract range + if (strpos($pRange, ':') === false) { + $rangeA = $pRange; + $rangeB = $pRange; + } else { + list($rangeA, $rangeB) = explode(':', $pRange); + } - return array( self::coordinateFromString($rangeA), self::coordinateFromString($rangeB)); + return array( self::coordinateFromString($rangeA), self::coordinateFromString($rangeB)); } /** * Column index from string * - * @param string $pString - * @return int Column index (base 1 !!!) - * @throws Exception + * @param string $pString + * @return int Column index (base 1 !!!) + * @throws Exception */ public static function columnIndexFromString($pString = 'A') { @@ -684,14 +658,14 @@ class PHPExcel_Cell if ($pColumnIndex < 26) { return chr(65 + $pColumnIndex); } - return PHPExcel_Cell::stringFromColumnIndex((int)($pColumnIndex / 26) -1).chr(65 + $pColumnIndex%26) ; + return PHPExcel_Cell::stringFromColumnIndex((int)($pColumnIndex / 26) -1).chr(65 + $pColumnIndex%26) ; } /** * Extract all cell references in range * - * @param string $pRange Range (e.g. A1 or A1:A10 or A1:A10 A100:A1000) - * @return array Array containing single cell references + * @param string $pRange Range (e.g. A1 or A1:A10 or A1:A10 A100:A1000) + * @return array Array containing single cell references */ public static function extractAllCellReferencesInRange($pRange = 'A1') { // Returnvalue @@ -731,17 +705,17 @@ class PHPExcel_Cell $rangeStart = $rangeEnd = ''; $startingCol = $startingRow = $endingCol = $endingRow = 0; - list($rangeStart, $rangeEnd) = $range[$i]; + list($rangeStart, $rangeEnd) = $range[$i]; list($startingCol, $startingRow) = PHPExcel_Cell::coordinateFromString($rangeStart); - list($endingCol, $endingRow) = PHPExcel_Cell::coordinateFromString($rangeEnd); + list($endingCol, $endingRow) = PHPExcel_Cell::coordinateFromString($rangeEnd); // Conversions... - $startingCol = PHPExcel_Cell::columnIndexFromString($startingCol); - $endingCol = PHPExcel_Cell::columnIndexFromString($endingCol); + $startingCol = PHPExcel_Cell::columnIndexFromString($startingCol); + $endingCol = PHPExcel_Cell::columnIndexFromString($endingCol); // Current data - $currentCol = --$startingCol; - $currentRow = $startingRow; + $currentCol = --$startingCol; + $currentRow = $startingRow; // Loop cells while ($currentCol < $endingCol) { @@ -763,9 +737,9 @@ class PHPExcel_Cell /** * Compare 2 cells * - * @param PHPExcel_Cell $a Cell a - * @param PHPExcel_Cell $a Cell b - * @return int Result of comparison (always -1 or 1, never zero!) + * @param PHPExcel_Cell $a Cell a + * @param PHPExcel_Cell $a Cell b + * @return int Result of comparison (always -1 or 1, never zero!) */ public static function compareCells(PHPExcel_Cell $a, PHPExcel_Cell $b) { @@ -813,7 +787,7 @@ class PHPExcel_Cell public function __clone() { $vars = get_object_vars($this); foreach ($vars as $key => $value) { - if (is_object($value)) { + if ((is_object($value)) && ($key != '_parent')) { $this->$key = clone $value; } else { $this->$key = $value; @@ -841,8 +815,20 @@ class PHPExcel_Cell { $this->_xfIndex = $pValue; - $this->notifyCacheController(); + return $this->notifyCacheController(); + } + + + public function setFormulaAttributes($pAttributes) + { + $this->_formulaAttributes = $pAttributes; return $this; } + public function getFormulaAttributes() + { + return $this->_formulaAttributes; + } + } + diff --git a/libraries/PHPExcel/PHPExcel/Cell/AdvancedValueBinder.php b/libraries/PHPExcel/PHPExcel/Cell/AdvancedValueBinder.php index 7e305c5..5126811 100644 --- a/libraries/PHPExcel/PHPExcel/Cell/AdvancedValueBinder.php +++ b/libraries/PHPExcel/PHPExcel/Cell/AdvancedValueBinder.php @@ -22,7 +22,7 @@ * @package PHPExcel_Cell * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Cell/DataType.php b/libraries/PHPExcel/PHPExcel/Cell/DataType.php index 1496d83..d542cab 100644 --- a/libraries/PHPExcel/PHPExcel/Cell/DataType.php +++ b/libraries/PHPExcel/PHPExcel/Cell/DataType.php @@ -22,7 +22,7 @@ * @package PHPExcel_Cell * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Cell/DataValidation.php b/libraries/PHPExcel/PHPExcel/Cell/DataValidation.php index 2c3913c..db1b497 100644 --- a/libraries/PHPExcel/PHPExcel/Cell/DataValidation.php +++ b/libraries/PHPExcel/PHPExcel/Cell/DataValidation.php @@ -22,7 +22,7 @@ * @package PHPExcel_Cell * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Cell/DefaultValueBinder.php b/libraries/PHPExcel/PHPExcel/Cell/DefaultValueBinder.php index e49449f..ad5ae46 100644 --- a/libraries/PHPExcel/PHPExcel/Cell/DefaultValueBinder.php +++ b/libraries/PHPExcel/PHPExcel/Cell/DefaultValueBinder.php @@ -22,7 +22,7 @@ * @package PHPExcel_Cell * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Cell/Hyperlink.php b/libraries/PHPExcel/PHPExcel/Cell/Hyperlink.php index eab9297..994cef5 100644 --- a/libraries/PHPExcel/PHPExcel/Cell/Hyperlink.php +++ b/libraries/PHPExcel/PHPExcel/Cell/Hyperlink.php @@ -22,7 +22,7 @@ * @package PHPExcel_Cell * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Cell/IValueBinder.php b/libraries/PHPExcel/PHPExcel/Cell/IValueBinder.php index 4bd1ef2..c14d630 100644 --- a/libraries/PHPExcel/PHPExcel/Cell/IValueBinder.php +++ b/libraries/PHPExcel/PHPExcel/Cell/IValueBinder.php @@ -22,7 +22,7 @@ * @package PHPExcel_Cell * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Comment.php b/libraries/PHPExcel/PHPExcel/Comment.php index 735e78c..432cfe1 100644 --- a/libraries/PHPExcel/PHPExcel/Comment.php +++ b/libraries/PHPExcel/PHPExcel/Comment.php @@ -22,7 +22,7 @@ * @package PHPExcel * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/DocumentProperties.php b/libraries/PHPExcel/PHPExcel/DocumentProperties.php index 64b0c2a..d6d928e 100644 --- a/libraries/PHPExcel/PHPExcel/DocumentProperties.php +++ b/libraries/PHPExcel/PHPExcel/DocumentProperties.php @@ -8,12 +8,12 @@ * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA @@ -22,7 +22,7 @@ * @package PHPExcel * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ @@ -41,70 +41,70 @@ class PHPExcel_DocumentProperties * @var string */ private $_creator; - + /** * LastModifiedBy * * @var string */ private $_lastModifiedBy; - + /** * Created * * @var datetime */ private $_created; - + /** * Modified * * @var datetime */ private $_modified; - + /** * Title * * @var string */ private $_title; - + /** * Description * * @var string */ private $_description; - + /** * Subject * * @var string */ private $_subject; - + /** * Keywords * * @var string */ private $_keywords; - + /** * Category * * @var string */ private $_category; - + /** * Company - * + * * @var string */ private $_company; - + /** * Create a new PHPExcel_DocumentProperties */ @@ -120,9 +120,10 @@ class PHPExcel_DocumentProperties $this->_description = ''; $this->_keywords = ''; $this->_category = ''; + $this->_manager = ''; $this->_company = 'Microsoft Corporation'; } - + /** * Get Creator * @@ -131,7 +132,7 @@ class PHPExcel_DocumentProperties public function getCreator() { return $this->_creator; } - + /** * Set Creator * @@ -142,7 +143,7 @@ class PHPExcel_DocumentProperties $this->_creator = $pValue; return $this; } - + /** * Get Last Modified By * @@ -151,7 +152,7 @@ class PHPExcel_DocumentProperties public function getLastModifiedBy() { return $this->_lastModifiedBy; } - + /** * Set Last Modified By * @@ -162,7 +163,7 @@ class PHPExcel_DocumentProperties $this->_lastModifiedBy = $pValue; return $this; } - + /** * Get Created * @@ -171,7 +172,7 @@ class PHPExcel_DocumentProperties public function getCreated() { return $this->_created; } - + /** * Set Created * @@ -185,7 +186,7 @@ class PHPExcel_DocumentProperties $this->_created = $pValue; return $this; } - + /** * Get Modified * @@ -194,7 +195,7 @@ class PHPExcel_DocumentProperties public function getModified() { return $this->_modified; } - + /** * Set Modified * @@ -208,7 +209,7 @@ class PHPExcel_DocumentProperties $this->_modified = $pValue; return $this; } - + /** * Get Title * @@ -217,7 +218,7 @@ class PHPExcel_DocumentProperties public function getTitle() { return $this->_title; } - + /** * Set Title * @@ -228,7 +229,7 @@ class PHPExcel_DocumentProperties $this->_title = $pValue; return $this; } - + /** * Get Description * @@ -237,7 +238,7 @@ class PHPExcel_DocumentProperties public function getDescription() { return $this->_description; } - + /** * Set Description * @@ -248,7 +249,7 @@ class PHPExcel_DocumentProperties $this->_description = $pValue; return $this; } - + /** * Get Subject * @@ -257,7 +258,7 @@ class PHPExcel_DocumentProperties public function getSubject() { return $this->_subject; } - + /** * Set Subject * @@ -268,7 +269,7 @@ class PHPExcel_DocumentProperties $this->_subject = $pValue; return $this; } - + /** * Get Keywords * @@ -277,7 +278,7 @@ class PHPExcel_DocumentProperties public function getKeywords() { return $this->_keywords; } - + /** * Set Keywords * @@ -288,7 +289,7 @@ class PHPExcel_DocumentProperties $this->_keywords = $pValue; return $this; } - + /** * Get Category * @@ -297,7 +298,7 @@ class PHPExcel_DocumentProperties public function getCategory() { return $this->_category; } - + /** * Set Category * @@ -308,7 +309,7 @@ class PHPExcel_DocumentProperties $this->_category = $pValue; return $this; } - + /** * Get Company * @@ -317,18 +318,38 @@ class PHPExcel_DocumentProperties public function getCompany() { return $this->_company; } - + /** * Set Company * * @param string $pValue - * @return PHPPowerPoint_DocumentProperties + * @return PHPExcel_DocumentProperties */ public function setCompany($pValue = '') { $this->_company = $pValue; return $this; } - + + /** + * Get Manager + * + * @return string + */ + public function getManager() { + return $this->_manager; + } + + /** + * Set Manager + * + * @param string $pValue + * @return PHPExcel_DocumentProperties + */ + public function setManager($pValue = '') { + $this->_manager = $pValue; + return $this; + } + /** * Implement PHP __clone to create a deep clone, not just a shallow copy. */ diff --git a/libraries/PHPExcel/PHPExcel/DocumentSecurity.php b/libraries/PHPExcel/PHPExcel/DocumentSecurity.php index 1522189..a6de9ee 100644 --- a/libraries/PHPExcel/PHPExcel/DocumentSecurity.php +++ b/libraries/PHPExcel/PHPExcel/DocumentSecurity.php @@ -22,7 +22,7 @@ * @package PHPExcel * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/HashTable.php b/libraries/PHPExcel/PHPExcel/HashTable.php index bd526b6..2191672 100644 --- a/libraries/PHPExcel/PHPExcel/HashTable.php +++ b/libraries/PHPExcel/PHPExcel/HashTable.php @@ -22,7 +22,7 @@ * @package PHPExcel * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/IComparable.php b/libraries/PHPExcel/PHPExcel/IComparable.php index 3c175d1..0a51b06 100644 --- a/libraries/PHPExcel/PHPExcel/IComparable.php +++ b/libraries/PHPExcel/PHPExcel/IComparable.php @@ -20,7 +20,7 @@ * @package PHPExcel * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/IOFactory.php b/libraries/PHPExcel/PHPExcel/IOFactory.php index 21fd23c..a3650be 100644 --- a/libraries/PHPExcel/PHPExcel/IOFactory.php +++ b/libraries/PHPExcel/PHPExcel/IOFactory.php @@ -22,7 +22,7 @@ * @package PHPExcel * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/NamedRange.php b/libraries/PHPExcel/PHPExcel/NamedRange.php index 1aa5236..992c2fa 100644 --- a/libraries/PHPExcel/PHPExcel/NamedRange.php +++ b/libraries/PHPExcel/PHPExcel/NamedRange.php @@ -22,7 +22,7 @@ * @package PHPExcel * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Reader/CSV.php b/libraries/PHPExcel/PHPExcel/Reader/CSV.php index 5fa83bd..086c948 100644 --- a/libraries/PHPExcel/PHPExcel/Reader/CSV.php +++ b/libraries/PHPExcel/PHPExcel/Reader/CSV.php @@ -22,7 +22,7 @@ * @package PHPExcel_Reader * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Reader/DefaultReadFilter.php b/libraries/PHPExcel/PHPExcel/Reader/DefaultReadFilter.php index c6620e7..e83ac9a 100644 --- a/libraries/PHPExcel/PHPExcel/Reader/DefaultReadFilter.php +++ b/libraries/PHPExcel/PHPExcel/Reader/DefaultReadFilter.php @@ -22,7 +22,7 @@ * @package PHPExcel_Reader * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Reader/Excel2003XML.php b/libraries/PHPExcel/PHPExcel/Reader/Excel2003XML.php index 96e3436..99f00ed 100644 --- a/libraries/PHPExcel/PHPExcel/Reader/Excel2003XML.php +++ b/libraries/PHPExcel/PHPExcel/Reader/Excel2003XML.php @@ -22,7 +22,7 @@ * @package PHPExcel_Reader * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ @@ -557,6 +557,11 @@ class PHPExcel_Reader_Excel2003XML implements PHPExcel_Reader_IReader $cellDataFormula = ''; if (isset($cell_ss['Formula'])) { $cellDataFormula = $cell_ss['Formula']; + // added this as a check for array formulas + if (isset($cell_ss['ArrayRange'])) { + $cellDataCSEFormula = $cell_ss['ArrayRange']; +// echo "found an array formula at ".$columnID.$rowID."<br />"; + } $hasCalculatedValue = true; } if (isset($cell->Data)) { diff --git a/libraries/PHPExcel/PHPExcel/Reader/Excel2007.php b/libraries/PHPExcel/PHPExcel/Reader/Excel2007.php index 031dee5..c4e3e41 100644 --- a/libraries/PHPExcel/PHPExcel/Reader/Excel2007.php +++ b/libraries/PHPExcel/PHPExcel/Reader/Excel2007.php @@ -22,7 +22,7 @@ * @package PHPExcel_Reader * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ @@ -71,6 +71,9 @@ class PHPExcel_Reader_Excel2007 implements PHPExcel_Reader_IReader */ private $_readFilter = null; + + private $_referenceHelper = null; + /** * Read data only? * @@ -150,6 +153,7 @@ class PHPExcel_Reader_Excel2007 implements PHPExcel_Reader_IReader */ public function __construct() { $this->_readFilter = new PHPExcel_Reader_DefaultReadFilter(); + $this->_referenceHelper = PHPExcel_ReferenceHelper::getInstance(); } /** @@ -245,12 +249,11 @@ class PHPExcel_Reader_Excel2007 implements PHPExcel_Reader_IReader $difference[0] = PHPExcel_Cell::columnIndexFromString($current[0]) - PHPExcel_Cell::columnIndexFromString($master[0]); $difference[1] = $current[1] - $master[1]; - $helper = PHPExcel_ReferenceHelper::getInstance(); - $value = $helper->updateFormulaReferences( $sharedFormulas[$instance]['formula'], - 'A1', - $difference[0], - $difference[1] - ); + $value = $this->_referenceHelper->updateFormulaReferences( $sharedFormulas[$instance]['formula'], + 'A1', + $difference[0], + $difference[1] + ); // echo 'Adjusted Formula is '.$value.'<br />'; } } @@ -311,7 +314,7 @@ class PHPExcel_Reader_Excel2007 implements PHPExcel_Reader_IReader switch ($rel["Type"]) { case "http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-…": $xmlCore = simplexml_load_string($this->_getFromZipArchive($zip, "{$rel['Target']}")); - if ($xmlCore) { + if (is_object($xmlCore)) { $xmlCore->registerXPathNamespace("dc", "http://purl.org/dc/elements/1.1/"); $xmlCore->registerXPathNamespace("dcterms", "http://purl.org/dc/terms/"); $xmlCore->registerXPathNamespace("cp", "http://schemas.openxmlformats.org/package/2006/metadata/core-properties"); @@ -328,6 +331,25 @@ class PHPExcel_Reader_Excel2007 implements PHPExcel_Reader_IReader } break; + case "http://schemas.openxmlformats.org/officeDocument/2006/relationships/extende…": + $xmlCore = simplexml_load_string($this->_getFromZipArchive($zip, "{$rel['Target']}")); + if (is_object($xmlCore)) { + $docProps = $excel->getProperties(); + if (isset($xmlCore->Company)) + $docProps->setCompany((string) $xmlCore->Company); + if (isset($xmlCore->Manager)) + $docProps->setManager((string) $xmlCore->Manager); + } + break; + + case "http://schemas.openxmlformats.org/officeDocument/2006/relationships/custom-…": + $xmlCore = simplexml_load_string($this->_getFromZipArchive($zip, "{$rel['Target']}")); + if (is_object($xmlCore)) { + $xmlCore->registerXPathNamespace("vt", "http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes"); + $docProps = $excel->getProperties(); + } + break; + case "http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeD…": $dir = dirname($rel["Target"]); $relsWorkbook = simplexml_load_string($this->_getFromZipArchive($zip, "$dir/_rels/" . basename($rel["Target"]) . ".rels")); //~ http://schemas.openxmlformats.org/package/2006/relationships"); @@ -692,6 +714,11 @@ class PHPExcel_Reader_Excel2007 implements PHPExcel_Reader_IReader } else { // Formula $this->_castToFormula($c,$r,$cellDataType,$value,$calculatedValue,$sharedFormulas,'_castToBool'); + if (isset($c->f['t'])) { + $att = array(); + $att = $c->f; + $docSheet->getCell($r)->setFormulaAttributes($att); + } // echo '$calculatedValue = '.$calculatedValue.'<br />'; } break; @@ -1276,10 +1303,14 @@ class PHPExcel_Reader_Excel2007 implements PHPExcel_Reader_IReader break; case '_xlnm.Print_Area': - $range = explode('!', $extractedRange); - $extractedRange = isset($range[1]) ? $range[1] : $range[0]; - - $docSheet->getPageSetup()->setPrintArea($extractedRange); + $rangeSets = explode(',', $extractedRange); // FIXME: what if sheetname contains comma? + $newRangeSets = array(); + foreach($rangeSets as $rangeSet) { + $range = explode('!', $rangeSet); // FIXME: what if sheetname contains exclamation mark? + $rangeSet = isset($range[1]) ? $range[1] : $range[0]; + $newRangeSets[] = str_replace('$', '', $rangeSet); + } + $docSheet->getPageSetup()->setPrintArea(implode(',',$newRangeSets)); break; default: diff --git a/libraries/PHPExcel/PHPExcel/Reader/Excel5.php b/libraries/PHPExcel/PHPExcel/Reader/Excel5.php index a4f20e7..5c71ee8 100644 --- a/libraries/PHPExcel/PHPExcel/Reader/Excel5.php +++ b/libraries/PHPExcel/PHPExcel/Reader/Excel5.php @@ -22,7 +22,7 @@ * @package PHPExcel_Reader_Excel5 * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ // Original file header of ParseXL (used as the base for this class): @@ -834,7 +834,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader // Foo!$C$7:$J$66 // Bar!$A$1:$IV$2 - $explodes = explode('!', $range); + $explodes = explode('!', $range); // FIXME: what if sheetname contains exclamation mark? $sheetName = $explodes[0]; if (count($explodes) == 2) { @@ -4202,22 +4202,22 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader // 1. BITMAPCOREHEADER // offset: 0; size: 4; bcSize, Specifies the number of bytes required by the structure $bcSize = $this->_GetInt4d($iData, 0); - var_dump($bcSize); +// var_dump($bcSize); // offset: 4; size: 2; bcWidth, specifies the width of the bitmap, in pixels $bcWidth = $this->_GetInt2d($iData, 4); - var_dump($bcWidth); +// var_dump($bcWidth); // offset: 6; size: 2; bcHeight, specifies the height of the bitmap, in pixels. $bcHeight = $this->_GetInt2d($iData, 6); - var_dump($bcHeight); +// var_dump($bcHeight); $ih = imagecreatetruecolor($bcWidth, $bcHeight); // offset: 8; size: 2; bcPlanes, specifies the number of planes for the target device. This value must be 1 // offset: 10; size: 2; bcBitCount specifies the number of bits-per-pixel. This value must be 1, 4, 8, or 24 $bcBitCount = $this->_GetInt2d($iData, 10); - var_dump($bcBitCount); +// var_dump($bcBitCount); $rgbString = substr($iData, 12); $rgbTriples = array(); @@ -4602,24 +4602,24 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader case 0x12: $name = 'tUplus'; $size = 1; $data = '+'; break; case 0x13: $name = 'tUminus'; $size = 1; $data = '-'; break; case 0x14: $name = 'tPercent'; $size = 1; $data = '%'; break; - case 0x15: // parenthesis + case 0x15: // parenthesis $name = 'tParen'; $size = 1; $data = null; break; - case 0x16: // missing argument + case 0x16: // missing argument $name = 'tMissArg'; $size = 1; $data = ''; break; - case 0x17: // string + case 0x17: // string $name = 'tStr'; // offset: 1; size: var; Unicode string, 8-bit string length $string = $this->_readUnicodeStringShort(substr($formulaData, 1)); $size = 1 + $string['size']; $data = $this->_UTF8toExcelDoubleQuoted($string['value']); break; - case 0x19: // Special attribute + case 0x19: // Special attribute // offset: 1; size: 1; attribute type flags: switch (ord($formulaData[1])) { case 0x01: @@ -4689,39 +4689,42 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader break; } break; - case 0x1C: // error code + case 0x1C: // error code // offset: 1; size: 1; error code $name = 'tErr'; $size = 2; $data = $this->_mapErrorCode(ord($formulaData[1])); break; - case 0x1D: // boolean + case 0x1D: // boolean // offset: 1; size: 1; 0 = false, 1 = true; $name = 'tBool'; $size = 2; $data = ord($formulaData[1]) ? 'TRUE' : 'FALSE'; break; - case 0x1E: // integer + case 0x1E: // integer // offset: 1; size: 2; unsigned 16-bit integer $name = 'tInt'; $size = 3; $data = $this->_GetInt2d($formulaData, 1); break; - case 0x1F: // number + case 0x1F: // number // offset: 1; size: 8; $name = 'tNum'; $size = 9; $data = $this->_extractNumber(substr($formulaData, 1)); $data = str_replace(',', '.', (string)$data); // in case non-English locale break; - case 0x40: // array constant - case 0x60: // array constant + case 0x20: // array constant + case 0x40: + case 0x60: // offset: 1; size: 7; not used $name = 'tArray'; $size = 8; $data = null; break; - case 0x41: // function with fixed number of arguments + case 0x21: // function with fixed number of arguments + case 0x41: + case 0x61: $name = 'tFunc'; $size = 3; // offset: 1; size: 2; index to built-in sheet function @@ -4891,9 +4894,9 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader } $data = array('function' => $function, 'args' => $args); break; - case 0x22: // function with variable number of arguments - case 0x42: // function with variable number of arguments - case 0x62: // function with variable number of arguments + case 0x22: // function with variable number of arguments + case 0x42: + case 0x62: $name = 'tFuncV'; $size = 4; // offset: 1; size: 1; number of arguments @@ -4995,8 +4998,9 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader } $data = array('function' => $function, 'args' => $args); break; - case 0x23: // index to defined name + case 0x23: // index to defined name case 0x43: + case 0x63: $name = 'tName'; $size = 5; // offset: 1; size: 2; one-based index to definedname record @@ -5004,22 +5008,23 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader // offset: 2; size: 2; not used $data = $this->_definedname[$definedNameIndex]['name']; break; - case 0x24: // single cell reference e.g. A5 + case 0x24: // single cell reference e.g. A5 case 0x44: case 0x64: $name = 'tRef'; $size = 5; $data = $this->_readBIFF8CellAddress(substr($formulaData, 1, 4)); break; - case 0x25: // cell range reference to cells in the same sheet + case 0x25: // cell range reference to cells in the same sheet (2d) case 0x45: case 0x65: $name = 'tArea'; $size = 9; $data = $this->_readBIFF8CellRangeAddress(substr($formulaData, 1, 8)); break; - case 0x26: + case 0x26: // Constant reference sub-expression case 0x46: + case 0x66: $name = 'tMemArea'; // offset: 1; size: 4; not used // offset: 5; size: 2; size of the following subexpression @@ -5027,7 +5032,9 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader $size = 7 + $subSize; $data = $this->_getFormulaFromData(substr($formulaData, 7, $subSize)); break; + case 0x27: // Deleted constant reference sub-expression case 0x47: + case 0x67: $name = 'tMemErr'; // offset: 1; size: 4; not used // offset: 5; size: 2; size of the following subexpression @@ -5035,16 +5042,17 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader $size = 7 + $subSize; $data = $this->_getFormulaFromData(substr($formulaData, 7, $subSize)); break; - case 0x29: + case 0x29: // Variable reference sub-expression case 0x49: + case 0x69: $name = 'tMemFunc'; - // offset: 1; size: 2; size of the following subexpression + // offset: 1; size: 2; size of the following sub-expression $subSize = $this->_GetInt2d($formulaData, 1); $size = 3 + $subSize; $data = $this->_getFormulaFromData(substr($formulaData, 3, $subSize)); break; - case 0x2C: // Relative reference, used in shared formulas and some other places + case 0x2C: // Relative 2d cell reference reference, used in shared formulas and some other places case 0x4C: case 0x6C: $name = 'tRefN'; @@ -5052,7 +5060,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader $data = $this->_readBIFF8CellAddressB(substr($formulaData, 1, 4), $baseCell); break; - case 0x2D: + case 0x2D: // Relative 2d range reference case 0x4D: case 0x6D: $name = 'tAreaN'; @@ -5060,7 +5068,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader $data = $this->_readBIFF8CellRangeAddressB(substr($formulaData, 1, 8), $baseCell); break; - case 0x39: + case 0x39: // External name case 0x59: case 0x79: $name = 'tNameX'; @@ -5073,8 +5081,9 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader // offset: 5; size: 2; not used break; - case 0x3A: // 3d reference to cell + case 0x3A: // 3d reference to cell case 0x5A: + case 0x7A: $name = 'tRef3d'; $size = 7; @@ -5085,15 +5094,15 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader $cellAddress = $this->_readBIFF8CellAddress(substr($formulaData, 3, 4)); $data = "$sheetRange!$cellAddress"; - } catch (Exception $e) { // deleted sheet reference $data = '#REF!'; } break; - case 0x3B: // 3d reference to cell range + case 0x3B: // 3d reference to cell range case 0x5B: + case 0x7B: $name = 'tArea3d'; $size = 11; @@ -5104,15 +5113,13 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader $cellRangeAddress = $this->_readBIFF8CellRangeAddress(substr($formulaData, 3, 8)); $data = "$sheetRange!$cellRangeAddress"; - } catch (Exception $e) { // deleted sheet reference $data = '#REF!'; - } break; - // case 0x39: // don't know how to deal with + // Unknown cases // don't know how to deal with default: throw new Exception('Unrecognized token ' . sprintf('%02X', $id) . ' in formula'); break; diff --git a/libraries/PHPExcel/PHPExcel/Reader/Excel5/Escher.php b/libraries/PHPExcel/PHPExcel/Reader/Excel5/Escher.php index 0418dd7..b7c67e9 100644 --- a/libraries/PHPExcel/PHPExcel/Reader/Excel5/Escher.php +++ b/libraries/PHPExcel/PHPExcel/Reader/Excel5/Escher.php @@ -22,7 +22,7 @@ * @package PHPExcel_Reader_Excel5 * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ /** diff --git a/libraries/PHPExcel/PHPExcel/Reader/IReadFilter.php b/libraries/PHPExcel/PHPExcel/Reader/IReadFilter.php index c397d56..00fa2e8 100644 --- a/libraries/PHPExcel/PHPExcel/Reader/IReadFilter.php +++ b/libraries/PHPExcel/PHPExcel/Reader/IReadFilter.php @@ -22,7 +22,7 @@ * @package PHPExcel_Reader * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Reader/IReader.php b/libraries/PHPExcel/PHPExcel/Reader/IReader.php index ef5beac..e1cdc43 100644 --- a/libraries/PHPExcel/PHPExcel/Reader/IReader.php +++ b/libraries/PHPExcel/PHPExcel/Reader/IReader.php @@ -22,7 +22,7 @@ * @package PHPExcel_Reader * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Reader/OOCalc.php b/libraries/PHPExcel/PHPExcel/Reader/OOCalc.php index 8a1407a..a1ddf91 100644 --- a/libraries/PHPExcel/PHPExcel/Reader/OOCalc.php +++ b/libraries/PHPExcel/PHPExcel/Reader/OOCalc.php @@ -22,7 +22,7 @@ * @package PHPExcel_Reader * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ @@ -242,6 +242,9 @@ class PHPExcel_Reader_OOCalc implements PHPExcel_Reader_IReader throw new Exception("Could not open " . $pFilename . " for reading! File does not exist."); } + $timezoneObj = new DateTimeZone('Europe/London'); + $GMT = new DateTimeZone('UTC'); + $zip = new ZipArchive; if ($zip->open($pFilename) === true) { // echo '<h1>Meta Information</h1>'; @@ -338,6 +341,11 @@ class PHPExcel_Reader_OOCalc implements PHPExcel_Reader_IReader foreach($worksheetData as $key => $rowData) { // echo '<b>'.$key.'</b><br />'; switch ($key) { + case 'table-header-rows': + foreach ($rowData as $key=>$cellData) { + $rowData = $cellData; + break; + } case 'table-row' : $columnID = 'A'; foreach($rowData as $key => $cellData) { @@ -387,7 +395,8 @@ class PHPExcel_Reader_OOCalc implements PHPExcel_Reader_IReader break; case 'date' : $type = PHPExcel_Cell_DataType::TYPE_NUMERIC; - $dateObj = date_create($cellDataOfficeAttributes['date-value']); + $dateObj = new DateTime($cellDataOfficeAttributes['date-value'], $GMT); + $dateObj->setTimeZone($timezoneObj); list($year,$month,$day,$hour,$minute,$second) = explode(' ',$dateObj->format('Y m d H i s')); $dataValue = PHPExcel_Shared_Date::FormattedPHPToExcel($year,$month,$day,$hour,$minute,$second); if ($dataValue != floor($dataValue)) { @@ -418,7 +427,7 @@ class PHPExcel_Reader_OOCalc implements PHPExcel_Reader_IReader if (($key % 2) == 0) { $value = preg_replace('/\[\.(.*):\.(.*)\]/Ui','$1:$2',$value); $value = preg_replace('/\[\.(.*)\]/Ui','$1',$value); - $value = PHPExcel_Calculation::_translateSeparator(';',',',$value); + $value = PHPExcel_Calculation::_translateSeparator(';',',',$value,$inBraces); } } unset($value); diff --git a/libraries/PHPExcel/PHPExcel/Reader/SYLK.php b/libraries/PHPExcel/PHPExcel/Reader/SYLK.php index ec8a4d4..790aa2f 100644 --- a/libraries/PHPExcel/PHPExcel/Reader/SYLK.php +++ b/libraries/PHPExcel/PHPExcel/Reader/SYLK.php @@ -22,7 +22,7 @@ * @package PHPExcel_Reader * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Reader/Serialized.php b/libraries/PHPExcel/PHPExcel/Reader/Serialized.php index 88f2892..04b14f2 100644 --- a/libraries/PHPExcel/PHPExcel/Reader/Serialized.php +++ b/libraries/PHPExcel/PHPExcel/Reader/Serialized.php @@ -22,7 +22,7 @@ * @package PHPExcel_Reader * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/ReferenceHelper.php b/libraries/PHPExcel/PHPExcel/ReferenceHelper.php index cb9673c..7a37ed0 100644 --- a/libraries/PHPExcel/PHPExcel/ReferenceHelper.php +++ b/libraries/PHPExcel/PHPExcel/ReferenceHelper.php @@ -22,7 +22,7 @@ * @package PHPExcel * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ @@ -35,6 +35,13 @@ */ class PHPExcel_ReferenceHelper { + /** Constants */ + /** Regular Expressions */ + const REFHELPER_REGEXP_CELLREF = '((\w*|\'[^!]*\')!)?(?<![:a-z\$])(\$?[a-z]{1,3}\$?\d+)(?=[^:!\d\'])'; + const REFHELPER_REGEXP_CELLRANGE = '((\w*|\'[^!]*\')!)?(\$?[a-z]{1,3}\$?\d+):(\$?[a-z]{1,3}\$?\d+)'; + const REFHELPER_REGEXP_ROWRANGE = '((\w*|\'[^!]*\')!)?(\$?\d+):(\$?\d+)'; + const REFHELPER_REGEXP_COLRANGE = '((\w*|\'[^!]*\')!)?(\$?[a-z]{1,3}):(\$?[a-z]{1,3})'; + /** * Instance of this class * @@ -119,10 +126,8 @@ class PHPExcel_ReferenceHelper $newCoordinates = PHPExcel_Cell::stringFromColumnIndex( PHPExcel_Cell::columnIndexFromString($cell->getColumn()) - 1 + $pNumCols ) . ($cell->getRow() + $pNumRows); // Should the cell be updated? Move value and cellXf index from one cell to another. - if ( - (PHPExcel_Cell::columnIndexFromString( $cell->getColumn() ) >= PHPExcel_Cell::columnIndexFromString($beforeColumn)) && - ($cell->getRow() >= $beforeRow) - ) { + if ((PHPExcel_Cell::columnIndexFromString( $cell->getColumn() ) >= PHPExcel_Cell::columnIndexFromString($beforeColumn)) && + ($cell->getRow() >= $beforeRow)) { // Update cell styles $pSheet->getCell($newCoordinates)->setXfIndex($cell->getXfIndex()); @@ -132,7 +137,7 @@ class PHPExcel_ReferenceHelper if ($cell->getDataType() == PHPExcel_Cell_DataType::TYPE_FORMULA) { // Formula should be adjusted $pSheet->getCell($newCoordinates) - ->setValue($this->updateFormulaReferences($cell->getValue(), $pBefore, $pNumCols, $pNumRows)); + ->setValue($this->updateFormulaReferences($cell->getValue(), $pBefore, $pNumCols, $pNumRows, $pSheet->getTitle())); } else { // Formula should not be adjusted $pSheet->getCell($newCoordinates)->setValue($cell->getValue()); @@ -340,43 +345,121 @@ class PHPExcel_ReferenceHelper * @return string Updated formula * @throws Exception */ - public function updateFormulaReferences($pFormula = '', $pBefore = 'A1', $pNumCols = 0, $pNumRows = 0) { - // Parse formula into a tree of tokens - $tokenisedFormula = PHPExcel_Calculation::getInstance()->parseFormula($pFormula); - - $newCellTokens = $cellTokens = array(); - $adjustCount = 0; - // Build the translation table of cell tokens - foreach($tokenisedFormula as $token) { - $token = $token['value']; - if (preg_match('/^'.PHPExcel_Calculation::CALCULATION_REGEXP_CELLREF.'$/i', $token, $matches)) { - list($column,$row) = PHPExcel_Cell::coordinateFromString($token); - // Max worksheet size is 1,048,576 rows by 16,384 columns in Excel 2007, so our adjustments need to be at least one digit more - $column = PHPExcel_Cell::columnIndexFromString($column) + 100000; - $row += 10000000; - $cellIndex = $column.$row; - if (!isset($cellTokens[$cellIndex])) { - $newReference = $this->updateCellReference($token, $pBefore, $pNumCols, $pNumRows); - if ($newReference !== $token) { - $newCellTokens[$cellIndex] = preg_quote($newReference); - $cellTokens[$cellIndex] = '/(?<![A-Z])'.preg_quote($token).'(?!\d)/i'; - ++$adjustCount; - } - } - } - } - if ($adjustCount == 0) { - return $pFormula; - } - krsort($cellTokens); - krsort($newCellTokens); - + public function updateFormulaReferences($pFormula = '', $pBefore = 'A1', $pNumCols = 0, $pNumRows = 0, $sheetName = '') { // Update cell references in the formula $formulaBlocks = explode('"',$pFormula); foreach($formulaBlocks as $i => &$formulaBlock) { - // Only count/replace in alternate array entries + // Ignore blocks that were enclosed in quotes (even entries in the $formulaBlocks array after the explode) if (($i % 2) == 0) { - $formulaBlock = preg_replace($cellTokens,$newCellTokens,$formulaBlock); + $adjustCount = 0; + $newCellTokens = $cellTokens = array(); + // Search for row ranges (e.g. 'Sheet1'!3:5 or 3:5) with or without $ absolutes (e.g. $3:5) + $matchCount = preg_match_all('/'.self::REFHELPER_REGEXP_ROWRANGE.'/i', ' '.$formulaBlock.' ', $matches, PREG_SET_ORDER); + if ($matchCount > 0) { + foreach($matches as $match) { + $fromString = ($match[2] > '') ? $match[2].'!' : ''; + $fromString .= $match[3].':'.$match[4]; + $modified3 = substr($this->updateCellReference('$A'.$match[3],$pBefore,$pNumCols,$pNumRows),2); + $modified4 = substr($this->updateCellReference('$A'.$match[4],$pBefore,$pNumCols,$pNumRows),2); + + if ($match[3].':'.$match[4] !== $modified3.':'.$modified4) { + if (($match[2] == '') || (trim($match[2],"'") == $sheetName)) { + $toString = ($match[2] > '') ? $match[2].'!' : ''; + $toString .= $modified3.':'.$modified4; + // Max worksheet size is 1,048,576 rows by 16,384 columns in Excel 2007, so our adjustments need to be at least one digit more + $column = 100000; + $row = 10000000+trim($match[3],'$'); + $cellIndex = $column.$row; + + $newCellTokens[$cellIndex] = preg_quote($toString); + $cellTokens[$cellIndex] = '/(?<!\d)'.preg_quote($fromString).'(?!\d)/i'; + ++$adjustCount; + } + } + } + } + // Search for column ranges (e.g. 'Sheet1'!C:E or C:E) with or without $ absolutes (e.g. $C:E) + $matchCount = preg_match_all('/'.self::REFHELPER_REGEXP_COLRANGE.'/i', ' '.$formulaBlock.' ', $matches, PREG_SET_ORDER); + if ($matchCount > 0) { + foreach($matches as $match) { + $fromString = ($match[2] > '') ? $match[2].'!' : ''; + $fromString .= $match[3].':'.$match[4]; + $modified3 = substr($this->updateCellReference($match[3].'$1',$pBefore,$pNumCols,$pNumRows),0,-2); + $modified4 = substr($this->updateCellReference($match[4].'$1',$pBefore,$pNumCols,$pNumRows),0,-2); + + if ($match[3].':'.$match[4] !== $modified3.':'.$modified4) { + if (($match[2] == '') || (trim($match[2],"'") == $sheetName)) { + $toString = ($match[2] > '') ? $match[2].'!' : ''; + $toString .= $modified3.':'.$modified4; + // Max worksheet size is 1,048,576 rows by 16,384 columns in Excel 2007, so our adjustments need to be at least one digit more + $column = PHPExcel_Cell::columnIndexFromString(trim($match[3],'$')) + 100000; + $row = 10000000; + $cellIndex = $column.$row; + + $newCellTokens[$cellIndex] = preg_quote($toString); + $cellTokens[$cellIndex] = '/(?<![A-Z])'.preg_quote($fromString).'(?![A-Z])/i'; + ++$adjustCount; + } + } + } + } + // Search for cell ranges (e.g. 'Sheet1'!A3:C5 or A3:C5) with or without $ absolutes (e.g. $A1:C$5) + $matchCount = preg_match_all('/'.self::REFHELPER_REGEXP_CELLRANGE.'/i', ' '.$formulaBlock.' ', $matches, PREG_SET_ORDER); + if ($matchCount > 0) { + foreach($matches as $match) { + $fromString = ($match[2] > '') ? $match[2].'!' : ''; + $fromString .= $match[3].':'.$match[4]; + $modified3 = $this->updateCellReference($match[3],$pBefore,$pNumCols,$pNumRows); + $modified4 = $this->updateCellReference($match[4],$pBefore,$pNumCols,$pNumRows); + + if ($match[3].$match[4] !== $modified3.$modified4) { + if (($match[2] == '') || (trim($match[2],"'") == $sheetName)) { + $toString = ($match[2] > '') ? $match[2].'!' : ''; + $toString .= $modified3.':'.$modified4; + list($column,$row) = PHPExcel_Cell::coordinateFromString($match[3]); + // Max worksheet size is 1,048,576 rows by 16,384 columns in Excel 2007, so our adjustments need to be at least one digit more + $column = PHPExcel_Cell::columnIndexFromString(trim($column,'$')) + 100000; + $row = trim($row,'$') + 10000000; + $cellIndex = $column.$row; + + $newCellTokens[$cellIndex] = preg_quote($toString); + $cellTokens[$cellIndex] = '/(?<![A-Z])'.preg_quote($fromString).'(?!\d)/i'; + ++$adjustCount; + } + } + } + } + // Search for cell references (e.g. 'Sheet1'!A3 or C5) with or without $ absolutes (e.g. $A1 or C$5) + $matchCount = preg_match_all('/'.self::REFHELPER_REGEXP_CELLREF.'/i', ' '.$formulaBlock.' ', $matches, PREG_SET_ORDER); + if ($matchCount > 0) { + foreach($matches as $match) { + $fromString = ($match[2] > '') ? $match[2].'!' : ''; + $fromString .= $match[3]; + $modified3 = $this->updateCellReference($match[3],$pBefore,$pNumCols,$pNumRows); + + if ($match[3] !== $modified3) { + if (($match[2] == '') || (trim($match[2],"'") == $sheetName)) { + $toString = ($match[2] > '') ? $match[2].'!' : ''; + $toString .= $modified3; + list($column,$row) = PHPExcel_Cell::coordinateFromString($match[3]); + // Max worksheet size is 1,048,576 rows by 16,384 columns in Excel 2007, so our adjustments need to be at least one digit more + $column = PHPExcel_Cell::columnIndexFromString(trim($column,'$')) + 100000; + $row = trim($row,'$') + 10000000; + $cellIndex = $column.$row; + + $newCellTokens[$cellIndex] = preg_quote($toString); + $cellTokens[$cellIndex] = '/(?<![A-Z])'.preg_quote($fromString).'(?!\d)/i'; + ++$adjustCount; + } + } + } + } + if ($adjustCount > 0) { + krsort($cellTokens); + krsort($newCellTokens); + // Update cell references in the formula + $formulaBlock = str_replace('\\','',preg_replace($cellTokens,$newCellTokens,$formulaBlock)); + } } } unset($formulaBlock); diff --git a/libraries/PHPExcel/PHPExcel/RichText.php b/libraries/PHPExcel/PHPExcel/RichText.php index c938c62..588e643 100644 --- a/libraries/PHPExcel/PHPExcel/RichText.php +++ b/libraries/PHPExcel/PHPExcel/RichText.php @@ -22,7 +22,7 @@ * @package PHPExcel_RichText * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/RichText/ITextElement.php b/libraries/PHPExcel/PHPExcel/RichText/ITextElement.php index 613028f..3f1aa7a 100644 --- a/libraries/PHPExcel/PHPExcel/RichText/ITextElement.php +++ b/libraries/PHPExcel/PHPExcel/RichText/ITextElement.php @@ -20,7 +20,7 @@ * @package PHPExcel_RichText * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/RichText/Run.php b/libraries/PHPExcel/PHPExcel/RichText/Run.php index 209af21..aac7676 100644 --- a/libraries/PHPExcel/PHPExcel/RichText/Run.php +++ b/libraries/PHPExcel/PHPExcel/RichText/Run.php @@ -20,7 +20,7 @@ * @package PHPExcel_RichText * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/RichText/TextElement.php b/libraries/PHPExcel/PHPExcel/RichText/TextElement.php index 3a24482..f5ce8e0 100644 --- a/libraries/PHPExcel/PHPExcel/RichText/TextElement.php +++ b/libraries/PHPExcel/PHPExcel/RichText/TextElement.php @@ -20,7 +20,7 @@ * @package PHPExcel_RichText * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Settings.php b/libraries/PHPExcel/PHPExcel/Settings.php index 7a1d57e..52d7880 100644 --- a/libraries/PHPExcel/PHPExcel/Settings.php +++ b/libraries/PHPExcel/PHPExcel/Settings.php @@ -22,7 +22,7 @@ * @package PHPExcel_Settings * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ /** PHPExcel root directory */ diff --git a/libraries/PHPExcel/PHPExcel/Shared/CodePage.php b/libraries/PHPExcel/PHPExcel/Shared/CodePage.php index 10f82e4..f209838 100644 --- a/libraries/PHPExcel/PHPExcel/Shared/CodePage.php +++ b/libraries/PHPExcel/PHPExcel/Shared/CodePage.php @@ -22,7 +22,7 @@ * @package PHPExcel_Shared * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Shared/Date.php b/libraries/PHPExcel/PHPExcel/Shared/Date.php index c45c23f..334e8df 100644 --- a/libraries/PHPExcel/PHPExcel/Shared/Date.php +++ b/libraries/PHPExcel/PHPExcel/Shared/Date.php @@ -23,7 +23,7 @@ * @package PHPExcel_Shared * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Shared/Drawing.php b/libraries/PHPExcel/PHPExcel/Shared/Drawing.php index a89c94e..a24f963 100644 --- a/libraries/PHPExcel/PHPExcel/Shared/Drawing.php +++ b/libraries/PHPExcel/PHPExcel/Shared/Drawing.php @@ -22,7 +22,7 @@ * @package PHPExcel_Shared * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Shared/Escher.php b/libraries/PHPExcel/PHPExcel/Shared/Escher.php index c230d99..11c19b2 100644 --- a/libraries/PHPExcel/PHPExcel/Shared/Escher.php +++ b/libraries/PHPExcel/PHPExcel/Shared/Escher.php @@ -22,7 +22,7 @@ * @package PHPExcel_Shared_Escher * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ /** diff --git a/libraries/PHPExcel/PHPExcel/Shared/Escher/DgContainer.php b/libraries/PHPExcel/PHPExcel/Shared/Escher/DgContainer.php index c78485b..6cbd2f0 100644 --- a/libraries/PHPExcel/PHPExcel/Shared/Escher/DgContainer.php +++ b/libraries/PHPExcel/PHPExcel/Shared/Escher/DgContainer.php @@ -22,7 +22,7 @@ * @package PHPExcel_Shared_Escher * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ /** diff --git a/libraries/PHPExcel/PHPExcel/Shared/Escher/DgContainer/SpgrContainer.php b/libraries/PHPExcel/PHPExcel/Shared/Escher/DgContainer/SpgrContainer.php index c659fd5..919cf1a 100644 --- a/libraries/PHPExcel/PHPExcel/Shared/Escher/DgContainer/SpgrContainer.php +++ b/libraries/PHPExcel/PHPExcel/Shared/Escher/DgContainer/SpgrContainer.php @@ -22,7 +22,7 @@ * @package PHPExcel_Shared_Escher * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ /** diff --git a/libraries/PHPExcel/PHPExcel/Shared/Escher/DgContainer/SpgrContainer/SpContainer.php b/libraries/PHPExcel/PHPExcel/Shared/Escher/DgContainer/SpgrContainer/SpContainer.php index 83e3193..454b7ee 100644 --- a/libraries/PHPExcel/PHPExcel/Shared/Escher/DgContainer/SpgrContainer/SpContainer.php +++ b/libraries/PHPExcel/PHPExcel/Shared/Escher/DgContainer/SpgrContainer/SpContainer.php @@ -22,7 +22,7 @@ * @package PHPExcel_Shared_Escher * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ /** diff --git a/libraries/PHPExcel/PHPExcel/Shared/Escher/DggContainer.php b/libraries/PHPExcel/PHPExcel/Shared/Escher/DggContainer.php index 59d34cf..61eab5d 100644 --- a/libraries/PHPExcel/PHPExcel/Shared/Escher/DggContainer.php +++ b/libraries/PHPExcel/PHPExcel/Shared/Escher/DggContainer.php @@ -22,7 +22,7 @@ * @package PHPExcel_Shared_Escher * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ /** @@ -70,6 +70,13 @@ class PHPExcel_Shared_Escher_DggContainer private $_OPT = array(); /** + * Array of identifier clusters containg information about the maximum shape identifiers + * + * @var array + */ + private $_IDCLs = array(); + + /** * Get maximum shape index of all shapes in all drawings (plus one) * * @return int @@ -174,4 +181,23 @@ class PHPExcel_Shared_Escher_DggContainer return null; } + /** + * Get identifier clusters + * + * @return array + */ + public function getIDCLs() + { + return $this->_IDCLs; + } + + /** + * Set identifier clusters. array(<drawingId> => <max shape id>, ...) + * + * @param array $pValue + */ + public function setIDCLs($pValue) + { + $this->_IDCLs = $pValue; + } } diff --git a/libraries/PHPExcel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer.php b/libraries/PHPExcel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer.php index 9292f2d..6040fb2 100644 --- a/libraries/PHPExcel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer.php +++ b/libraries/PHPExcel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer.php @@ -22,7 +22,7 @@ * @package PHPExcel_Shared_Escher * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ /** diff --git a/libraries/PHPExcel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE.php b/libraries/PHPExcel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE.php index 820e703..00ccb6d 100644 --- a/libraries/PHPExcel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE.php +++ b/libraries/PHPExcel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE.php @@ -22,7 +22,7 @@ * @package PHPExcel_Shared_Escher * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ /** diff --git a/libraries/PHPExcel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE/Blip.php b/libraries/PHPExcel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE/Blip.php index 35003dd..7f13632 100644 --- a/libraries/PHPExcel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE/Blip.php +++ b/libraries/PHPExcel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE/Blip.php @@ -22,7 +22,7 @@ * @package PHPExcel_Shared_Escher * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ /** diff --git a/libraries/PHPExcel/PHPExcel/Shared/Excel5.php b/libraries/PHPExcel/PHPExcel/Shared/Excel5.php index 05af633..6469c52 100644 --- a/libraries/PHPExcel/PHPExcel/Shared/Excel5.php +++ b/libraries/PHPExcel/PHPExcel/Shared/Excel5.php @@ -22,7 +22,7 @@ * @package PHPExcel_Shared * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ /** diff --git a/libraries/PHPExcel/PHPExcel/Shared/File.php b/libraries/PHPExcel/PHPExcel/Shared/File.php index dc2c3fd..23169ce 100644 --- a/libraries/PHPExcel/PHPExcel/Shared/File.php +++ b/libraries/PHPExcel/PHPExcel/Shared/File.php @@ -22,7 +22,7 @@ * @package PHPExcel_Shared * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ @@ -75,7 +75,9 @@ class PHPExcel_Shared_File $returnValue = ''; // Try using realpath() - $returnValue = realpath($pFilename); + if (file_exists($pFilename)) { + $returnValue = realpath($pFilename); + } // Found something? if ($returnValue == '' || is_null($returnValue)) { @@ -107,14 +109,14 @@ class PHPExcel_Shared_File // http://php.net/manual/en/function.sys-get-temp-dir.php#94119 if ( !function_exists('sys_get_temp_dir')) { - if( $temp = getenv('TMP') ) { - return realpath($temp); + if ($temp = getenv('TMP') ) { + if (file_exists($temp)) { return realpath($temp); } } - if( $temp = getenv('TEMP') ) { - return realpath($temp); + if ($temp = getenv('TEMP') ) { + if (file_exists($temp)) { return realpath($temp); } } - if( $temp = getenv('TMPDIR') ) { - return realpath($temp); + if ($temp = getenv('TMPDIR') ) { + if (file_exists($temp)) { return realpath($temp); } } // trick for creating a file in system's temporary dir @@ -126,10 +128,11 @@ class PHPExcel_Shared_File } return null; - } // use ordinary built-in PHP function + // There should be no problem with the 5.2.4 Suhosin realpath() bug, because this line should only + // be called if we're running 5.2.1 or earlier return realpath(sys_get_temp_dir()); } diff --git a/libraries/PHPExcel/PHPExcel/Shared/Font.php b/libraries/PHPExcel/PHPExcel/Shared/Font.php index 1759e87..24d78be 100644 --- a/libraries/PHPExcel/PHPExcel/Shared/Font.php +++ b/libraries/PHPExcel/PHPExcel/Shared/Font.php @@ -22,7 +22,7 @@ * @package PHPExcel_Shared * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Shared/OLE/ChainedBlockStream.php b/libraries/PHPExcel/PHPExcel/Shared/OLE/ChainedBlockStream.php index 7b6f845..af757d0 100644 --- a/libraries/PHPExcel/PHPExcel/Shared/OLE/ChainedBlockStream.php +++ b/libraries/PHPExcel/PHPExcel/Shared/OLE/ChainedBlockStream.php @@ -22,7 +22,7 @@ * @package PHPExcel_Shared_OLE * @copyright Copyright (c) 2006 - 2007 Christian Schmidt * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ /** diff --git a/libraries/PHPExcel/PHPExcel/Shared/OLERead.php b/libraries/PHPExcel/PHPExcel/Shared/OLERead.php index b747e13..6aebbf0 100644 --- a/libraries/PHPExcel/PHPExcel/Shared/OLERead.php +++ b/libraries/PHPExcel/PHPExcel/Shared/OLERead.php @@ -22,7 +22,7 @@ * @package PHPExcel_Shared * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ define('IDENTIFIER_OLE', pack('CCCCCCCC', 0xd0, 0xcf, 0x11, 0xe0, 0xa1, 0xb1, 0x1a, 0xe1)); diff --git a/libraries/PHPExcel/PHPExcel/Shared/PasswordHasher.php b/libraries/PHPExcel/PHPExcel/Shared/PasswordHasher.php index 6b7b312..7fb4934 100644 --- a/libraries/PHPExcel/PHPExcel/Shared/PasswordHasher.php +++ b/libraries/PHPExcel/PHPExcel/Shared/PasswordHasher.php @@ -22,7 +22,7 @@ * @package PHPExcel_Shared * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Shared/String.php b/libraries/PHPExcel/PHPExcel/Shared/String.php index 32766df..c033b9a 100644 --- a/libraries/PHPExcel/PHPExcel/Shared/String.php +++ b/libraries/PHPExcel/PHPExcel/Shared/String.php @@ -22,7 +22,7 @@ * @package PHPExcel_Shared * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ @@ -507,7 +507,7 @@ class PHPExcel_Shared_String * @author Rasmus Andersson {@link http://rasmusandersson.se/} * @author vadik56 */ - function utf16_decode( $str, $bom_be=true ) { + public static function utf16_decode( $str, $bom_be=true ) { if( strlen($str) < 2 ) return $str; $c0 = ord($str{0}); $c1 = ord($str{1}); diff --git a/libraries/PHPExcel/PHPExcel/Shared/XMLWriter.php b/libraries/PHPExcel/PHPExcel/Shared/XMLWriter.php index 223d3dd..8514847 100644 --- a/libraries/PHPExcel/PHPExcel/Shared/XMLWriter.php +++ b/libraries/PHPExcel/PHPExcel/Shared/XMLWriter.php @@ -22,13 +22,18 @@ * @package PHPExcel_Shared * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ if (!defined('DATE_W3C')) { define('DATE_W3C', 'Y-m-d\TH:i:sP'); } +if (!defined('DEBUGMODE_ENABLED')) { + define('DEBUGMODE_ENABLED', false); +} + + /** * PHPExcel_Shared_XMLWriter * @@ -80,7 +85,9 @@ class PHPExcel_Shared_XMLWriter { } // Set default values - $this->_xmlWriter->setIndent(true); + if (DEBUGMODE_ENABLED) { + $this->_xmlWriter->setIndent(true); + } } /** diff --git a/libraries/PHPExcel/PHPExcel/Shared/ZipStreamWrapper.php b/libraries/PHPExcel/PHPExcel/Shared/ZipStreamWrapper.php index 77661c6..b79bfc8 100644 --- a/libraries/PHPExcel/PHPExcel/Shared/ZipStreamWrapper.php +++ b/libraries/PHPExcel/PHPExcel/Shared/ZipStreamWrapper.php @@ -22,7 +22,7 @@ * @package PHPExcel_Shared * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Shared/trend/bestFitClass.php b/libraries/PHPExcel/PHPExcel/Shared/trend/bestFitClass.php index 27fecd5..28fe725 100644 --- a/libraries/PHPExcel/PHPExcel/Shared/trend/bestFitClass.php +++ b/libraries/PHPExcel/PHPExcel/Shared/trend/bestFitClass.php @@ -22,7 +22,7 @@ * @package PHPExcel_Shared_Best_Fit * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Shared/trend/exponentialBestFitClass.php b/libraries/PHPExcel/PHPExcel/Shared/trend/exponentialBestFitClass.php index a0717ea..0ff98cc 100644 --- a/libraries/PHPExcel/PHPExcel/Shared/trend/exponentialBestFitClass.php +++ b/libraries/PHPExcel/PHPExcel/Shared/trend/exponentialBestFitClass.php @@ -22,7 +22,7 @@ * @package PHPExcel_Shared_Best_Fit * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Shared/trend/linearBestFitClass.php b/libraries/PHPExcel/PHPExcel/Shared/trend/linearBestFitClass.php index 99f358c..71219a0 100644 --- a/libraries/PHPExcel/PHPExcel/Shared/trend/linearBestFitClass.php +++ b/libraries/PHPExcel/PHPExcel/Shared/trend/linearBestFitClass.php @@ -22,7 +22,7 @@ * @package PHPExcel_Shared_Best_Fit * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Shared/trend/logarithmicBestFitClass.php b/libraries/PHPExcel/PHPExcel/Shared/trend/logarithmicBestFitClass.php index a59c879..03c7dc3 100644 --- a/libraries/PHPExcel/PHPExcel/Shared/trend/logarithmicBestFitClass.php +++ b/libraries/PHPExcel/PHPExcel/Shared/trend/logarithmicBestFitClass.php @@ -22,7 +22,7 @@ * @package PHPExcel_Shared_Best_Fit * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Shared/trend/polynomialBestFitClass.php b/libraries/PHPExcel/PHPExcel/Shared/trend/polynomialBestFitClass.php index 02ff0a5..6947c11 100644 --- a/libraries/PHPExcel/PHPExcel/Shared/trend/polynomialBestFitClass.php +++ b/libraries/PHPExcel/PHPExcel/Shared/trend/polynomialBestFitClass.php @@ -22,7 +22,7 @@ * @package PHPExcel_Shared_Best_Fit * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Shared/trend/powerBestFitClass.php b/libraries/PHPExcel/PHPExcel/Shared/trend/powerBestFitClass.php index 9328fcb..6d2281c 100644 --- a/libraries/PHPExcel/PHPExcel/Shared/trend/powerBestFitClass.php +++ b/libraries/PHPExcel/PHPExcel/Shared/trend/powerBestFitClass.php @@ -22,7 +22,7 @@ * @package PHPExcel_Shared_Best_Fit * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Style.php b/libraries/PHPExcel/PHPExcel/Style.php index d0cbcb0..3e84f9f 100644 --- a/libraries/PHPExcel/PHPExcel/Style.php +++ b/libraries/PHPExcel/PHPExcel/Style.php @@ -22,7 +22,7 @@ * @package PHPExcel_Style * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ @@ -675,7 +675,7 @@ class PHPExcel_Style implements PHPExcel_IComparable public function __clone() { $vars = get_object_vars($this); foreach ($vars as $key => $value) { - if (is_object($value)) { + if ((is_object($value)) && ($key != '_parent')) { $this->$key = clone $value; } else { $this->$key = $value; diff --git a/libraries/PHPExcel/PHPExcel/Style/Alignment.php b/libraries/PHPExcel/PHPExcel/Style/Alignment.php index 412c603..15b6c87 100644 --- a/libraries/PHPExcel/PHPExcel/Style/Alignment.php +++ b/libraries/PHPExcel/PHPExcel/Style/Alignment.php @@ -22,7 +22,7 @@ * @package PHPExcel_Style * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ @@ -479,7 +479,7 @@ class PHPExcel_Style_Alignment implements PHPExcel_IComparable public function __clone() { $vars = get_object_vars($this); foreach ($vars as $key => $value) { - if (is_object($value)) { + if ((is_object($value)) && ($key != '_parent')) { $this->$key = clone $value; } else { $this->$key = $value; diff --git a/libraries/PHPExcel/PHPExcel/Style/Border.php b/libraries/PHPExcel/PHPExcel/Style/Border.php index 1af31d6..166ccb2 100644 --- a/libraries/PHPExcel/PHPExcel/Style/Border.php +++ b/libraries/PHPExcel/PHPExcel/Style/Border.php @@ -22,7 +22,7 @@ * @package PHPExcel_Style * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ @@ -372,7 +372,7 @@ class PHPExcel_Style_Border implements PHPExcel_IComparable public function __clone() { $vars = get_object_vars($this); foreach ($vars as $key => $value) { - if (is_object($value)) { + if ((is_object($value)) && ($key != '_parent')) { $this->$key = clone $value; } else { $this->$key = $value; diff --git a/libraries/PHPExcel/PHPExcel/Style/Borders.php b/libraries/PHPExcel/PHPExcel/Style/Borders.php index ffd66af..dc32c50 100644 --- a/libraries/PHPExcel/PHPExcel/Style/Borders.php +++ b/libraries/PHPExcel/PHPExcel/Style/Borders.php @@ -22,7 +22,7 @@ * @package PHPExcel_Style * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ @@ -489,7 +489,7 @@ class PHPExcel_Style_Borders implements PHPExcel_IComparable public function __clone() { $vars = get_object_vars($this); foreach ($vars as $key => $value) { - if (is_object($value)) { + if ((is_object($value)) && ($key != '_parent')) { $this->$key = clone $value; } else { $this->$key = $value; diff --git a/libraries/PHPExcel/PHPExcel/Style/Color.php b/libraries/PHPExcel/PHPExcel/Style/Color.php index 8a25af0..9734d62 100644 --- a/libraries/PHPExcel/PHPExcel/Style/Color.php +++ b/libraries/PHPExcel/PHPExcel/Style/Color.php @@ -22,7 +22,7 @@ * @package PHPExcel_Style * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ @@ -398,7 +398,7 @@ class PHPExcel_Style_Color implements PHPExcel_IComparable public function __clone() { $vars = get_object_vars($this); foreach ($vars as $key => $value) { - if (is_object($value)) { + if ((is_object($value)) && ($key != '_parent')) { $this->$key = clone $value; } else { $this->$key = $value; diff --git a/libraries/PHPExcel/PHPExcel/Style/Conditional.php b/libraries/PHPExcel/PHPExcel/Style/Conditional.php index 8ec5f92..4602b53 100644 --- a/libraries/PHPExcel/PHPExcel/Style/Conditional.php +++ b/libraries/PHPExcel/PHPExcel/Style/Conditional.php @@ -22,7 +22,7 @@ * @package PHPExcel_Style * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Style/Fill.php b/libraries/PHPExcel/PHPExcel/Style/Fill.php index 3ebf380..1357e47 100644 --- a/libraries/PHPExcel/PHPExcel/Style/Fill.php +++ b/libraries/PHPExcel/PHPExcel/Style/Fill.php @@ -22,7 +22,7 @@ * @package PHPExcel_Style * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ @@ -391,7 +391,7 @@ class PHPExcel_Style_Fill implements PHPExcel_IComparable public function __clone() { $vars = get_object_vars($this); foreach ($vars as $key => $value) { - if (is_object($value)) { + if ((is_object($value)) && ($key != '_parent')) { $this->$key = clone $value; } else { $this->$key = $value; diff --git a/libraries/PHPExcel/PHPExcel/Style/Font.php b/libraries/PHPExcel/PHPExcel/Style/Font.php index de39cf2..b58dbf5 100644 --- a/libraries/PHPExcel/PHPExcel/Style/Font.php +++ b/libraries/PHPExcel/PHPExcel/Style/Font.php @@ -22,7 +22,7 @@ * @package PHPExcel_Style * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ @@ -609,7 +609,7 @@ class PHPExcel_Style_Font implements PHPExcel_IComparable public function __clone() { $vars = get_object_vars($this); foreach ($vars as $key => $value) { - if (is_object($value)) { + if ((is_object($value)) && ($key != '_parent')) { $this->$key = clone $value; } else { $this->$key = $value; diff --git a/libraries/PHPExcel/PHPExcel/Style/NumberFormat.php b/libraries/PHPExcel/PHPExcel/Style/NumberFormat.php index 9ff1a97..0f0dcdc 100644 --- a/libraries/PHPExcel/PHPExcel/Style/NumberFormat.php +++ b/libraries/PHPExcel/PHPExcel/Style/NumberFormat.php @@ -22,7 +22,7 @@ * @package PHPExcel_Style * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 201 0-08-26 */ @@ -443,7 +443,7 @@ class PHPExcel_Style_NumberFormat implements PHPExcel_IComparable { $vars = get_object_vars($this); foreach ($vars as $key => $value) { - if (is_object($value)) { + if ((is_object($value)) && ($key != '_parent')) { $this->$key = clone $value; } else { $this->$key = $value; diff --git a/libraries/PHPExcel/PHPExcel/Style/Protection.php b/libraries/PHPExcel/PHPExcel/Style/Protection.php index 1c70702..29832da 100644 --- a/libraries/PHPExcel/PHPExcel/Style/Protection.php +++ b/libraries/PHPExcel/PHPExcel/Style/Protection.php @@ -271,7 +271,7 @@ class PHPExcel_Style_Protection implements PHPExcel_IComparable public function __clone() { $vars = get_object_vars($this); foreach ($vars as $key => $value) { - if (is_object($value)) { + if ((is_object($value)) && ($key != '_parent')) { $this->$key = clone $value; } else { $this->$key = $value; diff --git a/libraries/PHPExcel/PHPExcel/Worksheet.php b/libraries/PHPExcel/PHPExcel/Worksheet.php index dc401fd..fb7cc0a 100644 --- a/libraries/PHPExcel/PHPExcel/Worksheet.php +++ b/libraries/PHPExcel/PHPExcel/Worksheet.php @@ -22,7 +22,7 @@ * @package PHPExcel_Worksheet * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ @@ -2180,9 +2180,8 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable $highestRow = 1; // Find cells that can be cleaned - foreach ($this->_cellCollection->getCellList() as $coordinate) { - preg_match('/^(\w+)(\d+)$/U',$coordinate,$matches); - list(,$col,$row) = $matches; + foreach ($this->_cellCollection->getCellList() as $coord) { + list($col,$row) = sscanf($coord,'%[A-Z]%d'); $column = PHPExcel_Cell::columnIndexFromString($col); // Determine highest column and row @@ -2468,7 +2467,13 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable } if (is_object($val) || (is_array($val))) { - $this->{$key} = unserialize(serialize($val)); + if ($key == '_cellCollection') { + $newCollection = clone $this->_cellCollection; + $newCollection->copyCellCollection($this); + $this->_cellCollection = $newCollection; + } else { + $this->{$key} = unserialize(serialize($val)); + } } } } diff --git a/libraries/PHPExcel/PHPExcel/Worksheet/BaseDrawing.php b/libraries/PHPExcel/PHPExcel/Worksheet/BaseDrawing.php index e2c65c3..511643b 100644 --- a/libraries/PHPExcel/PHPExcel/Worksheet/BaseDrawing.php +++ b/libraries/PHPExcel/PHPExcel/Worksheet/BaseDrawing.php @@ -22,7 +22,7 @@ * @package PHPExcel_Worksheet * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Worksheet/CellIterator.php b/libraries/PHPExcel/PHPExcel/Worksheet/CellIterator.php index 4a6589f..630e089 100644 --- a/libraries/PHPExcel/PHPExcel/Worksheet/CellIterator.php +++ b/libraries/PHPExcel/PHPExcel/Worksheet/CellIterator.php @@ -22,7 +22,7 @@ * @package PHPExcel_Worksheet * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Worksheet/ColumnDimension.php b/libraries/PHPExcel/PHPExcel/Worksheet/ColumnDimension.php index f42ef31..30b0035 100644 --- a/libraries/PHPExcel/PHPExcel/Worksheet/ColumnDimension.php +++ b/libraries/PHPExcel/PHPExcel/Worksheet/ColumnDimension.php @@ -22,7 +22,7 @@ * @package PHPExcel_Worksheet * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Worksheet/Drawing.php b/libraries/PHPExcel/PHPExcel/Worksheet/Drawing.php index 7d362c0..537f9f3 100644 --- a/libraries/PHPExcel/PHPExcel/Worksheet/Drawing.php +++ b/libraries/PHPExcel/PHPExcel/Worksheet/Drawing.php @@ -22,7 +22,7 @@ * @package PHPExcel_Worksheet_Drawing * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Worksheet/Drawing/Shadow.php b/libraries/PHPExcel/PHPExcel/Worksheet/Drawing/Shadow.php index f83c26d..053ab0d 100644 --- a/libraries/PHPExcel/PHPExcel/Worksheet/Drawing/Shadow.php +++ b/libraries/PHPExcel/PHPExcel/Worksheet/Drawing/Shadow.php @@ -22,7 +22,7 @@ * @package PHPExcel_Worksheet_Drawing * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Worksheet/HeaderFooter.php b/libraries/PHPExcel/PHPExcel/Worksheet/HeaderFooter.php index 4e39339..9d2708d 100644 --- a/libraries/PHPExcel/PHPExcel/Worksheet/HeaderFooter.php +++ b/libraries/PHPExcel/PHPExcel/Worksheet/HeaderFooter.php @@ -22,7 +22,7 @@ * @package PHPExcel_Worksheet * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Worksheet/HeaderFooterDrawing.php b/libraries/PHPExcel/PHPExcel/Worksheet/HeaderFooterDrawing.php index 9f2b25d..f614261 100644 --- a/libraries/PHPExcel/PHPExcel/Worksheet/HeaderFooterDrawing.php +++ b/libraries/PHPExcel/PHPExcel/Worksheet/HeaderFooterDrawing.php @@ -22,7 +22,7 @@ * @package PHPExcel_Worksheet * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Worksheet/MemoryDrawing.php b/libraries/PHPExcel/PHPExcel/Worksheet/MemoryDrawing.php index 0bd37f5..a43e6a9 100644 --- a/libraries/PHPExcel/PHPExcel/Worksheet/MemoryDrawing.php +++ b/libraries/PHPExcel/PHPExcel/Worksheet/MemoryDrawing.php @@ -22,7 +22,7 @@ * @package PHPExcel_Worksheet * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Worksheet/PageMargins.php b/libraries/PHPExcel/PHPExcel/Worksheet/PageMargins.php index 6fc8f1a..155b976 100644 --- a/libraries/PHPExcel/PHPExcel/Worksheet/PageMargins.php +++ b/libraries/PHPExcel/PHPExcel/Worksheet/PageMargins.php @@ -22,7 +22,7 @@ * @package PHPExcel_Worksheet * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Worksheet/PageSetup.php b/libraries/PHPExcel/PHPExcel/Worksheet/PageSetup.php index ffbd573..8e615f7 100644 --- a/libraries/PHPExcel/PHPExcel/Worksheet/PageSetup.php +++ b/libraries/PHPExcel/PHPExcel/Worksheet/PageSetup.php @@ -22,7 +22,7 @@ * @package PHPExcel_Worksheet * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ @@ -179,6 +179,11 @@ class PHPExcel_Worksheet_PageSetup const ORIENTATION_LANDSCAPE = 'landscape'; const ORIENTATION_PORTRAIT = 'portrait'; + /* Print Range Set Method */ + const SETPRINTRANGE_OVERWRITE = 'O'; + const SETPRINTRANGE_INSERT = 'I'; + + /** * Paper size * @@ -261,7 +266,7 @@ class PHPExcel_Worksheet_PageSetup * @var string */ private $_printArea = null; - + /** * First page number * @@ -570,55 +575,197 @@ class PHPExcel_Worksheet_PageSetup } /** - * Get print area + * Get print area * - * @return string + * @param int $index Identifier for a specific print area range if several ranges have been set + * Default behaviour, or a index value of 0, will return all ranges as a comma-separated string + * Otherwise, the specific range identified by the value of $index will be returned + * Print areas are numbered from 1 + * @throws Exception + * @return string */ - public function getPrintArea() { - return $this->_printArea; + public function getPrintArea($index = 0) { + if ($index == 0) { + return $this->_printArea; + } + $printAreas = explode(',',$this->_printArea); + if (isset($printAreas[$index-1])) { + return $printAreas[$index-1]; + } + throw new Exception("Requested Print Area does not exist"); } /** - * Is print area set? + * Is print area set? * - * @return boolean + * @param int $index Identifier for a specific print area range if several ranges have been set + * Default behaviour, or an index value of 0, will identify whether any print range is set + * Otherwise, existence of the range identified by the value of $index will be returned + * Print areas are numbered from 1 + * @return boolean */ - public function isPrintAreaSet() { - return !is_null($this->_printArea); + public function isPrintAreaSet($index = 0) { + if ($index == 0) { + return !is_null($this->_printArea); + } + $printAreas = explode(',',$this->_printArea); + return isset($printAreas[$index-1]); } /** - * Set print area. E.g. 'A1:D10' or 'A1:D10,G5:M20' + * Clear a print area * - * @param string $value - * @throws Exception - * @return PHPExcel_Worksheet_PageSetup + * @param int $index Identifier for a specific print area range if several ranges have been set + * Default behaviour, or an index value of 0, will clear all print ranges that are set + * Otherwise, the range identified by the value of $index will be removed from the series + * Print areas are numbered from 1 + * @return PHPExcel_Worksheet_PageSetup */ - public function setPrintArea($value) { - if (strpos($value,':') === false) { - throw new Exception('Cell coordinate must be a range of cells.'); - } elseif (strpos($value,'$') !== false) { - throw new Exception('Cell coordinate must not be absolute.'); - } else { - $this->_printArea = strtoupper($value); - } + public function clearPrintArea($index = 0) { + if ($index == 0) { + $this->_printArea = NULL; + } else { + $printAreas = explode(',',$this->_printArea); + if (isset($printAreas[$index-1])) { + unset($printAreas[$index-1]); + $this->_printArea = implode(',',$printAreas); + } + } + + return $this; + } + + /** + * Set print area. e.g. 'A1:D10' or 'A1:D10,G5:M20' + * + * @param string $value + * @param int $index Identifier for a specific print area range allowing several ranges to be set + * When the method is "O"verwrite, then a positive integer index will overwrite that indexed + * entry in the print areas list; a negative index value will identify which entry to + * overwrite working bacward through the print area to the list, with the last entry as -1. + * Specifying an index value of 0, will overwrite <b>all</b> existing print ranges. + * When the method is "I"nsert, then a positive index will insert after that indexed entry in + * the print areas list, while a negative index will insert before the indexed entry. + * Specifying an index value of 0, will always append the new print range at the end of the + * list. + * Print areas are numbered from 1 + * @param string $method Determines the method used when setting multiple print areas + * Default behaviour, or the "O" method, overwrites existing print area + * The "I" method, inserts the new print area before any specified index, or at the end of the list + * @throws Exception + * @return PHPExcel_Worksheet_PageSetup + */ + public function setPrintArea($value, $index = 0, $method = self::SETPRINTRANGE_OVERWRITE) { + if (strpos($value,'!') !== false) { + throw new Exception('Cell coordinate must not specify a worksheet.'); + } elseif (strpos($value,':') === false) { + throw new Exception('Cell coordinate must be a range of cells.'); + } elseif (strpos($value,'$') !== false) { + throw new Exception('Cell coordinate must not be absolute.'); + } + $value = strtoupper($value); + + if ($method == self::SETPRINTRANGE_OVERWRITE) { + if ($index == 0) { + $this->_printArea = $value; + } else { + $printAreas = explode(',',$this->_printArea); + if($index < 0) { + $index = count($printAreas) - abs($index) + 1; + } + if (($index <= 0) || ($index > count($printAreas))) { + throw new Exception('Invalid index for setting print range.'); + } + $printAreas[$index-1] = $value; + $this->_printArea = implode(',',$printAreas); + } + } elseif($method == self::SETPRINTRANGE_INSERT) { + if ($index == 0) { + $this->_printArea .= ($this->_printArea == '') ? $value : ','.$value; + } else { + $printAreas = explode(',',$this->_printArea); + if($index < 0) { + $index = abs($index) - 1; + } + if ($index > count($printAreas)) { + throw new Exception('Invalid index for setting print range.'); + } + $printAreas = array_merge(array_slice($printAreas,0,$index),array($value),array_slice($printAreas,$index)); + $this->_printArea = implode(',',$printAreas); + } + } else { + throw new Exception('Invalid method for setting print range.'); + } + return $this; } /** - * Set print area + * Add a new print area (e.g. 'A1:D10' or 'A1:D10,G5:M20') to the list of print areas * - * @param int $column1 Column 1 - * @param int $row1 Row 1 - * @param int $column2 Column 2 - * @param int $row2 Row 2 - * @return PHPExcel_Worksheet_PageSetup + * @param string $value + * @param int $index Identifier for a specific print area range allowing several ranges to be set + * A positive index will insert after that indexed entry in the print areas list, while a + * negative index will insert before the indexed entry. + * Specifying an index value of 0, will always append the new print range at the end of the + * list. + * Print areas are numbered from 1 + * @throws Exception + * @return PHPExcel_Worksheet_PageSetup */ - public function setPrintAreaByColumnAndRow($column1, $row1, $column2, $row2) + public function addPrintArea($value, $index = -1) { + return $this->setPrintArea($value, $index, self::SETPRINTRANGE_INSERT); + } + + /** + * Set print area + * + * @param int $column1 Column 1 + * @param int $row1 Row 1 + * @param int $column2 Column 2 + * @param int $row2 Row 2 + * @param int $index Identifier for a specific print area range allowing several ranges to be set + * When the method is "O"verwrite, then a positive integer index will overwrite that indexed + * entry in the print areas list; a negative index value will identify which entry to + * overwrite working bacward through the print area to the list, with the last entry as -1. + * Specifying an index value of 0, will overwrite <b>all</b> existing print ranges. + * When the method is "I"nsert, then a positive index will insert after that indexed entry in + * the print areas list, while a negative index will insert before the indexed entry. + * Specifying an index value of 0, will always append the new print range at the end of the + * list. + * Print areas are numbered from 1 + * @param string $method Determines the method used when setting multiple print areas + * Default behaviour, or the "O" method, overwrites existing print area + * The "I" method, inserts the new print area before any specified index, or at the end of the list + * @throws Exception + * @return PHPExcel_Worksheet_PageSetup + */ + public function setPrintAreaByColumnAndRow($column1, $row1, $column2, $row2, $index = 0, $method = self::SETPRINTRANGE_OVERWRITE) { - return $this->setPrintArea(PHPExcel_Cell::stringFromColumnIndex($column1) . $row1 . ':' . PHPExcel_Cell::stringFromColumnIndex($column2) . $row2); + return $this->setPrintArea(PHPExcel_Cell::stringFromColumnIndex($column1) . $row1 . ':' . PHPExcel_Cell::stringFromColumnIndex($column2) . $row2, $index, $method); } - + + /** + * Add a new print area to the list of print areas + * + * @param int $column1 Column 1 + * @param int $row1 Row 1 + * @param int $column2 Column 2 + * @param int $row2 Row 2 + * @param int $index Identifier for a specific print area range allowing several ranges to be set + * A positive index will insert after that indexed entry in the print areas list, while a + * negative index will insert before the indexed entry. + * Specifying an index value of 0, will always append the new print range at the end of the + * list. + * Print areas are numbered from 1 + * @throws Exception + * @return PHPExcel_Worksheet_PageSetup + */ + public function addPrintAreaByColumnAndRow($column1, $row1, $column2, $row2, $index = -1) + { + return $this->setPrintArea(PHPExcel_Cell::stringFromColumnIndex($column1) . $row1 . ':' . PHPExcel_Cell::stringFromColumnIndex($column2) . $row2, $index, self::SETPRINTRANGE_INSERT); + } + /** * Get first page number * @@ -627,7 +774,7 @@ class PHPExcel_Worksheet_PageSetup public function getFirstPageNumber() { return $this->_firstPageNumber; } - + /** * Set first page number * @@ -638,7 +785,7 @@ class PHPExcel_Worksheet_PageSetup $this->_firstPageNumber = $value; return $this; } - + /** * Reset first page number * diff --git a/libraries/PHPExcel/PHPExcel/Worksheet/Protection.php b/libraries/PHPExcel/PHPExcel/Worksheet/Protection.php index 0e7bc4f..f60a265 100644 --- a/libraries/PHPExcel/PHPExcel/Worksheet/Protection.php +++ b/libraries/PHPExcel/PHPExcel/Worksheet/Protection.php @@ -22,7 +22,7 @@ * @package PHPExcel_Worksheet * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Worksheet/Row.php b/libraries/PHPExcel/PHPExcel/Worksheet/Row.php index c5cb33a..7311721 100644 --- a/libraries/PHPExcel/PHPExcel/Worksheet/Row.php +++ b/libraries/PHPExcel/PHPExcel/Worksheet/Row.php @@ -22,7 +22,7 @@ * @package PHPExcel_Worksheet * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Worksheet/RowDimension.php b/libraries/PHPExcel/PHPExcel/Worksheet/RowDimension.php index 8b1277d..153024f 100644 --- a/libraries/PHPExcel/PHPExcel/Worksheet/RowDimension.php +++ b/libraries/PHPExcel/PHPExcel/Worksheet/RowDimension.php @@ -22,7 +22,7 @@ * @package PHPExcel_Worksheet * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Worksheet/RowIterator.php b/libraries/PHPExcel/PHPExcel/Worksheet/RowIterator.php index d21bd51..e0f91fc 100644 --- a/libraries/PHPExcel/PHPExcel/Worksheet/RowIterator.php +++ b/libraries/PHPExcel/PHPExcel/Worksheet/RowIterator.php @@ -22,7 +22,7 @@ * @package PHPExcel_Worksheet * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Worksheet/SheetView.php b/libraries/PHPExcel/PHPExcel/Worksheet/SheetView.php index c7e04ae..fdfe001 100644 --- a/libraries/PHPExcel/PHPExcel/Worksheet/SheetView.php +++ b/libraries/PHPExcel/PHPExcel/Worksheet/SheetView.php @@ -22,7 +22,7 @@ * @package PHPExcel_Worksheet * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/WorksheetIterator.php b/libraries/PHPExcel/PHPExcel/WorksheetIterator.php index f6f6a6f..87f8b29 100644 --- a/libraries/PHPExcel/PHPExcel/WorksheetIterator.php +++ b/libraries/PHPExcel/PHPExcel/WorksheetIterator.php @@ -22,7 +22,7 @@ * @package PHPExcel * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Writer/CSV.php b/libraries/PHPExcel/PHPExcel/Writer/CSV.php index 03e1a6e..765244d 100644 --- a/libraries/PHPExcel/PHPExcel/Writer/CSV.php +++ b/libraries/PHPExcel/PHPExcel/Writer/CSV.php @@ -22,7 +22,7 @@ * @package PHPExcel_Writer * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ @@ -106,6 +106,8 @@ class PHPExcel_Writer_CSV implements PHPExcel_Writer_IWriter { // Fetch sheet $sheet = $this->_phpExcel->getSheet($this->_sheetIndex); + $saveDebugLog = PHPExcel_Calculation::getInstance()->writeDebugLog; + PHPExcel_Calculation::getInstance()->writeDebugLog = false; $saveArrayReturnType = PHPExcel_Calculation::getArrayReturnType(); PHPExcel_Calculation::setArrayReturnType(PHPExcel_Calculation::RETURN_ARRAY_AS_VALUE); @@ -132,6 +134,7 @@ class PHPExcel_Writer_CSV implements PHPExcel_Writer_IWriter { fclose($fileHandle); PHPExcel_Calculation::setArrayReturnType($saveArrayReturnType); + PHPExcel_Calculation::getInstance()->writeDebugLog = $saveDebugLog; } /** diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel2007.php b/libraries/PHPExcel/PHPExcel/Writer/Excel2007.php index 1963ab9..b9f7464 100644 --- a/libraries/PHPExcel/PHPExcel/Writer/Excel2007.php +++ b/libraries/PHPExcel/PHPExcel/Writer/Excel2007.php @@ -22,7 +22,7 @@ * @package PHPExcel_Writer_Excel2007 * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ @@ -201,6 +201,8 @@ class PHPExcel_Writer_Excel2007 implements PHPExcel_Writer_IWriter } } + $saveDebugLog = PHPExcel_Calculation::getInstance()->writeDebugLog; + PHPExcel_Calculation::getInstance()->writeDebugLog = false; $saveDateReturnType = PHPExcel_Calculation_Functions::getReturnDateType(); PHPExcel_Calculation_Functions::setReturnDateType(PHPExcel_Calculation_Functions::RETURNDATE_EXCEL); @@ -331,6 +333,7 @@ class PHPExcel_Writer_Excel2007 implements PHPExcel_Writer_IWriter } PHPExcel_Calculation_Functions::setReturnDateType($saveDateReturnType); + PHPExcel_Calculation::getInstance()->writeDebugLog = $saveDebugLog; // Close file if ($objZip->close() === false) { diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Comments.php b/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Comments.php index ddb7958..3a6ad37 100644 --- a/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Comments.php +++ b/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Comments.php @@ -22,7 +22,7 @@ * @package PHPExcel_Writer_Excel2007 * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel2007/ContentTypes.php b/libraries/PHPExcel/PHPExcel/Writer/Excel2007/ContentTypes.php index d27e386..84de96d 100644 --- a/libraries/PHPExcel/PHPExcel/Writer/Excel2007/ContentTypes.php +++ b/libraries/PHPExcel/PHPExcel/Writer/Excel2007/ContentTypes.php @@ -22,7 +22,7 @@ * @package PHPExcel_Writer_Excel2007 * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel2007/DocProps.php b/libraries/PHPExcel/PHPExcel/Writer/Excel2007/DocProps.php index 68e0f04..21fc3a4 100644 --- a/libraries/PHPExcel/PHPExcel/Writer/Excel2007/DocProps.php +++ b/libraries/PHPExcel/PHPExcel/Writer/Excel2007/DocProps.php @@ -22,7 +22,7 @@ * @package PHPExcel_Writer_Excel2007 * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Drawing.php b/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Drawing.php index 670b835..f1551da 100644 --- a/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Drawing.php +++ b/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Drawing.php @@ -22,7 +22,7 @@ * @package PHPExcel_Writer_Excel2007 * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Rels.php b/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Rels.php index d133621..7ffdd6d 100644 --- a/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Rels.php +++ b/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Rels.php @@ -22,7 +22,7 @@ * @package PHPExcel_Writer_Excel2007 * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel2007/StringTable.php b/libraries/PHPExcel/PHPExcel/Writer/Excel2007/StringTable.php index 8ab1c52..98a3c45 100644 --- a/libraries/PHPExcel/PHPExcel/Writer/Excel2007/StringTable.php +++ b/libraries/PHPExcel/PHPExcel/Writer/Excel2007/StringTable.php @@ -22,7 +22,7 @@ * @package PHPExcel_Writer_Excel2007 * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Style.php b/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Style.php index dd7621d..5354936 100644 --- a/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Style.php +++ b/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Style.php @@ -22,7 +22,7 @@ * @package PHPExcel_Writer_Excel2007 * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Theme.php b/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Theme.php index 9dbee16..e8ffe7b 100644 --- a/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Theme.php +++ b/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Theme.php @@ -22,7 +22,7 @@ * @package PHPExcel_Writer_Excel2007 * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Workbook.php b/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Workbook.php index 245fb87..d2c51fb 100644 --- a/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Workbook.php +++ b/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Workbook.php @@ -22,7 +22,7 @@ * @package PHPExcel_Writer_Excel2007 * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Worksheet.php b/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Worksheet.php index 411b42a..327e542 100644 --- a/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Worksheet.php +++ b/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Worksheet.php @@ -22,7 +22,7 @@ * @package PHPExcel_Writer_Excel2007 * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ @@ -1002,7 +1002,18 @@ class PHPExcel_Writer_Excel2007_Worksheet extends PHPExcel_Writer_Excel2007_Writ break; case 'f': // Formula - $objWriter->writeElement('f', substr($pCell->getValue(), 1)); + $attributes = $pCell->getFormulaAttributes(); + if($attributes['t'] == 'array') { + $objWriter->startElement('f'); + $objWriter->writeAttribute('t', 'array'); + $objWriter->writeAttribute('ref', $pCell->getCoordinate()); + $objWriter->writeAttribute('aca', '1'); + $objWriter->writeAttribute('ca', '1'); + $objWriter->text(substr($pCell->getValue(), 1)); + $objWriter->endElement(); + } else { + $objWriter->writeElement('f', substr($pCell->getValue(), 1)); + } if ($this->getParentWriter()->getOffice2003Compatibility() === false) { if ($this->getParentWriter()->getPreCalculateFormulas()) { $calculatedValue = $pCell->getCalculatedValue(); diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel2007/WriterPart.php b/libraries/PHPExcel/PHPExcel/Writer/Excel2007/WriterPart.php index c153237..97d56e1 100644 --- a/libraries/PHPExcel/PHPExcel/Writer/Excel2007/WriterPart.php +++ b/libraries/PHPExcel/PHPExcel/Writer/Excel2007/WriterPart.php @@ -22,7 +22,7 @@ * @package PHPExcel_Writer_Excel2007 * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel5.php b/libraries/PHPExcel/PHPExcel/Writer/Excel5.php index 0bb5571..4d69d91 100644 --- a/libraries/PHPExcel/PHPExcel/Writer/Excel5.php +++ b/libraries/PHPExcel/PHPExcel/Writer/Excel5.php @@ -22,7 +22,7 @@ * @package PHPExcel_Writer_Excel5 * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ @@ -91,6 +91,13 @@ class PHPExcel_Writer_Excel5 implements PHPExcel_Writer_IWriter */ private $_parser; + /** + * Identifier clusters for drawings. Used in MSODRAWINGGROUP record. + * + * @var array + */ + private $_IDCLs; + /** * Create a new PHPExcel_Writer_Excel5 @@ -120,6 +127,8 @@ class PHPExcel_Writer_Excel5 implements PHPExcel_Writer_IWriter // garbage collect $this->_phpExcel->garbageCollect(); + $saveDebugLog = PHPExcel_Calculation::getInstance()->writeDebugLog; + PHPExcel_Calculation::getInstance()->writeDebugLog = false; $saveDateReturnType = PHPExcel_Calculation_Functions::getReturnDateType(); PHPExcel_Calculation_Functions::setReturnDateType(PHPExcel_Calculation_Functions::RETURNDATE_EXCEL); @@ -130,6 +139,21 @@ class PHPExcel_Writer_Excel5 implements PHPExcel_Writer_IWriter $this->_writerWorkbook = new PHPExcel_Writer_Excel5_Workbook($this->_phpExcel, $this->_BIFF_version, $this->_str_total, $this->_str_unique, $this->_str_table, $this->_colors, $this->_parser); + // Initialise worksheet writers + $countSheets = $this->_phpExcel->getSheetCount(); + for ($i = 0; $i < $countSheets; ++$i) { + $this->_writerWorksheets[$i] = new PHPExcel_Writer_Excel5_Worksheet($this->_BIFF_version, + $this->_str_total, $this->_str_unique, + $this->_str_table, $this->_colors, + $this->_parser, + $this->_preCalculateFormulas, + $this->_phpExcel->getSheet($i)); + } + + // build Escher objects. Escher objects for workbooks needs to be build before Escher object for workbook. + $this->_buildWorksheetEschers(); + $this->_buildWorkbookEscher(); + // add 15 identical cell style Xfs // for now, we use the first cellXf instead of cellStyleXf $cellXfCollection = $this->_phpExcel->getCellXfCollection(); @@ -146,19 +170,10 @@ class PHPExcel_Writer_Excel5 implements PHPExcel_Writer_IWriter $workbookStreamName = ($this->_BIFF_version == 0x0600) ? 'Workbook' : 'Book'; $OLE = new PHPExcel_Shared_OLE_PPS_File(PHPExcel_Shared_OLE::Asc2Ucs($workbookStreamName)); - // Initialise worksheet writers - $countSheets = $this->_phpExcel->getSheetCount(); // Write the worksheet streams before the global workbook stream, // because the byte sizes of these are needed in the global workbook stream $worksheetSizes = array(); for ($i = 0; $i < $countSheets; ++$i) { - $this->_writerWorksheets[$i] = new PHPExcel_Writer_Excel5_Worksheet($this->_BIFF_version, - $this->_str_total, $this->_str_unique, - $this->_str_table, $this->_colors, - $this->_parser, - $this->_preCalculateFormulas, - $this->_phpExcel->getSheet($i)); - $this->_writerWorksheets[$i]->close(); $worksheetSizes[] = $this->_writerWorksheets[$i]->_datasize; } @@ -176,6 +191,7 @@ class PHPExcel_Writer_Excel5 implements PHPExcel_Writer_IWriter $res = $root->save($pFilename); PHPExcel_Calculation_Functions::setReturnDateType($saveDateReturnType); + PHPExcel_Calculation::getInstance()->writeDebugLog = $saveDebugLog; } /** @@ -208,4 +224,253 @@ class PHPExcel_Writer_Excel5 implements PHPExcel_Writer_IWriter $this->_preCalculateFormulas = $pValue; } + private function _buildWorksheetEschers() + { + // 1-based index to BstoreContainer + $blipIndex = 0; + + foreach ($this->_phpExcel->getAllsheets() as $sheet) { + // sheet index + $sheetIndex = $sheet->getParent()->getIndex($sheet); + + $escher = null; + + // check if there are any shapes for this sheet + if (count($sheet->getDrawingCollection()) == 0) { + continue; + } + + // create intermediate Escher object + $escher = new PHPExcel_Shared_Escher(); + + // dgContainer + $dgContainer = new PHPExcel_Shared_Escher_DgContainer(); + + // set the drawing index (we use sheet index + 1) + $dgId = $sheet->getParent()->getIndex($sheet) + 1; + $dgContainer->setDgId($dgId); + $escher->setDgContainer($dgContainer); + + // spgrContainer + $spgrContainer = new PHPExcel_Shared_Escher_DgContainer_SpgrContainer(); + $dgContainer->setSpgrContainer($spgrContainer); + + // add one shape which is the group shape + $spContainer = new PHPExcel_Shared_Escher_DgContainer_SpgrContainer_SpContainer(); + $spContainer->setSpgr(true); + $spContainer->setSpType(0); + $spContainer->setSpId(($sheet->getParent()->getIndex($sheet) + 1) << 10); + $spgrContainer->addChild($spContainer); + + // add the shapes + + $countShapes[$sheetIndex] = 0; // count number of shapes (minus group shape), in sheet + + foreach ($sheet->getDrawingCollection() as $drawing) { + ++$blipIndex; + + ++$countShapes[$sheetIndex]; + + // add the shape + $spContainer = new PHPExcel_Shared_Escher_DgContainer_SpgrContainer_SpContainer(); + + // set the shape type + $spContainer->setSpType(0x004B); + + // set the shape index (we combine 1-based sheet index and $countShapes to create unique shape index) + $reducedSpId = $countShapes[$sheetIndex]; + $spId = $reducedSpId + | ($sheet->getParent()->getIndex($sheet) + 1) << 10; + $spContainer->setSpId($spId); + + // keep track of last reducedSpId + $lastReducedSpId = $reducedSpId; + + // keep track of last spId + $lastSpId = $spId; + + // set the BLIP index + $spContainer->setOPT(0x4104, $blipIndex); + + // set coordinates and offsets, client anchor + $coordinates = $drawing->getCoordinates(); + $offsetX = $drawing->getOffsetX(); + $offsetY = $drawing->getOffsetY(); + $width = $drawing->getWidth(); + $height = $drawing->getHeight(); + + $twoAnchor = PHPExcel_Shared_Excel5::oneAnchor2twoAnchor($sheet, $coordinates, $offsetX, $offsetY, $width, $height); + + $spContainer->setStartCoordinates($twoAnchor['startCoordinates']); + $spContainer->setStartOffsetX($twoAnchor['startOffsetX']); + $spContainer->setStartOffsetY($twoAnchor['startOffsetY']); + $spContainer->setEndCoordinates($twoAnchor['endCoordinates']); + $spContainer->setEndOffsetX($twoAnchor['endOffsetX']); + $spContainer->setEndOffsetY($twoAnchor['endOffsetY']); + + $spgrContainer->addChild($spContainer); + } + + // identifier clusters, used for workbook Escher object + $this->_IDCLs[$dgId] = $lastReducedSpId; + + // set last shape index + $dgContainer->setLastSpId($lastSpId); + + // set the Escher object + $this->_writerWorksheets[$sheetIndex]->setEscher($escher); + } + } + + /** + * Build the Escher object corresponding to the MSODRAWINGGROUP record + */ + private function _buildWorkbookEscher() + { + $escher = null; + + // any drawings in this workbook? + $found = false; + foreach ($this->_phpExcel->getAllSheets() as $sheet) { + if (count($sheet->getDrawingCollection()) > 0) { + $found = true; + } + } + + // nothing to do if there are no drawings + if (!$found) { + return; + } + + // if we reach here, then there are drawings in the workbook + $escher = new PHPExcel_Shared_Escher(); + + // dggContainer + $dggContainer = new PHPExcel_Shared_Escher_DggContainer(); + $escher->setDggContainer($dggContainer); + + // set IDCLs (identifier clusters) + $dggContainer->setIDCLs($this->_IDCLs); + + // this loop is for determining maximum shape identifier of all drawing + $spIdMax = 0; + $totalCountShapes = 0; + $countDrawings = 0; + + foreach ($this->_phpExcel->getAllsheets() as $sheet) { + $sheetCountShapes = 0; // count number of shapes (minus group shape), in sheet + + if (count($sheet->getDrawingCollection()) > 0) { + ++$countDrawings; + + foreach ($sheet->getDrawingCollection() as $drawing) { + ++$sheetCountShapes; + ++$totalCountShapes; + + $spId = $sheetCountShapes + | ($this->_phpExcel->getIndex($sheet) + 1) << 10; + $spIdMax = max($spId, $spIdMax); + } + } + } + + $dggContainer->setSpIdMax($spIdMax + 1); + $dggContainer->setCDgSaved($countDrawings); + $dggContainer->setCSpSaved($totalCountShapes + $countDrawings); // total number of shapes incl. one group shapes per drawing + + // bstoreContainer + $bstoreContainer = new PHPExcel_Shared_Escher_DggContainer_BstoreContainer(); + $dggContainer->setBstoreContainer($bstoreContainer); + + // the BSE's (all the images) + foreach ($this->_phpExcel->getAllsheets() as $sheet) { + foreach ($sheet->getDrawingCollection() as $drawing) { + if ($drawing instanceof PHPExcel_Worksheet_Drawing) { + + $filename = $drawing->getPath(); + + list($imagesx, $imagesy, $imageFormat) = getimagesize($filename); + + switch ($imageFormat) { + + case 1: // GIF, not supported by BIFF8, we convert to PNG + $blipType = PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_PNG; + $imageResource = imagecreatefromgif($filename); + ob_start(); + imagepng($imageResource); + $blipData = ob_get_contents(); + ob_end_clean(); + break; + + case 2: // JPEG + $blipType = PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_JPEG; + $blipData = file_get_contents($filename); + break; + + case 3: // PNG + $blipType = PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_PNG; + $blipData = file_get_contents($filename); + break; + + case 6: // Windows DIB (BMP), we convert to PNG + $blipType = PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_PNG; + $imageResource = PHPExcel_Shared_Drawing::imagecreatefrombmp($filename); + ob_start(); + imagepng($imageResource); + $blipData = ob_get_contents(); + ob_end_clean(); + break; + + default: continue 2; + + } + + $blip = new PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE_Blip(); + $blip->setData($blipData); + + $BSE = new PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE(); + $BSE->setBlipType($blipType); + $BSE->setBlip($blip); + + $bstoreContainer->addBSE($BSE); + + } else if ($drawing instanceof PHPExcel_Worksheet_MemoryDrawing) { + + switch ($drawing->getRenderingFunction()) { + + case PHPExcel_Worksheet_MemoryDrawing::RENDERING_JPEG: + $blipType = PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_JPEG; + $renderingFunction = 'imagejpeg'; + break; + + case PHPExcel_Worksheet_MemoryDrawing::RENDERING_GIF: + case PHPExcel_Worksheet_MemoryDrawing::RENDERING_PNG: + case PHPExcel_Worksheet_MemoryDrawing::RENDERING_DEFAULT: + $blipType = PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_PNG; + $renderingFunction = 'imagepng'; + break; + + } + + ob_start(); + call_user_func($renderingFunction, $drawing->getImageResource()); + $blipData = ob_get_contents(); + ob_end_clean(); + + $blip = new PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE_Blip(); + $blip->setData($blipData); + + $BSE = new PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE(); + $BSE->setBlipType($blipType); + $BSE->setBlip($blip); + + $bstoreContainer->addBSE($BSE); + } + } + } + + // Set the Escher object + $this->_writerWorkbook->setEscher($escher); + } + } diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel5/BIFFwriter.php b/libraries/PHPExcel/PHPExcel/Writer/Excel5/BIFFwriter.php index 2c0a2d1..e758aeb 100644 --- a/libraries/PHPExcel/PHPExcel/Writer/Excel5/BIFFwriter.php +++ b/libraries/PHPExcel/PHPExcel/Writer/Excel5/BIFFwriter.php @@ -22,7 +22,7 @@ * @package PHPExcel_Writer_Excel5 * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ // Original file header of PEAR::Spreadsheet_Excel_Writer_BIFFwriter (used as the base for this class): diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel5/Escher.php b/libraries/PHPExcel/PHPExcel/Writer/Excel5/Escher.php index 402bd19..3c9c29f 100644 --- a/libraries/PHPExcel/PHPExcel/Writer/Excel5/Escher.php +++ b/libraries/PHPExcel/PHPExcel/Writer/Excel5/Escher.php @@ -22,7 +22,7 @@ * @package PHPExcel_Writer_Excel5 * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ @@ -106,9 +106,12 @@ class PHPExcel_Writer_Excel5_Escher , $this->_object->getCSpSaved() , $this->_object->getCDgSaved() // count total number of drawings saved ); + // add file identifier clusters (one per drawing) - for ($i = 0; $i < $this->_object->getCDgSaved(); ++$i) { - $dggData .= pack('VV', 0, 0); + $IDCLs = $this->_object->getIDCLs(); + + foreach ($IDCLs as $dgId => $maxReducedSpId) { + $dggData .= pack('VV', $dgId, $maxReducedSpId + 1); } $header = pack('vvV', $recVerInstance, $recType, strlen($dggData)); diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel5/Font.php b/libraries/PHPExcel/PHPExcel/Writer/Excel5/Font.php index bb4d201..2928070 100644 --- a/libraries/PHPExcel/PHPExcel/Writer/Excel5/Font.php +++ b/libraries/PHPExcel/PHPExcel/Writer/Excel5/Font.php @@ -22,7 +22,7 @@ * @package PHPExcel_Writer_Excel5 * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel5/Parser.php b/libraries/PHPExcel/PHPExcel/Writer/Excel5/Parser.php index cef650f..eb9891e 100644 --- a/libraries/PHPExcel/PHPExcel/Writer/Excel5/Parser.php +++ b/libraries/PHPExcel/PHPExcel/Writer/Excel5/Parser.php @@ -22,7 +22,7 @@ * @package PHPExcel_Writer_Excel5 * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ // Original file header of PEAR::Spreadsheet_Excel_Writer_Parser (used as the base for this class): @@ -1148,6 +1148,9 @@ class PHPExcel_Writer_Excel5_Parser case "<>": return $token; break; + case "^": + return $token; + break; default: // if it's a reference A1 or $A$1 or $A1 or A$1 if (preg_match('/^\$?[A-Ia-i]?[A-Za-z]\$?[0-9]+$/',$token) and @@ -1288,19 +1291,30 @@ class PHPExcel_Writer_Excel5_Parser $result2 = $this->_expression(); $result = $this->_createTree('ptgUminus', $result2, ''); return $result; + } elseif ($this->_current_token == "+") { + // catch "+" Term + $this->_advance(); + $result2 = $this->_expression(); + $result = $this->_createTree('ptgUplus', $result2, ''); + return $result; } $result = $this->_term(); while (($this->_current_token == "+") or - ($this->_current_token == "-")) { + ($this->_current_token == "-") or + ($this->_current_token == "^")) { /**/ if ($this->_current_token == "+") { $this->_advance(); $result2 = $this->_term(); $result = $this->_createTree('ptgAdd', $result, $result2); - } else { + } elseif ($this->_current_token == "-") { $this->_advance(); $result2 = $this->_term(); $result = $this->_createTree('ptgSub', $result, $result2); + } else { + $this->_advance(); + $result2 = $this->_term(); + $result = $this->_createTree('ptgPower', $result, $result2); } } return $result; diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel5/Workbook.php b/libraries/PHPExcel/PHPExcel/Writer/Excel5/Workbook.php index d26ddee..6e517e6 100644 --- a/libraries/PHPExcel/PHPExcel/Writer/Excel5/Workbook.php +++ b/libraries/PHPExcel/PHPExcel/Writer/Excel5/Workbook.php @@ -22,7 +22,7 @@ * @package PHPExcel_Writer_Excel5 * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ // Original file header of PEAR::Spreadsheet_Excel_Writer_Workbook (used as the base for this class): @@ -182,6 +182,13 @@ class PHPExcel_Writer_Excel5_Workbook extends PHPExcel_Writer_Excel5_BIFFwriter */ private $_colors; + /** + * Escher object corresponding to MSODRAWINGGROUP + * + * @var PHPExcel_Shared_Escher + */ + private $_escher; + /** * Class constructor @@ -1400,143 +1407,9 @@ class PHPExcel_Writer_Excel5_Workbook extends PHPExcel_Writer_Excel5_BIFFwriter */ private function _writeMsoDrawingGroup() { - // any drawings in this workbook? - $found = false; - foreach ($this->_phpExcel->getAllSheets() as $sheet) { - if (count($sheet->getDrawingCollection()) > 0) { - $found = true; - } - } - - // if there are drawings, then we need to write MSODRAWINGGROUP record - if ($found) { - - // create intermediate Escher object - $escher = new PHPExcel_Shared_Escher(); - - // dggContainer - $dggContainer = new PHPExcel_Shared_Escher_DggContainer(); - $escher->setDggContainer($dggContainer); - - // this loop is for determining maximum shape identifier of all drawing - $spIdMax = 0; - $totalCountShapes = 0; - $countDrawings = 0; - - foreach ($this->_phpExcel->getAllsheets() as $sheet) { - $sheetCountShapes = 0; // count number of shapes (minus group shape), in sheet - - if (count($sheet->getDrawingCollection()) > 0) { - ++$countDrawings; - - foreach ($sheet->getDrawingCollection() as $drawing) { - ++$sheetCountShapes; - ++$totalCountShapes; - - $spId = $sheetCountShapes - | ($this->_phpExcel->getIndex($sheet) + 1) << 10; - $spIdMax = max($spId, $spIdMax); - } - } - } - - $dggContainer->setSpIdMax($spIdMax + 1); - $dggContainer->setCDgSaved($countDrawings); - $dggContainer->setCSpSaved($totalCountShapes + $countDrawings); // total number of shapes incl. one group shapes per drawing - - // bstoreContainer - $bstoreContainer = new PHPExcel_Shared_Escher_DggContainer_BstoreContainer(); - $dggContainer->setBstoreContainer($bstoreContainer); - - // the BSE's (all the images) - foreach ($this->_phpExcel->getAllsheets() as $sheet) { - foreach ($sheet->getDrawingCollection() as $drawing) { - if ($drawing instanceof PHPExcel_Worksheet_Drawing) { - - $filename = $drawing->getPath(); - - list($imagesx, $imagesy, $imageFormat) = getimagesize($filename); - - switch ($imageFormat) { - - case 1: // GIF, not supported by BIFF8, we convert to PNG - $blipType = PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_PNG; - $imageResource = imagecreatefromgif($filename); - ob_start(); - imagepng($imageResource); - $blipData = ob_get_contents(); - ob_end_clean(); - break; - - case 2: // JPEG - $blipType = PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_JPEG; - $blipData = file_get_contents($filename); - break; - - case 3: // PNG - $blipType = PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_PNG; - $blipData = file_get_contents($filename); - break; - - case 6: // Windows DIB (BMP), we convert to PNG - $blipType = PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_PNG; - $imageResource = PHPExcel_Shared_Drawing::imagecreatefrombmp($filename); - ob_start(); - imagepng($imageResource); - $blipData = ob_get_contents(); - ob_end_clean(); - break; - - default: continue 2; - - } - - $blip = new PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE_Blip(); - $blip->setData($blipData); - - $BSE = new PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE(); - $BSE->setBlipType($blipType); - $BSE->setBlip($blip); - - $bstoreContainer->addBSE($BSE); - - } else if ($drawing instanceof PHPExcel_Worksheet_MemoryDrawing) { - - switch ($drawing->getRenderingFunction()) { - - case PHPExcel_Worksheet_MemoryDrawing::RENDERING_JPEG: - $blipType = PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_JPEG; - $renderingFunction = 'imagejpeg'; - break; - - case PHPExcel_Worksheet_MemoryDrawing::RENDERING_GIF: - case PHPExcel_Worksheet_MemoryDrawing::RENDERING_PNG: - case PHPExcel_Worksheet_MemoryDrawing::RENDERING_DEFAULT: - $blipType = PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_PNG; - $renderingFunction = 'imagepng'; - break; - - } - - ob_start(); - call_user_func($renderingFunction, $drawing->getImageResource()); - $blipData = ob_get_contents(); - ob_end_clean(); - - $blip = new PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE_Blip(); - $blip->setData($blipData); - - $BSE = new PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE(); - $BSE->setBlipType($blipType); - $BSE->setBlip($blip); - - $bstoreContainer->addBSE($BSE); - } - } - } - - // write the Escher stream from the intermediate Escher object - $writer = new PHPExcel_Writer_Excel5_Escher($escher); + // write the Escher stream if necessary + if (isset($this->_escher)) { + $writer = new PHPExcel_Writer_Excel5_Escher($this->_escher); $data = $writer->close(); $record = 0x00EB; @@ -1544,7 +1417,30 @@ class PHPExcel_Writer_Excel5_Workbook extends PHPExcel_Writer_Excel5_BIFFwriter $header = pack("vv", $record, $length); return $this->writeData($header . $data); + + } else { + return ''; } } + /** + * Get Escher object + * + * @return PHPExcel_Shared_Escher + */ + public function getEscher() + { + return $this->_escher; + } + + /** + * Set Escher object + * + * @param PHPExcel_Shared_Escher $pValue + */ + public function setEscher(PHPExcel_Shared_Escher $pValue = null) + { + $this->_escher = $pValue; + } + } diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel5/Worksheet.php b/libraries/PHPExcel/PHPExcel/Writer/Excel5/Worksheet.php index 646101a..0dd2b00 100644 --- a/libraries/PHPExcel/PHPExcel/Writer/Excel5/Worksheet.php +++ b/libraries/PHPExcel/PHPExcel/Writer/Excel5/Worksheet.php @@ -22,7 +22,7 @@ * @package PHPExcel_Writer_Excel5 * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ // Original file header of PEAR::Spreadsheet_Excel_Writer_Worksheet (used as the base for this class): @@ -186,6 +186,13 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter private $_countCellStyleXfs; /** + * Escher object corresponding to MSODRAWING + * + * @var PHPExcel_Shared_Escher + */ + private $_escher; + + /** * Constructor * * @param int $BIFF_version BIFF version @@ -2694,142 +2701,82 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter } /** - * Write MSODRAWING record + * Get Escher object + * + * @return PHPExcel_Shared_Escher */ - private function _writeMsoDrawing() + public function getEscher() { - // check if there are any shapes for this sheet - if (count($this->_phpSheet->getDrawingCollection()) == 0) { - return; - } - - // create intermediate Escher object - $escher = new PHPExcel_Shared_Escher(); - - // dgContainer - $dgContainer = new PHPExcel_Shared_Escher_DgContainer(); - - // set the drawing index (we use sheet index + 1) - $dgContainer->setDgId($this->_phpSheet->getParent()->getIndex($this->_phpSheet) + 1); - $escher->setDgContainer($dgContainer); - - // spgrContainer - $spgrContainer = new PHPExcel_Shared_Escher_DgContainer_SpgrContainer(); - $dgContainer->setSpgrContainer($spgrContainer); - - // add one shape which is the group shape - $spContainer = new PHPExcel_Shared_Escher_DgContainer_SpgrContainer_SpContainer(); - $spContainer->setSpgr(true); - $spContainer->setSpType(0); - $spContainer->setSpId(($this->_phpSheet->getParent()->getIndex($this->_phpSheet) + 1) << 10); - $spgrContainer->addChild($spContainer); - - // add the shapes - - // outer loop is for determining BSE index - $blipIndex = 0; // 1-based index to BstoreContainer - - $countShapes = 0; // count number of shapes (minus group shape), in this sheet - - foreach ($this->_phpSheet->getParent()->getAllsheets() as $sheet) { - foreach ($sheet->getDrawingCollection() as $drawing) { - ++$blipIndex; - - if ($sheet === $this->_phpSheet) { - ++$countShapes; - - // add the shape - $spContainer = new PHPExcel_Shared_Escher_DgContainer_SpgrContainer_SpContainer(); - - // set the shape type - $spContainer->setSpType(0x004B); - - // set the shape index (we combine 1-based sheet index and $countShapes to create unique shape index) - $spId = $countShapes - | ($this->_phpSheet->getParent()->getIndex($this->_phpSheet) + 1) << 10; - $spContainer->setSpId($spId); - - // keep track of last spId - $lastSpId = $spId; - - // set the BLIP index - $spContainer->setOPT(0x4104, $blipIndex); - - // set coordinates and offsets, client anchor - $coordinates = $drawing->getCoordinates(); - $offsetX = $drawing->getOffsetX(); - $offsetY = $drawing->getOffsetY(); - $width = $drawing->getWidth(); - $height = $drawing->getHeight(); - - $twoAnchor = PHPExcel_Shared_Excel5::oneAnchor2twoAnchor($this->_phpSheet, $coordinates, $offsetX, $offsetY, $width, $height); + return $this->_escher; + } - $spContainer->setStartCoordinates($twoAnchor['startCoordinates']); - $spContainer->setStartOffsetX($twoAnchor['startOffsetX']); - $spContainer->setStartOffsetY($twoAnchor['startOffsetY']); - $spContainer->setEndCoordinates($twoAnchor['endCoordinates']); - $spContainer->setEndOffsetX($twoAnchor['endOffsetX']); - $spContainer->setEndOffsetY($twoAnchor['endOffsetY']); + /** + * Set Escher object + * + * @param PHPExcel_Shared_Escher $pValue + */ + public function setEscher(PHPExcel_Shared_Escher $pValue = null) + { + $this->_escher = $pValue; + } - $spgrContainer->addChild($spContainer); - } + /** + * Write MSODRAWING record + */ + private function _writeMsoDrawing() + { + // write the Escher stream if necessary + if (isset($this->_escher)) { + $writer = new PHPExcel_Writer_Excel5_Escher($this->_escher); + $data = $writer->close(); + $spOffsets = $writer->getSpOffsets(); + + // write the neccesary MSODRAWING, OBJ records + + // split the Escher stream + $spOffsets[0] = 0; + $nm = count($spOffsets) - 1; // number of shapes excluding first shape + for ($i = 1; $i <= $nm; ++$i) { + // MSODRAWING record + $record = 0x00EC; // Record identifier + + // chunk of Escher stream for one shape + + $dataChunk = substr($data, $spOffsets[$i -1], $spOffsets[$i] - $spOffsets[$i - 1]); + + $length = strlen($dataChunk); + $header = pack("vv", $record, $length); + + $this->_append($header . $dataChunk); + + // OBJ record + $record = 0x005D; // record identifier + $objData = ''; + + // ftCmo + $objData .= + pack('vvvvvVVV' + , 0x0015 // 0x0015 = ftCmo + , 0x0012 // length of ftCmo data + , 0x0008 // object type, 0x0008 = picture + , $i // object id number, Excel seems to use 1-based index, local for the sheet + , 0x6011 // option flags, 0x6011 is what OpenOffice.org uses + , 0 // reserved + , 0 // reserved + , 0 // reserved + ); + // ftEnd + $objData .= + pack('vv' + , 0x0000 // 0x0000 = ftEnd + , 0x0000 // length of ftEnd data + ); + + $length = strlen($objData); + $header = pack('vv', $record, $length); + $this->_append($header . $objData); } } - - // set last shape index - $dgContainer->setLastSpId($lastSpId); - - // write the Escher stream - $writer = new PHPExcel_Writer_Excel5_Escher($escher); - $data = $writer->close(); - $spOffsets = $writer->getSpOffsets(); - - // write the neccesary MSODRAWING, OBJ records - - // split the Escher stream - $spOffsets[0] = 0; - $nm = count($spOffsets) - 1; // number of shapes excluding first shape - for ($i = 1; $i <= $nm; ++$i) { - // MSODRAWING record - $record = 0x00EC; // Record identifier - - // chunk of Escher stream for one shape - - $dataChunk = substr($data, $spOffsets[$i -1], $spOffsets[$i] - $spOffsets[$i - 1]); - - $length = strlen($dataChunk); - $header = pack("vv", $record, $length); - - $this->_append($header . $dataChunk); - - // OBJ record - $record = 0x005D; // record identifier - $objData = ''; - - // ftCmo - $objData .= - pack('vvvvvVVV' - , 0x0015 // 0x0015 = ftCmo - , 0x0012 // length of ftCmo data - , 0x0008 // object type, 0x0008 = picture - , $i // object id number, Excel seems to use 1-based index, local for the sheet - , 0x6011 // option flags, 0x6011 is what OpenOffice.org uses - , 0 // reserved - , 0 // reserved - , 0 // reserved - ); - // ftEnd - $objData .= - pack('vv' - , 0x0000 // 0x0000 = ftEnd - , 0x0000 // length of ftEnd data - ); - - $length = strlen($objData); - $header = pack('vv', $record, $length); - $this->_append($header . $objData); - } - } /** @@ -3006,4 +2953,4 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter return 0; } -} +} \ No newline at end of file diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel5/Xf.php b/libraries/PHPExcel/PHPExcel/Writer/Excel5/Xf.php index 9246a34..27632f3 100644 --- a/libraries/PHPExcel/PHPExcel/Writer/Excel5/Xf.php +++ b/libraries/PHPExcel/PHPExcel/Writer/Excel5/Xf.php @@ -22,7 +22,7 @@ * @package PHPExcel_Writer_Excel5 * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ // Original file header of PEAR::Spreadsheet_Excel_Writer_Format (used as the base for this class): diff --git a/libraries/PHPExcel/PHPExcel/Writer/HTML.php b/libraries/PHPExcel/PHPExcel/Writer/HTML.php index 3c892cf..b6667f5 100644 --- a/libraries/PHPExcel/PHPExcel/Writer/HTML.php +++ b/libraries/PHPExcel/PHPExcel/Writer/HTML.php @@ -22,7 +22,7 @@ * @package PHPExcel_Writer * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ @@ -152,6 +152,8 @@ class PHPExcel_Writer_HTML implements PHPExcel_Writer_IWriter { // garbage collect $this->_phpExcel->garbageCollect(); + $saveDebugLog = PHPExcel_Calculation::getInstance()->writeDebugLog; + PHPExcel_Calculation::getInstance()->writeDebugLog = false; $saveArrayReturnType = PHPExcel_Calculation::getArrayReturnType(); PHPExcel_Calculation::setArrayReturnType(PHPExcel_Calculation::RETURN_ARRAY_AS_VALUE); @@ -182,6 +184,7 @@ class PHPExcel_Writer_HTML implements PHPExcel_Writer_IWriter { fclose($fileHandle); PHPExcel_Calculation::setArrayReturnType($saveArrayReturnType); + PHPExcel_Calculation::getInstance()->writeDebugLog = $saveDebugLog; } /** @@ -330,7 +333,7 @@ class PHPExcel_Writer_HTML implements PHPExcel_Writer_IWriter { // row min,max $rowMin = $dimension[0][1]; $rowMax = $dimension[1][1]; - + // calculate start of <tbody>, <thead> $tbodyStart = $rowMin; $tbodyEnd = $rowMax; @@ -338,7 +341,7 @@ class PHPExcel_Writer_HTML implements PHPExcel_Writer_IWriter { $theadEnd = 0; // default: no </thead> if ($sheet->getPageSetup()->isRowsToRepeatAtTopSet()) { $rowsToRepeatAtTop = $sheet->getPageSetup()->getRowsToRepeatAtTop(); - + // we can only support repeating rows that start at top row if ($rowsToRepeatAtTop[0] == 1) { $theadStart = $rowsToRepeatAtTop[0]; @@ -346,7 +349,7 @@ class PHPExcel_Writer_HTML implements PHPExcel_Writer_IWriter { $tbodyStart = $rowsToRepeatAtTop[1] + 1; } } - + // Loop through cells $rowData = null; for ($row = $rowMin; $row <= $rowMax; ++$row) { diff --git a/libraries/PHPExcel/PHPExcel/Writer/IWriter.php b/libraries/PHPExcel/PHPExcel/Writer/IWriter.php index ec5331e..35fd689 100644 --- a/libraries/PHPExcel/PHPExcel/Writer/IWriter.php +++ b/libraries/PHPExcel/PHPExcel/Writer/IWriter.php @@ -22,7 +22,7 @@ * @package PHPExcel_Writer * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Writer/PDF.php b/libraries/PHPExcel/PHPExcel/Writer/PDF.php index 570ce9d..f588635 100644 --- a/libraries/PHPExcel/PHPExcel/Writer/PDF.php +++ b/libraries/PHPExcel/PHPExcel/Writer/PDF.php @@ -22,7 +22,7 @@ * @package PHPExcel_Writer * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Writer/Serialized.php b/libraries/PHPExcel/PHPExcel/Writer/Serialized.php index 603c4f7..51616b4 100644 --- a/libraries/PHPExcel/PHPExcel/Writer/Serialized.php +++ b/libraries/PHPExcel/PHPExcel/Writer/Serialized.php @@ -22,7 +22,7 @@ * @package PHPExcel_Writer * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ @@ -163,10 +163,10 @@ class PHPExcel_Writer_Serialized implements PHPExcel_Writer_IWriter // PHPExcel $objWriter->startElement('PHPExcel'); - $objWriter->writeAttribute('version', '1.7.3c'); + $objWriter->writeAttribute('version', '1.7.4'); // Comment - $objWriter->writeComment('This file has been generated using PHPExcel v1.7.3c (http://www.codeplex.com/PHPExcel) It contains a base64 encoded serialized version of the PHPExcel internal object.'); + $objWriter->writeComment('This file has been generated using PHPExcel v1.7.4 (http://www.codeplex.com/PHPExcel) It contains a base64 encoded serialized version of the PHPExcel internal object.'); // Data $objWriter->startElement('data'); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_7-9-gadaa35a
by Dieter Adriaenssens 11 Sep '10

11 Sep '10

The branch, QA_3_3 has been updated via adaa35a87feeaf079d4178bb471073e0e19a75b6 (commit) from f5879655d58812b978dc975e5dc8d8497d11a3c3 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/PHPExcel/PHPExcel.php | 4 +- libraries/PHPExcel/PHPExcel/Autoloader.php | 2 +- .../PHPExcel/PHPExcel/CachedObjectStorage/APC.php | 45 +++- .../PHPExcel/CachedObjectStorage/CacheBase.php | 35 ++- .../PHPExcel/CachedObjectStorage/DiscISAM.php | 28 ++- .../PHPExcel/CachedObjectStorage/ICache.php | 9 +- .../PHPExcel/CachedObjectStorage/Memcache.php | 53 +++- .../PHPExcel/CachedObjectStorage/Memory.php | 2 +- .../PHPExcel/CachedObjectStorage/MemoryGZip.php | 2 +- .../CachedObjectStorage/MemorySerialized.php | 2 +- .../PHPExcel/CachedObjectStorage/PHPTemp.php | 26 ++- .../PHPExcel/CachedObjectStorage/Wincache.php | 58 +++- libraries/PHPExcel/PHPExcel/Calculation.php | 105 +++++-- .../PHPExcel/PHPExcel/Calculation/Exception.php | 2 +- .../PHPExcel/Calculation/ExceptionHandler.php | 2 +- .../PHPExcel/Calculation/FormulaParser.php | 2 +- .../PHPExcel/PHPExcel/Calculation/FormulaToken.php | 2 +- .../PHPExcel/PHPExcel/Calculation/Function.php | 2 +- .../PHPExcel/PHPExcel/Calculation/Functions.php | 175 ++++++------- libraries/PHPExcel/PHPExcel/Cell.php | 296 ++++++++++---------- .../PHPExcel/PHPExcel/Cell/AdvancedValueBinder.php | 2 +- libraries/PHPExcel/PHPExcel/Cell/DataType.php | 2 +- .../PHPExcel/PHPExcel/Cell/DataValidation.php | 2 +- .../PHPExcel/PHPExcel/Cell/DefaultValueBinder.php | 2 +- libraries/PHPExcel/PHPExcel/Cell/Hyperlink.php | 2 +- libraries/PHPExcel/PHPExcel/Cell/IValueBinder.php | 2 +- libraries/PHPExcel/PHPExcel/Comment.php | 2 +- libraries/PHPExcel/PHPExcel/DocumentProperties.php | 93 ++++--- libraries/PHPExcel/PHPExcel/DocumentSecurity.php | 2 +- libraries/PHPExcel/PHPExcel/HashTable.php | 2 +- libraries/PHPExcel/PHPExcel/IComparable.php | 2 +- libraries/PHPExcel/PHPExcel/IOFactory.php | 2 +- libraries/PHPExcel/PHPExcel/NamedRange.php | 2 +- libraries/PHPExcel/PHPExcel/Reader/CSV.php | 2 +- .../PHPExcel/PHPExcel/Reader/DefaultReadFilter.php | 2 +- .../PHPExcel/PHPExcel/Reader/Excel2003XML.php | 7 +- libraries/PHPExcel/PHPExcel/Reader/Excel2007.php | 55 +++- libraries/PHPExcel/PHPExcel/Reader/Excel5.php | 77 +++--- .../PHPExcel/PHPExcel/Reader/Excel5/Escher.php | 2 +- libraries/PHPExcel/PHPExcel/Reader/IReadFilter.php | 2 +- libraries/PHPExcel/PHPExcel/Reader/IReader.php | 2 +- libraries/PHPExcel/PHPExcel/Reader/OOCalc.php | 15 +- libraries/PHPExcel/PHPExcel/Reader/SYLK.php | 2 +- libraries/PHPExcel/PHPExcel/Reader/Serialized.php | 2 +- libraries/PHPExcel/PHPExcel/ReferenceHelper.php | 161 ++++++++--- libraries/PHPExcel/PHPExcel/RichText.php | 2 +- .../PHPExcel/PHPExcel/RichText/ITextElement.php | 2 +- libraries/PHPExcel/PHPExcel/RichText/Run.php | 2 +- .../PHPExcel/PHPExcel/RichText/TextElement.php | 2 +- libraries/PHPExcel/PHPExcel/Settings.php | 2 +- libraries/PHPExcel/PHPExcel/Shared/CodePage.php | 2 +- libraries/PHPExcel/PHPExcel/Shared/Date.php | 2 +- libraries/PHPExcel/PHPExcel/Shared/Drawing.php | 2 +- libraries/PHPExcel/PHPExcel/Shared/Escher.php | 2 +- .../PHPExcel/Shared/Escher/DgContainer.php | 2 +- .../Shared/Escher/DgContainer/SpgrContainer.php | 2 +- .../DgContainer/SpgrContainer/SpContainer.php | 2 +- .../PHPExcel/Shared/Escher/DggContainer.php | 28 ++- .../Shared/Escher/DggContainer/BstoreContainer.php | 2 +- .../Escher/DggContainer/BstoreContainer/BSE.php | 2 +- .../DggContainer/BstoreContainer/BSE/Blip.php | 2 +- libraries/PHPExcel/PHPExcel/Shared/Excel5.php | 2 +- libraries/PHPExcel/PHPExcel/Shared/File.php | 21 +- libraries/PHPExcel/PHPExcel/Shared/Font.php | 2 +- .../PHPExcel/Shared/OLE/ChainedBlockStream.php | 2 +- libraries/PHPExcel/PHPExcel/Shared/OLERead.php | 2 +- .../PHPExcel/PHPExcel/Shared/PasswordHasher.php | 2 +- libraries/PHPExcel/PHPExcel/Shared/String.php | 4 +- libraries/PHPExcel/PHPExcel/Shared/XMLWriter.php | 11 +- .../PHPExcel/PHPExcel/Shared/ZipStreamWrapper.php | 2 +- .../PHPExcel/Shared/trend/bestFitClass.php | 2 +- .../Shared/trend/exponentialBestFitClass.php | 2 +- .../PHPExcel/Shared/trend/linearBestFitClass.php | 2 +- .../Shared/trend/logarithmicBestFitClass.php | 2 +- .../Shared/trend/polynomialBestFitClass.php | 2 +- .../PHPExcel/Shared/trend/powerBestFitClass.php | 2 +- libraries/PHPExcel/PHPExcel/Style.php | 4 +- libraries/PHPExcel/PHPExcel/Style/Alignment.php | 4 +- libraries/PHPExcel/PHPExcel/Style/Border.php | 4 +- libraries/PHPExcel/PHPExcel/Style/Borders.php | 4 +- libraries/PHPExcel/PHPExcel/Style/Color.php | 4 +- libraries/PHPExcel/PHPExcel/Style/Conditional.php | 2 +- libraries/PHPExcel/PHPExcel/Style/Fill.php | 4 +- libraries/PHPExcel/PHPExcel/Style/Font.php | 4 +- libraries/PHPExcel/PHPExcel/Style/NumberFormat.php | 4 +- libraries/PHPExcel/PHPExcel/Style/Protection.php | 2 +- libraries/PHPExcel/PHPExcel/Worksheet.php | 15 +- .../PHPExcel/PHPExcel/Worksheet/BaseDrawing.php | 2 +- .../PHPExcel/PHPExcel/Worksheet/CellIterator.php | 2 +- .../PHPExcel/Worksheet/ColumnDimension.php | 2 +- libraries/PHPExcel/PHPExcel/Worksheet/Drawing.php | 2 +- .../PHPExcel/PHPExcel/Worksheet/Drawing/Shadow.php | 2 +- .../PHPExcel/PHPExcel/Worksheet/HeaderFooter.php | 2 +- .../PHPExcel/Worksheet/HeaderFooterDrawing.php | 2 +- .../PHPExcel/PHPExcel/Worksheet/MemoryDrawing.php | 2 +- .../PHPExcel/PHPExcel/Worksheet/PageMargins.php | 2 +- .../PHPExcel/PHPExcel/Worksheet/PageSetup.php | 213 ++++++++++++--- .../PHPExcel/PHPExcel/Worksheet/Protection.php | 2 +- libraries/PHPExcel/PHPExcel/Worksheet/Row.php | 2 +- .../PHPExcel/PHPExcel/Worksheet/RowDimension.php | 2 +- .../PHPExcel/PHPExcel/Worksheet/RowIterator.php | 2 +- .../PHPExcel/PHPExcel/Worksheet/SheetView.php | 2 +- libraries/PHPExcel/PHPExcel/WorksheetIterator.php | 2 +- libraries/PHPExcel/PHPExcel/Writer/CSV.php | 5 +- libraries/PHPExcel/PHPExcel/Writer/Excel2007.php | 5 +- .../PHPExcel/Writer/Excel2007/Comments.php | 2 +- .../PHPExcel/Writer/Excel2007/ContentTypes.php | 2 +- .../PHPExcel/Writer/Excel2007/DocProps.php | 2 +- .../PHPExcel/PHPExcel/Writer/Excel2007/Drawing.php | 2 +- .../PHPExcel/PHPExcel/Writer/Excel2007/Rels.php | 2 +- .../PHPExcel/Writer/Excel2007/StringTable.php | 2 +- .../PHPExcel/PHPExcel/Writer/Excel2007/Style.php | 2 +- .../PHPExcel/PHPExcel/Writer/Excel2007/Theme.php | 2 +- .../PHPExcel/Writer/Excel2007/Workbook.php | 2 +- .../PHPExcel/Writer/Excel2007/Worksheet.php | 15 +- .../PHPExcel/Writer/Excel2007/WriterPart.php | 2 +- libraries/PHPExcel/PHPExcel/Writer/Excel5.php | 285 ++++++++++++++++++- .../PHPExcel/PHPExcel/Writer/Excel5/BIFFwriter.php | 2 +- .../PHPExcel/PHPExcel/Writer/Excel5/Escher.php | 9 +- libraries/PHPExcel/PHPExcel/Writer/Excel5/Font.php | 2 +- .../PHPExcel/PHPExcel/Writer/Excel5/Parser.php | 20 ++- .../PHPExcel/PHPExcel/Writer/Excel5/Workbook.php | 172 +++--------- .../PHPExcel/PHPExcel/Writer/Excel5/Worksheet.php | 211 ++++++--------- libraries/PHPExcel/PHPExcel/Writer/Excel5/Xf.php | 2 +- libraries/PHPExcel/PHPExcel/Writer/HTML.php | 11 +- libraries/PHPExcel/PHPExcel/Writer/IWriter.php | 2 +- libraries/PHPExcel/PHPExcel/Writer/PDF.php | 2 +- libraries/PHPExcel/PHPExcel/Writer/Serialized.php | 6 +- 129 files changed, 1563 insertions(+), 917 deletions(-) diff --git a/ChangeLog b/ChangeLog index 42030ef..eeebed1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA 3.3.8.0 (not yet released) - bug #3059311 [import] BIGINT field type added to table analysis +- [core] Update library PHPExcel to version 1.7.4 3.3.7.0 (2010-09-07) - patch #3050492 [PDF scratchboard] Cannot drag table box to the edge after diff --git a/libraries/PHPExcel/PHPExcel.php b/libraries/PHPExcel/PHPExcel.php index 8b9c71f..c54d421 100644 --- a/libraries/PHPExcel/PHPExcel.php +++ b/libraries/PHPExcel/PHPExcel.php @@ -22,7 +22,7 @@ * @package PHPExcel * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ @@ -434,7 +434,7 @@ class PHPExcel // update the cellXfs foreach ($pSheet->getCellCollection(false) as $cellID) { - $cell = $sheet->getCell($cellID); + $cell = $pSheet->getCell($cellID); $cell->setXfIndex( $cell->getXfIndex() + $countCellXfs ); } diff --git a/libraries/PHPExcel/PHPExcel/Autoloader.php b/libraries/PHPExcel/PHPExcel/Autoloader.php index 3821d74..e66ce60 100644 --- a/libraries/PHPExcel/PHPExcel/Autoloader.php +++ b/libraries/PHPExcel/PHPExcel/Autoloader.php @@ -22,7 +22,7 @@ * @package PHPExcel * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ class PHPExcel_Autoloader diff --git a/libraries/PHPExcel/PHPExcel/CachedObjectStorage/APC.php b/libraries/PHPExcel/PHPExcel/CachedObjectStorage/APC.php index 62e3a14..dae46c2 100644 --- a/libraries/PHPExcel/PHPExcel/CachedObjectStorage/APC.php +++ b/libraries/PHPExcel/PHPExcel/CachedObjectStorage/APC.php @@ -22,7 +22,7 @@ * @package PHPExcel_CachedObjectStorage * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ @@ -45,7 +45,7 @@ class PHPExcel_CachedObjectStorage_APC extends PHPExcel_CachedObjectStorage_Cach if (!apc_store($this->_cachePrefix.$this->_currentObjectID.'.cache',serialize($this->_currentObject),$this->_cacheTime)) { $this->__destruct(); - throw new Exception('Failed to store cell in APC'); + throw new Exception('Failed to store cell '.$cellID.' in APC'); } $this->_currentObjectID = $this->_currentObject = null; } // function _storeData() @@ -90,7 +90,7 @@ class PHPExcel_CachedObjectStorage_APC extends PHPExcel_CachedObjectStorage_Cach if ($success === false) { // Entry no longer exists in APC, so clear it from the cache array parent::deleteCacheData($pCoord); - throw new Exception('Cell entry no longer exists in APC'); + throw new Exception('Cell entry '.$cellID.' no longer exists in APC'); } return true; } @@ -117,7 +117,7 @@ class PHPExcel_CachedObjectStorage_APC extends PHPExcel_CachedObjectStorage_Cach if ($obj === false) { // Entry no longer exists in APC, so clear it from the cache array parent::deleteCacheData($pCoord); - throw new Exception('Cell entry no longer exists in APC'); + throw new Exception('Cell entry '.$cellID.' no longer exists in APC'); } } else { // Return null if requested entry doesn't exist in cache @@ -150,6 +150,35 @@ class PHPExcel_CachedObjectStorage_APC extends PHPExcel_CachedObjectStorage_Cach } // function deleteCacheData() + /** + * Clone the cell collection + * + * @return void + */ + public function copyCellCollection(PHPExcel_Worksheet $parent) { + parent::copyCellCollection($parent); + // Get a new id for the new file name + $baseUnique = $this->_getUniqueID(); + $newCachePrefix = substr(md5($baseUnique),0,8).'.'; + $cacheList = $this->getCellList(); + foreach($cacheList as $cellID) { + if ($cellID != $this->_currentObjectID) { + $obj = apc_fetch($this->_cachePrefix.$cellID.'.cache'); + if ($obj === false) { + // Entry no longer exists in APC, so clear it from the cache array + parent::deleteCacheData($cellID); + throw new Exception('Cell entry '.$cellID.' no longer exists in APC'); + } + if (!apc_store($newCachePrefix.$cellID.'.cache',$obj,$this->_cacheTime)) { + $this->__destruct(); + throw new Exception('Failed to store cell '.$cellID.' in APC'); + } + } + } + $this->_cachePrefix = $newCachePrefix; + } // function copyCellCollection() + + public function unsetWorksheetCells() { if(!is_null($this->_currentObject)) { $this->_currentObject->detach(); @@ -170,12 +199,8 @@ class PHPExcel_CachedObjectStorage_APC extends PHPExcel_CachedObjectStorage_Cach $cacheTime = (isset($arguments['cacheTime'])) ? $arguments['cacheTime'] : 600; if (is_null($this->_cachePrefix)) { - if (function_exists('posix_getpid')) { - $baseUnique = posix_getpid(); - } else { - $baseUnique = mt_rand(); - } - $this->_cachePrefix = substr(md5(uniqid($baseUnique,true)),0,8).'.'; + $baseUnique = $this->_getUniqueID(); + $this->_cachePrefix = substr(md5($baseUnique),0,8).'.'; $this->_cacheTime = $cacheTime; parent::__construct($parent); diff --git a/libraries/PHPExcel/PHPExcel/CachedObjectStorage/CacheBase.php b/libraries/PHPExcel/PHPExcel/CachedObjectStorage/CacheBase.php index 9871d90..208ed02 100644 --- a/libraries/PHPExcel/PHPExcel/CachedObjectStorage/CacheBase.php +++ b/libraries/PHPExcel/PHPExcel/CachedObjectStorage/CacheBase.php @@ -22,7 +22,7 @@ * @package PHPExcel_CachedObjectStorage * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ @@ -116,7 +116,7 @@ class PHPExcel_CachedObjectStorage_CacheBase { $this->_currentObjectID = $this->_currentObject = null; } - if (isset($this->_cellCache[$pCoord])) { + if (is_object($this->_cellCache[$pCoord])) { $this->_cellCache[$pCoord]->detach(); unset($this->_cellCache[$pCoord]); } @@ -141,13 +141,34 @@ class PHPExcel_CachedObjectStorage_CacheBase { public function getSortedCellList() { $sortKeys = array(); foreach ($this->_cellCache as $coord => $value) { - preg_match('/^(\w+)(\d+)$/U',$coord,$matches); - list(,$colNum,$rowNum) = $matches; - $sortKeys[$coord] = str_pad($rowNum . str_pad($colNum,3,'@',STR_PAD_LEFT),12,'0',STR_PAD_LEFT); + list($colNum,$rowNum) = sscanf($coord,'%[A-Z]%d'); + $sortKeys[sprintf('%09d%3s',$rowNum,$colNum)] = $coord; } - asort($sortKeys); + ksort($sortKeys); - return array_keys($sortKeys); + return array_values($sortKeys); } // function sortCellList() + + protected function _getUniqueID() { + if (function_exists('posix_getpid')) { + $baseUnique = posix_getpid(); + } else { + $baseUnique = mt_rand(); + } + return uniqid($baseUnique,true); + } + + /** + * Clone the cell collection + * + * @return void + */ + public function copyCellCollection(PHPExcel_Worksheet $parent) { + $this->_parent = $parent; + if ((!is_null($this->_currentObject)) && (is_object($this->_currentObject))) { + $this->_currentObject->attach($parent); + } + } // function copyCellCollection() + } diff --git a/libraries/PHPExcel/PHPExcel/CachedObjectStorage/DiscISAM.php b/libraries/PHPExcel/PHPExcel/CachedObjectStorage/DiscISAM.php index e685607..dff52fa 100644 --- a/libraries/PHPExcel/PHPExcel/CachedObjectStorage/DiscISAM.php +++ b/libraries/PHPExcel/PHPExcel/CachedObjectStorage/DiscISAM.php @@ -22,7 +22,7 @@ * @package PHPExcel_CachedObjectStorage * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ @@ -103,6 +103,24 @@ class PHPExcel_CachedObjectStorage_DiscISAM extends PHPExcel_CachedObjectStorage } // function getCacheData() + /** + * Clone the cell collection + * + * @return void + */ + public function copyCellCollection(PHPExcel_Worksheet $parent) { + parent::copyCellCollection($parent); + // Get a new id for the new file name + $baseUnique = $this->_getUniqueID(); + $newFileName = sys_get_temp_dir().'/PHPExcel.'.$baseUnique.'.cache'; + // Copy the existing cell cache file + copy ($this->_fileName,$newFileName); + $this->_fileName = $newFileName; + // Open the copied cell cache file + $this->_fileHandle = fopen($this->_fileName,'a+'); + } // function copyCellCollection() + + public function unsetWorksheetCells() { if(!is_null($this->_currentObject)) { $this->_currentObject->detach(); @@ -121,12 +139,8 @@ class PHPExcel_CachedObjectStorage_DiscISAM extends PHPExcel_CachedObjectStorage public function __construct(PHPExcel_Worksheet $parent) { parent::__construct($parent); if (is_null($this->_fileHandle)) { - if (function_exists('posix_getpid')) { - $baseUnique = posix_getpid(); - } else { - $baseUnique = mt_rand(); - } - $this->_fileName = sys_get_temp_dir().'/PHPExcel.'.uniqid($baseUnique,true).'.cache'; + $baseUnique = $this->_getUniqueID(); + $this->_fileName = sys_get_temp_dir().'/PHPExcel.'.$baseUnique.'.cache'; $this->_fileHandle = fopen($this->_fileName,'a+'); } } // function __construct() diff --git a/libraries/PHPExcel/PHPExcel/CachedObjectStorage/ICache.php b/libraries/PHPExcel/PHPExcel/CachedObjectStorage/ICache.php index f3282aa..4731b8e 100644 --- a/libraries/PHPExcel/PHPExcel/CachedObjectStorage/ICache.php +++ b/libraries/PHPExcel/PHPExcel/CachedObjectStorage/ICache.php @@ -22,7 +22,7 @@ * @package PHPExcel_CachedObjectStorage * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ @@ -94,4 +94,11 @@ interface PHPExcel_CachedObjectStorage_ICache */ public function getSortedCellList(); + /** + * Clone the cell collection + * + * @return void + */ + public function copyCellCollection(PHPExcel_Worksheet $parent); + } diff --git a/libraries/PHPExcel/PHPExcel/CachedObjectStorage/Memcache.php b/libraries/PHPExcel/PHPExcel/CachedObjectStorage/Memcache.php index f1fc43c..74df8e8 100644 --- a/libraries/PHPExcel/PHPExcel/CachedObjectStorage/Memcache.php +++ b/libraries/PHPExcel/PHPExcel/CachedObjectStorage/Memcache.php @@ -22,7 +22,7 @@ * @package PHPExcel_CachedObjectStorage * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ @@ -49,7 +49,7 @@ class PHPExcel_CachedObjectStorage_Memcache extends PHPExcel_CachedObjectStorage if (!$this->_memcache->replace($this->_cachePrefix.$this->_currentObjectID.'.cache',$obj,NULL,$this->_cacheTime)) { if (!$this->_memcache->add($this->_cachePrefix.$this->_currentObjectID.'.cache',$obj,NULL,$this->_cacheTime)) { $this->__destruct(); - throw new Exception('Failed to store cell in Memcache'); + throw new Exception('Failed to store cell '.$cellID.' in MemCache'); } } $this->_currentObjectID = $this->_currentObject = null; @@ -90,12 +90,12 @@ class PHPExcel_CachedObjectStorage_Memcache extends PHPExcel_CachedObjectStorage if ($this->_currentObjectID == $pCoord) { return true; } - // Check if the requested entry still exists in apc + // Check if the requested entry still exists in Memcache $success = $this->_memcache->get($this->_cachePrefix.$pCoord.'.cache'); if ($success === false) { // Entry no longer exists in Memcache, so clear it from the cache array parent::deleteCacheData($pCoord); - throw new Exception('Cell entry no longer exists in Memcache'); + throw new Exception('Cell entry '.$cellID.' no longer exists in MemCache'); } return true; } @@ -122,7 +122,7 @@ class PHPExcel_CachedObjectStorage_Memcache extends PHPExcel_CachedObjectStorage if ($obj === false) { // Entry no longer exists in Memcache, so clear it from the cache array parent::deleteCacheData($pCoord); - throw new Exception('Cell entry no longer exists in Memcache'); + throw new Exception('Cell entry '.$cellID.' no longer exists in MemCache'); } } else { // Return null if requested entry doesn't exist in cache @@ -155,6 +155,35 @@ class PHPExcel_CachedObjectStorage_Memcache extends PHPExcel_CachedObjectStorage } // function deleteCacheData() + /** + * Clone the cell collection + * + * @return void + */ + public function copyCellCollection(PHPExcel_Worksheet $parent) { + parent::copyCellCollection($parent); + // Get a new id for the new file name + $baseUnique = $this->_getUniqueID(); + $newCachePrefix = substr(md5($baseUnique),0,8).'.'; + $cacheList = $this->getCellList(); + foreach($cacheList as $cellID) { + if ($cellID != $this->_currentObjectID) { + $obj = $this->_memcache->get($this->_cachePrefix.$cellID.'.cache'); + if ($obj === false) { + // Entry no longer exists in Memcache, so clear it from the cache array + parent::deleteCacheData($cellID); + throw new Exception('Cell entry '.$cellID.' no longer exists in MemCache'); + } + if (!$this->_memcache->add($newCachePrefix.$cellID.'.cache',$obj,NULL,$this->_cacheTime)) { + $this->__destruct(); + throw new Exception('Failed to store cell '.$cellID.' in MemCache'); + } + } + } + $this->_cachePrefix = $newCachePrefix; + } // function copyCellCollection() + + public function unsetWorksheetCells() { if(!is_null($this->_currentObject)) { $this->_currentObject->detach(); @@ -177,17 +206,13 @@ class PHPExcel_CachedObjectStorage_Memcache extends PHPExcel_CachedObjectStorage $cacheTime = (isset($arguments['cacheTime'])) ? $arguments['cacheTime'] : 600; if (is_null($this->_cachePrefix)) { - if (function_exists('posix_getpid')) { - $baseUnique = posix_getpid(); - } else { - $baseUnique = mt_rand(); - } - $this->_cachePrefix = substr(md5(uniqid($baseUnique,true)),0,8).'.'; + $baseUnique = $this->_getUniqueID(); + $this->_cachePrefix = substr(md5($baseUnique),0,8).'.'; // Set a new Memcache object and connect to the Memcache server $this->_memcache = new Memcache(); - if (!$this->_memcache->addServer($memcacheServer, $memcachePort, false, 50, 5, 5, true, array($this, 'failureCallback')) { - throw new Exception('Could not connect to Memcache server at '.$memcacheServer.':'.$memcachePort); + if (!$this->_memcache->addServer($memcacheServer, $memcachePort, false, 50, 5, 5, true, array($this, 'failureCallback'))) { + throw new Exception('Could not connect to MemCache server at '.$memcacheServer.':'.$memcachePort); } $this->_cacheTime = $cacheTime; @@ -197,7 +222,7 @@ class PHPExcel_CachedObjectStorage_Memcache extends PHPExcel_CachedObjectStorage public function failureCallback($host, $port) { - throw new Exception('memcache '.$host.':'.$port' failed'); + throw new Exception('memcache '.$host.':'.$port.' failed'); } diff --git a/libraries/PHPExcel/PHPExcel/CachedObjectStorage/Memory.php b/libraries/PHPExcel/PHPExcel/CachedObjectStorage/Memory.php index be0fade..4b59b91 100644 --- a/libraries/PHPExcel/PHPExcel/CachedObjectStorage/Memory.php +++ b/libraries/PHPExcel/PHPExcel/CachedObjectStorage/Memory.php @@ -22,7 +22,7 @@ * @package PHPExcel_CachedObjectStorage * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/CachedObjectStorage/MemoryGZip.php b/libraries/PHPExcel/PHPExcel/CachedObjectStorage/MemoryGZip.php index c281389..394faf2 100644 --- a/libraries/PHPExcel/PHPExcel/CachedObjectStorage/MemoryGZip.php +++ b/libraries/PHPExcel/PHPExcel/CachedObjectStorage/MemoryGZip.php @@ -22,7 +22,7 @@ * @package PHPExcel_CachedObjectStorage * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/CachedObjectStorage/MemorySerialized.php b/libraries/PHPExcel/PHPExcel/CachedObjectStorage/MemorySerialized.php index 9c29ea2..0b5b997 100644 --- a/libraries/PHPExcel/PHPExcel/CachedObjectStorage/MemorySerialized.php +++ b/libraries/PHPExcel/PHPExcel/CachedObjectStorage/MemorySerialized.php @@ -22,7 +22,7 @@ * @package PHPExcel_CachedObjectStorage * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/CachedObjectStorage/PHPTemp.php b/libraries/PHPExcel/PHPExcel/CachedObjectStorage/PHPTemp.php index 98cd952..54810d8 100644 --- a/libraries/PHPExcel/PHPExcel/CachedObjectStorage/PHPTemp.php +++ b/libraries/PHPExcel/PHPExcel/CachedObjectStorage/PHPTemp.php @@ -22,7 +22,7 @@ * @package PHPExcel_CachedObjectStorage * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ @@ -38,6 +38,8 @@ class PHPExcel_CachedObjectStorage_PHPTemp extends PHPExcel_CachedObjectStorage_ private $_fileHandle = null; + private $_memoryCacheSize = null; + private function _storeData() { $this->_currentObject->detach(); @@ -102,6 +104,24 @@ class PHPExcel_CachedObjectStorage_PHPTemp extends PHPExcel_CachedObjectStorage_ } // function getCacheData() + /** + * Clone the cell collection + * + * @return void + */ + public function copyCellCollection(PHPExcel_Worksheet $parent) { + parent::copyCellCollection($parent); + // Open a new stream for the cell cache data + $newFileHandle = fopen('php://temp/maxmemory:'.$this->_memoryCacheSize,'a+'); + // Copy the existing cell cache data to the new stream + fseek($this->_fileHandle,0); + while (!feof($this->_fileHandle)) { + fwrite($newFileHandle,fread($this->_fileHandle, 1024)); + } + $this->_fileHandle = $newFileHandle; + } // function copyCellCollection() + + public function unsetWorksheetCells() { if(!is_null($this->_currentObject)) { $this->_currentObject->detach(); @@ -118,11 +138,11 @@ class PHPExcel_CachedObjectStorage_PHPTemp extends PHPExcel_CachedObjectStorage_ public function __construct(PHPExcel_Worksheet $parent, $memoryCacheSize = '1MB') { - $memoryCacheSize = (isset($arguments['memoryCacheSize'])) ? $arguments['memoryCacheSize'] : '1MB'; + $this->_memoryCacheSize = (isset($arguments['memoryCacheSize'])) ? $arguments['memoryCacheSize'] : '1MB'; parent::__construct($parent); if (is_null($this->_fileHandle)) { - $this->_fileHandle = fopen('php://temp/maxmemory:'.$memoryCacheSize,'a+'); + $this->_fileHandle = fopen('php://temp/maxmemory:'.$this->_memoryCacheSize,'a+'); } } // function __construct() diff --git a/libraries/PHPExcel/PHPExcel/CachedObjectStorage/Wincache.php b/libraries/PHPExcel/PHPExcel/CachedObjectStorage/Wincache.php index d759d7c..aa075be 100644 --- a/libraries/PHPExcel/PHPExcel/CachedObjectStorage/Wincache.php +++ b/libraries/PHPExcel/PHPExcel/CachedObjectStorage/Wincache.php @@ -22,7 +22,7 @@ * @package PHPExcel_CachedObjectStorage * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ @@ -45,9 +45,15 @@ class PHPExcel_CachedObjectStorage_Wincache extends PHPExcel_CachedObjectStorage $obj = serialize($this->_currentObject); if (wincache_ucache_exists($this->_cachePrefix.$this->_currentObjectID.'.cache')) { - wincache_ucache_set($this->_cachePrefix.$this->_currentObjectID.'.cache', $obj, $this->_cacheTime); + if (!wincache_ucache_set($this->_cachePrefix.$this->_currentObjectID.'.cache', $obj, $this->_cacheTime)) { + $this->__destruct(); + throw new Exception('Failed to store cell '.$cellID.' in WinCache'); + } } else { - wincache_ucache_add($this->_cachePrefix.$this->_currentObjectID.'.cache', $obj, $this->_cacheTime); + if (!wincache_ucache_add($this->_cachePrefix.$this->_currentObjectID.'.cache', $obj, $this->_cacheTime)) { + $this->__destruct(); + throw new Exception('Failed to store cell '.$cellID.' in WinCache'); + } } $this->_currentObjectID = $this->_currentObject = null; @@ -93,7 +99,7 @@ class PHPExcel_CachedObjectStorage_Wincache extends PHPExcel_CachedObjectStorage if ($success === false) { // Entry no longer exists in Wincache, so clear it from the cache array parent::deleteCacheData($pCoord); - throw new Exception('Cell entry no longer exists in Wincache'); + throw new Exception('Cell entry '.$cellID.' no longer exists in WinCache'); } return true; } @@ -120,9 +126,9 @@ class PHPExcel_CachedObjectStorage_Wincache extends PHPExcel_CachedObjectStorage $success = false; $obj = wincache_ucache_get($this->_cachePrefix.$pCoord.'.cache', $success); if ($success === false) { - // Entry no longer exists in Wincache, so clear it from the cache array + // Entry no longer exists in WinCache, so clear it from the cache array parent::deleteCacheData($pCoord); - throw new Exception('Cell entry no longer exists in Wincache'); + throw new Exception('Cell entry '.$cellID.' no longer exists in WinCache'); } } else { // Return null if requested entry doesn't exist in cache @@ -155,13 +161,43 @@ class PHPExcel_CachedObjectStorage_Wincache extends PHPExcel_CachedObjectStorage } // function deleteCacheData() + /** + * Clone the cell collection + * + * @return void + */ + public function copyCellCollection(PHPExcel_Worksheet $parent) { + parent::copyCellCollection($parent); + // Get a new id for the new file name + $baseUnique = $this->_getUniqueID(); + $newCachePrefix = substr(md5($baseUnique),0,8).'.'; + $cacheList = $this->getCellList(); + foreach($cacheList as $cellID) { + if ($cellID != $this->_currentObjectID) { + $success = false; + $obj = wincache_ucache_get($this->_cachePrefix.$cellID.'.cache', $success); + if ($success === false) { + // Entry no longer exists in WinCache, so clear it from the cache array + parent::deleteCacheData($cellID); + throw new Exception('Cell entry '.$cellID.' no longer exists in Wincache'); + } + if (!wincache_ucache_add($newCachePrefix.$cellID.'.cache', $obj, $this->_cacheTime)) { + $this->__destruct(); + throw new Exception('Failed to store cell '.$cellID.' in Wincache'); + } + } + } + $this->_cachePrefix = $newCachePrefix; + } // function copyCellCollection() + + public function unsetWorksheetCells() { if(!is_null($this->_currentObject)) { $this->_currentObject->detach(); $this->_currentObject = $this->_currentObjectID = null; } - // Flush the Wincache cache + // Flush the WinCache cache $this->__destruct(); $this->_cellCache = array(); @@ -175,12 +211,8 @@ class PHPExcel_CachedObjectStorage_Wincache extends PHPExcel_CachedObjectStorage $cacheTime = (isset($arguments['cacheTime'])) ? $arguments['cacheTime'] : 600; if (is_null($this->_cachePrefix)) { - if (function_exists('posix_getpid')) { - $baseUnique = posix_getpid(); - } else { - $baseUnique = mt_rand(); - } - $this->_cachePrefix = substr(md5(uniqid($baseUnique,true)),0,8).'.'; + $baseUnique = $this->_getUniqueID(); + $this->_cachePrefix = substr(md5($baseUnique),0,8).'.'; $this->_cacheTime = $cacheTime; parent::__construct($parent); diff --git a/libraries/PHPExcel/PHPExcel/Calculation.php b/libraries/PHPExcel/PHPExcel/Calculation.php index 6e8499e..e32891a 100644 --- a/libraries/PHPExcel/PHPExcel/Calculation.php +++ b/libraries/PHPExcel/PHPExcel/Calculation.php @@ -22,7 +22,7 @@ * @package PHPExcel_Calculation * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ @@ -2248,7 +2248,7 @@ class PHPExcel_Calculation { } $this->debugLogStack[] = $wsTitle.'!'.$cellID; // Parse the formula onto the token stack and calculate the value - $cellValue = $this->_processTokenStack($this->_parseFormula($formula), $cellID, $pCell); + $cellValue = $this->_processTokenStack($this->_parseFormula($formula, $pCell), $cellID, $pCell); array_pop($this->debugLogStack); // Save to calculation cache @@ -2462,31 +2462,24 @@ class PHPExcel_Calculation { $value = array_pop($testArray); } - switch (gettype($value)) { - case 'double' : - case 'float' : - $typeString = 'a floating point number'; - break; - case 'integer' : - $typeString = 'an integer number'; - break; - case 'boolean' : - $typeString = 'a boolean'; - break; - case 'array' : - $typeString = 'a matrix'; - break; - case 'string' : - if ($value == '') { - return 'an empty string'; - } elseif ($value{0} == '#') { - return 'a '.$value.' error'; - } else { - $typeString = 'a string'; - } - break; - case 'NULL' : - return 'a null value'; + if (is_null($value)) { + return 'a null value'; + } elseif (is_float($value)) { + $typeString = 'a floating point number'; + } elseif(is_int($value)) { + $typeString = 'an integer number'; + } elseif(is_bool($value)) { + $typeString = 'a boolean'; + } elseif(is_array($value)) { + $typeString = 'a matrix'; + } else { + if ($value == '') { + return 'an empty string'; + } elseif ($value{0} == '#') { + return 'a '.$value.' error'; + } else { + $typeString = 'a string'; + } } return $typeString.' with a value of '.self::_showValue($value); } // function _showTypeDetails() @@ -2548,11 +2541,15 @@ class PHPExcel_Calculation { // Convert infix to postfix notation - private function _parseFormula($formula) { + private function _parseFormula($formula, PHPExcel_Cell $pCell = null) { if (($formula = self::_convertMatrixReferences(trim($formula))) === false) { return false; } + // If we're using cell caching, then $pCell may well be flushed back to the cache (which detaches the parent worksheet), + // so we store the parent worksheet so that we can re-attach it when necessary + $pCellParent = (!is_null($pCell)) ? $pCell->getParent() : null; + // Binary Operators // These operators always work on two values // Array key is the operator, the value indicates whether this is a left or right associative operator @@ -2774,12 +2771,56 @@ class PHPExcel_Calculation { // echo 'Element '.$val.' is a Cell reference<br />'; // Watch for this case-change when modifying to allow cell references in different worksheets... // Should only be applied to the actual cell column, not the worksheet name + + // If the last entry on the stack was a : operator, then we have a cell range reference + $testPrevOp = $stack->last(1); + if ($testPrevOp['value'] == ':') { + // If we have a worksheet reference, then we're playing with a 3D reference + if ($matches[2] == '') { + // Otherwise, we 'inherit' the worksheet reference from the start cell reference + // The start of the cell range reference should be the last entry in $output + $startCellRef = $output[count($output)-1]['value']; + preg_match('/^'.self::CALCULATION_REGEXP_CELLREF.'$/i', $startCellRef, $startMatches); + if ($startMatches[2] > '') { + $val = $startMatches[2].'!'.$val; + } + } + } $cellRef = strtoupper($val); -// $output[] = $cellRef; + $output[] = array('type' => 'Cell Reference', 'value' => $val, 'reference' => $cellRef); // $expectingOperator = false; } else { // it's a variable, constant, string, number or boolean // echo 'Element is a Variable, Constant, String, Number or Boolean<br />'; + // If the last entry on the stack was a : operator, then we may have a row or column range reference + $testPrevOp = $stack->last(1); + if ($testPrevOp['value'] == ':') { + $startRowColRef = $output[count($output)-1]['value']; + $rangeWS1 = ''; + if (strpos('!',$startRowColRef) !== false) { + list($rangeWS1,$startRowColRef) = explode('!',$startRowColRef); + } + if ($rangeWS1 != '') $rangeWS1 .= '!'; + $rangeWS2 = $rangeWS1; + if (strpos('!',$val) !== false) { + list($rangeWS2,$val) = explode('!',$val); + } + if ($rangeWS2 != '') $rangeWS2 .= '!'; + if ((is_integer($startRowColRef)) && (ctype_digit($val)) && + ($startRowColRef <= 1048576) && ($val <= 1048576)) { + // Row range + $endRowColRef = (!is_null($pCellParent)) ? $pCellParent->getHighestColumn() : 'XFD'; // Max 16,384 columns for Excel2007 + $output[count($output)-1]['value'] = $rangeWS1.'A'.$startRowColRef; + $val = $rangeWS2.$endRowColRef.$val; + } elseif ((ctype_alpha($startRowColRef)) && (ctype_alpha($val)) && + (strlen($startRowColRef) <= 3) && (strlen($val) <= 3)) { + // Column range + $endRowColRef = (!is_null($pCellParent)) ? $pCellParent->getHighestRow() : 1048576; // Max 1,048,576 rows for Excel2007 + $output[count($output)-1]['value'] = $rangeWS1.strtoupper($startRowColRef).'1'; + $val = $rangeWS2.$val.$endRowColRef; + } + } + $localeConstant = false; if ($opCharacter == '"') { // echo 'Element is a String<br />'; @@ -2808,6 +2849,8 @@ class PHPExcel_Calculation { } $index += $length; + } elseif ($opCharacter == '$') { // absolute row or column range + $index++; } elseif ($opCharacter == ')') { // miscellaneous error checking if ($expectingOperand) { $output[] = array('type' => 'Null Value', 'value' => self::$_ExcelConstants['NULL'], 'reference' => NULL); @@ -3067,7 +3110,7 @@ class PHPExcel_Calculation { return $this->_raiseFormulaError('Unable to access Cell Reference'); } $this->_writeDebug('Evaluation Result for cells '.$cellRef.' in worksheet '.$matches[2].' is '.self::_showTypeDetails($cellValue)); - $cellRef = $matches[2].'!'.$cellRef; +// $cellRef = $matches[2].'!'.$cellRef; } else { // echo '$cellRef='.$cellRef.' in current worksheet<br />'; $this->_writeDebug('Evaluating Cell Range '.$cellRef.' in current worksheet'); @@ -3101,7 +3144,7 @@ class PHPExcel_Calculation { return $this->_raiseFormulaError('Unable to access Cell Reference'); } $this->_writeDebug('Evaluation Result for cell '.$cellRef.' in worksheet '.$matches[2].' is '.self::_showTypeDetails($cellValue)); - $cellRef = $matches[2].'!'.$cellRef; +// $cellRef = $matches[2].'!'.$cellRef; } else { // echo '$cellRef='.$cellRef.' in current worksheet<br />'; $this->_writeDebug('Evaluating Cell '.$cellRef.' in current worksheet'); diff --git a/libraries/PHPExcel/PHPExcel/Calculation/Exception.php b/libraries/PHPExcel/PHPExcel/Calculation/Exception.php index 8e77b9d..b94f3f4 100644 --- a/libraries/PHPExcel/PHPExcel/Calculation/Exception.php +++ b/libraries/PHPExcel/PHPExcel/Calculation/Exception.php @@ -22,7 +22,7 @@ * @package PHPExcel_Calculation * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Calculation/ExceptionHandler.php b/libraries/PHPExcel/PHPExcel/Calculation/ExceptionHandler.php index 9956167..7050260 100644 --- a/libraries/PHPExcel/PHPExcel/Calculation/ExceptionHandler.php +++ b/libraries/PHPExcel/PHPExcel/Calculation/ExceptionHandler.php @@ -22,7 +22,7 @@ * @package PHPExcel_Calculation * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ /** diff --git a/libraries/PHPExcel/PHPExcel/Calculation/FormulaParser.php b/libraries/PHPExcel/PHPExcel/Calculation/FormulaParser.php index 8fcde41..271aa75 100644 --- a/libraries/PHPExcel/PHPExcel/Calculation/FormulaParser.php +++ b/libraries/PHPExcel/PHPExcel/Calculation/FormulaParser.php @@ -22,7 +22,7 @@ * @package PHPExcel_Calculation * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Calculation/FormulaToken.php b/libraries/PHPExcel/PHPExcel/Calculation/FormulaToken.php index 69d7f42..8c1396e 100644 --- a/libraries/PHPExcel/PHPExcel/Calculation/FormulaToken.php +++ b/libraries/PHPExcel/PHPExcel/Calculation/FormulaToken.php @@ -22,7 +22,7 @@ * @package PHPExcel_Calculation * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Calculation/Function.php b/libraries/PHPExcel/PHPExcel/Calculation/Function.php index 783e533..81dfc99 100644 --- a/libraries/PHPExcel/PHPExcel/Calculation/Function.php +++ b/libraries/PHPExcel/PHPExcel/Calculation/Function.php @@ -22,7 +22,7 @@ * @package PHPExcel_Calculation * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Calculation/Functions.php b/libraries/PHPExcel/PHPExcel/Calculation/Functions.php index 8ce3cfd..805f483 100644 --- a/libraries/PHPExcel/PHPExcel/Calculation/Functions.php +++ b/libraries/PHPExcel/PHPExcel/Calculation/Functions.php @@ -22,7 +22,7 @@ * @package PHPExcel_Calculation * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ @@ -1885,7 +1885,7 @@ class PHPExcel_Calculation_Functions { } // Return - if (($aCount > 0) && ($returnValue > 0)) { + if (($aCount > 0) && ($returnValue >= 0)) { return sqrt($returnValue / $aCount); } } @@ -1937,7 +1937,7 @@ class PHPExcel_Calculation_Functions { } // Return - if (($aCount > 0) && ($returnValue > 0)) { + if (($aCount > 0) && ($returnValue >= 0)) { return sqrt($returnValue / $aCount); } } @@ -1984,7 +1984,7 @@ class PHPExcel_Calculation_Functions { } // Return - if (($aCount > 0) && ($returnValue > 0)) { + if (($aCount > 0) && ($returnValue >= 0)) { return sqrt($returnValue / $aCount); } } @@ -2036,7 +2036,7 @@ class PHPExcel_Calculation_Functions { } // Return - if (($aCount > 0) && ($returnValue > 0)) { + if (($aCount > 0) && ($returnValue >= 0)) { return sqrt($returnValue / $aCount); } } @@ -5691,7 +5691,7 @@ class PHPExcel_Calculation_Functions { * @return string Version information */ public static function VERSION() { - return 'PHPExcel 1.7.3c, 2010-06-01'; + return 'PHPExcel 1.7.4, 2010-08-26'; } // function VERSION() @@ -11139,112 +11139,101 @@ class PHPExcel_Calculation_Functions { * @return integer The relative position of the found item */ public static function MATCH($lookup_value, $lookup_array, $match_type=1) { - - // flatten the lookup_array $lookup_array = self::flattenArray($lookup_array); - - // flatten lookup_value since it may be a cell reference to a value or the value itself $lookup_value = self::flattenSingleValue($lookup_value); - - // MATCH is not case sensitive + $match_type = (is_null($match_type)) ? 1 : (int) self::flattenSingleValue($match_type); + // MATCH is not case sensitive $lookup_value = strtolower($lookup_value); - /* - echo "--------------------<br>looking for $lookup_value in <br>"; - print_r($lookup_array); - echo "<br>"; - //return 1; - /**/ - - // ** - // check inputs - // ** - // lookup_value type has to be number, text, or logical values - if (!is_numeric($lookup_value) && !is_string($lookup_value) && !is_bool($lookup_value)){ - // error: lookup_array should contain only number, text, or logical values - //echo "error: lookup_array should contain only number, text, or logical values<br>"; + // lookup_value type has to be number, text, or logical values + if ((!is_numeric($lookup_value)) && (!is_string($lookup_value)) && (!is_bool($lookup_value))) { return self::$_errorCodes['na']; } - // match_type is 0, 1 or -1 - if ($match_type!==0 && $match_type!==-1 && $match_type!==1){ - // error: wrong value for match_type - //echo "error: wrong value for match_type<br>"; + // match_type is 0, 1 or -1 + if (($match_type !== 0) && ($match_type !== -1) && ($match_type !== 1)) { return self::$_errorCodes['na']; } - // lookup_array should not be empty - if (sizeof($lookup_array)<=0){ - // error: empty range - //echo "error: empty range ".sizeof($lookup_array)."<br>"; + // lookup_array should not be empty + $lookupArraySize = count($lookup_array); + if ($lookupArraySize <= 0) { return self::$_errorCodes['na']; } - // lookup_array should contain only number, text, or logical values - for ($i=0;$i<sizeof($lookup_array);++$i){ - // check the type of the value - if (!is_numeric($lookup_array[$i]) && !is_string($lookup_array[$i]) && !is_bool($lookup_array[$i])){ - // error: lookup_array should contain only number, text, or logical values - //echo "error: lookup_array should contain only number, text, or logical values<br>"; + // lookup_array should contain only number, text, or logical values, or empty (null) cells + foreach($lookup_array as $i => $lookupArrayValue) { + // check the type of the value + if ((!is_numeric($lookupArrayValue)) && (!is_string($lookupArrayValue)) && + (!is_bool($lookupArrayValue)) && (!is_null($lookupArrayValue))) { return self::$_errorCodes['na']; } - // convert tpo lowercase - if (is_string($lookup_array[$i])) - $lookup_array[$i] = strtolower($lookup_array[$i]); + // convert strings to lowercase for case-insensitive testing + if (is_string($lookupArrayValue)) { + $lookup_array[$i] = strtolower($lookupArrayValue); + } + if ((is_null($lookupArrayValue)) && (($match_type == 1) || ($match_type == -1))) { + $lookup_array = array_slice($lookup_array,0,$i-1); + } } // if match_type is 1 or -1, the list has to be ordered - if($match_type==1 || $match_type==-1){ - // ** - // iniitialization - // store the last value - $iLastValue=$lookup_array[0]; - // ** - // loop on the cells - for ($i=0;$i<sizeof($lookup_array);++$i){ - // check ascending order - if(($match_type==1 && $lookup_array[$i]<$iLastValue) - // OR check descending order - || ($match_type==-1 && $lookup_array[$i]>$iLastValue)){ - // error: list is not ordered correctly - //echo "error: list is not ordered correctly<br>"; - return self::$_errorCodes['na']; - } - } + if ($match_type == 1) { + asort($lookup_array); + $keySet = array_keys($lookup_array); + } elseif($match_type == -1) { + arsort($lookup_array); + $keySet = array_keys($lookup_array); } + // ** // find the match // ** // loop on the cells - for ($i=0; $i < sizeof($lookup_array); ++$i){ - // if match_type is 0 <=> find the first value that is exactly equal to lookup_value - if ($match_type==0 && $lookup_array[$i]==$lookup_value){ - // this is the exact match - return $i+1; - } - // if match_type is -1 <=> find the smallest value that is greater than or equal to lookup_value - if ($match_type==-1 && $lookup_array[$i] < $lookup_value){ - if ($i<1){ +// var_dump($lookup_array); +// echo '<br />'; + foreach($lookup_array as $i => $lookupArrayValue) { + if (($match_type == 0) && ($lookupArrayValue == $lookup_value)) { + // exact match + return ++$i; + } elseif (($match_type == -1) && ($lookupArrayValue <= $lookup_value)) { +// echo '$i = '.$i.' => '; +// var_dump($lookupArrayValue); +// echo '<br />'; +// echo 'Keyset = '; +// var_dump($keySet); +// echo '<br />'; + $i = array_search($i,$keySet); +// echo '$i='.$i.'<br />'; + // if match_type is -1 <=> find the smallest value that is greater than or equal to lookup_value + if ($i < 1){ // 1st cell was allready smaller than the lookup_value break; - } - else + } else { // the previous cell was the match - return $i; - } - // if match_type is 1 <=> find the largest value that is less than or equal to lookup_value - if ($match_type==1 && $lookup_array[$i] > $lookup_value){ - if ($i<1){ + return $keySet[$i-1]+1; + } + } elseif (($match_type == 1) && ($lookupArrayValue >= $lookup_value)) { +// echo '$i = '.$i.' => '; +// var_dump($lookupArrayValue); +// echo '<br />'; +// echo 'Keyset = '; +// var_dump($keySet); +// echo '<br />'; + $i = array_search($i,$keySet); +// echo '$i='.$i.'<br />'; + // if match_type is 1 <=> find the largest value that is less than or equal to lookup_value + if ($i < 1){ // 1st cell was allready bigger than the lookup_value break; - } - else + } else { // the previous cell was the match - return $i; + return $keySet[$i-1]+1; + } } } - // unsuccessful in finding a match, return #N/A error value - //echo "unsuccessful in finding a match<br>"; + + // unsuccessful in finding a match, return #N/A error value return self::$_errorCodes['na']; } // function MATCH() @@ -11378,25 +11367,19 @@ class PHPExcel_Calculation_Functions { } $value = self::flattenSingleValue($value); - switch (gettype($value)) { - case 'double' : - case 'float' : - case 'integer' : + if ((is_float($value)) || (is_int($value))) { return 1; - break; - case 'boolean' : + } elseif(is_bool($value)) { return 4; - break; - case 'array' : + } elseif(is_array($value)) { return 64; break; - case 'string' : - // Errors - if ((strlen($value) > 0) && ($value{0} == '#')) { - return 16; - } - return 2; - break; + } elseif(is_string($value)) { + // Errors + if ((strlen($value) > 0) && ($value{0} == '#')) { + return 16; + } + return 2; } return 0; } // function TYPE() diff --git a/libraries/PHPExcel/PHPExcel/Cell.php b/libraries/PHPExcel/PHPExcel/Cell.php index f8ebf86..b805b8d 100644 --- a/libraries/PHPExcel/PHPExcel/Cell.php +++ b/libraries/PHPExcel/PHPExcel/Cell.php @@ -22,7 +22,7 @@ * @package PHPExcel_Cell * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ @@ -91,6 +91,13 @@ class PHPExcel_Cell */ private $_xfIndex; + /** + * Attributes of the formula + * + * + */ + private $_formulaAttributes; + /** * Send notification to the cache controller @@ -98,6 +105,7 @@ class PHPExcel_Cell **/ public function notifyCacheController() { $this->_parent->getCellCacheController()->updateCacheData($this); + return $this; } public function detach() { @@ -112,11 +120,11 @@ class PHPExcel_Cell /** * Create a new Cell * - * @param string $pColumn - * @param int $pRow - * @param mixed $pValue - * @param string $pDataType - * @param PHPExcel_Worksheet $pSheet + * @param string $pColumn + * @param int $pRow + * @param mixed $pValue + * @param string $pDataType + * @param PHPExcel_Worksheet $pSheet * @throws Exception */ public function __construct($pColumn = 'A', $pRow = 1, $pValue = null, $pDataType = null, PHPExcel_Worksheet $pSheet = null) @@ -189,7 +197,7 @@ class PHPExcel_Cell * * This clears the cell formula. * - * @param mixed $pValue Value + * @param mixed $pValue Value * @return PHPExcel_Cell */ public function setValue($pValue = null) @@ -203,7 +211,7 @@ class PHPExcel_Cell /** * Set cell value (with explicit data type given) * - * @param mixed $pValue Value + * @param mixed $pValue Value * @param string $pDataType Explicit data type * @return PHPExcel_Cell * @throws Exception @@ -242,8 +250,7 @@ class PHPExcel_Cell // set the datatype $this->_dataType = $pDataType; - $this->notifyCacheController(); - return $this; + return $this->notifyCacheController(); } /** @@ -254,7 +261,7 @@ class PHPExcel_Cell public function getCalculatedValue($resetLog=true) { // echo 'Cell '.$this->getCoordinate().' value is a '.$this->_dataType.' with a value of '.$this->getValue().'<br />'; - if (!is_null($this->_calculatedValue) && $this->_dataType == PHPExcel_Cell_DataType::TYPE_FORMULA) { + if ($this->_dataType == PHPExcel_Cell_DataType::TYPE_FORMULA) { try { // echo 'Cell value for '.$this->getCoordinate().' is a formula: Calculating value<br />'; $result = PHPExcel_Calculation::getInstance()->calculateCellValue($this,$resetLog); @@ -262,28 +269,23 @@ class PHPExcel_Cell } catch ( Exception $ex ) { // echo 'Calculation Exception: '.$ex->getMessage().'<br />'; $result = '#N/A'; - throw(new Exception($ex->getMessage())); + throw(new Exception($this->getParent()->getTitle().'!'.$this->getCoordinate().' -> '.$ex->getMessage())); } - if ((is_string($result)) && ($result == '#Not Yet Implemented')) { + if ($result === '#Not Yet Implemented') { // echo 'Returning fallback value of '.$this->_calculatedValue.' for cell '.$this->getCoordinate().'<br />'; return $this->_calculatedValue; // Fallback if calculation engine does not support the formula. - } else { -// echo 'Returning calculated value of '.$result.' for cell '.$this->getCoordinate().'<br />'; - return $result; } +// echo 'Returning calculated value of '.$result.' for cell '.$this->getCoordinate().'<br />'; + return $result; } if (is_null($this->_value)) { // echo 'Cell '.$this->getCoordinate().' has no value, formula or otherwise<br />'; return null; - } else if ($this->_dataType != PHPExcel_Cell_DataType::TYPE_FORMULA) { -// echo 'Cell value for '.$this->getCoordinate().' is not a formula: Returning data value of '.$this->_value.'<br />'; - return $this->_value; - } else { -// echo 'Cell value is a formula: Calculating value<br />'; - return PHPExcel_Calculation::getInstance()->calculateCellValue($this,$resetLog); } +// echo 'Cell value for '.$this->getCoordinate().' is not a formula: Returning data value of '.$this->_value.'<br />'; + return $this->_value; } /** @@ -298,8 +300,7 @@ class PHPExcel_Cell $this->_calculatedValue = $pValue; } - $this->notifyCacheController(); - return $this; + return $this->notifyCacheController(); } /** @@ -332,8 +333,7 @@ class PHPExcel_Cell { $this->_dataType = $pDataType; - $this->notifyCacheController(); - return $this; + return $this->notifyCacheController(); } /** @@ -361,15 +361,14 @@ class PHPExcel_Cell throw new Exception('Cannot get data validation for cell that is not bound to a worksheet'); } - $dataValidation = $this->_parent->getDataValidation($this->getCoordinate()); - return $dataValidation; + return $this->_parent->getDataValidation($this->getCoordinate()); } /** * Set Data validation * - * @param PHPExcel_Cell_DataValidation $pDataValidation - * @throws Exception + * @param PHPExcel_Cell_DataValidation $pDataValidation + * @throws Exception * @return PHPExcel_Cell */ public function setDataValidation(PHPExcel_Cell_DataValidation $pDataValidation = null) @@ -380,45 +379,43 @@ class PHPExcel_Cell $this->_parent->setDataValidation($this->getCoordinate(), $pDataValidation); - $this->notifyCacheController(); - return $this; + return $this->notifyCacheController(); } - /** - * Has Hyperlink - * - * @return boolean - */ - public function hasHyperlink() - { + /** + * Has Hyperlink + * + * @return boolean + */ + public function hasHyperlink() + { if (!isset($this->_parent)) { throw new Exception('Cannot check for hyperlink when cell is not bound to a worksheet'); } return $this->_parent->hyperlinkExists($this->getCoordinate()); - } - - /** - * Get Hyperlink - * - * @throws Exception - * @return PHPExcel_Cell_Hyperlink - */ - public function getHyperlink() - { + } + + /** + * Get Hyperlink + * + * @throws Exception + * @return PHPExcel_Cell_Hyperlink + */ + public function getHyperlink() + { if (!isset($this->_parent)) { throw new Exception('Cannot get hyperlink for cell that is not bound to a worksheet'); } - $hyperlink = $this->_parent->getHyperlink($this->getCoordinate()); - return $hyperlink; - } + return $this->_parent->getHyperlink($this->getCoordinate()); + } /** * Set Hyperlink * - * @param PHPExcel_Cell_Hyperlink $pHyperlink - * @throws Exception + * @param PHPExcel_Cell_Hyperlink $pHyperlink + * @throws Exception * @return PHPExcel_Cell */ public function setHyperlink(PHPExcel_Cell_Hyperlink $pHyperlink = null) @@ -429,9 +426,8 @@ class PHPExcel_Cell $this->_parent->setHyperlink($this->getCoordinate(), $pHyperlink); - $this->notifyCacheController(); - return $this; - } + return $this->notifyCacheController(); + } /** * Get parent @@ -451,94 +447,63 @@ class PHPExcel_Cell public function rebindParent(PHPExcel_Worksheet $parent) { $this->_parent = $parent; - $this->notifyCacheController(); - return $this; + return $this->notifyCacheController(); } /** * Is cell in a specific range? * - * @param string $pRange Cell range (e.g. A1:A1) - * @return boolean + * @param string $pRange Cell range (e.g. A1:A1) + * @return boolean */ public function isInRange($pRange = 'A1:A1') { - // Uppercase coordinate - $pRange = strtoupper($pRange); - - // Extract range - $rangeA = ''; - $rangeB = ''; - if (strpos($pRange, ':') === false) { - $rangeA = $pRange; - $rangeB = $pRange; - } else { - list($rangeA, $rangeB) = explode(':', $pRange); - } - - // Calculate range outer borders - $rangeStart = PHPExcel_Cell::coordinateFromString($rangeA); - $rangeEnd = PHPExcel_Cell::coordinateFromString($rangeB); + list($rangeStart,$rangeEnd) = PHPExcel_Cell::rangeBoundaries($pRange); - // Translate column into index - $rangeStart[0] = PHPExcel_Cell::columnIndexFromString($rangeStart[0]) - 1; - $rangeEnd[0] = PHPExcel_Cell::columnIndexFromString($rangeEnd[0]) - 1; - - // Translate properties - $myColumn = PHPExcel_Cell::columnIndexFromString($this->getColumn()) - 1; - $myRow = $this->getRow(); + // Translate properties + $myColumn = PHPExcel_Cell::columnIndexFromString($this->getColumn()) - 1; + $myRow = $this->getRow(); // Verify if cell is in range - return ( - ($rangeStart[0] <= $myColumn && $rangeEnd[0] >= $myColumn) && - ($rangeStart[1] <= $myRow && $rangeEnd[1] >= $myRow) - ); + return (($rangeStart[0] <= $myColumn) && ($rangeEnd[0] >= $myColumn) && + ($rangeStart[1] <= $myRow) && ($rangeEnd[1] >= $myRow) + ); } /** * Coordinate from string * - * @param string $pCoordinateString - * @return array Array containing column and row (indexes 0 and 1) + * @param string $pCoordinateString + * @return array Array containing column and row (indexes 0 and 1) * @throws Exception */ public static function coordinateFromString($pCoordinateString = 'A1') { if (strpos($pCoordinateString,':') !== false) { throw new Exception('Cell coordinate string can not be a range of cells.'); - } else if ($pCoordinateString == '') { throw new Exception('Cell coordinate can not be zero-length string.'); - } else if (preg_match("/([$]?[A-Z]+)([$]?\d+)/", $pCoordinateString, $matches)) { list(, $column, $row) = $matches; return array($column, $row); - } else { throw new Exception('Invalid cell coordinate.'); - } } /** * Make string coordinate absolute * - * @param string $pCoordinateString - * @return string Absolute coordinate + * @param string $pCoordinateString + * @return string Absolute coordinate * @throws Exception */ public static function absoluteCoordinate($pCoordinateString = 'A1') { if (strpos($pCoordinateString,':') === false && strpos($pCoordinateString,',') === false) { - // Return value - $returnValue = ''; - // Create absolute coordinate list($column, $row) = PHPExcel_Cell::coordinateFromString($pCoordinateString); - $returnValue = '$' . $column . '$' . $row; - - // Return - return $returnValue; + return '$' . $column . '$' . $row; } else { throw new Exception("Coordinate string should not be a cell range."); } @@ -547,8 +512,8 @@ class PHPExcel_Cell /** * Split range into coordinate strings * - * @param string $pRange - * @return array Array containg one or more arrays containing one or two coordinate strings + * @param string $pRange + * @return array Array containg one or more arrays containing one or two coordinate strings */ public static function splitRange($pRange = 'A1:A1') { @@ -562,7 +527,7 @@ class PHPExcel_Cell /** * Build range from coordinate strings * - * @param array $pRange Array containg one or more arrays containing one or two coordinate strings + * @param array $pRange Array containg one or more arrays containing one or two coordinate strings * @return string String representation of $pRange * @throws Exception */ @@ -584,67 +549,76 @@ class PHPExcel_Cell } /** - * Calculate range dimension + * Calculate range boundaries * - * @param string $pRange Cell range (e.g. A1:A1) - * @return array Range dimension (width, height) + * @param string $pRange Cell range (e.g. A1:A1) + * @return array Range coordinates (Start Cell, End Cell) where Start Cell and End Cell are arrays (Column Number, Row Number) */ - public static function rangeDimension($pRange = 'A1:A1') + public static function rangeBoundaries($pRange = 'A1:A1') { // Uppercase coordinate $pRange = strtoupper($pRange); - // Extract range - $rangeA = ''; - $rangeB = ''; - if (strpos($pRange, ':') === false) { - $rangeA = $pRange; - $rangeB = $pRange; - } else { - list($rangeA, $rangeB) = explode(':', $pRange); - } + // Extract range + if (strpos($pRange, ':') === false) { + $rangeA = $rangeB = $pRange; + } else { + list($rangeA, $rangeB) = explode(':', $pRange); + } - // Calculate range outer borders - $rangeStart = PHPExcel_Cell::coordinateFromString($rangeA); - $rangeEnd = PHPExcel_Cell::coordinateFromString($rangeB); + // Calculate range outer borders + $rangeStart = PHPExcel_Cell::coordinateFromString($rangeA); + $rangeEnd = PHPExcel_Cell::coordinateFromString($rangeB); - // Translate column into index - $rangeStart[0] = PHPExcel_Cell::columnIndexFromString($rangeStart[0]); - $rangeEnd[0] = PHPExcel_Cell::columnIndexFromString($rangeEnd[0]); + // Translate column into index + $rangeStart[0] = PHPExcel_Cell::columnIndexFromString($rangeStart[0]); + $rangeEnd[0] = PHPExcel_Cell::columnIndexFromString($rangeEnd[0]); - return array( ($rangeEnd[0] - $rangeStart[0] + 1), ($rangeEnd[1] - $rangeStart[1] + 1) ); + return array($rangeStart, $rangeEnd); + } + + /** + * Calculate range dimension + * + * @param string $pRange Cell range (e.g. A1:A1) + * @return array Range dimension (width, height) + */ + public static function rangeDimension($pRange = 'A1:A1') + { + // Calculate range outer borders + list($rangeStart,$rangeEnd) = PHPExcel_Cell::rangeBoundaries($pRange); + + return array( ($rangeEnd[0] - $rangeStart[0] + 1), ($rangeEnd[1] - $rangeStart[1] + 1) ); } /** * Calculate range boundaries * - * @param string $pRange Cell range (e.g. A1:A1) - * @return array Range boundaries (staring Column, starting Row, Final Column, Final Row) + * @param string $pRange Cell range (e.g. A1:A1) + * @return array Range boundaries (staring Column, starting Row, Final Column, Final Row) */ public static function getRangeBoundaries($pRange = 'A1:A1') { // Uppercase coordinate $pRange = strtoupper($pRange); - // Extract range - $rangeA = ''; - $rangeB = ''; - if (strpos($pRange, ':') === false) { - $rangeA = $pRange; - $rangeB = $pRange; - } else { - list($rangeA, $rangeB) = explode(':', $pRange); - } + // Extract range + if (strpos($pRange, ':') === false) { + $rangeA = $pRange; + $rangeB = $pRange; + } else { + list($rangeA, $rangeB) = explode(':', $pRange); + } - return array( self::coordinateFromString($rangeA), self::coordinateFromString($rangeB)); + return array( self::coordinateFromString($rangeA), self::coordinateFromString($rangeB)); } /** * Column index from string * - * @param string $pString - * @return int Column index (base 1 !!!) - * @throws Exception + * @param string $pString + * @return int Column index (base 1 !!!) + * @throws Exception */ public static function columnIndexFromString($pString = 'A') { @@ -684,14 +658,14 @@ class PHPExcel_Cell if ($pColumnIndex < 26) { return chr(65 + $pColumnIndex); } - return PHPExcel_Cell::stringFromColumnIndex((int)($pColumnIndex / 26) -1).chr(65 + $pColumnIndex%26) ; + return PHPExcel_Cell::stringFromColumnIndex((int)($pColumnIndex / 26) -1).chr(65 + $pColumnIndex%26) ; } /** * Extract all cell references in range * - * @param string $pRange Range (e.g. A1 or A1:A10 or A1:A10 A100:A1000) - * @return array Array containing single cell references + * @param string $pRange Range (e.g. A1 or A1:A10 or A1:A10 A100:A1000) + * @return array Array containing single cell references */ public static function extractAllCellReferencesInRange($pRange = 'A1') { // Returnvalue @@ -731,17 +705,17 @@ class PHPExcel_Cell $rangeStart = $rangeEnd = ''; $startingCol = $startingRow = $endingCol = $endingRow = 0; - list($rangeStart, $rangeEnd) = $range[$i]; + list($rangeStart, $rangeEnd) = $range[$i]; list($startingCol, $startingRow) = PHPExcel_Cell::coordinateFromString($rangeStart); - list($endingCol, $endingRow) = PHPExcel_Cell::coordinateFromString($rangeEnd); + list($endingCol, $endingRow) = PHPExcel_Cell::coordinateFromString($rangeEnd); // Conversions... - $startingCol = PHPExcel_Cell::columnIndexFromString($startingCol); - $endingCol = PHPExcel_Cell::columnIndexFromString($endingCol); + $startingCol = PHPExcel_Cell::columnIndexFromString($startingCol); + $endingCol = PHPExcel_Cell::columnIndexFromString($endingCol); // Current data - $currentCol = --$startingCol; - $currentRow = $startingRow; + $currentCol = --$startingCol; + $currentRow = $startingRow; // Loop cells while ($currentCol < $endingCol) { @@ -763,9 +737,9 @@ class PHPExcel_Cell /** * Compare 2 cells * - * @param PHPExcel_Cell $a Cell a - * @param PHPExcel_Cell $a Cell b - * @return int Result of comparison (always -1 or 1, never zero!) + * @param PHPExcel_Cell $a Cell a + * @param PHPExcel_Cell $a Cell b + * @return int Result of comparison (always -1 or 1, never zero!) */ public static function compareCells(PHPExcel_Cell $a, PHPExcel_Cell $b) { @@ -813,7 +787,7 @@ class PHPExcel_Cell public function __clone() { $vars = get_object_vars($this); foreach ($vars as $key => $value) { - if (is_object($value)) { + if ((is_object($value)) && ($key != '_parent')) { $this->$key = clone $value; } else { $this->$key = $value; @@ -841,8 +815,20 @@ class PHPExcel_Cell { $this->_xfIndex = $pValue; - $this->notifyCacheController(); + return $this->notifyCacheController(); + } + + + public function setFormulaAttributes($pAttributes) + { + $this->_formulaAttributes = $pAttributes; return $this; } + public function getFormulaAttributes() + { + return $this->_formulaAttributes; + } + } + diff --git a/libraries/PHPExcel/PHPExcel/Cell/AdvancedValueBinder.php b/libraries/PHPExcel/PHPExcel/Cell/AdvancedValueBinder.php index 7e305c5..5126811 100644 --- a/libraries/PHPExcel/PHPExcel/Cell/AdvancedValueBinder.php +++ b/libraries/PHPExcel/PHPExcel/Cell/AdvancedValueBinder.php @@ -22,7 +22,7 @@ * @package PHPExcel_Cell * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Cell/DataType.php b/libraries/PHPExcel/PHPExcel/Cell/DataType.php index 1496d83..d542cab 100644 --- a/libraries/PHPExcel/PHPExcel/Cell/DataType.php +++ b/libraries/PHPExcel/PHPExcel/Cell/DataType.php @@ -22,7 +22,7 @@ * @package PHPExcel_Cell * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Cell/DataValidation.php b/libraries/PHPExcel/PHPExcel/Cell/DataValidation.php index 2c3913c..db1b497 100644 --- a/libraries/PHPExcel/PHPExcel/Cell/DataValidation.php +++ b/libraries/PHPExcel/PHPExcel/Cell/DataValidation.php @@ -22,7 +22,7 @@ * @package PHPExcel_Cell * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Cell/DefaultValueBinder.php b/libraries/PHPExcel/PHPExcel/Cell/DefaultValueBinder.php index e49449f..ad5ae46 100644 --- a/libraries/PHPExcel/PHPExcel/Cell/DefaultValueBinder.php +++ b/libraries/PHPExcel/PHPExcel/Cell/DefaultValueBinder.php @@ -22,7 +22,7 @@ * @package PHPExcel_Cell * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Cell/Hyperlink.php b/libraries/PHPExcel/PHPExcel/Cell/Hyperlink.php index eab9297..994cef5 100644 --- a/libraries/PHPExcel/PHPExcel/Cell/Hyperlink.php +++ b/libraries/PHPExcel/PHPExcel/Cell/Hyperlink.php @@ -22,7 +22,7 @@ * @package PHPExcel_Cell * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Cell/IValueBinder.php b/libraries/PHPExcel/PHPExcel/Cell/IValueBinder.php index 4bd1ef2..c14d630 100644 --- a/libraries/PHPExcel/PHPExcel/Cell/IValueBinder.php +++ b/libraries/PHPExcel/PHPExcel/Cell/IValueBinder.php @@ -22,7 +22,7 @@ * @package PHPExcel_Cell * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Comment.php b/libraries/PHPExcel/PHPExcel/Comment.php index 735e78c..432cfe1 100644 --- a/libraries/PHPExcel/PHPExcel/Comment.php +++ b/libraries/PHPExcel/PHPExcel/Comment.php @@ -22,7 +22,7 @@ * @package PHPExcel * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/DocumentProperties.php b/libraries/PHPExcel/PHPExcel/DocumentProperties.php index 64b0c2a..d6d928e 100644 --- a/libraries/PHPExcel/PHPExcel/DocumentProperties.php +++ b/libraries/PHPExcel/PHPExcel/DocumentProperties.php @@ -8,12 +8,12 @@ * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA @@ -22,7 +22,7 @@ * @package PHPExcel * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ @@ -41,70 +41,70 @@ class PHPExcel_DocumentProperties * @var string */ private $_creator; - + /** * LastModifiedBy * * @var string */ private $_lastModifiedBy; - + /** * Created * * @var datetime */ private $_created; - + /** * Modified * * @var datetime */ private $_modified; - + /** * Title * * @var string */ private $_title; - + /** * Description * * @var string */ private $_description; - + /** * Subject * * @var string */ private $_subject; - + /** * Keywords * * @var string */ private $_keywords; - + /** * Category * * @var string */ private $_category; - + /** * Company - * + * * @var string */ private $_company; - + /** * Create a new PHPExcel_DocumentProperties */ @@ -120,9 +120,10 @@ class PHPExcel_DocumentProperties $this->_description = ''; $this->_keywords = ''; $this->_category = ''; + $this->_manager = ''; $this->_company = 'Microsoft Corporation'; } - + /** * Get Creator * @@ -131,7 +132,7 @@ class PHPExcel_DocumentProperties public function getCreator() { return $this->_creator; } - + /** * Set Creator * @@ -142,7 +143,7 @@ class PHPExcel_DocumentProperties $this->_creator = $pValue; return $this; } - + /** * Get Last Modified By * @@ -151,7 +152,7 @@ class PHPExcel_DocumentProperties public function getLastModifiedBy() { return $this->_lastModifiedBy; } - + /** * Set Last Modified By * @@ -162,7 +163,7 @@ class PHPExcel_DocumentProperties $this->_lastModifiedBy = $pValue; return $this; } - + /** * Get Created * @@ -171,7 +172,7 @@ class PHPExcel_DocumentProperties public function getCreated() { return $this->_created; } - + /** * Set Created * @@ -185,7 +186,7 @@ class PHPExcel_DocumentProperties $this->_created = $pValue; return $this; } - + /** * Get Modified * @@ -194,7 +195,7 @@ class PHPExcel_DocumentProperties public function getModified() { return $this->_modified; } - + /** * Set Modified * @@ -208,7 +209,7 @@ class PHPExcel_DocumentProperties $this->_modified = $pValue; return $this; } - + /** * Get Title * @@ -217,7 +218,7 @@ class PHPExcel_DocumentProperties public function getTitle() { return $this->_title; } - + /** * Set Title * @@ -228,7 +229,7 @@ class PHPExcel_DocumentProperties $this->_title = $pValue; return $this; } - + /** * Get Description * @@ -237,7 +238,7 @@ class PHPExcel_DocumentProperties public function getDescription() { return $this->_description; } - + /** * Set Description * @@ -248,7 +249,7 @@ class PHPExcel_DocumentProperties $this->_description = $pValue; return $this; } - + /** * Get Subject * @@ -257,7 +258,7 @@ class PHPExcel_DocumentProperties public function getSubject() { return $this->_subject; } - + /** * Set Subject * @@ -268,7 +269,7 @@ class PHPExcel_DocumentProperties $this->_subject = $pValue; return $this; } - + /** * Get Keywords * @@ -277,7 +278,7 @@ class PHPExcel_DocumentProperties public function getKeywords() { return $this->_keywords; } - + /** * Set Keywords * @@ -288,7 +289,7 @@ class PHPExcel_DocumentProperties $this->_keywords = $pValue; return $this; } - + /** * Get Category * @@ -297,7 +298,7 @@ class PHPExcel_DocumentProperties public function getCategory() { return $this->_category; } - + /** * Set Category * @@ -308,7 +309,7 @@ class PHPExcel_DocumentProperties $this->_category = $pValue; return $this; } - + /** * Get Company * @@ -317,18 +318,38 @@ class PHPExcel_DocumentProperties public function getCompany() { return $this->_company; } - + /** * Set Company * * @param string $pValue - * @return PHPPowerPoint_DocumentProperties + * @return PHPExcel_DocumentProperties */ public function setCompany($pValue = '') { $this->_company = $pValue; return $this; } - + + /** + * Get Manager + * + * @return string + */ + public function getManager() { + return $this->_manager; + } + + /** + * Set Manager + * + * @param string $pValue + * @return PHPExcel_DocumentProperties + */ + public function setManager($pValue = '') { + $this->_manager = $pValue; + return $this; + } + /** * Implement PHP __clone to create a deep clone, not just a shallow copy. */ diff --git a/libraries/PHPExcel/PHPExcel/DocumentSecurity.php b/libraries/PHPExcel/PHPExcel/DocumentSecurity.php index 1522189..a6de9ee 100644 --- a/libraries/PHPExcel/PHPExcel/DocumentSecurity.php +++ b/libraries/PHPExcel/PHPExcel/DocumentSecurity.php @@ -22,7 +22,7 @@ * @package PHPExcel * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/HashTable.php b/libraries/PHPExcel/PHPExcel/HashTable.php index bd526b6..2191672 100644 --- a/libraries/PHPExcel/PHPExcel/HashTable.php +++ b/libraries/PHPExcel/PHPExcel/HashTable.php @@ -22,7 +22,7 @@ * @package PHPExcel * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/IComparable.php b/libraries/PHPExcel/PHPExcel/IComparable.php index 3c175d1..0a51b06 100644 --- a/libraries/PHPExcel/PHPExcel/IComparable.php +++ b/libraries/PHPExcel/PHPExcel/IComparable.php @@ -20,7 +20,7 @@ * @package PHPExcel * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/IOFactory.php b/libraries/PHPExcel/PHPExcel/IOFactory.php index 21fd23c..a3650be 100644 --- a/libraries/PHPExcel/PHPExcel/IOFactory.php +++ b/libraries/PHPExcel/PHPExcel/IOFactory.php @@ -22,7 +22,7 @@ * @package PHPExcel * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/NamedRange.php b/libraries/PHPExcel/PHPExcel/NamedRange.php index 1aa5236..992c2fa 100644 --- a/libraries/PHPExcel/PHPExcel/NamedRange.php +++ b/libraries/PHPExcel/PHPExcel/NamedRange.php @@ -22,7 +22,7 @@ * @package PHPExcel * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Reader/CSV.php b/libraries/PHPExcel/PHPExcel/Reader/CSV.php index 5fa83bd..086c948 100644 --- a/libraries/PHPExcel/PHPExcel/Reader/CSV.php +++ b/libraries/PHPExcel/PHPExcel/Reader/CSV.php @@ -22,7 +22,7 @@ * @package PHPExcel_Reader * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Reader/DefaultReadFilter.php b/libraries/PHPExcel/PHPExcel/Reader/DefaultReadFilter.php index c6620e7..e83ac9a 100644 --- a/libraries/PHPExcel/PHPExcel/Reader/DefaultReadFilter.php +++ b/libraries/PHPExcel/PHPExcel/Reader/DefaultReadFilter.php @@ -22,7 +22,7 @@ * @package PHPExcel_Reader * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Reader/Excel2003XML.php b/libraries/PHPExcel/PHPExcel/Reader/Excel2003XML.php index 96e3436..99f00ed 100644 --- a/libraries/PHPExcel/PHPExcel/Reader/Excel2003XML.php +++ b/libraries/PHPExcel/PHPExcel/Reader/Excel2003XML.php @@ -22,7 +22,7 @@ * @package PHPExcel_Reader * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ @@ -557,6 +557,11 @@ class PHPExcel_Reader_Excel2003XML implements PHPExcel_Reader_IReader $cellDataFormula = ''; if (isset($cell_ss['Formula'])) { $cellDataFormula = $cell_ss['Formula']; + // added this as a check for array formulas + if (isset($cell_ss['ArrayRange'])) { + $cellDataCSEFormula = $cell_ss['ArrayRange']; +// echo "found an array formula at ".$columnID.$rowID."<br />"; + } $hasCalculatedValue = true; } if (isset($cell->Data)) { diff --git a/libraries/PHPExcel/PHPExcel/Reader/Excel2007.php b/libraries/PHPExcel/PHPExcel/Reader/Excel2007.php index 031dee5..c4e3e41 100644 --- a/libraries/PHPExcel/PHPExcel/Reader/Excel2007.php +++ b/libraries/PHPExcel/PHPExcel/Reader/Excel2007.php @@ -22,7 +22,7 @@ * @package PHPExcel_Reader * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ @@ -71,6 +71,9 @@ class PHPExcel_Reader_Excel2007 implements PHPExcel_Reader_IReader */ private $_readFilter = null; + + private $_referenceHelper = null; + /** * Read data only? * @@ -150,6 +153,7 @@ class PHPExcel_Reader_Excel2007 implements PHPExcel_Reader_IReader */ public function __construct() { $this->_readFilter = new PHPExcel_Reader_DefaultReadFilter(); + $this->_referenceHelper = PHPExcel_ReferenceHelper::getInstance(); } /** @@ -245,12 +249,11 @@ class PHPExcel_Reader_Excel2007 implements PHPExcel_Reader_IReader $difference[0] = PHPExcel_Cell::columnIndexFromString($current[0]) - PHPExcel_Cell::columnIndexFromString($master[0]); $difference[1] = $current[1] - $master[1]; - $helper = PHPExcel_ReferenceHelper::getInstance(); - $value = $helper->updateFormulaReferences( $sharedFormulas[$instance]['formula'], - 'A1', - $difference[0], - $difference[1] - ); + $value = $this->_referenceHelper->updateFormulaReferences( $sharedFormulas[$instance]['formula'], + 'A1', + $difference[0], + $difference[1] + ); // echo 'Adjusted Formula is '.$value.'<br />'; } } @@ -311,7 +314,7 @@ class PHPExcel_Reader_Excel2007 implements PHPExcel_Reader_IReader switch ($rel["Type"]) { case "http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-…": $xmlCore = simplexml_load_string($this->_getFromZipArchive($zip, "{$rel['Target']}")); - if ($xmlCore) { + if (is_object($xmlCore)) { $xmlCore->registerXPathNamespace("dc", "http://purl.org/dc/elements/1.1/"); $xmlCore->registerXPathNamespace("dcterms", "http://purl.org/dc/terms/"); $xmlCore->registerXPathNamespace("cp", "http://schemas.openxmlformats.org/package/2006/metadata/core-properties"); @@ -328,6 +331,25 @@ class PHPExcel_Reader_Excel2007 implements PHPExcel_Reader_IReader } break; + case "http://schemas.openxmlformats.org/officeDocument/2006/relationships/extende…": + $xmlCore = simplexml_load_string($this->_getFromZipArchive($zip, "{$rel['Target']}")); + if (is_object($xmlCore)) { + $docProps = $excel->getProperties(); + if (isset($xmlCore->Company)) + $docProps->setCompany((string) $xmlCore->Company); + if (isset($xmlCore->Manager)) + $docProps->setManager((string) $xmlCore->Manager); + } + break; + + case "http://schemas.openxmlformats.org/officeDocument/2006/relationships/custom-…": + $xmlCore = simplexml_load_string($this->_getFromZipArchive($zip, "{$rel['Target']}")); + if (is_object($xmlCore)) { + $xmlCore->registerXPathNamespace("vt", "http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes"); + $docProps = $excel->getProperties(); + } + break; + case "http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeD…": $dir = dirname($rel["Target"]); $relsWorkbook = simplexml_load_string($this->_getFromZipArchive($zip, "$dir/_rels/" . basename($rel["Target"]) . ".rels")); //~ http://schemas.openxmlformats.org/package/2006/relationships"); @@ -692,6 +714,11 @@ class PHPExcel_Reader_Excel2007 implements PHPExcel_Reader_IReader } else { // Formula $this->_castToFormula($c,$r,$cellDataType,$value,$calculatedValue,$sharedFormulas,'_castToBool'); + if (isset($c->f['t'])) { + $att = array(); + $att = $c->f; + $docSheet->getCell($r)->setFormulaAttributes($att); + } // echo '$calculatedValue = '.$calculatedValue.'<br />'; } break; @@ -1276,10 +1303,14 @@ class PHPExcel_Reader_Excel2007 implements PHPExcel_Reader_IReader break; case '_xlnm.Print_Area': - $range = explode('!', $extractedRange); - $extractedRange = isset($range[1]) ? $range[1] : $range[0]; - - $docSheet->getPageSetup()->setPrintArea($extractedRange); + $rangeSets = explode(',', $extractedRange); // FIXME: what if sheetname contains comma? + $newRangeSets = array(); + for each($rangeSets as $rangeSet) { + $range = explode('!', $rangeSet); // FIXME: what if sheetname contains exclamation mark? + $rangeSet = isset($range[1]) ? $range[1] : $range[0]; + $newRangeSets[] = str_replace('$', '', $rangeSet); + } + $docSheet->getPageSetup()->setPrintArea(implode(',',$newRangeSets)); break; default: diff --git a/libraries/PHPExcel/PHPExcel/Reader/Excel5.php b/libraries/PHPExcel/PHPExcel/Reader/Excel5.php index a4f20e7..5c71ee8 100644 --- a/libraries/PHPExcel/PHPExcel/Reader/Excel5.php +++ b/libraries/PHPExcel/PHPExcel/Reader/Excel5.php @@ -22,7 +22,7 @@ * @package PHPExcel_Reader_Excel5 * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ // Original file header of ParseXL (used as the base for this class): @@ -834,7 +834,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader // Foo!$C$7:$J$66 // Bar!$A$1:$IV$2 - $explodes = explode('!', $range); + $explodes = explode('!', $range); // FIXME: what if sheetname contains exclamation mark? $sheetName = $explodes[0]; if (count($explodes) == 2) { @@ -4202,22 +4202,22 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader // 1. BITMAPCOREHEADER // offset: 0; size: 4; bcSize, Specifies the number of bytes required by the structure $bcSize = $this->_GetInt4d($iData, 0); - var_dump($bcSize); +// var_dump($bcSize); // offset: 4; size: 2; bcWidth, specifies the width of the bitmap, in pixels $bcWidth = $this->_GetInt2d($iData, 4); - var_dump($bcWidth); +// var_dump($bcWidth); // offset: 6; size: 2; bcHeight, specifies the height of the bitmap, in pixels. $bcHeight = $this->_GetInt2d($iData, 6); - var_dump($bcHeight); +// var_dump($bcHeight); $ih = imagecreatetruecolor($bcWidth, $bcHeight); // offset: 8; size: 2; bcPlanes, specifies the number of planes for the target device. This value must be 1 // offset: 10; size: 2; bcBitCount specifies the number of bits-per-pixel. This value must be 1, 4, 8, or 24 $bcBitCount = $this->_GetInt2d($iData, 10); - var_dump($bcBitCount); +// var_dump($bcBitCount); $rgbString = substr($iData, 12); $rgbTriples = array(); @@ -4602,24 +4602,24 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader case 0x12: $name = 'tUplus'; $size = 1; $data = '+'; break; case 0x13: $name = 'tUminus'; $size = 1; $data = '-'; break; case 0x14: $name = 'tPercent'; $size = 1; $data = '%'; break; - case 0x15: // parenthesis + case 0x15: // parenthesis $name = 'tParen'; $size = 1; $data = null; break; - case 0x16: // missing argument + case 0x16: // missing argument $name = 'tMissArg'; $size = 1; $data = ''; break; - case 0x17: // string + case 0x17: // string $name = 'tStr'; // offset: 1; size: var; Unicode string, 8-bit string length $string = $this->_readUnicodeStringShort(substr($formulaData, 1)); $size = 1 + $string['size']; $data = $this->_UTF8toExcelDoubleQuoted($string['value']); break; - case 0x19: // Special attribute + case 0x19: // Special attribute // offset: 1; size: 1; attribute type flags: switch (ord($formulaData[1])) { case 0x01: @@ -4689,39 +4689,42 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader break; } break; - case 0x1C: // error code + case 0x1C: // error code // offset: 1; size: 1; error code $name = 'tErr'; $size = 2; $data = $this->_mapErrorCode(ord($formulaData[1])); break; - case 0x1D: // boolean + case 0x1D: // boolean // offset: 1; size: 1; 0 = false, 1 = true; $name = 'tBool'; $size = 2; $data = ord($formulaData[1]) ? 'TRUE' : 'FALSE'; break; - case 0x1E: // integer + case 0x1E: // integer // offset: 1; size: 2; unsigned 16-bit integer $name = 'tInt'; $size = 3; $data = $this->_GetInt2d($formulaData, 1); break; - case 0x1F: // number + case 0x1F: // number // offset: 1; size: 8; $name = 'tNum'; $size = 9; $data = $this->_extractNumber(substr($formulaData, 1)); $data = str_replace(',', '.', (string)$data); // in case non-English locale break; - case 0x40: // array constant - case 0x60: // array constant + case 0x20: // array constant + case 0x40: + case 0x60: // offset: 1; size: 7; not used $name = 'tArray'; $size = 8; $data = null; break; - case 0x41: // function with fixed number of arguments + case 0x21: // function with fixed number of arguments + case 0x41: + case 0x61: $name = 'tFunc'; $size = 3; // offset: 1; size: 2; index to built-in sheet function @@ -4891,9 +4894,9 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader } $data = array('function' => $function, 'args' => $args); break; - case 0x22: // function with variable number of arguments - case 0x42: // function with variable number of arguments - case 0x62: // function with variable number of arguments + case 0x22: // function with variable number of arguments + case 0x42: + case 0x62: $name = 'tFuncV'; $size = 4; // offset: 1; size: 1; number of arguments @@ -4995,8 +4998,9 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader } $data = array('function' => $function, 'args' => $args); break; - case 0x23: // index to defined name + case 0x23: // index to defined name case 0x43: + case 0x63: $name = 'tName'; $size = 5; // offset: 1; size: 2; one-based index to definedname record @@ -5004,22 +5008,23 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader // offset: 2; size: 2; not used $data = $this->_definedname[$definedNameIndex]['name']; break; - case 0x24: // single cell reference e.g. A5 + case 0x24: // single cell reference e.g. A5 case 0x44: case 0x64: $name = 'tRef'; $size = 5; $data = $this->_readBIFF8CellAddress(substr($formulaData, 1, 4)); break; - case 0x25: // cell range reference to cells in the same sheet + case 0x25: // cell range reference to cells in the same sheet (2d) case 0x45: case 0x65: $name = 'tArea'; $size = 9; $data = $this->_readBIFF8CellRangeAddress(substr($formulaData, 1, 8)); break; - case 0x26: + case 0x26: // Constant reference sub-expression case 0x46: + case 0x66: $name = 'tMemArea'; // offset: 1; size: 4; not used // offset: 5; size: 2; size of the following subexpression @@ -5027,7 +5032,9 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader $size = 7 + $subSize; $data = $this->_getFormulaFromData(substr($formulaData, 7, $subSize)); break; + case 0x27: // Deleted constant reference sub-expression case 0x47: + case 0x67: $name = 'tMemErr'; // offset: 1; size: 4; not used // offset: 5; size: 2; size of the following subexpression @@ -5035,16 +5042,17 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader $size = 7 + $subSize; $data = $this->_getFormulaFromData(substr($formulaData, 7, $subSize)); break; - case 0x29: + case 0x29: // Variable reference sub-expression case 0x49: + case 0x69: $name = 'tMemFunc'; - // offset: 1; size: 2; size of the following subexpression + // offset: 1; size: 2; size of the following sub-expression $subSize = $this->_GetInt2d($formulaData, 1); $size = 3 + $subSize; $data = $this->_getFormulaFromData(substr($formulaData, 3, $subSize)); break; - case 0x2C: // Relative reference, used in shared formulas and some other places + case 0x2C: // Relative 2d cell reference reference, used in shared formulas and some other places case 0x4C: case 0x6C: $name = 'tRefN'; @@ -5052,7 +5060,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader $data = $this->_readBIFF8CellAddressB(substr($formulaData, 1, 4), $baseCell); break; - case 0x2D: + case 0x2D: // Relative 2d range reference case 0x4D: case 0x6D: $name = 'tAreaN'; @@ -5060,7 +5068,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader $data = $this->_readBIFF8CellRangeAddressB(substr($formulaData, 1, 8), $baseCell); break; - case 0x39: + case 0x39: // External name case 0x59: case 0x79: $name = 'tNameX'; @@ -5073,8 +5081,9 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader // offset: 5; size: 2; not used break; - case 0x3A: // 3d reference to cell + case 0x3A: // 3d reference to cell case 0x5A: + case 0x7A: $name = 'tRef3d'; $size = 7; @@ -5085,15 +5094,15 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader $cellAddress = $this->_readBIFF8CellAddress(substr($formulaData, 3, 4)); $data = "$sheetRange!$cellAddress"; - } catch (Exception $e) { // deleted sheet reference $data = '#REF!'; } break; - case 0x3B: // 3d reference to cell range + case 0x3B: // 3d reference to cell range case 0x5B: + case 0x7B: $name = 'tArea3d'; $size = 11; @@ -5104,15 +5113,13 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader $cellRangeAddress = $this->_readBIFF8CellRangeAddress(substr($formulaData, 3, 8)); $data = "$sheetRange!$cellRangeAddress"; - } catch (Exception $e) { // deleted sheet reference $data = '#REF!'; - } break; - // case 0x39: // don't know how to deal with + // Unknown cases // don't know how to deal with default: throw new Exception('Unrecognized token ' . sprintf('%02X', $id) . ' in formula'); break; diff --git a/libraries/PHPExcel/PHPExcel/Reader/Excel5/Escher.php b/libraries/PHPExcel/PHPExcel/Reader/Excel5/Escher.php index 0418dd7..b7c67e9 100644 --- a/libraries/PHPExcel/PHPExcel/Reader/Excel5/Escher.php +++ b/libraries/PHPExcel/PHPExcel/Reader/Excel5/Escher.php @@ -22,7 +22,7 @@ * @package PHPExcel_Reader_Excel5 * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ /** diff --git a/libraries/PHPExcel/PHPExcel/Reader/IReadFilter.php b/libraries/PHPExcel/PHPExcel/Reader/IReadFilter.php index c397d56..00fa2e8 100644 --- a/libraries/PHPExcel/PHPExcel/Reader/IReadFilter.php +++ b/libraries/PHPExcel/PHPExcel/Reader/IReadFilter.php @@ -22,7 +22,7 @@ * @package PHPExcel_Reader * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Reader/IReader.php b/libraries/PHPExcel/PHPExcel/Reader/IReader.php index ef5beac..e1cdc43 100644 --- a/libraries/PHPExcel/PHPExcel/Reader/IReader.php +++ b/libraries/PHPExcel/PHPExcel/Reader/IReader.php @@ -22,7 +22,7 @@ * @package PHPExcel_Reader * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Reader/OOCalc.php b/libraries/PHPExcel/PHPExcel/Reader/OOCalc.php index 8a1407a..a1ddf91 100644 --- a/libraries/PHPExcel/PHPExcel/Reader/OOCalc.php +++ b/libraries/PHPExcel/PHPExcel/Reader/OOCalc.php @@ -22,7 +22,7 @@ * @package PHPExcel_Reader * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ @@ -242,6 +242,9 @@ class PHPExcel_Reader_OOCalc implements PHPExcel_Reader_IReader throw new Exception("Could not open " . $pFilename . " for reading! File does not exist."); } + $timezoneObj = new DateTimeZone('Europe/London'); + $GMT = new DateTimeZone('UTC'); + $zip = new ZipArchive; if ($zip->open($pFilename) === true) { // echo '<h1>Meta Information</h1>'; @@ -338,6 +341,11 @@ class PHPExcel_Reader_OOCalc implements PHPExcel_Reader_IReader foreach($worksheetData as $key => $rowData) { // echo '<b>'.$key.'</b><br />'; switch ($key) { + case 'table-header-rows': + foreach ($rowData as $key=>$cellData) { + $rowData = $cellData; + break; + } case 'table-row' : $columnID = 'A'; foreach($rowData as $key => $cellData) { @@ -387,7 +395,8 @@ class PHPExcel_Reader_OOCalc implements PHPExcel_Reader_IReader break; case 'date' : $type = PHPExcel_Cell_DataType::TYPE_NUMERIC; - $dateObj = date_create($cellDataOfficeAttributes['date-value']); + $dateObj = new DateTime($cellDataOfficeAttributes['date-value'], $GMT); + $dateObj->setTimeZone($timezoneObj); list($year,$month,$day,$hour,$minute,$second) = explode(' ',$dateObj->format('Y m d H i s')); $dataValue = PHPExcel_Shared_Date::FormattedPHPToExcel($year,$month,$day,$hour,$minute,$second); if ($dataValue != floor($dataValue)) { @@ -418,7 +427,7 @@ class PHPExcel_Reader_OOCalc implements PHPExcel_Reader_IReader if (($key % 2) == 0) { $value = preg_replace('/\[\.(.*):\.(.*)\]/Ui','$1:$2',$value); $value = preg_replace('/\[\.(.*)\]/Ui','$1',$value); - $value = PHPExcel_Calculation::_translateSeparator(';',',',$value); + $value = PHPExcel_Calculation::_translateSeparator(';',',',$value,$inBraces); } } unset($value); diff --git a/libraries/PHPExcel/PHPExcel/Reader/SYLK.php b/libraries/PHPExcel/PHPExcel/Reader/SYLK.php index ec8a4d4..790aa2f 100644 --- a/libraries/PHPExcel/PHPExcel/Reader/SYLK.php +++ b/libraries/PHPExcel/PHPExcel/Reader/SYLK.php @@ -22,7 +22,7 @@ * @package PHPExcel_Reader * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Reader/Serialized.php b/libraries/PHPExcel/PHPExcel/Reader/Serialized.php index 88f2892..04b14f2 100644 --- a/libraries/PHPExcel/PHPExcel/Reader/Serialized.php +++ b/libraries/PHPExcel/PHPExcel/Reader/Serialized.php @@ -22,7 +22,7 @@ * @package PHPExcel_Reader * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/ReferenceHelper.php b/libraries/PHPExcel/PHPExcel/ReferenceHelper.php index cb9673c..7a37ed0 100644 --- a/libraries/PHPExcel/PHPExcel/ReferenceHelper.php +++ b/libraries/PHPExcel/PHPExcel/ReferenceHelper.php @@ -22,7 +22,7 @@ * @package PHPExcel * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ @@ -35,6 +35,13 @@ */ class PHPExcel_ReferenceHelper { + /** Constants */ + /** Regular Expressions */ + const REFHELPER_REGEXP_CELLREF = '((\w*|\'[^!]*\')!)?(?<![:a-z\$])(\$?[a-z]{1,3}\$?\d+)(?=[^:!\d\'])'; + const REFHELPER_REGEXP_CELLRANGE = '((\w*|\'[^!]*\')!)?(\$?[a-z]{1,3}\$?\d+):(\$?[a-z]{1,3}\$?\d+)'; + const REFHELPER_REGEXP_ROWRANGE = '((\w*|\'[^!]*\')!)?(\$?\d+):(\$?\d+)'; + const REFHELPER_REGEXP_COLRANGE = '((\w*|\'[^!]*\')!)?(\$?[a-z]{1,3}):(\$?[a-z]{1,3})'; + /** * Instance of this class * @@ -119,10 +126,8 @@ class PHPExcel_ReferenceHelper $newCoordinates = PHPExcel_Cell::stringFromColumnIndex( PHPExcel_Cell::columnIndexFromString($cell->getColumn()) - 1 + $pNumCols ) . ($cell->getRow() + $pNumRows); // Should the cell be updated? Move value and cellXf index from one cell to another. - if ( - (PHPExcel_Cell::columnIndexFromString( $cell->getColumn() ) >= PHPExcel_Cell::columnIndexFromString($beforeColumn)) && - ($cell->getRow() >= $beforeRow) - ) { + if ((PHPExcel_Cell::columnIndexFromString( $cell->getColumn() ) >= PHPExcel_Cell::columnIndexFromString($beforeColumn)) && + ($cell->getRow() >= $beforeRow)) { // Update cell styles $pSheet->getCell($newCoordinates)->setXfIndex($cell->getXfIndex()); @@ -132,7 +137,7 @@ class PHPExcel_ReferenceHelper if ($cell->getDataType() == PHPExcel_Cell_DataType::TYPE_FORMULA) { // Formula should be adjusted $pSheet->getCell($newCoordinates) - ->setValue($this->updateFormulaReferences($cell->getValue(), $pBefore, $pNumCols, $pNumRows)); + ->setValue($this->updateFormulaReferences($cell->getValue(), $pBefore, $pNumCols, $pNumRows, $pSheet->getTitle())); } else { // Formula should not be adjusted $pSheet->getCell($newCoordinates)->setValue($cell->getValue()); @@ -340,43 +345,121 @@ class PHPExcel_ReferenceHelper * @return string Updated formula * @throws Exception */ - public function updateFormulaReferences($pFormula = '', $pBefore = 'A1', $pNumCols = 0, $pNumRows = 0) { - // Parse formula into a tree of tokens - $tokenisedFormula = PHPExcel_Calculation::getInstance()->parseFormula($pFormula); - - $newCellTokens = $cellTokens = array(); - $adjustCount = 0; - // Build the translation table of cell tokens - foreach($tokenisedFormula as $token) { - $token = $token['value']; - if (preg_match('/^'.PHPExcel_Calculation::CALCULATION_REGEXP_CELLREF.'$/i', $token, $matches)) { - list($column,$row) = PHPExcel_Cell::coordinateFromString($token); - // Max worksheet size is 1,048,576 rows by 16,384 columns in Excel 2007, so our adjustments need to be at least one digit more - $column = PHPExcel_Cell::columnIndexFromString($column) + 100000; - $row += 10000000; - $cellIndex = $column.$row; - if (!isset($cellTokens[$cellIndex])) { - $newReference = $this->updateCellReference($token, $pBefore, $pNumCols, $pNumRows); - if ($newReference !== $token) { - $newCellTokens[$cellIndex] = preg_quote($newReference); - $cellTokens[$cellIndex] = '/(?<![A-Z])'.preg_quote($token).'(?!\d)/i'; - ++$adjustCount; - } - } - } - } - if ($adjustCount == 0) { - return $pFormula; - } - krsort($cellTokens); - krsort($newCellTokens); - + public function updateFormulaReferences($pFormula = '', $pBefore = 'A1', $pNumCols = 0, $pNumRows = 0, $sheetName = '') { // Update cell references in the formula $formulaBlocks = explode('"',$pFormula); foreach($formulaBlocks as $i => &$formulaBlock) { - // Only count/replace in alternate array entries + // Ignore blocks that were enclosed in quotes (even entries in the $formulaBlocks array after the explode) if (($i % 2) == 0) { - $formulaBlock = preg_replace($cellTokens,$newCellTokens,$formulaBlock); + $adjustCount = 0; + $newCellTokens = $cellTokens = array(); + // Search for row ranges (e.g. 'Sheet1'!3:5 or 3:5) with or without $ absolutes (e.g. $3:5) + $matchCount = preg_match_all('/'.self::REFHELPER_REGEXP_ROWRANGE.'/i', ' '.$formulaBlock.' ', $matches, PREG_SET_ORDER); + if ($matchCount > 0) { + foreach($matches as $match) { + $fromString = ($match[2] > '') ? $match[2].'!' : ''; + $fromString .= $match[3].':'.$match[4]; + $modified3 = substr($this->updateCellReference('$A'.$match[3],$pBefore,$pNumCols,$pNumRows),2); + $modified4 = substr($this->updateCellReference('$A'.$match[4],$pBefore,$pNumCols,$pNumRows),2); + + if ($match[3].':'.$match[4] !== $modified3.':'.$modified4) { + if (($match[2] == '') || (trim($match[2],"'") == $sheetName)) { + $toString = ($match[2] > '') ? $match[2].'!' : ''; + $toString .= $modified3.':'.$modified4; + // Max worksheet size is 1,048,576 rows by 16,384 columns in Excel 2007, so our adjustments need to be at least one digit more + $column = 100000; + $row = 10000000+trim($match[3],'$'); + $cellIndex = $column.$row; + + $newCellTokens[$cellIndex] = preg_quote($toString); + $cellTokens[$cellIndex] = '/(?<!\d)'.preg_quote($fromString).'(?!\d)/i'; + ++$adjustCount; + } + } + } + } + // Search for column ranges (e.g. 'Sheet1'!C:E or C:E) with or without $ absolutes (e.g. $C:E) + $matchCount = preg_match_all('/'.self::REFHELPER_REGEXP_COLRANGE.'/i', ' '.$formulaBlock.' ', $matches, PREG_SET_ORDER); + if ($matchCount > 0) { + foreach($matches as $match) { + $fromString = ($match[2] > '') ? $match[2].'!' : ''; + $fromString .= $match[3].':'.$match[4]; + $modified3 = substr($this->updateCellReference($match[3].'$1',$pBefore,$pNumCols,$pNumRows),0,-2); + $modified4 = substr($this->updateCellReference($match[4].'$1',$pBefore,$pNumCols,$pNumRows),0,-2); + + if ($match[3].':'.$match[4] !== $modified3.':'.$modified4) { + if (($match[2] == '') || (trim($match[2],"'") == $sheetName)) { + $toString = ($match[2] > '') ? $match[2].'!' : ''; + $toString .= $modified3.':'.$modified4; + // Max worksheet size is 1,048,576 rows by 16,384 columns in Excel 2007, so our adjustments need to be at least one digit more + $column = PHPExcel_Cell::columnIndexFromString(trim($match[3],'$')) + 100000; + $row = 10000000; + $cellIndex = $column.$row; + + $newCellTokens[$cellIndex] = preg_quote($toString); + $cellTokens[$cellIndex] = '/(?<![A-Z])'.preg_quote($fromString).'(?![A-Z])/i'; + ++$adjustCount; + } + } + } + } + // Search for cell ranges (e.g. 'Sheet1'!A3:C5 or A3:C5) with or without $ absolutes (e.g. $A1:C$5) + $matchCount = preg_match_all('/'.self::REFHELPER_REGEXP_CELLRANGE.'/i', ' '.$formulaBlock.' ', $matches, PREG_SET_ORDER); + if ($matchCount > 0) { + foreach($matches as $match) { + $fromString = ($match[2] > '') ? $match[2].'!' : ''; + $fromString .= $match[3].':'.$match[4]; + $modified3 = $this->updateCellReference($match[3],$pBefore,$pNumCols,$pNumRows); + $modified4 = $this->updateCellReference($match[4],$pBefore,$pNumCols,$pNumRows); + + if ($match[3].$match[4] !== $modified3.$modified4) { + if (($match[2] == '') || (trim($match[2],"'") == $sheetName)) { + $toString = ($match[2] > '') ? $match[2].'!' : ''; + $toString .= $modified3.':'.$modified4; + list($column,$row) = PHPExcel_Cell::coordinateFromString($match[3]); + // Max worksheet size is 1,048,576 rows by 16,384 columns in Excel 2007, so our adjustments need to be at least one digit more + $column = PHPExcel_Cell::columnIndexFromString(trim($column,'$')) + 100000; + $row = trim($row,'$') + 10000000; + $cellIndex = $column.$row; + + $newCellTokens[$cellIndex] = preg_quote($toString); + $cellTokens[$cellIndex] = '/(?<![A-Z])'.preg_quote($fromString).'(?!\d)/i'; + ++$adjustCount; + } + } + } + } + // Search for cell references (e.g. 'Sheet1'!A3 or C5) with or without $ absolutes (e.g. $A1 or C$5) + $matchCount = preg_match_all('/'.self::REFHELPER_REGEXP_CELLREF.'/i', ' '.$formulaBlock.' ', $matches, PREG_SET_ORDER); + if ($matchCount > 0) { + foreach($matches as $match) { + $fromString = ($match[2] > '') ? $match[2].'!' : ''; + $fromString .= $match[3]; + $modified3 = $this->updateCellReference($match[3],$pBefore,$pNumCols,$pNumRows); + + if ($match[3] !== $modified3) { + if (($match[2] == '') || (trim($match[2],"'") == $sheetName)) { + $toString = ($match[2] > '') ? $match[2].'!' : ''; + $toString .= $modified3; + list($column,$row) = PHPExcel_Cell::coordinateFromString($match[3]); + // Max worksheet size is 1,048,576 rows by 16,384 columns in Excel 2007, so our adjustments need to be at least one digit more + $column = PHPExcel_Cell::columnIndexFromString(trim($column,'$')) + 100000; + $row = trim($row,'$') + 10000000; + $cellIndex = $column.$row; + + $newCellTokens[$cellIndex] = preg_quote($toString); + $cellTokens[$cellIndex] = '/(?<![A-Z])'.preg_quote($fromString).'(?!\d)/i'; + ++$adjustCount; + } + } + } + } + if ($adjustCount > 0) { + krsort($cellTokens); + krsort($newCellTokens); + // Update cell references in the formula + $formulaBlock = str_replace('\\','',preg_replace($cellTokens,$newCellTokens,$formulaBlock)); + } } } unset($formulaBlock); diff --git a/libraries/PHPExcel/PHPExcel/RichText.php b/libraries/PHPExcel/PHPExcel/RichText.php index c938c62..588e643 100644 --- a/libraries/PHPExcel/PHPExcel/RichText.php +++ b/libraries/PHPExcel/PHPExcel/RichText.php @@ -22,7 +22,7 @@ * @package PHPExcel_RichText * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/RichText/ITextElement.php b/libraries/PHPExcel/PHPExcel/RichText/ITextElement.php index 613028f..3f1aa7a 100644 --- a/libraries/PHPExcel/PHPExcel/RichText/ITextElement.php +++ b/libraries/PHPExcel/PHPExcel/RichText/ITextElement.php @@ -20,7 +20,7 @@ * @package PHPExcel_RichText * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/RichText/Run.php b/libraries/PHPExcel/PHPExcel/RichText/Run.php index 209af21..aac7676 100644 --- a/libraries/PHPExcel/PHPExcel/RichText/Run.php +++ b/libraries/PHPExcel/PHPExcel/RichText/Run.php @@ -20,7 +20,7 @@ * @package PHPExcel_RichText * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/RichText/TextElement.php b/libraries/PHPExcel/PHPExcel/RichText/TextElement.php index 3a24482..f5ce8e0 100644 --- a/libraries/PHPExcel/PHPExcel/RichText/TextElement.php +++ b/libraries/PHPExcel/PHPExcel/RichText/TextElement.php @@ -20,7 +20,7 @@ * @package PHPExcel_RichText * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Settings.php b/libraries/PHPExcel/PHPExcel/Settings.php index 7a1d57e..52d7880 100644 --- a/libraries/PHPExcel/PHPExcel/Settings.php +++ b/libraries/PHPExcel/PHPExcel/Settings.php @@ -22,7 +22,7 @@ * @package PHPExcel_Settings * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ /** PHPExcel root directory */ diff --git a/libraries/PHPExcel/PHPExcel/Shared/CodePage.php b/libraries/PHPExcel/PHPExcel/Shared/CodePage.php index 10f82e4..f209838 100644 --- a/libraries/PHPExcel/PHPExcel/Shared/CodePage.php +++ b/libraries/PHPExcel/PHPExcel/Shared/CodePage.php @@ -22,7 +22,7 @@ * @package PHPExcel_Shared * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Shared/Date.php b/libraries/PHPExcel/PHPExcel/Shared/Date.php index c45c23f..334e8df 100644 --- a/libraries/PHPExcel/PHPExcel/Shared/Date.php +++ b/libraries/PHPExcel/PHPExcel/Shared/Date.php @@ -23,7 +23,7 @@ * @package PHPExcel_Shared * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Shared/Drawing.php b/libraries/PHPExcel/PHPExcel/Shared/Drawing.php index a89c94e..a24f963 100644 --- a/libraries/PHPExcel/PHPExcel/Shared/Drawing.php +++ b/libraries/PHPExcel/PHPExcel/Shared/Drawing.php @@ -22,7 +22,7 @@ * @package PHPExcel_Shared * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Shared/Escher.php b/libraries/PHPExcel/PHPExcel/Shared/Escher.php index c230d99..11c19b2 100644 --- a/libraries/PHPExcel/PHPExcel/Shared/Escher.php +++ b/libraries/PHPExcel/PHPExcel/Shared/Escher.php @@ -22,7 +22,7 @@ * @package PHPExcel_Shared_Escher * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ /** diff --git a/libraries/PHPExcel/PHPExcel/Shared/Escher/DgContainer.php b/libraries/PHPExcel/PHPExcel/Shared/Escher/DgContainer.php index c78485b..6cbd2f0 100644 --- a/libraries/PHPExcel/PHPExcel/Shared/Escher/DgContainer.php +++ b/libraries/PHPExcel/PHPExcel/Shared/Escher/DgContainer.php @@ -22,7 +22,7 @@ * @package PHPExcel_Shared_Escher * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ /** diff --git a/libraries/PHPExcel/PHPExcel/Shared/Escher/DgContainer/SpgrContainer.php b/libraries/PHPExcel/PHPExcel/Shared/Escher/DgContainer/SpgrContainer.php index c659fd5..919cf1a 100644 --- a/libraries/PHPExcel/PHPExcel/Shared/Escher/DgContainer/SpgrContainer.php +++ b/libraries/PHPExcel/PHPExcel/Shared/Escher/DgContainer/SpgrContainer.php @@ -22,7 +22,7 @@ * @package PHPExcel_Shared_Escher * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ /** diff --git a/libraries/PHPExcel/PHPExcel/Shared/Escher/DgContainer/SpgrContainer/SpContainer.php b/libraries/PHPExcel/PHPExcel/Shared/Escher/DgContainer/SpgrContainer/SpContainer.php index 83e3193..454b7ee 100644 --- a/libraries/PHPExcel/PHPExcel/Shared/Escher/DgContainer/SpgrContainer/SpContainer.php +++ b/libraries/PHPExcel/PHPExcel/Shared/Escher/DgContainer/SpgrContainer/SpContainer.php @@ -22,7 +22,7 @@ * @package PHPExcel_Shared_Escher * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ /** diff --git a/libraries/PHPExcel/PHPExcel/Shared/Escher/DggContainer.php b/libraries/PHPExcel/PHPExcel/Shared/Escher/DggContainer.php index 59d34cf..61eab5d 100644 --- a/libraries/PHPExcel/PHPExcel/Shared/Escher/DggContainer.php +++ b/libraries/PHPExcel/PHPExcel/Shared/Escher/DggContainer.php @@ -22,7 +22,7 @@ * @package PHPExcel_Shared_Escher * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ /** @@ -70,6 +70,13 @@ class PHPExcel_Shared_Escher_DggContainer private $_OPT = array(); /** + * Array of identifier clusters containg information about the maximum shape identifiers + * + * @var array + */ + private $_IDCLs = array(); + + /** * Get maximum shape index of all shapes in all drawings (plus one) * * @return int @@ -174,4 +181,23 @@ class PHPExcel_Shared_Escher_DggContainer return null; } + /** + * Get identifier clusters + * + * @return array + */ + public function getIDCLs() + { + return $this->_IDCLs; + } + + /** + * Set identifier clusters. array(<drawingId> => <max shape id>, ...) + * + * @param array $pValue + */ + public function setIDCLs($pValue) + { + $this->_IDCLs = $pValue; + } } diff --git a/libraries/PHPExcel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer.php b/libraries/PHPExcel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer.php index 9292f2d..6040fb2 100644 --- a/libraries/PHPExcel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer.php +++ b/libraries/PHPExcel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer.php @@ -22,7 +22,7 @@ * @package PHPExcel_Shared_Escher * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ /** diff --git a/libraries/PHPExcel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE.php b/libraries/PHPExcel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE.php index 820e703..00ccb6d 100644 --- a/libraries/PHPExcel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE.php +++ b/libraries/PHPExcel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE.php @@ -22,7 +22,7 @@ * @package PHPExcel_Shared_Escher * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ /** diff --git a/libraries/PHPExcel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE/Blip.php b/libraries/PHPExcel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE/Blip.php index 35003dd..7f13632 100644 --- a/libraries/PHPExcel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE/Blip.php +++ b/libraries/PHPExcel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE/Blip.php @@ -22,7 +22,7 @@ * @package PHPExcel_Shared_Escher * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ /** diff --git a/libraries/PHPExcel/PHPExcel/Shared/Excel5.php b/libraries/PHPExcel/PHPExcel/Shared/Excel5.php index 05af633..6469c52 100644 --- a/libraries/PHPExcel/PHPExcel/Shared/Excel5.php +++ b/libraries/PHPExcel/PHPExcel/Shared/Excel5.php @@ -22,7 +22,7 @@ * @package PHPExcel_Shared * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ /** diff --git a/libraries/PHPExcel/PHPExcel/Shared/File.php b/libraries/PHPExcel/PHPExcel/Shared/File.php index dc2c3fd..23169ce 100644 --- a/libraries/PHPExcel/PHPExcel/Shared/File.php +++ b/libraries/PHPExcel/PHPExcel/Shared/File.php @@ -22,7 +22,7 @@ * @package PHPExcel_Shared * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ @@ -75,7 +75,9 @@ class PHPExcel_Shared_File $returnValue = ''; // Try using realpath() - $returnValue = realpath($pFilename); + if (file_exists($pFilename)) { + $returnValue = realpath($pFilename); + } // Found something? if ($returnValue == '' || is_null($returnValue)) { @@ -107,14 +109,14 @@ class PHPExcel_Shared_File // http://php.net/manual/en/function.sys-get-temp-dir.php#94119 if ( !function_exists('sys_get_temp_dir')) { - if( $temp = getenv('TMP') ) { - return realpath($temp); + if ($temp = getenv('TMP') ) { + if (file_exists($temp)) { return realpath($temp); } } - if( $temp = getenv('TEMP') ) { - return realpath($temp); + if ($temp = getenv('TEMP') ) { + if (file_exists($temp)) { return realpath($temp); } } - if( $temp = getenv('TMPDIR') ) { - return realpath($temp); + if ($temp = getenv('TMPDIR') ) { + if (file_exists($temp)) { return realpath($temp); } } // trick for creating a file in system's temporary dir @@ -126,10 +128,11 @@ class PHPExcel_Shared_File } return null; - } // use ordinary built-in PHP function + // There should be no problem with the 5.2.4 Suhosin realpath() bug, because this line should only + // be called if we're running 5.2.1 or earlier return realpath(sys_get_temp_dir()); } diff --git a/libraries/PHPExcel/PHPExcel/Shared/Font.php b/libraries/PHPExcel/PHPExcel/Shared/Font.php index 1759e87..24d78be 100644 --- a/libraries/PHPExcel/PHPExcel/Shared/Font.php +++ b/libraries/PHPExcel/PHPExcel/Shared/Font.php @@ -22,7 +22,7 @@ * @package PHPExcel_Shared * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Shared/OLE/ChainedBlockStream.php b/libraries/PHPExcel/PHPExcel/Shared/OLE/ChainedBlockStream.php index 7b6f845..af757d0 100644 --- a/libraries/PHPExcel/PHPExcel/Shared/OLE/ChainedBlockStream.php +++ b/libraries/PHPExcel/PHPExcel/Shared/OLE/ChainedBlockStream.php @@ -22,7 +22,7 @@ * @package PHPExcel_Shared_OLE * @copyright Copyright (c) 2006 - 2007 Christian Schmidt * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ /** diff --git a/libraries/PHPExcel/PHPExcel/Shared/OLERead.php b/libraries/PHPExcel/PHPExcel/Shared/OLERead.php index b747e13..6aebbf0 100644 --- a/libraries/PHPExcel/PHPExcel/Shared/OLERead.php +++ b/libraries/PHPExcel/PHPExcel/Shared/OLERead.php @@ -22,7 +22,7 @@ * @package PHPExcel_Shared * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ define('IDENTIFIER_OLE', pack('CCCCCCCC', 0xd0, 0xcf, 0x11, 0xe0, 0xa1, 0xb1, 0x1a, 0xe1)); diff --git a/libraries/PHPExcel/PHPExcel/Shared/PasswordHasher.php b/libraries/PHPExcel/PHPExcel/Shared/PasswordHasher.php index 6b7b312..7fb4934 100644 --- a/libraries/PHPExcel/PHPExcel/Shared/PasswordHasher.php +++ b/libraries/PHPExcel/PHPExcel/Shared/PasswordHasher.php @@ -22,7 +22,7 @@ * @package PHPExcel_Shared * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Shared/String.php b/libraries/PHPExcel/PHPExcel/Shared/String.php index 32766df..c033b9a 100644 --- a/libraries/PHPExcel/PHPExcel/Shared/String.php +++ b/libraries/PHPExcel/PHPExcel/Shared/String.php @@ -22,7 +22,7 @@ * @package PHPExcel_Shared * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ @@ -507,7 +507,7 @@ class PHPExcel_Shared_String * @author Rasmus Andersson {@link http://rasmusandersson.se/} * @author vadik56 */ - function utf16_decode( $str, $bom_be=true ) { + public static function utf16_decode( $str, $bom_be=true ) { if( strlen($str) < 2 ) return $str; $c0 = ord($str{0}); $c1 = ord($str{1}); diff --git a/libraries/PHPExcel/PHPExcel/Shared/XMLWriter.php b/libraries/PHPExcel/PHPExcel/Shared/XMLWriter.php index 223d3dd..8514847 100644 --- a/libraries/PHPExcel/PHPExcel/Shared/XMLWriter.php +++ b/libraries/PHPExcel/PHPExcel/Shared/XMLWriter.php @@ -22,13 +22,18 @@ * @package PHPExcel_Shared * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ if (!defined('DATE_W3C')) { define('DATE_W3C', 'Y-m-d\TH:i:sP'); } +if (!defined('DEBUGMODE_ENABLED')) { + define('DEBUGMODE_ENABLED', false); +} + + /** * PHPExcel_Shared_XMLWriter * @@ -80,7 +85,9 @@ class PHPExcel_Shared_XMLWriter { } // Set default values - $this->_xmlWriter->setIndent(true); + if (DEBUGMODE_ENABLED) { + $this->_xmlWriter->setIndent(true); + } } /** diff --git a/libraries/PHPExcel/PHPExcel/Shared/ZipStreamWrapper.php b/libraries/PHPExcel/PHPExcel/Shared/ZipStreamWrapper.php index 77661c6..b79bfc8 100644 --- a/libraries/PHPExcel/PHPExcel/Shared/ZipStreamWrapper.php +++ b/libraries/PHPExcel/PHPExcel/Shared/ZipStreamWrapper.php @@ -22,7 +22,7 @@ * @package PHPExcel_Shared * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Shared/trend/bestFitClass.php b/libraries/PHPExcel/PHPExcel/Shared/trend/bestFitClass.php index 27fecd5..28fe725 100644 --- a/libraries/PHPExcel/PHPExcel/Shared/trend/bestFitClass.php +++ b/libraries/PHPExcel/PHPExcel/Shared/trend/bestFitClass.php @@ -22,7 +22,7 @@ * @package PHPExcel_Shared_Best_Fit * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Shared/trend/exponentialBestFitClass.php b/libraries/PHPExcel/PHPExcel/Shared/trend/exponentialBestFitClass.php index a0717ea..0ff98cc 100644 --- a/libraries/PHPExcel/PHPExcel/Shared/trend/exponentialBestFitClass.php +++ b/libraries/PHPExcel/PHPExcel/Shared/trend/exponentialBestFitClass.php @@ -22,7 +22,7 @@ * @package PHPExcel_Shared_Best_Fit * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Shared/trend/linearBestFitClass.php b/libraries/PHPExcel/PHPExcel/Shared/trend/linearBestFitClass.php index 99f358c..71219a0 100644 --- a/libraries/PHPExcel/PHPExcel/Shared/trend/linearBestFitClass.php +++ b/libraries/PHPExcel/PHPExcel/Shared/trend/linearBestFitClass.php @@ -22,7 +22,7 @@ * @package PHPExcel_Shared_Best_Fit * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Shared/trend/logarithmicBestFitClass.php b/libraries/PHPExcel/PHPExcel/Shared/trend/logarithmicBestFitClass.php index a59c879..03c7dc3 100644 --- a/libraries/PHPExcel/PHPExcel/Shared/trend/logarithmicBestFitClass.php +++ b/libraries/PHPExcel/PHPExcel/Shared/trend/logarithmicBestFitClass.php @@ -22,7 +22,7 @@ * @package PHPExcel_Shared_Best_Fit * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Shared/trend/polynomialBestFitClass.php b/libraries/PHPExcel/PHPExcel/Shared/trend/polynomialBestFitClass.php index 02ff0a5..6947c11 100644 --- a/libraries/PHPExcel/PHPExcel/Shared/trend/polynomialBestFitClass.php +++ b/libraries/PHPExcel/PHPExcel/Shared/trend/polynomialBestFitClass.php @@ -22,7 +22,7 @@ * @package PHPExcel_Shared_Best_Fit * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Shared/trend/powerBestFitClass.php b/libraries/PHPExcel/PHPExcel/Shared/trend/powerBestFitClass.php index 9328fcb..6d2281c 100644 --- a/libraries/PHPExcel/PHPExcel/Shared/trend/powerBestFitClass.php +++ b/libraries/PHPExcel/PHPExcel/Shared/trend/powerBestFitClass.php @@ -22,7 +22,7 @@ * @package PHPExcel_Shared_Best_Fit * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Style.php b/libraries/PHPExcel/PHPExcel/Style.php index d0cbcb0..3e84f9f 100644 --- a/libraries/PHPExcel/PHPExcel/Style.php +++ b/libraries/PHPExcel/PHPExcel/Style.php @@ -22,7 +22,7 @@ * @package PHPExcel_Style * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ @@ -675,7 +675,7 @@ class PHPExcel_Style implements PHPExcel_IComparable public function __clone() { $vars = get_object_vars($this); foreach ($vars as $key => $value) { - if (is_object($value)) { + if ((is_object($value)) && ($key != '_parent')) { $this->$key = clone $value; } else { $this->$key = $value; diff --git a/libraries/PHPExcel/PHPExcel/Style/Alignment.php b/libraries/PHPExcel/PHPExcel/Style/Alignment.php index 412c603..15b6c87 100644 --- a/libraries/PHPExcel/PHPExcel/Style/Alignment.php +++ b/libraries/PHPExcel/PHPExcel/Style/Alignment.php @@ -22,7 +22,7 @@ * @package PHPExcel_Style * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ @@ -479,7 +479,7 @@ class PHPExcel_Style_Alignment implements PHPExcel_IComparable public function __clone() { $vars = get_object_vars($this); foreach ($vars as $key => $value) { - if (is_object($value)) { + if ((is_object($value)) && ($key != '_parent')) { $this->$key = clone $value; } else { $this->$key = $value; diff --git a/libraries/PHPExcel/PHPExcel/Style/Border.php b/libraries/PHPExcel/PHPExcel/Style/Border.php index 1af31d6..166ccb2 100644 --- a/libraries/PHPExcel/PHPExcel/Style/Border.php +++ b/libraries/PHPExcel/PHPExcel/Style/Border.php @@ -22,7 +22,7 @@ * @package PHPExcel_Style * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ @@ -372,7 +372,7 @@ class PHPExcel_Style_Border implements PHPExcel_IComparable public function __clone() { $vars = get_object_vars($this); foreach ($vars as $key => $value) { - if (is_object($value)) { + if ((is_object($value)) && ($key != '_parent')) { $this->$key = clone $value; } else { $this->$key = $value; diff --git a/libraries/PHPExcel/PHPExcel/Style/Borders.php b/libraries/PHPExcel/PHPExcel/Style/Borders.php index ffd66af..dc32c50 100644 --- a/libraries/PHPExcel/PHPExcel/Style/Borders.php +++ b/libraries/PHPExcel/PHPExcel/Style/Borders.php @@ -22,7 +22,7 @@ * @package PHPExcel_Style * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ @@ -489,7 +489,7 @@ class PHPExcel_Style_Borders implements PHPExcel_IComparable public function __clone() { $vars = get_object_vars($this); foreach ($vars as $key => $value) { - if (is_object($value)) { + if ((is_object($value)) && ($key != '_parent')) { $this->$key = clone $value; } else { $this->$key = $value; diff --git a/libraries/PHPExcel/PHPExcel/Style/Color.php b/libraries/PHPExcel/PHPExcel/Style/Color.php index 8a25af0..9734d62 100644 --- a/libraries/PHPExcel/PHPExcel/Style/Color.php +++ b/libraries/PHPExcel/PHPExcel/Style/Color.php @@ -22,7 +22,7 @@ * @package PHPExcel_Style * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ @@ -398,7 +398,7 @@ class PHPExcel_Style_Color implements PHPExcel_IComparable public function __clone() { $vars = get_object_vars($this); foreach ($vars as $key => $value) { - if (is_object($value)) { + if ((is_object($value)) && ($key != '_parent')) { $this->$key = clone $value; } else { $this->$key = $value; diff --git a/libraries/PHPExcel/PHPExcel/Style/Conditional.php b/libraries/PHPExcel/PHPExcel/Style/Conditional.php index 8ec5f92..4602b53 100644 --- a/libraries/PHPExcel/PHPExcel/Style/Conditional.php +++ b/libraries/PHPExcel/PHPExcel/Style/Conditional.php @@ -22,7 +22,7 @@ * @package PHPExcel_Style * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Style/Fill.php b/libraries/PHPExcel/PHPExcel/Style/Fill.php index 3ebf380..1357e47 100644 --- a/libraries/PHPExcel/PHPExcel/Style/Fill.php +++ b/libraries/PHPExcel/PHPExcel/Style/Fill.php @@ -22,7 +22,7 @@ * @package PHPExcel_Style * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ @@ -391,7 +391,7 @@ class PHPExcel_Style_Fill implements PHPExcel_IComparable public function __clone() { $vars = get_object_vars($this); foreach ($vars as $key => $value) { - if (is_object($value)) { + if ((is_object($value)) && ($key != '_parent')) { $this->$key = clone $value; } else { $this->$key = $value; diff --git a/libraries/PHPExcel/PHPExcel/Style/Font.php b/libraries/PHPExcel/PHPExcel/Style/Font.php index de39cf2..b58dbf5 100644 --- a/libraries/PHPExcel/PHPExcel/Style/Font.php +++ b/libraries/PHPExcel/PHPExcel/Style/Font.php @@ -22,7 +22,7 @@ * @package PHPExcel_Style * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ @@ -609,7 +609,7 @@ class PHPExcel_Style_Font implements PHPExcel_IComparable public function __clone() { $vars = get_object_vars($this); foreach ($vars as $key => $value) { - if (is_object($value)) { + if ((is_object($value)) && ($key != '_parent')) { $this->$key = clone $value; } else { $this->$key = $value; diff --git a/libraries/PHPExcel/PHPExcel/Style/NumberFormat.php b/libraries/PHPExcel/PHPExcel/Style/NumberFormat.php index 9ff1a97..0f0dcdc 100644 --- a/libraries/PHPExcel/PHPExcel/Style/NumberFormat.php +++ b/libraries/PHPExcel/PHPExcel/Style/NumberFormat.php @@ -22,7 +22,7 @@ * @package PHPExcel_Style * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ @@ -443,7 +443,7 @@ class PHPExcel_Style_NumberFormat implements PHPExcel_IComparable { $vars = get_object_vars($this); foreach ($vars as $key => $value) { - if (is_object($value)) { + if ((is_object($value)) && ($key != '_parent')) { $this->$key = clone $value; } else { $this->$key = $value; diff --git a/libraries/PHPExcel/PHPExcel/Style/Protection.php b/libraries/PHPExcel/PHPExcel/Style/Protection.php index 1c70702..29832da 100644 --- a/libraries/PHPExcel/PHPExcel/Style/Protection.php +++ b/libraries/PHPExcel/PHPExcel/Style/Protection.php @@ -271,7 +271,7 @@ class PHPExcel_Style_Protection implements PHPExcel_IComparable public function __clone() { $vars = get_object_vars($this); foreach ($vars as $key => $value) { - if (is_object($value)) { + if ((is_object($value)) && ($key != '_parent')) { $this->$key = clone $value; } else { $this->$key = $value; diff --git a/libraries/PHPExcel/PHPExcel/Worksheet.php b/libraries/PHPExcel/PHPExcel/Worksheet.php index dc401fd..fb7cc0a 100644 --- a/libraries/PHPExcel/PHPExcel/Worksheet.php +++ b/libraries/PHPExcel/PHPExcel/Worksheet.php @@ -22,7 +22,7 @@ * @package PHPExcel_Worksheet * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ @@ -2180,9 +2180,8 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable $highestRow = 1; // Find cells that can be cleaned - foreach ($this->_cellCollection->getCellList() as $coordinate) { - preg_match('/^(\w+)(\d+)$/U',$coordinate,$matches); - list(,$col,$row) = $matches; + foreach ($this->_cellCollection->getCellList() as $coord) { + list($col,$row) = sscanf($coord,'%[A-Z]%d'); $column = PHPExcel_Cell::columnIndexFromString($col); // Determine highest column and row @@ -2468,7 +2467,13 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable } if (is_object($val) || (is_array($val))) { - $this->{$key} = unserialize(serialize($val)); + if ($key == '_cellCollection') { + $newCollection = clone $this->_cellCollection; + $newCollection->copyCellCollection($this); + $this->_cellCollection = $newCollection; + } else { + $this->{$key} = unserialize(serialize($val)); + } } } } diff --git a/libraries/PHPExcel/PHPExcel/Worksheet/BaseDrawing.php b/libraries/PHPExcel/PHPExcel/Worksheet/BaseDrawing.php index e2c65c3..511643b 100644 --- a/libraries/PHPExcel/PHPExcel/Worksheet/BaseDrawing.php +++ b/libraries/PHPExcel/PHPExcel/Worksheet/BaseDrawing.php @@ -22,7 +22,7 @@ * @package PHPExcel_Worksheet * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Worksheet/CellIterator.php b/libraries/PHPExcel/PHPExcel/Worksheet/CellIterator.php index 4a6589f..630e089 100644 --- a/libraries/PHPExcel/PHPExcel/Worksheet/CellIterator.php +++ b/libraries/PHPExcel/PHPExcel/Worksheet/CellIterator.php @@ -22,7 +22,7 @@ * @package PHPExcel_Worksheet * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Worksheet/ColumnDimension.php b/libraries/PHPExcel/PHPExcel/Worksheet/ColumnDimension.php index f42ef31..30b0035 100644 --- a/libraries/PHPExcel/PHPExcel/Worksheet/ColumnDimension.php +++ b/libraries/PHPExcel/PHPExcel/Worksheet/ColumnDimension.php @@ -22,7 +22,7 @@ * @package PHPExcel_Worksheet * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Worksheet/Drawing.php b/libraries/PHPExcel/PHPExcel/Worksheet/Drawing.php index 7d362c0..537f9f3 100644 --- a/libraries/PHPExcel/PHPExcel/Worksheet/Drawing.php +++ b/libraries/PHPExcel/PHPExcel/Worksheet/Drawing.php @@ -22,7 +22,7 @@ * @package PHPExcel_Worksheet_Drawing * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Worksheet/Drawing/Shadow.php b/libraries/PHPExcel/PHPExcel/Worksheet/Drawing/Shadow.php index f83c26d..053ab0d 100644 --- a/libraries/PHPExcel/PHPExcel/Worksheet/Drawing/Shadow.php +++ b/libraries/PHPExcel/PHPExcel/Worksheet/Drawing/Shadow.php @@ -22,7 +22,7 @@ * @package PHPExcel_Worksheet_Drawing * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Worksheet/HeaderFooter.php b/libraries/PHPExcel/PHPExcel/Worksheet/HeaderFooter.php index 4e39339..9d2708d 100644 --- a/libraries/PHPExcel/PHPExcel/Worksheet/HeaderFooter.php +++ b/libraries/PHPExcel/PHPExcel/Worksheet/HeaderFooter.php @@ -22,7 +22,7 @@ * @package PHPExcel_Worksheet * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Worksheet/HeaderFooterDrawing.php b/libraries/PHPExcel/PHPExcel/Worksheet/HeaderFooterDrawing.php index 9f2b25d..f614261 100644 --- a/libraries/PHPExcel/PHPExcel/Worksheet/HeaderFooterDrawing.php +++ b/libraries/PHPExcel/PHPExcel/Worksheet/HeaderFooterDrawing.php @@ -22,7 +22,7 @@ * @package PHPExcel_Worksheet * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Worksheet/MemoryDrawing.php b/libraries/PHPExcel/PHPExcel/Worksheet/MemoryDrawing.php index 0bd37f5..a43e6a9 100644 --- a/libraries/PHPExcel/PHPExcel/Worksheet/MemoryDrawing.php +++ b/libraries/PHPExcel/PHPExcel/Worksheet/MemoryDrawing.php @@ -22,7 +22,7 @@ * @package PHPExcel_Worksheet * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Worksheet/PageMargins.php b/libraries/PHPExcel/PHPExcel/Worksheet/PageMargins.php index 6fc8f1a..155b976 100644 --- a/libraries/PHPExcel/PHPExcel/Worksheet/PageMargins.php +++ b/libraries/PHPExcel/PHPExcel/Worksheet/PageMargins.php @@ -22,7 +22,7 @@ * @package PHPExcel_Worksheet * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Worksheet/PageSetup.php b/libraries/PHPExcel/PHPExcel/Worksheet/PageSetup.php index ffbd573..8e615f7 100644 --- a/libraries/PHPExcel/PHPExcel/Worksheet/PageSetup.php +++ b/libraries/PHPExcel/PHPExcel/Worksheet/PageSetup.php @@ -22,7 +22,7 @@ * @package PHPExcel_Worksheet * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ @@ -179,6 +179,11 @@ class PHPExcel_Worksheet_PageSetup const ORIENTATION_LANDSCAPE = 'landscape'; const ORIENTATION_PORTRAIT = 'portrait'; + /* Print Range Set Method */ + const SETPRINTRANGE_OVERWRITE = 'O'; + const SETPRINTRANGE_INSERT = 'I'; + + /** * Paper size * @@ -261,7 +266,7 @@ class PHPExcel_Worksheet_PageSetup * @var string */ private $_printArea = null; - + /** * First page number * @@ -570,55 +575,197 @@ class PHPExcel_Worksheet_PageSetup } /** - * Get print area + * Get print area * - * @return string + * @param int $index Identifier for a specific print area range if several ranges have been set + * Default behaviour, or a index value of 0, will return all ranges as a comma-separated string + * Otherwise, the specific range identified by the value of $index will be returned + * Print areas are numbered from 1 + * @throws Exception + * @return string */ - public function getPrintArea() { - return $this->_printArea; + public function getPrintArea($index = 0) { + if ($index == 0) { + return $this->_printArea; + } + $printAreas = explode(',',$this->_printArea); + if (isset($printAreas[$index-1])) { + return $printAreas[$index-1]; + } + throw new Exception("Requested Print Area does not exist"); } /** - * Is print area set? + * Is print area set? * - * @return boolean + * @param int $index Identifier for a specific print area range if several ranges have been set + * Default behaviour, or an index value of 0, will identify whether any print range is set + * Otherwise, existence of the range identified by the value of $index will be returned + * Print areas are numbered from 1 + * @return boolean */ - public function isPrintAreaSet() { - return !is_null($this->_printArea); + public function isPrintAreaSet($index = 0) { + if ($index == 0) { + return !is_null($this->_printArea); + } + $printAreas = explode(',',$this->_printArea); + return isset($printAreas[$index-1]); } /** - * Set print area. E.g. 'A1:D10' or 'A1:D10,G5:M20' + * Clear a print area * - * @param string $value - * @throws Exception - * @return PHPExcel_Worksheet_PageSetup + * @param int $index Identifier for a specific print area range if several ranges have been set + * Default behaviour, or an index value of 0, will clear all print ranges that are set + * Otherwise, the range identified by the value of $index will be removed from the series + * Print areas are numbered from 1 + * @return PHPExcel_Worksheet_PageSetup */ - public function setPrintArea($value) { - if (strpos($value,':') === false) { - throw new Exception('Cell coordinate must be a range of cells.'); - } elseif (strpos($value,'$') !== false) { - throw new Exception('Cell coordinate must not be absolute.'); - } else { - $this->_printArea = strtoupper($value); - } + public function clearPrintArea($index = 0) { + if ($index == 0) { + $this->_printArea = NULL; + } else { + $printAreas = explode(',',$this->_printArea); + if (isset($printAreas[$index-1])) { + unset($printAreas[$index-1]); + $this->_printArea = implode(',',$printAreas); + } + } + + return $this; + } + + /** + * Set print area. e.g. 'A1:D10' or 'A1:D10,G5:M20' + * + * @param string $value + * @param int $index Identifier for a specific print area range allowing several ranges to be set + * When the method is "O"verwrite, then a positive integer index will overwrite that indexed + * entry in the print areas list; a negative index value will identify which entry to + * overwrite working bacward through the print area to the list, with the last entry as -1. + * Specifying an index value of 0, will overwrite <b>all</b> existing print ranges. + * When the method is "I"nsert, then a positive index will insert after that indexed entry in + * the print areas list, while a negative index will insert before the indexed entry. + * Specifying an index value of 0, will always append the new print range at the end of the + * list. + * Print areas are numbered from 1 + * @param string $method Determines the method used when setting multiple print areas + * Default behaviour, or the "O" method, overwrites existing print area + * The "I" method, inserts the new print area before any specified index, or at the end of the list + * @throws Exception + * @return PHPExcel_Worksheet_PageSetup + */ + public function setPrintArea($value, $index = 0, $method = self::SETPRINTRANGE_OVERWRITE) { + if (strpos($value,'!') !== false) { + throw new Exception('Cell coordinate must not specify a worksheet.'); + } elseif (strpos($value,':') === false) { + throw new Exception('Cell coordinate must be a range of cells.'); + } elseif (strpos($value,'$') !== false) { + throw new Exception('Cell coordinate must not be absolute.'); + } + $value = strtoupper($value); + + if ($method == self::SETPRINTRANGE_OVERWRITE) { + if ($index == 0) { + $this->_printArea = $value; + } else { + $printAreas = explode(',',$this->_printArea); + if($index < 0) { + $index = count($printAreas) - abs($index) + 1; + } + if (($index <= 0) || ($index > count($printAreas))) { + throw new Exception('Invalid index for setting print range.'); + } + $printAreas[$index-1] = $value; + $this->_printArea = implode(',',$printAreas); + } + } elseif($method == self::SETPRINTRANGE_INSERT) { + if ($index == 0) { + $this->_printArea .= ($this->_printArea == '') ? $value : ','.$value; + } else { + $printAreas = explode(',',$this->_printArea); + if($index < 0) { + $index = abs($index) - 1; + } + if ($index > count($printAreas)) { + throw new Exception('Invalid index for setting print range.'); + } + $printAreas = array_merge(array_slice($printAreas,0,$index),array($value),array_slice($printAreas,$index)); + $this->_printArea = implode(',',$printAreas); + } + } else { + throw new Exception('Invalid method for setting print range.'); + } + return $this; } /** - * Set print area + * Add a new print area (e.g. 'A1:D10' or 'A1:D10,G5:M20') to the list of print areas * - * @param int $column1 Column 1 - * @param int $row1 Row 1 - * @param int $column2 Column 2 - * @param int $row2 Row 2 - * @return PHPExcel_Worksheet_PageSetup + * @param string $value + * @param int $index Identifier for a specific print area range allowing several ranges to be set + * A positive index will insert after that indexed entry in the print areas list, while a + * negative index will insert before the indexed entry. + * Specifying an index value of 0, will always append the new print range at the end of the + * list. + * Print areas are numbered from 1 + * @throws Exception + * @return PHPExcel_Worksheet_PageSetup */ - public function setPrintAreaByColumnAndRow($column1, $row1, $column2, $row2) + public function addPrintArea($value, $index = -1) { + return $this->setPrintArea($value, $index, self::SETPRINTRANGE_INSERT); + } + + /** + * Set print area + * + * @param int $column1 Column 1 + * @param int $row1 Row 1 + * @param int $column2 Column 2 + * @param int $row2 Row 2 + * @param int $index Identifier for a specific print area range allowing several ranges to be set + * When the method is "O"verwrite, then a positive integer index will overwrite that indexed + * entry in the print areas list; a negative index value will identify which entry to + * overwrite working bacward through the print area to the list, with the last entry as -1. + * Specifying an index value of 0, will overwrite <b>all</b> existing print ranges. + * When the method is "I"nsert, then a positive index will insert after that indexed entry in + * the print areas list, while a negative index will insert before the indexed entry. + * Specifying an index value of 0, will always append the new print range at the end of the + * list. + * Print areas are numbered from 1 + * @param string $method Determines the method used when setting multiple print areas + * Default behaviour, or the "O" method, overwrites existing print area + * The "I" method, inserts the new print area before any specified index, or at the end of the list + * @throws Exception + * @return PHPExcel_Worksheet_PageSetup + */ + public function setPrintAreaByColumnAndRow($column1, $row1, $column2, $row2, $index = 0, $method = self::SETPRINTRANGE_OVERWRITE) { - return $this->setPrintArea(PHPExcel_Cell::stringFromColumnIndex($column1) . $row1 . ':' . PHPExcel_Cell::stringFromColumnIndex($column2) . $row2); + return $this->setPrintArea(PHPExcel_Cell::stringFromColumnIndex($column1) . $row1 . ':' . PHPExcel_Cell::stringFromColumnIndex($column2) . $row2, $index, $method); } - + + /** + * Add a new print area to the list of print areas + * + * @param int $column1 Column 1 + * @param int $row1 Row 1 + * @param int $column2 Column 2 + * @param int $row2 Row 2 + * @param int $index Identifier for a specific print area range allowing several ranges to be set + * A positive index will insert after that indexed entry in the print areas list, while a + * negative index will insert before the indexed entry. + * Specifying an index value of 0, will always append the new print range at the end of the + * list. + * Print areas are numbered from 1 + * @throws Exception + * @return PHPExcel_Worksheet_PageSetup + */ + public function addPrintAreaByColumnAndRow($column1, $row1, $column2, $row2, $index = -1) + { + return $this->setPrintArea(PHPExcel_Cell::stringFromColumnIndex($column1) . $row1 . ':' . PHPExcel_Cell::stringFromColumnIndex($column2) . $row2, $index, self::SETPRINTRANGE_INSERT); + } + /** * Get first page number * @@ -627,7 +774,7 @@ class PHPExcel_Worksheet_PageSetup public function getFirstPageNumber() { return $this->_firstPageNumber; } - + /** * Set first page number * @@ -638,7 +785,7 @@ class PHPExcel_Worksheet_PageSetup $this->_firstPageNumber = $value; return $this; } - + /** * Reset first page number * diff --git a/libraries/PHPExcel/PHPExcel/Worksheet/Protection.php b/libraries/PHPExcel/PHPExcel/Worksheet/Protection.php index 0e7bc4f..f60a265 100644 --- a/libraries/PHPExcel/PHPExcel/Worksheet/Protection.php +++ b/libraries/PHPExcel/PHPExcel/Worksheet/Protection.php @@ -22,7 +22,7 @@ * @package PHPExcel_Worksheet * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Worksheet/Row.php b/libraries/PHPExcel/PHPExcel/Worksheet/Row.php index c5cb33a..7311721 100644 --- a/libraries/PHPExcel/PHPExcel/Worksheet/Row.php +++ b/libraries/PHPExcel/PHPExcel/Worksheet/Row.php @@ -22,7 +22,7 @@ * @package PHPExcel_Worksheet * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Worksheet/RowDimension.php b/libraries/PHPExcel/PHPExcel/Worksheet/RowDimension.php index 8b1277d..153024f 100644 --- a/libraries/PHPExcel/PHPExcel/Worksheet/RowDimension.php +++ b/libraries/PHPExcel/PHPExcel/Worksheet/RowDimension.php @@ -22,7 +22,7 @@ * @package PHPExcel_Worksheet * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Worksheet/RowIterator.php b/libraries/PHPExcel/PHPExcel/Worksheet/RowIterator.php index d21bd51..e0f91fc 100644 --- a/libraries/PHPExcel/PHPExcel/Worksheet/RowIterator.php +++ b/libraries/PHPExcel/PHPExcel/Worksheet/RowIterator.php @@ -22,7 +22,7 @@ * @package PHPExcel_Worksheet * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Worksheet/SheetView.php b/libraries/PHPExcel/PHPExcel/Worksheet/SheetView.php index c7e04ae..fdfe001 100644 --- a/libraries/PHPExcel/PHPExcel/Worksheet/SheetView.php +++ b/libraries/PHPExcel/PHPExcel/Worksheet/SheetView.php @@ -22,7 +22,7 @@ * @package PHPExcel_Worksheet * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/WorksheetIterator.php b/libraries/PHPExcel/PHPExcel/WorksheetIterator.php index f6f6a6f..87f8b29 100644 --- a/libraries/PHPExcel/PHPExcel/WorksheetIterator.php +++ b/libraries/PHPExcel/PHPExcel/WorksheetIterator.php @@ -22,7 +22,7 @@ * @package PHPExcel * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Writer/CSV.php b/libraries/PHPExcel/PHPExcel/Writer/CSV.php index 03e1a6e..765244d 100644 --- a/libraries/PHPExcel/PHPExcel/Writer/CSV.php +++ b/libraries/PHPExcel/PHPExcel/Writer/CSV.php @@ -22,7 +22,7 @@ * @package PHPExcel_Writer * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ @@ -106,6 +106,8 @@ class PHPExcel_Writer_CSV implements PHPExcel_Writer_IWriter { // Fetch sheet $sheet = $this->_phpExcel->getSheet($this->_sheetIndex); + $saveDebugLog = PHPExcel_Calculation::getInstance()->writeDebugLog; + PHPExcel_Calculation::getInstance()->writeDebugLog = false; $saveArrayReturnType = PHPExcel_Calculation::getArrayReturnType(); PHPExcel_Calculation::setArrayReturnType(PHPExcel_Calculation::RETURN_ARRAY_AS_VALUE); @@ -132,6 +134,7 @@ class PHPExcel_Writer_CSV implements PHPExcel_Writer_IWriter { fclose($fileHandle); PHPExcel_Calculation::setArrayReturnType($saveArrayReturnType); + PHPExcel_Calculation::getInstance()->writeDebugLog = $saveDebugLog; } /** diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel2007.php b/libraries/PHPExcel/PHPExcel/Writer/Excel2007.php index 1963ab9..b9f7464 100644 --- a/libraries/PHPExcel/PHPExcel/Writer/Excel2007.php +++ b/libraries/PHPExcel/PHPExcel/Writer/Excel2007.php @@ -22,7 +22,7 @@ * @package PHPExcel_Writer_Excel2007 * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ @@ -201,6 +201,8 @@ class PHPExcel_Writer_Excel2007 implements PHPExcel_Writer_IWriter } } + $saveDebugLog = PHPExcel_Calculation::getInstance()->writeDebugLog; + PHPExcel_Calculation::getInstance()->writeDebugLog = false; $saveDateReturnType = PHPExcel_Calculation_Functions::getReturnDateType(); PHPExcel_Calculation_Functions::setReturnDateType(PHPExcel_Calculation_Functions::RETURNDATE_EXCEL); @@ -331,6 +333,7 @@ class PHPExcel_Writer_Excel2007 implements PHPExcel_Writer_IWriter } PHPExcel_Calculation_Functions::setReturnDateType($saveDateReturnType); + PHPExcel_Calculation::getInstance()->writeDebugLog = $saveDebugLog; // Close file if ($objZip->close() === false) { diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Comments.php b/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Comments.php index ddb7958..3a6ad37 100644 --- a/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Comments.php +++ b/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Comments.php @@ -22,7 +22,7 @@ * @package PHPExcel_Writer_Excel2007 * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel2007/ContentTypes.php b/libraries/PHPExcel/PHPExcel/Writer/Excel2007/ContentTypes.php index d27e386..84de96d 100644 --- a/libraries/PHPExcel/PHPExcel/Writer/Excel2007/ContentTypes.php +++ b/libraries/PHPExcel/PHPExcel/Writer/Excel2007/ContentTypes.php @@ -22,7 +22,7 @@ * @package PHPExcel_Writer_Excel2007 * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel2007/DocProps.php b/libraries/PHPExcel/PHPExcel/Writer/Excel2007/DocProps.php index 68e0f04..21fc3a4 100644 --- a/libraries/PHPExcel/PHPExcel/Writer/Excel2007/DocProps.php +++ b/libraries/PHPExcel/PHPExcel/Writer/Excel2007/DocProps.php @@ -22,7 +22,7 @@ * @package PHPExcel_Writer_Excel2007 * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Drawing.php b/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Drawing.php index 670b835..f1551da 100644 --- a/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Drawing.php +++ b/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Drawing.php @@ -22,7 +22,7 @@ * @package PHPExcel_Writer_Excel2007 * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Rels.php b/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Rels.php index d133621..7ffdd6d 100644 --- a/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Rels.php +++ b/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Rels.php @@ -22,7 +22,7 @@ * @package PHPExcel_Writer_Excel2007 * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel2007/StringTable.php b/libraries/PHPExcel/PHPExcel/Writer/Excel2007/StringTable.php index 8ab1c52..98a3c45 100644 --- a/libraries/PHPExcel/PHPExcel/Writer/Excel2007/StringTable.php +++ b/libraries/PHPExcel/PHPExcel/Writer/Excel2007/StringTable.php @@ -22,7 +22,7 @@ * @package PHPExcel_Writer_Excel2007 * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Style.php b/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Style.php index dd7621d..5354936 100644 --- a/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Style.php +++ b/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Style.php @@ -22,7 +22,7 @@ * @package PHPExcel_Writer_Excel2007 * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Theme.php b/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Theme.php index 9dbee16..e8ffe7b 100644 --- a/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Theme.php +++ b/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Theme.php @@ -22,7 +22,7 @@ * @package PHPExcel_Writer_Excel2007 * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Workbook.php b/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Workbook.php index 245fb87..d2c51fb 100644 --- a/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Workbook.php +++ b/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Workbook.php @@ -22,7 +22,7 @@ * @package PHPExcel_Writer_Excel2007 * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Worksheet.php b/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Worksheet.php index 411b42a..327e542 100644 --- a/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Worksheet.php +++ b/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Worksheet.php @@ -22,7 +22,7 @@ * @package PHPExcel_Writer_Excel2007 * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ @@ -1002,7 +1002,18 @@ class PHPExcel_Writer_Excel2007_Worksheet extends PHPExcel_Writer_Excel2007_Writ break; case 'f': // Formula - $objWriter->writeElement('f', substr($pCell->getValue(), 1)); + $attributes = $pCell->getFormulaAttributes(); + if($attributes['t'] == 'array') { + $objWriter->startElement('f'); + $objWriter->writeAttribute('t', 'array'); + $objWriter->writeAttribute('ref', $pCell->getCoordinate()); + $objWriter->writeAttribute('aca', '1'); + $objWriter->writeAttribute('ca', '1'); + $objWriter->text(substr($pCell->getValue(), 1)); + $objWriter->endElement(); + } else { + $objWriter->writeElement('f', substr($pCell->getValue(), 1)); + } if ($this->getParentWriter()->getOffice2003Compatibility() === false) { if ($this->getParentWriter()->getPreCalculateFormulas()) { $calculatedValue = $pCell->getCalculatedValue(); diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel2007/WriterPart.php b/libraries/PHPExcel/PHPExcel/Writer/Excel2007/WriterPart.php index c153237..97d56e1 100644 --- a/libraries/PHPExcel/PHPExcel/Writer/Excel2007/WriterPart.php +++ b/libraries/PHPExcel/PHPExcel/Writer/Excel2007/WriterPart.php @@ -22,7 +22,7 @@ * @package PHPExcel_Writer_Excel2007 * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel5.php b/libraries/PHPExcel/PHPExcel/Writer/Excel5.php index 0bb5571..4d69d91 100644 --- a/libraries/PHPExcel/PHPExcel/Writer/Excel5.php +++ b/libraries/PHPExcel/PHPExcel/Writer/Excel5.php @@ -22,7 +22,7 @@ * @package PHPExcel_Writer_Excel5 * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ @@ -91,6 +91,13 @@ class PHPExcel_Writer_Excel5 implements PHPExcel_Writer_IWriter */ private $_parser; + /** + * Identifier clusters for drawings. Used in MSODRAWINGGROUP record. + * + * @var array + */ + private $_IDCLs; + /** * Create a new PHPExcel_Writer_Excel5 @@ -120,6 +127,8 @@ class PHPExcel_Writer_Excel5 implements PHPExcel_Writer_IWriter // garbage collect $this->_phpExcel->garbageCollect(); + $saveDebugLog = PHPExcel_Calculation::getInstance()->writeDebugLog; + PHPExcel_Calculation::getInstance()->writeDebugLog = false; $saveDateReturnType = PHPExcel_Calculation_Functions::getReturnDateType(); PHPExcel_Calculation_Functions::setReturnDateType(PHPExcel_Calculation_Functions::RETURNDATE_EXCEL); @@ -130,6 +139,21 @@ class PHPExcel_Writer_Excel5 implements PHPExcel_Writer_IWriter $this->_writerWorkbook = new PHPExcel_Writer_Excel5_Workbook($this->_phpExcel, $this->_BIFF_version, $this->_str_total, $this->_str_unique, $this->_str_table, $this->_colors, $this->_parser); + // Initialise worksheet writers + $countSheets = $this->_phpExcel->getSheetCount(); + for ($i = 0; $i < $countSheets; ++$i) { + $this->_writerWorksheets[$i] = new PHPExcel_Writer_Excel5_Worksheet($this->_BIFF_version, + $this->_str_total, $this->_str_unique, + $this->_str_table, $this->_colors, + $this->_parser, + $this->_preCalculateFormulas, + $this->_phpExcel->getSheet($i)); + } + + // build Escher objects. Escher objects for workbooks needs to be build before Escher object for workbook. + $this->_buildWorksheetEschers(); + $this->_buildWorkbookEscher(); + // add 15 identical cell style Xfs // for now, we use the first cellXf instead of cellStyleXf $cellXfCollection = $this->_phpExcel->getCellXfCollection(); @@ -146,19 +170,10 @@ class PHPExcel_Writer_Excel5 implements PHPExcel_Writer_IWriter $workbookStreamName = ($this->_BIFF_version == 0x0600) ? 'Workbook' : 'Book'; $OLE = new PHPExcel_Shared_OLE_PPS_File(PHPExcel_Shared_OLE::Asc2Ucs($workbookStreamName)); - // Initialise worksheet writers - $countSheets = $this->_phpExcel->getSheetCount(); // Write the worksheet streams before the global workbook stream, // because the byte sizes of these are needed in the global workbook stream $worksheetSizes = array(); for ($i = 0; $i < $countSheets; ++$i) { - $this->_writerWorksheets[$i] = new PHPExcel_Writer_Excel5_Worksheet($this->_BIFF_version, - $this->_str_total, $this->_str_unique, - $this->_str_table, $this->_colors, - $this->_parser, - $this->_preCalculateFormulas, - $this->_phpExcel->getSheet($i)); - $this->_writerWorksheets[$i]->close(); $worksheetSizes[] = $this->_writerWorksheets[$i]->_datasize; } @@ -176,6 +191,7 @@ class PHPExcel_Writer_Excel5 implements PHPExcel_Writer_IWriter $res = $root->save($pFilename); PHPExcel_Calculation_Functions::setReturnDateType($saveDateReturnType); + PHPExcel_Calculation::getInstance()->writeDebugLog = $saveDebugLog; } /** @@ -208,4 +224,253 @@ class PHPExcel_Writer_Excel5 implements PHPExcel_Writer_IWriter $this->_preCalculateFormulas = $pValue; } + private function _buildWorksheetEschers() + { + // 1-based index to BstoreContainer + $blipIndex = 0; + + foreach ($this->_phpExcel->getAllsheets() as $sheet) { + // sheet index + $sheetIndex = $sheet->getParent()->getIndex($sheet); + + $escher = null; + + // check if there are any shapes for this sheet + if (count($sheet->getDrawingCollection()) == 0) { + continue; + } + + // create intermediate Escher object + $escher = new PHPExcel_Shared_Escher(); + + // dgContainer + $dgContainer = new PHPExcel_Shared_Escher_DgContainer(); + + // set the drawing index (we use sheet index + 1) + $dgId = $sheet->getParent()->getIndex($sheet) + 1; + $dgContainer->setDgId($dgId); + $escher->setDgContainer($dgContainer); + + // spgrContainer + $spgrContainer = new PHPExcel_Shared_Escher_DgContainer_SpgrContainer(); + $dgContainer->setSpgrContainer($spgrContainer); + + // add one shape which is the group shape + $spContainer = new PHPExcel_Shared_Escher_DgContainer_SpgrContainer_SpContainer(); + $spContainer->setSpgr(true); + $spContainer->setSpType(0); + $spContainer->setSpId(($sheet->getParent()->getIndex($sheet) + 1) << 10); + $spgrContainer->addChild($spContainer); + + // add the shapes + + $countShapes[$sheetIndex] = 0; // count number of shapes (minus group shape), in sheet + + foreach ($sheet->getDrawingCollection() as $drawing) { + ++$blipIndex; + + ++$countShapes[$sheetIndex]; + + // add the shape + $spContainer = new PHPExcel_Shared_Escher_DgContainer_SpgrContainer_SpContainer(); + + // set the shape type + $spContainer->setSpType(0x004B); + + // set the shape index (we combine 1-based sheet index and $countShapes to create unique shape index) + $reducedSpId = $countShapes[$sheetIndex]; + $spId = $reducedSpId + | ($sheet->getParent()->getIndex($sheet) + 1) << 10; + $spContainer->setSpId($spId); + + // keep track of last reducedSpId + $lastReducedSpId = $reducedSpId; + + // keep track of last spId + $lastSpId = $spId; + + // set the BLIP index + $spContainer->setOPT(0x4104, $blipIndex); + + // set coordinates and offsets, client anchor + $coordinates = $drawing->getCoordinates(); + $offsetX = $drawing->getOffsetX(); + $offsetY = $drawing->getOffsetY(); + $width = $drawing->getWidth(); + $height = $drawing->getHeight(); + + $twoAnchor = PHPExcel_Shared_Excel5::oneAnchor2twoAnchor($sheet, $coordinates, $offsetX, $offsetY, $width, $height); + + $spContainer->setStartCoordinates($twoAnchor['startCoordinates']); + $spContainer->setStartOffsetX($twoAnchor['startOffsetX']); + $spContainer->setStartOffsetY($twoAnchor['startOffsetY']); + $spContainer->setEndCoordinates($twoAnchor['endCoordinates']); + $spContainer->setEndOffsetX($twoAnchor['endOffsetX']); + $spContainer->setEndOffsetY($twoAnchor['endOffsetY']); + + $spgrContainer->addChild($spContainer); + } + + // identifier clusters, used for workbook Escher object + $this->_IDCLs[$dgId] = $lastReducedSpId; + + // set last shape index + $dgContainer->setLastSpId($lastSpId); + + // set the Escher object + $this->_writerWorksheets[$sheetIndex]->setEscher($escher); + } + } + + /** + * Build the Escher object corresponding to the MSODRAWINGGROUP record + */ + private function _buildWorkbookEscher() + { + $escher = null; + + // any drawings in this workbook? + $found = false; + foreach ($this->_phpExcel->getAllSheets() as $sheet) { + if (count($sheet->getDrawingCollection()) > 0) { + $found = true; + } + } + + // nothing to do if there are no drawings + if (!$found) { + return; + } + + // if we reach here, then there are drawings in the workbook + $escher = new PHPExcel_Shared_Escher(); + + // dggContainer + $dggContainer = new PHPExcel_Shared_Escher_DggContainer(); + $escher->setDggContainer($dggContainer); + + // set IDCLs (identifier clusters) + $dggContainer->setIDCLs($this->_IDCLs); + + // this loop is for determining maximum shape identifier of all drawing + $spIdMax = 0; + $totalCountShapes = 0; + $countDrawings = 0; + + foreach ($this->_phpExcel->getAllsheets() as $sheet) { + $sheetCountShapes = 0; // count number of shapes (minus group shape), in sheet + + if (count($sheet->getDrawingCollection()) > 0) { + ++$countDrawings; + + foreach ($sheet->getDrawingCollection() as $drawing) { + ++$sheetCountShapes; + ++$totalCountShapes; + + $spId = $sheetCountShapes + | ($this->_phpExcel->getIndex($sheet) + 1) << 10; + $spIdMax = max($spId, $spIdMax); + } + } + } + + $dggContainer->setSpIdMax($spIdMax + 1); + $dggContainer->setCDgSaved($countDrawings); + $dggContainer->setCSpSaved($totalCountShapes + $countDrawings); // total number of shapes incl. one group shapes per drawing + + // bstoreContainer + $bstoreContainer = new PHPExcel_Shared_Escher_DggContainer_BstoreContainer(); + $dggContainer->setBstoreContainer($bstoreContainer); + + // the BSE's (all the images) + foreach ($this->_phpExcel->getAllsheets() as $sheet) { + foreach ($sheet->getDrawingCollection() as $drawing) { + if ($drawing instanceof PHPExcel_Worksheet_Drawing) { + + $filename = $drawing->getPath(); + + list($imagesx, $imagesy, $imageFormat) = getimagesize($filename); + + switch ($imageFormat) { + + case 1: // GIF, not supported by BIFF8, we convert to PNG + $blipType = PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_PNG; + $imageResource = imagecreatefromgif($filename); + ob_start(); + imagepng($imageResource); + $blipData = ob_get_contents(); + ob_end_clean(); + break; + + case 2: // JPEG + $blipType = PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_JPEG; + $blipData = file_get_contents($filename); + break; + + case 3: // PNG + $blipType = PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_PNG; + $blipData = file_get_contents($filename); + break; + + case 6: // Windows DIB (BMP), we convert to PNG + $blipType = PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_PNG; + $imageResource = PHPExcel_Shared_Drawing::imagecreatefrombmp($filename); + ob_start(); + imagepng($imageResource); + $blipData = ob_get_contents(); + ob_end_clean(); + break; + + default: continue 2; + + } + + $blip = new PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE_Blip(); + $blip->setData($blipData); + + $BSE = new PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE(); + $BSE->setBlipType($blipType); + $BSE->setBlip($blip); + + $bstoreContainer->addBSE($BSE); + + } else if ($drawing instanceof PHPExcel_Worksheet_MemoryDrawing) { + + switch ($drawing->getRenderingFunction()) { + + case PHPExcel_Worksheet_MemoryDrawing::RENDERING_JPEG: + $blipType = PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_JPEG; + $renderingFunction = 'imagejpeg'; + break; + + case PHPExcel_Worksheet_MemoryDrawing::RENDERING_GIF: + case PHPExcel_Worksheet_MemoryDrawing::RENDERING_PNG: + case PHPExcel_Worksheet_MemoryDrawing::RENDERING_DEFAULT: + $blipType = PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_PNG; + $renderingFunction = 'imagepng'; + break; + + } + + ob_start(); + call_user_func($renderingFunction, $drawing->getImageResource()); + $blipData = ob_get_contents(); + ob_end_clean(); + + $blip = new PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE_Blip(); + $blip->setData($blipData); + + $BSE = new PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE(); + $BSE->setBlipType($blipType); + $BSE->setBlip($blip); + + $bstoreContainer->addBSE($BSE); + } + } + } + + // Set the Escher object + $this->_writerWorkbook->setEscher($escher); + } + } diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel5/BIFFwriter.php b/libraries/PHPExcel/PHPExcel/Writer/Excel5/BIFFwriter.php index 2c0a2d1..e758aeb 100644 --- a/libraries/PHPExcel/PHPExcel/Writer/Excel5/BIFFwriter.php +++ b/libraries/PHPExcel/PHPExcel/Writer/Excel5/BIFFwriter.php @@ -22,7 +22,7 @@ * @package PHPExcel_Writer_Excel5 * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ // Original file header of PEAR::Spreadsheet_Excel_Writer_BIFFwriter (used as the base for this class): diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel5/Escher.php b/libraries/PHPExcel/PHPExcel/Writer/Excel5/Escher.php index 402bd19..3c9c29f 100644 --- a/libraries/PHPExcel/PHPExcel/Writer/Excel5/Escher.php +++ b/libraries/PHPExcel/PHPExcel/Writer/Excel5/Escher.php @@ -22,7 +22,7 @@ * @package PHPExcel_Writer_Excel5 * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ @@ -106,9 +106,12 @@ class PHPExcel_Writer_Excel5_Escher , $this->_object->getCSpSaved() , $this->_object->getCDgSaved() // count total number of drawings saved ); + // add file identifier clusters (one per drawing) - for ($i = 0; $i < $this->_object->getCDgSaved(); ++$i) { - $dggData .= pack('VV', 0, 0); + $IDCLs = $this->_object->getIDCLs(); + + foreach ($IDCLs as $dgId => $maxReducedSpId) { + $dggData .= pack('VV', $dgId, $maxReducedSpId + 1); } $header = pack('vvV', $recVerInstance, $recType, strlen($dggData)); diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel5/Font.php b/libraries/PHPExcel/PHPExcel/Writer/Excel5/Font.php index bb4d201..2928070 100644 --- a/libraries/PHPExcel/PHPExcel/Writer/Excel5/Font.php +++ b/libraries/PHPExcel/PHPExcel/Writer/Excel5/Font.php @@ -22,7 +22,7 @@ * @package PHPExcel_Writer_Excel5 * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel5/Parser.php b/libraries/PHPExcel/PHPExcel/Writer/Excel5/Parser.php index cef650f..eb9891e 100644 --- a/libraries/PHPExcel/PHPExcel/Writer/Excel5/Parser.php +++ b/libraries/PHPExcel/PHPExcel/Writer/Excel5/Parser.php @@ -22,7 +22,7 @@ * @package PHPExcel_Writer_Excel5 * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ // Original file header of PEAR::Spreadsheet_Excel_Writer_Parser (used as the base for this class): @@ -1148,6 +1148,9 @@ class PHPExcel_Writer_Excel5_Parser case "<>": return $token; break; + case "^": + return $token; + break; default: // if it's a reference A1 or $A$1 or $A1 or A$1 if (preg_match('/^\$?[A-Ia-i]?[A-Za-z]\$?[0-9]+$/',$token) and @@ -1288,19 +1291,30 @@ class PHPExcel_Writer_Excel5_Parser $result2 = $this->_expression(); $result = $this->_createTree('ptgUminus', $result2, ''); return $result; + } elseif ($this->_current_token == "+") { + // catch "+" Term + $this->_advance(); + $result2 = $this->_expression(); + $result = $this->_createTree('ptgUplus', $result2, ''); + return $result; } $result = $this->_term(); while (($this->_current_token == "+") or - ($this->_current_token == "-")) { + ($this->_current_token == "-") or + ($this->_current_token == "^")) { /**/ if ($this->_current_token == "+") { $this->_advance(); $result2 = $this->_term(); $result = $this->_createTree('ptgAdd', $result, $result2); - } else { + } elseif ($this->_current_token == "-") { $this->_advance(); $result2 = $this->_term(); $result = $this->_createTree('ptgSub', $result, $result2); + } else { + $this->_advance(); + $result2 = $this->_term(); + $result = $this->_createTree('ptgPower', $result, $result2); } } return $result; diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel5/Workbook.php b/libraries/PHPExcel/PHPExcel/Writer/Excel5/Workbook.php index d26ddee..6e517e6 100644 --- a/libraries/PHPExcel/PHPExcel/Writer/Excel5/Workbook.php +++ b/libraries/PHPExcel/PHPExcel/Writer/Excel5/Workbook.php @@ -22,7 +22,7 @@ * @package PHPExcel_Writer_Excel5 * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ // Original file header of PEAR::Spreadsheet_Excel_Writer_Workbook (used as the base for this class): @@ -182,6 +182,13 @@ class PHPExcel_Writer_Excel5_Workbook extends PHPExcel_Writer_Excel5_BIFFwriter */ private $_colors; + /** + * Escher object corresponding to MSODRAWINGGROUP + * + * @var PHPExcel_Shared_Escher + */ + private $_escher; + /** * Class constructor @@ -1400,143 +1407,9 @@ class PHPExcel_Writer_Excel5_Workbook extends PHPExcel_Writer_Excel5_BIFFwriter */ private function _writeMsoDrawingGroup() { - // any drawings in this workbook? - $found = false; - foreach ($this->_phpExcel->getAllSheets() as $sheet) { - if (count($sheet->getDrawingCollection()) > 0) { - $found = true; - } - } - - // if there are drawings, then we need to write MSODRAWINGGROUP record - if ($found) { - - // create intermediate Escher object - $escher = new PHPExcel_Shared_Escher(); - - // dggContainer - $dggContainer = new PHPExcel_Shared_Escher_DggContainer(); - $escher->setDggContainer($dggContainer); - - // this loop is for determining maximum shape identifier of all drawing - $spIdMax = 0; - $totalCountShapes = 0; - $countDrawings = 0; - - foreach ($this->_phpExcel->getAllsheets() as $sheet) { - $sheetCountShapes = 0; // count number of shapes (minus group shape), in sheet - - if (count($sheet->getDrawingCollection()) > 0) { - ++$countDrawings; - - foreach ($sheet->getDrawingCollection() as $drawing) { - ++$sheetCountShapes; - ++$totalCountShapes; - - $spId = $sheetCountShapes - | ($this->_phpExcel->getIndex($sheet) + 1) << 10; - $spIdMax = max($spId, $spIdMax); - } - } - } - - $dggContainer->setSpIdMax($spIdMax + 1); - $dggContainer->setCDgSaved($countDrawings); - $dggContainer->setCSpSaved($totalCountShapes + $countDrawings); // total number of shapes incl. one group shapes per drawing - - // bstoreContainer - $bstoreContainer = new PHPExcel_Shared_Escher_DggContainer_BstoreContainer(); - $dggContainer->setBstoreContainer($bstoreContainer); - - // the BSE's (all the images) - foreach ($this->_phpExcel->getAllsheets() as $sheet) { - foreach ($sheet->getDrawingCollection() as $drawing) { - if ($drawing instanceof PHPExcel_Worksheet_Drawing) { - - $filename = $drawing->getPath(); - - list($imagesx, $imagesy, $imageFormat) = getimagesize($filename); - - switch ($imageFormat) { - - case 1: // GIF, not supported by BIFF8, we convert to PNG - $blipType = PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_PNG; - $imageResource = imagecreatefromgif($filename); - ob_start(); - imagepng($imageResource); - $blipData = ob_get_contents(); - ob_end_clean(); - break; - - case 2: // JPEG - $blipType = PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_JPEG; - $blipData = file_get_contents($filename); - break; - - case 3: // PNG - $blipType = PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_PNG; - $blipData = file_get_contents($filename); - break; - - case 6: // Windows DIB (BMP), we convert to PNG - $blipType = PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_PNG; - $imageResource = PHPExcel_Shared_Drawing::imagecreatefrombmp($filename); - ob_start(); - imagepng($imageResource); - $blipData = ob_get_contents(); - ob_end_clean(); - break; - - default: continue 2; - - } - - $blip = new PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE_Blip(); - $blip->setData($blipData); - - $BSE = new PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE(); - $BSE->setBlipType($blipType); - $BSE->setBlip($blip); - - $bstoreContainer->addBSE($BSE); - - } else if ($drawing instanceof PHPExcel_Worksheet_MemoryDrawing) { - - switch ($drawing->getRenderingFunction()) { - - case PHPExcel_Worksheet_MemoryDrawing::RENDERING_JPEG: - $blipType = PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_JPEG; - $renderingFunction = 'imagejpeg'; - break; - - case PHPExcel_Worksheet_MemoryDrawing::RENDERING_GIF: - case PHPExcel_Worksheet_MemoryDrawing::RENDERING_PNG: - case PHPExcel_Worksheet_MemoryDrawing::RENDERING_DEFAULT: - $blipType = PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_PNG; - $renderingFunction = 'imagepng'; - break; - - } - - ob_start(); - call_user_func($renderingFunction, $drawing->getImageResource()); - $blipData = ob_get_contents(); - ob_end_clean(); - - $blip = new PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE_Blip(); - $blip->setData($blipData); - - $BSE = new PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE(); - $BSE->setBlipType($blipType); - $BSE->setBlip($blip); - - $bstoreContainer->addBSE($BSE); - } - } - } - - // write the Escher stream from the intermediate Escher object - $writer = new PHPExcel_Writer_Excel5_Escher($escher); + // write the Escher stream if necessary + if (isset($this->_escher)) { + $writer = new PHPExcel_Writer_Excel5_Escher($this->_escher); $data = $writer->close(); $record = 0x00EB; @@ -1544,7 +1417,30 @@ class PHPExcel_Writer_Excel5_Workbook extends PHPExcel_Writer_Excel5_BIFFwriter $header = pack("vv", $record, $length); return $this->writeData($header . $data); + + } else { + return ''; } } + /** + * Get Escher object + * + * @return PHPExcel_Shared_Escher + */ + public function getEscher() + { + return $this->_escher; + } + + /** + * Set Escher object + * + * @param PHPExcel_Shared_Escher $pValue + */ + public function setEscher(PHPExcel_Shared_Escher $pValue = null) + { + $this->_escher = $pValue; + } + } diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel5/Worksheet.php b/libraries/PHPExcel/PHPExcel/Writer/Excel5/Worksheet.php index 646101a..0dd2b00 100644 --- a/libraries/PHPExcel/PHPExcel/Writer/Excel5/Worksheet.php +++ b/libraries/PHPExcel/PHPExcel/Writer/Excel5/Worksheet.php @@ -22,7 +22,7 @@ * @package PHPExcel_Writer_Excel5 * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ // Original file header of PEAR::Spreadsheet_Excel_Writer_Worksheet (used as the base for this class): @@ -186,6 +186,13 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter private $_countCellStyleXfs; /** + * Escher object corresponding to MSODRAWING + * + * @var PHPExcel_Shared_Escher + */ + private $_escher; + + /** * Constructor * * @param int $BIFF_version BIFF version @@ -2694,142 +2701,82 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter } /** - * Write MSODRAWING record + * Get Escher object + * + * @return PHPExcel_Shared_Escher */ - private function _writeMsoDrawing() + public function getEscher() { - // check if there are any shapes for this sheet - if (count($this->_phpSheet->getDrawingCollection()) == 0) { - return; - } - - // create intermediate Escher object - $escher = new PHPExcel_Shared_Escher(); - - // dgContainer - $dgContainer = new PHPExcel_Shared_Escher_DgContainer(); - - // set the drawing index (we use sheet index + 1) - $dgContainer->setDgId($this->_phpSheet->getParent()->getIndex($this->_phpSheet) + 1); - $escher->setDgContainer($dgContainer); - - // spgrContainer - $spgrContainer = new PHPExcel_Shared_Escher_DgContainer_SpgrContainer(); - $dgContainer->setSpgrContainer($spgrContainer); - - // add one shape which is the group shape - $spContainer = new PHPExcel_Shared_Escher_DgContainer_SpgrContainer_SpContainer(); - $spContainer->setSpgr(true); - $spContainer->setSpType(0); - $spContainer->setSpId(($this->_phpSheet->getParent()->getIndex($this->_phpSheet) + 1) << 10); - $spgrContainer->addChild($spContainer); - - // add the shapes - - // outer loop is for determining BSE index - $blipIndex = 0; // 1-based index to BstoreContainer - - $countShapes = 0; // count number of shapes (minus group shape), in this sheet - - foreach ($this->_phpSheet->getParent()->getAllsheets() as $sheet) { - foreach ($sheet->getDrawingCollection() as $drawing) { - ++$blipIndex; - - if ($sheet === $this->_phpSheet) { - ++$countShapes; - - // add the shape - $spContainer = new PHPExcel_Shared_Escher_DgContainer_SpgrContainer_SpContainer(); - - // set the shape type - $spContainer->setSpType(0x004B); - - // set the shape index (we combine 1-based sheet index and $countShapes to create unique shape index) - $spId = $countShapes - | ($this->_phpSheet->getParent()->getIndex($this->_phpSheet) + 1) << 10; - $spContainer->setSpId($spId); - - // keep track of last spId - $lastSpId = $spId; - - // set the BLIP index - $spContainer->setOPT(0x4104, $blipIndex); - - // set coordinates and offsets, client anchor - $coordinates = $drawing->getCoordinates(); - $offsetX = $drawing->getOffsetX(); - $offsetY = $drawing->getOffsetY(); - $width = $drawing->getWidth(); - $height = $drawing->getHeight(); - - $twoAnchor = PHPExcel_Shared_Excel5::oneAnchor2twoAnchor($this->_phpSheet, $coordinates, $offsetX, $offsetY, $width, $height); + return $this->_escher; + } - $spContainer->setStartCoordinates($twoAnchor['startCoordinates']); - $spContainer->setStartOffsetX($twoAnchor['startOffsetX']); - $spContainer->setStartOffsetY($twoAnchor['startOffsetY']); - $spContainer->setEndCoordinates($twoAnchor['endCoordinates']); - $spContainer->setEndOffsetX($twoAnchor['endOffsetX']); - $spContainer->setEndOffsetY($twoAnchor['endOffsetY']); + /** + * Set Escher object + * + * @param PHPExcel_Shared_Escher $pValue + */ + public function setEscher(PHPExcel_Shared_Escher $pValue = null) + { + $this->_escher = $pValue; + } - $spgrContainer->addChild($spContainer); - } + /** + * Write MSODRAWING record + */ + private function _writeMsoDrawing() + { + // write the Escher stream if necessary + if (isset($this->_escher)) { + $writer = new PHPExcel_Writer_Excel5_Escher($this->_escher); + $data = $writer->close(); + $spOffsets = $writer->getSpOffsets(); + + // write the neccesary MSODRAWING, OBJ records + + // split the Escher stream + $spOffsets[0] = 0; + $nm = count($spOffsets) - 1; // number of shapes excluding first shape + for ($i = 1; $i <= $nm; ++$i) { + // MSODRAWING record + $record = 0x00EC; // Record identifier + + // chunk of Escher stream for one shape + + $dataChunk = substr($data, $spOffsets[$i -1], $spOffsets[$i] - $spOffsets[$i - 1]); + + $length = strlen($dataChunk); + $header = pack("vv", $record, $length); + + $this->_append($header . $dataChunk); + + // OBJ record + $record = 0x005D; // record identifier + $objData = ''; + + // ftCmo + $objData .= + pack('vvvvvVVV' + , 0x0015 // 0x0015 = ftCmo + , 0x0012 // length of ftCmo data + , 0x0008 // object type, 0x0008 = picture + , $i // object id number, Excel seems to use 1-based index, local for the sheet + , 0x6011 // option flags, 0x6011 is what OpenOffice.org uses + , 0 // reserved + , 0 // reserved + , 0 // reserved + ); + // ftEnd + $objData .= + pack('vv' + , 0x0000 // 0x0000 = ftEnd + , 0x0000 // length of ftEnd data + ); + + $length = strlen($objData); + $header = pack('vv', $record, $length); + $this->_append($header . $objData); } } - - // set last shape index - $dgContainer->setLastSpId($lastSpId); - - // write the Escher stream - $writer = new PHPExcel_Writer_Excel5_Escher($escher); - $data = $writer->close(); - $spOffsets = $writer->getSpOffsets(); - - // write the neccesary MSODRAWING, OBJ records - - // split the Escher stream - $spOffsets[0] = 0; - $nm = count($spOffsets) - 1; // number of shapes excluding first shape - for ($i = 1; $i <= $nm; ++$i) { - // MSODRAWING record - $record = 0x00EC; // Record identifier - - // chunk of Escher stream for one shape - - $dataChunk = substr($data, $spOffsets[$i -1], $spOffsets[$i] - $spOffsets[$i - 1]); - - $length = strlen($dataChunk); - $header = pack("vv", $record, $length); - - $this->_append($header . $dataChunk); - - // OBJ record - $record = 0x005D; // record identifier - $objData = ''; - - // ftCmo - $objData .= - pack('vvvvvVVV' - , 0x0015 // 0x0015 = ftCmo - , 0x0012 // length of ftCmo data - , 0x0008 // object type, 0x0008 = picture - , $i // object id number, Excel seems to use 1-based index, local for the sheet - , 0x6011 // option flags, 0x6011 is what OpenOffice.org uses - , 0 // reserved - , 0 // reserved - , 0 // reserved - ); - // ftEnd - $objData .= - pack('vv' - , 0x0000 // 0x0000 = ftEnd - , 0x0000 // length of ftEnd data - ); - - $length = strlen($objData); - $header = pack('vv', $record, $length); - $this->_append($header . $objData); - } - } /** @@ -3006,4 +2953,4 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter return 0; } -} +} \ No newline at end of file diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel5/Xf.php b/libraries/PHPExcel/PHPExcel/Writer/Excel5/Xf.php index 9246a34..27632f3 100644 --- a/libraries/PHPExcel/PHPExcel/Writer/Excel5/Xf.php +++ b/libraries/PHPExcel/PHPExcel/Writer/Excel5/Xf.php @@ -22,7 +22,7 @@ * @package PHPExcel_Writer_Excel5 * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ // Original file header of PEAR::Spreadsheet_Excel_Writer_Format (used as the base for this class): diff --git a/libraries/PHPExcel/PHPExcel/Writer/HTML.php b/libraries/PHPExcel/PHPExcel/Writer/HTML.php index 3c892cf..b6667f5 100644 --- a/libraries/PHPExcel/PHPExcel/Writer/HTML.php +++ b/libraries/PHPExcel/PHPExcel/Writer/HTML.php @@ -22,7 +22,7 @@ * @package PHPExcel_Writer * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ @@ -152,6 +152,8 @@ class PHPExcel_Writer_HTML implements PHPExcel_Writer_IWriter { // garbage collect $this->_phpExcel->garbageCollect(); + $saveDebugLog = PHPExcel_Calculation::getInstance()->writeDebugLog; + PHPExcel_Calculation::getInstance()->writeDebugLog = false; $saveArrayReturnType = PHPExcel_Calculation::getArrayReturnType(); PHPExcel_Calculation::setArrayReturnType(PHPExcel_Calculation::RETURN_ARRAY_AS_VALUE); @@ -182,6 +184,7 @@ class PHPExcel_Writer_HTML implements PHPExcel_Writer_IWriter { fclose($fileHandle); PHPExcel_Calculation::setArrayReturnType($saveArrayReturnType); + PHPExcel_Calculation::getInstance()->writeDebugLog = $saveDebugLog; } /** @@ -330,7 +333,7 @@ class PHPExcel_Writer_HTML implements PHPExcel_Writer_IWriter { // row min,max $rowMin = $dimension[0][1]; $rowMax = $dimension[1][1]; - + // calculate start of <tbody>, <thead> $tbodyStart = $rowMin; $tbodyEnd = $rowMax; @@ -338,7 +341,7 @@ class PHPExcel_Writer_HTML implements PHPExcel_Writer_IWriter { $theadEnd = 0; // default: no </thead> if ($sheet->getPageSetup()->isRowsToRepeatAtTopSet()) { $rowsToRepeatAtTop = $sheet->getPageSetup()->getRowsToRepeatAtTop(); - + // we can only support repeating rows that start at top row if ($rowsToRepeatAtTop[0] == 1) { $theadStart = $rowsToRepeatAtTop[0]; @@ -346,7 +349,7 @@ class PHPExcel_Writer_HTML implements PHPExcel_Writer_IWriter { $tbodyStart = $rowsToRepeatAtTop[1] + 1; } } - + // Loop through cells $rowData = null; for ($row = $rowMin; $row <= $rowMax; ++$row) { diff --git a/libraries/PHPExcel/PHPExcel/Writer/IWriter.php b/libraries/PHPExcel/PHPExcel/Writer/IWriter.php index ec5331e..35fd689 100644 --- a/libraries/PHPExcel/PHPExcel/Writer/IWriter.php +++ b/libraries/PHPExcel/PHPExcel/Writer/IWriter.php @@ -22,7 +22,7 @@ * @package PHPExcel_Writer * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Writer/PDF.php b/libraries/PHPExcel/PHPExcel/Writer/PDF.php index 570ce9d..f588635 100644 --- a/libraries/PHPExcel/PHPExcel/Writer/PDF.php +++ b/libraries/PHPExcel/PHPExcel/Writer/PDF.php @@ -22,7 +22,7 @@ * @package PHPExcel_Writer * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ diff --git a/libraries/PHPExcel/PHPExcel/Writer/Serialized.php b/libraries/PHPExcel/PHPExcel/Writer/Serialized.php index 603c4f7..51616b4 100644 --- a/libraries/PHPExcel/PHPExcel/Writer/Serialized.php +++ b/libraries/PHPExcel/PHPExcel/Writer/Serialized.php @@ -22,7 +22,7 @@ * @package PHPExcel_Writer * @copyright Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version 1.7.3c, 2010-06-01 + * @version 1.7.4, 2010-08-26 */ @@ -163,10 +163,10 @@ class PHPExcel_Writer_Serialized implements PHPExcel_Writer_IWriter // PHPExcel $objWriter->startElement('PHPExcel'); - $objWriter->writeAttribute('version', '1.7.3c'); + $objWriter->writeAttribute('version', '1.7.4'); // Comment - $objWriter->writeComment('This file has been generated using PHPExcel v1.7.3c (http://www.codeplex.com/PHPExcel) It contains a base64 encoded serialized version of the PHPExcel internal object.'); + $objWriter->writeComment('This file has been generated using PHPExcel v1.7.4 (http://www.codeplex.com/PHPExcel) It contains a base64 encoded serialized version of the PHPExcel internal object.'); // Data $objWriter->startElement('data'); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_7-10090-ge539a03
by Dieter Adriaenssens 11 Sep '10

11 Sep '10

The branch, master has been updated via e539a03ef938fb5df7950603bc196d2506c2c9b4 (commit) via f5879655d58812b978dc975e5dc8d8497d11a3c3 (commit) from 4c61dc7f6b59bf7579ce6da9633a689191a3846f (commit) - Log ----------------------------------------------------------------- commit e539a03ef938fb5df7950603bc196d2506c2c9b4 Merge: 4c61dc7f6b59bf7579ce6da9633a689191a3846f f5879655d58812b978dc975e5dc8d8497d11a3c3 Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net> Date: Sat Sep 11 11:03:15 2010 +0200 Merge branch 'QA_3_3' ----------------------------------------------------------------------- Summary of changes: libraries/import.lib.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libraries/import.lib.php b/libraries/import.lib.php index bacc6a4..98221de 100644 --- a/libraries/import.lib.php +++ b/libraries/import.lib.php @@ -739,7 +739,7 @@ function PMA_detectType($last_cumulative_type, &$cell) { if ($cell == (string)(float)$cell && strpos($cell, ".") !== false && substr_count($cell, ".") == 1) { return DECIMAL; } else { - if ($cell > 2147483647) { + if (abs($cell) > 2147483647) { return BIGINT; } else { return INT; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_7-8-gf587965
by Dieter Adriaenssens 11 Sep '10

11 Sep '10

The branch, QA_3_3 has been updated via f5879655d58812b978dc975e5dc8d8497d11a3c3 (commit) from 194e357a996310225364d311e6c27ed41db002bb (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: libraries/import.lib.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libraries/import.lib.php b/libraries/import.lib.php index 278028b..24b27db 100644 --- a/libraries/import.lib.php +++ b/libraries/import.lib.php @@ -744,7 +744,7 @@ function PMA_detectType($last_cumulative_type, &$cell) { if ($cell == (string)(float)$cell && strpos($cell, ".") !== false && substr_count($cell, ".") == 1) { return DECIMAL; } else { - if ($cell > 2147483647) { + if (abs($cell) > 2147483647) { return BIGINT; } else { return INT; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_7-10088-g4c61dc7
by Marc Delisle 10 Sep '10

10 Sep '10

The branch, master has been updated via 4c61dc7f6b59bf7579ce6da9633a689191a3846f (commit) via 7f6b17052bac46e0b3aaa4dad79b3b4c40368177 (commit) from 77b6fb172d3099c54335e05e12859b5d8ca42950 (commit) - Log ----------------------------------------------------------------- commit 4c61dc7f6b59bf7579ce6da9633a689191a3846f Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Sep 10 12:46:45 2010 -0400 update .po files commit 7f6b17052bac46e0b3aaa4dad79b3b4c40368177 Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Sep 10 12:46:02 2010 -0400 Not really restart insertion but continue insertion ----------------------------------------------------------------------- Summary of changes: po/af.po | 52 ++++++++++++++++---------------- po/ar.po | 60 ++++++++++++++++++------------------ po/az.po | 52 ++++++++++++++++---------------- po/be.po | 63 +++++++++++++++++++------------------- po/be(a)latin.po | 75 +++++++++++++++++++++++---------------------- po/bg.po | 56 +++++++++++++++++----------------- po/bn.po | 64 +++++++++++++++++++------------------- po/bs.po | 52 ++++++++++++++++---------------- po/ca.po | 67 ++++++++++++++++++++-------------------- po/cs.po | 72 ++++++++++++++++++++++---------------------- po/cy.po | 56 +++++++++++++++++----------------- po/da.po | 60 ++++++++++++++++++------------------ po/de.po | 67 ++++++++++++++++++++-------------------- po/el.po | 87 +++++++++++++++++++++++++++-------------------------- po/en_GB.po | 82 +++++++++++++++++++++++--------------------------- po/es.po | 67 ++++++++++++++++++++-------------------- po/et.po | 52 ++++++++++++++++---------------- po/eu.po | 52 ++++++++++++++++---------------- po/fa.po | 68 ++++++++++++++++++++-------------------- po/fi.po | 63 +++++++++++++++++++------------------- po/fr.po | 65 ++++++++++++++++++++------------------- po/gl.po | 67 ++++++++++++++++++++-------------------- po/he.po | 52 ++++++++++++++++---------------- po/hi.po | 56 +++++++++++++++++----------------- po/hr.po | 67 ++++++++++++++++++++-------------------- po/hu.po | 75 +++++++++++++++++++++++---------------------- po/id.po | 60 ++++++++++++++++++------------------ po/it.po | 59 ++++++++++++++++++----------------- po/ja.po | 59 ++++++++++++++++++----------------- po/ka.po | 75 +++++++++++++++++++++++---------------------- po/ko.po | 60 ++++++++++++++++++------------------ po/lt.po | 64 +++++++++++++++++++------------------- po/lv.po | 56 +++++++++++++++++----------------- po/mk.po | 52 ++++++++++++++++---------------- po/mn.po | 60 ++++++++++++++++++------------------ po/ms.po | 52 ++++++++++++++++---------------- po/nb.po | 68 +++++++++++++++++++---------------------- po/nl.po | 59 ++++++++++++++++++----------------- po/phpmyadmin.pot | 51 +++++++++++++++---------------- po/pl.po | 75 +++++++++++++++++++++++---------------------- po/pt.po | 52 ++++++++++++++++---------------- po/pt_BR.po | 55 +++++++++++++++++---------------- po/ro.po | 63 +++++++++++++++++++------------------- po/ru.po | 76 +++++++++++++++++++++++----------------------- po/si.po | 64 +++++++++++++++++++------------------- po/sk.po | 64 +++++++++++++++++++------------------- po/sl.po | 65 ++++++++++++++++++--------------------- po/sq.po | 52 ++++++++++++++++---------------- po/sr.po | 63 +++++++++++++++++++------------------- po/sr(a)latin.po | 63 +++++++++++++++++++------------------- po/sv.po | 63 +++++++++++++++++++------------------- po/ta.po | 52 ++++++++++++++++---------------- po/te.po | 52 ++++++++++++++++---------------- po/th.po | 52 ++++++++++++++++---------------- po/tr.po | 59 ++++++++++++++++++----------------- po/tt.po | 56 +++++++++++++++++----------------- po/ug.po | 64 +++++++++++++++++++------------------- po/uk.po | 60 ++++++++++++++++++------------------ po/ur.po | 60 ++++++++++++++++++------------------ po/uz.po | 75 +++++++++++++++++++++++---------------------- po/uz(a)latin.po | 87 +++++++++++++++++++++++++++-------------------------- po/zh_CN.po | 66 ++++++++++++++++++++-------------------- po/zh_TW.po | 52 ++++++++++++++++---------------- tbl_change.php | 6 ++-- 64 files changed, 1964 insertions(+), 1956 deletions(-) diff --git a/po/af.po b/po/af.po index 831d015..7568710 100644 --- a/po/af.po +++ b/po/af.po @@ -3,14 +3,14 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-09-07 15:21+0200\n" +"POT-Creation-Date: 2010-09-10 12:46-0400\n" "PO-Revision-Date: 2010-03-30 23:04+0200\n" "Last-Translator: Michal <michal(a)cihar.com>\n" "Language-Team: afrikaans <af(a)li.org>\n" -"Language: af\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: af\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.1\n" @@ -614,7 +614,7 @@ msgstr "Voeg by" #: libraries/config/user_preferences.forms.php:228 #: libraries/config/user_preferences.forms.php:262 #: libraries/db_links.inc.php:48 libraries/export/latex.php:351 -#: libraries/import.lib.php:1136 libraries/tbl_links.inc.php:54 +#: libraries/import.lib.php:1148 libraries/tbl_links.inc.php:54 #: pmd_general.php:133 server_privileges.php:595 server_replication.php:313 #: tbl_create.php:305 tbl_tracking.php:263 msgid "Structure" @@ -663,8 +663,8 @@ msgstr "" #: db_structure.php:404 libraries/display_tbl.lib.php:1945 #, 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 "" #: db_structure.php:418 db_structure.php:432 libraries/header.inc.php:138 @@ -873,8 +873,8 @@ msgstr "" #: 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 "" #: import.php:277 import.php:330 libraries/File.class.php:566 @@ -1564,8 +1564,8 @@ msgstr "Kommentaar" #: libraries/Index.class.php:465 libraries/common.lib.php:610 #: libraries/common.lib.php:1143 libraries/config/messages.inc.php:459 -#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1119 -#: libraries/import.lib.php:1143 libraries/schema/User_Schema.class.php:168 +#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1131 +#: libraries/import.lib.php:1155 libraries/schema/User_Schema.class.php:168 #: setup/frames/index.inc.php:125 tbl_row_action.php:68 msgid "Edit" msgstr "Verander" @@ -1705,8 +1705,8 @@ msgstr "Welkom by %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 "" #: libraries/auth/config.auth.lib.php:115 @@ -2103,7 +2103,7 @@ msgstr "" #: libraries/config.values.php:95 libraries/export/htmlword.php:24 #: libraries/export/latex.php:41 libraries/export/odt.php:33 #: libraries/export/sql.php:79 libraries/export/texytext.php:23 -#: libraries/import.lib.php:1141 +#: libraries/import.lib.php:1153 #, fuzzy msgid "structure" msgstr "Struktuur" @@ -4493,8 +4493,8 @@ msgstr "" #, 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 "" #: libraries/display_export.lib.php:275 @@ -4668,7 +4668,7 @@ msgstr "" #: libraries/export/sql.php:55 libraries/export/texytext.php:30 #: libraries/export/xls.php:28 libraries/export/xlsx.php:28 #: libraries/export/xml.php:25 libraries/export/yaml.php:29 -#: libraries/import.lib.php:1114 libraries/import.lib.php:1136 +#: libraries/import.lib.php:1126 libraries/import.lib.php:1148 #: libraries/import/csv.php:32 libraries/import/docsql.php:34 #: libraries/import/ldi.php:48 libraries/import/ods.php:32 #: libraries/import/sql.php:19 libraries/import/xls.php:27 @@ -5459,38 +5459,38 @@ msgstr "Voortgebring deur" msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL het niks teruggegee nie (dus nul rye)." -#: libraries/import.lib.php:1110 +#: libraries/import.lib.php:1122 msgid "" "The following structures have either been created or altered. Here you can:" msgstr "" -#: libraries/import.lib.php:1111 +#: libraries/import.lib.php:1123 msgid "View a structure`s contents by clicking on its name" msgstr "" -#: libraries/import.lib.php:1112 +#: libraries/import.lib.php:1124 msgid "" "Change any of its settings by clicking the corresponding \"Options\" link" msgstr "" -#: libraries/import.lib.php:1113 +#: libraries/import.lib.php:1125 msgid "Edit its structure by following the \"Structure\" link" msgstr "" -#: libraries/import.lib.php:1116 +#: libraries/import.lib.php:1128 #, fuzzy msgid "Go to database" msgstr "Geen databasisse" -#: libraries/import.lib.php:1119 libraries/import.lib.php:1143 +#: libraries/import.lib.php:1131 libraries/import.lib.php:1155 msgid "settings" msgstr "" -#: libraries/import.lib.php:1138 +#: libraries/import.lib.php:1150 msgid "Go to table" msgstr "" -#: libraries/import.lib.php:1147 +#: libraries/import.lib.php:1159 msgid "Go to view" msgstr "" @@ -7380,8 +7380,8 @@ msgstr "" 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 "" #: server_privileges.php:1776 @@ -8843,7 +8843,7 @@ msgstr "" #: tbl_change.php:1106 #, php-format -msgid "Restart insertion with %s rows" +msgid "Continue insertion with %s rows" msgstr "" #: tbl_chart.php:56 diff --git a/po/ar.po b/po/ar.po index f223f23..bedb60c 100644 --- a/po/ar.po +++ b/po/ar.po @@ -3,14 +3,14 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-09-07 15:21+0200\n" +"POT-Creation-Date: 2010-09-10 12:46-0400\n" "PO-Revision-Date: 2010-05-29 14:16+0200\n" "Last-Translator: Ahmed <aa.mahdawy.10(a)gmail.com>\n" "Language-Team: arabic <ar(a)li.org>\n" -"Language: ar\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: ar\n" "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 " "&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n" "X-Generator: Pootle 2.0.1\n" @@ -349,8 +349,8 @@ msgid "" "The phpMyAdmin configuration storage has been deactivated. To find out why " "click %shere%s." msgstr "" -"تم تعطيل المزايا الإضافية للعمل بالجداول المترابطة. لمعرفة السبب اضغط %sهنا" -"%s." +"تم تعطيل المزايا الإضافية للعمل بالجداول المترابطة. لمعرفة السبب اضغط %sهنا%" +"s." #: db_operations.php:549 #, fuzzy @@ -619,7 +619,7 @@ msgstr "إدخال" #: libraries/config/user_preferences.forms.php:228 #: libraries/config/user_preferences.forms.php:262 #: libraries/db_links.inc.php:48 libraries/export/latex.php:351 -#: libraries/import.lib.php:1136 libraries/tbl_links.inc.php:54 +#: libraries/import.lib.php:1148 libraries/tbl_links.inc.php:54 #: pmd_general.php:133 server_privileges.php:595 server_replication.php:313 #: tbl_create.php:305 tbl_tracking.php:263 msgid "Structure" @@ -668,8 +668,8 @@ msgstr "" #: db_structure.php:404 libraries/display_tbl.lib.php:1945 #, 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 "" #: db_structure.php:418 db_structure.php:432 libraries/header.inc.php:138 @@ -875,8 +875,8 @@ msgstr "تم حفظ الـDump إلى الملف %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 "" #: import.php:277 import.php:330 libraries/File.class.php:566 @@ -1570,8 +1570,8 @@ msgstr "تعليق" #: libraries/Index.class.php:465 libraries/common.lib.php:610 #: libraries/common.lib.php:1143 libraries/config/messages.inc.php:459 -#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1119 -#: libraries/import.lib.php:1143 libraries/schema/User_Schema.class.php:168 +#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1131 +#: libraries/import.lib.php:1155 libraries/schema/User_Schema.class.php:168 #: setup/frames/index.inc.php:125 tbl_row_action.php:68 msgid "Edit" msgstr "تحرير" @@ -1711,8 +1711,8 @@ msgstr "أهلا بك في %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 "" #: libraries/auth/config.auth.lib.php:115 @@ -2113,7 +2113,7 @@ msgstr "الدليل الذي حددته لتحميل عملك لا يمكن ا #: libraries/config.values.php:95 libraries/export/htmlword.php:24 #: libraries/export/latex.php:41 libraries/export/odt.php:33 #: libraries/export/sql.php:79 libraries/export/texytext.php:23 -#: libraries/import.lib.php:1141 +#: libraries/import.lib.php:1153 msgid "structure" msgstr "" @@ -4516,8 +4516,8 @@ msgstr "" #, 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 "" #: libraries/display_export.lib.php:275 @@ -4697,7 +4697,7 @@ msgstr "رتب حسب المفتاح" #: libraries/export/sql.php:55 libraries/export/texytext.php:30 #: libraries/export/xls.php:28 libraries/export/xlsx.php:28 #: libraries/export/xml.php:25 libraries/export/yaml.php:29 -#: libraries/import.lib.php:1114 libraries/import.lib.php:1136 +#: libraries/import.lib.php:1126 libraries/import.lib.php:1148 #: libraries/import/csv.php:32 libraries/import/docsql.php:34 #: libraries/import/ldi.php:48 libraries/import/ods.php:32 #: libraries/import/sql.php:19 libraries/import/xls.php:27 @@ -5491,37 +5491,37 @@ msgstr "أنشئ بواسطة" msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL قام بإرجاع نتيجة إعداد فارغه (مثلا صف صفري)." -#: libraries/import.lib.php:1110 +#: libraries/import.lib.php:1122 msgid "" "The following structures have either been created or altered. Here you can:" msgstr "" -#: libraries/import.lib.php:1111 +#: libraries/import.lib.php:1123 msgid "View a structure`s contents by clicking on its name" msgstr "" -#: libraries/import.lib.php:1112 +#: libraries/import.lib.php:1124 msgid "" "Change any of its settings by clicking the corresponding \"Options\" link" msgstr "" -#: libraries/import.lib.php:1113 +#: libraries/import.lib.php:1125 msgid "Edit its structure by following the \"Structure\" link" msgstr "" -#: libraries/import.lib.php:1116 +#: libraries/import.lib.php:1128 msgid "Go to database" msgstr "" -#: libraries/import.lib.php:1119 libraries/import.lib.php:1143 +#: libraries/import.lib.php:1131 libraries/import.lib.php:1155 msgid "settings" msgstr "" -#: libraries/import.lib.php:1138 +#: libraries/import.lib.php:1150 msgid "Go to table" msgstr "اذهب إلى الجدول" -#: libraries/import.lib.php:1147 +#: libraries/import.lib.php:1159 msgid "Go to view" msgstr "" @@ -6787,8 +6787,8 @@ msgid "" "The additional features for working with linked tables have been " "deactivated. To find out why click %shere%s." msgstr "" -"تم تعطيل المزايا الإضافية للعمل بالجداول المترابطة. لمعرفة السبب اضغط %sهنا" -"%s." +"تم تعطيل المزايا الإضافية للعمل بالجداول المترابطة. لمعرفة السبب اضغط %sهنا%" +"s." #: main.php:311 msgid "" @@ -7459,8 +7459,8 @@ msgstr "احذف قواعد البيانات التي لها نفس أسماء 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 "" "ملاحظة: يقرأ phpMyAdmin صلاحيات المستخدمين من جداول الصلاحيات من خادم MySQL " "مباشرة. محتويات هذه الجداول قد تختلف عن الصلاحيات التي يستخدمها الخادم إذا " @@ -8914,7 +8914,7 @@ msgstr "" #: tbl_change.php:1106 #, php-format -msgid "Restart insertion with %s rows" +msgid "Continue insertion with %s rows" msgstr "" #: tbl_chart.php:56 diff --git a/po/az.po b/po/az.po index ebf11ef..cf00ec7 100644 --- a/po/az.po +++ b/po/az.po @@ -3,14 +3,14 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-09-07 15:21+0200\n" +"POT-Creation-Date: 2010-09-10 12:46-0400\n" "PO-Revision-Date: 2010-03-12 09:11+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: azerbaijani <az(a)li.org>\n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: \n" "X-Generator: Translate Toolkit 1.5.3\n" #: browse_foreigners.php:36 browse_foreigners.php:57 @@ -610,7 +610,7 @@ msgstr "Elave et" #: libraries/config/user_preferences.forms.php:228 #: libraries/config/user_preferences.forms.php:262 #: libraries/db_links.inc.php:48 libraries/export/latex.php:351 -#: libraries/import.lib.php:1136 libraries/tbl_links.inc.php:54 +#: libraries/import.lib.php:1148 libraries/tbl_links.inc.php:54 #: pmd_general.php:133 server_privileges.php:595 server_replication.php:313 #: tbl_create.php:305 tbl_tracking.php:263 msgid "Structure" @@ -659,8 +659,8 @@ msgstr "" #: db_structure.php:404 libraries/display_tbl.lib.php:1945 #, 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 "" #: db_structure.php:418 db_structure.php:432 libraries/header.inc.php:138 @@ -872,8 +872,8 @@ msgstr "Sxem %s faylına qeyd edildi." #: 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 "" #: import.php:277 import.php:330 libraries/File.class.php:566 @@ -1577,8 +1577,8 @@ msgstr "Qısa İzahatlar" #: libraries/Index.class.php:465 libraries/common.lib.php:610 #: libraries/common.lib.php:1143 libraries/config/messages.inc.php:459 -#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1119 -#: libraries/import.lib.php:1143 libraries/schema/User_Schema.class.php:168 +#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1131 +#: libraries/import.lib.php:1155 libraries/schema/User_Schema.class.php:168 #: setup/frames/index.inc.php:125 tbl_row_action.php:68 msgid "Edit" msgstr "Deyişdir" @@ -1718,8 +1718,8 @@ msgstr "%s - e Xoş Gelmişsiniz!" #: 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 "" #: libraries/auth/config.auth.lib.php:115 @@ -2122,7 +2122,7 @@ msgstr "Upload işleri üçün te'yin etdiyiniz direktoriya tapılmadı" #: libraries/config.values.php:95 libraries/export/htmlword.php:24 #: libraries/export/latex.php:41 libraries/export/odt.php:33 #: libraries/export/sql.php:79 libraries/export/texytext.php:23 -#: libraries/import.lib.php:1141 +#: libraries/import.lib.php:1153 #, fuzzy msgid "structure" msgstr "Quruluş" @@ -4547,8 +4547,8 @@ msgstr "" #, 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 "" #: libraries/display_export.lib.php:275 @@ -4726,7 +4726,7 @@ msgstr "" #: libraries/export/sql.php:55 libraries/export/texytext.php:30 #: libraries/export/xls.php:28 libraries/export/xlsx.php:28 #: libraries/export/xml.php:25 libraries/export/yaml.php:29 -#: libraries/import.lib.php:1114 libraries/import.lib.php:1136 +#: libraries/import.lib.php:1126 libraries/import.lib.php:1148 #: libraries/import/csv.php:32 libraries/import/docsql.php:34 #: libraries/import/ldi.php:48 libraries/import/ods.php:32 #: libraries/import/sql.php:19 libraries/import/xls.php:27 @@ -5529,38 +5529,38 @@ msgstr "Qurucu" msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL boş netice çoxluğu gönderdi (ye'ni sıfır setir)." -#: libraries/import.lib.php:1110 +#: libraries/import.lib.php:1122 msgid "" "The following structures have either been created or altered. Here you can:" msgstr "" -#: libraries/import.lib.php:1111 +#: libraries/import.lib.php:1123 msgid "View a structure`s contents by clicking on its name" msgstr "" -#: libraries/import.lib.php:1112 +#: libraries/import.lib.php:1124 msgid "" "Change any of its settings by clicking the corresponding \"Options\" link" msgstr "" -#: libraries/import.lib.php:1113 +#: libraries/import.lib.php:1125 msgid "Edit its structure by following the \"Structure\" link" msgstr "" -#: libraries/import.lib.php:1116 +#: libraries/import.lib.php:1128 #, fuzzy msgid "Go to database" msgstr "Baza seçilmemişdir ve ya mövcud deyildir." -#: libraries/import.lib.php:1119 libraries/import.lib.php:1143 +#: libraries/import.lib.php:1131 libraries/import.lib.php:1155 msgid "settings" msgstr "" -#: libraries/import.lib.php:1138 +#: libraries/import.lib.php:1150 msgid "Go to table" msgstr "" -#: libraries/import.lib.php:1147 +#: libraries/import.lib.php:1159 msgid "Go to view" msgstr "" @@ -7531,8 +7531,8 @@ msgstr "İstifadeçilerle eyni adlı me'lumat bazalarını leğv et." 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 "" "Qeyd: phpMyAdmin istifadeçi selahiyyetlerini birbaşa MySQL-in selahiyyetler " "cedvellerinden almaqdadır. Eger elle nizamlamalar edilmişse, bu cedvellerin " @@ -9004,7 +9004,7 @@ msgstr "" #: tbl_change.php:1106 #, php-format -msgid "Restart insertion with %s rows" +msgid "Continue insertion with %s rows" msgstr "" #: tbl_chart.php:56 diff --git a/po/be.po b/po/be.po index 03c5453..c8ab807 100644 --- a/po/be.po +++ b/po/be.po @@ -3,14 +3,14 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-09-07 15:21+0200\n" +"POT-Creation-Date: 2010-09-10 12:46-0400\n" "PO-Revision-Date: 2010-03-12 09:12+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: belarusian_cyrillic <be(a)li.org>\n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: \n" "X-Generator: Translate Toolkit 1.5.3\n" #: browse_foreigners.php:36 browse_foreigners.php:57 @@ -611,7 +611,7 @@ msgstr "Уставіць" #: libraries/config/user_preferences.forms.php:228 #: libraries/config/user_preferences.forms.php:262 #: libraries/db_links.inc.php:48 libraries/export/latex.php:351 -#: libraries/import.lib.php:1136 libraries/tbl_links.inc.php:54 +#: libraries/import.lib.php:1148 libraries/tbl_links.inc.php:54 #: pmd_general.php:133 server_privileges.php:595 server_replication.php:313 #: tbl_create.php:305 tbl_tracking.php:263 msgid "Structure" @@ -660,11 +660,11 @@ msgstr "" #: db_structure.php:404 libraries/display_tbl.lib.php:1945 #, 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 "" -"Гэты прагляд мае толькі такую колькасьць радкоў. Калі ласка, зьвярніцеся да " -"%sдакумэнтацыі%s." +"Гэты прагляд мае толькі такую колькасьць радкоў. Калі ласка, зьвярніцеся да %" +"sдакумэнтацыі%s." #: db_structure.php:418 db_structure.php:432 libraries/header.inc.php:138 #: libraries/tbl_info.inc.php:60 tbl_structure.php:205 test/theme.php:73 @@ -879,8 +879,8 @@ msgstr "Дамп захаваны ў файл %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 "" "Вы, мусіць, паспрабавалі загрузіць вельмі вялікі файл. Калі ласка, " "зьвярніцеся да %sдакумэнтацыі%s для высьвятленьня спосабаў абыйсьці гэтае " @@ -899,8 +899,8 @@ msgid "" "You attempted to load file with unsupported compression (%s). Either support " "for it is not implemented or disabled by your configuration." msgstr "" -"Вы паспрабавалі загрузіць файл з мэтадам сьціску, які непадтрымліваецца " -"(%s). Ягоная падтрымка або не рэалізаваная, або адключаная ў вашай " +"Вы паспрабавалі загрузіць файл з мэтадам сьціску, які непадтрымліваецца (%" +"s). Ягоная падтрымка або не рэалізаваная, або адключаная ў вашай " "канфігурацыі." #: import.php:335 @@ -1604,8 +1604,8 @@ msgstr "Камэнтар" #: libraries/Index.class.php:465 libraries/common.lib.php:610 #: libraries/common.lib.php:1143 libraries/config/messages.inc.php:459 -#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1119 -#: libraries/import.lib.php:1143 libraries/schema/User_Schema.class.php:168 +#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1131 +#: libraries/import.lib.php:1155 libraries/schema/User_Schema.class.php:168 #: setup/frames/index.inc.php:125 tbl_row_action.php:68 msgid "Edit" msgstr "Рэдагаваць" @@ -1751,8 +1751,8 @@ msgstr "Запрашаем у %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 "" "Імаверна, прычына гэтага ў тым, што ня створаны канфігурацыйны файл. Каб яго " "стварыць, можна выкарыстаць %1$sналадачны скрыпт%2$s." @@ -2168,7 +2168,7 @@ msgstr "Немагчыма адкрыць пазначаную вамі тэчк #: libraries/config.values.php:95 libraries/export/htmlword.php:24 #: libraries/export/latex.php:41 libraries/export/odt.php:33 #: libraries/export/sql.php:79 libraries/export/texytext.php:23 -#: libraries/import.lib.php:1141 +#: libraries/import.lib.php:1153 #, fuzzy msgid "structure" msgstr "Структура" @@ -4636,8 +4636,8 @@ msgstr "" #| "happen: %3$s. Other text will be kept as is." 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 "" "Гэтае значэньне інтэрпрэтуецца з выкарыстаньнем %1$sstrftime%2$s, таму можна " "выкарыстоўваць радкі фарматаваньня часу. Апроч гэтага, будуць праведзеныя " @@ -4833,7 +4833,7 @@ msgstr "Сартаваць па ключы" #: libraries/export/sql.php:55 libraries/export/texytext.php:30 #: libraries/export/xls.php:28 libraries/export/xlsx.php:28 #: libraries/export/xml.php:25 libraries/export/yaml.php:29 -#: libraries/import.lib.php:1114 libraries/import.lib.php:1136 +#: libraries/import.lib.php:1126 libraries/import.lib.php:1148 #: libraries/import/csv.php:32 libraries/import/docsql.php:34 #: libraries/import/ldi.php:48 libraries/import/ods.php:32 #: libraries/import/sql.php:19 libraries/import/xls.php:27 @@ -5693,39 +5693,39 @@ msgstr "Створаны" msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL вярнула пусты вынік (то бок нуль радкоў)." -#: libraries/import.lib.php:1110 +#: libraries/import.lib.php:1122 msgid "" "The following structures have either been created or altered. Here you can:" msgstr "" -#: libraries/import.lib.php:1111 +#: libraries/import.lib.php:1123 msgid "View a structure`s contents by clicking on its name" msgstr "" -#: libraries/import.lib.php:1112 +#: libraries/import.lib.php:1124 msgid "" "Change any of its settings by clicking the corresponding \"Options\" link" msgstr "" -#: libraries/import.lib.php:1113 +#: libraries/import.lib.php:1125 msgid "Edit its structure by following the \"Structure\" link" msgstr "" -#: libraries/import.lib.php:1116 +#: libraries/import.lib.php:1128 #, fuzzy msgid "Go to database" msgstr "Базы дадзеных адсутнічаюць" -#: libraries/import.lib.php:1119 libraries/import.lib.php:1143 +#: libraries/import.lib.php:1131 libraries/import.lib.php:1155 msgid "settings" msgstr "" -#: libraries/import.lib.php:1138 +#: libraries/import.lib.php:1150 #, fuzzy msgid "Go to table" msgstr "Базы дадзеных адсутнічаюць" -#: libraries/import.lib.php:1147 +#: libraries/import.lib.php:1159 msgid "Go to view" msgstr "" @@ -7757,8 +7757,8 @@ msgstr "Выдаліць базы дадзеных, якія маюць такі 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 "" "Заўвага: phpMyAdmin атрымлівае прывілеі карыстальнікаў наўпростава з табліц " "прывілеяў MySQL. Зьмесьціва гэтых табліц можа адрозьнівацца ад прывілеяў, " @@ -9368,8 +9368,9 @@ msgstr "" "CTRL+стрэлкі для перамяшчэньня ў любое іншае месца" #: tbl_change.php:1106 -#, php-format -msgid "Restart insertion with %s rows" +#, fuzzy, php-format +#| msgid "Restart insertion with %s rows" +msgid "Continue insertion with %s rows" msgstr "Пачаць устаўку зноў з %s-га радку" #: tbl_chart.php:56 diff --git a/po/be(a)latin.po b/po/be(a)latin.po index e61820a..0010315 100644 --- a/po/be(a)latin.po +++ b/po/be(a)latin.po @@ -3,16 +3,16 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-09-07 15:21+0200\n" +"POT-Creation-Date: 2010-09-10 12:46-0400\n" "PO-Revision-Date: 2010-03-30 23:09+0200\n" "Last-Translator: Michal <michal(a)cihar.com>\n" "Language-Team: belarusian_latin <be@latin@li.org>\n" -"Language: be@latin\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"Language: be@latin\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" +"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" "X-Generator: Pootle 2.0.1\n" #: browse_foreigners.php:36 browse_foreigners.php:57 @@ -617,7 +617,7 @@ msgstr "Ustavić" #: libraries/config/user_preferences.forms.php:228 #: libraries/config/user_preferences.forms.php:262 #: libraries/db_links.inc.php:48 libraries/export/latex.php:351 -#: libraries/import.lib.php:1136 libraries/tbl_links.inc.php:54 +#: libraries/import.lib.php:1148 libraries/tbl_links.inc.php:54 #: pmd_general.php:133 server_privileges.php:595 server_replication.php:313 #: tbl_create.php:305 tbl_tracking.php:263 msgid "Structure" @@ -666,11 +666,11 @@ msgstr "" #: db_structure.php:404 libraries/display_tbl.lib.php:1945 #, 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 "" -"Hety prahlad maje tolki takuju kolkaść radkoŭ. Kali łaska, źviarniciesia da " -"%sdakumentacyi%s." +"Hety prahlad maje tolki takuju kolkaść radkoŭ. Kali łaska, źviarniciesia da %" +"sdakumentacyi%s." #: db_structure.php:418 db_structure.php:432 libraries/header.inc.php:138 #: libraries/tbl_info.inc.php:60 tbl_structure.php:205 test/theme.php:73 @@ -877,8 +877,8 @@ msgstr "Damp zachavany ŭ fajł %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 "" "Vy, musić, pasprabavali zahruzić vielmi vialiki fajł. Kali łaska, " "źviarniciesia da %sdakumentacyi%s dla vyśviatleńnia sposabaŭ abyjści hetaje " @@ -897,8 +897,8 @@ msgid "" "You attempted to load file with unsupported compression (%s). Either support " "for it is not implemented or disabled by your configuration." msgstr "" -"Vy pasprabavali zahruzić fajł z metadam ścisku, jaki niepadtrymlivajecca " -"(%s). Jahonaja padtrymka abo nie realizavanaja, abo adklučanaja ŭ vašaj " +"Vy pasprabavali zahruzić fajł z metadam ścisku, jaki niepadtrymlivajecca (%" +"s). Jahonaja padtrymka abo nie realizavanaja, abo adklučanaja ŭ vašaj " "kanfihuracyi." #: import.php:335 @@ -1604,8 +1604,8 @@ msgstr "Kamentar" #: libraries/Index.class.php:465 libraries/common.lib.php:610 #: libraries/common.lib.php:1143 libraries/config/messages.inc.php:459 -#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1119 -#: libraries/import.lib.php:1143 libraries/schema/User_Schema.class.php:168 +#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1131 +#: libraries/import.lib.php:1155 libraries/schema/User_Schema.class.php:168 #: setup/frames/index.inc.php:125 tbl_row_action.php:68 msgid "Edit" msgstr "Redagavać" @@ -1751,8 +1751,8 @@ msgstr "Zaprašajem u %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 "" "Imavierna, pryčyna hetaha ŭ tym, što nia stvorany kanfihuracyjny fajł. Kab " "jaho stvaryć, možna vykarystać %1$snaładačny skrypt%2$s." @@ -2169,7 +2169,7 @@ msgstr "Niemahčyma adkryć paznačanuju vami tečku dla zahruzki fajłaŭ" #: libraries/config.values.php:95 libraries/export/htmlword.php:24 #: libraries/export/latex.php:41 libraries/export/odt.php:33 #: libraries/export/sql.php:79 libraries/export/texytext.php:23 -#: libraries/import.lib.php:1141 +#: libraries/import.lib.php:1153 msgid "structure" msgstr "" @@ -4600,8 +4600,8 @@ msgstr "" #| "happen: %3$s. Other text will be kept as is." 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 "" "Hetaje značeńnie interpretujecca z vykarystańniem %1$sstrftime%2$s, tamu " "možna vykarystoŭvać radki farmatavańnia času. Aproč hetaha, buduć " @@ -4798,7 +4798,7 @@ msgstr "Sartavać pa klučy" #: libraries/export/sql.php:55 libraries/export/texytext.php:30 #: libraries/export/xls.php:28 libraries/export/xlsx.php:28 #: libraries/export/xml.php:25 libraries/export/yaml.php:29 -#: libraries/import.lib.php:1114 libraries/import.lib.php:1136 +#: libraries/import.lib.php:1126 libraries/import.lib.php:1148 #: libraries/import/csv.php:32 libraries/import/docsql.php:34 #: libraries/import/ldi.php:48 libraries/import/ods.php:32 #: libraries/import/sql.php:19 libraries/import/xls.php:27 @@ -5661,37 +5661,37 @@ msgstr "Stvorany" msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL viarnuła pusty vynik (to bok nul radkoŭ)." -#: libraries/import.lib.php:1110 +#: libraries/import.lib.php:1122 msgid "" "The following structures have either been created or altered. Here you can:" msgstr "" -#: libraries/import.lib.php:1111 +#: libraries/import.lib.php:1123 msgid "View a structure`s contents by clicking on its name" msgstr "" -#: libraries/import.lib.php:1112 +#: libraries/import.lib.php:1124 msgid "" "Change any of its settings by clicking the corresponding \"Options\" link" msgstr "" -#: libraries/import.lib.php:1113 +#: libraries/import.lib.php:1125 msgid "Edit its structure by following the \"Structure\" link" msgstr "" -#: libraries/import.lib.php:1116 +#: libraries/import.lib.php:1128 msgid "Go to database" msgstr "" -#: libraries/import.lib.php:1119 libraries/import.lib.php:1143 +#: libraries/import.lib.php:1131 libraries/import.lib.php:1155 msgid "settings" msgstr "" -#: libraries/import.lib.php:1138 +#: libraries/import.lib.php:1150 msgid "Go to table" msgstr "" -#: libraries/import.lib.php:1147 +#: libraries/import.lib.php:1159 msgid "Go to view" msgstr "" @@ -6558,8 +6558,8 @@ msgid "" "installed the necessary PHP extensions as described in the %sdocumentation%s." msgstr "" "Niemahčyma prainicyjalizavać pravierku SQL. Kali łaska, praviercie, ci " -"ŭstalavanyja ŭ vas nieabchodnyja pašyreńni PHP, jak heta apisana ŭ " -"%sdakumentacyi%s." +"ŭstalavanyja ŭ vas nieabchodnyja pašyreńni PHP, jak heta apisana ŭ %" +"sdakumentacyi%s." #: libraries/tbl_links.inc.php:106 libraries/tbl_links.inc.php:107 msgid "Table seems to be empty!" @@ -6745,8 +6745,8 @@ msgstr "" "dadadzienyja da mietki času (pa zmoŭčańni — 0). Druhi parametar " "vykarystoŭvajcie, kab paznačyć inšy farmat daty/času. Treci parametar " "vyznačaje typ daty, jakaja budzie pakazanaja: vašaja lakalnaja data albo " -"data UTC (vykarystoŭvajcie dla hetaha parametry «local» i «utc» adpaviedna). " -"U zaležnaści ad hetaha farmat daty maje roznyja značeńni: dla atrymańnia " +"data UTC (vykarystoŭvajcie dla hetaha parametry «local» i «utc» adpaviedna). U " +"zaležnaści ad hetaha farmat daty maje roznyja značeńni: dla atrymańnia " "parametraŭ lakalnaj daty hladzicie dakumentacyju dla funkcyi PHP strftime(), " "a dla hrynvickaha času (parametar «utc») — dakumentacyju funkcyi gmdate()." @@ -7721,8 +7721,8 @@ msgstr "" 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 "" "Zaŭvaha: phpMyAdmin atrymlivaje pryvilei karystalnikaŭ naŭprostava z tablic " "pryvilejaŭ MySQL. Źmieściva hetych tablic moža adroźnivacca ad pryvilejaŭ, " @@ -9318,8 +9318,9 @@ msgstr "" "abo CTRL+strełki dla pieramiaščeńnia ŭ luboje inšaje miesca" #: tbl_change.php:1106 -#, php-format -msgid "Restart insertion with %s rows" +#, fuzzy, php-format +#| msgid "Restart insertion with %s rows" +msgid "Continue insertion with %s rows" msgstr "Pačać ustaŭku znoŭ z %s-ha radku" #: tbl_chart.php:56 diff --git a/po/bg.po b/po/bg.po index ab0f181..c303e14 100644 --- a/po/bg.po +++ b/po/bg.po @@ -3,14 +3,14 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-09-07 15:21+0200\n" +"POT-Creation-Date: 2010-09-10 12:46-0400\n" "PO-Revision-Date: 2010-06-11 17:28+0200\n" "Last-Translator: <stanprog(a)stanprog.com>\n" "Language-Team: bulgarian <bg(a)li.org>\n" -"Language: bg\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: bg\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.1\n" @@ -610,7 +610,7 @@ msgstr "Вмъкване" #: libraries/config/user_preferences.forms.php:228 #: libraries/config/user_preferences.forms.php:262 #: libraries/db_links.inc.php:48 libraries/export/latex.php:351 -#: libraries/import.lib.php:1136 libraries/tbl_links.inc.php:54 +#: libraries/import.lib.php:1148 libraries/tbl_links.inc.php:54 #: pmd_general.php:133 server_privileges.php:595 server_replication.php:313 #: tbl_create.php:305 tbl_tracking.php:263 msgid "Structure" @@ -659,8 +659,8 @@ msgstr "" #: db_structure.php:404 libraries/display_tbl.lib.php:1945 #, 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 "" #: db_structure.php:418 db_structure.php:432 libraries/header.inc.php:138 @@ -871,8 +871,8 @@ msgstr "Схемата(дъмп) беше записана във файл %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 "" "Вероятно сте направили опит да качите твърде голям файл. Моля, обърнете се " "към %sdдокументацията%s за да намерите начин да избегнете това ограничение." @@ -1585,8 +1585,8 @@ msgstr "Коментари" #: libraries/Index.class.php:465 libraries/common.lib.php:610 #: libraries/common.lib.php:1143 libraries/config/messages.inc.php:459 -#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1119 -#: libraries/import.lib.php:1143 libraries/schema/User_Schema.class.php:168 +#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1131 +#: libraries/import.lib.php:1155 libraries/schema/User_Schema.class.php:168 #: setup/frames/index.inc.php:125 tbl_row_action.php:68 msgid "Edit" msgstr "Редактиране" @@ -1728,8 +1728,8 @@ msgstr "Добре дошли в %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 "" #: libraries/auth/config.auth.lib.php:115 @@ -2138,7 +2138,7 @@ msgstr "Директорията която сте указали за upload н #: libraries/config.values.php:95 libraries/export/htmlword.php:24 #: libraries/export/latex.php:41 libraries/export/odt.php:33 #: libraries/export/sql.php:79 libraries/export/texytext.php:23 -#: libraries/import.lib.php:1141 +#: libraries/import.lib.php:1153 #, fuzzy msgid "structure" msgstr "Структура" @@ -4576,8 +4576,8 @@ msgstr "" #, 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 "" #: libraries/display_export.lib.php:275 @@ -4760,7 +4760,7 @@ msgstr "Сортиране по ключ" #: libraries/export/sql.php:55 libraries/export/texytext.php:30 #: libraries/export/xls.php:28 libraries/export/xlsx.php:28 #: libraries/export/xml.php:25 libraries/export/yaml.php:29 -#: libraries/import.lib.php:1114 libraries/import.lib.php:1136 +#: libraries/import.lib.php:1126 libraries/import.lib.php:1148 #: libraries/import/csv.php:32 libraries/import/docsql.php:34 #: libraries/import/ldi.php:48 libraries/import/ods.php:32 #: libraries/import/sql.php:19 libraries/import/xls.php:27 @@ -5567,38 +5567,38 @@ msgstr "Генерирано от" msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL върна празен резултат (т.е. нула редове)." -#: libraries/import.lib.php:1110 +#: libraries/import.lib.php:1122 msgid "" "The following structures have either been created or altered. Here you can:" msgstr "" -#: libraries/import.lib.php:1111 +#: libraries/import.lib.php:1123 msgid "View a structure`s contents by clicking on its name" msgstr "" -#: libraries/import.lib.php:1112 +#: libraries/import.lib.php:1124 msgid "" "Change any of its settings by clicking the corresponding \"Options\" link" msgstr "" -#: libraries/import.lib.php:1113 +#: libraries/import.lib.php:1125 msgid "Edit its structure by following the \"Structure\" link" msgstr "" -#: libraries/import.lib.php:1116 +#: libraries/import.lib.php:1128 #, fuzzy msgid "Go to database" msgstr "Няма бази от данни" -#: libraries/import.lib.php:1119 libraries/import.lib.php:1143 +#: libraries/import.lib.php:1131 libraries/import.lib.php:1155 msgid "settings" msgstr "" -#: libraries/import.lib.php:1138 +#: libraries/import.lib.php:1150 msgid "Go to table" msgstr "" -#: libraries/import.lib.php:1147 +#: libraries/import.lib.php:1159 msgid "Go to view" msgstr "" @@ -6469,8 +6469,8 @@ msgid "" "installed the necessary PHP extensions as described in the %sdocumentation%s." msgstr "" "SQL валидатора не може да бъде инициализиран. Моля проверете дали сте " -"инсталирали необходимите PHP разширения, така както е описано в " -"%sдокументацията%s." +"инсталирали необходимите PHP разширения, така както е описано в %" +"sдокументацията%s." #: libraries/tbl_links.inc.php:106 libraries/tbl_links.inc.php:107 msgid "Table seems to be empty!" @@ -7598,8 +7598,8 @@ msgstr "" 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 "" "Забележка: phpMyAdmin взема потребителските привилегии директно от таблицата " "на привилегиите на MySQL. Съдържанието на тази таблица може да се различава " @@ -9083,7 +9083,7 @@ msgstr "" #: tbl_change.php:1106 #, php-format -msgid "Restart insertion with %s rows" +msgid "Continue insertion with %s rows" msgstr "" #: tbl_chart.php:56 diff --git a/po/bn.po b/po/bn.po index d5300a3..4240186 100644 --- a/po/bn.po +++ b/po/bn.po @@ -3,14 +3,14 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-09-07 15:21+0200\n" +"POT-Creation-Date: 2010-09-10 12:46-0400\n" "PO-Revision-Date: 2010-03-12 09:11+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: bangla <bn(a)li.org>\n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: \n" "X-Generator: Translate Toolkit 1.5.3\n" #: browse_foreigners.php:36 browse_foreigners.php:57 @@ -609,7 +609,7 @@ msgstr "Insert" #: libraries/config/user_preferences.forms.php:228 #: libraries/config/user_preferences.forms.php:262 #: libraries/db_links.inc.php:48 libraries/export/latex.php:351 -#: libraries/import.lib.php:1136 libraries/tbl_links.inc.php:54 +#: libraries/import.lib.php:1148 libraries/tbl_links.inc.php:54 #: pmd_general.php:133 server_privileges.php:595 server_replication.php:313 #: tbl_create.php:305 tbl_tracking.php:263 msgid "Structure" @@ -658,8 +658,8 @@ msgstr "" #: db_structure.php:404 libraries/display_tbl.lib.php:1945 #, 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 "" #: db_structure.php:418 db_structure.php:432 libraries/header.inc.php:138 @@ -872,11 +872,11 @@ msgstr "ডাম্প %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 "" -"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." #: import.php:277 import.php:330 libraries/File.class.php:566 #: libraries/File.class.php:676 @@ -1590,8 +1590,8 @@ msgstr "মন্তব্যসমূহ" #: libraries/Index.class.php:465 libraries/common.lib.php:610 #: libraries/common.lib.php:1143 libraries/config/messages.inc.php:459 -#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1119 -#: libraries/import.lib.php:1143 libraries/schema/User_Schema.class.php:168 +#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1131 +#: libraries/import.lib.php:1155 libraries/schema/User_Schema.class.php:168 #: setup/frames/index.inc.php:125 tbl_row_action.php:68 msgid "Edit" msgstr "সম্পাদনা কর" @@ -1734,8 +1734,8 @@ msgstr "Welcome to %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 "" "সম্ভবত আপনি কনফিগারেশন ফাইল তৈরী করেননি। আপনি %1$ssetup script%2$s ব্যাবহার " "করে একটি তৈরী করতে পারেন " @@ -2146,7 +2146,7 @@ msgstr "The directory you set for upload work cannot be reached" #: libraries/config.values.php:95 libraries/export/htmlword.php:24 #: libraries/export/latex.php:41 libraries/export/odt.php:33 #: libraries/export/sql.php:79 libraries/export/texytext.php:23 -#: libraries/import.lib.php:1141 +#: libraries/import.lib.php:1153 #, fuzzy msgid "structure" msgstr "Structure" @@ -4600,12 +4600,12 @@ msgstr "" #| "happen: %3$s. Other text will be kept as is." 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 "" "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." +"formatting strings. Additionally the following transformations will happen: %" +"3$s. Other text will be kept as is." #: libraries/display_export.lib.php:275 msgid "use this for future exports" @@ -4796,7 +4796,7 @@ msgstr "Sort by key" #: libraries/export/sql.php:55 libraries/export/texytext.php:30 #: libraries/export/xls.php:28 libraries/export/xlsx.php:28 #: libraries/export/xml.php:25 libraries/export/yaml.php:29 -#: libraries/import.lib.php:1114 libraries/import.lib.php:1136 +#: libraries/import.lib.php:1126 libraries/import.lib.php:1148 #: libraries/import/csv.php:32 libraries/import/docsql.php:34 #: libraries/import/ldi.php:48 libraries/import/ods.php:32 #: libraries/import/sql.php:19 libraries/import/xls.php:27 @@ -5621,39 +5621,39 @@ msgstr "Generated by" msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL returned an empty result set (i.e. zero rows)." -#: libraries/import.lib.php:1110 +#: libraries/import.lib.php:1122 msgid "" "The following structures have either been created or altered. Here you can:" msgstr "" -#: libraries/import.lib.php:1111 +#: libraries/import.lib.php:1123 msgid "View a structure`s contents by clicking on its name" msgstr "" -#: libraries/import.lib.php:1112 +#: libraries/import.lib.php:1124 msgid "" "Change any of its settings by clicking the corresponding \"Options\" link" msgstr "" -#: libraries/import.lib.php:1113 +#: libraries/import.lib.php:1125 msgid "Edit its structure by following the \"Structure\" link" msgstr "" -#: libraries/import.lib.php:1116 +#: libraries/import.lib.php:1128 #, fuzzy msgid "Go to database" msgstr "কোন ডাটাবেজ নাই" -#: libraries/import.lib.php:1119 libraries/import.lib.php:1143 +#: libraries/import.lib.php:1131 libraries/import.lib.php:1155 msgid "settings" msgstr "" -#: libraries/import.lib.php:1138 +#: libraries/import.lib.php:1150 #, fuzzy msgid "Go to table" msgstr "কোন ডাটাবেজ নাই" -#: libraries/import.lib.php:1147 +#: libraries/import.lib.php:1159 msgid "Go to view" msgstr "" @@ -7666,13 +7666,13 @@ msgstr "ব্যাবহারকারীর নামে নাম এমন 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 "" "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." #: server_privileges.php:1776 msgid "The selected user was not found in the privilege table." @@ -9253,7 +9253,7 @@ msgstr "" #: tbl_change.php:1106 #, php-format -msgid "Restart insertion with %s rows" +msgid "Continue insertion with %s rows" msgstr "" #: tbl_chart.php:56 diff --git a/po/bs.po b/po/bs.po index 0ebf0e7..604a6dc 100644 --- a/po/bs.po +++ b/po/bs.po @@ -3,14 +3,14 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-09-07 15:21+0200\n" +"POT-Creation-Date: 2010-09-10 12:46-0400\n" "PO-Revision-Date: 2010-03-12 09:12+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: bosnian <bs(a)li.org>\n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: \n" "X-Generator: Translate Toolkit 1.5.3\n" #: browse_foreigners.php:36 browse_foreigners.php:57 @@ -612,7 +612,7 @@ msgstr "Novi zapis" #: libraries/config/user_preferences.forms.php:228 #: libraries/config/user_preferences.forms.php:262 #: libraries/db_links.inc.php:48 libraries/export/latex.php:351 -#: libraries/import.lib.php:1136 libraries/tbl_links.inc.php:54 +#: libraries/import.lib.php:1148 libraries/tbl_links.inc.php:54 #: pmd_general.php:133 server_privileges.php:595 server_replication.php:313 #: tbl_create.php:305 tbl_tracking.php:263 msgid "Structure" @@ -661,8 +661,8 @@ msgstr "" #: db_structure.php:404 libraries/display_tbl.lib.php:1945 #, 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 "" #: db_structure.php:418 db_structure.php:432 libraries/header.inc.php:138 @@ -874,8 +874,8 @@ msgstr "Sadržaj baze je sačuvan u fajl %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 "" #: import.php:277 import.php:330 libraries/File.class.php:566 @@ -1575,8 +1575,8 @@ msgstr "Komentari" #: libraries/Index.class.php:465 libraries/common.lib.php:610 #: libraries/common.lib.php:1143 libraries/config/messages.inc.php:459 -#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1119 -#: libraries/import.lib.php:1143 libraries/schema/User_Schema.class.php:168 +#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1131 +#: libraries/import.lib.php:1155 libraries/schema/User_Schema.class.php:168 #: setup/frames/index.inc.php:125 tbl_row_action.php:68 msgid "Edit" msgstr "Promeni" @@ -1716,8 +1716,8 @@ msgstr "Dobrodošli na %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 "" #: libraries/auth/config.auth.lib.php:115 @@ -2121,7 +2121,7 @@ msgstr "Direkcija koju ste izabrali za slanje nije dostupna" #: libraries/config.values.php:95 libraries/export/htmlword.php:24 #: libraries/export/latex.php:41 libraries/export/odt.php:33 #: libraries/export/sql.php:79 libraries/export/texytext.php:23 -#: libraries/import.lib.php:1141 +#: libraries/import.lib.php:1153 #, fuzzy msgid "structure" msgstr "Struktura" @@ -4540,8 +4540,8 @@ msgstr "" #, 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 "" #: libraries/display_export.lib.php:275 @@ -4719,7 +4719,7 @@ msgstr "" #: libraries/export/sql.php:55 libraries/export/texytext.php:30 #: libraries/export/xls.php:28 libraries/export/xlsx.php:28 #: libraries/export/xml.php:25 libraries/export/yaml.php:29 -#: libraries/import.lib.php:1114 libraries/import.lib.php:1136 +#: libraries/import.lib.php:1126 libraries/import.lib.php:1148 #: libraries/import/csv.php:32 libraries/import/docsql.php:34 #: libraries/import/ldi.php:48 libraries/import/ods.php:32 #: libraries/import/sql.php:19 libraries/import/xls.php:27 @@ -5516,38 +5516,38 @@ msgstr "Generirao" msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL je vratio prazan rezultat (nula redova)." -#: libraries/import.lib.php:1110 +#: libraries/import.lib.php:1122 msgid "" "The following structures have either been created or altered. Here you can:" msgstr "" -#: libraries/import.lib.php:1111 +#: libraries/import.lib.php:1123 msgid "View a structure`s contents by clicking on its name" msgstr "" -#: libraries/import.lib.php:1112 +#: libraries/import.lib.php:1124 msgid "" "Change any of its settings by clicking the corresponding \"Options\" link" msgstr "" -#: libraries/import.lib.php:1113 +#: libraries/import.lib.php:1125 msgid "Edit its structure by following the \"Structure\" link" msgstr "" -#: libraries/import.lib.php:1116 +#: libraries/import.lib.php:1128 #, fuzzy msgid "Go to database" msgstr "Baza ne postoji" -#: libraries/import.lib.php:1119 libraries/import.lib.php:1143 +#: libraries/import.lib.php:1131 libraries/import.lib.php:1155 msgid "settings" msgstr "" -#: libraries/import.lib.php:1138 +#: libraries/import.lib.php:1150 msgid "Go to table" msgstr "" -#: libraries/import.lib.php:1147 +#: libraries/import.lib.php:1159 msgid "Go to view" msgstr "" @@ -7516,8 +7516,8 @@ msgstr "Odbaci baze koje se zovu isto kao korisnici." 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 "" "Napomena: phpMyAdmin uzima privilegije korisnika direktno iz MySQL tabela " "privilegija. Sadržaj ove tabele može se razlikovati od privilegija koje " @@ -8987,7 +8987,7 @@ msgstr "" #: tbl_change.php:1106 #, php-format -msgid "Restart insertion with %s rows" +msgid "Continue insertion with %s rows" msgstr "" #: tbl_chart.php:56 diff --git a/po/ca.po b/po/ca.po index 1551222..fee7074 100644 --- a/po/ca.po +++ b/po/ca.po @@ -3,14 +3,14 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-09-07 15:21+0200\n" +"POT-Creation-Date: 2010-09-10 12:46-0400\n" "PO-Revision-Date: 2010-03-12 09:13+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: catalan <ca(a)li.org>\n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: \n" "X-Generator: Translate Toolkit 1.5.3\n" #: browse_foreigners.php:36 browse_foreigners.php:57 @@ -612,7 +612,7 @@ msgstr "Insereix" #: libraries/config/user_preferences.forms.php:228 #: libraries/config/user_preferences.forms.php:262 #: libraries/db_links.inc.php:48 libraries/export/latex.php:351 -#: libraries/import.lib.php:1136 libraries/tbl_links.inc.php:54 +#: libraries/import.lib.php:1148 libraries/tbl_links.inc.php:54 #: pmd_general.php:133 server_privileges.php:595 server_replication.php:313 #: tbl_create.php:305 tbl_tracking.php:263 msgid "Structure" @@ -661,8 +661,8 @@ msgstr "El seguiment no està actiu." #: db_structure.php:404 libraries/display_tbl.lib.php:1945 #, 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 "" "Aquesta vista té al menys aques nombre de files. Consulta %sdocumentation%s." @@ -869,11 +869,11 @@ msgstr "El bolcat s'ha desat amb el nom d'arxiu %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 "" -"Probablement has triat d'enviar un arxiu massa gran. Consulta la " -"%sdocumentació%s per trobar formes de modificar aquest límit." +"Probablement has triat d'enviar un arxiu massa gran. Consulta la %" +"sdocumentació%s per trobar formes de modificar aquest límit." #: import.php:277 import.php:330 libraries/File.class.php:566 #: libraries/File.class.php:676 @@ -1597,8 +1597,8 @@ msgstr "Comentari" #: libraries/Index.class.php:465 libraries/common.lib.php:610 #: libraries/common.lib.php:1143 libraries/config/messages.inc.php:459 -#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1119 -#: libraries/import.lib.php:1143 libraries/schema/User_Schema.class.php:168 +#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1131 +#: libraries/import.lib.php:1155 libraries/schema/User_Schema.class.php:168 #: setup/frames/index.inc.php:125 tbl_row_action.php:68 msgid "Edit" msgstr "Edita" @@ -1745,8 +1745,8 @@ msgstr "Benvingut a %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 "" "La raó més probable d'aixó és que no heu creat l'arxiu de configuració. " "Podriau voler utilitzar %1$ssetup script%2$s per crear-ne un." @@ -2165,7 +2165,7 @@ msgstr "No està disponible el directori indicat per pujar arxius" #: libraries/config.values.php:95 libraries/export/htmlword.php:24 #: libraries/export/latex.php:41 libraries/export/odt.php:33 #: libraries/export/sql.php:79 libraries/export/texytext.php:23 -#: libraries/import.lib.php:1141 +#: libraries/import.lib.php:1153 msgid "structure" msgstr "estructura" @@ -4803,12 +4803,12 @@ msgstr "" #| "happen: %3$s. Other text will be kept as is." 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 "" "Aquest valor s'interpreta usant %1$sstrftime%2$s, pel que podeu usar les " -"cadenes de formateig de temps. A més, es faràn aquestes transformacions: " -"%3$s. Altre text es deixarà sense variació." +"cadenes d e formateig de temps. A més, es faràn aquestes transformacions: %3" +"$s. Altre text es deixarà sense variació." #: libraries/display_export.lib.php:275 msgid "use this for future exports" @@ -5008,7 +5008,7 @@ msgstr "Classifica per la clau" #: libraries/export/sql.php:55 libraries/export/texytext.php:30 #: libraries/export/xls.php:28 libraries/export/xlsx.php:28 #: libraries/export/xml.php:25 libraries/export/yaml.php:29 -#: libraries/import.lib.php:1114 libraries/import.lib.php:1136 +#: libraries/import.lib.php:1126 libraries/import.lib.php:1148 #: libraries/import/csv.php:32 libraries/import/docsql.php:34 #: libraries/import/ldi.php:48 libraries/import/ods.php:32 #: libraries/import/sql.php:19 libraries/import/xls.php:27 @@ -5869,39 +5869,39 @@ msgstr "Generat per" msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL ha retornat un conjunt buit (p.e. cap fila)." -#: libraries/import.lib.php:1110 +#: libraries/import.lib.php:1122 msgid "" "The following structures have either been created or altered. Here you can:" msgstr "Les següents estructures han estat creades o bé alterades. Aquí pots:" -#: libraries/import.lib.php:1111 +#: libraries/import.lib.php:1123 msgid "View a structure`s contents by clicking on its name" msgstr "Veure el contingut d'una estructura fent clic sobre el seu nom" -#: libraries/import.lib.php:1112 +#: libraries/import.lib.php:1124 msgid "" "Change any of its settings by clicking the corresponding \"Options\" link" msgstr "" "Canviar qualsevol dels seus ajustaments fent clic al corresponents enllaç " "\"Opcions\"" -#: libraries/import.lib.php:1113 +#: libraries/import.lib.php:1125 msgid "Edit its structure by following the \"Structure\" link" msgstr "Modificar la seva estructura, seguint l'enllaç \"Estructura\"" -#: libraries/import.lib.php:1116 +#: libraries/import.lib.php:1128 msgid "Go to database" msgstr "Vés a la base de dades" -#: libraries/import.lib.php:1119 libraries/import.lib.php:1143 +#: libraries/import.lib.php:1131 libraries/import.lib.php:1155 msgid "settings" msgstr "configuració" -#: libraries/import.lib.php:1138 +#: libraries/import.lib.php:1150 msgid "Go to table" msgstr "Vés a la taula" -#: libraries/import.lib.php:1147 +#: libraries/import.lib.php:1159 msgid "Go to view" msgstr "Vés a la vista" @@ -6780,8 +6780,8 @@ msgid "" "installed the necessary PHP extensions as described in the %sdocumentation%s." msgstr "" "No s'ha pogut iniciar el validador SQL. Si us plau, comproveu que teniu " -"instal·lats els mòduls de PHP necessaris tal i com s'indica a la " -"%sdocumentació%s." +"instal·lats els mòduls de PHP necessaris tal i com s'indica a la %" +"sdocumentació%s." #: libraries/tbl_links.inc.php:106 libraries/tbl_links.inc.php:107 msgid "Table seems to be empty!" @@ -7953,8 +7953,8 @@ msgstr "" 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 "" "Nota: phpMyAdmin obté els permisos de l'usuari directament de les taules de " "permisos de MySQL. El contingut d'aquestes taules pot ser diferent dels " @@ -9645,8 +9645,9 @@ msgstr "" "on vulguis" #: tbl_change.php:1106 -#, php-format -msgid "Restart insertion with %s rows" +#, fuzzy, php-format +#| msgid "Restart insertion with %s rows" +msgid "Continue insertion with %s rows" msgstr "Reinicia l'inserció amb %s files" #: tbl_chart.php:56 diff --git a/po/cs.po b/po/cs.po index 8300564..fc8ad1a 100644 --- a/po/cs.po +++ b/po/cs.po @@ -6,14 +6,14 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-09-07 15:21+0200\n" +"POT-Creation-Date: 2010-09-10 12:46-0400\n" "PO-Revision-Date: 2010-09-07 10:55+0200\n" "Last-Translator: Michal Čihař <michal(a)cihar.com>\n" "Language-Team: czech <cs(a)li.org>\n" -"Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: cs\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" "X-Generator: Pootle 2.0.5\n" @@ -597,7 +597,7 @@ msgstr "Vložit" #: libraries/config/user_preferences.forms.php:228 #: libraries/config/user_preferences.forms.php:262 #: libraries/db_links.inc.php:48 libraries/export/latex.php:351 -#: libraries/import.lib.php:1136 libraries/tbl_links.inc.php:54 +#: libraries/import.lib.php:1148 libraries/tbl_links.inc.php:54 #: pmd_general.php:133 server_privileges.php:595 server_replication.php:313 #: tbl_create.php:305 tbl_tracking.php:263 msgid "Structure" @@ -646,8 +646,8 @@ msgstr "Sledování není zapnuté." #: db_structure.php:404 libraries/display_tbl.lib.php:1945 #, 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." @@ -854,8 +854,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." @@ -1491,8 +1491,8 @@ msgstr "Komentář" #: libraries/Index.class.php:465 libraries/common.lib.php:610 #: libraries/common.lib.php:1143 libraries/config/messages.inc.php:459 -#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1119 -#: libraries/import.lib.php:1143 libraries/schema/User_Schema.class.php:168 +#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1131 +#: libraries/import.lib.php:1155 libraries/schema/User_Schema.class.php:168 #: setup/frames/index.inc.php:125 tbl_row_action.php:68 msgid "Edit" msgstr "Upravit" @@ -1637,8 +1637,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." @@ -2040,7 +2040,7 @@ msgstr "Adresář určený pro upload souborů nemohl být otevřen" #: libraries/config.values.php:95 libraries/export/htmlword.php:24 #: libraries/export/latex.php:41 libraries/export/odt.php:33 #: libraries/export/sql.php:79 libraries/export/texytext.php:23 -#: libraries/import.lib.php:1141 +#: libraries/import.lib.php:1153 msgid "structure" msgstr "struktura" @@ -4499,8 +4499,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 " @@ -4678,7 +4678,7 @@ msgstr "Setřídit podle klíče" #: libraries/export/sql.php:55 libraries/export/texytext.php:30 #: libraries/export/xls.php:28 libraries/export/xlsx.php:28 #: libraries/export/xml.php:25 libraries/export/yaml.php:29 -#: libraries/import.lib.php:1114 libraries/import.lib.php:1136 +#: libraries/import.lib.php:1126 libraries/import.lib.php:1148 #: libraries/import/csv.php:32 libraries/import/docsql.php:34 #: libraries/import/ldi.php:48 libraries/import/ods.php:32 #: libraries/import/sql.php:19 libraries/import/xls.php:27 @@ -5496,37 +5496,37 @@ msgstr "Vygeneroval" msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL vrátil prázdný výsledek (tj. nulový počet řádků)." -#: libraries/import.lib.php:1110 +#: libraries/import.lib.php:1122 msgid "" "The following structures have either been created or altered. Here you can:" msgstr "Následující tabulky byly vytvořeny nebo změněny. Teď můžete:" -#: libraries/import.lib.php:1111 +#: libraries/import.lib.php:1123 msgid "View a structure`s contents by clicking on its name" msgstr "Zobrazit obsah tabulky kliknutím na její jméno" -#: libraries/import.lib.php:1112 +#: libraries/import.lib.php:1124 msgid "" "Change any of its settings by clicking the corresponding \"Options\" link" msgstr "Změnit jakákoliv její nastavení kliknutím na odkaz \"Nastavení\"" -#: libraries/import.lib.php:1113 +#: libraries/import.lib.php:1125 msgid "Edit its structure by following the \"Structure\" link" msgstr "Upravit strukturu kliknutím na odkaz \"Struktura\"" -#: libraries/import.lib.php:1116 +#: libraries/import.lib.php:1128 msgid "Go to database" msgstr "Přejít na databázi" -#: libraries/import.lib.php:1119 libraries/import.lib.php:1143 +#: libraries/import.lib.php:1131 libraries/import.lib.php:1155 msgid "settings" msgstr "nastavení" -#: libraries/import.lib.php:1138 +#: libraries/import.lib.php:1150 msgid "Go to table" msgstr "Přejít na tabulku" -#: libraries/import.lib.php:1147 +#: libraries/import.lib.php:1159 msgid "Go to view" msgstr "Přejít na podhled" @@ -6416,8 +6416,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" @@ -6458,8 +6458,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:729 server_engines.php:56 #: tbl_operations.php:352 @@ -6984,8 +6984,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" @@ -7454,8 +7454,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 " @@ -8939,9 +8939,8 @@ msgstr "" "Nastavil jste typ přihlašování [kbd]config[/kbd] a zadal jste uživatelské " "jméno a heslo pro automatické přihlášení, což není doporučená volba pro " "produkční servery. Kdokoli kdo zná URL phpMyAdminu může přímo přistoupit k " -"Vašemu phpMyAdmin panelu. Nastavte [a@?page=servers&mode=edit&id=" -"%1$d#tab_Server]typ přihlašování[/a] na [kbd]cookie[/kbd] nebo [kbd]http[/" -"kbd]." +"Vašemu phpMyAdmin panelu. Nastavte [a@?page=servers&mode=edit&id=%1" +"$d#tab_Server]typ přihlašování[/a] na [kbd]cookie[/kbd] nebo [kbd]http[/kbd]." #: setup/lib/index.lib.php:259 #, php-format @@ -9077,8 +9076,9 @@ msgstr "" "směry" #: tbl_change.php:1106 -#, php-format -msgid "Restart insertion with %s rows" +#, fuzzy, php-format +#| msgid "Restart insertion with %s rows" +msgid "Continue insertion with %s rows" msgstr "Začít znovu vkládání s %s řádky" #: tbl_chart.php:56 diff --git a/po/cy.po b/po/cy.po index 2b27767..3a1017d 100644 --- a/po/cy.po +++ b/po/cy.po @@ -6,14 +6,14 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-09-07 15:21+0200\n" +"POT-Creation-Date: 2010-09-10 12:46-0400\n" "PO-Revision-Date: 2010-06-07 20:23+0200\n" "Last-Translator: <ardavies(a)tiscali.co.uk>\n" "Language-Team: Welsh <cy(a)li.org>\n" -"Language: cy\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: cy\n" "Plural-Forms: nplurals=2; plural=(n==2) ? 1 : 0;\n" "X-Generator: Pootle 2.0.1\n" @@ -607,7 +607,7 @@ msgstr "Mewnosod" #: libraries/config/user_preferences.forms.php:228 #: libraries/config/user_preferences.forms.php:262 #: libraries/db_links.inc.php:48 libraries/export/latex.php:351 -#: libraries/import.lib.php:1136 libraries/tbl_links.inc.php:54 +#: libraries/import.lib.php:1148 libraries/tbl_links.inc.php:54 #: pmd_general.php:133 server_privileges.php:595 server_replication.php:313 #: tbl_create.php:305 tbl_tracking.php:263 msgid "Structure" @@ -656,8 +656,8 @@ msgstr "Nid yw tracio'n weithredol" #: db_structure.php:404 libraries/display_tbl.lib.php:1945 #, 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 "" "Mae gan yr olwg hon o leiaf y nifer hwn o resi. Gweler y %sdogfennaeth%s." @@ -864,8 +864,8 @@ msgstr "Dadlwythiad wedi'i gadw i'r ffeil %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 "" "Yn ôl pob tebyg, mae'r ffeil i rhy fawr i'w lanlwytho. Gweler y %sdogfennaeth" "%s am ffyrdd i weithio o gwmpas y cyfyngiad hwn." @@ -1529,8 +1529,8 @@ msgstr "Sylw" #: libraries/Index.class.php:465 libraries/common.lib.php:610 #: libraries/common.lib.php:1143 libraries/config/messages.inc.php:459 -#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1119 -#: libraries/import.lib.php:1143 libraries/schema/User_Schema.class.php:168 +#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1131 +#: libraries/import.lib.php:1155 libraries/schema/User_Schema.class.php:168 #: setup/frames/index.inc.php:125 tbl_row_action.php:68 msgid "Edit" msgstr "Golygu" @@ -1673,11 +1673,11 @@ msgstr "Croeso i %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 "" -"Rydych chi heb greu ffeil ffurfwedd yn ôl pob tebyg. Gallwch ddefnyddio'r " -"%1$sgript gosod%2$s er mwyn ei chreu." +"Rydych chi heb greu ffeil ffurfwedd yn ôl pob tebyg. Gallwch ddefnyddio'r %1" +"$sgript gosod%2$s er mwyn ei chreu." #: libraries/auth/config.auth.lib.php:115 msgid "" @@ -2082,7 +2082,7 @@ msgstr "" #: libraries/config.values.php:95 libraries/export/htmlword.php:24 #: libraries/export/latex.php:41 libraries/export/odt.php:33 #: libraries/export/sql.php:79 libraries/export/texytext.php:23 -#: libraries/import.lib.php:1141 +#: libraries/import.lib.php:1153 msgid "structure" msgstr "" @@ -4487,8 +4487,8 @@ msgstr "" #, 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 "" #: libraries/display_export.lib.php:275 @@ -4672,7 +4672,7 @@ msgstr "Trefnu gan allwedd" #: libraries/export/sql.php:55 libraries/export/texytext.php:30 #: libraries/export/xls.php:28 libraries/export/xlsx.php:28 #: libraries/export/xml.php:25 libraries/export/yaml.php:29 -#: libraries/import.lib.php:1114 libraries/import.lib.php:1136 +#: libraries/import.lib.php:1126 libraries/import.lib.php:1148 #: libraries/import/csv.php:32 libraries/import/docsql.php:34 #: libraries/import/ldi.php:48 libraries/import/ods.php:32 #: libraries/import/sql.php:19 libraries/import/xls.php:27 @@ -5465,37 +5465,37 @@ msgstr "" msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "" -#: libraries/import.lib.php:1110 +#: libraries/import.lib.php:1122 msgid "" "The following structures have either been created or altered. Here you can:" msgstr "" -#: libraries/import.lib.php:1111 +#: libraries/import.lib.php:1123 msgid "View a structure`s contents by clicking on its name" msgstr "" -#: libraries/import.lib.php:1112 +#: libraries/import.lib.php:1124 msgid "" "Change any of its settings by clicking the corresponding \"Options\" link" msgstr "" -#: libraries/import.lib.php:1113 +#: libraries/import.lib.php:1125 msgid "Edit its structure by following the \"Structure\" link" msgstr "" -#: libraries/import.lib.php:1116 +#: libraries/import.lib.php:1128 msgid "Go to database" msgstr "" -#: libraries/import.lib.php:1119 libraries/import.lib.php:1143 +#: libraries/import.lib.php:1131 libraries/import.lib.php:1155 msgid "settings" msgstr "" -#: libraries/import.lib.php:1138 +#: libraries/import.lib.php:1150 msgid "Go to table" msgstr "" -#: libraries/import.lib.php:1147 +#: libraries/import.lib.php:1159 msgid "Go to view" msgstr "" @@ -7326,8 +7326,8 @@ msgstr "" 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 "" #: server_privileges.php:1776 @@ -8769,7 +8769,7 @@ msgstr "" #: tbl_change.php:1106 #, php-format -msgid "Restart insertion with %s rows" +msgid "Continue insertion with %s rows" msgstr "" #: tbl_chart.php:56 diff --git a/po/da.po b/po/da.po index feb20b4..7cbcce9 100644 --- a/po/da.po +++ b/po/da.po @@ -3,14 +3,14 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-09-07 15:21+0200\n" +"POT-Creation-Date: 2010-09-10 12:46-0400\n" "PO-Revision-Date: 2010-07-21 14:55+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: danish <da(a)li.org>\n" -"Language: da\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: da\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.1\n" @@ -613,7 +613,7 @@ msgstr "Indsæt" #: libraries/config/user_preferences.forms.php:228 #: libraries/config/user_preferences.forms.php:262 #: libraries/db_links.inc.php:48 libraries/export/latex.php:351 -#: libraries/import.lib.php:1136 libraries/tbl_links.inc.php:54 +#: libraries/import.lib.php:1148 libraries/tbl_links.inc.php:54 #: pmd_general.php:133 server_privileges.php:595 server_replication.php:313 #: tbl_create.php:305 tbl_tracking.php:263 msgid "Structure" @@ -662,8 +662,8 @@ msgstr "" #: db_structure.php:404 libraries/display_tbl.lib.php:1945 #, 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 "" #: db_structure.php:418 db_structure.php:432 libraries/header.inc.php:138 @@ -869,11 +869,11 @@ msgstr "Dump er blevet gemt i filen %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 "" -"Du har sandsynligvis forsøgt at uploade en for stor fil. Se venligst " -"%sdokumentationen%s for måder hvorpå du kan arbejde dig uden om denne " +"Du har sandsynligvis forsøgt at uploade en for stor fil. Se venligst %" +"sdokumentationen%s for måder hvorpå du kan arbejde dig uden om denne " "begrænsning." #: import.php:277 import.php:330 libraries/File.class.php:566 @@ -1591,8 +1591,8 @@ msgstr "" #: libraries/Index.class.php:465 libraries/common.lib.php:610 #: libraries/common.lib.php:1143 libraries/config/messages.inc.php:459 -#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1119 -#: libraries/import.lib.php:1143 libraries/schema/User_Schema.class.php:168 +#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1131 +#: libraries/import.lib.php:1155 libraries/schema/User_Schema.class.php:168 #: setup/frames/index.inc.php:125 tbl_row_action.php:68 msgid "Edit" msgstr "Ret" @@ -1736,8 +1736,8 @@ msgstr "Velkommen til %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 "" "Sandsynlig årsag til dette er at du ikke har oprettet en konfigurationsfil. " "Du kan bruge %1$sopsætningsscriptet%2$s til at oprette en." @@ -2149,7 +2149,7 @@ msgstr "Mappen du har sat til upload-arbejde kan ikke findes" #: libraries/config.values.php:95 libraries/export/htmlword.php:24 #: libraries/export/latex.php:41 libraries/export/odt.php:33 #: libraries/export/sql.php:79 libraries/export/texytext.php:23 -#: libraries/import.lib.php:1141 +#: libraries/import.lib.php:1153 msgid "structure" msgstr "" @@ -4563,8 +4563,8 @@ msgstr "" #| "happen: %3$s. Other text will be kept as is." 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 "" "Denne værdi fortolkes via %1$sstrftime%2$s, så du kan bruge tidsformatterede " "strenge. Ydermere vil følgende transformationer foregå: %3$s. Anden tekst " @@ -4761,7 +4761,7 @@ msgstr "Sorteringsnøgle" #: libraries/export/sql.php:55 libraries/export/texytext.php:30 #: libraries/export/xls.php:28 libraries/export/xlsx.php:28 #: libraries/export/xml.php:25 libraries/export/yaml.php:29 -#: libraries/import.lib.php:1114 libraries/import.lib.php:1136 +#: libraries/import.lib.php:1126 libraries/import.lib.php:1148 #: libraries/import/csv.php:32 libraries/import/docsql.php:34 #: libraries/import/ldi.php:48 libraries/import/ods.php:32 #: libraries/import/sql.php:19 libraries/import/xls.php:27 @@ -5575,37 +5575,37 @@ msgstr "Genereret af" msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL returnerede ingen data (fx ingen rækker)." -#: libraries/import.lib.php:1110 +#: libraries/import.lib.php:1122 msgid "" "The following structures have either been created or altered. Here you can:" msgstr "" -#: libraries/import.lib.php:1111 +#: libraries/import.lib.php:1123 msgid "View a structure`s contents by clicking on its name" msgstr "" -#: libraries/import.lib.php:1112 +#: libraries/import.lib.php:1124 msgid "" "Change any of its settings by clicking the corresponding \"Options\" link" msgstr "" -#: libraries/import.lib.php:1113 +#: libraries/import.lib.php:1125 msgid "Edit its structure by following the \"Structure\" link" msgstr "" -#: libraries/import.lib.php:1116 +#: libraries/import.lib.php:1128 msgid "Go to database" msgstr "" -#: libraries/import.lib.php:1119 libraries/import.lib.php:1143 +#: libraries/import.lib.php:1131 libraries/import.lib.php:1155 msgid "settings" msgstr "" -#: libraries/import.lib.php:1138 +#: libraries/import.lib.php:1150 msgid "Go to table" msgstr "" -#: libraries/import.lib.php:1147 +#: libraries/import.lib.php:1159 msgid "Go to view" msgstr "" @@ -7619,14 +7619,14 @@ msgstr "Drop databaser der har samme navne som brugernes." 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 "" "Bemærk: phpMyAdmin henter brugernes privilegier direkte fra MySQLs " "privilegietabeller. Indholdet af disse tabeller kan være forskelligt fra " "privilegierne serveren i øjeblikket bruger hvis der er lavet manuelle " -"ændringer i den. Hvis dette er tilfældet, bør du %sgenindlæse privilegierne" -"%s før du fortsætter." +"ændringer i den. Hvis dette er tilfældet, bør du %sgenindlæse privilegierne%" +"s før du fortsætter." #: server_privileges.php:1776 msgid "The selected user was not found in the privilege table." @@ -9201,7 +9201,7 @@ msgstr "" #: tbl_change.php:1106 #, php-format -msgid "Restart insertion with %s rows" +msgid "Continue insertion with %s rows" msgstr "" #: tbl_chart.php:56 diff --git a/po/de.po b/po/de.po index 58d83eb..10052aa 100644 --- a/po/de.po +++ b/po/de.po @@ -3,14 +3,14 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-09-07 15:21+0200\n" +"POT-Creation-Date: 2010-09-10 12:46-0400\n" "PO-Revision-Date: 2010-07-31 21:09+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: german <de(a)li.org>\n" -"Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.1\n" @@ -610,7 +610,7 @@ msgstr "Einfügen" #: libraries/config/user_preferences.forms.php:228 #: libraries/config/user_preferences.forms.php:262 #: libraries/db_links.inc.php:48 libraries/export/latex.php:351 -#: libraries/import.lib.php:1136 libraries/tbl_links.inc.php:54 +#: libraries/import.lib.php:1148 libraries/tbl_links.inc.php:54 #: pmd_general.php:133 server_privileges.php:595 server_replication.php:313 #: tbl_create.php:305 tbl_tracking.php:263 msgid "Structure" @@ -659,11 +659,11 @@ msgstr "Tracking ist nicht aktiviert." #: db_structure.php:404 libraries/display_tbl.lib.php:1945 #, 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 "" -"Dieser View hat mindestens diese Anzahl von Zeilen. Bitte lesen Sie die " -"%sDokumentation%s." +"Dieser View hat mindestens diese Anzahl von Zeilen. Bitte lesen Sie die %" +"sDokumentation%s." #: db_structure.php:418 db_structure.php:432 libraries/header.inc.php:138 #: libraries/tbl_info.inc.php:60 tbl_structure.php:205 test/theme.php:73 @@ -868,11 +868,11 @@ msgstr "Dump (Schema) wurde in Datei %s gespeichert." #: 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 "" -"Möglicherweise wurde eine zu große Datei hochgeladen. Bitte lesen Sie die " -"%sDokumentation%s zur Lösung diese Problems." +"Möglicherweise wurde eine zu große Datei hochgeladen. Bitte lesen Sie die %" +"sDokumentation%s zur Lösung diese Problems." #: import.php:277 import.php:330 libraries/File.class.php:566 #: libraries/File.class.php:676 @@ -1546,8 +1546,8 @@ msgstr "Kommentar" #: libraries/Index.class.php:465 libraries/common.lib.php:610 #: libraries/common.lib.php:1143 libraries/config/messages.inc.php:459 -#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1119 -#: libraries/import.lib.php:1143 libraries/schema/User_Schema.class.php:168 +#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1131 +#: libraries/import.lib.php:1155 libraries/schema/User_Schema.class.php:168 #: setup/frames/index.inc.php:125 tbl_row_action.php:68 msgid "Edit" msgstr "Bearbeiten" @@ -1692,8 +1692,8 @@ msgstr "Willkommen bei %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 "" "Eine mögliche Ursache wäre, dass Sie noch keine Konfigurationsdatei angelegt " "haben. Verwenden Sie in diesem Fall doch das %1$sSetup-Skript%2$s, um eine " @@ -2113,7 +2113,7 @@ msgstr "Auf das festgelegte Upload-Verzeichnis kann nicht zugegriffen werden." #: libraries/config.values.php:95 libraries/export/htmlword.php:24 #: libraries/export/latex.php:41 libraries/export/odt.php:33 #: libraries/export/sql.php:79 libraries/export/texytext.php:23 -#: libraries/import.lib.php:1141 +#: libraries/import.lib.php:1153 msgid "structure" msgstr "Struktur" @@ -4749,8 +4749,8 @@ msgstr "" #| "happen: %3$s. Other text will be kept as is." 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 "" "Dieser Wert wird mit %1$sstrftime%2$s geparst, Sie können also Platzhalter " "für Datum und Uhrzeit verwenden. Darüber hinaus werden folgende Umformungen " @@ -4954,7 +4954,7 @@ msgstr "Nach Schlüssel sortieren" #: libraries/export/sql.php:55 libraries/export/texytext.php:30 #: libraries/export/xls.php:28 libraries/export/xlsx.php:28 #: libraries/export/xml.php:25 libraries/export/yaml.php:29 -#: libraries/import.lib.php:1114 libraries/import.lib.php:1136 +#: libraries/import.lib.php:1126 libraries/import.lib.php:1148 #: libraries/import/csv.php:32 libraries/import/docsql.php:34 #: libraries/import/ldi.php:48 libraries/import/ods.php:32 #: libraries/import/sql.php:19 libraries/import/xls.php:27 @@ -5807,40 +5807,40 @@ msgstr "Erstellt von" msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL lieferte ein leeres Resultat zurück (d.h. null Zeilen)." -#: libraries/import.lib.php:1110 +#: libraries/import.lib.php:1122 msgid "" "The following structures have either been created or altered. Here you can:" msgstr "" "Die folgenden Strukturen wurden entweder erstellt oder verändert. Hier " "können Sie:" -#: libraries/import.lib.php:1111 +#: libraries/import.lib.php:1123 msgid "View a structure`s contents by clicking on its name" msgstr "Zum Anzeigen einer Struktur einfach auf den Namen klicken" -#: libraries/import.lib.php:1112 +#: libraries/import.lib.php:1124 msgid "" "Change any of its settings by clicking the corresponding \"Options\" link" msgstr "" "Zum Ändern der Einstellungen auf das entsprechende \"Optionen\" klicken" -#: libraries/import.lib.php:1113 +#: libraries/import.lib.php:1125 msgid "Edit its structure by following the \"Structure\" link" msgstr "Zum Ändern der Struktur auf das entsprechenden \"Struktur\" klicken" -#: libraries/import.lib.php:1116 +#: libraries/import.lib.php:1128 msgid "Go to database" msgstr "Gehe zur Datenbank" -#: libraries/import.lib.php:1119 libraries/import.lib.php:1143 +#: libraries/import.lib.php:1131 libraries/import.lib.php:1155 msgid "settings" msgstr "Einstellungen" -#: libraries/import.lib.php:1138 +#: libraries/import.lib.php:1150 msgid "Go to table" msgstr "Gehe zur Tabelle" -#: libraries/import.lib.php:1147 +#: libraries/import.lib.php:1159 msgid "Go to view" msgstr "Gehe zum View" @@ -6816,8 +6816,8 @@ msgid "" "author what %s does." msgstr "" "Für diese Umwandlung ist keine Beschreibung verfügbar.<br />Für weitere " -"Informationen wenden Sie sich bitte an den Autoren der Funktion "" -"%s"." +"Informationen wenden Sie sich bitte an den Autoren der Funktion "%" +"s"." #: libraries/tbl_properties.inc.php:729 server_engines.php:56 #: tbl_operations.php:352 @@ -7910,8 +7910,8 @@ msgstr "Die gleichnamigen Datenbanken löschen." 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 "" "phpMyAdmin liest die Benutzerprofile direkt aus den entsprechenden MySQL-" "Tabellen aus. Der Inhalt dieser Tabellen kann sich von den Benutzerprofilen, " @@ -9596,8 +9596,9 @@ msgstr "" "beliebig bewegen" #: tbl_change.php:1106 -#, php-format -msgid "Restart insertion with %s rows" +#, fuzzy, php-format +#| msgid "Restart insertion with %s rows" +msgid "Continue insertion with %s rows" msgstr "Einfügen mit %s Zeilen neu starten" #: tbl_chart.php:56 diff --git a/po/el.po b/po/el.po index c43d851..1a025e2 100644 --- a/po/el.po +++ b/po/el.po @@ -3,14 +3,14 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-09-07 15:21+0200\n" +"POT-Creation-Date: 2010-09-10 12:46-0400\n" "PO-Revision-Date: 2010-09-06 11:51+0200\n" "Last-Translator: Panagiotis Papazoglou <papaz_p(a)yahoo.com>\n" "Language-Team: greek <el(a)li.org>\n" -"Language: el\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: el\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.5\n" @@ -596,7 +596,7 @@ msgstr "Προσθήκη" #: libraries/config/user_preferences.forms.php:228 #: libraries/config/user_preferences.forms.php:262 #: libraries/db_links.inc.php:48 libraries/export/latex.php:351 -#: libraries/import.lib.php:1136 libraries/tbl_links.inc.php:54 +#: libraries/import.lib.php:1148 libraries/tbl_links.inc.php:54 #: pmd_general.php:133 server_privileges.php:595 server_replication.php:313 #: tbl_create.php:305 tbl_tracking.php:263 msgid "Structure" @@ -645,11 +645,11 @@ msgstr "Η παρακολούθηση δεν έιναι ενεργοποιημέ #: db_structure.php:404 libraries/display_tbl.lib.php:1945 #, 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 "" -"Αυτή η προβολή έχει τουλάχιστον αυτό τον αριθμό γραμμών. Λεπτομέρειες στην " -"%sτεκμηρίωση%s." +"Αυτή η προβολή έχει τουλάχιστον αυτό τον αριθμό γραμμών. Λεπτομέρειες στην %" +"sτεκμηρίωση%s." #: db_structure.php:418 db_structure.php:432 libraries/header.inc.php:138 #: libraries/tbl_info.inc.php:60 tbl_structure.php:205 test/theme.php:73 @@ -855,11 +855,11 @@ msgstr "Το αρχείο εξόδου αποθηκεύτηκε ως %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 "" -"Πιθανόν προσπαθείτε να αποστείλετε πολύ μεγάλο αρχείο. Λεπτομέρειες στην " -"%sτεκμηρίωση%s για τρόπους αντιμετώπισης αυτού του περιορισμού." +"Πιθανόν προσπαθείτε να αποστείλετε πολύ μεγάλο αρχείο. Λεπτομέρειες στην %" +"sτεκμηρίωση%s για τρόπους αντιμετώπισης αυτού του περιορισμού." #: import.php:277 import.php:330 libraries/File.class.php:566 #: libraries/File.class.php:676 @@ -1557,8 +1557,8 @@ msgstr "Σχόλιο" #: libraries/Index.class.php:465 libraries/common.lib.php:610 #: libraries/common.lib.php:1143 libraries/config/messages.inc.php:459 -#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1119 -#: libraries/import.lib.php:1143 libraries/schema/User_Schema.class.php:168 +#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1131 +#: libraries/import.lib.php:1155 libraries/schema/User_Schema.class.php:168 #: setup/frames/index.inc.php:125 tbl_row_action.php:68 msgid "Edit" msgstr "Επεξεργασία" @@ -1702,8 +1702,8 @@ msgstr "Καλωσήρθατε στο %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 "" "Πιθανή αιτία για αυτό είναι η μη δημιουργία αρχείου προσαρμογής. Ίσως θέλετε " "να χρησιμοποιήσετε τον %1$sκώδικα εγκατάστασηςt%2$s για να δημιουργήσετε ένα." @@ -2123,7 +2123,7 @@ msgstr "" #: libraries/config.values.php:95 libraries/export/htmlword.php:24 #: libraries/export/latex.php:41 libraries/export/odt.php:33 #: libraries/export/sql.php:79 libraries/export/texytext.php:23 -#: libraries/import.lib.php:1141 +#: libraries/import.lib.php:1153 msgid "structure" msgstr "δομή" @@ -4757,8 +4757,8 @@ msgstr "" #| "happen: %3$s. Other text will be kept as is." 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 "" "Αυτή η τιμή μετατρέπεται με χρήση της συνάρτησης %1$sstrftime%2$s, έτσι " "μπορείτε να χρησιμοποιήσετε φράσεις μορφής χρόνου. Επιπρόσθετα, θα γίνουν " @@ -4957,7 +4957,7 @@ msgstr "Ταξινόμηση ανά κλειδί" #: libraries/export/sql.php:55 libraries/export/texytext.php:30 #: libraries/export/xls.php:28 libraries/export/xlsx.php:28 #: libraries/export/xml.php:25 libraries/export/yaml.php:29 -#: libraries/import.lib.php:1114 libraries/import.lib.php:1136 +#: libraries/import.lib.php:1126 libraries/import.lib.php:1148 #: libraries/import/csv.php:32 libraries/import/docsql.php:34 #: libraries/import/ldi.php:48 libraries/import/ods.php:32 #: libraries/import/sql.php:19 libraries/import/xls.php:27 @@ -5822,37 +5822,37 @@ msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "" "Η MySQL επέστρεψε ένα άδειο σύνολο αποτελεσμάτων (π.χ. καμμία εγγραφή)." -#: libraries/import.lib.php:1110 +#: libraries/import.lib.php:1122 msgid "" "The following structures have either been created or altered. Here you can:" msgstr "Οι ακόλουθες δομές δημιουργήθηκαν ή αλλάχτηκαν. Εδώ μπορείτε να:" -#: libraries/import.lib.php:1111 +#: libraries/import.lib.php:1123 msgid "View a structure`s contents by clicking on its name" msgstr "Δείτε τα περιεχόμενα δομής πατώντας στο όνομα" -#: libraries/import.lib.php:1112 +#: libraries/import.lib.php:1124 msgid "" "Change any of its settings by clicking the corresponding \"Options\" link" msgstr "Αλλάξτε τις ρυθμίσεις πατώντας τον αντίστοιχο σύνδεσμο «Επιλογές»" -#: libraries/import.lib.php:1113 +#: libraries/import.lib.php:1125 msgid "Edit its structure by following the \"Structure\" link" msgstr "Επεξεργαστεί τη δομή από τον σύνδεσμο «Δομή»" -#: libraries/import.lib.php:1116 +#: libraries/import.lib.php:1128 msgid "Go to database" msgstr "Μετάβαση στη βάση δεδομένων" -#: libraries/import.lib.php:1119 libraries/import.lib.php:1143 +#: libraries/import.lib.php:1131 libraries/import.lib.php:1155 msgid "settings" msgstr "ρυθμίσεις" -#: libraries/import.lib.php:1138 +#: libraries/import.lib.php:1150 msgid "Go to table" msgstr "Μετάβαση στον πίνακα" -#: libraries/import.lib.php:1147 +#: libraries/import.lib.php:1159 msgid "Go to view" msgstr "Μετάβαση στην προβολή" @@ -6729,8 +6729,8 @@ msgid "" "installed the necessary PHP extensions as described in the %sdocumentation%s." msgstr "" "Ο επικυρωτής SQL δεν μπόρεσε να ενεργοποιηθεί. Παρακαλώ ελέγξτε ότι έχετε " -"εγκαταστήσει της απαραίτητες επεκτάσεις της php όπως περιγράφεται στην " -"%sτεκμηρίωση%s." +"εγκαταστήσει της απαραίτητες επεκτάσεις της php όπως περιγράφεται στην %" +"sτεκμηρίωση%s." #: libraries/tbl_links.inc.php:106 libraries/tbl_links.inc.php:107 msgid "Table seems to be empty!" @@ -7913,8 +7913,8 @@ msgstr "Διαγραφή βάσεων δεδομένων που έχουν ίδ 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 "" "Σημείωση: Το phpMyAdmin διαβάζει τα δικαιώματα των χρηστών κατευθείαν από " "τους πίνακες δικαιωμάτων της MySQL. Το περιεχόμενο αυτών των πινάκων μπορεί " @@ -9473,8 +9473,8 @@ msgid "" "to." msgstr "" "Αν νομίζετε ότι είναι απαραίτητο, χρησιμοποιήστε πρόσθετες ρυθμίσεις " -"προστασίας - ρυθμίσεις [a@?page=servers&mode=edit&id=" -"%1$d#tab_Server_config]επικύρωση διακομιστή[/a] και [a@?page=form&" +"προστασίας - ρυθμίσεις [a@?page=servers&mode=edit&id=%1" +"$d#tab_Server_config]επικύρωση διακομιστή[/a] και [a@?page=form&" "formset=features#tab_Security]λίστα αξιόπιστων διακομιστών[/a]. Ωστόσο, η " "βασισμένη στις ΙΡ προστασία δεν είναι αξιόπιστη αν ο πάροχός έχει χιλιάδες " "χρήστες που συνδέονται." @@ -9491,8 +9491,8 @@ msgstr "" "Ορίζετε τον τύπο επικύρωσης [kbd]ρύθμισης[/kbd] και περιλαμβάνει όνομα " "χρήστη και κωδικό πρόσβασης για αυτόματη σύνδεση, αν και δεν προτείνεται. " "Όποιος γνωρίζει ή υποθέτει τη διεύθυνση URL του phpMyAdmin μπορεί να έχει " -"άμεση πρόσβαση. Ορίστε τον [a@?page=servers&mode=edit&id=" -"%1$d#tab_Server]τύπο επικύρωσης[/a] σε [kbd]cookie[/kbd] ή [kbd]http[/kbd]." +"άμεση πρόσβαση. Ορίστε τον [a@?page=servers&mode=edit&id=%1" +"$d#tab_Server]τύπο επικύρωσης[/a] σε [kbd]cookie[/kbd] ή [kbd]http[/kbd]." #: setup/lib/index.lib.php:259 #, php-format @@ -9639,8 +9639,9 @@ msgstr "" "μετακίνηση παντού" #: tbl_change.php:1106 -#, php-format -msgid "Restart insertion with %s rows" +#, fuzzy, php-format +#| msgid "Restart insertion with %s rows" +msgid "Continue insertion with %s rows" msgstr "Επανεκκίνηση εισαγωγής με %s εγγραφές" #: tbl_chart.php:56 @@ -10280,9 +10281,9 @@ msgstr "Μετονομασία πίνακα σε" #~ "\\'b')." #~ msgstr "" #~ "Παρακαλώ εισάγετε τις τιμές για τη μετατροπή χρησιμοποιώντας τη μορφή: " -#~ "'α', 100, β,'γ'...<br />Εάν χρειαστείτε να χρησιμοποιήσετε καθέτους " -#~ "(«\\») ή μονά εισαγωγικά («'») στις τιμές, χρησιμοποιείτε καθέτους " -#~ "(παράδειγμα '\\\\χψω' ή 'α\\'β')." +#~ "'α', 100, β,'γ'...<br />Εάν χρειαστείτε να χρησιμοποιήσετε καθέτους («\\») " +#~ "ή μονά εισαγωγικά («'») στις τιμές, χρησιμοποιείτε καθέτους (παράδειγμα '\\" +#~ "\\χψω' ή 'α\\'β')." #, fuzzy #~| msgid "" @@ -10296,9 +10297,9 @@ msgstr "Μετονομασία πίνακα σε" #~ "a backslash (for example '\\\\xyz' or 'a\\'b')." #~ msgstr "" #~ "Παρακαλώ εισάγετε τις τιμές για τη μετατροπή χρησιμοποιώντας τη μορφή: " -#~ "'α', 100, β,'γ'...<br />Εάν χρειαστείτε να χρησιμοποιήσετε καθέτους " -#~ "(«\\») ή μονά εισαγωγικά («'») στις τιμές, χρησιμοποιείτε καθέτους " -#~ "(παράδειγμα '\\\\χψω' ή 'α\\'β')." +#~ "'α', 100, β,'γ'...<br />Εάν χρειαστείτε να χρησιμοποιήσετε καθέτους («\\») " +#~ "ή μονά εισαγωγικά («'») στις τιμές, χρησιμοποιείτε καθέτους (παράδειγμα '\\" +#~ "\\χψω' ή 'α\\'β')." #~ msgid "New table" #~ msgstr "Νέος πίνακας" diff --git a/po/en_GB.po b/po/en_GB.po index 4395eda..0c6da42 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -3,14 +3,14 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-09-07 15:21+0200\n" +"POT-Creation-Date: 2010-09-10 12:46-0400\n" "PO-Revision-Date: 2010-09-07 19:46+0200\n" "Last-Translator: Robert Readman <robert_readman(a)hotmail.com>\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" @@ -591,7 +591,7 @@ msgstr "Insert" #: libraries/config/user_preferences.forms.php:228 #: libraries/config/user_preferences.forms.php:262 #: libraries/db_links.inc.php:48 libraries/export/latex.php:351 -#: libraries/import.lib.php:1136 libraries/tbl_links.inc.php:54 +#: libraries/import.lib.php:1148 libraries/tbl_links.inc.php:54 #: pmd_general.php:133 server_privileges.php:595 server_replication.php:313 #: tbl_create.php:305 tbl_tracking.php:263 msgid "Structure" @@ -640,11 +640,11 @@ msgstr "Tracking is not active." #: db_structure.php:404 libraries/display_tbl.lib.php:1945 #, 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 "" -"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." #: db_structure.php:418 db_structure.php:432 libraries/header.inc.php:138 #: libraries/tbl_info.inc.php:60 tbl_structure.php:205 test/theme.php:73 @@ -848,11 +848,11 @@ msgstr "Dump has been saved to file %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 "" -"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." #: import.php:277 import.php:330 libraries/File.class.php:566 #: libraries/File.class.php:676 @@ -1068,7 +1068,6 @@ msgid "Changing Charset" msgstr "Changing Charset" #: js/messages.php:75 -#| msgid "Table must have atleast 1 column" msgid "Table must have at least one column" msgstr "Table must have at least one column" @@ -1484,8 +1483,8 @@ msgstr "Comment" #: libraries/Index.class.php:465 libraries/common.lib.php:610 #: libraries/common.lib.php:1143 libraries/config/messages.inc.php:459 -#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1119 -#: libraries/import.lib.php:1143 libraries/schema/User_Schema.class.php:168 +#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1131 +#: libraries/import.lib.php:1155 libraries/schema/User_Schema.class.php:168 #: setup/frames/index.inc.php:125 tbl_row_action.php:68 msgid "Edit" msgstr "Edit" @@ -1628,11 +1627,11 @@ msgstr "Welcome to %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 "" -"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." #: libraries/auth/config.auth.lib.php:115 msgid "" @@ -2030,7 +2029,7 @@ msgstr "The directory you set for upload work cannot be reached" #: libraries/config.values.php:95 libraries/export/htmlword.php:24 #: libraries/export/latex.php:41 libraries/export/odt.php:33 #: libraries/export/sql.php:79 libraries/export/texytext.php:23 -#: libraries/import.lib.php:1141 +#: libraries/import.lib.php:1153 msgid "structure" msgstr "structure" @@ -3062,7 +3061,6 @@ msgid "Display servers selection" msgstr "Display servers selection" #: libraries/config/messages.inc.php:268 -#| msgid "Display databases in a tree" msgid "Display table filter" msgstr "Display table filter" @@ -3203,7 +3201,6 @@ msgid "Login cookie validity" msgstr "Login cookie validity" #: libraries/config/messages.inc.php:296 -#| msgid "Double size of textarea for LONGTEXT fields" msgid "Double size of textarea for LONGTEXT columns" msgstr "Double size of textarea for LONGTEXT columns" @@ -3335,10 +3332,6 @@ msgid "Persistent connections" msgstr "Persistent connections" #: libraries/config/messages.inc.php:325 -#| msgid "" -#| "Disable the default warning that is displayed on the database details " -#| "Structure page if any of the required tables for the relation features " -#| "could not be found" msgid "" "Disable the default warning that is displayed on the database details " "Structure page if any of the required tables for the phpMyAdmin " @@ -4496,12 +4489,12 @@ msgstr ", @TABLE@ will become the table name" #, 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 "" "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." #: libraries/display_export.lib.php:275 msgid "use this for future exports" @@ -4673,7 +4666,7 @@ msgstr "Sort by key" #: libraries/export/sql.php:55 libraries/export/texytext.php:30 #: libraries/export/xls.php:28 libraries/export/xlsx.php:28 #: libraries/export/xml.php:25 libraries/export/yaml.php:29 -#: libraries/import.lib.php:1114 libraries/import.lib.php:1136 +#: libraries/import.lib.php:1126 libraries/import.lib.php:1148 #: libraries/import/csv.php:32 libraries/import/docsql.php:34 #: libraries/import/ldi.php:48 libraries/import/ods.php:32 #: libraries/import/sql.php:19 libraries/import/xls.php:27 @@ -5513,39 +5506,39 @@ msgstr "Generated by" msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL returned an empty result set (i.e. zero rows)." -#: libraries/import.lib.php:1110 +#: libraries/import.lib.php:1122 msgid "" "The following structures have either been created or altered. Here you can:" msgstr "" "The following structures have either been created or altered. Here you can:" -#: libraries/import.lib.php:1111 +#: libraries/import.lib.php:1123 msgid "View a structure`s contents by clicking on its name" msgstr "View a structure`s contents by clicking on its name" -#: libraries/import.lib.php:1112 +#: libraries/import.lib.php:1124 msgid "" "Change any of its settings by clicking the corresponding \"Options\" link" msgstr "" "Change any of its settings by clicking the corresponding \"Options\" link" -#: libraries/import.lib.php:1113 +#: libraries/import.lib.php:1125 msgid "Edit its structure by following the \"Structure\" link" msgstr "Edit its structure by following the \"Structure\" link" -#: libraries/import.lib.php:1116 +#: libraries/import.lib.php:1128 msgid "Go to database" msgstr "Go to database" -#: libraries/import.lib.php:1119 libraries/import.lib.php:1143 +#: libraries/import.lib.php:1131 libraries/import.lib.php:1155 msgid "settings" msgstr "settings" -#: libraries/import.lib.php:1138 +#: libraries/import.lib.php:1150 msgid "Go to table" msgstr "Go to table" -#: libraries/import.lib.php:1147 +#: libraries/import.lib.php:1159 msgid "Go to view" msgstr "Go to view" @@ -7480,13 +7473,13 @@ msgstr "Drop the databases that have the same names as the users." 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 "" "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." #: server_privileges.php:1776 msgid "The selected user was not found in the privilege table." @@ -9110,8 +9103,9 @@ msgstr "" "Use TAB key to move from value to value, or CTRL+arrows to move anywhere" #: tbl_change.php:1106 -#, php-format -msgid "Restart insertion with %s rows" +#, fuzzy, php-format +#| msgid "Restart insertion with %s rows" +msgid "Continue insertion with %s rows" msgstr "Restart insertion with %s rows" #: tbl_chart.php:56 diff --git a/po/es.po b/po/es.po index e5556f0..d95f794 100644 --- a/po/es.po +++ b/po/es.po @@ -3,14 +3,14 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-09-07 15:21+0200\n" +"POT-Creation-Date: 2010-09-10 12:46-0400\n" "PO-Revision-Date: 2010-03-12 11:23+0200\n" "Last-Translator: Michal <michal(a)cihar.com>\n" "Language-Team: spanish <es(a)li.org>\n" -"Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: es\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.1\n" @@ -612,7 +612,7 @@ msgstr "Insertar" #: libraries/config/user_preferences.forms.php:228 #: libraries/config/user_preferences.forms.php:262 #: libraries/db_links.inc.php:48 libraries/export/latex.php:351 -#: libraries/import.lib.php:1136 libraries/tbl_links.inc.php:54 +#: libraries/import.lib.php:1148 libraries/tbl_links.inc.php:54 #: pmd_general.php:133 server_privileges.php:595 server_replication.php:313 #: tbl_create.php:305 tbl_tracking.php:263 msgid "Structure" @@ -661,11 +661,11 @@ msgstr "" #: db_structure.php:404 libraries/display_tbl.lib.php:1945 #, 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 "" -"Esta vista tiene al menos este número de filas. Por favor, refiérase a la " -"%sdocumentation%s." +"Esta vista tiene al menos este número de filas. Por favor, refiérase a la %" +"sdocumentation%s." #: db_structure.php:418 db_structure.php:432 libraries/header.inc.php:138 #: libraries/tbl_info.inc.php:60 tbl_structure.php:205 test/theme.php:73 @@ -879,8 +879,8 @@ msgstr "Su archivo (MySQL dump) ha sido guardado con el nombre %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 "" "Usted probablemente intentó cargar un archivo demasiado grande. Por favor, " "refiérase a %sdocumentation%s para hallar modos de superar esta limitante." @@ -1608,8 +1608,8 @@ msgstr "Comentario" #: libraries/Index.class.php:465 libraries/common.lib.php:610 #: libraries/common.lib.php:1143 libraries/config/messages.inc.php:459 -#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1119 -#: libraries/import.lib.php:1143 libraries/schema/User_Schema.class.php:168 +#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1131 +#: libraries/import.lib.php:1155 libraries/schema/User_Schema.class.php:168 #: setup/frames/index.inc.php:125 tbl_row_action.php:68 msgid "Edit" msgstr "Editar" @@ -1738,8 +1738,8 @@ msgstr "¡No se halló la plantilla de interfaz (theme) %s!" #, php-format msgid "Theme path not found for theme %s!" msgstr "" -"¡No se halló la ruta de la plantilla de interfaz (theme) para la plantilla " -"%s!" +"¡No se halló la ruta de la plantilla de interfaz (theme) para la plantilla %" +"s!" #: libraries/Theme_Manager.class.php:291 test/theme.php:160 themes.php:20 #: themes.php:40 @@ -1760,8 +1760,8 @@ msgstr "Bienvenido a %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 "" "La razón más probable es que usted no creó un archivo de configuración. " "Utilice %1$ssetup script%2$s para crear una." @@ -2182,7 +2182,7 @@ msgstr "" #: libraries/config.values.php:95 libraries/export/htmlword.php:24 #: libraries/export/latex.php:41 libraries/export/odt.php:33 #: libraries/export/sql.php:79 libraries/export/texytext.php:23 -#: libraries/import.lib.php:1141 +#: libraries/import.lib.php:1153 #, fuzzy msgid "structure" msgstr "Estructura" @@ -4767,8 +4767,8 @@ msgstr "" #| "happen: %3$s. Other text will be kept as is." 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 "" "Este valor es interpretado usando %1$sstrftime%2$s; así, usted puede usar " "cadenas de caracteres para formatear el tiempo. De manera adicional, " @@ -4967,7 +4967,7 @@ msgstr "Organizar según la clave" #: libraries/export/sql.php:55 libraries/export/texytext.php:30 #: libraries/export/xls.php:28 libraries/export/xlsx.php:28 #: libraries/export/xml.php:25 libraries/export/yaml.php:29 -#: libraries/import.lib.php:1114 libraries/import.lib.php:1136 +#: libraries/import.lib.php:1126 libraries/import.lib.php:1148 #: libraries/import/csv.php:32 libraries/import/docsql.php:34 #: libraries/import/ldi.php:48 libraries/import/ods.php:32 #: libraries/import/sql.php:19 libraries/import/xls.php:27 @@ -5837,39 +5837,39 @@ msgstr "Generado por" msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL ha devuelto un valor vacío (i.e., cero columnas)." -#: libraries/import.lib.php:1110 +#: libraries/import.lib.php:1122 msgid "" "The following structures have either been created or altered. Here you can:" msgstr "" -#: libraries/import.lib.php:1111 +#: libraries/import.lib.php:1123 msgid "View a structure`s contents by clicking on its name" msgstr "" -#: libraries/import.lib.php:1112 +#: libraries/import.lib.php:1124 msgid "" "Change any of its settings by clicking the corresponding \"Options\" link" msgstr "" -#: libraries/import.lib.php:1113 +#: libraries/import.lib.php:1125 msgid "Edit its structure by following the \"Structure\" link" msgstr "" -#: libraries/import.lib.php:1116 +#: libraries/import.lib.php:1128 #, fuzzy msgid "Go to database" msgstr "No hay bases de datos" -#: libraries/import.lib.php:1119 libraries/import.lib.php:1143 +#: libraries/import.lib.php:1131 libraries/import.lib.php:1155 msgid "settings" msgstr "" -#: libraries/import.lib.php:1138 +#: libraries/import.lib.php:1150 #, fuzzy msgid "Go to table" msgstr "No hay bases de datos" -#: libraries/import.lib.php:1147 +#: libraries/import.lib.php:1159 msgid "Go to view" msgstr "" @@ -7234,8 +7234,8 @@ msgid "" "Server running with Suhosin. Please refer to %sdocumentation%s for possible " "issues." msgstr "" -"El servidor está utilizando Suhosin. Por favor, refiérase a %sdocumentation" -"%s para posibles ajustes." +"El servidor está utilizando Suhosin. Por favor, refiérase a %sdocumentation%" +"s para posibles ajustes." #: navigation.php:60 navigation.php:61 navigation.php:64 #, fuzzy @@ -7925,8 +7925,8 @@ msgstr "" 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 "" "Nota: phpMyAdmin obtiene los privilegios de los usuarios 'directamente de " "las tablas de privilegios MySQL'. El contenido de estas tablas puede diferir " @@ -9612,8 +9612,9 @@ msgstr "" "a cualquier parte" #: tbl_change.php:1106 -#, php-format -msgid "Restart insertion with %s rows" +#, fuzzy, php-format +#| msgid "Restart insertion with %s rows" +msgid "Continue insertion with %s rows" msgstr "Reinicie la inserción con %s filas" #: tbl_chart.php:56 diff --git a/po/et.po b/po/et.po index 5f019d2..c77c3b3 100644 --- a/po/et.po +++ b/po/et.po @@ -3,14 +3,14 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-09-07 15:21+0200\n" +"POT-Creation-Date: 2010-09-10 12:46-0400\n" "PO-Revision-Date: 2010-03-12 09:14+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: estonian <et(a)li.org>\n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: \n" "X-Generator: Translate Toolkit 1.5.3\n" #: browse_foreigners.php:36 browse_foreigners.php:57 @@ -609,7 +609,7 @@ msgstr "Lisa" #: libraries/config/user_preferences.forms.php:228 #: libraries/config/user_preferences.forms.php:262 #: libraries/db_links.inc.php:48 libraries/export/latex.php:351 -#: libraries/import.lib.php:1136 libraries/tbl_links.inc.php:54 +#: libraries/import.lib.php:1148 libraries/tbl_links.inc.php:54 #: pmd_general.php:133 server_privileges.php:595 server_replication.php:313 #: tbl_create.php:305 tbl_tracking.php:263 msgid "Structure" @@ -658,8 +658,8 @@ msgstr "" #: db_structure.php:404 libraries/display_tbl.lib.php:1945 #, 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 "" #: db_structure.php:418 db_structure.php:432 libraries/header.inc.php:138 @@ -873,8 +873,8 @@ msgstr "Väljavõte salvestati faili %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 "" "Te kindlasti proovisite laadida liiga suurt faili. Palun uuri " "dokumentatsiooni %sdocumentation%s selle limiidi seadmiseks." @@ -1591,8 +1591,8 @@ msgstr "Kommentaarid" #: libraries/Index.class.php:465 libraries/common.lib.php:610 #: libraries/common.lib.php:1143 libraries/config/messages.inc.php:459 -#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1119 -#: libraries/import.lib.php:1143 libraries/schema/User_Schema.class.php:168 +#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1131 +#: libraries/import.lib.php:1155 libraries/schema/User_Schema.class.php:168 #: setup/frames/index.inc.php:125 tbl_row_action.php:68 msgid "Edit" msgstr "Muuda" @@ -1734,8 +1734,8 @@ msgstr "Tere tulemast %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 "" "Arvatav põhjus on te pole veel loonud seadete faili. Soovitavalt võid " "kasutada %1$ssetup script%2$s et seadistada." @@ -2147,7 +2147,7 @@ msgstr "Kataloog mille Te üleslaadimiseks sättisite ei ole ligipääsetav" #: libraries/config.values.php:95 libraries/export/htmlword.php:24 #: libraries/export/latex.php:41 libraries/export/odt.php:33 #: libraries/export/sql.php:79 libraries/export/texytext.php:23 -#: libraries/import.lib.php:1141 +#: libraries/import.lib.php:1153 #, fuzzy msgid "structure" msgstr "Struktuur" @@ -4603,8 +4603,8 @@ msgstr "" #| "happen: %3$s. Other text will be kept as is." 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 "" "Seda väärtust on tõlgendatud kasutades %1$sstrftime%2$s, sa võid kasutada " "sama aja(time) formaati. Lisaks tulevad ka järgnevad muudatused: %3$s. " @@ -4798,7 +4798,7 @@ msgstr "Sorteeri võtme järgi" #: libraries/export/sql.php:55 libraries/export/texytext.php:30 #: libraries/export/xls.php:28 libraries/export/xlsx.php:28 #: libraries/export/xml.php:25 libraries/export/yaml.php:29 -#: libraries/import.lib.php:1114 libraries/import.lib.php:1136 +#: libraries/import.lib.php:1126 libraries/import.lib.php:1148 #: libraries/import/csv.php:32 libraries/import/docsql.php:34 #: libraries/import/ldi.php:48 libraries/import/ods.php:32 #: libraries/import/sql.php:19 libraries/import/xls.php:27 @@ -5621,39 +5621,39 @@ msgstr "Genereerija " msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL tagastas tühja tulemuse (s.t. null rida)." -#: libraries/import.lib.php:1110 +#: libraries/import.lib.php:1122 msgid "" "The following structures have either been created or altered. Here you can:" msgstr "" -#: libraries/import.lib.php:1111 +#: libraries/import.lib.php:1123 msgid "View a structure`s contents by clicking on its name" msgstr "" -#: libraries/import.lib.php:1112 +#: libraries/import.lib.php:1124 msgid "" "Change any of its settings by clicking the corresponding \"Options\" link" msgstr "" -#: libraries/import.lib.php:1113 +#: libraries/import.lib.php:1125 msgid "Edit its structure by following the \"Structure\" link" msgstr "" -#: libraries/import.lib.php:1116 +#: libraries/import.lib.php:1128 #, fuzzy msgid "Go to database" msgstr "Pole andmebaase" -#: libraries/import.lib.php:1119 libraries/import.lib.php:1143 +#: libraries/import.lib.php:1131 libraries/import.lib.php:1155 msgid "settings" msgstr "" -#: libraries/import.lib.php:1138 +#: libraries/import.lib.php:1150 #, fuzzy msgid "Go to table" msgstr "Pole andmebaase" -#: libraries/import.lib.php:1147 +#: libraries/import.lib.php:1159 msgid "Go to view" msgstr "" @@ -7660,8 +7660,8 @@ msgstr "Kustuta andmebaasid millel on samad nimed nagu kasutajatel." 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 "" "Märkus: phpMyAdmin võtab kasutajate privileegid otse MySQL privileges " "tabelist. Tabeli sisu võib erineda sellest, mida server hetkel kasutab, seda " @@ -9242,7 +9242,7 @@ msgstr "" #: tbl_change.php:1106 #, php-format -msgid "Restart insertion with %s rows" +msgid "Continue insertion with %s rows" msgstr "" #: tbl_chart.php:56 diff --git a/po/eu.po b/po/eu.po index 27be5b9..b412c45 100644 --- a/po/eu.po +++ b/po/eu.po @@ -3,14 +3,14 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-09-07 15:21+0200\n" +"POT-Creation-Date: 2010-09-10 12:46-0400\n" "PO-Revision-Date: 2010-07-21 14:53+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: basque <eu(a)li.org>\n" -"Language: eu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: eu\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.1\n" @@ -613,7 +613,7 @@ msgstr "Txertatu" #: libraries/config/user_preferences.forms.php:228 #: libraries/config/user_preferences.forms.php:262 #: libraries/db_links.inc.php:48 libraries/export/latex.php:351 -#: libraries/import.lib.php:1136 libraries/tbl_links.inc.php:54 +#: libraries/import.lib.php:1148 libraries/tbl_links.inc.php:54 #: pmd_general.php:133 server_privileges.php:595 server_replication.php:313 #: tbl_create.php:305 tbl_tracking.php:263 msgid "Structure" @@ -662,8 +662,8 @@ msgstr "" #: db_structure.php:404 libraries/display_tbl.lib.php:1945 #, 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 "" #: db_structure.php:418 db_structure.php:432 libraries/header.inc.php:138 @@ -875,8 +875,8 @@ msgstr "Iraulketa %s fitxategian gorde da." #: 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 "" #: import.php:277 import.php:330 libraries/File.class.php:566 @@ -1579,8 +1579,8 @@ msgstr "Iruzkinak" #: libraries/Index.class.php:465 libraries/common.lib.php:610 #: libraries/common.lib.php:1143 libraries/config/messages.inc.php:459 -#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1119 -#: libraries/import.lib.php:1143 libraries/schema/User_Schema.class.php:168 +#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1131 +#: libraries/import.lib.php:1155 libraries/schema/User_Schema.class.php:168 #: setup/frames/index.inc.php:125 tbl_row_action.php:68 msgid "Edit" msgstr "Editatu" @@ -1720,8 +1720,8 @@ msgstr "Ongietorriak %s(e)ra" #: 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 "" #: libraries/auth/config.auth.lib.php:115 @@ -2124,7 +2124,7 @@ msgstr "Igoerentzat ezarri duzun direktorioa ez dago eskuragarri" #: libraries/config.values.php:95 libraries/export/htmlword.php:24 #: libraries/export/latex.php:41 libraries/export/odt.php:33 #: libraries/export/sql.php:79 libraries/export/texytext.php:23 -#: libraries/import.lib.php:1141 +#: libraries/import.lib.php:1153 #, fuzzy msgid "structure" msgstr "Egitura" @@ -4545,8 +4545,8 @@ msgstr "" #, 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 "" #: libraries/display_export.lib.php:275 @@ -4724,7 +4724,7 @@ msgstr "Gakoaren arabera ordenatu" #: libraries/export/sql.php:55 libraries/export/texytext.php:30 #: libraries/export/xls.php:28 libraries/export/xlsx.php:28 #: libraries/export/xml.php:25 libraries/export/yaml.php:29 -#: libraries/import.lib.php:1114 libraries/import.lib.php:1136 +#: libraries/import.lib.php:1126 libraries/import.lib.php:1148 #: libraries/import/csv.php:32 libraries/import/docsql.php:34 #: libraries/import/ldi.php:48 libraries/import/ods.php:32 #: libraries/import/sql.php:19 libraries/import/xls.php:27 @@ -5522,38 +5522,38 @@ msgstr "Egilea:" msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL-k emaitza hutsa itzuli du. (i.e. zero errenkada)." -#: libraries/import.lib.php:1110 +#: libraries/import.lib.php:1122 msgid "" "The following structures have either been created or altered. Here you can:" msgstr "" -#: libraries/import.lib.php:1111 +#: libraries/import.lib.php:1123 msgid "View a structure`s contents by clicking on its name" msgstr "" -#: libraries/import.lib.php:1112 +#: libraries/import.lib.php:1124 msgid "" "Change any of its settings by clicking the corresponding \"Options\" link" msgstr "" -#: libraries/import.lib.php:1113 +#: libraries/import.lib.php:1125 msgid "Edit its structure by following the \"Structure\" link" msgstr "" -#: libraries/import.lib.php:1116 +#: libraries/import.lib.php:1128 #, fuzzy msgid "Go to database" msgstr "Datu-baserik ez" -#: libraries/import.lib.php:1119 libraries/import.lib.php:1143 +#: libraries/import.lib.php:1131 libraries/import.lib.php:1155 msgid "settings" msgstr "" -#: libraries/import.lib.php:1138 +#: libraries/import.lib.php:1150 msgid "Go to table" msgstr "" -#: libraries/import.lib.php:1147 +#: libraries/import.lib.php:1159 msgid "Go to view" msgstr "" @@ -7542,8 +7542,8 @@ msgstr "Erabiltzaileen izen berdina duten datu-baseak ezabatu." 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 "" "Oharra: phpMyAdmin-ek erabiltzaileen pribilegioak' zuzenean MySQL-ren " "pribilegioen taulatik' eskuratzen ditu. Taula hauen edukiak, tartean eskuz " @@ -9017,7 +9017,7 @@ msgstr "" #: tbl_change.php:1106 #, php-format -msgid "Restart insertion with %s rows" +msgid "Continue insertion with %s rows" msgstr "" #: tbl_chart.php:56 diff --git a/po/fa.po b/po/fa.po index d297798..2513448 100644 --- a/po/fa.po +++ b/po/fa.po @@ -3,14 +3,14 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-09-07 15:21+0200\n" +"POT-Creation-Date: 2010-09-10 12:46-0400\n" "PO-Revision-Date: 2010-05-19 03:54+0200\n" "Last-Translator: <ahmad_usa2007(a)yahoo.com>\n" "Language-Team: persian <fa(a)li.org>\n" -"Language: fa\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: fa\n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Pootle 2.0.1\n" @@ -607,7 +607,7 @@ msgstr "درج" #: libraries/config/user_preferences.forms.php:228 #: libraries/config/user_preferences.forms.php:262 #: libraries/db_links.inc.php:48 libraries/export/latex.php:351 -#: libraries/import.lib.php:1136 libraries/tbl_links.inc.php:54 +#: libraries/import.lib.php:1148 libraries/tbl_links.inc.php:54 #: pmd_general.php:133 server_privileges.php:595 server_replication.php:313 #: tbl_create.php:305 tbl_tracking.php:263 msgid "Structure" @@ -656,8 +656,8 @@ msgstr "" #: db_structure.php:404 libraries/display_tbl.lib.php:1945 #, 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 "" #: db_structure.php:418 db_structure.php:432 libraries/header.inc.php:138 @@ -866,8 +866,8 @@ msgstr "" #: 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 "" #: import.php:277 import.php:330 libraries/File.class.php:566 @@ -1556,8 +1556,8 @@ msgstr "توضيحات" #: libraries/Index.class.php:465 libraries/common.lib.php:610 #: libraries/common.lib.php:1143 libraries/config/messages.inc.php:459 -#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1119 -#: libraries/import.lib.php:1143 libraries/schema/User_Schema.class.php:168 +#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1131 +#: libraries/import.lib.php:1155 libraries/schema/User_Schema.class.php:168 #: setup/frames/index.inc.php:125 tbl_row_action.php:68 msgid "Edit" msgstr "ويرايش" @@ -1697,8 +1697,8 @@ msgstr "به %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 "" #: libraries/auth/config.auth.lib.php:115 @@ -2098,7 +2098,7 @@ msgstr "پوشه‌اي را كه براي انتقال فايل انتخاب ك #: libraries/config.values.php:95 libraries/export/htmlword.php:24 #: libraries/export/latex.php:41 libraries/export/odt.php:33 #: libraries/export/sql.php:79 libraries/export/texytext.php:23 -#: libraries/import.lib.php:1141 +#: libraries/import.lib.php:1153 #, fuzzy msgid "structure" msgstr "ساختار" @@ -4491,8 +4491,8 @@ msgstr "" #, 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 "" #: libraries/display_export.lib.php:275 @@ -4666,7 +4666,7 @@ msgstr "" #: libraries/export/sql.php:55 libraries/export/texytext.php:30 #: libraries/export/xls.php:28 libraries/export/xlsx.php:28 #: libraries/export/xml.php:25 libraries/export/yaml.php:29 -#: libraries/import.lib.php:1114 libraries/import.lib.php:1136 +#: libraries/import.lib.php:1126 libraries/import.lib.php:1148 #: libraries/import/csv.php:32 libraries/import/docsql.php:34 #: libraries/import/ldi.php:48 libraries/import/ods.php:32 #: libraries/import/sql.php:19 libraries/import/xls.php:27 @@ -5455,38 +5455,38 @@ msgstr "توليد‌شده توسط" msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL يك نتيجه خالي داد. (مثلا 0 سطر)." -#: libraries/import.lib.php:1110 +#: libraries/import.lib.php:1122 msgid "" "The following structures have either been created or altered. Here you can:" msgstr "" -#: libraries/import.lib.php:1111 +#: libraries/import.lib.php:1123 msgid "View a structure`s contents by clicking on its name" msgstr "" -#: libraries/import.lib.php:1112 +#: libraries/import.lib.php:1124 msgid "" "Change any of its settings by clicking the corresponding \"Options\" link" msgstr "" -#: libraries/import.lib.php:1113 +#: libraries/import.lib.php:1125 msgid "Edit its structure by following the \"Structure\" link" msgstr "" -#: libraries/import.lib.php:1116 +#: libraries/import.lib.php:1128 #, fuzzy msgid "Go to database" msgstr "No databases" -#: libraries/import.lib.php:1119 libraries/import.lib.php:1143 +#: libraries/import.lib.php:1131 libraries/import.lib.php:1155 msgid "settings" msgstr "" -#: libraries/import.lib.php:1138 +#: libraries/import.lib.php:1150 msgid "Go to table" msgstr "" -#: libraries/import.lib.php:1147 +#: libraries/import.lib.php:1159 msgid "Go to view" msgstr "" @@ -6364,9 +6364,9 @@ msgid "" msgstr "" "اگر نوع ستون \"enum\" يا \"set\" مي‌باشد ، لطفا براي ورود مقادير از اين قالب " "استفاده نماييد : 'a','b','c'...<br /> اگر احتياج داشتيد كه از علامت مميز " -"برعكس(بك‌اسلش) (\" \\ \") يا نقل‌قول تكي (\" ' \") در آن مقادير استفاده " -"نماييد ، قبل از آنها علامت (\" \\ \") را بگذاريد<br /> (براي مثال'\\\\xyz' " -"يا 'a\\'b')" +"برعكس(بك‌اسلش) (\" \\ \") يا نقل‌قول تكي (\" ' \") در آن مقادير استفاده نماييد " +"، قبل از آنها علامت (\" \\ \") را بگذاريد<br /> (براي مثال'\\\\xyz' يا 'a" +"\\'b')" #: libraries/tbl_properties.inc.php:105 msgid "" @@ -6395,9 +6395,9 @@ msgid "" msgstr "" "اگر نوع ستون \"enum\" يا \"set\" مي‌باشد ، لطفا براي ورود مقادير از اين قالب " "استفاده نماييد : 'a','b','c'...<br /> اگر احتياج داشتيد كه از علامت مميز " -"برعكس(بك‌اسلش) (\" \\ \") يا نقل‌قول تكي (\" ' \") در آن مقادير استفاده " -"نماييد ، قبل از آنها علامت (\" \\ \") را بگذاريد<br /> (براي مثال'\\\\xyz' " -"يا 'a\\'b')" +"برعكس(بك‌اسلش) (\" \\ \") يا نقل‌قول تكي (\" ' \") در آن مقادير استفاده نماييد " +"، قبل از آنها علامت (\" \\ \") را بگذاريد<br /> (براي مثال'\\\\xyz' يا 'a" +"\\'b')" #: libraries/tbl_properties.inc.php:371 msgid "ENUM or SET data too long?" @@ -6650,8 +6650,8 @@ msgid "" "this security hole by setting a password for user 'root'." msgstr "" "پرونده پيكربندي شما حاوي تنظيماتي است (كاربر root بدون اسم رمز) كه مرتبط با " -"حساب پيش‌فرض MySQL مي‌باشد. اجراي MySQL با اين پيش‌فرض باعث ورود غيرمجاز " -"مي‌شود ، و شما بايد اين حفره امنيتي را ذرست كنيد." +"حساب پيش‌فرض MySQL مي‌باشد. اجراي MySQL با اين پيش‌فرض باعث ورود غيرمجاز مي‌شود " +"، و شما بايد اين حفره امنيتي را ذرست كنيد." #: main.php:255 msgid "" @@ -7364,8 +7364,8 @@ msgstr "" 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 "" #: server_privileges.php:1776 @@ -8820,7 +8820,7 @@ msgstr "" #: tbl_change.php:1106 #, php-format -msgid "Restart insertion with %s rows" +msgid "Continue insertion with %s rows" msgstr "" #: tbl_chart.php:56 diff --git a/po/fi.po b/po/fi.po index ae34079..f366a62 100644 --- a/po/fi.po +++ b/po/fi.po @@ -3,14 +3,14 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-09-07 15:21+0200\n" +"POT-Creation-Date: 2010-09-10 12:46-0400\n" "PO-Revision-Date: 2010-04-30 18:08+0200\n" "Last-Translator: <kajouni(a)gmail.com>\n" "Language-Team: finnish <fi(a)li.org>\n" -"Language: fi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: fi\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.1\n" @@ -613,7 +613,7 @@ msgstr "Lisää rivi" #: libraries/config/user_preferences.forms.php:228 #: libraries/config/user_preferences.forms.php:262 #: libraries/db_links.inc.php:48 libraries/export/latex.php:351 -#: libraries/import.lib.php:1136 libraries/tbl_links.inc.php:54 +#: libraries/import.lib.php:1148 libraries/tbl_links.inc.php:54 #: pmd_general.php:133 server_privileges.php:595 server_replication.php:313 #: tbl_create.php:305 tbl_tracking.php:263 msgid "Structure" @@ -662,11 +662,11 @@ msgstr "Seuranta ei ole käytössä." #: db_structure.php:404 libraries/display_tbl.lib.php:1945 #, 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 "" -"Tässä näkymässä on vähintään tämän luvun verran rivejä. Katso lisätietoja " -"%sohjeista%s." +"Tässä näkymässä on vähintään tämän luvun verran rivejä. Katso lisätietoja %" +"sohjeista%s." #: db_structure.php:418 db_structure.php:432 libraries/header.inc.php:138 #: libraries/tbl_info.inc.php:60 tbl_structure.php:205 test/theme.php:73 @@ -871,8 +871,8 @@ msgstr "Vedos tallennettiin tiedostoon %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 "" "Yritit todennäköisesti lähettää palvelimelle liian suurta tiedostoa. Katso " "tämän rajoituksen muuttamisesta lisätietoja %sohjeista%s." @@ -1597,8 +1597,8 @@ msgstr "Kommentti" #: libraries/Index.class.php:465 libraries/common.lib.php:610 #: libraries/common.lib.php:1143 libraries/config/messages.inc.php:459 -#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1119 -#: libraries/import.lib.php:1143 libraries/schema/User_Schema.class.php:168 +#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1131 +#: libraries/import.lib.php:1155 libraries/schema/User_Schema.class.php:168 #: setup/frames/index.inc.php:125 tbl_row_action.php:68 msgid "Edit" msgstr "Muokkaa" @@ -1744,11 +1744,11 @@ msgstr "Tervetuloa, toivottaa %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 "" -"Et liene luonut asetustiedostoa. Voit luoda asetustiedoston " -"%1$sasetusskriptillä%2$s." +"Et liene luonut asetustiedostoa. Voit luoda asetustiedoston %1" +"$sasetusskriptillä%2$s." #: libraries/auth/config.auth.lib.php:115 msgid "" @@ -2162,7 +2162,7 @@ msgstr "Tiedostojen lähetykseen valittua hakemistoa ei voida käyttää" #: libraries/config.values.php:95 libraries/export/htmlword.php:24 #: libraries/export/latex.php:41 libraries/export/odt.php:33 #: libraries/export/sql.php:79 libraries/export/texytext.php:23 -#: libraries/import.lib.php:1141 +#: libraries/import.lib.php:1153 msgid "structure" msgstr "rakenne" @@ -4789,8 +4789,8 @@ msgstr "" #| "happen: %3$s. Other text will be kept as is." 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 "" "Tämä arvo on %1$sstrftime%2$s-funktion mukainen, joten " "ajanmuodostostusmerkkijonoja voi käyttää. Lisäksi tapahtuu seuraavat " @@ -4994,7 +4994,7 @@ msgstr "Lajittele avaimen mukaan" #: libraries/export/sql.php:55 libraries/export/texytext.php:30 #: libraries/export/xls.php:28 libraries/export/xlsx.php:28 #: libraries/export/xml.php:25 libraries/export/yaml.php:29 -#: libraries/import.lib.php:1114 libraries/import.lib.php:1136 +#: libraries/import.lib.php:1126 libraries/import.lib.php:1148 #: libraries/import/csv.php:32 libraries/import/docsql.php:34 #: libraries/import/ldi.php:48 libraries/import/ods.php:32 #: libraries/import/sql.php:19 libraries/import/xls.php:27 @@ -5849,38 +5849,38 @@ msgstr "Luontiympäristö" msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL palautti tyhjän vastauksen, toisin sanoen nolla riviä." -#: libraries/import.lib.php:1110 +#: libraries/import.lib.php:1122 msgid "" "The following structures have either been created or altered. Here you can:" msgstr "Seuraavat rakenteet on joko luotu tai niitä on muutettu. Voit:" -#: libraries/import.lib.php:1111 +#: libraries/import.lib.php:1123 msgid "View a structure`s contents by clicking on its name" msgstr "näyttää rakenteen sisällön painamalla sen nimeä" -#: libraries/import.lib.php:1112 +#: libraries/import.lib.php:1124 msgid "" "Change any of its settings by clicking the corresponding \"Options\" link" msgstr "" "muuttaa mitä tahansa sen asetuksia painamalla vastaavaa \"Valinnat\"-linkkiä" -#: libraries/import.lib.php:1113 +#: libraries/import.lib.php:1125 msgid "Edit its structure by following the \"Structure\" link" msgstr "Muokkaa sen rakennetta seuraamalla \"Rakenne\"-linkkiä" -#: libraries/import.lib.php:1116 +#: libraries/import.lib.php:1128 msgid "Go to database" msgstr "Siirry tietokantaan" -#: libraries/import.lib.php:1119 libraries/import.lib.php:1143 +#: libraries/import.lib.php:1131 libraries/import.lib.php:1155 msgid "settings" msgstr "asetukset" -#: libraries/import.lib.php:1138 +#: libraries/import.lib.php:1150 msgid "Go to table" msgstr "Siirry tauluun" -#: libraries/import.lib.php:1147 +#: libraries/import.lib.php:1159 msgid "Go to view" msgstr "Siirry näkymään" @@ -7926,8 +7926,8 @@ msgstr "Poista tietokannat, joilla on sama nimi kuin käyttäjillä." 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 "" "Huom: PhpMyAdmin hakee käyttäjien käyttöoikeudet suoraan MySQL-palvelimen " "käyttöoikeustauluista. Näiden taulujen sisältö saattaa poiketa palvelimen " @@ -9628,8 +9628,9 @@ msgstr "" "siirtyä mihin tahansa kohtaan." #: tbl_change.php:1106 -#, php-format -msgid "Restart insertion with %s rows" +#, fuzzy, php-format +#| msgid "Restart insertion with %s rows" +msgid "Continue insertion with %s rows" msgstr "Aloita lisäys alusta %s rivillä" #: tbl_chart.php:56 diff --git a/po/fr.po b/po/fr.po index 508b9dd..5f7cea4 100644 --- a/po/fr.po +++ b/po/fr.po @@ -3,14 +3,14 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-09-07 15:21+0200\n" +"POT-Creation-Date: 2010-09-10 12:46-0400\n" "PO-Revision-Date: 2010-09-05 15:34+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" @@ -591,7 +591,7 @@ msgstr "Insérer" #: libraries/config/user_preferences.forms.php:228 #: libraries/config/user_preferences.forms.php:262 #: libraries/db_links.inc.php:48 libraries/export/latex.php:351 -#: libraries/import.lib.php:1136 libraries/tbl_links.inc.php:54 +#: libraries/import.lib.php:1148 libraries/tbl_links.inc.php:54 #: pmd_general.php:133 server_privileges.php:595 server_replication.php:313 #: tbl_create.php:305 tbl_tracking.php:263 msgid "Structure" @@ -640,11 +640,11 @@ msgstr "Le suivi n'est pas activé." #: db_structure.php:404 libraries/display_tbl.lib.php:1945 #, 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 "" -"Cette vue contient au moins ce nombre d'enregistrements. Veuillez référer à " -"%sdocumentation%s." +"Cette vue contient au moins ce nombre d'enregistrements. Veuillez référer à %" +"sdocumentation%s." #: db_structure.php:418 db_structure.php:432 libraries/header.inc.php:138 #: libraries/tbl_info.inc.php:60 tbl_structure.php:205 test/theme.php:73 @@ -851,8 +851,8 @@ msgstr "Le fichier d'exportation a été sauvegardé sous %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 "" "Vous avez probablement tenté de télécharger un fichier trop volumineux. " "Veuillez vous référer à la %sdocumentation%s pour des façons de contourner " @@ -1496,8 +1496,8 @@ msgstr "Commentaire" #: libraries/Index.class.php:465 libraries/common.lib.php:610 #: libraries/common.lib.php:1143 libraries/config/messages.inc.php:459 -#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1119 -#: libraries/import.lib.php:1143 libraries/schema/User_Schema.class.php:168 +#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1131 +#: libraries/import.lib.php:1155 libraries/schema/User_Schema.class.php:168 #: setup/frames/index.inc.php:125 tbl_row_action.php:68 msgid "Edit" msgstr "Modifier" @@ -1641,8 +1641,8 @@ msgstr "Bienvenue sur %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 "" "La raison probable est que vous n'avez pas créé de fichier de configuration. " "Vous pouvez utiliser le %1$sscript de configuration%2$s dans ce but." @@ -2051,7 +2051,7 @@ msgstr "Le répertoire de transfert est inaccessible" #: libraries/config.values.php:95 libraries/export/htmlword.php:24 #: libraries/export/latex.php:41 libraries/export/odt.php:33 #: libraries/export/sql.php:79 libraries/export/texytext.php:23 -#: libraries/import.lib.php:1141 +#: libraries/import.lib.php:1153 msgid "structure" msgstr "structure" @@ -4541,8 +4541,8 @@ msgstr ", @TABLE@ sera remplacé par le nom de la table" #, 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 "" "Cette valeur est interprétée avec %1$sstrftime%2$s, vous pouvez donc " "utiliser des chaînes de format d'heure. Ces transformations additionnelles " @@ -4720,7 +4720,7 @@ msgstr "Trier sur l'index" #: libraries/export/sql.php:55 libraries/export/texytext.php:30 #: libraries/export/xls.php:28 libraries/export/xlsx.php:28 #: libraries/export/xml.php:25 libraries/export/yaml.php:29 -#: libraries/import.lib.php:1114 libraries/import.lib.php:1136 +#: libraries/import.lib.php:1126 libraries/import.lib.php:1148 #: libraries/import/csv.php:32 libraries/import/docsql.php:34 #: libraries/import/ldi.php:48 libraries/import/ods.php:32 #: libraries/import/sql.php:19 libraries/import/xls.php:27 @@ -5581,38 +5581,38 @@ msgstr "Généré par" msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL n'a retourné aucun enregistrement." -#: libraries/import.lib.php:1110 +#: libraries/import.lib.php:1122 msgid "" "The following structures have either been created or altered. Here you can:" msgstr "" "Les structures suivanates ont été créées ou modifiées. Ici vous pouvez :" -#: libraries/import.lib.php:1111 +#: libraries/import.lib.php:1123 msgid "View a structure`s contents by clicking on its name" msgstr "Consulter le contenu d'une structure en cliquant sur son nom" -#: libraries/import.lib.php:1112 +#: libraries/import.lib.php:1124 msgid "" "Change any of its settings by clicking the corresponding \"Options\" link" msgstr "Modifiez l'un des réglages en cliquant le lien «Options» correspondant" -#: libraries/import.lib.php:1113 +#: libraries/import.lib.php:1125 msgid "Edit its structure by following the \"Structure\" link" msgstr "Modifier sa structure via le lien «Structure»" -#: libraries/import.lib.php:1116 +#: libraries/import.lib.php:1128 msgid "Go to database" msgstr "Aller à la base de données" -#: libraries/import.lib.php:1119 libraries/import.lib.php:1143 +#: libraries/import.lib.php:1131 libraries/import.lib.php:1155 msgid "settings" msgstr "réglages" -#: libraries/import.lib.php:1138 +#: libraries/import.lib.php:1150 msgid "Go to table" msgstr "Aller à la table" -#: libraries/import.lib.php:1147 +#: libraries/import.lib.php:1159 msgid "Go to view" msgstr "Aller à la vue" @@ -7608,8 +7608,8 @@ msgstr "" 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 "" "Note: phpMyAdmin obtient la liste des privilèges directement à partir des " "tables MySQL. Le contenu de ces tables peut être différent des privilèges " @@ -9131,9 +9131,9 @@ msgstr "" "La méthode d'authentification [kbd]config[/kbd] permet une connexion " "automatique, ce qui n'est pas souhaitable dans un environnement réel. Toute " "personne qui connaît l'URL d'accès peut entrer dans votre phpMyAdmin. Il est " -"suggéré de régler votre [a@?page=servers&mode=edit&id=" -"%1$d#tab_Server]type d'authentification[/a] à [kbd]cookie[/kbd] ou [kbd]http" -"[/kbd]." +"suggéré de régler votre [a@?page=servers&mode=edit&id=%1" +"$d#tab_Server]type d'authentification[/a] à [kbd]cookie[/kbd] ou [kbd]http[/" +"kbd]." #: setup/lib/index.lib.php:259 #, php-format @@ -9274,8 +9274,9 @@ msgstr "" "pour aller n'importe où" #: tbl_change.php:1106 -#, php-format -msgid "Restart insertion with %s rows" +#, fuzzy, php-format +#| msgid "Restart insertion with %s rows" +msgid "Continue insertion with %s rows" msgstr "Recommencer l'insertion avec %s lignes" #: tbl_chart.php:56 diff --git a/po/gl.po b/po/gl.po index 4fb23b9..46ec12a 100644 --- a/po/gl.po +++ b/po/gl.po @@ -3,14 +3,14 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-09-07 15:21+0200\n" +"POT-Creation-Date: 2010-09-10 12:46-0400\n" "PO-Revision-Date: 2010-07-21 14:50+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: galician <gl(a)li.org>\n" -"Language: gl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: gl\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.1\n" @@ -614,7 +614,7 @@ msgstr "Inserir" #: libraries/config/user_preferences.forms.php:228 #: libraries/config/user_preferences.forms.php:262 #: libraries/db_links.inc.php:48 libraries/export/latex.php:351 -#: libraries/import.lib.php:1136 libraries/tbl_links.inc.php:54 +#: libraries/import.lib.php:1148 libraries/tbl_links.inc.php:54 #: pmd_general.php:133 server_privileges.php:595 server_replication.php:313 #: tbl_create.php:305 tbl_tracking.php:263 msgid "Structure" @@ -663,11 +663,11 @@ msgstr "O seguemento non está activado." #: db_structure.php:404 libraries/display_tbl.lib.php:1945 #, 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 "" -"Esta vista ten, cando menos, este número de fileiras. Vexa a %sdocumentation" -"%s." +"Esta vista ten, cando menos, este número de fileiras. Vexa a %sdocumentation%" +"s." #: db_structure.php:418 db_structure.php:432 libraries/header.inc.php:138 #: libraries/tbl_info.inc.php:60 tbl_structure.php:205 test/theme.php:73 @@ -872,11 +872,11 @@ msgstr "Gardouse o volcado no ficheiro %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 "" -"Posibelmente tentou enviar un ficheiro demasiado grande. Consulte a " -"%sdocumentación%s para averiguar como evitar este límite." +"Posibelmente tentou enviar un ficheiro demasiado grande. Consulte a %" +"sdocumentación%s para averiguar como evitar este límite." #: import.php:277 import.php:330 libraries/File.class.php:566 #: libraries/File.class.php:676 @@ -1599,8 +1599,8 @@ msgstr "Comentario" #: libraries/Index.class.php:465 libraries/common.lib.php:610 #: libraries/common.lib.php:1143 libraries/config/messages.inc.php:459 -#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1119 -#: libraries/import.lib.php:1143 libraries/schema/User_Schema.class.php:168 +#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1131 +#: libraries/import.lib.php:1155 libraries/schema/User_Schema.class.php:168 #: setup/frames/index.inc.php:125 tbl_row_action.php:68 msgid "Edit" msgstr "Modificar" @@ -1747,8 +1747,8 @@ msgstr "Reciba a benvida a %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 "" "Isto débese, posibelmente, a que non se creou un ficheiro de configuración. " "Tal vez queira utilizar %1$ssetup script%2$s para crear un." @@ -2169,7 +2169,7 @@ msgstr "Non se pode acceder ao directorio que designou para os envíos" #: libraries/config.values.php:95 libraries/export/htmlword.php:24 #: libraries/export/latex.php:41 libraries/export/odt.php:33 #: libraries/export/sql.php:79 libraries/export/texytext.php:23 -#: libraries/import.lib.php:1141 +#: libraries/import.lib.php:1153 msgid "structure" msgstr "estrutura" @@ -4827,8 +4827,8 @@ msgstr "" #| "happen: %3$s. Other text will be kept as is." 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 "" "Este valor interprétase utilizando %1$sstrftime%2$s, de maneira que pode " "utilizar cadeas de formato de hora. Produciranse transformacións en " @@ -5032,7 +5032,7 @@ msgstr "Ordenar pola chave" #: libraries/export/sql.php:55 libraries/export/texytext.php:30 #: libraries/export/xls.php:28 libraries/export/xlsx.php:28 #: libraries/export/xml.php:25 libraries/export/yaml.php:29 -#: libraries/import.lib.php:1114 libraries/import.lib.php:1136 +#: libraries/import.lib.php:1126 libraries/import.lib.php:1148 #: libraries/import/csv.php:32 libraries/import/docsql.php:34 #: libraries/import/ldi.php:48 libraries/import/ods.php:32 #: libraries/import/sql.php:19 libraries/import/xls.php:27 @@ -5891,38 +5891,38 @@ msgstr "Xerado por" msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL retornou un conxunto vacío (ex. cero rexistros)." -#: libraries/import.lib.php:1110 +#: libraries/import.lib.php:1122 msgid "" "The following structures have either been created or altered. Here you can:" msgstr "As estruturas seguintes foron creadas ou alteradas. Aquí pode:" -#: libraries/import.lib.php:1111 +#: libraries/import.lib.php:1123 msgid "View a structure`s contents by clicking on its name" msgstr "Ver o contido dunha estrutura premendo o seu nome" -#: libraries/import.lib.php:1112 +#: libraries/import.lib.php:1124 msgid "" "Change any of its settings by clicking the corresponding \"Options\" link" msgstr "" "Mude calqueraa destas opcións premendo a ligazón \"Opcións\" correspondente" -#: libraries/import.lib.php:1113 +#: libraries/import.lib.php:1125 msgid "Edit its structure by following the \"Structure\" link" msgstr "Modificar a súa estrutura seguindo a ligazón \"Estrutura\"" -#: libraries/import.lib.php:1116 +#: libraries/import.lib.php:1128 msgid "Go to database" msgstr "Ir á base de datos" -#: libraries/import.lib.php:1119 libraries/import.lib.php:1143 +#: libraries/import.lib.php:1131 libraries/import.lib.php:1155 msgid "settings" msgstr "opcións" -#: libraries/import.lib.php:1138 +#: libraries/import.lib.php:1150 msgid "Go to table" msgstr "Ir á táboa" -#: libraries/import.lib.php:1147 +#: libraries/import.lib.php:1159 msgid "Go to view" msgstr "Ir á vista" @@ -7294,8 +7294,8 @@ msgid "" "Server running with Suhosin. Please refer to %sdocumentation%s for possible " "issues." msgstr "" -"Servidor a executarse con Suhosin. Consulte os posíbeis problemas na " -"%sdocumentation%s." +"Servidor a executarse con Suhosin. Consulte os posíbeis problemas na %" +"sdocumentation%s." #: navigation.php:60 navigation.php:61 navigation.php:64 #, fuzzy @@ -7971,8 +7971,8 @@ msgstr "Eliminar as bases de datos que teñan os mesmos nomes que os usuarios." 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 "" "Nota: phpMyAdmin recolle os privilexios dos usuarios directamente das táboas " "de privilexios do MySQL. O contido destas táboas pode diferir dos " @@ -9670,8 +9670,9 @@ msgstr "" "combinada cunha flecha para moverse a calquera sitio" #: tbl_change.php:1106 -#, php-format -msgid "Restart insertion with %s rows" +#, fuzzy, php-format +#| msgid "Restart insertion with %s rows" +msgid "Continue insertion with %s rows" msgstr "Reiniciar a inserción con %s fileiras" #: tbl_chart.php:56 diff --git a/po/he.po b/po/he.po index 84c42cb..7d1e0e0 100644 --- a/po/he.po +++ b/po/he.po @@ -3,14 +3,14 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-09-07 15:21+0200\n" +"POT-Creation-Date: 2010-09-10 12:46-0400\n" "PO-Revision-Date: 2010-03-12 09:15+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: hebrew <he(a)li.org>\n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: \n" "X-Generator: Translate Toolkit 1.5.3\n" #: browse_foreigners.php:36 browse_foreigners.php:57 @@ -604,7 +604,7 @@ msgstr "הכנסה" #: libraries/config/user_preferences.forms.php:228 #: libraries/config/user_preferences.forms.php:262 #: libraries/db_links.inc.php:48 libraries/export/latex.php:351 -#: libraries/import.lib.php:1136 libraries/tbl_links.inc.php:54 +#: libraries/import.lib.php:1148 libraries/tbl_links.inc.php:54 #: pmd_general.php:133 server_privileges.php:595 server_replication.php:313 #: tbl_create.php:305 tbl_tracking.php:263 msgid "Structure" @@ -653,8 +653,8 @@ msgstr "" #: db_structure.php:404 libraries/display_tbl.lib.php:1945 #, 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 "" #: db_structure.php:418 db_structure.php:432 libraries/header.inc.php:138 @@ -864,8 +864,8 @@ msgstr "הוצאה נשמרה אל קובץ %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 "" #: import.php:277 import.php:330 libraries/File.class.php:566 @@ -1568,8 +1568,8 @@ msgstr "הערות" #: libraries/Index.class.php:465 libraries/common.lib.php:610 #: libraries/common.lib.php:1143 libraries/config/messages.inc.php:459 -#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1119 -#: libraries/import.lib.php:1143 libraries/schema/User_Schema.class.php:168 +#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1131 +#: libraries/import.lib.php:1155 libraries/schema/User_Schema.class.php:168 #: setup/frames/index.inc.php:125 tbl_row_action.php:68 msgid "Edit" msgstr "עריכה" @@ -1711,8 +1711,8 @@ msgstr "ברוך הבא אל %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 "" #: libraries/auth/config.auth.lib.php:115 @@ -2115,7 +2115,7 @@ msgstr "" #: libraries/config.values.php:95 libraries/export/htmlword.php:24 #: libraries/export/latex.php:41 libraries/export/odt.php:33 #: libraries/export/sql.php:79 libraries/export/texytext.php:23 -#: libraries/import.lib.php:1141 +#: libraries/import.lib.php:1153 #, fuzzy msgid "structure" msgstr "מבנה" @@ -4538,8 +4538,8 @@ msgstr "" #, 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 "" #: libraries/display_export.lib.php:275 @@ -4717,7 +4717,7 @@ msgstr "" #: libraries/export/sql.php:55 libraries/export/texytext.php:30 #: libraries/export/xls.php:28 libraries/export/xlsx.php:28 #: libraries/export/xml.php:25 libraries/export/yaml.php:29 -#: libraries/import.lib.php:1114 libraries/import.lib.php:1136 +#: libraries/import.lib.php:1126 libraries/import.lib.php:1148 #: libraries/import/csv.php:32 libraries/import/docsql.php:34 #: libraries/import/ldi.php:48 libraries/import/ods.php:32 #: libraries/import/sql.php:19 libraries/import/xls.php:27 @@ -5518,38 +5518,38 @@ msgstr "נוצר ע\"י" msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL החזיר חבילת תוצאות ריקה (לדוגמא, אפס שורות)." -#: libraries/import.lib.php:1110 +#: libraries/import.lib.php:1122 msgid "" "The following structures have either been created or altered. Here you can:" msgstr "" -#: libraries/import.lib.php:1111 +#: libraries/import.lib.php:1123 msgid "View a structure`s contents by clicking on its name" msgstr "" -#: libraries/import.lib.php:1112 +#: libraries/import.lib.php:1124 msgid "" "Change any of its settings by clicking the corresponding \"Options\" link" msgstr "" -#: libraries/import.lib.php:1113 +#: libraries/import.lib.php:1125 msgid "Edit its structure by following the \"Structure\" link" msgstr "" -#: libraries/import.lib.php:1116 +#: libraries/import.lib.php:1128 #, fuzzy msgid "Go to database" msgstr "אין מאגרי נתונים" -#: libraries/import.lib.php:1119 libraries/import.lib.php:1143 +#: libraries/import.lib.php:1131 libraries/import.lib.php:1155 msgid "settings" msgstr "" -#: libraries/import.lib.php:1138 +#: libraries/import.lib.php:1150 msgid "Go to table" msgstr "" -#: libraries/import.lib.php:1147 +#: libraries/import.lib.php:1159 msgid "Go to view" msgstr "" @@ -7448,8 +7448,8 @@ msgstr "הסרת מאגרי נתונים שיש להם שמות דומים כמ 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 "" "הערה: phpMyAdmin מקבל הרשאות משתמש ישירות מטבלאות הרשאות של MySQL. התוכן של " "הטבלאות האלו יכול להיות שונה מההרשאות שהשרת משתמש בהן, אם הן שונו באופן " @@ -8911,7 +8911,7 @@ msgstr "" #: tbl_change.php:1106 #, php-format -msgid "Restart insertion with %s rows" +msgid "Continue insertion with %s rows" msgstr "" #: tbl_chart.php:56 diff --git a/po/hi.po b/po/hi.po index 8610a86..e349e05 100644 --- a/po/hi.po +++ b/po/hi.po @@ -3,14 +3,14 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-09-07 15:21+0200\n" +"POT-Creation-Date: 2010-09-10 12:46-0400\n" "PO-Revision-Date: 2010-05-21 05:48+0200\n" "Last-Translator: <u4663530(a)anu.edu.au>\n" "Language-Team: hindi <hi(a)li.org>\n" -"Language: hi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: hi\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.1\n" @@ -612,7 +612,7 @@ msgstr "इनसर्ट" #: libraries/config/user_preferences.forms.php:228 #: libraries/config/user_preferences.forms.php:262 #: libraries/db_links.inc.php:48 libraries/export/latex.php:351 -#: libraries/import.lib.php:1136 libraries/tbl_links.inc.php:54 +#: libraries/import.lib.php:1148 libraries/tbl_links.inc.php:54 #: pmd_general.php:133 server_privileges.php:595 server_replication.php:313 #: tbl_create.php:305 tbl_tracking.php:263 msgid "Structure" @@ -661,8 +661,8 @@ msgstr "ट्रैकिंग सक्रिय नहीं है." #: db_structure.php:404 libraries/display_tbl.lib.php:1945 #, 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 "इस द्रश्य में कम से कम इतनी पंक्तियाँ हैं. और जानने के लिए %s दोक्युमेंताशन%s पढ़ें." #: db_structure.php:418 db_structure.php:432 libraries/header.inc.php:138 @@ -867,8 +867,8 @@ msgstr "डंप को %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 "" "आप शायद बहुत बड़ी फाइल अपलोड करने की कोशिश कर रहे हैं. इस दुविधा के लिए कृपया करके %s " "दोकुमेंताशन%s पढ़ें." @@ -1528,8 +1528,8 @@ msgstr "टिप्पणी" #: libraries/Index.class.php:465 libraries/common.lib.php:610 #: libraries/common.lib.php:1143 libraries/config/messages.inc.php:459 -#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1119 -#: libraries/import.lib.php:1143 libraries/schema/User_Schema.class.php:168 +#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1131 +#: libraries/import.lib.php:1155 libraries/schema/User_Schema.class.php:168 #: setup/frames/index.inc.php:125 tbl_row_action.php:68 msgid "Edit" msgstr "सम्पादन" @@ -1669,11 +1669,11 @@ msgstr " %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 "" -"आपने शायद एक विन्यास फाइल नहीं बने थी. विन्यास फाइल बनाने के लिए %1$ssetup script" -"%2$s का उपयोग करें." +"आपने शायद एक विन्यास फाइल नहीं बने थी. विन्यास फाइल बनाने के लिए %1$ssetup script%2" +"$s का उपयोग करें." #: libraries/auth/config.auth.lib.php:115 msgid "" @@ -2063,7 +2063,7 @@ msgstr "" #: libraries/config.values.php:95 libraries/export/htmlword.php:24 #: libraries/export/latex.php:41 libraries/export/odt.php:33 #: libraries/export/sql.php:79 libraries/export/texytext.php:23 -#: libraries/import.lib.php:1141 +#: libraries/import.lib.php:1153 msgid "structure" msgstr "" @@ -4446,8 +4446,8 @@ msgstr "" #, 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 "" #: libraries/display_export.lib.php:275 @@ -4622,7 +4622,7 @@ msgstr "" #: libraries/export/sql.php:55 libraries/export/texytext.php:30 #: libraries/export/xls.php:28 libraries/export/xlsx.php:28 #: libraries/export/xml.php:25 libraries/export/yaml.php:29 -#: libraries/import.lib.php:1114 libraries/import.lib.php:1136 +#: libraries/import.lib.php:1126 libraries/import.lib.php:1148 #: libraries/import/csv.php:32 libraries/import/docsql.php:34 #: libraries/import/ldi.php:48 libraries/import/ods.php:32 #: libraries/import/sql.php:19 libraries/import/xls.php:27 @@ -5405,37 +5405,37 @@ msgstr "" msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "" -#: libraries/import.lib.php:1110 +#: libraries/import.lib.php:1122 msgid "" "The following structures have either been created or altered. Here you can:" msgstr "" -#: libraries/import.lib.php:1111 +#: libraries/import.lib.php:1123 msgid "View a structure`s contents by clicking on its name" msgstr "" -#: libraries/import.lib.php:1112 +#: libraries/import.lib.php:1124 msgid "" "Change any of its settings by clicking the corresponding \"Options\" link" msgstr "" -#: libraries/import.lib.php:1113 +#: libraries/import.lib.php:1125 msgid "Edit its structure by following the \"Structure\" link" msgstr "" -#: libraries/import.lib.php:1116 +#: libraries/import.lib.php:1128 msgid "Go to database" msgstr "" -#: libraries/import.lib.php:1119 libraries/import.lib.php:1143 +#: libraries/import.lib.php:1131 libraries/import.lib.php:1155 msgid "settings" msgstr "" -#: libraries/import.lib.php:1138 +#: libraries/import.lib.php:1150 msgid "Go to table" msgstr "" -#: libraries/import.lib.php:1147 +#: libraries/import.lib.php:1159 msgid "Go to view" msgstr "" @@ -7286,8 +7286,8 @@ msgstr "Drop the databases that have the same names as the users." 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 "" #: server_privileges.php:1776 @@ -8731,7 +8731,7 @@ msgstr "" #: tbl_change.php:1106 #, php-format -msgid "Restart insertion with %s rows" +msgid "Continue insertion with %s rows" msgstr "" #: tbl_chart.php:56 diff --git a/po/hr.po b/po/hr.po index 6e4391b..695ff37 100644 --- a/po/hr.po +++ b/po/hr.po @@ -3,16 +3,16 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-09-07 15:21+0200\n" +"POT-Creation-Date: 2010-09-10 12:46-0400\n" "PO-Revision-Date: 2010-07-21 14:54+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: croatian <hr(a)li.org>\n" -"Language: hr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Language: hr\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" +"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Pootle 2.0.1\n" #: browse_foreigners.php:36 browse_foreigners.php:57 @@ -613,7 +613,7 @@ msgstr "Umetni" #: libraries/config/user_preferences.forms.php:228 #: libraries/config/user_preferences.forms.php:262 #: libraries/db_links.inc.php:48 libraries/export/latex.php:351 -#: libraries/import.lib.php:1136 libraries/tbl_links.inc.php:54 +#: libraries/import.lib.php:1148 libraries/tbl_links.inc.php:54 #: pmd_general.php:133 server_privileges.php:595 server_replication.php:313 #: tbl_create.php:305 tbl_tracking.php:263 msgid "Structure" @@ -662,8 +662,8 @@ msgstr "" #: db_structure.php:404 libraries/display_tbl.lib.php:1945 #, 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 "" "Ovaj prikaz sadrži najmanje ovoliko redaka. Proučite %sdokumentaciju%s." @@ -878,11 +878,11 @@ msgstr "Izbacivanje je spremljeno u datoteku %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 "" -"Vjerojatno ste pokušali s učitavanjem prevelike datoteke. Pogledajte " -"%sdokumentaciju%s radi uputa o načinima rješavanja ovog ograničenja." +"Vjerojatno ste pokušali s učitavanjem prevelike datoteke. Pogledajte %" +"sdokumentaciju%s radi uputa o načinima rješavanja ovog ograničenja." #: import.php:277 import.php:330 libraries/File.class.php:566 #: libraries/File.class.php:676 @@ -1603,8 +1603,8 @@ msgstr "Komentar" #: libraries/Index.class.php:465 libraries/common.lib.php:610 #: libraries/common.lib.php:1143 libraries/config/messages.inc.php:459 -#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1119 -#: libraries/import.lib.php:1143 libraries/schema/User_Schema.class.php:168 +#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1131 +#: libraries/import.lib.php:1155 libraries/schema/User_Schema.class.php:168 #: setup/frames/index.inc.php:125 tbl_row_action.php:68 msgid "Edit" msgstr "Uređivanje" @@ -1748,8 +1748,8 @@ msgstr "Dobro došli u %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 "" "Vjerojatan razlog je nepostojeća konfiguracijska datoteka. Za izradu možete " "upotrijebiti naredbu %1$ssetup script%2$s" @@ -2163,7 +2163,7 @@ msgstr "Mapu koju ste odabrali za potrebe učitavanja nije moguće dohvatiti" #: libraries/config.values.php:95 libraries/export/htmlword.php:24 #: libraries/export/latex.php:41 libraries/export/odt.php:33 #: libraries/export/sql.php:79 libraries/export/texytext.php:23 -#: libraries/import.lib.php:1141 +#: libraries/import.lib.php:1153 #, fuzzy msgid "structure" msgstr "Strukturu" @@ -4621,8 +4621,8 @@ msgstr "" #| "happen: %3$s. Other text will be kept as is." 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 "" "Vrijednost se interpretira pomoću %1$sstrftime%2$s, pa možete upotrijebiti " "naredbe oblikovanja vremena. Dodatno se mogu dogoditi sljedeća " @@ -4818,7 +4818,7 @@ msgstr "Presloži po ključu" #: libraries/export/sql.php:55 libraries/export/texytext.php:30 #: libraries/export/xls.php:28 libraries/export/xlsx.php:28 #: libraries/export/xml.php:25 libraries/export/yaml.php:29 -#: libraries/import.lib.php:1114 libraries/import.lib.php:1136 +#: libraries/import.lib.php:1126 libraries/import.lib.php:1148 #: libraries/import/csv.php:32 libraries/import/docsql.php:34 #: libraries/import/ldi.php:48 libraries/import/ods.php:32 #: libraries/import/sql.php:19 libraries/import/xls.php:27 @@ -5673,39 +5673,39 @@ msgstr "Generirano s" msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL je vratio prazan komplet rezultata (npr. nula redova)." -#: libraries/import.lib.php:1110 +#: libraries/import.lib.php:1122 msgid "" "The following structures have either been created or altered. Here you can:" msgstr "" -#: libraries/import.lib.php:1111 +#: libraries/import.lib.php:1123 msgid "View a structure`s contents by clicking on its name" msgstr "" -#: libraries/import.lib.php:1112 +#: libraries/import.lib.php:1124 msgid "" "Change any of its settings by clicking the corresponding \"Options\" link" msgstr "" -#: libraries/import.lib.php:1113 +#: libraries/import.lib.php:1125 msgid "Edit its structure by following the \"Structure\" link" msgstr "" -#: libraries/import.lib.php:1116 +#: libraries/import.lib.php:1128 #, fuzzy msgid "Go to database" msgstr "Nema baza podataka" -#: libraries/import.lib.php:1119 libraries/import.lib.php:1143 +#: libraries/import.lib.php:1131 libraries/import.lib.php:1155 msgid "settings" msgstr "" -#: libraries/import.lib.php:1138 +#: libraries/import.lib.php:1150 #, fuzzy msgid "Go to table" msgstr "Nema baza podataka" -#: libraries/import.lib.php:1147 +#: libraries/import.lib.php:1159 msgid "Go to view" msgstr "" @@ -7730,8 +7730,8 @@ msgstr "Ispusti baze podataka koje imaju iste nazive i korisnike." 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 "" "Napomena: phpMyAdmin preuzima korisničke privilegije izravno iz MySQL " "tablica privilegija. U slučaju da su ručno mijenjane, sadržaj ovih tablica " @@ -9330,8 +9330,9 @@ msgstr "" "odnosno s tipkama CTRL+Strelice za premještanje bilo kamo" #: tbl_change.php:1106 -#, php-format -msgid "Restart insertion with %s rows" +#, fuzzy, php-format +#| msgid "Restart insertion with %s rows" +msgid "Continue insertion with %s rows" msgstr "Ponovno pokreni umetanje s %s redaka" #: tbl_chart.php:56 @@ -10087,8 +10088,8 @@ msgstr "Preimenuj tablicu u" #~ "Cannot load [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] " #~ "extension. Please check your PHP configuration." #~ msgstr "" -#~ "Nije moguće učitati proširenje [a@http://php.net/%1$s@Documentation]" -#~ "[em]%1$s[/em][/a] . Provjerite svoju PHP konfiguraciju." +#~ "Nije moguće učitati proširenje [a@http://php.net/%1$s@Documentation][em]%1" +#~ "$s[/em][/a] . Provjerite svoju PHP konfiguraciju." #~ msgid "" #~ "Couldn't load the iconv or recode extension needed for charset " diff --git a/po/hu.po b/po/hu.po index 613c853..88a0bce 100644 --- a/po/hu.po +++ b/po/hu.po @@ -3,14 +3,14 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-09-07 15:21+0200\n" +"POT-Creation-Date: 2010-09-10 12:46-0400\n" "PO-Revision-Date: 2010-07-22 02:22+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: hungarian <hu(a)li.org>\n" -"Language: hu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: hu\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.1\n" @@ -612,7 +612,7 @@ msgstr "Beszúrás" #: libraries/config/user_preferences.forms.php:228 #: libraries/config/user_preferences.forms.php:262 #: libraries/db_links.inc.php:48 libraries/export/latex.php:351 -#: libraries/import.lib.php:1136 libraries/tbl_links.inc.php:54 +#: libraries/import.lib.php:1148 libraries/tbl_links.inc.php:54 #: pmd_general.php:133 server_privileges.php:595 server_replication.php:313 #: tbl_create.php:305 tbl_tracking.php:263 msgid "Structure" @@ -661,11 +661,11 @@ msgstr "" #: db_structure.php:404 libraries/display_tbl.lib.php:1945 #, 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 "" -"Ebben a nézetben legalább ennyi számú sor van. Kérjük, hogy nézzen utána a " -"%sdokumentációban%s." +"Ebben a nézetben legalább ennyi számú sor van. Kérjük, hogy nézzen utána a %" +"sdokumentációban%s." #: db_structure.php:418 db_structure.php:432 libraries/header.inc.php:138 #: libraries/tbl_info.inc.php:60 tbl_structure.php:205 test/theme.php:73 @@ -877,11 +877,11 @@ msgstr "A kiíratás mentése a(z) %s fájlba megtörtént." #: 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 "" -"Ön bizonyára túl nagy fájlt próbált meg feltölteni. Kérjük, nézzen utána a " -"%sdokumentációban%s a korlátozás feloldásának." +"Ön bizonyára túl nagy fájlt próbált meg feltölteni. Kérjük, nézzen utána a %" +"sdokumentációban%s a korlátozás feloldásának." #: import.php:277 import.php:330 libraries/File.class.php:566 #: libraries/File.class.php:676 @@ -1604,8 +1604,8 @@ msgstr "Megjegyzés" #: libraries/Index.class.php:465 libraries/common.lib.php:610 #: libraries/common.lib.php:1143 libraries/config/messages.inc.php:459 -#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1119 -#: libraries/import.lib.php:1143 libraries/schema/User_Schema.class.php:168 +#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1131 +#: libraries/import.lib.php:1155 libraries/schema/User_Schema.class.php:168 #: setup/frames/index.inc.php:125 tbl_row_action.php:68 msgid "Edit" msgstr "Módosítás" @@ -1751,11 +1751,11 @@ msgstr "Üdvözli a %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 "" -"Ön valószínűleg nem hozta létre a konfigurációs fájlt. A " -"%1$stelepítőszkripttel%2$s el tudja készíteni." +"Ön valószínűleg nem hozta létre a konfigurációs fájlt. A %1" +"$stelepítőszkripttel%2$s el tudja készíteni." #: libraries/auth/config.auth.lib.php:115 msgid "" @@ -2169,7 +2169,7 @@ msgstr "Nem elérhető a feltöltésekhez megadott könyvtár" #: libraries/config.values.php:95 libraries/export/htmlword.php:24 #: libraries/export/latex.php:41 libraries/export/odt.php:33 #: libraries/export/sql.php:79 libraries/export/texytext.php:23 -#: libraries/import.lib.php:1141 +#: libraries/import.lib.php:1153 #, fuzzy msgid "structure" msgstr "Szerkezet" @@ -4818,8 +4818,8 @@ msgstr "" #| "happen: %3$s. Other text will be kept as is." 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 "" "Ennek az értéknek az értelmezése az %1$sstrftime%2$s használatával történik, " "vagyis időformázó karakterláncokat használhat. A következő átalakításokra " @@ -5016,7 +5016,7 @@ msgstr "Kulcs szerinti rendezés" #: libraries/export/sql.php:55 libraries/export/texytext.php:30 #: libraries/export/xls.php:28 libraries/export/xlsx.php:28 #: libraries/export/xml.php:25 libraries/export/yaml.php:29 -#: libraries/import.lib.php:1114 libraries/import.lib.php:1136 +#: libraries/import.lib.php:1126 libraries/import.lib.php:1148 #: libraries/import/csv.php:32 libraries/import/docsql.php:34 #: libraries/import/ldi.php:48 libraries/import/ods.php:32 #: libraries/import/sql.php:19 libraries/import/xls.php:27 @@ -5873,38 +5873,38 @@ msgstr "Készítette" msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "A MySQL üres eredményhalmazt adott vissza (pl. nulla sorok)." -#: libraries/import.lib.php:1110 +#: libraries/import.lib.php:1122 msgid "" "The following structures have either been created or altered. Here you can:" msgstr "" -#: libraries/import.lib.php:1111 +#: libraries/import.lib.php:1123 msgid "View a structure`s contents by clicking on its name" msgstr "" -#: libraries/import.lib.php:1112 +#: libraries/import.lib.php:1124 msgid "" "Change any of its settings by clicking the corresponding \"Options\" link" msgstr "" -#: libraries/import.lib.php:1113 +#: libraries/import.lib.php:1125 msgid "Edit its structure by following the \"Structure\" link" msgstr "" -#: libraries/import.lib.php:1116 +#: libraries/import.lib.php:1128 #, fuzzy msgid "Go to database" msgstr "Nincs adatbázis" -#: libraries/import.lib.php:1119 libraries/import.lib.php:1143 +#: libraries/import.lib.php:1131 libraries/import.lib.php:1155 msgid "settings" msgstr "" -#: libraries/import.lib.php:1138 +#: libraries/import.lib.php:1150 msgid "Go to table" msgstr "" -#: libraries/import.lib.php:1147 +#: libraries/import.lib.php:1159 msgid "Go to view" msgstr "" @@ -6779,8 +6779,8 @@ msgid "" "The SQL validator could not be initialized. Please check if you have " "installed the necessary PHP extensions as described in the %sdocumentation%s." msgstr "" -"Nem lehetett inicializálni az SQL ellenőrzőt. Ellenőrizze, hogy a " -"%sdokumentációban%s leírtak szerint telepítette-e a szükséges PHP-" +"Nem lehetett inicializálni az SQL ellenőrzőt. Ellenőrizze, hogy a %" +"sdokumentációban%s leírtak szerint telepítette-e a szükséges PHP-" "kiterjesztést." #: libraries/tbl_links.inc.php:106 libraries/tbl_links.inc.php:107 @@ -7965,13 +7965,13 @@ msgstr "A felhasználókéval azonos nevű adatbázisok eldobása." 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 "" "Megjegyzés: a phpMyAdmin a felhasználók jogait közvetlenül a MySQL " "privilégium táblákból veszi. Ezen táblák tartalma eltérhet a szerver által " -"használt jogoktól, ha a módosításuk kézzel történt. Ebben az esetben " -"%stöltse be újra a jogokat%s a folytatás előtt." +"használt jogoktól, ha a módosításuk kézzel történt. Ebben az esetben %" +"stöltse be újra a jogokat%s a folytatás előtt." #: server_privileges.php:1776 msgid "The selected user was not found in the privilege table." @@ -9635,8 +9635,9 @@ msgstr "" "léphet. " #: tbl_change.php:1106 -#, php-format -msgid "Restart insertion with %s rows" +#, fuzzy, php-format +#| msgid "Restart insertion with %s rows" +msgid "Continue insertion with %s rows" msgstr "Beszúrás újrakezdése %s sorral" #: tbl_chart.php:56 diff --git a/po/id.po b/po/id.po index efa99ab..e059dc6 100644 --- a/po/id.po +++ b/po/id.po @@ -3,14 +3,14 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-09-07 15:21+0200\n" +"POT-Creation-Date: 2010-09-10 12:46-0400\n" "PO-Revision-Date: 2010-06-16 01:45+0200\n" "Last-Translator: <jack.hakim(a)yahoo.com>\n" "Language-Team: indonesian <id(a)li.org>\n" -"Language: id\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: id\n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Pootle 2.0.1\n" @@ -601,7 +601,7 @@ msgstr "Sisipkan" #: libraries/config/user_preferences.forms.php:228 #: libraries/config/user_preferences.forms.php:262 #: libraries/db_links.inc.php:48 libraries/export/latex.php:351 -#: libraries/import.lib.php:1136 libraries/tbl_links.inc.php:54 +#: libraries/import.lib.php:1148 libraries/tbl_links.inc.php:54 #: pmd_general.php:133 server_privileges.php:595 server_replication.php:313 #: tbl_create.php:305 tbl_tracking.php:263 msgid "Structure" @@ -650,11 +650,11 @@ msgstr "Pelacakan tidak aktif." #: db_structure.php:404 libraries/display_tbl.lib.php:1945 #, 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 "" -"Sebuah view setidaknya mempunyai jumlah kolom berikut. Silahkan lihat " -"%sdokumentasi%s" +"Sebuah view setidaknya mempunyai jumlah kolom berikut. Silahkan lihat %" +"sdokumentasi%s" #: db_structure.php:418 db_structure.php:432 libraries/header.inc.php:138 #: libraries/tbl_info.inc.php:60 tbl_structure.php:205 test/theme.php:73 @@ -859,11 +859,11 @@ msgstr "Dump (Skema) disimpan pada file %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 "" -"Anda mungkin meng-upload file yang terlalu besar. Silahkan lihat " -"%sdokumentasi%s untuk mendapatkan solusi tentang batasan ini." +"Anda mungkin meng-upload file yang terlalu besar. Silahkan lihat %" +"sdokumentasi%s untuk mendapatkan solusi tentang batasan ini." #: import.php:277 import.php:330 libraries/File.class.php:566 #: libraries/File.class.php:676 @@ -1577,8 +1577,8 @@ msgstr "Komentar" #: libraries/Index.class.php:465 libraries/common.lib.php:610 #: libraries/common.lib.php:1143 libraries/config/messages.inc.php:459 -#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1119 -#: libraries/import.lib.php:1143 libraries/schema/User_Schema.class.php:168 +#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1131 +#: libraries/import.lib.php:1155 libraries/schema/User_Schema.class.php:168 #: setup/frames/index.inc.php:125 tbl_row_action.php:68 msgid "Edit" msgstr "Ubah" @@ -1718,8 +1718,8 @@ msgstr "Selamat Datang di %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 "" #: libraries/auth/config.auth.lib.php:115 @@ -2127,7 +2127,7 @@ msgstr "" #: libraries/config.values.php:95 libraries/export/htmlword.php:24 #: libraries/export/latex.php:41 libraries/export/odt.php:33 #: libraries/export/sql.php:79 libraries/export/texytext.php:23 -#: libraries/import.lib.php:1141 +#: libraries/import.lib.php:1153 #, fuzzy msgid "structure" msgstr "Struktur" @@ -4565,8 +4565,8 @@ msgstr "" #, 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 "" #: libraries/display_export.lib.php:275 @@ -4744,7 +4744,7 @@ msgstr "Urut berdasarkan kunci" #: libraries/export/sql.php:55 libraries/export/texytext.php:30 #: libraries/export/xls.php:28 libraries/export/xlsx.php:28 #: libraries/export/xml.php:25 libraries/export/yaml.php:29 -#: libraries/import.lib.php:1114 libraries/import.lib.php:1136 +#: libraries/import.lib.php:1126 libraries/import.lib.php:1148 #: libraries/import/csv.php:32 libraries/import/docsql.php:34 #: libraries/import/ldi.php:48 libraries/import/ods.php:32 #: libraries/import/sql.php:19 libraries/import/xls.php:27 @@ -5569,38 +5569,38 @@ msgstr "Diciptakan oleh" msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL balikkan hasil kosong (a.k. baris yang kosong)." -#: libraries/import.lib.php:1110 +#: libraries/import.lib.php:1122 msgid "" "The following structures have either been created or altered. Here you can:" msgstr "" -#: libraries/import.lib.php:1111 +#: libraries/import.lib.php:1123 msgid "View a structure`s contents by clicking on its name" msgstr "" -#: libraries/import.lib.php:1112 +#: libraries/import.lib.php:1124 msgid "" "Change any of its settings by clicking the corresponding \"Options\" link" msgstr "" -#: libraries/import.lib.php:1113 +#: libraries/import.lib.php:1125 msgid "Edit its structure by following the \"Structure\" link" msgstr "" -#: libraries/import.lib.php:1116 +#: libraries/import.lib.php:1128 #, fuzzy msgid "Go to database" msgstr "Database tidak ditemukan" -#: libraries/import.lib.php:1119 libraries/import.lib.php:1143 +#: libraries/import.lib.php:1131 libraries/import.lib.php:1155 msgid "settings" msgstr "" -#: libraries/import.lib.php:1138 +#: libraries/import.lib.php:1150 msgid "Go to table" msgstr "" -#: libraries/import.lib.php:1147 +#: libraries/import.lib.php:1159 msgid "Go to view" msgstr "" @@ -7612,8 +7612,8 @@ msgstr "Hapus database yang memiliki nama yang sama dengan pengguna." 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 "" "Perhatian: phpMyAdmin membaca data tentang pengguna secara langsung dari " "tabel profil pengguna MySQL. Isi dari tabel bisa saja berbeda dengan profil " @@ -9091,7 +9091,7 @@ msgstr "" #: tbl_change.php:1106 #, php-format -msgid "Restart insertion with %s rows" +msgid "Continue insertion with %s rows" msgstr "" #: tbl_chart.php:56 diff --git a/po/it.po b/po/it.po index 0375f3f..d6bc012 100644 --- a/po/it.po +++ b/po/it.po @@ -3,14 +3,14 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-09-07 15:21+0200\n" +"POT-Creation-Date: 2010-09-10 12:46-0400\n" "PO-Revision-Date: 2010-08-22 19:39+0200\n" "Last-Translator: <rebeluca(a)gmail.com>\n" "Language-Team: italian <it(a)li.org>\n" -"Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: it\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.5\n" @@ -597,7 +597,7 @@ msgstr "Inserisci" #: libraries/config/user_preferences.forms.php:228 #: libraries/config/user_preferences.forms.php:262 #: libraries/db_links.inc.php:48 libraries/export/latex.php:351 -#: libraries/import.lib.php:1136 libraries/tbl_links.inc.php:54 +#: libraries/import.lib.php:1148 libraries/tbl_links.inc.php:54 #: pmd_general.php:133 server_privileges.php:595 server_replication.php:313 #: tbl_create.php:305 tbl_tracking.php:263 msgid "Structure" @@ -646,8 +646,8 @@ msgstr "Il tracking non è attivo." #: db_structure.php:404 libraries/display_tbl.lib.php:1945 #, 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 "" "Questa visuale ha, come minimo, questo numero di righe. Per informazioni " "controlla la %sdocumentazione%s." @@ -856,8 +856,8 @@ msgstr "Il dump è stato salvato sul file %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 "" "Stai probabilmente cercando di caricare sul server un file troppo grosso. " "Fai riferimento alla documentazione %sdocumentation%s Per i modi di aggirare " @@ -1527,8 +1527,8 @@ msgstr "Commenti" #: libraries/Index.class.php:465 libraries/common.lib.php:610 #: libraries/common.lib.php:1143 libraries/config/messages.inc.php:459 -#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1119 -#: libraries/import.lib.php:1143 libraries/schema/User_Schema.class.php:168 +#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1131 +#: libraries/import.lib.php:1155 libraries/schema/User_Schema.class.php:168 #: setup/frames/index.inc.php:125 tbl_row_action.php:68 msgid "Edit" msgstr "Modifica" @@ -1672,8 +1672,8 @@ msgstr "Benvenuto in %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 "" "La ragione di questo è che probabilmente non hai creato alcun file di " "configurazione. Potresti voler usare %1$ssetup script%2$s per crearne uno." @@ -2080,7 +2080,7 @@ msgstr "La directory impostata per l'upload non può essere trovata" #: libraries/config.values.php:95 libraries/export/htmlword.php:24 #: libraries/export/latex.php:41 libraries/export/odt.php:33 #: libraries/export/sql.php:79 libraries/export/texytext.php:23 -#: libraries/import.lib.php:1141 +#: libraries/import.lib.php:1153 msgid "structure" msgstr "struttura" @@ -4571,8 +4571,8 @@ msgstr "" #| "happen: %3$s. Other text will be kept as is." 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 "" "Questo valore è interpretato usando %1$sstrftime%2$s: in questo modo puoi " "usare stringhe di formattazione per le date/tempi. Verranno anche aggiunte " @@ -4776,7 +4776,7 @@ msgstr "Ordina per chiave" #: libraries/export/sql.php:55 libraries/export/texytext.php:30 #: libraries/export/xls.php:28 libraries/export/xlsx.php:28 #: libraries/export/xml.php:25 libraries/export/yaml.php:29 -#: libraries/import.lib.php:1114 libraries/import.lib.php:1136 +#: libraries/import.lib.php:1126 libraries/import.lib.php:1148 #: libraries/import/csv.php:32 libraries/import/docsql.php:34 #: libraries/import/ldi.php:48 libraries/import/ods.php:32 #: libraries/import/sql.php:19 libraries/import/xls.php:27 @@ -5642,38 +5642,38 @@ msgstr "Generato da" msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL ha restituito un insieme vuoto (i.e. zero righe)." -#: libraries/import.lib.php:1110 +#: libraries/import.lib.php:1122 msgid "" "The following structures have either been created or altered. Here you can:" msgstr "Le seguenti strutture sono state create o modificate. Qui tu puoi:" -#: libraries/import.lib.php:1111 +#: libraries/import.lib.php:1123 msgid "View a structure`s contents by clicking on its name" msgstr "Visualizza i contenuti delle strutture facendo click sul loro nome" -#: libraries/import.lib.php:1112 +#: libraries/import.lib.php:1124 msgid "" "Change any of its settings by clicking the corresponding \"Options\" link" msgstr "" "Modificare ogni impostazione cliccando sul corrispondente link \"Opzioni\"" -#: libraries/import.lib.php:1113 +#: libraries/import.lib.php:1125 msgid "Edit its structure by following the \"Structure\" link" msgstr "Modifica la sua struttura seguendo il link \"Struttura\"" -#: libraries/import.lib.php:1116 +#: libraries/import.lib.php:1128 msgid "Go to database" msgstr "Vai al database" -#: libraries/import.lib.php:1119 libraries/import.lib.php:1143 +#: libraries/import.lib.php:1131 libraries/import.lib.php:1155 msgid "settings" msgstr "impostazioni" -#: libraries/import.lib.php:1138 +#: libraries/import.lib.php:1150 msgid "Go to table" msgstr "Vai alla tabella" -#: libraries/import.lib.php:1147 +#: libraries/import.lib.php:1159 msgid "Go to view" msgstr "Vai alla visualizzazione" @@ -7047,8 +7047,8 @@ msgid "" "Server running with Suhosin. Please refer to %sdocumentation%s for possible " "issues." msgstr "" -"Sul server è in esecuzione Suhosin. Controlla la documentazione: " -"%sdocumentation%s per possibili problemi." +"Sul server è in esecuzione Suhosin. Controlla la documentazione: %" +"sdocumentation%s per possibili problemi." #: navigation.php:60 navigation.php:61 navigation.php:64 #, fuzzy @@ -7727,8 +7727,8 @@ msgstr "Elimina i databases gli stessi nomi degli utenti." 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 "" "N.B.: phpMyAdmin legge i privilegi degli utenti direttamente nella tabella " "dei privilegi di MySQL. Il contenuto di questa tabella può differire dai " @@ -9337,8 +9337,9 @@ msgstr "" "+frecce per spostarlo altrove" #: tbl_change.php:1106 -#, php-format -msgid "Restart insertion with %s rows" +#, fuzzy, php-format +#| msgid "Restart insertion with %s rows" +msgid "Continue insertion with %s rows" msgstr "Riprendi inserimento con la riga %s" #: tbl_chart.php:56 diff --git a/po/ja.po b/po/ja.po index 2e947f3..0ed573c 100644 --- a/po/ja.po +++ b/po/ja.po @@ -3,14 +3,14 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-09-07 15:21+0200\n" +"POT-Creation-Date: 2010-09-10 12:46-0400\n" "PO-Revision-Date: 2010-03-12 11:22+0200\n" "Last-Translator: Michal <michal(a)cihar.com>\n" "Language-Team: japanese <jp(a)li.org>\n" -"Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: ja\n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Pootle 2.0.1\n" @@ -610,7 +610,7 @@ msgstr "挿入" #: libraries/config/user_preferences.forms.php:228 #: libraries/config/user_preferences.forms.php:262 #: libraries/db_links.inc.php:48 libraries/export/latex.php:351 -#: libraries/import.lib.php:1136 libraries/tbl_links.inc.php:54 +#: libraries/import.lib.php:1148 libraries/tbl_links.inc.php:54 #: pmd_general.php:133 server_privileges.php:595 server_replication.php:313 #: tbl_create.php:305 tbl_tracking.php:263 msgid "Structure" @@ -659,8 +659,8 @@ msgstr "" #: db_structure.php:404 libraries/display_tbl.lib.php:1945 #, 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 "このビューの最低行数。詳しくは%sドキュメント%sをご覧ください。" #: db_structure.php:418 db_structure.php:432 libraries/header.inc.php:138 @@ -866,8 +866,8 @@ msgstr "ダンプをファイル %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 "" "アップロードしようとしたファイルが大きすぎるようです。対策については %sドキュ" "メント%s をご覧ください" @@ -1587,8 +1587,8 @@ msgstr "コメント" #: libraries/Index.class.php:465 libraries/common.lib.php:610 #: libraries/common.lib.php:1143 libraries/config/messages.inc.php:459 -#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1119 -#: libraries/import.lib.php:1143 libraries/schema/User_Schema.class.php:168 +#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1131 +#: libraries/import.lib.php:1155 libraries/schema/User_Schema.class.php:168 #: setup/frames/index.inc.php:125 tbl_row_action.php:68 msgid "Edit" msgstr "編集" @@ -1730,11 +1730,11 @@ msgstr "%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 "" -"設定ファイルが作成されていないものと思われます。%1$sセットアップスクリプ" -"ト%2$s を利用して設定ファイルを作成してください" +"設定ファイルが作成されていないものと思われます。%1$sセットアップスクリプト%2" +"$s を利用して設定ファイルを作成してください" #: libraries/auth/config.auth.lib.php:115 msgid "" @@ -2140,7 +2140,7 @@ msgstr "指定したアップロードディレクトリが利用できません #: libraries/config.values.php:95 libraries/export/htmlword.php:24 #: libraries/export/latex.php:41 libraries/export/odt.php:33 #: libraries/export/sql.php:79 libraries/export/texytext.php:23 -#: libraries/import.lib.php:1141 +#: libraries/import.lib.php:1153 msgid "structure" msgstr "" @@ -4569,8 +4569,8 @@ msgstr "" #| "happen: %3$s. Other text will be kept as is." 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 "" "このテンプレートは %1$sstrftime%2$s を使って解釈されます。そのため、時間の書" "式文字列を利用できます。また、次の変換も行われます。%3$s それ以外のテキストは" @@ -4768,7 +4768,7 @@ msgstr "キーでソート" #: libraries/export/sql.php:55 libraries/export/texytext.php:30 #: libraries/export/xls.php:28 libraries/export/xlsx.php:28 #: libraries/export/xml.php:25 libraries/export/yaml.php:29 -#: libraries/import.lib.php:1114 libraries/import.lib.php:1136 +#: libraries/import.lib.php:1126 libraries/import.lib.php:1148 #: libraries/import/csv.php:32 libraries/import/docsql.php:34 #: libraries/import/ldi.php:48 libraries/import/ods.php:32 #: libraries/import/sql.php:19 libraries/import/xls.php:27 @@ -5624,37 +5624,37 @@ msgstr "生成環境" msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "返り値が空でした(行数0)" -#: libraries/import.lib.php:1110 +#: libraries/import.lib.php:1122 msgid "" "The following structures have either been created or altered. Here you can:" msgstr "" -#: libraries/import.lib.php:1111 +#: libraries/import.lib.php:1123 msgid "View a structure`s contents by clicking on its name" msgstr "" -#: libraries/import.lib.php:1112 +#: libraries/import.lib.php:1124 msgid "" "Change any of its settings by clicking the corresponding \"Options\" link" msgstr "" -#: libraries/import.lib.php:1113 +#: libraries/import.lib.php:1125 msgid "Edit its structure by following the \"Structure\" link" msgstr "" -#: libraries/import.lib.php:1116 +#: libraries/import.lib.php:1128 msgid "Go to database" msgstr "" -#: libraries/import.lib.php:1119 libraries/import.lib.php:1143 +#: libraries/import.lib.php:1131 libraries/import.lib.php:1155 msgid "settings" msgstr "" -#: libraries/import.lib.php:1138 +#: libraries/import.lib.php:1150 msgid "Go to table" msgstr "" -#: libraries/import.lib.php:1147 +#: libraries/import.lib.php:1159 msgid "Go to view" msgstr "" @@ -7658,8 +7658,8 @@ msgstr "ユーザと同名のデータベースを削除する" 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 "" "注意: phpMyAdmin は MySQL の特権テーブルから直接ユーザ特権を取得しますが、手" "作業で特権を更新した場合は phpMyAdmin が利用しているテーブルの内容とサーバの" @@ -9208,8 +9208,9 @@ msgstr "" "由に移動できます" #: tbl_change.php:1106 -#, php-format -msgid "Restart insertion with %s rows" +#, fuzzy, php-format +#| msgid "Restart insertion with %s rows" +msgid "Continue insertion with %s rows" msgstr "%s 行から挿入を再開する" #: tbl_chart.php:56 diff --git a/po/ka.po b/po/ka.po index 3ba4bf0..7fbbeba 100644 --- a/po/ka.po +++ b/po/ka.po @@ -3,14 +3,14 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-09-07 15:21+0200\n" +"POT-Creation-Date: 2010-09-10 12:46-0400\n" "PO-Revision-Date: 2010-03-12 09:14+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: georgian <ka(a)li.org>\n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: \n" "X-Generator: Translate Toolkit 1.5.3\n" #: browse_foreigners.php:36 browse_foreigners.php:57 @@ -611,7 +611,7 @@ msgstr "ჩასმა" #: libraries/config/user_preferences.forms.php:228 #: libraries/config/user_preferences.forms.php:262 #: libraries/db_links.inc.php:48 libraries/export/latex.php:351 -#: libraries/import.lib.php:1136 libraries/tbl_links.inc.php:54 +#: libraries/import.lib.php:1148 libraries/tbl_links.inc.php:54 #: pmd_general.php:133 server_privileges.php:595 server_replication.php:313 #: tbl_create.php:305 tbl_tracking.php:263 msgid "Structure" @@ -660,11 +660,11 @@ msgstr "" #: db_structure.php:404 libraries/display_tbl.lib.php:1945 #, 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 "" -"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." #: db_structure.php:418 db_structure.php:432 libraries/header.inc.php:138 #: libraries/tbl_info.inc.php:60 tbl_structure.php:205 test/theme.php:73 @@ -876,11 +876,11 @@ msgstr "Dump has been saved to file %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 "" -"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." #: import.php:277 import.php:330 libraries/File.class.php:566 #: libraries/File.class.php:676 @@ -1600,8 +1600,8 @@ msgstr "კომენტარი" #: libraries/Index.class.php:465 libraries/common.lib.php:610 #: libraries/common.lib.php:1143 libraries/config/messages.inc.php:459 -#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1119 -#: libraries/import.lib.php:1143 libraries/schema/User_Schema.class.php:168 +#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1131 +#: libraries/import.lib.php:1155 libraries/schema/User_Schema.class.php:168 #: setup/frames/index.inc.php:125 tbl_row_action.php:68 msgid "Edit" msgstr "რედაქტირება" @@ -1747,11 +1747,11 @@ msgstr "მოგესალმებათ %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 "" -"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." #: libraries/auth/config.auth.lib.php:115 msgid "" @@ -2162,7 +2162,7 @@ msgstr "The directory you set for upload work cannot be reached" #: libraries/config.values.php:95 libraries/export/htmlword.php:24 #: libraries/export/latex.php:41 libraries/export/odt.php:33 #: libraries/export/sql.php:79 libraries/export/texytext.php:23 -#: libraries/import.lib.php:1141 +#: libraries/import.lib.php:1153 #, fuzzy msgid "structure" msgstr "სტრუქტურა" @@ -4771,12 +4771,12 @@ msgstr "" #| "happen: %3$s. Other text will be kept as is." 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 "" "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." +"formatting strings. Additionally the following transformations will happen: %" +"3$s. Other text will be kept as is." #: libraries/display_export.lib.php:275 msgid "use this for future exports" @@ -4968,7 +4968,7 @@ msgstr "Sort by key" #: libraries/export/sql.php:55 libraries/export/texytext.php:30 #: libraries/export/xls.php:28 libraries/export/xlsx.php:28 #: libraries/export/xml.php:25 libraries/export/yaml.php:29 -#: libraries/import.lib.php:1114 libraries/import.lib.php:1136 +#: libraries/import.lib.php:1126 libraries/import.lib.php:1148 #: libraries/import/csv.php:32 libraries/import/docsql.php:34 #: libraries/import/ldi.php:48 libraries/import/ods.php:32 #: libraries/import/sql.php:19 libraries/import/xls.php:27 @@ -5824,39 +5824,39 @@ msgstr "Generated by" msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL returned an empty result set (i.e. zero rows)." -#: libraries/import.lib.php:1110 +#: libraries/import.lib.php:1122 msgid "" "The following structures have either been created or altered. Here you can:" msgstr "" -#: libraries/import.lib.php:1111 +#: libraries/import.lib.php:1123 msgid "View a structure`s contents by clicking on its name" msgstr "" -#: libraries/import.lib.php:1112 +#: libraries/import.lib.php:1124 msgid "" "Change any of its settings by clicking the corresponding \"Options\" link" msgstr "" -#: libraries/import.lib.php:1113 +#: libraries/import.lib.php:1125 msgid "Edit its structure by following the \"Structure\" link" msgstr "" -#: libraries/import.lib.php:1116 +#: libraries/import.lib.php:1128 #, fuzzy msgid "Go to database" msgstr "მონაცემთა ბაზები არაა" -#: libraries/import.lib.php:1119 libraries/import.lib.php:1143 +#: libraries/import.lib.php:1131 libraries/import.lib.php:1155 msgid "settings" msgstr "" -#: libraries/import.lib.php:1138 +#: libraries/import.lib.php:1150 #, fuzzy msgid "Go to table" msgstr "მონაცემთა ბაზები არაა" -#: libraries/import.lib.php:1147 +#: libraries/import.lib.php:1159 msgid "Go to view" msgstr "" @@ -7892,13 +7892,13 @@ msgstr "Drop the databases that have the same names as the users." 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 "" "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." #: server_privileges.php:1776 msgid "The selected user was not found in the privilege table." @@ -9533,8 +9533,9 @@ msgstr "" "Use TAB key to move from value to value, or CTRL+arrows to move anywhere" #: tbl_change.php:1106 -#, php-format -msgid "Restart insertion with %s rows" +#, fuzzy, php-format +#| msgid "Restart insertion with %s rows" +msgid "Continue insertion with %s rows" msgstr "Restart insertion with %s rows" #: tbl_chart.php:56 diff --git a/po/ko.po b/po/ko.po index 64a0e8d..8be2215 100644 --- a/po/ko.po +++ b/po/ko.po @@ -3,14 +3,14 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-09-07 15:21+0200\n" +"POT-Creation-Date: 2010-09-10 12:46-0400\n" "PO-Revision-Date: 2010-06-16 18:18+0200\n" "Last-Translator: <cihar(a)nvyu.net>\n" "Language-Team: korean <ko(a)li.org>\n" -"Language: ko\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: ko\n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Pootle 2.0.1\n" @@ -347,8 +347,8 @@ msgid "" "The phpMyAdmin configuration storage has been deactivated. To find out why " "click %shere%s." msgstr "" -"링크 테이블을 처리하는 추가 기능이 비활성화되어 있습니다. 원인을 확인하려면 " -"%s여기를 클릭%s하십시오." +"링크 테이블을 처리하는 추가 기능이 비활성화되어 있습니다. 원인을 확인하려면 %" +"s여기를 클릭%s하십시오." #: db_operations.php:549 msgid "Edit or export relational schema" @@ -597,7 +597,7 @@ msgstr "삽입" #: libraries/config/user_preferences.forms.php:228 #: libraries/config/user_preferences.forms.php:262 #: libraries/db_links.inc.php:48 libraries/export/latex.php:351 -#: libraries/import.lib.php:1136 libraries/tbl_links.inc.php:54 +#: libraries/import.lib.php:1148 libraries/tbl_links.inc.php:54 #: pmd_general.php:133 server_privileges.php:595 server_replication.php:313 #: tbl_create.php:305 tbl_tracking.php:263 msgid "Structure" @@ -646,8 +646,8 @@ msgstr "트래킹이 활성화되어 있지 않습니다." #: db_structure.php:404 libraries/display_tbl.lib.php:1945 #, 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 "" #: db_structure.php:418 db_structure.php:432 libraries/header.inc.php:138 @@ -858,8 +858,8 @@ msgstr "" #: 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 "" #: import.php:277 import.php:330 libraries/File.class.php:566 @@ -1520,8 +1520,8 @@ msgstr "설명(코멘트)" #: libraries/Index.class.php:465 libraries/common.lib.php:610 #: libraries/common.lib.php:1143 libraries/config/messages.inc.php:459 -#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1119 -#: libraries/import.lib.php:1143 libraries/schema/User_Schema.class.php:168 +#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1131 +#: libraries/import.lib.php:1155 libraries/schema/User_Schema.class.php:168 #: setup/frames/index.inc.php:125 tbl_row_action.php:68 msgid "Edit" msgstr "수정" @@ -1661,8 +1661,8 @@ msgstr "%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 "" "설정 파일을 생성하지 않은 것 같습니다. %1$ssetup script%2$s 를 사용해 설정 파" "일을 생성할 수 있습니다." @@ -2060,7 +2060,7 @@ msgstr "업로드 디렉토리에 접근할 수 없습니다" #: libraries/config.values.php:95 libraries/export/htmlword.php:24 #: libraries/export/latex.php:41 libraries/export/odt.php:33 #: libraries/export/sql.php:79 libraries/export/texytext.php:23 -#: libraries/import.lib.php:1141 +#: libraries/import.lib.php:1153 #, fuzzy msgid "structure" msgstr "구조" @@ -4483,8 +4483,8 @@ msgstr "" #, 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 "" #: libraries/display_export.lib.php:275 @@ -4662,7 +4662,7 @@ msgstr "" #: libraries/export/sql.php:55 libraries/export/texytext.php:30 #: libraries/export/xls.php:28 libraries/export/xlsx.php:28 #: libraries/export/xml.php:25 libraries/export/yaml.php:29 -#: libraries/import.lib.php:1114 libraries/import.lib.php:1136 +#: libraries/import.lib.php:1126 libraries/import.lib.php:1148 #: libraries/import/csv.php:32 libraries/import/docsql.php:34 #: libraries/import/ldi.php:48 libraries/import/ods.php:32 #: libraries/import/sql.php:19 libraries/import/xls.php:27 @@ -5449,38 +5449,38 @@ msgstr "" msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "결과값이 없습니다. (빈 레코드 리턴.)" -#: libraries/import.lib.php:1110 +#: libraries/import.lib.php:1122 msgid "" "The following structures have either been created or altered. Here you can:" msgstr "" -#: libraries/import.lib.php:1111 +#: libraries/import.lib.php:1123 msgid "View a structure`s contents by clicking on its name" msgstr "" -#: libraries/import.lib.php:1112 +#: libraries/import.lib.php:1124 msgid "" "Change any of its settings by clicking the corresponding \"Options\" link" msgstr "" -#: libraries/import.lib.php:1113 +#: libraries/import.lib.php:1125 msgid "Edit its structure by following the \"Structure\" link" msgstr "" -#: libraries/import.lib.php:1116 +#: libraries/import.lib.php:1128 #, fuzzy msgid "Go to database" msgstr "데이터베이스가 없습니다" -#: libraries/import.lib.php:1119 libraries/import.lib.php:1143 +#: libraries/import.lib.php:1131 libraries/import.lib.php:1155 msgid "settings" msgstr "" -#: libraries/import.lib.php:1138 +#: libraries/import.lib.php:1150 msgid "Go to table" msgstr "" -#: libraries/import.lib.php:1147 +#: libraries/import.lib.php:1159 msgid "Go to view" msgstr "" @@ -6685,8 +6685,8 @@ msgid "" "The additional features for working with linked tables have been " "deactivated. To find out why click %shere%s." msgstr "" -"링크 테이블을 처리하는 추가 기능이 비활성화되어 있습니다. 원인을 확인하려면 " -"%s여기를 클릭%s하십시오." +"링크 테이블을 처리하는 추가 기능이 비활성화되어 있습니다. 원인을 확인하려면 %" +"s여기를 클릭%s하십시오." #: main.php:311 msgid "" @@ -7365,8 +7365,8 @@ msgstr "사용자명과 같은 이름의 데이터베이스를 삭제" 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 "" #: server_privileges.php:1776 @@ -8832,7 +8832,7 @@ msgstr "" #: tbl_change.php:1106 #, php-format -msgid "Restart insertion with %s rows" +msgid "Continue insertion with %s rows" msgstr "" #: tbl_chart.php:56 diff --git a/po/lt.po b/po/lt.po index f9cb71d..162ea1c 100644 --- a/po/lt.po +++ b/po/lt.po @@ -3,16 +3,16 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-09-07 15:21+0200\n" +"POT-Creation-Date: 2010-09-10 12:46-0400\n" "PO-Revision-Date: 2010-08-30 15:22+0200\n" "Last-Translator: <edgaras.janusauskas(a)gmail.com>\n" "Language-Team: lithuanian <lt(a)li.org>\n" -"Language: lt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n" -"%100<10 || n%100>=20) ? 1 : 2);\n" +"Language: lt\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%" +"100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Pootle 2.0.5\n" #: browse_foreigners.php:36 browse_foreigners.php:57 @@ -595,7 +595,7 @@ msgstr "Įterpti" #: libraries/config/user_preferences.forms.php:228 #: libraries/config/user_preferences.forms.php:262 #: libraries/db_links.inc.php:48 libraries/export/latex.php:351 -#: libraries/import.lib.php:1136 libraries/tbl_links.inc.php:54 +#: libraries/import.lib.php:1148 libraries/tbl_links.inc.php:54 #: pmd_general.php:133 server_privileges.php:595 server_replication.php:313 #: tbl_create.php:305 tbl_tracking.php:263 msgid "Structure" @@ -644,8 +644,8 @@ msgstr "" #: db_structure.php:404 libraries/display_tbl.lib.php:1945 #, 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 "" #: db_structure.php:418 db_structure.php:432 libraries/header.inc.php:138 @@ -854,11 +854,11 @@ msgstr "Duombazės atvaizdis išsaugotas faile %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 "" -"Jūs tikriausiai bandėte įkelti per didelį failą. Prašome perskaityti " -"%sdokumentaciją%s būdams kaip apeiti šį apribojimą." +"Jūs tikriausiai bandėte įkelti per didelį failą. Prašome perskaityti %" +"sdokumentaciją%s būdams kaip apeiti šį apribojimą." #: import.php:277 import.php:330 libraries/File.class.php:566 #: libraries/File.class.php:676 @@ -1542,8 +1542,8 @@ msgstr "Komentaras" #: libraries/Index.class.php:465 libraries/common.lib.php:610 #: libraries/common.lib.php:1143 libraries/config/messages.inc.php:459 -#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1119 -#: libraries/import.lib.php:1143 libraries/schema/User_Schema.class.php:168 +#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1131 +#: libraries/import.lib.php:1155 libraries/schema/User_Schema.class.php:168 #: setup/frames/index.inc.php:125 tbl_row_action.php:68 msgid "Edit" msgstr "Redaguoti" @@ -1687,8 +1687,8 @@ msgstr "Jūs naudojate %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 "" "Jūs tikriausiai nesukūrėte nustatymų (konfigūracinio) failo. Galite " "pasinaudoti %1$snustatymų skriptu%2$s, kad sukurtumėte failą." @@ -2094,7 +2094,7 @@ msgstr "Nepasiekimas nurodytas www-serverio katalogas atsiuntimams." #: libraries/config.values.php:95 libraries/export/htmlword.php:24 #: libraries/export/latex.php:41 libraries/export/odt.php:33 #: libraries/export/sql.php:79 libraries/export/texytext.php:23 -#: libraries/import.lib.php:1141 +#: libraries/import.lib.php:1153 msgid "structure" msgstr "struktūra" @@ -4512,8 +4512,8 @@ msgstr ", @TABLE@ taps lentelės pavadinimu" #, 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 "" "Ši reikšmė interpretuojama naudojant %1$sstrftime%2$s, taigi Jūs galite " "keisti laiko formatavimą. Taip pat pakeičiamos šios eilutės: %3$s. Kitas " @@ -4693,7 +4693,7 @@ msgstr "Rūšiuoti pagal raktą" #: libraries/export/sql.php:55 libraries/export/texytext.php:30 #: libraries/export/xls.php:28 libraries/export/xlsx.php:28 #: libraries/export/xml.php:25 libraries/export/yaml.php:29 -#: libraries/import.lib.php:1114 libraries/import.lib.php:1136 +#: libraries/import.lib.php:1126 libraries/import.lib.php:1148 #: libraries/import/csv.php:32 libraries/import/docsql.php:34 #: libraries/import/ldi.php:48 libraries/import/ods.php:32 #: libraries/import/sql.php:19 libraries/import/xls.php:27 @@ -5493,38 +5493,38 @@ msgstr "Sugeneravo" msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL gražino tuščią rezultatų rinkinį (nėra eilučių)." -#: libraries/import.lib.php:1110 +#: libraries/import.lib.php:1122 msgid "" "The following structures have either been created or altered. Here you can:" msgstr "Sekanti struktūra buvo sukurta arba pakeista. Čia galite:" -#: libraries/import.lib.php:1111 +#: libraries/import.lib.php:1123 msgid "View a structure`s contents by clicking on its name" msgstr "Peržiūrėti struktūros turinį paspaudžiant ant vardo" -#: libraries/import.lib.php:1112 +#: libraries/import.lib.php:1124 msgid "" "Change any of its settings by clicking the corresponding \"Options\" link" msgstr "" "Keisti bet kuriuos iš šių nustatymų spauskite atitinkamą „Nustatymai“ nuorodą" -#: libraries/import.lib.php:1113 +#: libraries/import.lib.php:1125 msgid "Edit its structure by following the \"Structure\" link" msgstr "Keisti jo struktūrą spauskite „Struktūra“ nuorodą" -#: libraries/import.lib.php:1116 +#: libraries/import.lib.php:1128 msgid "Go to database" msgstr "Eiti į duomenų bazę" -#: libraries/import.lib.php:1119 libraries/import.lib.php:1143 +#: libraries/import.lib.php:1131 libraries/import.lib.php:1155 msgid "settings" msgstr "nustatymai" -#: libraries/import.lib.php:1138 +#: libraries/import.lib.php:1150 msgid "Go to table" msgstr "Eiti į lentelę" -#: libraries/import.lib.php:1147 +#: libraries/import.lib.php:1159 msgid "Go to view" msgstr "Eiti į rodinį (view)" @@ -6805,8 +6805,8 @@ msgid "" "The additional features for working with linked tables have been " "deactivated. To find out why click %shere%s." msgstr "" -"Nėra PMA lentelių, kurios leidžia dirbti su jungtinėmis MySQL lentelėmis. " -"%sPaaiškinimas%s." +"Nėra PMA lentelių, kurios leidžia dirbti su jungtinėmis MySQL lentelėmis. %" +"sPaaiškinimas%s." #: main.php:311 msgid "" @@ -7492,8 +7492,8 @@ msgstr "" 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 "" "Pastaba: phpMyAdmin gauna vartotojų teises tiesiai iš MySQL privilegijų " "lentelės. Šiose lentelėse nurodytos teisės gali skirtis nuo nustatymų " @@ -9040,7 +9040,7 @@ msgstr "" #: tbl_change.php:1106 #, php-format -msgid "Restart insertion with %s rows" +msgid "Continue insertion with %s rows" msgstr "" #: tbl_chart.php:56 diff --git a/po/lv.po b/po/lv.po index 3dc004d..6021203 100644 --- a/po/lv.po +++ b/po/lv.po @@ -3,14 +3,14 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-09-07 15:21+0200\n" +"POT-Creation-Date: 2010-09-10 12:46-0400\n" "PO-Revision-Date: 2010-03-12 09:16+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: latvian <lv(a)li.org>\n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: \n" "X-Generator: Translate Toolkit 1.5.3\n" #: browse_foreigners.php:36 browse_foreigners.php:57 @@ -609,7 +609,7 @@ msgstr "Pievienot" #: libraries/config/user_preferences.forms.php:228 #: libraries/config/user_preferences.forms.php:262 #: libraries/db_links.inc.php:48 libraries/export/latex.php:351 -#: libraries/import.lib.php:1136 libraries/tbl_links.inc.php:54 +#: libraries/import.lib.php:1148 libraries/tbl_links.inc.php:54 #: pmd_general.php:133 server_privileges.php:595 server_replication.php:313 #: tbl_create.php:305 tbl_tracking.php:263 msgid "Structure" @@ -658,8 +658,8 @@ msgstr "" #: db_structure.php:404 libraries/display_tbl.lib.php:1945 #, 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 "" #: db_structure.php:418 db_structure.php:432 libraries/header.inc.php:138 @@ -871,8 +871,8 @@ msgstr "Damps tika saglabāts failā %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 "" #: import.php:277 import.php:330 libraries/File.class.php:566 @@ -1577,8 +1577,8 @@ msgstr "Komentāri" #: libraries/Index.class.php:465 libraries/common.lib.php:610 #: libraries/common.lib.php:1143 libraries/config/messages.inc.php:459 -#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1119 -#: libraries/import.lib.php:1143 libraries/schema/User_Schema.class.php:168 +#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1131 +#: libraries/import.lib.php:1155 libraries/schema/User_Schema.class.php:168 #: setup/frames/index.inc.php:125 tbl_row_action.php:68 msgid "Edit" msgstr "Labot" @@ -1720,8 +1720,8 @@ msgstr "Laipni lūgti %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 "" #: libraries/auth/config.auth.lib.php:115 @@ -2127,7 +2127,7 @@ msgstr "Direktoija, kuru norādijāt augšupielādei, nav pieejama" #: libraries/config.values.php:95 libraries/export/htmlword.php:24 #: libraries/export/latex.php:41 libraries/export/odt.php:33 #: libraries/export/sql.php:79 libraries/export/texytext.php:23 -#: libraries/import.lib.php:1141 +#: libraries/import.lib.php:1153 #, fuzzy msgid "structure" msgstr "Struktūra" @@ -4548,8 +4548,8 @@ msgstr "" #, 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 "" #: libraries/display_export.lib.php:275 @@ -4727,7 +4727,7 @@ msgstr "Kārtot pēc atslēgas" #: libraries/export/sql.php:55 libraries/export/texytext.php:30 #: libraries/export/xls.php:28 libraries/export/xlsx.php:28 #: libraries/export/xml.php:25 libraries/export/yaml.php:29 -#: libraries/import.lib.php:1114 libraries/import.lib.php:1136 +#: libraries/import.lib.php:1126 libraries/import.lib.php:1148 #: libraries/import/csv.php:32 libraries/import/docsql.php:34 #: libraries/import/ldi.php:48 libraries/import/ods.php:32 #: libraries/import/sql.php:19 libraries/import/xls.php:27 @@ -5533,38 +5533,38 @@ msgstr "Uzģenerēja" msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL atgrieza tukšo rezultātu (0 rindas)." -#: libraries/import.lib.php:1110 +#: libraries/import.lib.php:1122 msgid "" "The following structures have either been created or altered. Here you can:" msgstr "" -#: libraries/import.lib.php:1111 +#: libraries/import.lib.php:1123 msgid "View a structure`s contents by clicking on its name" msgstr "" -#: libraries/import.lib.php:1112 +#: libraries/import.lib.php:1124 msgid "" "Change any of its settings by clicking the corresponding \"Options\" link" msgstr "" -#: libraries/import.lib.php:1113 +#: libraries/import.lib.php:1125 msgid "Edit its structure by following the \"Structure\" link" msgstr "" -#: libraries/import.lib.php:1116 +#: libraries/import.lib.php:1128 #, fuzzy msgid "Go to database" msgstr "Nav datubāzu" -#: libraries/import.lib.php:1119 libraries/import.lib.php:1143 +#: libraries/import.lib.php:1131 libraries/import.lib.php:1155 msgid "settings" msgstr "" -#: libraries/import.lib.php:1138 +#: libraries/import.lib.php:1150 msgid "Go to table" msgstr "" -#: libraries/import.lib.php:1147 +#: libraries/import.lib.php:1159 msgid "Go to view" msgstr "" @@ -7542,13 +7542,13 @@ msgstr "Dzēst datubāzes, kurām ir tādi paši vārdi, kā lietotājiem." 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 "" "Piezīme: phpMyAdmin saņem lietotāju privilēģijas pa taisno no MySQL " "privilēģiju tabilām. Šo tabulu saturs var atšķirties no privilēģijām, ko " -"lieto serveris, ja tur tika veikti labojumi. Šajā gadījumā ir nepieciešams " -"%spārlādēt privilēģijas%s pirms Jūs turpināt." +"lieto serveris, ja tur tika veikti labojumi. Šajā gadījumā ir nepieciešams %" +"spārlādēt privilēģijas%s pirms Jūs turpināt." #: server_privileges.php:1776 msgid "The selected user was not found in the privilege table." @@ -9019,7 +9019,7 @@ msgstr "" #: tbl_change.php:1106 #, php-format -msgid "Restart insertion with %s rows" +msgid "Continue insertion with %s rows" msgstr "" #: tbl_chart.php:56 diff --git a/po/mk.po b/po/mk.po index 75ceeb2..9542f20 100644 --- a/po/mk.po +++ b/po/mk.po @@ -3,14 +3,14 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-09-07 15:21+0200\n" +"POT-Creation-Date: 2010-09-10 12:46-0400\n" "PO-Revision-Date: 2010-03-12 09:16+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: macedonian_cyrillic <mk(a)li.org>\n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: \n" "X-Generator: Translate Toolkit 1.5.3\n" #: browse_foreigners.php:36 browse_foreigners.php:57 @@ -609,7 +609,7 @@ msgstr "Нов запис" #: libraries/config/user_preferences.forms.php:228 #: libraries/config/user_preferences.forms.php:262 #: libraries/db_links.inc.php:48 libraries/export/latex.php:351 -#: libraries/import.lib.php:1136 libraries/tbl_links.inc.php:54 +#: libraries/import.lib.php:1148 libraries/tbl_links.inc.php:54 #: pmd_general.php:133 server_privileges.php:595 server_replication.php:313 #: tbl_create.php:305 tbl_tracking.php:263 msgid "Structure" @@ -658,8 +658,8 @@ msgstr "" #: db_structure.php:404 libraries/display_tbl.lib.php:1945 #, 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 "" #: db_structure.php:418 db_structure.php:432 libraries/header.inc.php:138 @@ -871,8 +871,8 @@ msgstr "Содржината на базата на податоци е сочу #: 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 "" #: import.php:277 import.php:330 libraries/File.class.php:566 @@ -1577,8 +1577,8 @@ msgstr "Коментари" #: libraries/Index.class.php:465 libraries/common.lib.php:610 #: libraries/common.lib.php:1143 libraries/config/messages.inc.php:459 -#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1119 -#: libraries/import.lib.php:1143 libraries/schema/User_Schema.class.php:168 +#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1131 +#: libraries/import.lib.php:1155 libraries/schema/User_Schema.class.php:168 #: setup/frames/index.inc.php:125 tbl_row_action.php:68 msgid "Edit" msgstr "Промени" @@ -1720,8 +1720,8 @@ msgstr "%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 "" #: libraries/auth/config.auth.lib.php:115 @@ -2132,7 +2132,7 @@ msgstr "Директориумот кој го избравте за праќа #: libraries/config.values.php:95 libraries/export/htmlword.php:24 #: libraries/export/latex.php:41 libraries/export/odt.php:33 #: libraries/export/sql.php:79 libraries/export/texytext.php:23 -#: libraries/import.lib.php:1141 +#: libraries/import.lib.php:1153 #, fuzzy msgid "structure" msgstr "Структура" @@ -4564,8 +4564,8 @@ msgstr "" #, 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 "" #: libraries/display_export.lib.php:275 @@ -4743,7 +4743,7 @@ msgstr "Подредување по клуч" #: libraries/export/sql.php:55 libraries/export/texytext.php:30 #: libraries/export/xls.php:28 libraries/export/xlsx.php:28 #: libraries/export/xml.php:25 libraries/export/yaml.php:29 -#: libraries/import.lib.php:1114 libraries/import.lib.php:1136 +#: libraries/import.lib.php:1126 libraries/import.lib.php:1148 #: libraries/import/csv.php:32 libraries/import/docsql.php:34 #: libraries/import/ldi.php:48 libraries/import/ods.php:32 #: libraries/import/sql.php:19 libraries/import/xls.php:27 @@ -5570,38 +5570,38 @@ msgstr "Генерирал" msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL врати празен резултат (нула записи)." -#: libraries/import.lib.php:1110 +#: libraries/import.lib.php:1122 msgid "" "The following structures have either been created or altered. Here you can:" msgstr "" -#: libraries/import.lib.php:1111 +#: libraries/import.lib.php:1123 msgid "View a structure`s contents by clicking on its name" msgstr "" -#: libraries/import.lib.php:1112 +#: libraries/import.lib.php:1124 msgid "" "Change any of its settings by clicking the corresponding \"Options\" link" msgstr "" -#: libraries/import.lib.php:1113 +#: libraries/import.lib.php:1125 msgid "Edit its structure by following the \"Structure\" link" msgstr "" -#: libraries/import.lib.php:1116 +#: libraries/import.lib.php:1128 #, fuzzy msgid "Go to database" msgstr "Базата на податоци не постои" -#: libraries/import.lib.php:1119 libraries/import.lib.php:1143 +#: libraries/import.lib.php:1131 libraries/import.lib.php:1155 msgid "settings" msgstr "" -#: libraries/import.lib.php:1138 +#: libraries/import.lib.php:1150 msgid "Go to table" msgstr "" -#: libraries/import.lib.php:1147 +#: libraries/import.lib.php:1159 msgid "Go to view" msgstr "" @@ -7608,8 +7608,8 @@ msgstr "" 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 "" "Напомена: phpMyAdmin ги зема привилегиите на корисникот директно од MySQL " "табелата на привилегии. Содржината на оваа табела табела може да се " @@ -9085,7 +9085,7 @@ msgstr "" #: tbl_change.php:1106 #, php-format -msgid "Restart insertion with %s rows" +msgid "Continue insertion with %s rows" msgstr "" #: tbl_chart.php:56 diff --git a/po/mn.po b/po/mn.po index 041a28b..df52975 100644 --- a/po/mn.po +++ b/po/mn.po @@ -3,14 +3,14 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-09-07 15:21+0200\n" +"POT-Creation-Date: 2010-09-10 12:46-0400\n" "PO-Revision-Date: 2010-03-12 09:17+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: mongolian <mn(a)li.org>\n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: \n" "X-Generator: Translate Toolkit 1.5.3\n" #: browse_foreigners.php:36 browse_foreigners.php:57 @@ -609,7 +609,7 @@ msgstr "Оруулах" #: libraries/config/user_preferences.forms.php:228 #: libraries/config/user_preferences.forms.php:262 #: libraries/db_links.inc.php:48 libraries/export/latex.php:351 -#: libraries/import.lib.php:1136 libraries/tbl_links.inc.php:54 +#: libraries/import.lib.php:1148 libraries/tbl_links.inc.php:54 #: pmd_general.php:133 server_privileges.php:595 server_replication.php:313 #: tbl_create.php:305 tbl_tracking.php:263 msgid "Structure" @@ -658,8 +658,8 @@ msgstr "" #: db_structure.php:404 libraries/display_tbl.lib.php:1945 #, 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 "" #: db_structure.php:418 db_structure.php:432 libraries/header.inc.php:138 @@ -864,8 +864,8 @@ msgstr "Асгалт %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 "" #: import.php:277 import.php:330 libraries/File.class.php:566 @@ -1569,8 +1569,8 @@ msgstr "" #: libraries/Index.class.php:465 libraries/common.lib.php:610 #: libraries/common.lib.php:1143 libraries/config/messages.inc.php:459 -#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1119 -#: libraries/import.lib.php:1143 libraries/schema/User_Schema.class.php:168 +#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1131 +#: libraries/import.lib.php:1155 libraries/schema/User_Schema.class.php:168 #: setup/frames/index.inc.php:125 tbl_row_action.php:68 msgid "Edit" msgstr "Засах" @@ -1712,11 +1712,11 @@ msgstr "%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 "" -"Үүний шалтгаан нь магадгүй та тохиргооны файл үүсгээгүй байж болох юм. Та " -"%1$ssetup script%2$s -ийг ашиглаж нэгийг үүсгэж болно." +"Үүний шалтгаан нь магадгүй та тохиргооны файл үүсгээгүй байж болох юм. Та %1" +"$ssetup script%2$s -ийг ашиглаж нэгийг үүсгэж болно." #: libraries/auth/config.auth.lib.php:115 msgid "" @@ -2120,7 +2120,7 @@ msgstr "Таны сонгосон хавтас \"upload\" хийгдэхгүй #: libraries/config.values.php:95 libraries/export/htmlword.php:24 #: libraries/export/latex.php:41 libraries/export/odt.php:33 #: libraries/export/sql.php:79 libraries/export/texytext.php:23 -#: libraries/import.lib.php:1141 +#: libraries/import.lib.php:1153 msgid "structure" msgstr "" @@ -4533,12 +4533,12 @@ msgstr "" #| "happen: %3$s. Other text will be kept as is." 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 "" "Энэ утга нь %1$sstrftime%2$s -ийг хэрэглэж үүссэн, тиймээс та хугацааны " -"тогтнолын тэмдэгтийг хэрэглэж болно. Нэмэлтээр дараах хувиргалт байх болно: " -"%3$s. Бусад бичвэрүүд үүн шиг хадгалагдана." +"тогтнолын тэмдэгтийг хэрэглэж болно. Нэмэлтээр дараах хувиргалт байх болно: %" +"3$s. Бусад бичвэрүүд үүн шиг хадгалагдана." #: libraries/display_export.lib.php:275 msgid "use this for future exports" @@ -4727,7 +4727,7 @@ msgstr "Түлхүүрээр эрэмбэлэх" #: libraries/export/sql.php:55 libraries/export/texytext.php:30 #: libraries/export/xls.php:28 libraries/export/xlsx.php:28 #: libraries/export/xml.php:25 libraries/export/yaml.php:29 -#: libraries/import.lib.php:1114 libraries/import.lib.php:1136 +#: libraries/import.lib.php:1126 libraries/import.lib.php:1148 #: libraries/import/csv.php:32 libraries/import/docsql.php:34 #: libraries/import/ldi.php:48 libraries/import/ods.php:32 #: libraries/import/sql.php:19 libraries/import/xls.php:27 @@ -5544,37 +5544,37 @@ msgstr "Үүсгэгч" msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL хоосон үр дүн буцаалаа (тэг мөрүүд г.м.)." -#: libraries/import.lib.php:1110 +#: libraries/import.lib.php:1122 msgid "" "The following structures have either been created or altered. Here you can:" msgstr "" -#: libraries/import.lib.php:1111 +#: libraries/import.lib.php:1123 msgid "View a structure`s contents by clicking on its name" msgstr "" -#: libraries/import.lib.php:1112 +#: libraries/import.lib.php:1124 msgid "" "Change any of its settings by clicking the corresponding \"Options\" link" msgstr "" -#: libraries/import.lib.php:1113 +#: libraries/import.lib.php:1125 msgid "Edit its structure by following the \"Structure\" link" msgstr "" -#: libraries/import.lib.php:1116 +#: libraries/import.lib.php:1128 msgid "Go to database" msgstr "" -#: libraries/import.lib.php:1119 libraries/import.lib.php:1143 +#: libraries/import.lib.php:1131 libraries/import.lib.php:1155 msgid "settings" msgstr "" -#: libraries/import.lib.php:1138 +#: libraries/import.lib.php:1150 msgid "Go to table" msgstr "" -#: libraries/import.lib.php:1147 +#: libraries/import.lib.php:1159 msgid "Go to view" msgstr "" @@ -7547,8 +7547,8 @@ msgstr "Хэрэглэгчтэй адил нэртэй өгөгдлийн сан 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 "" "Тэмдэглэл: phpMyAdmin нь MySQL-ийн онцгой эрхийн хүснэгтээс хэрэглэгчдийн " "онцгой эрхийг авна. Хэрэв тэд гараар өөрчлөгдсөн бол эдгээр хүснэгтийн " @@ -9055,7 +9055,7 @@ msgstr "" #: tbl_change.php:1106 #, php-format -msgid "Restart insertion with %s rows" +msgid "Continue insertion with %s rows" msgstr "" #: tbl_chart.php:56 diff --git a/po/ms.po b/po/ms.po index a261d0d..8c4db5f 100644 --- a/po/ms.po +++ b/po/ms.po @@ -3,14 +3,14 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-09-07 15:21+0200\n" +"POT-Creation-Date: 2010-09-10 12:46-0400\n" "PO-Revision-Date: 2010-03-12 09:17+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: malay <ms(a)li.org>\n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: \n" "X-Generator: Translate Toolkit 1.5.3\n" #: browse_foreigners.php:36 browse_foreigners.php:57 @@ -612,7 +612,7 @@ msgstr "Selit" #: libraries/config/user_preferences.forms.php:228 #: libraries/config/user_preferences.forms.php:262 #: libraries/db_links.inc.php:48 libraries/export/latex.php:351 -#: libraries/import.lib.php:1136 libraries/tbl_links.inc.php:54 +#: libraries/import.lib.php:1148 libraries/tbl_links.inc.php:54 #: pmd_general.php:133 server_privileges.php:595 server_replication.php:313 #: tbl_create.php:305 tbl_tracking.php:263 msgid "Structure" @@ -661,8 +661,8 @@ msgstr "" #: db_structure.php:404 libraries/display_tbl.lib.php:1945 #, 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 "" #: db_structure.php:418 db_structure.php:432 libraries/header.inc.php:138 @@ -871,8 +871,8 @@ msgstr "" #: 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 "" #: import.php:277 import.php:330 libraries/File.class.php:566 @@ -1568,8 +1568,8 @@ msgstr "Komen" #: libraries/Index.class.php:465 libraries/common.lib.php:610 #: libraries/common.lib.php:1143 libraries/config/messages.inc.php:459 -#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1119 -#: libraries/import.lib.php:1143 libraries/schema/User_Schema.class.php:168 +#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1131 +#: libraries/import.lib.php:1155 libraries/schema/User_Schema.class.php:168 #: setup/frames/index.inc.php:125 tbl_row_action.php:68 msgid "Edit" msgstr "Ubah" @@ -1709,8 +1709,8 @@ msgstr "Selamat Datang ke %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 "" #: libraries/auth/config.auth.lib.php:115 @@ -2109,7 +2109,7 @@ msgstr "Direktori muatnaik yang telah ditetapkan tidak dapat dicapai" #: libraries/config.values.php:95 libraries/export/htmlword.php:24 #: libraries/export/latex.php:41 libraries/export/odt.php:33 #: libraries/export/sql.php:79 libraries/export/texytext.php:23 -#: libraries/import.lib.php:1141 +#: libraries/import.lib.php:1153 #, fuzzy msgid "structure" msgstr "Struktur" @@ -4508,8 +4508,8 @@ msgstr "" #, 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 "" #: libraries/display_export.lib.php:275 @@ -4687,7 +4687,7 @@ msgstr "" #: libraries/export/sql.php:55 libraries/export/texytext.php:30 #: libraries/export/xls.php:28 libraries/export/xlsx.php:28 #: libraries/export/xml.php:25 libraries/export/yaml.php:29 -#: libraries/import.lib.php:1114 libraries/import.lib.php:1136 +#: libraries/import.lib.php:1126 libraries/import.lib.php:1148 #: libraries/import/csv.php:32 libraries/import/docsql.php:34 #: libraries/import/ldi.php:48 libraries/import/ods.php:32 #: libraries/import/sql.php:19 libraries/import/xls.php:27 @@ -5480,38 +5480,38 @@ msgstr "Dijana oleh" msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL memulangkan set hasil kosong (i.e. sifar baris)" -#: libraries/import.lib.php:1110 +#: libraries/import.lib.php:1122 msgid "" "The following structures have either been created or altered. Here you can:" msgstr "" -#: libraries/import.lib.php:1111 +#: libraries/import.lib.php:1123 msgid "View a structure`s contents by clicking on its name" msgstr "" -#: libraries/import.lib.php:1112 +#: libraries/import.lib.php:1124 msgid "" "Change any of its settings by clicking the corresponding \"Options\" link" msgstr "" -#: libraries/import.lib.php:1113 +#: libraries/import.lib.php:1125 msgid "Edit its structure by following the \"Structure\" link" msgstr "" -#: libraries/import.lib.php:1116 +#: libraries/import.lib.php:1128 #, fuzzy msgid "Go to database" msgstr "Tiada pangkalan data" -#: libraries/import.lib.php:1119 libraries/import.lib.php:1143 +#: libraries/import.lib.php:1131 libraries/import.lib.php:1155 msgid "settings" msgstr "" -#: libraries/import.lib.php:1138 +#: libraries/import.lib.php:1150 msgid "Go to table" msgstr "" -#: libraries/import.lib.php:1147 +#: libraries/import.lib.php:1159 msgid "Go to view" msgstr "" @@ -7411,8 +7411,8 @@ msgstr "" 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 "" #: server_privileges.php:1776 @@ -8877,7 +8877,7 @@ msgstr "" #: tbl_change.php:1106 #, php-format -msgid "Restart insertion with %s rows" +msgid "Continue insertion with %s rows" msgstr "" #: tbl_chart.php:56 diff --git a/po/nb.po b/po/nb.po index 8b56563..a3f4836 100644 --- a/po/nb.po +++ b/po/nb.po @@ -3,14 +3,14 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-09-07 15:21+0200\n" +"POT-Creation-Date: 2010-09-10 12:46-0400\n" "PO-Revision-Date: 2010-09-09 10:40+0200\n" "Last-Translator: <sven.erik.andersen(a)gmail.com>\n" "Language-Team: norwegian <no(a)li.org>\n" -"Language: nb\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: nb\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.5\n" @@ -589,7 +589,7 @@ msgstr "Sett inn" #: libraries/config/user_preferences.forms.php:228 #: libraries/config/user_preferences.forms.php:262 #: libraries/db_links.inc.php:48 libraries/export/latex.php:351 -#: libraries/import.lib.php:1136 libraries/tbl_links.inc.php:54 +#: libraries/import.lib.php:1148 libraries/tbl_links.inc.php:54 #: pmd_general.php:133 server_privileges.php:595 server_replication.php:313 #: tbl_create.php:305 tbl_tracking.php:263 msgid "Structure" @@ -638,8 +638,8 @@ msgstr "Overvåkning er ikke aktiv." #: db_structure.php:404 libraries/display_tbl.lib.php:1945 #, 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 "Denne visningen har minst dette antall rader. Sjekk %sdocumentation%s." #: db_structure.php:418 db_structure.php:432 libraries/header.inc.php:138 @@ -845,8 +845,8 @@ msgstr "Dump har blitt lagret til fila %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 "" "Du forsøkte sansynligvis å laste opp en for stor fil. Sjekk %sdokumentasjonen" "%s for måter å omgå denne begrensningen." @@ -1485,8 +1485,8 @@ msgstr "Kommentar" #: libraries/Index.class.php:465 libraries/common.lib.php:610 #: libraries/common.lib.php:1143 libraries/config/messages.inc.php:459 -#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1119 -#: libraries/import.lib.php:1143 libraries/schema/User_Schema.class.php:168 +#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1131 +#: libraries/import.lib.php:1155 libraries/schema/User_Schema.class.php:168 #: setup/frames/index.inc.php:125 tbl_row_action.php:68 msgid "Edit" msgstr "Rediger" @@ -1629,8 +1629,8 @@ msgstr "Velkommen til %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 "" "En mulig årsak for dette er at du ikke opprettet konfigurasjonsfila. Du bør " "kanskje bruke %1$ssetup script%2$s for å opprette en." @@ -2031,7 +2031,7 @@ msgstr "Katalogen du anga for opplasting kan ikke nåes" #: libraries/config.values.php:95 libraries/export/htmlword.php:24 #: libraries/export/latex.php:41 libraries/export/odt.php:33 #: libraries/export/sql.php:79 libraries/export/texytext.php:23 -#: libraries/import.lib.php:1141 +#: libraries/import.lib.php:1153 msgid "structure" msgstr "struktur" @@ -2044,7 +2044,6 @@ msgstr "data" #: libraries/config.values.php:97 libraries/export/htmlword.php:24 #: libraries/export/latex.php:41 libraries/export/odt.php:33 #: libraries/export/sql.php:79 libraries/export/texytext.php:23 -#| msgid "Structure and data" msgid "structure and data" msgstr "struktur og data" @@ -2067,7 +2066,6 @@ msgid "complete inserts" msgstr "Komplette innlegg" #: libraries/config.values.php:120 -#| msgid "Extended inserts" msgid "extended inserts" msgstr "Utvidete innlegg" @@ -2113,7 +2111,6 @@ msgstr "Mangler data for %s" #: libraries/config/FormDisplay.class.php:727 #: libraries/config/FormDisplay.class.php:731 -#| msgid "Variable" msgid "unavailable" msgstr "ikke tilgjengelig" @@ -2138,13 +2135,11 @@ msgid "SQL Validator is disabled" msgstr "SQL Validator er avslått" #: libraries/config/FormDisplay.class.php:764 -#| msgid "PHP extension to use" msgid "SOAP extension not found" msgstr "SOAP tillegg ble ikke funnet" #: libraries/config/FormDisplay.class.php:772 #, php-format -#| msgid "Maximum tables" msgid "maximum %s" msgstr "maksimum %s" @@ -4594,8 +4589,8 @@ msgstr "" #| "happen: %3$s. Other text will be kept as is." 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 "" "Denne verdien blir tolket slik som %1$sstrftime%2$s, så du kan bruke " "tidformateringsstrenger. I tillegg vil følgende transformasjoner skje: %3$s. " @@ -4796,7 +4791,7 @@ msgstr "Sorter etter nøkkel" #: libraries/export/sql.php:55 libraries/export/texytext.php:30 #: libraries/export/xls.php:28 libraries/export/xlsx.php:28 #: libraries/export/xml.php:25 libraries/export/yaml.php:29 -#: libraries/import.lib.php:1114 libraries/import.lib.php:1136 +#: libraries/import.lib.php:1126 libraries/import.lib.php:1148 #: libraries/import/csv.php:32 libraries/import/docsql.php:34 #: libraries/import/ldi.php:48 libraries/import/ods.php:32 #: libraries/import/sql.php:19 libraries/import/xls.php:27 @@ -5646,40 +5641,40 @@ msgstr "Generert av" msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL returnerte ett tomt resultat (m.a.o. ingen rader)." -#: libraries/import.lib.php:1110 +#: libraries/import.lib.php:1122 msgid "" "The following structures have either been created or altered. Here you can:" msgstr "" "Følgende strukturer har enten blitt opprettet eller endret. Her kan du:" -#: libraries/import.lib.php:1111 +#: libraries/import.lib.php:1123 msgid "View a structure`s contents by clicking on its name" msgstr "Vis en strukturs innhold ved å klikke på dens navn" -#: libraries/import.lib.php:1112 +#: libraries/import.lib.php:1124 msgid "" "Change any of its settings by clicking the corresponding \"Options\" link" msgstr "" "Endre noen av dens innstillinger ved å klikke på den tilhørende " "\"Innstillinger\" link" -#: libraries/import.lib.php:1113 +#: libraries/import.lib.php:1125 msgid "Edit its structure by following the \"Structure\" link" msgstr "Endre dens struktur ved å følge \"Struktur\" linken" -#: libraries/import.lib.php:1116 +#: libraries/import.lib.php:1128 msgid "Go to database" msgstr "Gå til database" -#: libraries/import.lib.php:1119 libraries/import.lib.php:1143 +#: libraries/import.lib.php:1131 libraries/import.lib.php:1155 msgid "settings" msgstr "innstillinger" -#: libraries/import.lib.php:1138 +#: libraries/import.lib.php:1150 msgid "Go to table" msgstr "Gå til tabell" -#: libraries/import.lib.php:1147 +#: libraries/import.lib.php:1159 msgid "Go to view" msgstr "Gå til visning" @@ -6590,8 +6585,8 @@ msgid "" "For a list of available transformation options and their MIME type " "transformations, click on %stransformation descriptions%s" msgstr "" -"For en liste over tilgjengelige transformasjonsvalg, klikk på " -"%stransformasjonsbeskrivelser%s" +"For en liste over tilgjengelige transformasjonsvalg, klikk på %" +"stransformasjonsbeskrivelser%s" #: libraries/tbl_properties.inc.php:143 msgid "Transformation options" @@ -7651,8 +7646,8 @@ msgstr "Slett databasene som har det samme navnet som brukerne." 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 "" "Merk: phpMyAdmin får brukerprivilegiene direkte fra MySQL " "privilegietabeller. Innholdet i disse tabellene kan være forskjellig fra de " @@ -9147,8 +9142,8 @@ msgid "" "to." msgstr "" "Hvis du føler at dette er nødvending, så bruk ekstra " -"beskyttelsesinnstillinger - [a@?page=servers&mode=edit&id=" -"%1$d#tab_Server_config]vertsautentisering[/a] innstillinger og [a@?" +"beskyttelsesinnstillinger - [a@?page=servers&mode=edit&id=%1" +"$d#tab_Server_config]vertsautentisering[/a] innstillinger og [a@?" "page=form&formset=features#tab_Security]godkjente mellomlagerliste[/a]. " "Merk at IP-basert beskyttelse ikke er så god hvis din IP tilhører en " "Internettilbyder som har tusenvis av brukere, inkludert deg, tilknyttet." @@ -9304,8 +9299,9 @@ msgstr "" "å bevege deg hvor som helst" #: tbl_change.php:1106 -#, php-format -msgid "Restart insertion with %s rows" +#, fuzzy, php-format +#| msgid "Restart insertion with %s rows" +msgid "Continue insertion with %s rows" msgstr "Restarte innsettinga med %s rader" #: tbl_chart.php:56 diff --git a/po/nl.po b/po/nl.po index 4830ec3..87449f2 100644 --- a/po/nl.po +++ b/po/nl.po @@ -3,14 +3,14 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-09-07 15:21+0200\n" +"POT-Creation-Date: 2010-09-10 12:46-0400\n" "PO-Revision-Date: 2010-08-27 12:34+0200\n" "Last-Translator: Herman van Rink <rink(a)initfour.nl>\n" "Language-Team: dutch <nl(a)li.org>\n" -"Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: nl\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.5\n" @@ -609,7 +609,7 @@ msgstr "Invoegen" #: libraries/config/user_preferences.forms.php:228 #: libraries/config/user_preferences.forms.php:262 #: libraries/db_links.inc.php:48 libraries/export/latex.php:351 -#: libraries/import.lib.php:1136 libraries/tbl_links.inc.php:54 +#: libraries/import.lib.php:1148 libraries/tbl_links.inc.php:54 #: pmd_general.php:133 server_privileges.php:595 server_replication.php:313 #: tbl_create.php:305 tbl_tracking.php:263 msgid "Structure" @@ -658,8 +658,8 @@ msgstr "Tracking is niet actief." #: db_structure.php:404 libraries/display_tbl.lib.php:1945 #, 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 "" "Deze view heeft minimaal deze hoeveelheid aan rijen. Zie de %sdocumentatie%s." @@ -867,11 +867,11 @@ msgstr "Dump is bewaard als %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 "" -"U probeerde waarschijnlijk een bestand dat te groot is te uploaden. Zie de " -"%sdocumentatie%s voor mogelijkheden om dit te omzeilen." +"U probeerde waarschijnlijk een bestand dat te groot is te uploaden. Zie de %" +"sdocumentatie%s voor mogelijkheden om dit te omzeilen." #: import.php:277 import.php:330 libraries/File.class.php:566 #: libraries/File.class.php:676 @@ -1567,8 +1567,8 @@ msgstr "Opmerking" #: libraries/Index.class.php:465 libraries/common.lib.php:610 #: libraries/common.lib.php:1143 libraries/config/messages.inc.php:459 -#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1119 -#: libraries/import.lib.php:1143 libraries/schema/User_Schema.class.php:168 +#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1131 +#: libraries/import.lib.php:1155 libraries/schema/User_Schema.class.php:168 #: setup/frames/index.inc.php:125 tbl_row_action.php:68 msgid "Edit" msgstr "Wijzig" @@ -1712,8 +1712,8 @@ msgstr "Welkom op %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 "" "U heeft waarschijnlijk geen configuratiebestand aangemaakt. Het beste kunt u " "%1$ssetup script%2$s gebruiken om een te maken." @@ -2130,7 +2130,7 @@ msgstr "" #: libraries/config.values.php:95 libraries/export/htmlword.php:24 #: libraries/export/latex.php:41 libraries/export/odt.php:33 #: libraries/export/sql.php:79 libraries/export/texytext.php:23 -#: libraries/import.lib.php:1141 +#: libraries/import.lib.php:1153 msgid "structure" msgstr "structuur" @@ -4781,8 +4781,8 @@ msgstr "" #| "happen: %3$s. Other text will be kept as is." 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 "" "Deze waarde wordt geïnterpreteerd met behulp van %1$sstrftime%2$s, het " "gebruik van opmaakcodes is dan ook toegestaan. Daarnaast worden de volgende " @@ -4985,7 +4985,7 @@ msgstr "Sorteren op sleutel" #: libraries/export/sql.php:55 libraries/export/texytext.php:30 #: libraries/export/xls.php:28 libraries/export/xlsx.php:28 #: libraries/export/xml.php:25 libraries/export/yaml.php:29 -#: libraries/import.lib.php:1114 libraries/import.lib.php:1136 +#: libraries/import.lib.php:1126 libraries/import.lib.php:1148 #: libraries/import/csv.php:32 libraries/import/docsql.php:34 #: libraries/import/ldi.php:48 libraries/import/ods.php:32 #: libraries/import/sql.php:19 libraries/import/xls.php:27 @@ -5848,37 +5848,37 @@ msgstr "Gegenereerd door" msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL gaf een lege resultaat set terug (0 rijen)." -#: libraries/import.lib.php:1110 +#: libraries/import.lib.php:1122 msgid "" "The following structures have either been created or altered. Here you can:" msgstr "De volgende structuren zijn aangemaakt of aangepast. Hier kunt u:" -#: libraries/import.lib.php:1111 +#: libraries/import.lib.php:1123 msgid "View a structure`s contents by clicking on its name" msgstr "De inhoud van een structuur bekijken door er op te klikken" -#: libraries/import.lib.php:1112 +#: libraries/import.lib.php:1124 msgid "" "Change any of its settings by clicking the corresponding \"Options\" link" msgstr "Een instelling veranderen door op \"Opties\" te klikken" -#: libraries/import.lib.php:1113 +#: libraries/import.lib.php:1125 msgid "Edit its structure by following the \"Structure\" link" msgstr "Klik op de \"Structuur\"-koppeling om de structuur aan te passen" -#: libraries/import.lib.php:1116 +#: libraries/import.lib.php:1128 msgid "Go to database" msgstr "Ga naar database" -#: libraries/import.lib.php:1119 libraries/import.lib.php:1143 +#: libraries/import.lib.php:1131 libraries/import.lib.php:1155 msgid "settings" msgstr "instellingen" -#: libraries/import.lib.php:1138 +#: libraries/import.lib.php:1150 msgid "Go to table" msgstr "Ga naar tabel" -#: libraries/import.lib.php:1147 +#: libraries/import.lib.php:1159 msgid "Go to view" msgstr "Ga naar view" @@ -7947,8 +7947,8 @@ msgstr "Verwijder de databases die dezelfde naam hebben als de gebruikers." 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 "" "Opmerking: phpMyAdmin krijgt de rechten voor de gebruikers uit de MySQL " "privileges tabel. De content van deze tabel kan verschillen met de rechten " @@ -9642,8 +9642,9 @@ msgstr "" "om vrijuit te navigeren" #: tbl_change.php:1106 -#, php-format -msgid "Restart insertion with %s rows" +#, fuzzy, php-format +#| msgid "Restart insertion with %s rows" +msgid "Continue insertion with %s rows" msgstr "Herstart het invoegen met %s rijen" #: tbl_chart.php:56 diff --git a/po/phpmyadmin.pot b/po/phpmyadmin.pot index 12c2ba2..bd4e54f 100644 --- a/po/phpmyadmin.pot +++ b/po/phpmyadmin.pot @@ -8,11 +8,10 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-09-07 15:21+0200\n" +"POT-Creation-Date: 2010-09-10 12:46-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" @@ -590,7 +589,7 @@ msgstr "" #: libraries/config/user_preferences.forms.php:228 #: libraries/config/user_preferences.forms.php:262 #: libraries/db_links.inc.php:48 libraries/export/latex.php:351 -#: libraries/import.lib.php:1136 libraries/tbl_links.inc.php:54 +#: libraries/import.lib.php:1148 libraries/tbl_links.inc.php:54 #: pmd_general.php:133 server_privileges.php:595 server_replication.php:313 #: tbl_create.php:305 tbl_tracking.php:263 msgid "Structure" @@ -639,8 +638,8 @@ msgstr "" #: db_structure.php:404 libraries/display_tbl.lib.php:1945 #, possible-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 "" #: db_structure.php:418 db_structure.php:432 libraries/header.inc.php:138 @@ -844,8 +843,8 @@ msgstr "" #: import.php:58 #, possible-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 "" #: import.php:277 import.php:330 libraries/File.class.php:566 @@ -1463,8 +1462,8 @@ msgstr "" #: libraries/Index.class.php:465 libraries/common.lib.php:610 #: libraries/common.lib.php:1143 libraries/config/messages.inc.php:459 -#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1119 -#: libraries/import.lib.php:1143 libraries/schema/User_Schema.class.php:168 +#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1131 +#: libraries/import.lib.php:1155 libraries/schema/User_Schema.class.php:168 #: setup/frames/index.inc.php:125 tbl_row_action.php:68 msgid "Edit" msgstr "" @@ -1604,8 +1603,8 @@ msgstr "" #: libraries/auth/config.auth.lib.php:106 #, possible-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 "" #: libraries/auth/config.auth.lib.php:115 @@ -1991,7 +1990,7 @@ msgstr "" #: libraries/config.values.php:95 libraries/export/htmlword.php:24 #: libraries/export/latex.php:41 libraries/export/odt.php:33 #: libraries/export/sql.php:79 libraries/export/texytext.php:23 -#: libraries/import.lib.php:1141 +#: libraries/import.lib.php:1153 msgid "structure" msgstr "" @@ -4289,8 +4288,8 @@ msgstr "" #, possible-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 "" #: libraries/display_export.lib.php:275 @@ -4452,7 +4451,7 @@ msgstr "" #: libraries/export/sql.php:55 libraries/export/texytext.php:30 #: libraries/export/xls.php:28 libraries/export/xlsx.php:28 #: libraries/export/xml.php:25 libraries/export/yaml.php:29 -#: libraries/import.lib.php:1114 libraries/import.lib.php:1136 +#: libraries/import.lib.php:1126 libraries/import.lib.php:1148 #: libraries/import/csv.php:32 libraries/import/docsql.php:34 #: libraries/import/ldi.php:48 libraries/import/ods.php:32 #: libraries/import/sql.php:19 libraries/import/xls.php:27 @@ -5211,37 +5210,37 @@ msgstr "" msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "" -#: libraries/import.lib.php:1110 +#: libraries/import.lib.php:1122 msgid "" "The following structures have either been created or altered. Here you can:" msgstr "" -#: libraries/import.lib.php:1111 +#: libraries/import.lib.php:1123 msgid "View a structure`s contents by clicking on its name" msgstr "" -#: libraries/import.lib.php:1112 +#: libraries/import.lib.php:1124 msgid "" "Change any of its settings by clicking the corresponding \"Options\" link" msgstr "" -#: libraries/import.lib.php:1113 +#: libraries/import.lib.php:1125 msgid "Edit its structure by following the \"Structure\" link" msgstr "" -#: libraries/import.lib.php:1116 +#: libraries/import.lib.php:1128 msgid "Go to database" msgstr "" -#: libraries/import.lib.php:1119 libraries/import.lib.php:1143 +#: libraries/import.lib.php:1131 libraries/import.lib.php:1155 msgid "settings" msgstr "" -#: libraries/import.lib.php:1138 +#: libraries/import.lib.php:1150 msgid "Go to table" msgstr "" -#: libraries/import.lib.php:1147 +#: libraries/import.lib.php:1159 msgid "Go to view" msgstr "" @@ -7042,8 +7041,8 @@ msgstr "" 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 "" #: server_privileges.php:1776 @@ -8481,7 +8480,7 @@ msgstr "" #: tbl_change.php:1106 #, possible-php-format -msgid "Restart insertion with %s rows" +msgid "Continue insertion with %s rows" msgstr "" #: tbl_chart.php:56 diff --git a/po/pl.po b/po/pl.po index dd1947f..3e949ab 100644 --- a/po/pl.po +++ b/po/pl.po @@ -3,14 +3,14 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-09-07 15:21+0200\n" +"POT-Creation-Date: 2010-09-10 12:46-0400\n" "PO-Revision-Date: 2010-07-22 02:29+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: polish <pl(a)li.org>\n" -"Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: pl\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" "X-Generator: Pootle 2.0.1\n" @@ -613,7 +613,7 @@ msgstr "Dodaj" #: libraries/config/user_preferences.forms.php:228 #: libraries/config/user_preferences.forms.php:262 #: libraries/db_links.inc.php:48 libraries/export/latex.php:351 -#: libraries/import.lib.php:1136 libraries/tbl_links.inc.php:54 +#: libraries/import.lib.php:1148 libraries/tbl_links.inc.php:54 #: pmd_general.php:133 server_privileges.php:595 server_replication.php:313 #: tbl_create.php:305 tbl_tracking.php:263 msgid "Structure" @@ -662,11 +662,11 @@ msgstr "" #: db_structure.php:404 libraries/display_tbl.lib.php:1945 #, 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 "" -"Ta perspektywa ma przynajmniej tyle wierszy. Więcej informacji w " -"%sdocumentation%s." +"Ta perspektywa ma przynajmniej tyle wierszy. Więcej informacji w %" +"sdocumentation%s." #: db_structure.php:418 db_structure.php:432 libraries/header.inc.php:138 #: libraries/tbl_info.inc.php:60 tbl_structure.php:205 test/theme.php:73 @@ -879,8 +879,8 @@ msgstr "Zrzut został zapisany do pliku %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 "" "Prawdopodobnie próbowano wrzucić duży plik. Aby poznać sposoby obejścia tego " "limitu, proszę zapoznać się z %sdokumenacją%s." @@ -1605,8 +1605,8 @@ msgstr "Komentarz" #: libraries/Index.class.php:465 libraries/common.lib.php:610 #: libraries/common.lib.php:1143 libraries/config/messages.inc.php:459 -#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1119 -#: libraries/import.lib.php:1143 libraries/schema/User_Schema.class.php:168 +#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1131 +#: libraries/import.lib.php:1155 libraries/schema/User_Schema.class.php:168 #: setup/frames/index.inc.php:125 tbl_row_action.php:68 msgid "Edit" msgstr "Edytuj" @@ -1752,8 +1752,8 @@ msgstr "Witamy w %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 "" "Prawdopodobnie powodem jest brak utworzonego pliku konfiguracyjnego. Do jego " "stworzenia można użyć %1$sskryptu instalacyjnego%2$s." @@ -2170,7 +2170,7 @@ msgstr "Katalog ustalony dla uploadu jest nieosiągalny" #: libraries/config.values.php:95 libraries/export/htmlword.php:24 #: libraries/export/latex.php:41 libraries/export/odt.php:33 #: libraries/export/sql.php:79 libraries/export/texytext.php:23 -#: libraries/import.lib.php:1141 +#: libraries/import.lib.php:1153 #, fuzzy msgid "structure" msgstr "Struktura" @@ -4690,8 +4690,8 @@ msgstr "" #| "happen: %3$s. Other text will be kept as is." 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 "" "Interpretacja tej wartości należy do funkcji %1$sstrftime%2$s i można użyć " "jej napisów formatujących. Dodatkowo zostaną zastosowane następujące " @@ -4888,7 +4888,7 @@ msgstr "Sortuj wg klucza" #: libraries/export/sql.php:55 libraries/export/texytext.php:30 #: libraries/export/xls.php:28 libraries/export/xlsx.php:28 #: libraries/export/xml.php:25 libraries/export/yaml.php:29 -#: libraries/import.lib.php:1114 libraries/import.lib.php:1136 +#: libraries/import.lib.php:1126 libraries/import.lib.php:1148 #: libraries/import/csv.php:32 libraries/import/docsql.php:34 #: libraries/import/ldi.php:48 libraries/import/ods.php:32 #: libraries/import/sql.php:19 libraries/import/xls.php:27 @@ -5738,39 +5738,39 @@ msgstr "Wygenerowany przez" msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL zwrócił pusty wynik (zero rekordów)." -#: libraries/import.lib.php:1110 +#: libraries/import.lib.php:1122 msgid "" "The following structures have either been created or altered. Here you can:" msgstr "" -#: libraries/import.lib.php:1111 +#: libraries/import.lib.php:1123 msgid "View a structure`s contents by clicking on its name" msgstr "" -#: libraries/import.lib.php:1112 +#: libraries/import.lib.php:1124 msgid "" "Change any of its settings by clicking the corresponding \"Options\" link" msgstr "" -#: libraries/import.lib.php:1113 +#: libraries/import.lib.php:1125 msgid "Edit its structure by following the \"Structure\" link" msgstr "" -#: libraries/import.lib.php:1116 +#: libraries/import.lib.php:1128 #, fuzzy msgid "Go to database" msgstr "Brak baz danych" -#: libraries/import.lib.php:1119 libraries/import.lib.php:1143 +#: libraries/import.lib.php:1131 libraries/import.lib.php:1155 msgid "settings" msgstr "" -#: libraries/import.lib.php:1138 +#: libraries/import.lib.php:1150 #, fuzzy msgid "Go to table" msgstr "Brak baz danych" -#: libraries/import.lib.php:1147 +#: libraries/import.lib.php:1159 msgid "Go to view" msgstr "" @@ -6642,8 +6642,8 @@ msgid "" "installed the necessary PHP extensions as described in the %sdocumentation%s." msgstr "" "Analizator składni SQL nie mógł zostać zainicjowany. Sprawdź, czy " -"zainstalowane są niezbędne rozszerzenia PHP, tak jak zostało to opisane w " -"%sdokumentacji%s." +"zainstalowane są niezbędne rozszerzenia PHP, tak jak zostało to opisane w %" +"sdokumentacji%s." #: libraries/tbl_links.inc.php:106 libraries/tbl_links.inc.php:107 msgid "Table seems to be empty!" @@ -6691,8 +6691,8 @@ msgid "" "For a list of available transformation options and their MIME type " "transformations, click on %stransformation descriptions%s" msgstr "" -"Aby uzyskać listę dostępnych opcji transformacji i ich typów MIME, kliknij " -"%sopisy transformacji%s" +"Aby uzyskać listę dostępnych opcji transformacji i ich typów MIME, kliknij %" +"sopisy transformacji%s" #: libraries/tbl_properties.inc.php:143 msgid "Transformation options" @@ -7125,8 +7125,8 @@ msgid "" "Server running with Suhosin. Please refer to %sdocumentation%s for possible " "issues." msgstr "" -"Serwer działa pod ochroną Suhosina. Możliwe problemy opisuje %sdokumentacja" -"%s." +"Serwer działa pod ochroną Suhosina. Możliwe problemy opisuje %sdokumentacja%" +"s." #: navigation.php:60 navigation.php:61 navigation.php:64 #, fuzzy @@ -7799,8 +7799,8 @@ msgstr "Usuń bazy danych o takich samych nazwach jak użytkownicy." 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 "" "Uwaga: phpMyAdmin pobiera uprawnienia użytkowników wprost z tabeli uprawnień " "MySQL-a. Zawartość tej tabeli, jeśli zostały w niej dokonane ręczne zmiany, " @@ -9293,8 +9293,8 @@ msgid "" "to." msgstr "" "Jeżeli wydaje się to konieczne, można użyć dodatkowych ustawień " -"bezpieczeństwa — [a@?page=servers&mode=edit&id=" -"%1$d#tab_Server_config]uwierzytelniania na podstawie hosta[/a] i [a@?" +"bezpieczeństwa — [a@?page=servers&mode=edit&id=%1" +"$d#tab_Server_config]uwierzytelniania na podstawie hosta[/a] i [a@?" "page=form&formset=features#tab_Security]listy zaufanych serwerów proxy[/" "a]. Jednakże ochrona oparta na adresy IP może nie być wiarygodna, jeżeli " "używany IP należy do ISP, do którego podłączonych jest tysiące użytkowników." @@ -9454,8 +9454,9 @@ msgstr "" "dowolne miejsce" #: tbl_change.php:1106 -#, php-format -msgid "Restart insertion with %s rows" +#, fuzzy, php-format +#| msgid "Restart insertion with %s rows" +msgid "Continue insertion with %s rows" msgstr "Odśwież wstawianie z %s rekordami" #: tbl_chart.php:56 diff --git a/po/pt.po b/po/pt.po index 1835b11..d4824fb 100644 --- a/po/pt.po +++ b/po/pt.po @@ -3,14 +3,14 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-09-07 15:21+0200\n" +"POT-Creation-Date: 2010-09-10 12:46-0400\n" "PO-Revision-Date: 2010-07-22 02:23+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: portuguese <pt(a)li.org>\n" -"Language: pt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: pt\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.1\n" @@ -611,7 +611,7 @@ msgstr "Insere" #: libraries/config/user_preferences.forms.php:228 #: libraries/config/user_preferences.forms.php:262 #: libraries/db_links.inc.php:48 libraries/export/latex.php:351 -#: libraries/import.lib.php:1136 libraries/tbl_links.inc.php:54 +#: libraries/import.lib.php:1148 libraries/tbl_links.inc.php:54 #: pmd_general.php:133 server_privileges.php:595 server_replication.php:313 #: tbl_create.php:305 tbl_tracking.php:263 msgid "Structure" @@ -660,8 +660,8 @@ msgstr "" #: db_structure.php:404 libraries/display_tbl.lib.php:1945 #, 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 "" #: db_structure.php:418 db_structure.php:432 libraries/header.inc.php:138 @@ -876,8 +876,8 @@ msgstr "O Dump foi gravado para o ficheiro %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 "" #: import.php:277 import.php:330 libraries/File.class.php:566 @@ -1580,8 +1580,8 @@ msgstr "Comentários" #: libraries/Index.class.php:465 libraries/common.lib.php:610 #: libraries/common.lib.php:1143 libraries/config/messages.inc.php:459 -#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1119 -#: libraries/import.lib.php:1143 libraries/schema/User_Schema.class.php:168 +#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1131 +#: libraries/import.lib.php:1155 libraries/schema/User_Schema.class.php:168 #: setup/frames/index.inc.php:125 tbl_row_action.php:68 msgid "Edit" msgstr "Edita" @@ -1721,8 +1721,8 @@ msgstr "Bemvindo ao %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 "" #: libraries/auth/config.auth.lib.php:115 @@ -2126,7 +2126,7 @@ msgstr "Não é possivel alcançar a directoria que configurou para fazer upload #: libraries/config.values.php:95 libraries/export/htmlword.php:24 #: libraries/export/latex.php:41 libraries/export/odt.php:33 #: libraries/export/sql.php:79 libraries/export/texytext.php:23 -#: libraries/import.lib.php:1141 +#: libraries/import.lib.php:1153 #, fuzzy msgid "structure" msgstr "Estrutura" @@ -4554,8 +4554,8 @@ msgstr "" #, 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 "" #: libraries/display_export.lib.php:275 @@ -4733,7 +4733,7 @@ msgstr "Ordenar por chave" #: libraries/export/sql.php:55 libraries/export/texytext.php:30 #: libraries/export/xls.php:28 libraries/export/xlsx.php:28 #: libraries/export/xml.php:25 libraries/export/yaml.php:29 -#: libraries/import.lib.php:1114 libraries/import.lib.php:1136 +#: libraries/import.lib.php:1126 libraries/import.lib.php:1148 #: libraries/import/csv.php:32 libraries/import/docsql.php:34 #: libraries/import/ldi.php:48 libraries/import/ods.php:32 #: libraries/import/sql.php:19 libraries/import/xls.php:27 @@ -5533,39 +5533,39 @@ msgstr "Gerado por" msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL não retornou nenhum registo." -#: libraries/import.lib.php:1110 +#: libraries/import.lib.php:1122 msgid "" "The following structures have either been created or altered. Here you can:" msgstr "" -#: libraries/import.lib.php:1111 +#: libraries/import.lib.php:1123 msgid "View a structure`s contents by clicking on its name" msgstr "" -#: libraries/import.lib.php:1112 +#: libraries/import.lib.php:1124 msgid "" "Change any of its settings by clicking the corresponding \"Options\" link" msgstr "" -#: libraries/import.lib.php:1113 +#: libraries/import.lib.php:1125 msgid "Edit its structure by following the \"Structure\" link" msgstr "" -#: libraries/import.lib.php:1116 +#: libraries/import.lib.php:1128 #, fuzzy msgid "Go to database" msgstr "Sem bases de dados" -#: libraries/import.lib.php:1119 libraries/import.lib.php:1143 +#: libraries/import.lib.php:1131 libraries/import.lib.php:1155 msgid "settings" msgstr "" -#: libraries/import.lib.php:1138 +#: libraries/import.lib.php:1150 #, fuzzy msgid "Go to table" msgstr "Sem bases de dados" -#: libraries/import.lib.php:1147 +#: libraries/import.lib.php:1159 msgid "Go to view" msgstr "" @@ -7493,8 +7493,8 @@ msgstr "" 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 "" "Nota: O phpMyAdmin recebe os privilégios dos utilizadores directamente da " "tabela de privilégios do MySQL. O conteúdo destas tabelas pode diferir dos " @@ -8971,7 +8971,7 @@ msgstr "" #: tbl_change.php:1106 #, php-format -msgid "Restart insertion with %s rows" +msgid "Continue insertion with %s rows" msgstr "" #: tbl_chart.php:56 diff --git a/po/pt_BR.po b/po/pt_BR.po index 3c759ed..7d7de42 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -3,14 +3,14 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-09-07 15:21+0200\n" +"POT-Creation-Date: 2010-09-10 12:46-0400\n" "PO-Revision-Date: 2010-07-13 23:58+0200\n" "Last-Translator: William Bachion <william(a)bachiondesign.com>\n" "Language-Team: brazilian_portuguese <pt_BR(a)li.org>\n" -"Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: pt_BR\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Pootle 2.0.1\n" @@ -612,7 +612,7 @@ msgstr "Inserir" #: libraries/config/user_preferences.forms.php:228 #: libraries/config/user_preferences.forms.php:262 #: libraries/db_links.inc.php:48 libraries/export/latex.php:351 -#: libraries/import.lib.php:1136 libraries/tbl_links.inc.php:54 +#: libraries/import.lib.php:1148 libraries/tbl_links.inc.php:54 #: pmd_general.php:133 server_privileges.php:595 server_replication.php:313 #: tbl_create.php:305 tbl_tracking.php:263 msgid "Structure" @@ -661,8 +661,8 @@ msgstr "" #: db_structure.php:404 libraries/display_tbl.lib.php:1945 #, 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 "" #: db_structure.php:418 db_structure.php:432 libraries/header.inc.php:138 @@ -876,8 +876,8 @@ msgstr "Dump foi salvo no arquivo %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 "" "Você provavelmente tentou carregar um arquivo muito grande. Veja referências " "na %sdocumentation%s para burlar esses limites." @@ -1598,8 +1598,8 @@ msgstr "Cometário" #: libraries/Index.class.php:465 libraries/common.lib.php:610 #: libraries/common.lib.php:1143 libraries/config/messages.inc.php:459 -#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1119 -#: libraries/import.lib.php:1143 libraries/schema/User_Schema.class.php:168 +#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1131 +#: libraries/import.lib.php:1155 libraries/schema/User_Schema.class.php:168 #: setup/frames/index.inc.php:125 tbl_row_action.php:68 msgid "Edit" msgstr "Editar" @@ -1746,8 +1746,8 @@ msgstr "Bem vindo ao %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 "" "A provável razão para isso é que você não criou o arquivo de configuração. " "Você deve usar o %1$ssetup script%2$s para criar um." @@ -2157,7 +2157,7 @@ msgstr "" #: libraries/config.values.php:95 libraries/export/htmlword.php:24 #: libraries/export/latex.php:41 libraries/export/odt.php:33 #: libraries/export/sql.php:79 libraries/export/texytext.php:23 -#: libraries/import.lib.php:1141 +#: libraries/import.lib.php:1153 #, fuzzy msgid "structure" msgstr "Estrutura" @@ -4621,8 +4621,8 @@ msgstr "" #| "happen: %3$s. Other text will be kept as is." 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 "" "Esse valor é interpretado usando %1$sstrftime%2$s, então você pode usar as " "strings de formatação de tempo. Adicionalmente a seguinte transformação " @@ -4818,7 +4818,7 @@ msgstr "Ordenar pela chave" #: libraries/export/sql.php:55 libraries/export/texytext.php:30 #: libraries/export/xls.php:28 libraries/export/xlsx.php:28 #: libraries/export/xml.php:25 libraries/export/yaml.php:29 -#: libraries/import.lib.php:1114 libraries/import.lib.php:1136 +#: libraries/import.lib.php:1126 libraries/import.lib.php:1148 #: libraries/import/csv.php:32 libraries/import/docsql.php:34 #: libraries/import/ldi.php:48 libraries/import/ods.php:32 #: libraries/import/sql.php:19 libraries/import/xls.php:27 @@ -5643,39 +5643,39 @@ msgstr "Gerado por" msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL retornou um conjunto vazio (ex. zero registros)." -#: libraries/import.lib.php:1110 +#: libraries/import.lib.php:1122 msgid "" "The following structures have either been created or altered. Here you can:" msgstr "" -#: libraries/import.lib.php:1111 +#: libraries/import.lib.php:1123 msgid "View a structure`s contents by clicking on its name" msgstr "" -#: libraries/import.lib.php:1112 +#: libraries/import.lib.php:1124 msgid "" "Change any of its settings by clicking the corresponding \"Options\" link" msgstr "" -#: libraries/import.lib.php:1113 +#: libraries/import.lib.php:1125 msgid "Edit its structure by following the \"Structure\" link" msgstr "" -#: libraries/import.lib.php:1116 +#: libraries/import.lib.php:1128 #, fuzzy msgid "Go to database" msgstr "Sem bases" -#: libraries/import.lib.php:1119 libraries/import.lib.php:1143 +#: libraries/import.lib.php:1131 libraries/import.lib.php:1155 msgid "settings" msgstr "" -#: libraries/import.lib.php:1138 +#: libraries/import.lib.php:1150 #, fuzzy msgid "Go to table" msgstr "Sem bases" -#: libraries/import.lib.php:1147 +#: libraries/import.lib.php:1159 msgid "Go to view" msgstr "" @@ -7693,8 +7693,8 @@ msgstr "Eliminar o Banco de Dados que possui o mesmo nome dos usuários." 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 "" "Nota: O phpMyAdmin recebe os privilégios dos usuário diretamente da tabela " "de privilégios do MySQL. O conteúdo destas tabelas pode divergir dos " @@ -9295,8 +9295,9 @@ msgstr "" "em qualquer direção" #: tbl_change.php:1106 -#, php-format -msgid "Restart insertion with %s rows" +#, fuzzy, php-format +#| msgid "Restart insertion with %s rows" +msgid "Continue insertion with %s rows" msgstr "Reiniciar inserção com %s registros" #: tbl_chart.php:56 diff --git a/po/ro.po b/po/ro.po index 26829b6..d06ad3b 100644 --- a/po/ro.po +++ b/po/ro.po @@ -3,14 +3,14 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-09-07 15:21+0200\n" +"POT-Creation-Date: 2010-09-10 12:46-0400\n" "PO-Revision-Date: 2010-07-22 02:28+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: romanian <ro(a)li.org>\n" -"Language: ro\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: ro\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < " "20)) ? 1 : 2);;\n" "X-Generator: Pootle 2.0.1\n" @@ -616,7 +616,7 @@ msgstr "Inserare" #: libraries/config/user_preferences.forms.php:228 #: libraries/config/user_preferences.forms.php:262 #: libraries/db_links.inc.php:48 libraries/export/latex.php:351 -#: libraries/import.lib.php:1136 libraries/tbl_links.inc.php:54 +#: libraries/import.lib.php:1148 libraries/tbl_links.inc.php:54 #: pmd_general.php:133 server_privileges.php:595 server_replication.php:313 #: tbl_create.php:305 tbl_tracking.php:263 msgid "Structure" @@ -665,8 +665,8 @@ msgstr "Monitorizarea nu este activată" #: db_structure.php:404 libraries/display_tbl.lib.php:1945 #, 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 "" "Această vedere are minim acest număr de rânduri. Vedeți %sdocumentation%s." @@ -881,11 +881,11 @@ msgstr "Copia a fost salvată în fișierul %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 "" -"Probabil ați încercat să încărcați un fișier prea mare. Faceți referire la " -"%sdocumentație%s pentru căi de ocolire a acestei limite." +"Probabil ați încercat să încărcați un fișier prea mare. Faceți referire la %" +"sdocumentație%s pentru căi de ocolire a acestei limite." #: import.php:277 import.php:330 libraries/File.class.php:566 #: libraries/File.class.php:676 @@ -1604,8 +1604,8 @@ msgstr "Comentariu" #: libraries/Index.class.php:465 libraries/common.lib.php:610 #: libraries/common.lib.php:1143 libraries/config/messages.inc.php:459 -#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1119 -#: libraries/import.lib.php:1143 libraries/schema/User_Schema.class.php:168 +#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1131 +#: libraries/import.lib.php:1155 libraries/schema/User_Schema.class.php:168 #: setup/frames/index.inc.php:125 tbl_row_action.php:68 msgid "Edit" msgstr "Editare" @@ -1753,8 +1753,8 @@ msgstr "Bine ați venit la %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 "" "Motivul probabil pentru aceasta este că nu ați creat un fișier de " "configurare. Puteți folosi %1$s vrăjitorul de setări %2$s pentru a crea un " @@ -2171,7 +2171,7 @@ msgstr "Directorul stabilit pentru încărcare nu poate fi găsit" #: libraries/config.values.php:95 libraries/export/htmlword.php:24 #: libraries/export/latex.php:41 libraries/export/odt.php:33 #: libraries/export/sql.php:79 libraries/export/texytext.php:23 -#: libraries/import.lib.php:1141 +#: libraries/import.lib.php:1153 #, fuzzy msgid "structure" msgstr "Structură" @@ -4633,12 +4633,12 @@ msgstr "" #| "happen: %3$s. Other text will be kept as is." 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 "" "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." +"formatting strings. Additionally the following transformations will happen: %" +"3$s. Other text will be kept as is." #: libraries/display_export.lib.php:275 msgid "use this for future exports" @@ -4829,7 +4829,7 @@ msgstr "Sortare după cheie" #: libraries/export/sql.php:55 libraries/export/texytext.php:30 #: libraries/export/xls.php:28 libraries/export/xlsx.php:28 #: libraries/export/xml.php:25 libraries/export/yaml.php:29 -#: libraries/import.lib.php:1114 libraries/import.lib.php:1136 +#: libraries/import.lib.php:1126 libraries/import.lib.php:1148 #: libraries/import/csv.php:32 libraries/import/docsql.php:34 #: libraries/import/ldi.php:48 libraries/import/ods.php:32 #: libraries/import/sql.php:19 libraries/import/xls.php:27 @@ -5683,39 +5683,39 @@ msgstr "Generat de" msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL a dat un set de rezultate gol (zero linii)." -#: libraries/import.lib.php:1110 +#: libraries/import.lib.php:1122 msgid "" "The following structures have either been created or altered. Here you can:" msgstr "" -#: libraries/import.lib.php:1111 +#: libraries/import.lib.php:1123 msgid "View a structure`s contents by clicking on its name" msgstr "" -#: libraries/import.lib.php:1112 +#: libraries/import.lib.php:1124 msgid "" "Change any of its settings by clicking the corresponding \"Options\" link" msgstr "" -#: libraries/import.lib.php:1113 +#: libraries/import.lib.php:1125 msgid "Edit its structure by following the \"Structure\" link" msgstr "" -#: libraries/import.lib.php:1116 +#: libraries/import.lib.php:1128 #, fuzzy msgid "Go to database" msgstr "Nu sînt baze de date" -#: libraries/import.lib.php:1119 libraries/import.lib.php:1143 +#: libraries/import.lib.php:1131 libraries/import.lib.php:1155 msgid "settings" msgstr "" -#: libraries/import.lib.php:1138 +#: libraries/import.lib.php:1150 #, fuzzy msgid "Go to table" msgstr "Nu sînt baze de date" -#: libraries/import.lib.php:1147 +#: libraries/import.lib.php:1159 msgid "Go to view" msgstr "" @@ -7745,8 +7745,8 @@ msgstr "Aruncă baza de date care are același nume ca utilizatorul." 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 "" "Notă: phpMyAdmin folosește privilegiile utilizatorilor direct din tabelul de " "privilegii din MySQL. Conținutul acestui tabel poate diferi de cel original. " @@ -9337,8 +9337,9 @@ msgstr "" "pentru a merge în oricare direcție" #: tbl_change.php:1106 -#, php-format -msgid "Restart insertion with %s rows" +#, fuzzy, php-format +#| msgid "Restart insertion with %s rows" +msgid "Continue insertion with %s rows" msgstr "Repornește inserția cu %s rînduri" #: tbl_chart.php:56 diff --git a/po/ru.po b/po/ru.po index f152483..9bbc0af 100644 --- a/po/ru.po +++ b/po/ru.po @@ -3,16 +3,16 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-09-07 15:21+0200\n" +"POT-Creation-Date: 2010-09-10 12:46-0400\n" "PO-Revision-Date: 2010-07-22 02:27+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: russian <ru(a)li.org>\n" -"Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Language: ru\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" +"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Pootle 2.0.1\n" #: browse_foreigners.php:36 browse_foreigners.php:57 @@ -618,7 +618,7 @@ msgstr "Вставить" #: libraries/config/user_preferences.forms.php:228 #: libraries/config/user_preferences.forms.php:262 #: libraries/db_links.inc.php:48 libraries/export/latex.php:351 -#: libraries/import.lib.php:1136 libraries/tbl_links.inc.php:54 +#: libraries/import.lib.php:1148 libraries/tbl_links.inc.php:54 #: pmd_general.php:133 server_privileges.php:595 server_replication.php:313 #: tbl_create.php:305 tbl_tracking.php:263 msgid "Structure" @@ -667,8 +667,8 @@ msgstr "Слежение выключено." #: db_structure.php:404 libraries/display_tbl.lib.php:1945 #, 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 "" "Данное представление имеет, по меньшей мере, указанное количество строк. " "Пожалуйста, обратитесь к %sдокументации%s." @@ -876,8 +876,8 @@ msgstr "Дамп был сохранен в файл %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 "" "Вероятно, размер загружаемого файла слишком велик. Способы обхода данного " "ограничения описаны в %sдокументации%s." @@ -1607,8 +1607,8 @@ msgstr "Комментарий" #: libraries/Index.class.php:465 libraries/common.lib.php:610 #: libraries/common.lib.php:1143 libraries/config/messages.inc.php:459 -#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1119 -#: libraries/import.lib.php:1143 libraries/schema/User_Schema.class.php:168 +#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1131 +#: libraries/import.lib.php:1155 libraries/schema/User_Schema.class.php:168 #: setup/frames/index.inc.php:125 tbl_row_action.php:68 msgid "Edit" msgstr "Изменить" @@ -1752,8 +1752,8 @@ msgstr "Добро пожаловать в %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 "" "Возможная причина - отсутствие файла конфигурации. Для его создания вы " "можете воспользоваться %1$sсценарием установки%2$s." @@ -2171,7 +2171,7 @@ msgstr "Установленный каталог загрузки не дост #: libraries/config.values.php:95 libraries/export/htmlword.php:24 #: libraries/export/latex.php:41 libraries/export/odt.php:33 #: libraries/export/sql.php:79 libraries/export/texytext.php:23 -#: libraries/import.lib.php:1141 +#: libraries/import.lib.php:1153 msgid "structure" msgstr "структура" @@ -4828,8 +4828,8 @@ msgstr "" #| "happen: %3$s. Other text will be kept as is." 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 "" "Значение обрабатывается функцией %1$sstrftime%2$s, благодаря чему возможна " "вставка текущей даты и времени. Дополнительно могут быть использованы " @@ -5030,7 +5030,7 @@ msgstr "Сортировать по индексу" #: libraries/export/sql.php:55 libraries/export/texytext.php:30 #: libraries/export/xls.php:28 libraries/export/xlsx.php:28 #: libraries/export/xml.php:25 libraries/export/yaml.php:29 -#: libraries/import.lib.php:1114 libraries/import.lib.php:1136 +#: libraries/import.lib.php:1126 libraries/import.lib.php:1148 #: libraries/import/csv.php:32 libraries/import/docsql.php:34 #: libraries/import/ldi.php:48 libraries/import/ods.php:32 #: libraries/import/sql.php:19 libraries/import/xls.php:27 @@ -5889,37 +5889,37 @@ msgstr "Создан" msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL вернула пустой результат (т.е. ноль строк)." -#: libraries/import.lib.php:1110 +#: libraries/import.lib.php:1122 msgid "" "The following structures have either been created or altered. Here you can:" msgstr "Следующие структуры были созданы, либо изменены. Вы можете:" -#: libraries/import.lib.php:1111 +#: libraries/import.lib.php:1123 msgid "View a structure`s contents by clicking on its name" msgstr "Просмотреть детали структуры нажав на её имя" -#: libraries/import.lib.php:1112 +#: libraries/import.lib.php:1124 msgid "" "Change any of its settings by clicking the corresponding \"Options\" link" msgstr "Изменить любой параметр нажав на соответствующую ссылку Параметр" -#: libraries/import.lib.php:1113 +#: libraries/import.lib.php:1125 msgid "Edit its structure by following the \"Structure\" link" msgstr "Отредактировать структуру перейдя по ссылке Структура" -#: libraries/import.lib.php:1116 +#: libraries/import.lib.php:1128 msgid "Go to database" msgstr "Перейти к базе данных" -#: libraries/import.lib.php:1119 libraries/import.lib.php:1143 +#: libraries/import.lib.php:1131 libraries/import.lib.php:1155 msgid "settings" msgstr "настройки" -#: libraries/import.lib.php:1138 +#: libraries/import.lib.php:1150 msgid "Go to table" msgstr "Перейти к таблице" -#: libraries/import.lib.php:1147 +#: libraries/import.lib.php:1159 msgid "Go to view" msgstr "Перейти к отображению (VIEW)" @@ -7976,8 +7976,8 @@ msgstr "Удалить базы данных, имена которых совп 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 "" "Примечание: phpMyAdmin получает информацию о пользовательских привилегиях " "непосредственно из таблиц привилегий MySQL. Содержимое этих таблиц может " @@ -9110,8 +9110,8 @@ msgid "" "<b>Query statistics</b>: Since its startup, %s queries have been sent to the " "server." msgstr "" -"Статистика запросов: со времени запуска, на сервер было отослано запросов - " -"%s." +"Статистика запросов: со времени запуска, на сервер было отослано запросов - %" +"s." #: server_status.php:615 msgid "per minute" @@ -9544,9 +9544,8 @@ msgstr "" "Вы установили [kbd]config[/kbd] идентификацию и ввели имя полльзователя с " "паролем для автоматического входа, что крайне не рекомендуется для рабочего " "хоста. Любой, кто сможет узнать ссылку к phpMyAdmin сможет напрямую попасть " -"в панель управления. Установите [a@?page=servers&mode=edit&id=" -"%1$d#tab_Server]тип идентификации[/a] в [kbd]cookie[/kbd] или [kbd]http[/" -"kbd]." +"в панель управления. Установите [a@?page=servers&mode=edit&id=%1" +"$d#tab_Server]тип идентификации[/a] в [kbd]cookie[/kbd] или [kbd]http[/kbd]." #: setup/lib/index.lib.php:259 #, php-format @@ -9690,8 +9689,9 @@ msgstr "" "+клавиши со стрелками - для свободного перемещения" #: tbl_change.php:1106 -#, php-format -msgid "Restart insertion with %s rows" +#, fuzzy, php-format +#| msgid "Restart insertion with %s rows" +msgid "Continue insertion with %s rows" msgstr "Количество вставляемых строк: %s" #: tbl_chart.php:56 @@ -10274,8 +10274,8 @@ msgid "" "No themes support; please check your configuration and/or your themes in " "directory %s." msgstr "" -"Поддержка тем не работает, проверьте конфигурацию и наличие тем в каталоге " -"%s." +"Поддержка тем не работает, проверьте конфигурацию и наличие тем в каталоге %" +"s." #: themes.php:41 msgid "Get more themes!" @@ -10484,8 +10484,8 @@ msgstr "Переименовать таблицу в" #~ "Cannot load [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] " #~ "extension. Please check your PHP configuration." #~ msgstr "" -#~ "Невозможно загрузить расширение [a@http://php.net/%1$s@Documentation]" -#~ "[em]%1$s[/em][/a]! Проверьте настройки PHP." +#~ "Невозможно загрузить расширение [a@http://php.net/%1$s@Documentation][em]%" +#~ "1$s[/em][/a]! Проверьте настройки PHP." #~ msgid "" #~ "Couldn't load the iconv or recode extension needed for charset " diff --git a/po/si.po b/po/si.po index f1c3111..6192c45 100644 --- a/po/si.po +++ b/po/si.po @@ -3,14 +3,14 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-09-07 15:21+0200\n" +"POT-Creation-Date: 2010-09-10 12:46-0400\n" "PO-Revision-Date: 2010-07-22 02:26+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: sinhala <si(a)li.org>\n" -"Language: si\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: si\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.1\n" @@ -610,7 +610,7 @@ msgstr "ඇතුල් කරන්න" #: libraries/config/user_preferences.forms.php:228 #: libraries/config/user_preferences.forms.php:262 #: libraries/db_links.inc.php:48 libraries/export/latex.php:351 -#: libraries/import.lib.php:1136 libraries/tbl_links.inc.php:54 +#: libraries/import.lib.php:1148 libraries/tbl_links.inc.php:54 #: pmd_general.php:133 server_privileges.php:595 server_replication.php:313 #: tbl_create.php:305 tbl_tracking.php:263 msgid "Structure" @@ -659,8 +659,8 @@ msgstr "" #: db_structure.php:404 libraries/display_tbl.lib.php:1945 #, 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 "" #: db_structure.php:418 db_structure.php:432 libraries/header.inc.php:138 @@ -873,11 +873,11 @@ msgstr "%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 "" -"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." #: import.php:277 import.php:330 libraries/File.class.php:566 #: libraries/File.class.php:676 @@ -1591,8 +1591,8 @@ msgstr "විස්තරය" #: libraries/Index.class.php:465 libraries/common.lib.php:610 #: libraries/common.lib.php:1143 libraries/config/messages.inc.php:459 -#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1119 -#: libraries/import.lib.php:1143 libraries/schema/User_Schema.class.php:168 +#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1131 +#: libraries/import.lib.php:1155 libraries/schema/User_Schema.class.php:168 #: setup/frames/index.inc.php:125 tbl_row_action.php:68 msgid "Edit" msgstr "සංස්කරණය කරන්න" @@ -1735,8 +1735,8 @@ msgstr "%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 "" "Probably reason of this is that you did not create configuration file. You " "might want to use %1$ssetup script%2$s to create one." @@ -2146,7 +2146,7 @@ msgstr "අප්ලෝඩ් කිරීම් සඳහා සැකසූ #: libraries/config.values.php:95 libraries/export/htmlword.php:24 #: libraries/export/latex.php:41 libraries/export/odt.php:33 #: libraries/export/sql.php:79 libraries/export/texytext.php:23 -#: libraries/import.lib.php:1141 +#: libraries/import.lib.php:1153 #, fuzzy msgid "structure" msgstr "සැකිල්ල" @@ -4598,12 +4598,12 @@ msgstr "" #| "happen: %3$s. Other text will be kept as is." 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 "" "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." +"formatting strings. Additionally the following transformations will happen: %" +"3$s. Other text will be kept as is." #: libraries/display_export.lib.php:275 msgid "use this for future exports" @@ -4794,7 +4794,7 @@ msgstr "යතුර අනුව තෝරන්න" #: libraries/export/sql.php:55 libraries/export/texytext.php:30 #: libraries/export/xls.php:28 libraries/export/xlsx.php:28 #: libraries/export/xml.php:25 libraries/export/yaml.php:29 -#: libraries/import.lib.php:1114 libraries/import.lib.php:1136 +#: libraries/import.lib.php:1126 libraries/import.lib.php:1148 #: libraries/import/csv.php:32 libraries/import/docsql.php:34 #: libraries/import/ldi.php:48 libraries/import/ods.php:32 #: libraries/import/sql.php:19 libraries/import/xls.php:27 @@ -5615,39 +5615,39 @@ msgstr "උත්පාදනය කරන ලද්දේ" msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL returned an empty result set (i.e. zero rows)." -#: libraries/import.lib.php:1110 +#: libraries/import.lib.php:1122 msgid "" "The following structures have either been created or altered. Here you can:" msgstr "" -#: libraries/import.lib.php:1111 +#: libraries/import.lib.php:1123 msgid "View a structure`s contents by clicking on its name" msgstr "" -#: libraries/import.lib.php:1112 +#: libraries/import.lib.php:1124 msgid "" "Change any of its settings by clicking the corresponding \"Options\" link" msgstr "" -#: libraries/import.lib.php:1113 +#: libraries/import.lib.php:1125 msgid "Edit its structure by following the \"Structure\" link" msgstr "" -#: libraries/import.lib.php:1116 +#: libraries/import.lib.php:1128 #, fuzzy msgid "Go to database" msgstr "දත්තගබඩා නොමැත" -#: libraries/import.lib.php:1119 libraries/import.lib.php:1143 +#: libraries/import.lib.php:1131 libraries/import.lib.php:1155 msgid "settings" msgstr "" -#: libraries/import.lib.php:1138 +#: libraries/import.lib.php:1150 #, fuzzy msgid "Go to table" msgstr "දත්තගබඩා නොමැත" -#: libraries/import.lib.php:1147 +#: libraries/import.lib.php:1159 msgid "Go to view" msgstr "" @@ -7643,13 +7643,13 @@ msgstr "භාවිතා කරන්නන් හා සමාන නම් 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 "" "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." #: server_privileges.php:1776 msgid "The selected user was not found in the privilege table." @@ -9225,7 +9225,7 @@ msgstr "" #: tbl_change.php:1106 #, php-format -msgid "Restart insertion with %s rows" +msgid "Continue insertion with %s rows" msgstr "" #: tbl_chart.php:56 diff --git a/po/sk.po b/po/sk.po index 54d6098..238c34d 100644 --- a/po/sk.po +++ b/po/sk.po @@ -3,14 +3,14 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-09-07 15:21+0200\n" +"POT-Creation-Date: 2010-09-10 12:46-0400\n" "PO-Revision-Date: 2010-07-22 02:26+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: slovak <sk(a)li.org>\n" -"Language: sk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: sk\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" "X-Generator: Pootle 2.0.1\n" @@ -615,7 +615,7 @@ msgstr "Vložiť" #: libraries/config/user_preferences.forms.php:228 #: libraries/config/user_preferences.forms.php:262 #: libraries/db_links.inc.php:48 libraries/export/latex.php:351 -#: libraries/import.lib.php:1136 libraries/tbl_links.inc.php:54 +#: libraries/import.lib.php:1148 libraries/tbl_links.inc.php:54 #: pmd_general.php:133 server_privileges.php:595 server_replication.php:313 #: tbl_create.php:305 tbl_tracking.php:263 msgid "Structure" @@ -664,8 +664,8 @@ msgstr "" #: db_structure.php:404 libraries/display_tbl.lib.php:1945 #, 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 "" #: db_structure.php:418 db_structure.php:432 libraries/header.inc.php:138 @@ -876,8 +876,8 @@ msgstr "Dump (schéma) bol uložený do súboru %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 "" "Pravdepodobne ste sa pokúsili uploadnuť príliš veľký súbor. Prečítajte si " "prosím %sdokumentáciu%s, ako sa dá toto obmedzenie obísť." @@ -1599,8 +1599,8 @@ msgstr "Komentár" #: libraries/Index.class.php:465 libraries/common.lib.php:610 #: libraries/common.lib.php:1143 libraries/config/messages.inc.php:459 -#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1119 -#: libraries/import.lib.php:1143 libraries/schema/User_Schema.class.php:168 +#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1131 +#: libraries/import.lib.php:1155 libraries/schema/User_Schema.class.php:168 #: setup/frames/index.inc.php:125 tbl_row_action.php:68 msgid "Edit" msgstr "Upraviť" @@ -1744,8 +1744,8 @@ msgstr "Vitajte 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 "" "Pravdepodobná príčina je, že neexistuje konfiguračný súbor. Na jeho " "vytvorenie môžete použiť %1$skonfiguračný skript%2$s." @@ -2156,7 +2156,7 @@ msgstr "Adresár určený pre upload súborov sa nedá otvoriť" #: libraries/config.values.php:95 libraries/export/htmlword.php:24 #: libraries/export/latex.php:41 libraries/export/odt.php:33 #: libraries/export/sql.php:79 libraries/export/texytext.php:23 -#: libraries/import.lib.php:1141 +#: libraries/import.lib.php:1153 #, fuzzy msgid "structure" msgstr "Štruktúra" @@ -4610,8 +4610,8 @@ msgstr "" #| "happen: %3$s. Other text will be kept as is." 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 "" "Táto hodnota je interpretovaná pomocou %1$sstrftime%2$s, takže môžete použiť " "reťazec pre formátovanie dátumu a času. Naviac budú vykonané tieto " @@ -4812,7 +4812,7 @@ msgstr "Zoradiť podľa kľúča" #: libraries/export/sql.php:55 libraries/export/texytext.php:30 #: libraries/export/xls.php:28 libraries/export/xlsx.php:28 #: libraries/export/xml.php:25 libraries/export/yaml.php:29 -#: libraries/import.lib.php:1114 libraries/import.lib.php:1136 +#: libraries/import.lib.php:1126 libraries/import.lib.php:1148 #: libraries/import/csv.php:32 libraries/import/docsql.php:34 #: libraries/import/ldi.php:48 libraries/import/ods.php:32 #: libraries/import/sql.php:19 libraries/import/xls.php:27 @@ -5628,37 +5628,37 @@ msgstr "Vygenerované" msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL vrátil prázdny výsledok (tj. nulový počet riadkov)." -#: libraries/import.lib.php:1110 +#: libraries/import.lib.php:1122 msgid "" "The following structures have either been created or altered. Here you can:" msgstr "Nasledujúce tabuľky boli vytvorené alebo zmenené. Teraz možete:" -#: libraries/import.lib.php:1111 +#: libraries/import.lib.php:1123 msgid "View a structure`s contents by clicking on its name" msgstr "Zobraziť obsah tabuľky kliknuťím na jej názov" -#: libraries/import.lib.php:1112 +#: libraries/import.lib.php:1124 msgid "" "Change any of its settings by clicking the corresponding \"Options\" link" msgstr "Zmeniť ľubovolné nastavenia kliknutím na odkaz \"Nastavenia\"" -#: libraries/import.lib.php:1113 +#: libraries/import.lib.php:1125 msgid "Edit its structure by following the \"Structure\" link" msgstr "Upraviť štruktúru kliknutím na odkaz \"Štruktúra\"" -#: libraries/import.lib.php:1116 +#: libraries/import.lib.php:1128 msgid "Go to database" msgstr "Prejsť do databázy" -#: libraries/import.lib.php:1119 libraries/import.lib.php:1143 +#: libraries/import.lib.php:1131 libraries/import.lib.php:1155 msgid "settings" msgstr "nastavenia" -#: libraries/import.lib.php:1138 +#: libraries/import.lib.php:1150 msgid "Go to table" msgstr "Prejsť do tabuľky" -#: libraries/import.lib.php:1147 +#: libraries/import.lib.php:1159 msgid "Go to view" msgstr "Prejsť na Prejsť na pohľad" @@ -6529,8 +6529,8 @@ msgid "" "installed the necessary PHP extensions as described in the %sdocumentation%s." msgstr "" "SQL validator nemohol byť inicializovaný. Prosím skontrolujte, či sú " -"nainštalované všetky potrebné rozšírenia php, tak ako sú popísané v " -"%sdocumentation%s." +"nainštalované všetky potrebné rozšírenia php, tak ako sú popísané v %" +"sdocumentation%s." #: libraries/tbl_links.inc.php:106 libraries/tbl_links.inc.php:107 msgid "Table seems to be empty!" @@ -7660,13 +7660,13 @@ msgstr "Odstrániť databázy s rovnakým menom ako majú používatelia." 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ískava práva používateľov priamo z tabuliek MySQL. " "Obsah týchto tabuliek sa môže líšiť od práv, ktoré používa server, ak boli " -"tieto tabuľky ručne upravené. V tomto prípade sa odporúča vykonať " -"%sznovunačítanie práv%s predtým ako budete pokračovať." +"tieto tabuľky ručne upravené. V tomto prípade sa odporúča vykonať %" +"sznovunačítanie práv%s predtým ako budete pokračovať." #: server_privileges.php:1776 msgid "The selected user was not found in the privilege table." @@ -9273,7 +9273,7 @@ msgstr "" #: tbl_change.php:1106 #, php-format -msgid "Restart insertion with %s rows" +msgid "Continue insertion with %s rows" msgstr "" #: tbl_chart.php:56 @@ -9970,8 +9970,8 @@ msgstr "Premenovať tabuľku na" #~ msgid "Imported file compression will be automatically detected from: %s" #~ msgstr "" -#~ "Kompresia importovaného súboru bude rozpoznaná automaticky. Podporované: " -#~ "%s" +#~ "Kompresia importovaného súboru bude rozpoznaná automaticky. Podporované: %" +#~ "s" #~ msgid "Add into comments" #~ msgstr "Pridať do komentárov" diff --git a/po/sl.po b/po/sl.po index a9aa67e..c435087 100644 --- a/po/sl.po +++ b/po/sl.po @@ -3,16 +3,16 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-09-07 15:21+0200\n" +"POT-Creation-Date: 2010-09-10 12:46-0400\n" "PO-Revision-Date: 2010-09-07 18:44+0200\n" "Last-Translator: Domen <dbc334(a)gmail.com>\n" "Language-Team: slovenian <sl(a)li.org>\n" -"Language: sl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || " -"n%100==4 ? 2 : 3);\n" +"Language: sl\n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n" +"%100==4 ? 2 : 3);\n" "X-Generator: Pootle 2.0.5\n" #: browse_foreigners.php:36 browse_foreigners.php:57 @@ -597,7 +597,7 @@ msgstr "Vstavi" #: libraries/config/user_preferences.forms.php:228 #: libraries/config/user_preferences.forms.php:262 #: libraries/db_links.inc.php:48 libraries/export/latex.php:351 -#: libraries/import.lib.php:1136 libraries/tbl_links.inc.php:54 +#: libraries/import.lib.php:1148 libraries/tbl_links.inc.php:54 #: pmd_general.php:133 server_privileges.php:595 server_replication.php:313 #: tbl_create.php:305 tbl_tracking.php:263 msgid "Structure" @@ -646,8 +646,8 @@ msgstr "Sledenje ni aktivno." #: db_structure.php:404 libraries/display_tbl.lib.php:1945 #, 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 "Pogled ima vsaj toliko vrstic. Prosimo, oglejte si %sdokumentacijo%s." #: db_structure.php:418 db_structure.php:432 libraries/header.inc.php:138 @@ -853,8 +853,8 @@ msgstr "Dump je shranjen v datoteko %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 "" "Najverjetneje ste poskušali naložiti preveliko datoteko. Prosimo, oglejte si " "%sdokumentacijo%s za načine, kako obiti to omejitev." @@ -1491,8 +1491,8 @@ msgstr "Pripomba" #: libraries/Index.class.php:465 libraries/common.lib.php:610 #: libraries/common.lib.php:1143 libraries/config/messages.inc.php:459 -#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1119 -#: libraries/import.lib.php:1143 libraries/schema/User_Schema.class.php:168 +#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1131 +#: libraries/import.lib.php:1155 libraries/schema/User_Schema.class.php:168 #: setup/frames/index.inc.php:125 tbl_row_action.php:68 msgid "Edit" msgstr "Uredi" @@ -1641,8 +1641,8 @@ msgstr "Dobrodošli 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 "" "Najverjetneje niste ustvarili konfiguracijske datoteke. Morda želite " "uporabiti %1$snastavitveni skript%2$s, da jo ustvarite." @@ -2044,7 +2044,7 @@ msgstr "Imenik, ki ste ga določili za nalaganje, je nedosegljiv" #: libraries/config.values.php:95 libraries/export/htmlword.php:24 #: libraries/export/latex.php:41 libraries/export/odt.php:33 #: libraries/export/sql.php:79 libraries/export/texytext.php:23 -#: libraries/import.lib.php:1141 +#: libraries/import.lib.php:1153 msgid "structure" msgstr "struktura" @@ -3081,7 +3081,6 @@ msgid "Display servers selection" msgstr "Prikaži izbiro strežnikov" #: libraries/config/messages.inc.php:268 -#| msgid "Display databases in a tree" msgid "Display table filter" msgstr "Prikaži filter tabel" @@ -3224,7 +3223,6 @@ msgid "Login cookie validity" msgstr "Veljavnost prijavnega piškotka" #: libraries/config/messages.inc.php:296 -#| msgid "Double size of textarea for LONGTEXT fields" msgid "Double size of textarea for LONGTEXT columns" msgstr "Dvojna velikost besedilnega polja za stolpce LONGTEXT" @@ -3358,10 +3356,6 @@ msgid "Persistent connections" msgstr "Vztrajne povezave" #: libraries/config/messages.inc.php:325 -#| msgid "" -#| "Disable the default warning that is displayed on the database details " -#| "Structure page if any of the required tables for the relation features " -#| "could not be found" msgid "" "Disable the default warning that is displayed on the database details " "Structure page if any of the required tables for the phpMyAdmin " @@ -4523,8 +4517,8 @@ msgstr ", @TABLE@ bo postalo ime tabele" #, 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 "" "Vrednost je prevedena z uporabo %1$sstrftime%2$s, tako da lahko uporabljate " "nize za zapis časa. Dodatno bo prišlo še do naslednjih pretvorb: %3$s. " @@ -4702,7 +4696,7 @@ msgstr "Uredi po ključu" #: libraries/export/sql.php:55 libraries/export/texytext.php:30 #: libraries/export/xls.php:28 libraries/export/xlsx.php:28 #: libraries/export/xml.php:25 libraries/export/yaml.php:29 -#: libraries/import.lib.php:1114 libraries/import.lib.php:1136 +#: libraries/import.lib.php:1126 libraries/import.lib.php:1148 #: libraries/import/csv.php:32 libraries/import/docsql.php:34 #: libraries/import/ldi.php:48 libraries/import/ods.php:32 #: libraries/import/sql.php:19 libraries/import/xls.php:27 @@ -5548,40 +5542,40 @@ msgstr "Ustvaril" msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL je vrnil kot rezultat prazno množico (npr. nič vrstic)." -#: libraries/import.lib.php:1110 +#: libraries/import.lib.php:1122 msgid "" "The following structures have either been created or altered. Here you can:" msgstr "" "Naslednje strukture so bile ali ustvarjene ali spremenjene: Tukaj lahko:" -#: libraries/import.lib.php:1111 +#: libraries/import.lib.php:1123 msgid "View a structure`s contents by clicking on its name" msgstr "Oglejte si vsebino strukture s klikom na njeno ime" -#: libraries/import.lib.php:1112 +#: libraries/import.lib.php:1124 msgid "" "Change any of its settings by clicking the corresponding \"Options\" link" msgstr "" "Spremenite katero koli njeno nastavitev s klikom na pripadajočo povezavo " "\"Možnosti\"" -#: libraries/import.lib.php:1113 +#: libraries/import.lib.php:1125 msgid "Edit its structure by following the \"Structure\" link" msgstr "Uredite njeno strukturo s sledenjem povezavi \"Struktura\"" -#: libraries/import.lib.php:1116 +#: libraries/import.lib.php:1128 msgid "Go to database" msgstr "Pojdi v zbirko podatkov" -#: libraries/import.lib.php:1119 libraries/import.lib.php:1143 +#: libraries/import.lib.php:1131 libraries/import.lib.php:1155 msgid "settings" msgstr "nastavitve" -#: libraries/import.lib.php:1138 +#: libraries/import.lib.php:1150 msgid "Go to table" msgstr "Pojdi v tabelo" -#: libraries/import.lib.php:1147 +#: libraries/import.lib.php:1159 msgid "Go to view" msgstr "Pojdi na pogled" @@ -7522,8 +7516,8 @@ msgstr "Izbriši zbirke podatkov, ki imajo enako ime kot uporabniki." 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 "" "Obvestilo: phpMyAdmin dobi podatke o uporabnikovih privilegijih iz tabel " "privilegijev MySQL. Vsebina teh tabel se lahko razlikuje od privilegijev, ki " @@ -9169,8 +9163,9 @@ msgstr "" "premik kamor koli" #: tbl_change.php:1106 -#, php-format -msgid "Restart insertion with %s rows" +#, fuzzy, php-format +#| msgid "Restart insertion with %s rows" +msgid "Continue insertion with %s rows" msgstr "Ponovno začni vstavljanje z %s vrsticami" #: tbl_chart.php:56 diff --git a/po/sq.po b/po/sq.po index 902c5ed..20385ad 100644 --- a/po/sq.po +++ b/po/sq.po @@ -3,14 +3,14 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-09-07 15:21+0200\n" +"POT-Creation-Date: 2010-09-10 12:46-0400\n" "PO-Revision-Date: 2010-07-21 14:51+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: albanian <sq(a)li.org>\n" -"Language: sq\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: sq\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.1\n" @@ -610,7 +610,7 @@ msgstr "Shto" #: libraries/config/user_preferences.forms.php:228 #: libraries/config/user_preferences.forms.php:262 #: libraries/db_links.inc.php:48 libraries/export/latex.php:351 -#: libraries/import.lib.php:1136 libraries/tbl_links.inc.php:54 +#: libraries/import.lib.php:1148 libraries/tbl_links.inc.php:54 #: pmd_general.php:133 server_privileges.php:595 server_replication.php:313 #: tbl_create.php:305 tbl_tracking.php:263 msgid "Structure" @@ -659,8 +659,8 @@ msgstr "Gjurmimi nuk është aktiv." #: db_structure.php:404 libraries/display_tbl.lib.php:1945 #, 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 "" #: db_structure.php:418 db_structure.php:432 libraries/header.inc.php:138 @@ -873,8 +873,8 @@ msgstr "Dump u ruajt tek file %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 "" #: import.php:277 import.php:330 libraries/File.class.php:566 @@ -1578,8 +1578,8 @@ msgstr "Komente" #: libraries/Index.class.php:465 libraries/common.lib.php:610 #: libraries/common.lib.php:1143 libraries/config/messages.inc.php:459 -#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1119 -#: libraries/import.lib.php:1143 libraries/schema/User_Schema.class.php:168 +#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1131 +#: libraries/import.lib.php:1155 libraries/schema/User_Schema.class.php:168 #: setup/frames/index.inc.php:125 tbl_row_action.php:68 msgid "Edit" msgstr "Ndrysho" @@ -1721,8 +1721,8 @@ msgstr "Mirësevini tek %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 "" #: libraries/auth/config.auth.lib.php:115 @@ -2126,7 +2126,7 @@ msgstr "Directory që keni zgjedhur për upload nuk arrin të gjehet" #: libraries/config.values.php:95 libraries/export/htmlword.php:24 #: libraries/export/latex.php:41 libraries/export/odt.php:33 #: libraries/export/sql.php:79 libraries/export/texytext.php:23 -#: libraries/import.lib.php:1141 +#: libraries/import.lib.php:1153 #, fuzzy msgid "structure" msgstr "Struktura" @@ -4545,8 +4545,8 @@ msgstr "" #, 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 "" #: libraries/display_export.lib.php:275 @@ -4724,7 +4724,7 @@ msgstr "Rendit sipas kyçit" #: libraries/export/sql.php:55 libraries/export/texytext.php:30 #: libraries/export/xls.php:28 libraries/export/xlsx.php:28 #: libraries/export/xml.php:25 libraries/export/yaml.php:29 -#: libraries/import.lib.php:1114 libraries/import.lib.php:1136 +#: libraries/import.lib.php:1126 libraries/import.lib.php:1148 #: libraries/import/csv.php:32 libraries/import/docsql.php:34 #: libraries/import/ldi.php:48 libraries/import/ods.php:32 #: libraries/import/sql.php:19 libraries/import/xls.php:27 @@ -5528,38 +5528,38 @@ msgstr "Gjeneruar nga" msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL ka kthyer një të përbashkët boshe (p.sh. zero rreshta)." -#: libraries/import.lib.php:1110 +#: libraries/import.lib.php:1122 msgid "" "The following structures have either been created or altered. Here you can:" msgstr "" -#: libraries/import.lib.php:1111 +#: libraries/import.lib.php:1123 msgid "View a structure`s contents by clicking on its name" msgstr "" -#: libraries/import.lib.php:1112 +#: libraries/import.lib.php:1124 msgid "" "Change any of its settings by clicking the corresponding \"Options\" link" msgstr "" -#: libraries/import.lib.php:1113 +#: libraries/import.lib.php:1125 msgid "Edit its structure by following the \"Structure\" link" msgstr "" -#: libraries/import.lib.php:1116 +#: libraries/import.lib.php:1128 #, fuzzy msgid "Go to database" msgstr "Asnjë databazë" -#: libraries/import.lib.php:1119 libraries/import.lib.php:1143 +#: libraries/import.lib.php:1131 libraries/import.lib.php:1155 msgid "settings" msgstr "" -#: libraries/import.lib.php:1138 +#: libraries/import.lib.php:1150 msgid "Go to table" msgstr "" -#: libraries/import.lib.php:1147 +#: libraries/import.lib.php:1159 msgid "Go to view" msgstr "" @@ -7552,8 +7552,8 @@ msgstr "Elemino databazat që kanë emër të njëjtë me përdoruesit." 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 "" "Shënim: phpMyAdmin lexon të drejtat e përdoruesve direkt nga tabela e " "privilegjeve të MySQL. Përmbajtja e kësaj tabele mund të ndryshojë prej të " @@ -9023,7 +9023,7 @@ msgstr "" #: tbl_change.php:1106 #, php-format -msgid "Restart insertion with %s rows" +msgid "Continue insertion with %s rows" msgstr "" #: tbl_chart.php:56 diff --git a/po/sr.po b/po/sr.po index a80bd34..4b210bf 100644 --- a/po/sr.po +++ b/po/sr.po @@ -3,16 +3,16 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-09-07 15:21+0200\n" +"POT-Creation-Date: 2010-09-10 12:46-0400\n" "PO-Revision-Date: 2010-03-30 23:47+0200\n" "Last-Translator: Michal <michal(a)cihar.com>\n" "Language-Team: serbian_cyrillic <sr(a)li.org>\n" -"Language: sr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Language: sr\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" +"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Pootle 2.0.1\n" #: browse_foreigners.php:36 browse_foreigners.php:57 @@ -616,7 +616,7 @@ msgstr "Нови запис" #: libraries/config/user_preferences.forms.php:228 #: libraries/config/user_preferences.forms.php:262 #: libraries/db_links.inc.php:48 libraries/export/latex.php:351 -#: libraries/import.lib.php:1136 libraries/tbl_links.inc.php:54 +#: libraries/import.lib.php:1148 libraries/tbl_links.inc.php:54 #: pmd_general.php:133 server_privileges.php:595 server_replication.php:313 #: tbl_create.php:305 tbl_tracking.php:263 msgid "Structure" @@ -665,8 +665,8 @@ msgstr "" #: db_structure.php:404 libraries/display_tbl.lib.php:1945 #, 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 "" #: db_structure.php:418 db_structure.php:432 libraries/header.inc.php:138 @@ -880,11 +880,11 @@ msgstr "Садржај базе је сачуван у датотеку %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 "" -"Вероватно сте покушали да увезете превелику датотеку. Молимо погледајте " -"%sдокументацију%s за начине превазилажења овог ограничења." +"Вероватно сте покушали да увезете превелику датотеку. Молимо погледајте %" +"sдокументацију%s за начине превазилажења овог ограничења." #: import.php:277 import.php:330 libraries/File.class.php:566 #: libraries/File.class.php:676 @@ -1601,8 +1601,8 @@ msgstr "Коментари" #: libraries/Index.class.php:465 libraries/common.lib.php:610 #: libraries/common.lib.php:1143 libraries/config/messages.inc.php:459 -#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1119 -#: libraries/import.lib.php:1143 libraries/schema/User_Schema.class.php:168 +#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1131 +#: libraries/import.lib.php:1155 libraries/schema/User_Schema.class.php:168 #: setup/frames/index.inc.php:125 tbl_row_action.php:68 msgid "Edit" msgstr "Промени" @@ -1744,8 +1744,8 @@ msgstr "Добродошли на %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 "" "Вероватан разлог за ово је да нисте направили конфигурациону датотеку. " "Можете користити %1$sскрипт за инсталацију%2$s да бисте је направили." @@ -2155,7 +2155,7 @@ msgstr "Директоријум који сте изабрали за слањ #: libraries/config.values.php:95 libraries/export/htmlword.php:24 #: libraries/export/latex.php:41 libraries/export/odt.php:33 #: libraries/export/sql.php:79 libraries/export/texytext.php:23 -#: libraries/import.lib.php:1141 +#: libraries/import.lib.php:1153 #, fuzzy msgid "structure" msgstr "Структура" @@ -4614,8 +4614,8 @@ msgstr "" #| "happen: %3$s. Other text will be kept as is." 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 "" "Ова вредност се тумачи коришћењем %1$sstrftime%2$s, тако да можете да " "користите стрингове за форматирање времена. Такође ће се десити и следеће " @@ -4811,7 +4811,7 @@ msgstr "Сортирај по кључу" #: libraries/export/sql.php:55 libraries/export/texytext.php:30 #: libraries/export/xls.php:28 libraries/export/xlsx.php:28 #: libraries/export/xml.php:25 libraries/export/yaml.php:29 -#: libraries/import.lib.php:1114 libraries/import.lib.php:1136 +#: libraries/import.lib.php:1126 libraries/import.lib.php:1148 #: libraries/import/csv.php:32 libraries/import/docsql.php:34 #: libraries/import/ldi.php:48 libraries/import/ods.php:32 #: libraries/import/sql.php:19 libraries/import/xls.php:27 @@ -5634,39 +5634,39 @@ msgstr "Генерисао" msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL је вратио празан резултат (нула редова)." -#: libraries/import.lib.php:1110 +#: libraries/import.lib.php:1122 msgid "" "The following structures have either been created or altered. Here you can:" msgstr "" -#: libraries/import.lib.php:1111 +#: libraries/import.lib.php:1123 msgid "View a structure`s contents by clicking on its name" msgstr "" -#: libraries/import.lib.php:1112 +#: libraries/import.lib.php:1124 msgid "" "Change any of its settings by clicking the corresponding \"Options\" link" msgstr "" -#: libraries/import.lib.php:1113 +#: libraries/import.lib.php:1125 msgid "Edit its structure by following the \"Structure\" link" msgstr "" -#: libraries/import.lib.php:1116 +#: libraries/import.lib.php:1128 #, fuzzy msgid "Go to database" msgstr "База не постоји" -#: libraries/import.lib.php:1119 libraries/import.lib.php:1143 +#: libraries/import.lib.php:1131 libraries/import.lib.php:1155 msgid "settings" msgstr "" -#: libraries/import.lib.php:1138 +#: libraries/import.lib.php:1150 #, fuzzy msgid "Go to table" msgstr "База не постоји" -#: libraries/import.lib.php:1147 +#: libraries/import.lib.php:1159 msgid "Go to view" msgstr "" @@ -7677,8 +7677,8 @@ msgstr "Одбаци базе које се зову исто као корис 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 "" "Напомена: phpMyAdmin узима привилегије корисника директно из MySQL табела " "привилегија. Садржај ове табеле може се разликовати од привилегија које " @@ -9258,8 +9258,9 @@ msgstr "" "слободно померање" #: tbl_change.php:1106 -#, php-format -msgid "Restart insertion with %s rows" +#, fuzzy, php-format +#| msgid "Restart insertion with %s rows" +msgid "Continue insertion with %s rows" msgstr "Поново покрени уношење са %s редова" #: tbl_chart.php:56 diff --git a/po/sr(a)latin.po b/po/sr(a)latin.po index 3dcca5a..4286ce5 100644 --- a/po/sr(a)latin.po +++ b/po/sr(a)latin.po @@ -3,16 +3,16 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-09-07 15:21+0200\n" +"POT-Creation-Date: 2010-09-10 12:46-0400\n" "PO-Revision-Date: 2010-08-30 19:31+0200\n" "Last-Translator: Vladimir Tošić <vtosic(a)gmail.com>\n" "Language-Team: serbian_latin <sr@latin@li.org>\n" -"Language: sr@latin\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Language: sr@latin\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" +"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Pootle 2.0.5\n" #: browse_foreigners.php:36 browse_foreigners.php:57 @@ -613,7 +613,7 @@ msgstr "Novi zapis" #: libraries/config/user_preferences.forms.php:228 #: libraries/config/user_preferences.forms.php:262 #: libraries/db_links.inc.php:48 libraries/export/latex.php:351 -#: libraries/import.lib.php:1136 libraries/tbl_links.inc.php:54 +#: libraries/import.lib.php:1148 libraries/tbl_links.inc.php:54 #: pmd_general.php:133 server_privileges.php:595 server_replication.php:313 #: tbl_create.php:305 tbl_tracking.php:263 msgid "Structure" @@ -662,8 +662,8 @@ msgstr "" #: db_structure.php:404 libraries/display_tbl.lib.php:1945 #, 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 "" #: db_structure.php:418 db_structure.php:432 libraries/header.inc.php:138 @@ -877,11 +877,11 @@ msgstr "Sadržaj baze je sačuvan u datoteku %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 "" -"Verovatno ste pokušali da uvezete preveliku datoteku. Molimo pogledajte " -"%sdokumentaciju%s za načine prevazilaženja ovog ograničenja." +"Verovatno ste pokušali da uvezete preveliku datoteku. Molimo pogledajte %" +"sdokumentaciju%s za načine prevazilaženja ovog ograničenja." #: import.php:277 import.php:330 libraries/File.class.php:566 #: libraries/File.class.php:676 @@ -1598,8 +1598,8 @@ msgstr "Komentari" #: libraries/Index.class.php:465 libraries/common.lib.php:610 #: libraries/common.lib.php:1143 libraries/config/messages.inc.php:459 -#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1119 -#: libraries/import.lib.php:1143 libraries/schema/User_Schema.class.php:168 +#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1131 +#: libraries/import.lib.php:1155 libraries/schema/User_Schema.class.php:168 #: setup/frames/index.inc.php:125 tbl_row_action.php:68 msgid "Edit" msgstr "Promeni" @@ -1741,8 +1741,8 @@ msgstr "Dobrodošli na %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 "" "Verovatan razlog za ovo je da niste napravili konfiguracionu datoteku. " "Možete koristiti %1$sskript za instalaciju%2$s da biste je napravili." @@ -2152,7 +2152,7 @@ msgstr "Direktorijum koji ste izabrali za slanje nije dostupan" #: libraries/config.values.php:95 libraries/export/htmlword.php:24 #: libraries/export/latex.php:41 libraries/export/odt.php:33 #: libraries/export/sql.php:79 libraries/export/texytext.php:23 -#: libraries/import.lib.php:1141 +#: libraries/import.lib.php:1153 #, fuzzy msgid "structure" msgstr "Struktura" @@ -4609,8 +4609,8 @@ msgstr "" #| "happen: %3$s. Other text will be kept as is." 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 "" "Ova vrednost se tumači korišćenjem %1$sstrftime%2$s, tako da možete da " "koristite stringove za formatiranje vremena. Takođe će se desiti i sledeće " @@ -4806,7 +4806,7 @@ msgstr "Sortiraj po ključu" #: libraries/export/sql.php:55 libraries/export/texytext.php:30 #: libraries/export/xls.php:28 libraries/export/xlsx.php:28 #: libraries/export/xml.php:25 libraries/export/yaml.php:29 -#: libraries/import.lib.php:1114 libraries/import.lib.php:1136 +#: libraries/import.lib.php:1126 libraries/import.lib.php:1148 #: libraries/import/csv.php:32 libraries/import/docsql.php:34 #: libraries/import/ldi.php:48 libraries/import/ods.php:32 #: libraries/import/sql.php:19 libraries/import/xls.php:27 @@ -5625,39 +5625,39 @@ msgstr "Generisao" msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL je vratio prazan rezultat (nula redova)." -#: libraries/import.lib.php:1110 +#: libraries/import.lib.php:1122 msgid "" "The following structures have either been created or altered. Here you can:" msgstr "" -#: libraries/import.lib.php:1111 +#: libraries/import.lib.php:1123 msgid "View a structure`s contents by clicking on its name" msgstr "" -#: libraries/import.lib.php:1112 +#: libraries/import.lib.php:1124 msgid "" "Change any of its settings by clicking the corresponding \"Options\" link" msgstr "" -#: libraries/import.lib.php:1113 +#: libraries/import.lib.php:1125 msgid "Edit its structure by following the \"Structure\" link" msgstr "" -#: libraries/import.lib.php:1116 +#: libraries/import.lib.php:1128 #, fuzzy msgid "Go to database" msgstr "Baza ne postoji" -#: libraries/import.lib.php:1119 libraries/import.lib.php:1143 +#: libraries/import.lib.php:1131 libraries/import.lib.php:1155 msgid "settings" msgstr "" -#: libraries/import.lib.php:1138 +#: libraries/import.lib.php:1150 #, fuzzy msgid "Go to table" msgstr "Baza ne postoji" -#: libraries/import.lib.php:1147 +#: libraries/import.lib.php:1159 msgid "Go to view" msgstr "" @@ -7670,8 +7670,8 @@ msgstr "Odbaci baze koje se zovu isto kao korisnici." 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 "" "Napomena: phpMyAdmin uzima privilegije korisnika direktno iz MySQL tabela " "privilegija. Sadržaj ove tabele može se razlikovati od privilegija koje " @@ -9254,8 +9254,9 @@ msgstr "" "slobodno pomeranje" #: tbl_change.php:1106 -#, php-format -msgid "Restart insertion with %s rows" +#, fuzzy, php-format +#| msgid "Restart insertion with %s rows" +msgid "Continue insertion with %s rows" msgstr "Ponovo pokreni unošenje sa %s redova" #: tbl_chart.php:56 diff --git a/po/sv.po b/po/sv.po index ef6a0c8..428a01c 100644 --- a/po/sv.po +++ b/po/sv.po @@ -3,14 +3,14 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-09-07 15:21+0200\n" +"POT-Creation-Date: 2010-09-10 12:46-0400\n" "PO-Revision-Date: 2010-07-21 14:48+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: swedish <sv(a)li.org>\n" -"Language: sv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: sv\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.1\n" @@ -612,7 +612,7 @@ msgstr "Lägg till" #: libraries/config/user_preferences.forms.php:228 #: libraries/config/user_preferences.forms.php:262 #: libraries/db_links.inc.php:48 libraries/export/latex.php:351 -#: libraries/import.lib.php:1136 libraries/tbl_links.inc.php:54 +#: libraries/import.lib.php:1148 libraries/tbl_links.inc.php:54 #: pmd_general.php:133 server_privileges.php:595 server_replication.php:313 #: tbl_create.php:305 tbl_tracking.php:263 msgid "Structure" @@ -661,8 +661,8 @@ msgstr "" #: db_structure.php:404 libraries/display_tbl.lib.php:1945 #, 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 "Denna vy har åtminstone detta antal rader. Se %sdokumentation%s." #: db_structure.php:418 db_structure.php:432 libraries/header.inc.php:138 @@ -876,8 +876,8 @@ msgstr "SQL-satserna har sparats till filen %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 "" "Du försökte förmodligen ladda upp en för stor fil. Se %sdokumentationen%s " "för metoder att gå runt denna begränsning." @@ -1599,8 +1599,8 @@ msgstr "Kommentar" #: libraries/Index.class.php:465 libraries/common.lib.php:610 #: libraries/common.lib.php:1143 libraries/config/messages.inc.php:459 -#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1119 -#: libraries/import.lib.php:1143 libraries/schema/User_Schema.class.php:168 +#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1131 +#: libraries/import.lib.php:1155 libraries/schema/User_Schema.class.php:168 #: setup/frames/index.inc.php:125 tbl_row_action.php:68 msgid "Edit" msgstr "Ändra" @@ -1747,8 +1747,8 @@ msgstr "Välkommen till %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 "" "Trolig orsak till detta är att du inte skapade en konfigurationsfil. Du vill " "kanske använda %1$suppsättningsskript%2$s för att skapa en." @@ -2164,7 +2164,7 @@ msgstr "Katalogen som du konfigurerat för uppladdning kan inte nås" #: libraries/config.values.php:95 libraries/export/htmlword.php:24 #: libraries/export/latex.php:41 libraries/export/odt.php:33 #: libraries/export/sql.php:79 libraries/export/texytext.php:23 -#: libraries/import.lib.php:1141 +#: libraries/import.lib.php:1153 #, fuzzy msgid "structure" msgstr "Struktur" @@ -4778,8 +4778,8 @@ msgstr "" #| "happen: %3$s. Other text will be kept as is." 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 "" "Detta värde tolkas mha %1$sstrftime%2$s, så du kan använda strängar med " "tidsformatering. Dessutom kommer följande omvandlingar att ske: %3$s. Övrig " @@ -4981,7 +4981,7 @@ msgstr "Sortera efter nyckel" #: libraries/export/sql.php:55 libraries/export/texytext.php:30 #: libraries/export/xls.php:28 libraries/export/xlsx.php:28 #: libraries/export/xml.php:25 libraries/export/yaml.php:29 -#: libraries/import.lib.php:1114 libraries/import.lib.php:1136 +#: libraries/import.lib.php:1126 libraries/import.lib.php:1148 #: libraries/import/csv.php:32 libraries/import/docsql.php:34 #: libraries/import/ldi.php:48 libraries/import/ods.php:32 #: libraries/import/sql.php:19 libraries/import/xls.php:27 @@ -5834,39 +5834,39 @@ msgstr "Genererad av" msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL returnerade ett tomt resultat (dvs inga rader)." -#: libraries/import.lib.php:1110 +#: libraries/import.lib.php:1122 msgid "" "The following structures have either been created or altered. Here you can:" msgstr "" -#: libraries/import.lib.php:1111 +#: libraries/import.lib.php:1123 msgid "View a structure`s contents by clicking on its name" msgstr "" -#: libraries/import.lib.php:1112 +#: libraries/import.lib.php:1124 msgid "" "Change any of its settings by clicking the corresponding \"Options\" link" msgstr "" -#: libraries/import.lib.php:1113 +#: libraries/import.lib.php:1125 msgid "Edit its structure by following the \"Structure\" link" msgstr "" -#: libraries/import.lib.php:1116 +#: libraries/import.lib.php:1128 #, fuzzy msgid "Go to database" msgstr "Inga databaser" -#: libraries/import.lib.php:1119 libraries/import.lib.php:1143 +#: libraries/import.lib.php:1131 libraries/import.lib.php:1155 msgid "settings" msgstr "" -#: libraries/import.lib.php:1138 +#: libraries/import.lib.php:1150 #, fuzzy msgid "Go to table" msgstr "Inga databaser" -#: libraries/import.lib.php:1147 +#: libraries/import.lib.php:1159 msgid "Go to view" msgstr "" @@ -7218,8 +7218,8 @@ msgid "" "Your PHP MySQL library version %s differs from your MySQL server version %s. " "This may cause unpredictable behavior." msgstr "" -"Din PHP MySQL bibliotekversion %s skiljer sig från din MySQL serverversion " -"%s. Detta kan orsaka oförutsägbara beteenden." +"Din PHP MySQL bibliotekversion %s skiljer sig från din MySQL serverversion %" +"s. Detta kan orsaka oförutsägbara beteenden." #: main.php:338 #, php-format @@ -7903,8 +7903,8 @@ msgstr "Ta bort databaserna med samma namn som användarna." 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 "" "Anm: phpMyAdmin hämtar användarnas privilegier direkt från MySQL:s " "privilegiumtabeller. Innehållet i dessa tabeller kan skilja sig från " @@ -9401,8 +9401,8 @@ msgid "" "to." msgstr "" "Om du känner att detta är nödvändigt, använd ytterligare " -"säkerhetsinställningar - [a@?page=servers&mode=edit&id=" -"%1$d#tab_Server_config]värdautentisering[/a] och [a@?page=form&" +"säkerhetsinställningar - [a@?page=servers&mode=edit&id=%1" +"$d#tab_Server_config]värdautentisering[/a] och [a@?page=form&" "formset=features#tab_Security]betrodd proxyserverlista[/a]. Dock är kanske " "IP-baserat skydd inte pålitligt om din IP-adress hör till en ISP som " "tusentals användare, inklusive du, är ansluten till." @@ -9562,8 +9562,9 @@ msgstr "" "för att flytta vart som helst" #: tbl_change.php:1106 -#, php-format -msgid "Restart insertion with %s rows" +#, fuzzy, php-format +#| msgid "Restart insertion with %s rows" +msgid "Continue insertion with %s rows" msgstr "Börja om infogning med %s rader" #: tbl_chart.php:56 diff --git a/po/ta.po b/po/ta.po index cb06cc4..51c0685 100644 --- a/po/ta.po +++ b/po/ta.po @@ -6,14 +6,14 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-09-07 15:21+0200\n" +"POT-Creation-Date: 2010-09-10 12:46-0400\n" "PO-Revision-Date: 2010-04-16 10:43+0200\n" "Last-Translator: Sutharshan <sutharshan02(a)gmail.com>\n" "Language-Team: Tamil <ta(a)li.org>\n" -"Language: ta\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: ta\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.1\n" @@ -593,7 +593,7 @@ msgstr "" #: libraries/config/user_preferences.forms.php:228 #: libraries/config/user_preferences.forms.php:262 #: libraries/db_links.inc.php:48 libraries/export/latex.php:351 -#: libraries/import.lib.php:1136 libraries/tbl_links.inc.php:54 +#: libraries/import.lib.php:1148 libraries/tbl_links.inc.php:54 #: pmd_general.php:133 server_privileges.php:595 server_replication.php:313 #: tbl_create.php:305 tbl_tracking.php:263 msgid "Structure" @@ -642,8 +642,8 @@ msgstr "" #: db_structure.php:404 libraries/display_tbl.lib.php:1945 #, 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 "" #: db_structure.php:418 db_structure.php:432 libraries/header.inc.php:138 @@ -847,8 +847,8 @@ msgstr "" #: 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 "" #: import.php:277 import.php:330 libraries/File.class.php:566 @@ -1512,8 +1512,8 @@ msgstr "" #: libraries/Index.class.php:465 libraries/common.lib.php:610 #: libraries/common.lib.php:1143 libraries/config/messages.inc.php:459 -#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1119 -#: libraries/import.lib.php:1143 libraries/schema/User_Schema.class.php:168 +#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1131 +#: libraries/import.lib.php:1155 libraries/schema/User_Schema.class.php:168 #: setup/frames/index.inc.php:125 tbl_row_action.php:68 msgid "Edit" msgstr "" @@ -1653,8 +1653,8 @@ msgstr "" #: 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 "" "நீங்கள் அமைப்பு கோப்பை உருவாக்கவில்லை. அதை உருவாக்க நீங்கள் %1$s உருவாக்க கோவையை %2$s " "பயன்படுத்தலாம்" @@ -2045,7 +2045,7 @@ msgstr "" #: libraries/config.values.php:95 libraries/export/htmlword.php:24 #: libraries/export/latex.php:41 libraries/export/odt.php:33 #: libraries/export/sql.php:79 libraries/export/texytext.php:23 -#: libraries/import.lib.php:1141 +#: libraries/import.lib.php:1153 msgid "structure" msgstr "" @@ -4357,8 +4357,8 @@ msgstr "" #, 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 "" #: libraries/display_export.lib.php:275 @@ -4520,7 +4520,7 @@ msgstr "" #: libraries/export/sql.php:55 libraries/export/texytext.php:30 #: libraries/export/xls.php:28 libraries/export/xlsx.php:28 #: libraries/export/xml.php:25 libraries/export/yaml.php:29 -#: libraries/import.lib.php:1114 libraries/import.lib.php:1136 +#: libraries/import.lib.php:1126 libraries/import.lib.php:1148 #: libraries/import/csv.php:32 libraries/import/docsql.php:34 #: libraries/import/ldi.php:48 libraries/import/ods.php:32 #: libraries/import/sql.php:19 libraries/import/xls.php:27 @@ -5285,37 +5285,37 @@ msgstr "" msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "" -#: libraries/import.lib.php:1110 +#: libraries/import.lib.php:1122 msgid "" "The following structures have either been created or altered. Here you can:" msgstr "" -#: libraries/import.lib.php:1111 +#: libraries/import.lib.php:1123 msgid "View a structure`s contents by clicking on its name" msgstr "" -#: libraries/import.lib.php:1112 +#: libraries/import.lib.php:1124 msgid "" "Change any of its settings by clicking the corresponding \"Options\" link" msgstr "" -#: libraries/import.lib.php:1113 +#: libraries/import.lib.php:1125 msgid "Edit its structure by following the \"Structure\" link" msgstr "" -#: libraries/import.lib.php:1116 +#: libraries/import.lib.php:1128 msgid "Go to database" msgstr "" -#: libraries/import.lib.php:1119 libraries/import.lib.php:1143 +#: libraries/import.lib.php:1131 libraries/import.lib.php:1155 msgid "settings" msgstr "" -#: libraries/import.lib.php:1138 +#: libraries/import.lib.php:1150 msgid "Go to table" msgstr "" -#: libraries/import.lib.php:1147 +#: libraries/import.lib.php:1159 msgid "Go to view" msgstr "" @@ -7121,8 +7121,8 @@ msgstr "" 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 "" #: server_privileges.php:1776 @@ -8560,7 +8560,7 @@ msgstr "" #: tbl_change.php:1106 #, php-format -msgid "Restart insertion with %s rows" +msgid "Continue insertion with %s rows" msgstr "" #: tbl_chart.php:56 diff --git a/po/te.po b/po/te.po index 0e6b831..d3a879e 100644 --- a/po/te.po +++ b/po/te.po @@ -6,14 +6,14 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-09-07 15:21+0200\n" +"POT-Creation-Date: 2010-09-10 12:46-0400\n" "PO-Revision-Date: 2010-05-26 14:20+0200\n" "Last-Translator: <veeven(a)gmail.com>\n" "Language-Team: Telugu <te(a)li.org>\n" -"Language: te\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: te\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.1\n" @@ -604,7 +604,7 @@ msgstr "" #: libraries/config/user_preferences.forms.php:228 #: libraries/config/user_preferences.forms.php:262 #: libraries/db_links.inc.php:48 libraries/export/latex.php:351 -#: libraries/import.lib.php:1136 libraries/tbl_links.inc.php:54 +#: libraries/import.lib.php:1148 libraries/tbl_links.inc.php:54 #: pmd_general.php:133 server_privileges.php:595 server_replication.php:313 #: tbl_create.php:305 tbl_tracking.php:263 msgid "Structure" @@ -654,8 +654,8 @@ msgstr "" #: db_structure.php:404 libraries/display_tbl.lib.php:1945 #, 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 "" # మొదటి అనువాదము @@ -862,8 +862,8 @@ msgstr "" #: 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 "" #: import.php:277 import.php:330 libraries/File.class.php:566 @@ -1564,8 +1564,8 @@ msgstr "వ్యాఖ్య" #: libraries/Index.class.php:465 libraries/common.lib.php:610 #: libraries/common.lib.php:1143 libraries/config/messages.inc.php:459 -#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1119 -#: libraries/import.lib.php:1143 libraries/schema/User_Schema.class.php:168 +#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1131 +#: libraries/import.lib.php:1155 libraries/schema/User_Schema.class.php:168 #: setup/frames/index.inc.php:125 tbl_row_action.php:68 msgid "Edit" msgstr "మార్చు" @@ -1706,8 +1706,8 @@ msgstr "%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 "" #: libraries/auth/config.auth.lib.php:115 @@ -2103,7 +2103,7 @@ msgstr "" #: libraries/config.values.php:95 libraries/export/htmlword.php:24 #: libraries/export/latex.php:41 libraries/export/odt.php:33 #: libraries/export/sql.php:79 libraries/export/texytext.php:23 -#: libraries/import.lib.php:1141 +#: libraries/import.lib.php:1153 msgid "structure" msgstr "" @@ -4445,8 +4445,8 @@ msgstr "" #, 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 "" #: libraries/display_export.lib.php:275 @@ -4610,7 +4610,7 @@ msgstr "" #: libraries/export/sql.php:55 libraries/export/texytext.php:30 #: libraries/export/xls.php:28 libraries/export/xlsx.php:28 #: libraries/export/xml.php:25 libraries/export/yaml.php:29 -#: libraries/import.lib.php:1114 libraries/import.lib.php:1136 +#: libraries/import.lib.php:1126 libraries/import.lib.php:1148 #: libraries/import/csv.php:32 libraries/import/docsql.php:34 #: libraries/import/ldi.php:48 libraries/import/ods.php:32 #: libraries/import/sql.php:19 libraries/import/xls.php:27 @@ -5383,37 +5383,37 @@ msgstr "" msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "" -#: libraries/import.lib.php:1110 +#: libraries/import.lib.php:1122 msgid "" "The following structures have either been created or altered. Here you can:" msgstr "" -#: libraries/import.lib.php:1111 +#: libraries/import.lib.php:1123 msgid "View a structure`s contents by clicking on its name" msgstr "" -#: libraries/import.lib.php:1112 +#: libraries/import.lib.php:1124 msgid "" "Change any of its settings by clicking the corresponding \"Options\" link" msgstr "" -#: libraries/import.lib.php:1113 +#: libraries/import.lib.php:1125 msgid "Edit its structure by following the \"Structure\" link" msgstr "" -#: libraries/import.lib.php:1116 +#: libraries/import.lib.php:1128 msgid "Go to database" msgstr "" -#: libraries/import.lib.php:1119 libraries/import.lib.php:1143 +#: libraries/import.lib.php:1131 libraries/import.lib.php:1155 msgid "settings" msgstr "అమరికలు" -#: libraries/import.lib.php:1138 +#: libraries/import.lib.php:1150 msgid "Go to table" msgstr "" -#: libraries/import.lib.php:1147 +#: libraries/import.lib.php:1159 msgid "Go to view" msgstr "" @@ -7277,8 +7277,8 @@ msgstr "" 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 "" #: server_privileges.php:1776 @@ -8733,7 +8733,7 @@ msgstr "" #: tbl_change.php:1106 #, php-format -msgid "Restart insertion with %s rows" +msgid "Continue insertion with %s rows" msgstr "" #: tbl_chart.php:56 diff --git a/po/th.po b/po/th.po index d3e4a49..9a2b53a 100644 --- a/po/th.po +++ b/po/th.po @@ -3,14 +3,14 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-09-07 15:21+0200\n" +"POT-Creation-Date: 2010-09-10 12:46-0400\n" "PO-Revision-Date: 2010-03-12 09:19+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: thai <th(a)li.org>\n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: \n" "X-Generator: Translate Toolkit 1.5.3\n" #: browse_foreigners.php:36 browse_foreigners.php:57 @@ -608,7 +608,7 @@ msgstr "แทรก" #: libraries/config/user_preferences.forms.php:228 #: libraries/config/user_preferences.forms.php:262 #: libraries/db_links.inc.php:48 libraries/export/latex.php:351 -#: libraries/import.lib.php:1136 libraries/tbl_links.inc.php:54 +#: libraries/import.lib.php:1148 libraries/tbl_links.inc.php:54 #: pmd_general.php:133 server_privileges.php:595 server_replication.php:313 #: tbl_create.php:305 tbl_tracking.php:263 msgid "Structure" @@ -657,8 +657,8 @@ msgstr "" #: db_structure.php:404 libraries/display_tbl.lib.php:1945 #, 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 "" #: db_structure.php:418 db_structure.php:432 libraries/header.inc.php:138 @@ -868,8 +868,8 @@ msgstr "" #: 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 "" #: import.php:277 import.php:330 libraries/File.class.php:566 @@ -1571,8 +1571,8 @@ msgstr "หมายเหตุ" #: libraries/Index.class.php:465 libraries/common.lib.php:610 #: libraries/common.lib.php:1143 libraries/config/messages.inc.php:459 -#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1119 -#: libraries/import.lib.php:1143 libraries/schema/User_Schema.class.php:168 +#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1131 +#: libraries/import.lib.php:1155 libraries/schema/User_Schema.class.php:168 #: setup/frames/index.inc.php:125 tbl_row_action.php:68 msgid "Edit" msgstr "แก้ไข" @@ -1714,8 +1714,8 @@ msgstr "%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 "" #: libraries/auth/config.auth.lib.php:115 @@ -2112,7 +2112,7 @@ msgstr "ไม่สามารถใช้งาน ไดเรกทอร #: libraries/config.values.php:95 libraries/export/htmlword.php:24 #: libraries/export/latex.php:41 libraries/export/odt.php:33 #: libraries/export/sql.php:79 libraries/export/texytext.php:23 -#: libraries/import.lib.php:1141 +#: libraries/import.lib.php:1153 #, fuzzy msgid "structure" msgstr "โครงสร้าง" @@ -4532,8 +4532,8 @@ msgstr "" #, 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 "" #: libraries/display_export.lib.php:275 @@ -4711,7 +4711,7 @@ msgstr "เรียงโดยคีย์" #: libraries/export/sql.php:55 libraries/export/texytext.php:30 #: libraries/export/xls.php:28 libraries/export/xlsx.php:28 #: libraries/export/xml.php:25 libraries/export/yaml.php:29 -#: libraries/import.lib.php:1114 libraries/import.lib.php:1136 +#: libraries/import.lib.php:1126 libraries/import.lib.php:1148 #: libraries/import/csv.php:32 libraries/import/docsql.php:34 #: libraries/import/ldi.php:48 libraries/import/ods.php:32 #: libraries/import/sql.php:19 libraries/import/xls.php:27 @@ -5510,38 +5510,38 @@ msgstr "สร้างโดย" msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL คืนผลลัพธ์ว่างเปล่ากลับมา (null / 0 แถว)." -#: libraries/import.lib.php:1110 +#: libraries/import.lib.php:1122 msgid "" "The following structures have either been created or altered. Here you can:" msgstr "" -#: libraries/import.lib.php:1111 +#: libraries/import.lib.php:1123 msgid "View a structure`s contents by clicking on its name" msgstr "" -#: libraries/import.lib.php:1112 +#: libraries/import.lib.php:1124 msgid "" "Change any of its settings by clicking the corresponding \"Options\" link" msgstr "" -#: libraries/import.lib.php:1113 +#: libraries/import.lib.php:1125 msgid "Edit its structure by following the \"Structure\" link" msgstr "" -#: libraries/import.lib.php:1116 +#: libraries/import.lib.php:1128 #, fuzzy msgid "Go to database" msgstr "ไม่มีฐานข้อมูล" -#: libraries/import.lib.php:1119 libraries/import.lib.php:1143 +#: libraries/import.lib.php:1131 libraries/import.lib.php:1155 msgid "settings" msgstr "" -#: libraries/import.lib.php:1138 +#: libraries/import.lib.php:1150 msgid "Go to table" msgstr "" -#: libraries/import.lib.php:1147 +#: libraries/import.lib.php:1159 msgid "Go to view" msgstr "" @@ -7451,8 +7451, 8 @@ msgstr "โยนฐานข้อมูลที่มีชื่อเดี 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 "" #: server_privileges.php:1776 @@ -8914,7 +8914,7 @@ msgstr "" #: tbl_change.php:1106 #, php-format -msgid "Restart insertion with %s rows" +msgid "Continue insertion with %s rows" msgstr "" #: tbl_chart.php:56 diff --git a/po/tr.po b/po/tr.po index 04c2b3b..4cd20df 100644 --- a/po/tr.po +++ b/po/tr.po @@ -3,14 +3,14 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-09-07 15:21+0200\n" +"POT-Creation-Date: 2010-09-10 12:46-0400\n" "PO-Revision-Date: 2010-09-08 22:43+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" @@ -588,7 +588,7 @@ msgstr "Ekle" #: libraries/config/user_preferences.forms.php:228 #: libraries/config/user_preferences.forms.php:262 #: libraries/db_links.inc.php:48 libraries/export/latex.php:351 -#: libraries/import.lib.php:1136 libraries/tbl_links.inc.php:54 +#: libraries/import.lib.php:1148 libraries/tbl_links.inc.php:54 #: pmd_general.php:133 server_privileges.php:595 server_replication.php:313 #: tbl_create.php:305 tbl_tracking.php:263 msgid "Structure" @@ -637,8 +637,8 @@ msgstr "İzleme aktif değil." #: db_structure.php:404 libraries/display_tbl.lib.php:1945 #, 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 "" "Bu görünüm en az bu satır sayısı kadar olur. Lütfen %sbelgeden%s yararlanın." @@ -845,8 +845,8 @@ msgstr "Döküm, %s dosyasına kaydedildi." #: 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 "" "Muhtemelen çok büyük dosya göndermeyi denediniz. Lütfen bu sınıra çözüm yolu " "bulmak için %sbelgeden%s yararlanın." @@ -1484,8 +1484,8 @@ msgstr "Yorum" #: libraries/Index.class.php:465 libraries/common.lib.php:610 #: libraries/common.lib.php:1143 libraries/config/messages.inc.php:459 -#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1119 -#: libraries/import.lib.php:1143 libraries/schema/User_Schema.class.php:168 +#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1131 +#: libraries/import.lib.php:1155 libraries/schema/User_Schema.class.php:168 #: setup/frames/index.inc.php:125 tbl_row_action.php:68 msgid "Edit" msgstr "Düzenle" @@ -1624,8 +1624,8 @@ msgstr "%s'e Hoş Geldiniz" #: 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 "" "Muhtemelen bunun sebebi yapılandırma dosyasını oluşturmadığınız içindir. Bir " "tane oluşturmak için %1$skur programcığı%2$s kullanmak isteyebilirsiniz." @@ -2031,7 +2031,7 @@ msgstr "Gönderme işi için ayarladığınız dizine ulaşılamıyor" #: libraries/config.values.php:95 libraries/export/htmlword.php:24 #: libraries/export/latex.php:41 libraries/export/odt.php:33 #: libraries/export/sql.php:79 libraries/export/texytext.php:23 -#: libraries/import.lib.php:1141 +#: libraries/import.lib.php:1153 msgid "structure" msgstr "yapı" @@ -4522,8 +4522,8 @@ msgstr ", @TABLE@ tablo adı olacaktır" #, 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 "" "Bu değer %1$sstrftime%2$s kullanılarak yorumlanır, bu yüzden zaman " "biçimlendirme dizgisi kullanabilirsiniz. İlave olarak aşağıdaki dönüşümler " @@ -4701,7 +4701,7 @@ msgstr "Anahtara göre sırala" #: libraries/export/sql.php:55 libraries/export/texytext.php:30 #: libraries/export/xls.php:28 libraries/export/xlsx.php:28 #: libraries/export/xml.php:25 libraries/export/yaml.php:29 -#: libraries/import.lib.php:1114 libraries/import.lib.php:1136 +#: libraries/import.lib.php:1126 libraries/import.lib.php:1148 #: libraries/import/csv.php:32 libraries/import/docsql.php:34 #: libraries/import/ldi.php:48 libraries/import/ods.php:32 #: libraries/import/sql.php:19 libraries/import/xls.php:27 @@ -5548,39 +5548,39 @@ msgstr "Üreten:" msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL boş bir sonuç kümesi döndürdü (örn. sıfır satır)." -#: libraries/import.lib.php:1110 +#: libraries/import.lib.php:1122 msgid "" "The following structures have either been created or altered. Here you can:" msgstr "Aşağıdaki yapılar ya oluşturuldu ya da değiştirildi. Buyurun:" -#: libraries/import.lib.php:1111 +#: libraries/import.lib.php:1123 msgid "View a structure`s contents by clicking on its name" msgstr "İsmine tıklayarak yapının içeriklerini görüntüleyin" -#: libraries/import.lib.php:1112 +#: libraries/import.lib.php:1124 msgid "" "Change any of its settings by clicking the corresponding \"Options\" link" msgstr "" "Uyan \"Seçenekler\" bağlantısına tıklayarak bunun herhangi bir ayarını " "değiştirin" -#: libraries/import.lib.php:1113 +#: libraries/import.lib.php:1125 msgid "Edit its structure by following the \"Structure\" link" msgstr "Aşağıdaki \"Yapı\" bağlantısıyla bunun yapısını düzenleyin" -#: libraries/import.lib.php:1116 +#: libraries/import.lib.php:1128 msgid "Go to database" msgstr "Veritabanına git" -#: libraries/import.lib.php:1119 libraries/import.lib.php:1143 +#: libraries/import.lib.php:1131 libraries/import.lib.php:1155 msgid "settings" msgstr "ayarlar" -#: libraries/import.lib.php:1138 +#: libraries/import.lib.php:1150 msgid "Go to table" msgstr "Tabloya git" -#: libraries/import.lib.php:1147 +#: libraries/import.lib.php:1159 msgid "Go to view" msgstr "Görünüme git" @@ -7528,8 +7528,8 @@ msgstr "Kullanıcılarla aynı isimlerde olan veritabanlarını kaldır." 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 "" "Not: phpMyAdmin kullanıcıların yetkilerini doğrudan MySQL'in yetki " "tablolarından alır. Bu tabloların içerikleri, eğer elle değiştirildiyse " @@ -8913,8 +8913,8 @@ msgid "" "A newer version of phpMyAdmin is available and you should consider " "upgrading. The newest version is %s, released on %s." msgstr "" -"phpMyAdmin'in yeni sürümü mevcut ve yükseltmeyi düşünmelisiniz. Yeni sürüm " -"%s, %s tarihinde yayınlandı." +"phpMyAdmin'in yeni sürümü mevcut ve yükseltmeyi düşünmelisiniz. Yeni sürüm %" +"s, %s tarihinde yayınlandı." #: setup/lib/index.lib.php:162 #, php-format @@ -9171,8 +9171,9 @@ msgstr "" "CTRL+OK TUŞLARI'nı kullanın" #: tbl_change.php:1106 -#, php-format -msgid "Restart insertion with %s rows" +#, fuzzy, php-format +#| msgid "Restart insertion with %s rows" +msgid "Continue insertion with %s rows" msgstr "%s satırlı eklemeyi yeniden başlat" #: tbl_chart.php:56 diff --git a/po/tt.po b/po/tt.po index 6ba0360..98c49b5 100644 --- a/po/tt.po +++ b/po/tt.po @@ -3,14 +3,14 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-09-07 15:21+0200\n" +"POT-Creation-Date: 2010-09-10 12:46-0400\n" "PO-Revision-Date: 2010-07-22 02:25+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: tatarish <tt(a)li.org>\n" -"Language: tt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: tt\n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Pootle 2.0.1\n" @@ -607,7 +607,7 @@ msgstr "Östäw" #: libraries/config/user_preferences.forms.php:228 #: libraries/config/user_preferences.forms.php:262 #: libraries/db_links.inc.php:48 libraries/export/latex.php:351 -#: libraries/import.lib.php:1136 libraries/tbl_links.inc.php:54 +#: libraries/import.lib.php:1148 libraries/tbl_links.inc.php:54 #: pmd_general.php:133 server_privileges.php:595 server_replication.php:313 #: tbl_create.php:305 tbl_tracking.php:263 msgid "Structure" @@ -656,8 +656,8 @@ msgstr "" #: db_structure.php:404 libraries/display_tbl.lib.php:1945 #, 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 "" #: db_structure.php:418 db_structure.php:432 libraries/header.inc.php:138 @@ -872,8 +872,8 @@ msgstr "Eçtälege \"%s\" biremenä saqlandı." #: 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 "" #: import.php:277 import.php:330 libraries/File.class.php:566 @@ -1578,8 +1578,8 @@ msgstr "Açıqlama" #: libraries/Index.class.php:465 libraries/common.lib.php:610 #: libraries/common.lib.php:1143 libraries/config/messages.inc.php:459 -#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1119 -#: libraries/import.lib.php:1143 libraries/schema/User_Schema.class.php:168 +#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1131 +#: libraries/import.lib.php:1155 libraries/schema/User_Schema.class.php:168 #: setup/frames/index.inc.php:125 tbl_row_action.php:68 msgid "Edit" msgstr "Tözätü" @@ -1721,8 +1721,8 @@ msgstr "%s siña İsäñme di" #: 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 "" #: libraries/auth/config.auth.lib.php:115 @@ -2130,7 +2130,7 @@ msgstr "Yökläw öçen bigelängän törgäkne uqıp bulmí" #: libraries/config.values.php:95 libraries/export/htmlword.php:24 #: libraries/export/latex.php:41 libraries/export/odt.php:33 #: libraries/export/sql.php:79 libraries/export/texytext.php:23 -#: libraries/import.lib.php:1141 +#: libraries/import.lib.php:1153 #, fuzzy msgid "structure" msgstr "Tözeleş" @@ -4575,8 +4575,8 @@ msgstr "" #, 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 "" #: libraries/display_export.lib.php:275 @@ -4759,7 +4759,7 @@ msgstr "Qullanası tezeş" #: libraries/export/sql.php:55 libraries/export/texytext.php:30 #: libraries/export/xls.php:28 libraries/export/xlsx.php:28 #: libraries/export/xml.php:25 libraries/export/yaml.php:29 -#: libraries/import.lib.php:1114 libraries/import.lib.php:1136 +#: libraries/import.lib.php:1126 libraries/import.lib.php:1148 #: libraries/import/csv.php:32 libraries/import/docsql.php:34 #: libraries/import/ldi.php:48 libraries/import/ods.php:32 #: libraries/import/sql.php:19 libraries/import/xls.php:27 @@ -5579,39 +5579,39 @@ msgstr "Ürçätkeç:" msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL sorawğa buş cawap, yäğni nül kertem qaytarttı." -#: libraries/import.lib.php:1110 +#: libraries/import.lib.php:1122 msgid "" "The following structures have either been created or altered. Here you can:" msgstr "" -#: libraries/import.lib.php:1111 +#: libraries/import.lib.php:1123 msgid "View a structure`s contents by clicking on its name" msgstr "" -#: libraries/import.lib.php:1112 +#: libraries/import.lib.php:1124 msgid "" "Change any of its settings by clicking the corresponding \"Options\" link" msgstr "" -#: libraries/import.lib.php:1113 +#: libraries/import.lib.php:1125 msgid "Edit its structure by following the \"Structure\" link" msgstr "" -#: libraries/import.lib.php:1116 +#: libraries/import.lib.php:1128 #, fuzzy msgid "Go to database" msgstr "Biremleklär yuq" -#: libraries/import.lib.php:1119 libraries/import.lib.php:1143 +#: libraries/import.lib.php:1131 libraries/import.lib.php:1155 msgid "settings" msgstr "" -#: libraries/import.lib.php:1138 +#: libraries/import.lib.php:1150 #, fuzzy msgid "Go to table" msgstr "Biremleklär yuq" -#: libraries/import.lib.php:1147 +#: libraries/import.lib.php:1159 msgid "Go to view" msgstr "" @@ -6474,8 +6474,8 @@ msgid "" "The SQL validator could not be initialized. Please check if you have " "installed the necessary PHP extensions as described in the %sdocumentation%s." msgstr "" -"SQL-tikşerüçe köylänmägän. Bu kiräk bulğan php-yöklämäne köyläw turında " -"%squllanmada%s uqıp bula." +"SQL-tikşerüçe köylänmägän. Bu kiräk bulğan php-yöklämäne köyläw turında %" +"squllanmada%s uqıp bula." #: libraries/tbl_links.inc.php:106 libraries/tbl_links.inc.php:107 msgid "Table seems to be empty!" @@ -7594,8 +7594,8 @@ msgstr "Bu qullanuçılar kebek atalğan biremleklärne beteräse." 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 "" "Beläse: MySQL-serverneñ eçke tüşämä eçennän alınğan xoquqlar bu. Server " "qullana torğan xoquqlar qul aşa üzgärtelgän bulsa, bu tüşämä eçtälege " @@ -9081,7 +9081,7 @@ msgstr "" #: tbl_change.php:1106 #, php-format -msgid "Restart insertion with %s rows" +msgid "Continue insertion with %s rows" msgstr "" #: tbl_chart.php:56 diff --git a/po/ug.po b/po/ug.po index bd9fba0..f0ad8ab 100644 --- a/po/ug.po +++ b/po/ug.po @@ -6,14 +6,14 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-09-07 15:21+0200\n" +"POT-Creation-Date: 2010-09-10 12:46-0400\n" "PO-Revision-Date: 2010-08-26 11:59+0200\n" "Last-Translator: <gheni(a)yahoo.cn>\n" "Language-Team: Uyghur <ug(a)li.org>\n" -"Language: ug\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: ug\n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Pootle 2.0.5\n" @@ -342,8 +342,8 @@ msgid "" "The phpMyAdmin configuration storage has been deactivated. To find out why " "click %shere%s." msgstr "" -"ئالاقىدار جەدۋەللەرنىڭ قوشۇمچە ئىقتىدارى پائالسىز. سەۋەبىنى ئېنىقلاش ئۈچۈن " -"%sبۇ يەرنى كۆرۈڭ%s." +"ئالاقىدار جەدۋەللەرنىڭ قوشۇمچە ئىقتىدارى پائالسىز. سەۋەبىنى ئېنىقلاش ئۈچۈن %" +"sبۇ يەرنى كۆرۈڭ%s." #: db_operations.php:549 #, fuzzy @@ -592,7 +592,7 @@ msgstr "قىستۇرۇش" #: libraries/config/user_preferences.forms.php:228 #: libraries/config/user_preferences.forms.php:262 #: libraries/db_links.inc.php:48 libraries/export/latex.php:351 -#: libraries/import.lib.php:1136 libraries/tbl_links.inc.php:54 +#: libraries/import.lib.php:1148 libraries/tbl_links.inc.php:54 #: pmd_general.php:133 server_privileges.php:595 server_replication.php:313 #: tbl_create.php:305 tbl_tracking.php:263 msgid "Structure" @@ -641,8 +641,8 @@ msgstr "ئىزلاش ئاكتىپ ئەمەس" #: db_structure.php:404 libraries/display_tbl.lib.php:1945 #, 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 "بۇ كۆرسەتمە كامىدا ئىگە بولغان سەپ، %sھۆججەت%s." #: db_structure.php:418 db_structure.php:432 libraries/header.inc.php:138 @@ -848,8 +848,8 @@ msgstr "%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 "" "سىز يوللىماقچى بولغان ھۆججەت بەك چوڭكەن، %sياردەم%s ھۆججىتىدىن ھەل قىلىش " "چارىسىنى كۆرۈڭ." @@ -1505,8 +1505,8 @@ msgstr "ئىزاھات" #: libraries/Index.class.php:465 libraries/common.lib.php:610 #: libraries/common.lib.php:1143 libraries/config/messages.inc.php:459 -#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1119 -#: libraries/import.lib.php:1143 libraries/schema/User_Schema.class.php:168 +#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1131 +#: libraries/import.lib.php:1155 libraries/schema/User_Schema.class.php:168 #: setup/frames/index.inc.php:125 tbl_row_action.php:68 msgid "Edit" msgstr "تەھىرلەش" @@ -1645,11 +1645,11 @@ msgstr "%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 "" -"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." #: libraries/auth/config.auth.lib.php:115 msgid "" @@ -2044,7 +2044,7 @@ msgstr "كۆرسىتىلگەن مۇندەرىجىگە يۈكلىيەلمىدى" #: libraries/config.values.php:95 libraries/export/htmlword.php:24 #: libraries/export/latex.php:41 libraries/export/odt.php:33 #: libraries/export/sql.php:79 libraries/export/texytext.php:23 -#: libraries/import.lib.php:1141 +#: libraries/import.lib.php:1153 msgid "structure" msgstr "" @@ -4408,8 +4408,8 @@ msgstr "" #, 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 "" #: libraries/display_export.lib.php:275 @@ -4591,7 +4591,7 @@ msgstr "" #: libraries/export/sql.php:55 libraries/export/texytext.php:30 #: libraries/export/xls.php:28 libraries/export/xlsx.php:28 #: libraries/export/xml.php:25 libraries/export/yaml.php:29 -#: libraries/import.lib.php:1114 libraries/import.lib.php:1136 +#: libraries/import.lib.php:1126 libraries/import.lib.php:1148 #: libraries/import/csv.php:32 libraries/import/docsql.php:34 #: libraries/import/ldi.php:48 libraries/import/ods.php:32 #: libraries/import/sql.php:19 libraries/import/xls.php:27 @@ -5378,37 +5378,37 @@ msgstr "" msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "" -#: libraries/import.lib.php:1110 +#: libraries/import.lib.php:1122 msgid "" "The following structures have either been created or altered. Here you can:" msgstr "" -#: libraries/import.lib.php:1111 +#: libraries/import.lib.php:1123 msgid "View a structure`s contents by clicking on its name" msgstr "" -#: libraries/import.lib.php:1112 +#: libraries/import.lib.php:1124 msgid "" "Change any of its settings by clicking the corresponding \"Options\" link" msgstr "" -#: libraries/import.lib.php:1113 +#: libraries/import.lib.php:1125 msgid "Edit its structure by following the \"Structure\" link" msgstr "" -#: libraries/import.lib.php:1116 +#: libraries/import.lib.php:1128 msgid "Go to database" msgstr "" -#: libraries/import.lib.php:1119 libraries/import.lib.php:1143 +#: libraries/import.lib.php:1131 libraries/import.lib.php:1155 msgid "settings" msgstr "" -#: libraries/import.lib.php:1138 +#: libraries/import.lib.php:1150 msgid "Go to table" msgstr "" -#: libraries/import.lib.php:1147 +#: libraries/import.lib.php:1159 msgid "Go to view" msgstr "" @@ -6583,8 +6583,8 @@ msgid "" "The additional features for working with linked tables have been " "deactivated. To find out why click %shere%s." msgstr "" -"ئالاقىدار جەدۋەللەرنىڭ قوشۇمچە ئىقتىدارى پائالسىز. سەۋەبىنى ئېنىقلاش ئۈچۈن " -"%sبۇ يەرنى كۆرۈڭ%s." +"ئالاقىدار جەدۋەللەرنىڭ قوشۇمچە ئىقتىدارى پائالسىز. سەۋەبىنى ئېنىقلاش ئۈچۈن %" +"sبۇ يەرنى كۆرۈڭ%s." #: main.php:311 msgid "" @@ -7239,8 +7239,8 @@ msgstr "" 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 "" #: server_privileges.php:1776 @@ -8678,7 +8678,7 @@ msgstr "" #: tbl_change.php:1106 #, php-format -msgid "Restart insertion with %s rows" +msgid "Continue insertion with %s rows" msgstr "" #: tbl_chart.php:56 diff --git a/po/uk.po b/po/uk.po index e22713e..e2c468d 100644 --- a/po/uk.po +++ b/po/uk.po @@ -3,16 +3,16 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-09-07 15:21+0200\n" +"POT-Creation-Date: 2010-09-10 12:46-0400\n" "PO-Revision-Date: 2010-07-27 23:41+0200\n" "Last-Translator: Olexiy Zagorskyi <zalex_ua(a)i.ua>\n" "Language-Team: ukrainian <uk(a)li.org>\n" -"Language: uk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Language: uk\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" +"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Pootle 2.0.1\n" #: browse_foreigners.php:36 browse_foreigners.php:57 @@ -600,7 +600,7 @@ msgstr "Вставити" #: libraries/config/user_preferences.forms.php:228 #: libraries/config/user_preferences.forms.php:262 #: libraries/db_links.inc.php:48 libraries/export/latex.php:351 -#: libraries/import.lib.php:1136 libraries/tbl_links.inc.php:54 +#: libraries/import.lib.php:1148 libraries/tbl_links.inc.php:54 #: pmd_general.php:133 server_privileges.php:595 server_replication.php:313 #: tbl_create.php:305 tbl_tracking.php:263 msgid "Structure" @@ -649,8 +649,8 @@ msgstr "" #: db_structure.php:404 libraries/display_tbl.lib.php:1945 #, 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 "" #: db_structure.php:418 db_structure.php:432 libraries/header.inc.php:138 @@ -856,8 +856,8 @@ msgstr "Dump збережено у файл %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 "" #: import.php:277 import.php:330 libraries/File.class.php:566 @@ -1557,8 +1557,8 @@ msgstr "" #: libraries/Index.class.php:465 libraries/common.lib.php:610 #: libraries/common.lib.php:1143 libraries/config/messages.inc.php:459 -#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1119 -#: libraries/import.lib.php:1143 libraries/schema/User_Schema.class.php:168 +#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1131 +#: libraries/import.lib.php:1155 libraries/schema/User_Schema.class.php:168 #: setup/frames/index.inc.php:125 tbl_row_action.php:68 msgid "Edit" msgstr "Редагувати" @@ -1698,8 +1698,8 @@ msgstr "Ласкаво просимо до %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 "" #: libraries/auth/config.auth.lib.php:115 @@ -2103,7 +2103,7 @@ msgstr "Встановлений Вами каталог для завантаж #: libraries/config.values.php:95 libraries/export/htmlword.php:24 #: libraries/export/latex.php:41 libraries/export/odt.php:33 #: libraries/export/sql.php:79 libraries/export/texytext.php:23 -#: libraries/import.lib.php:1141 +#: libraries/import.lib.php:1153 msgid "structure" msgstr "" @@ -4497,8 +4497,8 @@ msgstr "" #, 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 "" #: libraries/display_export.lib.php:275 @@ -4678,7 +4678,7 @@ msgstr "" #: libraries/export/sql.php:55 libraries/export/texytext.php:30 #: libraries/export/xls.php:28 libraries/export/xlsx.php:28 #: libraries/export/xml.php:25 libraries/export/yaml.php:29 -#: libraries/import.lib.php:1114 libraries/import.lib.php:1136 +#: libraries/import.lib.php:1126 libraries/import.lib.php:1148 #: libraries/import/csv.php:32 libraries/import/docsql.php:34 #: libraries/import/ldi.php:48 libraries/import/ods.php:32 #: libraries/import/sql.php:19 libraries/import/xls.php:27 @@ -5468,37 +5468,37 @@ msgstr "Згенеровано" msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL повернула пустий результат (тобто нуль рядків)." -#: libraries/import.lib.php:1110 +#: libraries/import.lib.php:1122 msgid "" "The following structures have either been created or altered. Here you can:" msgstr "" -#: libraries/import.lib.php:1111 +#: libraries/import.lib.php:1123 msgid "View a structure`s contents by clicking on its name" msgstr "" -#: libraries/import.lib.php:1112 +#: libraries/import.lib.php:1124 msgid "" "Change any of its settings by clicking the corresponding \"Options\" link" msgstr "" -#: libraries/import.lib.php:1113 +#: libraries/import.lib.php:1125 msgid "Edit its structure by following the \"Structure\" link" msgstr "" -#: libraries/import.lib.php:1116 +#: libraries/import.lib.php:1128 msgid "Go to database" msgstr "" -#: libraries/import.lib.php:1119 libraries/import.lib.php:1143 +#: libraries/import.lib.php:1131 libraries/import.lib.php:1155 msgid "settings" msgstr "" -#: libraries/import.lib.php:1138 +#: libraries/import.lib.php:1150 msgid "Go to table" msgstr "" -#: libraries/import.lib.php:1147 +#: libraries/import.lib.php:1159 msgid "Go to view" msgstr "" @@ -6402,8 +6402,8 @@ msgid "" "For a list of available transformation options and their MIME type " "transformations, click on %stransformation descriptions%s" msgstr "" -"Щоб отримати список можливих опцій і їх MIME-type перетворень, натисніть " -"%sописи перетворень%s" +"Щоб отримати список можливих опцій і їх MIME-type перетворень, натисніть %" +"sописи перетворень%s" #: libraries/tbl_properties.inc.php:143 msgid "Transformation options" @@ -7444,8 +7444,8 @@ msgstr "Усунути бази даних, які мають такі ж наз 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 "" "Примітка: phpMyAdmin отримує права користувачів безпосередньо з таблиці прав " "MySQL. Зміст цієї таблиці може відрізнятися від прав, які використовуються " @@ -8905,7 +8905,7 @@ msgstr "" #: tbl_change.php:1106 #, php-format -msgid "Restart insertion with %s rows" +msgid "Continue insertion with %s rows" msgstr "" #: tbl_chart.php:56 diff --git a/po/ur.po b/po/ur.po index f49a7f5..ca1a991 100644 --- a/po/ur.po +++ b/po/ur.po @@ -6,14 +6,14 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-09-07 15:21+0200\n" +"POT-Creation-Date: 2010-09-10 12:46-0400\n" "PO-Revision-Date: 2010-05-14 12:35+0200\n" "Last-Translator: <monymirza(a)gmail.com>\n" "Language-Team: Urdu <ur(a)li.org>\n" -"Language: ur\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: ur\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.1\n" @@ -614,7 +614,7 @@ msgstr "داخل کریں" #: libraries/config/user_preferences.forms.php:228 #: libraries/config/user_preferences.forms.php:262 #: libraries/db_links.inc.php:48 libraries/export/latex.php:351 -#: libraries/import.lib.php:1136 libraries/tbl_links.inc.php:54 +#: libraries/import.lib.php:1148 libraries/tbl_links.inc.php:54 #: pmd_general.php:133 server_privileges.php:595 server_replication.php:313 #: tbl_create.php:305 tbl_tracking.php:263 msgid "Structure" @@ -663,11 +663,11 @@ msgstr "ٹریکنگ ایکٹو نہیں ہے" #: db_structure.php:404 libraries/display_tbl.lib.php:1945 #, 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 "" -"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." #: db_structure.php:418 db_structure.php:432 libraries/header.inc.php:138 #: libraries/tbl_info.inc.php:60 tbl_structure.php:205 test/theme.php:73 @@ -871,11 +871,11 @@ msgstr "Dump has been saved to file %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 "" -"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." #: import.php:277 import.php:330 libraries/File.class.php:566 #: libraries/File.class.php:676 @@ -1517,8 +1517,8 @@ msgstr "" #: libraries/Index.class.php:465 libraries/common.lib.php:610 #: libraries/common.lib.php:1143 libraries/config/messages.inc.php:459 -#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1119 -#: libraries/import.lib.php:1143 libraries/schema/User_Schema.class.php:168 +#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1131 +#: libraries/import.lib.php:1155 libraries/schema/User_Schema.class.php:168 #: setup/frames/index.inc.php:125 tbl_row_action.php:68 msgid "Edit" msgstr "" @@ -1658,8 +1658,8 @@ msgstr "" #: 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 "" #: libraries/auth/config.auth.lib.php:115 @@ -2045,7 +2045,7 @@ msgstr "" #: libraries/config.values.php:95 libraries/export/htmlword.php:24 #: libraries/export/latex.php:41 libraries/export/odt.php:33 #: libraries/export/sql.php:79 libraries/export/texytext.php:23 -#: libraries/import.lib.php:1141 +#: libraries/import.lib.php:1153 msgid "structure" msgstr "" @@ -4381,8 +4381,8 @@ msgstr "" #, 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 "" #: libraries/display_export.lib.php:275 @@ -4546,7 +4546,7 @@ msgstr "" #: libraries/export/sql.php:55 libraries/export/texytext.php:30 #: libraries/export/xls.php:28 libraries/export/xlsx.php:28 #: libraries/export/xml.php:25 libraries/export/yaml.php:29 -#: libraries/import.lib.php:1114 libraries/import.lib.php:1136 +#: libraries/import.lib.php:1126 libraries/import.lib.php:1148 #: libraries/import/csv.php:32 libraries/import/docsql.php:34 #: libraries/import/ldi.php:48 libraries/import/ods.php:32 #: libraries/import/sql.php:19 libraries/import/xls.php:27 @@ -5315,37 +5315,37 @@ msgstr "" msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "" -#: libraries/import.lib.php:1110 +#: libraries/import.lib.php:1122 msgid "" "The following structures have either been created or altered. Here you can:" msgstr "" -#: libraries/import.lib.php:1111 +#: libraries/import.lib.php:1123 msgid "View a structure`s contents by clicking on its name" msgstr "" -#: libraries/import.lib.php:1112 +#: libraries/import.lib.php:1124 msgid "" "Change any of its settings by clicking the corresponding \"Options\" link" msgstr "" -#: libraries/import.lib.php:1113 +#: libraries/import.lib.php:1125 msgid "Edit its structure by following the \"Structure\" link" msgstr "" -#: libraries/import.lib.php:1116 +#: libraries/import.lib.php:1128 msgid "Go to database" msgstr "" -#: libraries/import.lib.php:1119 libraries/import.lib.php:1143 +#: libraries/import.lib.php:1131 libraries/import.lib.php:1155 msgid "settings" msgstr "" -#: libraries/import.lib.php:1138 +#: libraries/import.lib.php:1150 msgid "Go to table" msgstr "" -#: libraries/import.lib.php:1147 +#: libraries/import.lib.php:1159 msgid "Go to view" msgstr "" @@ -7174,8 +7174,8 @@ msgstr "" 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 "" #: server_privileges.php:1776 @@ -8613,7 +8613,7 @@ msgstr "" #: tbl_change.php:1106 #, php-format -msgid "Restart insertion with %s rows" +msgid "Continue insertion with %s rows" msgstr "" #: tbl_chart.php:56 diff --git a/po/uz.po b/po/uz.po index 249d847..c4281b0 100644 --- a/po/uz.po +++ b/po/uz.po @@ -3,14 +3,14 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-09-07 15:21+0200\n" +"POT-Creation-Date: 2010-09-10 12:46-0400\n" "PO-Revision-Date: 2010-07-22 02:31+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: uzbek_cyrillic <uz(a)li.org>\n" -"Language: uz\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: uz\n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Pootle 2.0.1\n" @@ -612,7 +612,7 @@ msgstr "Қўйиш" #: libraries/config/user_preferences.forms.php:228 #: libraries/config/user_preferences.forms.php:262 #: libraries/db_links.inc.php:48 libraries/export/latex.php:351 -#: libraries/import.lib.php:1136 libraries/tbl_links.inc.php:54 +#: libraries/import.lib.php:1148 libraries/tbl_links.inc.php:54 #: pmd_general.php:133 server_privileges.php:595 server_replication.php:313 #: tbl_create.php:305 tbl_tracking.php:263 msgid "Structure" @@ -661,8 +661,8 @@ msgstr "Кузатиш фаол эмас." #: db_structure.php:404 libraries/display_tbl.lib.php:1945 #, 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 "" "Ушбу намойиш камида кўрсатилган миқдорда қаторларга эга. Батафсил маълумот " "учун %sдокументацияга%s қаранг." @@ -870,11 +870,11 @@ msgstr "Дамп \"%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 "" -"Эҳтимол, юкланаётган файл ҳажми жуда катта. Бу муаммони ечишнинг усуллари " -"%sдокументацияда%s келтирилган." +"Эҳтимол, юкланаётган файл ҳажми жуда катта. Бу муаммони ечишнинг усуллари %" +"sдокументацияда%s келтирилган." #: import.php:277 import.php:330 libraries/File.class.php:566 #: libraries/File.class.php:676 @@ -1605,8 +1605,8 @@ msgstr "Изоҳ" #: libraries/Index.class.php:465 libraries/common.lib.php:610 #: libraries/common.lib.php:1143 libraries/config/messages.inc.php:459 -#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1119 -#: libraries/import.lib.php:1143 libraries/schema/User_Schema.class.php:168 +#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1131 +#: libraries/import.lib.php:1155 libraries/schema/User_Schema.class.php:168 #: setup/frames/index.inc.php:125 tbl_row_action.php:68 msgid "Edit" msgstr "Таҳрирлаш" @@ -1749,8 +1749,8 @@ msgstr "\"%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 "" "Эҳтимол, конфигурация файли тузилмаган. Уни тузиш учун %1$ssўрнатиш " "сценарийсидан%2$s фойдаланишингиз мумкин." @@ -2172,7 +2172,7 @@ msgstr "Кўрсатилган каталокка юклаб бўлмади" #: libraries/config.values.php:95 libraries/export/htmlword.php:24 #: libraries/export/latex.php:41 libraries/export/odt.php:33 #: libraries/export/sql.php:79 libraries/export/texytext.php:23 -#: libraries/import.lib.php:1141 +#: libraries/import.lib.php:1153 msgid "structure" msgstr "тузилиш" @@ -3922,8 +3922,8 @@ msgstr "\"config\" аутентификация усули пароли" msgid "" "Leave blank for no PDF schema support, suggested: [kbd]pma_pdf_pages[/kbd]" msgstr "" -"Агар PDF-схема ишлатмасангиз, бўш қолдиринг, асл қиймати: " -"[kbd]\"pma_pdf_pages\"[/kbd]" +"Агар PDF-схема ишлатмасангиз, бўш қолдиринг, асл қиймати: [kbd]" +"\"pma_pdf_pages\"[/kbd]" #: libraries/config/messages.inc.php:396 msgid "PDF schema: pages table" @@ -4013,8 +4013,8 @@ msgstr "SSL уланишдан фойдаланиш" msgid "" "Leave blank for no PDF schema support, suggested: [kbd]pma_table_coords[/kbd]" msgstr "" -"PDF-схемадан фойдаланмаслик учун бўш қолдиринг, асл қиймати: " -"[kbd]\"pma_table_coords\"[/kbd]" +"PDF-схемадан фойдаланмаслик учун бўш қолдиринг, асл қиймати: [kbd]" +"\"pma_table_coords\"[/kbd]" #: libraries/config/messages.inc.php:413 msgid "PDF schema: table coordinates" @@ -4827,12 +4827,12 @@ msgstr "" #| "happen: %3$s. Other text will be kept as is." 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 "" "Қиймат %1$sstrftime%2$s функцияси билан қайта ишланган, шунинг учун ҳозирги " -"вақт ва санани қўйиш мумкин. Қўшимча равишда қуйидагилар ишлатилиши мумкин: " -"%3$s. Матннинг бошқа қисмлари ўзгаришсиз қолади." +"вақт ва санани қўйиш мумкин. Қўшимча равишда қуйидагилар ишлатилиши мумкин: %" +"3$s. Матннинг бошқа қисмлари ўзгаришсиз қолади." #: libraries/display_export.lib.php:275 msgid "use this for future exports" @@ -5032,7 +5032,7 @@ msgstr "Индекс бўйича сортировка қилиш" #: libraries/export/sql.php:55 libraries/export/texytext.php:30 #: libraries/export/xls.php:28 libraries/export/xlsx.php:28 #: libraries/export/xml.php:25 libraries/export/yaml.php:29 -#: libraries/import.lib.php:1114 libraries/import.lib.php:1136 +#: libraries/import.lib.php:1126 libraries/import.lib.php:1148 #: libraries/import/csv.php:32 libraries/import/docsql.php:34 #: libraries/import/ldi.php:48 libraries/import/ods.php:32 #: libraries/import/sql.php:19 libraries/import/xls.php:27 @@ -5887,39 +5887,39 @@ msgstr "Тузилган" msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL бўш натижа берди (яъни нольта сатр)." -#: libraries/import.lib.php:1110 +#: libraries/import.lib.php:1122 msgid "" "The following structures have either been created or altered. Here you can:" msgstr "" "Қуйидаги тузилишлар ё тузилди ё ўзгартирилди. Бу ерда сиз қуйидаги амалларни " "бажаришингиз мумкин:" -#: libraries/import.lib.php:1111 +#: libraries/import.lib.php:1123 msgid "View a structure`s contents by clicking on its name" msgstr "Тузилмани кўриш учун унинг номи устига сичқонча тугмасини босинг" -#: libraries/import.lib.php:1112 +#: libraries/import.lib.php:1124 msgid "" "Change any of its settings by clicking the corresponding \"Options\" link" msgstr "Қуйидаги танловларни ўзгартириш учун, \"Танловлар\" боғига босинг" -#: libraries/import.lib.php:1113 +#: libraries/import.lib.php:1125 msgid "Edit its structure by following the \"Structure\" link" msgstr "Тузилмани ўзгартириш учун, \"Тузилма\" боғига киринг" -#: libraries/import.lib.php:1116 +#: libraries/import.lib.php:1128 msgid "Go to database" msgstr "Ушбу базага ўтиш" -#: libraries/import.lib.php:1119 libraries/import.lib.php:1143 +#: libraries/import.lib.php:1131 libraries/import.lib.php:1155 msgid "settings" msgstr "танловлар" -#: libraries/import.lib.php:1138 +#: libraries/import.lib.php:1150 msgid "Go to table" msgstr "Ушбу жадвалга ўтиш" -#: libraries/import.lib.php:1147 +#: libraries/import.lib.php:1159 msgid "Go to view" msgstr "Ушбу кўринишга ўтиш" @@ -7992,8 +7992,8 @@ msgstr "Фойдаланувчилар номлари билан аталган 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 "" "ИЗОҲ: phpMyAdmin фойдаланувчилар привилегиялари ҳақидаги маълумотларни " "тўғридан-тўғри MySQL привилегиялари жадвалидан олади. Ушбу жадвалдаги " @@ -8747,8 +8747,8 @@ msgstr "Очиқ файллар сони." #: server_status.php:121 msgid "The number of streams that are open (used mainly for logging)." msgstr "" -"Очиқ оқимлар сони (журнал файлларида кўлланилади). <b>Оқим</b> деб \"fopen" -"()\" функцияси ёрдамида очилган файлга айтилади." +"Очиқ оқимлар сони (журнал файлларида кўлланилади). <b>Оқим</b> деб \"fopen()" +"\" функцияси ёрдамида очилган файлга айтилади." #: server_status.php:122 msgid "The number of tables that are open." @@ -9687,8 +9687,9 @@ msgstr "" "Майдонлараро ўтиш учун TAB тугмаси ёки CTRL+стрелка тугмаларидан фойдаланинг" #: tbl_change.php:1106 -#, php-format -msgid "Restart insertion with %s rows" +#, fuzzy, php-format +#| msgid "Restart insertion with %s rows" +msgid "Continue insertion with %s rows" msgstr "Қўйилаётган қаторлар сони: \"%s\"" #: tbl_chart.php:56 diff --git a/po/uz(a)latin.po b/po/uz(a)latin.po index e210c7d..a8adf7d 100644 --- a/po/uz(a)latin.po +++ b/po/uz(a)latin.po @@ -3,14 +3,14 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-09-07 15:21+0200\n" +"POT-Creation-Date: 2010-09-10 12:46-0400\n" "PO-Revision-Date: 2010-07-22 02:30+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: uzbek_latin <uz@latin@li.org>\n" -"Language: uz@latin\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: uz@latin\n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Pootle 2.0.1\n" @@ -614,7 +614,7 @@ msgstr "Qo‘yish" #: libraries/config/user_preferences.forms.php:228 #: libraries/config/user_preferences.forms.php:262 #: libraries/db_links.inc.php:48 libraries/export/latex.php:351 -#: libraries/import.lib.php:1136 libraries/tbl_links.inc.php:54 +#: libraries/import.lib.php:1148 libraries/tbl_links.inc.php:54 #: pmd_general.php:133 server_privileges.php:595 server_replication.php:313 #: tbl_create.php:305 tbl_tracking.php:263 msgid "Structure" @@ -663,8 +663,8 @@ msgstr "Kuzatish faol emas." #: db_structure.php:404 libraries/display_tbl.lib.php:1945 #, 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 "" "Ushbu namoyish kamida ko‘rsatilgan miqdorda qatorlarga ega. Batafsil " "ma`lumot uchun %sdokumentatsiyaga%s qarang." @@ -872,8 +872,8 @@ msgstr "Damp \"%s\" faylida saqlandi." #: 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 "" "Ehtimol, yuklanayotgan fayl hajmi juda katta. Bu muammoni yechishning " "usullari %sdokumentatsiyada%s keltirilgan." @@ -1611,8 +1611,8 @@ msgstr "Izoh" #: libraries/Index.class.php:465 libraries/common.lib.php:610 #: libraries/common.lib.php:1143 libraries/config/messages.inc.php:459 -#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1119 -#: libraries/import.lib.php:1143 libraries/schema/User_Schema.class.php:168 +#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1131 +#: libraries/import.lib.php:1155 libraries/schema/User_Schema.class.php:168 #: setup/frames/index.inc.php:125 tbl_row_action.php:68 msgid "Edit" msgstr "Tahrirlash" @@ -1755,8 +1755,8 @@ msgstr "\"%s\" dasturiga xush kelibsiz" #: 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 "" "Ehtimol, konfiguratsiya fayli tuzilmagan. Uni tuzish uchun %1$sso‘rnatish " "ssenariysidan%2$s foydalanishingiz mumkin." @@ -2180,7 +2180,7 @@ msgstr "Ko‘rsatilgan katalokka yuklab bo‘lmadi" #: libraries/config.values.php:95 libraries/export/htmlword.php:24 #: libraries/export/latex.php:41 libraries/export/odt.php:33 #: libraries/export/sql.php:79 libraries/export/texytext.php:23 -#: libraries/import.lib.php:1141 +#: libraries/import.lib.php:1153 msgid "structure" msgstr "tuzilish" @@ -3845,9 +3845,9 @@ msgid "" "More information on [a@http://sf.net/support/tracker.php?aid=1849494]PMA bug " "tracker[/a] and [a@http://bugs.mysql.com/19588]MySQL Bugs[/a]" msgstr "" -"Ko‘proq ma`lumot uchun [a@http://sf.net/support/tracker.php?" -"aid=1849494]\"PMA bug tracker\"[/a] va [a@http://bugs.mysql." -"com/19588]\"MySQL Bugs\"[/a]larga qarang" +"Ko‘proq ma`lumot uchun [a@http://sf.net/support/tracker.php?aid=1849494]" +"\"PMA bug tracker\"[/a] va [a@http://bugs.mysql.com/19588]\"MySQL Bugs\"[/a]" +"larga qarang" #: libraries/config/messages.inc.php:379 msgid "Disable use of INFORMATION_SCHEMA" @@ -3937,8 +3937,8 @@ msgstr "\"config\" autentifikatsiya usuli paroli" msgid "" "Leave blank for no PDF schema support, suggested: [kbd]pma_pdf_pages[/kbd]" msgstr "" -"Agar PDF-sxema ishlatmasangiz, bo‘sh qoldiring, asl qiymati: " -"[kbd]\"pma_pdf_pages\"[/kbd]" +"Agar PDF-sxema ishlatmasangiz, bo‘sh qoldiring, asl qiymati: [kbd]" +"\"pma_pdf_pages\"[/kbd]" #: libraries/config/messages.inc.php:396 msgid "PDF schema: pages table" @@ -3952,8 +3952,8 @@ msgid "" msgstr "" "Aloqalar, xatcho‘plar va PDF imkoniyatlari uchun ishlatiladigan baza. " "Batafsil ma`lumot uchun [a@http://wiki.phpmyadmin.net/pma/pmadb]\"pmadb\"[/a]" -"ga qarang. Agar foydalanmasangiz, bo‘sh qoldiring. Asl qiymati: " -"[kbd]\"phpmyadmin\"[/kbd]" +"ga qarang. Agar foydalanmasangiz, bo‘sh qoldiring. Asl qiymati: [kbd]" +"\"phpmyadmin\"[/kbd]" #: libraries/config/messages.inc.php:398 #, fuzzy @@ -4028,8 +4028,8 @@ msgstr "SSL ulanishdan foydalanish" msgid "" "Leave blank for no PDF schema support, suggested: [kbd]pma_table_coords[/kbd]" msgstr "" -"PDF-sxemadan foydalanmaslik uchun bo‘sh qoldiring, asl qiymati: " -"[kbd]\"pma_table_coords\"[/kbd]" +"PDF-sxemadan foydalanmaslik uchun bo‘sh qoldiring, asl qiymati: [kbd]" +"\"pma_table_coords\"[/kbd]" #: libraries/config/messages.inc.php:413 msgid "PDF schema: table coordinates" @@ -4660,8 +4660,8 @@ msgid "" "May be approximate. See [a@./Documentation.html#faq3_11@Documentation]FAQ " "3.11[/a]" msgstr "" -"Taxminiy bo‘lishi mumkin. [a@./Documentation." -"html#faq3_11@Documentation]\"FAQ 3.11\"[/a]ga qarang" +"Taxminiy bo‘lishi mumkin. [a@./Documentation.html#faq3_11@Documentation]" +"\"FAQ 3.11\"[/a]ga qarang" #: libraries/db_structure.lib.php:60 server_databases.php:153 #: tbl_printview.php:333 tbl_structure.php:772 @@ -4848,8 +4848,8 @@ msgstr "" #| "happen: %3$s. Other text will be kept as is." 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 "" "Qiymat %1$sstrftime%2$s funksiyasi bilan qayta ishlangan, shuning uchun " "hozirgi vaqt va sanani qo‘yish mumkin. Qo‘shimcha ravishda quyidagilar " @@ -5055,7 +5055,7 @@ msgstr "Indeks bo‘yicha sortirovka qilish" #: libraries/export/sql.php:55 libraries/export/texytext.php:30 #: libraries/export/xls.php:28 libraries/export/xlsx.php:28 #: libraries/export/xml.php:25 libraries/export/yaml.php:29 -#: libraries/import.lib.php:1114 libraries/import.lib.php:1136 +#: libraries/import.lib.php:1126 libraries/import.lib.php:1148 #: libraries/import/csv.php:32 libraries/import/docsql.php:34 #: libraries/import/ldi.php:48 libraries/import/ods.php:32 #: libraries/import/sql.php:19 libraries/import/xls.php:27 @@ -5914,39 +5914,39 @@ msgstr "Tuzilgan" msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL bo‘sh natija berdi (ya`ni nolta satr)." -#: libraries/import.lib.php:1110 +#: libraries/import.lib.php:1122 msgid "" "The following structures have either been created or altered. Here you can:" msgstr "" "Quyidagi tuzilishlar yo tuzildi yo o‘zgartirildi. Bu yerda siz quyidagi " "amallarni bajarishingiz mumkin:" -#: libraries/import.lib.php:1111 +#: libraries/import.lib.php:1123 msgid "View a structure`s contents by clicking on its name" msgstr "Tuzilmani ko‘rish uchun uning nomi ustiga sichqoncha tugmasini bosing" -#: libraries/import.lib.php:1112 +#: libraries/import.lib.php:1124 msgid "" "Change any of its settings by clicking the corresponding \"Options\" link" msgstr "Quyidagi tanlovlarni o‘zgartirish uchun, \"Tanlovlar\" bog‘iga bosing" -#: libraries/import.lib.php:1113 +#: libraries/import.lib.php:1125 msgid "Edit its structure by following the \"Structure\" link" msgstr "Tuzilmani o‘zgartirish uchun, \"Tuzilma\" bog‘iga kiring" -#: libraries/import.lib.php:1116 +#: libraries/import.lib.php:1128 msgid "Go to database" msgstr "Ushbu bazaga o‘tish" -#: libraries/import.lib.php:1119 libraries/import.lib.php:1143 +#: libraries/import.lib.php:1131 libraries/import.lib.php:1155 msgid "settings" msgstr "tanlovlar" -#: libraries/import.lib.php:1138 +#: libraries/import.lib.php:1150 msgid "Go to table" msgstr "Ushbu jadvalga o‘tish" -#: libraries/import.lib.php:1147 +#: libraries/import.lib.php:1159 msgid "Go to view" msgstr "Ushbu ko‘rinishga o‘tish" @@ -8036,8 +8036,8 @@ msgstr "" 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 "" "IZOH: phpMyAdmin foydalanuvchilar privilegiyalari haqidagi ma`lumotlarni " "to‘g‘ridan-to‘g‘ri MySQL privilegiyalari jadvalidan oladi. Ushbu jadvaldagi " @@ -9609,9 +9609,9 @@ msgstr "" "real xostlar uchun tavsiya etilmaydi. Serverdagi phpMyAdmin turgan katalog " "adresini bilgan yoki taxmin qilgan har kim ushbu dasturga bemalol kirib, " "serverdagi ma`lumotlar bazalari bilan istalgan operatsiyalarni amalga " -"oshirishi mumkin. Server [a@?page=servers&mode=edit&id=" -"%1$d#tab_Server]autentifikatsiya usuli[/a]ni [kbd]cookie[/kbd] yoki [kbd]http" -"[/kbd] deb belgilash tavsiya etiladi." +"oshirishi mumkin. Server [a@?page=servers&mode=edit&id=%1" +"$d#tab_Server]autentifikatsiya usuli[/a]ni [kbd]cookie[/kbd] yoki [kbd]http[/" +"kbd] deb belgilash tavsiya etiladi." #: setup/lib/index.lib.php:259 #, php-format @@ -9751,8 +9751,9 @@ msgstr "" "foydalaning" #: tbl_change.php:1106 -#, php-format -msgid "Restart insertion with %s rows" +#, fuzzy, php-format +#| msgid "Restart insertion with %s rows" +msgid "Continue insertion with %s rows" msgstr "Qo‘yilayotgan qatorlar soni: \"%s\"" #: tbl_chart.php:56 @@ -9770,8 +9771,8 @@ msgid "" "The result of this query can't be used for a chart. See [a@./Documentation." "html#faq6_29@Documentation]FAQ 6.29[/a]" msgstr "" -"Taxminiy bo‘lishi mumkin. [a@./Documentation." -"html#faq3_11@Documentation]\"FAQ 3.11\"[/a]ga qarang" +"Taxminiy bo‘lishi mumkin. [a@./Documentation.html#faq3_11@Documentation]" +"\"FAQ 3.11\"[/a]ga qarang" #: tbl_chart.php:90 msgid "Width" diff --git a/po/zh_CN.po b/po/zh_CN.po index 9a0a630..85ab156 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -3,14 +3,14 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-09-07 15:21+0200\n" +"POT-Creation-Date: 2010-09-10 12:46-0400\n" "PO-Revision-Date: 2010-09-09 14:28+0200\n" "Last-Translator: shanyan baishui <Siramizu(a)gmail.com>\n" "Language-Team: chinese_simplified <zh_CN(a)li.org>\n" -"Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: zh_CN\n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Pootle 2.0.5\n" @@ -585,7 +585,7 @@ msgstr "插入" #: libraries/config/user_preferences.forms.php:228 #: libraries/config/user_preferences.forms.php:262 #: libraries/db_links.inc.php:48 libraries/export/latex.php:351 -#: libraries/import.lib.php:1136 libraries/tbl_links.inc.php:54 +#: libraries/import.lib.php:1148 libraries/tbl_links.inc.php:54 #: pmd_general.php:133 server_privileges.php:595 server_replication.php:313 #: tbl_create.php:305 tbl_tracking.php:263 msgid "Structure" @@ -634,8 +634,8 @@ msgstr "追踪已禁用。" #: db_structure.php:404 libraries/display_tbl.lib.php:1945 #, 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 "该视图最少包含的行数，参见%s文档%s。" #: db_structure.php:418 db_structure.php:432 libraries/header.inc.php:138 @@ -839,8 +839,8 @@ msgstr "转存已经保存到文件 %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 "您可能正在上传很大的文件，请参考%s文档%s来寻找解决方法。" #: import.php:277 import.php:330 libraries/File.class.php:566 @@ -1465,8 +1465,8 @@ msgstr "注释" #: libraries/Index.class.php:465 libraries/common.lib.php:610 #: libraries/common.lib.php:1143 libraries/config/messages.inc.php:459 -#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1119 -#: libraries/import.lib.php:1143 libraries/schema/User_Schema.class.php:168 +#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1131 +#: libraries/import.lib.php:1155 libraries/schema/User_Schema.class.php:168 #: setup/frames/index.inc.php:125 tbl_row_action.php:68 msgid "Edit" msgstr "编辑" @@ -1603,8 +1603,8 @@ msgstr "欢迎使用 %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 "" "你可能还没有创建配置文件。你可以使用 %1$s设置脚本%2$s 来创建一个配置文件。" @@ -1997,7 +1997,7 @@ msgstr "用于上传的文件夹出错，无法使用" #: libraries/config.values.php:95 libraries/export/htmlword.php:24 #: libraries/export/latex.php:41 libraries/export/odt.php:33 #: libraries/export/sql.php:79 libraries/export/texytext.php:23 -#: libraries/import.lib.php:1141 +#: libraries/import.lib.php:1153 msgid "structure" msgstr "结构" @@ -3010,7 +3010,6 @@ msgid "Display servers selection" msgstr "显示服务器选择" #: libraries/config/messages.inc.php:268 -#| msgid "Display databases in a tree" msgid "Display table filter" msgstr "显示数据表快速搜索框" @@ -4372,8 +4371,8 @@ msgstr "，@TABLE@ 将变成数据表名" #, 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 "" "这个值是使用 %1$sstrftime%2$s 来解析的，所以你能用时间格式的字符串。另外，下" "列内容也将被转换：%3$s。其他文本将保持原样。参见%4$s常见问题 (FAQ)%5$s。" @@ -4541,7 +4540,7 @@ msgstr "主键排序" #: libraries/export/sql.php:55 libraries/export/texytext.php:30 #: libraries/export/xls.php:28 libraries/export/xlsx.php:28 #: libraries/export/xml.php:25 libraries/export/yaml.php:29 -#: libraries/import.lib.php:1114 libraries/import.lib.php:1136 +#: libraries/import.lib.php:1126 libraries/import.lib.php:1148 #: libraries/import/csv.php:32 libraries/import/docsql.php:34 #: libraries/import/ldi.php:48 libraries/import/ods.php:32 #: libraries/import/sql.php:19 libraries/import/xls.php:27 @@ -5338,37 +5337,37 @@ msgstr "生成者" msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL 返回的查询结果为空 (即零行)。" -#: libraries/import.lib.php:1110 +#: libraries/import.lib.php:1122 msgid "" "The following structures have either been created or altered. Here you can:" msgstr "下列结构被创建或修改。你可以:" -#: libraries/import.lib.php:1111 +#: libraries/import.lib.php:1123 msgid "View a structure`s contents by clicking on its name" msgstr "点击它的名字查看内容" -#: libraries/import.lib.php:1112 +#: libraries/import.lib.php:1124 msgid "" "Change any of its settings by clicking the corresponding \"Options\" link" msgstr "点击相应的“选项”链接修改它的设置" -#: libraries/import.lib.php:1113 +#: libraries/import.lib.php:1125 msgid "Edit its structure by following the \"Structure\" link" msgstr "点击“结构”链接编辑它的结构" -#: libraries/import.lib.php:1116 +#: libraries/import.lib.php:1128 msgid "Go to database" msgstr "转到数据库" -#: libraries/import.lib.php:1119 libraries/import.lib.php:1143 +#: libraries/import.lib.php:1131 libraries/import.lib.php:1155 msgid "settings" msgstr "设置" -#: libraries/import.lib.php:1138 +#: libraries/import.lib.php:1150 msgid "Go to table" msgstr "转到数据表" -#: libraries/import.lib.php:1147 +#: libraries/import.lib.php:1159 msgid "Go to view" msgstr "转到视图" @@ -7236,12 +7235,12 @@ msgstr "删除与用户同名的数据库。" 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 "" "注意：phpMyAdmin 直接由 MySQL 权限表取得用户权限。如果用户手动更改表，表内容" -"将可能与服务器使用的用户权限有异。在这种情况下，您应在继续前%s重新载入权" -"限%s。" +"将可能与服务器使用的用户权限有异。在这种情况下，您应在继续前%s重新载入权限%" +"s。" #: server_privileges.php:1776 msgid "The selected user was not found in the privilege table." @@ -8644,9 +8643,9 @@ msgid "" msgstr "" "您设置了 [kbd]config[/kbd] 认证方式，且为了能够自动登录而保存了用户名和密码，" "但在常用主机上不建议这样设置。如果有人知道 phpMyAdmin 的地址，他们就能够进入 " -"phpMyAdmin 的管理界面。建议将[a@?page=servers&mode=edit&id=" -"%1$d#tab_Server]登录认证方式[/a]设置为 [kbd]cookie 认证[/kbd]或 [kbd]HTTP 认" -"证[/kbd]。" +"phpMyAdmin 的管理界面。建议将[a@?page=servers&mode=edit&id=%1" +"$d#tab_Server]登录认证方式[/a]设置为 [kbd]cookie 认证[/kbd]或 [kbd]HTTP 认证" +"[/kbd]。" #: setup/lib/index.lib.php:259 #, php-format @@ -8780,8 +8779,9 @@ msgid "" msgstr "按 TAB 键跳到下一个数值，或 CTRL+方向键作随意移动" #: tbl_change.php:1106 -#, php-format -msgid "Restart insertion with %s rows" +#, fuzzy, php-format +#| msgid "Restart insertion with %s rows" +msgid "Continue insertion with %s rows" msgstr "重新进行插入操作，共 %s 行" #: tbl_chart.php:56 diff --git a/po/zh_TW.po b/po/zh_TW.po index be04f1c..5cd0795 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -3,14 +3,14 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-09-07 15:21+0200\n" +"POT-Creation-Date: 2010-09-10 12:46-0400\n" "PO-Revision-Date: 2010-03-12 09:15+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: chinese_traditional <zh_TW(a)li.org>\n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: \n" "X-Generator: Translate Toolkit 1.5.3\n" #: browse_foreigners.php:36 browse_foreigners.php:57 @@ -606,7 +606,7 @@ msgstr "新增" #: libraries/config/user_preferences.forms.php:228 #: libraries/config/user_preferences.forms.php:262 #: libraries/db_links.inc.php:48 libraries/export/latex.php:351 -#: libraries/import.lib.php:1136 libraries/tbl_links.inc.php:54 +#: libraries/import.lib.php:1148 libraries/tbl_links.inc.php:54 #: pmd_general.php:133 server_privileges.php:595 server_replication.php:313 #: tbl_create.php:305 tbl_tracking.php:263 msgid "Structure" @@ -655,8 +655,8 @@ msgstr "" #: db_structure.php:404 libraries/display_tbl.lib.php:1945 #, 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 "" #: db_structure.php:418 db_structure.php:432 libraries/header.inc.php:138 @@ -865,8 +865,8 @@ msgstr "備份已儲到檔案 %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 "你正嘗試上載大容量檔案，請查看此 %s文件%s 如何略過此限制." #: import.php:277 import.php:330 libraries/File.class.php:566 @@ -1571,8 +1571,8 @@ msgstr "註解" #: libraries/Index.class.php:465 libraries/common.lib.php:610 #: libraries/common.lib.php:1143 libraries/config/messages.inc.php:459 -#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1119 -#: libraries/import.lib.php:1143 libraries/schema/User_Schema.class.php:168 +#: libraries/display_tbl.lib.php:1112 libraries/import.lib.php:1131 +#: libraries/import.lib.php:1155 libraries/schema/User_Schema.class.php:168 #: setup/frames/index.inc.php:125 tbl_row_action.php:68 msgid "Edit" msgstr "編輯" @@ -1714,8 +1714,8 @@ msgstr "歡迎使用 %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 "有可能你未建立設定檔. 你可利用此 %1$s安裝程序%2$s 建立設定檔." #: libraries/auth/config.auth.lib.php:115 @@ -2120,7 +2120,7 @@ msgstr "設定之上載目錄錯誤，未能使用" #: libraries/config.values.php:95 libraries/export/htmlword.php:24 #: libraries/export/latex.php:41 libraries/export/odt.php:33 #: libraries/export/sql.php:79 libraries/export/texytext.php:23 -#: libraries/import.lib.php:1141 +#: libraries/import.lib.php:1153 #, fuzzy msgid "structure" msgstr "結構" @@ -4556,8 +4556,8 @@ msgstr "" #, 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 "" #: libraries/display_export.lib.php:275 @@ -4740,7 +4740,7 @@ msgstr "依鍵名排序" #: libraries/export/sql.php:55 libraries/export/texytext.php:30 #: libraries/export/xls.php:28 libraries/export/xlsx.php:28 #: libraries/export/xml.php:25 libraries/export/yaml.php:29 -#: libraries/import.lib.php:1114 libraries/import.lib.php:1136 +#: libraries/import.lib.php:1126 libraries/import.lib.php:1148 #: libraries/import/csv.php:32 libraries/import/docsql.php:34 #: libraries/import/ldi.php:48 libraries/import/ods.php:32 #: libraries/import/sql.php:19 libraries/import/xls.php:27 @@ -5555,38 +5555,38 @@ msgstr "建立" msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL 傳回的查詢結果為空 (原因可能為：沒有找到符合條件的記錄)" -#: libraries/import.lib.php:1110 +#: libraries/import.lib.php:1122 msgid "" "The following structures have either been created or altered. Here you can:" msgstr "" -#: libraries/import.lib.php:1111 +#: libraries/import.lib.php:1123 msgid "View a structure`s contents by clicking on its name" msgstr "" -#: libraries/import.lib.php:1112 +#: libraries/import.lib.php:1124 msgid "" "Change any of its settings by clicking the corresponding \"Options\" link" msgstr "" -#: libraries/import.lib.php:1113 +#: libraries/import.lib.php:1125 msgid "Edit its structure by following the \"Structure\" link" msgstr "" -#: libraries/import.lib.php:1116 +#: libraries/import.lib.php:1128 #, fuzzy msgid "Go to database" msgstr "沒有資料庫" -#: libraries/import.lib.php:1119 libraries/import.lib.php:1143 +#: libraries/import.lib.php:1131 libraries/import.lib.php:1155 msgid "settings" msgstr "" -#: libraries/import.lib.php:1138 +#: libraries/import.lib.php:1150 msgid "Go to table" msgstr "" -#: libraries/import.lib.php:1147 +#: libraries/import.lib.php:1159 msgid "Go to view" msgstr "" @@ -7532,8 +7532,8 @@ msgstr "刪除與使用者相同名稱之資料庫." 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 "" "註: phpMyAdmin 直接由 MySQL 權限資料表取得使用者權限. 如果使用者自行更改資料" "表, 資料表內容將可能與實際使用者情況有異. 在這情況下, 您應在繼續前 %s重新載" @@ -8994,7 +8994,7 @@ msgstr "按 TAB 鍵跳到下一個數值, 或 CTRL+方向鍵作隨意移動" #: tbl_change.php:1106 #, php-format -msgid "Restart insertion with %s rows" +msgid "Continue insertion with %s rows" msgstr "" #: tbl_chart.php:56 diff --git a/tbl_change.php b/tbl_change.php index 2e5d78b..6d2e957 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -1081,8 +1081,8 @@ if (isset($where_clause)) { <?php if ($insert_mode) { ?> - -<form id="restartForm" method="post" action="tbl_replace.php" name="restartForm" > + +<form id="continueForm" method="post" action="tbl_replace.php" name="continueForm" > <?php echo PMA_generate_common_hidden_inputs($db, $table); ?> <input type="hidden" name="goto" value="<?php echo htmlspecialchars($GLOBALS['goto']); ?>" /> <input type="hidden" name="err_url" value="<?php echo htmlspecialchars($err_url); ?>" /> @@ -1103,7 +1103,7 @@ if ($insert_mode) { $tmp .= '>' . $value . '</option>' . "\n"; } $tmp .= '</select>' . "\n"; - echo "\n" . sprintf(__('Restart insertion with %s rows'), $tmp); + echo "\n" . sprintf(__('Continue insertion with %s rows'), $tmp); unset($tmp); echo '<noscript><input type="submit" value="' . __('Go') . '" /></noscript>' . "\n"; echo '</form>' . "\n"; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_7-10086-g77b6fb1
by Dieter Adriaenssens 10 Sep '10

10 Sep '10

The branch, master has been updated via 77b6fb172d3099c54335e05e12859b5d8ca42950 (commit) via 194e357a996310225364d311e6c27ed41db002bb (commit) from 7f598f4f4f562b392fe4a83d3e9fd9bf00379e37 (commit) - Log ----------------------------------------------------------------- commit 77b6fb172d3099c54335e05e12859b5d8ca42950 Merge: 7f598f4f4f562b392fe4a83d3e9fd9bf00379e37 194e357a996310225364d311e6c27ed41db002bb Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net> Date: Fri Sep 10 17:34:52 2010 +0200 Merge branch 'QA_3_3' Conflicts: ChangeLog ----------------------------------------------------------------------- Summary of changes: ChangeLog | 3 ++ libraries/import.lib.php | 68 +++++++++++++++++++++++++++------------------- 2 files changed, 43 insertions(+), 28 deletions(-) diff --git a/ChangeLog b/ChangeLog index ad54bee..d15366e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -113,6 +113,9 @@ - bug #3056610 [interface] Removed modification options for information_schema + patch #3055886 [config] Add Left frame table filter visibility config option, thanks to eesau +3.3.8.0 (not yet released) +- bug #3059311 [import] BIGINT field type added to table analysis + 3.3.7.0 (2010-09-07) - patch #3050492 [PDF scratchboard] Cannot drag table box to the edge after a page size increase, thanks to Martin Schönberger - mad05 diff --git a/libraries/import.lib.php b/libraries/import.lib.php index 8ef38f6..bacc6a4 100644 --- a/libraries/import.lib.php +++ b/libraries/import.lib.php @@ -408,6 +408,7 @@ define("NONE", 0); define("VARCHAR", 1); define("INT", 2); define("DECIMAL", 3); +define("BIGINT", 4); /* Decimal size defs */ define("M", 0); @@ -489,6 +490,7 @@ function PMA_getDecimalSize(&$cell) { * @uses FULL * @uses VARCHAR * @uses DECIMAL + * @uses BIGINT * @uses INT * @uses NONE * @uses strcmp() @@ -497,8 +499,8 @@ function PMA_getDecimalSize(&$cell) { * @uses PMA_getD() * @uses PMA_getDecimalSize() * @param string $last_cumulative_size Last cumulative column size - * @param int $last_cumulative_type Last cumulative column type (NONE or VARCHAR or DECIMAL or INT) - * @param int $curr_type Type of the current cell (NONE or VARCHAR or DECIMAL or INT) + * @param int $last_cumulative_type Last cumulative column type (NONE or VARCHAR or DECIMAL or INT or BIGINT) + * @param int $curr_type Type of the current cell (NONE or VARCHAR or DECIMAL or INT or BIGINT) * @param string &$cell The current cell * @return string Size of the given cell in the type-appropriate format */ @@ -516,7 +518,7 @@ function PMA_detectSize($last_cumulative_size, $last_cumulative_type, $curr_type */ elseif ($curr_type == VARCHAR) { /** - * The last cumlative type was VARCHAR + * The last cumulative type was VARCHAR */ if ($last_cumulative_type == VARCHAR) { if ($curr_size >= $last_cumulative_size) { @@ -526,7 +528,7 @@ function PMA_detectSize($last_cumulative_size, $last_cumulative_type, $curr_type } } /** - * The last cumlative type was DECIMAL + * The last cumulative type was DECIMAL */ elseif ($last_cumulative_type == DECIMAL) { $oldM = PMA_getM($last_cumulative_size); @@ -538,9 +540,9 @@ function PMA_detectSize($last_cumulative_size, $last_cumulative_type, $curr_type } } /** - * The last cumlative type was INT + * The last cumulative type was BIGINT or INT */ - elseif ($last_cumulative_type == INT) { + elseif ($last_cumulative_type == BIGINT || $last_cumulative_type == INT) { if ($curr_size >= $last_cumulative_size) { return $curr_size; } else { @@ -569,7 +571,7 @@ function PMA_detectSize($last_cumulative_size, $last_cumulative_type, $curr_type */ elseif ($curr_type == DECIMAL) { /** - * The last cumlative type was VARCHAR + * The last cumulative type was VARCHAR */ if ($last_cumulative_type == VARCHAR) { /* Convert $last_cumulative_size from varchar to decimal format */ @@ -582,7 +584,7 @@ function PMA_detectSize($last_cumulative_size, $last_cumulative_type, $curr_type } } /** - * The last cumlative type was DECIMAL + * The last cumulative type was DECIMAL */ elseif ($last_cumulative_type == DECIMAL) { $size = PMA_getDecimalSize($cell); @@ -599,9 +601,9 @@ function PMA_detectSize($last_cumulative_size, $last_cumulative_type, $curr_type } } /** - * The last cumlative type was INT + * The last cumulative type was BIGINT or INT */ - elseif ($last_cumulative_type == INT) { + elseif ($last_cumulative_type == BIGINT || $last_cumulative_type == INT) { /* Convert $last_cumulative_size from int to decimal format */ $size = PMA_getDecimalSize($cell); @@ -632,11 +634,11 @@ function PMA_detectSize($last_cumulative_size, $last_cumulative_type, $curr_type } } /** - * What to do if the current cell is of type INT + * What to do if the current cell is of type BIGINT or INT */ - elseif ($curr_type == INT) { + elseif ($curr_type == BIGINT || $curr_type == INT) { /** - * The last cumlative type was VARCHAR + * The last cumulative type was VARCHAR */ if ($last_cumulative_type == VARCHAR) { if ($curr_size >= $last_cumulative_size) { @@ -646,7 +648,7 @@ function PMA_detectSize($last_cumulative_size, $last_cumulative_type, $curr_type } } /** - * The last cumlative type was DECIMAL + * The last cumulative type was DECIMAL */ elseif ($last_cumulative_type == DECIMAL) { $oldM = PMA_getM($last_cumulative_size); @@ -664,9 +666,9 @@ function PMA_detectSize($last_cumulative_size, $last_cumulative_type, $curr_type } } /** - * The last cumlative type was INT + * The last cumulative type was BIGINT or INT */ - elseif ($last_cumulative_type == INT) { + elseif ($last_cumulative_type == BIGINT || $last_cumulative_type == INT) { if ($curr_size >= $last_cumulative_size) { return $curr_size; } else { @@ -709,6 +711,7 @@ function PMA_detectSize($last_cumulative_size, $last_cumulative_type, $curr_type * @access public * * @uses DECIMAL + * @uses BIGINT * @uses INT * @uses VARCHAR * @uses NONE @@ -716,13 +719,13 @@ function PMA_detectSize($last_cumulative_size, $last_cumulative_type, $curr_type * @uses strcmp() * @uses strpos() * @uses substr_count() - * @param int $last_cumulative_type Last cumulative column type (VARCHAR or INT or DECIMAL or NONE) + * @param int $last_cumulative_type Last cumulative column type (VARCHAR or INT or BIGINT or DECIMAL or NONE) * @param string &$cell String representation of the cell for which a best-fit type is to be determined - * @return int The MySQL type representation (VARCHAR or INT or DECIMAL or NONE) + * @return int The MySQL type representation (VARCHAR or INT or BIGINT or DECIMAL or NONE) */ function PMA_detectType($last_cumulative_type, &$cell) { /** - * If numeric, determine if decimal or int + * If numeric, determine if decimal, int or bigint * Else, we call it varchar for simplicity */ @@ -736,7 +739,11 @@ function PMA_detectType($last_cumulative_type, &$cell) { if ($cell == (string)(float)$cell && strpos($cell, ".") !== false && substr_count($cell, ".") == 1) { return DECIMAL; } else { - return INT; + if ($cell > 2147483647) { + return BIGINT; + } else { + return INT; + } } } else { return VARCHAR; @@ -758,6 +765,7 @@ function PMA_detectType($last_cumulative_type, &$cell) { * @uses ROWS * @uses VARCHAR * @uses DECIMAL + * @uses BIGINT * @uses INT * @uses NONE * @uses count() @@ -802,21 +810,25 @@ function PMA_analyzeTable(&$table) { $sizes[$i] = PMA_detectSize($sizes[$i], $types[$i], $curr_type, $table[ROWS][$j][$i]); /** - * If a type for this column has alreday been delcared, + * If a type for this column has already been declared, * only alter it if it was a number and a varchar was found - */ - if ($curr_type != NONE) { + */ + if ($curr_type != NONE) { if ($curr_type == VARCHAR) { $types[$i] = VARCHAR; } else if ($curr_type == DECIMAL) { if ($types[$i] != VARCHAR) { $types[$i] = DECIMAL; } + } else if ($curr_type == BIGINT) { + if ($types[$i] != VARCHAR && $types[$i] != DECIMAL) { + $types[$i] = BIGINT; + } } else if ($curr_type == INT) { - if ($types[$i] != VARCHAR && $types[$i] != DECIMAL) { - $types[$i] = INT; - } - } + if ($types[$i] != VARCHAR && $types[$i] != DECIMAL && $types[$i] != BIGINT) { + $types[$i] = INT; + } + } } } } @@ -945,7 +957,7 @@ function PMA_buildSQL($db_name, &$tables, &$analyses = NULL, &$additional_sql = } if ($analyses != NULL) { - $type_array = array(NONE => "NULL", VARCHAR => "varchar", INT => "int", DECIMAL => "decimal"); + $type_array = array(NONE => "NULL", VARCHAR => "varchar", INT => "int", DECIMAL => "decimal", BIGINT => "bigint"); /* TODO: Do more checking here to make sure they really are matched */ if (count($tables) != count($analyses)) { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_7-7-g194e357
by Dieter Adriaenssens 10 Sep '10

10 Sep '10

The branch, QA_3_3 has been updated via 194e357a996310225364d311e6c27ed41db002bb (commit) from 5d136abd8bf9f85336f52332470acf9e52448b20 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/import.lib.php | 68 +++++++++++++++++++++++++++------------------- 2 files changed, 41 insertions(+), 28 deletions(-) diff --git a/ChangeLog b/ChangeLog index 523f015..42030ef 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,7 @@ $Id$ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/… $ 3.3.8.0 (not yet released) +- bug #3059311 [import] BIGINT field type added to table analysis 3.3.7.0 (2010-09-07) - patch #3050492 [PDF scratchboard] Cannot drag table box to the edge after diff --git a/libraries/import.lib.php b/libraries/import.lib.php index 6c039bd..278028b 100644 --- a/libraries/import.lib.php +++ b/libraries/import.lib.php @@ -408,6 +408,7 @@ define("NONE", 0); define("VARCHAR", 1); define("INT", 2); define("DECIMAL", 3); +define("BIGINT", 4); /* Decimal size defs */ define("M", 0); @@ -493,6 +494,7 @@ function PMA_getDecimalSize(&$cell) { * @uses FULL * @uses VARCHAR * @uses DECIMAL + * @uses BIGINT * @uses INT * @uses NONE * @uses strcmp() @@ -501,8 +503,8 @@ function PMA_getDecimalSize(&$cell) { * @uses PMA_getD() * @uses PMA_getDecimalSize() * @param string $last_cumulative_size Last cumulative column size - * @param int $last_cumulative_type Last cumulative column type (NONE or VARCHAR or DECIMAL or INT) - * @param int $curr_type Type of the current cell (NONE or VARCHAR or DECIMAL or INT) + * @param int $last_cumulative_type Last cumulative column type (NONE or VARCHAR or DECIMAL or INT or BIGINT) + * @param int $curr_type Type of the current cell (NONE or VARCHAR or DECIMAL or INT or BIGINT) * @param string &$cell The current cell * @return string Size of the given cell in the type-appropriate format */ @@ -520,7 +522,7 @@ function PMA_detectSize($last_cumulative_size, $last_cumulative_type, $curr_type */ elseif ($curr_type == VARCHAR) { /** - * The last cumlative type was VARCHAR + * The last cumulative type was VARCHAR */ if ($last_cumulative_type == VARCHAR) { if ($curr_size >= $last_cumulative_size) { @@ -530,7 +532,7 @@ function PMA_detectSize($last_cumulative_size, $last_cumulative_type, $curr_type } } /** - * The last cumlative type was DECIMAL + * The last cumulative type was DECIMAL */ elseif ($last_cumulative_type == DECIMAL) { $oldM = PMA_getM($last_cumulative_size); @@ -542,9 +544,9 @@ function PMA_detectSize($last_cumulative_size, $last_cumulative_type, $curr_type } } /** - * The last cumlative type was INT + * The last cumulative type was BIGINT or INT */ - elseif ($last_cumulative_type == INT) { + elseif ($last_cumulative_type == BIGINT || $last_cumulative_type == INT) { if ($curr_size >= $last_cumulative_size) { return $curr_size; } else { @@ -573,7 +575,7 @@ function PMA_detectSize($last_cumulative_size, $last_cumulative_type, $curr_type */ elseif ($curr_type == DECIMAL) { /** - * The last cumlative type was VARCHAR + * The last cumulative type was VARCHAR */ if ($last_cumulative_type == VARCHAR) { /* Convert $last_cumulative_size from varchar to decimal format */ @@ -586,7 +588,7 @@ function PMA_detectSize($last_cumulative_size, $last_cumulative_type, $curr_type } } /** - * The last cumlative type was DECIMAL + * The last cumulative type was DECIMAL */ elseif ($last_cumulative_type == DECIMAL) { $size = PMA_getDecimalSize($cell); @@ -603,9 +605,9 @@ function PMA_detectSize($last_cumulative_size, $last_cumulative_type, $curr_type } } /** - * The last cumlative type was INT + * The last cumulative type was BIGINT or INT */ - elseif ($last_cumulative_type == INT) { + elseif ($last_cumulative_type == BIGINT || $last_cumulative_type == INT) { /* Convert $last_cumulative_size from int to decimal format */ $size = PMA_getDecimalSize($cell); @@ -636,11 +638,11 @@ function PMA_detectSize($last_cumulative_size, $last_cumulative_type, $curr_type } } /** - * What to do if the current cell is of type INT + * What to do if the current cell is of type BIGINT or INT */ - elseif ($curr_type == INT) { + elseif ($curr_type == BIGINT || $curr_type == INT) { /** - * The last cumlative type was VARCHAR + * The last cumulative type was VARCHAR */ if ($last_cumulative_type == VARCHAR) { if ($curr_size >= $last_cumulative_size) { @@ -650,7 +652,7 @@ function PMA_detectSize($last_cumulative_size, $last_cumulative_type, $curr_type } } /** - * The last cumlative type was DECIMAL + * The last cumulative type was DECIMAL */ elseif ($last_cumulative_type == DECIMAL) { $oldM = PMA_getM($last_cumulative_size); @@ -668,9 +670,9 @@ function PMA_detectSize($last_cumulative_size, $last_cumulative_type, $curr_type } } /** - * The last cumlative type was INT + * The last cumulative type was BIGINT or INT */ - elseif ($last_cumulative_type == INT) { + elseif ($last_cumulative_type == BIGINT || $last_cumulative_type == INT) { if ($curr_size >= $last_cumulative_size) { return $curr_size; } else { @@ -714,6 +716,7 @@ function PMA_detectSize($last_cumulative_size, $last_cumulative_type, $curr_type * @access public * * @uses DECIMAL + * @uses BIGINT * @uses INT * @uses VARCHAR * @uses NONE @@ -721,13 +724,13 @@ function PMA_detectSize($last_cumulative_size, $last_cumulative_type, $curr_type * @uses strcmp() * @uses strpos() * @uses substr_count() - * @param int $last_cumulative_type Last cumulative column type (VARCHAR or INT or DECIMAL or NONE) + * @param int $last_cumulative_type Last cumulative column type (VARCHAR or INT or BIGINT or DECIMAL or NONE) * @param string &$cell String representation of the cell for which a best-fit type is to be determined - * @return int The MySQL type representation (VARCHAR or INT or DECIMAL or NONE) + * @return int The MySQL type representation (VARCHAR or INT or BIGINT or DECIMAL or NONE) */ function PMA_detectType($last_cumulative_type, &$cell) { /** - * If numeric, determine if decimal or int + * If numeric, determine if decimal, int or bigint * Else, we call it varchar for simplicity */ @@ -741,7 +744,11 @@ function PMA_detectType($last_cumulative_type, &$cell) { if ($cell == (string)(float)$cell && strpos($cell, ".") !== false && substr_count($cell, ".") == 1) { return DECIMAL; } else { - return INT; + if ($cell > 2147483647) { + return BIGINT; + } else { + return INT; + } } } else { return VARCHAR; @@ -764,6 +771,7 @@ function PMA_detectType($last_cumulative_type, &$cell) { * @uses ROWS * @uses VARCHAR * @uses DECIMAL + * @uses BIGINT * @uses INT * @uses NONE * @uses count() @@ -808,21 +816,25 @@ function PMA_analyzeTable(&$table) { $sizes[$i] = PMA_detectSize($sizes[$i], $types[$i], $curr_type, $table[ROWS][$j][$i]); /** - * If a type for this column has alreday been delcared, + * If a type for this column has already been declared, * only alter it if it was a number and a varchar was found - */ - if ($curr_type != NONE) { + */ + if ($curr_type != NONE) { if ($curr_type == VARCHAR) { $types[$i] = VARCHAR; } else if ($curr_type == DECIMAL) { if ($types[$i] != VARCHAR) { $types[$i] = DECIMAL; } + } else if ($curr_type == BIGINT) { + if ($types[$i] != VARCHAR && $types[$i] != DECIMAL) { + $types[$i] = BIGINT; + } } else if ($curr_type == INT) { - if ($types[$i] != VARCHAR && $types[$i] != DECIMAL) { - $types[$i] = INT; - } - } + if ($types[$i] != VARCHAR && $types[$i] != DECIMAL && $types[$i] != BIGINT) { + $types[$i] = INT; + } + } } } } @@ -952,7 +964,7 @@ function PMA_buildSQL($db_name, &$tables, &$analyses = NULL, &$additional_sql = } if ($analyses != NULL) { - $type_array = array(NONE => "NULL", VARCHAR => "varchar", INT => "int", DECIMAL => "decimal"); + $type_array = array(NONE => "NULL", VARCHAR => "varchar", INT => "int", DECIMAL => "decimal", BIGINT => "bigint"); /* TODO: Do more checking here to make sure they really are matched */ if (count($tables) != count($analyses)) { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin localized documentation branch, master, updated. 2f9c367a74b99ad6a77af141f523a973e473b600
by Michal Čihař 10 Sep '10

10 Sep '10

The branch, master has been updated via 2f9c367a74b99ad6a77af141f523a973e473b600 (commit) from eaba78b3a838b9c98dede9c9e01be0fc07fefa18 (commit) - Log ----------------------------------------------------------------- commit 2f9c367a74b99ad6a77af141f523a973e473b600 Author: Michal Čihař <mcihar(a)novell.com> Date: Fri Sep 10 08:29:13 2010 +0200 Regenerate translations. ----------------------------------------------------------------------- Summary of changes: output/zh_CN/Documentation.html | 638 ++++++++++++++++----------------------- output/zh_CN/INSTALL | 4 +- output/zh_CN/README | 71 +++++ output/zh_CN/TODO | 4 +- output/zh_CN/index.html | 12 +- output/zh_CN/translators.html | 7 +- 6 files changed, 352 insertions(+), 384 deletions(-) create mode 100644 output/zh_CN/README diff --git a/output/zh_CN/Documentation.html b/output/zh_CN/Documentation.html index 1820cd6..69909c7 100644 --- a/output/zh_CN/Documentation.html +++ b/output/zh_CN/Documentation.html @@ -78,8 +78,7 @@ SourceForge.net 的项目页 (英语)</a></li> 5.2.0 或更高版本。 </li> <li>要支持上传 zip 文件，需要 <tt>zip</tt> 扩展。</li> - <li>For proper support of multibyte strings (eg. UTF-8, which is currently the -default), you should install the mbstring and ctype extensions. + <li>为了更好的支持多字节字符串 (如 UTF-8 编码的文字, 当前默认编码)，你应该安装 mbstring 和 ctype 扩展。 </li> <li>要支持内联 JPEG 图像的等比缩略图 ("image/jpeg: inline")，需要 GD2 扩展</li> <li>当使用 "cookie" <a href="#authentication_modes">认证</a>时，我们强烈建议大部分用户使用 @@ -88,9 +87,8 @@ default), you should install the mbstring and ctype extensions. </li> <li>要支持上传进度条，参见 <a href="#faq2_9"> <abbr title="常见问题 (Frequently Asked Questions)">FAQ</abbr> 2.9</a>。</li> - <li>To support BLOB streaming, see PHP and MySQL requirements in <a -href="#faq6_25"> <abbr title="Frequently Asked Questions">FAQ</abbr> -6.25</a>.</li> + <li>要支持 BLOB 流，参见 <a href="#faq6_25"> <abbr title="常见问题 (Frequently Asked +Questions)">FAQ</abbr> 6.25</a> 中所述的 PHP 和 MySQL 需求。</li> </ul> </li> <li><b>MySQL</b> 5.0 或更高版本 (<a href="#faq1_17">查看详细说明</a>);</li> @@ -107,8 +105,8 @@ href="#faq6_25"> <abbr title="Frequently Asked Questions">FAQ</abbr> <h3>目前 phpMyAdmin 具有的功能有:</h3> -<ul><li>browse and drop databases, tables, views, columns and indexes</li> - <li>create, copy, drop, rename and alter databases, tables, columns and indexes</li> +<ul><li>浏览、删除数据库、数据表、视图、字段和索引</li> + <li>创建、复制、删除、改名以及修改数据库、数据表、字段和索引</li> <li>用服务器中设置好的计划维护服务器、数据库、数据表</li> <li>运行、编辑一条或多条任意 <abbr title="结构化查询语言 (structured query language)">SQL</abbr> 语句，并加入书签</li> @@ -141,7 +139,7 @@ Language)">SQL</abbr> 文件中导入数据和 MySQL 结构</li> Questions)">FAQ</abbr> 3.6)</a></li> <li>支持改进的 MySQL 扩展 mysqli <a href="#faq1_17"> (参见 <abbr title="常见问题 (Frequently Asked Questions)">FAQ</abbr> 1.17)</a></li> - <li>communicate in <a href="./translators.html">58 different languages</a> + <li>支持 <a href="./translators.html">58 种不同的语言</a> </li> <li>同步当前或远程服务器上的任意两个数据库 <a href="#faq9_1">(参见 <abbr title="常见问题 (Frequently Asked Questions)">FAQ</abbr> 9.1)</a> @@ -166,7 +164,7 @@ title="逗号分隔型取值 (comma separated values)">CSV</abbr> 时可压缩 <ol><li><a href="#quick_install">快速安装</a></li> <li><a href="#setup_script">使用安装脚本</a></li> - <li><a href="#linked-tables">phpMyAdmin configuration storage</a></li> + <li><a href="#linked-tables">phpMyAdmin 高级功能</a></li> <li><a href="#upgrading">从旧版本升级</a></li> <li><a href="#authentication_modes">使用认证</a></li> </ol> @@ -272,23 +270,21 @@ Apache 中你可以通过 .htaccess 文件设置，其他网站服务器请自 </li> </ol> -<h3 id="linked-tables">phpMyAdmin configuration storage</h3> +<h3 id="linked-tables">phpMyAdmin 高级功能</h3> -<p> For a whole set of new features (bookmarks, comments, <abbr -title="structured query language">SQL</abbr>-history, tracking mechanism, -<abbr title="Portable Document Format">PDF</abbr>-generation, column -contents transformation, etc.) you need to create a set of special -tables. Those tables can be located in your own database, or in a central -database for a multi-user installation (this database would then be accessed -by the controluser, so no other user should have rights to it).</p> +<p> 若要使用一些高级功能 (如: 书签、注释、<abbr title="结构化查询语言 (structured query +language)">SQL</abbr> 查询历史、结构追踪、生成 <abbr title="便携式文档格式 (Portable Document +Format)">PDF</abbr> +、内容转换等)，你需要创建一些特殊的数据表。这些表可以放在你自己的数据库里，也可以在一个多用户的服务器上创建一个独立的数据库 +(这个数据库将通过其对应的帐号访问，所以不应该给其他用户访问这个数据库的权限)。</p> <p> 你可以在 <tt>./scripts/</tt> 目录下找到 <i>create_tables.sql</i> 文件 (如果你使用的是 Windows 服务器，请特别注意在 <a href="#faq1_23"> <abbr title="常见问题 (Frequently Asked Questions)">FAQ</abbr> 1.23</a> 中所提到的问题)。</p> -<p> If you already had this infrastructure and upgraded to MySQL 4.1.2 or newer, -please use <i>./scripts/upgrade_tables_mysql_4_1_2+.sql</i> and then create -new tables by importing <i>./scripts/create_tables.sql</i>.</p> +<p> 如果你以前就使用过该功能并升级过 MySQL 到 4.1.2 或更高版本，请使用 +<i>./scripts/upgrade_tables_mysql_4_1_2+.sql</i> 然后通过导入 +<i>./scripts/create_tables.sql</i> 来创建新的数据表。</p> <p> 你可以使用 phpMyAdmin 来创建这些数据表。但请注意，你可能需要特殊 (管理员) 权限来创建数据库和数据表，而且可能还需要根据实际所使用的数据修改这个脚本中数据库的名字。</p> @@ -307,10 +303,8 @@ href="#authentication_modes">使用认证</a> 一节)。</p> <p> <strong>请勿</strong>复制 <tt>libraries/config.default.php</tt> 为 <tt>config.inc.php</tt> 因为默认配置是仅对当前版本有效的。</p> -<p> If you have upgraded your MySQL server from a version previous to 4.1.2 to -version 5.x or newer and if you use the phpMyAdmin configuration storage, -you should run the SQL script found in -<tt>scripts/upgrade_tables_mysql_4_1_2+.sql</tt>.</p> +<p> 如果你把 MySQL 服务器从 4.1.2 之前的版本升级到了 5.x 或更高版本，并且使用 phpMyAdmin 高级功能，你还要运行 SQL 脚本 +<tt>scripts/upgrade_tables_mysql_4_1_2+.sql</tt> 。</p> <h3 id="authentication_modes">使用认证</h3> @@ -328,8 +322,7 @@ Protocol)">HTTP</abbr> 或 cookie 认证，用户名和密码也不会被保存不论如何，如果你不使用 HTTPS 协议，密码将总是以明文传输。<br /> 当使用 cookie 认证时，密码将经过 blowfish 算法加密并保存在一个临时 cookie 中。</li> - <li id="pmausr">Note: this section is only applicable if your MySQL server is running with -<tt>--skip-show-database</tt>.<br /><br /> + <li id="pmausr">注意: 本节仅适用于运行在 <tt>--skip-show-database</tt> 模式下的 MySQL 服务器。<br /><br /> 当使用 '<abbr title="超文本转移协议 (HyperText Transfer Protocol)">HTTP</abbr>' 和 'cookie' 认证时，phpMyAdmin 需要一个在 <i>`mysql`.`user` (除 `Password` @@ -365,8 +358,7 @@ GRANT SELECT (Host, Db, User, Table_name, Table_priv, Column_priv) GRANT SELECT, INSERT, UPDATE, DELETE ON <pma_db>.* TO 'pma'@'localhost'; </pre> - (this of course requires that your <a href="#linked-tables">phpMyAdmin -configuration storage</a> be set up). + (需要设置好 <a href="#linked-tables">phpMyAdmin 高级功能</a>)。 <br /></li> <li>每一个<i>真实的</i>用户应在特定的数据库上具有一定的权限。除非你很明白这些权限的作用 @@ -563,12 +555,10 @@ class="configrule">$cfg['Servers'][$i]['host']</a> 设为 "127.0.0.1" <span id="cfg_Servers_controlpass">$cfg['Servers'][$i]['controlpass']</span> 字符串 </dt> - <dd>This special account is used for 2 distinct purposes: to make possible all -relational features (see <a href="#pmadb" -class="configrule">$cfg['Servers'][$i]['pmadb']</a>) and, for a MySQL -server running with <tt>--skip-show-database</tt>, to enable a multi-user -installation (<abbr title="HyperText Transfer Protocol">HTTP</abbr> or -cookie authentication mode).<br /><br /> + <dd>这个特殊的帐号有两种不同的用途: 1、为 phpMyAdmin 高级功能提供支持 (参见 <a href="#pmadb" +class="configrule">$cfg['Servers'][$i]['pmadb']</a>)。2、在运行于 +<tt>--skip-show-database</tt> 模式的 MySQL 服务器上使用多用户安装提供支持 (<abbr +title="超文本转移协议 (HyperText Transfer Protocol)">HTTP</abbr> 或 cookie 认证)。<br /><br /> 当使用 <abbr title="超文本转移协议 (HyperText Transfer Protocol)">HTTP</abbr> 或 cookie 认证时 (自 2.2.1 起也包括 'config' 认证)，你需要提供一个在 <i>mysql.user (除了 @@ -668,7 +658,7 @@ array('要置顶的数据库1', '要置顶的数据库2', '*');</tt> 即可，ph 例如，要隐藏所有以字母 "a" 开头的数据库，用<br /> <pre>$cfg['Servers'][$i]['hide_db'] = '^a';</pre> 要隐藏数据库 "数据库1" 和 "数据库2" ，用 <br /> - <pre>$cfg['Servers'][$i]['hide_db'] = '^(db1|db2)$';</pre> + <pre>$cfg['Servers'][$i]['hide_db'] = '^(数据库1|数据库2)$';// 译者注: 上例中也可使用中文，需注意配置文件编码应为 UTF-8</pre> 可以在 PHP 手册的 <a href="http://php.net/manual/en/reference.pcre.pattern.syntax.php">Perl 兼容正则表达式的语法 (外链，英语)</a> 一节中找到更多关于正则表达式的信息。 @@ -681,19 +671,15 @@ href="http://php.net/manual/en/reference.pcre.pattern.syntax.php">Perl <dt id="pmadb"> <span id="cfg_Servers_pmadb">$cfg['Servers'][$i]['pmadb']</span> 字符串 </dt> - <dd>The name of the database containing the phpMyAdmin configuration storage. + <dd>包含 phpMyAdmin 高级功能数据的数据库名。 <br /><br /> - See the <a href="#linked-tables">phpMyAdmin configuration storage</a> -section in this document to see the benefits of this feature, and for a -quick way of creating this database and the needed tables. + 参见 <a href="#linked-tables">phpMyAdmin 高级功能</a>一节了解其好处以及如何快速创建该数据库和需要的数据表。 <br /><br /> - If you are the only user of this phpMyAdmin installation, you can use your -current database to store those special tables; in this case, just put your -current database name in <tt>$cfg['Servers'][$i]['pmadb']</tt>. For a -multi-user installation, set this parameter to the name of your central -database containing the phpMyAdmin configuration storage.</dd> + 如果此 phpMyAdmin 只有你自己使用，你可以用你当前的数据库来保存这些特殊的数据表，这种情况下，你可以在 +<tt>$cfg['Servers'][$i]['pmadb']</tt> 中填写当前数据库的名字。若此 phpMyAdmin +作为多用户使用，请设为包含 phpMyAdmin 高级功能数据表的专用数据库。</dd> <dt id="bookmark"> <span @@ -703,7 +689,7 @@ id="cfg_Servers_bookmarktable">$cfg['Servers'][$i]['bookmarktable']</span> <dd>自 2.2.0 起 phpMyAdmin 允许用户将查询加入书签。你可以将经常要执行的语句加入书签。<br /><br /> 要启用此功能: - <ul><li>set up <a href="#pmadb">pmadb</a> and the phpMyAdmin configuration storage</li> + <ul><li>设置好 <a href="#pmadb">pmadb</a> 和 phpMyAdmin 高级功能</li> <li>在 <tt>$cfg['Servers'][$i]['bookmarktable']</tt> 中设置要使用的数据表名</li> </ul> </dd> @@ -711,9 +697,7 @@ id="cfg_Servers_bookmarktable">$cfg['Servers'][$i]['bookmarktable']</span> <dt id="relation"> <span id="cfg_Servers_relation">$cfg['Servers'][$i]['relation']</span> 字符串 </dt> - <dd>Since release 2.2.4 you can describe, in a special 'relation' table, which -column is a key in another table (a foreign key). phpMyAdmin currently uses -this to + <dd>自 2.2.4 起你可以在 'relation' 表的支持下定义一张表中的一个字段与另一张表的关系 (外键)。目前 phpMyAdmin 用它来 <ul><li>使外键数据可点击，浏览主表时可通过点击数据值转到外表;</li> <li>display in an optional tool-tip the "display column" when browsing the master table, if you move the mouse to a column containing a foreign key @@ -737,7 +721,7 @@ Questions)">FAQ</abbr> 6.6</a>)</li> 要启用此功能: - <ul><li>set up <a href="#pmadb">pmadb</a> and the phpMyAdmin configuration storage</li> + <ul><li>设置好 <a href="#pmadb">pmadb</a> 和 phpMyAdmin 高级功能</li> <li>在 <tt>$cfg['Servers'][$i]['relation']</tt> 中设置要使用的数据表名</li> <li>now as normal user open phpMyAdmin and for each one of your tables where you want to use this feature, click "Structure/Relation view/" and @@ -745,9 +729,8 @@ choose foreign columns. </li> </ul> - Please note that in the current version, <tt>master_db</tt> must be the same -as <tt>foreign_db</tt>. Those columns have been put in future development of -the cross-db relations. + 请注意在当前版本中 <tt>master_db</tt> 必须和 <tt>foreign_db</tt> +一致。这两个字段是为后期跨数据库关系开发预留的。 </dd> <dt id="table_info"> @@ -759,14 +742,12 @@ the cross-db relations. column is to be displayed as a tool-tip when moving the cursor over the corresponding key.<br /> 这张表的名字将被保存在此变量中。要启用此功能: - <ul><li>set up <a href="#pmadb">pmadb</a> and the phpMyAdmin configuration storage</li> - <li>put the table name in <tt>$cfg['Servers'][$i]['table_info']</tt> (e.g. -'pma_table_info')</li> - <li>then for each table where you want to use this feature, click -"Structure/Relation view/Choose column to display" to choose the -column.</li> + <ul><li>设置好 <a href="#pmadb">pmadb</a> 和 phpMyAdmin 高级功能</li> + <li>在 <tt>$cfg['Servers'][$i]['table_info']</tt> 中设置要使用的数据表名 +(如：'pma_table_info')</li> + <li>对每一张你要使用此功能的数据表，点击"结构/关系查看/选择要显示的字段"设置好显示的字段。</li> </ul> - Usage tip: <a href="#faqdisplay">Display column</a>. + 使用技巧: <a href="#faqdisplay">显示字段</a>。 </dd> <dt id="table_coords"> <span @@ -783,7 +764,7 @@ Format)">PDF</abbr> 大纲输出中的坐标)。<br /><br /> 要启用此功能: - <ul><li>set up <a href="#pmadb">pmadb</a> and the phpMyAdmin configuration storage</li> + <ul><li>设置好 <a href="#pmadb">pmadb</a> 和 phpMyAdmin 高级功能</li> <li>在 <tt>$cfg['Servers'][$i]['table_coords']</tt> 和 <tt>$cfg['Servers'][$i]['pdf_pages']</tt> 中设置要使用的数据表名</li> </ul> @@ -815,9 +796,9 @@ system, your column_info table has to have the three new columns 'mimetype', <br /><br /> 要启用此功能: - <ul><li>set up <a href="#pmadb">pmadb</a> and the phpMyAdmin configuration storage</li> - <li>put the table name in <tt>$cfg['Servers'][$i]['column_info']</tt> (e.g. -'pma_column_info')</li> + <ul><li>设置好 <a href="#pmadb">pmadb</a> 和 phpMyAdmin 高级功能</li> + <li>在 <tt>$cfg['Servers'][$i]['column_info']</tt> 中设置要使用的数据表名 +(如：'pma_column_info')</li> <li>要从 2.5.0 之前的 Column_comments 表升级可执行: <pre> @@ -848,9 +829,8 @@ class="configrule">$cfg['QueryHistoryMax']</a> 要启用此功能: - <ul><li>set up <a href="#pmadb">pmadb</a> and the phpMyAdmin configuration storage</li> - <li>put the table name in <tt>$cfg['Servers'][$i]['history']</tt> -(e.g. 'pma_history') + <ul><li>设置好 <a href="#pmadb">pmadb</a> 和 phpMyAdmin 高级功能</li> + <li>在 <tt>$cfg['Servers'][$i]['history']</tt> 中设置要使用的数据表名 (如：'pma_history') </li> </ul> </dd> @@ -876,16 +856,15 @@ class="configrule">$cfg['QueryHistoryMax']</a> 要启用此功能: <ul> - <li>set up <a href="#pmadb">pmadb</a> and the phpMyAdmin configuration storage</li> - <li>put the table name in <tt>$cfg['Servers'][$i]['tracking']</tt> -(e.g. 'pma_tracking')</li> + <li>设置好 <a href="#pmadb">pmadb</a> 和 phpMyAdmin 高级功能</li> + <li>在 <tt>$cfg['Servers'][$i]['tracking']</tt> 中设置要使用的数据表名 (如：'pma_tracking')</li> </ul> </dd> <dt id="tracking2"> <span id="cfg_Servers_tracking_version_auto_create">$cfg['Servers'][$i]['tracking_version_auto_create']</span> -boolean +布尔 </dt> <dd> 设置追踪系统是否自动为数据表和视图创建版本。默认为 false 。 @@ -919,11 +898,10 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre> <dt id="tracking4"> <span id="cfg_Servers_tracking_add_drop_view">$cfg['Servers'][$i]['tracking_add_drop_view']</span> -boolean +布尔 </dt> <dd> - Whether a DROP VIEW IF EXISTS statement will be added as first line to the -log when creating a view. Default value is true. + 设置当记录视图创建时，是否在日志首行加上 DROP VIEW IF EXISTS 语句。默认为 true 。 <br/><br/> </dd> @@ -931,28 +909,26 @@ log when creating a view. Default value is true. <dt id="tracking5"> <span id="cfg_Servers_tracking_add_drop_table">$cfg['Servers'][$i]['tracking_add_drop_table']</span> -boolean +布尔 </dt> <dd> - Whether a DROP TABLE IF EXISTS statement will be added as first line to the -log when creating a table. Default value is true. + 设置当记录数据表创建时，是否在日志首行加上 DROP TABLE IF EXISTS 语句。默认为 true 。 <br/><br/> </dd> <dt id="tracking6"> <span id="cfg_Servers_tracking_add_drop_database">$cfg['Servers'][$i]['tracking_add_drop_database']</span> -boolean +布尔 </dt> <dd> - Whether a DROP DATABASE IF EXISTS statement will be added as first line to -the log when creating a database. Default value is true. + 设置当记录数据库创建时，是否在日志首行加上 DROP DATABASE IF EXISTS 语句。默认为 true 。 <br/><br/> </dd> <dt id="userconfig"> <span id="cfg_Servers_userconfig">$cfg['Servers'][$i]['userconfig']</span> -string +字符串 </dt> <dd> Since release 3.4.x phpMyAdmin allows users to set most preferences by @@ -967,8 +943,8 @@ browser's local storage, or, it is is unavailable, until the end of session. 要启用此功能: <ul> - <li>set up <a href="#pmadb">pmadb</a> and the phpMyAdmin configuration storage</li> - <li>put the table name in <tt>$cfg['Servers'][$i]['userconfig']</tt></li> + <li>设置好 <a href="#pmadb">pmadb</a> 和 phpMyAdmin 高级功能</li> + <li>在 <tt>$cfg['Servers'][$i]['userconfig']</tt> 中设置要使用的数据表名</li> </ul> </dd> @@ -982,9 +958,9 @@ id="cfg_Servers_designer_coords">$cfg['Servers'][$i]['designer_coords']</span> 要启用此功能: - <ul><li>set up <a href="#pmadb">pmadb</a> and the phpMyAdmin configuration storage</li> - <li>put the table name in <tt>$cfg['Servers'][$i]['designer_coords']</tt> -(e.g. 'pma_designer_coords') + <ul><li>设置好 <a href="#pmadb">pmadb</a> 和 phpMyAdmin 高级功能</li> + <li>在 <tt>$cfg['Servers'][$i]['designer_coords']</tt> 中设置要使用的数据表名 +(如：'pma_designer_coords') </li> </ul> </dd> @@ -1016,8 +992,7 @@ id="cfg_Servers_AllowNoPassword">$cfg['Servers'][$i]['AllowNoPassword']</span> id="cfg_Servers_AllowDeny_order">$cfg['Servers'][$i]['AllowDeny']['order']</span> 字符串 </dt> - <dd>If your rule order is empty, then <abbr title="Internet Protocol">IP</abbr> -authorization is disabled.<br /><br /> + <dd>若不指定规则顺序，<abbr title="互联网协议 (Internet Protocol)">IP</abbr> 认证将不可用。<br /><br /> 若将规则顺序设为 <tt>'deny,allow'</tt>，系统将首先应用所有的允许 (allow) 规则，然后再应用禁止规则 (deny) 。默认允许访问。任何没有被 Deny (禁止) 命令匹配的客户端或者被 Allow (允许) 命令匹配的客户端将被允许访问服务器。 <br /><br /> @@ -1134,7 +1109,7 @@ Protocol)">HTTP</abbr> 传输。<br /> <dd>保存会话数据的路径 (<a href="http://php.net/session_save_path">PHP 参数 session_save_path (外链，英语)</a>)。</dd> - <dt id="cfg_MemoryLimit">$cfg['MemoryLimit'] string [number of bytes]</dt> + <dt id="cfg_MemoryLimit">$cfg['MemoryLimit'] 字符串 [单位: 字节]</dt> <dd>设置脚本运行的可使用的内存。若设为 0 则无限制。<br /> 本设置用于导入/导出转储文件以及 phpMyAdmin 的其他功能，所以显然不要设置一个很小的值。若 PHP 运行于安全模式则无效。<br /> 同样可以设置为 php.ini 中可以识别的字符串，如 '16M' 。请确保没有丢掉后缀 (16 表示 16 字节！)</dd> @@ -3509,89 +3484,68 @@ clause is generated when I browse a table.</a></h4> <tt>On</tt> on the server. It seems to be a browser-specific problem; meanwhile use the <tt>cookie</tt> authentication mode.</p> -<h3 id="faqusing">Using phpMyAdmin</h3> +<h3 id="faqusing">使用 phpMyAdmin</h3> <h4 id="faq6_1"> - <a href="#faq6_1">6.1 I can't insert new rows into a table / I can't create -a table - MySQL brings up a <abbr title="structured query -language">SQL</abbr>-error. </a></h4> + <a href="#faq6_1">6.1 我插入不了数据到表中 / 我创建不了数据表 - MySQL 提示 <abbr title="结构化查询语言 +(structured query language)">SQL</abbr> 错误。 </a></h4> <p> - Examine the <abbr title="structured query language">SQL</abbr> error with -care. Often the problem is caused by specifying a wrong column-type.<br /> - Common errors include: + 仔细检查 <abbr title="结构化查询语言 (structured query language)">SQL</abbr> +错误。这个问题通常是因为指定了错误的字段类型。<br /> + 常见错误有: </p> <ul> - <li>Using <tt>VARCHAR</tt> without a size argument</li> - <li>Using <tt>TEXT</tt> or <tt>BLOB</tt> with a size argument</li> + <li>不给 <tt>VARCHAR</tt> 设置大小参数</li> + <li>给 <tt>TEXT</tt> 或 <tt>BLOB</tt> 设置大小参数</li> </ul> <p> - Also, look at the syntax chapter in the MySQL manual to confirm that your -syntax is correct. + 同时，请参考 MySQL 手册中语法一章确定你的语法都正确。 </p> <h4 id="faq6_2"> - <a href="#faq6_2">6.2 When I create a table, I set an index for two columns -and phpMyAdmin generates only one index with those two columns. </a></h4> + <a href="#faq6_2">6.2 建表时，我给两个字段设置了索引，但 phpMyAdmin 却创建了一个包含这两个字段的索引。 </a></h4> <p> - This is the way to create a multi-columns index. If you want two indexes, -create the first one when creating the table, save, then display the table -properties and click the Index link to create the other index. + 这是一种创建多字段索引的方法。如果你需要两个索引，在建表时先设置一个，保存，然后显示数据表属性并点击索引链接来创建另一个索引。 </p> <h4 id="faq6_3"> - <a href="#faq6_3">6.3 How can I insert a null value into my table?</a></h4> + <a href="#faq6_3">6.3 怎样向我的表中插入一个空 (null) 值？</a></h4> <p> - Since version 2.2.3, you have a checkbox for each column that can be null. -Before 2.2.3, you had to enter "null", without the quotes, as the -column's value. Since version 2.5.5, you have to use the checkbox to get a -real NULL value, so if you enter "NULL" this means you want a -literal NULL in the column, and not a NULL value (this works in PHP4). + 自 2.2.3 版起，每个字段都有一个复选框来设置字段是否为空。 2.2.3 之前，你只能输入 +"null"，不包括引号来作为字段的值。自 2.5.5 版起，你可以使用复选框来获得一个真正的空 (NULL) 值，如果你输入 +"NULL" 将表示文字 NULL，而不是空 (NULL) 值 (对 PHP4 同样有效)。 </p> <h4 id="faq6_4"> - <a href="#faq6_4">6.4 How can I backup my database or table?</a></h4> + <a href="#faq6_4">6.4 怎样备份我的数据库或数据表？</a></h4> -<p> Click on a database or table name in the left frame, the properties will be -displayed. Then on the menu, click "Export", you can dump the -structure, the data, or both. This will generate standard <abbr -title="structured query language">SQL</abbr> statements that can be used to -recreate your database/table. +<p> 在左侧框架中点击数据库或表名，将会显示它们的属性。然后在菜单上点击 "导出"，你可以转储结构和/或数据。该功能将生成标准 +<abbr title="结构化查询语言 (structured query language)">SQL</abbr> +语句以便重新创建你的数据库/表。 <br /><br /> - You will need to choose "Save as file", so that phpMyAdmin can -transmit the resulting dump to your station. Depending on your PHP -configuration, you will see options to compress the dump. See also the <a -href="#cfg_ExecTimeLimit" class="configrule">$cfg['ExecTimeLimit']</a> -configuration variable.<br /><br /> + 若选择 "保存为文件"，phpMyAdmin 即可将转储结果直接提供下载。取决于 PHP 的配置，你还能看见压缩选项。同时请参见 +<a href="#cfg_ExecTimeLimit" class="configrule">$cfg['ExecTimeLimit']</a> +配置变量。<br /><br /> - For additional help on this subject, look for the word "dump" in -this document.</p> + 要获得更多关于该主题的帮助，请在本文档中查找 "转储" 。</p> <h4 id="faq6_5"> - <a href="#faq6_5">6.5 How can I restore (upload) my database or table using -a dump? How can I run a ".sql" file? </a></h4> - -<p> Click on a database name in the left frame, the properties will be -displayed. Select "Import" from the list of tabs in the -right–hand frame (or "<abbr title="structured query -language">SQL</abbr>" if your phpMyAdmin version is previous to -2.7.0). In the "Location of the text file" section, type in the -path to your dump filename, or use the Browse button. Then click Go. + <a href="#faq6_5">6.5 怎样通过转储恢复 (上传) 我的数据库或表？怎样运行一个 ".sql" 文件？</a></h4> + +<p> 在左侧框架中点击数据库或表名，将会显示它们的属性。在右手边框架中的标签列表中选择 "导入" (或 "<abbr +title="结构化查询语言 (structured query language)">SQL</abbr>" 如果你的 phpMyAdmin +版本低于 2.7.0)。在 "文本文件的位置" 中输入你的转储文件名，或使用浏览按钮。然后点击执行。 <br /><br /> - With version 2.7.0, the import engine has been re–written, if possible -it is suggested that you upgrade to take advantage of the new features. + 2.7.0 版的导入功能已经重写了，建议尽可能升级以使用新功能。 <br /><br /> - For additional help on this subject, look for the word "upload" in -this document. + 要获得更多关于该主题的帮助，请在本文档中查找 "上传" 。 </p> <h4 id="faq6_6"> - <a href="#faq6_6">6.6 How can I use the relation table in -Query-by-example?</a></h4> + <a href="#faq6_6">6.6 怎样在依例查询 (Query-by-example) 中使用关系表？</a></h4> -<p> Here is an example with the tables persons, towns and countries, all located -in the database mydb. If you don't have a <tt>pma_relation</tt> table, -create it as explained in the configuration section. Then create the example -tables:</p> +<p> 下面用数据库 mydb 中的数据表 persons、towns 和 countries 来举例。如果你没有 <tt>pma_relation</tt> +表，请先根据设置一节中的说明创建。然后创建示范表:</p> <pre> CREATE TABLE REL_countries ( @@ -3623,30 +3577,26 @@ INSERT INTO REL_towns VALUES ('S', 'Sherbrooke'); INSERT INTO REL_towns VALUES ('M', 'Montréal'); </pre> -<p> To setup appropriate links and display information:</p> +<p> 设置对应连接并显示信息:</p> -<ul><li>on table "REL_persons" click Structure, then Relation view</li> - <li>in Links, for "town_code" choose "REL_towns->code"</li> - <li>in Links, for "country_code" choose -"REL_countries->country_code"</li> - <li>on table "REL_towns" click Structure, then Relation view</li> - <li>in "Choose column to display", choose "description"</li> - <li>repeat the two previous steps for table "REL_countries"</li> +<ul><li>在表 "REL_persons" 上点击结构、关系查看</li> + <li>在关系中，"town_code" 选择 "REL_towns->code"</li> + <li>在关系中，"country_code" 选择 "REL_countries->country_code"</li> + <li>在表 "REL_towns" 上点击结构、关系查看</li> + <li>在 "选择要显示的字段" 上选择 "description"</li> + <li>在表 "REL_countries" 中重复以上两步</li> </ul> -<p> Then test like this:</p> - -<ul><li>Click on your db name in the left frame</li> - <li>Choose "Query"</li> - <li>Use tables: persons, towns, countries</li> - <li>Click "Update query"</li> - <li>In the columns row, choose persons.person_name and click the -"Show" tickbox </li> - <li>Do the same for towns.description and countries.descriptions in the other 2 -columns</li> - <li>Click "Update query" and you will see in the query box that the -correct joins have been generated</li> - <li>Click "Submit query"</li> +<p> 测试步骤如下:</p> + +<ul><li>在左侧框架中点击你的数据库名</li> + <li>选择 "查询"</li> + <li>使用表: persons、towns、countries</li> + <li>点击 "更新查询"</li> + <li>在字段行中，选择 persons.person_name 并选中 "显示" 复选框 </li> + <li>为 towns.description 和 countries.descriptions 在另两列中重复上一步</li> + <li>点击 "更新查询" 你就能在查询框中看到已生成的 join 语句</li> + <li>点击 "提交查询"</li> </ul> <h4 id="faqdisplay"> @@ -4078,195 +4028,147 @@ special format for chart script to understand it. Currently supported formats can be found in the <a href="http://wiki.phpmyadmin.net/pma/Devel:Charts#Data_formats_for_query_results_…">wiki</a>.</p> -<h3 id="faqproject">phpMyAdmin project</h3> +<h3 id="faqproject">phpMyAdmin 项目</h3> <h4 id="faq7_1"> - <a href="#faq7_1">7.1 I have found a bug. How do I inform developers?</a></h4> + <a href="#faq7_1">7.1 我发现了一个缺陷。怎样向开发者报告？</a></h4> -<p> Our Bug Tracker is located at <a +<p> 我们的缺陷追踪器位于 <a href="http://sf.net/projects/phpmyadmin/">http://sf.net/projects/phpmyadmin/</a> -under the Bugs section.<br /><br /> +的 Bugs 功能块。<br /><br /> - But please first discuss your bug with other users:<br /> + 但请先和其他用户讨论你发现的问题:<br /> <a href="https://sourceforge.net/projects/phpmyadmin/forums"> -https://sourceforge.net/projects/phpmyadmin/forums</a>. +https://sourceforge.net/projects/phpmyadmin/forums</a>。 </p> <h4 id="faq7_2"> - <a href="#faq7_2">7.2 I want to translate the messages to a new language or -upgrade an existing language, where do I start?</a></h4> - -<p> Always use latest Git version of the po file to translate. You can -optionally translate online at our <a -href="http://l10n.cihar.com/">translation server</a> where you can also get -the latest po files and merge them with your translations. For creating a -new translation simply use <code>po/phpmyadmin.pot</code> and generate -<code>po/LANG_CODE.po</code> for your language (you can use <code>msginit -i -po/phpmyadmin.pot -l LANG_CODE --no-translator -o po/LANG_CODE.po</code> to -do this) or ask on the mailing list to add the translation to the web -interface. More details are available on <a -href="http://wiki.phpmyadmin.net/pma/Devel:Gettext_for_translators">our -wiki</a>. + <a href="#faq7_2">7.2 怎样开始翻译一个新的语言或更新现有的语言？</a></h4> + +<p> 永远使用最新的 Git 版本的 po 文件来翻译。你也可以选择在我们的<a +href="http://l10n.cihar.com/">翻译服务器</a>在线翻译，也可在此获得最新的 po 文件并与你的翻译合并。使用 +<code>po/phpmyadmin.pot</code> 生成 <code>po/语言代码.po</code> 即可为你的语言创建新的翻译 +(可以使用 <code>msginit -i po/phpmyadmin.pot -l 语言代码 --no-translator -o +po/语言代码.po</code>) 或通过邮件列表寻求在 web 界面上添加翻译。更多详细信息请见<a +href="http://wiki.phpmyadmin.net/pma/Devel:Gettext_for_translators">我们的维基</a>。 </p> <p> - Please note that we try not to use HTML entities like &eacute; in the -translations, since we define the right character set in the file. With -HTML entities, the text on JavaScript messages would not display correctly. -However there are some entities that need to be there: quotes, non-breakable -spaces, ampersands, less than, greater than. + 请注意自从我们对文件定义了正确的编码后，我们尝试不在翻译中使用诸如 &eacute; 的 HTML 实体。若使用 HTML +实体，JavaScript 消息中的文本将可能不能正确显示。不论怎样有些实体还是必需的: 引号、不可分空格、& 符号、小于号、大于号。 </p> <p> - You can then put your translations, as a zip file to avoid losing special -characters, on the sourceforge.net <a -href="https://sourceforge.net/tracker/?group_id=23067&atid=387645">translation -tracker.</a> + 然后你可以将你的翻译，或者打包压缩成 zip 文件来避免丢失特殊字符，放在 sourceforge.net 的<a +href="https://sourceforge.net/tracker/?group_id=23067&atid=387645">翻译追踪器</a>上。 </p> <p> - It would be a good idea to subscribe to the <a -href="https://lists.sourceforge.net/lists/listinfo/phpmyadmin-translators">phpmyadmin-translators</a> -mailing list, because this is where we ask for translations of new messages. + 你还可以订阅 <a +href="https://lists.sourceforge.net/lists/listinfo/phpmyadmin-translators">phpMyAdmin +翻译</a> 邮件列表，当我们有新文本需要翻译时就会在那发出通知。 </p> <p> - Documentation is being translated using po4a and gettext (see <a -href="http://www.phpmyadmin.net/home_page/docs.php">documentation</a> for -existing translations). To start, checkout <a -href="http://phpmyadmin.git.sourceforge.net/git/gitweb.cgi?p=phpmyadmin/localized…"><code>localized_docs/po</code></a> -from Git, or just go to the <a -href="https://l10n.cihar.com/projects/pmadoc/">translation server</a> and -translate it online. If your language is missing, just contact <a -href="mailto:michal@cihar.com">Michal Čihař</a>; he will add -it. If you prefer to directly translate the po files, please put updated -ones into our <a -href="https://sourceforge.net/tracker/?group_id=23067&atid=387645">translation -tracker</a>. + 文档是通过 po4a 和 gettext 翻译的 (参见<a +href="http://www.phpmyadmin.net/home_page/docs.php">文档</a>查看现有的翻译) 。要开始翻译，先从 +Git 检出 <a +href="http://phpmyadmin.git.sourceforge.net/git/gitweb.cgi?p=phpmyadmin/localized…"><code>localized_docs/po</code></a>，或者直接到<a +href="https://l10n.cihar.com/projects/pmadoc/">翻译服务器</a>在线翻译。如果没有找到你的语言，请联系 +<a href="mailto:michal@cihar.com">Michal Čihař</a>; +他会加上。如果你更喜欢直接翻译 po 文件，请将翻译好的文件放在我们的<a +href="https://sourceforge.net/tracker/?group_id=23067&atid=387645">翻译追踪器</a>上。 </p> <h4 id="faq7_3"> - <a href="#faq7_3">7.3 I would like to help out with the development of -phpMyAdmin. How should I proceed?</a></h4> + <a href="#faq7_3">7.3 怎样帮助开发 phpMyAdmin ？</a></h4> -<p> The following method is preferred for new developers:</p> +<p> 对新开发者推荐以下方式:</p> -<ol><li>fetch the current git repository over anonymous git:<br /> +<ol><li>通过匿名方式获取当前 git 库:<br /> <tt>git clone git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin</tt><br /> </li> - <li>add your stuff</li> - <li>generate patch with your changes: <tt>git diff > xxx.diff</tt><br /> + <li>添加你的内容</li> + <li>生成你的补丁: <tt>git diff > xxx.diff</tt><br /> </li> - <li>submit your patch via the <a -href="https://sourceforge.net/tracker/?group_id=23067&atid=377410">patch -tracker of the phpMyAdmin project</a>. + <li>通过 <a +href="https://sourceforge.net/tracker/?group_id=23067&atid=377410">phpMyAdmin +项目的补丁追踪器</a>提交你的补丁。 </li> </ol> -<p>More details on git are available on <a -href="http://wiki.phpmyadmin.net/pma/Devel:Git">our wiki</a>.</p> +<p>更多关于 git 的详细信息请见<a +href="http://wiki.phpmyadmin.net/pma/Devel:Git">我们的维基</a>。</p> -<p> Write access to the repository is granted only to experienced developers who -have already contributed something useful to phpMyAdmin.<br /> - Also, have a look at the <a href="#developers">Developers section</a>.</p> +<p> 库的写入权限仅授予给那些对 phpMyAdmin 作出大量贡献且富有经验的开发者。<br /> + 同时，请看一下<a href="#developers">开发</a>一节。</p> <h3 id="faqsecurity">安全</h3> <h4 id="faq8_1"> - <a href="#faq8_1">8.1 Where can I get information about the security alerts -issued for phpMyAdmin?</a></h4> + <a href="#faq8_1">8.1 哪里可以了获取 phpMyAdmin 的安全公告信息？</a></h4> -<p> Please refer to <a +<p> 请参见 <a href="http://www.phpmyadmin.net/home_page/security.php">http://www.phpmyadmin.net/home_page/security.php</a> </p> <h4 id="faq8_2"> - <a href="#faq8_2">8.2 How can I protect phpMyAdmin against brute force -attacks?</a></h4> + <a href="#faq8_2">8.2 怎样保护 phpMyAdmin 防止暴力破解？</a></h4> -<p> If you use Apache web server, phpMyAdmin exports information about -authentication to the Apache environment and it can be used in Apache logs. -Currently there are two variables available: +<p> 如果你使用 Apache 服务器，phpMyAdmin 会导出认证信息到 Apache 环境并可被 Apache 日志使用。目前有两个变量可用: </p> <dl> <dt><code>userID</code></dt> - <dd>User name of currently active user (he does not have to be logged in).</dd> + <dd>当前活动用户的用户名 (他不一定需要登录)。</dd> <dt><code>userStatus</code></dt> - <dd>Status of currently active user, one of <code>ok</code> (user is logged in), -<code>mysql-denied</code> (MySQL denied user login), -<code>allow-denied</code> (user denied by allow/deny rules), -<code>root-denied</code> (root is denied in configuration), -<code>empty-denied</code> (empty password is denied).</dd> + <dd>当前活动用户的状态，有 <code>ok</code> (用户已登录)、<code>mysql-denied</code> (MySQL +拒绝用户登录)、<code>allow-denied</code> (用户被允许/禁止规则禁止)、<code>root-denied</code> +(root 用户登录在配置文件中被禁止)、<code>empty-denied</code> (禁止空密码登录) 这几种状态。</dd> </dl> <p> - <code>LogFormat</code> directive for Apache can look like following: + 可以像这样设置 Apache 的 <code>LogFormat</code> 指令: </p> <pre> LogFormat "%h %l %u %t \"%r\" %>s %b \ \"%{Referer}i\" \"%{User-Agent}i\" %{userID}n %{userStatus}n" pma_combined </pre> <p> - You can then use any log analyzing tools to detect possible break-in -attempts. + 然后你可以使用任何日志分析工具来检测潜在的攻击。 </p> -<h3 id="faqsynchronization">Synchronization</h3> +<h3 id="faqsynchronization">同步</h3> <h4 id="faq9_1"> - <a href="#faq9_1">9.1 How can I synchronize two databases/tables in -phpMyAdmin?</a></h4> + <a href="#faq9_1">9.1 怎样在 phpMyAdmin 中同步两个数据库/表？</a></h4> -<p> You can now synchronize databases/tables in phpMyAdmin using the Synchronize -feature. It allows you to connect to local as well as remote servers. This -requires you to enter server host name, username, password, port and the -name of the database. Therefore you can now synchronize your databases -placed on the same server or some remote server. +<p> 你可以使用 phpMyAdmin +的同步功能同步数据库/表。该功能可以连接到本地或者远程服务器。但需要你输入服务器主机名、用户名、密码、端口和数据库名。然后你就可以在相同或不同的服务器间同步数据库了。 </p> <p> -This feature is helpful for developers who need to replicate their -database’s structure as well as data. Moreover, this feature not only -helps replication but also facilitates the user to keep his/her database in -sync with another database. Other than the full database, certain tables of -the databases can also be synchronized. +该功能对需要复制数据库结构和数据的开发者们是很有帮助的。此外，该功能并不仅限于复制，还能帮助用户保持他们的数据库和另一个数据库同步。除了可以同步整个数据库外，也可以只同步数据库的部分数据表。 </p> <p> -You need to fill in the host name of the server, the username and password -of an user account already there in MySQL. Port is by default populated with -3306 (MySQL default port). Then the name of the database should be mentioned -at the end. All the information other than the port needs to be filled -explicitly for the source as well as target servers. +你需要填写服务器的主机名、MySQL 中已存在的用户名和密码。端口默认是 3306 (MySQL +默认端口)。最后是数据库名。源数据库和目标数据库除了端口外的信息都要填写准确。 </p> <p> -After successfully passing through the authentication phase, the source and -target database table names will be displayed. It will be a tabular -representation. +在成功通过认证阶段后，将会以表格形式显示出源和目标数据库中的数据表名。 </p> <p> -On the left, are listed the source database table names. Some of the names -have a <code>+</code> plus sign preceding them. This shows that these tables -are only present in source database and they need to be added to the target -database in order to synchronize the target database. The tables whose names -are not preceded by a <code>+</code> sign are already present in the target -database. +在左侧会列出源数据库中的表。部分表的名字前会有一个 <code>+</code> +加号。表示这些表仅在源数据库中存在并且需要在同步到目标数据库时添加到目标数据库。名字前没有 <code>+</code> 加号的表已存在于目标数据库中。 </p> <p> -On the right, are listed the target database table names. There are few -table names that have <code>(not present)</code> appended after their -names. This means that these tables are to be created in target database in -order to synchronize target database with source database. Some table names -have a <code>-</code> minus sign preceding them. This shows that these -tables are only present in target database and they will remain unchanged in -the target database. The column in the middle shows the difference between -the source and target corresponding tables. +在左侧会列出目标数据库中的表。部分表的名字后会有 <code>(未找到)</code> +字样。表示这些表将在与源数据库同步时添加到目标数据库。部分表的名字前会有一个 <code>-</code> +减号。表示这些表仅在目标数据库中存在并且不会被修改。位于中间的一列表示源/目标对应表之间的区别。 </p> <p> -The difference is depicted by the red and green buttons with <tt>S</tt> and -<tt>D</tt> letters, indicating that either Structure or Data are not up to -date. By clicking on them, they will turn grey, what means that they will be -synchronized. +红色 <tt>S</tt> 和绿色 <tt>D</tt> 按钮表示结构 (S) 或数据 (D) +是否需要更新。当点击按钮时，它们将变成灰色，表示相应表将会被同步。 </p> @@ -4286,29 +4188,27 @@ synchronized. 此外，我们希望能兼容 XHTML1.0 和 CSS2 并且符合 <a href="http://pear.php.net/"> <abbr title="PHP 扩展和应用程序库 (PHP Extension and Application Repository)">PEAR</abbr> 代码标准</a>。请尽量注意。</li> - <li>Please enable showing PHP errors and warnings by the <code><a + <li>请通过 <code><a href="#cfg_Error_Handler_display">$cfg['Error_Handler']['display']</a></code> -configuration directive.</li> +指令开启显示 PHP 错误和警告。</li> <li>请尽量保持文件命名约定。数据表相关的用 <i>tbl_*.php</i>，数据库相关的用 <i>db_*.php</i>，服务器相关的用 <i>server_*.php</i> 等。</li> - <li>Please use gettext wrappers around all messages (<code>__('Some -text')</code> or <code>_ngettext()</code> function). To translate them, you -need to call <code>scripts/update-po</code> script. To use translated -messages, call <code>scripts/generate-mo</code>, which generates binary -files read by Gettext.</li> + <li>请使用 gettext 调用所有文本 (<code>__('文本')</code> 或 <code>_ngettext()</code> 函数)。 +若需要翻译，运行 <code>scripts/update-po</code> 脚本。要使用已翻译的文本，运行 +<code>scripts/generate-mo</code>，即可生成 Gettext 所需的二进制文件。</li> <li>如果您写一份更新记录，这将会更加有帮助。</li> <li id="developersdbg"> phpMyAdmin 现在已经支持 DBG 扩展 (<a href="http://dd.cron.ru/dbg/">PHP 调试器 DBG (外链，英语)</a>) 以便开发者能更好地调试以及测试他们的代码。<br /> 更多信息请参见 <a href="#cfg_DBG" class="configrule">$cfg['DBG']*</a> 设置选项。<br /> - 纪念哥伦比亚号航天飞机 (STS-107) 在重新进入地球大气层时爆炸以及纪念为了地球人民牺牲的勇敢的人们。</li> + 纪念哥伦比亚号航天飞机 (STS-107) 在重新进入地球大气层时爆炸以及为了地球人民牺牲的勇敢的人们。</li> </ul> <h2 id="copyright">版权</h2> <pre> -Copyright (C) 1998-2000 Tobias Ratschiller <tobias_at_ratschiller.com> -Copyright (C) 2001-2010 Marc Delisle <marc_at_infomarc.info> +版权所有 (C) 1998-2000 Tobias Ratschiller <tobias_at_ratschiller.com> +版权所有 (C) 2001-2010 Marc Delisle <marc_at_infomarc.info> Olivier Müller <om_at_omnis.ch> Robin Johnson <robbat2_at_users.sourceforge.net> Alexander M. Turek <me_at_derrabus.de> @@ -4316,7 +4216,7 @@ Copyright (C) 2001-2010 Marc Delisle <marc_at_infomarc.info> Garvin Hicking <me_at_supergarv.de> Michael Keck <mkkeck_at_users.sourceforge.net> Sebastian Mendel <cybot_tm_at_users.sourceforge.net> - [check <a href="#credits">credits</a> for more details] + [更多信息请参见<a href="#credits">鸣谢</a>] </pre> <p> @@ -4374,115 +4274,115 @@ Repository)">PEAR</abbr> 代码标准以及 XHTML1.0 和 CSS2 规范</li> <li>Robin Johnson <robbat2_at_users.sourceforge.net> <ul> - <li>database maintenance controls</li> - <li>table type code</li> - <li>Host authentication <abbr title="Internet Protocol">IP</abbr> Allow/Deny</li> - <li>DB-based configuration (Not completed)</li> - <li><abbr title="structured query language">SQL</abbr> parser and pretty-printer</li> - <li><abbr title="structured query language">SQL</abbr> validator</li> + <li>数据库维护功能</li> + <li>数据表类型代码</li> + <li>主机认证 <abbr title="互联网协议 (Internet Protocol)">IP</abbr> 允许/禁止</li> + <li>基于数据库的配置 (未完成)</li> + <li><abbr title="结构化查询语言 (structured query language)">SQL</abbr> 解析器和语法高亮</li> + <li><abbr title="结构化查询语言 (structured query language)">SQL</abbr> 校验器</li> <li>许多缺陷修正和改进</li> </ul></li> <li>Armel Fauveau <armel.fauveau_at_globalis-ms.com> <ul> - <li>bookmarks feature</li> - <li>multiple dump feature</li> - <li>gzip dump feature</li> - <li>zip dump feature</li> + <li>书签功能</li> + <li>多转储功能</li> + <li>gzip 转储功能</li> + <li>zip 转储功能</li> </ul></li> <li>Geert Lund <glund_at_silversoft.dk> <ul> - <li>various fixes</li> - <li>moderator of the phpMyAdmin former users forum at phpwizard.net</li> + <li>缺陷修正</li> + <li>phpMyAdmin 早期在 phpwizard.net 的用户论坛版主</li> </ul></li> <li>Korakot Chaovavanich <korakot_at_iname.com> <ul> - <li>"insert as new row" feature</li> + <li>"以新行插入" 功能</li> </ul></li> <li>Pete Kelly <webmaster_at_trafficg.com> <ul> - <li>rewrote and fix dump code</li> - <li>bugfixes</li> + <li>重写并修复转储代码</li> + <li>缺陷修正</li> </ul></li> <li>Steve Alberty <alberty_at_neptunlabs.de> <ul> - <li>rewrote dump code for PHP4</li> - <li>mySQL table statistics</li> - <li>bugfixes</li> + <li>重写 PHP4 的转储代码</li> + <li>MySQL 数据表统计</li> + <li>缺陷修正</li> </ul></li> <li>Benjamin Gandon <gandon_at_isia.cma.fr> <ul> - <li>main author of the version 2.1.0.1</li> - <li>bugfixes</li> + <li>2.1.0.1 版的主要作者</li> + <li>缺陷修正</li> </ul></li> <li>Alexander M. Turek <me_at_derrabus.de> <ul> - <li>MySQL 4.0 / 4.1 / 5.0 compatibility</li> - <li>abstract database interface (PMA_DBI) with MySQLi support</li> - <li>privileges administration</li> - <li><abbr title="Extensible Markup Language">XML</abbr> exports</li> - <li>various features and fixes</li> - <li>German language file updates</li> + <li>MySQL 4.0 / 4.1 / 5.0 兼容</li> + <li>抽象数据库接口 (PMA_DBI) 并支持 MySQLi</li> + <li>权限管理</li> + <li>导出为 <abbr title="可扩展标记语言 (Extensible Markup Language)">XML</abbr></li> + <li>许多缺陷修正和改进</li> + <li>德语语言文件更新</li> </ul></li> <li>Mike Beck <mike.beck_at_web.de> <ul> - <li>automatic joins in QBE</li> + <li>自动加入依例查询 (QBE)</li> <li>links column in printview</li> <li>关系查看</li> </ul></li> <li>Michal Čihař <michal_at_cihar.com> <ul> - <li>enhanced index creation/display feature</li> - <li>feature to use a different charset for HTML than for MySQL</li> - <li>improvements of export feature</li> - <li>various features and fixes</li> - <li>Czech language file updates</li> + <li>增强索引创建/显示功能</li> + <li>让 HTML 与 MySQL 使用不同的字符集</li> + <li>改进导出功能</li> + <li>许多缺陷修正和改进</li> + <li>捷克语语言文件更新</li> </ul></li> <li>Christophe Gesché from the "MySQL Form Generator for PHPMyAdmin" (http://sf.net/projects/phpmysqlformgen/) <ul> - <li>suggested the patch for multiple table printviews</li> + <li>多表打印预览补丁</li> </ul></li> <li>Garvin Hicking <me_at_supergarv.de> <ul> - <li>built the patch for vertical display of table rows</li> - <li>built the Javascript based Query window + <abbr title="structured query -language">SQL</abbr> history</li> - <li>Improvement of column/db comments</li> - <li>(MIME)-Transformations for columns</li> - <li>Use custom alias names for Databases in left frame</li> - <li>hierarchical/nested table display</li> + <li>垂直显示记录补丁</li> + <li>基于 Javascript 的查询窗口 + <abbr title="结构化查询语言 (structured query +language)">SQL</abbr> 历史功能</li> + <li>改进字段/数据库注释</li> + <li>类型转换</li> + <li>在左侧框架中使用自定义的数据库别名</li> + <li>数据表分层/分组显示</li> <li><abbr title="Portable Document Format">PDF</abbr>-scratchboard for WYSIWYG-distribution of <abbr title="Portable Document Format">PDF</abbr> relations</li> - <li>new icon sets</li> - <li>vertical display of column properties page</li> - <li>some bugfixes, features, support, German language additions</li> + <li>新图标集</li> + <li>字段属性页的垂直显示模式</li> + <li>一些缺陷修正、功能、支持、德语语言增加</li> </ul></li> <li>Yukihiro Kawada <kawada_at_den.fujifilm.co.jp> <ul> - <li>japanese kanji encoding conversion feature</li> + <li>日本汉字编码转换功能</li> </ul></li> -<li>Piotr Roszatycki <d3xter_at_users.sourceforge.net> and Dan Wilson +<li>Piotr Roszatycki <d3xter_at_users.sourceforge.net> 和 Dan Wilson <ul> - <li>the Cookie authentication mode</li> + <li>Cookie 认证功能</li> </ul></li> <li>Axel Sander <n8falke_at_users.sourceforge.net> <ul> - <li>table relation-links feature</li> + <li>数据表关系连接功能</li> </ul></li> <li>Maxime Delorme <delorme.maxime_at_free.fr> @@ -4496,29 +4396,29 @@ href="http://www.acko.net/node/56">http://www.acko.net/node/56</a>).</li> <li>Olof Edlund <olof.edlund_at_upright.se> <ul> - <li><abbr title="structured query language">SQL</abbr> validator server</li> + <li><abbr title="结构化查询语言 (structured query language)">SQL</abbr> 校验服务器</li> </ul></li> <li>Ivan R. Lanin <ivanlanin_at_users.sourceforge.net> <ul> - <li>phpMyAdmin logo (until June 2004)</li> + <li>phpMyAdmin logo (2004 年 6 月前)</li> </ul></li> <li>Mike Cochrane <mike_at_graftonhall.co.nz> <ul> - <li>blowfish library from the Horde project</li> + <li>Horde 项目的 blowfish 库</li> </ul></li> <li>Marcel Tschopp <ne0x_at_users.sourceforge.net> <ul> - <li>mysqli support</li> + <li>mysqli 支持</li> <li>许多缺陷修正和改进</li> </ul></li> <li>Michael Keck <mkkeck_at_users.sourceforge.net> <ul> - <li>redesign for 2.6.0</li> - <li>phpMyAdmin sailboat logo (June 2004)</li> + <li>重新设计 2.6.0</li> + <li>phpMyAdmin 帆船 logo (2004 年 6 月)</li> </ul></li> <li>Mathias Landhäußer @@ -4528,61 +4428,61 @@ href="http://www.acko.net/node/56">http://www.acko.net/node/56</a>).</li> <li>Sebastian Mendel <cybot_tm_at_users.sourceforge.net> <ul> - <li>interface improvements</li> - <li>various bugfixes</li> + <li>界面改进</li> + <li>许多缺陷修正</li> </ul></li> <li>Ivan A Kirillov <ul> - <li>new relations Designer</li> + <li>新的关系设计器</li> </ul></li> -<li>Raj Kissu Rajandran (Google Summer of Code 2008) +<li>Raj Kissu Rajandran (Google 代码之夏 2008) <ul> - <li>BLOBstreaming support</li> + <li>BLOB 流支持</li> </ul></li> -<li>Piotr Przybylski (Google Summer of Code 2008 and 2010) +<li>Piotr Przybylski (Google 代码之夏 2008 和 2010) <ul> - <li>improved setup script</li> - <li>user preferences</li> + <li>改进安装脚本</li> + <li>用户偏好</li> </ul></li> -<li>Derek Schaefer (Google Summer of Code 2009) +<li>Derek Schaefer (Google 代码之夏 2009) <ul> - <li>Improved the import system</li> + <li>改进导入功能</li> </ul></li> -<li>Alexander Rutkowski (Google Summer of Code 2009) +<li>Alexander Rutkowski (Google 代码之夏 2009) <ul> - <li>Tracking mechanism</li> + <li>结构追踪</li> </ul></li> -<li>Zahra Naeem (Google Summer of Code 2009) +<li>Zahra Naeem (Google 代码之夏 2009) <ul> - <li>Synchronization feature</li> + <li>同步功能</li> </ul></li> -<li>Tomáš Srnka (Google Summer of Code 2009) +<li>Tomáš Srnka (Google 代码之夏 2009) <ul> - <li>Replication support</li> + <li>复制支持</li> </ul></li> -<li>Muhammad Adnan (Google Summer of Code 2010) +<li>Muhammad Adnan (Google 代码之夏 2010) <ul> - <li>Relation schema export to multiple formats</li> + <li>导出关系大纲为多种格式</li> </ul></li> -<li>Lori Lee (Google Summer of Code 2010) +<li>Lori Lee (Google 代码之夏 2010) <ul> - <li>User interface improvements</li> - <li>ENUM/SET editor</li> - <li>Simplified interface for export/import</li> + <li>用户界面改进</li> + <li>ENUM/SET 编辑器</li> + <li>简化导入/导出界面</li> </ul></li> -<li>Ninad Pundalik (Google Summer of Code 2010) +<li>Ninad Pundalik (Google 代码之夏 2010) <ul> - <li>AJAXifying the interface</li> + <li>界面 AJAX 化</li> </ul></li> <li>Barrie Leslie @@ -4593,8 +4493,7 @@ href="http://www.acko.net/node/56">http://www.acko.net/node/56</a>).</li> </ul> <p> -And also to the following people who have contributed minor changes, -enhancements, bugfixes or support for a new language since version 2.1.0: +以及自 2.1.0 版以来对功能修改、增强、缺陷修正和新语言支持作出贡献的人们: </p> <p> @@ -4813,9 +4712,8 @@ Language))</a> - 一个 W3C 推荐用来创建可以描述不同类型数据的 </div> <ul id="footer"> - <li>Copyright © 2003 - 2010 <a -href="http://www.phpmyadmin.net/home_page/team.php">phpMyAdmin devel -team</a></li> + <li>版权所有 © 2003 - 2010 <a +href="http://www.phpmyadmin.net/home_page/team.php">phpMyAdmin 开发组</a></li> <li><a href="LICENSE">授权</a></li> <li><a href="http://www.phpmyadmin.net/home_page/donate.php">捐助 (英语)</a></li> <li class="last">验证 <a href="http://validator.w3.org/check/referer">HTML</a> 和 <a diff --git a/output/zh_CN/INSTALL b/output/zh_CN/INSTALL index 3f125fd..e721825 100644 --- a/output/zh_CN/INSTALL +++ b/output/zh_CN/INSTALL @@ -1,5 +1,5 @@ -phpMyAdmin - Installation -------------------------- +phpMyAdmin - 安装 +------------------- 参见 Documentation.txt 或 Documentation.html 文件。 diff --git a/output/zh_CN/README b/output/zh_CN/README new file mode 100644 index 0000000..190c8a5 --- /dev/null +++ b/output/zh_CN/README @@ -0,0 +1,71 @@ +phpMyAdmin - 读我 +=================== + +使用 PHP 编写，通过 web 管理 MySQL 的工具。 + +版本 3.4.0-dev +---------------- + +http://www.phpmyadmin.net/ + +版权所有 (C) 1998-2000 + Tobias Ratschiller <tobias_at_ratschiller.com> +版权所有 (C) 2001-2010 + Marc Delisle <marc_at_infomarc.info> + Olivier Müller <om_at_omnis.ch> + Robin Johnson <robbat2_at_users.sourceforge.net> + Alexander M. Turek <me_at_derrabus.de> + Michal Čihař <michal_at_cihar.com> + Garvin Hicking <me_at_supergarv.de> + Michael Keck <mkkeck_at_users.sourceforge.net> + Sebastian Mendel <cybot_tm_at_users.sourceforge.net> + [详细信息请参见 Documentation.txt/.html 文件] + +本软件是自由软件，你可以在自由软件基金会发布的 GNU 通用公共许可协议第 2 版的许可下重新修改并/或发布。 + +本软件因希望能对大家有用而发布，但没有任何担保，也没有任何适销性或针对特定用途的隐含的担保。参见 GNU 通用公共许可协议获得详细信息。 + +你应该在获得此软件的同时收到一份 GNU 通用公共许可协议的副本如果没有，请致函 Free Software Foundation, Inc., 51 +Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +环境需求 +~~~~~~~~~~~~ + +* PHP 5.2 或更高版本 +* MySQL 5.0 或更高版本 +* a web-browser (doh!) + +概要 +~~~~~~ + +phpMyAdmin 旨在通过 web 管理 MySQL 。具体功能请参见 Documentation.txt/.html 文件。 + +下载 +~~~~~~ + +你可以在 http://www.phpmyadmin.net/ 获得最新版本。 + +更多信息 +~~~~~~~~~~~~ + +参见 Documentation.txt/.html 文件。 + +支持 +~~~~~~ + +参见 http://www.phpmyadmin.net/ 中关于支持论坛的相关信息 + + +尽情享受吧！ +~~~~~~~~~~~~~~~~~~ + +phpMyAdmin 开发组 + + +附: + 请勿向我们发送邮件询问诸如 "怎样编译 + 支持 MySQL 的 PHP" 之类的问题。我们 + 没有时间为您做免费咨询。 + 请将您的问题发送到相应的邮件列表或论坛。 + 在联系我们之前，请阅读 Documentation.html (特别是常见问题 (FAQ) 部分)。 + diff --git a/output/zh_CN/TODO b/output/zh_CN/TODO index 072b518..2797f57 100644 --- a/output/zh_CN/TODO +++ b/output/zh_CN/TODO @@ -1,5 +1,5 @@ -phpMyAdmin - Todo -================= +phpMyAdmin - 计划 +=================== 目前我们将 Sourceforge 的追踪器作为计划表使用: diff --git a/output/zh_CN/index.html b/output/zh_CN/index.html index d10b80b..5ed0910 100644 --- a/output/zh_CN/index.html +++ b/output/zh_CN/index.html @@ -4,15 +4,15 @@ version="-//W3C//DTD XHTML 1.1//EN" dir="ltr"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>phpMyAdmin Simplified Chinese Documentation</title> + <title>phpMyAdmin 简体中文文档</title> </head> <body> -<h1>phpMyAdmin Simplified Chinese Documentation</h1> -<p>Documents translated to Simplified Chinese:</p> +<h1>phpMyAdmin 简体中文文档</h1> +<p>已翻译为简体中文的文件:</p> <ul> -<li><a href="Documentation.html">Main documentation</a></li> -<li><a href="INSTALL">INSTALL</a></li> -<li><a href="TODO">TODO</a></li> +<li><a href="Documentation.html">主文档</a></li> +<li><a href="INSTALL">安装</a></li> +<li><a href="TODO">计划</a></li> <li><a href="translators.html">翻译</a></li> </ul> </body> diff --git a/output/zh_CN/translators.html b/output/zh_CN/translators.html index 8e34579..584fea6 100644 --- a/output/zh_CN/translators.html +++ b/output/zh_CN/translators.html @@ -434,7 +434,7 @@ href="https://l10n.cihar.com/projects/pmadoc/">翻译服务器</a>来帮助我 </tr> <tr id="telugu"> - <td>Telugu</td> + <td>泰卢固语</td> <td> veeven (veeven(a)gmail.com) </td> @@ -471,9 +471,8 @@ href="https://l10n.cihar.com/projects/pmadoc/">翻译服务器</a>来帮助我 </div> <ul id="footer"> - <li>Copyright © 2003 - 2010 <a -href="http://www.phpmyadmin.net/home_page/team.php">phpMyAdmin devel -team</a></li> + <li>版权所有 © 2003 - 2010 <a +href="http://www.phpmyadmin.net/home_page/team.php">phpMyAdmin 开发组</a></li> <li><a href="LICENSE">授权</a></li> <li><a href="http://www.phpmyadmin.net/home_page/donate.php">捐助 (英语)</a></li> <li class="last">验证 <a href="http://validator.w3.org/check/referer">HTML</a> 和 <a hooks/post-receive -- phpMyAdmin localized documentation

1 0

Jump to page: