Commit Graph

16051 Commits

Author SHA1 Message Date
lorilee
2ebf96d242 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin
Conflicts:
	libraries/display_export.lib.php
	libraries/display_import.lib.php
2010-07-20 13:04:03 -07:00
Robert Readman
2fe1c82426 Translation update done using Pootle. 2010-07-20 16:50:45 +02:00
Michal Čihař
0b86b981bb This comment looks totally irellevant. 2010-07-20 15:29:06 +02:00
Michal Čihař
5340978548 Refresh offsets in po files. 2010-07-20 15:10:44 +02:00
Michal Čihař
3e57a8eca9 No @uses __('Something'). 2010-07-20 15:06:34 +02:00
Michal Čihař
907663959b Merge remote branch 'pootle/master'
Conflicts:
	po/ug.po
2010-07-20 14:46:46 +02:00
Michal Čihař
0f090b8d7a Merge branch 'QA_3_3' 2010-07-20 14:41:40 +02:00
Michal Čihař
8b592a365b Merge remote branch 'origin/MAINT_3_3_5' into QA_3_3 2010-07-20 14:41:29 +02:00
Michal Čihař
60b2d5a3a4 Merge branch 'QA_3_3'
Conflicts:
	Documentation.html
	README
	libraries/Config.class.php
	translators.html
2010-07-20 14:39:46 +02:00
Michal Čihař
ef500cd23f bug #3031705 [core] Do not use CONCAT for DECIMAL fields. 2010-07-20 14:37:53 +02:00
Michal Čihař
59428bb433 Whitespace cleanup. 2010-07-20 14:36:44 +02:00
Michal Čihař
0305c10f91 rfe #3016457 [interface] Define tab order in SQL form to allow easier tab navigation. 2010-07-20 14:19:46 +02:00
Michal Čihař
4330ee3fd4 Whitespace cleanup. 2010-07-20 14:15:00 +02:00
Michal Čihař
29ccdfc1ff Focus SQL query area after dom is ready. 2010-07-20 14:14:44 +02:00
Michal Čihař
318dc4b650 Drop @version tag from docblocks. 2010-07-20 13:59:17 +02:00
Michal Čihař
95c0b5125d This function is not used anywhere. 2010-07-20 13:57:25 +02:00
Michal Čihař
79a23fcd01 Forgotten occurence. 2010-07-20 12:20:06 +02:00
Michal Čihař
ee99ed3d39 libiconv is gone as of PHP 4.0.5, no need to support that 2010-07-20 12:19:35 +02:00
Michal Čihař
163aca52b4 Update Czech translation. 2010-07-20 12:17:45 +02:00
Michal Čihař
c4f1e7a951 Regenerate po files. 2010-07-20 12:14:50 +02:00
Michal Čihař
be6e0eb8f3 Standard warnings for missing extensions. 2010-07-20 12:13:29 +02:00
Michal Čihař
f152dbcf84 The configuration directive is handled by generic config loading. 2010-07-20 12:10:41 +02:00
Michal Čihař
75593e3603 Do not die if RecodingEngine is auto and no engine is found. 2010-07-20 12:09:22 +02:00
Michal Čihař
42532065ab No section for loading extensions.
The dl has been deprecated long time and the code for it removed as well
so we can simplify loading much.
2010-07-20 12:08:43 +02:00
Michal Čihař
11e53fb141 [core] Dropped AllowAnywhereRecoding configuration variable.
It really does not make sense these days, now the recoding of
export/import is available when the necessary extensions are loaded and
it is possible to disable it using RecodingEngine directive.
2010-07-20 12:05:07 +02:00
Michal Čihař
a4055b4773 [core] RecodingEngine now accepts none as valid option. 2010-07-20 11:56:21 +02:00
Michal Čihař
d7192b3a95 DefaultCharset is not used anywhere. 2010-07-20 11:52:33 +02:00
gheni
2288d4bf2e Translation update done using Pootle. 2010-07-20 11:46:35 +02:00
Michal Čihař
df4a6efe47 Drop convcharset/pma_charset handling.
This code had no real use, it was used for converting strings from MySQL
to browser encoding.
2010-07-20 11:46:11 +02:00
Michal Čihař
8ceb240551 Drop passing of convcharset. 2010-07-20 11:43:10 +02:00
Michal Čihař
4603f7e881 This function is not used anywhere. 2010-07-20 11:42:53 +02:00
Michal Čihař
c9aa65668c Fix comment. 2010-07-20 11:42:38 +02:00
Michal Čihař
765e9021e4 No need to handle convcharset here. 2010-07-20 11:41:21 +02:00
gheni
dc873dd68a Translation update done using Pootle. 2010-07-20 11:28:53 +02:00
gheni
9b2a7e30e3 Translation update done using Pootle. 2010-07-20 11:28:24 +02:00
gheni
be361aa857 Translation update done using Pootle. 2010-07-20 11:27:23 +02:00
Michal Čihař
857b1250e7 Czech translation update. 2010-07-20 11:11:18 +02:00
Michal Čihař
0f4dacb2b1 Missing format string, so mark it fuzzy. 2010-07-20 11:10:34 +02:00
gheni
fa44618a16 Translation update done using Pootle. 2010-07-20 11:03:49 +02:00
Pootle server
ec065a139b Merge remote branch 'origin/master' 2010-07-19 20:40:11 +02:00
Marc Delisle
b1b4e0a920 Translation update done using Pootle. 2010-07-19 19:46:33 +02:00
Marc Delisle
f48834217f Translation update done using Pootle. 2010-07-19 19:46:13 +02:00
Marc Delisle
e684e92c99 Translation update done using Pootle. 2010-07-19 19:45:48 +02:00
Marc Delisle
b147c386c0 Translation update done using Pootle. 2010-07-19 19:45:45 +02:00
Marc Delisle
1c6dd50061 Translation update done using Pootle. 2010-07-19 19:45:42 +02:00
Marc Delisle
51bd2ae28f Translation update done using Pootle. 2010-07-19 19:45:40 +02:00
Marc Delisle
43056682a5 Translation update done using Pootle. 2010-07-19 19:45:37 +02:00
Marc Delisle
c1410e8362 Translation update done using Pootle. 2010-07-19 19:45:34 +02:00
Marc Delisle
955e794a3d Translation update done using Pootle. 2010-07-19 19:45:28 +02:00
Marc Delisle
0d5cf31ce0 Translation update done using Pootle. 2010-07-19 19:45:25 +02:00