Merge remote-tracking branch 'origin/3.0' into 3.1

lang/af.yml

@@ -2,6 +2,7 @@ af:
   AssetAdmin:
     ALLOWEDEXTS: 'Allowed extensions'
     NEWFOLDER: 'Nuwe Dossier'
+    SHOWALLOWEDEXTS: 'Show allowed extensions'
   AssetTableField:
     CREATED: 'Eerste opgelaai'
     DIM: Afmetings
@@ -59,9 +60,9 @@ af:
     ERRORNOTADMIN: 'Daardie verbruiker is nie ''n administreerder nie'
     ERRORNOTREC: 'Daar die verbruikersnaam / wagwoord is nie herken nie'
   Boolean:
-    0: Onwaar
     ANY: Enige
-    1: Waar
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   CMSLoadingScreen.ss:
     LOADING: 'Besig om te laai...'
     REQUIREJS: 'Die IBS vereis dat JavaScript aangeskakel is'
@@ -70,6 +71,8 @@ af:
     ACCESSALLINTERFACES: 'Toegang tot alle IBS gedeeltes'
     ACCESSALLINTERFACESHELP: 'Oorheers meer spesifieke toegans verstellings'
     SAVE: Stoor
+  CMSPageHistoryController_versions.ss:
+    PREVIEW: 'Website preview'
   CMSProfileController:
     MENUTITLE: 'My profiel'
   ChangePasswordEmail.ss:
@@ -79,8 +82,8 @@ af:
     HELLO: 'Hi daar'
     PASSWORD: Wagwoord
   CheckboxField:
-    - Onwaar
-    - Waar
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   ComplexTableField:
     CLOSEPOPUP: 'Maak wipop toe'
     SUCCESSADD2: '{name} bygesit'
@@ -109,20 +112,21 @@ af:
     PLURALNAME: 'Data Voorwerpe'
     SINGULARNAME: 'Data Voorwerp'
   Date:
-    DAY: dag
-    DAYS: dae
-    HOUR: uur
-    HOURS: ure
-    MIN: minuut
-    MINS: minute
-    MONTH: maand
-    MONTHS: maande
-    SEC: sekonde
-    SECS: sekondes
+    DAY: day
+    DAYS: days
+    HOUR: hour
+    HOURS: hours
+    LessThanMinuteAgo: 'less than a minute'
+    MIN: min
+    MINS: mins
+    MONTH: month
+    MONTHS: months
+    SEC: sec
+    SECS: secs
     TIMEDIFFAGO: '{difference} terug'
     TIMEDIFFIN: 'in {difference}'
-    YEAR: jaar
-    YEARS: jare
+    YEAR: year
+    YEARS: years
   DateField:
     NOTSET: 'Nie gestel nie'
     TODAY: vandag
@@ -198,7 +202,8 @@ af:
     TEXT2: 'wagwoord herstel skakel'
     TEXT3: vir
   Form:
-    FIELDISREQUIRED: '%s word benodig.'
+    CSRF_FAILED_MESSAGE: 'There seems to have been a technical problem. Please click the back button, refresh your browser, and try again.'
+    FIELDISREQUIRED: '{name} is required'
     SubmitBtnLabel: Gaan
     VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
     VALIDATIONNOTUNIQUE: 'The waarde wat ingesleutel is is nie uniek nie'
@@ -208,6 +213,7 @@ af:
     VALIDATOR: Vergeldiger
     VALIDCURRENCY: 'Tik asseblief ''n geldige geldeenheid in '
   FormField:
+    Example: 'e.g. %s'
     NONE: geen
   GridAction:
     DELETE_DESCRIPTION: Verwyder
@@ -230,6 +236,7 @@ af:
     ResetFilter: Herstel
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'Geen toestemming om te verwyder nie'
+    EditPermissionsFailure: 'No permission to unlink record'
   GridFieldDetailForm:
     CancelBtn: 'Kanselleer '
     Create: Skep
@@ -237,7 +244,9 @@ af:
     DeletePermissionsFailure: 'Geen toestemming om te verwyder nie'
     Deleted: 'Verwyderde %s %s'
     Save: Stoor
-    Saved: 'Gestoor %s %s'
+    Saved: 'Saved {name} {link}'
+  GridFieldEditButton.ss:
+    EDIT: Edit
   GridFieldItemEditView.ss: null
   Group:
     AddRole: 'Voeg nog ''n rol by hierdie groep'
@@ -267,6 +276,7 @@ af:
     ADDURL: 'Voeg URL by'
     ADJUSTDETAILSDIMENSIONS: 'Details & dimensions'
     ANCHORVALUE: Anker
+    BUTTONADDURL: 'Add url'
     BUTTONINSERT: 'Plaas in'
     BUTTONINSERTLINK: 'Sit in'
     BUTTONREMOVELINK: 'Verwyder skakel'
@@ -331,6 +341,9 @@ af:
     PreviewButton: Beskou
     REORGANISATIONSUCCESSFUL: 'Die ''site tree'' is suksesvol geheorganiseer'
     SAVEDUP: Gestoor
+    ShowAsList: 'show as list'
+    TooManyPages: 'Too many pages'
+    ValidationError: 'Validation error'
     VersionUnknown: Unknown
   LeftAndMain_Menu.ss:
     Hello: Hi
@@ -407,6 +420,7 @@ af:
     TWODIGITMONTH: 'Twee syfer maand (01=Januarie etc)'
     TWODIGITSECOND: 'Twee syfers van sekondes (00 to 59)'
     TWODIGITYEAR: 'Twee syfer jaar'
+    Toggle: 'Show formatting help'
   MemberImportForm:
     Help1: '<p> Voer gebruikers in <em>CSV</em>formaat (komma geskeide waardes).<small> <a href="#" class="toggle-advanced">Wys gevorderde gebruike</a></small></p>'
     Help2: '<div class="advanced">	<h4>Advanced usage</h4>	<ul>	<li>Allowed columns: <em>%s</em></li>	<li>Existing users are matched by their unique <em>Code</em> property, and updated with any new values from	the imported file.</li>	<li>Groups can be assigned by the <em>Groups</em> column. Groups are identified by their <em>Code</em> property,	multiple groups can be separated by comma. Existing group memberships are not cleared.</li>	</ul></div>'
@@ -421,7 +435,7 @@ af:
   ModelAdmin:
     DELETE: Verwyder
     DELETEDRECORDS: 'Verwyder {count} rekords'
-    EMPTYBEFOREIMPORT: 'Maak databasis skoon voordat data ingevoer word'
+    EMPTYBEFOREIMPORT: 'Replace data'
     IMPORT: 'Voer in van CSV'
     IMPORTEDRECORDS: 'Imported {count} records.'
     NOCSVFILE: 'Soek asseblief vir ''n CSV lêer om in the voer'
@@ -515,7 +529,20 @@ af:
     BtnImport: 'Voer In'
     FileFieldLabel: 'CSV Lêer <small>(Laat toe uitbreidings: *.csv)</small>'
   SilverStripeNavigator:
+    Auto: Auto
+    ChangeViewMode: 'Change view mode'
+    Desktop: Desktop
+    DualWindowView: 'Dual Window'
     Edit: Verander
+    EditView: 'Edit mode'
+    Mobile: Mobile
+    PreviewState: 'Preview State'
+    PreviewView: 'Preview mode'
+    Responsive: Responsive
+    SplitView: 'Split mode'
+    Tablet: Tablet
+    ViewDeviceWidth: 'Select a preview width'
+    Width: width
   SimpleImageField:
     NOUPLOAD: 'Geen foto gelaai nie'
   SiteTree:
@@ -551,6 +578,8 @@ af:
     ATTACHFILE: 'Heg lêer aan'
     ATTACHFILES: 'Heg lêer(s) aan'
     AttachFile: 'Aangehegde lêer(s)'
+    CHOOSEANOTHERFILE: 'Choose another file'
+    CHOOSEANOTHERINFO: 'Replace this file with another one from the file store'
     DELETE: 'Verwyder van lêers af'
     DELETEINFO: 'Wis die lêer uit die lêer stoor uit'
     DOEDIT: Stoor
@@ -565,12 +594,15 @@ af:
     FROMFILES: 'Van die lêers afdeling'
     HOTLINKINFO: 'Info: This image will be hotlinked. Please ensure you have permissions from the original site creator to do so.'
     MAXNUMBEROFFILES: 'Maksimum aantal van {count} lêer(s) oorskry '
+    MAXNUMBEROFFILESONE: 'Can only upload one file'
     MAXNUMBEROFFILESSHORT: 'Kan net {count} lêer oplaai'
+    OVERWRITEWARNING: 'File with the same name already exists'
     REMOVE: Verwyder
     REMOVEERROR: 'Daar het ''n fout onstaan met die verwydering van die lêer'
     REMOVEINFO: 'Verwyder die lêer van hier af maar moet dit nie uit die lêer stoor verwyder nie'
     STARTALL: 'Begin alles'
     STARTALLINFO: 'Begin op alles op te laai'
     Saved: Gestoor
+    UPLOADSINTO: 'saves into /{path}'
   Versioned:
     has_many_Versions: Weergawe

lang/ar.yml

@@ -2,14 +2,15 @@ ar:
   AssetAdmin:
     ALLOWEDEXTS: 'Allowed extensions'
     NEWFOLDER: 'مجلد جديد'
+    SHOWALLOWEDEXTS: 'Show allowed extensions'
   AssetTableField:
     CREATED: 'أول المرفوعات'
     DIM: الأبعاد
     FILENAME: 'اسم الملف'
     FOLDER: Folder
     LASTEDIT: 'آخر التعديلات'
-    OWNER: المالك
-    SIZE: الحجم
+    OWNER: 'المالك'
+    SIZE: 'الحجم'
     TITLE: العنوان
     TYPE: النوع
     URL: الرابط
@@ -28,7 +29,7 @@ ar:
     UPLOADINPROGRESS: 'Please wait… upload in progress'
     UPLOADOR: OR
   BBCodeParser:
-    ALIGNEMENT: المحاذاة
+    ALIGNEMENT: 'المحاذاة'
     ALIGNEMENTEXAMPLE: 'محاذاة إلى اليمين'
     BOLD: 'خط عريض'
     BOLDEXAMPLE: عريض
@@ -42,7 +43,7 @@ ar:
     IMAGE: الصورة
     IMAGEDESCRIPTION: 'عرض الصورة في الموضوع'
     ITALIC: 'خط مائل'
-    ITALICEXAMPLE: مائل
+    ITALICEXAMPLE: 'مائل'
     LINK: 'رابط الموقع'
     LINKDESCRIPTION: 'رابط إلى موقع آخر'
     STRUCK: 'خط في المنتصف'
@@ -59,9 +60,9 @@ ar:
     ERRORNOTADMIN: 'هذا المستخدم لا يملك صلاحيات الإدارة'
     ERRORNOTREC: 'اسم المستخدم أو الرقم السري غير صحيح'
   Boolean:
-    0: لا
     ANY: أي
-    1: نعم
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   CMSLoadingScreen.ss:
     LOADING: Loading...
     REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
@@ -70,6 +71,8 @@ ar:
     ACCESSALLINTERFACES: 'الدخول إلى جميع واجهات إدارة المحتوى'
     ACCESSALLINTERFACESHELP: 'ينقض أكثر من توصيف الوصول المحدد'
     SAVE: حفظ
+  CMSPageHistoryController_versions.ss:
+    PREVIEW: 'Website preview'
   CMSProfileController:
     MENUTITLE: 'My Profile'
   ChangePasswordEmail.ss:
@@ -79,8 +82,8 @@ ar:
     HELLO: أهلاً
     PASSWORD: 'الرقم السري'
   CheckboxField:
-    - لا
-    - نعم
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   ComplexTableField:
     CLOSEPOPUP: 'إغلاق النافذة'
     SUCCESSADD2: 'Added {name}'
@@ -109,23 +112,24 @@ ar:
     PLURALNAME: 'بيانات كائن'
     SINGULARNAME: 'بيانات كائن'
   Date:
-    DAY: اليوم
-    DAYS: الأيام
-    HOUR: ساعة
-    HOURS: ساعات
-    MIN: دقيقة
-    MINS: الدقائق
-    MONTH: الشهر
-    MONTHS: الأشهر
-    SEC: ثانية
-    SECS: الثواني
+    DAY: day
+    DAYS: days
+    HOUR: hour
+    HOURS: hours
+    LessThanMinuteAgo: 'less than a minute'
+    MIN: min
+    MINS: mins
+    MONTH: month
+    MONTHS: months
+    SEC: sec
+    SECS: secs
     TIMEDIFFAGO: '{difference} ago'
     TIMEDIFFIN: 'in {difference}'
-    YEAR: السنة
-    YEARS: السنوات
+    YEAR: year
+    YEARS: years
   DateField:
     NOTSET: 'غير محدد'
-    TODAY: اليوم
+    TODAY: 'اليوم'
     VALIDDATEFORMAT2: 'Please enter a valid date format ({format})'
     VALIDDATEMAXDATE: 'Your date has to be older or matching the maximum allowed date ({date})'
     VALIDDATEMINDATE: 'Your date has to be newer or matching the minimum allowed date ({date})'
@@ -144,7 +148,7 @@ ar:
     ANY: أي
   File:
     AviType: 'AVI video file'
-    Content: المحتوى
+    Content: 'المحتوى'
     CssType: 'CSS file'
     DmgType: 'Apple disk image'
     DocType: 'Word document'
@@ -162,11 +166,11 @@ ar:
     MpgType: 'MPEG video file'
     NOFILESIZE: 'حجم الملف 0 بايت'
     NOVALIDUPLOAD: 'نوع الملف غير قابل للرفع'
-    Name: الاسم
-    PLURALNAME: الملفات
+    Name: 'الاسم'
+    PLURALNAME: 'الملفات'
     PdfType: 'Adobe Acrobat PDF file'
     PngType: 'PNG image - good general-purpose format'
-    SINGULARNAME: الملف
+    SINGULARNAME: 'الملف'
     TOOLARGE: 'Filesize is too large, maximum {size} allowed'
     TOOLARGESHORT: 'Filesize exceeds {size}'
     TiffType: 'Tagged image format'
@@ -180,7 +184,7 @@ ar:
     ATTACHONCESAVED2: 'Files can be attached once you have saved the record for the first time.'
     DELETE: 'Delete {type}'
     DISALLOWEDFILETYPE: 'This filetype is not allowed to be uploaded'
-    FILE: ملف
+    FILE: 'ملف'
     FROMCOMPUTER: 'من جهازك الشخصي'
     FROMFILESTORE: 'من مكتبة الملفات'
     NOSOURCE: 'الرجاء اختيارمصدر ملف المرفق'
@@ -198,16 +202,18 @@ ar:
     TEXT2: 'رابط إعادة تعيين كلمة المرور'
     TEXT3: لـ
   Form:
-    FIELDISREQUIRED: '%s مطلوب'
+    CSRF_FAILED_MESSAGE: 'There seems to have been a technical problem. Please click the back button, refresh your browser, and try again.'
+    FIELDISREQUIRED: '{name} is required'
     SubmitBtnLabel: Go
     VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
     VALIDATIONNOTUNIQUE: 'القيمة المدخلة غير فريدة و قابلة للتكرار '
     VALIDATIONPASSWORDSDONTMATCH: 'رقم المرور غير صحيح'
     VALIDATIONPASSWORDSNOTEMPTY: 'أرقام المرور لا يمكن أن تكون فارغة'
     VALIDATIONSTRONGPASSWORD: 'Passwords must have at least one digit and one alphanumeric character'
-    VALIDATOR: المحقق
+    VALIDATOR: 'المحقق'
     VALIDCURRENCY: 'Please enter a valid currency'
   FormField:
+    Example: 'e.g. %s'
     NONE: لايوجد
   GridAction:
     DELETE_DESCRIPTION: Delete
@@ -230,6 +236,7 @@ ar:
     ResetFilter: Reset
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'No delete permissions'
+    EditPermissionsFailure: 'No permission to unlink record'
   GridFieldDetailForm:
     CancelBtn: Cancel
     Create: Create
@@ -237,7 +244,9 @@ ar:
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
     Save: Save
-    Saved: 'Saved %s %s'
+    Saved: 'Saved {name} {link}'
+  GridFieldEditButton.ss:
+    EDIT: Edit
   GridFieldItemEditView.ss: null
   Group:
     AddRole: 'Add a role for this group'
@@ -267,6 +276,7 @@ ar:
     ADDURL: 'Add URL'
     ADJUSTDETAILSDIMENSIONS: 'Details & dimensions'
     ANCHORVALUE: رابط
+    BUTTONADDURL: 'Add url'
     BUTTONINSERT: Insert
     BUTTONINSERTLINK: 'أدخل رابط'
     BUTTONREMOVELINK: 'إزالة رابط'
@@ -279,8 +289,8 @@ ar:
     CSSCLASSRIGHT: 'إلى اليمين ، مع التفاف النص'
     DETAILS: Details
     EMAIL: 'بريد إلكتروني'
-    FILE: ملف
-    FOLDER: المجلد
+    FILE: 'ملف'
+    FOLDER: 'المجلد'
     FROMCMS: 'From the CMS'
     FROMCOMPUTER: 'From your computer'
     FROMWEB: 'From the web'
@@ -322,7 +332,7 @@ ar:
     CANT_REORGANISE: 'You do not have permission to alter Top level pages. Your change was not saved.'
     DELETED: Deleted.
     DropdownBatchActionsDefault: Actions
-    HELP: مساعدة
+    HELP: 'مساعدة'
     PAGETYPE: 'نوع الصفحة:'
     PERMAGAIN: 'تم خروجك من النظام بنجاح. للدخول مرة أخرى أدحل البريد الإلكتروني و الرقم السري بالأسفل'
     PERMALREADY: 'عذراً , لكن لا يمكنك الوصول لهذا القسم من النظام. يتوجب عليك الدخول بصلاحية أخرى'
@@ -331,7 +341,10 @@ ar:
     PreviewButton: Preview
     REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
     SAVEDUP: Saved.
-    VersionUnknown: unknown
+    ShowAsList: 'show as list'
+    TooManyPages: 'Too many pages'
+    ValidationError: 'Validation error'
+    VersionUnknown: Unknown
   LeftAndMain_Menu.ss:
     Hello: Hi
     LOGOUT: 'Log out'
@@ -377,7 +390,7 @@ ar:
     ValidationIdentifierFailed: 'Can''t overwrite existing member #{id} with identical identifier ({name} = {value}))'
     WELCOMEBACK: 'Welcome Back, {firstname}'
     YOUROLDPASSWORD: 'رقم المرور السابق'
-    belongs_many_many_Groups: المجموعات
+    belongs_many_many_Groups: 'المجموعات'
     db_LastVisited: 'تاريخ آخر زيارة'
     db_Locale: 'واجهة الموقع'
     db_LockedOutUntil: 'مغلق حتى تاريخ'
@@ -407,6 +420,7 @@ ar:
     TWODIGITMONTH: 'Two-digit month (01=January, etc.)'
     TWODIGITSECOND: 'Two digits of second (00 through 59)'
     TWODIGITYEAR: 'Two-digit year'
+    Toggle: 'Show formatting help'
   MemberImportForm:
     Help1: '<p>Import users in <em>CSV format</em> (comma-separated values). <small><a href="#" class="toggle-advanced">Show advanced usage</a></small></p>'
     Help2: '<div class="advanced">	<h4>Advanced usage</h4>	<ul>	<li>Allowed columns: <em>%s</em></li>	<li>Existing users are matched by their unique <em>Code</em> property, and updated with any new values from	the imported file.</li>	<li>Groups can be assigned by the <em>Groups</em> column. Groups are identified by their <em>Code</em> property,	multiple groups can be separated by comma. Existing group memberships are not cleared.</li>	</ul></div>'
@@ -421,7 +435,7 @@ ar:
   ModelAdmin:
     DELETE: حذف
     DELETEDRECORDS: 'Deleted {count} records.'
-    EMPTYBEFOREIMPORT: 'Clear Database before import'
+    EMPTYBEFOREIMPORT: 'Replace data'
     IMPORT: 'استيراد من CSV'
     IMPORTEDRECORDS: 'Imported {count} records.'
     NOCSVFILE: 'فضلاً استعرض ملف CSV للاستيراد'
@@ -441,8 +455,8 @@ ar:
     IMPORT_TAB_HEADER: Import
     SEARCHLISTINGS: Search
   MoneyField:
-    FIELDLABELAMOUNT: الكمية
-    FIELDLABELCURRENCY: العملة
+    FIELDLABELAMOUNT: 'الكمية'
+    FIELDLABELCURRENCY: 'العملة'
   NullableField:
     IsNullLabel: باطل
   NumericField:
@@ -515,7 +529,20 @@ ar:
     BtnImport: استيراد
     FileFieldLabel: ' CSV ملف <small>(الامتداد المسموح :*.csv )</small>'
   SilverStripeNavigator:
+    Auto: Auto
+    ChangeViewMode: 'Change view mode'
+    Desktop: Desktop
+    DualWindowView: 'Dual Window'
     Edit: Edit
+    EditView: 'Edit mode'
+    Mobile: Mobile
+    PreviewState: 'Preview State'
+    PreviewView: 'Preview mode'
+    Responsive: Responsive
+    SplitView: 'Split mode'
+    Tablet: Tablet
+    ViewDeviceWidth: 'Select a preview width'
+    Width: width
   SimpleImageField:
     NOUPLOAD: 'لا توجد صور مرفوعة'
   SiteTree:
@@ -551,6 +578,8 @@ ar:
     ATTACHFILE: 'Attach a file'
     ATTACHFILES: 'Attach files'
     AttachFile: 'Attach file(s)'
+    CHOOSEANOTHERFILE: 'Choose another file'
+    CHOOSEANOTHERINFO: 'Replace this file with another one from the file store'
     DELETE: 'Delete from files'
     DELETEINFO: 'Permanently delete this file from the file store'
     DOEDIT: Save
@@ -565,12 +594,15 @@ ar:
     FROMFILES: 'From files'
     HOTLINKINFO: 'Info: This image will be hotlinked. Please ensure you have permissions from the original site creator to do so.'
     MAXNUMBEROFFILES: 'Max number of {count} file(s) exceeded.'
+    MAXNUMBEROFFILESONE: 'Can only upload one file'
     MAXNUMBEROFFILESSHORT: 'Can only upload {count} files'
+    OVERWRITEWARNING: 'File with the same name already exists'
     REMOVE: Remove
     REMOVEERROR: 'Error removing file'
     REMOVEINFO: 'Remove this file from here, but do not delete it from the file store'
     STARTALL: 'Start all'
     STARTALLINFO: 'Start all uploads'
     Saved: Saved
+    UPLOADSINTO: 'saves into /{path}'
   Versioned:
     has_many_Versions: الإصدارات

lang/ast.yml

@@ -2,6 +2,7 @@ ast:
   AssetAdmin:
     ALLOWEDEXTS: 'Allowed extensions'
     NEWFOLDER: NewFolder
+    SHOWALLOWEDEXTS: 'Show allowed extensions'
   AssetTableField:
     CREATED: 'First uploaded'
     DIM: Dimensions
@@ -59,9 +60,9 @@ ast:
     ERRORNOTADMIN: 'That user is not an administrator.'
     ERRORNOTREC: 'That username / password isn''t recognised'
   Boolean:
-    0: 'False'
     ANY: Any
-    1: 'True'
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   CMSLoadingScreen.ss:
     LOADING: Loading...
     REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
@@ -70,6 +71,8 @@ ast:
     ACCESSALLINTERFACES: 'Access to all CMS sections'
     ACCESSALLINTERFACESHELP: 'Overrules more specific access settings.'
     SAVE: Save
+  CMSPageHistoryController_versions.ss:
+    PREVIEW: 'Website preview'
   CMSProfileController:
     MENUTITLE: 'My Profile'
   ChangePasswordEmail.ss:
@@ -79,8 +82,8 @@ ast:
     HELLO: Hi
     PASSWORD: Password
   CheckboxField:
-    - 'False'
-    - 'True'
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   ComplexTableField:
     CLOSEPOPUP: 'Close Popup'
     SUCCESSADD2: 'Added {name}'
@@ -109,20 +112,21 @@ ast:
     PLURALNAME: 'Oxetos de datos'
     SINGULARNAME: 'Oxetu de datos'
   Date:
-    DAY: ' day'
-    DAYS: ' days'
-    HOUR: ' hour'
-    HOURS: ' hours'
-    MIN: ' min'
-    MINS: ' mins'
-    MONTH: ' month'
-    MONTHS: ' months'
-    SEC: ' sec'
-    SECS: ' secs'
+    DAY: day
+    DAYS: days
+    HOUR: hour
+    HOURS: hours
+    LessThanMinuteAgo: 'less than a minute'
+    MIN: min
+    MINS: mins
+    MONTH: month
+    MONTHS: months
+    SEC: sec
+    SECS: secs
     TIMEDIFFAGO: '{difference} ago'
     TIMEDIFFIN: 'in {difference}'
-    YEAR: ' year'
-    YEARS: ' years'
+    YEAR: year
+    YEARS: years
   DateField:
     NOTSET: 'nun s''establez'
     TODAY: hoi
@@ -198,7 +202,8 @@ ast:
     TEXT2: 'password reset link'
     TEXT3: for
   Form:
-    FIELDISREQUIRED: '%s is required'
+    CSRF_FAILED_MESSAGE: 'There seems to have been a technical problem. Please click the back button, refresh your browser, and try again.'
+    FIELDISREQUIRED: '{name} is required'
     SubmitBtnLabel: Go
     VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
     VALIDATIONNOTUNIQUE: 'The value entered is not unique'
@@ -208,6 +213,7 @@ ast:
     VALIDATOR: Validator
     VALIDCURRENCY: 'Please enter a valid currency'
   FormField:
+    Example: 'e.g. %s'
     NONE: none
   GridAction:
     DELETE_DESCRIPTION: Delete
@@ -230,6 +236,7 @@ ast:
     ResetFilter: Reset
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'No delete permissions'
+    EditPermissionsFailure: 'No permission to unlink record'
   GridFieldDetailForm:
     CancelBtn: Cancel
     Create: Create
@@ -237,7 +244,9 @@ ast:
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
     Save: Save
-    Saved: 'Saved %s %s'
+    Saved: 'Saved {name} {link}'
+  GridFieldEditButton.ss:
+    EDIT: Edit
   GridFieldItemEditView.ss: null
   Group:
     AddRole: 'Add a role for this group'
@@ -267,6 +276,7 @@ ast:
     ADDURL: 'Add URL'
     ADJUSTDETAILSDIMENSIONS: 'Details & dimensions'
     ANCHORVALUE: Anchor
+    BUTTONADDURL: 'Add url'
     BUTTONINSERT: Insert
     BUTTONINSERTLINK: 'Insert link'
     BUTTONREMOVELINK: 'Remove link'
@@ -331,7 +341,10 @@ ast:
     PreviewButton: Preview
     REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
     SAVEDUP: Saved.
-    VersionUnknown: unknown
+    ShowAsList: 'show as list'
+    TooManyPages: 'Too many pages'
+    ValidationError: 'Validation error'
+    VersionUnknown: Unknown
   LeftAndMain_Menu.ss:
     Hello: Hi
     LOGOUT: 'Log out'
@@ -407,6 +420,7 @@ ast:
     TWODIGITMONTH: 'Two-digit month (01=January, etc.)'
     TWODIGITSECOND: 'Two digits of second (00 through 59)'
     TWODIGITYEAR: 'Two-digit year'
+    Toggle: 'Show formatting help'
   MemberImportForm:
     Help1: '<p>Import users in <em>CSV format</em> (comma-separated values). <small><a href="#" class="toggle-advanced">Show advanced usage</a></small></p>'
     Help2: '<div class="advanced">	<h4>Advanced usage</h4>	<ul>	<li>Allowed columns: <em>%s</em></li>	<li>Existing users are matched by their unique <em>Code</em> property, and updated with any new values from	the imported file.</li>	<li>Groups can be assigned by the <em>Groups</em> column. Groups are identified by their <em>Code</em> property,	multiple groups can be separated by comma. Existing group memberships are not cleared.</li>	</ul></div>'
@@ -421,7 +435,7 @@ ast:
   ModelAdmin:
     DELETE: Delete
     DELETEDRECORDS: 'Deleted {count} records.'
-    EMPTYBEFOREIMPORT: 'Clear Database before import'
+    EMPTYBEFOREIMPORT: 'Replace data'
     IMPORT: 'Import from CSV'
     IMPORTEDRECORDS: 'Imported {count} records.'
     NOCSVFILE: 'Please browse for a CSV file to import'
@@ -515,7 +529,20 @@ ast:
     BtnImport: 'Import from CSV'
     FileFieldLabel: 'CSV File <small>(Allowed extensions: *.csv)</small>'
   SilverStripeNavigator:
+    Auto: Auto
+    ChangeViewMode: 'Change view mode'
+    Desktop: Desktop
+    DualWindowView: 'Dual Window'
     Edit: Edit
+    EditView: 'Edit mode'
+    Mobile: Mobile
+    PreviewState: 'Preview State'
+    PreviewView: 'Preview mode'
+    Responsive: Responsive
+    SplitView: 'Split mode'
+    Tablet: Tablet
+    ViewDeviceWidth: 'Select a preview width'
+    Width: width
   SimpleImageField:
     NOUPLOAD: 'No Image Uploaded'
   SiteTree:
@@ -551,6 +578,8 @@ ast:
     ATTACHFILE: 'Attach a file'
     ATTACHFILES: 'Attach files'
     AttachFile: 'Attach file(s)'
+    CHOOSEANOTHERFILE: 'Choose another file'
+    CHOOSEANOTHERINFO: 'Replace this file with another one from the file store'
     DELETE: 'Delete from files'
     DELETEINFO: 'Permanently delete this file from the file store'
     DOEDIT: Save
@@ -565,12 +594,15 @@ ast:
     FROMFILES: 'From files'
     HOTLINKINFO: 'Info: This image will be hotlinked. Please ensure you have permissions from the original site creator to do so.'
     MAXNUMBEROFFILES: 'Max number of {count} file(s) exceeded.'
+    MAXNUMBEROFFILESONE: 'Can only upload one file'
     MAXNUMBEROFFILESSHORT: 'Can only upload {count} files'
+    OVERWRITEWARNING: 'File with the same name already exists'
     REMOVE: Remove
     REMOVEERROR: 'Error removing file'
     REMOVEINFO: 'Remove this file from here, but do not delete it from the file store'
     STARTALL: 'Start all'
     STARTALLINFO: 'Start all uploads'
     Saved: Saved
+    UPLOADSINTO: 'saves into /{path}'
   Versioned:
     has_many_Versions: Versiones

lang/az.yml

@@ -2,6 +2,7 @@ az:
   AssetAdmin:
     ALLOWEDEXTS: 'Allowed extensions'
     NEWFOLDER: NewFolder
+    SHOWALLOWEDEXTS: 'Show allowed extensions'
   AssetTableField:
     CREATED: 'First uploaded'
     DIM: Dimensions
@@ -59,9 +60,9 @@ az:
     ERRORNOTADMIN: 'İstifadəçi administrator deyil'
     ERRORNOTREC: 'Belə istifadəçi adı və ya parol tanınmadı'
   Boolean:
-    0: Yox
     ANY: İstənilən
-    1: Bəli
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   CMSLoadingScreen.ss:
     LOADING: Loading...
     REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
@@ -70,6 +71,8 @@ az:
     ACCESSALLINTERFACES: 'Access to all CMS sections'
     ACCESSALLINTERFACESHELP: 'Overrules more specific access settings.'
     SAVE: 'Yadda saxla'
+  CMSPageHistoryController_versions.ss:
+    PREVIEW: 'Website preview'
   CMSProfileController:
     MENUTITLE: 'My Profile'
   ChangePasswordEmail.ss:
@@ -79,8 +82,8 @@ az:
     HELLO: Salam
     PASSWORD: Parol
   CheckboxField:
-    - Yox
-    - Bəli
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   ComplexTableField:
     CLOSEPOPUP: Bağla
     SUCCESSADD2: 'Added {name}'
@@ -109,20 +112,21 @@ az:
     PLURALNAME: 'Data Obyektlər'
     SINGULARNAME: 'Data Obyekt'
   Date:
-    DAY: gün
-    DAYS: günlər
-    HOUR: saat
-    HOURS: saatlar
-    MIN: dəq
-    MINS: dəqiqələr
-    MONTH: ay
-    MONTHS: aylar
-    SEC: san
-    SECS: san-lər
+    DAY: day
+    DAYS: days
+    HOUR: hour
+    HOURS: hours
+    LessThanMinuteAgo: 'less than a minute'
+    MIN: min
+    MINS: mins
+    MONTH: month
+    MONTHS: months
+    SEC: sec
+    SECS: secs
     TIMEDIFFAGO: '{difference} ago'
     TIMEDIFFIN: 'in {difference}'
-    YEAR: il
-    YEARS: illər
+    YEAR: year
+    YEARS: years
   DateField:
     NOTSET: 'təyin edilməyib'
     TODAY: 'bu gün'
@@ -198,7 +202,8 @@ az:
     TEXT2: 'parolu sıfırlma linki'
     TEXT3: üçün
   Form:
-    FIELDISREQUIRED: '%s tələb olunur.'
+    CSRF_FAILED_MESSAGE: 'There seems to have been a technical problem. Please click the back button, refresh your browser, and try again.'
+    FIELDISREQUIRED: '{name} is required'
     SubmitBtnLabel: Go
     VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
     VALIDATIONNOTUNIQUE: 'Daxil edilən məlumat unikal deyil'
@@ -208,6 +213,7 @@ az:
     VALIDATOR: Validator
     VALIDCURRENCY: 'Please enter a valid currency'
   FormField:
+    Example: 'e.g. %s'
     NONE: 'heç bir'
   GridAction:
     DELETE_DESCRIPTION: Delete
@@ -230,6 +236,7 @@ az:
     ResetFilter: Reset
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'No delete permissions'
+    EditPermissionsFailure: 'No permission to unlink record'
   GridFieldDetailForm:
     CancelBtn: Cancel
     Create: Create
@@ -237,7 +244,9 @@ az:
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
     Save: Save
-    Saved: 'Saved %s %s'
+    Saved: 'Saved {name} {link}'
+  GridFieldEditButton.ss:
+    EDIT: Edit
   GridFieldItemEditView.ss: null
   Group:
     AddRole: 'Add a role for this group'
@@ -267,6 +276,7 @@ az:
     ADDURL: 'Add URL'
     ADJUSTDETAILSDIMENSIONS: 'Details & dimensions'
     ANCHORVALUE: Ankor
+    BUTTONADDURL: 'Add url'
     BUTTONINSERT: Insert
     BUTTONINSERTLINK: 'Link əlavə et'
     BUTTONREMOVELINK: 'Linki sil'
@@ -331,7 +341,10 @@ az:
     PreviewButton: Preview
     REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
     SAVEDUP: Saved.
-    VersionUnknown: unknown
+    ShowAsList: 'show as list'
+    TooManyPages: 'Too many pages'
+    ValidationError: 'Validation error'
+    VersionUnknown: Unknown
   LeftAndMain_Menu.ss:
     Hello: Hi
     LOGOUT: 'Log out'
@@ -407,6 +420,7 @@ az:
     TWODIGITMONTH: 'Two-digit month (01=January, etc.)'
     TWODIGITSECOND: 'Two digits of second (00 through 59)'
     TWODIGITYEAR: 'Two-digit year'
+    Toggle: 'Show formatting help'
   MemberImportForm:
     Help1: '<p>Import users in <em>CSV format</em> (comma-separated values). <small><a href="#" class="toggle-advanced">Show advanced usage</a></small></p>'
     Help2: '<div class="advanced">	<h4>Advanced usage</h4>	<ul>	<li>Allowed columns: <em>%s</em></li>	<li>Existing users are matched by their unique <em>Code</em> property, and updated with any new values from	the imported file.</li>	<li>Groups can be assigned by the <em>Groups</em> column. Groups are identified by their <em>Code</em> property,	multiple groups can be separated by comma. Existing group memberships are not cleared.</li>	</ul></div>'
@@ -421,7 +435,7 @@ az:
   ModelAdmin:
     DELETE: Delete
     DELETEDRECORDS: 'Deleted {count} records.'
-    EMPTYBEFOREIMPORT: 'Clear Database before import'
+    EMPTYBEFOREIMPORT: 'Replace data'
     IMPORT: 'Import from CSV'
     IMPORTEDRECORDS: 'Imported {count} records.'
     NOCSVFILE: 'Please browse for a CSV file to import'
@@ -515,7 +529,20 @@ az:
     BtnImport: 'Import from CSV'
     FileFieldLabel: 'CSV File <small>(Allowed extensions: *.csv)</small>'
   SilverStripeNavigator:
+    Auto: Auto
+    ChangeViewMode: 'Change view mode'
+    Desktop: Desktop
+    DualWindowView: 'Dual Window'
     Edit: Edit
+    EditView: 'Edit mode'
+    Mobile: Mobile
+    PreviewState: 'Preview State'
+    PreviewView: 'Preview mode'
+    Responsive: Responsive
+    SplitView: 'Split mode'
+    Tablet: Tablet
+    ViewDeviceWidth: 'Select a preview width'
+    Width: width
   SimpleImageField:
     NOUPLOAD: 'Şəkil yüklənməmişdir'
   SiteTree:
@@ -551,6 +578,8 @@ az:
     ATTACHFILE: 'Attach a file'
     ATTACHFILES: 'Attach files'
     AttachFile: 'Attach file(s)'
+    CHOOSEANOTHERFILE: 'Choose another file'
+    CHOOSEANOTHERINFO: 'Replace this file with another one from the file store'
     DELETE: 'Delete from files'
     DELETEINFO: 'Permanently delete this file from the file store'
     DOEDIT: Save
@@ -565,12 +594,15 @@ az:
     FROMFILES: 'From files'
     HOTLINKINFO: 'Info: This image will be hotlinked. Please ensure you have permissions from the original site creator to do so.'
     MAXNUMBEROFFILES: 'Max number of {count} file(s) exceeded.'
+    MAXNUMBEROFFILESONE: 'Can only upload one file'
     MAXNUMBEROFFILESSHORT: 'Can only upload {count} files'
+    OVERWRITEWARNING: 'File with the same name already exists'
     REMOVE: Remove
     REMOVEERROR: 'Error removing file'
     REMOVEINFO: 'Remove this file from here, but do not delete it from the file store'
     STARTALL: 'Start all'
     STARTALLINFO: 'Start all uploads'
     Saved: Saved
+    UPLOADSINTO: 'saves into /{path}'
   Versioned:
     has_many_Versions: Versiyalar

lang/bg.yml

@@ -2,9 +2,10 @@ bg:
   AssetAdmin:
     ALLOWEDEXTS: 'Allowed extensions'
     NEWFOLDER: НоваПапка
+    SHOWALLOWEDEXTS: 'Show allowed extensions'
   AssetTableField:
     CREATED: Създаден
-    DIM: Размери
+    DIM: 'Размери'
     FILENAME: 'Име на файл'
     FOLDER: Папка
     LASTEDIT: 'Последна промяна'
@@ -59,9 +60,9 @@ bg:
     ERRORNOTADMIN: 'Този потребител не е администратор.'
     ERRORNOTREC: 'Това потребителско име / парола не е разпознато'
   Boolean:
-    0: 'False'
     ANY: Any
-    1: 'True'
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   CMSLoadingScreen.ss:
     LOADING: 'Зареждане ...'
     REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
@@ -70,6 +71,8 @@ bg:
     ACCESSALLINTERFACES: 'Достъп до всички секции на CMS'
     ACCESSALLINTERFACESHELP: 'Overrules more specific access settings.'
     SAVE: Запис
+  CMSPageHistoryController_versions.ss:
+    PREVIEW: 'Website preview'
   CMSProfileController:
     MENUTITLE: 'Моят профил'
   ChangePasswordEmail.ss:
@@ -79,8 +82,8 @@ bg:
     HELLO: Здравей!
     PASSWORD: Парола
   CheckboxField:
-    - 'не е чекнато'
-    - чекнато
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   ComplexTableField:
     CLOSEPOPUP: 'Затвори прозореца'
     SUCCESSADD2: 'Беше добавен {name}'
@@ -88,8 +91,8 @@ bg:
   ComplexTableField.ss:
     ADDITEM: 'Добави %s'
     NOITEMSFOUND: 'No items found'
-    SORTASC: Възходящ
-    SORTDESC: Низходящ
+    SORTASC: 'Възходящ'
+    SORTDESC: 'Низходящ'
   ComplexTableField_popup.ss:
     NEXT: Следващо
     PREVIOUS: Предишно
@@ -109,20 +112,21 @@ bg:
     PLURALNAME: 'Обекти с данни'
     SINGULARNAME: 'Обект с данни'
   Date:
-    DAY: ден
-    DAYS: дни
-    HOUR: час
-    HOURS: часове
-    MIN: минута
-    MINS: минути
-    MONTH: месец
-    MONTHS: месеци
-    SEC: секунда
-    SECS: секунди
+    DAY: day
+    DAYS: days
+    HOUR: hour
+    HOURS: hours
+    LessThanMinuteAgo: 'less than a minute'
+    MIN: min
+    MINS: mins
+    MONTH: month
+    MONTHS: months
+    SEC: sec
+    SECS: secs
     TIMEDIFFAGO: 'преди {difference}'
     TIMEDIFFIN: 'за {difference}'
-    YEAR: година
-    YEARS: години
+    YEAR: year
+    YEARS: years
   DateField:
     NOTSET: 'Не нагласено'
     TODAY: днес
@@ -198,7 +202,8 @@ bg:
     TEXT2: 'адрес за рестартирване на парола'
     TEXT3: за
   Form:
-    FIELDISREQUIRED: 'нужно е %s'
+    CSRF_FAILED_MESSAGE: 'There seems to have been a technical problem. Please click the back button, refresh your browser, and try again.'
+    FIELDISREQUIRED: '{name} is required'
     SubmitBtnLabel: Go
     VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
     VALIDATIONNOTUNIQUE: 'Въведената стойност не е уникална'
@@ -208,6 +213,7 @@ bg:
     VALIDATOR: Валидатор
     VALIDCURRENCY: 'Моля, въведете коректна валута.'
   FormField:
+    Example: 'e.g. %s'
     NONE: нищо
   GridAction:
     DELETE_DESCRIPTION: Изтриване
@@ -230,6 +236,7 @@ bg:
     ResetFilter: Изчистване
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'Изтриването не е разрешено'
+    EditPermissionsFailure: 'No permission to unlink record'
   GridFieldDetailForm:
     CancelBtn: Cancel
     Create: Създай
@@ -237,7 +244,9 @@ bg:
     DeletePermissionsFailure: 'Изтриването не е разрешено'
     Deleted: 'Изтрити %s %s'
     Save: Запис
-    Saved: 'Съхранени %s %s'
+    Saved: 'Saved {name} {link}'
+  GridFieldEditButton.ss:
+    EDIT: Edit
   GridFieldItemEditView.ss: null
   Group:
     AddRole: 'Добавяне на роля към групата'
@@ -253,7 +262,7 @@ bg:
     RolesAddEditLink: 'Управление на ролите'
     SINGULARNAME: Group
     Sort: Сортиране
-    has_many_Permissions: Разрешения
+    has_many_Permissions: 'Разрешения'
     many_many_Members: Потребители
   GroupImportForm:
     Help1: '<p>Внасяне на една или повече групи в <em>CSV формат</em> (comma-separated values). <small><a href="#" class="toggle-advanced">Покажи начин на употреба</a></small></p>'
@@ -267,6 +276,7 @@ bg:
     ADDURL: 'Добави URL'
     ADJUSTDETAILSDIMENSIONS: 'Детайли и размери'
     ANCHORVALUE: Котва
+    BUTTONADDURL: 'Add url'
     BUTTONINSERT: Вмъкни
     BUTTONINSERTLINK: 'Вмъкни препратка'
     BUTTONREMOVELINK: 'Премахни препратка'
@@ -288,7 +298,7 @@ bg:
     IMAGEALT: 'Алтернативен текст (alt)'
     IMAGEALTTEXT: 'Алтернативен текст (alt) - показва се ако изображението не е заредено'
     IMAGEALTTEXTDESC: 'Вижда се на екранните четци или ако картинката не може да бъде показана'
-    IMAGEDIMENSIONS: Размери
+    IMAGEDIMENSIONS: 'Размери'
     IMAGEHEIGHTPX: Височина
     IMAGETITLE: 'Описание (tooltip) - за допълнителна информация към изображението'
     IMAGETITLETEXT: 'Описание (tooltip)'
@@ -331,6 +341,9 @@ bg:
     PreviewButton: Преглед
     REORGANISATIONSUCCESSFUL: 'Реорганизацията на дървото на сайта беше успешна.'
     SAVEDUP: Записано
+    ShowAsList: 'show as list'
+    TooManyPages: 'Too many pages'
+    ValidationError: 'Validation error'
     VersionUnknown: непозната
   LeftAndMain_Menu.ss:
     Hello: Здравей
@@ -407,6 +420,7 @@ bg:
     TWODIGITMONTH: 'Месец с водеща нула (01=Януари, и т.н.)'
     TWODIGITSECOND: 'Секунди с водеща нула (00 до 59)'
     TWODIGITYEAR: 'Двуцифрена година'
+    Toggle: 'Show formatting help'
   MemberImportForm:
     Help1: '<p>Внасяне на потебители в <em>CSV формат</em> (comma-separated values). <small><a href="#" class="toggle-advanced">Покажи начин на употреба</a></small></p>'
     Help2: '<div class="advanced">	<h4>Advanced usage</h4>	<ul>	<li>Allowed columns: <em>%s</em></li>	<li>Existing users are matched by their unique <em>Code</em> property, and updated with any new values from	the imported file.</li>	<li>Groups can be assigned by the <em>Groups</em> column. Groups are identified by their <em>Code</em> property,	multiple groups can be separated by comma. Existing group memberships are not cleared.</li>	</ul></div>'
@@ -421,7 +435,7 @@ bg:
   ModelAdmin:
     DELETE: Изтрий
     DELETEDRECORDS: 'Бяха изтрити {count} записа.'
-    EMPTYBEFOREIMPORT: 'Clear Database before import'
+    EMPTYBEFOREIMPORT: 'Replace data'
     IMPORT: 'Внасяне от CSV'
     IMPORTEDRECORDS: 'Бяха внесени {count} записа.'
     NOCSVFILE: 'Преглед на CSV файл за внасяне'
@@ -506,16 +520,29 @@ bg:
     MENUTITLE: Сигурност
     MemberListCaution: 'Внимание: изтривайки потребители от този списък, ще ги премахне от всички групи и от базата данни.'
     NEWGROUP: 'Нова група'
-    PERMISSIONS: Разрешения
-    ROLES: Роли
+    PERMISSIONS: 'Разрешения'
+    ROLES: 'Роли'
     ROLESDESCRIPTION: 'Ролите са предварително зададени сетове от разрешения и могат да бъдат присвоявани на групи.<br />Ако е нужно, те се наследяват от родителските групи.'
-    TABROLES: Роли
+    TABROLES: 'Роли'
     Users: Потребители
   SecurityAdmin_MemberImportForm:
     BtnImport: 'Внасяне от CSV'
     FileFieldLabel: 'CSV файл <small>(разширение: *.csv)</small>'
   SilverStripeNavigator:
-    Edit: Редакция
+    Auto: Auto
+    ChangeViewMode: 'Change view mode'
+    Desktop: Desktop
+    DualWindowView: 'Dual Window'
+    Edit: 'Редакция'
+    EditView: 'Edit mode'
+    Mobile: Mobile
+    PreviewState: 'Preview State'
+    PreviewView: 'Preview mode'
+    Responsive: Responsive
+    SplitView: 'Split mode'
+    Tablet: Tablet
+    ViewDeviceWidth: 'Select a preview width'
+    Width: width
   SimpleImageField:
     NOUPLOAD: 'Няма качени изображения'
   SiteTree:
@@ -551,12 +578,14 @@ bg:
     ATTACHFILE: 'Прикачване на файл'
     ATTACHFILES: 'Прикачване на файлове'
     AttachFile: 'Прикачване на файл(ове)'
+    CHOOSEANOTHERFILE: 'Choose another file'
+    CHOOSEANOTHERINFO: 'Replace this file with another one from the file store'
     DELETE: 'Delete from files'
     DELETEINFO: 'Изтрий файла от сървъра'
     DOEDIT: Запис
     DROPFILE: 'пуснете файл'
     DROPFILES: 'пускане на файлове'
-    Dimensions: Размери
+    Dimensions: 'Размери'
     EDIT: Edit
     EDITINFO: 'Редактирай този файл'
     FIELDNOTSET: 'Информация за файла не беше намерена'
@@ -565,12 +594,15 @@ bg:
     FROMFILES: 'От файлове'
     HOTLINKINFO: 'Info: This image will be hotlinked. Please ensure you have permissions from the original site creator to do so.'
     MAXNUMBEROFFILES: 'Максималния брой файлове ({count}) е надхвърлен.'
+    MAXNUMBEROFFILESONE: 'Can only upload one file'
     MAXNUMBEROFFILESSHORT: 'Максималният брой файлове за качване е {count}'
-    REMOVE: Премахни
+    OVERWRITEWARNING: 'File with the same name already exists'
+    REMOVE: 'Премахни'
     REMOVEERROR: 'Грешка при премахване на файл'
     REMOVEINFO: 'Премахни файла без да го изтриваш'
     STARTALL: 'Старт на всички'
     STARTALLINFO: 'Start all uploads'
     Saved: Записано
+    UPLOADSINTO: 'saves into /{path}'
   Versioned:
     has_many_Versions: Версии

lang/bs.yml

@@ -2,6 +2,7 @@ bs:
   AssetAdmin:
     ALLOWEDEXTS: 'Allowed extensions'
     NEWFOLDER: NoviDirektorij
+    SHOWALLOWEDEXTS: 'Show allowed extensions'
   AssetTableField:
     CREATED: 'Prvo postavljeno'
     DIM: Dimenzije
@@ -59,9 +60,9 @@ bs:
     ERRORNOTADMIN: 'Ovaj korisnik nije administrator.'
     ERRORNOTREC: 'Korisničko ime / šifra nije prepoznata'
   Boolean:
-    0: 'False'
     ANY: Any
-    1: 'True'
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   CMSLoadingScreen.ss:
     LOADING: Loading...
     REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
@@ -70,6 +71,8 @@ bs:
     ACCESSALLINTERFACES: 'Access to all CMS sections'
     ACCESSALLINTERFACESHELP: 'Overrules more specific access settings.'
     SAVE: Snimi
+  CMSPageHistoryController_versions.ss:
+    PREVIEW: 'Website preview'
   CMSProfileController:
     MENUTITLE: 'My Profile'
   ChangePasswordEmail.ss:
@@ -79,8 +82,8 @@ bs:
     HELLO: Pozdrav
     PASSWORD: Password
   CheckboxField:
-    - 'False'
-    - 'True'
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   ComplexTableField:
     CLOSEPOPUP: 'Close Popup'
     SUCCESSADD2: 'Added {name}'
@@ -109,20 +112,21 @@ bs:
     PLURALNAME: 'Data Objects'
     SINGULARNAME: 'Data Object'
   Date:
-    DAY: dan
-    DAYS: dani
-    HOUR: sat
-    HOURS: sati
-    MIN: minuta
-    MINS: minute
-    MONTH: mjesec
-    MONTHS: mjeseci
-    SEC: sekunda
-    SECS: sekundi
+    DAY: day
+    DAYS: days
+    HOUR: hour
+    HOURS: hours
+    LessThanMinuteAgo: 'less than a minute'
+    MIN: min
+    MINS: mins
+    MONTH: month
+    MONTHS: months
+    SEC: sec
+    SECS: secs
     TIMEDIFFAGO: '{difference} ago'
     TIMEDIFFIN: 'in {difference}'
-    YEAR: godina
-    YEARS: godine
+    YEAR: year
+    YEARS: years
   DateField:
     NOTSET: 'nije postavljeno'
     TODAY: danas
@@ -198,7 +202,8 @@ bs:
     TEXT2: 'link za ponovno podešavanje šifre'
     TEXT3: za
   Form:
-    FIELDISREQUIRED: '%s je obavezno'
+    CSRF_FAILED_MESSAGE: 'There seems to have been a technical problem. Please click the back button, refresh your browser, and try again.'
+    FIELDISREQUIRED: '{name} is required'
     SubmitBtnLabel: Go
     VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
     VALIDATIONNOTUNIQUE: 'Unesena vrijednost nije jedinstvena'
@@ -208,6 +213,7 @@ bs:
     VALIDATOR: 'Provjera ispravnosti'
     VALIDCURRENCY: 'Please enter a valid currency'
   FormField:
+    Example: 'e.g. %s'
     NONE: ništa
   GridAction:
     DELETE_DESCRIPTION: Delete
@@ -230,6 +236,7 @@ bs:
     ResetFilter: Reset
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'No delete permissions'
+    EditPermissionsFailure: 'No permission to unlink record'
   GridFieldDetailForm:
     CancelBtn: Cancel
     Create: Create
@@ -237,7 +244,9 @@ bs:
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
     Save: Save
-    Saved: 'Saved %s %s'
+    Saved: 'Saved {name} {link}'
+  GridFieldEditButton.ss:
+    EDIT: Edit
   GridFieldItemEditView.ss: null
   Group:
     AddRole: 'Add a role for this group'
@@ -267,6 +276,7 @@ bs:
     ADDURL: 'Add URL'
     ADJUSTDETAILSDIMENSIONS: 'Details & dimensions'
     ANCHORVALUE: Sidro
+    BUTTONADDURL: 'Add url'
     BUTTONINSERT: Insert
     BUTTONINSERTLINK: 'Ubaci link'
     BUTTONREMOVELINK: 'Ukloni link'
@@ -293,7 +303,7 @@ bs:
     IMAGETITLE: 'Title text (tooltip) - for additional information about the image'
     IMAGETITLETEXT: 'Title text (tooltip)'
     IMAGETITLETEXTDESC: 'For additional information about the image'
-    IMAGEWIDTHPX: Širina
+    IMAGEWIDTHPX: 'Širina'
     INSERTMEDIA: 'Insert Media'
     LINK: Link
     LINKANCHOR: 'Sidro na ovoj stranici'
@@ -331,7 +341,10 @@ bs:
     PreviewButton: Preview
     REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
     SAVEDUP: Saved.
-    VersionUnknown: unknown
+    ShowAsList: 'show as list'
+    TooManyPages: 'Too many pages'
+    ValidationError: 'Validation error'
+    VersionUnknown: Unknown
   LeftAndMain_Menu.ss:
     Hello: Hi
     LOGOUT: 'Log out'
@@ -365,7 +378,7 @@ bs:
     INVALIDNEWPASSWORD: 'We couldn''t accept that password: {password}'
     LOGGEDINAS: 'You''re logged in as {name}.'
     NEWPASSWORD: 'Nova šifra'
-    PASSWORD: Šifra
+    PASSWORD: 'Šifra'
     PLURALNAME: Members
     REMEMBERME: 'Zapamti me slijedeći put'
     SINGULARNAME: Member
@@ -407,6 +420,7 @@ bs:
     TWODIGITMONTH: 'Two-digit month (01=January, etc.)'
     TWODIGITSECOND: 'Two digits of second (00 through 59)'
     TWODIGITYEAR: 'Two-digit year'
+    Toggle: 'Show formatting help'
   MemberImportForm:
     Help1: '<p>Import users in <em>CSV format</em> (comma-separated values). <small><a href="#" class="toggle-advanced">Show advanced usage</a></small></p>'
     Help2: '<div class="advanced">	<h4>Advanced usage</h4>	<ul>	<li>Allowed columns: <em>%s</em></li>	<li>Existing users are matched by their unique <em>Code</em> property, and updated with any new values from	the imported file.</li>	<li>Groups can be assigned by the <em>Groups</em> column. Groups are identified by their <em>Code</em> property,	multiple groups can be separated by comma. Existing group memberships are not cleared.</li>	</ul></div>'
@@ -421,7 +435,7 @@ bs:
   ModelAdmin:
     DELETE: Delete
     DELETEDRECORDS: 'Deleted {count} records.'
-    EMPTYBEFOREIMPORT: 'Clear Database before import'
+    EMPTYBEFOREIMPORT: 'Replace data'
     IMPORT: 'Import from CSV'
     IMPORTEDRECORDS: 'Imported {count} records.'
     NOCSVFILE: 'Please browse for a CSV file to import'
@@ -515,7 +529,20 @@ bs:
     BtnImport: 'Import from CSV'
     FileFieldLabel: 'CSV File <small>(Allowed extensions: *.csv)</small>'
   SilverStripeNavigator:
+    Auto: Auto
+    ChangeViewMode: 'Change view mode'
+    Desktop: Desktop
+    DualWindowView: 'Dual Window'
     Edit: Edit
+    EditView: 'Edit mode'
+    Mobile: Mobile
+    PreviewState: 'Preview State'
+    PreviewView: 'Preview mode'
+    Responsive: Responsive
+    SplitView: 'Split mode'
+    Tablet: Tablet
+    ViewDeviceWidth: 'Select a preview width'
+    Width: width
   SimpleImageField:
     NOUPLOAD: 'Nijedna slika nije postavljena'
   SiteTree:
@@ -527,7 +554,7 @@ bs:
     ADDITEM: 'Add %s'
   TableListField:
     CSVEXPORT: 'Izvezi u CSV'
-    PRINT: Štampaj
+    PRINT: 'Štampaj'
     Print: Print
     SELECT: 'Select:'
   TableListField.ss:
@@ -551,6 +578,8 @@ bs:
     ATTACHFILE: 'Attach a file'
     ATTACHFILES: 'Attach files'
     AttachFile: 'Attach file(s)'
+    CHOOSEANOTHERFILE: 'Choose another file'
+    CHOOSEANOTHERINFO: 'Replace this file with another one from the file store'
     DELETE: 'Delete from files'
     DELETEINFO: 'Permanently delete this file from the file store'
     DOEDIT: Save
@@ -565,12 +594,15 @@ bs:
     FROMFILES: 'From files'
     HOTLINKINFO: 'Info: This image will be hotlinked. Please ensure you have permissions from the original site creator to do so.'
     MAXNUMBEROFFILES: 'Max number of {count} file(s) exceeded.'
+    MAXNUMBEROFFILESONE: 'Can only upload one file'
     MAXNUMBEROFFILESSHORT: 'Can only upload {count} files'
+    OVERWRITEWARNING: 'File with the same name already exists'
     REMOVE: Remove
     REMOVEERROR: 'Error removing file'
     REMOVEINFO: 'Remove this file from here, but do not delete it from the file store'
     STARTALL: 'Start all'
     STARTALLINFO: 'Start all uploads'
     Saved: Saved
+    UPLOADSINTO: 'saves into /{path}'
   Versioned:
     has_many_Versions: Versions

lang/ca.yml

@@ -2,6 +2,7 @@ ca:
   AssetAdmin:
     ALLOWEDEXTS: 'Allowed extensions'
     NEWFOLDER: NovaCarpeta
+    SHOWALLOWEDEXTS: 'Show allowed extensions'
   AssetTableField:
     CREATED: 'Carregat per primer cop'
     DIM: Dimensions
@@ -59,9 +60,9 @@ ca:
     ERRORNOTADMIN: 'Aquest usuari no és un administrador.'
     ERRORNOTREC: 'Aquest nom d''usuari / contrasenya no es reconeix'
   Boolean:
-    0: 'False'
     ANY: Any
-    1: 'True'
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   CMSLoadingScreen.ss:
     LOADING: Loading...
     REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
@@ -70,6 +71,8 @@ ca:
     ACCESSALLINTERFACES: 'Access to all CMS sections'
     ACCESSALLINTERFACESHELP: 'Overrules more specific access settings.'
     SAVE: Desa
+  CMSPageHistoryController_versions.ss:
+    PREVIEW: 'Website preview'
   CMSProfileController:
     MENUTITLE: 'My Profile'
   ChangePasswordEmail.ss:
@@ -79,8 +82,8 @@ ca:
     HELLO: Hola
     PASSWORD: Contrasenya
   CheckboxField:
-    - 'False'
-    - 'True'
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   ComplexTableField:
     CLOSEPOPUP: 'Tanca la finestra'
     SUCCESSADD2: 'Added {name}'
@@ -109,20 +112,21 @@ ca:
     PLURALNAME: 'Objectes de dades'
     SINGULARNAME: 'Objecte de dades'
   Date:
-    DAY: dia
-    DAYS: dies
-    HOUR: hora
-    HOURS: hores
-    MIN: minut
-    MINS: minuts
-    MONTH: mes
-    MONTHS: mesos
-    SEC: segon
-    SECS: segons
+    DAY: day
+    DAYS: days
+    HOUR: hour
+    HOURS: hours
+    LessThanMinuteAgo: 'less than a minute'
+    MIN: min
+    MINS: mins
+    MONTH: month
+    MONTHS: months
+    SEC: sec
+    SECS: secs
     TIMEDIFFAGO: '{difference} ago'
     TIMEDIFFIN: 'in {difference}'
-    YEAR: any
-    YEARS: anys
+    YEAR: year
+    YEARS: years
   DateField:
     NOTSET: 'no definit'
     TODAY: avui
@@ -198,7 +202,8 @@ ca:
     TEXT2: 'enllaç de reinici de la contrasenya'
     TEXT3: per
   Form:
-    FIELDISREQUIRED: 'Es requereix %s'
+    CSRF_FAILED_MESSAGE: 'There seems to have been a technical problem. Please click the back button, refresh your browser, and try again.'
+    FIELDISREQUIRED: '{name} is required'
     SubmitBtnLabel: Go
     VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
     VALIDATIONNOTUNIQUE: 'El valor que heu introduït no és únic'
@@ -208,6 +213,7 @@ ca:
     VALIDATOR: Validador
     VALIDCURRENCY: 'Please enter a valid currency'
   FormField:
+    Example: 'e.g. %s'
     NONE: cap
   GridAction:
     DELETE_DESCRIPTION: Delete
@@ -230,6 +236,7 @@ ca:
     ResetFilter: Reset
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'No delete permissions'
+    EditPermissionsFailure: 'No permission to unlink record'
   GridFieldDetailForm:
     CancelBtn: Cancel
     Create: Create
@@ -237,7 +244,9 @@ ca:
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
     Save: Save
-    Saved: 'Saved %s %s'
+    Saved: 'Saved {name} {link}'
+  GridFieldEditButton.ss:
+    EDIT: Edit
   GridFieldItemEditView.ss: null
   Group:
     AddRole: 'Add a role for this group'
@@ -267,6 +276,7 @@ ca:
     ADDURL: 'Add URL'
     ADJUSTDETAILSDIMENSIONS: 'Details & dimensions'
     ANCHORVALUE: Ancla
+    BUTTONADDURL: 'Add url'
     BUTTONINSERT: Insert
     BUTTONINSERTLINK: 'Insereix un enllaç'
     BUTTONREMOVELINK: 'Suprimeix un enllaç'
@@ -304,7 +314,7 @@ ca:
     LINKINTERNAL: 'Pàgina del lloc web'
     LINKOPENNEWWIN: 'Obrir l''enllaç a una nova finestra?'
     LINKTO: 'Enllaça a'
-    PAGE: Pàgina
+    PAGE: 'Pàgina'
     URL: URL
     URLNOTANOEMBEDRESOURCE: 'The URL ''{url}'' could not be turned into a media resource.'
     UpdateMEDIA: 'Update Media'
@@ -331,7 +341,10 @@ ca:
     PreviewButton: Preview
     REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
     SAVEDUP: Saved.
-    VersionUnknown: unknown
+    ShowAsList: 'show as list'
+    TooManyPages: 'Too many pages'
+    ValidationError: 'Validation error'
+    VersionUnknown: Unknown
   LeftAndMain_Menu.ss:
     Hello: Hi
     LOGOUT: 'Log out'
@@ -407,6 +420,7 @@ ca:
     TWODIGITMONTH: 'Two-digit month (01=January, etc.)'
     TWODIGITSECOND: 'Two digits of second (00 through 59)'
     TWODIGITYEAR: 'Two-digit year'
+    Toggle: 'Show formatting help'
   MemberImportForm:
     Help1: '<p>Import users in <em>CSV format</em> (comma-separated values). <small><a href="#" class="toggle-advanced">Show advanced usage</a></small></p>'
     Help2: '<div class="advanced">	<h4>Advanced usage</h4>	<ul>	<li>Allowed columns: <em>%s</em></li>	<li>Existing users are matched by their unique <em>Code</em> property, and updated with any new values from	the imported file.</li>	<li>Groups can be assigned by the <em>Groups</em> column. Groups are identified by their <em>Code</em> property,	multiple groups can be separated by comma. Existing group memberships are not cleared.</li>	</ul></div>'
@@ -421,7 +435,7 @@ ca:
   ModelAdmin:
     DELETE: Suprimeix
     DELETEDRECORDS: 'Deleted {count} records.'
-    EMPTYBEFOREIMPORT: 'Clear Database before import'
+    EMPTYBEFOREIMPORT: 'Replace data'
     IMPORT: 'Importa de CSV'
     IMPORTEDRECORDS: 'Imported {count} records.'
     NOCSVFILE: 'Si us plau, cerqueu el fitxer CSV per a importar'
@@ -515,7 +529,20 @@ ca:
     BtnImport: 'Import from CSV'
     FileFieldLabel: 'CSV File <small>(Allowed extensions: *.csv)</small>'
   SilverStripeNavigator:
+    Auto: Auto
+    ChangeViewMode: 'Change view mode'
+    Desktop: Desktop
+    DualWindowView: 'Dual Window'
     Edit: Edit
+    EditView: 'Edit mode'
+    Mobile: Mobile
+    PreviewState: 'Preview State'
+    PreviewView: 'Preview mode'
+    Responsive: Responsive
+    SplitView: 'Split mode'
+    Tablet: Tablet
+    ViewDeviceWidth: 'Select a preview width'
+    Width: width
   SimpleImageField:
     NOUPLOAD: 'No heu carregat cap imatge'
   SiteTree:
@@ -551,6 +578,8 @@ ca:
     ATTACHFILE: 'Attach a file'
     ATTACHFILES: 'Attach files'
     AttachFile: 'Attach file(s)'
+    CHOOSEANOTHERFILE: 'Choose another file'
+    CHOOSEANOTHERINFO: 'Replace this file with another one from the file store'
     DELETE: 'Delete from files'
     DELETEINFO: 'Permanently delete this file from the file store'
     DOEDIT: Save
@@ -565,12 +594,15 @@ ca:
     FROMFILES: 'From files'
     HOTLINKINFO: 'Info: This image will be hotlinked. Please ensure you have permissions from the original site creator to do so.'
     MAXNUMBEROFFILES: 'Max number of {count} file(s) exceeded.'
+    MAXNUMBEROFFILESONE: 'Can only upload one file'
     MAXNUMBEROFFILESSHORT: 'Can only upload {count} files'
+    OVERWRITEWARNING: 'File with the same name already exists'
     REMOVE: Remove
     REMOVEERROR: 'Error removing file'
     REMOVEINFO: 'Remove this file from here, but do not delete it from the file store'
     STARTALL: 'Start all'
     STARTALLINFO: 'Start all uploads'
     Saved: Saved
+    UPLOADSINTO: 'saves into /{path}'
   Versioned:
     has_many_Versions: Versions

lang/cs.yml

@@ -2,6 +2,7 @@ cs:
   AssetAdmin:
     ALLOWEDEXTS: 'Povolené extenze'
     NEWFOLDER: 'Nová složka'
+    SHOWALLOWEDEXTS: 'Show allowed extensions'
   AssetTableField:
     CREATED: 'Poprvé nahráno'
     DIM: Rozměry
@@ -59,9 +60,9 @@ cs:
     ERRORNOTADMIN: 'Tento uživatel není administrátor.'
     ERRORNOTREC: 'Toto uživatelské jméno / heslo nebylo rozpoznáno'
   Boolean:
-    0: Ne
     ANY: Jakkýkoliv
-    1: Ano
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   CMSLoadingScreen.ss:
     LOADING: Nahrávání...
     REQUIREJS: 'CMS vyžaduje, aby jste měli JavaScript zapnut.'
@@ -70,6 +71,8 @@ cs:
     ACCESSALLINTERFACES: 'Přístup ke všem sekcím CMS'
     ACCESSALLINTERFACESHELP: 'Prepíše více specifické nastavení přístupu.'
     SAVE: Uložit
+  CMSPageHistoryController_versions.ss:
+    PREVIEW: 'Website preview'
   CMSProfileController:
     MENUTITLE: 'Můj profil'
   ChangePasswordEmail.ss:
@@ -79,8 +82,8 @@ cs:
     HELLO: 'Dobrý den'
     PASSWORD: Heslo
   CheckboxField:
-    - Ne
-    - Ano
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   ComplexTableField:
     CLOSEPOPUP: Zavřít
     SUCCESSADD2: 'Přidáno {name}'
@@ -109,20 +112,21 @@ cs:
     PLURALNAME: 'Datové objekty'
     SINGULARNAME: 'Datový objekt'
   Date:
-    DAY: den
-    DAYS: dny
-    HOUR: hodina
-    HOURS: hodiny
-    MIN: minuta
-    MINS: minuty
-    MONTH: měsíc
-    MONTHS: měsíce
-    SEC: sekunda
-    SECS: sekundy
+    DAY: day
+    DAYS: days
+    HOUR: hour
+    HOURS: hours
+    LessThanMinuteAgo: 'less than a minute'
+    MIN: min
+    MINS: mins
+    MONTH: month
+    MONTHS: months
+    SEC: sec
+    SECS: secs
     TIMEDIFFAGO: 'před {difference}'
     TIMEDIFFIN: 'v {difference}'
-    YEAR: rok
-    YEARS: roky
+    YEAR: year
+    YEARS: years
   DateField:
     NOTSET: nenastaveno
     TODAY: dnes
@@ -198,7 +202,8 @@ cs:
     TEXT2: 'odkaz na reset hesla'
     TEXT3: pro
   Form:
-    FIELDISREQUIRED: '%s je požadováno.'
+    CSRF_FAILED_MESSAGE: 'There seems to have been a technical problem. Please click the back button, refresh your browser, and try again.'
+    FIELDISREQUIRED: '{name} is required'
     SubmitBtnLabel: Jdi
     VALIDATIONCREDITNUMBER: 'Prosím ujistěte se, že jste zadal/a {number} číslo kreditní karty správně'
     VALIDATIONNOTUNIQUE: 'Zadaná hodnota není unikátní'
@@ -208,6 +213,7 @@ cs:
     VALIDATOR: Validátor
     VALIDCURRENCY: 'Prosím zadejte platnou měnu'
   FormField:
+    Example: 'e.g. %s'
     NONE: žádný
   GridAction:
     DELETE_DESCRIPTION: Smazat
@@ -230,6 +236,7 @@ cs:
     ResetFilter: Resetovat
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'Žádná oprávnění mazat'
+    EditPermissionsFailure: 'No permission to unlink record'
   GridFieldDetailForm:
     CancelBtn: Storno
     Create: Vytvořit
@@ -237,7 +244,9 @@ cs:
     DeletePermissionsFailure: 'Žádná oprávnění mazat'
     Deleted: 'Smazáno %s %s'
     Save: Uložit
-    Saved: 'Uloženo %s %s'
+    Saved: 'Saved {name} {link}'
+  GridFieldEditButton.ss:
+    EDIT: Edit
   GridFieldItemEditView.ss: null
   Group:
     AddRole: 'Přidat roli pro tuto skupinu'
@@ -267,6 +276,7 @@ cs:
     ADDURL: 'Přidat URL'
     ADJUSTDETAILSDIMENSIONS: 'Detaily & rozměry'
     ANCHORVALUE: 'Záložka (kotva)'
+    BUTTONADDURL: 'Add url'
     BUTTONINSERT: Vložit
     BUTTONINSERTLINK: 'Vložit odkaz'
     BUTTONREMOVELINK: 'Odstranit odkaz'
@@ -293,7 +303,7 @@ cs:
     IMAGETITLE: 'Titul text (tooltip) - další informace o obrázku'
     IMAGETITLETEXT: 'Titulek textu (tooltip)'
     IMAGETITLETEXTDESC: 'Pro další informace o obrázku'
-    IMAGEWIDTHPX: Šířka
+    IMAGEWIDTHPX: 'Šířka'
     INSERTMEDIA: 'Vložit média'
     LINK: 'Vložit nebo upravit odkaz'
     LINKANCHOR: 'Záložka (kotva) na stránce'
@@ -331,7 +341,10 @@ cs:
     PreviewButton: Náhled
     REORGANISATIONSUCCESSFUL: 'Strom webu reorganizován úspěšně.'
     SAVEDUP: Uloženo.
-    VersionUnknown: neznáme
+    ShowAsList: 'show as list'
+    TooManyPages: 'Too many pages'
+    ValidationError: 'Validation error'
+    VersionUnknown: Unknown
   LeftAndMain_Menu.ss:
     Hello: Ahoj
     LOGOUT: 'Odhlásit se'
@@ -407,6 +420,7 @@ cs:
     TWODIGITMONTH: 'Dvojčíslí měsíce (01=Leden, atď.)'
     TWODIGITSECOND: 'Dvojčíslí vteřiny (00 až 59)'
     TWODIGITYEAR: 'Dvojčíslí roku'
+    Toggle: 'Show formatting help'
   MemberImportForm:
     Help1: '<p>Import členů v <em>CSV formátu</em> (čárkou-oddělené hodnoty). <small><a href="#" class="toggle-advanced">Zobrazit rozšířené použití</a></small></p>'
     Help2: "<div class=\"advanced\">\\n<h4>Pokročilé použití</h4>\\n<ul>\\n<li>Povolené sloupce: <em>%s</em></li>\\n<li>Existující uživatelé jsou porovnáni jejich unikátní vlastností <em>Code</em>, a aktualizováni s novými hodnotami z importovaného souboru.</li>\\n<li>Skupiny mohou být přiřazeny sloupcem <em>Groups</em>. Skupiny jsou identifikovány svojí vlastností <em>Code</em>, více skupin může být odděleno čárkou. Existující členství ve skupině nejsou smazána.</li>\\n</ul>\\n</div>"
@@ -421,7 +435,7 @@ cs:
   ModelAdmin:
     DELETE: Smazat
     DELETEDRECORDS: 'Smazáno {count} záznamů.'
-    EMPTYBEFOREIMPORT: 'Vyčistit databázi před importováním'
+    EMPTYBEFOREIMPORT: 'Replace data'
     IMPORT: 'Importovat ze souboru CSV'
     IMPORTEDRECORDS: 'Importováno {count} záznamů.'
     NOCSVFILE: 'Prosím, vyhledejte soubor CSV pro import'
@@ -515,7 +529,20 @@ cs:
     BtnImport: Import
     FileFieldLabel: 'Soubor CSV <small>(Povoleny přípony: *.csv)</small>'
   SilverStripeNavigator:
+    Auto: Auto
+    ChangeViewMode: 'Change view mode'
+    Desktop: Desktop
+    DualWindowView: 'Dual Window'
     Edit: Editovat
+    EditView: 'Edit mode'
+    Mobile: Mobile
+    PreviewState: 'Preview State'
+    PreviewView: 'Preview mode'
+    Responsive: Responsive
+    SplitView: 'Split mode'
+    Tablet: Tablet
+    ViewDeviceWidth: 'Select a preview width'
+    Width: width
   SimpleImageField:
     NOUPLOAD: 'Nebyl nahrán žádný obrázek'
   SiteTree:
@@ -551,6 +578,8 @@ cs:
     ATTACHFILE: 'Připojit soubor'
     ATTACHFILES: 'Připojit soubory'
     AttachFile: 'Připojit soubor(y)'
+    CHOOSEANOTHERFILE: 'Choose another file'
+    CHOOSEANOTHERINFO: 'Replace this file with another one from the file store'
     DELETE: 'Smazat ze souborů'
     DELETEINFO: 'Trvale odstranit tento soubor z úložiště souborů'
     DOEDIT: Uložit
@@ -565,12 +594,15 @@ cs:
     FROMFILES: 'Ze souborů'
     HOTLINKINFO: 'Info: Tento obrázek bude "hotlinkován". Ujistěte se prosím, že máte oprávnění od původního tvůrce webu, aby se tak stalo.'
     MAXNUMBEROFFILES: 'Maximální počet {count} soubor(ů) překročen.'
+    MAXNUMBEROFFILESONE: 'Can only upload one file'
     MAXNUMBEROFFILESSHORT: 'Můžete nahrát pouze {count} souborů'
+    OVERWRITEWARNING: 'File with the same name already exists'
     REMOVE: Odstranit
     REMOVEERROR: 'Chyba odstranění souboru'
     REMOVEINFO: 'Odtranit tento soubor odsud, ale nesmazat ho z úložiště souborů'
     STARTALL: 'Začni vše'
     STARTALLINFO: 'Začni vše nahrávat'
     Saved: Uloženo
+    UPLOADSINTO: 'saves into /{path}'
   Versioned:
     has_many_Versions: Verze

lang/da.yml

@@ -2,6 +2,7 @@ da:
   AssetAdmin:
     ALLOWEDEXTS: 'Allowed extensions'
     NEWFOLDER: 'Ny mappe'
+    SHOWALLOWEDEXTS: 'Show allowed extensions'
   AssetTableField:
     CREATED: 'Først uploadet'
     DIM: Dimensioner
@@ -59,9 +60,9 @@ da:
     ERRORNOTADMIN: 'That user is not an administrator.'
     ERRORNOTREC: 'That username / password isn''t recognised'
   Boolean:
-    0: 'False'
     ANY: Any
-    1: 'True'
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   CMSLoadingScreen.ss:
     LOADING: Loading...
     REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
@@ -70,6 +71,8 @@ da:
     ACCESSALLINTERFACES: 'Adgang til alle CMS grænseflader'
     ACCESSALLINTERFACESHELP: 'Overrules more specific access settings.'
     SAVE: Gem
+  CMSPageHistoryController_versions.ss:
+    PREVIEW: 'Website preview'
   CMSProfileController:
     MENUTITLE: 'My Profile'
   ChangePasswordEmail.ss:
@@ -79,8 +82,8 @@ da:
     HELLO: Hi
     PASSWORD: Password
   CheckboxField:
-    - 'False'
-    - 'True'
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   ComplexTableField:
     CLOSEPOPUP: 'Luk popup'
     SUCCESSADD2: 'Added {name}'
@@ -109,20 +112,21 @@ da:
     PLURALNAME: 'Data Objects'
     SINGULARNAME: 'Data Object'
   Date:
-    DAY: ' day'
-    DAYS: ' days'
-    HOUR: ' hour'
-    HOURS: ' hours'
-    MIN: ' min'
-    MINS: ' mins'
-    MONTH: ' month'
-    MONTHS: ' months'
-    SEC: ' sec'
-    SECS: ' secs'
+    DAY: day
+    DAYS: days
+    HOUR: hour
+    HOURS: hours
+    LessThanMinuteAgo: 'less than a minute'
+    MIN: min
+    MINS: mins
+    MONTH: month
+    MONTHS: months
+    SEC: sec
+    SECS: secs
     TIMEDIFFAGO: '{difference} ago'
     TIMEDIFFIN: 'in {difference}'
-    YEAR: ' year'
-    YEARS: ' years'
+    YEAR: year
+    YEARS: years
   DateField:
     NOTSET: 'not set'
     TODAY: today
@@ -198,7 +202,8 @@ da:
     TEXT2: 'password reset link'
     TEXT3: for
   Form:
-    FIELDISREQUIRED: '%s is required'
+    CSRF_FAILED_MESSAGE: 'There seems to have been a technical problem. Please click the back button, refresh your browser, and try again.'
+    FIELDISREQUIRED: '{name} is required'
     SubmitBtnLabel: Go
     VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
     VALIDATIONNOTUNIQUE: 'The value entered is not unique'
@@ -208,6 +213,7 @@ da:
     VALIDATOR: Validator
     VALIDCURRENCY: 'Please enter a valid currency'
   FormField:
+    Example: 'e.g. %s'
     NONE: none
   GridAction:
     DELETE_DESCRIPTION: Delete
@@ -230,6 +236,7 @@ da:
     ResetFilter: Reset
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'No delete permissions'
+    EditPermissionsFailure: 'No permission to unlink record'
   GridFieldDetailForm:
     CancelBtn: Cancel
     Create: Create
@@ -237,7 +244,9 @@ da:
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
     Save: Save
-    Saved: 'Saved %s %s'
+    Saved: 'Saved {name} {link}'
+  GridFieldEditButton.ss:
+    EDIT: Edit
   GridFieldItemEditView.ss: null
   Group:
     AddRole: 'Add a role for this group'
@@ -267,6 +276,7 @@ da:
     ADDURL: 'Add URL'
     ADJUSTDETAILSDIMENSIONS: 'Details & dimensions'
     ANCHORVALUE: Anchor
+    BUTTONADDURL: 'Add url'
     BUTTONINSERT: Insert
     BUTTONINSERTLINK: 'Insert link'
     BUTTONREMOVELINK: 'Remove link'
@@ -331,7 +341,10 @@ da:
     PreviewButton: Preview
     REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
     SAVEDUP: Saved.
-    VersionUnknown: unknown
+    ShowAsList: 'show as list'
+    TooManyPages: 'Too many pages'
+    ValidationError: 'Validation error'
+    VersionUnknown: Unknown
   LeftAndMain_Menu.ss:
     Hello: Hi
     LOGOUT: 'Log out'
@@ -407,6 +420,7 @@ da:
     TWODIGITMONTH: 'Two-digit month (01=January, etc.)'
     TWODIGITSECOND: 'Two digits of second (00 through 59)'
     TWODIGITYEAR: 'Two-digit year'
+    Toggle: 'Show formatting help'
   MemberImportForm:
     Help1: '<p>Import users in <em>CSV format</em> (comma-separated values). <small><a href="#" class="toggle-advanced">Show advanced usage</a></small></p>'
     Help2: '<div class="advanced">	<h4>Advanced usage</h4>	<ul>	<li>Allowed columns: <em>%s</em></li>	<li>Existing users are matched by their unique <em>Code</em> property, and updated with any new values from	the imported file.</li>	<li>Groups can be assigned by the <em>Groups</em> column. Groups are identified by their <em>Code</em> property,	multiple groups can be separated by comma. Existing group memberships are not cleared.</li>	</ul></div>'
@@ -421,7 +435,7 @@ da:
   ModelAdmin:
     DELETE: Slet
     DELETEDRECORDS: 'Deleted {count} records.'
-    EMPTYBEFOREIMPORT: 'Clear Database before import'
+    EMPTYBEFOREIMPORT: 'Replace data'
     IMPORT: 'Importer fra CSV'
     IMPORTEDRECORDS: 'Imported {count} records.'
     NOCSVFILE: 'Tryk p&aring; Gennemse for at v&aelig;lge en CSVfil til importering'
@@ -515,7 +529,20 @@ da:
     BtnImport: 'Import from CSV'
     FileFieldLabel: 'CSV File <small>(Allowed extensions: *.csv)</small>'
   SilverStripeNavigator:
+    Auto: Auto
+    ChangeViewMode: 'Change view mode'
+    Desktop: Desktop
+    DualWindowView: 'Dual Window'
     Edit: Edit
+    EditView: 'Edit mode'
+    Mobile: Mobile
+    PreviewState: 'Preview State'
+    PreviewView: 'Preview mode'
+    Responsive: Responsive
+    SplitView: 'Split mode'
+    Tablet: Tablet
+    ViewDeviceWidth: 'Select a preview width'
+    Width: width
   SimpleImageField:
     NOUPLOAD: 'No Image Uploaded'
   SiteTree:
@@ -551,6 +578,8 @@ da:
     ATTACHFILE: 'Attach a file'
     ATTACHFILES: 'Attach files'
     AttachFile: 'Attach file(s)'
+    CHOOSEANOTHERFILE: 'Choose another file'
+    CHOOSEANOTHERINFO: 'Replace this file with another one from the file store'
     DELETE: 'Delete from files'
     DELETEINFO: 'Permanently delete this file from the file store'
     DOEDIT: Save
@@ -565,12 +594,15 @@ da:
     FROMFILES: 'From files'
     HOTLINKINFO: 'Info: This image will be hotlinked. Please ensure you have permissions from the original site creator to do so.'
     MAXNUMBEROFFILES: 'Max number of {count} file(s) exceeded.'
+    MAXNUMBEROFFILESONE: 'Can only upload one file'
     MAXNUMBEROFFILESSHORT: 'Can only upload {count} files'
+    OVERWRITEWARNING: 'File with the same name already exists'
     REMOVE: Remove
     REMOVEERROR: 'Error removing file'
     REMOVEINFO: 'Remove this file from here, but do not delete it from the file store'
     STARTALL: 'Start all'
     STARTALLINFO: 'Start all uploads'
     Saved: Saved
+    UPLOADSINTO: 'saves into /{path}'
   Versioned:
     has_many_Versions: Versions

lang/de.yml

@@ -2,6 +2,7 @@ de:
   AssetAdmin:
     ALLOWEDEXTS: 'Allowed extensions'
     NEWFOLDER: 'Neuer Ordner'
+    SHOWALLOWEDEXTS: 'Show allowed extensions'
   AssetTableField:
     CREATED: 'Erstmalig hochgeladen'
     DIM: Dimensionen
@@ -59,9 +60,9 @@ de:
     ERRORNOTADMIN: 'Dieser Nutzer ist kein Administrator'
     ERRORNOTREC: 'Dieser/s  Nutzername/Passwort wurde nicht erkannt'
   Boolean:
-    0: Nein
     ANY: alle
-    1: Ja
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   CMSLoadingScreen.ss:
     LOADING: 'Lade Daten ...'
     REQUIREJS: 'Für die Benutzung des CMS wird JavaScript benötigt.'
@@ -70,6 +71,8 @@ de:
     ACCESSALLINTERFACES: 'Zugriff auf alle Bereiche des CMS'
     ACCESSALLINTERFACESHELP: 'Hebt alle bereichspezifischen Berechtigungen auf.'
     SAVE: Speichern
+  CMSPageHistoryController_versions.ss:
+    PREVIEW: 'Website preview'
   CMSProfileController:
     MENUTITLE: 'Mein Profil'
   ChangePasswordEmail.ss:
@@ -79,8 +82,8 @@ de:
     HELLO: Hi
     PASSWORD: Passwort
   CheckboxField:
-    - Nein
-    - Ja
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   ComplexTableField:
     CLOSEPOPUP: 'Popup schließen'
     SUCCESSADD2: '{name} hinzugefügt'
@@ -109,20 +112,21 @@ de:
     PLURALNAME: DataObjects
     SINGULARNAME: DataObject
   Date:
-    DAY: Tag
-    DAYS: Tage
-    HOUR: Stunde
-    HOURS: Stunden
-    MIN: Minuten
-    MINS: Minuten
-    MONTH: Monat
-    MONTHS: Monat
-    SEC: Sekunden
-    SECS: Sekunden
+    DAY: day
+    DAYS: days
+    HOUR: hour
+    HOURS: hours
+    LessThanMinuteAgo: 'less than a minute'
+    MIN: min
+    MINS: mins
+    MONTH: month
+    MONTHS: months
+    SEC: sec
+    SECS: secs
     TIMEDIFFAGO: 'vor {difference}'
     TIMEDIFFIN: 'in {difference}'
-    YEAR: Jahr
-    YEARS: Jahre
+    YEAR: year
+    YEARS: years
   DateField:
     NOTSET: 'nicht gesetzt'
     TODAY: heute
@@ -198,7 +202,8 @@ de:
     TEXT2: 'Link zum Zurücksetzen des Passworts'
     TEXT3: für
   Form:
-    FIELDISREQUIRED: '%s wird benötigt'
+    CSRF_FAILED_MESSAGE: 'There seems to have been a technical problem. Please click the back button, refresh your browser, and try again.'
+    FIELDISREQUIRED: '{name} is required'
     SubmitBtnLabel: Los
     VALIDATIONCREDITNUMBER: 'Bitte stellen Sie sicher, dass Sie die Kreditkartennummer ({number}) korrekt eingegeben haben'
     VALIDATIONNOTUNIQUE: 'Der eingegebene Wert ist nicht einzigartig'
@@ -208,6 +213,7 @@ de:
     VALIDATOR: Prüfer
     VALIDCURRENCY: 'Bitte geben Sie einen korrekten Betrag ein'
   FormField:
+    Example: 'e.g. %s'
     NONE: keine
   GridAction:
     DELETE_DESCRIPTION: Löschen
@@ -230,6 +236,7 @@ de:
     ResetFilter: Zurücksetzen
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'Keine Berechtigung zum Löschen'
+    EditPermissionsFailure: 'No permission to unlink record'
   GridFieldDetailForm:
     CancelBtn: Abbrechen
     Create: Erstellen
@@ -237,7 +244,9 @@ de:
     DeletePermissionsFailure: 'Keine Berechtigungen zum löschen'
     Deleted: 'Gelöscht %s %s'
     Save: Speichern
-    Saved: 'Gespeichert %s %s'
+    Saved: 'Saved {name} {link}'
+  GridFieldEditButton.ss:
+    EDIT: Edit
   GridFieldItemEditView.ss: null
   Group:
     AddRole: 'Rolle für die Gruppe hinzufügen'
@@ -267,6 +276,7 @@ de:
     ADDURL: 'URL hinzufügen'
     ADJUSTDETAILSDIMENSIONS: 'Details & Dimensionen'
     ANCHORVALUE: Anker
+    BUTTONADDURL: 'Add url'
     BUTTONINSERT: Einfügen
     BUTTONINSERTLINK: 'Verweis einfügen'
     BUTTONREMOVELINK: 'Verweise entfernen'
@@ -331,7 +341,10 @@ de:
     PreviewButton: Vorschau
     REORGANISATIONSUCCESSFUL: 'Der Seitenbaum wurde erfolgreich sortiert.'
     SAVEDUP: Gespeichert.
-    VersionUnknown: Unbekannt
+    ShowAsList: 'show as list'
+    TooManyPages: 'Too many pages'
+    ValidationError: 'Validation error'
+    VersionUnknown: unbekannt
   LeftAndMain_Menu.ss:
     Hello: Hi
     LOGOUT: Ausloggen
@@ -407,6 +420,7 @@ de:
     TWODIGITMONTH: 'Monat mit führender Null (z.B. 01 = Januar, usw.)'
     TWODIGITSECOND: Sekunde
     TWODIGITYEAR: 'Zweistellige Jahreszahl'
+    Toggle: 'Show formatting help'
   MemberImportForm:
     Help1: '<p>Mitglieder im <em>CSV</em>-Format (kommaseparierte Werte) importieren. <small><a href="#" class="toggle-advanced">Erweiterte Nutzung</a></small></p>'
     Help2: "<div class=\"advanced\">\\n<h4>Erweiterte Benutzung</h4>\\n<ul>\\n<li>Gültige Spalten: <em>%s</em></li>\\n<li>Bereits existierende Benutzer werden anhand ihres eindeutigen <em>Code</em> identifiziert und um neue Einträge aus der Importdatei erweitert.</li>\\n<li>Gruppen können in der Spalte <em>Gruppen</em> hinzugefügt werden. Gruppen werden anhand ihres <em>Code</em> erkannt. Mehrere Gruppen werden Komma-separiert eingetragen. Schon zugewiesene Gruppen werden nicht entfernt.</li>\\n</ul>\\n</div>"
@@ -421,7 +435,7 @@ de:
   ModelAdmin:
     DELETE: Löschen
     DELETEDRECORDS: '{count} Datensätze wurden gelöscht.'
-    EMPTYBEFOREIMPORT: 'Datenbank vor Import leeren'
+    EMPTYBEFOREIMPORT: 'Replace data'
     IMPORT: 'CSV Import'
     IMPORTEDRECORDS: '{count} Datensätze wurden importiert.'
     NOCSVFILE: 'Wählen Sie eine CSV-Datei zum Importieren'
@@ -515,7 +529,20 @@ de:
     BtnImport: Import
     FileFieldLabel: 'CSV Datei <small>(Erlaubte Dateierweiterung: *.csv)</small>'
   SilverStripeNavigator:
+    Auto: Auto
+    ChangeViewMode: 'Change view mode'
+    Desktop: Desktop
+    DualWindowView: 'Dual Window'
     Edit: Bearbeiten
+    EditView: 'Edit mode'
+    Mobile: Mobile
+    PreviewState: 'Preview State'
+    PreviewView: 'Preview mode'
+    Responsive: Responsive
+    SplitView: 'Split mode'
+    Tablet: Tablet
+    ViewDeviceWidth: 'Select a preview width'
+    Width: width
   SimpleImageField:
     NOUPLOAD: 'Es wurde kein Bild hochgeladen'
   SiteTree:
@@ -551,6 +578,8 @@ de:
     ATTACHFILE: 'Datei anhängen'
     ATTACHFILES: 'Dateien anhängen'
     AttachFile: 'Dateien anhängen'
+    CHOOSEANOTHERFILE: 'Choose another file'
+    CHOOSEANOTHERINFO: 'Replace this file with another one from the file store'
     DELETE: 'Aus Dateien löschen'
     DELETEINFO: 'Löscht die Datei dauerhaft aus dem Dateisystem'
     DOEDIT: Speichern
@@ -565,12 +594,15 @@ de:
     FROMFILES: 'Von "Dateien"'
     HOTLINKINFO: 'Info: Dieses Bild wird verknüpft. Bitte vergewissere dich die Erlaubnis des Inhabers der Ursprungsseite zu haben.'
     MAXNUMBEROFFILES: 'Maximale Anzahl an {count}  Datei(en) überschritten'
+    MAXNUMBEROFFILESONE: 'Can only upload one file'
     MAXNUMBEROFFILESSHORT: 'SIe können maximal {count} Datei(en) hochladen'
+    OVERWRITEWARNING: 'File with the same name already exists'
     REMOVE: Entfernen
     REMOVEERROR: 'Fehler beim Entfernen der Datei'
     REMOVEINFO: 'Entfernt die Datei von hier, löscht Sie aber nicht aus dem Dateisystem.'
     STARTALL: 'Alle starten'
     STARTALLINFO: 'Alle Uploads starten'
     Saved: Gespeichert
+    UPLOADSINTO: 'saves into /{path}'
   Versioned:
     has_many_Versions: Versionen

lang/el.yml

@@ -2,6 +2,7 @@ el:
   AssetAdmin:
     ALLOWEDEXTS: 'Allowed extensions'
     NEWFOLDER: NewFolder
+    SHOWALLOWEDEXTS: 'Show allowed extensions'
   AssetTableField:
     CREATED: 'First uploaded'
     DIM: Dimensions
@@ -59,9 +60,9 @@ el:
     ERRORNOTADMIN: 'That user is not an administrator.'
     ERRORNOTREC: 'That username / password isn''t recognised'
   Boolean:
-    0: 'False'
     ANY: Any
-    1: 'True'
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   CMSLoadingScreen.ss:
     LOADING: Loading...
     REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
@@ -69,7 +70,9 @@ el:
     ACCESS: 'Access to ''{title}'' section'
     ACCESSALLINTERFACES: 'Access to all CMS sections'
     ACCESSALLINTERFACESHELP: 'Overrules more specific access settings.'
-    SAVE: Αποθήκευση
+    SAVE: 'Αποθήκευση'
+  CMSPageHistoryController_versions.ss:
+    PREVIEW: 'Website preview'
   CMSProfileController:
     MENUTITLE: 'My Profile'
   ChangePasswordEmail.ss:
@@ -79,8 +82,8 @@ el:
     HELLO: Hi
     PASSWORD: Password
   CheckboxField:
-    - 'False'
-    - 'True'
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   ComplexTableField:
     CLOSEPOPUP: 'Close Popup'
     SUCCESSADD2: 'Added {name}'
@@ -109,20 +112,21 @@ el:
     PLURALNAME: 'Data Objects'
     SINGULARNAME: 'Data Object'
   Date:
-    DAY: ' day'
-    DAYS: ' days'
-    HOUR: ' hour'
-    HOURS: ' hours'
-    MIN: ' min'
-    MINS: ' mins'
-    MONTH: ' month'
-    MONTHS: ' months'
-    SEC: ' sec'
-    SECS: ' secs'
+    DAY: day
+    DAYS: days
+    HOUR: hour
+    HOURS: hours
+    LessThanMinuteAgo: 'less than a minute'
+    MIN: min
+    MINS: mins
+    MONTH: month
+    MONTHS: months
+    SEC: sec
+    SECS: secs
     TIMEDIFFAGO: '{difference} ago'
     TIMEDIFFIN: 'in {difference}'
-    YEAR: ' year'
-    YEARS: ' years'
+    YEAR: year
+    YEARS: years
   DateField:
     NOTSET: 'not set'
     TODAY: today
@@ -198,7 +202,8 @@ el:
     TEXT2: 'password reset link'
     TEXT3: for
   Form:
-    FIELDISREQUIRED: '%s is required'
+    CSRF_FAILED_MESSAGE: 'There seems to have been a technical problem. Please click the back button, refresh your browser, and try again.'
+    FIELDISREQUIRED: '{name} is required'
     SubmitBtnLabel: Go
     VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
     VALIDATIONNOTUNIQUE: 'The value entered is not unique'
@@ -208,6 +213,7 @@ el:
     VALIDATOR: Validator
     VALIDCURRENCY: 'Please enter a valid currency'
   FormField:
+    Example: 'e.g. %s'
     NONE: none
   GridAction:
     DELETE_DESCRIPTION: Delete
@@ -230,6 +236,7 @@ el:
     ResetFilter: Reset
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'No delete permissions'
+    EditPermissionsFailure: 'No permission to unlink record'
   GridFieldDetailForm:
     CancelBtn: Cancel
     Create: Create
@@ -237,7 +244,9 @@ el:
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
     Save: Save
-    Saved: 'Saved %s %s'
+    Saved: 'Saved {name} {link}'
+  GridFieldEditButton.ss:
+    EDIT: Edit
   GridFieldItemEditView.ss: null
   Group:
     AddRole: 'Add a role for this group'
@@ -267,6 +276,7 @@ el:
     ADDURL: 'Add URL'
     ADJUSTDETAILSDIMENSIONS: 'Details & dimensions'
     ANCHORVALUE: Anchor
+    BUTTONADDURL: 'Add url'
     BUTTONINSERT: Insert
     BUTTONINSERTLINK: 'Insert link'
     BUTTONREMOVELINK: 'Remove link'
@@ -331,7 +341,10 @@ el:
     PreviewButton: Preview
     REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
     SAVEDUP: Saved.
-    VersionUnknown: unknown
+    ShowAsList: 'show as list'
+    TooManyPages: 'Too many pages'
+    ValidationError: 'Validation error'
+    VersionUnknown: Unknown
   LeftAndMain_Menu.ss:
     Hello: Hi
     LOGOUT: 'Log out'
@@ -407,6 +420,7 @@ el:
     TWODIGITMONTH: 'Two-digit month (01=January, etc.)'
     TWODIGITSECOND: 'Two digits of second (00 through 59)'
     TWODIGITYEAR: 'Two-digit year'
+    Toggle: 'Show formatting help'
   MemberImportForm:
     Help1: '<p>Import users in <em>CSV format</em> (comma-separated values). <small><a href="#" class="toggle-advanced">Show advanced usage</a></small></p>'
     Help2: '<div class="advanced">	<h4>Advanced usage</h4>	<ul>	<li>Allowed columns: <em>%s</em></li>	<li>Existing users are matched by their unique <em>Code</em> property, and updated with any new values from	the imported file.</li>	<li>Groups can be assigned by the <em>Groups</em> column. Groups are identified by their <em>Code</em> property,	multiple groups can be separated by comma. Existing group memberships are not cleared.</li>	</ul></div>'
@@ -421,7 +435,7 @@ el:
   ModelAdmin:
     DELETE: Delete
     DELETEDRECORDS: 'Deleted {count} records.'
-    EMPTYBEFOREIMPORT: 'Clear Database before import'
+    EMPTYBEFOREIMPORT: 'Replace data'
     IMPORT: 'Import from CSV'
     IMPORTEDRECORDS: 'Imported {count} records.'
     NOCSVFILE: 'Please browse for a CSV file to import'
@@ -515,7 +529,20 @@ el:
     BtnImport: 'Import from CSV'
     FileFieldLabel: 'CSV File <small>(Allowed extensions: *.csv)</small>'
   SilverStripeNavigator:
+    Auto: Auto
+    ChangeViewMode: 'Change view mode'
+    Desktop: Desktop
+    DualWindowView: 'Dual Window'
     Edit: Edit
+    EditView: 'Edit mode'
+    Mobile: Mobile
+    PreviewState: 'Preview State'
+    PreviewView: 'Preview mode'
+    Responsive: Responsive
+    SplitView: 'Split mode'
+    Tablet: Tablet
+    ViewDeviceWidth: 'Select a preview width'
+    Width: width
   SimpleImageField:
     NOUPLOAD: 'No Image Uploaded'
   SiteTree:
@@ -551,6 +578,8 @@ el:
     ATTACHFILE: 'Attach a file'
     ATTACHFILES: 'Attach files'
     AttachFile: 'Attach file(s)'
+    CHOOSEANOTHERFILE: 'Choose another file'
+    CHOOSEANOTHERINFO: 'Replace this file with another one from the file store'
     DELETE: 'Delete from files'
     DELETEINFO: 'Permanently delete this file from the file store'
     DOEDIT: Save
@@ -565,12 +594,15 @@ el:
     FROMFILES: 'From files'
     HOTLINKINFO: 'Info: This image will be hotlinked. Please ensure you have permissions from the original site creator to do so.'
     MAXNUMBEROFFILES: 'Max number of {count} file(s) exceeded.'
+    MAXNUMBEROFFILESONE: 'Can only upload one file'
     MAXNUMBEROFFILESSHORT: 'Can only upload {count} files'
+    OVERWRITEWARNING: 'File with the same name already exists'
     REMOVE: Remove
     REMOVEERROR: 'Error removing file'
     REMOVEINFO: 'Remove this file from here, but do not delete it from the file store'
     STARTALL: 'Start all'
     STARTALLINFO: 'Start all uploads'
     Saved: Saved
+    UPLOADSINTO: 'saves into /{path}'
   Versioned:
     has_many_Versions: Versions

lang/en.yml

@@ -2,6 +2,7 @@ en:
   AssetAdmin:
     ALLOWEDEXTS: 'Allowed extensions'
     NEWFOLDER: NewFolder
+    SHOWALLOWEDEXTS: 'Show allowed extensions'
   AssetTableField:
     CREATED: 'First uploaded'
     DIM: Dimensions
@@ -109,20 +110,21 @@ en:
     PLURALNAME: 'Data Objects'
     SINGULARNAME: 'Data Object'
   Date:
-    DAY: ' day'
-    DAYS: ' days'
-    HOUR: ' hour'
-    HOURS: ' hours'
-    MIN: ' min'
-    MINS: ' mins'
-    MONTH: ' month'
-    MONTHS: ' months'
-    SEC: ' sec'
-    SECS: ' secs'
+    DAY: day
+    DAYS: days
+    HOUR: hour
+    HOURS: hours
+    MIN: min
+    MINS: mins
+    MONTH: month
+    MONTHS: months
+    SEC: sec
+    SECS: secs
     TIMEDIFFAGO: '{difference} ago'
     TIMEDIFFIN: 'in {difference}'
-    YEAR: ' year'
-    YEARS: ' years'
+    YEAR: year
+    YEARS: years
+    LessThanMinuteAgo: 'less than a minute'
   DateField:
     NOTSET: 'not set'
     TODAY: today
@@ -198,7 +200,7 @@ en:
     TEXT2: 'password reset link'
     TEXT3: for
   Form:
-    FIELDISREQUIRED: '%s is required'
+    FIELDISREQUIRED: '{name} is required'
     SubmitBtnLabel: Go
     VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
     VALIDATIONNOTUNIQUE: 'The value entered is not unique'
@@ -207,8 +209,10 @@ en:
     VALIDATIONSTRONGPASSWORD: 'Passwords must have at least one digit and one alphanumeric character'
     VALIDATOR: Validator
     VALIDCURRENCY: 'Please enter a valid currency'
+    CSRF_FAILED_MESSAGE: 'There seems to have been a technical problem. Please click the back button, refresh your browser, and try again.'
   FormField:
     NONE: none
+    Example: 'e.g. %s'
   GridAction:
     DELETE_DESCRIPTION: Delete
     Delete: Delete
@@ -230,6 +234,7 @@ en:
     ResetFilter: Reset
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'No delete permissions'
+    EditPermissionsFailure: 'No permission to unlink record'
   GridFieldDetailForm:
     CancelBtn: Cancel
     Create: Create
@@ -237,7 +242,7 @@ en:
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
     Save: Save
-    Saved: 'Saved %s %s'
+    Saved: 'Saved {name} {link}'
   GridFieldItemEditView.ss:
     'Go back': 'Go back'
   Group:
@@ -309,6 +314,7 @@ en:
     URL: URL
     URLNOTANOEMBEDRESOURCE: 'The URL ''{url}'' could not be turned into a media resource.'
     UpdateMEDIA: 'Update Media'
+    BUTTONADDURL: 'Add url'
   Image:
     PLURALNAME: Files
     SINGULARNAME: File
@@ -332,7 +338,10 @@ en:
     PreviewButton: Preview
     REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
     SAVEDUP: Saved.
-    VersionUnknown: unknown
+    VersionUnknown: Unknown
+    ShowAsList: 'show as list'
+    TooManyPages: 'Too many pages'
+    ValidationError: 'Validation error'
   LeftAndMain_Menu.ss:
     Hello: Hi
     LOGOUT: 'Log out'
@@ -407,6 +416,7 @@ en:
     TWODIGITMONTH: 'Two-digit month (01=January, etc.)'
     TWODIGITSECOND: 'Two digits of second (00 through 59)'
     TWODIGITYEAR: 'Two-digit year'
+    Toggle: 'Show formatting help'
   MemberImportForm:
     Help1: '<p>Import users in <em>CSV format</em> (comma-separated values). <small><a href="#" class="toggle-advanced">Show advanced usage</a></small></p>'
     Help2: "<div class=\"advanced\">\n	<h4>Advanced usage</h4>\n	<ul>\n	<li>Allowed columns: <em>%s</em></li>\n	<li>Existing users are matched by their unique <em>Code</em> property, and updated with any new values from\n	the imported file.</li>\n	<li>Groups can be assigned by the <em>Groups</em> column. Groups are identified by their <em>Code</em> property,\n	multiple groups can be separated by comma. Existing group memberships are not cleared.</li>\n	</ul>\n</div>"
@@ -422,7 +432,7 @@ en:
   ModelAdmin:
     DELETE: Delete
     DELETEDRECORDS: 'Deleted {count} records.'
-    EMPTYBEFOREIMPORT: 'Clear Database before import'
+    EMPTYBEFOREIMPORT: 'Replace data'
     IMPORT: 'Import from CSV'
     IMPORTEDRECORDS: 'Imported {count} records.'
     NOCSVFILE: 'Please browse for a CSV file to import'
@@ -517,6 +527,19 @@ en:
     FileFieldLabel: 'CSV File <small>(Allowed extensions: *.csv)</small>'
   SilverStripeNavigator:
     Edit: Edit
+    Auto: Auto
+    ChangeViewMode: 'Change view mode'
+    Desktop: Desktop
+    DualWindowView: 'Dual Window'
+    EditView: 'Edit mode'
+    Mobile: Mobile
+    PreviewState: 'Preview State'
+    PreviewView: 'Preview mode'
+    Responsive: Responsive
+    SplitView: 'Split mode'
+    Tablet: Tablet
+    ViewDeviceWidth: 'Select a preview width'
+    Width: width
   SimpleImageField:
     NOUPLOAD: 'No Image Uploaded'
   SiteTree:
@@ -574,5 +597,13 @@ en:
     STARTALL: 'Start all'
     STARTALLINFO: 'Start all uploads'
     Saved: Saved
+    CHOOSEANOTHERFILE: 'Choose another file'
+    CHOOSEANOTHERINFO: 'Replace this file with another one from the file store'
+    OVERWRITEWARNING: 'File with the same name already exists'
+    UPLOADSINTO: 'saves into /{path}'
   Versioned:
     has_many_Versions: Versions
+  CMSPageHistoryController_versions.ss:
+    PREVIEW: 'Website preview'
+  GridFieldEditButton.ss:
+    EDIT: Edit

lang/en_GB.yml

@@ -2,6 +2,7 @@ en_GB:
   AssetAdmin:
     ALLOWEDEXTS: 'Allowed extensions'
     NEWFOLDER: NewFolder
+    SHOWALLOWEDEXTS: 'Show allowed extensions'
   AssetTableField:
     CREATED: 'First uploaded'
     DIM: Dimensions
@@ -59,9 +60,9 @@ en_GB:
     ERRORNOTADMIN: 'That user is not an administrator.'
     ERRORNOTREC: 'That username / password isn''t recognised'
   Boolean:
-    0: 'False'
     ANY: Any
-    1: 'True'
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   CMSLoadingScreen.ss:
     LOADING: Loading...
     REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
@@ -70,6 +71,8 @@ en_GB:
     ACCESSALLINTERFACES: 'Access to all CMS sections'
     ACCESSALLINTERFACESHELP: 'Overrules more specific access settings.'
     SAVE: Save
+  CMSPageHistoryController_versions.ss:
+    PREVIEW: 'Website preview'
   CMSProfileController:
     MENUTITLE: 'My Profile'
   ChangePasswordEmail.ss:
@@ -79,8 +82,8 @@ en_GB:
     HELLO: Hello
     PASSWORD: Password
   CheckboxField:
-    - 'False'
-    - 'True'
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   ComplexTableField:
     CLOSEPOPUP: 'Close Popup'
     SUCCESSADD2: 'Added {name}'
@@ -113,10 +116,11 @@ en_GB:
     DAYS: days
     HOUR: hour
     HOURS: hours
+    LessThanMinuteAgo: 'less than a minute'
     MIN: min
     MINS: mins
     MONTH: month
-    MONTHS: ' months'
+    MONTHS: months
     SEC: sec
     SECS: secs
     TIMEDIFFAGO: '{difference} ago'
@@ -198,7 +202,8 @@ en_GB:
     TEXT2: 'password reset link'
     TEXT3: for
   Form:
-    FIELDISREQUIRED: '%s is required.'
+    CSRF_FAILED_MESSAGE: 'There seems to have been a technical problem. Please click the back button, refresh your browser, and try again.'
+    FIELDISREQUIRED: '{name} is required'
     SubmitBtnLabel: Go
     VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
     VALIDATIONNOTUNIQUE: 'The value entered is not unique'
@@ -208,6 +213,7 @@ en_GB:
     VALIDATOR: Validator
     VALIDCURRENCY: 'Please enter a valid currency'
   FormField:
+    Example: 'e.g. %s'
     NONE: none
   GridAction:
     DELETE_DESCRIPTION: Delete
@@ -230,6 +236,7 @@ en_GB:
     ResetFilter: Reset
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'No delete permissions'
+    EditPermissionsFailure: 'No permission to unlink record'
   GridFieldDetailForm:
     CancelBtn: Cancel
     Create: Create
@@ -237,7 +244,9 @@ en_GB:
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
     Save: Save
-    Saved: 'Saved %s %s'
+    Saved: 'Saved {name} {link}'
+  GridFieldEditButton.ss:
+    EDIT: Edit
   GridFieldItemEditView.ss: null
   Group:
     AddRole: 'Add a role for this group'
@@ -267,6 +276,7 @@ en_GB:
     ADDURL: 'Add URL'
     ADJUSTDETAILSDIMENSIONS: 'Details & dimensions'
     ANCHORVALUE: Anchor
+    BUTTONADDURL: 'Add url'
     BUTTONINSERT: Insert
     BUTTONINSERTLINK: 'Insert link'
     BUTTONREMOVELINK: 'Remove link'
@@ -331,7 +341,10 @@ en_GB:
     PreviewButton: Preview
     REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
     SAVEDUP: Saved.
-    VersionUnknown: unknown
+    ShowAsList: 'show as list'
+    TooManyPages: 'Too many pages'
+    ValidationError: 'Validation error'
+    VersionUnknown: Unknown
   LeftAndMain_Menu.ss:
     Hello: Hi
     LOGOUT: 'Log out'
@@ -407,6 +420,7 @@ en_GB:
     TWODIGITMONTH: 'Two-digit month (01=January, etc.)'
     TWODIGITSECOND: 'Two digits of second (00 through 59)'
     TWODIGITYEAR: 'Two-digit year'
+    Toggle: 'Show formatting help'
   MemberImportForm:
     Help1: '<p>Import users in <em>CSV format</em> (comma-separated values). <small><a href="#" class="toggle-advanced">Show advanced usage</a></small></p>'
     Help2: '<div class="advanced">	<h4>Advanced usage</h4>	<ul>	<li>Allowed columns: <em>%s</em></li>	<li>Existing users are matched by their unique <em>Code</em> property, and updated with any new values from	the imported file.</li>	<li>Groups can be assigned by the <em>Groups</em> column. Groups are identified by their <em>Code</em> property,	multiple groups can be separated by comma. Existing group memberships are not cleared.</li>	</ul></div>'
@@ -421,7 +435,7 @@ en_GB:
   ModelAdmin:
     DELETE: Delete
     DELETEDRECORDS: 'Deleted {count} records.'
-    EMPTYBEFOREIMPORT: 'Clear Database before import'
+    EMPTYBEFOREIMPORT: 'Replace data'
     IMPORT: 'Import from CSV'
     IMPORTEDRECORDS: 'Imported {count} records.'
     NOCSVFILE: 'Please browse for a CSV file to import'
@@ -515,7 +529,20 @@ en_GB:
     BtnImport: 'Import from CSV'
     FileFieldLabel: 'CSV File <small>(Allowed extensions: *.csv)</small>'
   SilverStripeNavigator:
+    Auto: Auto
+    ChangeViewMode: 'Change view mode'
+    Desktop: Desktop
+    DualWindowView: 'Dual Window'
     Edit: Edit
+    EditView: 'Edit mode'
+    Mobile: Mobile
+    PreviewState: 'Preview State'
+    PreviewView: 'Preview mode'
+    Responsive: Responsive
+    SplitView: 'Split mode'
+    Tablet: Tablet
+    ViewDeviceWidth: 'Select a preview width'
+    Width: width
   SimpleImageField:
     NOUPLOAD: 'No Image Uploaded'
   SiteTree:
@@ -551,6 +578,8 @@ en_GB:
     ATTACHFILE: 'Attach a file'
     ATTACHFILES: 'Attach files'
     AttachFile: 'Attach file(s)'
+    CHOOSEANOTHERFILE: 'Choose another file'
+    CHOOSEANOTHERINFO: 'Replace this file with another one from the file store'
     DELETE: 'Delete from files'
     DELETEINFO: 'Permanently delete this file from the file store'
     DOEDIT: Save
@@ -565,13 +594,15 @@ en_GB:
     FROMFILES: 'From files'
     HOTLINKINFO: 'Info: This image will be hotlinked. Please ensure you have permissions from the original site creator to do so.'
     MAXNUMBEROFFILES: 'Max number of {count} file(s) exceeded.'
-    MAXNUMBEROFFILESSHORT: 'Can only upload {count} files'
     MAXNUMBEROFFILESONE: 'Can only upload one file'
+    MAXNUMBEROFFILESSHORT: 'Can only upload {count} files'
+    OVERWRITEWARNING: 'File with the same name already exists'
     REMOVE: Remove
     REMOVEERROR: 'Error removing file'
     REMOVEINFO: 'Remove this file from here, but do not delete it from the file store'
     STARTALL: 'Start all'
     STARTALLINFO: 'Start all uploads'
     Saved: Saved
+    UPLOADSINTO: 'saves into /{path}'
   Versioned:
     has_many_Versions: Versions

lang/eo.yml

@@ -2,6 +2,7 @@ eo:
   AssetAdmin:
     ALLOWEDEXTS: 'Allowed extensions'
     NEWFOLDER: NewFolder
+    SHOWALLOWEDEXTS: 'Show allowed extensions'
   AssetTableField:
     CREATED: 'Unue alŝutita'
     DIM: Dimensioj
@@ -59,9 +60,9 @@ eo:
     ERRORNOTADMIN: 'Tiu uzanto ne estas administranto.'
     ERRORNOTREC: 'Kiuj salutnomo / pasvorto ne estas rekonebla'
   Boolean:
-    0: Ne
     ANY: Ajna
-    1: Jes
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   CMSLoadingScreen.ss:
     LOADING: Loading...
     REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
@@ -70,6 +71,8 @@ eo:
     ACCESSALLINTERFACES: 'Aliro al ĉiuj interfacoj de CMS'
     ACCESSALLINTERFACESHELP: 'Nuligas pli specifajn alirajn agordojn.'
     SAVE: Konservi
+  CMSPageHistoryController_versions.ss:
+    PREVIEW: 'Website preview'
   CMSProfileController:
     MENUTITLE: 'My Profile'
   ChangePasswordEmail.ss:
@@ -79,8 +82,8 @@ eo:
     HELLO: Saluton
     PASSWORD: Pasvorto
   CheckboxField:
-    - Ne
-    - Jes
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   ComplexTableField:
     CLOSEPOPUP: 'Fermi Ŝprucfenestron'
     SUCCESSADD2: 'Added {name}'
@@ -109,20 +112,21 @@ eo:
     PLURALNAME: 'Datumaj Objektoj'
     SINGULARNAME: 'Datuma Objekto'
   Date:
-    DAY: tago
-    DAYS: tagoj
-    HOUR: horo
-    HOURS: horoj
+    DAY: day
+    DAYS: days
+    HOUR: hour
+    HOURS: hours
+    LessThanMinuteAgo: 'less than a minute'
     MIN: min
-    MINS: minutoj
-    MONTH: monato
-    MONTHS: monatoj
-    SEC: sek
-    SECS: sekundoj
+    MINS: mins
+    MONTH: month
+    MONTHS: months
+    SEC: sec
+    SECS: secs
     TIMEDIFFAGO: '{difference} ago'
     TIMEDIFFIN: 'in {difference}'
-    YEAR: jaro
-    YEARS: jaroj
+    YEAR: year
+    YEARS: years
   DateField:
     NOTSET: 'ne agordita'
     TODAY: hodiaŭ
@@ -198,7 +202,8 @@ eo:
     TEXT2: 'pasvorta reagorda ligilo'
     TEXT3: por
   Form:
-    FIELDISREQUIRED: '%s estas postulita'
+    CSRF_FAILED_MESSAGE: 'There seems to have been a technical problem. Please click the back button, refresh your browser, and try again.'
+    FIELDISREQUIRED: '{name} is required'
     SubmitBtnLabel: Go
     VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
     VALIDATIONNOTUNIQUE: 'La enirita valoron ne unika'
@@ -208,6 +213,7 @@ eo:
     VALIDATOR: Validigilo
     VALIDCURRENCY: 'Please enter a valid currency'
   FormField:
+    Example: 'e.g. %s'
     NONE: neniu
   GridAction:
     DELETE_DESCRIPTION: Delete
@@ -230,6 +236,7 @@ eo:
     ResetFilter: Reset
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'No delete permissions'
+    EditPermissionsFailure: 'No permission to unlink record'
   GridFieldDetailForm:
     CancelBtn: Cancel
     Create: Create
@@ -237,7 +244,9 @@ eo:
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
     Save: Save
-    Saved: 'Saved %s %s'
+    Saved: 'Saved {name} {link}'
+  GridFieldEditButton.ss:
+    EDIT: Edit
   GridFieldItemEditView.ss: null
   Group:
     AddRole: 'Add a role for this group'
@@ -267,6 +276,7 @@ eo:
     ADDURL: 'Add URL'
     ADJUSTDETAILSDIMENSIONS: 'Details & dimensions'
     ANCHORVALUE: Ankri
+    BUTTONADDURL: 'Add url'
     BUTTONINSERT: Insert
     BUTTONINSERTLINK: 'Almeti ligilon'
     BUTTONREMOVELINK: 'Forigi ligilon'
@@ -331,7 +341,10 @@ eo:
     PreviewButton: Preview
     REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
     SAVEDUP: Saved.
-    VersionUnknown: unknown
+    ShowAsList: 'show as list'
+    TooManyPages: 'Too many pages'
+    ValidationError: 'Validation error'
+    VersionUnknown: Unknown
   LeftAndMain_Menu.ss:
     Hello: Hi
     LOGOUT: 'Log out'
@@ -407,6 +420,7 @@ eo:
     TWODIGITMONTH: 'Two-digit month (01=January, etc.)'
     TWODIGITSECOND: 'Two digits of second (00 through 59)'
     TWODIGITYEAR: 'Two-digit year'
+    Toggle: 'Show formatting help'
   MemberImportForm:
     Help1: '<p>Gravaj membroj en <em>CSV-formato</em> (perkome disigitaj valoroj ). <small><a href="#" class="toggle-advanced">Vidigi spertulan uzadon</a></small></p>'
     Help2: '<div class="advanced">	<h4>Advanced usage</h4>	<ul>	<li>Allowed columns: <em>%s</em></li>	<li>Existing users are matched by their unique <em>Code</em> property, and updated with any new values from	the imported file.</li>	<li>Groups can be assigned by the <em>Groups</em> column. Groups are identified by their <em>Code</em> property,	multiple groups can be separated by comma. Existing group memberships are not cleared.</li>	</ul></div>'
@@ -421,7 +435,7 @@ eo:
   ModelAdmin:
     DELETE: Forigi
     DELETEDRECORDS: 'Deleted {count} records.'
-    EMPTYBEFOREIMPORT: 'Clear Database before import'
+    EMPTYBEFOREIMPORT: 'Replace data'
     IMPORT: 'Importi el CSV'
     IMPORTEDRECORDS: 'Imported {count} records.'
     NOCSVFILE: 'Bonvolu foliumi por CSV-dosiero importota'
@@ -515,7 +529,20 @@ eo:
     BtnImport: Importi
     FileFieldLabel: 'CSV-dosiero <small>(Permesitaj sufiksoj: *.csv)</small>'
   SilverStripeNavigator:
+    Auto: Auto
+    ChangeViewMode: 'Change view mode'
+    Desktop: Desktop
+    DualWindowView: 'Dual Window'
     Edit: Edit
+    EditView: 'Edit mode'
+    Mobile: Mobile
+    PreviewState: 'Preview State'
+    PreviewView: 'Preview mode'
+    Responsive: Responsive
+    SplitView: 'Split mode'
+    Tablet: Tablet
+    ViewDeviceWidth: 'Select a preview width'
+    Width: width
   SimpleImageField:
     NOUPLOAD: 'Neniu Bildo Alŝutita'
   SiteTree:
@@ -551,6 +578,8 @@ eo:
     ATTACHFILE: 'Attach a file'
     ATTACHFILES: 'Attach files'
     AttachFile: 'Attach file(s)'
+    CHOOSEANOTHERFILE: 'Choose another file'
+    CHOOSEANOTHERINFO: 'Replace this file with another one from the file store'
     DELETE: 'Delete from files'
     DELETEINFO: 'Permanently delete this file from the file store'
     DOEDIT: Save
@@ -565,12 +594,15 @@ eo:
     FROMFILES: 'From files'
     HOTLINKINFO: 'Info: This image will be hotlinked. Please ensure you have permissions from the original site creator to do so.'
     MAXNUMBEROFFILES: 'Max number of {count} file(s) exceeded.'
+    MAXNUMBEROFFILESONE: 'Can only upload one file'
     MAXNUMBEROFFILESSHORT: 'Can only upload {count} files'
+    OVERWRITEWARNING: 'File with the same name already exists'
     REMOVE: Remove
     REMOVEERROR: 'Error removing file'
     REMOVEINFO: 'Remove this file from here, but do not delete it from the file store'
     STARTALL: 'Start all'
     STARTALLINFO: 'Start all uploads'
     Saved: Saved
+    UPLOADSINTO: 'saves into /{path}'
   Versioned:
     has_many_Versions: Versioj

lang/es.yml

@@ -1,12 +1,13 @@
 es:
   AssetAdmin:
-    ALLOWEDEXTS: 'Allowed extensions'
+    ALLOWEDEXTS: 'Extensiones permitidas'
     NEWFOLDER: NuevaCarpeta
+    SHOWALLOWEDEXTS: 'Show allowed extensions'
   AssetTableField:
     CREATED: 'Agregado por primera vez'
     DIM: Dimensiones
     FILENAME: 'Nombre del archivo'
-    FOLDER: Folder
+    FOLDER: Carpeta
     LASTEDIT: 'Modificado por última vez'
     OWNER: Propietario
     SIZE: Tamaño
@@ -14,19 +15,19 @@ es:
     TYPE: Tipo
     URL: URL
   AssetUploadField:
-    ChooseFiles: 'Choose files'
-    DRAGFILESHERE: 'Drag files here'
-    DROPAREA: 'Drop Area'
-    EDITALL: 'Edit all'
-    EDITANDORGANIZE: 'Edit & organize'
-    EDITINFO: 'Edit files'
-    FILES: Files
-    FROMCOMPUTER: 'Choose files from your computer'
-    FROMCOMPUTERINFO: 'Upload from your computer'
+    ChooseFiles: 'Seleccione los archivos'
+    DRAGFILESHERE: 'Arrastre los archivos aqui'
+    DROPAREA: 'Area para soltar ficheros'
+    EDITALL: 'Editar todo'
+    EDITANDORGANIZE: 'Editar y organizar'
+    EDITINFO: 'Editar archivos'
+    FILES: Archivos
+    FROMCOMPUTER: 'Seleccione los archivos desde su ordenador'
+    FROMCOMPUTERINFO: 'Subir archivos desde tu ordenador'
     TOTAL: Total
-    TOUPLOAD: 'Choose files to upload...'
-    UPLOADINPROGRESS: 'Please wait… upload in progress'
-    UPLOADOR: OR
+    TOUPLOAD: 'Seleccione los archivos a subir...'
+    UPLOADINPROGRESS: 'Por favor espere .... carga en curso'
+    UPLOADOR: O
   BBCodeParser:
     ALIGNEMENT: Alineación
     ALIGNEMENTEXAMPLE: 'alineado a la derecha'
@@ -53,25 +54,27 @@ es:
     UNORDEREDDESCRIPTION: 'Lista desordenada'
     UNORDEREDEXAMPLE1: 'elemento 1 desordenado'
   BackLink_Button.ss:
-    Back: Back
+    Back: Volver
   BasicAuth:
     ENTERINFO: 'Por favor introduzca su nombre de usuario y contraseña.'
     ERRORNOTADMIN: 'Ese usuario no es un administrador.'
     ERRORNOTREC: 'Ese nombre de usuario / contraseña no pudo ser reconocido.'
   Boolean:
-    0: 'False'
-    ANY: Any
-    1: 'True'
+    ANY: Cualquiera
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   CMSLoadingScreen.ss:
-    LOADING: Loading...
-    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
+    LOADING: Cargando...
+    REQUIREJS: 'El CMS requiere que tenga habilitado JavaScript .'
   CMSMain:
-    ACCESS: 'Access to ''{title}'' section'
+    ACCESS: 'Acceder a la sección ''{title}'''
     ACCESSALLINTERFACES: 'Acceder a todas las interfaces del CMS'
-    ACCESSALLINTERFACESHELP: 'Overrules more specific access settings.'
+    ACCESSALLINTERFACESHELP: 'Anula configuraciones de acceso más específicas.'
     SAVE: Guardar
+  CMSPageHistoryController_versions.ss:
+    PREVIEW: 'Website preview'
   CMSProfileController:
-    MENUTITLE: 'My Profile'
+    MENUTITLE: 'Mi Perfil'
   ChangePasswordEmail.ss:
     CHANGEPASSWORDTEXT1: 'Has cambiado tu contraseña por'
     CHANGEPASSWORDTEXT2: 'Ahora puede utilizar los siguientes datos de acreditación para iniciar sesión:'
@@ -79,24 +82,24 @@ es:
     HELLO: Hola
     PASSWORD: Contraseña
   CheckboxField:
-    - 'False'
-    - 'True'
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   ComplexTableField:
     CLOSEPOPUP: 'Cerrar Popup'
-    SUCCESSADD2: 'Added {name}'
+    SUCCESSADD2: 'Añadido {name}'
     SUCCESSEDIT: 'Guardado %s %s %s'
   ComplexTableField.ss:
     ADDITEM: 'Agregar %s'
-    NOITEMSFOUND: 'No items found'
+    NOITEMSFOUND: 'Registros no encontrados'
     SORTASC: 'Orden Ascendente'
     SORTDESC: 'Orden Descendente'
   ComplexTableField_popup.ss:
     NEXT: Siguiente
     PREVIOUS: Anterior
   ConfirmedPasswordField:
-    ATLEAST: 'Passwords must be at least {min} characters long.'
-    BETWEEN: 'Passwords must be {min} to {max} characters long.'
-    MAXIMUM: 'Passwords must be at most {max} characters long.'
+    ATLEAST: 'Las constraseñas deben tener al menos {min} caracteres de longitud.'
+    BETWEEN: 'Las contraseñas deben tener desde {min} a {max} caracteres de longitud.'
+    MAXIMUM: 'Las contraseñas deben tener como máximo {max} caracteres de longitud.'
     SHOWONCLICKTITLE: 'Cambiar contraseña'
   CreditCardField:
     FIRST: primero
@@ -109,192 +112,199 @@ es:
     PLURALNAME: 'Objetos de Datos'
     SINGULARNAME: 'Objeto de Datos'
   Date:
-    DAY: día
-    DAYS: días
-    HOUR: hora
-    HOURS: horas
+    DAY: day
+    DAYS: days
+    HOUR: hour
+    HOURS: hours
+    LessThanMinuteAgo: 'less than a minute'
     MIN: min
-    MINS: mins.
-    MONTH: mes
-    MONTHS: meses
-    SEC: seg.
-    SECS: segs.
-    TIMEDIFFAGO: '{difference} ago'
-    TIMEDIFFIN: 'in {difference}'
-    YEAR: año
-    YEARS: años
+    MINS: mins
+    MONTH: month
+    MONTHS: months
+    SEC: sec
+    SECS: secs
+    TIMEDIFFAGO: 'hace {difference}'
+    TIMEDIFFIN: 'en {difference}'
+    YEAR: year
+    YEARS: years
   DateField:
     NOTSET: 'sin establecer'
     TODAY: hoy
-    VALIDDATEFORMAT2: 'Please enter a valid date format ({format})'
-    VALIDDATEMAXDATE: 'Your date has to be older or matching the maximum allowed date ({date})'
-    VALIDDATEMINDATE: 'Your date has to be newer or matching the minimum allowed date ({date})'
+    VALIDDATEFORMAT2: 'Por favor, introduzca un formato de fecha válido ({format})'
+    VALIDDATEMAXDATE: 'La fecha tiene que ser mayor o igual a la fecha máxima permitida ({date})'
+    VALIDDATEMINDATE: 'La fecha tiene que ser posterior o coincidente a la fecha mínima permitida ({date})'
   DatetimeField:
-    NOTSET: 'Not set'
+    NOTSET: 'No establecido'
   Director:
-    INVALID_REQUEST: 'Invalid request'
+    INVALID_REQUEST: 'Solicitud no válida'
   DropdownField:
     CHOOSE: (Elegir)
   EmailField:
-    VALIDATION: 'Please enter an email address'
+    VALIDATION: 'Introduzca una dirección de correo electrónico'
   Email_BounceRecord:
     PLURALNAME: 'Email Bounce Records'
     SINGULARNAME: 'Email Bounce Record'
   Enum:
-    ANY: Any
+    ANY: Cualquiera
   File:
-    AviType: 'AVI video file'
+    AviType: 'Archivo de video AVI'
     Content: Contenido
-    CssType: 'CSS file'
-    DmgType: 'Apple disk image'
-    DocType: 'Word document'
+    CssType: 'Archivo CSS'
+    DmgType: 'Image de disco de Apple'
+    DocType: 'Documento Word'
     Filename: 'Nombre del archivo'
-    GifType: 'GIF image - good for diagrams'
-    GzType: 'GZIP compressed file'
-    HtlType: 'HTML file'
-    HtmlType: 'HTML file'
-    INVALIDEXTENSION: 'Extension is not allowed (valid: {extensions})'
-    INVALIDEXTENSIONSHORT: 'Extension is not allowed'
-    IcoType: 'Icon image'
-    JpgType: 'JPEG image - good for photos'
-    JsType: 'Javascript file'
-    Mp3Type: 'MP3 audio file'
-    MpgType: 'MPEG video file'
+    GifType: 'Imagen GIF - buena para diagramas'
+    GzType: 'Archivo comprimido GZIP'
+    HtlType: 'Archivo HTML'
+    HtmlType: 'Archivo HTML'
+    INVALIDEXTENSION: 'La extensión no es permitida (válidas: {extensions})'
+    INVALIDEXTENSIONSHORT: 'La extensión no es permitida'
+    IcoType: 'Imagen Icon'
+    JpgType: 'Imagen JPEG - buena para fotos'
+    JsType: 'Archivo Javascript'
+    Mp3Type: 'Archivo de audio MP3'
+    MpgType: 'Archivo de video MPEG'
     NOFILESIZE: 'El tamaño del fichero es de cero bytes.'
-    NOVALIDUPLOAD: 'File is not a valid upload'
+    NOVALIDUPLOAD: 'El archivo no es válido para cargarlo'
     Name: Nombre
     PLURALNAME: Archivos
-    PdfType: 'Adobe Acrobat PDF file'
-    PngType: 'PNG image - good general-purpose format'
+    PdfType: 'Archivo PDF de Adobe Acrobat'
+    PngType: 'Imagen PNG - buen formato de propósito general'
     SINGULARNAME: Archivo
-    TOOLARGE: 'Filesize is too large, maximum {size} allowed'
-    TOOLARGESHORT: 'Filesize exceeds {size}'
-    TiffType: 'Tagged image format'
+    TOOLARGE: 'El tamaño del archivo es demasiado grande, máximo permitido {size}'
+    TOOLARGESHORT: 'El tamaño del archivo supera {size}'
+    TiffType: 'Formato de imagen etiquetada'
     Title: Título
-    WavType: 'WAV audo file'
-    XlsType: 'Excel spreadsheet'
-    ZipType: 'ZIP compressed file'
+    WavType: 'Archivo de audio WAV'
+    XlsType: 'Hoja de cálculo Excel'
+    ZipType: 'Archivo comprimido ZIP'
   FileIFrameField:
-    ATTACH: 'Attach {type}'
-    ATTACHONCESAVED: '{type}s can be attached once you have saved the record for the first time.'
-    ATTACHONCESAVED2: 'Files can be attached once you have saved the record for the first time.'
-    DELETE: 'Delete {type}'
-    DISALLOWEDFILETYPE: 'This filetype is not allowed to be uploaded'
-    FILE: File
-    FROMCOMPUTER: 'From your Computer'
-    FROMFILESTORE: 'From the File Store'
-    NOSOURCE: 'Please select a source file to attach'
-    REPLACE: 'Replace {type}'
+    ATTACH: 'Adjunte {type}'
+    ATTACHONCESAVED: '{type}s puede ser adjuntado una vez hayas guardado el registro por primera vez.'
+    ATTACHONCESAVED2: 'Se pueden adjuntar archivos una vez se haya guardado el registro por primera vez.'
+    DELETE: 'Borrar {type}'
+    DISALLOWEDFILETYPE: 'No se permite cargar este tipo de archivo'
+    FILE: Archivo
+    FROMCOMPUTER: 'Desde tu ordenador'
+    FROMFILESTORE: 'Desde el Almacén de archivos'
+    NOSOURCE: 'Por favor, seleccione un archivo de origen para adjuntar'
+    REPLACE: 'Reemplace {type}'
   FileIFrameField_iframe.ss:
-    TITLE: 'Image Uploading Iframe'
+    TITLE: 'Imagen para cargar Iframe'
   Filesystem:
-    SYNCRESULTS: 'Sync complete: {createdcount} items created, {deletedcount} items deleted'
+    SYNCRESULTS: 'Sincronización completada: {createdcount} registros creados, {deletedcount} registros borrados'
   Folder:
-    PLURALNAME: Folders
-    SINGULARNAME: Folder
+    PLURALNAME: Carpetas
+    SINGULARNAME: Carpeta
   ForgotPasswordEmail.ss:
     HELLO: Hola
     TEXT1: 'Aquí tiene su'
     TEXT2: 'enlace para restablecer contraseña'
     TEXT3: para
   Form:
-    FIELDISREQUIRED: 'se requiere llenar el campo %s'
-    SubmitBtnLabel: Go
-    VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
+    CSRF_FAILED_MESSAGE: 'There seems to have been a technical problem. Please click the back button, refresh your browser, and try again.'
+    FIELDISREQUIRED: '{name} is required'
+    SubmitBtnLabel: Ir
+    VALIDATIONCREDITNUMBER: 'Por favor, asegúrese de que ha introducido el número de tarjeta de crédito correctamente {number}'
     VALIDATIONNOTUNIQUE: 'El valor que se ha introducido no es único'
     VALIDATIONPASSWORDSDONTMATCH: 'Las contraseñas no concuerdan'
     VALIDATIONPASSWORDSNOTEMPTY: 'Las contraseñas no pueden estar vacías'
-    VALIDATIONSTRONGPASSWORD: 'Passwords must have at least one digit and one alphanumeric character'
+    VALIDATIONSTRONGPASSWORD: 'Las contraseñas deben tener al menos un dígito y un carácter alfanumérico'
     VALIDATOR: Validador
-    VALIDCURRENCY: 'Please enter a valid currency'
+    VALIDCURRENCY: 'Por favor, introduzca una moneda válida.'
   FormField:
+    Example: 'e.g. %s'
     NONE: ninguna
   GridAction:
-    DELETE_DESCRIPTION: Delete
-    Delete: Delete
-    UnlinkRelation: Unlink
+    DELETE_DESCRIPTION: Borrar
+    Delete: Borrar
+    UnlinkRelation: Desenlazar
   GridField:
-    Add: 'Add {name}'
-    Filter: Filter
-    FilterBy: 'Filter by '
-    Find: Find
-    LEVELUP: 'Level up'
-    LinkExisting: 'Link Existing'
-    NewRecord: 'New %s'
-    NoItemsFound: 'No items found'
-    PRINTEDAT: 'Printed at'
-    PRINTEDBY: 'Printed by'
-    PlaceHolder: 'Find {type}'
-    PlaceHolderWithLabels: 'Find {type} by {name}'
-    RelationSearch: 'Relation search'
-    ResetFilter: Reset
+    Add: 'Añadir {name}'
+    Filter: Filtro
+    FilterBy: 'Filtrar por'
+    Find: Buscar
+    LEVELUP: 'Subir nivel'
+    LinkExisting: 'Enlace Existente'
+    NewRecord: 'Nuevo %s'
+    NoItemsFound: 'No se encontraron registros'
+    PRINTEDAT: 'Impreso en'
+    PRINTEDBY: 'Impreso por'
+    PlaceHolder: 'Buscar {type}'
+    PlaceHolderWithLabels: 'Buscar {type} por {name}'
+    RelationSearch: 'Búsqueda de relación'
+    ResetFilter: Restaurar
   GridFieldAction_Delete:
-    DeletePermissionsFailure: 'No delete permissions'
+    DeletePermissionsFailure: 'Sin permiso para borrar'
+    EditPermissionsFailure: 'No permission to unlink record'
   GridFieldDetailForm:
-    CancelBtn: Cancel
-    Create: Create
-    Delete: Delete
-    DeletePermissionsFailure: 'No delete permissions'
-    Deleted: 'Deleted %s %s'
-    Save: Save
-    Saved: 'Saved %s %s'
+    CancelBtn: Cancelar
+    Create: Crear
+    Delete: Borrar
+    DeletePermissionsFailure: 'Sin permiso para borrar'
+    Deleted: 'Borrado %s %s'
+    Save: Guardar
+    Saved: 'Saved {name} {link}'
+  GridFieldEditButton.ss:
+    EDIT: Edit
   GridFieldItemEditView.ss: null
   Group:
-    AddRole: 'Add a role for this group'
+    AddRole: 'Añadir una regla a este grupo'
     Code: 'Código de grupo'
-    DefaultGroupTitleAdministrators: Administrators
-    DefaultGroupTitleContentAuthors: 'Content Authors'
+    DefaultGroupTitleAdministrators: Administradores
+    DefaultGroupTitleContentAuthors: 'Autores de contenido'
     Description: Descripción
-    GroupReminder: 'If you choose a parent group, this group will take all it''s roles'
+    GroupReminder: 'Si selecciona un grupo padre, este grupo tomará todas sus funciones'
     Locked: '¿Bloqueado?'
-    NoRoles: 'No roles found'
-    PLURALNAME: Groups
+    NoRoles: 'Reglas no encontradas'
+    PLURALNAME: Grupos
     Parent: 'Grupo Padre'
-    RolesAddEditLink: 'Manage roles'
-    SINGULARNAME: Group
+    RolesAddEditLink: 'Administrar reglas'
+    SINGULARNAME: Grupo
     Sort: 'Orden de Clasificación'
     has_many_Permissions: Permisos
     many_many_Members: Miembros
   GroupImportForm:
-    Help1: '<p>Import one or more groups in <em>CSV</em> format (comma-separated values). <small><a href="#" class="toggle-advanced">Show advanced usage</a></small></p>'
-    Help2: '<div class="advanced">	<h4>Advanced usage</h4>	<ul>	<li>Allowed columns: <em>%s</em></li>	<li>Existing groups are matched by their unique <em>Code</em> value, and updated with any new values from the 	imported file</li>	<li>Group hierarchies can be created by using a <em>ParentCode</em> column.</li>	<li>Permission codes can be assigned by the <em>PermissionCode</em> column. Existing permission codes are not	cleared.</li>	</ul></div>'
-    ResultCreated: 'Created {count} groups'
+    Help1: '<p>Importar uno o más grupos en formato <em>CSV</em> (valores separados por coma). <small><a href="#" class="toggle-advanced">Mostrar uso avanzado</a></small></p>'
+    Help2: "<div class=\"advanced\">\\n<h4>Uso avanzado</h4>\\n<ul>\\n<li>Columnas permitidas: <em>%s</em></li>\\n<li>Grupos existentes son relacionados por su valor <em>Code</em>, y actualizados con nuevos valores desde el archivo importado</li>\\n<li>Jerarquías de grupos pueden ser creadas usando una columna <em>ParentCode</em>.</li>\\n<li>Códigos de permiso pueden ser asignados por la columna  <em>PermissionCode</em>. Códigos de permisos existentes no son borrados.</li>\\n</ul>\\n</div>"
+    ResultCreated: 'Creados {count} grupos'
     ResultDeleted: 'Se eliminaron %d grupos'
-    ResultUpdated: 'Updated %d groups'
+    ResultUpdated: 'Actualizados grupos %d'
   Hierarchy:
-    InfiniteLoopNotAllowed: 'Infinite loop found within the "{type}" hierarchy. Please change the parent to resolve this'
+    InfiniteLoopNotAllowed: 'Bucle infinito encontrado dentro de la jerarquía "{type}". Por favor, cambie el padre para resolver el problema'
   HtmlEditorField:
-    ADDURL: 'Add URL'
-    ADJUSTDETAILSDIMENSIONS: 'Details &amp; dimensions'
+    ADDURL: 'Añadir URL'
+    ADJUSTDETAILSDIMENSIONS: 'Detalles &amp; dimensiones'
     ANCHORVALUE: Ancla
-    BUTTONINSERT: Insert
+    BUTTONADDURL: 'Add url'
+    BUTTONINSERT: Insertar
     BUTTONINSERTLINK: 'Insertar enlace'
     BUTTONREMOVELINK: 'Eliminar enlace'
-    BUTTONUpdate: Update
-    CAPTIONTEXT: 'Caption text'
+    BUTTONUpdate: Actualizar
+    CAPTIONTEXT: 'Texto del título'
     CSSCLASS: 'Alineación / estilo'
     CSSCLASSCENTER: 'Centrado, en si mismo'
     CSSCLASSLEFT: 'A la izquierda, con el texto flotando alrededor.'
     CSSCLASSLEFTALONE: 'En la izquierda, en el suyo.'
     CSSCLASSRIGHT: 'A la derecha, con el texto flotando alrededor.'
-    DETAILS: Details
+    DETAILS: Detalles
     EMAIL: 'Dirección de E-mail'
     FILE: Archivo
     FOLDER: Carpeta
-    FROMCMS: 'From the CMS'
-    FROMCOMPUTER: 'From your computer'
-    FROMWEB: 'From the web'
-    FindInFolder: 'Find in Folder'
-    IMAGEALT: 'Alternative text (alt)'
-    IMAGEALTTEXT: 'Alternative text (alt) - shown if image cannot be displayed'
-    IMAGEALTTEXTDESC: 'Shown to screen readers or if image can not be displayed'
+    FROMCMS: 'Desde el CMS'
+    FROMCOMPUTER: 'Desde tu ordenador'
+    FROMWEB: 'Desde la web'
+    FindInFolder: 'Buscar en carpeta'
+    IMAGEALT: 'Texto alternativo (alt)'
+    IMAGEALTTEXT: 'Texto alternativo (alt) - es mostrado si la imagen no puede ser visualizada'
+    IMAGEALTTEXTDESC: 'Mostrar a los lectores de pantalla o si la imagen no se puede visualizar'
     IMAGEDIMENSIONS: Dimensiones
     IMAGEHEIGHTPX: Alto
-    IMAGETITLE: 'Title text (tooltip) - for additional information about the image'
-    IMAGETITLETEXT: 'Title text (tooltip)'
-    IMAGETITLETEXTDESC: 'For additional information about the image'
+    IMAGETITLE: 'Texto del título (tooltip) - para obtener más información acerca de la imagen'
+    IMAGETITLETEXT: 'Texto del título (tooltip)'
+    IMAGETITLETEXTDESC: 'Para obtener información adicional acerca de la imagen'
     IMAGEWIDTHPX: Ancho
-    INSERTMEDIA: 'Insert Media'
+    INSERTMEDIA: 'Insertar Media'
     LINK: 'Insertar/editar enlace para el texto resaltado'
     LINKANCHOR: 'Ancla en esta página'
     LINKDESCR: 'Descripción del Enlace'
@@ -306,55 +316,58 @@ es:
     LINKTO: 'Enlazar a'
     PAGE: Página
     URL: URL
-    URLNOTANOEMBEDRESOURCE: 'The URL ''{url}'' could not be turned into a media resource.'
-    UpdateMEDIA: 'Update Media'
+    URLNOTANOEMBEDRESOURCE: 'La URL ''{url}'' ''no se puede convertir en un recurso multimedia.'
+    UpdateMEDIA: 'Actualizar Media'
   Image:
-    PLURALNAME: Files
-    SINGULARNAME: File
+    PLURALNAME: Archivos
+    SINGULARNAME: Archivo
   ImageField:
-    IMAGE: Image
+    IMAGE: Imagen
   Image_Cached:
-    PLURALNAME: Files
-    SINGULARNAME: File
+    PLURALNAME: Archivos
+    SINGULARNAME: Archivo
   Image_iframe.ss:
     TITLE: 'Iframe para agregar imágenes'
   LeftAndMain:
-    CANT_REORGANISE: 'You do not have permission to alter Top level pages. Your change was not saved.'
-    DELETED: Deleted.
-    DropdownBatchActionsDefault: Actions
+    CANT_REORGANISE: 'Usted no tiene permiso para modificar las páginas de nivel superior. Su modificación no se ha guardado.'
+    DELETED: Borrado
+    DropdownBatchActionsDefault: Acciones
     HELP: Ayuda
     PAGETYPE: 'Tipo de página:'
     PERMAGAIN: 'Ha sido desconectado del CMS. Si quiere volver a entrar, introduzca su nombre de usuario y contraseña a continuación.'
     PERMALREADY: 'Lamentablemente no puede acceder a esta parte del CMS. Si quiere entrar como alguien distinto, hágalo a continuación'
     PERMDEFAULT: 'Introduzca su correo electrónico y su contraseña para acceder al CMS.'
     PLEASESAVE: 'Por favor Guarde la Página: Esta página no se ha podido actualizar porque aún no ha sido salvada.'
-    PreviewButton: Preview
-    REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
-    SAVEDUP: Saved.
-    VersionUnknown: unknown
+    PreviewButton: 'Vista previa'
+    REORGANISATIONSUCCESSFUL: 'Reorganizado el árbol del sitio con éxito.'
+    SAVEDUP: Guardado
+    ShowAsList: 'show as list'
+    TooManyPages: 'Too many pages'
+    ValidationError: 'Validation error'
+    VersionUnknown: Unknown
   LeftAndMain_Menu.ss:
-    Hello: Hi
-    LOGOUT: 'Log out'
+    Hello: Hola
+    LOGOUT: 'Finalizar la sesión'
   LoginAttempt:
     Email: 'Correo electrónico'
     IP: 'Dirección IP'
-    PLURALNAME: 'Login Attempts'
-    SINGULARNAME: 'Login Attempt'
+    PLURALNAME: 'Intentos de ingreso'
+    SINGULARNAME: 'Intento de ingreso'
     Status: Estado
   Member:
-    ADDGROUP: 'Add group'
+    ADDGROUP: 'Añadir grupo'
     BUTTONCHANGEPASSWORD: 'Cambiar Contraseña'
     BUTTONLOGIN: 'Inicie Sesión'
     BUTTONLOGINOTHER: 'Inicie sesión como otra persona'
     BUTTONLOSTPASSWORD: 'He perdido mi contraseña'
-    CANTEDIT: 'You don''t have permission to do that'
+    CANTEDIT: 'No tiene permiso para hacer eso'
     CONFIRMNEWPASSWORD: 'Confirmar Nueva Contraseña'
     CONFIRMPASSWORD: 'Confirmar Contraseña'
-    DATEFORMAT: 'Date format'
-    DefaultAdminFirstname: 'Default Admin'
-    DefaultDateTime: default
+    DATEFORMAT: 'Formato de fecha'
+    DefaultAdminFirstname: 'Administrador por defecto'
+    DefaultDateTime: 'por defecto'
     EMAIL: E-mail
-    EMPTYNEWPASSWORD: 'The new password can''t be empty, please try again'
+    EMPTYNEWPASSWORD: 'La nueva contraseña no puede estar vacía, por favor inténtalo de nuevo'
     ENTEREMAIL: 'Por favor, introduce un correo electrónico para obtener un enlace con el que cambiar la contraseña'
     ERRORLOCKEDOUT: 'Su cuenta ha sido inhabilitada temporalmente porque ha habido demasiados intentos fallidos de conectarse. Por favor, intente de nuevo en 20 minutos.'
     ERRORNEWPASSWORD: 'Ha introducido su nueva contraseña de distinta manera, intente de nuevo'
@@ -362,8 +375,8 @@ es:
     ERRORWRONGCRED: 'No parece ser la dirección de e-mail o contraseña correcta. Por favor intente de nuevo.'
     FIRSTNAME: Nombre(s)
     INTERFACELANG: 'Lenguaje de la Interfaz'
-    INVALIDNEWPASSWORD: 'We couldn''t accept that password: {password}'
-    LOGGEDINAS: 'You''re logged in as {name}.'
+    INVALIDNEWPASSWORD: 'No podemos aceptar este password: {password}'
+    LOGGEDINAS: 'Estás conectado como {name}.'
     NEWPASSWORD: 'Nueva Contraseña'
     PASSWORD: Contraseña
     PLURALNAME: Miembros
@@ -372,10 +385,10 @@ es:
     SUBJECTPASSWORDCHANGED: 'Su contraseña ha sido cambiada'
     SUBJECTPASSWORDRESET: 'Enlace para restaurar su contraseña'
     SURNAME: Apellidos
-    TIMEFORMAT: 'Time format'
+    TIMEFORMAT: 'Formato de tiempo'
     VALIDATIONMEMBEREXISTS: 'Ya existe un miembro con este email.'
-    ValidationIdentifierFailed: 'Can''t overwrite existing member #{id} with identical identifier ({name} = {value}))'
-    WELCOMEBACK: 'Welcome Back, {firstname}'
+    ValidationIdentifierFailed: 'No se puede sobrescribir el miembro existente #{id} con identificador idéntico ({name} = {value}))'
+    WELCOMEBACK: 'Bienvenido de nuevo, {firstname}'
     YOUROLDPASSWORD: 'Su contraseña anterior'
     belongs_many_many_Groups: Grupos
     db_LastVisited: 'Fecha de la Última Visita'
@@ -387,98 +400,99 @@ es:
   MemberAuthenticator:
     TITLE: 'E-mail &amp; Contraseña'
   MemberDatetimeOptionsetField:
-    AMORPM: 'AM (Ante meridiem) or PM (Post meridiem)'
-    'APPLY FILTER': 'Apply Filter'
-    Custom: Custom
-    DATEFORMATBAD: 'Date format is invalid'
-    DAYNOLEADING: 'Day of month without leading zero'
-    DIGITSDECFRACTIONSECOND: 'One or more digits representing a decimal fraction of a second'
-    FOURDIGITYEAR: 'Four-digit year'
-    FULLNAMEMONTH: 'Full name of month (e.g. June)'
-    HOURNOLEADING: 'Hour without leading zero'
-    MINUTENOLEADING: 'Minute without leading zero'
-    MONTHNOLEADING: 'Month digit without leading zero'
-    Preview: Preview
-    SHORTMONTH: 'Short name of month (e.g. Jun)'
-    TOGGLEHELP: 'Toggle formatting help'
-    TWODIGITDAY: 'Two-digit day of month'
-    TWODIGITHOUR: 'Two digits of hour (00 through 23)'
-    TWODIGITMINUTE: 'Two digits of minute (00 through 59)'
-    TWODIGITMONTH: 'Two-digit month (01=January, etc.)'
-    TWODIGITSECOND: 'Two digits of second (00 through 59)'
-    TWODIGITYEAR: 'Two-digit year'
+    AMORPM: 'AM (antes del mediodía) o PM (después del mediodía)'
+    'APPLY FILTER': 'Aplicar filtro'
+    Custom: Personalizable
+    DATEFORMATBAD: 'El formato de fecha es inválido'
+    DAYNOLEADING: 'Día del mes sin cero inicial'
+    DIGITSDECFRACTIONSECOND: 'Uno o más dígitos representando una fracción decimal de un segundo'
+    FOURDIGITYEAR: 'Año de cuatro dígitos'
+    FULLNAMEMONTH: 'Nombre completo del mes (ej.Junio)'
+    HOURNOLEADING: 'Hora sin ceros a la izquierda'
+    MINUTENOLEADING: 'Minutos sin cero inicial'
+    MONTHNOLEADING: 'Dígitos mes sin cero inicial'
+    Preview: 'Vista previa'
+    SHORTMONTH: 'Nombre abreviado del mes (por ejemplo, Jun)'
+    TOGGLEHELP: 'Cambia el formato de ayuda'
+    TWODIGITDAY: 'Día de dos dígitos del mes'
+    TWODIGITHOUR: 'Dos dígitos de hora (00 a 23)'
+    TWODIGITMINUTE: 'Dos dígitos en minutos (00 a 59)'
+    TWODIGITMONTH: 'Meses con dos dígitos (01=Enero,etc.)'
+    TWODIGITSECOND: 'Segundos con dos dígitos (00 a 59)'
+    TWODIGITYEAR: 'Año de dos dígitos'
+    Toggle: 'Show formatting help'
   MemberImportForm:
-    Help1: '<p>Import users in <em>CSV format</em> (comma-separated values). <small><a href="#" class="toggle-advanced">Show advanced usage</a></small></p>'
-    Help2: '<div class="advanced">	<h4>Advanced usage</h4>	<ul>	<li>Allowed columns: <em>%s</em></li>	<li>Existing users are matched by their unique <em>Code</em> property, and updated with any new values from	the imported file.</li>	<li>Groups can be assigned by the <em>Groups</em> column. Groups are identified by their <em>Code</em> property,	multiple groups can be separated by comma. Existing group memberships are not cleared.</li>	</ul></div>'
-    ResultCreated: 'Created {count} members'
+    Help1: '<p>Importar usuarios en <em>formato CSV</em> (valores separados por coma). <small><a href="#" class="toggle-advanced">Mostrar uso avanzado</a></small></p>'
+    Help2: "<div class=\"advanced\">\\n<h4>Uso avanzado</h4>\\n<ul>\\n<li>Columnas permitidas: <em>%s</em></li>\\n<li>Usuarios existentes son relacionados por su propiedad <em>Code</em>, y actualizados con nuevos valores desde el archivo importado.</li>\\n<li>Los grupos pueden ser asignaods por la columna <em>Groups</em>. Los grupos son identificados por su propiedad <em>Code</em>,\\nmúltiples grupos pueden ser separados por comas. Los grupos de miembros existentes no son borrados.</li>\\n</ul>\\n</div>"
+    ResultCreated: 'Creados {count} miembros'
     ResultDeleted: 'Se eliminaron %d miembros'
-    ResultNone: 'No changes'
-    ResultUpdated: 'Updated {count} members'
+    ResultNone: 'No hay cambios'
+    ResultUpdated: 'Actualizados {count} miembros'
   MemberPassword:
-    PLURALNAME: 'Member Passwords'
-    SINGULARNAME: 'Member Password'
+    PLURALNAME: 'Contraseñas de los miembros'
+    SINGULARNAME: 'Contraseña del miembro'
   MemberTableField: null
   ModelAdmin:
     DELETE: Eliminar
-    DELETEDRECORDS: 'Deleted {count} records.'
-    EMPTYBEFOREIMPORT: 'Clear Database before import'
+    DELETEDRECORDS: 'Borrados {count} registros.'
+    EMPTYBEFOREIMPORT: 'Replace data'
     IMPORT: 'Importar desde CSV'
-    IMPORTEDRECORDS: 'Imported {count} records.'
+    IMPORTEDRECORDS: 'Importados {count} registros.'
     NOCSVFILE: 'Por favor, selecciona un archivo CSV para importar'
     NOIMPORT: 'Nada para importar'
-    RESET: Reset
-    Title: 'Data Models'
-    UPDATEDRECORDS: 'Updated {count} records.'
+    RESET: Restablecer
+    Title: 'Modelos de datos'
+    UPDATEDRECORDS: 'Actualizados {count} registros.'
   ModelAdmin_ImportSpec.ss:
-    IMPORTSPECFIELDS: 'Database columns'
-    IMPORTSPECLINK: 'Show Specification for %s'
-    IMPORTSPECRELATIONS: Relations
-    IMPORTSPECTITLE: 'Specification for %s'
+    IMPORTSPECFIELDS: 'Columnas de la base de datos'
+    IMPORTSPECLINK: 'Mostrar especificación para %s'
+    IMPORTSPECRELATIONS: Relaciones
+    IMPORTSPECTITLE: 'Especificación para %s'
   ModelAdmin_Tools.ss:
-    FILTER: Filter
-    IMPORT: Import
+    FILTER: Filtrar
+    IMPORT: Importar
   ModelSidebar.ss:
-    IMPORT_TAB_HEADER: Import
-    SEARCHLISTINGS: Search
+    IMPORT_TAB_HEADER: Importar
+    SEARCHLISTINGS: Buscar
   MoneyField:
-    FIELDLABELAMOUNT: Amount
-    FIELDLABELCURRENCY: Currency
+    FIELDLABELAMOUNT: Cantidad
+    FIELDLABELCURRENCY: Moneda
   NullableField:
-    IsNullLabel: 'Is Null'
+    IsNullLabel: 'Es Nulo'
   NumericField:
-    VALIDATION: '''{value}'' is not a number, only numbers can be accepted for this field'
+    VALIDATION: '''{value}'' no es un número, sólo números pueden ser aceptados para este campo'
   Pagination:
-    Page: Page
-    View: View
+    Page: Página
+    View: Vista
   Permission:
-    AdminGroup: Administrator
-    CMS_ACCESS_CATEGORY: 'CMS Access'
+    AdminGroup: Administrador
+    CMS_ACCESS_CATEGORY: 'Acceso al CMS'
     FULLADMINRIGHTS: 'Todos los derechos administrativos'
-    FULLADMINRIGHTS_HELP: 'Implies and overrules all other assigned permissions.'
-    PLURALNAME: Permissions
-    SINGULARNAME: Permission
+    FULLADMINRIGHTS_HELP: 'Implica y anula todos los demás permisos asignados.'
+    PLURALNAME: Permisos
+    SINGULARNAME: Permiso
   PermissionCheckboxSetField:
-    AssignedTo: 'assigned to "{title}"'
-    FromGroup: 'inherited from group "{title}"'
-    FromRole: 'inherited from role "{title}"'
-    FromRoleOnGroup: 'inherited from role "%s" on group "%s"'
+    AssignedTo: 'asignado a "{title}"'
+    FromGroup: 'heredado desde el grupo "{title}"'
+    FromRole: 'heredado desde la regla "{title}"'
+    FromRoleOnGroup: 'heredado desde la regla "%s" del grupo "%s"'
   PermissionRole:
-    OnlyAdminCanApply: 'Only admin can apply'
-    PLURALNAME: Roles
-    SINGULARNAME: Role
-    Title: Title
+    OnlyAdminCanApply: 'Sólo el administrador puede aplicar'
+    PLURALNAME: Reglas
+    SINGULARNAME: Regla
+    Title: Título
   PermissionRoleCode:
-    PLURALNAME: 'Permission Role Cods'
-    SINGULARNAME: 'Permission Role Code'
+    PLURALNAME: 'Códigos de las reglas de permisos'
+    SINGULARNAME: 'Códigos de las regla de permisos'
   Permissions:
-    PERMISSIONS_CATEGORY: 'Roles and access permissions'
-    UserPermissionsIntro: 'Assigning groups to this user will adjust the permissions they have. See the groups section for details of permissions on individual groups.'
+    PERMISSIONS_CATEGORY: 'Reglas y permisos de acceso'
+    UserPermissionsIntro: 'Asignar grupos a este usuario ajustará los permisos que tienen. Vea la sección de grupos para obtener información sobre permisos en grupos individuales.'
   PhoneNumberField:
     VALIDATION: 'Por favor introduzca un número de teléfono válido'
   RelationComplexTableField.ss:
     ADD: Añadir
-    CSVEXPORT: 'Export to CSV'
-    NOTFOUND: 'No items found'
+    CSVEXPORT: 'Exportar a CSV'
+    NOTFOUND: 'Registros no encontrados'
   Security:
     ALREADYLOGGEDIN: 'No tiene acceso a esta página. Si posee otra cuenta con los privilegios para acceder a esta página, puede iniciar sesión a continuación.'
     BUTTONSEND: 'Envíenme el enlace para restaurar la contraseña'
@@ -489,88 +503,106 @@ es:
     LOGGEDOUT: 'Ha terminado su sesión. Si desea iniciar sesión nuevamente, introduzca sus datos de acreditación a continuación.'
     LOGIN: Entrar
     NOTEPAGESECURED: 'Esa página está protegida. Introduzca sus datos de acreditación a continuación y lo enviaremos a ella en un momento.'
-    NOTERESETLINKINVALID: '<p>The password reset link is invalid or expired.</p><p>You can request a new one <a href="{link1}">here</a> or change your password after you <a href="{link2}">logged in</a>.</p>'
+    NOTERESETLINKINVALID: '<p>El enlace para restablecer la contraseña es inválido o ha expirado.</p><p>Usted puede solicitar uno nuevo <a href="{link1}">aqui</a> o cambiar su contraseña después de que se haya <a href="{link2}">conectado</a>.</p>'
     NOTERESETPASSWORD: 'Introduzca su dirección de e-mail, y le enviaremos un enlace, con el cual podrá restaurar su contraseña'
-    PASSWORDSENTHEADER: 'Password reset link sent to ''{email}'''
-    PASSWORDSENTTEXT: 'Thank you! A reset link has been sent to ''{email}'', provided an account exists for this email address.'
+    PASSWORDSENTHEADER: 'Un enlace para restablecer la contraseña ha sido enviado a ''{email}'''
+    PASSWORDSENTTEXT: 'Gracias! Un enlace para restablecer la contraseña ha sido enviado a ''{email}'', siempre que una cuenta exista para la dirección de email indicada.'
   SecurityAdmin:
-    ACCESS_HELP: 'Allow viewing, adding and editing users, as well as assigning permissions and roles to them.'
-    APPLY_ROLES: 'Apply roles to groups'
-    APPLY_ROLES_HELP: 'Ability to edit the roles assigned to a group. Requires the "Access to ''Users'' section" permission.'
+    ACCESS_HELP: 'Permitir ver, añadir y editar usuarios, así como asignarles permisos y reglas.'
+    APPLY_ROLES: 'Aplicar reglas a grupos'
+    APPLY_ROLES_HELP: 'Posibilidad de editar las reglas asignados a un grupo. Requiere el permiso de "acceso a la sección ''Usuarios''" .'
     EDITPERMISSIONS: 'Editar permisos y direcciones IP de cada grupo'
-    EDITPERMISSIONS_HELP: 'Ability to edit Permissions and IP Addresses for a group. Requires the "Access to ''Security'' section" permission.'
+    EDITPERMISSIONS_HELP: 'Posibilidad de editar los permisos y direcciones IP para un grupo. Requiere el permiso de "Acceso a la sección ''Seguridad '' ".'
     GROUPNAME: 'Nombre del grupo'
-    IMPORTGROUPS: 'Import groups'
-    IMPORTUSERS: 'Import users'
+    IMPORTGROUPS: 'Importar grupos'
+    IMPORTUSERS: 'Importar usuarios'
     MEMBERS: Miembros
-    MENUTITLE: Security
-    MemberListCaution: 'Caution: Removing members from this list will remove them from all groups and the database'
+    MENUTITLE: Seguridad
+    MemberListCaution: 'Precaución: Borrar miembros de esta lista también los eliminará de todos los grupos y la base de datos'
     NEWGROUP: 'Nuevo grupo'
     PERMISSIONS: Permisos
-    ROLES: Roles
-    ROLESDESCRIPTION: 'Roles are predefined sets of permissions, and can be assigned to groups.<br />They are inherited from parent groups if required.'
-    TABROLES: Roles
-    Users: Users
+    ROLES: Reglas
+    ROLESDESCRIPTION: 'Las reglas son conjuntos predefinidos de permisos, y pueden ser asignadas a grupos.<br /> Pueden ser heredadas desde grupos padres si es necesario.'
+    TABROLES: Reglas
+    Users: Usuarios
   SecurityAdmin_MemberImportForm:
-    BtnImport: 'Import from CSV'
-    FileFieldLabel: 'CSV File <small>(Allowed extensions: *.csv)</small>'
+    BtnImport: 'Importar desde CSV'
+    FileFieldLabel: 'Archivo CSV <small>(Permitidas extensiones: *.csv)</small>'
   SilverStripeNavigator:
-    Edit: Edit
+    Auto: Auto
+    ChangeViewMode: 'Change view mode'
+    Desktop: Desktop
+    DualWindowView: 'Dual Window'
+    Edit: Editar
+    EditView: 'Edit mode'
+    Mobile: Mobile
+    PreviewState: 'Preview State'
+    PreviewView: 'Preview mode'
+    Responsive: Responsive
+    SplitView: 'Split mode'
+    Tablet: Tablet
+    ViewDeviceWidth: 'Select a preview width'
+    Width: width
   SimpleImageField:
     NOUPLOAD: 'No se han agregado imágenes'
   SiteTree:
     TABMAIN: Principal
   TableField:
-    ISREQUIRED: 'In %s ''%s'' is required'
+    ISREQUIRED: 'En %s ''%s'' es requerido'
   TableField.ss:
     ADD: 'Añadir una nueva línea'
-    ADDITEM: 'Add %s'
+    ADDITEM: 'Añadir %s'
   TableListField:
     CSVEXPORT: 'Exportar a CSV'
     PRINT: Imprimir
-    Print: Print
-    SELECT: 'Select:'
+    Print: Imprimir
+    SELECT: Seleccionar
   TableListField.ss:
-    NOITEMSFOUND: 'No items found'
-    SORTASC: 'Sort in ascending order'
-    SORTDESC: 'Sort in descending order'
+    NOITEMSFOUND: 'Registros no encontrados'
+    SORTASC: 'Clasificar en orden ascendente'
+    SORTDESC: 'Clasificar en orden descendente'
   TableListField_PageControls.ss:
-    DISPLAYING: Displaying
-    OF: of
-    TO: to
+    DISPLAYING: Mostrando
+    OF: de
+    TO: a
     VIEWFIRST: 'Ver primero'
     VIEWLAST: 'Ver último'
     VIEWNEXT: 'Ver siguiente'
     VIEWPREVIOUS: 'Ver anterior'
   TimeField:
-    VALIDATEFORMAT: 'Please enter a valid time format ({format})'
+    VALIDATEFORMAT: 'Por favor, introduzca un formato de tiempo válido ({format})'
   ToggleField:
     LESS: menos
     MORE: más
   UploadField:
-    ATTACHFILE: 'Attach a file'
-    ATTACHFILES: 'Attach files'
-    AttachFile: 'Attach file(s)'
-    DELETE: 'Delete from files'
-    DELETEINFO: 'Permanently delete this file from the file store'
-    DOEDIT: Save
-    DROPFILE: 'drop a file'
-    DROPFILES: 'drop files'
-    Dimensions: Dimensions
-    EDIT: Edit
-    EDITINFO: 'Edit this file'
-    FIELDNOTSET: 'File information not found'
-    FROMCOMPUTER: 'From your computer'
-    FROMCOMPUTERINFO: 'Select from files'
-    FROMFILES: 'From files'
-    HOTLINKINFO: 'Info: This image will be hotlinked. Please ensure you have permissions from the original site creator to do so.'
-    MAXNUMBEROFFILES: 'Max number of {count} file(s) exceeded.'
-    MAXNUMBEROFFILESSHORT: 'Can only upload {count} files'
-    REMOVE: Remove
-    REMOVEERROR: 'Error removing file'
-    REMOVEINFO: 'Remove this file from here, but do not delete it from the file store'
-    STARTALL: 'Start all'
-    STARTALLINFO: 'Start all uploads'
-    Saved: Saved
+    ATTACHFILE: 'Adjuntar un archivo'
+    ATTACHFILES: 'Adjuntar ficheros'
+    AttachFile: 'Adjuntar archivo(s)'
+    CHOOSEANOTHERFILE: 'Choose another file'
+    CHOOSEANOTHERINFO: 'Replace this file with another one from the file store'
+    DELETE: 'Borrar desde archivos'
+    DELETEINFO: 'Borrar permanentemente este archivo del almacén de archivos'
+    DOEDIT: Guardar
+    DROPFILE: 'Soltar un fichero'
+    DROPFILES: 'soltar archivos'
+    Dimensions: Dimensiones
+    EDIT: Editar
+    EDITINFO: 'Editar este archivo'
+    FIELDNOTSET: 'No ha sido encontrada la información del archivo'
+    FROMCOMPUTER: 'Desde tu ordenador'
+    FROMCOMPUTERINFO: 'Seleccione desde los archivos'
+    FROMFILES: 'Desde archivos'
+    HOTLINKINFO: 'Información: Esta imagen será hotlinked. Asegúrese de que tiene los permisos del sitio original del creador para hacerlo.'
+    MAXNUMBEROFFILES: 'El número máximo de {count} archivo(s) ha sido excedido.'
+    MAXNUMBEROFFILESONE: 'Can only upload one file'
+    MAXNUMBEROFFILESSHORT: 'Sólo puede cargar {count} archivos'
+    OVERWRITEWARNING: 'File with the same name already exists'
+    REMOVE: Eliminar
+    REMOVEERROR: 'Error borrando el fichero'
+    REMOVEINFO: 'Eliminar este archivo de este lugar, pero no eliminarlo del almacén de archivos'
+    STARTALL: 'Iniciar todos'
+    STARTALLINFO: 'Iniciar todas las subidas de archivos'
+    Saved: Guardado
+    UPLOADSINTO: 'saves into /{path}'
   Versioned:
     has_many_Versions: Versiones

lang/es_AR.yml

@@ -2,6 +2,7 @@ es_AR:
   AssetAdmin:
     ALLOWEDEXTS: 'Allowed extensions'
     NEWFOLDER: 'Nueva Carpeta'
+    SHOWALLOWEDEXTS: 'Show allowed extensions'
   AssetTableField:
     CREATED: 'Agregado por primera vez'
     DIM: Dimensiones
@@ -59,9 +60,9 @@ es_AR:
     ERRORNOTADMIN: 'El usuario no es administrador.'
     ERRORNOTREC: 'No se reconoce el nombre de usuario / contraseña'
   Boolean:
-    0: No
     ANY: Cualquiera
-    1: Sí
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   CMSLoadingScreen.ss:
     LOADING: Loading...
     REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
@@ -70,6 +71,8 @@ es_AR:
     ACCESSALLINTERFACES: 'Acceder a todas las secciones del CMS'
     ACCESSALLINTERFACESHELP: 'Overrules more specific access settings.'
     SAVE: Guardar
+  CMSPageHistoryController_versions.ss:
+    PREVIEW: 'Website preview'
   CMSProfileController:
     MENUTITLE: 'My Profile'
   ChangePasswordEmail.ss:
@@ -79,8 +82,8 @@ es_AR:
     HELLO: Hola
     PASSWORD: Contraseña
   CheckboxField:
-    - No
-    - No
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   ComplexTableField:
     CLOSEPOPUP: 'Cerrar Ventana Emergente'
     SUCCESSADD2: 'Added {name}'
@@ -109,20 +112,21 @@ es_AR:
     PLURALNAME: 'Objetos de Datos'
     SINGULARNAME: 'Objeto de Datos'
   Date:
-    DAY: día
-    DAYS: días
-    HOUR: hora
-    HOURS: horas
+    DAY: day
+    DAYS: days
+    HOUR: hour
+    HOURS: hours
+    LessThanMinuteAgo: 'less than a minute'
     MIN: min
-    MINS: min
-    MONTH: mes
-    MONTHS: meses
-    SEC: seg
-    SECS: segs
+    MINS: mins
+    MONTH: month
+    MONTHS: months
+    SEC: sec
+    SECS: secs
     TIMEDIFFAGO: '{difference} ago'
     TIMEDIFFIN: 'in {difference}'
-    YEAR: año
-    YEARS: años
+    YEAR: year
+    YEARS: years
   DateField:
     NOTSET: 'no especificada'
     TODAY: hoy
@@ -198,7 +202,8 @@ es_AR:
     TEXT2: 'vínculo para restablecer la contraseña'
     TEXT3: para
   Form:
-    FIELDISREQUIRED: '%s es obligatorio.'
+    CSRF_FAILED_MESSAGE: 'There seems to have been a technical problem. Please click the back button, refresh your browser, and try again.'
+    FIELDISREQUIRED: '{name} is required'
     SubmitBtnLabel: Go
     VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
     VALIDATIONNOTUNIQUE: 'El valor ingresado no es único'
@@ -208,6 +213,7 @@ es_AR:
     VALIDATOR: Verificador
     VALIDCURRENCY: 'Please enter a valid currency'
   FormField:
+    Example: 'e.g. %s'
     NONE: ninguna
   GridAction:
     DELETE_DESCRIPTION: Delete
@@ -230,6 +236,7 @@ es_AR:
     ResetFilter: Reset
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'No delete permissions'
+    EditPermissionsFailure: 'No permission to unlink record'
   GridFieldDetailForm:
     CancelBtn: Cancel
     Create: Create
@@ -237,7 +244,9 @@ es_AR:
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
     Save: Save
-    Saved: 'Saved %s %s'
+    Saved: 'Saved {name} {link}'
+  GridFieldEditButton.ss:
+    EDIT: Edit
   GridFieldItemEditView.ss: null
   Group:
     AddRole: 'Add a role for this group'
@@ -267,6 +276,7 @@ es_AR:
     ADDURL: 'Add URL'
     ADJUSTDETAILSDIMENSIONS: 'Details & dimensions'
     ANCHORVALUE: Anclar
+    BUTTONADDURL: 'Add url'
     BUTTONINSERT: Insert
     BUTTONINSERTLINK: 'Insertar enlace'
     BUTTONREMOVELINK: 'Quitar enlace'
@@ -331,7 +341,10 @@ es_AR:
     PreviewButton: Preview
     REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
     SAVEDUP: Saved.
-    VersionUnknown: unknown
+    ShowAsList: 'show as list'
+    TooManyPages: 'Too many pages'
+    ValidationError: 'Validation error'
+    VersionUnknown: Unknown
   LeftAndMain_Menu.ss:
     Hello: Hi
     LOGOUT: 'Log out'
@@ -407,6 +420,7 @@ es_AR:
     TWODIGITMONTH: 'Two-digit month (01=January, etc.)'
     TWODIGITSECOND: 'Two digits of second (00 through 59)'
     TWODIGITYEAR: 'Two-digit year'
+    Toggle: 'Show formatting help'
   MemberImportForm:
     Help1: '<p>Importar miembros en <em>formato CSV</em> (valores separados por comas). <small><a href="#" class="toggle-advanced">Mostrar uso avanzado</a></small></p>'
     Help2: '<div class="advanced">	<h4>Advanced usage</h4>	<ul>	<li>Allowed columns: <em>%s</em></li>	<li>Existing users are matched by their unique <em>Code</em> property, and updated with any new values from	the imported file.</li>	<li>Groups can be assigned by the <em>Groups</em> column. Groups are identified by their <em>Code</em> property,	multiple groups can be separated by comma. Existing group memberships are not cleared.</li>	</ul></div>'
@@ -421,7 +435,7 @@ es_AR:
   ModelAdmin:
     DELETE: Eliminar
     DELETEDRECORDS: 'Deleted {count} records.'
-    EMPTYBEFOREIMPORT: 'Clear Database before import'
+    EMPTYBEFOREIMPORT: 'Replace data'
     IMPORT: 'Importar desde CSV'
     IMPORTEDRECORDS: 'Imported {count} records.'
     NOCSVFILE: 'Por favor explorar por un archivo CVS para importar'
@@ -515,7 +529,20 @@ es_AR:
     BtnImport: importar
     FileFieldLabel: 'Archivo CSV <small>(extensiones permitidas: *.csv)</small>'
   SilverStripeNavigator:
+    Auto: Auto
+    ChangeViewMode: 'Change view mode'
+    Desktop: Desktop
+    DualWindowView: 'Dual Window'
     Edit: Edit
+    EditView: 'Edit mode'
+    Mobile: Mobile
+    PreviewState: 'Preview State'
+    PreviewView: 'Preview mode'
+    Responsive: Responsive
+    SplitView: 'Split mode'
+    Tablet: Tablet
+    ViewDeviceWidth: 'Select a preview width'
+    Width: width
   SimpleImageField:
     NOUPLOAD: 'La Imagen No se Cargó'
   SiteTree:
@@ -551,6 +578,8 @@ es_AR:
     ATTACHFILE: 'Attach a file'
     ATTACHFILES: 'Attach files'
     AttachFile: 'Attach file(s)'
+    CHOOSEANOTHERFILE: 'Choose another file'
+    CHOOSEANOTHERINFO: 'Replace this file with another one from the file store'
     DELETE: 'Delete from files'
     DELETEINFO: 'Permanently delete this file from the file store'
     DOEDIT: Save
@@ -565,12 +594,15 @@ es_AR:
     FROMFILES: 'From files'
     HOTLINKINFO: 'Info: This image will be hotlinked. Please ensure you have permissions from the original site creator to do so.'
     MAXNUMBEROFFILES: 'Max number of {count} file(s) exceeded.'
+    MAXNUMBEROFFILESONE: 'Can only upload one file'
     MAXNUMBEROFFILESSHORT: 'Can only upload {count} files'
+    OVERWRITEWARNING: 'File with the same name already exists'
     REMOVE: Remove
     REMOVEERROR: 'Error removing file'
     REMOVEINFO: 'Remove this file from here, but do not delete it from the file store'
     STARTALL: 'Start all'
     STARTALLINFO: 'Start all uploads'
     Saved: Saved
+    UPLOADSINTO: 'saves into /{path}'
   Versioned:
     has_many_Versions: Versiones

lang/es_MX.yml

@@ -2,6 +2,7 @@ es_MX:
   AssetAdmin:
     ALLOWEDEXTS: 'Allowed extensions'
     NEWFOLDER: 'Nueva Carpeta'
+    SHOWALLOWEDEXTS: 'Show allowed extensions'
   AssetTableField:
     CREATED: 'Agregado por primera vez'
     DIM: Dimensiones
@@ -59,9 +60,9 @@ es_MX:
     ERRORNOTADMIN: 'El usuario no es administrador.'
     ERRORNOTREC: 'No se reconoce el nombre de usuario / contraseña'
   Boolean:
-    0: Falso
     ANY: Cualquiera
-    1: Verdadero
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   CMSLoadingScreen.ss:
     LOADING: Cargando...
     REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
@@ -70,6 +71,8 @@ es_MX:
     ACCESSALLINTERFACES: 'Acceder a todas las secciones del CMS'
     ACCESSALLINTERFACESHELP: 'Anula la configuració de acceso más específica.'
     SAVE: Guardar
+  CMSPageHistoryController_versions.ss:
+    PREVIEW: 'Website preview'
   CMSProfileController:
     MENUTITLE: 'My Profile'
   ChangePasswordEmail.ss:
@@ -79,8 +82,8 @@ es_MX:
     HELLO: Hey
     PASSWORD: Contraseña
   CheckboxField:
-    - Falso
-    - Verdadero
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   ComplexTableField:
     CLOSEPOPUP: 'Cerrar Mensaje Emergente'
     SUCCESSADD2: 'Added {name}'
@@ -109,20 +112,21 @@ es_MX:
     PLURALNAME: 'Datos de objetos'
     SINGULARNAME: 'Datos del objeto'
   Date:
-    DAY: día
-    DAYS: días
-    HOUR: hora
-    HOURS: horas
-    MIN: minuto
-    MINS: minutos
-    MONTH: mes
-    MONTHS: meses
-    SEC: segundo
-    SECS: segundos
+    DAY: day
+    DAYS: days
+    HOUR: hour
+    HOURS: hours
+    LessThanMinuteAgo: 'less than a minute'
+    MIN: min
+    MINS: mins
+    MONTH: month
+    MONTHS: months
+    SEC: sec
+    SECS: secs
     TIMEDIFFAGO: '{difference} atrás'
     TIMEDIFFIN: 'en {difference}'
-    YEAR: año
-    YEARS: años
+    YEAR: year
+    YEARS: years
   DateField:
     NOTSET: 'no especificada'
     TODAY: ahora
@@ -198,7 +202,8 @@ es_MX:
     TEXT2: 'vínculo para restablecer la contraseña'
     TEXT3: para
   Form:
-    FIELDISREQUIRED: '%s es obligatorio'
+    CSRF_FAILED_MESSAGE: 'There seems to have been a technical problem. Please click the back button, refresh your browser, and try again.'
+    FIELDISREQUIRED: '{name} is required'
     SubmitBtnLabel: Go
     VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
     VALIDATIONNOTUNIQUE: 'El valor ingresado no es único'
@@ -208,6 +213,7 @@ es_MX:
     VALIDATOR: Verificador
     VALIDCURRENCY: 'Please enter a valid currency'
   FormField:
+    Example: 'e.g. %s'
     NONE: Ninguno
   GridAction:
     DELETE_DESCRIPTION: Delete
@@ -230,6 +236,7 @@ es_MX:
     ResetFilter: Resetear
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'No borrar permisos'
+    EditPermissionsFailure: 'No permission to unlink record'
   GridFieldDetailForm:
     CancelBtn: Cancel
     Create: Create
@@ -237,7 +244,9 @@ es_MX:
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
     Save: Save
-    Saved: 'Saved %s %s'
+    Saved: 'Saved {name} {link}'
+  GridFieldEditButton.ss:
+    EDIT: Edit
   GridFieldItemEditView.ss: null
   Group:
     AddRole: 'Agrega un rol para este grupo'
@@ -267,6 +276,7 @@ es_MX:
     ADDURL: 'Add URL'
     ADJUSTDETAILSDIMENSIONS: 'Details & dimensions'
     ANCHORVALUE: Anclar
+    BUTTONADDURL: 'Add url'
     BUTTONINSERT: Insertar
     BUTTONINSERTLINK: 'Insertar enlace'
     BUTTONREMOVELINK: 'Quitar enlace'
@@ -331,6 +341,9 @@ es_MX:
     PreviewButton: Preview
     REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
     SAVEDUP: Saved.
+    ShowAsList: 'show as list'
+    TooManyPages: 'Too many pages'
+    ValidationError: 'Validation error'
     VersionUnknown: desconocido
   LeftAndMain_Menu.ss:
     Hello: Hi
@@ -407,6 +420,7 @@ es_MX:
     TWODIGITMONTH: 'Mes de 2 dígitos (01=Enero, etc.)'
     TWODIGITSECOND: 'Dos dígitos de los segundos (00 a 59)'
     TWODIGITYEAR: 'Año en 2 dígitos'
+    Toggle: 'Show formatting help'
   MemberImportForm:
     Help1: "<p>Importar usurious en <em>format CSV</em> (valores separados por comas). <small><a href=\"#\" class=\"toggle-advanced\">Mostrar uso avanzado</a></small></p>\\n"
     Help2: '<div class="advanced">	<h4>Advanced usage</h4>	<ul>	<li>Allowed columns: <em>%s</em></li>	<li>Existing users are matched by their unique <em>Code</em> property, and updated with any new values from	the imported file.</li>	<li>Groups can be assigned by the <em>Groups</em> column. Groups are identified by their <em>Code</em> property,	multiple groups can be separated by comma. Existing group memberships are not cleared.</li>	</ul></div>'
@@ -421,7 +435,7 @@ es_MX:
   ModelAdmin:
     DELETE: Eliminar
     DELETEDRECORDS: 'Borrados {count} registros'
-    EMPTYBEFOREIMPORT: 'Clear Database before import'
+    EMPTYBEFOREIMPORT: 'Replace data'
     IMPORT: 'Importar desde CSV'
     IMPORTEDRECORDS: 'Importados {count} registros'
     NOCSVFILE: 'Por favor navegue hasta el archivo CSV a importar'
@@ -515,7 +529,20 @@ es_MX:
     BtnImport: Importar
     FileFieldLabel: 'Archivo CSV <small>(Extensiones permitidas: *.csv)'
   SilverStripeNavigator:
+    Auto: Auto
+    ChangeViewMode: 'Change view mode'
+    Desktop: Desktop
+    DualWindowView: 'Dual Window'
     Edit: Edit
+    EditView: 'Edit mode'
+    Mobile: Mobile
+    PreviewState: 'Preview State'
+    PreviewView: 'Preview mode'
+    Responsive: Responsive
+    SplitView: 'Split mode'
+    Tablet: Tablet
+    ViewDeviceWidth: 'Select a preview width'
+    Width: width
   SimpleImageField:
     NOUPLOAD: 'No subió la Imagen'
   SiteTree:
@@ -551,6 +578,8 @@ es_MX:
     ATTACHFILE: 'Adjuntar un archivo'
     ATTACHFILES: 'Adjuntar archivos'
     AttachFile: 'Adjuntar archivo(s)'
+    CHOOSEANOTHERFILE: 'Choose another file'
+    CHOOSEANOTHERINFO: 'Replace this file with another one from the file store'
     DELETE: 'Delete from files'
     DELETEINFO: 'Eliminar permanentemente este archivo desde el almacén'
     DOEDIT: Guardar
@@ -565,12 +594,15 @@ es_MX:
     FROMFILES: 'Desde archivos'
     HOTLINKINFO: 'Info: This image will be hotlinked. Please ensure you have permissions from the original site creator to do so.'
     MAXNUMBEROFFILES: 'Máximo número {count} de archivos sobrepasado'
+    MAXNUMBEROFFILESONE: 'Can only upload one file'
     MAXNUMBEROFFILESSHORT: 'Solo puedes subir {count} archivos'
+    OVERWRITEWARNING: 'File with the same name already exists'
     REMOVE: Remover
     REMOVEERROR: 'Error removiendo archivo'
     REMOVEINFO: 'Remover este archivo de aquí, pero no borrarlo del almacén de archivos'
     STARTALL: 'Comenzar todas'
     STARTALLINFO: 'Start all uploads'
     Saved: Guardado
+    UPLOADSINTO: 'saves into /{path}'
   Versioned:
     has_many_Versions: Versiones

lang/et_EE.yml

@@ -1,43 +1,44 @@
 et_EE:
   AssetAdmin:
-    ALLOWEDEXTS: 'Allowed extensions'
+    ALLOWEDEXTS: 'Lubatud laiendid'
     NEWFOLDER: 'Uus kaust'
+    SHOWALLOWEDEXTS: 'Show allowed extensions'
   AssetTableField:
     CREATED: 'Esmakordselt üles laaditud'
     DIM: Mõõtmed
     FILENAME: Failinimi
-    FOLDER: Folder
+    FOLDER: Kaust
     LASTEDIT: 'Viimati muudetud'
     OWNER: Omanik
-    SIZE: Suurus
+    SIZE: Failisuurus
     TITLE: Pealkiri
-    TYPE: Tüüp
-    URL: Aadress
+    TYPE: Failitüüp
+    URL: URL
   AssetUploadField:
-    ChooseFiles: 'Choose files'
-    DRAGFILESHERE: 'Lohista failid siia'
-    DROPAREA: 'Drop Area'
-    EDITALL: 'Edit all'
-    EDITANDORGANIZE: 'Edit & organize'
-    EDITINFO: 'Edit files'
-    FILES: Files
-    FROMCOMPUTER: 'Choose files from your computer'
-    FROMCOMPUTERINFO: 'Upload from your computer'
-    TOTAL: Total
-    TOUPLOAD: 'Choose files to upload...'
-    UPLOADINPROGRESS: 'Please wait… upload in progress'
-    UPLOADOR: OR
+    ChooseFiles: 'Valige failid'
+    DRAGFILESHERE: 'Lohistage failid siia'
+    DROPAREA: Pukseerimisala
+    EDITALL: 'Muuda kõiki'
+    EDITANDORGANIZE: 'Muuda ja korralda'
+    EDITINFO: 'Muuda faile'
+    FILES: Failid
+    FROMCOMPUTER: 'Valige fail arvutist'
+    FROMCOMPUTERINFO: 'Laadige üles arvutist'
+    TOTAL: Kokku
+    TOUPLOAD: 'Valige üleslaadimiseks failid...'
+    UPLOADINPROGRESS: 'Oodake... Üleslaadimine on pooleli'
+    UPLOADOR: VÕI
   BBCodeParser:
     ALIGNEMENT: Joondus
     ALIGNEMENTEXAMPLE: 'Joondus paremale'
     BOLD: 'Paks tekst'
     BOLDEXAMPLE: Paks
-    CODE: 'Koodi plokk'
+    CODE: Koodiplokk
     CODEDESCRIPTION: 'Kodederimata koodi plokk'
     CODEEXAMPLE: 'Koodi plokk'
-    COLORED: 'Värvitud tekst'
+    COLORED: 'Värviline tekst'
     COLOREDEXAMPLE: 'Sinine tekst'
-    EMAILLINK: 'Emaili aadress'
+    EMAILLINK: 'Saada link e-posti teel'
     EMAILLINKDESCRIPTION: 'Loo link emaili aadrssile'
     IMAGE: Pilt
     IMAGEDESCRIPTION: 'Näita pilti oma postituses'
@@ -59,19 +60,21 @@ et_EE:
     ERRORNOTADMIN: 'Antud kasutaja ei ole administraator.'
     ERRORNOTREC: 'See kasutajanimi / parool ei ole tunnustatud'
   Boolean:
-    0: 'False'
-    ANY: Any
-    1: 'True'
+    ANY: Kõik
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   CMSLoadingScreen.ss:
-    LOADING: Loading...
-    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
+    LOADING: Laadimine...
+    REQUIREJS: 'Sisuhaldussüsteem nõuab, et JavaScript oleks lubatud.'
   CMSMain:
     ACCESS: 'Juurdepääs jaotisele ''{title}'''
     ACCESSALLINTERFACES: 'Ligipääs kõigile Sisuhalduse kasutajaliidestele'
-    ACCESSALLINTERFACESHELP: 'Overrules more specific access settings.'
+    ACCESSALLINTERFACESHELP: 'Alistab täpsemad juurdepääsuseaded.'
     SAVE: Salvesta
+  CMSPageHistoryController_versions.ss:
+    PREVIEW: 'Website preview'
   CMSProfileController:
-    MENUTITLE: 'My Profile'
+    MENUTITLE: 'Minu profiil'
   ChangePasswordEmail.ss:
     CHANGEPASSWORDTEXT1: 'Vahetasid oma parooli lehel'
     CHANGEPASSWORDTEXT2: 'Nüüd võid kasutada sisse logimiseks järgnevaid andmeid:'
@@ -79,28 +82,28 @@ et_EE:
     HELLO: Tere
     PASSWORD: Parool
   CheckboxField:
-    - 'False'
-    - 'True'
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   ComplexTableField:
     CLOSEPOPUP: 'Sulge hüpikaken'
-    SUCCESSADD2: 'Added {name}'
+    SUCCESSADD2: '{name} on lisatud'
     SUCCESSEDIT: 'Salvestatud %s %s %s'
   ComplexTableField.ss:
     ADDITEM: 'Lisa %s'
-    NOITEMSFOUND: 'No items found'
+    NOITEMSFOUND: 'Üksusi ei leitud'
     SORTASC: 'Sorteeri kasvavalt'
     SORTDESC: 'Sorteeri kahanevalt'
   ComplexTableField_popup.ss:
     NEXT: Eelmine
     PREVIOUS: Järgmine
   ConfirmedPasswordField:
-    ATLEAST: 'Passwords must be at least {min} characters long.'
-    BETWEEN: 'Passwords must be {min} to {max} characters long.'
-    MAXIMUM: 'Passwords must be at most {max} characters long.'
+    ATLEAST: 'Parool peab olema vähemalt {min} märki pikk.'
+    BETWEEN: 'Parooli pikkus peab olema vahemikus {min}–{max} märki.'
+    MAXIMUM: 'Parool võib olla kuni {max} märki pikk.'
     SHOWONCLICKTITLE: 'Muuda parool'
   CreditCardField:
     FIRST: esimene
-    FOURTH: Neljas
+    FOURTH: neljas
     SECOND: teine
     THIRD: kolmas
   CurrencyField:
@@ -109,192 +112,199 @@ et_EE:
     PLURALNAME: 'Andme objektid'
     SINGULARNAME: 'Andme objekt'
   Date:
-    DAY: Päev
-    DAYS: Päevad
-    HOUR: Tund
-    HOURS: Tunnid
-    MIN: Minut
-    MINS: Minutid
-    MONTH: Kuu
-    MONTHS: Kuud
-    SEC: Sekund
-    SECS: Sekundit
+    DAY: day
+    DAYS: days
+    HOUR: hour
+    HOURS: hours
+    LessThanMinuteAgo: 'less than a minute'
+    MIN: min
+    MINS: mins
+    MONTH: month
+    MONTHS: months
+    SEC: sec
+    SECS: secs
     TIMEDIFFAGO: '{difference} ago'
     TIMEDIFFIN: 'in {difference}'
-    YEAR: Aasta
-    YEARS: Aastad
+    YEAR: year
+    YEARS: years
   DateField:
     NOTSET: 'Pole seadistatud'
     TODAY: Täna
-    VALIDDATEFORMAT2: 'Please enter a valid date format ({format})'
-    VALIDDATEMAXDATE: 'Your date has to be older or matching the maximum allowed date ({date})'
-    VALIDDATEMINDATE: 'Your date has to be newer or matching the minimum allowed date ({date})'
+    VALIDDATEFORMAT2: 'Sisestage sobivas vormingus kuupäev ({format})'
+    VALIDDATEMAXDATE: 'Teie kuupäev peab oleme lubatud kuupäevast ({date}) varasem või ühtima sellega.'
+    VALIDDATEMINDATE: 'Teie kuupäev peab oleme lubatud kuupäevast ({date}) hilisem või ühtima sellega.'
   DatetimeField:
     NOTSET: Määramata
   Director:
-    INVALID_REQUEST: 'Invalid request'
+    INVALID_REQUEST: 'Sobimatu taotlus'
   DropdownField:
     CHOOSE: (Vali)
   EmailField:
-    VALIDATION: 'Please enter an email address'
+    VALIDATION: 'Sisestage e-posti aadress'
   Email_BounceRecord:
-    PLURALNAME: 'Email Bounce Records'
-    SINGULARNAME: 'Email Bounce Record'
+    PLURALNAME: 'Tagastatud e-posti kirjed'
+    SINGULARNAME: 'Tagastatud e-posti kirje'
   Enum:
-    ANY: Any
+    ANY: Kõik
   File:
-    AviType: 'AVI videofail'
+    AviType: AVI-videofail
     Content: Sisu
-    CssType: 'CSS file'
+    CssType: CSS-fail
     DmgType: 'Apple disk image'
     DocType: 'Wordi dokument'
     Filename: Failinimi
-    GifType: 'GIF image - good for diagrams'
-    GzType: 'GZIP tihendatud fail'
-    HtlType: 'HTML fail'
-    HtmlType: 'HTML fail'
-    INVALIDEXTENSION: 'Extension is not allowed (valid: {extensions})'
-    INVALIDEXTENSIONSHORT: 'Extension is not allowed'
-    IcoType: 'Icon image'
-    JpgType: 'JPEG pilt - hea fotode jaoks'
+    GifType: 'GIF-kujutis – hea diagrammide jaoks'
+    GzType: 'Tihendatud GZIP-fail'
+    HtlType: HTML-fail
+    HtmlType: HTML-fail
+    INVALIDEXTENSION: 'Laiend ei ole lubatud (sobimatud: {extensions})'
+    INVALIDEXTENSIONSHORT: 'Laiend ei ole lubatud'
+    IcoType: Ikoonipilt
+    JpgType: 'JPEG-kujutis – hea fotode jaoks'
     JsType: 'Javascripti fail'
-    Mp3Type: 'MP3 helifail'
-    MpgType: 'MPEG videofail'
-    NOFILESIZE: 'Faili suurus on null bitti.'
-    NOVALIDUPLOAD: 'File is not a valid upload'
+    Mp3Type: MP3-helifail
+    MpgType: MPEG-videofail
+    NOFILESIZE: 'Faili suurus on null baiti.'
+    NOVALIDUPLOAD: 'Fail ei ole üleslaadimiseks sobiv'
     Name: Nimi
     PLURALNAME: Failid
-    PdfType: 'Adobe Acrobat PDF file'
-    PngType: 'PNG image - good general-purpose format'
+    PdfType: 'Adobe Acrobati PDF-fail'
+    PngType: 'PNG-kujutis – hea üldotstarbelise vormingu jaoks'
     SINGULARNAME: Fail
-    TOOLARGE: 'Filesize is too large, maximum {size} allowed'
-    TOOLARGESHORT: 'Filesize exceeds {size}'
+    TOOLARGE: 'Fail on liiga suur, lubatud on maksimaalselt {size}'
+    TOOLARGESHORT: 'Fail on suurem kui {size}'
     TiffType: 'Tagged image format'
     Title: Pealkiri
-    WavType: 'WAV helifail'
+    WavType: WAV-helifail
     XlsType: 'Exceli arvutustabel'
-    ZipType: 'ZIP tihendatud fail'
+    ZipType: 'Tihendatud ZIP-fail'
   FileIFrameField:
-    ATTACH: 'Attach {type}'
+    ATTACH: 'Manusta {type}'
     ATTACHONCESAVED: '{type}s can be attached once you have saved the record for the first time.'
-    ATTACHONCESAVED2: 'Files can be attached once you have saved the record for the first time.'
-    DELETE: 'Delete {type}'
-    DISALLOWEDFILETYPE: 'This filetype is not allowed to be uploaded'
-    FILE: File
-    FROMCOMPUTER: 'From your Computer'
-    FROMFILESTORE: 'From the File Store'
-    NOSOURCE: 'Please select a source file to attach'
-    REPLACE: 'Replace {type}'
+    ATTACHONCESAVED2: 'Faile saab manustada pärast seda, kui olete kirje salvestanud.'
+    DELETE: 'Kustuta {type}'
+    DISALLOWEDFILETYPE: 'Seda failitüüpi ei ole lubatud üles laadida'
+    FILE: Fail
+    FROMCOMPUTER: 'Teie arvutist'
+    FROMFILESTORE: Failihoidlast
+    NOSOURCE: 'Valige manustamiseks lähtefail'
+    REPLACE: 'Asenda {type}'
   FileIFrameField_iframe.ss:
-    TITLE: 'Image Uploading Iframe'
+    TITLE: 'Kujutise üleslaadimise IFrame'
   Filesystem:
-    SYNCRESULTS: 'Sync complete: {createdcount} items created, {deletedcount} items deleted'
+    SYNCRESULTS: 'Sünkroonimine on lõpetatud: {createdcount} loodud üksust, {deletedcount} kustutatud üksust'
   Folder:
-    PLURALNAME: Kataloogid
-    SINGULARNAME: Folder
+    PLURALNAME: Kaustad
+    SINGULARNAME: Kaust
   ForgotPasswordEmail.ss:
     HELLO: Tere
     TEXT1: 'Siin on sinu'
     TEXT2: 'Parooli tühistus link'
     TEXT3: -
   Form:
-    FIELDISREQUIRED: '%s on vajalik'
-    SubmitBtnLabel: Go
-    VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
+    CSRF_FAILED_MESSAGE: 'There seems to have been a technical problem. Please click the back button, refresh your browser, and try again.'
+    FIELDISREQUIRED: '{name} is required'
+    SubmitBtnLabel: Mine
+    VALIDATIONCREDITNUMBER: 'Veenduge, et sisestasite krediitkaardinumbri {number} õigesti'
     VALIDATIONNOTUNIQUE: 'Sisestatud väärtus ei ole unikaalne'
     VALIDATIONPASSWORDSDONTMATCH: 'Paroolid ei katu'
     VALIDATIONPASSWORDSNOTEMPTY: 'Paroolid ei saa olla tühjad'
-    VALIDATIONSTRONGPASSWORD: 'Passwords must have at least one digit and one alphanumeric character'
+    VALIDATIONSTRONGPASSWORD: 'Paroolis peab olema vähemalt üks number ja üks tähestikutäht'
     VALIDATOR: Kinnitaja
-    VALIDCURRENCY: 'Please enter a valid currency'
+    VALIDCURRENCY: 'Sisestage kehtiv valuuta'
   FormField:
+    Example: 'e.g. %s'
     NONE: puudub
   GridAction:
     DELETE_DESCRIPTION: Kustuta
-    Delete: Delete
-    UnlinkRelation: Unlink
+    Delete: Kustuta
+    UnlinkRelation: 'Tühista linkimine'
   GridField:
-    Add: 'Add {name}'
-    Filter: Filter
-    FilterBy: 'Filter by '
-    Find: Find
+    Add: 'Lisa {name}'
+    Filter: Filtreeri
+    FilterBy: Filtreerimisalus
+    Find: Otsi
     LEVELUP: 'Level up'
-    LinkExisting: 'Link Existing'
-    NewRecord: 'New %s'
-    NoItemsFound: 'Ei leitud ühtegi kannet'
-    PRINTEDAT: 'Printed at'
-    PRINTEDBY: 'Printed by'
-    PlaceHolder: 'Find {type}'
+    LinkExisting: 'Lingi olemasolev'
+    NewRecord: 'Uus %s'
+    NoItemsFound: 'Üksusi ei leitud'
+    PRINTEDAT: 'Printimiskoht:'
+    PRINTEDBY: Printis
+    PlaceHolder: 'Leia {type}'
     PlaceHolderWithLabels: 'Find {type} by {name}'
-    RelationSearch: 'Relation search'
-    ResetFilter: Reset
+    RelationSearch: 'Seose otsing'
+    ResetFilter: Lähtesta
   GridFieldAction_Delete:
-    DeletePermissionsFailure: 'No delete permissions'
+    DeletePermissionsFailure: 'Kustutamisõigused puuduvad'
+    EditPermissionsFailure: 'No permission to unlink record'
   GridFieldDetailForm:
-    CancelBtn: Katkesta
-    Create: Create
-    Delete: Delete
-    DeletePermissionsFailure: 'No delete permissions'
-    Deleted: 'Deleted %s %s'
-    Save: Save
-    Saved: 'Saved %s %s'
+    CancelBtn: Loobu
+    Create: Loo
+    Delete: Kustuta
+    DeletePermissionsFailure: 'Kustutamisõigused puuduvad'
+    Deleted: '%s %s on kustutatud'
+    Save: Salvesta
+    Saved: 'Saved {name} {link}'
+  GridFieldEditButton.ss:
+    EDIT: Edit
   GridFieldItemEditView.ss: null
   Group:
-    AddRole: 'Add a role for this group'
+    AddRole: 'Lisa selle grupi jaoks rolle'
     Code: 'Grupi kood'
-    DefaultGroupTitleAdministrators: Administrators
-    DefaultGroupTitleContentAuthors: 'Content Authors'
+    DefaultGroupTitleAdministrators: Administraatorid
+    DefaultGroupTitleContentAuthors: 'Sisu autorid'
     Description: Kirjeldus
-    GroupReminder: 'If you choose a parent group, this group will take all it''s roles'
+    GroupReminder: 'Kui valite vanemgrupi, kaotab see grupp kõik rollid'
     Locked: 'Lukus?'
-    NoRoles: 'No roles found'
-    PLURALNAME: Groups
+    NoRoles: 'Ühtegi rolli ei leitud'
+    PLURALNAME: Grupid
     Parent: 'Vanem grupp'
-    RolesAddEditLink: 'Manage roles'
-    SINGULARNAME: Group
+    RolesAddEditLink: 'Halda rolle'
+    SINGULARNAME: Grupp
     Sort: Järjesta
     has_many_Permissions: Õigused
     many_many_Members: Liikmed
   GroupImportForm:
-    Help1: '<p>Import one or more groups in <em>CSV</em> format (comma-separated values). <small><a href="#" class="toggle-advanced">Show advanced usage</a></small></p>'
+    Help1: '<p>Impordi üks või rohkem gruppe <em>CSV</em>-vormingus (komaeraldusega väärtused). <small><a href="#" class="toggle-advanced">Kuva täpsem kasutus</a></small></p>'
     Help2: '<div class="advanced">	<h4>Advanced usage</h4>	<ul>	<li>Allowed columns: <em>%s</em></li>	<li>Existing groups are matched by their unique <em>Code</em> value, and updated with any new values from the 	imported file</li>	<li>Group hierarchies can be created by using a <em>ParentCode</em> column.</li>	<li>Permission codes can be assigned by the <em>PermissionCode</em> column. Existing permission codes are not	cleared.</li>	</ul></div>'
-    ResultCreated: 'Created {count} groups'
-    ResultDeleted: 'Deleted %d groups'
-    ResultUpdated: 'Updated %d groups'
+    ResultCreated: '{count} gruppi on loodud'
+    ResultDeleted: '%d gruppi on kustutatud'
+    ResultUpdated: '%d gruppi on uuendatud'
   Hierarchy:
     InfiniteLoopNotAllowed: 'Infinite loop found within the "{type}" hierarchy. Please change the parent to resolve this'
   HtmlEditorField:
-    ADDURL: 'Add URL'
-    ADJUSTDETAILSDIMENSIONS: 'Details &amp; dimensions'
+    ADDURL: 'Lisa URL'
+    ADJUSTDETAILSDIMENSIONS: 'Üksikasjad ja mõõtmed'
     ANCHORVALUE: Link
-    BUTTONINSERT: Insert
+    BUTTONADDURL: 'Add url'
+    BUTTONINSERT: Sisesta
     BUTTONINSERTLINK: 'Sisesta link'
     BUTTONREMOVELINK: 'Eemalda link'
-    BUTTONUpdate: Update
-    CAPTIONTEXT: 'Caption text'
+    BUTTONUpdate: Uuenda
+    CAPTIONTEXT: 'Pealdise tekst'
     CSSCLASS: 'Joondus / Stiil'
     CSSCLASSCENTER: 'Keskel, iseseisvalt.'
     CSSCLASSLEFT: 'Vasakul, tekst voldib ennast ümber.'
     CSSCLASSLEFTALONE: 'Ise vasakule'
     CSSCLASSRIGHT: 'Paremal, tekst voldib ennast ümber.'
-    DETAILS: Details
+    DETAILS: Üksikasjad
     EMAIL: 'E-posti aadress'
     FILE: Fail
     FOLDER: Kaust
-    FROMCMS: 'From the CMS'
-    FROMCOMPUTER: 'From your computer'
-    FROMWEB: 'From the web'
-    FindInFolder: 'Find in Folder'
-    IMAGEALT: 'Alternative text (alt)'
-    IMAGEALTTEXT: 'Alternative text (alt) - shown if image cannot be displayed'
-    IMAGEALTTEXTDESC: 'Shown to screen readers or if image can not be displayed'
+    FROMCMS: Sisuhaldussüsteemist
+    FROMCOMPUTER: 'Teie arvutist'
+    FROMWEB: Veebist
+    FindInFolder: 'Otsi kaustast'
+    IMAGEALT: 'Asetekst (alt)'
+    IMAGEALTTEXT: 'Asetekst (alt) – kuvatakse, kui kujutist ei ole võimalik kuvada'
+    IMAGEALTTEXTDESC: 'Kuvatakse ekraanilugeja puhul või kui kujutist ei saa kuvada'
     IMAGEDIMENSIONS: Mõõtmed
     IMAGEHEIGHTPX: Laius
-    IMAGETITLE: 'Title text (tooltip) - for additional information about the image'
-    IMAGETITLETEXT: 'Title text (tooltip)'
-    IMAGETITLETEXTDESC: 'For additional information about the image'
+    IMAGETITLE: 'Pealkirja tekst (kohtspikker) – lisateabeks kujutise kohta'
+    IMAGETITLETEXT: 'Pealkirja tekst (kohtspikker)'
+    IMAGETITLETEXTDESC: 'Lisateabe saamiseks kujutise kohta'
     IMAGEWIDTHPX: Kõrgus
-    INSERTMEDIA: 'Insert Media'
+    INSERTMEDIA: 'Sisesta meedium'
     LINK: Link
     LINKANCHOR: 'Link sellele lehele'
     LINKDESCR: 'Lingi kirjeldus'
@@ -306,22 +316,22 @@ et_EE:
     LINKTO: Lingi
     PAGE: Leht
     URL: URL
-    URLNOTANOEMBEDRESOURCE: 'The URL ''{url}'' could not be turned into a media resource.'
-    UpdateMEDIA: 'Update Media'
+    URLNOTANOEMBEDRESOURCE: 'URL-i ''{url}'' ei saanud muuta meediumiressursiks.'
+    UpdateMEDIA: 'Uuenda meediumi'
   Image:
-    PLURALNAME: Files
-    SINGULARNAME: File
+    PLURALNAME: Failid
+    SINGULARNAME: Fail
   ImageField:
-    IMAGE: Image
+    IMAGE: Kujutis
   Image_Cached:
-    PLURALNAME: Files
-    SINGULARNAME: File
+    PLURALNAME: Failid
+    SINGULARNAME: Fail
   Image_iframe.ss:
     TITLE: 'Pildi üleslaadimise Iframe'
   LeftAndMain:
-    CANT_REORGANISE: 'You do not have permission to alter Top level pages. Your change was not saved.'
+    CANT_REORGANISE: 'Teil ei ole õigusi kõrgema taseme lehtede muutmiseks. Teie muudatust ei salvestatud.'
     DELETED: Kustutatud.
-    DropdownBatchActionsDefault: Actions
+    DropdownBatchActionsDefault: Tegevused
     HELP: Spikker
     PAGETYPE: 'Lehekülje tüüp:'
     PERMAGAIN: 'Oled Sisuhaldusest välja logitud. Kui soovite uuesti sisse logida sisestage kasutajanimi ja parool.'
@@ -329,32 +339,35 @@ et_EE:
     PERMDEFAULT: 'Sisesta oma e-posti aadress ja parool sisuhaldussüsteemi ligipääsemiseks.'
     PLEASESAVE: 'Palun Salvesta Lehekülg: Antud lehekülge ei uuendatud, kuna seda ei ole veel salvestatud.'
     PreviewButton: Eelvaade
-    REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
+    REORGANISATIONSUCCESSFUL: 'Saidipuu korraldati edukalt ümber.'
     SAVEDUP: Salvestatud.
-    VersionUnknown: unknown
+    ShowAsList: 'show as list'
+    TooManyPages: 'Too many pages'
+    ValidationError: 'Validation error'
+    VersionUnknown: Unknown
   LeftAndMain_Menu.ss:
-    Hello: Hi
+    Hello: Tere!
     LOGOUT: 'Logi välja'
   LoginAttempt:
     Email: 'E-posti aadress'
     IP: 'IP Aadress'
-    PLURALNAME: 'Login Attempts'
-    SINGULARNAME: 'Login Attempt'
+    PLURALNAME: Sisselogimiskatsed
+    SINGULARNAME: Sisselogimiskatse
     Status: Staatus
   Member:
-    ADDGROUP: 'Add group'
+    ADDGROUP: 'Lisa grupp'
     BUTTONCHANGEPASSWORD: 'Muuda parool'
     BUTTONLOGIN: 'Logi sisse'
     BUTTONLOGINOTHER: 'Logi sisse kellegi teisena'
     BUTTONLOSTPASSWORD: 'Kaotasin oma parooli'
-    CANTEDIT: 'You don''t have permission to do that'
+    CANTEDIT: 'Teil ei ole selleks tegevuseks õigust'
     CONFIRMNEWPASSWORD: 'Kinnita uus parool'
     CONFIRMPASSWORD: 'Kinnita parool'
-    DATEFORMAT: 'Kuupäeva vorming'
-    DefaultAdminFirstname: 'Default Admin'
-    DefaultDateTime: default
+    DATEFORMAT: Kuupäevavorming
+    DefaultAdminFirstname: Vaikeadministraator
+    DefaultDateTime: vaikeseadistus
     EMAIL: E-post
-    EMPTYNEWPASSWORD: 'The new password can''t be empty, please try again'
+    EMPTYNEWPASSWORD: 'Uue parooli väli ei saa olla tühi. Proovige uuesti'
     ENTEREMAIL: 'Palun sisesta email, et saada paooli tühistamise link'
     ERRORLOCKEDOUT: 'Konto on liiga paljude ebaõnnestunud sisselogimiskatsete tõttu ajutiselt blokeeritud. Palun oota 20 minutit ja proovi siis uuesti.'
     ERRORNEWPASSWORD: 'Te sisestasite oma parooli erinevalt, proovige uuesti'
@@ -363,7 +376,7 @@ et_EE:
     FIRSTNAME: Eesnimi
     INTERFACELANG: 'Kasutajaliidese keel'
     INVALIDNEWPASSWORD: 'We couldn''t accept that password: {password}'
-    LOGGEDINAS: 'You''re logged in as {name}.'
+    LOGGEDINAS: 'Olete logitud sisse kui {name}.'
     NEWPASSWORD: 'Uus parool'
     PASSWORD: Parool
     PLURALNAME: Kasutajad
@@ -372,10 +385,10 @@ et_EE:
     SUBJECTPASSWORDCHANGED: 'Sinu parool on muudetud'
     SUBJECTPASSWORDRESET: 'Sinu parooli lähtestamise link'
     SURNAME: Perekonnanimi
-    TIMEFORMAT: 'Aja vorming'
+    TIMEFORMAT: Kellaajavorming
     VALIDATIONMEMBEREXISTS: 'Sellise e-posti aadressiga liige on juba olemas'
-    ValidationIdentifierFailed: 'Can''t overwrite existing member #{id} with identical identifier ({name} = {value}))'
-    WELCOMEBACK: 'Welcome Back, {firstname}'
+    ValidationIdentifierFailed: 'Olemasolevat kasutajat #{id} ei saa sama identifikaatoriga üle kirjutada ({name} = {value})'
+    WELCOMEBACK: 'Tere tulemast tagasi, {firstname}!'
     YOUROLDPASSWORD: 'Sinu vana parool'
     belongs_many_many_Groups: Grupid
     db_LastVisited: 'Viimati külastatud kuupäev'
@@ -387,98 +400,99 @@ et_EE:
   MemberAuthenticator:
     TITLE: 'E-post ja parool'
   MemberDatetimeOptionsetField:
-    AMORPM: 'AM (Ante meridiem) or PM (Post meridiem)'
-    'APPLY FILTER': 'Apply Filter'
-    Custom: Custom
-    DATEFORMATBAD: 'Date format is invalid'
-    DAYNOLEADING: 'Day of month without leading zero'
+    AMORPM: 'AM (enne keskpäeva) või PM (pärast keskpäeva)'
+    'APPLY FILTER': 'Rakenda filter'
+    Custom: Kohandatud
+    DATEFORMATBAD: 'Kuupäevavorming on sobimatu'
+    DAYNOLEADING: 'Kuupäev ilma nullita'
     DIGITSDECFRACTIONSECOND: 'One or more digits representing a decimal fraction of a second'
-    FOURDIGITYEAR: 'Four-digit year'
-    FULLNAMEMONTH: 'Full name of month (e.g. June)'
-    HOURNOLEADING: 'Hour without leading zero'
-    MINUTENOLEADING: 'Minute without leading zero'
-    MONTHNOLEADING: 'Month digit without leading zero'
+    FOURDIGITYEAR: 'Aasta nelja numbrina'
+    FULLNAMEMONTH: 'Kuu täisnimetus (nt august)'
+    HOURNOLEADING: 'Tunnid ilma nullita'
+    MINUTENOLEADING: 'Minutid ilma nullita'
+    MONTHNOLEADING: 'Kuu ilma nullita'
     Preview: Eelvaade
-    SHORTMONTH: 'Short name of month (e.g. Jun)'
+    SHORTMONTH: 'Kuu lühinimetus (nt aug)'
     TOGGLEHELP: 'Toggle formatting help'
-    TWODIGITDAY: 'Two-digit day of month'
-    TWODIGITHOUR: 'Two digits of hour (00 through 23)'
-    TWODIGITMINUTE: 'Two digits of minute (00 through 59)'
-    TWODIGITMONTH: 'Two-digit month (01=January, etc.)'
-    TWODIGITSECOND: 'Two digits of second (00 through 59)'
-    TWODIGITYEAR: 'Two-digit year'
+    TWODIGITDAY: 'Kuupäev kahe numbrina'
+    TWODIGITHOUR: 'Tunnid kahe numbrina (00–23)'
+    TWODIGITMINUTE: 'Minutid kahe numbrina (00–59)'
+    TWODIGITMONTH: 'Kuu kahe numbrina (nt 01=jaanuar jne)'
+    TWODIGITSECOND: 'Sekundid kahe numbrina (00–59)'
+    TWODIGITYEAR: 'Aasta kahe numbrina'
+    Toggle: 'Show formatting help'
   MemberImportForm:
-    Help1: '<p>Import users in <em>CSV format</em> (comma-separated values). <small><a href="#" class="toggle-advanced">Show advanced usage</a></small></p>'
+    Help1: '<p>Impordi kasutajad <em>CSV-vormingus</em> (komaeraldusega väärtused). <small><a href="#" class="toggle-advanced">Kuva täpsem kasutus</a></small></p>'
     Help2: '<div class="advanced">	<h4>Advanced usage</h4>	<ul>	<li>Allowed columns: <em>%s</em></li>	<li>Existing users are matched by their unique <em>Code</em> property, and updated with any new values from	the imported file.</li>	<li>Groups can be assigned by the <em>Groups</em> column. Groups are identified by their <em>Code</em> property,	multiple groups can be separated by comma. Existing group memberships are not cleared.</li>	</ul></div>'
-    ResultCreated: 'Created {count} members'
-    ResultDeleted: 'Deleted %d members'
-    ResultNone: 'No changes'
-    ResultUpdated: 'Updated {count} members'
+    ResultCreated: '{count} liiget on loodud'
+    ResultDeleted: '%d liiget on kustutatud'
+    ResultNone: 'Muudatusi pole'
+    ResultUpdated: '{count} liiget on uuendatud'
   MemberPassword:
-    PLURALNAME: 'Member Passwords'
-    SINGULARNAME: 'Member Password'
+    PLURALNAME: 'Liikme paroolid'
+    SINGULARNAME: 'Liikme parool'
   MemberTableField: null
   ModelAdmin:
     DELETE: Kustuta
-    DELETEDRECORDS: 'Deleted {count} records.'
-    EMPTYBEFOREIMPORT: 'Clear Database before import'
-    IMPORT: 'Impordi CSV failist'
-    IMPORTEDRECORDS: 'Imported {count} records.'
-    NOCSVFILE: 'Palun avage CSV fail impordiks'
-    NOIMPORT: 'Midagi pole importida'
-    RESET: Reset
-    Title: 'Data Models'
-    UPDATEDRECORDS: 'Updated {count} records.'
+    DELETEDRECORDS: '{count} kirjet on kustutatud.'
+    EMPTYBEFOREIMPORT: 'Replace data'
+    IMPORT: 'Impordi CSV-failist'
+    IMPORTEDRECORDS: '{count} kirjet on imporditud.'
+    NOCSVFILE: 'Avage importimiseks CSV-fail'
+    NOIMPORT: 'Pole midagi importida'
+    RESET: Lähtesta
+    Title: Andmemudelid
+    UPDATEDRECORDS: '{count} kirjet on uuendatud.'
   ModelAdmin_ImportSpec.ss:
-    IMPORTSPECFIELDS: 'Database columns'
-    IMPORTSPECLINK: 'Show Specification for %s'
-    IMPORTSPECRELATIONS: Relations
-    IMPORTSPECTITLE: 'Specification for %s'
+    IMPORTSPECFIELDS: 'Andmebaasi tulbad'
+    IMPORTSPECLINK: 'Kuva üksuse %s spetsifikatsioonid'
+    IMPORTSPECRELATIONS: Seosed
+    IMPORTSPECTITLE: 'Üksuse %s spetsifikatsioonid'
   ModelAdmin_Tools.ss:
-    FILTER: Filter
-    IMPORT: Import
+    FILTER: Filtreeri
+    IMPORT: Impordi
   ModelSidebar.ss:
-    IMPORT_TAB_HEADER: Import
-    SEARCHLISTINGS: Search
+    IMPORT_TAB_HEADER: Impordi
+    SEARCHLISTINGS: Otsi
   MoneyField:
-    FIELDLABELAMOUNT: Amount
+    FIELDLABELAMOUNT: Hulk
     FIELDLABELCURRENCY: Valuuta
   NullableField:
-    IsNullLabel: 'Is Null'
+    IsNullLabel: 'On tühi'
   NumericField:
-    VALIDATION: '''{value}'' is not a number, only numbers can be accepted for this field'
+    VALIDATION: '''{value}'' ei ole number, sellele väljale võib sisestada ainult numbreid'
   Pagination:
-    Page: Lehekülg
-    View: View
+    Page: Leht
+    View: Kuva
   Permission:
-    AdminGroup: Administrator
-    CMS_ACCESS_CATEGORY: CMS-juurdepääs
-    FULLADMINRIGHTS: 'Täis administraatori õigused'
+    AdminGroup: Administraator
+    CMS_ACCESS_CATEGORY: 'Sisuhaldussüsteemi juurdepääs'
+    FULLADMINRIGHTS: 'Täielikud administraatoriõigused'
     FULLADMINRIGHTS_HELP: 'Implies and overrules all other assigned permissions.'
     PLURALNAME: Õigused
     SINGULARNAME: Õigus
   PermissionCheckboxSetField:
-    AssignedTo: 'assigned to "{title}"'
-    FromGroup: 'inherited from group "{title}"'
-    FromRole: 'inherited from role "{title}"'
-    FromRoleOnGroup: 'inherited from role "%s" on group "%s"'
+    AssignedTo: 'määratud grupile "{title}"'
+    FromGroup: 'päritud grupilt "{title}"'
+    FromRole: 'päritud rollilt "{title}"'
+    FromRoleOnGroup: 'päritud rollist "%s" grupis "%s"'
   PermissionRole:
-    OnlyAdminCanApply: 'Only admin can apply'
-    PLURALNAME: Roles
-    SINGULARNAME: Role
-    Title: Title
+    OnlyAdminCanApply: 'Ainult administraator saab rakendada'
+    PLURALNAME: Rollid
+    SINGULARNAME: Roll
+    Title: Pealkiri
   PermissionRoleCode:
     PLURALNAME: 'Permission Role Cods'
     SINGULARNAME: 'Permission Role Code'
   Permissions:
     PERMISSIONS_CATEGORY: 'Rollid ja juurdepääsuõigused'
-    UserPermissionsIntro: 'Assigning groups to this user will adjust the permissions they have. See the groups section for details of permissions on individual groups.'
+    UserPermissionsIntro: 'Sellele kasutajale gruppide määramine kohandab tema õiguseid. Vaadake gruppide jaotist, et näha üksikasju iga grupi õiguste kohta.'
   PhoneNumberField:
-    VALIDATION: 'Palun sisesta kehtiv telefoninumber'
+    VALIDATION: 'Sisestage kehtiv telefoninumber'
   RelationComplexTableField.ss:
     ADD: Lisa
-    CSVEXPORT: 'Export to CSV'
-    NOTFOUND: 'No items found'
+    CSVEXPORT: 'Ekspordi CSV-vormingusse'
+    NOTFOUND: 'Üksusi ei leitud'
   Security:
     ALREADYLOGGEDIN: 'Sul puudub õigus sellele lehele pääsemiseks. Kui sul on teine konto, millega siia sisse logida, võid <a href="%s">uuesti sisse logida</a>.'
     BUTTONSEND: 'Saada parooli tühistamise link'
@@ -489,33 +503,46 @@ et_EE:
     LOGGEDOUT: 'Olete välja loginud. Kui soovite uuesti siseneda, sisestage oma andmed allpool'
     LOGIN: 'Logi sisse'
     NOTEPAGESECURED: 'See leht on turvatud. Sisesta enda andmed allpool ja me saadame sind otse edasi'
-    NOTERESETLINKINVALID: '<p>The password reset link is invalid or expired.</p><p>You can request a new one <a href="{link1}">here</a> or change your password after you <a href="{link2}">logged in</a>.</p>'
+    NOTERESETLINKINVALID: '<p>Parooli lähtestamise link on kehtetu või aegunud.</p><p>Saate taotleda uut linki <a href="{link1}">siin</a> või muuta parooli pärast <a href="{link2}">sisselogimist</a>.</p>'
     NOTERESETPASSWORD: 'Sisesta oma email ja me saadame sulle lingi kus saad oma parooli tühistada.'
-    PASSWORDSENTHEADER: 'Password reset link sent to ''{email}'''
-    PASSWORDSENTTEXT: 'Thank you! A reset link has been sent to ''{email}'', provided an account exists for this email address.'
+    PASSWORDSENTHEADER: 'Parooli lähtestamise link saadeti aadressile ''{email}'''
+    PASSWORDSENTTEXT: 'Aitäh! Lähtestamislink saadeti aadressile ''{email}'' eeldusel, et selle e-posti aadressiga seotud konto on olemas.'
   SecurityAdmin:
-    ACCESS_HELP: 'Allow viewing, adding and editing users, as well as assigning permissions and roles to them.'
-    APPLY_ROLES: 'Apply roles to groups'
-    APPLY_ROLES_HELP: 'Ability to edit the roles assigned to a group. Requires the "Access to ''Users'' section" permission.'
+    ACCESS_HELP: 'Luba kasutajate vaatamine, lisamine ja muutmine ning nedele lubade ja rollide määramine.'
+    APPLY_ROLES: 'Määra gruppidele rolle'
+    APPLY_ROLES_HELP: 'Võime muuta grupile määratud rolle. Vajab Kasutajate sektsiooni juurdepääsu luba.'
     EDITPERMISSIONS: 'Muuda õigusi ja IP aadresse igal grupil'
-    EDITPERMISSIONS_HELP: 'Ability to edit Permissions and IP Addresses for a group. Requires the "Access to ''Security'' section" permission.'
+    EDITPERMISSIONS_HELP: 'Võime muuta grupi Lubasid ja IP aadresse. Vajab Turvalisusseadetele juurdepääsu luba.'
     GROUPNAME: 'Rühma nimi'
-    IMPORTGROUPS: 'Import groups'
-    IMPORTUSERS: 'Import users'
+    IMPORTGROUPS: 'Impordi grupid'
+    IMPORTUSERS: 'Impordi kasutajad'
     MEMBERS: Kasutajad
-    MENUTITLE: Security
-    MemberListCaution: 'Caution: Removing members from this list will remove them from all groups and the database'
+    MENUTITLE: Turvalisus
+    MemberListCaution: 'Hoiatus. Sellest loendist liikmete eemdaldamisel eemaldatakse need kõikidest gruppidest ja andmebaasidest'
     NEWGROUP: 'Uus rühm'
     PERMISSIONS: Õigused
-    ROLES: Roles
-    ROLESDESCRIPTION: 'Roles are predefined sets of permissions, and can be assigned to groups.<br />They are inherited from parent groups if required.'
-    TABROLES: Roles
-    Users: Users
+    ROLES: Rollid
+    ROLESDESCRIPTION: 'Rollid on eelmäratud õiguste kogumid, mida on võimalik määrara gruppidele.<br />Need päritakse vajaduse korral vanemgruppidest.'
+    TABROLES: Rollid
+    Users: Kasutajad
   SecurityAdmin_MemberImportForm:
-    BtnImport: 'Import from CSV'
-    FileFieldLabel: 'CSV File <small>(Allowed extensions: *.csv)</small>'
+    BtnImport: 'Impordi CSV-failist'
+    FileFieldLabel: 'CSV-fail <small>(lubatud laiendid: *.csv)</small>'
   SilverStripeNavigator:
+    Auto: Auto
+    ChangeViewMode: 'Change view mode'
+    Desktop: Desktop
+    DualWindowView: 'Dual Window'
     Edit: Muuda
+    EditView: 'Edit mode'
+    Mobile: Mobile
+    PreviewState: 'Preview State'
+    PreviewView: 'Preview mode'
+    Responsive: Responsive
+    SplitView: 'Split mode'
+    Tablet: Tablet
+    ViewDeviceWidth: 'Select a preview width'
+    Width: width
   SimpleImageField:
     NOUPLOAD: 'Pilte pole üles laaditud'
   SiteTree:
@@ -524,53 +551,58 @@ et_EE:
     ISREQUIRED: 'In %s ''%s'' is required'
   TableField.ss:
     ADD: 'Lisa uus rida'
-    ADDITEM: 'Add %s'
+    ADDITEM: 'Lisa %s'
   TableListField:
-    CSVEXPORT: 'Ekspordi CSV-sse'
+    CSVEXPORT: 'Ekspordi CSV-vormingusse'
     PRINT: Prindi
-    Print: Print
+    Print: Prindi
     SELECT: 'Vali:'
   TableListField.ss:
-    NOITEMSFOUND: 'No items found'
+    NOITEMSFOUND: 'Üksusi ei leitud'
     SORTASC: 'Sordi kasvavas järjekorras'
     SORTDESC: 'Sordi kahanevas järjekorras'
   TableListField_PageControls.ss:
-    DISPLAYING: Displaying
-    OF: of
+    DISPLAYING: Kuvatakse
+    OF: /
     TO: to
     VIEWFIRST: 'Vaata esimest'
     VIEWLAST: 'Vaata viimast'
     VIEWNEXT: 'Vaata järgmist'
     VIEWPREVIOUS: 'Vaata eelmist'
   TimeField:
-    VALIDATEFORMAT: 'Please enter a valid time format ({format})'
+    VALIDATEFORMAT: 'Sisestage sobivas vormingus kellaaeg ({format})'
   ToggleField:
     LESS: Vähem
     MORE: Veel
   UploadField:
-    ATTACHFILE: 'Attach a file'
-    ATTACHFILES: 'Attach files'
-    AttachFile: 'Attach file(s)'
-    DELETE: 'Delete from files'
-    DELETEINFO: 'Permanently delete this file from the file store'
-    DOEDIT: Save
-    DROPFILE: 'drop a file'
-    DROPFILES: 'drop files'
-    Dimensions: Dimensions
-    EDIT: Edit
-    EDITINFO: 'Edit this file'
-    FIELDNOTSET: 'File information not found'
-    FROMCOMPUTER: 'From your computer'
-    FROMCOMPUTERINFO: 'Select from files'
-    FROMFILES: 'From files'
+    ATTACHFILE: 'Manusta fail'
+    ATTACHFILES: 'Manusta failid'
+    AttachFile: 'Manusta fail(id)'
+    CHOOSEANOTHERFILE: 'Choose another file'
+    CHOOSEANOTHERINFO: 'Replace this file with another one from the file store'
+    DELETE: 'Kustuta failide hulgast'
+    DELETEINFO: 'Kustuta see fail lõplikult failihoidlast'
+    DOEDIT: Salvesta
+    DROPFILE: 'pukseeri failid'
+    DROPFILES: 'pukseeri failid'
+    Dimensions: Mõõtmed
+    EDIT: Muuda
+    EDITINFO: 'Muuda seda faili'
+    FIELDNOTSET: 'Failiteavet ei leitud'
+    FROMCOMPUTER: 'Teie arvutist'
+    FROMCOMPUTERINFO: 'Valige failide hulgast'
+    FROMFILES: Failidest
     HOTLINKINFO: 'Info: This image will be hotlinked. Please ensure you have permissions from the original site creator to do so.'
-    MAXNUMBEROFFILES: 'Max number of {count} file(s) exceeded.'
-    MAXNUMBEROFFILESSHORT: 'Can only upload {count} files'
-    REMOVE: Remove
-    REMOVEERROR: 'Error removing file'
-    REMOVEINFO: 'Remove this file from here, but do not delete it from the file store'
-    STARTALL: 'Start all'
-    STARTALLINFO: 'Start all uploads'
-    Saved: Saved
+    MAXNUMBEROFFILES: 'Maksimaalne failide arv {count} on ületatud.'
+    MAXNUMBEROFFILESONE: 'Can only upload one file'
+    MAXNUMBEROFFILESSHORT: 'Üles saab laadida ainult {count} faili'
+    OVERWRITEWARNING: 'File with the same name already exists'
+    REMOVE: Eemalda
+    REMOVEERROR: 'Viga faili eemaldamisel'
+    REMOVEINFO: 'Eemalda see fail siit, kuid ära kustuta seda failihoidlast'
+    STARTALL: 'Alusta kõiki'
+    STARTALLINFO: 'Alusta kõiki üleslaadimisi'
+    Saved: Salvestatud
+    UPLOADSINTO: 'saves into /{path}'
   Versioned:
     has_many_Versions: Versioon

lang/fa_IR.yml

@@ -2,6 +2,7 @@ fa_IR:
   AssetAdmin:
     ALLOWEDEXTS: 'Allowed extensions'
     NEWFOLDER: 'پوشه جديد'
+    SHOWALLOWEDEXTS: 'Show allowed extensions'
   AssetTableField:
     CREATED: 'First uploaded'
     DIM: ابعاد
@@ -9,7 +10,7 @@ fa_IR:
     FOLDER: Folder
     LASTEDIT: 'آخرین تغییرات'
     OWNER: دارنده
-    SIZE: حجم
+    SIZE: 'حجم'
     TITLE: عنوان
     TYPE: نوع
     URL: نشانی
@@ -59,9 +60,9 @@ fa_IR:
     ERRORNOTADMIN: 'That user is not an administrator.'
     ERRORNOTREC: 'That username / password isn''t recognised'
   Boolean:
-    0: نه
     ANY: هر
-    1: آری
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   CMSLoadingScreen.ss:
     LOADING: Loading...
     REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
@@ -70,17 +71,19 @@ fa_IR:
     ACCESSALLINTERFACES: 'Access to all CMS sections'
     ACCESSALLINTERFACESHELP: 'Overrules more specific access settings.'
     SAVE: نگاهداری
+  CMSPageHistoryController_versions.ss:
+    PREVIEW: 'Website preview'
   CMSProfileController:
     MENUTITLE: 'My Profile'
   ChangePasswordEmail.ss:
     CHANGEPASSWORDTEXT1: 'شما گذرواژه تان را دگرگون کردید برای'
     CHANGEPASSWORDTEXT2: 'You can now use the following credentials to log in:'
-    EMAIL: ايميل
+    EMAIL: 'ايميل'
     HELLO: درود
     PASSWORD: 'كلمه عبور'
   CheckboxField:
-    - نه
-    - آری
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   ComplexTableField:
     CLOSEPOPUP: 'بستن چنجره'
     SUCCESSADD2: 'Added {name}'
@@ -100,32 +103,33 @@ fa_IR:
     SHOWONCLICKTITLE: 'تغيير كلمه عبور'
   CreditCardField:
     FIRST: نخست
-    FOURTH: چهارم
-    SECOND: دوم
-    THIRD: سوم
+    FOURTH: 'چهارم'
+    SECOND: 'دوم'
+    THIRD: 'سوم'
   CurrencyField:
     CURRENCYSYMBOL: $
   DataObject:
     PLURALNAME: 'داده های اشیاء'
     SINGULARNAME: 'داده اشیاء'
   Date:
-    DAY: روز
-    DAYS: روز
-    HOUR: ساعت
-    HOURS: ساعت
-    MIN: دقیقه
-    MINS: دقیقه
-    MONTH: ماه
-    MONTHS: 'ماه ها'
-    SEC: ثانیه
-    SECS: ثانیه
+    DAY: day
+    DAYS: days
+    HOUR: hour
+    HOURS: hours
+    LessThanMinuteAgo: 'less than a minute'
+    MIN: min
+    MINS: mins
+    MONTH: month
+    MONTHS: months
+    SEC: sec
+    SECS: secs
     TIMEDIFFAGO: '{difference} ago'
     TIMEDIFFIN: 'in {difference}'
-    YEAR: سال
-    YEARS: سال
+    YEAR: year
+    YEARS: years
   DateField:
     NOTSET: 'not set'
-    TODAY: امروز
+    TODAY: 'امروز'
     VALIDDATEFORMAT2: 'Please enter a valid date format ({format})'
     VALIDDATEMAXDATE: 'Your date has to be older or matching the maximum allowed date ({date})'
     VALIDDATEMINDATE: 'Your date has to be newer or matching the minimum allowed date ({date})'
@@ -144,7 +148,7 @@ fa_IR:
     ANY: Any
   File:
     AviType: 'AVI video file'
-    Content: محتوا
+    Content: 'محتوا'
     CssType: 'CSS file'
     DmgType: 'Apple disk image'
     DocType: 'Word document'
@@ -162,7 +166,7 @@ fa_IR:
     MpgType: 'MPEG video file'
     NOFILESIZE: 'Filesize is zero bytes.'
     NOVALIDUPLOAD: 'File is not a valid upload'
-    Name: نام
+    Name: 'نام'
     PLURALNAME: 'فايل ها'
     PdfType: 'Adobe Acrobat PDF file'
     PngType: 'PNG image - good general-purpose format'
@@ -198,7 +202,8 @@ fa_IR:
     TEXT2: 'password reset link'
     TEXT3: برای
   Form:
-    FIELDISREQUIRED: '%s نیاز است.'
+    CSRF_FAILED_MESSAGE: 'There seems to have been a technical problem. Please click the back button, refresh your browser, and try again.'
+    FIELDISREQUIRED: '{name} is required'
     SubmitBtnLabel: Go
     VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
     VALIDATIONNOTUNIQUE: 'The value entered is not unique'
@@ -208,6 +213,7 @@ fa_IR:
     VALIDATOR: Validator
     VALIDCURRENCY: 'Please enter a valid currency'
   FormField:
+    Example: 'e.g. %s'
     NONE: 'هیچ کدام'
   GridAction:
     DELETE_DESCRIPTION: Delete
@@ -230,6 +236,7 @@ fa_IR:
     ResetFilter: Reset
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'No delete permissions'
+    EditPermissionsFailure: 'No permission to unlink record'
   GridFieldDetailForm:
     CancelBtn: Cancel
     Create: Create
@@ -237,7 +244,9 @@ fa_IR:
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
     Save: Save
-    Saved: 'Saved %s %s'
+    Saved: 'Saved {name} {link}'
+  GridFieldEditButton.ss:
+    EDIT: Edit
   GridFieldItemEditView.ss: null
   Group:
     AddRole: 'Add a role for this group'
@@ -253,7 +262,7 @@ fa_IR:
     RolesAddEditLink: 'اضافه/ویرایش وظیفه'
     SINGULARNAME: Group
     Sort: 'تربیت چیدن'
-    has_many_Permissions: مجوز‌ها
+    has_many_Permissions: 'مجوز‌ها'
     many_many_Members: اعضاء
   GroupImportForm:
     Help1: '<p>Import one or more groups in <em>CSV</em> format (comma-separated values). <small><a href="#" class="toggle-advanced">Show advanced usage</a></small></p>'
@@ -267,6 +276,7 @@ fa_IR:
     ADDURL: 'Add URL'
     ADJUSTDETAILSDIMENSIONS: 'Details &amp; dimensions'
     ANCHORVALUE: Anchor
+    BUTTONADDURL: 'Add url'
     BUTTONINSERT: Insert
     BUTTONINSERTLINK: 'گذاشتن پیوند'
     BUTTONREMOVELINK: 'برداشتن پیوند'
@@ -322,7 +332,7 @@ fa_IR:
     CANT_REORGANISE: 'You do not have permission to alter Top level pages. Your change was not saved.'
     DELETED: Deleted.
     DropdownBatchActionsDefault: Actions
-    HELP: کمک
+    HELP: 'کمک'
     PAGETYPE: 'نوع صفحه'
     PERMAGAIN: 'شما از سیستم مدیریت محتوا خارج شده اید.اگر میخواهید دوباره وارد شوید نام کاربری و رمز عبور خود را در قسمت زیر وارد کنید'
     PERMALREADY: 'من متاسفم، شما نمی توانید به آن قسمت از سیستم مدیریت محتوا دسترسی پیدا کنید. اگر میخواهید به عنوان شخص دیگری وارد شوید از قسمت زیر تلاش کنید'
@@ -331,7 +341,10 @@ fa_IR:
     PreviewButton: Preview
     REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
     SAVEDUP: Saved.
-    VersionUnknown: unknown
+    ShowAsList: 'show as list'
+    TooManyPages: 'Too many pages'
+    ValidationError: 'Validation error'
+    VersionUnknown: Unknown
   LeftAndMain_Menu.ss:
     Hello: Hi
     LOGOUT: 'Log out'
@@ -360,7 +373,7 @@ fa_IR:
     ERRORNEWPASSWORD: 'You have entered your new password differently, try again'
     ERRORPASSWORDNOTMATCH: 'Your current password does not match, please try again'
     ERRORWRONGCRED: 'That doesn''t seem to be the right e-mail address or password. Please try again.'
-    FIRSTNAME: نام
+    FIRSTNAME: 'نام'
     INTERFACELANG: 'زبان برنامه'
     INVALIDNEWPASSWORD: 'We couldn''t accept that password: {password}'
     LOGGEDINAS: 'You''re logged in as {name}.'
@@ -407,6 +420,7 @@ fa_IR:
     TWODIGITMONTH: 'Two-digit month (01=January, etc.)'
     TWODIGITSECOND: 'Two digits of second (00 through 59)'
     TWODIGITYEAR: 'Two-digit year'
+    Toggle: 'Show formatting help'
   MemberImportForm:
     Help1: '<p>Import users in <em>CSV format</em> (comma-separated values). <small><a href="#" class="toggle-advanced">Show advanced usage</a></small></p>'
     Help2: '<div class="advanced">	<h4>Advanced usage</h4>	<ul>	<li>Allowed columns: <em>%s</em></li>	<li>Existing users are matched by their unique <em>Code</em> property, and updated with any new values from	the imported file.</li>	<li>Groups can be assigned by the <em>Groups</em> column. Groups are identified by their <em>Code</em> property,	multiple groups can be separated by comma. Existing group memberships are not cleared.</li>	</ul></div>'
@@ -421,7 +435,7 @@ fa_IR:
   ModelAdmin:
     DELETE: حذف
     DELETEDRECORDS: 'Deleted {count} records.'
-    EMPTYBEFOREIMPORT: 'Clear Database before import'
+    EMPTYBEFOREIMPORT: 'Replace data'
     IMPORT: 'Import from CSV'
     IMPORTEDRECORDS: 'Imported {count} records.'
     NOCSVFILE: 'Please browse for a CSV file to import'
@@ -515,7 +529,20 @@ fa_IR:
     BtnImport: 'وارد کردن'
     FileFieldLabel: 'CSV File <small>(Allowed extensions: *.csv)</small>'
   SilverStripeNavigator:
+    Auto: Auto
+    ChangeViewMode: 'Change view mode'
+    Desktop: Desktop
+    DualWindowView: 'Dual Window'
     Edit: Edit
+    EditView: 'Edit mode'
+    Mobile: Mobile
+    PreviewState: 'Preview State'
+    PreviewView: 'Preview mode'
+    Responsive: Responsive
+    SplitView: 'Split mode'
+    Tablet: Tablet
+    ViewDeviceWidth: 'Select a preview width'
+    Width: width
   SimpleImageField:
     NOUPLOAD: 'No Image Uploaded'
   SiteTree:
@@ -551,6 +578,8 @@ fa_IR:
     ATTACHFILE: 'Attach a file'
     ATTACHFILES: 'Attach files'
     AttachFile: 'Attach file(s)'
+    CHOOSEANOTHERFILE: 'Choose another file'
+    CHOOSEANOTHERINFO: 'Replace this file with another one from the file store'
     DELETE: 'Delete from files'
     DELETEINFO: 'Permanently delete this file from the file store'
     DOEDIT: Save
@@ -565,12 +594,15 @@ fa_IR:
     FROMFILES: 'From files'
     HOTLINKINFO: 'Info: This image will be hotlinked. Please ensure you have permissions from the original site creator to do so.'
     MAXNUMBEROFFILES: 'Max number of {count} file(s) exceeded.'
+    MAXNUMBEROFFILESONE: 'Can only upload one file'
     MAXNUMBEROFFILESSHORT: 'Can only upload {count} files'
+    OVERWRITEWARNING: 'File with the same name already exists'
     REMOVE: Remove
     REMOVEERROR: 'Error removing file'
     REMOVEINFO: 'Remove this file from here, but do not delete it from the file store'
     STARTALL: 'Start all'
     STARTALLINFO: 'Start all uploads'
     Saved: Saved
+    UPLOADSINTO: 'saves into /{path}'
   Versioned:
     has_many_Versions: 'نسخه ها'

lang/fi.yml

@@ -2,6 +2,7 @@ fi:
   AssetAdmin:
     ALLOWEDEXTS: 'Sallitut laajennukset'
     NEWFOLDER: 'Uusi kansio'
+    SHOWALLOWEDEXTS: 'Show allowed extensions'
   AssetTableField:
     CREATED: 'Ensimmäisen kerran ladattu palvelimelle'
     DIM: Mitat
@@ -59,9 +60,9 @@ fi:
     ERRORNOTADMIN: 'Tämä käyttäjä ei ole ylläpitäjä'
     ERRORNOTREC: 'Tätä käyttäjänimeä/salasanaa ei tunnistettu.'
   Boolean:
-    0: Ei
     ANY: Yhtään
-    1: Kyllä
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   CMSLoadingScreen.ss:
     LOADING: Ladataan...
     REQUIREJS: 'CMS-järjestelmä vaatii, että selaimessasi on JavaSkriptit päällä.'
@@ -70,6 +71,8 @@ fi:
     ACCESSALLINTERFACES: 'Pääsy kaikkiin CMS-osioihin'
     ACCESSALLINTERFACESHELP: 'Ohittaa tarkemmat käyttöoikeudet.'
     SAVE: Tallenna
+  CMSPageHistoryController_versions.ss:
+    PREVIEW: 'Website preview'
   CMSProfileController:
     MENUTITLE: Profiilini
   ChangePasswordEmail.ss:
@@ -79,8 +82,8 @@ fi:
     HELLO: Hei
     PASSWORD: Salasana
   CheckboxField:
-    - Ei
-    - Kyllä
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   ComplexTableField:
     CLOSEPOPUP: 'Sulje ponnahdusikkuna'
     SUCCESSADD2: 'Lisättiin {name}'
@@ -109,20 +112,21 @@ fi:
     PLURALNAME: Dataobjektit
     SINGULARNAME: Dataobjekti
   Date:
-    DAY: päivä
-    DAYS: ' päivää '
-    HOUR: ' tunti'
-    HOURS: ' tuntia'
+    DAY: day
+    DAYS: days
+    HOUR: hour
+    HOURS: hours
+    LessThanMinuteAgo: 'less than a minute'
     MIN: min
-    MINS: min.
-    MONTH: kuukausi
-    MONTHS: kuukaudet
-    SEC: sek.
-    SECS: sek.
+    MINS: mins
+    MONTH: month
+    MONTHS: months
+    SEC: sec
+    SECS: secs
     TIMEDIFFAGO: '{difference} sitten'
     TIMEDIFFIN: '» {difference}'
-    YEAR: vuosi
-    YEARS: vuodet
+    YEAR: year
+    YEARS: years
   DateField:
     NOTSET: 'ei asetettu'
     TODAY: tänään
@@ -198,7 +202,8 @@ fi:
     TEXT2: 'salasanan tyhjäys -linkki'
     TEXT3: henkilölle
   Form:
-    FIELDISREQUIRED: '%s on pakollinen.'
+    CSRF_FAILED_MESSAGE: 'There seems to have been a technical problem. Please click the back button, refresh your browser, and try again.'
+    FIELDISREQUIRED: '{name} is required'
     SubmitBtnLabel: Siirrä
     VALIDATIONCREDITNUMBER: 'Tarkista, ovatko antamasi luottokortin numerot ({number}) oikein'
     VALIDATIONNOTUNIQUE: 'Syötetty arvo ei ole yksilöllinen'
@@ -208,6 +213,7 @@ fi:
     VALIDATOR: Tarkistin
     VALIDCURRENCY: 'Ole hyvä ja valitse voimassa oleva valuutta'
   FormField:
+    Example: 'e.g. %s'
     NONE: 'Ei yhtään'
   GridAction:
     DELETE_DESCRIPTION: Poista
@@ -230,6 +236,7 @@ fi:
     ResetFilter: Nollaa
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'Ei oikeuksia poistamiseen'
+    EditPermissionsFailure: 'No permission to unlink record'
   GridFieldDetailForm:
     CancelBtn: Peruuta
     Create: Luo
@@ -237,7 +244,9 @@ fi:
     DeletePermissionsFailure: 'Ei oikeuksia poistamiseen'
     Deleted: 'Poistettiin %s %s'
     Save: Tallenna
-    Saved: 'Tallennettu %s %s'
+    Saved: 'Saved {name} {link}'
+  GridFieldEditButton.ss:
+    EDIT: Edit
   GridFieldItemEditView.ss: null
   Group:
     AddRole: 'Lisää ryhmälle rooli'
@@ -267,6 +276,7 @@ fi:
     ADDURL: 'Lisää URL-osoite'
     ADJUSTDETAILSDIMENSIONS: 'Tarkat tiedot & mitat'
     ANCHORVALUE: Ankkuri
+    BUTTONADDURL: 'Add url'
     BUTTONINSERT: Liitä
     BUTTONINSERTLINK: 'Lisää linkki'
     BUTTONREMOVELINK: 'Poista linkki'
@@ -323,7 +333,7 @@ fi:
     DELETED: Poistettu.
     DropdownBatchActionsDefault: Toimenpiteet
     HELP: Ohje
-    PAGETYPE: 'Sivun tyyppi:'
+    PAGETYPE: 'Sivutyyppi:'
     PERMAGAIN: 'Olet kirjautunut ulos CMS:stä. Jos haluat kirjautua uudelleen sisään, syötä käyttäjätunnuksesi ja salasanasi alla.'
     PERMALREADY: 'Paihoittelut, mutta et pääse tähän osaan CMS:ää. Jos haluat kirjautua jonain muuna, voit tehdä sen alla.'
     PERMDEFAULT: 'Valitse tunnistustapa ja syötä tunnistetietosi CMS:ään.'
@@ -331,6 +341,9 @@ fi:
     PreviewButton: Esikatselu
     REORGANISATIONSUCCESSFUL: 'Hakemistopuu järjestettiin uudelleen onnistuneesti.'
     SAVEDUP: Tallennettu.
+    ShowAsList: 'show as list'
+    TooManyPages: 'Too many pages'
+    ValidationError: 'Validation error'
     VersionUnknown: tuntematon
   LeftAndMain_Menu.ss:
     Hello: Hei
@@ -407,6 +420,7 @@ fi:
     TWODIGITMONTH: 'Kaksinumeroinen kuukausi (01=tammikuu, jne.)'
     TWODIGITSECOND: 'Kaksinumeroinen sekunti (00–59)'
     TWODIGITYEAR: 'Kaksinumeroinen vuosiluku'
+    Toggle: 'Show formatting help'
   MemberImportForm:
     Help1: '<p>Tuo käyttäjät <em>CSV-muodossa</em> (arvot pilkulla erotettuina). <small><a href="#" class="toggle-advanced">Näytä edistyksellinen käyttö</a></small></p>'
     Help2: "<div class=\"advanced\">\\n<h4>Edistynyt käyttö</h4>\\n<ul>\\n<li>Sallitut palstat: <em>%s</em></li>\\n<li>Olemassa olevat käyttäjät kohdistetaan uniikilla <em>Code</em>-arvolla, ja päivitetään uudet arvot tuodusta tiedostosta.</li>\\n<li>Ryhmät voidaan kohdistaa <em>Ryhmät</em>-palstaan. Ryhmät tunnistetaan <em>Code</em>-arvosta, useat ryhmät voidaan erottaa pilkulla. Olemassa olevat ryhmäjäsenyydet säilytetään.</li>\\n</ul>\\n</div>"
@@ -421,7 +435,7 @@ fi:
   ModelAdmin:
     DELETE: Poista
     DELETEDRECORDS: 'Poistettiin {count} tietuetta'
-    EMPTYBEFOREIMPORT: 'Tyhjennä tietokanta ennen tuonti'
+    EMPTYBEFOREIMPORT: 'Replace data'
     IMPORT: 'Tuo CSV:stä'
     IMPORTEDRECORDS: 'Tuotiin {count} tietuetta'
     NOCSVFILE: 'Selaa ja tuo CSV-tiedosto'
@@ -515,7 +529,20 @@ fi:
     BtnImport: Tuonti
     FileFieldLabel: 'CSV-tiedosto <small>(Sallitut päätteet: *.csv)</small>'
   SilverStripeNavigator:
+    Auto: Auto
+    ChangeViewMode: 'Change view mode'
+    Desktop: Desktop
+    DualWindowView: 'Dual Window'
     Edit: Muokkaa
+    EditView: 'Edit mode'
+    Mobile: Mobile
+    PreviewState: 'Preview State'
+    PreviewView: 'Preview mode'
+    Responsive: Responsive
+    SplitView: 'Split mode'
+    Tablet: Tablet
+    ViewDeviceWidth: 'Select a preview width'
+    Width: width
   SimpleImageField:
     NOUPLOAD: 'Kuvaa ei kopioitu palvelimelle'
   SiteTree:
@@ -551,6 +578,8 @@ fi:
     ATTACHFILE: 'Liitä tiedosto'
     ATTACHFILES: 'Liitä tiedostoja'
     AttachFile: 'Liitä tiedostoja'
+    CHOOSEANOTHERFILE: 'Choose another file'
+    CHOOSEANOTHERINFO: 'Replace this file with another one from the file store'
     DELETE: 'Poista tiedostoista'
     DELETEINFO: 'Poista tiedosto pysyvästi'
     DOEDIT: Tallenna
@@ -565,12 +594,15 @@ fi:
     FROMFILES: Tiedostoista
     HOTLINKINFO: 'Info: Kuvalle tulee suora linkki. Varmista sivun omistajalta, että sinulla on oikeus suoraan linkitykseen.'
     MAXNUMBEROFFILES: 'Suurin sallittu määrä ({count}) tiedostoja ylitetty.'
+    MAXNUMBEROFFILESONE: 'Can only upload one file'
     MAXNUMBEROFFILESSHORT: 'Voidaan siirtää vain {count} tiedostoa'
+    OVERWRITEWARNING: 'File with the same name already exists'
     REMOVE: Poista
     REMOVEERROR: 'Virhe poistettaessa tiedostoa'
     REMOVEINFO: 'Poista tiedosto, mutta säilytä se tiedostovarastossa'
     STARTALL: 'Aloita kaikki'
     STARTALLINFO: 'Aloita kaikkien siirto'
     Saved: Tallennettu
+    UPLOADSINTO: 'saves into /{path}'
   Versioned:
     has_many_Versions: Versiot

lang/fo.yml

@@ -2,6 +2,7 @@ fo:
   AssetAdmin:
     ALLOWEDEXTS: 'Allowed extensions'
     NEWFOLDER: 'Nýggj skjátta'
+    SHOWALLOWEDEXTS: 'Show allowed extensions'
   AssetTableField:
     CREATED: 'First uploaded'
     DIM: Dimensions
@@ -59,9 +60,9 @@ fo:
     ERRORNOTADMIN: 'Hasin brúkarin er ikki ein fyrisitari.'
     ERRORNOTREC: 'Brúkaranavn / loyniorð er skeivt'
   Boolean:
-    0: 'False'
     ANY: Any
-    1: 'True'
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   CMSLoadingScreen.ss:
     LOADING: Loading...
     REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
@@ -70,6 +71,8 @@ fo:
     ACCESSALLINTERFACES: 'Access to all CMS sections'
     ACCESSALLINTERFACESHELP: 'Overrules more specific access settings.'
     SAVE: Goym
+  CMSPageHistoryController_versions.ss:
+    PREVIEW: 'Website preview'
   CMSProfileController:
     MENUTITLE: 'My Profile'
   ChangePasswordEmail.ss:
@@ -79,8 +82,8 @@ fo:
     HELLO: Hey
     PASSWORD: Loyniorð
   CheckboxField:
-    - 'False'
-    - 'True'
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   ComplexTableField:
     CLOSEPOPUP: 'Lat glugga aftur'
     SUCCESSADD2: 'Added {name}'
@@ -109,20 +112,21 @@ fo:
     PLURALNAME: 'Dáta eindir'
     SINGULARNAME: 'Dáta eind'
   Date:
-    DAY: dagur
-    DAYS: dagar
-    HOUR: tími
-    HOURS: tímar
-    MIN: minuttur
-    MINS: minuttir
-    MONTH: máni
-    MONTHS: mánaðar
-    SEC: sekund
-    SECS: sekundir
+    DAY: day
+    DAYS: days
+    HOUR: hour
+    HOURS: hours
+    LessThanMinuteAgo: 'less than a minute'
+    MIN: min
+    MINS: mins
+    MONTH: month
+    MONTHS: months
+    SEC: sec
+    SECS: secs
     TIMEDIFFAGO: '{difference} ago'
     TIMEDIFFIN: 'in {difference}'
-    YEAR: ár
-    YEARS: ár
+    YEAR: year
+    YEARS: years
   DateField:
     NOTSET: 'ikki ásett'
     TODAY: 'í dag'
@@ -198,7 +202,8 @@ fo:
     TEXT2: 'password reset link'
     TEXT3: for
   Form:
-    FIELDISREQUIRED: '%s er kravt'
+    CSRF_FAILED_MESSAGE: 'There seems to have been a technical problem. Please click the back button, refresh your browser, and try again.'
+    FIELDISREQUIRED: '{name} is required'
     SubmitBtnLabel: Go
     VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
     VALIDATIONNOTUNIQUE: 'Virðið sum bleiv inntøppað er ikki eintýðugt'
@@ -208,6 +213,7 @@ fo:
     VALIDATOR: Validator
     VALIDCURRENCY: 'Please enter a valid currency'
   FormField:
+    Example: 'e.g. %s'
     NONE: einki
   GridAction:
     DELETE_DESCRIPTION: Delete
@@ -230,6 +236,7 @@ fo:
     ResetFilter: Reset
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'No delete permissions'
+    EditPermissionsFailure: 'No permission to unlink record'
   GridFieldDetailForm:
     CancelBtn: Cancel
     Create: Create
@@ -237,7 +244,9 @@ fo:
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
     Save: Save
-    Saved: 'Saved %s %s'
+    Saved: 'Saved {name} {link}'
+  GridFieldEditButton.ss:
+    EDIT: Edit
   GridFieldItemEditView.ss: null
   Group:
     AddRole: 'Add a role for this group'
@@ -267,6 +276,7 @@ fo:
     ADDURL: 'Add URL'
     ADJUSTDETAILSDIMENSIONS: 'Details & dimensions'
     ANCHORVALUE: Anchor
+    BUTTONADDURL: 'Add url'
     BUTTONINSERT: Insert
     BUTTONINSERTLINK: 'Stovna leinku'
     BUTTONREMOVELINK: 'Strika leinku'
@@ -331,7 +341,10 @@ fo:
     PreviewButton: Preview
     REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
     SAVEDUP: Saved.
-    VersionUnknown: unknown
+    ShowAsList: 'show as list'
+    TooManyPages: 'Too many pages'
+    ValidationError: 'Validation error'
+    VersionUnknown: Unknown
   LeftAndMain_Menu.ss:
     Hello: Hi
     LOGOUT: 'Log out'
@@ -407,6 +420,7 @@ fo:
     TWODIGITMONTH: 'Two-digit month (01=January, etc.)'
     TWODIGITSECOND: 'Two digits of second (00 through 59)'
     TWODIGITYEAR: 'Two-digit year'
+    Toggle: 'Show formatting help'
   MemberImportForm:
     Help1: '<p>Import users in <em>CSV format</em> (comma-separated values). <small><a href="#" class="toggle-advanced">Show advanced usage</a></small></p>'
     Help2: '<div class="advanced">	<h4>Advanced usage</h4>	<ul>	<li>Allowed columns: <em>%s</em></li>	<li>Existing users are matched by their unique <em>Code</em> property, and updated with any new values from	the imported file.</li>	<li>Groups can be assigned by the <em>Groups</em> column. Groups are identified by their <em>Code</em> property,	multiple groups can be separated by comma. Existing group memberships are not cleared.</li>	</ul></div>'
@@ -421,7 +435,7 @@ fo:
   ModelAdmin:
     DELETE: Strika
     DELETEDRECORDS: 'Deleted {count} records.'
-    EMPTYBEFOREIMPORT: 'Clear Database before import'
+    EMPTYBEFOREIMPORT: 'Replace data'
     IMPORT: 'Innles frá CSV'
     IMPORTEDRECORDS: 'Imported {count} records.'
     NOCSVFILE: 'Please browse for a CSV file to import'
@@ -515,7 +529,20 @@ fo:
     BtnImport: 'Import from CSV'
     FileFieldLabel: 'CSV File <small>(Allowed extensions: *.csv)</small>'
   SilverStripeNavigator:
+    Auto: Auto
+    ChangeViewMode: 'Change view mode'
+    Desktop: Desktop
+    DualWindowView: 'Dual Window'
     Edit: Edit
+    EditView: 'Edit mode'
+    Mobile: Mobile
+    PreviewState: 'Preview State'
+    PreviewView: 'Preview mode'
+    Responsive: Responsive
+    SplitView: 'Split mode'
+    Tablet: Tablet
+    ViewDeviceWidth: 'Select a preview width'
+    Width: width
   SimpleImageField:
     NOUPLOAD: 'No Image Uploaded'
   SiteTree:
@@ -551,6 +578,8 @@ fo:
     ATTACHFILE: 'Attach a file'
     ATTACHFILES: 'Attach files'
     AttachFile: 'Attach file(s)'
+    CHOOSEANOTHERFILE: 'Choose another file'
+    CHOOSEANOTHERINFO: 'Replace this file with another one from the file store'
     DELETE: 'Delete from files'
     DELETEINFO: 'Permanently delete this file from the file store'
     DOEDIT: Save
@@ -565,12 +594,15 @@ fo:
     FROMFILES: 'From files'
     HOTLINKINFO: 'Info: This image will be hotlinked. Please ensure you have permissions from the original site creator to do so.'
     MAXNUMBEROFFILES: 'Max number of {count} file(s) exceeded.'
+    MAXNUMBEROFFILESONE: 'Can only upload one file'
     MAXNUMBEROFFILESSHORT: 'Can only upload {count} files'
+    OVERWRITEWARNING: 'File with the same name already exists'
     REMOVE: Remove
     REMOVEERROR: 'Error removing file'
     REMOVEINFO: 'Remove this file from here, but do not delete it from the file store'
     STARTALL: 'Start all'
     STARTALLINFO: 'Start all uploads'
     Saved: Saved
+    UPLOADSINTO: 'saves into /{path}'
   Versioned:
     has_many_Versions: Útgávur

lang/fr.yml

@@ -2,6 +2,7 @@ fr:
   AssetAdmin:
     ALLOWEDEXTS: 'Allowed extensions'
     NEWFOLDER: 'Nouveau dossier'
+    SHOWALLOWEDEXTS: 'Show allowed extensions'
   AssetTableField:
     CREATED: 'Premier chargement'
     DIM: Dimensions
@@ -59,9 +60,9 @@ fr:
     ERRORNOTADMIN: 'Cet utilisateur n''est pas un administrateur.'
     ERRORNOTREC: 'Cet identifiant / mot de passe n''est pas reconnu'
   Boolean:
-    0: Non
     ANY: Tout
-    1: Oui
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   CMSLoadingScreen.ss:
     LOADING: Chargement...
     REQUIREJS: 'Vous devez activer JavaScript pour utiliser le CMS.'
@@ -70,6 +71,8 @@ fr:
     ACCESSALLINTERFACES: 'Accès à toutes les sections du CMS'
     ACCESSALLINTERFACESHELP: 'Prioritaire sur les droits plus spécifiques d''accès.'
     SAVE: Enregistrer
+  CMSPageHistoryController_versions.ss:
+    PREVIEW: 'Website preview'
   CMSProfileController:
     MENUTITLE: 'Mon profil'
   ChangePasswordEmail.ss:
@@ -79,8 +82,8 @@ fr:
     HELLO: Salut
     PASSWORD: 'Mot de passe'
   CheckboxField:
-    - Non
-    - Oui
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   ComplexTableField:
     CLOSEPOPUP: 'Ferme Popup'
     SUCCESSADD2: '{name} ajouté'
@@ -109,20 +112,21 @@ fr:
     PLURALNAME: 'Data Objects'
     SINGULARNAME: 'Data Object'
   Date:
-    DAY: jour
-    DAYS: jours
-    HOUR: heure
-    HOURS: heures
-    MIN: minutes
-    MINS: minutes
-    MONTH: mois
-    MONTHS: mois
-    SEC: seconde
-    SECS: secondes
+    DAY: day
+    DAYS: days
+    HOUR: hour
+    HOURS: hours
+    LessThanMinuteAgo: 'less than a minute'
+    MIN: min
+    MINS: mins
+    MONTH: month
+    MONTHS: months
+    SEC: sec
+    SECS: secs
     TIMEDIFFAGO: 'Il y a {difference}'
     TIMEDIFFIN: 'Dans {difference}'
-    YEAR: année
-    YEARS: années
+    YEAR: year
+    YEARS: years
   DateField:
     NOTSET: 'pas d''ensemble'
     TODAY: 'aujourd''hui'
@@ -198,7 +202,8 @@ fr:
     TEXT2: 'lien de réinitialisation de mot de passe'
     TEXT3: pour
   Form:
-    FIELDISREQUIRED: '%s est requis'
+    CSRF_FAILED_MESSAGE: 'There seems to have been a technical problem. Please click the back button, refresh your browser, and try again.'
+    FIELDISREQUIRED: '{name} is required'
     SubmitBtnLabel: Envoyer
     VALIDATIONCREDITNUMBER: 'Vérifiez que vous avez bien saisi votre numéro de carte bleue {number}.'
     VALIDATIONNOTUNIQUE: 'La valeur entrée n''est pas unique'
@@ -208,6 +213,7 @@ fr:
     VALIDATOR: Validateur
     VALIDCURRENCY: 'Saisissez une monnaie valide'
   FormField:
+    Example: 'e.g. %s'
     NONE: aucun
   GridAction:
     DELETE_DESCRIPTION: Supprime
@@ -230,6 +236,7 @@ fr:
     ResetFilter: Réinitialiser
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'Vous n’avez pas les autorisations pour supprimer'
+    EditPermissionsFailure: 'No permission to unlink record'
   GridFieldDetailForm:
     CancelBtn: Annuler
     Create: Créer
@@ -237,7 +244,9 @@ fr:
     DeletePermissionsFailure: 'Vous n’avez pas les autorisations pour supprimer'
     Deleted: '%s %s supprimés'
     Save: Enregistrer
-    Saved: '%s %s sauvegardés'
+    Saved: 'Saved {name} {link}'
+  GridFieldEditButton.ss:
+    EDIT: Edit
   GridFieldItemEditView.ss: null
   Group:
     AddRole: 'Ajouter un rôle à ce groupe '
@@ -267,6 +276,7 @@ fr:
     ADDURL: 'Ajouter URL'
     ADJUSTDETAILSDIMENSIONS: 'Détails & dimensions'
     ANCHORVALUE: Ancre
+    BUTTONADDURL: 'Add url'
     BUTTONINSERT: Insérer
     BUTTONINSERTLINK: 'Insérer un lien'
     BUTTONREMOVELINK: 'Supprimer le lien'
@@ -331,6 +341,9 @@ fr:
     PreviewButton: Aperçu
     REORGANISATIONSUCCESSFUL: 'L’arbre du site a été bien réorganisé.'
     SAVEDUP: Enregistré.
+    ShowAsList: 'show as list'
+    TooManyPages: 'Too many pages'
+    ValidationError: 'Validation error'
     VersionUnknown: inconnu
   LeftAndMain_Menu.ss:
     Hello: Bonjour
@@ -407,6 +420,7 @@ fr:
     TWODIGITMONTH: 'Le mois sur deux chiffres (p. ex. 01=janvier)'
     TWODIGITSECOND: 'La seconde sur deux chiffres (de 00 à 59)'
     TWODIGITYEAR: 'L’année sur deux chiffres'
+    Toggle: 'Show formatting help'
   MemberImportForm:
     Help1: '<p>Importer les membres au format<em>CSV format</em> (comma-separated values). <small><a href="#" class="toggle-advanced">Afficher l''usage avancé.</a></small></p>'
     Help2: "<div class=\"advanced\">\\n<h4>Utilisation avancée</h4>\\n<ul>\\n<li>Colonnes autorisées&nbsp;: <em>%s</em></li>\\n<li>Les utilisateurs existants sont retrouvés avec leur <em>Code</em> unique et les registres sont mis à jour avec les nouvelles valeurs du fichier importé.</li>\\n<li>Des groupes peuvent être assignés à l’aide de la colonne <em>Groups</em>. Les groupes sont identifiés par leur <em>Code</em>, plusieurs groupes peuvent être indiqués en les séparant par des virgules. L’appartenance actuelle aux groupes n’est pas modifiée.</li>\\n</ul>\\n</div>"
@@ -421,7 +435,7 @@ fr:
   ModelAdmin:
     DELETE: Supprime
     DELETEDRECORDS: '{count} enregistrements supprimés.'
-    EMPTYBEFOREIMPORT: 'Vider la base de données avant d’importer'
+    EMPTYBEFOREIMPORT: 'Replace data'
     IMPORT: 'Importer de CSV'
     IMPORTEDRECORDS: '{count} enregistrements importés.'
     NOCSVFILE: 'Veuillez choisir un fichier CSV à importer'
@@ -515,7 +529,20 @@ fr:
     BtnImport: Importer
     FileFieldLabel: 'Fichier CSV <small>(extension autorisée&nbsp;: *.csv)</small>'
   SilverStripeNavigator:
+    Auto: Auto
+    ChangeViewMode: 'Change view mode'
+    Desktop: Desktop
+    DualWindowView: 'Dual Window'
     Edit: 'Tout modifier'
+    EditView: 'Edit mode'
+    Mobile: Mobile
+    PreviewState: 'Preview State'
+    PreviewView: 'Preview mode'
+    Responsive: Responsive
+    SplitView: 'Split mode'
+    Tablet: Tablet
+    ViewDeviceWidth: 'Select a preview width'
+    Width: width
   SimpleImageField:
     NOUPLOAD: 'Aucune image chargée'
   SiteTree:
@@ -537,7 +564,7 @@ fr:
   TableListField_PageControls.ss:
     DISPLAYING: 'Affichage de'
     OF: de
-    TO: à
+    TO: 'à'
     VIEWFIRST: 'Voir premier'
     VIEWLAST: 'Voir dernier'
     VIEWNEXT: 'Voir suivant'
@@ -551,6 +578,8 @@ fr:
     ATTACHFILE: 'Joindre un fichier'
     ATTACHFILES: 'Joindre des fichiers'
     AttachFile: 'Joindre un ou plusieurs fichiers'
+    CHOOSEANOTHERFILE: 'Choose another file'
+    CHOOSEANOTHERINFO: 'Replace this file with another one from the file store'
     DELETE: 'Supprimer des fichiers'
     DELETEINFO: 'Effacer définitivement ce fichier des archives'
     DOEDIT: Enregistrer
@@ -565,12 +594,15 @@ fr:
     FROMFILES: 'Depuis les fichiers'
     HOTLINKINFO: 'Note : Cette image sera liée par un « hotlink », assurez-vous d’avoir l’autorisation des ayant-droits du site web d’origine.'
     MAXNUMBEROFFILES: 'Le nombre maximal de {count} fichiers a été dépassé.'
+    MAXNUMBEROFFILESONE: 'Can only upload one file'
     MAXNUMBEROFFILESSHORT: 'On ne peut pas télécharger plus de {count} fichiers'
+    OVERWRITEWARNING: 'File with the same name already exists'
     REMOVE: Supprimer
     REMOVEERROR: 'Le fichier n’a pas pu être supprimé'
     REMOVEINFO: 'Supprimer ce fichier ici sans l’effacer des archives'
     STARTALL: 'Démarrer tout'
     STARTALLINFO: 'Démarrer tous les téléchargements'
     Saved: Enregistré
+    UPLOADSINTO: 'saves into /{path}'
   Versioned:
     has_many_Versions: Versions

lang/gl_ES.yml

@@ -2,6 +2,7 @@ gl_ES:
   AssetAdmin:
     ALLOWEDEXTS: 'Allowed extensions'
     NEWFOLDER: NewFolder
+    SHOWALLOWEDEXTS: 'Show allowed extensions'
   AssetTableField:
     CREATED: 'Primeiro subido'
     DIM: Dimensións
@@ -59,9 +60,9 @@ gl_ES:
     ERRORNOTADMIN: 'Ese usuario non é un administrador.'
     ERRORNOTREC: 'Ese nome de usuario/contrasinal non é recoñecido'
   Boolean:
-    0: Falso
     ANY: Ningún
-    1: Verdadeiro
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   CMSLoadingScreen.ss:
     LOADING: Loading...
     REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
@@ -70,6 +71,8 @@ gl_ES:
     ACCESSALLINTERFACES: 'Acceder a todas as seccións do CMS'
     ACCESSALLINTERFACESHELP: 'Anular a configuración de acceso máis específica.'
     SAVE: Gardar
+  CMSPageHistoryController_versions.ss:
+    PREVIEW: 'Website preview'
   CMSProfileController:
     MENUTITLE: 'My Profile'
   ChangePasswordEmail.ss:
@@ -79,8 +82,8 @@ gl_ES:
     HELLO: Ola
     PASSWORD: Contrasinal
   CheckboxField:
-    - Falso
-    - Verdade
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   ComplexTableField:
     CLOSEPOPUP: 'Pechar Ventá Emerxente'
     SUCCESSADD2: 'Added {name}'
@@ -109,20 +112,21 @@ gl_ES:
     PLURALNAME: 'Obxectos de Datos'
     SINGULARNAME: 'Obxecto de Dato'
   Date:
-    DAY: día
-    DAYS: días
-    HOUR: hora
-    HOURS: horas
+    DAY: day
+    DAYS: days
+    HOUR: hour
+    HOURS: hours
+    LessThanMinuteAgo: 'less than a minute'
     MIN: min
     MINS: mins
-    MONTH: mes
-    MONTHS: meses
-    SEC: seg
-    SECS: segs
+    MONTH: month
+    MONTHS: months
+    SEC: sec
+    SECS: secs
     TIMEDIFFAGO: '{difference} ago'
     TIMEDIFFIN: 'in {difference}'
-    YEAR: ano
-    YEARS: anos
+    YEAR: year
+    YEARS: years
   DateField:
     NOTSET: 'sen establecer'
     TODAY: hoxe
@@ -198,7 +202,8 @@ gl_ES:
     TEXT2: 'ligazón de reinicio do contrasinal'
     TEXT3: para
   Form:
-    FIELDISREQUIRED: '%s é requirido'
+    CSRF_FAILED_MESSAGE: 'There seems to have been a technical problem. Please click the back button, refresh your browser, and try again.'
+    FIELDISREQUIRED: '{name} is required'
     SubmitBtnLabel: Go
     VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
     VALIDATIONNOTUNIQUE: 'O valor inserido non é único'
@@ -208,6 +213,7 @@ gl_ES:
     VALIDATOR: Validador
     VALIDCURRENCY: 'Please enter a valid currency'
   FormField:
+    Example: 'e.g. %s'
     NONE: ningún
   GridAction:
     DELETE_DESCRIPTION: Delete
@@ -230,6 +236,7 @@ gl_ES:
     ResetFilter: Reiniciar
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'Non eliminar permisos'
+    EditPermissionsFailure: 'No permission to unlink record'
   GridFieldDetailForm:
     CancelBtn: Cancel
     Create: Create
@@ -237,7 +244,9 @@ gl_ES:
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
     Save: Save
-    Saved: 'Saved %s %s'
+    Saved: 'Saved {name} {link}'
+  GridFieldEditButton.ss:
+    EDIT: Edit
   GridFieldItemEditView.ss: null
   Group:
     AddRole: 'Engadir un role para este grupo'
@@ -267,6 +276,7 @@ gl_ES:
     ADDURL: 'Add URL'
     ADJUSTDETAILSDIMENSIONS: 'Details & dimensions'
     ANCHORVALUE: Áncora
+    BUTTONADDURL: 'Add url'
     BUTTONINSERT: Inserir
     BUTTONINSERTLINK: 'Inserir ligazón'
     BUTTONREMOVELINK: 'Eliminar ligazón'
@@ -331,6 +341,9 @@ gl_ES:
     PreviewButton: Preview
     REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
     SAVEDUP: Saved.
+    ShowAsList: 'show as list'
+    TooManyPages: 'Too many pages'
+    ValidationError: 'Validation error'
     VersionUnknown: descoñecido
   LeftAndMain_Menu.ss:
     Hello: Hi
@@ -407,6 +420,7 @@ gl_ES:
     TWODIGITMONTH: 'Dous díxitos para o mes (01=Xaneiro, etc.)'
     TWODIGITSECOND: 'Dous díxitos de segundo (00 ata 59)'
     TWODIGITYEAR: 'Dous díxitos ano'
+    Toggle: 'Show formatting help'
   MemberImportForm:
     Help1: '<p>Importar usuarios en <em>formato CSV</em> (valores separados por comas). <small><a href="#" class="toggle-advanced">Amosar uso avanzado</a></small></p>'
     Help2: '<div class="advanced">	<h4>Advanced usage</h4>	<ul>	<li>Allowed columns: <em>%s</em></li>	<li>Existing users are matched by their unique <em>Code</em> property, and updated with any new values from	the imported file.</li>	<li>Groups can be assigned by the <em>Groups</em> column. Groups are identified by their <em>Code</em> property,	multiple groups can be separated by comma. Existing group memberships are not cleared.</li>	</ul></div>'
@@ -421,7 +435,7 @@ gl_ES:
   ModelAdmin:
     DELETE: Eliminar
     DELETEDRECORDS: 'Deleted {count} records.'
-    EMPTYBEFOREIMPORT: 'Clear Database before import'
+    EMPTYBEFOREIMPORT: 'Replace data'
     IMPORT: 'Importar dende CSV'
     IMPORTEDRECORDS: 'Imported {count} records.'
     NOCSVFILE: 'Por favor navega por un ficheiro CSV para importar'
@@ -515,7 +529,20 @@ gl_ES:
     BtnImport: 'Importar dende CSV'
     FileFieldLabel: 'Ficheiro CSV <small>(Extensións permitidas: *.csv)</small>'
   SilverStripeNavigator:
+    Auto: Auto
+    ChangeViewMode: 'Change view mode'
+    Desktop: Desktop
+    DualWindowView: 'Dual Window'
     Edit: Edit
+    EditView: 'Edit mode'
+    Mobile: Mobile
+    PreviewState: 'Preview State'
+    PreviewView: 'Preview mode'
+    Responsive: Responsive
+    SplitView: 'Split mode'
+    Tablet: Tablet
+    ViewDeviceWidth: 'Select a preview width'
+    Width: width
   SimpleImageField:
     NOUPLOAD: 'Ningunha Imaxe Subida'
   SiteTree:
@@ -551,6 +578,8 @@ gl_ES:
     ATTACHFILE: 'Anexar un ficheiro'
     ATTACHFILES: 'Anexar ficheiros'
     AttachFile: 'Anexar ficheiro(s)'
+    CHOOSEANOTHERFILE: 'Choose another file'
+    CHOOSEANOTHERINFO: 'Replace this file with another one from the file store'
     DELETE: 'Delete from files'
     DELETEINFO: 'Eliminar permanentemente este ficheiro do almacén de ficheiros'
     DOEDIT: Gardar
@@ -565,12 +594,15 @@ gl_ES:
     FROMFILES: 'Dende ficheiros'
     HOTLINKINFO: 'Info: This image will be hotlinked. Please ensure you have permissions from the original site creator to do so.'
     MAXNUMBEROFFILES: 'Max number of {count} file(s) exceeded.'
+    MAXNUMBEROFFILESONE: 'Can only upload one file'
     MAXNUMBEROFFILESSHORT: 'Can only upload {count} files'
+    OVERWRITEWARNING: 'File with the same name already exists'
     REMOVE: Remove
     REMOVEERROR: 'Erro eliminando o ficheiro'
     REMOVEINFO: 'Eliminar este ficheiro daquí, pero non eliminalo do almacén de ficheiros'
     STARTALL: 'Comezar todo'
     STARTALLINFO: 'Start all uploads'
     Saved: Gardado
+    UPLOADSINTO: 'saves into /{path}'
   Versioned:
     has_many_Versions: Versións

lang/he_IL.yml

@@ -2,6 +2,7 @@ he_IL:
   AssetAdmin:
     ALLOWEDEXTS: 'Allowed extensions'
     NEWFOLDER: תיקיהחדשה
+    SHOWALLOWEDEXTS: 'Show allowed extensions'
   AssetTableField:
     CREATED: 'הועלה לראשונה'
     DIM: מידות
@@ -59,9 +60,9 @@ he_IL:
     ERRORNOTADMIN: 'משתמש זה אינו מנהל'
     ERRORNOTREC: 'שם המשתמש / סיסמא לא מזוהה'
   Boolean:
-    0: 'False'
     ANY: Any
-    1: 'True'
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   CMSLoadingScreen.ss:
     LOADING: Loading...
     REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
@@ -70,6 +71,8 @@ he_IL:
     ACCESSALLINTERFACES: 'גישה לכל ממשקי המערכת'
     ACCESSALLINTERFACESHELP: 'Overrules more specific access settings.'
     SAVE: שמור
+  CMSPageHistoryController_versions.ss:
+    PREVIEW: 'Website preview'
   CMSProfileController:
     MENUTITLE: 'My Profile'
   ChangePasswordEmail.ss:
@@ -79,8 +82,8 @@ he_IL:
     HELLO: היי
     PASSWORD: Password
   CheckboxField:
-    - 'False'
-    - 'True'
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   ComplexTableField:
     CLOSEPOPUP: 'סגור חלון'
     SUCCESSADD2: 'Added {name}'
@@ -109,20 +112,21 @@ he_IL:
     PLURALNAME: 'אובייקטי מידע'
     SINGULARNAME: 'אובייקט מידע'
   Date:
-    DAY: יום
-    DAYS: ימים
-    HOUR: שעה
-    HOURS: שעות
-    MIN: דקה
-    MINS: דקות
-    MONTH: חודש
-    MONTHS: חודשים
-    SEC: שניה
-    SECS: שניות
+    DAY: day
+    DAYS: days
+    HOUR: hour
+    HOURS: hours
+    LessThanMinuteAgo: 'less than a minute'
+    MIN: min
+    MINS: mins
+    MONTH: month
+    MONTHS: months
+    SEC: sec
+    SECS: secs
     TIMEDIFFAGO: '{difference} ago'
     TIMEDIFFIN: 'in {difference}'
-    YEAR: שנה
-    YEARS: שנים
+    YEAR: year
+    YEARS: years
   DateField:
     NOTSET: 'not set'
     TODAY: today
@@ -198,7 +202,8 @@ he_IL:
     TEXT2: 'password reset link'
     TEXT3: for
   Form:
-    FIELDISREQUIRED: 'דרוש %s'
+    CSRF_FAILED_MESSAGE: 'There seems to have been a technical problem. Please click the back button, refresh your browser, and try again.'
+    FIELDISREQUIRED: '{name} is required'
     SubmitBtnLabel: Go
     VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
     VALIDATIONNOTUNIQUE: 'הערך שהוקש אינו יחודי'
@@ -208,6 +213,7 @@ he_IL:
     VALIDATOR: Validator
     VALIDCURRENCY: 'Please enter a valid currency'
   FormField:
+    Example: 'e.g. %s'
     NONE: none
   GridAction:
     DELETE_DESCRIPTION: Delete
@@ -230,6 +236,7 @@ he_IL:
     ResetFilter: Reset
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'No delete permissions'
+    EditPermissionsFailure: 'No permission to unlink record'
   GridFieldDetailForm:
     CancelBtn: Cancel
     Create: Create
@@ -237,7 +244,9 @@ he_IL:
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
     Save: Save
-    Saved: 'Saved %s %s'
+    Saved: 'Saved {name} {link}'
+  GridFieldEditButton.ss:
+    EDIT: Edit
   GridFieldItemEditView.ss: null
   Group:
     AddRole: 'Add a role for this group'
@@ -267,12 +276,13 @@ he_IL:
     ADDURL: 'Add URL'
     ADJUSTDETAILSDIMENSIONS: 'Details & dimensions'
     ANCHORVALUE: Anchor
+    BUTTONADDURL: 'Add url'
     BUTTONINSERT: Insert
     BUTTONINSERTLINK: 'הכנס קישור'
     BUTTONREMOVELINK: 'הסר קישור'
     BUTTONUpdate: Update
     CAPTIONTEXT: 'Caption text'
-    CSSCLASS: יישור/סגנון
+    CSSCLASS: 'יישור/סגנון'
     CSSCLASSCENTER: 'ממורכז, ללא טקסט בצדדים.'
     CSSCLASSLEFT: 'לשמאל, עם טקסט מסודר מסביב.'
     CSSCLASSLEFTALONE: 'On the left, on its own.'
@@ -331,7 +341,10 @@ he_IL:
     PreviewButton: Preview
     REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
     SAVEDUP: Saved.
-    VersionUnknown: unknown
+    ShowAsList: 'show as list'
+    TooManyPages: 'Too many pages'
+    ValidationError: 'Validation error'
+    VersionUnknown: Unknown
   LeftAndMain_Menu.ss:
     Hello: Hi
     LOGOUT: 'Log out'
@@ -407,6 +420,7 @@ he_IL:
     TWODIGITMONTH: 'Two-digit month (01=January, etc.)'
     TWODIGITSECOND: 'Two digits of second (00 through 59)'
     TWODIGITYEAR: 'Two-digit year'
+    Toggle: 'Show formatting help'
   MemberImportForm:
     Help1: '<p>Import users in <em>CSV format</em> (comma-separated values). <small><a href="#" class="toggle-advanced">Show advanced usage</a></small></p>'
     Help2: '<div class="advanced">	<h4>Advanced usage</h4>	<ul>	<li>Allowed columns: <em>%s</em></li>	<li>Existing users are matched by their unique <em>Code</em> property, and updated with any new values from	the imported file.</li>	<li>Groups can be assigned by the <em>Groups</em> column. Groups are identified by their <em>Code</em> property,	multiple groups can be separated by comma. Existing group memberships are not cleared.</li>	</ul></div>'
@@ -421,7 +435,7 @@ he_IL:
   ModelAdmin:
     DELETE: מחק
     DELETEDRECORDS: 'Deleted {count} records.'
-    EMPTYBEFOREIMPORT: 'Clear Database before import'
+    EMPTYBEFOREIMPORT: 'Replace data'
     IMPORT: 'ייבא מקובץ CSV'
     IMPORTEDRECORDS: 'Imported {count} records.'
     NOCSVFILE: 'בחר קובץ CSV לייבוא'
@@ -515,7 +529,20 @@ he_IL:
     BtnImport: 'Import from CSV'
     FileFieldLabel: 'CSV File <small>(Allowed extensions: *.csv)</small>'
   SilverStripeNavigator:
+    Auto: Auto
+    ChangeViewMode: 'Change view mode'
+    Desktop: Desktop
+    DualWindowView: 'Dual Window'
     Edit: Edit
+    EditView: 'Edit mode'
+    Mobile: Mobile
+    PreviewState: 'Preview State'
+    PreviewView: 'Preview mode'
+    Responsive: Responsive
+    SplitView: 'Split mode'
+    Tablet: Tablet
+    ViewDeviceWidth: 'Select a preview width'
+    Width: width
   SimpleImageField:
     NOUPLOAD: 'לא הועלתה תמונה'
   SiteTree:
@@ -551,6 +578,8 @@ he_IL:
     ATTACHFILE: 'Attach a file'
     ATTACHFILES: 'Attach files'
     AttachFile: 'Attach file(s)'
+    CHOOSEANOTHERFILE: 'Choose another file'
+    CHOOSEANOTHERINFO: 'Replace this file with another one from the file store'
     DELETE: 'Delete from files'
     DELETEINFO: 'Permanently delete this file from the file store'
     DOEDIT: Save
@@ -565,12 +594,15 @@ he_IL:
     FROMFILES: 'From files'
     HOTLINKINFO: 'Info: This image will be hotlinked. Please ensure you have permissions from the original site creator to do so.'
     MAXNUMBEROFFILES: 'Max number of {count} file(s) exceeded.'
+    MAXNUMBEROFFILESONE: 'Can only upload one file'
     MAXNUMBEROFFILESSHORT: 'Can only upload {count} files'
+    OVERWRITEWARNING: 'File with the same name already exists'
     REMOVE: Remove
     REMOVEERROR: 'Error removing file'
     REMOVEINFO: 'Remove this file from here, but do not delete it from the file store'
     STARTALL: 'Start all'
     STARTALLINFO: 'Start all uploads'
     Saved: Saved
+    UPLOADSINTO: 'saves into /{path}'
   Versioned:
     has_many_Versions: גירסאות

lang/hi.yml

@@ -2,6 +2,7 @@ hi:
   AssetAdmin:
     ALLOWEDEXTS: 'Allowed extensions'
     NEWFOLDER: NewFolder
+    SHOWALLOWEDEXTS: 'Show allowed extensions'
   AssetTableField:
     CREATED: 'First uploaded'
     DIM: Dimensions
@@ -59,9 +60,9 @@ hi:
     ERRORNOTADMIN: 'That user is not an administrator.'
     ERRORNOTREC: 'That username / password isn''t recognised'
   Boolean:
-    0: 'False'
     ANY: Any
-    1: 'True'
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   CMSLoadingScreen.ss:
     LOADING: Loading...
     REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
@@ -70,6 +71,8 @@ hi:
     ACCESSALLINTERFACES: 'Access to all CMS sections'
     ACCESSALLINTERFACESHELP: 'Overrules more specific access settings.'
     SAVE: Save
+  CMSPageHistoryController_versions.ss:
+    PREVIEW: 'Website preview'
   CMSProfileController:
     MENUTITLE: 'My Profile'
   ChangePasswordEmail.ss:
@@ -79,8 +82,8 @@ hi:
     HELLO: Hi
     PASSWORD: Password
   CheckboxField:
-    - 'False'
-    - 'True'
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   ComplexTableField:
     CLOSEPOPUP: 'Close Popup'
     SUCCESSADD2: 'Added {name}'
@@ -109,20 +112,21 @@ hi:
     PLURALNAME: 'Data Objects'
     SINGULARNAME: 'Data Object'
   Date:
-    DAY: ' day'
-    DAYS: ' days'
-    HOUR: ' hour'
-    HOURS: ' hours'
-    MIN: ' min'
-    MINS: ' mins'
-    MONTH: ' month'
-    MONTHS: ' months'
-    SEC: ' sec'
-    SECS: ' secs'
+    DAY: day
+    DAYS: days
+    HOUR: hour
+    HOURS: hours
+    LessThanMinuteAgo: 'less than a minute'
+    MIN: min
+    MINS: mins
+    MONTH: month
+    MONTHS: months
+    SEC: sec
+    SECS: secs
     TIMEDIFFAGO: '{difference} ago'
     TIMEDIFFIN: 'in {difference}'
-    YEAR: ' year'
-    YEARS: ' years'
+    YEAR: year
+    YEARS: years
   DateField:
     NOTSET: 'not set'
     TODAY: आज
@@ -198,7 +202,8 @@ hi:
     TEXT2: 'password reset link'
     TEXT3: for
   Form:
-    FIELDISREQUIRED: '%s is required'
+    CSRF_FAILED_MESSAGE: 'There seems to have been a technical problem. Please click the back button, refresh your browser, and try again.'
+    FIELDISREQUIRED: '{name} is required'
     SubmitBtnLabel: Go
     VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
     VALIDATIONNOTUNIQUE: 'The value entered is not unique'
@@ -208,6 +213,7 @@ hi:
     VALIDATOR: Validator
     VALIDCURRENCY: 'Please enter a valid currency'
   FormField:
+    Example: 'e.g. %s'
     NONE: none
   GridAction:
     DELETE_DESCRIPTION: Delete
@@ -230,6 +236,7 @@ hi:
     ResetFilter: Reset
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'No delete permissions'
+    EditPermissionsFailure: 'No permission to unlink record'
   GridFieldDetailForm:
     CancelBtn: Cancel
     Create: Create
@@ -237,7 +244,9 @@ hi:
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
     Save: Save
-    Saved: 'Saved %s %s'
+    Saved: 'Saved {name} {link}'
+  GridFieldEditButton.ss:
+    EDIT: Edit
   GridFieldItemEditView.ss: null
   Group:
     AddRole: 'इस समूह के लिए एक भूमिका जोड़ें'
@@ -253,7 +262,7 @@ hi:
     RolesAddEditLink: 'भूमिकाओं का प्रबंधन करे '
     SINGULARNAME: Group
     Sort: 'Sort Order'
-    has_many_Permissions: अनुमतियाँ
+    has_many_Permissions: 'अनुमतियाँ'
     many_many_Members: सदस्य
   GroupImportForm:
     Help1: '<p>Import one or more groups in <em>CSV</em> format (comma-separated values). <small><a href="#" class="toggle-advanced">Show advanced usage</a></small></p>'
@@ -267,6 +276,7 @@ hi:
     ADDURL: 'Add URL'
     ADJUSTDETAILSDIMENSIONS: 'Details &amp; dimensions'
     ANCHORVALUE: Anchor
+    BUTTONADDURL: 'Add url'
     BUTTONINSERT: Insert
     BUTTONINSERTLINK: 'Insert link'
     BUTTONREMOVELINK: 'Remove link'
@@ -331,7 +341,10 @@ hi:
     PreviewButton: Preview
     REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
     SAVEDUP: Saved.
-    VersionUnknown: unknown
+    ShowAsList: 'show as list'
+    TooManyPages: 'Too many pages'
+    ValidationError: 'Validation error'
+    VersionUnknown: Unknown
   LeftAndMain_Menu.ss:
     Hello: Hi
     LOGOUT: 'Log out'
@@ -407,6 +420,7 @@ hi:
     TWODIGITMONTH: 'Two-digit month (01=January, etc.)'
     TWODIGITSECOND: 'Two digits of second (00 through 59)'
     TWODIGITYEAR: 'Two-digit year'
+    Toggle: 'Show formatting help'
   MemberImportForm:
     Help1: '<p>Import users in <em>CSV format</em> (comma-separated values). <small><a href="#" class="toggle-advanced">Show advanced usage</a></small></p>'
     Help2: '<div class="advanced">	<h4>Advanced usage</h4>	<ul>	<li>Allowed columns: <em>%s</em></li>	<li>Existing users are matched by their unique <em>Code</em> property, and updated with any new values from	the imported file.</li>	<li>Groups can be assigned by the <em>Groups</em> column. Groups are identified by their <em>Code</em> property,	multiple groups can be separated by comma. Existing group memberships are not cleared.</li>	</ul></div>'
@@ -421,7 +435,7 @@ hi:
   ModelAdmin:
     DELETE: Delete
     DELETEDRECORDS: 'Deleted {count} records.'
-    EMPTYBEFOREIMPORT: 'Clear Database before import'
+    EMPTYBEFOREIMPORT: 'Replace data'
     IMPORT: 'Import from CSV'
     IMPORTEDRECORDS: 'Imported {count} records.'
     NOCSVFILE: 'Please browse for a CSV file to import'
@@ -515,7 +529,20 @@ hi:
     BtnImport: 'Import from CSV'
     FileFieldLabel: 'CSV File <small>(Allowed extensions: *.csv)</small>'
   SilverStripeNavigator:
+    Auto: Auto
+    ChangeViewMode: 'Change view mode'
+    Desktop: Desktop
+    DualWindowView: 'Dual Window'
     Edit: Edit
+    EditView: 'Edit mode'
+    Mobile: Mobile
+    PreviewState: 'Preview State'
+    PreviewView: 'Preview mode'
+    Responsive: Responsive
+    SplitView: 'Split mode'
+    Tablet: Tablet
+    ViewDeviceWidth: 'Select a preview width'
+    Width: width
   SimpleImageField:
     NOUPLOAD: 'No Image Uploaded'
   SiteTree:
@@ -551,6 +578,8 @@ hi:
     ATTACHFILE: 'Attach a file'
     ATTACHFILES: 'Attach files'
     AttachFile: 'Attach file(s)'
+    CHOOSEANOTHERFILE: 'Choose another file'
+    CHOOSEANOTHERINFO: 'Replace this file with another one from the file store'
     DELETE: 'Delete from files'
     DELETEINFO: 'Permanently delete this file from the file store'
     DOEDIT: Save
@@ -565,12 +594,15 @@ hi:
     FROMFILES: 'From files'
     HOTLINKINFO: 'Info: This image will be hotlinked. Please ensure you have permissions from the original site creator to do so.'
     MAXNUMBEROFFILES: 'Max number of {count} file(s) exceeded.'
+    MAXNUMBEROFFILESONE: 'Can only upload one file'
     MAXNUMBEROFFILESSHORT: 'Can only upload {count} files'
+    OVERWRITEWARNING: 'File with the same name already exists'
     REMOVE: Remove
     REMOVEERROR: 'Error removing file'
     REMOVEINFO: 'Remove this file from here, but do not delete it from the file store'
     STARTALL: 'Start all'
     STARTALLINFO: 'Start all uploads'
     Saved: Saved
+    UPLOADSINTO: 'saves into /{path}'
   Versioned:
     has_many_Versions: Versions

lang/hr.yml

@@ -2,6 +2,7 @@ hr:
   AssetAdmin:
     ALLOWEDEXTS: 'Allowed extensions'
     NEWFOLDER: 'Novi direktorij'
+    SHOWALLOWEDEXTS: 'Show allowed extensions'
   AssetTableField:
     CREATED: Uploadano
     DIM: Dimenzije
@@ -59,9 +60,9 @@ hr:
     ERRORNOTADMIN: 'Korisnik nije administrator'
     ERRORNOTREC: 'Korisničko ime / lozinka nije prepoznata'
   Boolean:
-    0: 'False'
     ANY: Any
-    1: 'True'
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   CMSLoadingScreen.ss:
     LOADING: Loading...
     REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
@@ -70,6 +71,8 @@ hr:
     ACCESSALLINTERFACES: 'Access to all CMS sections'
     ACCESSALLINTERFACESHELP: 'Overrules more specific access settings.'
     SAVE: Snimi
+  CMSPageHistoryController_versions.ss:
+    PREVIEW: 'Website preview'
   CMSProfileController:
     MENUTITLE: 'My Profile'
   ChangePasswordEmail.ss:
@@ -79,8 +82,8 @@ hr:
     HELLO: Pozdrav
     PASSWORD: Password
   CheckboxField:
-    - 'False'
-    - 'True'
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   ComplexTableField:
     CLOSEPOPUP: 'Close Popup'
     SUCCESSADD2: 'Added {name}'
@@ -109,20 +112,21 @@ hr:
     PLURALNAME: 'Podatkovni Objekti'
     SINGULARNAME: 'Podatkovni Objekt'
   Date:
-    DAY: dan
-    DAYS: dani
-    HOUR: sat
-    HOURS: sati
-    MIN: minute
-    MINS: minute
-    MONTH: mjesec
-    MONTHS: mjeseci
-    SEC: sekunde
-    SECS: sekundi
+    DAY: day
+    DAYS: days
+    HOUR: hour
+    HOURS: hours
+    LessThanMinuteAgo: 'less than a minute'
+    MIN: min
+    MINS: mins
+    MONTH: month
+    MONTHS: months
+    SEC: sec
+    SECS: secs
     TIMEDIFFAGO: '{difference} ago'
     TIMEDIFFIN: 'in {difference}'
-    YEAR: godina
-    YEARS: godine
+    YEAR: year
+    YEARS: years
   DateField:
     NOTSET: 'not set'
     TODAY: today
@@ -198,7 +202,8 @@ hr:
     TEXT2: 'link za resetiranje zaporke'
     TEXT3: za
   Form:
-    FIELDISREQUIRED: '%s je obavezan'
+    CSRF_FAILED_MESSAGE: 'There seems to have been a technical problem. Please click the back button, refresh your browser, and try again.'
+    FIELDISREQUIRED: '{name} is required'
     SubmitBtnLabel: Go
     VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
     VALIDATIONNOTUNIQUE: 'Unesena vrijednost nije unikatna'
@@ -208,6 +213,7 @@ hr:
     VALIDATOR: Validator
     VALIDCURRENCY: 'Please enter a valid currency'
   FormField:
+    Example: 'e.g. %s'
     NONE: none
   GridAction:
     DELETE_DESCRIPTION: Delete
@@ -230,6 +236,7 @@ hr:
     ResetFilter: Reset
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'No delete permissions'
+    EditPermissionsFailure: 'No permission to unlink record'
   GridFieldDetailForm:
     CancelBtn: Cancel
     Create: Create
@@ -237,7 +244,9 @@ hr:
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
     Save: Save
-    Saved: 'Saved %s %s'
+    Saved: 'Saved {name} {link}'
+  GridFieldEditButton.ss:
+    EDIT: Edit
   GridFieldItemEditView.ss: null
   Group:
     AddRole: 'Add a role for this group'
@@ -267,6 +276,7 @@ hr:
     ADDURL: 'Add URL'
     ADJUSTDETAILSDIMENSIONS: 'Details & dimensions'
     ANCHORVALUE: Anchor
+    BUTTONADDURL: 'Add url'
     BUTTONINSERT: Insert
     BUTTONINSERTLINK: 'Ubaci vezu'
     BUTTONREMOVELINK: 'Obriši vezu'
@@ -293,7 +303,7 @@ hr:
     IMAGETITLE: 'Title text (tooltip) - for additional information about the image'
     IMAGETITLETEXT: 'Title text (tooltip)'
     IMAGETITLETEXTDESC: 'For additional information about the image'
-    IMAGEWIDTHPX: Širina
+    IMAGEWIDTHPX: 'Širina'
     INSERTMEDIA: 'Insert Media'
     LINK: 'Ubaci/editiraj link za označeni tekst'
     LINKANCHOR: 'Anchor on this page'
@@ -331,7 +341,10 @@ hr:
     PreviewButton: Preview
     REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
     SAVEDUP: Saved.
-    VersionUnknown: unknown
+    ShowAsList: 'show as list'
+    TooManyPages: 'Too many pages'
+    ValidationError: 'Validation error'
+    VersionUnknown: Unknown
   LeftAndMain_Menu.ss:
     Hello: Hi
     LOGOUT: 'Log out'
@@ -407,6 +420,7 @@ hr:
     TWODIGITMONTH: 'Two-digit month (01=January, etc.)'
     TWODIGITSECOND: 'Two digits of second (00 through 59)'
     TWODIGITYEAR: 'Two-digit year'
+    Toggle: 'Show formatting help'
   MemberImportForm:
     Help1: '<p>Import users in <em>CSV format</em> (comma-separated values). <small><a href="#" class="toggle-advanced">Show advanced usage</a></small></p>'
     Help2: '<div class="advanced">	<h4>Advanced usage</h4>	<ul>	<li>Allowed columns: <em>%s</em></li>	<li>Existing users are matched by their unique <em>Code</em> property, and updated with any new values from	the imported file.</li>	<li>Groups can be assigned by the <em>Groups</em> column. Groups are identified by their <em>Code</em> property,	multiple groups can be separated by comma. Existing group memberships are not cleared.</li>	</ul></div>'
@@ -421,7 +435,7 @@ hr:
   ModelAdmin:
     DELETE: Delete
     DELETEDRECORDS: 'Deleted {count} records.'
-    EMPTYBEFOREIMPORT: 'Clear Database before import'
+    EMPTYBEFOREIMPORT: 'Replace data'
     IMPORT: 'Import from CSV'
     IMPORTEDRECORDS: 'Imported {count} records.'
     NOCSVFILE: 'Please browse for a CSV file to import'
@@ -515,7 +529,20 @@ hr:
     BtnImport: 'Import from CSV'
     FileFieldLabel: 'CSV File <small>(Allowed extensions: *.csv)</small>'
   SilverStripeNavigator:
+    Auto: Auto
+    ChangeViewMode: 'Change view mode'
+    Desktop: Desktop
+    DualWindowView: 'Dual Window'
     Edit: Edit
+    EditView: 'Edit mode'
+    Mobile: Mobile
+    PreviewState: 'Preview State'
+    PreviewView: 'Preview mode'
+    Responsive: Responsive
+    SplitView: 'Split mode'
+    Tablet: Tablet
+    ViewDeviceWidth: 'Select a preview width'
+    Width: width
   SimpleImageField:
     NOUPLOAD: 'Nema uploadanih slika'
   SiteTree:
@@ -551,6 +578,8 @@ hr:
     ATTACHFILE: 'Attach a file'
     ATTACHFILES: 'Attach files'
     AttachFile: 'Attach file(s)'
+    CHOOSEANOTHERFILE: 'Choose another file'
+    CHOOSEANOTHERINFO: 'Replace this file with another one from the file store'
     DELETE: 'Delete from files'
     DELETEINFO: 'Permanently delete this file from the file store'
     DOEDIT: Save
@@ -565,12 +594,15 @@ hr:
     FROMFILES: 'From files'
     HOTLINKINFO: 'Info: This image will be hotlinked. Please ensure you have permissions from the original site creator to do so.'
     MAXNUMBEROFFILES: 'Max number of {count} file(s) exceeded.'
+    MAXNUMBEROFFILESONE: 'Can only upload one file'
     MAXNUMBEROFFILESSHORT: 'Can only upload {count} files'
+    OVERWRITEWARNING: 'File with the same name already exists'
     REMOVE: Remove
     REMOVEERROR: 'Error removing file'
     REMOVEINFO: 'Remove this file from here, but do not delete it from the file store'
     STARTALL: 'Start all'
     STARTALLINFO: 'Start all uploads'
     Saved: Saved
+    UPLOADSINTO: 'saves into /{path}'
   Versioned:
     has_many_Versions: Verzije

lang/hu.yml

@@ -2,6 +2,7 @@ hu:
   AssetAdmin:
     ALLOWEDEXTS: 'Allowed extensions'
     NEWFOLDER: 'Új mappa'
+    SHOWALLOWEDEXTS: 'Show allowed extensions'
   AssetTableField:
     CREATED: 'Először feltöltve'
     DIM: Képméret
@@ -59,9 +60,9 @@ hu:
     ERRORNOTADMIN: 'Ez a felhasználó nem adminisztrátor. '
     ERRORNOTREC: 'Ez a felhasználónév / jelszó nem létezik'
   Boolean:
-    0: 'False'
     ANY: Any
-    1: 'True'
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   CMSLoadingScreen.ss:
     LOADING: Loading...
     REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
@@ -70,6 +71,8 @@ hu:
     ACCESSALLINTERFACES: 'Elérés minden CMS interfészhez'
     ACCESSALLINTERFACESHELP: 'Overrules more specific access settings.'
     SAVE: Mentés
+  CMSPageHistoryController_versions.ss:
+    PREVIEW: 'Website preview'
   CMSProfileController:
     MENUTITLE: 'My Profile'
   ChangePasswordEmail.ss:
@@ -79,8 +82,8 @@ hu:
     HELLO: Szia!
     PASSWORD: Password
   CheckboxField:
-    - 'False'
-    - 'True'
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   ComplexTableField:
     CLOSEPOPUP: 'Ablak bezárása'
     SUCCESSADD2: 'Added {name}'
@@ -109,20 +112,21 @@ hu:
     PLURALNAME: 'Data Objects'
     SINGULARNAME: 'Data Object'
   Date:
-    DAY: nap
-    DAYS: nappal
-    HOUR: órája
-    HOURS: órával
-    MIN: perce
-    MINS: perccel
-    MONTH: hónap
-    MONTHS: hónappal
-    SEC: másodperce
-    SECS: másodperccel
+    DAY: day
+    DAYS: days
+    HOUR: hour
+    HOURS: hours
+    LessThanMinuteAgo: 'less than a minute'
+    MIN: min
+    MINS: mins
+    MONTH: month
+    MONTHS: months
+    SEC: sec
+    SECS: secs
     TIMEDIFFAGO: '{difference} ago'
     TIMEDIFFIN: 'in {difference}'
-    YEAR: éve
-    YEARS: évvel
+    YEAR: year
+    YEARS: years
   DateField:
     NOTSET: 'not set'
     TODAY: today
@@ -198,7 +202,8 @@ hu:
     TEXT2: 'password reset link'
     TEXT3: for
   Form:
-    FIELDISREQUIRED: 'A %s szükséges'
+    CSRF_FAILED_MESSAGE: 'There seems to have been a technical problem. Please click the back button, refresh your browser, and try again.'
+    FIELDISREQUIRED: '{name} is required'
     SubmitBtnLabel: Go
     VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
     VALIDATIONNOTUNIQUE: 'A beírt érték nem egyedi'
@@ -208,6 +213,7 @@ hu:
     VALIDATOR: Validator
     VALIDCURRENCY: 'Please enter a valid currency'
   FormField:
+    Example: 'e.g. %s'
     NONE: none
   GridAction:
     DELETE_DESCRIPTION: Delete
@@ -230,6 +236,7 @@ hu:
     ResetFilter: Reset
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'No delete permissions'
+    EditPermissionsFailure: 'No permission to unlink record'
   GridFieldDetailForm:
     CancelBtn: Cancel
     Create: Create
@@ -237,7 +244,9 @@ hu:
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
     Save: Save
-    Saved: 'Saved %s %s'
+    Saved: 'Saved {name} {link}'
+  GridFieldEditButton.ss:
+    EDIT: Edit
   GridFieldItemEditView.ss: null
   Group:
     AddRole: 'Add a role for this group'
@@ -267,6 +276,7 @@ hu:
     ADDURL: 'Add URL'
     ADJUSTDETAILSDIMENSIONS: 'Details & dimensions'
     ANCHORVALUE: Anchor
+    BUTTONADDURL: 'Add url'
     BUTTONINSERT: Insert
     BUTTONINSERTLINK: 'Link beszúrása'
     BUTTONREMOVELINK: 'Link eltávolítása'
@@ -331,7 +341,10 @@ hu:
     PreviewButton: Preview
     REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
     SAVEDUP: Saved.
-    VersionUnknown: unknown
+    ShowAsList: 'show as list'
+    TooManyPages: 'Too many pages'
+    ValidationError: 'Validation error'
+    VersionUnknown: Unknown
   LeftAndMain_Menu.ss:
     Hello: Hi
     LOGOUT: 'Log out'
@@ -407,6 +420,7 @@ hu:
     TWODIGITMONTH: 'Two-digit month (01=January, etc.)'
     TWODIGITSECOND: 'Two digits of second (00 through 59)'
     TWODIGITYEAR: 'Two-digit year'
+    Toggle: 'Show formatting help'
   MemberImportForm:
     Help1: '<p>Import users in <em>CSV format</em> (comma-separated values). <small><a href="#" class="toggle-advanced">Show advanced usage</a></small></p>'
     Help2: '<div class="advanced">	<h4>Advanced usage</h4>	<ul>	<li>Allowed columns: <em>%s</em></li>	<li>Existing users are matched by their unique <em>Code</em> property, and updated with any new values from	the imported file.</li>	<li>Groups can be assigned by the <em>Groups</em> column. Groups are identified by their <em>Code</em> property,	multiple groups can be separated by comma. Existing group memberships are not cleared.</li>	</ul></div>'
@@ -421,7 +435,7 @@ hu:
   ModelAdmin:
     DELETE: Törlés
     DELETEDRECORDS: 'Deleted {count} records.'
-    EMPTYBEFOREIMPORT: 'Clear Database before import'
+    EMPTYBEFOREIMPORT: 'Replace data'
     IMPORT: 'Betöltés CSV-ből'
     IMPORTEDRECORDS: 'Imported {count} records.'
     NOCSVFILE: 'Kérünk, válaszd ki a betöltendő CSV fájlt'
@@ -515,7 +529,20 @@ hu:
     BtnImport: 'Import from CSV'
     FileFieldLabel: 'CSV File <small>(Allowed extensions: *.csv)</small>'
   SilverStripeNavigator:
+    Auto: Auto
+    ChangeViewMode: 'Change view mode'
+    Desktop: Desktop
+    DualWindowView: 'Dual Window'
     Edit: Edit
+    EditView: 'Edit mode'
+    Mobile: Mobile
+    PreviewState: 'Preview State'
+    PreviewView: 'Preview mode'
+    Responsive: Responsive
+    SplitView: 'Split mode'
+    Tablet: Tablet
+    ViewDeviceWidth: 'Select a preview width'
+    Width: width
   SimpleImageField:
     NOUPLOAD: 'Nincs feltöltött kép'
   SiteTree:
@@ -551,6 +578,8 @@ hu:
     ATTACHFILE: 'Attach a file'
     ATTACHFILES: 'Attach files'
     AttachFile: 'Attach file(s)'
+    CHOOSEANOTHERFILE: 'Choose another file'
+    CHOOSEANOTHERINFO: 'Replace this file with another one from the file store'
     DELETE: 'Delete from files'
     DELETEINFO: 'Permanently delete this file from the file store'
     DOEDIT: Save
@@ -565,12 +594,15 @@ hu:
     FROMFILES: 'From files'
     HOTLINKINFO: 'Info: This image will be hotlinked. Please ensure you have permissions from the original site creator to do so.'
     MAXNUMBEROFFILES: 'Max number of {count} file(s) exceeded.'
+    MAXNUMBEROFFILESONE: 'Can only upload one file'
     MAXNUMBEROFFILESSHORT: 'Can only upload {count} files'
+    OVERWRITEWARNING: 'File with the same name already exists'
     REMOVE: Remove
     REMOVEERROR: 'Error removing file'
     REMOVEINFO: 'Remove this file from here, but do not delete it from the file store'
     STARTALL: 'Start all'
     STARTALLINFO: 'Start all uploads'
     Saved: Saved
+    UPLOADSINTO: 'saves into /{path}'
   Versioned:
     has_many_Versions: Verziók

lang/hy_AM.yml

@@ -2,6 +2,7 @@ hy_AM:
   AssetAdmin:
     ALLOWEDEXTS: 'Allowed extensions'
     NEWFOLDER: NewFolder
+    SHOWALLOWEDEXTS: 'Show allowed extensions'
   AssetTableField:
     CREATED: 'First uploaded'
     DIM: Dimensions
@@ -59,9 +60,9 @@ hy_AM:
     ERRORNOTADMIN: 'That user is not an administrator.'
     ERRORNOTREC: 'That username / password isn''t recognised'
   Boolean:
-    0: 'False'
     ANY: Any
-    1: 'True'
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   CMSLoadingScreen.ss:
     LOADING: Loading...
     REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
@@ -70,6 +71,8 @@ hy_AM:
     ACCESSALLINTERFACES: 'Access to all CMS sections'
     ACCESSALLINTERFACESHELP: 'Overrules more specific access settings.'
     SAVE: Save
+  CMSPageHistoryController_versions.ss:
+    PREVIEW: 'Website preview'
   CMSProfileController:
     MENUTITLE: 'My Profile'
   ChangePasswordEmail.ss:
@@ -79,8 +82,8 @@ hy_AM:
     HELLO: Hi
     PASSWORD: Password
   CheckboxField:
-    - 'False'
-    - 'True'
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   ComplexTableField:
     CLOSEPOPUP: 'Close Popup'
     SUCCESSADD2: 'Added {name}'
@@ -109,20 +112,21 @@ hy_AM:
     PLURALNAME: 'Data Objects'
     SINGULARNAME: 'Data Object'
   Date:
-    DAY: ' day'
-    DAYS: ' days'
-    HOUR: ' hour'
-    HOURS: ' hours'
-    MIN: ' min'
-    MINS: ' mins'
-    MONTH: ' month'
-    MONTHS: ' months'
-    SEC: ' sec'
-    SECS: ' secs'
+    DAY: day
+    DAYS: days
+    HOUR: hour
+    HOURS: hours
+    LessThanMinuteAgo: 'less than a minute'
+    MIN: min
+    MINS: mins
+    MONTH: month
+    MONTHS: months
+    SEC: sec
+    SECS: secs
     TIMEDIFFAGO: '{difference} ago'
     TIMEDIFFIN: 'in {difference}'
-    YEAR: ' year'
-    YEARS: ' years'
+    YEAR: year
+    YEARS: years
   DateField:
     NOTSET: 'not set'
     TODAY: today
@@ -198,7 +202,8 @@ hy_AM:
     TEXT2: 'password reset link'
     TEXT3: for
   Form:
-    FIELDISREQUIRED: '%s is required'
+    CSRF_FAILED_MESSAGE: 'There seems to have been a technical problem. Please click the back button, refresh your browser, and try again.'
+    FIELDISREQUIRED: '{name} is required'
     SubmitBtnLabel: Go
     VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
     VALIDATIONNOTUNIQUE: 'The value entered is not unique'
@@ -208,6 +213,7 @@ hy_AM:
     VALIDATOR: Validator
     VALIDCURRENCY: 'Please enter a valid currency'
   FormField:
+    Example: 'e.g. %s'
     NONE: none
   GridAction:
     DELETE_DESCRIPTION: Delete
@@ -230,6 +236,7 @@ hy_AM:
     ResetFilter: Reset
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'No delete permissions'
+    EditPermissionsFailure: 'No permission to unlink record'
   GridFieldDetailForm:
     CancelBtn: Cancel
     Create: Create
@@ -237,7 +244,9 @@ hy_AM:
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
     Save: Save
-    Saved: 'Saved %s %s'
+    Saved: 'Saved {name} {link}'
+  GridFieldEditButton.ss:
+    EDIT: Edit
   GridFieldItemEditView.ss: null
   Group:
     AddRole: 'Add a role for this group'
@@ -267,6 +276,7 @@ hy_AM:
     ADDURL: 'Add URL'
     ADJUSTDETAILSDIMENSIONS: 'Details & dimensions'
     ANCHORVALUE: Anchor
+    BUTTONADDURL: 'Add url'
     BUTTONINSERT: Insert
     BUTTONINSERTLINK: 'Insert link'
     BUTTONREMOVELINK: 'Remove link'
@@ -331,7 +341,10 @@ hy_AM:
     PreviewButton: Preview
     REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
     SAVEDUP: Saved.
-    VersionUnknown: unknown
+    ShowAsList: 'show as list'
+    TooManyPages: 'Too many pages'
+    ValidationError: 'Validation error'
+    VersionUnknown: Unknown
   LeftAndMain_Menu.ss:
     Hello: Hi
     LOGOUT: 'Log out'
@@ -407,6 +420,7 @@ hy_AM:
     TWODIGITMONTH: 'Two-digit month (01=January, etc.)'
     TWODIGITSECOND: 'Two digits of second (00 through 59)'
     TWODIGITYEAR: 'Two-digit year'
+    Toggle: 'Show formatting help'
   MemberImportForm:
     Help1: '<p>Import users in <em>CSV format</em> (comma-separated values). <small><a href="#" class="toggle-advanced">Show advanced usage</a></small></p>'
     Help2: '<div class="advanced">	<h4>Advanced usage</h4>	<ul>	<li>Allowed columns: <em>%s</em></li>	<li>Existing users are matched by their unique <em>Code</em> property, and updated with any new values from	the imported file.</li>	<li>Groups can be assigned by the <em>Groups</em> column. Groups are identified by their <em>Code</em> property,	multiple groups can be separated by comma. Existing group memberships are not cleared.</li>	</ul></div>'
@@ -421,7 +435,7 @@ hy_AM:
   ModelAdmin:
     DELETE: Delete
     DELETEDRECORDS: 'Deleted {count} records.'
-    EMPTYBEFOREIMPORT: 'Clear Database before import'
+    EMPTYBEFOREIMPORT: 'Replace data'
     IMPORT: 'Import from CSV'
     IMPORTEDRECORDS: 'Imported {count} records.'
     NOCSVFILE: 'Please browse for a CSV file to import'
@@ -515,7 +529,20 @@ hy_AM:
     BtnImport: 'Import from CSV'
     FileFieldLabel: 'CSV File <small>(Allowed extensions: *.csv)</small>'
   SilverStripeNavigator:
+    Auto: Auto
+    ChangeViewMode: 'Change view mode'
+    Desktop: Desktop
+    DualWindowView: 'Dual Window'
     Edit: Edit
+    EditView: 'Edit mode'
+    Mobile: Mobile
+    PreviewState: 'Preview State'
+    PreviewView: 'Preview mode'
+    Responsive: Responsive
+    SplitView: 'Split mode'
+    Tablet: Tablet
+    ViewDeviceWidth: 'Select a preview width'
+    Width: width
   SimpleImageField:
     NOUPLOAD: 'No Image Uploaded'
   SiteTree:
@@ -551,6 +578,8 @@ hy_AM:
     ATTACHFILE: 'Attach a file'
     ATTACHFILES: 'Attach files'
     AttachFile: 'Attach file(s)'
+    CHOOSEANOTHERFILE: 'Choose another file'
+    CHOOSEANOTHERINFO: 'Replace this file with another one from the file store'
     DELETE: 'Delete from files'
     DELETEINFO: 'Permanently delete this file from the file store'
     DOEDIT: Save
@@ -565,12 +594,15 @@ hy_AM:
     FROMFILES: 'From files'
     HOTLINKINFO: 'Info: This image will be hotlinked. Please ensure you have permissions from the original site creator to do so.'
     MAXNUMBEROFFILES: 'Max number of {count} file(s) exceeded.'
+    MAXNUMBEROFFILESONE: 'Can only upload one file'
     MAXNUMBEROFFILESSHORT: 'Can only upload {count} files'
+    OVERWRITEWARNING: 'File with the same name already exists'
     REMOVE: Remove
     REMOVEERROR: 'Error removing file'
     REMOVEINFO: 'Remove this file from here, but do not delete it from the file store'
     STARTALL: 'Start all'
     STARTALLINFO: 'Start all uploads'
     Saved: Saved
+    UPLOADSINTO: 'saves into /{path}'
   Versioned:
     has_many_Versions: Versions

lang/id.yml

@@ -2,6 +2,7 @@ id:
   AssetAdmin:
     ALLOWEDEXTS: 'Allowed extensions'
     NEWFOLDER: NewFolder
+    SHOWALLOWEDEXTS: 'Show allowed extensions'
   AssetTableField:
     CREATED: 'First uploaded'
     DIM: Dimensions
@@ -59,9 +60,9 @@ id:
     ERRORNOTADMIN: 'User tersebut bukan administrator.'
     ERRORNOTREC: 'Username/password tidak dikenali'
   Boolean:
-    0: 'False'
     ANY: Any
-    1: 'True'
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   CMSLoadingScreen.ss:
     LOADING: Loading...
     REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
@@ -70,6 +71,8 @@ id:
     ACCESSALLINTERFACES: 'Access to all CMS sections'
     ACCESSALLINTERFACESHELP: 'Overrules more specific access settings.'
     SAVE: Simpan
+  CMSPageHistoryController_versions.ss:
+    PREVIEW: 'Website preview'
   CMSProfileController:
     MENUTITLE: 'My Profile'
   ChangePasswordEmail.ss:
@@ -79,8 +82,8 @@ id:
     HELLO: Hai
     PASSWORD: Password
   CheckboxField:
-    - 'False'
-    - 'True'
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   ComplexTableField:
     CLOSEPOPUP: 'Tutup popup'
     SUCCESSADD2: 'Added {name}'
@@ -109,20 +112,21 @@ id:
     PLURALNAME: 'Objek-objek Data'
     SINGULARNAME: 'Objek Data'
   Date:
-    DAY: hari
-    DAYS: hari
-    HOUR: jam
-    HOURS: jam
-    MIN: menit
-    MINS: menit
-    MONTH: bulan
-    MONTHS: bulan
-    SEC: detik
-    SECS: detik
+    DAY: day
+    DAYS: days
+    HOUR: hour
+    HOURS: hours
+    LessThanMinuteAgo: 'less than a minute'
+    MIN: min
+    MINS: mins
+    MONTH: month
+    MONTHS: months
+    SEC: sec
+    SECS: secs
     TIMEDIFFAGO: '{difference} ago'
     TIMEDIFFIN: 'in {difference}'
-    YEAR: tahun
-    YEARS: tahun
+    YEAR: year
+    YEARS: years
   DateField:
     NOTSET: 'tidak diset'
     TODAY: 'hari ini'
@@ -198,7 +202,8 @@ id:
     TEXT2: 'link untuk mereset kata sandi'
     TEXT3: untuk
   Form:
-    FIELDISREQUIRED: '%s dibutuhkan'
+    CSRF_FAILED_MESSAGE: 'There seems to have been a technical problem. Please click the back button, refresh your browser, and try again.'
+    FIELDISREQUIRED: '{name} is required'
     SubmitBtnLabel: Go
     VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
     VALIDATIONNOTUNIQUE: 'Harga yang dimasukkan tidak unik'
@@ -208,6 +213,7 @@ id:
     VALIDATOR: Pengesah
     VALIDCURRENCY: 'Please enter a valid currency'
   FormField:
+    Example: 'e.g. %s'
     NONE: 'tidak ada'
   GridAction:
     DELETE_DESCRIPTION: Delete
@@ -230,6 +236,7 @@ id:
     ResetFilter: Reset
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'No delete permissions'
+    EditPermissionsFailure: 'No permission to unlink record'
   GridFieldDetailForm:
     CancelBtn: Cancel
     Create: Create
@@ -237,7 +244,9 @@ id:
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
     Save: Save
-    Saved: 'Saved %s %s'
+    Saved: 'Saved {name} {link}'
+  GridFieldEditButton.ss:
+    EDIT: Edit
   GridFieldItemEditView.ss: null
   Group:
     AddRole: 'Add a role for this group'
@@ -267,6 +276,7 @@ id:
     ADDURL: 'Add URL'
     ADJUSTDETAILSDIMENSIONS: 'Details & dimensions'
     ANCHORVALUE: Anchor
+    BUTTONADDURL: 'Add url'
     BUTTONINSERT: Insert
     BUTTONINSERTLINK: 'Beri link'
     BUTTONREMOVELINK: 'Pindahkan link'
@@ -331,7 +341,10 @@ id:
     PreviewButton: Preview
     REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
     SAVEDUP: Saved.
-    VersionUnknown: unknown
+    ShowAsList: 'show as list'
+    TooManyPages: 'Too many pages'
+    ValidationError: 'Validation error'
+    VersionUnknown: Unknown
   LeftAndMain_Menu.ss:
     Hello: Hi
     LOGOUT: 'Log out'
@@ -407,6 +420,7 @@ id:
     TWODIGITMONTH: 'Two-digit month (01=January, etc.)'
     TWODIGITSECOND: 'Two digits of second (00 through 59)'
     TWODIGITYEAR: 'Two-digit year'
+    Toggle: 'Show formatting help'
   MemberImportForm:
     Help1: '<p>Import users in <em>CSV format</em> (comma-separated values). <small><a href="#" class="toggle-advanced">Show advanced usage</a></small></p>'
     Help2: '<div class="advanced">	<h4>Advanced usage</h4>	<ul>	<li>Allowed columns: <em>%s</em></li>	<li>Existing users are matched by their unique <em>Code</em> property, and updated with any new values from	the imported file.</li>	<li>Groups can be assigned by the <em>Groups</em> column. Groups are identified by their <em>Code</em> property,	multiple groups can be separated by comma. Existing group memberships are not cleared.</li>	</ul></div>'
@@ -421,7 +435,7 @@ id:
   ModelAdmin:
     DELETE: Delete
     DELETEDRECORDS: 'Deleted {count} records.'
-    EMPTYBEFOREIMPORT: 'Clear Database before import'
+    EMPTYBEFOREIMPORT: 'Replace data'
     IMPORT: 'Import from CSV'
     IMPORTEDRECORDS: 'Imported {count} records.'
     NOCSVFILE: 'Please browse for a CSV file to import'
@@ -515,7 +529,20 @@ id:
     BtnImport: 'Import from CSV'
     FileFieldLabel: 'CSV File <small>(Allowed extensions: *.csv)</small>'
   SilverStripeNavigator:
+    Auto: Auto
+    ChangeViewMode: 'Change view mode'
+    Desktop: Desktop
+    DualWindowView: 'Dual Window'
     Edit: Edit
+    EditView: 'Edit mode'
+    Mobile: Mobile
+    PreviewState: 'Preview State'
+    PreviewView: 'Preview mode'
+    Responsive: Responsive
+    SplitView: 'Split mode'
+    Tablet: Tablet
+    ViewDeviceWidth: 'Select a preview width'
+    Width: width
   SimpleImageField:
     NOUPLOAD: 'Tidak Ada Gambar yang Di-upload'
   SiteTree:
@@ -551,6 +578,8 @@ id:
     ATTACHFILE: 'Attach a file'
     ATTACHFILES: 'Attach files'
     AttachFile: 'Attach file(s)'
+    CHOOSEANOTHERFILE: 'Choose another file'
+    CHOOSEANOTHERINFO: 'Replace this file with another one from the file store'
     DELETE: 'Delete from files'
     DELETEINFO: 'Permanently delete this file from the file store'
     DOEDIT: Save
@@ -565,12 +594,15 @@ id:
     FROMFILES: 'From files'
     HOTLINKINFO: 'Info: This image will be hotlinked. Please ensure you have permissions from the original site creator to do so.'
     MAXNUMBEROFFILES: 'Max number of {count} file(s) exceeded.'
+    MAXNUMBEROFFILESONE: 'Can only upload one file'
     MAXNUMBEROFFILESSHORT: 'Can only upload {count} files'
+    OVERWRITEWARNING: 'File with the same name already exists'
     REMOVE: Remove
     REMOVEERROR: 'Error removing file'
     REMOVEINFO: 'Remove this file from here, but do not delete it from the file store'
     STARTALL: 'Start all'
     STARTALLINFO: 'Start all uploads'
     Saved: Saved
+    UPLOADSINTO: 'saves into /{path}'
   Versioned:
     has_many_Versions: Versi-versi

lang/is.yml

@@ -2,6 +2,7 @@ is:
   AssetAdmin:
     ALLOWEDEXTS: 'Allowed extensions'
     NEWFOLDER: NewFolder
+    SHOWALLOWEDEXTS: 'Show allowed extensions'
   AssetTableField:
     CREATED: 'First uploaded'
     DIM: Dimensions
@@ -59,9 +60,9 @@ is:
     ERRORNOTADMIN: 'Þessi notandi er ekki stjórnandi'
     ERRORNOTREC: 'Þetta notendanafn / lykilorð er ekki til'
   Boolean:
-    0: Nei
     ANY: Einhver
-    1: Já
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   CMSLoadingScreen.ss:
     LOADING: Loading...
     REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
@@ -70,6 +71,8 @@ is:
     ACCESSALLINTERFACES: 'Access to all CMS sections'
     ACCESSALLINTERFACESHELP: 'Overrules more specific access settings.'
     SAVE: Vista
+  CMSPageHistoryController_versions.ss:
+    PREVIEW: 'Website preview'
   CMSProfileController:
     MENUTITLE: 'My Profile'
   ChangePasswordEmail.ss:
@@ -79,8 +82,8 @@ is:
     HELLO: Hæ
     PASSWORD: Lykilorð
   CheckboxField:
-    - Nei
-    - Já
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   ComplexTableField:
     CLOSEPOPUP: 'Loka glugga'
     SUCCESSADD2: 'Added {name}'
@@ -109,20 +112,21 @@ is:
     PLURALNAME: 'Gagna hlutir'
     SINGULARNAME: 'Gagna hlutir'
   Date:
-    DAY: dagur
-    DAYS: dagar
-    HOUR: klukkustund
-    HOURS: klukkustundir
-    MIN: mín
-    MINS: mín
-    MONTH: mánuð
-    MONTHS: mánuði
-    SEC: sek
-    SECS: sek
+    DAY: day
+    DAYS: days
+    HOUR: hour
+    HOURS: hours
+    LessThanMinuteAgo: 'less than a minute'
+    MIN: min
+    MINS: mins
+    MONTH: month
+    MONTHS: months
+    SEC: sec
+    SECS: secs
     TIMEDIFFAGO: '{difference} ago'
     TIMEDIFFIN: 'in {difference}'
-    YEAR: ár
-    YEARS: ár
+    YEAR: year
+    YEARS: years
   DateField:
     NOTSET: 'ekki valið'
     TODAY: 'í dag'
@@ -198,7 +202,8 @@ is:
     TEXT2: 'endursetja lykilorð'
     TEXT3: fyrir
   Form:
-    FIELDISREQUIRED: '%s er krafist'
+    CSRF_FAILED_MESSAGE: 'There seems to have been a technical problem. Please click the back button, refresh your browser, and try again.'
+    FIELDISREQUIRED: '{name} is required'
     SubmitBtnLabel: Go
     VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
     VALIDATIONNOTUNIQUE: 'Gildið sem þú slóst inn er ekki einkvæmt'
@@ -208,6 +213,7 @@ is:
     VALIDATOR: Staðfesta
     VALIDCURRENCY: 'Please enter a valid currency'
   FormField:
+    Example: 'e.g. %s'
     NONE: ekkert
   GridAction:
     DELETE_DESCRIPTION: Delete
@@ -230,6 +236,7 @@ is:
     ResetFilter: Reset
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'No delete permissions'
+    EditPermissionsFailure: 'No permission to unlink record'
   GridFieldDetailForm:
     CancelBtn: Cancel
     Create: Create
@@ -237,7 +244,9 @@ is:
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
     Save: Save
-    Saved: 'Saved %s %s'
+    Saved: 'Saved {name} {link}'
+  GridFieldEditButton.ss:
+    EDIT: Edit
   GridFieldItemEditView.ss: null
   Group:
     AddRole: 'Add a role for this group'
@@ -267,6 +276,7 @@ is:
     ADDURL: 'Add URL'
     ADJUSTDETAILSDIMENSIONS: 'Details & dimensions'
     ANCHORVALUE: Markstikla
+    BUTTONADDURL: 'Add url'
     BUTTONINSERT: Insert
     BUTTONINSERTLINK: 'Bæta við hlekk'
     BUTTONREMOVELINK: 'Fjarlægja hlekk'
@@ -331,7 +341,10 @@ is:
     PreviewButton: Preview
     REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
     SAVEDUP: Saved.
-    VersionUnknown: unknown
+    ShowAsList: 'show as list'
+    TooManyPages: 'Too many pages'
+    ValidationError: 'Validation error'
+    VersionUnknown: Unknown
   LeftAndMain_Menu.ss:
     Hello: Hi
     LOGOUT: 'Log out'
@@ -407,6 +420,7 @@ is:
     TWODIGITMONTH: 'Two-digit month (01=January, etc.)'
     TWODIGITSECOND: 'Two digits of second (00 through 59)'
     TWODIGITYEAR: 'Two-digit year'
+    Toggle: 'Show formatting help'
   MemberImportForm:
     Help1: '<p>Import users in <em>CSV format</em> (comma-separated values). <small><a href="#" class="toggle-advanced">Show advanced usage</a></small></p>'
     Help2: '<div class="advanced">	<h4>Advanced usage</h4>	<ul>	<li>Allowed columns: <em>%s</em></li>	<li>Existing users are matched by their unique <em>Code</em> property, and updated with any new values from	the imported file.</li>	<li>Groups can be assigned by the <em>Groups</em> column. Groups are identified by their <em>Code</em> property,	multiple groups can be separated by comma. Existing group memberships are not cleared.</li>	</ul></div>'
@@ -421,7 +435,7 @@ is:
   ModelAdmin:
     DELETE: Delete
     DELETEDRECORDS: 'Deleted {count} records.'
-    EMPTYBEFOREIMPORT: 'Clear Database before import'
+    EMPTYBEFOREIMPORT: 'Replace data'
     IMPORT: 'Import from CSV'
     IMPORTEDRECORDS: 'Imported {count} records.'
     NOCSVFILE: 'Please browse for a CSV file to import'
@@ -515,7 +529,20 @@ is:
     BtnImport: 'Import from CSV'
     FileFieldLabel: 'CSV File <small>(Allowed extensions: *.csv)</small>'
   SilverStripeNavigator:
+    Auto: Auto
+    ChangeViewMode: 'Change view mode'
+    Desktop: Desktop
+    DualWindowView: 'Dual Window'
     Edit: Edit
+    EditView: 'Edit mode'
+    Mobile: Mobile
+    PreviewState: 'Preview State'
+    PreviewView: 'Preview mode'
+    Responsive: Responsive
+    SplitView: 'Split mode'
+    Tablet: Tablet
+    ViewDeviceWidth: 'Select a preview width'
+    Width: width
   SimpleImageField:
     NOUPLOAD: 'Engin mynd sótt'
   SiteTree:
@@ -551,6 +578,8 @@ is:
     ATTACHFILE: 'Attach a file'
     ATTACHFILES: 'Attach files'
     AttachFile: 'Attach file(s)'
+    CHOOSEANOTHERFILE: 'Choose another file'
+    CHOOSEANOTHERINFO: 'Replace this file with another one from the file store'
     DELETE: 'Delete from files'
     DELETEINFO: 'Permanently delete this file from the file store'
     DOEDIT: Save
@@ -565,12 +594,15 @@ is:
     FROMFILES: 'From files'
     HOTLINKINFO: 'Info: This image will be hotlinked. Please ensure you have permissions from the original site creator to do so.'
     MAXNUMBEROFFILES: 'Max number of {count} file(s) exceeded.'
+    MAXNUMBEROFFILESONE: 'Can only upload one file'
     MAXNUMBEROFFILESSHORT: 'Can only upload {count} files'
+    OVERWRITEWARNING: 'File with the same name already exists'
     REMOVE: Remove
     REMOVEERROR: 'Error removing file'
     REMOVEINFO: 'Remove this file from here, but do not delete it from the file store'
     STARTALL: 'Start all'
     STARTALLINFO: 'Start all uploads'
     Saved: Saved
+    UPLOADSINTO: 'saves into /{path}'
   Versioned:
     has_many_Versions: útgáfur

lang/it.yml

@@ -2,6 +2,7 @@ it:
   AssetAdmin:
     ALLOWEDEXTS: 'Estensioni consentite'
     NEWFOLDER: NuovaCartella
+    SHOWALLOWEDEXTS: 'Show allowed extensions'
   AssetTableField:
     CREATED: 'Inizialmente caricato'
     DIM: Dimensioni
@@ -59,9 +60,9 @@ it:
     ERRORNOTADMIN: 'Questo utente non è amministratore.'
     ERRORNOTREC: 'Nome utente / password non riconosciuti'
   Boolean:
-    0: NO
     ANY: Qualsiasi
-    1: SI
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   CMSLoadingScreen.ss:
     LOADING: 'Caricamento in corso...'
     REQUIREJS: 'Il CMS richiede JavaScript abilitato.'
@@ -70,6 +71,8 @@ it:
     ACCESSALLINTERFACES: 'Accesso a tutte le sezioni del CMS'
     ACCESSALLINTERFACESHELP: 'Annulla le impostazioni di accesso più specifiche.'
     SAVE: Salva
+  CMSPageHistoryController_versions.ss:
+    PREVIEW: 'Website preview'
   CMSProfileController:
     MENUTITLE: 'Il mio Profilo'
   ChangePasswordEmail.ss:
@@ -79,8 +82,8 @@ it:
     HELLO: Ciao
     PASSWORD: Password
   CheckboxField:
-    - No
-    - Si
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   ComplexTableField:
     CLOSEPOPUP: 'Chiudi Finestra'
     SUCCESSADD2: 'Aggiunto {name}'
@@ -109,20 +112,21 @@ it:
     PLURALNAME: 'Data Objects'
     SINGULARNAME: 'Data Object'
   Date:
-    DAY: giorno
-    DAYS: giorni
-    HOUR: ora
-    HOURS: ore
+    DAY: day
+    DAYS: days
+    HOUR: hour
+    HOURS: hours
+    LessThanMinuteAgo: 'less than a minute'
     MIN: min
-    MINS: min
-    MONTH: mese
-    MONTHS: mesi
+    MINS: mins
+    MONTH: month
+    MONTHS: months
     SEC: sec
-    SECS: sec
+    SECS: secs
     TIMEDIFFAGO: '{difference} fa'
     TIMEDIFFIN: 'in {difference}'
-    YEAR: anno
-    YEARS: anni
+    YEAR: year
+    YEARS: years
   DateField:
     NOTSET: 'non impostato'
     TODAY: oggi
@@ -198,7 +202,8 @@ it:
     TEXT2: 'Link per l''azzeramento della password'
     TEXT3: per
   Form:
-    FIELDISREQUIRED: '%s è richiesto'
+    CSRF_FAILED_MESSAGE: 'There seems to have been a technical problem. Please click the back button, refresh your browser, and try again.'
+    FIELDISREQUIRED: '{name} is required'
     SubmitBtnLabel: Vai
     VALIDATIONCREDITNUMBER: 'Assicurati che il numero di carta di credito {number} sia inserito correttamente'
     VALIDATIONNOTUNIQUE: 'Il valore inserito non è unico'
@@ -208,6 +213,7 @@ it:
     VALIDATOR: Valiidatore
     VALIDCURRENCY: 'Inserisci una valuta valida'
   FormField:
+    Example: 'e.g. %s'
     NONE: nessuno
   GridAction:
     DELETE_DESCRIPTION: Elimina
@@ -230,6 +236,7 @@ it:
     ResetFilter: Azzera
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'Non hai i permessi per eliminare'
+    EditPermissionsFailure: 'No permission to unlink record'
   GridFieldDetailForm:
     CancelBtn: Annulla
     Create: Crea
@@ -237,7 +244,9 @@ it:
     DeletePermissionsFailure: 'Non hai i permessi per eliminare'
     Deleted: 'Eliminato %s %s'
     Save: Salva
-    Saved: 'Salvato %s %s'
+    Saved: 'Saved {name} {link}'
+  GridFieldEditButton.ss:
+    EDIT: Edit
   GridFieldItemEditView.ss: null
   Group:
     AddRole: 'Aggiungi un ruolo per questo gruppo'
@@ -267,6 +276,7 @@ it:
     ADDURL: 'Aggiungi URL'
     ADJUSTDETAILSDIMENSIONS: 'Dettagli e dimensioni'
     ANCHORVALUE: Ancora
+    BUTTONADDURL: 'Add url'
     BUTTONINSERT: Inserisci
     BUTTONINSERTLINK: 'Inserisci link'
     BUTTONREMOVELINK: 'Rimuovi link'
@@ -331,6 +341,9 @@ it:
     PreviewButton: Anteprima
     REORGANISATIONSUCCESSFUL: 'Albero del sito riorganizzato con successo.'
     SAVEDUP: Salvato.
+    ShowAsList: 'show as list'
+    TooManyPages: 'Too many pages'
+    ValidationError: 'Validation error'
     VersionUnknown: sconosciuto
   LeftAndMain_Menu.ss:
     Hello: Ciao
@@ -407,6 +420,7 @@ it:
     TWODIGITMONTH: 'Mese a due cifre (01=Gennaio, ecc.)'
     TWODIGITSECOND: 'Secondi a due cifre (00 a 59)'
     TWODIGITYEAR: 'Anno a due cifre'
+    Toggle: 'Show formatting help'
   MemberImportForm:
     Help1: '<p>Importa utenti in <em>formato CSV</em> (valori separati da virgole). <small><a href="#" class="toggle-advanced">Mostra utilizzo avanzato</a></small></p>'
     Help2: "<div class=\"advanced\">\\n<h4>Utilizzo avanzato</h4>\\n<ul>\\n<li>Colonne consentite: <em>%s</em></li>\\n<li>Utenti esistenti sono individuati attraverso la proprietà univoca <em>Code</em> e aggiornati con i nuovi valori \\ndal file importato.</li>\\n<li>I gruppi possono essere assegnati attraverso la colonna <em>Groups</em>. I gruppi sono identificati attraverso la loro colonna <em>Code</em>, \\npiù gruppi devono essere separati da virgola. L''appartenenza esistente a gruppi non viene cancellata.</li>\\n</ul>\\n</div>"
@@ -421,7 +435,7 @@ it:
   ModelAdmin:
     DELETE: Elimina
     DELETEDRECORDS: 'Eliminati {count} record.'
-    EMPTYBEFOREIMPORT: 'Cancella database prima dell''import'
+    EMPTYBEFOREIMPORT: 'Replace data'
     IMPORT: 'Importa da CSV'
     IMPORTEDRECORDS: 'Importati {count} record.'
     NOCSVFILE: 'Scegli un file CSV da importare'
@@ -515,7 +529,20 @@ it:
     BtnImport: 'Importa da CSV'
     FileFieldLabel: 'File CSV <small>(Estensioni consentite: *.csv)</small>'
   SilverStripeNavigator:
+    Auto: Auto
+    ChangeViewMode: 'Change view mode'
+    Desktop: Desktop
+    DualWindowView: 'Dual Window'
     Edit: Modifica
+    EditView: 'Edit mode'
+    Mobile: Mobile
+    PreviewState: 'Preview State'
+    PreviewView: 'Preview mode'
+    Responsive: Responsive
+    SplitView: 'Split mode'
+    Tablet: Tablet
+    ViewDeviceWidth: 'Select a preview width'
+    Width: width
   SimpleImageField:
     NOUPLOAD: 'Nessuna immagine caricata'
   SiteTree:
@@ -551,6 +578,8 @@ it:
     ATTACHFILE: 'Allega un file'
     ATTACHFILES: 'Allega file'
     AttachFile: 'Allega file'
+    CHOOSEANOTHERFILE: 'Choose another file'
+    CHOOSEANOTHERINFO: 'Replace this file with another one from the file store'
     DELETE: Elimina
     DELETEINFO: 'Elimina permanentemente questo file dal CMS'
     DOEDIT: Salva
@@ -565,12 +594,15 @@ it:
     FROMFILES: 'Dal CMS'
     HOTLINKINFO: 'Info: Questa immagine sarà collegata. Assicurati di avere il permesso di farlo.'
     MAXNUMBEROFFILES: 'Numero massimo di {count} file ecceduto.'
+    MAXNUMBEROFFILESONE: 'Can only upload one file'
     MAXNUMBEROFFILESSHORT: 'Puoi caricare solo {count} file'
+    OVERWRITEWARNING: 'File with the same name already exists'
     REMOVE: Rimuovi
     REMOVEERROR: 'Errore eliminando il file'
     REMOVEINFO: 'Rimuove il file da qui, ma non lo elimina dal CMS'
     STARTALL: 'Avvia tutti'
     STARTALLINFO: 'Avvia tutti i caricamenti'
     Saved: Salvato
+    UPLOADSINTO: 'saves into /{path}'
   Versioned:
     has_many_Versions: Versioni

lang/ja_JP.yml

@@ -2,13 +2,14 @@ ja_JP:
   AssetAdmin:
     ALLOWEDEXTS: 'Allowed extensions'
     NEWFOLDER: 新しいフォルダ
+    SHOWALLOWEDEXTS: 'Show allowed extensions'
   AssetTableField:
     CREATED: 初回アップロード日時
     DIM: Dimensions
     FILENAME: ファイル名
     FOLDER: フォルダ
     LASTEDIT: 最終更新日
-    OWNER: 所有者
+    OWNER: '所有者'
     SIZE: ファイルサイズ
     TITLE: タイトル
     TYPE: ファイルの種類
@@ -16,7 +17,7 @@ ja_JP:
   AssetUploadField:
     ChooseFiles: ファイルを選択
     DRAGFILESHERE: ここにファイルをドラッグ
-    DROPAREA: ドロップ領域
+    DROPAREA: 'ドロップ領域'
     EDITALL: すべて編集
     EDITANDORGANIZE: 編集と管理
     EDITINFO: ファイルを編集
@@ -25,7 +26,7 @@ ja_JP:
     FROMCOMPUTERINFO: コンピュータからアップロード
     TOTAL: 合計
     TOUPLOAD: 'Choose files to upload...'
-    UPLOADINPROGRESS: しばらくお待ちください...アップロードは進行中です
+    UPLOADINPROGRESS: 'しばらくお待ちください...アップロードは進行中です'
     UPLOADOR: もしくは
   BBCodeParser:
     ALIGNEMENT: 整列
@@ -44,7 +45,7 @@ ja_JP:
     ITALIC: テキストを斜体にする
     ITALICEXAMPLE: 斜体
     LINK: ウェブサイトのリンク
-    LINKDESCRIPTION: 別のウェブサイトかURLにリンクしてください
+    LINKDESCRIPTION: '別のウェブサイトかURLにリンクしてください'
     STRUCK: テキストに取り消し線を引く
     STRUCKEXAMPLE: 取り消し線
     UNDERLINE: テキストに下線を引く
@@ -55,21 +56,23 @@ ja_JP:
   BackLink_Button.ss:
     Back: 戻る
   BasicAuth:
-    ENTERINFO: ユーザー名とパスワードを入力してください
-    ERRORNOTADMIN: このユーザーは管理者（アドミニストレーター）ではありません
+    ENTERINFO: 'ユーザー名とパスワードを入力してください'
+    ERRORNOTADMIN: 'このユーザーは管理者（アドミニストレーター）ではありません'
     ERRORNOTREC: 'ユーザー名 / パスワードは認識されませんでした'
   Boolean:
-    0: 偽
     ANY: 何でも
-    1: 真
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   CMSLoadingScreen.ss:
     LOADING: 読み込み中...
-    REQUIREJS: CMSを利用するにはJavascriptが有効化されている必要があります。
+    REQUIREJS: 'CMSを利用するにはJavascriptが有効化されている必要があります。'
   CMSMain:
     ACCESS: 'Access to ''{title}'' section'
     ACCESSALLINTERFACES: すべてのCMSのセクションへアクセス
     ACCESSALLINTERFACESHELP: 'Overrules more specific access settings.'
     SAVE: 保存
+  CMSPageHistoryController_versions.ss:
+    PREVIEW: 'Website preview'
   CMSProfileController:
     MENUTITLE: 'My Profile'
   ChangePasswordEmail.ss:
@@ -79,17 +82,17 @@ ja_JP:
     HELLO: こんにちわ！
     PASSWORD: パスワード
   CheckboxField:
-    - いいえ
-    - はい
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   ComplexTableField:
     CLOSEPOPUP: ポップアップを閉じる
     SUCCESSADD2: '{name}を追加しました'
     SUCCESSEDIT: '更新日時 %s %s %s'
   ComplexTableField.ss:
     ADDITEM: '%sを追加する'
-    NOITEMSFOUND: 項目が見つかりませんでした
-    SORTASC: 昇順
-    SORTDESC: ソート（下順）
+    NOITEMSFOUND: '項目が見つかりませんでした'
+    SORTASC: '昇順'
+    SORTDESC: 'ソート（下順）'
   ComplexTableField_popup.ss:
     NEXT: 次へ
     PREVIOUS: 前へ
@@ -109,20 +112,21 @@ ja_JP:
     PLURALNAME: データオブジェクト
     SINGULARNAME: データオブジェクト
   Date:
-    DAY: ' 日'
-    DAYS: 日
-    HOUR: 時
-    HOURS: 時
-    MIN: 分
-    MINS: 分
-    MONTH: ' 月'
-    MONTHS: ' 月'
-    SEC: 秒
-    SECS: 秒
+    DAY: day
+    DAYS: days
+    HOUR: hour
+    HOURS: hours
+    LessThanMinuteAgo: 'less than a minute'
+    MIN: min
+    MINS: mins
+    MONTH: month
+    MONTHS: months
+    SEC: sec
+    SECS: secs
     TIMEDIFFAGO: '{difference}前'
     TIMEDIFFIN: '{difference}以内'
-    YEAR: 年
-    YEARS: 年
+    YEAR: year
+    YEARS: years
   DateField:
     NOTSET: セットされていません
     TODAY: 今日
@@ -136,7 +140,7 @@ ja_JP:
   DropdownField:
     CHOOSE: (選択)
   EmailField:
-    VALIDATION: メールアドレスを入力してください
+    VALIDATION: 'メールアドレスを入力してください'
   Email_BounceRecord:
     PLURALNAME: 'Eメール 反応記録'
     SINGULARNAME: 'Eメール 反応記録'
@@ -144,7 +148,7 @@ ja_JP:
     ANY: 何でも
   File:
     AviType: 'AVI video file'
-    Content: 内容
+    Content: '内容'
     CssType: 'CSS file'
     DmgType: 'Apple disk image'
     DocType: 'Word document'
@@ -198,16 +202,18 @@ ja_JP:
     TEXT2: パスワードリセットのリンク
     TEXT3: は
   Form:
-    FIELDISREQUIRED: '%s が必要です'
+    CSRF_FAILED_MESSAGE: 'There seems to have been a technical problem. Please click the back button, refresh your browser, and try again.'
+    FIELDISREQUIRED: '{name} is required'
     SubmitBtnLabel: Go
     VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
-    VALIDATIONNOTUNIQUE: 入力された値はユニークではありません
+    VALIDATIONNOTUNIQUE: '入力された値はユニークではありません'
     VALIDATIONPASSWORDSDONTMATCH: パスワードが一致しません
     VALIDATIONPASSWORDSNOTEMPTY: パスワードが空欄です
     VALIDATIONSTRONGPASSWORD: 'Passwords must have at least one digit and one alphanumeric character'
     VALIDATOR: 検証
     VALIDCURRENCY: 'Please enter a valid currency'
   FormField:
+    Example: 'e.g. %s'
     NONE: 何もありません
   GridAction:
     DELETE_DESCRIPTION: Delete
@@ -221,7 +227,7 @@ ja_JP:
     LEVELUP: 'Level up'
     LinkExisting: 'Link Existing'
     NewRecord: 新しい%s
-    NoItemsFound: 項目が見つかりませんでした
+    NoItemsFound: '項目が見つかりませんでした'
     PRINTEDAT: 'Printed at'
     PRINTEDBY: 'Printed by'
     PlaceHolder: '{type}を探す'
@@ -230,6 +236,7 @@ ja_JP:
     ResetFilter: リセット
   GridFieldAction_Delete:
     DeletePermissionsFailure: 削除権限がありません
+    EditPermissionsFailure: 'No permission to unlink record'
   GridFieldDetailForm:
     CancelBtn: Cancel
     Create: 作成
@@ -237,22 +244,24 @@ ja_JP:
     DeletePermissionsFailure: 削除権限がありません
     Deleted: '削除済み %s %s'
     Save: 保存
-    Saved: '保存済み %s %s'
+    Saved: 'Saved {name} {link}'
+  GridFieldEditButton.ss:
+    EDIT: Edit
   GridFieldItemEditView.ss: null
   Group:
-    AddRole: このグループに役割を追加する
+    AddRole: 'このグループに役割を追加する'
     Code: グループコード
-    DefaultGroupTitleAdministrators: 管理者
-    DefaultGroupTitleContentAuthors: コンテンツの著者
+    DefaultGroupTitleAdministrators: '管理者'
+    DefaultGroupTitleContentAuthors: 'コンテンツの著者'
     Description: 説明文
-    GroupReminder: 元グループを選択された場合、このグループはその役割をすべて受け継ぎます。
+    GroupReminder: '元グループを選択された場合、このグループはその役割をすべて受け継ぎます。'
     Locked: ロックしますか？
     NoRoles: 役割が見つかりませんでした
     PLURALNAME: Groups
-    Parent: 元グループ
+    Parent: '元グループ'
     RolesAddEditLink: 役割の管理
     SINGULARNAME: Group
-    Sort: 並び順
+    Sort: '並び順'
     has_many_Permissions: 承認
     many_many_Members: メンバー
   GroupImportForm:
@@ -264,19 +273,20 @@ ja_JP:
   Hierarchy:
     InfiniteLoopNotAllowed: 'Infinite loop found within the "{type}" hierarchy. Please change the parent to resolve this'
   HtmlEditorField:
-    ADDURL: URLを追加
+    ADDURL: 'URLを追加'
     ADJUSTDETAILSDIMENSIONS: 'Details & dimensions'
     ANCHORVALUE: アンカー
-    BUTTONINSERT: 追加
-    BUTTONINSERTLINK: リンクを追加
+    BUTTONADDURL: 'Add url'
+    BUTTONINSERT: '追加'
+    BUTTONINSERTLINK: 'リンクを追加'
     BUTTONREMOVELINK: リンクを削除
     BUTTONUpdate: 更新
     CAPTIONTEXT: タイトル
     CSSCLASS: '調整 / スタイル'
     CSSCLASSCENTER: 中央はテキストのみ
-    CSSCLASSLEFT: 左側にテキストと一緒に処理してください
+    CSSCLASSLEFT: '左側にテキストと一緒に処理してください'
     CSSCLASSLEFTALONE: 中央はテキストのみ
-    CSSCLASSRIGHT: 右側にテキストと一緒に処理してください
+    CSSCLASSRIGHT: '右側にテキストと一緒に処理してください'
     DETAILS: 詳細
     EMAIL: メールアドレス
     FILE: ファイル
@@ -284,18 +294,18 @@ ja_JP:
     FROMCMS: CMSから
     FROMCOMPUTER: コンピュータから
     FROMWEB: Webから
-    FindInFolder: フォルダ内を探す
+    FindInFolder: 'フォルダ内を探す'
     IMAGEALT: 代替テキスト(Alt)
     IMAGEALTTEXT: '代替(Alt)テキスト - 画像が表示されなかった場合に表示されます'
-    IMAGEALTTEXTDESC: スクリーンリーダー利用者やイメージが表示されなかった場合に表示されます
+    IMAGEALTTEXTDESC: 'スクリーンリーダー利用者やイメージが表示されなかった場合に表示されます'
     IMAGEDIMENSIONS: サイズ
     IMAGEHEIGHTPX: Height
     IMAGETITLE: 'タイトル(ツールチップ)テキスト - 画像に対する追加的情報'
     IMAGETITLETEXT: タイトルテキスト(ツールチップ)
-    IMAGETITLETEXTDESC: 画像に関する追加情報
+    IMAGETITLETEXTDESC: '画像に関する追加情報'
     IMAGEWIDTHPX: Width
-    INSERTMEDIA: メディアを追加
-    LINK: ハイライトテキストへのリンクの挿入/削除
+    INSERTMEDIA: 'メディアを追加'
+    LINK: 'ハイライトテキストへのリンクの挿入/削除'
     LINKANCHOR: このページにアンカーを置く
     LINKDESCR: リンクの説明
     LINKEMAIL: メールアドレス
@@ -324,13 +334,16 @@ ja_JP:
     DropdownBatchActionsDefault: アクション
     HELP: ヘルプ
     PAGETYPE: 'ページの種類:'
-    PERMAGAIN: ログアウトしました。再度ログインする場合は下にユーザー名とパスワードを入力してください。
-    PERMALREADY: 申し訳ございません。ご指定になられたCMSの箇所にはアクセスいただけません。別ユーザーとしてログインをされたい場合は、下記より行えます。
-    PERMDEFAULT: 認証方法を選択し、CMSにアクセスするために利用する認証情報を入力してください。
+    PERMAGAIN: 'ログアウトしました。再度ログインする場合は下にユーザー名とパスワードを入力してください。'
+    PERMALREADY: '申し訳ございません。ご指定になられたCMSの箇所にはアクセスいただけません。別ユーザーとしてログインをされたい場合は、下記より行えます。'
+    PERMDEFAULT: '認証方法を選択し、CMSにアクセスするために利用する認証情報を入力してください。'
     PLEASESAVE: '保存してください: 保存してないため更新できません。'
     PreviewButton: プレビュー
     REORGANISATIONSUCCESSFUL: サイトツリーの再編集に成功しました。
     SAVEDUP: 保存済み
+    ShowAsList: 'show as list'
+    TooManyPages: 'Too many pages'
+    ValidationError: 'Validation error'
     VersionUnknown: 不明
   LeftAndMain_Menu.ss:
     Hello: こんにちは！
@@ -342,7 +355,7 @@ ja_JP:
     SINGULARNAME: 'Login Attempt'
     Status: ステータス
   Member:
-    ADDGROUP: グループを追加
+    ADDGROUP: 'グループを追加'
     BUTTONCHANGEPASSWORD: パスワードの変更
     BUTTONLOGIN: ログイン
     BUTTONLOGINOTHER: 他の誰かとしてログイン
@@ -351,15 +364,15 @@ ja_JP:
     CONFIRMNEWPASSWORD: 新しいパスワードを確認します
     CONFIRMPASSWORD: パスワード（確認のためもう一度）
     DATEFORMAT: 'Date format'
-    DefaultAdminFirstname: 初期管理者
+    DefaultAdminFirstname: '初期管理者'
     DefaultDateTime: 初期設定
     EMAIL: メールアドレス
-    EMPTYNEWPASSWORD: パスワードが空です。もう一度入力して下さい。
-    ENTEREMAIL: パスワードをリセットするためにメールアドレスを入力してください。
-    ERRORLOCKEDOUT: あなたのアカウントは何度もログインに失敗したため一時的に利用できなくなっています。20分後に試してください。
-    ERRORNEWPASSWORD: 入力されたパスワードが一致しません。再度お試しください
-    ERRORPASSWORDNOTMATCH: 登録されているパスワードと一致しません、もう一度入力し直してください
-    ERRORWRONGCRED: メールアドレスまたはパスワードが正しくありません、もう一度入力し直してください
+    EMPTYNEWPASSWORD: 'パスワードが空です。もう一度入力して下さい。'
+    ENTEREMAIL: 'パスワードをリセットするためにメールアドレスを入力してください。'
+    ERRORLOCKEDOUT: 'あなたのアカウントは何度もログインに失敗したため一時的に利用できなくなっています。20分後に試してください。'
+    ERRORNEWPASSWORD: '入力されたパスワードが一致しません。再度お試しください'
+    ERRORPASSWORDNOTMATCH: '登録されているパスワードと一致しません、もう一度入力し直してください'
+    ERRORWRONGCRED: 'メールアドレスまたはパスワードが正しくありません、もう一度入力し直してください'
     FIRSTNAME: 名
     INTERFACELANG: 画面言語
     INVALIDNEWPASSWORD: '次のパスワードは受け付けることができません: {password}'
@@ -373,7 +386,7 @@ ja_JP:
     SUBJECTPASSWORDRESET: パスワード再発行
     SURNAME: 姓
     TIMEFORMAT: 'Time format'
-    VALIDATIONMEMBEREXISTS: 入力したメールアドレス（%s）は、他のメンバーにすでに使用されています。
+    VALIDATIONMEMBEREXISTS: '入力したメールアドレス（%s）は、他のメンバーにすでに使用されています。'
     ValidationIdentifierFailed: 'Can''t overwrite existing member #{id} with identical identifier ({name} = {value}))'
     WELCOMEBACK: '{firstname}さん、おかえりなさい'
     YOUROLDPASSWORD: 古いパスワード
@@ -381,7 +394,7 @@ ja_JP:
     db_LastVisited: 最終訪問日
     db_Locale: インターフェースの言語地域
     db_LockedOutUntil: DBロックがされています。
-    db_NumVisit: 訪問者数
+    db_NumVisit: '訪問者数'
     db_Password: パスワード
     db_PasswordExpiry: パスワードの有効期限
   MemberAuthenticator:
@@ -407,6 +420,7 @@ ja_JP:
     TWODIGITMONTH: 'Two-digit month (01=January, etc.)'
     TWODIGITSECOND: 'Two digits of second (00 through 59)'
     TWODIGITYEAR: 'Two-digit year'
+    Toggle: 'Show formatting help'
   MemberImportForm:
     Help1: '<p><em>CSVフォーマット</em>(コンマ区切り)でユーザーを取り込みます。 <small><a href="#" class="toggle-advanced">高度な利用方法を表示</a></small></p>'
     Help2: '<div class="advanced">	<h4>Advanced usage</h4>	<ul>	<li>Allowed columns: <em>%s</em></li>	<li>Existing users are matched by their unique <em>Code</em> property, and updated with any new values from	the imported file.</li>	<li>Groups can be assigned by the <em>Groups</em> column. Groups are identified by their <em>Code</em> property,	multiple groups can be separated by comma. Existing group memberships are not cleared.</li>	</ul></div>'
@@ -421,16 +435,16 @@ ja_JP:
   ModelAdmin:
     DELETE: 削除
     DELETEDRECORDS: '{count}レコードを削除しました。'
-    EMPTYBEFOREIMPORT: 'Clear Database before import'
+    EMPTYBEFOREIMPORT: 'Replace data'
     IMPORT: CSVからインポート
     IMPORTEDRECORDS: '{count}レコードを取り込みました。'
-    NOCSVFILE: インポートするためのCSVファイルを参照してください
+    NOCSVFILE: 'インポートするためのCSVファイルを参照してください'
     NOIMPORT: インポートするものがありません。
     RESET: リセット
     Title: 'Data Models'
     UPDATEDRECORDS: '{count}レコードを更新しました。'
   ModelAdmin_ImportSpec.ss:
-    IMPORTSPECFIELDS: データベースカラム
+    IMPORTSPECFIELDS: 'データベースカラム'
     IMPORTSPECLINK: 'Show Specification for %s'
     IMPORTSPECRELATIONS: 関連
     IMPORTSPECTITLE: 'Specification for %s'
@@ -451,9 +465,9 @@ ja_JP:
     Page: Page
     View: View
   Permission:
-    AdminGroup: 管理者
+    AdminGroup: '管理者'
     CMS_ACCESS_CATEGORY: 'CMS Access'
-    FULLADMINRIGHTS: 完全な管理権
+    FULLADMINRIGHTS: '完全な管理権'
     FULLADMINRIGHTS_HELP: 'Implies and overrules all other assigned permissions.'
     PLURALNAME: Permissions
     SINGULARNAME: Permission
@@ -474,27 +488,27 @@ ja_JP:
     PERMISSIONS_CATEGORY: 役割とアクセス権限
     UserPermissionsIntro: 'Assigning groups to this user will adjust the permissions they have. See the groups section for details of permissions on individual groups.'
   PhoneNumberField:
-    VALIDATION: 電話番号を入力してください
+    VALIDATION: '電話番号を入力してください'
   RelationComplexTableField.ss:
-    ADD: 追加
+    ADD: '追加'
     CSVEXPORT: CSVへ書き出し
-    NOTFOUND: 項目が見つかりませんでした
+    NOTFOUND: '項目が見つかりませんでした'
   Security:
     ALREADYLOGGEDIN: 'あなたはこのページにアクセスできません。別のアカウントを持っていたら <a href="%s">再ログイン</a>を行ってください。'
-    BUTTONSEND: パスワードリセットのリンクを送信してください
+    BUTTONSEND: 'パスワードリセットのリンクを送信してください'
     CHANGEPASSWORDBELOW: 以下のパスワードを変更できます
     CHANGEPASSWORDHEADER: パスワードを変更しました
-    ENTERNEWPASSWORD: 新しいパスワードを入力してください
+    ENTERNEWPASSWORD: '新しいパスワードを入力してください'
     ERRORPASSWORDPERMISSION: パスワードを変更する為に、ログインしなければなりません！
-    LOGGEDOUT: ログアウトしました。再度ログインする場合は証明書キーを入力してください
+    LOGGEDOUT: 'ログアウトしました。再度ログインする場合は証明書キーを入力してください'
     LOGIN: ログイン
-    NOTEPAGESECURED: このページはセキュリティで保護されております証明書キーを下記に入力してください。こちらからすぐに送信します
+    NOTEPAGESECURED: 'このページはセキュリティで保護されております証明書キーを下記に入力してください。こちらからすぐに送信します'
     NOTERESETLINKINVALID: '<p>The password reset link is invalid or expired.</p><p>You can request a new one <a href="{link1}">here</a> or change your password after you <a href="{link2}">logged in</a>.</p>'
-    NOTERESETPASSWORD: メールアドレスを入力してください、パスワードをリセットするURLを送信致します
+    NOTERESETPASSWORD: 'メールアドレスを入力してください、パスワードをリセットするURLを送信致します'
     PASSWORDSENTHEADER: 'Password reset link sent to ''{email}'''
     PASSWORDSENTTEXT: 'Thank you! A reset link has been sent to ''{email}'', provided an account exists for this email address.'
   SecurityAdmin:
-    ACCESS_HELP: ユーザを閲覧、追加、編集すること、及び、そのユーザに対して権限や役割を割り当てることを許可
+    ACCESS_HELP: 'ユーザを閲覧、追加、編集すること、及び、そのユーザに対して権限や役割を割り当てることを許可'
     APPLY_ROLES: 役割をグループへ適用
     APPLY_ROLES_HELP: 'Ability to edit the roles assigned to a group. Requires the "Access to ''Users'' section" permission.'
     EDITPERMISSIONS: グループの権限を編集
@@ -515,7 +529,20 @@ ja_JP:
     BtnImport: CSVから取り込み
     FileFieldLabel: 'CSVファイル <small>(利用可能な拡張子: *.csv)</small>'
   SilverStripeNavigator:
+    Auto: Auto
+    ChangeViewMode: 'Change view mode'
+    Desktop: Desktop
+    DualWindowView: 'Dual Window'
     Edit: 編集
+    EditView: 'Edit mode'
+    Mobile: Mobile
+    PreviewState: 'Preview State'
+    PreviewView: 'Preview mode'
+    Responsive: Responsive
+    SplitView: 'Split mode'
+    Tablet: Tablet
+    ViewDeviceWidth: 'Select a preview width'
+    Width: width
   SimpleImageField:
     NOUPLOAD: 何も画像がアップロードされていません
   SiteTree:
@@ -523,7 +550,7 @@ ja_JP:
   TableField:
     ISREQUIRED: 'In %s ''%s'' is required'
   TableField.ss:
-    ADD: 新しい行を追加
+    ADD: '新しい行を追加'
     ADDITEM: '%sを追加'
   TableListField:
     CSVEXPORT: CSVにエクスポート
@@ -531,9 +558,9 @@ ja_JP:
     Print: Print
     SELECT: 選択：
   TableListField.ss:
-    NOITEMSFOUND: 項目が見つかりませんでした
-    SORTASC: 昇順で並べ替え
-    SORTDESC: 降順で並べ替え
+    NOITEMSFOUND: '項目が見つかりませんでした'
+    SORTASC: '昇順で並べ替え'
+    SORTDESC: '降順で並べ替え'
   TableListField_PageControls.ss:
     DISPLAYING: Displaying
     OF: of
@@ -546,31 +573,36 @@ ja_JP:
     VALIDATEFORMAT: '正しい時間フォーマット{{format}}を入力してください'
   ToggleField:
     LESS: 減少
-    MORE: 増加
+    MORE: '増加'
   UploadField:
     ATTACHFILE: ファイルを添付
     ATTACHFILES: ファイルを添付
     AttachFile: ファイルを添付
+    CHOOSEANOTHERFILE: 'Choose another file'
+    CHOOSEANOTHERINFO: 'Replace this file with another one from the file store'
     DELETE: 'Delete from files'
-    DELETEINFO: ファイルストレージから永久にこのファイルは削除されました
+    DELETEINFO: 'ファイルストレージから永久にこのファイルは削除されました'
     DOEDIT: 保存
     DROPFILE: ファイルをドロップ
     DROPFILES: ファイルをドロップ
     Dimensions: Dimensions
     EDIT: 編集
     EDITINFO: このファイルを編集
-    FIELDNOTSET: ファイル情報が見つかりませんでした
+    FIELDNOTSET: 'ファイル情報が見つかりませんでした'
     FROMCOMPUTER: コンピュータから
     FROMCOMPUTERINFO: ファイルから選択
     FROMFILES: ファイルから
     HOTLINKINFO: 'Info: This image will be hotlinked. Please ensure you have permissions from the original site creator to do so.'
     MAXNUMBEROFFILES: '最大数の{count}ファイルを超えました。'
+    MAXNUMBEROFFILESONE: 'Can only upload one file'
     MAXNUMBEROFFILESSHORT: '{count}ファイルしかアップロードすることができません'
+    OVERWRITEWARNING: 'File with the same name already exists'
     REMOVE: 削除
     REMOVEERROR: ファイルの削除におけるエラー
-    REMOVEINFO: ここからこのファイルを削除。ただし、ファイルのストレージからこのファイルの削除はしない。
+    REMOVEINFO: 'ここからこのファイルを削除。ただし、ファイルのストレージからこのファイルの削除はしない。'
     STARTALL: すべて開始
     STARTALLINFO: すべてのアップロードを開始
     Saved: 保存しました
+    UPLOADSINTO: 'saves into /{path}'
   Versioned:
     has_many_Versions: バージョン

lang/km.yml

@@ -2,6 +2,7 @@ km:
   AssetAdmin:
     ALLOWEDEXTS: 'Allowed extensions'
     NEWFOLDER: NewFolder
+    SHOWALLOWEDEXTS: 'Show allowed extensions'
   AssetTableField:
     CREATED: 'First uploaded'
     DIM: Dimensions
@@ -59,9 +60,9 @@ km:
     ERRORNOTADMIN: 'That user is not an administrator.'
     ERRORNOTREC: 'That username / password isn''t recognised'
   Boolean:
-    0: 'False'
     ANY: Any
-    1: 'True'
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   CMSLoadingScreen.ss:
     LOADING: Loading...
     REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
@@ -70,6 +71,8 @@ km:
     ACCESSALLINTERFACES: 'Access to all CMS sections'
     ACCESSALLINTERFACESHELP: 'Overrules more specific access settings.'
     SAVE: Save
+  CMSPageHistoryController_versions.ss:
+    PREVIEW: 'Website preview'
   CMSProfileController:
     MENUTITLE: 'My Profile'
   ChangePasswordEmail.ss:
@@ -79,8 +82,8 @@ km:
     HELLO: Hi
     PASSWORD: Password
   CheckboxField:
-    - 'False'
-    - 'True'
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   ComplexTableField:
     CLOSEPOPUP: 'Close Popup'
     SUCCESSADD2: 'Added {name}'
@@ -109,20 +112,21 @@ km:
     PLURALNAME: 'Data Objects'
     SINGULARNAME: 'Data Objects'
   Date:
-    DAY: ថ្ងៃ
-    DAYS: ថ្ងៃ
-    HOUR: ម៉ោង
-    HOURS: ម៉ោង
-    MIN: នាទី
-    MINS: នាទី
-    MONTH: ខែ
-    MONTHS: ខែ
-    SEC: វិនាទី
-    SECS: វិនាទី
+    DAY: day
+    DAYS: days
+    HOUR: hour
+    HOURS: hours
+    LessThanMinuteAgo: 'less than a minute'
+    MIN: min
+    MINS: mins
+    MONTH: month
+    MONTHS: months
+    SEC: sec
+    SECS: secs
     TIMEDIFFAGO: '{difference} ago'
     TIMEDIFFIN: 'in {difference}'
-    YEAR: ឆ្នាំ
-    YEARS: ឆ្នាំ
+    YEAR: year
+    YEARS: years
   DateField:
     NOTSET: 'not set'
     TODAY: today
@@ -198,7 +202,8 @@ km:
     TEXT2: 'password reset link'
     TEXT3: for
   Form:
-    FIELDISREQUIRED: '%s is required'
+    CSRF_FAILED_MESSAGE: 'There seems to have been a technical problem. Please click the back button, refresh your browser, and try again.'
+    FIELDISREQUIRED: '{name} is required'
     SubmitBtnLabel: Go
     VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
     VALIDATIONNOTUNIQUE: 'The value entered is not unique'
@@ -208,6 +213,7 @@ km:
     VALIDATOR: Validator
     VALIDCURRENCY: 'Please enter a valid currency'
   FormField:
+    Example: 'e.g. %s'
     NONE: none
   GridAction:
     DELETE_DESCRIPTION: Delete
@@ -230,6 +236,7 @@ km:
     ResetFilter: Reset
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'No delete permissions'
+    EditPermissionsFailure: 'No permission to unlink record'
   GridFieldDetailForm:
     CancelBtn: Cancel
     Create: Create
@@ -237,7 +244,9 @@ km:
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
     Save: Save
-    Saved: 'Saved %s %s'
+    Saved: 'Saved {name} {link}'
+  GridFieldEditButton.ss:
+    EDIT: Edit
   GridFieldItemEditView.ss: null
   Group:
     AddRole: 'Add a role for this group'
@@ -246,10 +255,10 @@ km:
     DefaultGroupTitleContentAuthors: 'Content Authors'
     Description: Description
     GroupReminder: 'If you choose a parent group, this group will take all it''s roles'
-    Locked: មិនអាចប្រើ
+    Locked: 'មិនអាចប្រើ'
     NoRoles: 'No roles found'
     PLURALNAME: Groups
-    Parent: ចំណាត់ក្រុមដើម
+    Parent: 'ចំណាត់ក្រុមដើម'
     RolesAddEditLink: 'Manage roles'
     SINGULARNAME: Group
     Sort: 'Sort Order'
@@ -267,6 +276,7 @@ km:
     ADDURL: 'Add URL'
     ADJUSTDETAILSDIMENSIONS: 'Details & dimensions'
     ANCHORVALUE: Anchor
+    BUTTONADDURL: 'Add url'
     BUTTONINSERT: Insert
     BUTTONINSERTLINK: 'Insert link'
     BUTTONREMOVELINK: 'Remove link'
@@ -331,7 +341,10 @@ km:
     PreviewButton: Preview
     REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
     SAVEDUP: Saved.
-    VersionUnknown: unknown
+    ShowAsList: 'show as list'
+    TooManyPages: 'Too many pages'
+    ValidationError: 'Validation error'
+    VersionUnknown: Unknown
   LeftAndMain_Menu.ss:
     Hello: Hi
     LOGOUT: 'Log out'
@@ -377,13 +390,13 @@ km:
     ValidationIdentifierFailed: 'Can''t overwrite existing member #{id} with identical identifier ({name} = {value}))'
     WELCOMEBACK: 'Welcome Back, {firstname}'
     YOUROLDPASSWORD: 'Your old password'
-    belongs_many_many_Groups: ចំណាត់ក្រុម
+    belongs_many_many_Groups: 'ចំណាត់ក្រុម'
     db_LastVisited: 'Last Visited Date'
     db_Locale: 'Interface Locale'
-    db_LockedOutUntil: ដោះចេញរហូតដល់
+    db_LockedOutUntil: 'ដោះចេញរហូតដល់'
     db_NumVisit: 'Number of Visits'
     db_Password: Password
-    db_PasswordExpiry: កាលបរិច្ឆេទផុតកំណត់ពាក្យសំងាត់
+    db_PasswordExpiry: 'កាលបរិច្ឆេទផុតកំណត់ពាក្យសំងាត់'
   MemberAuthenticator:
     TITLE: 'E-mail & Password'
   MemberDatetimeOptionsetField:
@@ -407,6 +420,7 @@ km:
     TWODIGITMONTH: 'Two-digit month (01=January, etc.)'
     TWODIGITSECOND: 'Two digits of second (00 through 59)'
     TWODIGITYEAR: 'Two-digit year'
+    Toggle: 'Show formatting help'
   MemberImportForm:
     Help1: '<p>Import users in <em>CSV format</em> (comma-separated values). <small><a href="#" class="toggle-advanced">Show advanced usage</a></small></p>'
     Help2: '<div class="advanced">	<h4>Advanced usage</h4>	<ul>	<li>Allowed columns: <em>%s</em></li>	<li>Existing users are matched by their unique <em>Code</em> property, and updated with any new values from	the imported file.</li>	<li>Groups can be assigned by the <em>Groups</em> column. Groups are identified by their <em>Code</em> property,	multiple groups can be separated by comma. Existing group memberships are not cleared.</li>	</ul></div>'
@@ -421,7 +435,7 @@ km:
   ModelAdmin:
     DELETE: Delete
     DELETEDRECORDS: 'Deleted {count} records.'
-    EMPTYBEFOREIMPORT: 'Clear Database before import'
+    EMPTYBEFOREIMPORT: 'Replace data'
     IMPORT: 'Import from CSV'
     IMPORTEDRECORDS: 'Imported {count} records.'
     NOCSVFILE: 'Please browse for a CSV file to import'
@@ -515,7 +529,20 @@ km:
     BtnImport: 'Import from CSV'
     FileFieldLabel: 'CSV File <small>(Allowed extensions: *.csv)</small>'
   SilverStripeNavigator:
+    Auto: Auto
+    ChangeViewMode: 'Change view mode'
+    Desktop: Desktop
+    DualWindowView: 'Dual Window'
     Edit: Edit
+    EditView: 'Edit mode'
+    Mobile: Mobile
+    PreviewState: 'Preview State'
+    PreviewView: 'Preview mode'
+    Responsive: Responsive
+    SplitView: 'Split mode'
+    Tablet: Tablet
+    ViewDeviceWidth: 'Select a preview width'
+    Width: width
   SimpleImageField:
     NOUPLOAD: 'No Image Uploaded'
   SiteTree:
@@ -551,6 +578,8 @@ km:
     ATTACHFILE: 'Attach a file'
     ATTACHFILES: 'Attach files'
     AttachFile: 'Attach file(s)'
+    CHOOSEANOTHERFILE: 'Choose another file'
+    CHOOSEANOTHERINFO: 'Replace this file with another one from the file store'
     DELETE: 'Delete from files'
     DELETEINFO: 'Permanently delete this file from the file store'
     DOEDIT: Save
@@ -565,12 +594,15 @@ km:
     FROMFILES: 'From files'
     HOTLINKINFO: 'Info: This image will be hotlinked. Please ensure you have permissions from the original site creator to do so.'
     MAXNUMBEROFFILES: 'Max number of {count} file(s) exceeded.'
+    MAXNUMBEROFFILESONE: 'Can only upload one file'
     MAXNUMBEROFFILESSHORT: 'Can only upload {count} files'
+    OVERWRITEWARNING: 'File with the same name already exists'
     REMOVE: Remove
     REMOVEERROR: 'Error removing file'
     REMOVEINFO: 'Remove this file from here, but do not delete it from the file store'
     STARTALL: 'Start all'
     STARTALLINFO: 'Start all uploads'
     Saved: Saved
+    UPLOADSINTO: 'saves into /{path}'
   Versioned:
     has_many_Versions: ជំនាន់

lang/lt.yml

@@ -2,6 +2,7 @@ lt:
   AssetAdmin:
     ALLOWEDEXTS: 'Allowed extensions'
     NEWFOLDER: NewFolder
+    SHOWALLOWEDEXTS: 'Show allowed extensions'
   AssetTableField:
     CREATED: 'First uploaded'
     DIM: Dimensions
@@ -59,9 +60,9 @@ lt:
     ERRORNOTADMIN: 'Vartotojas nėra administratorius'
     ERRORNOTREC: 'Toks vartotojo vardas / slaptažodis neatpažintas'
   Boolean:
-    0: Ne
     ANY: 'Bet koks'
-    1: Taip
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   CMSLoadingScreen.ss:
     LOADING: Loading...
     REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
@@ -70,6 +71,8 @@ lt:
     ACCESSALLINTERFACES: 'Access to all CMS sections'
     ACCESSALLINTERFACESHELP: 'Overrules more specific access settings.'
     SAVE: Išsaugoti
+  CMSPageHistoryController_versions.ss:
+    PREVIEW: 'Website preview'
   CMSProfileController:
     MENUTITLE: 'My Profile'
   ChangePasswordEmail.ss:
@@ -79,8 +82,8 @@ lt:
     HELLO: Sveiki
     PASSWORD: Slaptažodis
   CheckboxField:
-    - Ne
-    - Taip
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   ComplexTableField:
     CLOSEPOPUP: Uždaryti
     SUCCESSADD2: 'Added {name}'
@@ -109,20 +112,21 @@ lt:
     PLURALNAME: 'Duomenų objektai'
     SINGULARNAME: 'Duomenų objektas'
   Date:
-    DAY: diena
-    DAYS: dienas
-    HOUR: valandą
-    HOURS: valandas
-    MIN: minutę
-    MINS: minutes
-    MONTH: mėnuo
-    MONTHS: mėnesiai
-    SEC: sek.
-    SECS: sekundes
+    DAY: day
+    DAYS: days
+    HOUR: hour
+    HOURS: hours
+    LessThanMinuteAgo: 'less than a minute'
+    MIN: min
+    MINS: mins
+    MONTH: month
+    MONTHS: months
+    SEC: sec
+    SECS: secs
     TIMEDIFFAGO: '{difference} ago'
     TIMEDIFFIN: 'in {difference}'
-    YEAR: metai
-    YEARS: metus
+    YEAR: year
+    YEARS: years
   DateField:
     NOTSET: nenustatyta
     TODAY: šiandien
@@ -198,7 +202,8 @@ lt:
     TEXT2: 'slaptažodžio atstatymo nuoroda'
     TEXT3: kam
   Form:
-    FIELDISREQUIRED: '%s yra būtinas'
+    CSRF_FAILED_MESSAGE: 'There seems to have been a technical problem. Please click the back button, refresh your browser, and try again.'
+    FIELDISREQUIRED: '{name} is required'
     SubmitBtnLabel: Go
     VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
     VALIDATIONNOTUNIQUE: 'Įvesta reikšmė nėra unikali'
@@ -208,6 +213,7 @@ lt:
     VALIDATOR: Tikrintojas
     VALIDCURRENCY: 'Please enter a valid currency'
   FormField:
+    Example: 'e.g. %s'
     NONE: niekas
   GridAction:
     DELETE_DESCRIPTION: Delete
@@ -230,6 +236,7 @@ lt:
     ResetFilter: Reset
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'No delete permissions'
+    EditPermissionsFailure: 'No permission to unlink record'
   GridFieldDetailForm:
     CancelBtn: Cancel
     Create: Create
@@ -237,7 +244,9 @@ lt:
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
     Save: Save
-    Saved: 'Saved %s %s'
+    Saved: 'Saved {name} {link}'
+  GridFieldEditButton.ss:
+    EDIT: Edit
   GridFieldItemEditView.ss: null
   Group:
     AddRole: 'Add a role for this group'
@@ -267,6 +276,7 @@ lt:
     ADDURL: 'Add URL'
     ADJUSTDETAILSDIMENSIONS: 'Details & dimensions'
     ANCHORVALUE: Pagrindinis
+    BUTTONADDURL: 'Add url'
     BUTTONINSERT: Insert
     BUTTONINSERTLINK: 'Įterpti nuorodą'
     BUTTONREMOVELINK: 'Pašalinti nuorodą'
@@ -331,7 +341,10 @@ lt:
     PreviewButton: Preview
     REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
     SAVEDUP: Saved.
-    VersionUnknown: unknown
+    ShowAsList: 'show as list'
+    TooManyPages: 'Too many pages'
+    ValidationError: 'Validation error'
+    VersionUnknown: Unknown
   LeftAndMain_Menu.ss:
     Hello: Hi
     LOGOUT: 'Log out'
@@ -407,6 +420,7 @@ lt:
     TWODIGITMONTH: 'Two-digit month (01=January, etc.)'
     TWODIGITSECOND: 'Two digits of second (00 through 59)'
     TWODIGITYEAR: 'Two-digit year'
+    Toggle: 'Show formatting help'
   MemberImportForm:
     Help1: '<p>Import users in <em>CSV format</em> (comma-separated values). <small><a href="#" class="toggle-advanced">Show advanced usage</a></small></p>'
     Help2: '<div class="advanced">	<h4>Advanced usage</h4>	<ul>	<li>Allowed columns: <em>%s</em></li>	<li>Existing users are matched by their unique <em>Code</em> property, and updated with any new values from	the imported file.</li>	<li>Groups can be assigned by the <em>Groups</em> column. Groups are identified by their <em>Code</em> property,	multiple groups can be separated by comma. Existing group memberships are not cleared.</li>	</ul></div>'
@@ -421,7 +435,7 @@ lt:
   ModelAdmin:
     DELETE: Delete
     DELETEDRECORDS: 'Deleted {count} records.'
-    EMPTYBEFOREIMPORT: 'Clear Database before import'
+    EMPTYBEFOREIMPORT: 'Replace data'
     IMPORT: 'Import from CSV'
     IMPORTEDRECORDS: 'Imported {count} records.'
     NOCSVFILE: 'Please browse for a CSV file to import'
@@ -515,7 +529,20 @@ lt:
     BtnImport: 'Import from CSV'
     FileFieldLabel: 'CSV File <small>(Allowed extensions: *.csv)</small>'
   SilverStripeNavigator:
+    Auto: Auto
+    ChangeViewMode: 'Change view mode'
+    Desktop: Desktop
+    DualWindowView: 'Dual Window'
     Edit: Edit
+    EditView: 'Edit mode'
+    Mobile: Mobile
+    PreviewState: 'Preview State'
+    PreviewView: 'Preview mode'
+    Responsive: Responsive
+    SplitView: 'Split mode'
+    Tablet: Tablet
+    ViewDeviceWidth: 'Select a preview width'
+    Width: width
   SimpleImageField:
     NOUPLOAD: 'Neįkrauta jokių paveikslėlių'
   SiteTree:
@@ -551,6 +578,8 @@ lt:
     ATTACHFILE: 'Attach a file'
     ATTACHFILES: 'Attach files'
     AttachFile: 'Attach file(s)'
+    CHOOSEANOTHERFILE: 'Choose another file'
+    CHOOSEANOTHERINFO: 'Replace this file with another one from the file store'
     DELETE: 'Delete from files'
     DELETEINFO: 'Permanently delete this file from the file store'
     DOEDIT: Save
@@ -565,12 +594,15 @@ lt:
     FROMFILES: 'From files'
     HOTLINKINFO: 'Info: This image will be hotlinked. Please ensure you have permissions from the original site creator to do so.'
     MAXNUMBEROFFILES: 'Max number of {count} file(s) exceeded.'
+    MAXNUMBEROFFILESONE: 'Can only upload one file'
     MAXNUMBEROFFILESSHORT: 'Can only upload {count} files'
+    OVERWRITEWARNING: 'File with the same name already exists'
     REMOVE: Remove
     REMOVEERROR: 'Error removing file'
     REMOVEINFO: 'Remove this file from here, but do not delete it from the file store'
     STARTALL: 'Start all'
     STARTALLINFO: 'Start all uploads'
     Saved: Saved
+    UPLOADSINTO: 'saves into /{path}'
   Versioned:
     has_many_Versions: Versijos

lang/lv.yml

@@ -2,6 +2,7 @@ lv:
   AssetAdmin:
     ALLOWEDEXTS: 'Allowed extensions'
     NEWFOLDER: NewFolder
+    SHOWALLOWEDEXTS: 'Show allowed extensions'
   AssetTableField:
     CREATED: 'First uploaded'
     DIM: Dimensions
@@ -59,9 +60,9 @@ lv:
     ERRORNOTADMIN: 'Šis lietotājs nav administrators.'
     ERRORNOTREC: 'Šis lietotājvārds / parole nav atpazīts'
   Boolean:
-    0: Nē
     ANY: Jebkurš
-    1: Jā
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   CMSLoadingScreen.ss:
     LOADING: Loading...
     REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
@@ -70,6 +71,8 @@ lv:
     ACCESSALLINTERFACES: 'Access to all CMS sections'
     ACCESSALLINTERFACESHELP: 'Overrules more specific access settings.'
     SAVE: Saglabāt
+  CMSPageHistoryController_versions.ss:
+    PREVIEW: 'Website preview'
   CMSProfileController:
     MENUTITLE: 'My Profile'
   ChangePasswordEmail.ss:
@@ -79,8 +82,8 @@ lv:
     HELLO: Sveiki
     PASSWORD: Parole
   CheckboxField:
-    - Nē
-    - Jā
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   ComplexTableField:
     CLOSEPOPUP: 'Aizvērt izlēcošo logu'
     SUCCESSADD2: 'Added {name}'
@@ -109,20 +112,21 @@ lv:
     PLURALNAME: 'Datu Objekti'
     SINGULARNAME: 'Datu Objekts'
   Date:
-    DAY: diena
-    DAYS: dienas
-    HOUR: stunda
-    HOURS: stundas
-    MIN: minūte
-    MINS: minūtes
-    MONTH: mēnesis
-    MONTHS: mēneši
-    SEC: sekunde
-    SECS: sekundes
+    DAY: day
+    DAYS: days
+    HOUR: hour
+    HOURS: hours
+    LessThanMinuteAgo: 'less than a minute'
+    MIN: min
+    MINS: mins
+    MONTH: month
+    MONTHS: months
+    SEC: sec
+    SECS: secs
     TIMEDIFFAGO: '{difference} ago'
     TIMEDIFFIN: 'in {difference}'
-    YEAR: gads
-    YEARS: gadi
+    YEAR: year
+    YEARS: years
   DateField:
     NOTSET: 'nav uzstādīts'
     TODAY: šodien
@@ -198,7 +202,8 @@ lv:
     TEXT2: 'paroles atiestatīšanas saite'
     TEXT3: ' '
   Form:
-    FIELDISREQUIRED: '%s ir obligāti aizpildāms.'
+    CSRF_FAILED_MESSAGE: 'There seems to have been a technical problem. Please click the back button, refresh your browser, and try again.'
+    FIELDISREQUIRED: '{name} is required'
     SubmitBtnLabel: Go
     VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
     VALIDATIONNOTUNIQUE: 'Ievadītā vērtība nav unikāla'
@@ -208,6 +213,7 @@ lv:
     VALIDATOR: Validators
     VALIDCURRENCY: 'Please enter a valid currency'
   FormField:
+    Example: 'e.g. %s'
     NONE: neviens
   GridAction:
     DELETE_DESCRIPTION: Delete
@@ -230,6 +236,7 @@ lv:
     ResetFilter: Reset
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'No delete permissions'
+    EditPermissionsFailure: 'No permission to unlink record'
   GridFieldDetailForm:
     CancelBtn: Cancel
     Create: Create
@@ -237,7 +244,9 @@ lv:
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
     Save: Save
-    Saved: 'Saved %s %s'
+    Saved: 'Saved {name} {link}'
+  GridFieldEditButton.ss:
+    EDIT: Edit
   GridFieldItemEditView.ss: null
   Group:
     AddRole: 'Add a role for this group'
@@ -267,6 +276,7 @@ lv:
     ADDURL: 'Add URL'
     ADJUSTDETAILSDIMENSIONS: 'Details & dimensions'
     ANCHORVALUE: Enkurs
+    BUTTONADDURL: 'Add url'
     BUTTONINSERT: Insert
     BUTTONINSERTLINK: 'Ievietot saiti'
     BUTTONREMOVELINK: 'Noņemt saiti'
@@ -331,7 +341,10 @@ lv:
     PreviewButton: Preview
     REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
     SAVEDUP: Saved.
-    VersionUnknown: unknown
+    ShowAsList: 'show as list'
+    TooManyPages: 'Too many pages'
+    ValidationError: 'Validation error'
+    VersionUnknown: Unknown
   LeftAndMain_Menu.ss:
     Hello: Hi
     LOGOUT: 'Log out'
@@ -407,6 +420,7 @@ lv:
     TWODIGITMONTH: 'Two-digit month (01=January, etc.)'
     TWODIGITSECOND: 'Two digits of second (00 through 59)'
     TWODIGITYEAR: 'Two-digit year'
+    Toggle: 'Show formatting help'
   MemberImportForm:
     Help1: '<p>Import users in <em>CSV format</em> (comma-separated values). <small><a href="#" class="toggle-advanced">Show advanced usage</a></small></p>'
     Help2: '<div class="advanced">	<h4>Advanced usage</h4>	<ul>	<li>Allowed columns: <em>%s</em></li>	<li>Existing users are matched by their unique <em>Code</em> property, and updated with any new values from	the imported file.</li>	<li>Groups can be assigned by the <em>Groups</em> column. Groups are identified by their <em>Code</em> property,	multiple groups can be separated by comma. Existing group memberships are not cleared.</li>	</ul></div>'
@@ -421,7 +435,7 @@ lv:
   ModelAdmin:
     DELETE: Delete
     DELETEDRECORDS: 'Deleted {count} records.'
-    EMPTYBEFOREIMPORT: 'Clear Database before import'
+    EMPTYBEFOREIMPORT: 'Replace data'
     IMPORT: 'Import from CSV'
     IMPORTEDRECORDS: 'Imported {count} records.'
     NOCSVFILE: 'Please browse for a CSV file to import'
@@ -515,7 +529,20 @@ lv:
     BtnImport: 'Import from CSV'
     FileFieldLabel: 'CSV File <small>(Allowed extensions: *.csv)</small>'
   SilverStripeNavigator:
+    Auto: Auto
+    ChangeViewMode: 'Change view mode'
+    Desktop: Desktop
+    DualWindowView: 'Dual Window'
     Edit: Edit
+    EditView: 'Edit mode'
+    Mobile: Mobile
+    PreviewState: 'Preview State'
+    PreviewView: 'Preview mode'
+    Responsive: Responsive
+    SplitView: 'Split mode'
+    Tablet: Tablet
+    ViewDeviceWidth: 'Select a preview width'
+    Width: width
   SimpleImageField:
     NOUPLOAD: 'Netika augšupielādēts neviens attēls'
   SiteTree:
@@ -551,6 +578,8 @@ lv:
     ATTACHFILE: 'Attach a file'
     ATTACHFILES: 'Attach files'
     AttachFile: 'Attach file(s)'
+    CHOOSEANOTHERFILE: 'Choose another file'
+    CHOOSEANOTHERINFO: 'Replace this file with another one from the file store'
     DELETE: 'Delete from files'
     DELETEINFO: 'Permanently delete this file from the file store'
     DOEDIT: Save
@@ -565,12 +594,15 @@ lv:
     FROMFILES: 'From files'
     HOTLINKINFO: 'Info: This image will be hotlinked. Please ensure you have permissions from the original site creator to do so.'
     MAXNUMBEROFFILES: 'Max number of {count} file(s) exceeded.'
+    MAXNUMBEROFFILESONE: 'Can only upload one file'
     MAXNUMBEROFFILESSHORT: 'Can only upload {count} files'
+    OVERWRITEWARNING: 'File with the same name already exists'
     REMOVE: Remove
     REMOVEERROR: 'Error removing file'
     REMOVEINFO: 'Remove this file from here, but do not delete it from the file store'
     STARTALL: 'Start all'
     STARTALLINFO: 'Start all uploads'
     Saved: Saved
+    UPLOADSINTO: 'saves into /{path}'
   Versioned:
     has_many_Versions: Versijas

lang/mi_NZ.yml

@@ -2,6 +2,7 @@ mi_NZ:
   AssetAdmin:
     ALLOWEDEXTS: 'Ngā toronga ka whakaaetia'
     NEWFOLDER: KōpakiHōu
+    SHOWALLOWEDEXTS: 'Show allowed extensions'
   AssetTableField:
     CREATED: 'Tukuatu tuatahi'
     DIM: 'Ngā Rahinga'
@@ -59,9 +60,9 @@ mi_NZ:
     ERRORNOTADMIN: 'Ehara tēnā kaiwhakamahi i te kaiwhakahaere'
     ERRORNOTREC: 'Kāore i te mōhiotia tēnā ingoa kaiwhakamahi / kupuhipa'
   Boolean:
-    0: Hē
     ANY: 'Ko tētahi'
-    1: Pono
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   CMSLoadingScreen.ss:
     LOADING: 'Uta ana...'
     REQUIREJS: 'Ka hiahia te CMS kia whakahohea te JavaScript'
@@ -70,6 +71,8 @@ mi_NZ:
     ACCESSALLINTERFACES: 'Uru ki ngā wāhanga CMS katoa'
     ACCESSALLINTERFACESHELP: 'Ka takahi i ngā tautuhinga uru tauwhāiti ake'
     SAVE: Tiaki
+  CMSPageHistoryController_versions.ss:
+    PREVIEW: 'Website preview'
   CMSProfileController:
     MENUTITLE: 'My Profile'
   ChangePasswordEmail.ss:
@@ -79,8 +82,8 @@ mi_NZ:
     HELLO: 'Kia ora'
     PASSWORD: Kupuhipa
   CheckboxField:
-    - Hē
-    - Pono
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   ComplexTableField:
     CLOSEPOPUP: 'Kati Pakū-Ake'
     SUCCESSADD2: 'Kua tāpiritia a  {name}'
@@ -109,20 +112,21 @@ mi_NZ:
     PLURALNAME: 'Ngā Ahanoa Raraunga'
     SINGULARNAME: 'Ahanoa Raraunga'
   Date:
-    DAY: rā
-    DAYS: 'ngā rā'
-    HOUR: haora
-    HOURS: 'ngā haora'
-    MIN: meneti
-    MINS: 'ngā meneti'
-    MONTH: marama
-    MONTHS: 'ngā marama'
-    SEC: hēkona
-    SECS: 'ngā hēkona'
+    DAY: day
+    DAYS: days
+    HOUR: hour
+    HOURS: hours
+    LessThanMinuteAgo: 'less than a minute'
+    MIN: min
+    MINS: mins
+    MONTH: month
+    MONTHS: months
+    SEC: sec
+    SECS: secs
     TIMEDIFFAGO: '{difference} i mua'
     TIMEDIFFIN: 'i roto i te {difference}'
-    YEAR: tau
-    YEARS: 'ngā tau'
+    YEAR: year
+    YEARS: years
   DateField:
     NOTSET: 'kāore i tautuhia'
     TODAY: 'i tēnei rā'
@@ -198,7 +202,8 @@ mi_NZ:
     TEXT2: 'hono tautuhi kupuhipa anō'
     TEXT3: mā
   Form:
-    FIELDISREQUIRED: 'Ka hiahiatia a %s'
+    CSRF_FAILED_MESSAGE: 'There seems to have been a technical problem. Please click the back button, refresh your browser, and try again.'
+    FIELDISREQUIRED: '{name} is required'
     SubmitBtnLabel: Go
     VALIDATIONCREDITNUMBER: 'Tirohia kua tika tō tāuru i te tau kāri nama {number}'
     VALIDATIONNOTUNIQUE: 'Ehara te uara i tāurua i te ahurei'
@@ -208,6 +213,7 @@ mi_NZ:
     VALIDATOR: Pūwhakamana
     VALIDCURRENCY: 'Tāurua he moni tika'
   FormField:
+    Example: 'e.g. %s'
     NONE: Kore
   GridAction:
     DELETE_DESCRIPTION: Muku
@@ -230,6 +236,7 @@ mi_NZ:
     ResetFilter: 'Tautuhi anō'
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'Kāore he muku whakaaetanga'
+    EditPermissionsFailure: 'No permission to unlink record'
   GridFieldDetailForm:
     CancelBtn: Whakakore
     Create: Hanga
@@ -237,7 +244,9 @@ mi_NZ:
     DeletePermissionsFailure: 'Kāore he whakaaetanga muku'
     Deleted: 'Kua mukua %s %s'
     Save: Tiaki
-    Saved: 'I tiakina a %s %s'
+    Saved: 'Saved {name} {link}'
+  GridFieldEditButton.ss:
+    EDIT: Edit
   GridFieldItemEditView.ss: null
   Group:
     AddRole: 'Tāpiritia he tūnga mō tēnei rōpū'
@@ -267,6 +276,7 @@ mi_NZ:
     ADDURL: 'Tāpiri PRO'
     ADJUSTDETAILSDIMENSIONS: 'Ngā taipitopito & ngā rahinga'
     ANCHORVALUE: Punga
+    BUTTONADDURL: 'Add url'
     BUTTONINSERT: Kōkohu
     BUTTONINSERTLINK: 'Kōkuhu hono'
     BUTTONREMOVELINK: 'Tango hono'
@@ -331,6 +341,9 @@ mi_NZ:
     PreviewButton: Arokite
     REORGANISATIONSUCCESSFUL: 'Kua momoho te whakaraupapa anō i te rākau pae'
     SAVEDUP: 'Kua Tiakina'
+    ShowAsList: 'show as list'
+    TooManyPages: 'Too many pages'
+    ValidationError: 'Validation error'
     VersionUnknown: 'tē mōhiotia'
   LeftAndMain_Menu.ss:
     Hello: 'Kia ora'
@@ -407,6 +420,7 @@ mi_NZ:
     TWODIGITMONTH: 'Marama matirua (01=Kohitātea)'
     TWODIGITSECOND: 'Ngā mati hēkona e rua (00 ki te 59)'
     TWODIGITYEAR: 'Tau matirua'
+    Toggle: 'Show formatting help'
   MemberImportForm:
     Help1: '<p>Kawea mai ngā kaiwhakamahi i te <em>hōputu CSV </em> (ngā uara ka wehea ki te piko). <small><a href="#" class="toggle-advanced">Whakaatu whakamahinga ara atu anō</a></small></p>'
     Help2: '<div class="advanced">	<h4>Advanced usage</h4>	<ul>	<li>Allowed columns: <em>%s</em></li>	<li>Existing users are matched by their unique <em>Code</em> property, and updated with any new values from	the imported file.</li>	<li>Groups can be assigned by the <em>Groups</em> column. Groups are identified by their <em>Code</em> property,	multiple groups can be separated by comma. Existing group memberships are not cleared.</li>	</ul></div>'
@@ -421,7 +435,7 @@ mi_NZ:
   ModelAdmin:
     DELETE: Muku
     DELETEDRECORDS: 'I mukua e {count} ngā pūkete.'
-    EMPTYBEFOREIMPORT: 'Clear Database before import'
+    EMPTYBEFOREIMPORT: 'Replace data'
     IMPORT: 'Kawemai i CSV'
     IMPORTEDRECORDS: 'I kawea mai e {count} ngā pūkete.'
     NOCSVFILE: 'Pūtirotiro kia kitea he kōnae CSV hei kawemai'
@@ -515,7 +529,20 @@ mi_NZ:
     BtnImport: 'Kawemai i CSV'
     FileFieldLabel: 'Kōnae CSV <small>(Ngā toronga ka whakaaetia: *.csv)</small>'
   SilverStripeNavigator:
+    Auto: Auto
+    ChangeViewMode: 'Change view mode'
+    Desktop: Desktop
+    DualWindowView: 'Dual Window'
     Edit: Whakatika
+    EditView: 'Edit mode'
+    Mobile: Mobile
+    PreviewState: 'Preview State'
+    PreviewView: 'Preview mode'
+    Responsive: Responsive
+    SplitView: 'Split mode'
+    Tablet: Tablet
+    ViewDeviceWidth: 'Select a preview width'
+    Width: width
   SimpleImageField:
     NOUPLOAD: 'Kāore He Atahanga Tukuatu'
   SiteTree:
@@ -551,6 +578,8 @@ mi_NZ:
     ATTACHFILE: 'Tāpiritia tētahi kōnae'
     ATTACHFILES: 'Tāpiri kōnae'
     AttachFile: 'Tāpiritia t/ētahi kōnae'
+    CHOOSEANOTHERFILE: 'Choose another file'
+    CHOOSEANOTHERINFO: 'Replace this file with another one from the file store'
     DELETE: 'Muku i ngā kōnae'
     DELETEINFO: 'Muku pūmautia tēnei kōnae i te pātaka kōnae'
     DOEDIT: Tiaki
@@ -565,12 +594,15 @@ mi_NZ:
     FROMFILES: 'I ngā kōnae'
     HOTLINKINFO: 'Info: This image will be hotlinked. Please ensure you have permissions from the original site creator to do so.'
     MAXNUMBEROFFILES: 'Kua hipa te mōrahi o ngā kōnae {count}.'
+    MAXNUMBEROFFILESONE: 'Can only upload one file'
     MAXNUMBEROFFILESSHORT: 'Ka taea te tukuatu i ngā kōnae {count} anake '
+    OVERWRITEWARNING: 'File with the same name already exists'
     REMOVE: Tango
     REMOVEERROR: 'Kua rarua te tango kōnae'
     REMOVEINFO: 'Tangohia tēnei kōane i konei, engari kaua e muku i te pātaka kōnae'
     STARTALL: 'Tīmata katoa'
     STARTALLINFO: 'Tīmataria ngā tukuatu katoa'
     Saved: 'Kua Tiakina'
+    UPLOADSINTO: 'saves into /{path}'
   Versioned:
     has_many_Versions: 'Ngā Putanga'

lang/ms.yml

@@ -2,6 +2,7 @@ ms:
   AssetAdmin:
     ALLOWEDEXTS: 'Allowed extensions'
     NEWFOLDER: NewFolder
+    SHOWALLOWEDEXTS: 'Show allowed extensions'
   AssetTableField:
     CREATED: 'First uploaded'
     DIM: Dimensions
@@ -59,9 +60,9 @@ ms:
     ERRORNOTADMIN: 'Pengguna ini bukan pentadbir.'
     ERRORNOTREC: 'ID pengguna dan katalaluan tidak dikenali'
   Boolean:
-    0: 'False'
     ANY: Any
-    1: 'True'
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   CMSLoadingScreen.ss:
     LOADING: Loading...
     REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
@@ -70,6 +71,8 @@ ms:
     ACCESSALLINTERFACES: 'Access to all CMS sections'
     ACCESSALLINTERFACESHELP: 'Overrules more specific access settings.'
     SAVE: Save
+  CMSPageHistoryController_versions.ss:
+    PREVIEW: 'Website preview'
   CMSProfileController:
     MENUTITLE: 'My Profile'
   ChangePasswordEmail.ss:
@@ -79,8 +82,8 @@ ms:
     HELLO: Hi
     PASSWORD: 'Kata Laluan'
   CheckboxField:
-    - 'False'
-    - 'True'
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   ComplexTableField:
     CLOSEPOPUP: 'Close Popup'
     SUCCESSADD2: 'Added {name}'
@@ -109,20 +112,21 @@ ms:
     PLURALNAME: 'Objek-objek Data'
     SINGULARNAME: 'Objek Data'
   Date:
-    DAY: hari
-    DAYS: hari-hari
-    HOUR: jam
-    HOURS: jam-jam
-    MIN: minit
-    MINS: minit-minit
-    MONTH: bulan
-    MONTHS: bulan-bulan
-    SEC: saat
-    SECS: saat-saat
+    DAY: day
+    DAYS: days
+    HOUR: hour
+    HOURS: hours
+    LessThanMinuteAgo: 'less than a minute'
+    MIN: min
+    MINS: mins
+    MONTH: month
+    MONTHS: months
+    SEC: sec
+    SECS: secs
     TIMEDIFFAGO: '{difference} ago'
     TIMEDIFFIN: 'in {difference}'
-    YEAR: tahun
-    YEARS: tahun-tahun
+    YEAR: year
+    YEARS: years
   DateField:
     NOTSET: 'not set'
     TODAY: today
@@ -198,7 +202,8 @@ ms:
     TEXT2: 'password reset link'
     TEXT3: for
   Form:
-    FIELDISREQUIRED: '%s dipelukan'
+    CSRF_FAILED_MESSAGE: 'There seems to have been a technical problem. Please click the back button, refresh your browser, and try again.'
+    FIELDISREQUIRED: '{name} is required'
     SubmitBtnLabel: Go
     VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
     VALIDATIONNOTUNIQUE: 'Nilai yang dimasukkan tidak unik'
@@ -208,6 +213,7 @@ ms:
     VALIDATOR: Pengesah
     VALIDCURRENCY: 'Please enter a valid currency'
   FormField:
+    Example: 'e.g. %s'
     NONE: none
   GridAction:
     DELETE_DESCRIPTION: Delete
@@ -230,6 +236,7 @@ ms:
     ResetFilter: Reset
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'No delete permissions'
+    EditPermissionsFailure: 'No permission to unlink record'
   GridFieldDetailForm:
     CancelBtn: Cancel
     Create: Create
@@ -237,7 +244,9 @@ ms:
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
     Save: Save
-    Saved: 'Saved %s %s'
+    Saved: 'Saved {name} {link}'
+  GridFieldEditButton.ss:
+    EDIT: Edit
   GridFieldItemEditView.ss: null
   Group:
     AddRole: 'Add a role for this group'
@@ -267,6 +276,7 @@ ms:
     ADDURL: 'Add URL'
     ADJUSTDETAILSDIMENSIONS: 'Details & dimensions'
     ANCHORVALUE: Anchor
+    BUTTONADDURL: 'Add url'
     BUTTONINSERT: Insert
     BUTTONINSERTLINK: 'Masukkan pautan'
     BUTTONREMOVELINK: 'Hapuskan pautan'
@@ -331,7 +341,10 @@ ms:
     PreviewButton: Preview
     REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
     SAVEDUP: Saved.
-    VersionUnknown: unknown
+    ShowAsList: 'show as list'
+    TooManyPages: 'Too many pages'
+    ValidationError: 'Validation error'
+    VersionUnknown: Unknown
   LeftAndMain_Menu.ss:
     Hello: Hi
     LOGOUT: 'Log out'
@@ -407,6 +420,7 @@ ms:
     TWODIGITMONTH: 'Two-digit month (01=January, etc.)'
     TWODIGITSECOND: 'Two digits of second (00 through 59)'
     TWODIGITYEAR: 'Two-digit year'
+    Toggle: 'Show formatting help'
   MemberImportForm:
     Help1: '<p>Import users in <em>CSV format</em> (comma-separated values). <small><a href="#" class="toggle-advanced">Show advanced usage</a></small></p>'
     Help2: '<div class="advanced">	<h4>Advanced usage</h4>	<ul>	<li>Allowed columns: <em>%s</em></li>	<li>Existing users are matched by their unique <em>Code</em> property, and updated with any new values from	the imported file.</li>	<li>Groups can be assigned by the <em>Groups</em> column. Groups are identified by their <em>Code</em> property,	multiple groups can be separated by comma. Existing group memberships are not cleared.</li>	</ul></div>'
@@ -421,7 +435,7 @@ ms:
   ModelAdmin:
     DELETE: Delete
     DELETEDRECORDS: 'Deleted {count} records.'
-    EMPTYBEFOREIMPORT: 'Clear Database before import'
+    EMPTYBEFOREIMPORT: 'Replace data'
     IMPORT: 'Import from CSV'
     IMPORTEDRECORDS: 'Imported {count} records.'
     NOCSVFILE: 'Please browse for a CSV file to import'
@@ -515,7 +529,20 @@ ms:
     BtnImport: 'Import from CSV'
     FileFieldLabel: 'CSV File <small>(Allowed extensions: *.csv)</small>'
   SilverStripeNavigator:
+    Auto: Auto
+    ChangeViewMode: 'Change view mode'
+    Desktop: Desktop
+    DualWindowView: 'Dual Window'
     Edit: Edit
+    EditView: 'Edit mode'
+    Mobile: Mobile
+    PreviewState: 'Preview State'
+    PreviewView: 'Preview mode'
+    Responsive: Responsive
+    SplitView: 'Split mode'
+    Tablet: Tablet
+    ViewDeviceWidth: 'Select a preview width'
+    Width: width
   SimpleImageField:
     NOUPLOAD: 'Tiada imej dimuat naikkan'
   SiteTree:
@@ -551,6 +578,8 @@ ms:
     ATTACHFILE: 'Attach a file'
     ATTACHFILES: 'Attach files'
     AttachFile: 'Attach file(s)'
+    CHOOSEANOTHERFILE: 'Choose another file'
+    CHOOSEANOTHERINFO: 'Replace this file with another one from the file store'
     DELETE: 'Delete from files'
     DELETEINFO: 'Permanently delete this file from the file store'
     DOEDIT: Save
@@ -565,12 +594,15 @@ ms:
     FROMFILES: 'From files'
     HOTLINKINFO: 'Info: This image will be hotlinked. Please ensure you have permissions from the original site creator to do so.'
     MAXNUMBEROFFILES: 'Max number of {count} file(s) exceeded.'
+    MAXNUMBEROFFILESONE: 'Can only upload one file'
     MAXNUMBEROFFILESSHORT: 'Can only upload {count} files'
+    OVERWRITEWARNING: 'File with the same name already exists'
     REMOVE: Remove
     REMOVEERROR: 'Error removing file'
     REMOVEINFO: 'Remove this file from here, but do not delete it from the file store'
     STARTALL: 'Start all'
     STARTALLINFO: 'Start all uploads'
     Saved: Saved
+    UPLOADSINTO: 'saves into /{path}'
   Versioned:
     has_many_Versions: Versi-versi

lang/nb.yml

@@ -2,6 +2,7 @@ nb:
   AssetAdmin:
     ALLOWEDEXTS: 'Allowed extensions'
     NEWFOLDER: 'Ny Mappe'
+    SHOWALLOWEDEXTS: 'Show allowed extensions'
   AssetTableField:
     CREATED: 'Først opplastet'
     DIM: Dimensjoner
@@ -59,9 +60,9 @@ nb:
     ERRORNOTADMIN: 'Denne brukeren er ikke administrator.'
     ERRORNOTREC: 'Det brukernavnet / Passord er ikke gjenkjent'
   Boolean:
-    0: Usant
     ANY: Any
-    1: Sant
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   CMSLoadingScreen.ss:
     LOADING: 'Laster ...'
     REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
@@ -70,6 +71,8 @@ nb:
     ACCESSALLINTERFACES: 'Adgang til alle CMS-seksjoner'
     ACCESSALLINTERFACESHELP: 'Overstyrer mer spesifikke adgangsinnstillinger'
     SAVE: Lagre
+  CMSPageHistoryController_versions.ss:
+    PREVIEW: 'Website preview'
   CMSProfileController:
     MENUTITLE: 'My Profile'
   ChangePasswordEmail.ss:
@@ -79,8 +82,8 @@ nb:
     HELLO: Hei
     PASSWORD: Passord
   CheckboxField:
-    - Usant
-    - Sant
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   ComplexTableField:
     CLOSEPOPUP: 'Lukk Popup'
     SUCCESSADD2: 'Lagt til {name}'
@@ -109,20 +112,21 @@ nb:
     PLURALNAME: 'Data Objekter'
     SINGULARNAME: 'Data Objekt'
   Date:
-    DAY: dag
-    DAYS: dager
-    HOUR: time
-    HOURS: timer
-    MIN: minutter
-    MINS: minutter
-    MONTH: måned
-    MONTHS: måneder
-    SEC: sekund
-    SECS: sekunder
+    DAY: day
+    DAYS: days
+    HOUR: hour
+    HOURS: hours
+    LessThanMinuteAgo: 'less than a minute'
+    MIN: min
+    MINS: mins
+    MONTH: month
+    MONTHS: months
+    SEC: sec
+    SECS: secs
     TIMEDIFFAGO: '{difference} siden'
     TIMEDIFFIN: 'i {difference}'
-    YEAR: år
-    YEARS: år
+    YEAR: year
+    YEARS: years
   DateField:
     NOTSET: mangler
     TODAY: 'i dag'
@@ -198,7 +202,8 @@ nb:
     TEXT2: 'passord resett link'
     TEXT3: for
   Form:
-    FIELDISREQUIRED: 'mangler %s'
+    CSRF_FAILED_MESSAGE: 'There seems to have been a technical problem. Please click the back button, refresh your browser, and try again.'
+    FIELDISREQUIRED: '{name} is required'
     SubmitBtnLabel: Utfør
     VALIDATIONCREDITNUMBER: 'Vennligst sjekk at du har skrevet inn {number} korrekt kortnummer'
     VALIDATIONNOTUNIQUE: 'Den spesifiserte verdien er ikke unik'
@@ -208,6 +213,7 @@ nb:
     VALIDATOR: Validator
     VALIDCURRENCY: 'Vennligst skriv inn gyldig valuta'
   FormField:
+    Example: 'e.g. %s'
     NONE: ingen
   GridAction:
     DELETE_DESCRIPTION: Slett
@@ -230,6 +236,7 @@ nb:
     ResetFilter: Tilbakestille
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'Ikke tillatt å slette'
+    EditPermissionsFailure: 'No permission to unlink record'
   GridFieldDetailForm:
     CancelBtn: Avbryt
     Create: Create
@@ -237,7 +244,9 @@ nb:
     DeletePermissionsFailure: 'Ikke tillatt å slette'
     Deleted: 'Slettet %s %s'
     Save: Lagre
-    Saved: 'Lagret %s %s'
+    Saved: 'Saved {name} {link}'
+  GridFieldEditButton.ss:
+    EDIT: Edit
   GridFieldItemEditView.ss: null
   Group:
     AddRole: 'Legg en rolle til denne gruppen'
@@ -267,6 +276,7 @@ nb:
     ADDURL: 'Legg til URL'
     ADJUSTDETAILSDIMENSIONS: 'Details & dimensions'
     ANCHORVALUE: Lenke
+    BUTTONADDURL: 'Add url'
     BUTTONINSERT: 'Sett inn'
     BUTTONINSERTLINK: 'Sett inn lenke'
     BUTTONREMOVELINK: 'Fjern lenke'
@@ -331,6 +341,9 @@ nb:
     PreviewButton: Forhåndsvisning
     REORGANISATIONSUCCESSFUL: 'Omorganisering av sidetreet vellykket'
     SAVEDUP: Lagret.
+    ShowAsList: 'show as list'
+    TooManyPages: 'Too many pages'
+    ValidationError: 'Validation error'
     VersionUnknown: Ukjent
   LeftAndMain_Menu.ss:
     Hello: Hei
@@ -407,6 +420,7 @@ nb:
     TWODIGITMONTH: 'Tosifret måned (01=Januar, etc.)'
     TWODIGITSECOND: 'Tosifret sekundtall (00 til 59)'
     TWODIGITYEAR: 'Tosifret årstall'
+    Toggle: 'Show formatting help'
   MemberImportForm:
     Help1: '<p>Import users in <em>CSV format</em> (comma-separated values). <small><a href="#" class="toggle-advanced">Show advanced usage</a></small></p>'
     Help2: '<div class="advanced">	<h4>Advanced usage</h4>	<ul>	<li>Allowed columns: <em>%s</em></li>	<li>Existing users are matched by their unique <em>Code</em> property, and updated with any new values from	the imported file.</li>	<li>Groups can be assigned by the <em>Groups</em> column. Groups are identified by their <em>Code</em> property,	multiple groups can be separated by comma. Existing group memberships are not cleared.</li>	</ul></div>'
@@ -421,7 +435,7 @@ nb:
   ModelAdmin:
     DELETE: Slett
     DELETEDRECORDS: 'Deleted {count} records.'
-    EMPTYBEFOREIMPORT: 'Clear Database before import'
+    EMPTYBEFOREIMPORT: 'Replace data'
     IMPORT: 'Importer fra CSV'
     IMPORTEDRECORDS: 'Imported {count} records.'
     NOCSVFILE: 'Please browse for a CSV file to import'
@@ -515,7 +529,20 @@ nb:
     BtnImport: 'Importer fra CSV'
     FileFieldLabel: 'CSV File <small>(Allowed extensions: *.csv)</small>'
   SilverStripeNavigator:
+    Auto: Auto
+    ChangeViewMode: 'Change view mode'
+    Desktop: Desktop
+    DualWindowView: 'Dual Window'
     Edit: Rediger
+    EditView: 'Edit mode'
+    Mobile: Mobile
+    PreviewState: 'Preview State'
+    PreviewView: 'Preview mode'
+    Responsive: Responsive
+    SplitView: 'Split mode'
+    Tablet: Tablet
+    ViewDeviceWidth: 'Select a preview width'
+    Width: width
   SimpleImageField:
     NOUPLOAD: 'Ingen Bilder Lastet Opp'
   SiteTree:
@@ -551,6 +578,8 @@ nb:
     ATTACHFILE: 'Legg ved fil'
     ATTACHFILES: 'Legg ved filer'
     AttachFile: 'Legg ved fil(er)'
+    CHOOSEANOTHERFILE: 'Choose another file'
+    CHOOSEANOTHERINFO: 'Replace this file with another one from the file store'
     DELETE: 'Slett fra filer'
     DELETEINFO: 'Slett filen permament fra filarkivet'
     DOEDIT: Lagre
@@ -565,12 +594,15 @@ nb:
     FROMFILES: 'Fra filer'
     HOTLINKINFO: 'Info: Dette bildet vil bli lenket direkte til opprinnelig kilde. Vennligst forsikre deg om at du har tillatelse fra den opprinnelige rettighetshaveren til å gjøre dette.'
     MAXNUMBEROFFILES: 'Maks antall {count} fil(er) overskredet'
+    MAXNUMBEROFFILESONE: 'Can only upload one file'
     MAXNUMBEROFFILESSHORT: 'Kan kun laste opp {count} filer'
+    OVERWRITEWARNING: 'File with the same name already exists'
     REMOVE: Fjern
     REMOVEERROR: 'Feil ved fjerning av fil'
     REMOVEINFO: 'Fjern filen herfra, men ikke slett den fra filarkivet'
     STARTALL: 'Start alle'
     STARTALLINFO: 'Start alle opplastinger'
     Saved: Lagret
+    UPLOADSINTO: 'saves into /{path}'
   Versioned:
     has_many_Versions: Versjoner

lang/ne.yml

@@ -2,6 +2,7 @@ ne:
   AssetAdmin:
     ALLOWEDEXTS: 'Allowed extensions'
     NEWFOLDER: NewFolder
+    SHOWALLOWEDEXTS: 'Show allowed extensions'
   AssetTableField:
     CREATED: 'First uploaded'
     DIM: Dimensions
@@ -59,9 +60,9 @@ ne:
     ERRORNOTADMIN: 'यो प्रयोगकता मुख्य प्रयोगकता होइन'
     ERRORNOTREC: 'त्यो प्रयोगकता / पासओड बुझन् सकिएन'
   Boolean:
-    0: 'False'
     ANY: Any
-    1: 'True'
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   CMSLoadingScreen.ss:
     LOADING: Loading...
     REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
@@ -70,6 +71,8 @@ ne:
     ACCESSALLINTERFACES: 'Access to all CMS sections'
     ACCESSALLINTERFACESHELP: 'Overrules more specific access settings.'
     SAVE: Save
+  CMSPageHistoryController_versions.ss:
+    PREVIEW: 'Website preview'
   CMSProfileController:
     MENUTITLE: 'My Profile'
   ChangePasswordEmail.ss:
@@ -79,8 +82,8 @@ ne:
     HELLO: हाई
     PASSWORD: Password
   CheckboxField:
-    - 'False'
-    - 'True'
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   ComplexTableField:
     CLOSEPOPUP: 'Close Popup'
     SUCCESSADD2: 'Added {name}'
@@ -109,20 +112,21 @@ ne:
     PLURALNAME: 'Data Objects'
     SINGULARNAME: 'Data Object'
   Date:
-    DAY: दिन
-    DAYS: दिनहरु
-    HOUR: घण्टा
-    HOURS: घण्टाहरु
-    MIN: मिनेट
-    MINS: मिनेटहरु
-    MONTH: महिना
-    MONTHS: महिनाहरु
-    SEC: सेकेन्ड
-    SECS: सेकेन्डहरु
+    DAY: day
+    DAYS: days
+    HOUR: hour
+    HOURS: hours
+    LessThanMinuteAgo: 'less than a minute'
+    MIN: min
+    MINS: mins
+    MONTH: month
+    MONTHS: months
+    SEC: sec
+    SECS: secs
     TIMEDIFFAGO: '{difference} ago'
     TIMEDIFFIN: 'in {difference}'
-    YEAR: बर्ष
-    YEARS: बर्षाहरु
+    YEAR: year
+    YEARS: years
   DateField:
     NOTSET: 'not set'
     TODAY: today
@@ -198,7 +202,8 @@ ne:
     TEXT2: 'password reset link'
     TEXT3: for
   Form:
-    FIELDISREQUIRED: '%s चाहिन्छ'
+    CSRF_FAILED_MESSAGE: 'There seems to have been a technical problem. Please click the back button, refresh your browser, and try again.'
+    FIELDISREQUIRED: '{name} is required'
     SubmitBtnLabel: Go
     VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
     VALIDATIONNOTUNIQUE: 'लेखिएको मान भिन्न छैन '
@@ -208,6 +213,7 @@ ne:
     VALIDATOR: Validator
     VALIDCURRENCY: 'Please enter a valid currency'
   FormField:
+    Example: 'e.g. %s'
     NONE: none
   GridAction:
     DELETE_DESCRIPTION: Delete
@@ -230,6 +236,7 @@ ne:
     ResetFilter: Reset
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'No delete permissions'
+    EditPermissionsFailure: 'No permission to unlink record'
   GridFieldDetailForm:
     CancelBtn: Cancel
     Create: Create
@@ -237,7 +244,9 @@ ne:
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
     Save: Save
-    Saved: 'Saved %s %s'
+    Saved: 'Saved {name} {link}'
+  GridFieldEditButton.ss:
+    EDIT: Edit
   GridFieldItemEditView.ss: null
   Group:
     AddRole: 'Add a role for this group'
@@ -267,6 +276,7 @@ ne:
     ADDURL: 'Add URL'
     ADJUSTDETAILSDIMENSIONS: 'Details & dimensions'
     ANCHORVALUE: Anchor
+    BUTTONADDURL: 'Add url'
     BUTTONINSERT: Insert
     BUTTONINSERTLINK: 'लिन्क राखनुहोस्'
     BUTTONREMOVELINK: 'लिन्क हटाउनुहोस्'
@@ -331,7 +341,10 @@ ne:
     PreviewButton: Preview
     REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
     SAVEDUP: Saved.
-    VersionUnknown: unknown
+    ShowAsList: 'show as list'
+    TooManyPages: 'Too many pages'
+    ValidationError: 'Validation error'
+    VersionUnknown: Unknown
   LeftAndMain_Menu.ss:
     Hello: Hi
     LOGOUT: 'Log out'
@@ -407,6 +420,7 @@ ne:
     TWODIGITMONTH: 'Two-digit month (01=January, etc.)'
     TWODIGITSECOND: 'Two digits of second (00 through 59)'
     TWODIGITYEAR: 'Two-digit year'
+    Toggle: 'Show formatting help'
   MemberImportForm:
     Help1: '<p>Import users in <em>CSV format</em> (comma-separated values). <small><a href="#" class="toggle-advanced">Show advanced usage</a></small></p>'
     Help2: '<div class="advanced">	<h4>Advanced usage</h4>	<ul>	<li>Allowed columns: <em>%s</em></li>	<li>Existing users are matched by their unique <em>Code</em> property, and updated with any new values from	the imported file.</li>	<li>Groups can be assigned by the <em>Groups</em> column. Groups are identified by their <em>Code</em> property,	multiple groups can be separated by comma. Existing group memberships are not cleared.</li>	</ul></div>'
@@ -421,7 +435,7 @@ ne:
   ModelAdmin:
     DELETE: Delete
     DELETEDRECORDS: 'Deleted {count} records.'
-    EMPTYBEFOREIMPORT: 'Clear Database before import'
+    EMPTYBEFOREIMPORT: 'Replace data'
     IMPORT: 'Import from CSV'
     IMPORTEDRECORDS: 'Imported {count} records.'
     NOCSVFILE: 'Please browse for a CSV file to import'
@@ -515,7 +529,20 @@ ne:
     BtnImport: 'Import from CSV'
     FileFieldLabel: 'CSV File <small>(Allowed extensions: *.csv)</small>'
   SilverStripeNavigator:
+    Auto: Auto
+    ChangeViewMode: 'Change view mode'
+    Desktop: Desktop
+    DualWindowView: 'Dual Window'
     Edit: Edit
+    EditView: 'Edit mode'
+    Mobile: Mobile
+    PreviewState: 'Preview State'
+    PreviewView: 'Preview mode'
+    Responsive: Responsive
+    SplitView: 'Split mode'
+    Tablet: Tablet
+    ViewDeviceWidth: 'Select a preview width'
+    Width: width
   SimpleImageField:
     NOUPLOAD: 'कुनै पनि तस्बिर उप्लोओद गरिएको छैन '
   SiteTree:
@@ -551,6 +578,8 @@ ne:
     ATTACHFILE: 'Attach a file'
     ATTACHFILES: 'Attach files'
     AttachFile: 'Attach file(s)'
+    CHOOSEANOTHERFILE: 'Choose another file'
+    CHOOSEANOTHERINFO: 'Replace this file with another one from the file store'
     DELETE: 'Delete from files'
     DELETEINFO: 'Permanently delete this file from the file store'
     DOEDIT: Save
@@ -565,12 +594,15 @@ ne:
     FROMFILES: 'From files'
     HOTLINKINFO: 'Info: This image will be hotlinked. Please ensure you have permissions from the original site creator to do so.'
     MAXNUMBEROFFILES: 'Max number of {count} file(s) exceeded.'
+    MAXNUMBEROFFILESONE: 'Can only upload one file'
     MAXNUMBEROFFILESSHORT: 'Can only upload {count} files'
+    OVERWRITEWARNING: 'File with the same name already exists'
     REMOVE: Remove
     REMOVEERROR: 'Error removing file'
     REMOVEINFO: 'Remove this file from here, but do not delete it from the file store'
     STARTALL: 'Start all'
     STARTALLINFO: 'Start all uploads'
     Saved: Saved
+    UPLOADSINTO: 'saves into /{path}'
   Versioned:
     has_many_Versions: Versions

lang/nl.yml

@@ -2,6 +2,7 @@ nl:
   AssetAdmin:
     ALLOWEDEXTS: 'Toegestane extensies'
     NEWFOLDER: 'Nieuwe Map'
+    SHOWALLOWEDEXTS: 'Toon toegestane extensies'
   AssetTableField:
     CREATED: 'Eerste upload'
     DIM: Dimensies
@@ -59,9 +60,9 @@ nl:
     ERRORNOTADMIN: 'Die gebruiker is geen beheerder.'
     ERRORNOTREC: 'De gebruikersnaam en/of wachtwoord wordt niet herkend'
   Boolean:
-    0: Nee
     ANY: Elke
-    1: Ja
+    NOANSWER: Nee
+    YESANSWER: Ja
   CMSLoadingScreen.ss:
     LOADING: 'Bezig met laden...'
     REQUIREJS: 'Het CMS heeft JavaScript nodig om te werken.'
@@ -70,6 +71,8 @@ nl:
     ACCESSALLINTERFACES: 'Toegang tot alle CMS onderdelen'
     ACCESSALLINTERFACESHELP: 'Overstemt meer specifieke toegangsinstellingen'
     SAVE: Bewaar
+  CMSPageHistoryController_versions.ss:
+    PREVIEW: 'Website voorbeeld'
   CMSProfileController:
     MENUTITLE: 'Mijn Profiel'
   ChangePasswordEmail.ss:
@@ -79,8 +82,8 @@ nl:
     HELLO: Hallo
     PASSWORD: Wachtwoord
   CheckboxField:
-    - Nee
-    - Ja
+    NOANSWER: Nee
+    YESANSWER: Ja
   ComplexTableField:
     CLOSEPOPUP: 'Sluit Popup'
     SUCCESSADD2: 'Toegevoegd {name}'
@@ -113,11 +116,12 @@ nl:
     DAYS: dagen
     HOUR: uur
     HOURS: uren
+    LessThanMinuteAgo: 'minder dan één minuut'
     MIN: minuut
     MINS: minuten
     MONTH: maand
     MONTHS: maanden
-    SEC: seconde
+    SEC: second
     SECS: seconden
     TIMEDIFFAGO: '{difference} geleden'
     TIMEDIFFIN: '{difference} geleden'
@@ -198,7 +202,8 @@ nl:
     TEXT2: 'wachtwoord reset link'
     TEXT3: voor
   Form:
-    FIELDISREQUIRED: '%s is verplicht'
+    CSRF_FAILED_MESSAGE: 'Er lijkt een technisch probleem te zijn. Klikt u op de knop terug, vernieuw uw browser, en probeer het opnieuw.'
+    FIELDISREQUIRED: '{name} is verplicht'
     SubmitBtnLabel: Gaan
     VALIDATIONCREDITNUMBER: 'Gelieve uw credit card number {number} juist in te vullen'
     VALIDATIONNOTUNIQUE: 'De ingevoerde waarde is niet uniek'
@@ -208,6 +213,7 @@ nl:
     VALIDATOR: Controleur
     VALIDCURRENCY: 'Vul een geldige valuta in'
   FormField:
+    Example: 'e.g. %s'
     NONE: geen
   GridAction:
     DELETE_DESCRIPTION: Verwijderen
@@ -230,6 +236,7 @@ nl:
     ResetFilter: Herstellen
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'Onvoldoende rechten om te verwijderen'
+    EditPermissionsFailure: 'No permission to unlink record'
   GridFieldDetailForm:
     CancelBtn: Annuleren
     Create: Creëren
@@ -237,7 +244,9 @@ nl:
     DeletePermissionsFailure: 'Onvoldoende rechten om te verwijderen'
     Deleted: '%s %s verwijderd'
     Save: Opslaan
-    Saved: '%s %s opgeslagen'
+    Saved: '{name} {link} opgeslagen'
+  GridFieldEditButton.ss:
+    EDIT: Bewerken
   GridFieldItemEditView.ss: null
   Group:
     AddRole: 'Voeg een rol toe aan deze groep'
@@ -257,7 +266,7 @@ nl:
     many_many_Members: Leden
   GroupImportForm:
     Help1: '<p>Importeer en of meerdere groepen in <em>CSV</em> formaat (Kommagescheiden bestandsformaat). <small><a href="#" class="toggle-advanced">Toon geavanceerd gebruik</a></small></p>'
-    Help2: '<div class="advanced">	<h4>Advanced usage</h4>	<ul>	<li>Allowed columns: <em>%s</em></li>	<li>Existing groups are matched by their unique <em>Code</em> value, and updated with any new values from the 	imported file</li>	<li>Group hierarchies can be created by using a <em>ParentCode</em> column.</li>	<li>Permission codes can be assigned by the <em>PermissionCode</em> column. Existing permission codes are not	cleared.</li>	</ul></div>'
+    Help2: "<div class=\"advanced\">\\n<h4>Geavanceerd gebruik</h4>\\n<ul>\\n<li>Toegestane kolommen: <em>%s</em></li>\\n<li>Bestaande leden worden geïdentificeerd door middel van hun unieke <em>Code</em> waarde en aangepast met de nieuwe waarden van het geïmporteerde bestand</li>\\n<li>Groepen kunnen toegewezen worden met de <em>Groups</em> kolom. Groepen worden geïdentificeerd met hun <em>Code</em> waarde en meerdere groepen kunnen worden gescheiden met een komma. Bestaande groep lidmaatschappen worden niet gewist.</li>\\n</ul>\\n</div>\\n</ul>\\n</div>\\n"
     ResultCreated: '{count} groepen aangemaakt'
     ResultDeleted: '%d groepen verwijderd'
     ResultUpdated: '%d groepen aangepast'
@@ -267,6 +276,7 @@ nl:
     ADDURL: 'Voeg URL toe'
     ADJUSTDETAILSDIMENSIONS: 'Details $amp; afmeting'
     ANCHORVALUE: Anker
+    BUTTONADDURL: 'Voeg URL toe'
     BUTTONINSERT: Invoegen
     BUTTONINSERTLINK: 'Link invoegen'
     BUTTONREMOVELINK: 'Link verwijderen'
@@ -287,7 +297,7 @@ nl:
     FindInFolder: 'Zoek in map'
     IMAGEALT: 'Alternatieve tekst (alt tekst) - wordt getoond als de afbeelding niet kan worden geladen'
     IMAGEALTTEXT: 'Alternatieve tekst (alt tekst) - wordt getoond als de afbeelding niet kan worden geladen'
-    IMAGEALTTEXTDESC: 'Shown to screen readers or if image can not be displayed'
+    IMAGEALTTEXTDESC: 'Getoond voor schermlezers of als afbeelding niet kan worden weergegeven'
     IMAGEDIMENSIONS: Dimensies
     IMAGEHEIGHTPX: Hoogte
     IMAGETITLE: 'Titel tekst (tooltip) - Toon extra informatie over de afbeelding'
@@ -331,6 +341,9 @@ nl:
     PreviewButton: Preview
     REORGANISATIONSUCCESSFUL: 'Menu-indeling is aangepast'
     SAVEDUP: 'Succesvol opgeslagen'
+    ShowAsList: 'Laat als lijst zien'
+    TooManyPages: 'Te veel pagina''s'
+    ValidationError: Validatiefout
     VersionUnknown: onbekend
   LeftAndMain_Menu.ss:
     Hello: Hallo
@@ -374,7 +387,7 @@ nl:
     SURNAME: Achternaam
     TIMEFORMAT: 'Tijd formaat'
     VALIDATIONMEMBEREXISTS: 'Er bestaat al een lid met dit emailadres, %s'
-    ValidationIdentifierFailed: 'Can''t overwrite existing member #{id} with identical identifier ({name} = {value}))'
+    ValidationIdentifierFailed: 'Een bestaande gebruiker #{id} kan niet dezelfde unieke velden hebben ({name} = {value}))'
     WELCOMEBACK: 'Welkom terug {firstname}'
     YOUROLDPASSWORD: 'Uw oude wachtwoord'
     belongs_many_many_Groups: Groepen
@@ -392,7 +405,7 @@ nl:
     Custom: Aangepast
     DATEFORMATBAD: 'Datum is niet correct opgegeven'
     DAYNOLEADING: 'Dag van de maand zonder voorloop-nul'
-    DIGITSDECFRACTIONSECOND: 'One or more digits representing a decimal fraction of a second'
+    DIGITSDECFRACTIONSECOND: 'Een of meer cijfers die een decimale fractie van een seconde'
     FOURDIGITYEAR: 'jaar (yyyy)'
     FULLNAMEMONTH: 'Volledige naam van de maand (Bijv. Juni)'
     HOURNOLEADING: 'Uur zonder voorloopnul'
@@ -407,9 +420,10 @@ nl:
     TWODIGITMONTH: 'Maand in twee cijfers (01 = januari, enz.)'
     TWODIGITSECOND: 'Twee cijfer van het uur (00 tot 23)'
     TWODIGITYEAR: 'Twee-cijferig jaar'
+    Toggle: 'Toon opmaak hulp'
   MemberImportForm:
     Help1: '<p>Importeer leden in <em>CSV</em> formaat (Kommagescheiden bestandsformaat). <small><a href="#" class="toggle-advanced">Toon geavanceerd gebruik</a></small></p>'
-    Help2: '<div class="advanced">	<h4>Advanced usage</h4>	<ul>	<li>Allowed columns: <em>%s</em></li>	<li>Existing users are matched by their unique <em>Code</em> property, and updated with any new values from	the imported file.</li>	<li>Groups can be assigned by the <em>Groups</em> column. Groups are identified by their <em>Code</em> property,	multiple groups can be separated by comma. Existing group memberships are not cleared.</li>	</ul></div>'
+    Help2: "<div class=\"advanced\">\\n<h4>Geavanceerd gebruik</h4>\\n<ul>\\n<li>Toegestane kolommen: <em>%s</em></li>\\n<li>Bestaande leden worden geïdentificeerd door middel van hun unieke <em>Code</em> waarde en aangepast met de nieuwe waarden van het geïmporteerde bestand</li>\\n<li>Groepen kunnen toegewezen worden met de <em>Groups</em> kolom. Groepen worden geïdentificeerd met hun <em>Code</em> waarde en meerdere groepen kunnen worden gescheiden met een komma. Bestaande groep lidmaatschappen worden niet gewist.</li>\\n</ul>\\n</div>\\n</ul>\\n</div>\\n"
     ResultCreated: '{count} leden aangemaakt'
     ResultDeleted: '%d leden verwijderd'
     ResultNone: 'Geen wijzingen'
@@ -421,7 +435,7 @@ nl:
   ModelAdmin:
     DELETE: Verwijderen
     DELETEDRECORDS: '{count} records verwijderd'
-    EMPTYBEFOREIMPORT: 'Database legen voor importeren'
+    EMPTYBEFOREIMPORT: 'Vervang gegevens'
     IMPORT: 'Importeren vanuit CSV'
     IMPORTEDRECORDS: '{count} records geïmporteerd'
     NOCSVFILE: 'Selecteer een CSV bestand op uw computer om te importeren'
@@ -459,8 +473,8 @@ nl:
     SINGULARNAME: Machtiging
   PermissionCheckboxSetField:
     AssignedTo: 'toegewezen aan "{title}"'
-    FromGroup: 'inherited from group "{title}"'
-    FromRole: 'inherited from role "{title}"'
+    FromGroup: 'geërfd van de groep "{title}"'
+    FromRole: 'geërfd van de rol "{title}"'
     FromRoleOnGroup: 'geërfd van rol "%s" in groep "%s"'
   PermissionRole:
     OnlyAdminCanApply: 'Alleen admin kan doorvoeren'
@@ -472,7 +486,7 @@ nl:
     SINGULARNAME: 'Machtigingen rol code'
   Permissions:
     PERMISSIONS_CATEGORY: 'Rollen en toegangsrechten'
-    UserPermissionsIntro: 'Assigning groups to this user will adjust the permissions they have. See the groups section for details of permissions on individual groups.'
+    UserPermissionsIntro: 'Groepen aan deze gebruiker toewijzen zullen de permissies aanpassen. Zie de sectie groepen voor meer informatie over machtigingen voor afzonderlijke groepen.'
   PhoneNumberField:
     VALIDATION: 'Voer een geldig telefoonnummer in'
   RelationComplexTableField.ss:
@@ -515,7 +529,20 @@ nl:
     BtnImport: Importeer
     FileFieldLabel: 'CSV Bestand <small>(Toegestane extensies: *.csv)</small>'
   SilverStripeNavigator:
+    Auto: Automatisch
+    ChangeViewMode: 'Wijzig weergavemodus'
+    Desktop: Desktop
+    DualWindowView: Dubbelvenster
     Edit: Bewerken
+    EditView: Bewerkmodus
+    Mobile: Mobiel
+    PreviewState: Voorbeeldstatus
+    PreviewView: Voorbeeldmodus
+    Responsive: Responsive
+    SplitView: Split-modus
+    Tablet: Tablet
+    ViewDeviceWidth: 'Selecteer een voorbeeldbreedte'
+    Width: breedte
   SimpleImageField:
     NOUPLOAD: 'Geen afbeeldingen ontvangen'
   SiteTree:
@@ -551,6 +578,8 @@ nl:
     ATTACHFILE: 'Voeg een bestand toe'
     ATTACHFILES: 'Voeg bestanden toe'
     AttachFile: 'Voeg bestand(en) toe'
+    CHOOSEANOTHERFILE: 'Kies een ander bestand'
+    CHOOSEANOTHERINFO: 'Vervang dit bestand met een ander uit de bestandsopslag'
     DELETE: 'Volledig verwijderen'
     DELETEINFO: 'Verwijder dit bestand uit bestandsopslag van de website.'
     DOEDIT: Opslaan
@@ -565,12 +594,15 @@ nl:
     FROMFILES: 'Bestaande bestanden'
     HOTLINKINFO: 'Info: Deze afbeelding wordt hotlinked. Zorg ervoor dat u de machtigingen van de oorspronkelijke site maker om dit te doen.'
     MAXNUMBEROFFILES: 'Maximale aantal van {count} bestand(en) overschreden.'
+    MAXNUMBEROFFILESONE: 'Kan slechts één bestand uploaden'
     MAXNUMBEROFFILESSHORT: 'Kan alleen {count} bestanden uploaden'
+    OVERWRITEWARNING: 'Bestand met dezelfde naam bestaat al'
     REMOVE: Verwijder
     REMOVEERROR: 'Fout bij verwijderen'
     REMOVEINFO: 'Verwijder (ontkoppel) dit bestand, maar behoud het in bestandsopslag van de website.'
     STARTALL: 'Start alle'
     STARTALLINFO: 'Start alle'
     Saved: Opgeslagen
+    UPLOADSINTO: 'Word opgeslagen in /{path}'
   Versioned:
     has_many_Versions: Versies

lang/pa.yml

@@ -2,6 +2,7 @@ pa:
   AssetAdmin:
     ALLOWEDEXTS: 'Allowed extensions'
     NEWFOLDER: NewFolder
+    SHOWALLOWEDEXTS: 'Show allowed extensions'
   AssetTableField:
     CREATED: 'First uploaded'
     DIM: Dimensions
@@ -59,9 +60,9 @@ pa:
     ERRORNOTADMIN: 'ਇਹ user ਪ੍ਰਬੰਧਕ ਨਹੀ ਹੈ।'
     ERRORNOTREC: 'That username / password isn''t recognised'
   Boolean:
-    0: 'False'
     ANY: Any
-    1: 'True'
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   CMSLoadingScreen.ss:
     LOADING: Loading...
     REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
@@ -70,6 +71,8 @@ pa:
     ACCESSALLINTERFACES: 'Access to all CMS sections'
     ACCESSALLINTERFACESHELP: 'Overrules more specific access settings.'
     SAVE: Save
+  CMSPageHistoryController_versions.ss:
+    PREVIEW: 'Website preview'
   CMSProfileController:
     MENUTITLE: 'My Profile'
   ChangePasswordEmail.ss:
@@ -79,8 +82,8 @@ pa:
     HELLO: ਹਾਏ
     PASSWORD: Password
   CheckboxField:
-    - 'False'
-    - 'True'
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   ComplexTableField:
     CLOSEPOPUP: 'Close Popup'
     SUCCESSADD2: 'Added {name}'
@@ -91,7 +94,7 @@ pa:
     SORTASC: 'Sort ascending'
     SORTDESC: 'Sort descending'
   ComplexTableField_popup.ss:
-    NEXT: ਅਗਲਾ
+    NEXT: 'ਅਗਲਾ'
     PREVIOUS: ਪਿਛਲਾ
   ConfirmedPasswordField:
     ATLEAST: 'Passwords must be at least {min} characters long.'
@@ -109,20 +112,21 @@ pa:
     PLURALNAME: 'Data Objects'
     SINGULARNAME: 'Data Object'
   Date:
-    DAY: 'ਿਦਨ	'
-    DAYS: ਿਦਨ
-    HOUR: 'ਘੰਟਾ	'
-    HOURS: 'ਘੰਟੇ	'
-    MIN: 'ਿਮੰਟ	'
-    MINS: 'ਿਮੰਟ	'
-    MONTH: ਮਹੀਨਾ
-    MONTHS: 'ਮਹੀਨੇੇੇੇੇ '
-    SEC: 'ਸਿਕ ੰਟ'
-    SECS: 'ਸਿਕ ੰਟ'
+    DAY: day
+    DAYS: days
+    HOUR: hour
+    HOURS: hours
+    LessThanMinuteAgo: 'less than a minute'
+    MIN: min
+    MINS: mins
+    MONTH: month
+    MONTHS: months
+    SEC: sec
+    SECS: secs
     TIMEDIFFAGO: '{difference} ago'
     TIMEDIFFIN: 'in {difference}'
-    YEAR: ਸਾਲ
-    YEARS: ਸਾਲ
+    YEAR: year
+    YEARS: years
   DateField:
     NOTSET: 'not set'
     TODAY: today
@@ -198,7 +202,8 @@ pa:
     TEXT2: 'password reset link'
     TEXT3: for
   Form:
-    FIELDISREQUIRED: '%s ਚਾਹੀਦਾ ਹੈ'
+    CSRF_FAILED_MESSAGE: 'There seems to have been a technical problem. Please click the back button, refresh your browser, and try again.'
+    FIELDISREQUIRED: '{name} is required'
     SubmitBtnLabel: Go
     VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
     VALIDATIONNOTUNIQUE: 'The value entered is not unique'
@@ -208,6 +213,7 @@ pa:
     VALIDATOR: Validator
     VALIDCURRENCY: 'Please enter a valid currency'
   FormField:
+    Example: 'e.g. %s'
     NONE: none
   GridAction:
     DELETE_DESCRIPTION: Delete
@@ -230,6 +236,7 @@ pa:
     ResetFilter: Reset
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'No delete permissions'
+    EditPermissionsFailure: 'No permission to unlink record'
   GridFieldDetailForm:
     CancelBtn: Cancel
     Create: Create
@@ -237,7 +244,9 @@ pa:
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
     Save: Save
-    Saved: 'Saved %s %s'
+    Saved: 'Saved {name} {link}'
+  GridFieldEditButton.ss:
+    EDIT: Edit
   GridFieldItemEditView.ss: null
   Group:
     AddRole: 'Add a role for this group'
@@ -267,6 +276,7 @@ pa:
     ADDURL: 'Add URL'
     ADJUSTDETAILSDIMENSIONS: 'Details & dimensions'
     ANCHORVALUE: Anchor
+    BUTTONADDURL: 'Add url'
     BUTTONINSERT: Insert
     BUTTONINSERTLINK: 'ਿਲੰਕ ਪਾਉ'
     BUTTONREMOVELINK: 'ਿਲੰਕ ਕੱਟੋਂ'
@@ -331,7 +341,10 @@ pa:
     PreviewButton: Preview
     REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
     SAVEDUP: Saved.
-    VersionUnknown: unknown
+    ShowAsList: 'show as list'
+    TooManyPages: 'Too many pages'
+    ValidationError: 'Validation error'
+    VersionUnknown: Unknown
   LeftAndMain_Menu.ss:
     Hello: Hi
     LOGOUT: 'Log out'
@@ -407,6 +420,7 @@ pa:
     TWODIGITMONTH: 'Two-digit month (01=January, etc.)'
     TWODIGITSECOND: 'Two digits of second (00 through 59)'
     TWODIGITYEAR: 'Two-digit year'
+    Toggle: 'Show formatting help'
   MemberImportForm:
     Help1: '<p>Import users in <em>CSV format</em> (comma-separated values). <small><a href="#" class="toggle-advanced">Show advanced usage</a></small></p>'
     Help2: '<div class="advanced">	<h4>Advanced usage</h4>	<ul>	<li>Allowed columns: <em>%s</em></li>	<li>Existing users are matched by their unique <em>Code</em> property, and updated with any new values from	the imported file.</li>	<li>Groups can be assigned by the <em>Groups</em> column. Groups are identified by their <em>Code</em> property,	multiple groups can be separated by comma. Existing group memberships are not cleared.</li>	</ul></div>'
@@ -421,7 +435,7 @@ pa:
   ModelAdmin:
     DELETE: Delete
     DELETEDRECORDS: 'Deleted {count} records.'
-    EMPTYBEFOREIMPORT: 'Clear Database before import'
+    EMPTYBEFOREIMPORT: 'Replace data'
     IMPORT: 'Import from CSV'
     IMPORTEDRECORDS: 'Imported {count} records.'
     NOCSVFILE: 'Please browse for a CSV file to import'
@@ -515,7 +529,20 @@ pa:
     BtnImport: 'Import from CSV'
     FileFieldLabel: 'CSV File <small>(Allowed extensions: *.csv)</small>'
   SilverStripeNavigator:
+    Auto: Auto
+    ChangeViewMode: 'Change view mode'
+    Desktop: Desktop
+    DualWindowView: 'Dual Window'
     Edit: Edit
+    EditView: 'Edit mode'
+    Mobile: Mobile
+    PreviewState: 'Preview State'
+    PreviewView: 'Preview mode'
+    Responsive: Responsive
+    SplitView: 'Split mode'
+    Tablet: Tablet
+    ViewDeviceWidth: 'Select a preview width'
+    Width: width
   SimpleImageField:
     NOUPLOAD: 'ਕੋਈ ਫੋਟੋ ਅੱਪਲੋਡ ਨਹੀ ਹੋਈ'
   SiteTree:
@@ -551,6 +578,8 @@ pa:
     ATTACHFILE: 'Attach a file'
     ATTACHFILES: 'Attach files'
     AttachFile: 'Attach file(s)'
+    CHOOSEANOTHERFILE: 'Choose another file'
+    CHOOSEANOTHERINFO: 'Replace this file with another one from the file store'
     DELETE: 'Delete from files'
     DELETEINFO: 'Permanently delete this file from the file store'
     DOEDIT: Save
@@ -565,12 +594,15 @@ pa:
     FROMFILES: 'From files'
     HOTLINKINFO: 'Info: This image will be hotlinked. Please ensure you have permissions from the original site creator to do so.'
     MAXNUMBEROFFILES: 'Max number of {count} file(s) exceeded.'
+    MAXNUMBEROFFILESONE: 'Can only upload one file'
     MAXNUMBEROFFILESSHORT: 'Can only upload {count} files'
+    OVERWRITEWARNING: 'File with the same name already exists'
     REMOVE: Remove
     REMOVEERROR: 'Error removing file'
     REMOVEINFO: 'Remove this file from here, but do not delete it from the file store'
     STARTALL: 'Start all'
     STARTALLINFO: 'Start all uploads'
     Saved: Saved
+    UPLOADSINTO: 'saves into /{path}'
   Versioned:
     has_many_Versions: Versions

lang/pl.yml

@@ -2,6 +2,7 @@ pl:
   AssetAdmin:
     ALLOWEDEXTS: 'Dopuszczalne rozszerzenia'
     NEWFOLDER: NowyFolder
+    SHOWALLOWEDEXTS: 'Show allowed extensions'
   AssetTableField:
     CREATED: 'Po raz pierwszy wgrany'
     DIM: Rozmiar
@@ -59,9 +60,9 @@ pl:
     ERRORNOTADMIN: 'Ten użytkownik nie jest administratorem'
     ERRORNOTREC: 'Nie istnieje taki username/hasło'
   Boolean:
-    0: Nie
     ANY: Jakikolwiek
-    1: Tak
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   CMSLoadingScreen.ss:
     LOADING: Wczytywanie...
     REQUIREJS: 'CMS wymaga włączonej obsługi JavaScript.'
@@ -70,6 +71,8 @@ pl:
     ACCESSALLINTERFACES: 'Dostęp do wszystkich sekcji CMSa'
     ACCESSALLINTERFACESHELP: 'Nadpisuje bardziej specyficzne ustawienia dostępu.'
     SAVE: Zapisz
+  CMSPageHistoryController_versions.ss:
+    PREVIEW: 'Website preview'
   CMSProfileController:
     MENUTITLE: 'Mój profil'
   ChangePasswordEmail.ss:
@@ -79,8 +82,8 @@ pl:
     HELLO: Cześć
     PASSWORD: Hasło
   CheckboxField:
-    - Nie
-    - Tak
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   ComplexTableField:
     CLOSEPOPUP: 'Zamknij Okienko'
     SUCCESSADD2: 'Dodano {name}'
@@ -109,20 +112,21 @@ pl:
     PLURALNAME: 'Obiekty danych'
     SINGULARNAME: 'Obiekt danych'
   Date:
-    DAY: dzień
-    DAYS: dni
-    HOUR: godzina
-    HOURS: godziny
+    DAY: day
+    DAYS: days
+    HOUR: hour
+    HOURS: hours
+    LessThanMinuteAgo: 'less than a minute'
     MIN: min
-    MINS: minuty
-    MONTH: miesiąc
-    MONTHS: miesiące
-    SEC: sekunda
-    SECS: sekundy
+    MINS: mins
+    MONTH: month
+    MONTHS: months
+    SEC: sec
+    SECS: secs
     TIMEDIFFAGO: '{difference} temu'
     TIMEDIFFIN: 'w {difference}'
-    YEAR: rok
-    YEARS: lata
+    YEAR: year
+    YEARS: years
   DateField:
     NOTSET: 'nie ustawiono'
     TODAY: dzisiaj
@@ -198,7 +202,8 @@ pl:
     TEXT2: 'link zmiany hasła'
     TEXT3: dla
   Form:
-    FIELDISREQUIRED: '%s jest wymagane'
+    CSRF_FAILED_MESSAGE: 'There seems to have been a technical problem. Please click the back button, refresh your browser, and try again.'
+    FIELDISREQUIRED: '{name} is required'
     SubmitBtnLabel: Przejdź
     VALIDATIONCREDITNUMBER: 'Proszę upewnij się, że wprowadzony numer karty kredytowej {number} jest prawidłowy'
     VALIDATIONNOTUNIQUE: 'Wprowadzona wartość nie jest unikalna'
@@ -208,6 +213,7 @@ pl:
     VALIDATOR: Walidator
     VALIDCURRENCY: 'Proszę podaj prawidłową walutę'
   FormField:
+    Example: 'e.g. %s'
     NONE: brak
   GridAction:
     DELETE_DESCRIPTION: Usuń
@@ -230,6 +236,7 @@ pl:
     ResetFilter: Resetuj
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'Brak uprawnień do usuwania'
+    EditPermissionsFailure: 'No permission to unlink record'
   GridFieldDetailForm:
     CancelBtn: Anuluj
     Create: Stwórz
@@ -237,7 +244,9 @@ pl:
     DeletePermissionsFailure: 'Brak uprawnień do usuwania'
     Deleted: 'Usunięto %s %s'
     Save: Zapisz
-    Saved: 'Zapisano %s %s'
+    Saved: 'Saved {name} {link}'
+  GridFieldEditButton.ss:
+    EDIT: Edit
   GridFieldItemEditView.ss: null
   Group:
     AddRole: 'Dodaj rolę dla tej grupy'
@@ -267,6 +276,7 @@ pl:
     ADDURL: 'Dodaj adres URL'
     ADJUSTDETAILSDIMENSIONS: 'Szczegóły i rozmiar'
     ANCHORVALUE: Odnośnik
+    BUTTONADDURL: 'Add url'
     BUTTONINSERT: Wstaw
     BUTTONINSERTLINK: 'Wstaw link'
     BUTTONREMOVELINK: 'Zmień link'
@@ -328,9 +338,12 @@ pl:
     PERMALREADY: 'Niestety nie masz dostępu do tej części CMS. Jeśli chcesz zalogować się jako ktoś inny, zrób to poniżej'
     PERMDEFAULT: 'Proszę wybrać metodę identyfikacji i wpisać swoje dane, aby uruchomić CMSa.'
     PLEASESAVE: 'Proszę zapisać stronę. Ta strona nie mogła zostać uaktualniona, ponieważ nie została jeszcze zapisana.'
-    PreviewButton: Podgląd
+    PreviewButton: 'Podgląd'
     REORGANISATIONSUCCESSFUL: 'Pomyślnie zreorganizowano drzewo serwisu.'
     SAVEDUP: Zapisano.
+    ShowAsList: 'show as list'
+    TooManyPages: 'Too many pages'
+    ValidationError: 'Validation error'
     VersionUnknown: nieznany
   LeftAndMain_Menu.ss:
     Hello: Witaj
@@ -398,7 +411,7 @@ pl:
     HOURNOLEADING: 'Godzina bez wiodącego zera'
     MINUTENOLEADING: 'Minuta bez wiodącego zera'
     MONTHNOLEADING: 'Miesiąc bez wiodącego zera'
-    Preview: Podgląd
+    Preview: 'Podgląd'
     SHORTMONTH: 'Skrócona nazwa miesiąca (np. Cze)'
     TOGGLEHELP: 'Przełącz pomoc formatowania'
     TWODIGITDAY: 'Dwucyfrowy dzień miesiąca'
@@ -407,6 +420,7 @@ pl:
     TWODIGITMONTH: 'Dwucyfrowy miesiąc (01=Styczeń, itd.)'
     TWODIGITSECOND: 'Dwucyfrowa sekunda (od 00 do 59)'
     TWODIGITYEAR: 'Dwucyfrowy rok'
+    Toggle: 'Show formatting help'
   MemberImportForm:
     Help1: '<p>Zaimportuj użytkowników w <em>formacie CSV</em> (tekst rozdzielany przecinkami). <small><a href="#" class="toggle-advanced">Zaawansowane</a></small></p>'
     Help2: '<div class="advanced">	<h4>Advanced usage</h4>	<ul>	<li>Allowed columns: <em>%s</em></li>	<li>Existing users are matched by their unique <em>Code</em> property, and updated with any new values from	the imported file.</li>	<li>Groups can be assigned by the <em>Groups</em> column. Groups are identified by their <em>Code</em> property,	multiple groups can be separated by comma. Existing group memberships are not cleared.</li>	</ul></div>'
@@ -421,7 +435,7 @@ pl:
   ModelAdmin:
     DELETE: Usuń
     DELETEDRECORDS: 'Usunięto rekordów: {count}'
-    EMPTYBEFOREIMPORT: 'Wyczyść bazę danych przed importowaniem'
+    EMPTYBEFOREIMPORT: 'Replace data'
     IMPORT: 'Import z CSV'
     IMPORTEDRECORDS: 'Zaimportowano rekordów: {count}'
     NOCSVFILE: 'Wybierz plik CSV do zaimportowania'
@@ -515,7 +529,20 @@ pl:
     BtnImport: 'Import z CSV'
     FileFieldLabel: 'Plik CSV <small>(Dozwolone rozszerzenia: *.csv)</small>'
   SilverStripeNavigator:
+    Auto: Auto
+    ChangeViewMode: 'Change view mode'
+    Desktop: Desktop
+    DualWindowView: 'Dual Window'
     Edit: Edycja
+    EditView: 'Edit mode'
+    Mobile: Mobile
+    PreviewState: 'Preview State'
+    PreviewView: 'Preview mode'
+    Responsive: Responsive
+    SplitView: 'Split mode'
+    Tablet: Tablet
+    ViewDeviceWidth: 'Select a preview width'
+    Width: width
   SimpleImageField:
     NOUPLOAD: 'Nie wgrano zdjęć'
   SiteTree:
@@ -551,6 +578,8 @@ pl:
     ATTACHFILE: 'Załącz plik'
     ATTACHFILES: 'Załącz pliki'
     AttachFile: 'Załącz plik(i)'
+    CHOOSEANOTHERFILE: 'Choose another file'
+    CHOOSEANOTHERINFO: 'Replace this file with another one from the file store'
     DELETE: 'Usuń z plików'
     DELETEINFO: 'Usuń ten plik z magazynu'
     DOEDIT: Zapisz
@@ -565,12 +594,15 @@ pl:
     FROMFILES: 'Z plików'
     HOTLINKINFO: 'Informacja: Ten obrazek pochodzi z zewnętrznego serwisu. Upewnij się, że jego twórca pozwala korzystać z niego.'
     MAXNUMBEROFFILES: 'Osiągnięto maksymalną liczbę {count} plików.'
+    MAXNUMBEROFFILESONE: 'Can only upload one file'
     MAXNUMBEROFFILESSHORT: 'Można wgrać tylko {count} plik(ów/i)'
+    OVERWRITEWARNING: 'File with the same name already exists'
     REMOVE: Usuń
     REMOVEERROR: 'Błąd podczas usuwania pliku'
     REMOVEINFO: 'Usuń pliki z tego miejsca, ale nie usuwaj ich z magazynu'
     STARTALL: 'Rozpocznij wszystko'
     STARTALLINFO: 'Rozpocznij ładowanie wszystkich'
     Saved: Zapisano
+    UPLOADSINTO: 'saves into /{path}'
   Versioned:
     has_many_Versions: Wersje

lang/pt.yml

@@ -2,6 +2,7 @@ pt:
   AssetAdmin:
     ALLOWEDEXTS: 'Allowed extensions'
     NEWFOLDER: 'Nova pasta'
+    SHOWALLOWEDEXTS: 'Show allowed extensions'
   AssetTableField:
     CREATED: 'First uploaded'
     DIM: Dimensions
@@ -59,9 +60,9 @@ pt:
     ERRORNOTADMIN: 'Esse utilizador não é um administrador.'
     ERRORNOTREC: 'Esse nome de utilizador / password não é válido'
   Boolean:
-    0: Não
     ANY: Qualquer
-    1: Sim
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   CMSLoadingScreen.ss:
     LOADING: Loading...
     REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
@@ -70,6 +71,8 @@ pt:
     ACCESSALLINTERFACES: 'Access to all CMS sections'
     ACCESSALLINTERFACESHELP: 'Overrules more specific access settings.'
     SAVE: Guardar
+  CMSPageHistoryController_versions.ss:
+    PREVIEW: 'Website preview'
   CMSProfileController:
     MENUTITLE: 'My Profile'
   ChangePasswordEmail.ss:
@@ -79,8 +82,8 @@ pt:
     HELLO: Olá
     PASSWORD: Palavra-chave
   CheckboxField:
-    - Não
-    - Sim
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   ComplexTableField:
     CLOSEPOPUP: 'Fechar Janela'
     SUCCESSADD2: 'Added {name}'
@@ -109,20 +112,21 @@ pt:
     PLURALNAME: 'Objectos de Dados'
     SINGULARNAME: 'Objecto de Dados'
   Date:
-    DAY: dia
-    DAYS: dias
-    HOUR: hora
-    HOURS: horas
+    DAY: day
+    DAYS: days
+    HOUR: hour
+    HOURS: hours
+    LessThanMinuteAgo: 'less than a minute'
     MIN: min
     MINS: mins
-    MONTH: mês
-    MONTHS: meses
-    SEC: seg
-    SECS: segs
+    MONTH: month
+    MONTHS: months
+    SEC: sec
+    SECS: secs
     TIMEDIFFAGO: '{difference} ago'
     TIMEDIFFIN: 'in {difference}'
-    YEAR: ano
-    YEARS: anos
+    YEAR: year
+    YEARS: years
   DateField:
     NOTSET: 'Não inserido'
     TODAY: Hoje
@@ -198,7 +202,8 @@ pt:
     TEXT2: 'link para alterar password'
     TEXT3: para
   Form:
-    FIELDISREQUIRED: '%s é de preenchimento obrigatório'
+    CSRF_FAILED_MESSAGE: 'There seems to have been a technical problem. Please click the back button, refresh your browser, and try again.'
+    FIELDISREQUIRED: '{name} is required'
     SubmitBtnLabel: Go
     VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
     VALIDATIONNOTUNIQUE: 'O valor inserido não é único'
@@ -208,6 +213,7 @@ pt:
     VALIDATOR: Validator
     VALIDCURRENCY: 'Please enter a valid currency'
   FormField:
+    Example: 'e.g. %s'
     NONE: nenhum
   GridAction:
     DELETE_DESCRIPTION: Delete
@@ -230,6 +236,7 @@ pt:
     ResetFilter: Redefinir
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'Não tem permissões para apagar'
+    EditPermissionsFailure: 'No permission to unlink record'
   GridFieldDetailForm:
     CancelBtn: Cancelar
     Create: Create
@@ -237,7 +244,9 @@ pt:
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
     Save: Save
-    Saved: 'Saved %s %s'
+    Saved: 'Saved {name} {link}'
+  GridFieldEditButton.ss:
+    EDIT: Edit
   GridFieldItemEditView.ss: null
   Group:
     AddRole: 'Adicionar regra a este grupo'
@@ -267,6 +276,7 @@ pt:
     ADDURL: 'Add URL'
     ADJUSTDETAILSDIMENSIONS: 'Details & dimensions'
     ANCHORVALUE: Âncora
+    BUTTONADDURL: 'Add url'
     BUTTONINSERT: Inserir
     BUTTONINSERTLINK: 'Inserir link'
     BUTTONREMOVELINK: 'Remover link'
@@ -331,7 +341,10 @@ pt:
     PreviewButton: Preview
     REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
     SAVEDUP: Saved.
-    VersionUnknown: desconhecido
+    ShowAsList: 'show as list'
+    TooManyPages: 'Too many pages'
+    ValidationError: 'Validation error'
+    VersionUnknown: Unknown
   LeftAndMain_Menu.ss:
     Hello: Hi
     LOGOUT: 'Log out'
@@ -407,6 +420,7 @@ pt:
     TWODIGITMONTH: 'Two-digit month (01=January, etc.)'
     TWODIGITSECOND: 'Two digits of second (00 through 59)'
     TWODIGITYEAR: 'Two-digit year'
+    Toggle: 'Show formatting help'
   MemberImportForm:
     Help1: '<p>Import users in <em>CSV format</em> (comma-separated values). <small><a href="#" class="toggle-advanced">Show advanced usage</a></small></p>'
     Help2: '<div class="advanced">	<h4>Advanced usage</h4>	<ul>	<li>Allowed columns: <em>%s</em></li>	<li>Existing users are matched by their unique <em>Code</em> property, and updated with any new values from	the imported file.</li>	<li>Groups can be assigned by the <em>Groups</em> column. Groups are identified by their <em>Code</em> property,	multiple groups can be separated by comma. Existing group memberships are not cleared.</li>	</ul></div>'
@@ -421,7 +435,7 @@ pt:
   ModelAdmin:
     DELETE: Delete
     DELETEDRECORDS: 'Deleted {count} records.'
-    EMPTYBEFOREIMPORT: 'Clear Database before import'
+    EMPTYBEFOREIMPORT: 'Replace data'
     IMPORT: 'Import from CSV'
     IMPORTEDRECORDS: 'Imported {count} records.'
     NOCSVFILE: 'Please browse for a CSV file to import'
@@ -515,7 +529,20 @@ pt:
     BtnImport: 'Import from CSV'
     FileFieldLabel: 'CSV File <small>(Allowed extensions: *.csv)</small>'
   SilverStripeNavigator:
+    Auto: Auto
+    ChangeViewMode: 'Change view mode'
+    Desktop: Desktop
+    DualWindowView: 'Dual Window'
     Edit: Edit
+    EditView: 'Edit mode'
+    Mobile: Mobile
+    PreviewState: 'Preview State'
+    PreviewView: 'Preview mode'
+    Responsive: Responsive
+    SplitView: 'Split mode'
+    Tablet: Tablet
+    ViewDeviceWidth: 'Select a preview width'
+    Width: width
   SimpleImageField:
     NOUPLOAD: 'Nenhuma imagem enviada'
   SiteTree:
@@ -551,6 +578,8 @@ pt:
     ATTACHFILE: 'Adicionar um ficheiro'
     ATTACHFILES: 'Adicionar ficheiros'
     AttachFile: 'Adicionar ficheiro(s)'
+    CHOOSEANOTHERFILE: 'Choose another file'
+    CHOOSEANOTHERINFO: 'Replace this file with another one from the file store'
     DELETE: 'Delete from files'
     DELETEINFO: 'Remover permanentemente este ficheiro do sistema'
     DOEDIT: Guardar
@@ -565,12 +594,15 @@ pt:
     FROMFILES: 'De ficheiros'
     HOTLINKINFO: 'Info: This image will be hotlinked. Please ensure you have permissions from the original site creator to do so.'
     MAXNUMBEROFFILES: 'Max number of {count} file(s) exceeded.'
+    MAXNUMBEROFFILESONE: 'Can only upload one file'
     MAXNUMBEROFFILESSHORT: 'Can only upload {count} files'
+    OVERWRITEWARNING: 'File with the same name already exists'
     REMOVE: Remove
     REMOVEERROR: 'Erro ao mover o ficheiro'
     REMOVEINFO: 'Remover este ficheiro daqui, mas não apaga do sistema'
     STARTALL: 'Iniciar todos'
     STARTALLINFO: 'Start all uploads'
     Saved: Guardado
+    UPLOADSINTO: 'saves into /{path}'
   Versioned:
     has_many_Versions: Versões

lang/pt_BR.yml

@@ -2,6 +2,7 @@ pt_BR:
   AssetAdmin:
     ALLOWEDEXTS: 'Allowed extensions'
     NEWFOLDER: 'Nova Pasta'
+    SHOWALLOWEDEXTS: 'Show allowed extensions'
   AssetTableField:
     CREATED: 'Primeiro upload'
     DIM: Dimensões
@@ -59,9 +60,9 @@ pt_BR:
     ERRORNOTADMIN: 'Este usuário não é um administrador'
     ERRORNOTREC: 'Este nome de usuário / senha não é reconhecido'
   Boolean:
-    0: 'False'
     ANY: Any
-    1: 'True'
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   CMSLoadingScreen.ss:
     LOADING: Loading...
     REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
@@ -70,6 +71,8 @@ pt_BR:
     ACCESSALLINTERFACES: 'Acessar todas as interfaces do CMS'
     ACCESSALLINTERFACESHELP: 'Overrules more specific access settings.'
     SAVE: Salvar
+  CMSPageHistoryController_versions.ss:
+    PREVIEW: 'Website preview'
   CMSProfileController:
     MENUTITLE: 'My Profile'
   ChangePasswordEmail.ss:
@@ -79,8 +82,8 @@ pt_BR:
     HELLO: Olá
     PASSWORD: Senha
   CheckboxField:
-    - 'False'
-    - 'True'
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   ComplexTableField:
     CLOSEPOPUP: 'Fechar janela'
     SUCCESSADD2: 'Added {name}'
@@ -109,20 +112,21 @@ pt_BR:
     PLURALNAME: 'Dados dos objetos'
     SINGULARNAME: 'Dado do objeto'
   Date:
-    DAY: dia
-    DAYS: dias
-    HOUR: hora
-    HOURS: horas
+    DAY: day
+    DAYS: days
+    HOUR: hour
+    HOURS: hours
+    LessThanMinuteAgo: 'less than a minute'
     MIN: min
     MINS: mins
-    MONTH: mês
-    MONTHS: meses
+    MONTH: month
+    MONTHS: months
     SEC: sec
     SECS: secs
     TIMEDIFFAGO: '{difference} ago'
     TIMEDIFFIN: 'in {difference}'
-    YEAR: ano
-    YEARS: anos
+    YEAR: year
+    YEARS: years
   DateField:
     NOTSET: 'não informado'
     TODAY: hoje
@@ -198,7 +202,8 @@ pt_BR:
     TEXT2: 'link para reiniciar sua senha'
     TEXT3: para
   Form:
-    FIELDISREQUIRED: '%s é requerido'
+    CSRF_FAILED_MESSAGE: 'There seems to have been a technical problem. Please click the back button, refresh your browser, and try again.'
+    FIELDISREQUIRED: '{name} is required'
     SubmitBtnLabel: Go
     VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
     VALIDATIONNOTUNIQUE: 'O valor inserido não é exclusivo'
@@ -208,6 +213,7 @@ pt_BR:
     VALIDATOR: Verificador
     VALIDCURRENCY: 'Please enter a valid currency'
   FormField:
+    Example: 'e.g. %s'
     NONE: nenhum
   GridAction:
     DELETE_DESCRIPTION: Delete
@@ -230,6 +236,7 @@ pt_BR:
     ResetFilter: Reset
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'No delete permissions'
+    EditPermissionsFailure: 'No permission to unlink record'
   GridFieldDetailForm:
     CancelBtn: Cancel
     Create: Create
@@ -237,7 +244,9 @@ pt_BR:
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
     Save: Save
-    Saved: 'Saved %s %s'
+    Saved: 'Saved {name} {link}'
+  GridFieldEditButton.ss:
+    EDIT: Edit
   GridFieldItemEditView.ss: null
   Group:
     AddRole: 'Add a role for this group'
@@ -267,6 +276,7 @@ pt_BR:
     ADDURL: 'Add URL'
     ADJUSTDETAILSDIMENSIONS: 'Details & dimensions'
     ANCHORVALUE: Âncora
+    BUTTONADDURL: 'Add url'
     BUTTONINSERT: Insert
     BUTTONINSERTLINK: 'Inserir link'
     BUTTONREMOVELINK: 'Remover link'
@@ -331,7 +341,10 @@ pt_BR:
     PreviewButton: Preview
     REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
     SAVEDUP: Saved.
-    VersionUnknown: unknown
+    ShowAsList: 'show as list'
+    TooManyPages: 'Too many pages'
+    ValidationError: 'Validation error'
+    VersionUnknown: Unknown
   LeftAndMain_Menu.ss:
     Hello: Hi
     LOGOUT: 'Log out'
@@ -407,6 +420,7 @@ pt_BR:
     TWODIGITMONTH: 'Two-digit month (01=January, etc.)'
     TWODIGITSECOND: 'Two digits of second (00 through 59)'
     TWODIGITYEAR: 'Two-digit year'
+    Toggle: 'Show formatting help'
   MemberImportForm:
     Help1: '<p>Import users in <em>CSV format</em> (comma-separated values). <small><a href="#" class="toggle-advanced">Show advanced usage</a></small></p>'
     Help2: '<div class="advanced">	<h4>Advanced usage</h4>	<ul>	<li>Allowed columns: <em>%s</em></li>	<li>Existing users are matched by their unique <em>Code</em> property, and updated with any new values from	the imported file.</li>	<li>Groups can be assigned by the <em>Groups</em> column. Groups are identified by their <em>Code</em> property,	multiple groups can be separated by comma. Existing group memberships are not cleared.</li>	</ul></div>'
@@ -421,7 +435,7 @@ pt_BR:
   ModelAdmin:
     DELETE: Excluir
     DELETEDRECORDS: 'Deleted {count} records.'
-    EMPTYBEFOREIMPORT: 'Clear Database before import'
+    EMPTYBEFOREIMPORT: 'Replace data'
     IMPORT: 'importar do CSV'
     IMPORTEDRECORDS: 'Imported {count} records.'
     NOCSVFILE: 'Por favor, localize um arquivo CSV para importar'
@@ -515,7 +529,20 @@ pt_BR:
     BtnImport: 'Import from CSV'
     FileFieldLabel: 'CSV File <small>(Allowed extensions: *.csv)</small>'
   SilverStripeNavigator:
+    Auto: Auto
+    ChangeViewMode: 'Change view mode'
+    Desktop: Desktop
+    DualWindowView: 'Dual Window'
     Edit: Edit
+    EditView: 'Edit mode'
+    Mobile: Mobile
+    PreviewState: 'Preview State'
+    PreviewView: 'Preview mode'
+    Responsive: Responsive
+    SplitView: 'Split mode'
+    Tablet: Tablet
+    ViewDeviceWidth: 'Select a preview width'
+    Width: width
   SimpleImageField:
     NOUPLOAD: 'Não foi feito o upload de nenhuma imagem'
   SiteTree:
@@ -551,6 +578,8 @@ pt_BR:
     ATTACHFILE: 'Attach a file'
     ATTACHFILES: 'Attach files'
     AttachFile: 'Attach file(s)'
+    CHOOSEANOTHERFILE: 'Choose another file'
+    CHOOSEANOTHERINFO: 'Replace this file with another one from the file store'
     DELETE: 'Delete from files'
     DELETEINFO: 'Permanently delete this file from the file store'
     DOEDIT: Save
@@ -565,12 +594,15 @@ pt_BR:
     FROMFILES: 'From files'
     HOTLINKINFO: 'Info: This image will be hotlinked. Please ensure you have permissions from the original site creator to do so.'
     MAXNUMBEROFFILES: 'Max number of {count} file(s) exceeded.'
+    MAXNUMBEROFFILESONE: 'Can only upload one file'
     MAXNUMBEROFFILESSHORT: 'Can only upload {count} files'
+    OVERWRITEWARNING: 'File with the same name already exists'
     REMOVE: Remove
     REMOVEERROR: 'Error removing file'
     REMOVEINFO: 'Remove this file from here, but do not delete it from the file store'
     STARTALL: 'Start all'
     STARTALLINFO: 'Start all uploads'
     Saved: Saved
+    UPLOADSINTO: 'saves into /{path}'
   Versioned:
     has_many_Versions: Versões

lang/ro.yml

@@ -2,6 +2,7 @@ ro:
   AssetAdmin:
     ALLOWEDEXTS: 'Allowed extensions'
     NEWFOLDER: NewFolder
+    SHOWALLOWEDEXTS: 'Show allowed extensions'
   AssetTableField:
     CREATED: 'First uploaded'
     DIM: Dimensions
@@ -59,9 +60,9 @@ ro:
     ERRORNOTADMIN: 'Acest utilizator nu este un administrator.'
     ERRORNOTREC: 'That username / password isn''t recognised'
   Boolean:
-    0: 'False'
     ANY: Any
-    1: 'True'
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   CMSLoadingScreen.ss:
     LOADING: Loading...
     REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
@@ -70,6 +71,8 @@ ro:
     ACCESSALLINTERFACES: 'Access to all CMS sections'
     ACCESSALLINTERFACESHELP: 'Overrules more specific access settings.'
     SAVE: Save
+  CMSPageHistoryController_versions.ss:
+    PREVIEW: 'Website preview'
   CMSProfileController:
     MENUTITLE: 'My Profile'
   ChangePasswordEmail.ss:
@@ -79,8 +82,8 @@ ro:
     HELLO: Salut
     PASSWORD: Parola
   CheckboxField:
-    - 'False'
-    - 'True'
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   ComplexTableField:
     CLOSEPOPUP: 'Close Popup'
     SUCCESSADD2: 'Added {name}'
@@ -109,20 +112,21 @@ ro:
     PLURALNAME: 'Obiecte Data'
     SINGULARNAME: 'Obiect Data'
   Date:
-    DAY: zi
-    DAYS: zile
-    HOUR: oră
-    HOURS: ore
-    MIN: minut
-    MINS: minute
-    MONTH: lună
-    MONTHS: luni
-    SEC: secundă
-    SECS: secunde
+    DAY: day
+    DAYS: days
+    HOUR: hour
+    HOURS: hours
+    LessThanMinuteAgo: 'less than a minute'
+    MIN: min
+    MINS: mins
+    MONTH: month
+    MONTHS: months
+    SEC: sec
+    SECS: secs
     TIMEDIFFAGO: '{difference} ago'
     TIMEDIFFIN: 'in {difference}'
-    YEAR: an
-    YEARS: ani
+    YEAR: year
+    YEARS: years
   DateField:
     NOTSET: 'not set'
     TODAY: astazi
@@ -198,7 +202,8 @@ ro:
     TEXT2: 'link de resetare a parolei'
     TEXT3: pentru
   Form:
-    FIELDISREQUIRED: '%s is required'
+    CSRF_FAILED_MESSAGE: 'There seems to have been a technical problem. Please click the back button, refresh your browser, and try again.'
+    FIELDISREQUIRED: '{name} is required'
     SubmitBtnLabel: Go
     VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
     VALIDATIONNOTUNIQUE: 'Valoarea introdusă nu este unică'
@@ -208,6 +213,7 @@ ro:
     VALIDATOR: Validator
     VALIDCURRENCY: 'Please enter a valid currency'
   FormField:
+    Example: 'e.g. %s'
     NONE: none
   GridAction:
     DELETE_DESCRIPTION: Delete
@@ -230,6 +236,7 @@ ro:
     ResetFilter: Reseteaza
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'No delete permissions'
+    EditPermissionsFailure: 'No permission to unlink record'
   GridFieldDetailForm:
     CancelBtn: Cancel
     Create: Create
@@ -237,7 +244,9 @@ ro:
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
     Save: Save
-    Saved: 'Saved %s %s'
+    Saved: 'Saved {name} {link}'
+  GridFieldEditButton.ss:
+    EDIT: Edit
   GridFieldItemEditView.ss: null
   Group:
     AddRole: 'Add a role for this group'
@@ -267,6 +276,7 @@ ro:
     ADDURL: 'Add URL'
     ADJUSTDETAILSDIMENSIONS: 'Details & dimensions'
     ANCHORVALUE: Anchor
+    BUTTONADDURL: 'Add url'
     BUTTONINSERT: Insert
     BUTTONINSERTLINK: 'Insereaza link'
     BUTTONREMOVELINK: 'Indeparteaza link'
@@ -331,7 +341,10 @@ ro:
     PreviewButton: Preview
     REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
     SAVEDUP: Saved.
-    VersionUnknown: unknown
+    ShowAsList: 'show as list'
+    TooManyPages: 'Too many pages'
+    ValidationError: 'Validation error'
+    VersionUnknown: Unknown
   LeftAndMain_Menu.ss:
     Hello: Hi
     LOGOUT: 'Log out'
@@ -407,6 +420,7 @@ ro:
     TWODIGITMONTH: 'Two-digit month (01=January, etc.)'
     TWODIGITSECOND: 'Two digits of second (00 through 59)'
     TWODIGITYEAR: 'Two-digit year'
+    Toggle: 'Show formatting help'
   MemberImportForm:
     Help1: '<p>Import users in <em>CSV format</em> (comma-separated values). <small><a href="#" class="toggle-advanced">Show advanced usage</a></small></p>'
     Help2: '<div class="advanced">	<h4>Advanced usage</h4>	<ul>	<li>Allowed columns: <em>%s</em></li>	<li>Existing users are matched by their unique <em>Code</em> property, and updated with any new values from	the imported file.</li>	<li>Groups can be assigned by the <em>Groups</em> column. Groups are identified by their <em>Code</em> property,	multiple groups can be separated by comma. Existing group memberships are not cleared.</li>	</ul></div>'
@@ -421,7 +435,7 @@ ro:
   ModelAdmin:
     DELETE: Delete
     DELETEDRECORDS: 'Deleted {count} records.'
-    EMPTYBEFOREIMPORT: 'Clear Database before import'
+    EMPTYBEFOREIMPORT: 'Replace data'
     IMPORT: 'Import from CSV'
     IMPORTEDRECORDS: 'Imported {count} records.'
     NOCSVFILE: 'Please browse for a CSV file to import'
@@ -515,7 +529,20 @@ ro:
     BtnImport: 'Import from CSV'
     FileFieldLabel: 'CSV File <small>(Allowed extensions: *.csv)</small>'
   SilverStripeNavigator:
+    Auto: Auto
+    ChangeViewMode: 'Change view mode'
+    Desktop: Desktop
+    DualWindowView: 'Dual Window'
     Edit: Edit
+    EditView: 'Edit mode'
+    Mobile: Mobile
+    PreviewState: 'Preview State'
+    PreviewView: 'Preview mode'
+    Responsive: Responsive
+    SplitView: 'Split mode'
+    Tablet: Tablet
+    ViewDeviceWidth: 'Select a preview width'
+    Width: width
   SimpleImageField:
     NOUPLOAD: 'Nici o imagine incarcata'
   SiteTree:
@@ -551,6 +578,8 @@ ro:
     ATTACHFILE: 'Atasati un fisier'
     ATTACHFILES: 'Attach files'
     AttachFile: 'Attach file(s)'
+    CHOOSEANOTHERFILE: 'Choose another file'
+    CHOOSEANOTHERINFO: 'Replace this file with another one from the file store'
     DELETE: 'Delete from files'
     DELETEINFO: 'Permanently delete this file from the file store'
     DOEDIT: Salveaza
@@ -565,12 +594,15 @@ ro:
     FROMFILES: 'From files'
     HOTLINKINFO: 'Info: This image will be hotlinked. Please ensure you have permissions from the original site creator to do so.'
     MAXNUMBEROFFILES: 'Max number of {count} file(s) exceeded.'
+    MAXNUMBEROFFILESONE: 'Can only upload one file'
     MAXNUMBEROFFILESSHORT: 'Can only upload {count} files'
+    OVERWRITEWARNING: 'File with the same name already exists'
     REMOVE: Remove
     REMOVEERROR: 'Error removing file'
     REMOVEINFO: 'Remove this file from here, but do not delete it from the file store'
     STARTALL: 'Start all'
     STARTALLINFO: 'Start all uploads'
     Saved: Salvat
+    UPLOADSINTO: 'saves into /{path}'
   Versioned:
     has_many_Versions: Versiune

lang/ru.yml

@@ -2,14 +2,15 @@ ru:
   AssetAdmin:
     ALLOWEDEXTS: 'Allowed extensions'
     NEWFOLDER: 'Новая папка'
+    SHOWALLOWEDEXTS: 'Show allowed extensions'
   AssetTableField:
     CREATED: 'Первая загрузка'
-    DIM: Размеры
+    DIM: 'Размеры'
     FILENAME: 'Имя файла'
     FOLDER: Папка
     LASTEDIT: 'Последнее изменение'
     OWNER: Владелец
-    SIZE: Размер
+    SIZE: 'Размер'
     TITLE: Название
     TYPE: Тип
     URL: URL
@@ -59,9 +60,9 @@ ru:
     ERRORNOTADMIN: 'Такой пользователь не является администратором.'
     ERRORNOTREC: 'Такое имя пользователя или пароль не существует'
   Boolean:
-    0: 'False'
     ANY: Все
-    1: 'True'
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   CMSLoadingScreen.ss:
     LOADING: 'Идет загрузка...'
     REQUIREJS: 'Для работы с CMS у вас должен быть включен JavaScript.'
@@ -69,7 +70,9 @@ ru:
     ACCESS: 'Доступ к разделу ''{title}'''
     ACCESSALLINTERFACES: 'Доступ ко всему интерфейсу CMS'
     ACCESSALLINTERFACESHELP: 'Отменяет индивидуальные настройки прав доступа.'
-    SAVE: Сохранить
+    SAVE: 'Сохранить'
+  CMSPageHistoryController_versions.ss:
+    PREVIEW: 'Предварительный просмотр сайта'
   CMSProfileController:
     MENUTITLE: 'Мой профиль'
   ChangePasswordEmail.ss:
@@ -79,8 +82,8 @@ ru:
     HELLO: Здравствуйте
     PASSWORD: Пароль
   CheckboxField:
-    - 'False'
-    - 'True'
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   ComplexTableField:
     CLOSEPOPUP: 'Закрыть всплывающее окно'
     SUCCESSADD2: '{name} добавлено'
@@ -109,20 +112,21 @@ ru:
     PLURALNAME: Объекты
     SINGULARNAME: Объект
   Date:
-    DAY: день
-    DAYS: дней
-    HOUR: час
-    HOURS: час.
-    MIN: мин.
-    MINS: мин.
-    MONTH: месяц
-    MONTHS: месяца(ев)
-    SEC: сек.
-    SECS: сек.
+    DAY: day
+    DAYS: days
+    HOUR: hour
+    HOURS: hours
+    LessThanMinuteAgo: 'less than a minute'
+    MIN: min
+    MINS: mins
+    MONTH: month
+    MONTHS: months
+    SEC: sec
+    SECS: secs
     TIMEDIFFAGO: '{difference} назад'
     TIMEDIFFIN: 'через {difference}'
-    YEAR: год
-    YEARS: лет
+    YEAR: year
+    YEARS: years
   DateField:
     NOTSET: 'не установлено'
     TODAY: сегодня
@@ -198,7 +202,8 @@ ru:
     TEXT2: 'ссылка переустановки пароля'
     TEXT3: для
   Form:
-    FIELDISREQUIRED: 'Поле %s является обязательным'
+    CSRF_FAILED_MESSAGE: 'There seems to have been a technical problem. Please click the back button, refresh your browser, and try again.'
+    FIELDISREQUIRED: '{name} is required'
     SubmitBtnLabel: Выбрать
     VALIDATIONCREDITNUMBER: 'Пожалуйста, убедитесь, что номер кредитной карты {number} задан правильно'
     VALIDATIONNOTUNIQUE: 'Введенное значение не уникально'
@@ -208,6 +213,7 @@ ru:
     VALIDATOR: Валидатор
     VALIDCURRENCY: 'Пожалуйста, укажите валюту правильно'
   FormField:
+    Example: 'e.g. %s'
     NONE: 'не выбрано'
   GridAction:
     DELETE_DESCRIPTION: Удалить
@@ -230,14 +236,17 @@ ru:
     ResetFilter: Сброс
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'Нет прав на удаление'
+    EditPermissionsFailure: 'No permission to unlink record'
   GridFieldDetailForm:
     CancelBtn: Отмена
     Create: Создать
     Delete: Удалить
     DeletePermissionsFailure: 'Нет прав на удаление'
     Deleted: 'Удалено %s %s'
-    Save: Сохранить
-    Saved: 'Сохранено %s %s'
+    Save: 'Сохранить'
+    Saved: 'Saved {name} {link}'
+  GridFieldEditButton.ss:
+    EDIT: 'Редактировать'
   GridFieldItemEditView.ss: null
   Group:
     AddRole: 'Добавить роль для этой группы'
@@ -267,6 +276,7 @@ ru:
     ADDURL: 'Добавить URL'
     ADJUSTDETAILSDIMENSIONS: 'Дополнительные сведения и размеры'
     ANCHORVALUE: Якорь
+    BUTTONADDURL: 'Добавить URL'
     BUTTONINSERT: Вставить
     BUTTONINSERTLINK: 'Вставить ссылку'
     BUTTONREMOVELINK: 'Удалить ссылку'
@@ -288,7 +298,7 @@ ru:
     IMAGEALT: 'Альтернативный текст (alt)'
     IMAGEALTTEXT: 'Альтернативный текст (alt) - показывается, если изображение недоступно'
     IMAGEALTTEXTDESC: 'Передается программе чтения экрана или отображается, если изображение недоступно'
-    IMAGEDIMENSIONS: Размеры
+    IMAGEDIMENSIONS: 'Размеры'
     IMAGEHEIGHTPX: Высота
     IMAGETITLE: 'Текст (всплывающая подсказка) - для дополнительной информации об изображении'
     IMAGETITLETEXT: 'Текст (всплывающая подсказка)'
@@ -330,11 +340,14 @@ ru:
     PLEASESAVE: 'Пожалуйста, сохраните страницу: ее нельзя обновить, т.к. она еще не была сохранена.'
     PreviewButton: Просмотр
     REORGANISATIONSUCCESSFUL: 'Древесная структура сайта успешно реорганизована.'
-    SAVEDUP: Сохранено.
-    VersionUnknown: неизвестно
+    SAVEDUP: 'Сохранено.'
+    ShowAsList: 'show as list'
+    TooManyPages: 'Too many pages'
+    ValidationError: 'Validation error'
+    VersionUnknown: Unknown
   LeftAndMain_Menu.ss:
     Hello: Здравствуйте
-    LOGOUT: Выход
+    LOGOUT: 'Выход'
   LoginAttempt:
     Email: Email
     IP: IP-адрес
@@ -407,6 +420,7 @@ ru:
     TWODIGITMONTH: 'Месяц двумя цифрами (01=январь и т.д.)'
     TWODIGITSECOND: 'Секунды: двумя цифрами (00 - 59)'
     TWODIGITYEAR: 'Год: двумя цифрами'
+    Toggle: 'Show formatting help'
   MemberImportForm:
     Help1: '<p>Импорт пользователей в формате <em>CSV</em> (comma-separated values). <small><a href="#" class="toggle-advanced">Показать подробности</a></small></p>'
     Help2: "<div class=\"advanced\">\\n<h4>Расширенное использование</h4>\\n<ul>\\n<li>Разрешенные столбцы: <em>%s</em></li>\\n<li>Существующие пользователи сверяются c уникальным атрибутом <em>Code</em> и новые значения из \\nимпортированного файла вносятся в записи о пользователях.</li>\\n<li>Назначение групп производится с помощью столбца <em>Groups</em>. Группы идентифицируются по атрибуту <em>Code</em>, \\nотдельные группы разделяются запятой. Если участник входит в какую-либо группу, это свойство не обнуляется.</li>\\n</ul>\\n</div>"
@@ -421,7 +435,7 @@ ru:
   ModelAdmin:
     DELETE: Удалить
     DELETEDRECORDS: 'Удалено {count} записей.'
-    EMPTYBEFOREIMPORT: 'Очистить базу данных перед импортированием'
+    EMPTYBEFOREIMPORT: 'Заменить данные'
     IMPORT: 'Импорт из CSV'
     IMPORTEDRECORDS: 'Импортировано {count} записей.'
     NOCSVFILE: 'Выберите CSV-файл для импорта'
@@ -464,8 +478,8 @@ ru:
     FromRoleOnGroup: 'перенято из роли "%s" для группы "%s"'
   PermissionRole:
     OnlyAdminCanApply: 'Может применяться только администратором'
-    PLURALNAME: Роли
-    SINGULARNAME: Роль
+    PLURALNAME: 'Роли'
+    SINGULARNAME: 'Роль'
     Title: Название
   PermissionRoleCode:
     PLURALNAME: 'Коды ролей доступа'
@@ -487,7 +501,7 @@ ru:
     ENTERNEWPASSWORD: 'Пожалуйста, введите новый пароль.'
     ERRORPASSWORDPERMISSION: 'Вы должны войти в систему, чтобы изменить Ваш пароль!'
     LOGGEDOUT: 'Вы вышли. Если Вы хотите войти снова, введите ваши учетные данные ниже.'
-    LOGIN: Вход
+    LOGIN: 'Вход'
     NOTEPAGESECURED: 'Эта страница защищена. Пожалуйста, введите свои учетные данные для входа.'
     NOTERESETLINKINVALID: '<p>Неверная ссылка переустановки пароля или время действия ссылки истекло.</p><p>Вы можете повторно запросить ссылку, щелкнув <a href="{link1}">здесь</a>, или поменять пароль, <a href="{link2}">войдя в систему</a>.</p> '
     NOTERESETPASSWORD: 'Введите Ваш адрес email, и Вам будет отправлена ссылка, по которой Вы сможете переустановить свой пароль'
@@ -507,15 +521,28 @@ ru:
     MemberListCaution: 'Внимание: при удалении участников из этого списка они будут удалены из всех групп и из базы данных '
     NEWGROUP: 'Новая группа'
     PERMISSIONS: 'Права доступа'
-    ROLES: Роли
+    ROLES: 'Роли'
     ROLESDESCRIPTION: 'Роли представляют собой сочетания различных прав доступа, которые могут быть присвоены группам.<br />При необходимости они наследуются от групп более высокого уровня.'
-    TABROLES: Роли
+    TABROLES: 'Роли'
     Users: Пользователи
   SecurityAdmin_MemberImportForm:
     BtnImport: 'Импорт из CSV'
     FileFieldLabel: 'Файл CSV <small>(Допустимые расширения: *.csv)</small>'
   SilverStripeNavigator:
-    Edit: Редактировать
+    Auto: Auto
+    ChangeViewMode: 'Сменить режим просмотра'
+    Desktop: Desktop
+    DualWindowView: 'Dual Window'
+    Edit: 'Редактировать'
+    EditView: 'Edit mode'
+    Mobile: Mobile
+    PreviewState: 'Preview State'
+    PreviewView: 'Preview mode'
+    Responsive: Responsive
+    SplitView: 'Split mode'
+    Tablet: Планшет
+    ViewDeviceWidth: 'Select a preview width'
+    Width: width
   SimpleImageField:
     NOUPLOAD: 'Не загружено ни одного изображения'
   SiteTree:
@@ -551,13 +578,15 @@ ru:
     ATTACHFILE: 'Прикрепить файл'
     ATTACHFILES: 'Прикрепить файлы'
     AttachFile: 'Прикрепить файл(ы)'
+    CHOOSEANOTHERFILE: 'Choose another file'
+    CHOOSEANOTHERINFO: 'Replace this file with another one from the file store'
     DELETE: 'Удалить из файлов'
     DELETEINFO: 'Окончательно удалить этот файл с сервера'
-    DOEDIT: Сохранить
+    DOEDIT: 'Сохранить'
     DROPFILE: 'перетащите файл сюда'
     DROPFILES: 'перетащить файлы'
-    Dimensions: Размеры
-    EDIT: Редактировать
+    Dimensions: 'Размеры'
+    EDIT: 'Редактировать'
     EDITINFO: 'Редактировать этот файл'
     FIELDNOTSET: 'Информация о файле не найдена'
     FROMCOMPUTER: 'С диска'
@@ -565,12 +594,15 @@ ru:
     FROMFILES: 'Из файлов'
     HOTLINKINFO: 'Внимание: это изображение будет вставлено через хотлинк. Пожалуйста, не забывайте, что на это у вас должно быть разрешение владельца исходного ресурса.'
     MAXNUMBEROFFILES: 'Превышено максимальное количество файлов ({count}).'
+    MAXNUMBEROFFILESONE: 'Can only upload one file'
     MAXNUMBEROFFILESSHORT: 'Можно загрузить не более {count} файлов'
+    OVERWRITEWARNING: 'File with the same name already exists'
     REMOVE: Удалить
     REMOVEERROR: 'Ошибка при удалении файла'
     REMOVEINFO: 'Удалить файл отсюда, но не удалять с сервера'
     STARTALL: 'Стартовать все'
     STARTALLINFO: 'Стартовать все загрузки'
-    Saved: Сохранено
+    Saved: 'Сохранено'
+    UPLOADSINTO: 'saves into /{path}'
   Versioned:
     has_many_Versions: Версии

lang/si.yml

@@ -2,6 +2,7 @@ si:
   AssetAdmin:
     ALLOWEDEXTS: 'Allowed extensions'
     NEWFOLDER: 'අලත් ගොනුවක්'
+    SHOWALLOWEDEXTS: 'Show allowed extensions'
   AssetTableField:
     CREATED: 'පලමු ලිපිය අප්ලෝඩ් කරන ලදී'
     DIM: මාන
@@ -59,9 +60,9 @@ si:
     ERRORNOTADMIN: 'ඵම පරිශීලකයා නියමුවෙකු නොවේ'
     ERRORNOTREC: 'ඵම නම/මුරපදය හදුනාගත නොහැක'
   Boolean:
-    0: 'False'
     ANY: Any
-    1: 'True'
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   CMSLoadingScreen.ss:
     LOADING: Loading...
     REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
@@ -70,6 +71,8 @@ si:
     ACCESSALLINTERFACES: 'Access to all CMS sections'
     ACCESSALLINTERFACESHELP: 'Overrules more specific access settings.'
     SAVE: 'සේවි කරන්න'
+  CMSPageHistoryController_versions.ss:
+    PREVIEW: 'Website preview'
   CMSProfileController:
     MENUTITLE: 'My Profile'
   ChangePasswordEmail.ss:
@@ -79,8 +82,8 @@ si:
     HELLO: කොහොමද
     PASSWORD: Password
   CheckboxField:
-    - 'False'
-    - 'True'
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   ComplexTableField:
     CLOSEPOPUP: 'Close Popup'
     SUCCESSADD2: 'Added {name}'
@@ -99,7 +102,7 @@ si:
     MAXIMUM: 'Passwords must be at most {max} characters long.'
     SHOWONCLICKTITLE: 'මුර පදය වෙනස් කිරීම'
   CreditCardField:
-    FIRST: පළමු
+    FIRST: 'පළමු'
     FOURTH: fourth
     SECOND: දෙවන
     THIRD: third
@@ -109,20 +112,21 @@ si:
     PLURALNAME: 'දත්ත වස්තු'
     SINGULARNAME: 'දත්ත වස්තුව'
   Date:
-    DAY: ඳිනය
-    DAYS: ඳින
-    HOUR: පැය
-    HOURS: පැය
-    MIN: විනාඩිය
-    MINS: විනාඩි
-    MONTH: මාසය
-    MONTHS: මාස
-    SEC: තත්පරය
-    SECS: 'තත්පර '
+    DAY: day
+    DAYS: days
+    HOUR: hour
+    HOURS: hours
+    LessThanMinuteAgo: 'less than a minute'
+    MIN: min
+    MINS: mins
+    MONTH: month
+    MONTHS: months
+    SEC: sec
+    SECS: secs
     TIMEDIFFAGO: '{difference} ago'
     TIMEDIFFIN: 'in {difference}'
-    YEAR: අවුරුද්ද
-    YEARS: අවුරුදු
+    YEAR: year
+    YEARS: years
   DateField:
     NOTSET: 'not set'
     TODAY: today
@@ -198,7 +202,8 @@ si:
     TEXT2: 'password reset link'
     TEXT3: සඳහා
   Form:
-    FIELDISREQUIRED: '%s අවශ්යයි'
+    CSRF_FAILED_MESSAGE: 'There seems to have been a technical problem. Please click the back button, refresh your browser, and try again.'
+    FIELDISREQUIRED: '{name} is required'
     SubmitBtnLabel: Go
     VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
     VALIDATIONNOTUNIQUE: 'අගය අද්විතීය නොවේ'
@@ -208,6 +213,7 @@ si:
     VALIDATOR: Validator
     VALIDCURRENCY: 'Please enter a valid currency'
   FormField:
+    Example: 'e.g. %s'
     NONE: none
   GridAction:
     DELETE_DESCRIPTION: Delete
@@ -230,6 +236,7 @@ si:
     ResetFilter: Reset
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'No delete permissions'
+    EditPermissionsFailure: 'No permission to unlink record'
   GridFieldDetailForm:
     CancelBtn: Cancel
     Create: Create
@@ -237,7 +244,9 @@ si:
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
     Save: Save
-    Saved: 'Saved %s %s'
+    Saved: 'Saved {name} {link}'
+  GridFieldEditButton.ss:
+    EDIT: Edit
   GridFieldItemEditView.ss: null
   Group:
     AddRole: 'Add a role for this group'
@@ -253,7 +262,7 @@ si:
     RolesAddEditLink: 'Manage roles'
     SINGULARNAME: Group
     Sort: 'Sort Order'
-    has_many_Permissions: අවසර
+    has_many_Permissions: 'අවසර'
     many_many_Members: සාමාජිකයින්
   GroupImportForm:
     Help1: '<p>Import one or more groups in <em>CSV</em> format (comma-separated values). <small><a href="#" class="toggle-advanced">Show advanced usage</a></small></p>'
@@ -267,6 +276,7 @@ si:
     ADDURL: 'Add URL'
     ADJUSTDETAILSDIMENSIONS: 'Details &amp; dimensions'
     ANCHORVALUE: Anchor
+    BUTTONADDURL: 'Add url'
     BUTTONINSERT: Insert
     BUTTONINSERTLINK: 'බැදීමක් යොදන්න'
     BUTTONREMOVELINK: 'බැදීම ගලවන්න'
@@ -331,7 +341,10 @@ si:
     PreviewButton: Preview
     REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
     SAVEDUP: Saved.
-    VersionUnknown: unknown
+    ShowAsList: 'show as list'
+    TooManyPages: 'Too many pages'
+    ValidationError: 'Validation error'
+    VersionUnknown: Unknown
   LeftAndMain_Menu.ss:
     Hello: Hi
     LOGOUT: 'Log out'
@@ -407,6 +420,7 @@ si:
     TWODIGITMONTH: 'Two-digit month (01=January, etc.)'
     TWODIGITSECOND: 'Two digits of second (00 through 59)'
     TWODIGITYEAR: 'Two-digit year'
+    Toggle: 'Show formatting help'
   MemberImportForm:
     Help1: '<p>Import users in <em>CSV format</em> (comma-separated values). <small><a href="#" class="toggle-advanced">Show advanced usage</a></small></p>'
     Help2: '<div class="advanced">	<h4>Advanced usage</h4>	<ul>	<li>Allowed columns: <em>%s</em></li>	<li>Existing users are matched by their unique <em>Code</em> property, and updated with any new values from	the imported file.</li>	<li>Groups can be assigned by the <em>Groups</em> column. Groups are identified by their <em>Code</em> property,	multiple groups can be separated by comma. Existing group memberships are not cleared.</li>	</ul></div>'
@@ -421,7 +435,7 @@ si:
   ModelAdmin:
     DELETE: Delete
     DELETEDRECORDS: 'Deleted {count} records.'
-    EMPTYBEFOREIMPORT: 'Clear Database before import'
+    EMPTYBEFOREIMPORT: 'Replace data'
     IMPORT: 'Import from CSV'
     IMPORTEDRECORDS: 'Imported {count} records.'
     NOCSVFILE: 'Please browse for a CSV file to import'
@@ -515,7 +529,20 @@ si:
     BtnImport: 'Import from CSV'
     FileFieldLabel: 'CSV File <small>(Allowed extensions: *.csv)</small>'
   SilverStripeNavigator:
+    Auto: Auto
+    ChangeViewMode: 'Change view mode'
+    Desktop: Desktop
+    DualWindowView: 'Dual Window'
     Edit: Edit
+    EditView: 'Edit mode'
+    Mobile: Mobile
+    PreviewState: 'Preview State'
+    PreviewView: 'Preview mode'
+    Responsive: Responsive
+    SplitView: 'Split mode'
+    Tablet: Tablet
+    ViewDeviceWidth: 'Select a preview width'
+    Width: width
   SimpleImageField:
     NOUPLOAD: 'පි0තුර අප්ලෝඩ් කර නැත'
   SiteTree:
@@ -545,12 +572,14 @@ si:
   TimeField:
     VALIDATEFORMAT: 'Please enter a valid time format ({format})'
   ToggleField:
-    LESS: අඩු
+    LESS: 'අඩු'
     MORE: වැඩි
   UploadField:
     ATTACHFILE: 'Attach a file'
     ATTACHFILES: 'Attach files'
     AttachFile: 'Attach file(s)'
+    CHOOSEANOTHERFILE: 'Choose another file'
+    CHOOSEANOTHERINFO: 'Replace this file with another one from the file store'
     DELETE: 'Delete from files'
     DELETEINFO: 'Permanently delete this file from the file store'
     DOEDIT: Save
@@ -565,12 +594,15 @@ si:
     FROMFILES: 'From files'
     HOTLINKINFO: 'Info: This image will be hotlinked. Please ensure you have permissions from the original site creator to do so.'
     MAXNUMBEROFFILES: 'Max number of {count} file(s) exceeded.'
+    MAXNUMBEROFFILESONE: 'Can only upload one file'
     MAXNUMBEROFFILESSHORT: 'Can only upload {count} files'
+    OVERWRITEWARNING: 'File with the same name already exists'
     REMOVE: Remove
     REMOVEERROR: 'Error removing file'
     REMOVEINFO: 'Remove this file from here, but do not delete it from the file store'
     STARTALL: 'Start all'
     STARTALLINFO: 'Start all uploads'
     Saved: Saved
+    UPLOADSINTO: 'saves into /{path}'
   Versioned:
     has_many_Versions: වෙලුම

lang/sk.yml

@@ -2,6 +2,7 @@ sk:
   AssetAdmin:
     ALLOWEDEXTS: 'Povolené extenzie'
     NEWFOLDER: 'Nový priečinok'
+    SHOWALLOWEDEXTS: 'Show allowed extensions'
   AssetTableField:
     CREATED: 'Prvýkrát nahrané'
     DIM: Rozmery
@@ -59,9 +60,9 @@ sk:
     ERRORNOTADMIN: 'Tento používateľ nie je administrátor.'
     ERRORNOTREC: 'Toto používateľské meno / heslo nebolo rozpoznané'
   Boolean:
-    0: Nie
     ANY: Ktorýkoľvek
-    1: Áno
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   CMSLoadingScreen.ss:
     LOADING: 'Načíta sa ...'
     REQUIREJS: 'CMS vyžaduje, aby ste mali JavaScript zapnutý.'
@@ -70,6 +71,8 @@ sk:
     ACCESSALLINTERFACES: 'Pristup do všetkých častí CMS.'
     ACCESSALLINTERFACESHELP: 'Prepisuje viac špecifických  nastavení prístupu.'
     SAVE: Uložiť
+  CMSPageHistoryController_versions.ss:
+    PREVIEW: 'Website preview'
   CMSProfileController:
     MENUTITLE: 'Môj profil'
   ChangePasswordEmail.ss:
@@ -79,8 +82,8 @@ sk:
     HELLO: 'Dobrý deň'
     PASSWORD: Heslo
   CheckboxField:
-    - Nie
-    - Áno
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   ComplexTableField:
     CLOSEPOPUP: 'Zatvoriť okno'
     SUCCESSADD2: 'Pridané {name}'
@@ -109,20 +112,21 @@ sk:
     PLURALNAME: 'Datové objekty'
     SINGULARNAME: 'Dátový objekt'
   Date:
-    DAY: deň
-    DAYS: dni
-    HOUR: hodina
-    HOURS: hodiny
-    MIN: minúta
-    MINS: minúty
-    MONTH: mesiac
-    MONTHS: mesiace
-    SEC: sekunda
-    SECS: sekundy
+    DAY: day
+    DAYS: days
+    HOUR: hour
+    HOURS: hours
+    LessThanMinuteAgo: 'less than a minute'
+    MIN: min
+    MINS: mins
+    MONTH: month
+    MONTHS: months
+    SEC: sec
+    SECS: secs
     TIMEDIFFAGO: '{difference} pred'
     TIMEDIFFIN: 'v {difference}'
-    YEAR: rok
-    YEARS: roky
+    YEAR: year
+    YEARS: years
   DateField:
     NOTSET: nezadané
     TODAY: dnes
@@ -198,7 +202,8 @@ sk:
     TEXT2: 'odkaz na resetovanie hesla'
     TEXT3: pre
   Form:
-    FIELDISREQUIRED: '%s je požadované'
+    CSRF_FAILED_MESSAGE: 'There seems to have been a technical problem. Please click the back button, refresh your browser, and try again.'
+    FIELDISREQUIRED: '{name} is required'
     SubmitBtnLabel: Choď
     VALIDATIONCREDITNUMBER: 'Uistite sa, že ste zadali číslo {number} kreditnej karty správne'
     VALIDATIONNOTUNIQUE: 'Zadaná hodnota nie je unikátna'
@@ -208,6 +213,7 @@ sk:
     VALIDATOR: Validácia
     VALIDCURRENCY: 'Prosím zadajte platnú menu'
   FormField:
+    Example: 'e.g. %s'
     NONE: žiadne
   GridAction:
     DELETE_DESCRIPTION: Zmazať
@@ -230,6 +236,7 @@ sk:
     ResetFilter: Reset
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'Žiadne oprávnenia zmazať'
+    EditPermissionsFailure: 'No permission to unlink record'
   GridFieldDetailForm:
     CancelBtn: Zrušiť
     Create: Vytvoriť
@@ -237,7 +244,9 @@ sk:
     DeletePermissionsFailure: 'Žiadne oprávnenia zmazať'
     Deleted: 'Zmazané %s %s'
     Save: Uložiť
-    Saved: 'Uložené %s %s'
+    Saved: 'Saved {name} {link}'
+  GridFieldEditButton.ss:
+    EDIT: Edit
   GridFieldItemEditView.ss: null
   Group:
     AddRole: 'Pridať úlohu pre túto skupinu'
@@ -267,6 +276,7 @@ sk:
     ADDURL: 'Pridať URL'
     ADJUSTDETAILSDIMENSIONS: 'Detaily & rozmery'
     ANCHORVALUE: Odkaz
+    BUTTONADDURL: 'Add url'
     BUTTONINSERT: Vložiť
     BUTTONINSERTLINK: 'Vložiť odkaz'
     BUTTONREMOVELINK: 'Odstrániť odkaz'
@@ -293,7 +303,7 @@ sk:
     IMAGETITLE: 'Text titulky (tooltip) - pre doplňujúce informácie o obrázku'
     IMAGETITLETEXT: 'Text titulky (tooltip)'
     IMAGETITLETEXTDESC: 'Pre doplňujúce informácie o obrázku'
-    IMAGEWIDTHPX: Šírka
+    IMAGEWIDTHPX: 'Šírka'
     INSERTMEDIA: 'Vložiť média'
     LINK: 'Vložiť/upraviť odkaz na zvýraznený text'
     LINKANCHOR: 'Odkaz na tejto stranke'
@@ -331,6 +341,9 @@ sk:
     PreviewButton: Náhľad
     REORGANISATIONSUCCESSFUL: 'Strom webu bol reorganizovaný úspešne.'
     SAVEDUP: Uložené.
+    ShowAsList: 'show as list'
+    TooManyPages: 'Too many pages'
+    ValidationError: 'Validation error'
     VersionUnknown: neznáme
   LeftAndMain_Menu.ss:
     Hello: Ahoj
@@ -407,6 +420,7 @@ sk:
     TWODIGITMONTH: 'Dvojčíslie mesiaca (01=január, atď.)'
     TWODIGITSECOND: 'Dvojčíslie sekundy (00 až 59)'
     TWODIGITYEAR: 'Dvojčíslie roka'
+    Toggle: 'Show formatting help'
   MemberImportForm:
     Help1: 'Importovať členov v <em>CSV formáte</em> (čiarkov oddelené hodnoty). Zobraziť pokročile použitie'
     Help2: "<div class=\"advanced\">\\n<h4>Pokročilé použitie</h4>\\n<ul>\\n<li>Povolené stĺpce: <em>%s</em></li>\\n<li>Existujúci užívatelia sú porovnávaní ich unikátnou vlastnosťou <em>Code</em>, a aktualizovaní s novými hodnotami z\\nimportovaného súboru.</li>\\n<li>Skupiny môžu byťt priradené stĺpcom <em>Groups</em>. Skupiny sú identifikované ich vlastnosťou <em>Code</em>,\\nviacero skupín môže byť oddelené čiarkou. Existujúce členstvá skupiny nie sú smazané.</li>\\n</ul>\\n</div>"
@@ -421,7 +435,7 @@ sk:
   ModelAdmin:
     DELETE: Zmazať
     DELETEDRECORDS: 'Zmazaných {count} záznamov.'
-    EMPTYBEFOREIMPORT: 'Vyčistiť databázu pred importovaním'
+    EMPTYBEFOREIMPORT: 'Replace data'
     IMPORT: 'Importovať z CSV'
     IMPORTEDRECORDS: 'Importovaných {count} záznamov.'
     NOCSVFILE: 'Prosím vyhľadajte CSV súbor pre importovanie'
@@ -515,7 +529,20 @@ sk:
     BtnImport: Importovať
     FileFieldLabel: 'CSV súbor <small>(Povoléné koncovki súborov: *.csv)</small>'
   SilverStripeNavigator:
+    Auto: Auto
+    ChangeViewMode: 'Change view mode'
+    Desktop: Desktop
+    DualWindowView: 'Dual Window'
     Edit: Editovať
+    EditView: 'Edit mode'
+    Mobile: Mobile
+    PreviewState: 'Preview State'
+    PreviewView: 'Preview mode'
+    Responsive: Responsive
+    SplitView: 'Split mode'
+    Tablet: Tablet
+    ViewDeviceWidth: 'Select a preview width'
+    Width: width
   SimpleImageField:
     NOUPLOAD: 'Nebol nahraný žiaden obrázok'
   SiteTree:
@@ -551,6 +578,8 @@ sk:
     ATTACHFILE: 'Priložiť súbor'
     ATTACHFILES: 'Priložiť súbory'
     AttachFile: 'Priložiť súbor(y)'
+    CHOOSEANOTHERFILE: 'Choose another file'
+    CHOOSEANOTHERINFO: 'Replace this file with another one from the file store'
     DELETE: 'Zmazať zo súborov'
     DELETEINFO: 'Trvalo zmazať tento súbor z úložiska súborov'
     DOEDIT: Uložiť
@@ -565,12 +594,15 @@ sk:
     FROMFILES: 'Zo súborov'
     HOTLINKINFO: 'Info: Tento obrázok bude "hotlinkovaný". Uistete sa prosím, že máte oprávnenie od pôvodneho tvorcu webu, aby sa tak stalo.'
     MAXNUMBEROFFILES: 'Maximálny počet {count} súbor(ov) prekročený.'
+    MAXNUMBEROFFILESONE: 'Can only upload one file'
     MAXNUMBEROFFILESSHORT: 'Môžte nahrať iba {count} súborov'
+    OVERWRITEWARNING: 'File with the same name already exists'
     REMOVE: Odstrániť
     REMOVEERROR: 'Chyba odstránenia súboru'
     REMOVEINFO: 'Odstrániť tento súbor odtiaľ, ale nezmazať z úložiska súborov'
     STARTALL: 'Začni všetko'
     STARTALLINFO: 'Začni všetko nahrávať'
     Saved: Uložené
+    UPLOADSINTO: 'saves into /{path}'
   Versioned:
     has_many_Versions: verzie

lang/sl.yml

@@ -1,12 +1,13 @@
 sl:
   AssetAdmin:
-    ALLOWEDEXTS: 'Allowed extensions'
+    ALLOWEDEXTS: 'Podaljševanje je dovoljeno.'
     NEWFOLDER: 'Nova mapa'
+    SHOWALLOWEDEXTS: 'Show allowed extensions'
   AssetTableField:
     CREATED: 'Naloženo na začetku'
     DIM: Dimenzije
     FILENAME: 'Ime datoteke'
-    FOLDER: Folder
+    FOLDER: Mapa
     LASTEDIT: 'Zadnje naloženo'
     OWNER: Lastnik
     SIZE: Velikost
@@ -14,19 +15,19 @@ sl:
     TYPE: Tip
     URL: URL
   AssetUploadField:
-    ChooseFiles: 'Choose files'
-    DRAGFILESHERE: 'Drag files here'
+    ChooseFiles: 'Izberite datoteke'
+    DRAGFILESHERE: 'Potegnite datoteke na to mesto '
     DROPAREA: 'Drop Area'
-    EDITALL: 'Edit all'
-    EDITANDORGANIZE: 'Edit & organize'
-    EDITINFO: 'Edit files'
-    FILES: Files
-    FROMCOMPUTER: 'Choose files from your computer'
-    FROMCOMPUTERINFO: 'Upload from your computer'
-    TOTAL: Total
-    TOUPLOAD: 'Choose files to upload...'
-    UPLOADINPROGRESS: 'Please wait… upload in progress'
-    UPLOADOR: OR
+    EDITALL: 'Uredi vse'
+    EDITANDORGANIZE: 'Uredite in razvrščajte'
+    EDITINFO: 'Uredi datoteke'
+    FILES: Datoteke
+    FROMCOMPUTER: 'Izberite datoteke z vašega računalnika'
+    FROMCOMPUTERINFO: 'Prenesite z vašega računalnika'
+    TOTAL: Vse
+    TOUPLOAD: 'Izberite datoteke za prenos'
+    UPLOADINPROGRESS: 'Prosimo, počakajte ... prenos poteka.'
+    UPLOADOR: ALI
   BBCodeParser:
     ALIGNEMENT: Poravnava
     ALIGNEMENTEXAMPLE: 'desno poravnano'
@@ -53,25 +54,27 @@ sl:
     UNORDEREDDESCRIPTION: 'Neurejen seznam'
     UNORDEREDEXAMPLE1: 'alineja na neurejenem seznamu'
   BackLink_Button.ss:
-    Back: Back
+    Back: Nazaj
   BasicAuth:
     ENTERINFO: 'Vpišite uporabniško ime in geslo.'
     ERRORNOTADMIN: 'Uporabnik ni administrator tega spletnega mesta.'
     ERRORNOTREC: 'Ne prepoznam uporabniškega imena ali gesla'
   Boolean:
-    0: Ne
     ANY: Katerikoli
-    1: Da
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   CMSLoadingScreen.ss:
-    LOADING: Loading...
-    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
+    LOADING: 'Nalaganje ...'
+    REQUIREJS: 'CMS zahteva, da imate omogočen JavaScript.'
   CMSMain:
-    ACCESS: 'Access to ''{title}'' section'
+    ACCESS: 'Dostop do razdelka ''{title}'''
     ACCESSALLINTERFACES: 'Dostop do vseh sklopov CMS'
     ACCESSALLINTERFACESHELP: 'Omogoča bolj specifične nastavitve za možnosti dostop.'
     SAVE: Shrani
+  CMSPageHistoryController_versions.ss:
+    PREVIEW: 'Website preview'
   CMSProfileController:
-    MENUTITLE: 'My Profile'
+    MENUTITLE: 'Moj profil'
   ChangePasswordEmail.ss:
     CHANGEPASSWORDTEXT1: 'Geslo ste spremenili v'
     CHANGEPASSWORDTEXT2: 'Za prijavo lahko odslej uporabite naslednje podatke:'
@@ -79,24 +82,24 @@ sl:
     HELLO: 'Pozdravljeni,'
     PASSWORD: Geslo
   CheckboxField:
-    - Ne
-    - Da
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   ComplexTableField:
     CLOSEPOPUP: 'Zapri okno'
-    SUCCESSADD2: 'Added {name}'
+    SUCCESSADD2: 'Dodano {name}'
     SUCCESSEDIT: 'Shranjeno: %s %s %s'
   ComplexTableField.ss:
     ADDITEM: 'Dodaj %s'
-    NOITEMSFOUND: 'No items found'
+    NOITEMSFOUND: 'Ni najdenih predmetov.'
     SORTASC: 'Razvrsti naraščajoče'
     SORTDESC: 'Razvrsti padajoče'
   ComplexTableField_popup.ss:
     NEXT: Naprej
     PREVIOUS: Nazaj
   ConfirmedPasswordField:
-    ATLEAST: 'Passwords must be at least {min} characters long.'
-    BETWEEN: 'Passwords must be {min} to {max} characters long.'
-    MAXIMUM: 'Passwords must be at most {max} characters long.'
+    ATLEAST: 'Geslo mora vsebovati vsaj {min} znakov.'
+    BETWEEN: 'Geslo mora biti dolgo od {min} do {max} znakov.'
+    MAXIMUM: 'Geslo je lahko dolgo največ {max} znakov.'
     SHOWONCLICKTITLE: 'Spremeni geslo'
   CreditCardField:
     FIRST: prvič
@@ -109,191 +112,198 @@ sl:
     PLURALNAME: 'Podatkovni objekti'
     SINGULARNAME: 'Podatkovni objekt'
   Date:
-    DAY: dan
-    DAYS: dni
-    HOUR: ura
-    HOURS: ure
+    DAY: day
+    DAYS: days
+    HOUR: hour
+    HOURS: hours
+    LessThanMinuteAgo: 'less than a minute'
     MIN: min
-    MINS: minute
-    MONTH: mesec
-    MONTHS: meseci
-    SEC: s
-    SECS: s
+    MINS: mins
+    MONTH: month
+    MONTHS: months
+    SEC: sec
+    SECS: secs
     TIMEDIFFAGO: '{difference} ago'
     TIMEDIFFIN: 'in {difference}'
-    YEAR: leto
-    YEARS: let
+    YEAR: year
+    YEARS: years
   DateField:
     NOTSET: 'ni nastavljeno'
     TODAY: danes
-    VALIDDATEFORMAT2: 'Please enter a valid date format ({format})'
+    VALIDDATEFORMAT2: 'Prosim, vnesite ustrezno obliko datuma ({format})'
     VALIDDATEMAXDATE: 'Your date has to be older or matching the maximum allowed date ({date})'
     VALIDDATEMINDATE: 'Your date has to be newer or matching the minimum allowed date ({date})'
   DatetimeField:
-    NOTSET: 'Not set'
+    NOTSET: 'Ni nastavljeno'
   Director:
-    INVALID_REQUEST: 'Invalid request'
+    INVALID_REQUEST: 'Napačna zahteva'
   DropdownField:
     CHOOSE: (Izberi)
   EmailField:
-    VALIDATION: 'Please enter an email address'
+    VALIDATION: 'Prosim, vpišite e-naslov.'
   Email_BounceRecord:
     PLURALNAME: 'Seznam zavrnjenih e-sporočil'
     SINGULARNAME: 'Zavrnjeno e-sporočilo'
   Enum:
     ANY: Katerikoli
   File:
-    AviType: 'AVI video file'
+    AviType: 'AVI video datoteka'
     Content: Vsebina
-    CssType: 'CSS file'
+    CssType: 'CSS datoteka'
     DmgType: 'Apple disk image'
-    DocType: 'Word document'
+    DocType: 'Word datoteka'
     Filename: 'Ime datoteke'
-    GifType: 'GIF image - good for diagrams'
+    GifType: 'GIF slika - primerna za diagrame'
     GzType: 'GZIP compressed file'
-    HtlType: 'HTML file'
-    HtmlType: 'HTML file'
-    INVALIDEXTENSION: 'Extension is not allowed (valid: {extensions})'
-    INVALIDEXTENSIONSHORT: 'Extension is not allowed'
-    IcoType: 'Icon image'
-    JpgType: 'JPEG image - good for photos'
-    JsType: 'Javascript file'
-    Mp3Type: 'MP3 audio file'
-    MpgType: 'MPEG video file'
+    HtlType: 'HTML datoteka'
+    HtmlType: 'HTML datoteka'
+    INVALIDEXTENSION: 'Podaljševanje ni dovoljeno (dovoljeno: {extensions})'
+    INVALIDEXTENSIONSHORT: 'Podaljševanje ni dovoljeno.'
+    IcoType: Ikona
+    JpgType: 'JPEG slika - primerno za fotografije'
+    JsType: 'Javascript datoteka'
+    Mp3Type: 'MP3 avdio datoteka'
+    MpgType: 'MPEG video datoteka'
     NOFILESIZE: 'Velikost datoteke je 0 bajtov.'
     NOVALIDUPLOAD: 'Datoteke ni možno naložiti.'
     Name: Ime
     PLURALNAME: Datoteke
-    PdfType: 'Adobe Acrobat PDF file'
-    PngType: 'PNG image - good general-purpose format'
+    PdfType: 'Adobe Acrobat PDF datoteka'
+    PngType: 'PNG slika - večstransko uporabna oblika'
     SINGULARNAME: Datoteka
-    TOOLARGE: 'Filesize is too large, maximum {size} allowed'
-    TOOLARGESHORT: 'Filesize exceeds {size}'
+    TOOLARGE: 'Datoteka je prevelika. Največja dovoljena velikost je {size} '
+    TOOLARGESHORT: 'Velikost datoteke presega {size}'
     TiffType: 'Tagged image format'
     Title: Naslov
-    WavType: 'WAV audo file'
-    XlsType: 'Excel spreadsheet'
-    ZipType: 'ZIP compressed file'
+    WavType: 'WAV avdio datoteka'
+    XlsType: 'Excel preglednica'
+    ZipType: 'ZIP stisnjena datoteka'
   FileIFrameField:
-    ATTACH: 'Attach {type}'
+    ATTACH: 'Pripni {type}'
     ATTACHONCESAVED: '{type}s can be attached once you have saved the record for the first time.'
     ATTACHONCESAVED2: 'Files can be attached once you have saved the record for the first time.'
-    DELETE: 'Delete {type}'
-    DISALLOWEDFILETYPE: 'This filetype is not allowed to be uploaded'
+    DELETE: 'Izbriši {type}'
+    DISALLOWEDFILETYPE: 'Datoteke v tem formatu ni mogoče naložiti'
     FILE: Datoteka
     FROMCOMPUTER: 'Z vašega računalnika'
     FROMFILESTORE: 'Iz knjižnice datotek'
     NOSOURCE: 'Izberite datoteko, ki jo boste pripeli.'
-    REPLACE: 'Replace {type}'
+    REPLACE: 'Nadomesti {type}'
   FileIFrameField_iframe.ss:
     TITLE: 'Image Uploading Iframe'
   Filesystem:
     SYNCRESULTS: 'Sync complete: {createdcount} items created, {deletedcount} items deleted'
   Folder:
-    PLURALNAME: Folders
-    SINGULARNAME: Folder
+    PLURALNAME: Mape
+    SINGULARNAME: Mapa
   ForgotPasswordEmail.ss:
     HELLO: 'Pozdravljeni,'
     TEXT1: 'Tukaj je vaša'
     TEXT2: 'povezava za ponastavitev gesla'
     TEXT3: za
   Form:
-    FIELDISREQUIRED: 'Vpišite %s (obvezen podatek).'
-    SubmitBtnLabel: Go
-    VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
+    CSRF_FAILED_MESSAGE: 'There seems to have been a technical problem. Please click the back button, refresh your browser, and try again.'
+    FIELDISREQUIRED: '{name} is required'
+    SubmitBtnLabel: Naprej
+    VALIDATIONCREDITNUMBER: 'Prosim, preverite, da ste vnesli številko kreditne kartice {number} pravilno.'
     VALIDATIONNOTUNIQUE: 'Vpisana vrednost ni unikatna'
     VALIDATIONPASSWORDSDONTMATCH: 'Vpisani gesli se ne ujemata'
     VALIDATIONPASSWORDSNOTEMPTY: 'Vpišite geslo (dvakrat) v za to predvideni polji'
-    VALIDATIONSTRONGPASSWORD: 'Passwords must have at least one digit and one alphanumeric character'
+    VALIDATIONSTRONGPASSWORD: 'Geslo naj vsebuje vsaj eno črko in vsaj eno številko.'
     VALIDATOR: Preverjanje
-    VALIDCURRENCY: 'Please enter a valid currency'
+    VALIDCURRENCY: 'Prosim, vnesite pravo valuto.'
   FormField:
+    Example: 'e.g. %s'
     NONE: brez
   GridAction:
-    DELETE_DESCRIPTION: Delete
-    Delete: Delete
-    UnlinkRelation: Unlink
+    DELETE_DESCRIPTION: Izbriši
+    Delete: Izbriši
+    UnlinkRelation: 'Odstrani povezavo'
   GridField:
-    Add: 'Add {name}'
+    Add: 'Dodaj {name}'
     Filter: Filter
     FilterBy: 'Filter by '
-    Find: Find
+    Find: Poišči
     LEVELUP: 'Level up'
-    LinkExisting: 'Link Existing'
+    LinkExisting: 'Poveži na'
     NewRecord: 'New %s'
     NoItemsFound: 'No items found'
     PRINTEDAT: 'Printed at'
     PRINTEDBY: 'Printed by'
-    PlaceHolder: 'Find {type}'
-    PlaceHolderWithLabels: 'Find {type} by {name}'
+    PlaceHolder: 'Poišči {type} '
+    PlaceHolderWithLabels: 'Poišči {type} glede na {name}'
     RelationSearch: 'Relation search'
-    ResetFilter: Reset
+    ResetFilter: Ponastavi
   GridFieldAction_Delete:
-    DeletePermissionsFailure: 'No delete permissions'
+    DeletePermissionsFailure: 'Ni dovoljenja za brisanje'
+    EditPermissionsFailure: 'No permission to unlink record'
   GridFieldDetailForm:
-    CancelBtn: Cancel
-    Create: Create
-    Delete: Delete
-    DeletePermissionsFailure: 'No delete permissions'
+    CancelBtn: Prekliči
+    Create: Ustvari
+    Delete: Izbriši
+    DeletePermissionsFailure: 'Ni dovoljenja za brisanje'
     Deleted: 'Deleted %s %s'
-    Save: Save
-    Saved: 'Saved %s %s'
+    Save: Shrani
+    Saved: 'Saved {name} {link}'
+  GridFieldEditButton.ss:
+    EDIT: Edit
   GridFieldItemEditView.ss: null
   Group:
-    AddRole: 'Add a role for this group'
+    AddRole: 'Dodaj vlogo za to skupino.'
     Code: 'Koda skupine'
     DefaultGroupTitleAdministrators: Administratorji
     DefaultGroupTitleContentAuthors: 'Avtorji vsebine'
     Description: Opis
-    GroupReminder: 'If you choose a parent group, this group will take all it''s roles'
+    GroupReminder: 'Če izberete nadrejeno skupino, bo ta skupina prevzela vse vloge nadrejene skupine.'
     Locked: 'Zaklenjeno za urejanje?'
-    NoRoles: 'No roles found'
-    PLURALNAME: Groups
+    NoRoles: Vloge
+    PLURALNAME: Skupine
     Parent: 'Nadrejena skupina'
     RolesAddEditLink: 'Dodaj in uredi vloge'
-    SINGULARNAME: Group
+    SINGULARNAME: Skupina
     Sort: 'Način razvrščanja'
     has_many_Permissions: Dovoljenja
     many_many_Members: Uporabniki
   GroupImportForm:
     Help1: '<p>Uvozi eno ali več skupin v formatu <em>CSV</ em> (comma-separated values). <small> <a href="#" class="toggle-advanced">Prikaži možnosti za napredno urejanje</ a> </ small> </ p>'
     Help2: '<div class="advanced">	<h4>Advanced usage</h4>	<ul>	<li>Allowed columns: <em>%s</em></li>	<li>Existing groups are matched by their unique <em>Code</em> value, and updated with any new values from the 	imported file</li>	<li>Group hierarchies can be created by using a <em>ParentCode</em> column.</li>	<li>Permission codes can be assigned by the <em>PermissionCode</em> column. Existing permission codes are not	cleared.</li>	</ul></div>'
-    ResultCreated: 'Created {count} groups'
+    ResultCreated: 'Ustvarjenih je {count} skupin'
     ResultDeleted: 'Število izbrisanih skupin %d'
     ResultUpdated: 'Število ponastavljenih skupin %d'
   Hierarchy:
     InfiniteLoopNotAllowed: 'Infinite loop found within the "{type}" hierarchy. Please change the parent to resolve this'
   HtmlEditorField:
-    ADDURL: 'Add URL'
+    ADDURL: 'Dodaj URL'
     ADJUSTDETAILSDIMENSIONS: 'Details &amp; dimensions'
     ANCHORVALUE: Sidro
-    BUTTONINSERT: Insert
+    BUTTONADDURL: 'Add url'
+    BUTTONINSERT: Vstavi
     BUTTONINSERTLINK: 'Vstavi povezavo'
     BUTTONREMOVELINK: 'Odstrani povezavo'
-    BUTTONUpdate: Update
+    BUTTONUpdate: Osveži
     CAPTIONTEXT: Pripis
     CSSCLASS: 'Poravnava in slog'
     CSSCLASSCENTER: 'Na sredini, samostojno'
     CSSCLASSLEFT: 'Levo, z oblivajočim besedilom'
     CSSCLASSLEFTALONE: 'Na levi, samostojno.'
     CSSCLASSRIGHT: 'Desno, z oblivajočim besedilom'
-    DETAILS: Details
+    DETAILS: Podrobno
     EMAIL: E-naslov
     FILE: Datoteka
     FOLDER: Mapa
     FROMCMS: 'From the CMS'
-    FROMCOMPUTER: 'From your computer'
-    FROMWEB: 'From the web'
-    FindInFolder: 'Find in Folder'
-    IMAGEALT: 'Alternative text (alt)'
+    FROMCOMPUTER: 'Z vašega računalnika'
+    FROMWEB: 'S spleta'
+    FindInFolder: 'Poišči v mapi'
+    IMAGEALT: 'Nadomestno besedilo (alt)'
     IMAGEALTTEXT: 'Nadomestno besedilo (alt) bo izpisano, kadar slike ne bo možno prikazati'
-    IMAGEALTTEXTDESC: 'Shown to screen readers or if image can not be displayed'
+    IMAGEALTTEXTDESC: 'Prikaz na bralnikih ali če se slika ne more prikazati'
     IMAGEDIMENSIONS: Velikosti
     IMAGEHEIGHTPX: Višina
     IMAGETITLE: 'Naslov (tooltip)  bo izpisan kot dopolnitev k vsebini slike'
-    IMAGETITLETEXT: 'Title text (tooltip)'
-    IMAGETITLETEXTDESC: 'For additional information about the image'
-    IMAGEWIDTHPX: Širina
+    IMAGETITLETEXT: 'Naslov (tooltip)'
+    IMAGETITLETEXTDESC: 'Za dodatne informacije o sliki'
+    IMAGEWIDTHPX: 'Širina'
     INSERTMEDIA: 'Insert Media'
     LINK: Povezava
     LINKANCHOR: 'Sidro na tej strani'
@@ -309,50 +319,53 @@ sl:
     URLNOTANOEMBEDRESOURCE: 'The URL ''{url}'' could not be turned into a media resource.'
     UpdateMEDIA: 'Update Media'
   Image:
-    PLURALNAME: Files
-    SINGULARNAME: File
+    PLURALNAME: Datoteke
+    SINGULARNAME: Datoteka
   ImageField:
     IMAGE: Slika
   Image_Cached:
-    PLURALNAME: Files
-    SINGULARNAME: File
+    PLURALNAME: Datoteke
+    SINGULARNAME: Datoteka
   Image_iframe.ss:
     TITLE: 'Slika "uploading iframe"'
   LeftAndMain:
-    CANT_REORGANISE: 'You do not have permission to alter Top level pages. Your change was not saved.'
-    DELETED: Deleted.
-    DropdownBatchActionsDefault: Actions
+    CANT_REORGANISE: 'Nimate dovoljenja za menjavo strani v zgornjem nivoju. Sprememba ni shranjena.'
+    DELETED: Izbrisano.
+    DropdownBatchActionsDefault: Dejanja
     HELP: Pomoč
     PAGETYPE: 'Tip strani:'
     PERMAGAIN: 'Odjavili ste se iz CMS-vmesnika. Če se želite ponovno prijaviti, vpišite uporabniško ime in geslo.'
     PERMALREADY: 'Do tega dela CMS-vmesnika nimate dostopa. Če se želite vpisati z drugim uporabniškim imenom, lahko to storite spodaj'
     PERMDEFAULT: 'Izberite način avtentikacije in vpišite svoje podatke za dostop do CMS-vmesnika.'
     PLEASESAVE: 'Shranite stran: te strani ne morete posodobiti, ker še ni bila shranjena.'
-    PreviewButton: Preview
-    REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
-    SAVEDUP: Saved.
-    VersionUnknown: unknown
+    PreviewButton: Predogled
+    REORGANISATIONSUCCESSFUL: 'Struktura spletnega mesta je bila uspešno spremenjena.'
+    SAVEDUP: Shranjeno.
+    ShowAsList: 'show as list'
+    TooManyPages: 'Too many pages'
+    ValidationError: 'Validation error'
+    VersionUnknown: Unknown
   LeftAndMain_Menu.ss:
-    Hello: Hi
-    LOGOUT: 'Log out'
+    Hello: 'Pozdravljeni,'
+    LOGOUT: Odjava
   LoginAttempt:
     Email: E-naslov
     IP: IP-naslov
-    PLURALNAME: 'Login Attempts'
-    SINGULARNAME: 'Login Attempt'
+    PLURALNAME: 'Poskusi prijave'
+    SINGULARNAME: 'Poskus prijave'
     Status: Stanje
   Member:
-    ADDGROUP: 'Add group'
+    ADDGROUP: 'Dodaj skupino'
     BUTTONCHANGEPASSWORD: 'Spremeni geslo'
     BUTTONLOGIN: Prijava
     BUTTONLOGINOTHER: 'Prijavite se z drugim uporabniškim imenom'
     BUTTONLOSTPASSWORD: 'Pozabil-a sem geslo'
-    CANTEDIT: 'You don''t have permission to do that'
+    CANTEDIT: 'Nimate dovoljenja za to dejanje'
     CONFIRMNEWPASSWORD: 'Potrdi novo geslo'
     CONFIRMPASSWORD: 'Potrdi geslo'
     DATEFORMAT: 'Date format'
     DefaultAdminFirstname: 'Privzeti administrator'
-    DefaultDateTime: default
+    DefaultDateTime: privzeto
     EMAIL: E-naslov
     EMPTYNEWPASSWORD: 'Polje za vpis novega gesla ne sme ostati prazno. Poskusite ponovno.'
     ENTEREMAIL: 'Vpišite e-naslov, na katerega vam bomo nato poslali povezavo za ponastavitev gesla.'
@@ -362,8 +375,8 @@ sl:
     ERRORWRONGCRED: 'Izgleda, kakor da se uporabniško ime in geslo ne ujemata. Poskusite se ponovno prijaviti.'
     FIRSTNAME: Ime
     INTERFACELANG: Jezik
-    INVALIDNEWPASSWORD: 'We couldn''t accept that password: {password}'
-    LOGGEDINAS: 'You''re logged in as {name}.'
+    INVALIDNEWPASSWORD: 'Tega gesla ne moremo sprejeti: {password}'
+    LOGGEDINAS: 'Vpisan(a) si kot: {name}.'
     NEWPASSWORD: 'Novo geslo'
     PASSWORD: Geslo
     PLURALNAME: Uporabniki
@@ -375,7 +388,7 @@ sl:
     TIMEFORMAT: 'Time format'
     VALIDATIONMEMBEREXISTS: 'Uporabnik s tem %s že obstaja'
     ValidationIdentifierFailed: 'Can''t overwrite existing member #{id} with identical identifier ({name} = {value}))'
-    WELCOMEBACK: 'Welcome Back, {firstname}'
+    WELCOMEBACK: 'Ponovno pozdravljeni, {firstname}'
     YOUROLDPASSWORD: 'Staro geslo'
     belongs_many_many_Groups: Skupine
     db_LastVisited: 'Datum zadnjega obiska'
@@ -387,46 +400,47 @@ sl:
   MemberAuthenticator:
     TITLE: 'Uporabniški račun'
   MemberDatetimeOptionsetField:
-    AMORPM: 'AM (Ante meridiem) or PM (Post meridiem)'
+    AMORPM: 'AM (zjutraj in dopoldan) ali PM (popoldan in zvečer)'
     'APPLY FILTER': 'Apply Filter'
-    Custom: Custom
-    DATEFORMATBAD: 'Date format is invalid'
-    DAYNOLEADING: 'Day of month without leading zero'
-    DIGITSDECFRACTIONSECOND: 'One or more digits representing a decimal fraction of a second'
-    FOURDIGITYEAR: 'Four-digit year'
-    FULLNAMEMONTH: 'Full name of month (e.g. June)'
-    HOURNOLEADING: 'Hour without leading zero'
-    MINUTENOLEADING: 'Minute without leading zero'
-    MONTHNOLEADING: 'Month digit without leading zero'
-    Preview: Preview
-    SHORTMONTH: 'Short name of month (e.g. Jun)'
+    Custom: Prilagojeno
+    DATEFORMATBAD: 'Zapis datuma je napačen'
+    DAYNOLEADING: 'Dan v mesecu brez zapisa sprednje ničle'
+    DIGITSDECFRACTIONSECOND: 'Ena ali več decimalk, ki predstavljajo sekunde'
+    FOURDIGITYEAR: 'Štirimesten zapis letnice'
+    FULLNAMEMONTH: 'Celoten zapis meseca (npr: junij)'
+    HOURNOLEADING: 'Ura brez zapisa sprednje ničle'
+    MINUTENOLEADING: 'Minute brez zapisa sprednje ničle'
+    MONTHNOLEADING: 'Mesec brez zapisa sprednje ničle'
+    Preview: Predogled
+    SHORTMONTH: 'Kratek zapis meseca (npr. Jun)'
     TOGGLEHELP: 'Toggle formatting help'
-    TWODIGITDAY: 'Two-digit day of month'
-    TWODIGITHOUR: 'Two digits of hour (00 through 23)'
-    TWODIGITMINUTE: 'Two digits of minute (00 through 59)'
-    TWODIGITMONTH: 'Two-digit month (01=January, etc.)'
-    TWODIGITSECOND: 'Two digits of second (00 through 59)'
-    TWODIGITYEAR: 'Two-digit year'
+    TWODIGITDAY: 'Dvomestno število za mesec'
+    TWODIGITHOUR: 'Dvomestno število za uro (od 00 do 23)'
+    TWODIGITMINUTE: 'Dvomestno število za minute (od 00 do 59)'
+    TWODIGITMONTH: 'Dvomesten zapis meseca (01 = Januar)'
+    TWODIGITSECOND: 'Dvomesten zapis sekund (od 00 do 59)'
+    TWODIGITYEAR: 'Dvomestno število za letnico'
+    Toggle: 'Show formatting help'
   MemberImportForm:
     Help1: '<p>Uvoz uporabnikov v <em>formatu CSV</em> (comma-separated values). <small><a href="#" class="toggle-advanced">Prikaži možnosti za napredno urejanje.</a></small></p>'
     Help2: '<div class="advanced">	<h4>Advanced usage</h4>	<ul>	<li>Allowed columns: <em>%s</em></li>	<li>Existing users are matched by their unique <em>Code</em> property, and updated with any new values from	the imported file.</li>	<li>Groups can be assigned by the <em>Groups</em> column. Groups are identified by their <em>Code</em> property,	multiple groups can be separated by comma. Existing group memberships are not cleared.</li>	</ul></div>'
-    ResultCreated: 'Created {count} members'
+    ResultCreated: 'Ustvarjenih {count} članov'
     ResultDeleted: 'Število izbrisanih uporabnikov: %d'
     ResultNone: 'Ni sprememb'
-    ResultUpdated: 'Updated {count} members'
+    ResultUpdated: 'Posodobljenih {count} članov'
   MemberPassword:
-    PLURALNAME: 'Member Passwords'
-    SINGULARNAME: 'Member Password'
+    PLURALNAME: 'Gesla uporabnika'
+    SINGULARNAME: 'Geslo uporabnika'
   MemberTableField: null
   ModelAdmin:
     DELETE: Izbriši
     DELETEDRECORDS: 'Deleted {count} records.'
-    EMPTYBEFOREIMPORT: 'Clear Database before import'
+    EMPTYBEFOREIMPORT: 'Replace data'
     IMPORT: 'Uvozi CSV-datoteko'
     IMPORTEDRECORDS: 'Imported {count} records.'
     NOCSVFILE: 'Poiščite CSV-datoteko za uvoz'
     NOIMPORT: 'Ne najdem ničesar za uvoz'
-    RESET: Reset
+    RESET: Ponastavi
     Title: 'Data Models'
     UPDATEDRECORDS: 'Updated {count} records.'
   ModelAdmin_ImportSpec.ss:
@@ -436,37 +450,37 @@ sl:
     IMPORTSPECTITLE: 'Specification for %s'
   ModelAdmin_Tools.ss:
     FILTER: Filter
-    IMPORT: Import
+    IMPORT: Uvozi
   ModelSidebar.ss:
-    IMPORT_TAB_HEADER: Import
-    SEARCHLISTINGS: Search
+    IMPORT_TAB_HEADER: Uvozi
+    SEARCHLISTINGS: Išči
   MoneyField:
     FIELDLABELAMOUNT: Znesek
     FIELDLABELCURRENCY: Valuta
   NullableField:
     IsNullLabel: 'Prazno polje'
   NumericField:
-    VALIDATION: '''{value}'' is not a number, only numbers can be accepted for this field'
+    VALIDATION: '''{value}'' ni številka. V to polje lahko vnesete samo številke.'
   Pagination:
-    Page: Page
-    View: View
+    Page: Stran
+    View: Poglej
   Permission:
     AdminGroup: Administrator
     CMS_ACCESS_CATEGORY: 'Dostop do CMS-vmesnika'
     FULLADMINRIGHTS: 'Popolne administratorske pravice'
     FULLADMINRIGHTS_HELP: 'Lahko izniči oziroma upravlja z vsemi drugimi dovoljenji.'
-    PLURALNAME: Permissions
-    SINGULARNAME: Permission
+    PLURALNAME: Dovoljenja
+    SINGULARNAME: Dovoljenje
   PermissionCheckboxSetField:
     AssignedTo: 'assigned to "{title}"'
-    FromGroup: 'inherited from group "{title}"'
+    FromGroup: 'Privzeto iz skupine "{title}"'
     FromRole: 'inherited from role "{title}"'
     FromRoleOnGroup: 'podedovano iz vloge "%s" na skupino "%s"'
   PermissionRole:
     OnlyAdminCanApply: 'Only admin can apply'
-    PLURALNAME: Roles
-    SINGULARNAME: Role
-    Title: Title
+    PLURALNAME: Vloge
+    SINGULARNAME: Vloga
+    Title: Naslov
   PermissionRoleCode:
     PLURALNAME: 'Permission Role Cods'
     SINGULARNAME: 'Permission Role Code'
@@ -477,8 +491,8 @@ sl:
     VALIDATION: 'Vpišite veljavno telefonsko številko'
   RelationComplexTableField.ss:
     ADD: Dodaj
-    CSVEXPORT: 'Export to CSV'
-    NOTFOUND: 'No items found'
+    CSVEXPORT: 'Izvozi kot CSV-datoteko'
+    NOTFOUND: 'Ni najdenih predmetov.'
   Security:
     ALREADYLOGGEDIN: 'Nimate dovoljenja za dostop do te strani. Če imate uporabniško ime z večimi pravicami, se lahko <a href="%s">ponovno prijavite</a>.'
     BUTTONSEND: 'Pošlji povezavo za ponastavitev gesla'
@@ -489,10 +503,10 @@ sl:
     LOGGEDOUT: 'Vaša prijava je bila prekinjena. Če se želite ponovno prijaviti, vpišite svoje podatke.'
     LOGIN: Prijava
     NOTEPAGESECURED: 'Stran je zaščitena. Da bi lahko nadaljevali, vpišite svoje podatke.'
-    NOTERESETLINKINVALID: '<p>The password reset link is invalid or expired.</p><p>You can request a new one <a href="{link1}">here</a> or change your password after you <a href="{link2}">logged in</a>.</p>'
+    NOTERESETLINKINVALID: '<p>Povezava za ponastavitev gesla je napačna ali pa je njena veljavnost potekla.</p><p><a href="{link1}">Tukaj</a> lahko zaprosite za novo povezavo or pa zamenjate geslo, ko  <a href="{link2}">se prijavite v sistem</a>.</p>'
     NOTERESETPASSWORD: 'Vpišite e-naslov, na katerega vam bomo poslali povezavo za ponastavitev gesla'
-    PASSWORDSENTHEADER: 'Password reset link sent to ''{email}'''
-    PASSWORDSENTTEXT: 'Thank you! A reset link has been sent to ''{email}'', provided an account exists for this email address.'
+    PASSWORDSENTHEADER: 'Povezava za ponastavitev gesla je bila poslana na e-naslov ''{email}''.'
+    PASSWORDSENTTEXT: 'Hvala! Povezava za ponastavitev gesla je bila poslana na e-naslov ''{email}'', ki je naveden kot e-naslov vašega računa. '
   SecurityAdmin:
     ACCESS_HELP: 'Dovoli ogled, dodajanje in urejanje uporabnikov ter dodeljevanje dovoljenj in vlog zanje.'
     APPLY_ROLES: 'Skupinam pripiši vloge'
@@ -500,22 +514,35 @@ sl:
     EDITPERMISSIONS: 'Upravljanje dovoljenj za skupine'
     EDITPERMISSIONS_HELP: 'Možnost upravljanja z dovoljenji in IP-naslovi skupin. Potrebujete dovoljenje za dostop do sklopa "Varnost".'
     GROUPNAME: 'Ime skupine'
-    IMPORTGROUPS: 'Import groups'
-    IMPORTUSERS: 'Import users'
+    IMPORTGROUPS: 'Uvozi skupine'
+    IMPORTUSERS: 'Uvozi uporabnike'
     MEMBERS: Člani
-    MENUTITLE: Security
+    MENUTITLE: Varnost
     MemberListCaution: 'Pozor! Če boste odstranili uporabnike s tega seznama, jih boste hkrati odstranili iz vseh drugih skupin in izbrisali iz podatkovne zbirke.'
     NEWGROUP: 'Nova Skupina'
     PERMISSIONS: Dovoljenja
     ROLES: Vloge
     ROLESDESCRIPTION: 'Tukaj lahko skupini dodajate vloge. Vloge so logični sklopi dovoljenj, ki jih urejate v zavihku "Vloge".'
     TABROLES: Vloge
-    Users: Users
+    Users: Uporabniki
   SecurityAdmin_MemberImportForm:
     BtnImport: Uvozi
     FileFieldLabel: 'CSV-datoteka <small>(Samo končnica: *.csv)</small>'
   SilverStripeNavigator:
-    Edit: Edit
+    Auto: Auto
+    ChangeViewMode: 'Change view mode'
+    Desktop: Desktop
+    DualWindowView: 'Dual Window'
+    Edit: Uredi
+    EditView: 'Edit mode'
+    Mobile: Mobile
+    PreviewState: 'Preview State'
+    PreviewView: 'Preview mode'
+    Responsive: Responsive
+    SplitView: 'Split mode'
+    Tablet: Tablet
+    ViewDeviceWidth: 'Select a preview width'
+    Width: width
   SimpleImageField:
     NOUPLOAD: 'Slika ni naložena'
   SiteTree:
@@ -528,49 +555,54 @@ sl:
   TableListField:
     CSVEXPORT: 'Izvozi kot CSV-datoteko'
     PRINT: Natisni
-    Print: Print
+    Print: Natisni
     SELECT: 'Izberi:'
   TableListField.ss:
-    NOITEMSFOUND: 'No items found'
+    NOITEMSFOUND: 'Ni najdenih predmetov.'
     SORTASC: 'Razvrsti naraščajoče'
     SORTDESC: 'Razvrsti padajoče'
   TableListField_PageControls.ss:
-    DISPLAYING: Displaying
-    OF: of
-    TO: to
+    DISPLAYING: Prikaz
+    OF: od
+    TO: za
     VIEWFIRST: 'Na začetek'
     VIEWLAST: 'Na konec'
     VIEWNEXT: Naslednja
     VIEWPREVIOUS: Prejšnja
   TimeField:
-    VALIDATEFORMAT: 'Please enter a valid time format ({format})'
+    VALIDATEFORMAT: 'Prosim, vnesite čas v ustrezni obliki ({format})'
   ToggleField:
     LESS: manj
     MORE: več
   UploadField:
-    ATTACHFILE: 'Attach a file'
-    ATTACHFILES: 'Attach files'
-    AttachFile: 'Attach file(s)'
-    DELETE: 'Delete from files'
-    DELETEINFO: 'Permanently delete this file from the file store'
-    DOEDIT: Save
-    DROPFILE: 'drop a file'
-    DROPFILES: 'drop files'
-    Dimensions: Dimensions
-    EDIT: Edit
-    EDITINFO: 'Edit this file'
-    FIELDNOTSET: 'File information not found'
-    FROMCOMPUTER: 'From your computer'
-    FROMCOMPUTERINFO: 'Select from files'
-    FROMFILES: 'From files'
-    HOTLINKINFO: 'Info: This image will be hotlinked. Please ensure you have permissions from the original site creator to do so.'
-    MAXNUMBEROFFILES: 'Max number of {count} file(s) exceeded.'
-    MAXNUMBEROFFILESSHORT: 'Can only upload {count} files'
-    REMOVE: Remove
-    REMOVEERROR: 'Error removing file'
-    REMOVEINFO: 'Remove this file from here, but do not delete it from the file store'
+    ATTACHFILE: 'Pripni datoteko'
+    ATTACHFILES: 'Pripni datoteke'
+    AttachFile: 'Pripni datoteke'
+    CHOOSEANOTHERFILE: 'Choose another file'
+    CHOOSEANOTHERINFO: 'Replace this file with another one from the file store'
+    DELETE: 'Izbriši iz zbirke naloženih datotek'
+    DELETEINFO: 'Dokončno izbriši datoteko iz knjižnjice datotek'
+    DOEDIT: Shrani
+    DROPFILE: 'Spusti datoteko'
+    DROPFILES: 'Spusti datoteko'
+    Dimensions: Dimenzije
+    EDIT: Uredi
+    EDITINFO: 'Uredi datoteko'
+    FIELDNOTSET: 'Pred uvozom počisti bazo podatkov'
+    FROMCOMPUTER: 'Z vašega računalnika'
+    FROMCOMPUTERINFO: 'Izberite iz zbirke naloženih datotek'
+    FROMFILES: 'Iz zbirke naloženih datotek'
+    HOTLINKINFO: 'Info: Ta slika bo dostopna prek povezave. Prosim, preverite, da imate dovoljenje avtorja za tako uporabo.'
+    MAXNUMBEROFFILES: 'Doseženo je največje možno število datotek: {count}'
+    MAXNUMBEROFFILESONE: 'Can only upload one file'
+    MAXNUMBEROFFILESSHORT: 'Naložite lahko največ {count} datotek'
+    OVERWRITEWARNING: 'File with the same name already exists'
+    REMOVE: Odstrani
+    REMOVEERROR: 'Napaka pri brisanju datoteke'
+    REMOVEINFO: 'Odstrani datoteko, vendar je ne izbriši iz knjižnjice datotek'
     STARTALL: 'Start all'
     STARTALLINFO: 'Start all uploads'
-    Saved: Saved
+    Saved: Shranjeno
+    UPLOADSINTO: 'saves into /{path}'
   Versioned:
     has_many_Versions: Verzije

lang/sr.yml

@@ -2,6 +2,7 @@ sr:
   AssetAdmin:
     ALLOWEDEXTS: 'Allowed extensions'
     NEWFOLDER: 'Нова фасцикла'
+    SHOWALLOWEDEXTS: 'Show allowed extensions'
   AssetTableField:
     CREATED: 'Прво достављено'
     DIM: Димензије
@@ -59,9 +60,9 @@ sr:
     ERRORNOTADMIN: 'Овај корисник није администратор.'
     ERRORNOTREC: 'То корисничко име / лозинка није препознато'
   Boolean:
-    0: 'False'
     ANY: Any
-    1: 'True'
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   CMSLoadingScreen.ss:
     LOADING: Loading...
     REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
@@ -70,6 +71,8 @@ sr:
     ACCESSALLINTERFACES: 'Access to all CMS sections'
     ACCESSALLINTERFACESHELP: 'Overrules more specific access settings.'
     SAVE: Сачувај
+  CMSPageHistoryController_versions.ss:
+    PREVIEW: 'Website preview'
   CMSProfileController:
     MENUTITLE: 'My Profile'
   ChangePasswordEmail.ss:
@@ -79,8 +82,8 @@ sr:
     HELLO: Здраво
     PASSWORD: Password
   CheckboxField:
-    - 'False'
-    - 'True'
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   ComplexTableField:
     CLOSEPOPUP: 'Close Popup'
     SUCCESSADD2: 'Added {name}'
@@ -92,7 +95,7 @@ sr:
     SORTDESC: 'Сортирају у опадајућем поретку'
   ComplexTableField_popup.ss:
     NEXT: Следеће
-    PREVIOUS: Претходно
+    PREVIOUS: 'Претходно'
   ConfirmedPasswordField:
     ATLEAST: 'Passwords must be at least {min} characters long.'
     BETWEEN: 'Passwords must be {min} to {max} characters long.'
@@ -109,20 +112,21 @@ sr:
     PLURALNAME: 'Data Objects'
     SINGULARNAME: 'Data Object'
   Date:
-    DAY: дан
-    DAYS: дана
-    HOUR: сат
-    HOURS: сати
-    MIN: минут
-    MINS: минута
-    MONTH: месец
-    MONTHS: месеци
-    SEC: секунда
-    SECS: секунди
+    DAY: day
+    DAYS: days
+    HOUR: hour
+    HOURS: hours
+    LessThanMinuteAgo: 'less than a minute'
+    MIN: min
+    MINS: mins
+    MONTH: month
+    MONTHS: months
+    SEC: sec
+    SECS: secs
     TIMEDIFFAGO: '{difference} ago'
     TIMEDIFFIN: 'in {difference}'
-    YEAR: година
-    YEARS: година
+    YEAR: year
+    YEARS: years
   DateField:
     NOTSET: 'not set'
     TODAY: данас
@@ -198,7 +202,8 @@ sr:
     TEXT2: 'password reset link'
     TEXT3: for
   Form:
-    FIELDISREQUIRED: '%s је захтевано'
+    CSRF_FAILED_MESSAGE: 'There seems to have been a technical problem. Please click the back button, refresh your browser, and try again.'
+    FIELDISREQUIRED: '{name} is required'
     SubmitBtnLabel: Go
     VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
     VALIDATIONNOTUNIQUE: 'Унета вредност није јединствена'
@@ -208,6 +213,7 @@ sr:
     VALIDATOR: Validator
     VALIDCURRENCY: 'Please enter a valid currency'
   FormField:
+    Example: 'e.g. %s'
     NONE: без
   GridAction:
     DELETE_DESCRIPTION: Delete
@@ -230,6 +236,7 @@ sr:
     ResetFilter: Reset
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'No delete permissions'
+    EditPermissionsFailure: 'No permission to unlink record'
   GridFieldDetailForm:
     CancelBtn: Cancel
     Create: Create
@@ -237,7 +244,9 @@ sr:
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
     Save: Save
-    Saved: 'Saved %s %s'
+    Saved: 'Saved {name} {link}'
+  GridFieldEditButton.ss:
+    EDIT: Edit
   GridFieldItemEditView.ss: null
   Group:
     AddRole: 'Add a role for this group'
@@ -267,6 +276,7 @@ sr:
     ADDURL: 'Add URL'
     ADJUSTDETAILSDIMENSIONS: 'Details & dimensions'
     ANCHORVALUE: Anchor
+    BUTTONADDURL: 'Add url'
     BUTTONINSERT: Insert
     BUTTONINSERTLINK: 'Уметни линк'
     BUTTONREMOVELINK: 'Уклони линк'
@@ -331,7 +341,10 @@ sr:
     PreviewButton: Preview
     REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
     SAVEDUP: Saved.
-    VersionUnknown: unknown
+    ShowAsList: 'show as list'
+    TooManyPages: 'Too many pages'
+    ValidationError: 'Validation error'
+    VersionUnknown: Unknown
   LeftAndMain_Menu.ss:
     Hello: Hi
     LOGOUT: 'Log out'
@@ -407,6 +420,7 @@ sr:
     TWODIGITMONTH: 'Two-digit month (01=January, etc.)'
     TWODIGITSECOND: 'Two digits of second (00 through 59)'
     TWODIGITYEAR: 'Two-digit year'
+    Toggle: 'Show formatting help'
   MemberImportForm:
     Help1: '<p>Import users in <em>CSV format</em> (comma-separated values). <small><a href="#" class="toggle-advanced">Show advanced usage</a></small></p>'
     Help2: '<div class="advanced">	<h4>Advanced usage</h4>	<ul>	<li>Allowed columns: <em>%s</em></li>	<li>Existing users are matched by their unique <em>Code</em> property, and updated with any new values from	the imported file.</li>	<li>Groups can be assigned by the <em>Groups</em> column. Groups are identified by their <em>Code</em> property,	multiple groups can be separated by comma. Existing group memberships are not cleared.</li>	</ul></div>'
@@ -421,7 +435,7 @@ sr:
   ModelAdmin:
     DELETE: Delete
     DELETEDRECORDS: 'Deleted {count} records.'
-    EMPTYBEFOREIMPORT: 'Clear Database before import'
+    EMPTYBEFOREIMPORT: 'Replace data'
     IMPORT: 'Import from CSV'
     IMPORTEDRECORDS: 'Imported {count} records.'
     NOCSVFILE: 'Please browse for a CSV file to import'
@@ -515,7 +529,20 @@ sr:
     BtnImport: 'Import from CSV'
     FileFieldLabel: 'CSV File <small>(Allowed extensions: *.csv)</small>'
   SilverStripeNavigator:
+    Auto: Auto
+    ChangeViewMode: 'Change view mode'
+    Desktop: Desktop
+    DualWindowView: 'Dual Window'
     Edit: Edit
+    EditView: 'Edit mode'
+    Mobile: Mobile
+    PreviewState: 'Preview State'
+    PreviewView: 'Preview mode'
+    Responsive: Responsive
+    SplitView: 'Split mode'
+    Tablet: Tablet
+    ViewDeviceWidth: 'Select a preview width'
+    Width: width
   SimpleImageField:
     NOUPLOAD: 'Ниједна слика није достављена'
   SiteTree:
@@ -551,6 +578,8 @@ sr:
     ATTACHFILE: 'Attach a file'
     ATTACHFILES: 'Attach files'
     AttachFile: 'Attach file(s)'
+    CHOOSEANOTHERFILE: 'Choose another file'
+    CHOOSEANOTHERINFO: 'Replace this file with another one from the file store'
     DELETE: 'Delete from files'
     DELETEINFO: 'Permanently delete this file from the file store'
     DOEDIT: Save
@@ -565,12 +594,15 @@ sr:
     FROMFILES: 'From files'
     HOTLINKINFO: 'Info: This image will be hotlinked. Please ensure you have permissions from the original site creator to do so.'
     MAXNUMBEROFFILES: 'Max number of {count} file(s) exceeded.'
+    MAXNUMBEROFFILESONE: 'Can only upload one file'
     MAXNUMBEROFFILESSHORT: 'Can only upload {count} files'
+    OVERWRITEWARNING: 'File with the same name already exists'
     REMOVE: Remove
     REMOVEERROR: 'Error removing file'
     REMOVEINFO: 'Remove this file from here, but do not delete it from the file store'
     STARTALL: 'Start all'
     STARTALLINFO: 'Start all uploads'
     Saved: Saved
+    UPLOADSINTO: 'saves into /{path}'
   Versioned:
     has_many_Versions: Versions

lang/sv.yml

@@ -2,6 +2,7 @@ sv:
   AssetAdmin:
     ALLOWEDEXTS: 'Allowed extensions'
     NEWFOLDER: 'Ny mapp'
+    SHOWALLOWEDEXTS: 'Show allowed extensions'
   AssetTableField:
     CREATED: 'Först uppladdad'
     DIM: Dimensioner
@@ -59,9 +60,9 @@ sv:
     ERRORNOTADMIN: 'Den användaren är inte administratör'
     ERRORNOTREC: 'Användarnamnet / lösenordet hittas inte'
   Boolean:
-    0: Falskt
     ANY: 'Vilken som helst'
-    1: Sant
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   CMSLoadingScreen.ss:
     LOADING: Laddar...
     REQUIREJS: 'CMS:et kräver att du har javascript aktiverat.'
@@ -70,6 +71,8 @@ sv:
     ACCESSALLINTERFACES: 'Tillgång till alla CMS-sektioner'
     ACCESSALLINTERFACESHELP: 'Ersätter mer specifika behörighetsinställningar.'
     SAVE: Spara
+  CMSPageHistoryController_versions.ss:
+    PREVIEW: 'Website preview'
   CMSProfileController:
     MENUTITLE: 'Min Profil'
   ChangePasswordEmail.ss:
@@ -79,8 +82,8 @@ sv:
     HELLO: Hej
     PASSWORD: Lösenord
   CheckboxField:
-    - Falskt
-    - Sant
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   ComplexTableField:
     CLOSEPOPUP: 'Stäng popup'
     SUCCESSADD2: 'Lade till {name}'
@@ -109,20 +112,21 @@ sv:
     PLURALNAME: Dataobjekt
     SINGULARNAME: Dataobjekt
   Date:
-    DAY: dag
-    DAYS: dagar
-    HOUR: timme
-    HOURS: timmar
+    DAY: day
+    DAYS: days
+    HOUR: hour
+    HOURS: hours
+    LessThanMinuteAgo: 'less than a minute'
     MIN: min
-    MINS: min
-    MONTH: 'månad '
-    MONTHS: 'månader '
-    SEC: sek
-    SECS: sekunder
+    MINS: mins
+    MONTH: month
+    MONTHS: months
+    SEC: sec
+    SECS: secs
     TIMEDIFFAGO: '{difference} sen'
     TIMEDIFFIN: 'om {difference}'
-    YEAR: år
-    YEARS: år
+    YEAR: year
+    YEARS: years
   DateField:
     NOTSET: 'inte angivet'
     TODAY: 'i dag'
@@ -198,7 +202,8 @@ sv:
     TEXT2: 'Återställningslänk för lösenord'
     TEXT3: för
   Form:
-    FIELDISREQUIRED: '%s är obligatorisk'
+    CSRF_FAILED_MESSAGE: 'There seems to have been a technical problem. Please click the back button, refresh your browser, and try again.'
+    FIELDISREQUIRED: '{name} is required'
     SubmitBtnLabel: Kör
     VALIDATIONCREDITNUMBER: 'Kontrollera att du angav kortnummret {number} rätt'
     VALIDATIONNOTUNIQUE: 'Det angivna värdet är inte unikt'
@@ -208,6 +213,7 @@ sv:
     VALIDATOR: Validator
     VALIDCURRENCY: 'Var vänlig ange en korrekt valuta'
   FormField:
+    Example: 'e.g. %s'
     NONE: ingen
   GridAction:
     DELETE_DESCRIPTION: Radera
@@ -230,6 +236,7 @@ sv:
     ResetFilter: Rensa
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'Rättighet för att radera saknas'
+    EditPermissionsFailure: 'No permission to unlink record'
   GridFieldDetailForm:
     CancelBtn: Avbryt
     Create: Skapa
@@ -237,7 +244,9 @@ sv:
     DeletePermissionsFailure: 'Rättighet för att radera saknas'
     Deleted: 'Raderade %s %s'
     Save: Spara
-    Saved: 'Sparade %s %s'
+    Saved: 'Saved {name} {link}'
+  GridFieldEditButton.ss:
+    EDIT: Edit
   GridFieldItemEditView.ss: null
   Group:
     AddRole: 'Lägg till roll för den här gruppen'
@@ -267,6 +276,7 @@ sv:
     ADDURL: 'Lägg till URL'
     ADJUSTDETAILSDIMENSIONS: 'Detaljer & dimensioner'
     ANCHORVALUE: Ankare
+    BUTTONADDURL: 'Add url'
     BUTTONINSERT: Infoga
     BUTTONINSERTLINK: 'Infoga länk'
     BUTTONREMOVELINK: 'Ta bort länk'
@@ -321,7 +331,7 @@ sv:
   LeftAndMain:
     CANT_REORGANISE: 'Du har inte tillstånd att ändra sidor på toppnivå. Dina ändringar har inte sparats.'
     DELETED: Raderad
-    DropdownBatchActionsDefault: Åtgärder
+    DropdownBatchActionsDefault: 'Åtgärder'
     HELP: Hjälp
     PAGETYPE: Sidtyp
     PERMAGAIN: 'Du har blivit utloggad. Om du vill logga in igen anger du dina uppgifter nedan.'
@@ -331,6 +341,9 @@ sv:
     PreviewButton: Förhandsgranska
     REORGANISATIONSUCCESSFUL: 'Omorganisationen av sidträdet luyckades.'
     SAVEDUP: Sparad.
+    ShowAsList: 'show as list'
+    TooManyPages: 'Too many pages'
+    ValidationError: 'Validation error'
     VersionUnknown: okänd
   LeftAndMain_Menu.ss:
     Hello: Hej
@@ -407,6 +420,7 @@ sv:
     TWODIGITMONTH: 'Tvåsiffrig månad (01 = januari osv)'
     TWODIGITSECOND: 'Två siffror för sekund (00 till 59)'
     TWODIGITYEAR: 'Två siffror för år'
+    Toggle: 'Show formatting help'
   MemberImportForm:
     Help1: '<p>Importera användare i <em>CSV-format</em> (kommaseparerade värden). <small><a href="#" class="toggle-advanced">Visa avancerat</a></small></p>'
     Help2: "<div class=\"advanced\">\\n<h4>Avancerat </h4>\\n<ul>\\n<li>Tillåtna kolumner: <em>%s</em></li>\\n<li>Existerade användare matchas av deras unika <em>kod</em>-attribut och uppdateras med alla nya värden från den importerade filen</li>\\n<li>Grupper kan anges i <em>Grupp</em>-kolumnen. Grupper identiferas av deras <em>Code</em>-attribut. Anges flera grupper separeras dessa med kommatecken. Existerande användarrättigheter till grupperna tas inte bort.</li>\\n</ul>\\n</div>"
@@ -421,7 +435,7 @@ sv:
   ModelAdmin:
     DELETE: Radera
     DELETEDRECORDS: 'Raderade {count} poster.'
-    EMPTYBEFOREIMPORT: 'Töm databasen före import'
+    EMPTYBEFOREIMPORT: 'Replace data'
     IMPORT: 'Importera från CSV'
     IMPORTEDRECORDS: 'Importerade {count} poster.'
     NOCSVFILE: 'Var god och bläddra efter en CSV-fil för import'
@@ -515,7 +529,20 @@ sv:
     BtnImport: 'Importera från CSV'
     FileFieldLabel: 'CSV-fil <small>(Tillåtna filtyper: *.csv)</small>'
   SilverStripeNavigator:
+    Auto: Auto
+    ChangeViewMode: 'Change view mode'
+    Desktop: Desktop
+    DualWindowView: 'Dual Window'
     Edit: Ändra
+    EditView: 'Edit mode'
+    Mobile: Mobile
+    PreviewState: 'Preview State'
+    PreviewView: 'Preview mode'
+    Responsive: Responsive
+    SplitView: 'Split mode'
+    Tablet: Tablet
+    ViewDeviceWidth: 'Select a preview width'
+    Width: width
   SimpleImageField:
     NOUPLOAD: 'Ingen bild uppladdad'
   SiteTree:
@@ -551,6 +578,8 @@ sv:
     ATTACHFILE: 'Bifoga en fil'
     ATTACHFILES: 'Bifoga fil(er)'
     AttachFile: 'Bifoga fil(er)'
+    CHOOSEANOTHERFILE: 'Choose another file'
+    CHOOSEANOTHERINFO: 'Replace this file with another one from the file store'
     DELETE: 'Radera från filer'
     DELETEINFO: 'Ta bort filen permanent från filarkivet'
     DOEDIT: Spara
@@ -565,12 +594,15 @@ sv:
     FROMFILES: 'Från filer'
     HOTLINKINFO: 'Information: Denna bild kommer att bli länkad till. Var god kontrollera med ägaren till sajten att du har tillåtelse att länka till bilden.'
     MAXNUMBEROFFILES: 'Max antal ({count}) filer överstiget.'
+    MAXNUMBEROFFILESONE: 'Can only upload one file'
     MAXNUMBEROFFILESSHORT: 'Kan bara ladda upp {count} files'
+    OVERWRITEWARNING: 'File with the same name already exists'
     REMOVE: 'Ta bort'
     REMOVEERROR: 'Fel när filen skulle tas bort'
     REMOVEINFO: 'Ta bort filen härifrån, men radera den inte från filarkivet'
     STARTALL: 'Starta alla'
     STARTALLINFO: 'Starta all uppladdningar'
     Saved: Sparad
+    UPLOADSINTO: 'saves into /{path}'
   Versioned:
     has_many_Versions: Versioner

lang/th.yml

@@ -2,6 +2,7 @@ th:
   AssetAdmin:
     ALLOWEDEXTS: 'Allowed extensions'
     NEWFOLDER: สร้างโฟลเดอร์ใหม่
+    SHOWALLOWEDEXTS: 'Show allowed extensions'
   AssetTableField:
     CREATED: อัพโหลดครั้งแรก
     DIM: สัดส่วนกว้างยาว
@@ -39,8 +40,8 @@ th:
     COLOREDEXAMPLE: 'blue text'
     EMAILLINK: ลิงก์อีเมล
     EMAILLINKDESCRIPTION: สร้างลิงค์ให้กับที่อยู่อีเมล์
-    IMAGE: รูปภาพ
-    IMAGEDESCRIPTION: แสดงรูปภาพในหน้าบทความของคุณ
+    IMAGE: 'รูปภาพ'
+    IMAGEDESCRIPTION: 'แสดงรูปภาพในหน้าบทความของคุณ'
     ITALIC: ข้อความตัวเอียง
     ITALICEXAMPLE: ตัวเอียง
     LINK: ลิงก์เว็บไซต์
@@ -59,9 +60,9 @@ th:
     ERRORNOTADMIN: ผู้ใช้งานรายดังกล่าวไม่ใช่ผู้ดูแลระบบ
     ERRORNOTREC: 'That username / password isn''t recognised'
   Boolean:
-    0: ไม่ตกลง
     ANY: ใดๆ
-    1: ตกลง
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   CMSLoadingScreen.ss:
     LOADING: กำลังโหลด...
     REQUIREJS: 'CMS ตัวนี้จำเป็นต้องมีการเปิดใช้งานจาวาสคริปต์'
@@ -70,6 +71,8 @@ th:
     ACCESSALLINTERFACES: 'เข้าถึงพื้นที่ในส่วนของ CMS ทั้งหมด'
     ACCESSALLINTERFACESHELP: 'Overrules more specific access settings.'
     SAVE: บันทึก
+  CMSPageHistoryController_versions.ss:
+    PREVIEW: 'Website preview'
   CMSProfileController:
     MENUTITLE: 'My Profile'
   ChangePasswordEmail.ss:
@@ -79,8 +82,8 @@ th:
     HELLO: สวัสดี
     PASSWORD: รหัสผ่าน
   CheckboxField:
-    - ไม่ตกลง
-    - ตกลง
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   ComplexTableField:
     CLOSEPOPUP: ปิดหน้าต่างป๊อปอัพ
     SUCCESSADD2: 'เพิ่มแล้ว {name}'
@@ -109,20 +112,21 @@ th:
     PLURALNAME: 'Data Objects'
     SINGULARNAME: 'Data Object'
   Date:
-    DAY: วัน
-    DAYS: วัน
-    HOUR: ชั่วโมง
-    HOURS: ชั่วโมง
-    MIN: นาที
-    MINS: นาที
-    MONTH: เดือน
-    MONTHS: เดือน
-    SEC: วินาที
-    SECS: วินาที
+    DAY: day
+    DAYS: days
+    HOUR: hour
+    HOURS: hours
+    LessThanMinuteAgo: 'less than a minute'
+    MIN: min
+    MINS: mins
+    MONTH: month
+    MONTHS: months
+    SEC: sec
+    SECS: secs
     TIMEDIFFAGO: '{difference} ago'
     TIMEDIFFIN: 'in {difference}'
-    YEAR: ปี
-    YEARS: ปี
+    YEAR: year
+    YEARS: years
   DateField:
     NOTSET: ไม่ต้องตั้งค่า
     TODAY: วันนี้
@@ -198,7 +202,8 @@ th:
     TEXT2: ลิงค์รีเซ็ตรหัสผ่าน
     TEXT3: สำหรับ
   Form:
-    FIELDISREQUIRED: '%s เป็นข้อมูลที่จำเป็น'
+    CSRF_FAILED_MESSAGE: 'There seems to have been a technical problem. Please click the back button, refresh your browser, and try again.'
+    FIELDISREQUIRED: '{name} is required'
     SubmitBtnLabel: ไป
     VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
     VALIDATIONNOTUNIQUE: 'The value entered is not unique'
@@ -208,6 +213,7 @@ th:
     VALIDATOR: Validator
     VALIDCURRENCY: กรุณากรอกสกุลเงินที่ถูกต้อง
   FormField:
+    Example: 'e.g. %s'
     NONE: ไม่มี
   GridAction:
     DELETE_DESCRIPTION: ลบ
@@ -230,6 +236,7 @@ th:
     ResetFilter: รีเซ็ต
   GridFieldAction_Delete:
     DeletePermissionsFailure: ไม่ได้รับสิทธิ์ให้ลบได้
+    EditPermissionsFailure: 'No permission to unlink record'
   GridFieldDetailForm:
     CancelBtn: ยกเลิก
     Create: สร้าง
@@ -237,7 +244,9 @@ th:
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'ลบ %s %s แล้ว'
     Save: บันทึก
-    Saved: 'บันทึกแล้ว %s %s'
+    Saved: 'Saved {name} {link}'
+  GridFieldEditButton.ss:
+    EDIT: Edit
   GridFieldItemEditView.ss: null
   Group:
     AddRole: เพิ่มบทบาทให้กับกลุ่มนี้
@@ -267,11 +276,12 @@ th:
     ADDURL: 'เพิ่ม URL'
     ADJUSTDETAILSDIMENSIONS: 'รายละเอียด & ขนาดสัดส่วน'
     ANCHORVALUE: Anchor
+    BUTTONADDURL: 'Add url'
     BUTTONINSERT: แทรก
     BUTTONINSERTLINK: แทรกลิงค์
     BUTTONREMOVELINK: ลบลิงค์
     BUTTONUpdate: อัพเดท
-    CAPTIONTEXT: ข้อความคำอธิบายใต้ภาพ
+    CAPTIONTEXT: 'ข้อความคำอธิบายใต้ภาพ'
     CSSCLASS: 'การจัดวาง / รูปแบบ'
     CSSCLASSCENTER: 'Centered, on its own.'
     CSSCLASSLEFT: 'On the left, with text wrapping around.'
@@ -312,7 +322,7 @@ th:
     PLURALNAME: ไฟล์
     SINGULARNAME: ไฟล์
   ImageField:
-    IMAGE: รูปภาพ
+    IMAGE: 'รูปภาพ'
   Image_Cached:
     PLURALNAME: ไฟล์
     SINGULARNAME: ไฟล์
@@ -331,7 +341,10 @@ th:
     PreviewButton: ดูตัวอย่าง
     REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
     SAVEDUP: บันทึกแล้ว
-    VersionUnknown: ไม่ทราบ
+    ShowAsList: 'show as list'
+    TooManyPages: 'Too many pages'
+    ValidationError: 'Validation error'
+    VersionUnknown: Unknown
   LeftAndMain_Menu.ss:
     Hello: สวัสดีค่ะ
     LOGOUT: ออกจากระบบ
@@ -361,7 +374,7 @@ th:
     ERRORPASSWORDNOTMATCH: 'รหัสผ่านไม่ตรงกัน กรุณาลองใหม่อีกครั้ง'
     ERRORWRONGCRED: 'That doesn''t seem to be the right e-mail address or password. Please try again.'
     FIRSTNAME: ชื่อจริง
-    INTERFACELANG: ภาษาสำหรับหน้าจอติดต่อผู้ใช้
+    INTERFACELANG: 'ภาษาสำหรับหน้าจอติดต่อผู้ใช้'
     INVALIDNEWPASSWORD: 'We couldn''t accept that password: {password}'
     LOGGEDINAS: 'You''re logged in as {name}.'
     NEWPASSWORD: รหัสผ่านใหม่
@@ -379,7 +392,7 @@ th:
     YOUROLDPASSWORD: รหัสผ่านเก่าของคุณ
     belongs_many_many_Groups: กลุ่ม
     db_LastVisited: วันที่เยี่ยมชมล่าสุด
-    db_Locale: ภาษาสำหรับส่วนอินเทอร์เฟซ
+    db_Locale: 'ภาษาสำหรับส่วนอินเทอร์เฟซ'
     db_LockedOutUntil: ออกจากระบบจนกว่า
     db_NumVisit: จำนวนการเข้าชม
     db_Password: รหัสผ่าน
@@ -407,6 +420,7 @@ th:
     TWODIGITMONTH: 'Two-digit month (01=January, etc.)'
     TWODIGITSECOND: 'Two digits of second (00 through 59)'
     TWODIGITYEAR: 'Two-digit year'
+    Toggle: 'Show formatting help'
   MemberImportForm:
     Help1: '<p>Import users in <em>CSV format</em> (comma-separated values). <small><a href="#" class="toggle-advanced">Show advanced usage</a></small></p>'
     Help2: '<div class="advanced">	<h4>Advanced usage</h4>	<ul>	<li>Allowed columns: <em>%s</em></li>	<li>Existing users are matched by their unique <em>Code</em> property, and updated with any new values from	the imported file.</li>	<li>Groups can be assigned by the <em>Groups</em> column. Groups are identified by their <em>Code</em> property,	multiple groups can be separated by comma. Existing group memberships are not cleared.</li>	</ul></div>'
@@ -421,7 +435,7 @@ th:
   ModelAdmin:
     DELETE: ลบ
     DELETEDRECORDS: 'ลบแล้ว {count} รายการ'
-    EMPTYBEFOREIMPORT: 'Clear Database before import'
+    EMPTYBEFOREIMPORT: 'Replace data'
     IMPORT: 'นำเข้าจากไฟล์ CSV'
     IMPORTEDRECORDS: 'นำเข้าแล้ว {count} รายการ'
     NOCSVFILE: 'กรุณาเปิดดูเพื่อเลือกไฟล์ CSV สำหรับนำเข้าข้อมูล'
@@ -503,7 +517,7 @@ th:
     IMPORTGROUPS: นำเข้ากลุ่ม
     IMPORTUSERS: นำเข้าผู้ใช้งาน
     MEMBERS: สมาชิก
-    MENUTITLE: ความปลอดภัย
+    MENUTITLE: 'ความปลอดภัย'
     MemberListCaution: 'Caution: Removing members from this list will remove them from all groups and the database'
     NEWGROUP: สร้างกลุ่มใหม่
     PERMISSIONS: สิทธิ์อนุญาต
@@ -515,9 +529,22 @@ th:
     BtnImport: นำเข้า
     FileFieldLabel: 'CSV File <small>(Allowed extensions: *.csv)</small>'
   SilverStripeNavigator:
+    Auto: Auto
+    ChangeViewMode: 'Change view mode'
+    Desktop: Desktop
+    DualWindowView: 'Dual Window'
     Edit: แก้ไข
+    EditView: 'Edit mode'
+    Mobile: Mobile
+    PreviewState: 'Preview State'
+    PreviewView: 'Preview mode'
+    Responsive: Responsive
+    SplitView: 'Split mode'
+    Tablet: Tablet
+    ViewDeviceWidth: 'Select a preview width'
+    Width: width
   SimpleImageField:
-    NOUPLOAD: ยังไม่มีรูปภาพที่ถูกอัพโหลด
+    NOUPLOAD: 'ยังไม่มีรูปภาพที่ถูกอัพโหลด'
   SiteTree:
     TABMAIN: หลัก
   TableField:
@@ -551,6 +578,8 @@ th:
     ATTACHFILE: แนบไฟล์
     ATTACHFILES: แนบไฟล์
     AttachFile: แนบไฟล์
+    CHOOSEANOTHERFILE: 'Choose another file'
+    CHOOSEANOTHERINFO: 'Replace this file with another one from the file store'
     DELETE: ลบจากไฟล์
     DELETEINFO: ลบไฟล์นี้ออกจากพื้นที่จัดเก็บไฟล์อย่างถาวร
     DOEDIT: บันทึก
@@ -565,12 +594,15 @@ th:
     FROMFILES: จากไฟล์
     HOTLINKINFO: 'Info: This image will be hotlinked. Please ensure you have permissions from the original site creator to do so.'
     MAXNUMBEROFFILES: 'Max number of {count} file(s) exceeded.'
+    MAXNUMBEROFFILESONE: 'Can only upload one file'
     MAXNUMBEROFFILESSHORT: 'Can only upload {count} files'
+    OVERWRITEWARNING: 'File with the same name already exists'
     REMOVE: ลบออก
     REMOVEERROR: พบข้อผิดพลาดในระหว่างการลบไฟล์
     REMOVEINFO: 'ลบไฟล์นี้จากที่นี่ แต่ไม่ต้องลบไฟล์ดังกล่าวจากพื้นที่จัดเก็บไฟล์'
     STARTALL: เริ่มทั้งหมด
     STARTALLINFO: เริ่มการอัพโหลดทั้งหมด
     Saved: บันทึกแล้ว
+    UPLOADSINTO: 'saves into /{path}'
   Versioned:
     has_many_Versions: เวอร์ชั่น

lang/tr.yml

@@ -2,6 +2,7 @@ tr:
   AssetAdmin:
     ALLOWEDEXTS: 'Allowed extensions'
     NEWFOLDER: YeniKlasör
+    SHOWALLOWEDEXTS: 'Show allowed extensions'
   AssetTableField:
     CREATED: 'Yüklenme tarihi'
     DIM: Boyutları
@@ -59,9 +60,9 @@ tr:
     ERRORNOTADMIN: 'O kullanıcı, yönetici değildir'
     ERRORNOTREC: 'Kullanıcı adı / şifre hatalı'
   Boolean:
-    0: Yanlış
     ANY: Herhangi
-    1: Doğru
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   CMSLoadingScreen.ss:
     LOADING: Loading...
     REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
@@ -70,6 +71,8 @@ tr:
     ACCESSALLINTERFACES: 'Tüm İYS arayüzlerine erişim'
     ACCESSALLINTERFACESHELP: 'Overrules more specific access settings.'
     SAVE: Kaydet
+  CMSPageHistoryController_versions.ss:
+    PREVIEW: 'Website preview'
   CMSProfileController:
     MENUTITLE: 'My Profile'
   ChangePasswordEmail.ss:
@@ -79,8 +82,8 @@ tr:
     HELLO: Merhaba
     PASSWORD: Parola
   CheckboxField:
-    - Yanlış
-    - Doğru
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   ComplexTableField:
     CLOSEPOPUP: 'Açılır Pancereyi Kapat'
     SUCCESSADD2: 'Added {name}'
@@ -109,20 +112,21 @@ tr:
     PLURALNAME: 'Data Nesneleri'
     SINGULARNAME: 'Data Nesnesi'
   Date:
-    DAY: gün
-    DAYS: gün
-    HOUR: saat
-    HOURS: saat
-    MIN: dakika
-    MINS: dakika
-    MONTH: ay
-    MONTHS: ay
-    SEC: saniye
-    SECS: saniye
+    DAY: day
+    DAYS: days
+    HOUR: hour
+    HOURS: hours
+    LessThanMinuteAgo: 'less than a minute'
+    MIN: min
+    MINS: mins
+    MONTH: month
+    MONTHS: months
+    SEC: sec
+    SECS: secs
     TIMEDIFFAGO: '{difference} ago'
     TIMEDIFFIN: 'in {difference}'
-    YEAR: yıl
-    YEARS: yıl
+    YEAR: year
+    YEARS: years
   DateField:
     NOTSET: ayarlanmamış
     TODAY: bugün
@@ -198,7 +202,8 @@ tr:
     TEXT2: 'şifre sıfırlama linki'
     TEXT3: için
   Form:
-    FIELDISREQUIRED: '%s alanının girilmesi zorunludur'
+    CSRF_FAILED_MESSAGE: 'There seems to have been a technical problem. Please click the back button, refresh your browser, and try again.'
+    FIELDISREQUIRED: '{name} is required'
     SubmitBtnLabel: Go
     VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
     VALIDATIONNOTUNIQUE: 'Girilen değer benzersiz olmalıdır'
@@ -208,6 +213,7 @@ tr:
     VALIDATOR: 'Geçerlilik tespiti'
     VALIDCURRENCY: 'Please enter a valid currency'
   FormField:
+    Example: 'e.g. %s'
     NONE: hiç
   GridAction:
     DELETE_DESCRIPTION: Delete
@@ -230,6 +236,7 @@ tr:
     ResetFilter: Reset
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'No delete permissions'
+    EditPermissionsFailure: 'No permission to unlink record'
   GridFieldDetailForm:
     CancelBtn: Cancel
     Create: Create
@@ -237,7 +244,9 @@ tr:
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
     Save: Save
-    Saved: 'Saved %s %s'
+    Saved: 'Saved {name} {link}'
+  GridFieldEditButton.ss:
+    EDIT: Edit
   GridFieldItemEditView.ss: null
   Group:
     AddRole: 'Bu gruba rol ekleyin'
@@ -267,6 +276,7 @@ tr:
     ADDURL: 'Add URL'
     ADJUSTDETAILSDIMENSIONS: 'Details & dimensions'
     ANCHORVALUE: Anchor(çapa)
+    BUTTONADDURL: 'Add url'
     BUTTONINSERT: Insert
     BUTTONINSERTLINK: 'Bağlantı ekle'
     BUTTONREMOVELINK: 'Bağlantıyı sil'
@@ -331,7 +341,10 @@ tr:
     PreviewButton: Önizleme
     REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
     SAVEDUP: Kaydedilmiş.
-    VersionUnknown: unknown
+    ShowAsList: 'show as list'
+    TooManyPages: 'Too many pages'
+    ValidationError: 'Validation error'
+    VersionUnknown: Unknown
   LeftAndMain_Menu.ss:
     Hello: Hi
     LOGOUT: 'Log out'
@@ -407,6 +420,7 @@ tr:
     TWODIGITMONTH: 'Two-digit month (01=January, etc.)'
     TWODIGITSECOND: 'Two digits of second (00 through 59)'
     TWODIGITYEAR: 'Two-digit year'
+    Toggle: 'Show formatting help'
   MemberImportForm:
     Help1: '<p>Import users in <em>CSV format</em> (comma-separated values). <small><a href="#" class="toggle-advanced">Show advanced usage</a></small></p>'
     Help2: '<div class="advanced">	<h4>Advanced usage</h4>	<ul>	<li>Allowed columns: <em>%s</em></li>	<li>Existing users are matched by their unique <em>Code</em> property, and updated with any new values from	the imported file.</li>	<li>Groups can be assigned by the <em>Groups</em> column. Groups are identified by their <em>Code</em> property,	multiple groups can be separated by comma. Existing group memberships are not cleared.</li>	</ul></div>'
@@ -421,7 +435,7 @@ tr:
   ModelAdmin:
     DELETE: Sil
     DELETEDRECORDS: 'Deleted {count} records.'
-    EMPTYBEFOREIMPORT: 'Clear Database before import'
+    EMPTYBEFOREIMPORT: 'Replace data'
     IMPORT: 'CSV''den içer aktar'
     IMPORTEDRECORDS: 'Imported {count} records.'
     NOCSVFILE: 'CSV dosyası ekleme'
@@ -515,7 +529,20 @@ tr:
     BtnImport: Aktar
     FileFieldLabel: 'CSV File <small>(Allowed extensions: *.csv)</small>'
   SilverStripeNavigator:
+    Auto: Auto
+    ChangeViewMode: 'Change view mode'
+    Desktop: Desktop
+    DualWindowView: 'Dual Window'
     Edit: Edit
+    EditView: 'Edit mode'
+    Mobile: Mobile
+    PreviewState: 'Preview State'
+    PreviewView: 'Preview mode'
+    Responsive: Responsive
+    SplitView: 'Split mode'
+    Tablet: Tablet
+    ViewDeviceWidth: 'Select a preview width'
+    Width: width
   SimpleImageField:
     NOUPLOAD: 'Henüz Resim Yüklenmemiş'
   SiteTree:
@@ -551,6 +578,8 @@ tr:
     ATTACHFILE: 'Dosya ekle'
     ATTACHFILES: 'Dosya ekle'
     AttachFile: 'Dosyalar ekle'
+    CHOOSEANOTHERFILE: 'Choose another file'
+    CHOOSEANOTHERINFO: 'Replace this file with another one from the file store'
     DELETE: 'Delete from files'
     DELETEINFO: 'Permanently delete this file from the file store'
     DOEDIT: Kaydet
@@ -565,12 +594,15 @@ tr:
     FROMFILES: 'Kimden dosyaları'
     HOTLINKINFO: 'Info: This image will be hotlinked. Please ensure you have permissions from the original site creator to do so.'
     MAXNUMBEROFFILES: 'Max number of {count} file(s) exceeded.'
+    MAXNUMBEROFFILESONE: 'Can only upload one file'
     MAXNUMBEROFFILESSHORT: 'Can only upload {count} files'
+    OVERWRITEWARNING: 'File with the same name already exists'
     REMOVE: Remove
     REMOVEERROR: 'Error removing file'
     REMOVEINFO: 'Remove this file from here, but do not delete it from the file store'
     STARTALL: 'Tümünü başlat'
     STARTALLINFO: 'Start all uploads'
     Saved: Kaydedilmiş
+    UPLOADSINTO: 'saves into /{path}'
   Versioned:
     has_many_Versions: Versiyonlar

lang/uk.yml

@@ -2,6 +2,7 @@ uk:
   AssetAdmin:
     ALLOWEDEXTS: 'Allowed extensions'
     NEWFOLDER: 'Нова Тека'
+    SHOWALLOWEDEXTS: 'Show allowed extensions'
   AssetTableField:
     CREATED: 'Вперше завантажено'
     DIM: Виміри
@@ -9,7 +10,7 @@ uk:
     FOLDER: Folder
     LASTEDIT: 'Востаннє змінено'
     OWNER: Власник
-    SIZE: Розмір
+    SIZE: 'Розмір'
     TITLE: Назва
     TYPE: Тип
     URL: URL
@@ -59,9 +60,9 @@ uk:
     ERRORNOTADMIN: 'Цей користувач не є адміністратором.'
     ERRORNOTREC: 'Таке ім''я користувача / пароль не існує'
   Boolean:
-    0: 'False'
     ANY: Any
-    1: 'True'
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   CMSLoadingScreen.ss:
     LOADING: Loading...
     REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
@@ -70,6 +71,8 @@ uk:
     ACCESSALLINTERFACES: 'Access to all CMS sections'
     ACCESSALLINTERFACESHELP: 'Overrules more specific access settings.'
     SAVE: Зберегти
+  CMSPageHistoryController_versions.ss:
+    PREVIEW: 'Website preview'
   CMSProfileController:
     MENUTITLE: 'My Profile'
   ChangePasswordEmail.ss:
@@ -79,8 +82,8 @@ uk:
     HELLO: Привіт
     PASSWORD: Пароль
   CheckboxField:
-    - 'False'
-    - 'True'
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   ComplexTableField:
     CLOSEPOPUP: 'Закрити Popup'
     SUCCESSADD2: 'Added {name}'
@@ -109,20 +112,21 @@ uk:
     PLURALNAME: 'Об’єкти даних'
     SINGULARNAME: 'Об’єкт даних'
   Date:
-    DAY: день
-    DAYS: дні
-    HOUR: година
-    HOURS: годин
-    MIN: хв
-    MINS: хв
-    MONTH: місяць
-    MONTHS: місяці
-    SEC: сек
-    SECS: сек
+    DAY: day
+    DAYS: days
+    HOUR: hour
+    HOURS: hours
+    LessThanMinuteAgo: 'less than a minute'
+    MIN: min
+    MINS: mins
+    MONTH: month
+    MONTHS: months
+    SEC: sec
+    SECS: secs
     TIMEDIFFAGO: '{difference} ago'
     TIMEDIFFIN: 'in {difference}'
-    YEAR: рік
-    YEARS: роки
+    YEAR: year
+    YEARS: years
   DateField:
     NOTSET: 'не встановлено'
     TODAY: сьогодні
@@ -198,7 +202,8 @@ uk:
     TEXT2: 'password reset link'
     TEXT3: for
   Form:
-    FIELDISREQUIRED: '%s є необхідним'
+    CSRF_FAILED_MESSAGE: 'There seems to have been a technical problem. Please click the back button, refresh your browser, and try again.'
+    FIELDISREQUIRED: '{name} is required'
     SubmitBtnLabel: Go
     VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
     VALIDATIONNOTUNIQUE: 'Введене значання не унікальне'
@@ -208,6 +213,7 @@ uk:
     VALIDATOR: Validator
     VALIDCURRENCY: 'Please enter a valid currency'
   FormField:
+    Example: 'e.g. %s'
     NONE: none
   GridAction:
     DELETE_DESCRIPTION: Delete
@@ -230,6 +236,7 @@ uk:
     ResetFilter: Reset
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'No delete permissions'
+    EditPermissionsFailure: 'No permission to unlink record'
   GridFieldDetailForm:
     CancelBtn: Cancel
     Create: Create
@@ -237,7 +244,9 @@ uk:
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
     Save: Save
-    Saved: 'Saved %s %s'
+    Saved: 'Saved {name} {link}'
+  GridFieldEditButton.ss:
+    EDIT: Edit
   GridFieldItemEditView.ss: null
   Group:
     AddRole: 'Додати роль до цієї групи'
@@ -267,6 +276,7 @@ uk:
     ADDURL: 'Add URL'
     ADJUSTDETAILSDIMENSIONS: 'Details & dimensions'
     ANCHORVALUE: Якір
+    BUTTONADDURL: 'Add url'
     BUTTONINSERT: Insert
     BUTTONINSERTLINK: 'Вставити посилання'
     BUTTONREMOVELINK: 'Вмдалити посилання'
@@ -288,7 +298,7 @@ uk:
     IMAGEALT: 'Alternative text (alt)'
     IMAGEALTTEXT: 'Альтернативний текст (alt) - відображається якщо зображення не відображається'
     IMAGEALTTEXTDESC: 'Shown to screen readers or if image can not be displayed'
-    IMAGEDIMENSIONS: Розміри
+    IMAGEDIMENSIONS: 'Розміри'
     IMAGEHEIGHTPX: Висота
     IMAGETITLE: 'Текст заголовку (tooltip) - для додаткової інформації про зображення'
     IMAGETITLETEXT: 'Title text (tooltip)'
@@ -331,7 +341,10 @@ uk:
     PreviewButton: Preview
     REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
     SAVEDUP: Saved.
-    VersionUnknown: unknown
+    ShowAsList: 'show as list'
+    TooManyPages: 'Too many pages'
+    ValidationError: 'Validation error'
+    VersionUnknown: Unknown
   LeftAndMain_Menu.ss:
     Hello: Hi
     LOGOUT: 'Log out'
@@ -407,6 +420,7 @@ uk:
     TWODIGITMONTH: 'Two-digit month (01=January, etc.)'
     TWODIGITSECOND: 'Two digits of second (00 through 59)'
     TWODIGITYEAR: 'Two-digit year'
+    Toggle: 'Show formatting help'
   MemberImportForm:
     Help1: '<p>Import users in <em>CSV format</em> (comma-separated values). <small><a href="#" class="toggle-advanced">Show advanced usage</a></small></p>'
     Help2: '<div class="advanced">	<h4>Advanced usage</h4>	<ul>	<li>Allowed columns: <em>%s</em></li>	<li>Existing users are matched by their unique <em>Code</em> property, and updated with any new values from	the imported file.</li>	<li>Groups can be assigned by the <em>Groups</em> column. Groups are identified by their <em>Code</em> property,	multiple groups can be separated by comma. Existing group memberships are not cleared.</li>	</ul></div>'
@@ -421,7 +435,7 @@ uk:
   ModelAdmin:
     DELETE: Delete
     DELETEDRECORDS: 'Deleted {count} records.'
-    EMPTYBEFOREIMPORT: 'Clear Database before import'
+    EMPTYBEFOREIMPORT: 'Replace data'
     IMPORT: 'Імпортувати з CSV'
     IMPORTEDRECORDS: 'Imported {count} records.'
     NOCSVFILE: 'Please browse for a CSV file to import'
@@ -507,15 +521,28 @@ uk:
     MemberListCaution: 'Caution: Removing members from this list will remove them from all groups and the database'
     NEWGROUP: 'Нова Група'
     PERMISSIONS: Дозволи
-    ROLES: Ролі
+    ROLES: 'Ролі'
     ROLESDESCRIPTION: 'Roles are predefined sets of permissions, and can be assigned to groups.<br />They are inherited from parent groups if required.'
-    TABROLES: Ролі
+    TABROLES: 'Ролі'
     Users: Користувачі
   SecurityAdmin_MemberImportForm:
     BtnImport: 'Import from CSV'
     FileFieldLabel: 'CSV File <small>(Allowed extensions: *.csv)</small>'
   SilverStripeNavigator:
+    Auto: Auto
+    ChangeViewMode: 'Change view mode'
+    Desktop: Desktop
+    DualWindowView: 'Dual Window'
     Edit: Edit
+    EditView: 'Edit mode'
+    Mobile: Mobile
+    PreviewState: 'Preview State'
+    PreviewView: 'Preview mode'
+    Responsive: Responsive
+    SplitView: 'Split mode'
+    Tablet: Tablet
+    ViewDeviceWidth: 'Select a preview width'
+    Width: width
   SimpleImageField:
     NOUPLOAD: 'Не завантажено жодного зображення'
   SiteTree:
@@ -551,6 +578,8 @@ uk:
     ATTACHFILE: 'Прикріпити файл'
     ATTACHFILES: 'Прикріпити файли'
     AttachFile: 'Прикріпити файл(и)'
+    CHOOSEANOTHERFILE: 'Choose another file'
+    CHOOSEANOTHERINFO: 'Replace this file with another one from the file store'
     DELETE: 'Delete from files'
     DELETEINFO: 'Permanently delete this file from the file store'
     DOEDIT: Зберегти
@@ -565,12 +594,15 @@ uk:
     FROMFILES: 'З файлів'
     HOTLINKINFO: 'Info: This image will be hotlinked. Please ensure you have permissions from the original site creator to do so.'
     MAXNUMBEROFFILES: 'Max number of {count} file(s) exceeded.'
+    MAXNUMBEROFFILESONE: 'Can only upload one file'
     MAXNUMBEROFFILESSHORT: 'Can only upload {count} files'
+    OVERWRITEWARNING: 'File with the same name already exists'
     REMOVE: Remove
     REMOVEERROR: 'Помилка видалення файла'
     REMOVEINFO: 'Remove this file from here, but do not delete it from the file store'
     STARTALL: 'Start all'
     STARTALLINFO: 'Start all uploads'
     Saved: Saved
+    UPLOADSINTO: 'saves into /{path}'
   Versioned:
     has_many_Versions: Версіїї

lang/uz.yml

@@ -2,6 +2,7 @@ uz:
   AssetAdmin:
     ALLOWEDEXTS: 'Allowed extensions'
     NEWFOLDER: NewFolder
+    SHOWALLOWEDEXTS: 'Show allowed extensions'
   AssetTableField:
     CREATED: 'First uploaded'
     DIM: Dimensions
@@ -59,9 +60,9 @@ uz:
     ERRORNOTADMIN: 'That user is not an administrator.'
     ERRORNOTREC: 'That username / password isn''t recognised'
   Boolean:
-    0: 'False'
     ANY: Any
-    1: 'True'
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   CMSLoadingScreen.ss:
     LOADING: Loading...
     REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
@@ -70,6 +71,8 @@ uz:
     ACCESSALLINTERFACES: 'Access to all CMS sections'
     ACCESSALLINTERFACESHELP: 'Overrules more specific access settings.'
     SAVE: Saqlash
+  CMSPageHistoryController_versions.ss:
+    PREVIEW: 'Website preview'
   CMSProfileController:
     MENUTITLE: 'My Profile'
   ChangePasswordEmail.ss:
@@ -79,8 +82,8 @@ uz:
     HELLO: Hi
     PASSWORD: Password
   CheckboxField:
-    - 'False'
-    - 'True'
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   ComplexTableField:
     CLOSEPOPUP: 'Close Popup'
     SUCCESSADD2: 'Added {name}'
@@ -109,20 +112,21 @@ uz:
     PLURALNAME: 'Data Objects'
     SINGULARNAME: 'Data Object'
   Date:
-    DAY: ' day'
-    DAYS: ' days'
-    HOUR: ' hour'
-    HOURS: ' hours'
-    MIN: ' min'
-    MINS: ' mins'
-    MONTH: ' month'
-    MONTHS: ' months'
-    SEC: ' sec'
-    SECS: ' secs'
+    DAY: day
+    DAYS: days
+    HOUR: hour
+    HOURS: hours
+    LessThanMinuteAgo: 'less than a minute'
+    MIN: min
+    MINS: mins
+    MONTH: month
+    MONTHS: months
+    SEC: sec
+    SECS: secs
     TIMEDIFFAGO: '{difference} ago'
     TIMEDIFFIN: 'in {difference}'
-    YEAR: ' year'
-    YEARS: ' years'
+    YEAR: year
+    YEARS: years
   DateField:
     NOTSET: 'not set'
     TODAY: today
@@ -198,7 +202,8 @@ uz:
     TEXT2: 'password reset link'
     TEXT3: for
   Form:
-    FIELDISREQUIRED: '%s is required'
+    CSRF_FAILED_MESSAGE: 'There seems to have been a technical problem. Please click the back button, refresh your browser, and try again.'
+    FIELDISREQUIRED: '{name} is required'
     SubmitBtnLabel: Go
     VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
     VALIDATIONNOTUNIQUE: 'The value entered is not unique'
@@ -208,6 +213,7 @@ uz:
     VALIDATOR: Validator
     VALIDCURRENCY: 'Please enter a valid currency'
   FormField:
+    Example: 'e.g. %s'
     NONE: none
   GridAction:
     DELETE_DESCRIPTION: Delete
@@ -230,6 +236,7 @@ uz:
     ResetFilter: Reset
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'No delete permissions'
+    EditPermissionsFailure: 'No permission to unlink record'
   GridFieldDetailForm:
     CancelBtn: Cancel
     Create: Create
@@ -237,7 +244,9 @@ uz:
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
     Save: Save
-    Saved: 'Saved %s %s'
+    Saved: 'Saved {name} {link}'
+  GridFieldEditButton.ss:
+    EDIT: Edit
   GridFieldItemEditView.ss: null
   Group:
     AddRole: 'Add a role for this group'
@@ -267,6 +276,7 @@ uz:
     ADDURL: 'Add URL'
     ADJUSTDETAILSDIMENSIONS: 'Details & dimensions'
     ANCHORVALUE: Anchor
+    BUTTONADDURL: 'Add url'
     BUTTONINSERT: Insert
     BUTTONINSERTLINK: 'Insert link'
     BUTTONREMOVELINK: 'Remove link'
@@ -331,7 +341,10 @@ uz:
     PreviewButton: Preview
     REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
     SAVEDUP: Saved.
-    VersionUnknown: unknown
+    ShowAsList: 'show as list'
+    TooManyPages: 'Too many pages'
+    ValidationError: 'Validation error'
+    VersionUnknown: Unknown
   LeftAndMain_Menu.ss:
     Hello: Hi
     LOGOUT: 'Log out'
@@ -407,6 +420,7 @@ uz:
     TWODIGITMONTH: 'Two-digit month (01=January, etc.)'
     TWODIGITSECOND: 'Two digits of second (00 through 59)'
     TWODIGITYEAR: 'Two-digit year'
+    Toggle: 'Show formatting help'
   MemberImportForm:
     Help1: '<p>Import users in <em>CSV format</em> (comma-separated values). <small><a href="#" class="toggle-advanced">Show advanced usage</a></small></p>'
     Help2: '<div class="advanced">	<h4>Advanced usage</h4>	<ul>	<li>Allowed columns: <em>%s</em></li>	<li>Existing users are matched by their unique <em>Code</em> property, and updated with any new values from	the imported file.</li>	<li>Groups can be assigned by the <em>Groups</em> column. Groups are identified by their <em>Code</em> property,	multiple groups can be separated by comma. Existing group memberships are not cleared.</li>	</ul></div>'
@@ -421,7 +435,7 @@ uz:
   ModelAdmin:
     DELETE: Delete
     DELETEDRECORDS: 'Deleted {count} records.'
-    EMPTYBEFOREIMPORT: 'Clear Database before import'
+    EMPTYBEFOREIMPORT: 'Replace data'
     IMPORT: 'Import from CSV'
     IMPORTEDRECORDS: 'Imported {count} records.'
     NOCSVFILE: 'Please browse for a CSV file to import'
@@ -515,7 +529,20 @@ uz:
     BtnImport: 'Import from CSV'
     FileFieldLabel: 'CSV File <small>(Allowed extensions: *.csv)</small>'
   SilverStripeNavigator:
+    Auto: Auto
+    ChangeViewMode: 'Change view mode'
+    Desktop: Desktop
+    DualWindowView: 'Dual Window'
     Edit: Edit
+    EditView: 'Edit mode'
+    Mobile: Mobile
+    PreviewState: 'Preview State'
+    PreviewView: 'Preview mode'
+    Responsive: Responsive
+    SplitView: 'Split mode'
+    Tablet: Tablet
+    ViewDeviceWidth: 'Select a preview width'
+    Width: width
   SimpleImageField:
     NOUPLOAD: 'No Image Uploaded'
   SiteTree:
@@ -551,6 +578,8 @@ uz:
     ATTACHFILE: 'Attach a file'
     ATTACHFILES: 'Attach files'
     AttachFile: 'Attach file(s)'
+    CHOOSEANOTHERFILE: 'Choose another file'
+    CHOOSEANOTHERINFO: 'Replace this file with another one from the file store'
     DELETE: 'Delete from files'
     DELETEINFO: 'Permanently delete this file from the file store'
     DOEDIT: Save
@@ -565,12 +594,15 @@ uz:
     FROMFILES: 'From files'
     HOTLINKINFO: 'Info: This image will be hotlinked. Please ensure you have permissions from the original site creator to do so.'
     MAXNUMBEROFFILES: 'Max number of {count} file(s) exceeded.'
+    MAXNUMBEROFFILESONE: 'Can only upload one file'
     MAXNUMBEROFFILESSHORT: 'Can only upload {count} files'
+    OVERWRITEWARNING: 'File with the same name already exists'
     REMOVE: Remove
     REMOVEERROR: 'Error removing file'
     REMOVEINFO: 'Remove this file from here, but do not delete it from the file store'
     STARTALL: 'Start all'
     STARTALLINFO: 'Start all uploads'
     Saved: Saved
+    UPLOADSINTO: 'saves into /{path}'
   Versioned:
     has_many_Versions: Versions

lang/vi_VN.yml

@@ -2,6 +2,7 @@ vi_VN:
   AssetAdmin:
     ALLOWEDEXTS: 'Allowed extensions'
     NEWFOLDER: NewFolder
+    SHOWALLOWEDEXTS: 'Show allowed extensions'
   AssetTableField:
     CREATED: 'First uploaded'
     DIM: Dimensions
@@ -59,9 +60,9 @@ vi_VN:
     ERRORNOTADMIN: 'That user is not an administrator.'
     ERRORNOTREC: 'That username / password isn''t recognised'
   Boolean:
-    0: 'False'
     ANY: Any
-    1: 'True'
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   CMSLoadingScreen.ss:
     LOADING: Loading...
     REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
@@ -70,6 +71,8 @@ vi_VN:
     ACCESSALLINTERFACES: 'Access to all CMS sections'
     ACCESSALLINTERFACESHELP: 'Overrules more specific access settings.'
     SAVE: Lưu
+  CMSPageHistoryController_versions.ss:
+    PREVIEW: 'Website preview'
   CMSProfileController:
     MENUTITLE: 'My Profile'
   ChangePasswordEmail.ss:
@@ -79,8 +82,8 @@ vi_VN:
     HELLO: Hi
     PASSWORD: Password
   CheckboxField:
-    - 'False'
-    - 'True'
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   ComplexTableField:
     CLOSEPOPUP: 'Close Popup'
     SUCCESSADD2: 'Added {name}'
@@ -109,20 +112,21 @@ vi_VN:
     PLURALNAME: 'Data Objects'
     SINGULARNAME: 'Data Object'
   Date:
-    DAY: ngày
-    DAYS: ngày
-    HOUR: giờ
-    HOURS: giờ
-    MIN: phút
-    MINS: phút
-    MONTH: tháng
-    MONTHS: tháng
-    SEC: giây
-    SECS: giây
+    DAY: day
+    DAYS: days
+    HOUR: hour
+    HOURS: hours
+    LessThanMinuteAgo: 'less than a minute'
+    MIN: min
+    MINS: mins
+    MONTH: month
+    MONTHS: months
+    SEC: sec
+    SECS: secs
     TIMEDIFFAGO: '{difference} ago'
     TIMEDIFFIN: 'in {difference}'
-    YEAR: năm
-    YEARS: năm
+    YEAR: year
+    YEARS: years
   DateField:
     NOTSET: 'not set'
     TODAY: 'hôm nay'
@@ -198,7 +202,8 @@ vi_VN:
     TEXT2: 'password reset link'
     TEXT3: for
   Form:
-    FIELDISREQUIRED: '%s is required'
+    CSRF_FAILED_MESSAGE: 'There seems to have been a technical problem. Please click the back button, refresh your browser, and try again.'
+    FIELDISREQUIRED: '{name} is required'
     SubmitBtnLabel: Go
     VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
     VALIDATIONNOTUNIQUE: 'The value entered is not unique'
@@ -208,6 +213,7 @@ vi_VN:
     VALIDATOR: Validator
     VALIDCURRENCY: 'Please enter a valid currency'
   FormField:
+    Example: 'e.g. %s'
     NONE: none
   GridAction:
     DELETE_DESCRIPTION: Delete
@@ -230,6 +236,7 @@ vi_VN:
     ResetFilter: Reset
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'No delete permissions'
+    EditPermissionsFailure: 'No permission to unlink record'
   GridFieldDetailForm:
     CancelBtn: Cancel
     Create: Create
@@ -237,7 +244,9 @@ vi_VN:
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
     Save: Save
-    Saved: 'Saved %s %s'
+    Saved: 'Saved {name} {link}'
+  GridFieldEditButton.ss:
+    EDIT: Edit
   GridFieldItemEditView.ss: null
   Group:
     AddRole: 'Add a role for this group'
@@ -267,6 +276,7 @@ vi_VN:
     ADDURL: 'Add URL'
     ADJUSTDETAILSDIMENSIONS: 'Details & dimensions'
     ANCHORVALUE: Anchor
+    BUTTONADDURL: 'Add url'
     BUTTONINSERT: Insert
     BUTTONINSERTLINK: 'Insert link'
     BUTTONREMOVELINK: 'Remove link'
@@ -331,7 +341,10 @@ vi_VN:
     PreviewButton: Preview
     REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
     SAVEDUP: Saved.
-    VersionUnknown: unknown
+    ShowAsList: 'show as list'
+    TooManyPages: 'Too many pages'
+    ValidationError: 'Validation error'
+    VersionUnknown: Unknown
   LeftAndMain_Menu.ss:
     Hello: Hi
     LOGOUT: 'Log out'
@@ -407,6 +420,7 @@ vi_VN:
     TWODIGITMONTH: 'Two-digit month (01=January, etc.)'
     TWODIGITSECOND: 'Two digits of second (00 through 59)'
     TWODIGITYEAR: 'Two-digit year'
+    Toggle: 'Show formatting help'
   MemberImportForm:
     Help1: '<p>Import users in <em>CSV format</em> (comma-separated values). <small><a href="#" class="toggle-advanced">Show advanced usage</a></small></p>'
     Help2: '<div class="advanced">	<h4>Advanced usage</h4>	<ul>	<li>Allowed columns: <em>%s</em></li>	<li>Existing users are matched by their unique <em>Code</em> property, and updated with any new values from	the imported file.</li>	<li>Groups can be assigned by the <em>Groups</em> column. Groups are identified by their <em>Code</em> property,	multiple groups can be separated by comma. Existing group memberships are not cleared.</li>	</ul></div>'
@@ -421,7 +435,7 @@ vi_VN:
   ModelAdmin:
     DELETE: Delete
     DELETEDRECORDS: 'Deleted {count} records.'
-    EMPTYBEFOREIMPORT: 'Clear Database before import'
+    EMPTYBEFOREIMPORT: 'Replace data'
     IMPORT: 'Import from CSV'
     IMPORTEDRECORDS: 'Imported {count} records.'
     NOCSVFILE: 'Please browse for a CSV file to import'
@@ -515,7 +529,20 @@ vi_VN:
     BtnImport: 'Import from CSV'
     FileFieldLabel: 'CSV File <small>(Allowed extensions: *.csv)</small>'
   SilverStripeNavigator:
+    Auto: Auto
+    ChangeViewMode: 'Change view mode'
+    Desktop: Desktop
+    DualWindowView: 'Dual Window'
     Edit: Edit
+    EditView: 'Edit mode'
+    Mobile: Mobile
+    PreviewState: 'Preview State'
+    PreviewView: 'Preview mode'
+    Responsive: Responsive
+    SplitView: 'Split mode'
+    Tablet: Tablet
+    ViewDeviceWidth: 'Select a preview width'
+    Width: width
   SimpleImageField:
     NOUPLOAD: 'No Image Uploaded'
   SiteTree:
@@ -551,6 +578,8 @@ vi_VN:
     ATTACHFILE: 'Attach a file'
     ATTACHFILES: 'Attach files'
     AttachFile: 'Attach file(s)'
+    CHOOSEANOTHERFILE: 'Choose another file'
+    CHOOSEANOTHERINFO: 'Replace this file with another one from the file store'
     DELETE: 'Delete from files'
     DELETEINFO: 'Permanently delete this file from the file store'
     DOEDIT: Save
@@ -565,12 +594,15 @@ vi_VN:
     FROMFILES: 'From files'
     HOTLINKINFO: 'Info: This image will be hotlinked. Please ensure you have permissions from the original site creator to do so.'
     MAXNUMBEROFFILES: 'Max number of {count} file(s) exceeded.'
+    MAXNUMBEROFFILESONE: 'Can only upload one file'
     MAXNUMBEROFFILESSHORT: 'Can only upload {count} files'
+    OVERWRITEWARNING: 'File with the same name already exists'
     REMOVE: Remove
     REMOVEERROR: 'Error removing file'
     REMOVEINFO: 'Remove this file from here, but do not delete it from the file store'
     STARTALL: 'Start all'
     STARTALLINFO: 'Start all uploads'
     Saved: Saved
+    UPLOADSINTO: 'saves into /{path}'
   Versioned:
     has_many_Versions: Versions

lang/zh_CN.yml

@@ -2,13 +2,14 @@ zh_CN:
   AssetAdmin:
     ALLOWEDEXTS: 'Allowed extensions'
     NEWFOLDER: 新建文件夹
+    SHOWALLOWEDEXTS: 'Show allowed extensions'
   AssetTableField:
-    CREATED: 第一次被上传
+    CREATED: '第一次被上传'
     DIM: 尺寸
     FILENAME: 文件名
     FOLDER: Folder
     LASTEDIT: 上一次被更改
-    OWNER: 拥有者
+    OWNER: '拥有者'
     SIZE: 大小
     TITLE: 文件名称
     TYPE: 类型
@@ -55,13 +56,13 @@ zh_CN:
   BackLink_Button.ss:
     Back: Back
   BasicAuth:
-    ENTERINFO: 请输入用户名和密码
+    ENTERINFO: '请输入用户名和密码'
     ERRORNOTADMIN: 此用户没有管理员权限。
-    ERRORNOTREC: 没有找到此用户名/密码
+    ERRORNOTREC: '没有找到此用户名/密码'
   Boolean:
-    0: 'False'
     ANY: Any
-    1: 'True'
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   CMSLoadingScreen.ss:
     LOADING: Loading...
     REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
@@ -70,23 +71,25 @@ zh_CN:
     ACCESSALLINTERFACES: 'Access to all CMS sections'
     ACCESSALLINTERFACESHELP: 'Overrules more specific access settings.'
     SAVE: 保存
+  CMSPageHistoryController_versions.ss:
+    PREVIEW: 'Website preview'
   CMSProfileController:
     MENUTITLE: 'My Profile'
   ChangePasswordEmail.ss:
-    CHANGEPASSWORDTEXT1: 您已更改了登陆%s的密码
+    CHANGEPASSWORDTEXT1: '您已更改了登陆%s的密码'
     CHANGEPASSWORDTEXT2: 您现在可以用下列权限信息进行登路：
     EMAIL: Email
     HELLO: 嗨
     PASSWORD: Password
   CheckboxField:
-    - 'False'
-    - 'True'
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   ComplexTableField:
     CLOSEPOPUP: 'Close Popup'
     SUCCESSADD2: 'Added {name}'
     SUCCESSEDIT: 'Saved %s %s %s'
   ComplexTableField.ss:
-    ADDITEM: 新加
+    ADDITEM: '新加'
     NOITEMSFOUND: 'No items found'
     SORTASC: 正序排列
     SORTDESC: 倒序排列
@@ -97,7 +100,7 @@ zh_CN:
     ATLEAST: 'Passwords must be at least {min} characters long.'
     BETWEEN: 'Passwords must be {min} to {max} characters long.'
     MAXIMUM: 'Passwords must be at most {max} characters long.'
-    SHOWONCLICKTITLE: 更改密码
+    SHOWONCLICKTITLE: '更改密码'
   CreditCardField:
     FIRST: first
     FOURTH: fourth
@@ -109,20 +112,21 @@ zh_CN:
     PLURALNAME: 数据对象
     SINGULARNAME: 数据对象
   Date:
-    DAY: 天
-    DAYS: 天
-    HOUR: 个小时
-    HOURS: 个小时
-    MIN: 分钟
-    MINS: 分钟
-    MONTH: 个月
-    MONTHS: 个月
-    SEC: 秒
-    SECS: 秒
+    DAY: day
+    DAYS: days
+    HOUR: hour
+    HOURS: hours
+    LessThanMinuteAgo: 'less than a minute'
+    MIN: min
+    MINS: mins
+    MONTH: month
+    MONTHS: months
+    SEC: sec
+    SECS: secs
     TIMEDIFFAGO: '{difference} ago'
     TIMEDIFFIN: 'in {difference}'
-    YEAR: 年
-    YEARS: 年
+    YEAR: year
+    YEARS: years
   DateField:
     NOTSET: 'not set'
     TODAY: today
@@ -198,16 +202,18 @@ zh_CN:
     TEXT2: 'password reset link'
     TEXT3: for
   Form:
-    FIELDISREQUIRED: '%s是必需填写的'
+    CSRF_FAILED_MESSAGE: 'There seems to have been a technical problem. Please click the back button, refresh your browser, and try again.'
+    FIELDISREQUIRED: '{name} is required'
     SubmitBtnLabel: Go
     VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
-    VALIDATIONNOTUNIQUE: 输入值已被他人占用
-    VALIDATIONPASSWORDSDONTMATCH: （密码相互不匹配）
-    VALIDATIONPASSWORDSNOTEMPTY: 密码不能空白
+    VALIDATIONNOTUNIQUE: '输入值已被他人占用'
+    VALIDATIONPASSWORDSDONTMATCH: '（密码相互不匹配）'
+    VALIDATIONPASSWORDSNOTEMPTY: '密码不能空白'
     VALIDATIONSTRONGPASSWORD: 'Passwords must have at least one digit and one alphanumeric character'
     VALIDATOR: Validator
     VALIDCURRENCY: 'Please enter a valid currency'
   FormField:
+    Example: 'e.g. %s'
     NONE: none
   GridAction:
     DELETE_DESCRIPTION: Delete
@@ -230,6 +236,7 @@ zh_CN:
     ResetFilter: Reset
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'No delete permissions'
+    EditPermissionsFailure: 'No permission to unlink record'
   GridFieldDetailForm:
     CancelBtn: Cancel
     Create: Create
@@ -237,11 +244,13 @@ zh_CN:
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
     Save: Save
-    Saved: 'Saved %s %s'
+    Saved: 'Saved {name} {link}'
+  GridFieldEditButton.ss:
+    EDIT: Edit
   GridFieldItemEditView.ss: null
   Group:
     AddRole: 'Add a role for this group'
-    Code: 团队代码
+    Code: '团队代码'
     DefaultGroupTitleAdministrators: Administrators
     DefaultGroupTitleContentAuthors: 'Content Authors'
     Description: Description
@@ -267,13 +276,14 @@ zh_CN:
     ADDURL: 'Add URL'
     ADJUSTDETAILSDIMENSIONS: 'Details & dimensions'
     ANCHORVALUE: Anchor
+    BUTTONADDURL: 'Add url'
     BUTTONINSERT: Insert
-    BUTTONINSERTLINK: 插入链接
-    BUTTONREMOVELINK: 删除链接
+    BUTTONINSERTLINK: '插入链接'
+    BUTTONREMOVELINK: '删除链接'
     BUTTONUpdate: Update
     CAPTIONTEXT: 'Caption text'
-    CSSCLASS: 对齐/样式
-    CSSCLASSCENTER: 自居中
+    CSSCLASS: '对齐/样式'
+    CSSCLASSCENTER: '自居中'
     CSSCLASSLEFT: 左端自动换行
     CSSCLASSLEFTALONE: 'On the left, on its own.'
     CSSCLASSRIGHT: 右端自动换行
@@ -289,17 +299,17 @@ zh_CN:
     IMAGEALTTEXT: 'Alternative text (alt) - shown if image cannot be displayed'
     IMAGEALTTEXTDESC: 'Shown to screen readers or if image can not be displayed'
     IMAGEDIMENSIONS: 尺寸
-    IMAGEHEIGHTPX: 高（像素）
+    IMAGEHEIGHTPX: '高（像素）'
     IMAGETITLE: 'Title text (tooltip) - for additional information about the image'
     IMAGETITLETEXT: 'Title text (tooltip)'
     IMAGETITLETEXTDESC: 'For additional information about the image'
-    IMAGEWIDTHPX: 宽（像素）
+    IMAGEWIDTHPX: '宽（像素）'
     INSERTMEDIA: 'Insert Media'
-    LINK: 对所选文字插入/编辑链接
+    LINK: '对所选文字插入/编辑链接'
     LINKANCHOR: 'Anchor on this page'
     LINKDESCR: 链接描述
     LINKEMAIL: 电子邮件地址
-    LINKEXTERNAL: 其它网站
+    LINKEXTERNAL: '其它网站'
     LINKFILE: 下载文件
     LINKINTERNAL: 本站网页
     LINKOPENNEWWIN: 在新窗口打开链接？
@@ -317,21 +327,24 @@ zh_CN:
     PLURALNAME: Files
     SINGULARNAME: File
   Image_iframe.ss:
-    TITLE: 图象上传内嵌框架（Iframe）
+    TITLE: '图象上传内嵌框架（Iframe）'
   LeftAndMain:
     CANT_REORGANISE: 'You do not have permission to alter Top level pages. Your change was not saved.'
     DELETED: Deleted.
     DropdownBatchActionsDefault: Actions
     HELP: 帮助
     PAGETYPE: 网页类型
-    PERMAGAIN: 您于CMS的登录已被注销，请在下面输入用户名和密码重新登录。
-    PERMALREADY: 对不起，您无权登录CMS的这一部分。如果您要用另外的帐号，请在下面登录。
-    PERMDEFAULT: 请先选择一种验证方法并输入您的权限信息，以登录CMS。
-    PLEASESAVE: 请先保存：因为该网页还未保存，所以该页无法更新。
+    PERMAGAIN: '您于CMS的登录已被注销，请在下面输入用户名和密码重新登录。'
+    PERMALREADY: '对不起，您无权登录CMS的这一部分。如果您要用另外的帐号，请在下面登录。'
+    PERMDEFAULT: '请先选择一种验证方法并输入您的权限信息，以登录CMS。'
+    PLEASESAVE: '请先保存：因为该网页还未保存，所以该页无法更新。'
     PreviewButton: Preview
     REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
     SAVEDUP: Saved.
-    VersionUnknown: unknown
+    ShowAsList: 'show as list'
+    TooManyPages: 'Too many pages'
+    ValidationError: 'Validation error'
+    VersionUnknown: Unknown
   LeftAndMain_Menu.ss:
     Hello: Hi
     LOGOUT: 'Log out'
@@ -343,13 +356,13 @@ zh_CN:
     Status: Status
   Member:
     ADDGROUP: 'Add group'
-    BUTTONCHANGEPASSWORD: 更改密码
+    BUTTONCHANGEPASSWORD: '更改密码'
     BUTTONLOGIN: 登录
-    BUTTONLOGINOTHER: 使用其他帐户登录
-    BUTTONLOSTPASSWORD: 忘记密码
+    BUTTONLOGINOTHER: '使用其他帐户登录'
+    BUTTONLOSTPASSWORD: '忘记密码'
     CANTEDIT: 'You don''t have permission to do that'
-    CONFIRMNEWPASSWORD: 确认新密码
-    CONFIRMPASSWORD: 确认密码
+    CONFIRMNEWPASSWORD: '确认新密码'
+    CONFIRMPASSWORD: '确认密码'
     DATEFORMAT: 'Date format'
     DefaultAdminFirstname: 'Default Admin'
     DefaultDateTime: default
@@ -357,35 +370,35 @@ zh_CN:
     EMPTYNEWPASSWORD: 'The new password can''t be empty, please try again'
     ENTEREMAIL: 'Please enter an email address to get a password reset link.'
     ERRORLOCKEDOUT: 'Your account has been temporarily disabled because of too many failed attempts at logging in. Please try again in 20 minutes.'
-    ERRORNEWPASSWORD: 您输入了一个不同的新密码，请重新输入
-    ERRORPASSWORDNOTMATCH: 您当前的密码不正确，请再次输入
-    ERRORWRONGCRED: 电邮地址或密码似乎不对。请重新输入。
+    ERRORNEWPASSWORD: '您输入了一个不同的新密码，请重新输入'
+    ERRORPASSWORDNOTMATCH: '您当前的密码不正确，请再次输入'
+    ERRORWRONGCRED: '电邮地址或密码似乎不对。请重新输入。'
     FIRSTNAME: 名
     INTERFACELANG: 界面语言
     INVALIDNEWPASSWORD: 'We couldn''t accept that password: {password}'
     LOGGEDINAS: 'You''re logged in as {name}.'
-    NEWPASSWORD: 新密码
-    PASSWORD: 密码
+    NEWPASSWORD: '新密码'
+    PASSWORD: '密码'
     PLURALNAME: 成员
     REMEMBERME: 记住我的信息？
     SINGULARNAME: 成员
-    SUBJECTPASSWORDCHANGED: 您的密码已更改
-    SUBJECTPASSWORDRESET: 重设您的密码链接
+    SUBJECTPASSWORDCHANGED: '您的密码已更改'
+    SUBJECTPASSWORDRESET: '重设您的密码链接'
     SURNAME: 姓
     TIMEFORMAT: 'Time format'
     VALIDATIONMEMBEREXISTS: 已经存在用这个电子邮件的会员
     ValidationIdentifierFailed: 'Can''t overwrite existing member #{id} with identical identifier ({name} = {value}))'
     WELCOMEBACK: 'Welcome Back, {firstname}'
-    YOUROLDPASSWORD: 您的旧密码
+    YOUROLDPASSWORD: '您的旧密码'
     belongs_many_many_Groups: 团队
     db_LastVisited: 'Last Visited Date'
     db_Locale: 'Interface Locale'
     db_LockedOutUntil: 禁止直至
     db_NumVisit: 'Number of Visits'
     db_Password: Password
-    db_PasswordExpiry: 密码过期日期
+    db_PasswordExpiry: '密码过期日期'
   MemberAuthenticator:
-    TITLE: 电邮地址和密码
+    TITLE: '电邮地址和密码'
   MemberDatetimeOptionsetField:
     AMORPM: 'AM (Ante meridiem) or PM (Post meridiem)'
     'APPLY FILTER': 'Apply Filter'
@@ -407,6 +420,7 @@ zh_CN:
     TWODIGITMONTH: 'Two-digit month (01=January, etc.)'
     TWODIGITSECOND: 'Two digits of second (00 through 59)'
     TWODIGITYEAR: 'Two-digit year'
+    Toggle: 'Show formatting help'
   MemberImportForm:
     Help1: '<p>Import users in <em>CSV format</em> (comma-separated values). <small><a href="#" class="toggle-advanced">Show advanced usage</a></small></p>'
     Help2: '<div class="advanced">	<h4>Advanced usage</h4>	<ul>	<li>Allowed columns: <em>%s</em></li>	<li>Existing users are matched by their unique <em>Code</em> property, and updated with any new values from	the imported file.</li>	<li>Groups can be assigned by the <em>Groups</em> column. Groups are identified by their <em>Code</em> property,	multiple groups can be separated by comma. Existing group memberships are not cleared.</li>	</ul></div>'
@@ -419,9 +433,9 @@ zh_CN:
     SINGULARNAME: 'Member Password'
   MemberTableField: null
   ModelAdmin:
-    DELETE: 删除
+    DELETE: '删除'
     DELETEDRECORDS: 'Deleted {count} records.'
-    EMPTYBEFOREIMPORT: 'Clear Database before import'
+    EMPTYBEFOREIMPORT: 'Replace data'
     IMPORT: 'Import from CSV'
     IMPORTEDRECORDS: 'Imported {count} records.'
     NOCSVFILE: 'Please browse for a CSV file to import'
@@ -474,23 +488,23 @@ zh_CN:
     PERMISSIONS_CATEGORY: 'Roles and access permissions'
     UserPermissionsIntro: 'Assigning groups to this user will adjust the permissions they have. See the groups section for details of permissions on individual groups.'
   PhoneNumberField:
-    VALIDATION: 请输入有效电话号码
+    VALIDATION: '请输入有效电话号码'
   RelationComplexTableField.ss:
     ADD: Add
     CSVEXPORT: 'Export to CSV'
     NOTFOUND: 'No items found'
   Security:
-    ALREADYLOGGEDIN: 您无访问此页的权限。如果您拥有另一个可访问次页的帐户，请在下面登录。
-    BUTTONSEND: 给我发送密码重设链接
-    CHANGEPASSWORDBELOW: 您可在下面更改您的密码
-    CHANGEPASSWORDHEADER: 更改您的密码
-    ENTERNEWPASSWORD: 请输入新密码
-    ERRORPASSWORDPERMISSION: 您必需登录以更改您的密码
-    LOGGEDOUT: 您已被撤消登录。如果您想再次登录，在下面输入您的登录信息。
+    ALREADYLOGGEDIN: '您无访问此页的权限。如果您拥有另一个可访问次页的帐户，请在下面登录。'
+    BUTTONSEND: '给我发送密码重设链接'
+    CHANGEPASSWORDBELOW: '您可在下面更改您的密码'
+    CHANGEPASSWORDHEADER: '更改您的密码'
+    ENTERNEWPASSWORD: '请输入新密码'
+    ERRORPASSWORDPERMISSION: '您必需登录以更改您的密码'
+    LOGGEDOUT: '您已被撤消登录。如果您想再次登录，在下面输入您的登录信息。'
     LOGIN: 登录
-    NOTEPAGESECURED: 此页是受安全保护的。输入您的登录信息，我们会将您送达。
+    NOTEPAGESECURED: '此页是受安全保护的。输入您的登录信息，我们会将您送达。'
     NOTERESETLINKINVALID: '<p>The password reset link is invalid or expired.</p><p>You can request a new one <a href="{link1}">here</a> or change your password after you <a href="{link2}">logged in</a>.</p>'
-    NOTERESETPASSWORD: 输入您的电邮地址，我们会给您发送一个您可重设密码的链接
+    NOTERESETPASSWORD: '输入您的电邮地址，我们会给您发送一个您可重设密码的链接'
     PASSWORDSENTHEADER: 'Password reset link sent to ''{email}'''
     PASSWORDSENTTEXT: 'Thank you! A reset link has been sent to ''{email}'', provided an account exists for this email address.'
   SecurityAdmin:
@@ -515,9 +529,22 @@ zh_CN:
     BtnImport: 'Import from CSV'
     FileFieldLabel: 'CSV File <small>(Allowed extensions: *.csv)</small>'
   SilverStripeNavigator:
+    Auto: Auto
+    ChangeViewMode: 'Change view mode'
+    Desktop: Desktop
+    DualWindowView: 'Dual Window'
     Edit: Edit
+    EditView: 'Edit mode'
+    Mobile: Mobile
+    PreviewState: 'Preview State'
+    PreviewView: 'Preview mode'
+    Responsive: Responsive
+    SplitView: 'Split mode'
+    Tablet: Tablet
+    ViewDeviceWidth: 'Select a preview width'
+    Width: width
   SimpleImageField:
-    NOUPLOAD: 没有上传的图像
+    NOUPLOAD: '没有上传的图像'
   SiteTree:
     TABMAIN: 主要部分
   TableField:
@@ -551,6 +578,8 @@ zh_CN:
     ATTACHFILE: 'Attach a file'
     ATTACHFILES: 'Attach files'
     AttachFile: 'Attach file(s)'
+    CHOOSEANOTHERFILE: 'Choose another file'
+    CHOOSEANOTHERINFO: 'Replace this file with another one from the file store'
     DELETE: 'Delete from files'
     DELETEINFO: 'Permanently delete this file from the file store'
     DOEDIT: Save
@@ -565,12 +594,15 @@ zh_CN:
     FROMFILES: 'From files'
     HOTLINKINFO: 'Info: This image will be hotlinked. Please ensure you have permissions from the original site creator to do so.'
     MAXNUMBEROFFILES: 'Max number of {count} file(s) exceeded.'
+    MAXNUMBEROFFILESONE: 'Can only upload one file'
     MAXNUMBEROFFILESSHORT: 'Can only upload {count} files'
+    OVERWRITEWARNING: 'File with the same name already exists'
     REMOVE: Remove
     REMOVEERROR: 'Error removing file'
     REMOVEINFO: 'Remove this file from here, but do not delete it from the file store'
     STARTALL: 'Start all'
     STARTALLINFO: 'Start all uploads'
     Saved: Saved
+    UPLOADSINTO: 'saves into /{path}'
   Versioned:
     has_many_Versions: Versions

lang/zh_TW.yml

@@ -2,13 +2,14 @@ zh_TW:
   AssetAdmin:
     ALLOWEDEXTS: 'Allowed extensions'
     NEWFOLDER: 新資料夾
+    SHOWALLOWEDEXTS: 'Show allowed extensions'
   AssetTableField:
     CREATED: 第一次上傳
     DIM: 尺寸
     FILENAME: 檔案名稱
     FOLDER: Folder
     LASTEDIT: 最後一次更新
-    OWNER: 擁有者
+    OWNER: '擁有者'
     SIZE: 大小
     TITLE: 標題
     TYPE: 類型
@@ -55,13 +56,13 @@ zh_TW:
   BackLink_Button.ss:
     Back: Back
   BasicAuth:
-    ENTERINFO: 請輸入帳號密碼。
-    ERRORNOTADMIN: 那個使用者不是管理員。
+    ENTERINFO: '請輸入帳號密碼。'
+    ERRORNOTADMIN: '那個使用者不是管理員。'
     ERRORNOTREC: 那組帳號密碼不對。
   Boolean:
-    0: 'False'
     ANY: Any
-    1: 'True'
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   CMSLoadingScreen.ss:
     LOADING: Loading...
     REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
@@ -70,17 +71,19 @@ zh_TW:
     ACCESSALLINTERFACES: 'Access to all CMS sections'
     ACCESSALLINTERFACESHELP: 'Overrules more specific access settings.'
     SAVE: 儲存
+  CMSPageHistoryController_versions.ss:
+    PREVIEW: 'Website preview'
   CMSProfileController:
     MENUTITLE: 'My Profile'
   ChangePasswordEmail.ss:
     CHANGEPASSWORDTEXT1: 您為這個帳戶改密碼：
-    CHANGEPASSWORDTEXT2: 您可以用下列的帳號密碼登入：
+    CHANGEPASSWORDTEXT2: '您可以用下列的帳號密碼登入：'
     EMAIL: Email
     HELLO: 您好
     PASSWORD: Password
   CheckboxField:
-    - 'False'
-    - 'True'
+    NOANSWER: 'False'
+    YESANSWER: 'True'
   ComplexTableField:
     CLOSEPOPUP: 'Close Popup'
     SUCCESSADD2: 'Added {name}'
@@ -109,20 +112,21 @@ zh_TW:
     PLURALNAME: 'Data Objects'
     SINGULARNAME: 'Data Object'
   Date:
-    DAY: 日
-    DAYS: 日
-    HOUR: 小時
-    HOURS: 小時
-    MIN: 分鐘
-    MINS: 分鐘
-    MONTH: 月
-    MONTHS: 月
-    SEC: 秒
-    SECS: 秒
+    DAY: day
+    DAYS: days
+    HOUR: hour
+    HOURS: hours
+    LessThanMinuteAgo: 'less than a minute'
+    MIN: min
+    MINS: mins
+    MONTH: month
+    MONTHS: months
+    SEC: sec
+    SECS: secs
     TIMEDIFFAGO: '{difference} ago'
     TIMEDIFFIN: 'in {difference}'
-    YEAR: 年
-    YEARS: 年
+    YEAR: year
+    YEARS: years
   DateField:
     NOTSET: 'not set'
     TODAY: today
@@ -198,16 +202,18 @@ zh_TW:
     TEXT2: 'password reset link'
     TEXT3: for
   Form:
-    FIELDISREQUIRED: '必須要填 %s'
+    CSRF_FAILED_MESSAGE: 'There seems to have been a technical problem. Please click the back button, refresh your browser, and try again.'
+    FIELDISREQUIRED: '{name} is required'
     SubmitBtnLabel: Go
     VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
-    VALIDATIONNOTUNIQUE: 您輸入的數值並不是獨特的。
-    VALIDATIONPASSWORDSDONTMATCH: 密碼不相配
+    VALIDATIONNOTUNIQUE: '您輸入的數值並不是獨特的。'
+    VALIDATIONPASSWORDSDONTMATCH: '密碼不相配'
     VALIDATIONPASSWORDSNOTEMPTY: 密碼不能是空的
     VALIDATIONSTRONGPASSWORD: 'Passwords must have at least one digit and one alphanumeric character'
     VALIDATOR: Validator
     VALIDCURRENCY: 'Please enter a valid currency'
   FormField:
+    Example: 'e.g. %s'
     NONE: none
   GridAction:
     DELETE_DESCRIPTION: Delete
@@ -230,6 +236,7 @@ zh_TW:
     ResetFilter: Reset
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'No delete permissions'
+    EditPermissionsFailure: 'No permission to unlink record'
   GridFieldDetailForm:
     CancelBtn: Cancel
     Create: Create
@@ -237,7 +244,9 @@ zh_TW:
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
     Save: Save
-    Saved: 'Saved %s %s'
+    Saved: 'Saved {name} {link}'
+  GridFieldEditButton.ss:
+    EDIT: Edit
   GridFieldItemEditView.ss: null
   Group:
     AddRole: 'Add a role for this group'
@@ -267,16 +276,17 @@ zh_TW:
     ADDURL: 'Add URL'
     ADJUSTDETAILSDIMENSIONS: 'Details & dimensions'
     ANCHORVALUE: Anchor
+    BUTTONADDURL: 'Add url'
     BUTTONINSERT: Insert
-    BUTTONINSERTLINK: 插入連結
+    BUTTONINSERTLINK: '插入連結'
     BUTTONREMOVELINK: 移除連結
     BUTTONUpdate: Update
     CAPTIONTEXT: 'Caption text'
     CSSCLASS: 對齊/樣式
     CSSCLASSCENTER: 獨立置中
-    CSSCLASSLEFT: 靠左被字包圍。
+    CSSCLASSLEFT: '靠左被字包圍。'
     CSSCLASSLEFTALONE: 'On the left, on its own.'
-    CSSCLASSRIGHT: 靠右被字包圍。
+    CSSCLASSRIGHT: '靠右被字包圍。'
     DETAILS: Details
     EMAIL: 電子郵件地址
     FILE: 檔案
@@ -295,7 +305,7 @@ zh_TW:
     IMAGETITLETEXTDESC: 'For additional information about the image'
     IMAGEWIDTHPX: 寬
     INSERTMEDIA: 'Insert Media'
-    LINK: 插入或編輯選取的連結
+    LINK: '插入或編輯選取的連結'
     LINKANCHOR: 'Anchor on this page'
     LINKDESCR: 連結敘述
     LINKEMAIL: 電子郵件地址
@@ -304,7 +314,7 @@ zh_TW:
     LINKINTERNAL: 此網站
     LINKOPENNEWWIN: 在新視窗打開連結
     LINKTO: 連結至
-    PAGE: 網頁
+    PAGE: '網頁'
     URL: 網址
     URLNOTANOEMBEDRESOURCE: 'The URL ''{url}'' could not be turned into a media resource.'
     UpdateMEDIA: 'Update Media'
@@ -323,15 +333,18 @@ zh_TW:
     DELETED: Deleted.
     DropdownBatchActionsDefault: Actions
     HELP: 說明
-    PAGETYPE: 網頁類型：
-    PERMAGAIN: 您已被登出，請在下面重新登入。
-    PERMALREADY: 抱歉，您沒有權力使用這個部分。您可以用別的帳號登入。
-    PERMDEFAULT: 請選擇一個認證方法並登入。
-    PLEASESAVE: 請儲存：這個網頁沒有被更新因為尚未被儲存。
+    PAGETYPE: '網頁類型：'
+    PERMAGAIN: '您已被登出，請在下面重新登入。'
+    PERMALREADY: '抱歉，您沒有權力使用這個部分。您可以用別的帳號登入。'
+    PERMDEFAULT: '請選擇一個認證方法並登入。'
+    PLEASESAVE: '請儲存：這個網頁沒有被更新因為尚未被儲存。'
     PreviewButton: Preview
     REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
     SAVEDUP: Saved.
-    VersionUnknown: unknown
+    ShowAsList: 'show as list'
+    TooManyPages: 'Too many pages'
+    ValidationError: 'Validation error'
+    VersionUnknown: Unknown
   LeftAndMain_Menu.ss:
     Hello: Hi
     LOGOUT: 'Log out'
@@ -344,8 +357,8 @@ zh_TW:
   Member:
     ADDGROUP: 'Add group'
     BUTTONCHANGEPASSWORD: 更改密碼
-    BUTTONLOGIN: 登入
-    BUTTONLOGINOTHER: 用別的帳戶登入
+    BUTTONLOGIN: '登入'
+    BUTTONLOGINOTHER: '用別的帳戶登入'
     BUTTONLOSTPASSWORD: 忘記密碼
     CANTEDIT: 'You don''t have permission to do that'
     CONFIRMNEWPASSWORD: 確認新密碼
@@ -357,7 +370,7 @@ zh_TW:
     EMPTYNEWPASSWORD: 'The new password can''t be empty, please try again'
     ENTEREMAIL: 'Please enter an email address to get a password reset link.'
     ERRORLOCKEDOUT: 'Your account has been temporarily disabled because of too many failed attempts at logging in. Please try again in 20 minutes.'
-    ERRORNEWPASSWORD: 新密碼不相配，請再試一次。
+    ERRORNEWPASSWORD: '新密碼不相配，請再試一次。'
     ERRORPASSWORDNOTMATCH: 舊密碼不對，請再試一次。
     ERRORWRONGCRED: 密碼或電子郵件地址錯誤。請再是一次。
     FIRSTNAME: 名
@@ -407,6 +420,7 @@ zh_TW:
     TWODIGITMONTH: 'Two-digit month (01=January, etc.)'
     TWODIGITSECOND: 'Two digits of second (00 through 59)'
     TWODIGITYEAR: 'Two-digit year'
+    Toggle: 'Show formatting help'
   MemberImportForm:
     Help1: '<p>Import users in <em>CSV format</em> (comma-separated values). <small><a href="#" class="toggle-advanced">Show advanced usage</a></small></p>'
     Help2: '<div class="advanced">	<h4>Advanced usage</h4>	<ul>	<li>Allowed columns: <em>%s</em></li>	<li>Existing users are matched by their unique <em>Code</em> property, and updated with any new values from	the imported file.</li>	<li>Groups can be assigned by the <em>Groups</em> column. Groups are identified by their <em>Code</em> property,	multiple groups can be separated by comma. Existing group memberships are not cleared.</li>	</ul></div>'
@@ -421,7 +435,7 @@ zh_TW:
   ModelAdmin:
     DELETE: Delete
     DELETEDRECORDS: 'Deleted {count} records.'
-    EMPTYBEFOREIMPORT: 'Clear Database before import'
+    EMPTYBEFOREIMPORT: 'Replace data'
     IMPORT: 'Import from CSV'
     IMPORTEDRECORDS: 'Imported {count} records.'
     NOCSVFILE: 'Please browse for a CSV file to import'
@@ -474,23 +488,23 @@ zh_TW:
     PERMISSIONS_CATEGORY: 'Roles and access permissions'
     UserPermissionsIntro: 'Assigning groups to this user will adjust the permissions they have. See the groups section for details of permissions on individual groups.'
   PhoneNumberField:
-    VALIDATION: 請輸入有效的電話號碼
+    VALIDATION: '請輸入有效的電話號碼'
   RelationComplexTableField.ss:
     ADD: Add
     CSVEXPORT: 'Export to CSV'
     NOTFOUND: 'No items found'
   Security:
-    ALREADYLOGGEDIN: 你不能瀏覽此頁。請用別的帳戶登入。
+    ALREADYLOGGEDIN: '你不能瀏覽此頁。請用別的帳戶登入。'
     BUTTONSEND: 寄給我密碼重設網址。
     CHANGEPASSWORDBELOW: 請在下面更改密碼。
     CHANGEPASSWORDHEADER: 更改密碼
-    ENTERNEWPASSWORD: 請輸入新的密碼。
-    ERRORPASSWORDPERMISSION: 你必須先登入才能改密碼！
-    LOGGEDOUT: 你已登出。您在下面再登入一次。
+    ENTERNEWPASSWORD: '請輸入新的密碼。'
+    ERRORPASSWORDPERMISSION: '你必須先登入才能改密碼！'
+    LOGGEDOUT: '你已登出。您在下面再登入一次。'
     LOGIN: 'Log in'
-    NOTEPAGESECURED: 那的網頁是被保護的。請先登入。
+    NOTEPAGESECURED: '那的網頁是被保護的。請先登入。'
     NOTERESETLINKINVALID: '<p>The password reset link is invalid or expired.</p><p>You can request a new one <a href="{link1}">here</a> or change your password after you <a href="{link2}">logged in</a>.</p>'
-    NOTERESETPASSWORD: 請輸入您的電子郵件。我們將寄給你重設密媽的網址。
+    NOTERESETPASSWORD: '請輸入您的電子郵件。我們將寄給你重設密媽的網址。'
     PASSWORDSENTHEADER: 'Password reset link sent to ''{email}'''
     PASSWORDSENTTEXT: 'Thank you! A reset link has been sent to ''{email}'', provided an account exists for this email address.'
   SecurityAdmin:
@@ -515,7 +529,20 @@ zh_TW:
     BtnImport: 'Import from CSV'
     FileFieldLabel: 'CSV File <small>(Allowed extensions: *.csv)</small>'
   SilverStripeNavigator:
+    Auto: Auto
+    ChangeViewMode: 'Change view mode'
+    Desktop: Desktop
+    DualWindowView: 'Dual Window'
     Edit: Edit
+    EditView: 'Edit mode'
+    Mobile: Mobile
+    PreviewState: 'Preview State'
+    PreviewView: 'Preview mode'
+    Responsive: Responsive
+    SplitView: 'Split mode'
+    Tablet: Tablet
+    ViewDeviceWidth: 'Select a preview width'
+    Width: width
   SimpleImageField:
     NOUPLOAD: 沒有上傳圖片
   SiteTree:
@@ -551,6 +578,8 @@ zh_TW:
     ATTACHFILE: 'Attach a file'
     ATTACHFILES: 'Attach files'
     AttachFile: 'Attach file(s)'
+    CHOOSEANOTHERFILE: 'Choose another file'
+    CHOOSEANOTHERINFO: 'Replace this file with another one from the file store'
     DELETE: 'Delete from files'
     DELETEINFO: 'Permanently delete this file from the file store'
     DOEDIT: Save
@@ -565,12 +594,15 @@ zh_TW:
     FROMFILES: 'From files'
     HOTLINKINFO: 'Info: This image will be hotlinked. Please ensure you have permissions from the original site creator to do so.'
     MAXNUMBEROFFILES: 'Max number of {count} file(s) exceeded.'
+    MAXNUMBEROFFILESONE: 'Can only upload one file'
     MAXNUMBEROFFILESSHORT: 'Can only upload {count} files'
+    OVERWRITEWARNING: 'File with the same name already exists'
     REMOVE: Remove
     REMOVEERROR: 'Error removing file'
     REMOVEINFO: 'Remove this file from here, but do not delete it from the file store'
     STARTALL: 'Start all'
     STARTALLINFO: 'Start all uploads'
     Saved: Saved
+    UPLOADSINTO: 'saves into /{path}'
   Versioned:
     has_many_Versions: Versions