From 35ce802ff674d4b37dd950b7f75a97e3100a4875 Mon Sep 17 00:00:00 2001
From: Patrick Nelson <pat@catchyour.com>
Date: Wed, 10 Feb 2016 12:59:58 -0500
Subject: [PATCH 01/30] Update 01_Caching.md

`'failure_callback' => ''` fails but providing `'failure_callback' => null` seems to work fine (since it expects a closure but gets a string, I think).
---
 docs/en/02_Developer_Guides/08_Performance/01_Caching.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/02_Developer_Guides/08_Performance/01_Caching.md b/docs/en/02_Developer_Guides/08_Performance/01_Caching.md
index 35b8fb181..485137271 100644
--- a/docs/en/02_Developer_Guides/08_Performance/01_Caching.md
+++ b/docs/en/02_Developer_Guides/08_Performance/01_Caching.md
@@ -125,7 +125,7 @@ To use this backend, you need a memcached daemon and the memcache PECL extension
 				'timeout' => 5,
 				'retry_interval' => 15, 
 				'status' => true, 
-				'failure_callback' => ''
+				'failure_callback' => null
 			)
 		)
 	);

From febbd35b51431557ae43a398cb695b18f45f011f Mon Sep 17 00:00:00 2001
From: David Alexander <david@spiritlevel.nz>
Date: Wed, 17 Feb 2016 02:26:06 -0700
Subject: [PATCH 02/30] DOCS 3.1 : fixing api: links

missed one
---
 .../01_Installation/05_Common_Problems.md     |  2 +-
 .../01_Tutorials/02_Extending_A_Basic_Site.md | 32 +++----
 docs/en/01_Tutorials/03_Forms.md              | 26 +++---
 docs/en/01_Tutorials/04_Site_Search.md        |  2 +-
 .../05_Dataobject_Relationship_Management.md  |  4 +-
 .../00_Model/01_Data_Model_and_ORM.md         |  4 +-
 .../00_Model/02_Relations.md                  |  2 +-
 .../00_Model/08_SQL_Query.md                  |  4 +-
 .../00_Model/10_Versioning.md                 | 10 +-
 .../00_Model/11_Scaffolding.md                |  2 +-
 .../How_Tos/Dynamic_Default_Fields.md         |  2 +-
 .../How_Tos/Grouping_DataObject_Sets.md       |  8 +-
 .../01_Templates/02_Common_Variables.md       |  8 +-
 .../01_Templates/03_Requirements.md           |  2 +-
 .../01_Templates/09_Casting.md                |  2 +-
 .../01_Templates/How_Tos/02_Pagination.md     |  6 +-
 .../02_Controllers/01_Introduction.md         |  2 +-
 .../02_Controllers/02_Routing.md              |  2 +-
 .../03_Forms/00_Introduction.md               |  2 +-
 .../03_Forms/01_Validation.md                 |  6 +-
 .../Field_types/01_Common_Subclasses.md       | 92 +++++++++----------
 .../Field_types/03_HTMLEditorField.md         | 32 +++----
 .../03_Forms/Field_types/04_GridField.md      |  4 +-
 .../03_Forms/Field_types/05_UploadField.md    |  2 +-
 ...tact_Form.md => 05_Simple_Contact_Form.md} |  6 +-
 .../04_Configuration/00_Configuration.md      |  4 +-
 .../04_Configuration/01_SiteConfig.md         |  2 +-
 .../05_Extending/01_Extensions.md             |  6 +-
 .../05_Extending/04_Shortcodes.md             |  2 +-
 .../06_Testing/00_Unit_Testing.md             |  2 +-
 .../06_Testing/04_Fixtures.md                 |  4 +-
 .../How_Tos/00_Write_a_SapphireTest.md        |  2 +-
 .../06_Testing/How_Tos/03_Testing_Email.md    |  6 +-
 .../02_Developer_Guides/06_Testing/index.md   |  4 +-
 .../07_Debugging/00_Environment_Types.md      |  2 +-
 .../07_Debugging/02_URL_Variable_Tools.md     |  2 +-
 .../08_Performance/00_Partial_Caching.md      |  2 +-
 .../08_Performance/01_Caching.md              | 12 +--
 .../08_Performance/02_HTTP_Cache_Headers.md   |  4 +-
 .../09_Security/00_Member.md                  | 28 +++---
 .../09_Security/01_Access_Control.md          | 12 +--
 .../09_Security/02_Permissions.md             |  4 +-
 .../09_Security/03_Authentication.md          | 18 ++--
 .../09_Security/04_Secure_Coding.md           | 18 ++--
 .../11_Integration/00_CSV_Import.md           |  4 +-
 .../11_Integration/01_RestfulService.md       |  6 +-
 .../11_Integration/02_RSSFeed.md              | 16 ++--
 .../11_Integration/How_Tos/embed_rss.md       |  4 +-
 .../12_Search/02_FulltextSearch.md            |  6 +-
 docs/en/02_Developer_Guides/13_i18n/index.md  |  4 +-
 .../02_Developer_Guides/14_Files/01_Image.md  | 12 +--
 docs/en/02_Developer_Guides/14_Files/index.md |  2 +-
 .../01_ModelAdmin.md                          |  6 +-
 .../05_CMS_Architecture.md                    | 46 +++++-----
 .../06_Javascript_Development.md              |  6 +-
 .../How_Tos/Customise_CMS_Menu.md             |  8 +-
 .../How_Tos/Customise_CMS_Pages_List.md       |  6 +-
 .../How_Tos/Customise_CMS_Tree.md             | 12 +--
 .../How_Tos/Customise_Site_Reports.md         |  2 +-
 .../Extending_An_Existing_ModelAdmin.md       |  4 +-
 .../16_Execution_Pipeline/01_Flushable.md     |  8 +-
 .../16_Execution_Pipeline/02_Manifests.md     | 18 ++--
 .../16_Execution_Pipeline/index.md            | 12 +--
 docs/en/05_Contributing/02_Release_Process.md |  2 +-
 docs/en/index.md                              |  2 +-
 65 files changed, 292 insertions(+), 292 deletions(-)
 rename docs/en/02_Developer_Guides/03_Forms/How_Tos/{Simple_Contact_Form.md => 05_Simple_Contact_Form.md} (92%)

diff --git a/docs/en/00_Getting_Started/01_Installation/05_Common_Problems.md b/docs/en/00_Getting_Started/01_Installation/05_Common_Problems.md
index d40229792..5e3315767 100644
--- a/docs/en/00_Getting_Started/01_Installation/05_Common_Problems.md
+++ b/docs/en/00_Getting_Started/01_Installation/05_Common_Problems.md
@@ -71,7 +71,7 @@ every page on the site, if that's easier.
 
 ## I can see unparsed PHP output in my browser
 
-Please make sure all code inside `*.php` files is wrapped in classes. Due to the way `[api:ManifestBuilder]`
+Please make sure all code inside `*.php` files is wrapped in classes. Due to the way [api:ManifestBuilder]
 includes all files with this extension, any **procedural code will be executed on every call**. The most common error here
 is putting a test.php/phpinfo.php file in the document root. See [datamodel](/developer_guides/model/data_model_and_orm) and [controllers](/developer_guides/controllers)
 for ways how to structure your code.
diff --git a/docs/en/01_Tutorials/02_Extending_A_Basic_Site.md b/docs/en/01_Tutorials/02_Extending_A_Basic_Site.md
index 499dea2be..699d1d3b0 100644
--- a/docs/en/01_Tutorials/02_Extending_A_Basic_Site.md
+++ b/docs/en/01_Tutorials/02_Extending_A_Basic_Site.md
@@ -36,11 +36,11 @@ final page. Lets look at each one individually:
 
 ### Model
 
-All content on our site is stored in a database. Each class that is a child of the `[api:DataObject]` class will have its own table in our database. 
+All content on our site is stored in a database. Each class that is a child of the [api:DataObject] class will have its own table in our database. 
 
 Every object of such a class will correspond to a row in that table -
 this is our "data object", the **"model"** of Model-View-Controller. A page type has a data object that represents all the data for our page. Rather than inheriting 
-directly from `[api:DataObject]`, it inherits from `[api:SiteTree]`.  We generally create a "Page" data object, and subclass this for all other page types. This allows us to define behavior that is consistent across all pages in our site.
+directly from [api:DataObject], it inherits from [api:SiteTree].  We generally create a "Page" data object, and subclass this for all other page types. This allows us to define behavior that is consistent across all pages in our site.
 
 ### View
 
@@ -49,7 +49,7 @@ presentation of our website.
 
 ### Controller
 
-Each page type also has a **"controller"**. The controller contains all the code used to manipulate our data before it is rendered. For example, suppose we were making an auction site, and we only wanted to display the auctions closing in the next ten minutes. We would implement this logic in the controller. The controller for a page should inherit from `[api:ContentController]`. Just as we create a "Page" data object and subclass it for the rest of the site, we also create a "Page_Controller" that is subclassed.
+Each page type also has a **"controller"**. The controller contains all the code used to manipulate our data before it is rendered. For example, suppose we were making an auction site, and we only wanted to display the auctions closing in the next ten minutes. We would implement this logic in the controller. The controller for a page should inherit from [api:ContentController]. Just as we create a "Page" data object and subclass it for the rest of the site, we also create a "Page_Controller" that is subclassed.
 
 
 Creating a new page type requires creating each of these three elements. We will then have full control over presentation, the database, and editable CMS fields. 
@@ -95,7 +95,7 @@ Let's create the *ArticleHolder* page type.
 Here we have done something interesting: the *$allowed_children* field. This is one of a number of static fields we can define to change the properties of a page type. The *$allowed_children* field is an array of page types that are allowed
 to be children of the page in the site tree. As we only want **news articles** in the news section, we only want pages of the type *ArticlePage* as children. We can enforce this in the CMS by setting the *$allowed_children* field within this class.
 
-We will be introduced to other fields like this as we progress; there is a full list in the documentation for `[api:SiteTree]`.
+We will be introduced to other fields like this as we progress; there is a full list in the documentation for [api:SiteTree].
 
 Now that we have created our page types, we need to let SilverStripe rebuild the database: [http://localhost/your_site_name/dev/build](http://localhost/your_site_name/dev/build). SilverStripe should detect that there are two new page types, and add them to the list of page types in the database.
 
@@ -162,7 +162,7 @@ Let's walk through this method.
 
 
 Firstly, we get the fields from the parent class; we want to add fields, not replace them. The *$fields* variable
-returned is a `[api:FieldList]` object.
+returned is a [api:FieldList] object.
 
 	:::php
 	$fields->addFieldToTab('Root.Main', new TextField('Author'), 'Content');
@@ -170,14 +170,14 @@ returned is a `[api:FieldList]` object.
 
 
 We can then add our new fields with *addFieldToTab*. The first argument is the tab on which we want to add the field to:
-"Root.Main" is the tab which the content editor is on. The second argument is the field to add; this is not a database field, but a `[api:FormField]` - see the documentation for more details. 
+"Root.Main" is the tab which the content editor is on. The second argument is the field to add; this is not a database field, but a [api:FormField] - see the documentation for more details. 
 
 <div class="hint" markdown="1">
 Note: By default, the CMS only has one tab. Creating new tabs is much like adding to existing tabs. For instance: `$fields->addFieldToTab('Root.NewTab', new TextField('Author'));`
 would create a new tab called "New Tab", and a single "Author" textfield inside.
 </div>
 
-We have added two fields: A simple `[api:TextField]` and a `[api:DateField]`.   
+We have added two fields: A simple [api:TextField] and a [api:DateField]. 
 There are many more fields available in the default installation, listed in ["form field types"](/developer_guides/forms/field_types/common_subclasses).
 
 	:::php
@@ -232,7 +232,7 @@ By enabling *showCalendar* you show a calendar overlay when clicking on the fiel
 	:::php
 	$dateField->setConfig('dateformat', 'dd/MM/YYYY');
 
-*dateFormat* allows you to specify how you wish the date to be entered and displayed in the CMS field.  See the `[api:DateField]` documentation for more configuration options.
+*dateFormat* allows you to specify how you wish the date to be entered and displayed in the CMS field.  See the [api:DateField] documentation for more configuration options.
 
 	:::php
 	$fields->addFieldToTab('Root.Main', new TextField('Author', 'Author Name'), 'Content');
@@ -269,13 +269,13 @@ First, the template for displaying a single article:
 
 Most of the code is just like the regular Page.ss, we include an informational div with the date and the author of the Article.
 
-To access the new fields, we use *$Date* and *$Author*. In fact, all template variables and page controls come from either the data object or the controller for the page being displayed. The *$Title* variable comes from the *Title* field of the `[api:SiteTree]` class. *$Date* and *$Author* come from the *ArticlePage* table through your custom Page. *$Content* comes from the *SiteTree* table through the same data object. The data for your page is
+To access the new fields, we use *$Date* and *$Author*. In fact, all template variables and page controls come from either the data object or the controller for the page being displayed. The *$Title* variable comes from the *Title* field of the [api:SiteTree] class. *$Date* and *$Author* come from the *ArticlePage* table through your custom Page. *$Content* comes from the *SiteTree* table through the same data object. The data for your page is
 spread across several tables in the database matched by id - e.g. *Content* is in the *SiteTree* table, and *Date* and
 *Author* are in the *ArticlePage* table. SilverStripe matches this data, and collates it into a single data object.
 
 ![](../_images/tutorial2_data-collation.jpg)
 
-Rather than using *$Date* directly, we use *$Date.Nice*. If we look in the `[api:Date]` documentation, we can see
+Rather than using *$Date* directly, we use *$Date.Nice*. If we look in the [api:Date] documentation, we can see
 that the *Nice* function returns the date in *dd/mm/yyyy* format, rather than the *yyyy-mm-dd* format stored in the
 database.
 
@@ -305,7 +305,7 @@ We'll now create a template for the article holder. We want our news section to
 	</div>
 
 
-Here we use the page control *Children*. As the name suggests, this control allows you to iterate over the children of a page. In this case, the children are our news articles. The *$Link* variable will give the address of the article which we can use to create a link, and the *FirstParagraph* function of the `[api:HTMLText]` field gives us a nice summary of the article. The function strips all tags from the paragraph extracted.
+Here we use the page control *Children*. As the name suggests, this control allows you to iterate over the children of a page. In this case, the children are our news articles. The *$Link* variable will give the address of the article which we can use to create a link, and the *FirstParagraph* function of the [api:HTMLText] field gives us a nice summary of the article. The function strips all tags from the paragraph extracted.
 
 ![](../_images/tutorial2_articleholder.jpg)
 
@@ -398,7 +398,7 @@ The controller for a page is only created when page is actually visited, while t
 
 ## Creating a RSS feed
 
-An RSS feed is something that no news section should be without. SilverStripe makes it easy to create RSS feeds by providing an `[api:RSSFeed]` class to do all the hard work for us. Add the following in the *ArticleHolder_Controller* class:
+An RSS feed is something that no news section should be without. SilverStripe makes it easy to create RSS feeds by providing an [api:RSSFeed] class to do all the hard work for us. Add the following in the *ArticleHolder_Controller* class:
 
 **mysite/code/ArticleHolder.php**
 
@@ -418,7 +418,7 @@ Ensure that when you have input the code to implement an RSS feed; flush the web
 
 This function creates an RSS feed of all the news articles, and outputs it to the browser. If we go to [http://localhost/your_site_name/news/rss](http://localhost/your_site_name/news/rss) we should see our RSS feed. When there is more to a URL after a page's base URL, "rss" in this case, SilverStripe will call the function with that name on the controller if it exists.
 
-Depending on your browser, you should see something like the picture below. If your browser doesn't support RSS, you will most likely see the XML output instead. For more on RSS, see `[api:RSSFeed]`
+Depending on your browser, you should see something like the picture below. If your browser doesn't support RSS, you will most likely see the XML output instead. For more on RSS, see [api:RSSFeed]
 
 ![](../_images/tutorial2_rss-feed.jpg)
 
@@ -483,7 +483,7 @@ Nothing here should be new. The *StaffPage* page type is more interesting though
 
 Instead of adding our *Image* as a field in *$db*, we have used the *$has_one* array. This is because an *Image* is not a simple database field like all the fields we have seen so far, but has its own database table. By using the *$has_one* array, we create a relationship between the *StaffPage* table and the *Image* table by storing the id of the respective *Image* in the *StaffPage* table.
 
-We then add an `[api:UploadField]` in the *getCMSFields* function to the tab "Root.Images". Since this tab doesn't exist,
+We then add an [api:UploadField] in the *getCMSFields* function to the tab "Root.Images". Since this tab doesn't exist,
 the *addFieldToTab* function will create it for us. The *UploadField* allows us to select an image or upload a new one in
 the CMS.
 
@@ -497,7 +497,7 @@ a new *StaffHolder* called "Staff", and create some *StaffPage*s in it.
 
 ### Creating the staff section templates
 
-The staff section templates aren't too difficult to create, thanks to the utility methods provided by the `[api:Image]` class.
+The staff section templates aren't too difficult to create, thanks to the utility methods provided by the [api:Image] class.
 
 **themes/simple/templates/Layout/StaffHolder.ss**
 
@@ -521,7 +521,7 @@ The staff section templates aren't too difficult to create, thanks to the utilit
 	</div>
 
 
-This template is very similar to the *ArticleHolder* template. The *SetWidth* method of the `[api:Image]` class
+This template is very similar to the *ArticleHolder* template. The *SetWidth* method of the [api:Image] class
 will resize the image before sending it to the browser. The resized image is cached, so the server doesn't have to
 resize the image every time the page is viewed.
 
diff --git a/docs/en/01_Tutorials/03_Forms.md b/docs/en/01_Tutorials/03_Forms.md
index b88756e69..bb7d4b936 100644
--- a/docs/en/01_Tutorials/03_Forms.md
+++ b/docs/en/01_Tutorials/03_Forms.md
@@ -74,11 +74,11 @@ Let's step through this code.
 ```
 
 First we create our form fields. 
-We do this by creating a `[api:FieldList]` and passing our fields as arguments. 
-The first field is a `[api:TextField]` with the name 'Name'.
+We do this by creating a [api:FieldList] and passing our fields as arguments. 
+The first field is a [api:TextField] with the name 'Name'.
 There is a second argument when creating a field which specifies the text on the label of the field. If no second
 argument is passed, as in this case, it is assumed the label is the same as the name of the field.
-The second field we create is an `[api:OptionsetField]`. This is a dropdown, and takes a third argument - an
+The second field we create is an [api:OptionsetField]. This is a dropdown, and takes a third argument - an
 array mapping the values to the options listed in the dropdown.
 
 	```php
@@ -90,14 +90,14 @@ array mapping the values to the options listed in the dropdown.
 After creating the fields, we create the form actions. Form actions appear as buttons at the bottom of the form. 
 The first argument is the name of the function to call when the button is pressed, and the second is the label of the button.
 Here we create a 'Submit' button which calls the 'doBrowserPoll' method, which we will create later.
-All the form actions (in this case only one) are collected into a `[api:FieldList]` object the same way we did with
+All the form actions (in this case only one) are collected into a [api:FieldList] object the same way we did with
 the fields.
 
 ```php
 	return new Form($this, 'BrowserPollForm', $fields, $actions);
 ```
 
-Finally we create the `[api:Form]` object and return it.
+Finally we create the [api:Form] object and return it.
 The first argument is the controller that contains the form, in most cases '$this'. The second is the name of the method
 that returns the form, which is 'BrowserPollForm' in our case. The third and fourth arguments are the
 FieldLists containing the fields and form actions respectively.
@@ -178,8 +178,8 @@ All going according to plan, if you visit [http://localhost/your_site_name/home/
 
 Great! We now have a browser poll form, but it doesn't actually do anything. In order to make the form work, we have to implement the 'doBrowserPoll()' method that we told it about.
 
-First, we need some way of saving the poll submissions to the database, so we can retrieve the results later. We can do this by creating a new object that extends from `[api:DataObject]`.
-If you recall, in the [second tutorial](/tutorials/extending_a_basic_site) we said that all objects that inherit from DataObject and have their own fields are stored in tables the database. Also recall that all pages extend DataObject indirectly through `[api:SiteTree]`. Here instead of extending SiteTree (or `[api:Page]`) to create a page type, we will extend `[api:DataObject]` directly:
+First, we need some way of saving the poll submissions to the database, so we can retrieve the results later. We can do this by creating a new object that extends from [api:DataObject].
+If you recall, in the [second tutorial](/tutorials/extending_a_basic_site) we said that all objects that inherit from DataObject and have their own fields are stored in tables the database. Also recall that all pages extend DataObject indirectly through [api:SiteTree]. Here instead of extending SiteTree (or [api:Page]) to create a page type, we will extend [api:DataObject] directly:
 
 **mysite/code/BrowserPollSubmission.php**
 
@@ -208,7 +208,7 @@ If we then rebuild the database ([http://localhost/your_site_name/dev/build](htt
 	}
 ```
 
-A function that processes a form submission takes two arguments - the first is the data in the form, the second is the `[api:Form]` object.
+A function that processes a form submission takes two arguments - the first is the data in the form, the second is the [api:Form] object.
 In our function we create a new *BrowserPollSubmission* object. Since the name of our form fields, and the name of the database fields, are the same we can save the form directly into the data object.
 We call the 'write' method to write our data to the database, and '$this->redirectBack()' will redirect the user back to the home page.
 
@@ -240,7 +240,7 @@ If we then open the homepage and attempt to submit the form without filling in t
 Now that we have a working form, we need some way of showing the results.
 The first thing to do is make it so a user can only vote once per session. If the user hasn't voted, show the form, otherwise show the results.
 
-We can do this using a session variable. The `[api:Session]` class handles all session variables in SilverStripe. First modify the 'doBrowserPoll' to set the session variable 'BrowserPollVoted' when a user votes.
+We can do this using a session variable. The [api:Session] class handles all session variables in SilverStripe. First modify the 'doBrowserPoll' to set the session variable 'BrowserPollVoted' when a user votes.
 
 **mysite/code/HomePage.php**
 
@@ -279,7 +279,7 @@ Although the form is not shown, you'll still see the 'Browser Poll' heading. We'
 
 Now that we're collecting data, it would be nice to show the results on the website as well. We could simply output every vote, but that's boring. Let's group the results by browser, through the SilverStripe data model.
 
-In the [second tutorial](/tutorials/extending_a_basic_site), we got a collection of news articles for the home page by using the 'ArticleHolder::get()' function, which returns a `[api:DataList]`. We can get all submissions in the same fashion, through `BrowserPollSubmission::get()`. This list will be the starting point for our result aggregation.
+In the [second tutorial](/tutorials/extending_a_basic_site), we got a collection of news articles for the home page by using the 'ArticleHolder::get()' function, which returns a [api:DataList]. We can get all submissions in the same fashion, through `BrowserPollSubmission::get()`. This list will be the starting point for our result aggregation.
 
 Create the function 'BrowserPollResults' on the *HomePage_Controller* class.
 
@@ -306,7 +306,7 @@ This code introduces a few new concepts, so let's step through it.
 	```php
 	$submissions = new GroupedList(BrowserPollSubmission::get());
 ```
-First we get all of the `BrowserPollSubmission` records from the database. This returns the submissions as a `[api:DataList]`.Then we wrap it inside a `[api:GroupedList]`, which adds the ability to group those records. The resulting object will behave just like the original `DataList`, though (with the addition of a `groupBy()` method). 
+First we get all of the `BrowserPollSubmission` records from the database. This returns the submissions as a [api:DataList].Then we wrap it inside a [api:GroupedList], which adds the ability to group those records. The resulting object will behave just like the original `DataList`, though (with the addition of a `groupBy()` method). 
 
 ```php
 	$total = $submissions->Count();
@@ -324,9 +324,9 @@ We get the total number of submissions, which is needed to calculate the percent
 	}
 ```
 
-Now we create an empty `[api:ArrayList]` to hold the data we'll pass to the template. Its similar to `[api:DataList]`, but can hold arbitrary objects rather than just DataObject` instances. Then we iterate over the 'Browser' submissions field. 
+Now we create an empty [api:ArrayList] to hold the data we'll pass to the template. Its similar to [api:DataList], but can hold arbitrary objects rather than just DataObject` instances. Then we iterate over the 'Browser' submissions field. 
 
-The `groupBy()` method splits our list by the 'Browser' field passed to it, creating new lists with submissions just for a specific browser. Each of those lists is keyed by the browser name. The aggregated result is then contained in an `[api:ArrayData]` object, which behaves much like a standard PHP array, but allows us to use it in SilverStripe templates.
+The `groupBy()` method splits our list by the 'Browser' field passed to it, creating new lists with submissions just for a specific browser. Each of those lists is keyed by the browser name. The aggregated result is then contained in an [api:ArrayData] object, which behaves much like a standard PHP array, but allows us to use it in SilverStripe templates.
 
 
 The final step is to create the template to display our data. Change the 'BrowserPoll' div to the below.
diff --git a/docs/en/01_Tutorials/04_Site_Search.md b/docs/en/01_Tutorials/04_Site_Search.md
index 1d12c908e..a5db20590 100644
--- a/docs/en/01_Tutorials/04_Site_Search.md
+++ b/docs/en/01_Tutorials/04_Site_Search.md
@@ -92,7 +92,7 @@ function, and then attempt to render it with *Page_results.ss*, falling back to
 ## Creating the template
 
 Lastly we need the template for the search page. This template uses all the same techniques used in previous
-tutorials. It also uses a number of pagination variables, which are provided by the `[api:PaginatedList]`
+tutorials. It also uses a number of pagination variables, which are provided by the [api:PaginatedList]
 class.
 
 *themes/simple/templates/Layout/Page_results.ss*
diff --git a/docs/en/01_Tutorials/05_Dataobject_Relationship_Management.md b/docs/en/01_Tutorials/05_Dataobject_Relationship_Management.md
index 003a91856..c52e6f576 100644
--- a/docs/en/01_Tutorials/05_Dataobject_Relationship_Management.md
+++ b/docs/en/01_Tutorials/05_Dataobject_Relationship_Management.md
@@ -160,7 +160,7 @@ It's empty by default, but you can add new students as required,
 or relate them to the project by typing in the box above the table.
 
 In our case, we want to manage those records, edit their details, and add new ones. 
-To accomplish this, we have added a specific `[api:GridFieldConfig]`.
+To accomplish this, we have added a specific [api:GridFieldConfig].
 While we could've built the config from scratch, there's several
 preconfigured instances. The `GridFieldConfig_RecordEditor` default configures
 the field to edit records, rather than just viewing them.
@@ -427,4 +427,4 @@ we suggest some excercises to make the solution more flexible:
    and avoid any duplication between the two subclasses.
  * Render mentor details in their own template
  * Change the `GridField` to list only five records per page (the default is 20).
-   This configuration is stored in the `[api:GridFieldPaginator]` component
+   This configuration is stored in the [api:GridFieldPaginator] component
diff --git a/docs/en/02_Developer_Guides/00_Model/01_Data_Model_and_ORM.md b/docs/en/02_Developer_Guides/00_Model/01_Data_Model_and_ORM.md
index 9b06821ce..105f19879 100644
--- a/docs/en/02_Developer_Guides/00_Model/01_Data_Model_and_ORM.md
+++ b/docs/en/02_Developer_Guides/00_Model/01_Data_Model_and_ORM.md
@@ -461,7 +461,7 @@ Occasionally, the system described above won't let you do exactly what you need
 methods that manipulate the SQL query at a lower level.  When using these, please ensure that all table and field names 
 are escaped with double quotes, otherwise some DB backends (e.g. PostgreSQL) won't work.
 
-Under the hood, query generation is handled by the `[api:DataQuery]` class. This class does provide more direct access 
+Under the hood, query generation is handled by the [api:DataQuery] class. This class does provide more direct access 
 to certain SQL features that `DataList` abstracts away from you.
 
 In general, we advise against using these methods unless it's absolutely necessary. If the ORM doesn't do quite what 
@@ -573,7 +573,7 @@ sub-classes of the base class (including the base class itself).
 example above, NewsSection didn't have its own data, so an extra table would be redundant.
 
 *  In all the tables, ID is the primary key.  A matching ID number is used for all parts of a particular record: 
-record #2 in Page refers to the same object as record #2 in `[api:SiteTree]`.
+record #2 in Page refers to the same object as record #2 in [api:SiteTree].
 
 To retrieve a news article, SilverStripe joins the [api:SiteTree], [api:Page] and NewsPage tables by their ID fields. 
 
diff --git a/docs/en/02_Developer_Guides/00_Model/02_Relations.md b/docs/en/02_Developer_Guides/00_Model/02_Relations.md
index e07ec169b..32580aa68 100644
--- a/docs/en/02_Developer_Guides/00_Model/02_Relations.md
+++ b/docs/en/02_Developer_Guides/00_Model/02_Relations.md
@@ -232,7 +232,7 @@ and `remove()` method.
 You can use the ORM to get a filtered result list without writing any SQL. For example, this snippet gets you the 
 "Players"-relation on a team, but only containing active players.
 
-See `[api:DataObject::$has_many]` for more info on the described relations.
+See [api:DataObject::$has_many] for more info on the described relations.
 
 	:::php
 	<?php
diff --git a/docs/en/02_Developer_Guides/00_Model/08_SQL_Query.md b/docs/en/02_Developer_Guides/00_Model/08_SQL_Query.md
index 74dc687ad..abad6b8b0 100644
--- a/docs/en/02_Developer_Guides/00_Model/08_SQL_Query.md
+++ b/docs/en/02_Developer_Guides/00_Model/08_SQL_Query.md
@@ -55,7 +55,7 @@ the ORM creates.
 		echo $row['BirthYear'];
 	}
 
-The `$result` is an array lightly wrapped in a database-specific subclass of `[api:Query]`. This class implements the 
+The `$result` is an array lightly wrapped in a database-specific subclass of [api:Query]. This class implements the 
 *Iterator*-interface, and provides convenience-methods for accessing the data.
 
 ### Delete
@@ -111,4 +111,4 @@ Creates a map based on the first two columns of the query result.
 * [api:SQLQuery]
 * [api:DB]
 * [api:Query]
-* [api:Database]
\ No newline at end of file
+* [api:Database]
diff --git a/docs/en/02_Developer_Guides/00_Model/10_Versioning.md b/docs/en/02_Developer_Guides/00_Model/10_Versioning.md
index b344df6d2..60e089e8d 100644
--- a/docs/en/02_Developer_Guides/00_Model/10_Versioning.md
+++ b/docs/en/02_Developer_Guides/00_Model/10_Versioning.md
@@ -10,7 +10,7 @@ It is most commonly applied to pages in the CMS (the `SiteTree` class). Draft co
 from published content shown to your website visitors. 
 
 Versioning in SilverStripe is handled through the [api:Versioned] class. As a [api:DataExtension] it is possible to 
-be applied to any `[api:DataObject]` subclass. The extension class will automatically update read and write operations
+be applied to any [api:DataObject] subclass. The extension class will automatically update read and write operations
 done via the ORM via the `augmentSQL` database hook.
 
 Adding Versioned to your `DataObject` subclass works the same as any other extension. It accepts two or more arguments 
@@ -77,7 +77,7 @@ The record is retrieved as a `DataObject`, but saving back modifications via `wr
 rather than modifying the existing one.
 </div>
 
-In order to get a list of all versions for a specific record, we need to generate specialized `[api:Versioned_Version]` 
+In order to get a list of all versions for a specific record, we need to generate specialized [api:Versioned_Version] 
 objects, which expose the same database information as a `DataObject`, but also include information about when and how 
 a record was published.
 	
@@ -90,9 +90,9 @@ a record was published.
 
 The usual call to `DataObject->write()` will write to whatever stage is currently active, as defined by the 
 `Versioned::current_stage()` global setting. Each call will automatically create a new version in the 
-`<class>_versions` table. To avoid this, use `[writeWithoutVersion()](api:Versioned->writeWithoutVersion())` instead.
+`<class>_versions` table. To avoid this, use [api:Versioned::writeWithoutVersion()] instead.
 
-To move a saved version from one stage to another, call `[writeToStage(<stage>)](api:Versioned->writeToStage())` on the 
+To move a saved version from one stage to another, call [writeToStage(<stage>)](api:Versioned->writeToStage()) on the 
 object. The process of moving a version to a different stage is also called "publishing", so we've created a shortcut 
 for this: `publish(<from-stage>, <to-stage>)`.
 
@@ -127,7 +127,7 @@ is initialized. But it can also be set and reset temporarily to force a specific
 ### Custom SQL
 
 We generally discourage writing `Versioned` queries from scratch, due to the complexities involved through joining 
-multiple tables across an inherited table scheme (see `[api:Versioned->augmentSQL()]`). If possible, try to stick to 
+multiple tables across an inherited table scheme (see [api:Versioned::augmentSQL()]). If possible, try to stick to 
 smaller modifications of the generated `DataList` objects.
 
 Example: Get the first 10 live records, filtered by creation date:
diff --git a/docs/en/02_Developer_Guides/00_Model/11_Scaffolding.md b/docs/en/02_Developer_Guides/00_Model/11_Scaffolding.md
index f66d57d15..ef0f8ddf3 100644
--- a/docs/en/02_Developer_Guides/00_Model/11_Scaffolding.md
+++ b/docs/en/02_Developer_Guides/00_Model/11_Scaffolding.md
@@ -146,7 +146,7 @@ To include relations (`$has_one`, `$has_many` and `$many_many`) in your search,
 ### Summary Fields
 
 Summary fields can be used to show a quick overview of the data for a specific [api:DataObject] record. The most common use 
-is their display as table columns, e.g. in the search results of a `[api:ModelAdmin]` CMS interface.
+is their display as table columns, e.g. in the search results of a [api:ModelAdmin] CMS interface.
 
 	:::php
 	<?php
diff --git a/docs/en/02_Developer_Guides/00_Model/How_Tos/Dynamic_Default_Fields.md b/docs/en/02_Developer_Guides/00_Model/How_Tos/Dynamic_Default_Fields.md
index ef662bcef..6622fcf1a 100644
--- a/docs/en/02_Developer_Guides/00_Model/How_Tos/Dynamic_Default_Fields.md
+++ b/docs/en/02_Developer_Guides/00_Model/How_Tos/Dynamic_Default_Fields.md
@@ -2,7 +2,7 @@
 
 The [api:DataObject::$defaults] array allows you to specify simple static values to be the default values when a
 record is created, but in many situations default values need to be dynamically calculated. In order to do this, the
-[api:DataObject->populateDefaults()] method will need to be overloaded.
+[api:DataObject::populateDefaults()] method will need to be overloaded.
 
 This method is called whenever a new record is instantiated, and you must be sure to call the method on the parent
 object!
diff --git a/docs/en/02_Developer_Guides/00_Model/How_Tos/Grouping_DataObject_Sets.md b/docs/en/02_Developer_Guides/00_Model/How_Tos/Grouping_DataObject_Sets.md
index 5effa4379..85b12ed40 100644
--- a/docs/en/02_Developer_Guides/00_Model/How_Tos/Grouping_DataObject_Sets.md
+++ b/docs/en/02_Developer_Guides/00_Model/How_Tos/Grouping_DataObject_Sets.md
@@ -6,8 +6,8 @@ These lists can get quite long, and hard to present on a single list.
 by splitting up the list into multiple pages.
 
 In this howto, we present an alternative to pagination: 
-Grouping a list by various criteria, through the `[api:GroupedList]` class.
-This class is a `[api:SS_ListDecorator]`, which means it wraps around a list,
+Grouping a list by various criteria, through the [api:GroupedList] class.
+This class is a [api:SS_ListDecorator], which means it wraps around a list,
 adding new functionality. 
 
 It provides a `groupBy()` method, which takes a field name, and breaks up the managed list 
@@ -88,7 +88,7 @@ In this case, the `getTitleFirstLetter()` method defined earlier is used to brea
 Grouping a set by month is a very similar process. 
 The only difference would be to sort the records by month name, and
 then create a method on the DataObject that returns the month name, 
-and pass that to the [api:GroupedList->GroupedBy()] call.
+and pass that to the [api:GroupedList::GroupedBy()] call.
 
 We're reusing our example `Module` object,
 but grouping by its built-in `Created` property instead,
@@ -128,7 +128,7 @@ sorted by month name from January to December. This can be accomplshed by sortin
 	
 	}
 
-The final step is the render this into the template using the [api:GroupedList->GroupedBy()] method.
+The final step is the render this into the template using the [api:GroupedList::GroupedBy()] method.
 
 	:::ss
 	// Modules list grouped by the Month Posted
diff --git a/docs/en/02_Developer_Guides/01_Templates/02_Common_Variables.md b/docs/en/02_Developer_Guides/01_Templates/02_Common_Variables.md
index 9454dcc56..256e3ad62 100644
--- a/docs/en/02_Developer_Guides/01_Templates/02_Common_Variables.md
+++ b/docs/en/02_Developer_Guides/01_Templates/02_Common_Variables.md
@@ -403,7 +403,7 @@ You can add your own forms by implementing new form instances (see the [Forms tu
 
 ## API Documentation
 
- * `[api:ContentController]`: The main controller responsible for handling pages.
- * `[api:Controller]`: Generic controller (not specific to pages.)
- * `[api:DataObject]`: Underlying model class for page objects.
- * `[api:ViewableData]`: Underlying object class for pretty much anything displayable.
+ * [api:ContentController]: The main controller responsible for handling pages.
+ * [api:Controller]: Generic controller (not specific to pages.)
+ * [api:DataObject]: Underlying model class for page objects.
+ * [api:ViewableData]: Underlying object class for pretty much anything displayable.
diff --git a/docs/en/02_Developer_Guides/01_Templates/03_Requirements.md b/docs/en/02_Developer_Guides/01_Templates/03_Requirements.md
index 5a792fa0d..fdb6085bd 100644
--- a/docs/en/02_Developer_Guides/01_Templates/03_Requirements.md
+++ b/docs/en/02_Developer_Guides/01_Templates/03_Requirements.md
@@ -23,7 +23,7 @@ Requiring assets from the template is restricted compared to the PHP API.
 ## PHP Requirements API
 
 It is common practice to include most Requirements either in the *init()*-method of your [controller](../controllers/), or
-as close to rendering as possible (e.g. in `[api:FormField]`.
+as close to rendering as possible (e.g. in [api:FormField]).
 
 	:::php
 	<?php
diff --git a/docs/en/02_Developer_Guides/01_Templates/09_Casting.md b/docs/en/02_Developer_Guides/01_Templates/09_Casting.md
index d93a85581..617c07b90 100644
--- a/docs/en/02_Developer_Guides/01_Templates/09_Casting.md
+++ b/docs/en/02_Developer_Guides/01_Templates/09_Casting.md
@@ -98,7 +98,7 @@ this purpose.
 There's some exceptions to this rule, see the ["security" guide](../security).
 </div>
 
-In case you want to explicitly allow un-escaped HTML input, the property can be cast as `[api:HTMLText]`. The following 
+In case you want to explicitly allow un-escaped HTML input, the property can be cast as [api:HTMLText]. The following 
 example takes the `Content` field in a `SiteTree` class, which is of this type. It forces the content into an explicitly 
 escaped format.
 
diff --git a/docs/en/02_Developer_Guides/01_Templates/How_Tos/02_Pagination.md b/docs/en/02_Developer_Guides/01_Templates/How_Tos/02_Pagination.md
index c65d1b00c..9b9ed770c 100644
--- a/docs/en/02_Developer_Guides/01_Templates/How_Tos/02_Pagination.md
+++ b/docs/en/02_Developer_Guides/01_Templates/How_Tos/02_Pagination.md
@@ -25,8 +25,8 @@ Note that the concept of "pages" used in pagination does not necessarily mean th
 it's just a term to describe a sub-collection of the list.
 </div>
 
-There are two ways to generate pagination controls: [api:PaginatedList->Pages] and 
-[api:PaginatedList->PaginationSummary]. In this example we will use `PaginationSummary()`.
+There are two ways to generate pagination controls: [api:PaginatedList::Pages()] and 
+[api:PaginatedList::PaginationSummary()]. In this example we will use `PaginationSummary()`.
 
 The first step is to simply list the objects in the template:
 
@@ -72,7 +72,7 @@ If there is more than one page, this block will render a set of pagination contr
 
 In some situations where you are generating the list yourself, the underlying list will already contain only the items 
 that you wish to display on the current page. In this situation the automatic limiting done by [api:PaginatedList]
-will break the pagination. You can disable automatic limiting using the [api:PaginatedList->setLimitItems] method 
+will break the pagination. You can disable automatic limiting using the [api:PaginatedList::setLimitItems()] method 
 when using custom lists.
 
 	:::php
diff --git a/docs/en/02_Developer_Guides/02_Controllers/01_Introduction.md b/docs/en/02_Developer_Guides/02_Controllers/01_Introduction.md
index bba0fdd2a..aa7998b6e 100644
--- a/docs/en/02_Developer_Guides/02_Controllers/01_Introduction.md
+++ b/docs/en/02_Developer_Guides/02_Controllers/01_Introduction.md
@@ -159,7 +159,7 @@ Each controller should define a `Link()` method. This should be used to avoid ha
 	}
 
 <div class="info" markdown="1">
-The [api:Controller::join_links] is optional, but makes `Link()` more flexible by allowing an `$action` argument, and concatenates the path segments with slashes. The action should map to a method on your controller.
+The [api:Controller::join_links()] is optional, but makes `Link()` more flexible by allowing an `$action` argument, and concatenates the path segments with slashes. The action should map to a method on your controller.
 </div>
 
 ## Related Documentation
diff --git a/docs/en/02_Developer_Guides/02_Controllers/02_Routing.md b/docs/en/02_Developer_Guides/02_Controllers/02_Routing.md
index 876f50809..1d24ce661 100644
--- a/docs/en/02_Developer_Guides/02_Controllers/02_Routing.md
+++ b/docs/en/02_Developer_Guides/02_Controllers/02_Routing.md
@@ -95,7 +95,7 @@ You can also fetch one parameter at a time.
 
 ## URL Patterns
 
-The `[api:RequestHandler]` class will parse all rules you specify against the following patterns. The most specific rule
+The [api:RequestHandler] class will parse all rules you specify against the following patterns. The most specific rule
 will be the one followed for the response.
 
 <div class="alert">
diff --git a/docs/en/02_Developer_Guides/03_Forms/00_Introduction.md b/docs/en/02_Developer_Guides/03_Forms/00_Introduction.md
index 43fc1b43f..78d03bea9 100644
--- a/docs/en/02_Developer_Guides/03_Forms/00_Introduction.md
+++ b/docs/en/02_Developer_Guides/03_Forms/00_Introduction.md
@@ -87,7 +87,7 @@ controller action. To grant it access through URLs, we add it to the `$allowed_a
 
 <div class="notice" markdown="1">
 Form actions (`doSayHello`), on the other hand, should _not_ be included in `$allowed_actions`; these are handled 
-separately through [api:Form::httpSubmission].
+separately through [api:Form::httpSubmission()].
 </div>
 
 
diff --git a/docs/en/02_Developer_Guides/03_Forms/01_Validation.md b/docs/en/02_Developer_Guides/03_Forms/01_Validation.md
index c3ff0caee..82ad5abd0 100644
--- a/docs/en/02_Developer_Guides/03_Forms/01_Validation.md
+++ b/docs/en/02_Developer_Guides/03_Forms/01_Validation.md
@@ -5,7 +5,7 @@ summary: Validate form data through the server side validation API.
 
 SilverStripe provides server-side form validation out of the box through the [api:Validator] class and its' child class
 [api:RequiredFields]. A single `Validator` instance is set on each `Form`. Validators are implemented as an argument to 
-the `[api:Form]` constructor or through the function `setValidator`.
+the [api:Form] constructor or through the function `setValidator`.
 
 	:::php
 	<?php
@@ -50,7 +50,7 @@ In this example we will be required to input a value for `Name` and a valid emai
 
 <div class="info" markdown="1">
 Each individual [api:FormField] instance is responsible for validating the submitted content through the 
-[api:FormField::validate] method. By default, this just checks the value exists. Fields like `EmailField` override 
+[api:FormField::validate()] method. By default, this just checks the value exists. Fields like `EmailField` override 
 `validate` to check for a specific format.
 </div>
 
@@ -192,7 +192,7 @@ classes added to each input. For Parsley we can structure the form like.
 ## Model Validation
 
 An alternative (or additional) approach to validation is to place it directly on the database model. SilverStripe 
-provides a `[api:DataObject->validate]` method to validate data at the model level. See 
+provides a [api:DataObject::validate()] method to validate data at the model level. See 
 [Data Model Validation](../model/validation). 
 
 ### Validation in the CMS
diff --git a/docs/en/02_Developer_Guides/03_Forms/Field_types/01_Common_Subclasses.md b/docs/en/02_Developer_Guides/03_Forms/Field_types/01_Common_Subclasses.md
index 443f8a3ed..aa7430642 100644
--- a/docs/en/02_Developer_Guides/03_Forms/Field_types/01_Common_Subclasses.md
+++ b/docs/en/02_Developer_Guides/03_Forms/Field_types/01_Common_Subclasses.md
@@ -3,74 +3,74 @@ summary: A table containing a list of the common FormField subclasses.
 
 # Common FormField type subclasses
 
-This is a high level overview of available `[api:FormField]` subclasses. An automatically generated list is available 
+This is a high level overview of available [api:FormField] subclasses. An automatically generated list is available 
 on the SilverStripe API documentation.
 
 ## Basic
 
- * `[api:CheckboxField]`: Single checkbox field.
- * `[api:DropdownField]`: A `<select>` tag. Can optionally save into has-one relationships.
- * `[api:ReadonlyField]`: Read-only field to display a non-editable value with a label.
- * `[api:TextareaField]`: Multi-line text field.
- * `[api:TextField]`: Single-line text field.
- * `[api:PasswordField]`: Masked input field.
+ * [api:CheckboxField]: Single checkbox field.
+ * [api:DropdownField]: A `<select>` tag. Can optionally save into has-one relationships.
+ * [api:ReadonlyField]: Read-only field to display a non-editable value with a label.
+ * [api:TextareaField]: Multi-line text field.
+ * [api:TextField]: Single-line text field.
+ * [api:PasswordField]: Masked input field.
 
 ## Actions
 
- * `[api:FormAction]`: Button element for forms, both for `<input type="submit">` and `<button>`.
- * `[api:ResetFormAction]`: Action that clears all fields on a form.
+ * [api:FormAction]: Button element for forms, both for `<input type="submit">` and `<button>`.
+ * [api:ResetFormAction]: Action that clears all fields on a form.
 
 ## Formatted input
 
- * `[api:AjaxUniqueTextField]`: Text field that automatically checks that the value entered is unique for the given set of fields in a given set of tables.
- * `[api:ConfirmedPasswordField]`: Two masked input fields, checks for matching passwords.
- * `[api:CountryDropdownField]`: A simple extension to dropdown field, pre-configured to list countries.
- * `[api:CreditCardField]`: Allows input of credit card numbers via four separate form fields, including generic validation of its numeric values.
- * `[api:CurrencyField]`: Text field, validating its input as a currency. Limited to US-centric formats, including a hardcoded currency symbol and decimal separators. 
- See `[api:MoneyField]` for a more flexible implementation.
- * `[api:DateField]`: Represents a date in a single input field, or separated into day, month, and year. Can optionally use a calendar popup.
- * `[api:DatetimeField]`: Combined date- and time field.
- * `[api:EmailField]`: Text input field with validation for correct email format according to RFC 2822.
- * `[api:GroupedDropdownField]`: Grouped dropdown, using <optgroup> tags.
- * `[api:HtmlEditorField]`: A WYSIWYG editor interface.
- * `[api:MoneyField]`: A form field that can save into a `[api:Money]` database field.
- * `[api:NumericField]`: Text input field with validation for numeric values.
- * `[api:OptionsetField]`: Set of radio buttons designed to emulate a dropdown.
- * `[api:PhoneNumberField]`: Field for displaying phone numbers. It separates the number, the area code and optionally the country code and extension.
- * `[api:SelectionGroup]`: SelectionGroup represents a number of fields which are selectable by a radio button that appears at the beginning of each item.
- * `[api:TimeField]`: Input field with time-specific, localised validation.
+ * [api:AjaxUniqueTextField]: Text field that automatically checks that the value entered is unique for the given set of fields in a given set of tables.
+ * [api:ConfirmedPasswordField]: Two masked input fields, checks for matching passwords.
+ * [api:CountryDropdownField]: A simple extension to dropdown field, pre-configured to list countries.
+ * [api:CreditCardField]: Allows input of credit card numbers via four separate form fields, including generic validation of its numeric values.
+ * [api:CurrencyField]: Text field, validating its input as a currency. Limited to US-centric formats, including a hardcoded currency symbol and decimal separators. 
+ See [api:MoneyField] for a more flexible implementation.
+ * [api:DateField]: Represents a date in a single input field, or separated into day, month, and year. Can optionally use a calendar popup.
+ * [api:DatetimeField]: Combined date- and time field.
+ * [api:EmailField]: Text input field with validation for correct email format according to RFC 2822.
+ * [api:GroupedDropdownField]: Grouped dropdown, using <optgroup> tags.
+ * [api:HtmlEditorField]: A WYSIWYG editor interface.
+ * [api:MoneyField]: A form field that can save into a [api:Money] database field.
+ * [api:NumericField]: Text input field with validation for numeric values.
+ * [api:OptionsetField]: Set of radio buttons designed to emulate a dropdown.
+ * [api:PhoneNumberField]: Field for displaying phone numbers. It separates the number, the area code and optionally the country code and extension.
+ * [api:SelectionGroup]: SelectionGroup represents a number of fields which are selectable by a radio button that appears at the beginning of each item.
+ * [api:TimeField]: Input field with time-specific, localised validation.
 
 ## Structure
 
- * `[api:CompositeField]`: Base class for all fields that contain other fields. Uses `<div>` in template, but
+ * [api:CompositeField]: Base class for all fields that contain other fields. Uses `<div>` in template, but
 doesn't necessarily have any visible styling.
- * `[api:FieldGroup] attached in CMS-context.
- * `[api:FieldList]`: Basic container for sequential fields, or nested fields through CompositeField.
- * `[api:TabSet]`: Collection of fields which is rendered as separate tabs. Can be nested.
- * `[api:Tab]`: A single tab inside a `TabSet`.
- * `[api:ToggleCompositeField]`: Allows visibility of a group of fields to be toggled.
- * `[api:ToggleField]`: ReadonlyField with added toggle-capabilities - will preview the first sentence of the contained text-value, and show the full content by a javascript-switch.
+ * [api:FieldGroup] attached in CMS-context.
+ * [api:FieldList]: Basic container for sequential fields, or nested fields through CompositeField.
+ * [api:TabSet]: Collection of fields which is rendered as separate tabs. Can be nested.
+ * [api:Tab]: A single tab inside a `TabSet`.
+ * [api:ToggleCompositeField]: Allows visibility of a group of fields to be toggled.
+ * [api:ToggleField]: ReadonlyField with added toggle-capabilities - will preview the first sentence of the contained text-value, and show the full content by a javascript-switch.
 
 ## Files
 
- * `[api:FileField]`: Simple file upload dialog.
- * `[api:UploadField]`: File uploads through HTML5 features, including upload progress, preview and relationship management.
+ * [api:FileField]: Simple file upload dialog.
+ * [api:UploadField]: File uploads through HTML5 features, including upload progress, preview and relationship management.
 
 ## Relations
 
- * `[api:CheckboxSetField]`: Displays a set of checkboxes as a logical group.
- * `[api:TableField]`: In-place editing of tabular data.
- * `[api:TreeDropdownField]`: Dropdown-like field that allows you to select an item from a hierarchical AJAX-expandable tree.
- * `[api:TreeMultiselectField]`: Represents many-many joins using a tree selector shown in a dropdown-like element
- * `[api:GridField]`: Displays a `[api:SS_List]` in a tabular format. Versatile base class which can be configured to allow editing, sorting, etc.
- * `[api:ListboxField]`: Multi-line listbox field, through `<select multiple>`.
+ * [api:CheckboxSetField]: Displays a set of checkboxes as a logical group.
+ * [api:TableField]: In-place editing of tabular data.
+ * [api:TreeDropdownField]: Dropdown-like field that allows you to select an item from a hierarchical AJAX-expandable tree.
+ * [api:TreeMultiselectField]: Represents many-many joins using a tree selector shown in a dropdown-like element
+ * [api:GridField]: Displays a [api:SS_List] in a tabular format. Versatile base class which can be configured to allow editing, sorting, etc.
+ * [api:ListboxField]: Multi-line listbox field, through `<select multiple>`.
 
 
 ## Utility
 
- * `[api:DatalessField]` - Base class for fields which add some HTML to the form but don't submit any data or
+ * [api:DatalessField] - Base class for fields which add some HTML to the form but don't submit any data or
 save it to the database
- * `[api:HeaderField]`: Renders a simple HTML header element.
- * `[api:HiddenField]` - Renders a hidden input field.
- * `[api:LabelField]`: Simple label tag. This can be used to add extra text in your forms.
- * `[api:LiteralField]`: Renders arbitrary HTML into a form.
+ * [api:HeaderField]: Renders a simple HTML header element.
+ * [api:HiddenField] - Renders a hidden input field.
+ * [api:LabelField]: Simple label tag. This can be used to add extra text in your forms.
+ * [api:LiteralField]: Renders arbitrary HTML into a form.
diff --git a/docs/en/02_Developer_Guides/03_Forms/Field_types/03_HTMLEditorField.md b/docs/en/02_Developer_Guides/03_Forms/Field_types/03_HTMLEditorField.md
index 35c10cb11..55928aa1b 100644
--- a/docs/en/02_Developer_Guides/03_Forms/Field_types/03_HTMLEditorField.md
+++ b/docs/en/02_Developer_Guides/03_Forms/Field_types/03_HTMLEditorField.md
@@ -10,8 +10,8 @@ On top of the base functionality, we use our own insertion dialogs to ensure you
 files. In addition to the markup managed by TinyMCE, we use [shortcodes](/developer_guides/extending/shortcodes) to store 
 information about inserted images or media elements.
 
-The framework comes with a `[api:HTMLEditorField]` form field class which encapsulates most of the required
-functionality. It is usually added through the `[api:DataObject->getCMSFields()]` method:
+The framework comes with a [api:HTMLEditorField] form field class which encapsulates most of the required
+functionality. It is usually added through the [api:DataObject::getCMSFields()] method:
 
 **mysite/code/MyObject.php**
 
@@ -34,10 +34,10 @@ functionality. It is usually added through the `[api:DataObject->getCMSFields()]
 ## Configuration
 
 To keep the JavaScript editor configuration manageable and extensible, we've wrapped it in a PHP class called 
-`[api:HtmlEditorConfig]`. The class comes with its own defaults, which are extended through the [Configuration API](../../configuration)
+[api:HtmlEditorConfig]. The class comes with its own defaults, which are extended through the [Configuration API](../../configuration)
 in the framework (and the `cms` module in case you've got that installed).
 
-There can be multiple configs, which should always be created / accessed using `[api:HtmlEditorConfig::get]`. You can 
+There can be multiple configs, which should always be created / accessed using [api:HtmlEditorConfig::get()]. You can 
 then set the currently active config using `set_active()`.
 
 <div class="info" markdown="1">
@@ -54,7 +54,7 @@ order is alphabetical, so if you set a TinyMCE option in the `aardvark/_config.p
 
 In its simplest form, the configuration of the editor includes adding and removing buttons and plugins.
 
-You can add plugins to the editor using the Framework's `[api:HtmlEditorConfig::enablePlugins]` method. This will
+You can add plugins to the editor using the Framework's [api:HtmlEditorConfig::enablePlugins()] method. This will
 transparently generate the relevant underlying TinyMCE code.
 
 **mysite/_config.php**
@@ -81,7 +81,7 @@ Buttons can also be removed:
 	HtmlEditorConfig::get('cms')->removeButtons('tablecontrols', 'blockquote', 'hr');
 
 <div class="notice" markdown="1">
-Internally `[api:HtmlEditorConfig]` uses the TinyMCE's `theme_advanced_buttons` option to configure these. See the 
+Internally [api:HtmlEditorConfig] uses the TinyMCE's `theme_advanced_buttons` option to configure these. See the 
 [TinyMCE documentation of this option](http://www.tinymce.com/wiki.php/Configuration:theme_advanced_buttons_1_n)
 for more details.
 </div>
@@ -155,7 +155,7 @@ plugin that adds a button to the editor:
 		tinymce.PluginManager.add('myplugin', tinymce.plugins.myplugin);
 	})();
 
-You can then enable this plugin through the [api:HtmlEditorConfig::enablePlugins]:
+You can then enable this plugin through the [api:HtmlEditorConfig::enablePlugins()]:
 
 **mysite/_config.php**
 	:::php
@@ -166,8 +166,8 @@ documentation, or browse through plugins that come with the Framework at `thirdp
 
 ## Image and media insertion
 
-The `[api:HtmlEditorField]` API also handles inserting images and media files into the managed HTML content. It can be 
-used both for referencing files on the webserver filesystem (through the `[api:File]` and `[api:Image]` APIs), as well 
+The [api:HtmlEditorField] API also handles inserting images and media files into the managed HTML content. It can be 
+used both for referencing files on the webserver filesystem (through the [api:File] and [api:Image] APIs), as well 
 as hotlinking files from the web. 
 
 We use [shortcodes](/developer_guides/extending/shortcodes) to store information about inserted images or media elements. The 
@@ -180,7 +180,7 @@ The ["oEmbed" standard](http://www.oembed.com/) is implemented by many media ser
 representation of files just by referencing a website URL. For example, a content author can insert a playable youtube 
 video just by knowing its URL, as opposed to dealing with manual HTML code.
 
-oEmbed powers the "Insert from web" feature available through `[api:HtmlEditorField]`. Internally, it makes HTTP 
+oEmbed powers the "Insert from web" feature available through [api:HtmlEditorField]. Internally, it makes HTTP 
 queries to a list of external services if it finds a matching URL. These services are described in the 
 `Oembed.providers` configuration. Since these requests are performed on page rendering, they typically have a long 
 cache time (multiple days). 
@@ -206,7 +206,7 @@ By default, TinyMCE and SilverStripe will generate valid HTML5 markup, but it wi
 `<article>` or `<figure>`. If you plan to use those, add them to the 
 [valid_elements](http://www.tinymce.com/wiki.php/Configuration:valid_elements) configuration setting.
 
-Also, the `[api:SS_HTMLValue]` API underpinning the HTML processing parses the markup into a temporary object tree 
+Also, the [api:SS_HTMLValue] API underpinning the HTML processing parses the markup into a temporary object tree 
 which can be traversed and modified before saving. The built-in parser only supports HTML4 and XHTML syntax. In order 
 to successfully process HTML5 tags, please use the 
 ['silverstripe/html5' module](https://github.com/silverstripe/silverstripe-html5).
@@ -238,22 +238,22 @@ Adding functionality is a bit more advanced, you'll most likely
 need to add some fields to the PHP forms, as well as write some
 JavaScript to ensure the values from those fields make it into the content
 elements (and back out in case an existing element gets edited).
-There's lots of extension points in the `[api:HtmlEditorField_Toolbar]` class
+There's lots of extension points in the [api:HtmlEditorField_Toolbar] class
 to get you started.
 
 ### Security groups with their own editor configuration
 
 Different groups of authors can be assigned their own config,
 e.g. a more restricted rule set for content reviewers (see the "Security" )
-The config is available on each user record through `[api:Member->getHtmlEditorConfigForCMS()]`.
-The group assignment is done through the "Security" interface for each `[api:Group]` record.
+The config is available on each user record through [api:Member::getHtmlEditorConfigForCMS()].
+The group assignment is done through the "Security" interface for each [api:Group] record.
 Note: The dropdown is only available if more than one config exists.
 
 ### Using the editor outside of the CMS
 
 Each interface can have multiple fields of this type, each with their own toolbar to set formatting
 and insert HTML elements. They do share one common set of dialogs for inserting links and other media though,
-encapsulated in the `[api:HtmlEditorField_Toolbar]` class.
+encapsulated in the [api:HtmlEditorField_Toolbar] class.
 In the CMS, those dialogs are automatically instantiate, but in your own interfaces outside
 of the CMS you have to take care of instantiate yourself:
 
@@ -288,7 +288,7 @@ WYSIWYG editors are complex beasts, so replacing it completely is a difficult ta
 The framework provides a wrapper implementation for the basic required functionality,
 mainly around selecting and inserting content into the editor view.
 Have a look in `HtmlEditorField.js` and the `ss.editorWrapper` object to get you started
-on your own editor wrapper. Note that the `[api:HtmlEditorConfig]` is currently hardwired to support TinyMCE,
+on your own editor wrapper. Note that the [api:HtmlEditorConfig] is currently hardwired to support TinyMCE,
 so its up to you to either convert existing configuration as applicable,
 or start your own configuration.
 
diff --git a/docs/en/02_Developer_Guides/03_Forms/Field_types/04_GridField.md b/docs/en/02_Developer_Guides/03_Forms/Field_types/04_GridField.md
index df541e294..5965f010f 100644
--- a/docs/en/02_Developer_Guides/03_Forms/Field_types/04_GridField.md
+++ b/docs/en/02_Developer_Guides/03_Forms/Field_types/04_GridField.md
@@ -233,7 +233,7 @@ database.
 
 The `GridFieldDetailForm` component drives the record viewing and editing form. It takes its' fields from 
 `DataObject->getCMSFields()` method but can be customized to accept different fields via the 
-[api:GridFieldDetailForm->setFields] method.
+[api:GridFieldDetailForm::setFields()] method.
 
 	:::php
 	$form = $gridField->getConfig()->getComponentByType('GridFieldDetailForm');
@@ -351,7 +351,7 @@ processed placeholders as opposed to native template syntax.
 </div>
 
 Now you can add other components into this area by returning them as an array from your 
-[api:GridFieldComponent->getHTMLFragments()] implementation:
+[api:GridFieldComponent::getHTMLFragments()] implementation:
 
 	:::php
 	<?php
diff --git a/docs/en/02_Developer_Guides/03_Forms/Field_types/05_UploadField.md b/docs/en/02_Developer_Guides/03_Forms/Field_types/05_UploadField.md
index 31eef3c27..95ac3f64e 100644
--- a/docs/en/02_Developer_Guides/03_Forms/Field_types/05_UploadField.md
+++ b/docs/en/02_Developer_Guides/03_Forms/Field_types/05_UploadField.md
@@ -297,7 +297,7 @@ Certain default values for the above can be configured using the YAML config sys
 
 The above settings can also be set on a per-instance basis by using `setConfig` with the appropriate key.
 
-You can also configure the underlying `[api:Upload]` class, by using the YAML config system.
+You can also configure the underlying [api:Upload] class, by using the YAML config system.
 
 ```yaml
 	Upload:
diff --git a/docs/en/02_Developer_Guides/03_Forms/How_Tos/Simple_Contact_Form.md b/docs/en/02_Developer_Guides/03_Forms/How_Tos/05_Simple_Contact_Form.md
similarity index 92%
rename from docs/en/02_Developer_Guides/03_Forms/How_Tos/Simple_Contact_Form.md
rename to docs/en/02_Developer_Guides/03_Forms/How_Tos/05_Simple_Contact_Form.md
index e9a1035e5..1715590f0 100644
--- a/docs/en/02_Developer_Guides/03_Forms/How_Tos/Simple_Contact_Form.md
+++ b/docs/en/02_Developer_Guides/03_Forms/How_Tos/05_Simple_Contact_Form.md
@@ -34,14 +34,14 @@ There's quite a bit in this function, so we'll step through one piece at a time.
 		new TextareaField('Message')
 	);
 
-First we create all the fields we want in the contact form, and put them inside a FieldList. You can find a list of form fields available on the `[api:FormField]` page.   
+First we create all the fields we want in the contact form, and put them inside a FieldList. You can find a list of form fields available on the [api:FormField] page.
 
 	:::php
 	$actions = FieldList(
 		new FormAction('submit', 'Submit')
 	);
 
-We then create a `[api:FieldList]` of the form actions, or the buttons that submit the form. Here we add a single form action, with the name 'submit', and the label 'Submit'. We'll use the name of the form action later.
+We then create a [api:FieldList] of the form actions, or the buttons that submit the form. Here we add a single form action, with the name 'submit', and the label 'Submit'. We'll use the name of the form action later.
 
 	:::php
 	return new Form($this, 'Form', $fields, $actions);
@@ -104,7 +104,7 @@ The final thing we do is return a 'thank you for your feedback' message to the u
 
 All forms have some basic validation built in – email fields will only let the user enter email addresses, number fields will only accept numbers, and so on. Sometimes you need more complicated validation, so you can define your own validation by extending the Validator class.
 
-The framework comes with a predefined validator called `[api:RequiredFields]`, which performs the common task of making sure particular fields are filled out. Below is the code to add validation to a contact form:
+The framework comes with a predefined validator called [api:RequiredFields], which performs the common task of making sure particular fields are filled out. Below is the code to add validation to a contact form:
 
 	:::php
 	public function Form() { 
diff --git a/docs/en/02_Developer_Guides/04_Configuration/00_Configuration.md b/docs/en/02_Developer_Guides/04_Configuration/00_Configuration.md
index 419f602c6..0cfd4bcfe 100644
--- a/docs/en/02_Developer_Guides/04_Configuration/00_Configuration.md
+++ b/docs/en/02_Developer_Guides/04_Configuration/00_Configuration.md
@@ -46,7 +46,7 @@ be marked `private static` and follow the `lower_case_with_underscores` structur
 
 ## Accessing and Setting Configuration Properties
 
-This can be done by calling the static method `[api:Config::inst]`, like so:
+This can be done by calling the static method [api:Config::inst()], like so:
 
 	:::php
 	$config = Config::inst()->get('MyClass');
@@ -314,4 +314,4 @@ will result in only the latter coming through.
 
 ## API Documentation
 
-* [api:Config]
\ No newline at end of file
+* [api:Config]
diff --git a/docs/en/02_Developer_Guides/04_Configuration/01_SiteConfig.md b/docs/en/02_Developer_Guides/04_Configuration/01_SiteConfig.md
index 5c80ad429..af69e909a 100644
--- a/docs/en/02_Developer_Guides/04_Configuration/01_SiteConfig.md
+++ b/docs/en/02_Developer_Guides/04_Configuration/01_SiteConfig.md
@@ -69,4 +69,4 @@ provide the users a place to configure settings then the `SiteConfig` panel is t
 
 ## API Documentation
 
-* `[api:SiteConfig]`
+* [api:SiteConfig]
diff --git a/docs/en/02_Developer_Guides/05_Extending/01_Extensions.md b/docs/en/02_Developer_Guides/05_Extending/01_Extensions.md
index d88d77362..fe825245b 100644
--- a/docs/en/02_Developer_Guides/05_Extending/01_Extensions.md
+++ b/docs/en/02_Developer_Guides/05_Extending/01_Extensions.md
@@ -114,7 +114,7 @@ we added a `SayHi` method which is unique to our extension.
 
 If the `Extension` needs to modify an existing method it's a little trickier. It requires that the method you want to
 customize has provided an *Extension Hook* in the place where you want to modify the data. An *Extension Hook* is done 
-through the `[api:Object->extend]` method.
+through the [api:Object::extend()] method.
 
 **framework/security/Member.php**
 
@@ -209,8 +209,8 @@ In your [api:Extension] class you can only refer to the source object through th
 
 ## Checking to see if an Object has an Extension
 
-To see what extensions are currently enabled on an object, use [api:Object->getExtensionInstances] and 
-[api:Object->hasExtension]
+To see what extensions are currently enabled on an object, use [api:Object::getExtensionInstances()] and 
+[api:Object::hasExtension()]
 
 
 	:::php
diff --git a/docs/en/02_Developer_Guides/05_Extending/04_Shortcodes.md b/docs/en/02_Developer_Guides/05_Extending/04_Shortcodes.md
index 91e22794a..b642d9499 100644
--- a/docs/en/02_Developer_Guides/05_Extending/04_Shortcodes.md
+++ b/docs/en/02_Developer_Guides/05_Extending/04_Shortcodes.md
@@ -33,7 +33,7 @@ Here's some syntax variations:
 
 Shortcodes are automatically parsed on any database field which is declared as [api:HTMLValue] or [api:HTMLText], 
 when rendered into a template. This means you can use shortcodes on common fields like `SiteTree.Content`, and any 
-other `[api:DataObject::$db]` definitions of these types.
+other [api:DataObject::$db] definitions of these types.
 
 Other fields can be manually parsed with shortcodes through the `parse` method.
 
diff --git a/docs/en/02_Developer_Guides/06_Testing/00_Unit_Testing.md b/docs/en/02_Developer_Guides/06_Testing/00_Unit_Testing.md
index 098b5e3d1..75ae5f55f 100644
--- a/docs/en/02_Developer_Guides/06_Testing/00_Unit_Testing.md
+++ b/docs/en/02_Developer_Guides/06_Testing/00_Unit_Testing.md
@@ -96,7 +96,7 @@ environments. If for some reason you don't have access to the command line, you
 
 ### Via the CLI
 
-The [sake](../cli) executable that comes with SilverStripe can trigger a customized `[api:TestRunner]` class that 
+The [sake](../cli) executable that comes with SilverStripe can trigger a customized [api:TestRunner] class that 
 handles the PHPUnit configuration and output formatting. While the custom test runner a handy tool, it's also more 
 limited than using `phpunit` directly, particularly around formatting test output.
 
diff --git a/docs/en/02_Developer_Guides/06_Testing/04_Fixtures.md b/docs/en/02_Developer_Guides/06_Testing/04_Fixtures.md
index 3b97f52ce..757041aa0 100644
--- a/docs/en/02_Developer_Guides/06_Testing/04_Fixtures.md
+++ b/docs/en/02_Developer_Guides/06_Testing/04_Fixtures.md
@@ -6,7 +6,7 @@ summary: Populate test databases with fake seed data.
 To test functionality correctly, we must use consistent data. If we are testing our code with the same data each 
 time, we can trust our tests to yield reliable results and to identify when the logic changes. Each test run in 
 SilverStripe starts with a fresh database containing no records. `Fixtures` provide a way to describe the initial data
-to load into the database. The `[api:SapphireTest]` class takes care of populating a test database with data from 
+to load into the database. The [api:SapphireTest] class takes care of populating a test database with data from 
 fixtures - all we have to do is define them.
 
 Fixtures are defined in `YAML`. `YAML` is a markup language which is deliberately simple and easy to read, so it is 
@@ -192,7 +192,7 @@ To provide the value for the `many_many_extraField` use the YAML list syntax.
 
 While manually defined fixtures provide full flexibility, they offer very little in terms of structure and convention. 
 
-Alternatively, you can use the `[api:FixtureFactory]` class, which allows you to set default values, callbacks on object 
+Alternatively, you can use the [api:FixtureFactory] class, which allows you to set default values, callbacks on object 
 creation, and dynamic/lazy value setting.
 
 <div class="hint" markdown='1'>
diff --git a/docs/en/02_Developer_Guides/06_Testing/How_Tos/00_Write_a_SapphireTest.md b/docs/en/02_Developer_Guides/06_Testing/How_Tos/00_Write_a_SapphireTest.md
index 9bae22450..924fde543 100644
--- a/docs/en/02_Developer_Guides/06_Testing/How_Tos/00_Write_a_SapphireTest.md
+++ b/docs/en/02_Developer_Guides/06_Testing/How_Tos/00_Write_a_SapphireTest.md
@@ -60,7 +60,7 @@ The test database is rebuilt every time one of these methods is run.
 
 Inside our test method is the `objFromFixture` method that will generate an object for us based on data from our fixture
 file. To identify to the object, we provide a class name and an identifier. The identifier is specified in the YAML file
-but not saved in the database anywhere, `objFromFixture` looks the `[api:DataObject]` up in memory rather than using the
+but not saved in the database anywhere, `objFromFixture` looks the [api:DataObject] up in memory rather than using the
 database. This means that you can use it to test the functions responsible for looking up content in the database.
 
 The final part of our test is an assertion command, `assertEquals`. An assertion command allows us to test for something
diff --git a/docs/en/02_Developer_Guides/06_Testing/How_Tos/03_Testing_Email.md b/docs/en/02_Developer_Guides/06_Testing/How_Tos/03_Testing_Email.md
index db8f66a69..67feff0c2 100644
--- a/docs/en/02_Developer_Guides/06_Testing/How_Tos/03_Testing_Email.md
+++ b/docs/en/02_Developer_Guides/06_Testing/How_Tos/03_Testing_Email.md
@@ -2,8 +2,8 @@ title: How to test emails within unit tests
 
 # Testing Email within Unit Tests
 
-SilverStripe's test system has built-in support for testing emails sent using the `[api:Email]` class. If you are 
-running a `[api:SapphireTest]` test, then it holds off actually sending the email, and instead lets you assert that an 
+SilverStripe's test system has built-in support for testing emails sent using the [api:Email] class. If you are 
+running a [api:SapphireTest] test, then it holds off actually sending the email, and instead lets you assert that an 
 email was sent using this method.
 
 	:::php
@@ -15,7 +15,7 @@ email was sent using this method.
 		$e->send();
 	}
 
-To test that `MyMethod` sends the correct email, use the [api:SapphireTest::assertEmailSent] method.
+To test that `MyMethod` sends the correct email, use the [api:SapphireTest::assertEmailSent()] method.
 
 	:::php
 	$this->assertEmailSent($to, $from, $subject, $body);
diff --git a/docs/en/02_Developer_Guides/06_Testing/index.md b/docs/en/02_Developer_Guides/06_Testing/index.md
index f37aae6de..190c2798f 100644
--- a/docs/en/02_Developer_Guides/06_Testing/index.md
+++ b/docs/en/02_Developer_Guides/06_Testing/index.md
@@ -55,7 +55,7 @@ should have the appropriate permissions to create new databases on your server,
 
 ## Writing Tests
 
-Tests are written by creating subclasses of `[api:SapphireTest]`.  You should put tests for your site in the
+Tests are written by creating subclasses of [api:SapphireTest].  You should put tests for your site in the
 `mysite/tests` directory.  If you are writing tests for a module, put them in the `(modulename)/tests` directory.
 
 Generally speaking, there should be one test class for each application class.  The name of the test class should be the
@@ -100,7 +100,7 @@ All command-line arguments are documented on
 ### Via the "sake" Wrapper on Command Line
 
 The [sake](/developer_guides/cli/) executable that comes with SilverStripe can trigger a customized
-`[api:TestRunner]` class that handles the PHPUnit configuration and output formatting.
+[api:TestRunner] class that handles the PHPUnit configuration and output formatting.
 While the custom test runner a handy tool, its also more limited than using `phpunit` directly,
 particularly around formatting test output.
 
diff --git a/docs/en/02_Developer_Guides/07_Debugging/00_Environment_Types.md b/docs/en/02_Developer_Guides/07_Debugging/00_Environment_Types.md
index f34991746..758121772 100644
--- a/docs/en/02_Developer_Guides/07_Debugging/00_Environment_Types.md
+++ b/docs/en/02_Developer_Guides/07_Debugging/00_Environment_Types.md
@@ -36,7 +36,7 @@ on a public server very carefully.
 
 Test mode is designed for staging environments or other private collaboration sites before deploying a site live.
 
-In this mode error messages are hidden from the user and SilverStripe includes `[api:BasicAuth]` integration if you 
+In this mode error messages are hidden from the user and SilverStripe includes [api:BasicAuth] integration if you 
 want to password protect the site. You can enable that but adding this to your `mysite/_config/app.yml` file:
 
 	:::yml
diff --git a/docs/en/02_Developer_Guides/07_Debugging/02_URL_Variable_Tools.md b/docs/en/02_Developer_Guides/07_Debugging/02_URL_Variable_Tools.md
index 3e9bb0386..7ae530fb7 100644
--- a/docs/en/02_Developer_Guides/07_Debugging/02_URL_Variable_Tools.md
+++ b/docs/en/02_Developer_Guides/07_Debugging/02_URL_Variable_Tools.md
@@ -27,7 +27,7 @@ Append the option and corresponding value to your URL in your browser's address
  | isDev         | | 1      | | Put the site into [development mode](../), enabling debugging messages to the browser on a live server.  For security, you'll be asked to log in with an administrator log-in. Will persist for the current browser session. | 
  | isTest        | | 1      | | See above. | 
  | debug         | | 1      | | Show a collection of debugging information about the director / controller operation        |
- | debug_request | | 1      | | Show all steps of the request from initial `[api:HTTPRequest]` to `[api:Controller]` to Template Rendering  | 
+ | debug_request | | 1      | | Show all steps of the request from initial [api:HTTPRequest] to [api:Controller] to Template Rendering  | 
 
 ## Classes and Objects
 
diff --git a/docs/en/02_Developer_Guides/08_Performance/00_Partial_Caching.md b/docs/en/02_Developer_Guides/08_Performance/00_Partial_Caching.md
index 866c22a6f..5c7d3a281 100644
--- a/docs/en/02_Developer_Guides/08_Performance/00_Partial_Caching.md
+++ b/docs/en/02_Developer_Guides/08_Performance/00_Partial_Caching.md
@@ -35,7 +35,7 @@ Here are some more complex examples:
 	<% end_cached %>
 
 An additional global key is incorporated in the cache lookup. The default value for this is 
-`$CurrentReadingMode, $CurrentUser.ID`. This ensures that the current `[api:Versioned]` state and user ID are used. 
+`$CurrentReadingMode, $CurrentUser.ID`. This ensures that the current [api:Versioned] state and user ID are used. 
 This may be configured by changing the config value of `SSViewer.global_key`. It is also necessary to flush the 
 template caching when modifying this config, as this key is cached within the template itself.
 
diff --git a/docs/en/02_Developer_Guides/08_Performance/01_Caching.md b/docs/en/02_Developer_Guides/08_Performance/01_Caching.md
index 485137271..7e9d236d3 100644
--- a/docs/en/02_Developer_Guides/08_Performance/01_Caching.md
+++ b/docs/en/02_Developer_Guides/08_Performance/01_Caching.md
@@ -4,14 +4,14 @@
 
 The framework uses caches to store infrequently changing values.
 By default, the storage mechanism is simply the filesystem, although
-other cache backends can be configured. All caches use the `[api:SS_Cache]` API.
+other cache backends can be configured. All caches use the [api:SS_Cache] API.
 
 The most common caches are manifests of various resources: 
 
- * PHP class locations (`[api:SS_ClassManifest]`)
- * Template file locations and compiled templates (`[api:SS_TemplateManifest]`)
- * Configuration settings from YAML files (`[api:SS_ConfigManifest]`)
- * Language files (`[api:i18n]`)
+ * PHP class locations ([api:SS_ClassManifest])
+ * Template file locations and compiled templates ([api:SS_TemplateManifest])
+ * Configuration settings from YAML files ([api:SS_ConfigManifest])
+ * Language files ([api:i18n])
 
 Flushing the various manifests is performed through a GET
 parameter (`flush=1`). Since this action requires more server resources than normal requests,
@@ -23,7 +23,7 @@ executing the action is limited to the following cases when performed via a web
 
 ## The Cache API
 
-The `[api:SS_Cache]` class provides a bunch of static functions wrapping the Zend_Cache system 
+The [api:SS_Cache] class provides a bunch of static functions wrapping the Zend_Cache system 
 in something a little more easy to use with the SilverStripe config system.
 
 A `Zend_Cache` has both a frontend (determines how to get the value to cache, 
diff --git a/docs/en/02_Developer_Guides/08_Performance/02_HTTP_Cache_Headers.md b/docs/en/02_Developer_Guides/08_Performance/02_HTTP_Cache_Headers.md
index 455a3c4e9..42a926794 100644
--- a/docs/en/02_Developer_Guides/08_Performance/02_HTTP_Cache_Headers.md
+++ b/docs/en/02_Developer_Guides/08_Performance/02_HTTP_Cache_Headers.md
@@ -29,5 +29,5 @@ clause in `Cache-Control` and `Pragma` will be included.
 	:::php
 	HTTP::register_modification_date('2014-10-10');
 
-Used to set the modification date to something more recent than the default. [api:DataObject::__construct] calls 
-[api:HTTP::register_modification_date(] whenever a record comes from the database ensuring the newest date is present.
+Used to set the modification date to something more recent than the default. [api:DataObject::__construct()] calls 
+[api:HTTP::register_modification_date()] whenever a record comes from the database ensuring the newest date is present.
diff --git a/docs/en/02_Developer_Guides/09_Security/00_Member.md b/docs/en/02_Developer_Guides/09_Security/00_Member.md
index e30a3112d..e2818da6d 100644
--- a/docs/en/02_Developer_Guides/09_Security/00_Member.md
+++ b/docs/en/02_Developer_Guides/09_Security/00_Member.md
@@ -4,11 +4,11 @@ title: Members
 
 ## Introduction
 
-The `[api:Member]` class is used to represent user accounts on a SilverStripe site (including newsletter recipients).
+The [api:Member] class is used to represent user accounts on a SilverStripe site (including newsletter recipients).
  
 ## Testing For Logged In Users
 
-The `[api:Member]` class comes with 2 static methods for getting information about the current logged in user.
+The [api:Member] class comes with 2 static methods for getting information about the current logged in user.
 
 **Member::currentUserID()**
 
@@ -39,11 +39,11 @@ Returns the full *Member* Object for the current user, returns *null* if user is
 ## Subclassing
 
 <div class="warning" markdown="1">
-This is the least desirable way of extending the `[api:Member]` class. It's better to use `[api:DataExtension]`
+This is the least desirable way of extending the [api:Member] class. It's better to use [api:DataExtension]
 (see below).
 </div>
 
-You can define subclasses of `[api:Member]` to add extra fields or functionality to the built-in membership system.
+You can define subclasses of [api:Member] to add extra fields or functionality to the built-in membership system.
 
 	:::php
 	class MyMember extends Member {
@@ -54,7 +54,7 @@ You can define subclasses of `[api:Member]` to add extra fields or functionality
 	}
 
 
-To ensure that all new members are created using this class, put a call to `[api:Object::useCustomClass()]` in
+To ensure that all new members are created using this class, put a call to [api:Object::useCustomClass()] in
 (project)/_config.php:
 
 	:::php
@@ -65,8 +65,8 @@ Note that if you want to look this class-name up, you can call Object::getCustom
 ## Overloading getCMSFields()
 
 If you overload the built-in public function getCMSFields(), then you can change the form that is used to view & edit member
-details in the newsletter system.  This function returns a `[api:FieldList]` object.  You should generally start by calling
-parent::getCMSFields() and manipulate the `[api:FieldList]` from there.
+details in the newsletter system.  This function returns a [api:FieldList] object.  You should generally start by calling
+parent::getCMSFields() and manipulate the [api:FieldList] from there.
 
 	:::php
 	public function getCMSFields() {
@@ -80,11 +80,11 @@ parent::getCMSFields() and manipulate the `[api:FieldList]` from there.
 
 ## Extending Member or DataObject?
 
-Basic rule: Class `[api:Member]` should just be extended for entities who have some kind of login.
-If you have different types of `[api:Member]`s in the system, you have to make sure that those with login-capabilities have
+Basic rule: Class [api:Member] should just be extended for entities who have some kind of login.
+If you have different types of [api:Member]s in the system, you have to make sure that those with login-capabilities have
 unique email-addresses (as this is used for login-credentials). 
-For persons without login-capabilities (e.g. for an address-database), you shouldn't extend `[api:Member]` to avoid conflicts
-with the Member-database. This enables us to have a different subclass of `[api:Member]` for an email-address with login-data,
+For persons without login-capabilities (e.g. for an address-database), you shouldn't extend [api:Member] to avoid conflicts
+with the Member-database. This enables us to have a different subclass of [api:Member] for an email-address with login-data,
 and another subclass for the same email-address in the address-database.
 
 ## Member Role Extension
@@ -98,9 +98,9 @@ class. A better way is to use role extensions to add this behaviour. Add the fol
 	  extensions:
 	    - MyMemberExtension
 
-A role extension is simply a subclass of `[api:DataExtension]` that is designed to be used to add behaviour to `[api:Member]`. 
+A role extension is simply a subclass of [api:DataExtension] that is designed to be used to add behaviour to [api:Member]. 
 The roles affect the entire class - all members will get the additional behaviour.  However, if you want to restrict
-things, you should add appropriate `[api:Permission::checkMember()]` calls to the role's methods.
+things, you should add appropriate [api:Permission::checkMember()] calls to the role's methods.
 
 	:::php
 	class MyMemberExtension extends DataExtension {
@@ -130,4 +130,4 @@ things, you should add appropriate `[api:Permission::checkMember()]` calls to th
 
 ## API Documentation
 
-`[api:Member]`
+[api:Member]
diff --git a/docs/en/02_Developer_Guides/09_Security/01_Access_Control.md b/docs/en/02_Developer_Guides/09_Security/01_Access_Control.md
index 66ce01eb4..0565d3885 100644
--- a/docs/en/02_Developer_Guides/09_Security/01_Access_Control.md
+++ b/docs/en/02_Developer_Guides/09_Security/01_Access_Control.md
@@ -35,7 +35,7 @@ privileges from its parent group.
 
 ## Permission checking is at class level
 
-SilverStripe provides a security mechanism via the *Permission::check* method (see `[api:LeftAndMain]` for examples on how
+SilverStripe provides a security mechanism via the *Permission::check* method (see [api:LeftAndMain] for examples on how
 the admin screens work).
 
 (next step -- go from *Permission::checkMember*...)
@@ -48,14 +48,14 @@ works.
 
 ### Loading the admin page: looking at security
 
-If you go to [your site]/admin *Director.php* maps the 'admin' URL request through a `[api:Director]` rule to the
-`[api:CMSMain]` controller (see `[api:CMSMain]`, with no arguments). 
+If you go to [your site]/admin *Director.php* maps the 'admin' URL request through a [api:Director] rule to the
+[api:CMSMain] controller (see [api:CMSMain], with no arguments). 
 
-*CMSMain.init()* calls its parent which, of all things is called `[api:LeftAndMain]`. It's in `[api:LeftAndMain]` that the
+*CMSMain.init()* calls its parent which, of all things is called [api:LeftAndMain]. It's in [api:LeftAndMain] that the
 important security checks are made by calling *Permission::check*. 
 
-`[api:Security::permissionFailure]` is the next utility function you can use to redirect to the login form. 
+[api:Security::permissionFailure()] is the next utility function you can use to redirect to the login form. 
 
 ### Customizing Access Checks in CMS Classes
 
-see `[api:LeftAndMain]`
+see [api:LeftAndMain]
diff --git a/docs/en/02_Developer_Guides/09_Security/02_Permissions.md b/docs/en/02_Developer_Guides/09_Security/02_Permissions.md
index 79ef1f6e6..cf5f70470 100644
--- a/docs/en/02_Developer_Guides/09_Security/02_Permissions.md
+++ b/docs/en/02_Developer_Guides/09_Security/02_Permissions.md
@@ -19,7 +19,7 @@ The simple usage, Permission::check("PERM_CODE") will detect if the currently lo
 
 ## PermissionProvider
 
-`[api:PermissionProvider]` is an interface which lets you define a method *providePermissions()*.
+[api:PermissionProvider] is an interface which lets you define a method *providePermissions()*.
 This method should return a map of permission code names with a human readable explanation of its purpose.
 
 	:::php
@@ -98,4 +98,4 @@ Internally, this checks that the user has any of the defined `CMS_ACCESS_*` perm
 
 
 ## API Documentation
-`[api:Permission]`
+[api:Permission]
diff --git a/docs/en/02_Developer_Guides/09_Security/03_Authentication.md b/docs/en/02_Developer_Guides/09_Security/03_Authentication.md
index cd1243eed..8e4d8f7f3 100644
--- a/docs/en/02_Developer_Guides/09_Security/03_Authentication.md
+++ b/docs/en/02_Developer_Guides/09_Security/03_Authentication.md
@@ -3,33 +3,33 @@ summary: Explains SilverStripe's Authentication options and custom authenticator
 
 # Authentication
 
-By default, SilverStripe provides a `[api:MemberAuthenticator]` class which hooks into its own internal
+By default, SilverStripe provides a [api:MemberAuthenticator] class which hooks into its own internal
 authentication system.
 
 The main login system uses these controllers to handle the various security requests:
 
-`[api:Security]` - Which is the controller which handles most front-end security requests, including logging in, logging out, resetting password, or changing password. This class also provides an interface to allow configured `[api:Authenticator]` classes to each display a custom login form.	
+[api:Security] - Which is the controller which handles most front-end security requests, including logging in, logging out, resetting password, or changing password. This class also provides an interface to allow configured [api:Authenticator] classes to each display a custom login form.	
 
-`[api:CMSSecurity]` - Which is the controller which handles security requests within the CMS, and allows users to re-login without leaving the CMS.
+[api:CMSSecurity] - Which is the controller which handles security requests within the CMS, and allows users to re-login without leaving the CMS.
 
 ## Member Authentication
 
 The default member authentication system is implemented in the following classes:
 
-`[api:MemberAuthenticator]` - Which is the default member authentication implementation. This uses the email and password stored internally for each member to authenticate them.	
+[api:MemberAuthenticator] - Which is the default member authentication implementation. This uses the email and password stored internally for each member to authenticate them.	
 
-`[api:MemberLoginForm]` - Is the default form used by `MemberAuthenticator`, and is displayed on the public site at the url `Security/login` by default.
+[api:MemberLoginForm] - Is the default form used by `MemberAuthenticator`, and is displayed on the public site at the url `Security/login` by default.
 
-`[api:CMSMemberLoginForm]` - Is the secondary form used by `MemberAuthenticator`, and will be displayed to the	user within the CMS any time their session expires or they are logged out via an action. This form is	presented via a popup dialog, and can be used to re-authenticate that user automatically without them having	to lose their workspace. E.g. if editing a form, the user can login and continue to publish their content.
+[api:CMSMemberLoginForm] - Is the secondary form used by `MemberAuthenticator`, and will be displayed to the	user within the CMS any time their session expires or they are logged out via an action. This form is	presented via a popup dialog, and can be used to re-authenticate that user automatically without them having	to lose their workspace. E.g. if editing a form, the user can login and continue to publish their content.
 
 ## Custom Authentication
 
 Additional authentication methods (oauth, etc) can be implemented by creating custom implementations of each of the
 following base classes:
 
-`[api:Authenticator]` - The base class for authentication systems. This class also acts as the factory to generate various login forms for parts of the system. If an authenticator supports in-cms	reauthentication then it will be necessary to override the `supports_cms` and `get_cms_login_form` methods.
+[api:Authenticator] - The base class for authentication systems. This class also acts as the factory to generate various login forms for parts of the system. If an authenticator supports in-cms	reauthentication then it will be necessary to override the `supports_cms` and `get_cms_login_form` methods.
 
-`[api:LoginForm]` - which is the base class for a login form which links to a specific authenticator. At the very least, it will be necessary to implement a form class which provides a default login interface. If in-cms re-authentication is desired, then a specialised subclass of this method may be necessary. For example, this form could be extended to require confirmation of username as well as password.
+[api:LoginForm] - which is the base class for a login form which links to a specific authenticator. At the very least, it will be necessary to implement a form class which provides a default login interface. If in-cms re-authentication is desired, then a specialised subclass of this method may be necessary. For example, this form could be extended to require confirmation of username as well as password.
 
 ## Default Admin
 
@@ -44,6 +44,6 @@ It is advisable to configure this user in your `_ss_environment.php` file outsid
 	define('SS_DEFAULT_ADMIN_USERNAME', 'admin');
 	define('SS_DEFAULT_ADMIN_PASSWORD', 'password');
 
-When a user logs in with these credentials, then a `[api:Member]` with the Email 'admin' will be generated in
+When a user logs in with these credentials, then a [api:Member] with the Email 'admin' will be generated in
 the database, but without any password information. This means that the password can be reset or changed by simply
 updating the `_ss_environment.php` file.
diff --git a/docs/en/02_Developer_Guides/09_Security/04_Secure_Coding.md b/docs/en/02_Developer_Guides/09_Security/04_Secure_Coding.md
index 5d558fac0..b12b401a4 100644
--- a/docs/en/02_Developer_Guides/09_Security/04_Secure_Coding.md
+++ b/docs/en/02_Developer_Guides/09_Security/04_Secure_Coding.md
@@ -15,10 +15,10 @@ See [http://shiflett.org/articles/sql-injection](http://shiflett.org/articles/sq
 ### Automatic escaping
 
 SilverStripe automatically escapes data in SQL statements wherever possible,
-through database-specific methods (see `[api:Database->addslashes()]`).
-For `[api:MySQLDatabase]`, this will be `[mysql_real_escape_string()](http://de3.php.net/mysql_real_escape_string)`.
+through database-specific methods (see [api:Database::addslashes()]).
+For [api:MySQLDatabase], this will be [mysql_real_escape_string()](http://de3.php.net/mysql_real_escape_string).
 
-*  Most `[api:DataList]` accessors (see escaping note in method documentation)
+*  Most [api:DataList] accessors (see escaping note in method documentation)
 *  DataObject::get_by_id()
 *  DataObject::update()
 *  DataObject::castedUpdate()
@@ -164,8 +164,8 @@ We recommend configuring [shortcodes](/developer_guides/extending/shortcodes) th
 
 ### Escaping model properties
 
-`[api:SSViewer]` (the SilverStripe template engine) automatically takes care of escaping HTML tags from specific
-object-properties by [casting](/developer_guides/model/data_types_and_casting) its string value into a `[api:DBField]` object.
+[api:SSViewer] (the SilverStripe template engine) automatically takes care of escaping HTML tags from specific
+object-properties by [casting](/developer_guides/model/data_types_and_casting) its string value into a [api:DBField] object.
 
 PHP:
 
@@ -248,7 +248,7 @@ presentation from business logic.
 When using *customise()* or *renderWith()* calls in your controller, or otherwise forcing a custom context for your
 template, you'll need to take care of casting and escaping yourself in PHP. 
 
-The `[api:Convert]` class has utilities for this, mainly *Convert::raw2xml()* and *Convert::raw2att()* (which is
+The [api:Convert] class has utilities for this, mainly *Convert::raw2xml()* and *Convert::raw2att()* (which is
 also used by *XML* and *ATT* in template code).
 
 PHP:
@@ -323,14 +323,14 @@ SilverStripe has built-in countermeasures against [CSRF](http://shiflett.org/art
 will automatically contain a `SecurityID` parameter which is generated as a secure hash on the server, connected to the
 currently active session of the user. If this form is submitted without this parameter, or if the parameter doesn't
 match the hash stored in the users session, the request is discarded.
-You can disable this behaviour through `[api:Form->disableSecurityToken()]`.
+You can disable this behaviour through [api:Form::disableSecurityToken()].
 
 It is also recommended to limit form submissions to the intended HTTP verb (mostly `GET` or `POST`)
-through `[api:Form->setStrictFormMethodCheck()]`. 
+through [api:Form::setStrictFormMethodCheck()]. 
 
 Sometimes you need to handle state-changing HTTP submissions which aren't handled through
 SilverStripe's form system. In this case, you can also check the current HTTP request
-for a valid token through `[api:SecurityToken::checkRequest()]`.
+for a valid token through [api:SecurityToken::checkRequest()].
 
 ## Casting user input
 
diff --git a/docs/en/02_Developer_Guides/11_Integration/00_CSV_Import.md b/docs/en/02_Developer_Guides/11_Integration/00_CSV_Import.md
index fc59f2207..74e068dab 100644
--- a/docs/en/02_Developer_Guides/11_Integration/00_CSV_Import.md
+++ b/docs/en/02_Developer_Guides/11_Integration/00_CSV_Import.md
@@ -26,7 +26,7 @@ Feature overview:
 
 You can use the CsvBulkLoader without subclassing or other customizations, if the column names
 in your CSV file match `$db` properties in your dataobject. E.g. a simple import for the
-`[api:Member]` class could have this data in a file:
+[api:Member] class could have this data in a file:
 
 	FirstName,LastName,Email
 	Donald,Duck,donald@disney.com
@@ -38,7 +38,7 @@ The loader would be triggered through the `load()` method:
 	$loader = new CsvBulkLoader('Member');
 	$result = $loader->load('<my-file-path>');
 
-By the way, you can import `[api:Member]` and `[api:Group]` data through `http://localhost/admin/security`
+By the way, you can import [api:Member] and [api:Group] data through `http://localhost/admin/security`
 interface out of the box.
 
 ## Import through ModelAdmin
diff --git a/docs/en/02_Developer_Guides/11_Integration/01_RestfulService.md b/docs/en/02_Developer_Guides/11_Integration/01_RestfulService.md
index f9debc1f8..6009d27cc 100644
--- a/docs/en/02_Developer_Guides/11_Integration/01_RestfulService.md
+++ b/docs/en/02_Developer_Guides/11_Integration/01_RestfulService.md
@@ -2,7 +2,7 @@ summary: Consume external data through their RESTFul interfaces.
 
 # Restful Service
 
-`[api:RestfulService]` is used to enable connections to remote web services through PHP's `curl` command. It provides an
+[api:RestfulService] is used to enable connections to remote web services through PHP's `curl` command. It provides an
 interface and utility functions for generating a valid request and parsing the response returned from the web service. 
 
 <div class="alert" markdown="1">
@@ -134,7 +134,7 @@ To get the value of entry node with the namespace media, use:
 ### Handling Errors
 
 If the web service returned an error (for example, API key not available or inadequate parameters), 
-`[api:RestfulService]` can delegate the error handling to it's descendant class. To handle the errors, subclass 
+[api:RestfulService] can delegate the error handling to it's descendant class. To handle the errors, subclass 
 `RestfulService and define a function called errorCatch.
 
 	:::php
@@ -173,4 +173,4 @@ If you want to bypass error handling, define `checkErrors` in the constructor fo
 
 ## API Documentation
 
-* `[api:RestfulService]`
+* [api:RestfulService]
diff --git a/docs/en/02_Developer_Guides/11_Integration/02_RSSFeed.md b/docs/en/02_Developer_Guides/11_Integration/02_RSSFeed.md
index 55b21ce95..23c740d62 100644
--- a/docs/en/02_Developer_Guides/11_Integration/02_RSSFeed.md
+++ b/docs/en/02_Developer_Guides/11_Integration/02_RSSFeed.md
@@ -3,15 +3,15 @@ summary: Output records from your database as an RSS Feed.
 
 # RSS Feed
 
-Generating RSS / Atom-feeds is a matter of rendering a `[api:SS_List]` instance through the `[api:RSSFeed]` class.
+Generating RSS / Atom-feeds is a matter of rendering a [api:SS_List] instance through the [api:RSSFeed] class.
 
-The `[api:RSSFeed]` class doesn't limit you to generating article based feeds, it is just as easy to create a feed of 
-your current staff members, comments or any other custom `[api:DataObject]` subclasses you have defined. The only
+The [api:RSSFeed] class doesn't limit you to generating article based feeds, it is just as easy to create a feed of 
+your current staff members, comments or any other custom [api:DataObject] subclasses you have defined. The only
 logical limitation here is that every item in the RSS-feed should be accessible through a URL on your website, so it's 
-advisable to just create feeds from subclasses of `[api:SiteTree]`.
+advisable to just create feeds from subclasses of [api:SiteTree].
 
 <div class="warning" markdown="1">
-If you wish to generate an RSS feed that contains a `[api:DataObject]`, ensure you define a `AbsoluteLink` method on
+If you wish to generate an RSS feed that contains a [api:DataObject], ensure you define a `AbsoluteLink` method on
 the object.
 </div>
 
@@ -47,7 +47,7 @@ will normally go in your `Controllers` `init` method.
 
 ### Showing the 10 most recently updated pages
 
-You can use `[api:RSSFeed]` to easily create a feed showing your latest Page updates. The following example adds a page
+You can use [api:RSSFeed] to easily create a feed showing your latest Page updates. The following example adds a page
 `/home/rss/` which displays an XML file the latest updated pages.
 
 **mysite/code/Page.php**
@@ -87,7 +87,7 @@ You can use `[api:RSSFeed]` to easily create a feed showing your latest Page upd
 
 ### Rendering DataObjects in a RSSFeed
 
-DataObjects can be rendered in the feed as well, however, since they aren't explicitly `[api:SiteTree]` subclasses we 
+DataObjects can be rendered in the feed as well, however, since they aren't explicitly [api:SiteTree] subclasses we 
 need to include a function `AbsoluteLink` to allow the RSS feed to link through to the item.
 
 <div class="info">
@@ -193,4 +193,4 @@ As we've added a new template (PlayersRss.ss) make sure you clear your SilverStr
 
 ## API Documentation
 
-* `[api:RSSFeed]`
+* [api:RSSFeed]
diff --git a/docs/en/02_Developer_Guides/11_Integration/How_Tos/embed_rss.md b/docs/en/02_Developer_Guides/11_Integration/How_Tos/embed_rss.md
index 4903a4bc9..02ab66794 100644
--- a/docs/en/02_Developer_Guides/11_Integration/How_Tos/embed_rss.md
+++ b/docs/en/02_Developer_Guides/11_Integration/How_Tos/embed_rss.md
@@ -2,7 +2,7 @@ title: Embed an RSS Feed
 
 # Embed an RSS Feed
 
-`[api:RestfulService]` can be used to easily embed an RSS feed from a site. In this How to we'll embed the latest 
+[api:RestfulService] can be used to easily embed an RSS feed from a site. In this How to we'll embed the latest 
 weather information from the Yahoo Weather API.
 
 First, we write the code to query the API feed.
@@ -54,4 +54,4 @@ single field `Description`.
 ## Related
 
 * [RestfulService Documentation](../restfulservice)
-* `[api:RestfulService]`
\ No newline at end of file
+* [api:RestfulService]
diff --git a/docs/en/02_Developer_Guides/12_Search/02_FulltextSearch.md b/docs/en/02_Developer_Guides/12_Search/02_FulltextSearch.md
index 82153ca2d..7f8055efa 100644
--- a/docs/en/02_Developer_Guides/12_Search/02_FulltextSearch.md
+++ b/docs/en/02_Developer_Guides/12_Search/02_FulltextSearch.md
@@ -41,8 +41,8 @@ default site search, have a look at those extensions and modify as required.
 
 ### Fulltext Filter
 
-SilverStripe provides a `[api:FulltextFiler]` which you can use to perform custom fulltext searches on
-`[api:DataList]`'s.
+SilverStripe provides a [api:FulltextFilter] which you can use to perform custom fulltext searches on
+[api:DataList]s.
 
 Example DataObject:
 
@@ -78,4 +78,4 @@ field instead of the index.
 
 ## API Documentation
 
-* [api:FulltextSearchable]
\ No newline at end of file
+* [api:FulltextSearchable]
diff --git a/docs/en/02_Developer_Guides/13_i18n/index.md b/docs/en/02_Developer_Guides/13_i18n/index.md
index 634988c0a..f5f2ff9a4 100644
--- a/docs/en/02_Developer_Guides/13_i18n/index.md
+++ b/docs/en/02_Developer_Guides/13_i18n/index.md
@@ -24,7 +24,7 @@ The i18n class is enabled by default.
 
 ### Setting the locale
 
-To set the locale you just need to call `[api:i18n::set_locale()]` passing, as a parameter, the name of the locale that 
+To set the locale you just need to call [api:i18n::set_locale()] passing, as a parameter, the name of the locale that 
 you want to set.
 
 	:::php
@@ -39,7 +39,7 @@ for a complete listing of available locales.
 
 ### Getting the locale
 
-As you set the locale you can also get the current value, just by calling `[api:i18n::get_locale()]`.
+As you set the locale you can also get the current value, just by calling [api:i18n::get_locale()].
 
 ### Declaring the content language in HTML		{#declaring_the_content_language_in_html}
 
diff --git a/docs/en/02_Developer_Guides/14_Files/01_Image.md b/docs/en/02_Developer_Guides/14_Files/01_Image.md
index 10e65507e..bad5a4620 100644
--- a/docs/en/02_Developer_Guides/14_Files/01_Image.md
+++ b/docs/en/02_Developer_Guides/14_Files/01_Image.md
@@ -2,14 +2,14 @@
 
 ## Introduction
 
-Represents an image object through the `[api:Image]` class, inheriting all base functionality from the `[api:File]` class with extra functionality including resizing.
+Represents an image object through the [api:Image] class, inheriting all base functionality from the [api:File] class with extra functionality including resizing.
 
 ## Usage
 
 ### Managing images through form fields
 
-Images can be uploaded like any other file, through `[api:FileField]`.
-More advanced usage is possible through `[api:UploadField]`,
+Images can be uploaded like any other file, through [api:FileField].
+More advanced usage is possible through [api:UploadField],
 which provides thumbnails, a detail view of the image properties,
 and management of relationships to other DataObject instances.
 Allows upload of images through limiting file extensions with `setAllowedExtensions()`.
@@ -107,8 +107,8 @@ For output of an image tag with the image automatically resized to 80px width, y
 
 ### Form Upload
 
-For usage on a website form, see `[api:FileField]`.
-If you want to upload images within the CMS, see `[api:UploadField]`.
+For usage on a website form, see [api:FileField].
+If you want to upload images within the CMS, see [api:UploadField].
 
 ### Image Quality
 
@@ -132,4 +132,4 @@ image cache.
 	http://localhost/dev/tasks/FlushGeneratedImagesTask
 
 ## API Documentation
-`[api:Image]`
+[api:Image]
diff --git a/docs/en/02_Developer_Guides/14_Files/index.md b/docs/en/02_Developer_Guides/14_Files/index.md
index daff8a2cb..63173772b 100644
--- a/docs/en/02_Developer_Guides/14_Files/index.md
+++ b/docs/en/02_Developer_Guides/14_Files/index.md
@@ -37,4 +37,4 @@ You may also notice the 'Sync files' button (highlighted below). This button all
 
 ## Upload
 
-Files can be managed through a `FileField` or an `UploadField`. The `[api:FileField]` class provides a simple HTML input with a type of "file", whereas an `[api:UploadField]` provides a much more feature-rich field (including AJAX-based uploads, previews, relationship management and file data management). See [`Reference - UploadField`](/developer_guides/forms/field_types/uploadfield) for more information about how to use the `UploadField` class.
\ No newline at end of file
+Files can be managed through a `FileField` or an `UploadField`. The [api:FileField] class provides a simple HTML input with a type of "file", whereas an [api:UploadField] provides a much more feature-rich field (including AJAX-based uploads, previews, relationship management and file data management). See [`Reference - UploadField`](/developer_guides/forms/field_types/uploadfield) for more information about how to use the `UploadField` class.
diff --git a/docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/01_ModelAdmin.md b/docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/01_ModelAdmin.md
index 21f47e692..d1d13044f 100644
--- a/docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/01_ModelAdmin.md
+++ b/docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/01_ModelAdmin.md
@@ -124,7 +124,7 @@ searched results. Every [api:DataObject] can have its own context, based on the
 class makes a guess at how those fields should be searched, e.g. showing a checkbox for any boolean fields in your
 `$db` definition.
 
-To remove, add or modify searchable fields, define a new `[api:DataObject::$searchable_fields]` static on your model
+To remove, add or modify searchable fields, define a new [api:DataObject::$searchable_fields] static on your model
 class (see [SearchContext](../search/searchcontext) docs for details).
 
 **mysite/code/Product.php**
@@ -167,7 +167,7 @@ model class, where you can add or remove columns. To change the title, use [api:
 	   );
 	}
 
-The results list are retrieved from [api:SearchContext->getResults], based on the parameters passed through the search
+The results list are retrieved from [api:SearchContext::getResults()], based on the parameters passed through the search
 form. If no search parameters are given, the results will show every record. Results are a [api:DataList] instance, so
 can be customized by additional SQL filters, joins.
 
@@ -225,7 +225,7 @@ checkbox which limits search results to expensive products (over $100).
 		}
 	}
 
-To alter how the results are displayed (via `[api:GridField]`), you can also overload the `getEditForm()` method. For
+To alter how the results are displayed (via [api:GridField]), you can also overload the `getEditForm()` method. For
 example, to add a new component.
 
 **mysite/code/MyAdmin.php**
diff --git a/docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/05_CMS_Architecture.md b/docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/05_CMS_Architecture.md
index f1c4e7f01..0544f2a87 100644
--- a/docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/05_CMS_Architecture.md
+++ b/docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/05_CMS_Architecture.md
@@ -3,8 +3,8 @@
 ## Introduction
 
 A lot can be achieved in SilverStripe by adding properties and form fields
-to your own page types (via `[api:SiteTree->getCMSFields()]`), as well as creating
-your own data management interfaces through `[api:ModelAdmin]`. But sometimes
+to your own page types (via [api:SiteTree::getCMSFields()]), as well as creating
+your own data management interfaces through [api:ModelAdmin]. But sometimes
 you'll want to go deeper and tailor the underlying interface to your needs as well.
 For example, to build a personalized CMS dashboard, or content "slots" where authors
 can drag their content into. At its core, SilverStripe is a web application
@@ -51,14 +51,14 @@ See our [system requirements](/getting_started/server_requirements) for a list o
 
 ## Templates and Controllers
 
-The CMS backend is handled through the `[api:LeftAndMain]` controller class,
+The CMS backend is handled through the [api:LeftAndMain] controller class,
 which contains base functionality like displaying and saving a record.
-This is extended through various subclasses, e.g. to add a group hierarchy (`[api:SecurityAdmin]`),
-a search interface (`[api:ModelAdmin]`) or an "Add Page" form (`[api:CMSPageAddController]`).
+This is extended through various subclasses, e.g. to add a group hierarchy ([api:SecurityAdmin]),
+a search interface ([api:ModelAdmin]) or an "Add Page" form ([api:CMSPageAddController]).
 
 The controller structure is too complex to document here, a good starting point
-for following the execution path in code are `[api:LeftAndMain->getRecord()]` and `[api:LeftAndMain->getEditForm()]`.
-If you have the `cms` module installed, have a look at `[api:CMSMain->getEditForm()]` for a good
+for following the execution path in code are [api:LeftAndMain::getRecord()] and [api:LeftAndMain::getEditForm()].
+If you have the `cms` module installed, have a look at [api:CMSMain::getEditForm()] for a good
 example on how to extend the base functionality (e.g. by adding page versioning hints to the form).
 
 CMS templates are inherited based on their controllers, similar to subclasses of
@@ -72,13 +72,13 @@ which is in charge of rendering the main content area apart from the CMS menu.
 Depending on the complexity of your layout, you'll also need to overload the
 "EditForm" template (e.g. `MyCMSController_EditForm.ss`), e.g. to implement
 a tabbed form which only scrolls the main tab areas, while keeping the buttons at the bottom of the frame.
-This requires manual assignment of the template to your form instance, see `[api:CMSMain->getEditForm()]` for details.
+This requires manual assignment of the template to your form instance, see [api:CMSMain::getEditForm()] for details.
 
 Often its useful to have a "tools" panel in between the menu and your content,
 usually occupied by a search form or navigational helper.
 In this case, you can either overload the full base template as described above.
-To avoid duplicating all this template code, you can also use the special `[api:LeftAndMain->Tools()]` and
-`[api:LeftAndMain->EditFormTools()]` methods available in `LeftAndMain`.
+To avoid duplicating all this template code, you can also use the special [api:LeftAndMain::Tools()] and
+[api:LeftAndMain::EditFormTools()] methods available in `LeftAndMain`.
 These placeholders are populated by auto-detected templates,
 with the naming convention of "<controller classname>_Tools.ss" and "<controller classname>_EditFormTools.ss".
 So to add or "subclass" a tools panel, simply create this file and it's automatically picked up.
@@ -94,7 +94,7 @@ Refer to [Layout reference](/developer_guides/customising_the_admin_interface/cm
 ## Forms
 
 SilverStripe constructs forms and its fields within PHP,
-mainly through the `[getCMSFields()](api:DataObject->getCMSFields())` method.
+mainly through the [getCMSFields()](api:DataObject::getCMSFields()) method.
 This in turn means that the CMS loads these forms as HTML via Ajax calls,
 e.g. after saving a record (which requires a form refresh), or switching the section in the CMS.
 
@@ -165,10 +165,10 @@ any particular element.
 ## JavaScript and CSS dependencies via Requirements and Ajax
 
 The JavaScript logic powering the CMS is divided into many files,
-which typically are included via the `[api:Requirements]` class, by adding
-them to `[api:LeftAndMain->init()]` and its subclassed methods.
+which typically are included via the [api:Requirements] class, by adding
+them to [api:LeftAndMain::init()] and its subclassed methods.
 This class also takes care of minification and combination of the files,
-which is crucial for the CMS performance (see `[api:Requirements::combine_files()]`).
+which is crucial for the CMS performance (see [api:Requirements::combine_files()]).
 
 Due to the procedural and selector-driven style of UI programming in jQuery.entwine,
 it can be difficult to find the piece of code responsible for a certain behaviour.
@@ -188,7 +188,7 @@ and [jQuery.delegate](http://api.jquery.com/delegate/), so takes care of dynamic
 Most interfaces will require their own JavaScript and CSS files, so the Ajax loading has
 to ensure they're loaded unless already present. A custom-built library called
 `jQuery.ondemand` (located in `framework/thirdparty`) takes care of this transparently -
-so as a developer just declare your dependencies through the `[api:Requirements]` API.
+so as a developer just declare your dependencies through the [api:Requirements] API.
 
 ## Ajax Loading and Browser History
 
@@ -220,10 +220,10 @@ we often want to update these sections independently from their neighbouring con
 
 In order for this to work, the CMS templates declare certain sections as "PJAX fragments"
 through a `data-pjax-fragment` attribute. These names correlate to specific
-rendering logic in the PHP controllers, through the `[api:PjaxResponseNegotiator]` class.
+rendering logic in the PHP controllers, through the [api:PjaxResponseNegotiator] class.
 
 Through a custom `X-Pjax` HTTP header, the client can declare which view they're expecting,
-through identifiers like `CurrentForm` or `Content` (see `[api:LeftAndMain->getResponseNegotiator()]`).
+through identifiers like `CurrentForm` or `Content` (see [api:LeftAndMain::getResponseNegotiator()]).
 These identifiers are passed to `loadPanel()` via the `pjax` data option.
 The HTTP response is a JSON object literal, with template replacements keyed by their Pjax fragment.
 Through PHP callbacks, we ensure that only the required template parts are actually executed and rendered.
@@ -402,11 +402,11 @@ when using an input of type button, submit or reset, support is limited to plain
 
 ## Menu
 
-The navigation menu in the CMS is created through the `[api:CMSMenu]` API,
+The navigation menu in the CMS is created through the [api:CMSMenu] API,
 which auto-detects all subclasses of `LeftAndMain`. This means that your custom
 `ModelAdmin` subclasses will already appear in there without any explicit definition.
-To modify existing menu entries or create new ones, see `[api:CMSMenu::add_menu_item()]`
-and `[api:CMSMenu::remove_menu_item()]`.
+To modify existing menu entries or create new ones, see [api:CMSMenu::add_menu_item()]
+and [api:CMSMenu::remove_menu_item()].
 
 New content panels are typically loaded via Ajax, which might change
 the current menu context. For example, a link to edit a file might be clicked
@@ -422,7 +422,7 @@ which is picked up by the menu:
 		return 'my response';
 	}
 
-This is usually handled by the existing `[api:LeftAndMain]` logic,
+This is usually handled by the existing [api:LeftAndMain] logic,
 so you don't need to worry about it. The same concept applies for
 'X-Title' (change the window title) and 'X-ControllerURL' (change the URL recorded in browser history).
 Note: You can see any additional HTTP headers through the web developer tools in your browser of choice.
@@ -437,13 +437,13 @@ For more information, see the [Howto: Customise the CMS tree](/developer_guides/
 
 Note that a similar tree logic is also used for the
 form fields to select one or more entries from those hierarchies
-(`[api:TreeDropdownField]` and `[api:TreeMultiselectField]`).
+([api:TreeDropdownField] and [api:TreeMultiselectField]).
 
 ## Tabs
 
 We're using [jQuery UI tabs](http://jqueryui.com/), but in a customised fashion.
 HTML with tabs can be created either directly through HTML templates in the CMS,
-or indirectly through a `[api:TabSet]` form field. Since tabsets are useable
+or indirectly through a [api:TabSet] form field. Since tabsets are useable
 outside of the CMS as well, the baseline application of tabs happens via
 a small wrapper around `jQuery.tabs()` stored in `TabSet.js`.
 
diff --git a/docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/06_Javascript_Development.md b/docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/06_Javascript_Development.md
index a91150247..5888f9d81 100644
--- a/docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/06_Javascript_Development.md
+++ b/docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/06_Javascript_Development.md
@@ -352,7 +352,7 @@ attributes, or the jQuery.metadata plugin). For returning status messages, pleas
 
 Only return evaluated JavaScript snippets if unavoidable. Most of the time you can just pass data around, and let the
 clientside react to changes appropriately without telling it directly through JavaScript in AJAX responses. Don't use
-the `[api:Form]` SilverStripe class, which is built solely around
+the [api:Form] SilverStripe class, which is built solely around
 this inflexible concept.
 
 Example: Autocomplete input field loading page matches through AJAX
@@ -423,7 +423,7 @@ JavaScript:
 
 Although they are the minority of cases, there are times when a simple HTML fragment isn't enough.  For example, if you
 have server side code that needs to trigger the update of a couple of elements in the CMS left-hand tree, it would be
-inefficient to send back the HTML of entire tree. SilverStripe can serialize to and from JSON (see the `[api:Convert]` class), and jQuery deals very well with it through
+inefficient to send back the HTML of entire tree. SilverStripe can serialize to and from JSON (see the [api:Convert] class), and jQuery deals very well with it through
 [jQuery.getJSON()](http://docs.jquery.com/Ajax/jQuery.getJSON#urldatacallback), as long as the HTTP content-type is
 properly set.
 
@@ -582,4 +582,4 @@ Example: JSpec Shopping cart test (from [visionmedia.github.com](http://visionme
 ## Related
 
 * [Unobtrusive Javascript](http://www.onlinetools.org/articles/unobtrusivejavascript/chapter1.html)
-* [Quirksmode: In-depth Javascript Resources](http://www.quirksmode.org/resources.html)
\ No newline at end of file
+* [Quirksmode: In-depth Javascript Resources](http://www.quirksmode.org/resources.html)
diff --git a/docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Customise_CMS_Menu.md b/docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Customise_CMS_Menu.md
index 597993fdf..eac6d62db 100644
--- a/docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Customise_CMS_Menu.md
+++ b/docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Customise_CMS_Menu.md
@@ -2,10 +2,10 @@
 
 ## Adding an administration panel
 
-Every time you add a new extension of the `[api:LeftAndMain]` class to the CMS,
-SilverStripe will automatically create a new `[api:CMSMenuItem]` for it
+Every time you add a new extension of the [api:LeftAndMain] class to the CMS,
+SilverStripe will automatically create a new [api:CMSMenuItem] for it
 
-The most popular extension of LeftAndMain is a `[api:ModelAdmin]` class, so
+The most popular extension of LeftAndMain is a [api:ModelAdmin] class, so
 for a more detailed introduction to creating new `ModelAdmin` interfaces, read
 the [ModelAdmin reference](../modeladmin).
 
@@ -51,7 +51,7 @@ On top of your administration windows, the menu can also have external links
 (e.g. to external reference). In this example, we're going to add a link to
 Google to the menu.
 
-First, we need to define a `[api:LeftAndMainExtension]` which will contain our
+First, we need to define a [api:LeftAndMainExtension] which will contain our
 button configuration.
 
 	:::php
diff --git a/docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Customise_CMS_Pages_List.md b/docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Customise_CMS_Pages_List.md
index 6210ef23b..4568ce429 100644
--- a/docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Customise_CMS_Pages_List.md
+++ b/docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Customise_CMS_Pages_List.md
@@ -10,8 +10,8 @@ as well as sort and filter them in a way that would be hard to achieve in a tree
 But sometimes the default behaviour isn't powerful enough, and you want a more
 specific list view for certain page types, for example to sort the list by
 a different criteria, or add more columns to filter on. The resulting
-form is mainly based around a `[GridField](/reference/grid-field)` instance,
-which in turn includes all children in a `[DataList](/topics/datamodel)`.
+form is mainly based around a [GridField](/reference/grid-field) instance,
+which in turn includes all children in a [DataList](/topics/datamodel).
 You can use these two classes as a starting point for your customizations.
 
 Here's a brief example on how to add sorting and a new column for a
@@ -69,4 +69,4 @@ Now you just need to enable the extension in your [configuration file](../../con
 	  extensions:
 	    - NewsPageHolderCMSMainExtension
 
-You're all set! Don't forget to flush the caches by appending `?flush=all` to the URL.
\ No newline at end of file
+You're all set! Don't forget to flush the caches by appending `?flush=all` to the URL.
diff --git a/docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Customise_CMS_Tree.md b/docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Customise_CMS_Tree.md
index 46193e87e..8377cdf75 100644
--- a/docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Customise_CMS_Tree.md
+++ b/docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Customise_CMS_Tree.md
@@ -7,10 +7,10 @@ by the [jstree](http://jstree.com) library. It is configured through
 `framework/admin/javascript/LeftAndMain.Tree.js`, as well as some
 HTML5 metadata generated on its container (see the `data-hints` attribute).
 
-The tree is rendered through `[api:LeftAndMain->getSiteTreeFor()]`,
+The tree is rendered through [api:LeftAndMain::getSiteTreeFor()],
 which recursively collects all nodes based on various filtering criteria.
-The node strictly just has to implement the `[api:Hierarchy]` extension,
-but in the CMS usually is a `[api:SiteTree]` object.
+The node strictly just has to implement the [api:Hierarchy] extension,
+but in the CMS usually is a [api:SiteTree] object.
 
 ## Add status lozenges to tree nodes
 
@@ -43,13 +43,13 @@ code like this:
 By applying the proper style sheet, the snippet html above could produce the look of:
 ![Page Node Screenshot](../../../_images/tree_node.png "Page Node")
 
-SiteTree is a `[api:DataObject]` which is versioned by `[api:Versioned]` extension.
+SiteTree is a [api:DataObject] which is versioned by [api:Versioned] extension.
 Each node can optionally have publication status flags, e.g. "Removed from draft".
 Each flag has a unique identifier, which is also used as a CSS class for easier styling.
 
 Developers can easily add a new flag, delete or alter an existing flag on how it is looked
 or changing the flag label. The customization of these lozenges could be done either through
-inherited subclass or `[api:DataExtension]`. It is just really about how we change the return
+inherited subclass or [api:DataExtension]. It is just really about how we change the return
 value of function `SiteTree->getTreeTitle()` by two easily extendable methods
 `SiteTree->getStatusClass()` and `SiteTree->getStatusFlags()`.
 
@@ -74,7 +74,7 @@ __Example: using a subclass__
 		}
 	}
 
-The above subclass of `[api:SiteTree]` will add a new flag for indicating its
+The above subclass of [api:SiteTree] will add a new flag for indicating its
 __'Scheduled To Publish'__ status. The look of the page node will be changed
 from ![Normal Page Node](../../../_images/page_node_normal.png) to ![Scheduled Page Node](../../../_images/page_node_scheduled.png). The getStatusFlags has an `updateStatusFlags()`
 extension point, so the flags can be modified through `DataExtension` rather than
diff --git a/docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Customise_Site_Reports.md b/docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Customise_Site_Reports.md
index fdc65d01c..6b927aa09 100644
--- a/docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Customise_Site_Reports.md
+++ b/docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Customise_Site_Reports.md
@@ -71,4 +71,4 @@ More useful reports can be created by changing the `DataList` returned in the `s
 *  More examples
 
 ## API documentation
-`[api:ReportAdmin]`
+[api:ReportAdmin]
diff --git a/docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Extending_An_Existing_ModelAdmin.md b/docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Extending_An_Existing_ModelAdmin.md
index f1cc60c2f..d0b087821 100644
--- a/docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Extending_An_Existing_ModelAdmin.md
+++ b/docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Extending_An_Existing_ModelAdmin.md
@@ -1,7 +1,7 @@
 ## Extending existing ModelAdmin
 
 Sometimes you'll work with ModelAdmins from other modules. To customize these interfaces, you can always subclass. But there's
-also another tool at your disposal: The `[api:Extension]` API.
+also another tool at your disposal: The [api:Extension] API.
 
 	:::php
 	class MyAdminExtension extends Extension {
@@ -19,4 +19,4 @@ Now enable this extension through your `[config.yml](/topics/configuration)` fil
 	    - MyAdminExtension
 
 The following extension points are available: `updateEditForm()`, `updateSearchContext()`,
-`updateSearchForm()`, `updateList()`, `updateImportForm`.
\ No newline at end of file
+`updateSearchForm()`, `updateList()`, `updateImportForm`.
diff --git a/docs/en/02_Developer_Guides/16_Execution_Pipeline/01_Flushable.md b/docs/en/02_Developer_Guides/16_Execution_Pipeline/01_Flushable.md
index e46ef19b5..ffe7cf975 100644
--- a/docs/en/02_Developer_Guides/16_Execution_Pipeline/01_Flushable.md
+++ b/docs/en/02_Developer_Guides/16_Execution_Pipeline/01_Flushable.md
@@ -6,17 +6,17 @@ summary: Allows a class to define it's own flush functionality.
 ## Introduction
 
 Allows a class to define it's own flush functionality, which is triggered when `flush=1` is requested in the URL.
-`[api:FlushRequestFilter]` is run before a request is made, calling `flush()` statically on all
-implementors of `[api:Flushable]`.
+[api:FlushRequestFilter] is run before a request is made, calling `flush()` statically on all
+implementors of [api:Flushable].
 
 ## Usage
 
-To use this API, you need to make your class implement `[api:Flushable]`, and define a `flush()` static function,
+To use this API, you need to make your class implement [api:Flushable], and define a `flush()` static function,
 this defines the actions that need to be executed on a flush request.
 
 ### Using with SS_Cache
 
-This example uses `[api:SS_Cache]` in some custom code, and the same cache is cleaned on flush:
+This example uses [api:SS_Cache] in some custom code, and the same cache is cleaned on flush:
 
 	:::php
 	<?php
diff --git a/docs/en/02_Developer_Guides/16_Execution_Pipeline/02_Manifests.md b/docs/en/02_Developer_Guides/16_Execution_Pipeline/02_Manifests.md
index e85a94693..bbeb37613 100644
--- a/docs/en/02_Developer_Guides/16_Execution_Pipeline/02_Manifests.md
+++ b/docs/en/02_Developer_Guides/16_Execution_Pipeline/02_Manifests.md
@@ -26,15 +26,15 @@ You can write your own adapters by implementing the `ManifestCache` interface.
 ## Traversing the Filesystem
 
 Since manifests usually extract their information from files in the webroot,
-they require a powerful traversal tool: `[api:SS_FileFinder]`.
+they require a powerful traversal tool: [api:SS_FileFinder].
 The class provides filtering abilities for files and folders, as well as
 callbacks for recursive traversal. Each manifest has its own implementation,
-for example `[api:ManifestFileFinder]`, adding more domain specific filtering
+for example [api:ManifestFileFinder], adding more domain specific filtering
 like including themes, or excluding testss.
 
 ## PHP Class Manifest
 
-The `[api:ClassManifest]` builds a manifest of all classes, interfaces and some
+The [api:ClassManifest] builds a manifest of all classes, interfaces and some
 additional items present in a directory, and caches it.
 
 It finds the following information:
@@ -44,15 +44,15 @@ It finds the following information:
  * All implementors of an interface
  * All module configuration files
 
-The gathered information can be accessed through `[api:SS_ClassLoader::instance()]`,
-as well as `[api:ClassInfo]`. Some useful commands of the `ClassInfo` API:
+The gathered information can be accessed through [api:SS_ClassLoader::instance()],
+as well as [api:ClassInfo]. Some useful commands of the `ClassInfo` API:
 
  * `ClassInfo::subclassesFor($class)`: Returns a list of classes that inherit from the given class
  * `ClassInfo::ancestry($class)`: Returns the passed class name along with all its parent class names
  * `ClassInfo::implementorsOf($interfaceName)`: Returns all classes implementing the passed in interface
 
 In the absence of a generic module API, it is also the primary way to identify
-which modules are installed, through `[api:ClassManifest::getModules()]`.
+which modules are installed, through [api:ClassManifest::getModules()].
 A module is defined as a toplevel folder in the webroot which contains
 either a `_config.php` file, or a `_config/` folder. Modules can be specifically
 excluded from manifests by creating a blank `_manifest_exclude` file in the module folder.
@@ -62,14 +62,14 @@ a `tests/` folder, unless tests are executed.
 
 ## Template Manifest
 
-The `[api:SS_TemplateManifest]` class builds a manifest of all templates present in a directory,
+The [api:SS_TemplateManifest] class builds a manifest of all templates present in a directory,
 in both modules and themes. Templates in `tests/` folders are automatically excluded.
 The chapter on [template inheritance](../templates/template_inheritance) provides more details
 on its operation.
 
 ## Config Manifest
 
-The `[api:SS_ConfigManifest]` loads builds a manifest of configuration items,
+The [api:SS_ConfigManifest] loads builds a manifest of configuration items,
 for both PHP and YAML. It also takes care of ordering and merging configuration fragments.
 The chapter on [configuration](../configuration) has more details.
 
@@ -80,4 +80,4 @@ on any classes that implement the [Flushable](flushable) interface.
 This enables developers to clear [manifest caches](manifests),
 for example when adding new templates or PHP classes.
 Note that you need to be in [dev mode](/getting_started/environment_management)
-or logged-in as an administrator for flushing to take effect.
\ No newline at end of file
+or logged-in as an administrator for flushing to take effect.
diff --git a/docs/en/02_Developer_Guides/16_Execution_Pipeline/index.md b/docs/en/02_Developer_Guides/16_Execution_Pipeline/index.md
index 8d8ca4b6f..991f8ce51 100644
--- a/docs/en/02_Developer_Guides/16_Execution_Pipeline/index.md
+++ b/docs/en/02_Developer_Guides/16_Execution_Pipeline/index.md
@@ -93,7 +93,7 @@ All requests go through `framework/main.php`, which sets up the execution enviro
  * Optionally regenerates these manifests (if a ["flush" query parameter](flushable) is set)
  * Executes all procedural configuration defined through `_config.php` in all discovered modules
  * Loads the Composer PHP class autoloader
- * Hands control over to `[api:Director]`
+ * Hands control over to [api:Director]
 
 While you usually don't need to modify the bootstrap on this level, some deeper customizations like
 adding your own manifests or a performance-optimized routing might require it.
@@ -103,19 +103,19 @@ before handing control off to SilverStripe's own `main.php`.
 
 ## Routing and Request Handling
 
-The `main.php` script relies on `[api:Director]` to work out which [controller](../controllers/) should handle this request. It parses the URL, matching it to one of a number of patterns, 
+The `main.php` script relies on [api:Director] to work out which [controller](../controllers/) should handle this request. It parses the URL, matching it to one of a number of patterns, 
 and determines the controller, action and any argument to be used ([Routing](../controllers/routing)).
 
- * Creates a `[api:SS_HTTPRequest]` object containing all request and environment information
+ * Creates a [api:SS_HTTPRequest] object containing all request and environment information
  * The [session](../cookies_and_sessions/sessions) holds an abstraction of PHP session
  * Instantiates a [controller](../controllers/) object
- * The `[api:Injector]` is first referenced, and asks the registered 
+ * The [api:Injector] is first referenced, and asks the registered 
    [RequestFilter](../controllers/requestfilters)
    to pre-process the request object (see below)
- * The `Controller` executes the actual business logic and populates an `[api:SS_HTTPResponse]`
+ * The `Controller` executes the actual business logic and populates an [api:SS_HTTPResponse]
  * The `Controller` can optionally hand off control to further nested controllers
  * The `Controller` optionally renders a response body through `SSViewer` [templates](../templates)
- * The `[api:RequestProcessor]` is called to post-process the request to allow 
+ * The [api:RequestProcessor] is called to post-process the request to allow 
 further filtering before content is sent to the end user
  * The response is output to the client
 
diff --git a/docs/en/05_Contributing/02_Release_Process.md b/docs/en/05_Contributing/02_Release_Process.md
index 92b3b19e1..cd0ac396b 100644
--- a/docs/en/05_Contributing/02_Release_Process.md
+++ b/docs/en/05_Contributing/02_Release_Process.md
@@ -51,7 +51,7 @@ so we strive for giving ample warning on any upcoming changes through a "depreca
 How to deprecate an API:
 
 *  Add a `@deprecated` item to the docblock tag, with a `{@link <class>}` item pointing to the new API to use.
-*  Update the deprecated code to throw a `[api:Deprecation::notice()]` error.
+*  Update the deprecated code to throw a [api:Deprecation::notice()] error.
 *  Both the docblock and error message should contain the **target version** where the functionality is removed.
    So, if you're committing the change to a *3.1* minor release, the target version will be *4.0*. 
 *  Deprecations should not be committed to patch releases
diff --git a/docs/en/index.md b/docs/en/index.md
index b72d3add5..d0089ffd3 100644
--- a/docs/en/index.md
+++ b/docs/en/index.md
@@ -20,7 +20,7 @@ community. There are also several other websites with SilverStripe documentation
 * The [API Documentation](http://api.silverstripe.org/) contains technical reference and class information. 
 * The [User Help](http://userhelp.silverstripe.com) website contains documentation related to working within the CMS. 
 
-New features, API changes and the development [roadmap](http://www.silverstripe.org/roadmap/) for the product are 
+New features, API changes and the development [roadmap](http://www.silverstripe.org/software/roadmap/) for the product are 
 discussed on the [core mailinglist](https://groups.google.com/forum/#!forum/silverstripe-dev) along with 
 [UserVoice](http://silverstripe.uservoice.com/forums/251266-new-features).
 

From cfd1a5d69674e7269f02f3cfa3ddd211b2beb076 Mon Sep 17 00:00:00 2001
From: Damian Mooyman <damian@silverstripe.com>
Date: Fri, 19 Feb 2016 10:21:03 +1300
Subject: [PATCH 03/30] Update translations

---
 admin/javascript/lang/es.js        |   4 +-
 admin/javascript/lang/fa_IR.js     |  23 ++
 admin/javascript/lang/fi.js        |  14 +-
 admin/javascript/lang/src/es.js    |   4 +-
 admin/javascript/lang/src/fa_IR.js |  17 ++
 admin/javascript/lang/src/fi.js    |  14 +-
 admin/javascript/lang/src/sv.js    |   6 +-
 admin/javascript/lang/sv.js        |   6 +-
 javascript/lang/fa_IR.js           |  47 +++++
 javascript/lang/src/fa_IR.js       |  41 ++++
 lang/af.yml                        |   4 -
 lang/ar.yml                        |   5 -
 lang/bg.yml                        |   3 -
 lang/bs.yml                        |   9 +
 lang/cs.yml                        |  18 +-
 lang/de.yml                        |  20 +-
 lang/en.yml                        |  10 +
 lang/eo.yml                        |  12 +-
 lang/es.yml                        |  20 +-
 lang/es_MX.yml                     |   1 -
 lang/et_EE.yml                     |  13 +-
 lang/fa_IR.yml                     | 328 ++++++++++++++++++++++++++---
 lang/fi.yml                        | 106 ++++++----
 lang/fr.yml                        |   4 -
 lang/gl_ES.yml                     |   1 -
 lang/hr.yml                        |   1 -
 lang/id.yml                        |   5 -
 lang/id_ID.yml                     |   5 -
 lang/it.yml                        |   5 -
 lang/ja.yml                        |   4 -
 lang/lt.yml                        |  16 +-
 lang/mi.yml                        |   4 -
 lang/nb.yml                        |   5 -
 lang/nl.yml                        |   5 -
 lang/pl.yml                        |   5 -
 lang/pt.yml                        |   1 -
 lang/ro.yml                        |   1 -
 lang/ru.yml                        |   5 -
 lang/sk.yml                        |  44 ++--
 lang/sl.yml                        |   5 -
 lang/sr.yml                        |   5 -
 lang/sr@latin.yml                  |   5 -
 lang/sr_RS.yml                     |   5 -
 lang/sr_RS@latin.yml               |   5 -
 lang/sv.yml                        |  22 +-
 lang/th.yml                        |   4 -
 lang/uk.yml                        |   1 -
 lang/zh.yml                        |   5 -
 48 files changed, 651 insertions(+), 242 deletions(-)
 create mode 100644 admin/javascript/lang/fa_IR.js
 create mode 100644 admin/javascript/lang/src/fa_IR.js
 create mode 100644 javascript/lang/fa_IR.js
 create mode 100644 javascript/lang/src/fa_IR.js

diff --git a/admin/javascript/lang/es.js b/admin/javascript/lang/es.js
index dbbdde2ad..982a6fd56 100644
--- a/admin/javascript/lang/es.js
+++ b/admin/javascript/lang/es.js
@@ -9,8 +9,8 @@ if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
     "CMSMAIN.BATCH_PUBLISH_PROMPT": "Ud tiene {num} página(s) seleccionada(s).\n\n¿Realmente la(s) quiere publicar?",
     "CMSMAIN.BATCH_DELETE_PROMPT": "Ud tiene {num} página(s) seleccionada(s).\n\n¿Realmente quiere eliminarla(s)?",
     "CMSMAIN.BATCH_ARCHIVE_PROMPT": "Ud tiene {num} páginas seleccionadas.\n\n¿Está seguro de querer archivar estas páginas?\n\nEstas páginas y sus hijas se retirarán de publicación y se enviarán al archivo.",
-    "CMSMAIN.BATCH_RESTORE_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to restore to stage?\n\nChildren of archived pages will be restored to the root level, unless those pages are also being restored.",
-    "CMSMAIN.BATCH_DELETELIVE_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to delete these pages from live?",
+    "CMSMAIN.BATCH_RESTORE_PROMPT": "Ud tiene {num} páginas seleccionadas.\n\n¿Está seguro de querer restaurar estas páginas?\n\nLos hijos de las páginas archivadas serán restauradas al nivel raíz a no ser que esas páginas también sean restauradas.",
+    "CMSMAIN.BATCH_DELETELIVE_PROMPT": "Ud tiene {num} página(s) seleccionada(s).\n\n¿Realmente quieres eliminarla(s) desde el sitio en vivo?",
     "LeftAndMain.CONFIRMUNSAVED": "¿Estás seguro que quieres navegar fuera de esta página?⏎\n⏎\nADVERTENCIA: Tus cambios no han sido guardados.⏎\n⏎\nPresionar OK para continuar o Cancelar para continuar en la página actual",
     "LeftAndMain.CONFIRMUNSAVEDSHORT": "ADVERTENCIA: Tus cambios no han sido guardados.",
     "SecurityAdmin.BATCHACTIONSDELETECONFIRM": "¿Realmente quieres eliminar el grupo %s?",
diff --git a/admin/javascript/lang/fa_IR.js b/admin/javascript/lang/fa_IR.js
new file mode 100644
index 000000000..d061aa0ca
--- /dev/null
+++ b/admin/javascript/lang/fa_IR.js
@@ -0,0 +1,23 @@
+// This file was generated by silverstripe/cow from admin/javascript/lang/src/fa_IR.js.
+// See https://github.com/tractorcow/cow for details
+if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
+	if(typeof(console) != 'undefined') console.error('Class ss.i18n not defined');
+} else {
+	ss.i18n.addDictionary('fa_IR', {
+    "CMSMAIN.SELECTONEPAGE": "لطفاً حداقل ۱ صفحه را انتخاب نمایید.",
+    "CMSMAIN.BATCH_UNPUBLISH_PROMPT": "شما {num} صفحه را انتخاب کرده‌اید.\n\nآیا واقعاً می‌خواهید انتشار آن‌ها را لغو نمایید",
+    "CMSMAIN.BATCH_PUBLISH_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to publish?",
+    "CMSMAIN.BATCH_DELETE_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to delete?",
+    "CMSMAIN.BATCH_ARCHIVE_PROMPT": "You have {num} page(s) selected.\n\nAre you sure you want to archive these pages?\n\nThese pages and all of their children pages will be unpublished and sent to the archive.",
+    "CMSMAIN.BATCH_RESTORE_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to restore to stage?\n\nChildren of archived pages will be restored to the root level, unless those pages are also being restored.",
+    "CMSMAIN.BATCH_DELETELIVE_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to delete these pages from live?",
+    "LeftAndMain.CONFIRMUNSAVED": "Are you sure you want to navigate away from this page?\n\nWARNING: Your changes have not been saved.\n\nPress OK to continue, or Cancel to stay on the current page.",
+    "LeftAndMain.CONFIRMUNSAVEDSHORT": "WARNING: Your changes have not been saved.",
+    "SecurityAdmin.BATCHACTIONSDELETECONFIRM": "Do you really want to delete %s groups?",
+    "ModelAdmin.SAVED": "ذخیره شده",
+    "ModelAdmin.REALLYDELETE": "Do you really want to delete?",
+    "ModelAdmin.DELETED": "حذف شده",
+    "ModelAdmin.VALIDATIONERROR": "خطای اعتبار‌سنجی",
+    "LeftAndMain.PAGEWASDELETED": "This page was deleted.  To edit a page, select it from the left."
+});
+}
\ No newline at end of file
diff --git a/admin/javascript/lang/fi.js b/admin/javascript/lang/fi.js
index 7998c32be..d11ad45b8 100644
--- a/admin/javascript/lang/fi.js
+++ b/admin/javascript/lang/fi.js
@@ -4,13 +4,13 @@ if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
 	if(typeof(console) != 'undefined') console.error('Class ss.i18n not defined');
 } else {
 	ss.i18n.addDictionary('fi', {
-    "CMSMAIN.SELECTONEPAGE": "Please select at least one page",
-    "CMSMAIN.BATCH_UNPUBLISH_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to unpublish",
-    "CMSMAIN.BATCH_PUBLISH_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to publish?",
-    "CMSMAIN.BATCH_DELETE_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to delete?",
-    "CMSMAIN.BATCH_ARCHIVE_PROMPT": "You have {num} page(s) selected.\n\nAre you sure you want to archive these pages?\n\nThese pages and all of their children pages will be unpublished and sent to the archive.",
-    "CMSMAIN.BATCH_RESTORE_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to restore to stage?\n\nChildren of archived pages will be restored to the root level, unless those pages are also being restored.",
-    "CMSMAIN.BATCH_DELETELIVE_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to delete these pages from live?",
+    "CMSMAIN.SELECTONEPAGE": "Valitse vähintään yksi sivu",
+    "CMSMAIN.BATCH_UNPUBLISH_PROMPT": "Sinulla on {num} sivu(a) valittuna.\n\nHaluatko varmasti poistaa julkaisusta?",
+    "CMSMAIN.BATCH_PUBLISH_PROMPT": "Sinulla on {num} sivu(a) valittuna.\n\nHaluatko varmasti julkaista?",
+    "CMSMAIN.BATCH_DELETE_PROMPT": "Sinulla on {num} sivu(a) valittuna.\n\nHaluatko varmasti poistaa?",
+    "CMSMAIN.BATCH_ARCHIVE_PROMPT": "Sinulla on {num} sivu(a) valittuna.\n\nHaluatko varmasti arkistoida nämä sivut?\n\nValitut sivut ja kaikki niiden alasivut poistetaan julkaisusta sekä siirretään arkistoon.",
+    "CMSMAIN.BATCH_RESTORE_PROMPT": "Sinulla on {num} sivu(a) valittuna.\n\nHaluatko varmasti palauttaa sivut?\n\nArkistoitujen sivujen alasivut palautetaan juuritasolle, jos niitä sivuja ei palauteta.",
+    "CMSMAIN.BATCH_DELETELIVE_PROMPT": "Sinulla on {num} sivu(a) valittuna.\n\nHaluatko varmasti poistaa nämä sivut näkyvistä?",
     "LeftAndMain.CONFIRMUNSAVED": "Haluatko varmasti poistua tältä sivulta?\n\nVAROITUS: Muutoksiasi ei ole tallennettu.\n\nPaina OK jatkaaksesi, tai Peruuta pysyäksesi nykyisellä sivulla.",
     "LeftAndMain.CONFIRMUNSAVEDSHORT": "VAROITUS: Muutoksiasi ei ole tallennettu.",
     "SecurityAdmin.BATCHACTIONSDELETECONFIRM": "Haluatko varmasti poistaa %s ryhmät?",
diff --git a/admin/javascript/lang/src/es.js b/admin/javascript/lang/src/es.js
index 9b61d8f71..6de0e6fbe 100644
--- a/admin/javascript/lang/src/es.js
+++ b/admin/javascript/lang/src/es.js
@@ -4,8 +4,8 @@
     "CMSMAIN.BATCH_PUBLISH_PROMPT": "Ud tiene {num} página(s) seleccionada(s).\n\n¿Realmente la(s) quiere publicar?",
     "CMSMAIN.BATCH_DELETE_PROMPT": "Ud tiene {num} página(s) seleccionada(s).\n\n¿Realmente quiere eliminarla(s)?",
     "CMSMAIN.BATCH_ARCHIVE_PROMPT": "Ud tiene {num} páginas seleccionadas.\n\n¿Está seguro de querer archivar estas páginas?\n\nEstas páginas y sus hijas se retirarán de publicación y se enviarán al archivo.",
-    "CMSMAIN.BATCH_RESTORE_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to restore to stage?\n\nChildren of archived pages will be restored to the root level, unless those pages are also being restored.",
-    "CMSMAIN.BATCH_DELETELIVE_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to delete these pages from live?",
+    "CMSMAIN.BATCH_RESTORE_PROMPT": "Ud tiene {num} páginas seleccionadas.\n\n¿Está seguro de querer restaurar estas páginas?\n\nLos hijos de las páginas archivadas serán restauradas al nivel raíz a no ser que esas páginas también sean restauradas.",
+    "CMSMAIN.BATCH_DELETELIVE_PROMPT": "Ud tiene {num} página(s) seleccionada(s).\n\n¿Realmente quieres eliminarla(s) desde el sitio en vivo?",
     "LeftAndMain.CONFIRMUNSAVED": "¿Estás seguro que quieres navegar fuera de esta página?⏎\n⏎\nADVERTENCIA: Tus cambios no han sido guardados.⏎\n⏎\nPresionar OK para continuar o Cancelar para continuar en la página actual",
     "LeftAndMain.CONFIRMUNSAVEDSHORT": "ADVERTENCIA: Tus cambios no han sido guardados.",
     "SecurityAdmin.BATCHACTIONSDELETECONFIRM": "¿Realmente quieres eliminar el grupo %s?",
diff --git a/admin/javascript/lang/src/fa_IR.js b/admin/javascript/lang/src/fa_IR.js
new file mode 100644
index 000000000..3ba710b88
--- /dev/null
+++ b/admin/javascript/lang/src/fa_IR.js
@@ -0,0 +1,17 @@
+{
+    "CMSMAIN.SELECTONEPAGE": "لطفاً حداقل ۱ صفحه را انتخاب نمایید.",
+    "CMSMAIN.BATCH_UNPUBLISH_PROMPT": "شما {num} صفحه را انتخاب کرده‌اید.\n\nآیا واقعاً می‌خواهید انتشار آن‌ها را لغو نمایید",
+    "CMSMAIN.BATCH_PUBLISH_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to publish?",
+    "CMSMAIN.BATCH_DELETE_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to delete?",
+    "CMSMAIN.BATCH_ARCHIVE_PROMPT": "You have {num} page(s) selected.\n\nAre you sure you want to archive these pages?\n\nThese pages and all of their children pages will be unpublished and sent to the archive.",
+    "CMSMAIN.BATCH_RESTORE_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to restore to stage?\n\nChildren of archived pages will be restored to the root level, unless those pages are also being restored.",
+    "CMSMAIN.BATCH_DELETELIVE_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to delete these pages from live?",
+    "LeftAndMain.CONFIRMUNSAVED": "Are you sure you want to navigate away from this page?\n\nWARNING: Your changes have not been saved.\n\nPress OK to continue, or Cancel to stay on the current page.",
+    "LeftAndMain.CONFIRMUNSAVEDSHORT": "WARNING: Your changes have not been saved.",
+    "SecurityAdmin.BATCHACTIONSDELETECONFIRM": "Do you really want to delete %s groups?",
+    "ModelAdmin.SAVED": "ذخیره شده",
+    "ModelAdmin.REALLYDELETE": "Do you really want to delete?",
+    "ModelAdmin.DELETED": "حذف شده",
+    "ModelAdmin.VALIDATIONERROR": "خطای اعتبار‌سنجی",
+    "LeftAndMain.PAGEWASDELETED": "This page was deleted.  To edit a page, select it from the left."
+}
\ No newline at end of file
diff --git a/admin/javascript/lang/src/fi.js b/admin/javascript/lang/src/fi.js
index 7a3c95d99..305661df8 100644
--- a/admin/javascript/lang/src/fi.js
+++ b/admin/javascript/lang/src/fi.js
@@ -1,11 +1,11 @@
 {
-    "CMSMAIN.SELECTONEPAGE": "Please select at least one page",
-    "CMSMAIN.BATCH_UNPUBLISH_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to unpublish",
-    "CMSMAIN.BATCH_PUBLISH_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to publish?",
-    "CMSMAIN.BATCH_DELETE_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to delete?",
-    "CMSMAIN.BATCH_ARCHIVE_PROMPT": "You have {num} page(s) selected.\n\nAre you sure you want to archive these pages?\n\nThese pages and all of their children pages will be unpublished and sent to the archive.",
-    "CMSMAIN.BATCH_RESTORE_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to restore to stage?\n\nChildren of archived pages will be restored to the root level, unless those pages are also being restored.",
-    "CMSMAIN.BATCH_DELETELIVE_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to delete these pages from live?",
+    "CMSMAIN.SELECTONEPAGE": "Valitse vähintään yksi sivu",
+    "CMSMAIN.BATCH_UNPUBLISH_PROMPT": "Sinulla on {num} sivu(a) valittuna.\n\nHaluatko varmasti poistaa julkaisusta?",
+    "CMSMAIN.BATCH_PUBLISH_PROMPT": "Sinulla on {num} sivu(a) valittuna.\n\nHaluatko varmasti julkaista?",
+    "CMSMAIN.BATCH_DELETE_PROMPT": "Sinulla on {num} sivu(a) valittuna.\n\nHaluatko varmasti poistaa?",
+    "CMSMAIN.BATCH_ARCHIVE_PROMPT": "Sinulla on {num} sivu(a) valittuna.\n\nHaluatko varmasti arkistoida nämä sivut?\n\nValitut sivut ja kaikki niiden alasivut poistetaan julkaisusta sekä siirretään arkistoon.",
+    "CMSMAIN.BATCH_RESTORE_PROMPT": "Sinulla on {num} sivu(a) valittuna.\n\nHaluatko varmasti palauttaa sivut?\n\nArkistoitujen sivujen alasivut palautetaan juuritasolle, jos niitä sivuja ei palauteta.",
+    "CMSMAIN.BATCH_DELETELIVE_PROMPT": "Sinulla on {num} sivu(a) valittuna.\n\nHaluatko varmasti poistaa nämä sivut näkyvistä?",
     "LeftAndMain.CONFIRMUNSAVED": "Haluatko varmasti poistua tältä sivulta?\n\nVAROITUS: Muutoksiasi ei ole tallennettu.\n\nPaina OK jatkaaksesi, tai Peruuta pysyäksesi nykyisellä sivulla.",
     "LeftAndMain.CONFIRMUNSAVEDSHORT": "VAROITUS: Muutoksiasi ei ole tallennettu.",
     "SecurityAdmin.BATCHACTIONSDELETECONFIRM": "Haluatko varmasti poistaa %s ryhmät?",
diff --git a/admin/javascript/lang/src/sv.js b/admin/javascript/lang/src/sv.js
index 14be29147..dfc5165d2 100644
--- a/admin/javascript/lang/src/sv.js
+++ b/admin/javascript/lang/src/sv.js
@@ -3,9 +3,9 @@
     "CMSMAIN.BATCH_UNPUBLISH_PROMPT": "Du har valt {num} sida/sidor\n\nVill du verkligen avpublicera",
     "CMSMAIN.BATCH_PUBLISH_PROMPT": "Du har valt {num} sida/sidor.\nVill du verkligen publicera dem.",
     "CMSMAIN.BATCH_DELETE_PROMPT": "Du har valt {num} sida/sidor\n\nVill du verkligen radera dem.",
-    "CMSMAIN.BATCH_ARCHIVE_PROMPT": "You have {num} page(s) selected.\n\nAre you sure you want to archive these pages?\n\nThese pages and all of their children pages will be unpublished and sent to the archive.",
-    "CMSMAIN.BATCH_RESTORE_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to restore to stage?\n\nChildren of archived pages will be restored to the root level, unless those pages are also being restored.",
-    "CMSMAIN.BATCH_DELETELIVE_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to delete these pages from live?",
+    "CMSMAIN.BATCH_ARCHIVE_PROMPT": "Du har {num} sida/sidor valda.\n\n\nÄr du säker på att du vill arkivera dessa sidor?\n\n\nDessa sidor och sidornas undersidor kommer att avpubliceras och arkiveras.",
+    "CMSMAIN.BATCH_RESTORE_PROMPT": "Du har {num} sida/sidor valda. \n\nVill du verkligen återställa till ett tidigare skede?\n\nUndersidor till arkiverade sidor kommer att återställas till rotnivå , såvida dessa sidor också återställs .",
+    "CMSMAIN.BATCH_DELETELIVE_PROMPT": "Du har valt {num} sida/sidor\n\nVill du verkligen radera dem från den publicerade sidan?",
     "LeftAndMain.CONFIRMUNSAVED": "Är du säker på att du vill lämna denna sida?\n\nVARNING: Dina ändringar har inte sparats.\n\nTryck OK för att lämna sidan eller Avbryt för att stanna på aktuell sida.",
     "LeftAndMain.CONFIRMUNSAVEDSHORT": "WARNING: Your changes have not been saved.",
     "SecurityAdmin.BATCHACTIONSDELETECONFIRM": "Vill du verkligen radera %s grupper?",
diff --git a/admin/javascript/lang/sv.js b/admin/javascript/lang/sv.js
index 795d24ed2..ba11d4b32 100644
--- a/admin/javascript/lang/sv.js
+++ b/admin/javascript/lang/sv.js
@@ -8,9 +8,9 @@ if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
     "CMSMAIN.BATCH_UNPUBLISH_PROMPT": "Du har valt {num} sida/sidor\n\nVill du verkligen avpublicera",
     "CMSMAIN.BATCH_PUBLISH_PROMPT": "Du har valt {num} sida/sidor.\nVill du verkligen publicera dem.",
     "CMSMAIN.BATCH_DELETE_PROMPT": "Du har valt {num} sida/sidor\n\nVill du verkligen radera dem.",
-    "CMSMAIN.BATCH_ARCHIVE_PROMPT": "You have {num} page(s) selected.\n\nAre you sure you want to archive these pages?\n\nThese pages and all of their children pages will be unpublished and sent to the archive.",
-    "CMSMAIN.BATCH_RESTORE_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to restore to stage?\n\nChildren of archived pages will be restored to the root level, unless those pages are also being restored.",
-    "CMSMAIN.BATCH_DELETELIVE_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to delete these pages from live?",
+    "CMSMAIN.BATCH_ARCHIVE_PROMPT": "Du har {num} sida/sidor valda.\n\n\nÄr du säker på att du vill arkivera dessa sidor?\n\n\nDessa sidor och sidornas undersidor kommer att avpubliceras och arkiveras.",
+    "CMSMAIN.BATCH_RESTORE_PROMPT": "Du har {num} sida/sidor valda. \n\nVill du verkligen återställa till ett tidigare skede?\n\nUndersidor till arkiverade sidor kommer att återställas till rotnivå , såvida dessa sidor också återställs .",
+    "CMSMAIN.BATCH_DELETELIVE_PROMPT": "Du har valt {num} sida/sidor\n\nVill du verkligen radera dem från den publicerade sidan?",
     "LeftAndMain.CONFIRMUNSAVED": "Är du säker på att du vill lämna denna sida?\n\nVARNING: Dina ändringar har inte sparats.\n\nTryck OK för att lämna sidan eller Avbryt för att stanna på aktuell sida.",
     "LeftAndMain.CONFIRMUNSAVEDSHORT": "WARNING: Your changes have not been saved.",
     "SecurityAdmin.BATCHACTIONSDELETECONFIRM": "Vill du verkligen radera %s grupper?",
diff --git a/javascript/lang/fa_IR.js b/javascript/lang/fa_IR.js
new file mode 100644
index 000000000..e1228cc45
--- /dev/null
+++ b/javascript/lang/fa_IR.js
@@ -0,0 +1,47 @@
+// This file was generated by silverstripe/cow from javascript/lang/src/fa_IR.js.
+// See https://github.com/tractorcow/cow for details
+if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
+	if(typeof(console) != 'undefined') console.error('Class ss.i18n not defined');
+} else {
+	ss.i18n.addDictionary('fa_IR', {
+    "VALIDATOR.FIELDREQUIRED": "لطفاً \"%s\" را تکمیل نمایید، پرکردن آن الزامی است.",
+    "HASMANYFILEFIELD.UPLOADING": "در حال آپلود... %s",
+    "TABLEFIELD.DELETECONFIRMMESSAGE": "آیا مطمئن هستید که می‌خواهید این رکورد حذف شود؟",
+    "LOADING": "بارگذاری...",
+    "UNIQUEFIELD.SUGGESTED": "Changed value to '%s' : %s",
+    "UNIQUEFIELD.ENTERNEWVALUE": "You will need to enter a new value for this field",
+    "UNIQUEFIELD.CANNOTLEAVEEMPTY": "This field cannot be left empty",
+    "RESTRICTEDTEXTFIELD.CHARCANTBEUSED": "The character '%s' cannot be used in this field",
+    "UPDATEURL.CONFIRM": "Would you like me to change the URL to:\n\n%s/\n\nClick Ok to change the URL, click Cancel to leave it as:\n\n%s",
+    "UPDATEURL.CONFIRMURLCHANGED": "The URL has been changed to\n'%s'",
+    "FILEIFRAMEFIELD.DELETEFILE": "حذف فایل‌",
+    "FILEIFRAMEFIELD.UNATTACHFILE": "حذف ضمیمه فایل",
+    "FILEIFRAMEFIELD.DELETEIMAGE": "حذف تصویر",
+    "FILEIFRAMEFIELD.CONFIRMDELETE": "آیا مطمئن هستید که می‌خواهید این فایل حذف شود؟",
+    "LeftAndMain.IncompatBrowserWarning": "Your browser is not compatible with the CMS interface. Please use Internet Explorer 7+, Google Chrome 10+ or Mozilla Firefox 3.5+.",
+    "GRIDFIELD.ERRORINTRANSACTION": "An error occured while fetching data from the server\n Please try again later.",
+    "HtmlEditorField.SelectAnchor": "Select an anchor",
+    "UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
+    "UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
+    "UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
+    "UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
+    "UploadField.NOFILEUPLOADED": "هیچ فایلی آپلود نشد",
+    "UploadField.NOTMPFOLDER": "Missing a temporary folder",
+    "UploadField.WRITEFAILED": "Failed to write file to disk",
+    "UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
+    "UploadField.TOOLARGE": "Filesize is too large",
+    "UploadField.TOOSMALL": "Filesize is too small",
+    "UploadField.INVALIDEXTENSION": "قالب مجاز نیست",
+    "UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
+    "UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
+    "UploadField.EMPTYRESULT": "Empty file upload result",
+    "UploadField.LOADING": "بارگذاری...",
+    "UploadField.Editing": "Editing ...",
+    "UploadField.Uploaded": "آپلود‌شده",
+    "UploadField.OVERWRITEWARNING": "فایل با نام یکسان از پیش وجود دارد",
+    "TreeDropdownField.ENTERTOSEARCH": "Press enter to search",
+    "TreeDropdownField.OpenLink": "باز کنید",
+    "TreeDropdownField.FieldTitle": "انتخاب کنید",
+    "TreeDropdownField.SearchFieldTitle": "گزینش یا جستجو"
+});
+}
\ No newline at end of file
diff --git a/javascript/lang/src/fa_IR.js b/javascript/lang/src/fa_IR.js
new file mode 100644
index 000000000..e2a42e1e3
--- /dev/null
+++ b/javascript/lang/src/fa_IR.js
@@ -0,0 +1,41 @@
+{
+    "VALIDATOR.FIELDREQUIRED": "لطفاً \"%s\" را تکمیل نمایید، پرکردن آن الزامی است.",
+    "HASMANYFILEFIELD.UPLOADING": "در حال آپلود... %s",
+    "TABLEFIELD.DELETECONFIRMMESSAGE": "آیا مطمئن هستید که می‌خواهید این رکورد حذف شود؟",
+    "LOADING": "بارگذاری...",
+    "UNIQUEFIELD.SUGGESTED": "Changed value to '%s' : %s",
+    "UNIQUEFIELD.ENTERNEWVALUE": "You will need to enter a new value for this field",
+    "UNIQUEFIELD.CANNOTLEAVEEMPTY": "This field cannot be left empty",
+    "RESTRICTEDTEXTFIELD.CHARCANTBEUSED": "The character '%s' cannot be used in this field",
+    "UPDATEURL.CONFIRM": "Would you like me to change the URL to:\n\n%s/\n\nClick Ok to change the URL, click Cancel to leave it as:\n\n%s",
+    "UPDATEURL.CONFIRMURLCHANGED": "The URL has been changed to\n'%s'",
+    "FILEIFRAMEFIELD.DELETEFILE": "حذف فایل‌",
+    "FILEIFRAMEFIELD.UNATTACHFILE": "حذف ضمیمه فایل",
+    "FILEIFRAMEFIELD.DELETEIMAGE": "حذف تصویر",
+    "FILEIFRAMEFIELD.CONFIRMDELETE": "آیا مطمئن هستید که می‌خواهید این فایل حذف شود؟",
+    "LeftAndMain.IncompatBrowserWarning": "Your browser is not compatible with the CMS interface. Please use Internet Explorer 7+, Google Chrome 10+ or Mozilla Firefox 3.5+.",
+    "GRIDFIELD.ERRORINTRANSACTION": "An error occured while fetching data from the server\n Please try again later.",
+    "HtmlEditorField.SelectAnchor": "Select an anchor",
+    "UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
+    "UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
+    "UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
+    "UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
+    "UploadField.NOFILEUPLOADED": "هیچ فایلی آپلود نشد",
+    "UploadField.NOTMPFOLDER": "Missing a temporary folder",
+    "UploadField.WRITEFAILED": "Failed to write file to disk",
+    "UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
+    "UploadField.TOOLARGE": "Filesize is too large",
+    "UploadField.TOOSMALL": "Filesize is too small",
+    "UploadField.INVALIDEXTENSION": "قالب مجاز نیست",
+    "UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
+    "UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
+    "UploadField.EMPTYRESULT": "Empty file upload result",
+    "UploadField.LOADING": "بارگذاری...",
+    "UploadField.Editing": "Editing ...",
+    "UploadField.Uploaded": "آپلود‌شده",
+    "UploadField.OVERWRITEWARNING": "فایل با نام یکسان از پیش وجود دارد",
+    "TreeDropdownField.ENTERTOSEARCH": "Press enter to search",
+    "TreeDropdownField.OpenLink": "باز کنید",
+    "TreeDropdownField.FieldTitle": "انتخاب کنید",
+    "TreeDropdownField.SearchFieldTitle": "گزینش یا جستجو"
+}
\ No newline at end of file
diff --git a/lang/af.yml b/lang/af.yml
index 3dbfb4deb..9d9c34d26 100644
--- a/lang/af.yml
+++ b/lang/af.yml
@@ -22,7 +22,6 @@ af:
     FROMCOMPUTER: 'Kies lêers van jou rekenaar af'
     FROMCOMPUTERINFO: 'Laai op van jou rekenaar af'
     TOTAL: Totaal
-    TOUPLOAD: 'Kies lêers om op te laai...'
     UPLOADINPROGRESS: 'Wag asseblief... ons is besig om op te laai'
     UPLOADOR: OF
   BBCodeParser:
@@ -207,7 +206,6 @@ af:
     IMAGETITLETEXT: 'Titel teks (leidraad)'
     IMAGETITLETEXTDESC: 'Vir meer inligting oor die prentjie'
     IMAGEWIDTHPX: Wydte
-    INSERTMEDIA: 'Voeg Media In'
     LINK: 'Sit skakel in'
     LINKANCHOR: 'Anker op hierdie bladsy'
     LINKDESCR: 'Skakel beskrywing'
@@ -218,7 +216,6 @@ af:
     LINKOPENNEWWIN: 'Wil jy die skakel in ''n nuwe venster oop maak?'
     LINKTO: 'Koppel aan'
     PAGE: Bladsy
-    UpdateMEDIA: 'Verander Media'
   Image:
     PLURALNAME: Lêers
     SINGULARNAME: Lêer
@@ -228,7 +225,6 @@ af:
   LeftAndMain:
     CANT_REORGANISE: 'Jy het nie toestemming om Top vlak bladsye te verander nie. Jou verandering is nie gestoor nie.'
     DELETED: Was verwyder
-    DropdownBatchActionsDefault: Aksies
     PERMAGAIN: 'Jy is uit die IBS uitgeteken. As jy weer wil inteken, moet jy ''n gebruikersnaam en wagwoord onder in tik'
     PreviewButton: Beskou
     REORGANISATIONSUCCESSFUL: 'Die ''site tree'' is suksesvol geheorganiseer'
diff --git a/lang/ar.yml b/lang/ar.yml
index 8c0fb82cd..76e5a78dd 100644
--- a/lang/ar.yml
+++ b/lang/ar.yml
@@ -24,7 +24,6 @@ ar:
     FROMCOMPUTER: 'اختر ملفات من جهاز الكمبيوتر الخاص بك'
     FROMCOMPUTERINFO: 'حمل من جهاز الكمبيوتر الخاص بك'
     TOTAL: الكلي
-    TOUPLOAD: 'قم باختيار ملفات لتحميلها'
     UPLOADINPROGRESS: 'يرجى الانتظار ...جار التحميل'
     UPLOADOR: أو
   BBCodeParser:
@@ -121,7 +120,6 @@ ar:
     INVALID_REQUEST: 'طلب غير صحيح'
   DropdownField:
     CHOOSE: (اختر)
-    CHOOSESEARCH: '(اختار أو ابحث)'
   EmailField:
     VALIDATION: 'يرجى إدخال عنوان بريد إلكتروني'
   Enum:
@@ -269,7 +267,6 @@ ar:
     IMAGETITLETEXT: 'عنوان النص (أداة التلميح)'
     IMAGETITLETEXTDESC: 'للمزيد من المعلومات حول الصورة'
     IMAGEWIDTHPX: العرض
-    INSERTMEDIA: 'قم بإدراج وسائط'
     LINK: 'رابط'
     LINKANCHOR: 'ربط على هذه الصفحة'
     LINKDESCR: 'وصف الرابط'
@@ -282,7 +279,6 @@ ar:
     PAGE: صفحة
     URL: رابط
     URLNOTANOEMBEDRESOURCE: 'عنوان الموقع لا يمكن أن يتحول إلى مصدر وسائط. ''{URL}'''
-    UpdateMEDIA: 'تحديث الوسائط'
   Image:
     PLURALNAME: الملفات
     SINGULARNAME: الملف
@@ -294,7 +290,6 @@ ar:
   LeftAndMain:
     CANT_REORGANISE: 'ليس لديك تصريح لتغيير صفحات المستوى الأعلى. لم يتم حفظ التغيير.'
     DELETED: تم الحذف.
-    DropdownBatchActionsDefault: أفعال
     HELP: مساعدة
     PERMAGAIN: 'تم خروجك من النظام بنجاح. للدخول مرة أخرى أدحل البريد الإلكتروني و الرقم السري بالأسفل'
     PreviewButton: استعراض
diff --git a/lang/bg.yml b/lang/bg.yml
index d62b8c1eb..8f49ecdd5 100644
--- a/lang/bg.yml
+++ b/lang/bg.yml
@@ -196,7 +196,6 @@ bg:
     IMAGETITLETEXT: 'Описание (tooltip)'
     IMAGETITLETEXTDESC: 'Допълнителна информация към изображението'
     IMAGEWIDTHPX: Широчина
-    INSERTMEDIA: 'Вмъкване на медиа'
     LINK: 'Връзка'
     LINKANCHOR: 'Котва на тази страница'
     LINKDESCR: 'Описание на препратка'
@@ -208,13 +207,11 @@ bg:
     LINKTO: 'Препратка към'
     PAGE: Страница
     URLNOTANOEMBEDRESOURCE: 'URL адресът ''{url}'' не може да бъде превърнат в медиен ресурс.'
-    UpdateMEDIA: 'Актуализация на медиа'
   Image_iframe_ss:
     TITLE: 'Iframe за качване на изображение'
   LeftAndMain:
     CANT_REORGANISE: 'Нямаш права да променяш страници от най-горно ниво. Твоите промени не бяха записани.'
     DELETED: Изтрит
-    DropdownBatchActionsDefault: Действия
     HELP: Помощ
     PERMAGAIN: 'Вие излязохте от CMS. Ако искате да влезете отново, моля, въведете потребителско име и парола.'
     PreviewButton: Преглед
diff --git a/lang/bs.yml b/lang/bs.yml
index 5ba529028..6fef3709b 100644
--- a/lang/bs.yml
+++ b/lang/bs.yml
@@ -39,12 +39,18 @@ bs:
     ENTERINFO: 'Molimo, unesite korisničko ime i šifru.'
     ERRORNOTADMIN: 'Ovaj korisnik nije administrator.'
     ERRORNOTREC: 'Korisničko ime / šifra nije prepoznata'
+  Boolean:
+    NOANSWER: 'Ne'
+    YESANSWER: 'Da'
   CMSMain:
     SAVE: Snimi
   ChangePasswordEmail_ss:
     CHANGEPASSWORDTEXT1: 'Promijenili ste svoju šifru za'
     CHANGEPASSWORDTEXT2: 'Možete koristiti slijedeće podatke za prijavu:'
     HELLO: Pozdrav
+  CheckboxField:
+    NOANSWER: 'Ne'
+    YESANSWER: 'Da'
   CreditCardField:
     FIRST: prvo
     FOURTH: četvrto
@@ -65,12 +71,15 @@ bs:
     TEXT2: 'link za ponovno podešavanje šifre'
     TEXT3: za
   Form:
+    SubmitBtnLabel: Idi
     VALIDATIONNOTUNIQUE: 'Unesena vrijednost nije jedinstvena'
     VALIDATIONPASSWORDSDONTMATCH: 'Šifre se ne slažu'
     VALIDATIONPASSWORDSNOTEMPTY: 'Polja za unos šifre ne smiju ostati prazna'
     VALIDATOR: Provjera ispravnosti
   FormField:
     NONE: ništa
+  GridFieldDetailForm:
+    Create: Kreiraj
   HtmlEditorField:
     ANCHORVALUE: Sidro
     BUTTONINSERTLINK: 'Ubaci link'
diff --git a/lang/cs.yml b/lang/cs.yml
index a96f65879..aa4492189 100644
--- a/lang/cs.yml
+++ b/lang/cs.yml
@@ -1,5 +1,7 @@
 cs:
   AssetAdmin:
+    ALLOWEDEXTS: 'Povolené extenze nahraní souboru'
+    HIDEALLOWEDEXTS: 'Skrýt povolené extenze'
     NEWFOLDER: Nová složka
     SHOWALLOWEDEXTS: 'Ukázat povolené extenze'
   AssetTableField:
@@ -7,12 +9,14 @@ cs:
     DIM: Rozměry
     FILENAME: Název souboru
     FOLDER: Složka
+    HEIGHT: Výška
     LASTEDIT: 'Naposledy změněno'
     OWNER: Vlastník
     SIZE: 'Velikost'
     TITLE: Titulek
     TYPE: 'Typ'
     URL: URL
+    WIDTH: Šířka
   AssetUploadField:
     ChooseFiles: 'Vyberte soubory'
     DRAGFILESHERE: 'Táhni soubory sem'
@@ -23,6 +27,8 @@ cs:
     FILES: Soubory
     FROMCOMPUTER: 'Vyberte soubory z vašeho počítače'
     FROMCOMPUTERINFO: 'Nahrát z vašeho počítače'
+    INSERTURL: 'Vložit z URL'
+    REMOVEINFO: 'Odstranit tento soubor z tohoto pole'
     TOTAL: Celkem
     TOUPLOAD: 'Vyberte soubory k nahrání...'
     UPLOADINPROGRESS: 'Prosím čekejte... probíhá nahrávání'
@@ -77,6 +83,8 @@ cs:
     PASSWORDEXPIRED: '<p>Vaše heslo expirovalo. <a target="_top" href="{link}">Prosím zvolte nové heslo.</a></p>'
   CMSPageHistoryController_versions_ss:
     PREVIEW: 'Náhled webu'
+  CMSPagesController_Tools_ss:
+    FILTER: Filtr
   CMSProfileController:
     MENUTITLE: 'Můj profil'
   CMSSecurity:
@@ -105,6 +113,7 @@ cs:
     MAXIMUM: 'Hesla musí být nanejvýš {max} znaků dlouhé.'
     SHOWONCLICKTITLE: 'Změnit heslo'
   ContentController:
+    DRAFT_SITE_ACCESS_RESTRICTION: 'Musíte se přihlásit se svým CMS heslem, aby jste mohli prohlížet koncept nebo archivovaný obsah. <a href="%s">Klikněte sem pro návrat na zveřejněný web.</a>'
     NOTLOGGEDIN: 'Nepřihlášen'
   CreditCardField:
     FIRST: první
@@ -292,6 +301,8 @@ cs:
     FROMWEB: 'Z webu'
     FindInFolder: 'Hledat ve složce'
     IMAGEALT: 'Alternativní text (alt)'
+    IMAGEALTTEXT: 'Alternativní text (alt) - bude zobrazen, pokud obrázek nemúže být zobrazen'
+    IMAGEALTTEXTDESC: 'Zobrazeno na obrazovce, když obrázek nemůže být zobrazen'
     IMAGEDIMENSIONS: Rozměry
     IMAGEHEIGHTPX: Výška
     IMAGETITLE: 'Titul text (tooltip) - další informace o obrázku'
@@ -311,6 +322,7 @@ cs:
     PAGE: Stránku
     SUBJECT: 'Předmět emailu'
     URL: URL
+    URLDESCRIPTION: 'Vložit videa a obrázky z webu do Vaší stránky, prostým zadáním URL souboru. Ujistěte se, že máte patřičná práva před zdílením médií z webu.<br /><br />Prosím, uvědomte si, že soubory nejsou přidány do úložiště CMS, ale soubor je vestavěn z jeho původního umístění, když z nějakých důvodú soubor není dostupný v jeho původním umístění, nebude zobrazitelný na této stránce.'
     URLNOTANOEMBEDRESOURCE: 'URL ''{url}'' nemůže být vloženo do zdroje médií.'
     UpdateMEDIA: 'Aktualizovat média'
   Image:
@@ -324,11 +336,13 @@ cs:
   LeftAndMain:
     CANT_REORGANISE: 'Nemáte oprávnění měnit stránky nejvyšší úrovně. Vaše změna nebyla uložena.'
     DELETED: Smazáno.
-    DropdownBatchActionsDefault: Akcie
+    DropdownBatchActionsDefault: 'Vyberte akci...'
     HELP: Nápověda
+    PAGETYPE: 'Typ stránky'
     PERMAGAIN: 'Byli jste odhlášeni z CMS. Pokud se chcete znovu přihlásit, zadejte níže své uživatelské jméno a heslo.'
     PERMALREADY: 'Omlouvám se, ale nemůžete vstoupit do této části CMS. Pokud se chcete přihlásit jako někdo jiný, udělejte tak níže.'
-    PERMDEFAULT: 'Musíte být přihlášen/a k přístup do oblasti administrace, zadejte vaše přihlošovací údaje dole, prosím.'
+    PERMDEFAULT: 'Musíte být přihlášen/a k přístup do oblasti administrace, níže zadejte vaše přihlašovací údaje, prosím.'
+    PLEASESAVE: 'Prosím uložte stránku: Tato stránka nemohla být aktualizována, protože ještě nebyla uložena.'
     PreviewButton: Náhled
     REORGANISATIONSUCCESSFUL: 'Strom webu reorganizován úspěšně.'
     SAVEDUP: Uloženo.
diff --git a/lang/de.yml b/lang/de.yml
index de6f1f233..2138140f5 100644
--- a/lang/de.yml
+++ b/lang/de.yml
@@ -1,5 +1,7 @@
 de:
   AssetAdmin:
+    ALLOWEDEXTS: 'Erlaubte Dateiendungen'
+    HIDEALLOWEDEXTS: 'Verberge erlaubte Dateiendungen'
     NEWFOLDER: Neuer Ordner
     SHOWALLOWEDEXTS: 'Erlaubte Dateitypen anzeigen'
   AssetTableField:
@@ -7,12 +9,14 @@ de:
     DIM: Dimensionen
     FILENAME: Dateiname
     FOLDER: Ordner
+    HEIGHT: Höhe
     LASTEDIT: 'Letzte Änderung'
     OWNER: Eigentümer
     SIZE: 'Größe'
     TITLE: Titel
     TYPE: 'Typ'
     URL: URL
+    WIDTH: Breite
   AssetUploadField:
     ChooseFiles: 'Dateien auswählen'
     DRAGFILESHERE: 'Dateien hier ablegen'
@@ -23,8 +27,9 @@ de:
     FILES: Dateien
     FROMCOMPUTER: 'Dateien auf Ihrem Computer auswählen'
     FROMCOMPUTERINFO: 'Von Ihrem Computer hochladen'
+    REMOVEINFO: 'Entferne diese Datei aus dem Feld'
     TOTAL: Insgesamt
-    TOUPLOAD: 'Dateien für den Upload wählen...'
+    TOUPLOAD: 'Dateien für den Upload auswählen...'
     UPLOADINPROGRESS: 'Bitte warten sie... Upload im Gang'
     UPLOADOR: oder
   BBCodeParser:
@@ -77,6 +82,8 @@ de:
     PASSWORDEXPIRED: '<p>Ihr Passwort ist abgelaufen. <a target="_top" href="{link}">Bitte wählen Sie ein neues Passwort.</a></p>'
   CMSPageHistoryController_versions_ss:
     PREVIEW: 'Vorschau der Webseite'
+  CMSPagesController_Tools_ss:
+    FILTER: Filter
   CMSProfileController:
     MENUTITLE: 'Mein Profil'
   CMSSecurity:
@@ -105,6 +112,7 @@ de:
     MAXIMUM: 'Passwörter dürfen maximal {max} Zeichen lang sein.'
     SHOWONCLICKTITLE: 'Passwort ändern'
   ContentController:
+    DRAFT_SITE_ACCESS_RESTRICTION: 'Sie müssen sich mit dem CMS-Passwort anmelden, um unveröffentlichte oder archivierte Seiten sehen zu können. <a href="%s">Zur veröffentlichten Seite.</a>'
     NOTLOGGEDIN: 'Nicht eingeloggt'
   CreditCardField:
     FIRST: erste
@@ -144,7 +152,7 @@ de:
     INVALID_REQUEST: 'Ungültige Anfrage'
   DropdownField:
     CHOOSE: (Auswahl)
-    CHOOSESEARCH: '(Auswählen oder Suchen)'
+    CHOOSESEARCH: '(Auswahl und Suche)'
     SOURCE_VALIDATION: 'Bitte wählen Sie aus der Liste. {value} ist kein gültiger Wert'
   EmailField:
     VALIDATION: 'Bitte geben Sie eine E-Mail-Adresse ein'
@@ -292,14 +300,14 @@ de:
     FROMWEB: 'Aus dem Web'
     FindInFolder: 'In Ordner suchen'
     IMAGEALT: 'Alternativtext (alt)'
-    IMAGEALTTEXT: 'Alternativtext (alt) - erscheint, falls das Bild nicht angezeigt werden kann.'
+    IMAGEALTTEXT: 'Alternativer Text (alt) - angezeigt, wenn das Bild nicht dargestellt werden kann'
+    IMAGEALTTEXTDESC: 'Wird von Screenreadern vorgelesen oder angezeigt, falls das Bild nicht dargestellt werden kann'
     IMAGEDIMENSIONS: Dimensionen
     IMAGEHEIGHTPX: Höhe (px)
     IMAGETITLE: 'Titeltext (Tooltip) - für zusätzliche Informationen über das Bild'
     IMAGETITLETEXT: 'Titeltext (Tooltip)'
     IMAGETITLETEXTDESC: 'Weiterführende Informationen über das Bild'
     IMAGEWIDTHPX: Breite (px)
-    INSERTMEDIA: 'Medienobjekt einfügen'
     LINK: 'Verweis einfügen'
     LINKANCHOR: 'Anker auf dieser Seite'
     LINKDESCR: 'Beschreibung des Verweises'
@@ -313,7 +321,6 @@ de:
     SUBJECT: 'E-Mail-Betreff'
     URL: URL
     URLNOTANOEMBEDRESOURCE: 'Die URL ''{url}'' konnte nicht in eine Medienquelle umgewandelt werden'
-    UpdateMEDIA: 'Medienobjekt aktualisieren'
   Image:
     PLURALNAME: Dateien
     SINGULARNAME: Datei
@@ -325,9 +332,8 @@ de:
   LeftAndMain:
     CANT_REORGANISE: 'Sie besitzen nicht die benötigten Zugriffsrechte um Seiten der höchsten Ebene zu bearbeiten. Ihre Änderungen wurden nicht gespeichert.'
     DELETED: Gelöscht.
-    DropdownBatchActionsDefault: Aktionen
     HELP: Hilfe
-    PAGETYPE: 'Seitentyp:'
+    PAGETYPE: 'Seitentyp'
     PERMAGAIN: 'Sie wurden aus dem System ausgeloggt. Falls Sie sich wieder einloggen möchten, geben Sie bitte Benutzernamen und Passwort im untenstehenden Formular an.'
     PERMALREADY: 'Leider dürfen Sie diesen Teil des CMS nicht aufrufen. Wenn Sie sich als jemand anderes einloggen wollen, benutzen Sie bitte das nachstehende Formular.'
     PERMDEFAULT: 'Sie müssen angemeldet sein, um auf diesen Bereich zugreifen zu können. Bitte geben Sie Ihre Zugangsdaten ein.'
diff --git a/lang/en.yml b/lang/en.yml
index e194d2225..d754159e2 100644
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -1,5 +1,7 @@
 en:
   AssetAdmin:
+    ALLOWEDEXTS: 'Allowed file upload extensions'
+    HIDEALLOWEDEXTS: 'Hide allowed extensions'
     NEWFOLDER: NewFolder
     SHOWALLOWEDEXTS: 'Show allowed extensions'
   AssetTableField:
@@ -7,12 +9,14 @@ en:
     DIM: Dimensions
     FILENAME: Filename
     FOLDER: Folder
+    HEIGHT: Height
     LASTEDIT: 'Last changed'
     OWNER: Owner
     SIZE: 'File size'
     TITLE: Title
     TYPE: 'File type'
     URL: URL
+    WIDTH: Width
   AssetUploadField:
     ChooseFiles: 'Choose files'
     DRAGFILESHERE: 'Drag files here'
@@ -23,6 +27,8 @@ en:
     FILES: Files
     FROMCOMPUTER: 'Choose files from your computer'
     FROMCOMPUTERINFO: 'Upload from your computer'
+    INSERTURL: 'Insert from URL'
+    REMOVEINFO: 'Remove this file from this field'
     TOTAL: Total
     TOUPLOAD: 'Choose files to upload...'
     UPLOADINPROGRESS: 'Please wait… upload in progress'
@@ -77,6 +83,8 @@ en:
     PASSWORDEXPIRED: '<p>Your password has expired. <a target="_top" href="{link}">Please choose a new one.</a></p>'
   CMSPageHistoryController_versions_ss:
     PREVIEW: 'Website preview'
+  CMSPagesController_Tools_ss:
+    FILTER: Filter
   CMSProfileController:
     MENUTITLE: 'My Profile'
   CMSSecurity:
@@ -105,6 +113,7 @@ en:
     MAXIMUM: 'Passwords must be at most {max} characters long.'
     SHOWONCLICKTITLE: 'Change Password'
   ContentController:
+    DRAFT_SITE_ACCESS_RESTRICTION: 'You must log in with your CMS password in order to view the draft or archived content. <a href="%s">Click here to go back to the published site.</a>'
     NOTLOGGEDIN: 'Not logged in'
   CreditCardField:
     FIRST: first
@@ -313,6 +322,7 @@ en:
     PAGE: Page
     SUBJECT: 'Email subject'
     URL: URL
+    URLDESCRIPTION: 'Insert videos and images from the web into your page simply by entering the URL of the file. Make sure you have the rights or permissions before sharing media directly from the web.<br /><br />Please note that files are not added to the file store of the CMS but embeds the file from its original location, if for some reason the file is no longer available in its original location it will no longer be viewable on this page.'
     URLNOTANOEMBEDRESOURCE: 'The URL ''{url}'' could not be turned into a media resource.'
     UpdateMEDIA: 'Update Media'
   Image:
diff --git a/lang/eo.yml b/lang/eo.yml
index fbe1f4ba2..57195dcc0 100644
--- a/lang/eo.yml
+++ b/lang/eo.yml
@@ -24,7 +24,6 @@ eo:
     FROMCOMPUTER: 'Elekti dosierojn el via komputilo'
     FROMCOMPUTERINFO: 'Alŝuti el via komputilo'
     TOTAL: Totalo
-    TOUPLOAD: 'Elekti dosierojn alŝutotajn...'
     UPLOADINPROGRESS: 'Bonvolu atendi...alŝuto daŭras'
     UPLOADOR: AŬ
   BBCodeParser:
@@ -77,6 +76,8 @@ eo:
     PASSWORDEXPIRED: '<p>Via pasvorto finiĝis. <a target="_top" href="{link}">Bonvolu elekti novan.</a></p>'
   CMSPageHistoryController_versions_ss:
     PREVIEW: 'Antaŭvido de retejo'
+  CMSPagesController_Tools_ss:
+    FILTER: Filtrilo
   CMSProfileController:
     MENUTITLE: 'Mia agordaro'
   CMSSecurity:
@@ -105,6 +106,7 @@ eo:
     MAXIMUM: 'Pasvorto devas esti ne pli ol {min} signojn longa.'
     SHOWONCLICKTITLE: 'Ŝangi Pasvorton'
   ContentController:
+    DRAFT_SITE_ACCESS_RESTRICTION: 'Vi devas ensaluti per via CMS-pasvorto por vidi la projektan aŭ enarkivigitan enhavon.  <a href="%s">Alklaku ĉi tie por reiri al la publika retejo.</a>'
     NOTLOGGEDIN: 'Ne ensalutis'
   CreditCardField:
     FIRST: unuan
@@ -144,7 +146,6 @@ eo:
     INVALID_REQUEST: 'Malvalida peto'
   DropdownField:
     CHOOSE: (Elekti)
-    CHOOSESEARCH: '(Elekti aŭ serĉi)'
     SOURCE_VALIDATION: 'Bonvolu elekti valoron el la listo donita. {value} ne estas valida agordo'
   EmailField:
     VALIDATION: 'Bonvolu enigi readreson'
@@ -292,13 +293,14 @@ eo:
     FROMWEB: 'El la TTT'
     FindInFolder: 'Serĉi en dosierujo'
     IMAGEALT: 'Alternativa teksto (alt)'
+    IMAGEALTTEXT: 'Alternativa teksto (alt) - vidigi ĝin se ne eblas vidigi bildon'
+    IMAGEALTTEXTDESC: 'Vidigita al ekranlegiloj aŭ se ne eblas vidii bildon'
     IMAGEDIMENSIONS: Dimensioj
     IMAGEHEIGHTPX: Alto
     IMAGETITLE: 'Titola teksto (ŝpruchelpilo) - por plua informo pri la bildo'
     IMAGETITLETEXT: 'Teksto de titolo (ŝpruchelpilo)'
     IMAGETITLETEXTDESC: 'Por plua informo pri la bildo'
     IMAGEWIDTHPX: Larĝo
-    INSERTMEDIA: 'Enmeti memorilon'
     LINK: 'Ligilo'
     LINKANCHOR: 'Ankri al ĉi tiu paĝo'
     LINKDESCR: 'Ligila priskribo'
@@ -312,7 +314,6 @@ eo:
     SUBJECT: 'Temo de retpoŝto'
     URL: URL
     URLNOTANOEMBEDRESOURCE: 'La URL ''{url}'' ne estas konvertebla al memorilo.'
-    UpdateMEDIA: 'Ĝisdatigi memorilon'
   Image:
     PLURALNAME: Dosieroj
     SINGULARNAME: Dosiero
@@ -324,11 +325,12 @@ eo:
   LeftAndMain:
     CANT_REORGANISE: 'Vi ne rajtas ŝanĝi supronivelajn paĝojn. Via ŝanĝo ne konserviĝis.'
     DELETED: Forigita.
-    DropdownBatchActionsDefault: Agoj
     HELP: Helpo
+    PAGETYPE: 'Tipo de paĝo:'
     PERMAGAIN: 'Vin adiaŭis la CMS. Se vi volas denove saluti, enigu salutnomon kaj pasvorton malsupre.'
     PERMALREADY: 'Bedaŭrinde vi ne povas aliri tiun parton de la CMS. Se vi volas ensaluti kiel aliulo, faru tion sube.'
     PERMDEFAULT: 'Necesas ensaluti por aliri la administran zonon; bonvolu enigi viajn akreditaĵoj sube.'
+    PLEASESAVE: 'Bonvolu konservi paĝon: Ne eblis ĝisdatigi ĉi tiun paĝon ĉar ĝi ankoraŭ ne estas konservita.'
     PreviewButton: Antaŭvido
     REORGANISATIONSUCCESSFUL: 'Sukcese reorganizis la retejan arbon.'
     SAVEDUP: Konservita.
diff --git a/lang/es.yml b/lang/es.yml
index e2a3c3768..d08f5f16c 100644
--- a/lang/es.yml
+++ b/lang/es.yml
@@ -1,5 +1,7 @@
 es:
   AssetAdmin:
+    ALLOWEDEXTS: 'Extensiones permitidas para subir archivos'
+    HIDEALLOWEDEXTS: 'Ocultar extensiones permitidas'
     NEWFOLDER: NuevaCarpeta
     SHOWALLOWEDEXTS: 'Mostrar extensiones permitidas'
   AssetTableField:
@@ -7,12 +9,14 @@ es:
     DIM: Dimensiones
     FILENAME: Nombre del archivo
     FOLDER: Carpeta
+    HEIGHT: Alto
     LASTEDIT: 'Modificado por última vez'
     OWNER: Propietario
     SIZE: 'Tamaño'
     TITLE: Título
     TYPE: 'Tipo de archivo'
     URL: URL
+    WIDTH: Ancho
   AssetUploadField:
     ChooseFiles: 'Seleccione los archivos'
     DRAGFILESHERE: 'Arrastre los archivos aqui'
@@ -23,8 +27,10 @@ es:
     FILES: Archivos
     FROMCOMPUTER: 'Seleccione los archivos desde su ordenador'
     FROMCOMPUTERINFO: 'Subir archivos desde tu ordenador'
+    INSERTURL: 'Insertar desde URL'
+    REMOVEINFO: 'Remover este archivo '
     TOTAL: Total
-    TOUPLOAD: 'Seleccione los archivos a subir...'
+    TOUPLOAD: 'Seleccionar archivos para subir'
     UPLOADINPROGRESS: 'Por favor espere .... carga en curso'
     UPLOADOR: O
   BBCodeParser:
@@ -77,6 +83,8 @@ es:
     PASSWORDEXPIRED: '<p>Su contraseña expiró. <a target="_top" href="{link}">Por favor, elija una nueva.</a></p>'
   CMSPageHistoryController_versions_ss:
     PREVIEW: 'Previsualización'
+  CMSPagesController_Tools_ss:
+    FILTER: Filtrar
   CMSProfileController:
     MENUTITLE: 'Mi Perfil'
   CMSSecurity:
@@ -105,6 +113,7 @@ es:
     MAXIMUM: 'Las contraseñas deben tener como máximo {max} caracteres de longitud.'
     SHOWONCLICKTITLE: 'Cambiar contraseña'
   ContentController:
+    DRAFT_SITE_ACCESS_RESTRICTION: 'Debes iniciar sesión con tu contraseña del CMS para ver el borrador o el contenido archivado. <a href="%s">click aquí para regresar al sitio publicado.</a>'
     NOTLOGGEDIN: 'No estás conectado'
   CreditCardField:
     FIRST: primero
@@ -144,7 +153,7 @@ es:
     INVALID_REQUEST: 'Solicitud no válida'
   DropdownField:
     CHOOSE: (Elegir)
-    CHOOSESEARCH: '(Seleccionar o Buscar)'
+    CHOOSESEARCH: 'Seleccionar o Buscar'
     SOURCE_VALIDATION: 'Por favor, seleccionar un valor dentro de la lista provista. {value} no es una opcion válida'
   EmailField:
     VALIDATION: 'Introduzca una dirección de correo electrónico'
@@ -292,6 +301,8 @@ es:
     FROMWEB: 'Desde la web'
     FindInFolder: 'Buscar en carpeta'
     IMAGEALT: 'Texto alternativo (alt)'
+    IMAGEALTTEXT: 'Texto alternativo (alt) - es mostrado si la imagen no puede ser visualizada'
+    IMAGEALTTEXTDESC: 'Mostrar a los lectores de pantalla o si la imagen no se puede visualizar'
     IMAGEDIMENSIONS: Dimensiones
     IMAGEHEIGHTPX: Alto
     IMAGETITLE: 'Texto del título (tooltip) - para obtener más información acerca de la imagen'
@@ -311,6 +322,7 @@ es:
     PAGE: Página
     SUBJECT: 'Asunto del Email'
     URL: URL
+    URLDESCRIPTION: 'Insertar videos e imágenes de la web en tu sitio es tan simple como ingresar la URL del archivo. Asegúrate de que tienes los derechos o permisos antes de compartir directamente desde la web.<br/><br/>Por favor nota que los archivos que no son cargados al almacén de archivos del CMS, sino que vinculados directamente de la ubicación original, si por alguna razón el archivo ya no está disponible en la ubicación original, no será posible mostrarlo en este sitio.'
     URLNOTANOEMBEDRESOURCE: 'La URL ''{url}'' ''no se puede convertir en un recurso multimedia.'
     UpdateMEDIA: 'Actualizar Media'
   Image:
@@ -324,11 +336,13 @@ es:
   LeftAndMain:
     CANT_REORGANISE: 'Usted no tiene permiso para modificar las páginas de nivel superior. Su modificación no se ha guardado.'
     DELETED: Borrado
-    DropdownBatchActionsDefault: Acciones
+    DropdownBatchActionsDefault: 'Elegir una acción...'
     HELP: Ayuda
+    PAGETYPE: 'Tipo de página'
     PERMAGAIN: 'Ha sido desconectado del CMS. Si quiere volver a entrar, introduzca su nombre de usuario y contraseña a continuación.'
     PERMALREADY: 'Lamentablemente no puede acceder a esta parte del CMS. Si quiere entrar como alguien distinto, hágalo a continuación'
     PERMDEFAULT: 'Debes estar conectado para acceder al área de administración; por favor ingresa tus datos a continuación'
+    PLEASESAVE: 'Por favor Guarde la Página: Esta página no se ha podido actualizar porque aún no ha sido salvada.'
     PreviewButton: Vista previa
     REORGANISATIONSUCCESSFUL: 'Reorganizado el árbol del sitio con éxito.'
     SAVEDUP: Guardado
diff --git a/lang/es_MX.yml b/lang/es_MX.yml
index 468494866..272d24ad0 100644
--- a/lang/es_MX.yml
+++ b/lang/es_MX.yml
@@ -181,7 +181,6 @@ es_MX:
   Image_iframe_ss:
     TITLE: 'Subiendo Imagen Iframe'
   LeftAndMain:
-    DropdownBatchActionsDefault: Acciones
     HELP: Ayuda
     PERMAGAIN: 'Usted ha sido desconectado del CMS. Si quiere volver a entrar, introduzca su nombre de usuario y contraseña.'
   LoginAttempt:
diff --git a/lang/et_EE.yml b/lang/et_EE.yml
index 6dbae6917..200f6eef7 100644
--- a/lang/et_EE.yml
+++ b/lang/et_EE.yml
@@ -1,6 +1,7 @@
 et_EE:
   AssetAdmin:
     NEWFOLDER: Uus kaust
+    SHOWALLOWEDEXTS: 'Näita lubatud laiendeid'
   AssetTableField:
     CREATED: 'Esmakordselt üles laaditud'
     DIM: Mõõtmed
@@ -11,6 +12,7 @@ et_EE:
     SIZE: 'Failisuurus'
     TITLE: Pealkiri
     TYPE: 'Failitüüp'
+    URL: URL
   AssetUploadField:
     ChooseFiles: 'Valige failid'
     DRAGFILESHERE: 'Lohistage failid siia'
@@ -22,7 +24,6 @@ et_EE:
     FROMCOMPUTER: 'Valige fail arvutist'
     FROMCOMPUTERINFO: 'Laadige üles arvutist'
     TOTAL: Kokku
-    TOUPLOAD: 'Valige üleslaadimiseks failid...'
     UPLOADINPROGRESS: 'Oodake... Üleslaadimine on pooleli'
     UPLOADOR: VÕI
   BBCodeParser:
@@ -50,12 +51,16 @@ et_EE:
     UNORDERED: 'Järjestamata nimekiri'
     UNORDEREDDESCRIPTION: 'Järjestamata nimekiri'
     UNORDEREDEXAMPLE1: 'Järjestamata asi 1'
+  BackLink_Button_ss:
+    Back: Tagasi
   BasicAuth:
     ENTERINFO: 'Palun sisesta kasutajanimi ja parool.'
     ERRORNOTADMIN: 'Antud kasutaja ei ole administraator.'
     ERRORNOTREC: 'See kasutajanimi / parool ei ole tunnustatud'
   Boolean:
     ANY: Kõik
+    NOANSWER: 'Ei'
+    YESANSWER: 'Jah'
   CMSLoadingScreen_ss:
     LOADING: Laadimine...
     REQUIREJS: 'Sisuhaldussüsteem nõuab, et JavaScript oleks lubatud.'
@@ -72,6 +77,9 @@ et_EE:
     EMAIL: E-post
     HELLO: Tere
     PASSWORD: Parool
+  CheckboxField:
+    NOANSWER: 'Ei'
+    YESANSWER: 'Jah'
   ConfirmedPasswordField:
     ATLEAST: 'Parool peab olema vähemalt {min} märki pikk.'
     BETWEEN: 'Parooli pikkus peab olema vahemikus {min}–{max} märki.'
@@ -246,7 +254,6 @@ et_EE:
     IMAGETITLETEXT: 'Pealkirja tekst (kohtspikker)'
     IMAGETITLETEXTDESC: 'Lisateabe saamiseks kujutise kohta'
     IMAGEWIDTHPX: Kõrgus
-    INSERTMEDIA: 'Sisesta meedium'
     LINK: 'Link'
     LINKANCHOR: 'Link sellele lehele'
     LINKDESCR: 'Lingi kirjeldus'
@@ -259,7 +266,6 @@ et_EE:
     PAGE: Leht
     URL: URL
     URLNOTANOEMBEDRESOURCE: 'URL-i ''{url}'' ei saanud muuta meediumiressursiks.'
-    UpdateMEDIA: 'Uuenda meediumi'
   Image:
     PLURALNAME: Failid
     SINGULARNAME: Fail
@@ -271,7 +277,6 @@ et_EE:
   LeftAndMain:
     CANT_REORGANISE: 'Teil ei ole õigusi kõrgema taseme lehtede muutmiseks. Teie muudatust ei salvestatud.'
     DELETED: Kustutatud.
-    DropdownBatchActionsDefault: Tegevused
     HELP: Spikker
     PERMAGAIN: 'Oled Sisuhaldusest välja logitud. Kui soovite uuesti sisse logida sisestage kasutajanimi ja parool.'
     PreviewButton: Eelvaade
diff --git a/lang/fa_IR.yml b/lang/fa_IR.yml
index 08e128d9c..d67654e93 100644
--- a/lang/fa_IR.yml
+++ b/lang/fa_IR.yml
@@ -1,62 +1,120 @@
 fa_IR:
   AssetAdmin:
-    NEWFOLDER: پوشه جديد
+    ALLOWEDEXTS: 'قالب‌های مجاز آپلود فایل'
+    HIDEALLOWEDEXTS: 'مخفی‌کردن قالب‌های مجاز'
+    NEWFOLDER: پوشه‌ی جدید
+    SHOWALLOWEDEXTS: 'نمایش قالب‌های مجاز'
   AssetTableField:
+    CREATED: 'نخستین بارگذاری'
     DIM: ابعاد
     FILENAME: نام فايل
     FOLDER: پوشه
+    HEIGHT: ارتفاع
     LASTEDIT: 'آخرین تغییرات'
-    OWNER: دارنده
-    SIZE: 'حجم'
+    OWNER: مالک
+    SIZE: 'حجم فایل'
     TITLE: عنوان
-    TYPE: 'نوع'
-    URL: نشانی
+    TYPE: 'نوع فایل'
+    URL: نشانی اینترنتی
+    WIDTH: پهنا
   AssetUploadField:
+    ChooseFiles: 'انتخاب فایل‌ها'
+    DRAGFILESHERE: 'فایل‌ها را به اینجا بکشید'
+    DROPAREA: 'محل انداختن'
     EDITALL: 'ویرایش همه'
+    EDITANDORGANIZE: 'ویرایش و سازمان‌دهی'
     EDITINFO: 'ویرایش فایل‌ها'
     FILES: فایل‌ها
+    FROMCOMPUTER: 'انتخاب فایل‌ها از کامپیوتر شما'
+    FROMCOMPUTERINFO: 'آپلود از کامپیوتر شما'
+    INSERTURL: 'وارد‌کردن از نشانی اینترنتی'
+    REMOVEINFO: 'حذف این فایل از این فیلد'
     TOTAL: مجموع
+    TOUPLOAD: 'انتخاب فایل‌ها برای آپلود...'
+    UPLOADINPROGRESS: 'لطفاً صبر کنید... آپلود در جریان است'
+    UPLOADOR: یا
   BBCodeParser:
     ALIGNEMENT: جاگذاری
-    ALIGNEMENTEXAMPLE: 'به راست'
-    BOLD: 'نوشته درست'
-    BOLDEXAMPLE: درست
+    ALIGNEMENTEXAMPLE: 'راست‌چین'
+    BOLD: 'متن درشت'
+    BOLDEXAMPLE: درشت
+    CODE: 'بلوک کد'
+    CODEDESCRIPTION: 'بلوک کد فرمت‌نشده'
+    CODEEXAMPLE: 'بلوک کد'
     COLORED: 'نوشته رنگی'
     COLOREDEXAMPLE: 'نوشته آبی'
-    EMAILLINK: 'پیوند ایمیل'
+    EMAILLINK: 'لینک ایمیل'
+    EMAILLINKDESCRIPTION: 'ایجاد لینک به یک نشانی ایمیل'
     IMAGE: عکس
-    ITALIC: 'نوشته گژ'
-    ITALICEXAMPLE: گژ
-    LINK: 'پیوند تارگاه'
-    UNDERLINE: 'نوشته با زیرخط'
-    UNDERLINEEXAMPLE: زیرخط
+    IMAGEDESCRIPTION: 'نمایش یک تصویر در ارسال شما'
+    ITALIC: 'نوشته ایتالیک'
+    ITALICEXAMPLE: ایتالیک
+    LINK: 'لینک وب‌سایت'
+    LINKDESCRIPTION: 'لینک به یک وب‌سایت یا نشانی اینترنتی دیگر'
+    STRUCK: 'متن باطل‌شده'
+    STRUCKEXAMPLE: باطل‌شده
+    UNDERLINE: 'نوشته زیرخط‌دار'
+    UNDERLINEEXAMPLE: زیرخط‌دار
+    UNORDERED: 'لیست مرتب‌نشده'
+    UNORDEREDDESCRIPTION: 'لیست مرتب‌نشده'
+    UNORDEREDEXAMPLE1: 'لیست مرتب‌نشده 1'
+  BackLink_Button_ss:
+    Back: بازگشت
+  BasicAuth:
+    ENTERINFO: 'لطفاً یک نام‌کاربری و رمز عبور را وارد نمایید.'
+    ERRORNOTADMIN: 'این کاربر یک مدیر نیست.'
+    ERRORNOTREC: 'این نام کاربری / رمز عبور شناخته‌شده نیست'
   Boolean:
     ANY: هر
     NOANSWER: 'خیر'
     YESANSWER: 'بله'
   CMSLoadingScreen_ss:
     LOADING: بارگذاری...
+    REQUIREJS: 'سی‌ام‌اس نیازمند این است که جاوااسکریپت را فعال نمایید.'
   CMSMain:
-    SAVE: نگاهداری
+    ACCESS: 'دسترسی به بخش ''{title}'''
+    ACCESSALLINTERFACES: 'دسترسی به تمامی بخش‌های سی‌ام‌اس'
+    ACCESSALLINTERFACESHELP: 'شامل تنظیمات دسترسی‌های ویژه می‌شود.'
+    SAVE: ذخیره
   CMSMemberLoginForm:
     BUTTONFORGOTPASSWORD: 'رمز عبور را فراموش کرده‌اید؟'
+    BUTTONLOGIN: 'ورود دوباره'
     BUTTONLOGOUT: 'خروج'
+    PASSWORDEXPIRED: '<p>رمز عبور شما منقضی شده‌است. <a target="_top" href="{link}">لطفاً یکی دیگر برگزینید.</a></p>'
   CMSPageHistoryController_versions_ss:
     PREVIEW: 'پیش‌نمایش وب‌سایت'
+  CMSPagesController_Tools_ss:
+    FILTER: پالایش
   CMSProfileController:
     MENUTITLE: 'پروفایل من'
   CMSSecurity:
+    INVALIDUSER: '<p>کاربر نامعتبر. جهت ادامه <a target="_top" href="{link}">لطفاً اینجا مجدداً وارد شوید.</a></p>'
+    LoginMessage: '<p>اگر کارهایی ذخیره‌نشده دارید می‌توانید با ورود مجدد در زیر به جایی که قبلاً بودید بازگردید.</p>'
     SUCCESS: موفقیت
+    SUCCESSCONTENT: '<p>ورود موفق. اگر به‌طور خودکار ارجاع نشدید <a target="_top" href="{link}">اینجا را کلیک کنید.</a></p>'
+    TimedOutTitleAnonymous: 'جلسه شما به پایان رسیده است.'
+    TimedOutTitleMember: 'سلام {name}!<br />زمان جلسه شما به پایان رسیده است.'
   ChangePasswordEmail_ss:
-    CHANGEPASSWORDTEXT1: 'شما گذرواژه تان را دگرگون کردید برای'
+    CHANGEPASSWORDTEXT1: 'شما رمز عبورتان را تغییر دادید برای'
+    CHANGEPASSWORDTEXT2: 'اکنون می‌توانید با این اطلاعات وارد شوید:'
     EMAIL: ايميل
     HELLO: درود
-    PASSWORD: كلمه عبور
+    PASSWORD: رمز عبور
   CheckboxField:
     NOANSWER: 'خیر'
     YESANSWER: 'بله'
+  CheckboxFieldSetField:
+    SOURCE_VALIDATION: 'لطفاً یک ارزش از لیست فراهم‌شده برگزینید. {value} یک گزینه معتبر نیست'
+  CheckboxSetField:
+    SOURCE_VALIDATION: 'لطفاً یک ارزش از لیست فراهم‌شده برگزینید. ''{value}'' یک گزینه معتبر نیست'
   ConfirmedPasswordField:
-    SHOWONCLICKTITLE: 'تغيير كلمه عبور'
+    ATLEAST: 'رمزهای عبور باید حداقل {min} کاراکتر باشد.'
+    BETWEEN: 'رمزهای عبور باید بین {min} تا {max} کاراکتر باشد.'
+    MAXIMUM: 'رمزهای عبور باید حداکثر {max} کاراکتر باشد.'
+    SHOWONCLICKTITLE: 'تغییر رمز عبور'
+  ContentController:
+    DRAFT_SITE_ACCESS_RESTRICTION: 'برای نمایش پیش‌نویس یا محتوای آرشیو شده باید با رمز عبور سی‌ام‌اس خود وارد شوید. <a href="%s">اینجا را کلیک کنید</a> تا به سایت منتشر‌شده بازگردید.'
+    NOTLOGGEDIN: 'وارد نشده'
   CreditCardField:
     FIRST: نخست
     FOURTH: چهارم
@@ -65,7 +123,7 @@ fa_IR:
   CurrencyField:
     CURRENCYSYMBOL: ﷼
   DataObject:
-    PLURALNAME: 'داده های اشیاء'
+    PLURALNAME: 'داده‌های اشیاء'
     SINGULARNAME: 'داده اشیاء'
   Date:
     DAY: روز
@@ -84,73 +142,162 @@ fa_IR:
     YEAR: سال
     YEARS: سال
   DateField:
+    NOTSET: 'نامشخص'
     TODAY: امروز
+    VALIDDATEFORMAT2: 'لطفاً یک قالب تاریخ معتبر وارد نمایید ({format})'
+    VALIDDATEMAXDATE: 'تاریخ شما باید قدیمی‌تر یا برابر با حداکثر تاریخ مجاز ({date}) باشد'
+    VALIDDATEMINDATE: 'تاریخ شما باید جدیدتر یا برابر با حداقل تاریخ مجاز ({date}) باشد'
+  DatetimeField:
+    NOTSET: 'نامشخص'
+  Director:
+    INVALID_REQUEST: 'درخواست نامعتبر'
   DropdownField:
     CHOOSE: (گزینش)
+    CHOOSESEARCH: '(گزینش یا جستجو)'
+    SOURCE_VALIDATION: 'لطفاً یک ارزش از لیست فراهم‌شده برگزینید. {value} یک گزینه معتبر نیست'
+  EmailField:
+    VALIDATION: 'لطفاً یک نشانی ایمیل وارد نمایید'
   Enum:
     ANY: هر
   File:
     AviType: 'فایل ویدیو AVI'
     Content: محتوا
     CssType: 'فایل CSS'
-    Filename: نام پرونده
+    DmgType: 'دیسک ایمیج اپل'
+    DocType: 'فایل Word'
+    Filename: نام فايل
+    GifType: 'تصویر GIF - مناسب برای نمودارها'
+    GzType: 'فایل فشرده‌شده GZIP'
     HtlType: 'فایل HTML'
     HtmlType: 'فایل HTML'
+    INVALIDEXTENSION: 'قالب مجاز نیست (مجاز: {extensions})'
+    INVALIDEXTENSIONSHORT: 'قالب مجاز نیست'
+    IcoType: 'تصویر آیکن'
+    JpgType: 'تصویر JPEG - مناسب برای عکس‌ها'
+    JsType: 'فایل جاوااسکریپت'
+    Mp3Type: 'فایل صوتی MP3'
+    MpgType: 'فایل ویدیویی MPEG'
+    NOFILESIZE: 'حجم فایل صفر بایت است.'
+    NOVALIDUPLOAD: 'فایل یک بارگذاری معتبر نیست'
     Name: نام
-    PLURALNAME: فايل ها
+    PLURALNAME: فایل‌ها
+    PdfType: 'فایل اکروبات PDF'
+    PngType: 'تصویر PNG - قالب مناسب همه منظوره'
     SINGULARNAME: فايل
+    TOOLARGE: 'حجم فایل بسیار زیاد است، حداکثر {size} مجاز است'
+    TOOLARGESHORT: 'حجم فایل از {size} فراتر است'
+    TiffType: 'قالب تصویر تگ‌شده'
     Title: عنوان
+    WavType: 'فایل صوتی WAV'
+    XlsType: 'صفحه‌گسترده Excel'
+    ZipType: 'فایل فشرده‌شده زیپ'
+  Filesystem:
+    SYNCRESULTS: 'همگام‌سازی کامل‌شد: {createdcount} آیتم ایجاد شد، {deletedcount} آیتم حذف شد.'
   Folder:
     PLURALNAME: پوشه‌ها
     SINGULARNAME: پوشه
   ForgotPasswordEmail_ss:
     HELLO: درود
+    TEXT1: 'شما اینجاست'
+    TEXT2: 'لینک نوسازی رمز عبور'
     TEXT3: برای
   Form:
+    CSRF_EXPIRED_MESSAGE: 'جلسه شما به پایان رسیده است. لطفاً فرم را مجدداً ارسال کنید.'
+    CSRF_FAILED_MESSAGE: 'به‌نظر می‌آید یک نقص فنی به‌وجود آمده‌است. لطفاً بر روی دکمه‌ی بازگشت کلیک کنید، در مرورگر خود دکمه‌ی ازنو را بزنید، و مجدداً تلاش نمایید.'
+    FIELDISREQUIRED: '{name} مورد نیاز است'
     SubmitBtnLabel: برو
-    VALIDATIONPASSWORDSDONTMATCH: 'گذرواژه‌ها همانند هم نیستند'
-    VALIDATIONPASSWORDSNOTEMPTY: 'گذرواژه نباید تهی باشد'
+    VALIDATIONCREDITNUMBER: 'لطفاً اطمینان حاصل‌کنید که {number} شماره کارت اعتباری را به درستی وارد کرده‌اید'
+    VALIDATIONNOTUNIQUE: 'مقدار وارد شده یکتا نیست'
+    VALIDATIONPASSWORDSDONTMATCH: 'رمزهای عبور همانند هم نیستند'
+    VALIDATIONPASSWORDSNOTEMPTY: 'رمزهای عبور نباید تهی باشند'
+    VALIDATIONSTRONGPASSWORD: 'رمزهای عبور باید حداقل شامل یک شماره و یک کاراکتر الفبایی باشند'
+    VALIDATOR: اعتبارسنج
+    VALIDCURRENCY: 'لطفاً یک واحد پول معتبر وارد نمایید'
   FormField:
-    NONE: هیچ کدام
+    Example: 'به‌طور مثال %s'
+    NONE: هیچ‌کدام
   GridAction:
     DELETE_DESCRIPTION: حذف
     Delete: حذف
+    UnlinkRelation: حذف لینک
   GridField:
+    Add: 'افزودن {name}'
+    Filter: پالایش
+    FilterBy: 'پالایش براساس'
     Find: بگرد
+    LEVELUP: 'سطح بالایی'
+    LinkExisting: 'لینک موجود'
+    NewRecord: '%s جدید'
+    NoItemsFound: 'هیچ آیتمی یافت نشد'
+    PRINTEDAT: 'پرینت‌شده در'
+    PRINTEDBY: 'پرینت‌شده توسط'
+    PlaceHolder: 'یافتن {type}'
+    PlaceHolderWithLabels: 'یافتن {type} از روی {name}'
+    RelationSearch: 'جستجوی رابط'
     ResetFilter: از نو
+  GridFieldAction_Delete:
+    DeletePermissionsFailure: 'دسترسی‌های حذف وجود ندارد'
+    EditPermissionsFailure: 'دسترسی‌های حذف لینک وجود ندارد'
+  GridFieldDetailForm:
+    CancelBtn: لغو
+    Create: ایجاد
+    Delete: حذف
+    DeletePermissionsFailure: 'دسترسی‌های حذف وجود ندارد'
+    Deleted: 'حذف شده %s %s'
+    Save: ذخیره
+    Saved: 'ذخیره‌شده {name} {link}'
   GridFieldEditButton_ss:
     EDIT: ویرایش
   GridFieldItemEditView:
     Go_back: 'بازگشت'
   Group:
+    AddRole: 'اعمال یک وظیفه به گروه'
     Code: 'كد گروه'
-    DefaultGroupTitleAdministrators: مدیران کل
+    DefaultGroupTitleAdministrators: مدیران
     DefaultGroupTitleContentAuthors: 'نویسندگان مطالب'
     Description: توضحیات
-    Locked: 'بسته شده است؟'
+    GroupReminder: 'اگر یک گروه مادر را برگزینید،‌ این گروه تمامی وظایف آن را می‌پذیرد'
+    HierarchyPermsError: 'با دسترسی‌های داده‌شده نمی‌توان گروه مادر "%s" را تخصیص داد (نیازمند دسترسی مدید ارشد)'
+    Locked: 'قفل‌شده؟'
+    NoRoles: 'هیچ وظیفه‌ای پیدا نشد'
     PLURALNAME: گروه‌ها
     Parent: 'گروه مادر'
-    RolesAddEditLink: 'اضافه/ویرایش وظیفه'
+    RolesAddEditLink: 'مدیریت وظایف'
     SINGULARNAME: گروه
-    Sort: 'تربیت چیدن'
-    has_many_Permissions: مجوز‌ها
+    Sort: 'ترتیب مرتب‌سازی'
+    has_many_Permissions: دسترسی‌ها
     many_many_Members: اعضاء
   GroupImportForm:
-    ResultDeleted: 'گروه %d حذف شد'
-    ResultUpdated: 'گروه %d بروز شد'
+    Help1: '<p>یک یا چند گروه را در قالب <em>CSV</em> وارد کنید (مقادیر جدا شده با ویرگول). <small><a href="#" class="toggle-advanced">نمایش کاربری پیشرفته</a></small></p>'
+    ResultCreated: '{count} گروه ایجاد شده'
+    ResultDeleted: 'گروه‌های %d حذف شد'
+    ResultUpdated: 'گروه‌های %d به‌روز شد'
   HtmlEditorField:
     ADDURL: 'افزودن URL'
+    ADJUSTDETAILSDIMENSIONS: 'جزئیات و ابعاد'
+    ANCHORSCANNOTACCESSPAGE: 'شما مجاز به دسترسی به محتوای صفحه مورد نظر نیستید.'
+    ANCHORSPAGENOTFOUND: 'صفحه‌ی هدف پیدا نشد'
+    BUTTONADDURL: 'افزودن نشانی اینترنتی'
     BUTTONINSERT: وارد کردن
     BUTTONINSERTLINK: 'گذاشتن پیوند'
     BUTTONREMOVELINK: 'برداشتن پیوند'
     BUTTONUpdate: به روزرسانی
+    CAPTIONTEXT: 'متن کپشن'
     CSSCLASS: 'جاگیری / الگو'
+    DETAILS: جزئیات
     EMAIL: 'پست الکترونیک'
     FILE: پرونده
     FOLDER: پوشه
+    FROMCMS: 'از سامانه مدیریت محتوا'
+    FROMCOMPUTER: 'از کامپیوتر شما'
+    FROMWEB: 'از وب'
+    FindInFolder: 'یافتن در پوشه'
+    IMAGEDIMENSIONS: ابعاد
     IMAGEHEIGHTPX: بلندی
     IMAGEWIDTHPX: پهنا
+    INSERTMEDIA: 'واردکردن رسانه'
     LINK: 'پیوند'
+    LINKDESCR: 'توضیحات لینک'
     LINKEMAIL: 'پست الکترونیک'
     LINKEXTERNAL: 'تارگاه دیگر'
     LINKFILE: 'یک پرونده را بارگزاری کنید'
@@ -158,56 +305,124 @@ fa_IR:
     LINKOPENNEWWIN: 'در پنجره جدید باز شود ؟'
     LINKTO: 'پیوند به'
     PAGE: برگ
+    SUBJECT: 'موضوع پست الکترونیک'
     URL: نشانی
+    UpdateMEDIA: 'به‌روز‌رسانی رسانه'
   Image:
     PLURALNAME: فایل‌ها
     SINGULARNAME: فايل
   Image_Cached:
     PLURALNAME: فایل‌ها
     SINGULARNAME: فايل
+  Image_iframe_ss:
+    TITLE: 'آی‌فریم آپلود عکس'
   LeftAndMain:
     DELETED: حذف شده
+    DropdownBatchActionsDefault: 'انتخاب یک عملیات...'
     HELP: کمک
+    PAGETYPE: 'نوع صفحه'
     PERMAGAIN: 'شما از سیستم مدیریت محتوا خارج شده اید.اگر میخواهید دوباره وارد شوید نام کاربری و رمز عبور خود را در قسمت زیر وارد کنید'
     PreviewButton: پیش‌نمایش
     SAVEDUP: ذخیره شده
+    ShowAsList: 'نمایش به‌صورت لیست'
+    TooManyPages: 'صفحات بسیار زیاد'
+    ValidationError: 'خطای اعتبارسنجی'
+    VersionUnknown: نامشخص
   LeftAndMain_Menu_ss:
     Hello: درود
     LOGOUT: 'خروج'
+  ListboxField:
+    SOURCE_VALIDATION: 'لطفاً یک ارزش از میان لیست فراهم‌شده برگزینید. %s گزینه‌ی درستی نیست'
   LoginAttempt:
     Email: 'نشانی ای‌میل'
     IP: 'نشانی IP'
+    PLURALNAME: 'مبادرت‌ به ورود'
+    SINGULARNAME: 'مبادرت‌ به ورود'
     Status: وضعیت
   Member:
+    ADDGROUP: 'افزودن گروه'
     BUTTONCHANGEPASSWORD: 'تغییر رمز عبور'
     BUTTONLOGIN: 'ورود'
+    BUTTONLOGINOTHER: 'ورود به عنوان شخصی دیگر'
+    BUTTONLOSTPASSWORD: 'من رمز عبور خود را فراموش کرده‌ام'
+    CANTEDIT: 'شما دسترسی انجام این کار را ندارید.'
     CONFIRMNEWPASSWORD: 'تکرار رمز عبور جدید'
     CONFIRMPASSWORD: 'تکرار رمز عبور'
+    DATEFORMAT: 'قالب تاریخ'
     DefaultAdminFirstname: 'مدیر پیشفرض'
+    DefaultDateTime: پیش‌فرض
     EMAIL: پست الکترونیک
     EMPTYNEWPASSWORD: 'رمز عبور جدید نمیتواند خالی باشد، لطفا دوباره تلاش کنید'
+    ENTEREMAIL: 'لطفاً یک نشانی ایمیل وارد نمایید تا پیوند ازنوسازی رمز عبور را دریافت کنید.'
+    ERRORPASSWORDNOTMATCH: 'رمز عبور کنونی همانند نیست، لطفاً مجدداً تلاش نمایید'
     FIRSTNAME: 'نام'
     INTERFACELANG: 'زبان برنامه'
+    LOGGEDINAS: 'شما به {name} عنوان وارد شده‌اید.'
     NEWPASSWORD: 'گذرواژه تازه'
+    NoPassword: 'رمز عبوری برای این کاربر وجود ندارد'
     PASSWORD: رمز عبور
     PLURALNAME: اعضاء
+    REMEMBERME: 'مرا برای بار بعدی به خاطر بسپار؟'
     SINGULARNAME: عضو
     SUBJECTPASSWORDCHANGED: 'گذرواژه شما دگرگون شد'
     SUBJECTPASSWORDRESET: 'پیوند ازنوسازی گذرواژه شما'
     SURNAME: نام خانوادگی
     TIMEFORMAT: 'قالب زمان'
+    VALIDATIONMEMBEREXISTS: 'یک عضو با %s یکسان از پیش وجود دارد'
+    WELCOMEBACK: 'خوش آمدید، {firstname}'
     YOUROLDPASSWORD: 'رمز عبور قدیمی'
     belongs_many_many_Groups: گروه‌ها
+    db_LastVisited: 'تاریخ آخرین بازدید'
     db_LockedOutUntil: 'بسته شده تا '
+    db_NumVisit: 'شمار بازدید'
     db_Password: رمز عبور
     db_PasswordExpiry: 'تاریخ از میان رفتن گذرواژه'
+  MemberAuthenticator:
+    TITLE: 'ایمیل و رمز عبور'
   MemberDatetimeOptionsetField:
+    AMORPM: 'ق‌ظ (قبل‌از‌ظهر) یا ب‌ظ (بعد‌از‌ظهر)'
+    Custom: دلخواه
+    DATEFORMATBAD: 'قالب تاریخ نامعتبر است'
+    DAYNOLEADING: 'روز از ماه بدون نمایش صفر در ابتدا'
+    FOURDIGITYEAR: 'سال چهار عددی'
+    FULLNAMEMONTH: 'نام کامل ماه (مثال ژوئن)'
+    HOURNOLEADING: 'ساعت بدون نمایش صفر در ابتدا'
+    MINUTENOLEADING: 'دقیقه بدون نمایش صفر در ابتدا'
+    MONTHNOLEADING: 'عدد ماه بدون نمایش صفر در ابتدا'
     Preview: پیش‌نمایش
+    SHORTMONTH: 'نام کوچک ماه (مانند Jun)'
+    TWODIGITDAY: 'شماره دو عددی روز از ماه'
+    TWODIGITHOUR: 'ساعت دو عددی (00 تا 23)'
+    TWODIGITMINUTE: 'دقیقه‌ی دو رقمی (00 تا 59)'
+    TWODIGITMONTH: 'ماه دو رقمی ( 01=ژانویه، و مانند آن)'
+    TWODIGITSECOND: 'ثانیه‌ی دو رقمی (00 تا 59)'
+    TWODIGITYEAR: 'سال دو عددی'
+    Toggle: 'نمایش راهنمای قالب‌بندی'
   MemberImportForm:
+    ResultCreated: 'ایجاد {count} عضو'
     ResultDeleted: 'کاربر %d حذف شد'
     ResultNone: 'تغییری ایجاد نشد'
+    ResultUpdated: 'به‌روز‌رسانی {count} عضو'
+  MemberPassword:
+    PLURALNAME: 'رمزهای عبور کاربر'
+    SINGULARNAME: 'رمز عبور کاربر'
+  MemberTableField:
+    APPLY_FILTER: 'اعمال پالایش'
   ModelAdmin:
     DELETE: حذف
+    DELETEDRECORDS: 'حذف {count} رکورد'
+    EMPTYBEFOREIMPORT: 'جایگزینی داده'
+    IMPORT: 'وارد‌کردن از CSV'
+    IMPORTEDRECORDS: '{count} رکورد وارد‌شده'
+    NOCSVFILE: 'لطفاً یک فایل CSV برای وارد‌کردن پیدا کنید'
+    NOIMPORT: 'چیزی برای وارد‌کردن وجود ندارد'
+    RESET: از نو
+    Title: 'مدل‌های داده'
+    UPDATEDRECORDS: 'به‌روز‌رسانی {count} رکورد'
+  ModelAdmin_ImportSpec_ss:
+    IMPORTSPECFIELDS: 'ستون‌های پایگاه داده'
+    IMPORTSPECLINK: 'نمایش مشخصات برای %s'
+    IMPORTSPECTITLE: 'مشخصات برای %s'
   ModelAdmin_Tools_ss:
     FILTER: پالایش
     IMPORT: وارد کردن
@@ -226,45 +441,96 @@ fa_IR:
     AdminGroup: مدیر کل
     CMS_ACCESS_CATEGORY: 'دسترسی CMS'
     FULLADMINRIGHTS: 'توانایی‌های کامل مدیریتی:'
+    PLURALNAME: دسترسی‌ها
+    SINGULARNAME: مجوز
+  PermissionCheckboxSetField:
+    AssignedTo: 'اختصاص داده‌شده به "{title}"'
+    FromGroup: 'از گروه "{title}" ارث برده است'
+    FromRole: 'از نقش "{title}" ارث برده است'
   PermissionRole:
+    OnlyAdminCanApply: 'تنها مدیر ارشد می‌تواند اعمال کند'
     PLURALNAME: وظایف
     SINGULARNAME: وظیفه
     Title: عنوان
+  PermissionRoleCode:
+    PLURALNAME: 'کدهای دسترسی‌ وظایف'
   Permissions:
     PERMISSIONS_CATEGORY: 'مجوز دسترسی ها و وظایف'
   PhoneNumberField:
     VALIDATION: 'لطفاً شماره تلفن معتبر وارد کنید'
   Security:
     ALREADYLOGGEDIN: 'شما به این صفحه دسترسی ندارید. اگر حساب کاربری دیگری دارید که به این صفحه دسترسی دارد، شما میتوانید دوباره وارد شوید..'
+    BUTTONSEND: 'برایم یک ازنوسازی رمز عبور ارسال کن'
+    CHANGEPASSWORDBELOW: 'می‌توانید رمز عبور خود را در پایین تغییر دهید.'
     CHANGEPASSWORDHEADER: 'تغییر گذرواژه'
     ENTERNEWPASSWORD: 'لطفاً گذرواژه جدید را وارد کنید.'
+    ERRORPASSWORDPERMISSION: 'جهت تغییر رمز عبور خود باید وارد شده باشید!'
     LOGIN: 'ورود'
+    LOSTPASSWORDHEADER: 'فراموشی رمز عبور'
+    PASSWORDSENTHEADER: 'پیوند ازنوسازی رمز عبور به ''{email}'' ارسال شد'
   SecurityAdmin:
     APPLY_ROLES: 'اعمال وظایف به گروه'
+    EDITPERMISSIONS: 'مدیریت دسترسی‌های گروه‌ها'
+    GROUPNAME: 'نام گروه'
+    IMPORTGROUPS: 'وارد کردن گروه‌ها'
+    IMPORTUSERS: 'وارد کردن کاربران'
     MEMBERS: کاربران
     MENUTITLE: امنیت
     NEWGROUP: 'گروه تازه'
+    PERMISSIONS: دسترسی‌ها
     ROLES: وظایف
     TABROLES: وظایف
     Users: کاربران
   SecurityAdmin_MemberImportForm:
     BtnImport: 'وارد کردن'
   SilverStripeNavigator:
+    Auto: خودکار
+    ChangeViewMode: 'تغییر وضعیت نمایش'
+    Desktop: کامپیوتر رومیزی
+    DualWindowView: 'پنجره‌ی دوتایی'
     Edit: ویرایش
+    EditView: 'وضعیت ویرایش'
     Mobile: موبایل
+    PreviewState: 'وضعیت پیش‌نمایش'
+    PreviewView: 'وضعیت پیش‌نمایش'
+    Responsive: واکنش‌گرا
+    SplitView: 'وضعیت دونیم شده'
     Tablet: تبلت
+    ViewDeviceWidth: 'انتخاب عرض پیش‌نمایش'
     Width: پهنا
   SiteTree:
     TABMAIN: اصلی
   TableListField:
+    CSVEXPORT: 'خروجی‌گیری به CSV'
     Print: چاپ
+  TableListField_PageControls_ss:
+    OF: از
+  TimeField:
+    VALIDATEFORMAT: 'لطفاً یک قالب زمان معتبر وارد نمایید ({format})'
   ToggleField:
     MORE: بیشتر
   UploadField:
+    ATTACHFILE: 'ضمیمه کردن یک فایل'
+    ATTACHFILES: 'ضمیمه کردن فایل‌ها'
+    AttachFile: 'ضمیمه کردن فایل‌(ها)'
+    CHOOSEANOTHERFILE: 'انتخاب فایلی دیگر'
+    DELETE: 'حذف از فایل‌ها'
     DOEDIT: ذخیره
+    DROPFILE: 'انداختن یک فایل'
+    DROPFILES: 'انداختن فایل‌ها'
     Dimensions: ابعاد
     EDIT: ویرایش
+    EDITINFO: 'ویرایش این فایل'
+    FIELDNOTSET: 'اطلاعات فایل پیدا نشد'
+    FROMCOMPUTER: 'از کامپیوتر شما'
+    FROMCOMPUTERINFO: 'انتخاب از فایل‌ها'
+    FROMFILES: 'از فایل‌ها'
+    MAXNUMBEROFFILESONE: 'تنها یک فایل را می‌تواند آپلود کند'
+    MAXNUMBEROFFILESSHORT: 'تنها {count} فایل را می‌تواند آپلود کند'
+    OVERWRITEWARNING: 'فایل با نام یکسان از پیش وجود دارد'
     REMOVE: حذف
+    STARTALL: 'شروع همه'
     Saved: ذخیره شده
+    UPLOADSINTO: 'ذخیره شدن در /{path}'
   Versioned:
     has_many_Versions: نسخه ها
diff --git a/lang/fi.yml b/lang/fi.yml
index e06029735..f82b8134c 100644
--- a/lang/fi.yml
+++ b/lang/fi.yml
@@ -1,5 +1,7 @@
 fi:
   AssetAdmin:
+    ALLOWEDEXTS: 'Sallitut siirron tiedostopäätteet'
+    HIDEALLOWEDEXTS: 'Piilota sallitut päätteet'
     NEWFOLDER: Uusi kansio
     SHOWALLOWEDEXTS: 'Näytä sallitut laajennukset'
   AssetTableField:
@@ -7,12 +9,14 @@ fi:
     DIM: Mitat
     FILENAME: Tiedoston nimi
     FOLDER: Kansio
+    HEIGHT: Korkeus
     LASTEDIT: 'Viimeksi muokattu'
     OWNER: Omistaja
     SIZE: 'Koko'
     TITLE: Otsikko
     TYPE: 'Tyyppi'
     URL: URL
+    WIDTH: Leveys
   AssetUploadField:
     ChooseFiles: 'Valitse tiedostot'
     DRAGFILESHERE: 'Raahaa tiedotot tähän'
@@ -23,8 +27,9 @@ fi:
     FILES: Tiedostot
     FROMCOMPUTER: 'Valitse tiedostot omalta tietokoneeltasi'
     FROMCOMPUTERINFO: 'Siirrä omalta tietokoneeltasi'
+    INSERTURL: 'Lisää URL-osoitteesta'
+    REMOVEINFO: 'Poista tämä tiedosto tästä kentästä'
     TOTAL: Yhteensä
-    TOUPLOAD: 'Valitse ladattavia tiedostoja...'
     UPLOADINPROGRESS: 'Ole hyvä ja odota... siirto käynnissä'
     UPLOADOR: TAI
   BBCodeParser:
@@ -64,7 +69,7 @@ fi:
     YESANSWER: 'Kyllä'
   CMSLoadingScreen_ss:
     LOADING: Ladataan...
-    REQUIREJS: 'CMS-järjestelmä vaatii, että selaimessasi on JavaSkriptit päällä.'
+    REQUIREJS: 'CMS-järjestelmä vaatii, että selaimessasi on JavaScript päällä.'
   CMSMain:
     ACCESS: 'Pääsy ''{title}'' -osioon'
     ACCESSALLINTERFACES: 'Pääsy kaikkiin CMS-osioihin'
@@ -76,7 +81,9 @@ fi:
     BUTTONLOGOUT: 'Kirjaudu ulos'
     PASSWORDEXPIRED: '<p>Salasanasi on vanhentunut. <a target="_top" href="{link}">Valitse uusi.</a></p>'
   CMSPageHistoryController_versions_ss:
-    PREVIEW: 'Nettisivun esikatselu'
+    PREVIEW: 'Sivuston esikatselu'
+  CMSPagesController_Tools_ss:
+    FILTER: Suodata
   CMSProfileController:
     MENUTITLE: 'Profiilini'
   CMSSecurity:
@@ -102,9 +109,10 @@ fi:
   ConfirmedPasswordField:
     ATLEAST: 'Salasanan on oltava vähintään {min} merkkiä pitkä.'
     BETWEEN: 'Salasanan on oltava väh. {min} ja enintään {max} merkkiä pitkä.'
-    MAXIMUM: 'Salasanan voi olla enintään {max} merkkiä pitkä.'
+    MAXIMUM: 'Salasana voi olla enintään {max} merkkiä pitkä.'
     SHOWONCLICKTITLE: 'Vaihda salasana'
   ContentController:
+    DRAFT_SITE_ACCESS_RESTRICTION: 'Nähdäksesi vedoksen tai arkistoidun sisällön, sinun tulee kirjautua sisällönhallintajärjestelmän salasanallasi . <a href="%s">Klikkaa tästä palataksesi julkaistulle sivustolle.</a>'
     NOTLOGGEDIN: 'Ei kirjautuneena'
   CreditCardField:
     FIRST: ensimmäinen
@@ -137,50 +145,49 @@ fi:
     TODAY: tänään
     VALIDDATEFORMAT2: 'Ole hyvä ja kirjaa päivämäärä sallitussa muodossa ({format})'
     VALIDDATEMAXDATE: 'Päivämäärän on oltava vanhempi tai sovittava asetettuun maksimiin ({date})'
-    VALIDDATEMINDATE: 'Päivämäärän on oltava uudempi tai sovittava vähintään asetettuun minimiin ({date})'
+    VALIDDATEMINDATE: 'Päivämäärän on oltava uudempi tai sovittava asetettuun minimiin ({date})'
   DatetimeField:
     NOTSET: 'Ei asetettu'
   Director:
     INVALID_REQUEST: 'Pyyntö on virheellinen'
   DropdownField:
     CHOOSE: (Valitse)
-    CHOOSESEARCH: '(Valitse tai Hae)'
     SOURCE_VALIDATION: 'Valitse arvo pudotusvalikosta. {value} ei kelpaa'
   EmailField:
     VALIDATION: 'Anna sähköpostiosoite, ole hyvä.'
   Enum:
     ANY: Yhtään
   File:
-    AviType: 'AVI videotiedosto'
+    AviType: 'AVI-videotiedosto'
     Content: Sisältö
-    CssType: 'CSS tiedosto'
-    DmgType: 'Apple levykuva'
+    CssType: 'CSS-tiedosto'
+    DmgType: 'Apple-levykuva'
     DocType: 'Word-tiedosto'
     Filename: Tiedostonimi
-    GifType: 'GIF kuva - hyvä kaaviolle'
+    GifType: 'GIF-kuva - hyvä kaavioille'
     GzType: 'GZIP pakattu tiedosto'
     HtlType: 'HTML-tiedosto'
     HtmlType: 'HTML-tiedosto'
     INVALIDEXTENSION: 'Tiedostopääte ei ole sallittu (sallitut muodot: {extensions})'
     INVALIDEXTENSIONSHORT: 'Tiedostopääte ei ole sallittu'
-    IcoType: 'Icon kuva'
-    JpgType: 'JPEG kuva - hyvä valokuville'
+    IcoType: 'Icon-kuva'
+    JpgType: 'JPEG-kuva - hyvä valokuville'
     JsType: 'Javascript-tiedosto'
-    Mp3Type: 'MP3 äänitiedosto'
-    MpgType: 'MPEG videotiedosto'
+    Mp3Type: 'MP3-äänitiedosto'
+    MpgType: 'MPEG-videotiedosto'
     NOFILESIZE: 'Tiedostokoko on nolla tavua.'
     NOVALIDUPLOAD: 'Tiedosto ei ole kelvollinen ladattavaksi'
     Name: Nimi
     PLURALNAME: Tiedostot
-    PdfType: 'Adobe Acrobat PDF -tiedosto'
-    PngType: 'PNG kuva - hyvä yleinen muoto'
+    PdfType: 'Adobe Acrobat PDF-tiedosto'
+    PngType: 'PNG-kuva - hyvä yleinen muoto'
     SINGULARNAME: Tiedosto
     TOOLARGE: 'Tiedostokoko on liian suuri: maks. sallittu koko on {size}'
     TOOLARGESHORT: 'Sallittu tiedostokoko ylitetty {size}'
-    TiffType: 'Tiff-kuva'
+    TiffType: 'TIFF-kuva'
     Title: Otsikko
-    WavType: 'WAV äänitiedosto'
-    XlsType: 'Excel tiedosto'
+    WavType: 'WAV-äänitiedosto'
+    XlsType: 'Excel-taulukko'
     ZipType: 'ZIP-pakattu tiedosto'
   Filesystem:
     SYNCRESULTS: 'Synkronointi valmis:  {createdcount} kohdetta luotu, {deletedcount} kohdetta poistettu'
@@ -247,12 +254,12 @@ fi:
     DefaultGroupTitleAdministrators: Järjestelmänvalvojat
     DefaultGroupTitleContentAuthors: 'Sisällöntuottajat'
     Description: Kuvaus
-    GroupReminder: 'Valitessasi isäntäryhmän, roolit periytyvät tähän ryhmään'
-    HierarchyPermsError: 'Isäntä ryhmään ei voitu asettaa "%s" annettuja oikeuksia (vaaditaan JÄRJESTELMÄNVALVOJAN oikeudet)'
+    GroupReminder: 'Valitessasi isäntäryhmän roolit periytyvät tähän ryhmään'
+    HierarchyPermsError: 'Isäntäryhmään ei voitu asettaa "%s" annettuja oikeuksia (vaaditaan JÄRJESTELMÄNVALVOJAN oikeudet)'
     Locked: 'Lukittu?'
     NoRoles: 'Rooleja ei löytynyt'
     PLURALNAME: Ryhmät
-    Parent: 'Yliryhmä'
+    Parent: 'Isäntäryhmä'
     RolesAddEditLink: 'Lisää/muokkaa rooleja'
     SINGULARNAME: Ryhmä
     Sort: 'Järjestys'
@@ -260,6 +267,7 @@ fi:
     many_many_Members: Jäsenet
   GroupImportForm:
     Help1: '<p>Tuo yksi tai useampi ryhmä <em>CSV</em>-muotoisena (arvot pilkulla erotettuina). <small><a href="#" class="toggle-advanced">Näytä edistyksellinen käyttö</a></small></p>'
+    Help2: '<div class="advanced"><h4>Edistynyt käyttö</h4><ul><li>Sallitut palstat: <em>%s</em></li><li>Olemassa olevat käyttäjät kohdistetaan uniikilla <em>Code</em>-arvolla, ja päivitetään uudet arvot tuodusta tiedostosta.</li><li>Ryhmät voidaan kohdistaa <em>Ryhmät</em>-palstaan. Ryhmät tunnistetaan <em>Code</em>-arvosta, useat ryhmät voidaan erottaa pilkulla. Olemassa olevat ryhmäjäsenyydet säilytetään.</li></ul></div>'
     ResultCreated: 'Luotiin {count} ryhmä(ä)'
     ResultDeleted: 'Poistettu %d ryhmää'
     ResultUpdated: 'Päivitetty %d ryhmää'
@@ -281,7 +289,7 @@ fi:
     CSSCLASSCENTER: 'Keskellä omillaan.'
     CSSCLASSLEFT: 'Vasemmalla, tekstin ympäröimänä.'
     CSSCLASSLEFTALONE: 'Vasemmalla, yksinään.'
-    CSSCLASSRIGHT: 'Oikealla, tesktin ympätöimänä.'
+    CSSCLASSRIGHT: 'Oikealla, tekstin ympäröimänä.'
     DETAILS: Tiedot
     EMAIL: 'Sähköpostiosoite'
     FILE: Tiedosto
@@ -291,27 +299,28 @@ fi:
     FROMWEB: 'Webistä'
     FindInFolder: 'Etsi kansiosta'
     IMAGEALT: 'Vaihtoehtoinen teksti (alt)'
+    IMAGEALTTEXT: 'Vaihtoehtoinen teksti (alt) - näytetään jos kuvaa ei voida näyttää'
+    IMAGEALTTEXTDESC: 'Näytetään ruudunlukuohjelmille tai jos kuvaa ei voi näyttää'
     IMAGEDIMENSIONS: Mitat
     IMAGEHEIGHTPX: Korkeus
     IMAGETITLE: 'Otsikko (tooltip) - kuvan lisätietoja varten'
     IMAGETITLETEXT: 'Otsikkoteksti (tooltip)'
     IMAGETITLETEXTDESC: 'Kuvan lisätiedot'
     IMAGEWIDTHPX: Leveys
-    INSERTMEDIA: 'Liitä media'
     LINK: 'Lisää/muokkaa linkki(ä) valittuun tekstiin'
     LINKANCHOR: 'Ankkuroi tähän sivuun'
     LINKDESCR: 'Linkin kuvaus'
     LINKEMAIL: 'Sähköpostiosoite'
-    LINKEXTERNAL: 'Toinen verkkosivusto'
+    LINKEXTERNAL: 'Toinen verkkosivusto (ulkoinen linkki)'
     LINKFILE: 'Lataa tiedosto'
-    LINKINTERNAL: 'Sivu sivustolla'
+    LINKINTERNAL: 'Sivu sivustolla (sisäinen linkki)'
     LINKOPENNEWWIN: 'Avataanko linkki uudessa ikkunassa?'
     LINKTO: 'Linkki'
     PAGE: Sivu
     SUBJECT: 'Sähköpostin aihe'
     URL: URL-osoite
-    URLNOTANOEMBEDRESOURCE: 'URL-osoitetteesta ''{url}'' ei voitu liittää mediaa'
-    UpdateMEDIA: 'Päivitä media'
+    URLDESCRIPTION: 'Liittääksesi videoita tai kuvia verkosta, lisää tiedoston täydellinen verkko-osoite.<br /><br />Huomioithan, että mikäli alkuperäinen tiedosto häviää alkuperäisestä osoitteesta, tiedosto ei näy enää tällä sivulla.'
+    URLNOTANOEMBEDRESOURCE: 'URL-osoitteesta ''{url}'' ei voitu liittää mediaa'
   Image:
     PLURALNAME: Tiedostot
     SINGULARNAME: Tiedosto
@@ -319,22 +328,28 @@ fi:
     PLURALNAME: Tiedostot
     SINGULARNAME: Tiedosto
   Image_iframe_ss:
-    TITLE: 'Kuvansiirto IFrame-kehys'
+    TITLE: 'Kuvansiirto iframe-kehys'
   LeftAndMain:
     CANT_REORGANISE: 'Sinulla ei ole oikeuksia mennä ylemmän tason sivuille. Muutoksiasi ei tallennettu.'
     DELETED: Poistettu.
-    DropdownBatchActionsDefault: Toimenpiteet
     HELP: Ohje
+    PAGETYPE: 'Sivutyyppi'
     PERMAGAIN: 'Olet kirjautunut ulos CMS:stä. Jos haluat kirjautua uudelleen sisään, syötä käyttäjätunnuksesi ja salasanasi alla.'
+    PERMALREADY: 'Pahoittelut, mutta et pääse tähän osaan CMS:ää. Jos haluat kirjautua jonain muuna, voit tehdä sen alta.'
+    PERMDEFAULT: 'Sinun tulee olla kirjautuneena ylläpito-osioon; syötä tunnuksesi kenttiin.'
+    PLEASESAVE: 'Tätä sivua ei voitu päivittää, koska sitä ei ole vielä tallennettu. Tallenna sivu.'
     PreviewButton: Esikatselu
-    REORGANISATIONSUCCESSFUL: 'Hakemistopuu järjestettiin uudelleen onnistuneesti.'
+    REORGANISATIONSUCCESSFUL: 'Hakemistopuu uudelleenjärjestettiin onnistuneesti.'
     SAVEDUP: Tallennettu.
     ShowAsList: 'näytä listana'
     TooManyPages: 'Liian monta sivua'
     ValidationError: 'Virhe vahvistuksessa'
+    VersionUnknown: tuntematon
   LeftAndMain_Menu_ss:
     Hello: Hei
     LOGOUT: 'Kirjaudu ulos'
+  ListboxField:
+    SOURCE_VALIDATION: 'Valitse arvo annetuista vaihtoehdoista. %s ei kelpaa'
   LoginAttempt:
     Email: 'Sähköpostiosoite'
     IP: 'IP-osoite'
@@ -410,6 +425,7 @@ fi:
     Toggle: 'Näytä muotoiluohjeet'
   MemberImportForm:
     Help1: '<p>Tuo käyttäjät <em>CSV-muodossa</em> (arvot pilkulla erotettuina). <small><a href="#" class="toggle-advanced">Näytä edistyksellinen käyttö</a></small></p>'
+    Help2: '<div class="advanced"><h4>Edistynyt käyttö</h4><ul><li>Sallitut palstat: <em>%s</em></li><li>Olemassa olevat käyttäjät kohdistetaan uniikilla <em>Code</em>-arvolla, ja päivitetään uudet arvot tuodusta tiedostosta.</li><li>Ryhmät voidaan kohdistaa <em>Ryhmät</em>-palstaan. Ryhmät tunnistetaan <em>Code</em>-arvosta, useat ryhmät voidaan erottaa pilkulla. Olemassa olevat ryhmäjäsenyydet säilytetään.</li></ul></div>'
     ResultCreated: 'Luotiin {count} käyttäjä(ä)'
     ResultDeleted: 'Poistettu %d jäsentä'
     ResultNone: 'Ei muutoksia'
@@ -468,31 +484,31 @@ fi:
     FromRole: 'periytyivät roolista "{title}"'
     FromRoleOnGroup: 'periytynyt roolista "%s" ryhmässä "%s"'
   PermissionRole:
-    OnlyAdminCanApply: 'Vain järjestelmänvalvoja on oikeudet aseta'
+    OnlyAdminCanApply: 'Vain järjestelmänvalvojalla on oikeudet asettaa'
     PLURALNAME: Roolit
     SINGULARNAME: Rooli
     Title: Roolin nimi
   PermissionRoleCode:
     PLURALNAME: 'Käyttöoikeuden roolin koodit'
     PermsError: 'Ei voida asettaa koodia "%s" annetuilla oikeuksilla (vaaditaan JÄRJESTELMÄNVALVOJAN oikeudet)'
-    SINGULARNAME: 'Käyttöoikeiden roolin koodi'
+    SINGULARNAME: 'Käyttöoikeuden roolin koodi'
   Permissions:
     PERMISSIONS_CATEGORY: 'Roolit ja käyttöoikeudet'
     UserPermissionsIntro: 'Määriteltäessä käyttäjälle ryhmä, hänen käyttöoikeutensa mukautuvat ryhmälle tehtyjen asetusten mukaisesti. Katso tarkemmat ryhmäkohtaiset käyttöoikeusasetukset Ryhmät-välilehdeltä.'
   PhoneNumberField:
     VALIDATION: 'Kirjoita pätevä puhelinnumero'
   Security:
-    ALREADYLOGGEDIN: 'Sinulla ei ole oikeuksia tälle sivulle. Jos sinulla on toinen tili, jolla on oikeudet tälle sivulle, voit kirjautua niillä sisään.'
+    ALREADYLOGGEDIN: 'Sinulla ei ole oikeuksia tälle sivulle. Jos sinulla on toinen tili, jolla on oikeudet tälle sivulle, voit kirjautua sillä sisään.'
     BUTTONSEND: 'Lähetä minulle salasanan palautuslinkki'
-    CHANGEPASSWORDBELOW: 'Voit vaihtaa salasanaasi alla.'
+    CHANGEPASSWORDBELOW: 'Voit vaihtaa salasanasi alla.'
     CHANGEPASSWORDHEADER: 'Vaihda salasanasi'
     ENTERNEWPASSWORD: 'Syötä uusi salasanasi'
-    ERRORPASSWORDPERMISSION: 'Sinun täytyy olla kirjautuneena sisään, jotta voit vaihtaa salasanasi.'
+    ERRORPASSWORDPERMISSION: 'Sinun täytyy olla kirjautuneena sisään jotta voit vaihtaa salasanasi.'
     LOGGEDOUT: 'Kirjauduit ulos. Jos haluat kirjautua sisään, syötä tietosi alle.'
     LOGIN: 'Kirjaudu sisään'
-    LOSTPASSWORDHEADER: 'Unohtunut Salasana'
-    NOTEPAGESECURED: 'Tämä sivu on suojattu. Syötä tunnistetietosi alle ja annamme sinulle oikeat oikeudet.'
-    NOTERESETLINKINVALID: '<p>Salasanan nollauslinkki on virheellinen tai vanhentunut.</p><p>Voit pyytää uuden <a href="{link1}">napsauttamalla tästä</a> tai vaihtaa salasanasi <a href="{link2}">kirjautumisen jälkeen</a>.</p>'
+    LOSTPASSWORDHEADER: 'Unohtunut salasana'
+    NOTEPAGESECURED: 'Tämä sivu on suojattu. Syötä tunnistetietosi alle niin pääset eteenpäin.'
+    NOTERESETLINKINVALID: '<p>Salasanan palautuslinkki on virheellinen tai vanhentunut.</p><p>Voit pyytää uuden <a href="{link1}">napsauttamalla tästä</a> tai vaihtaa salasanasi <a href="{link2}">kirjautumisen jälkeen</a>.</p>'
     NOTERESETPASSWORD: 'Syötä sähköpostiosoitteesi ja lähetämme sinulle linkin, jonka avulla saat palautettua salasanasi'
     PASSWORDSENTHEADER: 'Salasanan palautuslinkki lähetettiin osoitteeseen ''{email}'''
     PASSWORDSENTTEXT: 'Kiitos! Salasanan palautuslinkki lähetettiin osoitteeseen ''{email}'', joka on liitettynä tähän käyttäjätiliin.'
@@ -500,7 +516,7 @@ fi:
     ACCESS_HELP: 'Oikeuttaa käyttäjien katselun, lisäämisen ja muokkaamisen, kuten myös käyttöoikeuksien ja roolien määrittämisen heille.'
     APPLY_ROLES: 'Aseta roolit ryhmille'
     APPLY_ROLES_HELP: 'Mahdollisuus muokata ryhmän roolinimityksiä. Vaatii "Pääsy turvallisuusosioon" -oikeuden.'
-    EDITPERMISSIONS: 'Muokkaa jokaisen ryhmän oikeuksia ja IP-osotteita.'
+    EDITPERMISSIONS: 'Muokkaa ryhmien oikeuksia'
     EDITPERMISSIONS_HELP: 'Mahdollisuus muokata ryhmän käyttöoikeuksia ja IP-osoitteita. Vaatii "Pääsy turvallisuusosioon" -oikeuden.'
     GROUPNAME: 'Ryhmän nimi'
     IMPORTGROUPS: 'Tuo ryhmiä'
@@ -539,6 +555,8 @@ fi:
     Print: Tulosta
   TableListField_PageControls_ss:
     OF: /
+  TextField:
+    VALIDATEMAXLENGTH: '{name}-arvo ei voi ylittää {maxLength} merkin määrää.'
   TimeField:
     VALIDATEFORMAT: 'Ole hyvä ja kirjaa päivämäärä sallitussa muodossa ({format})'
   ToggleField:
@@ -549,9 +567,9 @@ fi:
     ATTACHFILES: 'Liitä tiedostoja'
     AttachFile: 'Liitä tiedosto(ja)'
     CHOOSEANOTHERFILE: 'Valitse toinen tiedosto'
-    CHOOSEANOTHERINFO: 'Korvaa tämä tiedosto toisella palvelimen tiedostoissa olevalla'
+    CHOOSEANOTHERINFO: 'Korvaa tämä tiedosto toisella palvelimella olevalla tiedostolla'
     DELETE: 'Poista tiedostoista'
-    DELETEINFO: 'Poista tiedosto pysyvästi'
+    DELETEINFO: 'Poista tiedosto pysyvästi palvelimelta'
     DOEDIT: Tallenna
     DROPFILE: 'Pudota tiedosto'
     DROPFILES: 'pudota tiedostot'
@@ -564,11 +582,11 @@ fi:
     FROMFILES: 'Tiedostoista'
     HOTLINKINFO: 'Info: Kuvalle tulee suora linkki. Varmista sivun omistajalta, että sinulla on oikeus suoraan linkitykseen.'
     MAXNUMBEROFFILES: 'Suurin sallittu määrä ({count}) tiedostoja ylitetty.'
-    MAXNUMBEROFFILESONE: 'Vain yhden tiedoston siirto mahdollista'
+    MAXNUMBEROFFILESONE: 'Vain yhden tiedoston siirto on mahdollista'
     MAXNUMBEROFFILESSHORT: 'Voidaan siirtää vain {count} tiedostoa'
     OVERWRITEWARNING: 'Samanniminen tiedosto on jo palvelimella'
     REMOVE: Poista
-    REMOVEINFO: 'Poista tiedosto, mutta säilytä se tiedostovarastossa'
+    REMOVEINFO: 'Poista tiedosto, mutta säilytä se palvelimella'
     STARTALL: 'Aloita kaikki'
     Saved: Tallennettu
     UPLOADSINTO: 'tallentuu polkuun: /{path}'
diff --git a/lang/fr.yml b/lang/fr.yml
index 952d44c99..1630fd8ea 100644
--- a/lang/fr.yml
+++ b/lang/fr.yml
@@ -24,7 +24,6 @@ fr:
     FROMCOMPUTER: 'Choisissez des fichiers de votre ordinateur'
     FROMCOMPUTERINFO: 'Télécharger depuis votre ordinateur'
     TOTAL: Total
-    TOUPLOAD: 'Choisissez les fichiers à télécharger…'
     UPLOADINPROGRESS: 'Patientez s''il vous plaît… téléchargement en cours '
     UPLOADOR: OU
   BBCodeParser:
@@ -269,7 +268,6 @@ fr:
     IMAGETITLETEXT: 'Texte du titre (info-bulle)'
     IMAGETITLETEXTDESC: 'Autres informations à propos de l’image'
     IMAGEWIDTHPX: Largeur
-    INSERTMEDIA: 'Insérer un support audiovisuel'
     LINK: 'Lien'
     LINKANCHOR: 'Ancre sur cette page'
     LINKDESCR: 'Description du lien'
@@ -282,7 +280,6 @@ fr:
     PAGE: Page
     URL: URL
     URLNOTANOEMBEDRESOURCE: 'L’URL {url} n’a pas pu être utilisée comme ressource média.'
-    UpdateMEDIA: 'Mettre à jour le support audiovisuel'
   Image:
     PLURALNAME: Fichiers
     SINGULARNAME: Fichier
@@ -294,7 +291,6 @@ fr:
   LeftAndMain:
     CANT_REORGANISE: 'Vous n’avez pas l’autorisation de modifier les pages de premier niveau. Vos modifications n’ont pas été enregistrées.'
     DELETED: Supprimé.
-    DropdownBatchActionsDefault: Actions
     HELP: Aide
     PERMAGAIN: 'Vous avez été déconnecté du CMS. Si vous voulez vous reconnecter, entrez un nom d''utilisateur et un mot de passe ci-dessous.'
     PreviewButton: Aperçu
diff --git a/lang/gl_ES.yml b/lang/gl_ES.yml
index 79b418067..75ca90b7d 100644
--- a/lang/gl_ES.yml
+++ b/lang/gl_ES.yml
@@ -156,7 +156,6 @@ gl_ES:
   Image_iframe_ss:
     TITLE: 'Iframe subindo imaxe'
   LeftAndMain:
-    DropdownBatchActionsDefault: Accións
     HELP: Axuda
     PERMAGAIN: 'Non tes unha sesión válida no CMS. Se queres volver entrar, insire o nome de usuario e contrasinal a continuación.'
   LoginAttempt:
diff --git a/lang/hr.yml b/lang/hr.yml
index 0e8957e92..de353f065 100644
--- a/lang/hr.yml
+++ b/lang/hr.yml
@@ -23,7 +23,6 @@ hr:
     FROMCOMPUTER: 'Odaberite datoteke sa svog računala'
     FROMCOMPUTERINFO: 'Uploadajte sa svog računala'
     TOTAL: Ukupno
-    TOUPLOAD: 'Odaberite datoteke za upload...'
     UPLOADINPROGRESS: 'Molim pričekajte... upload u tijeku'
     UPLOADOR: ILI
   BBCodeParser:
diff --git a/lang/id.yml b/lang/id.yml
index 39c28c73a..c0522318a 100644
--- a/lang/id.yml
+++ b/lang/id.yml
@@ -24,7 +24,6 @@ id:
     FROMCOMPUTER: 'Pilih berkas dari komputer Anda'
     FROMCOMPUTERINFO: 'Unggah dari komputer Anda'
     TOTAL: Total
-    TOUPLOAD: 'Pilih berkas untuk diunggah...'
     UPLOADINPROGRESS: 'Mohon tunggu... sedang mengunggah'
     UPLOADOR: ATAU
   BBCodeParser:
@@ -144,7 +143,6 @@ id:
     INVALID_REQUEST: 'Permintaan tidak valid'
   DropdownField:
     CHOOSE: (Pilih)
-    CHOOSESEARCH: '(Pilih atau Cari)'
     SOURCE_VALIDATION: 'Mohon pilih nilai dari daftar yang ada. ''{value}'' bukan pilihan valid'
   EmailField:
     VALIDATION: 'Mohon isikan alamat email'
@@ -297,7 +295,6 @@ id:
     IMAGETITLETEXT: 'Teks gambar (tooltip)'
     IMAGETITLETEXTDESC: 'Untuk informasi tambahan tentang gambar'
     IMAGEWIDTHPX: Lebar
-    INSERTMEDIA: 'Sisipkan Media'
     LINK: 'Sisipkan Tautan'
     LINKANCHOR: 'Jangkar pada laman ini'
     LINKDESCR: 'Deskripsi tautan'
@@ -311,7 +308,6 @@ id:
     SUBJECT: 'Subyek email'
     URL: URL
     URLNOTANOEMBEDRESOURCE: 'URL ''{url}'' tidak dapat dijadikan sumber daya media.'
-    UpdateMEDIA: 'Perbarui Media'
   Image:
     PLURALNAME: Berkas
     SINGULARNAME: Berkas
@@ -323,7 +319,6 @@ id:
   LeftAndMain:
     CANT_REORGANISE: 'Anda tidak diijinkan mengubah laman Tingkat Atas. Pengubahan Anda tidak tersimpan.'
     DELETED: Terhapus.
-    DropdownBatchActionsDefault: Tindakan
     HELP: Bantuan
     PERMAGAIN: 'Anda telah keluar dari situs. Jika ingin kembali masuk, isikan nama pengguna dan kata kunci di bawah ini.'
     PreviewButton: Pratinjau
diff --git a/lang/id_ID.yml b/lang/id_ID.yml
index 16f42aac4..5b8ddb403 100644
--- a/lang/id_ID.yml
+++ b/lang/id_ID.yml
@@ -24,7 +24,6 @@ id_ID:
     FROMCOMPUTER: 'Pilih berkas dari komputer Anda'
     FROMCOMPUTERINFO: 'Unggah dari komputer Anda'
     TOTAL: Total
-    TOUPLOAD: 'Pilih berkas untuk diunggah...'
     UPLOADINPROGRESS: 'Mohon tunggu... sedang mengunggah'
     UPLOADOR: ATAU
   BBCodeParser:
@@ -144,7 +143,6 @@ id_ID:
     INVALID_REQUEST: 'Permintaan tidak valid'
   DropdownField:
     CHOOSE: (Pilih)
-    CHOOSESEARCH: '(Pilih atau Cari)'
     SOURCE_VALIDATION: 'Mohon pilih nilai dari daftar yang ada. ''{value}'' bukan pilihan valid'
   EmailField:
     VALIDATION: 'Mohon isikan alamat email'
@@ -297,7 +295,6 @@ id_ID:
     IMAGETITLETEXT: 'Teks gambar (tooltip)'
     IMAGETITLETEXTDESC: 'Untuk informasi tambahan tentang gambar'
     IMAGEWIDTHPX: Lebar
-    INSERTMEDIA: 'Sisipkan Media'
     LINK: 'Sisipkan Tautan'
     LINKANCHOR: 'Jangkar pada laman ini'
     LINKDESCR: 'Deskripsi tautan'
@@ -311,7 +308,6 @@ id_ID:
     SUBJECT: 'Subyek email'
     URL: URL
     URLNOTANOEMBEDRESOURCE: 'URL ''{url}'' tidak dapat dijadikan sumber daya media.'
-    UpdateMEDIA: 'Perbarui Media'
   Image:
     PLURALNAME: Berkas
     SINGULARNAME: Berkas
@@ -323,7 +319,6 @@ id_ID:
   LeftAndMain:
     CANT_REORGANISE: 'Anda tidak diijinkan mengubah laman Tingkat Atas. Pengubahan Anda tidak tersimpan.'
     DELETED: Terhapus.
-    DropdownBatchActionsDefault: Tindakan
     HELP: Bantuan
     PERMAGAIN: 'Anda telah keluar dari situs. Jika ingin kembali masuk, isikan nama pengguna dan kata kunci di bawah ini.'
     PreviewButton: Pratinjau
diff --git a/lang/it.yml b/lang/it.yml
index acef00d87..4ead4226b 100644
--- a/lang/it.yml
+++ b/lang/it.yml
@@ -24,7 +24,6 @@ it:
     FROMCOMPUTER: 'Scegli file dal tuo computer'
     FROMCOMPUTERINFO: 'Carica dal tuo conputer'
     TOTAL: Totale
-    TOUPLOAD: 'Scegli i file da caricare...'
     UPLOADINPROGRESS: 'Attendere prego... caricamento in corso'
     UPLOADOR: O
   BBCodeParser:
@@ -144,7 +143,6 @@ it:
     INVALID_REQUEST: 'Richiesta non valida'
   DropdownField:
     CHOOSE: (Scegli)
-    CHOOSESEARCH: '(Scegliere o Cercare)'
     SOURCE_VALIDATION: 'Per favore selezionare un valore tra quelli forniti. {value} non è un''opzione valida'
   EmailField:
     VALIDATION: 'Inserisci un indirizzo e-mail'
@@ -297,7 +295,6 @@ it:
     IMAGETITLETEXT: 'Titolo (tooltip)'
     IMAGETITLETEXTDESC: 'Per informazioni addizionali sull''immagine'
     IMAGEWIDTHPX: Larghezza
-    INSERTMEDIA: 'Inserisci Media'
     LINK: 'Inserisci Link'
     LINKANCHOR: 'Ancora su questa pagina'
     LINKDESCR: 'Descrizione del link'
@@ -311,7 +308,6 @@ it:
     SUBJECT: 'Oggetto email'
     URL: URL
     URLNOTANOEMBEDRESOURCE: 'L''URL ''{url}'' non può essere convertito in una risorsa media.'
-    UpdateMEDIA: 'Aggiorna Media'
   Image:
     PLURALNAME: Files
     SINGULARNAME: File
@@ -323,7 +319,6 @@ it:
   LeftAndMain:
     CANT_REORGANISE: 'Non hai i permessi per modificare le pagine di primo livello. Le modifiche non sono state salvate.'
     DELETED: Eliminato.
-    DropdownBatchActionsDefault: Azioni
     HELP: Aiuto
     PERMAGAIN: 'Sei stato disconnesso dal CMS. Se desideri autenticarti nuovamente, inserisci qui sotto nome utente e password.'
     PERMALREADY: 'Siamo spiacenti, ma non puoi accedere a questa sezione del CMS. Se desideri autenticarti come qualcun altro, fallo qui sotto.'
diff --git a/lang/ja.yml b/lang/ja.yml
index fc9bb04b1..67c65ba45 100644
--- a/lang/ja.yml
+++ b/lang/ja.yml
@@ -24,7 +24,6 @@ ja:
     FROMCOMPUTER: 'お使いのコンピュータからファイルを選択してください'
     FROMCOMPUTERINFO: 'コンピュータからアップロード'
     TOTAL: 合計
-    TOUPLOAD: 'アップロードするファイルを選択する'
     UPLOADINPROGRESS: 'しばらくお待ちください...アップロードは進行中です'
     UPLOADOR: もしくは
   BBCodeParser:
@@ -267,7 +266,6 @@ ja:
     IMAGETITLETEXT: 'タイトルテキスト(ツールチップ)'
     IMAGETITLETEXTDESC: '画像に関する追加情報'
     IMAGEWIDTHPX: 幅
-    INSERTMEDIA: 'メディアを追加'
     LINK: 'ハイライトテキストへのリンクの挿入/削除'
     LINKANCHOR: 'このページにアンカーを置く'
     LINKDESCR: 'リンクの説明'
@@ -280,7 +278,6 @@ ja:
     PAGE: ページ
     URL: URL
     URLNOTANOEMBEDRESOURCE: 'URL''{url}''はメディアリソースとして扱うことができませんでした。'
-    UpdateMEDIA: 'メディアを更新'
   Image:
     PLURALNAME: ファイル
     SINGULARNAME: ファイル
@@ -292,7 +289,6 @@ ja:
   LeftAndMain:
     CANT_REORGANISE: '最上層のページを変更する権限がありません。あなたの変更は保存されませんでした。'
     DELETED: 削除しました。
-    DropdownBatchActionsDefault: アクション
     HELP: ヘルプ
     PERMAGAIN: 'ログアウトしました。再度ログインする場合は下にユーザー名とパスワードを入力してください。'
     PreviewButton: プレビュー
diff --git a/lang/lt.yml b/lang/lt.yml
index 1725617f3..ef31520dd 100644
--- a/lang/lt.yml
+++ b/lang/lt.yml
@@ -1,5 +1,7 @@
 lt:
   AssetAdmin:
+    ALLOWEDEXTS: 'Leidžiamų įkelti bylų plėtiniai'
+    HIDEALLOWEDEXTS: 'Slėpti leidžiamus bylų plėtinius'
     NEWFOLDER: Naujas kalalogas
     SHOWALLOWEDEXTS: 'Rodyti leidžiamus bylų plėtinius'
   AssetTableField:
@@ -7,12 +9,14 @@ lt:
     DIM: Išmatavimai
     FILENAME: Bylos pavadinimas
     FOLDER: Katalogas
+    HEIGHT: Aukštis
     LASTEDIT: 'Redaguota'
     OWNER: Vartotojas
     SIZE: 'Bylos dydis'
     TITLE: Pavadinimas
     TYPE: 'Bylos tipas'
     URL: URL adresas
+    WIDTH: Plotis
   AssetUploadField:
     ChooseFiles: 'Pasirinkite bylas'
     DRAGFILESHERE: 'Vilkite bylas čia'
@@ -23,8 +27,10 @@ lt:
     FILES: Bylos
     FROMCOMPUTER: 'Pasirinkite bylas iš jūsų kompiuterio'
     FROMCOMPUTERINFO: 'Įkelti iš jūsų kompiuterio'
+    INSERTURL: 'Įkelti iš nuorodos'
+    REMOVEINFO: 'Pašalinti šią bylą iš šio lauko'
     TOTAL: Viso
-    TOUPLOAD: 'Pasirinkite bylas įkėlimui...'
+    TOUPLOAD: 'Pasirinkite norimas bylas...'
     UPLOADINPROGRESS: 'Prašome palaukti... vyksta įkėlimas'
     UPLOADOR: ARBA
   BBCodeParser:
@@ -77,6 +83,8 @@ lt:
     PASSWORDEXPIRED: '<p>Jūsų slaptažodžio galiojimas pasibaigė. <a target="_top" href="{link}">Prašome sukurti naują.</a></p>'
   CMSPageHistoryController_versions_ss:
     PREVIEW: 'Puslapio peržiūra'
+  CMSPagesController_Tools_ss:
+    FILTER: Filtras
   CMSProfileController:
     MENUTITLE: 'Mano profilis'
   CMSSecurity:
@@ -105,6 +113,7 @@ lt:
     MAXIMUM: 'Slaptažodžiai privalo būti ne ilgesni nei {max} simbolių ilgio.'
     SHOWONCLICKTITLE: 'Pakeisti slaptažodį'
   ContentController:
+    DRAFT_SITE_ACCESS_RESTRICTION: 'Jūs turite prisijungti su savo TVS slaptažodžiu, kad galėtumėte peržiūrėti juodraščio arba archyvo turinį.<a href="%s">Spauskite čia, norėdami grįžti į svetainę</a>.'
     NOTLOGGEDIN: 'Neprisijungęs'
   CreditCardField:
     FIRST: pirmas
@@ -313,6 +322,7 @@ lt:
     PAGE: Puslapis
     SUBJECT: 'El. laiško tema'
     URL: URL adresas
+    URLDESCRIPTION: 'Įkelkite video ir paveikslėlius iš interneto į jūsų puslapį tiesiog įvesdami bylos nuorodą. Būtinai pasitikrinkite ar turite leidimą panaudoti norimas bylas.<br /><br />Atminkite, kad pridėtos bylos nesaugomos TVS, bet rodomos tiesiai iš išorinio šaltinio. Jeigu šios bylos bus pašalintos iš ten, jūsų svetainėje jie nebebus rodomi.'
     URLNOTANOEMBEDRESOURCE: 'Nepavyko URL nuorodos ''{url}'' panaudoti media turiniui.'
     UpdateMEDIA: 'Atnaujinti media'
   Image:
@@ -326,9 +336,9 @@ lt:
   LeftAndMain:
     CANT_REORGANISE: 'Jūs neturite leidimo keisti aukščiausio lygio puslapių. Jūsų pakeitimai neišsaugoti.'
     DELETED: Ištrinta.
-    DropdownBatchActionsDefault: Veiksmai
+    DropdownBatchActionsDefault: 'Pasirinkite veiksmą...'
     HELP: Pagalba
-    PAGETYPE: 'Puslapio tipas:'
+    PAGETYPE: 'Puslapio tipas'
     PERMAGAIN: 'Jūs atsijungėte. Norėdami vėl prisijungti, įveskite savo duomenis į žemiau esančius laukelius.'
     PERMALREADY: 'Deja, bet Jūs negalite patekti į šią TVS dalį. Jeigu norite prisijungti kitu vartotoju, tai atlikite žemiau.'
     PERMDEFAULT: 'Jūs turite būti prisijungę, norėdami pasiekti administravimo zoną; prašome suvesti prisijungimo duomenis į žemiau esančius laukelius.'
diff --git a/lang/mi.yml b/lang/mi.yml
index 33b4ddafa..ee682ebc2 100644
--- a/lang/mi.yml
+++ b/lang/mi.yml
@@ -24,7 +24,6 @@ mi:
     FROMCOMPUTER: 'Kōwhiri kōnae mai i tō rorohiko'
     FROMCOMPUTERINFO: 'Tukuatu  i tō rorohiko'
     TOTAL: Tapeke
-    TOUPLOAD: 'Kōwhiria ngā kōnae hei tukuatu...'
     UPLOADINPROGRESS: 'Taihoa...he tukuatu kei te haere'
     UPLOADOR: TĒNEI RĀNEI
   BBCodeParser:
@@ -269,7 +268,6 @@ mi:
     IMAGETITLETEXT: 'Tuhinga taitara (ākiutauta) '
     IMAGETITLETEXTDESC: 'Mō ētahi atu mōhiohio mō te atahanga'
     IMAGEWIDTHPX: Whānui
-    INSERTMEDIA: 'Kōkuhu Pāpāho'
     LINK: 'Kōkuhu hono'
     LINKANCHOR: 'He punga kei tēnei whārangi'
     LINKDESCR: 'Whakaahuatanga hono'
@@ -282,7 +280,6 @@ mi:
     PAGE: Whārangi
     URL: PRO
     URLNOTANOEMBEDRESOURCE: 'Kāore e taea te huri i te PRO ''{url}'' hei rawa pāpāho.'
-    UpdateMEDIA: 'Whakahōu Pāpāho'
   Image:
     PLURALNAME: Ngā Kōnae
     SINGULARNAME: Kōnae
@@ -294,7 +291,6 @@ mi:
   LeftAndMain:
     CANT_REORGANISE: 'Kāore tō mana whakakē i ngā whārangi taumata Matua. Kāore tō huringa i tiakina.'
     DELETED: I mukua
-    DropdownBatchActionsDefault: Ngā Mahi
     HELP: Āwhina
     PERMAGAIN: 'Kua takiputaina atu koe i te CMS. Ki te pīrangi koe ki te takiuru atu anō, tāurutia tētahi ingoa kaiwhakamahi me te kupuhipa i raro.'
     PreviewButton: Arokite
diff --git a/lang/nb.yml b/lang/nb.yml
index 50651fa36..058b5a482 100644
--- a/lang/nb.yml
+++ b/lang/nb.yml
@@ -24,7 +24,6 @@ nb:
     FROMCOMPUTER: 'Velg filer fra din pc'
     FROMCOMPUTERINFO: 'Last opp fra din pc'
     TOTAL: Total
-    TOUPLOAD: 'Velg filer til opplasting ...'
     UPLOADINPROGRESS: 'Vennligst vent... opplasting pågår'
     UPLOADOR: ELLER
   BBCodeParser:
@@ -123,7 +122,6 @@ nb:
     INVALID_REQUEST: 'Ugyldig forespørsel'
   DropdownField:
     CHOOSE: (Velg)
-    CHOOSESEARCH: '(Velg eller søk)'
   EmailField:
     VALIDATION: 'Vennligst skriv inn en epostadresse'
   Enum:
@@ -271,7 +269,6 @@ nb:
     IMAGETITLETEXT: 'Titteltekst (tooltip)'
     IMAGETITLETEXTDESC: 'For tilleggsinformasjon om bilde'
     IMAGEWIDTHPX: Bredde
-    INSERTMEDIA: 'Sett inn media'
     LINK: 'Sett inn/rediger lenke i fremhevet tekst'
     LINKANCHOR: 'Lenke på denne siden'
     LINKDESCR: 'Lenkebeskrivelse'
@@ -284,7 +281,6 @@ nb:
     PAGE: Side
     URL: Nettadresse
     URLNOTANOEMBEDRESOURCE: 'Nettadressen ''{url}'' kunne ikke bli omgjort til en medieressurs.'
-    UpdateMEDIA: 'Oppdater media'
   Image:
     PLURALNAME: Filer
     SINGULARNAME: Fil
@@ -296,7 +292,6 @@ nb:
   LeftAndMain:
     CANT_REORGANISE: 'Du har ikke tilgang til å endre toppnivåsider. Endringen din ble ikke lagret.'
     DELETED: Slettet.
-    DropdownBatchActionsDefault: Handlinger
     HELP: Hjelp
     PERMAGAIN: 'Du har blitt logget ut av publiseringssystemet. Hvis du vil logge deg på igjen, skriv inn brukernavn og passord under.'
     PreviewButton: Forhåndsvisning
diff --git a/lang/nl.yml b/lang/nl.yml
index 3f16cd791..7fec01078 100644
--- a/lang/nl.yml
+++ b/lang/nl.yml
@@ -24,7 +24,6 @@ nl:
     FROMCOMPUTER: 'Selecteer bestanden op uw computer'
     FROMCOMPUTERINFO: 'Uploaden vanaf uw computer'
     TOTAL: Totaal
-    TOUPLOAD: 'Selecteer bestanden...'
     UPLOADINPROGRESS: 'Een ogenblik geduld... upload wordt uitgevoerd'
     UPLOADOR: OF
   BBCodeParser:
@@ -123,7 +122,6 @@ nl:
     INVALID_REQUEST: 'Fout bij verwerken'
   DropdownField:
     CHOOSE: (Kies)
-    CHOOSESEARCH: '(Kies of zoek)'
   EmailField:
     VALIDATION: 'Gelieve een e-mailadres in te voeren.'
   Enum:
@@ -272,7 +270,6 @@ nl:
     IMAGETITLETEXT: 'Tooltip (title)'
     IMAGETITLETEXTDESC: 'Toon extra informatie over de afbeelding'
     IMAGEWIDTHPX: Breedte
-    INSERTMEDIA: 'Media invoegen'
     LINK: 'Link invoegen'
     LINKANCHOR: 'Anker op deze pagina'
     LINKDESCR: 'Linkomschrijving'
@@ -285,7 +282,6 @@ nl:
     PAGE: Pagina
     URL: URL
     URLNOTANOEMBEDRESOURCE: '{url} kon niet worden omgezet in een media-bron.'
-    UpdateMEDIA: 'Media bijwerken'
   Image:
     PLURALNAME: Bestanden
     SINGULARNAME: Bestand
@@ -297,7 +293,6 @@ nl:
   LeftAndMain:
     CANT_REORGANISE: 'U hebt geen rechten om de pagina''s op het Top niveau aan te passen. Uw aanpassing is niet opgeslagen. '
     DELETED: Verwijderd.
-    DropdownBatchActionsDefault: Acties
     HELP: Help
     PERMAGAIN: 'U bent uitgelogd uit het CMS.  Als u weer wilt inloggen vul dan uw gebruikersnaam en wachtwoord hieronder in.'
     PreviewButton: Voorbeeld
diff --git a/lang/pl.yml b/lang/pl.yml
index 085faaaf0..f1f29b8e8 100644
--- a/lang/pl.yml
+++ b/lang/pl.yml
@@ -24,7 +24,6 @@ pl:
     FROMCOMPUTER: 'Wybierz pliki z komputera'
     FROMCOMPUTERINFO: 'Załaduj z twojego komputera'
     TOTAL: Razem
-    TOUPLOAD: 'Wybierz pliki do załadowania...'
     UPLOADINPROGRESS: 'Pliki są przesyłane... proszę czekać'
     UPLOADOR: LUB
   BBCodeParser:
@@ -123,7 +122,6 @@ pl:
     INVALID_REQUEST: 'Nieprawidłowe żądanie'
   DropdownField:
     CHOOSE: (wybierz)
-    CHOOSESEARCH: '(Wybierz lub szukaj)'
   EmailField:
     VALIDATION: 'Proszę podaj adres e-mail'
   Enum:
@@ -271,7 +269,6 @@ pl:
     IMAGETITLETEXT: 'Tytuł (wyskakujący dymek)'
     IMAGETITLETEXTDESC: 'Po dodatkowe informacje o obrazku'
     IMAGEWIDTHPX: Szerokość (px)
-    INSERTMEDIA: 'Wstaw Media'
     LINK: 'Wstaw/edytuj link z podświetlonego tekstu '
     LINKANCHOR: 'Odnośnik na tej stronie'
     LINKDESCR: 'Opis linku'
@@ -284,7 +281,6 @@ pl:
     PAGE: Strona
     URL: Adres URL
     URLNOTANOEMBEDRESOURCE: 'Adres URL ''{url}'' nie mógł zostać przekształcony w zasób medialny'
-    UpdateMEDIA: 'Zaktualizuj Media'
   Image:
     PLURALNAME: Pliki
     SINGULARNAME: Plik
@@ -296,7 +292,6 @@ pl:
   LeftAndMain:
     CANT_REORGANISE: 'Nie masz uprawnień by zmieniać strony na najwyższym poziomie. Twoje zmiany nie zostały zapisane.'
     DELETED: Usunięto.
-    DropdownBatchActionsDefault: Akcje
     HELP: Pomoc
     PERMAGAIN: 'Zostałeś wylogowany z CMSa. Jeśli chcesz zalogować się ponownie, wpisz login i hasło poniżej.'
     PreviewButton: Podgląd
diff --git a/lang/pt.yml b/lang/pt.yml
index 6ea02c6bc..c160c2637 100644
--- a/lang/pt.yml
+++ b/lang/pt.yml
@@ -142,7 +142,6 @@ pt:
   Image_iframe_ss:
     TITLE: 'Iframe de envio de Imagem'
   LeftAndMain:
-    DropdownBatchActionsDefault: Ações
     HELP: Ajuda
     PERMAGAIN: 'Saiu do CMS. Se se deseja autenticar novamente insira as suas credenciais abaixo.'
   LoginAttempt:
diff --git a/lang/ro.yml b/lang/ro.yml
index 0b0767ea6..fa94eb96b 100644
--- a/lang/ro.yml
+++ b/lang/ro.yml
@@ -10,7 +10,6 @@ ro:
     FROMCOMPUTER: 'Alegeți fișierele din calculator'
     FROMCOMPUTERINFO: 'Încărcați din calculator'
     TOTAL: Total
-    TOUPLOAD: 'Alegeți fișierele de încărcat...'
     UPLOADINPROGRESS: 'Vă rugăm să așteptați ... transfer în curs'
     UPLOADOR: SAU
   BBCodeParser:
diff --git a/lang/ru.yml b/lang/ru.yml
index 81f4181db..f77b537a5 100644
--- a/lang/ru.yml
+++ b/lang/ru.yml
@@ -24,7 +24,6 @@ ru:
     FROMCOMPUTER: 'Выберите файлы с диска вашего компьютера'
     FROMCOMPUTERINFO: 'Загрузить с диска вашего компьютера'
     TOTAL: Всего
-    TOUPLOAD: 'Выберите файлы для загрузки...'
     UPLOADINPROGRESS: 'Идет загрузка... Пожалуйста, подождите'
     UPLOADOR: ИЛИ
   BBCodeParser:
@@ -123,7 +122,6 @@ ru:
     INVALID_REQUEST: 'Неверный запрос'
   DropdownField:
     CHOOSE: (Выберите)
-    CHOOSESEARCH: '(Выбрать или найти)'
   EmailField:
     VALIDATION: 'Пожалуйста, задайте адрес email.'
   Enum:
@@ -271,7 +269,6 @@ ru:
     IMAGETITLETEXT: 'Текст (всплывающая подсказка)'
     IMAGETITLETEXTDESC: 'Для дополнительных сведений об изображении'
     IMAGEWIDTHPX: Ширина
-    INSERTMEDIA: 'Вставить медиафайл'
     LINK: 'Ссылка'
     LINKANCHOR: 'Якорь на этой странице'
     LINKDESCR: 'Описание ссылки'
@@ -284,7 +281,6 @@ ru:
     PAGE: Страница
     URL: URL
     URLNOTANOEMBEDRESOURCE: 'Не удалось преобразовать ссылку ''{url}'' в медиа-ресурс.'
-    UpdateMEDIA: 'Обновить медиафайл'
   Image:
     PLURALNAME: Файлы
     SINGULARNAME: Файл
@@ -296,7 +292,6 @@ ru:
   LeftAndMain:
     CANT_REORGANISE: 'У вас нет права редактировать страницы верхнего уровня. Изменения не были сохранены.'
     DELETED: Удалено.
-    DropdownBatchActionsDefault: Действия
     HELP: Помощь
     PERMAGAIN: 'Вы вышли из Системы Управления Сайтом. Если Вы хотите войти снова, введите внизу имя пользователя и пароль.'
     PreviewButton: Просмотр
diff --git a/lang/sk.yml b/lang/sk.yml
index 91f68461c..c0a94b7d9 100644
--- a/lang/sk.yml
+++ b/lang/sk.yml
@@ -1,5 +1,7 @@
 sk:
   AssetAdmin:
+    ALLOWEDEXTS: 'Povolené extenzie nahatia súboru'
+    HIDEALLOWEDEXTS: 'Skryť povolené extenzie'
     NEWFOLDER: Nový priečinok
     SHOWALLOWEDEXTS: 'Ukázať povolené extenzie'
   AssetTableField:
@@ -7,12 +9,14 @@ sk:
     DIM: Rozmery
     FILENAME: Názov
     FOLDER: Adresár
+    HEIGHT: Výška
     LASTEDIT: 'Posledne zmenené'
     OWNER: Vlastník
     SIZE: 'Veľkosť'
     TITLE: Titulok
     TYPE: 'Typ'
     URL: URL
+    WIDTH: Šírka
   AssetUploadField:
     ChooseFiles: 'Vyberte súbory'
     DRAGFILESHERE: 'Tiahni súbory tu'
@@ -23,8 +27,10 @@ sk:
     FILES: Súbory
     FROMCOMPUTER: 'Vyberte súbory z vášho počítača'
     FROMCOMPUTERINFO: 'Nahrat z vášho počítača'
+    INSERTURL: 'Vložiť z URL'
+    REMOVEINFO: 'Odstrániť tento soubor z tohto poľa'
     TOTAL: Súhrn
-    TOUPLOAD: 'Vyberte súbory pre nahratie...'
+    TOUPLOAD: 'Vyberte súbory pre nahratie'
     UPLOADINPROGRESS: 'Čakajte prosím… prebieha nahrávanie'
     UPLOADOR: ALEBO
   BBCodeParser:
@@ -77,6 +83,8 @@ sk:
     PASSWORDEXPIRED: '<p>Vaše heslo bolo expirované. <a target="_top" href="{link}">Prosím zvoľte nové heslo.</a></p>'
   CMSPageHistoryController_versions_ss:
     PREVIEW: 'Náhľad webu'
+  CMSPagesController_Tools_ss:
+    FILTER: Filter
   CMSProfileController:
     MENUTITLE: 'Môj profil'
   CMSSecurity:
@@ -105,6 +113,7 @@ sk:
     MAXIMUM: 'Heslá musia byť najviac {max} znakov dlhé.'
     SHOWONCLICKTITLE: 'Zmeniť heslo'
   ContentController:
+    DRAFT_SITE_ACCESS_RESTRICTION: 'Musíte sa prihlásiť so svojím CMS heslom pre zobrazenie návrhu alebo archivovaného obsahu. <a href="%s">Kliknite tu pre návrat na publikovaný web .</a>'
     NOTLOGGEDIN: 'Neprihlásený'
   CreditCardField:
     FIRST: prvý
@@ -194,7 +203,7 @@ sk:
     TEXT3: pre
   Form:
     CSRF_EXPIRED_MESSAGE: 'Čas Vášho sedenia vypršal. Prosím znova odošlite formulár.'
-    CSRF_FAILED_MESSAGE: 'Vyzerá to, že to musí být technický problem. Kliknite prosím na tlačítko späť, obnovte váš prehliadač, a skúste opäť.'
+    CSRF_FAILED_MESSAGE: 'Zdá sa, že nastal technický problém. Kliknite prosím na tlačítko späť, obnovte váš prehliadač, a skúste to opäť.'
     FIELDISREQUIRED: '{name} je požadované'
     SubmitBtnLabel: Choď
     VALIDATIONCREDITNUMBER: 'Uistite sa, že ste zadali číslo {number} kreditnej karty správne'
@@ -259,8 +268,8 @@ sk:
     has_many_Permissions: Právomoci
     many_many_Members: Členovia
   GroupImportForm:
-    Help1: 'Importovať jednu alebo viac skupín v CSV formáte (čiarkov oddelené hodnoty). Zobraziť pokročilé použitie'
-    Help2: '<div class="advanced"> <h4>Pokročilé použitie</h4> <ul> <li>Povolené stĺpce: <em>%s</em></li> <li>Existujúce skupiny sú porovnávané s ich unikátnou <em>Code</em>; hodnotou, a aktualizované s novými hodnotami z importovaného súbory&lt;/li> <li>Skupina hierarchií môže byť tvorená použitím <em>ParentCode</em>; stĺpce.&lt;/li> <li>Kódy oprávnení môžu byť priradené <em>PermissionCode</em>; stĺpcom. Existujúce oprávnenia nie sú smazáné.</li> </ul> </div>'
+    Help1: '<p>Importovať jednu alebo viac skupín v <em>CSV</em> formáte (čiarkou oddelené hodnoty). <small><a href="#" class="toggle-advanced">Zobraziť pokročilé použitie</a></small></p>'
+    Help2: '<div class=''advanced''>\n<h4>Pokročilé použitie</h4>\n<ul>\n<li>Povolené stĺpce: <em>%s</em></li>\n<li>Existujúce skupiny sú porovnávané ich unikátnou vlastnosťou <em>Code</em>, a aktualizované s novými hodnotami z\nimportovaného súboru.</li>\n<li>Hierarchia skupín môže byť tvorená použitím stĺpca <em>ParentCode</em>.</li>\n<li>Kódy oprávnení môžu byť priradené stĺpcom <em>PermissionCode</em>. Existujúce oprávnenia nie sú zmazané.</li>\n</ul>\n</div>'
     ResultCreated: 'Vytvorených {count} skupín'
     ResultDeleted: 'Zmazané %d skupiny'
     ResultUpdated: 'Aktualizované %d skupiny'
@@ -292,6 +301,8 @@ sk:
     FROMWEB: 'Z webu'
     FindInFolder: 'Vyhľadať v priečinku'
     IMAGEALT: 'Atlernatívny text (alt)'
+    IMAGEALTTEXT: 'Atlernatívny text (alt) - zobrazí sa, ak obrázok nemože byť zobrazený'
+    IMAGEALTTEXTDESC: 'Zobrazí sa na čítačke obrazovky alebo ak obrázok nemôže byť zobrazený'
     IMAGEDIMENSIONS: Rozmery
     IMAGEHEIGHTPX: Výška
     IMAGETITLE: 'Text titulky (tooltip) - pre doplňujúce informácie o obrázku'
@@ -311,6 +322,7 @@ sk:
     PAGE: Stránku
     SUBJECT: 'Predmet emailu'
     URL: URL
+    URLDESCRIPTION: 'Vložiť videá a obrázky z webu do Vašej stránky, jednoduchým zadaním URL súboru. Uistite sa, že máte príslušné práva pred zdielaním médií z webu.<br /><br />Prosím, uvedomte si, že súbory nie sú pridané do úložiska CMS, ale súbor je vstavaný z jeho pôvodného umiestenia, ak z nejakých dôvodov súbor nie je dostupný v jeho pôvodnom umiestení, nebude zobraziteľný na tejo stránke.'
     URLNOTANOEMBEDRESOURCE: 'URL ''{url}'' nemôže byť vložené do zdroja médií.'
     UpdateMEDIA: 'Aktualizovať média'
   Image:
@@ -324,11 +336,13 @@ sk:
   LeftAndMain:
     CANT_REORGANISE: 'Nemáte oprávnenie meniť stránky najvyššej úrovne. Vaša zmena nebola uložená.'
     DELETED: Zmazané.
-    DropdownBatchActionsDefault: Akcie
+    DropdownBatchActionsDefault: 'Vybrať akciu...'
     HELP: Pomoc
+    PAGETYPE: 'Typ stránky'
     PERMAGAIN: 'Boli ste odhlásený'
-    PERMALREADY: 'Je mi ľúto, ale nemáte prístup k tejto časti CMS. Ak sa chcete prihlásiť ako niekto iný, urobte tak nižšie'
+    PERMALREADY: 'Je nám ľúto, ale k tejto časti CMS nemáte prístup . Ak sa chcete prihlásiť ako niekto iný, urobte tak nižšie.'
     PERMDEFAULT: 'Musíte byť prihlásený/á k prístupu do oblasti administrácie, zadajte vaše prihlasovacie údaje dole, prosím.'
+    PLEASESAVE: 'Uložte stránku, prosím. Táto stránka nemôže byť aktualizovaná, pretože ešte nebola uložená.'
     PreviewButton: Náhľad
     REORGANISATIONSUCCESSFUL: 'Strom webu bol reorganizovaný úspešne.'
     SAVEDUP: Uložené.
@@ -365,8 +379,8 @@ sk:
     ERRORLOCKEDOUT2: 'Váš účet bol dočasne zablokovaný, kvôli množstvu neúspešných pokusov o prihlásenie. Prosím skúste to znova za {count} minút.'
     ERRORNEWPASSWORD: 'Zadali ste rozdielne nové heslo, skúste to znovu'
     ERRORPASSWORDNOTMATCH: 'Vaše súčasné heslo nie je správne, prosím skúste to znovu'
-    ERRORWRONGCRED: 'Poskytnuté detaily vyzerajúí byť nesprávne. Prosím skúste opäť.'
-    FIRSTNAME: 'Krstné meno'
+    ERRORWRONGCRED: 'Poskytnuté detaily vyzerajú byť nesprávne. Prosím skúste opäť.'
+    FIRSTNAME: 'Meno'
     INTERFACELANG: 'Jazyk rozhrania'
     INVALIDNEWPASSWORD: 'Nemohli sme pripustiť, že heslo: {password}'
     LOGGEDINAS: 'Ste prihlásený/á ako {name}.'
@@ -382,11 +396,11 @@ sk:
     SURNAME: Priezvisko
     TIMEFORMAT: 'Formát času'
     VALIDATIONMEMBEREXISTS: 'Člen s takýmto e-mailom už existuje'
-    ValidationIdentifierFailed: 'Nemôžte prepísať existujúceho člena #{id} s identickým identifikátorm ({name} = {value}))'
+    ValidationIdentifierFailed: 'Nemôžte prepísať existujúceho člena #{id} s identickým identifikátorm ({name} = {value})'
     WELCOMEBACK: 'Vitajte späť, {firstname}'
     YOUROLDPASSWORD: 'Vaše staré heslo'
     belongs_many_many_Groups: Skupiny
-    db_LastVisited: 'Dátum poslednej navštevy'
+    db_LastVisited: 'Dátum poslednej návštevy'
     db_Locale: 'Lokalizácia rozhrania'
     db_LockedOutUntil: 'Zamknutý až do'
     db_NumVisit: 'Počet návštev'
@@ -415,8 +429,8 @@ sk:
     TWODIGITYEAR: 'Dvojčíslie roka'
     Toggle: 'Ukázať nápovedu formátovania'
   MemberImportForm:
-    Help1: 'Importovať členov v <em>CSV formáte</em> (čiarkov oddelené hodnoty). Zobraziť pokročile použitie'
-    Help2: '<div class="advanced"> <h4>Pokročilé použitie</h4> <ul> <li>Povolené stĺpce: <em>%s</em></li> <li>Existujúci užívatelia sú porovnávaní ich unikátnou vlastnosťou <em>Code</em>, a aktualizovaní s novými hodnotami z importovaného súboru.</li> <li>Skupiny môžu byťt priradené stĺpcom <em>Groups</em>. Skupiny sú identifikované ich vlastnosťou <em>Code</em>, viacero skupín môže byť oddelené čiarkou. Existujúce členstvá skupiny nie sú smazané.</li> </ul> </div>'
+    Help1: '<p>Importovať členov v <em>CSV formáte</em> (čiarkou oddelené hodnoty). <small><a href="#" class="toggle-advanced">Zobraziť pokročile použitie</a></small></p>'
+    Help2: '<div class="advanced">\n<h4>Pokročilé použitie</h4>\n<ul>\n<li>Povolené stĺpce: <em>%s</em></li>\n<li>Existujúci užívatelia sú porovnávaní ich unikátnou vlastnosťou <em>Code</em>, a aktualizovaní s novými hodnotami z\nimportovaného súboru.</li>\n<li>Skupiny môžu byť priradené stĺpcom <em>Groups</em>. Skupiny sú identifikované ich vlastnosťou <em>Code</em>,\nviacero skupín môže byť oddelené čiarkou. Existujúce členstvá skupiny nie sú zmazané.</li>\n</ul>\n</div>'
     ResultCreated: 'Vytvorených {count} členov'
     ResultDeleted: 'Zmazaných %d členov'
     ResultNone: 'Žiadne zmeny'
@@ -454,7 +468,7 @@ sk:
   NullableField:
     IsNullLabel: 'Je Null'
   NumericField:
-    VALIDATION: '''{value}'' nie je číslo, iba čísla môžu byť akceptované pre toto pole'
+    VALIDATION: 'Zadaná hodnota ''{value}'' nie je číslo. Iba čísla môžu byť akceptované pre toto pole!'
   Pagination:
     Page: Stránka
     View: Zobraziť
@@ -520,10 +534,10 @@ sk:
     ROLES: Úlohy
     ROLESDESCRIPTION: 'Úlohy sú logické zoskupenia právomocí a môžu byť pridelené k skupinám.<br />Sú zdedené z nadradených skupín, ak je to požadované.'
     TABROLES: Úlohy
-    Users: Bezpečnosť
+    Users: Používatelia
   SecurityAdmin_MemberImportForm:
     BtnImport: 'Importovať'
-    FileFieldLabel: 'CSV súbor <small>(Povoléné koncovki súborov: *.csv)</small>'
+    FileFieldLabel: 'CSV súbor <small>(Povolené koncovky súborov: *.csv)</small>'
   SilverStripeNavigator:
     Auto: Auto
     ChangeViewMode: 'Zmeniť nód zobrazenia'
diff --git a/lang/sl.yml b/lang/sl.yml
index 789e29b82..752595c40 100644
--- a/lang/sl.yml
+++ b/lang/sl.yml
@@ -23,7 +23,6 @@ sl:
     FROMCOMPUTER: 'Izberite datoteke z vašega računalnika'
     FROMCOMPUTERINFO: 'Prenesite z vašega računalnika'
     TOTAL: Vse
-    TOUPLOAD: 'Izberite datoteke za prenos'
     UPLOADINPROGRESS: 'Prosimo, počakajte ... prenos poteka.'
     UPLOADOR: ALI
   BBCodeParser:
@@ -120,7 +119,6 @@ sl:
     INVALID_REQUEST: 'Napačna zahteva'
   DropdownField:
     CHOOSE: (Izberi)
-    CHOOSESEARCH: '(Izberi ali išči)'
   EmailField:
     VALIDATION: 'Prosim, vpišite e-naslov.'
   Enum:
@@ -260,7 +258,6 @@ sl:
     IMAGETITLETEXT: 'Naslov (tooltip)'
     IMAGETITLETEXTDESC: 'Za dodatne informacije o sliki'
     IMAGEWIDTHPX: Širina
-    INSERTMEDIA: 'Vstavi multimedijsko datoteko'
     LINK: 'Povezava'
     LINKANCHOR: 'Sidro na tej strani'
     LINKDESCR: 'Opis povezave'
@@ -272,7 +269,6 @@ sl:
     LINKTO: 'Poveži na'
     PAGE: Stran
     URL: URL
-    UpdateMEDIA: 'Posodobi multimedijsko datoteko'
   Image:
     PLURALNAME: Datoteke
     SINGULARNAME: Datoteka
@@ -284,7 +280,6 @@ sl:
   LeftAndMain:
     CANT_REORGANISE: 'Nimate dovoljenja za menjavo strani v zgornjem nivoju. Sprememba ni shranjena.'
     DELETED: Izbrisano.
-    DropdownBatchActionsDefault: Dejanja
     HELP: Pomoč
     PERMAGAIN: 'Odjavili ste se iz CMS-vmesnika. Če se želite ponovno prijaviti, vpišite uporabniško ime in geslo.'
     PreviewButton: Predogled
diff --git a/lang/sr.yml b/lang/sr.yml
index 77e339da4..0ebb641bc 100644
--- a/lang/sr.yml
+++ b/lang/sr.yml
@@ -24,7 +24,6 @@ sr:
     FROMCOMPUTER: 'Изаберите датотеке са Вашег рачунара'
     FROMCOMPUTERINFO: 'Постави са Вашег рачунара'
     TOTAL: Укупно
-    TOUPLOAD: 'Изаберите датотеке за постављање...'
     UPLOADINPROGRESS: 'Молимо Вас да сачекате... Постављање је у току'
     UPLOADOR: ИЛИ
   BBCodeParser:
@@ -123,7 +122,6 @@ sr:
     INVALID_REQUEST: 'Погрешан захтев'
   DropdownField:
     CHOOSE: (изаберите)
-    CHOOSESEARCH: '(Изабери или Пронађи)'
   EmailField:
     VALIDATION: 'Унесите адресу е-поште'
   Enum:
@@ -271,7 +269,6 @@ sr:
     IMAGETITLETEXT: 'Текст наслова (tooltip)'
     IMAGETITLETEXTDESC: 'За додатне информације о слици'
     IMAGEWIDTHPX: Ширина
-    INSERTMEDIA: 'Уметни медијски ресурс'
     LINK: 'Линк'
     LINKANCHOR: 'Сидро на овој страни'
     LINKDESCR: 'Опис линка'
@@ -284,7 +281,6 @@ sr:
     PAGE: Страница
     URL: URL
     URLNOTANOEMBEDRESOURCE: 'URL ''{url}'' не може бити претворен у медијски ресурс.'
-    UpdateMEDIA: 'Ажурирај медијски ресурс'
   Image:
     PLURALNAME: Датотеке
     SINGULARNAME: Датотека
@@ -296,7 +292,6 @@ sr:
   LeftAndMain:
     CANT_REORGANISE: 'Немате право да мењате странице вршног нивоа. Ваше измене нису сачуване.'
     DELETED: Избрисано
-    DropdownBatchActionsDefault: Акције
     HELP: Помоћ
     PERMAGAIN: 'Одјављени сте са CMS-а. Уколико желите да се поново пријавите, унесите корисничко име и лозинку.'
     PreviewButton: Претходни преглед
diff --git a/lang/sr@latin.yml b/lang/sr@latin.yml
index 6ae4e5b26..24c3f5487 100644
--- a/lang/sr@latin.yml
+++ b/lang/sr@latin.yml
@@ -24,7 +24,6 @@ sr@latin:
     FROMCOMPUTER: 'Izaberite datoteke sa Vašeg računara'
     FROMCOMPUTERINFO: 'Postavi sa Vašeg računara'
     TOTAL: Ukupno
-    TOUPLOAD: 'Izaberite datoteke za postavljanje...'
     UPLOADINPROGRESS: 'Molimo Vas da sačekate... Postavljanje je u toku'
     UPLOADOR: ILI
   BBCodeParser:
@@ -123,7 +122,6 @@ sr@latin:
     INVALID_REQUEST: 'Pogrešan zahtev'
   DropdownField:
     CHOOSE: (izaberite)
-    CHOOSESEARCH: '(Izaberi ili Pronađi)'
   EmailField:
     VALIDATION: 'Unesite adresu e-pošte'
   Enum:
@@ -271,7 +269,6 @@ sr@latin:
     IMAGETITLETEXT: 'Tekst naslova (tooltip)'
     IMAGETITLETEXTDESC: 'Za dodatne informacije o slici'
     IMAGEWIDTHPX: Širina
-    INSERTMEDIA: 'Umetni medijski resurs'
     LINK: 'Link'
     LINKANCHOR: 'Sidro na ovoj strani'
     LINKDESCR: 'Opis linka'
@@ -284,7 +281,6 @@ sr@latin:
     PAGE: Stranica
     URL: URL
     URLNOTANOEMBEDRESOURCE: 'URL ''{url}'' ne može biti pretvoren u medijski resurs.'
-    UpdateMEDIA: 'Ažuriraj medijski resurs'
   Image:
     PLURALNAME: Datoteke
     SINGULARNAME: Datoteka
@@ -296,7 +292,6 @@ sr@latin:
   LeftAndMain:
     CANT_REORGANISE: 'Nemate pravo da menjate stranice vršnog nivoa. Vaše izmene nisu sačuvane.'
     DELETED: Izbrisano
-    DropdownBatchActionsDefault: Akcije
     HELP: Pomoć
     PERMAGAIN: 'Odjavljeni ste sa CMS-a. Ukoliko želite da se ponovo prijavite, unesite korisničko ime i lozinku.'
     PreviewButton: Prethodni pregled
diff --git a/lang/sr_RS.yml b/lang/sr_RS.yml
index 60f2ff25d..71d35e882 100644
--- a/lang/sr_RS.yml
+++ b/lang/sr_RS.yml
@@ -24,7 +24,6 @@ sr_RS:
     FROMCOMPUTER: 'Изаберите датотеке са Вашег рачунара'
     FROMCOMPUTERINFO: 'Постави са Вашег рачунара'
     TOTAL: Укупно
-    TOUPLOAD: 'Изаберите датотеке за постављање...'
     UPLOADINPROGRESS: 'Молимо Вас да сачекате... Постављање је у току'
     UPLOADOR: ИЛИ
   BBCodeParser:
@@ -123,7 +122,6 @@ sr_RS:
     INVALID_REQUEST: 'Погрешан захтев'
   DropdownField:
     CHOOSE: (изаберите)
-    CHOOSESEARCH: '(Изабери или Пронађи)'
   EmailField:
     VALIDATION: 'Унесите адресу е-поште'
   Enum:
@@ -271,7 +269,6 @@ sr_RS:
     IMAGETITLETEXT: 'Текст наслова (tooltip)'
     IMAGETITLETEXTDESC: 'За додатне информације о слици'
     IMAGEWIDTHPX: Ширина
-    INSERTMEDIA: 'Уметни медијски ресурс'
     LINK: 'Линк'
     LINKANCHOR: 'Сидро на овој страни'
     LINKDESCR: 'Опис линка'
@@ -284,7 +281,6 @@ sr_RS:
     PAGE: Страница
     URL: URL
     URLNOTANOEMBEDRESOURCE: 'URL ''{url}'' не може бити претворен у медијски ресурс.'
-    UpdateMEDIA: 'Ажурирај медијски ресурс'
   Image:
     PLURALNAME: Датотеке
     SINGULARNAME: Датотека
@@ -296,7 +292,6 @@ sr_RS:
   LeftAndMain:
     CANT_REORGANISE: 'Немате право да мењате странице вршног нивоа. Ваше измене нису сачуване.'
     DELETED: Избрисано
-    DropdownBatchActionsDefault: Акције
     HELP: Помоћ
     PERMAGAIN: 'Одјављени сте са CMS-а. Уколико желите да се поново пријавите, унесите корисничко име и лозинку.'
     PreviewButton: Претходни преглед
diff --git a/lang/sr_RS@latin.yml b/lang/sr_RS@latin.yml
index a7365d321..960261002 100644
--- a/lang/sr_RS@latin.yml
+++ b/lang/sr_RS@latin.yml
@@ -24,7 +24,6 @@ sr_RS@latin:
     FROMCOMPUTER: 'Izaberite datoteke sa Vašeg računara'
     FROMCOMPUTERINFO: 'Postavi sa Vašeg računara'
     TOTAL: Ukupno
-    TOUPLOAD: 'Izaberite datoteke za postavljanje...'
     UPLOADINPROGRESS: 'Molimo Vas da sačekate... Postavljanje je u toku'
     UPLOADOR: ILI
   BBCodeParser:
@@ -123,7 +122,6 @@ sr_RS@latin:
     INVALID_REQUEST: 'Pogrešan zahtev'
   DropdownField:
     CHOOSE: (izaberite)
-    CHOOSESEARCH: '(Izaberi ili Pronađi)'
   EmailField:
     VALIDATION: 'Unesite adresu e-pošte'
   Enum:
@@ -271,7 +269,6 @@ sr_RS@latin:
     IMAGETITLETEXT: 'Tekst naslova (tooltip)'
     IMAGETITLETEXTDESC: 'Za dodatne informacije o slici'
     IMAGEWIDTHPX: Širina
-    INSERTMEDIA: 'Umetni medijski resurs'
     LINK: 'Link'
     LINKANCHOR: 'Sidro na ovoj strani'
     LINKDESCR: 'Opis linka'
@@ -284,7 +281,6 @@ sr_RS@latin:
     PAGE: Stranica
     URL: URL
     URLNOTANOEMBEDRESOURCE: 'URL ''{url}'' ne može biti pretvoren u medijski resurs.'
-    UpdateMEDIA: 'Ažuriraj medijski resurs'
   Image:
     PLURALNAME: Datoteke
     SINGULARNAME: Datoteka
@@ -296,7 +292,6 @@ sr_RS@latin:
   LeftAndMain:
     CANT_REORGANISE: 'Nemate pravo da menjate stranice vršnog nivoa. Vaše izmene nisu sačuvane.'
     DELETED: Izbrisano
-    DropdownBatchActionsDefault: Akcije
     HELP: Pomoć
     PERMAGAIN: 'Odjavljeni ste sa CMS-a. Ukoliko želite da se ponovo prijavite, unesite korisničko ime i lozinku.'
     PreviewButton: Prethodni pregled
diff --git a/lang/sv.yml b/lang/sv.yml
index c3b4a8f83..58a7564db 100644
--- a/lang/sv.yml
+++ b/lang/sv.yml
@@ -24,7 +24,6 @@ sv:
     FROMCOMPUTER: 'Välj filer från din dator'
     FROMCOMPUTERINFO: 'Ladda upp från din dator'
     TOTAL: Totalt
-    TOUPLOAD: 'Välj fil att ladda upp...'
     UPLOADINPROGRESS: 'Var god dröj... uppladdning pågår'
     UPLOADOR: ELLER
   BBCodeParser:
@@ -77,11 +76,14 @@ sv:
     PASSWORDEXPIRED: '<p>Ditt lösenard har gått ut. <a target="_top" href="{link}">Vänligen ange ett nytt.</a></p>'
   CMSPageHistoryController_versions_ss:
     PREVIEW: 'Förhandsgranska sida'
+  CMSPagesController_Tools_ss:
+    FILTER: Filtrera
   CMSProfileController:
     MENUTITLE: 'Min Profil'
   CMSSecurity:
     INVALIDUSER: '<p>Ogiltig användare. <a target="_top" href="{link}">Vänligen ange dina inloggnings-uppgifter igen</a> för att fortsätta.</p>'
     LoginMessage: '<p>Om du har osparade ändringar kan du fortsätta där du slutade genom att logga in igen nedan.</p>'
+    SUCCESS: Framgång
     SUCCESSCONTENT: '<p>Inloggningen lyckades. <a target="_top" href="{link}">Klicka här</a> om du inte skickas vidare automatiskt.</p>'
     TimedOutTitleAnonymous: 'Din session har upphört.'
     TimedOutTitleMember: 'Hej {name}!<br />Din session har upphört.'
@@ -104,6 +106,7 @@ sv:
     MAXIMUM: 'Lösenord får som längst vara {max} tecken långa.'
     SHOWONCLICKTITLE: 'Ändra lösenord'
   ContentController:
+    DRAFT_SITE_ACCESS_RESTRICTION: 'Du måste logga med ditt CMS-lösenord för att kunna se utkast och arkiverat material. <a href="%s">Klicka här för att gå tillbaks till den publicerade sajten.</a>'
     NOTLOGGEDIN: 'Inte inloggad'
   CreditCardField:
     FIRST: första
@@ -143,7 +146,6 @@ sv:
     INVALID_REQUEST: 'Ogiltig förfrågan'
   DropdownField:
     CHOOSE: (Välj)
-    CHOOSESEARCH: '(Välj eller sök)'
     SOURCE_VALIDATION: 'Vänligen välj att värde i listan. {value} är inget giltigt val'
   EmailField:
     VALIDATION: 'Var snäll och ange en epostadress'
@@ -259,6 +261,7 @@ sv:
     many_many_Members: Medlemmar
   GroupImportForm:
     Help1: '<p>Importera en eller flera grupper i <em>CSV</em>- format (komma-separerade värden). <small><a href="#" class ="toggle-advanced">Visa avancerade val</a></small></p>'
+    Help2: '<div class="advanced"><h4>Avancerat</h4><ul><li>Tillåtna kolumner: <em>%s</em></li><li>Existerade användare matchas av deras unika <em>kod</em>-attribut och uppdateras med alla nya värden från den importerade filen</li><li>Gruppnivåer kan skapas genom att använda <em>huvudkod</em> kolumnen.</il><il>Behörighetskoder kan tilldelas av <em>BehörighetsKod</em> kolomnen. Befintliga behörighetskoder raderas inte.</li></ul></div>'
     ResultCreated: 'Skapade {count} grupper'
     ResultDeleted: 'Raderade %d grupper'
     ResultUpdated: 'Uppdaterade %d grupper'
@@ -290,13 +293,14 @@ sv:
     FROMWEB: 'Från webben'
     FindInFolder: 'Hitta i mapp'
     IMAGEALT: 'Alternativ text (alt)'
+    IMAGEALTTEXT: 'Alternativ text (alt) - visas om bilden inte kan visas'
+    IMAGEALTTEXTDESC: 'Visas för skärmläsare eller om bilden inte kan visas'
     IMAGEDIMENSIONS: Dimensioner
     IMAGEHEIGHTPX: Höjd
     IMAGETITLE: 'Titel text (tooltip) - för ytterligare information om bilden'
     IMAGETITLETEXT: 'Titel text (tooltip)'
     IMAGETITLETEXTDESC: 'För ytterligare information om bilden'
     IMAGEWIDTHPX: Bredd
-    INSERTMEDIA: 'Infoga media'
     LINK: 'Infoga länk'
     LINKANCHOR: 'Ankare på den här sidan'
     LINKDESCR: 'Länk-beskrivning'
@@ -310,7 +314,6 @@ sv:
     SUBJECT: 'Ämne'
     URL: URL
     URLNOTANOEMBEDRESOURCE: 'URLen ''{url}'' gick inte  att omvandla till ett media.'
-    UpdateMEDIA: 'Uppdatera media'
   Image:
     PLURALNAME: Filer
     SINGULARNAME: Fil
@@ -322,9 +325,12 @@ sv:
   LeftAndMain:
     CANT_REORGANISE: 'Du har inte tillstånd att ändra sidor på toppnivå. Dina ändringar har inte sparats.'
     DELETED: Raderad
-    DropdownBatchActionsDefault: Åtgärder
     HELP: Hjälp
+    PAGETYPE: 'Sidtyp'
     PERMAGAIN: 'Du har blivit utloggad. Om du vill logga in igen anger du dina uppgifter nedan.'
+    PERMALREADY: 'Tyvärr så har du inte åtkomst till den delen av CMSet. Om du vill logga in med en annan användare kan du göra det nedan'
+    PERMDEFAULT: 'Du måste vara inloggad för att få åtkomst till administrativa delarna; var vänlig att logga in med dina användaruppgifter nedan.'
+    PLEASESAVE: 'Var god spara sidan. Den kan inte uppdateras för att den har inte sparats ännu.'
     PreviewButton: Förhandsgranska
     REORGANISATIONSUCCESSFUL: 'Omorganisationen av sidträdet luyckades.'
     SAVEDUP: Sparad.
@@ -335,6 +341,8 @@ sv:
   LeftAndMain_Menu_ss:
     Hello: Hej
     LOGOUT: 'Logga ut'
+  ListboxField:
+    SOURCE_VALIDATION: 'Vänligen välj att värde i listan. %s är inget giltigt val'
   LoginAttempt:
     Email: 'E-postadress'
     IP: 'IP-adress'
@@ -410,6 +418,7 @@ sv:
     Toggle: 'Visa fomateringshjälp'
   MemberImportForm:
     Help1: '<p>Importera användare i <em>CSV-format</em> (kommaseparerade värden). <small><a href="#" class="toggle-advanced">Visa avancerat</a></small></p>'
+    Help2: '<div class="advanced"><h4>Avancerat</h4><ul><li>Tillåtna kolumner: <em>%s</em></li><li>Existerade användare matchas av deras unika <em>kod</em>-attribut och uppdateras med alla nya värden från den importerade filen</li><li>Grupper kan anges i <em>Grupp</em>-kolumnen. Grupper identiferas av deras <em>Kod</em>-attribut. Anges flera grupper separeras dessa med kommatecken. Existerande användarrättigheter till grupperna tas inte bort.</li></ul></div>'
     ResultCreated: 'Skapade {count} medlemmar'
     ResultDeleted: 'Raderade %d medlemmar'
     ResultNone: 'Inga ändringar'
@@ -473,6 +482,7 @@ sv:
     SINGULARNAME: Roll
     Title: Rollnamn
   PermissionRoleCode:
+    PLURALNAME: 'Kod för rollrättigheter'
     PermsError: 'Koden "%s" kan inte ges privilegierad tillgång (adminrättigheter krävs)'
     SINGULARNAME: 'Kodför rollrättigheter'
   Permissions:
@@ -538,6 +548,8 @@ sv:
     Print: Skriv ut
   TableListField_PageControls_ss:
     OF: av
+  TextField:
+    VALIDATEMAXLENGTH: 'Värdet för {name} får inte överstiga {MaxLength} tecken'
   TimeField:
     VALIDATEFORMAT: 'Var god att ange tid i ett giltigt format ({format})'
   ToggleField:
diff --git a/lang/th.yml b/lang/th.yml
index c8c39c45f..167b51136 100644
--- a/lang/th.yml
+++ b/lang/th.yml
@@ -22,7 +22,6 @@ th:
     FROMCOMPUTER: 'เลือกไฟล์จากคอมพิวเตอร์ของคุณ'
     FROMCOMPUTERINFO: 'อัพโหลดจากเครื่องคอมพิวเตอร์ของคุณ'
     TOTAL: รวมทั้งหมด
-    TOUPLOAD: 'เลือกไฟล์ที่ต้องการอัพโหลด...'
     UPLOADOR: หรือ
   BBCodeParser:
     BOLD: 'ข้อความตัวหนา'
@@ -183,7 +182,6 @@ th:
     IMAGEHEIGHTPX: ส่วนสูง
     IMAGETITLETEXT: 'ข้อความหัวเรื่อง (tooltip)'
     IMAGEWIDTHPX: ความกว้าง
-    INSERTMEDIA: 'แทรกมีเดีย'
     LINK: 'ลิงก์'
     LINKDESCR: 'คำอธิบายลิงค์'
     LINKEMAIL: 'ที่อยู่อีเมล'
@@ -193,7 +191,6 @@ th:
     LINKOPENNEWWIN: 'เปิดลิงค์ในหน้าต่างใหม่'
     LINKTO: 'ลิงค์ไปที่'
     PAGE: หน้าเว็บ
-    UpdateMEDIA: 'อัพเดทมีเดีย'
   Image:
     PLURALNAME: ไฟล์
     SINGULARNAME: ไฟล์
@@ -203,7 +200,6 @@ th:
   Image_iframe_ss:
     TITLE: 'หน้าต่าง iframe สำหรับอัพโหลดรูปภาพ'
   LeftAndMain:
-    DropdownBatchActionsDefault: การกระทำ
     HELP: ช่วยเหลือ
     PERMAGAIN: 'คุณได้ออกจากระบบของ CMS แล้ว หากคุณต้องการเข้าสู่ระบบอีกครั้ง กรุณากรอกชื่อผู้ใช้งานและรหัสผ่านของคุณด้านล่าง'
   LeftAndMain_Menu_ss:
diff --git a/lang/uk.yml b/lang/uk.yml
index 1183fb75d..f37040682 100644
--- a/lang/uk.yml
+++ b/lang/uk.yml
@@ -21,7 +21,6 @@ uk:
     FROMCOMPUTER: 'Виберіть файли з вашого комп’ютера'
     FROMCOMPUTERINFO: 'Завантажте з вашого комп’ютера'
     TOTAL: Підсумок
-    TOUPLOAD: 'Виберіть файли для завантаження...'
     UPLOADINPROGRESS: 'Зачекайте, будь ласка, виконується завантаження'
     UPLOADOR: АБО
   BBCodeParser:
diff --git a/lang/zh.yml b/lang/zh.yml
index 7ef8121f2..694edf6e7 100644
--- a/lang/zh.yml
+++ b/lang/zh.yml
@@ -24,7 +24,6 @@ zh:
     FROMCOMPUTER: '从您的电脑选择文件'
     FROMCOMPUTERINFO: '从您的电脑上传'
     TOTAL: 合计
-    TOUPLOAD: '选择要上传的文件……'
     UPLOADINPROGRESS: '请稍候……上传正在进行中'
     UPLOADOR: 或
   BBCodeParser:
@@ -144,7 +143,6 @@ zh:
     INVALID_REQUEST: '无效请求'
   DropdownField:
     CHOOSE: （选择）
-    CHOOSESEARCH: '（选择或搜索）'
     SOURCE_VALIDATION: '请选择列表内提供的选项。{value}不是一个有效的选项'
   EmailField:
     VALIDATION: '请输入一个电子邮件地址'
@@ -296,7 +294,6 @@ zh:
     IMAGETITLETEXT: '标题文字（工具提示）'
     IMAGETITLETEXTDESC: '要获取关于该图像的更多信息'
     IMAGEWIDTHPX: 宽度
-    INSERTMEDIA: '插入媒体'
     LINK: '插入链接'
     LINKANCHOR: '固定于此页面'
     LINKDESCR: '链接描述'
@@ -310,7 +307,6 @@ zh:
     SUBJECT: '电子邮件标题'
     URL: 网址
     URLNOTANOEMBEDRESOURCE: '''{url}'' 该网址无法转换成媒体来源。'
-    UpdateMEDIA: '更新媒体'
   Image:
     PLURALNAME: 文件
     SINGULARNAME: 文件
@@ -322,7 +318,6 @@ zh:
   LeftAndMain:
     CANT_REORGANISE: '您没有权限更改顶层页面。您的更改没有保存。'
     DELETED: 已删除。
-    DropdownBatchActionsDefault: 动作
     HELP: 帮助
     PERMAGAIN: '您已经退出 CMS。如果您想再次登录，请在下面输入用户名和密码。'
     PERMALREADY: '抱歉，您不能访问这一部分的后台管理。如果您想以不同的身份登录，请在下面进行操作。'

From f32302522cbc4afde237b281fed4b72aacf27ba4 Mon Sep 17 00:00:00 2001
From: Damian Mooyman <damian@silverstripe.com>
Date: Fri, 19 Feb 2016 10:30:25 +1300
Subject: [PATCH 04/30] Added 3.1.17-rc1 changelog

---
 docs/en/04_Changelogs/rc/3.1.17-rc1.md | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 docs/en/04_Changelogs/rc/3.1.17-rc1.md

diff --git a/docs/en/04_Changelogs/rc/3.1.17-rc1.md b/docs/en/04_Changelogs/rc/3.1.17-rc1.md
new file mode 100644
index 000000000..d64986591
--- /dev/null
+++ b/docs/en/04_Changelogs/rc/3.1.17-rc1.md
@@ -0,0 +1,13 @@
+# 3.1.17-rc1
+
+<!--- Changes below this line will be automatically regenerated -->
+
+## Change Log
+
+### Bugfixes
+
+ * 2016-02-16 [644c807](https://github.com/silverstripe/silverstripe-cms/commit/644c8070311e82d35c39c6e1f0d37cc8aba53665) Use correct formaction for doRollback exemption #1378 (Andrew Aitken-Fincham)
+ * 2016-01-05 [00544ff](https://github.com/silverstripe/silverstripe-framework/commit/00544ff100048afdb7ccb1905304dddf8ab3205a) session_regenerate_id uses config system (Daniel Hensby)
+ * 2016-01-05 [4335d8e](https://github.com/silverstripe/silverstripe-framework/commit/4335d8ed221a2b402299b32e31f97fc2956ec161) Members with no ID inherit logged in user permission (Daniel Hensby)
+ * 2015-11-18 [e9b833f](https://github.com/silverstripe/silverstripe-framework/commit/e9b833f5f0f989af8d611f8cfe71f0b0e2cb0159) ConfirmedPassword field correctly reports mismatching passwords (Christopher Darling)
+ * 2015-11-05 [f577ecb](https://github.com/silverstripe/silverstripe-framework/commit/f577ecb81149d0d09dc846204f17b2153a244b5a) prevent use cache on browser back button (Igor Nadj)

From 5d2fc0d7cac4ce686f7ae05c1a7b1ad8c01711a8 Mon Sep 17 00:00:00 2001
From: Damian Mooyman <damian@silverstripe.com>
Date: Wed, 17 Feb 2016 17:30:51 +1300
Subject: [PATCH 05/30] [ss-2015-028] Block unauthenticated access to
 dev/build/defaults

---
 dev/DevelopmentAdmin.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/dev/DevelopmentAdmin.php b/dev/DevelopmentAdmin.php
index d68d941f7..a7f4efcc2 100644
--- a/dev/DevelopmentAdmin.php
+++ b/dev/DevelopmentAdmin.php
@@ -34,8 +34,9 @@ class DevelopmentAdmin extends Controller {
 		parent::init();
 		
 		// Special case for dev/build: Defer permission checks to DatabaseAdmin->init() (see #4957)
-		$requestedDevBuild = (stripos($this->request->getURL(), 'dev/build') === 0);
-		
+		$requestedDevBuild = (stripos($this->getRequest()->getURL(), 'dev/build') === 0)
+			&& (stripos($this->getRequest()->getURL(), 'dev/build/defaults') === false);
+
 		// We allow access to this controller regardless of live-status or ADMIN permission only
 		// if on CLI.  Access to this controller is always allowed in "dev-mode", or of the user is ADMIN.
 		$canAccess = (

From 013524af5069bb0cf909853f04418d9bef56d18c Mon Sep 17 00:00:00 2001
From: Damian Mooyman <damian@silverstripe.com>
Date: Wed, 17 Feb 2016 15:09:21 +1300
Subject: [PATCH 06/30] [ss-2016-002] Ensure Gridfield actions respect CSRF

---
 forms/gridfield/GridField.php                 |  12 ++
 .../gridfield/GridFieldDeleteActionTest.php   | 128 ++++++++++++++----
 2 files changed, 111 insertions(+), 29 deletions(-)

diff --git a/forms/gridfield/GridField.php b/forms/gridfield/GridField.php
index ae36e19f8..794222a33 100644
--- a/forms/gridfield/GridField.php
+++ b/forms/gridfield/GridField.php
@@ -832,6 +832,18 @@ class GridField extends FormField {
 	 */
 	public function gridFieldAlterAction($data, $form, SS_HTTPRequest $request) {
 		$data = $request->requestVars();
+
+		// Protection against CSRF attacks
+		$token = $this
+			->getForm()
+			->getSecurityToken();
+		if(!$token->checkRequest($request)) {
+			$this->httpError(400, _t("Form.CSRF_FAILED_MESSAGE",
+				"There seems to have been a technical problem. Please click the back button, ".
+				"refresh your browser, and try again."
+			));
+		}
+
 		$name = $this->getName();
 
 		$fieldData = null;
diff --git a/tests/forms/gridfield/GridFieldDeleteActionTest.php b/tests/forms/gridfield/GridFieldDeleteActionTest.php
index 3c69e19df..2f4d2d909 100644
--- a/tests/forms/gridfield/GridFieldDeleteActionTest.php
+++ b/tests/forms/gridfield/GridFieldDeleteActionTest.php
@@ -4,19 +4,19 @@ class GridFieldDeleteActionTest extends SapphireTest {
 
 	/** @var ArrayList */
 	protected $list;
-	
+
 	/** @var GridField */
 	protected $gridField;
-	
+
 	/** @var Form */
 	protected $form;
-	
+
 	/** @var string */
 	protected static $fixture_file = 'GridFieldActionTest.yml';
 
 	/** @var array */
 	protected $extraDataObjects = array('GridFieldAction_Delete_Team', 'GridFieldAction_Edit_Team');
-	
+
 	public function setUp() {
 		parent::setUp();
 		$this->list = new DataList('GridFieldAction_Delete_Team');
@@ -24,7 +24,7 @@ class GridFieldDeleteActionTest extends SapphireTest {
 		$this->gridField = new GridField('testfield', 'testfield', $this->list, $config);
 		$this->form = new Form(new Controller(), 'mockform', new FieldList(array($this->gridField)), new FieldList());
 	}
-	
+
 	public function testDontShowDeleteButtons() {
 		if(Member::currentUser()) { Member::currentUser()->logOut(); }
 		$content = new CSSContentParser($this->gridField->FieldHolder());
@@ -34,56 +34,126 @@ class GridFieldDeleteActionTest extends SapphireTest {
 		$this->assertEquals(0, count($content->getBySelector('.gridfield-button-delete')),
 			'Delete buttons should not show when not logged in.');
 	}
-	
+
 	public function testShowDeleteButtonsWithAdminPermission() {
 		$this->logInWithPermission('ADMIN');
 		$content = new CSSContentParser($this->gridField->FieldHolder());
 		$deleteButtons = $content->getBySelector('.gridfield-button-delete');
 		$this->assertEquals(3, count($deleteButtons), 'Delete buttons should show when logged in.');
 	}
-	
+
+	public function testActionsRequireCSRF() {
+		$this->logInWithPermission('ADMIN');
+		$this->setExpectedException(
+			'SS_HTTPResponse_Exception',
+			_t("Form.CSRF_FAILED_MESSAGE",
+				"There seems to have been a technical problem. Please click the back button, ".
+				"refresh your browser, and try again."
+			),
+			400
+		);
+		$stateID = 'testGridStateActionField';
+		$request = new SS_HTTPRequest(
+			'POST',
+			'url',
+			array(),
+			array(
+				'action_gridFieldAlterAction?StateID='.$stateID,
+				'SecurityID' => null,
+			)
+		);
+		$this->gridField->gridFieldAlterAction(array('StateID'=>$stateID), $this->form, $request);
+	}
+
 	public function testDeleteActionWithoutCorrectPermission() {
 		if(Member::currentUser()) { Member::currentUser()->logOut(); }
 		$this->setExpectedException('ValidationException');
-		
+
 		$stateID = 'testGridStateActionField';
-		Session::set($stateID, array('grid'=>'', 'actionName'=>'deleterecord',
-			'args'=>array('RecordID'=>$this->idFromFixture('GridFieldAction_Delete_Team', 'team1'))));
-		$request = new SS_HTTPRequest('POST', 'url', array(),
-			array('action_gridFieldAlterAction?StateID='.$stateID=>true));
+		Session::set(
+			$stateID,
+			array(
+				'grid' => '',
+				'actionName' => 'deleterecord',
+				'args' => array(
+					'RecordID' => $this->idFromFixture('GridFieldAction_Delete_Team', 'team1')
+				)
+			)
+		);
+		$token = SecurityToken::inst();
+		$request = new SS_HTTPRequest(
+			'POST',
+			'url',
+			array(),
+			array(
+				'action_gridFieldAlterAction?StateID='.$stateID => true,
+				$token->getName() => $token->getValue(),
+			)
+		);
 		$this->gridField->gridFieldAlterAction(array('StateID'=>$stateID), $this->form, $request);
 		$this->assertEquals(3, $this->list->count(),
 			'User should\'t be able to delete records without correct permissions.');
 	}
-	
+
 	public function testDeleteActionWithAdminPermission() {
 		$this->logInWithPermission('ADMIN');
 		$stateID = 'testGridStateActionField';
-		Session::set($stateID, array('grid'=>'', 'actionName'=>'deleterecord',
-			'args'=>array('RecordID'=>$this->idFromFixture('GridFieldAction_Delete_Team', 'team1'))));
-		$request = new SS_HTTPRequest('POST', 'url', array(),
-			array('action_gridFieldAlterAction?StateID='.$stateID=>true));
+		Session::set(
+			$stateID,
+			array(
+				'grid'=>'',
+				'actionName'=>'deleterecord',
+				'args' => array(
+					'RecordID' => $this->idFromFixture('GridFieldAction_Delete_Team', 'team1')
+				)
+			)
+		);
+		$token = SecurityToken::inst();
+		$request = new SS_HTTPRequest(
+			'POST',
+			'url',
+			array(),
+			array(
+				'action_gridFieldAlterAction?StateID='.$stateID=>true,
+				$token->getName() => $token->getValue(),
+			)
+		);
 		$this->gridField->gridFieldAlterAction(array('StateID'=>$stateID), $this->form, $request);
 		$this->assertEquals(2, $this->list->count(), 'User should be able to delete records with ADMIN permission.');
 	}
-	
+
 	public function testDeleteActionRemoveRelation() {
 		$this->logInWithPermission('ADMIN');
-		
+
 		$config = GridFieldConfig::create()->addComponent(new GridFieldDeleteAction(true));
-		
+
 		$gridField = new GridField('testfield', 'testfield', $this->list, $config);
 		$form = new Form(new Controller(), 'mockform', new FieldList(array($this->gridField)), new FieldList());
-		
+
 		$stateID = 'testGridStateActionField';
-		Session::set($stateID, array('grid'=>'', 'actionName'=>'deleterecord',
-			'args'=>array('RecordID'=>$this->idFromFixture('GridFieldAction_Delete_Team', 'team1'))));
-		$request = new SS_HTTPRequest('POST', 'url', array(),
-			array('action_gridFieldAlterAction?StateID='.$stateID=>true));
-		
+		Session::set(
+			$stateID,
+			array(
+				'grid'=>'',
+				'actionName'=>'deleterecord',
+				'args' => array(
+					'RecordID' => $this->idFromFixture('GridFieldAction_Delete_Team', 'team1')
+				)
+			)
+		);
+		$token = SecurityToken::inst();
+		$request = new SS_HTTPRequest(
+			'POST',
+			'url',
+			array(),
+			array(
+				'action_gridFieldAlterAction?StateID='.$stateID=>true,
+				$token->getName() => $token->getValue(),
+			)
+		);
 		$this->gridField->gridFieldAlterAction(array('StateID'=>$stateID), $this->form, $request);
 		$this->assertEquals(2, $this->list->count(), 'User should be able to delete records with ADMIN permission.');
-		
+
 	}
 }
 
@@ -92,11 +162,11 @@ class GridFieldAction_Delete_Team extends DataObject implements TestOnly {
 		'Name' => 'Varchar',
 		'City' => 'Varchar'
 	);
-	
+
 	public function canView($member = null) {
 		return true;
 	}
-	
+
 	public function canDelete($member = null) {
 		return parent::canDelete($member);
 	}

From 37059eb6b3546f304e9c031abca0f096ddb175c6 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Wed, 17 Feb 2016 23:19:19 +1300
Subject: [PATCH 07/30] [ss-2016-003] Hostname, IP and Protocol Spoofing
 through HTTP Headers

---
 control/Director.php                          | 40 +++++++++---------
 control/HTTPRequest.php                       | 25 ++++++++---
 core/Constants.php                            |  9 ++--
 core/startup/ParameterConfirmationToken.php   | 42 +++++++++----------
 .../09_Security/04_Secure_Coding.md           |  5 ++-
 5 files changed, 68 insertions(+), 53 deletions(-)

diff --git a/control/Director.php b/control/Director.php
index 07948d631..5c0eeb108 100644
--- a/control/Director.php
+++ b/control/Director.php
@@ -492,28 +492,28 @@ class Director implements TemplateGlobalProvider {
 	 */
 	public static function is_https() {
 		$return = false;
+
+		// See https://en.wikipedia.org/wiki/List_of_HTTP_header_fields
+		// See https://support.microsoft.com/?kbID=307347
+		$headerOverride = false;
+		if(TRUSTED_PROXY) {
+			$headers = (defined('SS_TRUSTED_PROXY_PROTOCOL_HEADER')) ? array(SS_TRUSTED_PROXY_PROTOCOL_HEADER) : null;
+			if(!$headers) {
+				// Backwards compatible defaults
+				$headers = array('HTTP_X_FORWARDED_PROTO', 'HTTP_X_FORWARDED_PROTOCOL', 'HTTP_FRONT_END_HTTPS');
+			}
+			foreach($headers as $header) {
+				$headerCompareVal = ($header === 'HTTP_FRONT_END_HTTPS' ? 'on' : 'https');
+				if(!empty($_SERVER[$header]) && strtolower($_SERVER[$header]) == $headerCompareVal) {
+					$headerOverride = true;
+					break;
+				}
+			}
+		}
+
 		if ($protocol = Config::inst()->get('Director', 'alternate_protocol')) {
 			$return = ($protocol == 'https');
-		} else if(
-			TRUSTED_PROXY
-			&& isset($_SERVER['HTTP_X_FORWARDED_PROTO'])
-			&& strtolower($_SERVER['HTTP_X_FORWARDED_PROTO']) == 'https'
-		) { 
-			// Convention for (non-standard) proxy signaling a HTTPS forward,
-			// see https://en.wikipedia.org/wiki/List_of_HTTP_header_fields
-			$return = true;
-		} else if(
-			TRUSTED_PROXY
-			&& isset($_SERVER['HTTP_X_FORWARDED_PROTOCOL'])
-			&& strtolower($_SERVER['HTTP_X_FORWARDED_PROTOCOL']) == 'https'
-		) { 
-			// Less conventional proxy header
-			$return = true;
-		} else if(
-			isset($_SERVER['HTTP_FRONT_END_HTTPS'])
-			&& strtolower($_SERVER['HTTP_FRONT_END_HTTPS']) == 'on'
-		) { 
-			// Microsoft proxy convention: https://support.microsoft.com/?kbID=307347
+		} else if($headerOverride) {
 			$return = true;
 		} else if((!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != 'off')) {
 			$return = true;
diff --git a/control/HTTPRequest.php b/control/HTTPRequest.php
index 9b8506baa..21e5db00e 100644
--- a/control/HTTPRequest.php
+++ b/control/HTTPRequest.php
@@ -653,14 +653,27 @@ class SS_HTTPRequest implements ArrayAccess {
 	 * @return string
 	 */
 	public function getIP() {
-		if (TRUSTED_PROXY && !empty($_SERVER['HTTP_CLIENT_IP'])) {
-			//check ip from share internet
-			return $_SERVER['HTTP_CLIENT_IP'];
-		} elseif (TRUSTED_PROXY && !empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
-			//to check ip is pass from proxy
-			return  $_SERVER['HTTP_X_FORWARDED_FOR'];
+		$headerOverrideIP = null;
+		if(TRUSTED_PROXY) {
+			$headers = (defined('SS_TRUSTED_PROXY_IP_HEADER')) ? array(SS_TRUSTED_PROXY_IP_HEADER) : null;
+			if(!$headers) {
+				// Backwards compatible defaults
+				$headers = array('HTTP_CLIENT_IP', 'HTTP_X_FORWARDED_FOR');
+			}
+			foreach($headers as $header) {
+				if(!empty($_SERVER[$header])) {
+					$headerOverrideIP = $_SERVER[$header];
+					break;
+				}
+			}
+		}
+
+		if ($headerOverrideIP) {
+			return $headerOverrideIP;
 		} elseif(isset($_SERVER['REMOTE_ADDR'])) {
 			return $_SERVER['REMOTE_ADDR'];
+		} else {
+			return null;
 		}
 	}
 	
diff --git a/core/Constants.php b/core/Constants.php
index ad6e45c07..70d698623 100644
--- a/core/Constants.php
+++ b/core/Constants.php
@@ -177,10 +177,13 @@ if(!isset($_SERVER['HTTP_HOST'])) {
 	/**
 	 * Fix HTTP_HOST from reverse proxies
 	 */
-	if (TRUSTED_PROXY && isset($_SERVER['HTTP_X_FORWARDED_HOST'])) {
-		
+	$trustedProxyHeader = (defined('SS_TRUSTED_PROXY_HOST_HEADER'))
+		? SS_TRUSTED_PROXY_HOST_HEADER
+		: 'HTTP_X_FORWARDED_HOST';
+
+	if (TRUSTED_PROXY && !empty($_SERVER[$trustedProxyHeader])) {
 		// Get the first host, in case there's multiple separated through commas
-		$_SERVER['HTTP_HOST'] = strtok($_SERVER['HTTP_X_FORWARDED_HOST'], ',');
+		$_SERVER['HTTP_HOST'] = strtok($_SERVER[SS_TRUSTED_PROXY_HOST_HEADER], ',');
 	}
 }
 
diff --git a/core/startup/ParameterConfirmationToken.php b/core/startup/ParameterConfirmationToken.php
index 55851c601..d65c32c4d 100644
--- a/core/startup/ParameterConfirmationToken.php
+++ b/core/startup/ParameterConfirmationToken.php
@@ -160,26 +160,25 @@ class ParameterConfirmationToken {
 
 		// Are we http or https? Replicates Director::is_https() without its dependencies/
 		$proto = 'http';
-		if(
-			TRUSTED_PROXY
-			&& isset($_SERVER['HTTP_X_FORWARDED_PROTO'])
-			&& strtolower($_SERVER['HTTP_X_FORWARDED_PROTO']) == 'https'
-		) { 
-			// Convention for (non-standard) proxy signaling a HTTPS forward,
-			// see https://en.wikipedia.org/wiki/List_of_HTTP_header_fields
-			$proto = 'https';
-		} else if(
-			TRUSTED_PROXY
-			&& isset($_SERVER['HTTP_X_FORWARDED_PROTOCOL'])
-			&& strtolower($_SERVER['HTTP_X_FORWARDED_PROTOCOL']) == 'https'
-		) { 
-			// Less conventional proxy header
-			$proto = 'https';
-		} else if(
-			isset($_SERVER['HTTP_FRONT_END_HTTPS'])
-			&& strtolower($_SERVER['HTTP_FRONT_END_HTTPS']) == 'on'
-		) { 
-			// Microsoft proxy convention: https://support.microsoft.com/?kbID=307347
+		// See https://en.wikipedia.org/wiki/List_of_HTTP_header_fields
+		// See https://support.microsoft.com/?kbID=307347
+		$headerOverride = false;
+		if(TRUSTED_PROXY) {
+			$headers = (defined('SS_TRUSTED_PROXY_PROTOCOL_HEADER')) ? array(SS_TRUSTED_PROXY_PROTOCOL_HEADER) : null;
+			if(!$headers) {
+				// Backwards compatible defaults
+				$headers = array('HTTP_X_FORWARDED_PROTO', 'HTTP_X_FORWARDED_PROTOCOL', 'HTTP_FRONT_END_HTTPS');
+			}
+			foreach($headers as $header) {
+				$headerCompareVal = ($header === 'HTTP_FRONT_END_HTTPS' ? 'on' : 'https');
+				if(!empty($_SERVER[$header]) && strtolower($_SERVER[$header]) == $headerCompareVal) {
+					$headerOverride = true;
+					break;
+				}
+			}
+		}
+
+		if($headerOverride) {
 			$proto = 'https';
 		} else if((!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != 'off')) {
 			$proto = 'https';
@@ -187,9 +186,6 @@ class ParameterConfirmationToken {
 			$proto = 'https';
 		}
 
-		if((!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != 'off')) $proto = 'https';
-		if(isset($_SERVER['SSL'])) $proto = 'https';
-
 		$parts = array_filter(array(
 			// What's our host
 			$_SERVER['HTTP_HOST'],
diff --git a/docs/en/02_Developer_Guides/09_Security/04_Secure_Coding.md b/docs/en/02_Developer_Guides/09_Security/04_Secure_Coding.md
index 5d558fac0..c6ee5af94 100644
--- a/docs/en/02_Developer_Guides/09_Security/04_Secure_Coding.md
+++ b/docs/en/02_Developer_Guides/09_Security/04_Secure_Coding.md
@@ -502,7 +502,11 @@ server IPs using the SS_TRUSTED_PROXY_IPS define in your _ss_environment.php.
 
 	:::php
 	define('SS_TRUSTED_PROXY_IPS', '127.0.0.1,192.168.0.1');
+	define('SS_TRUSTED_PROXY_HOST_HEADER', 'HTTP_X_FORWARDED_HOST');
+	define('SS_TRUSTED_PROXY_IP_HEADER', 'HTTP_X_FORWARDED_FOR');
+	define('SS_TRUSTED_PROXY_PROTOCOL_HEADER', 'HTTP_X_FORWARDED_PROTOCOL');
 
+At the same time, you'll also need to define which headers you trust from these proxy IPs. Since there are multiple ways through which proxies can pass through HTTP information on the original hostname, IP and protocol, these values need to be adjusted for your specific proxy. The header names match their equivalent `$_SERVER` values.
 
 If there is no proxy server, 'none' can be used to distrust all clients.
 If only trusted servers will make requests then you can use '*' to trust all clients.
@@ -525,7 +529,6 @@ In a future release this behaviour will be changed to be on by default, and this
 variable will be no longer necessary, thus it will be necessary to always set
 SS_TRUSTED_PROXY_IPS if using a proxy.
 
-
 ##  Related
 
  * [http://silverstripe.org/security-releases/](http://silverstripe.org/security-releases/)

From 9a4f0b48df4965f8baa9db29ae52106aae7ffbfd Mon Sep 17 00:00:00 2001
From: Damian Mooyman <damian@silverstripe.com>
Date: Wed, 24 Feb 2016 12:38:54 +1300
Subject: [PATCH 08/30] Added 3.1.17-rc2 changelog

---
 docs/en/04_Changelogs/rc/3.1.17-rc2.md | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 docs/en/04_Changelogs/rc/3.1.17-rc2.md

diff --git a/docs/en/04_Changelogs/rc/3.1.17-rc2.md b/docs/en/04_Changelogs/rc/3.1.17-rc2.md
new file mode 100644
index 000000000..01487e437
--- /dev/null
+++ b/docs/en/04_Changelogs/rc/3.1.17-rc2.md
@@ -0,0 +1,11 @@
+# 3.1.17-rc2
+
+<!--- Changes below this line will be automatically regenerated -->
+
+## Change Log
+
+### Security
+
+ * 2016-02-17 [37059eb](https://github.com/silverstripe/silverstripe-framework/commit/37059eb6b3546f304e9c031abca0f096ddb175c6) Hostname, IP and Protocol Spoofing through HTTP Headers (Ingo Schommer) - See [ss-2016-003](http://www.silverstripe.org/download/security-releases/ss-2016-003)
+ * 2016-02-17 [5d2fc0d](https://github.com/silverstripe/silverstripe-framework/commit/5d2fc0d7cac4ce686f7ae05c1a7b1ad8c01711a8) Block unauthenticated access to dev/build/defaults (Damian Mooyman) - See [ss-2015-028](http://www.silverstripe.org/download/security-releases/ss-2015-028)
+ * 2016-02-17 [013524a](https://github.com/silverstripe/silverstripe-framework/commit/013524af5069bb0cf909853f04418d9bef56d18c) Ensure Gridfield actions respect CSRF (Damian Mooyman) - See [ss-2016-002](http://www.silverstripe.org/download/security-releases/ss-2016-002)

From 01c13bf6b3661ce432dd8b628669d9b8d17fb191 Mon Sep 17 00:00:00 2001
From: Damian Mooyman <damian@silverstripe.com>
Date: Wed, 24 Feb 2016 15:20:40 +1300
Subject: [PATCH 09/30] Update translations

---
 lang/cs.yml    |  6 +++---
 lang/de.yml    |  4 ----
 lang/eo.yml    |  4 ----
 lang/es.yml    |  5 -----
 lang/fa_IR.yml |  2 --
 lang/fi.yml    |  4 ----
 lang/lt.yml    |  2 +-
 lang/sk.yml    | 10 +++++-----
 lang/sv.yml    |  4 ----
 9 files changed, 9 insertions(+), 32 deletions(-)

diff --git a/lang/cs.yml b/lang/cs.yml
index aa4492189..60ec7fad0 100644
--- a/lang/cs.yml
+++ b/lang/cs.yml
@@ -301,7 +301,7 @@ cs:
     FROMWEB: 'Z webu'
     FindInFolder: 'Hledat ve složce'
     IMAGEALT: 'Alternativní text (alt)'
-    IMAGEALTTEXT: 'Alternativní text (alt) - bude zobrazen, pokud obrázek nemúže být zobrazen'
+    IMAGEALTTEXT: 'Alternativní text (alt) - bude ukázán, když obrázek nemúže být zobrazen'
     IMAGEALTTEXTDESC: 'Zobrazeno na obrazovce, když obrázek nemůže být zobrazen'
     IMAGEDIMENSIONS: Rozměry
     IMAGEHEIGHTPX: Výška
@@ -336,13 +336,13 @@ cs:
   LeftAndMain:
     CANT_REORGANISE: 'Nemáte oprávnění měnit stránky nejvyšší úrovně. Vaše změna nebyla uložena.'
     DELETED: Smazáno.
-    DropdownBatchActionsDefault: 'Vyberte akci...'
+    DropdownBatchActionsDefault: Akce
     HELP: Nápověda
     PAGETYPE: 'Typ stránky'
     PERMAGAIN: 'Byli jste odhlášeni z CMS. Pokud se chcete znovu přihlásit, zadejte níže své uživatelské jméno a heslo.'
     PERMALREADY: 'Omlouvám se, ale nemůžete vstoupit do této části CMS. Pokud se chcete přihlásit jako někdo jiný, udělejte tak níže.'
     PERMDEFAULT: 'Musíte být přihlášen/a k přístup do oblasti administrace, níže zadejte vaše přihlašovací údaje, prosím.'
-    PLEASESAVE: 'Prosím uložte stránku: Tato stránka nemohla být aktualizována, protože ještě nebyla uložena.'
+    PLEASESAVE: 'Prosím uložte stránku: Tato stránka nemohla být aktualizována, ještě nebyla uložena.'
     PreviewButton: Náhled
     REORGANISATIONSUCCESSFUL: 'Strom webu reorganizován úspěšně.'
     SAVEDUP: Uloženo.
diff --git a/lang/de.yml b/lang/de.yml
index 2138140f5..6bfc998b4 100644
--- a/lang/de.yml
+++ b/lang/de.yml
@@ -300,8 +300,6 @@ de:
     FROMWEB: 'Aus dem Web'
     FindInFolder: 'In Ordner suchen'
     IMAGEALT: 'Alternativtext (alt)'
-    IMAGEALTTEXT: 'Alternativer Text (alt) - angezeigt, wenn das Bild nicht dargestellt werden kann'
-    IMAGEALTTEXTDESC: 'Wird von Screenreadern vorgelesen oder angezeigt, falls das Bild nicht dargestellt werden kann'
     IMAGEDIMENSIONS: Dimensionen
     IMAGEHEIGHTPX: Höhe (px)
     IMAGETITLE: 'Titeltext (Tooltip) - für zusätzliche Informationen über das Bild'
@@ -333,11 +331,9 @@ de:
     CANT_REORGANISE: 'Sie besitzen nicht die benötigten Zugriffsrechte um Seiten der höchsten Ebene zu bearbeiten. Ihre Änderungen wurden nicht gespeichert.'
     DELETED: Gelöscht.
     HELP: Hilfe
-    PAGETYPE: 'Seitentyp'
     PERMAGAIN: 'Sie wurden aus dem System ausgeloggt. Falls Sie sich wieder einloggen möchten, geben Sie bitte Benutzernamen und Passwort im untenstehenden Formular an.'
     PERMALREADY: 'Leider dürfen Sie diesen Teil des CMS nicht aufrufen. Wenn Sie sich als jemand anderes einloggen wollen, benutzen Sie bitte das nachstehende Formular.'
     PERMDEFAULT: 'Sie müssen angemeldet sein, um auf diesen Bereich zugreifen zu können. Bitte geben Sie Ihre Zugangsdaten ein.'
-    PLEASESAVE: 'Diese Seite konnte nicht aktualisiert werden weil sie noch nicht gespeichert wurde - bitte speichern.'
     PreviewButton: Vorschau
     REORGANISATIONSUCCESSFUL: 'Der Seitenbaum wurde erfolgreich sortiert.'
     SAVEDUP: Gespeichert.
diff --git a/lang/eo.yml b/lang/eo.yml
index 57195dcc0..0dc9dcd40 100644
--- a/lang/eo.yml
+++ b/lang/eo.yml
@@ -293,8 +293,6 @@ eo:
     FROMWEB: 'El la TTT'
     FindInFolder: 'Serĉi en dosierujo'
     IMAGEALT: 'Alternativa teksto (alt)'
-    IMAGEALTTEXT: 'Alternativa teksto (alt) - vidigi ĝin se ne eblas vidigi bildon'
-    IMAGEALTTEXTDESC: 'Vidigita al ekranlegiloj aŭ se ne eblas vidii bildon'
     IMAGEDIMENSIONS: Dimensioj
     IMAGEHEIGHTPX: Alto
     IMAGETITLE: 'Titola teksto (ŝpruchelpilo) - por plua informo pri la bildo'
@@ -326,11 +324,9 @@ eo:
     CANT_REORGANISE: 'Vi ne rajtas ŝanĝi supronivelajn paĝojn. Via ŝanĝo ne konserviĝis.'
     DELETED: Forigita.
     HELP: Helpo
-    PAGETYPE: 'Tipo de paĝo:'
     PERMAGAIN: 'Vin adiaŭis la CMS. Se vi volas denove saluti, enigu salutnomon kaj pasvorton malsupre.'
     PERMALREADY: 'Bedaŭrinde vi ne povas aliri tiun parton de la CMS. Se vi volas ensaluti kiel aliulo, faru tion sube.'
     PERMDEFAULT: 'Necesas ensaluti por aliri la administran zonon; bonvolu enigi viajn akreditaĵoj sube.'
-    PLEASESAVE: 'Bonvolu konservi paĝon: Ne eblis ĝisdatigi ĉi tiun paĝon ĉar ĝi ankoraŭ ne estas konservita.'
     PreviewButton: Antaŭvido
     REORGANISATIONSUCCESSFUL: 'Sukcese reorganizis la retejan arbon.'
     SAVEDUP: Konservita.
diff --git a/lang/es.yml b/lang/es.yml
index d08f5f16c..144c826fe 100644
--- a/lang/es.yml
+++ b/lang/es.yml
@@ -301,8 +301,6 @@ es:
     FROMWEB: 'Desde la web'
     FindInFolder: 'Buscar en carpeta'
     IMAGEALT: 'Texto alternativo (alt)'
-    IMAGEALTTEXT: 'Texto alternativo (alt) - es mostrado si la imagen no puede ser visualizada'
-    IMAGEALTTEXTDESC: 'Mostrar a los lectores de pantalla o si la imagen no se puede visualizar'
     IMAGEDIMENSIONS: Dimensiones
     IMAGEHEIGHTPX: Alto
     IMAGETITLE: 'Texto del título (tooltip) - para obtener más información acerca de la imagen'
@@ -336,13 +334,10 @@ es:
   LeftAndMain:
     CANT_REORGANISE: 'Usted no tiene permiso para modificar las páginas de nivel superior. Su modificación no se ha guardado.'
     DELETED: Borrado
-    DropdownBatchActionsDefault: 'Elegir una acción...'
     HELP: Ayuda
-    PAGETYPE: 'Tipo de página'
     PERMAGAIN: 'Ha sido desconectado del CMS. Si quiere volver a entrar, introduzca su nombre de usuario y contraseña a continuación.'
     PERMALREADY: 'Lamentablemente no puede acceder a esta parte del CMS. Si quiere entrar como alguien distinto, hágalo a continuación'
     PERMDEFAULT: 'Debes estar conectado para acceder al área de administración; por favor ingresa tus datos a continuación'
-    PLEASESAVE: 'Por favor Guarde la Página: Esta página no se ha podido actualizar porque aún no ha sido salvada.'
     PreviewButton: Vista previa
     REORGANISATIONSUCCESSFUL: 'Reorganizado el árbol del sitio con éxito.'
     SAVEDUP: Guardado
diff --git a/lang/fa_IR.yml b/lang/fa_IR.yml
index d67654e93..148e24ac8 100644
--- a/lang/fa_IR.yml
+++ b/lang/fa_IR.yml
@@ -318,9 +318,7 @@ fa_IR:
     TITLE: 'آی‌فریم آپلود عکس'
   LeftAndMain:
     DELETED: حذف شده
-    DropdownBatchActionsDefault: 'انتخاب یک عملیات...'
     HELP: کمک
-    PAGETYPE: 'نوع صفحه'
     PERMAGAIN: 'شما از سیستم مدیریت محتوا خارج شده اید.اگر میخواهید دوباره وارد شوید نام کاربری و رمز عبور خود را در قسمت زیر وارد کنید'
     PreviewButton: پیش‌نمایش
     SAVEDUP: ذخیره شده
diff --git a/lang/fi.yml b/lang/fi.yml
index f82b8134c..f469275aa 100644
--- a/lang/fi.yml
+++ b/lang/fi.yml
@@ -299,8 +299,6 @@ fi:
     FROMWEB: 'Webistä'
     FindInFolder: 'Etsi kansiosta'
     IMAGEALT: 'Vaihtoehtoinen teksti (alt)'
-    IMAGEALTTEXT: 'Vaihtoehtoinen teksti (alt) - näytetään jos kuvaa ei voida näyttää'
-    IMAGEALTTEXTDESC: 'Näytetään ruudunlukuohjelmille tai jos kuvaa ei voi näyttää'
     IMAGEDIMENSIONS: Mitat
     IMAGEHEIGHTPX: Korkeus
     IMAGETITLE: 'Otsikko (tooltip) - kuvan lisätietoja varten'
@@ -333,11 +331,9 @@ fi:
     CANT_REORGANISE: 'Sinulla ei ole oikeuksia mennä ylemmän tason sivuille. Muutoksiasi ei tallennettu.'
     DELETED: Poistettu.
     HELP: Ohje
-    PAGETYPE: 'Sivutyyppi'
     PERMAGAIN: 'Olet kirjautunut ulos CMS:stä. Jos haluat kirjautua uudelleen sisään, syötä käyttäjätunnuksesi ja salasanasi alla.'
     PERMALREADY: 'Pahoittelut, mutta et pääse tähän osaan CMS:ää. Jos haluat kirjautua jonain muuna, voit tehdä sen alta.'
     PERMDEFAULT: 'Sinun tulee olla kirjautuneena ylläpito-osioon; syötä tunnuksesi kenttiin.'
-    PLEASESAVE: 'Tätä sivua ei voitu päivittää, koska sitä ei ole vielä tallennettu. Tallenna sivu.'
     PreviewButton: Esikatselu
     REORGANISATIONSUCCESSFUL: 'Hakemistopuu uudelleenjärjestettiin onnistuneesti.'
     SAVEDUP: Tallennettu.
diff --git a/lang/lt.yml b/lang/lt.yml
index ef31520dd..13d5c7e0f 100644
--- a/lang/lt.yml
+++ b/lang/lt.yml
@@ -336,7 +336,7 @@ lt:
   LeftAndMain:
     CANT_REORGANISE: 'Jūs neturite leidimo keisti aukščiausio lygio puslapių. Jūsų pakeitimai neišsaugoti.'
     DELETED: Ištrinta.
-    DropdownBatchActionsDefault: 'Pasirinkite veiksmą...'
+    DropdownBatchActionsDefault: Veiksmai
     HELP: Pagalba
     PAGETYPE: 'Puslapio tipas'
     PERMAGAIN: 'Jūs atsijungėte. Norėdami vėl prisijungti, įveskite savo duomenis į žemiau esančius laukelius.'
diff --git a/lang/sk.yml b/lang/sk.yml
index c0a94b7d9..9433fb357 100644
--- a/lang/sk.yml
+++ b/lang/sk.yml
@@ -301,8 +301,8 @@ sk:
     FROMWEB: 'Z webu'
     FindInFolder: 'Vyhľadať v priečinku'
     IMAGEALT: 'Atlernatívny text (alt)'
-    IMAGEALTTEXT: 'Atlernatívny text (alt) - zobrazí sa, ak obrázok nemože byť zobrazený'
-    IMAGEALTTEXTDESC: 'Zobrazí sa na čítačke obrazovky alebo ak obrázok nemôže byť zobrazený'
+    IMAGEALTTEXT: 'Atlernatívny text (alt) - sa zobrazí, ak nemôže byť zobrazený obrázok'
+    IMAGEALTTEXTDESC: 'Zobrazí sa na obrazovke, keď obrázok nemôže byť zobrazený'
     IMAGEDIMENSIONS: Rozmery
     IMAGEHEIGHTPX: Výška
     IMAGETITLE: 'Text titulky (tooltip) - pre doplňujúce informácie o obrázku'
@@ -336,13 +336,13 @@ sk:
   LeftAndMain:
     CANT_REORGANISE: 'Nemáte oprávnenie meniť stránky najvyššej úrovne. Vaša zmena nebola uložená.'
     DELETED: Zmazané.
-    DropdownBatchActionsDefault: 'Vybrať akciu...'
+    DropdownBatchActionsDefault: Akcie
     HELP: Pomoc
-    PAGETYPE: 'Typ stránky'
+    PAGETYPE: 'Typ stránky:'
     PERMAGAIN: 'Boli ste odhlásený'
     PERMALREADY: 'Je nám ľúto, ale k tejto časti CMS nemáte prístup . Ak sa chcete prihlásiť ako niekto iný, urobte tak nižšie.'
     PERMDEFAULT: 'Musíte byť prihlásený/á k prístupu do oblasti administrácie, zadajte vaše prihlasovacie údaje dole, prosím.'
-    PLEASESAVE: 'Uložte stránku, prosím. Táto stránka nemôže byť aktualizovaná, pretože ešte nebola uložená.'
+    PLEASESAVE: 'Prosím uložte stránku: Táto stránka nemôže byť aktualizovaná, ešte nebola uložená.'
     PreviewButton: Náhľad
     REORGANISATIONSUCCESSFUL: 'Strom webu bol reorganizovaný úspešne.'
     SAVEDUP: Uložené.
diff --git a/lang/sv.yml b/lang/sv.yml
index 58a7564db..c35e712ce 100644
--- a/lang/sv.yml
+++ b/lang/sv.yml
@@ -293,8 +293,6 @@ sv:
     FROMWEB: 'Från webben'
     FindInFolder: 'Hitta i mapp'
     IMAGEALT: 'Alternativ text (alt)'
-    IMAGEALTTEXT: 'Alternativ text (alt) - visas om bilden inte kan visas'
-    IMAGEALTTEXTDESC: 'Visas för skärmläsare eller om bilden inte kan visas'
     IMAGEDIMENSIONS: Dimensioner
     IMAGEHEIGHTPX: Höjd
     IMAGETITLE: 'Titel text (tooltip) - för ytterligare information om bilden'
@@ -326,11 +324,9 @@ sv:
     CANT_REORGANISE: 'Du har inte tillstånd att ändra sidor på toppnivå. Dina ändringar har inte sparats.'
     DELETED: Raderad
     HELP: Hjälp
-    PAGETYPE: 'Sidtyp'
     PERMAGAIN: 'Du har blivit utloggad. Om du vill logga in igen anger du dina uppgifter nedan.'
     PERMALREADY: 'Tyvärr så har du inte åtkomst till den delen av CMSet. Om du vill logga in med en annan användare kan du göra det nedan'
     PERMDEFAULT: 'Du måste vara inloggad för att få åtkomst till administrativa delarna; var vänlig att logga in med dina användaruppgifter nedan.'
-    PLEASESAVE: 'Var god spara sidan. Den kan inte uppdateras för att den har inte sparats ännu.'
     PreviewButton: Förhandsgranska
     REORGANISATIONSUCCESSFUL: 'Omorganisationen av sidträdet luyckades.'
     SAVEDUP: Sparad.

From 1fe7d029db06723a86e400cfd035cecf21c9ed59 Mon Sep 17 00:00:00 2001
From: Damian Mooyman <damian@silverstripe.com>
Date: Wed, 24 Feb 2016 15:31:12 +1300
Subject: [PATCH 10/30] Added 3.1.17 changelog

---
 docs/en/04_Changelogs/3.1.17.md | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 docs/en/04_Changelogs/3.1.17.md

diff --git a/docs/en/04_Changelogs/3.1.17.md b/docs/en/04_Changelogs/3.1.17.md
new file mode 100644
index 000000000..e7d849e43
--- /dev/null
+++ b/docs/en/04_Changelogs/3.1.17.md
@@ -0,0 +1,19 @@
+# 3.1.17
+
+<!--- Changes below this line will be automatically regenerated -->
+
+## Change Log
+
+### Security
+
+ * 2016-02-17 [37059eb](https://github.com/silverstripe/silverstripe-framework/commit/37059eb6b3546f304e9c031abca0f096ddb175c6) Hostname, IP and Protocol Spoofing through HTTP Headers (Ingo Schommer) - See [ss-2016-003](http://www.silverstripe.org/download/security-releases/ss-2016-003)
+ * 2016-02-17 [5d2fc0d](https://github.com/silverstripe/silverstripe-framework/commit/5d2fc0d7cac4ce686f7ae05c1a7b1ad8c01711a8) Block unauthenticated access to dev/build/defaults (Damian Mooyman) - See [ss-2015-028](http://www.silverstripe.org/download/security-releases/ss-2015-028)
+ * 2016-02-17 [013524a](https://github.com/silverstripe/silverstripe-framework/commit/013524af5069bb0cf909853f04418d9bef56d18c) Ensure Gridfield actions respect CSRF (Damian Mooyman) - See [ss-2016-002](http://www.silverstripe.org/download/security-releases/ss-2016-002)
+
+### Bugfixes
+
+ * 2016-02-16 [644c807](https://github.com/silverstripe/silverstripe-cms/commit/644c8070311e82d35c39c6e1f0d37cc8aba53665) Use correct formaction for doRollback exemption #1378 (Andrew Aitken-Fincham)
+ * 2016-01-05 [00544ff](https://github.com/silverstripe/silverstripe-framework/commit/00544ff100048afdb7ccb1905304dddf8ab3205a) session_regenerate_id uses config system (Daniel Hensby)
+ * 2016-01-05 [4335d8e](https://github.com/silverstripe/silverstripe-framework/commit/4335d8ed221a2b402299b32e31f97fc2956ec161) Members with no ID inherit logged in user permission (Daniel Hensby)
+ * 2015-11-18 [e9b833f](https://github.com/silverstripe/silverstripe-framework/commit/e9b833f5f0f989af8d611f8cfe71f0b0e2cb0159) ConfirmedPassword field correctly reports mismatching passwords (Christopher Darling)
+ * 2015-11-05 [f577ecb](https://github.com/silverstripe/silverstripe-framework/commit/f577ecb81149d0d09dc846204f17b2153a244b5a) prevent use cache on browser back button (Igor Nadj)

From 3dc0d0ee89cba6b780c8770a94490c60a5b52745 Mon Sep 17 00:00:00 2001
From: Damian Mooyman <damian@silverstripe.com>
Date: Fri, 26 Feb 2016 12:35:00 +1300
Subject: [PATCH 11/30] BUG Fix regression in gridfield get actions

---
 javascript/GridField.js | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/javascript/GridField.js b/javascript/GridField.js
index 5472547a8..7da0d72bc 100644
--- a/javascript/GridField.js
+++ b/javascript/GridField.js
@@ -253,12 +253,18 @@
 		 */
 		$('.ss-gridfield .action.no-ajax').entwine({
 			onclick: function(e){
-				var self = this, btn = this.closest(':button'), grid = this.getGridField(), 
-					form = this.closest('form'), data = form.find(':input.gridstate').serialize();
+				var self = this, btn = this.closest(':button'), grid = this.getGridField(),
+					form = this.closest('form'), data = form.find(':input.gridstate').serialize(),
+					csrf = form.find('input[name="SecurityID"]').val();
 
 				// Add current button
 				data += "&" + encodeURIComponent(btn.attr('name')) + '=' + encodeURIComponent(btn.val());
 
+				// Add csrf
+				if(csrf) {
+					data += "&SecurityID=" + encodeURIComponent(csrf);
+				}
+
 				// Include any GET parameters from the current URL, as the view
 				// state might depend on it. For example, a list pre-filtered
 				// through external search criteria might be passed to GridField.

From cc95703b18187b3940f02380f8e5667d61345660 Mon Sep 17 00:00:00 2001
From: Damian Mooyman <damian@silverstripe.com>
Date: Fri, 26 Feb 2016 15:49:28 +1300
Subject: [PATCH 12/30] BUG Fix regressions in missing CSRF on print button

---
 javascript/GridField.js | 110 ++++++++++++++++++----------------------
 1 file changed, 48 insertions(+), 62 deletions(-)

diff --git a/javascript/GridField.js b/javascript/GridField.js
index 7da0d72bc..117e73f54 100644
--- a/javascript/GridField.js
+++ b/javascript/GridField.js
@@ -22,7 +22,7 @@
 				if(window.location.search) {
 					ajaxOpts.data = window.location.search.replace(/^\?/, '') + '&' + $.param(ajaxOpts.data);
 				}
-				
+
 				// For browsers which do not support history.pushState like IE9, ss framework uses hash to track
 				// the current location for PJAX, so for them we pass the query string stored in the hash instead
 				if(!window.history || !window.history.pushState){
@@ -142,14 +142,46 @@
 					e.preventDefault();
 					return;
 				}
-				
+
 				if(this.hasClass('ss-gridfield-button-close') || !(this.closest('.ss-gridfield').hasClass('show-filter'))){
 					filterState='hidden';
 				}
 
 				this.getGridField().reload({data: [{name: this.attr('name'), value: this.val(), filter: filterState}]});
 				e.preventDefault();
+			},
+			/**
+			 * Get the url this action should submit to
+			 */
+			actionurl: function() {
+				var btn = this.closest(':button'), grid = this.getGridField(),
+					form = this.closest('form'), data = form.find(':input.gridstate').serialize(),
+					csrf = form.find('input[name="SecurityID"]').val();
+
+				// Add current button
+				data += "&" + encodeURIComponent(btn.attr('name')) + '=' + encodeURIComponent(btn.val());
+
+				// Add csrf
+				if(csrf) {
+					data += "&SecurityID=" + encodeURIComponent(csrf);
+				}
+
+				// Include any GET parameters from the current URL, as the view
+				// state might depend on it. For example, a list pre-filtered
+				// through external search criteria might be passed to GridField.
+				if(window.location.search) {
+					data = window.location.search.replace(/^\?/, '') + '&' + data;
+				}
+
+				// decide whether we should use ? or & to connect the URL
+				var connector = grid.data('url').indexOf('?') == -1 ? '?' : '&';
+
+				return $.path.makeUrlAbsolute(
+					grid.data('url') + connector + data,
+					$('base').attr('href')
+				);
 			}
+
 		});
 
 		/**
@@ -180,7 +212,7 @@
 			}
 		});
 
-		// Covers both tabular delete button, and the button on the detail form 
+		// Covers both tabular delete button, and the button on the detail form
 		$('.ss-gridfield .col-buttons .action.gridfield-button-delete, .cms-edit-form .Actions button.action.action-delete').entwine({
 			onclick: function(e){
 				if(!confirm(ss.i18n._t('TABLEFIELD.DELETECONFIRMMESSAGE'))) {
@@ -191,7 +223,7 @@
 				}
 			}
 		});
-		
+
 		$('.ss-gridfield .action.gridfield-button-print').entwine({
 			UUID: null,
 			onmatch: function() {
@@ -202,34 +234,13 @@
 				this._super();
 			},
 			onclick: function(e){
-				var btn = this.closest(':button'), grid = this.getGridField(),
-					form = this.closest('form'), data = form.find(':input.gridstate').serialize();;
-
-				// Add current button
-				data += "&" + encodeURIComponent(btn.attr('name')) + '=' + encodeURIComponent(btn.val());
-
-				// Include any GET parameters from the current URL, as the view
-				// state might depend on it.
-				// For example, a list prefiltered through external search criteria
-				// might be passed to GridField.
-				if(window.location.search) {
-					data = window.location.search.replace(/^\?/, '') + '&' + data;
-				}
-
-				// decide whether we should use ? or & to connect the URL
-				var connector = grid.data('url').indexOf('?') == -1 ? '?' : '&';
-
-				var url = $.path.makeUrlAbsolute(
-					grid.data('url') + connector + data,
-					$('base').attr('href')
-				);
-
-				var newWindow = window.open(url);
-
+				var url = this.actionurl();
+				window.open(url);
+				e.preventDefault();
 				return false;
 			}
 		});
-		
+
 		$('.ss-gridfield-print-iframe').entwine({
 			onmatch: function(){
 				this._super();
@@ -244,7 +255,7 @@
 				this._super();
 			}
 		});
-		
+
 		/**
 		 * Prevents actions from causing an ajax reload of the field.
 		 *
@@ -253,33 +264,8 @@
 		 */
 		$('.ss-gridfield .action.no-ajax').entwine({
 			onclick: function(e){
-				var self = this, btn = this.closest(':button'), grid = this.getGridField(),
-					form = this.closest('form'), data = form.find(':input.gridstate').serialize(),
-					csrf = form.find('input[name="SecurityID"]').val();
-
-				// Add current button
-				data += "&" + encodeURIComponent(btn.attr('name')) + '=' + encodeURIComponent(btn.val());
-
-				// Add csrf
-				if(csrf) {
-					data += "&SecurityID=" + encodeURIComponent(csrf);
-				}
-
-				// Include any GET parameters from the current URL, as the view
-				// state might depend on it. For example, a list pre-filtered
-				// through external search criteria might be passed to GridField.
-				if(window.location.search) {
-					data = window.location.search.replace(/^\?/, '') + '&' + data;
-				}
-
-				// decide whether we should use ? or & to connect the URL
-				var connector = grid.data('url').indexOf('?') == -1 ? '?' : '&';
-
-				window.location.href = $.path.makeUrlAbsolute(
-					grid.data('url') + connector + data,
-					$('base').attr('href')
-				);
-
+				window.location.href = this.actionurl();
+				e.preventDefault();
 				return false;
 			}
 		});
@@ -321,7 +307,7 @@
 				if (this.data('selectable')) this.selectable('destroy');
 			}
 		});
-		
+
 		/**
 		 * Catch submission event in filter input fields, and submit the correct button
 		 * rather than the whole form.
@@ -330,7 +316,7 @@
 			onmatch: function() {
 				var filterbtn = this.closest('.fieldgroup').find('.ss-gridfield-button-filter'),
 					resetbtn = this.closest('.fieldgroup').find('.ss-gridfield-button-reset');
-				
+
 				if(this.val()) {
 					filterbtn.addClass('filtered');
 					resetbtn.addClass('filtered');
@@ -349,11 +335,11 @@
 
 				if(e.keyCode == '13') {
 					var btns = this.closest('.filter-header').find('.ss-gridfield-button-filter');
-					var filterState='show'; //filterstate should equal current state.				
+					var filterState='show'; //filterstate should equal current state.
 					if(this.hasClass('ss-gridfield-button-close')||!(this.closest('.ss-gridfield').hasClass('show-filter'))){
 						filterState='hidden';
 					}
-					
+
 					this.getGridField().reload({data: [{name: btns.attr('name'), value: btns.val(), filter: filterState}]});
 					return false;
 				}else{
@@ -375,7 +361,7 @@
 							},
 							type: "GET",
 							url: $(searchField).data('searchUrl'),
-							data: encodeURIComponent(searchField.attr('name'))+'='+encodeURIComponent(searchField.val()), 
+							data: encodeURIComponent(searchField.attr('name'))+'='+encodeURIComponent(searchField.val()),
 							success: function(data) {
 								response( $.map(JSON.parse(data), function( name, id ) {
 									return { label: name, value: name, id: id };

From b0ad86bf8f34115173e03bfc657c5bbb52e6a7c0 Mon Sep 17 00:00:00 2001
From: Damian Mooyman <damian@silverstripe.com>
Date: Fri, 26 Feb 2016 12:35:00 +1300
Subject: [PATCH 13/30] BUG Fix regression in gridfield get actions

---
 javascript/GridField.js | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/javascript/GridField.js b/javascript/GridField.js
index 5472547a8..7da0d72bc 100644
--- a/javascript/GridField.js
+++ b/javascript/GridField.js
@@ -253,12 +253,18 @@
 		 */
 		$('.ss-gridfield .action.no-ajax').entwine({
 			onclick: function(e){
-				var self = this, btn = this.closest(':button'), grid = this.getGridField(), 
-					form = this.closest('form'), data = form.find(':input.gridstate').serialize();
+				var self = this, btn = this.closest(':button'), grid = this.getGridField(),
+					form = this.closest('form'), data = form.find(':input.gridstate').serialize(),
+					csrf = form.find('input[name="SecurityID"]').val();
 
 				// Add current button
 				data += "&" + encodeURIComponent(btn.attr('name')) + '=' + encodeURIComponent(btn.val());
 
+				// Add csrf
+				if(csrf) {
+					data += "&SecurityID=" + encodeURIComponent(csrf);
+				}
+
 				// Include any GET parameters from the current URL, as the view
 				// state might depend on it. For example, a list pre-filtered
 				// through external search criteria might be passed to GridField.

From 320c833fa1573b35a0a48ff0052bd7f63844c54f Mon Sep 17 00:00:00 2001
From: Damian Mooyman <damian@silverstripe.com>
Date: Fri, 26 Feb 2016 15:49:28 +1300
Subject: [PATCH 14/30] BUG Fix regressions in missing CSRF on print button

---
 javascript/GridField.js | 110 ++++++++++++++++++----------------------
 1 file changed, 48 insertions(+), 62 deletions(-)

diff --git a/javascript/GridField.js b/javascript/GridField.js
index 7da0d72bc..117e73f54 100644
--- a/javascript/GridField.js
+++ b/javascript/GridField.js
@@ -22,7 +22,7 @@
 				if(window.location.search) {
 					ajaxOpts.data = window.location.search.replace(/^\?/, '') + '&' + $.param(ajaxOpts.data);
 				}
-				
+
 				// For browsers which do not support history.pushState like IE9, ss framework uses hash to track
 				// the current location for PJAX, so for them we pass the query string stored in the hash instead
 				if(!window.history || !window.history.pushState){
@@ -142,14 +142,46 @@
 					e.preventDefault();
 					return;
 				}
-				
+
 				if(this.hasClass('ss-gridfield-button-close') || !(this.closest('.ss-gridfield').hasClass('show-filter'))){
 					filterState='hidden';
 				}
 
 				this.getGridField().reload({data: [{name: this.attr('name'), value: this.val(), filter: filterState}]});
 				e.preventDefault();
+			},
+			/**
+			 * Get the url this action should submit to
+			 */
+			actionurl: function() {
+				var btn = this.closest(':button'), grid = this.getGridField(),
+					form = this.closest('form'), data = form.find(':input.gridstate').serialize(),
+					csrf = form.find('input[name="SecurityID"]').val();
+
+				// Add current button
+				data += "&" + encodeURIComponent(btn.attr('name')) + '=' + encodeURIComponent(btn.val());
+
+				// Add csrf
+				if(csrf) {
+					data += "&SecurityID=" + encodeURIComponent(csrf);
+				}
+
+				// Include any GET parameters from the current URL, as the view
+				// state might depend on it. For example, a list pre-filtered
+				// through external search criteria might be passed to GridField.
+				if(window.location.search) {
+					data = window.location.search.replace(/^\?/, '') + '&' + data;
+				}
+
+				// decide whether we should use ? or & to connect the URL
+				var connector = grid.data('url').indexOf('?') == -1 ? '?' : '&';
+
+				return $.path.makeUrlAbsolute(
+					grid.data('url') + connector + data,
+					$('base').attr('href')
+				);
 			}
+
 		});
 
 		/**
@@ -180,7 +212,7 @@
 			}
 		});
 
-		// Covers both tabular delete button, and the button on the detail form 
+		// Covers both tabular delete button, and the button on the detail form
 		$('.ss-gridfield .col-buttons .action.gridfield-button-delete, .cms-edit-form .Actions button.action.action-delete').entwine({
 			onclick: function(e){
 				if(!confirm(ss.i18n._t('TABLEFIELD.DELETECONFIRMMESSAGE'))) {
@@ -191,7 +223,7 @@
 				}
 			}
 		});
-		
+
 		$('.ss-gridfield .action.gridfield-button-print').entwine({
 			UUID: null,
 			onmatch: function() {
@@ -202,34 +234,13 @@
 				this._super();
 			},
 			onclick: function(e){
-				var btn = this.closest(':button'), grid = this.getGridField(),
-					form = this.closest('form'), data = form.find(':input.gridstate').serialize();;
-
-				// Add current button
-				data += "&" + encodeURIComponent(btn.attr('name')) + '=' + encodeURIComponent(btn.val());
-
-				// Include any GET parameters from the current URL, as the view
-				// state might depend on it.
-				// For example, a list prefiltered through external search criteria
-				// might be passed to GridField.
-				if(window.location.search) {
-					data = window.location.search.replace(/^\?/, '') + '&' + data;
-				}
-
-				// decide whether we should use ? or & to connect the URL
-				var connector = grid.data('url').indexOf('?') == -1 ? '?' : '&';
-
-				var url = $.path.makeUrlAbsolute(
-					grid.data('url') + connector + data,
-					$('base').attr('href')
-				);
-
-				var newWindow = window.open(url);
-
+				var url = this.actionurl();
+				window.open(url);
+				e.preventDefault();
 				return false;
 			}
 		});
-		
+
 		$('.ss-gridfield-print-iframe').entwine({
 			onmatch: function(){
 				this._super();
@@ -244,7 +255,7 @@
 				this._super();
 			}
 		});
-		
+
 		/**
 		 * Prevents actions from causing an ajax reload of the field.
 		 *
@@ -253,33 +264,8 @@
 		 */
 		$('.ss-gridfield .action.no-ajax').entwine({
 			onclick: function(e){
-				var self = this, btn = this.closest(':button'), grid = this.getGridField(),
-					form = this.closest('form'), data = form.find(':input.gridstate').serialize(),
-					csrf = form.find('input[name="SecurityID"]').val();
-
-				// Add current button
-				data += "&" + encodeURIComponent(btn.attr('name')) + '=' + encodeURIComponent(btn.val());
-
-				// Add csrf
-				if(csrf) {
-					data += "&SecurityID=" + encodeURIComponent(csrf);
-				}
-
-				// Include any GET parameters from the current URL, as the view
-				// state might depend on it. For example, a list pre-filtered
-				// through external search criteria might be passed to GridField.
-				if(window.location.search) {
-					data = window.location.search.replace(/^\?/, '') + '&' + data;
-				}
-
-				// decide whether we should use ? or & to connect the URL
-				var connector = grid.data('url').indexOf('?') == -1 ? '?' : '&';
-
-				window.location.href = $.path.makeUrlAbsolute(
-					grid.data('url') + connector + data,
-					$('base').attr('href')
-				);
-
+				window.location.href = this.actionurl();
+				e.preventDefault();
 				return false;
 			}
 		});
@@ -321,7 +307,7 @@
 				if (this.data('selectable')) this.selectable('destroy');
 			}
 		});
-		
+
 		/**
 		 * Catch submission event in filter input fields, and submit the correct button
 		 * rather than the whole form.
@@ -330,7 +316,7 @@
 			onmatch: function() {
 				var filterbtn = this.closest('.fieldgroup').find('.ss-gridfield-button-filter'),
 					resetbtn = this.closest('.fieldgroup').find('.ss-gridfield-button-reset');
-				
+
 				if(this.val()) {
 					filterbtn.addClass('filtered');
 					resetbtn.addClass('filtered');
@@ -349,11 +335,11 @@
 
 				if(e.keyCode == '13') {
 					var btns = this.closest('.filter-header').find('.ss-gridfield-button-filter');
-					var filterState='show'; //filterstate should equal current state.				
+					var filterState='show'; //filterstate should equal current state.
 					if(this.hasClass('ss-gridfield-button-close')||!(this.closest('.ss-gridfield').hasClass('show-filter'))){
 						filterState='hidden';
 					}
-					
+
 					this.getGridField().reload({data: [{name: btns.attr('name'), value: btns.val(), filter: filterState}]});
 					return false;
 				}else{
@@ -375,7 +361,7 @@
 							},
 							type: "GET",
 							url: $(searchField).data('searchUrl'),
-							data: encodeURIComponent(searchField.attr('name'))+'='+encodeURIComponent(searchField.val()), 
+							data: encodeURIComponent(searchField.attr('name'))+'='+encodeURIComponent(searchField.val()),
 							success: function(data) {
 								response( $.map(JSON.parse(data), function( name, id ) {
 									return { label: name, value: name, id: id };

From 9e0037d43e693a328a570bafe3f349b5cfb7e21e Mon Sep 17 00:00:00 2001
From: Damian Mooyman <damian@silverstripe.com>
Date: Fri, 26 Feb 2016 17:13:49 +1300
Subject: [PATCH 15/30] Added 3.1.18-rc1 changelog

---
 docs/en/04_Changelogs/rc/3.1.18-rc1.md | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 docs/en/04_Changelogs/rc/3.1.18-rc1.md

diff --git a/docs/en/04_Changelogs/rc/3.1.18-rc1.md b/docs/en/04_Changelogs/rc/3.1.18-rc1.md
new file mode 100644
index 000000000..f8d71ab9a
--- /dev/null
+++ b/docs/en/04_Changelogs/rc/3.1.18-rc1.md
@@ -0,0 +1,10 @@
+# 3.1.18-rc1
+
+<!--- Changes below this line will be automatically regenerated -->
+
+## Change Log
+
+### Bugfixes
+
+ * 2016-02-26 [cc95703](https://github.com/silverstripe/silverstripe-framework/commit/cc95703b18187b3940f02380f8e5667d61345660) Fix regressions in missing CSRF on print button (Damian Mooyman)
+ * 2016-02-25 [3dc0d0e](https://github.com/silverstripe/silverstripe-framework/commit/3dc0d0ee89cba6b780c8770a94490c60a5b52745) Fix regression in gridfield get actions (Damian Mooyman)

From 8c12b6f9926db61b10d58ea0d4f2777f8f80bc82 Mon Sep 17 00:00:00 2001
From: Damian Mooyman <damian@silverstripe.com>
Date: Fri, 26 Feb 2016 17:25:00 +1300
Subject: [PATCH 16/30] Added 3.2.3-rc1 changelog

---
 docs/en/04_Changelogs/rc/3.2.3-rc1.md | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 docs/en/04_Changelogs/rc/3.2.3-rc1.md

diff --git a/docs/en/04_Changelogs/rc/3.2.3-rc1.md b/docs/en/04_Changelogs/rc/3.2.3-rc1.md
new file mode 100644
index 000000000..f043a91e2
--- /dev/null
+++ b/docs/en/04_Changelogs/rc/3.2.3-rc1.md
@@ -0,0 +1,10 @@
+# 3.2.3-rc1
+
+<!--- Changes below this line will be automatically regenerated -->
+
+## Change Log
+
+### Bugfixes
+
+ * 2016-02-26 [320c833](https://github.com/silverstripe/silverstripe-framework/commit/320c833fa1573b35a0a48ff0052bd7f63844c54f) Fix regressions in missing CSRF on print button (Damian Mooyman)
+ * 2016-02-25 [b0ad86b](https://github.com/silverstripe/silverstripe-framework/commit/b0ad86bf8f34115173e03bfc657c5bbb52e6a7c0) Fix regression in gridfield get actions (Damian Mooyman)

From 3d2fcf90878b3eea83b7173b75b9bdab5ab54f6a Mon Sep 17 00:00:00 2001
From: Daniel Hensby <dhensby@silverstripe.com>
Date: Fri, 26 Feb 2016 14:45:07 +0000
Subject: [PATCH 17/30] Fixing undeclared constant issue

---
 core/Constants.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/Constants.php b/core/Constants.php
index 70d698623..5215ecd39 100644
--- a/core/Constants.php
+++ b/core/Constants.php
@@ -183,7 +183,7 @@ if(!isset($_SERVER['HTTP_HOST'])) {
 
 	if (TRUSTED_PROXY && !empty($_SERVER[$trustedProxyHeader])) {
 		// Get the first host, in case there's multiple separated through commas
-		$_SERVER['HTTP_HOST'] = strtok($_SERVER[SS_TRUSTED_PROXY_HOST_HEADER], ',');
+		$_SERVER['HTTP_HOST'] = strtok($_SERVER[$trustedProxyHeader], ',');
 	}
 }
 

From bd48d89642a259e0a4c93ab2a686bc45b2ac3bc4 Mon Sep 17 00:00:00 2001
From: Daniel Hensby <dhensby@silverstripe.com>
Date: Fri, 26 Feb 2016 14:45:07 +0000
Subject: [PATCH 18/30] FIX undeclared constant issue

---
 core/Constants.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/Constants.php b/core/Constants.php
index 70d698623..5215ecd39 100644
--- a/core/Constants.php
+++ b/core/Constants.php
@@ -183,7 +183,7 @@ if(!isset($_SERVER['HTTP_HOST'])) {
 
 	if (TRUSTED_PROXY && !empty($_SERVER[$trustedProxyHeader])) {
 		// Get the first host, in case there's multiple separated through commas
-		$_SERVER['HTTP_HOST'] = strtok($_SERVER[SS_TRUSTED_PROXY_HOST_HEADER], ',');
+		$_SERVER['HTTP_HOST'] = strtok($_SERVER[$trustedProxyHeader], ',');
 	}
 }
 

From 387264fbbbf6a4faa4b38142aafcceaf59f042da Mon Sep 17 00:00:00 2001
From: Damian Mooyman <damian@silverstripe.com>
Date: Sat, 27 Feb 2016 20:35:10 +1300
Subject: [PATCH 19/30] Update translations

---
 lang/cs.yml |  4 ++--
 lang/it.yml | 19 +++++++++++++++++++
 lang/lt.yml |  2 +-
 lang/sk.yml |  6 +++---
 4 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/lang/cs.yml b/lang/cs.yml
index 60ec7fad0..6b0139ef9 100644
--- a/lang/cs.yml
+++ b/lang/cs.yml
@@ -336,13 +336,13 @@ cs:
   LeftAndMain:
     CANT_REORGANISE: 'Nemáte oprávnění měnit stránky nejvyšší úrovně. Vaše změna nebyla uložena.'
     DELETED: Smazáno.
-    DropdownBatchActionsDefault: Akce
+    DropdownBatchActionsDefault: 'Vyberte akci...'
     HELP: Nápověda
     PAGETYPE: 'Typ stránky'
     PERMAGAIN: 'Byli jste odhlášeni z CMS. Pokud se chcete znovu přihlásit, zadejte níže své uživatelské jméno a heslo.'
     PERMALREADY: 'Omlouvám se, ale nemůžete vstoupit do této části CMS. Pokud se chcete přihlásit jako někdo jiný, udělejte tak níže.'
     PERMDEFAULT: 'Musíte být přihlášen/a k přístup do oblasti administrace, níže zadejte vaše přihlašovací údaje, prosím.'
-    PLEASESAVE: 'Prosím uložte stránku: Tato stránka nemohla být aktualizována, ještě nebyla uložena.'
+    PLEASESAVE: 'Prosím uložte stránku: Tato stránka nemohla být aktualizována, protože ještě nebyla uložena.'
     PreviewButton: Náhled
     REORGANISATIONSUCCESSFUL: 'Strom webu reorganizován úspěšně.'
     SAVEDUP: Uloženo.
diff --git a/lang/it.yml b/lang/it.yml
index 4ead4226b..b71a4181a 100644
--- a/lang/it.yml
+++ b/lang/it.yml
@@ -1,5 +1,6 @@
 it:
   AssetAdmin:
+    HIDEALLOWEDEXTS: 'Nascondi estensioni permesse'
     NEWFOLDER: NuovaCartella
     SHOWALLOWEDEXTS: 'Mostra le estensioni consentite'
   AssetTableField:
@@ -7,12 +8,14 @@ it:
     DIM: Dimensioni
     FILENAME: Nome del file
     FOLDER: Cartella
+    HEIGHT: Altezza
     LASTEDIT: 'Ultima modifica'
     OWNER: Proprietario
     SIZE: 'Dimensione'
     TITLE: Titolo
     TYPE: 'Tipo di file'
     URL: URL
+    WIDTH: Larghezza
   AssetUploadField:
     ChooseFiles: 'Scegli file'
     DRAGFILESHERE: 'Trascina file qui'
@@ -23,7 +26,10 @@ it:
     FILES: Files
     FROMCOMPUTER: 'Scegli file dal tuo computer'
     FROMCOMPUTERINFO: 'Carica dal tuo conputer'
+    INSERTURL: 'Inserisci da URL'
+    REMOVEINFO: 'Rimuovi questo file da questo campo'
     TOTAL: Totale
+    TOUPLOAD: 'Scegli file da caricare...'
     UPLOADINPROGRESS: 'Attendere prego... caricamento in corso'
     UPLOADOR: O
   BBCodeParser:
@@ -76,6 +82,8 @@ it:
     PASSWORDEXPIRED: '<p>La tua password è scaduta. <a target="_top" href="{link}">Per favore selezionarne una nuova.</a></p>'
   CMSPageHistoryController_versions_ss:
     PREVIEW: 'Preview del sito'
+  CMSPagesController_Tools_ss:
+    FILTER: Filtro
   CMSProfileController:
     MENUTITLE: 'Il mio Profilo'
   CMSSecurity:
@@ -104,6 +112,7 @@ it:
     MAXIMUM: 'La password deve essere lunga almeno {max} caratteri.'
     SHOWONCLICKTITLE: 'Cambia password'
   ContentController:
+    DRAFT_SITE_ACCESS_RESTRICTION: 'Devi loggarti con la tua password per vedere la bozza o il contenuto archiviato. <a href="%s">Premi qui per tornare indietro al sito pubblicato.</a>'
     NOTLOGGEDIN: 'Non autenticato'
   CreditCardField:
     FIRST: primo
@@ -143,6 +152,7 @@ it:
     INVALID_REQUEST: 'Richiesta non valida'
   DropdownField:
     CHOOSE: (Scegli)
+    CHOOSESEARCH: '(Scegli o Cerca)'
     SOURCE_VALIDATION: 'Per favore selezionare un valore tra quelli forniti. {value} non è un''opzione valida'
   EmailField:
     VALIDATION: 'Inserisci un indirizzo e-mail'
@@ -289,12 +299,14 @@ it:
     FROMWEB: 'Dal web'
     FindInFolder: 'Trova nella Cartella'
     IMAGEALT: 'Testo alternativo (alt)'
+    IMAGEALTTEXT: 'Testo alternativo (alt) - visualizzato nel caso l''immagine non puo'' essere visualizzata'
     IMAGEDIMENSIONS: Dimensioni
     IMAGEHEIGHTPX: Altezza
     IMAGETITLE: 'Titolo (tooltip) - per informazioni aggiuntive sull''immagine.'
     IMAGETITLETEXT: 'Titolo (tooltip)'
     IMAGETITLETEXTDESC: 'Per informazioni addizionali sull''immagine'
     IMAGEWIDTHPX: Larghezza
+    INSERTMEDIA: 'Inserisci Media'
     LINK: 'Inserisci Link'
     LINKANCHOR: 'Ancora su questa pagina'
     LINKDESCR: 'Descrizione del link'
@@ -307,7 +319,11 @@ it:
     PAGE: Pagina
     SUBJECT: 'Oggetto email'
     URL: URL
+    URLDESCRIPTION: 'Inserisci video e immagini dal Web nella tua pagina semplicemente inserendo l''URL del file.
+
+      Si sicuro di avere i diritti o i permessi prima di condividere media direttamente dal Web.<br /><br />NB : i file non sono aggiunti allo storage file del CMS, ma incorpora il file dalla sua location principale, se per un qualsiasi motivo il file non e'' più raggiungibile nella sua location principale, non sara'' più visibile su questa pagina.'
     URLNOTANOEMBEDRESOURCE: 'L''URL ''{url}'' non può essere convertito in una risorsa media.'
+    UpdateMEDIA: 'Aggiorna Media'
   Image:
     PLURALNAME: Files
     SINGULARNAME: File
@@ -319,10 +335,13 @@ it:
   LeftAndMain:
     CANT_REORGANISE: 'Non hai i permessi per modificare le pagine di primo livello. Le modifiche non sono state salvate.'
     DELETED: Eliminato.
+    DropdownBatchActionsDefault: 'Scegli un azione...'
     HELP: Aiuto
+    PAGETYPE: 'Tipo di pagina'
     PERMAGAIN: 'Sei stato disconnesso dal CMS. Se desideri autenticarti nuovamente, inserisci qui sotto nome utente e password.'
     PERMALREADY: 'Siamo spiacenti, ma non puoi accedere a questa sezione del CMS. Se desideri autenticarti come qualcun altro, fallo qui sotto.'
     PERMDEFAULT: 'Devi essere autenticato per accedere all''area amministrativa; Per favore inserisci le tue credenziali qui sotto'
+    PLEASESAVE: 'Per favore Salva Pagina: Questa pagina potrebbe non essere aggiornata in quanto non e'' ancora stata salvata.'
     PreviewButton: Anteprima
     REORGANISATIONSUCCESSFUL: 'Albero del sito riorganizzato con successo.'
     SAVEDUP: Salvato.
diff --git a/lang/lt.yml b/lang/lt.yml
index 13d5c7e0f..ef31520dd 100644
--- a/lang/lt.yml
+++ b/lang/lt.yml
@@ -336,7 +336,7 @@ lt:
   LeftAndMain:
     CANT_REORGANISE: 'Jūs neturite leidimo keisti aukščiausio lygio puslapių. Jūsų pakeitimai neišsaugoti.'
     DELETED: Ištrinta.
-    DropdownBatchActionsDefault: Veiksmai
+    DropdownBatchActionsDefault: 'Pasirinkite veiksmą...'
     HELP: Pagalba
     PAGETYPE: 'Puslapio tipas'
     PERMAGAIN: 'Jūs atsijungėte. Norėdami vėl prisijungti, įveskite savo duomenis į žemiau esančius laukelius.'
diff --git a/lang/sk.yml b/lang/sk.yml
index 9433fb357..c4b639b69 100644
--- a/lang/sk.yml
+++ b/lang/sk.yml
@@ -336,13 +336,13 @@ sk:
   LeftAndMain:
     CANT_REORGANISE: 'Nemáte oprávnenie meniť stránky najvyššej úrovne. Vaša zmena nebola uložená.'
     DELETED: Zmazané.
-    DropdownBatchActionsDefault: Akcie
+    DropdownBatchActionsDefault: 'Vybrať akciu...'
     HELP: Pomoc
-    PAGETYPE: 'Typ stránky:'
+    PAGETYPE: 'Typ stránky'
     PERMAGAIN: 'Boli ste odhlásený'
     PERMALREADY: 'Je nám ľúto, ale k tejto časti CMS nemáte prístup . Ak sa chcete prihlásiť ako niekto iný, urobte tak nižšie.'
     PERMDEFAULT: 'Musíte byť prihlásený/á k prístupu do oblasti administrácie, zadajte vaše prihlasovacie údaje dole, prosím.'
-    PLEASESAVE: 'Prosím uložte stránku: Táto stránka nemôže byť aktualizovaná, ešte nebola uložená.'
+    PLEASESAVE: 'Prosím uložte stránku: Táto stránka nemôže byť aktualizovaná, lebo ešte nebola uložená.'
     PreviewButton: Náhľad
     REORGANISATIONSUCCESSFUL: 'Strom webu bol reorganizovaný úspešne.'
     SAVEDUP: Uložené.

From 9d9a6fc0e86f4e83994ee3babd4377631b8d7f0f Mon Sep 17 00:00:00 2001
From: Damian Mooyman <damian@silverstripe.com>
Date: Sat, 27 Feb 2016 20:46:31 +1300
Subject: [PATCH 20/30] Added 3.1.18-rc2 changelog

---
 docs/en/04_Changelogs/rc/3.1.18-rc2.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 docs/en/04_Changelogs/rc/3.1.18-rc2.md

diff --git a/docs/en/04_Changelogs/rc/3.1.18-rc2.md b/docs/en/04_Changelogs/rc/3.1.18-rc2.md
new file mode 100644
index 000000000..f0b835d48
--- /dev/null
+++ b/docs/en/04_Changelogs/rc/3.1.18-rc2.md
@@ -0,0 +1,5 @@
+# 3.1.18-rc2
+
+<!--- Changes below this line will be automatically regenerated -->
+
+## Change Log

From b77acaeeb7e723ef322484712a6ccf54fcc3f2b2 Mon Sep 17 00:00:00 2001
From: Damian Mooyman <damian@silverstripe.com>
Date: Sat, 27 Feb 2016 20:53:23 +1300
Subject: [PATCH 21/30] Added 3.1.18-rc2 changelog

---
 docs/en/04_Changelogs/rc/3.1.18-rc2.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/en/04_Changelogs/rc/3.1.18-rc2.md b/docs/en/04_Changelogs/rc/3.1.18-rc2.md
index f0b835d48..5e813820e 100644
--- a/docs/en/04_Changelogs/rc/3.1.18-rc2.md
+++ b/docs/en/04_Changelogs/rc/3.1.18-rc2.md
@@ -3,3 +3,7 @@
 <!--- Changes below this line will be automatically regenerated -->
 
 ## Change Log
+
+### Bugfixes
+
+ * 2016-02-26 [bd48d89](https://github.com/silverstripe/silverstripe-framework/commit/bd48d89642a259e0a4c93ab2a686bc45b2ac3bc4) undeclared constant issue (Daniel Hensby)

From c2a0e8945f6f2bc2ff8bd4013c16195cf6d7b940 Mon Sep 17 00:00:00 2001
From: Daniel Hensby <dhensby@silverstripe.com>
Date: Fri, 26 Feb 2016 14:45:07 +0000
Subject: [PATCH 22/30] FIX undeclared constant issue

---
 core/Constants.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/Constants.php b/core/Constants.php
index a7e1b92aa..b166c629c 100644
--- a/core/Constants.php
+++ b/core/Constants.php
@@ -185,7 +185,7 @@ if(!isset($_SERVER['HTTP_HOST'])) {
 
 	if (TRUSTED_PROXY && !empty($_SERVER[$trustedProxyHeader])) {
 		// Get the first host, in case there's multiple separated through commas
-		$_SERVER['HTTP_HOST'] = strtok($_SERVER[SS_TRUSTED_PROXY_HOST_HEADER], ',');
+		$_SERVER['HTTP_HOST'] = strtok($_SERVER[$trustedProxyHeader], ',');
 	}
 }
 

From 6bbd50c9175aeb2da540ce7e40d29b1083b994d3 Mon Sep 17 00:00:00 2001
From: Damian Mooyman <damian@silverstripe.com>
Date: Sat, 27 Feb 2016 20:38:19 +1300
Subject: [PATCH 23/30] Update translations

---
 lang/cs.yml |  4 ++--
 lang/it.yml | 15 +++++++++++++++
 lang/lt.yml |  2 +-
 lang/sk.yml |  5 -----
 4 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/lang/cs.yml b/lang/cs.yml
index 60ec7fad0..6b0139ef9 100644
--- a/lang/cs.yml
+++ b/lang/cs.yml
@@ -336,13 +336,13 @@ cs:
   LeftAndMain:
     CANT_REORGANISE: 'Nemáte oprávnění měnit stránky nejvyšší úrovně. Vaše změna nebyla uložena.'
     DELETED: Smazáno.
-    DropdownBatchActionsDefault: Akce
+    DropdownBatchActionsDefault: 'Vyberte akci...'
     HELP: Nápověda
     PAGETYPE: 'Typ stránky'
     PERMAGAIN: 'Byli jste odhlášeni z CMS. Pokud se chcete znovu přihlásit, zadejte níže své uživatelské jméno a heslo.'
     PERMALREADY: 'Omlouvám se, ale nemůžete vstoupit do této části CMS. Pokud se chcete přihlásit jako někdo jiný, udělejte tak níže.'
     PERMDEFAULT: 'Musíte být přihlášen/a k přístup do oblasti administrace, níže zadejte vaše přihlašovací údaje, prosím.'
-    PLEASESAVE: 'Prosím uložte stránku: Tato stránka nemohla být aktualizována, ještě nebyla uložena.'
+    PLEASESAVE: 'Prosím uložte stránku: Tato stránka nemohla být aktualizována, protože ještě nebyla uložena.'
     PreviewButton: Náhled
     REORGANISATIONSUCCESSFUL: 'Strom webu reorganizován úspěšně.'
     SAVEDUP: Uloženo.
diff --git a/lang/it.yml b/lang/it.yml
index 4ead4226b..e10283e12 100644
--- a/lang/it.yml
+++ b/lang/it.yml
@@ -1,5 +1,6 @@
 it:
   AssetAdmin:
+    HIDEALLOWEDEXTS: 'Nascondi estensioni permesse'
     NEWFOLDER: NuovaCartella
     SHOWALLOWEDEXTS: 'Mostra le estensioni consentite'
   AssetTableField:
@@ -7,12 +8,14 @@ it:
     DIM: Dimensioni
     FILENAME: Nome del file
     FOLDER: Cartella
+    HEIGHT: Altezza
     LASTEDIT: 'Ultima modifica'
     OWNER: Proprietario
     SIZE: 'Dimensione'
     TITLE: Titolo
     TYPE: 'Tipo di file'
     URL: URL
+    WIDTH: Larghezza
   AssetUploadField:
     ChooseFiles: 'Scegli file'
     DRAGFILESHERE: 'Trascina file qui'
@@ -23,7 +26,10 @@ it:
     FILES: Files
     FROMCOMPUTER: 'Scegli file dal tuo computer'
     FROMCOMPUTERINFO: 'Carica dal tuo conputer'
+    INSERTURL: 'Inserisci da URL'
+    REMOVEINFO: 'Rimuovi questo file da questo campo'
     TOTAL: Totale
+    TOUPLOAD: 'Scegli file da caricare...'
     UPLOADINPROGRESS: 'Attendere prego... caricamento in corso'
     UPLOADOR: O
   BBCodeParser:
@@ -76,6 +82,8 @@ it:
     PASSWORDEXPIRED: '<p>La tua password è scaduta. <a target="_top" href="{link}">Per favore selezionarne una nuova.</a></p>'
   CMSPageHistoryController_versions_ss:
     PREVIEW: 'Preview del sito'
+  CMSPagesController_Tools_ss:
+    FILTER: Filtro
   CMSProfileController:
     MENUTITLE: 'Il mio Profilo'
   CMSSecurity:
@@ -104,6 +112,7 @@ it:
     MAXIMUM: 'La password deve essere lunga almeno {max} caratteri.'
     SHOWONCLICKTITLE: 'Cambia password'
   ContentController:
+    DRAFT_SITE_ACCESS_RESTRICTION: 'Devi loggarti con la tua password per vedere la bozza o il contenuto archiviato. <a href="%s">Premi qui per tornare indietro al sito pubblicato.</a>'
     NOTLOGGEDIN: 'Non autenticato'
   CreditCardField:
     FIRST: primo
@@ -143,6 +152,7 @@ it:
     INVALID_REQUEST: 'Richiesta non valida'
   DropdownField:
     CHOOSE: (Scegli)
+    CHOOSESEARCH: '(Scegli o Cerca)'
     SOURCE_VALIDATION: 'Per favore selezionare un valore tra quelli forniti. {value} non è un''opzione valida'
   EmailField:
     VALIDATION: 'Inserisci un indirizzo e-mail'
@@ -295,6 +305,7 @@ it:
     IMAGETITLETEXT: 'Titolo (tooltip)'
     IMAGETITLETEXTDESC: 'Per informazioni addizionali sull''immagine'
     IMAGEWIDTHPX: Larghezza
+    INSERTMEDIA: 'Inserisci Media'
     LINK: 'Inserisci Link'
     LINKANCHOR: 'Ancora su questa pagina'
     LINKDESCR: 'Descrizione del link'
@@ -307,7 +318,11 @@ it:
     PAGE: Pagina
     SUBJECT: 'Oggetto email'
     URL: URL
+    URLDESCRIPTION: 'Inserisci video e immagini dal Web nella tua pagina semplicemente inserendo l''URL del file.
+
+      Si sicuro di avere i diritti o i permessi prima di condividere media direttamente dal Web.<br /><br />NB : i file non sono aggiunti allo storage file del CMS, ma incorpora il file dalla sua location principale, se per un qualsiasi motivo il file non e'' più raggiungibile nella sua location principale, non sara'' più visibile su questa pagina.'
     URLNOTANOEMBEDRESOURCE: 'L''URL ''{url}'' non può essere convertito in una risorsa media.'
+    UpdateMEDIA: 'Aggiorna Media'
   Image:
     PLURALNAME: Files
     SINGULARNAME: File
diff --git a/lang/lt.yml b/lang/lt.yml
index 13d5c7e0f..ef31520dd 100644
--- a/lang/lt.yml
+++ b/lang/lt.yml
@@ -336,7 +336,7 @@ lt:
   LeftAndMain:
     CANT_REORGANISE: 'Jūs neturite leidimo keisti aukščiausio lygio puslapių. Jūsų pakeitimai neišsaugoti.'
     DELETED: Ištrinta.
-    DropdownBatchActionsDefault: Veiksmai
+    DropdownBatchActionsDefault: 'Pasirinkite veiksmą...'
     HELP: Pagalba
     PAGETYPE: 'Puslapio tipas'
     PERMAGAIN: 'Jūs atsijungėte. Norėdami vėl prisijungti, įveskite savo duomenis į žemiau esančius laukelius.'
diff --git a/lang/sk.yml b/lang/sk.yml
index 9433fb357..52bba5a82 100644
--- a/lang/sk.yml
+++ b/lang/sk.yml
@@ -301,8 +301,6 @@ sk:
     FROMWEB: 'Z webu'
     FindInFolder: 'Vyhľadať v priečinku'
     IMAGEALT: 'Atlernatívny text (alt)'
-    IMAGEALTTEXT: 'Atlernatívny text (alt) - sa zobrazí, ak nemôže byť zobrazený obrázok'
-    IMAGEALTTEXTDESC: 'Zobrazí sa na obrazovke, keď obrázok nemôže byť zobrazený'
     IMAGEDIMENSIONS: Rozmery
     IMAGEHEIGHTPX: Výška
     IMAGETITLE: 'Text titulky (tooltip) - pre doplňujúce informácie o obrázku'
@@ -336,13 +334,10 @@ sk:
   LeftAndMain:
     CANT_REORGANISE: 'Nemáte oprávnenie meniť stránky najvyššej úrovne. Vaša zmena nebola uložená.'
     DELETED: Zmazané.
-    DropdownBatchActionsDefault: Akcie
     HELP: Pomoc
-    PAGETYPE: 'Typ stránky:'
     PERMAGAIN: 'Boli ste odhlásený'
     PERMALREADY: 'Je nám ľúto, ale k tejto časti CMS nemáte prístup . Ak sa chcete prihlásiť ako niekto iný, urobte tak nižšie.'
     PERMDEFAULT: 'Musíte byť prihlásený/á k prístupu do oblasti administrácie, zadajte vaše prihlasovacie údaje dole, prosím.'
-    PLEASESAVE: 'Prosím uložte stránku: Táto stránka nemôže byť aktualizovaná, ešte nebola uložená.'
     PreviewButton: Náhľad
     REORGANISATIONSUCCESSFUL: 'Strom webu bol reorganizovaný úspešne.'
     SAVEDUP: Uložené.

From 3f5c635353dda812ecea3ab6c3c4ab72e0b50215 Mon Sep 17 00:00:00 2001
From: Damian Mooyman <damian@silverstripe.com>
Date: Sat, 27 Feb 2016 20:58:09 +1300
Subject: [PATCH 24/30] Added 3.2.3-rc2 changelog

---
 docs/en/04_Changelogs/rc/3.2.3-rc2.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 docs/en/04_Changelogs/rc/3.2.3-rc2.md

diff --git a/docs/en/04_Changelogs/rc/3.2.3-rc2.md b/docs/en/04_Changelogs/rc/3.2.3-rc2.md
new file mode 100644
index 000000000..8f8a71ed4
--- /dev/null
+++ b/docs/en/04_Changelogs/rc/3.2.3-rc2.md
@@ -0,0 +1,5 @@
+# 3.2.3-rc2
+
+<!--- Changes below this line will be automatically regenerated -->
+
+## Change Log

From 3c053bb85d1b236a0f3eb29ae16c8b760aa9b132 Mon Sep 17 00:00:00 2001
From: Damian Mooyman <damian@silverstripe.com>
Date: Sat, 27 Feb 2016 21:00:59 +1300
Subject: [PATCH 25/30] Added 3.2.3-rc2 changelog

---
 docs/en/04_Changelogs/rc/3.2.3-rc2.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/en/04_Changelogs/rc/3.2.3-rc2.md b/docs/en/04_Changelogs/rc/3.2.3-rc2.md
index 8f8a71ed4..6f1e594f9 100644
--- a/docs/en/04_Changelogs/rc/3.2.3-rc2.md
+++ b/docs/en/04_Changelogs/rc/3.2.3-rc2.md
@@ -3,3 +3,7 @@
 <!--- Changes below this line will be automatically regenerated -->
 
 ## Change Log
+
+### Bugfixes
+
+ * 2016-02-26 [c2a0e89](https://github.com/silverstripe/silverstripe-framework/commit/c2a0e8945f6f2bc2ff8bd4013c16195cf6d7b940) undeclared constant issue (Daniel Hensby)

From 29b35c7ccf413cdba373d07f1dd4777913f6d697 Mon Sep 17 00:00:00 2001
From: Nicola Fontana <ntd@entidi.it>
Date: Sun, 28 Feb 2016 21:40:34 +0100
Subject: [PATCH 26/30] Do not hang on nested parameters in search context

Backport of 0b5a57389b09 for 3.2 that does not add a new API, as
required by #5056 to be semver compatible.
---
 admin/code/ModelAdmin.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/admin/code/ModelAdmin.php b/admin/code/ModelAdmin.php
index 3f35a7d2e..59b5e443b 100644
--- a/admin/code/ModelAdmin.php
+++ b/admin/code/ModelAdmin.php
@@ -212,7 +212,10 @@ abstract class ModelAdmin extends LeftAndMain {
 		$params = $this->getRequest()->requestVar('q');
 
 		if(is_array($params)) {
-			$params = array_map('trim', $params);
+			$trimRecursive = function($v) use(&$trimRecursive) {
+				return is_array($v) ? array_map($trimRecursive, $v) : trim($v);
+			};
+			$params = $trimRecursive($params);
 		}
 
 		$list = $context->getResults($params);

From 31e04862a86664fa4bfbc51cbc8d56902e83db4c Mon Sep 17 00:00:00 2001
From: Damian Mooyman <damian@silverstripe.com>
Date: Mon, 29 Feb 2016 14:57:30 +1300
Subject: [PATCH 27/30] Update translations

---
 lang/cs.yml | 2 +-
 lang/fi.yml | 9 +++++++++
 lang/it.yml | 4 ----
 lang/sk.yml | 6 +++---
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/lang/cs.yml b/lang/cs.yml
index 6b0139ef9..33d6be50c 100644
--- a/lang/cs.yml
+++ b/lang/cs.yml
@@ -302,7 +302,7 @@ cs:
     FindInFolder: 'Hledat ve složce'
     IMAGEALT: 'Alternativní text (alt)'
     IMAGEALTTEXT: 'Alternativní text (alt) - bude ukázán, když obrázek nemúže být zobrazen'
-    IMAGEALTTEXTDESC: 'Zobrazeno na obrazovce, když obrázek nemůže být zobrazen'
+    IMAGEALTTEXTDESC: 'Zobrazeno na obrazovce, nebo když obrázek nemůže být zobrazen'
     IMAGEDIMENSIONS: Rozměry
     IMAGEHEIGHTPX: Výška
     IMAGETITLE: 'Titul text (tooltip) - další informace o obrázku'
diff --git a/lang/fi.yml b/lang/fi.yml
index f469275aa..ff929336d 100644
--- a/lang/fi.yml
+++ b/lang/fi.yml
@@ -30,6 +30,7 @@ fi:
     INSERTURL: 'Lisää URL-osoitteesta'
     REMOVEINFO: 'Poista tämä tiedosto tästä kentästä'
     TOTAL: Yhteensä
+    TOUPLOAD: 'Valitse siirrettävät tiedostot...'
     UPLOADINPROGRESS: 'Ole hyvä ja odota... siirto käynnissä'
     UPLOADOR: TAI
   BBCodeParser:
@@ -152,6 +153,7 @@ fi:
     INVALID_REQUEST: 'Pyyntö on virheellinen'
   DropdownField:
     CHOOSE: (Valitse)
+    CHOOSESEARCH: '(Valitse tai Hae)'
     SOURCE_VALIDATION: 'Valitse arvo pudotusvalikosta. {value} ei kelpaa'
   EmailField:
     VALIDATION: 'Anna sähköpostiosoite, ole hyvä.'
@@ -299,12 +301,15 @@ fi:
     FROMWEB: 'Webistä'
     FindInFolder: 'Etsi kansiosta'
     IMAGEALT: 'Vaihtoehtoinen teksti (alt)'
+    IMAGEALTTEXT: 'Vaihtoehtoinen teksti (alt) - näytetään jos kuvaa ei voida näyttää'
+    IMAGEALTTEXTDESC: 'Näytetään ruudunlukuohjelmille tai jos kuvia ei voi näyttää'
     IMAGEDIMENSIONS: Mitat
     IMAGEHEIGHTPX: Korkeus
     IMAGETITLE: 'Otsikko (tooltip) - kuvan lisätietoja varten'
     IMAGETITLETEXT: 'Otsikkoteksti (tooltip)'
     IMAGETITLETEXTDESC: 'Kuvan lisätiedot'
     IMAGEWIDTHPX: Leveys
+    INSERTMEDIA: 'Liitä media'
     LINK: 'Lisää/muokkaa linkki(ä) valittuun tekstiin'
     LINKANCHOR: 'Ankkuroi tähän sivuun'
     LINKDESCR: 'Linkin kuvaus'
@@ -319,6 +324,7 @@ fi:
     URL: URL-osoite
     URLDESCRIPTION: 'Liittääksesi videoita tai kuvia verkosta, lisää tiedoston täydellinen verkko-osoite.<br /><br />Huomioithan, että mikäli alkuperäinen tiedosto häviää alkuperäisestä osoitteesta, tiedosto ei näy enää tällä sivulla.'
     URLNOTANOEMBEDRESOURCE: 'URL-osoitteesta ''{url}'' ei voitu liittää mediaa'
+    UpdateMEDIA: 'Päivitä media'
   Image:
     PLURALNAME: Tiedostot
     SINGULARNAME: Tiedosto
@@ -330,10 +336,13 @@ fi:
   LeftAndMain:
     CANT_REORGANISE: 'Sinulla ei ole oikeuksia mennä ylemmän tason sivuille. Muutoksiasi ei tallennettu.'
     DELETED: Poistettu.
+    DropdownBatchActionsDefault: 'Valitse toiminto...'
     HELP: Ohje
+    PAGETYPE: 'Sivutyyppi'
     PERMAGAIN: 'Olet kirjautunut ulos CMS:stä. Jos haluat kirjautua uudelleen sisään, syötä käyttäjätunnuksesi ja salasanasi alla.'
     PERMALREADY: 'Pahoittelut, mutta et pääse tähän osaan CMS:ää. Jos haluat kirjautua jonain muuna, voit tehdä sen alta.'
     PERMDEFAULT: 'Sinun tulee olla kirjautuneena ylläpito-osioon; syötä tunnuksesi kenttiin.'
+    PLEASESAVE: 'Tallenna sivu: tätä sivua ei voitu päivittää, koska sitä ei ole vielä tallennettu.'
     PreviewButton: Esikatselu
     REORGANISATIONSUCCESSFUL: 'Hakemistopuu uudelleenjärjestettiin onnistuneesti.'
     SAVEDUP: Tallennettu.
diff --git a/lang/it.yml b/lang/it.yml
index b71a4181a..e10283e12 100644
--- a/lang/it.yml
+++ b/lang/it.yml
@@ -299,7 +299,6 @@ it:
     FROMWEB: 'Dal web'
     FindInFolder: 'Trova nella Cartella'
     IMAGEALT: 'Testo alternativo (alt)'
-    IMAGEALTTEXT: 'Testo alternativo (alt) - visualizzato nel caso l''immagine non puo'' essere visualizzata'
     IMAGEDIMENSIONS: Dimensioni
     IMAGEHEIGHTPX: Altezza
     IMAGETITLE: 'Titolo (tooltip) - per informazioni aggiuntive sull''immagine.'
@@ -335,13 +334,10 @@ it:
   LeftAndMain:
     CANT_REORGANISE: 'Non hai i permessi per modificare le pagine di primo livello. Le modifiche non sono state salvate.'
     DELETED: Eliminato.
-    DropdownBatchActionsDefault: 'Scegli un azione...'
     HELP: Aiuto
-    PAGETYPE: 'Tipo di pagina'
     PERMAGAIN: 'Sei stato disconnesso dal CMS. Se desideri autenticarti nuovamente, inserisci qui sotto nome utente e password.'
     PERMALREADY: 'Siamo spiacenti, ma non puoi accedere a questa sezione del CMS. Se desideri autenticarti come qualcun altro, fallo qui sotto.'
     PERMDEFAULT: 'Devi essere autenticato per accedere all''area amministrativa; Per favore inserisci le tue credenziali qui sotto'
-    PLEASESAVE: 'Per favore Salva Pagina: Questa pagina potrebbe non essere aggiornata in quanto non e'' ancora stata salvata.'
     PreviewButton: Anteprima
     REORGANISATIONSUCCESSFUL: 'Albero del sito riorganizzato con successo.'
     SAVEDUP: Salvato.
diff --git a/lang/sk.yml b/lang/sk.yml
index c4b639b69..6dd723391 100644
--- a/lang/sk.yml
+++ b/lang/sk.yml
@@ -301,8 +301,8 @@ sk:
     FROMWEB: 'Z webu'
     FindInFolder: 'Vyhľadať v priečinku'
     IMAGEALT: 'Atlernatívny text (alt)'
-    IMAGEALTTEXT: 'Atlernatívny text (alt) - sa zobrazí, ak nemôže byť zobrazený obrázok'
-    IMAGEALTTEXTDESC: 'Zobrazí sa na obrazovke, keď obrázok nemôže byť zobrazený'
+    IMAGEALTTEXT: 'Atlernatívny text (alt) - sa zobrazí, ak nemôže byť obrázok zobrazený'
+    IMAGEALTTEXTDESC: 'Zobrazí sa na obrazovke, alebo ak obrázok nemôže byť zobrazený'
     IMAGEDIMENSIONS: Rozmery
     IMAGEHEIGHTPX: Výška
     IMAGETITLE: 'Text titulky (tooltip) - pre doplňujúce informácie o obrázku'
@@ -338,7 +338,7 @@ sk:
     DELETED: Zmazané.
     DropdownBatchActionsDefault: 'Vybrať akciu...'
     HELP: Pomoc
-    PAGETYPE: 'Typ stránky'
+    PAGETYPE: 'Typ stránky:'
     PERMAGAIN: 'Boli ste odhlásený'
     PERMALREADY: 'Je nám ľúto, ale k tejto časti CMS nemáte prístup . Ak sa chcete prihlásiť ako niekto iný, urobte tak nižšie.'
     PERMDEFAULT: 'Musíte byť prihlásený/á k prístupu do oblasti administrácie, zadajte vaše prihlasovacie údaje dole, prosím.'

From a20654b49ba7108984dc122eb6f2fcd78da27621 Mon Sep 17 00:00:00 2001
From: Damian Mooyman <damian@silverstripe.com>
Date: Mon, 29 Feb 2016 15:01:55 +1300
Subject: [PATCH 28/30] Update translations

---
 lang/cs.yml | 5 -----
 lang/fi.yml | 4 ++++
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/lang/cs.yml b/lang/cs.yml
index 6b0139ef9..6245a3427 100644
--- a/lang/cs.yml
+++ b/lang/cs.yml
@@ -301,8 +301,6 @@ cs:
     FROMWEB: 'Z webu'
     FindInFolder: 'Hledat ve složce'
     IMAGEALT: 'Alternativní text (alt)'
-    IMAGEALTTEXT: 'Alternativní text (alt) - bude ukázán, když obrázek nemúže být zobrazen'
-    IMAGEALTTEXTDESC: 'Zobrazeno na obrazovce, když obrázek nemůže být zobrazen'
     IMAGEDIMENSIONS: Rozměry
     IMAGEHEIGHTPX: Výška
     IMAGETITLE: 'Titul text (tooltip) - další informace o obrázku'
@@ -336,13 +334,10 @@ cs:
   LeftAndMain:
     CANT_REORGANISE: 'Nemáte oprávnění měnit stránky nejvyšší úrovně. Vaše změna nebyla uložena.'
     DELETED: Smazáno.
-    DropdownBatchActionsDefault: 'Vyberte akci...'
     HELP: Nápověda
-    PAGETYPE: 'Typ stránky'
     PERMAGAIN: 'Byli jste odhlášeni z CMS. Pokud se chcete znovu přihlásit, zadejte níže své uživatelské jméno a heslo.'
     PERMALREADY: 'Omlouvám se, ale nemůžete vstoupit do této části CMS. Pokud se chcete přihlásit jako někdo jiný, udělejte tak níže.'
     PERMDEFAULT: 'Musíte být přihlášen/a k přístup do oblasti administrace, níže zadejte vaše přihlašovací údaje, prosím.'
-    PLEASESAVE: 'Prosím uložte stránku: Tato stránka nemohla být aktualizována, protože ještě nebyla uložena.'
     PreviewButton: Náhled
     REORGANISATIONSUCCESSFUL: 'Strom webu reorganizován úspěšně.'
     SAVEDUP: Uloženo.
diff --git a/lang/fi.yml b/lang/fi.yml
index f469275aa..e44c68f9b 100644
--- a/lang/fi.yml
+++ b/lang/fi.yml
@@ -30,6 +30,7 @@ fi:
     INSERTURL: 'Lisää URL-osoitteesta'
     REMOVEINFO: 'Poista tämä tiedosto tästä kentästä'
     TOTAL: Yhteensä
+    TOUPLOAD: 'Valitse siirrettävät tiedostot...'
     UPLOADINPROGRESS: 'Ole hyvä ja odota... siirto käynnissä'
     UPLOADOR: TAI
   BBCodeParser:
@@ -152,6 +153,7 @@ fi:
     INVALID_REQUEST: 'Pyyntö on virheellinen'
   DropdownField:
     CHOOSE: (Valitse)
+    CHOOSESEARCH: '(Valitse tai Hae)'
     SOURCE_VALIDATION: 'Valitse arvo pudotusvalikosta. {value} ei kelpaa'
   EmailField:
     VALIDATION: 'Anna sähköpostiosoite, ole hyvä.'
@@ -305,6 +307,7 @@ fi:
     IMAGETITLETEXT: 'Otsikkoteksti (tooltip)'
     IMAGETITLETEXTDESC: 'Kuvan lisätiedot'
     IMAGEWIDTHPX: Leveys
+    INSERTMEDIA: 'Liitä media'
     LINK: 'Lisää/muokkaa linkki(ä) valittuun tekstiin'
     LINKANCHOR: 'Ankkuroi tähän sivuun'
     LINKDESCR: 'Linkin kuvaus'
@@ -319,6 +322,7 @@ fi:
     URL: URL-osoite
     URLDESCRIPTION: 'Liittääksesi videoita tai kuvia verkosta, lisää tiedoston täydellinen verkko-osoite.<br /><br />Huomioithan, että mikäli alkuperäinen tiedosto häviää alkuperäisestä osoitteesta, tiedosto ei näy enää tällä sivulla.'
     URLNOTANOEMBEDRESOURCE: 'URL-osoitteesta ''{url}'' ei voitu liittää mediaa'
+    UpdateMEDIA: 'Päivitä media'
   Image:
     PLURALNAME: Tiedostot
     SINGULARNAME: Tiedosto

From 2147205dc155e87c336c7f66063d2b089cff7816 Mon Sep 17 00:00:00 2001
From: Damian Mooyman <damian@silverstripe.com>
Date: Mon, 29 Feb 2016 15:10:05 +1300
Subject: [PATCH 29/30] Added 3.1.18 changelog

---
 docs/en/04_Changelogs/3.1.18.md | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 docs/en/04_Changelogs/3.1.18.md

diff --git a/docs/en/04_Changelogs/3.1.18.md b/docs/en/04_Changelogs/3.1.18.md
new file mode 100644
index 000000000..279c8445a
--- /dev/null
+++ b/docs/en/04_Changelogs/3.1.18.md
@@ -0,0 +1,11 @@
+# 3.1.18
+
+<!--- Changes below this line will be automatically regenerated -->
+
+## Change Log
+
+### Bugfixes
+
+ * 2016-02-26 [bd48d89](https://github.com/silverstripe/silverstripe-framework/commit/bd48d89642a259e0a4c93ab2a686bc45b2ac3bc4) undeclared constant issue (Daniel Hensby)
+ * 2016-02-26 [cc95703](https://github.com/silverstripe/silverstripe-framework/commit/cc95703b18187b3940f02380f8e5667d61345660) Fix regressions in missing CSRF on print button (Damian Mooyman)
+ * 2016-02-25 [3dc0d0e](https://github.com/silverstripe/silverstripe-framework/commit/3dc0d0ee89cba6b780c8770a94490c60a5b52745) Fix regression in gridfield get actions (Damian Mooyman)

From fb582332010873c1ec03f5644263667f615b1f98 Mon Sep 17 00:00:00 2001
From: Damian Mooyman <damian@silverstripe.com>
Date: Mon, 29 Feb 2016 15:23:25 +1300
Subject: [PATCH 30/30] Added 3.3.1 changelog

---
 docs/en/04_Changelogs/3.3.1.md | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 docs/en/04_Changelogs/3.3.1.md

diff --git a/docs/en/04_Changelogs/3.3.1.md b/docs/en/04_Changelogs/3.3.1.md
new file mode 100644
index 000000000..36bd89453
--- /dev/null
+++ b/docs/en/04_Changelogs/3.3.1.md
@@ -0,0 +1,11 @@
+# 3.3.1
+
+<!--- Changes below this line will be automatically regenerated -->
+
+## Change Log
+
+### Bugfixes
+
+ * 2016-02-26 [b7b1aba](https://github.com/silverstripe/silverstripe-framework/commit/b7b1aba3fbc56a87c95beefb50051f4d40e00443) undeclared constant issue (Daniel Hensby)
+ * 2016-02-26 [0840f5d](https://github.com/silverstripe/silverstripe-framework/commit/0840f5d0212f517f50aaa64412dbf817e1fdc2cb) Fix regressions in missing CSRF on print button (Damian Mooyman)
+ * 2016-02-25 [2c1b934](https://github.com/silverstripe/silverstripe-framework/commit/2c1b934ba225101cf02950a461b012463b7b62de) Fix regression in gridfield get actions (Damian Mooyman)