Merge branch '3'

admin/client/lang/cs.js

@@ -8,7 +8,7 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
   ss.i18n.addDictionary('cs', {
     "CMSMAIN.BATCH_ARCHIVE_PROMPT": "Vybráno {num} stránek.\n\nSkutečně chcete archivovat tyto stránky?\n\nTyto stránky a její všechny podstránky budou nezveřejněny a odeslány do archívu.",
     "CMSMAIN.BATCH_DELETELIVE_PROMPT": "Máte vybráno {num} stránek.\n\nSkutečně chcete vymazat tyto stránky z webu?",
-    "CMSMAIN.BATCH_DELETE_PROMPT": "Máte vybráno {num} stránek.\n\nSkutečně je chcete vymazat?",
+    "CMSMAIN.BATCH_DELETE_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to delete?",
     "CMSMAIN.BATCH_PUBLISH_PROMPT": "Máte vybráno {num} stránek.\n\nSkutečně je chcete zveřejnit?",
     "CMSMAIN.BATCH_RESTORE_PROMPT": "Vybráno {num} stránek.\n\nSkutečně chcete obnovit?\n\nPodstránky archivovaných stránek budou obnoveny do nejvzšší úrovně, pokud tyto stránky budou také obnoveny.",
     "CMSMAIN.BATCH_UNPUBLISH_PROMPT": "Máte vybráno {num} stránek.\n\nSkutečně je chcete nezveřejnit?",

admin/client/lang/de.js

@@ -8,14 +8,14 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
   ss.i18n.addDictionary('de', {
     "CMSMAIN.BATCH_ARCHIVE_PROMPT": "Sie haben {num} Seite(n) ausgewählt.\n\nWollen Sie diese wirklich archivieren?\n\nDiese Seiten und alle Unterseiten davon werden von der veröffentlichen Seite gelöscht und in das Archiv verschoben.",
     "CMSMAIN.BATCH_DELETELIVE_PROMPT": "Sie haben {num} Seite(n) ausgewählt.\n\nWollen Sie diese wirklich von der veröfffentlichten Seite löschen?",
-    "CMSMAIN.BATCH_DELETE_PROMPT": "Sie haben {num} Seite(n) ausgewählt.\n\nWollen Sie diese wirklich löschen?",
+    "CMSMAIN.BATCH_DELETE_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to delete?",
     "CMSMAIN.BATCH_PUBLISH_PROMPT": "Sie haben {num} Seite(n) ausgewählt.\n\nWollen Sie diese wirklich veröffentlichen?",
     "CMSMAIN.BATCH_RESTORE_PROMPT": "Sie haben {num} Seite(n) ausgewählt.\\n\\nWollen Sie diese wirklich wiederherstellen?\\n\\nUnterseiten von archivierten Seiten werden auf der Root-Ebene wiederhergestellt, es sei denn, diese Seiten werden ebenfalls wiederhergestellt.",
     "CMSMAIN.BATCH_UNPUBLISH_PROMPT": "Sie haben {num} Seite(n) ausgewählt.\n\nWollen Sie wirklich die Veröffentlichung zurücknehmen?",
     "CMSMAIN.SELECTONEPAGE": "Bitte mindestens eine Seite auswählen",
     "Campaigns.ADDCAMPAIGN": "Add campaign",
-    "Campaigns.ITEM_SUMMARY_PLURAL": "%s items",
+    "Campaigns.ITEM_SUMMARY_PLURAL": "%s Einträge",
-    "Campaigns.ITEM_SUMMARY_SINGULAR": "%s item",
+    "Campaigns.ITEM_SUMMARY_SINGULAR": "%s Eintrag",
     "Campaigns.PUBLISHCAMPAIGN": "Publish campaign",
     "Campaigns.REVERTCAMPAIGN": "Revert",
     "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.",

admin/client/lang/eo.js

@@ -8,7 +8,7 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
   ss.i18n.addDictionary('eo', {
     "CMSMAIN.BATCH_ARCHIVE_PROMPT": "Vi elektis {num} paĝo(j)n.\n\nĈu vi vere volas enarĥivigi tiujn paĝojn?\n\nTiuj paĝoj kaj ĉiuj idaj paĝoj estos malpublikigitaj kaj senditaj al la arĥivo.",
     "CMSMAIN.BATCH_DELETELIVE_PROMPT": "Vi elektis {num} paĝo(j)n.\n\nĈi vi vere volas forigi tiujn paĝojn el la publika stadio?",
-    "CMSMAIN.BATCH_DELETE_PROMPT": "Vi elektis {num} paĝo(j)n.\n\nĈi vi vere volas forigi?",
+    "CMSMAIN.BATCH_DELETE_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to delete?",
     "CMSMAIN.BATCH_PUBLISH_PROMPT": "Vi elektis {num} paĝo(j)n.\n\nĈi vi vere volas publikigi?",
     "CMSMAIN.BATCH_RESTORE_PROMPT": "Vi elektis {num} paĝo(j)n.\n\nĈu vi vere volas restaŭri al stadio?\n\nIdoj de enarĥivigitaj paĝoj estos restaŭritaj al la radika nivelo, escepte se tiuj paĝoj ankaŭ estos restaŭritaj.",
     "CMSMAIN.BATCH_UNPUBLISH_PROMPT": "Vi elektis {num} paĝo(j)n.\n\nĈi vi vere volas malpublikigi?",

admin/client/lang/es.js

@@ -8,7 +8,7 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
   ss.i18n.addDictionary('es', {
     "CMSMAIN.BATCH_ARCHIVE_PROMPT": "Ud tiene {num} páginas seleccionadas.\n\n¿Está seguro de querer archivar estas páginas?\n\nEstas páginas y sus hijas se retirarán de publicación y se enviarán al archivo.",
     "CMSMAIN.BATCH_DELETELIVE_PROMPT": "Ud tiene {num} página(s) seleccionada(s).\n\n¿Realmente quieres eliminarla(s) desde el sitio en vivo?",
-    "CMSMAIN.BATCH_DELETE_PROMPT": "Ud tiene {num} página(s) seleccionada(s).\n\n¿Realmente quiere eliminarla(s)?",
+    "CMSMAIN.BATCH_DELETE_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to delete?",
     "CMSMAIN.BATCH_PUBLISH_PROMPT": "Ud tiene {num} página(s) seleccionada(s).\n\n¿Realmente la(s) quiere publicar?",
     "CMSMAIN.BATCH_RESTORE_PROMPT": "Ud tiene {num} páginas seleccionadas.\n\n¿Está seguro de querer restaurar estas páginas?\n\nLos hijos de las páginas archivadas serán restauradas al nivel raíz a no ser que esas páginas también sean restauradas.",
     "CMSMAIN.BATCH_UNPUBLISH_PROMPT": "Ud tiene {num} página(s) seleccionada(s).\n\n¿Realmente la(s) quiere retirar de publicación?",

admin/client/lang/fa_IR.js

@@ -8,7 +8,7 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
   ss.i18n.addDictionary('fa_IR', {
     "CMSMAIN.BATCH_ARCHIVE_PROMPT": "شما {num} صفحه(صفحه‌ها) را انتخاب کرده‌اید.\n\n\nآیا از این‌که می‌خواهید بایگانی شوند اطمینان دارید؟\n\nتمامی این صفحات و تمامی صفحات فرزند آن‌ها عدم انتشار می‌شوند و به بایگانی ارسال می‌گردند.",
     "CMSMAIN.BATCH_DELETELIVE_PROMPT": "شما {num} صفحه(صفحه‌ها) را انتخاب کرده‌اید.\n\nآیا واقعاً می‌خواهید آن‌ها از لایو را حذف نمایید؟",
-    "CMSMAIN.BATCH_DELETE_PROMPT": "شما {num} صفحه(صفحه‌ها) را انتخاب کرده‌اید.\n\nآیا واقعاً می‌خواهید آن‌ها را حذف نمایید؟",
+    "CMSMAIN.BATCH_DELETE_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to delete?",
     "CMSMAIN.BATCH_PUBLISH_PROMPT": "شما {num} صفحه(صفحه‌ها) را انتخاب کرده‌اید.\n\nآیا واقعاً می‌خواهید آن‌ها را منتشر نمایید؟",
     "CMSMAIN.BATCH_RESTORE_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to restore to stage?\n\nChildren of archived pages will be restored to the root level, unless those pages are also being restored.",
     "CMSMAIN.BATCH_UNPUBLISH_PROMPT": "شما {num} صفحه را انتخاب کرده‌اید.\n\nآیا واقعاً می‌خواهید انتشار آن‌ها را لغو نمایید",

admin/client/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": "You have {num} page(s) selected.\n\nDo you really want to delete?",
     "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?",

admin/client/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} pagine 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?",

admin/client/lang/lt.js

@@ -8,7 +8,7 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
   ss.i18n.addDictionary('lt', {
     "CMSMAIN.BATCH_ARCHIVE_PROMPT": "Pažymėjote {num} puslapius(-į).\n\nAr tikrai norite archyvuoti šiuos puslapius?\n\nŠie puslapiai ir visi po jais esantys puslapiai bus nebepublikuojami ir suarchyvuoti.",
     "CMSMAIN.BATCH_DELETELIVE_PROMPT": "Pažymėjote {num} puslapius(-į).\n\nAr tikrai norite ištrinti iš publikuotų puslapių?",
-    "CMSMAIN.BATCH_DELETE_PROMPT": "Pažymėjote {num} puslapius(-į).\n\nAr tikrai norite ištrinti?",
+    "CMSMAIN.BATCH_DELETE_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to delete?",
     "CMSMAIN.BATCH_PUBLISH_PROMPT": "Pažymėjote {num} puslapius(-į).\n\nAr tikrai norite publikuoti?",
     "CMSMAIN.BATCH_RESTORE_PROMPT": "Pažymėjote {num} puslapius(-į).\n\nAr tikrai norite atstatyti?\n\nPuslapiai, esantys po suarchyvuotais puslapiais, bus atstatyti aukščiausiame lygyje, nebent šie puslapiai irgi bus atstatyti.",
     "CMSMAIN.BATCH_UNPUBLISH_PROMPT": "Pažymėjote {num} puslapius(-į).\n\nAr tikrai norite nebepublikuoti?",

admin/client/lang/nl.js

@@ -8,7 +8,7 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
   ss.i18n.addDictionary('nl', {
     "CMSMAIN.BATCH_ARCHIVE_PROMPT": "Je hebt {num} pagina(s) geselecteerd.\n\nWeet je zeker dat je de pagina(s) wilt archiveren?\n\nDe publicatie van deze en onderliggende pagina's wordt ingetrokken en gearchiveerd.",
     "CMSMAIN.BATCH_DELETELIVE_PROMPT": "Je hebt {num} pagina(s) geselecteerd.\n\nWeet je zeker dat je de publicatie van deze pagina's wilt intrekken?",
-    "CMSMAIN.BATCH_DELETE_PROMPT": "Je hebt {num} pagina(s) geselecteerd.\n\nWeet je zeker dat je de pagina(s) wilt verwijderen?",
+    "CMSMAIN.BATCH_DELETE_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to delete?",
     "CMSMAIN.BATCH_PUBLISH_PROMPT": "Je hebt {num} pagina(s) geselecteerd.\n\nWeet je zeker dat je de pagina(s) wilt publiceren?",
     "CMSMAIN.BATCH_RESTORE_PROMPT": "Je hebt {num} pagina(s) geselecteerd.\n\nWeet je zeker dat je de pagina(s) wilt herstellen? Onderliggende pagina's worden naar het top level hersteld, tenzij deze pagina's ook worden hersteld.",
     "CMSMAIN.BATCH_UNPUBLISH_PROMPT": "Je hebt {num} pagina(s) geselecteerd.\n\nWeet je zeker dat je de publicatie wilt intrekken?",

admin/client/lang/ru.js

@@ -8,7 +8,7 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
   ss.i18n.addDictionary('ru', {
     "CMSMAIN.BATCH_ARCHIVE_PROMPT": "Вы выбрали {num} страниц(у)\nВы уверены что хотите отправить их в архив?\n\nПубликации этих страниц и их под-страниц будут отменены и отправлены в архив. ",
     "CMSMAIN.BATCH_DELETELIVE_PROMPT": "Вы выбрали {num} страниц(у)\n\nВы уверены что хотите отменить публикацию этих страниц?",
-    "CMSMAIN.BATCH_DELETE_PROMPT": "Вы выбрали {num} страниц(у)\n\nВы уверены что хотите их удалить?",
+    "CMSMAIN.BATCH_DELETE_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to delete?",
     "CMSMAIN.BATCH_PUBLISH_PROMPT": "Вы выбрали {num} страниц(у)\n\nВы уверены что хотите их опубликовать?",
     "CMSMAIN.BATCH_RESTORE_PROMPT": "Вы выбрали {num} страниц(у)\n\nВы уверены что хотите восстановить эти страницы в черновик?\n\nПод-страницы архивных страниц будут восстановлены в корень если эти страницы также не отмечены для восстановления.",
     "CMSMAIN.BATCH_UNPUBLISH_PROMPT": "Вы выбрали {num} страниц(у)\n\nВы уверены что хотите отменить их публикацию?",

admin/client/lang/sk.js

@@ -8,7 +8,7 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
   ss.i18n.addDictionary('sk', {
     "CMSMAIN.BATCH_ARCHIVE_PROMPT": "Vybrali ste {num} stránok.\n\nUrčite chcete archivovať tieto stránky?\n\nTieto stránky a jej všetky podstránky budú nezverejnené a odoslané do archívu.",
     "CMSMAIN.BATCH_DELETELIVE_PROMPT": "Máte vybratých {num} stránok.\n\nSkutočne chcete tieto stránky vymazať z webu?",
-    "CMSMAIN.BATCH_DELETE_PROMPT": "Máte vybratých {num} stránok.\n\nSkutočne ich chcete vymazať?",
+    "CMSMAIN.BATCH_DELETE_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to delete?",
     "CMSMAIN.BATCH_PUBLISH_PROMPT": "Máte vybratých {num} stránok.\n\nSkutočne ich chcete zverejniť?",
     "CMSMAIN.BATCH_RESTORE_PROMPT": "Vybrali ste {num} stránok.\n\nSkutočne chcete obnoviť?\n\nPodstránky archivovaných stránok budú obnovené do najvyššej úrovne, pokiaľ tieto stránky budú tiež obnovené.",
     "CMSMAIN.BATCH_UNPUBLISH_PROMPT": "Máte vybratých {num} stránok.\n\nSkutočne ich chcete nezverejniť?",

admin/client/lang/sl_SI.js

@@ -8,7 +8,7 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
   ss.i18n.addDictionary('sl_SI', {
     "CMSMAIN.BATCH_ARCHIVE_PROMPT": "Izbrano število strani: {num}\n\nSte prepričani, da želite arhivirati te strani?\n\nTe strani in vse ostale podstrani bodo odstranjene iz objave in premaknjene v arhiv.",
     "CMSMAIN.BATCH_DELETELIVE_PROMPT": "Izbrali ste {num} strani.\n\nAli ste prepričani, da želite izbrisati te strani iz objave?",
-    "CMSMAIN.BATCH_DELETE_PROMPT": "Izbrali ste {num} strani.\n\nAli ste prepričani, da jih želite izbrisati?",
+    "CMSMAIN.BATCH_DELETE_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to delete?",
     "CMSMAIN.BATCH_PUBLISH_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to publish?",
     "CMSMAIN.BATCH_RESTORE_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to restore to stage?\n\nChildren of archived pages will be restored to the root level, unless those pages are also being restored.",
     "CMSMAIN.BATCH_UNPUBLISH_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to unpublish",

admin/client/lang/src/cs.js

@@ -1,7 +1,7 @@
 {
     "CMSMAIN.BATCH_ARCHIVE_PROMPT": "Vybráno {num} stránek.\n\nSkutečně chcete archivovat tyto stránky?\n\nTyto stránky a její všechny podstránky budou nezveřejněny a odeslány do archívu.",
     "CMSMAIN.BATCH_DELETELIVE_PROMPT": "Máte vybráno {num} stránek.\n\nSkutečně chcete vymazat tyto stránky z webu?",
-    "CMSMAIN.BATCH_DELETE_PROMPT": "Máte vybráno {num} stránek.\n\nSkutečně je chcete vymazat?",
+    "CMSMAIN.BATCH_DELETE_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to delete?",
     "CMSMAIN.BATCH_PUBLISH_PROMPT": "Máte vybráno {num} stránek.\n\nSkutečně je chcete zveřejnit?",
     "CMSMAIN.BATCH_RESTORE_PROMPT": "Vybráno {num} stránek.\n\nSkutečně chcete obnovit?\n\nPodstránky archivovaných stránek budou obnoveny do nejvzšší úrovně, pokud tyto stránky budou také obnoveny.",
     "CMSMAIN.BATCH_UNPUBLISH_PROMPT": "Máte vybráno {num} stránek.\n\nSkutečně je chcete nezveřejnit?",

admin/client/lang/src/de.js

@@ -1,14 +1,14 @@
 {
     "CMSMAIN.BATCH_ARCHIVE_PROMPT": "Sie haben {num} Seite(n) ausgewählt.\n\nWollen Sie diese wirklich archivieren?\n\nDiese Seiten und alle Unterseiten davon werden von der veröffentlichen Seite gelöscht und in das Archiv verschoben.",
     "CMSMAIN.BATCH_DELETELIVE_PROMPT": "Sie haben {num} Seite(n) ausgewählt.\n\nWollen Sie diese wirklich von der veröfffentlichten Seite löschen?",
-    "CMSMAIN.BATCH_DELETE_PROMPT": "Sie haben {num} Seite(n) ausgewählt.\n\nWollen Sie diese wirklich löschen?",
+    "CMSMAIN.BATCH_DELETE_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to delete?",
     "CMSMAIN.BATCH_PUBLISH_PROMPT": "Sie haben {num} Seite(n) ausgewählt.\n\nWollen Sie diese wirklich veröffentlichen?",
     "CMSMAIN.BATCH_RESTORE_PROMPT": "Sie haben {num} Seite(n) ausgewählt.\\n\\nWollen Sie diese wirklich wiederherstellen?\\n\\nUnterseiten von archivierten Seiten werden auf der Root-Ebene wiederhergestellt, es sei denn, diese Seiten werden ebenfalls wiederhergestellt.",
     "CMSMAIN.BATCH_UNPUBLISH_PROMPT": "Sie haben {num} Seite(n) ausgewählt.\n\nWollen Sie wirklich die Veröffentlichung zurücknehmen?",
     "CMSMAIN.SELECTONEPAGE": "Bitte mindestens eine Seite auswählen",
     "Campaigns.ADDCAMPAIGN": "Add campaign",
-    "Campaigns.ITEM_SUMMARY_PLURAL": "%s items",
+    "Campaigns.ITEM_SUMMARY_PLURAL": "%s Einträge",
-    "Campaigns.ITEM_SUMMARY_SINGULAR": "%s item",
+    "Campaigns.ITEM_SUMMARY_SINGULAR": "%s Eintrag",
     "Campaigns.PUBLISHCAMPAIGN": "Publish campaign",
     "Campaigns.REVERTCAMPAIGN": "Revert",
     "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.",

admin/client/lang/src/eo.js

@@ -1,7 +1,7 @@
 {
     "CMSMAIN.BATCH_ARCHIVE_PROMPT": "Vi elektis {num} paĝo(j)n.\n\nĈu vi vere volas enarĥivigi tiujn paĝojn?\n\nTiuj paĝoj kaj ĉiuj idaj paĝoj estos malpublikigitaj kaj senditaj al la arĥivo.",
     "CMSMAIN.BATCH_DELETELIVE_PROMPT": "Vi elektis {num} paĝo(j)n.\n\nĈi vi vere volas forigi tiujn paĝojn el la publika stadio?",
-    "CMSMAIN.BATCH_DELETE_PROMPT": "Vi elektis {num} paĝo(j)n.\n\nĈi vi vere volas forigi?",
+    "CMSMAIN.BATCH_DELETE_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to delete?",
     "CMSMAIN.BATCH_PUBLISH_PROMPT": "Vi elektis {num} paĝo(j)n.\n\nĈi vi vere volas publikigi?",
     "CMSMAIN.BATCH_RESTORE_PROMPT": "Vi elektis {num} paĝo(j)n.\n\nĈu vi vere volas restaŭri al stadio?\n\nIdoj de enarĥivigitaj paĝoj estos restaŭritaj al la radika nivelo, escepte se tiuj paĝoj ankaŭ estos restaŭritaj.",
     "CMSMAIN.BATCH_UNPUBLISH_PROMPT": "Vi elektis {num} paĝo(j)n.\n\nĈi vi vere volas malpublikigi?",

admin/client/lang/src/es.js

@@ -1,7 +1,7 @@
 {
     "CMSMAIN.BATCH_ARCHIVE_PROMPT": "Ud tiene {num} páginas seleccionadas.\n\n¿Está seguro de querer archivar estas páginas?\n\nEstas páginas y sus hijas se retirarán de publicación y se enviarán al archivo.",
     "CMSMAIN.BATCH_DELETELIVE_PROMPT": "Ud tiene {num} página(s) seleccionada(s).\n\n¿Realmente quieres eliminarla(s) desde el sitio en vivo?",
-    "CMSMAIN.BATCH_DELETE_PROMPT": "Ud tiene {num} página(s) seleccionada(s).\n\n¿Realmente quiere eliminarla(s)?",
+    "CMSMAIN.BATCH_DELETE_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to delete?",
     "CMSMAIN.BATCH_PUBLISH_PROMPT": "Ud tiene {num} página(s) seleccionada(s).\n\n¿Realmente la(s) quiere publicar?",
     "CMSMAIN.BATCH_RESTORE_PROMPT": "Ud tiene {num} páginas seleccionadas.\n\n¿Está seguro de querer restaurar estas páginas?\n\nLos hijos de las páginas archivadas serán restauradas al nivel raíz a no ser que esas páginas también sean restauradas.",
     "CMSMAIN.BATCH_UNPUBLISH_PROMPT": "Ud tiene {num} página(s) seleccionada(s).\n\n¿Realmente la(s) quiere retirar de publicación?",

admin/client/lang/src/fa_IR.js

@@ -1,7 +1,7 @@
 {
     "CMSMAIN.BATCH_ARCHIVE_PROMPT": "شما {num} صفحه(صفحه‌ها) را انتخاب کرده‌اید.\n\n\nآیا از این‌که می‌خواهید بایگانی شوند اطمینان دارید؟\n\nتمامی این صفحات و تمامی صفحات فرزند آن‌ها عدم انتشار می‌شوند و به بایگانی ارسال می‌گردند.",
     "CMSMAIN.BATCH_DELETELIVE_PROMPT": "شما {num} صفحه(صفحه‌ها) را انتخاب کرده‌اید.\n\nآیا واقعاً می‌خواهید آن‌ها از لایو را حذف نمایید؟",
-    "CMSMAIN.BATCH_DELETE_PROMPT": "شما {num} صفحه(صفحه‌ها) را انتخاب کرده‌اید.\n\nآیا واقعاً می‌خواهید آن‌ها را حذف نمایید؟",
+    "CMSMAIN.BATCH_DELETE_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to delete?",
     "CMSMAIN.BATCH_PUBLISH_PROMPT": "شما {num} صفحه(صفحه‌ها) را انتخاب کرده‌اید.\n\nآیا واقعاً می‌خواهید آن‌ها را منتشر نمایید؟",
     "CMSMAIN.BATCH_RESTORE_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to restore to stage?\n\nChildren of archived pages will be restored to the root level, unless those pages are also being restored.",
     "CMSMAIN.BATCH_UNPUBLISH_PROMPT": "شما {num} صفحه را انتخاب کرده‌اید.\n\nآیا واقعاً می‌خواهید انتشار آن‌ها را لغو نمایید",

admin/client/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": "You have {num} page(s) selected.\n\nDo you really want to delete?",
     "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?",

admin/client/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} pagine 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?",

admin/client/lang/src/lt.js

@@ -1,7 +1,7 @@
 {
     "CMSMAIN.BATCH_ARCHIVE_PROMPT": "Pažymėjote {num} puslapius(-į).\n\nAr tikrai norite archyvuoti šiuos puslapius?\n\nŠie puslapiai ir visi po jais esantys puslapiai bus nebepublikuojami ir suarchyvuoti.",
     "CMSMAIN.BATCH_DELETELIVE_PROMPT": "Pažymėjote {num} puslapius(-į).\n\nAr tikrai norite ištrinti iš publikuotų puslapių?",
-    "CMSMAIN.BATCH_DELETE_PROMPT": "Pažymėjote {num} puslapius(-į).\n\nAr tikrai norite ištrinti?",
+    "CMSMAIN.BATCH_DELETE_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to delete?",
     "CMSMAIN.BATCH_PUBLISH_PROMPT": "Pažymėjote {num} puslapius(-į).\n\nAr tikrai norite publikuoti?",
     "CMSMAIN.BATCH_RESTORE_PROMPT": "Pažymėjote {num} puslapius(-į).\n\nAr tikrai norite atstatyti?\n\nPuslapiai, esantys po suarchyvuotais puslapiais, bus atstatyti aukščiausiame lygyje, nebent šie puslapiai irgi bus atstatyti.",
     "CMSMAIN.BATCH_UNPUBLISH_PROMPT": "Pažymėjote {num} puslapius(-į).\n\nAr tikrai norite nebepublikuoti?",

admin/client/lang/src/nl.js

@@ -1,7 +1,7 @@
 {
     "CMSMAIN.BATCH_ARCHIVE_PROMPT": "Je hebt {num} pagina(s) geselecteerd.\n\nWeet je zeker dat je de pagina(s) wilt archiveren?\n\nDe publicatie van deze en onderliggende pagina's wordt ingetrokken en gearchiveerd.",
     "CMSMAIN.BATCH_DELETELIVE_PROMPT": "Je hebt {num} pagina(s) geselecteerd.\n\nWeet je zeker dat je de publicatie van deze pagina's wilt intrekken?",
-    "CMSMAIN.BATCH_DELETE_PROMPT": "Je hebt {num} pagina(s) geselecteerd.\n\nWeet je zeker dat je de pagina(s) wilt verwijderen?",
+    "CMSMAIN.BATCH_DELETE_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to delete?",
     "CMSMAIN.BATCH_PUBLISH_PROMPT": "Je hebt {num} pagina(s) geselecteerd.\n\nWeet je zeker dat je de pagina(s) wilt publiceren?",
     "CMSMAIN.BATCH_RESTORE_PROMPT": "Je hebt {num} pagina(s) geselecteerd.\n\nWeet je zeker dat je de pagina(s) wilt herstellen? Onderliggende pagina's worden naar het top level hersteld, tenzij deze pagina's ook worden hersteld.",
     "CMSMAIN.BATCH_UNPUBLISH_PROMPT": "Je hebt {num} pagina(s) geselecteerd.\n\nWeet je zeker dat je de publicatie wilt intrekken?",

admin/client/lang/src/ru.js

@@ -1,7 +1,7 @@
 {
     "CMSMAIN.BATCH_ARCHIVE_PROMPT": "Вы выбрали {num} страниц(у)\nВы уверены что хотите отправить их в архив?\n\nПубликации этих страниц и их под-страниц будут отменены и отправлены в архив. ",
     "CMSMAIN.BATCH_DELETELIVE_PROMPT": "Вы выбрали {num} страниц(у)\n\nВы уверены что хотите отменить публикацию этих страниц?",
-    "CMSMAIN.BATCH_DELETE_PROMPT": "Вы выбрали {num} страниц(у)\n\nВы уверены что хотите их удалить?",
+    "CMSMAIN.BATCH_DELETE_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to delete?",
     "CMSMAIN.BATCH_PUBLISH_PROMPT": "Вы выбрали {num} страниц(у)\n\nВы уверены что хотите их опубликовать?",
     "CMSMAIN.BATCH_RESTORE_PROMPT": "Вы выбрали {num} страниц(у)\n\nВы уверены что хотите восстановить эти страницы в черновик?\n\nПод-страницы архивных страниц будут восстановлены в корень если эти страницы также не отмечены для восстановления.",
     "CMSMAIN.BATCH_UNPUBLISH_PROMPT": "Вы выбрали {num} страниц(у)\n\nВы уверены что хотите отменить их публикацию?",

admin/client/lang/src/sk.js

@@ -1,7 +1,7 @@
 {
     "CMSMAIN.BATCH_ARCHIVE_PROMPT": "Vybrali ste {num} stránok.\n\nUrčite chcete archivovať tieto stránky?\n\nTieto stránky a jej všetky podstránky budú nezverejnené a odoslané do archívu.",
     "CMSMAIN.BATCH_DELETELIVE_PROMPT": "Máte vybratých {num} stránok.\n\nSkutočne chcete tieto stránky vymazať z webu?",
-    "CMSMAIN.BATCH_DELETE_PROMPT": "Máte vybratých {num} stránok.\n\nSkutočne ich chcete vymazať?",
+    "CMSMAIN.BATCH_DELETE_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to delete?",
     "CMSMAIN.BATCH_PUBLISH_PROMPT": "Máte vybratých {num} stránok.\n\nSkutočne ich chcete zverejniť?",
     "CMSMAIN.BATCH_RESTORE_PROMPT": "Vybrali ste {num} stránok.\n\nSkutočne chcete obnoviť?\n\nPodstránky archivovaných stránok budú obnovené do najvyššej úrovne, pokiaľ tieto stránky budú tiež obnovené.",
     "CMSMAIN.BATCH_UNPUBLISH_PROMPT": "Máte vybratých {num} stránok.\n\nSkutočne ich chcete nezverejniť?",

admin/client/lang/src/sl_SI.js

@@ -1,7 +1,7 @@
 {
     "CMSMAIN.BATCH_ARCHIVE_PROMPT": "Izbrano število strani: {num}\n\nSte prepričani, da želite arhivirati te strani?\n\nTe strani in vse ostale podstrani bodo odstranjene iz objave in premaknjene v arhiv.",
     "CMSMAIN.BATCH_DELETELIVE_PROMPT": "Izbrali ste {num} strani.\n\nAli ste prepričani, da želite izbrisati te strani iz objave?",
-    "CMSMAIN.BATCH_DELETE_PROMPT": "Izbrali ste {num} strani.\n\nAli ste prepričani, da jih želite izbrisati?",
+    "CMSMAIN.BATCH_DELETE_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to delete?",
     "CMSMAIN.BATCH_PUBLISH_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to publish?",
     "CMSMAIN.BATCH_RESTORE_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to restore to stage?\n\nChildren of archived pages will be restored to the root level, unless those pages are also being restored.",
     "CMSMAIN.BATCH_UNPUBLISH_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to unpublish",

admin/client/lang/src/sv.js

@@ -1,7 +1,7 @@
 {
     "CMSMAIN.BATCH_ARCHIVE_PROMPT": "Du har {num} sida/sidor valda.\n\n\nÄr du säker på att du vill arkivera dessa sidor?\n\n\nDessa sidor och sidornas undersidor kommer att avpubliceras och arkiveras.",
     "CMSMAIN.BATCH_DELETELIVE_PROMPT": "Du har valt {num} sida/sidor\n\nVill du verkligen radera dem från den publicerade sidan?",
-    "CMSMAIN.BATCH_DELETE_PROMPT": "Du har valt {num} sida/sidor\n\nVill du verkligen radera dem.",
+    "CMSMAIN.BATCH_DELETE_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to delete?",
     "CMSMAIN.BATCH_PUBLISH_PROMPT": "Du har valt {num} sida/sidor.\nVill du verkligen publicera dem.",
     "CMSMAIN.BATCH_RESTORE_PROMPT": "Du har {num} sida/sidor valda. \n\nVill du verkligen återställa till ett tidigare skede?\n\nUndersidor till arkiverade sidor kommer att återställas till rotnivå , såvida dessa sidor också återställs .",
     "CMSMAIN.BATCH_UNPUBLISH_PROMPT": "Du har valt {num} sida/sidor\n\nVill du verkligen avpublicera",

admin/client/lang/src/zh.js

@@ -1,7 +1,7 @@
 {
     "CMSMAIN.BATCH_ARCHIVE_PROMPT": "You have {num} page(s) selected.\n\nAre you sure you want to archive these pages?\n\nThese pages and all of their children pages will be unpublished and sent to the archive.",
     "CMSMAIN.BATCH_DELETELIVE_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to delete these pages from live?",
-    "CMSMAIN.BATCH_DELETE_PROMPT": "您已选了{num}个页面。\n\n是否确定要删除？",
+    "CMSMAIN.BATCH_DELETE_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to delete?",
     "CMSMAIN.BATCH_PUBLISH_PROMPT": "您已选了{num}个页面。\n\n是否确定要发布？",
     "CMSMAIN.BATCH_RESTORE_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to restore to stage?\n\nChildren of archived pages will be restored to the root level, unless those pages are also being restored.",
     "CMSMAIN.BATCH_UNPUBLISH_PROMPT": "您已选了{num}个页面。\n\n是否确定要取消发布",

admin/client/lang/sv.js

@@ -8,7 +8,7 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
   ss.i18n.addDictionary('sv', {
     "CMSMAIN.BATCH_ARCHIVE_PROMPT": "Du har {num} sida/sidor valda.\n\n\nÄr du säker på att du vill arkivera dessa sidor?\n\n\nDessa sidor och sidornas undersidor kommer att avpubliceras och arkiveras.",
     "CMSMAIN.BATCH_DELETELIVE_PROMPT": "Du har valt {num} sida/sidor\n\nVill du verkligen radera dem från den publicerade sidan?",
-    "CMSMAIN.BATCH_DELETE_PROMPT": "Du har valt {num} sida/sidor\n\nVill du verkligen radera dem.",
+    "CMSMAIN.BATCH_DELETE_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to delete?",
     "CMSMAIN.BATCH_PUBLISH_PROMPT": "Du har valt {num} sida/sidor.\nVill du verkligen publicera dem.",
     "CMSMAIN.BATCH_RESTORE_PROMPT": "Du har {num} sida/sidor valda. \n\nVill du verkligen återställa till ett tidigare skede?\n\nUndersidor till arkiverade sidor kommer att återställas till rotnivå , såvida dessa sidor också återställs .",
     "CMSMAIN.BATCH_UNPUBLISH_PROMPT": "Du har valt {num} sida/sidor\n\nVill du verkligen avpublicera",

admin/client/lang/zh.js

@@ -8,7 +8,7 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
   ss.i18n.addDictionary('zh', {
     "CMSMAIN.BATCH_ARCHIVE_PROMPT": "You have {num} page(s) selected.\n\nAre you sure you want to archive these pages?\n\nThese pages and all of their children pages will be unpublished and sent to the archive.",
     "CMSMAIN.BATCH_DELETELIVE_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to delete these pages from live?",
-    "CMSMAIN.BATCH_DELETE_PROMPT": "您已选了{num}个页面。\n\n是否确定要删除？",
+    "CMSMAIN.BATCH_DELETE_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to delete?",
     "CMSMAIN.BATCH_PUBLISH_PROMPT": "您已选了{num}个页面。\n\n是否确定要发布？",
     "CMSMAIN.BATCH_RESTORE_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to restore to stage?\n\nChildren of archived pages will be restored to the root level, unless those pages are also being restored.",
     "CMSMAIN.BATCH_UNPUBLISH_PROMPT": "您已选了{num}个页面。\n\n是否确定要取消发布",

admin/code/ModelAdmin.php

@@ -94,10 +94,17 @@ abstract class ModelAdmin extends LeftAndMain {
 	/**
 	 * Change this variable if you don't want the Import from CSV form to appear.
 	 * This variable can be a boolean or an array.
-	 * If array, you can list className you want the form to appear on. i.e. array('myClassOne','myClasstwo')
+	 * If array, you can list className you want the form to appear on. i.e. array('myClassOne','myClassTwo')
 	 */
 	public $showImportForm = true;
 
+	/**
+	 * Change this variable if you don't want the search form to appear.
+	 * This variable can be a boolean or an array.
+	 * If array, you can list className you want the form to appear on. i.e. array('myClassOne','myClassTwo')
+	 */
+	public $showSearchForm = true;
+
 	/**
 	 * List of all {@link DataObject}s which can be imported through
 	 * a subclass of {@link BulkLoader} (mostly CSV data).
@@ -214,9 +221,14 @@ abstract class ModelAdmin extends LeftAndMain {
 	}
 
 	/**
-	 * @return Form
+	 * @return Form|bool
 	 */
 	public function SearchForm() {
+		if(!$this->showSearchForm ||
+			(is_array($this->showSearchForm) && !in_array($this->modelClass, $this->showSearchForm))
+		) {
+			return false;
+		}
 		$context = $this->getSearchContext();
 		/** @skipUpgrade */
 		$form = new Form($this, "SearchForm",

admin/templates/SilverStripe/Admin/Includes/ModelAdmin_Content.ss

@@ -16,7 +16,9 @@
 		</div>
 
 		<div class="cms-content-header-tabs cms-tabset-nav-primary ss-ui-tabs-nav">
+            <% if $SearchForm || $ImportForm %>
 			    <button id="filters-button" class="icon-button font-icon-search no-text" title="<%t CMSPagesController_Tools_ss.FILTER 'Filter' %>"></button>
+            <% end_if %>
 			<ul class="cms-tabset-nav-primary">
 				<% loop $ManagedModelTabs %>
 				<li class="tab-$ClassName $LinkOrCurrent<% if $LinkOrCurrent == 'current' %> ui-tabs-active<% end_if %>">

admin/templates/SilverStripe/Admin/Includes/ModelAdmin_Tools.ss

@@ -1,4 +1,5 @@
-<div id="cms-content-tools-ModelAdmin" class="cms-content-filters">
+<% if $SearchForm || $ImportForm %>
+    <div id="cms-content-tools-ModelAdmin" class="cms-content-filters">
         <% if $SearchForm %>
             <h3 class="cms-panel-header"><%t ModelAdmin_Tools_ss.FILTER 'Filter' %></h3>
             $SearchForm
@@ -8,4 +9,5 @@
             <h3 class="cms-panel-header"><%t ModelAdmin_Tools_ss.IMPORT 'Import' %></h3>
             $ImportForm
         <% end_if %>
-</div>
+    </div>
+<% end_if %>

client/lang/ar.js

@@ -10,6 +10,10 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
     "FILEIFRAMEFIELD.DELETEFILE": "احذف الملف",
     "FILEIFRAMEFIELD.DELETEIMAGE": "حذف الصورة",
     "FILEIFRAMEFIELD.UNATTACHFILE": "إلغاء إرفاق ملف",
+    "File.DRAFT": "Draft",
+    "File.MODIFIED": "Modified",
+    "File.PUBLISHED": "Published",
+    "FormField.NONE": "None",
     "GRIDFIELD.ERRORINTRANSACTION": "حدث خطأ أثناء استدعاء البيانات من الخادم\nيرجى إعادة المحاولة في وقت لاحق.",
     "HASMANYFILEFIELD.UPLOADING": "تم رفع ... %s",
     "HtmlEditorField.SelectAnchor": "حدد نقطة ارتساء",

client/lang/bg.js

@@ -10,6 +10,10 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
     "FILEIFRAMEFIELD.DELETEFILE": "Изтрий файла",
     "FILEIFRAMEFIELD.DELETEIMAGE": "Изтрий снимката",
     "FILEIFRAMEFIELD.UNATTACHFILE": "Премахни файла",
+    "File.DRAFT": "Draft",
+    "File.MODIFIED": "Modified",
+    "File.PUBLISHED": "Published",
+    "FormField.NONE": "None",
     "GRIDFIELD.ERRORINTRANSACTION": "Възникна грешка при извличане на данни от сървъра\n Опитайте отново по-късно.",
     "HASMANYFILEFIELD.UPLOADING": "Качване... %s",
     "HtmlEditorField.SelectAnchor": "Select an anchor",

client/lang/cs.js

@@ -10,6 +10,10 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
     "FILEIFRAMEFIELD.DELETEFILE": "Smazat soubor",
     "FILEIFRAMEFIELD.DELETEIMAGE": "Smazat obrázek",
     "FILEIFRAMEFIELD.UNATTACHFILE": "Odpojit soubor",
+    "File.DRAFT": "Draft",
+    "File.MODIFIED": "Modified",
+    "File.PUBLISHED": "Published",
+    "FormField.NONE": "None",
     "GRIDFIELD.ERRORINTRANSACTION": "Nastala chyba při získávání dat ze serveru\n Prosím zkuste opět později.",
     "HASMANYFILEFIELD.UPLOADING": "Nahrávání... %s",
     "HtmlEditorField.SelectAnchor": "Vyber kotvu",

client/lang/de.js

@@ -10,6 +10,10 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
     "FILEIFRAMEFIELD.DELETEFILE": "Datei löschen",
     "FILEIFRAMEFIELD.DELETEIMAGE": "Bild löschen",
     "FILEIFRAMEFIELD.UNATTACHFILE": "Datei loslösen",
+    "File.DRAFT": "Entwurf",
+    "File.MODIFIED": "Zuletzt geändert",
+    "File.PUBLISHED": "Veröffentlicht",
+    "FormField.NONE": "Keine",
     "GRIDFIELD.ERRORINTRANSACTION": "Beim Laden der Daten vom Server ist ein Fehler aufgetretetn\n Bitte versuchen sie es später noch einmal.",
     "HASMANYFILEFIELD.UPLOADING": "Lädt hoch... %s",
     "HtmlEditorField.SelectAnchor": "Anker auswählen",

client/lang/eo.js

@@ -10,6 +10,10 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
     "FILEIFRAMEFIELD.DELETEFILE": "Forigi dosieron",
     "FILEIFRAMEFIELD.DELETEIMAGE": "Forigi bildon",
     "FILEIFRAMEFIELD.UNATTACHFILE": "Malligi dosieron",
+    "File.DRAFT": "Malneto",
+    "File.MODIFIED": "Ŝanĝita",
+    "File.PUBLISHED": "Publikigita",
+    "FormField.NONE": "Neniu",
     "GRIDFIELD.ERRORINTRANSACTION": "Okazis eraro dum akirado de datumoj el la servilo\n Bonvole reprovu poste.",
     "HASMANYFILEFIELD.UPLOADING": "Alŝutiĝas %s...",
     "HtmlEditorField.SelectAnchor": "Elekti ankron",

client/lang/es.js

@@ -10,6 +10,10 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
     "FILEIFRAMEFIELD.DELETEFILE": "Borrar Archivo",
     "FILEIFRAMEFIELD.DELETEIMAGE": "Borrar Imagen ",
     "FILEIFRAMEFIELD.UNATTACHFILE": "Desanexar documento",
+    "File.DRAFT": "Draft",
+    "File.MODIFIED": "Modified",
+    "File.PUBLISHED": "Published",
+    "FormField.NONE": "None",
     "GRIDFIELD.ERRORINTRANSACTION": "Ocurrió un error mientras se obtenía datos desde el servidor⏎\nPor favor intente nuevamente.",
     "HASMANYFILEFIELD.UPLOADING": "Subiendo... %s",
     "HtmlEditorField.SelectAnchor": "Selecciona un ancla",

client/lang/fa_IR.js

@@ -10,6 +10,10 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
     "FILEIFRAMEFIELD.DELETEFILE": "حذف فایل‌",
     "FILEIFRAMEFIELD.DELETEIMAGE": "حذف تصویر",
     "FILEIFRAMEFIELD.UNATTACHFILE": "حذف ضمیمه فایل",
+    "File.DRAFT": "Draft",
+    "File.MODIFIED": "Modified",
+    "File.PUBLISHED": "Published",
+    "FormField.NONE": "None",
     "GRIDFIELD.ERRORINTRANSACTION": "یک خطا هنگام دستیابی به داده‌های سرور روی داد\nلطفاً بعداً تلاش نمایید.",
     "HASMANYFILEFIELD.UPLOADING": "در حال آپلود... %s",
     "HtmlEditorField.SelectAnchor": "انتخاب یک محل ارجاع لینک",

client/lang/fi.js

@@ -10,6 +10,10 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
     "FILEIFRAMEFIELD.DELETEFILE": "Poista tiedosto",
     "FILEIFRAMEFIELD.DELETEIMAGE": "Poista kuva",
     "FILEIFRAMEFIELD.UNATTACHFILE": "Irroita tiedosto",
+    "File.DRAFT": "Draft",
+    "File.MODIFIED": "Modified",
+    "File.PUBLISHED": "Published",
+    "FormField.NONE": "None",
     "GRIDFIELD.ERRORINTRANSACTION": "Tapahtui virhe haettaessa tietoa palvelimelta.\nYritä uudestaan myöhemmin.",
     "HASMANYFILEFIELD.UPLOADING": "Ladataan... %s",
     "HtmlEditorField.SelectAnchor": "Valitse ankkuri",

client/lang/fr.js

@@ -10,6 +10,10 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
     "FILEIFRAMEFIELD.DELETEFILE": "Delete File",
     "FILEIFRAMEFIELD.DELETEIMAGE": "Delete Image",
     "FILEIFRAMEFIELD.UNATTACHFILE": "Un-Attach File",
+    "File.DRAFT": "Draft",
+    "File.MODIFIED": "Modified",
+    "File.PUBLISHED": "Published",
+    "FormField.NONE": "None",
     "GRIDFIELD.ERRORINTRANSACTION": "Une erreur est survenue durant la transaction avec le serveur\n Merci de reesayer plus tard.",
     "HASMANYFILEFIELD.UPLOADING": "Uploading... %s",
     "HtmlEditorField.SelectAnchor": "Select an anchor",

client/lang/hr.js

@@ -10,6 +10,10 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
     "FILEIFRAMEFIELD.DELETEFILE": "Obriši datoteku",
     "FILEIFRAMEFIELD.DELETEIMAGE": "Obriši sliku",
     "FILEIFRAMEFIELD.UNATTACHFILE": "Un-Attach File",
+    "File.DRAFT": "Draft",
+    "File.MODIFIED": "Modified",
+    "File.PUBLISHED": "Published",
+    "FormField.NONE": "None",
     "GRIDFIELD.ERRORINTRANSACTION": "An error occured while fetching data from the server\n Please try again later.",
     "HASMANYFILEFIELD.UPLOADING": "Prebacujem... %s",
     "HtmlEditorField.SelectAnchor": "Odaberite sidro",

client/lang/id.js

@@ -10,6 +10,10 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
     "FILEIFRAMEFIELD.DELETEFILE": "Hapus Berkas",
     "FILEIFRAMEFIELD.DELETEIMAGE": "Hapus Gambar",
     "FILEIFRAMEFIELD.UNATTACHFILE": "Lepaskan Berkas",
+    "File.DRAFT": "Draft",
+    "File.MODIFIED": "Modified",
+    "File.PUBLISHED": "Published",
+    "FormField.NONE": "None",
     "GRIDFIELD.ERRORINTRANSACTION": "Terjadi kesalahan dalam menarik data dari server\n Mohon coba lagi nanti.",
     "HASMANYFILEFIELD.UPLOADING": "Mengunggah... %s",
     "HtmlEditorField.SelectAnchor": "Pilih jangkar",

client/lang/id_ID.js

@@ -10,6 +10,10 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
     "FILEIFRAMEFIELD.DELETEFILE": "Hapus Berkas",
     "FILEIFRAMEFIELD.DELETEIMAGE": "Hapus Gambar",
     "FILEIFRAMEFIELD.UNATTACHFILE": "Lepaskan Berkas",
+    "File.DRAFT": "Draft",
+    "File.MODIFIED": "Modified",
+    "File.PUBLISHED": "Published",
+    "FormField.NONE": "None",
     "GRIDFIELD.ERRORINTRANSACTION": "Terjadi kesalahan dalam menarik data dari server\n Mohon coba lagi nanti.",
     "HASMANYFILEFIELD.UPLOADING": "Mengunggah... %s",
     "HtmlEditorField.SelectAnchor": "Pilih jangkar",

client/lang/it.js

@@ -10,6 +10,10 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
     "FILEIFRAMEFIELD.DELETEFILE": "Eliminare file",
     "FILEIFRAMEFIELD.DELETEIMAGE": "Eliminare immagine",
     "FILEIFRAMEFIELD.UNATTACHFILE": "Scollegare file",
+    "File.DRAFT": "Draft",
+    "File.MODIFIED": "Modified",
+    "File.PUBLISHED": "Published",
+    "FormField.NONE": "None",
     "GRIDFIELD.ERRORINTRANSACTION": "Errore durante la lettura dei dati dal server.\nPer favore riprovare più tardi.",
     "HASMANYFILEFIELD.UPLOADING": "Invio file... %s",
     "HtmlEditorField.SelectAnchor": "Selezionare un riferimento",

client/lang/ja.js

@@ -10,6 +10,10 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
     "FILEIFRAMEFIELD.DELETEFILE": "ファイルを削除",
     "FILEIFRAMEFIELD.DELETEIMAGE": "画像を削除",
     "FILEIFRAMEFIELD.UNATTACHFILE": "Un-Attach File",
+    "File.DRAFT": "Draft",
+    "File.MODIFIED": "Modified",
+    "File.PUBLISHED": "Published",
+    "FormField.NONE": "None",
     "GRIDFIELD.ERRORINTRANSACTION": "サーバーからデータを取得中にエラーが発生しました．\n 後ほど改めてお試しください．",
     "HASMANYFILEFIELD.UPLOADING": "アップロード中です... %s",
     "HtmlEditorField.SelectAnchor": "アンカーを選択する",

client/lang/lt.js

@@ -10,6 +10,10 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
     "FILEIFRAMEFIELD.DELETEFILE": "Ištrinti bylą",
     "FILEIFRAMEFIELD.DELETEIMAGE": "Ištrinti paveikslėlį",
     "FILEIFRAMEFIELD.UNATTACHFILE": "Atrišti bylą",
+    "File.DRAFT": "Draft",
+    "File.MODIFIED": "Modified",
+    "File.PUBLISHED": "Published",
+    "FormField.NONE": "None",
     "GRIDFIELD.ERRORINTRANSACTION": "Įvyko klaida bandant gauto duomenis iš serverio\nBandykite vėliau.",
     "HASMANYFILEFIELD.UPLOADING": "Įkeliama... %s",
     "HtmlEditorField.SelectAnchor": "Pasirinkite nuorodą",

client/lang/mi.js

@@ -10,6 +10,10 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
     "FILEIFRAMEFIELD.DELETEFILE": "Muku Kōnae",
     "FILEIFRAMEFIELD.DELETEIMAGE": "Muku Atahanga",
     "FILEIFRAMEFIELD.UNATTACHFILE": "Wehetāpiri Kōnae",
+    "File.DRAFT": "Draft",
+    "File.MODIFIED": "Modified",
+    "File.PUBLISHED": "Published",
+    "FormField.NONE": "None",
     "GRIDFIELD.ERRORINTRANSACTION": "Kua puta mai he hapa i te tiki raraunga mai i te tūmau\n Ngāna anō ā muri atu.",
     "HASMANYFILEFIELD.UPLOADING": "Tukuatu ana... %s",
     "HtmlEditorField.SelectAnchor": "Select an anchor",

client/lang/nb.js

@@ -10,6 +10,10 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
     "FILEIFRAMEFIELD.DELETEFILE": "Slett fil",
     "FILEIFRAMEFIELD.DELETEIMAGE": "Slett bilde",
     "FILEIFRAMEFIELD.UNATTACHFILE": "Fjern vedlagt fil",
+    "File.DRAFT": "Draft",
+    "File.MODIFIED": "Modified",
+    "File.PUBLISHED": "Published",
+    "FormField.NONE": "None",
     "GRIDFIELD.ERRORINTRANSACTION": "En feil oppstod ved lesing fra serveren\nVennligst prøv på nytt senere.",
     "HASMANYFILEFIELD.UPLOADING": "Laster opp ... %s",
     "HtmlEditorField.SelectAnchor": "Velg et anker",

client/lang/nl.js

@@ -10,6 +10,10 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
     "FILEIFRAMEFIELD.DELETEFILE": "Verwijder bestand",
     "FILEIFRAMEFIELD.DELETEIMAGE": "Verwijder afbeelding",
     "FILEIFRAMEFIELD.UNATTACHFILE": "Bestand ontkoppelen",
+    "File.DRAFT": "Draft",
+    "File.MODIFIED": "Modified",
+    "File.PUBLISHED": "Published",
+    "FormField.NONE": "None",
     "GRIDFIELD.ERRORINTRANSACTION": "Er is een fout opgetreden bij het ophalen van gegevens van de server\n Probeer later opnieuw.",
     "HASMANYFILEFIELD.UPLOADING": "Uploaden... %s",
     "HtmlEditorField.SelectAnchor": "Kies een anker",

client/lang/pl.js

@@ -10,6 +10,10 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
     "FILEIFRAMEFIELD.DELETEFILE": "Usuń plik",
     "FILEIFRAMEFIELD.DELETEIMAGE": "Usuń obraz",
     "FILEIFRAMEFIELD.UNATTACHFILE": "Odłącz plik",
+    "File.DRAFT": "Draft",
+    "File.MODIFIED": "Modified",
+    "File.PUBLISHED": "Published",
+    "FormField.NONE": "None",
     "GRIDFIELD.ERRORINTRANSACTION": "Nastąpił błąd podczas pobierania danych z serwera\nProszę spróbować ponownie później.",
     "HASMANYFILEFIELD.UPLOADING": "Wysyłanie... %s",
     "HtmlEditorField.SelectAnchor": "Wybierz zakotwiczenie",

client/lang/ru.js

@@ -10,6 +10,10 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
     "FILEIFRAMEFIELD.DELETEFILE": "Удалить файл",
     "FILEIFRAMEFIELD.DELETEIMAGE": "Удалить изображение",
     "FILEIFRAMEFIELD.UNATTACHFILE": "Открепить файл",
+    "File.DRAFT": "Draft",
+    "File.MODIFIED": "Modified",
+    "File.PUBLISHED": "Published",
+    "FormField.NONE": "None",
     "GRIDFIELD.ERRORINTRANSACTION": "Ошибка при получении данных с сервера\n Пожалуйста, повторите попытку позже.",
     "HASMANYFILEFIELD.UPLOADING": "Загрузка... %s",
     "HtmlEditorField.SelectAnchor": "Выбрать якорь",

client/lang/sk.js

@@ -10,6 +10,10 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
     "FILEIFRAMEFIELD.DELETEFILE": "Zmazať súbor",
     "FILEIFRAMEFIELD.DELETEIMAGE": "Zmazať obrázok",
     "FILEIFRAMEFIELD.UNATTACHFILE": "Odpojiť súbor",
+    "File.DRAFT": "Draft",
+    "File.MODIFIED": "Modified",
+    "File.PUBLISHED": "Published",
+    "FormField.NONE": "None",
     "GRIDFIELD.ERRORINTRANSACTION": "Nastala chyba pri získavaní dát zo servera\n Prosím skúste opäť neskôr.",
     "HASMANYFILEFIELD.UPLOADING": "Nahrávanieí... %s",
     "HtmlEditorField.SelectAnchor": "Vyberte kotvu",

client/lang/sl.js

@@ -10,6 +10,10 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
     "FILEIFRAMEFIELD.DELETEFILE": "Izbriši datoteko",
     "FILEIFRAMEFIELD.DELETEIMAGE": "Izbriši sliko",
     "FILEIFRAMEFIELD.UNATTACHFILE": "Un-Attach File",
+    "File.DRAFT": "Draft",
+    "File.MODIFIED": "Modified",
+    "File.PUBLISHED": "Published",
+    "FormField.NONE": "None",
     "GRIDFIELD.ERRORINTRANSACTION": "Napak pri pridobivanju podatkov s strežnika.\nProsimo, poskusite ponovno ",
     "HASMANYFILEFIELD.UPLOADING": "Nalagam ... %s",
     "HtmlEditorField.SelectAnchor": "Izberi sidro",

client/lang/sr.js

@@ -10,6 +10,10 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
     "FILEIFRAMEFIELD.DELETEFILE": "Избриши датотеку",
     "FILEIFRAMEFIELD.DELETEIMAGE": "Избриши слику",
     "FILEIFRAMEFIELD.UNATTACHFILE": "Откачи датотеку",
+    "File.DRAFT": "Draft",
+    "File.MODIFIED": "Modified",
+    "File.PUBLISHED": "Published",
+    "FormField.NONE": "None",
     "GRIDFIELD.ERRORINTRANSACTION": "Приликом преузимања података са сервера дошло је до грешке.\nПокушајте поново касније.",
     "HASMANYFILEFIELD.UPLOADING": "Постављање... %s",
     "HtmlEditorField.SelectAnchor": "Изабери сидро",

client/lang/sr@latin.js

@@ -10,6 +10,10 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
     "FILEIFRAMEFIELD.DELETEFILE": "Izbriši datoteku",
     "FILEIFRAMEFIELD.DELETEIMAGE": "Izbriši sliku",
     "FILEIFRAMEFIELD.UNATTACHFILE": "Otkači datoteku",
+    "File.DRAFT": "Draft",
+    "File.MODIFIED": "Modified",
+    "File.PUBLISHED": "Published",
+    "FormField.NONE": "None",
     "GRIDFIELD.ERRORINTRANSACTION": "Prilikom preuzimanja podataka sa servera došlo je do greške.\nPokušajte ponovo kasnije.",
     "HASMANYFILEFIELD.UPLOADING": "Postavljanje... %s",
     "HtmlEditorField.SelectAnchor": "Izaberi sidro",

client/lang/sr_RS.js

@@ -10,6 +10,10 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
     "FILEIFRAMEFIELD.DELETEFILE": "Избриши датотеку",
     "FILEIFRAMEFIELD.DELETEIMAGE": "Избриши слику",
     "FILEIFRAMEFIELD.UNATTACHFILE": "Откачи датотеку",
+    "File.DRAFT": "Draft",
+    "File.MODIFIED": "Modified",
+    "File.PUBLISHED": "Published",
+    "FormField.NONE": "None",
     "GRIDFIELD.ERRORINTRANSACTION": "Приликом преузимања података са сервера дошло је до грешке.\nПокушајте поново касније.",
     "HASMANYFILEFIELD.UPLOADING": "Постављање... %s",
     "HtmlEditorField.SelectAnchor": "Изабери сидро",

client/lang/sr_RS@latin.js

@@ -10,6 +10,10 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
     "FILEIFRAMEFIELD.DELETEFILE": "Izbriši datoteku",
     "FILEIFRAMEFIELD.DELETEIMAGE": "Izbriši sliku",
     "FILEIFRAMEFIELD.UNATTACHFILE": "Otkači datoteku",
+    "File.DRAFT": "Draft",
+    "File.MODIFIED": "Modified",
+    "File.PUBLISHED": "Published",
+    "FormField.NONE": "None",
     "GRIDFIELD.ERRORINTRANSACTION": "Prilikom preuzimanja podataka sa servera došlo je do greške.\nPokušajte ponovo kasnije.",
     "HASMANYFILEFIELD.UPLOADING": "Postavljanje... %s",
     "HtmlEditorField.SelectAnchor": "Izaberi sidro",

client/lang/src/ar.js

@@ -3,6 +3,10 @@
     "FILEIFRAMEFIELD.DELETEFILE": "احذف الملف",
     "FILEIFRAMEFIELD.DELETEIMAGE": "حذف الصورة",
     "FILEIFRAMEFIELD.UNATTACHFILE": "إلغاء إرفاق ملف",
+    "File.DRAFT": "Draft",
+    "File.MODIFIED": "Modified",
+    "File.PUBLISHED": "Published",
+    "FormField.NONE": "None",
     "GRIDFIELD.ERRORINTRANSACTION": "حدث خطأ أثناء استدعاء البيانات من الخادم\nيرجى إعادة المحاولة في وقت لاحق.",
     "HASMANYFILEFIELD.UPLOADING": "تم رفع ... %s",
     "HtmlEditorField.SelectAnchor": "حدد نقطة ارتساء",

client/lang/src/bg.js

@@ -3,6 +3,10 @@
     "FILEIFRAMEFIELD.DELETEFILE": "Изтрий файла",
     "FILEIFRAMEFIELD.DELETEIMAGE": "Изтрий снимката",
     "FILEIFRAMEFIELD.UNATTACHFILE": "Премахни файла",
+    "File.DRAFT": "Draft",
+    "File.MODIFIED": "Modified",
+    "File.PUBLISHED": "Published",
+    "FormField.NONE": "None",
     "GRIDFIELD.ERRORINTRANSACTION": "Възникна грешка при извличане на данни от сървъра\n Опитайте отново по-късно.",
     "HASMANYFILEFIELD.UPLOADING": "Качване... %s",
     "HtmlEditorField.SelectAnchor": "Select an anchor",

client/lang/src/cs.js

@@ -3,6 +3,10 @@
     "FILEIFRAMEFIELD.DELETEFILE": "Smazat soubor",
     "FILEIFRAMEFIELD.DELETEIMAGE": "Smazat obrázek",
     "FILEIFRAMEFIELD.UNATTACHFILE": "Odpojit soubor",
+    "File.DRAFT": "Draft",
+    "File.MODIFIED": "Modified",
+    "File.PUBLISHED": "Published",
+    "FormField.NONE": "None",
     "GRIDFIELD.ERRORINTRANSACTION": "Nastala chyba při získávání dat ze serveru\n Prosím zkuste opět později.",
     "HASMANYFILEFIELD.UPLOADING": "Nahrávání... %s",
     "HtmlEditorField.SelectAnchor": "Vyber kotvu",

client/lang/src/de.js

@@ -3,6 +3,10 @@
     "FILEIFRAMEFIELD.DELETEFILE": "Datei löschen",
     "FILEIFRAMEFIELD.DELETEIMAGE": "Bild löschen",
     "FILEIFRAMEFIELD.UNATTACHFILE": "Datei loslösen",
+    "File.DRAFT": "Entwurf",
+    "File.MODIFIED": "Zuletzt geändert",
+    "File.PUBLISHED": "Veröffentlicht",
+    "FormField.NONE": "Keine",
     "GRIDFIELD.ERRORINTRANSACTION": "Beim Laden der Daten vom Server ist ein Fehler aufgetretetn\n Bitte versuchen sie es später noch einmal.",
     "HASMANYFILEFIELD.UPLOADING": "Lädt hoch... %s",
     "HtmlEditorField.SelectAnchor": "Anker auswählen",

client/lang/src/eo.js

@@ -3,6 +3,10 @@
     "FILEIFRAMEFIELD.DELETEFILE": "Forigi dosieron",
     "FILEIFRAMEFIELD.DELETEIMAGE": "Forigi bildon",
     "FILEIFRAMEFIELD.UNATTACHFILE": "Malligi dosieron",
+    "File.DRAFT": "Malneto",
+    "File.MODIFIED": "Ŝanĝita",
+    "File.PUBLISHED": "Publikigita",
+    "FormField.NONE": "Neniu",
     "GRIDFIELD.ERRORINTRANSACTION": "Okazis eraro dum akirado de datumoj el la servilo\n Bonvole reprovu poste.",
     "HASMANYFILEFIELD.UPLOADING": "Alŝutiĝas %s...",
     "HtmlEditorField.SelectAnchor": "Elekti ankron",

client/lang/src/es.js

@@ -3,6 +3,10 @@
     "FILEIFRAMEFIELD.DELETEFILE": "Borrar Archivo",
     "FILEIFRAMEFIELD.DELETEIMAGE": "Borrar Imagen ",
     "FILEIFRAMEFIELD.UNATTACHFILE": "Desanexar documento",
+    "File.DRAFT": "Draft",
+    "File.MODIFIED": "Modified",
+    "File.PUBLISHED": "Published",
+    "FormField.NONE": "None",
     "GRIDFIELD.ERRORINTRANSACTION": "Ocurrió un error mientras se obtenía datos desde el servidor⏎\nPor favor intente nuevamente.",
     "HASMANYFILEFIELD.UPLOADING": "Subiendo... %s",
     "HtmlEditorField.SelectAnchor": "Selecciona un ancla",

client/lang/src/fa_IR.js

@@ -3,6 +3,10 @@
     "FILEIFRAMEFIELD.DELETEFILE": "حذف فایل‌",
     "FILEIFRAMEFIELD.DELETEIMAGE": "حذف تصویر",
     "FILEIFRAMEFIELD.UNATTACHFILE": "حذف ضمیمه فایل",
+    "File.DRAFT": "Draft",
+    "File.MODIFIED": "Modified",
+    "File.PUBLISHED": "Published",
+    "FormField.NONE": "None",
     "GRIDFIELD.ERRORINTRANSACTION": "یک خطا هنگام دستیابی به داده‌های سرور روی داد\nلطفاً بعداً تلاش نمایید.",
     "HASMANYFILEFIELD.UPLOADING": "در حال آپلود... %s",
     "HtmlEditorField.SelectAnchor": "انتخاب یک محل ارجاع لینک",

client/lang/src/fi.js

@@ -3,6 +3,10 @@
     "FILEIFRAMEFIELD.DELETEFILE": "Poista tiedosto",
     "FILEIFRAMEFIELD.DELETEIMAGE": "Poista kuva",
     "FILEIFRAMEFIELD.UNATTACHFILE": "Irroita tiedosto",
+    "File.DRAFT": "Draft",
+    "File.MODIFIED": "Modified",
+    "File.PUBLISHED": "Published",
+    "FormField.NONE": "None",
     "GRIDFIELD.ERRORINTRANSACTION": "Tapahtui virhe haettaessa tietoa palvelimelta.\nYritä uudestaan myöhemmin.",
     "HASMANYFILEFIELD.UPLOADING": "Ladataan... %s",
     "HtmlEditorField.SelectAnchor": "Valitse ankkuri",

client/lang/src/fr.js

@@ -3,6 +3,10 @@
     "FILEIFRAMEFIELD.DELETEFILE": "Delete File",
     "FILEIFRAMEFIELD.DELETEIMAGE": "Delete Image",
     "FILEIFRAMEFIELD.UNATTACHFILE": "Un-Attach File",
+    "File.DRAFT": "Draft",
+    "File.MODIFIED": "Modified",
+    "File.PUBLISHED": "Published",
+    "FormField.NONE": "None",
     "GRIDFIELD.ERRORINTRANSACTION": "Une erreur est survenue durant la transaction avec le serveur\n Merci de reesayer plus tard.",
     "HASMANYFILEFIELD.UPLOADING": "Uploading... %s",
     "HtmlEditorField.SelectAnchor": "Select an anchor",

client/lang/src/hr.js

@@ -3,6 +3,10 @@
     "FILEIFRAMEFIELD.DELETEFILE": "Obriši datoteku",
     "FILEIFRAMEFIELD.DELETEIMAGE": "Obriši sliku",
     "FILEIFRAMEFIELD.UNATTACHFILE": "Un-Attach File",
+    "File.DRAFT": "Draft",
+    "File.MODIFIED": "Modified",
+    "File.PUBLISHED": "Published",
+    "FormField.NONE": "None",
     "GRIDFIELD.ERRORINTRANSACTION": "An error occured while fetching data from the server\n Please try again later.",
     "HASMANYFILEFIELD.UPLOADING": "Prebacujem... %s",
     "HtmlEditorField.SelectAnchor": "Odaberite sidro",

client/lang/src/id.js

@@ -3,6 +3,10 @@
     "FILEIFRAMEFIELD.DELETEFILE": "Hapus Berkas",
     "FILEIFRAMEFIELD.DELETEIMAGE": "Hapus Gambar",
     "FILEIFRAMEFIELD.UNATTACHFILE": "Lepaskan Berkas",
+    "File.DRAFT": "Draft",
+    "File.MODIFIED": "Modified",
+    "File.PUBLISHED": "Published",
+    "FormField.NONE": "None",
     "GRIDFIELD.ERRORINTRANSACTION": "Terjadi kesalahan dalam menarik data dari server\n Mohon coba lagi nanti.",
     "HASMANYFILEFIELD.UPLOADING": "Mengunggah... %s",
     "HtmlEditorField.SelectAnchor": "Pilih jangkar",

client/lang/src/id_ID.js

@@ -3,6 +3,10 @@
     "FILEIFRAMEFIELD.DELETEFILE": "Hapus Berkas",
     "FILEIFRAMEFIELD.DELETEIMAGE": "Hapus Gambar",
     "FILEIFRAMEFIELD.UNATTACHFILE": "Lepaskan Berkas",
+    "File.DRAFT": "Draft",
+    "File.MODIFIED": "Modified",
+    "File.PUBLISHED": "Published",
+    "FormField.NONE": "None",
     "GRIDFIELD.ERRORINTRANSACTION": "Terjadi kesalahan dalam menarik data dari server\n Mohon coba lagi nanti.",
     "HASMANYFILEFIELD.UPLOADING": "Mengunggah... %s",
     "HtmlEditorField.SelectAnchor": "Pilih jangkar",

client/lang/src/it.js

@@ -3,6 +3,10 @@
     "FILEIFRAMEFIELD.DELETEFILE": "Eliminare file",
     "FILEIFRAMEFIELD.DELETEIMAGE": "Eliminare immagine",
     "FILEIFRAMEFIELD.UNATTACHFILE": "Scollegare file",
+    "File.DRAFT": "Draft",
+    "File.MODIFIED": "Modified",
+    "File.PUBLISHED": "Published",
+    "FormField.NONE": "None",
     "GRIDFIELD.ERRORINTRANSACTION": "Errore durante la lettura dei dati dal server.\nPer favore riprovare più tardi.",
     "HASMANYFILEFIELD.UPLOADING": "Invio file... %s",
     "HtmlEditorField.SelectAnchor": "Selezionare un riferimento",

client/lang/src/ja.js

@@ -3,6 +3,10 @@
     "FILEIFRAMEFIELD.DELETEFILE": "ファイルを削除",
     "FILEIFRAMEFIELD.DELETEIMAGE": "画像を削除",
     "FILEIFRAMEFIELD.UNATTACHFILE": "Un-Attach File",
+    "File.DRAFT": "Draft",
+    "File.MODIFIED": "Modified",
+    "File.PUBLISHED": "Published",
+    "FormField.NONE": "None",
     "GRIDFIELD.ERRORINTRANSACTION": "サーバーからデータを取得中にエラーが発生しました．\n 後ほど改めてお試しください．",
     "HASMANYFILEFIELD.UPLOADING": "アップロード中です... %s",
     "HtmlEditorField.SelectAnchor": "アンカーを選択する",

client/lang/src/lt.js

@@ -3,6 +3,10 @@
     "FILEIFRAMEFIELD.DELETEFILE": "Ištrinti bylą",
     "FILEIFRAMEFIELD.DELETEIMAGE": "Ištrinti paveikslėlį",
     "FILEIFRAMEFIELD.UNATTACHFILE": "Atrišti bylą",
+    "File.DRAFT": "Draft",
+    "File.MODIFIED": "Modified",
+    "File.PUBLISHED": "Published",
+    "FormField.NONE": "None",
     "GRIDFIELD.ERRORINTRANSACTION": "Įvyko klaida bandant gauto duomenis iš serverio\nBandykite vėliau.",
     "HASMANYFILEFIELD.UPLOADING": "Įkeliama... %s",
     "HtmlEditorField.SelectAnchor": "Pasirinkite nuorodą",

client/lang/src/mi.js

@@ -3,6 +3,10 @@
     "FILEIFRAMEFIELD.DELETEFILE": "Muku Kōnae",
     "FILEIFRAMEFIELD.DELETEIMAGE": "Muku Atahanga",
     "FILEIFRAMEFIELD.UNATTACHFILE": "Wehetāpiri Kōnae",
+    "File.DRAFT": "Draft",
+    "File.MODIFIED": "Modified",
+    "File.PUBLISHED": "Published",
+    "FormField.NONE": "None",
     "GRIDFIELD.ERRORINTRANSACTION": "Kua puta mai he hapa i te tiki raraunga mai i te tūmau\n Ngāna anō ā muri atu.",
     "HASMANYFILEFIELD.UPLOADING": "Tukuatu ana... %s",
     "HtmlEditorField.SelectAnchor": "Select an anchor",

client/lang/src/nb.js

@@ -3,6 +3,10 @@
     "FILEIFRAMEFIELD.DELETEFILE": "Slett fil",
     "FILEIFRAMEFIELD.DELETEIMAGE": "Slett bilde",
     "FILEIFRAMEFIELD.UNATTACHFILE": "Fjern vedlagt fil",
+    "File.DRAFT": "Draft",
+    "File.MODIFIED": "Modified",
+    "File.PUBLISHED": "Published",
+    "FormField.NONE": "None",
     "GRIDFIELD.ERRORINTRANSACTION": "En feil oppstod ved lesing fra serveren\nVennligst prøv på nytt senere.",
     "HASMANYFILEFIELD.UPLOADING": "Laster opp ... %s",
     "HtmlEditorField.SelectAnchor": "Velg et anker",

client/lang/src/nl.js

@@ -3,6 +3,10 @@
     "FILEIFRAMEFIELD.DELETEFILE": "Verwijder bestand",
     "FILEIFRAMEFIELD.DELETEIMAGE": "Verwijder afbeelding",
     "FILEIFRAMEFIELD.UNATTACHFILE": "Bestand ontkoppelen",
+    "File.DRAFT": "Draft",
+    "File.MODIFIED": "Modified",
+    "File.PUBLISHED": "Published",
+    "FormField.NONE": "None",
     "GRIDFIELD.ERRORINTRANSACTION": "Er is een fout opgetreden bij het ophalen van gegevens van de server\n Probeer later opnieuw.",
     "HASMANYFILEFIELD.UPLOADING": "Uploaden... %s",
     "HtmlEditorField.SelectAnchor": "Kies een anker",

client/lang/src/pl.js

@@ -3,6 +3,10 @@
     "FILEIFRAMEFIELD.DELETEFILE": "Usuń plik",
     "FILEIFRAMEFIELD.DELETEIMAGE": "Usuń obraz",
     "FILEIFRAMEFIELD.UNATTACHFILE": "Odłącz plik",
+    "File.DRAFT": "Draft",
+    "File.MODIFIED": "Modified",
+    "File.PUBLISHED": "Published",
+    "FormField.NONE": "None",
     "GRIDFIELD.ERRORINTRANSACTION": "Nastąpił błąd podczas pobierania danych z serwera\nProszę spróbować ponownie później.",
     "HASMANYFILEFIELD.UPLOADING": "Wysyłanie... %s",
     "HtmlEditorField.SelectAnchor": "Wybierz zakotwiczenie",

client/lang/src/ru.js

@@ -3,6 +3,10 @@
     "FILEIFRAMEFIELD.DELETEFILE": "Удалить файл",
     "FILEIFRAMEFIELD.DELETEIMAGE": "Удалить изображение",
     "FILEIFRAMEFIELD.UNATTACHFILE": "Открепить файл",
+    "File.DRAFT": "Draft",
+    "File.MODIFIED": "Modified",
+    "File.PUBLISHED": "Published",
+    "FormField.NONE": "None",
     "GRIDFIELD.ERRORINTRANSACTION": "Ошибка при получении данных с сервера\n Пожалуйста, повторите попытку позже.",
     "HASMANYFILEFIELD.UPLOADING": "Загрузка... %s",
     "HtmlEditorField.SelectAnchor": "Выбрать якорь",

client/lang/src/sk.js

@@ -3,6 +3,10 @@
     "FILEIFRAMEFIELD.DELETEFILE": "Zmazať súbor",
     "FILEIFRAMEFIELD.DELETEIMAGE": "Zmazať obrázok",
     "FILEIFRAMEFIELD.UNATTACHFILE": "Odpojiť súbor",
+    "File.DRAFT": "Draft",
+    "File.MODIFIED": "Modified",
+    "File.PUBLISHED": "Published",
+    "FormField.NONE": "None",
     "GRIDFIELD.ERRORINTRANSACTION": "Nastala chyba pri získavaní dát zo servera\n Prosím skúste opäť neskôr.",
     "HASMANYFILEFIELD.UPLOADING": "Nahrávanieí... %s",
     "HtmlEditorField.SelectAnchor": "Vyberte kotvu",

client/lang/src/sl.js

@@ -3,6 +3,10 @@
     "FILEIFRAMEFIELD.DELETEFILE": "Izbriši datoteko",
     "FILEIFRAMEFIELD.DELETEIMAGE": "Izbriši sliko",
     "FILEIFRAMEFIELD.UNATTACHFILE": "Un-Attach File",
+    "File.DRAFT": "Draft",
+    "File.MODIFIED": "Modified",
+    "File.PUBLISHED": "Published",
+    "FormField.NONE": "None",
     "GRIDFIELD.ERRORINTRANSACTION": "Napak pri pridobivanju podatkov s strežnika.\nProsimo, poskusite ponovno ",
     "HASMANYFILEFIELD.UPLOADING": "Nalagam ... %s",
     "HtmlEditorField.SelectAnchor": "Izberi sidro",

client/lang/src/sr.js

@@ -3,6 +3,10 @@
     "FILEIFRAMEFIELD.DELETEFILE": "Избриши датотеку",
     "FILEIFRAMEFIELD.DELETEIMAGE": "Избриши слику",
     "FILEIFRAMEFIELD.UNATTACHFILE": "Откачи датотеку",
+    "File.DRAFT": "Draft",
+    "File.MODIFIED": "Modified",
+    "File.PUBLISHED": "Published",
+    "FormField.NONE": "None",
     "GRIDFIELD.ERRORINTRANSACTION": "Приликом преузимања података са сервера дошло је до грешке.\nПокушајте поново касније.",
     "HASMANYFILEFIELD.UPLOADING": "Постављање... %s",
     "HtmlEditorField.SelectAnchor": "Изабери сидро",

client/lang/src/sr@latin.js

@@ -3,6 +3,10 @@
     "FILEIFRAMEFIELD.DELETEFILE": "Izbriši datoteku",
     "FILEIFRAMEFIELD.DELETEIMAGE": "Izbriši sliku",
     "FILEIFRAMEFIELD.UNATTACHFILE": "Otkači datoteku",
+    "File.DRAFT": "Draft",
+    "File.MODIFIED": "Modified",
+    "File.PUBLISHED": "Published",
+    "FormField.NONE": "None",
     "GRIDFIELD.ERRORINTRANSACTION": "Prilikom preuzimanja podataka sa servera došlo je do greške.\nPokušajte ponovo kasnije.",
     "HASMANYFILEFIELD.UPLOADING": "Postavljanje... %s",
     "HtmlEditorField.SelectAnchor": "Izaberi sidro",

client/lang/src/sr_RS.js

@@ -3,6 +3,10 @@
     "FILEIFRAMEFIELD.DELETEFILE": "Избриши датотеку",
     "FILEIFRAMEFIELD.DELETEIMAGE": "Избриши слику",
     "FILEIFRAMEFIELD.UNATTACHFILE": "Откачи датотеку",
+    "File.DRAFT": "Draft",
+    "File.MODIFIED": "Modified",
+    "File.PUBLISHED": "Published",
+    "FormField.NONE": "None",
     "GRIDFIELD.ERRORINTRANSACTION": "Приликом преузимања података са сервера дошло је до грешке.\nПокушајте поново касније.",
     "HASMANYFILEFIELD.UPLOADING": "Постављање... %s",
     "HtmlEditorField.SelectAnchor": "Изабери сидро",

client/lang/src/sr_RS@latin.js

@@ -3,6 +3,10 @@
     "FILEIFRAMEFIELD.DELETEFILE": "Izbriši datoteku",
     "FILEIFRAMEFIELD.DELETEIMAGE": "Izbriši sliku",
     "FILEIFRAMEFIELD.UNATTACHFILE": "Otkači datoteku",
+    "File.DRAFT": "Draft",
+    "File.MODIFIED": "Modified",
+    "File.PUBLISHED": "Published",
+    "FormField.NONE": "None",
     "GRIDFIELD.ERRORINTRANSACTION": "Prilikom preuzimanja podataka sa servera došlo je do greške.\nPokušajte ponovo kasnije.",
     "HASMANYFILEFIELD.UPLOADING": "Postavljanje... %s",
     "HtmlEditorField.SelectAnchor": "Izaberi sidro",

client/lang/src/sv.js

@@ -3,6 +3,10 @@
     "FILEIFRAMEFIELD.DELETEFILE": "Radera fil",
     "FILEIFRAMEFIELD.DELETEIMAGE": "Radera bild",
     "FILEIFRAMEFIELD.UNATTACHFILE": "Avlänka fil",
+    "File.DRAFT": "Draft",
+    "File.MODIFIED": "Modified",
+    "File.PUBLISHED": "Published",
+    "FormField.NONE": "None",
     "GRIDFIELD.ERRORINTRANSACTION": "Ett fel uppstod när data hämtades från servern.\nVar god försök igen senare.",
     "HASMANYFILEFIELD.UPLOADING": "Laddar upp... %s",
     "HtmlEditorField.SelectAnchor": "Välj ett ankare",

client/lang/src/zh.js

@@ -3,6 +3,10 @@
     "FILEIFRAMEFIELD.DELETEFILE": "删除文件",
     "FILEIFRAMEFIELD.DELETEIMAGE": "删除图像",
     "FILEIFRAMEFIELD.UNATTACHFILE": "卸装文件",
+    "File.DRAFT": "Draft",
+    "File.MODIFIED": "Modified",
+    "File.PUBLISHED": "Published",
+    "FormField.NONE": "None",
     "GRIDFIELD.ERRORINTRANSACTION": "从服务器获取数据时出错\n请稍后重试。",
     "HASMANYFILEFIELD.UPLOADING": "正在上传... %s",
     "HtmlEditorField.SelectAnchor": "请选择一个锚",

client/lang/sv.js

@@ -10,6 +10,10 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
     "FILEIFRAMEFIELD.DELETEFILE": "Radera fil",
     "FILEIFRAMEFIELD.DELETEIMAGE": "Radera bild",
     "FILEIFRAMEFIELD.UNATTACHFILE": "Avlänka fil",
+    "File.DRAFT": "Draft",
+    "File.MODIFIED": "Modified",
+    "File.PUBLISHED": "Published",
+    "FormField.NONE": "None",
     "GRIDFIELD.ERRORINTRANSACTION": "Ett fel uppstod när data hämtades från servern.\nVar god försök igen senare.",
     "HASMANYFILEFIELD.UPLOADING": "Laddar upp... %s",
     "HtmlEditorField.SelectAnchor": "Välj ett ankare",

client/lang/zh.js

@@ -10,6 +10,10 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
     "FILEIFRAMEFIELD.DELETEFILE": "删除文件",
     "FILEIFRAMEFIELD.DELETEIMAGE": "删除图像",
     "FILEIFRAMEFIELD.UNATTACHFILE": "卸装文件",
+    "File.DRAFT": "Draft",
+    "File.MODIFIED": "Modified",
+    "File.PUBLISHED": "Published",
+    "FormField.NONE": "None",
     "GRIDFIELD.ERRORINTRANSACTION": "从服务器获取数据时出错\n请稍后重试。",
     "HASMANYFILEFIELD.UPLOADING": "正在上传... %s",
     "HtmlEditorField.SelectAnchor": "请选择一个锚",

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

@@ -0,0 +1,70 @@
+# 3.5.0-rc1
+
+<!--- Changes below this line will be automatically regenerated -->
+
+## Change Log
+
+### Security
+
+ * 2016-08-02 [62a2421](https://github.com/silverstripe/silverstripe-framework/commit/62a242154ec3508fe9b174a40713c8520ac1684c) value / title escaping in CheckboxSetField and OptionsetField (Damian Mooyman) - See [ss-2016-015](http://www.silverstripe.org/download/security-releases/ss-2016-015)
+ * 2016-07-25 [1c7d5de](https://github.com/silverstripe/silverstripe-framework/commit/1c7d5de51bcdf16ebb21c5a0ebe5fe9e31f9a822) Autologin cookies are ignored if autologin is disabled (Daniel Hensby) - See [ss-2016-014](http://www.silverstripe.org/download/security-releases/ss-2016-014)
+ * 2016-07-22 [83e3302](https://github.com/silverstripe/silverstripe-framework/commit/83e3302c0425d9b0e4fe42e82e3df03379f4dca5) Uncasted member name (Daniel Hensby) - See [ss-2016-013](http://www.silverstripe.org/download/security-releases/ss-2016-013)
+ * 2016-07-15 [dc47f7e](https://github.com/silverstripe/silverstripe-framework/commit/dc47f7ec9adf67a3f31887467de5b110e8e5b285) Reset `Member::Salt` on password change (Daniel Hensby) - See [ss-2016-008](http://www.silverstripe.org/download/security-releases/ss-2016-008)
+ * 2016-07-14 [6d41db7](https://github.com/silverstripe/silverstripe-framework/commit/6d41db77fa78f473db7bcff389456c980ef4e412) ChangePasswordForm does not check $member-&gt;canLogin before login (Daniel Hensby) - See [ss-2016-011](http://www.silverstripe.org/download/security-releases/ss-2016-011)
+ * 2016-07-14 [efa20d2](https://github.com/silverstripe/silverstripe-reports/commit/efa20d2da03f80758cce7fe697c62f7f42fe098a) Missing ACL check on ReportAdmin (Daniel Hensby) - See [ss-2016-012](http://www.silverstripe.org/download/security-releases/ss-2016-012)
+ * 2016-07-14 [5f73d34](https://github.com/silverstripe/silverstripe-cms/commit/5f73d3454ecbc4850e91a0a3007102f6d4d9b853) Missing ACL check on ReportAdmin (Daniel Hensby) - See [ss-2016-012](http://www.silverstripe.org/download/security-releases/ss-2016-012)
+ * 2016-05-03 [3fa84cf](https://github.com/silverstripe/silverstripe-framework/commit/3fa84cf0c64a539d78600c36364817a8e38411d8) Encode user supplied URL for embeding into page (Daniel Hensby) - See [ss-2016-007](http://www.silverstripe.org/download/security-releases/ss-2016-007)
+
+### API Changes
+
+ * 2016-11-07 [ffd9938](https://github.com/silverstripe/silverstripe-framework/commit/ffd993865299522c66b0dd91beeab35dde1da5fb) ShortcodeParser getter and extension points (Jonathon Menz)
+ * 2016-09-15 [b87c668](https://github.com/silverstripe/silverstripe-framework/commit/b87c668bf4184abb4d7348e77a63853038ad2de2) support dblib (#5996) (Damian Mooyman)
+ * 2016-09-05 [c6457c5](https://github.com/silverstripe/silverstripe-framework/commit/c6457c50e970654b43ff009933a80a1a493186fb) Allow has_many fixtures to be declared with array format as well as many_many (#5944) (Damian Mooyman)
+ * 2016-07-15 [d08ab6a](https://github.com/silverstripe/silverstripe-framework/commit/d08ab6ac81b67220f08f80a16dd804a6d489ff97) Allow X-Frame-Options to be configured (Damian Mooyman)
+ * 2016-06-20 [e810a99](https://github.com/silverstripe/silverstripe-framework/commit/e810a9928c2d0771ba8f44934ed6295bbed418b3) Add optimistic_connect to SS_Database (Damian Mooyman)
+
+### Features and Enhancements
+
+ * 2016-06-10 [19b9413](https://github.com/silverstripe/silverstripe-framework/commit/19b9413432a8baa66ad262c24a4663be0ec7bb33) Use injector for MemberLoginForm fields (Daniel Hensby)
+ * 2016-05-15 [c401d9d](https://github.com/silverstripe/silverstripe-framework/commit/c401d9daff6d4add3bbded2d1a97e66bedb66992) added hide_from_cms_tree and hide_from_hierarchy (John Milmine)
+ * 2015-02-11 [dae2295](https://github.com/silverstripe/silverstripe-framework/commit/dae2295e16caed0c38076fdc5f3ed0a962e8f170) Allow the paddedresize to take another hex value to specify a transparency on the padded color (Nick)
+
+### Bugfixes
+
+ * 2016-11-03 [edfe514](https://github.com/silverstripe/silverstripe-framework/commit/edfe514540aae0772f49225f3614ce045ad9e1d4) Ensure that builds use the 3.4 dependencies. (Sam Minnee)
+ * 2016-11-01 [c61d61d](https://github.com/silverstripe/silverstripe-framework/commit/c61d61d00324e764022489968b5a114271793522) default_records are no longer inherited to child classes (Daniel Hensby)
+ * 2016-10-30 [747bd4c](https://github.com/silverstripe/silverstripe-framework/commit/747bd4cac00383fffea66dea75f7e21e13df7088) filterAny error message now refers to correct method name (Daniel Hensby)
+ * 2016-10-19 [b0445f7](https://github.com/silverstripe/silverstripe-framework/commit/b0445f72e4cce324308bb32384d578e43753cd6d) Ambiguous column SQL error (Jonathon Menz)
+ * 2016-10-16 [fe81607](https://github.com/silverstripe/silverstripe-framework/commit/fe816076fc5a2b3b1e497b8c51c76430311eea2c) Make simplexml_load_file work on shared php-fpm (Nicola Fontana)
+ * 2016-10-11 [7368dec](https://github.com/silverstripe/silverstripe-framework/commit/7368deca8f409c5aba94a6b646d7c0ac4fbd452f) Fix issue with SS_List as datasource for dropdown field (Damian Mooyman)
+ * 2016-10-07 [ae83b7b](https://github.com/silverstripe/silverstripe-cms/commit/ae83b7b5ef28df5f5b3f752435f3b36b078f619a) History controller now shows right comparison versions (Daniel Hensby)
+ * 2016-10-04 [797be6a](https://github.com/silverstripe/silverstripe-framework/commit/797be6ac82f6938af06c24c99150648ff214f797) Revert natural sort (Jonathon Menz)
+ * 2016-10-04 [6dde5ce](https://github.com/silverstripe/silverstripe-framework/commit/6dde5ce5718911d8e405eb590c68036ceaa6e608) Absolute alternate_base_url no longer breaks session cookies (Daniel Hensby)
+ * 2016-10-03 [98d95cd](https://github.com/silverstripe/silverstripe-cms/commit/98d95cd70708ae1f15a9bf5c5a661cd66f449f2f) Sort order for duplicated child pages is now retained (Daniel Hensby)
+ * 2016-09-29 [ae4108b](https://github.com/silverstripe/silverstripe-framework/commit/ae4108bf00e9503c5748c4129df7e1c3ea8c8b5f) Content-Disposition header breaks in Firefox (#4087) (Anton Smith)
+ * 2016-09-19 [32d1856](https://github.com/silverstripe/silverstripe-framework/commit/32d1856d40416438c52b8eb0651814a0fd32c0eb) Debug::caller() will now handle errors from outside function calls (#6029) (Daniel Hensby)
+ * 2016-09-19 [d2d770c](https://github.com/silverstripe/silverstripe-framework/commit/d2d770c6fbaeb3ea209853dd44017198a6232c01) Frontend UploadField wouldn't call ssdialog (Cristian Torres)
+ * 2016-09-14 [cd8904e](https://github.com/silverstripe/silverstripe-framework/commit/cd8904e0454617b243c8e89c06c694844817f212) ing button destroy bug (3Dgoo)
+ * 2016-09-12 [a14df0b](https://github.com/silverstripe/silverstripe-framework/commit/a14df0bc2d08f953ff7dd6f57899dbf260ab13a5) Force line endings to LF on sake file (Daniel Hensby)
+ * 2016-09-06 [e7ecf6c](https://github.com/silverstripe/silverstripe-framework/commit/e7ecf6cf15d4b3d4adaf0a415a5c4f9f2a15a003) Bad strpos call in HTTP::register_etag() (Daniel Hensby)
+ * 2016-09-01 [f2ed59e](https://github.com/silverstripe/silverstripe-framework/commit/f2ed59e1851b4506f02994dd4a1f3ffa86938cb9) Empty dmyfields on DateField now validate as true (Daniel Hensby)
+ * 2016-08-22 [59be597](https://github.com/silverstripe/silverstripe-cms/commit/59be597004da21064e51c6237fbb451628bebf66) #1052 (Daniel Hensby)
+ * 2016-08-22 [4998b80](https://github.com/silverstripe/silverstripe-framework/commit/4998b8044530a83c617194d544b76a98f742386e) ArrayList sorting now caseinsensitive (Daniel Hensby)
+ * 2016-08-15 [a6a9cd7](https://github.com/silverstripe/silverstripe-cms/commit/a6a9cd729fd24b19f7b39fdeb867a491489687e0) Fix regression in FormField casting (Damian Mooyman)
+ * 2016-08-11 [d4114b3](https://github.com/silverstripe/silverstripe-framework/commit/d4114b3dce73ffaf786af7ce76f2e1c6f1483d47) include related fields on canFilter() check (Jonathon Menz)
+ * 2016-08-09 [63fc4db](https://github.com/silverstripe/silverstripe-cms/commit/63fc4dbcaebcc7063f8075681d8b1f09608afe1c) Fix extra border in page settings (Damian Mooyman)
+ * 2016-08-07 [86add3e](https://github.com/silverstripe/silverstripe-framework/commit/86add3e02113f5087b168ee6529c55283c7243cc) Use create syntax for CMSMemberLoginForm remember me form (Daniel Hensby)
+ * 2016-08-04 [5fcdf8c](https://github.com/silverstripe/silverstripe-framework/commit/5fcdf8c3132376d6724700235c960c8133711f14) don't look in node_modules (Michael Strong)
+ * 2016-08-03 [a84a1b7](https://github.com/silverstripe/silverstripe-siteconfig/commit/a84a1b785c1e943951203ffdb584af5a34e41bdb) es issue #32 (Access tab JS) (Colin Tucker)
+ * 2016-07-28 [56f0b72](https://github.com/silverstripe/silverstripe-framework/commit/56f0b72e8dbf5b7205ae12c80e0f4c9a0614d1a2) ETag header now properly quoted (Daniel Hensby)
+ * 2016-07-15 [9282662](https://github.com/silverstripe/silverstripe-framework/commit/9282662293b28cce056abf88e94123c8cdd172f4) ing bad syntax from PR (Daniel Hensby)
+ * 2016-07-15 [3662240](https://github.com/silverstripe/silverstripe-framework/commit/366224078b6b0d67aeebab2f9041c76a33ae5626) Allow caching of false config values (Fixes #4755) (#4762) (Sam Minnée)
+ * 2016-07-08 [74c555e](https://github.com/silverstripe/silverstripe-framework/commit/74c555e00443b1bc619f0a3970beedc3dbce99e6) for #5784: Added -&gt;setReplyTo(), deprecated -&gt;replyTo() for API consistency. Revamping, fixing, and enhancing internal Email API documentation. Simplified code and brought up-to-date with latest standards. (Patrick Nelson)
+ * 2016-07-05 [9afd602](https://github.com/silverstripe/silverstripe-framework/commit/9afd6020076dd1eb3b91f9566557cbe695121468) calling $record-&gt;write() breaks other 3rd party fields that write to an UnsavedRelationList. (Jake Bentvelzen)
+ * 2016-07-04 [637167f](https://github.com/silverstripe/silverstripe-framework/commit/637167f2f9b97cdb3c3d2a64c38f87ce0d4c7e7a) Fix missing icons (Damian Mooyman)
+ * 2016-06-09 [3bb32eb](https://github.com/silverstripe/silverstripe-reports/commit/3bb32eb013d5d12a1ba39e934181b92e75e38eab) Tests need the DB (Daniel Hensby)
+ * 2016-06-09 [68c4040](https://github.com/silverstripe/silverstripe-reports/commit/68c40402999894d267e49674585913be1e913458) No longer hardcoding admin links (Daniel Hensby)
+ * 2016-06-03 [429ce55](https://github.com/silverstripe/silverstripe-framework/commit/429ce557561f7d4fd648b73cb83d12c1f424cead) ViewableData::setFailover() didn't remove cached methods (Loz Calver)
+ * 2016-06-01 [8a58041](https://github.com/silverstripe/silverstripe-framework/commit/8a58041fbaa01c5f5890fa274c001eee13164c24) Remove default from address for error emails (Sam Minnee)
+ * 2016-05-27 [11aad47](https://github.com/silverstripe/silverstripe-framework/commit/11aad47eeb62c6b412282b6a6aaa3ee217bbeab3) invalid syntax in TinyMCE config (#5593) (Loz Calver)
+ * 2016-05-19 [b1df9dc](https://github.com/silverstripe/silverstripe-framework/commit/b1df9dcb1d378c778e941a8fabd3c376e8a5a45a) check that we have a token and a UID before attempting a member auto login (Stevie Mayhew)

docs/en/04_Changelogs/rc/3.5.0-rc2.md

@@ -0,0 +1,5 @@
+# 3.5.0-rc2
+
+<!--- Changes below this line will be automatically regenerated -->
+
+## Change Log

lang/cs.yml

@@ -214,14 +214,12 @@ cs:
     JsType: 'Javascript soubor'
     Mp3Type: 'MP3 audio soubor'
     MpgType: 'MPEG video soubor'
-    NOFILESIZE: 'Velikost souboru je 0 bajtů.'
     NOVALIDUPLOAD: 'Soubor není validní pro nahrání'
     Name: Jméno
     PLURALNAME: Soubory
     PdfType: 'Adobe Acrobat PDF soubor'
     PngType: 'PNG obrázek - vhodný jako univerzálmí formát'
     SINGULARNAME: Soubor
-    TOOLARGE: 'Velikost souboru je příliš velká, povolené maximum {size}'
     TOOLARGESHORT: 'Velikost souboru překračuje {size}'
     TiffType: 'Tiff formát obrázku'
     Title: Titulek

lang/de.yml

@@ -12,6 +12,7 @@ de:
     HEIGHT: Höhe
     LASTEDIT: 'Letzte Änderung'
     OWNER: Eigentümer
+    PATH: Pfad
     SIZE: 'Größe'
     TITLE: Titel
     TYPE: 'Typ'
@@ -27,6 +28,7 @@ de:
     FILES: Dateien
     FROMCOMPUTER: 'Dateien auf Ihrem Computer auswählen'
     FROMCOMPUTERINFO: 'Von Ihrem Computer hochladen'
+    INSERTURL: 'Von URL einfügen'
     REMOVEINFO: 'Entferne diese Datei aus dem Feld'
     TOTAL: Insgesamt
     UPLOADINPROGRESS: 'Bitte warten sie... Upload im Gang'
@@ -100,9 +102,16 @@ de:
     HELLO: Hallo
     PASSWORD: Passwort
   ChangeSet:
+    DESCRIPTION_AND: '{first} und {second}'
+    DESCRIPTION_ITEM: Eintrag
+    DESCRIPTION_ITEMS: Einträge
     DESCRIPTION_LIST_FIRST: '{item}'
+    DESCRIPTION_LIST_LAST: '{list}, und {item}'
     DESCRIPTION_LIST_MID: '{list}, {item}'
+    DESCRIPTION_OTHER_ITEM: 'anderer Eintrag'
+    DESCRIPTION_OTHER_ITEMS: 'andere Einträge'
     NAME: Name
+    STATE: Status
   CheckboxField:
     NOANSWER: 'Nein'
     YESANSWER: 'Ja'
@@ -113,6 +122,7 @@ de:
   ConfirmedPasswordField:
     ATLEAST: 'Passwörter müssen mindestens {min} Zeichen lang sein.'
     BETWEEN: 'Passwörter müssen zwischen {min} und {max} Zeichen lang sein.'
+    LOGGED_IN_ERROR: 'Sie müssen eingeloggt sein, um Ihr Passwort ändern zu können!'
     MAXIMUM: 'Passwörter dürfen maximal {max} Zeichen lang sein.'
     SHOWONCLICKTITLE: 'Passwort ändern'
   ContentController:
@@ -156,6 +166,8 @@ de:
     INVALID_REQUEST: 'Ungültige Anfrage'
   DropdownField:
     CHOOSE: (Auswahl)
+    CHOOSESEARCH: '(Auswählen oder Suchen)'
+    CHOOSE_MODEL: '({name} auswählen)'
     SOURCE_VALIDATION: 'Bitte wählen Sie aus der Liste. {value} ist kein gültiger Wert'
   EmailField:
     VALIDATION: 'Bitte geben Sie eine E-Mail-Adresse ein'
@@ -165,6 +177,7 @@ de:
     AviType: 'AVI Videodatei'
     Content: Inhalt
     CssType: 'CSS Datei'
+    DRAFT: Entwurf
     DmgType: 'Apple Disk Image'
     DocType: 'Word Dokument'
     Filename: Dateiname
@@ -174,9 +187,11 @@ de:
     HtmlType: 'HTML Datei'
     INVALIDEXTENSION: 'Dateityp ist nicht erlaubt (erlaubt sind: {extensions})'
     INVALIDEXTENSIONSHORT: 'Dateityp ist nicht erlaubt'
+    INVALIDEXTENSION_SHORT: 'Dateityp ist nicht erlaubt'
     IcoType: 'Icon Bild'
     JpgType: 'JPEG Bild - ideal für Fotos'
     JsType: 'Javascript Datei'
+    MODIFIED: Zuletzt geändert
     Mp3Type: 'MP3 Audiodatei'
     MpgType: 'MPEG Videodatei'
     NOVALIDUPLOAD: 'Datei ist kein gültiger Upload'
@@ -185,6 +200,7 @@ de:
     PdfType: 'Adobe Acrobat PDF Datei'
     PngType: 'PNG Bild - vielseitig einsetzbar'
     SINGULARNAME: Datei
+    TOOLARGESHORT: 'Dateigröße übersteigt {size}'
     TiffType: 'TIFF Bild - ideal für hohe Auflösungen'
     Title: Titel
     WavType: 'WAV Audiodatei'
@@ -205,6 +221,7 @@ de:
     CSRF_FAILED_MESSAGE: 'Es gab ein technisches Problem. Bitte versuchen Sie es erneut, nachdem sie die vorherige Seite neu geladen haben.'
     FIELDISREQUIRED: '{name} muss ausgefüllt werden'
     SubmitBtnLabel: Los
+    VALIDATIONCREDIT: 'Bitte stellen Sie sicher, dass Sie die Kreditkartennummer korrekt eingegeben haben'
     VALIDATIONCREDITNUMBER: 'Bitte stellen Sie sicher, dass Sie die Kreditkartennummer ({number}) korrekt eingegeben haben'
     VALIDATIONNOTUNIQUE: 'Der eingegebene Wert ist nicht einzigartig'
     VALIDATIONPASSWORDSDONTMATCH: 'Die Passwörter stimmen nicht überein'
@@ -273,8 +290,16 @@ de:
     ResultDeleted: '%d Gruppe(n) gelöscht'
     ResultUpdated: '%d Gruppe(n) aktualisiert'
   HTMLEditorField:
+    ANCHORSCANNOTACCESSPAGE: 'Sie haben keine Berechtigungen, den Inhalt dieser Seite zu sehen.'
+    ANCHORSPAGENOTFOUND: 'Zielseite nicht gefunden'
     ANCHORVALUE: Anker
     BUTTONADDURL: 'URL hinzufügen'
+    CAPTIONTEXT: 'Beschriftungstext'
+    CSSCLASS: 'Ausrichtung / Stil'
+    CSSCLASSCENTER: 'Zentriert, selbstständig'
+    CSSCLASSLEFT: 'Links, mit umfließendem Text'
+    CSSCLASSLEFTALONE: 'Links, alleinstehend'
+    CSSCLASSRIGHT: 'Rechts, mit umfließendem Text'
     DETAILS: Details
     EMAIL: 'E-Mail-Adresse'
     FOLDER: Ordner
@@ -288,8 +313,15 @@ de:
     IMAGETITLETEXTDESC: 'Weiterführende Informationen über das Bild'
     IMAGEWIDTHPX: Breite
     LINK: 'Verweis einfügen'
+    LINKANCHOR: 'Link oder Anker auf dieser Seite'
     LINKDESCR: 'Beschreibung des Verweises'
+    LINKDETAILS: 'Link Details'
+    LINKEMAIL: 'Link zu einer E-Mail-Adresse'
+    LINKEXTERNAL: 'Link auf eine andere Webseite'
+    LINKFILE: 'Link zu einem Dateidownload'
+    LINKINTERNAL: 'Link zu einer Seite auf dieser Webseite'
     LINKOPENNEWWIN: 'Verweis in neuem Fenster öffnen?'
+    LINKTO: 'Linktyp'
     PAGE: Seite
     SUBJECT: 'E-Mail-Betreff'
     URL: URL
@@ -325,6 +357,8 @@ de:
     FROMWEB: 'Aus dem Web'
     FindInFolder: 'In Ordner suchen'
     IMAGEALT: 'Alternativtext (alt)'
+    IMAGEALTTEXT: 'Alternativtext (alt) - erscheint, falls das Bild nicht angezeigt werden kann.'
+    IMAGEALTTEXTDESC: 'Wird von Screenreadern vorgelesen oder angezeigt, falls das Bild nicht angezeigt werden kann.'
     IMAGEDIMENSIONS: Dimensionen
     IMAGEHEIGHTPX: Höhe (px)
     IMAGETITLE: 'Titeltext (Tooltip) - für zusätzliche Informationen über das Bild'
@@ -358,10 +392,13 @@ de:
     CANCEL: Abbrechen
     CANT_REORGANISE: 'Sie besitzen nicht die benötigten Zugriffsrechte um Seiten der höchsten Ebene zu bearbeiten. Ihre Änderungen wurden nicht gespeichert.'
     DELETED: Gelöscht.
+    DropdownBatchActionsDefault: 'Aktion auswählen...'
     HELP: Hilfe
+    PAGETYPE: 'Seitentyp'
     PERMAGAIN: 'Sie wurden aus dem System ausgeloggt. Falls Sie sich wieder einloggen möchten, geben Sie bitte Benutzernamen und Passwort im untenstehenden Formular an.'
     PERMALREADY: 'Leider dürfen Sie diesen Teil des CMS nicht aufrufen. Wenn Sie sich als jemand anderes einloggen wollen, benutzen Sie bitte das nachstehende Formular.'
     PERMDEFAULT: 'Sie müssen angemeldet sein, um auf diesen Bereich zugreifen zu können. Bitte geben Sie Ihre Zugangsdaten ein.'
+    PLEASESAVE: 'Diese Seite konnte nicht aktualisiert werden weil sie noch nicht gespeichert wurde - bitte speichern.'
     PreviewButton: Vorschau
     REORGANISATIONSUCCESSFUL: 'Der Seitenbaum wurde erfolgreich sortiert.'
     SAVEDUP: Gespeichert.
@@ -415,6 +452,7 @@ de:
     SUBJECTPASSWORDRESET: 'Ihr Link zur Passwortrücksetzung'
     SURNAME: Nachname
     TIMEFORMAT: 'Uhrzeitformat'
+    VALIDATIONMEMBEREXISTS: 'Es gibt bereits ein Mitglied mit dieser {identifier}'
     ValidationIdentifierFailed: 'Das vorhandene Mitglied #{id} mit identischer Bezeichnung kann nicht überschrieben werden ({name} = {value}))'
     WELCOMEBACK: 'Hallo {firstname}. Schön, dass du wieder da bist'
     YOUROLDPASSWORD: 'Ihr altes Passwort'
@@ -435,6 +473,7 @@ de:
     DIGITSDECFRACTIONSECOND: 'Eine oder mehrere Ziffern, die einen Dezimalbruch einer Sekunde darstellen'
     FOURDIGITYEAR: 'Vierstellige Jahreszahl'
     FULLNAMEMONTH: 'Volle Monatsbezeichnung (z.B. Juni)'
+    HOURNOLEADING24: 'Stunde ohne führende Null, 24 Stunden Format'
     MINUTENOLEADING: 'Minute, ohne führende Null'
     MONTHNOLEADING: 'Monat, ohne führende Null'
     Preview: Vorschau
@@ -571,6 +610,43 @@ de:
     Tablet: Tablett
     ViewDeviceWidth: 'Breite der Vorschau auswählen'
     Width: Breite
+  SilverStripe\Admin\CMSProfileController:
+    MENUTITLE: 'Mein Profil'
+  SilverStripe\Admin\SecurityAdmin:
+    MENUTITLE: Sicherheit
+  SilverStripe\Assets\File:
+    PLURALNAME: Dateien
+    SINGULARNAME: Datei
+  SilverStripe\Assets\Folder:
+    PLURALNAME: Ordner
+    SINGULARNAME: Ordner
+  SilverStripe\Assets\Image:
+    PLURALNAME: Bilder
+    SINGULARNAME: Bild
+  SilverStripe\ORM\DataObject:
+    PLURALNAME: 'DatenObjekte'
+    SINGULARNAME: 'DatenObjekt'
+  SilverStripe\Security\Group:
+    PLURALNAME: Gruppen
+    SINGULARNAME: Gruppe
+  SilverStripe\Security\LoginAttempt:
+    PLURALNAME: 'Loginversuche'
+    SINGULARNAME: 'Loginversuch'
+  SilverStripe\Security\Member:
+    PLURALNAME: Benutzer
+    SINGULARNAME: Benutzer
+  SilverStripe\Security\MemberPassword:
+    PLURALNAME: 'Benutzerpasswörter'
+    SINGULARNAME: 'Benutzerpasswort'
+  SilverStripe\Security\Permission:
+    PLURALNAME: Berechtigungen
+    SINGULARNAME: Zugriffsberechtigung
+  SilverStripe\Security\PermissionRole:
+    PLURALNAME: Rollen
+    SINGULARNAME: Rolle
+  SilverStripe\Security\PermissionRoleCode:
+    PLURALNAME: 'Berechtigungsrollencodes'
+    SINGULARNAME: 'Berechtigungsrollencode'
   SiteTree:
     TABMAIN: Hauptteil
   TableListField:
@@ -616,6 +692,9 @@ de:
   Versioned:
     has_many_Versions: Versionen
   VersionedGridFieldItemRequest:
+    ARCHIVE: Archiv
+    Archived: '%s %s archiviert'
+    BUTTONARCHIVEDESC: 'Veröffentlichung zurücknehmen und in das Archiv verschieben'
     BUTTONPUBLISH: Veröffentlichen
     BUTTONUNPUBLISH: Veröffentlichung zurücknehmen
     BUTTONUNPUBLISHDESC: 'Entferne diesn Eintrag von der veröffentlichten Website'

lang/eo.yml

@@ -200,6 +200,7 @@ eo:
     AviType: 'AVI videa dosiero'
     Content: Enhavo
     CssType: 'CSS-dosiero'
+    DRAFT: Malneto
     DmgType: 'Apple-diska bildo'
     DocType: 'Word-dokumento'
     Filename: Dosiernomo
@@ -209,9 +210,11 @@ eo:
     HtmlType: 'HTML-dosiero'
     INVALIDEXTENSION: 'Malvalida sufikso (validaj: {extensions})'
     INVALIDEXTENSIONSHORT: 'Malvalida sufikso'
+    INVALIDEXTENSION_SHORT: 'Malvalida sufikso'
     IcoType: 'Bildsimbolo'
     JpgType: 'JPEG-bildo - taŭga por fotoj'
     JsType: 'Ĝavaskripta dosiero'
+    MODIFIED: Ŝanĝita
     Mp3Type: 'MP3-sondosiero'
     MpgType: 'AVI-videa dosiero'
     NOFILESIZE: 'Dosiero havas nul bajtojn'
@@ -740,6 +743,7 @@ eo:
     Saved: Konservis
     UPLOADSINTO: 'konservas en /{path}'
   Versioned:
+    INFERRED_TITLE: 'Generita de publikigo de  ''{title}'' ĉe {created}'
     has_many_Versions: Versioj
   VersionedGridFieldItemRequest:
     ARCHIVE: Arkivo

lang/sk.yml

@@ -214,14 +214,12 @@ sk:
     JsType: 'Javascript súbor'
     Mp3Type: 'MP3 audio súbor'
     MpgType: 'MPEG video súbor'
-    NOFILESIZE: 'Veľkosť súboru je nula bajtov.'
     NOVALIDUPLOAD: 'Subor nie je povolený pre nahratie'
     Name: Meno
     PLURALNAME: Súbory
     PdfType: 'Adobe Acrobat PDF súbor'
     PngType: 'PNG obrázok - vhodný univerzálny formát'
     SINGULARNAME: Súbor
-    TOOLARGE: 'Veľkosť súboru je príliš veľká, maximum {size} je povolené'
     TOOLARGESHORT: 'Veľkosť súboru prekračuje {size}'
     TiffType: 'Tiff formát obrázku'
     Title: Názov

lang/sl_SI.yml

@@ -197,6 +197,54 @@ sl_SI:
     Sort: 'Vrstni red sortiranja'
     has_many_Permissions: Dovoljenja
     many_many_Members: Člani
+  GroupImportForm:
+    ResultDeleted: 'Izbrisane %d skupine'
+    ResultUpdated: 'Posodobljene %d skupine'
+  HTMLEditorField:
+    ANCHORSCANNOTACCESSPAGE: 'Nimate dovoljenj za dostop do vsebin na izbrani strani.'
+    ANCHORSPAGENOTFOUND: 'Ciljne strani ni mogoče najti.'
+    ANCHORVALUE: Sidro
+    BUTTONADDURL: 'Dodaj url'
+    CAPTIONTEXT: 'Napis'
+    CSSCLASS: 'Poravnava / stil'
+    DETAILS: Podrobnosti
+    EMAIL: 'E-poštni naslov'
+    FOLDER: Mapa
+    IMAGEALT: 'Alternativni tekst (alt)'
+    IMAGEALTTEXT: 'Alternativni tekst (alt) - se pojavi, če fotografije ni mogoče prikazati'
+    IMAGEDIMENSIONS: Dimenzije
+    IMAGEHEIGHTPX: Višina
+    IMAGETITLETEXT: 'Naslov (namig)'
+    IMAGEWIDTHPX: Širina
+    LINKDESCR: 'Opis povezave'
+    LINKDETAILS: 'Podrobnosti povezave'
+    LINKEMAIL: 'Povezava na e-poštni naslov'
+    LINKEXTERNAL: 'Povezava na drugo spletno stran'
+    LINKFILE: 'Povezava za prenos datoteke'
+    LINKINTERNAL: 'Povezava na stran znotraj tega spletnega mesta'
+    LINKOPENNEWWIN: 'Odpri povezavo v novem oknu?'
+    LINKTO: 'Tip povezave'
+    PAGE: Stran
+    SUBJECT: 'Predmet e-pošte'
+    URL: URL
+  HtmlEditorField:
+    ANCHORVALUE: Sidro
+    BUTTONADDURL: 'Dodaj url'
+    BUTTONINSERT: Vstavi
+    BUTTONINSERTLINK: 'Vstavi povezavo'
+    BUTTONREMOVELINK: 'Odstrani povezavo'
+    BUTTONUpdate: Posodobi
+    DETAILS: Podrobnosti
+    EMAIL: 'E-poštni naslov'
+    FILE: Datoteka
+    FOLDER: Mapa
+    FROMCMS: 'Iz CMS urejevalnika'
+    FROMCOMPUTER: 'Iz vašega računalnika'
+    FROMWEB: 'Iz spleta'
+    FindInFolder: 'Iskanje po mapah'
+    IMAGEDIMENSIONS: Dimenzije
+    IMAGEHEIGHTPX: Višina
+    IMAGEWIDTHPX: Širina
   Member:
     EDIT_PASSWORD: 'Novo geslo'
     EMAIL: E-pošta

src/Control/HTTPResponse.php

@@ -111,7 +111,7 @@ class HTTPResponse {
 	}
 
 	/**
-	 * @param string $code
+	 * @param int $code
 	 * @param string $description Optional. See {@link setStatusDescription()}.
 	 *  No newlines are allowed in the description.
 	 *  If omitted, will default to the standard HTTP description

src/Core/Manifest/ManifestCache_File_PHP.php

@@ -13,7 +13,7 @@ class ManifestCache_File_PHP extends ManifestCache_File
 		global $loaded_manifest;
 		$loaded_manifest = null;
 
-		$file = $this->folder . '/cache_' . $key;
+		$file = $this->folder . DIRECTORY_SEPARATOR . 'cache_' . $key;
 		if (file_exists($file)) {
 			include $file;
 		}
@@ -23,7 +23,7 @@ class ManifestCache_File_PHP extends ManifestCache_File
 
 	function save($data, $key)
 	{
-		$file = $this->folder . '/cache_' . $key;
+		$file = $this->folder . DIRECTORY_SEPARATOR. 'cache_' . $key;
 		file_put_contents($file, '<?php $loaded_manifest = ' . var_export($data, true) . ';');
 	}
 }

src/Dev/SapphireTest.php

@@ -237,8 +237,6 @@ class SapphireTest extends PHPUnit_Framework_TestCase {
 
 		// i18n needs to be set to the defaults or tests fail
 		i18n::set_locale(i18n::config()->get('default_locale'));
-		i18n::config()->date_format = null;
-		i18n::config()->time_format = null;
 
 		// Set default timezone consistently to avoid NZ-specific dependencies
 		date_default_timezone_set('UTC');

src/ORM/DataQuery.php

@@ -437,6 +437,9 @@ class DataQuery {
 	 */
 	public function max($field) {
 		$table = ClassInfo::table_for_object_field($this->dataClass, $field);
+		if (!$table || $table === 'DataObject') {
+			return $this->aggregate("MAX(\"$field\")");
+		}
 		return $this->aggregate("MAX(\"$table\".\"$field\")");
 	}
 
@@ -449,6 +452,9 @@ class DataQuery {
 	 */
 	public function min($field) {
 		$table = ClassInfo::table_for_object_field($this->dataClass, $field);
+		if (!$table || $table === 'DataObject') {
+			return $this->aggregate("MIN(\"$field\")");
+		}
 		return $this->aggregate("MIN(\"$table\".\"$field\")");
 	}
 
@@ -461,6 +467,9 @@ class DataQuery {
 	 */
 	public function avg($field) {
 		$table = ClassInfo::table_for_object_field($this->dataClass, $field);
+		if (!$table || $table === 'DataObject') {
+			return $this->aggregate("AVG(\"$field\")");
+		}
 		return $this->aggregate("AVG(\"$table\".\"$field\")");
 	}
 
@@ -473,6 +482,9 @@ class DataQuery {
 	 */
 	public function sum($field) {
 		$table = ClassInfo::table_for_object_field($this->dataClass, $field);
+		if (!$table || $table === 'DataObject') {
+			return $this->aggregate("SUM(\"$field\")");
+		}
 		return $this->aggregate("SUM(\"$table\".\"$field\")");
 	}
 

src/Security/Member.php

@@ -817,7 +817,6 @@ class Member extends DataObject implements TemplateGlobalProvider {
 		if($id) {
 			return DataObject::get_by_id('SilverStripe\\Security\\Member', $id);
 		}
-		return null;
 	}
 
 	/**

tests/php/ORM/DataListTest.php

@@ -346,6 +346,13 @@ class DataListTest extends SapphireTest {
 		$this->assertNotNull($sponsors->Min('ID'));
 		$this->assertNotNull($sponsors->Avg('ID'));
 		$this->assertNotNull($sponsors->Sum('ID'));
+
+		// Test non-orm many_many_extraFields
+		$company = $this->objFromFixture(EquipmentCompany::class, 'equipmentcompany1');
+		$this->assertNotNull($company->SponsoredTeams()->Max('SponsorFee'));
+		$this->assertNotNull($company->SponsoredTeams()->Min('SponsorFee'));
+		$this->assertNotNull($company->SponsoredTeams()->Avg('SponsorFee'));
+		$this->assertNotNull($company->SponsoredTeams()->Sum('SponsorFee'));
 	}
 
 	public function testEach() {

tests/php/Security/MemberTest.php

@@ -1289,4 +1289,14 @@ class MemberTest extends FunctionalTest {
 		$this->assertTrue($fail, 'Passes with email and surname now (no firstname)');
 	}
 
+	public function testCurrentUser() {
+		$this->assertNull(Member::currentUser());
+
+		$adminMember = $this->objFromFixture(Member::class, 'admin');
+		$this->logInAs($adminMember);
+
+		$userFromSession = Member::currentUser();
+		$this->assertEquals($adminMember->ID, $userFromSession->ID);
+	}
+
 }