Merge branch '2.0' into 2

lang/cs.yml

@@ -9,17 +9,17 @@ cs:
   SilverStripe\Versioned\ChangeSetItem:
     PLURALNAME: 'Změnit nastavení položek '
     SINGULARNAME: 'Změnit nastevení položky'
+  SilverStripe\Versioned\GridFieldArchiveAction:
+    Archive: Archiv
+  SilverStripe\Versioned\RecursivePublishable:
+    INFERRED_TITLE: 'Generováno vydavatelem ''{title}'' v {created}'
   SilverStripe\Versioned\Versioned:
     has_many_Versions: Verze
   SilverStripe\Versioned\VersionedGridFieldItemRequest:
     BUTTONARCHIVEDESC: 'Nezveřejnit a poslat do archivu'
+    BUTTONSAVEPUBLISH: Zveřejnit
     BUTTONUNPUBLISH: Nezveřejnit
     BUTTONUNPUBLISHDESC: 'Odstranit tento záznam ze zveřejněného webu'
     Published: 'Zveřejněno {name} {link}'
-    BUTTONSAVEPUBLISH: Zveřejnit
-  SilverStripe\Versioned\GridFieldArchiveAction:
-    Archive: Archiv
-  SilverStripe\Versioned\RecursivePublishable:
-    INFERRED_TITLE: 'Generováno vydavatelem ''{title}'' v {created}'
   SilverStripe\Versioned\VersionedHTTPMiddleware:
     DRAFT_SITE_ACCESS_RESTRICTION: 'Musíte se přihlásit s vasím CMS heslem pro pohled na koncept nebo na archivovaný obsah. <a href="{link}">Kliknte sem pro návrat do zveřejněného webu.</a>'

lang/da.yml

@@ -31,26 +31,24 @@ da:
       one: 'A Change Set Item'
       other: '{count} Change Set Items'
     SINGULARNAME: 'Change Set Item'
+  SilverStripe\Versioned\GridFieldArchiveAction:
+    Archive: Arkiver
+  SilverStripe\Versioned\RecursivePublishable:
+    INFERRED_TITLE: 'Genereret ved udgivelse af ''{title}'' den {created}'
   SilverStripe\Versioned\Versioned:
     has_many_Versions: Versioner
   SilverStripe\Versioned\VersionedGridFieldItemRequest:
     Archived: 'Arkiverede {name} {title}'
-    BUTTONARCHIVEDESC: 'Fjern udgivelse og læg i arkiv'
-    BUTTONUNPUBLISH: 'Fjern udgivelse'
-    BUTTONUNPUBLISHDESC: 'Fjern fra udgivet site'
-    Published: 'Udgiv {name} {link}'
-    Unpublished: 'Fjern udgivelse af {name} {title}'
     BUTTONAPPLYCHANGES: 'Anvend ændringer'
+    BUTTONARCHIVEDESC: 'Fjern udgivelse og læg i arkiv'
     BUTTONPUBLISHED: Udgivet
     BUTTONSAVEPUBLISH: Udgiv
+    BUTTONUNPUBLISH: 'Fjern udgivelse'
+    BUTTONUNPUBLISHDESC: 'Fjern fra udgivet site'
     DRAFT: Kladde
     MODIFIED: Modificeret
-  SilverStripe\Versioned\VersionedHTTPMiddleware:
-    DRAFT_SITE_ACCESS_RESTRICTION: 'Du skal logge ind med din CMS adgangskode for at se kladde og arkiv versioner af dit indhold. <a href="{link}">Klik her for at vende tilbage til det udgivne site.</a>'
-  SilverStripe\Versioned\GridFieldArchiveAction:
-    Archive: Arkiver
-  SilverStripe\Versioned\RecursivePublishable:
-    INFERRED_TITLE: 'Genereret ved udgivelse af ''{title}'' den {created}'
+    Published: 'Udgiv {name} {link}'
+    Unpublished: 'Fjern udgivelse af {name} {title}'
   SilverStripe\Versioned\VersionedGridFieldState\VersionedGridFieldState:
     ADDEDTODRAFTHELP: 'Elementet er endnu ikke blevet udgivet'
     ADDEDTODRAFTSHORT: Kladde
