Commit Graph

296 Commits

Author SHA1 Message Date
Dan Hensby
de19c643fb Update translations 2016-11-28 12:35:17 +00:00
Dan Hensby
285c4921a7 Update translations 2016-11-21 13:51:27 +00:00
Dan Hensby
cca147513a Update translations 2016-11-09 11:32:19 +00:00
Damian Mooyman
bffab11a54 Update translations 2016-08-15 18:27:31 +12:00
Damian Mooyman
9f86315330 Update translations 2016-08-15 15:49:50 +12:00
Damian Mooyman
5f07e193fa Update translations 2016-08-05 17:57:46 +12:00
Damian Mooyman
afc9bb0dc6 Merge 3.3 into 3.4
# Conflicts:
#	code/controllers/CMSPageHistoryController.php
#	code/controllers/SilverStripeNavigator.php
#	lang/bg.yml
#	lang/cs.yml
#	lang/it.yml
#	lang/sk.yml
2016-08-05 16:46:35 +12:00
Damian Mooyman
8284fdc4ca Update translations 2016-08-05 16:13:13 +12:00
Damian Mooyman
99b3346316 Merge 3.2 into 3.3 2016-08-05 14:36:30 +12:00
Damian Mooyman
795ece3352 Merge 3.1 into 3.2
# Conflicts:
#	javascript/lang/fa_IR.js
#	javascript/lang/ru.js
#	javascript/lang/src/fa_IR.js
#	javascript/lang/src/ru.js
#	lang/fa_IR.yml
2016-08-05 11:37:29 +12:00
Damian Mooyman
6477e24219 Update translations 2016-08-05 11:06:51 +12:00
Damian Mooyman
1ea9444be9 Update translations 2016-06-02 17:07:41 +12:00
Damian Mooyman
f5b00786d6 Update translations 2016-05-19 14:48:39 +12:00
Damian Mooyman
4571779213 Update translations 2016-05-11 11:05:57 +12:00
Damian Mooyman
dd0163ae00 Update translations 2016-05-11 11:05:37 +12:00
Damian Mooyman
03c628345b Update translations 2016-05-11 10:58:24 +12:00
Daniel Hensby
4207e9bae9
Update translations 2016-05-05 12:47:36 +01:00
Daniel Hensby
228c406e64
Merge remote-tracking branch '3.2.4' into 3.3.2 2016-05-05 12:33:08 +01:00
Daniel Hensby
ce3575e362
Update translations 2016-05-05 12:25:44 +01:00
Daniel Hensby
5cbfad4aea
Merge remote-tracking branch 'origin/3.1.19' into 3.2.4 2016-05-05 12:25:13 +01:00
Daniel Hensby
2d10c94049
Update translations 2016-05-05 10:24:15 +01:00
Damian Mooyman
ffdfac6af4 Merge branch '3.2' into 3.3
# Conflicts:
#	lang/en.yml
#	lang/sk.yml
2016-02-29 16:47:11 +13:00
Damian Mooyman
2406881d3e Merge remote-tracking branch 'origin/3.3.1' into 3.3
# Conflicts:
#	lang/cs.yml
2016-02-29 16:44:01 +13:00
Damian Mooyman
1eed3608ad Merge branch '3.1' into 3.2
# Conflicts:
#	code/controllers/CMSMain.php
2016-02-29 16:41:01 +13:00
Damian Mooyman
77d506547c Update translations 2016-02-29 15:01:55 +13:00
Damian Mooyman
80959dc441 Update translations 2016-02-29 15:01:10 +13:00
Damian Mooyman
e6f9e71a0f Update translations 2016-02-29 14:57:30 +13:00
Damian Mooyman
05a9c760f8 Update translations 2016-02-27 20:38:29 +13:00
Damian Mooyman
a89debb962 Update translations 2016-02-27 20:38:19 +13:00
Damian Mooyman
be980a50fc Update translations 2016-02-27 20:35:10 +13:00
Damian Mooyman
208497ea42 Merge remote-tracking branch 'origin/3.2' into 3.3
# Conflicts:
#	lang/en.yml
#	lang/lt.yml
2016-02-24 17:32:58 +13:00
Damian Mooyman
a5444c3eeb Update translations 2016-02-24 16:06:03 +13:00
Damian Mooyman
4c3761f42c Update translations 2016-02-24 15:20:40 +13:00
Damian Mooyman
4849aa828e Update translations 2016-02-24 15:14:58 +13:00
Damian Mooyman
33bf5f9519 Update translations 2016-02-19 10:54:36 +13:00
Damian Mooyman
42cedb70b9 Update translations 2016-02-19 10:21:02 +13:00
Damian Mooyman
c43b84573b Update translations 2016-02-09 17:45:20 +13:00
Damian Mooyman
0cc49cb27a Update translations 2016-01-25 15:06:55 +13:00
Damian Mooyman
d387d4f311 Update translations 2015-12-23 13:22:38 +13:00
Damian Mooyman
15685d85ab Merge remote-tracking branch 'origin/3.2' into 3 2015-12-22 14:10:52 +13:00
Damian Mooyman
a40c8e034a Update translations 2015-11-16 16:01:51 +13:00
Damian Mooyman
5925883330 Update translations 2015-11-16 15:08:39 +13:00
Damian Mooyman
73377a7a92 Update translations 2015-11-11 17:06:44 +13:00
Damian Mooyman
ebed1d22e5 Update translations 2015-11-11 16:07:20 +13:00
Damian Mooyman
748866ec0f Merge remote-tracking branch 'origin/3.2' into 3
Conflicts:
	code/controllers/CMSMain.php
	code/model/ErrorPage.php
2015-11-03 13:11:26 +13:00
Damian Mooyman
54b8389b8a Merge remote-tracking branch 'origin/3.1' into 3.2
Conflicts:
	code/model/ErrorPage.php
	lang/fa_IR.yml
2015-11-03 11:11:29 +13:00
Damian Mooyman
d8915115f8 Update translations 2015-10-06 18:33:16 +13:00
Damian Mooyman
0df0f35278 Update translations 2015-09-18 14:21:19 +12:00
Damian Mooyman
6e72bd2cf8 Update translations 2015-09-15 10:51:27 +12:00
Damian Mooyman
ce212972c8 Update translations 2015-09-15 10:42:32 +12:00