Merge 3.4 into 3

admin/code/LeftAndMain.php

@@ -1499,6 +1499,9 @@ class LeftAndMain extends Controller implements PermissionProvider {
 	public function currentPageID() {
 		if($this->getRequest()->requestVar('ID') && is_numeric($this->getRequest()->requestVar('ID')))	{
 			return $this->getRequest()->requestVar('ID');
+		} elseif ($this->getRequest()->requestVar('CMSMainCurrentPageID') && is_numeric($this->getRequest()->requestVar('CMSMainCurrentPageID'))) {
+			// see GridFieldDetailForm::ItemEditForm
+			return $this->getRequest()->requestVar('CMSMainCurrentPageID');
 		} elseif (isset($this->urlParams['ID']) && is_numeric($this->urlParams['ID'])) {
 			return $this->urlParams['ID'];
 		} elseif(Session::get($this->sessionNamespace() . ".currentPage")) {

admin/javascript/lang/fa_IR.js

@@ -6,25 +6,25 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
   }
 } else {
   ss.i18n.addDictionary('fa_IR', {
-    "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_ARCHIVE_PROMPT": "شما {num} صفحه(صفحه‌ها) را انتخاب کرده‌اید.\n\n\nآیا از این‌که می‌خواهید بایگانی شوند اطمینان دارید؟\n\nتمامی این صفحات و تمامی صفحات فرزند آن‌ها عدم انتشار می‌شوند و به بایگانی ارسال می‌گردند.",
-    "CMSMAIN.BATCH_DELETELIVE_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to delete these pages from live?",
+    "CMSMAIN.BATCH_DELETELIVE_PROMPT": "شما {num} صفحه(صفحه‌ها) را انتخاب کرده‌اید.\n\nآیا واقعاً می‌خواهید آن‌ها از لایو را حذف نمایید؟",
-    "CMSMAIN.BATCH_DELETE_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to delete?",
+    "CMSMAIN.BATCH_DELETE_PROMPT": "شما {num} صفحه(صفحه‌ها) را انتخاب کرده‌اید.\n\nآیا واقعاً می‌خواهید آن‌ها را حذف نمایید؟",
-    "CMSMAIN.BATCH_PUBLISH_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to publish?",
+    "CMSMAIN.BATCH_PUBLISH_PROMPT": "شما {num} صفحه(صفحه‌ها) را انتخاب کرده‌اید.\n\nآیا واقعاً می‌خواهید آن‌ها را منتشر نمایید؟",
     "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_UNPUBLISH_PROMPT": "شما {num} صفحه را انتخاب کرده‌اید.\n\nآیا واقعاً می‌خواهید انتشار آن‌ها را لغو نمایید",
     "CMSMAIN.SELECTONEPAGE": "لطفاً حداقل ۱ صفحه را انتخاب نمایید.",
-    "Campaigns.ADDCAMPAIGN": "Add campaign",
+    "Campaigns.ADDCAMPAIGN": "افزودن کمپین",
-    "Campaigns.ITEM_SUMMARY_PLURAL": "%s items",
+    "Campaigns.ITEM_SUMMARY_PLURAL": "%s آیتم",
-    "Campaigns.ITEM_SUMMARY_SINGULAR": "%s item",
+    "Campaigns.ITEM_SUMMARY_SINGULAR": "%s آیتم",
-    "Campaigns.PUBLISHCAMPAIGN": "Publish campaign",
+    "Campaigns.PUBLISHCAMPAIGN": "انتشار کمپین",
-    "Campaigns.REVERTCAMPAIGN": "Revert",
+    "Campaigns.REVERTCAMPAIGN": "بازگرداندن",
     "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.",
+    "LeftAndMain.CONFIRMUNSAVEDSHORT": "هشدار: تغییرات شما ذخیره نشده‌اند.",
-    "LeftAndMain.PAGEWASDELETED": "This page was deleted.  To edit a page, select it from the left.",
+    "LeftAndMain.PAGEWASDELETED": "این صفحه حذف شده است. برای ویرایش یک صفحه، آن‌را از لیست چپ انتخاب نمایید.",
     "ModelAdmin.DELETED": "حذف شده",
-    "ModelAdmin.REALLYDELETE": "Do you really want to delete?",
+    "ModelAdmin.REALLYDELETE": "آیا واقعاً می‌خواهید حذف نمایید؟",
     "ModelAdmin.SAVED": "ذخیره شده",
     "ModelAdmin.VALIDATIONERROR": "خطای اعتبار‌سنجی",
-    "SecurityAdmin.BATCHACTIONSDELETECONFIRM": "Do you really want to delete %s groups?"
+    "SecurityAdmin.BATCHACTIONSDELETECONFIRM": "آیا واقعاً می‌خواهید %s گروه را حذف نمایید؟"
 });
 }

admin/javascript/lang/it.js

@@ -13,11 +13,11 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
     "CMSMAIN.BATCH_RESTORE_PROMPT": "Hai selezionato {num} pagina(e).\n\nSei sicuri di volerle ripristinare?\n\nI figli delle pagine archiviate saranno ripristinati nel primo livello, a meno anche i genitori non vengano ripristinati.",
     "CMSMAIN.BATCH_UNPUBLISH_PROMPT": "Hai {num} pagine selezionate.\n\nVuoi veramente nasconderle?",
     "CMSMAIN.SELECTONEPAGE": "Per favore selezionare almeno una pagina",
-    "Campaigns.ADDCAMPAIGN": "Add campaign",
+    "Campaigns.ADDCAMPAIGN": "Aggiungi campagna",
-    "Campaigns.ITEM_SUMMARY_PLURAL": "%s items",
+    "Campaigns.ITEM_SUMMARY_PLURAL": "%s elementi",
-    "Campaigns.ITEM_SUMMARY_SINGULAR": "%s item",
+    "Campaigns.ITEM_SUMMARY_SINGULAR": "%s elemento",
-    "Campaigns.PUBLISHCAMPAIGN": "Publish campaign",
+    "Campaigns.PUBLISHCAMPAIGN": "Pubblica campagna",
-    "Campaigns.REVERTCAMPAIGN": "Revert",
+    "Campaigns.REVERTCAMPAIGN": "Ripristina",
     "LeftAndMain.CONFIRMUNSAVED": "Siete sicuri di voler uscire da questa pagina?\n\nATTENZIONE: I vostri cambiamenti non sono stati salvati.\n\nCliccare OK per continuare, o su Annulla per rimanere sulla pagina corrente.",
     "LeftAndMain.CONFIRMUNSAVEDSHORT": "ATTENZIONE: le tue modifiche non sono state salvate.",
     "LeftAndMain.PAGEWASDELETED": "Questa pagina è stata eliminata. Per modificare questa pagine, selezionarla a sinistra.",

admin/javascript/lang/sl_SI.js

@@ -0,0 +1,30 @@
+// This file was generated by silverstripe/cow from admin/javascript/lang/src/sl_SI.js.
+// See https://github.com/tractorcow/cow for details
+if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
+  if (typeof(console) !== 'undefined') { // eslint-disable-line no-console
+    console.error('Class ss.i18n not defined');  // eslint-disable-line no-console
+  }
+} else {
+  ss.i18n.addDictionary('sl_SI', {
+    "CMSMAIN.BATCH_ARCHIVE_PROMPT": "Izbrano število strani: {num}\n\nSte prepričani, da želite arhivirati te strani?\n\nTe strani in vse ostale podstrani bodo odstranjene iz objave in premaknjene v arhiv.",
+    "CMSMAIN.BATCH_DELETELIVE_PROMPT": "Izbrali ste {num} strani.\n\nAli ste prepričani, da želite izbrisati te strani iz objave?",
+    "CMSMAIN.BATCH_DELETE_PROMPT": "Izbrali ste {num} strani.\n\nAli ste prepričani, da jih želite izbrisati?",
+    "CMSMAIN.BATCH_PUBLISH_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to publish?",
+    "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_UNPUBLISH_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to unpublish",
+    "CMSMAIN.SELECTONEPAGE": "Prosimo izberite vsaj eno stran",
+    "Campaigns.ADDCAMPAIGN": "Dodaj kampanjo",
+    "Campaigns.ITEM_SUMMARY_PLURAL": "% predmetov",
+    "Campaigns.ITEM_SUMMARY_SINGULAR": "%s predmet",
+    "Campaigns.PUBLISHCAMPAIGN": "Objavi kampanjo",
+    "Campaigns.REVERTCAMPAIGN": "Povrni",
+    "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": "POZOR: Spremembe niso bile shranjene.",
+    "LeftAndMain.PAGEWASDELETED": "Ta stran je bila izbrisana. Če želite urediti stran, jo najprej izberite na levi strani.",
+    "ModelAdmin.DELETED": "Izbrisano",
+    "ModelAdmin.REALLYDELETE": "Ste prepričani, da želite izbrisati?",
+    "ModelAdmin.SAVED": "Shranjeno",
+    "ModelAdmin.VALIDATIONERROR": "Napaka pri validaciji",
+    "SecurityAdmin.BATCHACTIONSDELETECONFIRM": "Ste prepričani, da želite pobrisati grupe: %s ?"
+});
+}

admin/javascript/lang/src/fa_IR.js

@@ -1,22 +1,22 @@
 {
-    "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_ARCHIVE_PROMPT": "شما {num} صفحه(صفحه‌ها) را انتخاب کرده‌اید.\n\n\nآیا از این‌که می‌خواهید بایگانی شوند اطمینان دارید؟\n\nتمامی این صفحات و تمامی صفحات فرزند آن‌ها عدم انتشار می‌شوند و به بایگانی ارسال می‌گردند.",
-    "CMSMAIN.BATCH_DELETELIVE_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to delete these pages from live?",
+    "CMSMAIN.BATCH_DELETELIVE_PROMPT": "شما {num} صفحه(صفحه‌ها) را انتخاب کرده‌اید.\n\nآیا واقعاً می‌خواهید آن‌ها از لایو را حذف نمایید؟",
-    "CMSMAIN.BATCH_DELETE_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to delete?",
+    "CMSMAIN.BATCH_DELETE_PROMPT": "شما {num} صفحه(صفحه‌ها) را انتخاب کرده‌اید.\n\nآیا واقعاً می‌خواهید آن‌ها را حذف نمایید؟",
-    "CMSMAIN.BATCH_PUBLISH_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to publish?",
+    "CMSMAIN.BATCH_PUBLISH_PROMPT": "شما {num} صفحه(صفحه‌ها) را انتخاب کرده‌اید.\n\nآیا واقعاً می‌خواهید آن‌ها را منتشر نمایید؟",
     "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_UNPUBLISH_PROMPT": "شما {num} صفحه را انتخاب کرده‌اید.\n\nآیا واقعاً می‌خواهید انتشار آن‌ها را لغو نمایید",
     "CMSMAIN.SELECTONEPAGE": "لطفاً حداقل ۱ صفحه را انتخاب نمایید.",
-    "Campaigns.ADDCAMPAIGN": "Add campaign",
+    "Campaigns.ADDCAMPAIGN": "افزودن کمپین",
-    "Campaigns.ITEM_SUMMARY_PLURAL": "%s items",
+    "Campaigns.ITEM_SUMMARY_PLURAL": "%s آیتم",
-    "Campaigns.ITEM_SUMMARY_SINGULAR": "%s item",
+    "Campaigns.ITEM_SUMMARY_SINGULAR": "%s آیتم",
-    "Campaigns.PUBLISHCAMPAIGN": "Publish campaign",
+    "Campaigns.PUBLISHCAMPAIGN": "انتشار کمپین",
-    "Campaigns.REVERTCAMPAIGN": "Revert",
+    "Campaigns.REVERTCAMPAIGN": "بازگرداندن",
     "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.",
+    "LeftAndMain.CONFIRMUNSAVEDSHORT": "هشدار: تغییرات شما ذخیره نشده‌اند.",
-    "LeftAndMain.PAGEWASDELETED": "This page was deleted.  To edit a page, select it from the left.",
+    "LeftAndMain.PAGEWASDELETED": "این صفحه حذف شده است. برای ویرایش یک صفحه، آن‌را از لیست چپ انتخاب نمایید.",
     "ModelAdmin.DELETED": "حذف شده",
-    "ModelAdmin.REALLYDELETE": "Do you really want to delete?",
+    "ModelAdmin.REALLYDELETE": "آیا واقعاً می‌خواهید حذف نمایید؟",
     "ModelAdmin.SAVED": "ذخیره شده",
     "ModelAdmin.VALIDATIONERROR": "خطای اعتبار‌سنجی",
-    "SecurityAdmin.BATCHACTIONSDELETECONFIRM": "Do you really want to delete %s groups?"
+    "SecurityAdmin.BATCHACTIONSDELETECONFIRM": "آیا واقعاً می‌خواهید %s گروه را حذف نمایید؟"
 }

admin/javascript/lang/src/it.js

@@ -6,11 +6,11 @@
     "CMSMAIN.BATCH_RESTORE_PROMPT": "Hai selezionato {num} pagina(e).\n\nSei sicuri di volerle ripristinare?\n\nI figli delle pagine archiviate saranno ripristinati nel primo livello, a meno anche i genitori non vengano ripristinati.",
     "CMSMAIN.BATCH_UNPUBLISH_PROMPT": "Hai {num} pagine selezionate.\n\nVuoi veramente nasconderle?",
     "CMSMAIN.SELECTONEPAGE": "Per favore selezionare almeno una pagina",
