Commit Graph

88837 Commits

Author SHA1 Message Date
Madhura Jayaratne
788f7efbe2 A couple of missed renamings in 790a2c2bee
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-01-07 17:03:31 +05:30
Marc Delisle
0a65267a57 Fix merge conflict
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-01-06 20:04:22 -05:00
Marc Delisle
4c1e377638 Merge commit '25a097f' 2014-01-06 20:02:31 -05:00
Weblate
25a097f21d Merge remote-tracking branch 'origin/QA_4_1' into QA_4_1 2014-01-07 01:52:20 +01:00
Douglas dreginatto
ce30242e55 Translated using Weblate (Portuguese (Brazil))
Currently translated at 99.6% (2740 of 2749)
2014-01-07 01:51:57 +01:00
Marc Delisle
b87a8227e5 bug #4220 Incorrect key values in foreign key browser
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-01-06 19:49:47 -05:00
J.M
e08c6fa711 Finish 1472-edit-privileges-submenu 2014-01-06 21:26:26 +01:00
J.M
a85dac4337 Add ChangeLog entry for rfe #1472
Signed-off-by: J.M <phpMyAdmin@ZweiSteinSoft.de>
2014-01-06 21:25:14 +01:00
J.M
61bae3f227 [interface] Break "Edit privileges" with sub-menus
Signed-off-by: J.M <phpMyAdmin@ZweiSteinSoft.de>
2014-01-06 21:22:31 +01:00
Helder Santana
569f829294 Translated using Weblate (Portuguese (Brazil))
Currently translated at 93.6% (2577 of 2751)
2014-01-06 16:17:16 +01:00
J.M
f864e0447e Correct typo in phpdoc comment
PMA_getHtmlToDisplayPrivilegesTable() function

Signed-off-by: J.M <phpMyAdmin@ZweiSteinSoft.de>
2014-01-06 16:11:40 +01:00
J.M
a7b4aa5355 Add missing * in phpdoc comment
PMA_getTablePrivsQueriesForChangeOrCopyUser() function

