Skip to content

Commit

Permalink
Merge branch 'release-2.7.4'
Browse files Browse the repository at this point in the history
  • Loading branch information
boajer committed Oct 5, 2018
2 parents e0256c8 + 15801b0 commit 0f9d728
Show file tree
Hide file tree
Showing 8 changed files with 117 additions and 22 deletions.
6 changes: 0 additions & 6 deletions locales/en-US/messages.lang.php

This file was deleted.

22 changes: 22 additions & 0 deletions locales/nl-NL/dac.rdf.po
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
msgid ""
msgstr ""
"Project-Id-Version: TAO 3.3.0-sprint86\n"
"PO-Revision-Date: 2018-09-26T12:04:43\n"
"Last-Translator: TAO Translation Team <[email protected]>\n"
"MIME-Version: 1.0\n"
"Language: nl-NL\n"
"sourceLanguage: en-US\n"
"targetLanguage: nl-NL\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"

# http://www.tao.lu/Ontologies/TAO.rdf#DacAdministrator
msgctxt "http://www.w3.org/2000/01/rdf-schema#label"
msgid "Data Access Administrator"
msgstr ""

# http://www.tao.lu/Ontologies/TAO.rdf#DacAdministrator
msgctxt "http://www.w3.org/2000/01/rdf-schema#comment"
msgid "Data Access Administrator role"
msgstr ""

75 changes: 75 additions & 0 deletions locales/nl-NL/messages.po
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
msgid ""
msgstr ""
"Project-Id-Version: TAO 3.3.0-sprint86\n"
"PO-Revision-Date: 2018-09-26T12:04:43\n"
"Last-Translator: TAO Translation Team <[email protected]>\n"
"MIME-Version: 1.0\n"
"Language: nl-NL\n"
"sourceLanguage: en-US\n"
"targetLanguage: nl-NL\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Poedit-Basepath: ../../\n"
"X-Poedit-KeywordsList: __\n"
"X-Poedit-SearchPath-0: .\n"

msgid "Access can not be revoked for the current user."
msgstr ""

msgid "Access control"
msgstr "Toegangscontrole"

msgid "Access Permissions for"
msgstr "Toegangspermissies voor"

msgid "Actions"
msgstr "Acties"

msgid "Add role(s)"
msgstr "Voeg rol(len) toe"

msgid "Add user(s)"
msgstr "Voeg gebruiker(s) toe"

msgid "grant"
msgstr "geven"

msgid "Name"
msgstr "Naam"

msgid "Permissions saved"
msgstr "Permissies opgeslagen"

msgid "read"
msgstr "lezen"

msgid "Recursive"
msgstr "Recursief"

msgid "Remove"
msgstr "Verwijderen"

msgid "role"
msgstr "rol"

msgid "Roles"
msgstr "Rollen"

msgid "Save"
msgstr "Opslaan"

msgid "Type"
msgstr "Type"

msgid "user"
msgstr "gebruiker"

msgid "Users"
msgstr "Gebruikers"

msgid "write"
msgstr "schrijven"

msgid "You must have one role or user that have the manage permission on this element."
msgstr "U dient een rol of gebruiker te hebben met toestemming om dit element te beheren"

1 change: 1 addition & 0 deletions locales/nl-NL/messages_po.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion manifest.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
'label' => 'extension-tao-dac-simple',
'description' => 'extension that allows admin to give access to some resources to other people',
'license' => 'GPL-2.0',
'version' => '2.7.3',
'version' => '2.7.4',
'author' => 'Open Assessment Technologies SA',
'requires' => array(
'taoBackOffice' => '>=1.4.0',
Expand Down
2 changes: 1 addition & 1 deletion scripts/update/Updater.php
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,6 @@ public function update($initialVersion) {
$this->setVersion('2.7.0');
}

$this->skip('2.7.0', '2.7.3');
$this->skip('2.7.0', '2.7.4');
}
}
29 changes: 16 additions & 13 deletions views/js/controllers.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion views/js/controllers.min.js.map

Large diffs are not rendered by default.

0 comments on commit 0f9d728

Please sign in to comment.