Skip to content

Commit

Permalink
Merge branch '4' into 5.1
Browse files Browse the repository at this point in the history
  • Loading branch information
GuySartorelli committed Feb 13, 2024
2 parents b56e771 + 33ff90c commit 81cd33b
Show file tree
Hide file tree
Showing 57 changed files with 333 additions and 321 deletions.
8 changes: 0 additions & 8 deletions lang/ast.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
ast:
SilverStripe\AssetAdmin\Forms\UploadField:
EDIT: Edit
SilverStripe\Control\ChangePasswordEmail_ss:
CHANGEPASSWORDTEXT1: 'Camudasti la contraseña pa'
SilverStripe\Forms\ConfirmedPasswordField:
Expand All @@ -10,12 +8,6 @@ ast:
TODAY: hoi
SilverStripe\Forms\DropdownField:
CHOOSE: (Escoyer)
SilverStripe\Forms\GridField\GridFieldEditButton:
EDIT: Edit
SilverStripe\Forms\GridField\GridFieldPaginator:
View: View
SilverStripe\Forms\GridField\GridFieldViewButton:
VIEW: View
SilverStripe\Forms\NullableField:
IsNullLabel: 'Ye nulu'
SilverStripe\ORM\DataObject:
Expand Down
6 changes: 0 additions & 6 deletions lang/az.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
az:
SilverStripe\AssetAdmin\Forms\UploadField:
Dimensions: Ölçülər
EDIT: Edit
SilverStripe\Control\ChangePasswordEmail_ss:
CHANGEPASSWORDTEXT1: 'Siz parolu bu url üçün dəyişdiniz'
HELLO: Salam
Expand Down Expand Up @@ -32,13 +31,8 @@ az:
SilverStripe\Forms\GridField\GridFieldDetailForm:
Delete: 'Dərc olunmuş saytdan sil'
Save: 'Yadda saxla'
SilverStripe\Forms\GridField\GridFieldEditButton:
EDIT: Edit
SilverStripe\Forms\GridField\GridFieldPaginator:
Page: Səhifə
View: View
SilverStripe\Forms\GridField\GridFieldViewButton:
VIEW: View
SilverStripe\Forms\MoneyField:
FIELDLABELAMOUNT: Miqdar
FIELDLABELCURRENCY: Valyuta
Expand Down
2 changes: 0 additions & 2 deletions lang/bg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,6 @@ bg:
INVALID_CURRENCY: 'Валутата {currency} не е в списъка с разрешени валути'
SilverStripe\Forms\MultiSelectField:
SOURCE_VALIDATION: 'Изберете стойност от списъка. {value} не е валидна опция(и)'
SilverStripe\Forms\NullableField:
IsNullLabel: 'Is Null'
SilverStripe\Forms\NumericField:
VALIDATION: '''{value}'' не е число, само числа могат да се въвеждат в това поле'
SilverStripe\Forms\TimeField:
Expand Down
7 changes: 0 additions & 7 deletions lang/bs.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
bs:
SilverStripe\AssetAdmin\Forms\UploadField:
Dimensions: Dimenzije
EDIT: Edit
SilverStripe\Control\ChangePasswordEmail_ss:
CHANGEPASSWORDTEXT1: 'Promijenili ste svoju šifru za'
HELLO: Pozdrav
Expand Down Expand Up @@ -30,18 +29,12 @@ bs:
TABMAIN: Glavno
SilverStripe\Forms\GridField\GridField:
CSVEXPORT: 'Izvezi u CSV'
Filter: Filter
Print: Štampaj
SilverStripe\Forms\GridField\GridFieldDetailForm:
Create: Kreiraj
Save: Snimi
SilverStripe\Forms\GridField\GridFieldEditButton:
EDIT: Edit
SilverStripe\Forms\GridField\GridFieldPaginator:
Page: Stranica
View: View
SilverStripe\Forms\GridField\GridFieldViewButton:
VIEW: View
SilverStripe\ORM\FieldType\DBBoolean:
ANY: 'Bilo koji'
NOANSWER: Ne
Expand Down
7 changes: 0 additions & 7 deletions lang/ca.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
ca:
SilverStripe\AssetAdmin\Forms\UploadField:
EDIT: Edit
SilverStripe\Control\ChangePasswordEmail_ss:
CHANGEPASSWORDTEXT1: 'Heu canviat la vostra contrasenya per'
HELLO: Hola
Expand Down Expand Up @@ -32,13 +30,8 @@ ca:
SilverStripe\Forms\GridField\GridFieldDetailForm:
Delete: Suprimeix
Save: Desa
SilverStripe\Forms\GridField\GridFieldEditButton:
EDIT: Edit
SilverStripe\Forms\GridField\GridFieldPaginator:
Page: Pàgina
View: View
SilverStripe\Forms\GridField\GridFieldViewButton:
VIEW: View
SilverStripe\ORM\DataObject:
PLURALNAME: 'Objectes de dades'
SINGULARNAME: 'Objecte de dades'
Expand Down
3 changes: 0 additions & 3 deletions lang/cs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,6 @@ cs:
has_many_Permissions: Oprávnění
many_many_Members: Členové
many_many_Roles: Role
many_many_Subsites: Subsites
SilverStripe\Security\LoginAttempt:
Email: 'Emailové adresy'
IP: 'IP adresy'
Expand Down Expand Up @@ -247,7 +246,6 @@ cs:
SilverStripe\Security\PermissionRole:
OnlyAdminCanApply: 'Pouze administrátor může použít'
PLURALNAME: Role
SINGULARNAME: Role
Title: Název
belongs_many_many_Groups: Skupiny
db_OnlyAdminCanApply: 'Pouze administrátor může použít'
Expand All @@ -256,7 +254,6 @@ cs:
PLURALNAME: 'Kódy role oprávnění'
PermsError: 'Nelze připojit kód "{code}" s privilegovanými právy (vyžaduje ADMIN přístup)'
SINGULARNAME: 'Kód role oprávnění'
has_one_Role: Role
SilverStripe\Security\RememberLoginHash:
has_one_Member: Člen
SilverStripe\Security\Security:
Expand Down
10 changes: 0 additions & 10 deletions lang/da.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ da:
HELLO: Hej
TEXT1: 'Her er din'
TEXT2: 'link til at nulstille dit kodeord'
TEXT3: for
SilverStripe\Control\RequestProcessor:
INVALID_REQUEST: 'Ugyldig forespørgsel'
REQUEST_ABORTED: 'Forespørgsel annulleret'
Expand Down Expand Up @@ -67,15 +66,12 @@ da:
CSVIMPORT: 'Importer CSV'
Filter: Filtrer
FilterBy: 'Filtrer på'
Find: Find
LinkExisting: 'Link eksisterende'
NewRecord: 'Ny {type}'
NoItemsFound: 'Ingen elementer fundet'
PRINTEDAT: 'Printet d.'
PRINTEDBY: 'Printet af'
PlaceHolder: 'Find {type}'
PlaceHolderWithLabels: 'Find {type} på {name}'
Print: Print
RelationSearch: Relationssøgning
ResetFilter: Nulstil
SilverStripe\Forms\GridField\GridFieldDeleteAction:
Expand Down Expand Up @@ -211,8 +207,6 @@ da:
one: 'Et loginforsøg'
other: '{count} loginforsøg'
SINGULARNAME: 'Login forsøg'
Status: Status
db_Status: Status
has_one_Member: Bruger
SilverStripe\Security\Member:
ADDGROUP: 'Tilføj gruppe'
Expand All @@ -225,7 +219,6 @@ da:
CONFIRMPASSWORD: 'Bekræft kodeord'
CURRENT_PASSWORD: 'Nuværende kodeord'
EDIT_PASSWORD: 'Nyt kodeord'
EMAIL: Email
EMPTYNEWPASSWORD: 'Det nye kodeord kan ikke være tom, prøv venligst igen'
ENTEREMAIL: 'Indtast venligst en email adresse for at få et nulstillingslink.'
ERRORLOCKEDOUT2: 'Din konto er blevet midlertidigt deaktiveret pga. for mange fejlslagne loginforsøg. Forsøg venligst igen om {count} minutter.'
Expand All @@ -251,7 +244,6 @@ da:
ValidationIdentifierFailed: 'Kan ikke overskrive eksisterende bruger #{id} med identisk identifikator ({name} = {value}))'
YOUROLDPASSWORD: 'Dit gamle kodeord'
belongs_many_many_Groups: Grupper
db_Email: Email
db_Locale: 'Sprog i brugerfladen'
db_LockedOutUntil: 'Låst ude indtil'
db_Password: Kodeord
Expand Down Expand Up @@ -281,7 +273,6 @@ da:
PREVPASSWORD: 'Du har tidligere brugt dette kodeord, vælg venligst et nyt kodeord'
TOOSHORT: 'Kodeordet er for kort, det skal mindst være {minimum} eller flere tegn langt'
SilverStripe\Security\Permission:
AdminGroup: Administrator
CMS_ACCESS_CATEGORY: 'CMS Adgang'
CONTENT_CATEGORY: Indholdsrettigheder
FULLADMINRIGHTS: 'Fuld administrator rettighed'
Expand All @@ -293,7 +284,6 @@ da:
other: '{count} rettigheder'
SINGULARNAME: Rettighed
UserPermissionsIntro: 'Tildeling af grupper til denne bruger, ændrer de rettigheder brugeren har. Se gruppe området for rettigheds detaljer på de individuelle grupper.'
db_Type: Type
has_one_Group: Gruppe
SilverStripe\Security\PermissionCheckboxSetField:
AssignedTo: 'tildelt til "{title}"'
Expand Down
11 changes: 2 additions & 9 deletions lang/de.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ de:
Add: '{name} hinzufügen'
CSVEXPORT: 'Als CSV-Datei exportieren'
CSVIMPORT: 'CSV importieren'
Filter: Filter
FilterBy: 'Filtern nach'
Find: Suchen
LinkExisting: 'Bestehenden Datensatz verknüpfen'
Expand Down Expand Up @@ -128,7 +127,6 @@ de:
VIEW: Anzeigen
SilverStripe\Forms\HTMLEditor\TinyMCEConfig:
BEST_FIT: passend
ORIGINAL: Original
PIXEL_WIDTH: '{width} Pixel'
SilverStripe\Forms\MoneyField:
FIELDLABELAMOUNT: Betrag
Expand All @@ -144,6 +142,8 @@ de:
VALIDATEMAXLENGTH: 'Der für {name} eingegebene Wert darf nicht mehr als {maxLength} Zeichen lang sein'
SilverStripe\Forms\TimeField:
VALIDATEFORMAT: 'Bitte geben Sie die Uhrzeit im korrekten Format ein ({format})'
SilverStripe\Forms\UrlField:
INVALID: 'Bitte geben Sie eine gültige URL ein'
SilverStripe\ORM\DataObject:
PLURALNAME: DatenObjekte
PLURALS:
Expand Down Expand Up @@ -172,7 +172,6 @@ de:
one: '{count} Sekunde'
other: '{count} Sekunden'
TIMEDIFFAGO: 'vor {difference}'
TIMEDIFFIN: 'in {difference}'
YEARS_SHORT_PLURALS:
one: '{count} Jahr'
other: '{count} Jahre'
Expand Down Expand Up @@ -242,7 +241,6 @@ de:
has_one_Parent: Übergeordnet
many_many_Members: Mitglieder
many_many_Roles: Rollen
many_many_Subsites: Subsites
SilverStripe\Security\LoginAttempt:
Email: E-Mail-Adresse
EmailHashed: 'E-Mail-Adresse (gehashed)'
Expand All @@ -252,8 +250,6 @@ de:
one: 'Ein Loginversuch'
other: '{count} Loginversuche'
SINGULARNAME: Loginversuch
Status: Status
db_Status: Status
has_one_Member: Benutzer
SilverStripe\Security\Member:
ADDGROUP: 'Gruppe hinzufügen'
Expand Down Expand Up @@ -326,7 +322,6 @@ de:
PREVPASSWORD: 'Sie haben dieses Passwort schon einmal verwendet. Bitte wählen Sie ein neues Passwort'
TOOSHORT: 'Das Passwort ist zu kurz, es muss mindestens {minimum} Zeichen lang sein'
SilverStripe\Security\Permission:
AdminGroup: Administrator
CMS_ACCESS_CATEGORY: 'CMS Zugriff'
CONTENT_CATEGORY: Inhaltsberechtigungen
FULLADMINRIGHTS: 'Unbeschränkte Administratorenrechte'
Expand Down Expand Up @@ -365,11 +360,9 @@ de:
SINGULARNAME: Berechtigungsrollencode
has_one_Role: Rolle
SilverStripe\Security\RememberLoginHash:
PLURALNAME: 'Login Hashes'
PLURALS:
one: 'Ein Login Hash'
other: '{count} Login Hashes'
SINGULARNAME: 'Login Hash'
has_one_Member: Benutzer
SilverStripe\Security\Security:
ALREADYLOGGEDIN: 'Sie haben keinen Zugriff auf diese Seite. Wenn Sie ein anderes Konto besitzen, mit dem Sie auf diese Seite zugreifen können, melden Sie sich bitte unten an.'
Expand Down
4 changes: 0 additions & 4 deletions lang/de_DE.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@ de_DE:
one: '{count} Sekunde'
other: '{count} Sekunden'
TIMEDIFFAGO: 'vor {difference}'
TIMEDIFFIN: 'in {difference}'
YEARS_SHORT_PLURALS:
one: '{count} Jahr'
other: '{count} Jahre'
Expand Down Expand Up @@ -130,8 +129,6 @@ de_DE:
one: 'Ein Loginversuch'
other: '{count} Loginversuche'
SINGULARNAME: Loginversuch
Status: Status
db_Status: Status
has_one_Member: Mitglied
SilverStripe\Security\Member:
ADDGROUP: 'Gruppe hinzufügen'
Expand Down Expand Up @@ -170,7 +167,6 @@ de_DE:
db_Password: Passwort
has_one_Member: Mitglied
SilverStripe\Security\Permission:
AdminGroup: Administrator
PLURALNAME: Rechte
db_Type: Typ
has_one_Group: Gruppe
Expand Down
8 changes: 0 additions & 8 deletions lang/el.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
el:
SilverStripe\AssetAdmin\Forms\UploadField:
Dimensions: Διαστάσεις
EDIT: Edit
SilverStripe\Forms\CheckboxField:
NOANSWER: Όχι
YESANSWER: Ναί
Expand All @@ -17,13 +16,8 @@ el:
Create: Δημιουργία
Delete: Διαγραφή
Save: Αποθήκευση
SilverStripe\Forms\GridField\GridFieldEditButton:
EDIT: Edit
SilverStripe\Forms\GridField\GridFieldPaginator:
Page: Σελίδα
View: View
SilverStripe\Forms\GridField\GridFieldViewButton:
VIEW: View
SilverStripe\ORM\FieldType\DBBoolean:
ANY: Οποιοδήποτε
NOANSWER: Όχι
Expand All @@ -36,9 +30,7 @@ el:
db_Title: Τίτλος
SilverStripe\Security\Member:
BUTTONLOGOUT: Αποσύνδεση
EMAIL: Email
PASSWORD: Κωδικός
db_Email: Email
db_Password: Κωδικός
SilverStripe\Security\MemberAuthenticator\CMSMemberLoginForm:
BUTTONLOGOUT: Αποσύνδεση
Expand Down
27 changes: 23 additions & 4 deletions lang/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,22 @@ en:
SilverStripe\Control\RequestProcessor:
INVALID_REQUEST: 'Invalid request'
REQUEST_ABORTED: 'Request aborted'
SilverStripe\Dev\DevBuildController:
CAN_DEV_BUILD_DESCRIPTION: 'Can execute /dev/build'
CAN_DEV_BUILD_HELP: 'Can execute the build command (/dev/build).'
SilverStripe\Dev\DevConfigController:
CAN_DEV_CONFIG_DESCRIPTION: 'Can view /dev/config'
CAN_DEV_CONFIG_HELP: 'Can view all application configuration (/dev/config).'
SilverStripe\Dev\DevConfirmationController:
INFO_DESCRIPTION: 'Confirm potentially dangerous operation'
INFO_TITLE: 'Security Confirmation'
SilverStripe\Dev\DevelopmentAdmin:
ALL_DEV_ADMIN_DESCRIPTION: 'Can view and execute all /dev endpoints'
ALL_DEV_ADMIN_HELP: 'Can view and execute all /dev endpoints'
PERMISSIONS_CATEGORY: 'Dev permissions'
SilverStripe\Dev\TaskRunner:
BUILDTASK_CAN_RUN_DESCRIPTION: 'Can view and execute all /dev/tasks'
BUILDTASK_CAN_RUN_HELP: 'Can view and execute all Build Tasks (/dev/tasks). This may still be overriden by individual task view permissions'
SilverStripe\Forms\CheckboxField:
NOANSWER: 'No'
YESANSWER: 'Yes'
Expand Down Expand Up @@ -111,9 +124,9 @@ en:
NEW: 'Add new record'
NEXT: 'Go to next record'
PREVIOUS: 'Go to previous record'
ViewPermissionsFailure: 'It seems you don''t have the necessary permissions to view "{ObjectTitle}"'
SAVETOASTMESSAGE: 'Saved {type} "{title}" successfully.'
SAVEDUP: 'Saved successfully.'
SAVETOASTMESSAGE: 'Saved {type} "{title}" successfully.'
ViewPermissionsFailure: 'It seems you don''t have the necessary permissions to view "{ObjectTitle}"'
SilverStripe\Forms\GridField\GridFieldEditButton:
EDIT: Edit
SilverStripe\Forms\GridField\GridFieldFilterHeader:
Expand All @@ -140,11 +153,17 @@ en:
SilverStripe\Forms\NullableField:
IsNullLabel: 'Is Null'
SilverStripe\Forms\NumericField:
VALIDATION: "'{value}' is not a number, only numbers can be accepted for this field"
VALIDATION: '''{value}'' is not a number, only numbers can be accepted for this field'
SilverStripe\Forms\SearchableDropdownTrait:
SELECT: Select...
SELECT_OR_TYPE_TO_SEARCH: 'Select or type to search...'
TYPE_TO_SEARCH: 'Type to search...'
SilverStripe\Forms\TextField:
VALIDATEMAXLENGTH: 'The value for {name} must not exceed {maxLength} characters in length'
SilverStripe\Forms\TimeField:
VALIDATEFORMAT: 'Please enter a valid time format ({format})'
SilverStripe\Forms\UrlField:
INVALID: 'Please enter a valid URL'
SilverStripe\ORM\DataObject:
GENERALSEARCH: 'General Search'
PLURALNAME: 'Data Objects'
Expand Down Expand Up @@ -291,7 +310,7 @@ en:
EDIT_PASSWORD: 'New Password'
EMAIL: Email
EMAIL_FAILED: 'There was an error when trying to email you a password reset link.'
EMPTYNEWPASSWORD: "The new password can't be empty, please try again"
EMPTYNEWPASSWORD: 'The new password can''t be empty, please try again'
ENTEREMAIL: 'Please enter an email address to get a password reset link.'
ERRORLOCKEDOUT2: 'Your account has been temporarily disabled because of too many failed attempts at logging in. Please try again in {count} minutes.'
ERRORNEWPASSWORD: 'You have entered your new password differently, try again'
Expand Down
2 changes: 0 additions & 2 deletions lang/en_GB.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
en_GB:
SilverStripe\Security\Member:
ERRORNEWPASSWORD: 'You have entered your new password differently, try again'
SilverStripe\Security\Security:
ALREADYLOGGEDIN: 'You don''t have access to this page. If you have another account that can access that page, you can log in again.'
Loading

0 comments on commit 81cd33b

Please sign in to comment.