Signed-off-by: J.M <phpMyAdmin@ZweiSteinSoft.de>
2014-01-06 16:10:08 +01:00
Weblate
3f9864a3e5 Merge remote-tracking branch 'origin/master' 2014-01-06 16:00:52 +01:00
J.M
94329f4b2f Minor fixes for table structure actions button row
Signed-off-by: J.M <phpMyAdmin@ZweiSteinSoft.de>
2014-01-06 15:53:40 +01:00
Weblate
6a5f14415a Merge remote-tracking branch 'origin/master' 2014-01-06 15:49:56 +01:00
Marc Delisle
7c328c2425 Merge commit 'fa0abe0' 2014-01-06 09:37:36 -05:00
Marc Delisle
eedc0f3071 Merge commit '10a6260' 2014-01-06 09:37:02 -05:00
Marc Delisle
14545822f8 Merge commit '06588b4' 2014-01-06 09:36:43 -05:00
Marc Delisle
fa0abe0a23 Merge branch 'QA_4_1' of github.com:phpmyadmin/phpmyadmin into QA_4_1 2014-01-06 09:36:06 -05:00
Marc Delisle
10a6260180 Fix failing test
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-01-06 09:35:54 -05:00
Weblate
06588b471b Merge remote-tracking branch 'origin/QA_4_1' into QA_4_1 2014-01-06 15:25:39 +01:00
Weblate
d37befb45b Merge remote-tracking branch 'origin/master' 2014-01-06 15:25:36 +01:00
Michal Čihař
40dc1f8b15 Translated using Weblate (Uzbek (latin))
Currently translated at 44.7% (1231 of 2749)
2014-01-06 15:25:35 +01:00
Michal Čihař
c268301cf2 Translated using Weblate (Romanian)
Currently translated at 59.3% (1632 of 2749)
2014-01-06 15:25:17 +01:00
Michal Čihař
a7a4861273 Translated using Weblate (Punjabi)
Currently translated at 0.1% (5 of 2749)
2014-01-06 15:24:49 +01:00
Marc Delisle
1c28058dc1 Merge branch 'QA_4_1' 2014-01-06 09:24:23 -05:00
Weblate
6124074f8a Merge remote-tracking branch 'origin/master' 2014-01-06 15:24:22 +01:00
Michal Čihař
ca4344a27e Translated using Weblate (Portuguese)
Currently translated at 55.8% (1534 of 2749)
2014-01-06 15:24:22 +01:00
Michal Čihař
335b677994 Translated using Weblate (Hebrew)
Currently translated at 22.1% (609 of 2749)
2014-01-06 15:23:45 +01:00
Marc Delisle
cbaa45d340 bug #4217 Current value not highlighted when browsing foreign values
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-01-06 09:23:31 -05:00
Marc Delisle
336d9decba Fix coding style
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-01-06 08:47:44 -05:00
J.M
d223df35cc Minor fixes for table structure actions button row
Signed-off-by: J.M <phpMyAdmin@ZweiSteinSoft.de>
2014-01-06 14:38:32 +01:00
Weblate
4c6458798c Merge remote-tracking branch 'origin/master' 2014-01-06 13:05:24 +01:00
Michal Čihař
5a120b7c69 Translated using Weblate (Uzbek (latin))
Currently translated at 41.7% (1150 of 2752)
2014-01-06 13:03:16 +01:00
Michal Čihař
969a34780c Translated using Weblate (Romanian)
Currently translated at 55.3% (1522 of 2752)
2014-01-06 13:00:55 +01:00
Michal Čihař
b209fa45d9 Translated using Weblate (Punjabi)
Currently translated at 0.1% (5 of 2752)
2014-01-06 12:58:27 +01:00
Michal Čihař
b528c21b4a Translated using Weblate (Portuguese)
Currently translated at 51.1% (1408 of 2752)
2014-01-06 12:57:27 +01:00
Michal Čihař
57d642fe14 Translated using Weblate (Hebrew)
Currently translated at 22.0% (608 of 2752)
2014-01-06 12:56:37 +01:00
Michal Čihař
04f98964ec End sentence with full stop
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-01-06 12:55:31 +01:00
Michal Čihař
61aa37e942 Merge remote-tracking branch 'origin/QA_4_1' 2014-01-06 12:10:54 +01:00
Michal Čihař
330fbfdb99 Translated using Weblate (Japanese)
Currently translated at 83.3% (2293 of 2752)
2014-01-06 12:10:31 +01:00
Michal Čihař
d1a566cc5d Translated using Weblate (Danish)
Currently translated at 93.8% (2583 of 2752)
2014-01-06 12:10:27 +01:00
Michal Dobsovic
1238d530e4 Translated using Weblate (Slovak)
Currently translated at 80.1% (2202 of 2749)
2014-01-06 12:10:16 +01:00
Michal Čihař
e645003c45 Translated using Weblate (Czech)
Currently translated at 100.0% (2749 of 2749)
2014-01-06 12:10:11 +01:00
Michal Čihař
ff89a7d072 Translated using Weblate (Czech)
Currently translated at 100.0% (2752 of 2752)
2014-01-06 12:09:41 +01:00
Weblate
999abd8040 Merge remote-tracking branch 'origin/master' 2014-01-06 11:50:54 +01:00
Michal Čihař
a93f2bc6f6 Fixed spacing in docblocks
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-01-06 11:45:39 +01:00
Weblate
aefbe4627a Merge remote-tracking branch 'origin/master' 2014-01-06 11:37:56 +01:00
Michal Čihař
17b6252b5b Shorter name for binary logs list
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-01-06 11:34:39 +01:00
Michal Čihař
9d215e6ac5 Remove unused parameter binary_log_file_names
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-01-06 11:33:25 +01:00