silverstripe-framework/lang
Damian Mooyman e6b877df27 Merge remote-tracking branch 'origin/3'
# Conflicts:
#	control/Director.php
#	control/HTTP.php
#	core/startup/ParameterConfirmationToken.php
#	docs/en/00_Getting_Started/01_Installation/05_Common_Problems.md
#	docs/en/00_Getting_Started/04_Directory_Structure.md
#	docs/en/00_Getting_Started/05_Coding_Conventions.md
#	docs/en/01_Tutorials/01_Building_A_Basic_Site.md
#	docs/en/01_Tutorials/02_Extending_A_Basic_Site.md
#	docs/en/01_Tutorials/03_Forms.md
#	docs/en/01_Tutorials/04_Site_Search.md
#	docs/en/01_Tutorials/05_Dataobject_Relationship_Management.md
#	docs/en/02_Developer_Guides/12_Search/01_Searchcontext.md
#	docs/en/02_Developer_Guides/13_i18n/index.md
#	docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/06_Javascript_Development.md
#	docs/en/03_Upgrading/index.md
#	docs/en/changelogs/index.md
#	docs/en/howto/customize-cms-menu.md
#	docs/en/howto/navigation-menu.md
#	docs/en/index.md
#	docs/en/installation/index.md
#	docs/en/installation/windows-manual-iis-6.md
#	docs/en/misc/contributing/code.md
#	docs/en/misc/contributing/issues.md
#	docs/en/misc/module-release-process.md
#	docs/en/reference/dataobject.md
#	docs/en/reference/execution-pipeline.md
#	docs/en/reference/grid-field.md
#	docs/en/reference/modeladmin.md
#	docs/en/reference/rssfeed.md
#	docs/en/reference/templates.md
#	docs/en/topics/commandline.md
#	docs/en/topics/debugging.md
#	docs/en/topics/email.md
#	docs/en/topics/forms.md
#	docs/en/topics/index.md
#	docs/en/topics/module-development.md
#	docs/en/topics/modules.md
#	docs/en/topics/page-type-templates.md
#	docs/en/topics/page-types.md
#	docs/en/topics/search.md
#	docs/en/topics/testing/index.md
#	docs/en/topics/testing/testing-guide-troubleshooting.md
#	docs/en/topics/theme-development.md
#	docs/en/tutorials/1-building-a-basic-site.md
#	docs/en/tutorials/2-extending-a-basic-site.md
#	docs/en/tutorials/3-forms.md
#	docs/en/tutorials/4-site-search.md
#	docs/en/tutorials/5-dataobject-relationship-management.md
#	docs/en/tutorials/building-a-basic-site.md
#	docs/en/tutorials/dataobject-relationship-management.md
#	docs/en/tutorials/extending-a-basic-site.md
#	docs/en/tutorials/forms.md
#	docs/en/tutorials/index.md
#	docs/en/tutorials/site-search.md
#	main.php
#	model/SQLQuery.php
#	security/ChangePasswordForm.php
#	security/MemberLoginForm.php
#	tests/control/ControllerTest.php
#	tests/core/startup/ParameterConfirmationTokenTest.php
#	tests/model/SQLQueryTest.php
#	tests/security/SecurityTest.php
#	tests/view/SSViewerTest.php
#	view/SSTemplateParser.php
#	view/SSTemplateParser.php.inc
#	view/SSViewer.php
2016-01-20 13:16:27 +13:00
..
_manifest_exclude #1476 Patch for ticket #128 and a few other changes 2007-10-22 01:51:02 +00:00
af.yml Added 3.1.14 changelog 2015-09-15 10:58:15 +12:00
ar.yml Added 3.1.14 changelog 2015-09-15 10:58:15 +12:00
ast.yml Updated translations 2013-11-08 00:58:24 +01:00
az.yml Updated translations 2013-11-08 00:58:24 +01:00
bg.yml Update translations 2015-09-02 11:15:53 +12:00
bs.yml Update translations 2015-09-02 11:15:53 +12:00
ca.yml Update translations 2015-09-02 11:15:53 +12:00
cs.yml Update translations 2015-12-23 13:22:38 +13:00
da.yml Update translations 2015-08-04 13:02:20 +12:00
de.yml Update translations 2015-12-23 13:22:38 +13:00
el.yml Update translations 2015-08-04 13:02:20 +12:00
en_GB.yml Update translation masters 2014-05-06 17:38:58 +12:00
en.yml Merge remote-tracking branch 'origin/3' 2016-01-20 13:16:27 +13:00
eo.yml Update translations 2015-12-23 13:22:38 +13:00
es_AR.yml Update translations 2015-09-02 11:15:53 +12:00
es_MX.yml Update translations 2015-09-02 11:15:53 +12:00
es.yml Update translations 2015-11-16 16:01:52 +13:00
et_EE.yml Added 3.1.14 changelog 2015-09-15 10:58:15 +12:00
fa_IR.yml Update translations 2015-12-23 13:22:38 +13:00
fi.yml Update translations 2015-12-23 13:22:38 +13:00
fo.yml Update translations 2015-09-02 11:15:53 +12:00
fr.yml Update translations 2015-11-11 16:07:20 +13:00
gl_ES.yml Update translations 2015-09-02 11:15:53 +12:00
he_IL.yml Update translations 2015-09-02 11:15:53 +12:00
hi.yml Updated translations 2013-11-08 00:58:24 +01:00
hr.yml Update translations 2015-09-02 11:15:53 +12:00
hu.yml Update translations 2015-09-02 11:15:53 +12:00
hy_AM.yml Translations: Switch to Transifex format 2013-08-07 00:25:16 +02:00
id_ID.yml Added 3.1.14 changelog 2015-09-15 10:58:15 +12:00
id.yml Added 3.1.14 changelog 2015-09-15 10:58:15 +12:00
is.yml Updated translations 2013-11-08 00:58:24 +01:00
it.yml Update translations 2015-11-16 16:01:52 +13:00
ja.yml Added 3.1.14 changelog 2015-09-15 10:58:15 +12:00
km.yml Updated translations 2013-11-08 00:58:24 +01:00
lt.yml Update translations 2015-12-23 13:22:38 +13:00
lv.yml Updated translations 2013-11-08 00:58:24 +01:00
mi.yml Added 3.1.14 changelog 2015-09-15 10:58:15 +12:00
ms.yml Updated translations 2013-11-08 00:58:24 +01:00
nb.yml Added 3.1.14 changelog 2015-09-15 10:58:15 +12:00
ne.yml Updated translations 2013-11-08 00:58:24 +01:00
nl.yml Added 3.1.14 changelog 2015-09-15 10:58:15 +12:00
pa.yml Updated translations 2013-11-08 00:58:24 +01:00
pl.yml Added 3.1.14 changelog 2015-09-15 10:58:15 +12:00
pt_BR.yml Update translations 2015-09-02 11:15:53 +12:00
pt.yml Update translations 2015-09-02 11:15:53 +12:00
ro.yml Updated translations 2014-02-18 11:49:55 +13:00
ru.yml Added 3.1.14 changelog 2015-09-15 10:58:15 +12:00
si.yml Update translations 2015-09-02 11:15:53 +12:00
sk.yml Update translations 2015-12-23 13:22:38 +13:00
sl.yml Update translations 2015-09-02 11:15:53 +12:00
sr_RS.yml Added 3.1.14 changelog 2015-09-15 10:58:15 +12:00
sr_RS@latin.yml Added 3.1.14 changelog 2015-09-15 10:58:15 +12:00
sr.yml Added 3.1.14 changelog 2015-09-15 10:58:15 +12:00
sr@latin.yml Added 3.1.14 changelog 2015-09-15 10:58:15 +12:00
sv.yml Added 3.1.14 changelog 2015-09-15 10:58:15 +12:00
th.yml Update translations 2015-09-02 11:15:53 +12:00
tr.yml Update translations 2015-10-06 18:33:16 +13:00
uk.yml Update translations 2015-09-02 11:15:53 +12:00
uz.yml Translations: Switch to Transifex format 2013-08-07 00:25:16 +02:00
vi_VN.yml Updated translations 2013-11-08 00:58:24 +01:00
vi.yml Updated translations 2014-02-18 11:49:55 +13:00
zh_CN.yml Update translations 2015-09-02 11:15:53 +12:00
zh_TW.yml Update translations 2015-09-02 11:15:53 +12:00
zh.yml Update translations 2015-10-06 18:33:16 +13:00