-    "Campaigns.ADDCAMPAIGN": "Add campaign",
+    "Campaigns.ADDCAMPAIGN": "Aggiungi campagna",
-    "Campaigns.ITEM_SUMMARY_PLURAL": "%s items",
+    "Campaigns.ITEM_SUMMARY_PLURAL": "%s elementi",
-    "Campaigns.ITEM_SUMMARY_SINGULAR": "%s item",
+    "Campaigns.ITEM_SUMMARY_SINGULAR": "%s elemento",
-    "Campaigns.PUBLISHCAMPAIGN": "Publish campaign",
+    "Campaigns.PUBLISHCAMPAIGN": "Pubblica campagna",
-    "Campaigns.REVERTCAMPAIGN": "Revert",
+    "Campaigns.REVERTCAMPAIGN": "Ripristina",
     "LeftAndMain.CONFIRMUNSAVED": "Siete sicuri di voler uscire da questa pagina?\n\nATTENZIONE: I vostri cambiamenti non sono stati salvati.\n\nCliccare OK per continuare, o su Annulla per rimanere sulla pagina corrente.",
     "LeftAndMain.CONFIRMUNSAVEDSHORT": "ATTENZIONE: le tue modifiche non sono state salvate.",
     "LeftAndMain.PAGEWASDELETED": "Questa pagina è stata eliminata. Per modificare questa pagine, selezionarla a sinistra.",

admin/javascript/lang/src/sl_SI.js

@@ -0,0 +1,22 @@
+{
+    "CMSMAIN.BATCH_ARCHIVE_PROMPT": "Izbrano število strani: {num}\n\nSte prepričani, da želite arhivirati te strani?\n\nTe strani in vse ostale podstrani bodo odstranjene iz objave in premaknjene v arhiv.",
+    "CMSMAIN.BATCH_DELETELIVE_PROMPT": "Izbrali ste {num} strani.\n\nAli ste prepričani, da želite izbrisati te strani iz objave?",
+    "CMSMAIN.BATCH_DELETE_PROMPT": "Izbrali ste {num} strani.\n\nAli ste prepričani, da jih želite izbrisati?",
+    "CMSMAIN.BATCH_PUBLISH_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to publish?",
+    "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_UNPUBLISH_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to unpublish",
+    "CMSMAIN.SELECTONEPAGE": "Prosimo izberite vsaj eno stran",
+    "Campaigns.ADDCAMPAIGN": "Dodaj kampanjo",
+    "Campaigns.ITEM_SUMMARY_PLURAL": "% predmetov",
+    "Campaigns.ITEM_SUMMARY_SINGULAR": "%s predmet",
+    "Campaigns.PUBLISHCAMPAIGN": "Objavi kampanjo",
+    "Campaigns.REVERTCAMPAIGN": "Povrni",
+    "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": "POZOR: Spremembe niso bile shranjene.",
+    "LeftAndMain.PAGEWASDELETED": "Ta stran je bila izbrisana. Če želite urediti stran, jo najprej izberite na levi strani.",
+    "ModelAdmin.DELETED": "Izbrisano",
+    "ModelAdmin.REALLYDELETE": "Ste prepričani, da želite izbrisati?",
+    "ModelAdmin.SAVED": "Shranjeno",
+    "ModelAdmin.VALIDATIONERROR": "Napaka pri validaciji",
+    "SecurityAdmin.BATCHACTIONSDELETECONFIRM": "Ste prepričani, da želite pobrisati grupe: %s ?"
+}

core/Config.php

