Skip to content

Commit 5746e5a

Browse files
nidenniden
committedOct 28, 2018
Merge branch 'l10n_3.4' into 3.4
* l10n_3.4: (3042 commits) New translations acl.md (Ukrainian) New translations acl.md (Vietnamese) New translations acl.md (Thai) New translations acl.md (Turkish) New translations acl.md (Russian) New translations acl.md (Spanish) New translations acl.md (Portuguese) New translations acl.md (Polish) New translations acl.md (Romanian) New translations acl.md (Korean) New translations acl.md (Persian) New translations acl.md (Italian) New translations acl.md (Japanese) New translations events.md (Japanese) New translations acl.md (Greek) New translations acl.md (Indonesian) New translations acl.md (Hungarian) New translations acl.md (French) New translations acl.md (German) New translations url.md (Czech) ...
2 parents 94eb0f3 + 729dde5 commit 5746e5a

26 files changed

+29
-29
lines changed
 

‎ar/acl.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -515,7 +515,7 @@ $acl->addRole($roleGuests);
515515
$acl->addRole($roleAdmins);
516516

517517
// Have 'Administrators' role inherit from 'Guests' its accesses
518-
$acl->addInherit($rollAdmins, $roleGuests);
518+
$acl->addInherit($roleAdmins, $roleGuests);
519519
```
520520

521521
<a name='serialization'></a>

‎az/acl.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -515,7 +515,7 @@ $acl->addRole($roleGuests);
515515
$acl->addRole($roleAdmins);
516516

517517
// Have 'Administrators' role inherit from 'Guests' its accesses
518-
$acl->addInherit($rollAdmins, $roleGuests);
518+
$acl->addInherit($roleAdmins, $roleGuests);
519519
```
520520

521521
<a name='serialization'></a>

‎bg/acl.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -515,7 +515,7 @@ $acl->addRole($roleGuests);
515515
$acl->addRole($roleAdmins);
516516

517517
// Have 'Administrators' role inherit from 'Guests' its accesses
518-
$acl->addInherit($rollAdmins, $roleGuests);
518+
$acl->addInherit($roleAdmins, $roleGuests);
519519
```
520520

521521
<a name='serialization'></a>

‎bs/acl.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -515,7 +515,7 @@ $acl->addRole($roleGuests);
515515
$acl->addRole($roleAdmins);
516516

517517
// Have 'Administrators' role inherit from 'Guests' its accesses
518-
$acl->addInherit($rollAdmins, $roleGuests);
518+
$acl->addInherit($roleAdmins, $roleGuests);
519519
```
520520

521521
<a name='serialization'></a>

‎cs/acl.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -515,7 +515,7 @@ $acl->addRole($roleGuests);
515515
$acl->addRole($roleAdmins);
516516

517517
// Have 'Administrators' role inherit from 'Guests' its accesses
518-
$acl->addInherit($rollAdmins, $roleGuests);
518+
$acl->addInherit($roleAdmins, $roleGuests);
519519
```
520520

521521
<a name='serialization'></a>

‎da/acl.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -515,7 +515,7 @@ $acl->addRole($roleGuests);
515515
$acl->addRole($roleAdmins);
516516

517517
// Have 'Administrators' role inherit from 'Guests' its accesses
518-
$acl->addInherit($rollAdmins, $roleGuests);
518+
$acl->addInherit($roleAdmins, $roleGuests);
519519
```
520520

521521
<a name='serialization'></a>

‎de/acl.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -515,7 +515,7 @@ $acl->addRole($roleGuests);
515515
$acl->addRole($roleAdmins);
516516

517517
// Have 'Administrators' role inherit from 'Guests' its accesses
518-
$acl->addInherit($rollAdmins, $roleGuests);
518+
$acl->addInherit($roleAdmins, $roleGuests);
519519
```
520520

521521
<a name='serialization'></a>

‎el/acl.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -515,7 +515,7 @@ $acl->addRole($roleGuests);
515515
$acl->addRole($roleAdmins);
516516

517517
// Have 'Administrators' role inherit from 'Guests' its accesses
518-
$acl->addInherit($rollAdmins, $roleGuests);
518+
$acl->addInherit($roleAdmins, $roleGuests);
519519
```
520520

521521
<a name='serialization'></a>

‎es/acl.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -475,9 +475,9 @@ Puede agregar cualquier parámetro a la función y pasar un array asociativo en
475475