@@ -60,3 +58,5 @@ da:
     MODIFIEDONDRAFTSHORT: Modificeret
     ONLIVEONLYSHORT: 'Kun på udgivet'
     ONLIVEONLYSHORTHELP: 'Elementet er udgivet, men er slettet fra kladden'
+  SilverStripe\Versioned\VersionedHTTPMiddleware:
+    DRAFT_SITE_ACCESS_RESTRICTION: 'Du skal logge ind med din CMS adgangskode for at se kladde og arkiv versioner af dit indhold. <a href="{link}">Klik her for at vende tilbage til det udgivne site.</a>'

lang/eo.yml

@@ -22,15 +22,28 @@ eo:
     STATE_OPEN: Aktiva
     STATE_PUBLISHED: Publikigita
     STATE_REVERTED: Malfarita
+    db_Description: Priskribo
+    db_IsInferred: Induktita
+    db_LastSynced: 'Laste sinkronigita'
     db_Name: Nomo
     db_PublishDate: 'Dato de publikigo'
     db_State: Ŝtato
+    has_many_Changes: Ŝanĝoj
+    has_one_Owner: Posedanto
+    has_one_Publisher: Publikiginto
   SilverStripe\Versioned\ChangeSetItem:
     PLURALNAME: 'Ŝangi agordojn'
     PLURALS:
       one: 'Unu ŝanĝara ero'
       other: '{count} ŝanĝaraj eroj'
     SINGULARNAME: 'Ŝangi agordon'
+    belongs_many_many_References: Referencoj
+    db_Added: Aldonita
+    db_VersionAfter: 'Versio antaŭ'
+    db_VersionBefore: 'Versio post'
+    has_one_ChangeSet: 'Ŝanĝi aron'
+    has_one_Object: Objekto
+    many_many_ReferencedBy: Referencis
   SilverStripe\Versioned\GridFieldArchiveAction:
     Archive: Arkivo
     ArchivePermissionsFailure: 'Mankas arkivaj permesoj'
@@ -50,6 +63,7 @@ eo:
     RESTORE_TO_ROOT: 'Restaŭri al malneto ĉe la supra nivelo'
     RESTORE_TO_ROOT_DESC: 'Restaŭri la enarkivigitan version al malneto kiel la supranivela ero'
   SilverStripe\Versioned\Versioned:
+    db_Version: Versio
     has_many_Versions: Versioj
   SilverStripe\Versioned\VersionedGridFieldItemRequest:
     Archived: 'Enarkivigita {name} {titolo}'

lang/fi.yml

@@ -55,14 +55,14 @@ fi:
     Archived: 'Arkistoitiin {name} {title}'
     BUTTONAPPLYCHANGES: 'Hyväksy muutokset'
     BUTTONARCHIVEDESC: 'Poista julkaisusta ja arkistoi'
+    BUTTONPUBLISHED: Julkaistu
+    BUTTONSAVEPUBLISH: Julkaise
     BUTTONUNPUBLISH: 'Poista julkaisusta'
     BUTTONUNPUBLISHDESC: 'Poista tämä tietue julkaistulta sivustolta'
     DRAFT: Vedos
     MODIFIED: Muokattu
     Published: 'Julkaistiin {name} {link}'
     Unpublished: 'Poistettiin julkaisusta {name} {title}'
-    BUTTONPUBLISHED: Julkaistu
-    BUTTONSAVEPUBLISH: Julkaise
   SilverStripe\Versioned\VersionedGridFieldState\VersionedGridFieldState:
     ADDEDTODRAFTHELP: 'Kohdetta ei ole julkaistu vielä'
     ADDEDTODRAFTSHORT: Vedos

lang/fr.yml

@@ -2,19 +2,19 @@ fr:
   SilverStripe\Versioned\ChangeSet:
     EMPTY: Vide
     ITEMS_CHANGES:
+      many: '{total} ({count} modifications)'
       one: '{total} (1 modification)'
       other: '{total} ({count} modifications)'
-      many: '{total} ({count} modifications)'
     ITEMS_TOTAL:
+      many: '{count} au total'
       one: '1 au total'
       other: '{count} au total'
-      many: '{count} au total'
     NAME: Nom
     PLURALNAME: Campagnes
     PLURALS:
+      many: '{count} Campagnes'
       one: 'Une campagne'
       other: '{count} Campagnes'
