Commit Graph

75075 Commits

Author SHA1 Message Date
Michal Čihař
0ca85c0d2b Merge remote-tracking branch 'weblate/master'
Conflicts:
	po/ja.po
	po/nl.po
	po/pl.po
	po/ro.po
	po/ru.po
	po/si.po
	po/th.po
2012-04-22 17:46:46 +02:00
Marc Delisle
f804fe5cfb ChangeLog entry 2012-04-22 07:45:02 -04:00
Yuichiro Takahashi
7c6f3e10dd Translated using Weblate. 2012-04-22 12:54:12 +02:00
Dieter Adriaenssens
6db00c402d Translated using Weblate. 2012-04-22 12:54:11 +02:00
Atul Pratap Singh
00ca858181 Patch #3500882 Fixing checkbox behaviour while editing identical rows 2012-04-22 06:53:54 -04:00
Marc Delisle
bdd4fbb9f9 Merge branch 'QA_3_5' 2012-04-22 05:51:10 -04:00
Tufan Barış YILDIRIM
66c10144f3 Missing condition for confirmation message 2012-04-22 05:50:54 -04:00
Rouslan Placella
7083dd0c93 Use LF line endings instead of CRLF 2012-04-22 00:27:46 +01:00
Rouslan Placella
f6253e1e6a Remove more stray trailing whitespaces 2012-04-22 00:24:20 +01:00
Yuichiro Takahashi
eeb89b96a1 Translated using Weblate. 2012-04-22 01:12:59 +02:00
Rouslan Placella
ff66fdbdf9 Remove stray trailing whitespaces 2012-04-22 00:12:30 +01:00
Marc Delisle
da0e04d179 Fix merge conflicts 2012-04-21 16:37:50 -04:00
Marc Delisle
a26aec4d80 bug #3516089 [structure] DROP does not work on defective VIEWs 2012-04-21 16:29:05 -04:00
Marc Delisle
e78a25ac76 Malayalam in language selector 2012-04-21 15:27:33 -04:00
Marc Delisle
3ae2d1852d Clarify variable names 2012-04-21 14:57:44 -04:00
Marc Delisle
3da49e3418 Clarify variable name 2012-04-21 14:48:30 -04:00
Marc Delisle
1c58314c53 Clarify function name 2012-04-21 14:40:08 -04:00
Madhura Jayaratne
06f153b4b1 Merge branch 'QA_3_5'
Conflicts:
	js/server_status_monitor.js
2012-04-21 23:54:22 +05:30
Rouslan Placella
f95d2fa43d Regenerated sprites 2012-04-21 19:19:58 +01:00
Madhura Jayaratne
227644088c Make button texts translatable 2012-04-21 23:49:14 +05:30
Rouslan Placella
00b57ea19f Removed more unused images 2012-04-21 19:18:13 +01:00
Rouslan Placella
74339e7139 Merge branch 'images' 2012-04-21 19:10:44 +01:00
Rouslan Placella
80e2eda56a Use CSS gradients instead of image backgrounds 2012-04-21 19:09:16 +01:00
Madhura Jayaratne
f856db18ab Merge branch 'QA_3_5'
Conflicts:
	js/server_status_monitor.js
2012-04-21 23:18:14 +05:30
Madhura Jayaratne
24af8431bb Setting the title initially is problematic with commit faeffd3 2012-04-21 23:14:07 +05:30
Rouslan Placella
d2bc29220e Removed unused images 2012-04-21 18:31:28 +01:00
Madhura Jayaratne
af7173b4c9 Translated using Weblate. 2012-04-21 19:16:19 +02:00
Madhura Jayaratne
f203b456b2 Merge branch 'QA_3_5'
Conflicts:
	js/server_status_monitor.js
2012-04-21 22:45:38 +05:30
Madhura Jayaratne
d7ca655efa Merge branch 'QA_3_5' of github.com:phpmyadmin/phpmyadmin into QA_3_5
Conflicts:
	ChangeLog
2012-04-21 22:40:15 +05:30
Madhura Jayaratne
e417febdc1 Make some messages translatable 2012-04-21 22:32:06 +05:30
Madhura Jayaratne
faeffd3566 bug #3520107 [interface] Server status page: Incorrect dialog box title 2012-04-21 22:20:19 +05:30
Setthawut Sawaengkit
18681dfce6 Translated using Weblate. 2012-04-21 16:07:30 +02:00
Yuichiro Takahashi
95bfb985b5 Translated using Weblate. 2012-04-21 16:07:29 +02:00
Jo Michael
f93041fc8d Merge branch 'show_git_commit' 2012-04-21 16:07:10 +02:00
Marcin Kozioł
ee82305455 Translated using Weblate. 2012-04-21 16:04:30 +02:00
Jo Michael
e689a10079 Try to load commit details from Github if local Git object only exists packed (we won't bother unpacking it) 2012-04-21 16:00:48 +02:00
Marc Delisle
3e7a4d64ee Refresh .po files 2012-04-21 08:22:06 -04:00
Michal Čihař
42e5d6e9e9 Merge remote-tracking branch 'origin/master' 2012-04-21 14:21:48 +02:00
Madhura Jayaratne
c6e53437c8 Translated using Weblate. 2012-04-21 14:21:45 +02:00
Victor Volkov
1f7248fefe Translated using Weblate. 2012-04-21 14:21:44 +02:00
Alex Marin
e7270cac10 Translated using Weblate. 2012-04-21 14:21:44 +02:00
Yuichiro Takahashi
88ab10a3fa Translated using Weblate. 2012-04-21 14:21:44 +02:00
Marc Delisle
b6925193d6 Remove SuggestDBName configuration directive 2012-04-21 08:21:28 -04:00
Victor Volkov
c4c41b3107 Translated using Weblate. 2012-04-21 10:47:11 +02:00
Michal Čihař
556dc63b7f Merge remote-tracking branch 'origin/master' 2012-04-21 10:05:16 +02:00
Madhura Jayaratne
2fe56aab10 Translated using Weblate. 2012-04-21 10:05:14 +02:00
Michal Čihař
02dbe89b9a Merge remote-tracking branch 'origin/QA_3_5' 2012-04-21 10:04:30 +02:00
Michal Čihař
0c4b876d1b Merge remote-tracking branch 'origin/master' 2012-04-21 10:03:39 +02:00
Madhura Jayaratne
0b3ef72c2a Translated using Weblate. 2012-04-21 10:03:33 +02:00
Yuichiro Takahashi
0f6a00db19 Translated using Weblate. 2012-04-21 10:03:32 +02:00