476476
## Herencia de roles
477477

478-
Se pueden construir estructuras complejas usando la herencia que `Phalcon\Acl\Role` proporciona. Los roles pueden heredar de otros roles, permitiendo acceso a super conjuntos o subconjuntos de recursos. There are two ways to use role inheritance:
478+
Se pueden construir estructuras complejas usando la herencia que `Phalcon\Acl\Role` proporciona. Los roles pueden heredar de otros roles, permitiendo acceso a super conjuntos o subconjuntos de recursos. Hay dos formas de utilizar la herencia de roles:
479479

480-
1. You can pass the inherited role as the second parameter of the method call, when adding that role in the list.
480+
1. Puede pasar el rol heredado como segundo parámetro al método `addRole()`, cuando agrega el rol a la lista.
481481

482482
```php
483483
<?php
@@ -499,7 +499,7 @@ $acl->addRole($roleGuests);
499499
$acl->addRole($roleAdmins, $roleGuests);
500500
```
501501

502-
2. You can setup the relationships after roles are added
502+
2. Puede configurar las relaciones después que los roles se agregaron
503503

504504
```php
505505
<?php
@@ -515,7 +515,7 @@ $acl->addRole($roleGuests);
515515
$acl->addRole($roleAdmins);
516516

517517
// Have 'Administrators' role inherit from 'Guests' its accesses
518-
$acl->addInherit($rollAdmins, $roleGuests);
518+
$acl->addInherit($roleAdmins, $roleGuests);
519519
```
520520

521521
<a name='serialization'></a>

‎fa/acl.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -515,7 +515,7 @@ $acl->addRole($roleGuests);
515515
$acl->addRole($roleAdmins);
516516

517517
// Have 'Administrators' role inherit from 'Guests' its accesses
518-
$acl->addInherit($rollAdmins, $roleGuests);
518+
$acl->addInherit($roleAdmins, $roleGuests);
519519
```
520520

521521
<a name='serialization'></a>

‎fr/acl.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -515,7 +515,7 @@ $acl->addRole($roleGuests);
515515
$acl->addRole($roleAdmins);
516516

517517
// Have 'Administrators' role inherit from 'Guests' its accesses
518-
$acl->addInherit($rollAdmins, $roleGuests);
518+
$acl->addInherit($roleAdmins, $roleGuests);
519519
```
520520

521521
<a name='serialization'></a>

‎hr/acl.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -515,7 +515,7 @@ $acl->addRole($roleGuests);
515515
$acl->addRole($roleAdmins);
516516

517517
// Have 'Administrators' role inherit from 'Guests' its accesses
518-
$acl->addInherit($rollAdmins, $roleGuests);
518+
$acl->addInherit($roleAdmins, $roleGuests);
519519
```
520520

521521
<a name='serialization'></a>

‎hu/acl.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -515,7 +515,7 @@ $acl->addRole($roleGuests);
515515
$acl->addRole($roleAdmins);
516516

517517
// Have 'Administrators' role inherit from 'Guests' its accesses
518-
$acl->addInherit($rollAdmins, $roleGuests);
518+
$acl->addInherit($roleAdmins, $roleGuests);
519519
```
520520

521521
<a name='serialization'></a>

‎id/acl.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -515,7 +515,7 @@ $acl->addRole($roleGuests);
515515
$acl->addRole($roleAdmins);
516516

517517
// Have 'Administrators' role inherit from 'Guests' its accesses
518-
$acl->addInherit($rollAdmins, $roleGuests);
518+
$acl->addInherit($roleAdmins, $roleGuests);
519519
```
520520

521521
<a name='serialization'></a>

‎it/acl.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -515,7 +515,7 @@ $acl->addRole($roleGuests);
515515
$acl->addRole($roleAdmins);
516516

517517
// Have 'Administrators' role inherit from 'Guests' its accesses
518-
$acl->addInherit($rollAdmins, $roleGuests);
518+
$acl->addInherit($roleAdmins, $roleGuests);
519519
```
520520

521521
<a name='serialization'></a>

‎ja/acl.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -515,7 +515,7 @@ $acl->addRole($roleGuests);
515515
$acl->addRole($roleAdmins);
516516