-      many: '{count} Campagnes'
     PUBLISHED_DATE_BY: '{date} par {name}'
     PUBLISHED_TODAY: 'Aujourd''hui {time}'
     PUBLISHED_TODAY_BY: 'Aujourd''hui {time} par {name}'
@@ -58,12 +58,12 @@ fr:
     Published: '{name} {link} publié'
     Unpublished: '{name} {title} dépublié'
   SilverStripe\Versioned\VersionedGridFieldState\VersionedGridFieldState:
-    ADDEDTODRAFTSHORT: Brouillon
-    ARCHIVEDPAGESHORT: Archivé
-    MODIFIEDONDRAFTSHORT: Modifié
     ADDEDTODRAFTHELP: 'L''élément n''a pas encore été publié'
+    ADDEDTODRAFTSHORT: Brouillon
     ARCHIVEDPAGEHELP: 'L''élément est retiré des brouillons et en ligne'
+    ARCHIVEDPAGESHORT: Archivé
     MODIFIEDONDRAFTHELP: 'L''élément a des changements non publiés'
+    MODIFIEDONDRAFTSHORT: Modifié
     ONLIVEONLYSHORTHELP: 'L''élément est publié, mais a été effacé des brouillons'
   SilverStripe\Versioned\VersionedHTTPMiddleware:
     DRAFT_SITE_ACCESS_RESTRICTION: 'Vous devez vous identifier avec votre mot de passe CMS pour voir le contenu brouillon ou archivé. <a href="{link}">Cliquez ici pour revenir au site publié.</a>'

lang/hr.yml

@@ -16,15 +16,15 @@ hr:
   SilverStripe\Versioned\ChangeSetItem:
     PLURALNAME: 'Promjena postavki stavki'
     SINGULARNAME: 'Promjena postavki stavke'
+  SilverStripe\Versioned\GridFieldArchiveAction:
+    Archive: Arhiviraj
   SilverStripe\Versioned\Versioned:
     has_many_Versions: Verzije
   SilverStripe\Versioned\VersionedGridFieldItemRequest:
     BUTTONARCHIVEDESC: 'Poništi objavljivanje i pošalji u arhivu'
-    BUTTONUNPUBLISH: 'Poništi objavljivanje'
-    BUTTONUNPUBLISHDESC: 'Ukloni ovaj zapis s objavljene strancie'
     BUTTONPUBLISHED: Objavljen
     BUTTONSAVEPUBLISH: Objavi
+    BUTTONUNPUBLISH: 'Poništi objavljivanje'
+    BUTTONUNPUBLISHDESC: 'Ukloni ovaj zapis s objavljene strancie'
   SilverStripe\Versioned\VersionedHTTPMiddleware:
     DRAFT_SITE_ACCESS_RESTRICTION: 'Morate se prijaviti s vašom CMS lozinkom kako bi ste vidjeti neobjavljeni ili arhivirani sadržaj. <a href="{link}">Kliknite ovdje da se vratite na objavljenu stranicu.</a>'
-  SilverStripe\Versioned\GridFieldArchiveAction:
-    Archive: Arhiviraj

lang/it.yml

@@ -2,19 +2,19 @@ it:
   SilverStripe\Versioned\ChangeSet:
     EMPTY: Vuota
     ITEMS_CHANGES:
+      many: '{total} ({count} modifiche)'
       one: '{total} (1 modifica)'
       other: '{total} ({count} modifiche)'
-      many: '{total} ({count} modifiche)'
     ITEMS_TOTAL:
+      many: '{count} totale'
       one: '1 totale'
       other: '{count} totale'
-      many: '{count} totale'
     NAME: Nome
     PLURALNAME: Campagne
     PLURALS:
+      many: '{count} Campagne'
       one: 'Una Campagna'
       other: '{count} Campagne'
-      many: '{count} Campagne'
     PUBLISHED_DATE_BY: '{date} di {name}'
     PUBLISHED_TODAY: 'Oggi {time}'
     PUBLISHED_TODAY_BY: 'Oggi {time} di {name}'
@@ -31,9 +31,9 @@ it:
   SilverStripe\Versioned\ChangeSetItem:
     PLURALNAME: 'Elementi del Gruppo Modifiche'
     PLURALS:
+      many: '{count} Elementi del Gruppo Modifiche'
       one: 'Un Elemento del Gruppo Modifiche'
       other: '{count} Elementi del Gruppo Modifiche'
