Merge branch '3.5' into 3

admin/code/LeftAndMain.php

@@ -1013,8 +1013,7 @@ class LeftAndMain extends Controller implements PermissionProvider {
 			}
 
 			$link = Controller::join_links($recordController->Link("show"), $record->ID);
-			$html = LeftAndMain_TreeNode::create($record, $link, $this->isCurrentPage($record))
+			$html = LeftAndMain_TreeNode::create($record, $link, $this->isCurrentPage($record))->forTemplate();
-				->forTemplate() . '</li>';
 
 			$data[$id] = array(
 				'html' => $html,
@@ -1990,16 +1989,21 @@ class LeftAndMain_TreeNode extends ViewableData {
 	 *
 	 * @todo Remove hardcoded assumptions around returning an <li>, by implementing recursive tree node rendering
 	 *
-	 * @return String
+	 * @return string
 	 */
 	public function forTemplate() {
 		$obj = $this->obj;
-		return "<li id=\"record-$obj->ID\" data-id=\"$obj->ID\" data-pagetype=\"$obj->ClassName\" class=\""
+
-			. $this->getClasses() . "\">" . "<ins class=\"jstree-icon\">&nbsp;</ins>"
+		return (string)SSViewer::execute_template('LeftAndMain_TreeNode', $obj, array(
-			. "<a href=\"" . $this->getLink() . "\" title=\"("
+			'Classes' => $this->getClasses(),
-			. trim(_t('LeftAndMain.PAGETYPE','Page type'), " :") // account for inconsistencies in translations
+			'Link' => $this->getLink(),
-			. ": " . $obj->i18n_singular_name() . ") $obj->Title\" ><ins class=\"jstree-icon\">&nbsp;</ins><span class=\"text\">" . ($obj->TreeTitle)
+			'Title' => sprintf(
-			. "</span></a>";
+				'(%s: %s) %s',
+				trim(_t('LeftAndMain.PAGETYPE','Page type'), " :"),
+				$obj->i18n_singular_name(),
+				$obj->Title
+			),
+		));
 	}
 
 	/**
@@ -2030,7 +2034,7 @@ class LeftAndMain_TreeNode extends ViewableData {
 			}
 			$classes .= ' ' . $filterClasses;
 		}
-		return $classes;
+		return $classes ?: '';
 	}
 
 	public function getObj() {

admin/javascript/lang/cs.js

@@ -18,9 +18,22 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
     "Campaigns.ITEM_SUMMARY_SINGULAR": "%s položka",
     "Campaigns.PUBLISHCAMPAIGN": "Zveřejnit kampaň",
     "Campaigns.REVERTCAMPAIGN": "Přepnout",
+    "File.NO_SIZE": "N/A",
+    "FormBuilderModal.CLOSE": "Close",
     "LeftAndMain.CONFIRMUNSAVED": "Určitě chcete opustit navigaci z této stránky?\n\nUPOZORNĚNÍ: Vaše změny nebyly uloženy.\n\nStlačte OK pro pokračovat, nebo Cancel, zůstanete na této stránce.",
     "LeftAndMain.CONFIRMUNSAVEDSHORT": "UPOZORNĚNÍ: Vaše změny nebyly uloženy.",
+    "LeftAndMain.JOIN": ",",
+    "LeftAndMain.JOINLAST": "and",
     "LeftAndMain.PAGEWASDELETED": "Tato stránka byla smazána. Pro editaci stránky, vyberte ji vlevo.",
+    "LeftAndMain.SEARCHCLEARRESULTS": "Clear search",
+    "LeftAndMain.SEARCHRESULTS": "Search results",
+    "LeftAndMain.SEARCHRESULTSMESSAGE": "Search results {parts}",
+    "LeftAndMain.SEARCHRESULTSMESSAGECATEGORY": "categorised as '{AppCategory}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDBETWEEN": "edited between '{CreatedFrom}' to '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDFROM": "edited from '{CreatedFrom}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDTO": "edited before '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEKEYWORDS": "with keywords '{Name}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGELIMIT": "limited to the folder '{Folder}'",
     "ModelAdmin.DELETED": "Smazáno",
     "ModelAdmin.REALLYDELETE": "Skutečně chcete smazat?",
     "ModelAdmin.SAVED": "Uloženo",

admin/javascript/lang/de.js

@@ -18,9 +18,22 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
     "Campaigns.ITEM_SUMMARY_SINGULAR": "%s Eintrag",
     "Campaigns.PUBLISHCAMPAIGN": "Publish campaign",
     "Campaigns.REVERTCAMPAIGN": "Revert",
+    "File.NO_SIZE": "N/A",
+    "FormBuilderModal.CLOSE": "Close",
     "LeftAndMain.CONFIRMUNSAVED": "Sind Sie sicher, dass Sie die Seite verlassen möchten?\n\nWARNUNG: Ihre Änderungen werden nicht gespeichert.\n\nDrücken Sie \"OK\" um fortzufahren, oder \"Abbrechen\" um auf dieser Seite zu bleiben.",
     "LeftAndMain.CONFIRMUNSAVEDSHORT": "WARNUNG: Ihre Änderungen wurden nicht gespeichert.",
+    "LeftAndMain.JOIN": ",",
+    "LeftAndMain.JOINLAST": "and",
     "LeftAndMain.PAGEWASDELETED": "Diese Seite wurde gelöscht.",
+    "LeftAndMain.SEARCHCLEARRESULTS": "Clear search",
+    "LeftAndMain.SEARCHRESULTS": "Search results",
+    "LeftAndMain.SEARCHRESULTSMESSAGE": "Search results {parts}",
+    "LeftAndMain.SEARCHRESULTSMESSAGECATEGORY": "categorised as '{AppCategory}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDBETWEEN": "edited between '{CreatedFrom}' to '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDFROM": "edited from '{CreatedFrom}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDTO": "edited before '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEKEYWORDS": "with keywords '{Name}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGELIMIT": "limited to the folder '{Folder}'",
     "ModelAdmin.DELETED": "Gelöscht",
     "ModelAdmin.REALLYDELETE": "Wirklich löschen?",
     "ModelAdmin.SAVED": "Gespeichert",

admin/javascript/lang/en.js

@@ -18,9 +18,22 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
     "Campaigns.ITEM_SUMMARY_SINGULAR": "%s item",
     "Campaigns.PUBLISHCAMPAIGN": "Publish campaign",
     "Campaigns.REVERTCAMPAIGN": "Revert",
+    "File.NO_SIZE": "N\/A",
+    "FormBuilderModal.CLOSE": "Close",
     "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.JOIN": ",",
+    "LeftAndMain.JOINLAST": "and",
     "LeftAndMain.PAGEWASDELETED": "This page was deleted.  To edit a page, select it from the left.",
+    "LeftAndMain.SEARCHCLEARRESULTS": "Clear search",
+    "LeftAndMain.SEARCHRESULTS": "Search results",
+    "LeftAndMain.SEARCHRESULTSMESSAGE": "Search results {parts}",
+    "LeftAndMain.SEARCHRESULTSMESSAGECATEGORY": "categorised as '{AppCategory}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDBETWEEN": "edited between '{CreatedFrom}' to '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDFROM": "edited from '{CreatedFrom}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDTO": "edited before '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEKEYWORDS": "with keywords '{Name}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGELIMIT": "limited to the folder '{Folder}'",
     "ModelAdmin.DELETED": "Deleted",
     "ModelAdmin.REALLYDELETE": "Do you really want to delete?",
     "ModelAdmin.SAVED": "Saved",

admin/javascript/lang/eo.js

@@ -18,9 +18,22 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
     "Campaigns.ITEM_SUMMARY_SINGULAR": "%s elemento",
     "Campaigns.PUBLISHCAMPAIGN": "Publikigi kampanjon",
     "Campaigns.REVERTCAMPAIGN": "Malfari",
+    "File.NO_SIZE": "N/A",
+    "FormBuilderModal.CLOSE": "Close",
     "LeftAndMain.CONFIRMUNSAVED": "Ĉu vi vere volas navigi for de ĉi tiu paĝo?\n\nAVERTO: Viaj ŝanĝoj ne estas konservitaj.\n\nPremu je Akcepti por daŭrigi, aŭ Nuligi por resti ĉe la aktuala paĝo.",
     "LeftAndMain.CONFIRMUNSAVEDSHORT": "AVERTO: Viaj ŝanĝoj ne estas konservitaj.",
+    "LeftAndMain.JOIN": ",",
+    "LeftAndMain.JOINLAST": "and",
     "LeftAndMain.PAGEWASDELETED": "Ĉi tiu paĝo estas forigita. Por redakti paĝon, elektu ĝin maldekstre.",
+    "LeftAndMain.SEARCHCLEARRESULTS": "Clear search",
+    "LeftAndMain.SEARCHRESULTS": "Search results",
+    "LeftAndMain.SEARCHRESULTSMESSAGE": "Search results {parts}",
+    "LeftAndMain.SEARCHRESULTSMESSAGECATEGORY": "categorised as '{AppCategory}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDBETWEEN": "edited between '{CreatedFrom}' to '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDFROM": "edited from '{CreatedFrom}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDTO": "edited before '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEKEYWORDS": "with keywords '{Name}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGELIMIT": "limited to the folder '{Folder}'",
     "ModelAdmin.DELETED": "Forigita",
     "ModelAdmin.REALLYDELETE": "Ĉi vi vere volas forigi?",
     "ModelAdmin.SAVED": "Konservita",

admin/javascript/lang/es.js

@@ -18,9 +18,22 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
     "Campaigns.ITEM_SUMMARY_SINGULAR": "%s item",
     "Campaigns.PUBLISHCAMPAIGN": "Publish campaign",
     "Campaigns.REVERTCAMPAIGN": "Revert",
+    "File.NO_SIZE": "N/A",
+    "FormBuilderModal.CLOSE": "Close",
     "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.",
+    "LeftAndMain.JOIN": ",",
+    "LeftAndMain.JOINLAST": "and",
     "LeftAndMain.PAGEWASDELETED": "Esta página fue eliminada. Para editar una página, seleccionarla desde la izquierda",
+    "LeftAndMain.SEARCHCLEARRESULTS": "Clear search",
+    "LeftAndMain.SEARCHRESULTS": "Search results",
+    "LeftAndMain.SEARCHRESULTSMESSAGE": "Search results {parts}",
+    "LeftAndMain.SEARCHRESULTSMESSAGECATEGORY": "categorised as '{AppCategory}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDBETWEEN": "edited between '{CreatedFrom}' to '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDFROM": "edited from '{CreatedFrom}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDTO": "edited before '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEKEYWORDS": "with keywords '{Name}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGELIMIT": "limited to the folder '{Folder}'",
     "ModelAdmin.DELETED": "Eliminado",
     "ModelAdmin.REALLYDELETE": "Estás seguro que quieres eliminarla?",
     "ModelAdmin.SAVED": "Guardado",

admin/javascript/lang/fa_IR.js

@@ -18,9 +18,22 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
     "Campaigns.ITEM_SUMMARY_SINGULAR": "%s آیتم",
     "Campaigns.PUBLISHCAMPAIGN": "انتشار کمپین",
     "Campaigns.REVERTCAMPAIGN": "بازگرداندن",
+    "File.NO_SIZE": "N/A",
+    "FormBuilderModal.CLOSE": "Close",
     "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": "هشدار: تغییرات شما ذخیره نشده‌اند.",
+    "LeftAndMain.JOIN": ",",
+    "LeftAndMain.JOINLAST": "and",
     "LeftAndMain.PAGEWASDELETED": "این صفحه حذف شده است. برای ویرایش یک صفحه، آن‌را از لیست چپ انتخاب نمایید.",
+    "LeftAndMain.SEARCHCLEARRESULTS": "Clear search",
+    "LeftAndMain.SEARCHRESULTS": "Search results",
+    "LeftAndMain.SEARCHRESULTSMESSAGE": "Search results {parts}",
+    "LeftAndMain.SEARCHRESULTSMESSAGECATEGORY": "categorised as '{AppCategory}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDBETWEEN": "edited between '{CreatedFrom}' to '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDFROM": "edited from '{CreatedFrom}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDTO": "edited before '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEKEYWORDS": "with keywords '{Name}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGELIMIT": "limited to the folder '{Folder}'",
     "ModelAdmin.DELETED": "حذف شده",
     "ModelAdmin.REALLYDELETE": "آیا واقعاً می‌خواهید حذف نمایید؟",
     "ModelAdmin.SAVED": "ذخیره شده",

admin/javascript/lang/fi.js

@@ -8,7 +8,7 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
   ss.i18n.addDictionary('fi', {
     "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_DELETELIVE_PROMPT": "Sinulla on {num} sivu(a) valittuna.\n\nHaluatko varmasti poistaa nämä sivut näkyvistä?",
-    "CMSMAIN.BATCH_DELETE_PROMPT": "Sinulla on {num} sivu(a) valittuna.\n\nHaluatko varmasti poistaa?",
+    "CMSMAIN.BATCH_DELETE_PROMPT": "Sinulla on {num} sivu(a) valittuna.\n\nHaluatko varmasti poistaa ne?",
     "CMSMAIN.BATCH_PUBLISH_PROMPT": "Sinulla on {num} sivu(a) valittuna.\n\nHaluatko varmasti julkaista?",
     "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_UNPUBLISH_PROMPT": "Sinulla on {num} sivu(a) valittuna.\n\nHaluatko varmasti poistaa julkaisusta?",
@@ -18,9 +18,22 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
     "Campaigns.ITEM_SUMMARY_SINGULAR": "%s kohde",
     "Campaigns.PUBLISHCAMPAIGN": "Julkaise kampanja",
     "Campaigns.REVERTCAMPAIGN": "Palauta",
+    "File.NO_SIZE": "Ei yhtään",
+    "FormBuilderModal.CLOSE": "Sulje",
     "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.",
+    "LeftAndMain.JOIN": ",",
+    "LeftAndMain.JOINLAST": "ja",
     "LeftAndMain.PAGEWASDELETED": "Sivu on poistettu. Valitse sivu muokattavaksesi vasemmalta.",
+    "LeftAndMain.SEARCHCLEARRESULTS": "Tyhjennä haku",
+    "LeftAndMain.SEARCHRESULTS": "Hakutulokset",
+    "LeftAndMain.SEARCHRESULTSMESSAGE": "Hakutulokset {parts}",
+    "LeftAndMain.SEARCHRESULTSMESSAGECATEGORY": "Kategorioitu nimellä '{AppCategory}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDBETWEEN": "muokattu välillä '{CreatedFrom}'–'{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDFROM": "muokattu kohteesta '{CreatedFrom}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDTO": "muokattu ennen '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEKEYWORDS": "avainsanoilla '{Name}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGELIMIT": "rajoitettu kansioon '{Folder}'",
     "ModelAdmin.DELETED": "Poistettu",
     "ModelAdmin.REALLYDELETE": "Haluatko varmasti poistaa?",
     "ModelAdmin.SAVED": "Tallennettu",

admin/javascript/lang/fr.js

@@ -18,9 +18,22 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
     "Campaigns.ITEM_SUMMARY_SINGULAR": "%s item",
     "Campaigns.PUBLISHCAMPAIGN": "Publish campaign",
     "Campaigns.REVERTCAMPAIGN": "Revert",
+    "File.NO_SIZE": "N/A",
+    "FormBuilderModal.CLOSE": "Close",
     "LeftAndMain.CONFIRMUNSAVED": "Etes-vous sûr de vouloir quitter cette page ?\n\nATTENTION: Vos changements n'ont pas été sauvegardés.\n\nCliquez sur OK pour continuer, ou sur Annuler pour rester sur la page actuelle.",
     "LeftAndMain.CONFIRMUNSAVEDSHORT": "WARNING: Your changes have not been saved.",
+    "LeftAndMain.JOIN": ",",
+    "LeftAndMain.JOINLAST": "and",
     "LeftAndMain.PAGEWASDELETED": "Cette page a été supprimée. Pour éditer cette page, veuillez la sélectionner à gauche.",
+    "LeftAndMain.SEARCHCLEARRESULTS": "Clear search",
+    "LeftAndMain.SEARCHRESULTS": "Search results",
+    "LeftAndMain.SEARCHRESULTSMESSAGE": "Search results {parts}",
+    "LeftAndMain.SEARCHRESULTSMESSAGECATEGORY": "categorised as '{AppCategory}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDBETWEEN": "edited between '{CreatedFrom}' to '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDFROM": "edited from '{CreatedFrom}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDTO": "edited before '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEKEYWORDS": "with keywords '{Name}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGELIMIT": "limited to the folder '{Folder}'",
     "ModelAdmin.DELETED": "Supprimé",
     "ModelAdmin.REALLYDELETE": "Etes-vous sûr de vouloir supprimer ?",
     "ModelAdmin.SAVED": "Sauvegardé",

admin/javascript/lang/hr.js

@@ -8,7 +8,7 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
   ss.i18n.addDictionary('hr', {
     "CMSMAIN.BATCH_ARCHIVE_PROMPT": "Imate {num} stranicu(e) označeno.\n\nJeste li sigurni da želite arhivirati ove stranice?\n\nOve stranice i sve stranice ispod nje će biti neobjavljene i poslane u arhivu.",
     "CMSMAIN.BATCH_DELETELIVE_PROMPT": "Imate {num} stranica(e) označeno.\n\nJeste li sigurni da želite obrisati ove stranice s objavljenog?",
-    "CMSMAIN.BATCH_DELETE_PROMPT": "Označili ste {num} stranicu(a).\n\nJeste li sigurni da želite obrisati?",
+    "CMSMAIN.BATCH_DELETE_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to delete?",
     "CMSMAIN.BATCH_PUBLISH_PROMPT": "Označili ste {num} stranicu(a).\n\nJeste li sigurni da želite objaviti?",
     "CMSMAIN.BATCH_RESTORE_PROMPT": "Imate {num} stranica(e) označeno.\n\nJeste li sigurni da želite vratiti ove stranice?\n\nSve podstranice će biti vraćene u najviši nivo, osim ako te stranice su vraćene.",
     "CMSMAIN.BATCH_UNPUBLISH_PROMPT": "Označili ste {num} stranicu(a).\n\nJeste li sigurni da želite odjaviti?",
@@ -18,9 +18,22 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
     "Campaigns.ITEM_SUMMARY_SINGULAR": "%s stavka",
     "Campaigns.PUBLISHCAMPAIGN": "Objavi kampanju",
     "Campaigns.REVERTCAMPAIGN": "Vrati",
+    "File.NO_SIZE": "N/A",
+    "FormBuilderModal.CLOSE": "Close",
     "LeftAndMain.CONFIRMUNSAVED": "Jeste li sigurni da želite otići s ove stranice?\n\nUPOZORENJE: Vaše promjene nisu spremljene.\n\nPritisnike OK za nastavka, ili Odustani za ostati na trenutnoj stranici.",
     "LeftAndMain.CONFIRMUNSAVEDSHORT": "UPOZORENJE: Vaše promjene nisu spremljene.",
+    "LeftAndMain.JOIN": ",",
+    "LeftAndMain.JOINLAST": "and",
     "LeftAndMain.PAGEWASDELETED": "Ova stranica je obrisana. Za uređivanje stranice, odaberite je s lijeve stranice.",
+    "LeftAndMain.SEARCHCLEARRESULTS": "Clear search",
+    "LeftAndMain.SEARCHRESULTS": "Search results",
+    "LeftAndMain.SEARCHRESULTSMESSAGE": "Search results {parts}",
+    "LeftAndMain.SEARCHRESULTSMESSAGECATEGORY": "categorised as '{AppCategory}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDBETWEEN": "edited between '{CreatedFrom}' to '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDFROM": "edited from '{CreatedFrom}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDTO": "edited before '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEKEYWORDS": "with keywords '{Name}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGELIMIT": "limited to the folder '{Folder}'",
     "ModelAdmin.DELETED": "Obrisano",
     "ModelAdmin.REALLYDELETE": "Jeste li sigurni da želite obrisati?",
     "ModelAdmin.SAVED": "Spremljeno",

admin/javascript/lang/id.js

@@ -18,9 +18,22 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
     "Campaigns.ITEM_SUMMARY_SINGULAR": "%s item",
     "Campaigns.PUBLISHCAMPAIGN": "Publish campaign",
     "Campaigns.REVERTCAMPAIGN": "Revert",
+    "File.NO_SIZE": "N/A",
+    "FormBuilderModal.CLOSE": "Close",
     "LeftAndMain.CONFIRMUNSAVED": "Anda ingin tinggalkan laman ini?\n\nPERINGATAN: Perubahan tidak akan disimpan.\n\nTekan OK untuk lanjut, atau Batal untuk tetap di laman ini.",
     "LeftAndMain.CONFIRMUNSAVEDSHORT": "PERINGATAN: Perubahan tidak akan disimpan.",
+    "LeftAndMain.JOIN": ",",
+    "LeftAndMain.JOINLAST": "and",
     "LeftAndMain.PAGEWASDELETED": "Laman sudah terhapus. Untuk mengedit, pilih pada sisi kiri.",
+    "LeftAndMain.SEARCHCLEARRESULTS": "Clear search",
+    "LeftAndMain.SEARCHRESULTS": "Search results",
+    "LeftAndMain.SEARCHRESULTSMESSAGE": "Search results {parts}",
+    "LeftAndMain.SEARCHRESULTSMESSAGECATEGORY": "categorised as '{AppCategory}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDBETWEEN": "edited between '{CreatedFrom}' to '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDFROM": "edited from '{CreatedFrom}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDTO": "edited before '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEKEYWORDS": "with keywords '{Name}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGELIMIT": "limited to the folder '{Folder}'",
     "ModelAdmin.DELETED": "Terhapus",
     "ModelAdmin.REALLYDELETE": "Anda yakin ingin menghapus?",
     "ModelAdmin.SAVED": "Tersimpan",

admin/javascript/lang/id_ID.js

@@ -18,9 +18,22 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
     "Campaigns.ITEM_SUMMARY_SINGULAR": "%s item",
     "Campaigns.PUBLISHCAMPAIGN": "Publish campaign",
     "Campaigns.REVERTCAMPAIGN": "Revert",
+    "File.NO_SIZE": "N/A",
+    "FormBuilderModal.CLOSE": "Close",
     "LeftAndMain.CONFIRMUNSAVED": "Anda ingin tinggalkan laman ini?\n\nPERINGATAN: Perubahan tidak akan disimpan.\n\nTekan OK untuk lanjut, atau Batal untuk tetap di laman ini.",
     "LeftAndMain.CONFIRMUNSAVEDSHORT": "PERINGATAN: Perubahan tidak akan disimpan.",
+    "LeftAndMain.JOIN": ",",
+    "LeftAndMain.JOINLAST": "and",
     "LeftAndMain.PAGEWASDELETED": "Laman sudah terhapus. Untuk mengedit, pilih pada sisi kiri.",
+    "LeftAndMain.SEARCHCLEARRESULTS": "Clear search",
+    "LeftAndMain.SEARCHRESULTS": "Search results",
+    "LeftAndMain.SEARCHRESULTSMESSAGE": "Search results {parts}",
+    "LeftAndMain.SEARCHRESULTSMESSAGECATEGORY": "categorised as '{AppCategory}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDBETWEEN": "edited between '{CreatedFrom}' to '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDFROM": "edited from '{CreatedFrom}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDTO": "edited before '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEKEYWORDS": "with keywords '{Name}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGELIMIT": "limited to the folder '{Folder}'",
     "ModelAdmin.DELETED": "Terhapus",
     "ModelAdmin.REALLYDELETE": "Anda yakin ingin menghapus?",
     "ModelAdmin.SAVED": "Tersimpan",

admin/javascript/lang/it.js

@@ -8,7 +8,7 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
   ss.i18n.addDictionary('it', {
     "CMSMAIN.BATCH_ARCHIVE_PROMPT": "Hai selezionato {num} pagina(e).\n\nSei sicuro di volerle archiviare?\n\nQueste pagine insieme a tutte le pagine figlio saranno spubblicate ed archiviate.",
     "CMSMAIN.BATCH_DELETELIVE_PROMPT": "Hai {num} pagine selezionate.\n\nVuoi veramente eliminare queste pagine dal sito live?",
-    "CMSMAIN.BATCH_DELETE_PROMPT": "Hai {num} pagina(e) selezionate.\n\nVuoi veramente eliminarle?",
+    "CMSMAIN.BATCH_DELETE_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to delete?",
     "CMSMAIN.BATCH_PUBLISH_PROMPT": "Hai {num} pagine selezionate.\n\nVuoi veramente pubblicarle?",
     "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?",
@@ -18,9 +18,22 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
     "Campaigns.ITEM_SUMMARY_SINGULAR": "%s elemento",
     "Campaigns.PUBLISHCAMPAIGN": "Pubblica campagna",
     "Campaigns.REVERTCAMPAIGN": "Ripristina",
+    "File.NO_SIZE": "N/A",
+    "FormBuilderModal.CLOSE": "Close",
     "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.JOIN": ",",
+    "LeftAndMain.JOINLAST": "and",
     "LeftAndMain.PAGEWASDELETED": "Questa pagina è stata eliminata. Per modificare questa pagine, selezionarla a sinistra.",
+    "LeftAndMain.SEARCHCLEARRESULTS": "Clear search",
+    "LeftAndMain.SEARCHRESULTS": "Search results",
+    "LeftAndMain.SEARCHRESULTSMESSAGE": "Search results {parts}",
+    "LeftAndMain.SEARCHRESULTSMESSAGECATEGORY": "categorised as '{AppCategory}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDBETWEEN": "edited between '{CreatedFrom}' to '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDFROM": "edited from '{CreatedFrom}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDTO": "edited before '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEKEYWORDS": "with keywords '{Name}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGELIMIT": "limited to the folder '{Folder}'",
     "ModelAdmin.DELETED": "Eliminato",
     "ModelAdmin.REALLYDELETE": "Si è sicuri di voler eliminare?",
     "ModelAdmin.SAVED": "Salvato",

admin/javascript/lang/ja.js

@@ -18,9 +18,22 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
     "Campaigns.ITEM_SUMMARY_SINGULAR": "%s item",
     "Campaigns.PUBLISHCAMPAIGN": "Publish campaign",
     "Campaigns.REVERTCAMPAIGN": "Revert",
+    "File.NO_SIZE": "N/A",
+    "FormBuilderModal.CLOSE": "Close",
     "LeftAndMain.CONFIRMUNSAVED": "このページから移動しても良いですか?\n\n警告: あなたの変更は保存されていません．\n\n続行するにはOKを押してください．キャンセルをクリックするとこのページにとどまります．",
     "LeftAndMain.CONFIRMUNSAVEDSHORT": "警告: あなたの変更は保存されていません．",
+    "LeftAndMain.JOIN": ",",
+    "LeftAndMain.JOINLAST": "and",
     "LeftAndMain.PAGEWASDELETED": "このページは削除されました．ページを編集するには，左から選択してください．",
+    "LeftAndMain.SEARCHCLEARRESULTS": "Clear search",
+    "LeftAndMain.SEARCHRESULTS": "Search results",
+    "LeftAndMain.SEARCHRESULTSMESSAGE": "Search results {parts}",
+    "LeftAndMain.SEARCHRESULTSMESSAGECATEGORY": "categorised as '{AppCategory}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDBETWEEN": "edited between '{CreatedFrom}' to '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDFROM": "edited from '{CreatedFrom}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDTO": "edited before '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEKEYWORDS": "with keywords '{Name}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGELIMIT": "limited to the folder '{Folder}'",
     "ModelAdmin.DELETED": "削除しました",
     "ModelAdmin.REALLYDELETE": "本当に削除しますか?",
     "ModelAdmin.SAVED": "保存しました",

admin/javascript/lang/lt.js

@@ -18,9 +18,22 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
     "Campaigns.ITEM_SUMMARY_SINGULAR": "%s item",
     "Campaigns.PUBLISHCAMPAIGN": "Publish campaign",
     "Campaigns.REVERTCAMPAIGN": "Revert",
+    "File.NO_SIZE": "N/A",
+    "FormBuilderModal.CLOSE": "Close",
     "LeftAndMain.CONFIRMUNSAVED": "Ar tikrai norite išeiti iš šio puslapio?\n\nDĖMESIO: Jūsų pakeitimai neišsaugoti.\n\nNorėdami tęsti, spauskite OK, jeigu norite likti, spauskite Cancel.",
     "LeftAndMain.CONFIRMUNSAVEDSHORT": "DĖMESIO: Jūsų pakeitimai neišsaugoti.",
+    "LeftAndMain.JOIN": ",",
+    "LeftAndMain.JOINLAST": "and",
     "LeftAndMain.PAGEWASDELETED": "Šis puslapis ištrintas. Norėdami redaguoti puslapį, pasirinkite jį kairėje.",
+    "LeftAndMain.SEARCHCLEARRESULTS": "Clear search",
+    "LeftAndMain.SEARCHRESULTS": "Search results",
+    "LeftAndMain.SEARCHRESULTSMESSAGE": "Search results {parts}",
+    "LeftAndMain.SEARCHRESULTSMESSAGECATEGORY": "categorised as '{AppCategory}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDBETWEEN": "edited between '{CreatedFrom}' to '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDFROM": "edited from '{CreatedFrom}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDTO": "edited before '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEKEYWORDS": "with keywords '{Name}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGELIMIT": "limited to the folder '{Folder}'",
     "ModelAdmin.DELETED": "Ištrinta",
     "ModelAdmin.REALLYDELETE": "Ar tikrai norite ištrinti?",
     "ModelAdmin.SAVED": "Išsaugota",

admin/javascript/lang/mi.js

@@ -18,9 +18,22 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
     "Campaigns.ITEM_SUMMARY_SINGULAR": "%s item",
     "Campaigns.PUBLISHCAMPAIGN": "Publish campaign",
     "Campaigns.REVERTCAMPAIGN": "Whakahokia",
+    "File.NO_SIZE": "N/A",
+    "FormBuilderModal.CLOSE": "Close",
     "LeftAndMain.CONFIRMUNSAVED": "Kei te hiahia whakatere atu i tēnei whārangi?\n\nWHAKATŪPATO: Kāore anō ō huringa kia tiakina.\n\nPēhi AE kia haere tonu, Whakakore rānei kia noho i te whārangi onāianei.",
     "LeftAndMain.CONFIRMUNSAVEDSHORT": "WHAKATŪPATO: Kāore anō ō huringa kia tiakina.",
+    "LeftAndMain.JOIN": ",",
+    "LeftAndMain.JOINLAST": "and",
     "LeftAndMain.PAGEWASDELETED": "I mukua tēnei whārangi.  Hei whakatika i tētahi whārangi, tīpakohia i te taha mauī.",
+    "LeftAndMain.SEARCHCLEARRESULTS": "Clear search",
+    "LeftAndMain.SEARCHRESULTS": "Search results",
+    "LeftAndMain.SEARCHRESULTSMESSAGE": "Search results {parts}",
+    "LeftAndMain.SEARCHRESULTSMESSAGECATEGORY": "categorised as '{AppCategory}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDBETWEEN": "edited between '{CreatedFrom}' to '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDFROM": "edited from '{CreatedFrom}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDTO": "edited before '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEKEYWORDS": "with keywords '{Name}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGELIMIT": "limited to the folder '{Folder}'",
     "ModelAdmin.DELETED": "Kua Mukua",
     "ModelAdmin.REALLYDELETE": "Kei te tino hiahia muku?",
     "ModelAdmin.SAVED": "Kua Tiakina",

admin/javascript/lang/nb.js

@@ -18,9 +18,22 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
     "Campaigns.ITEM_SUMMARY_SINGULAR": "%s item",
     "Campaigns.PUBLISHCAMPAIGN": "Publish campaign",
     "Campaigns.REVERTCAMPAIGN": "Revert",
+    "File.NO_SIZE": "N/A",
+    "FormBuilderModal.CLOSE": "Close",
     "LeftAndMain.CONFIRMUNSAVED": "Er du sikker på at du vil forlate denne siden?\n\nADVARSEL: Endringene din har ikke blitt lagret.\n\nTrykk OK for å fortsette eller Avbryt for å holde deg på samme side.",
     "LeftAndMain.CONFIRMUNSAVEDSHORT": "ADVARSEL: Endringene dine har ikke blitt lagret.",
+    "LeftAndMain.JOIN": ",",
+    "LeftAndMain.JOINLAST": "and",
     "LeftAndMain.PAGEWASDELETED": "Denne siden ble slettet. For å redigere en side, velg den fra listen til venstre.",
+    "LeftAndMain.SEARCHCLEARRESULTS": "Clear search",
+    "LeftAndMain.SEARCHRESULTS": "Search results",
+    "LeftAndMain.SEARCHRESULTSMESSAGE": "Search results {parts}",
+    "LeftAndMain.SEARCHRESULTSMESSAGECATEGORY": "categorised as '{AppCategory}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDBETWEEN": "edited between '{CreatedFrom}' to '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDFROM": "edited from '{CreatedFrom}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDTO": "edited before '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEKEYWORDS": "with keywords '{Name}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGELIMIT": "limited to the folder '{Folder}'",
     "ModelAdmin.DELETED": "Slettet",
     "ModelAdmin.REALLYDELETE": "Vil du virkelig slette?",
     "ModelAdmin.SAVED": "Lagret",

admin/javascript/lang/nl.js

@@ -18,9 +18,22 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
     "Campaigns.ITEM_SUMMARY_SINGULAR": "%s item",
     "Campaigns.PUBLISHCAMPAIGN": "Publish campaign",
     "Campaigns.REVERTCAMPAIGN": "Revert",
+    "File.NO_SIZE": "N/A",
+    "FormBuilderModal.CLOSE": "Close",
     "LeftAndMain.CONFIRMUNSAVED": "Weet u zeker dat u deze pagina wilt verlaten?\nWAARSCHUWING: Uw veranderingen zijn niet opgeslagen.\n\nKies OK om te verlaten, of Cancel om op de huidige pagina te blijven.",
     "LeftAndMain.CONFIRMUNSAVEDSHORT": "WAARSCHUWING: Uw veranderingen zijn niet opgeslagen",
+    "LeftAndMain.JOIN": ",",
+    "LeftAndMain.JOINLAST": "and",
     "LeftAndMain.PAGEWASDELETED": "Deze pagina is verwijderd. Om een pagina aan te passen, selecteer deze aan de linkerkant.",
+    "LeftAndMain.SEARCHCLEARRESULTS": "Clear search",
+    "LeftAndMain.SEARCHRESULTS": "Search results",
+    "LeftAndMain.SEARCHRESULTSMESSAGE": "Search results {parts}",
+    "LeftAndMain.SEARCHRESULTSMESSAGECATEGORY": "categorised as '{AppCategory}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDBETWEEN": "edited between '{CreatedFrom}' to '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDFROM": "edited from '{CreatedFrom}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDTO": "edited before '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEKEYWORDS": "with keywords '{Name}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGELIMIT": "limited to the folder '{Folder}'",
     "ModelAdmin.DELETED": "Verwijderd",
     "ModelAdmin.REALLYDELETE": "Weet u zeker dat u wilt verwijderen?",
     "ModelAdmin.SAVED": "Opgeslagen",

admin/javascript/lang/pl.js

@@ -18,9 +18,22 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
     "Campaigns.ITEM_SUMMARY_SINGULAR": "%s item",
     "Campaigns.PUBLISHCAMPAIGN": "Publish campaign",
     "Campaigns.REVERTCAMPAIGN": "Revert",
+    "File.NO_SIZE": "N/A",
+    "FormBuilderModal.CLOSE": "Close",
     "LeftAndMain.CONFIRMUNSAVED": "Czy na pewno chcesz kontynuować nawigację poza tą stronę?\n\nUWAGA: Twoje zmiany nie zostały zapisane.\n\nWciśnij OK aby kontynuować, wciśnij Anuluj aby pozostać na tej stronie.",
     "LeftAndMain.CONFIRMUNSAVEDSHORT": "UWAGA: Twoje zmiany nie zostały zapisane.",
+    "LeftAndMain.JOIN": ",",
+    "LeftAndMain.JOINLAST": "and",
     "LeftAndMain.PAGEWASDELETED": "Ta strona została usunięta. Wybierz stronę z listy aby rozpocząć edycję.",
+    "LeftAndMain.SEARCHCLEARRESULTS": "Clear search",
+    "LeftAndMain.SEARCHRESULTS": "Search results",
+    "LeftAndMain.SEARCHRESULTSMESSAGE": "Search results {parts}",
+    "LeftAndMain.SEARCHRESULTSMESSAGECATEGORY": "categorised as '{AppCategory}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDBETWEEN": "edited between '{CreatedFrom}' to '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDFROM": "edited from '{CreatedFrom}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDTO": "edited before '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEKEYWORDS": "with keywords '{Name}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGELIMIT": "limited to the folder '{Folder}'",
     "ModelAdmin.DELETED": "Usunięto",
     "ModelAdmin.REALLYDELETE": "Na pewno usunąć?",
     "ModelAdmin.SAVED": "Zapisano",

admin/javascript/lang/ro.js

@@ -18,9 +18,22 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
     "Campaigns.ITEM_SUMMARY_SINGULAR": "%s item",
     "Campaigns.PUBLISHCAMPAIGN": "Publish campaign",
     "Campaigns.REVERTCAMPAIGN": "Revert",
+    "File.NO_SIZE": "N/A",
+    "FormBuilderModal.CLOSE": "Close",
     "LeftAndMain.CONFIRMUNSAVED": "Sunteți sigur că doriți să părăsiți pagina?\n\nAVERTISMENT: Modificările nu au fost salvate.\n\nApăsați OK pentru a continua, sau Anulați pentru a rămâne pe pagina curentă.",
     "LeftAndMain.CONFIRMUNSAVEDSHORT": "AVERTISMENT: Modificările nu au fost salvate.",
+    "LeftAndMain.JOIN": ",",
+    "LeftAndMain.JOINLAST": "and",
     "LeftAndMain.PAGEWASDELETED": "Această pagină a fost ștearsă. Pentru a edita pagina, selectați-o din stânga.",
+    "LeftAndMain.SEARCHCLEARRESULTS": "Clear search",
+    "LeftAndMain.SEARCHRESULTS": "Search results",
+    "LeftAndMain.SEARCHRESULTSMESSAGE": "Search results {parts}",
+    "LeftAndMain.SEARCHRESULTSMESSAGECATEGORY": "categorised as '{AppCategory}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDBETWEEN": "edited between '{CreatedFrom}' to '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDFROM": "edited from '{CreatedFrom}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDTO": "edited before '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEKEYWORDS": "with keywords '{Name}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGELIMIT": "limited to the folder '{Folder}'",
     "ModelAdmin.DELETED": "Șters",
     "ModelAdmin.REALLYDELETE": "Sigur doriți să ștergeți?",
     "ModelAdmin.SAVED": "Salvat",

admin/javascript/lang/ru.js

@@ -18,9 +18,22 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
     "Campaigns.ITEM_SUMMARY_SINGULAR": "%s элемент",
     "Campaigns.PUBLISHCAMPAIGN": "Опубликовать кампанию",
     "Campaigns.REVERTCAMPAIGN": "Отменить",
+    "File.NO_SIZE": "N/A",
+    "FormBuilderModal.CLOSE": "Close",
     "LeftAndMain.CONFIRMUNSAVED": "Вы действительно хотите покинуть эту страницу?\n\nВНИМАНИЕ: Ваши изменения не были сохранены.\n\nНажмите ОК, чтобы продолжить или Отмена, чтобы остаться на текущей странице.",
     "LeftAndMain.CONFIRMUNSAVEDSHORT": "ВНИМАНИЕ: Ваши изменения не были сохранены",
+    "LeftAndMain.JOIN": ",",
+    "LeftAndMain.JOINLAST": "and",
     "LeftAndMain.PAGEWASDELETED": "Эта страница была удалена. Чтобы изменить страницу, выберите её из списка слева.",
+    "LeftAndMain.SEARCHCLEARRESULTS": "Clear search",
+    "LeftAndMain.SEARCHRESULTS": "Search results",
+    "LeftAndMain.SEARCHRESULTSMESSAGE": "Search results {parts}",
+    "LeftAndMain.SEARCHRESULTSMESSAGECATEGORY": "categorised as '{AppCategory}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDBETWEEN": "edited between '{CreatedFrom}' to '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDFROM": "edited from '{CreatedFrom}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDTO": "edited before '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEKEYWORDS": "with keywords '{Name}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGELIMIT": "limited to the folder '{Folder}'",
     "ModelAdmin.DELETED": "Удалено",
     "ModelAdmin.REALLYDELETE": "Вы действительно хотите удалить?",
     "ModelAdmin.SAVED": "Сохранено",

admin/javascript/lang/sk.js

@@ -18,9 +18,22 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
     "Campaigns.ITEM_SUMMARY_SINGULAR": "%s položka",
     "Campaigns.PUBLISHCAMPAIGN": "Zverejniť kampaň",
     "Campaigns.REVERTCAMPAIGN": "Prepnúť",
+    "File.NO_SIZE": "N/A",
+    "FormBuilderModal.CLOSE": "Close",
     "LeftAndMain.CONFIRMUNSAVED": "Určite chcete opustiť navigáciu z tejto stránky?\n\nUPOZORNENIE: Vaše zmeny neboli uložené.\n\nStlačte OK pre pokračovať, alebo Cancel, ostanete na teto stránke.",
     "LeftAndMain.CONFIRMUNSAVEDSHORT": "UPOZORNENIE: Vaše zmeny neboli uložené.",
+    "LeftAndMain.JOIN": ",",
+    "LeftAndMain.JOINLAST": "and",
     "LeftAndMain.PAGEWASDELETED": "Táto stránka bola zmazaná. Pre editáciu stránky, vyberte ju vľavo.",
+    "LeftAndMain.SEARCHCLEARRESULTS": "Clear search",
+    "LeftAndMain.SEARCHRESULTS": "Search results",
+    "LeftAndMain.SEARCHRESULTSMESSAGE": "Search results {parts}",
+    "LeftAndMain.SEARCHRESULTSMESSAGECATEGORY": "categorised as '{AppCategory}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDBETWEEN": "edited between '{CreatedFrom}' to '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDFROM": "edited from '{CreatedFrom}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDTO": "edited before '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEKEYWORDS": "with keywords '{Name}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGELIMIT": "limited to the folder '{Folder}'",
     "ModelAdmin.DELETED": "Zmazané",
     "ModelAdmin.REALLYDELETE": "Skutočně chcete zmazať?",
     "ModelAdmin.SAVED": "Uložené",

admin/javascript/lang/sl.js

@@ -18,9 +18,22 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
     "Campaigns.ITEM_SUMMARY_SINGULAR": "%s item",
     "Campaigns.PUBLISHCAMPAIGN": "Publish campaign",
     "Campaigns.REVERTCAMPAIGN": "Revert",
+    "File.NO_SIZE": "N/A",
+    "FormBuilderModal.CLOSE": "Close",
     "LeftAndMain.CONFIRMUNSAVED": "Res želite zapusitit stran?\n\nOPOZORILO: spremembe niso bile shranjene\n\nKliknite OK za nadaljevanje ali Prekliči, da ostanete na trenutni strani.",
     "LeftAndMain.CONFIRMUNSAVEDSHORT": "OPOZORILO: spremembe niso bile shranjene.",
+    "LeftAndMain.JOIN": ",",
+    "LeftAndMain.JOINLAST": "and",
     "LeftAndMain.PAGEWASDELETED": "Stran je bila izbrisana. Za urejanje izberite stran na levi.",
+    "LeftAndMain.SEARCHCLEARRESULTS": "Clear search",
+    "LeftAndMain.SEARCHRESULTS": "Search results",
+    "LeftAndMain.SEARCHRESULTSMESSAGE": "Search results {parts}",
+    "LeftAndMain.SEARCHRESULTSMESSAGECATEGORY": "categorised as '{AppCategory}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDBETWEEN": "edited between '{CreatedFrom}' to '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDFROM": "edited from '{CreatedFrom}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDTO": "edited before '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEKEYWORDS": "with keywords '{Name}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGELIMIT": "limited to the folder '{Folder}'",
     "ModelAdmin.DELETED": "Izbrisano",
     "ModelAdmin.REALLYDELETE": "Izbrišem?",
     "ModelAdmin.SAVED": "Shranjeno",

admin/javascript/lang/sl_SI.js

@@ -18,9 +18,22 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
     "Campaigns.ITEM_SUMMARY_SINGULAR": "%s predmet",
     "Campaigns.PUBLISHCAMPAIGN": "Objavi kampanjo",
     "Campaigns.REVERTCAMPAIGN": "Povrni",
+    "File.NO_SIZE": "N/A",
+    "FormBuilderModal.CLOSE": "Close",
     "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.JOIN": ",",
+    "LeftAndMain.JOINLAST": "and",
     "LeftAndMain.PAGEWASDELETED": "Ta stran je bila izbrisana. Če želite urediti stran, jo najprej izberite na levi strani.",
+    "LeftAndMain.SEARCHCLEARRESULTS": "Clear search",
+    "LeftAndMain.SEARCHRESULTS": "Search results",
+    "LeftAndMain.SEARCHRESULTSMESSAGE": "Search results {parts}",
+    "LeftAndMain.SEARCHRESULTSMESSAGECATEGORY": "categorised as '{AppCategory}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDBETWEEN": "edited between '{CreatedFrom}' to '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDFROM": "edited from '{CreatedFrom}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDTO": "edited before '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEKEYWORDS": "with keywords '{Name}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGELIMIT": "limited to the folder '{Folder}'",
     "ModelAdmin.DELETED": "Izbrisano",
     "ModelAdmin.REALLYDELETE": "Ste prepričani, da želite izbrisati?",
     "ModelAdmin.SAVED": "Shranjeno",

admin/javascript/lang/sr.js

@@ -18,9 +18,22 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
     "Campaigns.ITEM_SUMMARY_SINGULAR": "%s item",
     "Campaigns.PUBLISHCAMPAIGN": "Publish campaign",
     "Campaigns.REVERTCAMPAIGN": "Revert",
+    "File.NO_SIZE": "N/A",
+    "FormBuilderModal.CLOSE": "Close",
     "LeftAndMain.CONFIRMUNSAVED": "Да ли сте сигурни да желите да одете са ове странице?\n\nУПОЗОРЕЊЕ: Ваше измене још нису сачуване.\n\nПритисните У реду за наставак или Одустани да би сте остали на овој страници.",
     "LeftAndMain.CONFIRMUNSAVEDSHORT": "УПОЗОРЕЊЕ: Ваше измене нису сачуване.",
+    "LeftAndMain.JOIN": ",",
+    "LeftAndMain.JOINLAST": "and",
     "LeftAndMain.PAGEWASDELETED": "Ова страница је избрисана. Да би изменили страницу, изаберите је са леве стране.",
+    "LeftAndMain.SEARCHCLEARRESULTS": "Clear search",
+    "LeftAndMain.SEARCHRESULTS": "Search results",
+    "LeftAndMain.SEARCHRESULTSMESSAGE": "Search results {parts}",
+    "LeftAndMain.SEARCHRESULTSMESSAGECATEGORY": "categorised as '{AppCategory}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDBETWEEN": "edited between '{CreatedFrom}' to '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDFROM": "edited from '{CreatedFrom}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDTO": "edited before '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEKEYWORDS": "with keywords '{Name}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGELIMIT": "limited to the folder '{Folder}'",
     "ModelAdmin.DELETED": "Избрисано",
     "ModelAdmin.REALLYDELETE": "Да ли заиста желите да избришете?",
     "ModelAdmin.SAVED": "Сачувано.",

admin/javascript/lang/sr@latin.js

@@ -18,9 +18,22 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
     "Campaigns.ITEM_SUMMARY_SINGULAR": "%s item",
     "Campaigns.PUBLISHCAMPAIGN": "Publish campaign",
     "Campaigns.REVERTCAMPAIGN": "Revert",
+    "File.NO_SIZE": "N/A",
+    "FormBuilderModal.CLOSE": "Close",
     "LeftAndMain.CONFIRMUNSAVED": "Da li ste sigurni da želite da odete sa ove stranice?\n\nUPOZORENjE: Vaše izmene još nisu sačuvane.\n\nPritisnite U redu za nastavak ili Odustani da bi ste ostali na ovoj stranici.",
     "LeftAndMain.CONFIRMUNSAVEDSHORT": "UPOZORENjE: Vaše izmene nisu sačuvane.",
+    "LeftAndMain.JOIN": ",",
+    "LeftAndMain.JOINLAST": "and",
     "LeftAndMain.PAGEWASDELETED": "Ova stranica je izbrisana. Da bi izmenili stranicu, izaberite je sa leve strane.",
+    "LeftAndMain.SEARCHCLEARRESULTS": "Clear search",
+    "LeftAndMain.SEARCHRESULTS": "Search results",
+    "LeftAndMain.SEARCHRESULTSMESSAGE": "Search results {parts}",
+    "LeftAndMain.SEARCHRESULTSMESSAGECATEGORY": "categorised as '{AppCategory}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDBETWEEN": "edited between '{CreatedFrom}' to '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDFROM": "edited from '{CreatedFrom}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDTO": "edited before '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEKEYWORDS": "with keywords '{Name}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGELIMIT": "limited to the folder '{Folder}'",
     "ModelAdmin.DELETED": "Izbrisano",
     "ModelAdmin.REALLYDELETE": "Da li zaista želite da izbrišete?",
     "ModelAdmin.SAVED": "Sačuvano.",

admin/javascript/lang/sr_RS.js

@@ -18,9 +18,22 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
     "Campaigns.ITEM_SUMMARY_SINGULAR": "%s item",
     "Campaigns.PUBLISHCAMPAIGN": "Publish campaign",
     "Campaigns.REVERTCAMPAIGN": "Revert",
+    "File.NO_SIZE": "N/A",
+    "FormBuilderModal.CLOSE": "Close",
     "LeftAndMain.CONFIRMUNSAVED": "Да ли сте сигурни да желите да одете са ове странице?\n\nУПОЗОРЕЊЕ: Ваше измене још нису сачуване.\n\nПритисните У реду за наставак или Одустани да би сте остали на овој страници.",
     "LeftAndMain.CONFIRMUNSAVEDSHORT": "УПОЗОРЕЊЕ: Ваше измене нису сачуване.",
+    "LeftAndMain.JOIN": ",",
+    "LeftAndMain.JOINLAST": "and",
     "LeftAndMain.PAGEWASDELETED": "Ова страница је избрисана. Да би изменили страницу, изаберите је са леве стране.",
+    "LeftAndMain.SEARCHCLEARRESULTS": "Clear search",
+    "LeftAndMain.SEARCHRESULTS": "Search results",
+    "LeftAndMain.SEARCHRESULTSMESSAGE": "Search results {parts}",
+    "LeftAndMain.SEARCHRESULTSMESSAGECATEGORY": "categorised as '{AppCategory}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDBETWEEN": "edited between '{CreatedFrom}' to '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDFROM": "edited from '{CreatedFrom}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDTO": "edited before '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEKEYWORDS": "with keywords '{Name}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGELIMIT": "limited to the folder '{Folder}'",
     "ModelAdmin.DELETED": "Избрисано",
     "ModelAdmin.REALLYDELETE": "Да ли заиста желите да избришете?",
     "ModelAdmin.SAVED": "Сачувано.",

admin/javascript/lang/sr_RS@latin.js

@@ -18,9 +18,22 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
     "Campaigns.ITEM_SUMMARY_SINGULAR": "%s item",
     "Campaigns.PUBLISHCAMPAIGN": "Publish campaign",
     "Campaigns.REVERTCAMPAIGN": "Revert",
+    "File.NO_SIZE": "N/A",
+    "FormBuilderModal.CLOSE": "Close",
     "LeftAndMain.CONFIRMUNSAVED": "Da li ste sigurni da želite da odete sa ove stranice?\n\nUPOZORENjE: Vaše izmene još nisu sačuvane.\n\nPritisnite U redu za nastavak ili Odustani da bi ste ostali na ovoj stranici.",
     "LeftAndMain.CONFIRMUNSAVEDSHORT": "UPOZORENjE: Vaše izmene nisu sačuvane.",
+    "LeftAndMain.JOIN": ",",
+    "LeftAndMain.JOINLAST": "and",
     "LeftAndMain.PAGEWASDELETED": "Ova stranica je izbrisana. Da bi izmenili stranicu, izaberite je sa leve strane.",
+    "LeftAndMain.SEARCHCLEARRESULTS": "Clear search",
+    "LeftAndMain.SEARCHRESULTS": "Search results",
+    "LeftAndMain.SEARCHRESULTSMESSAGE": "Search results {parts}",
+    "LeftAndMain.SEARCHRESULTSMESSAGECATEGORY": "categorised as '{AppCategory}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDBETWEEN": "edited between '{CreatedFrom}' to '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDFROM": "edited from '{CreatedFrom}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDTO": "edited before '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEKEYWORDS": "with keywords '{Name}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGELIMIT": "limited to the folder '{Folder}'",
     "ModelAdmin.DELETED": "Izbrisano",
     "ModelAdmin.REALLYDELETE": "Da li zaista želite da izbrišete?",
     "ModelAdmin.SAVED": "Sačuvano.",

admin/javascript/lang/src/cs.js

@@ -11,9 +11,22 @@
     "Campaigns.ITEM_SUMMARY_SINGULAR": "%s položka",
     "Campaigns.PUBLISHCAMPAIGN": "Zveřejnit kampaň",
     "Campaigns.REVERTCAMPAIGN": "Přepnout",
+    "File.NO_SIZE": "N/A",
+    "FormBuilderModal.CLOSE": "Close",
     "LeftAndMain.CONFIRMUNSAVED": "Určitě chcete opustit navigaci z této stránky?\n\nUPOZORNĚNÍ: Vaše změny nebyly uloženy.\n\nStlačte OK pro pokračovat, nebo Cancel, zůstanete na této stránce.",
     "LeftAndMain.CONFIRMUNSAVEDSHORT": "UPOZORNĚNÍ: Vaše změny nebyly uloženy.",
+    "LeftAndMain.JOIN": ",",
+    "LeftAndMain.JOINLAST": "and",
     "LeftAndMain.PAGEWASDELETED": "Tato stránka byla smazána. Pro editaci stránky, vyberte ji vlevo.",
+    "LeftAndMain.SEARCHCLEARRESULTS": "Clear search",
+    "LeftAndMain.SEARCHRESULTS": "Search results",
+    "LeftAndMain.SEARCHRESULTSMESSAGE": "Search results {parts}",
+    "LeftAndMain.SEARCHRESULTSMESSAGECATEGORY": "categorised as '{AppCategory}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDBETWEEN": "edited between '{CreatedFrom}' to '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDFROM": "edited from '{CreatedFrom}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDTO": "edited before '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEKEYWORDS": "with keywords '{Name}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGELIMIT": "limited to the folder '{Folder}'",
     "ModelAdmin.DELETED": "Smazáno",
     "ModelAdmin.REALLYDELETE": "Skutečně chcete smazat?",
     "ModelAdmin.SAVED": "Uloženo",

admin/javascript/lang/src/de.js

@@ -11,9 +11,22 @@
     "Campaigns.ITEM_SUMMARY_SINGULAR": "%s Eintrag",
     "Campaigns.PUBLISHCAMPAIGN": "Publish campaign",
     "Campaigns.REVERTCAMPAIGN": "Revert",
+    "File.NO_SIZE": "N/A",
+    "FormBuilderModal.CLOSE": "Close",
     "LeftAndMain.CONFIRMUNSAVED": "Sind Sie sicher, dass Sie die Seite verlassen möchten?\n\nWARNUNG: Ihre Änderungen werden nicht gespeichert.\n\nDrücken Sie \"OK\" um fortzufahren, oder \"Abbrechen\" um auf dieser Seite zu bleiben.",
     "LeftAndMain.CONFIRMUNSAVEDSHORT": "WARNUNG: Ihre Änderungen wurden nicht gespeichert.",
+    "LeftAndMain.JOIN": ",",
+    "LeftAndMain.JOINLAST": "and",
     "LeftAndMain.PAGEWASDELETED": "Diese Seite wurde gelöscht.",
+    "LeftAndMain.SEARCHCLEARRESULTS": "Clear search",
+    "LeftAndMain.SEARCHRESULTS": "Search results",
+    "LeftAndMain.SEARCHRESULTSMESSAGE": "Search results {parts}",
+    "LeftAndMain.SEARCHRESULTSMESSAGECATEGORY": "categorised as '{AppCategory}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDBETWEEN": "edited between '{CreatedFrom}' to '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDFROM": "edited from '{CreatedFrom}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDTO": "edited before '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEKEYWORDS": "with keywords '{Name}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGELIMIT": "limited to the folder '{Folder}'",
     "ModelAdmin.DELETED": "Gelöscht",
     "ModelAdmin.REALLYDELETE": "Wirklich löschen?",
     "ModelAdmin.SAVED": "Gespeichert",

admin/javascript/lang/src/en.js

@@ -11,9 +11,22 @@
     "Campaigns.ITEM_SUMMARY_SINGULAR": "%s item",
     "Campaigns.PUBLISHCAMPAIGN": "Publish campaign",
     "Campaigns.REVERTCAMPAIGN": "Revert",
+    "File.NO_SIZE": "N\/A",
+    "FormBuilderModal.CLOSE": "Close",
     "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.JOIN": ",",
+    "LeftAndMain.JOINLAST": "and",
     "LeftAndMain.PAGEWASDELETED": "This page was deleted.  To edit a page, select it from the left.",
+    "LeftAndMain.SEARCHCLEARRESULTS": "Clear search",
+    "LeftAndMain.SEARCHRESULTS": "Search results",
+    "LeftAndMain.SEARCHRESULTSMESSAGE": "Search results {parts}",
+    "LeftAndMain.SEARCHRESULTSMESSAGECATEGORY": "categorised as '{AppCategory}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDBETWEEN": "edited between '{CreatedFrom}' to '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDFROM": "edited from '{CreatedFrom}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDTO": "edited before '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEKEYWORDS": "with keywords '{Name}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGELIMIT": "limited to the folder '{Folder}'",
     "ModelAdmin.DELETED": "Deleted",
     "ModelAdmin.REALLYDELETE": "Do you really want to delete?",
     "ModelAdmin.SAVED": "Saved",

admin/javascript/lang/src/eo.js

@@ -11,9 +11,22 @@
     "Campaigns.ITEM_SUMMARY_SINGULAR": "%s elemento",
     "Campaigns.PUBLISHCAMPAIGN": "Publikigi kampanjon",
     "Campaigns.REVERTCAMPAIGN": "Malfari",
+    "File.NO_SIZE": "N/A",
+    "FormBuilderModal.CLOSE": "Close",
     "LeftAndMain.CONFIRMUNSAVED": "Ĉu vi vere volas navigi for de ĉi tiu paĝo?\n\nAVERTO: Viaj ŝanĝoj ne estas konservitaj.\n\nPremu je Akcepti por daŭrigi, aŭ Nuligi por resti ĉe la aktuala paĝo.",
     "LeftAndMain.CONFIRMUNSAVEDSHORT": "AVERTO: Viaj ŝanĝoj ne estas konservitaj.",
+    "LeftAndMain.JOIN": ",",
+    "LeftAndMain.JOINLAST": "and",
     "LeftAndMain.PAGEWASDELETED": "Ĉi tiu paĝo estas forigita. Por redakti paĝon, elektu ĝin maldekstre.",
+    "LeftAndMain.SEARCHCLEARRESULTS": "Clear search",
+    "LeftAndMain.SEARCHRESULTS": "Search results",
+    "LeftAndMain.SEARCHRESULTSMESSAGE": "Search results {parts}",
+    "LeftAndMain.SEARCHRESULTSMESSAGECATEGORY": "categorised as '{AppCategory}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDBETWEEN": "edited between '{CreatedFrom}' to '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDFROM": "edited from '{CreatedFrom}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDTO": "edited before '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEKEYWORDS": "with keywords '{Name}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGELIMIT": "limited to the folder '{Folder}'",
     "ModelAdmin.DELETED": "Forigita",
     "ModelAdmin.REALLYDELETE": "Ĉi vi vere volas forigi?",
     "ModelAdmin.SAVED": "Konservita",

admin/javascript/lang/src/es.js

@@ -11,9 +11,22 @@
     "Campaigns.ITEM_SUMMARY_SINGULAR": "%s item",
     "Campaigns.PUBLISHCAMPAIGN": "Publish campaign",
     "Campaigns.REVERTCAMPAIGN": "Revert",
+    "File.NO_SIZE": "N/A",
+    "FormBuilderModal.CLOSE": "Close",
     "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.",
+    "LeftAndMain.JOIN": ",",
+    "LeftAndMain.JOINLAST": "and",
     "LeftAndMain.PAGEWASDELETED": "Esta página fue eliminada. Para editar una página, seleccionarla desde la izquierda",
+    "LeftAndMain.SEARCHCLEARRESULTS": "Clear search",
+    "LeftAndMain.SEARCHRESULTS": "Search results",
+    "LeftAndMain.SEARCHRESULTSMESSAGE": "Search results {parts}",
+    "LeftAndMain.SEARCHRESULTSMESSAGECATEGORY": "categorised as '{AppCategory}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDBETWEEN": "edited between '{CreatedFrom}' to '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDFROM": "edited from '{CreatedFrom}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDTO": "edited before '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEKEYWORDS": "with keywords '{Name}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGELIMIT": "limited to the folder '{Folder}'",
     "ModelAdmin.DELETED": "Eliminado",
     "ModelAdmin.REALLYDELETE": "Estás seguro que quieres eliminarla?",
     "ModelAdmin.SAVED": "Guardado",

admin/javascript/lang/src/fa_IR.js

@@ -11,9 +11,22 @@
     "Campaigns.ITEM_SUMMARY_SINGULAR": "%s آیتم",
     "Campaigns.PUBLISHCAMPAIGN": "انتشار کمپین",
     "Campaigns.REVERTCAMPAIGN": "بازگرداندن",
+    "File.NO_SIZE": "N/A",
+    "FormBuilderModal.CLOSE": "Close",
     "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": "هشدار: تغییرات شما ذخیره نشده‌اند.",
+    "LeftAndMain.JOIN": ",",
+    "LeftAndMain.JOINLAST": "and",
     "LeftAndMain.PAGEWASDELETED": "این صفحه حذف شده است. برای ویرایش یک صفحه، آن‌را از لیست چپ انتخاب نمایید.",
+    "LeftAndMain.SEARCHCLEARRESULTS": "Clear search",
+    "LeftAndMain.SEARCHRESULTS": "Search results",
+    "LeftAndMain.SEARCHRESULTSMESSAGE": "Search results {parts}",
+    "LeftAndMain.SEARCHRESULTSMESSAGECATEGORY": "categorised as '{AppCategory}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDBETWEEN": "edited between '{CreatedFrom}' to '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDFROM": "edited from '{CreatedFrom}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDTO": "edited before '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEKEYWORDS": "with keywords '{Name}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGELIMIT": "limited to the folder '{Folder}'",
     "ModelAdmin.DELETED": "حذف شده",
     "ModelAdmin.REALLYDELETE": "آیا واقعاً می‌خواهید حذف نمایید؟",
     "ModelAdmin.SAVED": "ذخیره شده",

admin/javascript/lang/src/fi.js

@@ -1,7 +1,7 @@
 {
     "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_DELETELIVE_PROMPT": "Sinulla on {num} sivu(a) valittuna.\n\nHaluatko varmasti poistaa nämä sivut näkyvistä?",
-    "CMSMAIN.BATCH_DELETE_PROMPT": "Sinulla on {num} sivu(a) valittuna.\n\nHaluatko varmasti poistaa?",
+    "CMSMAIN.BATCH_DELETE_PROMPT": "Sinulla on {num} sivu(a) valittuna.\n\nHaluatko varmasti poistaa ne?",
     "CMSMAIN.BATCH_PUBLISH_PROMPT": "Sinulla on {num} sivu(a) valittuna.\n\nHaluatko varmasti julkaista?",
     "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_UNPUBLISH_PROMPT": "Sinulla on {num} sivu(a) valittuna.\n\nHaluatko varmasti poistaa julkaisusta?",
@@ -11,9 +11,22 @@
     "Campaigns.ITEM_SUMMARY_SINGULAR": "%s kohde",
     "Campaigns.PUBLISHCAMPAIGN": "Julkaise kampanja",
     "Campaigns.REVERTCAMPAIGN": "Palauta",
+    "File.NO_SIZE": "Ei yhtään",
+    "FormBuilderModal.CLOSE": "Sulje",
     "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.",
+    "LeftAndMain.JOIN": ",",
+    "LeftAndMain.JOINLAST": "ja",
     "LeftAndMain.PAGEWASDELETED": "Sivu on poistettu. Valitse sivu muokattavaksesi vasemmalta.",
+    "LeftAndMain.SEARCHCLEARRESULTS": "Tyhjennä haku",
+    "LeftAndMain.SEARCHRESULTS": "Hakutulokset",
+    "LeftAndMain.SEARCHRESULTSMESSAGE": "Hakutulokset {parts}",
+    "LeftAndMain.SEARCHRESULTSMESSAGECATEGORY": "Kategorioitu nimellä '{AppCategory}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDBETWEEN": "muokattu välillä '{CreatedFrom}'–'{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDFROM": "muokattu kohteesta '{CreatedFrom}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDTO": "muokattu ennen '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEKEYWORDS": "avainsanoilla '{Name}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGELIMIT": "rajoitettu kansioon '{Folder}'",
     "ModelAdmin.DELETED": "Poistettu",
     "ModelAdmin.REALLYDELETE": "Haluatko varmasti poistaa?",
     "ModelAdmin.SAVED": "Tallennettu",

admin/javascript/lang/src/fr.js

@@ -11,9 +11,22 @@
     "Campaigns.ITEM_SUMMARY_SINGULAR": "%s item",
     "Campaigns.PUBLISHCAMPAIGN": "Publish campaign",
     "Campaigns.REVERTCAMPAIGN": "Revert",
+    "File.NO_SIZE": "N/A",
+    "FormBuilderModal.CLOSE": "Close",
     "LeftAndMain.CONFIRMUNSAVED": "Etes-vous sûr de vouloir quitter cette page ?\n\nATTENTION: Vos changements n'ont pas été sauvegardés.\n\nCliquez sur OK pour continuer, ou sur Annuler pour rester sur la page actuelle.",
     "LeftAndMain.CONFIRMUNSAVEDSHORT": "WARNING: Your changes have not been saved.",
+    "LeftAndMain.JOIN": ",",
+    "LeftAndMain.JOINLAST": "and",
     "LeftAndMain.PAGEWASDELETED": "Cette page a été supprimée. Pour éditer cette page, veuillez la sélectionner à gauche.",
+    "LeftAndMain.SEARCHCLEARRESULTS": "Clear search",
+    "LeftAndMain.SEARCHRESULTS": "Search results",
+    "LeftAndMain.SEARCHRESULTSMESSAGE": "Search results {parts}",
+    "LeftAndMain.SEARCHRESULTSMESSAGECATEGORY": "categorised as '{AppCategory}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDBETWEEN": "edited between '{CreatedFrom}' to '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDFROM": "edited from '{CreatedFrom}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDTO": "edited before '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEKEYWORDS": "with keywords '{Name}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGELIMIT": "limited to the folder '{Folder}'",
     "ModelAdmin.DELETED": "Supprimé",
     "ModelAdmin.REALLYDELETE": "Etes-vous sûr de vouloir supprimer ?",
     "ModelAdmin.SAVED": "Sauvegardé",

admin/javascript/lang/src/hr.js

@@ -1,7 +1,7 @@
 {
     "CMSMAIN.BATCH_ARCHIVE_PROMPT": "Imate {num} stranicu(e) označeno.\n\nJeste li sigurni da želite arhivirati ove stranice?\n\nOve stranice i sve stranice ispod nje će biti neobjavljene i poslane u arhivu.",
     "CMSMAIN.BATCH_DELETELIVE_PROMPT": "Imate {num} stranica(e) označeno.\n\nJeste li sigurni da želite obrisati ove stranice s objavljenog?",
-    "CMSMAIN.BATCH_DELETE_PROMPT": "Označili ste {num} stranicu(a).\n\nJeste li sigurni da želite obrisati?",
+    "CMSMAIN.BATCH_DELETE_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to delete?",
     "CMSMAIN.BATCH_PUBLISH_PROMPT": "Označili ste {num} stranicu(a).\n\nJeste li sigurni da želite objaviti?",
     "CMSMAIN.BATCH_RESTORE_PROMPT": "Imate {num} stranica(e) označeno.\n\nJeste li sigurni da želite vratiti ove stranice?\n\nSve podstranice će biti vraćene u najviši nivo, osim ako te stranice su vraćene.",
     "CMSMAIN.BATCH_UNPUBLISH_PROMPT": "Označili ste {num} stranicu(a).\n\nJeste li sigurni da želite odjaviti?",
@@ -11,9 +11,22 @@
     "Campaigns.ITEM_SUMMARY_SINGULAR": "%s stavka",
     "Campaigns.PUBLISHCAMPAIGN": "Objavi kampanju",
     "Campaigns.REVERTCAMPAIGN": "Vrati",
+    "File.NO_SIZE": "N/A",
+    "FormBuilderModal.CLOSE": "Close",
     "LeftAndMain.CONFIRMUNSAVED": "Jeste li sigurni da želite otići s ove stranice?\n\nUPOZORENJE: Vaše promjene nisu spremljene.\n\nPritisnike OK za nastavka, ili Odustani za ostati na trenutnoj stranici.",
     "LeftAndMain.CONFIRMUNSAVEDSHORT": "UPOZORENJE: Vaše promjene nisu spremljene.",
+    "LeftAndMain.JOIN": ",",
+    "LeftAndMain.JOINLAST": "and",
     "LeftAndMain.PAGEWASDELETED": "Ova stranica je obrisana. Za uređivanje stranice, odaberite je s lijeve stranice.",
+    "LeftAndMain.SEARCHCLEARRESULTS": "Clear search",
+    "LeftAndMain.SEARCHRESULTS": "Search results",
+    "LeftAndMain.SEARCHRESULTSMESSAGE": "Search results {parts}",
+    "LeftAndMain.SEARCHRESULTSMESSAGECATEGORY": "categorised as '{AppCategory}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDBETWEEN": "edited between '{CreatedFrom}' to '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDFROM": "edited from '{CreatedFrom}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDTO": "edited before '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEKEYWORDS": "with keywords '{Name}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGELIMIT": "limited to the folder '{Folder}'",
     "ModelAdmin.DELETED": "Obrisano",
     "ModelAdmin.REALLYDELETE": "Jeste li sigurni da želite obrisati?",
     "ModelAdmin.SAVED": "Spremljeno",

admin/javascript/lang/src/id.js

@@ -11,9 +11,22 @@
     "Campaigns.ITEM_SUMMARY_SINGULAR": "%s item",
     "Campaigns.PUBLISHCAMPAIGN": "Publish campaign",
     "Campaigns.REVERTCAMPAIGN": "Revert",
+    "File.NO_SIZE": "N/A",
+    "FormBuilderModal.CLOSE": "Close",
     "LeftAndMain.CONFIRMUNSAVED": "Anda ingin tinggalkan laman ini?\n\nPERINGATAN: Perubahan tidak akan disimpan.\n\nTekan OK untuk lanjut, atau Batal untuk tetap di laman ini.",
     "LeftAndMain.CONFIRMUNSAVEDSHORT": "PERINGATAN: Perubahan tidak akan disimpan.",
+    "LeftAndMain.JOIN": ",",
+    "LeftAndMain.JOINLAST": "and",
     "LeftAndMain.PAGEWASDELETED": "Laman sudah terhapus. Untuk mengedit, pilih pada sisi kiri.",
+    "LeftAndMain.SEARCHCLEARRESULTS": "Clear search",
+    "LeftAndMain.SEARCHRESULTS": "Search results",
+    "LeftAndMain.SEARCHRESULTSMESSAGE": "Search results {parts}",
+    "LeftAndMain.SEARCHRESULTSMESSAGECATEGORY": "categorised as '{AppCategory}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDBETWEEN": "edited between '{CreatedFrom}' to '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDFROM": "edited from '{CreatedFrom}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDTO": "edited before '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEKEYWORDS": "with keywords '{Name}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGELIMIT": "limited to the folder '{Folder}'",
     "ModelAdmin.DELETED": "Terhapus",
     "ModelAdmin.REALLYDELETE": "Anda yakin ingin menghapus?",
     "ModelAdmin.SAVED": "Tersimpan",

admin/javascript/lang/src/id_ID.js

@@ -11,9 +11,22 @@
     "Campaigns.ITEM_SUMMARY_SINGULAR": "%s item",
     "Campaigns.PUBLISHCAMPAIGN": "Publish campaign",
     "Campaigns.REVERTCAMPAIGN": "Revert",
+    "File.NO_SIZE": "N/A",
+    "FormBuilderModal.CLOSE": "Close",
     "LeftAndMain.CONFIRMUNSAVED": "Anda ingin tinggalkan laman ini?\n\nPERINGATAN: Perubahan tidak akan disimpan.\n\nTekan OK untuk lanjut, atau Batal untuk tetap di laman ini.",
     "LeftAndMain.CONFIRMUNSAVEDSHORT": "PERINGATAN: Perubahan tidak akan disimpan.",
+    "LeftAndMain.JOIN": ",",
+    "LeftAndMain.JOINLAST": "and",
     "LeftAndMain.PAGEWASDELETED": "Laman sudah terhapus. Untuk mengedit, pilih pada sisi kiri.",
+    "LeftAndMain.SEARCHCLEARRESULTS": "Clear search",
+    "LeftAndMain.SEARCHRESULTS": "Search results",
+    "LeftAndMain.SEARCHRESULTSMESSAGE": "Search results {parts}",
+    "LeftAndMain.SEARCHRESULTSMESSAGECATEGORY": "categorised as '{AppCategory}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDBETWEEN": "edited between '{CreatedFrom}' to '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDFROM": "edited from '{CreatedFrom}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDTO": "edited before '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEKEYWORDS": "with keywords '{Name}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGELIMIT": "limited to the folder '{Folder}'",
     "ModelAdmin.DELETED": "Terhapus",
     "ModelAdmin.REALLYDELETE": "Anda yakin ingin menghapus?",
     "ModelAdmin.SAVED": "Tersimpan",

admin/javascript/lang/src/it.js

@@ -1,7 +1,7 @@
 {
     "CMSMAIN.BATCH_ARCHIVE_PROMPT": "Hai selezionato {num} pagina(e).\n\nSei sicuro di volerle archiviare?\n\nQueste pagine insieme a tutte le pagine figlio saranno spubblicate ed archiviate.",
     "CMSMAIN.BATCH_DELETELIVE_PROMPT": "Hai {num} pagine selezionate.\n\nVuoi veramente eliminare queste pagine dal sito live?",
-    "CMSMAIN.BATCH_DELETE_PROMPT": "Hai {num} pagina(e) selezionate.\n\nVuoi veramente eliminarle?",
+    "CMSMAIN.BATCH_DELETE_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to delete?",
     "CMSMAIN.BATCH_PUBLISH_PROMPT": "Hai {num} pagine selezionate.\n\nVuoi veramente pubblicarle?",
     "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?",
@@ -11,9 +11,22 @@
     "Campaigns.ITEM_SUMMARY_SINGULAR": "%s elemento",
     "Campaigns.PUBLISHCAMPAIGN": "Pubblica campagna",
     "Campaigns.REVERTCAMPAIGN": "Ripristina",
+    "File.NO_SIZE": "N/A",
+    "FormBuilderModal.CLOSE": "Close",
     "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.JOIN": ",",
+    "LeftAndMain.JOINLAST": "and",
     "LeftAndMain.PAGEWASDELETED": "Questa pagina è stata eliminata. Per modificare questa pagine, selezionarla a sinistra.",
+    "LeftAndMain.SEARCHCLEARRESULTS": "Clear search",
+    "LeftAndMain.SEARCHRESULTS": "Search results",
+    "LeftAndMain.SEARCHRESULTSMESSAGE": "Search results {parts}",
+    "LeftAndMain.SEARCHRESULTSMESSAGECATEGORY": "categorised as '{AppCategory}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDBETWEEN": "edited between '{CreatedFrom}' to '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDFROM": "edited from '{CreatedFrom}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDTO": "edited before '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEKEYWORDS": "with keywords '{Name}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGELIMIT": "limited to the folder '{Folder}'",
     "ModelAdmin.DELETED": "Eliminato",
     "ModelAdmin.REALLYDELETE": "Si è sicuri di voler eliminare?",
     "ModelAdmin.SAVED": "Salvato",

admin/javascript/lang/src/ja.js

@@ -11,9 +11,22 @@
     "Campaigns.ITEM_SUMMARY_SINGULAR": "%s item",
     "Campaigns.PUBLISHCAMPAIGN": "Publish campaign",
     "Campaigns.REVERTCAMPAIGN": "Revert",
+    "File.NO_SIZE": "N/A",
+    "FormBuilderModal.CLOSE": "Close",
     "LeftAndMain.CONFIRMUNSAVED": "このページから移動しても良いですか?\n\n警告: あなたの変更は保存されていません．\n\n続行するにはOKを押してください．キャンセルをクリックするとこのページにとどまります．",
     "LeftAndMain.CONFIRMUNSAVEDSHORT": "警告: あなたの変更は保存されていません．",
+    "LeftAndMain.JOIN": ",",
+    "LeftAndMain.JOINLAST": "and",
     "LeftAndMain.PAGEWASDELETED": "このページは削除されました．ページを編集するには，左から選択してください．",
+    "LeftAndMain.SEARCHCLEARRESULTS": "Clear search",
+    "LeftAndMain.SEARCHRESULTS": "Search results",
+    "LeftAndMain.SEARCHRESULTSMESSAGE": "Search results {parts}",
+    "LeftAndMain.SEARCHRESULTSMESSAGECATEGORY": "categorised as '{AppCategory}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDBETWEEN": "edited between '{CreatedFrom}' to '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDFROM": "edited from '{CreatedFrom}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDTO": "edited before '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEKEYWORDS": "with keywords '{Name}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGELIMIT": "limited to the folder '{Folder}'",
     "ModelAdmin.DELETED": "削除しました",
     "ModelAdmin.REALLYDELETE": "本当に削除しますか?",
     "ModelAdmin.SAVED": "保存しました",

admin/javascript/lang/src/lt.js

@@ -11,9 +11,22 @@
     "Campaigns.ITEM_SUMMARY_SINGULAR": "%s item",
     "Campaigns.PUBLISHCAMPAIGN": "Publish campaign",
     "Campaigns.REVERTCAMPAIGN": "Revert",
+    "File.NO_SIZE": "N/A",
+    "FormBuilderModal.CLOSE": "Close",
     "LeftAndMain.CONFIRMUNSAVED": "Ar tikrai norite išeiti iš šio puslapio?\n\nDĖMESIO: Jūsų pakeitimai neišsaugoti.\n\nNorėdami tęsti, spauskite OK, jeigu norite likti, spauskite Cancel.",
     "LeftAndMain.CONFIRMUNSAVEDSHORT": "DĖMESIO: Jūsų pakeitimai neišsaugoti.",
+    "LeftAndMain.JOIN": ",",
+    "LeftAndMain.JOINLAST": "and",
     "LeftAndMain.PAGEWASDELETED": "Šis puslapis ištrintas. Norėdami redaguoti puslapį, pasirinkite jį kairėje.",
+    "LeftAndMain.SEARCHCLEARRESULTS": "Clear search",
+    "LeftAndMain.SEARCHRESULTS": "Search results",
+    "LeftAndMain.SEARCHRESULTSMESSAGE": "Search results {parts}",
+    "LeftAndMain.SEARCHRESULTSMESSAGECATEGORY": "categorised as '{AppCategory}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDBETWEEN": "edited between '{CreatedFrom}' to '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDFROM": "edited from '{CreatedFrom}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDTO": "edited before '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEKEYWORDS": "with keywords '{Name}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGELIMIT": "limited to the folder '{Folder}'",
     "ModelAdmin.DELETED": "Ištrinta",
     "ModelAdmin.REALLYDELETE": "Ar tikrai norite ištrinti?",
     "ModelAdmin.SAVED": "Išsaugota",

admin/javascript/lang/src/mi.js

@@ -11,9 +11,22 @@
     "Campaigns.ITEM_SUMMARY_SINGULAR": "%s item",
     "Campaigns.PUBLISHCAMPAIGN": "Publish campaign",
     "Campaigns.REVERTCAMPAIGN": "Whakahokia",
+    "File.NO_SIZE": "N/A",
+    "FormBuilderModal.CLOSE": "Close",
     "LeftAndMain.CONFIRMUNSAVED": "Kei te hiahia whakatere atu i tēnei whārangi?\n\nWHAKATŪPATO: Kāore anō ō huringa kia tiakina.\n\nPēhi AE kia haere tonu, Whakakore rānei kia noho i te whārangi onāianei.",
     "LeftAndMain.CONFIRMUNSAVEDSHORT": "WHAKATŪPATO: Kāore anō ō huringa kia tiakina.",
+    "LeftAndMain.JOIN": ",",
+    "LeftAndMain.JOINLAST": "and",
     "LeftAndMain.PAGEWASDELETED": "I mukua tēnei whārangi.  Hei whakatika i tētahi whārangi, tīpakohia i te taha mauī.",
+    "LeftAndMain.SEARCHCLEARRESULTS": "Clear search",
+    "LeftAndMain.SEARCHRESULTS": "Search results",
+    "LeftAndMain.SEARCHRESULTSMESSAGE": "Search results {parts}",
+    "LeftAndMain.SEARCHRESULTSMESSAGECATEGORY": "categorised as '{AppCategory}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDBETWEEN": "edited between '{CreatedFrom}' to '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDFROM": "edited from '{CreatedFrom}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDTO": "edited before '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEKEYWORDS": "with keywords '{Name}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGELIMIT": "limited to the folder '{Folder}'",
     "ModelAdmin.DELETED": "Kua Mukua",
     "ModelAdmin.REALLYDELETE": "Kei te tino hiahia muku?",
     "ModelAdmin.SAVED": "Kua Tiakina",

admin/javascript/lang/src/nb.js

@@ -11,9 +11,22 @@
     "Campaigns.ITEM_SUMMARY_SINGULAR": "%s item",
     "Campaigns.PUBLISHCAMPAIGN": "Publish campaign",
     "Campaigns.REVERTCAMPAIGN": "Revert",
+    "File.NO_SIZE": "N/A",
+    "FormBuilderModal.CLOSE": "Close",
     "LeftAndMain.CONFIRMUNSAVED": "Er du sikker på at du vil forlate denne siden?\n\nADVARSEL: Endringene din har ikke blitt lagret.\n\nTrykk OK for å fortsette eller Avbryt for å holde deg på samme side.",
     "LeftAndMain.CONFIRMUNSAVEDSHORT": "ADVARSEL: Endringene dine har ikke blitt lagret.",
+    "LeftAndMain.JOIN": ",",
+    "LeftAndMain.JOINLAST": "and",
     "LeftAndMain.PAGEWASDELETED": "Denne siden ble slettet. For å redigere en side, velg den fra listen til venstre.",
+    "LeftAndMain.SEARCHCLEARRESULTS": "Clear search",
+    "LeftAndMain.SEARCHRESULTS": "Search results",
+    "LeftAndMain.SEARCHRESULTSMESSAGE": "Search results {parts}",
+    "LeftAndMain.SEARCHRESULTSMESSAGECATEGORY": "categorised as '{AppCategory}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDBETWEEN": "edited between '{CreatedFrom}' to '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDFROM": "edited from '{CreatedFrom}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDTO": "edited before '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEKEYWORDS": "with keywords '{Name}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGELIMIT": "limited to the folder '{Folder}'",
     "ModelAdmin.DELETED": "Slettet",
     "ModelAdmin.REALLYDELETE": "Vil du virkelig slette?",
     "ModelAdmin.SAVED": "Lagret",

admin/javascript/lang/src/nl.js

@@ -11,9 +11,22 @@
     "Campaigns.ITEM_SUMMARY_SINGULAR": "%s item",
     "Campaigns.PUBLISHCAMPAIGN": "Publish campaign",
     "Campaigns.REVERTCAMPAIGN": "Revert",
+    "File.NO_SIZE": "N/A",
+    "FormBuilderModal.CLOSE": "Close",
     "LeftAndMain.CONFIRMUNSAVED": "Weet u zeker dat u deze pagina wilt verlaten?\nWAARSCHUWING: Uw veranderingen zijn niet opgeslagen.\n\nKies OK om te verlaten, of Cancel om op de huidige pagina te blijven.",
     "LeftAndMain.CONFIRMUNSAVEDSHORT": "WAARSCHUWING: Uw veranderingen zijn niet opgeslagen",
+    "LeftAndMain.JOIN": ",",
+    "LeftAndMain.JOINLAST": "and",
     "LeftAndMain.PAGEWASDELETED": "Deze pagina is verwijderd. Om een pagina aan te passen, selecteer deze aan de linkerkant.",
+    "LeftAndMain.SEARCHCLEARRESULTS": "Clear search",
+    "LeftAndMain.SEARCHRESULTS": "Search results",
+    "LeftAndMain.SEARCHRESULTSMESSAGE": "Search results {parts}",
+    "LeftAndMain.SEARCHRESULTSMESSAGECATEGORY": "categorised as '{AppCategory}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDBETWEEN": "edited between '{CreatedFrom}' to '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDFROM": "edited from '{CreatedFrom}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDTO": "edited before '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEKEYWORDS": "with keywords '{Name}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGELIMIT": "limited to the folder '{Folder}'",
     "ModelAdmin.DELETED": "Verwijderd",
     "ModelAdmin.REALLYDELETE": "Weet u zeker dat u wilt verwijderen?",
     "ModelAdmin.SAVED": "Opgeslagen",

admin/javascript/lang/src/pl.js

@@ -11,9 +11,22 @@
     "Campaigns.ITEM_SUMMARY_SINGULAR": "%s item",
     "Campaigns.PUBLISHCAMPAIGN": "Publish campaign",
     "Campaigns.REVERTCAMPAIGN": "Revert",
+    "File.NO_SIZE": "N/A",
+    "FormBuilderModal.CLOSE": "Close",
     "LeftAndMain.CONFIRMUNSAVED": "Czy na pewno chcesz kontynuować nawigację poza tą stronę?\n\nUWAGA: Twoje zmiany nie zostały zapisane.\n\nWciśnij OK aby kontynuować, wciśnij Anuluj aby pozostać na tej stronie.",
     "LeftAndMain.CONFIRMUNSAVEDSHORT": "UWAGA: Twoje zmiany nie zostały zapisane.",
+    "LeftAndMain.JOIN": ",",
+    "LeftAndMain.JOINLAST": "and",
     "LeftAndMain.PAGEWASDELETED": "Ta strona została usunięta. Wybierz stronę z listy aby rozpocząć edycję.",
+    "LeftAndMain.SEARCHCLEARRESULTS": "Clear search",
+    "LeftAndMain.SEARCHRESULTS": "Search results",
+    "LeftAndMain.SEARCHRESULTSMESSAGE": "Search results {parts}",
+    "LeftAndMain.SEARCHRESULTSMESSAGECATEGORY": "categorised as '{AppCategory}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDBETWEEN": "edited between '{CreatedFrom}' to '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDFROM": "edited from '{CreatedFrom}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDTO": "edited before '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEKEYWORDS": "with keywords '{Name}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGELIMIT": "limited to the folder '{Folder}'",
     "ModelAdmin.DELETED": "Usunięto",
     "ModelAdmin.REALLYDELETE": "Na pewno usunąć?",
     "ModelAdmin.SAVED": "Zapisano",

admin/javascript/lang/src/ro.js

@@ -11,9 +11,22 @@
     "Campaigns.ITEM_SUMMARY_SINGULAR": "%s item",
     "Campaigns.PUBLISHCAMPAIGN": "Publish campaign",
     "Campaigns.REVERTCAMPAIGN": "Revert",
+    "File.NO_SIZE": "N/A",
+    "FormBuilderModal.CLOSE": "Close",
     "LeftAndMain.CONFIRMUNSAVED": "Sunteți sigur că doriți să părăsiți pagina?\n\nAVERTISMENT: Modificările nu au fost salvate.\n\nApăsați OK pentru a continua, sau Anulați pentru a rămâne pe pagina curentă.",
     "LeftAndMain.CONFIRMUNSAVEDSHORT": "AVERTISMENT: Modificările nu au fost salvate.",
+    "LeftAndMain.JOIN": ",",
+    "LeftAndMain.JOINLAST": "and",
     "LeftAndMain.PAGEWASDELETED": "Această pagină a fost ștearsă. Pentru a edita pagina, selectați-o din stânga.",
+    "LeftAndMain.SEARCHCLEARRESULTS": "Clear search",
+    "LeftAndMain.SEARCHRESULTS": "Search results",
+    "LeftAndMain.SEARCHRESULTSMESSAGE": "Search results {parts}",
+    "LeftAndMain.SEARCHRESULTSMESSAGECATEGORY": "categorised as '{AppCategory}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDBETWEEN": "edited between '{CreatedFrom}' to '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDFROM": "edited from '{CreatedFrom}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDTO": "edited before '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEKEYWORDS": "with keywords '{Name}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGELIMIT": "limited to the folder '{Folder}'",
     "ModelAdmin.DELETED": "Șters",
     "ModelAdmin.REALLYDELETE": "Sigur doriți să ștergeți?",
     "ModelAdmin.SAVED": "Salvat",

admin/javascript/lang/src/ru.js

@@ -11,9 +11,22 @@
     "Campaigns.ITEM_SUMMARY_SINGULAR": "%s элемент",
     "Campaigns.PUBLISHCAMPAIGN": "Опубликовать кампанию",
     "Campaigns.REVERTCAMPAIGN": "Отменить",
+    "File.NO_SIZE": "N/A",
+    "FormBuilderModal.CLOSE": "Close",
     "LeftAndMain.CONFIRMUNSAVED": "Вы действительно хотите покинуть эту страницу?\n\nВНИМАНИЕ: Ваши изменения не были сохранены.\n\nНажмите ОК, чтобы продолжить или Отмена, чтобы остаться на текущей странице.",
     "LeftAndMain.CONFIRMUNSAVEDSHORT": "ВНИМАНИЕ: Ваши изменения не были сохранены",
+    "LeftAndMain.JOIN": ",",
+    "LeftAndMain.JOINLAST": "and",
     "LeftAndMain.PAGEWASDELETED": "Эта страница была удалена. Чтобы изменить страницу, выберите её из списка слева.",
+    "LeftAndMain.SEARCHCLEARRESULTS": "Clear search",
+    "LeftAndMain.SEARCHRESULTS": "Search results",
+    "LeftAndMain.SEARCHRESULTSMESSAGE": "Search results {parts}",
+    "LeftAndMain.SEARCHRESULTSMESSAGECATEGORY": "categorised as '{AppCategory}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDBETWEEN": "edited between '{CreatedFrom}' to '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDFROM": "edited from '{CreatedFrom}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDTO": "edited before '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEKEYWORDS": "with keywords '{Name}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGELIMIT": "limited to the folder '{Folder}'",
     "ModelAdmin.DELETED": "Удалено",
     "ModelAdmin.REALLYDELETE": "Вы действительно хотите удалить?",
     "ModelAdmin.SAVED": "Сохранено",

admin/javascript/lang/src/sk.js

@@ -11,9 +11,22 @@
     "Campaigns.ITEM_SUMMARY_SINGULAR": "%s položka",
     "Campaigns.PUBLISHCAMPAIGN": "Zverejniť kampaň",
     "Campaigns.REVERTCAMPAIGN": "Prepnúť",
+    "File.NO_SIZE": "N/A",
+    "FormBuilderModal.CLOSE": "Close",
     "LeftAndMain.CONFIRMUNSAVED": "Určite chcete opustiť navigáciu z tejto stránky?\n\nUPOZORNENIE: Vaše zmeny neboli uložené.\n\nStlačte OK pre pokračovať, alebo Cancel, ostanete na teto stránke.",
     "LeftAndMain.CONFIRMUNSAVEDSHORT": "UPOZORNENIE: Vaše zmeny neboli uložené.",
+    "LeftAndMain.JOIN": ",",
+    "LeftAndMain.JOINLAST": "and",
     "LeftAndMain.PAGEWASDELETED": "Táto stránka bola zmazaná. Pre editáciu stránky, vyberte ju vľavo.",
+    "LeftAndMain.SEARCHCLEARRESULTS": "Clear search",
+    "LeftAndMain.SEARCHRESULTS": "Search results",
+    "LeftAndMain.SEARCHRESULTSMESSAGE": "Search results {parts}",
+    "LeftAndMain.SEARCHRESULTSMESSAGECATEGORY": "categorised as '{AppCategory}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDBETWEEN": "edited between '{CreatedFrom}' to '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDFROM": "edited from '{CreatedFrom}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDTO": "edited before '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEKEYWORDS": "with keywords '{Name}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGELIMIT": "limited to the folder '{Folder}'",
     "ModelAdmin.DELETED": "Zmazané",
     "ModelAdmin.REALLYDELETE": "Skutočně chcete zmazať?",
     "ModelAdmin.SAVED": "Uložené",

admin/javascript/lang/src/sl.js

@@ -11,9 +11,22 @@
     "Campaigns.ITEM_SUMMARY_SINGULAR": "%s item",
     "Campaigns.PUBLISHCAMPAIGN": "Publish campaign",
     "Campaigns.REVERTCAMPAIGN": "Revert",
+    "File.NO_SIZE": "N/A",
+    "FormBuilderModal.CLOSE": "Close",
     "LeftAndMain.CONFIRMUNSAVED": "Res želite zapusitit stran?\n\nOPOZORILO: spremembe niso bile shranjene\n\nKliknite OK za nadaljevanje ali Prekliči, da ostanete na trenutni strani.",
     "LeftAndMain.CONFIRMUNSAVEDSHORT": "OPOZORILO: spremembe niso bile shranjene.",
+    "LeftAndMain.JOIN": ",",
+    "LeftAndMain.JOINLAST": "and",
     "LeftAndMain.PAGEWASDELETED": "Stran je bila izbrisana. Za urejanje izberite stran na levi.",
+    "LeftAndMain.SEARCHCLEARRESULTS": "Clear search",
+    "LeftAndMain.SEARCHRESULTS": "Search results",
+    "LeftAndMain.SEARCHRESULTSMESSAGE": "Search results {parts}",
+    "LeftAndMain.SEARCHRESULTSMESSAGECATEGORY": "categorised as '{AppCategory}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDBETWEEN": "edited between '{CreatedFrom}' to '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDFROM": "edited from '{CreatedFrom}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDTO": "edited before '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEKEYWORDS": "with keywords '{Name}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGELIMIT": "limited to the folder '{Folder}'",
     "ModelAdmin.DELETED": "Izbrisano",
     "ModelAdmin.REALLYDELETE": "Izbrišem?",
     "ModelAdmin.SAVED": "Shranjeno",

admin/javascript/lang/src/sl_SI.js

@@ -11,9 +11,22 @@
     "Campaigns.ITEM_SUMMARY_SINGULAR": "%s predmet",
     "Campaigns.PUBLISHCAMPAIGN": "Objavi kampanjo",
     "Campaigns.REVERTCAMPAIGN": "Povrni",
+    "File.NO_SIZE": "N/A",
+    "FormBuilderModal.CLOSE": "Close",
     "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.JOIN": ",",
+    "LeftAndMain.JOINLAST": "and",
     "LeftAndMain.PAGEWASDELETED": "Ta stran je bila izbrisana. Če želite urediti stran, jo najprej izberite na levi strani.",
+    "LeftAndMain.SEARCHCLEARRESULTS": "Clear search",
+    "LeftAndMain.SEARCHRESULTS": "Search results",
+    "LeftAndMain.SEARCHRESULTSMESSAGE": "Search results {parts}",
+    "LeftAndMain.SEARCHRESULTSMESSAGECATEGORY": "categorised as '{AppCategory}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDBETWEEN": "edited between '{CreatedFrom}' to '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDFROM": "edited from '{CreatedFrom}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDTO": "edited before '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEKEYWORDS": "with keywords '{Name}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGELIMIT": "limited to the folder '{Folder}'",
     "ModelAdmin.DELETED": "Izbrisano",
     "ModelAdmin.REALLYDELETE": "Ste prepričani, da želite izbrisati?",
     "ModelAdmin.SAVED": "Shranjeno",

admin/javascript/lang/src/sr.js

@@ -11,9 +11,22 @@
     "Campaigns.ITEM_SUMMARY_SINGULAR": "%s item",
     "Campaigns.PUBLISHCAMPAIGN": "Publish campaign",
     "Campaigns.REVERTCAMPAIGN": "Revert",
+    "File.NO_SIZE": "N/A",
+    "FormBuilderModal.CLOSE": "Close",
     "LeftAndMain.CONFIRMUNSAVED": "Да ли сте сигурни да желите да одете са ове странице?\n\nУПОЗОРЕЊЕ: Ваше измене још нису сачуване.\n\nПритисните У реду за наставак или Одустани да би сте остали на овој страници.",
     "LeftAndMain.CONFIRMUNSAVEDSHORT": "УПОЗОРЕЊЕ: Ваше измене нису сачуване.",
+    "LeftAndMain.JOIN": ",",
+    "LeftAndMain.JOINLAST": "and",
     "LeftAndMain.PAGEWASDELETED": "Ова страница је избрисана. Да би изменили страницу, изаберите је са леве стране.",
+    "LeftAndMain.SEARCHCLEARRESULTS": "Clear search",
+    "LeftAndMain.SEARCHRESULTS": "Search results",
+    "LeftAndMain.SEARCHRESULTSMESSAGE": "Search results {parts}",
+    "LeftAndMain.SEARCHRESULTSMESSAGECATEGORY": "categorised as '{AppCategory}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDBETWEEN": "edited between '{CreatedFrom}' to '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDFROM": "edited from '{CreatedFrom}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDTO": "edited before '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEKEYWORDS": "with keywords '{Name}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGELIMIT": "limited to the folder '{Folder}'",
     "ModelAdmin.DELETED": "Избрисано",
     "ModelAdmin.REALLYDELETE": "Да ли заиста желите да избришете?",
     "ModelAdmin.SAVED": "Сачувано.",

admin/javascript/lang/src/sr@latin.js

@@ -11,9 +11,22 @@
     "Campaigns.ITEM_SUMMARY_SINGULAR": "%s item",
     "Campaigns.PUBLISHCAMPAIGN": "Publish campaign",
     "Campaigns.REVERTCAMPAIGN": "Revert",
+    "File.NO_SIZE": "N/A",
+    "FormBuilderModal.CLOSE": "Close",
     "LeftAndMain.CONFIRMUNSAVED": "Da li ste sigurni da želite da odete sa ove stranice?\n\nUPOZORENjE: Vaše izmene još nisu sačuvane.\n\nPritisnite U redu za nastavak ili Odustani da bi ste ostali na ovoj stranici.",
     "LeftAndMain.CONFIRMUNSAVEDSHORT": "UPOZORENjE: Vaše izmene nisu sačuvane.",
+    "LeftAndMain.JOIN": ",",
+    "LeftAndMain.JOINLAST": "and",
     "LeftAndMain.PAGEWASDELETED": "Ova stranica je izbrisana. Da bi izmenili stranicu, izaberite je sa leve strane.",
+    "LeftAndMain.SEARCHCLEARRESULTS": "Clear search",
+    "LeftAndMain.SEARCHRESULTS": "Search results",
+    "LeftAndMain.SEARCHRESULTSMESSAGE": "Search results {parts}",
+    "LeftAndMain.SEARCHRESULTSMESSAGECATEGORY": "categorised as '{AppCategory}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDBETWEEN": "edited between '{CreatedFrom}' to '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDFROM": "edited from '{CreatedFrom}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDTO": "edited before '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEKEYWORDS": "with keywords '{Name}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGELIMIT": "limited to the folder '{Folder}'",
     "ModelAdmin.DELETED": "Izbrisano",
     "ModelAdmin.REALLYDELETE": "Da li zaista želite da izbrišete?",
     "ModelAdmin.SAVED": "Sačuvano.",

admin/javascript/lang/src/sr_RS.js

@@ -11,9 +11,22 @@
     "Campaigns.ITEM_SUMMARY_SINGULAR": "%s item",
     "Campaigns.PUBLISHCAMPAIGN": "Publish campaign",
     "Campaigns.REVERTCAMPAIGN": "Revert",
+    "File.NO_SIZE": "N/A",
+    "FormBuilderModal.CLOSE": "Close",
     "LeftAndMain.CONFIRMUNSAVED": "Да ли сте сигурни да желите да одете са ове странице?\n\nУПОЗОРЕЊЕ: Ваше измене још нису сачуване.\n\nПритисните У реду за наставак или Одустани да би сте остали на овој страници.",
     "LeftAndMain.CONFIRMUNSAVEDSHORT": "УПОЗОРЕЊЕ: Ваше измене нису сачуване.",
+    "LeftAndMain.JOIN": ",",
+    "LeftAndMain.JOINLAST": "and",
     "LeftAndMain.PAGEWASDELETED": "Ова страница је избрисана. Да би изменили страницу, изаберите је са леве стране.",
+    "LeftAndMain.SEARCHCLEARRESULTS": "Clear search",
+    "LeftAndMain.SEARCHRESULTS": "Search results",
+    "LeftAndMain.SEARCHRESULTSMESSAGE": "Search results {parts}",
+    "LeftAndMain.SEARCHRESULTSMESSAGECATEGORY": "categorised as '{AppCategory}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDBETWEEN": "edited between '{CreatedFrom}' to '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDFROM": "edited from '{CreatedFrom}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDTO": "edited before '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEKEYWORDS": "with keywords '{Name}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGELIMIT": "limited to the folder '{Folder}'",
     "ModelAdmin.DELETED": "Избрисано",
     "ModelAdmin.REALLYDELETE": "Да ли заиста желите да избришете?",
     "ModelAdmin.SAVED": "Сачувано.",

admin/javascript/lang/src/sr_RS@latin.js

@@ -11,9 +11,22 @@
     "Campaigns.ITEM_SUMMARY_SINGULAR": "%s item",
     "Campaigns.PUBLISHCAMPAIGN": "Publish campaign",
     "Campaigns.REVERTCAMPAIGN": "Revert",
+    "File.NO_SIZE": "N/A",
+    "FormBuilderModal.CLOSE": "Close",
     "LeftAndMain.CONFIRMUNSAVED": "Da li ste sigurni da želite da odete sa ove stranice?\n\nUPOZORENjE: Vaše izmene još nisu sačuvane.\n\nPritisnite U redu za nastavak ili Odustani da bi ste ostali na ovoj stranici.",
     "LeftAndMain.CONFIRMUNSAVEDSHORT": "UPOZORENjE: Vaše izmene nisu sačuvane.",
+    "LeftAndMain.JOIN": ",",
+    "LeftAndMain.JOINLAST": "and",
     "LeftAndMain.PAGEWASDELETED": "Ova stranica je izbrisana. Da bi izmenili stranicu, izaberite je sa leve strane.",
+    "LeftAndMain.SEARCHCLEARRESULTS": "Clear search",
+    "LeftAndMain.SEARCHRESULTS": "Search results",
+    "LeftAndMain.SEARCHRESULTSMESSAGE": "Search results {parts}",
+    "LeftAndMain.SEARCHRESULTSMESSAGECATEGORY": "categorised as '{AppCategory}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDBETWEEN": "edited between '{CreatedFrom}' to '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDFROM": "edited from '{CreatedFrom}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDTO": "edited before '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEKEYWORDS": "with keywords '{Name}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGELIMIT": "limited to the folder '{Folder}'",
     "ModelAdmin.DELETED": "Izbrisano",
     "ModelAdmin.REALLYDELETE": "Da li zaista želite da izbrišete?",
     "ModelAdmin.SAVED": "Sačuvano.",

admin/javascript/lang/src/sv.js

@@ -11,9 +11,22 @@
     "Campaigns.ITEM_SUMMARY_SINGULAR": "%s item",
     "Campaigns.PUBLISHCAMPAIGN": "Publish campaign",
     "Campaigns.REVERTCAMPAIGN": "Revert",
+    "File.NO_SIZE": "N/A",
+    "FormBuilderModal.CLOSE": "Close",
     "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.",
+    "LeftAndMain.JOIN": ",",
+    "LeftAndMain.JOINLAST": "and",
     "LeftAndMain.PAGEWASDELETED": "Sidan raderades. För att redigera en sida, välj den i menyn till vänster.",
+    "LeftAndMain.SEARCHCLEARRESULTS": "Clear search",
+    "LeftAndMain.SEARCHRESULTS": "Search results",
+    "LeftAndMain.SEARCHRESULTSMESSAGE": "Search results {parts}",
+    "LeftAndMain.SEARCHRESULTSMESSAGECATEGORY": "categorised as '{AppCategory}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDBETWEEN": "edited between '{CreatedFrom}' to '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDFROM": "edited from '{CreatedFrom}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDTO": "edited before '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEKEYWORDS": "with keywords '{Name}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGELIMIT": "limited to the folder '{Folder}'",
     "ModelAdmin.DELETED": "Raderad",
     "ModelAdmin.REALLYDELETE": "Vill du verkligen radera?",
     "ModelAdmin.SAVED": "Sparad",

admin/javascript/lang/src/zh.js

@@ -11,9 +11,22 @@
     "Campaigns.ITEM_SUMMARY_SINGULAR": "%s item",
     "Campaigns.PUBLISHCAMPAIGN": "Publish campaign",
     "Campaigns.REVERTCAMPAIGN": "Revert",
+    "File.NO_SIZE": "N/A",
+    "FormBuilderModal.CLOSE": "Close",
     "LeftAndMain.CONFIRMUNSAVED": "您确定要离开此页面？\n警告：您所做的更改尚未保存。\n请按“确定”继续，或“取消”留在当前页面。\n",
     "LeftAndMain.CONFIRMUNSAVEDSHORT": "警告：您所做的更改尚未保存。",
+    "LeftAndMain.JOIN": ",",
+    "LeftAndMain.JOINLAST": "and",
     "LeftAndMain.PAGEWASDELETED": "该页面已被删除。若要编辑一个页面，请在左边选择。",
+    "LeftAndMain.SEARCHCLEARRESULTS": "Clear search",
+    "LeftAndMain.SEARCHRESULTS": "Search results",
+    "LeftAndMain.SEARCHRESULTSMESSAGE": "Search results {parts}",
+    "LeftAndMain.SEARCHRESULTSMESSAGECATEGORY": "categorised as '{AppCategory}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDBETWEEN": "edited between '{CreatedFrom}' to '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDFROM": "edited from '{CreatedFrom}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDTO": "edited before '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEKEYWORDS": "with keywords '{Name}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGELIMIT": "limited to the folder '{Folder}'",
     "ModelAdmin.DELETED": "已删除",
     "ModelAdmin.REALLYDELETE": "您真的要删除吗？",
     "ModelAdmin.SAVED": "已保存",

admin/javascript/lang/sv.js

@@ -18,9 +18,22 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
     "Campaigns.ITEM_SUMMARY_SINGULAR": "%s item",
     "Campaigns.PUBLISHCAMPAIGN": "Publish campaign",
     "Campaigns.REVERTCAMPAIGN": "Revert",
+    "File.NO_SIZE": "N/A",
+    "FormBuilderModal.CLOSE": "Close",
     "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.",
+    "LeftAndMain.JOIN": ",",
+    "LeftAndMain.JOINLAST": "and",
     "LeftAndMain.PAGEWASDELETED": "Sidan raderades. För att redigera en sida, välj den i menyn till vänster.",
+    "LeftAndMain.SEARCHCLEARRESULTS": "Clear search",
+    "LeftAndMain.SEARCHRESULTS": "Search results",
+    "LeftAndMain.SEARCHRESULTSMESSAGE": "Search results {parts}",
+    "LeftAndMain.SEARCHRESULTSMESSAGECATEGORY": "categorised as '{AppCategory}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDBETWEEN": "edited between '{CreatedFrom}' to '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDFROM": "edited from '{CreatedFrom}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDTO": "edited before '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEKEYWORDS": "with keywords '{Name}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGELIMIT": "limited to the folder '{Folder}'",
     "ModelAdmin.DELETED": "Raderad",
     "ModelAdmin.REALLYDELETE": "Vill du verkligen radera?",
     "ModelAdmin.SAVED": "Sparad",

admin/javascript/lang/zh.js

@@ -18,9 +18,22 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
     "Campaigns.ITEM_SUMMARY_SINGULAR": "%s item",
     "Campaigns.PUBLISHCAMPAIGN": "Publish campaign",
     "Campaigns.REVERTCAMPAIGN": "Revert",
+    "File.NO_SIZE": "N/A",
+    "FormBuilderModal.CLOSE": "Close",
     "LeftAndMain.CONFIRMUNSAVED": "您确定要离开此页面？\n警告：您所做的更改尚未保存。\n请按“确定”继续，或“取消”留在当前页面。\n",
     "LeftAndMain.CONFIRMUNSAVEDSHORT": "警告：您所做的更改尚未保存。",
+    "LeftAndMain.JOIN": ",",
+    "LeftAndMain.JOINLAST": "and",
     "LeftAndMain.PAGEWASDELETED": "该页面已被删除。若要编辑一个页面，请在左边选择。",
+    "LeftAndMain.SEARCHCLEARRESULTS": "Clear search",
+    "LeftAndMain.SEARCHRESULTS": "Search results",
+    "LeftAndMain.SEARCHRESULTSMESSAGE": "Search results {parts}",
+    "LeftAndMain.SEARCHRESULTSMESSAGECATEGORY": "categorised as '{AppCategory}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDBETWEEN": "edited between '{CreatedFrom}' to '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDFROM": "edited from '{CreatedFrom}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEEDITEDTO": "edited before '{CreatedTo}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGEKEYWORDS": "with keywords '{Name}'",
+    "LeftAndMain.SEARCHRESULTSMESSAGELIMIT": "limited to the folder '{Folder}'",
     "ModelAdmin.DELETED": "已删除",
     "ModelAdmin.REALLYDELETE": "您真的要删除吗？",
     "ModelAdmin.SAVED": "已保存",

admin/templates/Includes/LeftAndMain_TreeNode.ss

@@ -0,0 +1,6 @@
+<li id="record-$ID" data-id="$ID" data-pagetype="$ClassName" class="$Classes">
+	<ins class="jstree-icon">&nbsp;</ins>
+	<a href="$Link" title="$Title.ATT"><ins class="jstree-icon">&nbsp;</ins>
+		<span class="text">$TreeTitle</span>
+	</a>
+</li>

admin/tests/LeftAndMainTest.php

@@ -302,6 +302,8 @@ class LeftAndMainTest_Object extends DataObject implements TestOnly {
 		'Hierarchy'
 	);
 
-	public function CMSTreeClasses() {}
+	public function CMSTreeClasses() {
+		return '';
+	}
 
 }

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

@@ -0,0 +1,14 @@
+# 3.4.4-rc1
+
+<!--- Changes below this line will be automatically regenerated -->
+
+## Change Log
+
+### Security
+
+ * 2017-01-13 [c6c6c13](https://github.com/silverstripe/silverstripe-framework/commit/c6c6c13fc265aeedf5de7226b3cde39d185ba49d) Unescaped title attribute in LeftAndMain_TreeNode::forTemplate (Daniel Hensby) - See [ss-2017-001](http://www.silverstripe.org/download/security-releases/ss-2017-001)
+
+### Bugfixes
+
+ * 2017-01-16 [17d123a](https://github.com/silverstripe/silverstripe-framework/commit/17d123a3be3a2c9e21845fda89c61f00301f78f5) Ensure correct regeneration of ConfigManifest if only one of the cache files is missing (Stephan Bauer)
+ * 2017-01-10 [5bba726](https://github.com/silverstripe/silverstripe-cms/commit/5bba7264c69b654ac5bcb87769781138be61cb92) Dont attempt to iterate over null in SiteTree::allowedChildren (Daniel Hensby)

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

@@ -0,0 +1,17 @@
+# 3.5.2-rc1
+
+<!--- Changes below this line will be automatically regenerated -->
+
+## Change Log
+
+### Security
+
+ * 2017-01-13 [c6c6c13](https://github.com/silverstripe/silverstripe-framework/commit/c6c6c13fc265aeedf5de7226b3cde39d185ba49d) Unescaped title attribute in LeftAndMain_TreeNode::forTemplate (Daniel Hensby) - See [ss-2017-001](http://www.silverstripe.org/download/security-releases/ss-2017-001)
+
+### Bugfixes
+
+ * 2017-01-24 [c640ade](https://github.com/silverstripe/silverstripe-framework/commit/c640ade9112c703068754c7d7061d646da7307bd) ed iframe postmessage breaking non-string messages (Ruud Arentsen)
+ * 2017-01-16 [17d123a](https://github.com/silverstripe/silverstripe-framework/commit/17d123a3be3a2c9e21845fda89c61f00301f78f5) Ensure correct regeneration of ConfigManifest if only one of the cache files is missing (Stephan Bauer)
+ * 2017-01-14 [1f1fffe](https://github.com/silverstripe/silverstripe-framework/commit/1f1fffe73454930c1aef394e9b106a484e6d59ee) Ensure correct regeneration of ConfigManifest if only one of the cache files is missing (fixes #6467) (Stephan Bauer)
+ * 2017-01-10 [5bba726](https://github.com/silverstripe/silverstripe-cms/commit/5bba7264c69b654ac5bcb87769781138be61cb92) Dont attempt to iterate over null in SiteTree::allowedChildren (Daniel Hensby)
+ * 2016-12-21 [f314b86](https://github.com/silverstripe/silverstripe-framework/commit/f314b86ad804b021cda255e4645e99e8d971fa8a) Temp disable shortcode SPLIT behaviour due to crash (#6436) (Damian Mooyman)

lang/de.yml

@@ -31,7 +31,6 @@ de:
     INSERTURL: "Von URL einfügen"
     REMOVEINFO: "Entferne diese Datei aus dem Feld"
     TOTAL: Insgesamt
-    TOUPLOAD: "Dateien zum Hochladen auswählen..."
     UPLOADINPROGRESS: "Bitte warten sie... Upload im Gang"
     UPLOADOR: oder
   BBCodeParser:
@@ -443,7 +442,6 @@ de:
     PASSWORD: Passwort
     PASSWORDEXPIRED: "Ihr Passwort ist abgelaufen. Bitte wählen Sie ein neues Passwort."
     PLURALNAME: Benutzer
-    REMEMBERME: "Für das nächste Mal merken?"
     SINGULARNAME: Benutzer
     SUBJECTPASSWORDCHANGED: "Ihr Passwort wurde geändert"
     SUBJECTPASSWORDRESET: "Ihr Link zur Passwortrücksetzung"
@@ -469,7 +467,6 @@ de:
     DIGITSDECFRACTIONSECOND: "Eine oder mehrere Ziffern, die einen Dezimalbruch einer Sekunde darstellen"
     FOURDIGITYEAR: "Vierstellige Jahreszahl"
     FULLNAMEMONTH: "Volle Monatsbezeichnung (z.B. Juni)"
-    HOURNOLEADING: "Stunde ohne führende Null"
     HOURNOLEADING24: "Stunde ohne führende Null, 24 Stunden Format"
     MINUTENOLEADING: "Minute, ohne führende Null"
     MONTHNOLEADING: "Monat, ohne führende Null"

lang/en.yml

@@ -67,6 +67,7 @@ en:
     UNORDEREDEXAMPLE1: 'unordered item 1'
   BackLink_Button_ss:
     Back: Back
+    NavigateUp: 'Navigate up a folder'
   BasicAuth:
     ENTERINFO: 'Please enter a username and password.'
     ERRORNOTADMIN: 'That user is not an administrator.'
@@ -110,7 +111,7 @@ en:
     AddToCampaign: 'Add To Campaign'
     AddToCampaignFormFieldLabel: 'Select a Campaign'
   ChangePasswordEmail_ss:
-    CHANGEPASSWORDFOREMAIL: 'The password for account with email address {email} has been changed. If you didn''t change your password please change your password using the link below'
+    CHANGEPASSWORDFOREMAIL: 'The password for account with email address {email} has been changed. If you didn\''t change your password please change your password using the link below'
     CHANGEPASSWORDTEXT1: 'You changed your password for'
     CHANGEPASSWORDTEXT2: 'You can now use the following credentials to log in:'
     CHANGEPASSWORDTEXT3: 'Change password'
@@ -425,9 +426,13 @@ en:
   LeftAndMain:
     CANCEL: Cancel
     CANT_REORGANISE: 'You do not have permission to alter Top level pages. Your change was not saved.'
+    CollapsePanel: 'Collapse Panel'
     DELETED: Deleted.
     DropdownBatchActionsDefault: 'Choose an action...'
+    ExpandPanel: 'Expand Panel'
     HELP: Help
+    MenuToggleAuto: Auto
+    MenuToggleStickyNav: 'Sticky nav'
     PAGETYPE: 'Page type'
     PERMAGAIN: 'You have been logged out of the CMS.  If you would like to log in again, enter a username and password below.'
     PERMALREADY: 'I''m sorry, but you can''t access that part of the CMS.  If you want to log in as someone else, do so below.'
@@ -704,6 +709,7 @@ en:
     TABMAIN: Main
   TableListField:
     CSVEXPORT: 'Export to CSV'
+    CSVIMPORT: 'Import CSV'
     Print: Print
   TableListField_PageControls_ss:
     OF: of
@@ -742,6 +748,8 @@ en:
     STARTALL: 'Start all'
     Saved: Saved
     UPLOADSINTO: 'saves into /{path}'
+  ValidationException:
+    DEFAULT_ERROR: 'Validation error'
   Versioned:
     INFERRED_TITLE: 'Generated by publish of ''{title}'' at {created}'
     has_many_Versions: Versions

lang/fa_IR.yml

@@ -37,7 +37,6 @@ fa_IR:
     INSERTURL: "وارد‌کردن از نشانی اینترنتی"
     REMOVEINFO: "حذف این فایل از این فیلد"
     TOTAL: مجموع
-    TOUPLOAD: "انتخاب فایل‌ها جهت آپلود..."
     UPLOADINPROGRESS: "لطفاً صبر کنید... آپلود در جریان است"
     UPLOADOR: یا
   BBCodeParser:
@@ -430,7 +429,6 @@ fa_IR:
     PASSWORD: گذرواژه
     PASSWORDEXPIRED: "گذرواژه شما منقضی شده‌است. لطفاً یکی جدید برگزینید."
     PLURALNAME: اعضاء
-    REMEMBERME: "مرا برای بار بعد به خاطر بسپار؟"
     SINGULARNAME: عضو
     SUBJECTPASSWORDCHANGED: "گذرواژه شما تغییر یافته است"
     SUBJECTPASSWORDRESET: "لینک ازنوسازی گذرواژه شما"
@@ -453,7 +451,6 @@ fa_IR:
     DAYNOLEADING: "روز از ماه بدون نمایش صفر در ابتدا"
     FOURDIGITYEAR: "سال چهار عددی"
     FULLNAMEMONTH: "نام کامل ماه (مثال ژوئن)"
-    HOURNOLEADING: "ساعت بدون صفر آغازین"
     HOURNOLEADING24: "ساعت بدون صفر آغازین، قالب ۲۴ ساعته"
     MINUTENOLEADING: "دقیقه بدون نمایش صفر در ابتدا"
     MONTHNOLEADING: "عدد ماه بدون نمایش صفر در ابتدا"

lang/fi.yml

@@ -67,6 +67,7 @@ fi:
     UNORDEREDEXAMPLE1: "järjestämätön lista 1"
   BackLink_Button_ss:
     Back: Takaisin
+    NavigateUp: "Siirry edelliseen kansioon"
   BasicAuth:
     ENTERINFO: "Anna käyttäjänimi ja salasana"
     ERRORNOTADMIN: "Tämä käyttäjä ei ole ylläpitäjä"
@@ -110,7 +111,7 @@ fi:
     AddToCampaign: "Lisää Kampanjaan"
     AddToCampaignFormFieldLabel: "Valitse Kampanja"
   ChangePasswordEmail_ss:
-    CHANGEPASSWORDFOREMAIL: "Tilin salasana sähköpostille {email} on vaihdettu. Mikäli et itse tätä tehnyt, vaihda salasana oheisesta linkistä"
+    CHANGEPASSWORDFOREMAIL: "Tilin salasana on vaihdettu. Sähköpostiosoite on {email}. Mikäli et pyytänyt salasanan vaihtoa, vaihda salasanasi alla olevasta linkistä"
     CHANGEPASSWORDTEXT1: "Vaihdoit salasanasi osoitteelle"
     CHANGEPASSWORDTEXT2: "Kirjautuaksesi sisään voit käyttää seuraavia tietoja:"
     CHANGEPASSWORDTEXT3: "Vaihda salasana"
@@ -240,7 +241,7 @@ fi:
     HELLO: Hei
     TEXT1: "Tässä on sinun"
     TEXT2: "salasanan vaihtolinkki"
-    TEXT3: henkilölle
+    TEXT3: kohteeseen
   Form:
     CSRF_EXPIRED_MESSAGE: "Istuntosi on umpeutunut. Lähetä lomake uudelleen."
     CSRF_FAILED_MESSAGE: "On ilmeisesti tapahtunut tekninen virhe. Klikkaa selaimesi Takaisin-nappia, päivitä sivu ja yritä uudelleen."
@@ -425,11 +426,15 @@ fi:
   LeftAndMain:
     CANCEL: Peruuta
     CANT_REORGANISE: "Sinulla ei ole oikeuksia mennä ylemmän tason sivuille. Muutoksiasi ei tallennettu."
+    CollapsePanel: "Supista paneeli"
     DELETED: Poistettu.
     DropdownBatchActionsDefault: "Valitse toiminto..."
+    ExpandPanel: "Laajenna paneeli"
     HELP: Ohje
+    MenuToggleAuto: Autom.
+    MenuToggleStickyNav: "Tahmea navi"
     PAGETYPE: "Sivun tyyppi"
-    PERMAGAIN: "Olet kirjautunut ulos CMS:stä. Jos haluat kirjautua uudelleen sisään, syötä käyttäjätunnuksesi ja salasanasi alla."
+    PERMAGAIN: "Olet kirjautunut ulos CMS:stä. Jos haluat kirjautua uudelleen sisään, syötä käyttäjätunnuksesi ja salasanasi alle."
     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."
@@ -482,7 +487,7 @@ fi:
     PASSWORD: Salasana
     PASSWORDEXPIRED: "Salasanasi on vanhentunut. Ole hyvä ja valitse uusi."
     PLURALNAME: Jäsenet
-    REMEMBERME: "Muista seuraavalla kerralla?"
+    REMEMBERME: "Muista minut seuraavalla kerralla?"
     SINGULARNAME: Jäsen
     SUBJECTPASSWORDCHANGED: "Salasanasi on vaihdettu"
     SUBJECTPASSWORDRESET: "Salasanasi palautuslinkki"
@@ -704,6 +709,7 @@ fi:
     TABMAIN: Yleiset
   TableListField:
     CSVEXPORT: "Vie CSV:nä"
+    CSVIMPORT: "Tuo CSV"
     Print: Tulosta
   TableListField_PageControls_ss:
     OF: /
@@ -742,6 +748,8 @@ fi:
     STARTALL: "Aloita kaikki"
     Saved: Tallennettu
     UPLOADSINTO: "tallentuu polkuun: /{path}"
+  ValidationException:
+    DEFAULT_ERROR: Validointivirhe
   Versioned:
     INFERRED_TITLE: "Luotu julkaisusta '{title}', {created}"
     has_many_Versions: Versiot

lang/hr.yml

@@ -37,7 +37,6 @@ hr:
     INSERTURL: "Ubaci sa linka"
     REMOVEINFO: "Izbrišite ovu datoteku s ovog polja"
     TOTAL: Ukupno
-    TOUPLOAD: "Odaberite datoteke za upload..."
     UPLOADINPROGRESS: "Molim pričekajte... upload u tijeku"
     UPLOADOR: ILI
   BBCodeParser:

lang/it.yml

@@ -37,7 +37,6 @@ it:
     INSERTURL: "Inserisci da URL"
     REMOVEINFO: "Rimuovi questo file da questo campo"
     TOTAL: Totale
-    TOUPLOAD: "Scegli i files da caricare..."
     UPLOADINPROGRESS: "Attendere prego... caricamento in corso"
     UPLOADOR: O
   BBCodeParser:
@@ -323,7 +322,6 @@ it:
     CSSCLASSRIGHT: "Sulla destra, con il testo attorno."
     DETAILS: Dettagli
     EMAIL: "Indirizzo email"
-    FILE: SilverStripe\Assets\File
     FOLDER: Cartella
     IMAGEALT: "Testo alternativo (alt)"
     IMAGEALTTEXT: "Testo alternativo (alt) - mostrato nel caso l'immagine non possa essere visualizzata"
@@ -473,7 +471,6 @@ it:
     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"
@@ -499,7 +496,6 @@ it:
     DIGITSDECFRACTIONSECOND: "Una o più cifre che rappresentano una frazione decimale di secondo"
     FOURDIGITYEAR: "Anno a quattro cifre"
     FULLNAMEMONTH: "Nome completo del mese (es. Giugno)"
-    HOURNOLEADING: "Ore senza zero iniziale"
     HOURNOLEADING24: "Ore senza zero iniziale, formato 24 ore"
     MINUTENOLEADING: "Minuti senza zero iniziale"
     MONTHNOLEADING: "Mese senza zero iniziale"

lang/sv.yml

@@ -27,7 +27,6 @@ sv:
     FROMCOMPUTERINFO: "Ladda upp från din dator"
     REMOVEINFO: "Ta bort från detta fält"
     TOTAL: Totalt
-    TOUPLOAD: "Välj filer att ladda upp..."
     UPLOADINPROGRESS: "Var god dröj... uppladdning pågår"
     UPLOADOR: ELLER
   BBCodeParser:

model/Hierarchy.php

@@ -127,7 +127,7 @@ class Hierarchy extends DataExtension {
 	 *
 	 * @return string
 	 */
-	public function getChildrenAsUL($attributes = "", $titleEval = '"<li>" . $child->Title', $extraArg = null,
+	public function getChildrenAsUL($attributes = "", $titleEval = '"<li>" . $child->Title . "</li>"', $extraArg = null,
 			$limitToMarked = false, $childrenMethod = "AllChildrenIncludingDeleted",
 			$numChildrenMethod = "numChildren", $rootCall = true,
 			$nodeCountThreshold = null, $nodeCountCallback = null) {
@@ -170,6 +170,10 @@ class Hierarchy extends DataExtension {
 					} else {
 						$output .= eval("return $titleEval;");
 					}
+					$output = trim($output);
+					if (substr($output, -5) == '</li>') {
+						$output = trim(substr($output, 0, -5));
+					}
 					$output .= "\n";
 
 					$numChildren = $child->$numChildrenMethod();

tests/forms/TreeDropdownFieldTest.php

@@ -22,8 +22,8 @@ class TreeDropdownFieldTest extends SapphireTest {
 		$cssPath = 'ul.tree li#selector-TestTree-'.$folder1->ID.' li#selector-TestTree-'.$folder1Subfolder1->ID.' a span.item';
 		$firstResult = $parser->getBySelector($cssPath);
 		$this->assertEquals(
-			(string)$firstResult[0],
 			$folder1Subfolder1->Name,
+			(string)$firstResult[0],
 			$folder1Subfolder1->Name.' is found, nested under '.$folder1->Name
 		);
 
@@ -31,8 +31,8 @@ class TreeDropdownFieldTest extends SapphireTest {
 		$cssPath = 'ul.tree li#selector-TestTree-'.$subfolder->ID.' a span.item';
 		$secondResult = $parser->getBySelector($cssPath);
 		$this->assertEquals(
-			(string)$secondResult[0],
 			$subfolder->Name,
+			(string)$secondResult[0],
 			$subfolder->Name.' is found at root level'
 		);
 
@@ -40,9 +40,8 @@ class TreeDropdownFieldTest extends SapphireTest {
 		$folder2 = $this->objFromFixture('Folder','folder2');
 		$cssPath = 'ul.tree li#selector-TestTree-'.$folder2->ID.' a span.item';
 		$noResult = $parser->getBySelector($cssPath);
-		$this->assertEquals(
+		$this->assertEmpty(
 			$noResult,
-			array(),
 			$folder2.' is not found'
 		);
 
@@ -58,8 +57,8 @@ class TreeDropdownFieldTest extends SapphireTest {
 		$cssPath = 'ul.tree li#selector-TestTree-'.$folder1->ID.' li#selector-TestTree-'.$folder1Subfolder1->ID.' a span.item';
 		$firstResult = $parser->getBySelector($cssPath);
 		$this->assertEquals(
-			(string)$firstResult[0],
 			$folder1Subfolder1->Name,
+			(string)$firstResult[0],
 			$folder1Subfolder1->Name.' is found, nested under '.$folder1->Name
 		);
 
@@ -74,8 +73,8 @@ class TreeDropdownFieldTest extends SapphireTest {
 			$file1->Name.' with ID '.$file1->ID.' is in search results'
 		);
 		$this->assertEquals(
-			(string)$firstResult[0],
 			$file1->Name,
+			(string)$firstResult[0],
 			$file1->Name.' is found nested under '.$subfolder->Name
 		);
 
@@ -87,8 +86,8 @@ class TreeDropdownFieldTest extends SapphireTest {
 			$file2->Name.' with ID '.$file2->ID.' is in search results'
 		);
 		$this->assertEquals(
-			(string)$secondResult[0],
 			$file2->Name,
+			(string)$secondResult[0],
 			$file2->Name.' is found nested under '.$subfolder->Name
 		);
 
@@ -96,9 +95,8 @@ class TreeDropdownFieldTest extends SapphireTest {
 		$file3 = $this->objFromFixture('File','asdf');
 		$cssPath = 'ul.tree li#selector-TestTree-'.$file3->ID;
 		$noResult = $parser->getBySelector($cssPath);
-		$this->assertEquals(
+		$this->assertEmpty(
 			$noResult,
-			array(),
 			$file3->Name.' is not found'
 		);
 	}