diff --git a/admin/code/ModelAdmin.php b/admin/code/ModelAdmin.php index aaeee5506..a08ab53d0 100644 --- a/admin/code/ModelAdmin.php +++ b/admin/code/ModelAdmin.php @@ -445,8 +445,14 @@ abstract class ModelAdmin extends LeftAndMain { // Show the class name rather than ModelAdmin title as root node $models = $this->getManagedModels(); + $params = $this->request->getVars(); + if(isset($params['url'])) unset($params['url']); + $items[0]->Title = $models[$this->modelClass]['title']; - $items[0]->Link = $this->Link($this->sanitiseClassName($this->modelClass)); + $items[0]->Link = Controller::join_links( + $this->Link($this->sanitiseClassName($this->modelClass)), + '?' . http_build_query($params) + ); return $items; } diff --git a/core/Core.php b/core/Core.php index e23eadbb9..0ff5d2425 100644 --- a/core/Core.php +++ b/core/Core.php @@ -46,19 +46,22 @@ error_reporting(E_ALL | E_STRICT); /** * Include _ss_environment.php files */ -$envFiles = array( - '_ss_environment.php', - '../_ss_environment.php', - '../../_ss_environment.php', - '../../../_ss_environment.php'); - -foreach($envFiles as $envFile) { - if(@file_exists($envFile)) { - define('SS_ENVIRONMENT_FILE', $envFile); - include_once($envFile); +//define the name of the environment file +$envFile = '_ss_environment.php'; +//define the dir to start scanning from (have to add the trailing slash) +$dir = '.'; +//check this dir and every parent dir (until we hit the base of the drive) +do { + $dir = realpath($dir) . '/'; + //if the file exists, then we include it, set relevant vars and break out + if (file_exists($dir . $envFile)) { + define('SS_ENVIRONMENT_FILE', $dir . $envFile); + include_once(SS_ENVIRONMENT_FILE); break; } -} +//here we need to check that the real path of the last dir and the next one are +// not the same, if they are, we have hit the root of the drive +} while (realpath($dir) != realpath($dir .= '../')); /////////////////////////////////////////////////////////////////////////////// // GLOBALS AND DEFINE SETTING diff --git a/dev/install/install.php5 b/dev/install/install.php5 index d3ec3783e..59fb35fa3 100644 --- a/dev/install/install.php5 +++ b/dev/install/install.php5 @@ -31,15 +31,24 @@ if (function_exists('session_start')) { // Include environment files $usingEnv = false; $envFileExists = false; -$envFiles = array('_ss_environment.php', '../_ss_environment.php', '../../_ss_environment.php'); -foreach($envFiles as $envFile) { - if(@file_exists($envFile)) { - include_once($envFile); +//define the name of the environment file +$envFile = '_ss_environment.php'; +//define the dir to start scanning from +$dir = '.'; +//check this dir and every parent dir (until we hit the base of the drive) +do { + $dir = realpath($dir) . '/'; + //if the file exists, then we include it, set relevant vars and break out + if (file_exists($dir . $envFile)) { + include_once($dir . $envFile); $envFileExists = true; + //legacy variable assignment $usingEnv = true; break; } -} +//here we need to check that the real path of the last dir and the next one are +// not the same, if they are, we have hit the root of the drive +} while (realpath($dir) != realpath($dir .= '../')); if($envFileExists) { if(!empty($_REQUEST['useEnv'])) { diff --git a/docs/en/misc/contributing/issues.md b/docs/en/misc/contributing/issues.md index 94d1a23e7..a143cc763 100644 --- a/docs/en/misc/contributing/issues.md +++ b/docs/en/misc/contributing/issues.md @@ -6,7 +6,26 @@ If you have discovered a bug in SilverStripe, we'd be glad to hear about it - well written bug reports can be half of the solution already! -Our bugtracker is located on [open.silverstripe.org](http://open.silverstripe.org/) (create a [new ticket](http://open.silverstripe.org/newticket)). +Our bugtracker is located on [open.silverstripe.org](http://open.silverstripe.org/). + +Before submitting a bug: + + * Ask for assistance on the [forums](http://silverstripe.org/forums), [core mailinglist](http://groups.google.com/group/silverstripe-dev) or on [IRC](http://silverstripe.org/irc) if you're unsure if its really a bug. + * [Search for existing tickets](http://open.silverstripe.org/query?keywords=~&description=~&summary=~&col=id&col=summary&col=owner&col=type&col=status&col=priority&col=milestone&col=changetime&desc=1&order=changetime) before reporting a new one + * Is this a security issue? Please follow our separate reporting guidelines below. + * Is this a issue with the core framework or cms? Modules have their own issue trackers (see [silverstripe.org/modules](http://www.silverstripe.org/modules)) + * Try to reproduce your issue on a [clean installation](http://doc.silverstripe.org/framework/en/installation/composer#using-development-versions), maybe the bug has already been fixed on an unreleased branch? + * The bugtracker is not the place to discuss enhancements, please use the forums or mailinglist. + Only log enhancement tickets if they gather a large interest in the community + and the enhancement is likely to be implemented in the next couple of months. + +If the issue does look like a new bug: + + * [Create a new ticket](http://open.silverstripe.org/newticket) + * Describe the steps required to reproduce your issue, and the expected outcome. Unit tests and screencasts can help here. + * Describe your environment as detailed as possible: SilverStripe version, Browser, PHP version, Operating System, any installed SilverStripe modules. + * Add keywords to help us organize issues, and please be realistic about the issue priority. Don't set milestones. + * *(optional)* [Submit a pull request](/misc/contributing/code) which fixes the issue. ## Reporting Security Issues @@ -17,4 +36,4 @@ Report security issues to [security@silverstripe.com](mailto:security@silverstri * [silverstripe.org/forums](http://silverstripe.org/forums): Forums on silverstripe.org * [silverstripe-dev](http://groups.google.com/group/silverstripe-dev): Core development mailinglist * [silverstripe-documentation](http://groups.google.com/group/silverstripe-documentation): Documentation team mailing list - +* [silverstripe-documentation](http://groups.google.com/group/silverstripe-translators): Translation team mailing list diff --git a/lang/ast.yml b/lang/ast.yml index f4cdfca14..15c142df6 100644 --- a/lang/ast.yml +++ b/lang/ast.yml @@ -480,7 +480,7 @@ ast: CSVEXPORT: 'Export to CSV' NOTFOUND: 'No items found' Security: - ALREADYLOGGEDIN: 'Nun tienes accesu a esta páxina. Si tienes otra cuenta que pueda entrar nesta páxina, pues volver a coneutate.' + ALREADYLOGGEDIN: 'Nun tienes accesu a esta páxina. Si tienes otra cuenta que pueda entrar nesta páxina, puedes volver conectate.' BUTTONSEND: 'Send me the password reset link' CHANGEPASSWORDBELOW: 'You can change your password below.' CHANGEPASSWORDHEADER: 'Change your password' diff --git a/lang/de.yml b/lang/de.yml index b52876873..eaf5cda3b 100644 --- a/lang/de.yml +++ b/lang/de.yml @@ -7,7 +7,7 @@ de: DIM: Dimensionen FILENAME: Dateiname FOLDER: Ordner - LASTEDIT: 'Letztmals geändert' + LASTEDIT: 'Letzte Änderung' OWNER: Eigentümer SIZE: Größe TITLE: Titel @@ -73,7 +73,7 @@ de: CMSProfileController: MENUTITLE: 'Mein Profil' ChangePasswordEmail.ss: - CHANGEPASSWORDTEXT1: 'Sie haben ihr Passwort geändert für' + CHANGEPASSWORDTEXT1: 'Sie haben Ihr Passwort geändert für' CHANGEPASSWORDTEXT2: 'Sie können nun folgende Angaben benutzen um sich einzuloggen' EMAIL: E-Mail HELLO: Hi @@ -424,7 +424,7 @@ de: EMPTYBEFOREIMPORT: 'Datenbank vor Import leeren' IMPORT: 'CSV Import' IMPORTEDRECORDS: '{count} Datensätze wurden importiert.' - NOCSVFILE: 'Wählen sie eine CSV-Datei zum Importieren' + NOCSVFILE: 'Wählen Sie eine CSV-Datei zum Importieren' NOIMPORT: 'Kein Import notwendig.' RESET: Zurücksetzen Title: Datenmodelle @@ -526,7 +526,7 @@ de: ADD: 'Eine neue Zeile hinzufügen' ADDITEM: '%s hinzufügen' TableListField: - CSVEXPORT: 'Exportieren zu CSV' + CSVEXPORT: 'Als CSV-Datei exportieren' PRINT: drucken Print: Drucken SELECT: 'Auswählen:' diff --git a/lang/en.yml b/lang/en.yml index 191c25fb2..4ff7b99a4 100644 --- a/lang/en.yml +++ b/lang/en.yml @@ -175,7 +175,7 @@ en: TEXT2: 'password reset link' TEXT3: for Form: - FIELDISREQUIRED: '{name} is required' + FIELDISREQUIRED: '%s is required' SubmitBtnLabel: Go VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly' VALIDATIONNOTUNIQUE: 'The value entered is not unique' @@ -214,9 +214,7 @@ en: DeletePermissionsFailure: 'No delete permissions' Deleted: 'Deleted %s %s' Save: Save - Saved: 'Saved {name} {link}' - GridFieldEditButton.ss: - EDIT: Edit + Saved: 'Saved %s %s' GridFieldItemEditView.ss: 'Go back': 'Go back' Group: diff --git a/lang/et_EE.yml b/lang/et_EE.yml index 1482ad36c..3d3b6b3e0 100644 --- a/lang/et_EE.yml +++ b/lang/et_EE.yml @@ -398,7 +398,7 @@ et_EE: HOURNOLEADING: 'Hour without leading zero' MINUTENOLEADING: 'Minute without leading zero' MONTHNOLEADING: 'Month digit without leading zero' - Preview: Preview + Preview: Eelvaade SHORTMONTH: 'Short name of month (e.g. Jun)' TOGGLEHELP: 'Toggle formatting help' TWODIGITDAY: 'Two-digit day of month' @@ -455,8 +455,8 @@ et_EE: CMS_ACCESS_CATEGORY: CMS-juurdepääs FULLADMINRIGHTS: 'Täis administraatori õigused' FULLADMINRIGHTS_HELP: 'Implies and overrules all other assigned permissions.' - PLURALNAME: Permissions - SINGULARNAME: Permission + PLURALNAME: Õigused + SINGULARNAME: Õigus PermissionCheckboxSetField: AssignedTo: 'assigned to "{title}"' FromGroup: 'inherited from group "{title}"' diff --git a/lang/fr.yml b/lang/fr.yml index 0e9e0381f..56722d69a 100644 --- a/lang/fr.yml +++ b/lang/fr.yml @@ -74,7 +74,7 @@ fr: MENUTITLE: 'Mon profil' ChangePasswordEmail.ss: CHANGEPASSWORDTEXT1: 'Vous avez modifié votre mot de passe pour' - CHANGEPASSWORDTEXT2: 'Vous pouvez maintenant utiliser les détails suivants pour vous connecter :' + CHANGEPASSWORDTEXT2: 'Vous pouvez maintenant utiliser les identifiants suivants pour vous connecter :' EMAIL: Email HELLO: Salut PASSWORD: 'Mot de passe' @@ -253,7 +253,7 @@ fr: RolesAddEditLink: 'Ajouter/éditer les rôles' SINGULARNAME: Groupe Sort: 'Ordre de tri' - has_many_Permissions: Permissions + has_many_Permissions: Autorisations many_many_Members: Membres GroupImportForm: Help1: '

Importer un ou plusieurs groupe(s) au format CSV (comma-separated values). Montrer l''usage avancé

' @@ -323,7 +323,7 @@ fr: DELETED: Supprimé. DropdownBatchActionsDefault: Actions HELP: Aide - PAGETYPE: 'Type de page :' + PAGETYPE: 'Type de page :' PERMAGAIN: 'Vous avez été déconnecté du CMS. Si vous voulez vous reconnecter, entrez un nom d''utilisateur et un mot de passe ci-dessous.' PERMALREADY: 'Désolé, mais vous ne pouvez pas accéder à cette partie du CMS. Si vous voulez changer d''identité, faites le ci-dessous' PERMDEFAULT: 'Saisissez votre adresse de courriel et votre mot de passe pour accéder au CMS.' @@ -494,26 +494,26 @@ fr: PASSWORDSENTHEADER: 'Lien de réinitialisation de mot de passe envoyé à « {email} »' PASSWORDSENTTEXT: 'Merci ! Un lien de réinitialisation vient d’être envoyé à « {email} », à condition que cette adresse existe.' SecurityAdmin: - ACCESS_HELP: 'Permettre la visualisation, l''addition et l''édition des utilisateurs, aussi bien que leur assigner des permissions et des rôles.' + ACCESS_HELP: 'Permet de consulter, d’ajouter et d’éditer les utilisateurs, aussi bien que de leur assigner des autorisations et des rôles.' APPLY_ROLES: 'Appliquer des rôles aux groupes' - APPLY_ROLES_HELP: 'Possibilité d''éditer les rôles assignés à un groupe. Nécessite "Access to ''Security'' section".' - EDITPERMISSIONS: 'Gérer les permissions des groupes' - EDITPERMISSIONS_HELP: 'Possibilité d''éditer les permissions et les l''adresses IP pour un groupe. Nécessite "Access to ''Security'' section".' + APPLY_ROLES_HELP: 'Possibilité d''éditer les rôle assignés à un groupe. Nécessite l’autorisation « Accès à la section “Utilisateurs” ».' + EDITPERMISSIONS: 'Gérer les autorisations des groupes' + EDITPERMISSIONS_HELP: 'Possibilité d''éditer les autorisations et les adresses IP pour un groupe. Nécessite l’autorisation « Accès à la section “Securité” ».' GROUPNAME: 'Nom du group' IMPORTGROUPS: 'Importer groupes' IMPORTUSERS: 'Importer utilisateurs' MEMBERS: Membres MENUTITLE: Sécurité - MemberListCaution: 'Attention : Enlever des membres de cette liste va les enlever de tous les groupes et de la base de donnée' - NEWGROUP: 'Nouveau Groupe' - PERMISSIONS: Permissions + MemberListCaution: 'Attention : en supprimant des membres de cette liste vous les enlèverez de tous les groupes ainsi que de la base de données' + NEWGROUP: 'Nouveau groupe' + PERMISSIONS: Autorisations ROLES: Rôles - ROLESDESCRIPTION: 'Cette section vous permet d''ajouter des rôles à ce groupe. Les rôles sont des regroupements logiques d''autorisations, qui peuvent être modifiés dans l''onglet Rôles' + ROLESDESCRIPTION: 'Les rôles sont des regroupements logiques d’autorisations qui peuvent être assignés à des groupes.
Ils peuvent être hérités de groupes parents, si nécessaire.' TABROLES: Rôles Users: Utilisateurs SecurityAdmin_MemberImportForm: BtnImport: Importer - FileFieldLabel: 'Fichier CSV (Extension permise: *.csv)' + FileFieldLabel: 'Fichier CSV (extension autorisée : *.csv)' SilverStripeNavigator: Edit: 'Tout modifier' SimpleImageField: diff --git a/lang/it.yml b/lang/it.yml index ec08a8cbb..8ac1e48de 100644 --- a/lang/it.yml +++ b/lang/it.yml @@ -3,15 +3,15 @@ it: ALLOWEDEXTS: 'Estensioni consentite' NEWFOLDER: NuovaCartella AssetTableField: - CREATED: 'Primo inserito' + CREATED: 'Inizialmente caricato' DIM: Dimensioni FILENAME: 'Nome del file' FOLDER: Cartella - LASTEDIT: 'Ultimo modificato' + LASTEDIT: 'Ultima modifica' OWNER: Proprietario SIZE: Dimensione TITLE: Titolo - TYPE: Tipo + TYPE: 'Tipo di file' URL: URL AssetUploadField: ChooseFiles: 'Scegli file' @@ -67,14 +67,14 @@ it: REQUIREJS: 'Il CMS richiede JavaScript abilitato.' CMSMain: ACCESS: 'Accesso alla sezione ''{title}''' - ACCESSALLINTERFACES: 'Accesso a tutte le interfaccia CMS' + ACCESSALLINTERFACES: 'Accesso a tutte le sezioni del CMS' ACCESSALLINTERFACESHELP: 'Annulla le impostazioni di accesso più specifiche.' SAVE: Salva CMSProfileController: MENUTITLE: 'Il mio Profilo' ChangePasswordEmail.ss: CHANGEPASSWORDTEXT1: 'Hai cambiato la password per' - CHANGEPASSWORDTEXT2: 'Puoi ora utilizzare le seguenti credenziali per accedere:' + CHANGEPASSWORDTEXT2: 'Ora puoi utilizzare le seguenti credenziali per accedere:' EMAIL: Email HELLO: Ciao PASSWORD: Password @@ -88,8 +88,8 @@ it: ComplexTableField.ss: ADDITEM: 'Inserisci %s' NOITEMSFOUND: 'Nessun elemento trovato' - SORTASC: 'Ordina in modo crescente' - SORTDESC: 'Ordina in modo decrescente' + SORTASC: 'Ordina in modo ascendente' + SORTDESC: 'Ordina in modo discendente' ComplexTableField_popup.ss: NEXT: Seguente PREVIOUS: Precedente @@ -97,7 +97,7 @@ it: ATLEAST: 'La password deve essere lunga almeno {min} caratteri.' BETWEEN: 'La password deve essere lunga da {min} a {max} caratteri.' MAXIMUM: 'La password deve essere lunga almeno {max} caratteri.' - SHOWONCLICKTITLE: 'Cambia la password' + SHOWONCLICKTITLE: 'Cambia password' CreditCardField: FIRST: primo FOURTH: quarto @@ -106,8 +106,8 @@ it: CurrencyField: CURRENCYSYMBOL: $ DataObject: - PLURALNAME: 'Oggetti dati' - SINGULARNAME: 'Oggetto dati' + PLURALNAME: 'Data Objects' + SINGULARNAME: 'Data Object' Date: DAY: giorno DAYS: giorni @@ -250,10 +250,10 @@ it: NoRoles: 'Nessun ruolo trovato' PLURALNAME: Gruppi Parent: 'Gruppo padre' - RolesAddEditLink: 'Aggiungi/modifica ruoli' + RolesAddEditLink: 'Gestisci ruoli' SINGULARNAME: Gruppo Sort: 'Tipo ordinamento' - has_many_Permissions: Autorizzazioni + has_many_Permissions: Permessi many_many_Members: Membri GroupImportForm: Help1: '

Importa gruppi in formato CSV (valori separati da virgole). Mostra utilizzo avanzato

' @@ -345,7 +345,7 @@ it: ADDGROUP: 'Aggiungi gruppo' BUTTONCHANGEPASSWORD: 'Cambia password' BUTTONLOGIN: Accedi - BUTTONLOGINOTHER: 'Autenticato come qualcun altro' + BUTTONLOGINOTHER: 'Autenticati come qualcun altro' BUTTONLOSTPASSWORD: 'Ho perso la mia password' CANTEDIT: 'Non hai i permessi per fare questo' CONFIRMNEWPASSWORD: 'Conferma nuova password' @@ -355,11 +355,11 @@ it: DefaultDateTime: predefinito EMAIL: Email EMPTYNEWPASSWORD: 'La nuova password non può essere vuota, riprova' - ENTEREMAIL: 'Indica un indirizzo e-mail per ricevere il collegamento di azzeramento della password' + ENTEREMAIL: 'Inserisci un indirizzo e-mail per ricevere il link di azzeramento della password' ERRORLOCKEDOUT: 'Il tuo account è stato temporaneamente disabilitato perchè ci sono stati troppi tentativi di accesso errati. Riprova tra 20 minuti.' ERRORNEWPASSWORD: 'Hai inserito la tua nuova password in modo differente, prova di nuovo' ERRORPASSWORDNOTMATCH: 'La tua password attuale non corrisponde, per favore prova ancora' - ERRORWRONGCRED: 'Non sembra esserci l''indirizzo e-mail corretto o la password. Per favore, prova di nuovo.' + ERRORWRONGCRED: 'E-mail o password non sembrano essere corretti. Per favore, prova di nuovo.' FIRSTNAME: Nome INTERFACELANG: 'Lingua dell''interfaccia' INVALIDNEWPASSWORD: 'Non possiamo accettare questa password: {password}' @@ -368,12 +368,12 @@ it: PASSWORD: Password PLURALNAME: Utenti REMEMBERME: 'Ricordati di me la prossima volta?' - SINGULARNAME: Membro + SINGULARNAME: Utente SUBJECTPASSWORDCHANGED: 'La tua password è stata cambiata' - SUBJECTPASSWORDRESET: 'Indirizzo per reimpostare la tua password' + SUBJECTPASSWORDRESET: 'Link per azzerare la tua password' SURNAME: Cognome TIMEFORMAT: 'Formato dell''ora' - VALIDATIONMEMBEREXISTS: 'Esiste già un membro con questa e-mail' + VALIDATIONMEMBEREXISTS: 'Esiste già un utente con l''e-mail %s' ValidationIdentifierFailed: 'Non posso sovrascrivere l''utente esistente #{id} con identificatore identico ({name} = {value}))' WELCOMEBACK: 'Bentornato, {firstname}' YOUROLDPASSWORD: 'La tua vecchia password' @@ -419,12 +419,12 @@ it: SINGULARNAME: 'Password utente' MemberTableField: null ModelAdmin: - DELETE: Cancella + DELETE: Elimina DELETEDRECORDS: 'Eliminati {count} record.' EMPTYBEFOREIMPORT: 'Cancella database prima dell''import' IMPORT: 'Importa da CSV' IMPORTEDRECORDS: 'Importati {count} record.' - NOCSVFILE: 'Cerca un file CSV da importare' + NOCSVFILE: 'Scegli un file CSV da importare' NOIMPORT: 'Nulla da importare.' RESET: Azzera Title: 'Modelli di dati' @@ -441,7 +441,7 @@ it: IMPORT_TAB_HEADER: Importa SEARCHLISTINGS: Cerca MoneyField: - FIELDLABELAMOUNT: Totale + FIELDLABELAMOUNT: Importo FIELDLABELCURRENCY: Valuta NullableField: IsNullLabel: 'è nullo.' @@ -461,7 +461,7 @@ it: AssignedTo: 'assegnato a "{title}"' FromGroup: 'ereditato dal gruppo "{title}"' FromRole: 'ereditato dal ruolo "{title}"' - FromRoleOnGroup: 'eredita dal ruolo "%s" sul gruppo "%s"' + FromRoleOnGroup: 'ereditato dal ruolo "%s" nel gruppo "%s"' PermissionRole: OnlyAdminCanApply: 'Solo l''amministratore può applicare' PLURALNAME: Ruoli @@ -481,16 +481,16 @@ it: NOTFOUND: 'Nessun elemento trovato' Security: ALREADYLOGGEDIN: 'Non hai accesso a questa pagina. Se hai un altro account che può accederci, puoi autenticarti qui sotto.' - BUTTONSEND: 'Inviami il link per reimpostare la password' - CHANGEPASSWORDBELOW: 'Puoi cambiare la tua password qui di seguito.' + BUTTONSEND: 'Inviami il link per azzerare la password' + CHANGEPASSWORDBELOW: 'Puoi cambiare la tua password qui sotto.' CHANGEPASSWORDHEADER: 'Cambia la tua password' ENTERNEWPASSWORD: 'Per favore inserisci una nuova password.' ERRORPASSWORDPERMISSION: 'Devi essere autenticato per poter cambiare la tua password!' - LOGGEDOUT: 'Sei stato sloggato. Se vuoi autenticarti nuovamente, inserisci qui sotto le tue credenziali.' + LOGGEDOUT: 'Sei stato disconnesso. Se vuoi autenticarti nuovamente, inserisci qui sotto le tue credenziali.' LOGIN: Entra - NOTEPAGESECURED: 'La pagina è sicura. Inserisci le credenziali qui di seguito per poter andare avanti.' + NOTEPAGESECURED: 'La pagina è protetta. Inserisci le credenziali qui sotto per poter andare avanti.' NOTERESETLINKINVALID: '

Il link per azzerare la password non è valido o è scaduto.

Puoi richiederne uno nuovo qui o cambiare la tua password dopo che ti sei connesso.

' - NOTERESETPASSWORD: 'Inserisci il tuo indirizzo e-mail e ti verrà inviato un link per poter reimpostare la tua password.' + NOTERESETPASSWORD: 'Inserisci il tuo indirizzo e-mail e ti verrà inviato un link per poter azzerare la tua password.' PASSWORDSENTHEADER: 'Link per azzeramento della password inviato a ''{email}''' PASSWORDSENTTEXT: 'Grazie! Un link di azzeramento è stato inviato a ''{email}'', fornito un account esistente per questo indirizzo e-mail.' SecurityAdmin: diff --git a/lang/mi_NZ.yml b/lang/mi_NZ.yml index 1b384ff62..206c90c49 100644 --- a/lang/mi_NZ.yml +++ b/lang/mi_NZ.yml @@ -4,7 +4,7 @@ mi_NZ: NEWFOLDER: KōpakiHōu AssetTableField: CREATED: 'Tukuatu tuatahi' - DIM: Nuinga + DIM: 'Ngā Rahinga' FILENAME: 'Ingoa Kōnae' FOLDER: Kōpaki LASTEDIT: 'Hurihanga tōmuri' @@ -69,7 +69,7 @@ mi_NZ: ACCESS: 'Uru ki te wāhanga ''{title}''' ACCESSALLINTERFACES: 'Uru ki ngā wāhanga CMS katoa' ACCESSALLINTERFACESHELP: 'Ka takahi i ngā tautuhinga uru tauwhāiti ake' - SAVE: tiakina + SAVE: Tiaki CMSProfileController: MENUTITLE: 'My Profile' ChangePasswordEmail.ss: @@ -505,7 +505,7 @@ mi_NZ: MEMBERS: 'Ngā Mema' MENUTITLE: Haumarutanga MemberListCaution: 'Whakatūpato: Mā te tango mema i tēnei rārangi, ka tangohia i ngā rōpū katoa me te pātengi raraunga' - NEWGROUP: 'Roopu hou' + NEWGROUP: 'Rōpū Hōu' PERMISSIONS: 'Ngā Whakaaetanga' ROLES: 'Ngā Tūnga' ROLESDESCRIPTION: 'Ko ngā tūnga he huinga o ngā whakaaetanga i tautuhia i mua, ā, ka taea te tautapa i ēnei ki ngā rōpū.
I tukuna iho i ngā rōpū matua ki te hiahiatia.' diff --git a/lang/nl.yml b/lang/nl.yml index 22985cbcb..c93eeb4da 100644 --- a/lang/nl.yml +++ b/lang/nl.yml @@ -237,7 +237,7 @@ nl: DeletePermissionsFailure: 'No delete permissions' Deleted: '%s %s verwijderd' Save: Opslaan - Saved: '%s %s %s Opgeslagen' + Saved: '%s %s opgeslagen' GridFieldItemEditView.ss: null Group: AddRole: 'Voeg een rol toe aan deze groep' @@ -503,7 +503,7 @@ nl: IMPORTGROUPS: Groepen IMPORTUSERS: 'Importeer gebruikers' MEMBERS: Leden - MENUTITLE: Security + MENUTITLE: Beveiliging MemberListCaution: 'Let op: Verwijderen van leden van deze lijst heeft als gevolg dat deze uit alle groepen en de database worden verwijderd' NEWGROUP: 'Nieuwe Groep' PERMISSIONS: Rechten diff --git a/lang/ro.yml b/lang/ro.yml index 61cac0920..6c72973bc 100644 --- a/lang/ro.yml +++ b/lang/ro.yml @@ -380,7 +380,7 @@ ro: belongs_many_many_Groups: Grupuri db_LastVisited: 'Data ultimei vizite' db_Locale: 'Interface Locale' - db_LockedOutUntil: 'Blocat pana cand' + db_LockedOutUntil: 'Blocat pana la' db_NumVisit: 'Numarul de vizite' db_Password: Parola db_PasswordExpiry: 'Data de Expirare a Parolei' diff --git a/lang/sk.yml b/lang/sk.yml index 2e113e6b0..a21501507 100644 --- a/lang/sk.yml +++ b/lang/sk.yml @@ -252,9 +252,9 @@ sk: Parent: 'Nadradená skupina' RolesAddEditLink: 'Spravovať úlohy' SINGULARNAME: Skupina - Sort: 'Zoradiť podľa' + Sort: 'Poradie zoradenia' has_many_Permissions: Právomoci - many_many_Members: Uživatelia + many_many_Members: Členovia GroupImportForm: Help1: 'Importovať jednu alebo viac skupín v CSV formáte (čiarkov oddelené hodnoty). Zobraziť pokročilé použitie' Help2: "
\\n

Pokročilé použitie

\\n\\n
" @@ -532,8 +532,8 @@ sk: SELECT: 'Vyberte:' TableListField.ss: NOITEMSFOUND: 'Žiadne položky' - SORTASC: 'Zoradiť vzostupne' - SORTDESC: 'Zoradiť zostupne' + SORTASC: 'Triedit v vzostupnom poradí' + SORTDESC: 'Triediť v zostupnom poradí' TableListField_PageControls.ss: DISPLAYING: Zobrazujem OF: z