Commit Graph

88975 Commits

Author SHA1 Message Date
Michal Čihař
0180d55cf2 Merge remote-tracking branch 'origin/QA_4_1' 2014-01-10 19:13:36 +01:00
Michal Čihař
4e72a040cb Translated using Weblate (Polish)
Currently translated at 86.9% (2394 of 2754)
2014-01-10 19:13:18 +01:00
Michal Čihař
d39ee90546 Translated using Weblate (Interlingua)
Currently translated at 38.2% (1053 of 2753)
2014-01-10 19:13:14 +01:00
Michal Čihař
5b13d46ac3 Translated using Weblate (English (United Kingdom))
Currently translated at 93.2% (2566 of 2753)
2014-01-10 19:13:10 +01:00
Michal Čihař
23f437ccd0 Translated using Weblate (Polish)
Currently translated at 92.6% (2548 of 2749)
2014-01-10 19:12:59 +01:00
Myung Han Yu
f6edf9f707 Translated using Weblate (Korean)
Currently translated at 70.9% (1950 of 2749)
2014-01-10 19:12:55 +01:00
Giovanni Sora
4f6f5aeeef Translated using Weblate (Interlingua)
Currently translated at 37.5% (1033 of 2749)
2014-01-10 19:12:51 +01:00
Marc Delisle
e97f234a50 Translated using Weblate (French)
Currently translated at 95.3% (2626 of 2754)
2014-01-10 19:01:12 +01:00
Marc Delisle
7b098f8042 Translated using Weblate (French)
Currently translated at 94.8% (2612 of 2754)
2014-01-10 18:57:07 +01:00
Marc Delisle
0d9c1ca02e Translated using Weblate (French)
Currently translated at 94.4% (2602 of 2754)
2014-01-10 18:51:21 +01:00
Marc Delisle
b8e2255460 Translated using Weblate (French)
Currently translated at 94.0% (2590 of 2754)
2014-01-10 18:47:26 +01:00
Kristjan Räts
4471d60d44 Translated using Weblate (Estonian)
Currently translated at 100.0% (2753 of 2753)
2014-01-10 18:45:01 +01:00
Burak Yavuz
3c7a9b067f Translated using Weblate (Turkish)
Currently translated at 99.8% (2751 of 2754)
2014-01-10 18:40:09 +01:00
Michal Čihař
4fc7ac5d3f Translated using Weblate (Czech)
Currently translated at 100.0% (2754 of 2754)
2014-01-10 17:22:46 +01:00
Marc Delisle
4aa2bfb635 Update po files 2014-01-10 10:35:17 -05:00
Marc Delisle
16cc2550ce Improve message
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-01-10 10:34:50 -05:00
Marc Delisle
3e011150fd Refactor: new _getTableCondition()
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-01-10 08:47:22 -05:00
Weblate
1b74f8bf78 Merge remote-tracking branch 'origin/master' 2014-01-10 09:25:30 +01:00
Myung Han Yu
67421109f2 Translated using Weblate (Korean)
Currently translated at 66.7% (1837 of 2752)
2014-01-10 09:24:10 +01:00
Hugues Peccatte
baa1cd87cc Merge pull request #840 from Tithugues/reduceNestedLevels
Reduce number of nested levels.
2014-01-10 00:18:45 -08:00
Hugues Peccatte
3b6ebb7467 Reduce number of nested levels.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-01-09 22:14:05 +01:00
Hugues Peccatte
ae0c9218ce PHPDoc update.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-01-09 20:51:40 +01:00
Weblate
2078214b39 Merge remote-tracking branch 'origin/master' 2014-01-09 19:26:33 +01:00
Giovanni Sora
e340336d5a Translated using Weblate (Interlingua)
Currently translated at 37.8% (1042 of 2752)
2014-01-09 19:24:23 +01:00
Hugues Peccatte
f7d5da319e Fix coding style.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-01-09 18:22:11 +01:00
Kristjan Räts
3ebabff99c Translated using Weblate (Estonian)
Currently translated at 100.0% (2749 of 2749)
2014-01-09 15:38:29 +01:00
Giovanni Sora
6e8d4d54eb Translated using Weblate (Interlingua)
Currently translated at 35.7% (984 of 2752)
2014-01-09 14:22:42 +01:00
Weblate
9ec09ffccb Merge remote-tracking branch 'origin/master' 2014-01-09 14:17:52 +01:00
Madhura Jayaratne
26702fc489 Merge branch 'QA_4_1' 2014-01-09 18:46:42 +05:30
Weblate
fe688affbd Merge remote-tracking branch 'origin/master' 2014-01-09 14:15:12 +01:00
Madhura Jayaratne
7831078e73 Merge branch 'QA_4_1' of github.com:phpmyadmin/phpmyadmin into QA_4_1 2014-01-09 18:45:00 +05:30
Giovanni Sora
0aeae1179d Translated using Weblate (Interlingua)
Currently translated at 35.9% (990 of 2752)
2014-01-09 14:13:34 +01:00
Weblate
6039d15b60 Merge remote-tracking branch 'origin/master' 2014-01-09 14:12:55 +01:00
Atul Pratap Singh
d3bd91eaaf Merge branch 'QA_4_1'
Conflicts:
	js/navigation.js
2014-01-10 00:06:29 +05:30
Atul Pratap Singh
832857cea9 Merge commit '4bd02f8' 2014-01-10 00:02:15 +05:30
Atul Pratap Singh
bdd53902f4 Merge commit 'ad415fe'
Conflicts:
	js/navigation.js
2014-01-10 00:01:18 +05:30
Atul Pratap Singh
207fb7b08a Merge branch 'QA_4_1' of github.com:phpmyadmin/phpmyadmin into QA_4_1 2014-01-09 21:16:54 +05:30
Atul Pratap Singh
0577539109 Remove redundant function and rename variable: auto-expand table/view
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
2014-01-09 21:01:19 +05:30
Atul Pratap Singh
eef7c3ddba Rewrite simply and generalize table/view part and fix bug#4219
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
2014-01-09 21:00:23 +05:30
Marc Delisle
f1bc750a88 Merge branch 'QA_4_1' 2014-01-09 08:11:51 -05:00
Marc Delisle
ed71b71263 Merge pull request #839 from madhuracj/QA_4_1
bug #4224 Empty table names when a table is "inuse"
2014-01-09 05:10:38 -08:00
Giovanni Sora
7b450ecff7 Translated using Weblate (Interlingua)
Currently translated at 35.4% (976 of 2752)
2014-01-09 14:10:17 +01:00
Madhura Jayaratne
e90abd5477 bug #4225 Partition maintenance broken
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-01-09 17:13:28 +05:30
Marc Delisle
93d0174751 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2014-01-09 06:40:08 -05:00
Marc Delisle
4ad48947f7 Refactor: new PMA_getDescriptionAndTitle()
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-01-09 06:39:40 -05:00
Madhura Jayaratne
09b0f9e60f bug #4224 Empty table names when a table is "inuse"
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-01-09 16:58:46 +05:30
Weblate
ff3c4c0816 Merge remote-tracking branch 'origin/master' 2014-01-09 12:22:11 +01:00
Marc Delisle
20da1d306e Missing right title
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-01-09 06:19:18 -05:00
Domen
e19ffa78d1 Translated using Weblate (Slovenian)
Currently translated at 96.3% (2652 of 2752)
2014-01-09 12:12:20 +01:00
Marc Delisle
6894e6d7e8 Fix typos
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-01-09 05:58:44 -05:00