[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_5, updated. RELEASE_3_5_0BETA1-256-g8cef483
by Michal Čihař 27 Jan '12
by Michal Čihař 27 Jan '12
27 Jan '12
The branch, QA_3_5 has been updated
via 8cef483dfe3452b235f0f18a398b4060f1db39a2 (commit)
via 4bd24a9b97d3f723206dd06ee6ebcbcb3078e888 (commit)
via 8bd33decfdf80bebdd1a2229517b7314a2eccbc0 (commit)
via 760aac415549c1d646b331b91c0dd6d4e5121fb9 (commit)
via 71cb4f0a804bce4621071eb187ec8a7550a920ac (commit)
via b1577c2b1945670d9bfadbcf0513e36fc7bdfae4 (commit)
via 697cbf9c0d9c65ed5c9a46aa0175c8168b967a1f (commit)
via 736678caa62ebd16821dab2eaa9b62972cbab729 (commit)
via 832192feece91e0813906689dba1e2d0b0e828f4 (commit)
via 4c3e985c2dffc27190a591eac8d3484c23473241 (commit)
via e8070b5488fbcf9d26e0d2e2fdd68f2123050e2d (commit)
via f213940834ddf7b4a431120075ef48c6785cec45 (commit)
via d23a10933a0df83d21b2379aacc00b44a1f8335d (commit)
via f597c6c5b8e4b12a25b6f7bcade9cba604779427 (commit)
via 51ae6e7e4d90ef25287feafdadf2c8f9d7d66bf5 (commit)
via a5c32db3091509d9e06f3dd6346055bc8a56be73 (commit)
via 1d23dc8747085e5add63b90fdc66c743ac944667 (commit)
via a078318ef53b48320dd537870e7a11e20e23c52b (commit)
from e64d33bba3b7355f25dbf637de9732367ed8a24e (commit)
- Log -----------------------------------------------------------------
commit 8cef483dfe3452b235f0f18a398b4060f1db39a2
Merge: e64d33b 4bd24a9
Author: Michal Čihař <mcihar(a)suse.cz>
Date: Fri Jan 27 14:13:57 2012 +0100
Merge remote-tracking branch 'pootle/master' into QA_3_5
commit 4bd24a9b97d3f723206dd06ee6ebcbcb3078e888
Author: Michal Čihař <michal(a)cihar.com>
Date: Fri Jan 27 15:10:38 2012 +0200
Translation update done using Pootle.
commit 8bd33decfdf80bebdd1a2229517b7314a2eccbc0
Author: Michal Čihař <michal(a)cihar.com>
Date: Fri Jan 27 15:08:28 2012 +0200
Translation update done using Pootle.
commit 760aac415549c1d646b331b91c0dd6d4e5121fb9
Author: Michal Čihař <michal(a)cihar.com>
Date: Fri Jan 27 15:08:04 2012 +0200
Translation update done using Pootle.
commit 71cb4f0a804bce4621071eb187ec8a7550a920ac
Author: Michal Čihař <michal(a)cihar.com>
Date: Fri Jan 27 15:08:00 2012 +0200
Translation update done using Pootle.
commit b1577c2b1945670d9bfadbcf0513e36fc7bdfae4
Author: Michal Čihař <michal(a)cihar.com>
Date: Fri Jan 27 15:07:55 2012 +0200
Translation update done using Pootle.
commit 697cbf9c0d9c65ed5c9a46aa0175c8168b967a1f
Author: Michal Čihař <michal(a)cihar.com>
Date: Fri Jan 27 15:07:10 2012 +0200
Translation update done using Pootle.
commit 736678caa62ebd16821dab2eaa9b62972cbab729
Author: Michal Čihař <michal(a)cihar.com>
Date: Fri Jan 27 15:06:44 2012 +0200
Translation update done using Pootle.
commit 832192feece91e0813906689dba1e2d0b0e828f4
Author: Michal Čihař <michal(a)cihar.com>
Date: Fri Jan 27 15:06:34 2012 +0200
Translation update done using Pootle.
commit 4c3e985c2dffc27190a591eac8d3484c23473241
Author: Michal Čihař <michal(a)cihar.com>
Date: Fri Jan 27 15:06:23 2012 +0200
Translation update done using Pootle.
commit e8070b5488fbcf9d26e0d2e2fdd68f2123050e2d
Author: Michal Čihař <michal(a)cihar.com>
Date: Fri Jan 27 15:06:08 2012 +0200
Translation update done using Pootle.
commit f213940834ddf7b4a431120075ef48c6785cec45
Author: Michal Čihař <michal(a)cihar.com>
Date: Fri Jan 27 15:05:35 2012 +0200
Translation update done using Pootle.
commit d23a10933a0df83d21b2379aacc00b44a1f8335d
Author: Michal Čihař <michal(a)cihar.com>
Date: Fri Jan 27 15:05:20 2012 +0200
Translation update done using Pootle.
commit f597c6c5b8e4b12a25b6f7bcade9cba604779427
Author: Michal Čihař <michal(a)cihar.com>
Date: Fri Jan 27 15:04:50 2012 +0200
Translation update done using Pootle.
commit 51ae6e7e4d90ef25287feafdadf2c8f9d7d66bf5
Author: Michal Čihař <michal(a)cihar.com>
Date: Fri Jan 27 15:04:33 2012 +0200
Translation update done using Pootle.
commit a5c32db3091509d9e06f3dd6346055bc8a56be73
Author: Michal Čihař <michal(a)cihar.com>
Date: Fri Jan 27 15:04:15 2012 +0200
Translation update done using Pootle.
commit 1d23dc8747085e5add63b90fdc66c743ac944667
Author: Michal Čihař <michal(a)cihar.com>
Date: Fri Jan 27 15:01:39 2012 +0200
Translation update done using Pootle.
commit a078318ef53b48320dd537870e7a11e20e23c52b
Author: Michal Čihař <michal(a)cihar.com>
Date: Fri Jan 27 15:01:34 2012 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes:
po/cs.po | 45 ++++++++++++++++++++++-----------------------
1 files changed, 22 insertions(+), 23 deletions(-)
diff --git a/po/cs.po b/po/cs.po
index 7c39b20..f92afe4 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -5,7 +5,7 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.5.0-beta2\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
"POT-Creation-Date: 2012-01-25 17:45+0100\n"
-"PO-Revision-Date: 2012-01-27 14:58+0200\n"
+"PO-Revision-Date: 2012-01-27 15:08+0200\n"
"Last-Translator: Michal Čihař <michal(a)cihar.com>\n"
"Language-Team: czech <cs(a)li.org>\n"
"Language: cs\n"
@@ -806,7 +806,7 @@ msgstr "Sledovat tabulku"
#: db_tracking.php:227
msgid "Database Log"
-msgstr "Historie databáze"
+msgstr "Záznam databáze"
#: enum_editor.php:23 js/messages.php:266
#: libraries/rte/rte_routines.lib.php:690
@@ -1495,7 +1495,7 @@ msgid ""
"You can't change these variables. Please log in as root or contact your "
"database administrator."
msgstr ""
-"Nemůžete změnit uvedené proměnné. Prosím přihlašte se jako root nebo "
+"Nemůžete změnit uvedené proměnné. Prosím přihlaste se jako root nebo "
"kontaktujte vašeho správce databáze."
#: js/messages.php:165
@@ -1526,11 +1526,11 @@ msgstr "Jednotka"
#: js/messages.php:174
msgid "From slow log"
-msgstr "Ze zánamu pomalých dotazů"
+msgstr "Ze záznamu pomalých dotazů"
#: js/messages.php:175
msgid "From general log"
-msgstr "Z obecného zánamu dotazů"
+msgstr "Z obecného záznamu dotazů"
#: js/messages.php:176
msgid "Analysing & loading logs. This may take a while."
@@ -1608,7 +1608,7 @@ msgstr "Graf"
#. l10n: A collection of available filters
#: js/messages.php:195
msgid "Log table filter options"
-msgstr "Nastavení filtrování logovacích tabulek"
+msgstr "Nastavení filtrování záznamových tabulek"
#. l10n: Filter as in "Start Filtering"
#: js/messages.php:197
@@ -4597,9 +4597,9 @@ msgid ""
"Leave blank for no [a@http://wiki.phpmyadmin.net/pma/bookmark]bookmark[/a] "
"support, suggested: [kbd]pma_bookmark[/kbd]"
msgstr ""
-"Nechte prázdné pro žádnou podporu Leave blank for no [a@http://wiki."
-"phpmyadmin.net/pma/bookmark]záložek[/a], výchozí nastavení: [kbd]"
-"pma_bookmarks[/kbd]"
+"Nechte prázdné pro vypnutí podpory "
+"[a@http://wiki.phpmyadmin.net/pma/bookmark]záložek[/a], doporučené "
+"nastavení: [kbd]pma_bookmarks[/kbd]"
#: libraries/config/messages.inc.php:375
msgid "Bookmark table"
@@ -6168,13 +6168,13 @@ msgstr ""
#: libraries/engines/pbms.lib.php:30
msgid "Garbage Threshold"
-msgstr "Práh velikosti odpadu (garbage)"
+msgstr "Hranice odpadu"
#: libraries/engines/pbms.lib.php:31
msgid "The percentage of garbage in a repository file before it is compacted."
msgstr ""
-"Procentuální podíl odpadu (garbage) v souboru datového logu předtím, než je "
-"soubor stlačen."
+"Procentuální podíl odpadu v souboru datového logu předtím, než je soubor "
+"zhuštěn."
#: libraries/engines/pbms.lib.php:35 libraries/replication_gui.lib.php:70
#: server_synchronize.php:1261
@@ -6191,7 +6191,7 @@ msgstr ""
#: libraries/engines/pbms.lib.php:40
msgid "Repository Threshold"
-msgstr "Práh velikosti skladiště"
+msgstr "Hranice skladiště"
#: libraries/engines/pbms.lib.php:41
msgid ""
@@ -6216,7 +6216,7 @@ msgstr ""
#: libraries/engines/pbms.lib.php:50
msgid "Temp Log Threshold"
-msgstr "Práh velikosti dočasného logového souboru"
+msgstr "Hranice dočasného záznanového souboru"
#: libraries/engines/pbms.lib.php:51
msgid ""
@@ -6314,7 +6314,7 @@ msgstr ""
#: libraries/engines/pbxt.lib.php:37
msgid "Log file threshold"
-msgstr "Prahová hodnota logového souboru"
+msgstr "Hranice záznamového souboru"
#: libraries/engines/pbxt.lib.php:38
msgid ""
@@ -6350,7 +6350,7 @@ msgstr ""
#: libraries/engines/pbxt.lib.php:52
msgid "Data log threshold"
-msgstr "Nejvyšší velikost datového logu"
+msgstr "Hranice datového záznamu"
#: libraries/engines/pbxt.lib.php:53
msgid ""
@@ -6366,16 +6366,15 @@ msgstr ""
#: libraries/engines/pbxt.lib.php:57
msgid "Garbage threshold"
-msgstr "Největší velikost odpadu (garbage)"
+msgstr "Hranice odpadu"
#: libraries/engines/pbxt.lib.php:58
msgid ""
"The percentage of garbage in a data log file before it is compacted. This is "
"a value between 1 and 99. The default is 50."
msgstr ""
-"Procentuální podíl odpadu (garbage) v souboru datového logu předtím, než je "
-"soubor stlačen. Tato hodnota se může pohybovat mezi 1 a 99. Výchozí hodnota "
-"je 50."
+"Procentuální podíl odpadu v souboru datového logu předtím, než je soubor "
+"zhuštěn. Tato hodnota se může pohybovat mezi 1 a 99. Výchozí hodnota je 50."
#: libraries/engines/pbxt.lib.php:62
msgid "Log buffer size"
@@ -7196,7 +7195,7 @@ msgid ""
"Please see the documentation on how to update your column_comments table"
msgstr ""
"Podívejte se prosím do dokumentace, jak aktualizovat tabulku s informacemi "
-"o polích (tabulka column_comments)"
+"o polích v tabulce column_comments"
#: libraries/relation.lib.php:124 libraries/sql_query_form.lib.php:376
msgid "Bookmarked SQL query"
@@ -12378,7 +12377,7 @@ msgid ""
msgstr ""
"Na řazení není nic špatného, ale ujistěte se, že dotazy, které hojně "
"využívají řazení používají klíče ve frázi ORDER BY, protože toto zajistí "
-"rychlejší řazení."
+"rychlejší řazení"
#: po/advisory_rules.php:123
#, php-format
@@ -12399,7 +12398,7 @@ msgid ""
"columns being used in the join conditions will greatly speed up table joins"
msgstr ""
"To znamená, že spojení tabulek musí často procházet celou tabulku. Přidáním "
-"klíčů na sloupce použité při slučování můžete tuto operaci značně urychlit."
+"klíčů na sloupce použité při slučování můžete tuto operaci značně urychlit"
#: po/advisory_rules.php:128
#, php-format
hooks/post-receive
--
phpMyAdmin
1
0
[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_5, updated. RELEASE_3_5_0BETA1-238-ge64d33b
by Michal Čihař 27 Jan '12
by Michal Čihař 27 Jan '12
27 Jan '12
The branch, QA_3_5 has been updated
via e64d33bba3b7355f25dbf637de9732367ed8a24e (commit)
via 3ef4b37f447469b51e3842a26f15e864798354ff (commit)
via 9f3e5f46028a5f6e30915f5c547a348b7942ed5c (commit)
via fa57bf1b7cd2061ae0bd3c548af7673246e63ecb (commit)
via 0a6ae4b26077674e12364d38caa7f469044eb65f (commit)
via 24e8aacd051dce33a9db0e44ce1c6c388baaf5b9 (commit)
via ced6716d71a2943875912a9875e9073510e0bc84 (commit)
via 4301ed2ab948cb90ceb1a6fe3a5cfa055e9ec5d3 (commit)
via 61c2348201746bac0c332131683a3938b450df40 (commit)
via 8ae4e415546a722d898ed0a3291562f52ded3873 (commit)
via 64d4d0e7d2f7e8a51f1a3480eeec1f076765612c (commit)
via cf8118c0906d5f3cbb8f2a908042d671eecc2972 (commit)
via b2b31f9b892d27174c2b99228ce1bc7a2f4ea39b (commit)
via ec1ab93652d9ece93d4bd6a2e437cae99bc06e3d (commit)
via a64923acac18759ee90a7acc453aa29814f5f534 (commit)
via 39919646625e9d562cfdf01eda82f25f6fc68177 (commit)
via 0052f63c632bbcd78de5fec9d5730bfc0a5992c8 (commit)
via e4d110b4d489e19380059289bce572fa73d2b2a8 (commit)
via e79d0bc1de688b843a7ebc8caea068a9278ddee6 (commit)
via 760fe8de1b711b86584a98432c09ddb93beb9b48 (commit)
via e66f23fcae4bff5b13a464c980b03fb41d423c0a (commit)
via dda8dc59745d90612476bc0d09630b21cd03188c (commit)
from a8e38f8cdbe331ba2092c6efa45bfadfca82df11 (commit)
- Log -----------------------------------------------------------------
commit e64d33bba3b7355f25dbf637de9732367ed8a24e
Author: Michal Čihař <mcihar(a)suse.cz>
Date: Fri Jan 27 14:00:21 2012 +0100
Fix format string
commit 3ef4b37f447469b51e3842a26f15e864798354ff
Merge: a8e38f8 9f3e5f4
Author: Michal Čihař <mcihar(a)suse.cz>
Date: Fri Jan 27 13:59:55 2012 +0100
Merge remote-tracking branch 'pootle/master' into QA_3_5
commit 9f3e5f46028a5f6e30915f5c547a348b7942ed5c
Author: Michal Čihař <michal(a)cihar.com>
Date: Fri Jan 27 14:59:17 2012 +0200
Translation update done using Pootle.
commit fa57bf1b7cd2061ae0bd3c548af7673246e63ecb
Author: Michal Čihař <michal(a)cihar.com>
Date: Fri Jan 27 14:58:53 2012 +0200
Translation update done using Pootle.
commit 0a6ae4b26077674e12364d38caa7f469044eb65f
Author: Michal Čihař <michal(a)cihar.com>
Date: Fri Jan 27 14:58:39 2012 +0200
Translation update done using Pootle.
commit 24e8aacd051dce33a9db0e44ce1c6c388baaf5b9
Author: Michal Čihař <michal(a)cihar.com>
Date: Fri Jan 27 14:58:22 2012 +0200
Translation update done using Pootle.
commit ced6716d71a2943875912a9875e9073510e0bc84
Author: Michal Čihař <michal(a)cihar.com>
Date: Fri Jan 27 14:57:50 2012 +0200
Translation update done using Pootle.
commit 4301ed2ab948cb90ceb1a6fe3a5cfa055e9ec5d3
Author: Michal Čihař <michal(a)cihar.com>
Date: Fri Jan 27 14:56:59 2012 +0200
Translation update done using Pootle.
commit 61c2348201746bac0c332131683a3938b450df40
Author: Michal Čihař <michal(a)cihar.com>
Date: Fri Jan 27 14:56:45 2012 +0200
Translation update done using Pootle.
commit 8ae4e415546a722d898ed0a3291562f52ded3873
Author: Michal Čihař <michal(a)cihar.com>
Date: Fri Jan 27 14:56:21 2012 +0200
Translation update done using Pootle.
commit 64d4d0e7d2f7e8a51f1a3480eeec1f076765612c
Author: Michal Čihař <michal(a)cihar.com>
Date: Fri Jan 27 14:55:46 2012 +0200
Translation update done using Pootle.
commit cf8118c0906d5f3cbb8f2a908042d671eecc2972
Author: Michal Čihař <michal(a)cihar.com>
Date: Fri Jan 27 14:55:28 2012 +0200
Translation update done using Pootle.
commit b2b31f9b892d27174c2b99228ce1bc7a2f4ea39b
Author: Michal Čihař <michal(a)cihar.com>
Date: Fri Jan 27 14:55:14 2012 +0200
Translation update done using Pootle.
commit ec1ab93652d9ece93d4bd6a2e437cae99bc06e3d
Author: Michal Čihař <michal(a)cihar.com>
Date: Fri Jan 27 14:54:57 2012 +0200
Translation update done using Pootle.
commit a64923acac18759ee90a7acc453aa29814f5f534
Author: Michal Čihař <michal(a)cihar.com>
Date: Fri Jan 27 14:54:31 2012 +0200
Translation update done using Pootle.
commit 39919646625e9d562cfdf01eda82f25f6fc68177
Author: Michal Čihař <michal(a)cihar.com>
Date: Fri Jan 27 14:54:02 2012 +0200
Translation update done using Pootle.
commit 0052f63c632bbcd78de5fec9d5730bfc0a5992c8
Author: Michal Čihař <michal(a)cihar.com>
Date: Fri Jan 27 14:53:44 2012 +0200
Translation update done using Pootle.
commit e4d110b4d489e19380059289bce572fa73d2b2a8
Author: Michal Čihař <michal(a)cihar.com>
Date: Fri Jan 27 14:53:25 2012 +0200
Translation update done using Pootle.
commit e79d0bc1de688b843a7ebc8caea068a9278ddee6
Author: Michal Čihař <michal(a)cihar.com>
Date: Fri Jan 27 14:52:46 2012 +0200
Translation update done using Pootle.
commit 760fe8de1b711b86584a98432c09ddb93beb9b48
Author: Michal Čihař <michal(a)cihar.com>
Date: Fri Jan 27 14:51:58 2012 +0200
Translation update done using Pootle.
commit e66f23fcae4bff5b13a464c980b03fb41d423c0a
Merge: dda8dc5 5d00fdf
Author: Pootle server <pootle(a)cihar.com>
Date: Fri Jan 27 12:40:12 2012 +0100
Merge remote-tracking branch 'origin/master'
commit dda8dc59745d90612476bc0d09630b21cd03188c
Author: Pootle server <noreply(a)l10n.cihar.com>
Date: Fri Jan 27 10:39:08 2012 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes:
po/cs.po | 40 +++++++++++++++++++++++++++++++---------
po/ko.po | 28 ++++++++--------------------
2 files changed, 39 insertions(+), 29 deletions(-)
diff --git a/po/cs.po b/po/cs.po
index e6cd5ba..7c39b20 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -5,7 +5,7 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.5.0-beta2\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
"POT-Creation-Date: 2012-01-25 17:45+0100\n"
-"PO-Revision-Date: 2012-01-24 21:07+0200\n"
+"PO-Revision-Date: 2012-01-27 14:58+0200\n"
"Last-Translator: Michal Čihař <michal(a)cihar.com>\n"
"Language-Team: czech <cs(a)li.org>\n"
"Language: cs\n"
@@ -12398,11 +12398,15 @@ msgid ""
"This means that joins are doing full table scans. Adding indexes for the "
"columns being used in the join conditions will greatly speed up table joins"
msgstr ""
+"To znamená, že spojení tabulek musí často procházet celou tabulku. Přidáním "
+"klíčů na sloupce použité při slučování můžete tuto operaci značně urychlit."
#: po/advisory_rules.php:128
#, php-format
msgid "Table joins average: %s, this value should be less than 1 per hour"
msgstr ""
+"Průměrně sloučeno tabulek: %s, tato hodnota by měla být menší než 1 za "
+"hodinu"
#: po/advisory_rules.php:130
msgid "Rate of reading first index entry"
@@ -12426,6 +12430,8 @@ msgstr ""
#, php-format
msgid "Index scans average: %s, this value should be less than 1 per hour"
msgstr ""
+"Průměrně procházeno klíčů: %s, tato hodnota by měla být menší než 1 za "
+"hodinu"
#: po/advisory_rules.php:135
msgid "Rate of reading fixed position"
@@ -12448,6 +12454,8 @@ msgid ""
"Rate of reading fixed position average: %s, this value should be less than 1 "
"per hour"
msgstr ""
+"Četnost čtení na pevné pozici: %s, tato hodnota by měla být menší než 1 za "
+"hodinu"
#: po/advisory_rules.php:140
msgid "Rate of reading next table row"
@@ -12468,6 +12476,8 @@ msgstr ""
msgid ""
"Rate of reading next table row: %s, this value should be less than 1 per hour"
msgstr ""
+"Četnost čtení dalšího řádku tabulky: %s, tato hodnota by měla být menší než "
+"1 za hodinu"
#: po/advisory_rules.php:145
msgid "tmp_table_size vs. max_heap_table_size"
@@ -12541,6 +12551,8 @@ msgid ""
"Rate of temporary tables being written to disk: %s, this value should be "
"less than 1 per hour"
msgstr ""
+"Četnost dočasného ukládání na disk: %s, tato hodnota by měla být menší než 1 "
+"za hodinu"
#: po/advisory_rules.php:160
msgid "MyISAM key buffer size"
@@ -12633,6 +12645,8 @@ msgstr ""
#, php-format
msgid "Opened table rate: %s, this value should be less than 10 per hour"
msgstr ""
+"Četnost otevírání tabulek: %s, tato hodnota by měla být menší než 10 za "
+"hodinu"
#: po/advisory_rules.php:185
#, fuzzy
@@ -12659,10 +12673,9 @@ msgid ""
msgstr ""
#: po/advisory_rules.php:190
-#, fuzzy
#| msgid "Format of imported file"
msgid "Rate of open files"
-msgstr "Formát importovaného souboru"
+msgstr "Četnost otevírání souborů"
#: po/advisory_rules.php:191
#, fuzzy
@@ -12674,6 +12687,8 @@ msgstr "Počet nevyřízených synchronizací logovacích souborů."
#, php-format
msgid "Opened files rate: %s, this value should be less than 5 per hour"
msgstr ""
+"Četnost otevírání souborů: %s, tato hodnota by měla být menší než 5 za "
+"hodinu"
#: po/advisory_rules.php:195
#, php-format
@@ -12697,12 +12712,14 @@ msgstr ""
#: po/advisory_rules.php:200
msgid "Table lock wait rate"
-msgstr ""
+msgstr "Četnost čekání na zámek tabulky"
#: po/advisory_rules.php:203
#, php-format
msgid "Table lock wait rate: %s, this value should be less than 1 per hour"
msgstr ""
+"Četnost čekání na zámek tabulky: %s, tato hodnota by měla být menší než 1 za "
+"hodinu"
#: po/advisory_rules.php:205
#, fuzzy
@@ -12746,19 +12763,20 @@ msgstr ""
#: po/advisory_rules.php:215
msgid "Threads that are slow to launch"
-msgstr ""
+msgstr "Vlákna se spouštějí příliš dlouho"
#: po/advisory_rules.php:216
-#, fuzzy
#| msgid "The number of threads that are not sleeping."
msgid "There are too many threads that are slow to launch."
-msgstr "Počet vláken, která nespí."
+msgstr "Je příliš mnoho vláken, která se spouštějí dlouho."
#: po/advisory_rules.php:217
msgid ""
"This generally happens in case of general system overload as it is pretty "
"simple operations. You might want to monitor your system load carefully."
msgstr ""
+"K tomuto obvykle dochází v případě přetížení systému, protože se jedná o "
+"velmi jednoduchou operaci. Je vhodné podrobně sledovat zatížení systému."
#: po/advisory_rules.php:218
#, php-format
@@ -12839,6 +12857,8 @@ msgstr "Trvalé připojení"
msgid ""
"Aborted connections rate is at %s, this value should be less than 1 per hour"
msgstr ""
+"Četnost přerušených spojení je %s, tato hodnota by měla být menší než 1 za "
+"hodinu"
#: po/advisory_rules.php:240
msgid "Percentage of aborted clients"
@@ -12870,10 +12890,12 @@ msgstr "Formát importovaného souboru"
#, php-format
msgid "Aborted client rate is at %s, this value should be less than 1 per hour"
msgstr ""
+"Četnost přerušených klientů: %s, tato hodnota by měla být menší než 1 za "
+"hodinu"
#: po/advisory_rules.php:250
msgid "Is InnoDB disabled?"
-msgstr ""
+msgstr "InnoDB je vypnuto?"
#: po/advisory_rules.php:251
msgid "You do not have InnoDB enabled."
@@ -12881,7 +12903,7 @@ msgstr "Máte zakázané InnoDB."
#: po/advisory_rules.php:252
msgid "InnoDB is usually the better choice for table engines."
-msgstr ""
+msgstr "InnoDB je obvykle nejlepší volba úložiště tabulky."
#: po/advisory_rules.php:253
msgid "have_innodb is set to 'value'"
diff --git a/po/ko.po b/po/ko.po
index 3b66495..1405a21 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -5,7 +5,7 @@ msgstr ""
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
"POT-Creation-Date: 2012-01-25 17:45+0100\n"
"PO-Revision-Date: 2012-01-27 08:18+0200\n"
-"Last-Translator: manyfun <manyfun7(a)gmail.com>\n"
+"Last-Translator: minsung kang <manyfun7(a)gmail.com>\n"
"Language-Team: korean <ko(a)li.org>\n"
"Language: ko\n"
"MIME-Version: 1.0\n"
@@ -806,25 +806,22 @@ msgid "ENUM/SET editor"
msgstr "ENUM/SET 수정"
#: enum_editor.php:28 js/messages.php:268
-#, fuzzy
#| msgid "Values for the column \"%s\""
msgid "Values for a new column"
msgstr "새로운 열의 값"
#: enum_editor.php:30 js/messages.php:267
-#, fuzzy, php-format
+#, php-format
#| msgid "Values for the column \"%s\""
msgid "Values for column %s"
msgstr "\"%s\" 열의 값"
#: enum_editor.php:34 js/messages.php:269
-#, fuzzy
#| msgid "Enter each value in a separate field."
msgid "Enter each value in a separate field"
msgstr "각각의 필드에 값을 입력하세요"
#: enum_editor.php:123
-#, fuzzy
msgid "Add a value"
msgstr "값을 추가"
@@ -941,7 +938,6 @@ msgid "Add an inner ring"
msgstr "내부 링 추가"
#: gis_data_editor.php:266 js/messages.php:322
-#, fuzzy
msgid "Polygon"
msgstr "폴리곤"
@@ -1103,7 +1099,6 @@ msgid "This is not a number!"
msgstr "은 숫자가 아닙니다!"
#: js/messages.php:46
-#, fuzzy
#| msgid "Add index"
msgid "Add Index"
msgstr "인덱스 추가"
@@ -1114,7 +1109,7 @@ msgid "Edit Index"
msgstr "인덱스 수정"
#: js/messages.php:48 tbl_indexes.php:293
-#, fuzzy, php-format
+#, php-format
msgid "Add %d column(s) to index"
msgstr "인덱스에 %d 열 추가"
@@ -1249,7 +1244,6 @@ msgid "Local monitor configuration incompatible"
msgstr "호환되지 않는 로컬 모니터 설정입니다."
#: js/messages.php:95
-#, fuzzy
msgid ""
"The chart arrangement configuration in your browsers local storage is not "
"compatible anymore to the newer version of the monitor dialog. It is very "
@@ -1373,11 +1367,11 @@ msgid "EiB"
msgstr "EB"
#: js/messages.php:132
-#, fuzzy, php-format
+#, php-format
#| msgid "%s table"
#| msgid_plural "%s tables"
msgid "%d table(s)"
-msgstr "%s개 테이블 "
+msgstr "%d개 테이블 "
#. l10n: Questions is the name of a MySQL Status variable
#: js/messages.php:135
@@ -1480,7 +1474,7 @@ msgstr "로그 출력을 %s로 설정"
#. l10n: Enable in this context means setting a status variable to ON
#: js/messages.php:159
-#, fuzzy, php-format
+#, php-format
#| msgid "Enabled"
msgid "Enable %s"
msgstr "%s 사용가능"
@@ -1515,7 +1509,6 @@ msgid "Current settings"
msgstr "현재 설정"
#: js/messages.php:168 server_status.php:1640
-#, fuzzy
#| msgid "Import files"
msgid "Chart Title"
msgstr "차트 제목"
@@ -1606,7 +1599,6 @@ msgid "Profiling results"
msgstr "프로파일링"
#: js/messages.php:191
-#, fuzzy
#| msgid "Table"
msgctxt "Display format"
msgid "Table"
@@ -1686,7 +1678,6 @@ msgstr ""
#: libraries/db_links.inc.php:82 libraries/display_import.lib.php:126
#: libraries/server_links.inc.php:69 libraries/tbl_links.inc.php:89
#: prefs_manage.php:229 server_status.php:1595 setup/frames/menu.inc.php:20
-#, fuzzy
msgid "Import"
msgstr "가져오기"
@@ -1708,7 +1699,6 @@ msgid "Issue"
msgstr ""
#: js/messages.php:221
-#, fuzzy
#| msgid "Documentation"
msgid "Recommendation"
msgstr "추천"
@@ -1836,12 +1826,11 @@ msgid "The definition of a stored function must contain a RETURN statement!"
msgstr "저장 함수의 정의는 RETURN문을 포함해야 합니다!"
#: js/messages.php:270
-#, fuzzy, php-format
+#, php-format
msgid "Add %d value(s)"
msgstr "%d 값 추가"
#: js/messages.php:273
-#, fuzzy
msgid ""
"Note: If the file contains multiple tables, they will be combined into one"
msgstr "참고: 파일에 여러 테이블이 포함되어 있다면, 하나로 결합됩니다."
@@ -1891,6 +1880,7 @@ msgid "Zoom Search"
msgstr "검색"
#: js/messages.php:293
+#, fuzzy
msgid "Each point represents a data row."
msgstr "각 포인트는 데이터 행을 나타냅니다."
@@ -3608,7 +3598,6 @@ msgid "Server name template"
msgstr "서버명 템플릿"
#: libraries/config/messages.inc.php:89
-#, fuzzy
msgid "Table name template"
msgstr "파일명 템플릿"
@@ -4506,7 +4495,6 @@ msgid "Query window height"
msgstr "질의 창"
#: libraries/config/messages.inc.php:348
-#, fuzzy
#| msgid "Query window"
msgid "Query window width (in pixels)"
msgstr "질의 창"
hooks/post-receive
--
phpMyAdmin
1
0
[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_5_0BETA1-216-ga8e38f8
by Michal Čihař 27 Jan '12
by Michal Čihař 27 Jan '12
27 Jan '12
The branch, master has been updated
via a8e38f8cdbe331ba2092c6efa45bfadfca82df11 (commit)
from 5d00fdf3da118fbbffc78b4eeda5e9cd48bf2bf1 (commit)
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
test/classes/PMA_File_test.php | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/test/classes/PMA_File_test.php b/test/classes/PMA_File_test.php
index 5115650..9760618 100644
--- a/test/classes/PMA_File_test.php
+++ b/test/classes/PMA_File_test.php
@@ -1,4 +1,3 @@
-
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
hooks/post-receive
--
phpMyAdmin
1
0
[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_5, updated. RELEASE_3_5_0BETA1-216-ga8e38f8
by Michal Čihař 27 Jan '12
by Michal Čihař 27 Jan '12
27 Jan '12
The branch, QA_3_5 has been updated
via a8e38f8cdbe331ba2092c6efa45bfadfca82df11 (commit)
from 5d00fdf3da118fbbffc78b4eeda5e9cd48bf2bf1 (commit)
- Log -----------------------------------------------------------------
commit a8e38f8cdbe331ba2092c6efa45bfadfca82df11
Author: Michal Čihař <mcihar(a)suse.cz>
Date: Fri Jan 27 13:47:03 2012 +0100
Prevent output from this test
-----------------------------------------------------------------------
Summary of changes:
test/classes/PMA_File_test.php | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/test/classes/PMA_File_test.php b/test/classes/PMA_File_test.php
index 5115650..9760618 100644
--- a/test/classes/PMA_File_test.php
+++ b/test/classes/PMA_File_test.php
@@ -1,4 +1,3 @@
-
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
hooks/post-receive
--
phpMyAdmin
1
0
[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_5_0BETA1-215-g5d00fdf
by Michal Čihař 27 Jan '12
by Michal Čihař 27 Jan '12
27 Jan '12
The branch, master has been updated
via 5d00fdf3da118fbbffc78b4eeda5e9cd48bf2bf1 (commit)
via 952a181f1fcf1fbcc0ff301111be4ce335f282d7 (commit)
via bda9be54eb9d3d7c6fe052903bcfa945c7f35cb8 (commit)
via ad29ef2de567d2c2a4f2ba155e93ee4a926b8a9a (commit)
via 9b9d3e5cbc59def734181a4bd40a48205651d83b (commit)
from 8e30c72834a64dfa9f984466abe0071208dc6bd9 (commit)
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
js/codemirror/lib/codemirror.js | 1525 ++++++++++++++++++++++---------
js/functions.js | 16 +-
themes/original/css/theme_right.css.php | 17 +-
themes/pmahomme/css/theme_right.css.php | 15 +
4 files changed, 1125 insertions(+), 448 deletions(-)
diff --git a/js/codemirror/lib/codemirror.js b/js/codemirror/lib/codemirror.js
index 27bec72..8e9a34e 100644
--- a/js/codemirror/lib/codemirror.js
+++ b/js/codemirror/lib/codemirror.js
@@ -1,3 +1,5 @@
+// CodeMirror v2.18
+
// All functions that need access to the editor's state live inside
// the CodeMirror function. Below that, at the bottom of the file,
// some utilities are defined.
@@ -16,18 +18,19 @@ var CodeMirror = (function() {
var targetDocument = options["document"];
// The element in which the editor lives.
var wrapper = targetDocument.createElement("div");
- wrapper.className = "CodeMirror";
+ wrapper.className = "CodeMirror" + (options.lineWrapping ? " CodeMirror-wrap" : "");
// This mess creates the base DOM structure for the editor.
wrapper.innerHTML =
'<div style="overflow: hidden; position: relative; width: 1px; height: 0px;">' + // Wraps and hides input textarea
- '<textarea style="position: absolute; width: 2px;" wrap="off"></textarea></div>' +
+ '<textarea style="position: absolute; width: 10000px;" wrap="off" ' +
+ 'autocorrect="off" autocapitalize="off"></textarea></div>' +
'<div class="CodeMirror-scroll cm-s-' + options.theme + '">' +
'<div style="position: relative">' + // Set to the height of the text, causes scrolling
- '<div style="position: absolute; height: 0; width: 0; overflow: hidden;"></div>' +
'<div style="position: relative">' + // Moved around its parent to cover visible view
'<div class="CodeMirror-gutter"><div class="CodeMirror-gutter-text"></div></div>' +
// Provides positioning relative to (visible) text origin
'<div class="CodeMirror-lines"><div style="position: relative">' +
+ '<div style="position: absolute; width: 100%; height: 0; overflow: hidden; visibility: hidden"></div>' +
'<pre class="CodeMirror-cursor"> </pre>' + // Absolutely positioned blinky cursor
'<div></div>' + // This DIV contains the actual code
'</div></div></div></div></div>';
@@ -35,21 +38,29 @@ var CodeMirror = (function() {
// I've never seen more elegant code in my life.
var inputDiv = wrapper.firstChild, input = inputDiv.firstChild,
scroller = wrapper.lastChild, code = scroller.firstChild,
- measure = code.firstChild, mover = measure.nextSibling,
- gutter = mover.firstChild, gutterText = gutter.firstChild,
- lineSpace = gutter.nextSibling.firstChild,
- cursor = lineSpace.firstChild, lineDiv = cursor.nextSibling;
+ mover = code.firstChild, gutter = mover.firstChild, gutterText = gutter.firstChild,
+ lineSpace = gutter.nextSibling.firstChild, measure = lineSpace.firstChild,
+ cursor = measure.nextSibling, lineDiv = cursor.nextSibling;
+ if (!webkit) lineSpace.draggable = true;
if (options.tabindex != null) input.tabindex = options.tabindex;
if (!options.gutter && !options.lineNumbers) gutter.style.display = "none";
+ // Check for problem with IE innerHTML not working when we have a
+ // P (or similar) parent node.
+ try { stringWidth("x"); }
+ catch (e) {
+ if (e.message.match(/unknown runtime/i))
+ e = new Error("A CodeMirror inside a P-style element does not work in Internet Explorer. (innerHTML bug)");
+ throw e;
+ }
+
// Delayed object wrap timeouts, making sure only one is active. blinker holds an interval.
var poll = new Delayed(), highlight = new Delayed(), blinker;
- // mode holds a mode API object. lines an array of Line objects
- // (see Line constructor), work an array of lines that should be
- // parsed, and history the undo history (instance of History
- // constructor).
- var mode, lines = [new Line("")], work, history = new History(), focused;
+ // mode holds a mode API object. doc is the tree of Line objects,
+ // work an array of lines that should be parsed, and history the
+ // undo history (instance of History constructor).
+ var mode, doc = new BranchChunk([new LeafChunk([new Line("")])]), work, focused;
loadMode();
// The selection. These are always maintained to point at valid
// positions. Inverted is used to remember that the user is
@@ -59,12 +70,12 @@ var CodeMirror = (function() {
// whether the user is holding shift. reducedSelection is a hack
// to get around the fact that we can't create inverted
// selections. See below.
- var shiftSelecting, reducedSelection, lastDoubleClick;
+ var shiftSelecting, reducedSelection, lastClick, lastDoubleClick, draggingText;
// Variables used by startOperation/endOperation to track what
// happened during the operation.
- var updateInput, changes, textChanged, selectionChanged, leaveInputAlone;
+ var updateInput, changes, textChanged, selectionChanged, leaveInputAlone, gutterDirty;
// Current visible range (may be bigger than the view window).
- var showingFrom = 0, showingTo = 0, lastHeight = 0, curKeyId = null;
+ var displayOffset = 0, showingFrom = 0, showingTo = 0, lastHeight = 0, curKeyId = null;
// editing will hold an object describing the things we put in the
// textarea, to help figure out whether something changed.
// bracketHighlighted is used to remember that a backet has been
@@ -76,17 +87,33 @@ var CodeMirror = (function() {
// Initialize the content.
operation(function(){setValue(options.value || ""); updateInput = false;})();
+ var history = new History();
+
+ var slowPollInterval = 2000;
+ // Gecko and Opera Linux do not reliably fire any event when starting an IME compose
+ var alwaysPollForIME = (!win && !mac) && (gecko || window.opera);
+ if (options.pollForIME && alwaysPollForIME) slowPollInterval = 50;
+ function keyMightStartIME(keyCode) {
+ return (win && ((gecko && keyCode == 229) || (window.opera && keyCode == 197))) || (mac && gecko);
+ }
// Register our event handlers.
connect(scroller, "mousedown", operation(onMouseDown));
+ connect(scroller, "dblclick", operation(onDoubleClick));
+ connect(lineSpace, "dragstart", onDragStart);
+ connect(lineSpace, "selectstart", e_preventDefault);
// Gecko browsers fire contextmenu *after* opening the menu, at
// which point we can't mess with it anymore. Context menu is
// handled in onMouseDown for Gecko.
if (!gecko) connect(scroller, "contextmenu", onContextMenu);
- connect(code, "dblclick", operation(onDblClick));
- connect(scroller, "scroll", function() {updateDisplay([]); if (options.onScroll) options.onScroll(instance);});
+ connect(scroller, "scroll", function() {
+ updateDisplay([]);
+ if (options.fixedGutter) gutter.style.left = scroller.scrollLeft + "px";
+ if (options.onScroll) options.onScroll(instance);
+ });
connect(window, "resize", function() {updateDisplay(true);});
connect(input, "keyup", operation(onKeyUp));
+ connect(input, "input", function() {fastPoll(curKeyId);});
connect(input, "keydown", operation(onKeyDown));
connect(input, "keypress", operation(onKeyPress));
connect(input, "focus", onFocus);
@@ -98,44 +125,51 @@ var CodeMirror = (function() {
connect(scroller, "paste", function(){focusInput(); fastPoll();});
connect(input, "paste", function(){fastPoll();});
connect(input, "cut", function(){fastPoll();});
-
- // IE throws unspecified error in certain cases, when
+
+ // IE throws unspecified error in certain cases, when
// trying to access activeElement before onload
var hasFocus; try { hasFocus = (targetDocument.activeElement == input); } catch(e) { }
if (hasFocus) setTimeout(onFocus, 20);
else onBlur();
- function isLine(l) {return l >= 0 && l < lines.length;}
+ function isLine(l) {return l >= 0 && l < doc.size;}
// The instance object that we'll return. Mostly calls out to
// local functions in the CodeMirror function. Some do some extra
// range checking and/or clipping. operation is used to wrap the
// call so that changes it makes are tracked, and the display is
// updated afterwards.
- var instance = {
+ var instance = wrapper.CodeMirror = {
getValue: getValue,
setValue: operation(setValue),
getSelection: getSelection,
replaceSelection: operation(replaceSelection),
focus: function(){focusInput(); onFocus(); fastPoll();},
setOption: function(option, value) {
+ var oldVal = options[option];
options[option] = value;
- if (option == "lineNumbers" || option == "gutter") gutterChanged();
- else if (option == "mode" || option == "indentUnit") loadMode();
+ if (option == "mode" || option == "indentUnit") loadMode();
else if (option == "readOnly" && value == "nocursor") input.blur();
else if (option == "theme") scroller.className = scroller.className.replace(/cm-s-\w+/, "cm-s-" + value);
+ else if (option == "lineWrapping" && oldVal != value) operation(wrappingChanged)();
+ else if (option == "pollForIME" && alwaysPollForIME) slowPollInterval = value ? 50 : 2000;
+ if (option == "lineNumbers" || option == "gutter" || option == "firstLineNumber" || option == "theme")
+ operation(gutterChanged)();
},
getOption: function(option) {return options[option];},
undo: operation(undo),
redo: operation(redo),
- indentLine: operation(function(n) {if (isLine(n)) indentLine(n, "smart");}),
+ indentLine: operation(function(n, dir) {
+ if (isLine(n)) indentLine(n, dir == null ? "smart" : dir ? "add" : "subtract");
+ }),
historySize: function() {return {undo: history.done.length, redo: history.undone.length};},
+ clearHistory: function() {history = new History();},
matchBrackets: operation(function(){matchBrackets(true);}),
- getTokenAt: function(pos) {
+ getTokenAt: operation(function(pos) {
pos = clipPos(pos);
- return lines[pos.line].getTokenAt(mode, getStateBefore(pos.line), pos.ch);
- },
+ return getLine(pos.line).getTokenAt(mode, getStateBefore(pos.line), pos.ch);
+ }),
getStateAfter: function(line) {
- line = clipLine(line == null ? lines.length - 1: line);
+ line = clipLine(line == null ? doc.size - 1: line);
return getStateBefore(line + 1);
},
cursorCoords: function(start){
@@ -145,24 +179,25 @@ var CodeMirror = (function() {
charCoords: function(pos){return pageCoords(clipPos(pos));},
coordsChar: function(coords) {
var off = eltOffset(lineSpace);
- var line = clipLine(Math.min(lines.length - 1, showingFrom + Math.floor((coords.y - off.top) / lineHeight())));
- return clipPos({line: line, ch: charFromX(clipLine(line), coords.x - off.left)});
+ return coordsChar(coords.x - off.left, coords.y - off.top);
},
getSearchCursor: function(query, pos, caseFold) {return new SearchCursor(query, pos, caseFold);},
- markText: operation(function(a, b, c){return operation(markText(a, b, c));}),
- setMarker: addGutterMarker,
- clearMarker: removeGutterMarker,
+ markText: operation(markText),
+ setBookmark: setBookmark,
+ setMarker: operation(addGutterMarker),
+ clearMarker: operation(removeGutterMarker),
setLineClass: operation(setLineClass),
+ hideLine: operation(function(h) {return setLineHidden(h, true);}),
+ showLine: operation(function(h) {return setLineHidden(h, false);}),
lineInfo: lineInfo,
- addWidget: function(pos, node, scroll, where) {
+ addWidget: function(pos, node, scroll, vert, horiz) {
pos = localCoords(clipPos(pos));
var top = pos.yBot, left = pos.x;
node.style.position = "absolute";
code.appendChild(node);
- node.style.left = left + "px";
- if (where == "over") top = pos.y;
- else if (where == "near") {
- var vspace = Math.max(scroller.offsetHeight, lines.length * lineHeight()),
+ if (vert == "over") top = pos.y;
+ else if (vert == "near") {
+ var vspace = Math.max(scroller.offsetHeight, doc.height * textHeight()),
hspace = Math.max(code.clientWidth, lineSpace.clientWidth) - paddingLeft();
if (pos.yBot + node.offsetHeight > vspace && pos.y > node.offsetHeight)
top = pos.y - node.offsetHeight;
@@ -170,12 +205,20 @@ var CodeMirror = (function() {
left = hspace - node.offsetWidth;
}
node.style.top = (top + paddingTop()) + "px";
- node.style.left = (left + paddingLeft()) + "px";
+ node.style.left = node.style.right = "";
+ if (horiz == "right") {
+ left = code.clientWidth - node.offsetWidth;
+ node.style.right = "0px";
+ } else {
+ if (horiz == "left") left = 0;
+ else if (horiz == "middle") left = (code.clientWidth - node.offsetWidth) / 2;
+ node.style.left = (left + paddingLeft()) + "px";
+ }
if (scroll)
scrollIntoView(left, top, left + node.offsetWidth, top + node.offsetHeight);
},
- lineCount: function() {return lines.length;},
+ lineCount: function() {return doc.size;},
getCursor: function(start) {
if (start == null) start = sel.inverted;
return copyPos(start ? sel.from : sel.to);
@@ -186,9 +229,9 @@ var CodeMirror = (function() {
else setCursor(line, ch);
}),
setSelection: operation(function(from, to) {setSelection(clipPos(from), clipPos(to || from));}),
- getLine: function(line) {if (isLine(line)) return lines[line].text;},
+ getLine: function(line) {if (isLine(line)) return getLine(line).text;},
setLine: operation(function(line, text) {
- if (isLine(line)) replaceRange(text, {line: line, ch: 0}, {line: line, ch: lines[line].text.length});
+ if (isLine(line)) replaceRange(text, {line: line, ch: 0}, {line: line, ch: getLine(line).text.length});
}),
removeLine: operation(function(line) {
if (isLine(line)) replaceRange("", {line: line, ch: 0}, clipPos({line: line+1, ch: 0}));
@@ -196,24 +239,41 @@ var CodeMirror = (function() {
replaceRange: operation(replaceRange),
getRange: function(from, to) {return getRange(clipPos(from), clipPos(to));},
+ coordsFromIndex: function(off) {
+ var lineNo = 0, ch;
+ doc.iter(0, doc.size, function(line) {
+ var sz = line.text.length + 1;
+ if (sz > off) { ch = off; return true; }
+ off -= sz;
+ ++lineNo;
+ });
+ return clipPos({line: lineNo, ch: ch});
+ },
+
operation: function(f){return operation(f)();},
refresh: function(){updateDisplay(true);},
getInputField: function(){return input;},
getWrapperElement: function(){return wrapper;},
- getScrollerElement: function(){return scroller;}
+ getScrollerElement: function(){return scroller;},
+ getGutterElement: function(){return gutter;}
};
+ function getLine(n) { return getLineAt(doc, n); }
+ function updateLineHeight(line, height) {
+ gutterDirty = true;
+ var diff = height - line.height;
+ for (var n = line; n; n = n.parent) n.height += diff;
+ }
+
function setValue(code) {
- history = null;
var top = {line: 0, ch: 0};
- updateLines(top, {line: lines.length - 1, ch: lines[lines.length-1].text.length},
+ updateLines(top, {line: doc.size - 1, ch: getLine(doc.size-1).text.length},
splitLines(code), top, top);
- history = new History();
+ updateInput = true;
}
function getValue(code) {
var text = [];
- for (var i = 0, l = lines.length; i < l; ++i)
- text.push(lines[i].text);
+ doc.iter(0, doc.size, function(line) { text.push(line.text); });
return text.join("\n");
}
@@ -221,17 +281,17 @@ var CodeMirror = (function() {
// Check whether this is a click in a widget
for (var n = e_target(e); n != wrapper; n = n.parentNode)
if (n.parentNode == code && n != mover) return;
- var ld = lastDoubleClick; lastDoubleClick = null;
- // First, see if this is a click in the gutter
+
+ // See if this is a click in the gutter
for (var n = e_target(e); n != wrapper; n = n.parentNode)
if (n.parentNode == gutterText) {
if (options.onGutterClick)
- options.onGutterClick(instance, indexOf(gutterText.childNodes, n) + showingFrom);
+ options.onGutterClick(instance, indexOf(gutterText.childNodes, n) + showingFrom, e);
return e_preventDefault(e);
}
var start = posFromMouse(e);
-
+
switch (e_button(e)) {
case 3:
if (gecko && !mac) onContextMenu(e);
@@ -246,18 +306,39 @@ var CodeMirror = (function() {
if (!start) {if (e_target(e) == scroller) e_preventDefault(e); return;}
if (!focused) onFocus();
- e_preventDefault(e);
- if (ld && +new Date - ld < 400) return selectLine(start.line);
- setCursor(start.line, start.ch, true);
+ var now = +new Date;
+ if (lastDoubleClick && lastDoubleClick.time > now - 400 && posEq(lastDoubleClick.pos, start)) {
+ e_preventDefault(e);
+ setTimeout(focusInput, 20);
+ return selectLine(start.line);
+ } else if (lastClick && lastClick.time > now - 400 && posEq(lastClick.pos, start)) {
+ lastDoubleClick = {time: now, pos: start};
+ e_preventDefault(e);
+ return selectWordAt(start);
+ } else { lastClick = {time: now, pos: start}; }
+
var last = start, going;
- // And then we have to see if it's a drag event, in which case
- // the dragged-over text must be selected.
- function end() {
- focusInput();
- updateInput = true;
- move(); up();
+ if (dragAndDrop && !posEq(sel.from, sel.to) &&
+ !posLess(start, sel.from) && !posLess(sel.to, start)) {
+ // Let the drag handler handle this.
+ if (webkit) lineSpace.draggable = true;
+ var up = connect(targetDocument, "mouseup", operation(function(e2) {
+ if (webkit) lineSpace.draggable = false;
+ draggingText = false;
+ up();
+ if (Math.abs(e.clientX - e2.clientX) + Math.abs(e.clientY - e2.clientY) < 10) {
+ e_preventDefault(e2);
+ setCursor(start.line, start.ch, true);
+ focusInput();
+ }
+ }), true);
+ draggingText = true;
+ return;
}
+ e_preventDefault(e);
+ setCursor(start.line, start.ch, true);
+
function extend(e) {
var cur = posFromMouse(e, true);
if (cur && !posEq(cur, last)) {
@@ -281,15 +362,19 @@ var CodeMirror = (function() {
var cur = posFromMouse(e);
if (cur) setSelectionUser(start, cur);
e_preventDefault(e);
- end();
+ focusInput();
+ updateInput = true;
+ move(); up();
}), true);
}
- function onDblClick(e) {
- var pos = posFromMouse(e);
- if (!pos) return;
- selectWordAt(pos);
+ function onDoubleClick(e) {
+ for (var n = e_target(e); n != wrapper; n = n.parentNode)
+ if (n.parentNode == gutterText) return e_preventDefault(e);
+ var start = posFromMouse(e);
+ if (!start) return;
+ lastDoubleClick = {time: +new Date, pos: start};
e_preventDefault(e);
- lastDoubleClick = +new Date;
+ selectWordAt(start);
}
function onDrop(e) {
e.preventDefault();
@@ -300,7 +385,13 @@ var CodeMirror = (function() {
var reader = new FileReader;
reader.onload = function() {
text[i] = reader.result;
- if (++read == n) replaceRange(text.join(""), clipPos(pos), clipPos(pos));
+ if (++read == n) {
+ pos = clipPos(pos);
+ operation(function() {
+ var end = replaceRange(text.join(""), pos, pos);
+ setSelectionUser(pos, end);
+ })();
+ }
};
reader.readAsText(file);
}
@@ -310,11 +401,24 @@ var CodeMirror = (function() {
else {
try {
var text = e.dataTransfer.getData("Text");
- if (text) replaceRange(text, pos, pos);
+ if (text) {
+ var end = replaceRange(text, pos, pos);
+ var curFrom = sel.from, curTo = sel.to;
+ setSelectionUser(pos, end);
+ if (draggingText) replaceRange("", curFrom, curTo);
+ focusInput();
+ }
}
catch(e){}
}
}
+ function onDragStart(e) {
+ var txt = getSelection();
+ // This will reset escapeElement
+ htmlEscape(txt);
+ e.dataTransfer.setDragImage(escapeElement, 0, 0);
+ e.dataTransfer.setData("Text", txt);
+ }
function onKeyDown(e) {
if (!focused) onFocus();
@@ -340,6 +444,7 @@ var CodeMirror = (function() {
if (mod && code == 90) {undo(); return e_preventDefault(e);} // ctrl-z
if (mod && ((e.shiftKey && code == 90) || code == 89)) {redo(); return e_preventDefault(e);} // ctrl-shift-z, ctrl-y
}
+ if (code == 36) { if (options.smartHome) { smartHome(); return e_preventDefault(e); } }
// Key id to use in the movementKeys map. We also pass it to
// fastPoll in order to 'self learn'. We need this because
@@ -347,15 +452,19 @@ var CodeMirror = (function() {
// its start when it is inverted and a movement key is pressed
// (and later restore it again), shouldn't be used for
// non-movement keys.
- curKeyId = (mod ? "c" : "") + code;
- if (sel.inverted && movementKeys.hasOwnProperty(curKeyId)) {
+ curKeyId = (mod ? "c" : "") + (e.altKey ? "a" : "") + code;
+ if (sel.inverted && movementKeys[curKeyId] === true) {
var range = selRange(input);
if (range) {
reducedSelection = {anchor: range.start};
setSelRange(input, range.start, range.start);
}
}
+ // Don't save the key as a movementkey unless it had a modifier
+ if (!mod && !e.altKey) curKeyId = null;
fastPoll(curKeyId);
+
+ if (options.pollForIME && keyMightStartIME(code)) slowPollInterval = 50;
}
function onKeyUp(e) {
if (options.onKeyEvent && options.onKeyEvent(instance, addStop(e))) return;
@@ -364,6 +473,8 @@ var CodeMirror = (function() {
updateInput = true;
}
if (e.keyCode == 16) shiftSelecting = null;
+
+ if (slowPollInterval < 2000 && !alwaysPollForIME) slowPollInterval = 2000;
}
function onKeyPress(e) {
if (options.onKeyEvent && options.onKeyEvent(instance, addStop(e))) return;
@@ -406,7 +517,7 @@ var CodeMirror = (function() {
function updateLines(from, to, newText, selFrom, selTo) {
if (history) {
var old = [];
- for (var i = from.line, e = to.line + 1; i < e; ++i) old.push(lines[i].text);
+ doc.iter(from.line, to.line + 1, function(line) { old.push(line.text); });
history.addChange(from.line, newText.length, old);
while (history.done.length > options.undoDepth) history.done.shift();
}
@@ -416,11 +527,11 @@ var CodeMirror = (function() {
var change = from.pop();
if (change) {
var replaced = [], end = change.start + change.added;
- for (var i = change.start; i < end; ++i) replaced.push(lines[i].text);
+ doc.iter(change.start, end, function(line) { replaced.push(line.text); });
to.push({start: change.start, added: change.old.length, old: replaced});
var pos = clipPos({line: change.start + change.old.length - 1,
ch: editEnd(replaced[replaced.length-1], change.old[change.old.length-1])});
- updateLinesNoUndo({line: change.start, ch: 0}, {line: end - 1, ch: lines[end-1].text.length}, change.old, pos, pos);
+ updateLinesNoUndo({line: change.start, ch: 0}, {line: end - 1, ch: getLine(end-1).text.length}, change.old, pos, pos);
updateInput = true;
}
}
@@ -429,51 +540,66 @@ var CodeMirror = (function() {
function updateLinesNoUndo(from, to, newText, selFrom, selTo) {
var recomputeMaxLength = false, maxLineLength = maxLine.length;
- for (var i = from.line; i <= to.line; ++i) {
- if (lines[i].text.length == maxLineLength) {recomputeMaxLength = true; break;}
- }
+ if (!options.lineWrapping)
+ doc.iter(from.line, to.line, function(line) {
+ if (line.text.length == maxLineLength) {recomputeMaxLength = true; return true;}
+ });
- var nlines = to.line - from.line, firstLine = lines[from.line], lastLine = lines[to.line];
+ var nlines = to.line - from.line, firstLine = getLine(from.line), lastLine = getLine(to.line);
// First adjust the line structure, taking some care to leave highlighting intact.
if (firstLine == lastLine) {
if (newText.length == 1)
firstLine.replace(from.ch, to.ch, newText[0]);
else {
lastLine = firstLine.split(to.ch, newText[newText.length-1]);
- var spliceargs = [from.line + 1, nlines];
- firstLine.replace(from.ch, firstLine.text.length, newText[0]);
- for (var i = 1, e = newText.length - 1; i < e; ++i) spliceargs.push(new Line(newText[i]));
- spliceargs.push(lastLine);
- lines.splice.apply(lines, spliceargs);
+ firstLine.replace(from.ch, null, newText[0]);
+ firstLine.fixMarkEnds(lastLine);
+ var added = [];
+ for (var i = 1, e = newText.length - 1; i < e; ++i)
+ added.push(Line.inheritMarks(newText[i], firstLine));
+ added.push(lastLine);
+ doc.insert(from.line + 1, added);
}
}
else if (newText.length == 1) {
- firstLine.replace(from.ch, firstLine.text.length, newText[0] + lastLine.text.slice(to.ch));
- lines.splice(from.line + 1, nlines);
+ firstLine.replace(from.ch, null, newText[0]);
+ lastLine.replace(null, to.ch, "");
+ firstLine.append(lastLine);
+ doc.remove(from.line + 1, nlines);
}
else {
- var spliceargs = [from.line + 1, nlines - 1];
- firstLine.replace(from.ch, firstLine.text.length, newText[0]);
- lastLine.replace(0, to.ch, newText[newText.length-1]);
- for (var i = 1, e = newText.length - 1; i < e; ++i) spliceargs.push(new Line(newText[i]));
- lines.splice.apply(lines, spliceargs);
- }
-
-
- for (var i = from.line, e = i + newText.length; i < e; ++i) {
- var l = lines[i].text;
- if (l.length > maxLineLength) {
- maxLine = l; maxLineLength = l.length; maxWidth = null;
- recomputeMaxLength = false;
- }
- }
- if (recomputeMaxLength) {
- maxLineLength = 0; maxLine = ""; maxWidth = null;
- for (var i = 0, e = lines.length; i < e; ++i) {
- var l = lines[i].text;
+ var added = [];
+ firstLine.replace(from.ch, null, newText[0]);
+ lastLine.replace(null, to.ch, newText[newText.length-1]);
+ firstLine.fixMarkEnds(lastLine);
+ for (var i = 1, e = newText.length - 1; i < e; ++i)
+ added.push(Line.inheritMarks(newText[i], firstLine));
+ if (nlines > 1) doc.remove(from.line + 1, nlines - 1);
+ doc.insert(from.line + 1, added);
+ }
+ if (options.lineWrapping) {
+ var perLine = scroller.clientWidth / charWidth() - 3;
+ doc.iter(from.line, from.line + newText.length, function(line) {
+ if (line.hidden) return;
+ var guess = Math.ceil(line.text.length / perLine) || 1;
+ if (guess != line.height) updateLineHeight(line, guess);
+ });
+ } else {
+ doc.iter(from.line, i + newText.length, function(line) {
+ var l = line.text;
if (l.length > maxLineLength) {
- maxLineLength = l.length; maxLine = l;
+ maxLine = l; maxLineLength = l.length; maxWidth = null;
+ recomputeMaxLength = false;
}
+ });
+ if (recomputeMaxLength) {
+ maxLineLength = 0; maxLine = ""; maxWidth = null;
+ doc.iter(0, doc.size, function(line) {
+ var l = line.text;
+ if (l.length > maxLineLength) {
+ maxLineLength = l.length; maxLine = l;
+ }
+ });
}
}
@@ -485,12 +611,9 @@ var CodeMirror = (function() {
if (task < from.line) newWork.push(task);
else if (task > to.line) newWork.push(task + lendiff);
}
- if (newText.length < 5) {
- highlightLines(from.line, from.line + newText.length);
- newWork.push(from.line + newText.length);
- } else {
- newWork.push(from.line);
- }
+ var hlEnd = from.line + Math.min(newText.length, 500);
+ highlightLines(from.line, hlEnd);
+ newWork.push(hlEnd);
work = newWork;
startWorker(100);
// Remember that these lines changed, for updating the display
@@ -502,7 +625,7 @@ var CodeMirror = (function() {
setSelection(selFrom, selTo, updateLine(sel.from.line), updateLine(sel.to.line));
// Make sure the scroll-size div has the correct height.
- code.style.height = (lines.length * lineHeight() + 2 * paddingTop()) + "px";
+ code.style.height = (doc.height * textHeight() + 2 * paddingTop()) + "px";
}
function replaceRange(code, from, to) {
@@ -540,10 +663,10 @@ var CodeMirror = (function() {
function getRange(from, to) {
var l1 = from.line, l2 = to.line;
- if (l1 == l2) return lines[l1].text.slice(from.ch, to.ch);
- var code = [lines[l1].text.slice(from.ch)];
- for (var i = l1 + 1; i < l2; ++i) code.push(lines[i].text);
- code.push(lines[l2].text.slice(0, to.ch));
+ if (l1 == l2) return getLine(l1).text.slice(from.ch, to.ch);
+ var code = [getLine(l1).text.slice(from.ch)];
+ doc.iter(l1 + 1, l2, function(line) { code.push(line.text); });
+ code.push(getLine(l2).text.slice(0, to.ch));
return code.join("\n");
}
function getSelection() {
@@ -553,7 +676,7 @@ var CodeMirror = (function() {
var pollingFast = false; // Ensures slowPoll doesn't cancel fastPoll
function slowPoll() {
if (pollingFast) return;
- poll.set(2000, function() {
+ poll.set(slowPollInterval, function() {
startOperation();
readInput();
if (focused) slowPoll();
@@ -566,7 +689,10 @@ var CodeMirror = (function() {
function p() {
startOperation();
var changed = readInput();
- if (changed == "moved" && keyId) movementKeys[keyId] = true;
+ if (changed && keyId) {
+ if (changed == "moved" && movementKeys[keyId] == null) movementKeys[keyId] = true;
+ if (changed == "changed") movementKeys[keyId] = false;
+ }
if (!changed && !missed) {missed = true; poll.set(80, p);}
else {pollingFast = false; slowPoll();}
endOperation();
@@ -648,14 +774,16 @@ var CodeMirror = (function() {
// editor state.
function prepareInput() {
var text = [];
- var from = Math.max(0, sel.from.line - 1), to = Math.min(lines.length, sel.to.line + 2);
- for (var i = from; i < to; ++i) text.push(lines[i].text);
+ var from = Math.max(0, sel.from.line - 1), to = Math.min(doc.size, sel.to.line + 2);
+ doc.iter(from, to, function(line) { text.push(line.text); });
text = input.value = text.join(lineSep);
var startch = sel.from.ch, endch = sel.to.ch;
- for (var i = from; i < sel.from.line; ++i)
- startch += lineSep.length + lines[i].text.length;
- for (var i = from; i < sel.to.line; ++i)
- endch += lineSep.length + lines[i].text.length;
+ doc.iter(from, sel.from.line, function(line) {
+ startch += lineSep.length + line.text.length;
+ });
+ doc.iter(from, sel.to.line, function(line) {
+ endch += lineSep.length + line.text.length;
+ });
editing = {text: text, from: from, to: to, start: startch, end: endch};
setSelRange(input, startch, reducedSelection ? startch : endch);
}
@@ -663,21 +791,29 @@ var CodeMirror = (function() {
if (options.readOnly != "nocursor") input.focus();
}
+ function scrollEditorIntoView() {
+ if (!cursor.getBoundingClientRect) return;
+ var rect = cursor.getBoundingClientRect();
+ var winH = window.innerHeight || Math.max(document.body.offsetHeight, document.documentElement.offsetHeight);
+ if (rect.top < 0 || rect.bottom > winH) cursor.scrollIntoView();
+ }
function scrollCursorIntoView() {
var cursor = localCoords(sel.inverted ? sel.from : sel.to);
- return scrollIntoView(cursor.x, cursor.y, cursor.x, cursor.yBot);
+ var x = options.lineWrapping ? Math.min(cursor.x, lineSpace.offsetWidth) : cursor.x;
+ return scrollIntoView(x, cursor.y, x, cursor.yBot);
}
function scrollIntoView(x1, y1, x2, y2) {
- var pl = paddingLeft(), pt = paddingTop(), lh = lineHeight();
+ var pl = paddingLeft(), pt = paddingTop(), lh = textHeight();
y1 += pt; y2 += pt; x1 += pl; x2 += pl;
var screen = scroller.clientHeight, screentop = scroller.scrollTop, scrolled = false, result = true;
if (y1 < screentop) {scroller.scrollTop = Math.max(0, y1 - 2*lh); scrolled = true;}
else if (y2 > screentop + screen) {scroller.scrollTop = y2 + lh - screen; scrolled = true;}
var screenw = scroller.clientWidth, screenleft = scroller.scrollLeft;
- if (x1 < screenleft) {
+ var gutterw = options.fixedGutter ? gutter.clientWidth : 0;
+ if (x1 < screenleft + gutterw) {
if (x1 < 50) x1 = 0;
- scroller.scrollLeft = Math.max(0, x1 - 10);
+ scroller.scrollLeft = Math.max(0, x1 - 10 - gutterw);
scrolled = true;
}
else if (x2 > screenw + screenleft) {
@@ -690,32 +826,103 @@ var CodeMirror = (function() {
}
function visibleLines() {
- var lh = lineHeight(), top = scroller.scrollTop - paddingTop();
- return {from: Math.min(lines.length, Math.max(0, Math.floor(top / lh))),
- to: Math.min(lines.length, Math.ceil((top + scroller.clientHeight) / lh))};
+ var lh = textHeight(), top = scroller.scrollTop - paddingTop();
+ var from_height = Math.max(0, Math.floor(top / lh));
+ var to_height = Math.ceil((top + scroller.clientHeight) / lh);
+ return {from: lineAtHeight(doc, from_height),
+ to: lineAtHeight(doc, to_height)};
}
// Uses a set of changes plus the current scroll position to
// determine which DOM updates have to be made, and makes the
// updates.
function updateDisplay(changes) {
if (!scroller.clientWidth) {
- showingFrom = showingTo = 0;
+ showingFrom = showingTo = displayOffset = 0;
return;
}
- // First create a range of theoretically intact lines, and punch
- // holes in that using the change info.
- var intact = changes === true ? [] : [{from: showingFrom, to: showingTo, domStart: 0}];
+ // Compute the new visible window
+ var visible = visibleLines();
+ // Bail out if the visible area is already rendered and nothing changed.
+ if (changes !== true && changes.length == 0 && visible.from >= showingFrom && visible.to <= showingTo) return;
+ var from = Math.max(visible.from - 100, 0), to = Math.min(doc.size, visible.to + 100);
+ if (showingFrom < from && from - showingFrom < 20) from = showingFrom;
+ if (showingTo > to && showingTo - to < 20) to = Math.min(doc.size, showingTo);
+
+ // Create a range of theoretically intact lines, and punch holes
+ // in that using the change info.
+ var intact = changes === true ? [] :
+ computeIntact([{from: showingFrom, to: showingTo, domStart: 0}], changes);
+ // Clip off the parts that won't be visible
+ var intactLines = 0;
+ for (var i = 0; i < intact.length; ++i) {
+ var range = intact[i];
+ if (range.from < from) {range.domStart += (from - range.from); range.from = from;}
+ if (range.to > to) range.to = to;
+ if (range.from >= range.to) intact.splice(i--, 1);
+ else intactLines += range.to - range.from;
+ }
+ if (intactLines == to - from) return;
+ intact.sort(function(a, b) {return a.domStart - b.domStart;});
+
+ var th = textHeight(), gutterDisplay = gutter.style.display;
+ lineDiv.style.display = gutter.style.display = "none";
+ patchDisplay(from, to, intact);
+ lineDiv.style.display = "";
+
+ // Position the mover div to align with the lines it's supposed
+ // to be showing (which will cover the visible display)
+ var different = from != showingFrom || to != showingTo || lastHeight != scroller.clientHeight;
+ if (different) lastHeight = scroller.clientHeight;
+ showingFrom = from; showingTo = to;
+ displayOffset = heightAtLine(doc, from);
+ mover.style.top = (displayOffset * th) + "px";
+ code.style.height = (doc.height * th + 2 * paddingTop()) + "px";
+
+ // Since this is all rather error prone, it is honoured with the
+ // only assertion in the whole file.
+ if (lineDiv.childNodes.length != showingTo - showingFrom)
+ throw new Error("BAD PATCH! " + JSON.stringify(intact) + " size=" + (showingTo - showingFrom) +
+ " nodes=" + lineDiv.childNodes.length);
+
+ if (options.lineWrapping) {
+ maxWidth = scroller.clientWidth;
+ var curNode = lineDiv.firstChild;
+ doc.iter(showingFrom, showingTo, function(line) {
+ if (!line.hidden) {
+ var height = Math.round(curNode.offsetHeight / th) || 1;
+ if (line.height != height) {updateLineHeight(line, height); gutterDirty = true;}
+ }
+ curNode = curNode.nextSibling;
+ });
+ } else {
+ if (maxWidth == null) maxWidth = stringWidth(maxLine);
+ if (maxWidth > scroller.clientWidth) {
+ lineSpace.style.width = maxWidth + "px";
+ // Needed to prevent odd wrapping/hiding of widgets placed in here.
+ code.style.width = "";
+ code.style.width = scroller.scrollWidth + "px";
+ } else {
+ lineSpace.style.width = code.style.width = "";
+ }
+ }
+ gutter.style.display = gutterDisplay;
+ if (different || gutterDirty) updateGutter();
+ updateCursor();
+ }
+
+ function computeIntact(intact, changes) {
for (var i = 0, l = changes.length || 0; i < l; ++i) {
var change = changes[i], intact2 = [], diff = change.diff || 0;
for (var j = 0, l2 = intact.length; j < l2; ++j) {
var range = intact[j];
- if (change.to <= range.from)
- intact2.push({from: range.from + diff, to: range.to + diff, domStart: range.domStart});
- else if (range.to <= change.from)
+ if (change.to <= range.from && change.diff)
+ intact2.push({from: range.from + diff, to: range.to + diff,
+ domStart: range.domStart});
+ else if (change.to <= range.from || change.from >= range.to)
intact2.push(range);
else {
if (change.from > range.from)
- intact2.push({from: range.from, to: change.from, domStart: range.domStart})
+ intact2.push({from: range.from, to: change.from, domStart: range.domStart});
if (change.to < range.to)
intact2.push({from: change.to + diff, to: range.to + diff,
domStart: range.domStart + (change.to - range.from)});
@@ -723,158 +930,90 @@ var CodeMirror = (function() {
}
intact = intact2;
}
+ return intact;
+ }
- // Then, determine which lines we'd want to see, and which
- // updates have to be made to get there.
- var visible = visibleLines();
- var from = Math.min(showingFrom, Math.max(visible.from - 3, 0)),
- to = Math.min(lines.length, Math.max(showingTo, visible.to + 3)),
- updates = [], domPos = 0, domEnd = showingTo - showingFrom, pos = from, changedLines = 0;
-
- for (var i = 0, l = intact.length; i < l; ++i) {
- var range = intact[i];
- if (range.to <= from) continue;
- if (range.from >= to) break;
- if (range.domStart > domPos || range.from > pos) {
- updates.push({from: pos, to: range.from, domSize: range.domStart - domPos, domStart: domPos});
- changedLines += range.from - pos;
+ function patchDisplay(from, to, intact) {
+ // The first pass removes the DOM nodes that aren't intact.
+ if (!intact.length) lineDiv.innerHTML = "";
+ else {
+ function killNode(node) {
+ var tmp = node.nextSibling;
+ node.parentNode.removeChild(node);
+ return tmp;
}
- pos = range.to;
- domPos = range.domStart + (range.to - range.from);
- }
- if (domPos != domEnd || pos != to) {
- changedLines += Math.abs(to - pos);
- updates.push({from: pos, to: to, domSize: domEnd - domPos, domStart: domPos});
- }
-
- if (!updates.length) return;
- lineDiv.style.display = "none";
- // If more than 30% of the screen needs update, just do a full
- // redraw (which is quicker than patching)
- if (changedLines > (visible.to - visible.from) * .3)
- refreshDisplay(from = Math.max(visible.from - 10, 0), to = Math.min(visible.to + 7, lines.length));
- // Otherwise, only update the stuff that needs updating.
- else
- patchDisplay(updates);
- lineDiv.style.display = "";
-
- // Position the mover div to align with the lines it's supposed
- // to be showing (which will cover the visible display)
- var different = from != showingFrom || to != showingTo || lastHeight != scroller.clientHeight;
- showingFrom = from; showingTo = to;
- mover.style.top = (from * lineHeight()) + "px";
- if (different) {
- lastHeight = scroller.clientHeight;
- code.style.height = (lines.length * lineHeight() + 2 * paddingTop()) + "px";
- updateGutter();
- }
-
- if (maxWidth == null) maxWidth = stringWidth(maxLine);
- if (maxWidth > scroller.clientWidth) {
- lineSpace.style.width = maxWidth + "px";
- // Needed to prevent odd wrapping/hiding of widgets placed in here.
- code.style.width = "";
- code.style.width = scroller.scrollWidth + "px";
- } else {
- lineSpace.style.width = code.style.width = "";
+ var domPos = 0, curNode = lineDiv.firstChild, n;
+ for (var i = 0; i < intact.length; ++i) {
+ var cur = intact[i];
+ while (cur.domStart > domPos) {curNode = killNode(curNode); domPos++;}
+ for (var j = 0, e = cur.to - cur.from; j < e; ++j) {curNode = curNode.nextSibling; domPos++;}
+ }
+ while (curNode) curNode = killNode(curNode);
}
-
- // Since this is all rather error prone, it is honoured with the
- // only assertion in the whole file.
- if (lineDiv.childNodes.length != showingTo - showingFrom)
- throw new Error("BAD PATCH! " + JSON.stringify(updates) + " size=" + (showingTo - showingFrom) +
- " nodes=" + lineDiv.childNodes.length);
- updateCursor();
- }
-
- function refreshDisplay(from, to) {
- var html = [], start = {line: from, ch: 0}, inSel = posLess(sel.from, start) && !posLess(sel.to, start);
- for (var i = from; i < to; ++i) {
+ // This pass fills in the lines that actually changed.
+ var nextIntact = intact.shift(), curNode = lineDiv.firstChild, j = from;
+ var sfrom = sel.from.line, sto = sel.to.line, inSel = sfrom < from && sto >= from;
+ var scratch = targetDocument.createElement("div"), newElt;
+ doc.iter(from, to, function(line) {
var ch1 = null, ch2 = null;
if (inSel) {
ch1 = 0;
- if (sel.to.line == i) {inSel = false; ch2 = sel.to.ch;}
- }
- else if (sel.from.line == i) {
- if (sel.to.line == i) {ch1 = sel.from.ch; ch2 = sel.to.ch;}
+ if (sto == j) {inSel = false; ch2 = sel.to.ch;}
+ } else if (sfrom == j) {
+ if (sto == j) {ch1 = sel.from.ch; ch2 = sel.to.ch;}
else {inSel = true; ch1 = sel.from.ch;}
}
- html.push(lines[i].getHTML(ch1, ch2, true));
- }
- lineDiv.innerHTML = html.join("");
- }
- function patchDisplay(updates) {
- // Slightly different algorithm for IE (badInnerHTML), since
- // there .innerHTML on PRE nodes is dumb, and discards
- // whitespace.
- var sfrom = sel.from.line, sto = sel.to.line, off = 0,
- scratch = badInnerHTML && targetDocument.createElement("div");
- for (var i = 0, e = updates.length; i < e; ++i) {
- var rec = updates[i];
- var extra = (rec.to - rec.from) - rec.domSize;
- var nodeAfter = lineDiv.childNodes[rec.domStart + rec.domSize + off] || null;
- if (badInnerHTML)
- for (var j = Math.max(-extra, rec.domSize); j > 0; --j)
- lineDiv.removeChild(nodeAfter ? nodeAfter.previousSibling : lineDiv.lastChild);
- else if (extra) {
- for (var j = Math.max(0, extra); j > 0; --j)
- lineDiv.insertBefore(targetDocument.createElement("pre"), nodeAfter);
- for (var j = Math.max(0, -extra); j > 0; --j)
- lineDiv.removeChild(nodeAfter ? nodeAfter.previousSibling : lineDiv.lastChild);
- }
- var node = lineDiv.childNodes[rec.domStart + off], inSel = sfrom < rec.from && sto >= rec.from;
- for (var j = rec.from; j < rec.to; ++j) {
- var ch1 = null, ch2 = null;
- if (inSel) {
- ch1 = 0;
- if (sto == j) {inSel = false; ch2 = sel.to.ch;}
- }
- else if (sfrom == j) {
- if (sto == j) {ch1 = sel.from.ch; ch2 = sel.to.ch;}
- else {inSel = true; ch1 = sel.from.ch;}
- }
- if (badInnerHTML) {
- scratch.innerHTML = lines[j].getHTML(ch1, ch2, true);
- lineDiv.insertBefore(scratch.firstChild, nodeAfter);
- }
- else {
- node.innerHTML = lines[j].getHTML(ch1, ch2, false);
- node.className = lines[j].className || "";
- node = node.nextSibling;
- }
+ if (nextIntact && nextIntact.to == j) nextIntact = intact.shift();
+ if (!nextIntact || nextIntact.from > j) {
+ if (line.hidden) scratch.innerHTML = "<pre></pre>";
+ else scratch.innerHTML = line.getHTML(ch1, ch2, true);
+ lineDiv.insertBefore(scratch.firstChild, curNode);
+ } else {
+ curNode = curNode.nextSibling;
}
- off += extra;
- }
+ ++j;
+ });
}
function updateGutter() {
if (!options.gutter && !options.lineNumbers) return;
var hText = mover.offsetHeight, hEditor = scroller.clientHeight;
gutter.style.height = (hText - hEditor < 2 ? hEditor : hText) + "px";
- var html = [];
- for (var i = showingFrom; i < Math.max(showingTo, showingFrom + 1); ++i) {
- var marker = lines[i].gutterMarker;
- var text = options.lineNumbers ? i + options.firstLineNumber : null;
- if (marker && marker.text)
- text = marker.text.replace("%N%", text != null ? text : "");
- else if (text == null)
- text = "\u00a0";
- html.push((marker && marker.style ? '<pre class="' + marker.style + '">' : "<pre>"), text, "</pre>");
- }
+ var html = [], i = showingFrom;
+ doc.iter(showingFrom, Math.max(showingTo, showingFrom + 1), function(line) {
+ if (line.hidden) {
+ html.push("<pre></pre>");
+ } else {
+ var marker = line.gutterMarker;
+ var text = options.lineNumbers ? i + options.firstLineNumber : null;
+ if (marker && marker.text)
+ text = marker.text.replace("%N%", text != null ? text : "");
+ else if (text == null)
+ text = "\u00a0";
+ html.push((marker && marker.style ? '<pre class="' + marker.style + '">' : "<pre>"), text);
+ for (var j = 1; j < line.height; ++j) html.push("<br> ");
+ html.push("</pre>");
+ }
+ ++i;
+ });
gutter.style.display = "none";
gutterText.innerHTML = html.join("");
- var minwidth = String(lines.length).length, firstNode = gutterText.firstChild, val = eltText(firstNode), pad = "";
+ var minwidth = String(doc.size).length, firstNode = gutterText.firstChild, val = eltText(firstNode), pad = "";
while (val.length + pad.length < minwidth) pad += "\u00a0";
if (pad) firstNode.insertBefore(targetDocument.createTextNode(pad), firstNode.firstChild);
gutter.style.display = "";
lineSpace.style.marginLeft = gutter.offsetWidth + "px";
+ gutterDirty = false;
}
function updateCursor() {
- var head = sel.inverted ? sel.from : sel.to, lh = lineHeight();
- var x = charX(head.line, head.ch) + "px", y = (head.line - showingFrom) * lh + "px";
- inputDiv.style.top = (head.line * lh - scroller.scrollTop) + "px";
+ var head = sel.inverted ? sel.from : sel.to, lh = textHeight();
+ var pos = localCoords(head, true);
+ var globalY = pos.y + displayOffset * textHeight();
+ inputDiv.style.top = Math.max(Math.min(globalY, scroller.offsetHeight), 0) + "px";
+ inputDiv.style.left = (pos.x - scroller.scrollLeft) + "px";
if (posEq(sel.from, sel.to)) {
- cursor.style.top = y; cursor.style.left = x;
+ cursor.style.top = pos.y + "px";
+ cursor.style.left = (options.lineWrapping ? Math.min(pos.x, lineSpace.offsetWidth) : pos.x) + "px";
cursor.style.display = "";
}
else cursor.style.display = "none";
@@ -892,9 +1031,14 @@ var CodeMirror = (function() {
// updateLines, since they have to be expressed in the line
// numbers before the update.
function setSelection(from, to, oldFrom, oldTo) {
+ if (oldFrom == null) {oldFrom = sel.from.line; oldTo = sel.to.line;}
if (posEq(sel.from, from) && posEq(sel.to, to)) return;
if (posLess(to, from)) {var tmp = to; to = from; from = tmp;}
+ // Skip over hidden lines.
+ if (from.line != oldFrom) from = skipHidden(from, oldFrom, sel.from.ch);
+ if (to.line != oldTo) to = skipHidden(to, oldTo, sel.to.ch);
+
if (posEq(from, to)) sel.inverted = false;
else if (posEq(from, sel.to)) sel.inverted = false;
else if (posEq(to, sel.from)) sel.inverted = true;
@@ -902,7 +1046,6 @@ var CodeMirror = (function() {
// Some ugly logic used to only mark the lines that actually did
// see a change in selection as changed, rather than the whole
// selected range.
- if (oldFrom == null) {oldFrom = sel.from.line; oldTo = sel.to.line;}
if (posEq(from, to)) {
if (!posEq(sel.from, sel.to))
changes.push({from: oldFrom, to: oldTo + 1});
@@ -927,42 +1070,61 @@ var CodeMirror = (function() {
sel.from = from; sel.to = to;
selectionChanged = true;
}
+ function skipHidden(pos, oldLine, oldCh) {
+ function getNonHidden(dir) {
+ var lNo = pos.line + dir, end = dir == 1 ? doc.size : -1;
+ while (lNo != end) {
+ var line = getLine(lNo);
+ if (!line.hidden) {
+ var ch = pos.ch;
+ if (ch > oldCh || ch > line.text.length) ch = line.text.length;
+ return {line: lNo, ch: ch};
+ }
+ lNo += dir;
+ }
+ }
+ var line = getLine(pos.line);
+ if (!line.hidden) return pos;
+ if (pos.line >= oldLine) return getNonHidden(1) || getNonHidden(-1);
+ else return getNonHidden(-1) || getNonHidden(1);
+ }
function setCursor(line, ch, user) {
var pos = clipPos({line: line, ch: ch || 0});
(user ? setSelectionUser : setSelection)(pos, pos);
}
- function clipLine(n) {return Math.max(0, Math.min(n, lines.length-1));}
+ function clipLine(n) {return Math.max(0, Math.min(n, doc.size-1));}
function clipPos(pos) {
if (pos.line < 0) return {line: 0, ch: 0};
- if (pos.line >= lines.length) return {line: lines.length-1, ch: lines[lines.length-1].text.length};
- var ch = pos.ch, linelen = lines[pos.line].text.length;
+ if (pos.line >= doc.size) return {line: doc.size-1, ch: getLine(doc.size-1).text.length};
+ var ch = pos.ch, linelen = getLine(pos.line).text.length;
if (ch == null || ch > linelen) return {line: pos.line, ch: linelen};
else if (ch < 0) return {line: pos.line, ch: 0};
else return pos;
}
function scrollPage(down) {
- var linesPerPage = Math.floor(scroller.clientHeight / lineHeight()), head = sel.inverted ? sel.from : sel.to;
- setCursor(head.line + (Math.max(linesPerPage - 1, 1) * (down ? 1 : -1)), head.ch, true);
+ var linesPerPage = Math.floor(scroller.clientHeight / textHeight()), head = sel.inverted ? sel.from : sel.to;
+ var target = heightAtLine(doc, head.line) + (Math.max(linesPerPage - 1, 1) * (down ? 1 : -1));
+ setCursor(lineAtHeight(doc, target), head.ch, true);
}
function scrollEnd(top) {
- var pos = top ? {line: 0, ch: 0} : {line: lines.length - 1, ch: lines[lines.length-1].text.length};
+ var pos = top ? {line: 0, ch: 0} : {line: doc.size - 1, ch: getLine(doc.size-1).text.length};
setSelectionUser(pos, pos);
}
function selectAll() {
- var endLine = lines.length - 1;
- setSelection({line: 0, ch: 0}, {line: endLine, ch: lines[endLine].text.length});
+ var endLine = doc.size - 1;
+ setSelection({line: 0, ch: 0}, {line: endLine, ch: getLine(endLine).text.length});
}
function selectWordAt(pos) {
- var line = lines[pos.line].text;
+ var line = getLine(pos.line).text;
var start = pos.ch, end = pos.ch;
while (start > 0 && /\w/.test(line.charAt(start - 1))) --start;
while (end < line.length && /\w/.test(line.charAt(end))) ++end;
setSelectionUser({line: pos.line, ch: start}, {line: pos.line, ch: end});
}
function selectLine(line) {
- setSelectionUser({line: line, ch: 0}, {line: line, ch: lines[line].text.length});
+ setSelectionUser({line: line, ch: 0}, {line: line, ch: getLine(line).text.length});
}
function handleEnter() {
replaceSelection("\n", "end");
@@ -994,6 +1156,10 @@ var CodeMirror = (function() {
}
return true;
}
+ function smartHome() {
+ var firstNonWS = Math.max(0, getLine(sel.from.line).text.search(/\S/));
+ setCursor(sel.from.line, sel.from.ch <= firstNonWS && sel.from.ch ? 0 : firstNonWS, true);
+ }
function indentLine(n, how) {
if (how == "smart") {
@@ -1001,9 +1167,9 @@ var CodeMirror = (function() {
else var state = getStateBefore(n);
}
- var line = lines[n], curSpace = line.indentation(), curSpaceString = line.text.match(/^\s*/)[0], indentation;
+ var line = getLine(n), curSpace = line.indentation(), curSpaceString = line.text.match(/^\s*/)[0], indentation;
if (how == "prev") {
- if (n) indentation = lines[n-1].indentation();
+ if (n) indentation = getLine(n-1).indentation();
else indentation = 0;
}
else if (how == "smart") indentation = mode.indent(state, line.text.slice(curSpaceString.length));
@@ -1028,87 +1194,148 @@ var CodeMirror = (function() {
function loadMode() {
mode = CodeMirror.getMode(options, options.mode);
- for (var i = 0, l = lines.length; i < l; ++i)
- lines[i].stateAfter = null;
+ doc.iter(0, doc.size, function(line) { line.stateAfter = null; });
work = [0];
startWorker();
}
function gutterChanged() {
var visible = options.gutter || options.lineNumbers;
gutter.style.display = visible ? "" : "none";
- if (visible) updateGutter();
+ if (visible) gutterDirty = true;
else lineDiv.parentNode.style.marginLeft = 0;
}
+ function wrappingChanged(from, to) {
+ if (options.lineWrapping) {
+ wrapper.className += " CodeMirror-wrap";
+ var perLine = scroller.clientWidth / charWidth() - 3;
+ doc.iter(0, doc.size, function(line) {
+ if (line.hidden) return;
+ var guess = Math.ceil(line.text.length / perLine) || 1;
+ if (guess != 1) updateLineHeight(line, guess);
+ });
+ lineSpace.style.width = code.style.width = "";
+ } else {
+ wrapper.className = wrapper.className.replace(" CodeMirror-wrap", "");
+ maxWidth = null; maxLine = "";
+ doc.iter(0, doc.size, function(line) {
+ if (line.height != 1 && !line.hidden) updateLineHeight(line, 1);
+ if (line.text.length > maxLine.length) maxLine = line.text;
+ });
+ }
+ changes.push({from: 0, to: doc.size});
+ }
+
+ function TextMarker() { this.set = []; }
+ TextMarker.prototype.clear = operation(function() {
+ for (var i = 0, e = this.set.length; i < e; ++i) {
+ var mk = this.set[i].marked;
+ if (!mk) continue;
+ for (var j = 0; j < mk.length; ++j)
+ if (mk[j].set == this.set) mk.splice(j--, 1);
+ }
+ // We don't know the exact lines that changed. Refreshing is
+ // cheaper than finding them.
+ changes.push({from: 0, to: doc.size});
+ });
+ TextMarker.prototype.find = function() {
+ var from, to;
+ for (var i = 0, e = this.set.length; i < e; ++i) {
+ var line = this.set[i], mk = line.marked;
+ for (var j = 0; j < mk.length; ++j) {
+ var mark = mk[j];
+ if (mark.set == this.set) {
+ if (mark.from != null || mark.to != null) {
+ var found = lineNo(line);
+ if (found != null) {
+ if (mark.from != null) from = {line: found, ch: mark.from};
+ if (mark.to != null) to = {line: found, ch: mark.to};
+ }
+ }
+ }
+ }
+ }
+ return {from: from, to: to};
+ };
function markText(from, to, className) {
from = clipPos(from); to = clipPos(to);
- var accum = [];
+ var tm = new TextMarker();
function add(line, from, to, className) {
- var line = lines[line], mark = line.addMark(from, to, className);
- mark.line = line;
- accum.push(mark);
+ mark = getLine(line).addMark(new MarkedText(from, to, className, tm.set));
}
if (from.line == to.line) add(from.line, from.ch, to.ch, className);
else {
add(from.line, from.ch, null, className);
for (var i = from.line + 1, e = to.line; i < e; ++i)
- add(i, 0, null, className);
- add(to.line, 0, to.ch, className);
+ add(i, null, null, className);
+ add(to.line, null, to.ch, className);
}
changes.push({from: from.line, to: to.line + 1});
- return function() {
- var start, end;
- for (var i = 0; i < accum.length; ++i) {
- var mark = accum[i], found = indexOf(lines, mark.line);
- mark.line.removeMark(mark);
- if (found > -1) {
- if (start == null) start = found;
- end = found;
- }
- }
- if (start != null) changes.push({from: start, to: end + 1});
- };
+ return tm;
+ }
+
+ function setBookmark(pos) {
+ pos = clipPos(pos);
+ var bm = new Bookmark(pos.ch);
+ getLine(pos.line).addMark(bm);
+ return bm;
}
function addGutterMarker(line, text, className) {
- if (typeof line == "number") line = lines[clipLine(line)];
+ if (typeof line == "number") line = getLine(clipLine(line));
line.gutterMarker = {text: text, style: className};
- updateGutter();
+ gutterDirty = true;
return line;
}
function removeGutterMarker(line) {
- if (typeof line == "number") line = lines[clipLine(line)];
+ if (typeof line == "number") line = getLine(clipLine(line));
line.gutterMarker = null;
- updateGutter();
+ gutterDirty = true;
}
- function setLineClass(line, className) {
- if (typeof line == "number") {
- var no = line;
- line = lines[clipLine(line)];
- }
- else {
- var no = indexOf(lines, line);
- if (no == -1) return null;
- }
- if (line.className != className) {
- line.className = className;
- changes.push({from: no, to: no + 1});
- }
+
+ function changeLine(handle, op) {
+ var no = handle, line = handle;
+ if (typeof handle == "number") line = getLine(clipLine(handle));
+ else no = lineNo(handle);
+ if (no == null) return null;
+ if (op(line, no)) changes.push({from: no, to: no + 1});
return line;
}
+ function setLineClass(handle, className) {
+ return changeLine(handle, function(line) {
+ if (line.className != className) {
+ line.className = className;
+ return true;
+ }
+ });
+ }
+ function setLineHidden(handle, hidden) {
+ return changeLine(handle, function(line, no) {
+ if (line.hidden != hidden) {
+ line.hidden = hidden;
+ updateLineHeight(line, hidden ? 0 : 1);
+ if (hidden && (sel.from.line == no || sel.to.line == no))
+ setSelection(skipHidden(sel.from, sel.from.line, sel.from.ch),
+ skipHidden(sel.to, sel.to.line, sel.to.ch));
+ return (gutterDirty = true);
+ }
+ });
+ }
function lineInfo(line) {
if (typeof line == "number") {
+ if (!isLine(line)) return null;
var n = line;
- line = lines[line];
+ line = getLine(line);
if (!line) return null;
}
else {
- var n = indexOf(lines, line);
- if (n == -1) return null;
+ var n = lineNo(line);
+ if (n == null) return null;
}
var marker = line.gutterMarker;
- return {line: n, text: line.text, markerText: marker && marker.text, markerClass: marker && marker.style};
+ return {line: n, handle: line, text: line.text, markerText: marker && marker.text,
+ markerClass: marker && marker.style, lineClass: line.className};
}
function stringWidth(str) {
@@ -1118,21 +1345,16 @@ var CodeMirror = (function() {
}
// These are used to go from pixel positions to character
// positions, taking varying character widths into account.
- function charX(line, pos) {
- if (pos == 0) return 0;
- measure.innerHTML = "<pre><span>" + lines[line].getHTML(null, null, false, pos) + "</span></pre>";
- return measure.firstChild.firstChild.offsetWidth;
- }
function charFromX(line, x) {
if (x <= 0) return 0;
- var lineObj = lines[line], text = lineObj.text;
+ var lineObj = getLine(line), text = lineObj.text;
function getX(len) {
measure.innerHTML = "<pre><span>" + lineObj.getHTML(null, null, false, len) + "</span></pre>";
return measure.firstChild.firstChild.offsetWidth;
}
var from = 0, fromX = 0, to = text.length, toX;
// Guess a suitable upper bound for our search.
- var estimated = Math.min(to, Math.ceil(x / stringWidth("x")));
+ var estimated = Math.min(to, Math.ceil(x / charWidth()));
for (;;) {
var estX = getX(estimated);
if (estX <= x && estimated < to) estimated = Math.min(to, Math.ceil(estimated * 1.2));
@@ -1151,20 +1373,93 @@ var CodeMirror = (function() {
}
}
+ var tempId = Math.floor(Math.random() * 0xffffff).toString(16);
+ function measureLine(line, ch) {
+ var extra = "";
+ // Include extra text at the end to make sure the measured line is wrapped in the right way.
+ if (options.lineWrapping) {
+ var end = line.text.indexOf(" ", ch + 2);
+ extra = line.text.slice(ch + 1, end < 0 ? line.text.length : end + (ie ? 5 : 0));
+ }
+ measure.innerHTML = "<pre>" + line.getHTML(null, null, false, ch) +
+ '<span id="CodeMirror-temp-' + tempId + '">' + (line.text.charAt(ch) || " ") + "</span>" +
+ extra + "</pre>";
+ var elt = document.getElementById("CodeMirror-temp-" + tempId);
+ var top = elt.offsetTop, left = elt.offsetLeft;
+ // Older IEs report zero offsets for spans directly after a wrap
+ if (ie && ch && top == 0 && left == 0) {
+ var backup = document.createElement("span");
+ backup.innerHTML = "x";
+ elt.parentNode.insertBefore(backup, elt.nextSibling);
+ top = backup.offsetTop;
+ }
+ return {top: top, left: left};
+ }
function localCoords(pos, inLineWrap) {
- var lh = lineHeight(), line = pos.line - (inLineWrap ? showingFrom : 0);
- return {x: charX(pos.line, pos.ch), y: line * lh, yBot: (line + 1) * lh};
+ var x, lh = textHeight(), y = lh * (heightAtLine(doc, pos.line) - (inLineWrap ? displayOffset : 0));
+ if (pos.ch == 0) x = 0;
+ else {
+ var sp = measureLine(getLine(pos.line), pos.ch);
+ x = sp.left;
+ if (options.lineWrapping) y += Math.max(0, sp.top);
+ }
+ return {x: x, y: y, yBot: y + lh};
+ }
+ // Coords must be lineSpace-local
+ function coordsChar(x, y) {
+ if (y < 0) y = 0;
+ var th = textHeight(), cw = charWidth(), heightPos = displayOffset + Math.floor(y / th);
+ var lineNo = lineAtHeight(doc, heightPos);
+ if (lineNo >= doc.size) return {line: doc.size - 1, ch: 0};
+ var lineObj = getLine(lineNo), text = lineObj.text;
+ var tw = options.lineWrapping, innerOff = tw ? heightPos - heightAtLine(doc, lineNo) : 0;
+ if (x <= 0 && innerOff == 0) return {line: lineNo, ch: 0};
+ function getX(len) {
+ var sp = measureLine(lineObj, len);
+ if (tw) {
+ var off = Math.round(sp.top / th);
+ return Math.max(0, sp.left + (off - innerOff) * scroller.clientWidth);
+ }
+ return sp.left;
+ }
+ var from = 0, fromX = 0, to = text.length, toX;
+ // Guess a suitable upper bound for our search.
+ var estimated = Math.min(to, Math.ceil((x + innerOff * scroller.clientWidth * .9) / cw));
+ for (;;) {
+ var estX = getX(estimated);
+ if (estX <= x && estimated < to) estimated = Math.min(to, Math.ceil(estimated * 1.2));
+ else {toX = estX; to = estimated; break;}
+ }
+ if (x > toX) return {line: lineNo, ch: to};
+ // Try to guess a suitable lower bound as well.
+ estimated = Math.floor(to * 0.8); estX = getX(estimated);
+ if (estX < x) {from = estimated; fromX = estX;}
+ // Do a binary search between these bounds.
+ for (;;) {
+ if (to - from <= 1) return {line: lineNo, ch: (toX - x > x - fromX) ? from : to};
+ var middle = Math.ceil((from + to) / 2), middleX = getX(middle);
+ if (middleX > x) {to = middle; toX = middleX;}
+ else {from = middle; fromX = middleX;}
+ }
}
function pageCoords(pos) {
var local = localCoords(pos, true), off = eltOffset(lineSpace);
return {x: off.left + local.x, y: off.top + local.y, yBot: off.top + local.yBot};
}
- function lineHeight() {
- var nlines = lineDiv.childNodes.length;
- if (nlines) return (lineDiv.offsetHeight / nlines) || 1;
- measure.innerHTML = "<pre>x</pre>";
- return measure.firstChild.offsetHeight || 1;
+ var cachedHeight, cachedFor;
+ function textHeight() {
+ var offsetHeight = lineDiv.offsetHeight;
+ if (offsetHeight == cachedFor) return cachedHeight;
+ cachedFor = offsetHeight;
+ measure.innerHTML = "<pre>x<br>x<br>x<br>x<br>x<br>x<br>x<br>x<br>x<br>x</pre>";
+ return (cachedHeight = measure.firstChild.offsetHeight / 10 || 1);
+ }
+ var cachedWidth, cachedFor = 0;
+ function charWidth() {
+ if (scroller.clientWidth == cachedFor) return cachedWidth;
+ cachedFor = scroller.clientWidth;
+ return (cachedWidth = stringWidth("x"));
}
function paddingTop() {return lineSpace.offsetTop;}
function paddingLeft() {return lineSpace.offsetLeft;}
@@ -1179,8 +1474,7 @@ var CodeMirror = (function() {
if (!liberal && (x - offW.left > scroller.clientWidth || y - offW.top > scroller.clientHeight))
return null;
var offL = eltOffset(lineSpace, true);
- var line = showingFrom + Math.floor((y - offL.top) / lineHeight());
- return clipPos({line: line, ch: charFromX(clipLine(line), x - offL.left)});
+ return coordsChar(x - offL.left, y - offL.top);
}
function onContextMenu(e) {
var pos = posFromMouse(e);
@@ -1190,8 +1484,8 @@ var CodeMirror = (function() {
var oldCSS = input.style.cssText;
inputDiv.style.position = "absolute";
- input.style.cssText = "position: fixed; width: 30px; height: 30px; top: " + (e_pageY(e) - 1) +
- "px; left: " + (e_pageX(e) - 1) + "px; z-index: 1000; background: white; " +
+ input.style.cssText = "position: fixed; width: 30px; height: 30px; top: " + (e.clientY - 5) +
+ "px; left: " + (e.clientX - 5) + "px; z-index: 1000; background: white; " +
"border-width: 0; outline: none; overflow: hidden; opacity: .05; filter: alpha(opacity=5);";
leaveInputAlone = true;
var val = input.value = getSelection();
@@ -1206,7 +1500,7 @@ var CodeMirror = (function() {
prepareInput();
slowPoll();
}
-
+
if (gecko) {
e_stop(e);
var mouseup = connect(window, "mouseup", function() {
@@ -1231,7 +1525,7 @@ var CodeMirror = (function() {
var matching = {"(": ")>", ")": "(<", "[": "]>", "]": "[<", "{": "}>", "}": "{<"};
function matchBrackets(autoclear) {
- var head = sel.inverted ? sel.from : sel.to, line = lines[head.line], pos = head.ch - 1;
+ var head = sel.inverted ? sel.from : sel.to, line = getLine(head.line), pos = head.ch - 1;
var match = (pos >= 0 && matching[line.text.charAt(pos)]) || matching[line.text.charAt(++pos)];
if (!match) return;
var ch = match.charAt(0), forward = match.charAt(1) == ">", d = forward ? 1 : -1, st = line.styles;
@@ -1255,18 +1549,16 @@ var CodeMirror = (function() {
}
}
}
- for (var i = head.line, e = forward ? Math.min(i + 100, lines.length) : Math.max(-1, i - 100); i != e; i+=d) {
- var line = lines[i], first = i == head.line;
+ for (var i = head.line, e = forward ? Math.min(i + 100, doc.size) : Math.max(-1, i - 100); i != e; i+=d) {
+ var line = getLine(i), first = i == head.line;
var found = scan(line, first && forward ? pos + 1 : 0, first && !forward ? pos : line.text.length);
if (found) break;
}
if (!found) found = {pos: null, match: false};
var style = found.match ? "CodeMirror-matchingbracket" : "CodeMirror-nonmatchingbracket";
var one = markText({line: head.line, ch: pos}, {line: head.line, ch: pos+1}, style),
- two = found.pos != null
- ? markText({line: i, ch: found.pos}, {line: i, ch: found.pos + 1}, style)
- : function() {};
- var clear = operation(function(){one(); two();});
+ two = found.pos != null && markText({line: i, ch: found.pos}, {line: i, ch: found.pos + 1}, style);
+ var clear = operation(function(){one.clear(); two && two.clear();});
if (autoclear) setTimeout(clear, 800);
else bracketHighlighted = clear;
}
@@ -1280,66 +1572,69 @@ var CodeMirror = (function() {
var minindent, minline;
for (var search = n, lim = n - 40; search > lim; --search) {
if (search == 0) return 0;
- var line = lines[search-1];
+ var line = getLine(search-1);
if (line.stateAfter) return search;
var indented = line.indentation();
if (minline == null || minindent > indented) {
- minline = search;
+ minline = search - 1;
minindent = indented;
}
}
return minline;
}
function getStateBefore(n) {
- var start = findStartLine(n), state = start && lines[start-1].stateAfter;
+ var start = findStartLine(n), state = start && getLine(start-1).stateAfter;
if (!state) state = startState(mode);
else state = copyState(mode, state);
- for (var i = start; i < n; ++i) {
- var line = lines[i];
+ doc.iter(start, n, function(line) {
line.highlight(mode, state);
line.stateAfter = copyState(mode, state);
- }
- if (n < lines.length && !lines[n].stateAfter) work.push(n);
+ });
+ if (start < n) changes.push({from: start, to: n});
+ if (n < doc.size && !getLine(n).stateAfter) work.push(n);
return state;
}
function highlightLines(start, end) {
var state = getStateBefore(start);
- for (var i = start; i < end; ++i) {
- var line = lines[i];
+ doc.iter(start, end, function(line) {
line.highlight(mode, state);
line.stateAfter = copyState(mode, state);
- }
+ });
}
function highlightWorker() {
var end = +new Date + options.workTime;
var foundWork = work.length;
while (work.length) {
- if (!lines[showingFrom].stateAfter) var task = showingFrom;
+ if (!getLine(showingFrom).stateAfter) var task = showingFrom;
else var task = work.pop();
- if (task >= lines.length) continue;
- var start = findStartLine(task), state = start && lines[start-1].stateAfter;
+ if (task >= doc.size) continue;
+ var start = findStartLine(task), state = start && getLine(start-1).stateAfter;
if (state) state = copyState(mode, state);
else state = startState(mode);
- var unchanged = 0, compare = mode.compareStates;
- for (var i = start, l = lines.length; i < l; ++i) {
- var line = lines[i], hadState = line.stateAfter;
+ var unchanged = 0, compare = mode.compareStates, realChange = false,
+ i = start, bail = false;
+ doc.iter(i, doc.size, function(line) {
+ var hadState = line.stateAfter;
if (+new Date > end) {
work.push(i);
startWorker(options.workDelay);
- changes.push({from: task, to: i + 1});
- return;
+ if (realChange) changes.push({from: task, to: i + 1});
+ return (bail = true);
}
var changed = line.highlight(mode, state);
+ if (changed) realChange = true;
line.stateAfter = copyState(mode, state);
if (compare) {
- if (hadState && compare(hadState, state)) break;
+ if (hadState && compare(hadState, state)) return true;
} else {
- if (changed || !hadState) unchanged = 0;
- else if (++unchanged > 3) break;
+ if (changed !== false || !hadState) unchanged = 0;
+ else if (++unchanged > 3) return true;
}
- }
- changes.push({from: task, to: i + 1});
+ ++i;
+ });
+ if (bail) return;
+ if (realChange) changes.push({from: task, to: i + 1});
}
if (foundWork && options.onHighlightComplete)
options.onHighlightComplete(instance);
@@ -1360,9 +1655,12 @@ var CodeMirror = (function() {
var reScroll = false;
if (selectionChanged) reScroll = !scrollCursorIntoView();
if (changes.length) updateDisplay(changes);
- else if (selectionChanged) updateCursor();
+ else {
+ if (selectionChanged) updateCursor();
+ if (gutterDirty) updateGutter();
+ }
if (reScroll) scrollCursorIntoView();
- if (selectionChanged) restartBlink();
+ if (selectionChanged) {scrollEditorIntoView(); restartBlink();}
// updateInput can be set to a boolean value to force/prevent an
// update.
@@ -1406,7 +1704,7 @@ var CodeMirror = (function() {
if (typeof query != "string") // Regexp match
this.matches = function(reverse, pos) {
if (reverse) {
- var line = lines[pos.line].text.slice(0, pos.ch), match = line.match(query), start = 0;
+ var line = getLine(pos.line).text.slice(0, pos.ch), match = line.match(query), start = 0;
while (match) {
var ind = line.indexOf(match[0]);
start += ind;
@@ -1418,7 +1716,7 @@ var CodeMirror = (function() {
}
}
else {
- var line = lines[pos.line].text.slice(pos.ch), match = line.match(query),
+ var line = getLine(pos.line).text.slice(pos.ch), match = line.match(query),
start = match && pos.ch + line.indexOf(match[0]);
}
if (match)
@@ -1433,7 +1731,7 @@ var CodeMirror = (function() {
// Different methods for single-line and multi-line queries
if (target.length == 1)
this.matches = function(reverse, pos) {
- var line = fold(lines[pos.line].text), len = query.length, match;
+ var line = fold(getLine(pos.line).text), len = query.length, match;
if (reverse ? (pos.ch >= len && (match = line.lastIndexOf(query, pos.ch - len)) != -1)
: (match = line.indexOf(query, pos.ch)) != -1)
return {from: {line: pos.line, ch: match},
@@ -1441,14 +1739,14 @@ var CodeMirror = (function() {
};
else
this.matches = function(reverse, pos) {
- var ln = pos.line, idx = (reverse ? target.length - 1 : 0), match = target[idx], line = fold(lines[ln].text);
+ var ln = pos.line, idx = (reverse ? target.length - 1 : 0), match = target[idx], line = fold(getLine(ln).text);
var offsetA = (reverse ? line.indexOf(match) + match.length : line.lastIndexOf(match));
if (reverse ? offsetA >= pos.ch || offsetA != match.length
: offsetA <= pos.ch || offsetA != line.length - match.length)
return;
for (;;) {
- if (reverse ? !ln : ln == lines.length - 1) return;
- line = fold(lines[ln += reverse ? -1 : 1].text);
+ if (reverse ? !ln : ln == doc.size - 1) return;
+ line = fold(getLine(ln += reverse ? -1 : 1).text);
match = target[reverse ? --idx : ++idx];
if (idx > 0 && idx < target.length - 1) {
if (line != match) return;
@@ -1484,10 +1782,10 @@ var CodeMirror = (function() {
}
if (reverse) {
if (!pos.line) return savePosAndFail(0);
- pos = {line: pos.line-1, ch: lines[pos.line-1].text.length};
+ pos = {line: pos.line-1, ch: getLine(pos.line-1).text.length};
}
else {
- if (pos.line == lines.length - 1) return savePosAndFail(lines.length);
+ if (pos.line == doc.size - 1) return savePosAndFail(doc.size);
pos = {line: pos.line+1, ch: 0};
}
}
@@ -1523,10 +1821,13 @@ var CodeMirror = (function() {
enterMode: "indent",
electricChars: true,
onKeyEvent: null,
+ lineWrapping: false,
lineNumbers: false,
gutter: false,
+ fixedGutter: false,
firstLineNumber: 1,
readOnly: false,
+ smartHome: true,
onChange: null,
onCursorActivity: null,
onGutterClick: null,
@@ -1537,6 +1838,7 @@ var CodeMirror = (function() {
workDelay: 200,
undoDepth: 40,
tabindex: null,
+ pollForIME: false,
document: window.document
};
@@ -1572,7 +1874,7 @@ var CodeMirror = (function() {
CodeMirror.listMIMEs = function() {
var list = [];
for (var m in mimeModes)
- if (mimeModes.propertyIsEnumerable(m)) list.push(m);
+ if (mimeModes.propertyIsEnumerable(m)) list.push({mime: m, mode: mimeModes[m]});
return list;
};
@@ -1634,11 +1936,11 @@ var CodeMirror = (function() {
}
return nstate;
}
- CodeMirror.startState = startState;
+ CodeMirror.copyState = copyState;
function startState(mode, a1, a2) {
return mode.startState ? mode.startState(a1, a2) : true;
}
- CodeMirror.copyState = copyState;
+ CodeMirror.startState = startState;
// The character stream used by a mode's parser.
function StringStream(string) {
@@ -1660,7 +1962,7 @@ var CodeMirror = (function() {
if (ok) {++this.pos; return ch;}
},
eatWhile: function(match) {
- var start = this.start;
+ var start = this.pos;
while (this.eat(match)){}
return this.pos > start;
},
@@ -1695,18 +1997,98 @@ var CodeMirror = (function() {
};
CodeMirror.StringStream = StringStream;
+ function MarkedText(from, to, className, set) {
+ this.from = from; this.to = to; this.style = className; this.set = set;
+ }
+ MarkedText.prototype = {
+ attach: function(line) { this.set.push(line); },
+ detach: function(line) {
+ var ix = indexOf(this.set, line);
+ if (ix > -1) this.set.splice(ix, 1);
+ },
+ split: function(pos, lenBefore) {
+ if (this.to <= pos && this.to != null) return null;
+ var from = this.from < pos || this.from == null ? null : this.from - pos + lenBefore;
+ var to = this.to == null ? null : this.to - pos + lenBefore;
+ return new MarkedText(from, to, this.style, this.set);
+ },
+ dup: function() { return new MarkedText(null, null, this.style, this.set); },
+ clipTo: function(fromOpen, from, toOpen, to, diff) {
+ if (this.from != null && this.from >= from)
+ this.from = Math.max(to, this.from) + diff;
+ if (this.to != null && this.to > from)
+ this.to = to < this.to ? this.to + diff : from;
+ if (fromOpen && to > this.from && (to < this.to || this.to == null))
+ this.from = null;
+ if (toOpen && (from < this.to || this.to == null) && (from > this.from || this.from == null))
+ this.to = null;
+ },
+ isDead: function() { return this.from != null && this.to != null && this.from >= this.to; },
+ sameSet: function(x) { return this.set == x.set; }
+ };
+
+ function Bookmark(pos) {
+ this.from = pos; this.to = pos; this.line = null;
+ }
+ Bookmark.prototype = {
+ attach: function(line) { this.line = line; },
+ detach: function(line) { if (this.line == line) this.line = null; },
+ split: function(pos, lenBefore) {
+ if (pos < this.from) {
+ this.from = this.to = (this.from - pos) + lenBefore;
+ return this;
+ }
+ },
+ isDead: function() { return this.from > this.to; },
+ clipTo: function(fromOpen, from, toOpen, to, diff) {
+ if ((fromOpen || from < this.from) && (toOpen || to > this.to)) {
+ this.from = 0; this.to = -1;
+ } else if (this.from > from) {
+ this.from = this.to = Math.max(to, this.from) + diff;
+ }
+ },
+ sameSet: function(x) { return false; },
+ find: function() {
+ if (!this.line || !this.line.parent) return null;
+ return {line: lineNo(this.line), ch: this.from};
+ },
+ clear: function() {
+ if (this.line) {
+ var found = indexOf(this.line.marked, this);
+ if (found != -1) this.line.marked.splice(found, 1);
+ this.line = null;
+ }
+ }
+ };
+
// Line objects. These hold state related to a line, including
// highlighting info (the styles array).
function Line(text, styles) {
this.styles = styles || [text, null];
- this.stateAfter = null;
this.text = text;
+ this.height = 1;
this.marked = this.gutterMarker = this.className = null;
+ this.stateAfter = this.parent = this.hidden = null;
+ }
+ Line.inheritMarks = function(text, orig) {
+ var ln = new Line(text), mk = orig.marked;
+ if (mk) {
+ for (var i = 0; i < mk.length; ++i) {
+ if (mk[i].to == null && mk[i].style) {
+ var newmk = ln.marked || (ln.marked = []), mark = mk[i];
+ var nmark = mark.dup(); newmk.push(nmark); nmark.attach(ln);
+ }
+ }
+ }
+ return ln;
}
Line.prototype = {
// Replace a piece of a line, keeping the styles around it intact.
- replace: function(from, to, text) {
- var st = [], mk = this.marked;
+ replace: function(from, to_, text) {
+ // Reset line class if the whole text was replaced.
+ if (!from && (to_ == null || to_ == this.text.length))
+ this.className = this.gutterMarker = null;
+ var st = [], mk = this.marked, to = to_ == null ? this.text.length : to_;
copyStyles(0, from, this.styles, st);
if (text) st.push(text, null);
copyStyles(to, this.text.length, this.styles, st);
@@ -1714,34 +2096,79 @@ var CodeMirror = (function() {
this.text = this.text.slice(0, from) + text + this.text.slice(to);
this.stateAfter = null;
if (mk) {
- var diff = text.length - (to - from), end = this.text.length;
- function fix(n) {return n <= Math.min(to, to + diff) ? n : n + diff;}
- for (var i = 0; i < mk.length; ++i) {
- var mark = mk[i], del = false;
- if (mark.from >= end) del = true;
- else {mark.from = fix(mark.from); if (mark.to != null) mark.to = fix(mark.to);}
- if (del || mark.from >= mark.to) {mk.splice(i, 1); i--;}
+ var diff = text.length - (to - from);
+ for (var i = 0, mark = mk[i]; i < mk.length; ++i) {
+ mark.clipTo(from == null, from || 0, to_ == null, to, diff);
+ if (mark.isDead()) {mark.detach(this); mk.splice(i--, 1);}
}
}
},
- // Split a line in two, again keeping styles intact.
+ // Split a part off a line, keeping styles and markers intact.
split: function(pos, textBefore) {
- var st = [textBefore, null];
+ var st = [textBefore, null], mk = this.marked;
copyStyles(pos, this.text.length, this.styles, st);
- return new Line(textBefore + this.text.slice(pos), st);
+ var taken = new Line(textBefore + this.text.slice(pos), st);
+ if (mk) {
+ for (var i = 0; i < mk.length; ++i) {
+ var mark = mk[i];
+ var newmark = mark.split(pos, textBefore.length);
+ if (newmark) {
+ if (!taken.marked) taken.marked = [];
+ taken.marked.push(newmark); newmark.attach(taken);
+ }
+ }
+ }
+ return taken;
},
- addMark: function(from, to, style) {
- var mk = this.marked, mark = {from: from, to: to, style: style};
- if (this.marked == null) this.marked = [];
- this.marked.push(mark);
- this.marked.sort(function(a, b){return a.from - b.from;});
- return mark;
+ append: function(line) {
+ var mylen = this.text.length, mk = line.marked, mymk = this.marked;
+ this.text += line.text;
+ copyStyles(0, line.text.length, line.styles, this.styles);
+ if (mymk) {
+ for (var i = 0; i < mymk.length; ++i)
+ if (mymk[i].to == null) mymk[i].to = mylen;
+ }
+ if (mk && mk.length) {
+ if (!mymk) this.marked = mymk = [];
+ outer: for (var i = 0; i < mk.length; ++i) {
+ var mark = mk[i];
+ if (!mark.from) {
+ for (var j = 0; j < mymk.length; ++j) {
+ var mymark = mymk[j];
+ if (mymark.to == mylen && mymark.sameSet(mark)) {
+ mymark.to = mark.to == null ? null : mark.to + mylen;
+ if (mymark.isDead()) {
+ mymark.detach(this);
+ mk.splice(i--, 1);
+ }
+ continue outer;
+ }
+ }
+ }
+ mymk.push(mark);
+ mark.attach(this);
+ mark.from += mylen;
+ if (mark.to != null) mark.to += mylen;
+ }
+ }
},
- removeMark: function(mark) {
- var mk = this.marked;
+ fixMarkEnds: function(other) {
+ var mk = this.marked, omk = other.marked;
if (!mk) return;
- for (var i = 0; i < mk.length; ++i)
- if (mk[i] == mark) {mk.splice(i, 1); break;}
+ for (var i = 0; i < mk.length; ++i) {
+ var mark = mk[i], close = mark.to == null;
+ if (close && omk) {
+ for (var j = 0; j < omk.length; ++j)
+ if (omk[j].sameSet(mark)) {close = false; break;}
+ }
+ if (close) mark.to = this.text.length;
+ }
+ },
+ addMark: function(mark) {
+ mark.attach(this);
+ if (this.marked == null) this.marked = [];
+ this.marked.push(mark);
+ this.marked.sort(function(a, b){return (a.from || 0) - (b.from || 0);});
},
// Run the given mode's parser over a line, update the styles
// array, which contains alternating fragments of text and CSS
@@ -1769,10 +2196,10 @@ var CodeMirror = (function() {
}
if (st.length != pos) {st.length = pos; changed = true;}
if (pos && st[pos-2] != prevWord) changed = true;
- // Short lines with simple highlights always count as changed,
- // because they are likely to highlight the same way in various
- // contexts.
- return changed || (st.length < 5 && this.text.length < 10);
+ // Short lines with simple highlights return null, and are
+ // counted as changed by the driver because they are likely to
+ // highlight the same way in various contexts.
+ return changed || (st.length < 5 && this.text.length < 10 ? null : false);
},
// Fetch the parser token for a given character. Useful for hacks
// that want to inspect the mode state (say, for completion).
@@ -1792,11 +2219,14 @@ var CodeMirror = (function() {
// Produces an HTML fragment for the line, taking selection,
// marking, and highlighting into account.
getHTML: function(sfrom, sto, includePre, endAt) {
- var html = [];
+ var html = [], first = true;
if (includePre)
html.push(this.className ? '<pre class="' + this.className + '">': "<pre>");
function span(text, style) {
if (!text) return;
+ // Work around a bug where, in some compat modes, IE ignores leading spaces
+ if (first && ie && text.charAt(0) == " ") text = "\u00a0" + text.slice(1);
+ first = false;
if (style) html.push('<span class="', style, '">', htmlEscape(text), "</span>");
else html.push(htmlEscape(text));
}
@@ -1809,10 +2239,10 @@ var CodeMirror = (function() {
span(" ", sfrom != null && sto == null ? "CodeMirror-selected" : null);
else if (!marked && sfrom == null)
for (var i = 0, ch = 0; ch < len; i+=2) {
- var str = st[i], l = str.length;
+ var str = st[i], style = st[i+1], l = str.length;
if (ch + l > len) str = str.slice(0, len - ch);
ch += l;
- span(str, "cm-" + st[i+1]);
+ span(str, style && "cm-" + style);
}
else {
var pos = 0, i = 0, text = "", style, sg = 0;
@@ -1856,6 +2286,11 @@ var CodeMirror = (function() {
}
if (includePre) html.push("</pre>");
return html.join("");
+ },
+ cleanUp: function() {
+ this.parent = null;
+ if (this.marked)
+ for (var i = 0, e = this.marked.length; i < e; ++i) this.marked[i].detach(this);
}
};
// Utility used by replace and split above
@@ -1874,6 +2309,191 @@ var CodeMirror = (function() {
}
}
+ // Data structure that holds the sequence of lines.
+ function LeafChunk(lines) {
+ this.lines = lines;
+ this.parent = null;
+ for (var i = 0, e = lines.length, height = 0; i < e; ++i) {
+ lines[i].parent = this;
+ height += lines[i].height;
+ }
+ this.height = height;
+ }
+ LeafChunk.prototype = {
+ chunkSize: function() { return this.lines.length; },
+ remove: function(at, n) {
+ for (var i = at, e = at + n; i < e; ++i) {
+ var line = this.lines[i];
+ line.cleanUp();
+ this.height -= line.height;
+ }
+ this.lines.splice(at, n);
+ },
+ collapse: function(lines) {
+ lines.splice.apply(lines, [lines.length, 0].concat(this.lines));
+ },
+ insertHeight: function(at, lines, height) {
+ this.height += height;
+ this.lines.splice.apply(this.lines, [at, 0].concat(lines));
+ for (var i = 0, e = lines.length; i < e; ++i) lines[i].parent = this;
+ },
+ iterN: function(at, n, op) {
+ for (var e = at + n; at < e; ++at)
+ if (op(this.lines[at])) return true;
+ }
+ };
+ function BranchChunk(children) {
+ this.children = children;
+ var size = 0, height = 0;
+ for (var i = 0, e = children.length; i < e; ++i) {
+ var ch = children[i];
+ size += ch.chunkSize(); height += ch.height;
+ ch.parent = this;
+ }
+ this.size = size;
+ this.height = height;
+ this.parent = null;
+ }
+ BranchChunk.prototype = {
+ chunkSize: function() { return this.size; },
+ remove: function(at, n) {
+ this.size -= n;
+ for (var i = 0; i < this.children.length; ++i) {
+ var child = this.children[i], sz = child.chunkSize();
+ if (at < sz) {
+ var rm = Math.min(n, sz - at), oldHeight = child.height;
+ child.remove(at, rm);
+ this.height -= oldHeight - child.height;
+ if (sz == rm) { this.children.splice(i--, 1); child.parent = null; }
+ if ((n -= rm) == 0) break;
+ at = 0;
+ } else at -= sz;
+ }
+ if (this.size - n < 25) {
+ var lines = [];
+ this.collapse(lines);
+ this.children = [new LeafChunk(lines)];
+ }
+ },
+ collapse: function(lines) {
+ for (var i = 0, e = this.children.length; i < e; ++i) this.children[i].collapse(lines);
+ },
+ insert: function(at, lines) {
+ var height = 0;
+ for (var i = 0, e = lines.length; i < e; ++i) height += lines[i].height;
+ this.insertHeight(at, lines, height);
+ },
+ insertHeight: function(at, lines, height) {
+ this.size += lines.length;
+ this.height += height;
+ for (var i = 0, e = this.children.length; i < e; ++i) {
+ var child = this.children[i], sz = child.chunkSize();
+ if (at <= sz) {
+ child.insertHeight(at, lines, height);
+ if (child.lines && child.lines.length > 50) {
+ while (child.lines.length > 50) {
+ var spilled = child.lines.splice(child.lines.length - 25, 25);
+ var newleaf = new LeafChunk(spilled);
+ child.height -= newleaf.height;
+ this.children.splice(i + 1, 0, newleaf);
+ newleaf.parent = this;
+ }
+ this.maybeSpill();
+ }
+ break;
+ }
+ at -= sz;
+ }
+ },
+ maybeSpill: function() {
+ if (this.children.length <= 10) return;
+ var me = this;
+ do {
+ var spilled = me.children.splice(me.children.length - 5, 5);
+ var sibling = new BranchChunk(spilled);
+ if (!me.parent) { // Become the parent node
+ var copy = new BranchChunk(me.children);
+ copy.parent = me;
+ me.children = [copy, sibling];
+ me = copy;
+ } else {
+ me.size -= sibling.size;
+ me.height -= sibling.height;
+ var myIndex = indexOf(me.parent.children, me);
+ me.parent.children.splice(myIndex + 1, 0, sibling);
+ }
+ sibling.parent = me.parent;
+ } while (me.children.length > 10);
+ me.parent.maybeSpill();
+ },
+ iter: function(from, to, op) { this.iterN(from, to - from, op); },
+ iterN: function(at, n, op) {
+ for (var i = 0, e = this.children.length; i < e; ++i) {
+ var child = this.children[i], sz = child.chunkSize();
+ if (at < sz) {
+ var used = Math.min(n, sz - at);
+ if (child.iterN(at, used, op)) return true;
+ if ((n -= used) == 0) break;
+ at = 0;
+ } else at -= sz;
+ }
+ }
+ };
+
+ function getLineAt(chunk, n) {
+ for (;;) {
+ for (var i = 0, e = chunk.children.length; i < e; ++i) {
+ var child = chunk.children[i], sz = child.chunkSize();
+ if (n < sz) { chunk = child; break; }
+ n -= sz;
+ }
+ if (chunk.lines) return chunk.lines[n];
+ }
+ }
+ function lineNo(line) {
+ if (line.parent == null) return null;
+ var cur = line.parent, no = indexOf(cur.lines, line);
+ for (var chunk = cur.parent; chunk; cur = chunk, chunk = chunk.parent) {
+ for (var i = 0, e = chunk.children.length; ; ++i) {
+ if (chunk.children[i] == cur) break;
+ no += chunk.children[i].chunkSize();
+ }
+ }
+ return no;
+ }
+ function lineAtHeight(chunk, h) {
+ var n = 0;
+ outer: do {
+ for (var i = 0, e = chunk.children.length; i < e; ++i) {
+ var child = chunk.children[i], ch = child.height;
+ if (h < ch) { chunk = child; continue outer; }
+ h -= ch;
+ n += child.chunkSize();
+ }
+ return n;
+ } while (!chunk.lines);
+ for (var i = 0, e = chunk.lines.length; i < e; ++i) {
+ var line = chunk.lines[i], lh = line.height;
+ if (h < lh) break;
+ h -= lh;
+ }
+ return n + i;
+ }
+ function heightAtLine(chunk, n) {
+ var h = 0;
+ outer: do {
+ for (var i = 0, e = chunk.children.length; i < e; ++i) {
+ var child = chunk.children[i], sz = child.chunkSize();
+ if (n < sz) { chunk = child; continue outer; }
+ n -= sz;
+ h += child.height;
+ }
+ return h;
+ } while (!chunk.lines);
+ for (var i = 0; i < n; ++i) h += chunk.lines[i].height;
+ return h;
+ }
+
// The history object 'chunks' changes that are made close together
// and at almost the same time into bigger undoable units.
function History() {
@@ -1930,16 +2550,6 @@ var CodeMirror = (function() {
else if (e.button & 2) return 3;
else if (e.button & 4) return 2;
}
- function e_pageX(e) {
- if (e.pageX != null) return e.pageX;
- var doc = e_target(e).ownerDocument;
- return e.clientX + doc.body.scrollLeft + doc.documentElement.scrollLeft;
- }
- function e_pageY(e) {
- if (e.pageY != null) return e.pageY;
- var doc = e_target(e).ownerDocument;
- return e.clientY + doc.body.scrollTop + doc.documentElement.scrollTop;
- }
// Event handler registration. If disconnect is true, it'll return a
// function that unregisters the handler.
@@ -1958,16 +2568,18 @@ var CodeMirror = (function() {
function Delayed() {this.id = null;}
Delayed.prototype = {set: function(ms, f) {clearTimeout(this.id); this.id = setTimeout(f, ms);}};
- // Some IE versions don't preserve whitespace when setting the
- // innerHTML of a PRE tag.
- var badInnerHTML = (function() {
- var pre = document.createElement("pre");
- pre.innerHTML = " "; return !pre.innerHTML;
- })();
+ // Detect drag-and-drop
+ var dragAndDrop = function() {
+ // IE8 has ondragstart and ondrop properties, but doesn't seem to
+ // actually support ondragstart the way it's supposed to work.
+ if (/MSIE [1-8]\b/.test(navigator.userAgent)) return false;
+ var div = document.createElement('div');
+ return "draggable" in div;
+ }();
var gecko = /gecko\/\d{7}/i.test(navigator.userAgent);
var ie = /MSIE \d/.test(navigator.userAgent);
- var safari = /Apple Computer/.test(navigator.vendor);
+ var webkit = /WebKit\//.test(navigator.userAgent);
var lineSep = "\n";
// Feature-detect whether newlines in textareas are converted to \r\n
@@ -1979,6 +2591,7 @@ var CodeMirror = (function() {
var tabSize = 8;
var mac = /Mac/.test(navigator.platform);
+ var win = /Win/.test(navigator.platform);
var movementKeys = {};
for (var i = 35; i <= 40; ++i)
movementKeys[i] = movementKeys["c" + i] = true;
@@ -2001,21 +2614,44 @@ var CodeMirror = (function() {
if (elt.currentStyle) return elt.currentStyle;
return window.getComputedStyle(elt, null);
}
+
// Find the position of an element by following the offsetParent chain.
// If screen==true, it returns screen (rather than page) coordinates.
function eltOffset(node, screen) {
- var doc = node.ownerDocument.body;
- var x = 0, y = 0, skipDoc = false;
+ var bod = node.ownerDocument.body;
+ var x = 0, y = 0, skipBody = false;
for (var n = node; n; n = n.offsetParent) {
- x += n.offsetLeft; y += n.offsetTop;
+ var ol = n.offsetLeft, ot = n.offsetTop;
+ // Firefox reports weird inverted offsets when the body has a border.
+ if (n == bod) { x += Math.abs(ol); y += Math.abs(ot); }
+ else { x += ol, y += ot; }
if (screen && computedStyle(n).position == "fixed")
- skipDoc = true;
+ skipBody = true;
}
- var e = screen && !skipDoc ? null : doc;
+ var e = screen && !skipBody ? null : bod;
for (var n = node.parentNode; n != e; n = n.parentNode)
if (n.scrollLeft != null) { x -= n.scrollLeft; y -= n.scrollTop;}
return {left: x, top: y};
}
+ // Use the faster and saner getBoundingClientRect method when possible.
+ if (document.documentElement.getBoundingClientRect != null) eltOffset = function(node, screen) {
+ // Take the parts of bounding client rect that we are interested in so we are able to edit if need be,
+ // since the returned value cannot be changed externally (they are kept in sync as the element moves within the page)
+ try { var box turned value cannot be changed externally (they are kept in sync as the element moves within the page) ; �� �� u�AA�* �
CA�* cA�* ��^B�* Ж�� ��B�* ���� ���� k BA�* 6 � � ! � ! `��� Ж�� x�^B�* ���� ��AA�* � BA�* `��� `�AA�* ���� ���B�* u�AA�* ��B�* ؤ�B�* ���B�* �
CA�* x�^B�* ���� ���� k BA�* �! �! `��� �� H~>B�* ���� ��AA�* � BA�* `��� `�AA�* ���� ���� ���� 8 cA�* �p� �� u�AA�* �
CA�* ���� p��� k BA�* G H I J K M N O P `��� Ж�� H5B�* @��� ��AA�* � BA�* `��� 0��B�* u�AA�* �^B�* �i�A�* ��B�* ؤ�B�* ���B�* �
CA�* H5B�* @��� ���� k BA�* 85B�* @��� ���� k BA�* (5B�* @��� ���� k BA�* 5B�* @��� ��� k BA�* ���B�* u�AA�* ���B�* ���� ���A�* e�AA�* ؤ�B�* ���� y��A�* e�AA�* ��B�* ���� Z��A�* e�AA�* �d�A�* �^B�* �i�A�* ��B�* ��^B�* ؤ�B�* ���B�* �
CA�* 8 cA�* -�A�* Ж�� p��A�* ���� `��� k BA�* 5 6 7 8 : < = > ? @ B D `��� Ж�� �-�A�* Ж�� u�AA�* cA�* ��� -�A�* e�AA�* cA�* �_@f �S Q��l�� �C�A�* Ж�� �-�A�* ���� p��� k BA�* u]�� 4Q��U^Qʉ� �u������*ēv`��� Ж�� H~�A�* ��A�* ��� ��%C�* ��%C�* ��A�* ���� З�� ���� �� �^B�* u�AA�* ��^B�* P��� ��%C�* ��� ���� ����������%C�* ؖ�� = node.getBoundingClientRect(); box = { top: box.top, left: box.left }; }
+ catch(e) { box = {top: 0, left: 0}; }
+ if (!screen) {
+ // Get the toplevel scroll, working around browser differences.
+ if (window.pageYOffset == null) {
+ var t = document.documentElement || document.body.parentNode;
+ if (t.scrollTop == null) t = document.body;
+ box.top += t.scrollTop; box.left += t.scrollLeft;
+ } else {
+ box.top += window.pageYOffset; box.left += window.pageXOffset;
+ }
+ }
+ return box;
+ };
+
// Get a node's text content.
function eltText(node) {
return node.textContent || node.innerText || node.nodeValue || "";
@@ -2026,11 +2662,17 @@ var CodeMirror = (function() {
function posLess(a, b) {return a.line < b.line || (a.line == b.line && a.ch < b.ch);}
function copyPos(x) {return {line: x.line, ch: x.ch};}
- var escapeElement = document.createElement("div");
+ var escapeElement = document.createElement("pre");
function htmlEscape(str) {
- escapeElement.innerText = escapeElement.textContent = str;
+ if (badTextContent) {
+ escapeElement.innerHTML = "";
+ escapeElement.appendChild(document.createTextNode(str));
+ } else {
+ escapeElement.textContent = str;
+ }
return escapeElement.innerHTML;
}
+ var badTextContent = htmlEscape("\t") != "\t";
CodeMirror.htmlEscape = htmlEscape;
// Used to position the cursor after an undo/redo by finding the
@@ -2073,7 +2715,7 @@ var CodeMirror = (function() {
try {return {start: te.selectionStart, end: te.selectionEnd};}
catch(e) {return null;}
};
- if (safari)
+ if (webkit)
// On Safari, selection set with setSelectionRange are in a sort
// of limbo wrt their anchor. If you press shift-left in them,
// the anchor is put at the end, and the selection expanded to
@@ -2140,5 +2782,4 @@ var CodeMirror = (function() {
CodeMirror.defineMIME("text/plain", "null");
return CodeMirror;
-})()
-;
\ No newline at end of file
+})();
diff --git a/js/functions.js b/js/functions.js
index c9574a1..12c6a65 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -2053,7 +2053,7 @@ $(document).ready(function() {
//Sort the table
$(tables_table).PMA_sort_table('th');
-
+
// Adjust summary row
PMA_adjustTotals();
}
@@ -3434,7 +3434,13 @@ $(document).ready(function() {
$(document).ready(function() {
var elm = $('#sqlquery');
if (elm.length > 0 && typeof CodeMirror != 'undefined') {
- codemirror_editor = CodeMirror.fromTextArea(elm[0], {lineNumbers: true, matchBrackets: true, indentUnit: 4, mode: "text/x-mysql"});
+ codemirror_editor = CodeMirror.fromTextArea(elm[0], {
+ lineNumbers: true,
+ matchBrackets: true,
+ indentUnit: 4,
+ mode: "text/x-mysql",
+ lineWrapping: true
+ });
}
});
@@ -3645,11 +3651,11 @@ $(document).ready(function () {
/**
* Toggles row colors of a set of 'tr' elements starting from a given element
- *
+ *
* @param $start Starting element
*/
-function toggleRowColors($start)
-{
+function toggleRowColors($start)
+{
for (var $curr_row = $start; $curr_row.length > 0; $curr_row = $curr_row.next()) {
if ($curr_row.hasClass('odd')) {
$curr_row.removeClass('odd').addClass('even');
diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php
index 71fa37e..5b5dd1c 100644
--- a/themes/original/css/theme_right.css.php
+++ b/themes/original/css/theme_right.css.php
@@ -2198,12 +2198,16 @@ fieldset .disabled-field td {
}
.CodeMirror-scroll {
- height: <?php echo ceil($GLOBALS['cfg']['TextareaRows'] * 1.2); ?>em;
overflow: auto;
+ height: <?php echo ceil($GLOBALS['cfg']['TextareaRows'] * 1.2); ?>em;
+ /* This is needed to prevent an IE[67] bug where the scrolled content
+ is visible outside of the scrolling box. */
+ position: relative;
}
.CodeMirror-gutter {
position: absolute; left: 0; top: 0;
+ z-index: 10;
background-color: #f7f7f7;
border-right: 1px solid #eee;
min-width: 2em;
@@ -2213,6 +2217,7 @@ fieldset .disabled-field td {
color: #aaa;
text-align: right;
padding: .4em .2em .4em .4em;
+ white-space: pre !important;
}
.CodeMirror-lines {
padding: .4em;
@@ -2227,6 +2232,16 @@ fieldset .disabled-field td {
font-family: inherit;
font-size: inherit;
padding: 0; margin: 0;
+ white-space: pre;
+ word-wrap: normal;
+}
+
+.CodeMirror-wrap pre {
+ word-wrap: break-word;
+ white-space: pre-wrap;
+}
+.CodeMirror-wrap .CodeMirror-scroll {
+ overflow-x: hidden;
}
.CodeMirror textarea {
diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php
index 8cce259..0e01c47 100644
--- a/themes/pmahomme/css/theme_right.css.php
+++ b/themes/pmahomme/css/theme_right.css.php
@@ -2620,10 +2620,14 @@ fieldset .disabled-field td {
.CodeMirror-scroll {
overflow: auto;
height: <?php echo ceil($GLOBALS['cfg']['TextareaRows'] * 1.2); ?>em;
+ /* This is needed to prevent an IE[67] bug where the scrolled content
+ is visible outside of the scrolling box. */
+ position: relative;
}
.CodeMirror-gutter {
position: absolute; left: 0; top: 0;
+ z-index: 10;
background-color: #f7f7f7;
border-right: 1px solid #eee;
min-width: 2em;
@@ -2633,6 +2637,7 @@ fieldset .disabled-field td {
color: #aaa;
text-align: right;
padding: .4em .2em .4em .4em;
+ white-space: pre !important;
}
.CodeMirror-lines {
padding: .4em;
@@ -2647,6 +2652,16 @@ fieldset .disabled-field td {
font-family: inherit;
font-size: inherit;
padding: 0; margin: 0;
+ white-space: pre;
+ word-wrap: normal;
+}
+
+.CodeMirror-wrap pre {
+ word-wrap: break-word;
+ white-space: pre-wrap;
+}
+.CodeMirror-wrap .CodeMirror-scroll {
+ overflow-x: hidden;
}
.CodeMirror textarea {
hooks/post-receive
--
phpMyAdmin
1
0
[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_5, updated. RELEASE_3_5_0BETA1-215-g5d00fdf
by Michal Čihař 27 Jan '12
by Michal Čihař 27 Jan '12
27 Jan '12
The branch, QA_3_5 has been updated
via 5d00fdf3da118fbbffc78b4eeda5e9cd48bf2bf1 (commit)
via 952a181f1fcf1fbcc0ff301111be4ce335f282d7 (commit)
via bda9be54eb9d3d7c6fe052903bcfa945c7f35cb8 (commit)
via ad29ef2de567d2c2a4f2ba155e93ee4a926b8a9a (commit)
via 9b9d3e5cbc59def734181a4bd40a48205651d83b (commit)
from 8e30c72834a64dfa9f984466abe0071208dc6bd9 (commit)
- Log -----------------------------------------------------------------
commit 5d00fdf3da118fbbffc78b4eeda5e9cd48bf2bf1
Author: Michal Čihař <mcihar(a)suse.cz>
Date: Fri Jan 27 11:04:39 2012 +0100
Wrap long lines
commit 952a181f1fcf1fbcc0ff301111be4ce335f282d7
Author: Michal Čihař <mcihar(a)suse.cz>
Date: Fri Jan 27 11:04:11 2012 +0100
Enable line wrapping for SQL editor
commit bda9be54eb9d3d7c6fe052903bcfa945c7f35cb8
Author: Michal Čihař <mcihar(a)suse.cz>
Date: Fri Jan 27 11:04:02 2012 +0100
Whitespace cleanup
commit ad29ef2de567d2c2a4f2ba155e93ee4a926b8a9a
Author: Michal Čihař <mcihar(a)suse.cz>
Date: Fri Jan 27 11:03:22 2012 +0100
Update CSS from CodeMirror 2.18
commit 9b9d3e5cbc59def734181a4bd40a48205651d83b
Author: Michal Čihař <mcihar(a)suse.cz>
Date: Fri Jan 27 11:00:49 2012 +0100
Update CodeMirror to 2.18
This brings lot of fixes and introduces line wrapping. Upgrading to
latest 2.1x should be safe, in future we will want to move to 2.2.
-----------------------------------------------------------------------
Summary of changes:
js/codemirror/lib/codemirror.js | 1525 ++++++++++++++++++++++---------
js/functions.js | 16 +-
themes/original/css/theme_right.css.php | 17 +-
themes/pmahomme/css/theme_right.css.php | 15 +
4 files changed, 1125 insertions(+), 448 deletions(-)
diff --git a/js/codemirror/lib/codemirror.js b/js/codemirror/lib/codemirror.js
index 27bec72..8e9a34e 100644
--- a/js/codemirror/lib/codemirror.js
+++ b/js/codemirror/lib/codemirror.js
@@ -1,3 +1,5 @@
+// CodeMirror v2.18
+
// All functions that need access to the editor's state live inside
// the CodeMirror function. Below that, at the bottom of the file,
// some utilities are defined.
@@ -16,18 +18,19 @@ var CodeMirror = (function() {
var targetDocument = options["document"];
// The element in which the editor lives.
var wrapper = targetDocument.createElement("div");
- wrapper.className = "CodeMirror";
+ wrapper.className = "CodeMirror" + (options.lineWrapping ? " CodeMirror-wrap" : "");
// This mess creates the base DOM structure for the editor.
wrapper.innerHTML =
'<div style="overflow: hidden; position: relative; width: 1px; height: 0px;">' + // Wraps and hides input textarea
- '<textarea style="position: absolute; width: 2px;" wrap="off"></textarea></div>' +
+ '<textarea style="position: absolute; width: 10000px;" wrap="off" ' +
+ 'autocorrect="off" autocapitalize="off"></textarea></div>' +
'<div class="CodeMirror-scroll cm-s-' + options.theme + '">' +
'<div style="position: relative">' + // Set to the height of the text, causes scrolling
- '<div style="position: absolute; height: 0; width: 0; overflow: hidden;"></div>' +
'<div style="position: relative">' + // Moved around its parent to cover visible view
'<div class="CodeMirror-gutter"><div class="CodeMirror-gutter-text"></div></div>' +
// Provides positioning relative to (visible) text origin
'<div class="CodeMirror-lines"><div style="position: relative">' +
+ '<div style="position: absolute; width: 100%; height: 0; overflow: hidden; visibility: hidden"></div>' +
'<pre class="CodeMirror-cursor"> </pre>' + // Absolutely positioned blinky cursor
'<div></div>' + // This DIV contains the actual code
'</div></div></div></div></div>';
@@ -35,21 +38,29 @@ var CodeMirror = (function() {
// I've never seen more elegant code in my life.
var inputDiv = wrapper.firstChild, input = inputDiv.firstChild,
scroller = wrapper.lastChild, code = scroller.firstChild,
- measure = code.firstChild, mover = measure.nextSibling,
- gutter = mover.firstChild, gutterText = gutter.firstChild,
- lineSpace = gutter.nextSibling.firstChild,
- cursor = lineSpace.firstChild, lineDiv = cursor.nextSibling;
+ mover = code.firstChild, gutter = mover.firstChild, gutterText = gutter.firstChild,
+ lineSpace = gutter.nextSibling.firstChild, measure = lineSpace.firstChild,
+ cursor = measure.nextSibling, lineDiv = cursor.nextSibling;
+ if (!webkit) lineSpace.draggable = true;
if (options.tabindex != null) input.tabindex = options.tabindex;
if (!options.gutter && !options.lineNumbers) gutter.style.display = "none";
+ // Check for problem with IE innerHTML not working when we have a
+ // P (or similar) parent node.
+ try { stringWidth("x"); }
+ catch (e) {
+ if (e.message.match(/unknown runtime/i))
+ e = new Error("A CodeMirror inside a P-style element does not work in Internet Explorer. (innerHTML bug)");
+ throw e;
+ }
+
// Delayed object wrap timeouts, making sure only one is active. blinker holds an interval.
var poll = new Delayed(), highlight = new Delayed(), blinker;
- // mode holds a mode API object. lines an array of Line objects
- // (see Line constructor), work an array of lines that should be
- // parsed, and history the undo history (instance of History
- // constructor).
- var mode, lines = [new Line("")], work, history = new History(), focused;
+ // mode holds a mode API object. doc is the tree of Line objects,
+ // work an array of lines that should be parsed, and history the
+ // undo history (instance of History constructor).
+ var mode, doc = new BranchChunk([new LeafChunk([new Line("")])]), work, focused;
loadMode();
// The selection. These are always maintained to point at valid
// positions. Inverted is used to remember that the user is
@@ -59,12 +70,12 @@ var CodeMirror = (function() {
// whether the user is holding shift. reducedSelection is a hack
// to get around the fact that we can't create inverted
// selections. See below.
- var shiftSelecting, reducedSelection, lastDoubleClick;
+ var shiftSelecting, reducedSelection, lastClick, lastDoubleClick, draggingText;
// Variables used by startOperation/endOperation to track what
// happened during the operation.
- var updateInput, changes, textChanged, selectionChanged, leaveInputAlone;
+ var updateInput, changes, textChanged, selectionChanged, leaveInputAlone, gutterDirty;
// Current visible range (may be bigger than the view window).
- var showingFrom = 0, showingTo = 0, lastHeight = 0, curKeyId = null;
+ var displayOffset = 0, showingFrom = 0, showingTo = 0, lastHeight = 0, curKeyId = null;
// editing will hold an object describing the things we put in the
// textarea, to help figure out whether something changed.
// bracketHighlighted is used to remember that a backet has been
@@ -76,17 +87,33 @@ var CodeMirror = (function() {
// Initialize the content.
operation(function(){setValue(options.value || ""); updateInput = false;})();
+ var history = new History();
+
+ var slowPollInterval = 2000;
+ // Gecko and Opera Linux do not reliably fire any event when starting an IME compose
+ var alwaysPollForIME = (!win && !mac) && (gecko || window.opera);
+ if (options.pollForIME && alwaysPollForIME) slowPollInterval = 50;
+ function keyMightStartIME(keyCode) {
+ return (win && ((gecko && keyCode == 229) || (window.opera && keyCode == 197))) || (mac && gecko);
+ }
// Register our event handlers.
connect(scroller, "mousedown", operation(onMouseDown));
+ connect(scroller, "dblclick", operation(onDoubleClick));
+ connect(lineSpace, "dragstart", onDragStart);
+ connect(lineSpace, "selectstart", e_preventDefault);
// Gecko browsers fire contextmenu *after* opening the menu, at
// which point we can't mess with it anymore. Context menu is
// handled in onMouseDown for Gecko.
if (!gecko) connect(scroller, "contextmenu", onContextMenu);
- connect(code, "dblclick", operation(onDblClick));
- connect(scroller, "scroll", function() {updateDisplay([]); if (options.onScroll) options.onScroll(instance);});
+ connect(scroller, "scroll", function() {
+ updateDisplay([]);
+ if (options.fixedGutter) gutter.style.left = scroller.scrollLeft + "px";
+ if (options.onScroll) options.onScroll(instance);
+ });
connect(window, "resize", function() {updateDisplay(true);});
connect(input, "keyup", operation(onKeyUp));
+ connect(input, "input", function() {fastPoll(curKeyId);});
connect(input, "keydown", operation(onKeyDown));
connect(input, "keypress", operation(onKeyPress));
connect(input, "focus", onFocus);
@@ -98,44 +125,51 @@ var CodeMirror = (function() {
connect(scroller, "paste", function(){focusInput(); fastPoll();});
connect(input, "paste", function(){fastPoll();});
connect(input, "cut", function(){fastPoll();});
-
- // IE throws unspecified error in certain cases, when
+
+ // IE throws unspecified error in certain cases, when
// trying to access activeElement before onload
var hasFocus; try { hasFocus = (targetDocument.activeElement == input); } catch(e) { }
if (hasFocus) setTimeout(onFocus, 20);
else onBlur();
- function isLine(l) {return l >= 0 && l < lines.length;}
+ function isLine(l) {return l >= 0 && l < doc.size;}
// The instance object that we'll return. Mostly calls out to
// local functions in the CodeMirror function. Some do some extra
// range checking and/or clipping. operation is used to wrap the
// call so that changes it makes are tracked, and the display is
// updated afterwards.
- var instance = {
+ var instance = wrapper.CodeMirror = {
getValue: getValue,
setValue: operation(setValue),
getSelection: getSelection,
replaceSelection: operation(replaceSelection),
focus: function(){focusInput(); onFocus(); fastPoll();},
setOption: function(option, value) {
+ var oldVal = options[option];
options[option] = value;
- if (option == "lineNumbers" || option == "gutter") gutterChanged();
- else if (option == "mode" || option == "indentUnit") loadMode();
+ if (option == "mode" || option == "indentUnit") loadMode();
else if (option == "readOnly" && value == "nocursor") input.blur();
else if (option == "theme") scroller.className = scroller.className.replace(/cm-s-\w+/, "cm-s-" + value);
+ else if (option == "lineWrapping" && oldVal != value) operation(wrappingChanged)();
+ else if (option == "pollForIME" && alwaysPollForIME) slowPollInterval = value ? 50 : 2000;
+ if (option == "lineNumbers" || option == "gutter" || option == "firstLineNumber" || option == "theme")
+ operation(gutterChanged)();
},
getOption: function(option) {return options[option];},
undo: operation(undo),
redo: operation(redo),
- indentLine: operation(function(n) {if (isLine(n)) indentLine(n, "smart");}),
+ indentLine: operation(function(n, dir) {
+ if (isLine(n)) indentLine(n, dir == null ? "smart" : dir ? "add" : "subtract");
+ }),
historySize: function() {return {undo: history.done.length, redo: history.undone.length};},
+ clearHistory: function() {history = new History();},
matchBrackets: operation(function(){matchBrackets(true);}),
- getTokenAt: function(pos) {
+ getTokenAt: operation(function(pos) {
pos = clipPos(pos);
- return lines[pos.line].getTokenAt(mode, getStateBefore(pos.line), pos.ch);
- },
+ return getLine(pos.line).getTokenAt(mode, getStateBefore(pos.line), pos.ch);
+ }),
getStateAfter: function(line) {
- line = clipLine(line == null ? lines.length - 1: line);
+ line = clipLine(line == null ? doc.size - 1: line);
return getStateBefore(line + 1);
},
cursorCoords: function(start){
@@ -145,24 +179,25 @@ var CodeMirror = (function() {
charCoords: function(pos){return pageCoords(clipPos(pos));},
coordsChar: function(coords) {
var off = eltOffset(lineSpace);
- var line = clipLine(Math.min(lines.length - 1, showingFrom + Math.floor((coords.y - off.top) / lineHeight())));
- return clipPos({line: line, ch: charFromX(clipLine(line), coords.x - off.left)});
+ return coordsChar(coords.x - off.left, coords.y - off.top);
},
getSearchCursor: function(query, pos, caseFold) {return new SearchCursor(query, pos, caseFold);},
- markText: operation(function(a, b, c){return operation(markText(a, b, c));}),
- setMarker: addGutterMarker,
- clearMarker: removeGutterMarker,
+ markText: operation(markText),
+ setBookmark: setBookmark,
+ setMarker: operation(addGutterMarker),
+ clearMarker: operation(removeGutterMarker),
setLineClass: operation(setLineClass),
+ hideLine: operation(function(h) {return setLineHidden(h, true);}),
+ showLine: operation(function(h) {return setLineHidden(h, false);}),
lineInfo: lineInfo,
- addWidget: function(pos, node, scroll, where) {
+ addWidget: function(pos, node, scroll, vert, horiz) {
pos = localCoords(clipPos(pos));
var top = pos.yBot, left = pos.x;
node.style.position = "absolute";
code.appendChild(node);
- node.style.left = left + "px";
- if (where == "over") top = pos.y;
- else if (where == "near") {
- var vspace = Math.max(scroller.offsetHeight, lines.length * lineHeight()),
+ if (vert == "over") top = pos.y;
+ else if (vert == "near") {
+ var vspace = Math.max(scroller.offsetHeight, doc.height * textHeight()),
hspace = Math.max(code.clientWidth, lineSpace.clientWidth) - paddingLeft();
if (pos.yBot + node.offsetHeight > vspace && pos.y > node.offsetHeight)
top = pos.y - node.offsetHeight;
@@ -170,12 +205,20 @@ var CodeMirror = (function() {
left = hspace - node.offsetWidth;
}
node.style.top = (top + paddingTop()) + "px";
- node.style.left = (left + paddingLeft()) + "px";
+ node.style.left = node.style.right = "";
+ if (horiz == "right") {
+ left = code.clientWidth - node.offsetWidth;
+ node.style.right = "0px";
+ } else {
+ if (horiz == "left") left = 0;
+ else if (horiz == "middle") left = (code.clientWidth - node.offsetWidth) / 2;
+ node.style.left = (left + paddingLeft()) + "px";
+ }
if (scroll)
scrollIntoView(left, top, left + node.offsetWidth, top + node.offsetHeight);
},
- lineCount: function() {return lines.length;},
+ lineCount: function() {return doc.size;},
getCursor: function(start) {
if (start == null) start = sel.inverted;
return copyPos(start ? sel.from : sel.to);
@@ -186,9 +229,9 @@ var CodeMirror = (function() {
else setCursor(line, ch);
}),
setSelection: operation(function(from, to) {setSelection(clipPos(from), clipPos(to || from));}),
- getLine: function(line) {if (isLine(line)) return lines[line].text;},
+ getLine: function(line) {if (isLine(line)) return getLine(line).text;},
setLine: operation(function(line, text) {
- if (isLine(line)) replaceRange(text, {line: line, ch: 0}, {line: line, ch: lines[line].text.length});
+ if (isLine(line)) replaceRange(text, {line: line, ch: 0}, {line: line, ch: getLine(line).text.length});
}),
removeLine: operation(function(line) {
if (isLine(line)) replaceRange("", {line: line, ch: 0}, clipPos({line: line+1, ch: 0}));
@@ -196,24 +239,41 @@ var CodeMirror = (function() {
replaceRange: operation(replaceRange),
getRange: function(from, to) {return getRange(clipPos(from), clipPos(to));},
+ coordsFromIndex: function(off) {
+ var lineNo = 0, ch;
+ doc.iter(0, doc.size, function(line) {
+ var sz = line.text.length + 1;
+ if (sz > off) { ch = off; return true; }
+ off -= sz;
+ ++lineNo;
+ });
+ return clipPos({line: lineNo, ch: ch});
+ },
+
operation: function(f){return operation(f)();},
refresh: function(){updateDisplay(true);},
getInputField: function(){return input;},
getWrapperElement: function(){return wrapper;},
- getScrollerElement: function(){return scroller;}
+ getScrollerElement: function(){return scroller;},
+ getGutterElement: function(){return gutter;}
};
+ function getLine(n) { return getLineAt(doc, n); }
+ function updateLineHeight(line, height) {
+ gutterDirty = true;
+ var diff = height - line.height;
+ for (var n = line; n; n = n.parent) n.height += diff;
+ }
+
function setValue(code) {
- history = null;
var top = {line: 0, ch: 0};
- updateLines(top, {line: lines.length - 1, ch: lines[lines.length-1].text.length},
+ updateLines(top, {line: doc.size - 1, ch: getLine(doc.size-1).text.length},
splitLines(code), top, top);
- history = new History();
+ updateInput = true;
}
function getValue(code) {
var text = [];
- for (var i = 0, l = lines.length; i < l; ++i)
- text.push(lines[i].text);
+ doc.iter(0, doc.size, function(line) { text.push(line.text); });
return text.join("\n");
}
@@ -221,17 +281,17 @@ var CodeMirror = (function() {
// Check whether this is a click in a widget
for (var n = e_target(e); n != wrapper; n = n.parentNode)
if (n.parentNode == code && n != mover) return;
- var ld = lastDoubleClick; lastDoubleClick = null;
- // First, see if this is a click in the gutter
+
+ // See if this is a click in the gutter
for (var n = e_target(e); n != wrapper; n = n.parentNode)
if (n.parentNode == gutterText) {
if (options.onGutterClick)
- options.onGutterClick(instance, indexOf(gutterText.childNodes, n) + showingFrom);
+ options.onGutterClick(instance, indexOf(gutterText.childNodes, n) + showingFrom, e);
return e_preventDefault(e);
}
var start = posFromMouse(e);
-
+
switch (e_button(e)) {
case 3:
if (gecko && !mac) onContextMenu(e);
@@ -246,18 +306,39 @@ var CodeMirror = (function() {
if (!start) {if (e_target(e) == scroller) e_preventDefault(e); return;}
if (!focused) onFocus();
- e_preventDefault(e);
- if (ld && +new Date - ld < 400) return selectLine(start.line);
- setCursor(start.line, start.ch, true);
+ var now = +new Date;
+ if (lastDoubleClick && lastDoubleClick.time > now - 400 && posEq(lastDoubleClick.pos, start)) {
+ e_preventDefault(e);
+ setTimeout(focusInput, 20);
+ return selectLine(start.line);
+ } else if (lastClick && lastClick.time > now - 400 && posEq(lastClick.pos, start)) {
+ lastDoubleClick = {time: now, pos: start};
+ e_preventDefault(e);
+ return selectWordAt(start);
+ } else { lastClick = {time: now, pos: start}; }
+
var last = start, going;
- // And then we have to see if it's a drag event, in which case
- // the dragged-over text must be selected.
- function end() {
- focusInput();
- updateInput = true;
- move(); up();
+ if (dragAndDrop && !posEq(sel.from, sel.to) &&
+ !posLess(start, sel.from) && !posLess(sel.to, start)) {
+ // Let the drag handler handle this.
+ if (webkit) lineSpace.draggable = true;
+ var up = connect(targetDocument, "mouseup", operation(function(e2) {
+ if (webkit) lineSpace.draggable = false;
+ draggingText = false;
+ up();
+ if (Math.abs(e.clientX - e2.clientX) + Math.abs(e.clientY - e2.clientY) < 10) {
+ e_preventDefault(e2);
+ setCursor(start.line, start.ch, true);
+ focusInput();
+ }
+ }), true);
+ draggingText = true;
+ return;
}
+ e_preventDefault(e);
+ setCursor(start.line, start.ch, true);
+
function extend(e) {
var cur = posFromMouse(e, true);
if (cur && !posEq(cur, last)) {
@@ -281,15 +362,19 @@ var CodeMirror = (function() {
var cur = posFromMouse(e);
if (cur) setSelectionUser(start, cur);
e_preventDefault(e);
- end();
+ focusInput();
+ updateInput = true;
+ move(); up();
}), true);
}
- function onDblClick(e) {
- var pos = posFromMouse(e);
- if (!pos) return;
- selectWordAt(pos);
+ function onDoubleClick(e) {
+ for (var n = e_target(e); n != wrapper; n = n.parentNode)
+ if (n.parentNode == gutterText) return e_preventDefault(e);
+ var start = posFromMouse(e);
+ if (!start) return;
+ lastDoubleClick = {time: +new Date, pos: start};
e_preventDefault(e);
- lastDoubleClick = +new Date;
+ selectWordAt(start);
}
function onDrop(e) {
e.preventDefault();
@@ -300,7 +385,13 @@ var CodeMirror = (function() {
var reader = new FileReader;
reader.onload = function() {
text[i] = reader.result;
- if (++read == n) replaceRange(text.join(""), clipPos(pos), clipPos(pos));
+ if (++read == n) {
+ pos = clipPos(pos);
+ operation(function() {
+ var end = replaceRange(text.join(""), pos, pos);
+ setSelectionUser(pos, end);
+ })();
+ }
};
reader.readAsText(file);
}
@@ -310,11 +401,24 @@ var CodeMirror = (function() {
else {
try {
var text = e.dataTransfer.getData("Text");
- if (text) replaceRange(text, pos, pos);
+ if (text) {
+ var end = replaceRange(text, pos, pos);
+ var curFrom = sel.from, curTo = sel.to;
+ setSelectionUser(pos, end);
+ if (draggingText) replaceRange("", curFrom, curTo);
+ focusInput();
+ }
}
catch(e){}
}
}
+ function onDragStart(e) {
+ var txt = getSelection();
+ // This will reset escapeElement
+ htmlEscape(txt);
+ e.dataTransfer.setDragImage(escapeElement, 0, 0);
+ e.dataTransfer.setData("Text", txt);
+ }
function onKeyDown(e) {
if (!focused) onFocus();
@@ -340,6 +444,7 @@ var CodeMirror = (function() {
if (mod && code == 90) {undo(); return e_preventDefault(e);} // ctrl-z
if (mod && ((e.shiftKey && code == 90) || code == 89)) {redo(); return e_preventDefault(e);} // ctrl-shift-z, ctrl-y
}
+ if (code == 36) { if (options.smartHome) { smartHome(); return e_preventDefault(e); } }
// Key id to use in the movementKeys map. We also pass it to
// fastPoll in order to 'self learn'. We need this because
@@ -347,15 +452,19 @@ var CodeMirror = (function() {
// its start when it is inverted and a movement key is pressed
// (and later restore it again), shouldn't be used for
// non-movement keys.
- curKeyId = (mod ? "c" : "") + code;
- if (sel.inverted && movementKeys.hasOwnProperty(curKeyId)) {
+ curKeyId = (mod ? "c" : "") + (e.altKey ? "a" : "") + code;
+ if (sel.inverted && movementKeys[curKeyId] === true) {
var range = selRange(input);
if (range) {
reducedSelection = {anchor: range.start};
setSelRange(input, range.start, range.start);
}
}
+ // Don't save the key as a movementkey unless it had a modifier
+ if (!mod && !e.altKey) curKeyId = null;
fastPoll(curKeyId);
+
+ if (options.pollForIME && keyMightStartIME(code)) slowPollInterval = 50;
}
function onKeyUp(e) {
if (options.onKeyEvent && options.onKeyEvent(instance, addStop(e))) return;
@@ -364,6 +473,8 @@ var CodeMirror = (function() {
updateInput = true;
}
if (e.keyCode == 16) shiftSelecting = null;
+
+ if (slowPollInterval < 2000 && !alwaysPollForIME) slowPollInterval = 2000;
}
function onKeyPress(e) {
if (options.onKeyEvent && options.onKeyEvent(instance, addStop(e))) return;
@@ -406,7 +517,7 @@ var CodeMirror = (function() {
function updateLines(from, to, newText, selFrom, selTo) {
if (history) {
var old = [];
- for (var i = from.line, e = to.line + 1; i < e; ++i) old.push(lines[i].text);
+ doc.iter(from.line, to.line + 1, function(line) { old.push(line.text); });
history.addChange(from.line, newText.length, old);
while (history.done.length > options.undoDepth) history.done.shift();
}
@@ -416,11 +527,11 @@ var CodeMirror = (function() {
var change = from.pop();
if (change) {
var replaced = [], end = change.start + change.added;
- for (var i = change.start; i < end; ++i) replaced.push(lines[i].text);
+ doc.iter(change.start, end, function(line) { replaced.push(line.text); });
to.push({start: change.start, added: change.old.length, old: replaced});
var pos = clipPos({line: change.start + change.old.length - 1,
ch: editEnd(replaced[replaced.length-1], change.old[change.old.length-1])});
- updateLinesNoUndo({line: change.start, ch: 0}, {line: end - 1, ch: lines[end-1].text.length}, change.old, pos, pos);
+ updateLinesNoUndo({line: change.start, ch: 0}, {line: end - 1, ch: getLine(end-1).text.length}, change.old, pos, pos);
updateInput = true;
}
}
@@ -429,51 +540,66 @@ var CodeMirror = (function() {
function updateLinesNoUndo(from, to, newText, selFrom, selTo) {
var recomputeMaxLength = false, maxLineLength = maxLine.length;
- for (var i = from.line; i <= to.line; ++i) {
- if (lines[i].text.length == maxLineLength) {recomputeMaxLength = true; break;}
- }
+ if (!options.lineWrapping)
+ doc.iter(from.line, to.line, function(line) {
+ if (line.text.length == maxLineLength) {recomputeMaxLength = true; return true;}
+ });
- var nlines = to.line - from.line, firstLine = lines[from.line], lastLine = lines[to.line];
+ var nlines = to.line - from.line, firstLine = getLine(from.line), lastLine = getLine(to.line);
// First adjust the line structure, taking some care to leave highlighting intact.
if (firstLine == lastLine) {
if (newText.length == 1)
firstLine.replace(from.ch, to.ch, newText[0]);
else {
lastLine = firstLine.split(to.ch, newText[newText.length-1]);
- var spliceargs = [from.line + 1, nlines];
- firstLine.replace(from.ch, firstLine.text.length, newText[0]);
- for (var i = 1, e = newText.length - 1; i < e; ++i) spliceargs.push(new Line(newText[i]));
- spliceargs.push(lastLine);
- lines.splice.apply(lines, spliceargs);
+ firstLine.replace(from.ch, null, newText[0]);
+ firstLine.fixMarkEnds(lastLine);
+ var added = [];
+ for (var i = 1, e = newText.length - 1; i < e; ++i)
+ added.push(Line.inheritMarks(newText[i], firstLine));
+ added.push(lastLine);
+ doc.insert(from.line + 1, added);
}
}
else if (newText.length == 1) {
- firstLine.replace(from.ch, firstLine.text.length, newText[0] + lastLine.text.slice(to.ch));
- lines.splice(from.line + 1, nlines);
+ firstLine.replace(from.ch, null, newText[0]);
+ lastLine.replace(null, to.ch, "");
+ firstLine.append(lastLine);
+ doc.remove(from.line + 1, nlines);
}
else {
- var spliceargs = [from.line + 1, nlines - 1];
- firstLine.replace(from.ch, firstLine.text.length, newText[0]);
- lastLine.replace(0, to.ch, newText[newText.length-1]);
- for (var i = 1, e = newText.length - 1; i < e; ++i) spliceargs.push(new Line(newText[i]));
- lines.splice.apply(lines, spliceargs);
- }
-
-
- for (var i = from.line, e = i + newText.length; i < e; ++i) {
- var l = lines[i].text;
- if (l.length > maxLineLength) {
- maxLine = l; maxLineLength = l.length; maxWidth = null;
- recomputeMaxLength = false;
- }
- }
- if (recomputeMaxLength) {
- maxLineLength = 0; maxLine = ""; maxWidth = null;
- for (var i = 0, e = lines.length; i < e; ++i) {
- var l = lines[i].text;
+ var added = [];
+ firstLine.replace(from.ch, null, newText[0]);
+ lastLine.replace(null, to.ch, newText[newText.length-1]);
+ firstLine.fixMarkEnds(lastLine);
+ for (var i = 1, e = newText.length - 1; i < e; ++i)
+ added.push(Line.inheritMarks(newText[i], firstLine));
+ if (nlines > 1) doc.remove(from.line + 1, nlines - 1);
+ doc.insert(from.line + 1, added);
+ }
+ if (options.lineWrapping) {
+ var perLine = scroller.clientWidth / charWidth() - 3;
+ doc.iter(from.line, from.line + newText.length, function(line) {
+ if (line.hidden) return;
+ var guess = Math.ceil(line.text.length / perLine) || 1;
+ if (guess != line.height) updateLineHeight(line, guess);
+ });
+ } else {
+ doc.iter(from.line, i + newText.length, function(line) {
+ var l = line.text;
if (l.length > maxLineLength) {
- maxLineLength = l.length; maxLine = l;
+ maxLine = l; maxLineLength = l.length; maxWidth = null;
+ recomputeMaxLength = false;
}
+ });
+ if (recomputeMaxLength) {
+ maxLineLength = 0; maxLine = ""; maxWidth = null;
+ doc.iter(0, doc.size, function(line) {
+ var l = line.text;
+ if (l.length > maxLineLength) {
+ maxLineLength = l.length; maxLine = l;
+ }
+ });
}
}
@@ -485,12 +611,9 @@ var CodeMirror = (function() {
if (task < from.line) newWork.push(task);
else if (task > to.line) newWork.push(task + lendiff);
}
- if (newText.length < 5) {
- highlightLines(from.line, from.line + newText.length);
- newWork.push(from.line + newText.length);
- } else {
- newWork.push(from.line);
- }
+ var hlEnd = from.line + Math.min(newText.length, 500);
+ highlightLines(from.line, hlEnd);
+ newWork.push(hlEnd);
work = newWork;
startWorker(100);
// Remember that these lines changed, for updating the display
@@ -502,7 +625,7 @@ var CodeMirror = (function() {
setSelection(selFrom, selTo, updateLine(sel.from.line), updateLine(sel.to.line));
// Make sure the scroll-size div has the correct height.
- code.style.height = (lines.length * lineHeight() + 2 * paddingTop()) + "px";
+ code.style.height = (doc.height * textHeight() + 2 * paddingTop()) + "px";
}
function replaceRange(code, from, to) {
@@ -540,10 +663,10 @@ var CodeMirror = (function() {
function getRange(from, to) {
var l1 = from.line, l2 = to.line;
- if (l1 == l2) return lines[l1].text.slice(from.ch, to.ch);
- var code = [lines[l1].text.slice(from.ch)];
- for (var i = l1 + 1; i < l2; ++i) code.push(lines[i].text);
- code.push(lines[l2].text.slice(0, to.ch));
+ if (l1 == l2) return getLine(l1).text.slice(from.ch, to.ch);
+ var code = [getLine(l1).text.slice(from.ch)];
+ doc.iter(l1 + 1, l2, function(line) { code.push(line.text); });
+ code.push(getLine(l2).text.slice(0, to.ch));
return code.join("\n");
}
function getSelection() {
@@ -553,7 +676,7 @@ var CodeMirror = (function() {
var pollingFast = false; // Ensures slowPoll doesn't cancel fastPoll
function slowPoll() {
if (pollingFast) return;
- poll.set(2000, function() {
+ poll.set(slowPollInterval, function() {
startOperation();
readInput();
if (focused) slowPoll();
@@ -566,7 +689,10 @@ var CodeMirror = (function() {
function p() {
startOperation();
var changed = readInput();
- if (changed == "moved" && keyId) movementKeys[keyId] = true;
+ if (changed && keyId) {
+ if (changed == "moved" && movementKeys[keyId] == null) movementKeys[keyId] = true;
+ if (changed == "changed") movementKeys[keyId] = false;
+ }
if (!changed && !missed) {missed = true; poll.set(80, p);}
else {pollingFast = false; slowPoll();}
endOperation();
@@ -648,14 +774,16 @@ var CodeMirror = (function() {
// editor state.
function prepareInput() {
var text = [];
- var from = Math.max(0, sel.from.line - 1), to = Math.min(lines.length, sel.to.line + 2);
- for (var i = from; i < to; ++i) text.push(lines[i].text);
+ var from = Math.max(0, sel.from.line - 1), to = Math.min(doc.size, sel.to.line + 2);
+ doc.iter(from, to, function(line) { text.push(line.text); });
text = input.value = text.join(lineSep);
var startch = sel.from.ch, endch = sel.to.ch;
- for (var i = from; i < sel.from.line; ++i)
- startch += lineSep.length + lines[i].text.length;
- for (var i = from; i < sel.to.line; ++i)
- endch += lineSep.length + lines[i].text.length;
+ doc.iter(from, sel.from.line, function(line) {
+ startch += lineSep.length + line.text.length;
+ });
+ doc.iter(from, sel.to.line, function(line) {
+ endch += lineSep.length + line.text.length;
+ });
editing = {text: text, from: from, to: to, start: startch, end: endch};
setSelRange(input, startch, reducedSelection ? startch : endch);
}
@@ -663,21 +791,29 @@ var CodeMirror = (function() {
if (options.readOnly != "nocursor") input.focus();
}
+ function scrollEditorIntoView() {
+ if (!cursor.getBoundingClientRect) return;
+ var rect = cursor.getBoundingClientRect();
+ var winH = window.innerHeight || Math.max(document.body.offsetHeight, document.documentElement.offsetHeight);
+ if (rect.top < 0 || rect.bottom > winH) cursor.scrollIntoView();
+ }
function scrollCursorIntoView() {
var cursor = localCoords(sel.inverted ? sel.from : sel.to);
- return scrollIntoView(cursor.x, cursor.y, cursor.x, cursor.yBot);
+ var x = options.lineWrapping ? Math.min(cursor.x, lineSpace.offsetWidth) : cursor.x;
+ return scrollIntoView(x, cursor.y, x, cursor.yBot);
}
function scrollIntoView(x1, y1, x2, y2) {
- var pl = paddingLeft(), pt = paddingTop(), lh = lineHeight();
+ var pl = paddingLeft(), pt = paddingTop(), lh = textHeight();
y1 += pt; y2 += pt; x1 += pl; x2 += pl;
var screen = scroller.clientHeight, screentop = scroller.scrollTop, scrolled = false, result = true;
if (y1 < screentop) {scroller.scrollTop = Math.max(0, y1 - 2*lh); scrolled = true;}
else if (y2 > screentop + screen) {scroller.scrollTop = y2 + lh - screen; scrolled = true;}
var screenw = scroller.clientWidth, screenleft = scroller.scrollLeft;
- if (x1 < screenleft) {
+ var gutterw = options.fixedGutter ? gutter.clientWidth : 0;
+ if (x1 < screenleft + gutterw) {
if (x1 < 50) x1 = 0;
- scroller.scrollLeft = Math.max(0, x1 - 10);
+ scroller.scrollLeft = Math.max(0, x1 - 10 - gutterw);
scrolled = true;
}
else if (x2 > screenw + screenleft) {
@@ -690,32 +826,103 @@ var CodeMirror = (function() {
}
function visibleLines() {
- var lh = lineHeight(), top = scroller.scrollTop - paddingTop();
- return {from: Math.min(lines.length, Math.max(0, Math.floor(top / lh))),
- to: Math.min(lines.length, Math.ceil((top + scroller.clientHeight) / lh))};
+ var lh = textHeight(), top = scroller.scrollTop - paddingTop();
+ var from_height = Math.max(0, Math.floor(top / lh));
+ var to_height = Math.ceil((top + scroller.clientHeight) / lh);
+ return {from: lineAtHeight(doc, from_height),
+ to: lineAtHeight(doc, to_height)};
}
// Uses a set of changes plus the current scroll position to
// determine which DOM updates have to be made, and makes the
// updates.
function updateDisplay(changes) {
if (!scroller.clientWidth) {
- showingFrom = showingTo = 0;
+ showingFrom = showingTo = displayOffset = 0;
return;
}
- // First create a range of theoretically intact lines, and punch
- // holes in that using the change info.
- var intact = changes === true ? [] : [{from: showingFrom, to: showingTo, domStart: 0}];
+ // Compute the new visible window
+ var visible = visibleLines();
+ // Bail out if the visible area is already rendered and nothing changed.
+ if (changes !== true && changes.length == 0 && visible.from >= showingFrom && visible.to <= showingTo) return;
+ var from = Math.max(visible.from - 100, 0), to = Math.min(doc.size, visible.to + 100);
+ if (showingFrom < from && from - showingFrom < 20) from = showingFrom;
+ if (showingTo > to && showingTo - to < 20) to = Math.min(doc.size, showingTo);
+
+ // Create a range of theoretically intact lines, and punch holes
+ // in that using the change info.
+ var intact = changes === true ? [] :
+ computeIntact([{from: showingFrom, to: showingTo, domStart: 0}], changes);
+ // Clip off the parts that won't be visible
+ var intactLines = 0;
+ for (var i = 0; i < intact.length; ++i) {
+ var range = intact[i];
+ if (range.from < from) {range.domStart += (from - range.from); range.from = from;}
+ if (range.to > to) range.to = to;
+ if (range.from >= range.to) intact.splice(i--, 1);
+ else intactLines += range.to - range.from;
+ }
+ if (intactLines == to - from) return;
+ intact.sort(function(a, b) {return a.domStart - b.domStart;});
+
+ var th = textHeight(), gutterDisplay = gutter.style.display;
+ lineDiv.style.display = gutter.style.display = "none";
+ patchDisplay(from, to, intact);
+ lineDiv.style.display = "";
+
+ // Position the mover div to align with the lines it's supposed
+ // to be showing (which will cover the visible display)
+ var different = from != showingFrom || to != showingTo || lastHeight != scroller.clientHeight;
+ if (different) lastHeight = scroller.clientHeight;
+ showingFrom = from; showingTo = to;
+ displayOffset = heightAtLine(doc, from);
+ mover.style.top = (displayOffset * th) + "px";
+ code.style.height = (doc.height * th + 2 * paddingTop()) + "px";
+
+ // Since this is all rather error prone, it is honoured with the
+ // only assertion in the whole file.
+ if (lineDiv.childNodes.length != showingTo - showingFrom)
+ throw new Error("BAD PATCH! " + JSON.stringify(intact) + " size=" + (showingTo - showingFrom) +
+ " nodes=" + lineDiv.childNodes.length);
+
+ if (options.lineWrapping) {
+ maxWidth = scroller.clientWidth;
+ var curNode = lineDiv.firstChild;
+ doc.iter(showingFrom, showingTo, function(line) {
+ if (!line.hidden) {
+ var height = Math.round(curNode.offsetHeight / th) || 1;
+ if (line.height != height) {updateLineHeight(line, height); gutterDirty = true;}
+ }
+ curNode = curNode.nextSibling;
+ });
+ } else {
+ if (maxWidth == null) maxWidth = stringWidth(maxLine);
+ if (maxWidth > scroller.clientWidth) {
+ lineSpace.style.width = maxWidth + "px";
+ // Needed to prevent odd wrapping/hiding of widgets placed in here.
+ code.style.width = "";
+ code.style.width = scroller.scrollWidth + "px";
+ } else {
+ lineSpace.style.width = code.style.width = "";
+ }
+ }
+ gutter.style.display = gutterDisplay;
+ if (different || gutterDirty) updateGutter();
+ updateCursor();
+ }
+
+ function computeIntact(intact, changes) {
for (var i = 0, l = changes.length || 0; i < l; ++i) {
var change = changes[i], intact2 = [], diff = change.diff || 0;
for (var j = 0, l2 = intact.length; j < l2; ++j) {
var range = intact[j];
- if (change.to <= range.from)
- intact2.push({from: range.from + diff, to: range.to + diff, domStart: range.domStart});
- else if (range.to <= change.from)
+ if (change.to <= range.from && change.diff)
+ intact2.push({from: range.from + diff, to: range.to + diff,
+ domStart: range.domStart});
+ else if (change.to <= range.from || change.from >= range.to)
intact2.push(range);
else {
if (change.from > range.from)
- intact2.push({from: range.from, to: change.from, domStart: range.domStart})
+ intact2.push({from: range.from, to: change.from, domStart: range.domStart});
if (change.to < range.to)
intact2.push({from: change.to + diff, to: range.to + diff,
domStart: range.domStart + (change.to - range.from)});
@@ -723,158 +930,90 @@ var CodeMirror = (function() {
}
intact = intact2;
}
+ return intact;
+ }
- // Then, determine which lines we'd want to see, and which
- // updates have to be made to get there.
- var visible = visibleLines();
- var from = Math.min(showingFrom, Math.max(visible.from - 3, 0)),
- to = Math.min(lines.length, Math.max(showingTo, visible.to + 3)),
- updates = [], domPos = 0, domEnd = showingTo - showingFrom, pos = from, changedLines = 0;
-
- for (var i = 0, l = intact.length; i < l; ++i) {
- var range = intact[i];
- if (range.to <= from) continue;
- if (range.from >= to) break;
- if (range.domStart > domPos || range.from > pos) {
- updates.push({from: pos, to: range.from, domSize: range.domStart - domPos, domStart: domPos});
- changedLines += range.from - pos;
+ function patchDisplay(from, to, intact) {
+ // The first pass removes the DOM nodes that aren't intact.
+ if (!intact.length) lineDiv.innerHTML = "";
+ else {
+ function killNode(node) {
+ var tmp = node.nextSibling;
+ node.parentNode.removeChild(node);
+ return tmp;
}
- pos = range.to;
- domPos = range.domStart + (range.to - range.from);
- }
- if (domPos != domEnd || pos != to) {
- changedLines += Math.abs(to - pos);
- updates.push({from: pos, to: to, domSize: domEnd - domPos, domStart: domPos});
- }
-
- if (!updates.length) return;
- lineDiv.style.display = "none";
- // If more than 30% of the screen needs update, just do a full
- // redraw (which is quicker than patching)
- if (changedLines > (visible.to - visible.from) * .3)
- refreshDisplay(from = Math.max(visible.from - 10, 0), to = Math.min(visible.to + 7, lines.length));
- // Otherwise, only update the stuff that needs updating.
- else
- patchDisplay(updates);
- lineDiv.style.display = "";
-
- // Position the mover div to align with the lines it's supposed
- // to be showing (which will cover the visible display)
- var different = from != showingFrom || to != showingTo || lastHeight != scroller.clientHeight;
- showingFrom = from; showingTo = to;
- mover.style.top = (from * lineHeight()) + "px";
- if (different) {
- lastHeight = scroller.clientHeight;
- code.style.height = (lines.length * lineHeight() + 2 * paddingTop()) + "px";
- updateGutter();
- }
-
- if (maxWidth == null) maxWidth = stringWidth(maxLine);
- if (maxWidth > scroller.clientWidth) {
- lineSpace.style.width = maxWidth + "px";
- // Needed to prevent odd wrapping/hiding of widgets placed in here.
- code.style.width = "";
- code.style.width = scroller.scrollWidth + "px";
- } else {
- lineSpace.style.width = code.style.width = "";
+ var domPos = 0, curNode = lineDiv.firstChild, n;
+ for (var i = 0; i < intact.length; ++i) {
+ var cur = intact[i];
+ while (cur.domStart > domPos) {curNode = killNode(curNode); domPos++;}
+ for (var j = 0, e = cur.to - cur.from; j < e; ++j) {curNode = curNode.nextSibling; domPos++;}
+ }
+ while (curNode) curNode = killNode(curNode);
}
-
- // Since this is all rather error prone, it is honoured with the
- // only assertion in the whole file.
- if (lineDiv.childNodes.length != showingTo - showingFrom)
- throw new Error("BAD PATCH! " + JSON.stringify(updates) + " size=" + (showingTo - showingFrom) +
- " nodes=" + lineDiv.childNodes.length);
- updateCursor();
- }
-
- function refreshDisplay(from, to) {
- var html = [], start = {line: from, ch: 0}, inSel = posLess(sel.from, start) && !posLess(sel.to, start);
- for (var i = from; i < to; ++i) {
+ // This pass fills in the lines that actually changed.
+ var nextIntact = intact.shift(), curNode = lineDiv.firstChild, j = from;
+ var sfrom = sel.from.line, sto = sel.to.line, inSel = sfrom < from && sto >= from;
+ var scratch = targetDocument.createElement("div"), newElt;
+ doc.iter(from, to, function(line) {
var ch1 = null, ch2 = null;
if (inSel) {
ch1 = 0;
- if (sel.to.line == i) {inSel = false; ch2 = sel.to.ch;}
- }
- else if (sel.from.line == i) {
- if (sel.to.line == i) {ch1 = sel.from.ch; ch2 = sel.to.ch;}
+ if (sto == j) {inSel = false; ch2 = sel.to.ch;}
+ } else if (sfrom == j) {
+ if (sto == j) {ch1 = sel.from.ch; ch2 = sel.to.ch;}
else {inSel = true; ch1 = sel.from.ch;}
}
- html.push(lines[i].getHTML(ch1, ch2, true));
- }
- lineDiv.innerHTML = html.join("");
- }
- function patchDisplay(updates) {
- // Slightly different algorithm for IE (badInnerHTML), since
- // there .innerHTML on PRE nodes is dumb, and discards
- // whitespace.
- var sfrom = sel.from.line, sto = sel.to.line, off = 0,
- scratch = badInnerHTML && targetDocument.createElement("div");
- for (var i = 0, e = updates.length; i < e; ++i) {
- var rec = updates[i];
- var extra = (rec.to - rec.from) - rec.domSize;
- var nodeAfter = lineDiv.childNodes[rec.domStart + rec.domSize + off] || null;
- if (badInnerHTML)
- for (var j = Math.max(-extra, rec.domSize); j > 0; --j)
- lineDiv.removeChild(nodeAfter ? nodeAfter.previousSibling : lineDiv.lastChild);
- else if (extra) {
- for (var j = Math.max(0, extra); j > 0; --j)
- lineDiv.insertBefore(targetDocument.createElement("pre"), nodeAfter);
- for (var j = Math.max(0, -extra); j > 0; --j)
- lineDiv.removeChild(nodeAfter ? nodeAfter.previousSibling : lineDiv.lastChild);
- }
- var node = lineDiv.childNodes[rec.domStart + off], inSel = sfrom < rec.from && sto >= rec.from;
- for (var j = rec.from; j < rec.to; ++j) {
- var ch1 = null, ch2 = null;
- if (inSel) {
- ch1 = 0;
- if (sto == j) {inSel = false; ch2 = sel.to.ch;}
- }
- else if (sfrom == j) {
- if (sto == j) {ch1 = sel.from.ch; ch2 = sel.to.ch;}
- else {inSel = true; ch1 = sel.from.ch;}
- }
- if (badInnerHTML) {
- scratch.innerHTML = lines[j].getHTML(ch1, ch2, true);
- lineDiv.insertBefore(scratch.firstChild, nodeAfter);
- }
- else {
- node.innerHTML = lines[j].getHTML(ch1, ch2, false);
- node.className = lines[j].className || "";
- node = node.nextSibling;
- }
+ if (nextIntact && nextIntact.to == j) nextIntact = intact.shift();
+ if (!nextIntact || nextIntact.from > j) {
+ if (line.hidden) scratch.innerHTML = "<pre></pre>";
+ else scratch.innerHTML = line.getHTML(ch1, ch2, true);
+ lineDiv.insertBefore(scratch.firstChild, curNode);
+ } else {
+ curNode = curNode.nextSibling;
}
- off += extra;
- }
+ ++j;
+ });
}
function updateGutter() {
if (!options.gutter && !options.lineNumbers) return;
var hText = mover.offsetHeight, hEditor = scroller.clientHeight;
gutter.style.height = (hText - hEditor < 2 ? hEditor : hText) + "px";
- var html = [];
- for (var i = showingFrom; i < Math.max(showingTo, showingFrom + 1); ++i) {
- var marker = lines[i].gutterMarker;
- var text = options.lineNumbers ? i + options.firstLineNumber : null;
- if (marker && marker.text)
- text = marker.text.replace("%N%", text != null ? text : "");
- else if (text == null)
- text = "\u00a0";
- html.push((marker && marker.style ? '<pre class="' + marker.style + '">' : "<pre>"), text, "</pre>");
- }
+ var html = [], i = showingFrom;
+ doc.iter(showingFrom, Math.max(showingTo, showingFrom + 1), function(line) {
+ if (line.hidden) {
+ html.push("<pre></pre>");
+ } else {
+ var marker = line.gutterMarker;
+ var text = options.lineNumbers ? i + options.firstLineNumber : null;
+ if (marker && marker.text)
+ text = marker.text.replace("%N%", text != null ? text : "");
+ else if (text == null)
+ text = "\u00a0";
+ html.push((marker && marker.style ? '<pre class="' + marker.style + '">' : "<pre>"), text);
+ for (var j = 1; j < line.height; ++j) html.push("<br> ");
+ html.push("</pre>");
+ }
+ ++i;
+ });
gutter.style.display = "none";
gutterText.innerHTML = html.join("");
- var minwidth = String(lines.length).length, firstNode = gutterText.firstChild, val = eltText(firstNode), pad = "";
+ var minwidth = String(doc.size).length, firstNode = gutterText.firstChild, val = eltText(firstNode), pad = "";
while (val.length + pad.length < minwidth) pad += "\u00a0";
if (pad) firstNode.insertBefore(targetDocument.createTextNode(pad), firstNode.firstChild);
gutter.style.display = "";
lineSpace.style.marginLeft = gutter.offsetWidth + "px";
+ gutterDirty = false;
}
function updateCursor() {
- var head = sel.inverted ? sel.from : sel.to, lh = lineHeight();
- var x = charX(head.line, head.ch) + "px", y = (head.line - showingFrom) * lh + "px";
- inputDiv.style.top = (head.line * lh - scroller.scrollTop) + "px";
+ var head = sel.inverted ? sel.from : sel.to, lh = textHeight();
+ var pos = localCoords(head, true);
+ var globalY = pos.y + displayOffset * textHeight();
+ inputDiv.style.top = Math.max(Math.min(globalY, scroller.offsetHeight), 0) + "px";
+ inputDiv.style.left = (pos.x - scroller.scrollLeft) + "px";
if (posEq(sel.from, sel.to)) {
- cursor.style.top = y; cursor.style.left = x;
+ cursor.style.top = pos.y + "px";
+ cursor.style.left = (options.lineWrapping ? Math.min(pos.x, lineSpace.offsetWidth) : pos.x) + "px";
cursor.style.display = "";
}
else cursor.style.display = "none";
@@ -892,9 +1031,14 @@ var CodeMirror = (function() {
// updateLines, since they have to be expressed in the line
// numbers before the update.
function setSelection(from, to, oldFrom, oldTo) {
+ if (oldFrom == null) {oldFrom = sel.from.line; oldTo = sel.to.line;}
if (posEq(sel.from, from) && posEq(sel.to, to)) return;
if (posLess(to, from)) {var tmp = to; to = from; from = tmp;}
+ // Skip over hidden lines.
+ if (from.line != oldFrom) from = skipHidden(from, oldFrom, sel.from.ch);
+ if (to.line != oldTo) to = skipHidden(to, oldTo, sel.to.ch);
+
if (posEq(from, to)) sel.inverted = false;
else if (posEq(from, sel.to)) sel.inverted = false;
else if (posEq(to, sel.from)) sel.inverted = true;
@@ -902,7 +1046,6 @@ var CodeMirror = (function() {
// Some ugly logic used to only mark the lines that actually did
// see a change in selection as changed, rather than the whole
// selected range.
- if (oldFrom == null) {oldFrom = sel.from.line; oldTo = sel.to.line;}
if (posEq(from, to)) {
if (!posEq(sel.from, sel.to))
changes.push({from: oldFrom, to: oldTo + 1});
@@ -927,42 +1070,61 @@ var CodeMirror = (function() {
sel.from = from; sel.to = to;
selectionChanged = true;
}
+ function skipHidden(pos, oldLine, oldCh) {
+ function getNonHidden(dir) {
+ var lNo = pos.line + dir, end = dir == 1 ? doc.size : -1;
+ while (lNo != end) {
+ var line = getLine(lNo);
+ if (!line.hidden) {
+ var ch = pos.ch;
+ if (ch > oldCh || ch > line.text.length) ch = line.text.length;
+ return {line: lNo, ch: ch};
+ }
+ lNo += dir;
+ }
+ }
+ var line = getLine(pos.line);
+ if (!line.hidden) return pos;
+ if (pos.line >= oldLine) return getNonHidden(1) || getNonHidden(-1);
+ else return getNonHidden(-1) || getNonHidden(1);
+ }
function setCursor(line, ch, user) {
var pos = clipPos({line: line, ch: ch || 0});
(user ? setSelectionUser : setSelection)(pos, pos);
}
- function clipLine(n) {return Math.max(0, Math.min(n, lines.length-1));}
+ function clipLine(n) {return Math.max(0, Math.min(n, doc.size-1));}
function clipPos(pos) {
if (pos.line < 0) return {line: 0, ch: 0};
- if (pos.line >= lines.length) return {line: lines.length-1, ch: lines[lines.length-1].text.length};
- var ch = pos.ch, linelen = lines[pos.line].text.length;
+ if (pos.line >= doc.size) return {line: doc.size-1, ch: getLine(doc.size-1).text.length};
+ var ch = pos.ch, linelen = getLine(pos.line).text.length;
if (ch == null || ch > linelen) return {line: pos.line, ch: linelen};
else if (ch < 0) return {line: pos.line, ch: 0};
else return pos;
}
function scrollPage(down) {
- var linesPerPage = Math.floor(scroller.clientHeight / lineHeight()), head = sel.inverted ? sel.from : sel.to;
- setCursor(head.line + (Math.max(linesPerPage - 1, 1) * (down ? 1 : -1)), head.ch, true);
+ var linesPerPage = Math.floor(scroller.clientHeight / textHeight()), head = sel.inverted ? sel.from : sel.to;
+ var target = heightAtLine(doc, head.line) + (Math.max(linesPerPage - 1, 1) * (down ? 1 : -1));
+ setCursor(lineAtHeight(doc, target), head.ch, true);
}
function scrollEnd(top) {
- var pos = top ? {line: 0, ch: 0} : {line: lines.length - 1, ch: lines[lines.length-1].text.length};
+ var pos = top ? {line: 0, ch: 0} : {line: doc.size - 1, ch: getLine(doc.size-1).text.length};
setSelectionUser(pos, pos);
}
function selectAll() {
- var endLine = lines.length - 1;
- setSelection({line: 0, ch: 0}, {line: endLine, ch: lines[endLine].text.length});
+ var endLine = doc.size - 1;
+ setSelection({line: 0, ch: 0}, {line: endLine, ch: getLine(endLine).text.length});
}
function selectWordAt(pos) {
- var line = lines[pos.line].text;
+ var line = getLine(pos.line).text;
var start = pos.ch, end = pos.ch;
while (start > 0 && /\w/.test(line.charAt(start - 1))) --start;
while (end < line.length && /\w/.test(line.charAt(end))) ++end;
setSelectionUser({line: pos.line, ch: start}, {line: pos.line, ch: end});
}
function selectLine(line) {
- setSelectionUser({line: line, ch: 0}, {line: line, ch: lines[line].text.length});
+ setSelectionUser({line: line, ch: 0}, {line: line, ch: getLine(line).text.length});
}
function handleEnter() {
replaceSelection("\n", "end");
@@ -994,6 +1156,10 @@ var CodeMirror = (function() {
}
return true;
}
+ function smartHome() {
+ var firstNonWS = Math.max(0, getLine(sel.from.line).text.search(/\S/));
+ setCursor(sel.from.line, sel.from.ch <= firstNonWS && sel.from.ch ? 0 : firstNonWS, true);
+ }
function indentLine(n, how) {
if (how == "smart") {
@@ -1001,9 +1167,9 @@ var CodeMirror = (function() {
else var state = getStateBefore(n);
}
- var line = lines[n], curSpace = line.indentation(), curSpaceString = line.text.match(/^\s*/)[0], indentation;
+ var line = getLine(n), curSpace = line.indentation(), curSpaceString = line.text.match(/^\s*/)[0], indentation;
if (how == "prev") {
- if (n) indentation = lines[n-1].indentation();
+ if (n) indentation = getLine(n-1).indentation();
else indentation = 0;
}
else if (how == "smart") indentation = mode.indent(state, line.text.slice(curSpaceString.length));
@@ -1028,87 +1194,148 @@ var CodeMirror = (function() {
function loadMode() {
mode = CodeMirror.getMode(options, options.mode);
- for (var i = 0, l = lines.length; i < l; ++i)
- lines[i].stateAfter = null;
+ doc.iter(0, doc.size, function(line) { line.stateAfter = null; });
work = [0];
startWorker();
}
function gutterChanged() {
var visible = options.gutter || options.lineNumbers;
gutter.style.display = visible ? "" : "none";
- if (visible) updateGutter();
+ if (visible) gutterDirty = true;
else lineDiv.parentNode.style.marginLeft = 0;
}
+ function wrappingChanged(from, to) {
+ if (options.lineWrapping) {
+ wrapper.className += " CodeMirror-wrap";
+ var perLine = scroller.clientWidth / charWidth() - 3;
+ doc.iter(0, doc.size, function(line) {
+ if (line.hidden) return;
+ var guess = Math.ceil(line.text.length / perLine) || 1;
+ if (guess != 1) updateLineHeight(line, guess);
+ });
+ lineSpace.style.width = code.style.width = "";
+ } else {
+ wrapper.className = wrapper.className.replace(" CodeMirror-wrap", "");
+ maxWidth = null; maxLine = "";
+ doc.iter(0, doc.size, function(line) {
+ if (line.height != 1 && !line.hidden) updateLineHeight(line, 1);
+ if (line.text.length > maxLine.length) maxLine = line.text;
+ });
+ }
+ changes.push({from: 0, to: doc.size});
+ }
+
+ function TextMarker() { this.set = []; }
+ TextMarker.prototype.clear = operation(function() {
+ for (var i = 0, e = this.set.length; i < e; ++i) {
+ var mk = this.set[i].marked;
+ if (!mk) continue;
+ for (var j = 0; j < mk.length; ++j)
+ if (mk[j].set == this.set) mk.splice(j--, 1);
+ }
+ // We don't know the exact lines that changed. Refreshing is
+ // cheaper than finding them.
+ changes.push({from: 0, to: doc.size});
+ });
+ TextMarker.prototype.find = function() {
+ var from, to;
+ for (var i = 0, e = this.set.length; i < e; ++i) {
+ var line = this.set[i], mk = line.marked;
+ for (var j = 0; j < mk.length; ++j) {
+ var mark = mk[j];
+ if (mark.set == this.set) {
+ if (mark.from != null || mark.to != null) {
+ var found = lineNo(line);
+ if (found != null) {
+ if (mark.from != null) from = {line: found, ch: mark.from};
+ if (mark.to != null) to = {line: found, ch: mark.to};
+ }
+ }
+ }
+ }
+ }
+ return {from: from, to: to};
+ };
function markText(from, to, className) {
from = clipPos(from); to = clipPos(to);
- var accum = [];
+ var tm = new TextMarker();
function add(line, from, to, className) {
- var line = lines[line], mark = line.addMark(from, to, className);
- mark.line = line;
- accum.push(mark);
+ mark = getLine(line).addMark(new MarkedText(from, to, className, tm.set));
}
if (from.line == to.line) add(from.line, from.ch, to.ch, className);
else {
add(from.line, from.ch, null, className);
for (var i = from.line + 1, e = to.line; i < e; ++i)
- add(i, 0, null, className);
- add(to.line, 0, to.ch, className);
+ add(i, null, null, className);
+ add(to.line, null, to.ch, className);
}
changes.push({from: from.line, to: to.line + 1});
- return function() {
- var start, end;
- for (var i = 0; i < accum.length; ++i) {
- var mark = accum[i], found = indexOf(lines, mark.line);
- mark.line.removeMark(mark);
- if (found > -1) {
- if (start == null) start = found;
- end = found;
- }
- }
- if (start != null) changes.push({from: start, to: end + 1});
- };
+ return tm;
+ }
+
+ function setBookmark(pos) {
+ pos = clipPos(pos);
+ var bm = new Bookmark(pos.ch);
+ getLine(pos.line).addMark(bm);
+ return bm;
}
function addGutterMarker(line, text, className) {
- if (typeof line == "number") line = lines[clipLine(line)];
+ if (typeof line == "number") line = getLine(clipLine(line));
line.gutterMarker = {text: text, style: className};
- updateGutter();
+ gutterDirty = true;
return line;
}
function removeGutterMarker(line) {
- if (typeof line == "number") line = lines[clipLine(line)];
+ if (typeof line == "number") line = getLine(clipLine(line));
line.gutterMarker = null;
- updateGutter();
+ gutterDirty = true;
}
- function setLineClass(line, className) {
- if (typeof line == "number") {
- var no = line;
- line = lines[clipLine(line)];
- }
- else {
- var no = indexOf(lines, line);
- if (no == -1) return null;
- }
- if (line.className != className) {
- line.className = className;
- changes.push({from: no, to: no + 1});
- }
+
+ function changeLine(handle, op) {
+ var no = handle, line = handle;
+ if (typeof handle == "number") line = getLine(clipLine(handle));
+ else no = lineNo(handle);
+ if (no == null) return null;
+ if (op(line, no)) changes.push({from: no, to: no + 1});
return line;
}
+ function setLineClass(handle, className) {
+ return changeLine(handle, function(line) {
+ if (line.className != className) {
+ line.className = className;
+ return true;
+ }
+ });
+ }
+ function setLineHidden(handle, hidden) {
+ return changeLine(handle, function(line, no) {
+ if (line.hidden != hidden) {
+ line.hidden = hidden;
+ updateLineHeight(line, hidden ? 0 : 1);
+ if (hidden && (sel.from.line == no || sel.to.line == no))
+ setSelection(skipHidden(sel.from, sel.from.line, sel.from.ch),
+ skipHidden(sel.to, sel.to.line, sel.to.ch));
+ return (gutterDirty = true);
+ }
+ });
+ }
function lineInfo(line) {
if (typeof line == "number") {
+ if (!isLine(line)) return null;
var n = line;
- line = lines[line];
+ line = getLine(line);
if (!line) return null;
}
else {
- var n = indexOf(lines, line);
- if (n == -1) return null;
+ var n = lineNo(line);
+ if (n == null) return null;
}
var marker = line.gutterMarker;
- return {line: n, text: line.text, markerText: marker && marker.text, markerClass: marker && marker.style};
+ return {line: n, handle: line, text: line.text, markerText: marker && marker.text,
+ markerClass: marker && marker.style, lineClass: line.className};
}
function stringWidth(str) {
@@ -1118,21 +1345,16 @@ var CodeMirror = (function() {
}
// These are used to go from pixel positions to character
// positions, taking varying character widths into account.
- function charX(line, pos) {
- if (pos == 0) return 0;
- measure.innerHTML = "<pre><span>" + lines[line].getHTML(null, null, false, pos) + "</span></pre>";
- return measure.firstChild.firstChild.offsetWidth;
- }
function charFromX(line, x) {
if (x <= 0) return 0;
- var lineObj = lines[line], text = lineObj.text;
+ var lineObj = getLine(line), text = lineObj.text;
function getX(len) {
measure.innerHTML = "<pre><span>" + lineObj.getHTML(null, null, false, len) + "</span></pre>";
return measure.firstChild.firstChild.offsetWidth;
}
var from = 0, fromX = 0, to = text.length, toX;
// Guess a suitable upper bound for our search.
- var estimated = Math.min(to, Math.ceil(x / stringWidth("x")));
+ var estimated = Math.min(to, Math.ceil(x / charWidth()));
for (;;) {
var estX = getX(estimated);
if (estX <= x && estimated < to) estimated = Math.min(to, Math.ceil(estimated * 1.2));
@@ -1151,20 +1373,93 @@ var CodeMirror = (function() {
}
}
+ var tempId = Math.floor(Math.random() * 0xffffff).toString(16);
+ function measureLine(line, ch) {
+ var extra = "";
+ // Include extra text at the end to make sure the measured line is wrapped in the right way.
+ if (options.lineWrapping) {
+ var end = line.text.indexOf(" ", ch + 2);
+ extra = line.text.slice(ch + 1, end < 0 ? line.text.length : end + (ie ? 5 : 0));
+ }
+ measure.innerHTML = "<pre>" + line.getHTML(null, null, false, ch) +
+ '<span id="CodeMirror-temp-' + tempId + '">' + (line.text.charAt(ch) || " ") + "</span>" +
+ extra + "</pre>";
+ var elt = document.getElementById("CodeMirror-temp-" + tempId);
+ var top = elt.offsetTop, left = elt.offsetLeft;
+ // Older IEs report zero offsets for spans directly after a wrap
+ if (ie && ch && top == 0 && left == 0) {
+ var backup = document.createElement("span");
+ backup.innerHTML = "x";
+ elt.parentNode.insertBefore(backup, elt.nextSibling);
+ top = backup.offsetTop;
+ }
+ return {top: top, left: left};
+ }
function localCoords(pos, inLineWrap) {
- var lh = lineHeight(), line = pos.line - (inLineWrap ? showingFrom : 0);
- return {x: charX(pos.line, pos.ch), y: line * lh, yBot: (line + 1) * lh};
+ var x, lh = textHeight(), y = lh * (heightAtLine(doc, pos.line) - (inLineWrap ? displayOffset : 0));
+ if (pos.ch == 0) x = 0;
+ else {
+ var sp = measureLine(getLine(pos.line), pos.ch);
+ x = sp.left;
+ if (options.lineWrapping) y += Math.max(0, sp.top);
+ }
+ return {x: x, y: y, yBot: y + lh};
+ }
+ // Coords must be lineSpace-local
+ function coordsChar(x, y) {
+ if (y < 0) y = 0;
+ var th = textHeight(), cw = charWidth(), heightPos = displayOffset + Math.floor(y / th);
+ var lineNo = lineAtHeight(doc, heightPos);
+ if (lineNo >= doc.size) return {line: doc.size - 1, ch: 0};
+ var lineObj = getLine(lineNo), text = lineObj.text;
+ var tw = options.lineWrapping, innerOff = tw ? heightPos - heightAtLine(doc, lineNo) : 0;
+ if (x <= 0 && innerOff == 0) return {line: lineNo, ch: 0};
+ function getX(len) {
+ var sp = measureLine(lineObj, len);
+ if (tw) {
+ var off = Math.round(sp.top / th);
+ return Math.max(0, sp.left + (off - innerOff) * scroller.clientWidth);
+ }
+ return sp.left;
+ }
+ var from = 0, fromX = 0, to = text.length, toX;
+ // Guess a suitable upper bound for our search.
+ var estimated = Math.min(to, Math.ceil((x + innerOff * scroller.clientWidth * .9) / cw));
+ for (;;) {
+ var estX = getX(estimated);
+ if (estX <= x && estimated < to) estimated = Math.min(to, Math.ceil(estimated * 1.2));
+ else {toX = estX; to = estimated; break;}
+ }
+ if (x > toX) return {line: lineNo, ch: to};
+ // Try to guess a suitable lower bound as well.
+ estimated = Math.floor(to * 0.8); estX = getX(estimated);
+ if (estX < x) {from = estimated; fromX = estX;}
+ // Do a binary search between these bounds.
+ for (;;) {
+ if (to - from <= 1) return {line: lineNo, ch: (toX - x > x - fromX) ? from : to};
+ var middle = Math.ceil((from + to) / 2), middleX = getX(middle);
+ if (middleX > x) {to = middle; toX = middleX;}
+ else {from = middle; fromX = middleX;}
+ }
}
function pageCoords(pos) {
var local = localCoords(pos, true), off = eltOffset(lineSpace);
return {x: off.left + local.x, y: off.top + local.y, yBot: off.top + local.yBot};
}
- function lineHeight() {
- var nlines = lineDiv.childNodes.length;
- if (nlines) return (lineDiv.offsetHeight / nlines) || 1;
- measure.innerHTML = "<pre>x</pre>";
- return measure.firstChild.offsetHeight || 1;
+ var cachedHeight, cachedFor;
+ function textHeight() {
+ var offsetHeight = lineDiv.offsetHeight;
+ if (offsetHeight == cachedFor) return cachedHeight;
+ cachedFor = offsetHeight;
+ measure.innerHTML = "<pre>x<br>x<br>x<br>x<br>x<br>x<br>x<br>x<br>x<br>x</pre>";
+ return (cachedHeight = measure.firstChild.offsetHeight / 10 || 1);
+ }
+ var cachedWidth, cachedFor = 0;
+ function charWidth() {
+ if (scroller.clientWidth == cachedFor) return cachedWidth;
+ cachedFor = scroller.clientWidth;
+ return (cachedWidth = stringWidth("x"));
}
function paddingTop() {return lineSpace.offsetTop;}
function paddingLeft() {return lineSpace.offsetLeft;}
@@ -1179,8 +1474,7 @@ var CodeMirror = (function() {
if (!liberal && (x - offW.left > scroller.clientWidth || y - offW.top > scroller.clientHeight))
return null;
var offL = eltOffset(lineSpace, true);
- var line = showingFrom + Math.floor((y - offL.top) / lineHeight());
- return clipPos({line: line, ch: charFromX(clipLine(line), x - offL.left)});
+ return coordsChar(x - offL.left, y - offL.top);
}
function onContextMenu(e) {
var pos = posFromMouse(e);
@@ -1190,8 +1484,8 @@ var CodeMirror = (function() {
var oldCSS = input.style.cssText;
inputDiv.style.position = "absolute";
- input.style.cssText = "position: fixed; width: 30px; height: 30px; top: " + (e_pageY(e) - 1) +
- "px; left: " + (e_pageX(e) - 1) + "px; z-index: 1000; background: white; " +
+ input.style.cssText = "position: fixed; width: 30px; height: 30px; top: " + (e.clientY - 5) +
+ "px; left: " + (e.clientX - 5) + "px; z-index: 1000; background: white; " +
"border-width: 0; outline: none; overflow: hidden; opacity: .05; filter: alpha(opacity=5);";
leaveInputAlone = true;
var val = input.value = getSelection();
@@ -1206,7 +1500,7 @@ var CodeMirror = (function() {
prepareInput();
slowPoll();
}
-
+
if (gecko) {
e_stop(e);
var mouseup = connect(window, "mouseup", function() {
@@ -1231,7 +1525,7 @@ var CodeMirror = (function() {
var matching = {"(": ")>", ")": "(<", "[": "]>", "]": "[<", "{": "}>", "}": "{<"};
function matchBrackets(autoclear) {
- var head = sel.inverted ? sel.from : sel.to, line = lines[head.line], pos = head.ch - 1;
+ var head = sel.inverted ? sel.from : sel.to, line = getLine(head.line), pos = head.ch - 1;
var match = (pos >= 0 && matching[line.text.charAt(pos)]) || matching[line.text.charAt(++pos)];
if (!match) return;
var ch = match.charAt(0), forward = match.charAt(1) == ">", d = forward ? 1 : -1, st = line.styles;
@@ -1255,18 +1549,16 @@ var CodeMirror = (function() {
}
}
}
- for (var i = head.line, e = forward ? Math.min(i + 100, lines.length) : Math.max(-1, i - 100); i != e; i+=d) {
- var line = lines[i], first = i == head.line;
+ for (var i = head.line, e = forward ? Math.min(i + 100, doc.size) : Math.max(-1, i - 100); i != e; i+=d) {
+ var line = getLine(i), first = i == head.line;
var found = scan(line, first && forward ? pos + 1 : 0, first && !forward ? pos : line.text.length);
if (found) break;
}
if (!found) found = {pos: null, match: false};
var style = found.match ? "CodeMirror-matchingbracket" : "CodeMirror-nonmatchingbracket";
var one = markText({line: head.line, ch: pos}, {line: head.line, ch: pos+1}, style),
- two = found.pos != null
- ? markText({line: i, ch: found.pos}, {line: i, ch: found.pos + 1}, style)
- : function() {};
- var clear = operation(function(){one(); two();});
+ two = found.pos != null && markText({line: i, ch: found.pos}, {line: i, ch: found.pos + 1}, style);
+ var clear = operation(function(){one.clear(); two && two.clear();});
if (autoclear) setTimeout(clear, 800);
else bracketHighlighted = clear;
}
@@ -1280,66 +1572,69 @@ var CodeMirror = (function() {
var minindent, minline;
for (var search = n, lim = n - 40; search > lim; --search) {
if (search == 0) return 0;
- var line = lines[search-1];
+ var line = getLine(search-1);
if (line.stateAfter) return search;
var indented = line.indentation();
if (minline == null || minindent > indented) {
- minline = search;
+ minline = search - 1;
minindent = indented;
}
}
return minline;
}
function getStateBefore(n) {
- var start = findStartLine(n), state = start && lines[start-1].stateAfter;
+ var start = findStartLine(n), state = start && getLine(start-1).stateAfter;
if (!state) state = startState(mode);
else state = copyState(mode, state);
- for (var i = start; i < n; ++i) {
- var line = lines[i];
+ doc.iter(start, n, function(line) {
line.highlight(mode, state);
line.stateAfter = copyState(mode, state);
- }
- if (n < lines.length && !lines[n].stateAfter) work.push(n);
+ });
+ if (start < n) changes.push({from: start, to: n});
+ if (n < doc.size && !getLine(n).stateAfter) work.push(n);
return state;
}
function highlightLines(start, end) {
var state = getStateBefore(start);
- for (var i = start; i < end; ++i) {
- var line = lines[i];
+ doc.iter(start, end, function(line) {
line.highlight(mode, state);
line.stateAfter = copyState(mode, state);
- }
+ });
}
function highlightWorker() {
var end = +new Date + options.workTime;
var foundWork = work.length;
while (work.length) {
- if (!lines[showingFrom].stateAfter) var task = showingFrom;
+ if (!getLine(showingFrom).stateAfter) var task = showingFrom;
else var task = work.pop();
- if (task >= lines.length) continue;
- var start = findStartLine(task), state = start && lines[start-1].stateAfter;
+ if (task >= doc.size) continue;
+ var start = findStartLine(task), state = start && getLine(start-1).stateAfter;
if (state) state = copyState(mode, state);
else state = startState(mode);
- var unchanged = 0, compare = mode.compareStates;
- for (var i = start, l = lines.length; i < l; ++i) {
- var line = lines[i], hadState = line.stateAfter;
+ var unchanged = 0, compare = mode.compareStates, realChange = false,
+ i = start, bail = false;
+ doc.iter(i, doc.size, function(line) {
+ var hadState = line.stateAfter;
if (+new Date > end) {
work.push(i);
startWorker(options.workDelay);
- changes.push({from: task, to: i + 1});
- return;
+ if (realChange) changes.push({from: task, to: i + 1});
+ return (bail = true);
}
var changed = line.highlight(mode, state);
+ if (changed) realChange = true;
line.stateAfter = copyState(mode, state);
if (compare) {
- if (hadState && compare(hadState, state)) break;
+ if (hadState && compare(hadState, state)) return true;
} else {
- if (changed || !hadState) unchanged = 0;
- else if (++unchanged > 3) break;
+ if (changed !== false || !hadState) unchanged = 0;
+ else if (++unchanged > 3) return true;
}
- }
- changes.push({from: task, to: i + 1});
+ ++i;
+ });
+ if (bail) return;
+ if (realChange) changes.push({from: task, to: i + 1});
}
if (foundWork && options.onHighlightComplete)
options.onHighlightComplete(instance);
@@ -1360,9 +1655,12 @@ var CodeMirror = (function() {
var reScroll = false;
if (selectionChanged) reScroll = !scrollCursorIntoView();
if (changes.length) updateDisplay(changes);
- else if (selectionChanged) updateCursor();
+ else {
+ if (selectionChanged) updateCursor();
+ if (gutterDirty) updateGutter();
+ }
if (reScroll) scrollCursorIntoView();
- if (selectionChanged) restartBlink();
+ if (selectionChanged) {scrollEditorIntoView(); restartBlink();}
// updateInput can be set to a boolean value to force/prevent an
// update.
@@ -1406,7 +1704,7 @@ var CodeMirror = (function() {
if (typeof query != "string") // Regexp match
this.matches = function(reverse, pos) {
if (reverse) {
- var line = lines[pos.line].text.slice(0, pos.ch), match = line.match(query), start = 0;
+ var line = getLine(pos.line).text.slice(0, pos.ch), match = line.match(query), start = 0;
while (match) {
var ind = line.indexOf(match[0]);
start += ind;
@@ -1418,7 +1716,7 @@ var CodeMirror = (function() {
}
}
else {
- var line = lines[pos.line].text.slice(pos.ch), match = line.match(query),
+ var line = getLine(pos.line).text.slice(pos.ch), match = line.match(query),
start = match && pos.ch + line.indexOf(match[0]);
}
if (match)
@@ -1433,7 +1731,7 @@ var CodeMirror = (function() {
// Different methods for single-line and multi-line queries
if (target.length == 1)
this.matches = function(reverse, pos) {
- var line = fold(lines[pos.line].text), len = query.length, match;
+ var line = fold(getLine(pos.line).text), len = query.length, match;
if (reverse ? (pos.ch >= len && (match = line.lastIndexOf(query, pos.ch - len)) != -1)
: (match = line.indexOf(query, pos.ch)) != -1)
return {from: {line: pos.line, ch: match},
@@ -1441,14 +1739,14 @@ var CodeMirror = (function() {
};
else
this.matches = function(reverse, pos) {
- var ln = pos.line, idx = (reverse ? target.length - 1 : 0), match = target[idx], line = fold(lines[ln].text);
+ var ln = pos.line, idx = (reverse ? target.length - 1 : 0), match = target[idx], line = fold(getLine(ln).text);
var offsetA = (reverse ? line.indexOf(match) + match.length : line.lastIndexOf(match));
if (reverse ? offsetA >= pos.ch || offsetA != match.length
: offsetA <= pos.ch || offsetA != line.length - match.length)
return;
for (;;) {
- if (reverse ? !ln : ln == lines.length - 1) return;
- line = fold(lines[ln += reverse ? -1 : 1].text);
+ if (reverse ? !ln : ln == doc.size - 1) return;
+ line = fold(getLine(ln += reverse ? -1 : 1).text);
match = target[reverse ? --idx : ++idx];
if (idx > 0 && idx < target.length - 1) {
if (line != match) return;
@@ -1484,10 +1782,10 @@ var CodeMirror = (function() {
}
if (reverse) {
if (!pos.line) return savePosAndFail(0);
- pos = {line: pos.line-1, ch: lines[pos.line-1].text.length};
+ pos = {line: pos.line-1, ch: getLine(pos.line-1).text.length};
}
else {
- if (pos.line == lines.length - 1) return savePosAndFail(lines.length);
+ if (pos.line == doc.size - 1) return savePosAndFail(doc.size);
pos = {line: pos.line+1, ch: 0};
}
}
@@ -1523,10 +1821,13 @@ var CodeMirror = (function() {
enterMode: "indent",
electricChars: true,
onKeyEvent: null,
+ lineWrapping: false,
lineNumbers: false,
gutter: false,
+ fixedGutter: false,
firstLineNumber: 1,
readOnly: false,
+ smartHome: true,
onChange: null,
onCursorActivity: null,
onGutterClick: null,
@@ -1537,6 +1838,7 @@ var CodeMirror = (function() {
workDelay: 200,
undoDepth: 40,
tabindex: null,
+ pollForIME: false,
document: window.document
};
@@ -1572,7 +1874,7 @@ var CodeMirror = (function() {
CodeMirror.listMIMEs = function() {
var list = [];
for (var m in mimeModes)
- if (mimeModes.propertyIsEnumerable(m)) list.push(m);
+ if (mimeModes.propertyIsEnumerable(m)) list.push({mime: m, mode: mimeModes[m]});
return list;
};
@@ -1634,11 +1936,11 @@ var CodeMirror = (function() {
}
return nstate;
}
- CodeMirror.startState = startState;
+ CodeMirror.copyState = copyState;
function startState(mode, a1, a2) {
return mode.startState ? mode.startState(a1, a2) : true;
}
- CodeMirror.copyState = copyState;
+ CodeMirror.startState = startState;
// The character stream used by a mode's parser.
function StringStream(string) {
@@ -1660,7 +1962,7 @@ var CodeMirror = (function() {
if (ok) {++this.pos; return ch;}
},
eatWhile: function(match) {
- var start = this.start;
+ var start = this.pos;
while (this.eat(match)){}
return this.pos > start;
},
@@ -1695,18 +1997,98 @@ var CodeMirror = (function() {
};
CodeMirror.StringStream = StringStream;
+ function MarkedText(from, to, className, set) {
+ this.from = from; this.to = to; this.style = className; this.set = set;
+ }
+ MarkedText.prototype = {
+ attach: function(line) { this.set.push(line); },
+ detach: function(line) {
+ var ix = indexOf(this.set, line);
+ if (ix > -1) this.set.splice(ix, 1);
+ },
+ split: function(pos, lenBefore) {
+ if (this.to <= pos && this.to != null) return null;
+ var from = this.from < pos || this.from == null ? null : this.from - pos + lenBefore;
+ var to = this.to == null ? null : this.to - pos + lenBefore;
+ return new MarkedText(from, to, this.style, this.set);
+ },
+ dup: function() { return new MarkedText(null, null, this.style, this.set); },
+ clipTo: function(fromOpen, from, toOpen, to, diff) {
+ if (this.from != null && this.from >= from)
+ this.from = Math.max(to, this.from) + diff;
+ if (this.to != null && this.to > from)
+ this.to = to < this.to ? this.to + diff : from;
+ if (fromOpen && to > this.from && (to < this.to || this.to == null))
+ this.from = null;
+ if (toOpen && (from < this.to || this.to == null) && (from > this.from || this.from == null))
+ this.to = null;
+ },
+ isDead: function() { return this.from != null && this.to != null && this.from >= this.to; },
+ sameSet: function(x) { return this.set == x.set; }
+ };
+
+ function Bookmark(pos) {
+ this.from = pos; this.to = pos; this.line = null;
+ }
+ Bookmark.prototype = {
+ attach: function(line) { this.line = line; },
+ detach: function(line) { if (this.line == line) this.line = null; },
+ split: function(pos, lenBefore) {
+ if (pos < this.from) {
+ this.from = this.to = (this.from - pos) + lenBefore;
+ return this;
+ }
+ },
+ isDead: function() { return this.from > this.to; },
+ clipTo: function(fromOpen, from, toOpen, to, diff) {
+ if ((fromOpen || from < this.from) && (toOpen || to > this.to)) {
+ this.from = 0; this.to = -1;
+ } else if (this.from > from) {
+ this.from = this.to = Math.max(to, this.from) + diff;
+ }
+ },
+ sameSet: function(x) { return false; },
+ find: function() {
+ if (!this.line || !this.line.parent) return null;
+ return {line: lineNo(this.line), ch: this.from};
+ },
+ clear: function() {
+ if (this.line) {
+ var found = indexOf(this.line.marked, this);
+ if (found != -1) this.line.marked.splice(found, 1);
+ this.line = null;
+ }
+ }
+ };
+
// Line objects. These hold state related to a line, including
// highlighting info (the styles array).
function Line(text, styles) {
this.styles = styles || [text, null];
- this.stateAfter = null;
this.text = text;
+ this.height = 1;
this.marked = this.gutterMarker = this.className = null;
+ this.stateAfter = this.parent = this.hidden = null;
+ }
+ Line.inheritMarks = function(text, orig) {
+ var ln = new Line(text), mk = orig.marked;
+ if (mk) {
+ for (var i = 0; i < mk.length; ++i) {
+ if (mk[i].to == null && mk[i].style) {
+ var newmk = ln.marked || (ln.marked = []), mark = mk[i];
+ var nmark = mark.dup(); newmk.push(nmark); nmark.attach(ln);
+ }
+ }
+ }
+ return ln;
}
Line.prototype = {
// Replace a piece of a line, keeping the styles around it intact.
- replace: function(from, to, text) {
- var st = [], mk = this.marked;
+ replace: function(from, to_, text) {
+ // Reset line class if the whole text was replaced.
+ if (!from && (to_ == null || to_ == this.text.length))
+ this.className = this.gutterMarker = null;
+ var st = [], mk = this.marked, to = to_ == null ? this.text.length : to_;
copyStyles(0, from, this.styles, st);
if (text) st.push(text, null);
copyStyles(to, this.text.length, this.styles, st);
@@ -1714,34 +2096,79 @@ var CodeMirror = (function() {
this.text = this.text.slice(0, from) + text + this.text.slice(to);
this.stateAfter = null;
if (mk) {
- var diff = text.length - (to - from), end = this.text.length;
- function fix(n) {return n <= Math.min(to, to + diff) ? n : n + diff;}
- for (var i = 0; i < mk.length; ++i) {
- var mark = mk[i], del = false;
- if (mark.from >= end) del = true;
- else {mark.from = fix(mark.from); if (mark.to != null) mark.to = fix(mark.to);}
- if (del || mark.from >= mark.to) {mk.splice(i, 1); i--;}
+ var diff = text.length - (to - from);
+ for (var i = 0, mark = mk[i]; i < mk.length; ++i) {
+ mark.clipTo(from == null, from || 0, to_ == null, to, diff);
+ if (mark.isDead()) {mark.detach(this); mk.splice(i--, 1);}
}
}
},
- // Split a line in two, again keeping styles intact.
+ // Split a part off a line, keeping styles and markers intact.
split: function(pos, textBefore) {
- var st = [textBefore, null];
+ var st = [textBefore, null], mk = this.marked;
copyStyles(pos, this.text.length, this.styles, st);
- return new Line(textBefore + this.text.slice(pos), st);
+ var taken = new Line(textBefore + this.text.slice(pos), st);
+ if (mk) {
+ for (var i = 0; i < mk.length; ++i) {
+ var mark = mk[i];
+ var newmark = mark.split(pos, textBefore.length);
+ if (newmark) {
+ if (!taken.marked) taken.marked = [];
+ taken.marked.push(newmark); newmark.attach(taken);
+ }
+ }
+ }
+ return taken;
},
- addMark: function(from, to, style) {
- var mk = this.marked, mark = {from: from, to: to, style: style};
- if (this.marked == null) this.marked = [];
- this.marked.push(mark);
- this.marked.sort(function(a, b){return a.from - b.from;});
- return mark;
+ append: function(line) {
+ var mylen = this.text.length, mk = line.marked, mymk = this.marked;
+ this.text += line.text;
+ copyStyles(0, line.text.length, line.styles, this.styles);
+ if (mymk) {
+ for (var i = 0; i < mymk.length; ++i)
+ if (mymk[i].to == null) mymk[i].to = mylen;
+ }
+ if (mk && mk.length) {
+ if (!mymk) this.marked = mymk = [];
+ outer: for (var i = 0; i < mk.length; ++i) {
+ var mark = mk[i];
+ if (!mark.from) {
+ for (var j = 0; j < mymk.length; ++j) {
+ var mymark = mymk[j];
+ if (mymark.to == mylen && mymark.sameSet(mark)) {
+ mymark.to = mark.to == null ? null : mark.to + mylen;
+ if (mymark.isDead()) {
+ mymark.detach(this);
+ mk.splice(i--, 1);
+ }
+ continue outer;
+ }
+ }
+ }
+ mymk.push(mark);
+ mark.attach(this);
+ mark.from += mylen;
+ if (mark.to != null) mark.to += mylen;
+ }
+ }
},
- removeMark: function(mark) {
- var mk = this.marked;
+ fixMarkEnds: function(other) {
+ var mk = this.marked, omk = other.marked;
if (!mk) return;
- for (var i = 0; i < mk.length; ++i)
- if (mk[i] == mark) {mk.splice(i, 1); break;}
+ for (var i = 0; i < mk.length; ++i) {
+ var mark = mk[i], close = mark.to == null;
+ if (close && omk) {
+ for (var j = 0; j < omk.length; ++j)
+ if (omk[j].sameSet(mark)) {close = false; break;}
+ }
+ if (close) mark.to = this.text.length;
+ }
+ },
+ addMark: function(mark) {
+ mark.attach(this);
+ if (this.marked == null) this.marked = [];
+ this.marked.push(mark);
+ this.marked.sort(function(a, b){return (a.from || 0) - (b.from || 0);});
},
// Run the given mode's parser over a line, update the styles
// array, which contains alternating fragments of text and CSS
@@ -1769,10 +2196,10 @@ var CodeMirror = (function() {
}
if (st.length != pos) {st.length = pos; changed = true;}
if (pos && st[pos-2] != prevWord) changed = true;
- // Short lines with simple highlights always count as changed,
- // because they are likely to highlight the same way in various
- // contexts.
- return changed || (st.length < 5 && this.text.length < 10);
+ // Short lines with simple highlights return null, and are
+ // counted as changed by the driver because they are likely to
+ // highlight the same way in various contexts.
+ return changed || (st.length < 5 && this.text.length < 10 ? null : false);
},
// Fetch the parser token for a given character. Useful for hacks
// that want to inspect the mode state (say, for completion).
@@ -1792,11 +2219,14 @@ var CodeMirror = (function() {
// Produces an HTML fragment for the line, taking selection,
// marking, and highlighting into account.
getHTML: function(sfrom, sto, includePre, endAt) {
- var html = [];
+ var html = [], first = true;
if (includePre)
html.push(this.className ? '<pre class="' + this.className + '">': "<pre>");
function span(text, style) {
if (!text) return;
+ // Work around a bug where, in some compat modes, IE ignores leading spaces
+ if (first && ie && text.charAt(0) == " ") text = "\u00a0" + text.slice(1);
+ first = false;
if (style) html.push('<span class="', style, '">', htmlEscape(text), "</span>");
else html.push(htmlEscape(text));
}
@@ -1809,10 +2239,10 @@ var CodeMirror = (function() {
span(" ", sfrom != null && sto == null ? "CodeMirror-selected" : null);
else if (!marked && sfrom == null)
for (var i = 0, ch = 0; ch < len; i+=2) {
- var str = st[i], l = str.length;
+ var str = st[i], style = st[i+1], l = str.length;
if (ch + l > len) str = str.slice(0, len - ch);
ch += l;
- span(str, "cm-" + st[i+1]);
+ span(str, style && "cm-" + style);
}
else {
var pos = 0, i = 0, text = "", style, sg = 0;
@@ -1856,6 +2286,11 @@ var CodeMirror = (function() {
}
if (includePre) html.push("</pre>");
return html.join("");
+ },
+ cleanUp: function() {
+ this.parent = null;
+ if (this.marked)
+ for (var i = 0, e = this.marked.length; i < e; ++i) this.marked[i].detach(this);
}
};
// Utility used by replace and split above
@@ -1874,6 +2309,191 @@ var CodeMirror = (function() {
}
}
+ // Data structure that holds the sequence of lines.
+ function LeafChunk(lines) {
+ this.lines = lines;
+ this.parent = null;
+ for (var i = 0, e = lines.length, height = 0; i < e; ++i) {
+ lines[i].parent = this;
+ height += lines[i].height;
+ }
+ this.height = height;
+ }
+ LeafChunk.prototype = {
+ chunkSize: function() { return this.lines.length; },
+ remove: function(at, n) {
+ for (var i = at, e = at + n; i < e; ++i) {
+ var line = this.lines[i];
+ line.cleanUp();
+ this.height -= line.height;
+ }
+ this.lines.splice(at, n);
+ },
+ collapse: function(lines) {
+ lines.splice.apply(lines, [lines.length, 0].concat(this.lines));
+ },
+ insertHeight: function(at, lines, height) {
+ this.height += height;
+ this.lines.splice.apply(this.lines, [at, 0].concat(lines));
+ for (var i = 0, e = lines.length; i < e; ++i) lines[i].parent = this;
+ },
+ iterN: function(at, n, op) {
+ for (var e = at + n; at < e; ++at)
+ if (op(this.lines[at])) return true;
+ }
+ };
+ function BranchChunk(children) {
+ this.children = children;
+ var size = 0, height = 0;
+ for (var i = 0, e = children.length; i < e; ++i) {
+ var ch = children[i];
+ size += ch.chunkSize(); height += ch.height;
+ ch.parent = this;
+ }
+ this.size = size;
+ this.height = height;
+ this.parent = null;
+ }
+ BranchChunk.prototype = {
+ chunkSize: function() { return this.size; },
+ remove: function(at, n) {
+ this.size -= n;
+ for (var i = 0; i < this.children.length; ++i) {
+ var child = this.children[i], sz = child.chunkSize();
+ if (at < sz) {
+ var rm = Math.min(n, sz - at), oldHeight = child.height;
+ child.remove(at, rm);
+ this.height -= oldHeight - child.height;
+ if (sz == rm) { this.children.splice(i--, 1); child.parent = null; }
+ if ((n -= rm) == 0) break;
+ at = 0;
+ } else at -= sz;
+ }
+ if (this.size - n < 25) {
+ var lines = [];
+ this.collapse(lines);
+ this.children = [new LeafChunk(lines)];
+ }
+ },
+ collapse: function(lines) {
+ for (var i = 0, e = this.children.length; i < e; ++i) this.children[i].collapse(lines);
+ },
+ insert: function(at, lines) {
+ var height = 0;
+ for (var i = 0, e = lines.length; i < e; ++i) height += lines[i].height;
+ this.insertHeight(at, lines, height);
+ },
+ insertHeight: function(at, lines, height) {
+ this.size += lines.length;
+ this.height += height;
+ for (var i = 0, e = this.children.length; i < e; ++i) {
+ var child = this.children[i], sz = child.chunkSize();
+ if (at <= sz) {
+ child.insertHeight(at, lines, height);
+ if (child.lines && child.lines.length > 50) {
+ while (child.lines.length > 50) {
+ var spilled = child.lines.splice(child.lines.length - 25, 25);
+ var newleaf = new LeafChunk(spilled);
+ child.height -= newleaf.height;
+ this.children.splice(i + 1, 0, newleaf);
+ newleaf.parent = this;
+ }
+ this.maybeSpill();
+ }
+ break;
+ }
+ at -= sz;
+ }
+ },
+ maybeSpill: function() {
+ if (this.children.length <= 10) return;
+ var me = this;
+ do {
+ var spilled = me.children.splice(me.children.length - 5, 5);
+ var sibling = new BranchChunk(spilled);
+ if (!me.parent) { // Become the parent node
+ var copy = new BranchChunk(me.children);
+ copy.parent = me;
+ me.children = [copy, sibling];
+ me = copy;
+ } else {
+ me.size -= sibling.size;
+ me.height -= sibling.height;
+ var myIndex = indexOf(me.parent.children, me);
+ me.parent.children.splice(myIndex + 1, 0, sibling);
+ }
+ sibling.parent = me.parent;
+ } while (me.children.length > 10);
+ me.parent.maybeSpill();
+ },
+ iter: function(from, to, op) { this.iterN(from, to - from, op); },
+ iterN: function(at, n, op) {
+ for (var i = 0, e = this.children.length; i < e; ++i) {
+ var child = this.children[i], sz = child.chunkSize();
+ if (at < sz) {
+ var used = Math.min(n, sz - at);
+ if (child.iterN(at, used, op)) return true;
+ if ((n -= used) == 0) break;
+ at = 0;
+ } else at -= sz;
+ }
+ }
+ };
+
+ function getLineAt(chunk, n) {
+ for (;;) {
+ for (var i = 0, e = chunk.children.length; i < e; ++i) {
+ var child = chunk.children[i], sz = child.chunkSize();
+ if (n < sz) { chunk = child; break; }
+ n -= sz;
+ }
+ if (chunk.lines) return chunk.lines[n];
+ }
+ }
+ function lineNo(line) {
+ if (line.parent == null) return null;
+ var cur = line.parent, no = indexOf(cur.lines, line);
+ for (var chunk = cur.parent; chunk; cur = chunk, chunk = chunk.parent) {
+ for (var i = 0, e = chunk.children.length; ; ++i) {
+ if (chunk.children[i] == cur) break;
+ no += chunk.children[i].chunkSize();
+ }
+ }
+ return no;
+ }
+ function lineAtHeight(chunk, h) {
+ var n = 0;
+ outer: do {
+ for (var i = 0, e = chunk.children.length; i < e; ++i) {
+ var child = chunk.children[i], ch = child.height;
+ if (h < ch) { chunk = child; continue outer; }
+ h -= ch;
+ n += child.chunkSize();
+ }
+ return n;
+ } while (!chunk.lines);
+ for (var i = 0, e = chunk.lines.length; i < e; ++i) {
+ var line = chunk.lines[i], lh = line.height;
+ if (h < lh) break;
+ h -= lh;
+ }
+ return n + i;
+ }
+ function heightAtLine(chunk, n) {
+ var h = 0;
+ outer: do {
+ for (var i = 0, e = chunk.children.length; i < e; ++i) {
+ var child = chunk.children[i], sz = child.chunkSize();
+ if (n < sz) { chunk = child; continue outer; }
+ n -= sz;
+ h += child.height;
+ }
+ return h;
+ } while (!chunk.lines);
+ for (var i = 0; i < n; ++i) h += chunk.lines[i].height;
+ return h;
+ }
+
// The history object 'chunks' changes that are made close together
// and at almost the same time into bigger undoable units.
function History() {
@@ -1930,16 +2550,6 @@ var CodeMirror = (function() {
else if (e.button & 2) return 3;
else if (e.button & 4) return 2;
}
- function e_pageX(e) {
- if (e.pageX != null) return e.pageX;
- var doc = e_target(e).ownerDocument;
- return e.clientX + doc.body.scrollLeft + doc.documentElement.scrollLeft;
- }
- function e_pageY(e) {
- if (e.pageY != null) return e.pageY;
- var doc = e_target(e).ownerDocument;
- return e.clientY + doc.body.scrollTop + doc.documentElement.scrollTop;
- }
// Event handler registration. If disconnect is true, it'll return a
// function that unregisters the handler.
@@ -1958,16 +2568,18 @@ var CodeMirror = (function() {
function Delayed() {this.id = null;}
Delayed.prototype = {set: function(ms, f) {clearTimeout(this.id); this.id = setTimeout(f, ms);}};
- // Some IE versions don't preserve whitespace when setting the
- // innerHTML of a PRE tag.
- var badInnerHTML = (function() {
- var pre = document.createElement("pre");
- pre.innerHTML = " "; return !pre.innerHTML;
- })();
+ // Detect drag-and-drop
+ var dragAndDrop = function() {
+ // IE8 has ondragstart and ondrop properties, but doesn't seem to
+ // actually support ondragstart the way it's supposed to work.
+ if (/MSIE [1-8]\b/.test(navigator.userAgent)) return false;
+ var div = document.createElement('div');
+ return "draggable" in div;
+ }();
var gecko = /gecko\/\d{7}/i.test(navigator.userAgent);
var ie = /MSIE \d/.test(navigator.userAgent);
- var safari = /Apple Computer/.test(navigator.vendor);
+ var webkit = /WebKit\//.test(navigator.userAgent);
var lineSep = "\n";
// Feature-detect whether newlines in textareas are converted to \r\n
@@ -1979,6 +2591,7 @@ var CodeMirror = (function() {
var tabSize = 8;
var mac = /Mac/.test(navigator.platform);
+ var win = /Win/.test(navigator.platform);
var movementKeys = {};
for (var i = 35; i <= 40; ++i)
movementKeys[i] = movementKeys["c" + i] = true;
@@ -2001,21 +2614,44 @@ var CodeMirror = (function() {
if (elt.currentStyle) return elt.currentStyle;
return window.getComputedStyle(elt, null);
}
+
// Find the position of an element by following the offsetParent chain.
// If screen==true, it returns screen (rather than page) coordinates.
function eltOffset(node, screen) {
- var doc = node.ownerDocument.body;
- var x = 0, y = 0, skipDoc = false;
+ var bod = node.ownerDocument.body;
+ var x = 0, y = 0, skipBody = false;
for (var n = node; n; n = n.offsetParent) {
- x += n.offsetLeft; y += n.offsetTop;
+ var ol = n.offsetLeft, ot = n.offsetTop;
+ // Firefox reports weird inverted offsets when the body has a border.
+ if (n == bod) { x += Math.abs(ol); y += Math.abs(ot); }
+ else { x += ol, y += ot; }
if (screen && computedStyle(n).position == "fixed")
- skipDoc = true;
+ skipBody = true;
}
- var e = screen && !skipDoc ? null : doc;
+ var e = screen && !skipBody ? null : bod;
for (var n = node.parentNode; n != e; n = n.parentNode)
if (n.scrollLeft != null) { x -= n.scrollLeft; y -= n.scrollTop;}
return {left: x, top: y};
}
+ // Use the faster and saner getBoundingClientRect method when possible.
+ if (document.documentElement.getBoundingClientRect != null) eltOffset = function(node, screen) {
+ // Take the parts of bounding client rect that we are interested in so we are able to edit if need be,
+ // since the returned value cannot be changed externally (they are kept in sync as the element moves within the page)
+ try { var box turned value cannot be changed externally (they are kept in sync as the element moves within the page) ; ��� ���� uJ1+ �j2+ eR+ �XN+ ���� �pp+ ���� ����� k`1+ 6 � � ! � ! ����� ���� xN+ ���� �B1+ �`1+ ����� `B1+ ����� ��+ uJ1+ �+ ��+ � �+ �j2+ xN+ ���� ����� k`1+ �! �! ����� ���� H�-+ ����� �B1+ �`1+ ����� `B1+ ����� ����� ����� 8kR+ �p� ���� uJ1+ �j2+ ����� ����� k`1+ G H I J K M N O P ����� ���� H�+ ����� �B1+ �`1+ ����� 0�+ uJ1+ N+ ���+ �+ ��+ � �+ �j2+ H�+ ����� ����� k`1+ 8�+ ����� ���� k`1+ (�+ ����� 0���� k`1+ �+ ����� `���� k`1+ ��+ uJ1+ � �+ ����� ��+ eI1+ ��+ ���� y�+ eI1+ �+ 0���� Z�+ eI1+ ���+ N+ ���+ �+ �$N+ ��+ � �+ �j2+ 8kR+ ��+ ���� p[�+ ����� ����� k`1+ 5 6 7 8 : < = > ? @ B D ����� ���� ���+ ���� uJ1+ eR+ `���� ��+ eI1+ eR+ �_@f �S Q��l�� ��y+ ���� ���+ ����� ����� k`1+ u]�� 4Q��U^Qʉ� �u������*ēv����� ���� H�v+ $�+ `���� �0+ �0+ �v�+ ����� ���� ����� @���� /N+ uJ1+ �$N+ ����� �0+ p���� ���� ���������0+ (���� = node.getBoundingClientRect(); box = { top: box.top, left: box.left }; }
+ catch(e) { box = {top: 0, left: 0}; }
+ if (!screen) {
+ // Get the toplevel scroll, working around browser differences.
+ if (window.pageYOffset == null) {
+ var t = document.documentElement || document.body.parentNode;
+ if (t.scrollTop == null) t = document.body;
+ box.top += t.scrollTop; box.left += t.scrollLeft;
+ } else {
+ box.top += window.pageYOffset; box.left += window.pageXOffset;
+ }
+ }
+ return box;
+ };
+
// Get a node's text content.
function eltText(node) {
return node.textContent || node.innerText || node.nodeValue || "";
@@ -2026,11 +2662,17 @@ var CodeMirror = (function() {
function posLess(a, b) {return a.line < b.line || (a.line == b.line && a.ch < b.ch);}
function copyPos(x) {return {line: x.line, ch: x.ch};}
- var escapeElement = document.createElement("div");
+ var escapeElement = document.createElement("pre");
function htmlEscape(str) {
- escapeElement.innerText = escapeElement.textContent = str;
+ if (badTextContent) {
+ escapeElement.innerHTML = "";
+ escapeElement.appendChild(document.createTextNode(str));
+ } else {
+ escapeElement.textContent = str;
+ }
return escapeElement.innerHTML;
}
+ var badTextContent = htmlEscape("\t") != "\t";
CodeMirror.htmlEscape = htmlEscape;
// Used to position the cursor after an undo/redo by finding the
@@ -2073,7 +2715,7 @@ var CodeMirror = (function() {
try {return {start: te.selectionStart, end: te.selectionEnd};}
catch(e) {return null;}
};
- if (safari)
+ if (webkit)
// On Safari, selection set with setSelectionRange are in a sort
// of limbo wrt their anchor. If you press shift-left in them,
// the anchor is put at the end, and the selection expanded to
@@ -2140,5 +2782,4 @@ var CodeMirror = (function() {
CodeMirror.defineMIME("text/plain", "null");
return CodeMirror;
-})()
-;
\ No newline at end of file
+})();
diff --git a/js/functions.js b/js/functions.js
index c9574a1..12c6a65 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -2053,7 +2053,7 @@ $(document).ready(function() {
//Sort the table
$(tables_table).PMA_sort_table('th');
-
+
// Adjust summary row
PMA_adjustTotals();
}
@@ -3434,7 +3434,13 @@ $(document).ready(function() {
$(document).ready(function() {
var elm = $('#sqlquery');
if (elm.length > 0 && typeof CodeMirror != 'undefined') {
- codemirror_editor = CodeMirror.fromTextArea(elm[0], {lineNumbers: true, matchBrackets: true, indentUnit: 4, mode: "text/x-mysql"});
+ codemirror_editor = CodeMirror.fromTextArea(elm[0], {
+ lineNumbers: true,
+ matchBrackets: true,
+ indentUnit: 4,
+ mode: "text/x-mysql",
+ lineWrapping: true
+ });
}
});
@@ -3645,11 +3651,11 @@ $(document).ready(function () {
/**
* Toggles row colors of a set of 'tr' elements starting from a given element
- *
+ *
* @param $start Starting element
*/
-function toggleRowColors($start)
-{
+function toggleRowColors($start)
+{
for (var $curr_row = $start; $curr_row.length > 0; $curr_row = $curr_row.next()) {
if ($curr_row.hasClass('odd')) {
$curr_row.removeClass('odd').addClass('even');
diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php
index 71fa37e..5b5dd1c 100644
--- a/themes/original/css/theme_right.css.php
+++ b/themes/original/css/theme_right.css.php
@@ -2198,12 +2198,16 @@ fieldset .disabled-field td {
}
.CodeMirror-scroll {
- height: <?php echo ceil($GLOBALS['cfg']['TextareaRows'] * 1.2); ?>em;
overflow: auto;
+ height: <?php echo ceil($GLOBALS['cfg']['TextareaRows'] * 1.2); ?>em;
+ /* This is needed to prevent an IE[67] bug where the scrolled content
+ is visible outside of the scrolling box. */
+ position: relative;
}
.CodeMirror-gutter {
position: absolute; left: 0; top: 0;
+ z-index: 10;
background-color: #f7f7f7;
border-right: 1px solid #eee;
min-width: 2em;
@@ -2213,6 +2217,7 @@ fieldset .disabled-field td {
color: #aaa;
text-align: right;
padding: .4em .2em .4em .4em;
+ white-space: pre !important;
}
.CodeMirror-lines {
padding: .4em;
@@ -2227,6 +2232,16 @@ fieldset .disabled-field td {
font-family: inherit;
font-size: inherit;
padding: 0; margin: 0;
+ white-space: pre;
+ word-wrap: normal;
+}
+
+.CodeMirror-wrap pre {
+ word-wrap: break-word;
+ white-space: pre-wrap;
+}
+.CodeMirror-wrap .CodeMirror-scroll {
+ overflow-x: hidden;
}
.CodeMirror textarea {
diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php
index 8cce259..0e01c47 100644
--- a/themes/pmahomme/css/theme_right.css.php
+++ b/themes/pmahomme/css/theme_right.css.php
@@ -2620,10 +2620,14 @@ fieldset .disabled-field td {
.CodeMirror-scroll {
overflow: auto;
height: <?php echo ceil($GLOBALS['cfg']['TextareaRows'] * 1.2); ?>em;
+ /* This is needed to prevent an IE[67] bug where the scrolled content
+ is visible outside of the scrolling box. */
+ position: relative;
}
.CodeMirror-gutter {
position: absolute; left: 0; top: 0;
+ z-index: 10;
background-color: #f7f7f7;
border-right: 1px solid #eee;
min-width: 2em;
@@ -2633,6 +2637,7 @@ fieldset .disabled-field td {
color: #aaa;
text-align: right;
padding: .4em .2em .4em .4em;
+ white-space: pre !important;
}
.CodeMirror-lines {
padding: .4em;
@@ -2647,6 +2652,16 @@ fieldset .disabled-field td {
font-family: inherit;
font-size: inherit;
padding: 0; margin: 0;
+ white-space: pre;
+ word-wrap: normal;
+}
+
+.CodeMirror-wrap pre {
+ word-wrap: break-word;
+ white-space: pre-wrap;
+}
+.CodeMirror-wrap .CodeMirror-scroll {
+ overflow-x: hidden;
}
.CodeMirror textarea {
hooks/post-receive
--
phpMyAdmin
1
0
[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_5_0BETA1-210-g8e30c72
by Michal Čihař 27 Jan '12
by Michal Čihař 27 Jan '12
27 Jan '12
The branch, master has been updated
via 8e30c72834a64dfa9f984466abe0071208dc6bd9 (commit)
via 8e0cb60950ab01ab87f347f76bc9b09c3035420d (commit)
via d94818837fc23da5f39234dfbd53722d2c197d34 (commit)
via 27bfe7ac795d05fc7cb3effb9f3be0e4e053f58b (commit)
via 412e3744e1dfeb46da9ceb0212a05224b8f10688 (commit)
via adaf3280376022d7275bf492a06741bb17445752 (commit)
via 31457b4bbb5ff5aaa05b8a19e8ccb18578830741 (commit)
via d5fa229af57a555f67135e7e452096320056fcff (commit)
via b752f2e6dbaa18bcfd21262dac7049a93178f588 (commit)
via 2d377e42b20122afb7036d7e85407121c6321089 (commit)
via 5047e1a98d9907dc09cf82e33a26415a4cd0f2e9 (commit)
via 3f2ee5bb76ce7a7729d3406f3824c88664949dea (commit)
via b78088f8ab3fbe19db1a0def65520ae053cd35a8 (commit)
via e5d1f9e2458d197db0fc32108de0d9e66ab34258 (commit)
via 587a60a1e3a842cff8fc5300180c8c6c27783327 (commit)
via 8cdea9729739c4e07586cc73425cf450a9479ec6 (commit)
via 16ff748c7d5c12fe39c39dcda2830938609806cd (commit)
via 20353f2f45e4dfd48b1a1faffe1b075b9c522f2c (commit)
via c1025dbfa2db560487f3a88812208dadde10c691 (commit)
via 88e76f7efe09dc3487627a9264271abcdbe73bf4 (commit)
via 6727f9a9dd7acc2294df27e4f37ec185e40df27d (commit)
via 59ffc43b9a8f6fba00016e4d30fe70bf3cd00592 (commit)
via 4630b8733b8930f2324309337854c5a1c25d5ff6 (commit)
via 44a7ffc751ee557f816beb9055ea7aee8d3e35cc (commit)
via e54ecbd86eb8819e07cc7ad859054d0975a70fc0 (commit)
via 296eb0dd5eaaf55df6ee6208fec42e12b4aa78fa (commit)
via b31854552b1a19e98637aa94bce63d481a3ff3ab (commit)
via fb1cd3540bcf91c5c36459591f26e550e03f4d25 (commit)
via bb95bd7191c34bff7b56fba91252cfb40dc4efcd (commit)
via 08a94d6fd6430873aa43496598a5eaf52833baa9 (commit)
via cbb91c66f77a82994a4579e52e1cd42497a79b92 (commit)
via f2727e7cf860978c1e420dea67bbbdbc914a4afd (commit)
via de994756082f7333c79c6c4c1e2106a6886e3cc6 (commit)
via e1be402c003802f2c27f251fd3c3f4938b59e03c (commit)
via c9ca75208a124ddd492735dcb4520f141e7239d9 (commit)
via 367fdb67876789f46ed1540f078e4d66e1bd6a3c (commit)
via b47008f010563eca33d9afff54d5172379853785 (commit)
via f576d5499dc21b686174893e5401650eaef7714e (commit)
via 862ee84f985285df7acafcd7dff4c3fc968f1544 (commit)
via 0d6c3163fae49feb63932baee293019a5c423c8c (commit)
via 27d3fee84690729efdc137c7183de49b9176b193 (commit)
via 4730e20d28c93f1842da30be9ff7e1cab649f86d (commit)
via 717064a24e8d891ba2d521958f0b21baf4d854b7 (commit)
via 19f46cfee9d1098b65082ed5dee60a1400f74586 (commit)
via 16b161f6e3fe47e5b5a07fbca2c57eb1cdf478fa (commit)
via 86f514a94162dc06e9c64ddcf8eee8749a3b15a7 (commit)
via 2177c5276382b32bcef89b09c1caab63672a678b (commit)
via 61d5ed88e50344ac4c4d26eac005d4ddbec2e524 (commit)
via 3359f1c8beaf5ccb206c80ff03bea9d7a3ee1bd9 (commit)
via aa3d780d3435c80a284e32c8f7c7d1b7401451f8 (commit)
via 15ffc9fd5d93ef84641a361c61560dbc777ba752 (commit)
via be6bbb325683e96b7e3bcd19eabc5d8e8ce0412f (commit)
via b35b772970d804d6a2fd67d28287cb0006ccf43c (commit)
via 58d905dd66cb6877f0ab443a07ab62b53d9c9bff (commit)
via 81752ad13934f4ef25e36d8fd03029b19c9a7a1a (commit)
via 6adefd3e33b5864ee0a0cb25b10a663a16511ead (commit)
via 446096edde5521f5f4e03d11ad52a1535401541f (commit)
via f3adf3265713ce4fac3111521df8b7baf2e6473a (commit)
via c81b133ac063741870c06c6668ab1d41d94b68a9 (commit)
via 9cf189526d8ec350310cbde5d65c0f12d92eb373 (commit)
via 938ab92e5a17487d4c77c6e8eeb15a1065592a58 (commit)
via ea8ad6ae34093ccfc830c97089ba8da5bbb13bb1 (commit)
via a6feb3318ab4cdb020960b91cc824e95ee2cbb3d (commit)
via aad18d9bf7e42999b566632c6f2955c0edeeb926 (commit)
via 7e0316495239d222a89f3736b7661afee59623ec (commit)
via da19538d1c1ab899d5b8994d67b9d739977696d3 (commit)
via 4e0da89fe9b707ac1d8fe05349034c1242046fe8 (commit)
via 108a038caa6a2075ad3245636e0371f2c3ae902d (commit)
via 8033483f361155cb5abf65f33b1d59467d243a3b (commit)
via 5a16e656fe72c7757f782d72e9f86b2a1afaa44c (commit)
via b1c4a1bfcaed3282847aaabaa028ea1ba1c23d09 (commit)
via 826554629659b47a272cef20042df3318e3d243e (commit)
via 9f7c8facae8cfdb83db6a70f1c54c1899fe4fc88 (commit)
via bcf0053a3f87c427ab3123b87c6ebfa551f6a916 (commit)
via 406ab2ae35e4c1ab740152dacd31f250ae11ce1b (commit)
via 5272cb1f595e4d146e2caf952ad3b9f2cc6f7cc7 (commit)
via 9e4359bc2a7197b68e2d3c3d1518c283de2f99ed (commit)
via 13b3815045351aa226049f3abf86ba63974303fe (commit)
via 79bbd61c406ef5f798d5897aea64bd54af572dab (commit)
via a6779be12c89e8ea79af90d9c167900d727d2b89 (commit)
via 74f7090be85c08ace379c1fecff1ad2aaecb2373 (commit)
via 5f863d2135537a6f9a37149334a70363e2dd444d (commit)
via e6c5ad628088e7090c2281944965799b7fb36863 (commit)
via 6fe16de1dfb56d432a77f682eebf1d9000d9cb9f (commit)
via 224080ae321e8c447b8f070ccb5292b1582a166e (commit)
via c4fb92c0a12f24b395676f6bea65d1f804f1a65f (commit)
via f97f64a2b14c6c0b28a20bdd03565307315d7ba7 (commit)
via 99fd1e0832690daf67e2e15508c3134afe2520f6 (commit)
via ec497a403e85798b3da335da94e45294be7a4fb7 (commit)
via acda27371a3cd11dcdd0223bbd79514c98f0a8d1 (commit)
via 5cfd2cb76b1635286cdda7676985a243cd27ee0c (commit)
via c79367010c9fe462ec6d299f9efd6d544af53d66 (commit)
via bda0e8ca236332a046ad17efd5cd815f67860639 (commit)
via f716445accdd3b505322c5614fbce4a287e5aef9 (commit)
via 51911b7df4ee862d35f7fd5def57d179f4b9abbe (commit)
via 1cd05eb20a77d0c8608711203ab58f5b15d17594 (commit)
via e722d7c24aa81228d95d1cd43774814ed398f5fb (commit)
via f5bd9839107dbccd17e834f5e92d3f512e0465ed (commit)
via 1099c6ebdbe8efcfb161f0774ff5e63196ba63a1 (commit)
via 0f7e257a403ac4211b66ebe92dd4ac5f589c2cda (commit)
via a50c2c6a0bad03899f543c89fe2b9396d9b1b9d3 (commit)
via 02ff14b657842a86d3b63a133aa87146fce542c1 (commit)
via 52a007762060d593586252734661f9668a65dcbc (commit)
via 94792142c4f3d33f57150339dcec2902a85dcdbc (commit)
via ddc2100e200f605a351d215017d3e8683e9f131b (commit)
via 260546252d7c52f1856f955e1cbb6fb7218871dd (commit)
via 2c7674668a60d853a8c379caa2bc356ff5ab7146 (commit)
via 60d0e7d57e05d3e8a17e5be6a671f5bee4812ff7 (commit)
via 550a9f90b6e4db6d419e0f6046b1b1d30df76f39 (commit)
via d97a208cb29fc2032be62a8b58550c939a4d8a49 (commit)
via 66dadd4aafd3987dcdbcddfdffe5093f11f1b27d (commit)
via 2a38e1a7cd83bdf2c91a8f59d701f3a0b013ed18 (commit)
via 5be4861b487cc2a9d0737b4c34ce91eb9dc15d3e (commit)
via 01a6292f69bfd074941216070bf602dc21440212 (commit)
via 6856bc91ca32e3303813c3dd9d2e274f2d791106 (commit)
via 655ea9e9d4b4863e3f8de9c7f30fe32ac6d56f3a (commit)
via 258a6233136216d9df29543b76b82fd0ea229a18 (commit)
via 96f01440032e0a818a801cf22c2ea52bc6c56491 (commit)
via 52b6810f06f1344271347a9aa243f55e84306b57 (commit)
via cb02b8690194d1988078cb5d8e1407f523b6ec73 (commit)
via 72e7e01955deb2cf3ad8ecca751dc7ed7f425522 (commit)
via 1a6d3875ac6d4250c972b2920af17771d8ed8746 (commit)
via cb6bcedb853eb18cc8b9a9b23812aac6597d713b (commit)
via 8b558322b389846b0c6d44d83aa11a6b55c98d52 (commit)
via 056092d3fcb0b58ae87f728712d119abcb23bab4 (commit)
via a32b91909798a0370ef0f565548bb367a16c59f2 (commit)
via d3e372cf0d69fd374bc60525e70e1209cff68bba (commit)
via a36e8cd7ee8a10552381fae77b5e9d01c47ea6b2 (commit)
via 0ed4c01e5712a4f1a74bf4feb00ddcac2c6b03c9 (commit)
via 56c3ff5e2eca2ee02c7505d4dfe1aaad90e5f45c (commit)
via 89908d5eebb0eab10b4b60a1ef40220c6501f1c9 (commit)
via ddf325f14c825a5bb7ec4e1217d7461f62ca9af5 (commit)
via 758499763734be210016effd880c775185ee594c (commit)
via fd4be143c55ba58146de142fd24b5ad6934e5e0f (commit)
via b3b8f5cd95617128063afbb0cf584cc77fd57456 (commit)
via 38bf72810ac06322b3480e43186373abcdaf4865 (commit)
via ef88b26ee2a9bf90c984d6abec7cff990081b24c (commit)
via fef002afc396151939dfde94430b812c4805e05c (commit)
via 6c29461c68d785a97202531f683fe83a37ba5a90 (commit)
via dba6786e18bb9afbc46de0bcbb6ad7cb8be71648 (commit)
via 2ac5617d4d3a9039026ef97e2ff90a992d4891b8 (commit)
via 7978886359013059fa02ce75ff10e721e867f985 (commit)
via c8a107641efad65b35df8a6dc45d98750be134d1 (commit)
via 4196e3aa74765fa5fa91b6aabf9bab8860db618e (commit)
via 5908d7c8e2e0fc0e674f7ec0996bf4c7505e762d (commit)
via 851d6c82c24d003089f75678017830a964dc1868 (commit)
via 66d1e58b92596ff655911c8898a24003e20dd466 (commit)
via 6d7e529875278ac615e836ded4910772be8674a8 (commit)
via ae6bfbda68cc94375edc9669e55bc6995543b987 (commit)
via a6b97fc8483276e4ab77c010d73fc9f786b14cbd (commit)
via e7682298d04e43d6f455a0b581d591073eb9e6c7 (commit)
via db99b31d5f77986bda016b3a3860b1341eb39135 (commit)
via b62cd9278d0402ae89eed230c725dc222d4cf8a9 (commit)
via e5f70a91a9c3f21a4f063c0448c7301ed7e602c3 (commit)
via fa4b62e88c05ccfd510aea8dabc20c82949d0e09 (commit)
via 21a906672512db6ee8968221fc4419e7662d419f (commit)
via 4480900c60c881ba52602b0140252a6900f3f5ce (commit)
via 9662cafa8d9f835782b03b4a2ab720b8d4034288 (commit)
via e1430400b3f5da0196adedcc06426e7b97c3bed6 (commit)
via ed5f324775e36b13cc65a57abb8d263074ffb1fd (commit)
via 6718a5641d52634d73b94540fa52035296be4abd (commit)
via b19adaad658d5bb778bb262065e4e0e40c5e93b6 (commit)
via c9f2747292454d971a551b2aa71b86f5bd96827f (commit)
via c07d33bc135656f26a24a98968a855ff62b3034c (commit)
via f19bed914f4c6670e83efb3f7e21648d3530e663 (commit)
via f0916b149263fe460496f1bf743c1e5eae6c4100 (commit)
via 8f570e35e58d542e866250b94a52ed94299c9522 (commit)
via 097e74a503156f331fa408a18da892e8f39f8ce9 (commit)
via 80da8012860579a4546721f5005cff10713981f8 (commit)
via 36ba328e154b588fe4ef471fada9d780021efa3f (commit)
via 4783a108a80b7887669f7cd31a2d066c004f16a3 (commit)
via 0369bbf92ba155b510835962edfca0157a813fdf (commit)
via dd90f5d0f6414319c8c0e4c10fdfb3dfa0f3f103 (commit)
via f35e4c6e937974b67f3cc193d4276a4971d026af (commit)
via f19cb94e436eb1f028565b967f74204f0dcd9aaf (commit)
via 31e86ac291a1b0006e545c6f943595bb78bd5953 (commit)
via e34ce439901439784ea494c6b9a8d0613a960470 (commit)
via 20626ad3864b3c1ad828a3152cb8c61dfb9bcace (commit)
via 5e79499aea583470e37633d2e0db3f0cdfccabc6 (commit)
via 0912bbd0d365ba14b48e3cb0fcb01ea4a1afc69f (commit)
via 05cfb37bc27707bd234597686d291051188e05a1 (commit)
via 3f0e3fc8f820ee21da91ca1ad611eb77f44800c3 (commit)
via 7e84ee25a97db791406768ead8334713690572f6 (commit)
via 5032e4e1526a2492c3c1da5a43dd8f053b66ad37 (commit)
via 4a252e0696206027a459d2d0fee7a157a6729cb7 (commit)
via 907f5d4ed3b1a9fd9d39f897352d17e8fe54d48d (commit)
via a797c58414027b344357678b3d8ee2f77197f203 (commit)
via c9aedb07ff31de8f8d668d3bda729110d463c1ab (commit)
via 021b5136f672d79f83092dba0812ff1bc8b12d26 (commit)
via dc9f4a7a3c7042f5924837e91ea3987d53766c1a (commit)
via 19d57c8ee4cc5aef113e368d75744a05dac19a39 (commit)
via 8877119f787839d6919ae436c9cd1df2585d23ea (commit)
from 90d81d90c79b1400c6fb6b0a9ce22b5616653edd (commit)
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
po/ja.po | 32 +++---
po/ko.po | 390 +++++++++++++++++++++++++----------------------------------
po/tr.po | 4 +-
po/zh_CN.po | 6 +-
4 files changed, 186 insertions(+), 246 deletions(-)
diff --git a/po/ja.po b/po/ja.po
index 20a7bb7..0cf0ca6 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.5.0-beta2\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
"POT-Creation-Date: 2012-01-25 17:45+0100\n"
-"PO-Revision-Date: 2012-01-23 15:53+0200\n"
+"PO-Revision-Date: 2012-01-26 12:03+0200\n"
"Last-Translator: Yuichiro <yuichiro(a)pop07.odn.ne.jp>\n"
"Language-Team: japanese <jp(a)li.org>\n"
"Language: ja\n"
@@ -244,7 +244,7 @@ msgstr "はい"
#: db_export.php:26
msgid "View dump (schema) of database"
-msgstr "DB のダンプ(スキーマ)表示"
+msgstr "データベースのダンプ (スキーマ) 表示"
#: db_export.php:30 db_printview.php:94 db_qbe.php:101 db_tracking.php:48
#: export.php:354 navigation.php:296
@@ -525,7 +525,7 @@ msgstr "\"<i>%s</i>\" の検索結果 %s:"
#, php-format
msgid "%s match inside table <i>%s</i>"
msgid_plural "%s matches inside table <i>%s</i>"
-msgstr[0] "%s 件（テーブル <i>%s</i>)"
+msgstr[0] "%s 件 (テーブル <i>%s</i>)"
#: db_search.php:234 libraries/common.lib.php:3128
#: libraries/common.lib.php:3340 libraries/common.lib.php:3341
@@ -2895,7 +2895,7 @@ msgstr "実行した SQL"
#: libraries/rte/rte_triggers.lib.php:91
#: libraries/rte/rte_triggers.lib.php:104
msgid "MySQL said: "
-msgstr "MySQLのメッセージ: "
+msgstr "MySQL のメッセージ: "
#: libraries/common.lib.php:1127
msgid "Failed to connect to SQL validator!"
@@ -4405,8 +4405,8 @@ msgid ""
"[kbd]SMART[/kbd] - i.e. descending order for columns of type TIME, DATE, "
"DATETIME and TIMESTAMP, ascending order otherwise"
msgstr ""
-"[kbd]SMART[/kbd] とは TIME、DATE、DATETIME、TIMESTAMP 型のカラムに対しては "
-"DESC、それ以外はASCの並び順にします。"
+"[kbd]SMART[/kbd] とは TIME、DATE、DATETIME、TIMESTAMP 型のカラムに対しては DESC、それ以外は ASC "
+"の並び順にします。"
#: libraries/config/messages.inc.php:330
msgid "Default sorting order"
@@ -4624,7 +4624,7 @@ msgstr "圧縮通信を行う"
#: libraries/config/messages.inc.php:380
msgid "How to connect to server, keep [kbd]tcp[/kbd] if unsure"
-msgstr "サーバへの接続方法。確信がなければ [kbd]tcp[/kbd] のままにします。"
+msgstr "サーバへの接続方法。確信がなければ [kbd]tcp[/kbd] のままにしてください。"
#: libraries/config/messages.inc.php:381
msgid "Connection type"
@@ -5023,7 +5023,7 @@ msgstr "このサーバの詳細な名前"
#: libraries/config/messages.inc.php:455
msgid "Whether a user should be displayed a "show all (rows)" button"
-msgstr "「すべて表示」ボタンを表示するかどうか。"
+msgstr "「(行を) すべて表示」ボタンを表示するかどうか。"
#: libraries/config/messages.inc.php:456
msgid "Allow to display all the rows"
@@ -6092,11 +6092,11 @@ msgstr "書き込み待ち"
#: libraries/engines/innodb.lib.php:242
msgid "Read misses in %"
-msgstr "読み込みミス(％)"
+msgstr "読み込みミス (%)"
#: libraries/engines/innodb.lib.php:250
msgid "Write waits in %"
-msgstr "書き込み待ち(％)"
+msgstr "書き込み待ち (%)"
#: libraries/engines/myisam.lib.php:22
msgid "Data pointer size"
@@ -6721,7 +6721,7 @@ msgstr "XML"
#: libraries/export/xml.php:34
msgid "Object creation options (all are recommended)"
-msgstr "生成オプション（全て推奨）"
+msgstr "生成オプション (すべて推奨)"
#: libraries/export/xml.php:62
msgid "Views"
@@ -7364,7 +7364,7 @@ msgstr "申し訳ありませんが、削除されたイベントの復元に失
#: libraries/rte/rte_events.lib.php:117 libraries/rte/rte_routines.lib.php:267
#: libraries/rte/rte_triggers.lib.php:90
msgid "The backed up query was:"
-msgstr ""
+msgstr "バックアップされていたクエリ:"
#: libraries/rte/rte_events.lib.php:121
#, php-format
@@ -7406,10 +7406,10 @@ msgid "Event type"
msgstr "イベント種別"
#: libraries/rte/rte_events.lib.php:416 libraries/rte/rte_routines.lib.php:849
-#, fuzzy, php-format
+#, php-format
#| msgid "Change"
msgid "Change to %s"
-msgstr "変更"
+msgstr "%s に変更する"
#: libraries/rte/rte_events.lib.php:422
msgid "Execute at"
@@ -8926,7 +8926,7 @@ msgstr "ストレージエンジン"
#: server_export.php:20
msgid "View dump (schema) of databases"
-msgstr "データベースのダンプ(スキーマ)表示"
+msgstr "データベースのダンプ (スキーマ) 表示"
#: server_plugins.php:81
msgid "Modules"
@@ -11287,7 +11287,7 @@ msgstr "テーブル %1$s を作成しました。"
#: tbl_export.php:24
msgid "View dump (schema) of table"
-msgstr "テーブルのダンプ(スキーマ)表示"
+msgstr "テーブルのダンプ (スキーマ) 表示"
#: tbl_gis_visualization.php:112
msgid "Display GIS Visualization"
diff --git a/po/ko.po b/po/ko.po
index 95162a2..3b66495 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.5.0-beta2\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
"POT-Creation-Date: 2012-01-25 17:45+0100\n"
-"PO-Revision-Date: 2011-11-18 08:35+0200\n"
+"PO-Revision-Date: 2012-01-27 08:18+0200\n"
"Last-Translator: manyfun <manyfun7(a)gmail.com>\n"
"Language-Team: korean <ko(a)li.org>\n"
"Language: ko\n"
@@ -103,10 +103,9 @@ msgid "No blob streaming server configured!"
msgstr "blob streaming 서버 설정이 되지 않았습니다!"
#: bs_disp_as_mime_type.php:35
-#, fuzzy
#| msgid "Failed to write file to disk."
msgid "Failed to fetch headers"
-msgstr "헤더를 가져오는 데 실패했습니다"
+msgstr "헤더를 가져오는 데 실패했습니다."
#: bs_disp_as_mime_type.php:41
msgid "Failed to open remote URL"
@@ -117,9 +116,7 @@ msgstr "원격 URL 열기에 실패했습니다"
msgid ""
"The %s file is not available on this system, please visit www.phpmyadmin.net "
"for more information."
-msgstr ""
-"%s 파일이 이 시스템에서 사용 가능하지 않습니다. www.phpmyadmin.net에 방문하"
-"여 정보를 확인하시기 바랍니다."
+msgstr "%s 파일은 이 시스템에서 이용할 수 없습니다. www.phpmyadmin.net에 방문하여 정보를 확인하시기 바랍니다."
#: db_create.php:60
#, php-format
@@ -202,7 +199,7 @@ msgstr "링크 대상:"
#: libraries/schema/Pdf_Relation_Schema.class.php:1333
#: libraries/tbl_properties.inc.php:122 tbl_printview.php:144
msgid "Comments"
-msgstr "설명(코멘트)"
+msgstr "설명"
#: db_datadict.php:233 js/messages.php:248 libraries/Index.class.php:349
#: libraries/Index.class.php:376 libraries/Index.class.php:679
@@ -272,7 +269,7 @@ msgstr "데이터베이스 %s 의 이름을 %s 로 변경하였습니다."
#: db_operations.php:284
#, php-format
msgid "Database %s has been copied to %s"
-msgstr "데이터베이스 %s 를 %s 로 복사하였습니다."
+msgstr "데이터베이스 %s를 %s로 복사하였습니다."
#: db_operations.php:412
msgid "Rename database to"
@@ -371,7 +368,7 @@ msgstr "테이블 "
#: tbl_printview.php:353 tbl_structure.php:363 tbl_structure.php:469
#: tbl_structure.php:882
msgid "Rows"
-msgstr "행(레코드)"
+msgstr "행"
#: db_printview.php:106 libraries/db_structure.lib.php:53 tbl_indexes.php:214
msgid "Size"
@@ -393,14 +390,14 @@ msgstr "생성"
#: libraries/schema/Pdf_Relation_Schema.class.php:1289 tbl_printview.php:403
#: tbl_structure.php:922
msgid "Last update"
-msgstr "업데이트"
+msgstr "마지막 업데이트"
#: db_printview.php:202 libraries/db_info.inc.php:84
#: libraries/export/sql.php:753
#: libraries/schema/Pdf_Relation_Schema.class.php:1294 tbl_printview.php:413
#: tbl_structure.php:930
msgid "Last check"
-msgstr "검사"
+msgstr "마지막 검사"
#: db_printview.php:219 db_structure.php:514
#, php-format
@@ -410,7 +407,7 @@ msgstr[0] "%s개 테이블 "
#: db_qbe.php:41
msgid "You have to choose at least one column to display"
-msgstr "출력하려면 적어도 1개 이상의 열(칼럼)을 선택해야 합니다."
+msgstr "출력하려면 적어도 1개 이상의 열을 선택해야 합니다."
#: db_qbe.php:186
#, php-format
@@ -436,7 +433,7 @@ msgstr "오름차순"
#: server_databases.php:162 server_databases.php:179 tbl_operations.php:280
#: tbl_select.php:223
msgid "Descending"
-msgstr "내림차순(역순)"
+msgstr "내림차순"
#: db_qbe.php:286 db_tracking.php:92 libraries/display_tbl.lib.php:426
#: tbl_change.php:287 tbl_tracking.php:654
@@ -588,7 +585,7 @@ msgstr "데이터베이스에 테이블이 없습니다."
#: db_structure.php:228 libraries/mysql_charsets.lib.php:409
#: libraries/mysql_charsets.lib.php:416
msgid "unknown"
-msgstr ""
+msgstr "알수없음"
#: db_structure.php:315 tbl_operations.php:692
#, php-format
@@ -603,7 +600,7 @@ msgstr "뷰 %s가 제거되었습니다."
#: db_structure.php:328 tbl_operations.php:709
#, php-format
msgid "Table %s has been dropped"
-msgstr "테이블 %s 을 제거했습니다."
+msgstr "테이블 %s를 제거했습니다."
#: db_structure.php:338 tbl_create.php:281
msgid "Tracking is active."
@@ -806,7 +803,7 @@ msgstr "데이터베이스 로그"
#: enum_editor.php:23 js/messages.php:266
#: libraries/rte/rte_routines.lib.php:690
msgid "ENUM/SET editor"
-msgstr "ENUM / SET 수정"
+msgstr "ENUM/SET 수정"
#: enum_editor.php:28 js/messages.php:268
#, fuzzy
@@ -963,17 +960,15 @@ msgid ""
msgstr ""
#: import.php:57
-#, fuzzy, php-format
+#, php-format
msgid ""
"You probably tried to upload too large file. Please refer to %sdocumentation"
"%s for ways to workaround this limit."
-msgstr ""
-"너무 큰 파일을 업로드하려고 시도했습니다. 제한치를 우회하는 방법은 %s문서%s"
-"를 참조하여 주십시오."
+msgstr "너무 큰 파일을 업로드하려고 시도했습니다. 제한을 해결하기 위해서는 %s문서%s를 참조하여 주십시오."
#: import.php:170 import.php:419
msgid "Showing bookmark"
-msgstr ""
+msgstr "북마크 보이기"
#: import.php:180 import.php:415
msgid "The bookmark has been deleted."
@@ -992,8 +987,8 @@ msgid ""
"You attempted to load file with unsupported compression (%s). Either support "
"for it is not implemented or disabled by your configuration."
msgstr ""
-"지원되지 않는 압축(%)형식의 파일을 업로드하려고 시도했습니다. 지원이 구현되"
-"지 않았거나 설정에서 사용하지 않게 되어있습니다."
+"지원되지 않는 압축(%)형식의 파일을 업로드하려고 시도했습니다. 지원이 구현되지 않거나 설정에서 사용하지 않게 되어있기 때문에 일 수 "
+"있습니다."
#: import.php:349
msgid ""
@@ -1046,7 +1041,7 @@ msgstr ""
#: libraries/sql_query_form.lib.php:113 tbl_operations.php:229
#: tbl_relation.php:284 tbl_row_action.php:126 view_operations.php:60
msgid "Your SQL query has been executed successfully"
-msgstr "SQL 질의가 바르게 실행되었습니다."
+msgstr "질의가 바르게 실행되었습니다."
#: import_status.php:29 libraries/common.lib.php:709
#: libraries/schema/Export_Relation_Schema.class.php:237 user_password.php:109
@@ -1075,7 +1070,7 @@ msgstr "이 테이블 전체를 제거하려고 합니다!"
#: js/messages.php:33
msgid "You are about to TRUNCATE a complete table!"
-msgstr "이 테이블 전체를 비우려고 합니다!"
+msgstr "이 테이블의 모든 데이터를 비우려고 합니다!"
#: js/messages.php:35
msgid "Deleting tracking data"
@@ -1091,7 +1086,7 @@ msgstr "이 명령은 오랜 시간이 걸릴 수 있습니다. 그래도 실행
#: js/messages.php:40
msgid "You are about to DISABLE a BLOB Repository!"
-msgstr "BLOB 저장소를 사용 불가능하게 하려고 합니다!"
+msgstr "BLOB 저장소를 사용할 수 없게 하려고 합니다!"
#: js/messages.php:41
#, php-format
@@ -1114,15 +1109,14 @@ msgid "Add Index"
msgstr "인덱스 추가"
#: js/messages.php:47
-#, fuzzy
#| msgid "Edit next row"
msgid "Edit Index"
-msgstr "다음 행 수정"
+msgstr "인덱스 수정"
#: js/messages.php:48 tbl_indexes.php:293
#, fuzzy, php-format
msgid "Add %d column(s) to index"
-msgstr "필드 추가하기"
+msgstr "인덱스에 %d 열 추가"
#. l10n: Default description for the y-Axis of Charts
#: js/messages.php:52
@@ -1250,10 +1244,9 @@ msgid "Query statistics"
msgstr "질의 통계"
#: js/messages.php:94
-#, fuzzy
#| msgid "Failed to write file to disk."
msgid "Local monitor configuration incompatible"
-msgstr "로컬 모니터 설정이 호환되지 않습니다."
+msgstr "호환되지 않는 로컬 모니터 설정입니다."
#: js/messages.php:95
#, fuzzy
@@ -1263,9 +1256,8 @@ msgid ""
"likely that your current configuration will not work anymore. Please reset "
"your configuration to default in the <i>Settings</i> menu."
msgstr ""
-"브라우저의 로컬 저장소에 있는 차트 정렬 설정이 더 이상 새 버전의 모니터 대화"
-"창과 호환되지 않습니다. 당신의 현재 설정은 더 이상 작동하지 않을 수 있습니"
-"다. <i>설정<i>메뉴에서 설정을 초기화해주세요."
+"브라우저 내의 차트 정렬 설정은 더 이상 새 버전의 모니터 다이얼로그와 호환되지 않습니다. 현재 설정은 더 이상 작동되지 않을 수 "
+"있습니다. <i>설정<i>메뉴에서 설정을 초기화해 주세요."
#: js/messages.php:97
msgid "Query cache efficiency"
@@ -1276,9 +1268,8 @@ msgid "Query cache usage"
msgstr "질의 캐시 사용량"
#: js/messages.php:99
-#, fuzzy
msgid "Query cache used"
-msgstr "사용된 질의 캐시"
+msgstr "질의 캐시 사용됨"
#: js/messages.php:101
msgid "System CPU Usage"
@@ -1400,24 +1391,22 @@ msgstr "소통량"
#: js/messages.php:137 libraries/server_links.inc.php:73
#: server_status.php:1550
-#, fuzzy
#| msgid "Deleting %s"
msgid "Settings"
-msgstr "%s 을 삭제합니다"
+msgstr "설정"
#: js/messages.php:138
-#, fuzzy
#| msgid "Rename database to"
msgid "Remove chart"
-msgstr "데이터베이스 이름 변경"
+msgstr "차트 삭제"
#: js/messages.php:139
msgid "Edit title and labels"
-msgstr ""
+msgstr "타이틀과 레이블 편집"
#: js/messages.php:140
msgid "Add chart to grid"
-msgstr ""
+msgstr "차트에 그리드 추가"
#: js/messages.php:142
msgid "Please add at least one variable to the series"
@@ -1433,11 +1422,11 @@ msgstr "없음"
#: js/messages.php:144
msgid "Resume monitor"
-msgstr ""
+msgstr "모니터링 재개"
#: js/messages.php:145
msgid "Pause monitor"
-msgstr ""
+msgstr "모니터링 정지"
#: js/messages.php:147
msgid "general_log and slow_query_log are enabled."
@@ -1457,11 +1446,11 @@ msgstr ""
#: js/messages.php:151
msgid "log_output is not set to TABLE."
-msgstr ""
+msgstr "테이블에 대한 로그 출력이 설정되지 않았습니다."
#: js/messages.php:152
msgid "log_output is set to TABLE."
-msgstr ""
+msgstr "테이블에 대한 로그 출력이 설정되었습니다."
#: js/messages.php:153
#, php-format
@@ -1480,28 +1469,28 @@ msgstr ""
msgid ""
"Following settings will be applied globally and reset to default on server "
"restart:"
-msgstr ""
+msgstr "다음 설정은 서버 전체에 적용됩니다. 서버 재기동시 기본 설정으로 초기화됩니다."
#. l10n: %s is FILE or TABLE
#: js/messages.php:157
-#, fuzzy, php-format
+#, php-format
#| msgid "Save as file"
msgid "Set log_output to %s"
-msgstr "파일로 저장"
+msgstr "로그 출력을 %s로 설정"
#. l10n: Enable in this context means setting a status variable to ON
#: js/messages.php:159
#, fuzzy, php-format
#| msgid "Enabled"
msgid "Enable %s"
-msgstr "사용가능"
+msgstr "%s 사용가능"
#. l10n: Disable in this context means setting a status variable to OFF
#: js/messages.php:161
-#, fuzzy, php-format
+#, php-format
#| msgid "Disable"
msgid "Disable %s"
-msgstr "무효"
+msgstr "%s 사용안함"
#. l10n: %d seconds
#: js/messages.php:163
@@ -1513,25 +1502,23 @@ msgstr ""
msgid ""
"You can't change these variables. Please log in as root or contact your "
"database administrator."
-msgstr ""
+msgstr "변수들을 변경할 수 없습니다. root로 로그인하거나 데이터베이스 관리자에게 문의하십시오."
#: js/messages.php:165
-#, fuzzy
#| msgid "Change"
msgid "Change settings"
-msgstr "변경"
+msgstr "설정 변경"
#: js/messages.php:166
-#, fuzzy
#| msgid "Connections"
msgid "Current settings"
-msgstr "연결 수"
+msgstr "현재 설정"
#: js/messages.php:168 server_status.php:1640
#, fuzzy
#| msgid "Import files"
msgid "Chart Title"
-msgstr "파일 가져오기"
+msgstr "차트 제목"
#. l10n: As in differential values
#: js/messages.php:170
@@ -1541,7 +1528,7 @@ msgstr ""
#: js/messages.php:171
#, php-format
msgid "Divided by %s"
-msgstr ""
+msgstr "%s로 구분"
#: js/messages.php:172
msgid "Unit"
@@ -1557,11 +1544,11 @@ msgstr ""
#: js/messages.php:176
msgid "Analysing & loading logs. This may take a while."
-msgstr ""
+msgstr "로그를 읽고 분석합니다. 이 작업은 시간이 걸릴 수 있습니다."
#: js/messages.php:177
msgid "Cancel request"
-msgstr ""
+msgstr "요청 취소"
#: js/messages.php:178
msgid ""
@@ -1569,6 +1556,8 @@ msgid ""
"However only the SQL query itself has been used as a grouping criteria, so "
"the other attributes of queries, such as start time, may differ."
msgstr ""
+"이 열은 함께 그룹화된 동일한 질의의 양을 보여줍니다. 그러나 질의 자체만으로 그룹화하기 때문에, 시작 시간 등의 질의에 대한 다른 "
+"특성은 다를 수 있습니다."
#: js/messages.php:179
msgid ""
@@ -1582,19 +1571,17 @@ msgid "Log data loaded. Queries executed in this time span:"
msgstr ""
#: js/messages.php:182
-#, fuzzy
msgid "Jump to Log table"
-msgstr "데이터베이스가 없습니다"
+msgstr "로그 테이블로 이동"
#: js/messages.php:183
msgid "Log analysed, but no data found in this time span."
-msgstr ""
+msgstr "로그가 분석되었습니다. 하지만 해당 기간내에는 자료가 없습니다."
#: js/messages.php:185
-#, fuzzy
#| msgid "Analyze"
msgid "Analyzing..."
-msgstr "분석"
+msgstr "분석중..."
#: js/messages.php:186
#, fuzzy
@@ -1608,10 +1595,9 @@ msgid "Time"
msgstr "시간"
#: js/messages.php:189
-#, fuzzy
#| msgid "Total"
msgid "Total time:"
-msgstr "전체 사용량"
+msgstr "전체 시간:"
#: js/messages.php:190
#, fuzzy
@@ -1627,36 +1613,33 @@ msgid "Table"
msgstr "테이블 "
#: js/messages.php:192
-#, fuzzy
#| msgid "Import files"
msgid "Chart"
-msgstr "파일 가져오기"
+msgstr "차트"
#. l10n: A collection of available filters
#: js/messages.php:195
-#, fuzzy
#| msgid "Table options"
msgid "Log table filter options"
-msgstr "테이블 옵션"
+msgstr "로그 테이블의 필터 옵션"
#. l10n: Filter as in "Start Filtering"
#: js/messages.php:197
msgid "Filter"
-msgstr ""
+msgstr "필터"
#: js/messages.php:198
msgid "Filter queries by word/regexp:"
-msgstr ""
+msgstr "단어/정규식에 의한 필터 질의:"
#: js/messages.php:199
msgid "Group queries, ignoring variable data in WHERE clauses"
msgstr ""
#: js/messages.php:200
-#, fuzzy
#| msgid "Number of columns"
msgid "Sum of grouped rows:"
-msgstr "컬럼수"
+msgstr "그룹화된 행의 합계:"
#: js/messages.php:201
#, fuzzy
@@ -1681,18 +1664,17 @@ msgid ""
msgstr ""
#: js/messages.php:206
-#, fuzzy
#| msgid "Rename database to"
msgid "Reload page"
-msgstr "데이터베이스 이름 변경"
+msgstr "페이지 새로고침"
#: js/messages.php:208
msgid "Affected rows:"
-msgstr ""
+msgstr "적용된 행:"
#: js/messages.php:210
msgid "Failed parsing config file. It doesn't seem to be valid JSON code."
-msgstr ""
+msgstr "구성 파일을 분석할 수 없습니다. 유효한 JSON 코드가 아닙니다."
#: js/messages.php:211
msgid ""
@@ -1706,13 +1688,12 @@ msgstr ""
#: prefs_manage.php:229 server_status.php:1595 setup/frames/menu.inc.php:20
#, fuzzy
msgid "Import"
-msgstr "내보내기"
+msgstr "가져오기"
#: js/messages.php:214
-#, fuzzy
#| msgid "Update Query"
msgid "Analyse Query"
-msgstr "질의 업데이트"
+msgstr "질의 분석"
#: js/messages.php:218
msgid "Advisor system"
@@ -1730,11 +1711,11 @@ msgstr ""
#, fuzzy
#| msgid "Documentation"
msgid "Recommendation"
-msgstr "문서"
+msgstr "추천"
#: js/messages.php:222
msgid "Rule details"
-msgstr ""
+msgstr "규칙 세부 사항"
#: js/messages.php:223
#, fuzzy
@@ -1744,36 +1725,34 @@ msgstr "인증중입니다..."
#: js/messages.php:224
msgid "Used variable / formula"
-msgstr ""
+msgstr "사용된 변수 / 수식"
#: js/messages.php:225
msgid "Test"
-msgstr ""
+msgstr "테스트"
#: js/messages.php:230 pmd_general.php:382 pmd_general.php:419
#: pmd_general.php:539 pmd_general.php:587 pmd_general.php:663
#: pmd_general.php:717 pmd_general.php:780 pmd_general.php:811
msgid "Cancel"
-msgstr ""
+msgstr "취소"
#: js/messages.php:233
-#, fuzzy
msgid "Loading"
-msgstr "Local"
+msgstr "불러오고 있습니다."
#: js/messages.php:234
-#, fuzzy
#| msgid "Processes"
msgid "Processing Request"
-msgstr "프로세스 목록"
+msgstr "요청을 처리중입니다."
#: js/messages.php:235 libraries/rte/rte_export.lib.php:39
msgid "Error in Processing Request"
-msgstr ""
+msgstr "요청 처리중 에러가 발생했습니다."
#: js/messages.php:236
msgid "Dropping Column"
-msgstr ""
+msgstr "열을 삭제하고 있습니다."
#: js/messages.php:237
msgid "Adding Primary Key"
@@ -1783,73 +1762,63 @@ msgstr ""
#: pmd_general.php:537 pmd_general.php:585 pmd_general.php:661
#: pmd_general.php:715 pmd_general.php:778
msgid "OK"
-msgstr ""
+msgstr "확인"
#: js/messages.php:239
msgid "Click to dismiss this notification"
msgstr ""
#: js/messages.php:242
-#, fuzzy
#| msgid "Rename database to"
msgid "Renaming Databases"
-msgstr "데이터베이스 이름 변경"
+msgstr "데이터베이스 이름을 변경중입니다."
#: js/messages.php:243
-#, fuzzy
#| msgid "Rename database to"
msgid "Reload Database"
-msgstr "데이터베이스 이름 변경"
+msgstr "데이터베이스를 다시 불러오고 있습니다."
#: js/messages.php:244
-#, fuzzy
#| msgid "Copy database to"
msgid "Copying Database"
-msgstr "데이터베이스 복사"
+msgstr "데이터베이스를 복사중입니다."
#: js/messages.php:245
msgid "Changing Charset"
-msgstr ""
+msgstr "언어를 변경하고 있습니다."
#: js/messages.php:246
-#, fuzzy
#| msgid "Table must have at least one column."
msgid "Table must have at least one column"
-msgstr "테이블은 적어도 1개 이상의 컬럼을 갖고 있어야 합니다."
+msgstr "테이블은 적어도 1개 이상의 컬럼이 있어야 합니다."
#: js/messages.php:251
-#, fuzzy
#| msgid "Use Tables"
msgid "Insert Table"
-msgstr "사용할 테이블"
+msgstr "테이블 삽입"
#: js/messages.php:252
-#, fuzzy
#| msgid "Indexes"
msgid "Hide indexes"
-msgstr "인덱스"
+msgstr "인덱스 숨기기"
#: js/messages.php:253
-#, fuzzy
#| msgid "Show grid"
msgid "Show indexes"
-msgstr "grid 보기"
+msgstr "인덱스 보이기"
#: js/messages.php:256
-#, fuzzy
#| msgid "Search"
msgid "Searching"
-msgstr "검색"
+msgstr "검색중"
#: js/messages.php:257
-#, fuzzy
msgid "Hide search results"
-msgstr "SQL 질의"
+msgstr "검색 결과 숨기기"
#: js/messages.php:258
-#, fuzzy
msgid "Show search results"
-msgstr "SQL 질의"
+msgstr "검색 결과 보이기"
#: js/messages.php:259
#, fuzzy
@@ -1858,38 +1827,36 @@ msgid "Browsing"
msgstr "보기"
#: js/messages.php:260
-#, fuzzy
#| msgid "Deleting %s"
msgid "Deleting"
-msgstr "%s 을 삭제합니다"
+msgstr "삭제중"
#: js/messages.php:263
msgid "The definition of a stored function must contain a RETURN statement!"
-msgstr ""
+msgstr "저장 함수의 정의는 RETURN문을 포함해야 합니다!"
#: js/messages.php:270
#, fuzzy, php-format
msgid "Add %d value(s)"
-msgstr "새 사용자 추가"
+msgstr "%d 값 추가"
#: js/messages.php:273
+#, fuzzy
msgid ""
"Note: If the file contains multiple tables, they will be combined into one"
-msgstr ""
+msgstr "참고: 파일에 여러 테이블이 포함되어 있다면, 하나로 결합됩니다."
#: js/messages.php:276
-#, fuzzy
msgid "Hide query box"
-msgstr "SQL 질의"
+msgstr "질의 상자 숨기기"
#: js/messages.php:277
-#, fuzzy
msgid "Show query box"
-msgstr "SQL 질의"
+msgstr "질의 상자 보이기"
#: js/messages.php:279 tbl_row_action.php:28
msgid "No rows selected"
-msgstr ""
+msgstr "선택된 행이 없습니다."
#: js/messages.php:280 libraries/common.lib.php:2743
#: libraries/display_tbl.lib.php:2506 querywindow.php:87 tbl_structure.php:149
@@ -1899,7 +1866,7 @@ msgstr "변경"
#: js/messages.php:281
msgid "Query execution time"
-msgstr ""
+msgstr "질의 실행 시간"
#: js/messages.php:284 libraries/config/FormDisplay.tpl.php:355
#: libraries/schema/User_Schema.class.php:352
@@ -1910,14 +1877,12 @@ msgid "Save"
msgstr "저장"
#: js/messages.php:287
-#, fuzzy
msgid "Hide search criteria"
-msgstr "SQL 질의"
+msgstr "검색 조건 숨기기"
#: js/messages.php:288
-#, fuzzy
msgid "Show search criteria"
-msgstr "SQL 질의"
+msgstr "검색 조건 보이기"
#: js/messages.php:291 libraries/tbl_select.lib.php:110
#, fuzzy
@@ -1927,15 +1892,16 @@ msgstr "검색"
#: js/messages.php:293
msgid "Each point represents a data row."
-msgstr ""
+msgstr "각 포인트는 데이터 행을 나타냅니다."
#: js/messages.php:295
msgid "Hovering over a point will show its label."
-msgstr ""
+msgstr "포인트에 마우스를 올리면 라벨이 표시됩니다."
#: js/messages.php:297
+#, fuzzy
msgid "Use mousewheel to zoom in or out of the plot."
-msgstr ""
+msgstr "마우스 휠로 확대/축소할 수 있습니다."
#: js/messages.php:299
msgid "Click and drag the mouse to navigate the plot."
@@ -1958,20 +1924,18 @@ msgid "Strings are converted into integer for plotting"
msgstr ""
#: js/messages.php:309
-#, fuzzy
#| msgid "Add/Delete columns"
msgid "Select two columns"
-msgstr "컬럼 추가/삭제"
+msgstr "두 개의 열 선택"
#: js/messages.php:310
msgid "Select two different columns"
-msgstr ""
+msgstr "두 개의다른 열 선택"
#: js/messages.php:311
-#, fuzzy
#| msgid "SQL result"
msgid "Query results"
-msgstr "SQL 결과"
+msgstr "질의 결과"
#: js/messages.php:312
#, fuzzy
@@ -1981,11 +1945,11 @@ msgstr "테이블 설명"
#: js/messages.php:315 tbl_change.php:312 tbl_indexes.php:228
#: tbl_indexes.php:255
msgid "Ignore"
-msgstr "Ignore"
+msgstr "무시"
#: js/messages.php:316 libraries/display_tbl.lib.php:1390
msgid "Copy"
-msgstr ""
+msgstr "복사"
#: js/messages.php:331
#, fuzzy
@@ -2463,7 +2427,7 @@ msgstr ""
#: libraries/File.class.php:516
msgid "Cannot read (moved) upload file."
-msgstr ""
+msgstr "업로드 파일을 읽을 수 없습니다."
#: libraries/Index.class.php:419 tbl_relation.php:522
msgid "No index defined!"
@@ -2491,9 +2455,8 @@ msgstr "Cardinality"
#: libraries/Index.class.php:448 libraries/rte/rte_events.lib.php:480
#: libraries/rte/rte_routines.lib.php:957 tbl_tracking.php:263
#: tbl_tracking.php:327
-#, fuzzy
msgid "Comment"
-msgstr "설명(코멘트)"
+msgstr "설명"
#: libraries/Index.class.php:474
msgid "The primary key has been dropped"
@@ -2599,7 +2562,7 @@ msgstr ""
#: libraries/Table.class.php:1252
#, php-format
msgid "Table %s has been renamed to %s"
-msgstr "테이블 %s을(를) %s(으)로 변경하였습니다."
+msgstr "테이블 %s을(를) %s(으)로 이름을 변경하였습니다."
#: libraries/Table.class.php:1384
msgid "Could not save table UI preferences"
@@ -2883,8 +2846,7 @@ msgstr "기본 설정을 가져올 수 없습니다: %1$s"
msgid ""
"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
"configuration file!"
-msgstr ""
-"환경설정 파일에 <tt>$cfg['PmaAbsoluteUri']</tt> 변수가 선언되어야 합니다."
+msgstr "환경설정 파일에 <tt>$cfg['PmaAbsoluteUri']</tt> 변수가 정의되어야 합니다!"
#: libraries/common.inc.php:650
#, php-format
@@ -3571,14 +3533,13 @@ msgid "Save as file"
msgstr "파일로 저장"
#: libraries/config/messages.inc.php:73 libraries/config/messages.inc.php:241
-#, fuzzy
msgid "Character set of the file"
-msgstr "파일 문자셋:"
+msgstr "파일 문자셋"
#: libraries/config/messages.inc.php:74 libraries/config/messages.inc.php:90
#: tbl_gis_visualization.php:181 tbl_printview.php:335 tbl_structure.php:842
msgid "Format"
-msgstr "Format"
+msgstr "형식"
#: libraries/config/messages.inc.php:75
msgid "Compression"
@@ -3592,26 +3553,23 @@ msgstr "압축"
#: libraries/export/excel.php:25 libraries/export/htmlword.php:30
#: libraries/export/latex.php:72 libraries/export/ods.php:25
#: libraries/export/odt.php:58 libraries/export/texytext.php:28
-#, fuzzy
#| msgid "Put fields names in the first row"
msgid "Put columns names in the first row"
-msgstr "맨처음에 필드 이름을 출력"
+msgstr "첫 줄에 열 이름을 넣기"
#: libraries/config/messages.inc.php:77 libraries/config/messages.inc.php:243
#: libraries/config/messages.inc.php:250 libraries/import/csv.php:76
#: libraries/import/ldi.php:42
-#, fuzzy
#| msgid "Fields enclosed by"
msgid "Columns enclosed by"
-msgstr "필드 감싸기"
+msgstr "열 감싸기"
#: libraries/config/messages.inc.php:78 libraries/config/messages.inc.php:244
#: libraries/config/messages.inc.php:251 libraries/import/csv.php:81
#: libraries/import/ldi.php:43
-#, fuzzy
#| msgid "Fields escaped by"
msgid "Columns escaped by"
-msgstr "필드 특수문자(escape) 처리"
+msgstr "열 특수문자 처리"
#: libraries/config/messages.inc.php:79 libraries/config/messages.inc.php:85
#: libraries/config/messages.inc.php:92 libraries/config/messages.inc.php:101
@@ -3619,38 +3577,35 @@ msgstr "필드 특수문자(escape) 처리"
#: libraries/config/messages.inc.php:144 libraries/config/messages.inc.php:147
#: libraries/config/messages.inc.php:149 libraries/export/texytext.php:27
msgid "Replace NULL by"
-msgstr ""
+msgstr "NULL 치환"
#: libraries/config/messages.inc.php:80 libraries/config/messages.inc.php:86
msgid "Remove CRLF characters within columns"
-msgstr ""
+msgstr "열 내의 CRLF 문자를 제거하기"
#: libraries/config/messages.inc.php:81 libraries/config/messages.inc.php:247
#: libraries/config/messages.inc.php:255 libraries/import/csv.php:63
#: libraries/import/ldi.php:41
-#, fuzzy
#| msgid "Lines terminated by"
msgid "Columns terminated by"
-msgstr "줄(열) 구분자"
+msgstr "열 구분자"
#: libraries/config/messages.inc.php:82 libraries/config/messages.inc.php:242
#: libraries/import/csv.php:86 libraries/import/ldi.php:44
msgid "Lines terminated by"
-msgstr "줄(열) 구분자"
+msgstr "줄 구분자"
#: libraries/config/messages.inc.php:84
msgid "Excel edition"
-msgstr ""
+msgstr "Excel 버전"
#: libraries/config/messages.inc.php:87
-#, fuzzy
msgid "Database name template"
-msgstr "파일명 템플릿"
+msgstr "데이터베이스명 템플릿"
#: libraries/config/messages.inc.php:88
-#, fuzzy
msgid "Server name template"
-msgstr "파일명 템플릿"
+msgstr "서버명 템플릿"
#: libraries/config/messages.inc.php:89
#, fuzzy
@@ -3662,128 +3617,127 @@ msgstr "파일명 템플릿"
#: libraries/config/messages.inc.php:145 libraries/export/htmlword.php:24
#: libraries/export/latex.php:40 libraries/export/odt.php:32
#: libraries/export/sql.php:123 libraries/export/texytext.php:23
-#, fuzzy
#| msgid "%s table"
#| msgid_plural "%s tables"
msgid "Dump table"
-msgstr "%s개 테이블 "
+msgstr "덤프 테이블"
#: libraries/config/messages.inc.php:94 libraries/export/latex.php:32
msgid "Include table caption"
-msgstr ""
+msgstr "테이블 설명 포함하기"
#: libraries/config/messages.inc.php:97 libraries/config/messages.inc.php:103
#: libraries/export/latex.php:50 libraries/export/latex.php:74
msgid "Table caption"
-msgstr ""
+msgstr "테이블 설명"
#: libraries/config/messages.inc.php:98 libraries/config/messages.inc.php:104
msgid "Continued table caption"
-msgstr ""
+msgstr "테이블 설명(Continued)"
#: libraries/config/messages.inc.php:99 libraries/config/messages.inc.php:105
#: libraries/export/latex.php:54 libraries/export/latex.php:78
msgid "Label key"
-msgstr ""
+msgstr "레이블 키"
#: libraries/config/messages.inc.php:100 libraries/config/messages.inc.php:112
#: libraries/config/messages.inc.php:136 libraries/export/odt.php:324
#: libraries/tbl_properties.inc.php:135
msgid "MIME type"
-msgstr ""
+msgstr "MIME 형식"
#: libraries/config/messages.inc.php:102 libraries/config/messages.inc.php:114
#: libraries/config/messages.inc.php:138 tbl_relation.php:392
#, fuzzy
msgid "Relations"
-msgstr "테이블 작업"
+msgstr "관계"
#: libraries/config/messages.inc.php:107
-#, fuzzy
#| msgid "Export"
msgid "Export method"
-msgstr "내보내기"
+msgstr "내보내기 방법"
#: libraries/config/messages.inc.php:116 libraries/config/messages.inc.php:118
msgid "Save on server"
-msgstr ""
+msgstr "서버에 저장"
#: libraries/config/messages.inc.php:117 libraries/config/messages.inc.php:119
#: libraries/display_export.lib.php:190 libraries/display_export.lib.php:216
msgid "Overwrite existing file(s)"
-msgstr ""
+msgstr "기존 파일 덮어쓰기"
#: libraries/config/messages.inc.php:120
-#, fuzzy
msgid "Remember file name template"
-msgstr "파일명 템플릿"
+msgstr "파일명 템플릿을 저장하기"
#: libraries/config/messages.inc.php:122
-#, fuzzy
#| msgid "Enclose table and field names with backquotes"
msgid "Enclose table and column names with backquotes"
-msgstr "테이블, 필드명에 백쿼터(`) 사용"
+msgstr "테이블과 열 이름을 백쿼트(`)로 감싸기"
#: libraries/config/messages.inc.php:123 libraries/config/messages.inc.php:262
#: libraries/display_export.lib.php:348
msgid "SQL compatibility mode"
-msgstr ""
+msgstr "SQL 호환 모드"
#: libraries/config/messages.inc.php:124 libraries/export/sql.php:190
+#, fuzzy
msgid "<code>CREATE TABLE</code> options:"
-msgstr ""
+msgstr "<code>CREATE TABLE</code> 옵션 :"
#: libraries/config/messages.inc.php:125
+#, fuzzy
msgid "Creation/Update/Check dates"
-msgstr ""
+msgstr "생성/업데이트/체크 날짜"
#: libraries/config/messages.inc.php:126
#, fuzzy
msgid "Use delayed inserts"
-msgstr "확장된 inserts"
+msgstr "지연 삽입 사용"
#: libraries/config/messages.inc.php:127 libraries/export/sql.php:81
msgid "Disable foreign key checks"
-msgstr ""
+msgstr "외래 키(foreign key) 체크 사용 안함"
#: libraries/config/messages.inc.php:130
msgid "Use hexadecimal for BLOB"
-msgstr ""
+msgstr "BLOB을 헥사 숫자로 사용"
#: libraries/config/messages.inc.php:132
#, fuzzy
#| msgid "Extended inserts"
msgid "Use ignore inserts"
-msgstr "확장된 inserts"
+msgstr "무시 삽입 사용"
#: libraries/config/messages.inc.php:134
+#, fuzzy
msgid "Syntax to use when inserting data"
-msgstr ""
+msgstr "데이터 삽입시 사용 구문"
#: libraries/config/messages.inc.php:135 libraries/export/sql.php:285
msgid "Maximal length of created query"
-msgstr ""
+msgstr "CREATE 질의 최대 길이"
#: libraries/config/messages.inc.php:140
-#, fuzzy
msgid "Export type"
-msgstr "테이블이 없습니다"
+msgstr "내보내기 형식"
#: libraries/config/messages.inc.php:141 libraries/export/sql.php:73
+#, fuzzy
msgid "Enclose export in a transaction"
-msgstr ""
+msgstr "트랜잭션으로 내보내기 감싸기"
#: libraries/config/messages.inc.php:142
msgid "Export time in UTC"
-msgstr ""
+msgstr "세계 표준시(UTC)로 시간 내보내기"
#: libraries/config/messages.inc.php:150
msgid "Force secured connection while using phpMyAdmin"
-msgstr ""
+msgstr "강제적인 보안 연결로 phpMyAdmin을 사용하기"
#: libraries/config/messages.inc.php:151
msgid "Force SSL connection"
-msgstr ""
+msgstr "강제적인 SSL 연결"
#: libraries/config/messages.inc.php:152
msgid ""
@@ -4056,10 +4010,9 @@ msgid "SQL queries settings"
msgstr "SQL 질의"
#: libraries/config/messages.inc.php:222
-#, fuzzy
#| msgid "SQL history"
msgid "SQL Validator"
-msgstr "SQL 내력(히스토리)"
+msgstr "질의 검사기"
#: libraries/config/messages.inc.php:223
msgid ""
@@ -5151,9 +5104,8 @@ msgid "Allow to display database and table statistics (eg. space usage)"
msgstr ""
#: libraries/config/messages.inc.php:476
-#, fuzzy
msgid "Show statistics"
-msgstr "행(레코드) 통계"
+msgstr "통계보기"
#: libraries/config/messages.inc.php:477
msgid ""
@@ -5376,10 +5328,9 @@ msgid "Cookie authentication"
msgstr "인증중입니다..."
#: libraries/config/setup.forms.php:48
-#, fuzzy
#| msgid "Authenticating..."
msgid "HTTP authentication"
-msgstr "인증중입니다..."
+msgstr "HTTP 인증"
#: libraries/config/setup.forms.php:51
#, fuzzy
@@ -5621,10 +5572,9 @@ msgstr ""
"내보내기 플러그인을 로드할 수 없습니다. 올바로 설치되었는지 확인해주세요!"
#: libraries/display_export.lib.php:82
-#, fuzzy
#| msgid "Allows locking tables for the current thread."
msgid "Exporting databases from the current server"
-msgstr "현재 쓰레드에 대한 테이블 잠금(lock) 허용."
+msgstr "현재 서버에서 데이터베이스를 내보내기"
#: libraries/display_export.lib.php:84
#, fuzzy, php-format
@@ -5653,22 +5603,19 @@ msgid "Custom - display all possible options"
msgstr ""
#: libraries/display_export.lib.php:132
-#, fuzzy
#| msgid "Databases"
msgid "Database(s):"
-msgstr "데이터베이스 "
+msgstr "데이터베이스 :"
#: libraries/display_export.lib.php:134
-#, fuzzy
#| msgid "Tables"
msgid "Table(s):"
-msgstr "테이블 수"
+msgstr "테이블 : "
#: libraries/display_export.lib.php:144
-#, fuzzy
#| msgid "Rows"
msgid "Rows:"
-msgstr "행(레코드)"
+msgstr "행 : "
#: libraries/display_export.lib.php:152
msgid "Dump some row(s)"
@@ -5777,10 +5724,9 @@ msgid "Format:"
msgstr "Format"
#: libraries/display_export.lib.php:333
-#, fuzzy
#| msgid "Column-specific privileges"
msgid "Format-specific options:"
-msgstr "열(칼럼)에 관한 권한"
+msgstr "형식 특정 옵션 : "
#: libraries/display_export.lib.php:334
msgid ""
@@ -5892,16 +5838,14 @@ msgid "%d is not valid row number."
msgstr ""
#: libraries/display_tbl.lib.php:427
-#, fuzzy
#| msgid "Start"
msgid "Start row"
-msgstr "토"
+msgstr "시작 행"
#: libraries/display_tbl.lib.php:429
-#, fuzzy
#| msgid "Number of columns"
msgid "Number of rows"
-msgstr "컬럼수"
+msgstr "행 갯수"
#: libraries/display_tbl.lib.php:434
#, fuzzy
@@ -5944,9 +5888,8 @@ msgstr ""
#: libraries/import/shp.php:22 libraries/import/sql.php:20
#: libraries/import/xml.php:32 libraries/rte/rte_routines.lib.php:863
#: tbl_select.php:175 tbl_structure.php:858
-#, fuzzy
msgid "Options"
-msgstr "테이블 작업"
+msgstr "옵션"
#: libraries/display_tbl.lib.php:631 libraries/display_tbl.lib.php:649
#, fuzzy
@@ -6504,10 +6447,9 @@ msgid "(continued)"
msgstr ""
#: libraries/export/latex.php:16
-#, fuzzy
#| msgid "Table structure for table"
msgid "Structure of table @TABLE@"
-msgstr "테이블 구조"
+msgstr "@TABLE@ 테이블 구조"
#: libraries/export/latex.php:48 libraries/export/odt.php:40
#: libraries/export/sql.php:142
@@ -8137,9 +8079,7 @@ msgstr ""
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 검사기가 초기화되지 않았습니다. %s문서%s에서 설명한 php 확장모듈을 설치했"
-"는지 확인해보십시오."
+msgstr "질의 검사기가 초기화되지 않았습니다. %s문서%s에서 설명한 필수 PHP 확장모듈을 설치했는지 확인해 보십시오."
#: libraries/tbl_links.inc.php:118 libraries/tbl_links.inc.php:119
msgid "Table seems to be empty!"
@@ -11077,7 +11017,7 @@ msgstr "다음 행 수정"
#: tbl_change.php:1070
msgid ""
"Use TAB key to move from value to value, or CTRL+arrows to move anywhere"
-msgstr "탭 키를 이용해 이동하거나 CTRL+화 ws to move anywhere" � 설명한 필수 PHP 확장모듈을 설치했는지 확인해 보십시오." 질의에 대한 다른 " � " ��08q+ @���� ��R8q+ 0ꑀ� 鑀� k�7q+ 6 � � ! � ! ����� @���� xt08q+ 0둀� ��7q+ ��7q+ ����� `�7q+ ���� �o�8q+ u�7q+ `�8q+ �d�8q+ �i�8q+ ��7q+ xt08q+ 0둀� ꑀ� k�7q+ �! �! ����� @���� H>8q+ 쑀� ��7q+ ��7q+ ����� `�7q+ ���� ���� ����� 8�47q+ �p� @���� u�7q+ ��7q+ 쑀� �ꑀ� k�7q+ G H I J K M N O P ����� @���� H��7q+ �푀� ��7q+ ��7q+ ����� 0o�8q+ u�7q+ �08q+ �)�7q+ `�8q+ �d�8q+ �i�8q+ ��7q+ H��7q+ �푀� �둀� k�7q+ 8��7q+ �푀� 쑀� k�7q+ (��7q+ �푀� P쑀� k�7q+ ��7q+ �푀� �쑀� k�7q+ �n�8q+ u�7q+ �i�8q+ 瑀� �x�7q+ e�7q+ �d�8q+ 푀� yx�7q+ e�7q+ `�8q+ P푀� Zx�7q+ e�7q+ �$�7q+ �08q+ �)�7q+ `�8q+ 08q+ �d�8q+ �i�8q+ ��7q+ 8�47q+ �7q+ @���� p��7q+ � �푀� k�7q+ 5 6 7 8 : < = > ? @ B D ����� @���� ��7q+ @���� u�7q+ �47q+ �푀� �7q+ e�7q+ �47q+ �_@f �S Q��l�� �\7q+ @���� ��7q+ �� �� k�7q+ u]�� 4Q��U^Qʉ� �u������*ēv����� @���� H>Y7q+ ��7q+ ����� ���8q+ ���8q+ �֒7q+ ���� @���� ����� `�� �08q+ u�7q+ 08q+ ����� ���8q+ ����� �� �����������8q+ H���� 살표로 이동할 수 있다"
+msgstr "탭 키나 CTRL+화살표로 값 항목을 이동할 수 있습니다."
#: tbl_change.php:1108
#, php-format
diff --git a/po/tr.po b/po/tr.po
index 71c8f1c..a150293 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.5.0-beta2\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
"POT-Creation-Date: 2012-01-25 17:45+0100\n"
-"PO-Revision-Date: 2012-01-22 13:01+0200\n"
+"PO-Revision-Date: 2012-01-22 13:02+0200\n"
"Last-Translator: Burak Yavuz <hitowerdigit(a)hotmail.com>\n"
"Language-Team: turkish <tr(a)li.org>\n"
"Language: tr\n"
@@ -5503,7 +5503,7 @@ msgstr "Yanlış IP adresi: %s"
#: libraries/core.lib.php:247
msgctxt "PHP documentation language"
msgid "en"
-msgstr "tr"
+msgstr "en"
#: libraries/core.lib.php:266
#, php-format
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 6354a86..cb4ca24 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.5.0-beta2\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
"POT-Creation-Date: 2012-01-25 17:45+0100\n"
-"PO-Revision-Date: 2012-01-11 08:26+0200\n"
+"PO-Revision-Date: 2012-01-26 16:13+0200\n"
"Last-Translator: Vian Zhao <brovian(a)gmail.com>\n"
"Language-Team: chinese_simplified <zh_CN(a)li.org>\n"
"Language: zh_CN\n"
@@ -881,12 +881,12 @@ msgstr "以 OpenStreetMaps 为背景"
# what's the f**k word of "SRID"?
#: gis_data_editor.php:134
msgid "SRID"
-msgstr ""
+msgstr "SRID"
#: gis_data_editor.php:151 js/messages.php:323
#: libraries/display_tbl.lib.php:692
msgid "Geometry"
-msgstr ""
+msgstr "几何学"
#: gis_data_editor.php:172 js/messages.php:319
msgid "Point"
hooks/post-receive
--
phpMyAdmin
1
0
[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_5, updated. RELEASE_3_5_0BETA1-210-g8e30c72
by Michal Čihař 27 Jan '12
by Michal Čihař 27 Jan '12
27 Jan '12
The branch, QA_3_5 has been updated
via 8e30c72834a64dfa9f984466abe0071208dc6bd9 (commit)
via 8e0cb60950ab01ab87f347f76bc9b09c3035420d (commit)
via d94818837fc23da5f39234dfbd53722d2c197d34 (commit)
via 27bfe7ac795d05fc7cb3effb9f3be0e4e053f58b (commit)
via 412e3744e1dfeb46da9ceb0212a05224b8f10688 (commit)
via adaf3280376022d7275bf492a06741bb17445752 (commit)
via 31457b4bbb5ff5aaa05b8a19e8ccb18578830741 (commit)
via d5fa229af57a555f67135e7e452096320056fcff (commit)
via b752f2e6dbaa18bcfd21262dac7049a93178f588 (commit)
via 2d377e42b20122afb7036d7e85407121c6321089 (commit)
via 5047e1a98d9907dc09cf82e33a26415a4cd0f2e9 (commit)
via 3f2ee5bb76ce7a7729d3406f3824c88664949dea (commit)
via b78088f8ab3fbe19db1a0def65520ae053cd35a8 (commit)
via e5d1f9e2458d197db0fc32108de0d9e66ab34258 (commit)
via 587a60a1e3a842cff8fc5300180c8c6c27783327 (commit)
via 8cdea9729739c4e07586cc73425cf450a9479ec6 (commit)
via 16ff748c7d5c12fe39c39dcda2830938609806cd (commit)
via 20353f2f45e4dfd48b1a1faffe1b075b9c522f2c (commit)
via c1025dbfa2db560487f3a88812208dadde10c691 (commit)
via 88e76f7efe09dc3487627a9264271abcdbe73bf4 (commit)
via 6727f9a9dd7acc2294df27e4f37ec185e40df27d (commit)
via 59ffc43b9a8f6fba00016e4d30fe70bf3cd00592 (commit)
via 4630b8733b8930f2324309337854c5a1c25d5ff6 (commit)
via 44a7ffc751ee557f816beb9055ea7aee8d3e35cc (commit)
via e54ecbd86eb8819e07cc7ad859054d0975a70fc0 (commit)
via 296eb0dd5eaaf55df6ee6208fec42e12b4aa78fa (commit)
via b31854552b1a19e98637aa94bce63d481a3ff3ab (commit)
via fb1cd3540bcf91c5c36459591f26e550e03f4d25 (commit)
via bb95bd7191c34bff7b56fba91252cfb40dc4efcd (commit)
via 08a94d6fd6430873aa43496598a5eaf52833baa9 (commit)
via cbb91c66f77a82994a4579e52e1cd42497a79b92 (commit)
via f2727e7cf860978c1e420dea67bbbdbc914a4afd (commit)
via de994756082f7333c79c6c4c1e2106a6886e3cc6 (commit)
via e1be402c003802f2c27f251fd3c3f4938b59e03c (commit)
via c9ca75208a124ddd492735dcb4520f141e7239d9 (commit)
via 367fdb67876789f46ed1540f078e4d66e1bd6a3c (commit)
via b47008f010563eca33d9afff54d5172379853785 (commit)
via f576d5499dc21b686174893e5401650eaef7714e (commit)
via 862ee84f985285df7acafcd7dff4c3fc968f1544 (commit)
via 0d6c3163fae49feb63932baee293019a5c423c8c (commit)
via 27d3fee84690729efdc137c7183de49b9176b193 (commit)
via 4730e20d28c93f1842da30be9ff7e1cab649f86d (commit)
via 717064a24e8d891ba2d521958f0b21baf4d854b7 (commit)
via 19f46cfee9d1098b65082ed5dee60a1400f74586 (commit)
via 16b161f6e3fe47e5b5a07fbca2c57eb1cdf478fa (commit)
via 86f514a94162dc06e9c64ddcf8eee8749a3b15a7 (commit)
via 2177c5276382b32bcef89b09c1caab63672a678b (commit)
via 61d5ed88e50344ac4c4d26eac005d4ddbec2e524 (commit)
via 3359f1c8beaf5ccb206c80ff03bea9d7a3ee1bd9 (commit)
via aa3d780d3435c80a284e32c8f7c7d1b7401451f8 (commit)
via 15ffc9fd5d93ef84641a361c61560dbc777ba752 (commit)
via be6bbb325683e96b7e3bcd19eabc5d8e8ce0412f (commit)
via b35b772970d804d6a2fd67d28287cb0006ccf43c (commit)
via 58d905dd66cb6877f0ab443a07ab62b53d9c9bff (commit)
via 81752ad13934f4ef25e36d8fd03029b19c9a7a1a (commit)
via 6adefd3e33b5864ee0a0cb25b10a663a16511ead (commit)
via 446096edde5521f5f4e03d11ad52a1535401541f (commit)
via f3adf3265713ce4fac3111521df8b7baf2e6473a (commit)
via c81b133ac063741870c06c6668ab1d41d94b68a9 (commit)
via 9cf189526d8ec350310cbde5d65c0f12d92eb373 (commit)
via 938ab92e5a17487d4c77c6e8eeb15a1065592a58 (commit)
via ea8ad6ae34093ccfc830c97089ba8da5bbb13bb1 (commit)
via a6feb3318ab4cdb020960b91cc824e95ee2cbb3d (commit)
via aad18d9bf7e42999b566632c6f2955c0edeeb926 (commit)
via 7e0316495239d222a89f3736b7661afee59623ec (commit)
via da19538d1c1ab899d5b8994d67b9d739977696d3 (commit)
via 4e0da89fe9b707ac1d8fe05349034c1242046fe8 (commit)
via 108a038caa6a2075ad3245636e0371f2c3ae902d (commit)
via 8033483f361155cb5abf65f33b1d59467d243a3b (commit)
via 5a16e656fe72c7757f782d72e9f86b2a1afaa44c (commit)
via b1c4a1bfcaed3282847aaabaa028ea1ba1c23d09 (commit)
via 826554629659b47a272cef20042df3318e3d243e (commit)
via 9f7c8facae8cfdb83db6a70f1c54c1899fe4fc88 (commit)
via bcf0053a3f87c427ab3123b87c6ebfa551f6a916 (commit)
via 406ab2ae35e4c1ab740152dacd31f250ae11ce1b (commit)
via 5272cb1f595e4d146e2caf952ad3b9f2cc6f7cc7 (commit)
via 9e4359bc2a7197b68e2d3c3d1518c283de2f99ed (commit)
via 13b3815045351aa226049f3abf86ba63974303fe (commit)
via 79bbd61c406ef5f798d5897aea64bd54af572dab (commit)
via a6779be12c89e8ea79af90d9c167900d727d2b89 (commit)
via 74f7090be85c08ace379c1fecff1ad2aaecb2373 (commit)
via 5f863d2135537a6f9a37149334a70363e2dd444d (commit)
via e6c5ad628088e7090c2281944965799b7fb36863 (commit)
via 6fe16de1dfb56d432a77f682eebf1d9000d9cb9f (commit)
via 224080ae321e8c447b8f070ccb5292b1582a166e (commit)
via c4fb92c0a12f24b395676f6bea65d1f804f1a65f (commit)
via f97f64a2b14c6c0b28a20bdd03565307315d7ba7 (commit)
via 99fd1e0832690daf67e2e15508c3134afe2520f6 (commit)
via ec497a403e85798b3da335da94e45294be7a4fb7 (commit)
via acda27371a3cd11dcdd0223bbd79514c98f0a8d1 (commit)
via 5cfd2cb76b1635286cdda7676985a243cd27ee0c (commit)
via c79367010c9fe462ec6d299f9efd6d544af53d66 (commit)
via bda0e8ca236332a046ad17efd5cd815f67860639 (commit)
via f716445accdd3b505322c5614fbce4a287e5aef9 (commit)
via 51911b7df4ee862d35f7fd5def57d179f4b9abbe (commit)
via 1cd05eb20a77d0c8608711203ab58f5b15d17594 (commit)
via e722d7c24aa81228d95d1cd43774814ed398f5fb (commit)
via f5bd9839107dbccd17e834f5e92d3f512e0465ed (commit)
via 1099c6ebdbe8efcfb161f0774ff5e63196ba63a1 (commit)
via 0f7e257a403ac4211b66ebe92dd4ac5f589c2cda (commit)
via a50c2c6a0bad03899f543c89fe2b9396d9b1b9d3 (commit)
via 02ff14b657842a86d3b63a133aa87146fce542c1 (commit)
via 52a007762060d593586252734661f9668a65dcbc (commit)
via 94792142c4f3d33f57150339dcec2902a85dcdbc (commit)
via ddc2100e200f605a351d215017d3e8683e9f131b (commit)
via 260546252d7c52f1856f955e1cbb6fb7218871dd (commit)
via 2c7674668a60d853a8c379caa2bc356ff5ab7146 (commit)
via 60d0e7d57e05d3e8a17e5be6a671f5bee4812ff7 (commit)
via 550a9f90b6e4db6d419e0f6046b1b1d30df76f39 (commit)
via d97a208cb29fc2032be62a8b58550c939a4d8a49 (commit)
via 66dadd4aafd3987dcdbcddfdffe5093f11f1b27d (commit)
via 2a38e1a7cd83bdf2c91a8f59d701f3a0b013ed18 (commit)
via 5be4861b487cc2a9d0737b4c34ce91eb9dc15d3e (commit)
via 01a6292f69bfd074941216070bf602dc21440212 (commit)
via 6856bc91ca32e3303813c3dd9d2e274f2d791106 (commit)
via 655ea9e9d4b4863e3f8de9c7f30fe32ac6d56f3a (commit)
via 258a6233136216d9df29543b76b82fd0ea229a18 (commit)
via 96f01440032e0a818a801cf22c2ea52bc6c56491 (commit)
via 52b6810f06f1344271347a9aa243f55e84306b57 (commit)
via cb02b8690194d1988078cb5d8e1407f523b6ec73 (commit)
via 72e7e01955deb2cf3ad8ecca751dc7ed7f425522 (commit)
via 1a6d3875ac6d4250c972b2920af17771d8ed8746 (commit)
via cb6bcedb853eb18cc8b9a9b23812aac6597d713b (commit)
via 8b558322b389846b0c6d44d83aa11a6b55c98d52 (commit)
via 056092d3fcb0b58ae87f728712d119abcb23bab4 (commit)
via a32b91909798a0370ef0f565548bb367a16c59f2 (commit)
via d3e372cf0d69fd374bc60525e70e1209cff68bba (commit)
via a36e8cd7ee8a10552381fae77b5e9d01c47ea6b2 (commit)
via 0ed4c01e5712a4f1a74bf4feb00ddcac2c6b03c9 (commit)
via 56c3ff5e2eca2ee02c7505d4dfe1aaad90e5f45c (commit)
via 89908d5eebb0eab10b4b60a1ef40220c6501f1c9 (commit)
via ddf325f14c825a5bb7ec4e1217d7461f62ca9af5 (commit)
via 758499763734be210016effd880c775185ee594c (commit)
via fd4be143c55ba58146de142fd24b5ad6934e5e0f (commit)
via b3b8f5cd95617128063afbb0cf584cc77fd57456 (commit)
via 38bf72810ac06322b3480e43186373abcdaf4865 (commit)
via ef88b26ee2a9bf90c984d6abec7cff990081b24c (commit)
via fef002afc396151939dfde94430b812c4805e05c (commit)
via 6c29461c68d785a97202531f683fe83a37ba5a90 (commit)
via dba6786e18bb9afbc46de0bcbb6ad7cb8be71648 (commit)
via 2ac5617d4d3a9039026ef97e2ff90a992d4891b8 (commit)
via 7978886359013059fa02ce75ff10e721e867f985 (commit)
via c8a107641efad65b35df8a6dc45d98750be134d1 (commit)
via 4196e3aa74765fa5fa91b6aabf9bab8860db618e (commit)
via 5908d7c8e2e0fc0e674f7ec0996bf4c7505e762d (commit)
via 851d6c82c24d003089f75678017830a964dc1868 (commit)
via 66d1e58b92596ff655911c8898a24003e20dd466 (commit)
via 6d7e529875278ac615e836ded4910772be8674a8 (commit)
via ae6bfbda68cc94375edc9669e55bc6995543b987 (commit)
via a6b97fc8483276e4ab77c010d73fc9f786b14cbd (commit)
via e7682298d04e43d6f455a0b581d591073eb9e6c7 (commit)
via db99b31d5f77986bda016b3a3860b1341eb39135 (commit)
via b62cd9278d0402ae89eed230c725dc222d4cf8a9 (commit)
via e5f70a91a9c3f21a4f063c0448c7301ed7e602c3 (commit)
via fa4b62e88c05ccfd510aea8dabc20c82949d0e09 (commit)
via 21a906672512db6ee8968221fc4419e7662d419f (commit)
via 4480900c60c881ba52602b0140252a6900f3f5ce (commit)
via 9662cafa8d9f835782b03b4a2ab720b8d4034288 (commit)
via e1430400b3f5da0196adedcc06426e7b97c3bed6 (commit)
via ed5f324775e36b13cc65a57abb8d263074ffb1fd (commit)
via 6718a5641d52634d73b94540fa52035296be4abd (commit)
via b19adaad658d5bb778bb262065e4e0e40c5e93b6 (commit)
via c9f2747292454d971a551b2aa71b86f5bd96827f (commit)
via c07d33bc135656f26a24a98968a855ff62b3034c (commit)
via f19bed914f4c6670e83efb3f7e21648d3530e663 (commit)
via f0916b149263fe460496f1bf743c1e5eae6c4100 (commit)
via 8f570e35e58d542e866250b94a52ed94299c9522 (commit)
via 097e74a503156f331fa408a18da892e8f39f8ce9 (commit)
via 80da8012860579a4546721f5005cff10713981f8 (commit)
via 36ba328e154b588fe4ef471fada9d780021efa3f (commit)
via 4783a108a80b7887669f7cd31a2d066c004f16a3 (commit)
via 0369bbf92ba155b510835962edfca0157a813fdf (commit)
via dd90f5d0f6414319c8c0e4c10fdfb3dfa0f3f103 (commit)
via f35e4c6e937974b67f3cc193d4276a4971d026af (commit)
via f19cb94e436eb1f028565b967f74204f0dcd9aaf (commit)
via 31e86ac291a1b0006e545c6f943595bb78bd5953 (commit)
via e34ce439901439784ea494c6b9a8d0613a960470 (commit)
via 90d81d90c79b1400c6fb6b0a9ce22b5616653edd (commit)
via 4a5e87186b4f0324f89f5a2ed3d8990044ec32db (commit)
via 20626ad3864b3c1ad828a3152cb8c61dfb9bcace (commit)
via 5e79499aea583470e37633d2e0db3f0cdfccabc6 (commit)
via 0912bbd0d365ba14b48e3cb0fcb01ea4a1afc69f (commit)
via 05cfb37bc27707bd234597686d291051188e05a1 (commit)
via 3f0e3fc8f820ee21da91ca1ad611eb77f44800c3 (commit)
via 7e84ee25a97db791406768ead8334713690572f6 (commit)
via 5032e4e1526a2492c3c1da5a43dd8f053b66ad37 (commit)
via 4a252e0696206027a459d2d0fee7a157a6729cb7 (commit)
via 907f5d4ed3b1a9fd9d39f897352d17e8fe54d48d (commit)
via a797c58414027b344357678b3d8ee2f77197f203 (commit)
via c9aedb07ff31de8f8d668d3bda729110d463c1ab (commit)
via 021b5136f672d79f83092dba0812ff1bc8b12d26 (commit)
via dc9f4a7a3c7042f5924837e91ea3987d53766c1a (commit)
via 19d57c8ee4cc5aef113e368d75744a05dac19a39 (commit)
via 8877119f787839d6919ae436c9cd1df2585d23ea (commit)
via d7082cd85659dd8f7279fee9e83c507eafcef2ce (commit)
via 112d692a3f7bfa69c9d2c7d8e68ec06f3aafa006 (commit)
via f196b4804d8e96386a822e68927e2103956a868f (commit)
via 51ac7f9be25a43e8c6ea929d31c5d2e0548529ad (commit)
via 31ac0a33f251d82e6145211cf36f23191f9237f0 (commit)
via 0ff6c7e67b01a42881dfd50d7acc67adfb2555c2 (commit)
via 519024e05c16f6a586d139539b9c71dde08935bc (commit)
from 5289db8dd474bc33af3bcf20688c6d0d4359eb0a (commit)
- Log -----------------------------------------------------------------
commit 8e30c72834a64dfa9f984466abe0071208dc6bd9
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 08:18:18 2012 +0200
Translation update done using Pootle.
commit 8e0cb60950ab01ab87f347f76bc9b09c3035420d
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 08:18:06 2012 +0200
Translation update done using Pootle.
commit d94818837fc23da5f39234dfbd53722d2c197d34
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 08:17:11 2012 +0200
Translation update done using Pootle.
commit 27bfe7ac795d05fc7cb3effb9f3be0e4e053f58b
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 08:16:00 2012 +0200
Translation update done using Pootle.
commit 412e3744e1dfeb46da9ceb0212a05224b8f10688
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 08:15:23 2012 +0200
Translation update done using Pootle.
commit adaf3280376022d7275bf492a06741bb17445752
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 08:15:11 2012 +0200
Translation update done using Pootle.
commit 31457b4bbb5ff5aaa05b8a19e8ccb18578830741
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 08:14:48 2012 +0200
Translation update done using Pootle.
commit d5fa229af57a555f67135e7e452096320056fcff
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 08:14:00 2012 +0200
Translation update done using Pootle.
commit b752f2e6dbaa18bcfd21262dac7049a93178f588
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 08:13:07 2012 +0200
Translation update done using Pootle.
commit 2d377e42b20122afb7036d7e85407121c6321089
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 08:12:38 2012 +0200
Translation update done using Pootle.
commit 5047e1a98d9907dc09cf82e33a26415a4cd0f2e9
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 08:12:38 2012 +0200
Translation update done using Pootle.
commit 3f2ee5bb76ce7a7729d3406f3824c88664949dea
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 08:11:44 2012 +0200
Translation update done using Pootle.
commit b78088f8ab3fbe19db1a0def65520ae053cd35a8
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 08:09:18 2012 +0200
Translation update done using Pootle.
commit e5d1f9e2458d197db0fc32108de0d9e66ab34258
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 08:08:35 2012 +0200
Translation update done using Pootle.
commit 587a60a1e3a842cff8fc5300180c8c6c27783327
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 08:08:24 2012 +0200
Translation update done using Pootle.
commit 8cdea9729739c4e07586cc73425cf450a9479ec6
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 08:08:10 2012 +0200
Translation update done using Pootle.
commit 16ff748c7d5c12fe39c39dcda2830938609806cd
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 08:06:31 2012 +0200
Translation update done using Pootle.
commit 20353f2f45e4dfd48b1a1faffe1b075b9c522f2c
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 08:06:22 2012 +0200
Translation update done using Pootle.
commit c1025dbfa2db560487f3a88812208dadde10c691
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 08:06:04 2012 +0200
Translation update done using Pootle.
commit 88e76f7efe09dc3487627a9264271abcdbe73bf4
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 08:05:44 2012 +0200
Translation update done using Pootle.
commit 6727f9a9dd7acc2294df27e4f37ec185e40df27d
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 08:05:27 2012 +0200
Translation update done using Pootle.
commit 59ffc43b9a8f6fba00016e4d30fe70bf3cd00592
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 08:05:05 2012 +0200
Translation update done using Pootle.
commit 4630b8733b8930f2324309337854c5a1c25d5ff6
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 08:04:02 2012 +0200
Translation update done using Pootle.
commit 44a7ffc751ee557f816beb9055ea7aee8d3e35cc
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 08:03:54 2012 +0200
Translation update done using Pootle.
commit e54ecbd86eb8819e07cc7ad859054d0975a70fc0
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 08:03:49 2012 +0200
Translation update done using Pootle.
commit 296eb0dd5eaaf55df6ee6208fec42e12b4aa78fa
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 08:03:31 2012 +0200
Translation update done using Pootle.
commit b31854552b1a19e98637aa94bce63d481a3ff3ab
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 08:03:27 2012 +0200
Translation update done using Pootle.
commit fb1cd3540bcf91c5c36459591f26e550e03f4d25
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 08:02:13 2012 +0200
Translation update done using Pootle.
commit bb95bd7191c34bff7b56fba91252cfb40dc4efcd
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 08:01:08 2012 +0200
Translation update done using Pootle.
commit 08a94d6fd6430873aa43496598a5eaf52833baa9
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 08:00:57 2012 +0200
Translation update done using Pootle.
commit cbb91c66f77a82994a4579e52e1cd42497a79b92
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 08:00:42 2012 +0200
Translation update done using Pootle.
commit f2727e7cf860978c1e420dea67bbbdbc914a4afd
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 08:00:03 2012 +0200
Translation update done using Pootle.
commit de994756082f7333c79c6c4c1e2106a6886e3cc6
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 07:59:19 2012 +0200
Translation update done using Pootle.
commit e1be402c003802f2c27f251fd3c3f4938b59e03c
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 07:59:06 2012 +0200
Translation update done using Pootle.
commit c9ca75208a124ddd492735dcb4520f141e7239d9
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 07:56:54 2012 +0200
Translation update done using Pootle.
commit 367fdb67876789f46ed1540f078e4d66e1bd6a3c
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 07:56:35 2012 +0200
Translation update done using Pootle.
commit b47008f010563eca33d9afff54d5172379853785
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 07:56:19 2012 +0200
Translation update done using Pootle.
commit f576d5499dc21b686174893e5401650eaef7714e
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 07:56:07 2012 +0200
Translation update done using Pootle.
commit 862ee84f985285df7acafcd7dff4c3fc968f1544
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 07:55:47 2012 +0200
Translation update done using Pootle.
commit 0d6c3163fae49feb63932baee293019a5c423c8c
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 07:55:11 2012 +0200
Translation update done using Pootle.
commit 27d3fee84690729efdc137c7183de49b9176b193
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 07:55:02 2012 +0200
Translation update done using Pootle.
commit 4730e20d28c93f1842da30be9ff7e1cab649f86d
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 07:54:54 2012 +0200
Translation update done using Pootle.
commit 717064a24e8d891ba2d521958f0b21baf4d854b7
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 07:52:00 2012 +0200
Translation update done using Pootle.
commit 19f46cfee9d1098b65082ed5dee60a1400f74586
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 07:51:07 2012 +0200
Translation update done using Pootle.
commit 16b161f6e3fe47e5b5a07fbca2c57eb1cdf478fa
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 07:49:25 2012 +0200
Translation update done using Pootle.
commit 86f514a94162dc06e9c64ddcf8eee8749a3b15a7
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 07:49:03 2012 +0200
Translation update done using Pootle.
commit 2177c5276382b32bcef89b09c1caab63672a678b
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 07:49:03 2012 +0200
Translation update done using Pootle.
commit 61d5ed88e50344ac4c4d26eac005d4ddbec2e524
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 07:48:21 2012 +0200
Translation update done using Pootle.
commit 3359f1c8beaf5ccb206c80ff03bea9d7a3ee1bd9
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 07:47:54 2012 +0200
Translation update done using Pootle.
commit aa3d780d3435c80a284e32c8f7c7d1b7401451f8
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 07:47:49 2012 +0200
Translation update done using Pootle.
commit 15ffc9fd5d93ef84641a361c61560dbc777ba752
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 07:47:30 2012 +0200
Translation update done using Pootle.
commit be6bbb325683e96b7e3bcd19eabc5d8e8ce0412f
Author: any anonymous user <>
Date: Fri Jan 27 07:46:50 2012 +0200
Translation update done using Pootle.
commit b35b772970d804d6a2fd67d28287cb0006ccf43c
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 07:46:50 2012 +0200
Translation update done using Pootle.
commit 58d905dd66cb6877f0ab443a07ab62b53d9c9bff
Author: any anonymous user <>
Date: Fri Jan 27 07:46:44 2012 +0200
Translation update done using Pootle.
commit 81752ad13934f4ef25e36d8fd03029b19c9a7a1a
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 07:46:44 2012 +0200
Translation update done using Pootle.
commit 6adefd3e33b5864ee0a0cb25b10a663a16511ead
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 07:46:34 2012 +0200
Translation update done using Pootle.
commit 446096edde5521f5f4e03d11ad52a1535401541f
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 07:44:57 2012 +0200
Translation update done using Pootle.
commit f3adf3265713ce4fac3111521df8b7baf2e6473a
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 07:44:33 2012 +0200
Translation update done using Pootle.
commit c81b133ac063741870c06c6668ab1d41d94b68a9
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 07:43:30 2012 +0200
Translation update done using Pootle.
commit 9cf189526d8ec350310cbde5d65c0f12d92eb373
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 07:42:24 2012 +0200
Translation update done using Pootle.
commit 938ab92e5a17487d4c77c6e8eeb15a1065592a58
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 07:42:11 2012 +0200
Translation update done using Pootle.
commit ea8ad6ae34093ccfc830c97089ba8da5bbb13bb1
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 07:42:03 2012 +0200
Translation update done using Pootle.
commit a6feb3318ab4cdb020960b91cc824e95ee2cbb3d
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 07:41:48 2012 +0200
Translation update done using Pootle.
commit aad18d9bf7e42999b566632c6f2955c0edeeb926
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 07:41:19 2012 +0200
Translation update done using Pootle.
commit 7e0316495239d222a89f3736b7661afee59623ec
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 07:40:56 2012 +0200
Translation update done using Pootle.
commit da19538d1c1ab899d5b8994d67b9d739977696d3
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 07:40:50 2012 +0200
Translation update done using Pootle.
commit 4e0da89fe9b707ac1d8fe05349034c1242046fe8
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 07:40:45 2012 +0200
Translation update done using Pootle.
commit 108a038caa6a2075ad3245636e0371f2c3ae902d
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 07:40:36 2012 +0200
Translation update done using Pootle.
commit 8033483f361155cb5abf65f33b1d59467d243a3b
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 07:39:41 2012 +0200
Translation update done using Pootle.
commit 5a16e656fe72c7757f782d72e9f86b2a1afaa44c
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 07:37:55 2012 +0200
Translation update done using Pootle.
commit b1c4a1bfcaed3282847aaabaa028ea1ba1c23d09
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 07:34:57 2012 +0200
Translation update done using Pootle.
commit 826554629659b47a272cef20042df3318e3d243e
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 07:34:38 2012 +0200
Translation update done using Pootle.
commit 9f7c8facae8cfdb83db6a70f1c54c1899fe4fc88
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 07:33:27 2012 +0200
Translation update done using Pootle.
commit bcf0053a3f87c427ab3123b87c6ebfa551f6a916
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 07:33:13 2012 +0200
Translation update done using Pootle.
commit 406ab2ae35e4c1ab740152dacd31f250ae11ce1b
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 07:33:00 2012 +0200
Translation update done using Pootle.
commit 5272cb1f595e4d146e2caf952ad3b9f2cc6f7cc7
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 07:32:56 2012 +0200
Translation update done using Pootle.
commit 9e4359bc2a7197b68e2d3c3d1518c283de2f99ed
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 07:31:54 2012 +0200
Translation update done using Pootle.
commit 13b3815045351aa226049f3abf86ba63974303fe
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 07:30:01 2012 +0200
Translation update done using Pootle.
commit 79bbd61c406ef5f798d5897aea64bd54af572dab
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 07:28:54 2012 +0200
Translation update done using Pootle.
commit a6779be12c89e8ea79af90d9c167900d727d2b89
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 07:28:37 2012 +0200
Translation update done using Pootle.
commit 74f7090be85c08ace379c1fecff1ad2aaecb2373
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 07:27:33 2012 +0200
Translation update done using Pootle.
commit 5f863d2135537a6f9a37149334a70363e2dd444d
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 07:26:45 2012 +0200
Translation update done using Pootle.
commit e6c5ad628088e7090c2281944965799b7fb36863
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 07:25:57 2012 +0200
Translation update done using Pootle.
commit 6fe16de1dfb56d432a77f682eebf1d9000d9cb9f
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 07:25:47 2012 +0200
Translation update done using Pootle.
commit 224080ae321e8c447b8f070ccb5292b1582a166e
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 07:25:31 2012 +0200
Translation update done using Pootle.
commit c4fb92c0a12f24b395676f6bea65d1f804f1a65f
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 07:25:06 2012 +0200
Translation update done using Pootle.
commit f97f64a2b14c6c0b28a20bdd03565307315d7ba7
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 07:24:20 2012 +0200
Translation update done using Pootle.
commit 99fd1e0832690daf67e2e15508c3134afe2520f6
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 07:23:05 2012 +0200
Translation update done using Pootle.
commit ec497a403e85798b3da335da94e45294be7a4fb7
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 07:22:59 2012 +0200
Translation update done using Pootle.
commit acda27371a3cd11dcdd0223bbd79514c98f0a8d1
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 07:22:46 2012 +0200
Translation update done using Pootle.
commit 5cfd2cb76b1635286cdda7676985a243cd27ee0c
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 07:22:38 2012 +0200
Translation update done using Pootle.
commit c79367010c9fe462ec6d299f9efd6d544af53d66
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 07:22:24 2012 +0200
Translation update done using Pootle.
commit bda0e8ca236332a046ad17efd5cd815f67860639
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 07:21:24 2012 +0200
Translation update done using Pootle.
commit f716445accdd3b505322c5614fbce4a287e5aef9
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 07:21:11 2012 +0200
Translation update done using Pootle.
commit 51911b7df4ee862d35f7fd5def57d179f4b9abbe
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 07:21:05 2012 +0200
Translation update done using Pootle.
commit 1cd05eb20a77d0c8608711203ab58f5b15d17594
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 07:20:30 2012 +0200
Translation update done using Pootle.
commit e722d7c24aa81228d95d1cd43774814ed398f5fb
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 07:18:53 2012 +0200
Translation update done using Pootle.
commit f5bd9839107dbccd17e834f5e92d3f512e0465ed
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 07:18:48 2012 +0200
Translation update done using Pootle.
commit 1099c6ebdbe8efcfb161f0774ff5e63196ba63a1
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 07:18:28 2012 +0200
Translation update done using Pootle.
commit 0f7e257a403ac4211b66ebe92dd4ac5f589c2cda
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 07:18:17 2012 +0200
Translation update done using Pootle.
commit a50c2c6a0bad03899f543c89fe2b9396d9b1b9d3
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 07:17:50 2012 +0200
Translation update done using Pootle.
commit 02ff14b657842a86d3b63a133aa87146fce542c1
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 07:17:45 2012 +0200
Translation update done using Pootle.
commit 52a007762060d593586252734661f9668a65dcbc
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 07:17:33 2012 +0200
Translation update done using Pootle.
commit 94792142c4f3d33f57150339dcec2902a85dcdbc
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 07:16:16 2012 +0200
Translation update done using Pootle.
commit ddc2100e200f605a351d215017d3e8683e9f131b
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 07:16:05 2012 +0200
Translation update done using Pootle.
commit 260546252d7c52f1856f955e1cbb6fb7218871dd
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 07:15:01 2012 +0200
Translation update done using Pootle.
commit 2c7674668a60d853a8c379caa2bc356ff5ab7146
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 07:14:31 2012 +0200
Translation update done using Pootle.
commit 60d0e7d57e05d3e8a17e5be6a671f5bee4812ff7
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 07:14:22 2012 +0200
Translation update done using Pootle.
commit 550a9f90b6e4db6d419e0f6046b1b1d30df76f39
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 07:14:06 2012 +0200
Translation update done using Pootle.
commit d97a208cb29fc2032be62a8b58550c939a4d8a49
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 07:14:01 2012 +0200
Translation update done using Pootle.
commit 66dadd4aafd3987dcdbcddfdffe5093f11f1b27d
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 07:13:54 2012 +0200
Translation update done using Pootle.
commit 2a38e1a7cd83bdf2c91a8f59d701f3a0b013ed18
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 07:13:47 2012 +0200
Translation update done using Pootle.
commit 5be4861b487cc2a9d0737b4c34ce91eb9dc15d3e
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 07:13:34 2012 +0200
Translation update done using Pootle.
commit 01a6292f69bfd074941216070bf602dc21440212
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 07:13:04 2012 +0200
Translation update done using Pootle.
commit 6856bc91ca32e3303813c3dd9d2e274f2d791106
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 07:12:43 2012 +0200
Translation update done using Pootle.
commit 655ea9e9d4b4863e3f8de9c7f30fe32ac6d56f3a
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 07:12:32 2012 +0200
Translation update done using Pootle.
commit 258a6233136216d9df29543b76b82fd0ea229a18
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 07:12:20 2012 +0200
Translation update done using Pootle.
commit 96f01440032e0a818a801cf22c2ea52bc6c56491
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 07:07:50 2012 +0200
Translation update done using Pootle.
commit 52b6810f06f1344271347a9aa243f55e84306b57
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 07:07:37 2012 +0200
Translation update done using Pootle.
commit cb02b8690194d1988078cb5d8e1407f523b6ec73
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 07:07:18 2012 +0200
Translation update done using Pootle.
commit 72e7e01955deb2cf3ad8ecca751dc7ed7f425522
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 07:07:07 2012 +0200
Translation update done using Pootle.
commit 1a6d3875ac6d4250c972b2920af17771d8ed8746
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 07:06:45 2012 +0200
Translation update done using Pootle.
commit cb6bcedb853eb18cc8b9a9b23812aac6597d713b
Author: any anonymous user <>
Date: Fri Jan 27 07:06:29 2012 +0200
Translation update done using Pootle.
commit 8b558322b389846b0c6d44d83aa11a6b55c98d52
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 07:06:29 2012 +0200
Translation update done using Pootle.
commit 056092d3fcb0b58ae87f728712d119abcb23bab4
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 07:06:25 2012 +0200
Translation update done using Pootle.
commit a32b91909798a0370ef0f565548bb367a16c59f2
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 07:06:20 2012 +0200
Translation update done using Pootle.
commit d3e372cf0d69fd374bc60525e70e1209cff68bba
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 07:05:38 2012 +0200
Translation update done using Pootle.
commit a36e8cd7ee8a10552381fae77b5e9d01c47ea6b2
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 07:03:06 2012 +0200
Translation update done using Pootle.
commit 0ed4c01e5712a4f1a74bf4feb00ddcac2c6b03c9
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 07:00:57 2012 +0200
Translation update done using Pootle.
commit 56c3ff5e2eca2ee02c7505d4dfe1aaad90e5f45c
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 06:59:01 2012 +0200
Translation update done using Pootle.
commit 89908d5eebb0eab10b4b60a1ef40220c6501f1c9
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 06:58:38 2012 +0200
Translation update done using Pootle.
commit ddf325f14c825a5bb7ec4e1217d7461f62ca9af5
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 06:57:42 2012 +0200
Translation update done using Pootle.
commit 758499763734be210016effd880c775185ee594c
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 06:55:55 2012 +0200
Translation update done using Pootle.
commit fd4be143c55ba58146de142fd24b5ad6934e5e0f
Author: any anonymous user <>
Date: Fri Jan 27 06:54:37 2012 +0200
Translation update done using Pootle.
commit b3b8f5cd95617128063afbb0cf584cc77fd57456
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 06:54:37 2012 +0200
Translation update done using Pootle.
commit 38bf72810ac06322b3480e43186373abcdaf4865
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 06:54:34 2012 +0200
Translation update done using Pootle.
commit ef88b26ee2a9bf90c984d6abec7cff990081b24c
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 06:54:14 2012 +0200
Translation update done using Pootle.
commit fef002afc396151939dfde94430b812c4805e05c
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 06:53:35 2012 +0200
Translation update done using Pootle.
commit 6c29461c68d785a97202531f683fe83a37ba5a90
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 06:52:47 2012 +0200
Translation update done using Pootle.
commit dba6786e18bb9afbc46de0bcbb6ad7cb8be71648
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 06:52:43 2012 +0200
Translation update done using Pootle.
commit 2ac5617d4d3a9039026ef97e2ff90a992d4891b8
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 06:52:02 2012 +0200
Translation update done using Pootle.
commit 7978886359013059fa02ce75ff10e721e867f985
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 06:51:21 2012 +0200
Translation update done using Pootle.
commit c8a107641efad65b35df8a6dc45d98750be134d1
Author: any anonymous user <>
Date: Fri Jan 27 06:47:31 2012 +0200
Translation update done using Pootle.
commit 4196e3aa74765fa5fa91b6aabf9bab8860db618e
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 06:47:31 2012 +0200
Translation update done using Pootle.
commit 5908d7c8e2e0fc0e674f7ec0996bf4c7505e762d
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 06:47:21 2012 +0200
Translation update done using Pootle.
commit 851d6c82c24d003089f75678017830a964dc1868
Author: any anonymous user <>
Date: Fri Jan 27 06:46:13 2012 +0200
Translation update done using Pootle.
commit 66d1e58b92596ff655911c8898a24003e20dd466
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 06:46:13 2012 +0200
Translation update done using Pootle.
commit 6d7e529875278ac615e836ded4910772be8674a8
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 06:46:07 2012 +0200
Translation update done using Pootle.
commit ae6bfbda68cc94375edc9669e55bc6995543b987
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 06:45:57 2012 +0200
Translation update done using Pootle.
commit a6b97fc8483276e4ab77c010d73fc9f786b14cbd
Author: any anonymous user <>
Date: Fri Jan 27 06:45:32 2012 +0200
Translation update done using Pootle.
commit e7682298d04e43d6f455a0b581d591073eb9e6c7
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 06:45:32 2012 +0200
Translation update done using Pootle.
commit db99b31d5f77986bda016b3a3860b1341eb39135
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 06:41:24 2012 +0200
Translation update done using Pootle.
commit b62cd9278d0402ae89eed230c725dc222d4cf8a9
Author: any anonymous user <>
Date: Fri Jan 27 06:41:00 2012 +0200
Translation update done using Pootle.
commit e5f70a91a9c3f21a4f063c0448c7301ed7e602c3
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 06:41:00 2012 +0200
Translation update done using Pootle.
commit fa4b62e88c05ccfd510aea8dabc20c82949d0e09
Author: any anonymous user <>
Date: Fri Jan 27 06:40:50 2012 +0200
Translation update done using Pootle.
commit 21a906672512db6ee8968221fc4419e7662d419f
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 06:40:49 2012 +0200
Translation update done using Pootle.
commit 4480900c60c881ba52602b0140252a6900f3f5ce
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 06:40:39 2012 +0200
Translation update done using Pootle.
commit 9662cafa8d9f835782b03b4a2ab720b8d4034288
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 06:39:35 2012 +0200
Translation update done using Pootle.
commit e1430400b3f5da0196adedcc06426e7b97c3bed6
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 06:37:24 2012 +0200
Translation update done using Pootle.
commit ed5f324775e36b13cc65a57abb8d263074ffb1fd
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 06:37:16 2012 +0200
Translation update done using Pootle.
commit 6718a5641d52634d73b94540fa52035296be4abd
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 06:33:06 2012 +0200
Translation update done using Pootle.
commit b19adaad658d5bb778bb262065e4e0e40c5e93b6
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 06:32:46 2012 +0200
Translation update done using Pootle.
commit c9f2747292454d971a551b2aa71b86f5bd96827f
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 06:32:26 2012 +0200
Translation update done using Pootle.
commit c07d33bc135656f26a24a98968a855ff62b3034c
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 06:32:13 2012 +0200
Translation update done using Pootle.
commit f19bed914f4c6670e83efb3f7e21648d3530e663
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 06:31:40 2012 +0200
Translation update done using Pootle.
commit f0916b149263fe460496f1bf743c1e5eae6c4100
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 06:26:03 2012 +0200
Translation update done using Pootle.
commit 8f570e35e58d542e866250b94a52ed94299c9522
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 06:25:12 2012 +0200
Translation update done using Pootle.
commit 097e74a503156f331fa408a18da892e8f39f8ce9
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 06:24:38 2012 +0200
Translation update done using Pootle.
commit 80da8012860579a4546721f5005cff10713981f8
Author: any anonymous user <>
Date: Fri Jan 27 06:24:10 2012 +0200
Translation update done using Pootle.
commit 36ba328e154b588fe4ef471fada9d780021efa3f
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 06:24:09 2012 +0200
Translation update done using Pootle.
commit 4783a108a80b7887669f7cd31a2d066c004f16a3
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 06:23:14 2012 +0200
Translation update done using Pootle.
commit 0369bbf92ba155b510835962edfca0157a813fdf
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 06:22:48 2012 +0200
Translation update done using Pootle.
commit dd90f5d0f6414319c8c0e4c10fdfb3dfa0f3f103
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 06:17:40 2012 +0200
Translation update done using Pootle.
commit f35e4c6e937974b67f3cc193d4276a4971d026af
Author: manyfun <manyfun7(a)gmail.com>
Date: Fri Jan 27 06:09:59 2012 +0200
Translation update done using Pootle.
commit f19cb94e436eb1f028565b967f74204f0dcd9aaf
Merge: 31e86ac 90d81d9
Author: Pootle server <pootle(a)cihar.com>
Date: Thu Jan 26 16:40:08 2012 +0100
Merge remote-tracking branch 'origin/master'
commit 31e86ac291a1b0006e545c6f943595bb78bd5953
Author: Vian Zhao <brovian(a)gmail.com>
Date: Thu Jan 26 16:14:11 2012 +0200
Translation update done using Pootle.
commit e34ce439901439784ea494c6b9a8d0613a960470
Author: Vian Zhao <brovian(a)gmail.com>
Date: Thu Jan 26 16:13:57 2012 +0200
Translation update done using Pootle.
commit 20626ad3864b3c1ad828a3152cb8c61dfb9bcace
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Thu Jan 26 12:04:07 2012 +0200
Translation update done using Pootle.
commit 5e79499aea583470e37633d2e0db3f0cdfccabc6
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Thu Jan 26 12:03:32 2012 +0200
Translation update done using Pootle.
commit 0912bbd0d365ba14b48e3cb0fcb01ea4a1afc69f
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Thu Jan 26 12:02:15 2012 +0200
Translation update done using Pootle.
commit 05cfb37bc27707bd234597686d291051188e05a1
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Thu Jan 26 12:02:06 2012 +0200
Translation update done using Pootle.
commit 3f0e3fc8f820ee21da91ca1ad611eb77f44800c3
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Thu Jan 26 12:01:11 2012 +0200
Translation update done using Pootle.
commit 7e84ee25a97db791406768ead8334713690572f6
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Thu Jan 26 12:00:03 2012 +0200
Translation update done using Pootle.
commit 5032e4e1526a2492c3c1da5a43dd8f053b66ad37
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Thu Jan 26 11:59:35 2012 +0200
Translation update done using Pootle.
commit 4a252e0696206027a459d2d0fee7a157a6729cb7
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Thu Jan 26 11:59:08 2012 +0200
Translation update done using Pootle.
commit 907f5d4ed3b1a9fd9d39f897352d17e8fe54d48d
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Thu Jan 26 11:58:55 2012 +0200
Translation update done using Pootle.
commit a797c58414027b344357678b3d8ee2f77197f203
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Thu Jan 26 11:58:31 2012 +0200
Translation update done using Pootle.
commit c9aedb07ff31de8f8d668d3bda729110d463c1ab
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Thu Jan 26 11:57:56 2012 +0200
Translation update done using Pootle.
commit 021b5136f672d79f83092dba0812ff1bc8b12d26
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Thu Jan 26 11:57:20 2012 +0200
Translation update done using Pootle.
commit dc9f4a7a3c7042f5924837e91ea3987d53766c1a
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Thu Jan 26 11:56:44 2012 +0200
Translation update done using Pootle.
commit 19d57c8ee4cc5aef113e368d75744a05dac19a39
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Thu Jan 26 11:56:28 2012 +0200
Translation update done using Pootle.
commit 8877119f787839d6919ae436c9cd1df2585d23ea
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Jan 26 08:12:31 2012 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 2 +
Documentation.html | 4 +-
README | 2 +-
libraries/Config.class.php | 2 +-
po/ja.po | 32 ++--
po/ko.po | 390 +++++++++++++++++++-------------------------
po/tr.po | 4 +-
po/zh_CN.po | 6 +-
server_status.php | 23 ++-
tbl_operations.php | 72 ++++++---
10 files changed, 254 insertions(+), 283 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 08694de..53c143a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
phpMyAdmin - ChangeLog
======================
+3.6.0.0 (not yet released)
+
3.5.0.0 (not yet released)
+ rfe #2021981 [interface] Add support for mass prefix change.
+ "up to date" message on main page when current version is up to date
diff --git a/Documentation.html b/Documentation.html
index 49f6ec1..8fafa5f 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -9,7 +9,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78
<link rel="icon" href="./favicon.ico" type="image/x-icon" />
<link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" />
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <title>phpMyAdmin 3.5.0-beta2 - Documentation</title>
+ <title>phpMyAdmin 3.6.0-dev - Documentation</title>
<link rel="stylesheet" type="text/css" href="docs.css" />
</head>
@@ -17,7 +17,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78
<div id="header">
<h1>
<a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a>
- 3.5.0-beta2
+ 3.6.0-dev
Documentation
</h1>
</div>
diff --git a/README b/README
index 5e1d40b..f1ba37a 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
phpMyAdmin - Readme
===================
-Version 3.5.0-beta2
+Version 3.6.0-dev
A set of PHP-scripts to manage MySQL over the web.
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index 8235d83..635a02e 100644
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@@ -98,7 +98,7 @@ class PMA_Config
*/
function checkSystem()
{
- $this->set('PMA_VERSION', '3.5.0-beta2');
+ $this->set('PMA_VERSION', '3.6.0-dev');
/**
* @deprecated
*/
diff --git a/po/ja.po b/po/ja.po
index 20a7bb7..0cf0ca6 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.5.0-beta2\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
"POT-Creation-Date: 2012-01-25 17:45+0100\n"
-"PO-Revision-Date: 2012-01-23 15:53+0200\n"
+"PO-Revision-Date: 2012-01-26 12:03+0200\n"
"Last-Translator: Yuichiro <yuichiro(a)pop07.odn.ne.jp>\n"
"Language-Team: japanese <jp(a)li.org>\n"
"Language: ja\n"
@@ -244,7 +244,7 @@ msgstr "はい"
#: db_export.php:26
msgid "View dump (schema) of database"
-msgstr "DB のダンプ(スキーマ)表示"
+msgstr "データベースのダンプ (スキーマ) 表示"
#: db_export.php:30 db_printview.php:94 db_qbe.php:101 db_tracking.php:48
#: export.php:354 navigation.php:296
@@ -525,7 +525,7 @@ msgstr "\"<i>%s</i>\" の検索結果 %s:"
#, php-format
msgid "%s match inside table <i>%s</i>"
msgid_plural "%s matches inside table <i>%s</i>"
-msgstr[0] "%s 件（テーブル <i>%s</i>)"
+msgstr[0] "%s 件 (テーブル <i>%s</i>)"
#: db_search.php:234 libraries/common.lib.php:3128
#: libraries/common.lib.php:3340 libraries/common.lib.php:3341
@@ -2895,7 +2895,7 @@ msgstr "実行した SQL"
#: libraries/rte/rte_triggers.lib.php:91
#: libraries/rte/rte_triggers.lib.php:104
msgid "MySQL said: "
-msgstr "MySQLのメッセージ: "
+msgstr "MySQL のメッセージ: "
#: libraries/common.lib.php:1127
msgid "Failed to connect to SQL validator!"
@@ -4405,8 +4405,8 @@ msgid ""
"[kbd]SMART[/kbd] - i.e. descending order for columns of type TIME, DATE, "
"DATETIME and TIMESTAMP, ascending order otherwise"
msgstr ""
-"[kbd]SMART[/kbd] とは TIME、DATE、DATETIME、TIMESTAMP 型のカラムに対しては "
-"DESC、それ以外はASCの並び順にします。"
+"[kbd]SMART[/kbd] とは TIME、DATE、DATETIME、TIMESTAMP 型のカラムに対しては DESC、それ以外は ASC "
+"の並び順にします。"
#: libraries/config/messages.inc.php:330
msgid "Default sorting order"
@@ -4624,7 +4624,7 @@ msgstr "圧縮通信を行う"
#: libraries/config/messages.inc.php:380
msgid "How to connect to server, keep [kbd]tcp[/kbd] if unsure"
-msgstr "サーバへの接続方法。確信がなければ [kbd]tcp[/kbd] のままにします。"
+msgstr "サーバへの接続方法。確信がなければ [kbd]tcp[/kbd] のままにしてください。"
#: libraries/config/messages.inc.php:381
msgid "Connection type"
@@ -5023,7 +5023,7 @@ msgstr "このサーバの詳細な名前"
#: libraries/config/messages.inc.php:455
msgid "Whether a user should be displayed a "show all (rows)" button"
-msgstr "「すべて表示」ボタンを表示するかどうか。"
+msgstr "「(行を) すべて表示」ボタンを表示するかどうか。"
#: libraries/config/messages.inc.php:456
msgid "Allow to display all the rows"
@@ -6092,11 +6092,11 @@ msgstr "書き込み待ち"
#: libraries/engines/innodb.lib.php:242
msgid "Read misses in %"
-msgstr "読み込みミス(％)"
+msgstr "読み込みミス (%)"
#: libraries/engines/innodb.lib.php:250
msgid "Write waits in %"
-msgstr "書き込み待ち(％)"
+msgstr "書き込み待ち (%)"
#: libraries/engines/myisam.lib.php:22
msgid "Data pointer size"
@@ -6721,7 +6721,7 @@ msgstr "XML"
#: libraries/export/xml.php:34
msgid "Object creation options (all are recommended)"
-msgstr "生成オプション（全て推奨）"
+msgstr "生成オプション (すべて推奨)"
#: libraries/export/xml.php:62
msgid "Views"
@@ -7364,7 +7364,7 @@ msgstr "申し訳ありませんが、削除されたイベントの復元に失
#: libraries/rte/rte_events.lib.php:117 libraries/rte/rte_routines.lib.php:267
#: libraries/rte/rte_triggers.lib.php:90
msgid "The backed up query was:"
-msgstr ""
+msgstr "バックアップされていたクエリ:"
#: libraries/rte/rte_events.lib.php:121
#, php-format
@@ -7406,10 +7406,10 @@ msgid "Event type"
msgstr "イベント種別"
#: libraries/rte/rte_events.lib.php:416 libraries/rte/rte_routines.lib.php:849
-#, fuzzy, php-format
+#, php-format
#| msgid "Change"
msgid "Change to %s"
-msgstr "変更"
+msgstr "%s に変更する"
#: libraries/rte/rte_events.lib.php:422
msgid "Execute at"
@@ -8926,7 +8926,7 @@ msgstr "ストレージエンジン"
#: server_export.php:20
msgid "View dump (schema) of databases"
-msgstr "データベースのダンプ(スキーマ)表示"
+msgstr "データベースのダンプ (スキーマ) 表示"
#: server_plugins.php:81
msgid "Modules"
@@ -11287,7 +11287,7 @@ msgstr "テーブル %1$s を作成しました。"
#: tbl_export.php:24
msgid "View dump (schema) of table"
-msgstr "テーブルのダンプ(スキーマ)表示"
+msgstr "テーブルのダンプ (スキーマ) 表示"
#: tbl_gis_visualization.php:112
msgid "Display GIS Visualization"
diff --git a/po/ko.po b/po/ko.po
index 95162a2..3b66495 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.5.0-beta2\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
"POT-Creation-Date: 2012-01-25 17:45+0100\n"
-"PO-Revision-Date: 2011-11-18 08:35+0200\n"
+"PO-Revision-Date: 2012-01-27 08:18+0200\n"
"Last-Translator: manyfun <manyfun7(a)gmail.com>\n"
"Language-Team: korean <ko(a)li.org>\n"
"Language: ko\n"
@@ -103,10 +103,9 @@ msgid "No blob streaming server configured!"
msgstr "blob streaming 서버 설정이 되지 않았습니다!"
#: bs_disp_as_mime_type.php:35
-#, fuzzy
#| msgid "Failed to write file to disk."
msgid "Failed to fetch headers"
-msgstr "헤더를 가져오는 데 실패했습니다"
+msgstr "헤더를 가져오는 데 실패했습니다."
#: bs_disp_as_mime_type.php:41
msgid "Failed to open remote URL"
@@ -117,9 +116,7 @@ msgstr "원격 URL 열기에 실패했습니다"
msgid ""
"The %s file is not available on this system, please visit www.phpmyadmin.net "
"for more information."
-msgstr ""
-"%s 파일이 이 시스템에서 사용 가능하지 않습니다. www.phpmyadmin.net에 방문하"
-"여 정보를 확인하시기 바랍니다."
+msgstr "%s 파일은 이 시스템에서 이용할 수 없습니다. www.phpmyadmin.net에 방문하여 정보를 확인하시기 바랍니다."
#: db_create.php:60
#, php-format
@@ -202,7 +199,7 @@ msgstr "링크 대상:"
#: libraries/schema/Pdf_Relation_Schema.class.php:1333
#: libraries/tbl_properties.inc.php:122 tbl_printview.php:144
msgid "Comments"
-msgstr "설명(코멘트)"
+msgstr "설명"
#: db_datadict.php:233 js/messages.php:248 libraries/Index.class.php:349
#: libraries/Index.class.php:376 libraries/Index.class.php:679
@@ -272,7 +269,7 @@ msgstr "데이터베이스 %s 의 이름을 %s 로 변경하였습니다."
#: db_operations.php:284
#, php-format
msgid "Database %s has been copied to %s"
-msgstr "데이터베이스 %s 를 %s 로 복사하였습니다."
+msgstr "데이터베이스 %s를 %s로 복사하였습니다."
#: db_operations.php:412
msgid "Rename database to"
@@ -371,7 +368,7 @@ msgstr "테이블 "
#: tbl_printview.php:353 tbl_structure.php:363 tbl_structure.php:469
#: tbl_structure.php:882
msgid "Rows"
-msgstr "행(레코드)"
+msgstr "행"
#: db_printview.php:106 libraries/db_structure.lib.php:53 tbl_indexes.php:214
msgid "Size"
@@ -393,14 +390,14 @@ msgstr "생성"
#: libraries/schema/Pdf_Relation_Schema.class.php:1289 tbl_printview.php:403
#: tbl_structure.php:922
msgid "Last update"
-msgstr "업데이트"
+msgstr "마지막 업데이트"
#: db_printview.php:202 libraries/db_info.inc.php:84
#: libraries/export/sql.php:753
#: libraries/schema/Pdf_Relation_Schema.class.php:1294 tbl_printview.php:413
#: tbl_structure.php:930
msgid "Last check"
-msgstr "검사"
+msgstr "마지막 검사"
#: db_printview.php:219 db_structure.php:514
#, php-format
@@ -410,7 +407,7 @@ msgstr[0] "%s개 테이블 "
#: db_qbe.php:41
msgid "You have to choose at least one column to display"
-msgstr "출력하려면 적어도 1개 이상의 열(칼럼)을 선택해야 합니다."
+msgstr "출력하려면 적어도 1개 이상의 열을 선택해야 합니다."
#: db_qbe.php:186
#, php-format
@@ -436,7 +433,7 @@ msgstr "오름차순"
#: server_databases.php:162 server_databases.php:179 tbl_operations.php:280
#: tbl_select.php:223
msgid "Descending"
-msgstr "내림차순(역순)"
+msgstr "내림차순"
#: db_qbe.php:286 db_tracking.php:92 libraries/display_tbl.lib.php:426
#: tbl_change.php:287 tbl_tracking.php:654
@@ -588,7 +585,7 @@ msgstr "데이터베이스에 테이블이 없습니다."
#: db_structure.php:228 libraries/mysql_charsets.lib.php:409
#: libraries/mysql_charsets.lib.php:416
msgid "unknown"
-msgstr ""
+msgstr "알수없음"
#: db_structure.php:315 tbl_operations.php:692
#, php-format
@@ -603,7 +600,7 @@ msgstr "뷰 %s가 제거되었습니다."
#: db_structure.php:328 tbl_operations.php:709
#, php-format
msgid "Table %s has been dropped"
-msgstr "테이블 %s 을 제거했습니다."
+msgstr "테이블 %s를 제거했습니다."
#: db_structure.php:338 tbl_create.php:281
msgid "Tracking is active."
@@ -806,7 +803,7 @@ msgstr "데이터베이스 로그"
#: enum_editor.php:23 js/messages.php:266
#: libraries/rte/rte_routines.lib.php:690
msgid "ENUM/SET editor"
-msgstr "ENUM / SET 수정"
+msgstr "ENUM/SET 수정"
#: enum_editor.php:28 js/messages.php:268
#, fuzzy
@@ -963,17 +960,15 @@ msgid ""
msgstr ""
#: import.php:57
-#, fuzzy, php-format
+#, php-format
msgid ""
"You probably tried to upload too large file. Please refer to %sdocumentation"
"%s for ways to workaround this limit."
-msgstr ""
-"너무 큰 파일을 업로드하려고 시도했습니다. 제한치를 우회하는 방법은 %s문서%s"
-"를 참조하여 주십시오."
+msgstr "너무 큰 파일을 업로드하려고 시도했습니다. 제한을 해결하기 위해서는 %s문서%s를 참조하여 주십시오."
#: import.php:170 import.php:419
msgid "Showing bookmark"
-msgstr ""
+msgstr "북마크 보이기"
#: import.php:180 import.php:415
msgid "The bookmark has been deleted."
@@ -992,8 +987,8 @@ msgid ""
"You attempted to load file with unsupported compression (%s). Either support "
"for it is not implemented or disabled by your configuration."
msgstr ""
-"지원되지 않는 압축(%)형식의 파일을 업로드하려고 시도했습니다. 지원이 구현되"
-"지 않았거나 설정에서 사용하지 않게 되어있습니다."
+"지원되지 않는 압축(%)형식의 파일을 업로드하려고 시도했습니다. 지원이 구현되지 않거나 설정에서 사용하지 않게 되어있기 때문에 일 수 "
+"있습니다."
#: import.php:349
msgid ""
@@ -1046,7 +1041,7 @@ msgstr ""
#: libraries/sql_query_form.lib.php:113 tbl_operations.php:229
#: tbl_relation.php:284 tbl_row_action.php:126 view_operations.php:60
msgid "Your SQL query has been executed successfully"
-msgstr "SQL 질의가 바르게 실행되었습니다."
+msgstr "질의가 바르게 실행되었습니다."
#: import_status.php:29 libraries/common.lib.php:709
#: libraries/schema/Export_Relation_Schema.class.php:237 user_password.php:109
@@ -1075,7 +1070,7 @@ msgstr "이 테이블 전체를 제거하려고 합니다!"
#: js/messages.php:33
msgid "You are about to TRUNCATE a complete table!"
-msgstr "이 테이블 전체를 비우려고 합니다!"
+msgstr "이 테이블의 모든 데이터를 비우려고 합니다!"
#: js/messages.php:35
msgid "Deleting tracking data"
@@ -1091,7 +1086,7 @@ msgstr "이 명령은 오랜 시간이 걸릴 수 있습니다. 그래도 실행
#: js/messages.php:40
msgid "You are about to DISABLE a BLOB Repository!"
-msgstr "BLOB 저장소를 사용 불가능하게 하려고 합니다!"
+msgstr "BLOB 저장소를 사용할 수 없게 하려고 합니다!"
#: js/messages.php:41
#, php-format
@@ -1114,15 +1109,14 @@ msgid "Add Index"
msgstr "인덱스 추가"
#: js/messages.php:47
-#, fuzzy
#| msgid "Edit next row"
msgid "Edit Index"
-msgstr "다음 행 수정"
+msgstr "인덱스 수정"
#: js/messages.php:48 tbl_indexes.php:293
#, fuzzy, php-format
msgid "Add %d column(s) to index"
-msgstr "필드 추가하기"
+msgstr "인덱스에 %d 열 추가"
#. l10n: Default description for the y-Axis of Charts
#: js/messages.php:52
@@ -1250,10 +1244,9 @@ msgid "Query statistics"
msgstr "질의 통계"
#: js/messages.php:94
-#, fuzzy
#| msgid "Failed to write file to disk."
msgid "Local monitor configuration incompatible"
-msgstr "로컬 모니터 설정이 호환되지 않습니다."
+msgstr "호환되지 않는 로컬 모니터 설정입니다."
#: js/messages.php:95
#, fuzzy
@@ -1263,9 +1256,8 @@ msgid ""
"likely that your current configuration will not work anymore. Please reset "
"your configuration to default in the <i>Settings</i> menu."
msgstr ""
-"브라우저의 로컬 저장소에 있는 차트 정렬 설정이 더 이상 새 버전의 모니터 대화"
-"창과 호환되지 않습니다. 당신의 현재 설정은 더 이상 작동하지 않을 수 있습니"
-"다. <i>설정<i>메뉴에서 설정을 초기화해주세요."
+"브라우저 내의 차트 정렬 설정은 더 이상 새 버전의 모니터 다이얼로그와 호환되지 않습니다. 현재 설정은 더 이상 작동되지 않을 수 "
+"있습니다. <i>설정<i>메뉴에서 설정을 초기화해 주세요."
#: js/messages.php:97
msgid "Query cache efficiency"
@@ -1276,9 +1268,8 @@ msgid "Query cache usage"
msgstr "질의 캐시 사용량"
#: js/messages.php:99
-#, fuzzy
msgid "Query cache used"
-msgstr "사용된 질의 캐시"
+msgstr "질의 캐시 사용됨"
#: js/messages.php:101
msgid "System CPU Usage"
@@ -1400,24 +1391,22 @@ msgstr "소통량"
#: js/messages.php:137 libraries/server_links.inc.php:73
#: server_status.php:1550
-#, fuzzy
#| msgid "Deleting %s"
msgid "Settings"
-msgstr "%s 을 삭제합니다"
+msgstr "설정"
#: js/messages.php:138
-#, fuzzy
#| msgid "Rename database to"
msgid "Remove chart"
-msgstr "데이터베이스 이름 변경"
+msgstr "차트 삭제"
#: js/messages.php:139
msgid "Edit title and labels"
-msgstr ""
+msgstr "타이틀과 레이블 편집"
#: js/messages.php:140
msgid "Add chart to grid"
-msgstr ""
+msgstr "차트에 그리드 추가"
#: js/messages.php:142
msgid "Please add at least one variable to the series"
@@ -1433,11 +1422,11 @@ msgstr "없음"
#: js/messages.php:144
msgid "Resume monitor"
-msgstr ""
+msgstr "모니터링 재개"
#: js/messages.php:145
msgid "Pause monitor"
-msgstr ""
+msgstr "모니터링 정지"
#: js/messages.php:147
msgid "general_log and slow_query_log are enabled."
@@ -1457,11 +1446,11 @@ msgstr ""
#: js/messages.php:151
msgid "log_output is not set to TABLE."
-msgstr ""
+msgstr "테이블에 대한 로그 출력이 설정되지 않았습니다."
#: js/messages.php:152
msgid "log_output is set to TABLE."
-msgstr ""
+msgstr "테이블에 대한 로그 출력이 설정되었습니다."
#: js/messages.php:153
#, php-format
@@ -1480,28 +1469,28 @@ msgstr ""
msgid ""
"Following settings will be applied globally and reset to default on server "
"restart:"
-msgstr ""
+msgstr "다음 설정은 서버 전체에 적용됩니다. 서버 재기동시 기본 설정으로 초기화됩니다."
#. l10n: %s is FILE or TABLE
#: js/messages.php:157
-#, fuzzy, php-format
+#, php-format
#| msgid "Save as file"
msgid "Set log_output to %s"
-msgstr "파일로 저장"
+msgstr "로그 출력을 %s로 설정"
#. l10n: Enable in this context means setting a status variable to ON
#: js/messages.php:159
#, fuzzy, php-format
#| msgid "Enabled"
msgid "Enable %s"
-msgstr "사용가능"
+msgstr "%s 사용가능"
#. l10n: Disable in this context means setting a status variable to OFF
#: js/messages.php:161
-#, fuzzy, php-format
+#, php-format
#| msgid "Disable"
msgid "Disable %s"
-msgstr "무효"
+msgstr "%s 사용안함"
#. l10n: %d seconds
#: js/messages.php:163
@@ -1513,25 +1502,23 @@ msgstr ""
msgid ""
"You can't change these variables. Please log in as root or contact your "
"database administrator."
-msgstr ""
+msgstr "변수들을 변경할 수 없습니다. root로 로그인하거나 데이터베이스 관리자에게 문의하십시오."
#: js/messages.php:165
-#, fuzzy
#| msgid "Change"
msgid "Change settings"
-msgstr "변경"
+msgstr "설정 변경"
#: js/messages.php:166
-#, fuzzy
#| msgid "Connections"
msgid "Current settings"
-msgstr "연결 수"
+msgstr "현재 설정"
#: js/messages.php:168 server_status.php:1640
#, fuzzy
#| msgid "Import files"
msgid "Chart Title"
-msgstr "파일 가져오기"
+msgstr "차트 제목"
#. l10n: As in differential values
#: js/messages.php:170
@@ -1541,7 +1528,7 @@ msgstr ""
#: js/messages.php:171
#, php-format
msgid "Divided by %s"
-msgstr ""
+msgstr "%s로 구분"
#: js/messages.php:172
msgid "Unit"
@@ -1557,11 +1544,11 @@ msgstr ""
#: js/messages.php:176
msgid "Analysing & loading logs. This may take a while."
-msgstr ""
+msgstr "로그를 읽고 분석합니다. 이 작업은 시간이 걸릴 수 있습니다."
#: js/messages.php:177
msgid "Cancel request"
-msgstr ""
+msgstr "요청 취소"
#: js/messages.php:178
msgid ""
@@ -1569,6 +1556,8 @@ msgid ""
"However only the SQL query itself has been used as a grouping criteria, so "
"the other attributes of queries, such as start time, may differ."
msgstr ""
+"이 열은 함께 그룹화된 동일한 질의의 양을 보여줍니다. 그러나 질의 자체만으로 그룹화하기 때문에, 시작 시간 등의 질의에 대한 다른 "
+"특성은 다를 수 있습니다."
#: js/messages.php:179
msgid ""
@@ -1582,19 +1571,17 @@ msgid "Log data loaded. Queries executed in this time span:"
msgstr ""
#: js/messages.php:182
-#, fuzzy
msgid "Jump to Log table"
-msgstr "데이터베이스가 없습니다"
+msgstr "로그 테이블로 이동"
#: js/messages.php:183
msgid "Log analysed, but no data found in this time span."
-msgstr ""
+msgstr "로그가 분석되었습니다. 하지만 해당 기간내에는 자료가 없습니다."
#: js/messages.php:185
-#, fuzzy
#| msgid "Analyze"
msgid "Analyzing..."
-msgstr "분석"
+msgstr "분석중..."
#: js/messages.php:186
#, fuzzy
@@ -1608,10 +1595,9 @@ msgid "Time"
msgstr "시간"
#: js/messages.php:189
-#, fuzzy
#| msgid "Total"
msgid "Total time:"
-msgstr "전체 사용량"
+msgstr "전체 시간:"
#: js/messages.php:190
#, fuzzy
@@ -1627,36 +1613,33 @@ msgid "Table"
msgstr "테이블 "
#: js/messages.php:192
-#, fuzzy
#| msgid "Import files"
msgid "Chart"
-msgstr "파일 가져오기"
+msgstr "차트"
#. l10n: A collection of available filters
#: js/messages.php:195
-#, fuzzy
#| msgid "Table options"
msgid "Log table filter options"
-msgstr "테이블 옵션"
+msgstr "로그 테이블의 필터 옵션"
#. l10n: Filter as in "Start Filtering"
#: js/messages.php:197
msgid "Filter"
-msgstr ""
+msgstr "필터"
#: js/messages.php:198
msgid "Filter queries by word/regexp:"
-msgstr ""
+msgstr "단어/정규식에 의한 필터 질의:"
#: js/messages.php:199
msgid "Group queries, ignoring variable data in WHERE clauses"
msgstr ""
#: js/messages.php:200
-#, fuzzy
#| msgid "Number of columns"
msgid "Sum of grouped rows:"
-msgstr "컬럼수"
+msgstr "그룹화된 행의 합계:"
#: js/messages.php:201
#, fuzzy
@@ -1681,18 +1664,17 @@ msgid ""
msgstr ""
#: js/messages.php:206
-#, fuzzy
#| msgid "Rename database to"
msgid "Reload page"
-msgstr "데이터베이스 이름 변경"
+msgstr "페이지 새로고침"
#: js/messages.php:208
msgid "Affected rows:"
-msgstr ""
+msgstr "적용된 행:"
#: js/messages.php:210
msgid "Failed parsing config file. It doesn't seem to be valid JSON code."
-msgstr ""
+msgstr "구성 파일을 분석할 수 없습니다. 유효한 JSON 코드가 아닙니다."
#: js/messages.php:211
msgid ""
@@ -1706,13 +1688,12 @@ msgstr ""
#: prefs_manage.php:229 server_status.php:1595 setup/frames/menu.inc.php:20
#, fuzzy
msgid "Import"
-msgstr "내보내기"
+msgstr "가져오기"
#: js/messages.php:214
-#, fuzzy
#| msgid "Update Query"
msgid "Analyse Query"
-msgstr "질의 업데이트"
+msgstr "질의 분석"
#: js/messages.php:218
msgid "Advisor system"
@@ -1730,11 +1711,11 @@ msgstr ""
#, fuzzy
#| msgid "Documentation"
msgid "Recommendation"
-msgstr "문서"
+msgstr "추천"
#: js/messages.php:222
msgid "Rule details"
-msgstr ""
+msgstr "규칙 세부 사항"
#: js/messages.php:223
#, fuzzy
@@ -1744,36 +1725,34 @@ msgstr "인증중입니다..."
#: js/messages.php:224
msgid "Used variable / formula"
-msgstr ""
+msgstr "사용된 변수 / 수식"
#: js/messages.php:225
msgid "Test"
-msgstr ""
+msgstr "테스트"
#: js/messages.php:230 pmd_general.php:382 pmd_general.php:419
#: pmd_general.php:539 pmd_general.php:587 pmd_general.php:663
#: pmd_general.php:717 pmd_general.php:780 pmd_general.php:811
msgid "Cancel"
-msgstr ""
+msgstr "취소"
#: js/messages.php:233
-#, fuzzy
msgid "Loading"
-msgstr "Local"
+msgstr "불러오고 있습니다."
#: js/messages.php:234
-#, fuzzy
#| msgid "Processes"
msgid "Processing Request"
-msgstr "프로세스 목록"
+msgstr "요청을 처리중입니다."
#: js/messages.php:235 libraries/rte/rte_export.lib.php:39
msgid "Error in Processing Request"
-msgstr ""
+msgstr "요청 처리중 에러가 발생했습니다."
#: js/messages.php:236
msgid "Dropping Column"
-msgstr ""
+msgstr "열을 삭제하고 있습니다."
#: js/messages.php:237
msgid "Adding Primary Key"
@@ -1783,73 +1762,63 @@ msgstr ""
#: pmd_general.php:537 pmd_general.php:585 pmd_general.php:661
#: pmd_general.php:715 pmd_general.php:778
msgid "OK"
-msgstr ""
+msgstr "확인"
#: js/messages.php:239
msgid "Click to dismiss this notification"
msgstr ""
#: js/messages.php:242
-#, fuzzy
#| msgid "Rename database to"
msgid "Renaming Databases"
-msgstr "데이터베이스 이름 변경"
+msgstr "데이터베이스 이름을 변경중입니다."
#: js/messages.php:243
-#, fuzzy
#| msgid "Rename database to"
msgid "Reload Database"
-msgstr "데이터베이스 이름 변경"
+msgstr "데이터베이스를 다시 불러오고 있습니다."
#: js/messages.php:244
-#, fuzzy
#| msgid "Copy database to"
msgid "Copying Database"
-msgstr "데이터베이스 복사"
+msgstr "데이터베이스를 복사중입니다."
#: js/messages.php:245
msgid "Changing Charset"
-msgstr ""
+msgstr "언어를 변경하고 있습니다."
#: js/messages.php:246
-#, fuzzy
#| msgid "Table must have at least one column."
msgid "Table must have at least one column"
-msgstr "테이블은 적어도 1개 이상의 컬럼을 갖고 있어야 합니다."
+msgstr "테이블은 적어도 1개 이상의 컬럼이 있어야 합니다."
#: js/messages.php:251
-#, fuzzy
#| msgid "Use Tables"
msgid "Insert Table"
-msgstr "사용할 테이블"
+msgstr "테이블 삽입"
#: js/messages.php:252
-#, fuzzy
#| msgid "Indexes"
msgid "Hide indexes"
-msgstr "인덱스"
+msgstr "인덱스 숨기기"
#: js/messages.php:253
-#, fuzzy
#| msgid "Show grid"
msgid "Show indexes"
-msgstr "grid 보기"
+msgstr "인덱스 보이기"
#: js/messages.php:256
-#, fuzzy
#| msgid "Search"
msgid "Searching"
-msgstr "검색"
+msgstr "검색중"
#: js/messages.php:257
-#, fuzzy
msgid "Hide search results"
-msgstr "SQL 질의"
+msgstr "검색 결과 숨기기"
#: js/messages.php:258
-#, fuzzy
msgid "Show search results"
-msgstr "SQL 질의"
+msgstr "검색 결과 보이기"
#: js/messages.php:259
#, fuzzy
@@ -1858,38 +1827,36 @@ msgid "Browsing"
msgstr "보기"
#: js/messages.php:260
-#, fuzzy
#| msgid "Deleting %s"
msgid "Deleting"
-msgstr "%s 을 삭제합니다"
+msgstr "삭제중"
#: js/messages.php:263
msgid "The definition of a stored function must contain a RETURN statement!"
-msgstr ""
+msgstr "저장 함수의 정의는 RETURN문을 포함해야 합니다!"
#: js/messages.php:270
#, fuzzy, php-format
msgid "Add %d value(s)"
-msgstr "새 사용자 추가"
+msgstr "%d 값 추가"
#: js/messages.php:273
+#, fuzzy
msgid ""
"Note: If the file contains multiple tables, they will be combined into one"
-msgstr ""
+msgstr "참고: 파일에 여러 테이블이 포함되어 있다면, 하나로 결합됩니다."
#: js/messages.php:276
-#, fuzzy
msgid "Hide query box"
-msgstr "SQL 질의"
+msgstr "질의 상자 숨기기"
#: js/messages.php:277
-#, fuzzy
msgid "Show query box"
-msgstr "SQL 질의"
+msgstr "질의 상자 보이기"
#: js/messages.php:279 tbl_row_action.php:28
msgid "No rows selected"
-msgstr ""
+msgstr "선택된 행이 없습니다."
#: js/messages.php:280 libraries/common.lib.php:2743
#: libraries/display_tbl.lib.php:2506 querywindow.php:87 tbl_structure.php:149
@@ -1899,7 +1866,7 @@ msgstr "변경"
#: js/messages.php:281
msgid "Query execution time"
-msgstr ""
+msgstr "질의 실행 시간"
#: js/messages.php:284 libraries/config/FormDisplay.tpl.php:355
#: libraries/schema/User_Schema.class.php:352
@@ -1910,14 +1877,12 @@ msgid "Save"
msgstr "저장"
#: js/messages.php:287
-#, fuzzy
msgid "Hide search criteria"
-msgstr "SQL 질의"
+msgstr "검색 조건 숨기기"
#: js/messages.php:288
-#, fuzzy
msgid "Show search criteria"
-msgstr "SQL 질의"
+msgstr "검색 조건 보이기"
#: js/messages.php:291 libraries/tbl_select.lib.php:110
#, fuzzy
@@ -1927,15 +1892,16 @@ msgstr "검색"
#: js/messages.php:293
msgid "Each point represents a data row."
-msgstr ""
+msgstr "각 포인트는 데이터 행을 나타냅니다."
#: js/messages.php:295
msgid "Hovering over a point will show its label."
-msgstr ""
+msgstr "포인트에 마우스를 올리면 라벨이 표시됩니다."
#: js/messages.php:297
+#, fuzzy
msgid "Use mousewheel to zoom in or out of the plot."
-msgstr ""
+msgstr "마우스 휠로 확대/축소할 수 있습니다."
#: js/messages.php:299
msgid "Click and drag the mouse to navigate the plot."
@@ -1958,20 +1924,18 @@ msgid "Strings are converted into integer for plotting"
msgstr ""
#: js/messages.php:309
-#, fuzzy
#| msgid "Add/Delete columns"
msgid "Select two columns"
-msgstr "컬럼 추가/삭제"
+msgstr "두 개의 열 선택"
#: js/messages.php:310
msgid "Select two different columns"
-msgstr ""
+msgstr "두 개의다른 열 선택"
#: js/messages.php:311
-#, fuzzy
#| msgid "SQL result"
msgid "Query results"
-msgstr "SQL 결과"
+msgstr "질의 결과"
#: js/messages.php:312
#, fuzzy
@@ -1981,11 +1945,11 @@ msgstr "테이블 설명"
#: js/messages.php:315 tbl_change.php:312 tbl_indexes.php:228
#: tbl_indexes.php:255
msgid "Ignore"
-msgstr "Ignore"
+msgstr "무시"
#: js/messages.php:316 libraries/display_tbl.lib.php:1390
msgid "Copy"
-msgstr ""
+msgstr "복사"
#: js/messages.php:331
#, fuzzy
@@ -2463,7 +2427,7 @@ msgstr ""
#: libraries/File.class.php:516
msgid "Cannot read (moved) upload file."
-msgstr ""
+msgstr "업로드 파일을 읽을 수 없습니다."
#: libraries/Index.class.php:419 tbl_relation.php:522
msgid "No index defined!"
@@ -2491,9 +2455,8 @@ msgstr "Cardinality"
#: libraries/Index.class.php:448 libraries/rte/rte_events.lib.php:480
#: libraries/rte/rte_routines.lib.php:957 tbl_tracking.php:263
#: tbl_tracking.php:327
-#, fuzzy
msgid "Comment"
-msgstr "설명(코멘트)"
+msgstr "설명"
#: libraries/Index.class.php:474
msgid "The primary key has been dropped"
@@ -2599,7 +2562,7 @@ msgstr ""
#: libraries/Table.class.php:1252
#, php-format
msgid "Table %s has been renamed to %s"
-msgstr "테이블 %s을(를) %s(으)로 변경하였습니다."
+msgstr "테이블 %s을(를) %s(으)로 이름을 변경하였습니다."
#: libraries/Table.class.php:1384
msgid "Could not save table UI preferences"
@@ -2883,8 +2846,7 @@ msgstr "기본 설정을 가져올 수 없습니다: %1$s"
msgid ""
"The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
"configuration file!"
-msgstr ""
-"환경설정 파일에 <tt>$cfg['PmaAbsoluteUri']</tt> 변수가 선언되어야 합니다."
+msgstr "환경설정 파일에 <tt>$cfg['PmaAbsoluteUri']</tt> 변수가 정의되어야 합니다!"
#: libraries/common.inc.php:650
#, php-format
@@ -3571,14 +3533,13 @@ msgid "Save as file"
msgstr "파일로 저장"
#: libraries/config/messages.inc.php:73 libraries/config/messages.inc.php:241
-#, fuzzy
msgid "Character set of the file"
-msgstr "파일 문자셋:"
+msgstr "파일 문자셋"
#: libraries/config/messages.inc.php:74 libraries/config/messages.inc.php:90
#: tbl_gis_visualization.php:181 tbl_printview.php:335 tbl_structure.php:842
msgid "Format"
-msgstr "Format"
+msgstr "형식"
#: libraries/config/messages.inc.php:75
msgid "Compression"
@@ -3592,26 +3553,23 @@ msgstr "압축"
#: libraries/export/excel.php:25 libraries/export/htmlword.php:30
#: libraries/export/latex.php:72 libraries/export/ods.php:25
#: libraries/export/odt.php:58 libraries/export/texytext.php:28
-#, fuzzy
#| msgid "Put fields names in the first row"
msgid "Put columns names in the first row"
-msgstr "맨처음에 필드 이름을 출력"
+msgstr "첫 줄에 열 이름을 넣기"
#: libraries/config/messages.inc.php:77 libraries/config/messages.inc.php:243
#: libraries/config/messages.inc.php:250 libraries/import/csv.php:76
#: libraries/import/ldi.php:42
-#, fuzzy
#| msgid "Fields enclosed by"
msgid "Columns enclosed by"
-msgstr "필드 감싸기"
+msgstr "열 감싸기"
#: libraries/config/messages.inc.php:78 libraries/config/messages.inc.php:244
#: libraries/config/messages.inc.php:251 libraries/import/csv.php:81
#: libraries/import/ldi.php:43
-#, fuzzy
#| msgid "Fields escaped by"
msgid "Columns escaped by"
-msgstr "필드 특수문자(escape) 처리"
+msgstr "열 특수문자 처리"
#: libraries/config/messages.inc.php:79 libraries/config/messages.inc.php:85
#: libraries/config/messages.inc.php:92 libraries/config/messages.inc.php:101
@@ -3619,38 +3577,35 @@ msgstr "필드 특수문자(escape) 처리"
#: libraries/config/messages.inc.php:144 libraries/config/messages.inc.php:147
#: libraries/config/messages.inc.php:149 libraries/export/texytext.php:27
msgid "Replace NULL by"
-msgstr ""
+msgstr "NULL 치환"
#: libraries/config/messages.inc.php:80 libraries/config/messages.inc.php:86
msgid "Remove CRLF characters within columns"
-msgstr ""
+msgstr "열 내의 CRLF 문자를 제거하기"
#: libraries/config/messages.inc.php:81 libraries/config/messages.inc.php:247
#: libraries/config/messages.inc.php:255 libraries/import/csv.php:63
#: libraries/import/ldi.php:41
-#, fuzzy
#| msgid "Lines terminated by"
msgid "Columns terminated by"
-msgstr "줄(열) 구분자"
+msgstr "열 구분자"
#: libraries/config/messages.inc.php:82 libraries/config/messages.inc.php:242
#: libraries/import/csv.php:86 libraries/import/ldi.php:44
msgid "Lines terminated by"
-msgstr "줄(열) 구분자"
+msgstr "줄 구분자"
#: libraries/config/messages.inc.php:84
msgid "Excel edition"
-msgstr ""
+msgstr "Excel 버전"
#: libraries/config/messages.inc.php:87
-#, fuzzy
msgid "Database name template"
-msgstr "파일명 템플릿"
+msgstr "데이터베이스명 템플릿"
#: libraries/config/messages.inc.php:88
-#, fuzzy
msgid "Server name template"
-msgstr "파일명 템플릿"
+msgstr "서버명 템플릿"
#: libraries/config/messages.inc.php:89
#, fuzzy
@@ -3662,128 +3617,127 @@ msgstr "파일명 템플릿"
#: libraries/config/messages.inc.php:145 libraries/export/htmlword.php:24
#: libraries/export/latex.php:40 libraries/export/odt.php:32
#: libraries/export/sql.php:123 libraries/export/texytext.php:23
-#, fuzzy
#| msgid "%s table"
#| msgid_plural "%s tables"
msgid "Dump table"
-msgstr "%s개 테이블 "
+msgstr "덤프 테이블"
#: libraries/config/messages.inc.php:94 libraries/export/latex.php:32
msgid "Include table caption"
-msgstr ""
+msgstr "테이블 설명 포함하기"
#: libraries/config/messages.inc.php:97 libraries/config/messages.inc.php:103
#: libraries/export/latex.php:50 libraries/export/latex.php:74
msgid "Table caption"
-msgstr ""
+msgstr "테이블 설명"
#: libraries/config/messages.inc.php:98 libraries/config/messages.inc.php:104
msgid "Continued table caption"
-msgstr ""
+msgstr "테이블 설명(Continued)"
#: libraries/config/messages.inc.php:99 libraries/config/messages.inc.php:105
#: libraries/export/latex.php:54 libraries/export/latex.php:78
msgid "Label key"
-msgstr ""
+msgstr "레이블 키"
#: libraries/config/messages.inc.php:100 libraries/config/messages.inc.php:112
#: libraries/config/messages.inc.php:136 libraries/export/odt.php:324
#: libraries/tbl_properties.inc.php:135
msgid "MIME type"
-msgstr ""
+msgstr "MIME 형식"
#: libraries/config/messages.inc.php:102 libraries/config/messages.inc.php:114
#: libraries/config/messages.inc.php:138 tbl_relation.php:392
#, fuzzy
msgid "Relations"
-msgstr "테이블 작업"
+msgstr "관계"
#: libraries/config/messages.inc.php:107
-#, fuzzy
#| msgid "Export"
msgid "Export method"
-msgstr "내보내기"
+msgstr "내보내기 방법"
#: libraries/config/messages.inc.php:116 libraries/config/messages.inc.php:118
msgid "Save on server"
-msgstr ""
+msgstr "서버에 저장"
#: libraries/config/messages.inc.php:117 libraries/config/messages.inc.php:119
#: libraries/display_export.lib.php:190 libraries/display_export.lib.php:216
msgid "Overwrite existing file(s)"
-msgstr ""
+msgstr "기존 파일 덮어쓰기"
#: libraries/config/messages.inc.php:120
-#, fuzzy
msgid "Remember file name template"
-msgstr "파일명 템플릿"
+msgstr "파일명 템플릿을 저장하기"
#: libraries/config/messages.inc.php:122
-#, fuzzy
#| msgid "Enclose table and field names with backquotes"
msgid "Enclose table and column names with backquotes"
-msgstr "테이블, 필드명에 백쿼터(`) 사용"
+msgstr "테이블과 열 이름을 백쿼트(`)로 감싸기"
#: libraries/config/messages.inc.php:123 libraries/config/messages.inc.php:262
#: libraries/display_export.lib.php:348
msgid "SQL compatibility mode"
-msgstr ""
+msgstr "SQL 호환 모드"
#: libraries/config/messages.inc.php:124 libraries/export/sql.php:190
+#, fuzzy
msgid "<code>CREATE TABLE</code> options:"
-msgstr ""
+msgstr "<code>CREATE TABLE</code> 옵션 :"
#: libraries/config/messages.inc.php:125
+#, fuzzy
msgid "Creation/Update/Check dates"
-msgstr ""
+msgstr "생성/업데이트/체크 날짜"
#: libraries/config/messages.inc.php:126
#, fuzzy
msgid "Use delayed inserts"
-msgstr "확장된 inserts"
+msgstr "지연 삽입 사용"
#: libraries/config/messages.inc.php:127 libraries/export/sql.php:81
msgid "Disable foreign key checks"
-msgstr ""
+msgstr "외래 키(foreign key) 체크 사용 안함"
#: libraries/config/messages.inc.php:130
msgid "Use hexadecimal for BLOB"
-msgstr ""
+msgstr "BLOB을 헥사 숫자로 사용"
#: libraries/config/messages.inc.php:132
#, fuzzy
#| msgid "Extended inserts"
msgid "Use ignore inserts"
-msgstr "확장된 inserts"
+msgstr "무시 삽입 사용"
#: libraries/config/messages.inc.php:134
+#, fuzzy
msgid "Syntax to use when inserting data"
-msgstr ""
+msgstr "데이터 삽입시 사용 구문"
#: libraries/config/messages.inc.php:135 libraries/export/sql.php:285
msgid "Maximal length of created query"
-msgstr ""
+msgstr "CREATE 질의 최대 길이"
#: libraries/config/messages.inc.php:140
-#, fuzzy
msgid "Export type"
-msgstr "테이블이 없습니다"
+msgstr "내보내기 형식"
#: libraries/config/messages.inc.php:141 libraries/export/sql.php:73
+#, fuzzy
msgid "Enclose export in a transaction"
-msgstr ""
+msgstr "트랜잭션으로 내보내기 감싸기"
#: libraries/config/messages.inc.php:142
msgid "Export time in UTC"
-msgstr ""
+msgstr "세계 표준시(UTC)로 시간 내보내기"
#: libraries/config/messages.inc.php:150
msgid "Force secured connection while using phpMyAdmin"
-msgstr ""
+msgstr "강제적인 보안 연결로 phpMyAdmin을 사용하기"
#: libraries/config/messages.inc.php:151
msgid "Force SSL connection"
-msgstr ""
+msgstr "강제적인 SSL 연결"
#: libraries/config/messages.inc.php:152
msgid ""
@@ -4056,10 +4010,9 @@ msgid "SQL queries settings"
msgstr "SQL 질의"
#: libraries/config/messages.inc.php:222
-#, fuzzy
#| msgid "SQL history"
msgid "SQL Validator"
-msgstr "SQL 내력(히스토리)"
+msgstr "질의 검사기"
#: libraries/config/messages.inc.php:223
msgid ""
@@ -5151,9 +5104,8 @@ msgid "Allow to display database and table statistics (eg. space usage)"
msgstr ""
#: libraries/config/messages.inc.php:476
-#, fuzzy
msgid "Show statistics"
-msgstr "행(레코드) 통계"
+msgstr "통계보기"
#: libraries/config/messages.inc.php:477
msgid ""
@@ -5376,10 +5328,9 @@ msgid "Cookie authentication"
msgstr "인증중입니다..."
#: libraries/config/setup.forms.php:48
-#, fuzzy
#| msgid "Authenticating..."
msgid "HTTP authentication"
-msgstr "인증중입니다..."
+msgstr "HTTP 인증"
#: libraries/config/setup.forms.php:51
#, fuzzy
@@ -5621,10 +5572,9 @@ msgstr ""
"내보내기 플러그인을 로드할 수 없습니다. 올바로 설치되었는지 확인해주세요!"
#: libraries/display_export.lib.php:82
-#, fuzzy
#| msgid "Allows locking tables for the current thread."
msgid "Exporting databases from the current server"
-msgstr "현재 쓰레드에 대한 테이블 잠금(lock) 허용."
+msgstr "현재 서버에서 데이터베이스를 내보내기"
#: libraries/display_export.lib.php:84
#, fuzzy, php-format
@@ -5653,22 +5603,19 @@ msgid "Custom - display all possible options"
msgstr ""
#: libraries/display_export.lib.php:132
-#, fuzzy
#| msgid "Databases"
msgid "Database(s):"
-msgstr "데이터베이스 "
+msgstr "데이터베이스 :"
#: libraries/display_export.lib.php:134
-#, fuzzy
#| msgid "Tables"
msgid "Table(s):"
-msgstr "테이블 수"
+msgstr "테이블 : "
#: libraries/display_export.lib.php:144
-#, fuzzy
#| msgid "Rows"
msgid "Rows:"
-msgstr "행(레코드)"
+msgstr "행 : "
#: libraries/display_export.lib.php:152
msgid "Dump some row(s)"
@@ -5777,10 +5724,9 @@ msgid "Format:"
msgstr "Format"
#: libraries/display_export.lib.php:333
-#, fuzzy
#| msgid "Column-specific privileges"
msgid "Format-specific options:"
-msgstr "열(칼럼)에 관한 권한"
+msgstr "형식 특정 옵션 : "
#: libraries/display_export.lib.php:334
msgid ""
@@ -5892,16 +5838,14 @@ msgid "%d is not valid row number."
msgstr ""
#: libraries/display_tbl.lib.php:427
-#, fuzzy
#| msgid "Start"
msgid "Start row"
-msgstr "토"
+msgstr "시작 행"
#: libraries/display_tbl.lib.php:429
-#, fuzzy
#| msgid "Number of columns"
msgid "Number of rows"
-msgstr "컬럼수"
+msgstr "행 갯수"
#: libraries/display_tbl.lib.php:434
#, fuzzy
@@ -5944,9 +5888,8 @@ msgstr ""
#: libraries/import/shp.php:22 libraries/import/sql.php:20
#: libraries/import/xml.php:32 libraries/rte/rte_routines.lib.php:863
#: tbl_select.php:175 tbl_structure.php:858
-#, fuzzy
msgid "Options"
-msgstr "테이블 작업"
+msgstr "옵션"
#: libraries/display_tbl.lib.php:631 libraries/display_tbl.lib.php:649
#, fuzzy
@@ -6504,10 +6447,9 @@ msgid "(continued)"
msgstr ""
#: libraries/export/latex.php:16
-#, fuzzy
#| msgid "Table structure for table"
msgid "Structure of table @TABLE@"
-msgstr "테이블 구조"
+msgstr "@TABLE@ 테이블 구조"
#: libraries/export/latex.php:48 libraries/export/odt.php:40
#: libraries/export/sql.php:142
@@ -8137,9 +8079,7 @@ msgstr ""
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 검사기가 초기화되지 않았습니다. %s문서%s에서 설명한 php 확장모듈을 설치했"
-"는지 확인해보십시오."
+msgstr "질의 검사기가 초기화되지 않았습니다. %s문서%s에서 설명한 필수 PHP 확장모듈을 설치했는지 확인해 보십시오."
#: libraries/tbl_links.inc.php:118 libraries/tbl_links.inc.php:119
msgid "Table seems to be empty!"
@@ -11077,7 +11017,7 @@ msgstr "다음 행 수정"
#: tbl_change.php:1070
msgid ""
"Use TAB key to move from value to value, or CTRL+arrows to move anywhere"
-msgstr "탭 키를 이용해 이동하거나 CTRL+화살표로 이동할 수 있다"
+msgstr "탭 키나 CTRL+화살표로 값 항목을 이동할 수 있습니다."
#: tbl_change.php:1108
#, php-format
diff --git a/po/tr.po b/po/tr.po
index 71c8f1c..a150293 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.5.0-beta2\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
"POT-Creation-Date: 2012-01-25 17:45+0100\n"
-"PO-Revision-Date: 2012-01-22 13:01+0200\n"
+"PO-Revision-Date: 2012-01-22 13:02+0200\n"
"Last-Translator: Burak Yavuz <hitowerdigit(a)hotmail.com>\n"
"Language-Team: turkish <tr(a)li.org>\n"
"Language: tr\n"
@@ -5503,7 +5503,7 @@ msgstr "Yanlış IP adresi: %s"
#: libraries/core.lib.php:247
msgctxt "PHP documentation language"
msgid "en"
-msgstr "tr"
+msgstr "en"
#: libraries/core.lib.php:266
#, php-format
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 6354a86..cb4ca24 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.5.0-beta2\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
"POT-Creation-Date: 2012-01-25 17:45+0100\n"
-"PO-Revision-Date: 2012-01-11 08:26+0200\n"
+"PO-Revision-Date: 2012-01-26 16:13+0200\n"
"Last-Translator: Vian Zhao <brovian(a)gmail.com>\n"
"Language-Team: chinese_simplified <zh_CN(a)li.org>\n"
"Language: zh_CN\n"
@@ -881,12 +881,12 @@ msgstr "以 OpenStreetMaps 为背景"
# what's the f**k word of "SRID"?
#: gis_data_editor.php:134
msgid "SRID"
-msgstr ""
+msgstr "SRID"
#: gis_data_editor.php:151 js/messages.php:323
#: libraries/display_tbl.lib.php:692
msgid "Geometry"
-msgstr ""
+msgstr "几何学"
#: gis_data_editor.php:172 js/messages.php:319
msgid "Point"
diff --git a/server_status.php b/server_status.php
index 3a891ba..24dcb9b 100644
--- a/server_status.php
+++ b/server_status.php
@@ -61,7 +61,8 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
$queries = PMA_DBI_fetch_result(
"SHOW GLOBAL STATUS
WHERE (Variable_name LIKE 'Com_%' OR Variable_name = 'Questions')
- AND Value > 0", 0, 1);
+ AND Value > 0", 0, 1
+ );
}
cleanDeprecated($queries);
// admin commands are not queries
@@ -83,7 +84,8 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
$traffic = PMA_DBI_fetch_result(
"SHOW GLOBAL STATUS
WHERE Variable_name = 'Bytes_received'
- OR Variable_name = 'Bytes_sent'", 0, 1);
+ OR Variable_name = 'Bytes_sent'", 0, 1
+ );
$ret = array(
'x' => microtime(true) * 1000,
@@ -943,12 +945,12 @@ function printQueryStatistics()
echo '<br />';
echo 'ø ' . __('per minute') . ': ';
- echo PMA_formatNumber( $total_queries * 60 / $server_status['Uptime'], 0);
+ echo PMA_formatNumber($total_queries * 60 / $server_status['Uptime'], 0);
echo '<br />';
if ($total_queries / $server_status['Uptime'] >= 1) {
echo 'ø ' . __('per second') . ': ';
- echo PMA_formatNumber( $total_queries / $server_status['Uptime'], 0);
+ echo PMA_formatNumber($total_queries / $server_status['Uptime'], 0);
}
?>
</span>
@@ -1038,22 +1040,25 @@ function printServerTraffic()
* starttime calculation
*/
$start_time = PMA_DBI_fetch_value(
- 'SELECT UNIX_TIMESTAMP() - ' . $server_status['Uptime']);
+ 'SELECT UNIX_TIMESTAMP() - ' . $server_status['Uptime']
+ );
?>
<h3><?php
echo sprintf(
__('Network traffic since startup: %s'),
- implode(' ', PMA_formatByteDown( $server_status['Bytes_received'] + $server_status['Bytes_sent'], 3, 1))
- );
+ implode(' ', PMA_formatByteDown($server_status['Bytes_received'] + $server_status['Bytes_sent'], 3, 1))
+ );
?>
</h3>
<p>
<?php
- echo sprintf(__('This MySQL server has been running for %1$s. It started up on %2$s.'),
+ echo sprintf(
+ __('This MySQL server has been running for %1$s. It started up on %2$s.'),
PMA_timespanFormat($server_status['Uptime']),
- PMA_localisedDate($start_time)) . "\n";
+ PMA_localisedDate($start_time)
+ ) . "\n";
?>
</p>
diff --git a/tbl_operations.php b/tbl_operations.php
index a09528b..da2291e 100644
--- a/tbl_operations.php
+++ b/tbl_operations.php
@@ -380,8 +380,10 @@ if (strstr($show_comment, '; InnoDB free') === false) {
<!-- Table character set -->
<tr><td><?php echo __('Collation'); ?></td>
- <td><?php echo PMA_generateCharsetDropdownBox(PMA_CSDROPDOWN_COLLATION,
- 'tbl_collation', null, $tbl_collation, false, 3); ?>
+ <td><?php echo PMA_generateCharsetDropdownBox(
+ PMA_CSDROPDOWN_COLLATION,
+ 'tbl_collation', null, $tbl_collation, false, 3
+ ); ?>
</td>
</tr>
<?php
@@ -598,11 +600,13 @@ if (isset($possible_row_formats[$tbl_type])) {
// Note: BERKELEY (BDB) is no longer supported, starting with MySQL 5.1
if ($is_myisam_or_aria || $is_innodb || $is_berkeleydb) {
if ($is_myisam_or_aria || $is_innodb) {
- $this_url_params = array_merge($url_params,
+ $this_url_params = array_merge(
+ $url_params,
array(
'sql_query' => 'CHECK TABLE ' . PMA_backquote($GLOBALS['table']),
'table_maintenance' => 'Go',
- ));
+ )
+ );
?>
<li><a class='maintain_action' href="tbl_operations.php<?php echo PMA_generate_common_url($this_url_params); ?>">
<?php echo __('Check table'); ?></a>
@@ -611,8 +615,10 @@ if ($is_myisam_or_aria || $is_innodb || $is_berkeleydb) {
<?php
}
if ($is_innodb) {
- $this_url_params = array_merge($url_params,
- array('sql_query' => 'ALTER TABLE ' . PMA_backquote($GLOBALS['table']) . ' ENGINE = InnoDB'));
+ $this_url_params = array_merge(
+ $url_params,
+ array('sql_query' => 'ALTER TABLE ' . PMA_backquote($GLOBALS['table']) . ' ENGINE = InnoDB')
+ );
?>
<li><a class='maintain_action' href="sql.php<?php echo PMA_generate_common_url($this_url_params); ?>">
<?php echo __('Defragment table'); ?></a>
@@ -621,11 +627,13 @@ if ($is_myisam_or_aria || $is_innodb || $is_berkeleydb) {
<?php
}
if ($is_myisam_or_aria || $is_berkeleydb) {
- $this_url_params = array_merge($url_params,
+ $this_url_params = array_merge(
+ $url_params,
array(
'sql_query' => 'ANALYZE TABLE ' . PMA_backquote($GLOBALS['table']),
'table_maintenance' => 'Go',
- ));
+ )
+ );
?>
<li><a class='maintain_action' href="tbl_operations.php<?php echo PMA_generate_common_url($this_url_params); ?>">
<?php echo __('Analyze table'); ?></a>
@@ -634,11 +642,13 @@ if ($is_myisam_or_aria || $is_innodb || $is_berkeleydb) {
<?php
}
if ($is_myisam_or_aria && !PMA_DRIZZLE) {
- $this_url_params = array_merge($url_params,
+ $this_url_params = array_merge(
+ $url_params,
array(
'sql_query' => 'REPAIR TABLE ' . PMA_backquote($GLOBALS['table']),
'table_maintenance' => 'Go',
- ));
+ )
+ );
?>
<li><a class='maintain_action' href="tbl_operations.php<?php echo PMA_generate_common_url($this_url_params); ?>">
<?php echo __('Repair table'); ?></a>
@@ -647,11 +657,13 @@ if ($is_myisam_or_aria || $is_innodb || $is_berkeleydb) {
<?php
}
if (($is_myisam_or_aria || $is_innodb || $is_berkeleydb) && !PMA_DRIZZLE) {
- $this_url_params = array_merge($url_params,
+ $this_url_params = array_merge(
+ $url_params,
array(
'sql_query' => 'OPTIMIZE TABLE ' . PMA_backquote($GLOBALS['table']),
'table_maintenance' => 'Go',
- ));
+ )
+ );
?>
<li><a class='maintain_action' href="tbl_operations.php<?php echo PMA_generate_common_url($this_url_params); ?>">
<?php echo __('Optimize table'); ?></a>
@@ -660,13 +672,17 @@ if ($is_myisam_or_aria || $is_innodb || $is_berkeleydb) {
<?php
}
} // end MYISAM or BERKELEYDB case
-$this_url_params = array_merge($url_params,
+$this_url_params = array_merge(
+ $url_params,
array(
'sql_query' => 'FLUSH TABLE ' . PMA_backquote($GLOBALS['table']),
- 'message_to_show' => sprintf(__('Table %s has been flushed'),
- htmlspecialchars($GLOBALS['table'])),
+ 'message_to_show' => sprintf(
+ __('Table %s has been flushed'),
+ htmlspecialchars($GLOBALS['table'])
+ ),
'reload' => 1,
- ));
+ )
+);
?>
<li><a class='maintain_action' href="sql.php<?php echo PMA_generate_common_url($this_url_params); ?>">
<?php echo __('Flush the table (FLUSH)'); ?></a>
@@ -684,13 +700,15 @@ $this_url_params = array_merge($url_params,
<?php
if (! $tbl_is_view && ! (isset($db_is_information_schema) && $db_is_information_schema)) {
$this_sql_query = 'TRUNCATE TABLE ' . PMA_backquote($GLOBALS['table']);
- $this_url_params = array_merge($url_params,
+ $this_url_params = array_merge(
+ $url_params,
array(
'sql_query' => $this_sql_query,
'goto' => 'tbl_structure.php',
'reload' => '1',
'message_to_show' => sprintf(__('Table %s has been emptied'), htmlspecialchars($table)),
- ));
+ )
+ );
?>
<li><a href="sql.php<?php echo PMA_generate_common_url($this_url_params); ?>" <?php echo ($GLOBALS['cfg']['AjaxEnable'] ? 'id="truncate_tbl_anchor" class="ajax"' : ''); ?>>
<?php echo __('Empty the table (TRUNCATE)'); ?></a>
@@ -700,7 +718,8 @@ if (! $tbl_is_view && ! (isset($db_is_information_schema) && $db_is_information_
}
if (! (isset($db_is_information_schema) && $db_is_information_schema)) {
$this_sql_query = 'DROP TABLE ' . PMA_backquote($GLOBALS['table']);
- $this_url_params = array_merge($url_params,
+ $this_url_params = array_merge(
+ $url_params,
array(
'sql_query' => $this_sql_query,
'goto' => 'db_operations.php',
@@ -710,7 +729,8 @@ if (! (isset($db_is_information_schema) && $db_is_information_schema)) {
// table name is needed to avoid running
// PMA_relationsCleanupDatabase() on the whole db later
'table' => $GLOBALS['table'],
- ));
+ )
+ );
?>
<li><a href="sql.php<?php echo PMA_generate_common_url($this_url_params); ?>" <?php echo ($GLOBALS['cfg']['AjaxEnable'] ? 'id="drop_tbl_anchor"' : ''); ?>>
<?php echo __('Delete the table (DROP)'); ?></a>
@@ -756,10 +776,12 @@ if (! (isset($db_is_information_schema) && $db_is_information_schema)) {
echo PMA_showMySQLDocu('partitioning_maintenance', 'partitioning_maintenance');
// I'm not sure of the best way to display that; this link does
// not depend on the Go button
- $this_url_params = array_merge($url_params,
+ $this_url_params = array_merge(
+ $url_params,
array(
'sql_query' => 'ALTER TABLE ' . PMA_backquote($GLOBALS['table']) . ' REMOVE PARTITIONING'
- ));
+ )
+ );
?>
<br /><a href="sql.php<?php echo PMA_generate_common_url($this_url_params); ?>">
<?php echo __('Remove partitioning'); ?></a>
@@ -810,8 +832,10 @@ if ($cfgRelation['relwork'] && ! $is_innodb) {
. ' IS NULL AND '
. PMA_backquote($GLOBALS['table']) . '.' . PMA_backquote($master)
. ' IS NOT NULL';
- $this_url_params = array_merge($url_params,
- array('sql_query' => $join_query));
+ $this_url_params = array_merge(
+ $url_params,
+ array('sql_query' => $join_query)
+ );
echo ' <li>'
. '<a href="sql.php'
. PMA_generate_common_url($this_url_params)
hooks/post-receive
--
phpMyAdmin
1
0
[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_5_0BETA1-18-g90d81d9
by Dieter Adriaenssens 26 Jan '12
by Dieter Adriaenssens 26 Jan '12
26 Jan '12
The branch, master has been updated
via 90d81d90c79b1400c6fb6b0a9ce22b5616653edd (commit)
via 4a5e87186b4f0324f89f5a2ed3d8990044ec32db (commit)
from d7082cd85659dd8f7279fee9e83c507eafcef2ce (commit)
- Log -----------------------------------------------------------------
commit 90d81d90c79b1400c6fb6b0a9ce22b5616653edd
Merge: 4a5e871 d7082cd
Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net>
Date: Thu Jan 26 14:41:13 2012 +0100
Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin
commit 4a5e87186b4f0324f89f5a2ed3d8990044ec32db
Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net>
Date: Thu Jan 26 14:40:39 2012 +0100
fix coding style
-----------------------------------------------------------------------
Summary of changes:
server_status.php | 23 ++++++++++------
tbl_operations.php | 72 ++++++++++++++++++++++++++++++++++-----------------
2 files changed, 62 insertions(+), 33 deletions(-)
diff --git a/server_status.php b/server_status.php
index 3a891ba..24dcb9b 100644
--- a/server_status.php
+++ b/server_status.php
@@ -61,7 +61,8 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
$queries = PMA_DBI_fetch_result(
"SHOW GLOBAL STATUS
WHERE (Variable_name LIKE 'Com_%' OR Variable_name = 'Questions')
- AND Value > 0", 0, 1);
+ AND Value > 0", 0, 1
+ );
}
cleanDeprecated($queries);
// admin commands are not queries
@@ -83,7 +84,8 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
$traffic = PMA_DBI_fetch_result(
"SHOW GLOBAL STATUS
WHERE Variable_name = 'Bytes_received'
- OR Variable_name = 'Bytes_sent'", 0, 1);
+ OR Variable_name = 'Bytes_sent'", 0, 1
+ );
$ret = array(
'x' => microtime(true) * 1000,
@@ -943,12 +945,12 @@ function printQueryStatistics()
echo '<br />';
echo 'ø ' . __('per minute') . ': ';
- echo PMA_formatNumber( $total_queries * 60 / $server_status['Uptime'], 0);
+ echo PMA_formatNumber($total_queries * 60 / $server_status['Uptime'], 0);
echo '<br />';
if ($total_queries / $server_status['Uptime'] >= 1) {
echo 'ø ' . __('per second') . ': ';
- echo PMA_formatNumber( $total_queries / $server_status['Uptime'], 0);
+ echo PMA_formatNumber($total_queries / $server_status['Uptime'], 0);
}
?>
</span>
@@ -1038,22 +1040,25 @@ function printServerTraffic()
* starttime calculation
*/
$start_time = PMA_DBI_fetch_value(
- 'SELECT UNIX_TIMESTAMP() - ' . $server_status['Uptime']);
+ 'SELECT UNIX_TIMESTAMP() - ' . $server_status['Uptime']
+ );
?>
<h3><?php
echo sprintf(
__('Network traffic since startup: %s'),
- implode(' ', PMA_formatByteDown( $server_status['Bytes_received'] + $server_status['Bytes_sent'], 3, 1))
- );
+ implode(' ', PMA_formatByteDown($server_status['Bytes_received'] + $server_status['Bytes_sent'], 3, 1))
+ );
?>
</h3>
<p>
<?php
- echo sprintf(__('This MySQL server has been running for %1$s. It started up on %2$s.'),
+ echo sprintf(
+ __('This MySQL server has been running for %1$s. It started up on %2$s.'),
PMA_timespanFormat($server_status['Uptime']),
- PMA_localisedDate($start_time)) . "\n";
+ PMA_localisedDate($start_time)
+ ) . "\n";
?>
</p>
diff --git a/tbl_operations.php b/tbl_operations.php
index a09528b..da2291e 100644
--- a/tbl_operations.php
+++ b/tbl_operations.php
@@ -380,8 +380,10 @@ if (strstr($show_comment, '; InnoDB free') === false) {
<!-- Table character set -->
<tr><td><?php echo __('Collation'); ?></td>
- <td><?php echo PMA_generateCharsetDropdownBox(PMA_CSDROPDOWN_COLLATION,
- 'tbl_collation', null, $tbl_collation, false, 3); ?>
+ <td><?php echo PMA_generateCharsetDropdownBox(
+ PMA_CSDROPDOWN_COLLATION,
+ 'tbl_collation', null, $tbl_collation, false, 3
+ ); ?>
</td>
</tr>
<?php
@@ -598,11 +600,13 @@ if (isset($possible_row_formats[$tbl_type])) {
// Note: BERKELEY (BDB) is no longer supported, starting with MySQL 5.1
if ($is_myisam_or_aria || $is_innodb || $is_berkeleydb) {
if ($is_myisam_or_aria || $is_innodb) {
- $this_url_params = array_merge($url_params,
+ $this_url_params = array_merge(
+ $url_params,
array(
'sql_query' => 'CHECK TABLE ' . PMA_backquote($GLOBALS['table']),
'table_maintenance' => 'Go',
- ));
+ )
+ );
?>
<li><a class='maintain_action' href="tbl_operations.php<?php echo PMA_generate_common_url($this_url_params); ?>">
<?php echo __('Check table'); ?></a>
@@ -611,8 +615,10 @@ if ($is_myisam_or_aria || $is_innodb || $is_berkeleydb) {
<?php
}
if ($is_innodb) {
- $this_url_params = array_merge($url_params,
- array('sql_query' => 'ALTER TABLE ' . PMA_backquote($GLOBALS['table']) . ' ENGINE = InnoDB'));
+ $this_url_params = array_merge(
+ $url_params,
+ array('sql_query' => 'ALTER TABLE ' . PMA_backquote($GLOBALS['table']) . ' ENGINE = InnoDB')
+ );
?>
<li><a class='maintain_action' href="sql.php<?php echo PMA_generate_common_url($this_url_params); ?>">
<?php echo __('Defragment table'); ?></a>
@@ -621,11 +627,13 @@ if ($is_myisam_or_aria || $is_innodb || $is_berkeleydb) {
<?php
}
if ($is_myisam_or_aria || $is_berkeleydb) {
- $this_url_params = array_merge($url_params,
+ $this_url_params = array_merge(
+ $url_params,
array(
'sql_query' => 'ANALYZE TABLE ' . PMA_backquote($GLOBALS['table']),
'table_maintenance' => 'Go',
- ));
+ )
+ );
?>
<li><a class='maintain_action' href="tbl_operations.php<?php echo PMA_generate_common_url($this_url_params); ?>">
<?php echo __('Analyze table'); ?></a>
@@ -634,11 +642,13 @@ if ($is_myisam_or_aria || $is_innodb || $is_berkeleydb) {
<?php
}
if ($is_myisam_or_aria && !PMA_DRIZZLE) {
- $this_url_params = array_merge($url_params,
+ $this_url_params = array_merge(
+ $url_params,
array(
'sql_query' => 'REPAIR TABLE ' . PMA_backquote($GLOBALS['table']),
'table_maintenance' => 'Go',
- ));
+ )
+ );
?>
<li><a class='maintain_action' href="tbl_operations.php<?php echo PMA_generate_common_url($this_url_params); ?>">
<?php echo __('Repair table'); ?></a>
@@ -647,11 +657,13 @@ if ($is_myisam_or_aria || $is_innodb || $is_berkeleydb) {
<?php
}
if (($is_myisam_or_aria || $is_innodb || $is_berkeleydb) && !PMA_DRIZZLE) {
- $this_url_params = array_merge($url_params,
+ $this_url_params = array_merge(
+ $url_params,
array(
'sql_query' => 'OPTIMIZE TABLE ' . PMA_backquote($GLOBALS['table']),
'table_maintenance' => 'Go',
- ));
+ )
+ );
?>
<li><a class='maintain_action' href="tbl_operations.php<?php echo PMA_generate_common_url($this_url_params); ?>">
<?php echo __('Optimize table'); ?></a>
@@ -660,13 +672,17 @@ if ($is_myisam_or_aria || $is_innodb || $is_berkeleydb) {
<?php
}
} // end MYISAM or BERKELEYDB case
-$this_url_params = array_merge($url_params,
+$this_url_params = array_merge(
+ $url_params,
array(
'sql_query' => 'FLUSH TABLE ' . PMA_backquote($GLOBALS['table']),
- 'message_to_show' => sprintf(__('Table %s has been flushed'),
- htmlspecialchars($GLOBALS['table'])),
+ 'message_to_show' => sprintf(
+ __('Table %s has been flushed'),
+ htmlspecialchars($GLOBALS['table'])
+ ),
'reload' => 1,
- ));
+ )
+);
?>
<li><a class='maintain_action' href="sql.php<?php echo PMA_generate_common_url($this_url_params); ?>">
<?php echo __('Flush the table (FLUSH)'); ?></a>
@@ -684,13 +700,15 @@ $this_url_params = array_merge($url_params,
<?php
if (! $tbl_is_view && ! (isset($db_is_information_schema) && $db_is_information_schema)) {
$this_sql_query = 'TRUNCATE TABLE ' . PMA_backquote($GLOBALS['table']);
- $this_url_params = array_merge($url_params,
+ $this_url_params = array_merge(
+ $url_params,
array(
'sql_query' => $this_sql_query,
'goto' => 'tbl_structure.php',
'reload' => '1',
'message_to_show' => sprintf(__('Table %s has been emptied'), htmlspecialchars($table)),
- ));
+ )
+ );
?>
<li><a href="sql.php<?php echo PMA_generate_common_url($this_url_params); ?>" <?php echo ($GLOBALS['cfg']['AjaxEnable'] ? 'id="truncate_tbl_anchor" class="ajax"' : ''); ?>>
<?php echo __('Empty the table (TRUNCATE)'); ?></a>
@@ -700,7 +718,8 @@ if (! $tbl_is_view && ! (isset($db_is_information_schema) && $db_is_information_
}
if (! (isset($db_is_information_schema) && $db_is_information_schema)) {
$this_sql_query = 'DROP TABLE ' . PMA_backquote($GLOBALS['table']);
- $this_url_params = array_merge($url_params,
+ $this_url_params = array_merge(
+ $url_params,
array(
'sql_query' => $this_sql_query,
'goto' => 'db_operations.php',
@@ -710,7 +729,8 @@ if (! (isset($db_is_information_schema) && $db_is_information_schema)) {
// table name is needed to avoid running
// PMA_relationsCleanupDatabase() on the whole db later
'table' => $GLOBALS['table'],
- ));
+ )
+ );
?>
<li><a href="sql.php<?php echo PMA_generate_common_url($this_url_params); ?>" <?php echo ($GLOBALS['cfg']['AjaxEnable'] ? 'id="drop_tbl_anchor"' : ''); ?>>
<?php echo __('Delete the table (DROP)'); ?></a>
@@ -756,10 +776,12 @@ if (! (isset($db_is_information_schema) && $db_is_information_schema)) {
echo PMA_showMySQLDocu('partitioning_maintenance', 'partitioning_maintenance');
// I'm not sure of the best way to display that; this link does
// not depend on the Go button
- $this_url_params = array_merge($url_params,
+ $this_url_params = array_merge(
+ $url_params,
array(
'sql_query' => 'ALTER TABLE ' . PMA_backquote($GLOBALS['table']) . ' REMOVE PARTITIONING'
- ));
+ )
+ );
?>
<br /><a href="sql.php<?php echo PMA_generate_common_url($this_url_params); ?>">
<?php echo __('Remove partitioning'); ?></a>
@@ -810,8 +832,10 @@ if ($cfgRelation['relwork'] && ! $is_innodb) {
. ' IS NULL AND '
. PMA_backquote($GLOBALS['table']) . '.' . PMA_backquote($master)
. ' IS NOT NULL';
- $this_url_params = array_merge($url_params,
- array('sql_query' => $join_query));
+ $this_url_params = array_merge(
+ $url_params,
+ array('sql_query' => $join_query)
+ );
echo ' <li>'
. '<a href="sql.php'
. PMA_generate_common_url($this_url_params)
hooks/post-receive
--
phpMyAdmin
1
0
[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_5_0BETA1-16-gd7082cd
by Madhura Jayaratne 25 Jan '12
by Madhura Jayaratne 25 Jan '12
25 Jan '12
The branch, master has been updated
via d7082cd85659dd8f7279fee9e83c507eafcef2ce (commit)
via 5289db8dd474bc33af3bcf20688c6d0d4359eb0a (commit)
from 112d692a3f7bfa69c9d2c7d8e68ec06f3aafa006 (commit)
- Log -----------------------------------------------------------------
commit d7082cd85659dd8f7279fee9e83c507eafcef2ce
Merge: 112d692 5289db8
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: Wed Jan 25 23:38:33 2012 +0530
Merge branch 'QA_3_5'
Conflicts:
ChangeLog
Documentation.html
README
libraries/Config.class.php
-----------------------------------------------------------------------
Summary of changes:
hooks/post-receive
--
phpMyAdmin
1
0