diff options
| author | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2012-12-18 15:41:58 +0100 |
|---|---|---|
| committer | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2012-12-18 15:41:58 +0100 |
| commit | 586cc9a83b27f54647c3425403cfcfa0cd9210c2 (patch) | |
| tree | 61305f81a41e0380b65da0fcb20b738ef813d8f6 /core | |
| parent | b05666219e43e59cfeab13a53b992cf71ad8bfad (diff) | |
| parent | dd5e39ca71d80c97e1b62427642ba1a08f75624d (diff) | |
| download | nextcloud-server-586cc9a83b27f54647c3425403cfcfa0cd9210c2.tar.gz nextcloud-server-586cc9a83b27f54647c3425403cfcfa0cd9210c2.zip | |
merge master into navigation
Diffstat (limited to 'core')
85 files changed, 6092 insertions, 491 deletions
diff --git a/core/ajax/requesttoken.php b/core/ajax/requesttoken.php deleted file mode 100644 index 9d43a722852..00000000000 --- a/core/ajax/requesttoken.php +++ /dev/null @@ -1,40 +0,0 @@ -<?php -/** -* ownCloud -* @author Christian Reiner -* @copyright 2011-2012 Christian Reiner <foss@christian-reiner.info> -* -* This library is free software; you can redistribute it and/or -* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE -* License as published by the Free Software Foundation; either -* version 3 of the license, or any later version. -* -* This library is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU AFFERO GENERAL PUBLIC LICENSE for more details. -* -* You should have received a copy of the GNU Affero General Public -* License along with this library. -* If not, see <http://www.gnu.org/licenses/>. -* -*/ - -/** - * @file core/ajax/requesttoken.php - * @brief Ajax method to retrieve a fresh request protection token for ajax calls - * @return json: success/error state indicator including a fresh request token - * @author Christian Reiner - */ - -// don't load apps or filesystem for this task -$RUNTIME_NOAPPS = true; -$RUNTIME_NOSETUPFS = true; - -// Sanity checks -// using OCP\JSON::callCheck() below protects the token refreshing itself. -//OCP\JSON::callCheck ( ); -OCP\JSON::checkLoggedIn ( ); -// hand out a fresh token -OCP\JSON::success ( array ( 'token' => OCP\Util::callRegister() ) ); -?> diff --git a/core/ajax/share.php b/core/ajax/share.php index efe01dff886..12206e0fd79 100644 --- a/core/ajax/share.php +++ b/core/ajax/share.php @@ -28,13 +28,19 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo case 'share': if (isset($_POST['shareType']) && isset($_POST['shareWith']) && isset($_POST['permissions'])) { try { - if ((int)$_POST['shareType'] === OCP\Share::SHARE_TYPE_LINK && $_POST['shareWith'] == '') { + $shareType = (int)$_POST['shareType']; + $shareWith = $_POST['shareWith']; + if ($shareType === OCP\Share::SHARE_TYPE_LINK && $shareWith == '') { $shareWith = null; + } + + $token = OCP\Share::shareItem($_POST['itemType'], $_POST['itemSource'], $shareType, $shareWith, $_POST['permissions']); + + if (is_string($token)) { + OC_JSON::success(array('data' => array('token' => $token))); } else { - $shareWith = $_POST['shareWith']; + OC_JSON::success(); } - OCP\Share::shareItem($_POST['itemType'], $_POST['itemSource'], (int)$_POST['shareType'], $shareWith, $_POST['permissions']); - OC_JSON::success(); } catch (Exception $exception) { OC_JSON::error(array('data' => array('message' => $exception->getMessage()))); } @@ -63,6 +69,42 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo ($return) ? OC_JSON::success() : OC_JSON::error(); } break; + case 'email': + // read post variables + $user = OCP\USER::getUser(); + $type = $_POST['itemType']; + $link = $_POST['link']; + $file = $_POST['file']; + $to_address = $_POST['toaddress']; + + // enable l10n support + $l = OC_L10N::get('core'); + + // setup the email + $subject = (string)$l->t('User %s shared a file with you', $user); + if ($type === 'dir') + $subject = (string)$l->t('User %s shared a folder with you', $user); + + $text = (string)$l->t('User %s shared the file "%s" with you. It is available for download here: %s', array($user, $file, $link)); + if ($type === 'dir') + $text = (string)$l->t('User %s shared the folder "%s" with you. It is available for download here: %s', array($user, $file, $link)); + + // handle localhost installations + $server_host = OCP\Util::getServerHost(); + if ($server_host === 'localhost') + $server_host = "example.com"; + + $default_from = 'sharing-noreply@' . $server_host; + $from_address = OCP\Config::getUserValue($user, 'settings', 'email', $default_from ); + + // send it out now + try { + OCP\Util::sendMail($to_address, $to_address, $subject, $text, $from_address, $user); + OCP\JSON::success(); + } catch (Exception $exception) { + OCP\JSON::error(array('data' => array('message' => $exception->getMessage()))); + } + break; } } else if (isset($_GET['fetch'])) { switch ($_GET['fetch']) { diff --git a/core/ajax/vcategories/add.php b/core/ajax/vcategories/add.php index 8d31275dbfb..23d00af70ab 100644 --- a/core/ajax/vcategories/add.php +++ b/core/ajax/vcategories/add.php @@ -14,23 +14,25 @@ function debug($msg) { OC_Log::write('core', 'ajax/vcategories/add.php: '.$msg, OC_Log::DEBUG); } -OC_JSON::checkLoggedIn(); -$category = isset($_GET['category'])?strip_tags($_GET['category']):null; -$app = isset($_GET['app'])?$_GET['app']:null; +OCP\JSON::checkLoggedIn(); +OCP\JSON::callCheck(); -if(is_null($app)) { - bailOut(OC_Contacts_App::$l10n->t('Application name not provided.')); -} +$l = OC_L10N::get('core'); + +$category = isset($_POST['category']) ? strip_tags($_POST['category']) : null; +$type = isset($_POST['type']) ? $_POST['type'] : null; -OC_JSON::checkAppEnabled($app); +if(is_null($type)) { + bailOut($l->t('Category type not provided.')); +} if(is_null($category)) { - bailOut(OC_Contacts_App::$l10n->t('No category to add?')); + bailOut($l->t('No category to add?')); } debug(print_r($category, true)); -$categories = new OC_VCategories($app); +$categories = new OC_VCategories($type); if($categories->hasCategory($category)) { bailOut(OC_Contacts_App::$l10n->t('This category already exists: '.$category)); } else { diff --git a/core/ajax/vcategories/addToFavorites.php b/core/ajax/vcategories/addToFavorites.php new file mode 100644 index 00000000000..52f62d5fc6b --- /dev/null +++ b/core/ajax/vcategories/addToFavorites.php @@ -0,0 +1,38 @@ +<?php +/** + * Copyright (c) 2012 Thomas Tanghus <thomas@tanghus.net> + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ +function bailOut($msg) { + OC_JSON::error(array('data' => array('message' => $msg))); + OC_Log::write('core', 'ajax/vcategories/addToFavorites.php: '.$msg, OC_Log::DEBUG); + exit(); +} +function debug($msg) { + OC_Log::write('core', 'ajax/vcategories/addToFavorites.php: '.$msg, OC_Log::DEBUG); +} + +OCP\JSON::checkLoggedIn(); +OCP\JSON::callCheck(); + +$l = OC_L10N::get('core'); + +$id = isset($_POST['id']) ? strip_tags($_POST['id']) : null; +$type = isset($_POST['type']) ? $_POST['type'] : null; + +if(is_null($type)) { + bailOut($l->t('Object type not provided.')); +} + +if(is_null($id)) { + bailOut($l->t('%s ID not provided.', $type)); +} + +$categories = new OC_VCategories($type); +if(!$categories->addToFavorites($id, $type)) { + bailOut($l->t('Error adding %s to favorites.', $id)); +} + +OC_JSON::success(); diff --git a/core/ajax/vcategories/delete.php b/core/ajax/vcategories/delete.php index 74b0220870c..dfec3785743 100644 --- a/core/ajax/vcategories/delete.php +++ b/core/ajax/vcategories/delete.php @@ -15,21 +15,26 @@ function debug($msg) { OC_Log::write('core', 'ajax/vcategories/delete.php: '.$msg, OC_Log::DEBUG); } -OC_JSON::checkLoggedIn(); -$app = isset($_POST['app'])?$_POST['app']:null; -$categories = isset($_POST['categories'])?$_POST['categories']:null; -if(is_null($app)) { - bailOut(OC_Contacts_App::$l10n->t('Application name not provided.')); -} +OCP\JSON::checkLoggedIn(); +OCP\JSON::callCheck(); + +$l = OC_L10N::get('core'); -OC_JSON::checkAppEnabled($app); +$type = isset($_POST['type']) ? $_POST['type'] : null; +$categories = isset($_POST['categories']) ? $_POST['categories'] : null; + +if(is_null($type)) { + bailOut($l->t('Object type not provided.')); +} -debug('The application "'.$app.'" uses the default file. OC_VObjects will not be updated.'); +debug('The application using category type "' + . $type + . '" uses the default file for deletion. OC_VObjects will not be updated.'); if(is_null($categories)) { - bailOut('No categories selected for deletion.'); + bailOut($l->t('No categories selected for deletion.')); } -$vcategories = new OC_VCategories($app); +$vcategories = new OC_VCategories($type); $vcategories->delete($categories); OC_JSON::success(array('data' => array('categories'=>$vcategories->categories()))); diff --git a/core/ajax/vcategories/edit.php b/core/ajax/vcategories/edit.php index caeebcaa940..0387b17576c 100644 --- a/core/ajax/vcategories/edit.php +++ b/core/ajax/vcategories/edit.php @@ -16,16 +16,18 @@ function debug($msg) { } OC_JSON::checkLoggedIn(); -$app = isset($_GET['app'])?$_GET['app']:null; -if(is_null($app)) { - bailOut('Application name not provided.'); +$l = OC_L10N::get('core'); + +$type = isset($_GET['type']) ? $_GET['type'] : null; + +if(is_null($type)) { + bailOut($l->t('Category type not provided.')); } -OC_JSON::checkAppEnabled($app); -$tmpl = new OC_TEMPLATE("core", "edit_categories_dialog"); +$tmpl = new OCP\Template("core", "edit_categories_dialog"); -$vcategories = new OC_VCategories($app); +$vcategories = new OC_VCategories($type); $categories = $vcategories->categories(); debug(print_r($categories, true)); $tmpl->assign('categories', $categories); diff --git a/core/ajax/vcategories/favorites.php b/core/ajax/vcategories/favorites.php new file mode 100644 index 00000000000..db4244d601a --- /dev/null +++ b/core/ajax/vcategories/favorites.php @@ -0,0 +1,30 @@ +<?php +/** + * Copyright (c) 2012 Thomas Tanghus <thomas@tanghus.net> + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ +function bailOut($msg) { + OC_JSON::error(array('data' => array('message' => $msg))); + OC_Log::write('core', 'ajax/vcategories/addToFavorites.php: '.$msg, OC_Log::DEBUG); + exit(); +} +function debug($msg) { + OC_Log::write('core', 'ajax/vcategories/addToFavorites.php: '.$msg, OC_Log::DEBUG); +} + +OCP\JSON::checkLoggedIn(); +OCP\JSON::callCheck(); + +$type = isset($_GET['type']) ? $_GET['type'] : null; + +if(is_null($type)) { + $l = OC_L10N::get('core'); + bailOut($l->t('Object type not provided.')); +} + +$categories = new OC_VCategories($type); +$ids = $categories->getFavorites($type); + +OC_JSON::success(array('ids' => $ids)); diff --git a/core/ajax/vcategories/removeFromFavorites.php b/core/ajax/vcategories/removeFromFavorites.php new file mode 100644 index 00000000000..ba6e95c2497 --- /dev/null +++ b/core/ajax/vcategories/removeFromFavorites.php @@ -0,0 +1,38 @@ +<?php +/** + * Copyright (c) 2012 Thomas Tanghus <thomas@tanghus.net> + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ +function bailOut($msg) { + OC_JSON::error(array('data' => array('message' => $msg))); + OC_Log::write('core', 'ajax/vcategories/removeFromFavorites.php: '.$msg, OC_Log::DEBUG); + exit(); +} +function debug($msg) { + OC_Log::write('core', 'ajax/vcategories/removeFromFavorites.php: '.$msg, OC_Log::DEBUG); +} + +OCP\JSON::checkLoggedIn(); +OCP\JSON::callCheck(); + +$l = OC_L10N::get('core'); + +$id = isset($_POST['id']) ? strip_tags($_POST['id']) : null; +$type = isset($_POST['type']) ? $_POST['type'] : null; + +if(is_null($type)) { + bailOut($l->t('Object type not provided.')); +} + +if(is_null($id)) { + bailOut($l->t('%s ID not provided.', $type)); +} + +$categories = new OC_VCategories($type); +if(!$categories->removeFromFavorites($id, $type)) { + bailOut($l->t('Error removing %s from favorites.', $id)); +} + +OC_JSON::success(); diff --git a/core/css/share.css b/core/css/share.css index 5aca731356a..e806d25982e 100644 --- a/core/css/share.css +++ b/core/css/share.css @@ -50,11 +50,17 @@ padding-top:.5em; } - #dropdown input[type="text"],#dropdown input[type="password"] { - width:90%; - } +#dropdown input[type="text"],#dropdown input[type="password"] { + width:90%; +} + +#dropdown form { + font-size: 100%; + margin-left: 0; + margin-right: 0; +} - #linkText,#linkPass,#expiration { +#linkText,#linkPass,#expiration { display:none; } diff --git a/core/css/styles.css b/core/css/styles.css index 34c08fb7f12..2b55cc28c10 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -3,7 +3,7 @@ See the COPYING-README file. */ html, body, div, span, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, code, del, dfn, em, img, q, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, dialog, figure, footer, header, hgroup, nav, section { margin:0; padding:0; border:0; outline:0; font-weight:inherit; font-size:100%; font-family:inherit; vertical-align:baseline; cursor:default; } -html, body { height: 100%; overflow: auto; } +html, body { height:100%; overflow:auto; } article, aside, dialog, figure, footer, header, hgroup, nav, section { display:block; } body { line-height:1.5; } table { border-collapse:separate; border-spacing:0; white-space:nowrap; } @@ -16,45 +16,82 @@ body { background:#fefefe; font:normal .8em/1.6em "Lucida Grande", Arial, Verdan /* HEADERS */ -#body-user #header, #body-settings #header { position:fixed; top:0; left:0; right:0; z-index:100; height:45px; line-height:2.5em; background:#1d2d44; -moz-box-shadow:0 0 10px rgba(0, 0, 0, .5), inset 0 -2px 10px #222; -webkit-box-shadow:0 0 10px rgba(0, 0, 0, .5), inset 0 -2px 10px #222; box-shadow:0 0 10px rgba(0, 0, 0, .5), inset 0 -2px 10px #222; } +#body-user #header, #body-settings #header { position:fixed; top:0; left:0; right:0; z-index:100; height:45px; line-height:2.5em; padding:.5em; background:#1d2d44; -moz-box-shadow:0 0 10px rgba(0, 0, 0, .5), inset 0 -2px 10px #222; -webkit-box-shadow:0 0 10px rgba(0, 0, 0, .5), inset 0 -2px 10px #222; box-shadow:0 0 10px rgba(0, 0, 0, .5), inset 0 -2px 10px #222; } #body-login #header { margin: -2em auto 0; text-align:center; height:10em; padding:1em 0 .5em; -moz-box-shadow:0 0 1em rgba(0, 0, 0, .5); -webkit-box-shadow:0 0 1em rgba(0, 0, 0, .5); box-shadow:0 0 1em rgba(0, 0, 0, .5); -background: #1d2d44; /* Old browsers */ -background: -moz-linear-gradient(top, #35537a 0%, #1d2d42 100%); /* FF3.6+ */ -background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#35537a), color-stop(100%,#1d2d42)); /* Chrome,Safari4+ */ -background: -webkit-linear-gradient(top, #35537a 0%,#1d2d42 100%); /* Chrome10+,Safari5.1+ */ -background: -o-linear-gradient(top, #35537a 0%,#1d2d42 100%); /* Opera11.10+ */ -background: -ms-linear-gradient(top, #35537a 0%,#1d2d42 100%); /* IE10+ */ -background: linear-gradient(top, #35537a 0%,#1d2d42 100%); /* W3C */ -filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#35537a', endColorstr='#1d2d42',GradientType=0 ); /* IE6-9 */ } +background:#1d2d44; /* Old browsers */ +background:-moz-linear-gradient(top, #35537a 0%, #1d2d42 100%); /* FF3.6+ */ +background:-webkit-gradient(linear, left top, left bottom, color-stop(0%,#35537a), color-stop(100%,#1d2d42)); /* Chrome,Safari4+ */ +background:-webkit-linear-gradient(top, #35537a 0%,#1d2d42 100%); /* Chrome10+,Safari5.1+ */ +background:-o-linear-gradient(top, #35537a 0%,#1d2d42 100%); /* Opera11.10+ */ +background:-ms-linear-gradient(top, #35537a 0%,#1d2d42 100%); /* IE10+ */ +background:linear-gradient(top, #35537a 0%,#1d2d42 100%); /* W3C */ +filter:progid:DXImageTransform.Microsoft.gradient( startColorstr='#35537a', endColorstr='#1d2d42',GradientType=0 ); /* IE6-9 */ } #owncloud { position:absolute; padding:6px; padding-bottom:0; } /* INPUTS */ input[type="text"], input[type="password"] { cursor:text; } -input, textarea, select, button, .button, #quota, div.jp-progress, .pager li a { font-size:1em; font-family:Arial, Verdana, sans-serif; width:10em; margin:.3em; padding:.6em .5em .4em; background:#fff; color:#333; border:1px solid #ddd; -moz-box-shadow:0 1px 1px #fff, 0 2px 0 #bbb inset; -webkit-box-shadow:0 1px 1px #fff, 0 1px 0 #bbb inset; box-shadow:0 1px 1px #fff, 0 1px 0 #bbb inset; -moz-border-radius:.5em; -webkit-border-radius:.5em; border-radius:.5em; outline:none; } +input:not([type="checkbox"]), textarea, select, button, .button, #quota, div.jp-progress, .pager li a { + width:10em; margin:.3em; padding:.6em .5em .4em; + font-size:1em; font-family:Arial, Verdana, sans-serif; + background:#fff; color:#333; border:1px solid #ddd; outline:none; + -moz-box-shadow:0 1px 1px #fff, 0 2px 0 #bbb inset; -webkit-box-shadow:0 1px 1px #fff, 0 1px 0 #bbb inset; box-shadow:0 1px 1px #fff, 0 1px 0 #bbb inset; + -moz-border-radius:.5em; -webkit-border-radius:.5em; border-radius:.5em; +} +input[type="hidden"] { height:0; width:0; } input[type="text"], input[type="password"], input[type="search"], textarea { background:#f8f8f8; color:#555; cursor:text; } input[type="text"], input[type="password"], input[type="search"] { -webkit-appearance:textfield; -moz-appearance:textfield; -webkit-box-sizing:content-box; -moz-box-sizing:content-box; box-sizing:content-box; } input[type="text"]:hover, input[type="text"]:focus, input[type="text"]:active, input[type="password"]:hover, input[type="password"]:focus, input[type="password"]:active, .searchbox input[type="search"]:hover, .searchbox input[type="search"]:focus, .searchbox input[type="search"]:active, textarea:hover, textarea:focus, textarea:active { background-color:#fff; color:#333; -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1; } - -input[type="submit"], input[type="button"], button, .button, #quota, div.jp-progress, select, .pager li a { width:auto; padding:.4em; border:1px solid #ddd; font-weight:bold; cursor:pointer; background:#f8f8f8; color:#555; text-shadow:#fff 0 1px 0; -moz-box-shadow:0 1px 1px #fff, 0 1px 1px #fff inset; -webkit-box-shadow:0 1px 1px #fff, 0 1px 1px #fff inset; -moz-border-radius:.5em; -webkit-border-radius:.5em; border-radius:.5em; } -input[type="submit"]:hover, input[type="submit"]:focus, input[type="button"]:hover, select:hover, select:focus, select:active, input[type="button"]:focus, .button:hover { background:#fff; color:#333; } -input[type="checkbox"] { width:auto; } +input[type="checkbox"] { margin:0; padding:0; height:auto; width:auto; } +input[type="checkbox"]:hover+label, input[type="checkbox"]:focus+label { color:#111 !important; } #quota { cursor:default; } + +/* BUTTONS */ +input[type="submit"], input[type="button"], button, .button, #quota, div.jp-progress, select, .pager li a { + width:auto; padding:.4em; + background-color:rgba(230,230,230,.5); font-weight:bold; color:#555; text-shadow:#fff 0 1px 0; border:1px solid rgba(180,180,180,.5); cursor:pointer; + -moz-box-shadow:0 1px 1px #fff, 0 1px 1px #fff inset; -webkit-box-shadow:0 1px 1px #fff, 0 1px 1px #fff inset; box-shadow:0 1px 1px #fff, 0 1px 1px #fff inset; + -moz-border-radius:.5em; -webkit-border-radius:.5em; border-radius:.5em; +} +input[type="submit"]:hover, input[type="submit"]:focus, input[type="button"]:hover, select:hover, select:focus, select:active, input[type="button"]:focus, .button:hover { + background:rgba(255,255,255,.5); color:#333; +} +input[type="submit"] img, input[type="button"] img, button img, .button img { cursor:pointer; } + +/* Primary action button, use sparingly */ +.primary, input[type="submit"].primary, input[type="button"].primary, button.primary, .button.primary { + border:1px solid #1d2d44; + background:#35537a; color:#ddd; text-shadow:#000 0 -1px 0; + -moz-box-shadow:0 0 1px #000,0 1px 1px #6d7d94 inset; -webkit-box-shadow:0 0 1px #000,0 1px 1px #6d7d94 inset; box-shadow:0 0 1px #000,0 1px 1px #6d7d94 inset; +} + .primary:hover, input[type="submit"].primary:hover, input[type="button"].primary:hover, button.primary:hover, .button.primary:hover, + .primary:focus, input[type="submit"].primary:focus, input[type="button"].primary:focus, button.primary:focus, .button.primary:focus { + border:1px solid #1d2d44; + background:#2d3d54; color:#fff; text-shadow:#000 0 -1px 0; + -moz-box-shadow:0 0 1px #000,0 1px 1px #5d6d84 inset; -webkit-box-shadow:0 0 1px #000,0 1px 1px #5d6d84 inset; box-shadow:0 0 1px #000,0 1px 1px #5d6d84 inset; + } + .primary:active, input[type="submit"].primary:active, input[type="button"].primary:active, button.primary:active, .button.primary:active { + border:1px solid #1d2d44; + background:#1d2d42; color:#bbb; text-shadow:#000 0 -1px 0; + -moz-box-shadow:0 1px 1px #fff,0 1px 1px 0 rgba(0,0,0,.2) inset; -webkit-box-shadow:0 1px 1px #fff,0 1px 1px 0 rgba(0,0,0,.2) inset; box-shadow:0 1px 1px #fff,0 1px 1px 0 rgba(0,0,0,.2) inset; + } + + #body-login input { font-size:1.5em; } -#body-login input[type="text"], #body-login input[type="password"] { width: 13em; } -#body-login input.login { width: auto; float: right; } +#body-login input[type="text"], #body-login input[type="password"] { width:13em; } +#body-login input.login { width:auto; float:right; } #remember_login { margin:.8em .2em 0 1em; } .searchbox input[type="search"] { font-size:1.2em; padding:.2em .5em .2em 1.5em; background:#fff url('../img/actions/search.svg') no-repeat .5em center; border:0; -moz-border-radius:1em; -webkit-border-radius:1em; border-radius:1em; -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=70)"; filter:alpha(opacity=70);opacity:.7; -webkit-transition:opacity 300ms; -moz-transition:opacity 300ms; -o-transition:opacity 300ms; transition:opacity 300ms; margin-top:10px; float:right; } input[type="submit"].enabled { background:#66f866; border:1px solid #5e5; -moz-box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #cfc inset; -webkit-box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #cfc inset; box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #cfc inset; } -input[type="submit"].highlight{ background:#ffc100; border:1px solid #db0; text-shadow:#ffeedd 0 1px 0; -moz-box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #ffeedd inset; -webkit-box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #ffeedd inset; box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #ffeedd inset; } -#select_all{ margin-top: .4em !important;} +#select_all{ margin-top:.4em !important;} + /* CONTENT ------------------------------------------------------------------ */ -#controls { padding: 0 0.5em; width:100%; top:3.5em; height:2.8em; margin:0; background:#f7f7f7; border-bottom:1px solid #eee; position:fixed; z-index:50; -moz-box-shadow:0 -3px 7px #000; -webkit-box-shadow:0 -3px 7px #000; box-shadow:0 -3px 7px #000; } +#controls { padding:0 0.5em; width:100%; top:3.5em; height:2.8em; margin:0; background:#f7f7f7; border-bottom:1px solid #eee; position:fixed; z-index:50; -moz-box-shadow:0 -3px 7px #000; -webkit-box-shadow:0 -3px 7px #000; box-shadow:0 -3px 7px #000; } #controls .button { display:inline-block; } #content { height: 100%; @@ -64,39 +101,85 @@ input[type="submit"].highlight{ background:#ffc100; border:1px solid #db0; text- box-sizing: border-box; -moz-box-sizing: border-box; } -#leftcontent, .leftcontent { position:fixed; overflow: auto; top:6.4em; width:20em; background:#f8f8f8; border-right:1px solid #ddd; } +/* TODO check if this is better: #content { top:3.5em; left:12.5em; position:absolute; } */ +#leftcontent, .leftcontent { position:fixed; overflow:auto; top:6.4em; width:20em; background:#f8f8f8; border-right:1px solid #ddd; } #leftcontent li, .leftcontent li { background:#f8f8f8; padding:.5em .8em; white-space:nowrap; overflow:hidden; text-overflow:ellipsis; -webkit-transition:background-color 200ms; -moz-transition:background-color 200ms; -o-transition:background-color 200ms; transition:background-color 200ms; } #leftcontent li:hover, #leftcontent li:active, #leftcontent li.active, .leftcontent li:hover, .leftcontent li:active, .leftcontent li.active { background:#eee; } #leftcontent li.active, .leftcontent li.active { font-weight:bold; } #leftcontent li:hover, .leftcontent li:hover { color:#333; background:#ddd; } -#leftcontent a { height: 100%; display: block; margin: 0; padding: 0 1em 0 0; float: left; } -#rightcontent, .rightcontent { position:fixed; top: 6.4em; left: 32.5em; overflow: auto } +#leftcontent a { height:100%; display:block; margin:0; padding:0 1em 0 0; float:left; } +#rightcontent, .rightcontent { position:fixed; top:6.4em; left:32.5em; overflow:auto } /* LOG IN & INSTALLATION ------------------------------------------------------------ */ #body-login { background:#ddd; } -#body-login div.buttons { text-align: center; } -#body-login p.info { width:22em; text-align: center; margin:2em auto; color:#777; text-shadow:#fff 0 1px 0; } +#body-login div.buttons { text-align:center; } +#body-login p.info { width:22em; text-align:center; margin:2em auto; color:#777; text-shadow:#fff 0 1px 0; } #body-login p.info a { font-weight:bold; color:#777; } #login { min-height:30em; margin:2em auto 0; border-bottom:1px solid #f8f8f8; background:#eee; } #login form { width:22em; margin:2em auto 2em; padding:0; } -#login form fieldset { background:0; border:0; margin-bottom:2em; padding:0; } -#login form fieldset legend { font-weight:bold; } -#login form label { margin:.95em 0 0 .85em; color:#666; } +#login form fieldset { margin-bottom:20px; } +#login form #adminaccount { margin-bottom:5px; } +#login form fieldset legend, #datadirContent label { + width:100%; text-align:center; + font-weight:bold; color:#999; text-shadow:0 1px 0 white; +} +#login form fieldset legend a { color:#999; } +#login #datadirContent label { display:block; margin:0; color:#999; } +#login form #datadirField legend { margin-bottom:15px; } + + +/* Icons for username and password fields to better recognize them */ +#adminlogin, #adminpass, #user, #password { width:11.7em!important; padding-left:1.8em; } +#adminlogin+label, #adminpass+label, #user+label, #password+label { left:2.2em; } +#adminlogin+label+img, #adminpass+label+img, #user+label+img, #password+label+img { + position:absolute; left:1.25em; top:1.65em; + opacity:.3; +} +#adminpass+label+img, #password+label+img { top:1.1em; } + + +/* Nicely grouping input field sets */ +.grouptop input { + margin-bottom:0; + border-bottom:0; border-bottom-left-radius:0; border-bottom-right-radius:0; +} +.groupmiddle input { + margin-top:0; margin-bottom:0; + border-top:0; border-radius:0; + box-shadow:0 1px 1px #fff,0 1px 0 #ddd inset; +} +.groupbottom input { + margin-top:0; + border-top:0; border-top-right-radius:0; border-top-left-radius:0; + box-shadow:0 1px 1px #fff,0 1px 0 #ddd inset; +} + +#login form label { color:#666; } +#login .groupmiddle label, #login .groupbottom label { top:.65em; } /* NEEDED FOR INFIELD LABELS */ -p.infield { position: relative; } -label.infield { cursor: text !important; } -#login form label.infield { position:absolute; font-size:1.5em; color:#AAA; } -#login #dbhostlabel, #login #directorylabel { display:block; margin:.95em 0 .8em -8em; } +p.infield { position:relative; } +label.infield { cursor:text !important; top:1.05em; left:.85em; } +#login form label.infield { position:absolute; font-size:19px; color:#aaa; white-space:nowrap; } #login form input[type="checkbox"]+label { position:relative; margin:0; font-size:1em; text-shadow:#fff 0 1px 0; } #login form .errors { background:#fed7d7; border:1px solid #f00; list-style-indent:inside; margin:0 0 2em; padding:1em; } #login form #selectDbType { text-align:center; } -#login form #selectDbType label { position:static; font-size:1em; margin:0 -.3em 1em; cursor:pointer; padding:.4em; border:1px solid #ddd; font-weight:bold; background:#f8f8f8; color:#555; text-shadow:#eee 0 1px 0; -moz-box-shadow:0 1px 1px #fff, 0 1px 1px #fff inset; -webkit-box-shadow:0 1px 1px #fff, 0 1px 1px #fff inset; } -#login form #selectDbType label span { cursor:pointer; font-size:0.9em; } -#login form #selectDbType label.ui-state-hover span, #login form #selectDbType label.ui-state-active span { color:#000; } -#login form #selectDbType label.ui-state-hover, #login form #selectDbType label.ui-state-active { color: #333; background-color: #ccc; } +#login form #selectDbType label { + position:static; margin:0 -3px 5px; padding:.4em; + font-size:12px; font-weight:bold; background:#f8f8f8; color:#888; cursor:pointer; + border:1px solid #ddd; text-shadow:#eee 0 1px 0; + -moz-box-shadow:0 1px 1px #fff, 0 1px 1px #fff inset; -webkit-box-shadow:0 1px 1px #fff, 0 1px 1px #fff inset; +} +#login form #selectDbType label.ui-state-hover, #login form #selectDbType label.ui-state-active { color:#000; background-color:#e8e8e8; } + +fieldset.warning { + padding:8px; + color:#b94a48; background-color:#f2dede; border:1px solid #eed3d7; + border-radius:5px; +} +fieldset.warning legend { color:#b94a48 !important; } /* NAVIGATION ------------------------------------------------------------- */ @@ -120,15 +203,15 @@ label.infield { cursor: text !important; } /* VARIOUS REUSABLE SELECTORS */ .hidden { display:none; } -.bold { font-weight: bold; } -.center { text-align: center; } +.bold { font-weight:bold; } +.center { text-align:center; } #notification { z-index:101; background-color:#fc4; border:0; padding:0 .7em .3em; display:none; position:fixed; left:50%; top:0; -moz-border-radius-bottomleft:1em; -webkit-border-bottom-left-radius:1em; border-bottom-left-radius:1em; -moz-border-radius-bottomright:1em; -webkit-border-bottom-right-radius:1em; border-bottom-right-radius:1em; } #notification span { cursor:pointer; font-weight:bold; margin-left:1em; } tr .action, .selectedActions a { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; filter:alpha(opacity=0); opacity:0; -webkit-transition:opacity 200ms; -moz-transition:opacity 200ms; -o-transition:opacity 200ms; transition:opacity 200ms; } tr:hover .action, .selectedActions a { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=50)"; filter:alpha(opacity=50); opacity:.5; } -tr .action { width: 16px; height: 16px; } +tr .action { width:16px; height:16px; } .header-action { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=80)"; filter:alpha(opacity=80); opacity:.8; } tr:hover .action:hover, .selectedActions a:hover, .header-action:hover { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1; } @@ -137,58 +220,58 @@ tbody tr:hover, tr:active { background-color:#f8f8f8; } #body-settings .personalblock, #body-settings .helpblock { padding:.5em 1em; margin:1em; background:#f8f8f8; color:#555; text-shadow:#fff 0 1px 0; -moz-border-radius:.5em; -webkit-border-radius:.5em; border-radius:.5em; } #body-settings .personalblock#quota { position:relative; padding:0; } -#body-settings #controls+.helpblock { position:relative; margin-top: 3em; } +#body-settings #controls+.helpblock { position:relative; margin-top:3em; } .personalblock > legend { margin-top:2em; } -.personalblock > legend, th, dt, label { font-weight: bold; } -code { font-family: "Lucida Console", "Lucida Sans Typewriter", "DejaVu Sans Mono", monospace; } +.personalblock > legend, th, dt, label { font-weight:bold; } +code { font-family:"Lucida Console", "Lucida Sans Typewriter", "DejaVu Sans Mono", monospace; } #quota div, div.jp-play-bar, div.jp-seek-bar { padding:0; background:#e6e6e6; font-weight:normal; white-space:nowrap; -moz-border-radius-bottomleft:.4em; -webkit-border-bottom-left-radius:.4em; border-bottom-left-radius:.4em; -moz-border-radius-topleft:.4em; -webkit-border-top-left-radius:.4em; border-top-left-radius:.4em; } -#quotatext {padding: .6em 1em;} +#quotatext {padding:.6em 1em;} div.jp-play-bar, div.jp-seek-bar { padding:0; } .pager { list-style:none; float:right; display:inline; margin:.7em 13em 0 0; } .pager li { display:inline-block; } -li.error { width:640px; margin:4em auto; padding:1em 1em 1em 4em; background:#ffe .8em .8em no-repeat; color: #FF3B3B; border:1px solid #ccc; -moz-border-radius:10px; -webkit-border-radius:10px; border-radius:10px; } -.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { overflow: hidden; text-overflow: ellipsis; } -.hint { background-image: url('../img/actions/info.png'); background-repeat:no-repeat; color: #777777; padding-left: 25px; background-position: 0 0.3em;} -.separator { display: inline; border-left: 1px solid #d3d3d3; border-right: 1px solid #fff; height: 10px; width:0px; margin: 4px; } +li.error { width:640px; margin:4em auto; padding:1em 1em 1em 4em; background:#ffe .8em .8em no-repeat; color:#FF3B3B; border:1px solid #ccc; -moz-border-radius:10px; -webkit-border-radius:10px; border-radius:10px; } +.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { overflow:hidden; text-overflow:ellipsis; } +.hint { background-image:url('../img/actions/info.png'); background-repeat:no-repeat; color:#777777; padding-left:25px; background-position:0 0.3em;} +.separator { display:inline; border-left:1px solid #d3d3d3; border-right:1px solid #fff; height:10px; width:0px; margin:4px; } -a.bookmarklet { background-color: #ddd; border:1px solid #ccc; padding: 5px;padding-top: 0px;padding-bottom: 2px; text-decoration: none; margin-top: 5px } +a.bookmarklet { background-color:#ddd; border:1px solid #ccc; padding:5px;padding-top:0px;padding-bottom:2px; text-decoration:none; margin-top:5px } -.exception{color: #000000;} -.exception textarea{width:95%;height: 200px;background:#ffe;border:0;} +.exception{color:#000000;} +.exception textarea{width:95%;height:200px;background:#ffe;border:0;} -.ui-icon-circle-triangle-e{ background-image: url('../img/actions/play-next.svg'); } -.ui-icon-circle-triangle-w{ background-image: url('../img/actions/play-previous.svg'); } -.ui-datepicker-prev,.ui-datepicker-next{ border: 1px solid #ddd; background: #ffffff; } +.ui-icon-circle-triangle-e{ background-image:url('../img/actions/play-next.svg'); } +.ui-icon-circle-triangle-w{ background-image:url('../img/actions/play-previous.svg'); } +.ui-datepicker-prev,.ui-datepicker-next{ border:1px solid #ddd; background:#ffffff; } /* ---- DIALOGS ---- */ -#dirtree {width: 100%;} -#filelist {height: 270px; overflow:scroll; background-color: white; width: 100%;} -.filepicker_element_selected { background-color: lightblue;} -.filepicker_loader {height: 120px; width: 100%; background-color: #333; -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=30)"; filter:alpha(opacity=30); opacity:.3; visibility: visible; position:absolute; top:0; left:0; text-align:center; padding-top: 150px;} +#dirtree {width:100%;} +#filelist {height:270px; overflow:scroll; background-color:white; width:100%;} +.filepicker_element_selected { background-color:lightblue;} +.filepicker_loader {height:120px; width:100%; background-color:#333; -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=30)"; filter:alpha(opacity=30); opacity:.3; visibility:visible; position:absolute; top:0; left:0; text-align:center; padding-top:150px;} /* ---- CATEGORIES ---- */ -#categoryform .scrollarea { position: absolute; left: 10px; top: 10px; right: 10px; bottom: 50px; overflow: auto; border:1px solid #ddd; background: #f8f8f8; } -#categoryform .bottombuttons { position: absolute; bottom: 10px;} -#categoryform .bottombuttons * { float: left;} +#categoryform .scrollarea { position:absolute; left:10px; top:10px; right:10px; bottom:50px; overflow:auto; border:1px solid #ddd; background:#f8f8f8; } +#categoryform .bottombuttons { position:absolute; bottom:10px;} +#categoryform .bottombuttons * { float:left;} /*#categorylist { border:1px solid #ddd;}*/ #categorylist li { background:#f8f8f8; padding:.3em .8em; white-space:nowrap; overflow:hidden; text-overflow:ellipsis; -webkit-transition:background-color 500ms; -moz-transition:background-color 500ms; -o-transition:background-color 500ms; transition:background-color 500ms; } #categorylist li:hover, #categorylist li:active { background:#eee; } -#category_addinput { width: 10em; } +#category_addinput { width:10em; } /* ---- APP SETTINGS ---- */ -.popup { background-color: white; border-radius: 10px 10px 10px 10px; box-shadow: 0 0 20px #888888; color: #333333; padding: 10px; position: fixed !important; z-index: 200; } -.popup.topright { top: 7em; right: 1em; } -.popup.bottomleft { bottom: 1em; left: 33em; } -.popup .close { position:absolute; top: 0.2em; right:0.2em; height: 20px; width: 20px; background:url('../img/actions/delete.svg') no-repeat center; } -.popup h2 { font-weight: bold; font-size: 1.2em; } -.arrow { border-bottom: 10px solid white; border-left: 10px solid transparent; border-right: 10px solid transparent; display: block; height: 0; position: absolute; width: 0; z-index: 201; } -.arrow.left { left: -13px; bottom: 1.2em; -webkit-transform: rotate(270deg); -moz-transform: rotate(270deg); -o-transform: rotate(270deg); -ms-transform: rotate(270deg); transform: rotate(270deg); } -.arrow.up { top: -8px; right: 2em; } -.arrow.down { -webkit-transform: rotate(180deg); -moz-transform: rotate(180deg); -o-transform: rotate(180deg); -ms-transform: rotate(180deg); transform: rotate(180deg); } +.popup { background-color:white; border-radius:10px 10px 10px 10px; box-shadow:0 0 20px #888888; color:#333333; padding:10px; position:fixed !important; z-index:200; } +.popup.topright { top:7em; right:1em; } +.popup.bottomleft { bottom:1em; left:33em; } +.popup .close { position:absolute; top:0.2em; right:0.2em; height:20px; width:20px; background:url('../img/actions/delete.svg') no-repeat center; } +.popup h2 { font-weight:bold; font-size:1.2em; } +.arrow { border-bottom:10px solid white; border-left:10px solid transparent; border-right:10px solid transparent; display:block; height:0; position:absolute; width:0; z-index:201; } +.arrow.left { left:-13px; bottom:1.2em; -webkit-transform:rotate(270deg); -moz-transform:rotate(270deg); -o-transform:rotate(270deg); -ms-transform:rotate(270deg); transform:rotate(270deg); } +.arrow.up { top:-8px; right:2em; } +.arrow.down { -webkit-transform:rotate(180deg); -moz-transform:rotate(180deg); -o-transform:rotate(180deg); -ms-transform:rotate(180deg); transform:rotate(180deg); } /* ---- BREADCRUMB ---- */ div.crumb { float:left; display:block; background:url('../img/breadcrumb.svg') no-repeat right 0; padding:.75em 1.5em 0 1em; height:2.9em; } diff --git a/core/img/actions/password.png b/core/img/actions/password.png Binary files differnew file mode 100644 index 00000000000..5167161dfa9 --- /dev/null +++ b/core/img/actions/password.png diff --git a/core/img/actions/password.svg b/core/img/actions/password.svg new file mode 100644 index 00000000000..ee6a9fe0182 --- /dev/null +++ b/core/img/actions/password.svg @@ -0,0 +1,2148 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + version="1.0" + width="16" + height="16" + id="svg11300" + inkscape:version="0.48.3.1 r9886" + sodipodi:docname="password.svg" + inkscape:export-filename="password.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> + <metadata + id="metadata26"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title /> + </cc:Work> + </rdf:RDF> + </metadata> + <sodipodi:namedview + pagecolor="#cccccc" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1280" + inkscape:window-height="745" + id="namedview24" + showgrid="true" + showguides="true" + inkscape:guide-bbox="true" + inkscape:zoom="16.000001" + inkscape:cx="-1.1375545" + inkscape:cy="5.0070539" + inkscape:window-x="0" + inkscape:window-y="27" + inkscape:window-maximized="1" + inkscape:current-layer="g4146"> + <inkscape:grid + type="xygrid" + id="grid4330" + empspacing="5" + dotted="true" + visible="true" + enabled="true" + snapvisiblegridlinesonly="true" /> + </sodipodi:namedview> + <defs + id="defs3"> + <linearGradient + id="linearGradient4136"> + <stop + offset="0" + style="stop-color:#000000;stop-opacity:1;" + id="stop4138" /> + <stop + offset="1" + style="stop-color:#363636;stop-opacity:1" + id="stop4140" /> + </linearGradient> + <linearGradient + id="linearGradient4303"> + <stop + offset="0" + style="stop-color:#000000;stop-opacity:1" + id="stop4305" /> + <stop + offset="1" + style="stop-color:#363636;stop-opacity:1" + id="stop4307" /> + </linearGradient> + <linearGradient + id="linearGradient4297"> + <stop + id="stop4299" + style="stop-color:#000000;stop-opacity:1" + offset="0" /> + <stop + id="stop4301" + style="stop-color:#363636;stop-opacity:1" + offset="1" /> + </linearGradient> + <linearGradient + id="linearGradient4115"> + <stop + id="stop4117" + style="stop-color:#000000;stop-opacity:1" + offset="0" /> + <stop + id="stop4119" + style="stop-color:#363636;stop-opacity:0.698" + offset="1" /> + </linearGradient> + <linearGradient + id="linearGradient3785"> + <stop + id="stop3787" + style="stop-color:#b8b8b8;stop-opacity:1" + offset="0" /> + <stop + id="stop3789" + style="stop-color:#878787;stop-opacity:1" + offset="1" /> + </linearGradient> + <linearGradient + id="linearGradient6954"> + <stop + id="stop6960" + style="stop-color:#f5f5f5;stop-opacity:1" + offset="0" /> + <stop + id="stop6962" + style="stop-color:#d2d2d2;stop-opacity:1" + offset="1" /> + </linearGradient> + <linearGradient + id="linearGradient3341"> + <stop + id="stop3343" + style="stop-color:white;stop-opacity:1" + offset="0" /> + <stop + id="stop3345" + style="stop-color:white;stop-opacity:0" + offset="1" /> + </linearGradient> + <radialGradient + cx="24.999998" + cy="28.659998" + r="16" + fx="24.999998" + fy="28.659998" + id="radialGradient2856" + xlink:href="#linearGradient6954" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.56186795,0,0,0.15787922,-6.1682604,5.3385209)" /> + <linearGradient + x1="30" + y1="25.084745" + x2="30" + y2="45" + id="linearGradient2858" + xlink:href="#linearGradient3785" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.42808986,0,0,0.42296591,-2.823809,-3.2486024)" /> + <radialGradient + cx="26.375898" + cy="12.31301" + r="8" + fx="26.375898" + fy="12.31301" + id="radialGradient2860" + xlink:href="#linearGradient6954" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.55250164,-0.0426402,0.04315608,0.50971914,-6.3026675,-1.9765067)" /> + <linearGradient + x1="30" + y1="5" + x2="30" + y2="44.678879" + id="linearGradient2862" + xlink:href="#linearGradient3785" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.33685737,0,0,0.32161283,-0.10572085,-0.29529973)" /> + <linearGradient + x1="30" + y1="0.91818392" + x2="30" + y2="25.792814" + id="linearGradient2864" + xlink:href="#linearGradient3341" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.33685737,0,0,0.32161283,-0.10572085,-0.29529973)" /> + <linearGradient + x1="29.955881" + y1="21.86607" + x2="29.955881" + y2="43.144382" + id="linearGradient2866" + xlink:href="#linearGradient3341" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.42808986,0,0,0.42296591,-2.823809,-3.2486024)" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1" + id="linearGradient7308" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.54681372,0,0,0.39376081,3.7325729,-0.29182867)" + x1="34.992828" + y1="0.94087797" + x2="34.992828" + y2="33.955856" /> + <linearGradient + id="linearGradient3587-6-5-3-4-5-4-0-1"> + <stop + offset="0" + style="stop-color:#000000;stop-opacity:1" + id="stop3589-9-2-2-3-2-53-4-3" /> + <stop + offset="1" + style="stop-color:#363636;stop-opacity:1" + id="stop3591-7-4-73-7-9-86-9-3" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1" + id="linearGradient3796" + x1="8.3635759" + y1="15.028702" + x2="15.937561" + y2="11.00073" + gradientUnits="userSpaceOnUse" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1" + id="linearGradient3798" + x1="6.9951797" + y1="4.7478018" + x2="13.00482" + y2="4.7478018" + gradientUnits="userSpaceOnUse" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1" + id="linearGradient3815" + x1="209.34245" + y1="998.45801" + x2="209.34245" + y2="1013.451" + gradientUnits="userSpaceOnUse" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-5" + id="linearGradient3815-3" + x1="209.34245" + y1="998.45801" + x2="209.34245" + y2="1013.451" + gradientUnits="userSpaceOnUse" /> + <linearGradient + id="linearGradient3587-6-5-3-4-5-4-0-1-5"> + <stop + offset="0" + style="stop-color:#000000;stop-opacity:1" + id="stop3589-9-2-2-3-2-53-4-3-9" /> + <stop + offset="1" + style="stop-color:#363636;stop-opacity:1" + id="stop3591-7-4-73-7-9-86-9-3-0" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-5" + id="linearGradient3831" + x1="209.34245" + y1="998.45801" + x2="209.34245" + y2="1013.451" + gradientUnits="userSpaceOnUse" /> + <linearGradient + id="linearGradient3833"> + <stop + offset="0" + style="stop-color:#000000;stop-opacity:1" + id="stop3835" /> + <stop + offset="1" + style="stop-color:#363636;stop-opacity:1" + id="stop3837" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1" + id="linearGradient3874" + gradientUnits="userSpaceOnUse" + x1="209.34245" + y1="998.45801" + x2="209.34245" + y2="1013.451" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2" + id="linearGradient3892-2" + x1="8.7094374" + y1="1.0035814" + x2="8.6826077" + y2="16.052532" + gradientUnits="userSpaceOnUse" /> + <linearGradient + id="linearGradient3587-6-5-3-4-5-4-0-1-2"> + <stop + offset="0" + style="stop-color:#000000;stop-opacity:1" + id="stop3589-9-2-2-3-2-53-4-3-1" /> + <stop + offset="1" + style="stop-color:#363636;stop-opacity:1" + id="stop3591-7-4-73-7-9-86-9-3-4" /> + </linearGradient> + <linearGradient + gradientTransform="matrix(0.96967712,0,0,0.96967712,0.26437941,-0.96950812)" + y2="16.052532" + x2="8.6826077" + y1="1.0035814" + x1="8.7094374" + gradientUnits="userSpaceOnUse" + id="linearGradient3909" + xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2" + inkscape:collect="always" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1" + id="linearGradient3984" + gradientUnits="userSpaceOnUse" + x1="209.34245" + y1="998.45801" + x2="209.34245" + y2="1013.451" /> + <linearGradient + id="linearGradient3587-6-5-3-4-5-4-0-1-2-1"> + <stop + offset="0" + style="stop-color:#000000;stop-opacity:1" + id="stop3589-9-2-2-3-2-53-4-3-1-4" /> + <stop + offset="1" + style="stop-color:#363636;stop-opacity:1" + id="stop3591-7-4-73-7-9-86-9-3-4-6" /> + </linearGradient> + <linearGradient + gradientTransform="matrix(0.78786264,0,0,0.78786264,-1.5726929,-0.7389112)" + y2="16.052532" + x2="8.6826077" + y1="1.0035814" + x1="8.7094374" + gradientUnits="userSpaceOnUse" + id="linearGradient3909-3" + xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-2" + inkscape:collect="always" /> + <linearGradient + id="linearGradient3587-6-5-3-4-5-4-0-1-2-2"> + <stop + offset="0" + style="stop-color:#000000;stop-opacity:1" + id="stop3589-9-2-2-3-2-53-4-3-1-7" /> + <stop + offset="1" + style="stop-color:#363636;stop-opacity:1" + id="stop3591-7-4-73-7-9-86-9-3-4-5" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4115-9" + id="linearGradient4113-3" + x1="0.86849999" + y1="13.895414" + x2="0.44923753" + y2="28.776533" + gradientUnits="userSpaceOnUse" /> + <linearGradient + id="linearGradient4115-9"> + <stop + id="stop4117-5" + style="stop-color:#000000;stop-opacity:1" + offset="0" /> + <stop + id="stop4119-6" + style="stop-color:#363636;stop-opacity:0.698" + offset="1" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3104" + id="linearGradient3815-4" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.23426255,0,0,0.2859159,18.734419,0.35950872)" + x1="-51.786404" + y1="50.786446" + x2="-51.786404" + y2="2.9062471" /> + <linearGradient + id="linearGradient3104"> + <stop + id="stop3106" + style="stop-color:#aaaaaa;stop-opacity:1" + offset="0" /> + <stop + id="stop3108" + style="stop-color:#c8c8c8;stop-opacity:1" + offset="1" /> + </linearGradient> + <radialGradient + cx="13.138569" + cy="25.625349" + r="13.931416" + fx="13.138569" + fy="25.625349" + id="radialGradient2965" + xlink:href="#linearGradient3690-451" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0,0.92614711,-1.0546317,0,32.402583,-9.3345932)" /> + <linearGradient + id="linearGradient3690-451"> + <stop + id="stop2857" + style="stop-color:#e8e8e8;stop-opacity:1" + offset="0" /> + <stop + id="stop2859" + style="stop-color:#d8d8d8;stop-opacity:1" + offset="0.26238" /> + <stop + id="stop2861" + style="stop-color:#c2c2c2;stop-opacity:1" + offset="0.66093999" /> + <stop + id="stop2863" + style="stop-color:#a5a5a5;stop-opacity:1" + offset="1" /> + </linearGradient> + <linearGradient + x1="21.483376" + y1="36.255058" + x2="21.483376" + y2="9.5799999" + id="linearGradient2967" + xlink:href="#linearGradient3603-84" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762279)" /> + <linearGradient + id="linearGradient3603-84"> + <stop + id="stop2867" + style="stop-color:#707070;stop-opacity:1" + offset="0" /> + <stop + id="stop2869" + style="stop-color:#9e9e9e;stop-opacity:1" + offset="1" /> + </linearGradient> + <linearGradient + x1="11.566265" + y1="22.292103" + x2="15.214532" + y2="33.95525" + id="linearGradient3674-262" + xlink:href="#linearGradient8265-821-176-38-919-66-249-529" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.4893617,0,0,0.4893617,1.7131795,22.728095)" /> + <linearGradient + id="linearGradient8265-821-176-38-919-66-249-529"> + <stop + id="stop2873" + style="stop-color:#ffffff;stop-opacity:0.27450982" + offset="0" /> + <stop + id="stop2875" + style="stop-color:#ffffff;stop-opacity:0" + offset="1" /> + </linearGradient> + <linearGradient + x1="24.046366" + y1="11.673002" + x2="24.046366" + y2="34.713669" + id="linearGradient3677-116" + xlink:href="#linearGradient3642-81" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762276)" /> + <linearGradient + id="linearGradient3642-81"> + <stop + id="stop2879" + style="stop-color:#ffffff;stop-opacity:1" + offset="0" /> + <stop + id="stop2881" + style="stop-color:#ffffff;stop-opacity:0" + offset="1" /> + </linearGradient> + <linearGradient + y2="34.713669" + x2="24.046366" + y1="11.673002" + x1="24.046366" + gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762276)" + gradientUnits="userSpaceOnUse" + id="linearGradient3037" + xlink:href="#linearGradient3642-81" + inkscape:collect="always" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3155-40" + id="linearGradient8639" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.415777,-0.4174938,0.518983,0.5146192,-15.747227,2.6503673)" + spreadMethod="pad" + x1="23.575972" + y1="25.356892" + x2="23.575972" + y2="31.210939" /> + <linearGradient + id="linearGradient3155-40"> + <stop + id="stop2541" + offset="0" + style="stop-color:#181818;stop-opacity:1;" /> + <stop + style="stop-color:#dbdbdb;stop-opacity:1;" + offset="0.13482948" + id="stop2543" /> + <stop + id="stop2545" + offset="0.20224422" + style="stop-color:#a4a4a4;stop-opacity:1;" /> + <stop + style="stop-color:#ffffff;stop-opacity:1;" + offset="0.26965895" + id="stop2547" /> + <stop + id="stop2549" + offset="0.44650277" + style="stop-color:#8d8d8d;stop-opacity:1;" /> + <stop + style="stop-color:#959595;stop-opacity:1;" + offset="0.57114136" + id="stop2551" /> + <stop + id="stop2553" + offset="0.72038066" + style="stop-color:#cecece;stop-opacity:1;" /> + <stop + id="stop2555" + offset="1" + style="stop-color:#181818;stop-opacity:1;" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3240-279" + id="linearGradient8641" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.867764,0.6930272)" + x1="30.037716" + y1="24.989594" + x2="30.037716" + y2="30.000141" /> + <linearGradient + id="linearGradient3240-279"> + <stop + style="stop-color:#565656;stop-opacity:1;" + offset="0" + id="stop2559" /> + <stop + id="stop2561" + offset="0.5" + style="stop-color:#9a9a9a;stop-opacity:1;" /> + <stop + style="stop-color:#545454;stop-opacity:1;" + offset="1" + id="stop2563" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3223-789" + id="linearGradient8643" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.983472,0.8092126)" + x1="30.037716" + y1="24.989594" + x2="30.037716" + y2="30.000141" /> + <linearGradient + id="linearGradient3223-789"> + <stop + id="stop2567" + offset="0" + style="stop-color:#b1b1b1;stop-opacity:1;" /> + <stop + style="stop-color:#ffffff;stop-opacity:1;" + offset="0.5" + id="stop2569" /> + <stop + id="stop2571" + offset="1" + style="stop-color:#8f8f8f;stop-opacity:1;" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3240-686" + id="linearGradient8645" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.465684,0.2892868)" + x1="30.037716" + y1="24.989594" + x2="30.037716" + y2="30.000141" /> + <linearGradient + id="linearGradient3240-686"> + <stop + style="stop-color:#565656;stop-opacity:1;" + offset="0" + id="stop2575" /> + <stop + id="stop2577" + offset="0.5" + style="stop-color:#9a9a9a;stop-opacity:1;" /> + <stop + style="stop-color:#545454;stop-opacity:1;" + offset="1" + id="stop2579" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3223-768" + id="linearGradient8647" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.581392,0.4054707)" + x1="30.037716" + y1="24.989594" + x2="30.037716" + y2="30.000141" /> + <linearGradient + id="linearGradient3223-768"> + <stop + id="stop2583" + offset="0" + style="stop-color:#b1b1b1;stop-opacity:1;" /> + <stop + style="stop-color:#ffffff;stop-opacity:1;" + offset="0.5" + id="stop2585" /> + <stop + id="stop2587" + offset="1" + style="stop-color:#8f8f8f;stop-opacity:1;" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3240-907" + id="linearGradient8649" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.061661,-0.1164056)" + x1="30.037716" + y1="24.989594" + x2="30.037716" + y2="30.000141" /> + <linearGradient + id="linearGradient3240-907"> + <stop + style="stop-color:#565656;stop-opacity:1;" + offset="0" + id="stop2591" /> + <stop + id="stop2593" + offset="0.5" + style="stop-color:#9a9a9a;stop-opacity:1;" /> + <stop + style="stop-color:#545454;stop-opacity:1;" + offset="1" + id="stop2595" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3223-699" + id="linearGradient8651" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.177369,-2.1969969e-4)" + x1="30.037716" + y1="24.989594" + x2="30.037716" + y2="30.000141" /> + <linearGradient + id="linearGradient3223-699"> + <stop + id="stop2599" + offset="0" + style="stop-color:#b1b1b1;stop-opacity:1;" /> + <stop + style="stop-color:#ffffff;stop-opacity:1;" + offset="0.5" + id="stop2601" /> + <stop + id="stop2603" + offset="1" + style="stop-color:#8f8f8f;stop-opacity:1;" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3290-678" + id="linearGradient8653" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.602268,-17.636692,0.462492)" + x1="9" + y1="29.056757" + x2="9" + y2="26.02973" /> + <linearGradient + id="linearGradient3290-678"> + <stop + id="stop2607" + offset="0" + style="stop-color:#ece5a5;stop-opacity:1;" /> + <stop + id="stop2609" + offset="1" + style="stop-color:#fcfbf2;stop-opacity:1;" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3191-577" + id="linearGradient8655" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.3763801,0.03615261,0.03669995,0.374874,-2.2182805,-1.1331002)" + x1="5.5178981" + y1="37.371799" + x2="9.5220556" + y2="41.391716" /> + <linearGradient + id="linearGradient3191-577"> + <stop + id="stop2613" + offset="0" + style="stop-color:#dbce48;stop-opacity:1;" /> + <stop + id="stop2615" + offset="1" + style="stop-color:#c5b625;stop-opacity:1;" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-1-0" + id="linearGradient3934-0" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)" + x1="8.7094374" + y1="1.0035814" + x2="8.6826077" + y2="16.052532" /> + <linearGradient + id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0"> + <stop + offset="0" + style="stop-color:#000000;stop-opacity:1" + id="stop3589-9-2-2-3-2-53-4-3-1-4-9" /> + <stop + offset="1" + style="stop-color:#363636;stop-opacity:1" + id="stop3591-7-4-73-7-9-86-9-3-4-6-0" /> + </linearGradient> + <linearGradient + y2="16.052532" + x2="8.6826077" + y1="1.0035814" + x1="8.7094374" + gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)" + gradientUnits="userSpaceOnUse" + id="linearGradient4154-8" + xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9" + inkscape:collect="always" /> + <linearGradient + id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9"> + <stop + offset="0" + style="stop-color:#000000;stop-opacity:1" + id="stop3589-9-2-2-3-2-53-4-3-1-4-9-8" /> + <stop + offset="1" + style="stop-color:#363636;stop-opacity:1" + id="stop3591-7-4-73-7-9-86-9-3-4-6-0-4" /> + </linearGradient> + <linearGradient + id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9-0"> + <stop + offset="0" + style="stop-color:#000000;stop-opacity:1" + id="stop3589-9-2-2-3-2-53-4-3-1-4-9-8-3" /> + <stop + offset="1" + style="stop-color:#363636;stop-opacity:1" + id="stop3591-7-4-73-7-9-86-9-3-4-6-0-4-8" /> + </linearGradient> + <linearGradient + id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-3"> + <stop + offset="0" + style="stop-color:#000000;stop-opacity:1" + id="stop3589-9-2-2-3-2-53-4-3-1-4-9-3" /> + <stop + offset="1" + style="stop-color:#363636;stop-opacity:1" + id="stop3591-7-4-73-7-9-86-9-3-4-6-0-6" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5" + id="linearGradient4326" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.6858824,0,0,0.68591053,-5.3691237,-18.974705)" + x1="14.501121" + y1="-1.4095211" + x2="14.152531" + y2="20.074369" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5" + id="linearGradient4328" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)" + x1="8.7094374" + y1="1.0035814" + x2="8.6826077" + y2="16.052532" /> + <linearGradient + x1="-2.4040222" + y1="4.4573336" + x2="-2.4040222" + y2="18.967093" + id="linearGradient3878" + xlink:href="#linearGradient3587-6-5" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(13.927091,-3.4266134)" /> + <linearGradient + id="linearGradient3587-6-5"> + <stop + id="stop3589-9-2" + style="stop-color:#000000;stop-opacity:1" + offset="0" /> + <stop + id="stop3591-7-4" + style="stop-color:#363636;stop-opacity:1" + offset="1" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5" + id="linearGradient4357" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.0344828,0,0,1.0344828,8.0707628,-14.513825)" + x1="0.86849999" + y1="13.895414" + x2="0.44923753" + y2="28.776533" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1" + id="linearGradient4405" + gradientUnits="userSpaceOnUse" + x1="209.34245" + y1="998.45801" + x2="209.34245" + y2="1013.451" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55" + id="linearGradient4413-7" + gradientUnits="userSpaceOnUse" + x1="209.34245" + y1="998.45801" + x2="209.34245" + y2="1013.451" /> + <linearGradient + id="linearGradient3587-6-5-3-4-5-4-0-1-55"> + <stop + offset="0" + style="stop-color:#000000;stop-opacity:1" + id="stop3589-9-2-2-3-2-53-4-3-95" /> + <stop + offset="1" + style="stop-color:#363636;stop-opacity:1" + id="stop3591-7-4-73-7-9-86-9-3-6" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-2" + id="linearGradient4411-3" + gradientUnits="userSpaceOnUse" + x1="209.34245" + y1="998.45801" + x2="209.34245" + y2="1013.451" /> + <linearGradient + id="linearGradient3587-6-5-2"> + <stop + id="stop3589-9-2-8" + style="stop-color:#000000;stop-opacity:1" + offset="0" /> + <stop + id="stop3591-7-4-0" + style="stop-color:#363636;stop-opacity:1" + offset="1" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-2-4" + id="linearGradient4466-9" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.23426255,0,0,0.2859159,18.734419,60.359508)" + x1="-41.553459" + y1="2.2401412" + x2="-41.553459" + y2="54.703121" /> + <linearGradient + id="linearGradient3587-6-5-2-4"> + <stop + id="stop3589-9-2-8-7" + style="stop-color:#000000;stop-opacity:1;" + offset="0" /> + <stop + id="stop3591-7-4-0-3" + style="stop-color:#363636;stop-opacity:1" + offset="1" /> + </linearGradient> + <linearGradient + y2="54.703121" + x2="-41.553459" + y1="2.2401412" + x1="-41.553459" + gradientTransform="matrix(0.21864454,0,0,0.26685422,17.618755,60.402242)" + gradientUnits="userSpaceOnUse" + id="linearGradient4483-3" + xlink:href="#linearGradient3587-6-5-2-4-9" + inkscape:collect="always" /> + <linearGradient + id="linearGradient3587-6-5-2-4-9"> + <stop + id="stop3589-9-2-8-7-2" + style="stop-color:#000000;stop-opacity:1" + offset="0" /> + <stop + id="stop3591-7-4-0-3-8" + style="stop-color:#363636;stop-opacity:1" + offset="1" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55" + id="linearGradient4564" + gradientUnits="userSpaceOnUse" + x1="209.34245" + y1="998.45801" + x2="209.34245" + y2="1013.451" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5" + id="linearGradient4566" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(13.927091,16.573387)" + x1="-2.4040222" + y1="4.4573336" + x2="-2.4040222" + y2="18.967093" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-2" + id="linearGradient4578" + gradientUnits="userSpaceOnUse" + x1="209.34245" + y1="998.45801" + x2="209.34245" + y2="1013.451" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55" + id="linearGradient4580" + gradientUnits="userSpaceOnUse" + x1="209.34245" + y1="998.45801" + x2="209.34245" + y2="1013.451" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-3" + id="linearGradient4359-4" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.99998838,0,0,0.99998838,29.038238,-21.358617)" + x1="8.7094374" + y1="1.0035814" + x2="8.6826077" + y2="16.052532" /> + <linearGradient + id="linearGradient3587-6-5-3"> + <stop + id="stop3589-9-2-6" + style="stop-color:#000000;stop-opacity:1" + offset="0" /> + <stop + id="stop3591-7-4-5" + style="stop-color:#363636;stop-opacity:1" + offset="1" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-3" + id="linearGradient4361-4" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.6858824,0,0,0.68591053,25.66524,-19.333318)" + x1="8.7094374" + y1="1.0035814" + x2="8.6826077" + y2="16.052532" /> + <linearGradient + id="linearGradient4597"> + <stop + id="stop4599" + style="stop-color:#000000;stop-opacity:1" + offset="0" /> + <stop + id="stop4601" + style="stop-color:#363636;stop-opacity:1" + offset="1" /> + </linearGradient> + <linearGradient + y2="16.052532" + x2="8.6826077" + y1="1.0035814" + x1="8.7094374" + gradientTransform="matrix(0.6858824,0,0,0.68591053,25.66524,-19.333318)" + gradientUnits="userSpaceOnUse" + id="linearGradient4610" + xlink:href="#linearGradient3587-6-5-3" + inkscape:collect="always" /> + <linearGradient + x1="1.3333321" + y1="6.6666665" + x2="1.3333321" + y2="33.333332" + id="linearGradient2422" + xlink:href="#linearGradient3587-6-5-5" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.4090909,0,0,0.375,7.4545459,0.5)" /> + <linearGradient + id="linearGradient3587-6-5-5"> + <stop + id="stop3589-9-2-4" + style="stop-color:#000000;stop-opacity:1" + offset="0" /> + <stop + id="stop3591-7-4-3" + style="stop-color:#363636;stop-opacity:1" + offset="1" /> + </linearGradient> + <linearGradient + x1="26.045763" + y1="9.6223383" + x2="26.045763" + y2="19.490837" + id="linearGradient3189" + xlink:href="#linearGradient3587-6-5-8" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)" /> + <linearGradient + id="linearGradient3587-6-5-8"> + <stop + id="stop3589-9-2-67" + style="stop-color:#000000;stop-opacity:1" + offset="0" /> + <stop + id="stop3591-7-4-2" + style="stop-color:#363636;stop-opacity:1" + offset="1" /> + </linearGradient> + <linearGradient + x1="26.045763" + y1="9.6223383" + x2="26.045763" + y2="19.490837" + id="linearGradient3203" + xlink:href="#linearGradient3587-6-5-8" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)" /> + <linearGradient + id="linearGradient3120"> + <stop + id="stop3122" + style="stop-color:#000000;stop-opacity:1" + offset="0" /> + <stop + id="stop3124" + style="stop-color:#363636;stop-opacity:1" + offset="1" /> + </linearGradient> + <linearGradient + x1="26.045763" + y1="9.6223383" + x2="26.045763" + y2="19.490837" + id="linearGradient3207" + xlink:href="#linearGradient3587-6-5-8" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)" /> + <linearGradient + id="linearGradient3127"> + <stop + id="stop3129" + style="stop-color:#000000;stop-opacity:1" + offset="0" /> + <stop + id="stop3131" + style="stop-color:#363636;stop-opacity:1" + offset="1" /> + </linearGradient> + <linearGradient + x1="26.045763" + y1="9.6223383" + x2="26.045763" + y2="19.490837" + id="linearGradient3211" + xlink:href="#linearGradient3587-6-5-8" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)" /> + <linearGradient + id="linearGradient3134"> + <stop + id="stop3136" + style="stop-color:#000000;stop-opacity:1" + offset="0" /> + <stop + id="stop3138" + style="stop-color:#363636;stop-opacity:1" + offset="1" /> + </linearGradient> + <linearGradient + x1="11" + y1="6" + x2="11" + y2="17" + id="linearGradient2409" + xlink:href="#linearGradient3587-6-5-1" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.2403101,0,0,0.8988764,10.387597,0.2247191)" /> + <linearGradient + id="linearGradient3587-6-5-1"> + <stop + id="stop3589-9-2-0" + style="stop-color:#000000;stop-opacity:1" + offset="0" /> + <stop + id="stop3591-7-4-21" + style="stop-color:#363636;stop-opacity:1" + offset="1" /> + </linearGradient> + <linearGradient + x1="40.805084" + y1="5.6271191" + x2="40.805084" + y2="17.627119" + id="linearGradient3206" + xlink:href="#linearGradient3587-8-5" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(-32.805085,-3.6271193)" /> + <linearGradient + id="linearGradient3587-8-5"> + <stop + id="stop3589-2-7" + style="stop-color:#000000;stop-opacity:1" + offset="0" /> + <stop + id="stop3591-3-5" + style="stop-color:#363636;stop-opacity:1" + offset="1" /> + </linearGradient> + <linearGradient + y2="17.627119" + x2="40.805084" + y1="5.6271191" + x1="40.805084" + gradientTransform="translate(-32.805085,-3.6271193)" + gradientUnits="userSpaceOnUse" + id="linearGradient3180" + xlink:href="#linearGradient3587-8-5" + inkscape:collect="always" /> + <linearGradient + x1="1.3333321" + y1="6.6666665" + x2="1.3333321" + y2="33.333332" + id="linearGradient2422-1" + xlink:href="#linearGradient3587-6-5-86" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.2727273,0,0,0.375,9.636365,1.5)" /> + <linearGradient + id="linearGradient3587-6-5-86"> + <stop + id="stop3589-9-2-65" + style="stop-color:#000000;stop-opacity:1" + offset="0" /> + <stop + id="stop3591-7-4-9" + style="stop-color:#363636;stop-opacity:1" + offset="1" /> + </linearGradient> + <linearGradient + x1="11" + y1="6" + x2="11" + y2="17" + id="linearGradient2427" + xlink:href="#linearGradient3587-6-5-86" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,1.5842703)" /> + <linearGradient + id="linearGradient3207-3"> + <stop + id="stop3209" + style="stop-color:#000000;stop-opacity:1" + offset="0" /> + <stop + id="stop3211" + style="stop-color:#363636;stop-opacity:1" + offset="1" /> + </linearGradient> + <linearGradient + x1="11" + y1="6" + x2="11" + y2="17" + id="linearGradient2436" + xlink:href="#linearGradient3587-6-5-86" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,9.58427)" /> + <linearGradient + id="linearGradient3214"> + <stop + id="stop3216" + style="stop-color:#000000;stop-opacity:1" + offset="0" /> + <stop + id="stop3218" + style="stop-color:#363636;stop-opacity:1" + offset="1" /> + </linearGradient> + <linearGradient + x1="11" + y1="6" + x2="11" + y2="17" + id="linearGradient2442" + xlink:href="#linearGradient3587-6-5-86" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,5.5842706)" /> + <linearGradient + id="linearGradient3221"> + <stop + id="stop3223" + style="stop-color:#000000;stop-opacity:1" + offset="0" /> + <stop + id="stop3225" + style="stop-color:#363636;stop-opacity:1" + offset="1" /> + </linearGradient> + <linearGradient + x1="1.3333321" + y1="4.9755898" + x2="1.3333321" + y2="37.373981" + id="linearGradient2422-1-0" + xlink:href="#linearGradient3587-6-5-0" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.39871888,0,0,0.3091132,71.812715,15.470662)" /> + <linearGradient + id="linearGradient3587-6-5-0"> + <stop + id="stop3589-9-2-5" + style="stop-color:#000000;stop-opacity:1" + offset="0" /> + <stop + id="stop3591-7-4-1" + style="stop-color:#363636;stop-opacity:1" + offset="1" /> + </linearGradient> + <linearGradient + x1="46.395508" + y1="12.707516" + x2="46.395508" + y2="38.409042" + id="linearGradient3795-2" + xlink:href="#linearGradient3587-6-5-3-5-7" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(-0.4100229,0,0,0.5447147,28.02322,-5.9219706)" /> + <linearGradient + id="linearGradient3587-6-5-3-5-7"> + <stop + id="stop3589-9-2-2-6-2" + style="stop-color:#000000;stop-opacity:1" + offset="0" /> + <stop + id="stop3591-7-4-73-5-1" + style="stop-color:#363636;stop-opacity:1" + offset="1" /> + </linearGradient> + <linearGradient + id="linearGradient3587-6-5-3-5"> + <stop + offset="0" + style="stop-color:#000000;stop-opacity:1" + id="stop3589-9-2-2-6" /> + <stop + offset="1" + style="stop-color:#363636;stop-opacity:1" + id="stop3591-7-4-73-5" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-3-5" + id="linearGradient4872" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(-0.4100229,0,0,0.5447147,19.329265,-26.729116)" + x1="100.77747" + y1="17.859186" + x2="100.77747" + y2="38.055252" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-8" + id="linearGradient4894" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)" + x1="26.045763" + y1="9.6223383" + x2="26.045763" + y2="19.490837" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-8" + id="linearGradient4900" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)" + x1="26.045763" + y1="9.6223383" + x2="26.045763" + y2="19.490837" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-8" + id="linearGradient4906" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)" + x1="26.045763" + y1="9.6223383" + x2="26.045763" + y2="19.490837" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-8" + id="linearGradient4912" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)" + x1="26.045763" + y1="9.6223383" + x2="26.045763" + y2="19.490837" /> + <linearGradient + id="linearGradient3587-6-5-8-6"> + <stop + id="stop3589-9-2-67-3" + style="stop-color:#000000;stop-opacity:1" + offset="0" /> + <stop + id="stop3591-7-4-2-3" + style="stop-color:#363636;stop-opacity:1" + offset="1" /> + </linearGradient> + <linearGradient + id="linearGradient4935"> + <stop + id="stop4937" + style="stop-color:#000000;stop-opacity:1" + offset="0" /> + <stop + id="stop4939" + style="stop-color:#363636;stop-opacity:1" + offset="1" /> + </linearGradient> + <linearGradient + id="linearGradient4942"> + <stop + id="stop4944" + style="stop-color:#000000;stop-opacity:1" + offset="0" /> + <stop + id="stop4946" + style="stop-color:#363636;stop-opacity:1" + offset="1" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-8-6" + id="linearGradient4912-4" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)" + x1="26.045763" + y1="9.6223383" + x2="26.045763" + y2="19.490837" /> + <linearGradient + id="linearGradient4949"> + <stop + id="stop4951" + style="stop-color:#000000;stop-opacity:1" + offset="0" /> + <stop + id="stop4953" + style="stop-color:#363636;stop-opacity:1" + offset="1" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-8" + id="linearGradient5012" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)" + x1="26.045763" + y1="9.6223383" + x2="26.045763" + y2="19.490837" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-8" + id="linearGradient5015" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)" + x1="26.045763" + y1="9.6223383" + x2="26.045763" + y2="19.490837" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-8" + id="linearGradient5018" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)" + x1="26.045763" + y1="9.6223383" + x2="26.045763" + y2="19.490837" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-8" + id="linearGradient5021" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)" + x1="26.045763" + y1="9.6223383" + x2="26.045763" + y2="19.490837" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-2-4" + id="linearGradient3335" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.21864454,0,0,0.26685422,18.618755,-19.597758)" + x1="-41.553459" + y1="2.2401412" + x2="-41.553459" + y2="54.703121" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4136" + id="linearGradient4134" + x1="9" + y1="0" + x2="9" + y2="15" + gradientUnits="userSpaceOnUse" + spreadMethod="pad" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4136" + id="linearGradient4150" + gradientUnits="userSpaceOnUse" + spreadMethod="pad" + x1="9" + y1="0" + x2="9" + y2="15" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-2-4-6" + id="linearGradient3335-7" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.2186487,0,0,0.26685422,76.619476,1.402242)" + x1="-41.553459" + y1="2.2401412" + x2="-41.755585" + y2="47.208389" /> + <linearGradient + id="linearGradient3587-6-5-2-4-6"> + <stop + id="stop3589-9-2-8-7-8" + style="stop-color:#000000;stop-opacity:1;" + offset="0" /> + <stop + id="stop3591-7-4-0-3-4" + style="stop-color:#363636;stop-opacity:1" + offset="1" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-2-4-6-0" + id="linearGradient3335-7-8" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,0.402242)" + x1="-41.553459" + y1="2.2401412" + x2="-41.553459" + y2="54.703121" /> + <linearGradient + id="linearGradient3587-6-5-2-4-6-0"> + <stop + id="stop3589-9-2-8-7-8-7" + style="stop-color:#000000;stop-opacity:1;" + offset="0" /> + <stop + id="stop3591-7-4-0-3-4-7" + style="stop-color:#363636;stop-opacity:1" + offset="1" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-2-4-6-4" + id="linearGradient3335-7-7" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,0.402242)" + x1="-41.553459" + y1="2.2401412" + x2="-41.553459" + y2="54.703121" /> + <linearGradient + id="linearGradient3587-6-5-2-4-6-4"> + <stop + id="stop3589-9-2-8-7-8-2" + style="stop-color:#000000;stop-opacity:1;" + offset="0" /> + <stop + id="stop3591-7-4-0-3-4-2" + style="stop-color:#363636;stop-opacity:1" + offset="1" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-2-4-6-7" + id="linearGradient3335-7-3" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,1.402242)" + x1="-41.553459" + y1="2.2401412" + x2="-41.755585" + y2="47.208389" /> + <linearGradient + id="linearGradient3587-6-5-2-4-6-7"> + <stop + id="stop3589-9-2-8-7-8-4" + style="stop-color:#000000;stop-opacity:1;" + offset="0" /> + <stop + id="stop3591-7-4-0-3-4-5" + style="stop-color:#363636;stop-opacity:1" + offset="1" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-2-4-6-2" + id="linearGradient3335-7-1" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.2186487,0,0,0.26685422,56.619476,1.4022422)" + x1="-39.421574" + y1="-5.2547116" + x2="-39.421574" + y2="47.208389" /> + <linearGradient + id="linearGradient3587-6-5-2-4-6-2"> + <stop + id="stop3589-9-2-8-7-8-77" + style="stop-color:#000000;stop-opacity:1;" + offset="0" /> + <stop + id="stop3591-7-4-0-3-4-9" + style="stop-color:#363636;stop-opacity:1" + offset="1" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4136-9" + id="linearGradient4150-0" + gradientUnits="userSpaceOnUse" + spreadMethod="pad" + x1="9" + y1="0" + x2="9" + y2="15" /> + <linearGradient + id="linearGradient4136-9"> + <stop + offset="0" + style="stop-color:#000000;stop-opacity:1;" + id="stop4138-6" /> + <stop + offset="1" + style="stop-color:#363636;stop-opacity:1" + id="stop4140-3" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-2-4-6-2-6" + id="linearGradient3335-7-1-7" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.2186487,0,0,0.26685422,56.619476,1.4022422)" + x1="-39.421574" + y1="-5.2547116" + x2="-39.421574" + y2="47.208389" /> + <linearGradient + id="linearGradient3587-6-5-2-4-6-2-6"> + <stop + id="stop3589-9-2-8-7-8-77-4" + style="stop-color:#000000;stop-opacity:1;" + offset="0" /> + <stop + id="stop3591-7-4-0-3-4-9-3" + style="stop-color:#363636;stop-opacity:1" + offset="1" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-10" + id="linearGradient4328-1" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)" + x1="8.7094374" + y1="1.0035814" + x2="8.6826077" + y2="16.052532" /> + <linearGradient + id="linearGradient3587-6-5-10"> + <stop + id="stop3589-9-2-3" + style="stop-color:#000000;stop-opacity:1" + offset="0" /> + <stop + id="stop3591-7-4-4" + style="stop-color:#363636;stop-opacity:1" + offset="1" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-19" + id="linearGradient4326-9" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.6858824,0,0,0.68591053,-5.3691237,-18.974705)" + x1="14.501121" + y1="-1.4095211" + x2="14.152531" + y2="20.074369" /> + <linearGradient + id="linearGradient3587-6-5-19"> + <stop + id="stop3589-9-2-62" + style="stop-color:#000000;stop-opacity:1" + offset="0" /> + <stop + id="stop3591-7-4-54" + style="stop-color:#363636;stop-opacity:1" + offset="1" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-4" + id="linearGradient4357-0" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.0344828,0,0,1.0344828,8.0707628,-14.513825)" + x1="0.86849999" + y1="13.895414" + x2="0.44923753" + y2="28.776533" /> + <linearGradient + id="linearGradient3587-6-5-4"> + <stop + id="stop3589-9-2-1" + style="stop-color:#000000;stop-opacity:1" + offset="0" /> + <stop + id="stop3591-7-4-04" + style="stop-color:#363636;stop-opacity:1" + offset="1" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-26" + id="linearGradient4566-7" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(13.927091,16.573387)" + x1="-2.4040222" + y1="4.4573336" + x2="-2.4040222" + y2="18.967093" /> + <linearGradient + id="linearGradient3587-6-5-26"> + <stop + id="stop3589-9-2-45" + style="stop-color:#000000;stop-opacity:1" + offset="0" /> + <stop + id="stop3591-7-4-20" + style="stop-color:#363636;stop-opacity:1" + offset="1" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55-2" + id="linearGradient4580-3" + gradientUnits="userSpaceOnUse" + x1="209.34245" + y1="998.45801" + x2="209.34245" + y2="1013.451" /> + <linearGradient + id="linearGradient3587-6-5-3-4-5-4-0-1-55-2"> + <stop + offset="0" + style="stop-color:#000000;stop-opacity:1" + id="stop3589-9-2-2-3-2-53-4-3-95-4" /> + <stop + offset="1" + style="stop-color:#363636;stop-opacity:1" + id="stop3591-7-4-73-7-9-86-9-3-6-3" /> + </linearGradient> + <linearGradient + id="linearGradient3587-6-5-2-1"> + <stop + id="stop3589-9-2-8-2" + style="stop-color:#000000;stop-opacity:1" + offset="0" /> + <stop + id="stop3591-7-4-0-2" + style="stop-color:#363636;stop-opacity:1" + offset="1" /> + </linearGradient> + <linearGradient + y2="1013.451" + x2="209.34245" + y1="998.45801" + x1="209.34245" + gradientUnits="userSpaceOnUse" + id="linearGradient3528" + xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55-2" + inkscape:collect="always" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-2-4-4" + id="linearGradient3335-2" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.21864454,0,0,0.26685422,18.618755,-19.597758)" + x1="-41.553459" + y1="2.2401412" + x2="-41.553459" + y2="54.703121" /> + <linearGradient + id="linearGradient3587-6-5-2-4-4"> + <stop + id="stop3589-9-2-8-7-7" + style="stop-color:#000000;stop-opacity:1;" + offset="0" /> + <stop + id="stop3591-7-4-0-3-6" + style="stop-color:#363636;stop-opacity:1" + offset="1" /> + </linearGradient> + <linearGradient + y2="54.703121" + x2="-41.553459" + y1="2.2401412" + x1="-41.553459" + gradientTransform="matrix(0.21864454,0,0,0.26685422,18.618755,-19.597758)" + gradientUnits="userSpaceOnUse" + id="linearGradient3567" + xlink:href="#linearGradient3587-6-5-2-4-4" + inkscape:collect="always" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-8-3" + id="linearGradient5021-0" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)" + x1="26.045763" + y1="9.6223383" + x2="26.045763" + y2="19.490837" /> + <linearGradient + id="linearGradient3587-6-5-8-3"> + <stop + id="stop3589-9-2-67-4" + style="stop-color:#000000;stop-opacity:1" + offset="0" /> + <stop + id="stop3591-7-4-2-9" + style="stop-color:#363636;stop-opacity:1" + offset="1" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-8-3" + id="linearGradient5018-2" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)" + x1="26.045763" + y1="9.6223383" + x2="26.045763" + y2="19.490837" /> + <linearGradient + id="linearGradient3584"> + <stop + id="stop3586" + style="stop-color:#000000;stop-opacity:1" + offset="0" /> + <stop + id="stop3588" + style="stop-color:#363636;stop-opacity:1" + offset="1" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-8-3" + id="linearGradient5015-7" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)" + x1="26.045763" + y1="9.6223383" + x2="26.045763" + y2="19.490837" /> + <linearGradient + id="linearGradient3591"> + <stop + id="stop3593" + style="stop-color:#000000;stop-opacity:1" + offset="0" /> + <stop + id="stop3595" + style="stop-color:#363636;stop-opacity:1" + offset="1" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-8-3" + id="linearGradient5012-4" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)" + x1="26.045763" + y1="9.6223383" + x2="26.045763" + y2="19.490837" /> + <linearGradient + id="linearGradient3598"> + <stop + id="stop3600" + style="stop-color:#000000;stop-opacity:1" + offset="0" /> + <stop + id="stop3602" + style="stop-color:#363636;stop-opacity:1" + offset="1" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-8-3" + id="linearGradient4638" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)" + x1="26.045763" + y1="9.6223383" + x2="26.045763" + y2="19.490837" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-8-3" + id="linearGradient4640" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)" + x1="26.045763" + y1="9.6223383" + x2="26.045763" + y2="19.490837" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-8-3" + id="linearGradient4642" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)" + x1="26.045763" + y1="9.6223383" + x2="26.045763" + y2="19.490837" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-8-3" + id="linearGradient4644" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)" + x1="26.045763" + y1="9.6223383" + x2="26.045763" + y2="19.490837" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-8-3" + id="linearGradient4656" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.375,0,0,0.375,7.5,6.499999)" + x1="26.045763" + y1="9.6223383" + x2="26.045763" + y2="19.490837" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-8-3" + id="linearGradient4659" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)" + x1="26.045763" + y1="9.6223383" + x2="26.045763" + y2="19.490837" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-8-3" + id="linearGradient4661" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)" + x1="26.045763" + y1="9.6223383" + x2="26.045763" + y2="19.490837" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-8-3" + id="linearGradient4663" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.375,0,0,0.375,7.5,6.499999)" + x1="26.045763" + y1="9.6223383" + x2="26.045763" + y2="19.490837" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-8-3" + id="linearGradient4665" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)" + x1="26.045763" + y1="9.6223383" + x2="26.045763" + y2="19.490837" /> + <linearGradient + id="linearGradient3587-6-5-8-3-9"> + <stop + id="stop3589-9-2-67-4-8" + style="stop-color:#000000;stop-opacity:1" + offset="0" /> + <stop + id="stop3591-7-4-2-9-5" + style="stop-color:#363636;stop-opacity:1" + offset="1" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-8-3-9" + id="linearGradient4661-4" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)" + x1="26.045763" + y1="9.6223383" + x2="26.045763" + y2="19.490837" /> + <linearGradient + id="linearGradient4682"> + <stop + id="stop4684" + style="stop-color:#000000;stop-opacity:1" + offset="0" /> + <stop + id="stop4686" + style="stop-color:#363636;stop-opacity:1" + offset="1" /> + </linearGradient> + <linearGradient + id="linearGradient4689"> + <stop + id="stop4691" + style="stop-color:#000000;stop-opacity:1" + offset="0" /> + <stop + id="stop4693" + style="stop-color:#363636;stop-opacity:1" + offset="1" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-8-3-9" + id="linearGradient4665-8" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)" + x1="26.045763" + y1="9.6223383" + x2="26.045763" + y2="19.490837" /> + <linearGradient + id="linearGradient4696"> + <stop + id="stop4698" + style="stop-color:#000000;stop-opacity:1" + offset="0" /> + <stop + id="stop4700" + style="stop-color:#363636;stop-opacity:1" + offset="1" /> + </linearGradient> + <linearGradient + y2="19.490837" + x2="26.045763" + y1="9.6223383" + x1="26.045763" + gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)" + gradientUnits="userSpaceOnUse" + id="linearGradient4707" + xlink:href="#linearGradient3587-6-5-8-3-9" + inkscape:collect="always" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-8-3" + id="linearGradient4823" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)" + x1="26.045763" + y1="9.6223383" + x2="26.045763" + y2="19.490837" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-8-3" + id="linearGradient4825" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)" + x1="26.045763" + y1="9.6223383" + x2="26.045763" + y2="19.490837" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-8-3" + id="linearGradient4827" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.375,0,0,0.375,7.5,6.499999)" + x1="26.045763" + y1="9.6223383" + x2="26.045763" + y2="19.490837" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-8-3" + id="linearGradient4829" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)" + x1="26.045763" + y1="9.6223383" + x2="26.045763" + y2="19.490837" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-8-3" + id="linearGradient3717" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)" + x1="26.045763" + y1="9.6223383" + x2="26.045763" + y2="19.490837" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-8-3" + id="linearGradient3719" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)" + x1="26.045763" + y1="9.6223383" + x2="26.045763" + y2="19.490837" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-8-3" + id="linearGradient3721" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.375,0,0,0.375,7.5,6.499999)" + x1="26.045763" + y1="9.6223383" + x2="26.045763" + y2="19.490837" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-8-3" + id="linearGradient3723" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)" + x1="26.045763" + y1="9.6223383" + x2="26.045763" + y2="19.490837" /> + </defs> + <g + transform="matrix(0.78786264,0,0,0.78786264,-3.1483699,0.44173984)" + id="g3743-3" + style="opacity:0.6;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-opacity:1" /> + <rect + style="color:#000000;fill:#ccc000;fill-opacity:0;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect3136" + width="163.31035" + height="97.986206" + x="-62.896553" + y="-32.993103" /> + <g + transform="matrix(0.99998873,0,0,0.99998873,-3.996044,-20.001608)" + id="g3743-9-4" + style="opacity:0.6;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-opacity:1" /> + <g + id="g4146"> + <path + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;opacity:1" + d="M 3 6 C 1.8954305 6 1 6.8954305 1 8 C 1 9.1045695 1.8954305 10 3 10 C 4.1045695 10 5 9.1045695 5 8 C 5 6.8954305 4.1045695 6 3 6 z M 8 6 C 6.8954305 6 6 6.8954305 6 8 C 6 9.1045695 6.8954305 10 8 10 C 9.1045695 10 10 9.1045695 10 8 C 10 6.8954305 9.1045695 6 8 6 z M 13 6 C 11.895431 6 11 6.8954305 11 8 C 11 9.1045695 11.895431 10 13 10 C 14.104569 10 15 9.1045695 15 8 C 15 6.8954305 14.104569 6 13 6 z " + id="path3750" /> + </g> +</svg> diff --git a/core/img/actions/user.png b/core/img/actions/user.png Binary files differnew file mode 100644 index 00000000000..2221ac679d1 --- /dev/null +++ b/core/img/actions/user.png diff --git a/core/img/actions/user.svg b/core/img/actions/user.svg new file mode 100644 index 00000000000..6d0dc714ce4 --- /dev/null +++ b/core/img/actions/user.svg @@ -0,0 +1,1698 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + version="1.0" + width="16" + height="16" + id="svg11300" + inkscape:version="0.48.3.1 r9886" + sodipodi:docname="user.svg" + inkscape:export-filename="user.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> + <metadata + id="metadata26"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title /> + </cc:Work> + </rdf:RDF> + </metadata> + <sodipodi:namedview + pagecolor="#cccccc" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1280" + inkscape:window-height="745" + id="namedview24" + showgrid="true" + showguides="true" + inkscape:guide-bbox="true" + inkscape:zoom="16" + inkscape:cx="6.2464037" + inkscape:cy="5.7411894" + inkscape:window-x="0" + inkscape:window-y="27" + inkscape:window-maximized="1" + inkscape:current-layer="g4146"> + <inkscape:grid + type="xygrid" + id="grid4330" + empspacing="5" + dotted="true" + visible="true" + enabled="true" + snapvisiblegridlinesonly="true" /> + </sodipodi:namedview> + <defs + id="defs3"> + <linearGradient + id="linearGradient4136"> + <stop + offset="0" + style="stop-color:#000000;stop-opacity:1;" + id="stop4138" /> + <stop + offset="1" + style="stop-color:#363636;stop-opacity:1" + id="stop4140" /> + </linearGradient> + <linearGradient + id="linearGradient4303"> + <stop + offset="0" + style="stop-color:#000000;stop-opacity:1" + id="stop4305" /> + <stop + offset="1" + style="stop-color:#363636;stop-opacity:1" + id="stop4307" /> + </linearGradient> + <linearGradient + id="linearGradient4297"> + <stop + id="stop4299" + style="stop-color:#000000;stop-opacity:1" + offset="0" /> + <stop + id="stop4301" + style="stop-color:#363636;stop-opacity:1" + offset="1" /> + </linearGradient> + <linearGradient + id="linearGradient4115"> + <stop + id="stop4117" + style="stop-color:#000000;stop-opacity:1" + offset="0" /> + <stop + id="stop4119" + style="stop-color:#363636;stop-opacity:0.698" + offset="1" /> + </linearGradient> + <linearGradient + id="linearGradient3785"> + <stop + id="stop3787" + style="stop-color:#b8b8b8;stop-opacity:1" + offset="0" /> + <stop + id="stop3789" + style="stop-color:#878787;stop-opacity:1" + offset="1" /> + </linearGradient> + <linearGradient + id="linearGradient6954"> + <stop + id="stop6960" + style="stop-color:#f5f5f5;stop-opacity:1" + offset="0" /> + <stop + id="stop6962" + style="stop-color:#d2d2d2;stop-opacity:1" + offset="1" /> + </linearGradient> + <linearGradient + id="linearGradient3341"> + <stop + id="stop3343" + style="stop-color:white;stop-opacity:1" + offset="0" /> + <stop + id="stop3345" + style="stop-color:white;stop-opacity:0" + offset="1" /> + </linearGradient> + <radialGradient + cx="24.999998" + cy="28.659998" + r="16" + fx="24.999998" + fy="28.659998" + id="radialGradient2856" + xlink:href="#linearGradient6954" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.56186795,0,0,0.15787922,-6.1682604,5.3385209)" /> + <linearGradient + x1="30" + y1="25.084745" + x2="30" + y2="45" + id="linearGradient2858" + xlink:href="#linearGradient3785" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.42808986,0,0,0.42296591,-2.823809,-3.2486024)" /> + <radialGradient + cx="26.375898" + cy="12.31301" + r="8" + fx="26.375898" + fy="12.31301" + id="radialGradient2860" + xlink:href="#linearGradient6954" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.55250164,-0.0426402,0.04315608,0.50971914,-6.3026675,-1.9765067)" /> + <linearGradient + x1="30" + y1="5" + x2="30" + y2="44.678879" + id="linearGradient2862" + xlink:href="#linearGradient3785" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.33685737,0,0,0.32161283,-0.10572085,-0.29529973)" /> + <linearGradient + x1="30" + y1="0.91818392" + x2="30" + y2="25.792814" + id="linearGradient2864" + xlink:href="#linearGradient3341" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.33685737,0,0,0.32161283,-0.10572085,-0.29529973)" /> + <linearGradient + x1="29.955881" + y1="21.86607" + x2="29.955881" + y2="43.144382" + id="linearGradient2866" + xlink:href="#linearGradient3341" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.42808986,0,0,0.42296591,-2.823809,-3.2486024)" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1" + id="linearGradient7308" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.54681372,0,0,0.39376081,3.7325729,-0.29182867)" + x1="34.992828" + y1="0.94087797" + x2="34.992828" + y2="33.955856" /> + <linearGradient + id="linearGradient3587-6-5-3-4-5-4-0-1"> + <stop + offset="0" + style="stop-color:#000000;stop-opacity:1" + id="stop3589-9-2-2-3-2-53-4-3" /> + <stop + offset="1" + style="stop-color:#363636;stop-opacity:1" + id="stop3591-7-4-73-7-9-86-9-3" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1" + id="linearGradient3796" + x1="8.3635759" + y1="15.028702" + x2="15.937561" + y2="11.00073" + gradientUnits="userSpaceOnUse" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1" + id="linearGradient3798" + x1="6.9951797" + y1="4.7478018" + x2="13.00482" + y2="4.7478018" + gradientUnits="userSpaceOnUse" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1" + id="linearGradient3815" + x1="209.34245" + y1="998.45801" + x2="209.34245" + y2="1013.451" + gradientUnits="userSpaceOnUse" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-5" + id="linearGradient3815-3" + x1="209.34245" + y1="998.45801" + x2="209.34245" + y2="1013.451" + gradientUnits="userSpaceOnUse" /> + <linearGradient + id="linearGradient3587-6-5-3-4-5-4-0-1-5"> + <stop + offset="0" + style="stop-color:#000000;stop-opacity:1" + id="stop3589-9-2-2-3-2-53-4-3-9" /> + <stop + offset="1" + style="stop-color:#363636;stop-opacity:1" + id="stop3591-7-4-73-7-9-86-9-3-0" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-5" + id="linearGradient3831" + x1="209.34245" + y1="998.45801" + x2="209.34245" + y2="1013.451" + gradientUnits="userSpaceOnUse" /> + <linearGradient + id="linearGradient3833"> + <stop + offset="0" + style="stop-color:#000000;stop-opacity:1" + id="stop3835" /> + <stop + offset="1" + style="stop-color:#363636;stop-opacity:1" + id="stop3837" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1" + id="linearGradient3874" + gradientUnits="userSpaceOnUse" + x1="209.34245" + y1="998.45801" + x2="209.34245" + y2="1013.451" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2" + id="linearGradient3892-2" + x1="8.7094374" + y1="1.0035814" + x2="8.6826077" + y2="16.052532" + gradientUnits="userSpaceOnUse" /> + <linearGradient + id="linearGradient3587-6-5-3-4-5-4-0-1-2"> + <stop + offset="0" + style="stop-color:#000000;stop-opacity:1" + id="stop3589-9-2-2-3-2-53-4-3-1" /> + <stop + offset="1" + style="stop-color:#363636;stop-opacity:1" + id="stop3591-7-4-73-7-9-86-9-3-4" /> + </linearGradient> + <linearGradient + gradientTransform="matrix(0.96967712,0,0,0.96967712,0.26437941,-0.96950812)" + y2="16.052532" + x2="8.6826077" + y1="1.0035814" + x1="8.7094374" + gradientUnits="userSpaceOnUse" + id="linearGradient3909" + xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2" + inkscape:collect="always" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1" + id="linearGradient3984" + gradientUnits="userSpaceOnUse" + x1="209.34245" + y1="998.45801" + x2="209.34245" + y2="1013.451" /> + <linearGradient + id="linearGradient3587-6-5-3-4-5-4-0-1-2-1"> + <stop + offset="0" + style="stop-color:#000000;stop-opacity:1" + id="stop3589-9-2-2-3-2-53-4-3-1-4" /> + <stop + offset="1" + style="stop-color:#363636;stop-opacity:1" + id="stop3591-7-4-73-7-9-86-9-3-4-6" /> + </linearGradient> + <linearGradient + gradientTransform="matrix(0.78786264,0,0,0.78786264,-1.5726929,-0.7389112)" + y2="16.052532" + x2="8.6826077" + y1="1.0035814" + x1="8.7094374" + gradientUnits="userSpaceOnUse" + id="linearGradient3909-3" + xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-2" + inkscape:collect="always" /> + <linearGradient + id="linearGradient3587-6-5-3-4-5-4-0-1-2-2"> + <stop + offset="0" + style="stop-color:#000000;stop-opacity:1" + id="stop3589-9-2-2-3-2-53-4-3-1-7" /> + <stop + offset="1" + style="stop-color:#363636;stop-opacity:1" + id="stop3591-7-4-73-7-9-86-9-3-4-5" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4115-9" + id="linearGradient4113-3" + x1="0.86849999" + y1="13.895414" + x2="0.44923753" + y2="28.776533" + gradientUnits="userSpaceOnUse" /> + <linearGradient + id="linearGradient4115-9"> + <stop + id="stop4117-5" + style="stop-color:#000000;stop-opacity:1" + offset="0" /> + <stop + id="stop4119-6" + style="stop-color:#363636;stop-opacity:0.698" + offset="1" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3104" + id="linearGradient3815-4" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.23426255,0,0,0.2859159,18.734419,0.35950872)" + x1="-51.786404" + y1="50.786446" + x2="-51.786404" + y2="2.9062471" /> + <linearGradient + id="linearGradient3104"> + <stop + id="stop3106" + style="stop-color:#aaaaaa;stop-opacity:1" + offset="0" /> + <stop + id="stop3108" + style="stop-color:#c8c8c8;stop-opacity:1" + offset="1" /> + </linearGradient> + <radialGradient + cx="13.138569" + cy="25.625349" + r="13.931416" + fx="13.138569" + fy="25.625349" + id="radialGradient2965" + xlink:href="#linearGradient3690-451" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0,0.92614711,-1.0546317,0,32.402583,-9.3345932)" /> + <linearGradient + id="linearGradient3690-451"> + <stop + id="stop2857" + style="stop-color:#e8e8e8;stop-opacity:1" + offset="0" /> + <stop + id="stop2859" + style="stop-color:#d8d8d8;stop-opacity:1" + offset="0.26238" /> + <stop + id="stop2861" + style="stop-color:#c2c2c2;stop-opacity:1" + offset="0.66093999" /> + <stop + id="stop2863" + style="stop-color:#a5a5a5;stop-opacity:1" + offset="1" /> + </linearGradient> + <linearGradient + x1="21.483376" + y1="36.255058" + x2="21.483376" + y2="9.5799999" + id="linearGradient2967" + xlink:href="#linearGradient3603-84" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762279)" /> + <linearGradient + id="linearGradient3603-84"> + <stop + id="stop2867" + style="stop-color:#707070;stop-opacity:1" + offset="0" /> + <stop + id="stop2869" + style="stop-color:#9e9e9e;stop-opacity:1" + offset="1" /> + </linearGradient> + <linearGradient + x1="11.566265" + y1="22.292103" + x2="15.214532" + y2="33.95525" + id="linearGradient3674-262" + xlink:href="#linearGradient8265-821-176-38-919-66-249-529" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.4893617,0,0,0.4893617,1.7131795,22.728095)" /> + <linearGradient + id="linearGradient8265-821-176-38-919-66-249-529"> + <stop + id="stop2873" + style="stop-color:#ffffff;stop-opacity:0.27450982" + offset="0" /> + <stop + id="stop2875" + style="stop-color:#ffffff;stop-opacity:0" + offset="1" /> + </linearGradient> + <linearGradient + x1="24.046366" + y1="11.673002" + x2="24.046366" + y2="34.713669" + id="linearGradient3677-116" + xlink:href="#linearGradient3642-81" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762276)" /> + <linearGradient + id="linearGradient3642-81"> + <stop + id="stop2879" + style="stop-color:#ffffff;stop-opacity:1" + offset="0" /> + <stop + id="stop2881" + style="stop-color:#ffffff;stop-opacity:0" + offset="1" /> + </linearGradient> + <linearGradient + y2="34.713669" + x2="24.046366" + y1="11.673002" + x1="24.046366" + gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762276)" + gradientUnits="userSpaceOnUse" + id="linearGradient3037" + xlink:href="#linearGradient3642-81" + inkscape:collect="always" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3155-40" + id="linearGradient8639" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.415777,-0.4174938,0.518983,0.5146192,-15.747227,2.6503673)" + spreadMethod="pad" + x1="23.575972" + y1="25.356892" + x2="23.575972" + y2="31.210939" /> + <linearGradient + id="linearGradient3155-40"> + <stop + id="stop2541" + offset="0" + style="stop-color:#181818;stop-opacity:1;" /> + <stop + style="stop-color:#dbdbdb;stop-opacity:1;" + offset="0.13482948" + id="stop2543" /> + <stop + id="stop2545" + offset="0.20224422" + style="stop-color:#a4a4a4;stop-opacity:1;" /> + <stop + style="stop-color:#ffffff;stop-opacity:1;" + offset="0.26965895" + id="stop2547" /> + <stop + id="stop2549" + offset="0.44650277" + style="stop-color:#8d8d8d;stop-opacity:1;" /> + <stop + style="stop-color:#959595;stop-opacity:1;" + offset="0.57114136" + id="stop2551" /> + <stop + id="stop2553" + offset="0.72038066" + style="stop-color:#cecece;stop-opacity:1;" /> + <stop + id="stop2555" + offset="1" + style="stop-color:#181818;stop-opacity:1;" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3240-279" + id="linearGradient8641" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.867764,0.6930272)" + x1="30.037716" + y1="24.989594" + x2="30.037716" + y2="30.000141" /> + <linearGradient + id="linearGradient3240-279"> + <stop + style="stop-color:#565656;stop-opacity:1;" + offset="0" + id="stop2559" /> + <stop + id="stop2561" + offset="0.5" + style="stop-color:#9a9a9a;stop-opacity:1;" /> + <stop + style="stop-color:#545454;stop-opacity:1;" + offset="1" + id="stop2563" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3223-789" + id="linearGradient8643" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.983472,0.8092126)" + x1="30.037716" + y1="24.989594" + x2="30.037716" + y2="30.000141" /> + <linearGradient + id="linearGradient3223-789"> + <stop + id="stop2567" + offset="0" + style="stop-color:#b1b1b1;stop-opacity:1;" /> + <stop + style="stop-color:#ffffff;stop-opacity:1;" + offset="0.5" + id="stop2569" /> + <stop + id="stop2571" + offset="1" + style="stop-color:#8f8f8f;stop-opacity:1;" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3240-686" + id="linearGradient8645" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.465684,0.2892868)" + x1="30.037716" + y1="24.989594" + x2="30.037716" + y2="30.000141" /> + <linearGradient + id="linearGradient3240-686"> + <stop + style="stop-color:#565656;stop-opacity:1;" + offset="0" + id="stop2575" /> + <stop + id="stop2577" + offset="0.5" + style="stop-color:#9a9a9a;stop-opacity:1;" /> + <stop + style="stop-color:#545454;stop-opacity:1;" + offset="1" + id="stop2579" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3223-768" + id="linearGradient8647" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.581392,0.4054707)" + x1="30.037716" + y1="24.989594" + x2="30.037716" + y2="30.000141" /> + <linearGradient + id="linearGradient3223-768"> + <stop + id="stop2583" + offset="0" + style="stop-color:#b1b1b1;stop-opacity:1;" /> + <stop + style="stop-color:#ffffff;stop-opacity:1;" + offset="0.5" + id="stop2585" /> + <stop + id="stop2587" + offset="1" + style="stop-color:#8f8f8f;stop-opacity:1;" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3240-907" + id="linearGradient8649" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.061661,-0.1164056)" + x1="30.037716" + y1="24.989594" + x2="30.037716" + y2="30.000141" /> + <linearGradient + id="linearGradient3240-907"> + <stop + style="stop-color:#565656;stop-opacity:1;" + offset="0" + id="stop2591" /> + <stop + id="stop2593" + offset="0.5" + style="stop-color:#9a9a9a;stop-opacity:1;" /> + <stop + style="stop-color:#545454;stop-opacity:1;" + offset="1" + id="stop2595" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3223-699" + id="linearGradient8651" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.177369,-2.1969969e-4)" + x1="30.037716" + y1="24.989594" + x2="30.037716" + y2="30.000141" /> + <linearGradient + id="linearGradient3223-699"> + <stop + id="stop2599" + offset="0" + style="stop-color:#b1b1b1;stop-opacity:1;" /> + <stop + style="stop-color:#ffffff;stop-opacity:1;" + offset="0.5" + id="stop2601" /> + <stop + id="stop2603" + offset="1" + style="stop-color:#8f8f8f;stop-opacity:1;" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3290-678" + id="linearGradient8653" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.602268,-17.636692,0.462492)" + x1="9" + y1="29.056757" + x2="9" + y2="26.02973" /> + <linearGradient + id="linearGradient3290-678"> + <stop + id="stop2607" + offset="0" + style="stop-color:#ece5a5;stop-opacity:1;" /> + <stop + id="stop2609" + offset="1" + style="stop-color:#fcfbf2;stop-opacity:1;" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3191-577" + id="linearGradient8655" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.3763801,0.03615261,0.03669995,0.374874,-2.2182805,-1.1331002)" + x1="5.5178981" + y1="37.371799" + x2="9.5220556" + y2="41.391716" /> + <linearGradient + id="linearGradient3191-577"> + <stop + id="stop2613" + offset="0" + style="stop-color:#dbce48;stop-opacity:1;" /> + <stop + id="stop2615" + offset="1" + style="stop-color:#c5b625;stop-opacity:1;" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-1-0" + id="linearGradient3934-0" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)" + x1="8.7094374" + y1="1.0035814" + x2="8.6826077" + y2="16.052532" /> + <linearGradient + id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0"> + <stop + offset="0" + style="stop-color:#000000;stop-opacity:1" + id="stop3589-9-2-2-3-2-53-4-3-1-4-9" /> + <stop + offset="1" + style="stop-color:#363636;stop-opacity:1" + id="stop3591-7-4-73-7-9-86-9-3-4-6-0" /> + </linearGradient> + <linearGradient + y2="16.052532" + x2="8.6826077" + y1="1.0035814" + x1="8.7094374" + gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)" + gradientUnits="userSpaceOnUse" + id="linearGradient4154-8" + xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9" + inkscape:collect="always" /> + <linearGradient + id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9"> + <stop + offset="0" + style="stop-color:#000000;stop-opacity:1" + id="stop3589-9-2-2-3-2-53-4-3-1-4-9-8" /> + <stop + offset="1" + style="stop-color:#363636;stop-opacity:1" + id="stop3591-7-4-73-7-9-86-9-3-4-6-0-4" /> + </linearGradient> + <linearGradient + id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9-0"> + <stop + offset="0" + style="stop-color:#000000;stop-opacity:1" + id="stop3589-9-2-2-3-2-53-4-3-1-4-9-8-3" /> + <stop + offset="1" + style="stop-color:#363636;stop-opacity:1" + id="stop3591-7-4-73-7-9-86-9-3-4-6-0-4-8" /> + </linearGradient> + <linearGradient + id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-3"> + <stop + offset="0" + style="stop-color:#000000;stop-opacity:1" + id="stop3589-9-2-2-3-2-53-4-3-1-4-9-3" /> + <stop + offset="1" + style="stop-color:#363636;stop-opacity:1" + id="stop3591-7-4-73-7-9-86-9-3-4-6-0-6" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5" + id="linearGradient4326" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.6858824,0,0,0.68591053,-5.3691237,-18.974705)" + x1="14.501121" + y1="-1.4095211" + x2="14.152531" + y2="20.074369" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5" + id="linearGradient4328" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)" + x1="8.7094374" + y1="1.0035814" + x2="8.6826077" + y2="16.052532" /> + <linearGradient + x1="-2.4040222" + y1="4.4573336" + x2="-2.4040222" + y2="18.967093" + id="linearGradient3878" + xlink:href="#linearGradient3587-6-5" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(13.927091,-3.4266134)" /> + <linearGradient + id="linearGradient3587-6-5"> + <stop + id="stop3589-9-2" + style="stop-color:#000000;stop-opacity:1" + offset="0" /> + <stop + id="stop3591-7-4" + style="stop-color:#363636;stop-opacity:1" + offset="1" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5" + id="linearGradient4357" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.0344828,0,0,1.0344828,8.0707628,-14.513825)" + x1="0.86849999" + y1="13.895414" + x2="0.44923753" + y2="28.776533" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1" + id="linearGradient4405" + gradientUnits="userSpaceOnUse" + x1="209.34245" + y1="998.45801" + x2="209.34245" + y2="1013.451" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55" + id="linearGradient4413-7" + gradientUnits="userSpaceOnUse" + x1="209.34245" + y1="998.45801" + x2="209.34245" + y2="1013.451" /> + <linearGradient + id="linearGradient3587-6-5-3-4-5-4-0-1-55"> + <stop + offset="0" + style="stop-color:#000000;stop-opacity:1" + id="stop3589-9-2-2-3-2-53-4-3-95" /> + <stop + offset="1" + style="stop-color:#363636;stop-opacity:1" + id="stop3591-7-4-73-7-9-86-9-3-6" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-2" + id="linearGradient4411-3" + gradientUnits="userSpaceOnUse" + x1="209.34245" + y1="998.45801" + x2="209.34245" + y2="1013.451" /> + <linearGradient + id="linearGradient3587-6-5-2"> + <stop + id="stop3589-9-2-8" + style="stop-color:#000000;stop-opacity:1" + offset="0" /> + <stop + id="stop3591-7-4-0" + style="stop-color:#363636;stop-opacity:1" + offset="1" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-2-4" + id="linearGradient4466-9" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.23426255,0,0,0.2859159,18.734419,60.359508)" + x1="-41.553459" + y1="2.2401412" + x2="-41.553459" + y2="54.703121" /> + <linearGradient + id="linearGradient3587-6-5-2-4"> + <stop + id="stop3589-9-2-8-7" + style="stop-color:#000000;stop-opacity:1;" + offset="0" /> + <stop + id="stop3591-7-4-0-3" + style="stop-color:#363636;stop-opacity:1" + offset="1" /> + </linearGradient> + <linearGradient + y2="54.703121" + x2="-41.553459" + y1="2.2401412" + x1="-41.553459" + gradientTransform="matrix(0.21864454,0,0,0.26685422,17.618755,60.402242)" + gradientUnits="userSpaceOnUse" + id="linearGradient4483-3" + xlink:href="#linearGradient3587-6-5-2-4-9" + inkscape:collect="always" /> + <linearGradient + id="linearGradient3587-6-5-2-4-9"> + <stop + id="stop3589-9-2-8-7-2" + style="stop-color:#000000;stop-opacity:1" + offset="0" /> + <stop + id="stop3591-7-4-0-3-8" + style="stop-color:#363636;stop-opacity:1" + offset="1" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55" + id="linearGradient4564" + gradientUnits="userSpaceOnUse" + x1="209.34245" + y1="998.45801" + x2="209.34245" + y2="1013.451" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5" + id="linearGradient4566" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(13.927091,16.573387)" + x1="-2.4040222" + y1="4.4573336" + x2="-2.4040222" + y2="18.967093" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-2" + id="linearGradient4578" + gradientUnits="userSpaceOnUse" + x1="209.34245" + y1="998.45801" + x2="209.34245" + y2="1013.451" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55" + id="linearGradient4580" + gradientUnits="userSpaceOnUse" + x1="209.34245" + y1="998.45801" + x2="209.34245" + y2="1013.451" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-3" + id="linearGradient4359-4" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.99998838,0,0,0.99998838,29.038238,-21.358617)" + x1="8.7094374" + y1="1.0035814" + x2="8.6826077" + y2="16.052532" /> + <linearGradient + id="linearGradient3587-6-5-3"> + <stop + id="stop3589-9-2-6" + style="stop-color:#000000;stop-opacity:1" + offset="0" /> + <stop + id="stop3591-7-4-5" + style="stop-color:#363636;stop-opacity:1" + offset="1" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-3" + id="linearGradient4361-4" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.6858824,0,0,0.68591053,25.66524,-19.333318)" + x1="8.7094374" + y1="1.0035814" + x2="8.6826077" + y2="16.052532" /> + <linearGradient + id="linearGradient4597"> + <stop + id="stop4599" + style="stop-color:#000000;stop-opacity:1" + offset="0" /> + <stop + id="stop4601" + style="stop-color:#363636;stop-opacity:1" + offset="1" /> + </linearGradient> + <linearGradient + y2="16.052532" + x2="8.6826077" + y1="1.0035814" + x1="8.7094374" + gradientTransform="matrix(0.6858824,0,0,0.68591053,25.66524,-19.333318)" + gradientUnits="userSpaceOnUse" + id="linearGradient4610" + xlink:href="#linearGradient3587-6-5-3" + inkscape:collect="always" /> + <linearGradient + x1="1.3333321" + y1="6.6666665" + x2="1.3333321" + y2="33.333332" + id="linearGradient2422" + xlink:href="#linearGradient3587-6-5-5" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.4090909,0,0,0.375,7.4545459,0.5)" /> + <linearGradient + id="linearGradient3587-6-5-5"> + <stop + id="stop3589-9-2-4" + style="stop-color:#000000;stop-opacity:1" + offset="0" /> + <stop + id="stop3591-7-4-3" + style="stop-color:#363636;stop-opacity:1" + offset="1" /> + </linearGradient> + <linearGradient + x1="26.045763" + y1="9.6223383" + x2="26.045763" + y2="19.490837" + id="linearGradient3189" + xlink:href="#linearGradient3587-6-5-8" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)" /> + <linearGradient + id="linearGradient3587-6-5-8"> + <stop + id="stop3589-9-2-67" + style="stop-color:#000000;stop-opacity:1" + offset="0" /> + <stop + id="stop3591-7-4-2" + style="stop-color:#363636;stop-opacity:1" + offset="1" /> + </linearGradient> + <linearGradient + x1="26.045763" + y1="9.6223383" + x2="26.045763" + y2="19.490837" + id="linearGradient3203" + xlink:href="#linearGradient3587-6-5-8" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)" /> + <linearGradient + id="linearGradient3120"> + <stop + id="stop3122" + style="stop-color:#000000;stop-opacity:1" + offset="0" /> + <stop + id="stop3124" + style="stop-color:#363636;stop-opacity:1" + offset="1" /> + </linearGradient> + <linearGradient + x1="26.045763" + y1="9.6223383" + x2="26.045763" + y2="19.490837" + id="linearGradient3207" + xlink:href="#linearGradient3587-6-5-8" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)" /> + <linearGradient + id="linearGradient3127"> + <stop + id="stop3129" + style="stop-color:#000000;stop-opacity:1" + offset="0" /> + <stop + id="stop3131" + style="stop-color:#363636;stop-opacity:1" + offset="1" /> + </linearGradient> + <linearGradient + x1="26.045763" + y1="9.6223383" + x2="26.045763" + y2="19.490837" + id="linearGradient3211" + xlink:href="#linearGradient3587-6-5-8" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)" /> + <linearGradient + id="linearGradient3134"> + <stop + id="stop3136" + style="stop-color:#000000;stop-opacity:1" + offset="0" /> + <stop + id="stop3138" + style="stop-color:#363636;stop-opacity:1" + offset="1" /> + </linearGradient> + <linearGradient + x1="11" + y1="6" + x2="11" + y2="17" + id="linearGradient2409" + xlink:href="#linearGradient3587-6-5-1" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.2403101,0,0,0.8988764,10.387597,0.2247191)" /> + <linearGradient + id="linearGradient3587-6-5-1"> + <stop + id="stop3589-9-2-0" + style="stop-color:#000000;stop-opacity:1" + offset="0" /> + <stop + id="stop3591-7-4-21" + style="stop-color:#363636;stop-opacity:1" + offset="1" /> + </linearGradient> + <linearGradient + x1="40.805084" + y1="5.6271191" + x2="40.805084" + y2="17.627119" + id="linearGradient3206" + xlink:href="#linearGradient3587-8-5" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(-32.805085,-3.6271193)" /> + <linearGradient + id="linearGradient3587-8-5"> + <stop + id="stop3589-2-7" + style="stop-color:#000000;stop-opacity:1" + offset="0" /> + <stop + id="stop3591-3-5" + style="stop-color:#363636;stop-opacity:1" + offset="1" /> + </linearGradient> + <linearGradient + y2="17.627119" + x2="40.805084" + y1="5.6271191" + x1="40.805084" + gradientTransform="translate(-32.805085,-3.6271193)" + gradientUnits="userSpaceOnUse" + id="linearGradient3180" + xlink:href="#linearGradient3587-8-5" + inkscape:collect="always" /> + <linearGradient + x1="1.3333321" + y1="6.6666665" + x2="1.3333321" + y2="33.333332" + id="linearGradient2422-1" + xlink:href="#linearGradient3587-6-5-86" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.2727273,0,0,0.375,9.636365,1.5)" /> + <linearGradient + id="linearGradient3587-6-5-86"> + <stop + id="stop3589-9-2-65" + style="stop-color:#000000;stop-opacity:1" + offset="0" /> + <stop + id="stop3591-7-4-9" + style="stop-color:#363636;stop-opacity:1" + offset="1" /> + </linearGradient> + <linearGradient + x1="11" + y1="6" + x2="11" + y2="17" + id="linearGradient2427" + xlink:href="#linearGradient3587-6-5-86" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,1.5842703)" /> + <linearGradient + id="linearGradient3207-3"> + <stop + id="stop3209" + style="stop-color:#000000;stop-opacity:1" + offset="0" /> + <stop + id="stop3211" + style="stop-color:#363636;stop-opacity:1" + offset="1" /> + </linearGradient> + <linearGradient + x1="11" + y1="6" + x2="11" + y2="17" + id="linearGradient2436" + xlink:href="#linearGradient3587-6-5-86" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,9.58427)" /> + <linearGradient + id="linearGradient3214"> + <stop + id="stop3216" + style="stop-color:#000000;stop-opacity:1" + offset="0" /> + <stop + id="stop3218" + style="stop-color:#363636;stop-opacity:1" + offset="1" /> + </linearGradient> + <linearGradient + x1="11" + y1="6" + x2="11" + y2="17" + id="linearGradient2442" + xlink:href="#linearGradient3587-6-5-86" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,5.5842706)" /> + <linearGradient + id="linearGradient3221"> + <stop + id="stop3223" + style="stop-color:#000000;stop-opacity:1" + offset="0" /> + <stop + id="stop3225" + style="stop-color:#363636;stop-opacity:1" + offset="1" /> + </linearGradient> + <linearGradient + x1="1.3333321" + y1="4.9755898" + x2="1.3333321" + y2="37.373981" + id="linearGradient2422-1-0" + xlink:href="#linearGradient3587-6-5-0" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.39871888,0,0,0.3091132,71.812715,15.470662)" /> + <linearGradient + id="linearGradient3587-6-5-0"> + <stop + id="stop3589-9-2-5" + style="stop-color:#000000;stop-opacity:1" + offset="0" /> + <stop + id="stop3591-7-4-1" + style="stop-color:#363636;stop-opacity:1" + offset="1" /> + </linearGradient> + <linearGradient + x1="46.395508" + y1="12.707516" + x2="46.395508" + y2="38.409042" + id="linearGradient3795-2" + xlink:href="#linearGradient3587-6-5-3-5-7" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(-0.4100229,0,0,0.5447147,28.02322,-5.9219706)" /> + <linearGradient + id="linearGradient3587-6-5-3-5-7"> + <stop + id="stop3589-9-2-2-6-2" + style="stop-color:#000000;stop-opacity:1" + offset="0" /> + <stop + id="stop3591-7-4-73-5-1" + style="stop-color:#363636;stop-opacity:1" + offset="1" /> + </linearGradient> + <linearGradient + id="linearGradient3587-6-5-3-5"> + <stop + offset="0" + style="stop-color:#000000;stop-opacity:1" + id="stop3589-9-2-2-6" /> + <stop + offset="1" + style="stop-color:#363636;stop-opacity:1" + id="stop3591-7-4-73-5" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-3-5" + id="linearGradient4872" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(-0.4100229,0,0,0.5447147,19.329265,-26.729116)" + x1="100.77747" + y1="17.859186" + x2="100.77747" + y2="38.055252" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-8" + id="linearGradient4894" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)" + x1="26.045763" + y1="9.6223383" + x2="26.045763" + y2="19.490837" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-8" + id="linearGradient4900" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)" + x1="26.045763" + y1="9.6223383" + x2="26.045763" + y2="19.490837" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-8" + id="linearGradient4906" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)" + x1="26.045763" + y1="9.6223383" + x2="26.045763" + y2="19.490837" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-8" + id="linearGradient4912" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)" + x1="26.045763" + y1="9.6223383" + x2="26.045763" + y2="19.490837" /> + <linearGradient + id="linearGradient3587-6-5-8-6"> + <stop + id="stop3589-9-2-67-3" + style="stop-color:#000000;stop-opacity:1" + offset="0" /> + <stop + id="stop3591-7-4-2-3" + style="stop-color:#363636;stop-opacity:1" + offset="1" /> + </linearGradient> + <linearGradient + id="linearGradient4935"> + <stop + id="stop4937" + style="stop-color:#000000;stop-opacity:1" + offset="0" /> + <stop + id="stop4939" + style="stop-color:#363636;stop-opacity:1" + offset="1" /> + </linearGradient> + <linearGradient + id="linearGradient4942"> + <stop + id="stop4944" + style="stop-color:#000000;stop-opacity:1" + offset="0" /> + <stop + id="stop4946" + style="stop-color:#363636;stop-opacity:1" + offset="1" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-8-6" + id="linearGradient4912-4" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)" + x1="26.045763" + y1="9.6223383" + x2="26.045763" + y2="19.490837" /> + <linearGradient + id="linearGradient4949"> + <stop + id="stop4951" + style="stop-color:#000000;stop-opacity:1" + offset="0" /> + <stop + id="stop4953" + style="stop-color:#363636;stop-opacity:1" + offset="1" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-8" + id="linearGradient5012" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)" + x1="26.045763" + y1="9.6223383" + x2="26.045763" + y2="19.490837" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-8" + id="linearGradient5015" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)" + x1="26.045763" + y1="9.6223383" + x2="26.045763" + y2="19.490837" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-8" + id="linearGradient5018" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)" + x1="26.045763" + y1="9.6223383" + x2="26.045763" + y2="19.490837" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-8" + id="linearGradient5021" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)" + x1="26.045763" + y1="9.6223383" + x2="26.045763" + y2="19.490837" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-2-4" + id="linearGradient3335" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.21864454,0,0,0.26685422,18.618755,-19.597758)" + x1="-41.553459" + y1="2.2401412" + x2="-41.553459" + y2="54.703121" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4136" + id="linearGradient4134" + x1="9" + y1="0" + x2="9" + y2="15" + gradientUnits="userSpaceOnUse" + spreadMethod="pad" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4136" + id="linearGradient4150" + gradientUnits="userSpaceOnUse" + spreadMethod="pad" + x1="9" + y1="0" + x2="9" + y2="15" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-2-4-6" + id="linearGradient3335-7" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.2186487,0,0,0.26685422,76.619476,1.402242)" + x1="-41.553459" + y1="2.2401412" + x2="-41.755585" + y2="47.208389" /> + <linearGradient + id="linearGradient3587-6-5-2-4-6"> + <stop + id="stop3589-9-2-8-7-8" + style="stop-color:#000000;stop-opacity:1;" + offset="0" /> + <stop + id="stop3591-7-4-0-3-4" + style="stop-color:#363636;stop-opacity:1" + offset="1" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-2-4-6-0" + id="linearGradient3335-7-8" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,0.402242)" + x1="-41.553459" + y1="2.2401412" + x2="-41.553459" + y2="54.703121" /> + <linearGradient + id="linearGradient3587-6-5-2-4-6-0"> + <stop + id="stop3589-9-2-8-7-8-7" + style="stop-color:#000000;stop-opacity:1;" + offset="0" /> + <stop + id="stop3591-7-4-0-3-4-7" + style="stop-color:#363636;stop-opacity:1" + offset="1" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-2-4-6-4" + id="linearGradient3335-7-7" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,0.402242)" + x1="-41.553459" + y1="2.2401412" + x2="-41.553459" + y2="54.703121" /> + <linearGradient + id="linearGradient3587-6-5-2-4-6-4"> + <stop + id="stop3589-9-2-8-7-8-2" + style="stop-color:#000000;stop-opacity:1;" + offset="0" /> + <stop + id="stop3591-7-4-0-3-4-2" + style="stop-color:#363636;stop-opacity:1" + offset="1" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-2-4-6-7" + id="linearGradient3335-7-3" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,1.402242)" + x1="-41.553459" + y1="2.2401412" + x2="-41.755585" + y2="47.208389" /> + <linearGradient + id="linearGradient3587-6-5-2-4-6-7"> + <stop + id="stop3589-9-2-8-7-8-4" + style="stop-color:#000000;stop-opacity:1;" + offset="0" /> + <stop + id="stop3591-7-4-0-3-4-5" + style="stop-color:#363636;stop-opacity:1" + offset="1" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-2-4-6-2" + id="linearGradient3335-7-1" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.2186487,0,0,0.26685422,56.619476,1.4022422)" + x1="-39.421574" + y1="-5.2547116" + x2="-39.421574" + y2="47.208389" /> + <linearGradient + id="linearGradient3587-6-5-2-4-6-2"> + <stop + id="stop3589-9-2-8-7-8-77" + style="stop-color:#000000;stop-opacity:1;" + offset="0" /> + <stop + id="stop3591-7-4-0-3-4-9" + style="stop-color:#363636;stop-opacity:1" + offset="1" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4136-9" + id="linearGradient4150-0" + gradientUnits="userSpaceOnUse" + spreadMethod="pad" + x1="9" + y1="0" + x2="9" + y2="15" /> + <linearGradient + id="linearGradient4136-9"> + <stop + offset="0" + style="stop-color:#000000;stop-opacity:1;" + id="stop4138-6" /> + <stop + offset="1" + style="stop-color:#363636;stop-opacity:1" + id="stop4140-3" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-2-4-6-2-6" + id="linearGradient3335-7-1-7" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.2186487,0,0,0.26685422,56.619476,1.4022422)" + x1="-39.421574" + y1="-5.2547116" + x2="-39.421574" + y2="47.208389" /> + <linearGradient + id="linearGradient3587-6-5-2-4-6-2-6"> + <stop + id="stop3589-9-2-8-7-8-77-4" + style="stop-color:#000000;stop-opacity:1;" + offset="0" /> + <stop + id="stop3591-7-4-0-3-4-9-3" + style="stop-color:#363636;stop-opacity:1" + offset="1" /> + </linearGradient> + <linearGradient + y2="47.208389" + x2="-39.421574" + y1="-5.2547116" + x1="-39.421574" + gradientTransform="matrix(0.2186487,0,0,0.26685422,56.619476,1.4022422)" + gradientUnits="userSpaceOnUse" + id="linearGradient3397" + xlink:href="#linearGradient3587-6-5-2-4-6-2-6" + inkscape:collect="always" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3587-6-5-10" + id="linearGradient4328-1" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)" + x1="8.7094374" + y1="1.0035814" + x2="8.6826077" + y2="16.052532" /> + <linearGradient + id="linearGradient3587-6-5-10"> + <stop + id="stop3589-9-2-3" + style="stop-color:#000000;stop-opacity:1" + offset="0" /> + <stop + id="stop3591-7-4-4" + style="stop-color:#363636;stop-opacity:1" + offset="1" /> + </linearGradient> + </defs> + <g + transform="matrix(0.78786264,0,0,0.78786264,-3.1483699,0.44173984)" + id="g3743-3" + style="opacity:0.6;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-opacity:1" /> + <rect + style="color:#000000;fill:#ccc000;fill-opacity:0;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect3136" + width="163.31035" + height="97.986206" + x="-62.896553" + y="-32.993103" /> + <g + transform="matrix(0.99998873,0,0,0.99998873,-3.996044,-20.001608)" + id="g3743-9-4" + style="opacity:0.6;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-opacity:1" /> + <g + id="g4146"> + <path + id="path2880-5-3" + style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00012147000000007;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans;opacity:1" + d="m 8.4036095,0.99999982 c -1.7311503,0 -3.199751,1.26607188 -3.199751,2.89996308 0.012287,0.516426 0.058473,1.1532486 0.3666387,2.4999667 l 0,0.033333 0.033328,0.033333 c 0.098928,0.2833818 0.2428905,0.4454861 0.4332995,0.6666581 0.190409,0.2211719 0.4174151,0.4814874 0.6332844,0.6999905 0.025397,0.025708 0.041676,0.041633 0.066656,0.066677 0.04281,0.1863059 0.094672,0.386808 0.1333222,0.5666595 0.1028444,0.4785093 0.092296,0.817368 0.066668,0.93332 -0.7438941,0.26121 -1.6693756,0.572285 -2.4998049,0.9333223 -0.4662227,0.202697 -0.8881034,0.383698 -1.2332384,0.599993 -0.3451339,0.216295 -0.6883746,0.379709 -0.7999369,0.866656 -0.1600387,0.632932 -0.19866,0.753904 -0.399969,1.533302 -0.027212,0.209143 0.083011,0.429614 0.2666456,0.533326 1.507807,0.814508 3.8239751,1.142327 6.1328564,1.13332 2.3088796,-0.009 4.6066016,-0.356087 6.0661936,-1.13332 0.117388,-0.07353 0.143041,-0.108689 0.133323,-0.233305 -0.04365,-0.68908 -0.08154,-1.366916 -0.133319,-1.766644 -0.01807,-0.09908 -0.06492,-0.192753 -0.133324,-0.266663 -0.46366,-0.553698 -1.156389,-0.89218 -1.966513,-1.23332 -0.739597,-0.31144 -1.606657,-0.6348603 -2.4664743,-0.9999873 -0.048123,-0.107207 -0.095926,-0.4191236 0,-0.8999881 0.025759,-0.1291209 0.066096,-0.2674152 0.099994,-0.3999952 0.0808,-0.090507 0.143781,-0.164467 0.233316,-0.2666632 0.190958,-0.2179623 0.396144,-0.4466106 0.56662,-0.6666572 0.170482,-0.2200478 0.309958,-0.4088229 0.399971,-0.6666594 l 0.03333,-0.033333 c 0.34839,-1.4061623 0.348571,-1.9929284 0.366639,-2.4999678 l 0,-0.033333 c 0,-1.6338901 -1.468599,-2.899962 -3.199751,-2.899962 z" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cccccsscscssccccccccscscsscccssc" /> + </g> +</svg> diff --git a/core/js/eventsource.js b/core/js/eventsource.js index 45c63715a7e..0c2a995f331 100644 --- a/core/js/eventsource.js +++ b/core/js/eventsource.js @@ -40,9 +40,13 @@ OC.EventSource=function(src,data){ dataStr+=name+'='+encodeURIComponent(data[name])+'&'; } } - dataStr+='requesttoken='+OC.Request.Token; + dataStr+='requesttoken='+OC.EventSource.requesttoken; if(!this.useFallBack && typeof EventSource !='undefined'){ - this.source=new EventSource(src+'?'+dataStr); + var joinChar = '&'; + if(src.indexOf('?') == -1) { + joinChar = '?'; + } + this.source=new EventSource(src+joinChar+dataStr); this.source.onmessage=function(e){ for(var i=0;i<this.typelessListeners.length;i++){ this.typelessListeners[i](JSON.parse(e.data)); @@ -54,7 +58,12 @@ OC.EventSource=function(src,data){ this.iframe=$('<iframe/>'); this.iframe.attr('id',iframeId); this.iframe.hide(); - this.iframe.attr('src',src+'?fallback=true&fallback_id='+OC.EventSource.iframeCount+'&'+dataStr); + + var joinChar = '&'; + if(src.indexOf('?') == -1) { + joinChar = '?'; + } + this.iframe.attr('src',src+joinChar+'fallback=true&fallback_id='+OC.EventSource.iframeCount+'&'+dataStr); $('body').append(this.iframe); this.useFallBack=true; OC.EventSource.iframeCount++ @@ -90,7 +99,7 @@ OC.EventSource.prototype={ lastLength:0,//for fallback listen:function(type,callback){ if(callback && callback.call){ - + if(type){ if(this.useFallBack){ if(!this.listeners[type]){ diff --git a/core/js/jquery.infieldlabel.js b/core/js/jquery.infieldlabel.js new file mode 100644 index 00000000000..c7daf61edd8 --- /dev/null +++ b/core/js/jquery.infieldlabel.js @@ -0,0 +1,164 @@ +/** + * @license In-Field Label jQuery Plugin + * http://fuelyourcoding.com/scripts/infield.html + * + * Copyright (c) 2009-2010 Doug Neiner + * Dual licensed under the MIT and GPL licenses. + * Uses the same license as jQuery, see: + * http://docs.jquery.com/License + * + * @version 0.1.6 + */ +(function ($) { + + $.InFieldLabels = function (label, field, options) { + // To avoid scope issues, use 'base' instead of 'this' + // to reference this class from internal events and functions. + var base = this; + + // Access to jQuery and DOM versions of each element + base.$label = $(label); + base.label = label; + + base.$field = $(field); + base.field = field; + + base.$label.data("InFieldLabels", base); + base.showing = true; + + base.init = function () { + // Merge supplied options with default options + base.options = $.extend({}, $.InFieldLabels.defaultOptions, options); + + // Check if the field is already filled in + // add a short delay to handle autocomplete + setTimeout(function() { + if (base.$field.val() !== "") { + base.$label.hide(); + base.showing = false; + } + }, 200); + + base.$field.focus(function () { + base.fadeOnFocus(); + }).blur(function () { + base.checkForEmpty(true); + }).bind('keydown.infieldlabel', function (e) { + // Use of a namespace (.infieldlabel) allows us to + // unbind just this method later + base.hideOnChange(e); + }).bind('paste', function (e) { + // Since you can not paste an empty string we can assume + // that the fieldis not empty and the label can be cleared. + base.setOpacity(0.0); + }).change(function (e) { + base.checkForEmpty(); + }).bind('onPropertyChange', function () { + base.checkForEmpty(); + }).bind('keyup.infieldlabel', function () { + base.checkForEmpty() + }); + setInterval(function(){ + if(base.$field.val() != ""){ + base.$label.hide(); + base.showing = false; + }; + },100); + }; + + // If the label is currently showing + // then fade it down to the amount + // specified in the settings + base.fadeOnFocus = function () { + if (base.showing) { + base.setOpacity(base.options.fadeOpacity); + } + }; + + base.setOpacity = function (opacity) { + base.$label.stop().animate({ opacity: opacity }, base.options.fadeDuration); + base.showing = (opacity > 0.0); + }; + + // Checks for empty as a fail safe + // set blur to true when passing from + // the blur event + base.checkForEmpty = function (blur) { + if (base.$field.val() === "") { + base.prepForShow(); + base.setOpacity(blur ? 1.0 : base.options.fadeOpacity); + } else { + base.setOpacity(0.0); + } + }; + + base.prepForShow = function (e) { + if (!base.showing) { + // Prepare for a animate in... + base.$label.css({opacity: 0.0}).show(); + + // Reattach the keydown event + base.$field.bind('keydown.infieldlabel', function (e) { + base.hideOnChange(e); + }); + } + }; + + base.hideOnChange = function (e) { + if ( + (e.keyCode === 16) || // Skip Shift + (e.keyCode === 9) // Skip Tab + ) { + return; + } + + if (base.showing) { + base.$label.hide(); + base.showing = false; + } + + // Remove keydown event to save on CPU processing + base.$field.unbind('keydown.infieldlabel'); + }; + + // Run the initialization method + base.init(); + }; + + $.InFieldLabels.defaultOptions = { + fadeOpacity: 0.5, // Once a field has focus, how transparent should the label be + fadeDuration: 300 // How long should it take to animate from 1.0 opacity to the fadeOpacity + }; + + + $.fn.inFieldLabels = function (options) { + return this.each(function () { + // Find input or textarea based on for= attribute + // The for attribute on the label must contain the ID + // of the input or textarea element + var for_attr = $(this).attr('for'), $field; + if (!for_attr) { + return; // Nothing to attach, since the for field wasn't used + } + + // Find the referenced input or textarea element + $field = $( + "input#" + for_attr + "[type='text']," + + "input#" + for_attr + "[type='search']," + + "input#" + for_attr + "[type='tel']," + + "input#" + for_attr + "[type='url']," + + "input#" + for_attr + "[type='email']," + + "input#" + for_attr + "[type='password']," + + "textarea#" + for_attr + ); + + if ($field.length === 0) { + return; // Again, nothing to attach + } + + // Only create object for input[text], input[password], or textarea + (new $.InFieldLabels(this, $field[0], options)); + }); + }; + +}(jQuery));
\ No newline at end of file diff --git a/core/js/jquery.infieldlabel.min.js b/core/js/jquery.infieldlabel.min.js deleted file mode 100644 index 36f6b8f1271..00000000000 --- a/core/js/jquery.infieldlabel.min.js +++ /dev/null @@ -1,12 +0,0 @@ -/* - In-Field Label jQuery Plugin - http://fuelyourcoding.com/scripts/infield.html - - Copyright (c) 2009-2010 Doug Neiner - Dual licensed under the MIT and GPL licenses. - Uses the same license as jQuery, see: - http://docs.jquery.com/License - - @version 0.1.5 -*/ -(function($){$.InFieldLabels=function(label,field,options){var base=this;base.$label=$(label);base.label=label;base.$field=$(field);base.field=field;base.$label.data("InFieldLabels",base);base.showing=true;base.init=function(){base.options=$.extend({},$.InFieldLabels.defaultOptions,options);setTimeout(function(){if(base.$field.val()!==""){base.$label.hide();base.showing=false}},200);base.$field.focus(function(){base.fadeOnFocus()}).blur(function(){base.checkForEmpty(true)}).bind('keydown.infieldlabel',function(e){base.hideOnChange(e)}).bind('paste',function(e){base.setOpacity(0.0)}).change(function(e){base.checkForEmpty()}).bind('onPropertyChange',function(){base.checkForEmpty()}).bind('keyup.infieldlabel',function(){base.checkForEmpty()})};base.fadeOnFocus=function(){if(base.showing){base.setOpacity(base.options.fadeOpacity)}};base.setOpacity=function(opacity){base.$label.stop().animate({opacity:opacity},base.options.fadeDuration);base.showing=(opacity>0.0)};base.checkForEmpty=function(blur){if(base.$field.val()===""){base.prepForShow();base.setOpacity(blur?1.0:base.options.fadeOpacity)}else{base.setOpacity(0.0)}};base.prepForShow=function(e){if(!base.showing){base.$label.css({opacity:0.0}).show();base.$field.bind('keydown.infieldlabel',function(e){base.hideOnChange(e)})}};base.hideOnChange=function(e){if((e.keyCode===16)||(e.keyCode===9)){return}if(base.showing){base.$label.hide();base.showing=false}base.$field.unbind('keydown.infieldlabel')};base.init()};$.InFieldLabels.defaultOptions={fadeOpacity:0.5,fadeDuration:300};$.fn.inFieldLabels=function(options){return this.each(function(){var for_attr=$(this).attr('for'),$field;if(!for_attr){return}$field=$("input#"+for_attr+"[type='text'],"+"input#"+for_attr+"[type='search'],"+"input#"+for_attr+"[type='tel'],"+"input#"+for_attr+"[type='url'],"+"input#"+for_attr+"[type='email'],"+"input#"+for_attr+"[type='password'],"+"textarea#"+for_attr);if($field.length===0){return}(new $.InFieldLabels(this,$field[0],options))})}}(jQuery)); diff --git a/core/js/js.js b/core/js/js.js index 790fe4dcb3f..e1f213972dc 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -1,4 +1,20 @@ /** + * Disable console output unless DEBUG mode is enabled. + * Add + * define('DEBUG', true); + * To the end of config/config.php to enable debug mode. + */ +if (oc_debug !== true) { + if (!window.console) { + window.console = {}; + } + var methods = ['log', 'debug', 'warn', 'info', 'error', 'assert']; + for (var i = 0; i < methods.length; i++) { + console[methods[i]] = function () { }; + } +} + +/** * translate a string * @param app the id of the app for which to translate the string * @param text the string to translate @@ -591,7 +607,7 @@ $(document).ready(function(){ $('.jp-controls .jp-previous').tipsy({gravity:'nw', fade:true, live:true}); $('.jp-controls .jp-next').tipsy({gravity:'n', fade:true, live:true}); $('.password .action').tipsy({gravity:'se', fade:true, live:true}); - $('.file_upload_button_wrapper').tipsy({gravity:'w', fade:true}); + $('#upload a').tipsy({gravity:'w', fade:true}); $('.selectedActions a').tipsy({gravity:'s', fade:true, live:true}); $('a.delete').tipsy({gravity: 'e', fade:true, live:true}); $('a.action').tipsy({gravity:'s', fade:true, live:true}); @@ -633,7 +649,7 @@ if (!Array.prototype.map){ /** * Filter Jquery selector by attribute value - **/ + */ $.fn.filterAttr = function(attr_name, attr_value) { return this.filter(function() { return $(this).attr(attr_name) === attr_value; }); }; @@ -641,7 +657,7 @@ $.fn.filterAttr = function(attr_name, attr_value) { function humanFileSize(size) { var humanList = ['B', 'kB', 'MB', 'GB', 'TB']; // Calculate Log with base 1024: size = 1024 ** order - var order = Math.floor(Math.log(size) / Math.log(1024)); + var order = size?Math.floor(Math.log(size) / Math.log(1024)):0; // Stay in range of the byte sizes that are defined order = Math.min(humanList.length - 1, order); var readableFormat = humanList[order]; @@ -668,6 +684,31 @@ function formatDate(date){ } /** + * takes an absolute timestamp and return a string with a human-friendly relative date + * @param int a Unix timestamp + */ +function relative_modified_date(timestamp) { + var timediff = Math.round((new Date()).getTime() / 1000) - timestamp; + var diffminutes = Math.round(timediff/60); + var diffhours = Math.round(diffminutes/60); + var diffdays = Math.round(diffhours/24); + var diffmonths = Math.round(diffdays/31); + if(timediff < 60) { return t('core','seconds ago'); } + else if(timediff < 120) { return t('core','1 minute ago'); } + else if(timediff < 3600) { return t('core','{minutes} minutes ago',{minutes: diffminutes}); } + else if(timediff < 7200) { return t('core','1 hour ago'); } + else if(timediff < 86400) { return t('core','{hours} hours ago',{hours: diffhours}); } + else if(timediff < 86400) { return t('core','today'); } + else if(timediff < 172800) { return t('core','yesterday'); } + else if(timediff < 2678400) { return t('core','{days} days ago',{days: diffdays}); } + else if(timediff < 5184000) { return t('core','last month'); } + else if(timediff < 31556926) { return t('core','{months} months ago',{months: diffmonths}); } + //else if(timediff < 31556926) { return t('core','months ago'); } + else if(timediff < 63113852) { return t('core','last year'); } + else { return t('core','years ago'); } +} + +/** * get a variable by name * @param string name */ diff --git a/core/js/oc-vcategories.js b/core/js/oc-vcategories.js index c99dd51f53a..609703f2cc9 100644 --- a/core/js/oc-vcategories.js +++ b/core/js/oc-vcategories.js @@ -1,30 +1,48 @@ -var OCCategories={ - edit:function(){ - if(OCCategories.app == undefined) { - OC.dialogs.alert('OCCategories.app is not set!'); - return; +var OCCategories= { + category_favorites:'_$!<Favorite>!$_', + edit:function(type, cb) { + if(!type && !this.type) { + throw { name: 'MissingParameter', message: t('core', 'The object type is not specified.') }; } + type = type ? type : this.type; $('body').append('<div id="category_dialog"></div>'); - $('#category_dialog').load(OC.filePath('core', 'ajax', 'vcategories/edit.php')+'?app='+OCCategories.app, function(response){ + $('#category_dialog').load( + OC.filePath('core', 'ajax', 'vcategories/edit.php') + '?type=' + type, function(response) { try { var jsondata = jQuery.parseJSON(response); - if(response.status == 'error'){ + if(response.status == 'error') { OC.dialogs.alert(response.data.message, 'Error'); return; } } catch(e) { - $('#edit_categories_dialog').dialog({ + var setEnabled = function(d, enable) { + if(enable) { + d.css('cursor', 'default').find('input,button:not(#category_addbutton)') + .prop('disabled', false).css('cursor', 'default'); + } else { + d.css('cursor', 'wait').find('input,button:not(#category_addbutton)') + .prop('disabled', true).css('cursor', 'wait'); + } + } + var dlg = $('#edit_categories_dialog').dialog({ modal: true, height: 350, minHeight:200, width: 250, minWidth: 200, buttons: { - 'Close': function() { - $(this).dialog("close"); + 'Close': function() { + $(this).dialog('close'); }, 'Delete':function() { - OCCategories.doDelete(); + var categories = $('#categorylist').find('input:checkbox').serialize(); + setEnabled(dlg, false); + OCCategories.doDelete(categories, function() { + setEnabled(dlg, true); + }); }, 'Rescan':function() { - OCCategories.rescan(); + setEnabled(dlg, false); + OCCategories.rescan(function() { + setEnabled(dlg, true); + }); } }, close : function(event, ui) { @@ -32,7 +50,7 @@ var OCCategories={ $('#category_dialog').remove(); }, open : function(event, ui) { - $('#category_addinput').live('input',function(){ + $('#category_addinput').live('input',function() { if($(this).val().length > 0) { $('#category_addbutton').removeAttr('disabled'); } @@ -43,7 +61,7 @@ var OCCategories={ $('#category_addbutton').attr('disabled', 'disabled'); return false; }); - $('#category_addbutton').live('click',function(e){ + $('#category_addbutton').live('click',function(e) { e.preventDefault(); if($('#category_addinput').val().length > 0) { OCCategories.add($('#category_addinput').val()); @@ -55,58 +73,142 @@ var OCCategories={ } }); }, - _processDeleteResult:function(jsondata, status, xhr){ - if(jsondata.status == 'success'){ + _processDeleteResult:function(jsondata) { + if(jsondata.status == 'success') { OCCategories._update(jsondata.data.categories); } else { OC.dialogs.alert(jsondata.data.message, 'Error'); } }, - doDelete:function(){ - var categories = $('#categorylist').find('input:checkbox').serialize(); + favorites:function(type, cb) { + if(!type && !this.type) { + throw { name: 'MissingParameter', message: t('core', 'The object type is not specified.') }; + } + type = type ? type : this.type; + $.getJSON(OC.filePath('core', 'ajax', 'categories/favorites.php'), {type: type},function(jsondata) { + if(typeof cb == 'function') { + cb(jsondata); + } else { + if(jsondata.status === 'success') { + OCCategories._update(jsondata.data.categories); + } else { + OC.dialogs.alert(jsondata.data.message, t('core', 'Error')); + } + } + }); + }, + addToFavorites:function(id, type, cb) { + if(!type && !this.type) { + throw { name: 'MissingParameter', message: t('core', 'The object type is not specified.') }; + } + type = type ? type : this.type; + $.post(OC.filePath('core', 'ajax', 'vcategories/addToFavorites.php'), {id:id, type:type}, function(jsondata) { + if(typeof cb == 'function') { + cb(jsondata); + } else { + if(jsondata.status !== 'success') { + OC.dialogs.alert(jsondata.data.message, 'Error'); + } + } + }); + }, + removeFromFavorites:function(id, type, cb) { + if(!type && !this.type) { + throw { name: 'MissingParameter', message: t('core', 'The object type is not specified.') }; + } + type = type ? type : this.type; + $.post(OC.filePath('core', 'ajax', 'vcategories/removeFromFavorites.php'), {id:id, type:type}, function(jsondata) { + if(typeof cb == 'function') { + cb(jsondata); + } else { + if(jsondata.status !== 'success') { + OC.dialogs.alert(jsondata.data.message, t('core', 'Error')); + } + } + }); + }, + doDelete:function(categories, type, cb) { + if(!type && !this.type) { + throw { name: 'MissingParameter', message: t('core', 'The object type is not specified.') }; + } + type = type ? type : this.type; if(categories == '' || categories == undefined) { OC.dialogs.alert(t('core', 'No categories selected for deletion.'), t('core', 'Error')); return false; } - categories += '&app=' + OCCategories.app; - $.post(OC.filePath(OCCategories.app, 'ajax', 'categories/delete.php'), categories, OCCategories._processDeleteResult) - .error(function(xhr){ - if (xhr.status == 404) { - $.post(OC.filePath('core', 'ajax', 'vcategories/delete.php'), categories, OCCategories._processDeleteResult); - } - }); + var self = this; + var q = categories + '&type=' + type; + if(this.app) { + q += '&app=' + this.app; + $.post(OC.filePath(this.app, 'ajax', 'categories/delete.php'), q, function(jsondata) { + if(typeof cb == 'function') { + cb(jsondata); + } else { + self._processDeleteResult(jsondata); + } + }); + } else { + $.post(OC.filePath('core', 'ajax', 'vcategories/delete.php'), q, function(jsondata) { + if(typeof cb == 'function') { + cb(jsondata); + } else { + self._processDeleteResult(jsondata); + } + }); + } }, - add:function(category){ - $.getJSON(OC.filePath('core', 'ajax', 'vcategories/add.php'),{'category':category, 'app':OCCategories.app},function(jsondata){ - if(jsondata.status == 'success'){ - OCCategories._update(jsondata.data.categories); + add:function(category, type, cb) { + if(!type && !this.type) { + throw { name: 'MissingParameter', message: t('core', 'The object type is not specified.') }; + } + type = type ? type : this.type; + $.post(OC.filePath('core', 'ajax', 'vcategories/add.php'),{'category':category, 'type':type},function(jsondata) { + if(typeof cb == 'function') { + cb(jsondata); } else { - OC.dialogs.alert(jsondata.data.message, 'Error'); + if(jsondata.status === 'success') { + OCCategories._update(jsondata.data.categories); + } else { + OC.dialogs.alert(jsondata.data.message, 'Error'); + } } }); - return false; }, - rescan:function(){ - $.getJSON(OC.filePath(OCCategories.app, 'ajax', 'categories/rescan.php'),function(jsondata, status, xhr){ - if(jsondata.status == 'success'){ - OCCategories._update(jsondata.data.categories); + rescan:function(app, cb) { + if(!app && !this.app) { + throw { name: 'MissingParameter', message: t('core', 'The app name is not specified.') }; + } + app = app ? app : this.app; + $.getJSON(OC.filePath(app, 'ajax', 'categories/rescan.php'),function(jsondata, status, xhr) { + if(typeof cb == 'function') { + cb(jsondata); } else { - OC.dialogs.alert(jsondata.data.message, 'Error'); + if(jsondata.status === 'success') { + OCCategories._update(jsondata.data.categories); + } else { + OC.dialogs.alert(jsondata.data.message, 'Error'); + } } }).error(function(xhr){ if (xhr.status == 404) { - OC.dialogs.alert('The required file ' + OC.filePath(OCCategories.app, 'ajax', 'categories/rescan.php') + ' is not installed!', 'Error'); + var errormessage = t('core', 'The required file {file} is not installed!', + {file: OC.filePath(app, 'ajax', 'categories/rescan.php')}, t('core', 'Error')); + if(typeof cb == 'function') { + cb({status:'error', data:{message:errormessage}}); + } else { + OC.dialogs.alert(errormessage); + } } }); }, - _update:function(categories){ + _update:function(categories) { var categorylist = $('#categorylist'); categorylist.find('li').remove(); for(var category in categories) { var item = '<li><input type="checkbox" name="categories" value="' + categories[category] + '" />' + categories[category] + '</li>'; $(item).appendTo(categorylist); } - if(OCCategories.changed != undefined) { + if(typeof OCCategories.changed === 'function') { OCCategories.changed(categories); } } diff --git a/core/js/requesttoken.js b/core/js/requesttoken.js deleted file mode 100644 index 0d78cd7e93b..00000000000 --- a/core/js/requesttoken.js +++ /dev/null @@ -1,55 +0,0 @@ -/** - * ownCloud - * - * @file core/js/requesttoken.js - * @brief Routine to refresh the Request protection request token periodically - * @author Christian Reiner (arkascha) - * @copyright 2011-2012 Christian Reiner <foss@christian-reiner.info> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE - * License as published by the Free Software Foundation; either - * version 3 of the license, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU AFFERO GENERAL PUBLIC LICENSE for more details. - * - * You should have received a copy of the GNU Affero General Public - * License along with this library. - * If not, see <http://www.gnu.org/licenses/>. - * - */ - -OC.Request = { - // the request token - Token: {}, - // the lifespan span (in secs) - Lifespan: {}, - // method to refresh the local request token periodically - Refresh: function(){ - // just a client side console log to preserve efficiency - console.log("refreshing request token (lifebeat)"); - var dfd=new $.Deferred(); - $.ajax({ - type: 'POST', - url: OC.filePath('core','ajax','requesttoken.php'), - cache: false, - data: { }, - dataType: 'json' - }).done(function(response){ - // store refreshed token inside this class - OC.Request.Token=response.token; - dfd.resolve(); - }).fail(dfd.reject); - return dfd; - } -} -// accept requesttoken and lifespan into the OC namespace -OC.Request.Token = oc_requesttoken; -OC.Request.Lifespan = oc_requestlifespan; -// refresh the request token periodically shortly before it becomes invalid on the server side -setInterval(OC.Request.Refresh,Math.floor(1000*OC.Request.Lifespan*0.93)), // 93% of lifespan value, close to when the token expires -// early bind token as additional ajax argument for every single request -$(document).bind('ajaxSend', function(elm, xhr, s){xhr.setRequestHeader('requesttoken', OC.Request.Token);}); diff --git a/core/js/router.js b/core/js/router.js index 8b66f5a05c5..3562785b342 100644 --- a/core/js/router.js +++ b/core/js/router.js @@ -1,9 +1,14 @@ OC.router_base_url = OC.webroot + '/index.php/', OC.Router = { + // register your ajax requests to load after the loading of the routes + // has finished. otherwise you face problems with race conditions + registerLoadedCallback: function(callback){ + this.routes_request.done(callback); + }, routes_request: $.ajax(OC.router_base_url + 'core/routes.json', { dataType: 'json', success: function(jsondata) { - if (jsondata.status == 'success') { + if (jsondata.status === 'success') { OC.Router.routes = jsondata.data; } } @@ -11,7 +16,7 @@ OC.Router = { generate:function(name, opt_params) { if (!('routes' in this)) { if(this.routes_request.state() != 'resolved') { - alert('wait');// wait + console.warn('To avoid race conditions, please register a callback');// wait } } if (!(name in this.routes)) { diff --git a/core/js/share.js b/core/js/share.js index 73c74a7cb6d..df5ebf008b4 100644 --- a/core/js/share.js +++ b/core/js/share.js @@ -146,7 +146,7 @@ OC.Share={ showDropDown:function(itemType, itemSource, appendTo, link, possiblePermissions) { var data = OC.Share.loadItem(itemType, itemSource); var html = '<div id="dropdown" class="drop" data-item-type="'+itemType+'" data-item-source="'+itemSource+'">'; - if (data.reshare) { + if (data !== false && data.reshare !== false && data.reshare.uid_owner !== undefined) { if (data.reshare.share_type == OC.Share.SHARE_TYPE_GROUP) { html += '<span class="reshare">'+t('core', 'Shared with you and the group {group} by {owner}', {group: data.reshare.share_with, owner: data.reshare.uid_owner})+'</span>'; } else { @@ -168,6 +168,10 @@ OC.Share={ html += '<input id="linkPassText" type="password" placeholder="'+t('core', 'Password')+'" />'; html += '</div>'; html += '</div>'; + html += '<form id="emailPrivateLink" >'; + html += '<input id="email" style="display:none; width:65%;" value="" placeholder="'+t('core', 'Email link to person')+'" type="text" />'; + html += '<input id="emailButton" style="display:none; float:right;" type="submit" value="'+t('core', 'Send')+'" />'; + html += '</form>'; } html += '<div id="expiration">'; html += '<input type="checkbox" name="expirationCheckbox" id="expirationCheckbox" value="1" /><label for="expirationCheckbox">'+t('core', 'Set expiration date')+'</label>'; @@ -179,7 +183,7 @@ OC.Share={ if (data.shares) { $.each(data.shares, function(index, share) { if (share.share_type == OC.Share.SHARE_TYPE_LINK) { - OC.Share.showLink(itemSource, share.share_with); + OC.Share.showLink(share.token, share.share_with, itemSource); } else { if (share.collection) { OC.Share.addShareWith(share.share_type, share.share_with, share.permissions, possiblePermissions, share.collection); @@ -323,18 +327,24 @@ OC.Share={ $('#expiration').show(); } }, - showLink:function(itemSource, password) { + showLink:function(token, password, itemSource) { OC.Share.itemShares[OC.Share.SHARE_TYPE_LINK] = true; $('#linkCheckbox').attr('checked', true); - var filename = $('tr').filterAttr('data-id', String(itemSource)).data('file'); - var type = $('tr').filterAttr('data-id', String(itemSource)).data('type'); - if ($('#dir').val() == '/') { - var file = $('#dir').val() + filename; + if (! token) { + //fallback to pre token link + var filename = $('tr').filterAttr('data-id', String(itemSource)).data('file'); + var type = $('tr').filterAttr('data-id', String(itemSource)).data('type'); + if ($('#dir').val() == '/') { + var file = $('#dir').val() + filename; + } else { + var file = $('#dir').val() + '/' + filename; + } + file = '/'+OC.currentUser+'/files'+file; + var link = parent.location.protocol+'//'+location.host+OC.linkTo('', 'public.php')+'?service=files&'+type+'='+encodeURIComponent(file); } else { - var file = $('#dir').val() + '/' + filename; + //TODO add path param when showing a link to file in a subfolder of a public link share + var link = parent.location.protocol+'//'+location.host+OC.linkTo('', 'public.php')+'?service=files&t='+token; } - file = '/'+OC.currentUser+'/files'+file; - var link = parent.location.protocol+'//'+location.host+OC.linkTo('', 'public.php')+'?service=files&'+type+'='+encodeURIComponent(file); $('#linkText').val(link); $('#linkText').show('blind'); $('#showPassword').show(); @@ -343,13 +353,17 @@ OC.Share={ $('#linkPassText').attr('placeholder', t('core', 'Password protected')); } $('#expiration').show(); + $('#emailPrivateLink #email').show(); + $('#emailPrivateLink #emailButton').show(); }, hideLink:function() { $('#linkText').hide('blind'); $('#showPassword').hide(); $('#linkPass').hide(); - }, - dirname:function(path) { + $('#emailPrivateLink #email').hide(); + $('#emailPrivateLink #emailButton').hide(); + }, + dirname:function(path) { return path.replace(/\\/g,'/').replace(/\/[^\/]*$/, ''); }, showExpirationDate:function(date) { @@ -364,6 +378,8 @@ OC.Share={ } $(document).ready(function() { + + if(typeof monthNames != 'undefined'){ $.datepicker.setDefaults({ monthNames: monthNames, monthNamesShort: $.map(monthNames, function(v) { return v.slice(0,3)+'.'; }), @@ -372,7 +388,7 @@ $(document).ready(function() { dayNamesShort: $.map(dayNames, function(v) { return v.slice(0,3)+'.'; }), firstDay: firstDay }); - + } $('a.share').live('click', function(event) { event.stopPropagation(); if ($(this).data('item-type') !== undefined && $(this).data('item') !== undefined) { @@ -478,8 +494,8 @@ $(document).ready(function() { var itemSource = $('#dropdown').data('item-source'); if (this.checked) { // Create a link - OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, '', OC.PERMISSION_READ, function() { - OC.Share.showLink(itemSource); + OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, '', OC.PERMISSION_READ, function(data) { + OC.Share.showLink(data.token, null, itemSource); OC.Share.updateIcon(itemType, itemSource); }); } else { @@ -539,4 +555,34 @@ $(document).ready(function() { }); }); + + $('#emailPrivateLink').live('submit', function(event) { + event.preventDefault(); + var link = $('#linkText').val(); + var itemType = $('#dropdown').data('item-type'); + var itemSource = $('#dropdown').data('item-source'); + var file = $('tr').filterAttr('data-id', String(itemSource)).data('file'); + var email = $('#email').val(); + if (email != '') { + $('#email').attr('disabled', "disabled"); + $('#email').val(t('core', 'Sending ...')); + $('#emailButton').attr('disabled', "disabled"); + + $.post(OC.filePath('core', 'ajax', 'share.php'), { action: 'email', toaddress: email, link: link, itemType: itemType, itemSource: itemSource, file: file}, + function(result) { + $('#email').attr('disabled', "false"); + $('#emailButton').attr('disabled', "false"); + if (result && result.status == 'success') { + $('#email').css('font-weight', 'bold'); + $('#email').animate({ fontWeight: 'normal' }, 2000, function() { + $(this).val(''); + }).val(t('core','Email sent')); + } else { + OC.dialogs.alert(result.data.message, t('core', 'Error while sharing')); + } + }); + } + }); + + }); diff --git a/core/l10n/ar.php b/core/l10n/ar.php index c7cbacbf644..80a22a248e6 100644 --- a/core/l10n/ar.php +++ b/core/l10n/ar.php @@ -2,6 +2,7 @@ "Settings" => "تعديلات", "Cancel" => "الغاء", "Password" => "كلمة السر", +"Unshare" => "إلغاء مشاركة", "Use the following link to reset your password: {link}" => "استخدم هذه الوصلة لاسترجاع كلمة السر: {link}", "You will receive a link to reset your password via Email." => "سوف نرسل لك بريد يحتوي على وصلة لتجديد كلمة السر.", "Username" => "إسم المستخدم", diff --git a/core/l10n/bg_BG.php b/core/l10n/bg_BG.php index b63062e8d31..0033324cb1d 100644 --- a/core/l10n/bg_BG.php +++ b/core/l10n/bg_BG.php @@ -1,11 +1,11 @@ <?php $TRANSLATIONS = array( "This category already exists: " => "Категорията вече съществува:", +"No categories selected for deletion." => "Няма избрани категории за изтриване", "Settings" => "Настройки", "Cancel" => "Отказ", "No" => "Не", "Yes" => "Да", "Ok" => "Добре", -"No categories selected for deletion." => "Няма избрани категории за изтриване", "Error" => "Грешка", "Password" => "Парола", "You will receive a link to reset your password via Email." => "Ще получите връзка за нулиране на паролата Ви.", diff --git a/core/l10n/ca.php b/core/l10n/ca.php index 5c7552a4e87..cf7cdfb7c94 100644 --- a/core/l10n/ca.php +++ b/core/l10n/ca.php @@ -1,15 +1,39 @@ <?php $TRANSLATIONS = array( -"Application name not provided." => "No s'ha facilitat cap nom per l'aplicació.", +"User %s shared a file with you" => "L'usuari %s ha compartit un fitxer amb vós", +"User %s shared a folder with you" => "L'usuari %s ha compartit una carpeta amb vós", +"User %s shared the file \"%s\" with you. It is available for download here: %s" => "L'usuari %s ha compartit el fitxer \"%s\" amb vós. Està disponible per a la descàrrega a: %s", +"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "L'usuari %s ha compartit la carpeta \"%s\" amb vós. Està disponible per a la descàrrega a: %s", +"Category type not provided." => "No s'ha especificat el tipus de categoria.", "No category to add?" => "No voleu afegir cap categoria?", "This category already exists: " => "Aquesta categoria ja existeix:", +"Object type not provided." => "No s'ha proporcionat el tipus d'objecte.", +"%s ID not provided." => "No s'ha proporcionat la ID %s.", +"Error adding %s to favorites." => "Error en afegir %s als preferits.", +"No categories selected for deletion." => "No hi ha categories per eliminar.", +"Error removing %s from favorites." => "Error en eliminar %s dels preferits.", "Settings" => "Arranjament", +"seconds ago" => "segons enrere", +"1 minute ago" => "fa 1 minut", +"{minutes} minutes ago" => "fa {minutes} minuts", +"1 hour ago" => "fa 1 hora", +"{hours} hours ago" => "fa {hours} hores", +"today" => "avui", +"yesterday" => "ahir", +"{days} days ago" => "fa {days} dies", +"last month" => "el mes passat", +"{months} months ago" => "fa {months} mesos", +"months ago" => "mesos enrere", +"last year" => "l'any passat", +"years ago" => "anys enrere", "Choose" => "Escull", "Cancel" => "Cancel·la", "No" => "No", "Yes" => "Sí", "Ok" => "D'acord", -"No categories selected for deletion." => "No hi ha categories per eliminar.", +"The object type is not specified." => "No s'ha especificat el tipus d'objecte.", "Error" => "Error", +"The app name is not specified." => "No s'ha especificat el nom de l'aplicació.", +"The required file {file} is not installed!" => "El figtxer requerit {file} no està instal·lat!", "Error while sharing" => "Error en compartir", "Error while unsharing" => "Error en deixar de compartir", "Error while changing permissions" => "Error en canviar els permisos", @@ -19,6 +43,8 @@ "Share with link" => "Comparteix amb enllaç", "Password protect" => "Protegir amb contrasenya", "Password" => "Contrasenya", +"Email link to person" => "Enllaç per correu electrónic amb la persona", +"Send" => "Envia", "Set expiration date" => "Estableix la data d'expiració", "Expiration date" => "Data d'expiració", "Share via email:" => "Comparteix per correu electrònic", @@ -35,6 +61,8 @@ "Password protected" => "Protegeix amb contrasenya", "Error unsetting expiration date" => "Error en eliminar la data d'expiració", "Error setting expiration date" => "Error en establir la data d'expiració", +"Sending ..." => "Enviant...", +"Email sent" => "El correu electrónic s'ha enviat", "ownCloud password reset" => "estableix de nou la contrasenya Owncloud", "Use the following link to reset your password: {link}" => "Useu l'enllaç següent per restablir la contrasenya: {link}", "You will receive a link to reset your password via Email." => "Rebreu un enllaç al correu electrònic per reiniciar la contrasenya.", diff --git a/core/l10n/cs_CZ.php b/core/l10n/cs_CZ.php index f6d2b3977b1..96252ea8bba 100644 --- a/core/l10n/cs_CZ.php +++ b/core/l10n/cs_CZ.php @@ -1,15 +1,39 @@ <?php $TRANSLATIONS = array( -"Application name not provided." => "Nezadán název aplikace.", +"User %s shared a file with you" => "Uživatel %s s vámi sdílí soubor", +"User %s shared a folder with you" => "Uživatel %s s vámi sdílí složku", +"User %s shared the file \"%s\" with you. It is available for download here: %s" => "Uživatel %s s vámi sdílí soubor \"%s\". Můžete jej stáhnout zde: %s", +"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Uživatel %s s vámi sdílí složku \"%s\". Můžete ji stáhnout zde: %s", +"Category type not provided." => "Nezadán typ kategorie.", "No category to add?" => "Žádná kategorie k přidání?", "This category already exists: " => "Tato kategorie již existuje: ", +"Object type not provided." => "Nezadán typ objektu.", +"%s ID not provided." => "Nezadáno ID %s.", +"Error adding %s to favorites." => "Chyba při přidávání %s k oblíbeným.", +"No categories selected for deletion." => "Žádné kategorie nebyly vybrány ke smazání.", +"Error removing %s from favorites." => "Chyba při odebírání %s z oblíbených.", "Settings" => "Nastavení", +"seconds ago" => "před pár vteřinami", +"1 minute ago" => "před minutou", +"{minutes} minutes ago" => "před {minutes} minutami", +"1 hour ago" => "před hodinou", +"{hours} hours ago" => "před {hours} hodinami", +"today" => "dnes", +"yesterday" => "včera", +"{days} days ago" => "před {days} dny", +"last month" => "minulý mesíc", +"{months} months ago" => "před {months} měsíci", +"months ago" => "před měsíci", +"last year" => "minulý rok", +"years ago" => "před lety", "Choose" => "Vybrat", "Cancel" => "Zrušit", "No" => "Ne", "Yes" => "Ano", "Ok" => "Ok", -"No categories selected for deletion." => "Žádné kategorie nebyly vybrány ke smazání.", +"The object type is not specified." => "Není určen typ objektu.", "Error" => "Chyba", +"The app name is not specified." => "Není určen název aplikace.", +"The required file {file} is not installed!" => "Požadovaný soubor {file} není nainstalován.", "Error while sharing" => "Chyba při sdílení", "Error while unsharing" => "Chyba při rušení sdílení", "Error while changing permissions" => "Chyba při změně oprávnění", @@ -19,6 +43,8 @@ "Share with link" => "Sdílet s odkazem", "Password protect" => "Chránit heslem", "Password" => "Heslo", +"Email link to person" => "Odeslat osobě odkaz e-mailem", +"Send" => "Odeslat", "Set expiration date" => "Nastavit datum vypršení platnosti", "Expiration date" => "Datum vypršení platnosti", "Share via email:" => "Sdílet e-mailem:", @@ -35,6 +61,8 @@ "Password protected" => "Chráněno heslem", "Error unsetting expiration date" => "Chyba při odstraňování data vypršení platnosti", "Error setting expiration date" => "Chyba při nastavení data vypršení platnosti", +"Sending ..." => "Odesílám...", +"Email sent" => "E-mail odeslán", "ownCloud password reset" => "Obnovení hesla pro ownCloud", "Use the following link to reset your password: {link}" => "Heslo obnovíte použitím následujícího odkazu: {link}", "You will receive a link to reset your password via Email." => "Bude Vám e-mailem zaslán odkaz pro obnovu hesla.", diff --git a/core/l10n/da.php b/core/l10n/da.php index 2614d376894..2798b22830f 100644 --- a/core/l10n/da.php +++ b/core/l10n/da.php @@ -1,14 +1,23 @@ <?php $TRANSLATIONS = array( -"Application name not provided." => "Applikationens navn ikke medsendt", "No category to add?" => "Ingen kategori at tilføje?", "This category already exists: " => "Denne kategori eksisterer allerede: ", +"No categories selected for deletion." => "Ingen kategorier valgt", "Settings" => "Indstillinger", +"seconds ago" => "sekunder siden", +"1 minute ago" => "1 minut siden", +"{minutes} minutes ago" => "{minutes} minutter siden", +"today" => "i dag", +"yesterday" => "i går", +"{days} days ago" => "{days} dage siden", +"last month" => "sidste måned", +"months ago" => "måneder siden", +"last year" => "sidste år", +"years ago" => "år siden", "Choose" => "Vælg", "Cancel" => "Fortryd", "No" => "Nej", "Yes" => "Ja", "Ok" => "OK", -"No categories selected for deletion." => "Ingen kategorier valgt", "Error" => "Fejl", "Error while sharing" => "Fejl under deling", "Error while unsharing" => "Fejl under annullering af deling", diff --git a/core/l10n/de.php b/core/l10n/de.php index 5382d1cc641..5ad16273fb9 100644 --- a/core/l10n/de.php +++ b/core/l10n/de.php @@ -1,15 +1,35 @@ <?php $TRANSLATIONS = array( -"Application name not provided." => "Der Anwendungsname wurde nicht angegeben.", +"Category type not provided." => "Kategorie nicht angegeben.", "No category to add?" => "Keine Kategorie hinzuzufügen?", "This category already exists: " => "Kategorie existiert bereits:", +"Object type not provided." => "Objekttyp nicht angegeben.", +"%s ID not provided." => "%s ID nicht angegeben.", +"Error adding %s to favorites." => "Fehler beim Hinzufügen von %s zu den Favoriten.", +"No categories selected for deletion." => "Es wurde keine Kategorien zum Löschen ausgewählt.", +"Error removing %s from favorites." => "Fehler beim Entfernen von %s von den Favoriten.", "Settings" => "Einstellungen", +"seconds ago" => "Gerade eben", +"1 minute ago" => "vor einer Minute", +"{minutes} minutes ago" => "Vor {minutes} Minuten", +"1 hour ago" => "Vor einer Stunde", +"{hours} hours ago" => "Vor {hours} Stunden", +"today" => "Heute", +"yesterday" => "Gestern", +"{days} days ago" => "Vor {days} Tag(en)", +"last month" => "Letzten Monat", +"{months} months ago" => "Vor {months} Monaten", +"months ago" => "Vor Monaten", +"last year" => "Letztes Jahr", +"years ago" => "Vor Jahren", "Choose" => "Auswählen", "Cancel" => "Abbrechen", "No" => "Nein", "Yes" => "Ja", "Ok" => "OK", -"No categories selected for deletion." => "Es wurde keine Kategorien zum Löschen ausgewählt.", +"The object type is not specified." => "Der Objekttyp ist nicht angegeben.", "Error" => "Fehler", +"The app name is not specified." => "Der App-Name ist nicht angegeben.", +"The required file {file} is not installed!" => "Die benötigte Datei {file} ist nicht installiert.", "Error while sharing" => "Fehler beim Freigeben", "Error while unsharing" => "Fehler beim Aufheben der Freigabe", "Error while changing permissions" => "Fehler beim Ändern der Rechte", @@ -19,6 +39,8 @@ "Share with link" => "Über einen Link freigeben", "Password protect" => "Passwortschutz", "Password" => "Passwort", +"Email link to person" => "Link per E-Mail verschicken", +"Send" => "Senden", "Set expiration date" => "Setze ein Ablaufdatum", "Expiration date" => "Ablaufdatum", "Share via email:" => "Über eine E-Mail freigeben:", @@ -35,9 +57,13 @@ "Password protected" => "Durch ein Passwort geschützt", "Error unsetting expiration date" => "Fehler beim entfernen des Ablaufdatums", "Error setting expiration date" => "Fehler beim Setzen des Ablaufdatums", +"Sending ..." => "Sende ...", +"Email sent" => "E-Mail wurde verschickt", "ownCloud password reset" => "ownCloud-Passwort zurücksetzen", "Use the following link to reset your password: {link}" => "Nutze den nachfolgenden Link, um Dein Passwort zurückzusetzen: {link}", "You will receive a link to reset your password via Email." => "Du erhältst einen Link per E-Mail, um Dein Passwort zurückzusetzen.", +"Reset email send." => "Die E-Mail zum Zurücksetzen wurde versendet.", +"Request failed!" => "Die Anfrage schlug fehl!", "Username" => "Benutzername", "Request reset" => "Beantrage Zurücksetzung", "Your password was reset" => "Dein Passwort wurde zurückgesetzt.", @@ -90,7 +116,7 @@ "web services under your control" => "Web-Services unter Ihrer Kontrolle", "Log out" => "Abmelden", "Automatic logon rejected!" => "Automatischer Login zurückgewiesen!", -"If you did not change your password recently, your account may be compromised!" => "Wenn du Dein Passwort nicht änderst, könnte dein Account kompromitiert werden!", +"If you did not change your password recently, your account may be compromised!" => "Wenn Du Dein Passwort nicht vor kurzem geändert hast, könnte Dein\nAccount kompromittiert sein!", "Please change your password to secure your account again." => "Bitte ändere Dein Passwort, um Deinen Account wieder zu schützen.", "Lost your password?" => "Passwort vergessen?", "remember" => "merken", diff --git a/core/l10n/de_DE.php b/core/l10n/de_DE.php index 1425970f3a4..e32068f6db2 100644 --- a/core/l10n/de_DE.php +++ b/core/l10n/de_DE.php @@ -1,29 +1,55 @@ <?php $TRANSLATIONS = array( -"Application name not provided." => "Der Anwendungsname wurde nicht angegeben.", +"User %s shared a file with you" => "Der Nutzer %s teilt eine Datei mit dir", +"User %s shared a folder with you" => "Der Nutzer %s teilt einen Ordner mit dir", +"User %s shared the file \"%s\" with you. It is available for download here: %s" => "Der Nutzer %s teilt die Datei \"%s\" mit dir. Du kannst diese hier herunterladen: %s", +"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Der Nutzer %s teilt den Ornder \"%s\" mit dir. Du kannst diesen hier herunterladen: %s", +"Category type not provided." => "Kategorie nicht angegeben.", "No category to add?" => "Keine Kategorie hinzuzufügen?", "This category already exists: " => "Kategorie existiert bereits:", +"Object type not provided." => "Objekttyp nicht angegeben.", +"%s ID not provided." => "%s ID nicht angegeben.", +"Error adding %s to favorites." => "Fehler beim Hinzufügen von %s zu den Favoriten.", +"No categories selected for deletion." => "Es wurden keine Kategorien zum Löschen ausgewählt.", +"Error removing %s from favorites." => "Fehler beim Entfernen von %s von den Favoriten.", "Settings" => "Einstellungen", +"seconds ago" => "Gerade eben", +"1 minute ago" => "Vor 1 Minute", +"{minutes} minutes ago" => "Vor {minutes} Minuten", +"1 hour ago" => "Vor einer Stunde", +"{hours} hours ago" => "Vor {hours} Stunden", +"today" => "Heute", +"yesterday" => "Gestern", +"{days} days ago" => "Vor {days} Tag(en)", +"last month" => "Letzten Monat", +"{months} months ago" => "Vor {months} Monaten", +"months ago" => "Vor Monaten", +"last year" => "Letztes Jahr", +"years ago" => "Vor Jahren", "Choose" => "Auswählen", "Cancel" => "Abbrechen", "No" => "Nein", "Yes" => "Ja", "Ok" => "OK", -"No categories selected for deletion." => "Es wurden keine Kategorien zum Löschen ausgewählt.", +"The object type is not specified." => "Der Objekttyp ist nicht angegeben.", "Error" => "Fehler", -"Error while sharing" => "Fehler beim Freigeben", -"Error while unsharing" => "Fehler beim Aufheben der Freigabe", -"Error while changing permissions" => "Fehler beim Ändern der Rechte", -"Shared with you and the group {group} by {owner}" => "Durch {owner} für Sie und die Gruppe{group} freigegeben.", +"The app name is not specified." => "Der App-Name ist nicht angegeben.", +"The required file {file} is not installed!" => "Die benötigte Datei {file} ist nicht installiert.", +"Error while sharing" => "Fehler bei der Freigabe", +"Error while unsharing" => "Fehler bei der Aufhebung der Freigabe", +"Error while changing permissions" => "Fehler bei der Änderung der Rechte", +"Shared with you and the group {group} by {owner}" => "Durch {owner} für Sie und die Gruppe {group} freigegeben.", "Shared with you by {owner}" => "Durch {owner} für Sie freigegeben.", "Share with" => "Freigeben für", "Share with link" => "Über einen Link freigeben", "Password protect" => "Passwortschutz", "Password" => "Passwort", +"Email link to person" => "Link per Mail an Person schicken", +"Send" => "Senden", "Set expiration date" => "Setze ein Ablaufdatum", "Expiration date" => "Ablaufdatum", -"Share via email:" => "Über eine E-Mail freigeben:", +"Share via email:" => "Mittels einer E-Mail freigeben:", "No people found" => "Niemand gefunden", -"Resharing is not allowed" => "Weiterverteilen ist nicht erlaubt", +"Resharing is not allowed" => "Das Weiterverteilen ist nicht erlaubt", "Shared in {item} with {user}" => "Freigegeben in {item} von {user}", "Unshare" => "Freigabe aufheben", "can edit" => "kann bearbeiten", @@ -33,8 +59,10 @@ "delete" => "löschen", "share" => "freigeben", "Password protected" => "Durch ein Passwort geschützt", -"Error unsetting expiration date" => "Fehler beim entfernen des Ablaufdatums", +"Error unsetting expiration date" => "Fehler beim Entfernen des Ablaufdatums", "Error setting expiration date" => "Fehler beim Setzen des Ablaufdatums", +"Sending ..." => "Sende ...", +"Email sent" => "Email gesendet", "ownCloud password reset" => "ownCloud-Passwort zurücksetzen", "Use the following link to reset your password: {link}" => "Nutzen Sie den nachfolgenden Link, um Ihr Passwort zurückzusetzen: {link}", "You will receive a link to reset your password via Email." => "Sie erhalten einen Link per E-Mail, um Ihr Passwort zurückzusetzen.", @@ -56,8 +84,8 @@ "Edit categories" => "Kategorien bearbeiten", "Add" => "Hinzufügen", "Security Warning" => "Sicherheitshinweis", -"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Es ist kein sicherer Zufallszahlengenerator verfügbar, bitte aktivieren Sie die PHP-Erweiterung für OpenSSL", -"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Ohne einen sicheren Zufallszahlengenerator sind Angreifer in der Lage die Tokens für das Zurücksetzen der Passwörter vorherzusehen und damit können Konten übernommen.", +"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Es ist kein sicherer Zufallszahlengenerator verfügbar, bitte aktivieren Sie die PHP-Erweiterung für OpenSSL.", +"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Ohne einen sicheren Zufallszahlengenerator sind Angreifer in der Lage, die Tokens für das Zurücksetzen der Passwörter vorherzusehen und Ihr Konto zu übernehmen.", "Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Ihr Datenverzeichnis und Ihre Dateien sind wahrscheinlich über das Internet erreichbar. Die von ownCloud bereitgestellte .htaccess Datei funktioniert nicht. Wir empfehlen Ihnen dringend, Ihren Webserver so zu konfigurieren, dass das Datenverzeichnis nicht mehr über das Internet erreichbar ist. Alternativ können Sie auch das Datenverzeichnis aus dem Dokumentenverzeichnis des Webservers verschieben.", "Create an <strong>admin account</strong>" => "<strong>Administrator-Konto</strong> anlegen", "Advanced" => "Fortgeschritten", @@ -92,8 +120,8 @@ "web services under your control" => "Web-Services unter Ihrer Kontrolle", "Log out" => "Abmelden", "Automatic logon rejected!" => "Automatische Anmeldung verweigert.", -"If you did not change your password recently, your account may be compromised!" => "Wenn Sie Ihr Passwort nicht kürzlich geändert haben könnte Ihr Konto gefährdet sein.", -"Please change your password to secure your account again." => "Bitte ändern Sie Ihr Passwort, um Ihr Konto wieder zu sichern..", +"If you did not change your password recently, your account may be compromised!" => "Wenn Sie Ihr Passwort nicht vor kurzem geändert haben, könnte Ihr\nAccount kompromittiert sein!", +"Please change your password to secure your account again." => "Bitte ändern Sie Ihr Passwort, um Ihr Konto wieder zu sichern.", "Lost your password?" => "Passwort vergessen?", "remember" => "merken", "Log in" => "Einloggen", @@ -101,6 +129,6 @@ "prev" => "Zurück", "next" => "Weiter", "Security Warning!" => "Sicherheitshinweis!", -"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Bitte überprüfen Sie Ihr Passwort. <br/>Aus Sicherheitsgründen werden Sie gelegentlich aufgefordert, Ihr Passwort einzugeben.", +"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Bitte überprüfen Sie Ihr Passwort. <br/>Aus Sicherheitsgründen werden Sie gelegentlich aufgefordert, Ihr Passwort erneut einzugeben.", "Verify" => "Überprüfen" ); diff --git a/core/l10n/el.php b/core/l10n/el.php index e387d19bef1..e01de9fdc2c 100644 --- a/core/l10n/el.php +++ b/core/l10n/el.php @@ -1,15 +1,35 @@ <?php $TRANSLATIONS = array( -"Application name not provided." => "Δε προσδιορίστηκε όνομα εφαρμογής", -"No category to add?" => "Δεν έχετε να προστέσθέσεται μια κα", -"This category already exists: " => "Αυτή η κατηγορία υπάρχει ήδη", +"Category type not provided." => "Δεν δώθηκε τύπος κατηγορίας.", +"No category to add?" => "Δεν έχετε κατηγορία να προσθέσετε;", +"This category already exists: " => "Αυτή η κατηγορία υπάρχει ήδη:", +"Object type not provided." => "Δεν δώθηκε τύπος αντικειμένου.", +"%s ID not provided." => "Δεν δώθηκε η ID για %s.", +"Error adding %s to favorites." => "Σφάλμα προσθήκης %s στα αγαπημένα.", +"No categories selected for deletion." => "Δεν επιλέχτηκαν κατηγορίες για διαγραφή.", +"Error removing %s from favorites." => "Σφάλμα αφαίρεσης %s από τα αγαπημένα.", "Settings" => "Ρυθμίσεις", +"seconds ago" => "δευτερόλεπτα πριν", +"1 minute ago" => "1 λεπτό πριν", +"{minutes} minutes ago" => "{minutes} λεπτά πριν", +"1 hour ago" => "1 ώρα πριν", +"{hours} hours ago" => "{hours} ώρες πριν", +"today" => "σήμερα", +"yesterday" => "χτες", +"{days} days ago" => "{days} ημέρες πριν", +"last month" => "τελευταίο μήνα", +"{months} months ago" => "{months} μήνες πριν", +"months ago" => "μήνες πριν", +"last year" => "τελευταίο χρόνο", +"years ago" => "χρόνια πριν", "Choose" => "Επιλέξτε", -"Cancel" => "Ακύρωση", +"Cancel" => "Άκυρο", "No" => "Όχι", "Yes" => "Ναι", "Ok" => "Οκ", -"No categories selected for deletion." => "Δεν επιλέχτηκαν κατηγορίες για διαγραφή", +"The object type is not specified." => "Δεν καθορίστηκε ο τύπος του αντικειμένου.", "Error" => "Σφάλμα", +"The app name is not specified." => "Δεν καθορίστηκε το όνομα της εφαρμογής.", +"The required file {file} is not installed!" => "Το απαιτούμενο αρχείο {file} δεν εγκαταστάθηκε!", "Error while sharing" => "Σφάλμα κατά τον διαμοιρασμό", "Error while unsharing" => "Σφάλμα κατά το σταμάτημα του διαμοιρασμού", "Error while changing permissions" => "Σφάλμα κατά την αλλαγή των δικαιωμάτων", @@ -17,25 +37,25 @@ "Shared with you by {owner}" => "Διαμοιράστηκε με σας από τον {owner}", "Share with" => "Διαμοιρασμός με", "Share with link" => "Διαμοιρασμός με σύνδεσμο", -"Password protect" => "Προστασία κωδικού", -"Password" => "Κωδικός", +"Password protect" => "Προστασία συνθηματικού", +"Password" => "Συνθηματικό", "Set expiration date" => "Ορισμός ημ. λήξης", "Expiration date" => "Ημερομηνία λήξης", "Share via email:" => "Διαμοιρασμός μέσω email:", "No people found" => "Δεν βρέθηκε άνθρωπος", "Resharing is not allowed" => "Ξαναμοιρασμός δεν επιτρέπεται", "Shared in {item} with {user}" => "Διαμοιρασμός του {item} με τον {user}", -"Unshare" => "Σταμάτημα μοιράσματος", +"Unshare" => "Σταμάτημα διαμοιρασμού", "can edit" => "δυνατότητα αλλαγής", "access control" => "έλεγχος πρόσβασης", "create" => "δημιουργία", -"update" => "ανανέωση", +"update" => "ενημέρωση", "delete" => "διαγραφή", "share" => "διαμοιρασμός", -"Password protected" => "Προστασία με κωδικό", +"Password protected" => "Προστασία με συνθηματικό", "Error unsetting expiration date" => "Σφάλμα κατά την διαγραφή της ημ. λήξης", "Error setting expiration date" => "Σφάλμα κατά τον ορισμό ημ. λήξης", -"ownCloud password reset" => "Επαναφορά κωδικού ownCloud", +"ownCloud password reset" => "Επαναφορά συνθηματικού ownCloud", "Use the following link to reset your password: {link}" => "Χρησιμοποιήστε τον ακόλουθο σύνδεσμο για να επανεκδόσετε τον κωδικό: {link}", "You will receive a link to reset your password via Email." => "Θα λάβετε ένα σύνδεσμο για να επαναφέρετε τον κωδικό πρόσβασής σας μέσω ηλεκτρονικού ταχυδρομείου.", "Reset email send." => "Η επαναφορά του email στάλθηκε.", @@ -44,26 +64,28 @@ "Request reset" => "Επαναφορά αίτησης", "Your password was reset" => "Ο κωδικός πρόσβασής σας επαναφέρθηκε", "To login page" => "Σελίδα εισόδου", -"New password" => "Νέος κωδικός", -"Reset password" => "Επαναφορά κωδικού πρόσβασης", +"New password" => "Νέο συνθηματικό", +"Reset password" => "Επαναφορά συνθηματικού", "Personal" => "Προσωπικά", "Users" => "Χρήστες", "Apps" => "Εφαρμογές", "Admin" => "Διαχειριστής", "Help" => "Βοήθεια", "Access forbidden" => "Δεν επιτρέπεται η πρόσβαση", -"Cloud not found" => "Δεν βρέθηκε σύννεφο", -"Edit categories" => "Επεξεργασία κατηγορίας", +"Cloud not found" => "Δεν βρέθηκε νέφος", +"Edit categories" => "Επεξεργασία κατηγοριών", "Add" => "Προσθήκη", "Security Warning" => "Προειδοποίηση Ασφαλείας", -"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Ο κατάλογος data και τα αρχεία σας πιθανόν να είναι διαθέσιμα στο διαδίκτυο. Το αρχείο .htaccess που παρέχει το ownCloud δεν δουλεύει. Σας προτείνουμε ανεπιφύλακτα να ρυθμίσετε το διακομιστή σας με τέτοιο τρόπο ώστε ο κατάλογος data να μην είναι πλέον προσβάσιμος ή να μετακινήσετε τον κατάλογο data έξω από τον κατάλογο του διακομιστή.", +"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Δεν είναι διαθέσιμο το πρόσθετο δημιουργίας τυχαίων αριθμών ασφαλείας, παρακαλώ ενεργοποιήστε το πρόσθετο της PHP, OpenSSL.", +"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Χωρίς το πρόσθετο δημιουργίας τυχαίων αριθμών ασφαλείας, μπορεί να διαρρεύσει ο λογαριασμός σας από επιθέσεις στο διαδίκτυο.", +"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Ο κατάλογος data και τα αρχεία σας πιθανόν να είναι διαθέσιμα στο διαδίκτυο. Το αρχείο .htaccess που παρέχει το ownCloud δεν δουλεύει. Σας προτείνουμε ανεπιφύλακτα να ρυθμίσετε το διακομιστή σας με τέτοιο τρόπο ώστε ο κατάλογος data να μην είναι πλέον προσβάσιμος ή να μετακινήσετε τον κατάλογο data έξω από τον κατάλογο του διακομιστή.", "Create an <strong>admin account</strong>" => "Δημιουργήστε έναν <strong>λογαριασμό διαχειριστή</strong>", "Advanced" => "Για προχωρημένους", "Data folder" => "Φάκελος δεδομένων", -"Configure the database" => "Διαμόρφωση της βάσης δεδομένων", +"Configure the database" => "Ρύθμιση της βάσης δεδομένων", "will be used" => "θα χρησιμοποιηθούν", "Database user" => "Χρήστης της βάσης δεδομένων", -"Database password" => "Κωδικός πρόσβασης βάσης δεδομένων", +"Database password" => "Συνθηματικό βάσης δεδομένων", "Database name" => "Όνομα βάσης δεδομένων", "Database tablespace" => "Κενά Πινάκων Βάσης Δεδομένων", "Database host" => "Διακομιστής βάσης δεδομένων", @@ -90,13 +112,15 @@ "web services under your control" => "Υπηρεσίες web υπό τον έλεγχό σας", "Log out" => "Αποσύνδεση", "Automatic logon rejected!" => "Απορρίφθηκε η αυτόματη σύνδεση!", -"Please change your password to secure your account again." => "Παρακαλώ αλλάξτε τον κωδικό σας για να ασφαλίσετε πάλι τον λογαριασμό σας.", -"Lost your password?" => "Ξεχάσατε τον κωδικό σας;", -"remember" => "να με θυμάσαι", +"If you did not change your password recently, your account may be compromised!" => "Εάν δεν αλλάξατε το συνθηματικό σας προσφάτως, ο λογαριασμός μπορεί να έχει διαρρεύσει!", +"Please change your password to secure your account again." => "Παρακαλώ αλλάξτε το συνθηματικό σας για να ασφαλίσετε πάλι τον λογαριασμό σας.", +"Lost your password?" => "Ξεχάσατε το συνθηματικό σας;", +"remember" => "απομνημόνευση", "Log in" => "Είσοδος", "You are logged out." => "Έχετε αποσυνδεθεί.", "prev" => "προηγούμενο", "next" => "επόμενο", "Security Warning!" => "Προειδοποίηση Ασφαλείας!", +"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Παρακαλώ επιβεβαιώστε το συνθηματικό σας. <br/>Για λόγους ασφαλείας μπορεί να ερωτάστε να εισάγετε ξανά το συνθηματικό σας.", "Verify" => "Επαλήθευση" ); diff --git a/core/l10n/eo.php b/core/l10n/eo.php index e98f6c1616f..7b65652d67c 100644 --- a/core/l10n/eo.php +++ b/core/l10n/eo.php @@ -1,18 +1,40 @@ <?php $TRANSLATIONS = array( -"Application name not provided." => "Nomo de aplikaĵo ne proviziiĝis.", +"Category type not provided." => "Ne proviziĝis tipon de kategorio.", "No category to add?" => "Ĉu neniu kategorio estas aldonota?", "This category already exists: " => "Ĉi tiu kategorio jam ekzistas: ", +"Object type not provided." => "Ne proviziĝis tipon de objekto.", +"%s ID not provided." => "Ne proviziĝis ID-on de %s.", +"Error adding %s to favorites." => "Eraro dum aldono de %s al favoratoj.", +"No categories selected for deletion." => "Neniu kategorio elektiĝis por forigo.", +"Error removing %s from favorites." => "Eraro dum forigo de %s el favoratoj.", "Settings" => "Agordo", +"seconds ago" => "sekundoj antaŭe", +"1 minute ago" => "antaŭ 1 minuto", +"{minutes} minutes ago" => "antaŭ {minutes} minutoj", +"1 hour ago" => "antaŭ 1 horo", +"{hours} hours ago" => "antaŭ {hours} horoj", +"today" => "hodiaŭ", +"yesterday" => "hieraŭ", +"{days} days ago" => "antaŭ {days} tagoj", +"last month" => "lastamonate", +"{months} months ago" => "antaŭ {months} monatoj", +"months ago" => "monatoj antaŭe", +"last year" => "lastajare", +"years ago" => "jaroj antaŭe", "Choose" => "Elekti", "Cancel" => "Nuligi", "No" => "Ne", "Yes" => "Jes", "Ok" => "Akcepti", -"No categories selected for deletion." => "Neniu kategorio elektiĝis por forigo.", +"The object type is not specified." => "Ne indikiĝis tipo de la objekto.", "Error" => "Eraro", +"The app name is not specified." => "Ne indikiĝis nomo de la aplikaĵo.", +"The required file {file} is not installed!" => "La necesa dosiero {file} ne instaliĝis!", "Error while sharing" => "Eraro dum kunhavigo", "Error while unsharing" => "Eraro dum malkunhavigo", "Error while changing permissions" => "Eraro dum ŝanĝo de permesoj", +"Shared with you and the group {group} by {owner}" => "Kunhavigita kun vi kaj la grupo {group} de {owner}", +"Shared with you by {owner}" => "Kunhavigita kun vi de {owner}", "Share with" => "Kunhavigi kun", "Share with link" => "Kunhavigi per ligilo", "Password protect" => "Protekti per pasvorto", @@ -22,6 +44,7 @@ "Share via email:" => "Kunhavigi per retpoŝto:", "No people found" => "Ne troviĝis gento", "Resharing is not allowed" => "Rekunhavigo ne permesatas", +"Shared in {item} with {user}" => "Kunhavigita en {item} kun {user}", "Unshare" => "Malkunhavigi", "can edit" => "povas redakti", "access control" => "alirkontrolo", @@ -35,6 +58,7 @@ "ownCloud password reset" => "La pasvorto de ownCloud restariĝis.", "Use the following link to reset your password: {link}" => "Uzu la jenan ligilon por restarigi vian pasvorton: {link}", "You will receive a link to reset your password via Email." => "Vi ricevos ligilon retpoŝte por rekomencigi vian pasvorton.", +"Request failed!" => "Peto malsukcesis!", "Username" => "Uzantonomo", "Request reset" => "Peti rekomencigon", "Your password was reset" => "Via pasvorto rekomencis", @@ -51,6 +75,7 @@ "Edit categories" => "Redakti kategoriojn", "Add" => "Aldoni", "Security Warning" => "Sekureca averto", +"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Ne disponeblas sekura generilo de hazardaj numeroj; bonvolu kapabligi la OpenSSL-kromaĵon por PHP.", "Create an <strong>admin account</strong>" => "Krei <strong>administran konton</strong>", "Advanced" => "Progresinta", "Data folder" => "Datuma dosierujo", @@ -83,10 +108,15 @@ "December" => "Decembro", "web services under your control" => "TTT-servoj sub via kontrolo", "Log out" => "Elsaluti", +"If you did not change your password recently, your account may be compromised!" => "Se vi ne ŝanĝis vian pasvorton lastatempe, via konto eble kompromitas!", +"Please change your password to secure your account again." => "Bonvolu ŝanĝi vian pasvorton por sekurigi vian konton ree.", "Lost your password?" => "Ĉu vi perdis vian pasvorton?", "remember" => "memori", "Log in" => "Ensaluti", "You are logged out." => "Vi estas elsalutita.", "prev" => "maljena", -"next" => "jena" +"next" => "jena", +"Security Warning!" => "Sekureca averto!", +"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Bonvolu kontroli vian pasvorton. <br/>Pro sekureco, oni okaze povas peti al vi enigi vian pasvorton ree.", +"Verify" => "Kontroli" ); diff --git a/core/l10n/es.php b/core/l10n/es.php index 86c95cce5f0..2a9f5682dfb 100644 --- a/core/l10n/es.php +++ b/core/l10n/es.php @@ -1,15 +1,39 @@ <?php $TRANSLATIONS = array( -"Application name not provided." => "Nombre de la aplicación no provisto.", +"User %s shared a file with you" => "El usuario %s ha compartido un archivo contigo", +"User %s shared a folder with you" => "El usuario %s ha compartido una carpeta contigo", +"User %s shared the file \"%s\" with you. It is available for download here: %s" => "El usuario %s ha compartido el archivo \"%s\" contigo. Puedes descargarlo aquí: %s", +"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "El usuario %s ha compartido la carpeta \"%s\" contigo. Puedes descargarla aquí: %s", +"Category type not provided." => "Tipo de categoria no proporcionado.", "No category to add?" => "¿Ninguna categoría para añadir?", "This category already exists: " => "Esta categoría ya existe: ", +"Object type not provided." => "ipo de objeto no proporcionado.", +"%s ID not provided." => "%s ID no proporcionado.", +"Error adding %s to favorites." => "Error añadiendo %s a los favoritos.", +"No categories selected for deletion." => "No hay categorías seleccionadas para borrar.", +"Error removing %s from favorites." => "Error eliminando %s de los favoritos.", "Settings" => "Ajustes", +"seconds ago" => "hace segundos", +"1 minute ago" => "hace 1 minuto", +"{minutes} minutes ago" => "hace {minutes} minutos", +"1 hour ago" => "Hace 1 hora", +"{hours} hours ago" => "Hace {hours} horas", +"today" => "hoy", +"yesterday" => "ayer", +"{days} days ago" => "hace {days} días", +"last month" => "mes pasado", +"{months} months ago" => "Hace {months} meses", +"months ago" => "hace meses", +"last year" => "año pasado", +"years ago" => "hace años", "Choose" => "Seleccionar", "Cancel" => "Cancelar", "No" => "No", "Yes" => "Sí", "Ok" => "Aceptar", -"No categories selected for deletion." => "No hay categorías seleccionadas para borrar.", +"The object type is not specified." => "El tipo de objeto no se ha especificado.", "Error" => "Fallo", +"The app name is not specified." => "El nombre de la app no se ha especificado.", +"The required file {file} is not installed!" => "El fichero {file} requerido, no está instalado.", "Error while sharing" => "Error compartiendo", "Error while unsharing" => "Error descompartiendo", "Error while changing permissions" => "Error cambiando permisos", @@ -19,6 +43,8 @@ "Share with link" => "Compartir con enlace", "Password protect" => "Protegido por contraseña", "Password" => "Contraseña", +"Email link to person" => "Enviar un enlace por correo electrónico a una persona", +"Send" => "Enviar", "Set expiration date" => "Establecer fecha de caducidad", "Expiration date" => "Fecha de caducidad", "Share via email:" => "compartido via e-mail:", @@ -35,6 +61,8 @@ "Password protected" => "Protegido por contraseña", "Error unsetting expiration date" => "Error al eliminar la fecha de caducidad", "Error setting expiration date" => "Error estableciendo fecha de caducidad", +"Sending ..." => "Enviando...", +"Email sent" => "Correo electrónico enviado", "ownCloud password reset" => "Reiniciar contraseña de ownCloud", "Use the following link to reset your password: {link}" => "Utiliza el siguiente enlace para restablecer tu contraseña: {link}", "You will receive a link to reset your password via Email." => "Recibirás un enlace por correo electrónico para restablecer tu contraseña", diff --git a/core/l10n/es_AR.php b/core/l10n/es_AR.php index 5cbdbe42401..2da7951b064 100644 --- a/core/l10n/es_AR.php +++ b/core/l10n/es_AR.php @@ -1,15 +1,35 @@ <?php $TRANSLATIONS = array( -"Application name not provided." => "Nombre de la aplicación no provisto.", +"Category type not provided." => "Tipo de categoría no provisto. ", "No category to add?" => "¿Ninguna categoría para añadir?", "This category already exists: " => "Esta categoría ya existe: ", +"Object type not provided." => "Tipo de objeto no provisto. ", +"%s ID not provided." => "%s ID no provista. ", +"Error adding %s to favorites." => "Error al agregar %s a favoritos. ", +"No categories selected for deletion." => "No hay categorías seleccionadas para borrar.", +"Error removing %s from favorites." => "Error al remover %s de favoritos. ", "Settings" => "Ajustes", +"seconds ago" => "segundos atrás", +"1 minute ago" => "hace 1 minuto", +"{minutes} minutes ago" => "hace {minutes} minutos", +"1 hour ago" => "Hace 1 hora", +"{hours} hours ago" => "{hours} horas atrás", +"today" => "hoy", +"yesterday" => "ayer", +"{days} days ago" => "hace {days} días", +"last month" => "el mes pasado", +"{months} months ago" => "{months} meses atrás", +"months ago" => "meses atrás", +"last year" => "el año pasado", +"years ago" => "años atrás", "Choose" => "Elegir", "Cancel" => "Cancelar", "No" => "No", "Yes" => "Sí", "Ok" => "Aceptar", -"No categories selected for deletion." => "No hay categorías seleccionadas para borrar.", +"The object type is not specified." => "El tipo de objeto no esta especificado. ", "Error" => "Error", +"The app name is not specified." => "El nombre de la aplicación no esta especificado.", +"The required file {file} is not installed!" => "¡El archivo requerido {file} no está instalado!", "Error while sharing" => "Error al compartir", "Error while unsharing" => "Error en el procedimiento de ", "Error while changing permissions" => "Error al cambiar permisos", diff --git a/core/l10n/et_EE.php b/core/l10n/et_EE.php index 7554de8b6f2..b67dd13dd69 100644 --- a/core/l10n/et_EE.php +++ b/core/l10n/et_EE.php @@ -1,14 +1,23 @@ <?php $TRANSLATIONS = array( -"Application name not provided." => "Rakenduse nime pole sisestatud.", "No category to add?" => "Pole kategooriat, mida lisada?", "This category already exists: " => "See kategooria on juba olemas: ", +"No categories selected for deletion." => "Kustutamiseks pole kategooriat valitud.", "Settings" => "Seaded", +"seconds ago" => "sekundit tagasi", +"1 minute ago" => "1 minut tagasi", +"{minutes} minutes ago" => "{minutes} minutit tagasi", +"today" => "täna", +"yesterday" => "eile", +"{days} days ago" => "{days} päeva tagasi", +"last month" => "viimasel kuul", +"months ago" => "kuu tagasi", +"last year" => "viimasel aastal", +"years ago" => "aastat tagasi", "Choose" => "Vali", "Cancel" => "Loobu", "No" => "Ei", "Yes" => "Jah", "Ok" => "Ok", -"No categories selected for deletion." => "Kustutamiseks pole kategooriat valitud.", "Error" => "Viga", "Error while sharing" => "Viga jagamisel", "Error while unsharing" => "Viga jagamise lõpetamisel", diff --git a/core/l10n/eu.php b/core/l10n/eu.php index f370ee315d8..1a21ca34705 100644 --- a/core/l10n/eu.php +++ b/core/l10n/eu.php @@ -1,27 +1,56 @@ <?php $TRANSLATIONS = array( -"Application name not provided." => "Aplikazioaren izena falta da", +"User %s shared a file with you" => "%s erabiltzaileak zurekin fitxategi bat partekatu du ", +"User %s shared a folder with you" => "%s erabiltzaileak zurekin karpeta bat partekatu du ", +"User %s shared the file \"%s\" with you. It is available for download here: %s" => "%s erabiltzaileak \"%s\" fitxategia zurekin partekatu du. Hemen duzu eskuragarri: %s", +"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "%s erabiltzaileak \"%s\" karpeta zurekin partekatu du. Hemen duzu eskuragarri: %s", +"Category type not provided." => "Kategoria mota ez da zehaztu.", "No category to add?" => "Ez dago gehitzeko kategoriarik?", "This category already exists: " => "Kategoria hau dagoeneko existitzen da:", +"Object type not provided." => "Objetu mota ez da zehaztu.", +"%s ID not provided." => "%s ID mota ez da zehaztu.", +"Error adding %s to favorites." => "Errorea gertatu da %s gogokoetara gehitzean.", +"No categories selected for deletion." => "Ez da ezabatzeko kategoriarik hautatu.", +"Error removing %s from favorites." => "Errorea gertatu da %s gogokoetatik ezabatzean.", "Settings" => "Ezarpenak", +"seconds ago" => "segundu", +"1 minute ago" => "orain dela minutu 1", +"{minutes} minutes ago" => "orain dela {minutes} minutu", +"1 hour ago" => "orain dela ordu bat", +"{hours} hours ago" => "orain dela {hours} ordu", +"today" => "gaur", +"yesterday" => "atzo", +"{days} days ago" => "orain dela {days} egun", +"last month" => "joan den hilabetean", +"{months} months ago" => "orain dela {months} hilabete", +"months ago" => "hilabete", +"last year" => "joan den urtean", +"years ago" => "urte", "Choose" => "Aukeratu", "Cancel" => "Ezeztatu", "No" => "Ez", "Yes" => "Bai", "Ok" => "Ados", -"No categories selected for deletion." => "Ez da ezabatzeko kategoriarik hautatu.", +"The object type is not specified." => "Objetu mota ez dago zehaztuta.", "Error" => "Errorea", +"The app name is not specified." => "App izena ez dago zehaztuta.", +"The required file {file} is not installed!" => "Beharrezkoa den {file} fitxategia ez dago instalatuta!", "Error while sharing" => "Errore bat egon da elkarbanatzean", "Error while unsharing" => "Errore bat egon da elkarbanaketa desegitean", "Error while changing permissions" => "Errore bat egon da baimenak aldatzean", +"Shared with you and the group {group} by {owner}" => "{owner}-k zu eta {group} taldearekin partekatuta", +"Shared with you by {owner}" => "{owner}-k zurekin partekatuta", "Share with" => "Elkarbanatu honekin", "Share with link" => "Elkarbanatu lotura batekin", "Password protect" => "Babestu pasahitzarekin", "Password" => "Pasahitza", +"Email link to person" => "Postaz bidali lotura ", +"Send" => "Bidali", "Set expiration date" => "Ezarri muga data", "Expiration date" => "Muga data", "Share via email:" => "Elkarbanatu eposta bidez:", "No people found" => "Ez da inor aurkitu", "Resharing is not allowed" => "Berriz elkarbanatzea ez dago baimendua", +"Shared in {item} with {user}" => "{user}ekin {item}-n partekatuta", "Unshare" => "Ez elkarbanatu", "can edit" => "editatu dezake", "access control" => "sarrera kontrola", @@ -32,9 +61,13 @@ "Password protected" => "Pasahitzarekin babestuta", "Error unsetting expiration date" => "Errorea izan da muga data kentzean", "Error setting expiration date" => "Errore bat egon da muga data ezartzean", +"Sending ..." => "Bidaltzen ...", +"Email sent" => "Eposta bidalia", "ownCloud password reset" => "ownCloud-en pasahitza berrezarri", "Use the following link to reset your password: {link}" => "Eribili hurrengo lotura zure pasahitza berrezartzeko: {link}", "You will receive a link to reset your password via Email." => "Zure pashitza berrezartzeko lotura bat jasoko duzu Epostaren bidez.", +"Reset email send." => "Berrezartzeko eposta bidali da.", +"Request failed!" => "Eskariak huts egin du!", "Username" => "Erabiltzaile izena", "Request reset" => "Eskaera berrezarri da", "Your password was reset" => "Zure pasahitza berrezarri da", @@ -51,6 +84,8 @@ "Edit categories" => "Editatu kategoriak", "Add" => "Gehitu", "Security Warning" => "Segurtasun abisua", +"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Ez dago hausazko zenbaki sortzaile segururik eskuragarri, mesedez gatiu PHP OpenSSL extensioa.", +"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Hausazko zenbaki sortzaile segururik gabe erasotzaile batek pasahitza berrezartzeko kodeak iragarri ditzake eta zure kontuaz jabetu.", "Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Zure data karpeta eta zure fitxategiak internetetik zuzenean eskuragarri egon daitezke. ownCloudek emandako .htaccess fitxategia ez du bere lana egiten. Aholkatzen dizugu zure web zerbitzaria ongi konfiguratzea data karpeta eskuragarri ez izateko edo data karpeta web zerbitzariaren dokumentu errotik mugitzea.", "Create an <strong>admin account</strong>" => "Sortu <strong>kudeatzaile kontu<strong> bat", "Advanced" => "Aurreratua", @@ -84,10 +119,16 @@ "December" => "Abendua", "web services under your control" => "web zerbitzuak zure kontrolpean", "Log out" => "Saioa bukatu", +"Automatic logon rejected!" => "Saio hasiera automatikoa ez onartuta!", +"If you did not change your password recently, your account may be compromised!" => "Zure pasahitza orain dela gutxi ez baduzu aldatu, zure kontua arriskuan egon daiteke!", +"Please change your password to secure your account again." => "Mesedez aldatu zure pasahitza zure kontua berriz segurtatzeko.", "Lost your password?" => "Galdu duzu pasahitza?", "remember" => "gogoratu", "Log in" => "Hasi saioa", "You are logged out." => "Zure saioa bukatu da.", "prev" => "aurrekoa", -"next" => "hurrengoa" +"next" => "hurrengoa", +"Security Warning!" => "Segurtasun abisua", +"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Mesedez egiaztatu zure pasahitza. <br/>Segurtasun arrazoiengatik noizbehinka zure pasahitza berriz sartzea eska diezazukegu.", +"Verify" => "Egiaztatu" ); diff --git a/core/l10n/fa.php b/core/l10n/fa.php index bf548d2d780..2f859dc31d2 100644 --- a/core/l10n/fa.php +++ b/core/l10n/fa.php @@ -1,13 +1,20 @@ <?php $TRANSLATIONS = array( -"Application name not provided." => "نام برنامه پیدا نشد", "No category to add?" => "آیا گروه دیگری برای افزودن ندارید", "This category already exists: " => "این گروه از قبل اضافه شده", +"No categories selected for deletion." => "هیج دسته ای برای پاک شدن انتخاب نشده است", "Settings" => "تنظیمات", +"seconds ago" => "ثانیهها پیش", +"1 minute ago" => "1 دقیقه پیش", +"today" => "امروز", +"yesterday" => "دیروز", +"last month" => "ماه قبل", +"months ago" => "ماههای قبل", +"last year" => "سال قبل", +"years ago" => "سالهای قبل", "Cancel" => "منصرف شدن", "No" => "نه", "Yes" => "بله", "Ok" => "قبول", -"No categories selected for deletion." => "هیج دسته ای برای پاک شدن انتخاب نشده است", "Error" => "خطا", "Password" => "گذرواژه", "create" => "ایجاد", diff --git a/core/l10n/fi_FI.php b/core/l10n/fi_FI.php index caee9dd53d9..4b4a23b8c70 100644 --- a/core/l10n/fi_FI.php +++ b/core/l10n/fi_FI.php @@ -1,21 +1,37 @@ <?php $TRANSLATIONS = array( -"Application name not provided." => "Sovelluksen nimeä ei määritelty.", "No category to add?" => "Ei lisättävää luokkaa?", "This category already exists: " => "Tämä luokka on jo olemassa: ", +"No categories selected for deletion." => "Luokkia ei valittu poistettavaksi.", "Settings" => "Asetukset", +"seconds ago" => "sekuntia sitten", +"1 minute ago" => "1 minuutti sitten", +"{minutes} minutes ago" => "{minutes} minuuttia sitten", +"1 hour ago" => "1 tunti sitten", +"{hours} hours ago" => "{hours} tuntia sitten", +"today" => "tänään", +"yesterday" => "eilen", +"{days} days ago" => "{days} päivää sitten", +"last month" => "viime kuussa", +"{months} months ago" => "{months} kuukautta sitten", +"months ago" => "kuukautta sitten", +"last year" => "viime vuonna", +"years ago" => "vuotta sitten", "Choose" => "Valitse", "Cancel" => "Peru", "No" => "Ei", "Yes" => "Kyllä", "Ok" => "Ok", -"No categories selected for deletion." => "Luokkia ei valittu poistettavaksi.", "Error" => "Virhe", +"The app name is not specified." => "Sovelluksen nimeä ei ole määritelty.", +"The required file {file} is not installed!" => "Vaadittua tiedostoa {file} ei ole asennettu!", "Error while sharing" => "Virhe jaettaessa", "Error while unsharing" => "Virhe jakoa peruttaessa", "Error while changing permissions" => "Virhe oikeuksia muuttaessa", "Share with link" => "Jaa linkillä", "Password protect" => "Suojaa salasanalla", "Password" => "Salasana", +"Email link to person" => "Lähetä linkki sähköpostitse", +"Send" => "Lähetä", "Set expiration date" => "Aseta päättymispäivä", "Expiration date" => "Päättymispäivä", "Share via email:" => "Jaa sähköpostilla:", @@ -31,6 +47,8 @@ "Password protected" => "Salasanasuojattu", "Error unsetting expiration date" => "Virhe purettaessa eräpäivää", "Error setting expiration date" => "Virhe päättymispäivää asettaessa", +"Sending ..." => "Lähetetään...", +"Email sent" => "Sähköposti lähetetty", "ownCloud password reset" => "ownCloud-salasanan nollaus", "Use the following link to reset your password: {link}" => "Voit palauttaa salasanasi seuraavassa osoitteessa: {link}", "You will receive a link to reset your password via Email." => "Saat sähköpostitse linkin nollataksesi salasanan.", diff --git a/core/l10n/fr.php b/core/l10n/fr.php index 597f58172d9..f02a7b0087c 100644 --- a/core/l10n/fr.php +++ b/core/l10n/fr.php @@ -1,18 +1,40 @@ <?php $TRANSLATIONS = array( -"Application name not provided." => "Nom de l'application non fourni.", +"Category type not provided." => "Type de catégorie non spécifié.", "No category to add?" => "Pas de catégorie à ajouter ?", "This category already exists: " => "Cette catégorie existe déjà : ", +"Object type not provided." => "Type d'objet non spécifié.", +"%s ID not provided." => "L'identifiant de %s n'est pas spécifié.", +"Error adding %s to favorites." => "Erreur lors de l'ajout de %s aux favoris.", +"No categories selected for deletion." => "Aucune catégorie sélectionnée pour suppression", +"Error removing %s from favorites." => "Erreur lors de la suppression de %s des favoris.", "Settings" => "Paramètres", +"seconds ago" => "il y a quelques secondes", +"1 minute ago" => "il y a une minute", +"{minutes} minutes ago" => "il y a {minutes} minutes", +"1 hour ago" => "Il y a une heure", +"{hours} hours ago" => "Il y a {hours} heures", +"today" => "aujourd'hui", +"yesterday" => "hier", +"{days} days ago" => "il y a {days} jours", +"last month" => "le mois dernier", +"{months} months ago" => "Il y a {months} mois", +"months ago" => "il y a plusieurs mois", +"last year" => "l'année dernière", +"years ago" => "il y a plusieurs années", "Choose" => "Choisir", "Cancel" => "Annuler", "No" => "Non", "Yes" => "Oui", "Ok" => "Ok", -"No categories selected for deletion." => "Aucune catégorie sélectionnée pour suppression", +"The object type is not specified." => "Le type d'objet n'est pas spécifié.", "Error" => "Erreur", +"The app name is not specified." => "Le nom de l'application n'est pas spécifié.", +"The required file {file} is not installed!" => "Le fichier requis {file} n'est pas installé !", "Error while sharing" => "Erreur lors de la mise en partage", "Error while unsharing" => "Erreur lors de l'annulation du partage", "Error while changing permissions" => "Erreur lors du changement des permissions", +"Shared with you and the group {group} by {owner}" => "Partagé par {owner} avec vous et le groupe {group}", +"Shared with you by {owner}" => "Partagé avec vous par {owner}", "Share with" => "Partager avec", "Share with link" => "Partager via lien", "Password protect" => "Protéger par un mot de passe", @@ -22,6 +44,7 @@ "Share via email:" => "Partager via e-mail :", "No people found" => "Aucun utilisateur trouvé", "Resharing is not allowed" => "Le repartage n'est pas autorisé", +"Shared in {item} with {user}" => "Partagé dans {item} avec {user}", "Unshare" => "Ne plus partager", "can edit" => "édition autorisée", "access control" => "contrôle des accès", @@ -35,6 +58,8 @@ "ownCloud password reset" => "Réinitialisation de votre mot de passe Owncloud", "Use the following link to reset your password: {link}" => "Utilisez le lien suivant pour réinitialiser votre mot de passe : {link}", "You will receive a link to reset your password via Email." => "Vous allez recevoir un e-mail contenant un lien pour réinitialiser votre mot de passe.", +"Reset email send." => "Mail de réinitialisation envoyé.", +"Request failed!" => "La requête a échoué !", "Username" => "Nom d'utilisateur", "Request reset" => "Demander la réinitialisation", "Your password was reset" => "Votre mot de passe a été réinitialisé", diff --git a/core/l10n/gl.php b/core/l10n/gl.php index 97f0ec9862c..4cdc39896b5 100644 --- a/core/l10n/gl.php +++ b/core/l10n/gl.php @@ -1,19 +1,65 @@ <?php $TRANSLATIONS = array( -"Application name not provided." => "Non se indicou o nome do aplicativo.", +"Category type not provided." => "Non se indicou o tipo de categoría", "No category to add?" => "Sen categoría que engadir?", "This category already exists: " => "Esta categoría xa existe: ", -"Settings" => "Preferencias", +"Object type not provided." => "Non se forneceu o tipo de obxecto.", +"%s ID not provided." => "Non se deu o ID %s.", +"Error adding %s to favorites." => "Erro ao engadir %s aos favoritos.", +"No categories selected for deletion." => "Non hai categorías seleccionadas para eliminar.", +"Error removing %s from favorites." => "Erro ao eliminar %s dos favoritos.", +"Settings" => "Configuracións", +"seconds ago" => "segundos atrás", +"1 minute ago" => "hai 1 minuto", +"{minutes} minutes ago" => "{minutes} minutos atrás", +"1 hour ago" => "hai 1 hora", +"{hours} hours ago" => "{hours} horas atrás", +"today" => "hoxe", +"yesterday" => "onte", +"{days} days ago" => "{days} días atrás", +"last month" => "último mes", +"{months} months ago" => "{months} meses atrás", +"months ago" => "meses atrás", +"last year" => "último ano", +"years ago" => "anos atrás", +"Choose" => "Escoller", "Cancel" => "Cancelar", "No" => "Non", "Yes" => "Si", -"Ok" => "Ok", -"No categories selected for deletion." => "Non hai categorías seleccionadas para eliminar.", +"Ok" => "Aceptar", +"The object type is not specified." => "Non se especificou o tipo de obxecto.", "Error" => "Erro", +"The app name is not specified." => "Non se especificou o nome do aplicativo.", +"The required file {file} is not installed!" => "Non está instalado o ficheiro {file} que se precisa", +"Error while sharing" => "Erro compartindo", +"Error while unsharing" => "Erro ao deixar de compartir", +"Error while changing permissions" => "Erro ao cambiar os permisos", +"Shared with you and the group {group} by {owner}" => "Compartido contigo e co grupo {group} de {owner}", +"Shared with you by {owner}" => "Compartido contigo por {owner}", +"Share with" => "Compartir con", +"Share with link" => "Compartir ca ligazón", +"Password protect" => "Protexido con contrasinais", "Password" => "Contrasinal", +"Set expiration date" => "Definir a data de caducidade", +"Expiration date" => "Data de caducidade", +"Share via email:" => "Compartir por correo electrónico:", +"No people found" => "Non se atopou xente", +"Resharing is not allowed" => "Non se acepta volver a compartir", +"Shared in {item} with {user}" => "Compartido en {item} con {user}", "Unshare" => "Deixar de compartir", +"can edit" => "pode editar", +"access control" => "control de acceso", +"create" => "crear", +"update" => "actualizar", +"delete" => "borrar", +"share" => "compartir", +"Password protected" => "Protexido con contrasinal", +"Error unsetting expiration date" => "Erro ao quitar a data de caducidade", +"Error setting expiration date" => "Erro ao definir a data de caducidade", "ownCloud password reset" => "Restablecer contrasinal de ownCloud", -"Use the following link to reset your password: {link}" => "Use a seguinte ligazón para restablecer o contrasinal: {link}", +"Use the following link to reset your password: {link}" => "Usa a seguinte ligazón para restablecer o contrasinal: {link}", "You will receive a link to reset your password via Email." => "Recibirá unha ligazón por correo electrónico para restablecer o contrasinal", +"Reset email send." => "Restablecer o envío por correo.", +"Request failed!" => "Fallo na petición", "Username" => "Nome de usuario", "Request reset" => "Petición de restablecemento", "Your password was reset" => "O contrasinal foi restablecido", @@ -27,9 +73,12 @@ "Help" => "Axuda", "Access forbidden" => "Acceso denegado", "Cloud not found" => "Nube non atopada", -"Edit categories" => "Editar categorias", +"Edit categories" => "Editar categorías", "Add" => "Engadir", "Security Warning" => "Aviso de seguridade", +"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Non hai un xerador de números aleatorios dispoñíbel. Activa o engadido de OpenSSL para PHP.", +"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Sen un xerador de números aleatorios seguro podería acontecer que predicindo as cadeas de texto de reinicio de contrasinais se afagan coa túa conta.", +"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "O teu cartafol de datos e os teus ficheiros son seguramente accesibles a través de internet. O ficheiro .htaccess que ownCloud fornece non está empregándose. Suxírese que configures o teu servidor web de tal maneira que o cartafol de datos non estea accesíbel ou movas o cartafol de datos fóra do root do directorio de datos do servidor web.", "Create an <strong>admin account</strong>" => "Crear unha <strong>contra de administrador</strong>", "Advanced" => "Avanzado", "Data folder" => "Cartafol de datos", @@ -38,8 +87,9 @@ "Database user" => "Usuario da base de datos", "Database password" => "Contrasinal da base de datos", "Database name" => "Nome da base de datos", +"Database tablespace" => "Táboa de espazos da base de datos", "Database host" => "Servidor da base de datos", -"Finish setup" => "Rematar configuración", +"Finish setup" => "Rematar a configuración", "Sunday" => "Domingo", "Monday" => "Luns", "Tuesday" => "Martes", @@ -58,13 +108,19 @@ "September" => "Setembro", "October" => "Outubro", "November" => "Novembro", -"December" => "Nadal", +"December" => "Decembro", "web services under your control" => "servizos web baixo o seu control", "Log out" => "Desconectar", +"Automatic logon rejected!" => "Rexeitouse a entrada automática", +"If you did not change your password recently, your account may be compromised!" => "Se non fixeches cambios de contrasinal recentemente é posíbel que a túa conta estea comprometida!", +"Please change your password to secure your account again." => "Cambia de novo o teu contrasinal para asegurar a túa conta.", "Lost your password?" => "Perdeu o contrasinal?", "remember" => "lembrar", "Log in" => "Conectar", "You are logged out." => "Está desconectado", "prev" => "anterior", -"next" => "seguinte" +"next" => "seguinte", +"Security Warning!" => "Advertencia de seguranza", +"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Verifica o teu contrasinal.<br/>Por motivos de seguridade pode que ocasionalmente se che pregunte de novo polo teu contrasinal.", +"Verify" => "Verificar" ); diff --git a/core/l10n/he.php b/core/l10n/he.php index f0ba4198d6b..d4ec0ab84c4 100644 --- a/core/l10n/he.php +++ b/core/l10n/he.php @@ -1,19 +1,65 @@ <?php $TRANSLATIONS = array( -"Application name not provided." => "שם היישום לא סופק.", +"Category type not provided." => "סוג הקטגוריה לא סופק.", "No category to add?" => "אין קטגוריה להוספה?", "This category already exists: " => "קטגוריה זאת כבר קיימת: ", +"Object type not provided." => "סוג הפריט לא סופק.", +"%s ID not provided." => "מזהה %s לא סופק.", +"Error adding %s to favorites." => "אירעה שגיאה בעת הוספת %s למועדפים.", +"No categories selected for deletion." => "לא נבחרו קטגוריות למחיקה", +"Error removing %s from favorites." => "שגיאה בהסרת %s מהמועדפים.", "Settings" => "הגדרות", +"seconds ago" => "שניות", +"1 minute ago" => "לפני דקה אחת", +"{minutes} minutes ago" => "לפני {minutes} דקות", +"1 hour ago" => "לפני שעה", +"{hours} hours ago" => "לפני {hours} שעות", +"today" => "היום", +"yesterday" => "אתמול", +"{days} days ago" => "לפני {days} ימים", +"last month" => "חודש שעבר", +"{months} months ago" => "לפני {months} חודשים", +"months ago" => "חודשים", +"last year" => "שנה שעברה", +"years ago" => "שנים", +"Choose" => "בחירה", "Cancel" => "ביטול", "No" => "לא", "Yes" => "כן", "Ok" => "בסדר", -"No categories selected for deletion." => "לא נבחרו קטגוריות למחיקה", +"The object type is not specified." => "סוג הפריט לא צוין.", "Error" => "שגיאה", +"The app name is not specified." => "שם היישום לא צוין.", +"The required file {file} is not installed!" => "הקובץ הנדרש {file} אינו מותקן!", +"Error while sharing" => "שגיאה במהלך השיתוף", +"Error while unsharing" => "שגיאה במהלך ביטול השיתוף", +"Error while changing permissions" => "שגיאה במהלך שינוי ההגדרות", +"Shared with you and the group {group} by {owner}" => "שותף אתך ועם הקבוצה {group} שבבעלות {owner}", +"Shared with you by {owner}" => "שותף אתך על ידי {owner}", +"Share with" => "שיתוף עם", +"Share with link" => "שיתוף עם קישור", +"Password protect" => "הגנה בססמה", "Password" => "ססמה", +"Set expiration date" => "הגדרת תאריך תפוגה", +"Expiration date" => "תאריך התפוגה", +"Share via email:" => "שיתוף באמצעות דוא״ל:", +"No people found" => "לא נמצאו אנשים", +"Resharing is not allowed" => "אסור לעשות שיתוף מחדש", +"Shared in {item} with {user}" => "שותף תחת {item} עם {user}", "Unshare" => "הסר שיתוף", +"can edit" => "ניתן לערוך", +"access control" => "בקרת גישה", +"create" => "יצירה", +"update" => "עדכון", +"delete" => "מחיקה", +"share" => "שיתוף", +"Password protected" => "מוגן בססמה", +"Error unsetting expiration date" => "אירעה שגיאה בביטול תאריך התפוגה", +"Error setting expiration date" => "אירעה שגיאה בעת הגדרת תאריך התפוגה", "ownCloud password reset" => "איפוס הססמה של ownCloud", "Use the following link to reset your password: {link}" => "יש להשתמש בקישור הבא כדי לאפס את הססמה שלך: {link}", "You will receive a link to reset your password via Email." => "יישלח לתיבת הדוא״ל שלך קישור לאיפוס הססמה.", +"Reset email send." => "איפוס שליחת דוא״ל.", +"Request failed!" => "הבקשה נכשלה!", "Username" => "שם משתמש", "Request reset" => "בקשת איפוס", "Your password was reset" => "הססמה שלך אופסה", @@ -29,6 +75,10 @@ "Cloud not found" => "ענן לא נמצא", "Edit categories" => "עריכת הקטגוריות", "Add" => "הוספה", +"Security Warning" => "אזהרת אבטחה", +"No secure random number generator is available, please enable the PHP OpenSSL extension." => "אין מחולל מספרים אקראיים מאובטח, נא להפעיל את ההרחבה OpenSSL ב־PHP.", +"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "ללא מחולל מספרים אקראיים מאובטח תוקף יכול לנבא את מחרוזות איפוס הססמה ולהשתלט על החשבון שלך.", +"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "יתכן שתיקיית הנתונים והקבצים שלך נגישים דרך האינטרנט. קובץ ה־.htaccess שמסופק על ידי ownCloud כנראה אינו עובד. אנו ממליצים בחום להגדיר את שרת האינטרנט שלך בדרך שבה תיקיית הנתונים לא תהיה זמינה עוד או להעביר את תיקיית הנתונים מחוץ לספריית העל של שרת האינטרנט.", "Create an <strong>admin account</strong>" => "יצירת <strong>חשבון מנהל</strong>", "Advanced" => "מתקדם", "Data folder" => "תיקיית נתונים", @@ -61,10 +111,16 @@ "December" => "דצמבר", "web services under your control" => "שירותי רשת בשליטתך", "Log out" => "התנתקות", +"Automatic logon rejected!" => "בקשת הכניסה האוטומטית נדחתה!", +"If you did not change your password recently, your account may be compromised!" => "אם לא שינית את ססמתך לאחרונה, יתכן שחשבונך נפגע!", +"Please change your password to secure your account again." => "נא לשנות את הססמה שלך כדי לאבטח את חשבונך מחדש.", "Lost your password?" => "שכחת את ססמתך?", "remember" => "שמירת הססמה", "Log in" => "כניסה", "You are logged out." => "לא התחברת.", "prev" => "הקודם", -"next" => "הבא" +"next" => "הבא", +"Security Warning!" => "אזהרת אבטחה!", +"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "נא לאמת את הססמה שלך. <br/>מטעמי אבטחה יתכן שתופיע בקשה להזין את הססמה שוב.", +"Verify" => "אימות" ); diff --git a/core/l10n/hi.php b/core/l10n/hi.php index c84f76c4e49..0e4f18c6cd8 100644 --- a/core/l10n/hi.php +++ b/core/l10n/hi.php @@ -1,6 +1,10 @@ <?php $TRANSLATIONS = array( "Password" => "पासवर्ड", +"Use the following link to reset your password: {link}" => "आगे दिये गये लिंक का उपयोग पासवर्ड बदलने के लिये किजीये: {link}", +"You will receive a link to reset your password via Email." => "पासवर्ड बदलने कि लिंक आपको ई-मेल द्वारा भेजी जायेगी|", "Username" => "प्रयोक्ता का नाम", +"Your password was reset" => "आपका पासवर्ड बदला गया है", +"New password" => "नया पासवर्ड", "Cloud not found" => "क्लौड नहीं मिला ", "Create an <strong>admin account</strong>" => "व्यवस्थापक खाता बनाएँ", "Advanced" => "उन्नत", diff --git a/core/l10n/hr.php b/core/l10n/hr.php index d1d6e9cfc65..69bdd3a4f83 100644 --- a/core/l10n/hr.php +++ b/core/l10n/hr.php @@ -1,14 +1,20 @@ <?php $TRANSLATIONS = array( -"Application name not provided." => "Ime aplikacije nije pribavljeno.", "No category to add?" => "Nemate kategorija koje možete dodati?", "This category already exists: " => "Ova kategorija već postoji: ", +"No categories selected for deletion." => "Nema odabranih kategorija za brisanje.", "Settings" => "Postavke", +"seconds ago" => "sekundi prije", +"today" => "danas", +"yesterday" => "jučer", +"last month" => "prošli mjesec", +"months ago" => "mjeseci", +"last year" => "prošlu godinu", +"years ago" => "godina", "Choose" => "Izaberi", "Cancel" => "Odustani", "No" => "Ne", "Yes" => "Da", "Ok" => "U redu", -"No categories selected for deletion." => "Nema odabranih kategorija za brisanje.", "Error" => "Pogreška", "Error while sharing" => "Greška prilikom djeljenja", "Error while unsharing" => "Greška prilikom isključivanja djeljenja", diff --git a/core/l10n/hu_HU.php b/core/l10n/hu_HU.php index 7c3ce250cf1..d1bfb303e6f 100644 --- a/core/l10n/hu_HU.php +++ b/core/l10n/hu_HU.php @@ -1,13 +1,20 @@ <?php $TRANSLATIONS = array( -"Application name not provided." => "Alkalmazásnév hiányzik", "No category to add?" => "Nincs hozzáadandó kategória?", "This category already exists: " => "Ez a kategória már létezik", +"No categories selected for deletion." => "Nincs törlésre jelölt kategória", "Settings" => "Beállítások", +"seconds ago" => "másodperccel ezelőtt", +"1 minute ago" => "1 perccel ezelőtt", +"today" => "ma", +"yesterday" => "tegnap", +"last month" => "múlt hónapban", +"months ago" => "hónappal ezelőtt", +"last year" => "tavaly", +"years ago" => "évvel ezelőtt", "Cancel" => "Mégse", "No" => "Nem", "Yes" => "Igen", "Ok" => "Ok", -"No categories selected for deletion." => "Nincs törlésre jelölt kategória", "Error" => "Hiba", "Password" => "Jelszó", "Unshare" => "Nem oszt meg", diff --git a/core/l10n/id.php b/core/l10n/id.php index 2b7072fd7c5..99df16332f5 100644 --- a/core/l10n/id.php +++ b/core/l10n/id.php @@ -1,14 +1,21 @@ <?php $TRANSLATIONS = array( -"Application name not provided." => "Nama aplikasi tidak diberikan.", "No category to add?" => "Tidak ada kategori yang akan ditambahkan?", "This category already exists: " => "Kategori ini sudah ada:", +"No categories selected for deletion." => "Tidak ada kategori terpilih untuk penghapusan.", "Settings" => "Setelan", +"seconds ago" => "beberapa detik yang lalu", +"1 minute ago" => "1 menit lalu", +"today" => "hari ini", +"yesterday" => "kemarin", +"last month" => "bulan kemarin", +"months ago" => "beberapa bulan lalu", +"last year" => "tahun kemarin", +"years ago" => "beberapa tahun lalu", "Choose" => "pilih", "Cancel" => "Batalkan", "No" => "Tidak", "Yes" => "Ya", "Ok" => "Oke", -"No categories selected for deletion." => "Tidak ada kategori terpilih untuk penghapusan.", "Error" => "gagal", "Error while sharing" => "gagal ketika membagikan", "Error while unsharing" => "gagal ketika membatalkan pembagian", diff --git a/core/l10n/is.php b/core/l10n/is.php new file mode 100644 index 00000000000..23117cddf8b --- /dev/null +++ b/core/l10n/is.php @@ -0,0 +1,36 @@ +<?php $TRANSLATIONS = array( +"Category type not provided." => "Flokkur ekki gefin", +"seconds ago" => "sek síðan", +"1 minute ago" => "1 min síðan", +"{minutes} minutes ago" => "{minutes} min síðan", +"today" => "í dag", +"yesterday" => "í gær", +"{days} days ago" => "{days} dagar síðan", +"last month" => "síðasta mánuði", +"months ago" => "mánuðir síðan", +"last year" => "síðasta ári", +"years ago" => "árum síðan", +"Password" => "Lykilorð", +"Username" => "Notendanafn", +"Personal" => "Persónustillingar", +"Admin" => "Vefstjórn", +"Help" => "Help", +"Cloud not found" => "Skýið finnst eigi", +"Edit categories" => "Breyta flokkum", +"Add" => "Bæta", +"Create an <strong>admin account</strong>" => "Útbúa <strong>vefstjóra aðgang</strong>", +"January" => "Janúar", +"February" => "Febrúar", +"March" => "Mars", +"April" => "Apríl", +"May" => "Maí", +"June" => "Júní", +"July" => "Júlí", +"August" => "Ágúst", +"September" => "September", +"October" => "Október", +"Log out" => "Útskrá", +"You are logged out." => "Þú ert útskráð(ur).", +"prev" => "fyrra", +"next" => "næsta" +); diff --git a/core/l10n/it.php b/core/l10n/it.php index e772d7c5105..e97deb9fb5f 100644 --- a/core/l10n/it.php +++ b/core/l10n/it.php @@ -1,15 +1,39 @@ <?php $TRANSLATIONS = array( -"Application name not provided." => "Nome dell'applicazione non fornito.", +"User %s shared a file with you" => "L'utente %s ha condiviso un file con te", +"User %s shared a folder with you" => "L'utente %s ha condiviso una cartella con te", +"User %s shared the file \"%s\" with you. It is available for download here: %s" => "L'utente %s ha condiviso il file \"%s\" con te. È disponibile per lo scaricamento qui: %s", +"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "L'utente %s ha condiviso la cartella \"%s\" con te. È disponibile per lo scaricamento qui: %s", +"Category type not provided." => "Tipo di categoria non fornito.", "No category to add?" => "Nessuna categoria da aggiungere?", "This category already exists: " => "Questa categoria esiste già: ", +"Object type not provided." => "Tipo di oggetto non fornito.", +"%s ID not provided." => "ID %s non fornito.", +"Error adding %s to favorites." => "Errore durante l'aggiunta di %s ai preferiti.", +"No categories selected for deletion." => "Nessuna categoria selezionata per l'eliminazione.", +"Error removing %s from favorites." => "Errore durante la rimozione di %s dai preferiti.", "Settings" => "Impostazioni", +"seconds ago" => "secondi fa", +"1 minute ago" => "Un minuto fa", +"{minutes} minutes ago" => "{minutes} minuti fa", +"1 hour ago" => "1 ora fa", +"{hours} hours ago" => "{hours} ore fa", +"today" => "oggi", +"yesterday" => "ieri", +"{days} days ago" => "{days} giorni fa", +"last month" => "mese scorso", +"{months} months ago" => "{months} mesi fa", +"months ago" => "mesi fa", +"last year" => "anno scorso", +"years ago" => "anni fa", "Choose" => "Scegli", "Cancel" => "Annulla", "No" => "No", "Yes" => "Sì", "Ok" => "Ok", -"No categories selected for deletion." => "Nessuna categoria selezionata per l'eliminazione.", +"The object type is not specified." => "Il tipo di oggetto non è specificato.", "Error" => "Errore", +"The app name is not specified." => "Il nome dell'applicazione non è specificato.", +"The required file {file} is not installed!" => "Il file richiesto {file} non è installato!", "Error while sharing" => "Errore durante la condivisione", "Error while unsharing" => "Errore durante la rimozione della condivisione", "Error while changing permissions" => "Errore durante la modifica dei permessi", @@ -19,6 +43,8 @@ "Share with link" => "Condividi con collegamento", "Password protect" => "Proteggi con password", "Password" => "Password", +"Email link to person" => "Invia collegamento via email", +"Send" => "Invia", "Set expiration date" => "Imposta data di scadenza", "Expiration date" => "Data di scadenza", "Share via email:" => "Condividi tramite email:", @@ -35,6 +61,8 @@ "Password protected" => "Protetta da password", "Error unsetting expiration date" => "Errore durante la rimozione della data di scadenza", "Error setting expiration date" => "Errore durante l'impostazione della data di scadenza", +"Sending ..." => "Invio in corso...", +"Email sent" => "Messaggio inviato", "ownCloud password reset" => "Ripristino password di ownCloud", "Use the following link to reset your password: {link}" => "Usa il collegamento seguente per ripristinare la password: {link}", "You will receive a link to reset your password via Email." => "Riceverai un collegamento per ripristinare la tua password via email", diff --git a/core/l10n/ja_JP.php b/core/l10n/ja_JP.php index 28d2a3041f3..72615d36f62 100644 --- a/core/l10n/ja_JP.php +++ b/core/l10n/ja_JP.php @@ -1,24 +1,50 @@ <?php $TRANSLATIONS = array( -"Application name not provided." => "アプリケーション名は提供されていません。", +"User %s shared a file with you" => "ユーザ %s はあなたとファイルを共有しています", +"User %s shared a folder with you" => "ユーザ %s はあなたとフォルダを共有しています", +"User %s shared the file \"%s\" with you. It is available for download here: %s" => "ユーザ %s はあなたとファイル \"%s\" を共有しています。こちらからダウンロードできます: %s", +"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "ユーザ %s はあなたとフォルダ \"%s\" を共有しています。こちらからダウンロードできます: %s", +"Category type not provided." => "カテゴリタイプは提供されていません。", "No category to add?" => "追加するカテゴリはありませんか？", "This category already exists: " => "このカテゴリはすでに存在します: ", +"Object type not provided." => "オブジェクトタイプは提供されていません。", +"%s ID not provided." => "%s ID は提供されていません。", +"Error adding %s to favorites." => "お気に入りに %s を追加エラー", +"No categories selected for deletion." => "削除するカテゴリが選択されていません。", +"Error removing %s from favorites." => "お気に入りから %s の削除エラー", "Settings" => "設定", +"seconds ago" => "秒前", +"1 minute ago" => "1 分前", +"{minutes} minutes ago" => "{minutes} 分前", +"1 hour ago" => "1 時間前", +"{hours} hours ago" => "{hours} 時間前", +"today" => "今日", +"yesterday" => "昨日", +"{days} days ago" => "{days} 日前", +"last month" => "一月前", +"{months} months ago" => "{months} 月前", +"months ago" => "月前", +"last year" => "一年前", +"years ago" => "年前", "Choose" => "選択", "Cancel" => "キャンセル", "No" => "いいえ", "Yes" => "はい", "Ok" => "OK", -"No categories selected for deletion." => "削除するカテゴリが選択されていません。", +"The object type is not specified." => "オブジェクタイプが指定されていません。", "Error" => "エラー", +"The app name is not specified." => "アプリ名がしていされていません。", +"The required file {file} is not installed!" => "必要なファイル {file} がインストールされていません！", "Error while sharing" => "共有でエラー発生", "Error while unsharing" => "共有解除でエラー発生", "Error while changing permissions" => "権限変更でエラー発生", "Shared with you and the group {group} by {owner}" => "あなたと {owner} のグループ {group} で共有中", -"Shared with you by {owner}" => "{owner} があなたと共有中", +"Shared with you by {owner}" => "{owner} と共有中", "Share with" => "共有者", "Share with link" => "URLリンクで共有", "Password protect" => "パスワード保護", "Password" => "パスワード", +"Email link to person" => "メールリンク", +"Send" => "送信", "Set expiration date" => "有効期限を設定", "Expiration date" => "有効期限", "Share via email:" => "メール経由で共有:", @@ -35,6 +61,8 @@ "Password protected" => "パスワード保護", "Error unsetting expiration date" => "有効期限の未設定エラー", "Error setting expiration date" => "有効期限の設定でエラー発生", +"Sending ..." => "送信中...", +"Email sent" => "メールを送信しました", "ownCloud password reset" => "ownCloudのパスワードをリセットします", "Use the following link to reset your password: {link}" => "パスワードをリセットするには次のリンクをクリックして下さい: {link}", "You will receive a link to reset your password via Email." => "メールでパスワードをリセットするリンクが届きます。", diff --git a/core/l10n/ka_GE.php b/core/l10n/ka_GE.php index ac98e1f9d1f..efb3998a77e 100644 --- a/core/l10n/ka_GE.php +++ b/core/l10n/ka_GE.php @@ -1,14 +1,23 @@ <?php $TRANSLATIONS = array( -"Application name not provided." => "აპლიკაციის სახელი არ არის განხილული", "No category to add?" => "არ არის კატეგორია დასამატებლად?", "This category already exists: " => "კატეგორია უკვე არსებობს", +"No categories selected for deletion." => "სარედაქტირებელი კატეგორია არ არის არჩეული ", "Settings" => "პარამეტრები", +"seconds ago" => "წამის წინ", +"1 minute ago" => "1 წუთის წინ", +"{minutes} minutes ago" => "{minutes} წუთის წინ", +"today" => "დღეს", +"yesterday" => "გუშინ", +"{days} days ago" => "{days} დღის წინ", +"last month" => "გასულ თვეში", +"months ago" => "თვის წინ", +"last year" => "ბოლო წელს", +"years ago" => "წლის წინ", "Choose" => "არჩევა", "Cancel" => "უარყოფა", "No" => "არა", "Yes" => "კი", "Ok" => "დიახ", -"No categories selected for deletion." => "სარედაქტირებელი კატეგორია არ არის არჩეული ", "Error" => "შეცდომა", "Error while sharing" => "შეცდომა გაზიარების დროს", "Error while unsharing" => "შეცდომა გაზიარების გაუქმების დროს", diff --git a/core/l10n/ko.php b/core/l10n/ko.php index a8fdab7c6ec..3846dff796b 100644 --- a/core/l10n/ko.php +++ b/core/l10n/ko.php @@ -1,19 +1,65 @@ <?php $TRANSLATIONS = array( -"Application name not provided." => "응용 프로그램의 이름이 규정되어 있지 않습니다. ", -"No category to add?" => "추가할 카테고리가 없습니까?", -"This category already exists: " => "이 카테고리는 이미 존재합니다:", +"Category type not provided." => "분류 형식이 제공되지 않았습니다.", +"No category to add?" => "추가할 분류가 없습니까?", +"This category already exists: " => "이 분류는 이미 존재합니다:", +"Object type not provided." => "객체 형식이 제공되지 않았습니다.", +"%s ID not provided." => "%s ID가 제공되지 않았습니다.", +"Error adding %s to favorites." => "책갈피에 %s을(를) 추가할 수 없었습니다.", +"No categories selected for deletion." => "삭제할 분류를 선택하지 않았습니다.", +"Error removing %s from favorites." => "책갈피에서 %s을(를) 삭제할 수 없었습니다.", "Settings" => "설정", +"seconds ago" => "초 전", +"1 minute ago" => "1분 전", +"{minutes} minutes ago" => "{minutes}분 전", +"1 hour ago" => "1시간 전", +"{hours} hours ago" => "{hours}시간 전", +"today" => "오늘", +"yesterday" => "어제", +"{days} days ago" => "{days}일 전", +"last month" => "지난 달", +"{months} months ago" => "{months}개월 전", +"months ago" => "개월 전", +"last year" => "작년", +"years ago" => "년 전", +"Choose" => "선택", "Cancel" => "취소", -"No" => "아니오", +"No" => "아니요", "Yes" => "예", "Ok" => "승락", -"No categories selected for deletion." => "삭제 카테고리를 선택하지 않았습니다.", -"Error" => "에러", +"The object type is not specified." => "객체 유형이 지정되지 않았습니다.", +"Error" => "오류", +"The app name is not specified." => "앱 이름이 지정되지 않았습니다.", +"The required file {file} is not installed!" => "필요한 파일 {file}이(가) 설치되지 않았습니다!", +"Error while sharing" => "공유하는 중 오류 발생", +"Error while unsharing" => "공유 해제하는 중 오류 발생", +"Error while changing permissions" => "권한 변경하는 중 오류 발생", +"Shared with you and the group {group} by {owner}" => "{owner} 님이 여러분 및 그룹 {group}와(과) 공유 중", +"Shared with you by {owner}" => "{owner} 님이 공유 중", +"Share with" => "다음으로 공유", +"Share with link" => "URL 링크로 공유", +"Password protect" => "암호 보호", "Password" => "암호", +"Set expiration date" => "만료 날짜 설정", +"Expiration date" => "만료 날짜", +"Share via email:" => "이메일로 공유:", +"No people found" => "발견된 사람 없음", +"Resharing is not allowed" => "다시 공유할 수 없습니다", +"Shared in {item} with {user}" => "{user} 님과 {item}에서 공유 중", +"Unshare" => "공유 해제", +"can edit" => "편집 가능", +"access control" => "접근 제어", "create" => "만들기", -"ownCloud password reset" => "ownCloud 비밀번호 재설정", -"Use the following link to reset your password: {link}" => "다음 링크를 사용하여 암호를 초기화할 수 있습니다: {link}", -"You will receive a link to reset your password via Email." => "전자 우편으로 암호 재설정 링크를 보냈습니다.", +"update" => "업데이트", +"delete" => "삭제", +"share" => "공유", +"Password protected" => "암호로 보호됨", +"Error unsetting expiration date" => "만료 날짜 해제 오류", +"Error setting expiration date" => "만료 날짜 설정 오류", +"ownCloud password reset" => "ownCloud 암호 재설정", +"Use the following link to reset your password: {link}" => "다음 링크를 사용하여 암호를 재설정할 수 있습니다: {link}", +"You will receive a link to reset your password via Email." => "이메일로 암호 재설정 링크를 보냈습니다.", +"Reset email send." => "초기화 이메일을 보냈습니다.", +"Request failed!" => "요청이 실패했습니다!", "Username" => "사용자 이름", "Request reset" => "요청 초기화", "Your password was reset" => "암호가 재설정되었습니다", @@ -22,22 +68,26 @@ "Reset password" => "암호 재설정", "Personal" => "개인", "Users" => "사용자", -"Apps" => "프로그램", +"Apps" => "앱", "Admin" => "관리자", "Help" => "도움말", -"Access forbidden" => "접근 금지", +"Access forbidden" => "접근 금지됨", "Cloud not found" => "클라우드를 찾을 수 없습니다", -"Edit categories" => "카테고리 편집", +"Edit categories" => "분류 편집", "Add" => "추가", "Security Warning" => "보안 경고", -"Create an <strong>admin account</strong>" => "<strong>관리자 계정</strong>을 만드십시오", +"No secure random number generator is available, please enable the PHP OpenSSL extension." => "안전한 난수 생성기를 사용할 수 없습니다. PHP의 OpenSSL 확장을 활성화해 주십시오.", +"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "안전한 난수 생성기를 사용하지 않으면 공격자가 암호 초기화 토큰을 추측하여 계정을 탈취할 수 있습니다.", +"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "데이터 디렉터리와 파일을 인터넷에서 접근할 수 있는 것 같습니다. ownCloud에서 제공한 .htaccess 파일이 작동하지 않습니다. 웹 서버를 다시 설정하여 데이터 디렉터리에 접근할 수 없도록 하거나 문서 루트 바깥쪽으로 옮기는 것을 추천합니다.", +"Create an <strong>admin account</strong>" => "<strong>관리자 계정</strong> 만들기", "Advanced" => "고급", -"Data folder" => "자료 폴더", -"Configure the database" => "데이터베이스 구성", -"will be used" => "사용 될 것임", +"Data folder" => "데이터 폴더", +"Configure the database" => "데이터베이스 설정", +"will be used" => "사용될 예정", "Database user" => "데이터베이스 사용자", "Database password" => "데이터베이스 암호", "Database name" => "데이터베이스 이름", +"Database tablespace" => "데이터베이스 테이블 공간", "Database host" => "데이터베이스 호스트", "Finish setup" => "설치 완료", "Sunday" => "일요일", @@ -61,10 +111,16 @@ "December" => "12월", "web services under your control" => "내가 관리하는 웹 서비스", "Log out" => "로그아웃", +"Automatic logon rejected!" => "자동 로그인이 거부되었습니다!", +"If you did not change your password recently, your account may be compromised!" => "최근에 암호를 변경하지 않았다면 계정이 탈취되었을 수도 있습니다!", +"Please change your password to secure your account again." => "계정의 안전을 위하여 암호를 변경하십시오.", "Lost your password?" => "암호를 잊으셨습니까?", "remember" => "기억하기", "Log in" => "로그인", -"You are logged out." => "로그아웃 하셨습니다.", +"You are logged out." => "로그아웃되었습니다.", "prev" => "이전", -"next" => "다음" +"next" => "다음", +"Security Warning!" => "보안 경고!", +"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "암호를 확인해 주십시오.<br/>보안상의 이유로 종종 암호를 물어볼 것입니다.", +"Verify" => "확인" ); diff --git a/core/l10n/lb.php b/core/l10n/lb.php index 507efd7a4bb..7a1c462ffd1 100644 --- a/core/l10n/lb.php +++ b/core/l10n/lb.php @@ -1,13 +1,12 @@ <?php $TRANSLATIONS = array( -"Application name not provided." => "Numm vun der Applikatioun ass net uginn.", "No category to add?" => "Keng Kategorie fir bäizesetzen?", "This category already exists: " => "Des Kategorie existéiert schonn:", +"No categories selected for deletion." => "Keng Kategorien ausgewielt fir ze läschen.", "Settings" => "Astellungen", "Cancel" => "Ofbriechen", "No" => "Nee", "Yes" => "Jo", "Ok" => "OK", -"No categories selected for deletion." => "Keng Kategorien ausgewielt fir ze läschen.", "Error" => "Fehler", "Password" => "Passwuert", "create" => "erstellen", diff --git a/core/l10n/lt_LT.php b/core/l10n/lt_LT.php index 11ee84b5dae..9c5c8f90c5e 100644 --- a/core/l10n/lt_LT.php +++ b/core/l10n/lt_LT.php @@ -1,14 +1,23 @@ <?php $TRANSLATIONS = array( -"Application name not provided." => "Nepateiktas programos pavadinimas.", "No category to add?" => "Nepridėsite jokios kategorijos?", "This category already exists: " => "Tokia kategorija jau yra:", +"No categories selected for deletion." => "Trynimui nepasirinkta jokia kategorija.", "Settings" => "Nustatymai", +"seconds ago" => "prieš sekundę", +"1 minute ago" => "Prieš 1 minutę", +"{minutes} minutes ago" => "Prieš {count} minutes", +"today" => "šiandien", +"yesterday" => "vakar", +"{days} days ago" => "Prieš {days} dienas", +"last month" => "praeitą mėnesį", +"months ago" => "prieš mėnesį", +"last year" => "praeitais metais", +"years ago" => "prieš metus", "Choose" => "Pasirinkite", "Cancel" => "Atšaukti", "No" => "Ne", "Yes" => "Taip", "Ok" => "Gerai", -"No categories selected for deletion." => "Trynimui nepasirinkta jokia kategorija.", "Error" => "Klaida", "Error while sharing" => "Klaida, dalijimosi metu", "Error while unsharing" => "Klaida, kai atšaukiamas dalijimasis", diff --git a/core/l10n/mk.php b/core/l10n/mk.php index 9e3c94750cb..251abb015f9 100644 --- a/core/l10n/mk.php +++ b/core/l10n/mk.php @@ -1,13 +1,12 @@ <?php $TRANSLATIONS = array( -"Application name not provided." => "Име за апликацијата не е доставено.", "No category to add?" => "Нема категорија да се додаде?", "This category already exists: " => "Оваа категорија веќе постои:", +"No categories selected for deletion." => "Не е одбрана категорија за бришење.", "Settings" => "Поставки", "Cancel" => "Откажи", "No" => "Не", "Yes" => "Да", "Ok" => "Во ред", -"No categories selected for deletion." => "Не е одбрана категорија за бришење.", "Error" => "Грешка", "Password" => "Лозинка", "create" => "креирај", diff --git a/core/l10n/ms_MY.php b/core/l10n/ms_MY.php index 7cb0dbb10b3..56a79572ef7 100644 --- a/core/l10n/ms_MY.php +++ b/core/l10n/ms_MY.php @@ -1,13 +1,12 @@ <?php $TRANSLATIONS = array( -"Application name not provided." => "nama applikasi tidak disediakan", "No category to add?" => "Tiada kategori untuk di tambah?", "This category already exists: " => "Kategori ini telah wujud", +"No categories selected for deletion." => "tiada kategori dipilih untuk penghapusan", "Settings" => "Tetapan", "Cancel" => "Batal", "No" => "Tidak", "Yes" => "Ya", "Ok" => "Ok", -"No categories selected for deletion." => "tiada kategori dipilih untuk penghapusan", "Error" => "Ralat", "Password" => "Kata laluan", "ownCloud password reset" => "Set semula kata lalaun ownCloud", diff --git a/core/l10n/nb_NO.php b/core/l10n/nb_NO.php index d210485fd9f..7382a1e8398 100644 --- a/core/l10n/nb_NO.php +++ b/core/l10n/nb_NO.php @@ -1,14 +1,23 @@ <?php $TRANSLATIONS = array( -"Application name not provided." => "Applikasjonsnavn ikke angitt.", "No category to add?" => "Ingen kategorier å legge til?", "This category already exists: " => "Denne kategorien finnes allerede:", +"No categories selected for deletion." => "Ingen kategorier merket for sletting.", "Settings" => "Innstillinger", +"seconds ago" => "sekunder siden", +"1 minute ago" => "1 minutt siden", +"{minutes} minutes ago" => "{minutes} minutter siden", +"today" => "i dag", +"yesterday" => "i går", +"{days} days ago" => "{days} dager siden", +"last month" => "forrige måned", +"months ago" => "måneder siden", +"last year" => "forrige år", +"years ago" => "år siden", "Choose" => "Velg", "Cancel" => "Avbryt", "No" => "Nei", "Yes" => "Ja", "Ok" => "Ok", -"No categories selected for deletion." => "Ingen kategorier merket for sletting.", "Error" => "Feil", "Error while sharing" => "Feil under deling", "Share with" => "Del med", diff --git a/core/l10n/nl.php b/core/l10n/nl.php index e3016ee444c..89bb322773d 100644 --- a/core/l10n/nl.php +++ b/core/l10n/nl.php @@ -1,15 +1,35 @@ <?php $TRANSLATIONS = array( -"Application name not provided." => "Applicatienaam niet gegeven.", +"Category type not provided." => "Categorie type niet opgegeven.", "No category to add?" => "Geen categorie toevoegen?", "This category already exists: " => "Deze categorie bestaat al.", +"Object type not provided." => "Object type niet opgegeven.", +"%s ID not provided." => "%s ID niet opgegeven.", +"Error adding %s to favorites." => "Toevoegen van %s aan favorieten is mislukt.", +"No categories selected for deletion." => "Geen categorie geselecteerd voor verwijdering.", +"Error removing %s from favorites." => "Verwijderen %s van favorieten is mislukt.", "Settings" => "Instellingen", +"seconds ago" => "seconden geleden", +"1 minute ago" => "1 minuut geleden", +"{minutes} minutes ago" => "{minutes} minuten geleden", +"1 hour ago" => "1 uur geleden", +"{hours} hours ago" => "{hours} uren geleden", +"today" => "vandaag", +"yesterday" => "gisteren", +"{days} days ago" => "{days} dagen geleden", +"last month" => "vorige maand", +"{months} months ago" => "{months} maanden geleden", +"months ago" => "maanden geleden", +"last year" => "vorig jaar", +"years ago" => "jaar geleden", "Choose" => "Kies", "Cancel" => "Annuleren", "No" => "Nee", "Yes" => "Ja", "Ok" => "Ok", -"No categories selected for deletion." => "Geen categorie geselecteerd voor verwijdering.", +"The object type is not specified." => "Het object type is niet gespecificeerd.", "Error" => "Fout", +"The app name is not specified." => "De app naam is niet gespecificeerd.", +"The required file {file} is not installed!" => "Het vereiste bestand {file} is niet geïnstalleerd!", "Error while sharing" => "Fout tijdens het delen", "Error while unsharing" => "Fout tijdens het stoppen met delen", "Error while changing permissions" => "Fout tijdens het veranderen van permissies", @@ -17,9 +37,9 @@ "Shared with you by {owner}" => "Gedeeld met u door {owner}", "Share with" => "Deel met", "Share with link" => "Deel met link", -"Password protect" => "Passeerwoord beveiliging", +"Password protect" => "Wachtwoord beveiliging", "Password" => "Wachtwoord", -"Set expiration date" => "Zet vervaldatum", +"Set expiration date" => "Stel vervaldatum in", "Expiration date" => "Vervaldatum", "Share via email:" => "Deel via email:", "No people found" => "Geen mensen gevonden", @@ -38,6 +58,8 @@ "ownCloud password reset" => "ownCloud wachtwoord herstellen", "Use the following link to reset your password: {link}" => "Gebruik de volgende link om je wachtwoord te resetten: {link}", "You will receive a link to reset your password via Email." => "U ontvangt een link om uw wachtwoord opnieuw in te stellen via e-mail.", +"Reset email send." => "Reset e-mail verstuurd.", +"Request failed!" => "Verzoek mislukt!", "Username" => "Gebruikersnaam", "Request reset" => "Resetaanvraag", "Your password was reset" => "Je wachtwoord is gewijzigd", @@ -53,18 +75,18 @@ "Cloud not found" => "Cloud niet gevonden", "Edit categories" => "Wijzigen categorieën", "Add" => "Toevoegen", -"Security Warning" => "Beveiligings waarschuwing", +"Security Warning" => "Beveiligingswaarschuwing", "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Er kon geen willekeurig nummer worden gegenereerd. Zet de PHP OpenSSL extentie aan.", "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Zonder random nummer generator is het mogelijk voor een aanvaller om de reset tokens van wachtwoorden te voorspellen. Dit kan leiden tot het inbreken op uw account.", "Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Uw data is waarschijnlijk toegankelijk vanaf net internet. Het .htaccess bestand dat ownCloud levert werkt niet goed. U wordt aangeraden om de configuratie van uw webserver zodanig aan te passen dat de data folders niet meer publiekelijk toegankelijk zijn. U kunt ook de data folder verplaatsen naar een folder buiten de webserver document folder.", "Create an <strong>admin account</strong>" => "Maak een <strong>beheerdersaccount</strong> aan", "Advanced" => "Geavanceerd", "Data folder" => "Gegevensmap", -"Configure the database" => "Configureer de databank", +"Configure the database" => "Configureer de database", "will be used" => "zal gebruikt worden", -"Database user" => "Gebruiker databank", -"Database password" => "Wachtwoord databank", -"Database name" => "Naam databank", +"Database user" => "Gebruiker database", +"Database password" => "Wachtwoord database", +"Database name" => "Naam database", "Database tablespace" => "Database tablespace", "Database host" => "Database server", "Finish setup" => "Installatie afronden", @@ -98,7 +120,7 @@ "You are logged out." => "U bent afgemeld.", "prev" => "vorige", "next" => "volgende", -"Security Warning!" => "Beveiligings waarschuwing!", -"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Verifiëer uw wachtwoord!<br/>Om veiligheidsredenen wordt u regelmatig gevraagd uw wachtwoord in te geven.", +"Security Warning!" => "Beveiligingswaarschuwing!", +"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Verifieer uw wachtwoord!<br/>Om veiligheidsredenen wordt u regelmatig gevraagd uw wachtwoord in te geven.", "Verify" => "Verifieer" ); diff --git a/core/l10n/oc.php b/core/l10n/oc.php index c37e84530d2..1ae67063572 100644 --- a/core/l10n/oc.php +++ b/core/l10n/oc.php @@ -1,14 +1,21 @@ <?php $TRANSLATIONS = array( -"Application name not provided." => "Nom d'applicacion pas donat.", "No category to add?" => "Pas de categoria d'ajustar ?", "This category already exists: " => "La categoria exista ja :", +"No categories selected for deletion." => "Pas de categorias seleccionadas per escafar.", "Settings" => "Configuracion", +"seconds ago" => "segonda a", +"1 minute ago" => "1 minuta a", +"today" => "uèi", +"yesterday" => "ièr", +"last month" => "mes passat", +"months ago" => "meses a", +"last year" => "an passat", +"years ago" => "ans a", "Choose" => "Causís", "Cancel" => "Anulla", "No" => "Non", "Yes" => "Òc", "Ok" => "D'accòrdi", -"No categories selected for deletion." => "Pas de categorias seleccionadas per escafar.", "Error" => "Error", "Error while sharing" => "Error al partejar", "Error while unsharing" => "Error al non partejar", diff --git a/core/l10n/pl.php b/core/l10n/pl.php index 18806af7945..b780e546194 100644 --- a/core/l10n/pl.php +++ b/core/l10n/pl.php @@ -1,15 +1,35 @@ <?php $TRANSLATIONS = array( -"Application name not provided." => "Brak nazwy dla aplikacji", +"Category type not provided." => "Typ kategorii nie podany.", "No category to add?" => "Brak kategorii", "This category already exists: " => "Ta kategoria już istnieje", +"Object type not provided." => "Typ obiektu nie podany.", +"%s ID not provided." => "%s ID nie podany.", +"Error adding %s to favorites." => "Błąd dodania %s do ulubionych.", +"No categories selected for deletion." => "Nie ma kategorii zaznaczonych do usunięcia.", +"Error removing %s from favorites." => "Błąd usunięcia %s z ulubionych.", "Settings" => "Ustawienia", +"seconds ago" => "sekund temu", +"1 minute ago" => "1 minute temu", +"{minutes} minutes ago" => "{minutes} minut temu", +"1 hour ago" => "1 godzine temu", +"{hours} hours ago" => "{hours} godzin temu", +"today" => "dziś", +"yesterday" => "wczoraj", +"{days} days ago" => "{days} dni temu", +"last month" => "ostani miesiąc", +"{months} months ago" => "{months} miesięcy temu", +"months ago" => "miesięcy temu", +"last year" => "ostatni rok", +"years ago" => "lat temu", "Choose" => "Wybierz", "Cancel" => "Anuluj", "No" => "Nie", "Yes" => "Tak", "Ok" => "Ok", -"No categories selected for deletion." => "Nie ma kategorii zaznaczonych do usunięcia.", +"The object type is not specified." => "Typ obiektu nie jest określony.", "Error" => "Błąd", +"The app name is not specified." => "Nazwa aplikacji nie jest określona.", +"The required file {file} is not installed!" => "Żądany plik {file} nie jest zainstalowany!", "Error while sharing" => "Błąd podczas współdzielenia", "Error while unsharing" => "Błąd podczas zatrzymywania współdzielenia", "Error while changing permissions" => "Błąd przy zmianie uprawnień", @@ -19,6 +39,8 @@ "Share with link" => "Współdziel z link", "Password protect" => "Zabezpieczone hasłem", "Password" => "Hasło", +"Email link to person" => "Email do osoby", +"Send" => "Wyślij", "Set expiration date" => "Ustaw datę wygaśnięcia", "Expiration date" => "Data wygaśnięcia", "Share via email:" => "Współdziel poprzez maila", @@ -35,6 +57,8 @@ "Password protected" => "Zabezpieczone hasłem", "Error unsetting expiration date" => "Błąd niszczenie daty wygaśnięcia", "Error setting expiration date" => "Błąd podczas ustawiania daty wygaśnięcia", +"Sending ..." => "Wysyłanie...", +"Email sent" => "Wyślij Email", "ownCloud password reset" => "restart hasła", "Use the following link to reset your password: {link}" => "Proszę użyć tego odnośnika do zresetowania hasła: {link}", "You will receive a link to reset your password via Email." => "Odnośnik służący do resetowania hasła zostanie wysłany na adres e-mail.", diff --git a/core/l10n/pt_BR.php b/core/l10n/pt_BR.php index f40328407f9..f28b0035995 100644 --- a/core/l10n/pt_BR.php +++ b/core/l10n/pt_BR.php @@ -1,18 +1,40 @@ <?php $TRANSLATIONS = array( -"Application name not provided." => "Nome da aplicação não foi fornecido.", +"Category type not provided." => "Tipo de categoria não fornecido.", "No category to add?" => "Nenhuma categoria adicionada?", "This category already exists: " => "Essa categoria já existe", +"Object type not provided." => "tipo de objeto não fornecido.", +"%s ID not provided." => "%s ID não fornecido(s).", +"Error adding %s to favorites." => "Erro ao adicionar %s aos favoritos.", +"No categories selected for deletion." => "Nenhuma categoria selecionada para deletar.", +"Error removing %s from favorites." => "Erro ao remover %s dos favoritos.", "Settings" => "Configurações", +"seconds ago" => "segundos atrás", +"1 minute ago" => "1 minuto atrás", +"{minutes} minutes ago" => "{minutes} minutos atrás", +"1 hour ago" => "1 hora atrás", +"{hours} hours ago" => "{hours} horas atrás", +"today" => "hoje", +"yesterday" => "ontem", +"{days} days ago" => "{days} dias atrás", +"last month" => "último mês", +"{months} months ago" => "{months} meses atrás", +"months ago" => "meses atrás", +"last year" => "último ano", +"years ago" => "anos atrás", "Choose" => "Escolha", "Cancel" => "Cancelar", "No" => "Não", "Yes" => "Sim", "Ok" => "Ok", -"No categories selected for deletion." => "Nenhuma categoria selecionada para deletar.", +"The object type is not specified." => "O tipo de objeto não foi especificado.", "Error" => "Erro", +"The app name is not specified." => "O nome do app não foi especificado.", +"The required file {file} is not installed!" => "O arquivo {file} necessário não está instalado!", "Error while sharing" => "Erro ao compartilhar", "Error while unsharing" => "Erro ao descompartilhar", "Error while changing permissions" => "Erro ao mudar permissões", +"Shared with you and the group {group} by {owner}" => "Compartilhado com você e com o grupo {group} por {owner}", +"Shared with you by {owner}" => "Compartilhado com você por {owner}", "Share with" => "Compartilhar com", "Share with link" => "Compartilhar com link", "Password protect" => "Proteger com senha", @@ -22,6 +44,7 @@ "Share via email:" => "Compartilhar via e-mail:", "No people found" => "Nenhuma pessoa encontrada", "Resharing is not allowed" => "Não é permitido re-compartilhar", +"Shared in {item} with {user}" => "Compartilhado em {item} com {user}", "Unshare" => "Descompartilhar", "can edit" => "pode editar", "access control" => "controle de acesso", @@ -35,6 +58,8 @@ "ownCloud password reset" => "Redefinir senha ownCloud", "Use the following link to reset your password: {link}" => "Use o seguinte link para redefinir sua senha: {link}", "You will receive a link to reset your password via Email." => "Você receberá um link para redefinir sua senha via e-mail.", +"Reset email send." => "Email de redefinição de senha enviado.", +"Request failed!" => "A requisição falhou!", "Username" => "Nome de Usuário", "Request reset" => "Pedido de reposição", "Your password was reset" => "Sua senha foi mudada", @@ -86,6 +111,8 @@ "December" => "Dezembro", "web services under your control" => "web services sob seu controle", "Log out" => "Sair", +"Automatic logon rejected!" => "Entrada Automática no Sistema Rejeitada!", +"If you did not change your password recently, your account may be compromised!" => "Se você não mudou a sua senha recentemente, a sua conta pode estar comprometida!", "Please change your password to secure your account again." => "Por favor troque sua senha para tornar sua conta segura novamente.", "Lost your password?" => "Esqueçeu sua senha?", "remember" => "lembrete", @@ -93,5 +120,7 @@ "You are logged out." => "Você está desconectado.", "prev" => "anterior", "next" => "próximo", -"Security Warning!" => "Aviso de Segurança!" +"Security Warning!" => "Aviso de Segurança!", +"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Por favor, verifique a sua senha.<br />Por motivos de segurança, você deverá ser solicitado a muda-la ocasionalmente.", +"Verify" => "Verificar" ); diff --git a/core/l10n/pt_PT.php b/core/l10n/pt_PT.php index c9daa645c47..24017d39819 100644 --- a/core/l10n/pt_PT.php +++ b/core/l10n/pt_PT.php @@ -1,15 +1,35 @@ <?php $TRANSLATIONS = array( -"Application name not provided." => "Nome da aplicação não definida.", +"Category type not provided." => "Tipo de categoria não fornecido", "No category to add?" => "Nenhuma categoria para adicionar?", "This category already exists: " => "Esta categoria já existe:", +"Object type not provided." => "Tipo de objecto não fornecido", +"%s ID not provided." => "ID %s não fornecido", +"Error adding %s to favorites." => "Erro a adicionar %s aos favoritos", +"No categories selected for deletion." => "Nenhuma categoria seleccionar para eliminar", +"Error removing %s from favorites." => "Erro a remover %s dos favoritos.", "Settings" => "Definições", +"seconds ago" => "Minutos atrás", +"1 minute ago" => "Falta 1 minuto", +"{minutes} minutes ago" => "{minutes} minutos atrás", +"1 hour ago" => "Há 1 hora", +"{hours} hours ago" => "Há {hours} horas atrás", +"today" => "hoje", +"yesterday" => "ontem", +"{days} days ago" => "{days} dias atrás", +"last month" => "ultímo mês", +"{months} months ago" => "Há {months} meses atrás", +"months ago" => "meses atrás", +"last year" => "ano passado", +"years ago" => "anos atrás", "Choose" => "Escolha", "Cancel" => "Cancelar", "No" => "Não", "Yes" => "Sim", "Ok" => "Ok", -"No categories selected for deletion." => "Nenhuma categoria seleccionar para eliminar", +"The object type is not specified." => "O tipo de objecto não foi especificado", "Error" => "Erro", +"The app name is not specified." => "O nome da aplicação não foi especificado", +"The required file {file} is not installed!" => "O ficheiro necessário {file} não está instalado!", "Error while sharing" => "Erro ao partilhar", "Error while unsharing" => "Erro ao deixar de partilhar", "Error while changing permissions" => "Erro ao mudar permissões", @@ -38,6 +58,8 @@ "ownCloud password reset" => "Reposição da password ownCloud", "Use the following link to reset your password: {link}" => "Use o seguinte endereço para repor a sua password: {link}", "You will receive a link to reset your password via Email." => "Vai receber um endereço para repor a sua password", +"Reset email send." => "E-mail de reinicialização enviado.", +"Request failed!" => "O pedido falhou!", "Username" => "Utilizador", "Request reset" => "Pedir reposição", "Your password was reset" => "A sua password foi reposta", @@ -54,6 +76,8 @@ "Edit categories" => "Editar categorias", "Add" => "Adicionar", "Security Warning" => "Aviso de Segurança", +"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Não existe nenhum gerador seguro de números aleatórios, por favor, active a extensão OpenSSL no PHP.", +"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Sem nenhum gerador seguro de números aleatórios, uma pessoa mal intencionada pode prever a sua password, reiniciar as seguranças adicionais e tomar conta da sua conta. ", "Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "A sua pasta com os dados e os seus ficheiros estão provavelmente acessíveis a partir das internet. Sugerimos veementemente que configure o seu servidor web de maneira a que a pasta com os dados deixe de ficar acessível, ou mova a pasta com os dados para fora da raiz de documentos do servidor web.", "Create an <strong>admin account</strong>" => "Criar uma <strong>conta administrativa</strong>", "Advanced" => "Avançado", @@ -87,6 +111,8 @@ "December" => "Dezembro", "web services under your control" => "serviços web sob o seu controlo", "Log out" => "Sair", +"Automatic logon rejected!" => "Login automático rejeitado!", +"If you did not change your password recently, your account may be compromised!" => "Se não mudou a sua palavra-passe recentemente, a sua conta pode ter sido comprometida!", "Please change your password to secure your account again." => "Por favor mude a sua palavra-passe para assegurar a sua conta de novo.", "Lost your password?" => "Esqueceu a sua password?", "remember" => "lembrar", diff --git a/core/l10n/ro.php b/core/l10n/ro.php index d0551be2483..560ef5b9fc8 100644 --- a/core/l10n/ro.php +++ b/core/l10n/ro.php @@ -1,14 +1,21 @@ <?php $TRANSLATIONS = array( -"Application name not provided." => "Numele aplicație nu este furnizat.", "No category to add?" => "Nici o categorie de adăugat?", "This category already exists: " => "Această categorie deja există:", +"No categories selected for deletion." => "Nici o categorie selectată pentru ștergere.", "Settings" => "Configurări", +"seconds ago" => "secunde în urmă", +"1 minute ago" => "1 minut în urmă", +"today" => "astăzi", +"yesterday" => "ieri", +"last month" => "ultima lună", +"months ago" => "luni în urmă", +"last year" => "ultimul an", +"years ago" => "ani în urmă", "Choose" => "Alege", "Cancel" => "Anulare", "No" => "Nu", "Yes" => "Da", "Ok" => "Ok", -"No categories selected for deletion." => "Nici o categorie selectată pentru ștergere.", "Error" => "Eroare", "Error while sharing" => "Eroare la partajare", "Error while unsharing" => "Eroare la anularea partajării", diff --git a/core/l10n/ru.php b/core/l10n/ru.php index ff5f30fbe18..4db2a2f06fd 100644 --- a/core/l10n/ru.php +++ b/core/l10n/ru.php @@ -1,15 +1,39 @@ <?php $TRANSLATIONS = array( -"Application name not provided." => "Имя приложения не установлено.", +"User %s shared a file with you" => "Пользователь %s поделился с вами файлом", +"User %s shared a folder with you" => "Пользователь %s открыл вам доступ к папке", +"User %s shared the file \"%s\" with you. It is available for download here: %s" => "Пользователь %s открыл вам доступ к файлу \"%s\". Он доступен для загрузки здесь: %s", +"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Пользователь %s открыл вам доступ к папке \"%s\". Она доступна для загрузки здесь: %s", +"Category type not provided." => "Тип категории не предоставлен", "No category to add?" => "Нет категорий для добавления?", "This category already exists: " => "Эта категория уже существует: ", +"Object type not provided." => "Тип объекта не предоставлен", +"%s ID not provided." => "ID %s не предоставлен", +"Error adding %s to favorites." => "Ошибка добавления %s в избранное", +"No categories selected for deletion." => "Нет категорий для удаления.", +"Error removing %s from favorites." => "Ошибка удаления %s из избранного", "Settings" => "Настройки", +"seconds ago" => "несколько секунд назад", +"1 minute ago" => "1 минуту назад", +"{minutes} minutes ago" => "{minutes} минут назад", +"1 hour ago" => "час назад", +"{hours} hours ago" => "{hours} часов назад", +"today" => "сегодня", +"yesterday" => "вчера", +"{days} days ago" => "{days} дней назад", +"last month" => "в прошлом месяце", +"{months} months ago" => "{months} месяцев назад", +"months ago" => "несколько месяцев назад", +"last year" => "в прошлом году", +"years ago" => "несколько лет назад", "Choose" => "Выбрать", "Cancel" => "Отмена", "No" => "Нет", "Yes" => "Да", "Ok" => "Ок", -"No categories selected for deletion." => "Нет категорий для удаления.", +"The object type is not specified." => "Тип объекта не указан", "Error" => "Ошибка", +"The app name is not specified." => "Имя приложения не указано", +"The required file {file} is not installed!" => "Необходимый файл {file} не установлен!", "Error while sharing" => "Ошибка при открытии доступа", "Error while unsharing" => "Ошибка при закрытии доступа", "Error while changing permissions" => "Ошибка при смене разрешений", @@ -19,6 +43,8 @@ "Share with link" => "Поделиться с ссылкой", "Password protect" => "Защитить паролем", "Password" => "Пароль", +"Email link to person" => "Почтовая ссылка на персону", +"Send" => "Отправить", "Set expiration date" => "Установить срок доступа", "Expiration date" => "Дата окончания", "Share via email:" => "Поделится через электронную почту:", @@ -35,6 +61,8 @@ "Password protected" => "Защищено паролем", "Error unsetting expiration date" => "Ошибка при отмене срока доступа", "Error setting expiration date" => "Ошибка при установке срока доступа", +"Sending ..." => "Отправляется ...", +"Email sent" => "Письмо отправлено", "ownCloud password reset" => "Сброс пароля ", "Use the following link to reset your password: {link}" => "Используйте следующую ссылку чтобы сбросить пароль: {link}", "You will receive a link to reset your password via Email." => "На ваш адрес Email выслана ссылка для сброса пароля.", diff --git a/core/l10n/ru_RU.php b/core/l10n/ru_RU.php index 610bb0b175b..7dea4062809 100644 --- a/core/l10n/ru_RU.php +++ b/core/l10n/ru_RU.php @@ -1,15 +1,35 @@ <?php $TRANSLATIONS = array( -"Application name not provided." => "Имя приложения не предоставлено.", +"Category type not provided." => "Тип категории не предоставлен.", "No category to add?" => "Нет категории для добавления?", "This category already exists: " => "Эта категория уже существует:", +"Object type not provided." => "Тип объекта не предоставлен.", +"%s ID not provided." => "%s ID не предоставлен.", +"Error adding %s to favorites." => "Ошибка добавления %s в избранное.", +"No categories selected for deletion." => "Нет категорий, выбранных для удаления.", +"Error removing %s from favorites." => "Ошибка удаления %s из избранного.", "Settings" => "Настройки", +"seconds ago" => "секунд назад", +"1 minute ago" => " 1 минуту назад", +"{minutes} minutes ago" => "{минуты} минут назад", +"1 hour ago" => "1 час назад", +"{hours} hours ago" => "{часы} часов назад", +"today" => "сегодня", +"yesterday" => "вчера", +"{days} days ago" => "{дни} дней назад", +"last month" => "в прошлом месяце", +"{months} months ago" => "{месяцы} месяцев назад", +"months ago" => "месяц назад", +"last year" => "в прошлом году", +"years ago" => "лет назад", "Choose" => "Выбрать", "Cancel" => "Отмена", "No" => "Нет", "Yes" => "Да", "Ok" => "Да", -"No categories selected for deletion." => "Нет категорий, выбранных для удаления.", +"The object type is not specified." => "Тип объекта не указан.", "Error" => "Ошибка", +"The app name is not specified." => "Имя приложения не указано.", +"The required file {file} is not installed!" => "Требуемый файл {файл} не установлен!", "Error while sharing" => "Ошибка создания общего доступа", "Error while unsharing" => "Ошибка отключения общего доступа", "Error while changing permissions" => "Ошибка при изменении прав доступа", diff --git a/core/l10n/si_LK.php b/core/l10n/si_LK.php index 9061274fb15..35b0df3188c 100644 --- a/core/l10n/si_LK.php +++ b/core/l10n/si_LK.php @@ -1,12 +1,19 @@ <?php $TRANSLATIONS = array( -"Application name not provided." => "යෙදුම් නාමය සපයා නැත.", +"No categories selected for deletion." => "මකා දැමීම සඳහා ප්රවර්ගයන් තෝරා නොමැත.", "Settings" => "සැකසුම්", +"seconds ago" => "තත්පරයන්ට පෙර", +"1 minute ago" => "1 මිනිත්තුවකට පෙර", +"today" => "අද", +"yesterday" => "ඊයේ", +"last month" => "පෙර මාසයේ", +"months ago" => "මාස කීපයකට පෙර", +"last year" => "පෙර අවුරුද්දේ", +"years ago" => "අවුරුදු කීපයකට පෙර", "Choose" => "තෝරන්න", "Cancel" => "එපා", "No" => "නැහැ", "Yes" => "ඔව්", "Ok" => "හරි", -"No categories selected for deletion." => "මකා දැමීම සඳහා ප්රවර්ගයන් තෝරා නොමැත.", "Error" => "දෝෂයක්", "Share with" => "බෙදාගන්න", "Share with link" => "යොමුවක් මඟින් බෙදාගන්න", @@ -19,15 +26,20 @@ "can edit" => "සංස්කරණය කළ හැක", "access control" => "ප්රවේශ පාලනය", "create" => "සදන්න", +"update" => "යාවත්කාලීන කරන්න", "delete" => "මකන්න", "share" => "බෙදාහදාගන්න", "Password protected" => "මුර පදයකින් ආරක්ශාකර ඇත", "Error unsetting expiration date" => "කල් ඉකුත් දිනය ඉවත් කිරීමේ දෝෂයක්", "Error setting expiration date" => "කල් ඉකුත් දිනය ස්ථාපනය කිරීමේ දෝෂයක්", +"ownCloud password reset" => "ownCloud මුරපදය ප්රත්යාරම්භ කරන්න", +"You will receive a link to reset your password via Email." => "ඔබගේ මුරපදය ප්රත්යාරම්භ කිරීම සඳහා යොමුව විද්යුත් තැපෑලෙන් ලැබෙනු ඇත", "Request failed!" => "ඉල්ලීම අසාර්ථකයි!", "Username" => "පරිශීලක නම", +"Your password was reset" => "ඔබේ මුරපදය ප්රත්යාරම්භ කරන ලදී", "To login page" => "පිවිසුම් පිටුවට", "New password" => "නව මුර පදයක්", +"Reset password" => "මුරපදය ප්රත්යාරම්භ කරන්න", "Personal" => "පෞද්ගලික", "Users" => "පරිශීලකයන්", "Apps" => "යෙදුම්", @@ -39,9 +51,11 @@ "Add" => "එක් කරන්න", "Security Warning" => "ආරක්ෂක නිවේදනයක්", "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "ආරක්ෂිත අහඹු සංඛ්යා උත්පාදකයක් නොමැති නම් ඔබගේ ගිණුමට පහරදෙන අයකුට එහි මුරපද යළි පිහිටුවීමට අවශ්ය ටෝකන පහසුවෙන් සොයාගෙන ඔබගේ ගිණුම පැහැරගත හැක.", +"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "ඔබගේ දත්ත ඩිරෙක්ටරිය හා ගොනුවලට අන්තර්ජාලයෙන් පිවිසිය හැක. ownCloud සපයා ඇති .htaccess ගොනුව ක්රියාකරන්නේ නැත. අපි තරයේ කියා සිටිනුයේ නම්, මෙම දත්ත හා ගොනු එසේ පිවිසීමට නොහැකි වන ලෙස ඔබේ වෙබ් සේවාදායකයා වින්යාස කරන ලෙස හෝ එම ඩිරෙක්ටරිය වෙබ් මූලයෙන් පිටතට ගෙනයන ලෙසය.", "Advanced" => "දියුණු/උසස්", "Data folder" => "දත්ත ෆෝල්ඩරය", "Configure the database" => "දත්ත සමුදාය හැඩගැසීම", +"will be used" => "භාවිතා වනු ඇත", "Database user" => "දත්තගබඩා භාවිතාකරු", "Database password" => "දත්තගබඩාවේ මුරපදය", "Database name" => "දත්තගබඩාවේ නම", diff --git a/core/l10n/sk_SK.php b/core/l10n/sk_SK.php index 8b76ccc537e..162d94e8242 100644 --- a/core/l10n/sk_SK.php +++ b/core/l10n/sk_SK.php @@ -1,15 +1,35 @@ <?php $TRANSLATIONS = array( -"Application name not provided." => "Meno aplikácie nezadané.", +"Category type not provided." => "Neposkytnutý kategorický typ.", "No category to add?" => "Žiadna kategória pre pridanie?", "This category already exists: " => "Táto kategória už existuje:", +"Object type not provided." => "Neposkytnutý typ objektu.", +"%s ID not provided." => "%s ID neposkytnuté.", +"Error adding %s to favorites." => "Chyba pri pridávaní %s do obľúbených položiek.", +"No categories selected for deletion." => "Neboli vybrané žiadne kategórie pre odstránenie.", +"Error removing %s from favorites." => "Chyba pri odstraňovaní %s z obľúbených položiek.", "Settings" => "Nastavenia", +"seconds ago" => "pred sekundami", +"1 minute ago" => "pred minútou", +"{minutes} minutes ago" => "pred {minutes} minútami", +"1 hour ago" => "Pred 1 hodinou.", +"{hours} hours ago" => "Pred {hours} hodinami.", +"today" => "dnes", +"yesterday" => "včera", +"{days} days ago" => "pred {days} dňami", +"last month" => "minulý mesiac", +"{months} months ago" => "Pred {months} mesiacmi.", +"months ago" => "pred mesiacmi", +"last year" => "minulý rok", +"years ago" => "pred rokmi", "Choose" => "Výber", "Cancel" => "Zrušiť", "No" => "Nie", "Yes" => "Áno", "Ok" => "Ok", -"No categories selected for deletion." => "Neboli vybrané žiadne kategórie pre odstránenie.", +"The object type is not specified." => "Nešpecifikovaný typ objektu.", "Error" => "Chyba", +"The app name is not specified." => "Nešpecifikované meno aplikácie.", +"The required file {file} is not installed!" => "Požadovaný súbor {file} nie je inštalovaný!", "Error while sharing" => "Chyba počas zdieľania", "Error while unsharing" => "Chyba počas ukončenia zdieľania", "Error while changing permissions" => "Chyba počas zmeny oprávnení", diff --git a/core/l10n/sl.php b/core/l10n/sl.php index 6c63ba04661..0ee2eb03b3c 100644 --- a/core/l10n/sl.php +++ b/core/l10n/sl.php @@ -1,27 +1,56 @@ <?php $TRANSLATIONS = array( -"Application name not provided." => "Ime programa ni določeno.", +"User %s shared a file with you" => "Uporanik %s je dal datoteko v souporabo z vami", +"User %s shared a folder with you" => "Uporanik %s je dal mapo v souporabo z vami", +"User %s shared the file \"%s\" with you. It is available for download here: %s" => "Uporanik %s je dal datoteko \"%s\" v souporabo z vami. Prenesete jo lahko tukaj: %s", +"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Uporanik %s je dal mapo \"%s\" v souporabo z vami. Prenesete je lahko tukaj: %s", +"Category type not provided." => "Vrsta kategorije ni podana.", "No category to add?" => "Ni kategorije za dodajanje?", "This category already exists: " => "Ta kategorija že obstaja:", +"Object type not provided." => "Vrsta predmeta ni podana.", +"%s ID not provided." => "%s ID ni podan.", +"Error adding %s to favorites." => "Napaka pri dodajanju %s med priljubljene.", +"No categories selected for deletion." => "Za izbris ni izbrana nobena kategorija.", +"Error removing %s from favorites." => "Napaka pri odstranjevanju %s iz priljubljenih.", "Settings" => "Nastavitve", +"seconds ago" => "pred nekaj sekundami", +"1 minute ago" => "pred minuto", +"{minutes} minutes ago" => "pred {minutes} minutami", +"1 hour ago" => "pred 1 uro", +"{hours} hours ago" => "pred {hours} urami", +"today" => "danes", +"yesterday" => "včeraj", +"{days} days ago" => "pred {days} dnevi", +"last month" => "zadnji mesec", +"{months} months ago" => "pred {months} meseci", +"months ago" => "mesecev nazaj", +"last year" => "lansko leto", +"years ago" => "let nazaj", "Choose" => "Izbor", "Cancel" => "Prekliči", "No" => "Ne", "Yes" => "Da", "Ok" => "V redu", -"No categories selected for deletion." => "Za izbris ni izbrana nobena kategorija.", +"The object type is not specified." => "Vrsta predmeta ni podana.", "Error" => "Napaka", +"The app name is not specified." => "Ime aplikacije ni podano.", +"The required file {file} is not installed!" => "Zahtevana datoteka {file} ni nameščena!", "Error while sharing" => "Napaka med souporabo", "Error while unsharing" => "Napaka med odstranjevanjem souporabe", "Error while changing permissions" => "Napaka med spreminjanjem dovoljenj", +"Shared with you and the group {group} by {owner}" => "V souporabi z vami in skupino {group}. Lastnik je {owner}.", +"Shared with you by {owner}" => "V souporabi z vami. Lastnik je {owner}.", "Share with" => "Omogoči souporabo z", "Share with link" => "Omogoči souporabo s povezavo", "Password protect" => "Zaščiti z geslom", "Password" => "Geslo", +"Email link to person" => "Posreduj povezavo po e-pošti", +"Send" => "Pošlji", "Set expiration date" => "Nastavi datum preteka", "Expiration date" => "Datum preteka", "Share via email:" => "Souporaba preko elektronske pošte:", "No people found" => "Ni najdenih uporabnikov", "Resharing is not allowed" => "Ponovna souporaba ni omogočena", +"Shared in {item} with {user}" => "V souporabi v {item} z {user}", "Unshare" => "Odstrani souporabo", "can edit" => "lahko ureja", "access control" => "nadzor dostopa", @@ -32,9 +61,13 @@ "Password protected" => "Zaščiteno z geslom", "Error unsetting expiration date" => "Napaka brisanja datuma preteka", "Error setting expiration date" => "Napaka med nastavljanjem datuma preteka", +"Sending ..." => "Pošiljam ...", +"Email sent" => "E-pošta je bila poslana", "ownCloud password reset" => "Ponastavitev gesla ownCloud", "Use the following link to reset your password: {link}" => "Uporabite naslednjo povezavo za ponastavitev gesla: {link}", "You will receive a link to reset your password via Email." => "Na elektronski naslov boste prejeli povezavo za ponovno nastavitev gesla.", +"Reset email send." => "E-pošta za ponastavitev je bila poslana.", +"Request failed!" => "Zahtevek je spodletel!", "Username" => "Uporabniško Ime", "Request reset" => "Zahtevaj ponastavitev", "Your password was reset" => "Geslo je ponastavljeno", @@ -51,6 +84,8 @@ "Edit categories" => "Uredi kategorije", "Add" => "Dodaj", "Security Warning" => "Varnostno opozorilo", +"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Na voljo ni varnega generatorja naključnih števil. Prosimo, če omogočite PHP OpenSSL razširitev.", +"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Brez varnega generatorja naključnih števil lahko napadalec napove žetone za ponastavitev gesla, kar mu omogoča, da prevzame vaš račun.", "Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Trenutno je dostop do podatkovne mape in datotek najverjetneje omogočen vsem uporabnikom na omrežju. Datoteka .htaccess, vključena v ownCloud namreč ni omogočena. Močno priporočamo nastavitev spletnega strežnika tako, da mapa podatkov ne bo javno dostopna ali pa, da jo prestavite ven iz korenske mape spletnega strežnika.", "Create an <strong>admin account</strong>" => "Ustvari <strong>skrbniški račun</strong>", "Advanced" => "Napredne možnosti", @@ -85,6 +120,7 @@ "web services under your control" => "spletne storitve pod vašim nadzorom", "Log out" => "Odjava", "Automatic logon rejected!" => "Samodejno prijavljanje je zavrnjeno!", +"If you did not change your password recently, your account may be compromised!" => "Če vašega gesla niste nedavno spremenili, je vaš račun lahko ogrožen!", "Please change your password to secure your account again." => "Spremenite geslo za izboljšanje zaščite računa.", "Lost your password?" => "Ali ste pozabili geslo?", "remember" => "Zapomni si me", @@ -93,5 +129,6 @@ "prev" => "nazaj", "next" => "naprej", "Security Warning!" => "Varnostno opozorilo!", +"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Prosimo, če preverite vaše geslo. Iz varnostnih razlogov vas lahko občasno prosimo, da ga ponovno vnesete.", "Verify" => "Preveri" ); diff --git a/core/l10n/sr.php b/core/l10n/sr.php index b2576c44445..406b92ff83f 100644 --- a/core/l10n/sr.php +++ b/core/l10n/sr.php @@ -1,9 +1,65 @@ <?php $TRANSLATIONS = array( +"Category type not provided." => "Врста категорије није унет.", +"No category to add?" => "Додати још неку категорију?", +"This category already exists: " => "Категорија већ постоји:", +"Object type not provided." => "Врста објекта није унета.", +"%s ID not provided." => "%s ИД нису унети.", +"Error adding %s to favorites." => "Грешка приликом додавања %s у омиљене.", +"No categories selected for deletion." => "Ни једна категорија није означена за брисање.", +"Error removing %s from favorites." => "Грешка приликом уклањања %s из омиљених", "Settings" => "Подешавања", +"seconds ago" => "пре неколико секунди", +"1 minute ago" => "пре 1 минут", +"{minutes} minutes ago" => "пре {minutes} минута", +"1 hour ago" => "Пре једног сата", +"{hours} hours ago" => "Пре {hours} сата (сати)", +"today" => "данас", +"yesterday" => "јуче", +"{days} days ago" => "пре {days} дана", +"last month" => "прошлог месеца", +"{months} months ago" => "Пре {months} месеца (месеци)", +"months ago" => "месеци раније", +"last year" => "прошле године", +"years ago" => "година раније", +"Choose" => "Одабери", "Cancel" => "Откажи", +"No" => "Не", +"Yes" => "Да", +"Ok" => "У реду", +"The object type is not specified." => "Врста објекта није подешена.", +"Error" => "Грешка", +"The app name is not specified." => "Име програма није унето.", +"The required file {file} is not installed!" => "Потребна датотека {file} није инсталирана.", +"Error while sharing" => "Грешка у дељењу", +"Error while unsharing" => "Грешка код искључења дељења", +"Error while changing permissions" => "Грешка код промене дозвола", +"Shared with you and the group {group} by {owner}" => "Дељено са вама и са групом {group}. Поделио {owner}.", +"Shared with you by {owner}" => "Поделио са вама {owner}", +"Share with" => "Подели са", +"Share with link" => "Подели линк", +"Password protect" => "Заштићено лозинком", "Password" => "Лозинка", +"Set expiration date" => "Постави датум истека", +"Expiration date" => "Датум истека", +"Share via email:" => "Подели поштом:", +"No people found" => "Особе нису пронађене.", +"Resharing is not allowed" => "Поновно дељење није дозвољено", +"Shared in {item} with {user}" => "Подељено унутар {item} са {user}", +"Unshare" => "Не дели", +"can edit" => "може да мења", +"access control" => "права приступа", +"create" => "направи", +"update" => "ажурирај", +"delete" => "обриши", +"share" => "подели", +"Password protected" => "Заштићено лозинком", +"Error unsetting expiration date" => "Грешка код поништавања датума истека", +"Error setting expiration date" => "Грешка код постављања датума истека", +"ownCloud password reset" => "Поништавање лозинке за ownCloud", "Use the following link to reset your password: {link}" => "Овом везом ресетујте своју лозинку: {link}", "You will receive a link to reset your password via Email." => "Добићете везу за ресетовање лозинке путем е-поште.", +"Reset email send." => "Захтев је послат поштом.", +"Request failed!" => "Захтев одбијен!", "Username" => "Корисничко име", "Request reset" => "Захтевај ресетовање", "Your password was reset" => "Ваша лозинка је ресетована", @@ -15,8 +71,14 @@ "Apps" => "Програми", "Admin" => "Аднинистрација", "Help" => "Помоћ", +"Access forbidden" => "Забрањен приступ", "Cloud not found" => "Облак није нађен", +"Edit categories" => "Измени категорије", "Add" => "Додај", +"Security Warning" => "Сигурносно упозорење", +"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Поуздан генератор случајних бројева није доступан, предлажемо да укључите PHP проширење OpenSSL.", +"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Без поузданог генератора случајнох бројева нападач лако може предвидети лозинку за поништавање кључа шифровања и отети вам налог.", +"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Тренутно су ваши подаци и датотеке доступне са интернета. Датотека .htaccess коју је обезбедио пакет ownCloud не функционише. Саветујемо вам да подесите веб сервер тако да директоријум са подацима не буде изложен или да га преместите изван коренског директоријума веб сервера.", "Create an <strong>admin account</strong>" => "Направи <strong>административни налог</strong>", "Advanced" => "Напредно", "Data folder" => "Фацикла података", @@ -25,6 +87,7 @@ "Database user" => "Корисник базе", "Database password" => "Лозинка базе", "Database name" => "Име базе", +"Database tablespace" => "Радни простор базе података", "Database host" => "Домаћин базе", "Finish setup" => "Заврши подешавање", "Sunday" => "Недеља", @@ -48,10 +111,16 @@ "December" => "Децембар", "web services under your control" => "веб сервиси под контролом", "Log out" => "Одјава", +"Automatic logon rejected!" => "Аутоматска пријава је одбијена!", +"If you did not change your password recently, your account may be compromised!" => "Ако ускоро не промените лозинку ваш налог може бити компромитован!", +"Please change your password to secure your account again." => "Промените лозинку да бисте обезбедили налог.", "Lost your password?" => "Изгубили сте лозинку?", "remember" => "упамти", "Log in" => "Пријава", "You are logged out." => "Одјављени сте.", "prev" => "претходно", -"next" => "следеће" +"next" => "следеће", +"Security Warning!" => "Сигурносно упозорење!", +"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Потврдите лозинку. <br />Из сигурносних разлога затрежићемо вам да два пута унесете лозинку.", +"Verify" => "Потврди" ); diff --git a/core/l10n/sv.php b/core/l10n/sv.php index d10ee392fa8..b06ccb199c6 100644 --- a/core/l10n/sv.php +++ b/core/l10n/sv.php @@ -1,15 +1,35 @@ <?php $TRANSLATIONS = array( -"Application name not provided." => "Programnamn har inte angetts.", +"Category type not provided." => "Kategorityp inte angiven.", "No category to add?" => "Ingen kategori att lägga till?", "This category already exists: " => "Denna kategori finns redan:", +"Object type not provided." => "Objekttyp inte angiven.", +"%s ID not provided." => "%s ID inte angiven.", +"Error adding %s to favorites." => "Fel vid tillägg av %s till favoriter.", +"No categories selected for deletion." => "Inga kategorier valda för radering.", +"Error removing %s from favorites." => "Fel vid borttagning av %s från favoriter.", "Settings" => "Inställningar", +"seconds ago" => "sekunder sedan", +"1 minute ago" => "1 minut sedan", +"{minutes} minutes ago" => "{minutes} minuter sedan", +"1 hour ago" => "1 timme sedan", +"{hours} hours ago" => "{hours} timmar sedan", +"today" => "i dag", +"yesterday" => "i går", +"{days} days ago" => "{days} dagar sedan", +"last month" => "förra månaden", +"{months} months ago" => "{months} månader sedan", +"months ago" => "månader sedan", +"last year" => "förra året", +"years ago" => "år sedan", "Choose" => "Välj", "Cancel" => "Avbryt", "No" => "Nej", "Yes" => "Ja", "Ok" => "Ok", -"No categories selected for deletion." => "Inga kategorier valda för radering.", +"The object type is not specified." => "Objekttypen är inte specificerad.", "Error" => "Fel", +"The app name is not specified." => " Namnet på appen är inte specificerad.", +"The required file {file} is not installed!" => "Den nödvändiga filen {file} är inte installerad!", "Error while sharing" => "Fel vid delning", "Error while unsharing" => "Fel när delning skulle avslutas", "Error while changing permissions" => "Fel vid ändring av rättigheter", diff --git a/core/l10n/ta_LK.php b/core/l10n/ta_LK.php index faf82fd1f9c..9a432d11c9b 100644 --- a/core/l10n/ta_LK.php +++ b/core/l10n/ta_LK.php @@ -1,15 +1,35 @@ <?php $TRANSLATIONS = array( -"Application name not provided." => "செயலி பெயர் வழங்கப்படவில்லை.", +"Category type not provided." => "பிரிவு வகைகள் வழங்கப்படவில்லை", "No category to add?" => "சேர்ப்பதற்கான வகைகள் இல்லையா?", "This category already exists: " => "இந்த வகை ஏற்கனவே உள்ளது:", +"Object type not provided." => "பொருள் வகை வழங்கப்படவில்லை", +"%s ID not provided." => "%s ID வழங்கப்படவில்லை", +"Error adding %s to favorites." => "விருப்பங்களுக்கு %s ஐ சேர்ப்பதில் வழு", +"No categories selected for deletion." => "நீக்குவதற்கு எந்தப் பிரிவும் தெரிவுசெய்யப்படவில்லை.", +"Error removing %s from favorites." => "விருப்பத்திலிருந்து %s ஐ அகற்றுவதில் வழு.உஇஇ", "Settings" => "அமைப்புகள்", +"seconds ago" => "செக்கன்களுக்கு முன்", +"1 minute ago" => "1 நிமிடத்திற்கு முன் ", +"{minutes} minutes ago" => "{நிமிடங்கள்} நிமிடங்களுக்கு முன் ", +"1 hour ago" => "1 மணித்தியாலத்திற்கு முன்", +"{hours} hours ago" => "{மணித்தியாலங்கள்} மணித்தியாலங்களிற்கு முன்", +"today" => "இன்று", +"yesterday" => "நேற்று", +"{days} days ago" => "{நாட்கள்} நாட்களுக்கு முன்", +"last month" => "கடந்த மாதம்", +"{months} months ago" => "{மாதங்கள்} மாதங்களிற்கு முன்", +"months ago" => "மாதங்களுக்கு முன்", +"last year" => "கடந்த வருடம்", +"years ago" => "வருடங்களுக்கு முன்", "Choose" => "தெரிவுசெய்க ", "Cancel" => "இரத்து செய்க", "No" => "இல்லை", "Yes" => "ஆம்", "Ok" => "சரி", -"No categories selected for deletion." => "நீக்குவதற்கு எந்தப் பிரிவும் தெரிவுசெய்யப்படவில்லை.", +"The object type is not specified." => "பொருள் வகை குறிப்பிடப்படவில்லை.", "Error" => "வழு", +"The app name is not specified." => "செயலி பெயர் குறிப்பிடப்படவில்லை.", +"The required file {file} is not installed!" => "தேவைப்பட்ட கோப்பு {கோப்பு} நிறுவப்படவில்லை!", "Error while sharing" => "பகிரும் போதான வழு", "Error while unsharing" => "பகிராமல் உள்ளப்போதான வழு", "Error while changing permissions" => "அனுமதிகள் மாறும்போதான வழு", diff --git a/core/l10n/th_TH.php b/core/l10n/th_TH.php index eb6e18c281d..e254ccf259f 100644 --- a/core/l10n/th_TH.php +++ b/core/l10n/th_TH.php @@ -1,15 +1,35 @@ <?php $TRANSLATIONS = array( -"Application name not provided." => "ยังไม่ได้ตั้งชื่อแอพพลิเคชั่น", +"Category type not provided." => "ยังไม่ได้ระบุชนิดของหมวดหมู่", "No category to add?" => "ไม่มีหมวดหมู่ที่ต้องการเพิ่ม?", "This category already exists: " => "หมวดหมู่นี้มีอยู่แล้ว: ", +"Object type not provided." => "ชนิดของวัตถุยังไม่ได้ถูกระบุ", +"%s ID not provided." => "ยังไม่ได้ระบุรหัส %s", +"Error adding %s to favorites." => "เกิดข้อผิดพลาดในการเพิ่ม %s เข้าไปยังรายการโปรด", +"No categories selected for deletion." => "ยังไม่ได้เลือกหมวดหมู่ที่ต้องการลบ", +"Error removing %s from favorites." => "เกิดข้อผิดพลาดในการลบ %s ออกจากรายการโปรด", "Settings" => "ตั้งค่า", +"seconds ago" => "วินาที ก่อนหน้านี้", +"1 minute ago" => "1 นาทีก่อนหน้านี้", +"{minutes} minutes ago" => "{minutes} นาทีก่อนหน้านี้", +"1 hour ago" => "1 ชั่วโมงก่อนหน้านี้", +"{hours} hours ago" => "{hours} ชั่วโมงก่อนหน้านี้", +"today" => "วันนี้", +"yesterday" => "เมื่อวานนี้", +"{days} days ago" => "{day} วันก่อนหน้านี้", +"last month" => "เดือนที่แล้ว", +"{months} months ago" => "{months} เดือนก่อนหน้านี้", +"months ago" => "เดือน ที่ผ่านมา", +"last year" => "ปีที่แล้ว", +"years ago" => "ปี ที่ผ่านมา", "Choose" => "เลือก", "Cancel" => "ยกเลิก", "No" => "ไม่ตกลง", "Yes" => "ตกลง", "Ok" => "ตกลง", -"No categories selected for deletion." => "ยังไม่ได้เลือกหมวดหมู่ที่ต้องการลบ", +"The object type is not specified." => "ชนิดของวัตถุยังไม่ได้รับการระบุ", "Error" => "พบข้อผิดพลาด", +"The app name is not specified." => "ชื่อของแอปยังไม่ได้รับการระบุชื่อ", +"The required file {file} is not installed!" => "ไฟล์ {file} ซึ่งเป็นไฟล์ที่จำเป็นต้องได้รับการติดตั้งไว้ก่อน ยังไม่ได้ถูกติดตั้ง", "Error while sharing" => "เกิดข้อผิดพลาดในระหว่างการแชร์ข้อมูล", "Error while unsharing" => "เกิดข้อผิดพลาดในการยกเลิกการแชร์ข้อมูล", "Error while changing permissions" => "เกิดข้อผิดพลาดในการเปลี่ยนสิทธิ์การเข้าใช้งาน", diff --git a/core/l10n/tr.php b/core/l10n/tr.php index faaef3d4fee..cb0df023993 100644 --- a/core/l10n/tr.php +++ b/core/l10n/tr.php @@ -1,15 +1,20 @@ <?php $TRANSLATIONS = array( -"Application name not provided." => "Uygulama adı verilmedi.", "No category to add?" => "Eklenecek kategori yok?", "This category already exists: " => "Bu kategori zaten mevcut: ", +"No categories selected for deletion." => "Silmek için bir kategori seçilmedi", "Settings" => "Ayarlar", +"Choose" => "seç", "Cancel" => "İptal", "No" => "Hayır", "Yes" => "Evet", "Ok" => "Tamam", -"No categories selected for deletion." => "Silmek için bir kategori seçilmedi", "Error" => "Hata", +"Error while sharing" => "Paylaşım sırasında hata ", +"Share with" => "ile Paylaş", +"Share with link" => "Bağlantı ile paylaş", +"Password protect" => "Şifre korunması", "Password" => "Parola", +"Set expiration date" => "Son kullanma tarihini ayarla", "Unshare" => "Paylaşılmayan", "create" => "oluştur", "ownCloud password reset" => "ownCloud parola sıfırlama", diff --git a/core/l10n/uk.php b/core/l10n/uk.php index 480fab2afc1..180d2a5c6bd 100644 --- a/core/l10n/uk.php +++ b/core/l10n/uk.php @@ -1,14 +1,75 @@ <?php $TRANSLATIONS = array( +"User %s shared a file with you" => "Користувач %s поділився файлом з вами", +"User %s shared a folder with you" => "Користувач %s поділився текою з вами", +"User %s shared the file \"%s\" with you. It is available for download here: %s" => "Користувач %s поділився файлом \"%s\" з вами. Він доступний для завантаження звідси: %s", +"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Користувач %s поділився текою \"%s\" з вами. Він доступний для завантаження звідси: %s", +"Category type not provided." => "Не вказано тип категорії.", +"No category to add?" => "Відсутні категорії для додавання?", +"This category already exists: " => "Ця категорія вже існує: ", +"Object type not provided." => "Не вказано тип об'єкту.", +"%s ID not provided." => "%s ID не вказано.", +"Error adding %s to favorites." => "Помилка при додаванні %s до обраного.", +"No categories selected for deletion." => "Жодної категорії не обрано для видалення.", +"Error removing %s from favorites." => "Помилка при видалені %s із обраного.", "Settings" => "Налаштування", +"seconds ago" => "секунди тому", +"1 minute ago" => "1 хвилину тому", +"{minutes} minutes ago" => "{minutes} хвилин тому", +"1 hour ago" => "1 годину тому", +"{hours} hours ago" => "{hours} години тому", +"today" => "сьогодні", +"yesterday" => "вчора", +"{days} days ago" => "{days} днів тому", +"last month" => "минулого місяця", +"{months} months ago" => "{months} місяців тому", +"months ago" => "місяці тому", +"last year" => "минулого року", +"years ago" => "роки тому", +"Choose" => "Обрати", "Cancel" => "Відмінити", "No" => "Ні", "Yes" => "Так", +"Ok" => "Ok", +"The object type is not specified." => "Не визначено тип об'єкту.", "Error" => "Помилка", +"The app name is not specified." => "Не визначено ім'я програми.", +"The required file {file} is not installed!" => "Необхідний файл {file} не встановлено!", +"Error while sharing" => "Помилка під час публікації", +"Error while unsharing" => "Помилка під час відміни публікації", +"Error while changing permissions" => "Помилка при зміні повноважень", +"Shared with you and the group {group} by {owner}" => " {owner} опублікував для Вас та для групи {group}", +"Shared with you by {owner}" => "{owner} опублікував для Вас", +"Share with" => "Опублікувати для", +"Share with link" => "Опублікувати через посилання", +"Password protect" => "Захистити паролем", "Password" => "Пароль", +"Email link to person" => "Ел. пошта належить Пану", +"Send" => "Надіслати", +"Set expiration date" => "Встановити термін дії", +"Expiration date" => "Термін дії", +"Share via email:" => "Опублікувати через Ел. пошту:", +"No people found" => "Жодної людини не знайдено", +"Resharing is not allowed" => "Пере-публікація не дозволяється", +"Shared in {item} with {user}" => "Опубліковано {item} для {user}", "Unshare" => "Заборонити доступ", +"can edit" => "може редагувати", +"access control" => "контроль доступу", "create" => "створити", -"You will receive a link to reset your password via Email." => "Ви отримаєте посилання для скидання вашого паролю на e-mail.", +"update" => "оновити", +"delete" => "видалити", +"share" => "опублікувати", +"Password protected" => "Захищено паролем", +"Error unsetting expiration date" => "Помилка при відміні терміна дії", +"Error setting expiration date" => "Помилка при встановленні терміна дії", +"Sending ..." => "Надсилання...", +"Email sent" => "Ел. пошта надіслана", +"ownCloud password reset" => "скидання пароля ownCloud", +"Use the following link to reset your password: {link}" => "Використовуйте наступне посилання для скидання пароля: {link}", +"You will receive a link to reset your password via Email." => "Ви отримаєте посилання для скидання вашого паролю на Ел. пошту.", +"Reset email send." => "Лист скидання відправлено.", +"Request failed!" => "Невдалий запит!", "Username" => "Ім'я користувача", +"Request reset" => "Запит скидання", "Your password was reset" => "Ваш пароль був скинутий", "To login page" => "До сторінки входу", "New password" => "Новий пароль", @@ -18,12 +79,24 @@ "Apps" => "Додатки", "Admin" => "Адміністратор", "Help" => "Допомога", +"Access forbidden" => "Доступ заборонено", +"Cloud not found" => "Cloud не знайдено", +"Edit categories" => "Редагувати категорії", "Add" => "Додати", +"Security Warning" => "Попередження про небезпеку", +"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Не доступний безпечний генератор випадкових чисел, будь ласка, активуйте PHP OpenSSL додаток.", +"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Без безпечного генератора випадкових чисел зловмисник може визначити токени скидання пароля і заволодіти Вашим обліковим записом.", +"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Ваш каталог з даними та Ваші файли можливо доступні з Інтернету. Файл .htaccess, наданий з ownCloud, не працює. Ми наполегливо рекомендуємо Вам налаштувати свій веб-сервер таким чином, щоб каталог data більше не був доступний, або перемістити каталог data за межі кореневого каталогу документів веб-сервера.", +"Create an <strong>admin account</strong>" => "Створити <strong>обліковий запис адміністратора</strong>", +"Advanced" => "Додатково", +"Data folder" => "Каталог даних", "Configure the database" => "Налаштування бази даних", "will be used" => "буде використано", "Database user" => "Користувач бази даних", "Database password" => "Пароль для бази даних", "Database name" => "Назва бази даних", +"Database tablespace" => "Таблиця бази даних", +"Database host" => "Хост бази даних", "Finish setup" => "Завершити налаштування", "Sunday" => "Неділя", "Monday" => "Понеділок", @@ -46,7 +119,16 @@ "December" => "Грудень", "web services under your control" => "веб-сервіс під вашим контролем", "Log out" => "Вихід", +"Automatic logon rejected!" => "Автоматичний вхід в систему відхилений!", +"If you did not change your password recently, your account may be compromised!" => "Якщо Ви не міняли пароль останнім часом, Ваш обліковий запис може бути скомпрометованим!", +"Please change your password to secure your account again." => "Будь ласка, змініть свій пароль, щоб знову захистити Ваш обліковий запис.", "Lost your password?" => "Забули пароль?", "remember" => "запам'ятати", -"Log in" => "Вхід" +"Log in" => "Вхід", +"You are logged out." => "Ви вийшли з системи.", +"prev" => "попередній", +"next" => "наступний", +"Security Warning!" => "Попередження про небезпеку!", +"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Будь ласка, повторно введіть свій пароль. <br/>З питань безпеки, Вам інколи доведеться повторно вводити свій пароль.", +"Verify" => "Підтвердити" ); diff --git a/core/l10n/vi.php b/core/l10n/vi.php index e9378294068..38e909d3f4e 100644 --- a/core/l10n/vi.php +++ b/core/l10n/vi.php @@ -1,43 +1,65 @@ <?php $TRANSLATIONS = array( -"Application name not provided." => "Tên ứng dụng không tồn tại", +"Category type not provided." => "Kiểu hạng mục không được cung cấp.", "No category to add?" => "Không có danh mục được thêm?", "This category already exists: " => "Danh mục này đã được tạo :", +"Object type not provided." => "Loại đối tượng không được cung cấp.", +"%s ID not provided." => "%s ID không được cung cấp.", +"Error adding %s to favorites." => "Lỗi thêm %s vào mục yêu thích.", +"No categories selected for deletion." => "Không có thể loại nào được chọn để xóa.", +"Error removing %s from favorites." => "Lỗi xóa %s từ mục yêu thích.", "Settings" => "Cài đặt", +"seconds ago" => "vài giây trước", +"1 minute ago" => "1 phút trước", +"{minutes} minutes ago" => "{minutes} phút trước", +"1 hour ago" => "1 giờ trước", +"{hours} hours ago" => "{hours} giờ trước", +"today" => "hôm nay", +"yesterday" => "hôm qua", +"{days} days ago" => "{days} ngày trước", +"last month" => "tháng trước", +"{months} months ago" => "{months} tháng trước", +"months ago" => "tháng trước", +"last year" => "năm trước", +"years ago" => "năm trước", "Choose" => "Chọn", "Cancel" => "Hủy", -"No" => "No", -"Yes" => "Yes", -"Ok" => "Ok", -"No categories selected for deletion." => "Không có thể loại nào được chọn để xóa.", +"No" => "Không", +"Yes" => "Có", +"Ok" => "Đồng ý", +"The object type is not specified." => "Loại đối tượng không được chỉ định.", "Error" => "Lỗi", +"The app name is not specified." => "Tên ứng dụng không được chỉ định.", +"The required file {file} is not installed!" => "Tập tin cần thiết {file} không được cài đặt!", "Error while sharing" => "Lỗi trong quá trình chia sẻ", "Error while unsharing" => "Lỗi trong quá trình gỡ chia sẻ", "Error while changing permissions" => "Lỗi trong quá trình phân quyền", "Shared with you and the group {group} by {owner}" => "Đã được chia sẽ với bạn và nhóm {group} bởi {owner}", -"Shared with you by {owner}" => "Đã được chia sẽ với bạn bởi {owner}", +"Shared with you by {owner}" => "Đã được chia sẽ bởi {owner}", "Share with" => "Chia sẻ với", -"Share with link" => "Chia sẻ với link", +"Share with link" => "Chia sẻ với liên kết", "Password protect" => "Mật khẩu bảo vệ", "Password" => "Mật khẩu", "Set expiration date" => "Đặt ngày kết thúc", "Expiration date" => "Ngày kết thúc", "Share via email:" => "Chia sẻ thông qua email", "No people found" => "Không tìm thấy người nào", -"Resharing is not allowed" => "Chia sẻ lại không được phép", +"Resharing is not allowed" => "Chia sẻ lại không được cho phép", "Shared in {item} with {user}" => "Đã được chia sẽ trong {item} với {user}", "Unshare" => "Gỡ bỏ chia sẻ", -"can edit" => "được chỉnh sửa", +"can edit" => "có thể chỉnh sửa", "access control" => "quản lý truy cập", "create" => "tạo", "update" => "cập nhật", "delete" => "xóa", "share" => "chia sẻ", "Password protected" => "Mật khẩu bảo vệ", -"Error unsetting expiration date" => "Lỗi trong quá trình gỡ bỏ ngày kết thúc", +"Error unsetting expiration date" => "Lỗi không thiết lập ngày kết thúc", "Error setting expiration date" => "Lỗi cấu hình ngày kết thúc", "ownCloud password reset" => "Khôi phục mật khẩu Owncloud ", "Use the following link to reset your password: {link}" => "Dùng đường dẫn sau để khôi phục lại mật khẩu : {link}", "You will receive a link to reset your password via Email." => "Vui lòng kiểm tra Email để khôi phục lại mật khẩu.", +"Reset email send." => "Thiết lập lại email gởi.", +"Request failed!" => "Yêu cầu của bạn không thành công !", "Username" => "Tên người dùng", "Request reset" => "Yêu cầu thiết lập lại ", "Your password was reset" => "Mật khẩu của bạn đã được khôi phục", @@ -49,20 +71,23 @@ "Apps" => "Ứng dụng", "Admin" => "Quản trị", "Help" => "Giúp đỡ", -"Access forbidden" => "Truy cập bị cấm ", +"Access forbidden" => "Truy cập bị cấm", "Cloud not found" => "Không tìm thấy Clound", "Edit categories" => "Sửa thể loại", "Add" => "Thêm", "Security Warning" => "Cảnh bảo bảo mật", -"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Thư mục dữ liệu và những tập tin của bạn có thể dễ dàng bị truy cập từ mạng. Tập tin .htaccess do ownCloud cung cấp không hoạt động. Chúng tôi đề nghị bạn nên cấu hình lại máy chủ webserver để thư mục dữ liệu không còn bị truy cập hoặc bạn nên di chuyển thư mục dữ liệu ra bên ngoài thư mục gốc của máy chủ.", +"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Không an toàn ! chức năng random number generator đã có sẵn ,vui lòng bật PHP OpenSSL extension.", +"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Nếu không có random number generator , Hacker có thể thiết lập lại mật khẩu và chiếm tài khoản của bạn.", +"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Thư mục dữ liệu và những tập tin của bạn có thể dễ dàng bị truy cập từ mạng. Tập tin .htaccess do ownCloud cung cấp không hoạt động. Chúng tôi đề nghị bạn nên cấu hình lại máy chủ web để thư mục dữ liệu không còn bị truy cập hoặc bạn nên di chuyển thư mục dữ liệu ra bên ngoài thư mục gốc của máy chủ.", "Create an <strong>admin account</strong>" => "Tạo một <strong>tài khoản quản trị</strong>", "Advanced" => "Nâng cao", "Data folder" => "Thư mục dữ liệu", -"Configure the database" => "Cấu hình Cơ Sở Dữ Liệu", +"Configure the database" => "Cấu hình cơ sở dữ liệu", "will be used" => "được sử dụng", "Database user" => "Người dùng cơ sở dữ liệu", "Database password" => "Mật khẩu cơ sở dữ liệu", "Database name" => "Tên cơ sở dữ liệu", +"Database tablespace" => "Cơ sở dữ liệu tablespace", "Database host" => "Database host", "Finish setup" => "Cài đặt hoàn tất", "Sunday" => "Chủ nhật", @@ -86,16 +111,16 @@ "December" => "Tháng 12", "web services under your control" => "các dịch vụ web dưới sự kiểm soát của bạn", "Log out" => "Đăng xuất", -"Automatic logon rejected!" => "Tự động đăng nhập đã bị từ chối!", +"Automatic logon rejected!" => "Tự động đăng nhập đã bị từ chối !", "If you did not change your password recently, your account may be compromised!" => "Nếu bạn không thay đổi mật khẩu gần đây của bạn, tài khoản của bạn có thể gặp nguy hiểm!", "Please change your password to secure your account again." => "Vui lòng thay đổi mật khẩu của bạn để đảm bảo tài khoản của bạn một lần nữa.", "Lost your password?" => "Bạn quên mật khẩu ?", -"remember" => "Nhớ", +"remember" => "ghi nhớ", "Log in" => "Đăng nhập", "You are logged out." => "Bạn đã đăng xuất.", "prev" => "Lùi lại", "next" => "Kế tiếp", -"Security Warning!" => "Cảnh báo bảo mật!", +"Security Warning!" => "Cảnh báo bảo mật !", "Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Vui lòng xác nhận mật khẩu của bạn. <br/> Vì lý do bảo mật thỉnh thoảng bạn có thể được yêu cầu nhập lại mật khẩu.", "Verify" => "Kiểm tra" ); diff --git a/core/l10n/zh_CN.GB2312.php b/core/l10n/zh_CN.GB2312.php index 0a2b72f8f4a..a785a36afcc 100644 --- a/core/l10n/zh_CN.GB2312.php +++ b/core/l10n/zh_CN.GB2312.php @@ -1,18 +1,29 @@ <?php $TRANSLATIONS = array( -"Application name not provided." => "应用程序并没有被提供.", "No category to add?" => "没有分类添加了?", "This category already exists: " => "这个分类已经存在了:", +"No categories selected for deletion." => "没有选者要删除的分类.", "Settings" => "设置", +"seconds ago" => "秒前", +"1 minute ago" => "1 分钟前", +"{minutes} minutes ago" => "{minutes} 分钟前", +"today" => "今天", +"yesterday" => "昨天", +"{days} days ago" => "{days} 天前", +"last month" => "上个月", +"months ago" => "月前", +"last year" => "去年", +"years ago" => "年前", "Choose" => "选择", "Cancel" => "取消", "No" => "否", "Yes" => "是", "Ok" => "好的", -"No categories selected for deletion." => "没有选者要删除的分类.", "Error" => "错误", "Error while sharing" => "分享出错", "Error while unsharing" => "取消分享出错", "Error while changing permissions" => "变更权限出错", +"Shared with you and the group {group} by {owner}" => "由 {owner} 与您和 {group} 群组分享", +"Shared with you by {owner}" => "由 {owner} 与您分享", "Share with" => "分享", "Share with link" => "分享链接", "Password protect" => "密码保护", @@ -22,6 +33,7 @@ "Share via email:" => "通过电子邮件分享：", "No people found" => "查无此人", "Resharing is not allowed" => "不允许重复分享", +"Shared in {item} with {user}" => "已经与 {user} 在 {item} 中分享", "Unshare" => "取消分享", "can edit" => "可编辑", "access control" => "访问控制", @@ -35,6 +47,8 @@ "ownCloud password reset" => "私有云密码重置", "Use the following link to reset your password: {link}" => "使用下面的链接来重置你的密码:{link}", "You will receive a link to reset your password via Email." => "你将会收到一个重置密码的链接", +"Reset email send." => "重置邮件已发送。", +"Request failed!" => "请求失败！", "Username" => "用户名", "Request reset" => "要求重置", "Your password was reset" => "你的密码已经被重置了", diff --git a/core/l10n/zh_CN.php b/core/l10n/zh_CN.php index 8bfa304482b..a83382904d3 100644 --- a/core/l10n/zh_CN.php +++ b/core/l10n/zh_CN.php @@ -1,15 +1,35 @@ <?php $TRANSLATIONS = array( -"Application name not provided." => "没有提供应用程序名称。", +"Category type not provided." => "未提供分类类型。", "No category to add?" => "没有可添加分类？", "This category already exists: " => "此分类已存在: ", +"Object type not provided." => "未提供对象类型。", +"%s ID not provided." => "%s ID未提供。", +"Error adding %s to favorites." => "向收藏夹中新增%s时出错。", +"No categories selected for deletion." => "没有选择要删除的类别", +"Error removing %s from favorites." => "从收藏夹中移除%s时出错。", "Settings" => "设置", +"seconds ago" => "秒前", +"1 minute ago" => "一分钟前", +"{minutes} minutes ago" => "{minutes} 分钟前", +"1 hour ago" => "1小时前", +"{hours} hours ago" => "{hours} 小时前", +"today" => "今天", +"yesterday" => "昨天", +"{days} days ago" => "{days} 天前", +"last month" => "上月", +"{months} months ago" => "{months} 月前", +"months ago" => "月前", +"last year" => "去年", +"years ago" => "年前", "Choose" => "选择(&C)...", "Cancel" => "取消", "No" => "否", "Yes" => "是", "Ok" => "好", -"No categories selected for deletion." => "没有选择要删除的类别", +"The object type is not specified." => "未指定对象类型。", "Error" => "错误", +"The app name is not specified." => "未指定App名称。", +"The required file {file} is not installed!" => "所需文件{file}未安装！", "Error while sharing" => "共享时出错", "Error while unsharing" => "取消共享时出错", "Error while changing permissions" => "修改权限时出错", @@ -38,6 +58,7 @@ "ownCloud password reset" => "重置 ownCloud 密码", "Use the following link to reset your password: {link}" => "使用以下链接重置您的密码：{link}", "You will receive a link to reset your password via Email." => "您将会收到包含可以重置密码链接的邮件。", +"Reset email send." => "重置邮件已发送。", "Request failed!" => "请求失败！", "Username" => "用户名", "Request reset" => "请求重置", diff --git a/core/l10n/zh_HK.php b/core/l10n/zh_HK.php new file mode 100644 index 00000000000..f55da4d3ef9 --- /dev/null +++ b/core/l10n/zh_HK.php @@ -0,0 +1,3 @@ +<?php $TRANSLATIONS = array( +"You are logged out." => "你已登出。" +); diff --git a/core/l10n/zh_TW.php b/core/l10n/zh_TW.php index 703389d1818..45c7596e609 100644 --- a/core/l10n/zh_TW.php +++ b/core/l10n/zh_TW.php @@ -1,20 +1,54 @@ <?php $TRANSLATIONS = array( -"Application name not provided." => "未提供應用程式名稱", "No category to add?" => "無分類添加?", "This category already exists: " => "此分類已經存在:", +"Object type not provided." => "不支援的物件類型", +"No categories selected for deletion." => "沒選擇要刪除的分類", "Settings" => "設定", +"seconds ago" => "幾秒前", +"1 minute ago" => "1 分鐘前", +"{minutes} minutes ago" => "{minutes} 分鐘前", +"1 hour ago" => "1 個小時前", +"{hours} hours ago" => "{hours} 個小時前", +"today" => "今天", +"yesterday" => "昨天", +"{days} days ago" => "{days} 天前", +"last month" => "上個月", +"{months} months ago" => "{months} 個月前", +"months ago" => "幾個月前", +"last year" => "去年", +"years ago" => "幾年前", +"Choose" => "選擇", "Cancel" => "取消", "No" => "No", "Yes" => "Yes", "Ok" => "Ok", -"No categories selected for deletion." => "沒選擇要刪除的分類", "Error" => "錯誤", +"The app name is not specified." => "沒有詳述APP名稱.", +"Error while sharing" => "分享時發生錯誤", +"Error while unsharing" => "取消分享時發生錯誤", +"Shared with you by {owner}" => "{owner} 已經和您分享", +"Share with" => "與分享", +"Share with link" => "使用連結分享", +"Password protect" => "密碼保護", "Password" => "密碼", +"Set expiration date" => "設置到期日", +"Expiration date" => "到期日", +"Share via email:" => "透過email分享:", +"Shared in {item} with {user}" => "已和 {user} 分享 {item}", "Unshare" => "取消共享", +"can edit" => "可編輯", +"access control" => "存取控制", "create" => "建立", +"update" => "更新", +"delete" => "刪除", +"share" => "分享", +"Password protected" => "密碼保護", +"Error setting expiration date" => "錯誤的到期日設定", "ownCloud password reset" => "ownCloud 密碼重設", "Use the following link to reset your password: {link}" => "請循以下聯結重設你的密碼: （聯結） ", "You will receive a link to reset your password via Email." => "重設密碼的連結將會寄到你的電子郵件信箱", +"Reset email send." => "重設郵件已送出.", +"Request failed!" => "請求失敗!", "Username" => "使用者名稱", "Request reset" => "要求重設", "Your password was reset" => "你的密碼已重設", @@ -31,6 +65,7 @@ "Edit categories" => "編輯分類", "Add" => "添加", "Security Warning" => "安全性警告", +"No secure random number generator is available, please enable the PHP OpenSSL extension." => "沒有可用的隨機數字產生器, 請啟用 PHP 中 OpenSSL 擴充功能.", "Create an <strong>admin account</strong>" => "建立一個<strong>管理者帳號</strong>", "Advanced" => "進階", "Data folder" => "資料夾", @@ -68,5 +103,7 @@ "Log in" => "登入", "You are logged out." => "你已登出", "prev" => "上一頁", -"next" => "下一頁" +"next" => "下一頁", +"Security Warning!" => "安全性警告!", +"Verify" => "驗證" ); diff --git a/core/routes.php b/core/routes.php index cc0aa53a21e..fc511d403d8 100644 --- a/core/routes.php +++ b/core/routes.php @@ -13,9 +13,6 @@ $this->create('search_ajax_search', '/search/ajax/search.php') // AppConfig $this->create('core_ajax_appconfig', '/core/ajax/appconfig.php') ->actionInclude('core/ajax/appconfig.php'); -// RequestToken -$this->create('core_ajax_requesttoken', '/core/ajax/requesttoken.php') - ->actionInclude('core/ajax/requesttoken.php'); // Share $this->create('core_ajax_share', '/core/ajax/share.php') ->actionInclude('core/ajax/share.php'); @@ -27,6 +24,12 @@ $this->create('core_ajax_vcategories_add', '/core/ajax/vcategories/add.php') ->actionInclude('core/ajax/vcategories/add.php'); $this->create('core_ajax_vcategories_delete', '/core/ajax/vcategories/delete.php') ->actionInclude('core/ajax/vcategories/delete.php'); +$this->create('core_ajax_vcategories_addtofavorites', '/core/ajax/vcategories/addToFavorites.php') + ->actionInclude('core/ajax/vcategories/addToFavorites.php'); +$this->create('core_ajax_vcategories_removefromfavorites', '/core/ajax/vcategories/removeFromFavorites.php') + ->actionInclude('core/ajax/vcategories/removeFromFavorites.php'); +$this->create('core_ajax_vcategories_favorites', '/core/ajax/vcategories/favorites.php') + ->actionInclude('core/ajax/vcategories/favorites.php'); $this->create('core_ajax_vcategories_edit', '/core/ajax/vcategories/edit.php') ->actionInclude('core/ajax/vcategories/edit.php'); // Routing diff --git a/core/setup.php b/core/setup.php new file mode 100644 index 00000000000..66b8cf378bd --- /dev/null +++ b/core/setup.php @@ -0,0 +1,52 @@ +<?php + +// Check for autosetup: +$autosetup_file = OC::$SERVERROOT."/config/autoconfig.php"; +if( file_exists( $autosetup_file )) { + OC_Log::write('core', 'Autoconfig file found, setting up owncloud...', OC_Log::INFO); + include $autosetup_file; + $_POST['install'] = 'true'; + $_POST = array_merge ($_POST, $AUTOCONFIG); + unlink($autosetup_file); +} + +OC_Util::addScript('setup'); + +$hasSQLite = class_exists('SQLite3'); +$hasMySQL = is_callable('mysql_connect'); +$hasPostgreSQL = is_callable('pg_connect'); +$hasOracle = is_callable('oci_connect'); +$datadir = OC_Config::getValue('datadirectory', OC::$SERVERROOT.'/data'); + +// Protect data directory here, so we can test if the protection is working +OC_Setup::protectDataDirectory(); + +$opts = array( + 'hasSQLite' => $hasSQLite, + 'hasMySQL' => $hasMySQL, + 'hasPostgreSQL' => $hasPostgreSQL, + 'hasOracle' => $hasOracle, + 'directory' => $datadir, + 'secureRNG' => OC_Util::secureRNG_available(), + 'htaccessWorking' => OC_Util::ishtaccessworking(), + 'errors' => array(), +); + +if(isset($_POST['install']) AND $_POST['install']=='true') { + // We have to launch the installation process : + $e = OC_Setup::install($_POST); + $errors = array('errors' => $e); + + if(count($e) > 0) { + //OC_Template::printGuestPage("", "error", array("errors" => $errors)); + $options = array_merge($_POST, $opts, $errors); + OC_Template::printGuestPage("", "installation", $options); + } + else { + header("Location: ".OC::$WEBROOT.'/'); + exit(); + } +} +else { + OC_Template::printGuestPage("", "installation", $opts); +} diff --git a/core/templates/edit_categories_dialog.php b/core/templates/edit_categories_dialog.php index 8997fa586bd..d0b7b5ee62a 100644 --- a/core/templates/edit_categories_dialog.php +++ b/core/templates/edit_categories_dialog.php @@ -6,11 +6,14 @@ $categories = isset($_['categories'])?$_['categories']:array(); <form method="post" id="categoryform"> <div class="scrollarea"> <ul id="categorylist"> - <?php foreach($categories as $category) { ?> + <?php foreach($categories as $category): ?> <li><input type="checkbox" name="categories[]" value="<?php echo $category; ?>" /><?php echo $category; ?></li> - <?php } ?> + <?php endforeach; ?> </ul> </div> - <div class="bottombuttons"><input type="text" id="category_addinput" name="category" /><button id="category_addbutton" disabled="disabled"><?php echo $l->t('Add'); ?></button></div> + <div class="bottombuttons"> + <input type="text" id="category_addinput" name="category" /> + <button id="category_addbutton" disabled="disabled"><?php echo $l->t('Add'); ?></button> + </div> </form> </div> diff --git a/core/templates/installation.php b/core/templates/installation.php index 5a3bd2cc9f0..28fbf29b540 100644 --- a/core/templates/installation.php +++ b/core/templates/installation.php @@ -19,7 +19,7 @@ </ul> <?php endif; ?> <?php if(!$_['secureRNG']): ?> - <fieldset style="color: #B94A48; background-color: #F2DEDE; border-color: #EED3D7;"> + <fieldset class="warning"> <legend><strong><?php echo $l->t('Security Warning');?></strong></legend> <span><?php echo $l->t('No secure random number generator is available, please enable the PHP OpenSSL extension.');?></span> <br/> @@ -27,27 +27,29 @@ </fieldset> <?php endif; ?> <?php if(!$_['htaccessWorking']): ?> - <fieldset style="color: #B94A48; background-color: #F2DEDE; border-color: #EED3D7;"> + <fieldset class="warning"> <legend><strong><?php echo $l->t('Security Warning');?></strong></legend> <span><?php echo $l->t('Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root.');?></span> </fieldset> <?php endif; ?> - <fieldset> + <fieldset id="adminaccount"> <legend><?php echo $l->t( 'Create an <strong>admin account</strong>' ); ?></legend> - <p class="infield"> - <label for="adminlogin" class="infield"><?php echo $l->t( 'Username' ); ?></label> + <p class="infield grouptop"> <input type="text" name="adminlogin" id="adminlogin" value="<?php print OC_Helper::init_var('adminlogin'); ?>" autocomplete="off" autofocus required /> + <label for="adminlogin" class="infield"><?php echo $l->t( 'Username' ); ?></label> + <img class="svg" src="<?php echo image_path('', 'actions/user.svg'); ?>" alt="" /> </p> - <p class="infield"> - <label for="adminpass" class="infield"><?php echo $l->t( 'Password' ); ?></label> + <p class="infield groupbottom"> <input type="password" name="adminpass" id="adminpass" value="<?php print OC_Helper::init_var('adminpass'); ?>" required /> + <label for="adminpass" class="infield"><?php echo $l->t( 'Password' ); ?></label> + <img class="svg" src="<?php echo image_path('', 'actions/password.svg'); ?>" alt="" /> </p> </fieldset> <fieldset id="datadirField"> <legend><a id="showAdvanced"><?php echo $l->t( 'Advanced' ); ?> ▾</a></legend> <div id="datadirContent"> - <label for="directory"><?php echo $l->t( 'Data folder' ); ?>:</label><br/> + <label for="directory"><?php echo $l->t( 'Data folder' ); ?></label> <input type="text" name="directory" id="directory" value="<?php print OC_Helper::init_var('directory', $_['directory']); ?>" /> </div> </fieldset> @@ -73,7 +75,7 @@ <p>MySQL <?php echo $l->t( 'will be used' ); ?>.</p> <input type="hidden" id="dbtype" name="dbtype" value="mysql" /> <?php else: ?> - <input type="radio" name="dbtype" value="mysql" id="mysql" <?php OC_Helper::init_radio('dbtype','mysql', 'sqlite'); ?>/> + <input type="radio" name="dbtype" value="mysql" id="mysql" <?php OC_Helper::init_radio('dbtype', 'mysql', 'sqlite'); ?>/> <label class="mysql" for="mysql">MySQL</label> <?php endif; ?> <?php endif; ?> @@ -84,7 +86,7 @@ <input type="hidden" id="dbtype" name="dbtype" value="pgsql" /> <?php else: ?> <label class="pgsql" for="pgsql">PostgreSQL</label> - <input type="radio" name="dbtype" value='pgsql' id="pgsql" <?php OC_Helper::init_radio('dbtype','pgsql', 'sqlite'); ?>/> + <input type="radio" name="dbtype" value='pgsql' id="pgsql" <?php OC_Helper::init_radio('dbtype', 'pgsql', 'sqlite'); ?>/> <?php endif; ?> <?php endif; ?> @@ -94,22 +96,22 @@ <input type="hidden" id="dbtype" name="dbtype" value="oci" /> <?php else: ?> <label class="oci" for="oci">Oracle</label> - <input type="radio" name="dbtype" value='oci' id="oci" <?php OC_Helper::init_radio('dbtype','oci', 'sqlite'); ?>/> + <input type="radio" name="dbtype" value='oci' id="oci" <?php OC_Helper::init_radio('dbtype', 'oci', 'sqlite'); ?>/> <?php endif; ?> <?php endif; ?> </div> <?php if($hasOtherDB): ?> <div id="use_other_db"> - <p class="infield"> + <p class="infield grouptop"> <label for="dbuser" class="infield"><?php echo $l->t( 'Database user' ); ?></label> <input type="text" name="dbuser" id="dbuser" value="<?php print OC_Helper::init_var('dbuser'); ?>" autocomplete="off" /> </p> - <p class="infield"> + <p class="infield groupmiddle"> <label for="dbpass" class="infield"><?php echo $l->t( 'Database password' ); ?></label> <input type="password" name="dbpass" id="dbpass" value="<?php print OC_Helper::init_var('dbpass'); ?>" /> </p> - <p class="infield"> + <p class="infield groupmiddle"> <label for="dbname" class="infield"><?php echo $l->t( 'Database name' ); ?></label> <input type="text" name="dbname" id="dbname" value="<?php print OC_Helper::init_var('dbname'); ?>" autocomplete="off" pattern="[0-9a-zA-Z$_]+" /> </p> @@ -117,17 +119,17 @@ <?php endif; ?> <?php if($_['hasOracle']): ?> <div id="use_oracle_db"> - <p class="infield"> + <p class="infield groupmiddle"> <label for="dbtablespace" class="infield"><?php echo $l->t( 'Database tablespace' ); ?></label> <input type="text" name="dbtablespace" id="dbtablespace" value="<?php print OC_Helper::init_var('dbtablespace'); ?>" autocomplete="off" /> </p> </div> <?php endif; ?> - <p class="infield"> - <label for="dbhost" class="infield"><?php echo $l->t( 'Database host' ); ?></label> + <p class="infield groupbottom"> + <label for="dbhost" class="infield" id="dbhostlabel"><?php echo $l->t( 'Database host' ); ?></label> <input type="text" name="dbhost" id="dbhost" value="<?php print OC_Helper::init_var('dbhost', 'localhost'); ?>" /> </p> </fieldset> - <div class="buttons"><input type="submit" value="<?php echo $l->t( 'Finish setup' ); ?>" /></div> + <div class="buttons"><input type="submit" class="primary" value="<?php echo $l->t( 'Finish setup' ); ?>" /></div> </form> diff --git a/core/templates/layout.base.php b/core/templates/layout.base.php index f78b6ff8bbd..47f4b423b3e 100644 --- a/core/templates/layout.base.php +++ b/core/templates/layout.base.php @@ -8,10 +8,10 @@ <link rel="stylesheet" href="<?php echo $cssfile; ?>" type="text/css" media="screen" /> <?php endforeach; ?> <script type="text/javascript"> + var oc_debug = <?php echo (defined('DEBUG') && DEBUG) ? 'true' : 'false'; ?>; var oc_webroot = '<?php echo OC::$WEBROOT; ?>'; var oc_appswebroots = <?php echo $_['apps_paths'] ?>; var oc_requesttoken = '<?php echo $_['requesttoken']; ?>'; - var oc_requestlifespan = '<?php echo $_['requestlifespan']; ?>'; </script> <?php foreach ($_['jsfiles'] as $jsfile): ?> <script type="text/javascript" src="<?php echo $jsfile; ?>"></script> diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php index e6468cdcfb4..8395426e4e4 100644 --- a/core/templates/layout.guest.php +++ b/core/templates/layout.guest.php @@ -8,10 +8,10 @@ <link rel="stylesheet" href="<?php echo $cssfile; ?>" type="text/css" media="screen" /> <?php endforeach; ?> <script type="text/javascript"> + var oc_debug = <?php echo (defined('DEBUG') && DEBUG) ? 'true' : 'false'; ?>; var oc_webroot = '<?php echo OC::$WEBROOT; ?>'; var oc_appswebroots = <?php echo $_['apps_paths'] ?>; var oc_requesttoken = '<?php echo $_['requesttoken']; ?>'; - var oc_requestlifespan = '<?php echo $_['requestlifespan']; ?>'; var datepickerFormatDate = <?php echo json_encode($l->l('jsdate', 'jsdate')) ?>; var dayNames = <?php echo json_encode(array((string)$l->t('Sunday'), (string)$l->t('Monday'), (string)$l->t('Tuesday'), (string)$l->t('Wednesday'), (string)$l->t('Thursday'), (string)$l->t('Friday'), (string)$l->t('Saturday'))) ?>; var monthNames = <?php echo json_encode(array((string)$l->t('January'), (string)$l->t('February'), (string)$l->t('March'), (string)$l->t('April'), (string)$l->t('May'), (string)$l->t('June'), (string)$l->t('July'), (string)$l->t('August'), (string)$l->t('September'), (string)$l->t('October'), (string)$l->t('November'), (string)$l->t('December'))) ?>; @@ -35,7 +35,7 @@ <body id="body-login"> <div id="login"> <header><div id="header"> - <img src="<?php echo image_path('', 'logo.png'); ?>" alt="ownCloud" /> + <img src="<?php echo image_path('', 'logo.svg'); ?>" class="svg" alt="ownCloud" /> </div></header> <?php echo $_['content']; ?> </div> diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index ddc97d34cc7..8cb49aaf3db 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -8,11 +8,11 @@ <link rel="stylesheet" href="<?php echo $cssfile; ?>" type="text/css" media="screen" /> <?php endforeach; ?> <script type="text/javascript"> + var oc_debug = <?php echo (defined('DEBUG') && DEBUG) ? 'true' : 'false'; ?>; var oc_webroot = '<?php echo OC::$WEBROOT; ?>'; var oc_appswebroots = <?php echo $_['apps_paths'] ?>; var oc_current_user = '<?php echo OC_User::getUser() ?>'; var oc_requesttoken = '<?php echo $_['requesttoken']; ?>'; - var oc_requestlifespan = '<?php echo $_['requestlifespan']; ?>'; var datepickerFormatDate = <?php echo json_encode($l->l('jsdate', 'jsdate')) ?>; var dayNames = <?php echo json_encode(array((string)$l->t('Sunday'), (string)$l->t('Monday'), (string)$l->t('Tuesday'), (string)$l->t('Wednesday'), (string)$l->t('Thursday'), (string)$l->t('Friday'), (string)$l->t('Saturday'))) ?>; var monthNames = <?php echo json_encode(array((string)$l->t('January'), (string)$l->t('February'), (string)$l->t('March'), (string)$l->t('April'), (string)$l->t('May'), (string)$l->t('June'), (string)$l->t('July'), (string)$l->t('August'), (string)$l->t('September'), (string)$l->t('October'), (string)$l->t('November'), (string)$l->t('December'))) ?>; @@ -21,6 +21,13 @@ <?php foreach($_['jsfiles'] as $jsfile): ?> <script type="text/javascript" src="<?php echo $jsfile; ?>"></script> <?php endforeach; ?> + <script type="text/javascript"> + requesttoken = '<?php echo $_['requesttoken']; ?>'; + OC.EventSource.requesttoken=requesttoken; + $(document).bind('ajaxSend', function(elm, xhr, s) { + xhr.setRequestHeader('requesttoken', requesttoken); + }); + </script> <?php foreach($_['headers'] as $header): ?> <?php echo '<'.$header['tag'].' '; diff --git a/core/templates/login.php b/core/templates/login.php index 0768b664c6f..153d1b50a30 100644 --- a/core/templates/login.php +++ b/core/templates/login.php @@ -1,7 +1,7 @@ <!--[if IE 8]><style>input[type="checkbox"]{padding:0;}</style><![endif]--> <form method="post"> <fieldset> - <?php if(!empty($_['redirect'])) { echo '<input type="hidden" name="redirect_url" value="'.$_['redirect'].'" />'; } ?> + <?php if(!empty($_['redirect_url'])) { echo '<input type="hidden" name="redirect_url" value="'.$_['redirect_url'].'" />'; } ?> <ul> <?php if(isset($_['invalidcookie']) && ($_['invalidcookie'])): ?> <li class="errors"> @@ -11,20 +11,22 @@ </li> <?php endif; ?> <?php if(isset($_['invalidpassword']) && ($_['invalidpassword'])): ?> - <a href="./core/lostpassword/"><li class="errors"> + <a href="<?php echo OC_Helper::linkToRoute('core_lostpassword_index') ?>"><li class="errors"> <?php echo $l->t('Lost your password?'); ?> </li></a> <?php endif; ?> </ul> - <p class="infield"> - <label for="user" class="infield"><?php echo $l->t( 'Username' ); ?></label> + <p class="infield grouptop"> <input type="text" name="user" id="user" value="<?php echo $_['username']; ?>"<?php echo $_['user_autofocus']?' autofocus':''; ?> autocomplete="on" required /> + <label for="user" class="infield"><?php echo $l->t( 'Username' ); ?></label> + <img class="svg" src="<?php echo image_path('', 'actions/user.svg'); ?>" alt="" /> </p> - <p class="infield"> - <label for="password" class="infield"><?php echo $l->t( 'Password' ); ?></label> + <p class="infield groupbottom"> <input type="password" name="password" id="password" value="" required<?php echo $_['user_autofocus']?'':' autofocus'; ?> /> + <label for="password" class="infield"><?php echo $l->t( 'Password' ); ?></label> + <img class="svg" src="<?php echo image_path('', 'actions/password.svg'); ?>" alt="" /> </p> <input type="checkbox" name="remember_login" value="1" id="remember_login" /><label for="remember_login"><?php echo $l->t('remember'); ?></label> - <input type="submit" id="submit" class="login" value="<?php echo $l->t( 'Log in' ); ?>" /> + <input type="submit" id="submit" class="login primary" value="<?php echo $l->t( 'Log in' ); ?>" /> </fieldset> </form> diff --git a/core/templates/logout.php b/core/templates/logout.php index 8cbbdd9cc8d..2247ed8e70f 100644 --- a/core/templates/logout.php +++ b/core/templates/logout.php @@ -1 +1 @@ -<?php echo $l->t( 'You are logged out.' ); ?>
\ No newline at end of file +<?php echo $l->t( 'You are logged out.' ); |
