Commit Graph

83914 Commits

Author SHA1 Message Date
Weblate
dcee3fa76f Merge remote-tracking branch 'origin/master' 2013-06-05 10:05:32 +02:00
Michal Čihař
4b085c444e Translated using Weblate (Indonesian)
Currently translated at 70.7% (1883 of 2665)
2013-06-05 10:05:27 +02:00
Michal Čihař
bfa6282083 Merge branch 'QA_4_0' 2013-06-05 10:04:57 +02:00
Michal Čihař
eb29af585a Allow customization of CSP headers
This is useful for inserting custom javascript in header/footer files.
2013-06-05 10:04:06 +02:00
Michal Čihař
bc0bd0281c Translated using Weblate (Czech)
Currently translated at 100.0% (2665 of 2665)
2013-06-05 09:02:06 +02:00
Kristjan Räts
8754c98522 Translated using Weblate (Estonian)
Currently translated at 100.0% (2665 of 2665)
2013-06-05 08:34:27 +02:00
Panagiotis Papazoglou
585010ee38 Translated using Weblate (Greek)
Currently translated at 100.0% (2665 of 2665)
2013-06-05 08:16:28 +02:00
Marc Delisle
1c60c2ba3b Merge pull request #403 from xmujay/0602
refactor server_status.php: 1. using better function name 2. split long lines
2013-06-04 09:58:42 -07:00
Matías Bellone
f9582a2cda Translated using Weblate (Spanish)
Currently translated at 100.0% (2665 of 2665)
2013-06-04 17:59:19 +02:00
Burak Yavuz
d7bf937fcd Translated using Weblate (Turkish)
Currently translated at 100.0% (2665 of 2665)
2013-06-04 17:56:27 +02:00
xmujay
c51e6d66a1 split long lines 2013-06-04 23:51:36 +08:00
xmujay
e7a2845690 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin into 0602 2013-06-04 23:25:44 +08:00
Dieter Adriaenssens
42685f8a00 Update po files 2013-06-04 17:19:46 +02:00
Dieter Adriaenssens
738caedafb RFE 1432, add table name to message 2013-06-04 17:18:21 +02:00
Michal Čihař
d8ef86fa40 Translated using Weblate (Czech)
Currently translated at 100.0% (2665 of 2665)
2013-06-04 15:26:01 +02:00
Michal Čihař
ff5991656d Translated using Weblate (Kannada)
Currently translated at 0.0% (1 of 2665)
2013-06-04 15:25:21 +02:00
Weblate
73af3fc52e Merge remote-tracking branch 'origin/master' 2013-06-04 15:11:06 +02:00
Michal Čihař
e4939fd3d5 Merge remote-tracking branch 'origin/QA_4_0' 2013-06-04 15:03:50 +02:00
Weblate
34da3eb671 Merge remote-tracking branch 'origin/master' 2013-06-04 15:02:44 +02:00
Dadan Setia
f7e0876444 Translated using Weblate (Indonesian)
Currently translated at 70.7% (1883 of 2665)
2013-06-04 15:02:37 +02:00
Michal Čihař
a034965517 Add Kannada language 2013-06-04 15:02:16 +02:00
Domen
0ed704c7b8 Translated using Weblate (Slovenian)
Currently translated at 100.0% (2603 of 2603)
2013-06-04 11:10:59 +02:00
Domen
a9a3591270 Translated using Weblate (Slovenian)
Currently translated at 100.0% (2665 of 2665)
2013-06-04 11:10:48 +02:00
Weblate
692c8dfd59 Merge remote-tracking branch 'origin/master' 2013-06-04 11:00:48 +02:00
Dadan Setia
cd24398bcf Translated using Weblate (Indonesian)
Currently translated at 70.6% (1882 of 2665)
2013-06-04 11:00:38 +02:00
Dieter Adriaenssens
cf0a7b6cac Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2013-06-04 11:00:07 +02:00
Dieter Adriaenssens
c6fd32f85d Merge branch 'QA_4_0'
Conflicts:
	sql.php
2013-06-04 10:54:04 +02:00
Kristjan Räts
77e4884496 Translated using Weblate (Estonian)
Currently translated at 100.0% (2665 of 2665)
2013-06-04 10:53:45 +02:00
Kristjan Räts
e12ee0519e Translated using Weblate (Estonian)
Currently translated at 100.0% (2603 of 2603)
2013-06-04 10:53:32 +02:00
Dieter Adriaenssens
7a3c15724a fix bug #3966, only display 'table has no unique column' when table is defined 2013-06-04 10:45:53 +02:00
Weblate
51822d328a Merge remote-tracking branch 'origin/master' 2013-06-04 10:44:53 +02:00
Anders Jonsson
8ec8f6f4d0 Translated using Weblate (Swedish)
Currently translated at 99.4% (2648 of 2665)
2013-06-04 10:44:42 +02:00
Dieter Adriaenssens
93a08acb80 Merge remote branch 'origin/QA_4_0' 2013-06-04 10:44:08 +02:00
Weblate
ca4fd020a4 Merge remote-tracking branch 'origin/master' 2013-06-04 09:09:28 +02:00
Burak Yavuz
4ce7683319 Translated using Weblate (Turkish)
Currently translated at 100.0% (2665 of 2665)
2013-06-04 09:08:03 +02:00
Weblate
ac6ed91fc7 Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0 2013-06-04 09:07:56 +02:00
Panagiotis Papazoglou
c7165e9c55 Translated using Weblate (Greek)
Currently translated at 100.0% (2665 of 2665)
2013-06-04 09:07:49 +02:00
Anders Jonsson
5df0726954 Translated using Weblate (Swedish)
Currently translated at 99.9% (2601 of 2603)
2013-06-04 09:07:48 +02:00
Michal Čihař
b38c7637d8 Merge branch 'QA_4_0' 2013-06-04 09:07:14 +02:00
Michal Čihař
37aa3d09df Merge commit 'b8a621629f4c6cd53b9820c98551eb605429774f' 2013-06-04 09:07:07 +02:00
Michal Čihař
9afc2fba57 Add check for json module in PHP
Debian no longer ships JSON support built in into PHP because of some
licensing issues found in the PHP 5.5 and others might follow, so we
need to check whether JSON module is there.
2013-06-04 09:05:47 +02:00
Madhura Jayaratne
4538ab5a2b Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2013-06-04 10:35:40 +05:30
Matías Bellone
b8a621629f Translated using Weblate (Spanish)
Currently translated at 100.0% (2603 of 2603)
2013-06-04 02:39:55 +02:00
Burak Yavuz
a7d46066f1 Translated using Weblate (Turkish)
Currently translated at 100.0% (2603 of 2603)
2013-06-03 19:14:35 +02:00
xmujay
9a93f7e127 refactor server_status.php
1. using better function name
2. split long lines
2013-06-03 23:24:48 +08:00
Michal Čihař
3c69f5299b Translated using Weblate (Czech)
Currently translated at 100.0% (2603 of 2603)
2013-06-03 17:18:51 +02:00
Marc Delisle
c55dfb4355 Translated using Weblate (French)
Currently translated at 100.0% (2603 of 2603)
2013-06-03 15:37:21 +02:00
Panagiotis Papazoglou
a8c2850c6e Translated using Weblate (Greek)
Currently translated at 100.0% (2603 of 2603)
2013-06-03 15:33:48 +02:00
Marc Delisle
91a9656759 Update po files 2013-06-03 09:17:20 -04:00
Marc Delisle
68d57f0c3a Update po files 2013-06-03 09:16:38 -04:00