-      many: '{count} Elementi del Gruppo Modifiche'
     SINGULARNAME: 'Elemento del Gruppo Modifiche'
   SilverStripe\Versioned\GridFieldArchiveAction:
     Archive: Archivio

lang/pl.yml

@@ -2,21 +2,21 @@ pl:
   SilverStripe\Versioned\ChangeSet:
     EMPTY: Pusty
     ITEMS_CHANGES:
-      one: '{total} (zmiana)'
       few: '{total} ({count} zmian)'
       many: '{total} ({count} zmian)'
+      one: '{total} (zmiana)'
       other: '{total} ({count} zmian)'
     ITEMS_TOTAL:
-      one: '1 ogólem'
       few: '{count} ogólem'
       many: '{count} ogólem'
+      one: '1 ogólem'
       other: '{count} ogólem'
     NAME: Nazwa
     PLURALNAME: Kampanie
     PLURALS:
-      one: Kampania
       few: Kampanie
       many: 'Kampanii {count} '
+      one: Kampania
       other: 'Kampanii {count} '
     PUBLISHED_DATE_BY: '{date} przez {name}'
     PUBLISHED_TODAY: 'Dzisiaj {time}'
@@ -34,9 +34,9 @@ pl:
   SilverStripe\Versioned\ChangeSetItem:
     PLURALNAME: 'Zmień ustawione elementy'
     PLURALS:
-      one: 'Zmień element'
       few: 'Zmień elementy'
       many: 'Zmień elementy {count}'
+      one: 'Zmień element'
       other: 'Zmień ustawione elementy {count}'
     SINGULARNAME: 'Zmień ustawione elementy'
   SilverStripe\Versioned\GridFieldArchiveAction:
@@ -63,16 +63,16 @@ pl:
     Archived: 'Zarchiwizowano {name} {title}'
     BUTTONAPPLYCHANGES: 'Zastosowano zmiany'
     BUTTONARCHIVEDESC: 'Cofnij publikację i wyślij do archiwum'
+    BUTTONPUBLISHED: Opublikowane
+    BUTTONSAVED: Zapisane
+    BUTTONSAVEPUBLISH: Publikuj
     BUTTONUNPUBLISH: 'Cofnij publikację'
     BUTTONUNPUBLISHDESC: 'Usuń rekord z opublikowanych stron'
     DRAFT: Szkic
     MODIFIED: Zmodyfikowano
+    MoreOptions: 'Więcej opcji'
     Published: 'Opublikowano {name} {link}'
     Unpublished: 'Cofnięto publikację {name} {title}'
-    BUTTONPUBLISHED: Opublikowane
-    BUTTONSAVED: Zapisane
-    BUTTONSAVEPUBLISH: Publikuj
-    MoreOptions: 'Więcej opcji'
   SilverStripe\Versioned\VersionedGridFieldState\VersionedGridFieldState:
     ADDEDTODRAFTHELP: 'Rekord nie został jeszcze opublikowany'
     ADDEDTODRAFTSHORT: Szkic

lang/ru.yml

@@ -3,9 +3,9 @@ ru:
     NAME: Имя
     PLURALNAME: Кампании
     PLURALS:
-      one: Кампания
       few: '{count} кампании'
       many: '{count} кампаний'
+      one: Кампания
       other: '{count} кампаний'
     SINGULARNAME: Кампания
     STATE: Состояние
@@ -14,22 +14,22 @@ ru:
   SilverStripe\Versioned\ChangeSetItem:
     PLURALNAME: 'Объекты набора изменений'
     PLURALS:
-      one: 'Объект набора изменений'
       few: '{count} объекта набора изменений'
       many: '{count} объектов набора изменений'
+      one: 'Объект набора изменений'
       other: '{count} объектов набора изменений'
     SINGULARNAME: 'Объект набора изменений'
+  SilverStripe\Versioned\GridFieldArchiveAction:
+    Archive: Архив
+  SilverStripe\Versioned\RecursivePublishable:
+    INFERRED_TITLE: 'Сгенерировано автоматически при публикации ''{title}'' в {created}'
   SilverStripe\Versioned\Versioned:
     has_many_Versions: Версии
   SilverStripe\Versioned\VersionedGridFieldItemRequest:
     BUTTONARCHIVEDESC: 'Отменить публикацию и добавить в архив'