517517
// Have 'Administrators' role inherit from 'Guests' its accesses
518-
$acl->addInherit($rollAdmins, $roleGuests);
518+
$acl->addInherit($roleAdmins, $roleGuests);
519519
```
520520

521521
<a name='serialization'></a>

‎ko/acl.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -515,7 +515,7 @@ $acl->addRole($roleGuests);
515515
$acl->addRole($roleAdmins);
516516

517517
// Have 'Administrators' role inherit from 'Guests' its accesses
518-
$acl->addInherit($rollAdmins, $roleGuests);
518+
$acl->addInherit($roleAdmins, $roleGuests);
519519
```
520520

521521
<a name='serialization'></a>

‎pl/acl.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -515,7 +515,7 @@ $acl->addRole($roleGuests);
515515
$acl->addRole($roleAdmins);
516516

517517
// Have 'Administrators' role inherit from 'Guests' its accesses
518-
$acl->addInherit($rollAdmins, $roleGuests);
518+
$acl->addInherit($roleAdmins, $roleGuests);
519519
```
520520

521521
<a name='serialization'></a>

‎pt/acl.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -515,7 +515,7 @@ $acl->addRole($roleGuests);
515515
$acl->addRole($roleAdmins);
516516

517517
// Have 'Administrators' role inherit from 'Guests' its accesses
518-
$acl->addInherit($rollAdmins, $roleGuests);
518+
$acl->addInherit($roleAdmins, $roleGuests);
519519
```
520520

521521
<a name='serialization'></a>

‎ro/acl.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -515,7 +515,7 @@ $acl->addRole($roleGuests);
515515
$acl->addRole($roleAdmins);
516516

517517
// Have 'Administrators' role inherit from 'Guests' its accesses
518-
$acl->addInherit($rollAdmins, $roleGuests);
518+
$acl->addInherit($roleAdmins, $roleGuests);
519519
```
520520

521521
<a name='serialization'></a>

‎ru/acl.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -519,7 +519,7 @@ $acl->addRole($roleGuests);
519519
$acl->addRole($roleAdmins);
520520

521521
// Have 'Administrators' role inherit from 'Guests' its accesses
522-
$acl->addInherit($rollAdmins, $roleGuests);
522+
$acl->addInherit($roleAdmins, $roleGuests);
523523
```
524524

525525
<a name='serialization'></a>

‎th/acl.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -515,7 +515,7 @@ $acl->addRole($roleGuests);
515515
$acl->addRole($roleAdmins);
516516

517517
// Have 'Administrators' role inherit from 'Guests' its accesses
518-
$acl->addInherit($rollAdmins, $roleGuests);
518+
$acl->addInherit($roleAdmins, $roleGuests);
519519
```
520520

521521
<a name='serialization'></a>

‎tr/acl.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -515,7 +515,7 @@ $acl->addRole($roleGuests);
515515
$acl->addRole($roleAdmins);
516516

517517
// Have 'Administrators' role inherit from 'Guests' its accesses
518-
$acl->addInherit($rollAdmins, $roleGuests);
518+
$acl->addInherit($roleAdmins, $roleGuests);
519519
```
520520

521521
<a name='serialization'></a>

‎uk/acl.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -515,7 +515,7 @@ $acl->addRole($roleGuests);
515515
$acl->addRole($roleAdmins);
516516

517517
// Have 'Administrators' role inherit from 'Guests' its accesses
518-
$acl->addInherit($rollAdmins, $roleGuests);
518+
$acl->addInherit($roleAdmins, $roleGuests);
519519
```
520520

521521
<a name='serialization'></a>

‎vi/acl.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -515,7 +515,7 @@ $acl->addRole($roleGuests);
515515
$acl->addRole($roleAdmins);
516516

517517
// Have 'Administrators' role inherit from 'Guests' its accesses
518-
$acl->addInherit($rollAdmins, $roleGuests);
518+
$acl->addInherit($roleAdmins, $roleGuests);
519519
```
520520

521521
<a name='serialization'></a>

‎zh/acl.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -515,7 +515,7 @@ $acl->addRole($roleGuests);
515515
$acl->addRole($roleAdmins);
516516

517517
// Have 'Administrators' role inherit from 'Guests' its accesses
518-
$acl->addInherit($rollAdmins, $roleGuests);
518+
$acl->addInherit($roleAdmins, $roleGuests);
519519
```
520520

521521
<a name='serialization'></a>

0 commit comments

Comments
 (0)
Please sign in to comment.