diff options
Diffstat (limited to 'core')
39 files changed, 151 insertions, 44 deletions
diff --git a/core/Command/Encryption/DecryptAll.php b/core/Command/Encryption/DecryptAll.php index 7d77cc62e67..e02d7be5bb6 100644 --- a/core/Command/Encryption/DecryptAll.php +++ b/core/Command/Encryption/DecryptAll.php @@ -134,7 +134,7 @@ class DecryptAll extends Command { $uid = $input->getArgument('user'); if ($uid === '') { - $message = 'your ownCloud'; + $message = 'your Nextcloud'; } else { $message = "$uid's account"; } diff --git a/core/Controller/OCSController.php b/core/Controller/OCSController.php index 13cc4d8ce2c..27ab9deb08a 100644 --- a/core/Controller/OCSController.php +++ b/core/Controller/OCSController.php @@ -22,8 +22,10 @@ namespace OC\Core\Controller; use OC\CapabilitiesManager; +use OC\Security\Bruteforce\Throttler; use OCP\AppFramework\Http\DataResponse; use OCP\IRequest; +use OCP\IUserManager; use OCP\IUserSession; class OCSController extends \OCP\AppFramework\OCSController { @@ -34,6 +36,12 @@ class OCSController extends \OCP\AppFramework\OCSController { /** @var IUserSession */ private $userSession; + /** @var IUserManager */ + private $userManager; + + /** @var Throttler */ + private $throttler; + /** * OCSController constructor. * @@ -41,15 +49,21 @@ class OCSController extends \OCP\AppFramework\OCSController { * @param IRequest $request * @param CapabilitiesManager $capabilitiesManager * @param IUserSession $userSession + * @param IUserManager $userManager + * @param Throttler $throttler */ public function __construct($appName, IRequest $request, CapabilitiesManager $capabilitiesManager, - IUserSession $userSession) { + IUserSession $userSession, + IUserManager $userManager, + Throttler $throttler) { parent::__construct($appName, $request); $this->capabilitiesManager = $capabilitiesManager; $this->userSession = $userSession; + $this->userManager = $userManager; + $this->throttler = $throttler; } /** @@ -102,4 +116,27 @@ class OCSController extends \OCP\AppFramework\OCSController { ]; return new DataResponse($data); } + + /** + * @PublicPage + * + * @param string $login + * @param string $password + * @return DataResponse + */ + public function personCheck($login = '', $password = '') { + if ($login !== '' && $password !== '') { + $this->throttler->sleepDelay($this->request->getRemoteAddress()); + if ($this->userManager->checkPassword($login, $password)) { + return new DataResponse([ + 'person' => [ + 'personid' => $login + ] + ]); + } + $this->throttler->registerAttempt('login', $this->request->getRemoteAddress()); + return new DataResponse(null, 102); + } + return new DataResponse(null, 101); + } } diff --git a/core/css/icons.css b/core/css/icons.css index d62ab1504db..5e5f968a5bb 100644 --- a/core/css/icons.css +++ b/core/css/icons.css @@ -118,7 +118,13 @@ img.icon-loading-small-dark, object.icon-loading-small-dark, video.icon-loading- background-image: url('../img/actions/audio.svg?v=1'); } .icon-audio-white { - background-image: url('../img/actions/audio-white.svg?v=1'); + background-image: url('../img/actions/audio-white.svg?v=2'); +} +.icon-audio-off { + background-image: url('../img/actions/audio-off.svg?v=1'); +} +.icon-audio-off-white { + background-image: url('../img/actions/audio-off-white.svg?v=1'); } .icon-caret { @@ -199,7 +205,7 @@ img.icon-loading-small-dark, object.icon-loading-small-dark, video.icon-loading- background-image: url('../img/actions/fullscreen.svg?v=1'); } .icon-fullscreen-white { - background-image: url('../img/actions/fullscreen-white.svg?v=1'); + background-image: url('../img/actions/fullscreen-white.svg?v=2'); } .icon-history { @@ -341,7 +347,13 @@ img.icon-loading-small-dark, object.icon-loading-small-dark, video.icon-loading- background-image: url('../img/actions/video.svg?v=1'); } .icon-video-white { - background-image: url('../img/actions/video-white.svg?v=1'); + background-image: url('../img/actions/video-white.svg?v=2'); +} +.icon-video-off { + background-image: url('../img/actions/video-off.svg?v=1'); +} +.icon-video-off-white { + background-image: url('../img/actions/video-off-white.svg?v=1'); } .icon-view-close { diff --git a/core/css/multiselect.css b/core/css/multiselect.css index cc1d6a3b468..8bcbd0e563d 100644 --- a/core/css/multiselect.css +++ b/core/css/multiselect.css @@ -31,9 +31,6 @@ ul.multiselectoptions.up { ul.multiselectoptions>li { overflow: hidden; white-space: nowrap; -} - -ul.multiselectoptions > li > input[type="checkbox"]+label:before { margin-left: 7px; } ul.multiselectoptions > li input[type='checkbox']+label { @@ -106,6 +103,7 @@ ul.multiselectoptions input.new { ul.multiselectoptions > li.creator { padding: 10px; + margin: 0; font-weight: bold; } ul.multiselectoptions > li.creator > input { diff --git a/core/img/actions/audio-off-white.svg b/core/img/actions/audio-off-white.svg new file mode 100644 index 00000000000..1968e4c7cfc --- /dev/null +++ b/core/img/actions/audio-off-white.svg @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" viewBox="0 0 16 16"> + <defs> + <filter id="a" style="color-interpolation-filters:sRGB" height="1.3148" width="1.4203" y="-.15742" x="-.21014"> + <feGaussianBlur stdDeviation="0.91827834"/> + </filter> + </defs> + <path opacity=".5" d="m8 1c-1.108 0-2 0.892-2 2v4c0 0.0535 0.0115 0.1038 0.0156 0.1562l3.9844-3.9824v-0.1738c0-1.108-0.892-2-2-2zm4.486 1.5137c-0.127 0-0.256 0.0233-0.377 0.0722-0.119 0.0488-0.232 0.1232-0.33 0.2207l-8.486 8.4844c-0.1959 0.196-0.293 0.453-0.293 0.709s0.0971 0.511 0.293 0.707c0.1958 0.196 0.4509 0.293 0.707 0.293s0.5131-0.097 0.709-0.293l8.484-8.4863c0.098-0.0975 0.172-0.2103 0.221-0.3301v-0.0019c0.147-0.361 0.073-0.7883-0.221-1.0821-0.196-0.1958-0.451-0.2929-0.707-0.2929zm-8.486 2.4863c-0.554 0-1 0.446-1 1v1a4.988 4.988 0 0 0 0.6719 2.5l1.5078-1.5078c-0.1093-0.3119-0.1797-0.6421-0.1797-0.9922v-1c0-0.554-0.446-1-1-1zm8.973 0.8594l-2.161 2.1582c-0.301 0.8367-0.9577 1.4934-1.7944 1.7949l-2.0742 2.0745a4.988 4.988 0 0 0 0.0566 0.013v1.1h-1.1699l-0.4141 0.414c-0.125 0.125-0.2683 0.222-0.416 0.307v1.279h6v-2h-2v-1.1c2.287-0.46 4-2.473 4-4.9v-1c0-0.0498-0.02-0.0928-0.027-0.1406z" filter="url(#a)"/> + <path fill="#fff" d="m8 1c-1.108 0-2 0.892-2 2v4c0 0.0535 0.0115 0.1038 0.0156 0.1562l3.9844-3.9824v-0.1738c0-1.108-0.892-2-2-2zm4.486 1.5137c-0.127 0-0.256 0.0233-0.377 0.0722-0.119 0.0488-0.232 0.1232-0.33 0.2207l-8.486 8.4844c-0.1959 0.196-0.293 0.453-0.293 0.709s0.0971 0.511 0.293 0.707c0.1958 0.196 0.4509 0.293 0.707 0.293s0.5131-0.097 0.709-0.293l8.484-8.4863c0.098-0.0975 0.172-0.2103 0.221-0.3301v-0.0019c0.147-0.361 0.073-0.7883-0.221-1.0821-0.196-0.1958-0.451-0.2929-0.707-0.2929zm-8.486 2.4863c-0.554 0-1 0.446-1 1v1a4.988 4.988 0 0 0 0.6719 2.5l1.5078-1.5078c-0.1093-0.3119-0.1797-0.6421-0.1797-0.9922v-1c0-0.554-0.446-1-1-1zm8.973 0.8594l-2.161 2.1582c-0.301 0.8367-0.9577 1.4934-1.7944 1.7949l-2.0742 2.0745a4.988 4.988 0 0 0 0.0566 0.013v1.1h-1.1699l-0.4141 0.414c-0.125 0.125-0.2683 0.222-0.416 0.307v1.279h6v-2h-2v-1.1c2.287-0.46 4-2.473 4-4.9v-1c0-0.0498-0.02-0.0928-0.027-0.1406z"/> +</svg> diff --git a/core/img/actions/audio-off.svg b/core/img/actions/audio-off.svg new file mode 100644 index 00000000000..8cf7fbcb5ca --- /dev/null +++ b/core/img/actions/audio-off.svg @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" viewBox="0 0 16 16"> + <path d="m8 1c-1.108 0-2 0.892-2 2v4c0 0.0535 0.0115 0.1038 0.0156 0.1562l3.9844-3.9824v-0.1738c0-1.108-0.892-2-2-2zm4.486 1.5137c-0.127 0-0.256 0.0233-0.377 0.0722-0.119 0.0488-0.232 0.1232-0.33 0.2207l-8.486 8.4844c-0.1959 0.196-0.293 0.453-0.293 0.709s0.0971 0.511 0.293 0.707c0.1958 0.196 0.4509 0.293 0.707 0.293s0.5131-0.097 0.709-0.293l8.484-8.4863c0.098-0.0975 0.172-0.2103 0.221-0.3301v-0.0019c0.147-0.361 0.073-0.7883-0.221-1.0821-0.196-0.1958-0.451-0.2929-0.707-0.2929zm-8.486 2.4863c-0.554 0-1 0.446-1 1v1a4.988 4.988 0 0 0 0.6719 2.5l1.5078-1.5078c-0.1093-0.3119-0.1797-0.6421-0.1797-0.9922v-1c0-0.554-0.446-1-1-1zm8.973 0.8594l-2.161 2.1582c-0.301 0.8367-0.9577 1.4934-1.7944 1.7949l-2.0742 2.0745a4.988 4.988 0 0 0 0.0566 0.013v1.1h-1.1699l-0.4141 0.414c-0.125 0.125-0.2683 0.222-0.416 0.307v1.279h6v-2h-2v-1.1c2.287-0.46 4-2.473 4-4.9v-1c0-0.0498-0.02-0.0928-0.027-0.1406z"/> +</svg> diff --git a/core/img/actions/audio-white.svg b/core/img/actions/audio-white.svg index 36523ef17d5..ac5d888a51c 100644 --- a/core/img/actions/audio-white.svg +++ b/core/img/actions/audio-white.svg @@ -1 +1,10 @@ -<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"><path d="M8 1c-1.108 0-2 .892-2 2v4c0 1.108.892 2 2 2s2-.892 2-2V3c0-1.108-.892-2-2-2zM4 5c-.554 0-1 .446-1 1v1a4.988 4.988 0 0 0 4 4.9V13H5v2h6v-2H9v-1.1c2.287-.46 4-2.473 4-4.9V6c0-.554-.446-1-1-1s-1 .446-1 1v1c0 1.662-1.338 3-3 3S5 8.662 5 7V6c0-.554-.446-1-1-1z" fill-rule="evenodd" fill="#fff"/></svg>
\ No newline at end of file +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" viewBox="0 0 16 16"> + <defs> + <filter id="a" style="color-interpolation-filters:sRGB" height="1.3086" width="1.432" y="-.15429" x="-0.216"> + <feGaussianBlur stdDeviation="0.90000044"/> + </filter> + </defs> + <path opacity=".5" d="m8 1c-1.108 0-2 0.892-2 2v4c0 1.108 0.892 2 2 2s2-0.892 2-2v-4c0-1.108-0.892-2-2-2zm-4 4c-0.554 0-1 0.446-1 1v1a4.988 4.988 0 0 0 4 4.9v1.1h-2v2h6v-2h-2v-1.1c2.287-0.46 4-2.473 4-4.9v-1c0-0.554-0.446-1-1-1s-1 0.446-1 1v1c0 1.662-1.338 3-3 3s-3-1.338-3-3v-1c0-0.554-0.446-1-1-1z" fill-rule="evenodd" filter="url(#a)"/> + <path fill="#fff" d="m8 1c-1.108 0-2 0.892-2 2v4c0 1.108 0.892 2 2 2s2-0.892 2-2v-4c0-1.108-0.892-2-2-2zm-4 4c-0.554 0-1 0.446-1 1v1a4.988 4.988 0 0 0 4 4.9v1.1h-2v2h6v-2h-2v-1.1c2.287-0.46 4-2.473 4-4.9v-1c0-0.554-0.446-1-1-1s-1 0.446-1 1v1c0 1.662-1.338 3-3 3s-3-1.338-3-3v-1c0-0.554-0.446-1-1-1z" fill-rule="evenodd"/> +</svg> diff --git a/core/img/actions/audio.svg b/core/img/actions/audio.svg index d1719a0b965..fa55c949a9d 100644 --- a/core/img/actions/audio.svg +++ b/core/img/actions/audio.svg @@ -1 +1 @@ -<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"><path d="M8 1c-1.108 0-2 .892-2 2v4c0 1.108.892 2 2 2s2-.892 2-2V3c0-1.108-.892-2-2-2zM4 5c-.554 0-1 .446-1 1v1a4.988 4.988 0 0 0 4 4.9V13H5v2h6v-2H9v-1.1c2.287-.46 4-2.473 4-4.9V6c0-.554-.446-1-1-1s-1 .446-1 1v1c0 1.662-1.338 3-3 3S5 8.662 5 7V6c0-.554-.446-1-1-1z" fill-rule="evenodd"/></svg>
\ No newline at end of file +<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" viewBox="0 0 16 16"><path d="M8 1c-1.108 0-2 .892-2 2v4c0 1.108.892 2 2 2s2-.892 2-2V3c0-1.108-.892-2-2-2zM4 5c-.554 0-1 .446-1 1v1a4.988 4.988 0 0 0 4 4.9V13H5v2h6v-2H9v-1.1c2.287-.46 4-2.473 4-4.9V6c0-.554-.446-1-1-1s-1 .446-1 1v1c0 1.662-1.338 3-3 3S5 8.662 5 7V6c0-.554-.446-1-1-1z" fill-rule="evenodd"/></svg> diff --git a/core/img/actions/confirm.svg b/core/img/actions/confirm.svg index f12084ed40e..fd954cdcb1f 100644 --- a/core/img/actions/confirm.svg +++ b/core/img/actions/confirm.svg @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1"> +<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" viewBox="0 0 16 16"> <path d="m8.6328 0.63477c-0.2556 0-0.5112 0.0971-0.707 0.29296-0.3918 0.39177-0.3918 1.0224 0 1.4141l4.6582 4.6582h-11.584c-0.554 0-1 0.446-1 1s0.446 1 1 1h11.586l-4.6583 4.658c-0.3917 0.392-0.3917 1.023 0 1.414 0.3918 0.392 1.0224 0.392 1.4141 0l6.3632-6.363v-0.002h0.002c0.093-0.093 0.166-0.2041 0.217-0.3281l0.002-0.0019v-0.002c0.02-0.0508 0.019-0.1053 0.031-0.1582 0.016-0.0718 0.043-0.14 0.043-0.2168 0-0.0714-0.027-0.1341-0.041-0.2012-0.012-0.0578-0.012-0.1202-0.033-0.1738v-0.002c-0.001-0.0013-0.002-0.0026-0.002-0.0039-0.051-0.1233-0.124-0.2335-0.217-0.3261-0.001-0.0007-0.001-0.0013-0.002-0.002l-6.3632-6.3633c-0.1959-0.19583-0.4534-0.29293-0.709-0.29293z" fill-rule="evenodd"/> </svg> diff --git a/core/img/actions/fullscreen-white.svg b/core/img/actions/fullscreen-white.svg index 77052945fb2..887cd99ee5f 100644 --- a/core/img/actions/fullscreen-white.svg +++ b/core/img/actions/fullscreen-white.svg @@ -1,4 +1,10 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" viewBox="0 0 16 16"> - <path d="m8 1c-0.554 0-1 0.446-1 1s0.446 1 1 1h5v5c0 0.554 0.446 1 1 1s1-0.446 1-1v-6c0-0.554-0.446-1-1-1h-6zm-6 6c-0.554 0-1 0.446-1 1v6c0 0.554 0.446 1 1 1h6c0.554 0 1-0.446 1-1s-0.446-1-1-1h-5v-5c0-0.554-0.446-1-1-1z" fill-rule="evenodd" fill="#fff"/> + <defs> + <filter id="a" style="color-interpolation-filters:sRGB" height="1.36" width="1.36" y="-.18" x="-.18"> + <feGaussianBlur stdDeviation="1.05"/> + </filter> + </defs> + <path opacity=".5" d="m8 1c-0.554 0-1 0.446-1 1s0.446 1 1 1h5v5c0 0.554 0.446 1 1 1s1-0.446 1-1v-6c0-0.554-0.446-1-1-1h-6zm-6 6c-0.554 0-1 0.446-1 1v6c0 0.554 0.446 1 1 1h6c0.554 0 1-0.446 1-1s-0.446-1-1-1h-5v-5c0-0.554-0.446-1-1-1z" fill-rule="evenodd" filter="url(#a)"/> + <path fill-rule="evenodd" fill="#fff" d="m8 1c-0.554 0-1 0.446-1 1s0.446 1 1 1h5v5c0 0.554 0.446 1 1 1s1-0.446 1-1v-6c0-0.554-0.446-1-1-1h-6zm-6 6c-0.554 0-1 0.446-1 1v6c0 0.554 0.446 1 1 1h6c0.554 0 1-0.446 1-1s-0.446-1-1-1h-5v-5c0-0.554-0.446-1-1-1z"/> </svg> diff --git a/core/img/actions/video-off-white.svg b/core/img/actions/video-off-white.svg new file mode 100644 index 00000000000..dbd3120a33a --- /dev/null +++ b/core/img/actions/video-off-white.svg @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" viewBox="0 0 16 16"> + <defs> + <filter id="a" style="color-interpolation-filters:sRGB" height="1.3818" width="1.3405" y="-.19090" x="-.17027"> + <feGaussianBlur stdDeviation="0.99326857"/> + </filter> + </defs> + <path opacity=".5" d="m13.486 1.5137c-0.255 0-0.511 0.0971-0.707 0.2929l-10.486 10.484c-0.3918 0.392-0.3918 1.024 0 1.416 0.3917 0.392 1.0242 0.392 1.416 0l10.484-10.486c0.392-0.392 0.392-1.0226 0-1.4144-0.196-0.1958-0.451-0.2929-0.707-0.2929zm-10.486 1.4863c-1.108 0-2 0.892-2 2v6c0 0.368 0.1054 0.706 0.2773 1.002 0.0849-0.149 0.1825-0.292 0.3086-0.418l8.3457-8.3457c-0.2792-0.1477-0.5926-0.2383-0.9316-0.2383h-6zm12 0.8066c-0.034 0.0401-0.062 0.0835-0.1 0.1211l-9.0699 9.0723h3.1699c1.108 0 2-0.892 2-2v-1.334l4 3.334v-9.1934z" filter="url(#a)"/> + <path fill="#fff" d="m13.486 1.5137c-0.255 0-0.511 0.0971-0.707 0.2929l-10.486 10.484c-0.3918 0.392-0.3918 1.024 0 1.416 0.3917 0.392 1.0242 0.392 1.416 0l10.484-10.486c0.392-0.392 0.392-1.0226 0-1.4144-0.196-0.1958-0.451-0.2929-0.707-0.2929zm-10.486 1.4863c-1.108 0-2 0.892-2 2v6c0 0.368 0.1054 0.706 0.2773 1.002 0.0849-0.149 0.1825-0.292 0.3086-0.418l8.3457-8.3457c-0.2792-0.1477-0.5926-0.2383-0.9316-0.2383h-6zm12 0.8066c-0.034 0.0401-0.062 0.0835-0.1 0.1211l-9.0699 9.0723h3.1699c1.108 0 2-0.892 2-2v-1.334l4 3.334v-9.1934z"/> +</svg> diff --git a/core/img/actions/video-off.svg b/core/img/actions/video-off.svg new file mode 100644 index 00000000000..cb61fe51986 --- /dev/null +++ b/core/img/actions/video-off.svg @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" viewBox="0 0 16 16"> + <path d="m13.486 1.5137c-0.255 0-0.511 0.0971-0.707 0.2929l-10.486 10.484c-0.3918 0.392-0.3918 1.024 0 1.416 0.3917 0.392 1.0242 0.392 1.416 0l10.484-10.486c0.392-0.392 0.392-1.0226 0-1.4144-0.196-0.1958-0.451-0.2929-0.707-0.2929zm-10.486 1.4863c-1.108 0-2 0.892-2 2v6c0 0.368 0.1054 0.706 0.2773 1.002 0.0849-0.149 0.1825-0.292 0.3086-0.418l8.3457-8.3457c-0.2792-0.1477-0.5926-0.2383-0.9316-0.2383h-6zm12 0.8066c-0.034 0.0401-0.062 0.0835-0.1 0.1211l-9.0699 9.0723h3.1699c1.108 0 2-0.892 2-2v-1.334l4 3.334v-9.1934z"/> +</svg> diff --git a/core/img/actions/video-white.svg b/core/img/actions/video-white.svg index 4499ff8c617..59dc1b25321 100644 --- a/core/img/actions/video-white.svg +++ b/core/img/actions/video-white.svg @@ -1 +1,10 @@ -<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"><path d="M3 3c-1.108 0-2 .892-2 2v6c0 1.108.892 2 2 2h6c1.108 0 2-.892 2-2V9.666L15 13V3l-4 3.334V5c0-1.108-.892-2-2-2z" fill="#fff"/></svg>
\ No newline at end of file +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" viewBox="0 0 16 16"> + <defs> + <filter id="a" style="color-interpolation-filters:sRGB" height="1.432" width="1.3086" y="-.216" x="-.15429"> + <feGaussianBlur stdDeviation="0.9"/> + </filter> + </defs> + <path opacity=".5" d="m3 3c-1.108 0-2 0.892-2 2v6c0 1.108 0.892 2 2 2h6c1.108 0 2-0.892 2-2v-1.334l4 3.334v-10l-4 3.334v-1.334c0-1.108-0.892-2-2-2z" filter="url(#a)"/> + <path d="m3 3c-1.108 0-2 0.892-2 2v6c0 1.108 0.892 2 2 2h6c1.108 0 2-0.892 2-2v-1.334l4 3.334v-10l-4 3.334v-1.334c0-1.108-0.892-2-2-2z" fill="#fff"/> +</svg> diff --git a/core/img/actions/video.svg b/core/img/actions/video.svg index 6c74ec7e1f7..002198dc0ab 100644 --- a/core/img/actions/video.svg +++ b/core/img/actions/video.svg @@ -1 +1 @@ -<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"><path d="M3 3c-1.108 0-2 .892-2 2v6c0 1.108.892 2 2 2h6c1.108 0 2-.892 2-2V9.666L15 13V3l-4 3.334V5c0-1.108-.892-2-2-2z"/></svg>
\ No newline at end of file +<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" viewBox="0 0 16 16"><path d="M3 3c-1.108 0-2 .892-2 2v6c0 1.108.892 2 2 2h6c1.108 0 2-.892 2-2V9.666L15 13V3l-4 3.334V5c0-1.108-.892-2-2-2z"/></svg> diff --git a/core/js/sharedialoglinkshareview.js b/core/js/sharedialoglinkshareview.js index bbc8f1b4547..85a20dce01a 100644 --- a/core/js/sharedialoglinkshareview.js +++ b/core/js/sharedialoglinkshareview.js @@ -134,10 +134,15 @@ var clipboard = new Clipboard('.clipboardButton'); clipboard.on('success', function(e) { var $input = $(e.trigger); - $input.tooltip({placement: 'bottom', trigger: 'manual', title: t('core', 'Copied!')}); - $input.tooltip('show'); + $input.tooltip('hide') + .attr('data-original-title', t('core', 'Copied!')) + .tooltip('fixTitle') + .tooltip({placement: 'bottom', trigger: 'manual'}) + .tooltip('show'); _.delay(function() { - $input.tooltip('hide'); + $input.tooltip('hide') + .attr('data-original-title', t('core', 'Copy')) + .tooltip('fixTitle'); }, 3000); }); clipboard.on('error', function (e) { @@ -151,14 +156,15 @@ actionMsg = t('core', 'Press Ctrl-C to copy.'); } - $input.tooltip({ - placement: 'bottom', - trigger: 'manual', - title: actionMsg - }); - $input.tooltip('show'); + $input.tooltip('hide') + .attr('data-original-title', actionMsg) + .tooltip('fixTitle') + .tooltip({placement: 'bottom', trigger: 'manual'}) + .tooltip('show'); _.delay(function () { - $input.tooltip('hide'); + $input.tooltip('hide') + .attr('data-original-title', t('core', 'Copy')) + .tooltip('fixTitle'); }, 3000); }); @@ -336,6 +342,8 @@ mailButtonText: t('core', 'Send') })); + this.$el.find('.clipboardButton').tooltip({placement: 'bottom', title: t('core', 'Copy'), trigger: 'hover'}); + this.delegateEvents(); return this; diff --git a/core/l10n/cs_CZ.js b/core/l10n/cs_CZ.js index cb198bbff29..c2e7fc09c7e 100644 --- a/core/l10n/cs_CZ.js +++ b/core/l10n/cs_CZ.js @@ -141,7 +141,6 @@ OC.L10N.register( "{sharee} (remote)" : "{sharee} (vzdálený)", "{sharee} (email)" : "{sharee} (email)", "Share" : "Sdílet", - "Share with people on other servers using the syntax username@example.com/nextcloud" : "Ke sdílení s lidmi na jiných serverech použijte syntaxi username@example.com/nextcloud", "Share with users or by mail..." : "Sdílejte s uživateli, nebo emailem...", "Share with users or remote users..." : "Sdílet s uživateli nebo vzdálenými uživateli...", "Share with users, remote users or by mail..." : "Sdílet s uživateli, vzdálenými uživateli, nebo emailem...", diff --git a/core/l10n/cs_CZ.json b/core/l10n/cs_CZ.json index 63770b07a7c..87a53ae5885 100644 --- a/core/l10n/cs_CZ.json +++ b/core/l10n/cs_CZ.json @@ -139,7 +139,6 @@ "{sharee} (remote)" : "{sharee} (vzdálený)", "{sharee} (email)" : "{sharee} (email)", "Share" : "Sdílet", - "Share with people on other servers using the syntax username@example.com/nextcloud" : "Ke sdílení s lidmi na jiných serverech použijte syntaxi username@example.com/nextcloud", "Share with users or by mail..." : "Sdílejte s uživateli, nebo emailem...", "Share with users or remote users..." : "Sdílet s uživateli nebo vzdálenými uživateli...", "Share with users, remote users or by mail..." : "Sdílet s uživateli, vzdálenými uživateli, nebo emailem...", diff --git a/core/l10n/de.js b/core/l10n/de.js index 3e86a36bacb..2430153ab3b 100644 --- a/core/l10n/de.js +++ b/core/l10n/de.js @@ -142,7 +142,6 @@ OC.L10N.register( "{sharee} (remote)" : "{sharee} (remote)", "{sharee} (email)" : "{sharee} (E-Mail)", "Share" : "Teilen", - "Share with people on other servers using the syntax username@example.com/nextcloud" : "Teile es mit Nutzern in anderen Server. Die Syntax hierfür lautet: username@beispiel.de/nextcloud", "Share with users or by mail..." : "Mit Benutzern oder per E-Mail teilen…", "Share with users or remote users..." : "Mit Benutzern oder externen Benutzern teilen…", "Share with users, remote users or by mail..." : "Mit Benutzern, externen Benutzern oder per E-Mail teilen…", @@ -159,6 +158,7 @@ OC.L10N.register( "Delete" : "Löschen", "Rename" : "Umbenennen", "Collaborative tags" : "Zusammenarbeits-Tags", + "No tags found" : "Keine Tags gefunden", "The object type is not specified." : "Der Objekttyp ist nicht angegeben.", "Enter new" : "Neuen eingeben", "Add" : "Hinzufügen", diff --git a/core/l10n/de.json b/core/l10n/de.json index 9ff58e5cf4c..777d3bd413f 100644 --- a/core/l10n/de.json +++ b/core/l10n/de.json @@ -140,7 +140,6 @@ "{sharee} (remote)" : "{sharee} (remote)", "{sharee} (email)" : "{sharee} (E-Mail)", "Share" : "Teilen", - "Share with people on other servers using the syntax username@example.com/nextcloud" : "Teile es mit Nutzern in anderen Server. Die Syntax hierfür lautet: username@beispiel.de/nextcloud", "Share with users or by mail..." : "Mit Benutzern oder per E-Mail teilen…", "Share with users or remote users..." : "Mit Benutzern oder externen Benutzern teilen…", "Share with users, remote users or by mail..." : "Mit Benutzern, externen Benutzern oder per E-Mail teilen…", @@ -157,6 +156,7 @@ "Delete" : "Löschen", "Rename" : "Umbenennen", "Collaborative tags" : "Zusammenarbeits-Tags", + "No tags found" : "Keine Tags gefunden", "The object type is not specified." : "Der Objekttyp ist nicht angegeben.", "Enter new" : "Neuen eingeben", "Add" : "Hinzufügen", diff --git a/core/l10n/de_DE.js b/core/l10n/de_DE.js index 53edf27fb08..bb593055723 100644 --- a/core/l10n/de_DE.js +++ b/core/l10n/de_DE.js @@ -142,7 +142,6 @@ OC.L10N.register( "{sharee} (remote)" : "{sharee} (entfernt)", "{sharee} (email)" : "{sharee} (E-Mail)", "Share" : "Teilen", - "Share with people on other servers using the syntax username@example.com/nextcloud" : "Teilen Sie es mit Nutzern in anderen Server. Die Syntax hierfür lautet: username@beispiel.de/nextcloud", "Share with users or by mail..." : "Mit Benutzern oder per E-Mail teilen…", "Share with users or remote users..." : "Mit Benutzern oder externen Benutzern teilen…", "Share with users, remote users or by mail..." : "Mit Benutzern, externen Benutzern oder per E-Mail teilen…", @@ -159,6 +158,7 @@ OC.L10N.register( "Delete" : "Löschen", "Rename" : "Umbenennen", "Collaborative tags" : "Zusammenarbeits-Tags", + "No tags found" : "Keine Tags gefunden", "The object type is not specified." : "Der Objekttyp ist nicht angegeben.", "Enter new" : "Neuen eingeben", "Add" : "Hinzufügen", diff --git a/core/l10n/de_DE.json b/core/l10n/de_DE.json index 55eda63628a..e1da36047e8 100644 --- a/core/l10n/de_DE.json +++ b/core/l10n/de_DE.json @@ -140,7 +140,6 @@ "{sharee} (remote)" : "{sharee} (entfernt)", "{sharee} (email)" : "{sharee} (E-Mail)", "Share" : "Teilen", - "Share with people on other servers using the syntax username@example.com/nextcloud" : "Teilen Sie es mit Nutzern in anderen Server. Die Syntax hierfür lautet: username@beispiel.de/nextcloud", "Share with users or by mail..." : "Mit Benutzern oder per E-Mail teilen…", "Share with users or remote users..." : "Mit Benutzern oder externen Benutzern teilen…", "Share with users, remote users or by mail..." : "Mit Benutzern, externen Benutzern oder per E-Mail teilen…", @@ -157,6 +156,7 @@ "Delete" : "Löschen", "Rename" : "Umbenennen", "Collaborative tags" : "Zusammenarbeits-Tags", + "No tags found" : "Keine Tags gefunden", "The object type is not specified." : "Der Objekttyp ist nicht angegeben.", "Enter new" : "Neuen eingeben", "Add" : "Hinzufügen", diff --git a/core/l10n/fr.js b/core/l10n/fr.js index b2b89d59afb..a4bb8ae1365 100644 --- a/core/l10n/fr.js +++ b/core/l10n/fr.js @@ -52,6 +52,7 @@ OC.L10N.register( "Saving..." : "Enregistrement…", "Dismiss" : "Ignorer", "seconds ago" : "à l'instant", + "Logging in …" : "Connexion…", "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Un lien permettant de réinitialiser votre mot de passe vient de vous être envoyé par courriel.<br>Si vous ne le recevez pas dans un délai raisonnable, contactez votre administrateur.<br>N'oubliez pas de vérifier dans votre dossier pourriel / spam!", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Vos fichiers sont chiffrés. Si vous n'avez pas activé la clé de récupération, il n'y aura aucun moyen de récupérer vos données une fois le mot de passe réinitialisé.<br />Si vous n'êtes pas sûr de ce que vous faites, veuillez contacter votre administrateur avant de continuer. <br />Voulez-vous vraiment continuer ?", "I know what I'm doing" : "Je sais ce que je fais", @@ -87,6 +88,7 @@ OC.L10N.register( "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Aucun cache mémoire n'est configuré. Si possible, configurez un \"memcache\" pour augmenter les performances. Pour plus d'information consultez la <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>.", "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "/dev/urandom n'est pas lisible par PHP, ce qui est fortement déconseillé pour des raisons de sécurité. Consultez la <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a> pour avoir plus d'informations à ce sujet.", "You are currently running PHP {version}. We encourage you to upgrade your PHP version to take advantage of <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\">performance and security updates provided by the PHP Group</a> as soon as your distribution supports it." : "Vous utilisez actuellement PHP {version}. Nous vous encourageons à mettre à jour votre version de PHP afin de tirer avantage des amélioration liées à <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\">la performance et la sécurité fournies par le PHP Group</a>, dès que votre distribution le supportera.", + "The reverse proxy headers configuration is incorrect, or you are accessing Nextcloud from a trusted proxy. If you are not accessing Nextcloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to Nextcloud. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "La configuration des entêtes du proxy inverse est incorrecte, ou vous accédez à Nextcloud depuis un proxy de confiance. Si vous n'êtes pas en train d’accéder à Nextcloud depuis un proxy de confiance, ceci est un problème de sécurité qui peut permettre à un attaquant d'usurper l'adresse IP affichée à Nextcloud. Consultez la <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a> pour avoir plus d'informations à ce sujet.", "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "\"memcached\" est configuré comme cache distribué, mais le module installé est \"memcache\". \\OC\\Memcache\\Memcached ne prend en charge que \"memcached\" et non \"memcache\". <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">Consulter le wiki de memcached à propos de ces deux modules.</a>", "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "Des fichiers n'ont pas réussi à passer la vérification d’intégrité. Plus d'information sur comment résoudre ce problème dans notre <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">Liste des fichiers invalides…</a> / <a href=\"{rescanEndpoint}\">Relancer…</a>)", "Error occurred while checking server setup" : "Une erreur s'est produite lors de la vérification de la configuration du serveur", @@ -140,7 +142,6 @@ OC.L10N.register( "{sharee} (remote)" : "{sharee} (distant)", "{sharee} (email)" : "{sharee} (email)", "Share" : "Partager", - "Share with people on other servers using the syntax username@example.com/nextcloud" : "Partagez avec des personnes sur d'autres serveurs en utilisant la syntaxe utilisateur@exemple.com/nextcloud", "Share with users or by mail..." : "Partager avec des utilisateurs ou par mail…", "Share with users or remote users..." : "Partager avec des utilisateurs ou des utilisateurs distants...", "Share with users, remote users or by mail..." : "Partager avec des utilisateurs, des utilisateurs distants ou par mail…", @@ -157,6 +158,7 @@ OC.L10N.register( "Delete" : "Supprimer", "Rename" : "Renommer", "Collaborative tags" : "Étiquettes collaboratives ", + "No tags found" : "Aucune étiquette n'a été trouvée", "The object type is not specified." : "Le type d'objet n'est pas spécifié.", "Enter new" : "Saisir un nouveau", "Add" : "Ajouter", @@ -179,6 +181,7 @@ OC.L10N.register( "Continue to Nextcloud" : "Continuer sur Nextcloud", "The update was successful. Redirecting you to Nextcloud now." : "La mise à jour a réussi. Vous allez être redirigé vers votre Nextcloud.", "Searching other places" : "Recherche en cours dans d'autres emplacements", + "No search results in other folders for '{tag}{filter}{endtag}'" : "Aucun résultat dans d'autres dossiers n'a été trouvé pour '{tag}{filter}{endtag}'", "_{count} search result in another folder_::_{count} search results in other folders_" : ["{count} résultat dans un autre dossier","{count} résultats dans d'autres dossiers"], "Personal" : "Personnel", "Users" : "Utilisateurs", diff --git a/core/l10n/fr.json b/core/l10n/fr.json index ea9df1383de..1210c70ca4f 100644 --- a/core/l10n/fr.json +++ b/core/l10n/fr.json @@ -50,6 +50,7 @@ "Saving..." : "Enregistrement…", "Dismiss" : "Ignorer", "seconds ago" : "à l'instant", + "Logging in …" : "Connexion…", "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Un lien permettant de réinitialiser votre mot de passe vient de vous être envoyé par courriel.<br>Si vous ne le recevez pas dans un délai raisonnable, contactez votre administrateur.<br>N'oubliez pas de vérifier dans votre dossier pourriel / spam!", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Vos fichiers sont chiffrés. Si vous n'avez pas activé la clé de récupération, il n'y aura aucun moyen de récupérer vos données une fois le mot de passe réinitialisé.<br />Si vous n'êtes pas sûr de ce que vous faites, veuillez contacter votre administrateur avant de continuer. <br />Voulez-vous vraiment continuer ?", "I know what I'm doing" : "Je sais ce que je fais", @@ -85,6 +86,7 @@ "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Aucun cache mémoire n'est configuré. Si possible, configurez un \"memcache\" pour augmenter les performances. Pour plus d'information consultez la <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>.", "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "/dev/urandom n'est pas lisible par PHP, ce qui est fortement déconseillé pour des raisons de sécurité. Consultez la <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a> pour avoir plus d'informations à ce sujet.", "You are currently running PHP {version}. We encourage you to upgrade your PHP version to take advantage of <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\">performance and security updates provided by the PHP Group</a> as soon as your distribution supports it." : "Vous utilisez actuellement PHP {version}. Nous vous encourageons à mettre à jour votre version de PHP afin de tirer avantage des amélioration liées à <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\">la performance et la sécurité fournies par le PHP Group</a>, dès que votre distribution le supportera.", + "The reverse proxy headers configuration is incorrect, or you are accessing Nextcloud from a trusted proxy. If you are not accessing Nextcloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to Nextcloud. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "La configuration des entêtes du proxy inverse est incorrecte, ou vous accédez à Nextcloud depuis un proxy de confiance. Si vous n'êtes pas en train d’accéder à Nextcloud depuis un proxy de confiance, ceci est un problème de sécurité qui peut permettre à un attaquant d'usurper l'adresse IP affichée à Nextcloud. Consultez la <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a> pour avoir plus d'informations à ce sujet.", "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "\"memcached\" est configuré comme cache distribué, mais le module installé est \"memcache\". \\OC\\Memcache\\Memcached ne prend en charge que \"memcached\" et non \"memcache\". <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">Consulter le wiki de memcached à propos de ces deux modules.</a>", "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "Des fichiers n'ont pas réussi à passer la vérification d’intégrité. Plus d'information sur comment résoudre ce problème dans notre <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">Liste des fichiers invalides…</a> / <a href=\"{rescanEndpoint}\">Relancer…</a>)", "Error occurred while checking server setup" : "Une erreur s'est produite lors de la vérification de la configuration du serveur", @@ -138,7 +140,6 @@ "{sharee} (remote)" : "{sharee} (distant)", "{sharee} (email)" : "{sharee} (email)", "Share" : "Partager", - "Share with people on other servers using the syntax username@example.com/nextcloud" : "Partagez avec des personnes sur d'autres serveurs en utilisant la syntaxe utilisateur@exemple.com/nextcloud", "Share with users or by mail..." : "Partager avec des utilisateurs ou par mail…", "Share with users or remote users..." : "Partager avec des utilisateurs ou des utilisateurs distants...", "Share with users, remote users or by mail..." : "Partager avec des utilisateurs, des utilisateurs distants ou par mail…", @@ -155,6 +156,7 @@ "Delete" : "Supprimer", "Rename" : "Renommer", "Collaborative tags" : "Étiquettes collaboratives ", + "No tags found" : "Aucune étiquette n'a été trouvée", "The object type is not specified." : "Le type d'objet n'est pas spécifié.", "Enter new" : "Saisir un nouveau", "Add" : "Ajouter", @@ -177,6 +179,7 @@ "Continue to Nextcloud" : "Continuer sur Nextcloud", "The update was successful. Redirecting you to Nextcloud now." : "La mise à jour a réussi. Vous allez être redirigé vers votre Nextcloud.", "Searching other places" : "Recherche en cours dans d'autres emplacements", + "No search results in other folders for '{tag}{filter}{endtag}'" : "Aucun résultat dans d'autres dossiers n'a été trouvé pour '{tag}{filter}{endtag}'", "_{count} search result in another folder_::_{count} search results in other folders_" : ["{count} résultat dans un autre dossier","{count} résultats dans d'autres dossiers"], "Personal" : "Personnel", "Users" : "Utilisateurs", diff --git a/core/l10n/hu_HU.js b/core/l10n/hu_HU.js index bc37e215b8f..300a5538744 100644 --- a/core/l10n/hu_HU.js +++ b/core/l10n/hu_HU.js @@ -142,7 +142,6 @@ OC.L10N.register( "{sharee} (remote)" : "{sharee} (távoli)", "{sharee} (email)" : "{sharee} (e-mail)", "Share" : "Megosztás", - "Share with people on other servers using the syntax username@example.com/nextcloud" : "Megosztás más szervert használó emberekkel, a következő szintaxissal: username@example.com/nextcloud", "Share with users or by mail..." : "Megosztás felhasználókkal e-mailben...", "Share with users or remote users..." : "Megosztás helyi vagy távoli felhasználókkal...", "Share with users, remote users or by mail..." : "Megosztás helyi vagy távoli felhasználókkal e-mailben...", @@ -159,6 +158,7 @@ OC.L10N.register( "Delete" : "Törlés", "Rename" : "Átnevezés", "Collaborative tags" : "Címke hozzárendelése", + "No tags found" : "Nem találhatók címkék", "The object type is not specified." : "Az objektum típusa nincs megadva.", "Enter new" : "Új beírása", "Add" : "Hozzáadás", diff --git a/core/l10n/hu_HU.json b/core/l10n/hu_HU.json index b69d360ab45..01805210235 100644 --- a/core/l10n/hu_HU.json +++ b/core/l10n/hu_HU.json @@ -140,7 +140,6 @@ "{sharee} (remote)" : "{sharee} (távoli)", "{sharee} (email)" : "{sharee} (e-mail)", "Share" : "Megosztás", - "Share with people on other servers using the syntax username@example.com/nextcloud" : "Megosztás más szervert használó emberekkel, a következő szintaxissal: username@example.com/nextcloud", "Share with users or by mail..." : "Megosztás felhasználókkal e-mailben...", "Share with users or remote users..." : "Megosztás helyi vagy távoli felhasználókkal...", "Share with users, remote users or by mail..." : "Megosztás helyi vagy távoli felhasználókkal e-mailben...", @@ -157,6 +156,7 @@ "Delete" : "Törlés", "Rename" : "Átnevezés", "Collaborative tags" : "Címke hozzárendelése", + "No tags found" : "Nem találhatók címkék", "The object type is not specified." : "Az objektum típusa nincs megadva.", "Enter new" : "Új beírása", "Add" : "Hozzáadás", diff --git a/core/l10n/it.js b/core/l10n/it.js index dc310a6b6a5..e6e13e6fc0d 100644 --- a/core/l10n/it.js +++ b/core/l10n/it.js @@ -142,7 +142,6 @@ OC.L10N.register( "{sharee} (remote)" : "{sharee} (remote)", "{sharee} (email)" : "{sharee} (email)", "Share" : "Condividi", - "Share with people on other servers using the syntax username@example.com/nextcloud" : "Condividi con persone su altri server utilizzando la sintassi nomeutente@esempio.com/nextcloud", "Share with users or by mail..." : "Condividi con utenti o tramite posta...", "Share with users or remote users..." : "Condividi con utenti o utenti remoti...", "Share with users, remote users or by mail..." : "Condividi con utenti, utenti remoti o tramite posta...", @@ -159,6 +158,7 @@ OC.L10N.register( "Delete" : "Elimina", "Rename" : "Rinomina", "Collaborative tags" : "Etichette collaborative", + "No tags found" : "Nessuna etichetta trovata", "The object type is not specified." : "Il tipo di oggetto non è specificato.", "Enter new" : "Inserisci nuovo", "Add" : "Aggiungi", diff --git a/core/l10n/it.json b/core/l10n/it.json index c9f84309b47..a385500a5d2 100644 --- a/core/l10n/it.json +++ b/core/l10n/it.json @@ -140,7 +140,6 @@ "{sharee} (remote)" : "{sharee} (remote)", "{sharee} (email)" : "{sharee} (email)", "Share" : "Condividi", - "Share with people on other servers using the syntax username@example.com/nextcloud" : "Condividi con persone su altri server utilizzando la sintassi nomeutente@esempio.com/nextcloud", "Share with users or by mail..." : "Condividi con utenti o tramite posta...", "Share with users or remote users..." : "Condividi con utenti o utenti remoti...", "Share with users, remote users or by mail..." : "Condividi con utenti, utenti remoti o tramite posta...", @@ -157,6 +156,7 @@ "Delete" : "Elimina", "Rename" : "Rinomina", "Collaborative tags" : "Etichette collaborative", + "No tags found" : "Nessuna etichetta trovata", "The object type is not specified." : "Il tipo di oggetto non è specificato.", "Enter new" : "Inserisci nuovo", "Add" : "Aggiungi", diff --git a/core/l10n/nb_NO.js b/core/l10n/nb_NO.js index 8683ba4be81..bb6de95e401 100644 --- a/core/l10n/nb_NO.js +++ b/core/l10n/nb_NO.js @@ -138,7 +138,6 @@ OC.L10N.register( "{sharee} (remote)" : "{sharee} (ekstern)", "{sharee} (email)" : "{sharee} (email)", "Share" : "Del", - "Share with people on other servers using the syntax username@example.com/nextcloud" : "Del med andre brukere på andre tjenere ved å bruker syntaksen brukernavn@eksempel.com/nextcloud", "Share with users or by mail..." : "Del med brukere eller på e-post...", "Share with users or remote users..." : "Del med brukere eller eksterne brukere...", "Share with users, remote users or by mail..." : "Del med brukere, eksterne brukere eller på e-post...", diff --git a/core/l10n/nb_NO.json b/core/l10n/nb_NO.json index dd4f6a898e6..d875ca36b97 100644 --- a/core/l10n/nb_NO.json +++ b/core/l10n/nb_NO.json @@ -136,7 +136,6 @@ "{sharee} (remote)" : "{sharee} (ekstern)", "{sharee} (email)" : "{sharee} (email)", "Share" : "Del", - "Share with people on other servers using the syntax username@example.com/nextcloud" : "Del med andre brukere på andre tjenere ved å bruker syntaksen brukernavn@eksempel.com/nextcloud", "Share with users or by mail..." : "Del med brukere eller på e-post...", "Share with users or remote users..." : "Del med brukere eller eksterne brukere...", "Share with users, remote users or by mail..." : "Del med brukere, eksterne brukere eller på e-post...", diff --git a/core/l10n/nl.js b/core/l10n/nl.js index 7477f2d7e21..c0bf5ab398e 100644 --- a/core/l10n/nl.js +++ b/core/l10n/nl.js @@ -141,7 +141,6 @@ OC.L10N.register( "{sharee} (remote)" : "{sharee} (extern)", "{sharee} (email)" : "{sharee} (e-mail)", "Share" : "Delen", - "Share with people on other servers using the syntax username@example.com/nextcloud" : "Delen met mensen bij andere servers via de syntax gebruikers@voorbeeld.nl/nextcloud", "Share with users or by mail..." : "Deel met gebruikers per e-mail...", "Share with users or remote users..." : "Deel met gebruikers of externe gebruikers...", "Share with users, remote users or by mail..." : "Deel met gebruikers, externe gebruikers of per e-mail...", diff --git a/core/l10n/nl.json b/core/l10n/nl.json index c664d16d04b..32f028fb9ac 100644 --- a/core/l10n/nl.json +++ b/core/l10n/nl.json @@ -139,7 +139,6 @@ "{sharee} (remote)" : "{sharee} (extern)", "{sharee} (email)" : "{sharee} (e-mail)", "Share" : "Delen", - "Share with people on other servers using the syntax username@example.com/nextcloud" : "Delen met mensen bij andere servers via de syntax gebruikers@voorbeeld.nl/nextcloud", "Share with users or by mail..." : "Deel met gebruikers per e-mail...", "Share with users or remote users..." : "Deel met gebruikers of externe gebruikers...", "Share with users, remote users or by mail..." : "Deel met gebruikers, externe gebruikers of per e-mail...", diff --git a/core/l10n/pl.js b/core/l10n/pl.js index d71664dd257..62a480479d1 100644 --- a/core/l10n/pl.js +++ b/core/l10n/pl.js @@ -114,6 +114,7 @@ OC.L10N.register( "{{shareInitiatorDisplayName}} shared via link" : "{{shareInitiatorDisplayName}} udostępniane za pośrednictwem łącza", "group" : "grupa", "remote" : "zdalny", + "email" : "email", "Unshare" : "Zatrzymaj współdzielenie", "can reshare" : "mogą udostępniać", "can edit" : "może edytować", diff --git a/core/l10n/pl.json b/core/l10n/pl.json index c3f11a5bc53..efdcbed277a 100644 --- a/core/l10n/pl.json +++ b/core/l10n/pl.json @@ -112,6 +112,7 @@ "{{shareInitiatorDisplayName}} shared via link" : "{{shareInitiatorDisplayName}} udostępniane za pośrednictwem łącza", "group" : "grupa", "remote" : "zdalny", + "email" : "email", "Unshare" : "Zatrzymaj współdzielenie", "can reshare" : "mogą udostępniać", "can edit" : "może edytować", diff --git a/core/l10n/pt_BR.js b/core/l10n/pt_BR.js index b0f2f49984c..b076ac54a04 100644 --- a/core/l10n/pt_BR.js +++ b/core/l10n/pt_BR.js @@ -141,7 +141,6 @@ OC.L10N.register( "{sharee} (remote)" : "{sharee} (remoto)", "{sharee} (email)" : "{sharee} (email)", "Share" : "Compartilhar", - "Share with people on other servers using the syntax username@example.com/nextcloud" : "Compartilhe com pessoas em outros servidores utilizando a sintaxe username@example.com/nextcloud", "Share with users or by mail..." : "Compartilhe com usuários internos ou por email...", "Share with users or remote users..." : "Compartilhe com usuários internos ou usuários remotos...", "Share with users, remote users or by mail..." : "Compartilhe com usuários internos, usuários remotos ou por email...", diff --git a/core/l10n/pt_BR.json b/core/l10n/pt_BR.json index 9ed30a810ae..4a143863db0 100644 --- a/core/l10n/pt_BR.json +++ b/core/l10n/pt_BR.json @@ -139,7 +139,6 @@ "{sharee} (remote)" : "{sharee} (remoto)", "{sharee} (email)" : "{sharee} (email)", "Share" : "Compartilhar", - "Share with people on other servers using the syntax username@example.com/nextcloud" : "Compartilhe com pessoas em outros servidores utilizando a sintaxe username@example.com/nextcloud", "Share with users or by mail..." : "Compartilhe com usuários internos ou por email...", "Share with users or remote users..." : "Compartilhe com usuários internos ou usuários remotos...", "Share with users, remote users or by mail..." : "Compartilhe com usuários internos, usuários remotos ou por email...", diff --git a/core/l10n/ru.js b/core/l10n/ru.js index 1cbc48b2f0d..f4016fbc8e8 100644 --- a/core/l10n/ru.js +++ b/core/l10n/ru.js @@ -139,7 +139,6 @@ OC.L10N.register( "{sharee} (group)" : "{sharee} (группа)", "{sharee} (remote)" : "{sharee} (удалённо)", "Share" : "Поделиться", - "Share with people on other servers using the syntax username@example.com/nextcloud" : "Поделиться с людьми на других серверах используя формат username@example.com/nextcloud", "Share with users or remote users..." : "Общий доступ с пользователями или удаленными пользователями", "Share with users or groups..." : "Общий доступ с пользователями или группами", "Share with users, groups or remote users..." : "Поделиться с пользователями, группами или удаленными пользователями...", diff --git a/core/l10n/ru.json b/core/l10n/ru.json index 4dac2250998..93236fc326a 100644 --- a/core/l10n/ru.json +++ b/core/l10n/ru.json @@ -137,7 +137,6 @@ "{sharee} (group)" : "{sharee} (группа)", "{sharee} (remote)" : "{sharee} (удалённо)", "Share" : "Поделиться", - "Share with people on other servers using the syntax username@example.com/nextcloud" : "Поделиться с людьми на других серверах используя формат username@example.com/nextcloud", "Share with users or remote users..." : "Общий доступ с пользователями или удаленными пользователями", "Share with users or groups..." : "Общий доступ с пользователями или группами", "Share with users, groups or remote users..." : "Поделиться с пользователями, группами или удаленными пользователями...", diff --git a/core/routes.php b/core/routes.php index c890d232cfe..2ddd77c1445 100644 --- a/core/routes.php +++ b/core/routes.php @@ -59,6 +59,7 @@ $application->registerRoutes($this, [ ['root' => '/cloud', 'name' => 'OCS#getCapabilities', 'url' => '/capabilities', 'verb' => 'GET'], ['root' => '/cloud', 'name' => 'OCS#getCurrentUser', 'url' => '/user', 'verb' => 'GET'], ['root' => '', 'name' => 'OCS#getConfig', 'url' => '/config', 'verb' => 'GET'], + ['root' => '/person', 'name' => 'OCS#personCheck', 'url' => '/check', 'verb' => 'POST'], ], ]); diff --git a/core/shipped.json b/core/shipped.json index 9855a663847..f831d17f36a 100644 --- a/core/shipped.json +++ b/core/shipped.json @@ -21,6 +21,7 @@ "files_videoplayer", "firstrunwizard", "gallery", + "logreader", "notifications", "password_policy", "provisioning_api", |