+    BUTTONSAVEPUBLISH: Опубликовать
     BUTTONUNPUBLISH: 'Отменить публикацию'
     BUTTONUNPUBLISHDESC: 'Удалить эту запись с сайта'
     Published: 'Опубликовано {name} {link}'
-    BUTTONSAVEPUBLISH: Опубликовать
   SilverStripe\Versioned\VersionedHTTPMiddleware:
     DRAFT_SITE_ACCESS_RESTRICTION: 'Вы должны войти в систему с помощью вашего пароля чтобы иметь возможность просматривать черновые или архивные страницы. Нажмите чтобы вернуться на опубликованный сайт.'
-  SilverStripe\Versioned\GridFieldArchiveAction:
-    Archive: Архив
-  SilverStripe\Versioned\RecursivePublishable:
-    INFERRED_TITLE: 'Сгенерировано автоматически при публикации ''{title}'' в {created}'

lang/sk.yml

@@ -9,17 +9,17 @@ sk:
   SilverStripe\Versioned\ChangeSetItem:
     PLURALNAME: 'Zmeniť nastavenie položiek'
     SINGULARNAME: 'Zmeniť nastavenie položky'
+  SilverStripe\Versioned\GridFieldArchiveAction:
+    Archive: Archív
+  SilverStripe\Versioned\RecursivePublishable:
+    INFERRED_TITLE: 'Generované vydavetaľom ''{title}'' v {created}'
   SilverStripe\Versioned\Versioned:
     has_many_Versions: Verzie
   SilverStripe\Versioned\VersionedGridFieldItemRequest:
     BUTTONARCHIVEDESC: 'Nezverejniť a poslať do archívu'
+    BUTTONSAVEPUBLISH: Zverejniť
     BUTTONUNPUBLISH: Nezverejniť
     BUTTONUNPUBLISHDESC: 'Odstrániť tento záznam zo zverejneného webu'
     Published: 'Zverejnené {name} {link}'
-    BUTTONSAVEPUBLISH: Zverejniť
-  SilverStripe\Versioned\GridFieldArchiveAction:
-    Archive: Archív
-  SilverStripe\Versioned\RecursivePublishable:
-    INFERRED_TITLE: 'Generované vydavetaľom ''{title}'' v {created}'
   SilverStripe\Versioned\VersionedHTTPMiddleware:
     DRAFT_SITE_ACCESS_RESTRICTION: 'Musíte sa prihlásiť s vašim CMS heslom pre náhľad koncepu alebo archivovaného obsahu. <a href="{link}">Kliknite tu pre návrat do zverejneného webu.</a>'

lang/sl.yml

@@ -2,22 +2,22 @@ sl:
   SilverStripe\Versioned\ChangeSet:
     EMPTY: Prazno
     ITEMS_CHANGES:
-      one: '{total} (1 sprememba)'
-      two: '{total} ({count} spremembi)'
       few: '{total} ({count} sprememb)'
+      one: '{total} (1 sprememba)'
       other: '{total} ({count} sprememb)'
+      two: '{total} ({count} spremembi)'
     ITEMS_TOTAL:
-      one: '1 skupaj'
-      two: '{count} skupaj'
       few: '{count} skupaj'
+      one: '1 skupaj'
       other: '{count} skupaj'
+      two: '{count} skupaj'
     NAME: Naziv
     PLURALNAME: Kampanje
     PLURALS:
-      one: Kampanja
-      two: '{count} kampanji'
       few: '{count} kampanj'
+      one: Kampanja
       other: '{count} kampanj'
+      two: '{count} kampanji'
     PUBLISHED_DATE_BY: 'Objavil {name}, {date}'
     PUBLISHED_TODAY: 'Danes {time}'
     PUBLISHED_TODAY_BY: 'Objavil {name} danes, {time}'
@@ -34,10 +34,10 @@ sl:
   SilverStripe\Versioned\ChangeSetItem:
     PLURALNAME: 'Nizi sprememb'
     PLURALS:
-      one: 'Niz sprememb'
-      two: '{count} niza sprememb'
       few: '{count} nizov sprememb'
+      one: 'Niz sprememb'
       other: '{count} nizov sprememb'
+      two: '{count} niza sprememb'
     SINGULARNAME: 'Preoblikuj niz sprememb'
   SilverStripe\Versioned\GridFieldArchiveAction:
     Archive: Arhiviraj