@@ -911,6 +911,7 @@ class Config_ForClass {
 
 	/**
 	 * @param string $name
+	 * @return mixed
 	 */
 	public function __get($name) {
 		return Config::inst()->get($this->class, $name);
@@ -924,6 +925,16 @@ class Config_ForClass {
 		return Config::inst()->update($this->class, $name, $val);
 	}
 
+	/**
+	 * @param string $name
+	 * @return bool
+	 */
+	public function __isset($name)
+	{
+		$val = $this->__get($name);
+		return isset($val);
+	}
+
 	/**
 	 * @param string $name
 	 * @param int $sourceOptions

dev/install/MySQLDatabaseConfigurationHelper.php

@@ -172,8 +172,10 @@ class MySQLDatabaseConfigurationHelper implements DatabaseConfigurationHelper {
 		if(!$this->checkValidDatabaseName($database)) return false;
 
 		// Escape all valid database patterns (permission must exist on all tables)
+		$sqlDatabase = addcslashes($database, '_%'); // See http://dev.mysql.com/doc/refman/5.7/en/string-literals.html
 		$dbPattern = sprintf(
-			'((%s)|(%s)|(%s))',
+			'((%s)|(%s)|(%s)|(%s))',
+			preg_quote("\"$sqlDatabase\".*"), // Regexp escape sql-escaped db identifier
 			preg_quote("\"$database\".*"),
 			preg_quote('"%".*'),
 			preg_quote('*.*')

docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/05_Typography.md

@@ -11,6 +11,11 @@ SilverStripe lets you customise the style of content in the CMS. This is done by
 
 Will load the `mysite/css/editor.css` file.
 
+If using this config option in `mysite/_config.php`, you will have to instead call:
+
+	:::php
+	HtmlEditorConfig::get('cms')->setOption('content_css', project() . '/css/editor.css');
+
 Any CSS classes within this file will be automatically added to the `WYSIWYG` editors 'style' dropdown. For instance, to
 add the color 'red' as an option within the `WYSIWYG` add the following to the `editor.css`
 

docs/en/04_Changelogs/rc/3.1.20-rc1.md

@@ -0,0 +1,13 @@
+# 3.1.20-rc1
+
+<!--- Changes below this line will be automatically regenerated -->
+
+## Change Log
+
+### Bugfixes
+
+ * 2016-05-20 [8382685](https://github.com/silverstripe/silverstripe-framework/commit/83826850346bc486bc4599dca56067897961cbfa) #5557 Tests with no DB requirements wont create test DB (Daniel Hensby)
+ * 2016-05-18 [62bd26d](https://github.com/silverstripe/silverstripe-framework/commit/62bd26d11ab9c9bf5b91ba8abb776ab3a4813a18) Fix suppression of display_errors in ErrorControlChain (Damian Mooyman)
+ * 2016-05-10 [3738d88](https://github.com/silverstripe/silverstripe-framework/commit/3738d888e0fbce48e0d88735edd3455a116937b5) Empty FROM clause (Daniel Hensby)
+ * 2016-05-05 [cc7a2ae](https://github.com/silverstripe/silverstripe-installer/commit/cc7a2aeb1e03f3f8db67a1ca547280b05dd9372a) Add framework/admin tests (#118) (Daniel Hensby)
+ * 2015-04-21 [a7100e9](https://github.com/silverstripe/silverstripe-framework/commit/a7100e9006b27e7885eb2ce851d9bc0839ca4468) Object::parse_class_spec failed to parse associative arrays (Loz Calver)

docs/en/04_Changelogs/rc/3.2.5-rc1.md

@@ -0,0 +1,21 @@
+# 3.2.5-rc1
+
+<!--- Changes below this line will be automatically regenerated -->
+
+## Change Log
+
+### Bugfixes
+
+ * 2016-07-07 [4aa1fc2](https://github.com/silverstripe/silverstripe-framework/commit/4aa1fc2d2cafd1c90401896cefb03e64b530a59c) Changed form fields that call renderWith in Field() to call parent::Field() instead (#5783) (Ed Chipman)
+ * 2016-07-07 [27cea80](https://github.com/silverstripe/silverstripe-framework/commit/27cea80b15a986d43b832658b13d01c08a5cfce1) SS_ConfigStaticManifest_Parser failed to handle ::class syntax (fixes #5701) (#5781) (Loz Calver)
+ * 2016-07-01 [39238d9](https://github.com/silverstripe/silverstripe-framework/commit/39238d908e0ed077d7aaf773562749468b6827ee) falsey attribute values in shortcodes now work (Daniel Hensby)
+ * 2016-06-30 [2cdfe6c](https://github.com/silverstripe/silverstripe-framework/commit/2cdfe6cc21f0cb253401fa169b5e1c3bb8738d43) Use RAW for DBField template helpers (Daniel Hensby)
+ * 2016-06-30 [b0f237b](https://github.com/silverstripe/silverstripe-framework/commit/b0f237bb3a336eea9f3a9f9bece2b65661c03cbc) Use RAW instead of Value for parsing shortcodes (Daniel Hensby)
+ * 2016-05-31 [eba89b9](https://github.com/silverstripe/silverstripe-cms/commit/eba89b9520a0103e4c0cb4b6730c3c0742f8b0d9) OldPageRedirector no longer loops infinitely if 404 thrown on existing page (Daniel Hensby)
+ * 2016-05-31 [341f49c](https://github.com/silverstripe/silverstripe-framework/commit/341f49c630c23ee665c195250c19935763172e36) Fixed lookup of next closest visible field for focus restoring (fixes #5618) (UndefinedOffset)
+ * 2016-05-20 [8382685](https://github.com/silverstripe/silverstripe-framework/commit/83826850346bc486bc4599dca56067897961cbfa) #5557 Tests with no DB requirements wont create test DB (Daniel Hensby)
+ * 2016-05-18 [62bd26d](https://github.com/silverstripe/silverstripe-framework/commit/62bd26d11ab9c9bf5b91ba8abb776ab3a4813a18) Fix suppression of display_errors in ErrorControlChain (Damian Mooyman)
+ * 2016-05-10 [3738d88](https://github.com/silverstripe/silverstripe-framework/commit/3738d888e0fbce48e0d88735edd3455a116937b5) Empty FROM clause (Daniel Hensby)
+ * 2016-05-05 [cc7a2ae](https://github.com/silverstripe/silverstripe-installer/commit/cc7a2aeb1e03f3f8db67a1ca547280b05dd9372a) Add framework/admin tests (#118) (Daniel Hensby)
+ * 2016-04-19 [43dcde5](https://github.com/silverstripe/silverstripe-framework/commit/43dcde5197e0995225235f69937ed57bec0cd7e2) Hierarchy was incorrectly unexpanding nodes that had been previously expanded (madmatt)
+ * 2015-04-21 [a7100e9](https://github.com/silverstripe/silverstripe-framework/commit/a7100e9006b27e7885eb2ce851d9bc0839ca4468) Object::parse_class_spec failed to parse associative arrays (Loz Calver)

docs/en/04_Changelogs/rc/3.3.3-rc1.md

@@ -0,0 +1,38 @@
+# 3.3.3-rc1
+
+<!--- Changes below this line will be automatically regenerated -->
+
+## Change Log
+
+### Bugfixes
+
+ * 2016-08-02 [cd80d50](https://github.com/silverstripe/silverstripe-framework/commit/cd80d501f9eb12d9aca3e65f742041b142ee659f) Fix unset config options returning isset() = true (Damian Mooyman)
+ * 2016-07-25 [3306deb](https://github.com/silverstripe/silverstripe-cms/commit/3306deb69b88473efac009f46a90cbaa6bb27351) Fix link concatenation in SilverStripeNavigator (#1560) (Damian Mooyman)
+ * 2016-07-20 [319d6d2](https://github.com/silverstripe/silverstripe-framework/commit/319d6d293e873d989c55473a0aa7ae1679010474) Fix doclink (#5827) (Damian Mooyman)
+ * 2016-07-19 [10e06dc](https://github.com/silverstripe/silverstripe-cms/commit/10e06dce507c6f9b3588e4f8669ce36ee843f79e) Fixes #1054 By preventing errors in the CMS _only_. (Russell Michell)
+ * 2016-07-15 [b3fea37](https://github.com/silverstripe/silverstripe-framework/commit/b3fea3723fae822068a6b761a682011b0970fff5) Fixes support for "inline" form actions (fixes #2534) (Loz Calver)
+ * 2016-07-12 [24efc7e](https://github.com/silverstripe/silverstripe-framework/commit/24efc7edf83bb06b5a01080d2742c07ef68d21b2) Fix sorting ArrayList with sql-like syntax (Damian Mooyman)
+ * 2016-07-12 [8123c43](https://github.com/silverstripe/silverstripe-cms/commit/8123c433f01ca1ce59062e45ad90bac13be1e990) Fix getAbsoluteLiveLink() concatenation (Damian Mooyman)
+ * 2016-07-12 [87477a1](https://github.com/silverstripe-labs/silverstripe-reports/commit/87477a1e01d03ebee7eb71c352b3da47da73a9f2) Fix incorrect url manipulation (Damian Mooyman)
+ * 2016-07-07 [4aa1fc2](https://github.com/silverstripe/silverstripe-framework/commit/4aa1fc2d2cafd1c90401896cefb03e64b530a59c) Changed form fields that call renderWith in Field() to call parent::Field() instead (#5783) (Ed Chipman)
+ * 2016-07-07 [27cea80](https://github.com/silverstripe/silverstripe-framework/commit/27cea80b15a986d43b832658b13d01c08a5cfce1) SS_ConfigStaticManifest_Parser failed to handle ::class syntax (fixes #5701) (#5781) (Loz Calver)
+ * 2016-07-01 [39238d9](https://github.com/silverstripe/silverstripe-framework/commit/39238d908e0ed077d7aaf773562749468b6827ee) falsey attribute values in shortcodes now work (Daniel Hensby)
+ * 2016-06-30 [2cdfe6c](https://github.com/silverstripe/silverstripe-framework/commit/2cdfe6cc21f0cb253401fa169b5e1c3bb8738d43) Use RAW for DBField template helpers (Daniel Hensby)
+ * 2016-06-30 [b0f237b](https://github.com/silverstripe/silverstripe-framework/commit/b0f237bb3a336eea9f3a9f9bece2b65661c03cbc) Use RAW instead of Value for parsing shortcodes (Daniel Hensby)
+ * 2016-06-13 [f0d4951](https://github.com/silverstripe/silverstripe-framework/commit/f0d49518152bb9743e32174bc870fac6951c161d) for #5683: Address security warning in CMS when attempting to access &lt;iframe&gt; contents (Back-porting fix from PR #5163) (Patrick Nelson)
+ * 2016-06-08 [bf00810](https://github.com/silverstripe/silverstripe-framework/commit/bf00810e1f5a7164d74ad66f3d03e813d81dfa25) Fix buttonClicked() error (Damian Mooyman)
+ * 2016-05-31 [eba89b9](https://github.com/silverstripe/silverstripe-cms/commit/eba89b9520a0103e4c0cb4b6730c3c0742f8b0d9) OldPageRedirector no longer loops infinitely if 404 thrown on existing page (Daniel Hensby)
+ * 2016-05-31 [341f49c](https://github.com/silverstripe/silverstripe-framework/commit/341f49c630c23ee665c195250c19935763172e36) Fixed lookup of next closest visible field for focus restoring (fixes #5618) (UndefinedOffset)
+ * 2016-05-27 [f1a0aef](https://github.com/silverstripe/silverstripe-framework/commit/f1a0aef0d7e18b921b53a381ff8489bc5c12740b) fix CMS_ACCESS permission being ignored if in incorrect order in array (Damian Mooyman)
+ * 2016-05-21 [decd7e5](https://github.com/silverstripe/silverstripe-framework/commit/decd7e5c57a0839cb873c86782a870326ffa175a) Fix getFinalisedQuery not including all queried columns (Damian Mooyman)
+ * 2016-05-20 [8382685](https://github.com/silverstripe/silverstripe-framework/commit/83826850346bc486bc4599dca56067897961cbfa) #5557 Tests with no DB requirements wont create test DB (Daniel Hensby)
+ * 2016-05-18 [62bd26d](https://github.com/silverstripe/silverstripe-framework/commit/62bd26d11ab9c9bf5b91ba8abb776ab3a4813a18) Fix suppression of display_errors in ErrorControlChain (Damian Mooyman)
+ * 2016-05-16 [79d0590](https://github.com/silverstripe/silverstripe-framework/commit/79d05906286698e7cf7274703088a47c54b106f2) Fix singleton('DBLocale') (Damian Mooyman)
+ * 2016-05-10 [3738d88](https://github.com/silverstripe/silverstripe-framework/commit/3738d888e0fbce48e0d88735edd3455a116937b5) Empty FROM clause (Daniel Hensby)
+ * 2016-05-10 [d1df67d](https://github.com/silverstripe/silverstripe-framework/commit/d1df67d3089a51c0db63fbaed869738453bee482) SQLSelect count methods now cast to int (fixes #5498) (Loz Calver)
+ * 2016-05-05 [cc7a2ae](https://github.com/silverstripe/silverstripe-installer/commit/cc7a2aeb1e03f3f8db67a1ca547280b05dd9372a) Add framework/admin tests (#118) (Daniel Hensby)
+ * 2016-05-02 [096f30e](https://github.com/silverstripe/silverstripe-framework/commit/096f30ebe5ff6446a399abc92813a6ff2d02e04e) Fix GridFieldAddExistingAutocompleter (Damian Mooyman)
+ * 2016-04-28 [6934083](https://github.com/silverstripe/silverstripe-framework/commit/693408330bdd235b92690912ad36ba8adbebdbef) for #5410 to help focus errors occurring on tabs within GridField controlled DataObjects (et al). (Patrick Nelson)
+ * 2016-04-19 [43dcde5](https://github.com/silverstripe/silverstripe-framework/commit/43dcde5197e0995225235f69937ed57bec0cd7e2) Hierarchy was incorrectly unexpanding nodes that had been previously expanded (madmatt)
+ * 2016-01-22 [4bd66b9](https://github.com/silverstripe/silverstripe-framework/commit/4bd66b9d3693492806bb4e9a512f8ae623c6a306) for #4909: Ensure RSSFeed_Entry is instantiated using the injector. (Patrick Nelson)
+ * 2015-04-21 [a7100e9](https://github.com/silverstripe/silverstripe-framework/commit/a7100e9006b27e7885eb2ce851d9bc0839ca4468) Object::parse_class_spec failed to parse associative arrays (Loz Calver)

docs/en/04_Changelogs/rc/3.4.1-rc1.md

@@ -0,0 +1,38 @@
+# 3.4.1-rc1
+
+<!--- Changes below this line will be automatically regenerated -->
+
+## Change Log
+
+### Bugfixes
+
+ * 2016-08-02 [cd80d50](https://github.com/silverstripe/silverstripe-framework/commit/cd80d501f9eb12d9aca3e65f742041b142ee659f) Fix unset config options returning isset() = true (Damian Mooyman)
+ * 2016-08-01 [7d0b8e6](https://github.com/silverstripe/silverstripe-framework/commit/7d0b8e6520a246bd20204613233a0a6ad0f19437) Fix permission checking code not correctly handling escaped SQL identifiers (Damian Mooyman)
+ * 2016-07-28 [6c37532](https://github.com/silverstripe/silverstripe-framework/commit/6c37532a7ae4877fe1eaff45f41ff9902d5cccee) Gridfield delete action back link (#5848) (Jono Menz)
+ * 2016-07-28 [c965133](https://github.com/silverstripe/silverstripe-cms/commit/c965133da03941fc736384d17518dc37be3d0e07) Direct edit file by URL (Jonathon Menz)
+ * 2016-07-25 [3306deb](https://github.com/silverstripe/silverstripe-cms/commit/3306deb69b88473efac009f46a90cbaa6bb27351) Fix link concatenation in SilverStripeNavigator (#1560) (Damian Mooyman)
+ * 2016-07-25 [9c7c7f6](https://github.com/silverstripe/silverstripe-framework/commit/9c7c7f6aa945ce5eeea3468bca59e5496e765016) Fix regression in missing require_js from #4259 (Damian Mooyman)
+ * 2016-07-22 [82e5431](https://github.com/silverstripe/silverstripe-cms/commit/82e54314bf2d26a5eb233018f472e248e44dc1ba) do not show HiddenClass pages in allowed children (#1555) (Robbie Averill)
+ * 2016-07-20 [319d6d2](https://github.com/silverstripe/silverstripe-framework/commit/319d6d293e873d989c55473a0aa7ae1679010474) Fix doclink (#5827) (Damian Mooyman)
+ * 2016-07-19 [10e06dc](https://github.com/silverstripe/silverstripe-cms/commit/10e06dce507c6f9b3588e4f8669ce36ee843f79e) Fixes #1054 By preventing errors in the CMS _only_. (Russell Michell)
+ * 2016-07-15 [b3fea37](https://github.com/silverstripe/silverstripe-framework/commit/b3fea3723fae822068a6b761a682011b0970fff5) Fixes support for "inline" form actions (fixes #2534) (Loz Calver)
+ * 2016-07-12 [24efc7e](https://github.com/silverstripe/silverstripe-framework/commit/24efc7edf83bb06b5a01080d2742c07ef68d21b2) Fix sorting ArrayList with sql-like syntax (Damian Mooyman)
+ * 2016-07-12 [8123c43](https://github.com/silverstripe/silverstripe-cms/commit/8123c433f01ca1ce59062e45ad90bac13be1e990) Fix getAbsoluteLiveLink() concatenation (Damian Mooyman)
+ * 2016-07-12 [87477a1](https://github.com/silverstripe-labs/silverstripe-reports/commit/87477a1e01d03ebee7eb71c352b3da47da73a9f2) Fix incorrect url manipulation (Damian Mooyman)
+ * 2016-07-07 [4aa1fc2](https://github.com/silverstripe/silverstripe-framework/commit/4aa1fc2d2cafd1c90401896cefb03e64b530a59c) Changed form fields that call renderWith in Field() to call parent::Field() instead (#5783) (Ed Chipman)
+ * 2016-07-07 [27cea80](https://github.com/silverstripe/silverstripe-framework/commit/27cea80b15a986d43b832658b13d01c08a5cfce1) SS_ConfigStaticManifest_Parser failed to handle ::class syntax (fixes #5701) (#5781) (Loz Calver)
+ * 2016-07-04 [0b7dab3](https://github.com/silverstripe/silverstripe-framework/commit/0b7dab3f66d64a4415b436b4301d4608b01b0597) Fix missing icons (Damian Mooyman)
+ * 2016-07-01 [39238d9](https://github.com/silverstripe/silverstripe-framework/commit/39238d908e0ed077d7aaf773562749468b6827ee) falsey attribute values in shortcodes now work (Daniel Hensby)
+ * 2016-06-30 [2cdfe6c](https://github.com/silverstripe/silverstripe-framework/commit/2cdfe6cc21f0cb253401fa169b5e1c3bb8738d43) Use RAW for DBField template helpers (Daniel Hensby)
+ * 2016-06-30 [b0f237b](https://github.com/silverstripe/silverstripe-framework/commit/b0f237bb3a336eea9f3a9f9bece2b65661c03cbc) Use RAW instead of Value for parsing shortcodes (Daniel Hensby)
+ * 2016-06-13 [f0d4951](https://github.com/silverstripe/silverstripe-framework/commit/f0d49518152bb9743e32174bc870fac6951c161d) for #5683: Address security warning in CMS when attempting to access &lt;iframe&gt; contents (Back-porting fix from PR #5163) (Patrick Nelson)
+ * 2016-06-08 [bf00810](https://github.com/silverstripe/silverstripe-framework/commit/bf00810e1f5a7164d74ad66f3d03e813d81dfa25) Fix buttonClicked() error (Damian Mooyman)
+ * 2016-06-06 [946495b](https://github.com/silverstripe/silverstripe-framework/commit/946495bcf575d727726dcacc0a6eba596661cfa2) Regression with &lt;% with / %&gt; (fixes #5656) (Loz Calver)
+ * 2016-05-31 [eba89b9](https://github.com/silverstripe/silverstripe-cms/commit/eba89b9520a0103e4c0cb4b6730c3c0742f8b0d9) OldPageRedirector no longer loops infinitely if 404 thrown on existing page (Daniel Hensby)
+ * 2016-05-31 [341f49c](https://github.com/silverstripe/silverstripe-framework/commit/341f49c630c23ee665c195250c19935763172e36) Fixed lookup of next closest visible field for focus restoring (fixes #5618) (UndefinedOffset)
+ * 2016-05-27 [f1a0aef](https://github.com/silverstripe/silverstripe-framework/commit/f1a0aef0d7e18b921b53a381ff8489bc5c12740b) fix CMS_ACCESS permission being ignored if in incorrect order in array (Damian Mooyman)
+ * 2016-05-21 [decd7e5](https://github.com/silverstripe/silverstripe-framework/commit/decd7e5c57a0839cb873c86782a870326ffa175a) Fix getFinalisedQuery not including all queried columns (Damian Mooyman)
+ * 2016-05-20 [8382685](https://github.com/silverstripe/silverstripe-framework/commit/83826850346bc486bc4599dca56067897961cbfa) #5557 Tests with no DB requirements wont create test DB (Daniel Hensby)
+ * 2016-04-19 [43dcde5](https://github.com/silverstripe/silverstripe-framework/commit/43dcde5197e0995225235f69937ed57bec0cd7e2) Hierarchy was incorrectly unexpanding nodes that had been previously expanded (madmatt)
+ * 2016-01-22 [4bd66b9](https://github.com/silverstripe/silverstripe-framework/commit/4bd66b9d3693492806bb4e9a512f8ae623c6a306) for #4909: Ensure RSSFeed_Entry is instantiated using the injector. (Patrick Nelson)
+ * 2015-04-21 [a7100e9](https://github.com/silverstripe/silverstripe-framework/commit/a7100e9006b27e7885eb2ce851d9bc0839ca4468) Object::parse_class_spec failed to parse associative arrays (Loz Calver)

forms/gridfield/GridFieldDetailForm.php

@@ -407,6 +407,14 @@ class GridFieldDetailForm_ItemRequest extends RequestHandler {
 			}
 		}
 
+		// this pushes the current page ID in as a hidden field
+		// this means the request will have the current page ID in it
+		// rather than relying on session which can have been rewritten
+		// by the user having another tab open
+		// see LeftAndMain::currentPageID
+		if($this->controller->hasMethod('currentPageID') && $this->controller->currentPageID()) {
+			$fields->push(new HiddenField('CMSMainCurrentPageID', null, $this->controller->currentPageID()));
+		}
 		// Caution: API violation. Form expects a Controller, but we are giving it a RequestHandler instead.
 		// Thanks to this however, we are able to nest GridFields, and also access the initial Controller by
 		// dereferencing GridFieldDetailForm_ItemRequest->getController() multiple times. See getToplevelController
@@ -598,6 +606,7 @@ class GridFieldDetailForm_ItemRequest extends RequestHandler {
 
 	public function doDelete($data, $form) {
 		$title = $this->record->Title;
+		$backLink = $this->getBacklink();
 		try {
 			if (!$this->record->canDelete()) {
 				throw new ValidationException(
@@ -628,7 +637,7 @@ class GridFieldDetailForm_ItemRequest extends RequestHandler {
 		$controller = $this->getToplevelController();
 		$controller->getRequest()->addHeader('X-Pjax', 'Content'); // Force a content refresh
 
-		return $controller->redirect($this->getBacklink(), 302); //redirect back to admin section
+		return $controller->redirect($backLink, 302); //redirect back to admin section
 	}
 
 	/**

javascript/lang/fa_IR.js

@@ -10,40 +10,40 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
     "FILEIFRAMEFIELD.DELETEFILE": "حذف فایل‌",
     "FILEIFRAMEFIELD.DELETEIMAGE": "حذف تصویر",
     "FILEIFRAMEFIELD.UNATTACHFILE": "حذف ضمیمه فایل",
-    "GRIDFIELD.ERRORINTRANSACTION": "An error occured while fetching data from the server\n Please try again later.",
+    "GRIDFIELD.ERRORINTRANSACTION": "یک خطا هنگام دستیابی به داده‌های سرور روی داد\nلطفاً بعداً تلاش نمایید.",
     "HASMANYFILEFIELD.UPLOADING": "در حال آپلود... %s",
-    "HtmlEditorField.SelectAnchor": "Select an anchor",
+    "HtmlEditorField.SelectAnchor": "انتخاب یک محل ارجاع لینک",
     "LOADING": "بارگذاری...",
-    "LeftAndMain.IncompatBrowserWarning": "Your browser is not compatible with the CMS interface. Please use Internet Explorer 7+, Google Chrome 10+ or Mozilla Firefox 3.5+.",
+    "LeftAndMain.IncompatBrowserWarning": "مرورگر شما با محیط کاربری سی‌ام‌اس سازگار نیست. لطفاً از اینترنت اکسپلورر نسخه 7 به بعد، گوگل کروم 10 به بعد یا موزیلا فایرفاکس 3.5 به بعد استفاده کنید.",
-    "RESTRICTEDTEXTFIELD.CHARCANTBEUSED": "The character '%s' cannot be used in this field",
+    "RESTRICTEDTEXTFIELD.CHARCANTBEUSED": "کاراکتر '%s' نمی‌تواند در این فیلد استفاده شود",
     "TABLEFIELD.DELETECONFIRMMESSAGE": "آیا مطمئن هستید که می‌خواهید این رکورد حذف شود؟",
-    "TreeDropdownField.ENTERTOSEARCH": "Press enter to search",
+    "TreeDropdownField.ENTERTOSEARCH": "جهت جستجو دکمه‌ی enter را بزنید",
-    "TreeDropdownField.FieldTitle": "انتخاب کنید",
+    "TreeDropdownField.FieldTitle": "انتخاب",
     "TreeDropdownField.OpenLink": "باز کنید",
-    "TreeDropdownField.SearchFieldTitle": "گزینش یا جستجو",
+    "TreeDropdownField.SearchFieldTitle": "انتخاب یا جستجو",
-    "UNIQUEFIELD.CANNOTLEAVEEMPTY": "This field cannot be left empty",
+    "UNIQUEFIELD.CANNOTLEAVEEMPTY": "این فیلد نمی‌تواند خالی بماند",
-    "UNIQUEFIELD.ENTERNEWVALUE": "You will need to enter a new value for this field",
+    "UNIQUEFIELD.ENTERNEWVALUE": "شما نیازمند این هستید که ارزش جدیدی برای این فیلد وارد نمایید",
-    "UNIQUEFIELD.SUGGESTED": "Changed value to '%s' : %s",
+    "UNIQUEFIELD.SUGGESTED": "ارزش به '%s' : %s تغییر کرد",
-    "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.CONFIRM": "آیا می‌خواهید که نشانی اینترنتی را تغییر دهم به:\n\n%s/\n\nبله را کلیک نمایید تا نشانی تغییر یابد، لغو را کلیک کنید تا بدین شکل باقی بماند:\n\n%s",
-    "UPDATEURL.CONFIRMURLCHANGED": "The URL has been changed to\n'%s'",
+    "UPDATEURL.CONFIRMURLCHANGED": "نشانی اینترنتی تغییر یافت به\n'%s'",
-    "UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
+    "UploadField.ConfirmDelete": "آیا مطمئن هستید که می‌خواهید این فایل از فایل‌سیستم سرور حذف شود؟",
-    "UploadField.EMPTYRESULT": "Empty file upload result",
+    "UploadField.EMPTYRESULT": "نتیجه‌ی آپلود فایل خالی است",
-    "UploadField.Editing": "Editing ...",
+    "UploadField.Editing": "ویراستن ...",
-    "UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
+    "UploadField.HTML_MAXFILESIZE": "فایل از MAX_FILE_SIZE تجاوز می‌کند (اچ‌تی‌ام‌ال از متضمن دستور)",
     "UploadField.INVALIDEXTENSION": "قالب مجاز نیست",
-    "UploadField.LOADING": "بارگذاری...",
+    "UploadField.LOADING": "بارگذاری ...",
-    "UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
+    "UploadField.MAXNUMBEROFFILESSIMPLE": "از حداکثر تعداد فایل تجاوز کرد",
     "UploadField.NOFILEUPLOADED": "هیچ فایلی آپلود نشد",
-    "UploadField.NOTMPFOLDER": "Missing a temporary folder",
+    "UploadField.NOTMPFOLDER": "پوشه‌ی موقت پیدا نشد",
-    "UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
+    "UploadField.ONLYPARTIALUPLOADED": "تنها بخش‌هایی از فایل آپلود شده است",
     "UploadField.OVERWRITEWARNING": "فایل با نام یکسان از پیش وجود دارد",
-    "UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
+    "UploadField.PHP_MAXFILESIZE": "فایل از upload_max_filesize تجاوز می‌کند (متضمن دستور php.ini)",
-    "UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
+    "UploadField.STOPEDBYEXTENSION": "آپلود فایل به دلیل قالب متوقف شد",
-    "UploadField.TOOLARGE": "Filesize is too large",
+    "UploadField.TOOLARGE": "حجم فایل بسیار زیاد است",
-    "UploadField.TOOSMALL": "Filesize is too small",
+    "UploadField.TOOSMALL": "حجم فایل بسیار کم است",
-    "UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
+    "UploadField.UPLOADEDBYTES": "بایت‌های آپلودشده از سایز فایل تجاوز می‌کند",
     "UploadField.Uploaded": "آپلود‌شده",
-    "UploadField.WRITEFAILED": "Failed to write file to disk",
+    "UploadField.WRITEFAILED": "ناتوان از نگارش فایل بر هارددیسک",
     "VALIDATOR.FIELDREQUIRED": "لطفاً \"%s\" را تکمیل نمایید، پرکردن آن الزامی است."
 });
 }

javascript/lang/src/fa_IR.js

@@ -3,39 +3,39 @@
     "FILEIFRAMEFIELD.DELETEFILE": "حذف فایل‌",
     "FILEIFRAMEFIELD.DELETEIMAGE": "حذف تصویر",
     "FILEIFRAMEFIELD.UNATTACHFILE": "حذف ضمیمه فایل",
-    "GRIDFIELD.ERRORINTRANSACTION": "An error occured while fetching data from the server\n Please try again later.",
+    "GRIDFIELD.ERRORINTRANSACTION": "یک خطا هنگام دستیابی به داده‌های سرور روی داد\nلطفاً بعداً تلاش نمایید.",
     "HASMANYFILEFIELD.UPLOADING": "در حال آپلود... %s",
-    "HtmlEditorField.SelectAnchor": "Select an anchor",
+    "HtmlEditorField.SelectAnchor": "انتخاب یک محل ارجاع لینک",
     "LOADING": "بارگذاری...",
-    "LeftAndMain.IncompatBrowserWarning": "Your browser is not compatible with the CMS interface. Please use Internet Explorer 7+, Google Chrome 10+ or Mozilla Firefox 3.5+.",
+    "LeftAndMain.IncompatBrowserWarning": "مرورگر شما با محیط کاربری سی‌ام‌اس سازگار نیست. لطفاً از اینترنت اکسپلورر نسخه 7 به بعد، گوگل کروم 10 به بعد یا موزیلا فایرفاکس 3.5 به بعد استفاده کنید.",
-    "RESTRICTEDTEXTFIELD.CHARCANTBEUSED": "The character '%s' cannot be used in this field",
+    "RESTRICTEDTEXTFIELD.CHARCANTBEUSED": "کاراکتر '%s' نمی‌تواند در این فیلد استفاده شود",
     "TABLEFIELD.DELETECONFIRMMESSAGE": "آیا مطمئن هستید که می‌خواهید این رکورد حذف شود؟",
-    "TreeDropdownField.ENTERTOSEARCH": "Press enter to search",
+    "TreeDropdownField.ENTERTOSEARCH": "جهت جستجو دکمه‌ی enter را بزنید",
-    "TreeDropdownField.FieldTitle": "انتخاب کنید",
+    "TreeDropdownField.FieldTitle": "انتخاب",
     "TreeDropdownField.OpenLink": "باز کنید",
-    "TreeDropdownField.SearchFieldTitle": "گزینش یا جستجو",
+    "TreeDropdownField.SearchFieldTitle": "انتخاب یا جستجو",
-    "UNIQUEFIELD.CANNOTLEAVEEMPTY": "This field cannot be left empty",
+    "UNIQUEFIELD.CANNOTLEAVEEMPTY": "این فیلد نمی‌تواند خالی بماند",
-    "UNIQUEFIELD.ENTERNEWVALUE": "You will need to enter a new value for this field",
+    "UNIQUEFIELD.ENTERNEWVALUE": "شما نیازمند این هستید که ارزش جدیدی برای این فیلد وارد نمایید",
-    "UNIQUEFIELD.SUGGESTED": "Changed value to '%s' : %s",
+    "UNIQUEFIELD.SUGGESTED": "ارزش به '%s' : %s تغییر کرد",
-    "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.CONFIRM": "آیا می‌خواهید که نشانی اینترنتی را تغییر دهم به:\n\n%s/\n\nبله را کلیک نمایید تا نشانی تغییر یابد، لغو را کلیک کنید تا بدین شکل باقی بماند:\n\n%s",
-    "UPDATEURL.CONFIRMURLCHANGED": "The URL has been changed to\n'%s'",
+    "UPDATEURL.CONFIRMURLCHANGED": "نشانی اینترنتی تغییر یافت به\n'%s'",
-    "UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?",
+    "UploadField.ConfirmDelete": "آیا مطمئن هستید که می‌خواهید این فایل از فایل‌سیستم سرور حذف شود؟",
-    "UploadField.EMPTYRESULT": "Empty file upload result",
+    "UploadField.EMPTYRESULT": "نتیجه‌ی آپلود فایل خالی است",
-    "UploadField.Editing": "Editing ...",
+    "UploadField.Editing": "ویراستن ...",
-    "UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)",
+    "UploadField.HTML_MAXFILESIZE": "فایل از MAX_FILE_SIZE تجاوز می‌کند (اچ‌تی‌ام‌ال از متضمن دستور)",
     "UploadField.INVALIDEXTENSION": "قالب مجاز نیست",
-    "UploadField.LOADING": "بارگذاری...",
+    "UploadField.LOADING": "بارگذاری ...",
-    "UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded",
+    "UploadField.MAXNUMBEROFFILESSIMPLE": "از حداکثر تعداد فایل تجاوز کرد",
     "UploadField.NOFILEUPLOADED": "هیچ فایلی آپلود نشد",
-    "UploadField.NOTMPFOLDER": "Missing a temporary folder",
+    "UploadField.NOTMPFOLDER": "پوشه‌ی موقت پیدا نشد",
-    "UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded",
+    "UploadField.ONLYPARTIALUPLOADED": "تنها بخش‌هایی از فایل آپلود شده است",
     "UploadField.OVERWRITEWARNING": "فایل با نام یکسان از پیش وجود دارد",
-    "UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)",
+    "UploadField.PHP_MAXFILESIZE": "فایل از upload_max_filesize تجاوز می‌کند (متضمن دستور php.ini)",
-    "UploadField.STOPEDBYEXTENSION": "File upload stopped by extension",
+    "UploadField.STOPEDBYEXTENSION": "آپلود فایل به دلیل قالب متوقف شد",
-    "UploadField.TOOLARGE": "Filesize is too large",
+    "UploadField.TOOLARGE": "حجم فایل بسیار زیاد است",
-    "UploadField.TOOSMALL": "Filesize is too small",
+    "UploadField.TOOSMALL": "حجم فایل بسیار کم است",
-    "UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size",
+    "UploadField.UPLOADEDBYTES": "بایت‌های آپلودشده از سایز فایل تجاوز می‌کند",
     "UploadField.Uploaded": "آپلود‌شده",
-    "UploadField.WRITEFAILED": "Failed to write file to disk",
+    "UploadField.WRITEFAILED": "ناتوان از نگارش فایل بر هارددیسک",
     "VALIDATOR.FIELDREQUIRED": "لطفاً \"%s\" را تکمیل نمایید، پرکردن آن الزامی است."
 }

lang/cs.yml

@@ -210,15 +210,12 @@ cs:
     JsType: 'Javascript soubor'
     Mp3Type: 'MP3 audio soubor'
     MpgType: 'MPEG video soubor'
-    NOFILESIZE: 'Velikost souboru je 0 bajtů.'
     NOVALIDUPLOAD: 'Soubor není validní pro nahrání'
     Name: Jméno
     PLURALNAME: Soubory
     PdfType: 'Adobe Acrobat PDF soubor'
     PngType: 'PNG obrázek - vhodný jako univerzálmí formát'
     SINGULARNAME: Soubor
-    TOOLARGE: 'Velikost souboru je příliš velká, povolené maximum {size}'
-    TOOLARGESHORT: 'Velikost souboru překračuje {size}'
     TiffType: 'Tiff formát obrázku'
     Title: Titulek
     WavType: 'WAV audo soubor'
@@ -381,8 +378,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'
@@ -417,13 +412,10 @@ cs:
     CANCEL: Storno
     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.
@@ -479,7 +471,6 @@ cs:
     SUBJECTPASSWORDRESET: 'Nulovací odkaz pro Vaše heslo'
     SURNAME: Příjmení
     TIMEFORMAT: 'Formát času'
-    VALIDATIONMEMBEREXISTS: 'Již existuje člen se stejným {identifier}'
     ValidationIdentifierFailed: 'Nemůžete přepsat existujícího člena #{id} s identickým identifikátorem ({name} = {value}))'
     WELCOMEBACK: 'Vítejte zpět, {firstname}'
     YOUROLDPASSWORD: 'Vaše staré heslo'

lang/de.yml

@@ -332,8 +332,6 @@ de:
     FROMWEB: 'Aus dem Web'
     FindInFolder: 'In Ordner suchen'
     IMAGEALT: 'Alternativtext (alt)'
-    IMAGEALTTEXT: 'Alternativtext (alt) - erscheint, falls das Bild nicht angezeigt werden kann.'
-    IMAGEALTTEXTDESC: 'Wird von Screenreadern vorgelesen oder angezeigt, falls das Bild nicht angezeigt werden kann.'
     IMAGEDIMENSIONS: Dimensionen
     IMAGEHEIGHTPX: Höhe (px)
     IMAGETITLE: 'Titeltext (Tooltip) - für zusätzliche Informationen über das Bild'
@@ -367,13 +365,10 @@ de:
     CANCEL: Abbrechen
     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: 'Aktion auswählen...'
     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.

lang/eo.yml

@@ -210,15 +210,12 @@ eo:
     JsType: 'Ĝavaskripta dosiero'
     Mp3Type: 'MP3-sondosiero'
     MpgType: 'AVI-videa dosiero'
-    NOFILESIZE: 'Dosiero havas nul bajtojn.'
     NOVALIDUPLOAD: 'Dosiero ne estas valida alŝutaĵo.'
     Name: Nomo
     PLURALNAME: Dosieroj
     PdfType: 'Dosiero de Adobe Acrobat PDF'
     PngType: 'PNG-bildo - ĝeneralcela formato'
     SINGULARNAME: Dosiero
-    TOOLARGE: 'Dosiero estas tro granda. La maksimumo estas {size}'
-    TOOLARGESHORT: 'Grando de dosiero superas {size}'
     TiffType: 'Markita bildoformato'
     Title: Titolo
     WavType: 'WAV-sondosiero'
@@ -381,8 +378,6 @@ eo:
     FROMWEB: 'El la TTT'
     FindInFolder: 'Serĉi en dosierujo'
     IMAGEALT: 'Alternativa teksto (alt)'
-    IMAGEALTTEXT: 'Alternativa teksto (alt) - vidiĝas se ne eblas vidigi bildon'
-    IMAGEALTTEXTDESC: 'Vidigita al ekranlegiloj aŭ se ne eblas vidigi bildon'
     IMAGEDIMENSIONS: Dimensioj
     IMAGEHEIGHTPX: Alto
     IMAGETITLE: 'Titola teksto (ŝpruchelpilo) - por plua informo pri la bildo'
@@ -417,13 +412,10 @@ eo:
     CANCEL: Rezigni
     CANT_REORGANISE: 'Vi ne rajtas ŝanĝi supronivelajn paĝojn. Via ŝanĝo ne konserviĝis.'
     DELETED: Forigita.
-    DropdownBatchActionsDefault: 'Elekti agon...'
     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.
@@ -479,7 +471,6 @@ eo:
     SUBJECTPASSWORDRESET: 'Via pasvorto reagordis ligilon'
     SURNAME: Familia nomo
     TIMEFORMAT: 'Formato de horo'
-    VALIDATIONMEMBEREXISTS: 'Jam ekzistas membro kun la sama {identifier}'
     ValidationIdentifierFailed: 'Ne povas anstataŭigi ekzistantan membron #{id} per sama identigilo ({name} = {value}))'
     WELCOMEBACK: 'Bonvenon denove, {firstname}'
     YOUROLDPASSWORD: 'Vian malnovan pasvorton'

lang/fa_IR.yml

@@ -1,6 +1,12 @@
 fa_IR:
+  AddToCampaign:
+    ErrorCampaignPermissionDenied: 'به نظر می‌رسد شما دسترسی‌های لازم برای افزودن {ObjectTitle} به {CampaignTitle} را ندارید'
+    ErrorGeneral: 'پوزش می‌طلبیم، اما خطایی رخ داد'
+    ErrorItemPermissionDenied: 'به نظر می‌رسد شما دسترسی‌های لازم برای افزودن {ObjectTitle} به کمپین را ندارید'
+    ErrorNotFound: 'این {Type} یافت نشد'
+    Success: '{ObjectTitle} با موفقیت به {CampaignTitle} افزوده شد'
   AssetAdmin:
-    ALLOWEDEXTS: 'قالب‌های مجاز آپلود فایل'
+    ALLOWEDEXTS: 'قالب‌های مجاز جهت آپلود فایل'
     HIDEALLOWEDEXTS: 'مخفی‌کردن قالب‌های مجاز'
     NEWFOLDER: پوشه‌ی جدید
     SHOWALLOWEDEXTS: 'نمایش قالب‌های مجاز'
@@ -30,11 +36,12 @@ fa_IR:
     INSERTURL: 'وارد‌کردن از نشانی اینترنتی'
     REMOVEINFO: 'حذف این فایل از این فیلد'
     TOTAL: مجموع
+    TOUPLOAD: 'انتخاب فایل‌ها جهت آپلود...'
     UPLOADINPROGRESS: 'لطفاً صبر کنید... آپلود در جریان است'
     UPLOADOR: یا
   BBCodeParser:
     ALIGNEMENT: جاگذاری
-    ALIGNEMENTEXAMPLE: 'راست‌چین'
+    ALIGNEMENTEXAMPLE: 'راست‌چین شده'
     BOLD: 'متن درشت'
     BOLDEXAMPLE: درشت
     CODE: 'بلوک کد'
@@ -47,7 +54,7 @@ fa_IR:
     IMAGE: عکس
     IMAGEDESCRIPTION: 'نمایش یک تصویر در ارسال شما'
     ITALIC: 'نوشته ایتالیک'
-    ITALICEXAMPLE: ایتالیک
+    ITALICEXAMPLE: ایتالیک‌ها
     LINK: 'لینک وب‌سایت'
     LINKDESCRIPTION: 'لینک به یک وب‌سایت یا نشانی اینترنتی دیگر'
     STRUCK: 'متن باطل‌شده'
@@ -67,6 +74,8 @@ fa_IR:
     ANY: هر
     NOANSWER: 'خیر'
     YESANSWER: 'بله'
+  CAMPAIGNS:
+    ADDTOCAMPAIGN: 'افزودن به کمپین'
   CMSLoadingScreen_ss:
     LOADING: بارگذاری...
     REQUIREJS: 'سی‌ام‌اس نیازمند این است که جاوااسکریپت را فعال نمایید.'
@@ -93,12 +102,29 @@ fa_IR:
     SUCCESSCONTENT: '<p>ورود موفق. اگر به‌طور خودکار ارجاع نشدید <a target="_top" href="{link}">اینجا را کلیک کنید.</a></p>'
     TimedOutTitleAnonymous: 'جلسه شما به پایان رسیده است.'
     TimedOutTitleMember: 'سلام {name}!<br />زمان جلسه شما به پایان رسیده است.'
+  CampaignAdmin:
+    MENUTITLE: کمپین‌ها
+  Campaigns:
+    AddToCampaign: 'افزودن به کمپین'
   ChangePasswordEmail_ss:
     CHANGEPASSWORDTEXT1: 'شما رمز عبورتان را تغییر دادید برای'
     CHANGEPASSWORDTEXT2: 'اکنون می‌توانید با این اطلاعات وارد شوید:'
+    CHANGEPASSWORDTEXT3: 'تغییر رمز عبور'
     EMAIL: ايميل
     HELLO: درود
     PASSWORD: رمز عبور
+  ChangeSet:
+    DESCRIPTION_AND: '{first} و {second}'
+    DESCRIPTION_ITEM: آیتم
+    DESCRIPTION_ITEMS: آیتم‌ها
+    DESCRIPTION_LIST_FIRST: '{item}'
+    DESCRIPTION_LIST_LAST: '{list}، و {item}'
+    DESCRIPTION_LIST_MID: '{list}، {item}'
+    DESCRIPTION_OTHER_ITEM: 'آیتم دیگر'
+    DESCRIPTION_OTHER_ITEMS: 'آیتم‌های دیگر'
+    NAME: نام
+    PLURALNAME: کمپین‌ها
+    SINGULARNAME: کمپین
   CheckboxField:
     NOANSWER: 'خیر'
     YESANSWER: 'بله'
@@ -109,6 +135,8 @@ fa_IR:
   ConfirmedPasswordField:
     ATLEAST: 'رمزهای عبور باید حداقل {min} کاراکتر باشد.'
     BETWEEN: 'رمزهای عبور باید بین {min} تا {max} کاراکتر باشد.'
+    CURRENT_PASSWORD_MISSING: 'شما باید رمز عبور کنونی خود را وارد نمایید.'
+    LOGGED_IN_ERROR: 'جهت تغییر رمز عبور خود باید وارد شده باشید.'
     MAXIMUM: 'رمزهای عبور باید حداکثر {max} کاراکتر باشد.'
     SHOWONCLICKTITLE: 'تغییر رمز عبور'
   ContentController:
@@ -152,6 +180,7 @@ fa_IR:
     INVALID_REQUEST: 'درخواست نامعتبر'
   DropdownField:
     CHOOSE: (گزینش)
+    CHOOSESEARCH: '(گزینش یا جستجو)'
     SOURCE_VALIDATION: 'لطفاً یک ارزش از لیست فراهم‌شده برگزینید. {value} یک گزینه معتبر نیست'
   EmailField:
     VALIDATION: 'لطفاً یک نشانی ایمیل وارد نمایید'
@@ -267,6 +296,36 @@ fa_IR:
     ResultCreated: '{count} گروه ایجاد شده'
     ResultDeleted: 'گروه‌های %d حذف شد'
     ResultUpdated: 'گروه‌های %d به‌روز شد'
+  HTMLEditorField:
+    ANCHORSCANNOTACCESSPAGE: 'شما مجاز به دسترسی به محتوای صفحه هدف نیستید.'
+    ANCHORSPAGENOTFOUND: 'صفحه‌ی هدف پیدا نشد.'
+    BUTTONADDURL: 'افزودن نشانی اینترنتی'
+    CSSCLASS: 'چیدمان / سبک'
+    DETAILS: جزئیات
+    EMAIL: 'نشانی ایمیل'
+    FILE: فايل
+    FOLDER: پوشه
+    IMAGEDIMENSIONS: ابعاد
+    IMAGEHEIGHTPX: ارتفاع
+    IMAGETITLETEXT: 'متن عنوان (تول‌تیپ)'
+    IMAGETITLETEXTDESC: 'جهت اطلاعات بیشتر درباره تصویر'
+    IMAGEWIDTHPX: پهنا
+    INSERTMEDIA: 'واردکردن رسانه از'
+    LINK: 'واردکردن لینک'
+    LINKDESCR: 'توضیحات لینک'
+    LINKEMAIL: 'نشانی ایمیل'
+    LINKEXTERNAL: 'وب‌سایت دیگر'
+    LINKFILE: 'یک فایل دانلود کنید'
+    LINKINTERNAL: 'صفحه روی وب‌سایت'
+    LINKOPENNEWWIN: 'لینک در پنجره جدید باز شود؟'
+    LINKTO: 'لینک به'
+    PAGE: صفحه
+    SUBJECT: 'موضوع ایمیل'
+    URL: نشانی اینترنتی
+    URLDESCRIPTION: 'ویدیوها و تصاویر موجود در وب را به آسانی و با وارد نمودن نشانی اینترنتی آن فایل در صفحه درج نمایید. اطمینان حاصل نمایید که شما دارای حقوق یا اجازه‌های مرتبط با اشتراک‌گذاری آن رسانه از وب هستید.<br /><br />لطفاً در نظر داشته باشید که فایل‌ها در سی‌ام‌اس ذخیره نمی‌شوند و آن‌ها از محل اصلی خود فراخوانی می‌شوند، اگر به دلایلی آن فایل در محل اصلی خود موجود نباشد در این صفحه هم قابل دیدن نخواهد بود.'
+    UpdateMEDIA: 'به‌روز‌رسانی رسانه'
+  HTMLEditorField_Toolbar:
+    ERROR_NOTFOUND: 'ناتوان از یافتن فایل جهت دیدن'
   HtmlEditorField:
     ADDURL: 'افزودن URL'
     ADJUSTDETAILSDIMENSIONS: 'جزئیات و ابعاد'
@@ -312,6 +371,7 @@ fa_IR:
   Image_iframe_ss:
     TITLE: 'آی‌فریم آپلود عکس'
   LeftAndMain:
+    CANCEL: لغو
     DELETED: حذف شده
     HELP: کمک
     PERMAGAIN: 'شما از سیستم مدیریت محتوا خارج شده اید.اگر میخواهید دوباره وارد شوید نام کاربری و رمز عبور خود را در قسمت زیر وارد کنید'
@@ -341,20 +401,25 @@ fa_IR:
     CANTEDIT: 'شما دسترسی انجام این کار را ندارید.'
     CONFIRMNEWPASSWORD: 'تکرار رمز عبور جدید'
     CONFIRMPASSWORD: 'تکرار رمز عبور'
+    CURRENT_PASSWORD: 'رمز ورود کنونی'
     DATEFORMAT: 'قالب تاریخ'
     DefaultAdminFirstname: 'مدیر پیشفرض'
     DefaultDateTime: پیش‌فرض
+    EDIT_PASSWORD: 'رمز ورود جدید'
     EMAIL: پست الکترونیک
     EMPTYNEWPASSWORD: 'رمز عبور جدید نمیتواند خالی باشد، لطفا دوباره تلاش کنید'
     ENTEREMAIL: 'لطفاً یک نشانی ایمیل وارد نمایید تا پیوند ازنوسازی رمز عبور را دریافت کنید.'
     ERRORPASSWORDNOTMATCH: 'رمز عبور کنونی همانند نیست، لطفاً مجدداً تلاش نمایید'
     FIRSTNAME: 'نام'
     INTERFACELANG: 'زبان برنامه'
+    KEEPMESIGNEDIN: 'مرا واردشده نگه‌دار'
     LOGGEDINAS: 'شما به {name} عنوان وارد شده‌اید.'
     NEWPASSWORD: 'گذرواژه تازه'
     NoPassword: 'رمز عبوری برای این کاربر وجود ندارد'
     PASSWORD: رمز عبور
+    PASSWORDEXPIRED: 'رمز عبور شما منقضی شده‌است. لطفاً یکی جدید برگزینید.'
     PLURALNAME: اعضاء
+    REMEMBERME: 'مرا برای بار بعد به‌خاطر بسپار؟'
     SINGULARNAME: عضو
     SUBJECTPASSWORDCHANGED: 'گذرواژه شما دگرگون شد'
     SUBJECTPASSWORDRESET: 'پیوند ازنوسازی گذرواژه شما'
@@ -428,6 +493,8 @@ fa_IR:
   Pagination:
     Page: صفحه
     View: نمایش
+  PasswordValidator:
+    TOOSHORT: 'رمز عبور بسیار کوتاه است، باید %s کاراکتر یا بیشتر باشد'
   Permission:
     AdminGroup: مدیر کل
     CMS_ACCESS_CATEGORY: 'دسترسی CMS'
@@ -456,6 +523,7 @@ fa_IR:
     CHANGEPASSWORDHEADER: 'تغییر گذرواژه'
     ENTERNEWPASSWORD: 'لطفاً گذرواژه جدید را وارد کنید.'
     ERRORPASSWORDPERMISSION: 'جهت تغییر رمز عبور خود باید وارد شده باشید!'
+    LOGGEDOUT: 'شما خارج شده‌اید. اگر مایل هستید دوباره وارد شوید، اطلاعات معتبر خود را در زیر وارد نمایید.'
     LOGIN: 'ورود'
     LOSTPASSWORDHEADER: 'فراموشی رمز عبور'
     PASSWORDSENTHEADER: 'پیوند ازنوسازی رمز عبور به ''{email}'' ارسال شد'
@@ -525,3 +593,10 @@ fa_IR:
     UPLOADSINTO: 'ذخیره شدن در /{path}'
   Versioned:
     has_many_Versions: نسخه ها
+  VersionedGridFieldItemRequest:
+    ARCHIVE: بایگانی
+    BUTTONARCHIVEDESC: 'عدم انتشار و ارسال به بایگانی'
+    BUTTONPUBLISH: انتشار
+    BUTTONUNPUBLISH: عدم انتشار
+  i18n:
+    PLURAL: '{number} {form}'

lang/fi.yml

@@ -210,15 +210,12 @@ fi:
     JsType: 'Javascript-tiedosto'
     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'
     SINGULARNAME: Tiedosto
-    TOOLARGE: 'Tiedostokoko on liian suuri: maks. sallittu koko on {size}'
-    TOOLARGESHORT: 'Tiedostokoko ylittää {size}'
     TiffType: 'TIFF-kuva'
     Title: Otsikko
     WavType: 'WAV-äänitiedosto'
@@ -381,8 +378,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 kuvia ei voi näyttää'
     IMAGEDIMENSIONS: Mitat
     IMAGEHEIGHTPX: Korkeus
     IMAGETITLE: 'Otsikko (tooltip) - kuvan lisätietoja varten'
@@ -417,13 +412,10 @@ fi:
     CANCEL: Peruuta
     CANT_REORGANISE: 'Sinulla ei ole oikeuksia mennä ylemmän tason sivuille. Muutoksiasi ei tallennettu.'
     DELETED: Poistettu.
-    DropdownBatchActionsDefault: 'Valitse toimenpide...'
     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.
@@ -479,7 +471,6 @@ fi:
     SUBJECTPASSWORDRESET: 'Salasanasi palautuslinkki'
     SURNAME: Sukunimi
     TIMEFORMAT: 'Aikamuoto'
-    VALIDATIONMEMBEREXISTS: '{identifier} niminen käyttäjä on jo olemassa'
     ValidationIdentifierFailed: 'Olemassa olevan käyttäjän id:n #{id} päälle ei voida kirjoittaa samalla tunnisteella ({name} = {value}))'
     WELCOMEBACK: 'Tervetuloa takaisin, {firstname}'
     YOUROLDPASSWORD: 'Vanha salasanasi'

lang/fr.yml

@@ -1,5 +1,6 @@
 fr:
   AssetAdmin:
+    HIDEALLOWEDEXTS: 'Cacher les extensions autorisées'
     NEWFOLDER: Nouveau dossier
     SHOWALLOWEDEXTS: 'Montrer les extensions autorisées'
   AssetTableField:
@@ -7,6 +8,7 @@ fr:
     DIM: Dimensions
     FILENAME: Nom du fichier
     FOLDER: Dossier
+    HEIGHT: Hauteur
     LASTEDIT: 'Dernière modification'
     OWNER: Propriétaire
     SIZE: 'Taille'
@@ -80,6 +82,7 @@ fr:
   ConfirmedPasswordField:
     ATLEAST: 'Le mot de passe doit comporter au moins {min} caractères.'
     BETWEEN: 'Le mot de passe doit comporter entre {min} et {max} caractères.'
+    CURRENT_PASSWORD_MISSING: 'Vous devez saisir votre mot de passe actuel.'
     MAXIMUM: 'Le mot de passe ne doit comporter plus de {max} caractères.'
     SHOWONCLICKTITLE: 'Changer le mot de passe'
   ContentController:
@@ -290,6 +293,7 @@ fr:
     DELETED: Supprimé.
     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.'
+    PERMDEFAULT: 'Vous devez être connecté afin d''accéder à l''interface d''administration. Saisissez vos identifiants ci-dessous.'
     PreviewButton: Aperçu
     REORGANISATIONSUCCESSFUL: 'L’arbre du site a été bien réorganisé.'
     SAVEDUP: Enregistré.

lang/hr.yml

@@ -5,14 +5,14 @@ hr:
   AssetTableField:
     CREATED: 'Uploadano'
     DIM: Dimenzije
-    FILENAME: Ime datoteke
+    FILENAME: Naziv datoteke
-    FOLDER: Mapa
+    FOLDER: Direktorij
     LASTEDIT: 'Zadnja promjena'
     OWNER: Vlasnik
-    SIZE: 'Veličina'
+    SIZE: 'Veličina datoteke'
     TITLE: Naslov
-    TYPE: 'Tip'
+    TYPE: 'Tip datoteke'
-    URL: URL
+    URL: Link
   AssetUploadField:
     ChooseFiles: 'Odaberite datoteke'
     DRAGFILESHERE: 'Povucite datoteke ovdje'

lang/it.yml

@@ -1,5 +1,12 @@
 it:
+  AddToCampaign:
+    ErrorCampaignPermissionDenied: 'Sembra tu non abbia i permessi necessari per aggiungere {ObjectTitle} a {CampaignTitle}'
+    ErrorGeneral: 'Spiacente, ma c''è stato un errore'
+    ErrorItemPermissionDenied: 'Sembra tu non abbia i permessi necessari per aggiungere {ObjectTitle} alla campagna'
+    ErrorNotFound: 'Non è stato possibile trovare {Type}'
+    Success: '{ObjectTitle} aggiunto a {CampaignTitle} con successo'
   AssetAdmin:
+    ALLOWEDEXTS: 'Estensioni consentite per l''upload'
     HIDEALLOWEDEXTS: 'Nascondi estensioni permesse'
     NEWFOLDER: NuovaCartella
     SHOWALLOWEDEXTS: 'Mostra le estensioni consentite'
@@ -29,6 +36,7 @@ it:
     INSERTURL: 'Inserisci da URL'
     REMOVEINFO: 'Rimuovi questo file da questo campo'
     TOTAL: Totale
+    TOUPLOAD: 'Scegli i file da caricare...'
     UPLOADINPROGRESS: 'Attendere prego... caricamento in corso'
     UPLOADOR: O
   BBCodeParser:
@@ -66,6 +74,8 @@ it:
     ANY: Qualsiasi
     NOANSWER: 'No'
     YESANSWER: 'Sì'
+  CAMPAIGNS:
+    ADDTOCAMPAIGN: 'Aggiungere alla campagna'
   CMSLoadingScreen_ss:
     LOADING: Caricamento in corso...
     REQUIREJS: 'Il CMS richiede JavaScript abilitato.'
@@ -92,12 +102,34 @@ it:
     SUCCESSCONTENT: '<p>Accesso eseguito. Se non sarai ridirezionato automaticamente, <a target="_top" href="{link}">cliccare qui</a></p>'
     TimedOutTitleAnonymous: 'La tua sessione è scaduta.'
     TimedOutTitleMember: 'Ciao {name}!<br />La tua sessione è scaduta.'
+  CampaignAdmin:
+    MENUTITLE: Campagne
+  Campaigns:
+    AddToCampaign: 'Aggiungere Alla Campagna'
   ChangePasswordEmail_ss:
+    CHANGEPASSWORDFOREMAIL: 'La password per l''account con l''email {email} è cambiata. Se non l\''hai ancora fatto, prego cambiare la password usando il link sottostante'
     CHANGEPASSWORDTEXT1: 'Hai cambiato la password per'
     CHANGEPASSWORDTEXT2: 'Ora puoi utilizzare le seguenti credenziali per accedere:'
+    CHANGEPASSWORDTEXT3: 'Cambia password'
     EMAIL: Email
     HELLO: Ciao
     PASSWORD: Password
+  ChangeSet:
+    DESCRIPTION_AND: '{first} e {second}'
+    DESCRIPTION_ITEM: elemento
+    DESCRIPTION_ITEMS: elementi
+    DESCRIPTION_LIST_FIRST: '{item}'
+    DESCRIPTION_LIST_LAST: '{list}, e {item}'
+    DESCRIPTION_LIST_MID: '{list}, {item}'
+    DESCRIPTION_OTHER_ITEM: 'altro elemento'
+    DESCRIPTION_OTHER_ITEMS: 'altri elementi'
+    NAME: Nome
+    PLURALNAME: Campagne
+    SINGULARNAME: Campagna
+    STATE: Stato
+  ChangeSetItem:
+    PLURALNAME: 'Cambiare gli elementi del set'
+    SINGULARNAME: 'Cambiare l''elemento del set'
   CheckboxField:
     NOANSWER: 'No'
     YESANSWER: 'Sì'
@@ -108,6 +140,9 @@ it:
   ConfirmedPasswordField:
     ATLEAST: 'La password deve essere lunga almeno {min} caratteri.'
     BETWEEN: 'La password deve essere lunga da {min} a {max} caratteri.'
+    CURRENT_PASSWORD_ERROR: 'La password che hai inserito non è corretta.'
+    CURRENT_PASSWORD_MISSING: 'Devi inserire la tua password attuale.'
+    LOGGED_IN_ERROR: 'Devi essere autenticato per poter cambiare la tua password.'
     MAXIMUM: 'La password deve essere lunga almeno {max} caratteri.'
     SHOWONCLICKTITLE: 'Cambia password'
   ContentController:
@@ -151,6 +186,7 @@ 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'
@@ -263,9 +299,73 @@ it:
     many_many_Members: Membri
   GroupImportForm:
     Help1: '<p>Importa gruppi in formato <em>CSV</em> (valori separati da virgole). <small><a href="#" class="toggle-advanced">Mostra utilizzo avanzato</a></small></p>'
+    Help2: '<div class="advanced">
+
+      <h4>Utilizzo avanzato</h4>
+
+      <ul>
+
+      <li>Colonne consentite: <em>%s</em></li>
+
+      <li>Gruppi esistenti sono individuati attraverso la proprietà univoca <em>Code</em> e aggiornati con i nuovi valori dal file importato.</li>
+
+      <li>Possono essere create gerarchie usando la colonna <em>ParentCode</em></li>
+
+      <li>Codici di autorizzazione possono essere assegnati con la colonna <em>PermissionCode</em>. I codici di autorizzazione preesistenti non saranno cancellati.</li>
+
+      </ul>
+
+      </div>'
     ResultCreated: 'Creati {count} gruppi'
     ResultDeleted: 'Eliminati %d gruppi'
     ResultUpdated: 'Aggiornati %d gruppi'
+  HTMLEditorField:
+    ANCHORSCANNOTACCESSPAGE: 'Non ti è consentito accedere al contenuto della pagina di destinazione.'
+    ANCHORSPAGENOTFOUND: 'Pagina di destinazione non trovata.'
+    ANCHORVALUE: Ancora
+    BUTTONADDURL: 'Aggiungi url'
+    CAPTIONTEXT: 'Didascalia di testo'
+    CSSCLASS: 'Allineamento / stile'
+    CSSCLASSCENTER: 'Centrato, su se stesso.'
+    CSSCLASSLEFT: 'Sulla sinistra, con il testo attorno.'
+    CSSCLASSLEFTALONE: 'Sulla sinistra, da sola.'
+    CSSCLASSRIGHT: 'Sulla destra, con il testo attorno.'
+    DETAILS: Dettagli
+    EMAIL: 'Indirizzo email'
+    FILE: File
+    FOLDER: Cartella
+    IMAGEALT: 'Testo alternativo (alt)'
+    IMAGEALTTEXT: 'Testo alternativo (alt) - mostrato nel caso l''immagine non possa essere visualizzata'
+    IMAGEALTTEXTDESC: 'Mostrato agli screen reader o se l''immagine non può essere visualizzata'
+    IMAGEDIMENSIONS: Dimensioni
+    IMAGEHEIGHTPX: Altezza
+    IMAGETITLE: 'Titolo (tooltip) - per informazioni aggiuntive sull''immagine.'
+    IMAGETITLETEXT: 'Titolo (tooltip)'
+    IMAGETITLETEXTDESC: 'Per informazioni aggiuntive sull''immagine'
+    IMAGEWIDTHPX: Larghezza
+    INSERTMEDIA: 'Inserisci media da'
+    LINK: 'Inserisci Link'
+    LINKANCHOR: 'Ancora su questa pagina'
+    LINKDESCR: 'Descrizione del link'
+    LINKEMAIL: 'Indirizzo email'
+    LINKEXTERNAL: 'Un altro sito web'
+    LINKFILE: 'Scarica un file'
+    LINKINTERNAL: 'Pagina su questo sito'
+    LINKOPENNEWWIN: 'Apri il link in una nuova finestra?'
+    LINKTO: 'Collega a'
+    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'
+  HTMLEditorField_Toolbar:
+    ERROR_ABSOLUTE: 'Possono essere incorporati solo URL assoluti'
+    ERROR_HOSTNAME: 'L''hostname di questo file non è incluso nella whitelist'
+    ERROR_ID: 'Sono necessari entrambi i parametri "ID" e "FileURL" per identificare il file'
+    ERROR_NOTFOUND: 'Impossibile trovare il file da visualizzare'
+    ERROR_OEMBED_REMOTE: 'Oembed è compatibile solo con file remoti'
+    ERROR_SCHEME: 'Lo schema di questo file non è incluso nella whitelist'
   Hierarchy:
     InfiniteLoopNotAllowed: 'Trovato loop infinito nella gerarchia di "{type}". Cambia il padre per risolvere il problema'
   HtmlEditorField:
@@ -325,6 +425,7 @@ it:
   Image_iframe_ss:
     TITLE: 'Iframe per l''inserimento dell''immagine'
   LeftAndMain:
+    CANCEL: Annulla
     CANT_REORGANISE: 'Non hai i permessi per modificare le pagine di primo livello. Le modifiche non sono state salvate.'
     DELETED: Eliminato.
     HELP: Aiuto
@@ -358,9 +459,11 @@ it:
     CANTEDIT: 'Non hai i permessi per fare questo'
     CONFIRMNEWPASSWORD: 'Conferma nuova password'
     CONFIRMPASSWORD: 'Conferma password'
+    CURRENT_PASSWORD: 'Password Attuale'
     DATEFORMAT: 'Formato della data'
     DefaultAdminFirstname: 'Amministratore Predefinito'
     DefaultDateTime: predefinito
+    EDIT_PASSWORD: 'Nuova password'
     EMAIL: Email
     EMPTYNEWPASSWORD: 'La nuova password non può essere vuota, riprova'
     ENTEREMAIL: 'Inserisci un indirizzo e-mail per ricevere il link di azzeramento della password'
@@ -371,12 +474,14 @@ it:
     FIRSTNAME: 'Nome'
     INTERFACELANG: 'Lingua dell''interfaccia'
     INVALIDNEWPASSWORD: 'Non possiamo accettare questa password: {password}'
+    KEEPMESIGNEDIN: 'Resta autenticato'
     LOGGEDINAS: 'Sei collegato come {name}.'
     NEWPASSWORD: 'Nuova password'
     NoPassword: 'Manca la password per questo utente.'
     PASSWORD: Password
     PASSWORDEXPIRED: 'La tua password è scaduta. Per favore selezionarne una nuova.'
     PLURALNAME: Utenti
+    REMEMBERME: 'Ricordati di me la prossima volta?'
     SINGULARNAME: Utente
     SUBJECTPASSWORDCHANGED: 'La tua password è stata cambiata'
     SUBJECTPASSWORDRESET: 'Link per azzerare la tua password'
@@ -416,6 +521,17 @@ it:
     Toggle: 'Mostra aiuto per la formattazione'
   MemberImportForm:
     Help1: '<p>Importa utenti in <em>formato CSV</em> (valori separati da virgole). <small><a href="#" class="toggle-advanced">Mostra utilizzo avanzato</a></small></p>'
+    Help2: '<div class="advanced">
+
+      <h4>Utilizzo avanzato</h4>
+
+      <ul>
+
+      <li>Colonne consentite: <em>%s</em></li>
+
+      <li>Utenti esistenti sono individuati attraverso la proprietà univoca <em>Code</em> e aggiornati con i nuovi valori dal file importato.</li>
+
+      <li>Possono essere assegnati gruppi usando la colonna <em>Groups</em>. I gruppi sono identificati dalla proprietà <em>Code</em>, possono essere specificati più gruppi separandoli con la virgola. I gruppi preesistenti non saranno cancellati.</li></ul></div>'
     ResultCreated: 'Creati {count} utenti'
     ResultDeleted: 'Eliminati %d utenti'
     ResultNone: 'Nessun cambiamento'
@@ -450,6 +566,8 @@ it:
   MoneyField:
     FIELDLABELAMOUNT: Importo
     FIELDLABELCURRENCY: Valuta
+  MultiSelectField:
+    SOURCE_VALIDATION: 'Per favore selezionare un valore tra quelli forniti. È stata fornita l''opzione non valida {value}'
   NullableField:
     IsNullLabel: 'è nullo.'
   NumericField:
@@ -487,6 +605,9 @@ it:
     UserPermissionsIntro: 'Assegnando gruppi a questo utente modificherà i suoi permessi. Vedi la sezione gruppi per dettagli sui permessi dei singoli gruppi.'
   PhoneNumberField:
     VALIDATION: 'Per favore inserisci un numero di telefono valido'
+  RememberLoginHash:
+    PLURALNAME: 'Ricordare gli Hash di Login'
+    SINGULARNAME: 'Ricordare l''Hash di Login'
   Security:
     ALREADYLOGGEDIN: 'Non hai accesso a questa pagina. Se hai un altro account che può accederci, puoi autenticarti qui sotto.'
     BUTTONSEND: 'Inviami il link per azzerare la password'
@@ -582,3 +703,14 @@ it:
     UPLOADSINTO: 'salva in /{path}'
   Versioned:
     has_many_Versions: Versioni
+  VersionedGridFieldItemRequest:
+    ARCHIVE: Archiviare
+    Archived: '%s %s archiviata'
+    BUTTONARCHIVEDESC: 'Nascondere e mettere in archivio'
+    BUTTONPUBLISH: Pubblicare
+    BUTTONUNPUBLISH: Nascondere
+    BUTTONUNPUBLISHDESC: 'Rimuovere questo record dal sito pubblicato'
+    Published: 'Pubblicato {name} {link}'
+    Unpublished: 'Nascosto %s %s'
+  i18n:
+    PLURAL: '{number} {form}'

lang/sk.yml

@@ -210,15 +210,12 @@ sk:
     JsType: 'Javascript súbor'
     Mp3Type: 'MP3 audio súbor'
     MpgType: 'MPEG video súbor'
-    NOFILESIZE: 'Veľkosť súboru je nula bajtov.'
     NOVALIDUPLOAD: 'Subor nie je povolený pre nahratie'
     Name: Meno
     PLURALNAME: Súbory
     PdfType: 'Adobe Acrobat PDF súbor'
     PngType: 'PNG obrázok - vhodný univerzálny formát'
     SINGULARNAME: Súbor
-    TOOLARGE: 'Veľkosť súboru je príliš veľká, maximum {size} je povolené'
-    TOOLARGESHORT: 'Veľkosť súboru prekračuje {size}'
     TiffType: 'Tiff formát obrázku'
     Title: Názov
     WavType: 'WAV audo súbor'
@@ -381,8 +378,6 @@ sk:
     FROMWEB: 'Z webu'
     FindInFolder: 'Vyhľadať v priečinku'
     IMAGEALT: 'Atlernatívny text (alt)'
-    IMAGEALTTEXT: 'Atlernatívny text (alt) - zobrazí sa, ak nemože byť zobrazený obrázok'
-    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'
@@ -417,13 +412,10 @@ sk:
     CANCEL: Zrušiť
     CANT_REORGANISE: 'Nemáte oprávnenie meniť stránky najvyššej úrovne. Vaša zmena nebola uložená.'
     DELETED: Zmazané.
-    DropdownBatchActionsDefault: 'Vyberte akciu...'
     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á, lebo ešte nebola uložená.'
     PreviewButton: Náhľad
     REORGANISATIONSUCCESSFUL: 'Strom webu bol reorganizovaný úspešne.'
     SAVEDUP: Uložené.
@@ -479,7 +471,6 @@ sk:
     SUBJECTPASSWORDRESET: 'Odkaz na resetovanie hesla'
     SURNAME: Priezvisko
     TIMEFORMAT: 'Formát času'
-    VALIDATIONMEMBEREXISTS: 'Člen už existuje s rovnakým {identifier}'
     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'

lang/sl_SI.yml

@@ -0,0 +1,295 @@
+sl_SI:
+  AddToCampaign:
+    ErrorGeneral: 'Se opravičujemo, prišlo je do napake'
+  AssetAdmin:
+    ALLOWEDEXTS: 'Dovoljeni tipi datotek za nalaganje'
+    NEWFOLDER: NovaMapa
+  AssetTableField:
+    DIM: Dimenzije
+    FILENAME: Ime datoteke
+    FOLDER: Mapa
+    HEIGHT: Višina
+    LASTEDIT: 'Nazadnje spremenjeno'
+    OWNER: Lastnik
+    SIZE: 'Velikost datoteke'
+    TITLE: Naslov
+    TYPE: 'Tip datoteke'
+    URL: URL
+    WIDTH: Širina
+  AssetUploadField:
+    ChooseFiles: 'Izberi datoteke'
+    DRAGFILESHERE: 'Povlecite datoteke na to mesto'
+    DROPAREA: 'Območje za datoteke'
+    EDITALL: 'Uredi vse'
+    EDITANDORGANIZE: 'Uredi in organiziraj'
+    EDITINFO: 'Uredi datoteke'
+    FILES: Datoteke
+    FROMCOMPUTER: 'Izberite datoteke iz vašega računalnika'
+    FROMCOMPUTERINFO: 'Naložite datoteke iz računalnika'
+    INSERTURL: 'Vstavite iz URL naslova'
+    REMOVEINFO: 'Odstranite datoteko iz tega polja'
+    TOTAL: Skupaj
+    TOUPLOAD: 'Izberite datoteke, ki jih želite naložiti'
+    UPLOADINPROGRESS: 'Prosimo počakajte... nalaganje datotek je v teku'
+    UPLOADOR: ALI
+  BBCodeParser:
+    ALIGNEMENT: Poravnava
+    ALIGNEMENTEXAMPLE: 'desno'
+    BOLD: 'Krepki tekst'
+    BOLDEXAMPLE: Krepko
+    CODE: 'Blok s kodo'
+    COLOREDEXAMPLE: 'modri tekst'
+    EMAILLINK: 'E-poštna povezava'
+    EMAILLINKDESCRIPTION: 'Ustvari e-poštno povezavo'
+    IMAGE: Slika
+    IMAGEDESCRIPTION: 'Prikažite fotografijo v vaši objavi'
+    ITALIC: 'Ležeči tekst'
+    ITALICEXAMPLE: Ležeče
+    LINK: 'Spletna povezava'
+    LINKDESCRIPTION: 'Povezava na drugo spletno mesto ali URL'
+    UNDERLINE: 'Podčrtan tekst'
+    UNDERLINEEXAMPLE: Podčrtano
+  BackLink_Button_ss:
+    Back: Nazaj
+  BasicAuth:
+    ENTERINFO: 'Prosimo vpišite uporabniško ime in geslo.'
+    ERRORNOTADMIN: 'Ta uporabnik ni administrator.'
+    ERRORNOTREC: 'Uporabniško ime ali geslo je neveljavno'
+  Boolean:
+    NOANSWER: 'Ne'
+    YESANSWER: 'Da'
+  CAMPAIGNS:
+    ADDTOCAMPAIGN: 'Dodaj v kampanjo'
+  CMSLoadingScreen_ss:
+    LOADING: Nalagam...
+    REQUIREJS: 'Zahteve CMS sistema so, da morate imeti omogočen JavaScript.'
+  CMSMain:
+    ACCESS: 'Dostop do ''{title}'' sekcije'
+    ACCESSALLINTERFACES: 'Dostop do vseh sekcije CMS-a.'
+    SAVE: Shrani
+  CMSMemberLoginForm:
+    BUTTONFORGOTPASSWORD: 'Pozabljeno geslo?'
+    BUTTONLOGIN: 'Ponovna prijava'
+    BUTTONLOGOUT: 'Odjava'
+  CMSPageHistoryController_versions_ss:
+    PREVIEW: 'Predogled spletne strani'
+  CMSPagesController_Tools_ss:
+    FILTER: Filter
+  CMSProfileController:
+    MENUTITLE: 'Moj profil'
+  CMSSecurity:
+    TimedOutTitleAnonymous: 'Vaša seja je potekla.'
+    TimedOutTitleMember: 'Hej {name}! Tvoja seja je potekla.'
+  CampaignAdmin:
+    MENUTITLE: Kampanje
+  ChangePasswordEmail_ss:
+    CHANGEPASSWORDTEXT1: 'Zamenjali ste geslo za'
+    CHANGEPASSWORDTEXT3: 'Zamenjaj geslo'
+    EMAIL: E-pošta
+    HELLO: Živjo
+    PASSWORD: Geslo
+  ChangeSet:
+    DESCRIPTION_AND: '{first} in {drugi}'
+    DESCRIPTION_ITEM: predmet
+    DESCRIPTION_ITEMS: predmetov
+    DESCRIPTION_OTHER_ITEM: 'drug predmet'
+    DESCRIPTION_OTHER_ITEMS: 'ostali predmeti'
+    NAME: Ime
+    PLURALNAME: Kampanje
+    SINGULARNAME: Kampanja
+    STATE: Stanje
+  CheckboxField:
+    NOANSWER: 'Ne'
+    YESANSWER: 'Da'
+  ConfirmedPasswordField:
+    SHOWONCLICKTITLE: 'Zamenjaj geslo'
+  ContentController:
+    NOTLOGGEDIN: 'Niste prijavljeni'
+  CreditCardField:
+    FIRST: prvi
+    FOURTH: četrti
+    SECOND: drugi
+    THIRD: tretji
+  CurrencyField:
+    CURRENCYSYMBOL: €
+  Date:
+    DAY: dan
+    DAYS: dni
+    HOUR: ura
+    HOURS: ur
+    LessThanMinuteAgo: 'manj kot minuto'
+    MIN: min
+    MINS: minut
+    MONTH: mesec
+    MONTHS: mesecev
+    SEC: sek
+    SECS: sekund
+    YEAR: leto
+    YEARS: let
+  DateField:
+    NOTSET: 'ni nastavljeno'
+    TODAY: danes
+    VALIDDATEFORMAT2: 'Prosimo vnesite veljavno obliko datuma ({format})'
+  DatetimeField:
+    NOTSET: 'Ni nastavljeno'
+  Director:
+    INVALID_REQUEST: 'Neveljavna zahteva'
+  DropdownField:
+    CHOOSE: (Izberi)
+    CHOOSESEARCH: '(Izberi ali poišči)'
+  EmailField:
+    VALIDATION: 'Prosimo vtipkajte e-poštni naslov'
+  File:
+    Content: Vsebina
+    CssType: 'CSS datoteka'
+    DocType: 'Word-ov dokument'
+    Filename: Ime datoteke
+    HtlType: 'HTML datoteka'
+    HtmlType: 'HTML datoteka'
+    JsType: 'Javascript datoteka'
+    Mp3Type: 'MP3 avdio datoteka'
+    MpgType: 'MPEG video datoteka'
+    Name: Ime
+    PLURALNAME: Datoteke
+    SINGULARNAME: Datoteka
+    Title: Naslov
+  Folder:
+    PLURALNAME: Mape
+    SINGULARNAME: Mapa
+  ForgotPasswordEmail_ss:
+    HELLO: Živjo
+    TEXT1: 'Tukaj je vaša'
+    TEXT2: 'povezava za resetiranje gesla'
+    TEXT3: za
+  Form:
+    SubmitBtnLabel: Pojdi
+  GridAction:
+    DELETE_DESCRIPTION: Izbriši
+    Delete: Izbriši
+    UnlinkRelation: Odstrani povezavo
+  GridField:
+    Add: 'Dodaj {name}'
+    Filter: Filter
+    FilterBy: 'Filtriraj po'
+    Find: Najdi
+    LEVELUP: 'Nivo višje'
+    NewRecord: 'Nov %s'
+    ResetFilter: Resetiraj
+  GridFieldDetailForm:
+    CancelBtn: Prekliči
+    Create: Ustvari
+    Delete: Izbriši
+    DeletePermissionsFailure: 'Nimate pravic za brisanje'
+    Deleted: 'Izbrisano %s %s'
+    Save: Shrani
+    Saved: 'Shranjeno {name} {link}'
+  GridFieldEditButton_ss:
+    EDIT: Uredi
+  GridFieldItemEditView:
+    Go_back: 'Nazaj'
+  Group:
+    AddRole: 'Dodaj vlogo za to skupino'
+    DefaultGroupTitleAdministrators: Administratorji
+    DefaultGroupTitleContentAuthors: 'Avtorji vsebine'
+    Description: Opis
+    Locked: 'Zaklenjeno?'
+    PLURALNAME: Skupine
+    Parent: 'Starševska skupina'
+    RolesAddEditLink: 'Uredi vloge'
+    SINGULARNAME: Skupina
+    Sort: 'Vrstni red sortiranja'
+    has_many_Permissions: Dovoljenja
+    many_many_Members: Člani
+  Member:
+    EDIT_PASSWORD: 'Novo geslo'
+    EMAIL: E-pošta
+    FIRSTNAME: 'Ime'
+    KEEPMESIGNEDIN: 'Zapomni si me prijavljenega'
+    LOGGEDINAS: 'Prijavljeni ste kot {name}.'
+    NEWPASSWORD: 'Novo geslo'
+    NoPassword: 'Uporabnik nima nastavljenega gesla.'
+    PASSWORD: Geslo
+    PLURALNAME: Uporabniki
+    REMEMBERME: 'Zapomni si me do naslednjič?'
+    SINGULARNAME: Uporabnik
+    SUBJECTPASSWORDCHANGED: 'Vaše geslo je bilo posodobljeno'
+    SURNAME: Priimek
+    TIMEFORMAT: 'Časovni zapis'
+    WELCOMEBACK: 'Dobrodošli nazaj, {firstname}'
+    YOUROLDPASSWORD: 'Vaše staro geslo'
+    belongs_many_many_Groups: Grupe
+    db_LastVisited: 'Nazadnje obiskano'
+    db_Password: Geslo
+    db_PasswordExpiry: 'Datum poteka gesla'
+  MemberAuthenticator:
+    TITLE: 'E-pošta in geslo'
+  MemberDatetimeOptionsetField:
+    Preview: Predogled
+  Permission:
+    AdminGroup: Administrator
+    CMS_ACCESS_CATEGORY: 'Dostop do CMS'
+    FULLADMINRIGHTS: 'Polne administratorske pravice'
+    PLURALNAME: Dovoljenja
+    SINGULARNAME: Dovoljenje
+  PermissionRole:
+    PLURALNAME: Vloge
+    SINGULARNAME: Vloga
+    Title: Naslov
+  Security:
+    CHANGEPASSWORDHEADER: 'Zamenjaj geslo'
+    ENTERNEWPASSWORD: 'Prosimo vtipkajte novo geslo.'
+    LOGIN: 'Prijava'
+    LOSTPASSWORDHEADER: 'Pozabljeno geslo'
+  SecurityAdmin:
+    MEMBERS: Uporabniki
+    MENUTITLE: Varnost
+    PERMISSIONS: Dovoljenja
+    ROLES: Vloge
+    TABROLES: Vloge
+    Users: Uporabniki
+  SecurityAdmin_MemberImportForm:
+    BtnImport: 'Uvozi iz CSV'
+  SilverStripeNavigator:
+    Edit: Uredi
+    EditView: 'Način urejanja'
+    Mobile: Mobilno
+    PreviewView: 'Način predogleda'
+    Responsive: Odzivno
+    SplitView: 'Razdeljeni način'
+    Tablet: Tablica
+    Width: širina
+  TableListField:
+    CSVEXPORT: 'Izvozi v CSV'
+    Print: Natisni
+  TableListField_PageControls_ss:
+    OF: od
+  ToggleField:
+    LESS: manj
+    MORE: več
+  UploadField:
+    ATTACHFILE: 'Pripini datoteko'
+    ATTACHFILES: 'Pripni datoteke'
+    AttachFile: 'Pripni datoteko/(e)'
+    CHOOSEANOTHERFILE: 'Izberite drugo datoteko'
+    DELETE: 'Izbriši iz datotek'
+    DELETEINFO: 'Trajno izbriši to datoteko iz shrambe datotek'
+    DOEDIT: Shrani
+    Dimensions: Dimenzije
+    EDIT: Uredi
+    EDITINFO: 'Uredi datoteko'
+    FIELDNOTSET: 'Ni informacij o datoteki'
+    FROMCOMPUTER: 'Iz vašega računalnika'
+    FROMCOMPUTERINFO: 'Izberite iz datotek'
+    FROMFILES: 'Iz datotek'
+    REMOVE: Odstrani
+    STARTALL: 'Zaženi vse'
+    Saved: Shranjeno
+  Versioned:
+    has_many_Versions: Verzije
+  VersionedGridFieldItemRequest:
+    ARCHIVE: Arhiv
+    Archived: 'Arhivirano %s %s'
+    BUTTONARCHIVEDESC: 'Odstrani iz objave in pošlji v arhiv'
+    BUTTONPUBLISH: Objavi
+    BUTTONUNPUBLISH: Odstrani iz objave
+    BUTTONUNPUBLISHDESC: 'Odstrani ta zapis iz objavljene strani'

security/Security.php

@@ -344,10 +344,8 @@ class Security extends Controller implements TemplateGlobalProvider {
 			if(in_array($authenticator, $authenticators)) {
 				return $authenticator;
 			}
-		} else {
-			return Authenticator::get_default_authenticator();
 		}
-
+		return Authenticator::get_default_authenticator();
 	}
 
 	/**

tests/core/ConfigTest.php

@@ -262,6 +262,19 @@ class ConfigTest extends SapphireTest {
 		$this->assertEquals(Object::static_lookup('ConfigTest_DefinesFooDoesntExtendObject', 'bar'), null);
 	}
 
+	public function testForClass() {
+		$config = ConfigTest_DefinesFoo::config();
+		// Set values
+		$this->assertTrue(isset($config->foo));
+		$this->assertFalse(empty($config->foo));
+		$this->assertEquals(1, $config->foo);
+		
+		// Unset values
+		$this->assertFalse(isset($config->bar));
+		$this->assertTrue(empty($config->bar));
+		$this->assertNull($config->bar);
+	}
+
 	public function testFragmentOrder() {
 		$this->markTestIncomplete();
 	}

tests/dev/MySQLDatabaseConfigurationHelperTest.php

@@ -74,6 +74,14 @@ class MySQLDatabaseConfigurationHelperTest extends SapphireTest {
 				. " WITH GRANT OPTION"
 		));
 
+		// Accept create on this database only
+		$this->assertNotEmpty($helper->checkDatabasePermissionGrant(
+			'database_name',
+			'create',
+			"GRANT ALL PRIVILEGES, CREATE ON \"database\\_name\".* TO 'root'@'localhost' IDENTIFIED BY PASSWORD 'XXXX'"
+				. " WITH GRANT OPTION"
+		));
+
 		// Accept create on any database (alternate wildcard syntax)
 		$this->assertNotEmpty($helper->checkDatabasePermissionGrant(
 			'database_name',