Damian Mooyman 4f06a43986 Merge 3.3 into 3 ... # Conflicts: # admin/javascript/lang/src/cs.js # admin/javascript/lang/src/de.js # admin/javascript/lang/src/en.js # admin/javascript/lang/src/eo.js # admin/javascript/lang/src/es.js # admin/javascript/lang/src/fi.js # admin/javascript/lang/src/fr.js # admin/javascript/lang/src/id.js # admin/javascript/lang/src/id_ID.js # admin/javascript/lang/src/it.js # admin/javascript/lang/src/ja.js # admin/javascript/lang/src/lt.js # admin/javascript/lang/src/mi.js # admin/javascript/lang/src/nb.js # admin/javascript/lang/src/nl.js # admin/javascript/lang/src/pl.js # admin/javascript/lang/src/ro.js # admin/javascript/lang/src/ru.js # admin/javascript/lang/src/sk.js # admin/javascript/lang/src/sl.js # admin/javascript/lang/src/sr.js # admin/javascript/lang/src/sr@latin.js # admin/javascript/lang/src/sr_RS.js # admin/javascript/lang/src/sr_RS@latin.js # admin/javascript/lang/src/sv.js # admin/javascript/lang/src/zh.js # javascript/lang/fr.js # javascript/lang/src/ar.js # javascript/lang/src/cs.js # javascript/lang/src/de.js # javascript/lang/src/en.js # javascript/lang/src/eo.js # javascript/lang/src/es.js # javascript/lang/src/fi.js # javascript/lang/src/fr.js # javascript/lang/src/id.js # javascript/lang/src/id_ID.js # javascript/lang/src/it.js # javascript/lang/src/ja.js # javascript/lang/src/lt.js # javascript/lang/src/mi.js # javascript/lang/src/nb.js # javascript/lang/src/nl.js # javascript/lang/src/pl.js # javascript/lang/src/ru.js # javascript/lang/src/sk.js # javascript/lang/src/sl.js # javascript/lang/src/sr.js # javascript/lang/src/sr@latin.js # javascript/lang/src/sr_RS.js # javascript/lang/src/sr_RS@latin.js # javascript/lang/src/sv.js # javascript/lang/src/zh.js # lang/it.yml		2016-05-11 14:06:23 +12:00
..
src	Merge 3.3 into 3	2016-05-11 14:06:23 +12:00
ar.js	Merge 3.3 into 3	2016-05-11 14:06:23 +12:00
bg.js	Update translations	2016-05-11 11:05:57 +12:00
cs.js	Merge 3.3 into 3	2016-05-11 14:06:23 +12:00
de.js	Merge 3.3 into 3	2016-05-11 14:06:23 +12:00
en_GB.js	Merge 3.3 into 3	2016-05-11 14:06:23 +12:00
en.js	Merge 3.3 into 3	2016-05-11 14:06:23 +12:00
eo.js	Merge 3.3 into 3	2016-05-11 14:06:23 +12:00
es.js	Merge 3.3 into 3	2016-05-11 14:06:23 +12:00
fa_IR.js	Update translations	2016-05-11 11:05:57 +12:00
fi.js	Merge 3.3 into 3	2016-05-11 14:06:23 +12:00
fr.js	Update translations	2016-05-11 11:05:57 +12:00
id_ID.js	Merge 3.3 into 3	2016-05-11 14:06:23 +12:00
id.js	Merge 3.3 into 3	2016-05-11 14:06:23 +12:00
it.js	Merge 3.3 into 3	2016-05-11 14:06:23 +12:00
ja.js	Merge 3.3 into 3	2016-05-11 14:06:23 +12:00
lt.js	Merge 3.3 into 3	2016-05-11 14:06:23 +12:00
mi.js	Merge 3.3 into 3	2016-05-11 14:06:23 +12:00
nb.js	Merge 3.3 into 3	2016-05-11 14:06:23 +12:00
nl.js	Merge 3.3 into 3	2016-05-11 14:06:23 +12:00
pl.js	Merge 3.3 into 3	2016-05-11 14:06:23 +12:00
ru.js	Merge 3.3 into 3	2016-05-11 14:06:23 +12:00
sk.js	Merge 3.3 into 3	2016-05-11 14:06:23 +12:00
sl.js	Merge 3.3 into 3	2016-05-11 14:06:23 +12:00
sr_RS.js	Merge 3.3 into 3	2016-05-11 14:06:23 +12:00
sr_RS@latin.js	Merge 3.3 into 3	2016-05-11 14:06:23 +12:00
sr.js	Merge 3.3 into 3	2016-05-11 14:06:23 +12:00
sr@latin.js	Merge 3.3 into 3	2016-05-11 14:06:23 +12:00
sv.js	Merge 3.3 into 3	2016-05-11 14:06:23 +12:00
zh.js	Merge 3.3 into 3	2016-05-11 14:06:23 +12:00