From 459c7164f79708b82ba1e07aca3279ac7fdc042b Mon Sep 17 00:00:00 2001 From: Florian BLOUET Date: Mon, 15 Feb 2016 16:34:12 +0100 Subject: [PATCH 1/8] PHRAS-965 - fix preview tooltip positionning in answers grid --- resources/www/common/js/jquery.tooltip.js | 404 ++++++++++------------ resources/www/prod/styles/main.scss | 4 +- templates/web/common/thumbnail.html.twig | 8 +- 3 files changed, 197 insertions(+), 219 deletions(-) diff --git a/resources/www/common/js/jquery.tooltip.js b/resources/www/common/js/jquery.tooltip.js index 91bc252ecf..5a0e8befa7 100644 --- a/resources/www/common/js/jquery.tooltip.js +++ b/resources/www/common/js/jquery.tooltip.js @@ -244,258 +244,230 @@ if (settings($this).outside) { var width = 'auto'; var height = 'auto'; - var ratio = 1; - var resizeImgTips = resizeVideoTips = false; - var $imgTips = $('#' + settings($.tooltip.current).id + ' .imgTips'); - var $videoTips = $('#' + settings($.tooltip.current).id + ' .videoTips'); + var tooltipId = settings($.tooltip.current).id; - if ($imgTips[0] && $('#' + settings($.tooltip.current).id + ' .noToolTipResize').length === 0) { - resizeImgTips = true; - width = parseInt($imgTips[0].style.width); - height = parseInt($imgTips[0].style.height); - ratio = width / height; - $imgTips.css({top: '0px', left: '0px'}); + + var $audioTips = $('#' + tooltipId + ' .audioTips'); + var $imgTips = $('#' + tooltipId + ' .imgTips'); + var $videoTips = $('#' + tooltipId + ' .videoTips'); + var $documentTips = $('#' + tooltipId + ' .documentTips'); + var shouldResize = $('#' + tooltipId + ' .noToolTipResize').length === 0 ? true : false; + + // get image or video original dimensions + var recordWidth = 240; + var recordHeight = 240; + var tooltipVerticalOffset = 75; + var tooltipHorizontalOffset = 35; + var maxWidthAllowed = 1024; + var maxHeightAllowed = 768; + var tooltipWidth = 0; + var tooltipHeight = 0; + + var $selector = $imgTips; + + if ($imgTips[0] && shouldResize) { + recordWidth = parseInt($imgTips[0].style.width); + recordHeight = parseInt($imgTips[0].style.height); + $imgTips.css({display: 'block', margin: '0 auto'}); } - if ($videoTips[0] && $('#' + settings($.tooltip.current).id + ' .noToolTipResize').length === 0) { - resizeVideoTips = true; - width = parseInt($videoTips.attr('width')); - height = parseInt($videoTips.attr('height')); - ratio = width / height; - $videoTips.css({top: '0px', left: '0px'}); + if ($documentTips[0] && shouldResize) { + recordWidth = $documentTips.data('original-width'); + recordHeight = $documentTips.data('original-height'); + $documentTips.css({display: 'block', margin: '0 auto'}); + $selector = $documentTips; } - var v = viewport(), - h = helper.parent; - helper.parent.css({ - width: width, - top: 0, - left: 0, - visibility: 'hidden', - // visibility:'visible', - display: 'block', - height: height - }); - - $(h).width($(h).width()); - width = ($(h).width() > (v.x - 40)) ? (v.x - 40) : $(h).width(); - height = ($(h).height() > (v.y - 40)) ? (v.y - 40) : $(h).height(); - -// $('#' + settings($.tooltip.current).id + ' .thumb_wrapper').width('auto').height('auto'); - - if ($('#' + settings($.tooltip.current).id + ' .audioTips').length > 0) { - height = height < 26 ? 26 : height; + if ($audioTips[0] && shouldResize) { + $audioTips.css({display: 'block', margin: '0 auto'}); + $selector = $audioTips; } - $(h).css({ - width: width, - height: height - }); + if ($videoTips[0] && shouldResize) { + recordWidth = $videoTips.data('original-width'); + recordHeight = $videoTips.data('original-height'); + // limit video to maxWidth: + /*if( recordWidth > 720 ) { + var limitRatio = recordWidth/recordHeight; + recordWidth = 720; + recordHeight = recordWidth / limitRatio; + }*/ + $videoTips.css({display: 'block', margin: '0 auto'}); + $selector = $videoTips; + } + + tooltipWidth = recordWidth + tooltipHorizontalOffset; + tooltipHeight = recordHeight + tooltipVerticalOffset; + + var rescale = function (containerWidth, containerHeight, resourceWidth, resourceHeight, maxWidthAllowed, maxHeightAllowed, $selector) { + var resourceRatio = resourceHeight / resourceWidth; + var resizeW = resourceWidth; + var resizeH = resourceHeight; + + if (resourceWidth > resourceHeight) { + // if width still too large: + if (resizeW > containerWidth) { + resizeW = containerWidth; + resizeH = containerWidth * resourceRatio; + } + + if (resizeH > containerHeight) { + resizeW = containerHeight / resourceRatio; + resizeH = containerHeight; + } + } else { + if (resizeH > containerHeight) { + resizeW = containerHeight / resourceRatio; + resizeH = containerHeight; + } + } + + if (maxWidthAllowed !== undefined && maxHeightAllowed !== undefined) { + if (resizeW > maxWidthAllowed || resizeH > maxHeightAllowed) { + return rescale(maxWidthAllowed, maxHeightAllowed, resourceWidth, resourceHeight) + } + } + + if( $selector !== undefined) { + $selector.css({width: Math.floor(resizeW), height: Math.floor(resizeH)}); + } + + return {width: Math.floor(resizeW), height: Math.floor(resizeH)}; + }; + if (event) { + + var viewportDimensions = viewport(); + var left = 0; + var top = 0; + var topOffset = 0; + var leftOffset = 0; + var rightOffset = 0; + var bottomOffset = -15; var $origEventTarget = $(event.target); // since event target can have different positionning, try to get common closest parent: - var $eventTarget = $origEventTarget.closest('.diapo'), - topOffset = 20, - leftOffset = 20; + var $eventTarget = $origEventTarget.closest('.diapo'); - if( $eventTarget.length > 0 ) { + if ($eventTarget.length > 0) { // change offsets: - topOffset = -8; - leftOffset = -8; + topOffset = 14; + leftOffset = 1; + rightOffset = 2; } else { // fallback on original target if nothing found: $eventTarget = $origEventTarget; } + var recordPosition = $eventTarget.offset(); + var recordWidthOffset = 148; // remove size + var recordHeightOffset = 195; + var totalViewportWidth = viewportDimensions.x; + var totalViewportHeight = viewportDimensions.y; + var leftAvailableSpace = recordPosition.left + leftOffset; + var topAvailableSpace = recordPosition.top + topOffset; + var rightAvailableSpace = (totalViewportWidth - leftAvailableSpace - recordWidthOffset) - rightOffset; + var bottomAvailableSpace = (totalViewportHeight - topAvailableSpace - recordHeightOffset); - var vert, vertS, hor, horS, top, left, ratioH, ratioV; - // ratio = $(h).width()/$(h).height(); - var ratioSurfaceH; - var ratioSurfaceV, wiH, wiV, heH, heV; - var ratioImage = $(h).width() / $(h).height(); + var shouldBeOnTop = false; + var availableHeight = bottomAvailableSpace; + var tooltipSize = {width: tooltipWidth, height: tooltipHeight}; + var position = 'top'; - //position de l'image - - if ($eventTarget.offset().left > (v.x - $eventTarget.offset().left - $eventTarget.width())) { - hor = 'gauche'; - wiH = $eventTarget.offset().left; - - horS = wiH * v.y; - ratioSurfaceH = wiH / v.y; - } - else { - hor = 'droite'; - wiH = (v.x - $eventTarget.offset().left - $eventTarget.width()); - horS = wiH * v.y; - ratioSurfaceH = wiH / v.y; - - } - if ($eventTarget.offset().top > (v.y - $eventTarget.offset().top - $eventTarget.height())) { - vert = 'haut'; - heV = $eventTarget.offset().top; - vertS = heV * v.x; - ratioSurfaceV = v.x / heV; - } - else { - vert = 'bas'; - heV = (v.y - $eventTarget.offset().top - $eventTarget.height()); - vertS = heV * v.x; - ratioSurfaceV = v.x / heV; + if (topAvailableSpace > bottomAvailableSpace) { + shouldBeOnTop = true; + availableHeight = topAvailableSpace; } + if (leftAvailableSpace > rightAvailableSpace) { + position = 'left'; + } else { + position = 'right'; + } - //correction par ratio - if (resizeImgTips && $imgTips.get(0)) { + if (shouldBeOnTop && availableHeight > leftAvailableSpace && availableHeight > rightAvailableSpace) { + position = 'top'; + } + else if (bottomAvailableSpace > leftAvailableSpace && bottomAvailableSpace > rightAvailableSpace) { + position = 'bottom'; + } + switch (position) { + case 'top': + tooltipSize = rescale(totalViewportWidth, topAvailableSpace, tooltipWidth, tooltipHeight, maxWidthAllowed, maxHeightAllowed); + tooltipWidth = tooltipSize.width; + tooltipHeight = tooltipSize.height; + left = leftAvailableSpace - (tooltipSize.width / 2) + (recordWidthOffset / 2); + top = topAvailableSpace - tooltipSize.height; + break; + case 'bottom': + tooltipSize = rescale(totalViewportWidth, bottomAvailableSpace, tooltipWidth, tooltipHeight, maxWidthAllowed, maxHeightAllowed); + tooltipWidth = tooltipSize.width; + tooltipHeight = tooltipSize.height; + left = leftAvailableSpace - (tooltipSize.width / 2) + (recordWidthOffset / 2); + top = totalViewportHeight - bottomAvailableSpace + bottomOffset; + break; + case 'left': + tooltipSize = rescale(leftAvailableSpace, totalViewportHeight, tooltipWidth, tooltipHeight, maxWidthAllowed, maxHeightAllowed); - if (ratioSurfaceH > ratioImage) { - horS = v.y * ratioImage * v.y; + tooltipWidth = tooltipSize.width; + tooltipHeight = tooltipSize.height; + left = leftAvailableSpace - tooltipSize.width; + break; + case 'right': + tooltipSize = rescale(rightAvailableSpace, totalViewportHeight, tooltipWidth, tooltipHeight, maxWidthAllowed, maxHeightAllowed); + tooltipWidth = tooltipSize.width; + tooltipHeight = tooltipSize.height; + left = leftAvailableSpace + recordWidthOffset + rightOffset; + break; + + } + + // try to vertical center, relative to source: + if (position === 'left' || position === 'right') { + var verticalSpace = topAvailableSpace + (recordHeightOffset / 2) + (tooltipHeight / 2) + if (verticalSpace < totalViewportHeight) { + // tooltip can be aligned vertically + top = topAvailableSpace + (recordHeightOffset / 2) - (tooltipHeight / 2); + } else { + top = totalViewportHeight - tooltipHeight; } - else { - horS = wiH * wiH / ratioImage; - } - if (ratioSurfaceV > ratioImage) { - vertS = heV * ratioImage * heV; - } - else { - vertS = v.x * v.x / ratioImage; + top = top < 0 ? 0 : top; + } + + // try to horizontal center, relative to source: + if (position === 'top' || position === 'bottom') { + // push to left + // push to right + var takeLeftSpace = (tooltipSize.width / 2) + leftAvailableSpace; + var takeRightSpace = (tooltipSize.width / 2) + rightAvailableSpace; + // if centering on top or bottom and tooltip is offcanvas + if (takeLeftSpace > totalViewportWidth || takeRightSpace > totalViewportWidth) { + + if (leftAvailableSpace > (totalViewportWidth / 2)) { + // push at left + left = 0; + } else { + + // push at right + left = totalViewportWidth - tooltipSize.width; + } + } else { + // center + left = leftAvailableSpace - (tooltipSize.width / 2) + (recordWidthOffset / 2); } } - var zH; - - if ((Math.abs(ratioSurfaceV - ratioImage) < Math.abs(ratioSurfaceH - ratioImage))) { - var zL = event.pageX; - var zW = $(h).width(); - zH = $(h).height(); - var ETOT = $eventTarget.offset().top; - var ETH = $eventTarget.height(); - left = (zL - zW / 2) < 20 ? 20 : (((zL + zW / 2 + 20) > v.x) ? (v.x - zW - 20) : (zL - zW / 2)); - - switch (vert) { - case 'haut': - height = (zH > (ETOT - 40)) ? (ETOT - 40) : zH; - top = ETOT - height - topOffset; - break; - case 'bas': - height = ((v.y - ETH - ETOT - 40) > zH) ? zH : (v.y - ETH - ETOT - 40); - top = ETOT + ETH + topOffset; - break; - default: - break; - } - } - else { - // height = ($(h).height()>(v.y-40))?(v.y-40):$(h).height(); - zH = $(h).height(); - var zT = event.pageY; - var EOTL = $eventTarget.offset().left; - var ETW = $eventTarget.width(); - var zw = $(h).width(); - top = (zT - zH / 2) < 20 ? 20 : (((zT + zH / 2 + 20) > v.y) ? (v.y - zH - 20) : (zT - zH / 2)); - switch (hor) { - case 'gauche': - width = (zw > (EOTL - 40)) ? (EOTL - 40) : zw; - left = EOTL - width - leftOffset; - break; - case 'droite': - width = ((v.x - ETW - EOTL - 40) > zw) ? zw : (v.x - ETW - EOTL - 40); - left = EOTL + ETW + leftOffset; - break; - default: - break; - } - } + rescale(tooltipWidth - tooltipHorizontalOffset, tooltipHeight - tooltipVerticalOffset, recordWidth, recordHeight, maxWidthAllowed, maxHeightAllowed, $selector); helper.parent.css({ - width: width, - height: height, + width: Math.round(tooltipWidth), + height: Math.round(tooltipHeight), left: left, top: top }); - - //si ya une image on re-ajuste au ratio - if (resizeImgTips && $imgTips.get(0)) { - if (width == 'auto') - width = $imgTips.get(0).width(); - if (height == 'auto') - height = $imgTips.get(0).height(); - if (ratio > 1) { - var nh = width / ratio; - if (nh > height) { - width = ratio * height; - nh = width / ratio; - } - height = nh; - } - else { - var nw = ratio * height; - if (nw > width) { - height = width / ratio; - nw = height * ratio; - } - width = nw; - } - } - else if (resizeVideoTips && $videoTips.get(0)) { - width = $videoTips.data('original-width'); - height = $videoTips.data('original-height'); - // limit video to maxWidth: - if( width > 720 ) { - var limitRatio = width/height; - width = 720; - height = width / limitRatio; - } - console.log('video first scaled to ', width, height) - } - else { - if (vertS < horS) { - height = 'auto'; - } - } - - if (resizeImgTips) { - var factor = Math.min((width - 45) / width, (height - 75) / height); - if (factor > 1) { - factor = 1; - } - var imgWidth = Math.round(width * factor); - var imgHeight = Math.round(height * factor); - - width = imgWidth + 45; - height = imgHeight + 85; - - $imgTips.css({ - maxWidth: imgWidth, - maxHeight: imgHeight - }); - } - - if (resizeVideoTips) { - var factor = Math.min((width - 45) / width, (height - 75) / height); - var imgWidth = Math.round(width * factor); - var imgHeight = Math.round(height * factor); - - width = imgWidth + 45; - height = imgHeight + 75; - console.log('video scaled to ', width, height) - $videoTips.css({ - width: Math.round(imgWidth), - height: Math.round(imgHeight) - }); - } - - helper.parent.css({ - width: Math.round(width), - height: Math.round(height), - left: left, - top: top - }); - } - } handle.apply($this, arguments); return; diff --git a/resources/www/prod/styles/main.scss b/resources/www/prod/styles/main.scss index 74ad3a7830..b578eb55bb 100644 --- a/resources/www/prod/styles/main.scss +++ b/resources/www/prod/styles/main.scss @@ -26,6 +26,8 @@ .caption-tooltip-container .popover-inner .popover-content { overflow: auto; overflow-x: hidden; + width: 100%; + box-sizing: border-box; } .popover-inner .popover-content dl.dl-horizontal { @@ -97,4 +99,4 @@ .ui-tabs-vertical .ui-tabs-panel { padding: 1em; float: right;} @import 'ie7'; -@import 'ie8'; \ No newline at end of file +@import 'ie8'; diff --git a/templates/web/common/thumbnail.html.twig b/templates/web/common/thumbnail.html.twig index 6197fbd591..07745d5d0e 100644 --- a/templates/web/common/thumbnail.html.twig +++ b/templates/web/common/thumbnail.html.twig @@ -10,27 +10,31 @@ {% endif %} {% if record_type == 'VIDEO_MP4' or record_type == 'VIDEO_FLV' %} -
+
{% elseif record_type == 'FLEXPAPER' %} +
+
{% elseif record_type == 'AUDIO_MP3' %} +
+
{% else %} {% set fit_size = fitIn( {"width":original_w, "height":original_h}, {"width":box_w, "height":box_h} )%} - From f5bdbc8cab094c7364b6b4673cb746ad18edf893 Mon Sep 17 00:00:00 2001 From: Florian BLOUET Date: Mon, 15 Feb 2016 18:05:26 +0100 Subject: [PATCH 2/8] fix tooltips for captions --- resources/www/common/js/jquery.tooltip.js | 53 ++++++++++++++--------- 1 file changed, 33 insertions(+), 20 deletions(-) diff --git a/resources/www/common/js/jquery.tooltip.js b/resources/www/common/js/jquery.tooltip.js index 5a0e8befa7..bf19351228 100644 --- a/resources/www/common/js/jquery.tooltip.js +++ b/resources/www/common/js/jquery.tooltip.js @@ -246,7 +246,7 @@ var height = 'auto'; var tooltipId = settings($.tooltip.current).id; - + var $defaultTips = $('#' + tooltipId); var $audioTips = $('#' + tooltipId + ' .audioTips'); var $imgTips = $('#' + tooltipId + ' .imgTips'); var $videoTips = $('#' + tooltipId + ' .videoTips'); @@ -255,15 +255,22 @@ // get image or video original dimensions var recordWidth = 240; - var recordHeight = 240; + var recordHeight = 0; var tooltipVerticalOffset = 75; var tooltipHorizontalOffset = 35; var maxWidthAllowed = 1024; var maxHeightAllowed = 768; var tooltipWidth = 0; var tooltipHeight = 0; + var viewportDimensions = viewport(); + var left = 0; + var top = 0; + var topOffset = 14; + var leftOffset = 1; + var rightOffset = 2; + var bottomOffset = -15; - var $selector = $imgTips; + var $selector = $defaultTips; if ($imgTips[0] && shouldResize) { recordWidth = parseInt($imgTips[0].style.width); @@ -271,19 +278,21 @@ $imgTips.css({display: 'block', margin: '0 auto'}); } - if ($documentTips[0] && shouldResize) { + else if ($documentTips[0] && shouldResize) { recordWidth = $documentTips.data('original-width'); recordHeight = $documentTips.data('original-height'); $documentTips.css({display: 'block', margin: '0 auto'}); $selector = $documentTips; } - if ($audioTips[0] && shouldResize) { + else if ($audioTips[0] && shouldResize) { + recordWidth = 240; + recordHeight = 240; $audioTips.css({display: 'block', margin: '0 auto'}); $selector = $audioTips; } - if ($videoTips[0] && shouldResize) { + else if ($videoTips[0] && shouldResize) { recordWidth = $videoTips.data('original-width'); recordHeight = $videoTips.data('original-height'); // limit video to maxWidth: @@ -295,6 +304,14 @@ $videoTips.css({display: 'block', margin: '0 auto'}); $selector = $videoTips; } + else { + // handle captions + var contentHeight = $selector.get(0).offsetHeight; + shouldResize = false; + tooltipVerticalOffset = 13; + recordHeight = contentHeight > maxHeightAllowed ? maxHeightAllowed : contentHeight; + $selector.css({height: 'auto'}); + } tooltipWidth = recordWidth + tooltipHorizontalOffset; tooltipHeight = recordHeight + tooltipVerticalOffset; @@ -338,13 +355,6 @@ if (event) { - var viewportDimensions = viewport(); - var left = 0; - var top = 0; - var topOffset = 0; - var leftOffset = 0; - var rightOffset = 0; - var bottomOffset = -15; var $origEventTarget = $(event.target); // since event target can have different positionning, try to get common closest parent: @@ -387,12 +397,14 @@ position = 'right'; } - if (shouldBeOnTop && availableHeight > leftAvailableSpace && availableHeight > rightAvailableSpace) { + + // prefer bottom position if tooltip is a small caption: + if (bottomAvailableSpace > leftAvailableSpace && bottomAvailableSpace > rightAvailableSpace) { + position = 'bottom'; + } else if (shouldBeOnTop && availableHeight > leftAvailableSpace && availableHeight > rightAvailableSpace) { position = 'top'; } - else if (bottomAvailableSpace > leftAvailableSpace && bottomAvailableSpace > rightAvailableSpace) { - position = 'bottom'; - } + switch (position) { case 'top': tooltipSize = rescale(totalViewportWidth, topAvailableSpace, tooltipWidth, tooltipHeight, maxWidthAllowed, maxHeightAllowed); @@ -449,7 +461,6 @@ // push at left left = 0; } else { - // push at right left = totalViewportWidth - tooltipSize.width; } @@ -459,11 +470,13 @@ } } - rescale(tooltipWidth - tooltipHorizontalOffset, tooltipHeight - tooltipVerticalOffset, recordWidth, recordHeight, maxWidthAllowed, maxHeightAllowed, $selector); + if (shouldResize) { + rescale(tooltipWidth - tooltipHorizontalOffset, tooltipHeight - tooltipVerticalOffset, recordWidth, recordHeight, maxWidthAllowed, maxHeightAllowed, $selector); + } helper.parent.css({ width: Math.round(tooltipWidth), - height: Math.round(tooltipHeight), + height: shouldResize ? Math.round(tooltipHeight) : 'auto', left: left, top: top }); From 41287802ca2bf55f599f9d605579ff5598051223 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Burnichon?= Date: Tue, 16 Feb 2016 13:48:06 +0100 Subject: [PATCH 3/8] fixup some PHPCS --- lib/classes/API/OAuth2/Adapter.php | 47 +++++++----------------------- 1 file changed, 10 insertions(+), 37 deletions(-) diff --git a/lib/classes/API/OAuth2/Adapter.php b/lib/classes/API/OAuth2/Adapter.php index 4545004905..925ba53ff4 100644 --- a/lib/classes/API/OAuth2/Adapter.php +++ b/lib/classes/API/OAuth2/Adapter.php @@ -1,5 +1,4 @@ "Bearer"]; @@ -59,14 +50,12 @@ class API_OAuth2_Adapter extends OAuth2 protected $authentication_scheme = ["authorization", "uri", "body"]; /** - * * do we enable expiration on access_token - * @param boolean + * @param bool */ protected $enable_expire = false; /** - * * @var string */ protected $session_id; @@ -78,9 +67,8 @@ class API_OAuth2_Adapter extends OAuth2 protected $token; /** - * - * @param Application $app - * @return API_OAuth2_Adapter + * @param Application $app + * @param array $conf */ public function __construct(Application $app, array $conf = []) { @@ -90,7 +78,6 @@ class API_OAuth2_Adapter extends OAuth2 } /** - * * @return array */ public function getParams() @@ -99,7 +86,6 @@ class API_OAuth2_Adapter extends OAuth2 } /** - * * @return ApiApplication */ public function getClient() @@ -108,9 +94,8 @@ class API_OAuth2_Adapter extends OAuth2 } /** - * - * @param array $params - * @return API_OAuth2_Adapter + * @param array $params + * @return $this */ public function setParams(array $params) { @@ -132,8 +117,7 @@ class API_OAuth2_Adapter extends OAuth2 } /** - * - * @return boolean + * @return bool */ public function has_ses_id() { @@ -141,7 +125,6 @@ class API_OAuth2_Adapter extends OAuth2 } /** - * * @return int */ public function get_ses_id() @@ -154,7 +137,7 @@ class API_OAuth2_Adapter extends OAuth2 * * @param string $clientId * @param string $clientSecret - * @return boolean + * @return bool */ protected function checkClientCredentials($clientId, $clientSecret = null) { @@ -170,12 +153,11 @@ class API_OAuth2_Adapter extends OAuth2 } /** - * * Implements OAuth2::getRedirectUri(). * - * @param $clientId + * @param string $clientId * - * @return mixed + * @return string * @throws RuntimeException */ protected function getRedirectUri($clientId) @@ -188,7 +170,6 @@ class API_OAuth2_Adapter extends OAuth2 } /** - * * Implements OAuth2::getAccessToken(). * * @param string $oauthToken @@ -233,7 +214,6 @@ class API_OAuth2_Adapter extends OAuth2 } /** - * * Overrides OAuth2::getSupportedGrantTypes(). * * @return array @@ -247,7 +227,6 @@ class API_OAuth2_Adapter extends OAuth2 } /** - * * Overrides OAuth2::getSupportedScopes(). * * @return array @@ -279,7 +258,6 @@ class API_OAuth2_Adapter extends OAuth2 } /** - * * Overrides OAuth2::setAuthCode(). * * @param $oauthCode @@ -361,7 +339,6 @@ class API_OAuth2_Adapter extends OAuth2 } /** - * * @param Request $request * @return array */ @@ -624,9 +601,6 @@ class API_OAuth2_Adapter extends OAuth2 $this->doRedirectUriCallback($params['redirect_uri'], $result); } - /** - * - */ public function grantAccessToken() { $filters = [ @@ -775,7 +749,6 @@ class API_OAuth2_Adapter extends OAuth2 "scope" => $scope ]; - $expires = null; if ($this->enable_expire) { $token['expires_in'] = $this->getVariable('access_token_lifetime', OAUTH2_DEFAULT_ACCESS_TOKEN_LIFETIME); } From 27eaf37a459a0fb2cca99232ef0530e1aabf41df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Burnichon?= Date: Tue, 16 Feb 2016 13:48:35 +0100 Subject: [PATCH 4/8] Set OAuth2_Adapter default API version --- lib/Alchemy/Phrasea/Core/Provider/APIServiceProvider.php | 2 +- lib/classes/API/OAuth2/Adapter.php | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/Alchemy/Phrasea/Core/Provider/APIServiceProvider.php b/lib/Alchemy/Phrasea/Core/Provider/APIServiceProvider.php index a59752a439..0d77e9c26c 100644 --- a/lib/Alchemy/Phrasea/Core/Provider/APIServiceProvider.php +++ b/lib/Alchemy/Phrasea/Core/Provider/APIServiceProvider.php @@ -21,7 +21,7 @@ class APIServiceProvider implements ServiceProviderInterface public function register(Application $app) { $app['oauth2-server'] = $app->share(function ($app) { - return new \API_OAuth2_Adapter($app); + return new \API_OAuth2_Adapter($app, ['api_version' => $app['api.default_version']]); }); $app['token'] = $app->share(function (Application $app) { /** @var \API_OAuth2_Adapter $oauth2 */ diff --git a/lib/classes/API/OAuth2/Adapter.php b/lib/classes/API/OAuth2/Adapter.php index 925ba53ff4..c674aa277b 100644 --- a/lib/classes/API/OAuth2/Adapter.php +++ b/lib/classes/API/OAuth2/Adapter.php @@ -473,16 +473,16 @@ class API_OAuth2_Adapter extends OAuth2 * @param User $user * * @return mixed - * @throws logicalException + * @throws LogicException */ public function updateAccount(User $user) { if ($this->client === null) { - throw new logicalException("Client property must be set before update an account"); + throw new LogicException("Client property must be set before update an account"); } if (null === $account = $this->app['repo.api-accounts']->findByUserAndApplication($user, $this->client)) { - $account = $this->app['manipulator.api-account']->create($this->client, $user); + $account = $this->app['manipulator.api-account']->create($this->client, $user, $this->getVariable('api_version', V2::VERSION)); } return $account; From 7bb84840349e93d97ae3f4f3219388088455aa22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Burnichon?= Date: Tue, 16 Feb 2016 13:17:48 +0100 Subject: [PATCH 5/8] Remove unused use statement --- lib/Alchemy/Phrasea/Controller/Admin/FieldsController.php | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/Alchemy/Phrasea/Controller/Admin/FieldsController.php b/lib/Alchemy/Phrasea/Controller/Admin/FieldsController.php index 75d0ede038..12e7703fbb 100644 --- a/lib/Alchemy/Phrasea/Controller/Admin/FieldsController.php +++ b/lib/Alchemy/Phrasea/Controller/Admin/FieldsController.php @@ -10,7 +10,6 @@ namespace Alchemy\Phrasea\Controller\Admin; -use Alchemy\Phrasea\Application; use Alchemy\Phrasea\Controller\Controller; use Alchemy\Phrasea\Metadata\TagProvider; use Alchemy\Phrasea\Vocabulary\Controller as VocabularyController; From b6656f8b726fc39086e810e69224f58b3b6a7a00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Burnichon?= Date: Tue, 16 Feb 2016 13:18:03 +0100 Subject: [PATCH 6/8] Fix translation keys --- lib/Alchemy/Phrasea/Notification/Mail/MailInfoNewOrder.php | 2 +- .../Phrasea/Notification/Mail/MailInfoValidationRequest.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/Alchemy/Phrasea/Notification/Mail/MailInfoNewOrder.php b/lib/Alchemy/Phrasea/Notification/Mail/MailInfoNewOrder.php index 87efb445b0..5c9c23d65e 100644 --- a/lib/Alchemy/Phrasea/Notification/Mail/MailInfoNewOrder.php +++ b/lib/Alchemy/Phrasea/Notification/Mail/MailInfoNewOrder.php @@ -34,7 +34,7 @@ class MailInfoNewOrder extends AbstractMail */ public function getSubject() { - return $this->app->trans('admin::register: Nouvelle commande sur %s', ['%application%' => $this->getPhraseanetTitle()]); + return $this->app->trans('admin::register: Nouvelle commande sur %application%', ['%application%' => $this->getPhraseanetTitle()]); } /** diff --git a/lib/Alchemy/Phrasea/Notification/Mail/MailInfoValidationRequest.php b/lib/Alchemy/Phrasea/Notification/Mail/MailInfoValidationRequest.php index 53fe5d0119..d4c916cf6a 100644 --- a/lib/Alchemy/Phrasea/Notification/Mail/MailInfoValidationRequest.php +++ b/lib/Alchemy/Phrasea/Notification/Mail/MailInfoValidationRequest.php @@ -70,7 +70,7 @@ class MailInfoValidationRequest extends AbstractMailWithLink { if (0 < $this->duration) { if (1 < $this->duration) { - return $this->message . "\n\n" . $this->app->trans("You have %d days to validate the selection.", ['%quantity%' => $this->duration]); + return $this->message . "\n\n" . $this->app->trans("You have %quantity% days to validate the selection.", ['%quantity%' => $this->duration]); } else { return $this->message . "\n\n" . $this->app->trans("You have 1 day to validate the selection."); } From 03314703b77820ad537aba9a95b50f728cb124a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Burnichon?= Date: Tue, 16 Feb 2016 13:26:31 +0100 Subject: [PATCH 7/8] Dump translation messages --- resources/locales/messages.de.xlf | 328 +++++++++++++++------------- resources/locales/messages.en.xlf | 328 +++++++++++++++------------- resources/locales/messages.fr.xlf | 328 +++++++++++++++------------- resources/locales/messages.nl.xlf | 328 +++++++++++++++------------- resources/locales/validators.de.xlf | 2 +- resources/locales/validators.en.xlf | 2 +- resources/locales/validators.fr.xlf | 2 +- resources/locales/validators.nl.xlf | 2 +- 8 files changed, 708 insertions(+), 612 deletions(-) diff --git a/resources/locales/messages.de.xlf b/resources/locales/messages.de.xlf index f114e45bea..1ca8b03975 100644 --- a/resources/locales/messages.de.xlf +++ b/resources/locales/messages.de.xlf @@ -1,6 +1,6 @@ - +
The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message. @@ -53,12 +53,12 @@ %d collection selected %d Kollektion ausgewählt - Controller/Root/LoginController.php + Controller/Root/LoginController.php %d collections selected %d Kollektionen ausgewählt - Controller/Root/LoginController.php + Controller/Root/LoginController.php %d fields have been updated @@ -212,12 +212,12 @@ %s field has been created with success. %s Feld wurde erfolgreich erstellt - Controller/Admin/FieldsController.php + Controller/Admin/FieldsController.php %s field has been deleted with success. %s Feld wurde erfolgreich gelöscht - Controller/Admin/FieldsController.php + Controller/Admin/FieldsController.php %total% reponses @@ -534,18 +534,18 @@ Account has been unlocked, you can now login. Konto wurde freigeschaltet, Sie dürfen nun einloggen - Controller/Root/LoginController.php - Controller/Root/LoginController.php + Controller/Root/LoginController.php + Controller/Root/LoginController.php Account has been unlocked, you still have to wait for admin approval. Konto wurde freigeschaltet, Sie müssen auf eine Administrator Genehmigung warten. - Controller/Root/LoginController.php + Controller/Root/LoginController.php Account is already unlocked, you can login. Konto ist schon freigeschaltet, Sie dürfen einloggen - Controller/Root/LoginController.php + Controller/Root/LoginController.php Account is not found. @@ -629,7 +629,7 @@ Add an admin einen Administrator hinzufügen - web/admin/dashboard.html.twig + web/admin/dashboard.html.twig Add user @@ -719,7 +719,7 @@ Aide sur les expressions regulieres Hilfe zu reguläre Ausdrücken - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig Ajouter a @@ -923,7 +923,7 @@ An unexpected error occurred during authentication process, please contact an admin An unexpected error occurred during authentication process, please contact an admin - Controller/Root/LoginController.php + Controller/Root/LoginController.php An upload on %bridge_adapter% failed, the resaon is : %reason% @@ -1098,7 +1098,7 @@ Aucun statut editable Kein editierbarer Status - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig Aucune @@ -1267,8 +1267,8 @@ Bad request format, only JSON is allowed Bad Request Format, nur JSON wird erlaubt Controller/Admin/DataboxController.php - Controller/Admin/RootController.php - Controller/Admin/RootController.php + Controller/Admin/RootController.php + Controller/Admin/RootController.php Controller/Root/AccountController.php @@ -1323,6 +1323,11 @@ Sammelkorb wurde aktualisiert Controller/Prod/BasketController.php + + Basket is not found + Basket is not found + Model/Repositories/BasketRepository.php + Basket updated Sammelkorb wurde aktualisiert @@ -1803,7 +1808,7 @@ Continuer ? Fortsetzen? - module/console/systemUpgrade.php + module/console/systemUpgrade.php Continuer quand meme @@ -2318,7 +2323,7 @@ Do you really want to delete the field %s ? Möchten Sie wirklich das Feld %s löschen ? - Controller/Admin/FieldsController.php + Controller/Admin/FieldsController.php Do you really want to end the activity of this session? @@ -2414,17 +2419,17 @@ ERREUR : La classe de subdef est necessaire et egal a "thumbnail","preview" ou "document" ERREUR : La classe de subdef est necessaire et egal a "thumbnail","preview" ou "document" - lib/classes/databox.php + lib/classes/databox.php ERREUR : Les name de subdef sont uniques par groupe de subdefs et necessaire FEHLER : das "name" Attribut des Knotens "subdef" ist zwingend und einzigartig durch Gruppe von subdef - lib/classes/databox.php + lib/classes/databox.php ERREUR : TOUTES LES BALISES subdefgroup necessitent un attribut name FEHLER : Alle "subdefgroup" tags brauchen ein "name" Attribut - lib/classes/databox.php + lib/classes/databox.php Edit @@ -2463,7 +2468,7 @@ Edition impossible Bearbeitung nicht möglich - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig Editor @@ -2498,7 +2503,7 @@ Email Email - web/admin/dashboard.html.twig + web/admin/dashboard.html.twig admin/publications/fiche.html.twig @@ -2535,7 +2540,7 @@ Email test result : %email_status% E-Mail Test Ergebnis: %email_status% - web/admin/dashboard.html.twig + web/admin/dashboard.html.twig Emails @@ -2929,37 +2934,37 @@ Field %name% could not be created, please try again or contact an admin. Field %name% could not be created, please try again or contact an admin. - Controller/Admin/FieldsController.php + Controller/Admin/FieldsController.php Field %name% could not be saved, please try again or contact an admin. Field %name% could not be saved, please try again or contact an admin. - Controller/Admin/FieldsController.php + Controller/Admin/FieldsController.php Field %s contains errors. Feld %s beinhaltet Fehler - Controller/Admin/FieldsController.php + Controller/Admin/FieldsController.php Field can not be blank. Feld kann nicht leer sein - Controller/Admin/FieldsController.php + Controller/Admin/FieldsController.php Field name already exists. Feldname existiert schon - Controller/Admin/FieldsController.php + Controller/Admin/FieldsController.php Field name is not valid. Feldname is nicht gültig - Controller/Admin/FieldsController.php + Controller/Admin/FieldsController.php Field source is not valid. Feldquelle ist nicht gültig - Controller/Admin/FieldsController.php + Controller/Admin/FieldsController.php File is not present in quarantine anymore, please refresh @@ -2972,7 +2977,7 @@ File is too big : 64k max Datei ist gross: 64k max. - Controller/Admin/RootController.php + Controller/Admin/RootController.php File upload has been cancelled @@ -3179,7 +3184,7 @@ Good Gut - Controller/Root/LoginController.php + Controller/Root/LoginController.php Google Analytics identifier @@ -3214,7 +3219,7 @@ Great Großartig - Controller/Root/LoginController.php + Controller/Root/LoginController.php Groupement des resultats sur le champ %name% @@ -3455,7 +3460,7 @@ Invalid captcha answer. ungültige CAPTCHA Antwort - Controller/Root/LoginController.php + Controller/Root/LoginController.php Invalid file format @@ -3490,7 +3495,7 @@ Invalid link. ungültiges Link - Controller/Root/LoginController.php + Controller/Root/LoginController.php Invalid password provided @@ -3505,8 +3510,8 @@ Invalid unlock link. ungültiges freigeschaltet Link - Controller/Root/LoginController.php - Controller/Root/LoginController.php + Controller/Root/LoginController.php + Controller/Root/LoginController.php Inverser @@ -3751,7 +3756,7 @@ Les status de certains documents ne sont pas accessibles par manque de droits Status von einigen Dokumenten werden nicht erreichbar, fehlende Rechte - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig Les termes apparaissent dans le(s) champs @@ -4005,7 +4010,7 @@ Missing "structure" parameter Missing "structure" parameter - Controller/Admin/RootController.php + Controller/Admin/RootController.php Missing labels parameter @@ -4026,7 +4031,7 @@ Missing path parameter Path Parameter fehlen - Controller/Admin/RootController.php + Controller/Admin/RootController.php Missing target collection @@ -4036,7 +4041,7 @@ Missing tests parameter Tests Parameter fehlen - Controller/Admin/RootController.php + Controller/Admin/RootController.php Missing view name parameter @@ -4192,7 +4197,7 @@ No collection selected Keine Kollektion ausgewählt - Controller/Root/LoginController.php + Controller/Root/LoginController.php No document in quarantine @@ -4202,7 +4207,7 @@ No document selected Kein ausgewähltes Dokument - prod/actions/delete_records_confirm.html.twig + prod/actions/delete_records_confirm.html.twig No elements to push @@ -4434,6 +4439,11 @@ Nur einen Datensatz kann geändert werden actions/Property/index.html.twig + + Open the URL in a new window + Open the URL in a new window + Core/Provider/TwigServiceProvider.php + Or login with Oder Anmeldung mit @@ -4469,7 +4479,7 @@ Ordinary Einfach - Controller/Root/LoginController.php + Controller/Root/LoginController.php Original name @@ -4606,7 +4616,7 @@ Phraseanet guest-access is disabled Phraseanet Gast Zugriff ist deaktiviert - Controller/Root/LoginController.php + Controller/Root/LoginController.php Phraseanet may require many binaries. @@ -4633,7 +4643,7 @@ Please accept the terms of use to register. Bitte nehmen Sie die Nutzungsbedingungen an, um zu registrieren - Controller/Root/LoginController.php + Controller/Root/LoginController.php Please be sure it is still valid and you can access it @@ -4655,10 +4665,15 @@ Bitte prüfen Sie, ob Sie dieseBewertung zu folgenden Benutzern senden möchten: %recommendation% prod/actions/Push.html.twig + + Please enter the databox name to reset or create + Please enter the databox name to reset or create + Command/Developer/IniReset.php + Please fill the captcha Füllen Sie bitte die CAPTCHA aus - Controller/Root/LoginController.php + Controller/Root/LoginController.php Please fix the database before starting @@ -4668,7 +4683,7 @@ Please provide a longer value. It should have %s character or more. Bitte geben Sie einen längeren Wert: %s Zeichen oder mehr - Controller/Root/LoginController.php + Controller/Root/LoginController.php Please provide a name for this selection. @@ -4678,32 +4693,32 @@ Please provide a valid IP address. Bitte geben Sie eine gültige IP Adresse ein. - Controller/Root/LoginController.php + Controller/Root/LoginController.php Please provide a valid email address. Bitte geben Sie eine gültige E-Mail Adresse ein. - Controller/Root/LoginController.php + Controller/Root/LoginController.php Please provide a value. Bitte bieten Sie einen Wert an. - Controller/Root/LoginController.php + Controller/Root/LoginController.php Please provide the same emails. Bitte geben Sie die gleiche E-Mail Adressen ein - Controller/Root/LoginController.php + Controller/Root/LoginController.php Please provide the same passwords. Bitte geben Sie die selbe Passwörter ein - Controller/Root/LoginController.php + Controller/Root/LoginController.php Please select at least %s choice. Bitte markieren Sie mindestens %s Auwahl. - Controller/Root/LoginController.php + Controller/Root/LoginController.php Please select at least one valid file @@ -4914,7 +4929,7 @@ Quarantine notificaton Quarantäne Benachrichtigung - eventsmanager/notify/uploadquarantine.php + eventsmanager/notify/uploadquarantine.php Quotas @@ -5355,7 +5370,7 @@ Reset cache Den Cache zurücksetzen - web/admin/dashboard.html.twig + web/admin/dashboard.html.twig Reset rights before applying template? @@ -5599,7 +5614,7 @@ Select all collections Alle Kollektionen auswählen - Controller/Root/LoginController.php + Controller/Root/LoginController.php Select files... @@ -5632,7 +5647,7 @@ Send Senden Controller/Prod/LanguageController.php - web/admin/dashboard.html.twig + web/admin/dashboard.html.twig web/login/forgot-password.html.twig prod/actions/Push.html.twig prod/orders/order_item.html.twig @@ -5817,7 +5832,7 @@ Something wrong happend Es ist etwas schief gelaufen ! - Controller/Admin/RootController.php + Controller/Admin/RootController.php Something wrong happened, please retry or contact an admin. @@ -5827,7 +5842,7 @@ Something wrong happened, please try again or contact an admin. Ein Fehler ist aufgetreten. Bitte versuchen Sie es erneut oder wenden Sie sich an Ihren Systemadministrator - Controller/Admin/FieldsController.php + Controller/Admin/FieldsController.php Sorry, site is currently undergoing maintenance, come back soon. @@ -5919,12 +5934,12 @@ Status icon upload failed : can not write on disk Status Ikone Upload ist fehlgeschlagen: kann nicht auf die Platte beschreiben - Controller/Admin/RootController.php + Controller/Admin/RootController.php Status icon upload failed : upload error Status Ikone Upload ist fehlgeschlagen: Upload Fehler - Controller/Admin/RootController.php + Controller/Admin/RootController.php Statut @@ -6149,7 +6164,7 @@ Target Device Zielgerät - classes/databox/subdef.php + classes/databox/subdef.php Task Scheduler @@ -6225,6 +6240,7 @@ The application is going down for maintenance, please logout. Die Anwendung wird wegen Überarbeitung heruntergefahren. Vielen Dank für Ihr Verständnis + Controller/Root/SessionController.php Controller/Root/SessionController.php @@ -6250,7 +6266,7 @@ The document %name% has been quarantined The document %name% has been quarantined - eventsmanager/notify/uploadquarantine.php + eventsmanager/notify/uploadquarantine.php The file contains the following elements @@ -6623,7 +6639,7 @@ Unable to authenticate with %provider_name% Unable to authenticate with %provider_name% - Controller/Root/LoginController.php + Controller/Root/LoginController.php Unable to connect to MySQL server @@ -6665,7 +6681,7 @@ Unable to retrieve provider identity unmöglich, Provider Identität abzurufen - Controller/Root/LoginController.php + Controller/Root/LoginController.php Unable to send the documents @@ -6676,8 +6692,8 @@ Unable to send your account unlock email. unmöglich, Ihr freigeschaltet Konto E-Mail zu senden - Controller/Root/LoginController.php - Controller/Root/LoginController.php + Controller/Root/LoginController.php + Controller/Root/LoginController.php Unable to share the list with the usr @@ -7138,7 +7154,7 @@ Vous etes maintenant deconnecte. A bientot. Sie sind nun erfolgreich abgemeldet. Bis bald! - Controller/Root/LoginController.php + Controller/Root/LoginController.php Vous n'avez pas assez de droits sur certains elements selectionnes @@ -7243,7 +7259,7 @@ Weak swach - Controller/Root/LoginController.php + Controller/Root/LoginController.php Webservices connectivity @@ -7434,7 +7450,7 @@ You do not enough rights to update status Sie haben nicht die genügende Rechte, um den Status zu aktualisieren - Controller/Admin/RootController.php + Controller/Admin/RootController.php You do not have access to this basket @@ -7459,16 +7475,16 @@ You do not have rights to remove selected documents Sie besitzen nicht genügend Zugriffsrechte, um die ausgewählte Dokumente zu löschen - prod/actions/delete_records_confirm.html.twig + prod/actions/delete_records_confirm.html.twig You do not have the permission to move records to %collection% You do not have the permission to move records to %collection% Controller/Prod/MoveCollectionController.php - - You have %d days to validate the selection. - Sie haben %d Tage, um die Auswahl zu bestätigen + + You have %quantity% days to validate the selection. + You have %quantity% days to validate the selection. Notification/Mail/MailInfoValidationRequest.php @@ -7481,6 +7497,11 @@ Sie haben versucht, zuviele Dateien anzustehen prod/upload/upload-flash.html.twig + + You have not access to this basket + You have not access to this basket + Model/Repositories/BasketRepository.php + You have selected %nbReceivedDocuments% records. Sie haben %nbReceivedDocuments% Datensätze ausgewählt @@ -7534,8 +7555,8 @@ You tried to register with an unknown provider Sie haben es versucht, mit einem unbekannten Provider zu registrieren - Controller/Root/LoginController.php - Controller/Root/LoginController.php + Controller/Root/LoginController.php + Controller/Root/LoginController.php You will no longer receive notifications at %old_email% @@ -7580,7 +7601,7 @@ Your configuration has been successfuly saved. Ihre Konfiguration wurde erfolgreich gespeichert - Controller/Admin/FieldsController.php + Controller/Admin/FieldsController.php Your contact email address has been updated @@ -7600,7 +7621,7 @@ Your identity is not recognized. Ihre Identität wird nicht erkannt - Controller/Root/LoginController.php + Controller/Root/LoginController.php Your install might need to build some sub-definitions @@ -8162,6 +8183,7 @@ admin::compte-utilisateur email E-Mail Controller/Admin/UserController.php + Event/Subscriber/RegistrationSubscriber.php web/account/account.html.twig web/admin/connected-users.html.twig web/admin/editusers.html.twig @@ -8209,6 +8231,7 @@ admin::compte-utilisateur nom Name Controller/Admin/UserController.php + Event/Subscriber/RegistrationSubscriber.php Core/Provider/RegistrationServiceProvider.php web/account/account.html.twig web/admin/connected-users.html.twig @@ -8241,6 +8264,7 @@ admin::compte-utilisateur prenom Vorname Controller/Admin/UserController.php + Event/Subscriber/RegistrationSubscriber.php Core/Provider/RegistrationServiceProvider.php web/account/account.html.twig web/admin/editusers.html.twig @@ -8426,7 +8450,7 @@ admin::monitor: module admin Admin Controller/Admin/ConnectedUsersController.php - lib/classes/phrasea.php + lib/classes/phrasea.php web/admin/connected-users.html.twig web/common/menubar.html.twig @@ -8434,7 +8458,7 @@ admin::monitor: module client Client Controller/Admin/ConnectedUsersController.php - lib/classes/phrasea.php + lib/classes/phrasea.php classes/record/preview.php web/admin/connected-users.html.twig @@ -8442,7 +8466,7 @@ admin::monitor: module comparateur Lightbox Controller/Admin/ConnectedUsersController.php - lib/classes/phrasea.php + lib/classes/phrasea.php web/admin/connected-users.html.twig @@ -8454,7 +8478,7 @@ admin::monitor: module production Prod Controller/Admin/ConnectedUsersController.php - lib/classes/phrasea.php + lib/classes/phrasea.php classes/record/preview.php web/admin/connected-users.html.twig @@ -8462,7 +8486,7 @@ admin::monitor: module report Report Controller/Admin/ConnectedUsersController.php - lib/classes/phrasea.php + lib/classes/phrasea.php web/admin/connected-users.html.twig web/common/menubar.html.twig @@ -8470,7 +8494,7 @@ admin::monitor: module thesaurus Thesaurus Controller/Admin/ConnectedUsersController.php - lib/classes/phrasea.php + lib/classes/phrasea.php web/admin/connected-users.html.twig web/common/menubar.html.twig @@ -8478,7 +8502,7 @@ admin::monitor: module upload Upload Controller/Admin/ConnectedUsersController.php - lib/classes/phrasea.php + lib/classes/phrasea.php web/common/menubar.html.twig @@ -8488,7 +8512,7 @@ Phrasea/Controller/LightboxController.php Phrasea/Controller/LightboxController.php Phrasea/Controller/LightboxController.php - lib/classes/phrasea.php + lib/classes/phrasea.php web/common/menubar.html.twig @@ -8542,9 +8566,9 @@ admin::register: Inscription automatique sur %application% Notification/Mail/MailInfoSomebodyAutoregistered.php - - admin::register: Nouvelle commande sur %s - Neue Bestellung auf %s + + admin::register: Nouvelle commande sur %application% + admin::register: Nouvelle commande sur %application% Notification/Mail/MailInfoNewOrder.php @@ -8711,7 +8735,7 @@ audio Audio - Phrasea/Twig/PhraseanetExtension.php + Phrasea/Twig/PhraseanetExtension.php task-manager/task-editor/subdefs.html.twig @@ -8747,7 +8771,7 @@ be notified when a document is placed in quarantine Benachrichtigungen bekommen, wenn ein Dokument unter Quarantäne gestellt wird - eventsmanager/notify/uploadquarantine.php + eventsmanager/notify/uploadquarantine.php bijou en or @@ -8768,8 +8792,8 @@ boutton::ajouter hinzufügen admin/collection/suggested_value.html.twig - prod/actions/edit_default.html.twig - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig boutton::annuler @@ -8790,8 +8814,8 @@ Bridge/Flickr/photo_modify.html.twig Bridge/Youtube/video_modify.html.twig Bridge/Youtube/video_modify.html.twig - prod/actions/edit_default.html.twig - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig web/prod/tab_thesaurus.html.twig web/report/all_content.html.twig web/thesaurus/accept.html.twig @@ -8881,8 +8905,8 @@ Controller/Prod/LanguageController.php web/common/dialog_export.html.twig web/lightbox/sc_note.html.twig - prod/actions/edit_default.html.twig - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig prod/actions/Push.html.twig web/report/all_content.html.twig web/thesaurus/accept.html.twig @@ -8953,12 +8977,12 @@ boutton::reinitialiser Zurücksetzen - web/admin/dashboard.html.twig + web/admin/dashboard.html.twig boutton::remplacer ersetzen - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig boutton::renouveller @@ -9069,7 +9093,7 @@ admin/collection/create.html.twig admin/collection/reorder.html.twig admin/collection/suggested_value.html.twig - web/admin/dashboard.html.twig + web/admin/dashboard.html.twig web/admin/editusers.html.twig admin/publications/fiche.html.twig admin/publications/list.html.twig @@ -9097,8 +9121,8 @@ Bridge/Youtube/video_deleteelement.html.twig Bridge/Youtube/video_modify.html.twig Bridge/Youtube/video_moveinto_playlist.html.twig - prod/actions/edit_default.html.twig - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig prod/Baskets/Reorder.html.twig prod/Baskets/Update.html.twig web/prod/index.html.twig @@ -9243,7 +9267,7 @@ collection.label.unknown collection.label.unknown - lib/classes/phrasea.php + lib/classes/phrasea.php commande::deadline @@ -9307,7 +9331,7 @@ document Dokument - Phrasea/Twig/PhraseanetExtension.php + Phrasea/Twig/PhraseanetExtension.php web/admin/subdefs.html.twig web/admin/subdefs.html.twig task-manager/task-editor/subdefs.html.twig @@ -9369,7 +9393,7 @@ edit::preset:: titre Titel - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig effacer (OK) ou quitter (Annuler) ? @@ -9422,7 +9446,7 @@ export::ftp: reglages manuels manuelle Einstellungen - classes/set/export.php + classes/set/export.php export::mail: contenu du mail @@ -9479,13 +9503,13 @@ flash flash - Phrasea/Twig/PhraseanetExtension.php + Phrasea/Twig/PhraseanetExtension.php task-manager/task-editor/subdefs.html.twig for the following reasons : %reasons% for the following reasons : %reasons% - eventsmanager/notify/uploadquarantine.php + eventsmanager/notify/uploadquarantine.php forms::ce champ est requis @@ -9553,7 +9577,7 @@ image Bild - Phrasea/Twig/PhraseanetExtension.php + Phrasea/Twig/PhraseanetExtension.php task-manager/task-editor/subdefs.html.twig @@ -9643,17 +9667,17 @@ login::erreur: Erreur d'authentification Anmeldefehler Controller/Api/OAuth2Controller.php - Controller/Root/LoginController.php + Controller/Root/LoginController.php login::erreur: No available connection - Please contact sys-admin Fehler: Keine verfügbare Verbindung - Bitte kontaktieren Sie den Administrator - Controller/Root/LoginController.php + Controller/Root/LoginController.php login::erreur: Vous n'avez pas confirme votre email Zugriff nicht möglich. Sie haben Ihre E-Mail Adresse noch nicht bestätigt - Controller/Root/LoginController.php + Controller/Root/LoginController.php login::notification: Changements enregistres @@ -9664,13 +9688,13 @@ login::notification: Mise a jour du mot de passe avec succes erfolgreiche Passwort Aktualisierung Controller/Root/AccountController.php - Controller/Root/LoginController.php + Controller/Root/LoginController.php login::notification: demande de confirmation par mail envoyee E-Mail Bestätigungsanfrage gesendet - Controller/Root/LoginController.php - Controller/Root/LoginController.php + Controller/Root/LoginController.php + Controller/Root/LoginController.php login::register: Faire une demande d'acces @@ -9937,7 +9961,7 @@ phraseanet:: Un email vient de vous etre envoye Wir haben Ihnen ein E-Mail gesendet - Controller/Root/LoginController.php + Controller/Root/LoginController.php phraseanet:: a propos @@ -10023,12 +10047,12 @@ phraseanet:: presse-papier Zwischenablage - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig phraseanet:: preview Voransicht - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig prod/actions/printer_default.html.twig @@ -10052,7 +10076,7 @@ phraseanet:: thesaurus Thesaurus - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig web/prod/tab_headers.html.twig web/thesaurus/index.html.twig web/thesaurus/load-thesaurus.html.twig @@ -10098,7 +10122,7 @@ ladend Controller/Prod/LanguageController.php admin/collection/suggested_value.html.twig - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig web/thesaurus/thesaurus.html.twig @@ -10388,7 +10412,7 @@ prod::edit: Impossible d'editer simultanement des documents provenant de bases differentes Es ist nicht möglich, Dokumente die aus verschiedenen Bilddatenbanken stammen gleichzeitig zu bearbeiten - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig prod::editing valeurs heterogenes, choisir 'remplacer', 'ajouter' ou 'annuler' @@ -10398,32 +10422,32 @@ prod::editing: %not_actionable% documents ne peuvent etre edites car vos droits sont induffisants %not_actionable% Dokumente können nicht bearbeitet werden, da Sie keine Rechte darauf haben - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig prod::editing: 1 document ne peut etre edite car vos droits sont induffisants Keine Bearbeitung möglich. Sie haben keinen Zugriff auf die Dokumente - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig prod::editing: aucun documents ne peuvent etre edites car vos droits sont induffisants Es können keine Dokumente bearbeitet werden, da Sie keine Berechtigung für das Bearbeiten haben - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig prod::editing: modeles de fiches Vorlage - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig prod::editing: rechercher-remplacer suchen / ersetzen - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig prod::editing: valider ou annuler les modifications Änderungen bestätigen oder abbrechen - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig prod::editing::annulation: abandonner les modification ? @@ -10438,77 +10462,77 @@ prod::editing::replace: remplacer dans le champ In dem Feld ersetzen - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig prod::editing::replace: remplacer dans tous les champs In allen Feldern ersetzen - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig prod::editing:indexation en cours Indexierung in Vorbereitung - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig prod::editing:remplace: chaine remplacante ersetzen durch - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig prod::editing:remplace: options de remplacement Optionen - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig prod::editing:remplace::option : utiliser une expression reguliere regulärer Ausdruck - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig prod::editing:remplace::option la valeur du cahmp doit etre exacte vollständiges Feld - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig prod::editing:remplace::option la valeur est comprise dans le champ im Feld gehalten - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig prod::editing:remplace::option respecter la casse Gross- und Kleinschreibung unterschieden - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig prod::editing:remplace::option: remplacer toutes les occurences alles ersetzen - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig prod::editing:remplace::option: rester insensible a la casse Gross- und Kleinschreibung nicht unterschieden - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig prod::editing:replace: chaine a rechercher Suchen - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig prod::facet:base_label prod::facet:base_label - Controller/Prod/QueryController.php + Controller/Prod/QueryController.php prod::facet:collection_label prod::facet:collection_label - Controller/Prod/QueryController.php + Controller/Prod/QueryController.php prod::facet:doctype_label prod::facet:doctype_label - Controller/Prod/QueryController.php + Controller/Prod/QueryController.php prod::recherche: Attention : la liste des bases selectionnees pour la recherche a ete changee. @@ -10794,7 +10818,7 @@ reponses::document sans titre ohne Titel - classes/record/adapter.php + classes/record/adapter.php report :: aucun resultat trouve @@ -11628,8 +11652,8 @@ reportage Reportage - Phrasea/Twig/PhraseanetExtension.php - Phrasea/Twig/PhraseanetExtension.php + Phrasea/Twig/PhraseanetExtension.php + Phrasea/Twig/PhraseanetExtension.php resultat numero %number% @@ -11719,7 +11743,7 @@ setup:: Reinitialisation des droits admins die Rechte von Administratoren zurücksetzen - web/admin/dashboard.html.twig + web/admin/dashboard.html.twig setup:: administrateurs de l'application @@ -11749,7 +11773,7 @@ setup::Tests d'envois d'emails Test E-Mail Überprüfungen - web/admin/dashboard.html.twig + web/admin/dashboard.html.twig sport @@ -11969,17 +11993,17 @@ task::subdef:creation des sous definitions Erstellung der Unterauflösungen - TaskManager/Job/SubdefsJob.php + TaskManager/Job/SubdefsJob.php task::subdef:creation des sous definitions des documents d'origine Erstellung von Unterauflösungen - TaskManager/Job/SubdefsJob.php + TaskManager/Job/SubdefsJob.php task::writemeta:(re)ecriture des metadatas dans les documents (et subdefs concernees) Zurückschreiben der Metadaten in Dokumente (und betroffenen Unterauflösungen) - TaskManager/Job/WriteMetadataJob.php + TaskManager/Job/WriteMetadataJob.php task::writemeta:Compatibilité MWG @@ -11989,7 +12013,7 @@ task::writemeta:ecriture des metadatas Metadaten Schreiben - TaskManager/Job/WriteMetadataJob.php + TaskManager/Job/WriteMetadataJob.php task::writemeta:effacer les metadatas non presentes dans la structure diff --git a/resources/locales/messages.en.xlf b/resources/locales/messages.en.xlf index 27af3e59a1..d9e3c84b24 100644 --- a/resources/locales/messages.en.xlf +++ b/resources/locales/messages.en.xlf @@ -1,6 +1,6 @@ - +
The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message. @@ -49,12 +49,12 @@ %d collection selected %d collection selected - Controller/Root/LoginController.php + Controller/Root/LoginController.php %d collections selected %d collections selected - Controller/Root/LoginController.php + Controller/Root/LoginController.php %d fields have been updated @@ -208,12 +208,12 @@ %s field has been created with success. %s field has been created with success. - Controller/Admin/FieldsController.php + Controller/Admin/FieldsController.php %s field has been deleted with success. %s field has been deleted with success. - Controller/Admin/FieldsController.php + Controller/Admin/FieldsController.php %total% reponses @@ -530,18 +530,18 @@ Account has been unlocked, you can now login. Account has been unlocked. You can now login. - Controller/Root/LoginController.php - Controller/Root/LoginController.php + Controller/Root/LoginController.php + Controller/Root/LoginController.php Account has been unlocked, you still have to wait for admin approval. Account has been unlocked. But you still have to wait for an administration approval. - Controller/Root/LoginController.php + Controller/Root/LoginController.php Account is already unlocked, you can login. Account is already unlocked. You can login. - Controller/Root/LoginController.php + Controller/Root/LoginController.php Account is not found. @@ -625,7 +625,7 @@ Add an admin Add an admin - web/admin/dashboard.html.twig + web/admin/dashboard.html.twig Add user @@ -715,7 +715,7 @@ Aide sur les expressions regulieres Help about Regular expressions - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig Ajouter a @@ -919,7 +919,7 @@ An unexpected error occurred during authentication process, please contact an admin An unexpected error has occured during authentication process. Please contact an admin - Controller/Root/LoginController.php + Controller/Root/LoginController.php An upload on %bridge_adapter% failed, the resaon is : %reason% @@ -1094,7 +1094,7 @@ Aucun statut editable No editable status - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig Aucune @@ -1263,8 +1263,8 @@ Bad request format, only JSON is allowed Bad request format. Only JSON is allowed. Controller/Admin/DataboxController.php - Controller/Admin/RootController.php - Controller/Admin/RootController.php + Controller/Admin/RootController.php + Controller/Admin/RootController.php Controller/Root/AccountController.php @@ -1319,6 +1319,11 @@ Basket has been updated Controller/Prod/BasketController.php + + Basket is not found + Basket is not found + Model/Repositories/BasketRepository.php + Basket updated Basket updated @@ -1799,7 +1804,7 @@ Continuer ? Continue ? - module/console/systemUpgrade.php + module/console/systemUpgrade.php Continuer quand meme @@ -2314,7 +2319,7 @@ Do you really want to delete the field %s ? Do you really want to delete the field %s? - Controller/Admin/FieldsController.php + Controller/Admin/FieldsController.php Do you really want to end the activity of this session? @@ -2410,17 +2415,17 @@ ERREUR : La classe de subdef est necessaire et egal a "thumbnail","preview" ou "document" Error: Class attribute is mandatory and must be Thumbnail, Preview or Document - lib/classes/databox.php + lib/classes/databox.php ERREUR : Les name de subdef sont uniques par groupe de subdefs et necessaire Error : Attribute "name" from node "subdef" is required and single - lib/classes/databox.php + lib/classes/databox.php ERREUR : TOUTES LES BALISES subdefgroup necessitent un attribut name Error : All "subdefgroup" tags must have an attribute "name" - lib/classes/databox.php + lib/classes/databox.php Edit @@ -2459,7 +2464,7 @@ Edition impossible Unable to edit - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig Editor @@ -2494,7 +2499,7 @@ Email E-mail - web/admin/dashboard.html.twig + web/admin/dashboard.html.twig admin/publications/fiche.html.twig @@ -2531,7 +2536,7 @@ Email test result : %email_status% E-mail test result: %email_status% - web/admin/dashboard.html.twig + web/admin/dashboard.html.twig Emails @@ -2925,37 +2930,37 @@ Field %name% could not be created, please try again or contact an admin. Field %name% could not be created, please try again or contact an admin. - Controller/Admin/FieldsController.php + Controller/Admin/FieldsController.php Field %name% could not be saved, please try again or contact an admin. Field %name% could not be saved, please try again or contact an admin. - Controller/Admin/FieldsController.php + Controller/Admin/FieldsController.php Field %s contains errors. Field %s contains errors. - Controller/Admin/FieldsController.php + Controller/Admin/FieldsController.php Field can not be blank. Field cannot be blank. - Controller/Admin/FieldsController.php + Controller/Admin/FieldsController.php Field name already exists. Field name already exists. - Controller/Admin/FieldsController.php + Controller/Admin/FieldsController.php Field name is not valid. Field name is not valid. - Controller/Admin/FieldsController.php + Controller/Admin/FieldsController.php Field source is not valid. Field source is not valid. - Controller/Admin/FieldsController.php + Controller/Admin/FieldsController.php File is not present in quarantine anymore, please refresh @@ -2968,7 +2973,7 @@ File is too big : 64k max File is too large: 64kb max. - Controller/Admin/RootController.php + Controller/Admin/RootController.php File upload has been cancelled @@ -3175,7 +3180,7 @@ Good Good - Controller/Root/LoginController.php + Controller/Root/LoginController.php Google Analytics identifier @@ -3210,7 +3215,7 @@ Great Great - Controller/Root/LoginController.php + Controller/Root/LoginController.php Groupement des resultats sur le champ %name% @@ -3451,7 +3456,7 @@ Invalid captcha answer. Invalid CAPTCHA answer. - Controller/Root/LoginController.php + Controller/Root/LoginController.php Invalid file format @@ -3486,7 +3491,7 @@ Invalid link. Invalid link - Controller/Root/LoginController.php + Controller/Root/LoginController.php Invalid password provided @@ -3501,8 +3506,8 @@ Invalid unlock link. Invalid unlock link. - Controller/Root/LoginController.php - Controller/Root/LoginController.php + Controller/Root/LoginController.php + Controller/Root/LoginController.php Inverser @@ -3747,7 +3752,7 @@ Les status de certains documents ne sont pas accessibles par manque de droits your user rights do not allow you to modify Status for some of the selected documents - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig Les termes apparaissent dans le(s) champs @@ -4001,7 +4006,7 @@ Missing "structure" parameter Missing "structure" parameter - Controller/Admin/RootController.php + Controller/Admin/RootController.php Missing labels parameter @@ -4022,7 +4027,7 @@ Missing path parameter Missing path parameter - Controller/Admin/RootController.php + Controller/Admin/RootController.php Missing target collection @@ -4032,7 +4037,7 @@ Missing tests parameter Missing test parameter - Controller/Admin/RootController.php + Controller/Admin/RootController.php Missing view name parameter @@ -4188,7 +4193,7 @@ No collection selected No selected collection - Controller/Root/LoginController.php + Controller/Root/LoginController.php No document in quarantine @@ -4198,7 +4203,7 @@ No document selected No document selected - prod/actions/delete_records_confirm.html.twig + prod/actions/delete_records_confirm.html.twig No elements to push @@ -4430,6 +4435,11 @@ Only one record can be modified. actions/Property/index.html.twig + + Open the URL in a new window + Open the URL in a new window + Core/Provider/TwigServiceProvider.php + Or login with Or login with @@ -4465,7 +4475,7 @@ Ordinary Ordinary - Controller/Root/LoginController.php + Controller/Root/LoginController.php Original name @@ -4602,7 +4612,7 @@ Phraseanet guest-access is disabled Phraseanet guest-access is disabled. - Controller/Root/LoginController.php + Controller/Root/LoginController.php Phraseanet may require many binaries. @@ -4629,7 +4639,7 @@ Please accept the terms of use to register. You must accept the terms of use to register. - Controller/Root/LoginController.php + Controller/Root/LoginController.php Please be sure it is still valid and you can access it @@ -4651,10 +4661,15 @@ Please consider you can send this feedback request to the following users: %recommendation% prod/actions/Push.html.twig + + Please enter the databox name to reset or create + Please enter the databox name to reset or create + Command/Developer/IniReset.php + Please fill the captcha Please fill the captcha field. - Controller/Root/LoginController.php + Controller/Root/LoginController.php Please fix the database before starting @@ -4664,7 +4679,7 @@ Please provide a longer value. It should have %s character or more. Please provide a longer value. It must have %s characters or more. - Controller/Root/LoginController.php + Controller/Root/LoginController.php Please provide a name for this selection. @@ -4674,32 +4689,32 @@ Please provide a valid IP address. Please provide a valid IP address. - Controller/Root/LoginController.php + Controller/Root/LoginController.php Please provide a valid email address. Please provide a valid e-mail address. - Controller/Root/LoginController.php + Controller/Root/LoginController.php Please provide a value. Please provide a value. - Controller/Root/LoginController.php + Controller/Root/LoginController.php Please provide the same emails. Please provide the same e-mails. - Controller/Root/LoginController.php + Controller/Root/LoginController.php Please provide the same passwords. Please provide the same passwords. - Controller/Root/LoginController.php + Controller/Root/LoginController.php Please select at least %s choice. Please select at least %s choice(s). - Controller/Root/LoginController.php + Controller/Root/LoginController.php Please select at least one valid file @@ -4914,7 +4929,7 @@ Pushed documents are also available in a received basket within Phraseanet Produ Quarantine notificaton Quarantine notification - eventsmanager/notify/uploadquarantine.php + eventsmanager/notify/uploadquarantine.php Quotas @@ -5355,7 +5370,7 @@ Pushed documents are also available in a received basket within Phraseanet Produ Reset cache Reset cache - web/admin/dashboard.html.twig + web/admin/dashboard.html.twig Reset rights before applying template? @@ -5599,7 +5614,7 @@ Pushed documents are also available in a received basket within Phraseanet Produ Select all collections Select all collections - Controller/Root/LoginController.php + Controller/Root/LoginController.php Select files... @@ -5632,7 +5647,7 @@ Pushed documents are also available in a received basket within Phraseanet Produ Send Send Controller/Prod/LanguageController.php - web/admin/dashboard.html.twig + web/admin/dashboard.html.twig web/login/forgot-password.html.twig prod/actions/Push.html.twig prod/orders/order_item.html.twig @@ -5817,7 +5832,7 @@ Pushed documents are also available in a received basket within Phraseanet Produ Something wrong happend Something wrong happened - Controller/Admin/RootController.php + Controller/Admin/RootController.php Something wrong happened, please retry or contact an admin. @@ -5827,7 +5842,7 @@ Pushed documents are also available in a received basket within Phraseanet Produ Something wrong happened, please try again or contact an admin. Something wrong happened. Please try again or contact an administrator. - Controller/Admin/FieldsController.php + Controller/Admin/FieldsController.php Sorry, site is currently undergoing maintenance, come back soon. @@ -5919,12 +5934,12 @@ Pushed documents are also available in a received basket within Phraseanet Produ Status icon upload failed : can not write on disk Status icon upload failed: cannot write on disk - Controller/Admin/RootController.php + Controller/Admin/RootController.php Status icon upload failed : upload error Status icon upload failed: upload error - Controller/Admin/RootController.php + Controller/Admin/RootController.php Statut @@ -6149,7 +6164,7 @@ Pushed documents are also available in a received basket within Phraseanet Produ Target Device Target device - classes/databox/subdef.php + classes/databox/subdef.php Task Scheduler @@ -6225,6 +6240,7 @@ Pushed documents are also available in a received basket within Phraseanet Produ The application is going down for maintenance, please logout. You will be disconnected for maintenance, please quit Phraseanet + Controller/Root/SessionController.php Controller/Root/SessionController.php @@ -6250,7 +6266,7 @@ Pushed documents are also available in a received basket within Phraseanet Produ The document %name% has been quarantined The document %name% has been quarantined - eventsmanager/notify/uploadquarantine.php + eventsmanager/notify/uploadquarantine.php The file contains the following elements @@ -6623,7 +6639,7 @@ Pushed documents are also available in a received basket within Phraseanet Produ Unable to authenticate with %provider_name% Unable to authenticate with %provider_name% - Controller/Root/LoginController.php + Controller/Root/LoginController.php Unable to connect to MySQL server @@ -6665,7 +6681,7 @@ Pushed documents are also available in a received basket within Phraseanet Produ Unable to retrieve provider identity Unable to retrieve provider identity. - Controller/Root/LoginController.php + Controller/Root/LoginController.php Unable to send the documents @@ -6676,8 +6692,8 @@ Pushed documents are also available in a received basket within Phraseanet Produ Unable to send your account unlock email. Unable to send e-mail to unlock your account. - Controller/Root/LoginController.php - Controller/Root/LoginController.php + Controller/Root/LoginController.php + Controller/Root/LoginController.php Unable to share the list with the usr @@ -7138,7 +7154,7 @@ Pushed documents are also available in a received basket within Phraseanet Produ Vous etes maintenant deconnecte. A bientot. You are now disconnected. See you soon. - Controller/Root/LoginController.php + Controller/Root/LoginController.php Vous n'avez pas assez de droits sur certains elements selectionnes @@ -7243,7 +7259,7 @@ Pushed documents are also available in a received basket within Phraseanet Produ Weak Weak - Controller/Root/LoginController.php + Controller/Root/LoginController.php Webservices connectivity @@ -7434,7 +7450,7 @@ Pushed documents are also available in a received basket within Phraseanet Produ You do not enough rights to update status Your user right do not allow you to change document status - Controller/Admin/RootController.php + Controller/Admin/RootController.php You do not have access to this basket @@ -7459,16 +7475,16 @@ Pushed documents are also available in a received basket within Phraseanet Produ You do not have rights to remove selected documents You don't have rights to remove selected documents. - prod/actions/delete_records_confirm.html.twig + prod/actions/delete_records_confirm.html.twig You do not have the permission to move records to %collection% You do not have the permission to move records to %collection% Controller/Prod/MoveCollectionController.php - - You have %d days to validate the selection. - You have %d days to give your feedback for the selected documents. + + You have %quantity% days to validate the selection. + You have %quantity% days to validate the selection. Notification/Mail/MailInfoValidationRequest.php @@ -7481,6 +7497,11 @@ Pushed documents are also available in a received basket within Phraseanet Produ You have attempted to queue too many files prod/upload/upload-flash.html.twig + + You have not access to this basket + You have not access to this basket + Model/Repositories/BasketRepository.php + You have selected %nbReceivedDocuments% records. You have selected %nbReceivedDocuments% records. @@ -7534,8 +7555,8 @@ Pushed documents are also available in a received basket within Phraseanet Produ You tried to register with an unknown provider You tried to register with an unknown provider. - Controller/Root/LoginController.php - Controller/Root/LoginController.php + Controller/Root/LoginController.php + Controller/Root/LoginController.php You will no longer receive notifications at %old_email% @@ -7580,7 +7601,7 @@ Pushed documents are also available in a received basket within Phraseanet Produ Your configuration has been successfuly saved. Your configuration has been successfuly saved. - Controller/Admin/FieldsController.php + Controller/Admin/FieldsController.php Your contact email address has been updated @@ -7600,7 +7621,7 @@ Pushed documents are also available in a received basket within Phraseanet Produ Your identity is not recognized. Your identity is not recognized. - Controller/Root/LoginController.php + Controller/Root/LoginController.php Your install might need to build some sub-definitions @@ -8162,6 +8183,7 @@ Pushed documents are also available in a received basket within Phraseanet Produ admin::compte-utilisateur email E-mail Controller/Admin/UserController.php + Event/Subscriber/RegistrationSubscriber.php web/account/account.html.twig web/admin/connected-users.html.twig web/admin/editusers.html.twig @@ -8209,6 +8231,7 @@ Pushed documents are also available in a received basket within Phraseanet Produ admin::compte-utilisateur nom Last name Controller/Admin/UserController.php + Event/Subscriber/RegistrationSubscriber.php Core/Provider/RegistrationServiceProvider.php web/account/account.html.twig web/admin/connected-users.html.twig @@ -8241,6 +8264,7 @@ Pushed documents are also available in a received basket within Phraseanet Produ admin::compte-utilisateur prenom First name Controller/Admin/UserController.php + Event/Subscriber/RegistrationSubscriber.php Core/Provider/RegistrationServiceProvider.php web/account/account.html.twig web/admin/editusers.html.twig @@ -8426,7 +8450,7 @@ Pushed documents are also available in a received basket within Phraseanet Produ admin::monitor: module admin Admin Controller/Admin/ConnectedUsersController.php - lib/classes/phrasea.php + lib/classes/phrasea.php web/admin/connected-users.html.twig web/common/menubar.html.twig @@ -8434,7 +8458,7 @@ Pushed documents are also available in a received basket within Phraseanet Produ admin::monitor: module client Client Controller/Admin/ConnectedUsersController.php - lib/classes/phrasea.php + lib/classes/phrasea.php classes/record/preview.php web/admin/connected-users.html.twig @@ -8442,7 +8466,7 @@ Pushed documents are also available in a received basket within Phraseanet Produ admin::monitor: module comparateur Lightbox Controller/Admin/ConnectedUsersController.php - lib/classes/phrasea.php + lib/classes/phrasea.php web/admin/connected-users.html.twig @@ -8454,7 +8478,7 @@ Pushed documents are also available in a received basket within Phraseanet Produ admin::monitor: module production Production Controller/Admin/ConnectedUsersController.php - lib/classes/phrasea.php + lib/classes/phrasea.php classes/record/preview.php web/admin/connected-users.html.twig @@ -8462,7 +8486,7 @@ Pushed documents are also available in a received basket within Phraseanet Produ admin::monitor: module report Report Controller/Admin/ConnectedUsersController.php - lib/classes/phrasea.php + lib/classes/phrasea.php web/admin/connected-users.html.twig web/common/menubar.html.twig @@ -8470,7 +8494,7 @@ Pushed documents are also available in a received basket within Phraseanet Produ admin::monitor: module thesaurus Thesaurus Controller/Admin/ConnectedUsersController.php - lib/classes/phrasea.php + lib/classes/phrasea.php web/admin/connected-users.html.twig web/common/menubar.html.twig @@ -8478,7 +8502,7 @@ Pushed documents are also available in a received basket within Phraseanet Produ admin::monitor: module upload Upload Controller/Admin/ConnectedUsersController.php - lib/classes/phrasea.php + lib/classes/phrasea.php web/common/menubar.html.twig @@ -8488,7 +8512,7 @@ Pushed documents are also available in a received basket within Phraseanet Produ Phrasea/Controller/LightboxController.php Phrasea/Controller/LightboxController.php Phrasea/Controller/LightboxController.php - lib/classes/phrasea.php + lib/classes/phrasea.php web/common/menubar.html.twig @@ -8542,9 +8566,9 @@ Pushed documents are also available in a received basket within Phraseanet Produ Automatic register on %application% Notification/Mail/MailInfoSomebodyAutoregistered.php - - admin::register: Nouvelle commande sur %s - New order on %s + + admin::register: Nouvelle commande sur %application% + admin::register: Nouvelle commande sur %application% Notification/Mail/MailInfoNewOrder.php @@ -8711,7 +8735,7 @@ Pushed documents are also available in a received basket within Phraseanet Produ audio audio - Phrasea/Twig/PhraseanetExtension.php + Phrasea/Twig/PhraseanetExtension.php task-manager/task-editor/subdefs.html.twig @@ -8747,7 +8771,7 @@ Pushed documents are also available in a received basket within Phraseanet Produ be notified when a document is placed in quarantine Be notified when a document is moved in quarantine - eventsmanager/notify/uploadquarantine.php + eventsmanager/notify/uploadquarantine.php bijou en or @@ -8768,8 +8792,8 @@ Pushed documents are also available in a received basket within Phraseanet Produ boutton::ajouter Add admin/collection/suggested_value.html.twig - prod/actions/edit_default.html.twig - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig boutton::annuler @@ -8790,8 +8814,8 @@ Pushed documents are also available in a received basket within Phraseanet Produ Bridge/Flickr/photo_modify.html.twig Bridge/Youtube/video_modify.html.twig Bridge/Youtube/video_modify.html.twig - prod/actions/edit_default.html.twig - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig web/prod/tab_thesaurus.html.twig web/report/all_content.html.twig web/thesaurus/accept.html.twig @@ -8881,8 +8905,8 @@ Pushed documents are also available in a received basket within Phraseanet Produ Controller/Prod/LanguageController.php web/common/dialog_export.html.twig web/lightbox/sc_note.html.twig - prod/actions/edit_default.html.twig - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig prod/actions/Push.html.twig web/report/all_content.html.twig web/thesaurus/accept.html.twig @@ -8953,12 +8977,12 @@ Pushed documents are also available in a received basket within Phraseanet Produ boutton::reinitialiser Reset - web/admin/dashboard.html.twig + web/admin/dashboard.html.twig boutton::remplacer Replace - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig boutton::renouveller @@ -9069,7 +9093,7 @@ Pushed documents are also available in a received basket within Phraseanet Produ admin/collection/create.html.twig admin/collection/reorder.html.twig admin/collection/suggested_value.html.twig - web/admin/dashboard.html.twig + web/admin/dashboard.html.twig web/admin/editusers.html.twig admin/publications/fiche.html.twig admin/publications/list.html.twig @@ -9097,8 +9121,8 @@ Pushed documents are also available in a received basket within Phraseanet Produ Bridge/Youtube/video_deleteelement.html.twig Bridge/Youtube/video_modify.html.twig Bridge/Youtube/video_moveinto_playlist.html.twig - prod/actions/edit_default.html.twig - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig prod/Baskets/Reorder.html.twig prod/Baskets/Update.html.twig web/prod/index.html.twig @@ -9243,7 +9267,7 @@ Pushed documents are also available in a received basket within Phraseanet Produ collection.label.unknown Unknown collection - lib/classes/phrasea.php + lib/classes/phrasea.php commande::deadline @@ -9307,7 +9331,7 @@ Pushed documents are also available in a received basket within Phraseanet Produ document document - Phrasea/Twig/PhraseanetExtension.php + Phrasea/Twig/PhraseanetExtension.php web/admin/subdefs.html.twig web/admin/subdefs.html.twig task-manager/task-editor/subdefs.html.twig @@ -9369,7 +9393,7 @@ Pushed documents are also available in a received basket within Phraseanet Produ edit::preset:: titre Title - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig effacer (OK) ou quitter (Annuler) ? @@ -9422,7 +9446,7 @@ Pushed documents are also available in a received basket within Phraseanet Produ export::ftp: reglages manuels Manual settings - classes/set/export.php + classes/set/export.php export::mail: contenu du mail @@ -9479,13 +9503,13 @@ Pushed documents are also available in a received basket within Phraseanet Produ flash flash - Phrasea/Twig/PhraseanetExtension.php + Phrasea/Twig/PhraseanetExtension.php task-manager/task-editor/subdefs.html.twig for the following reasons : %reasons% for the following reasons: %reasons% - eventsmanager/notify/uploadquarantine.php + eventsmanager/notify/uploadquarantine.php forms::ce champ est requis @@ -9553,7 +9577,7 @@ Pushed documents are also available in a received basket within Phraseanet Produ image Image - Phrasea/Twig/PhraseanetExtension.php + Phrasea/Twig/PhraseanetExtension.php task-manager/task-editor/subdefs.html.twig @@ -9643,17 +9667,17 @@ Pushed documents are also available in a received basket within Phraseanet Produ login::erreur: Erreur d'authentification Authentication error Controller/Api/OAuth2Controller.php - Controller/Root/LoginController.php + Controller/Root/LoginController.php login::erreur: No available connection - Please contact sys-admin No available connection. Please contact system administrator - Controller/Root/LoginController.php + Controller/Root/LoginController.php login::erreur: Vous n'avez pas confirme votre email Access denied, you have not confirmed your e-mail address. - Controller/Root/LoginController.php + Controller/Root/LoginController.php login::notification: Changements enregistres @@ -9664,13 +9688,13 @@ Pushed documents are also available in a received basket within Phraseanet Produ login::notification: Mise a jour du mot de passe avec succes Password update done Controller/Root/AccountController.php - Controller/Root/LoginController.php + Controller/Root/LoginController.php login::notification: demande de confirmation par mail envoyee E-mail confirmation sent. - Controller/Root/LoginController.php - Controller/Root/LoginController.php + Controller/Root/LoginController.php + Controller/Root/LoginController.php login::register: Faire une demande d'acces @@ -9937,7 +9961,7 @@ Pushed documents are also available in a received basket within Phraseanet Produ phraseanet:: Un email vient de vous etre envoye An e-mail has been sent. - Controller/Root/LoginController.php + Controller/Root/LoginController.php phraseanet:: a propos @@ -10023,12 +10047,12 @@ Pushed documents are also available in a received basket within Phraseanet Produ phraseanet:: presse-papier Clipboard - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig phraseanet:: preview Preview - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig prod/actions/printer_default.html.twig @@ -10052,7 +10076,7 @@ Pushed documents are also available in a received basket within Phraseanet Produ phraseanet:: thesaurus Thesaurus - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig web/prod/tab_headers.html.twig web/thesaurus/index.html.twig web/thesaurus/load-thesaurus.html.twig @@ -10098,7 +10122,7 @@ Pushed documents are also available in a received basket within Phraseanet Produ Loading Controller/Prod/LanguageController.php admin/collection/suggested_value.html.twig - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig web/thesaurus/thesaurus.html.twig @@ -10388,7 +10412,7 @@ Pushed documents are also available in a received basket within Phraseanet Produ prod::edit: Impossible d'editer simultanement des documents provenant de bases differentes Selected documents come from differents databases, unable to edit - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig prod::editing valeurs heterogenes, choisir 'remplacer', 'ajouter' ou 'annuler' @@ -10398,32 +10422,32 @@ Pushed documents are also available in a received basket within Phraseanet Produ prod::editing: %not_actionable% documents ne peuvent etre edites car vos droits sont induffisants Your user rights do not allow you to edit %not_actionable% documents from selection - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig prod::editing: 1 document ne peut etre edite car vos droits sont induffisants You do not have the required permissions to edit 1 document - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig prod::editing: aucun documents ne peuvent etre edites car vos droits sont induffisants Your user rights do not allow you to edit any of the selected documents - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig prod::editing: modeles de fiches Caption template - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig prod::editing: rechercher-remplacer Find / Replace - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig prod::editing: valider ou annuler les modifications Valid changes or Cancel - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig prod::editing::annulation: abandonner les modification ? @@ -10438,77 +10462,77 @@ Pushed documents are also available in a received basket within Phraseanet Produ prod::editing::replace: remplacer dans le champ Replace in field - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig prod::editing::replace: remplacer dans tous les champs Replace in all fields - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig prod::editing:indexation en cours Processing indexation - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig prod::editing:remplace: chaine remplacante Replace with - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig prod::editing:remplace: options de remplacement Options - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig prod::editing:remplace::option : utiliser une expression reguliere Regular expression - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig prod::editing:remplace::option la valeur du cahmp doit etre exacte Whole field - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig prod::editing:remplace::option la valeur est comprise dans le champ In field - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig prod::editing:remplace::option respecter la casse Case sensitive - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig prod::editing:remplace::option: remplacer toutes les occurences Replace All - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig prod::editing:remplace::option: rester insensible a la casse Case insensitive - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig prod::editing:replace: chaine a rechercher Find - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig prod::facet:base_label Base - Controller/Prod/QueryController.php + Controller/Prod/QueryController.php prod::facet:collection_label Collection - Controller/Prod/QueryController.php + Controller/Prod/QueryController.php prod::facet:doctype_label Document type - Controller/Prod/QueryController.php + Controller/Prod/QueryController.php prod::recherche: Attention : la liste des bases selectionnees pour la recherche a ete changee. @@ -10794,7 +10818,7 @@ Pushed documents are also available in a received basket within Phraseanet Produ reponses::document sans titre Untitled - classes/record/adapter.php + classes/record/adapter.php report :: aucun resultat trouve @@ -11628,8 +11652,8 @@ Pushed documents are also available in a received basket within Phraseanet Produ reportage Feature - Phrasea/Twig/PhraseanetExtension.php - Phrasea/Twig/PhraseanetExtension.php + Phrasea/Twig/PhraseanetExtension.php + Phrasea/Twig/PhraseanetExtension.php resultat numero %number% @@ -11719,7 +11743,7 @@ Pushed documents are also available in a received basket within Phraseanet Produ setup:: Reinitialisation des droits admins Reset admin rights - web/admin/dashboard.html.twig + web/admin/dashboard.html.twig setup:: administrateurs de l'application @@ -11749,7 +11773,7 @@ Pushed documents are also available in a received basket within Phraseanet Produ setup::Tests d'envois d'emails E-mails send test - web/admin/dashboard.html.twig + web/admin/dashboard.html.twig sport @@ -11969,17 +11993,17 @@ Pushed documents are also available in a received basket within Phraseanet Produ task::subdef:creation des sous definitions Subviews creation - TaskManager/Job/SubdefsJob.php + TaskManager/Job/SubdefsJob.php task::subdef:creation des sous definitions des documents d'origine Subviews creation - TaskManager/Job/SubdefsJob.php + TaskManager/Job/SubdefsJob.php task::writemeta:(re)ecriture des metadatas dans les documents (et subdefs concernees) Rewrite metadatas from documents and subviews. - TaskManager/Job/WriteMetadataJob.php + TaskManager/Job/WriteMetadataJob.php task::writemeta:Compatibilité MWG @@ -11989,7 +12013,7 @@ Pushed documents are also available in a received basket within Phraseanet Produ task::writemeta:ecriture des metadatas Write metadatas - TaskManager/Job/WriteMetadataJob.php + TaskManager/Job/WriteMetadataJob.php task::writemeta:effacer les metadatas non presentes dans la structure diff --git a/resources/locales/messages.fr.xlf b/resources/locales/messages.fr.xlf index ae19da1f6d..bb465953ce 100644 --- a/resources/locales/messages.fr.xlf +++ b/resources/locales/messages.fr.xlf @@ -1,6 +1,6 @@ - +
The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message. @@ -49,12 +49,12 @@ %d collection selected %d collection sélectionnée - Controller/Root/LoginController.php + Controller/Root/LoginController.php %d collections selected %d collections sélectionnées - Controller/Root/LoginController.php + Controller/Root/LoginController.php %d fields have been updated @@ -208,12 +208,12 @@ %s field has been created with success. Le champ %s a été créé avec succès. - Controller/Admin/FieldsController.php + Controller/Admin/FieldsController.php %s field has been deleted with success. Le champ %s a été supprimé avec succès. - Controller/Admin/FieldsController.php + Controller/Admin/FieldsController.php %total% reponses @@ -530,18 +530,18 @@ Account has been unlocked, you can now login. Le compte a été débloqué. Vous pouvez maintenant vous connecter. - Controller/Root/LoginController.php - Controller/Root/LoginController.php + Controller/Root/LoginController.php + Controller/Root/LoginController.php Account has been unlocked, you still have to wait for admin approval. Le compte a été débloqué. Vous devez toutefois attendre l'approbation d'un administrateur. - Controller/Root/LoginController.php + Controller/Root/LoginController.php Account is already unlocked, you can login. Le compte est déjà déverrouillé. Vous pouvez vous connecter. - Controller/Root/LoginController.php + Controller/Root/LoginController.php Account is not found. @@ -625,7 +625,7 @@ Add an admin Ajouter un administrateur Phraseanet - web/admin/dashboard.html.twig + web/admin/dashboard.html.twig Add user @@ -715,7 +715,7 @@ Aide sur les expressions regulieres Aide sur les expressions régulières - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig Ajouter a @@ -919,7 +919,7 @@ An unexpected error occurred during authentication process, please contact an admin Une erreur est survenue lors de l'authentification. Veuillez contacter un Administrateur - Controller/Root/LoginController.php + Controller/Root/LoginController.php An upload on %bridge_adapter% failed, the resaon is : %reason% @@ -1094,7 +1094,7 @@ Aucun statut editable Aucun status à éditer - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig Aucune @@ -1263,8 +1263,8 @@ Bad request format, only JSON is allowed Mauvais format de requête. Seul JSON est autorisé. Controller/Admin/DataboxController.php - Controller/Admin/RootController.php - Controller/Admin/RootController.php + Controller/Admin/RootController.php + Controller/Admin/RootController.php Controller/Root/AccountController.php @@ -1319,6 +1319,11 @@ Le panier a été mis à jour Controller/Prod/BasketController.php + + Basket is not found + Basket is not found + Model/Repositories/BasketRepository.php + Basket updated Paniers mis à jour @@ -1799,7 +1804,7 @@ Continuer ? Continuer ? - module/console/systemUpgrade.php + module/console/systemUpgrade.php Continuer quand meme @@ -2314,7 +2319,7 @@ Do you really want to delete the field %s ? Voulez-vous vraiment supprimer le champ %s ? - Controller/Admin/FieldsController.php + Controller/Admin/FieldsController.php Do you really want to end the activity of this session? @@ -2410,17 +2415,17 @@ ERREUR : La classe de subdef est necessaire et egal a "thumbnail","preview" ou "document" Erreur : Une classe est nécessaire et peut être égale à "Tout le monde","Sous-résolution" ou "Document" - lib/classes/databox.php + lib/classes/databox.php ERREUR : Les name de subdef sont uniques par groupe de subdefs et necessaire L'attribut "name" du noeud "subdef" est obligatoire et unique par groupe de subdefs - lib/classes/databox.php + lib/classes/databox.php ERREUR : TOUTES LES BALISES subdefgroup necessitent un attribut name ERREUR : Toutes les balises "subdefgroup" nécessitent un attribut "name" - lib/classes/databox.php + lib/classes/databox.php Edit @@ -2459,7 +2464,7 @@ Edition impossible Edition impossible - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig Editor @@ -2494,7 +2499,7 @@ Email E-mail - web/admin/dashboard.html.twig + web/admin/dashboard.html.twig admin/publications/fiche.html.twig @@ -2531,7 +2536,7 @@ Email test result : %email_status% Résultat du test d'e-mail : %email_status% - web/admin/dashboard.html.twig + web/admin/dashboard.html.twig Emails @@ -2925,37 +2930,37 @@ Field %name% could not be created, please try again or contact an admin. Le champ %name% ne peut être créé. Essayer de nouveau ou contacter un administrateur. - Controller/Admin/FieldsController.php + Controller/Admin/FieldsController.php Field %name% could not be saved, please try again or contact an admin. Le champ %name% ne peut pas être enregistré. Essayer de nouveau ou contacter un administrateur. - Controller/Admin/FieldsController.php + Controller/Admin/FieldsController.php Field %s contains errors. Le champ %s contient des erreurs. - Controller/Admin/FieldsController.php + Controller/Admin/FieldsController.php Field can not be blank. Le champ ne peut être vide. - Controller/Admin/FieldsController.php + Controller/Admin/FieldsController.php Field name already exists. Le nom de champ existe déjà. - Controller/Admin/FieldsController.php + Controller/Admin/FieldsController.php Field name is not valid. Le nom du champ est incorrect - Controller/Admin/FieldsController.php + Controller/Admin/FieldsController.php Field source is not valid. La source du champ est incorrecte - Controller/Admin/FieldsController.php + Controller/Admin/FieldsController.php File is not present in quarantine anymore, please refresh @@ -2968,7 +2973,7 @@ File is too big : 64k max Le poids du fichier ne peut dépasser 64 Ko - Controller/Admin/RootController.php + Controller/Admin/RootController.php File upload has been cancelled @@ -3175,7 +3180,7 @@ Good Bonne - Controller/Root/LoginController.php + Controller/Root/LoginController.php Google Analytics identifier @@ -3210,7 +3215,7 @@ Great Excellente - Controller/Root/LoginController.php + Controller/Root/LoginController.php Groupement des resultats sur le champ %name% @@ -3451,7 +3456,7 @@ Invalid captcha answer. La réponse au code CAPTCHA est incorrecte. - Controller/Root/LoginController.php + Controller/Root/LoginController.php Invalid file format @@ -3486,7 +3491,7 @@ Invalid link. Lien non valide. - Controller/Root/LoginController.php + Controller/Root/LoginController.php Invalid password provided @@ -3501,8 +3506,8 @@ Invalid unlock link. Lien de déverrouillage non valide. - Controller/Root/LoginController.php - Controller/Root/LoginController.php + Controller/Root/LoginController.php + Controller/Root/LoginController.php Inverser @@ -3747,7 +3752,7 @@ Les status de certains documents ne sont pas accessibles par manque de droits Vous ne disposez pas des droits nécessaires pour accéder aux status de certains documents - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig Les termes apparaissent dans le(s) champs @@ -4001,7 +4006,7 @@ Missing "structure" parameter Le paramètre "structure" est manquant - Controller/Admin/RootController.php + Controller/Admin/RootController.php Missing labels parameter @@ -4022,7 +4027,7 @@ Missing path parameter Paramètre Path (Chemin d'accès) manquant - Controller/Admin/RootController.php + Controller/Admin/RootController.php Missing target collection @@ -4032,7 +4037,7 @@ Missing tests parameter Paramètre de test manquant - Controller/Admin/RootController.php + Controller/Admin/RootController.php Missing view name parameter @@ -4188,7 +4193,7 @@ No collection selected Aucune collection sélectionnée - Controller/Root/LoginController.php + Controller/Root/LoginController.php No document in quarantine @@ -4198,7 +4203,7 @@ No document selected Aucun document sélectionné - prod/actions/delete_records_confirm.html.twig + prod/actions/delete_records_confirm.html.twig No elements to push @@ -4430,6 +4435,11 @@ Seul un enregistrement peut être modifié. actions/Property/index.html.twig + + Open the URL in a new window + Open the URL in a new window + Core/Provider/TwigServiceProvider.php + Or login with Ou se connecter avec @@ -4465,7 +4475,7 @@ Ordinary Normale - Controller/Root/LoginController.php + Controller/Root/LoginController.php Original name @@ -4602,7 +4612,7 @@ Phraseanet guest-access is disabled L'accès invité de Phraseanet est désactivé. - Controller/Root/LoginController.php + Controller/Root/LoginController.php Phraseanet may require many binaries. @@ -4629,7 +4639,7 @@ Please accept the terms of use to register. Veuillez accepter les condtions d'utilisation pour vous inscrire. - Controller/Root/LoginController.php + Controller/Root/LoginController.php Please be sure it is still valid and you can access it @@ -4651,10 +4661,15 @@ Cette demande de validation peut être adressée aux utilisateurs suivants : %recommendation% prod/actions/Push.html.twig + + Please enter the databox name to reset or create + Please enter the databox name to reset or create + Command/Developer/IniReset.php + Please fill the captcha Veuillez remplir le champ CAPTCHA - Controller/Root/LoginController.php + Controller/Root/LoginController.php Please fix the database before starting @@ -4664,7 +4679,7 @@ Please provide a longer value. It should have %s character or more. Veuillez indiquer une valeur plus grande : %s caractères ou plus. - Controller/Root/LoginController.php + Controller/Root/LoginController.php Please provide a name for this selection. @@ -4674,32 +4689,32 @@ Please provide a valid IP address. Veuillez indiquer une adresse IP valide. - Controller/Root/LoginController.php + Controller/Root/LoginController.php Please provide a valid email address. Veuillez indiquer une adresse e-mail valide. - Controller/Root/LoginController.php + Controller/Root/LoginController.php Please provide a value. Veuillez indiquer une valeur. - Controller/Root/LoginController.php + Controller/Root/LoginController.php Please provide the same emails. Veuillez indiquer les mêmes adresses e-mails. - Controller/Root/LoginController.php + Controller/Root/LoginController.php Please provide the same passwords. Veuillez indiquer des mots de passe identiques. - Controller/Root/LoginController.php + Controller/Root/LoginController.php Please select at least %s choice. Sélectionnez au moins %s choix. - Controller/Root/LoginController.php + Controller/Root/LoginController.php Please select at least one valid file @@ -4912,7 +4927,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Quarantine notificaton Notification de la Quarantaine - eventsmanager/notify/uploadquarantine.php + eventsmanager/notify/uploadquarantine.php Quotas @@ -5353,7 +5368,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Reset cache Réinitialiser le cache - web/admin/dashboard.html.twig + web/admin/dashboard.html.twig Reset rights before applying template? @@ -5597,7 +5612,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Select all collections Sélectionner toutes les collections - Controller/Root/LoginController.php + Controller/Root/LoginController.php Select files... @@ -5630,7 +5645,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Send Envoyer Controller/Prod/LanguageController.php - web/admin/dashboard.html.twig + web/admin/dashboard.html.twig web/login/forgot-password.html.twig prod/actions/Push.html.twig prod/orders/order_item.html.twig @@ -5815,7 +5830,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Something wrong happend Un problème est survenu - Controller/Admin/RootController.php + Controller/Admin/RootController.php Something wrong happened, please retry or contact an admin. @@ -5825,7 +5840,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Something wrong happened, please try again or contact an admin. Quelque chose ne fonctionne pas correctement. Veuillez réessayer ou contactez un administrateur. - Controller/Admin/FieldsController.php + Controller/Admin/FieldsController.php Sorry, site is currently undergoing maintenance, come back soon. @@ -5917,12 +5932,12 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Status icon upload failed : can not write on disk L'ajout de l'icône de Status a échoué, impossible d'écrire sur le disque - Controller/Admin/RootController.php + Controller/Admin/RootController.php Status icon upload failed : upload error L'ajout de l'icône de Status a échoué - Controller/Admin/RootController.php + Controller/Admin/RootController.php Statut @@ -6147,7 +6162,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Target Device Dispositif ciblé - classes/databox/subdef.php + classes/databox/subdef.php Task Scheduler @@ -6223,6 +6238,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis The application is going down for maintenance, please logout. L'application va être désactivée pour maintenance, merci de vous déconnecter dès que possible + Controller/Root/SessionController.php Controller/Root/SessionController.php @@ -6248,7 +6264,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis The document %name% has been quarantined Le document %name% a été placé en quarantaine - eventsmanager/notify/uploadquarantine.php + eventsmanager/notify/uploadquarantine.php The file contains the following elements @@ -6621,7 +6637,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Unable to authenticate with %provider_name% Impossible de s'authentifier avec %provider_name% - Controller/Root/LoginController.php + Controller/Root/LoginController.php Unable to connect to MySQL server @@ -6663,7 +6679,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Unable to retrieve provider identity Impossible de récupérer l'identité auprès du fournisseur. - Controller/Root/LoginController.php + Controller/Root/LoginController.php Unable to send the documents @@ -6674,8 +6690,8 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Unable to send your account unlock email. Impossible d'adresser l'e-mail de déverrouillage du compte. - Controller/Root/LoginController.php - Controller/Root/LoginController.php + Controller/Root/LoginController.php + Controller/Root/LoginController.php Unable to share the list with the usr @@ -7136,7 +7152,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Vous etes maintenant deconnecte. A bientot. Vous êtes maintenant déconnecté. A bientôt. - Controller/Root/LoginController.php + Controller/Root/LoginController.php Vous n'avez pas assez de droits sur certains elements selectionnes @@ -7241,7 +7257,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Weak Faible - Controller/Root/LoginController.php + Controller/Root/LoginController.php Webservices connectivity @@ -7432,7 +7448,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis You do not enough rights to update status Vous ne disposez pas des droits suffisants pour changer les Status - Controller/Admin/RootController.php + Controller/Admin/RootController.php You do not have access to this basket @@ -7457,16 +7473,16 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis You do not have rights to remove selected documents Vous n'avez pas les droits pour supprimer les documents sélectionnés - prod/actions/delete_records_confirm.html.twig + prod/actions/delete_records_confirm.html.twig You do not have the permission to move records to %collection% Vous ne disposez pas des autorisations requises pour déplacer les enregistrements vers la collection %collection% Controller/Prod/MoveCollectionController.php - - You have %d days to validate the selection. - Vous disposez de %d jours pour exprimer des avis et commentaires sur les documents séléctionnés. + + You have %quantity% days to validate the selection. + You have %quantity% days to validate the selection. Notification/Mail/MailInfoValidationRequest.php @@ -7479,6 +7495,11 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Trop de fichiers dans la file d'attente prod/upload/upload-flash.html.twig + + You have not access to this basket + You have not access to this basket + Model/Repositories/BasketRepository.php + You have selected %nbReceivedDocuments% records. Vous avez sélectionné %nbReceivedDocuments% enregistrements. @@ -7532,8 +7553,8 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis You tried to register with an unknown provider Vous tentez de vous inscrire auprès d'un fournisseur inconnu. - Controller/Root/LoginController.php - Controller/Root/LoginController.php + Controller/Root/LoginController.php + Controller/Root/LoginController.php You will no longer receive notifications at %old_email% @@ -7578,7 +7599,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Your configuration has been successfuly saved. La configuration a été sauvegardée avec succès. - Controller/Admin/FieldsController.php + Controller/Admin/FieldsController.php Your contact email address has been updated @@ -7598,7 +7619,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Your identity is not recognized. Votre identité n'est pas reconnue. - Controller/Root/LoginController.php + Controller/Root/LoginController.php Your install might need to build some sub-definitions @@ -8160,6 +8181,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis admin::compte-utilisateur email E-mail Controller/Admin/UserController.php + Event/Subscriber/RegistrationSubscriber.php web/account/account.html.twig web/admin/connected-users.html.twig web/admin/editusers.html.twig @@ -8207,6 +8229,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis admin::compte-utilisateur nom Nom Controller/Admin/UserController.php + Event/Subscriber/RegistrationSubscriber.php Core/Provider/RegistrationServiceProvider.php web/account/account.html.twig web/admin/connected-users.html.twig @@ -8239,6 +8262,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis admin::compte-utilisateur prenom Prénom Controller/Admin/UserController.php + Event/Subscriber/RegistrationSubscriber.php Core/Provider/RegistrationServiceProvider.php web/account/account.html.twig web/admin/editusers.html.twig @@ -8425,7 +8449,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le admin::monitor: module admin Admin Controller/Admin/ConnectedUsersController.php - lib/classes/phrasea.php + lib/classes/phrasea.php web/admin/connected-users.html.twig web/common/menubar.html.twig @@ -8433,7 +8457,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le admin::monitor: module client Classic Controller/Admin/ConnectedUsersController.php - lib/classes/phrasea.php + lib/classes/phrasea.php classes/record/preview.php web/admin/connected-users.html.twig @@ -8441,7 +8465,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le admin::monitor: module comparateur Lightbox Controller/Admin/ConnectedUsersController.php - lib/classes/phrasea.php + lib/classes/phrasea.php web/admin/connected-users.html.twig @@ -8453,7 +8477,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le admin::monitor: module production Production Controller/Admin/ConnectedUsersController.php - lib/classes/phrasea.php + lib/classes/phrasea.php classes/record/preview.php web/admin/connected-users.html.twig @@ -8461,7 +8485,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le admin::monitor: module report Report Controller/Admin/ConnectedUsersController.php - lib/classes/phrasea.php + lib/classes/phrasea.php web/admin/connected-users.html.twig web/common/menubar.html.twig @@ -8469,7 +8493,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le admin::monitor: module thesaurus Thesaurus Controller/Admin/ConnectedUsersController.php - lib/classes/phrasea.php + lib/classes/phrasea.php web/admin/connected-users.html.twig web/common/menubar.html.twig @@ -8477,7 +8501,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le admin::monitor: module upload Upload Controller/Admin/ConnectedUsersController.php - lib/classes/phrasea.php + lib/classes/phrasea.php web/common/menubar.html.twig @@ -8487,7 +8511,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le Phrasea/Controller/LightboxController.php Phrasea/Controller/LightboxController.php Phrasea/Controller/LightboxController.php - lib/classes/phrasea.php + lib/classes/phrasea.php web/common/menubar.html.twig @@ -8541,9 +8565,9 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le Inscription automatique sur %application% Notification/Mail/MailInfoSomebodyAutoregistered.php - - admin::register: Nouvelle commande sur %s - Nouvelle commande sur %s + + admin::register: Nouvelle commande sur %application% + admin::register: Nouvelle commande sur %application% Notification/Mail/MailInfoNewOrder.php @@ -8710,7 +8734,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le audio audios - Phrasea/Twig/PhraseanetExtension.php + Phrasea/Twig/PhraseanetExtension.php task-manager/task-editor/subdefs.html.twig @@ -8746,7 +8770,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le be notified when a document is placed in quarantine Recevoir une notification si un document est placé en quarantaine - eventsmanager/notify/uploadquarantine.php + eventsmanager/notify/uploadquarantine.php bijou en or @@ -8767,8 +8791,8 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le boutton::ajouter Ajouter admin/collection/suggested_value.html.twig - prod/actions/edit_default.html.twig - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig boutton::annuler @@ -8789,8 +8813,8 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le Bridge/Flickr/photo_modify.html.twig Bridge/Youtube/video_modify.html.twig Bridge/Youtube/video_modify.html.twig - prod/actions/edit_default.html.twig - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig web/prod/tab_thesaurus.html.twig web/report/all_content.html.twig web/thesaurus/accept.html.twig @@ -8880,8 +8904,8 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le Controller/Prod/LanguageController.php web/common/dialog_export.html.twig web/lightbox/sc_note.html.twig - prod/actions/edit_default.html.twig - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig prod/actions/Push.html.twig web/report/all_content.html.twig web/thesaurus/accept.html.twig @@ -8952,12 +8976,12 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le boutton::reinitialiser Ré-initialiser - web/admin/dashboard.html.twig + web/admin/dashboard.html.twig boutton::remplacer Remplacer - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig boutton::renouveller @@ -9068,7 +9092,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le admin/collection/create.html.twig admin/collection/reorder.html.twig admin/collection/suggested_value.html.twig - web/admin/dashboard.html.twig + web/admin/dashboard.html.twig web/admin/editusers.html.twig admin/publications/fiche.html.twig admin/publications/list.html.twig @@ -9096,8 +9120,8 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le Bridge/Youtube/video_deleteelement.html.twig Bridge/Youtube/video_modify.html.twig Bridge/Youtube/video_moveinto_playlist.html.twig - prod/actions/edit_default.html.twig - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig prod/Baskets/Reorder.html.twig prod/Baskets/Update.html.twig web/prod/index.html.twig @@ -9242,7 +9266,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le collection.label.unknown Collection inconnue - lib/classes/phrasea.php + lib/classes/phrasea.php commande::deadline @@ -9306,7 +9330,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le document documents - Phrasea/Twig/PhraseanetExtension.php + Phrasea/Twig/PhraseanetExtension.php web/admin/subdefs.html.twig web/admin/subdefs.html.twig task-manager/task-editor/subdefs.html.twig @@ -9368,7 +9392,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le edit::preset:: titre Nom du modèle - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig effacer (OK) ou quitter (Annuler) ? @@ -9421,7 +9445,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le export::ftp: reglages manuels Réglages manuels - classes/set/export.php + classes/set/export.php export::mail: contenu du mail @@ -9478,13 +9502,13 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le flash Flash - Phrasea/Twig/PhraseanetExtension.php + Phrasea/Twig/PhraseanetExtension.php task-manager/task-editor/subdefs.html.twig for the following reasons : %reasons% pour la raison suivante : %reasons% - eventsmanager/notify/uploadquarantine.php + eventsmanager/notify/uploadquarantine.php forms::ce champ est requis @@ -9552,7 +9576,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le image images - Phrasea/Twig/PhraseanetExtension.php + Phrasea/Twig/PhraseanetExtension.php task-manager/task-editor/subdefs.html.twig @@ -9642,17 +9666,17 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le login::erreur: Erreur d'authentification Erreur d'authentification Controller/Api/OAuth2Controller.php - Controller/Root/LoginController.php + Controller/Root/LoginController.php login::erreur: No available connection - Please contact sys-admin Connexion impossible, contactez un administrateur système - Controller/Root/LoginController.php + Controller/Root/LoginController.php login::erreur: Vous n'avez pas confirme votre email Accès impossible, vous n'avez pas confirmé votre adresse e-mail. - Controller/Root/LoginController.php + Controller/Root/LoginController.php login::notification: Changements enregistres @@ -9663,13 +9687,13 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le login::notification: Mise a jour du mot de passe avec succes Mise à jour du mot de passe effectuée Controller/Root/AccountController.php - Controller/Root/LoginController.php + Controller/Root/LoginController.php login::notification: demande de confirmation par mail envoyee Demande de confirmation envoyée par e-mail - Controller/Root/LoginController.php - Controller/Root/LoginController.php + Controller/Root/LoginController.php + Controller/Root/LoginController.php login::register: Faire une demande d'acces @@ -9936,7 +9960,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le phraseanet:: Un email vient de vous etre envoye Un e-mail vient de vous être envoyé - Controller/Root/LoginController.php + Controller/Root/LoginController.php phraseanet:: a propos @@ -10022,12 +10046,12 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le phraseanet:: presse-papier Presse-papier - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig phraseanet:: preview Prévisualisation - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig prod/actions/printer_default.html.twig @@ -10051,7 +10075,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le phraseanet:: thesaurus Thésaurus - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig web/prod/tab_headers.html.twig web/thesaurus/index.html.twig web/thesaurus/load-thesaurus.html.twig @@ -10097,7 +10121,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le Chargement Controller/Prod/LanguageController.php admin/collection/suggested_value.html.twig - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig web/thesaurus/thesaurus.html.twig @@ -10387,7 +10411,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le prod::edit: Impossible d'editer simultanement des documents provenant de bases differentes Impossible d'éditer simultanément des documents provenant de bases différentes - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig prod::editing valeurs heterogenes, choisir 'remplacer', 'ajouter' ou 'annuler' @@ -10397,32 +10421,32 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le prod::editing: %not_actionable% documents ne peuvent etre edites car vos droits sont induffisants %not_actionable% document(s) éditables, vous ne disposez pas des autorisations nécessaires - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig prod::editing: 1 document ne peut etre edite car vos droits sont induffisants Vous ne possédez pas les autorisations d'accès requises pour éditer 1 document - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig prod::editing: aucun documents ne peuvent etre edites car vos droits sont induffisants Aucun document ne peut être édité car vous ne disposez pas des autorisations nécessaires - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig prod::editing: modeles de fiches Modèles - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig prod::editing: rechercher-remplacer Rechercher / Remplacer - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig prod::editing: valider ou annuler les modifications Valider ou annuler les modifications - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig prod::editing::annulation: abandonner les modification ? @@ -10437,77 +10461,77 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le prod::editing::replace: remplacer dans le champ Remplacer dans le champ - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig prod::editing::replace: remplacer dans tous les champs Remplacer dans tous les champs - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig prod::editing:indexation en cours Indexation en cours - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig prod::editing:remplace: chaine remplacante Remplacer par - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig prod::editing:remplace: options de remplacement Options - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig prod::editing:remplace::option : utiliser une expression reguliere Expression régulière - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig prod::editing:remplace::option la valeur du cahmp doit etre exacte Champ complet - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig prod::editing:remplace::option la valeur est comprise dans le champ Contenu dans le champ - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig prod::editing:remplace::option respecter la casse Respecter la casse - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig prod::editing:remplace::option: remplacer toutes les occurences Remplacer tout - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig prod::editing:remplace::option: rester insensible a la casse Insensible à la casse - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig prod::editing:replace: chaine a rechercher Rechercher - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig prod::facet:base_label Bases - Controller/Prod/QueryController.php + Controller/Prod/QueryController.php prod::facet:collection_label Collections - Controller/Prod/QueryController.php + Controller/Prod/QueryController.php prod::facet:doctype_label Types de documents - Controller/Prod/QueryController.php + Controller/Prod/QueryController.php prod::recherche: Attention : la liste des bases selectionnees pour la recherche a ete changee. @@ -10793,7 +10817,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le reponses::document sans titre Sans titre - classes/record/adapter.php + classes/record/adapter.php report :: aucun resultat trouve @@ -11627,8 +11651,8 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le reportage Reportage - Phrasea/Twig/PhraseanetExtension.php - Phrasea/Twig/PhraseanetExtension.php + Phrasea/Twig/PhraseanetExtension.php + Phrasea/Twig/PhraseanetExtension.php resultat numero %number% @@ -11718,7 +11742,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le setup:: Reinitialisation des droits admins Réinitialiser les droits des administrateurs - web/admin/dashboard.html.twig + web/admin/dashboard.html.twig setup:: administrateurs de l'application @@ -11748,7 +11772,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le setup::Tests d'envois d'emails Tests d'envois d'e-mails - web/admin/dashboard.html.twig + web/admin/dashboard.html.twig sport @@ -11968,17 +11992,17 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le task::subdef:creation des sous definitions Création des sous-définitions - TaskManager/Job/SubdefsJob.php + TaskManager/Job/SubdefsJob.php task::subdef:creation des sous definitions des documents d'origine Création des sous-définitions des documents - TaskManager/Job/SubdefsJob.php + TaskManager/Job/SubdefsJob.php task::writemeta:(re)ecriture des metadatas dans les documents (et subdefs concernees) Réécriture des métadonnées dans les documents (et subdef) - TaskManager/Job/WriteMetadataJob.php + TaskManager/Job/WriteMetadataJob.php task::writemeta:Compatibilité MWG @@ -11988,7 +12012,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le task::writemeta:ecriture des metadatas Ecriture des métadonnées - TaskManager/Job/WriteMetadataJob.php + TaskManager/Job/WriteMetadataJob.php task::writemeta:effacer les metadatas non presentes dans la structure diff --git a/resources/locales/messages.nl.xlf b/resources/locales/messages.nl.xlf index af54fa8c68..2751c2d3f6 100644 --- a/resources/locales/messages.nl.xlf +++ b/resources/locales/messages.nl.xlf @@ -1,6 +1,6 @@ - +
The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message. @@ -53,12 +53,12 @@ %d collection selected %d collectie geselecteerd - Controller/Root/LoginController.php + Controller/Root/LoginController.php %d collections selected %d collecties geselecteerd - Controller/Root/LoginController.php + Controller/Root/LoginController.php %d fields have been updated @@ -212,12 +212,12 @@ %s field has been created with success. Veld %s is met succes aangemaakt. - Controller/Admin/FieldsController.php + Controller/Admin/FieldsController.php %s field has been deleted with success. Veld %s is met succes verwijderd. - Controller/Admin/FieldsController.php + Controller/Admin/FieldsController.php %total% reponses @@ -534,18 +534,18 @@ Account has been unlocked, you can now login. Gebruiker is ontgrendeld, u kunt zich aanmelden. - Controller/Root/LoginController.php - Controller/Root/LoginController.php + Controller/Root/LoginController.php + Controller/Root/LoginController.php Account has been unlocked, you still have to wait for admin approval. Gebruiker is ontgrendeld, u dient nog te wachten op goedkeuring van een beheerder. - Controller/Root/LoginController.php + Controller/Root/LoginController.php Account is already unlocked, you can login. Deze gebruiker is reeds ontgrendeld, u kunt zich aanmelden. - Controller/Root/LoginController.php + Controller/Root/LoginController.php Account is not found. @@ -629,7 +629,7 @@ Add an admin Voeg een beheerder toe - web/admin/dashboard.html.twig + web/admin/dashboard.html.twig Add user @@ -719,7 +719,7 @@ Aide sur les expressions regulieres Help over reguliere expressies - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig Ajouter a @@ -923,7 +923,7 @@ An unexpected error occurred during authentication process, please contact an admin An unexpected error occurred during authentication process, please contact an admin - Controller/Root/LoginController.php + Controller/Root/LoginController.php An upload on %bridge_adapter% failed, the resaon is : %reason% @@ -1098,7 +1098,7 @@ Aucun statut editable Geen enkele bewerkbare status - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig Aucune @@ -1267,8 +1267,8 @@ Bad request format, only JSON is allowed Slecht verzoek formaat, enkel JSON is toegestaan Controller/Admin/DataboxController.php - Controller/Admin/RootController.php - Controller/Admin/RootController.php + Controller/Admin/RootController.php + Controller/Admin/RootController.php Controller/Root/AccountController.php @@ -1323,6 +1323,11 @@ Mandje werd geüpdate Controller/Prod/BasketController.php + + Basket is not found + Basket is not found + Model/Repositories/BasketRepository.php + Basket updated Mandje geüpdate @@ -1803,7 +1808,7 @@ Continuer ? Doorgaan ? - module/console/systemUpgrade.php + module/console/systemUpgrade.php Continuer quand meme @@ -2318,7 +2323,7 @@ Do you really want to delete the field %s ? Bent u zeker om het veld %s te verwijderen? - Controller/Admin/FieldsController.php + Controller/Admin/FieldsController.php Do you really want to end the activity of this session? @@ -2414,17 +2419,17 @@ ERREUR : La classe de subdef est necessaire et egal a "thumbnail","preview" ou "document" ERREUR : La classe de subdef est necessaire et egal a "thumbnail","preview" ou "document" - lib/classes/databox.php + lib/classes/databox.php ERREUR : Les name de subdef sont uniques par groupe de subdefs et necessaire FOUT : De namen van de thumbnail moeten uniek zijn per group van thumbnails - lib/classes/databox.php + lib/classes/databox.php ERREUR : TOUTES LES BALISES subdefgroup necessitent un attribut name FOUT : ALLE TAGS subdefgroup vereisen een atribuut naam - lib/classes/databox.php + lib/classes/databox.php Edit @@ -2463,7 +2468,7 @@ Edition impossible Kan niet worden bewerkt - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig Editor @@ -2498,7 +2503,7 @@ Email Email - web/admin/dashboard.html.twig + web/admin/dashboard.html.twig admin/publications/fiche.html.twig @@ -2535,7 +2540,7 @@ Email test result : %email_status% Email test resultaat : %email_status% - web/admin/dashboard.html.twig + web/admin/dashboard.html.twig Emails @@ -2929,37 +2934,37 @@ Field %name% could not be created, please try again or contact an admin. Field %name% could not be created, please try again or contact an admin. - Controller/Admin/FieldsController.php + Controller/Admin/FieldsController.php Field %name% could not be saved, please try again or contact an admin. Field %name% could not be saved, please try again or contact an admin. - Controller/Admin/FieldsController.php + Controller/Admin/FieldsController.php Field %s contains errors. Veld %s bevat fouten. - Controller/Admin/FieldsController.php + Controller/Admin/FieldsController.php Field can not be blank. Veld mag niet leeg zijn - Controller/Admin/FieldsController.php + Controller/Admin/FieldsController.php Field name already exists. Veldnaam bestaat reeds - Controller/Admin/FieldsController.php + Controller/Admin/FieldsController.php Field name is not valid. Veldnaam is niet geldig - Controller/Admin/FieldsController.php + Controller/Admin/FieldsController.php Field source is not valid. Veldbron is niet geldig - Controller/Admin/FieldsController.php + Controller/Admin/FieldsController.php File is not present in quarantine anymore, please refresh @@ -2972,7 +2977,7 @@ File is too big : 64k max File is te groot : 64k max - Controller/Admin/RootController.php + Controller/Admin/RootController.php File upload has been cancelled @@ -3179,7 +3184,7 @@ Good Goed - Controller/Root/LoginController.php + Controller/Root/LoginController.php Google Analytics identifier @@ -3214,7 +3219,7 @@ Great Uitstekend - Controller/Root/LoginController.php + Controller/Root/LoginController.php Groupement des resultats sur le champ %name% @@ -3455,7 +3460,7 @@ Invalid captcha answer. Ongeldig captcha antwoord - Controller/Root/LoginController.php + Controller/Root/LoginController.php Invalid file format @@ -3490,7 +3495,7 @@ Invalid link. Ongeldige link - Controller/Root/LoginController.php + Controller/Root/LoginController.php Invalid password provided @@ -3505,8 +3510,8 @@ Invalid unlock link. Ongeldige ontgrendelings-link - Controller/Root/LoginController.php - Controller/Root/LoginController.php + Controller/Root/LoginController.php + Controller/Root/LoginController.php Inverser @@ -3751,7 +3756,7 @@ Les status de certains documents ne sont pas accessibles par manque de droits De status van bepaalde documenten is niet toegestaan omwille van gebrek aan rechten. - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig Les termes apparaissent dans le(s) champs @@ -4005,7 +4010,7 @@ Missing "structure" parameter Missing "structure" parameter - Controller/Admin/RootController.php + Controller/Admin/RootController.php Missing labels parameter @@ -4026,7 +4031,7 @@ Missing path parameter Pad parameter ontbreekt - Controller/Admin/RootController.php + Controller/Admin/RootController.php Missing target collection @@ -4036,7 +4041,7 @@ Missing tests parameter Test parameter ontbreekt - Controller/Admin/RootController.php + Controller/Admin/RootController.php Missing view name parameter @@ -4192,7 +4197,7 @@ No collection selected Geen collectie geselecteerd - Controller/Root/LoginController.php + Controller/Root/LoginController.php No document in quarantine @@ -4202,7 +4207,7 @@ No document selected Geen document geselecteerd - prod/actions/delete_records_confirm.html.twig + prod/actions/delete_records_confirm.html.twig No elements to push @@ -4434,6 +4439,11 @@ Enkel één record kan worden aangepast. actions/Property/index.html.twig + + Open the URL in a new window + Open the URL in a new window + Core/Provider/TwigServiceProvider.php + Or login with Of meld aan met @@ -4469,7 +4479,7 @@ Ordinary Gewoon - Controller/Root/LoginController.php + Controller/Root/LoginController.php Original name @@ -4606,7 +4616,7 @@ Phraseanet guest-access is disabled Gast toegang voor Phraseanet is niet actief - Controller/Root/LoginController.php + Controller/Root/LoginController.php Phraseanet may require many binaries. @@ -4633,7 +4643,7 @@ Please accept the terms of use to register. Gelieve de gebruiksvoorwaarden te aanvaarden alvorens te registreren. - Controller/Root/LoginController.php + Controller/Root/LoginController.php Please be sure it is still valid and you can access it @@ -4655,10 +4665,15 @@ Overweeg om deze goedkeuring naar de volgende gebruikers te sturen : %recommendation% prod/actions/Push.html.twig + + Please enter the databox name to reset or create + Please enter the databox name to reset or create + Command/Developer/IniReset.php + Please fill the captcha Gelieve de captcha in te vullen - Controller/Root/LoginController.php + Controller/Root/LoginController.php Please fix the database before starting @@ -4668,7 +4683,7 @@ Please provide a longer value. It should have %s character or more. Gelieve een langere waarde op te geven. Tenminste %s of meer tekens. - Controller/Root/LoginController.php + Controller/Root/LoginController.php Please provide a name for this selection. @@ -4678,32 +4693,32 @@ Please provide a valid IP address. Gelieve een geldig IP adres op te geven - Controller/Root/LoginController.php + Controller/Root/LoginController.php Please provide a valid email address. Gelieve een geldig email adres op te geven - Controller/Root/LoginController.php + Controller/Root/LoginController.php Please provide a value. Geef een waarde - Controller/Root/LoginController.php + Controller/Root/LoginController.php Please provide the same emails. Gelieve dezelfde emails op te geven. - Controller/Root/LoginController.php + Controller/Root/LoginController.php Please provide the same passwords. Gelieve dezelfde wachtwoorden op te geven - Controller/Root/LoginController.php + Controller/Root/LoginController.php Please select at least %s choice. Gelieve tenminste één %s keuze. - Controller/Root/LoginController.php + Controller/Root/LoginController.php Please select at least one valid file @@ -4914,7 +4929,7 @@ Quarantine notificaton Quarantaine melding - eventsmanager/notify/uploadquarantine.php + eventsmanager/notify/uploadquarantine.php Quotas @@ -5355,7 +5370,7 @@ Reset cache Reset cache - web/admin/dashboard.html.twig + web/admin/dashboard.html.twig Reset rights before applying template? @@ -5599,7 +5614,7 @@ Select all collections Alle collecties selecteren - Controller/Root/LoginController.php + Controller/Root/LoginController.php Select files... @@ -5632,7 +5647,7 @@ Send Versturen Controller/Prod/LanguageController.php - web/admin/dashboard.html.twig + web/admin/dashboard.html.twig web/login/forgot-password.html.twig prod/actions/Push.html.twig prod/orders/order_item.html.twig @@ -5817,7 +5832,7 @@ Something wrong happend Er is iets verkeerd gelopen - Controller/Admin/RootController.php + Controller/Admin/RootController.php Something wrong happened, please retry or contact an admin. @@ -5827,7 +5842,7 @@ Something wrong happened, please try again or contact an admin. Er heeft zich een fout voorgedaan, gelieve opnieuw te proberen of contact op te nemen met een beheerder. - Controller/Admin/FieldsController.php + Controller/Admin/FieldsController.php Sorry, site is currently undergoing maintenance, come back soon. @@ -5919,12 +5934,12 @@ Status icon upload failed : can not write on disk Status icon upload niet gelukt : kan niet naar de schijf schrijven - Controller/Admin/RootController.php + Controller/Admin/RootController.php Status icon upload failed : upload error Status icon upload niet gelukt : upload fout - Controller/Admin/RootController.php + Controller/Admin/RootController.php Statut @@ -6149,7 +6164,7 @@ Target Device Doelapparaat - classes/databox/subdef.php + classes/databox/subdef.php Task Scheduler @@ -6225,6 +6240,7 @@ The application is going down for maintenance, please logout. Het programma sluit af voor onderhoud, gelieve uit te loggen. + Controller/Root/SessionController.php Controller/Root/SessionController.php @@ -6250,7 +6266,7 @@ The document %name% has been quarantined The document %name% has been quarantined - eventsmanager/notify/uploadquarantine.php + eventsmanager/notify/uploadquarantine.php The file contains the following elements @@ -6623,7 +6639,7 @@ Unable to authenticate with %provider_name% Unable to authenticate with %provider_name% - Controller/Root/LoginController.php + Controller/Root/LoginController.php Unable to connect to MySQL server @@ -6665,7 +6681,7 @@ Unable to retrieve provider identity Het is niet mogelijk om de identiteit van de provider te ontvangen - Controller/Root/LoginController.php + Controller/Root/LoginController.php Unable to send the documents @@ -6676,8 +6692,8 @@ Unable to send your account unlock email. Het was niet mogelijk om uw ontgrendelings-email te versturen - Controller/Root/LoginController.php - Controller/Root/LoginController.php + Controller/Root/LoginController.php + Controller/Root/LoginController.php Unable to share the list with the usr @@ -7138,7 +7154,7 @@ Vous etes maintenant deconnecte. A bientot. U bent nu uitgelogd. Tot later. - Controller/Root/LoginController.php + Controller/Root/LoginController.php Vous n'avez pas assez de droits sur certains elements selectionnes @@ -7243,7 +7259,7 @@ Weak Matig - Controller/Root/LoginController.php + Controller/Root/LoginController.php Webservices connectivity @@ -7434,7 +7450,7 @@ You do not enough rights to update status U hebt niet voldoende rechten om de status up te date - Controller/Admin/RootController.php + Controller/Admin/RootController.php You do not have access to this basket @@ -7459,16 +7475,16 @@ You do not have rights to remove selected documents U hebt geen rechten om de geselecteerde documenten te verwijderen - prod/actions/delete_records_confirm.html.twig + prod/actions/delete_records_confirm.html.twig You do not have the permission to move records to %collection% You do not have the permission to move records to %collection% Controller/Prod/MoveCollectionController.php - - You have %d days to validate the selection. - U hebt %d dagen om de selectie te valideren. + + You have %quantity% days to validate the selection. + You have %quantity% days to validate the selection. Notification/Mail/MailInfoValidationRequest.php @@ -7481,6 +7497,11 @@ U hebt geprobeerd om te veel bestanden in de wachtrij te plaatsen prod/upload/upload-flash.html.twig + + You have not access to this basket + You have not access to this basket + Model/Repositories/BasketRepository.php + You have selected %nbReceivedDocuments% records. U hebt %nbReceivedDocuments% records geselecteerd. @@ -7534,8 +7555,8 @@ You tried to register with an unknown provider U probeerde met een ongekende provider te registreren - Controller/Root/LoginController.php - Controller/Root/LoginController.php + Controller/Root/LoginController.php + Controller/Root/LoginController.php You will no longer receive notifications at %old_email% @@ -7580,7 +7601,7 @@ Your configuration has been successfuly saved. Uw configuratie werd met succes bewaard. - Controller/Admin/FieldsController.php + Controller/Admin/FieldsController.php Your contact email address has been updated @@ -7600,7 +7621,7 @@ Your identity is not recognized. Uw identiteit werd niet herkend - Controller/Root/LoginController.php + Controller/Root/LoginController.php Your install might need to build some sub-definitions @@ -8162,6 +8183,7 @@ admin::compte-utilisateur email Email Controller/Admin/UserController.php + Event/Subscriber/RegistrationSubscriber.php web/account/account.html.twig web/admin/connected-users.html.twig web/admin/editusers.html.twig @@ -8209,6 +8231,7 @@ admin::compte-utilisateur nom Naam Controller/Admin/UserController.php + Event/Subscriber/RegistrationSubscriber.php Core/Provider/RegistrationServiceProvider.php web/account/account.html.twig web/admin/connected-users.html.twig @@ -8241,6 +8264,7 @@ admin::compte-utilisateur prenom Voornaam Controller/Admin/UserController.php + Event/Subscriber/RegistrationSubscriber.php Core/Provider/RegistrationServiceProvider.php web/account/account.html.twig web/admin/editusers.html.twig @@ -8426,7 +8450,7 @@ admin::monitor: module admin Beheerder Controller/Admin/ConnectedUsersController.php - lib/classes/phrasea.php + lib/classes/phrasea.php web/admin/connected-users.html.twig web/common/menubar.html.twig @@ -8434,7 +8458,7 @@ admin::monitor: module client Klant module Controller/Admin/ConnectedUsersController.php - lib/classes/phrasea.php + lib/classes/phrasea.php classes/record/preview.php web/admin/connected-users.html.twig @@ -8442,7 +8466,7 @@ admin::monitor: module comparateur Vergelijkings module Controller/Admin/ConnectedUsersController.php - lib/classes/phrasea.php + lib/classes/phrasea.php web/admin/connected-users.html.twig @@ -8454,7 +8478,7 @@ admin::monitor: module production Productie Controller/Admin/ConnectedUsersController.php - lib/classes/phrasea.php + lib/classes/phrasea.php classes/record/preview.php web/admin/connected-users.html.twig @@ -8462,7 +8486,7 @@ admin::monitor: module report Rapport Controller/Admin/ConnectedUsersController.php - lib/classes/phrasea.php + lib/classes/phrasea.php web/admin/connected-users.html.twig web/common/menubar.html.twig @@ -8470,7 +8494,7 @@ admin::monitor: module thesaurus Thesaurus Controller/Admin/ConnectedUsersController.php - lib/classes/phrasea.php + lib/classes/phrasea.php web/admin/connected-users.html.twig web/common/menubar.html.twig @@ -8478,7 +8502,7 @@ admin::monitor: module upload Upload Controller/Admin/ConnectedUsersController.php - lib/classes/phrasea.php + lib/classes/phrasea.php web/common/menubar.html.twig @@ -8488,7 +8512,7 @@ Phrasea/Controller/LightboxController.php Phrasea/Controller/LightboxController.php Phrasea/Controller/LightboxController.php - lib/classes/phrasea.php + lib/classes/phrasea.php web/common/menubar.html.twig @@ -8542,9 +8566,9 @@ admin::register: Inscription automatique sur %application% Notification/Mail/MailInfoSomebodyAutoregistered.php - - admin::register: Nouvelle commande sur %s - Nieuwe bestelling op %s + + admin::register: Nouvelle commande sur %application% + admin::register: Nouvelle commande sur %application% Notification/Mail/MailInfoNewOrder.php @@ -8711,7 +8735,7 @@ audio Audio - Phrasea/Twig/PhraseanetExtension.php + Phrasea/Twig/PhraseanetExtension.php task-manager/task-editor/subdefs.html.twig @@ -8747,7 +8771,7 @@ be notified when a document is placed in quarantine wordt gemeld wanneer een document in quarantaine wordt geplaatst - eventsmanager/notify/uploadquarantine.php + eventsmanager/notify/uploadquarantine.php bijou en or @@ -8768,8 +8792,8 @@ boutton::ajouter Toevoegen admin/collection/suggested_value.html.twig - prod/actions/edit_default.html.twig - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig boutton::annuler @@ -8790,8 +8814,8 @@ Bridge/Flickr/photo_modify.html.twig Bridge/Youtube/video_modify.html.twig Bridge/Youtube/video_modify.html.twig - prod/actions/edit_default.html.twig - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig web/prod/tab_thesaurus.html.twig web/report/all_content.html.twig web/thesaurus/accept.html.twig @@ -8881,8 +8905,8 @@ Controller/Prod/LanguageController.php web/common/dialog_export.html.twig web/lightbox/sc_note.html.twig - prod/actions/edit_default.html.twig - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig prod/actions/Push.html.twig web/report/all_content.html.twig web/thesaurus/accept.html.twig @@ -8953,12 +8977,12 @@ boutton::reinitialiser Herinitialiseren - web/admin/dashboard.html.twig + web/admin/dashboard.html.twig boutton::remplacer Vervangen - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig boutton::renouveller @@ -9069,7 +9093,7 @@ admin/collection/create.html.twig admin/collection/reorder.html.twig admin/collection/suggested_value.html.twig - web/admin/dashboard.html.twig + web/admin/dashboard.html.twig web/admin/editusers.html.twig admin/publications/fiche.html.twig admin/publications/list.html.twig @@ -9097,8 +9121,8 @@ Bridge/Youtube/video_deleteelement.html.twig Bridge/Youtube/video_modify.html.twig Bridge/Youtube/video_moveinto_playlist.html.twig - prod/actions/edit_default.html.twig - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig prod/Baskets/Reorder.html.twig prod/Baskets/Update.html.twig web/prod/index.html.twig @@ -9243,7 +9267,7 @@ collection.label.unknown collection.label.unknown - lib/classes/phrasea.php + lib/classes/phrasea.php commande::deadline @@ -9307,7 +9331,7 @@ document document - Phrasea/Twig/PhraseanetExtension.php + Phrasea/Twig/PhraseanetExtension.php web/admin/subdefs.html.twig web/admin/subdefs.html.twig task-manager/task-editor/subdefs.html.twig @@ -9369,7 +9393,7 @@ edit::preset:: titre Titel - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig effacer (OK) ou quitter (Annuler) ? @@ -9422,7 +9446,7 @@ export::ftp: reglages manuels Manuele instellingen - classes/set/export.php + classes/set/export.php export::mail: contenu du mail @@ -9479,13 +9503,13 @@ flash flash - Phrasea/Twig/PhraseanetExtension.php + Phrasea/Twig/PhraseanetExtension.php task-manager/task-editor/subdefs.html.twig for the following reasons : %reasons% for the following reasons : %reasons% - eventsmanager/notify/uploadquarantine.php + eventsmanager/notify/uploadquarantine.php forms::ce champ est requis @@ -9553,7 +9577,7 @@ image Beeld - Phrasea/Twig/PhraseanetExtension.php + Phrasea/Twig/PhraseanetExtension.php task-manager/task-editor/subdefs.html.twig @@ -9643,17 +9667,17 @@ login::erreur: Erreur d'authentification Verificatiefout Controller/Api/OAuth2Controller.php - Controller/Root/LoginController.php + Controller/Root/LoginController.php login::erreur: No available connection - Please contact sys-admin Geen beschikbare verbinding - Neem contact op met sys-admin - Controller/Root/LoginController.php + Controller/Root/LoginController.php login::erreur: Vous n'avez pas confirme votre email U hebt uw email adres niet bevestigd - Controller/Root/LoginController.php + Controller/Root/LoginController.php login::notification: Changements enregistres @@ -9664,13 +9688,13 @@ login::notification: Mise a jour du mot de passe avec succes Update van het paswoord met succes uitgevoerd Controller/Root/AccountController.php - Controller/Root/LoginController.php + Controller/Root/LoginController.php login::notification: demande de confirmation par mail envoyee Aanvraag tot goedkeuring per mail verstuurd - Controller/Root/LoginController.php - Controller/Root/LoginController.php + Controller/Root/LoginController.php + Controller/Root/LoginController.php login::register: Faire une demande d'acces @@ -9937,7 +9961,7 @@ phraseanet:: Un email vient de vous etre envoye Een email werd u toegestuurd - Controller/Root/LoginController.php + Controller/Root/LoginController.php phraseanet:: a propos @@ -10023,12 +10047,12 @@ phraseanet:: presse-papier Klembord - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig phraseanet:: preview Voorvertoning - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig prod/actions/printer_default.html.twig @@ -10052,7 +10076,7 @@ phraseanet:: thesaurus Thesaurus - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig web/prod/tab_headers.html.twig web/thesaurus/index.html.twig web/thesaurus/load-thesaurus.html.twig @@ -10098,7 +10122,7 @@ Laden Controller/Prod/LanguageController.php admin/collection/suggested_value.html.twig - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig web/thesaurus/thesaurus.html.twig @@ -10388,7 +10412,7 @@ prod::edit: Impossible d'editer simultanement des documents provenant de bases differentes Onmogelijk om documenten afkomstig van verschillende databases samen te bewerken - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig prod::editing valeurs heterogenes, choisir 'remplacer', 'ajouter' ou 'annuler' @@ -10398,32 +10422,32 @@ prod::editing: %not_actionable% documents ne peuvent etre edites car vos droits sont induffisants %not_actionable% documenten kunnen niet bewerkt worden omdat u niet voldoende rechten heeft - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig prod::editing: 1 document ne peut etre edite car vos droits sont induffisants 1 document kan niet worden bewerkt omdat u niet voldoende rechten heeft - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig prod::editing: aucun documents ne peuvent etre edites car vos droits sont induffisants Geen enkel document kan worden bewerkt omdat u niet voldoende rechten heeft - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig prod::editing: modeles de fiches Bestandsmodellen - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig prod::editing: rechercher-remplacer Zoeken-vervangen - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig prod::editing: valider ou annuler les modifications Bewaar of annuleer de aanpassingen - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig prod::editing::annulation: abandonner les modification ? @@ -10438,77 +10462,77 @@ prod::editing::replace: remplacer dans le champ Vervangen in het veld - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig prod::editing::replace: remplacer dans tous les champs Vervangen in alle velden - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig prod::editing:indexation en cours Indexatie is bezig - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig prod::editing:remplace: chaine remplacante Vervangende string - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig prod::editing:remplace: options de remplacement Vervanging opties - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig prod::editing:remplace::option : utiliser une expression reguliere Een reguliere expressie gebruiken - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig prod::editing:remplace::option la valeur du cahmp doit etre exacte De waarde van het veld moet exact zijn - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig prod::editing:remplace::option la valeur est comprise dans le champ De waarde is in het veld opgenomen - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig prod::editing:remplace::option respecter la casse Respecteer de hoofdlettergevoeligheid - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig prod::editing:remplace::option: remplacer toutes les occurences Alle zoektekst vervangen - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig prod::editing:remplace::option: rester insensible a la casse Hoofdletterongevoelig blijven - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig prod::editing:replace: chaine a rechercher String zoeken - prod/actions/edit_default.html.twig + prod/actions/edit_default.html.twig prod::facet:base_label prod::facet:base_label - Controller/Prod/QueryController.php + Controller/Prod/QueryController.php prod::facet:collection_label prod::facet:collection_label - Controller/Prod/QueryController.php + Controller/Prod/QueryController.php prod::facet:doctype_label prod::facet:doctype_label - Controller/Prod/QueryController.php + Controller/Prod/QueryController.php prod::recherche: Attention : la liste des bases selectionnees pour la recherche a ete changee. @@ -10794,7 +10818,7 @@ reponses::document sans titre Documenten zonder titel - classes/record/adapter.php + classes/record/adapter.php report :: aucun resultat trouve @@ -11628,8 +11652,8 @@ reportage Reportage - Phrasea/Twig/PhraseanetExtension.php - Phrasea/Twig/PhraseanetExtension.php + Phrasea/Twig/PhraseanetExtension.php + Phrasea/Twig/PhraseanetExtension.php resultat numero %number% @@ -11719,7 +11743,7 @@ setup:: Reinitialisation des droits admins Herinitialisatie van de admin rechten - web/admin/dashboard.html.twig + web/admin/dashboard.html.twig setup:: administrateurs de l'application @@ -11749,7 +11773,7 @@ setup::Tests d'envois d'emails Testen voor het versturen van mail - web/admin/dashboard.html.twig + web/admin/dashboard.html.twig sport @@ -11969,17 +11993,17 @@ task::subdef:creation des sous definitions aanmaak van de thumbnails - TaskManager/Job/SubdefsJob.php + TaskManager/Job/SubdefsJob.php task::subdef:creation des sous definitions des documents d'origine aanmaak van thumbnails bij orginele documenten - TaskManager/Job/SubdefsJob.php + TaskManager/Job/SubdefsJob.php task::writemeta:(re)ecriture des metadatas dans les documents (et subdefs concernees) (her)schrijven van de metadatas in de documenten (en betreffende thumbnails) - TaskManager/Job/WriteMetadataJob.php + TaskManager/Job/WriteMetadataJob.php task::writemeta:Compatibilité MWG @@ -11989,7 +12013,7 @@ task::writemeta:ecriture des metadatas wegschrijven van de metadatas - TaskManager/Job/WriteMetadataJob.php + TaskManager/Job/WriteMetadataJob.php task::writemeta:effacer les metadatas non presentes dans la structure diff --git a/resources/locales/validators.de.xlf b/resources/locales/validators.de.xlf index c8d622b6ee..47daba3f40 100644 --- a/resources/locales/validators.de.xlf +++ b/resources/locales/validators.de.xlf @@ -1,6 +1,6 @@ - +
The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message. diff --git a/resources/locales/validators.en.xlf b/resources/locales/validators.en.xlf index c561b445ec..cff3fa9d81 100644 --- a/resources/locales/validators.en.xlf +++ b/resources/locales/validators.en.xlf @@ -1,6 +1,6 @@ - +
The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message. diff --git a/resources/locales/validators.fr.xlf b/resources/locales/validators.fr.xlf index 1322397415..633a7ea29c 100644 --- a/resources/locales/validators.fr.xlf +++ b/resources/locales/validators.fr.xlf @@ -1,6 +1,6 @@ - +
The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message. diff --git a/resources/locales/validators.nl.xlf b/resources/locales/validators.nl.xlf index 048119eede..a87a361b07 100644 --- a/resources/locales/validators.nl.xlf +++ b/resources/locales/validators.nl.xlf @@ -1,6 +1,6 @@ - +
The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message. From a95797efbf6cf0d3b59e4505b89e69e5d125745f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Burnichon?= Date: Tue, 16 Feb 2016 19:09:59 +0100 Subject: [PATCH 8/8] Change UserSetting value to bigger non-nullable field --- lib/Alchemy/Phrasea/Core/Version.php | 2 +- lib/Alchemy/Phrasea/Model/Entities/UserSetting.php | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/lib/Alchemy/Phrasea/Core/Version.php b/lib/Alchemy/Phrasea/Core/Version.php index a645881dce..a5b1f63e60 100644 --- a/lib/Alchemy/Phrasea/Core/Version.php +++ b/lib/Alchemy/Phrasea/Core/Version.php @@ -16,7 +16,7 @@ class Version /** * @var string */ - private $number = '4.0.0-alpha.5'; + private $number = '4.0.0-alpha.6'; /** * @var string diff --git a/lib/Alchemy/Phrasea/Model/Entities/UserSetting.php b/lib/Alchemy/Phrasea/Model/Entities/UserSetting.php index 5d1a9d2534..6d8ce56ff8 100644 --- a/lib/Alchemy/Phrasea/Model/Entities/UserSetting.php +++ b/lib/Alchemy/Phrasea/Model/Entities/UserSetting.php @@ -1,9 +1,8 @@