diff options
Diffstat (limited to 'core')
88 files changed, 636 insertions, 270 deletions
diff --git a/core/ajax/share.php b/core/ajax/share.php index 648f0a71bd4..1166ea3198a 100644 --- a/core/ajax/share.php +++ b/core/ajax/share.php @@ -23,6 +23,8 @@ OC_JSON::checkLoggedIn(); OCP\JSON::callCheck(); OC_App::loadApps(); +$defaults = new \OCP\Defaults(); + if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSource'])) { switch ($_POST['action']) { case 'share': @@ -33,7 +35,7 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo if ($shareType === OCP\Share::SHARE_TYPE_LINK && $shareWith == '') { $shareWith = null; } - + $token = OCP\Share::shareItem( $_POST['itemType'], $_POST['itemSource'], @@ -41,7 +43,7 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo $shareWith, $_POST['permissions'] ); - + if (is_string($token)) { OC_JSON::success(array('data' => array('token' => $token))); } else { @@ -81,6 +83,104 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo ($return) ? OC_JSON::success() : OC_JSON::error(); } break; + case 'informRecipients': + + $l = OC_L10N::get('core'); + + $shareType = (int) $_POST['shareType']; + $itemType = $_POST['itemType']; + $itemSource = $_POST['itemSource']; + $recipient = $_POST['recipient']; + $ownerDisplayName = \OCP\User::getDisplayName(); + $from = \OCP\Util::getDefaultEmailAddress('sharing-noreply'); + + $noMail = array(); + $recipientList = array(); + + if($shareType === \OCP\Share::SHARE_TYPE_USER) { + $recipientList[] = $recipient; + } elseif ($shareType === \OCP\Share::SHARE_TYPE_GROUP) { + $recipientList = \OC_Group::usersInGroup($recipient); + } + + // don't send a mail to the user who shared the file + $recipientList = array_diff($recipientList, array(\OCP\User::getUser())); + + // send mail to all recipients with an email address + foreach ($recipientList as $recipient) { + //get correct target folder name + $email = OC_Preferences::getValue($recipient, 'settings', 'email', ''); + + if ($email !== '') { + $displayName = \OCP\User::getDisplayName($recipient); + $items = \OCP\Share::getItemSharedWithUser($itemType, $itemSource, $recipient); + $filename = trim($items[0]['file_target'], '/'); + $subject = (string)$l->t('%s shared »%s« with you', array($ownerDisplayName, $filename)); + $expiration = null; + if (isset($items[0]['expiration'])) { + $date = new DateTime($items[0]['expiration']); + $expiration = $date->format('Y-m-d'); + } + + if ($itemType === 'folder') { + $foldername = "/Shared/" . $filename; + } else { + // if it is a file we can just link to the Shared folder, + // that's the place where the user will find the file + $foldername = "/Shared"; + } + + $link = \OCP\Util::linkToAbsolute('files', 'index.php', array("dir" => $foldername)); + + $content = new OC_Template("core", "mail", ""); + $content->assign('link', $link); + $content->assign('user_displayname', $ownerDisplayName); + $content->assign('filename', $filename); + $content->assign('expiration', $expiration); + $text = $content->fetchPage(); + + $content = new OC_Template("core", "altmail", ""); + $content->assign('link', $link); + $content->assign('user_displayname', $ownerDisplayName); + $content->assign('filename', $filename); + $content->assign('expiration', $expiration); + $alttext = $content->fetchPage(); + + $default_from = OCP\Util::getDefaultEmailAddress('sharing-noreply'); + $from = OCP\Config::getUserValue(\OCP\User::getUser(), 'settings', 'email', $default_from); + + // send it out now + try { + OCP\Util::sendMail($email, $displayName, $subject, $text, $from, $ownerDisplayName, 1, $alttext); + } catch (Exception $exception) { + $noMail[] = \OCP\User::getDisplayName($recipient); + } + } + } + + \OCP\Share::setSendMailStatus($itemType, $itemSource, $shareType, true); + + if (empty($noMail)) { + OCP\JSON::success(); + } else { + OCP\JSON::error(array( + 'data' => array( + 'message' => $l->t("Couldn't send mail to following users: %s ", + implode(', ', $noMail) + ) + ) + )); + } + break; + case 'informRecipientsDisabled': + $itemSource = $_POST['itemSource']; + $shareType = $_POST['shareType']; + $itemType = $_POST['itemType']; + $recipient = $_POST['recipient']; + \OCP\Share::setSendMailStatus($itemType, $itemSource, $shareType, false); + OCP\JSON::success(); + break; + case 'email': // read post variables $user = OCP\USER::getUser(); @@ -213,10 +313,10 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo } } $count = 0; - + // enable l10n support $l = OC_L10N::get('core'); - + foreach ($groups as $group) { if ($count < 15) { if (!isset($_GET['itemShares']) diff --git a/core/css/apps.css b/core/css/apps.css index f6c20e6cc6a..49fb189f384 100644 --- a/core/css/apps.css +++ b/core/css/apps.css @@ -27,13 +27,11 @@ position: relative; width: 100%; -moz-box-sizing: border-box; box-sizing: border-box; - text-shadow: 0 1px 0 rgba(255,255,255,.9); } #app-navigation .active, #app-navigation .active a, #app-navigation li:hover > a { background-color: #ddd; - text-shadow: 0 1px 0 rgba(255,255,255,.7); } /* special rules for first-level entries and folders */ @@ -119,7 +117,7 @@ } #app-navigation > ul .open:hover { - -moz-box-shadow: inset 0 0 3px #ccc; -webkit-box-shadow: inset 0 0 3px #ccc; box-shadow: inset 0 0 3px #ccc; + box-shadow: inset 0 0 3px #ccc; } #app-navigation > ul .open ul { @@ -203,9 +201,14 @@ border: 0; border-radius: 0; } -.settings-button:hover { +.settings-button:hover, +.settings-button:focus { background-color: #ddd; } +.settings-button.opened:hover, +.settings-button.opened:focus { + background-color: transparent; +} /* icons */ .folder-icon, .delete-icon, .edit-icon, .progress-icon { diff --git a/core/css/share.css b/core/css/share.css index 2d6849b4bb1..2a21dc6edf6 100644 --- a/core/css/share.css +++ b/core/css/share.css @@ -2,95 +2,97 @@ This file is licensed under the Affero General Public License version 3 or later. See the COPYING-README file. */ - #dropdown { - background:#eee; - border-bottom-left-radius:1em; - border-bottom-right-radius:1em; - box-shadow:0 1px 1px #777; - display:block; - margin-right:7em; - position:absolute; - right:0; - width:19em; - z-index:500; - padding:1em; - } - - #shareWithList { - list-style-type:none; - padding:.5em; - } - - #shareWithList li { - padding-top:.1em; - } - - #shareWithList li:first-child { - white-space:normal; - } - - #shareWithList .cruds { - margin-left:-10px; - } +#dropdown { + background:#eee; + border-bottom-left-radius: 5px; + border-bottom-right-radius: 5px; + box-shadow:0 1px 1px #777; + display:block; + margin-right:7em; + position:absolute; + right:0; + width:25em; + z-index:500; + padding:1em; +} + +#shareWithList { + list-style-type:none; + padding:.5em; +} + +#shareWithList li { + padding-top:.1em; +} + +#shareWithList li:first-child { + white-space:normal; +} + +#shareWithList .cruds { + margin-left:-10px; +} #shareWithList .unshare img, #shareWithList .showCruds img { vertical-align:text-bottom; /* properly align icons */ } - #dropdown label { - font-weight:400; - } +#dropdown label { + font-weight:400; +} - #dropdown input[type="checkbox"] { - margin:0 .2em 0 .5em; - } +#dropdown input[type="checkbox"] { + margin:0 .2em 0 .5em; +} - a.showCruds { - display:inline; - opacity:.5; - } +a.showCruds { + display:inline; + opacity:.5; +} - a.unshare { - display:inline; - float:right; - opacity:.5; - padding:.3em 0 0 .3em !important; +a.unshare { + display:inline; + float:right; + opacity:.5; + padding:.3em 0 0 .3em !important; margin-top:-5px; - } +} - #link { - border-top:1px solid #ddd; - padding-top:.5em; - } +#link { + border-top:1px solid #ddd; + padding-top:.5em; +} #dropdown input[type="text"],#dropdown input[type="password"] { - width:90%; + width:90%; } #dropdown form { - font-size: 100%; - margin-left: 0; - margin-right: 0; + font-size: 100%; + margin-left: 0; + margin-right: 0; } #linkText,#linkPass,#expiration { - display:none; - } + display:none; +} - #link #showPassword img { - padding-left:.3em; - width:12px; - } +#link #showPassword img { + padding-left:.3em; + width:12px; +} - .reshare,#link label,#expiration label { - padding-left:.5em; - } +.reshare,#link label,#expiration label { + padding-left:.5em; +} - a.showCruds:hover,a.unshare:hover { - opacity:1; - } +a.showCruds:hover,a.unshare:hover { + opacity:1; +} -.reshare { white-space:normal; } /* fix shared by text going out of box */ +.reshare { /* fix shared by text going out of box */ + white-space:normal; +} .ui-autocomplete { /* limit dropdown height to 4 1/2 entries */ max-height:103px; diff --git a/core/css/styles.css b/core/css/styles.css index dcdeda8a9c9..6406bcd7e63 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -19,9 +19,6 @@ body { background:#fefefe; font:normal .8em/1.6em "Helvetica Neue",Helvetica,Ari #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 url('../img/noise.png') repeat; - -moz-box-shadow:0 0 10px rgba(0, 0, 0, .5); - -webkit-box-shadow:0 0 10px rgba(0, 0, 0, .5); - box-shadow:0 0 10px rgba(0, 0, 0, .5); } #body-login { @@ -41,11 +38,14 @@ body { background:#fefefe; font:normal .8em/1.6em "Helvetica Neue",Helvetica,Ari .header-right > * { vertical-align:middle; } #header .avatardiv { - text-shadow: none; float: left; display: inline-block; } +#header .avatardiv img { + opacity: 1; +} + /* INPUTS */ input[type="text"], input[type="password"], input[type="search"], input[type="number"], input[type="email"], input[type="url"], textarea, select, @@ -54,8 +54,7 @@ button, .button, width:10em; margin:.3em; padding:.6em .5em .4em; font-size:1em; 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; + border-radius: 3px; } input[type="hidden"] { height:0; width:0; } input[type="text"], input[type="password"], input[type="search"], input[type="number"], input[type="email"], input[type="url"], textarea { @@ -78,7 +77,10 @@ textarea:hover, textarea:focus, textarea:active { } 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; } +#quota { + cursor: default; + margin: 30px; +} /* SCROLLING */ @@ -91,10 +93,14 @@ input[type="checkbox"]:hover+label, input[type="checkbox"]:focus+label { color:# input[type="submit"], input[type="button"], button, .button, #quota, select, .pager li a { - width:auto; padding:.4em; - background-color:rgba(240,240,240,.9); font-weight:bold; color:#555; text-shadow:rgba(255,255,255,.9) 0 1px 0; border:1px solid rgba(190,190,190,.9); cursor:pointer; - -moz-box-shadow:0 1px 1px rgba(255,255,255,.9), 0 1px 1px rgba(255,255,255,.9) inset; -webkit-box-shadow:0 1px 1px rgba(255,255,255,.9), 0 1px 1px rgba(255,255,255,.9) inset; box-shadow:0 1px 1px rgba(255,255,255,.9), 0 1px 1px rgba(255,255,255,.9) inset; - -moz-border-radius:.5em; -webkit-border-radius:.5em; border-radius:.5em; + width: auto; + padding: .4em; + background-color: rgba(240,240,240,.9); + font-weight: bold; + color: #555; + border: 1px solid rgba(190,190,190,.9); + cursor: pointer; + border-radius: 3px; } input[type="submit"]:hover, input[type="submit"]:focus, input[type="button"]:hover, input[type="button"]:focus, @@ -105,14 +111,17 @@ select:hover, select:focus, select:active { color:#333; } input[type="submit"] img, input[type="button"] img, button img, .button img { cursor:pointer; } -#header .button { border:none; -moz-box-shadow:none; -webkit-box-shadow:none; box-shadow:none; } +#header .button { + border: none; + box-shadow: none; +} /* disabled input fields and buttons */ input:disabled, input:disabled:hover, input:disabled:focus, button:disabled, button:disabled:hover, button:disabled:focus, .button:disabled, .button:disabled:hover, .button:disabled:focus, a.disabled, a.disabled:hover, a.disabled:focus { - background: rgba(230,230,230,.9); + background-color: rgba(230,230,230,.9); color: #999; cursor: default; } @@ -122,56 +131,70 @@ a.disabled, a.disabled:hover, a.disabled:focus { border: 1px solid #1d2d44; background: #35537a; color: #ddd; - text-shadow: #000 0 -1px 0; - -moz-box-shadow: 0 0 1px #000, 0 1px 0 #6d7d94 inset; - -webkit-box-shadow: 0 0 1px #000, 0 1px 0 #6d7d94 inset; - box-shadow: 0 0 1px #000, 0 1px 0 #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: #304d76; color: #fff; - text-shadow: #000 0 -1px 0; - -moz-box-shadow: 0 0 1px #000, 0 1px 0 #4d5d74 inset; - -webkit-box-shadow: 0 0 1px #000, 0 1px 0 #4d5d74 inset; - box-shadow: 0 0 1px #000, 0 1px 0 #4d5d74 inset; } .primary:active, input[type="submit"].primary:active, input[type="button"].primary:active, button.primary:active, .button.primary:active { border: 1px solid #1d2d44; background: #1d2d44; color: #bbb; - text-shadow: #000 0 -1px 0; - -moz-box-shadow: 0 1px 1px #3d4d64, 0 1px 1px 0 rgba(0,0,0,.2) inset; - -webkit-box-shadow: 0 1px 1px #3d4d64, 0 1px 1px 0 rgba(0,0,0,.2) inset; - box-shadow: 0 1px 1px #3d4d64, 0 1px 1px 0 rgba(0,0,0,.2) inset; } -.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; } +.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; + border-radius: 1em; + -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=70)"; filter:alpha(opacity=70); opacity: .7; + margin-top: 10px; + float: right; +} +input[type="submit"].enabled { + background: #66f866; + border: 1px solid #5e5; +} /* CONTENT ------------------------------------------------------------------ */ #controls { + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; position: fixed; - height: 36px; + height: 44px; width: 100%; - padding: 0 75px 0 6px; + padding-right: 75px; margin: 0; background: #eee; border-bottom: 1px solid #e7e7e7; z-index: 50; - -moz-box-sizing: border-box; box-sizing: border-box; - -moz-box-shadow: 0 -3px 7px #000; -webkit-box-shadow: 0 -3px 7px #000; box-shadow: 0 -3px 7px #000; } -#controls .button { +#controls .button, +#controls button, +#controls input[type='submit'], +#controls input[type='text'], +#controls input[type='password'], +#controls select { + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; display: inline-block; + height: 36px; + padding: 7px 10px } #content { position:relative; height:100%; width:100%; } -#content .hascontrols { position: relative; top: 2.9em; } +#content .hascontrols { + position: relative; + top: 45px; +} #content-wrapper { position:absolute; height:100%; width:100%; padding-top:3.5em; padding-left:80px; -moz-box-sizing:border-box; box-sizing:border-box; @@ -189,8 +212,9 @@ input[type="submit"].enabled { background:#66f866; border:1px solid #5e5; -moz-b #rightcontent, .rightcontent { position:fixed; top:6.4em; left:24.5em; overflow:auto } #emptycontent { - font-size:1.5em; font-weight:bold; - color:#888; text-shadow:#fff 0 1px 0; + font-size: 1.5em; + font-weight: bold; + color: #888; position: absolute; text-align: center; top: 50%; @@ -216,11 +240,9 @@ input[type="submit"].enabled { background:#66f866; border:1px solid #5e5; -moz-b #body-login form input[type="checkbox"]+label { text-align: center; color: #ccc; - text-shadow: 0 1px 0 rgba(255,255,255,.1); -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=60)"; filter: alpha(opacity=60); opacity: .6; - text-shadow: 0 -1px 0 rgba(0,0,0,.5); } #body-login div.buttons { text-align:center; } @@ -274,9 +296,10 @@ input[name="adminpass-clone"] { padding-left:1.8em; width:11.7em !important; } #body-login input[type="password"], #body-login input[type="email"] { border: 1px solid #323233; - -moz-box-shadow: 0 1px 0 rgba(255,255,255,.15), 0 1px 1px rgba(0,0,0,.25) inset; - -webkit-box-shadow: 0 1px 0 rgba(255,255,255,.15), 0 1px 1px rgba(0,0,0,.25) inset; - box-shadow: 0 1px 0 rgba(255,255,255,.15), 0 1px 1px rgba(0,0,0,.25) inset; + border-radius: 5px; +} +#body-login input[type='submit'] { + border-radius: 5px; } /* Nicely grouping input field sets */ @@ -292,18 +315,14 @@ input[name="adminpass-clone"] { padding-left:1.8em; width:11.7em !important; } border-top: 0; border-bottom: 0; border-radius: 0; - -moz-box-shadow: 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(0,0,0,.1) inset !important; - -webkit-box-shadow: 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(0,0,0,.1) inset !important; - box-shadow: 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(0,0,0,.1) inset !important; + box-shadow: 0 1px 0 rgba(0,0,0,.1) inset !important; } #body-login .groupbottom input { margin-top: 0; border-top: 0; border-top-right-radius: 0; border-top-left-radius: 0; - -moz-box-shadow: 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(0,0,0,.1) inset !important; - -webkit-box-shadow: 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(0,0,0,.1) inset !important; - box-shadow: 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(0,0,0,.1) inset !important; + box-shadow: 0 1px 0 rgba(0,0,0,.1) inset !important; } /* In field labels. No, HTML placeholder does not work as well. */ @@ -401,8 +420,7 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; } #body-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; + border: 1px solid #ddd; } #body-login form #selectDbType label.ui-state-hover, #body-login form #selectDbType label.ui-state-active { color:#000; background-color:#e8e8e8; } @@ -411,29 +429,24 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; } #body-login .warning, #body-login .update, #body-login .error { display: block; padding: 10px; - color: #dd3b3b; - text-shadow: 0 -1px 0 rgba(0,0,0,.3); + color: #d2322d; background-color: rgba(0,0,0,.3); text-align: center; - -moz-border-radius: 5px; - -webkit-border-radius: 5px; - border-radius: 5px; + border-radius: 3px; cursor: default; } #body-user .warning, #body-settings .warning { - margin-top: 8px; - padding: 5px; - background: #fdd; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; + margin-top: 8px; + padding: 5px; + background: #fdd; + border-radius: 3px; } .warning legend, .warning a, .error a { - color: #dd3b3b !important; + color: #d2322d !important; font-weight: bold; } .error pre { @@ -456,7 +469,6 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; } font-weight: bold; } #body-login .warning legend { - text-shadow: none; -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter: alpha(opacity=100); opacity: 1; @@ -512,7 +524,6 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; } z-index: 75; height: 100%; background:#383c43 url('../img/noise.png') repeat; - -moz-box-shadow:0 0 7px #000; -webkit-box-shadow:0 0 7px #000; box-shadow:0 0 7px #000; overflow:hidden; box-sizing:border-box; -moz-box-sizing:border-box; /* prevent ugly selection effect on accidental selection */ -webkit-user-select: none; -moz-user-select: none; -ms-user-select: none; user-select: none; @@ -529,7 +540,6 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; } font-size: 11px; text-align: center; color: #fff; - text-shadow: #000 0 -1px 0; white-space:nowrap; overflow:hidden; text-overflow:ellipsis; /* ellipsize long app names */ padding-bottom: 10px; } @@ -593,7 +603,6 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; } margin-top: 7px; margin-left: 10px; color: #bbb; - text-shadow: 0 -1px 0 #000; } #expand { padding: 15px 15px 15px 5px; @@ -607,7 +616,7 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; } position:absolute; right:0; top:45px; z-index:76; display:none; background:#383c43 url('../img/noise.png') repeat; border-bottom-left-radius:7px; border-bottom:1px #333 solid; border-left:1px #333 solid; - -moz-box-shadow:0 0 7px rgb(29,45,68); -webkit-box-shadow:0 0 7px rgb(29,45,68); box-shadow:0 0 7px rgb(29,45,68); + box-shadow:0 0 7px rgb(29,45,68); -moz-box-sizing: border-box; box-sizing: border-box; /* prevent ugly selection effect on accidental selection */ -webkit-user-select: none; -moz-user-select: none; -ms-user-select: none; user-select: none; @@ -616,7 +625,6 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; } display: block; height: 40px; color: #fff; - text-shadow: 0 -1px 0 #000; padding: 4px 12px 0; -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=70)"; filter: alpha(opacity=70); @@ -642,7 +650,17 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; } .inlineblock { display: inline-block; } #notification-container { position: fixed; top: 0px; width: 100%; text-align: center; z-index: 101; line-height: 1.2;} -#notification, #update-notification { z-index:101; background-color:#fc4; border:0; padding:0 .7em .3em; display:none; position: relative; 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, #update-notification { + z-index: 101; + background-color: #fc4; + border: 0; + padding: 0 .7em .3em; + display: none; + position: relative; + top: 0; + border-bottom-left-radius: 3px; + border-bottom-right-radius: 3px; +} #notification span, #update-notification span { cursor:pointer; font-weight:bold; margin-left:1em; } tr .action:not(.permanent), .selectedActions a { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; filter:alpha(opacity=0); opacity:0; } @@ -652,13 +670,15 @@ tr .action { width:16px; height:16px; } tr:hover .action:hover, .selectedActions a:hover, .header-action:hover { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1; } tbody tr:hover, tr:active { background-color:#f8f8f8; } +#body-settings h2 { + font-size: 20px; + font-weight: normal; + margin-bottom: 7px; +} #body-settings .personalblock, #body-settings .helpblock { - padding: .5em 1em; - margin: 1em; - background-color: rgb(240,240,240); + padding: 30px; color: #555; - text-shadow: #fff 0 1px 0; - -moz-border-radius: .5em; -webkit-border-radius: .5em; border-radius: .5em; + border-top: 1px solid #ddd; } #body-settings .personalblock#quota { position:relative; padding:0; } #body-settings #controls+.helpblock { position:relative; margin-top:3em; } @@ -671,8 +691,8 @@ code { font-family:"Lucida Console", "Lucida Sans Typewriter", "DejaVu Sans Mono background-color: rgb(220,220,220); 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; } + border-bottom-left-radius: 3px; + border-top-left-radius: 3px; } #quotatext {padding:.6em 1em;} .pager { list-style:none; float:right; display:inline; margin:.7em 13em 0 0; } @@ -751,15 +771,38 @@ span.ui-icon {float: left; margin: 3px 7px 30px 0;} .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); } -.help-includes {overflow: hidden; width: 100%; height: 100%; -moz-box-sizing: border-box; box-sizing: border-box; padding-top: 2.8em; } +.help-includes { + overflow: hidden; + width: 100%; + height: 100%; + -moz-box-sizing: border-box; + box-sizing: border-box; + padding-top: 44px; +} .help-iframe {width: 100%; height: 100%; margin: 0;padding: 0; border: 0; overflow: auto;} /* ---- 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; -moz-box-sizing:border-box; box-sizing:border-box; } -div.crumb:first-child { padding:10px 20px 10px 5px; } -div.crumb.last { font-weight:bold; background:none; padding-right:10px; } -div.crumb a{ padding: 0.9em 0 0.7em 0; } +div.crumb { + float: left; + display: block; + background: url('../img/breadcrumb.svg') no-repeat right center; + height: 44px; +} +div.crumb a { + position: relative; + top: 12px; + padding: 14px 24px 14px 17px; + color: #555; +} +div.crumb:first-child a { + position: relative; + top: 13px; +} +div.crumb.last { + font-weight: bold; + margin-right: 10px; +} /* some feedback for hover/tap on breadcrumbs */ div.crumb:hover, diff --git a/core/img/actions/checkmark.png b/core/img/actions/checkmark.png Binary files differnew file mode 100644 index 00000000000..99a4019c69e --- /dev/null +++ b/core/img/actions/checkmark.png diff --git a/core/img/actions/checkmark.svg b/core/img/actions/checkmark.svg new file mode 100644 index 00000000000..f70a407c2ed --- /dev/null +++ b/core/img/actions/checkmark.svg @@ -0,0 +1,4 @@ +<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" version="1.1" xml:space="preserve" height="16px" viewBox="-0.5 -0.5 16 16" width="16px" enable-background="new -0.5 -0.5 16 16" y="0px" x="0px" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" overflow="visible"><metadata><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><defs> +</defs> +<path fill="#000" d="M12.438,3.6875c-0.363,0-0.726,0.1314-1,0.4063l-4.5005,4.5-1.9687-2c-0.5498-0.5484-1.4489-0.5498-2,0l-0.5,0.5c-0.5512,0.5496-0.5512,1.4502,0,2l2.9687,2.9682c0.0063,0.007-0.0065,0.025,0,0.032l0.5,0.5c0.5497,0.55,1.4503,0.55,2,0l0.5-0.5,0.1875-0.219,5.313-5.2812c0.549-0.5498,0.549-1.4503,0-2l-0.5-0.5c-0.275-0.2749-0.638-0.4063-1-0.4063z" transform="translate(-0.5,-0.5)"/> +</svg> diff --git a/core/img/actions/star.png b/core/img/actions/star.png Binary files differnew file mode 100644 index 00000000000..124ce495af6 --- /dev/null +++ b/core/img/actions/star.png diff --git a/core/img/actions/star.svg b/core/img/actions/star.svg new file mode 100644 index 00000000000..7bcd8dc0598 --- /dev/null +++ b/core/img/actions/star.svg @@ -0,0 +1,14 @@ +<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="22" width="22" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/"> + <metadata> + <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> + <g transform="matrix(0.06832234,0,0,0.06832234,-10.114234,-50.901693)"> + <path fill="#CCC" transform="translate(-21.071,-112.5)" d="m330.36,858.43,43.111,108.06,117.64,9.2572-89.445,74.392,27.55,114.75-98.391-62.079-100.62,61.66,28.637-112.76-89.734-76.638,116.09-7.6094z"/> + </g> +</svg> diff --git a/core/img/actions/starred.png b/core/img/actions/starred.png Binary files differnew file mode 100644 index 00000000000..5185d0f5381 --- /dev/null +++ b/core/img/actions/starred.png diff --git a/core/img/actions/starred.svg b/core/img/actions/starred.svg new file mode 100644 index 00000000000..c7a5a7dac12 --- /dev/null +++ b/core/img/actions/starred.svg @@ -0,0 +1,14 @@ +<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="22" width="22" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/"> + <metadata> + <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> + <g transform="matrix(0.06832234,0,0,0.06832234,-10.114235,-50.901693)"> + <path fill="#FC0" transform="translate(-21.071,-112.5)" d="m330.36,858.43,43.111,108.06,117.64,9.2572-89.445,74.392,27.55,114.75-98.391-62.079-100.62,61.66,28.637-112.76-89.734-76.638,116.09-7.6094z"/> + </g> +</svg> diff --git a/core/img/appstore.png b/core/img/appstore.png Binary files differindex 234aa0bb6be..2b90216f797 100644 --- a/core/img/appstore.png +++ b/core/img/appstore.png diff --git a/core/img/breadcrumb-start.png b/core/img/breadcrumb-start.png Binary files differdeleted file mode 100644 index b0df5f44037..00000000000 --- a/core/img/breadcrumb-start.png +++ /dev/null diff --git a/core/img/breadcrumb-start.svg b/core/img/breadcrumb-start.svg deleted file mode 100644 index 7f36231cdf8..00000000000 --- a/core/img/breadcrumb-start.svg +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="36" width="11" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/"> - <g transform="translate(0 -1016.4)"> - <path d="m0 0 11 18-11 18z" transform="translate(0 1016.4)" fill="#ddd"/> - </g> -</svg> diff --git a/core/img/breadcrumb.png b/core/img/breadcrumb.png Binary files differindex 84992be0d93..7e9593a36bf 100644 --- a/core/img/breadcrumb.png +++ b/core/img/breadcrumb.png diff --git a/core/img/breadcrumb.svg b/core/img/breadcrumb.svg index 05a216e50a9..f0b5c9218d5 100644 --- a/core/img/breadcrumb.svg +++ b/core/img/breadcrumb.svg @@ -1,6 +1,12 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="36" width="11" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/"> - <g transform="translate(0 -1016.4)"> - <path d="m0.5 0 10 18-10 18 10-18z" transform="translate(0 1016.4)" stroke="#ddd" stroke-linecap="round" stroke-miterlimit="31.2" stroke-width="0.9" fill="#ddd"/> - </g> +<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="44" width="14" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/"> + <metadata> + <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> + <path d="M0.54879,0.047777,12.744,22,0.54879,43.951,12.744,22z" stroke="#d7d7d7" stroke-linecap="round" stroke-miterlimit="31.20000076000000178" stroke-width="1.09758711000000009" fill="#F00"/> </svg> diff --git a/core/img/desktopapp.png b/core/img/desktopapp.png Binary files differindex 25dae6f197a..272397c949e 100644 --- a/core/img/desktopapp.png +++ b/core/img/desktopapp.png diff --git a/core/img/desktopapp.svg b/core/img/desktopapp.svg index a983e6f9598..c2cfb016299 100644 --- a/core/img/desktopapp.svg +++ b/core/img/desktopapp.svg @@ -1,5 +1,4 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 792 612" xml:space="preserve" height="60" viewBox="0 0 1346.4 475.2" width="170" version="1.1" y="0px" x="0px" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/"> -<rect rx="50" ry="50" height="475.2" width="1346.4" y="-3.5527e-15" x="-2.8405e-15" fill="#1a1a1a"/><path fill="#fff" d="m150.48 126.72c-11.88 0-23.76 11.88-23.76 23.76v166.32l-47.52 23.76v11.88s0 11.88 11.88 11.88h356.4c11.88 0 11.88-11.88 11.88-11.88v-11.88l-47.52-23.76v-166.32c0-11.88-11.88-23.76-23.76-23.76zm0 23.667h237.6v142.65h-237.6z"/><text style="word-spacing:0px;letter-spacing:0px" xml:space="preserve" font-size="316.8px" y="239.58" x="451.44" font-family="Sans" line-height="125%" fill="#ffffff"><tspan font-weight="600" font-size="126.72px" y="239.58" x="451.44" font-family="FreeSans" fill="#ffffff">Desktop app</tspan></text> -<text style="word-spacing:0px;letter-spacing:0px" xml:space="preserve" font-size="316.8px" y="342.54001" x="493.01996" font-family="Sans" line-height="125%" fill="#ffffff"><tspan font-size="71.28px" y="342.54001" x="493.01996" font-family="FreeSans" fill="#ffffff">Windows, OS X, Linux</tspan></text> +<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" version="1.1" xml:space="preserve" height="60" width="170" enable-background="new 0 0 792 612" y="0px" x="0px" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" viewBox="0 0 1346.4 475.2"><metadata><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> +<rect rx="50" ry="50" height="475.2" width="1346.4" y="-3.5527E-15" x="-2.8405E-15" fill="#000"/><path d="m150.48,126.72c-11.88,0-23.76,11.88-23.76,23.76v166.32l-47.52,23.76v11.88s0,11.88,11.88,11.88h356.4c11.88,0,11.88-11.88,11.88-11.88v-11.88l-47.52-23.76v-166.32c0-11.88-11.88-23.76-23.76-23.76zm0,23.667h237.6v142.65h-237.6z" fill="#fff"/><text style="word-spacing:0px;letter-spacing:0px;" xml:space="preserve" font-size="316.8px" y="239.58" x="451.44" font-family="Sans" line-height="125%" fill="#ffffff"><tspan font-size="126.72px" font-family="FreeSans" y="239.58" x="451.44" font-weight="600" fill="#ffffff">Desktop app</tspan></text> +<text style="word-spacing:0px;letter-spacing:0px;" xml:space="preserve" font-size="316.8px" y="342.54001" x="493.01996" font-family="Sans" line-height="125%" fill="#ffffff"><tspan font-size="71.28px" y="342.54001" x="493.01996" font-family="FreeSans" fill="#ffffff">Windows, OS X, Linux</tspan></text> </svg> diff --git a/core/img/googleplay.png b/core/img/googleplay.png Binary files differindex 1470518272e..9b33dab692b 100644 --- a/core/img/googleplay.png +++ b/core/img/googleplay.png diff --git a/core/img/places/link.png b/core/img/places/link.png Binary files differnew file mode 100644 index 00000000000..44b7e199a72 --- /dev/null +++ b/core/img/places/link.png diff --git a/core/img/places/link.svg b/core/img/places/link.svg new file mode 100644 index 00000000000..8784ebc1456 --- /dev/null +++ b/core/img/places/link.svg @@ -0,0 +1,12 @@ +<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/"> + <metadata> + <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> + <path fill="#333" d="M16,4c-6.6274,0-12,5.3726-12,12,0,6.627,5.3726,12,12,12,6.627,0,12-5.373,12-12,0-6.6274-5.373-12-12-12zm1.375,1.5313c2.059,0.0457,3.879,1.2826,5.719,2.0938l2.9691,4.1093-0.46971,1.7657,0.90686,0.56246-0.01543,2.0937c-0.02074,0.59892,0.0086,1.1986-0.0156,1.7969-0.28517,1.1355-0.94394,2.1713-1.5,3.2031-0.37695,0.18585,0.03437-1.2317-0.20313-1.6719,0.05486-1.0173-0.80743-0.97029-1.3903-0.40526-0.72172,0.42068-2.3074,0.54754-2.3589-0.59383-0.40972-1.3716-0.06-2.833,0.49886-4.1093l-0.921-1.125,0.327-2.891-1.469-1.4839,0.345-1.6252-1.719-0.9687c-0.339-0.2661-0.984-0.3713-1.125-0.7344,0.13954-0.00789,0.28457-0.018686,0.42189-0.0156zm-4.2187,0.015634c0.0539,0.00789,0.11999,0.045309,0.21874,0.125,0.57943,0.31834-0.14143,0.67954-0.31251,1.0157-0.92537,0.62589,0.28457,1.1385,0.68743,1.6406,0.64577-0.18549,1.2917-1.1086,2.2344-0.828,1.2058-0.37629,1.0137,1.0099,1.7031,1.625,0.08948,0.28954,1.5086,1.2317,0.65623,0.92177-0.702-0.54411-1.4827-0.50314-1.9845,0.28131-1.355,0.735-0.552-1.4144-1.202-1.9373-0.982-1.0957-0.57,0.8186-0.687,1.3907-0.639-0.0139-1.831-0.4913-2.485,0.2816l0.64046,1.0467,0.76577-1.1719c0.186-0.42411,0.41949,0.32966,0.62486,0.46886,0.24531,0.47297,1.4109,1.2744,0.53126,1.5-1.3039,0.72326-2.3295,1.8202-3.4375,2.7969-0.37371,0.78857-1.1366,0.6984-1.6094,0.0468-1.1438-0.70372-1.0589,1.1256-0.99994,1.8125l1.0013-0.626v1.0312c-0.028286,0.19509-0.00411,0.39806-0.0156,0.59383-0.70063,0.732-1.4069-1.0277-2.0157-1.422l-0.0468-2.5781c0.022114-0.72429-0.1308-1.4659,0.0156-2.1718,1.3779-1.4789,2.7775-3.0107,3.5935-4.891h1.3437c0.93909,0.45497,0.40406-1.0082,0.7812-0.95314zm-1.984,13.406c0.16303-0.01739,0.34848,0.01984,0.54688,0.12501,1.265,0.18106,2.2109,1.0987,3.2187,1.7969,0.80352,0.79632,2.5419,0.54134,2.7345,1.8907-0.29248,1.4636-1.7323,2.2495-3,2.7657-0.31646,0.17657-0.65657,0.31714-1.0157,0.37543-1.1753,0.29314-1.6834-0.912-1.9219-1.8137-0.53212-1.1143-1.8621-1.9577-1.6718-3.3274,0.0312-0.68057,0.40286-1.7373,1.1093-1.8125z"/> +</svg> diff --git a/core/js/avatar.js b/core/js/avatar.js index 57e6daa0930..c54c4068768 100644 --- a/core/js/avatar.js +++ b/core/js/avatar.js @@ -1,6 +1,6 @@ $(document).ready(function(){ if (OC.currentUser) { - $('#header .avatardiv').avatar(OC.currentUser, 32); + $('#header .avatardiv').avatar(OC.currentUser, 32, undefined, true); // Personal settings $('#avatar .avatardiv').avatar(OC.currentUser, 128); } diff --git a/core/js/jquery.avatar.js b/core/js/jquery.avatar.js index 88a4c25d1ee..00068101726 100644 --- a/core/js/jquery.avatar.js +++ b/core/js/jquery.avatar.js @@ -15,7 +15,7 @@ * You may use this on any <div></div> * Here I'm using <div class="avatardiv"></div> as an example. * - * There are 4 ways to call this: + * There are 5 ways to call this: * * 1. $('.avatardiv').avatar('jdoe', 128); * This will make the div to jdoe's fitting avatar, with a size of 128px. @@ -34,10 +34,15 @@ * 4. $('.avatardiv').avatar('jdoe', 128, true); * This will behave like the first example, except it will also append random * hashes to the custom avatar images, to force image reloading in IE8. + * + * 5. $('.avatardiv').avatar('jdoe', 128, undefined, true); + * This will behave like the first example, but it will hide the avatardiv, if + * it will display the default placeholder. undefined is the ie8fix from + * example 4 and can be either true, or false/undefined, to be ignored. */ (function ($) { - $.fn.avatar = function(user, size, ie8fix) { + $.fn.avatar = function(user, size, ie8fix, hidedefault) { if (typeof(size) === 'undefined') { if (this.height() > 0) { size = this.height(); @@ -69,12 +74,17 @@ var url = OC.Router.generate('core_avatar_get', {user: user, size: size})+'?requesttoken='+oc_requesttoken; $.get(url, function(result) { if (typeof(result) === 'object') { - if (result.data && result.data.displayname) { - $div.placeholder(user, result.data.displayname); + if (!hidedefault) { + if (result.data && result.data.displayname) { + $div.placeholder(user, result.data.displayname); + } else { + $div.placeholder(user); + } } else { - $div.placeholder(user); + $div.hide(); } } else { + $div.show(); if (ie8fix === true) { $div.html('<img src="'+url+'#'+Math.floor(Math.random()*1000)+'">'); } else { diff --git a/core/js/setup.js b/core/js/setup.js index c0df1ed96b0..62f313fc501 100644 --- a/core/js/setup.js +++ b/core/js/setup.js @@ -54,7 +54,7 @@ $(document).ready(function() { var post = $(this).serializeArray(); // Disable inputs - $(':submit', this).attr('disabled','disabled').val('Finishing …'); + $(':submit', this).attr('disabled','disabled').val($(':submit', this).data('finishing')); $('input', this).addClass('ui-state-disabled').attr('disabled','disabled'); $('#selectDbType').buttonset('disable'); diff --git a/core/js/share.js b/core/js/share.js index 82f5da0baea..b472797b3cd 100644 --- a/core/js/share.js +++ b/core/js/share.js @@ -114,6 +114,7 @@ OC.Share={ data = false; } }}); + return data; }, share:function(itemType, itemSource, shareType, shareWith, permissions, callback) { @@ -217,9 +218,9 @@ OC.Share={ OC.Share.showLink(share.token, share.share_with, itemSource); } else { if (share.collection) { - OC.Share.addShareWith(share.share_type, share.share_with, share.share_with_displayname, share.permissions, possiblePermissions, share.collection); + OC.Share.addShareWith(share.share_type, share.share_with, share.share_with_displayname, share.permissions, possiblePermissions, share.mail_send, share.collection); } else { - OC.Share.addShareWith(share.share_type, share.share_with, share.share_with_displayname, share.permissions, possiblePermissions, false); + OC.Share.addShareWith(share.share_type, share.share_with, share.share_with_displayname, share.permissions, possiblePermissions, share.mail_send, false); } } if (share.expiration != null) { @@ -301,7 +302,7 @@ OC.Share={ } }); }, - addShareWith:function(shareType, shareWith, shareWithDisplayName, permissions, possiblePermissions, collection) { + addShareWith:function(shareType, shareWith, shareWithDisplayName, permissions, possiblePermissions, mailSend, collection) { if (!OC.Share.itemShares[shareType]) { OC.Share.itemShares[shareType] = []; } @@ -343,6 +344,14 @@ OC.Share={ }else{ html += escapeHTML(shareWithDisplayName); } + var mailNotificationEnabled = $('input:hidden[name=mailNotificationEnabled]').val(); + if (mailNotificationEnabled === 'yes') { + var checked = ''; + if (mailSend === '1') { + checked = 'checked'; + } + html += '<label><input type="checkbox" name="mailNotification" class="mailNotification" ' + checked + ' />'+t('core', 'notify user by email')+'</label>'; + } if (possiblePermissions & OC.PERMISSION_CREATE || possiblePermissions & OC.PERMISSION_UPDATE || possiblePermissions & OC.PERMISSION_DELETE) { if (editChecked == '') { html += '<label style="display:none;">'; @@ -467,7 +476,7 @@ $(document).ready(function() { $(this).click(function(event) { var target = $(event.target); var isMatched = !target.is('.drop, .ui-datepicker-next, .ui-datepicker-prev, .ui-icon') - && !target.closest('#ui-datepicker-div').length; + && !target.closest('#ui-datepicker-div').length && !target.closest('.ui-autocomplete').length; if (OC.Share.droppedDown && isMatched && $('#dropdown').has(event.target).length === 0) { OC.Share.hideDropDown(); } @@ -493,6 +502,7 @@ $(document).ready(function() { $(document).on('click', '#dropdown .showCruds', function() { $(this).parent().find('.cruds').toggle(); + return false; }); $(document).on('click', '#dropdown .unshare', function() { @@ -510,6 +520,7 @@ $(document).ready(function() { $('#expiration').hide(); } }); + return false; }); $(document).on('change', '#dropdown .permissions', function() { @@ -699,5 +710,27 @@ $(document).ready(function() { } }); + $(document).on('click', '#dropdown input[name=mailNotification]', function() { + var li = $(this).parent(); + var itemType = $('#dropdown').data('item-type'); + var itemSource = $('#dropdown').data('item-source'); + var action = ''; + if (this.checked) { + action = 'informRecipients'; + } else { + action = 'informRecipientsDisabled'; + } + + var shareType = $(li).data('share-type'); + var shareWith = $(li).data('share-with'); + + $.post(OC.filePath('core', 'ajax', 'share.php'), {action: action, recipient: shareWith, shareType: shareType, itemSource: itemSource, itemType: itemType}, function(result) { + if (result.status !== 'success') { + OC.dialogs.alert(t('core', result.data.message), t('core', 'Warning')); + } + }); + +}); + }); diff --git a/core/l10n/ar.php b/core/l10n/ar.php index f61014e19e1..cb8a506c4a8 100644 --- a/core/l10n/ar.php +++ b/core/l10n/ar.php @@ -81,6 +81,7 @@ $TRANSLATIONS = array( "Error setting expiration date" => "حصل خطأ عند عملية تعيين تاريخ إنتهاء الصلاحية", "Sending ..." => "جاري الارسال ...", "Email sent" => "تم ارسال البريد الالكتروني", +"Warning" => "تحذير", "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "حصل خطأ في عملية التحديث, يرجى ارسال تقرير بهذه المشكلة الى <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>.", "The update was successful. Redirecting you to ownCloud now." => "تم التحديث بنجاح , يتم اعادة توجيهك الان الى Owncloud", "Use the following link to reset your password: {link}" => "استخدم هذه الوصلة لاسترجاع كلمة السر: {link}", diff --git a/core/l10n/bg_BG.php b/core/l10n/bg_BG.php index 4f5ae5993f4..3b7fd4633af 100644 --- a/core/l10n/bg_BG.php +++ b/core/l10n/bg_BG.php @@ -41,6 +41,7 @@ $TRANSLATIONS = array( "Share with" => "Споделено с", "Password" => "Парола", "create" => "създаване", +"Warning" => "Внимание", "You will receive a link to reset your password via Email." => "Ще получите връзка за нулиране на паролата Ви.", "Username" => "Потребител", "Request reset" => "Нулиране на заявка", diff --git a/core/l10n/bn_BD.php b/core/l10n/bn_BD.php index 3b4b990ac28..dfcd2f509a6 100644 --- a/core/l10n/bn_BD.php +++ b/core/l10n/bn_BD.php @@ -79,6 +79,7 @@ $TRANSLATIONS = array( "Error setting expiration date" => "মেয়াদোত্তীর্ণ হওয়ার তারিখ নির্ধারণ করতে সমস্যা দেখা দিয়েছে", "Sending ..." => "পাঠানো হচ্ছে......", "Email sent" => "ই-মেইল পাঠানো হয়েছে", +"Warning" => "সতর্কবাণী", "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/ca.php b/core/l10n/ca.php index 938d668b362..d85da45b5d6 100644 --- a/core/l10n/ca.php +++ b/core/l10n/ca.php @@ -103,6 +103,7 @@ $TRANSLATIONS = array( "Error setting expiration date" => "Error en establir la data de venciment", "Sending ..." => "Enviant...", "Email sent" => "El correu electrónic s'ha enviat", +"Warning" => "Avís", "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "L'actualització ha estat incorrecte. Comuniqueu aquest error a <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">la comunitat ownCloud</a>.", "The update was successful. Redirecting you to ownCloud now." => "L'actualització ha estat correcte. Ara us redirigim a ownCloud.", "%s password reset" => "restableix la contrasenya %s", @@ -125,7 +126,6 @@ $TRANSLATIONS = array( "Help" => "Ajuda", "Access forbidden" => "Accés prohibit", "Cloud not found" => "No s'ha trobat el núvol", -"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Ei,\n\nnomés fer-te saber que %s ha compartit %s amb tu.\nMira-ho: %s\n\nSalut!", "Edit categories" => "Edita les categories", "Add" => "Afegeix", "Security Warning" => "Avís de seguretat", @@ -155,7 +155,6 @@ $TRANSLATIONS = array( "remember" => "recorda'm", "Log in" => "Inici de sessió", "Alternative Logins" => "Acreditacions alternatives", -"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Ei,<br><br>només fer-te saber que %s ha compartit %s amb tu.<br><a href=\"%s\">Mira-ho:</a><br><br>Salut!", "Updating ownCloud to version %s, this may take a while." => "S'està actualitzant ownCloud a la versió %s, pot trigar una estona." ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/core/l10n/cs_CZ.php b/core/l10n/cs_CZ.php index 8b63079c87a..4bd8bd07b70 100644 --- a/core/l10n/cs_CZ.php +++ b/core/l10n/cs_CZ.php @@ -99,6 +99,7 @@ $TRANSLATIONS = array( "Error setting expiration date" => "Chyba při nastavení data vypršení platnosti", "Sending ..." => "Odesílám ...", "Email sent" => "E-mail odeslán", +"Warning" => "Varování", "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Aktualizace neproběhla úspěšně. Nahlaste prosím problém do <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">evidence chyb ownCloud</a>", "The update was successful. Redirecting you to ownCloud now." => "Aktualizace byla úspěšná. Přesměrovávám na ownCloud.", "%s password reset" => "reset hesla %s", @@ -121,7 +122,6 @@ $TRANSLATIONS = array( "Help" => "Nápověda", "Access forbidden" => "Přístup zakázán", "Cloud not found" => "Cloud nebyl nalezen", -"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Ahoj,\n\njenom vám chci oznámit, že %s s vámi sdílí %s.\nPodívat se můžete zde: %s\n\nDíky", "Edit categories" => "Upravit kategorie", "Add" => "Přidat", "Security Warning" => "Bezpečnostní upozornění", @@ -151,7 +151,6 @@ $TRANSLATIONS = array( "remember" => "zapamatovat", "Log in" => "Přihlásit", "Alternative Logins" => "Alternativní přihlášení", -"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Ahoj,<br><br>jenom vám chci oznámit, že %s s vámi sdílí %s.\nPodívat se můžete <br><a href=\"%s\">zde</a>.<br><br>Díky", "Updating ownCloud to version %s, this may take a while." => "Aktualizuji ownCloud na verzi %s, bude to chvíli trvat." ); $PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"; diff --git a/core/l10n/cy_GB.php b/core/l10n/cy_GB.php index 78eb6ba9698..920fcad3d6b 100644 --- a/core/l10n/cy_GB.php +++ b/core/l10n/cy_GB.php @@ -81,6 +81,7 @@ $TRANSLATIONS = array( "Error setting expiration date" => "Gwall wrth osod dyddiad dod i ben", "Sending ..." => "Yn anfon ...", "Email sent" => "Anfonwyd yr e-bost", +"Warning" => "Rhybudd", "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Methodd y diweddariad. Adroddwch y mater hwn i <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">gymuned ownCloud</a>.", "The update was successful. Redirecting you to ownCloud now." => "Roedd y diweddariad yn llwyddiannus. Cewch eich ailgyfeirio i ownCloud nawr.", "Use the following link to reset your password: {link}" => "Defnyddiwch y ddolen hon i ailosod eich cyfrinair: {link}", diff --git a/core/l10n/da.php b/core/l10n/da.php index 8938f2107fa..b28e8a969b4 100644 --- a/core/l10n/da.php +++ b/core/l10n/da.php @@ -16,8 +16,11 @@ $TRANSLATIONS = array( "Error adding %s to favorites." => "Fejl ved tilføjelse af %s til favoritter.", "No categories selected for deletion." => "Ingen kategorier valgt", "Error removing %s from favorites." => "Fejl ved fjernelse af %s fra favoritter.", +"No image or file provided" => "Ingen fil eller billede givet", "Unknown filetype" => "Ukendt filtype", "Invalid image" => "Ugyldigt billede", +"No temporary profile picture available, try again" => "Intet midlertidigt profilbillede tilgængeligt, prøv igen", +"No crop data provided" => "Ingen beskæringsdata give", "Sunday" => "Søndag", "Monday" => "Mandag", "Tuesday" => "Tirsdag", @@ -50,11 +53,20 @@ $TRANSLATIONS = array( "last year" => "sidste år", "years ago" => "år siden", "Choose" => "Vælg", +"Error loading file picker template: {error}" => "Fejl ved indlæsning af filvælger skabelon: {error}", "Yes" => "Ja", "No" => "Nej", "Ok" => "OK", -"_{count} file conflict_::_{count} file conflicts_" => array("",""), +"Error loading message template: {error}" => "Fejl ved indlæsning af besked skabelon: {error}", +"_{count} file conflict_::_{count} file conflicts_" => array("{count} filkonflikt","{count} filkonflikter"), +"One file conflict" => "En filkonflikt", +"Which files do you want to keep?" => "Hvilke filer ønsker du at beholde?", +"If you select both versions, the copied file will have a number added to its name." => "Hvis du vælger begge versioner, vil den kopierede fil få tilføjet et nummer til sit navn.", "Cancel" => "Annuller", +"Continue" => "Videre", +"(all selected)" => "(alle valgt)", +"({count} selected)" => "({count} valgt)", +"Error loading file exists template" => "Fejl ved inlæsning af; fil eksistere skabelon", "The object type is not specified." => "Objekttypen er ikke angivet.", "Error" => "Fejl", "The app name is not specified." => "Den app navn er ikke angivet.", @@ -91,6 +103,7 @@ $TRANSLATIONS = array( "Error setting expiration date" => "Fejl under sætning af udløbsdato", "Sending ..." => "Sender ...", "Email sent" => "E-mail afsendt", +"Warning" => "Advarsel", "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Opdateringen blev ikke udført korrekt. Rapporter venligst problemet til <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownClouds community</a>.", "The update was successful. Redirecting you to ownCloud now." => "Opdateringen blev udført korrekt. Du bliver nu viderestillet til ownCloud.", "%s password reset" => "%s adgangskode nulstillet", @@ -113,7 +126,6 @@ $TRANSLATIONS = array( "Help" => "Hjælp", "Access forbidden" => "Adgang forbudt", "Cloud not found" => "Sky ikke fundet", -"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Hallo\n\ndette blot for at lade dig vide, at %s har delt %s med dig.\nSe det: %s\n\nHej", "Edit categories" => "Rediger kategorier", "Add" => "Tilføj", "Security Warning" => "Sikkerhedsadvarsel", @@ -143,7 +155,6 @@ $TRANSLATIONS = array( "remember" => "husk", "Log in" => "Log ind", "Alternative Logins" => "Alternative logins", -"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Hallo,<br><br>dette blot for at lade dig vide, at %s har delt \"%s\" med dig.<br><a href=\"%s\">Se det!</a><br><br>Hej", "Updating ownCloud to version %s, this may take a while." => "Opdatere Owncloud til version %s, dette kan tage et stykke tid." ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/core/l10n/de.php b/core/l10n/de.php index b5ff8826ad8..7e292adcf39 100644 --- a/core/l10n/de.php +++ b/core/l10n/de.php @@ -1,6 +1,7 @@ <?php $TRANSLATIONS = array( "%s shared »%s« with you" => "%s teilte »%s« mit Ihnen", +"Couldn't send mail to following users: %s " => "Die E-Mail konnte nicht an folgende Benutzer gesendet werden: %s", "group" => "Gruppe", "Turned on maintenance mode" => "Wartungsmodus eingeschaltet", "Turned off maintenance mode" => "Wartungsmodus ausgeschaltet", @@ -92,6 +93,7 @@ $TRANSLATIONS = array( "Resharing is not allowed" => "Weiterverteilen ist nicht erlaubt", "Shared in {item} with {user}" => "Für {user} in {item} freigegeben", "Unshare" => "Freigabe aufheben", +"notify user by email" => "Benutzer per E-Mail informieren", "can edit" => "kann bearbeiten", "access control" => "Zugriffskontrolle", "create" => "erstellen", @@ -103,6 +105,7 @@ $TRANSLATIONS = array( "Error setting expiration date" => "Fehler beim Setzen des Ablaufdatums", "Sending ..." => "Sende ...", "Email sent" => "E-Mail wurde verschickt", +"Warning" => "Warnung", "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Das Update ist fehlgeschlagen. Bitte melde dieses Problem an die <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud Community</a>.", "The update was successful. Redirecting you to ownCloud now." => "Das Update war erfolgreich. Du wirst nun zu ownCloud weitergeleitet.", "%s password reset" => "%s-Passwort zurücksetzen", @@ -125,7 +128,9 @@ $TRANSLATIONS = array( "Help" => "Hilfe", "Access forbidden" => "Zugriff verboten", "Cloud not found" => "Cloud nicht gefunden", -"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Hallo,\n\nwollte dich nur kurz informieren, dass %s gerade %s mit dir geteilt hat.\nSchau es dir an: %s\n\nGruß!", +"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Hallo,\n\nich wollte Dich nur wissen lassen, dass %s %s mit Dir teilt.\nSchaue es Dir an: %s\n\n", +"The share will expire on %s.\n\n" => "Die Freigabe wird ablaufen am %s.\n\n", +"Cheers!" => "Hallo!", "Edit categories" => "Kategorien bearbeiten", "Add" => "Hinzufügen", "Security Warning" => "Sicherheitswarnung", @@ -146,6 +151,7 @@ $TRANSLATIONS = array( "Database tablespace" => "Datenbank-Tablespace", "Database host" => "Datenbank-Host", "Finish setup" => "Installation abschließen", +"Finishing …" => "Abschließen ...", "%s is available. Get more information on how to update." => "%s ist verfügbar. Holen Sie weitere Informationen zu Aktualisierungen ein.", "Log out" => "Abmelden", "Automatic logon rejected!" => "Automatischer Login zurückgewiesen!", @@ -155,7 +161,8 @@ $TRANSLATIONS = array( "remember" => "merken", "Log in" => "Einloggen", "Alternative Logins" => "Alternative Logins", -"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Hallo,<br/><br/>wollte dich nur kurz informieren, dass %s gerade %s mit dir geteilt hat.<br/><a href=\"%s\">Schau es dir an.</a><br/><br/>Gruß!", +"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>" => "Hallo,<br/><br/>wollte dich nur kurz informieren, dass %s gerade %s mit dir geteilt hat.<br/><a href=\"%s\">Schau es dir an.</a><br/><br/>", +"The share will expire on %s.<br><br>" => "Die Freigabe wird ablaufen am %s.<br><br>", "Updating ownCloud to version %s, this may take a while." => "Aktualisiere ownCloud auf Version %s. Dies könnte eine Weile dauern." ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/core/l10n/de_CH.php b/core/l10n/de_CH.php index 1fc6f6b7e1e..1f79e977cc9 100644 --- a/core/l10n/de_CH.php +++ b/core/l10n/de_CH.php @@ -83,6 +83,7 @@ $TRANSLATIONS = array( "Error setting expiration date" => "Fehler beim Setzen des Ablaufdatums", "Sending ..." => "Sende ...", "Email sent" => "Email gesendet", +"Warning" => "Warnung", "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Das Update ist fehlgeschlagen. Bitte melden Sie dieses Problem an die <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud Community</a>.", "The update was successful. Redirecting you to ownCloud now." => "Das Update war erfolgreich. Sie werden nun zu ownCloud weitergeleitet.", "%s password reset" => "%s-Passwort zurücksetzen", @@ -105,7 +106,6 @@ $TRANSLATIONS = array( "Help" => "Hilfe", "Access forbidden" => "Zugriff verboten", "Cloud not found" => "Cloud wurde nicht gefunden", -"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Hallo,\n\nich wollte Sie nur wissen lassen, dass %s %s mit Ihnen teilt.\nSchauen Sie es sich an: %s\n\nViele Grüsse!", "Edit categories" => "Kategorien ändern", "Add" => "Hinzufügen", "Security Warning" => "Sicherheitshinweis", @@ -135,7 +135,6 @@ $TRANSLATIONS = array( "remember" => "merken", "Log in" => "Einloggen", "Alternative Logins" => "Alternative Logins", -"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Hallo,<br><br>ich wollte Sie nur wissen lassen, dass %s %s mit Ihnen teilt.<br><a href=\"%s\">Schauen Sie es sich an!</a><br><br>Viele Grüsse!", "Updating ownCloud to version %s, this may take a while." => "Aktualisiere ownCloud auf Version %s. Dies könnte eine Weile dauern." ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/core/l10n/de_DE.php b/core/l10n/de_DE.php index 5b9b199f416..95519c7d412 100644 --- a/core/l10n/de_DE.php +++ b/core/l10n/de_DE.php @@ -1,6 +1,7 @@ <?php $TRANSLATIONS = array( "%s shared »%s« with you" => "%s geteilt »%s« mit Ihnen", +"Couldn't send mail to following users: %s " => "Die E-Mail konnte nicht an folgende Benutzer gesendet werden: %s", "group" => "Gruppe", "Turned on maintenance mode" => "Wartungsmodus eingeschaltet ", "Turned off maintenance mode" => "Wartungsmodus ausgeschaltet", @@ -92,6 +93,7 @@ $TRANSLATIONS = array( "Resharing is not allowed" => "Das Weiterverteilen ist nicht erlaubt", "Shared in {item} with {user}" => "Freigegeben in {item} von {user}", "Unshare" => "Freigabe aufheben", +"notify user by email" => "Benutzer per E-Mail informieren", "can edit" => "kann bearbeiten", "access control" => "Zugriffskontrolle", "create" => "erstellen", @@ -103,6 +105,7 @@ $TRANSLATIONS = array( "Error setting expiration date" => "Fehler beim Setzen des Ablaufdatums", "Sending ..." => "Sende ...", "Email sent" => "Email gesendet", +"Warning" => "Warnung", "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Das Update ist fehlgeschlagen. Bitte melden Sie dieses Problem an die <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud Community</a>.", "The update was successful. Redirecting you to ownCloud now." => "Das Update war erfolgreich. Sie werden nun zu ownCloud weitergeleitet.", "%s password reset" => "%s-Passwort zurücksetzen", @@ -125,7 +128,9 @@ $TRANSLATIONS = array( "Help" => "Hilfe", "Access forbidden" => "Zugriff verboten", "Cloud not found" => "Cloud wurde nicht gefunden", -"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Hallo,\n\nich wollte Sie nur wissen lassen, dass %s %s mit Ihnen teilt.\nSchauen Sie es sich an: %s\n\nViele Grüße!", +"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Hallo,\n\nich wollte Sie nur wissen lassen, dass %s %s mit Ihnen teilt.\nSchauen Sie es sich an: %s\n\n", +"The share will expire on %s.\n\n" => "Die Freigabe wird ablaufen am %s.\n\n", +"Cheers!" => "Hallo!", "Edit categories" => "Kategorien ändern", "Add" => "Hinzufügen", "Security Warning" => "Sicherheitshinweis", @@ -146,6 +151,7 @@ $TRANSLATIONS = array( "Database tablespace" => "Datenbank-Tablespace", "Database host" => "Datenbank-Host", "Finish setup" => "Installation abschließen", +"Finishing …" => "Abschließen ...", "%s is available. Get more information on how to update." => "%s ist verfügbar. Holen Sie weitere Informationen zu Aktualisierungen ein.", "Log out" => "Abmelden", "Automatic logon rejected!" => "Automatische Anmeldung verweigert!", @@ -155,7 +161,8 @@ $TRANSLATIONS = array( "remember" => "merken", "Log in" => "Einloggen", "Alternative Logins" => "Alternative Logins", -"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Hallo,<br><br>ich wollte Sie nur wissen lassen, dass %s %s mit Ihnen teilt.<br><a href=\"%s\">Schauen Sie es sich an!</a><br><br>Viele Grüße!", +"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>" => "Hallo,<br><br>ich wollte Sie nur wissen lassen, dass %s %s mit Ihnen teilt.<br><a href=\"%s\">Schauen Sie es sich an!</a><br><br>", +"The share will expire on %s.<br><br>" => "Die Freigabe wird ablaufen am %s.<br><br>", "Updating ownCloud to version %s, this may take a while." => "Aktualisiere ownCloud auf Version %s. Dies könnte eine Weile dauern." ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/core/l10n/el.php b/core/l10n/el.php index 7fc58ca3527..fd5987d02ae 100644 --- a/core/l10n/el.php +++ b/core/l10n/el.php @@ -83,6 +83,7 @@ $TRANSLATIONS = array( "Error setting expiration date" => "Σφάλμα κατά τον ορισμό ημ. λήξης", "Sending ..." => "Αποστολή...", "Email sent" => "Το Email απεστάλη ", +"Warning" => "Προειδοποίηση", "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Η ενημέρωση ήταν ανεπιτυχής. Παρακαλώ στείλτε αναφορά στην <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">κοινότητα ownCloud</a>.", "The update was successful. Redirecting you to ownCloud now." => "Η ενημέρωση ήταν επιτυχής. Μετάβαση στο ownCloud.", "Use the following link to reset your password: {link}" => "Χρησιμοποιήστε τον ακόλουθο σύνδεσμο για να επανεκδόσετε τον κωδικό: {link}", @@ -104,7 +105,6 @@ $TRANSLATIONS = array( "Help" => "Βοήθεια", "Access forbidden" => "Δεν επιτρέπεται η πρόσβαση", "Cloud not found" => "Δεν βρέθηκε νέφος", -"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Γεια σας,\n\nσας ενημερώνουμε ότι ο %s διαμοιράστηκε μαζί σας το %s.\nΔείτε το: %s\n\nΓεια χαρά!", "Edit categories" => "Επεξεργασία κατηγοριών", "Add" => "Προσθήκη", "Security Warning" => "Προειδοποίηση Ασφαλείας", @@ -134,7 +134,6 @@ $TRANSLATIONS = array( "remember" => "απομνημόνευση", "Log in" => "Είσοδος", "Alternative Logins" => "Εναλλακτικές Συνδέσεις", -"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Γεια σας,<br><br>σας ενημερώνουμε ότι ο %s διαμοιράστηκε μαζί σας το »%s«.<br><a href=\"%s\">Δείτε το!</a><br><br>Γεια χαρά!", "Updating ownCloud to version %s, this may take a while." => "Ενημερώνοντας το ownCloud στην έκδοση %s,μπορεί να πάρει λίγο χρόνο." ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/core/l10n/en_GB.php b/core/l10n/en_GB.php index bb26f1469dd..c69cf59f384 100644 --- a/core/l10n/en_GB.php +++ b/core/l10n/en_GB.php @@ -103,6 +103,7 @@ $TRANSLATIONS = array( "Error setting expiration date" => "Error setting expiration date", "Sending ..." => "Sending ...", "Email sent" => "Email sent", +"Warning" => "Warning", "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>.", "The update was successful. Redirecting you to ownCloud now." => "The update was successful. Redirecting you to ownCloud now.", "%s password reset" => "%s password reset", @@ -125,7 +126,6 @@ $TRANSLATIONS = array( "Help" => "Help", "Access forbidden" => "Access denied", "Cloud not found" => "Cloud not found", -"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!", "Edit categories" => "Edit categories", "Add" => "Add", "Security Warning" => "Security Warning", @@ -155,7 +155,6 @@ $TRANSLATIONS = array( "remember" => "remember", "Log in" => "Log in", "Alternative Logins" => "Alternative Logins", -"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Hey there,<br><br>just letting you know that %s shared \"%s\" with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!", "Updating ownCloud to version %s, this may take a while." => "Updating ownCloud to version %s, this may take a while." ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/core/l10n/eo.php b/core/l10n/eo.php index 712f97538f3..2b416db4707 100644 --- a/core/l10n/eo.php +++ b/core/l10n/eo.php @@ -82,6 +82,7 @@ $TRANSLATIONS = array( "Error setting expiration date" => "Eraro dum agordado de limdato", "Sending ..." => "Sendante...", "Email sent" => "La retpoŝtaĵo sendiĝis", +"Warning" => "Averto", "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "La ĝisdatigo estis malsukcese. Bonvolu raporti tiun problemon al la <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownClouda komunumo</a>.", "The update was successful. Redirecting you to ownCloud now." => "La ĝisdatigo estis sukcesa. Alidirektante nun al ownCloud.", "Use the following link to reset your password: {link}" => "Uzu la jenan ligilon por restarigi vian pasvorton: {link}", @@ -101,7 +102,6 @@ $TRANSLATIONS = array( "Help" => "Helpo", "Access forbidden" => "Aliro estas malpermesata", "Cloud not found" => "La nubo ne estas trovita", -"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Saluton:\n\nNi nur sciigas vin, ke %s kunhavigis %s kun vi.\nVidu ĝin: %s\n\nĜis!", "Edit categories" => "Redakti kategoriojn", "Add" => "Aldoni", "Security Warning" => "Sekureca averto", @@ -127,7 +127,6 @@ $TRANSLATIONS = array( "remember" => "memori", "Log in" => "Ensaluti", "Alternative Logins" => "Alternativaj ensalutoj", -"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Saluton:<br /><br />Ni nur sciigas vin, ke %s kunhavigis “%s” kun vi.<br /><a href=\"%s\">Vidu ĝin</a><br /><br />Ĝis!", "Updating ownCloud to version %s, this may take a while." => "ownCloud ĝisdatiĝas al eldono %s, tio ĉi povas daŭri je iom da tempo." ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/core/l10n/es.php b/core/l10n/es.php index 3aa0c3f732c..29eea2dbf49 100644 --- a/core/l10n/es.php +++ b/core/l10n/es.php @@ -16,6 +16,11 @@ $TRANSLATIONS = array( "Error adding %s to favorites." => "Error añadiendo %s a favoritos.", "No categories selected for deletion." => "No hay categorías seleccionadas para borrar.", "Error removing %s from favorites." => "Error eliminando %s de los favoritos.", +"No image or file provided" => "No se especificó ningún archivo o imagen", +"Unknown filetype" => "Tipo de archivo desconocido", +"Invalid image" => "Imagen inválida", +"No temporary profile picture available, try again" => "No hay disponible una imagen temporal de perfil, pruebe de nuevo", +"No crop data provided" => "No se proporcionó datos del recorte", "Sunday" => "Domingo", "Monday" => "Lunes", "Tuesday" => "Martes", @@ -48,11 +53,20 @@ $TRANSLATIONS = array( "last year" => "el año pasado", "years ago" => "años antes", "Choose" => "Seleccionar", +"Error loading file picker template: {error}" => "Error cargando plantilla del seleccionador de archivos: {error}", "Yes" => "Sí", "No" => "No", "Ok" => "Aceptar", -"_{count} file conflict_::_{count} file conflicts_" => array("",""), +"Error loading message template: {error}" => "Error cargando plantilla del mensaje: {error}", +"_{count} file conflict_::_{count} file conflicts_" => array("{count} conflicto de archivo","{count} conflictos de archivo"), +"One file conflict" => "On conflicto de archivo", +"Which files do you want to keep?" => "¿Que archivos deseas mantener?", +"If you select both versions, the copied file will have a number added to its name." => "Si seleccionas ambas versiones, el archivo copiado tendrá añadido un número en su nombre.", "Cancel" => "Cancelar", +"Continue" => "Continuar", +"(all selected)" => "(seleccionados todos)", +"({count} selected)" => "({count} seleccionados)", +"Error loading file exists template" => "Error cargando plantilla de archivo existente", "The object type is not specified." => "El tipo de objeto no está especificado.", "Error" => "Error", "The app name is not specified." => "El nombre de la aplicación no está especificado.", @@ -89,6 +103,7 @@ $TRANSLATIONS = array( "Error setting expiration date" => "Error estableciendo fecha de caducidad", "Sending ..." => "Enviando...", "Email sent" => "Correo electrónico enviado", +"Warning" => "Precaución", "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "La actualización ha fracasado. Por favor, informe de este problema a la <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">Comunidad de ownCloud</a>.", "The update was successful. Redirecting you to ownCloud now." => "La actualización se ha realizado con éxito. Redireccionando a ownCloud ahora.", "%s password reset" => "%s restablecer contraseña", @@ -111,7 +126,6 @@ $TRANSLATIONS = array( "Help" => "Ayuda", "Access forbidden" => "Acceso denegado", "Cloud not found" => "No se encuentra la nube", -"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Hey,\n\nsólo te hago saber que %s ha compartido %s contigo.\nEcha un ojo en: %s\n\n¡Un saludo!", "Edit categories" => "Editar categorías", "Add" => "Agregar", "Security Warning" => "Advertencia de seguridad", @@ -141,7 +155,6 @@ $TRANSLATIONS = array( "remember" => "recordar", "Log in" => "Entrar", "Alternative Logins" => "Inicios de sesión alternativos", -"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Hey,<br><br>sólo te hago saber que %s ha compartido %s contigo.<br><a href=\"%s\">¡Echa un ojo!</a><br><br>¡Un saludo!", "Updating ownCloud to version %s, this may take a while." => "Actualizando ownCloud a la versión %s, esto puede demorar un tiempo." ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/core/l10n/es_AR.php b/core/l10n/es_AR.php index 6dce47f760d..7d7e29c8ffb 100644 --- a/core/l10n/es_AR.php +++ b/core/l10n/es_AR.php @@ -89,6 +89,7 @@ $TRANSLATIONS = array( "Error setting expiration date" => "Error al asignar fecha de vencimiento", "Sending ..." => "Mandando...", "Email sent" => "e-mail mandado", +"Warning" => "Atención", "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "La actualización no pudo ser completada. Por favor, reportá el inconveniente a la comunidad <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud</a>.", "The update was successful. Redirecting you to ownCloud now." => "La actualización fue exitosa. Estás siendo redirigido a ownCloud.", "%s password reset" => "%s restablecer contraseña", @@ -111,7 +112,6 @@ $TRANSLATIONS = array( "Help" => "Ayuda", "Access forbidden" => "Acceso prohibido", "Cloud not found" => "No se encontró ownCloud", -"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Hola,\n\nSimplemente te informo que %s compartió %s con vos.\nMiralo acá: %s\n\n¡Chau!", "Edit categories" => "Editar categorías", "Add" => "Agregar", "Security Warning" => "Advertencia de seguridad", @@ -141,7 +141,6 @@ $TRANSLATIONS = array( "remember" => "recordame", "Log in" => "Iniciar sesión", "Alternative Logins" => "Nombre alternativos de usuarios", -"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Hola,<br><br>Simplemente te informo que %s compartió %s con vos.<br><a href=\"%s\">Miralo acá:</a><br><br>¡Chau!", "Updating ownCloud to version %s, this may take a while." => "Actualizando ownCloud a la versión %s, puede demorar un rato." ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/core/l10n/et_EE.php b/core/l10n/et_EE.php index 17ce89543a6..7b26850166d 100644 --- a/core/l10n/et_EE.php +++ b/core/l10n/et_EE.php @@ -1,6 +1,7 @@ <?php $TRANSLATIONS = array( "%s shared »%s« with you" => "%s jagas sinuga »%s«", +"Couldn't send mail to following users: %s " => "Kirja saatmine järgnevatele kasutajatele ebaõnnestus: %s ", "group" => "grupp", "Turned on maintenance mode" => "Haldusreziimis", "Turned off maintenance mode" => "Haldusreziim lõpetatud", @@ -58,8 +59,13 @@ $TRANSLATIONS = array( "No" => "Ei", "Ok" => "Ok", "Error loading message template: {error}" => "Viga sõnumi malli laadimisel: {error}", -"_{count} file conflict_::_{count} file conflicts_" => array("",""), +"_{count} file conflict_::_{count} file conflicts_" => array("{count} failikonflikt","{count} failikonflikti"), +"One file conflict" => "Üks failikonflikt", +"Which files do you want to keep?" => "Milliseid faile sa soovid alles hoida?", "Cancel" => "Loobu", +"Continue" => "Jätka", +"(all selected)" => "(kõik valitud)", +"({count} selected)" => "({count} valitud)", "The object type is not specified." => "Objekti tüüp pole määratletud.", "Error" => "Viga", "The app name is not specified." => "Rakenduse nimi ole määratletud.", @@ -85,6 +91,7 @@ $TRANSLATIONS = array( "Resharing is not allowed" => "Edasijagamine pole lubatud", "Shared in {item} with {user}" => "Jagatud {item} kasutajaga {user}", "Unshare" => "Lõpeta jagamine", +"notify user by email" => "teavita kasutajaid e-postiga", "can edit" => "saab muuta", "access control" => "ligipääsukontroll", "create" => "loo", @@ -96,6 +103,7 @@ $TRANSLATIONS = array( "Error setting expiration date" => "Viga aegumise kuupäeva määramisel", "Sending ..." => "Saatmine ...", "Email sent" => "E-kiri on saadetud", +"Warning" => "Hoiatus", "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Uuendus ebaõnnestus. Palun teavita probleemidest <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud kogukonda</a>.", "The update was successful. Redirecting you to ownCloud now." => "Uuendus oli edukas. Kohe suunatakse Sind ownCloudi.", "%s password reset" => "%s parooli lähtestus", @@ -118,7 +126,9 @@ $TRANSLATIONS = array( "Help" => "Abiinfo", "Access forbidden" => "Ligipääs on keelatud", "Cloud not found" => "Pilve ei leitud", -"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Hei,\n\nlihtsalt annan sulle teada, et %s jagas sinuga %s.\nVaata seda siin: %s\n\nTervitused!", +"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Hei,\n\nlihtsalt annan sulle teada, et %s jagas sulle välja %s.\nVaata seda: %s\n\n", +"The share will expire on %s.\n\n" => "Jagamine aegub %s.\n\n", +"Cheers!" => "Terekest!", "Edit categories" => "Muuda kategooriaid", "Add" => "Lisa", "Security Warning" => "Turvahoiatus", @@ -139,6 +149,7 @@ $TRANSLATIONS = array( "Database tablespace" => "Andmebaasi tabeliruum", "Database host" => "Andmebaasi host", "Finish setup" => "Lõpeta seadistamine", +"Finishing …" => "Lõpetamine ...", "%s is available. Get more information on how to update." => "%s on saadaval. Vaata lähemalt kuidas uuendada.", "Log out" => "Logi välja", "Automatic logon rejected!" => "Automaatne sisselogimine lükati tagasi!", @@ -148,7 +159,8 @@ $TRANSLATIONS = array( "remember" => "pea meeles", "Log in" => "Logi sisse", "Alternative Logins" => "Alternatiivsed sisselogimisviisid", -"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Hei,<br><br>lihtsalt annan sulle teada, et %s jagas sinuga »%s«.<br><a href=\"%s\">Vaata seda!</a><br><br>Tervitades!", +"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>" => "Hei,<br><br>lihtsalt annan sulle teada, et %s jagas sulle välja »%s«.<br><a href=\"%s\">Vaata seda!</a><br><br>", +"The share will expire on %s.<br><br>" => "Jagamine aegub %s.<br><br>", "Updating ownCloud to version %s, this may take a while." => "ownCloudi uuendamine versioonile %s. See võib veidi aega võtta." ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/core/l10n/eu.php b/core/l10n/eu.php index 1e6594adf6f..2bf1b060790 100644 --- a/core/l10n/eu.php +++ b/core/l10n/eu.php @@ -83,6 +83,7 @@ $TRANSLATIONS = array( "Error setting expiration date" => "Errore bat egon da muga data ezartzean", "Sending ..." => "Bidaltzen ...", "Email sent" => "Eposta bidalia", +"Warning" => "Abisua", "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Eguneraketa ez da ongi egin. Mesedez egin arazoaren txosten bat <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud komunitatearentzako</a>.", "The update was successful. Redirecting you to ownCloud now." => "Eguneraketa ongi egin da. Orain zure ownClouderea berbideratua izango zara.", "%s password reset" => "%s pasahitza berrezarri", @@ -105,7 +106,6 @@ $TRANSLATIONS = array( "Help" => "Laguntza", "Access forbidden" => "Sarrera debekatuta", "Cloud not found" => "Ez da hodeia aurkitu", -"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Kaixo\n\n%s-ek %s zurekin partekatu duela jakin dezazun.\nIkusi ezazu: %s\n\nOngi jarraitu!", "Edit categories" => "Editatu kategoriak", "Add" => "Gehitu", "Security Warning" => "Segurtasun abisua", @@ -135,7 +135,6 @@ $TRANSLATIONS = array( "remember" => "gogoratu", "Log in" => "Hasi saioa", "Alternative Logins" => "Beste erabiltzaile izenak", -"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Kaixo<br><br>%s-ek %s zurekin partekatu duela jakin dezazun.<br><a href=\"%s\">\nIkusi ezazu</a><br><br>Ongi jarraitu!", "Updating ownCloud to version %s, this may take a while." => "ownCloud %s bertsiora eguneratzen, denbora har dezake." ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/core/l10n/fa.php b/core/l10n/fa.php index 930a5b0dcbc..e173d628f5f 100644 --- a/core/l10n/fa.php +++ b/core/l10n/fa.php @@ -83,6 +83,7 @@ $TRANSLATIONS = array( "Error setting expiration date" => "خطا در تنظیم تاریخ انقضا", "Sending ..." => "درحال ارسال ...", "Email sent" => "ایمیل ارسال شد", +"Warning" => "اخطار", "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "به روز رسانی ناموفق بود. لطفا این خطا را به <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">جامعه ی OwnCloud</a> گزارش نمایید.", "The update was successful. Redirecting you to ownCloud now." => "به روزرسانی موفقیت آمیز بود. در حال انتقال شما به OwnCloud.", "Use the following link to reset your password: {link}" => "از لینک زیر جهت دوباره سازی پسورد استفاده کنید :\n{link}", @@ -104,7 +105,6 @@ $TRANSLATIONS = array( "Help" => "راهنما", "Access forbidden" => "اجازه دسترسی به مناطق ممنوعه را ندارید", "Cloud not found" => "پیدا نشد", -"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "اینجا,⏎\n فقط به شما اجازه میدهد که بدانید %s به اشتراک گذاشته شده %s توسط شما.⏎\nمشاهده آن : %s⏎\n⏎\nبه سلامتی!", "Edit categories" => "ویرایش گروه", "Add" => "افزودن", "Security Warning" => "اخطار امنیتی", @@ -132,7 +132,6 @@ $TRANSLATIONS = array( "remember" => "بیاد آوری", "Log in" => "ورود", "Alternative Logins" => "ورود متناوب", -"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "اینجا<br><br> فقط به شما اجازه میدهد که بدانید %s به اشتراک گذاشته شده»%s« توسط شما.<br><a href=\"%s\"> مشاهده آن!</a><br><br> به سلامتی!", "Updating ownCloud to version %s, this may take a while." => "به روز رسانی OwnCloud به نسخه ی %s، این عملیات ممکن است زمان بر باشد." ); $PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/core/l10n/fi_FI.php b/core/l10n/fi_FI.php index cf215159c39..c6c9f09e1dd 100644 --- a/core/l10n/fi_FI.php +++ b/core/l10n/fi_FI.php @@ -1,6 +1,7 @@ <?php $TRANSLATIONS = array( "%s shared »%s« with you" => "%s jakoi kohteen »%s« kanssasi", +"Couldn't send mail to following users: %s " => "Sähköpostin lähetys seuraaville käyttäjille epäonnistui: %s", "group" => "ryhmä", "Turned on maintenance mode" => "Siirrytty ylläpitotilaan", "Turned off maintenance mode" => "Ylläpitotila laitettu pois päältä", @@ -14,6 +15,7 @@ $TRANSLATIONS = array( "Error adding %s to favorites." => "Virhe lisätessä kohdetta %s suosikkeihin.", "No categories selected for deletion." => "Luokkia ei valittu poistettavaksi.", "Error removing %s from favorites." => "Virhe poistaessa kohdetta %s suosikeista.", +"No image or file provided" => "Kuvaa tai tiedostoa ei määritelty", "Unknown filetype" => "Tuntematon tiedostotyyppi", "Invalid image" => "Virhellinen kuva", "No temporary profile picture available, try again" => "Väliaikaista profiilikuvaa ei ole käytettävissä, yritä uudelleen", @@ -53,6 +55,8 @@ $TRANSLATIONS = array( "No" => "Ei", "Ok" => "Ok", "_{count} file conflict_::_{count} file conflicts_" => array("",""), +"Which files do you want to keep?" => "Mitkä tiedostot haluat säilyttää?", +"If you select both versions, the copied file will have a number added to its name." => "Jos valitset kummatkin versiot, kopioidun tiedoston nimeen lisätään numero.", "Cancel" => "Peru", "Continue" => "Jatka", "(all selected)" => "(kaikki valittu)", @@ -81,6 +85,7 @@ $TRANSLATIONS = array( "Resharing is not allowed" => "Jakaminen uudelleen ei ole salittu", "Shared in {item} with {user}" => "{item} on jaettu {user} kanssa", "Unshare" => "Peru jakaminen", +"notify user by email" => "ilmoita käyttäjälle sähköpostitse", "can edit" => "voi muokata", "access control" => "Pääsyn hallinta", "create" => "luo", @@ -92,6 +97,7 @@ $TRANSLATIONS = array( "Error setting expiration date" => "Virhe päättymispäivää asettaessa", "Sending ..." => "Lähetetään...", "Email sent" => "Sähköposti lähetetty", +"Warning" => "Varoitus", "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Päivitys epäonnistui. Ilmoita ongelmasta <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud-yhteisölle</a>.", "The update was successful. Redirecting you to ownCloud now." => "Päivitys onnistui. Selain ohjautuu nyt ownCloudiisi.", "%s password reset" => "%s salasanan nollaus", @@ -113,7 +119,8 @@ $TRANSLATIONS = array( "Help" => "Ohje", "Access forbidden" => "Pääsy estetty", "Cloud not found" => "Pilveä ei löydy", -"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Hei!\n\n%s jakoi kohteen %s kanssasi.\nKatso se tästä: %s\n\nNäkemiin!", +"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Hei sinä!\n\n%s jakoi kohteen %s kanssasi.\nTutustu siihen: %s\n\n", +"The share will expire on %s.\n\n" => "Jakaminen päättyy %s.\n\n", "Edit categories" => "Muokkaa luokkia", "Add" => "Lisää", "Security Warning" => "Turvallisuusvaroitus", @@ -133,6 +140,7 @@ $TRANSLATIONS = array( "Database tablespace" => "Tietokannan taulukkotila", "Database host" => "Tietokantapalvelin", "Finish setup" => "Viimeistele asennus", +"Finishing …" => "Valmistellaan…", "%s is available. Get more information on how to update." => "%s on saatavilla. Lue lisätietoja, miten päivitys asennetaan.", "Log out" => "Kirjaudu ulos", "Automatic logon rejected!" => "Automaattinen sisäänkirjautuminen hylättiin!", @@ -142,7 +150,8 @@ $TRANSLATIONS = array( "remember" => "muista", "Log in" => "Kirjaudu sisään", "Alternative Logins" => "Vaihtoehtoiset kirjautumiset", -"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Hei!<br><br>%s jakoi kohteen »%s« kanssasi.<br><a href=\"%s\">Katso se tästä!</a><br><br>Näkemiin!", +"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>" => "Hei sinä!<br><br>%s jakoi kohteen »%s« kanssasi.<br><a href=\"%s\">Tutustu siihen!</a><br><br>", +"The share will expire on %s.<br><br>" => "Jakaminen päättyy %s.<br><br>", "Updating ownCloud to version %s, this may take a while." => "Päivitetään ownCloud versioon %s, tämä saattaa kestää hetken." ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/core/l10n/fr.php b/core/l10n/fr.php index e7cb75e53f0..83460f43343 100644 --- a/core/l10n/fr.php +++ b/core/l10n/fr.php @@ -103,6 +103,7 @@ $TRANSLATIONS = array( "Error setting expiration date" => "Erreur lors de la spécification de la date d'expiration", "Sending ..." => "En cours d'envoi ...", "Email sent" => "Email envoyé", +"Warning" => "Attention", "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "La mise à jour a échoué. Veuillez signaler ce problème à la <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">communauté ownCloud</a>.", "The update was successful. Redirecting you to ownCloud now." => "La mise à jour a réussi. Vous êtes redirigé maintenant vers ownCloud.", "%s password reset" => "Réinitialisation de votre mot de passe %s", @@ -125,7 +126,6 @@ $TRANSLATIONS = array( "Help" => "Aide", "Access forbidden" => "Accès interdit", "Cloud not found" => "Introuvable", -"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Salut,\n\nje veux juste vous signaler %s partagé %s avec vous.\nVoyez-le: %s\n\nBonne continuation!", "Edit categories" => "Editer les catégories", "Add" => "Ajouter", "Security Warning" => "Avertissement de sécurité", @@ -155,7 +155,6 @@ $TRANSLATIONS = array( "remember" => "se souvenir de moi", "Log in" => "Connexion", "Alternative Logins" => "Logins alternatifs", -"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Salut,<br><br>je veux juste vous signaler %s partagé »%s« avec vous.<br><a href=\"%s\">Voyez-le!</a><br><br>Bonne continuation!", "Updating ownCloud to version %s, this may take a while." => "Mise à jour en cours d'ownCloud vers la version %s, cela peut prendre du temps." ); $PLURAL_FORMS = "nplurals=2; plural=(n > 1);"; diff --git a/core/l10n/gl.php b/core/l10n/gl.php index e3be94537e5..3325a894f48 100644 --- a/core/l10n/gl.php +++ b/core/l10n/gl.php @@ -1,6 +1,7 @@ <?php $TRANSLATIONS = array( "%s shared »%s« with you" => "%s compartiu «%s» con vostede", +"Couldn't send mail to following users: %s " => "Non é posíbel enviar correo aos usuarios seguintes: %s", "group" => "grupo", "Turned on maintenance mode" => "Modo de mantemento activado", "Turned off maintenance mode" => "Modo de mantemento desactivado", @@ -92,6 +93,7 @@ $TRANSLATIONS = array( "Resharing is not allowed" => "Non se permite volver a compartir", "Shared in {item} with {user}" => "Compartido en {item} con {user}", "Unshare" => "Deixar de compartir", +"notify user by email" => "notificar ao usuario por correo", "can edit" => "pode editar", "access control" => "control de acceso", "create" => "crear", @@ -103,6 +105,7 @@ $TRANSLATIONS = array( "Error setting expiration date" => "Produciuse un erro ao definir a data de caducidade", "Sending ..." => "Enviando...", "Email sent" => "Correo enviado", +"Warning" => "Aviso", "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "A actualización non foi satisfactoria, informe deste problema á <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">comunidade de ownCloud</a>.", "The update was successful. Redirecting you to ownCloud now." => "A actualización realizouse correctamente. Redirixíndoo agora á ownCloud.", "%s password reset" => "Restabelecer o contrasinal %s", @@ -125,7 +128,9 @@ $TRANSLATIONS = array( "Help" => "Axuda", "Access forbidden" => "Acceso denegado", "Cloud not found" => "Nube non atopada", -"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Ola,\n\nsó facerlle saber que %s compartiu %s con vostede.\nVéxao en: %s\n\nSaúdos!", +"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Ola,\n\nsó facerlle saber que %s compartiu %s con vostede.\nVéxao en: %s\n\n", +"The share will expire on %s.\n\n" => "Esta compartición caduca o %s.\n\n", +"Cheers!" => "Saúdos!", "Edit categories" => "Editar as categorías", "Add" => "Engadir", "Security Warning" => "Aviso de seguranza", @@ -146,6 +151,7 @@ $TRANSLATIONS = array( "Database tablespace" => "Táboa de espazos da base de datos", "Database host" => "Servidor da base de datos", "Finish setup" => "Rematar a configuración", +"Finishing …" => "Rematado ...", "%s is available. Get more information on how to update." => "%s está dispoñíbel. Obteña máis información sobre como actualizar.", "Log out" => "Desconectar", "Automatic logon rejected!" => "Rexeitouse a entrada automática", @@ -155,7 +161,8 @@ $TRANSLATIONS = array( "remember" => "lembrar", "Log in" => "Conectar", "Alternative Logins" => "Accesos alternativos", -"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Ola,<br><br>só facerlle saber que %s compartiu «%s» con vostede.<br><a href=\"%s\">Véxao!</a><br><br>Saúdos!", +"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>" => "Ola,<br><br>Só facerlle saber que %s compartiu «%s» con vostede.<br><a href=\"%s\">Véxao!</a><br><br>", +"The share will expire on %s.<br><br>" => "Esta compartición caduca o %s.<br><br>", "Updating ownCloud to version %s, this may take a while." => "Actualizando ownCloud a versión %s, esto pode levar un anaco." ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/core/l10n/he.php b/core/l10n/he.php index 704755da07f..30ef27664ea 100644 --- a/core/l10n/he.php +++ b/core/l10n/he.php @@ -82,6 +82,7 @@ $TRANSLATIONS = array( "Error setting expiration date" => "אירעה שגיאה בעת הגדרת תאריך התפוגה", "Sending ..." => "מתבצעת שליחה ...", "Email sent" => "הודעת הדוא״ל נשלחה", +"Warning" => "אזהרה", "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "תהליך העדכון לא הושלם בהצלחה. נא דווח את הבעיה ב<a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">קהילת ownCloud</a>.", "The update was successful. Redirecting you to ownCloud now." => "תהליך העדכון הסתיים בהצלחה. עכשיו מנתב אותך אל ownCloud.", "Use the following link to reset your password: {link}" => "יש להשתמש בקישור הבא כדי לאפס את הססמה שלך: {link}", @@ -102,7 +103,6 @@ $TRANSLATIONS = array( "Help" => "עזרה", "Access forbidden" => "הגישה נחסמה", "Cloud not found" => "ענן לא נמצא", -"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "שלום,\n\nרצינו לעדכן כי %s שיתף/שיתפה איתך את »%s«.\n\nלצפיה: %s\n\nיום טוב!", "Edit categories" => "ערוך קטגוריות", "Add" => "הוספה", "Security Warning" => "אזהרת אבטחה", @@ -131,7 +131,6 @@ $TRANSLATIONS = array( "remember" => "שמירת הססמה", "Log in" => "כניסה", "Alternative Logins" => "כניסות אלטרנטיביות", -"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "שלום,<br><br>רצינו לעדכן כי %s שיתף/שיתפה איתך את »%s«.<br><a href=\"%s\">לצפיה</a><br><br>יום טוב!", "Updating ownCloud to version %s, this may take a while." => "מעדכן את ownCloud אל גרסא %s, זה עלול לקחת זמן מה." ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/core/l10n/hi.php b/core/l10n/hi.php index e783ec88d17..ec9381c787d 100644 --- a/core/l10n/hi.php +++ b/core/l10n/hi.php @@ -36,6 +36,7 @@ $TRANSLATIONS = array( "No people found" => "कोई व्यक्ति नहीं मिले ", "Sending ..." => "भेजा जा रहा है", "Email sent" => "ईमेल भेज दिया गया है ", +"Warning" => "चेतावनी ", "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/hu_HU.php b/core/l10n/hu_HU.php index 107a5f04c05..2cc473a9c01 100644 --- a/core/l10n/hu_HU.php +++ b/core/l10n/hu_HU.php @@ -103,6 +103,7 @@ $TRANSLATIONS = array( "Error setting expiration date" => "Nem sikerült a lejárati időt beállítani", "Sending ..." => "Küldés ...", "Email sent" => "Az emailt elküldtük", +"Warning" => "Figyelmeztetés", "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "A frissítés nem sikerült. Kérem értesítse erről a problémáról az <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud közösséget</a>.", "The update was successful. Redirecting you to ownCloud now." => "A frissítés sikeres volt. Visszairányítjuk az ownCloud szolgáltatáshoz.", "%s password reset" => "%s jelszó visszaállítás", @@ -125,7 +126,6 @@ $TRANSLATIONS = array( "Help" => "Súgó", "Access forbidden" => "A hozzáférés nem engedélyezett", "Cloud not found" => "A felhő nem található", -"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Üdv!\n\nÚj hír: %s megosztotta Önnel ezt: %s.\nItt nézhető meg: %s\n\nMinden jót!", "Edit categories" => "Kategóriák szerkesztése", "Add" => "Hozzáadás", "Security Warning" => "Biztonsági figyelmeztetés", @@ -155,7 +155,6 @@ $TRANSLATIONS = array( "remember" => "emlékezzen", "Log in" => "Bejelentkezés", "Alternative Logins" => "Alternatív bejelentkezés", -"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Üdv!<br><br>Új hír: %s megosztotta Önnel ezt: »%s«.<br><a href=\"%s\">Itt nézhető meg!</a><br><br>Minden jót!", "Updating ownCloud to version %s, this may take a while." => "Owncloud frissítés a %s verzióra folyamatban. Kis türelmet." ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/core/l10n/id.php b/core/l10n/id.php index 69993d44055..2b987eecd84 100644 --- a/core/l10n/id.php +++ b/core/l10n/id.php @@ -81,6 +81,7 @@ $TRANSLATIONS = array( "Error setting expiration date" => "Galat ketika menyetel tanggal kedaluwarsa", "Sending ..." => "Mengirim ...", "Email sent" => "Email terkirim", +"Warning" => "Peringatan", "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Pembaruan gagal. Silakan laporkan masalah ini ke <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">komunitas ownCloud</a>.", "The update was successful. Redirecting you to ownCloud now." => "Pembaruan sukses. Anda akan diarahkan ulang ke ownCloud.", "Use the following link to reset your password: {link}" => "Gunakan tautan berikut untuk menyetel ulang sandi Anda: {link}", diff --git a/core/l10n/is.php b/core/l10n/is.php index 729aaa4c9e6..f72b7290b8f 100644 --- a/core/l10n/is.php +++ b/core/l10n/is.php @@ -79,6 +79,7 @@ $TRANSLATIONS = array( "Error setting expiration date" => "Villa við að setja gildistíma", "Sending ..." => "Sendi ...", "Email sent" => "Tölvupóstur sendur", +"Warning" => "Aðvörun", "The update was successful. Redirecting you to ownCloud now." => "Uppfærslan heppnaðist. Beini þér til ownCloud nú.", "Use the following link to reset your password: {link}" => "Notað eftirfarandi veftengil til að endursetja lykilorðið þitt: {link}", "You will receive a link to reset your password via Email." => "Þú munt fá veftengil í tölvupósti til að endursetja lykilorðið.", diff --git a/core/l10n/it.php b/core/l10n/it.php index bd2fad79c87..0b2d3768b0c 100644 --- a/core/l10n/it.php +++ b/core/l10n/it.php @@ -1,6 +1,7 @@ <?php $TRANSLATIONS = array( "%s shared »%s« with you" => "%s ha condiviso «%s» con te", +"Couldn't send mail to following users: %s " => "Impossibile inviare email ai seguenti utenti: %s", "group" => "gruppo", "Turned on maintenance mode" => "Modalità di manutenzione attivata", "Turned off maintenance mode" => "Modalità di manutenzione disattivata", @@ -92,6 +93,7 @@ $TRANSLATIONS = array( "Resharing is not allowed" => "La ri-condivisione non è consentita", "Shared in {item} with {user}" => "Condiviso in {item} con {user}", "Unshare" => "Rimuovi condivisione", +"notify user by email" => "notifica l'utente tramite email", "can edit" => "può modificare", "access control" => "controllo d'accesso", "create" => "creare", @@ -103,6 +105,7 @@ $TRANSLATIONS = array( "Error setting expiration date" => "Errore durante l'impostazione della data di scadenza", "Sending ..." => "Invio in corso...", "Email sent" => "Messaggio inviato", +"Warning" => "Avviso", "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "L'aggiornamento non è riuscito. Segnala il problema alla <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">comunità di ownCloud</a>.", "The update was successful. Redirecting you to ownCloud now." => "L'aggiornamento è stato effettuato correttamente. Stai per essere reindirizzato a ownCloud.", "%s password reset" => "Ripristino password di %s", @@ -125,7 +128,9 @@ $TRANSLATIONS = array( "Help" => "Aiuto", "Access forbidden" => "Accesso negato", "Cloud not found" => "Nuvola non trovata", -"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Ehilà,\n\nvolevo solamente farti sapere che %s ha condiviso %s con te.\nGuarda: %s\n\nSaluti!", +"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Ciao,\n\nvolevo informarti che %s ha condiviso %s con te.\nVedi: %s\n\n", +"The share will expire on %s.\n\n" => "La condivisione scadrà il %s.\n\n", +"Cheers!" => "Saluti!", "Edit categories" => "Modifica categorie", "Add" => "Aggiungi", "Security Warning" => "Avviso di sicurezza", @@ -146,6 +151,7 @@ $TRANSLATIONS = array( "Database tablespace" => "Spazio delle tabelle del database", "Database host" => "Host del database", "Finish setup" => "Termina la configurazione", +"Finishing …" => "Completamento...", "%s is available. Get more information on how to update." => "%s è disponibile. Ottieni ulteriori informazioni sull'aggiornamento.", "Log out" => "Esci", "Automatic logon rejected!" => "Accesso automatico rifiutato.", @@ -155,7 +161,8 @@ $TRANSLATIONS = array( "remember" => "ricorda", "Log in" => "Accedi", "Alternative Logins" => "Accessi alternativi", -"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Ehilà,<br><br>volevo solamente farti sapere che %s ha condiviso «%s» con te.<br><a href=\"%s\">Guarda!</a><br><br>Saluti!", +"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>" => "Ciao,<br><br>volevo informarti che %s ha condiviso %s con te.<br><a href=\"%s\">Vedi!</a><br><br>", +"The share will expire on %s.<br><br>" => "La condivisione scadrà il %s.<br><br>", "Updating ownCloud to version %s, this may take a while." => "Aggiornamento di ownCloud alla versione %s in corso, ciò potrebbe richiedere del tempo." ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/core/l10n/ja_JP.php b/core/l10n/ja_JP.php index 110e5b21201..bf8313f7176 100644 --- a/core/l10n/ja_JP.php +++ b/core/l10n/ja_JP.php @@ -103,6 +103,7 @@ $TRANSLATIONS = array( "Error setting expiration date" => "有効期限の設定でエラー発生", "Sending ..." => "送信中...", "Email sent" => "メールを送信しました", +"Warning" => "警告", "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "更新に成功しました。この問題を <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a> にレポートしてください。", "The update was successful. Redirecting you to ownCloud now." => "更新に成功しました。今すぐownCloudにリダイレクトします。", "%s password reset" => "%s パスワードリセット", @@ -125,7 +126,6 @@ $TRANSLATIONS = array( "Help" => "ヘルプ", "Access forbidden" => "アクセスが禁止されています", "Cloud not found" => "見つかりません", -"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "こんにちは、\n\n%s があなたと %s を共有したことをお知らせします。\nそれを表示: %s\n\nそれでは。", "Edit categories" => "カテゴリを編集", "Add" => "追加", "Security Warning" => "セキュリティ警告", @@ -155,7 +155,6 @@ $TRANSLATIONS = array( "remember" => "パスワードを記憶する", "Log in" => "ログイン", "Alternative Logins" => "代替ログイン", -"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "こんにちは、<br><br>%sがあなたと »%s« を共有したことをお知らせします。<br><a href=\"%s\">それを表示</a><br><br>それでは。", "Updating ownCloud to version %s, this may take a while." => "ownCloud をバージョン %s に更新しています、しばらくお待ち下さい。" ); $PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/core/l10n/ka_GE.php b/core/l10n/ka_GE.php index e051f9ce1d2..a32960e1a23 100644 --- a/core/l10n/ka_GE.php +++ b/core/l10n/ka_GE.php @@ -81,6 +81,7 @@ $TRANSLATIONS = array( "Error setting expiration date" => "შეცდომა ვადის გასვლის მითითების დროს", "Sending ..." => "გაგზავნა ....", "Email sent" => "იმეილი გაიგზავნა", +"Warning" => "გაფრთხილება", "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "განახლება ვერ განხორციელდა. გთხოვთ შეგვატყობინოთ ამ პრობლემის შესახებ აქ: <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>.", "The update was successful. Redirecting you to ownCloud now." => "განახლება ვერ განხორციელდა. გადამისამართება თქვენს ownCloud–ზე.", "Use the following link to reset your password: {link}" => "გამოიყენე შემდეგი ლინკი პაროლის შესაცვლელად: {link}", diff --git a/core/l10n/ko.php b/core/l10n/ko.php index 947f5e9ee26..92c7b96f01c 100644 --- a/core/l10n/ko.php +++ b/core/l10n/ko.php @@ -82,6 +82,7 @@ $TRANSLATIONS = array( "Error setting expiration date" => "만료 날짜 설정 오류", "Sending ..." => "전송 중...", "Email sent" => "이메일 발송됨", +"Warning" => "경고", "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "업데이트가 실패하였습니다. 이 문제를 <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud 커뮤니티</a>에 보고해 주십시오.", "The update was successful. Redirecting you to ownCloud now." => "업데이트가 성공하였습니다. ownCloud로 돌아갑니다.", "Use the following link to reset your password: {link}" => "다음 링크를 사용하여 암호를 재설정할 수 있습니다: {link}", diff --git a/core/l10n/ku_IQ.php b/core/l10n/ku_IQ.php index 2feb6db2723..e11cf0b5a96 100644 --- a/core/l10n/ku_IQ.php +++ b/core/l10n/ku_IQ.php @@ -9,6 +9,7 @@ $TRANSLATIONS = array( "Error" => "ههڵه", "Share" => "هاوبەشی کردن", "Password" => "وشەی تێپەربو", +"Warning" => "ئاگاداری", "Username" => "ناوی بهکارهێنهر", "New password" => "وشەی نهێنی نوێ", "Reset password" => "دووباره كردنهوهی وشهی نهێنی", diff --git a/core/l10n/lb.php b/core/l10n/lb.php index 9e127d867c6..17e4345ad51 100644 --- a/core/l10n/lb.php +++ b/core/l10n/lb.php @@ -83,6 +83,7 @@ $TRANSLATIONS = array( "Error setting expiration date" => "Feeler beim Setze vum Verfallsdatum", "Sending ..." => "Gëtt geschéckt...", "Email sent" => "Email geschéckt", +"Warning" => "Warnung", "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Den Update war net erfollegräich. Mell dëse Problem w.e.gl der<a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud-Community</a>.", "The update was successful. Redirecting you to ownCloud now." => "Den Update war erfollegräich. Du gëss elo bei d'ownCloud ëmgeleet.", "Use the following link to reset your password: {link}" => "Benotz folgende Link fir däi Passwuert zréckzesetzen: {link}", @@ -104,7 +105,6 @@ $TRANSLATIONS = array( "Help" => "Hëllef", "Access forbidden" => "Zougrëff net erlaabt", "Cloud not found" => "Cloud net fonnt", -"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Hallo,\n\nech wëll just Bescheed soen dass den/d' %s, »%s« mat dir gedeelt huet.\nKucken: %s\n\nE schéine Bonjour!", "Edit categories" => "Kategorien editéieren", "Add" => "Dobäisetzen", "Security Warning" => "Sécherheets-Warnung", @@ -132,7 +132,6 @@ $TRANSLATIONS = array( "remember" => "verhalen", "Log in" => "Umellen", "Alternative Logins" => "Alternativ Umeldungen", -"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Hallo,<br><br>ech wëll just Bescheed soen dass den/d' %s, »%s« mat dir gedeelt huet.<br><a href=\"%s\">Kucken!</a><br><br>E schéine Bonjour!", "Updating ownCloud to version %s, this may take a while." => "ownCloud gëtt op d'Versioun %s aktualiséiert, dat kéint e Moment daueren." ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/core/l10n/lt_LT.php b/core/l10n/lt_LT.php index 610e7aeadeb..7d3ce9bec6f 100644 --- a/core/l10n/lt_LT.php +++ b/core/l10n/lt_LT.php @@ -1,6 +1,7 @@ <?php $TRANSLATIONS = array( "%s shared »%s« with you" => "%s pasidalino »%s« su tavimi", +"Couldn't send mail to following users: %s " => "Nepavyko nusiųsti el. pašto šiems naudotojams: %s ", "group" => "grupė", "Turned on maintenance mode" => "Įjungta priežiūros veiksena", "Turned off maintenance mode" => "Išjungta priežiūros veiksena", @@ -92,6 +93,7 @@ $TRANSLATIONS = array( "Resharing is not allowed" => "Dalijinasis išnaujo negalimas", "Shared in {item} with {user}" => "Pasidalino {item} su {user}", "Unshare" => "Nebesidalinti", +"notify user by email" => "informuoti naudotoją el. paštu", "can edit" => "gali redaguoti", "access control" => "priėjimo kontrolė", "create" => "sukurti", @@ -103,6 +105,7 @@ $TRANSLATIONS = array( "Error setting expiration date" => "Klaida nustatant galiojimo laiką", "Sending ..." => "Siunčiama...", "Email sent" => "Laiškas išsiųstas", +"Warning" => "Įspėjimas", "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Atnaujinimas buvo nesėkmingas. PApie tai prašome pranešti the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud bendruomenei</a>.", "The update was successful. Redirecting you to ownCloud now." => "Atnaujinimas buvo sėkmingas. Nukreipiame į jūsų ownCloud.", "%s password reset" => "%s slaptažodžio atnaujinimas", @@ -125,7 +128,8 @@ $TRANSLATIONS = array( "Help" => "Pagalba", "Access forbidden" => "Priėjimas draudžiamas", "Cloud not found" => "Negalima rasti", -"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Labas,\n\nInformuojame, kad %s pasidalino su Jumis %s.\nPažiūrėkite: %s\n\nLinkėjimai!", +"The share will expire on %s.\n\n" => "Bendrinimo laikas baigsis %s.\n", +"Cheers!" => "Sveikinimai!", "Edit categories" => "Redaguoti kategorijas", "Add" => "Pridėti", "Security Warning" => "Saugumo pranešimas", @@ -146,6 +150,7 @@ $TRANSLATIONS = array( "Database tablespace" => "Duomenų bazės loginis saugojimas", "Database host" => "Duomenų bazės serveris", "Finish setup" => "Baigti diegimą", +"Finishing …" => "Baigiama ...", "%s is available. Get more information on how to update." => "%s yra prieinama. Gaukite daugiau informacijos apie atnaujinimą.", "Log out" => "Atsijungti", "Automatic logon rejected!" => "Automatinis prisijungimas atmestas!", @@ -155,7 +160,7 @@ $TRANSLATIONS = array( "remember" => "prisiminti", "Log in" => "Prisijungti", "Alternative Logins" => "Alternatyvūs prisijungimai", -"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Labas,<br><br>tik informuojame, kad %s pasidalino su Jumis »%s«.<br><a href=\"%s\">Peržiūrėk!</a><br><br>Linkėjimai!", +"The share will expire on %s.<br><br>" => "Bendrinimo laikas baigsis %s.<br><br>", "Updating ownCloud to version %s, this may take a while." => "Atnaujinama ownCloud į %s versiją. tai gali šiek tiek užtrukti." ); $PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);"; diff --git a/core/l10n/lv.php b/core/l10n/lv.php index 6bdbeaf5e20..998a03c5dd1 100644 --- a/core/l10n/lv.php +++ b/core/l10n/lv.php @@ -83,6 +83,7 @@ $TRANSLATIONS = array( "Error setting expiration date" => "Kļūda, iestatot termiņa datumu", "Sending ..." => "Sūta...", "Email sent" => "Vēstule nosūtīta", +"Warning" => "Brīdinājums", "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Atjaunināšana beidzās nesekmīgi. Lūdzu, ziņojiet par šo problēmu <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud kopienai</a>.", "The update was successful. Redirecting you to ownCloud now." => "Atjaunināšana beidzās sekmīgi. Tagad pārsūta jūs uz ownCloud.", "%s password reset" => "%s paroles maiņa", @@ -105,7 +106,6 @@ $TRANSLATIONS = array( "Help" => "Palīdzība", "Access forbidden" => "Pieeja ir liegta", "Cloud not found" => "Mākonis netika atrasts", -"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Sveiks,\nTikai daru tev zināmu ka %s dalās %s ar tevi.\nApskati to: %s\n\nJaukiņi Labiņi!", "Edit categories" => "Rediģēt kategoriju", "Add" => "Pievienot", "Security Warning" => "Brīdinājums par drošību", @@ -135,7 +135,6 @@ $TRANSLATIONS = array( "remember" => "atcerēties", "Log in" => "Ierakstīties", "Alternative Logins" => "Alternatīvās pieteikšanās", -"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Sveiks,<br><br>Tikai daru tev zināmu ka %s dalās %s ar tevi.<br><a href=\"%s\">Apskati to!</a><br><br>Jaukiņi Labiņi!", "Updating ownCloud to version %s, this may take a while." => "Atjaunina ownCloud uz versiju %s. Tas var aizņemt kādu laiciņu." ); $PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);"; diff --git a/core/l10n/mk.php b/core/l10n/mk.php index 1c998bb636a..dffd20ab3bb 100644 --- a/core/l10n/mk.php +++ b/core/l10n/mk.php @@ -79,6 +79,7 @@ $TRANSLATIONS = array( "Error setting expiration date" => "Грешка при поставување на рок на траење", "Sending ..." => "Праќање...", "Email sent" => "Е-порака пратена", +"Warning" => "Предупредување", "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/ms_MY.php b/core/l10n/ms_MY.php index 5aea25a3fd4..cac2dbff2a2 100644 --- a/core/l10n/ms_MY.php +++ b/core/l10n/ms_MY.php @@ -34,6 +34,7 @@ $TRANSLATIONS = array( "Error" => "Ralat", "Share" => "Kongsi", "Password" => "Kata laluan", +"Warning" => "Amaran", "Use the following link to reset your password: {link}" => "Guna pautan berikut untuk menetapkan semula kata laluan anda: {link}", "You will receive a link to reset your password via Email." => "Anda akan menerima pautan untuk menetapkan semula kata laluan anda melalui emel", "Username" => "Nama pengguna", diff --git a/core/l10n/nb_NO.php b/core/l10n/nb_NO.php index 01dec885574..a252642678a 100644 --- a/core/l10n/nb_NO.php +++ b/core/l10n/nb_NO.php @@ -67,6 +67,7 @@ $TRANSLATIONS = array( "Error setting expiration date" => "Kan ikke sette utløpsdato", "Sending ..." => "Sender...", "Email sent" => "E-post sendt", +"Warning" => "Advarsel", "Use the following link to reset your password: {link}" => "Bruk følgende lenke for å tilbakestille passordet ditt: {link}", "You will receive a link to reset your password via Email." => "Du burde motta detaljer om å tilbakestille passordet ditt via epost.", "Username" => "Brukernavn", @@ -82,7 +83,6 @@ $TRANSLATIONS = array( "Help" => "Hjelp", "Access forbidden" => "Tilgang nektet", "Cloud not found" => "Sky ikke funnet", -"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Hei der.⏎\n⏎\nVille bare gjøre deg oppmerksom på at %s delte %s med deg.⏎\nVis den: %s⏎\n⏎\nVI ses!", "Edit categories" => "Rediger kategorier", "Add" => "Legg til", "Security Warning" => "Sikkerhetsadvarsel", diff --git a/core/l10n/nl.php b/core/l10n/nl.php index 3dcdeaedec2..fe8ec482e3b 100644 --- a/core/l10n/nl.php +++ b/core/l10n/nl.php @@ -96,6 +96,7 @@ $TRANSLATIONS = array( "Error setting expiration date" => "Fout tijdens het instellen van de vervaldatum", "Sending ..." => "Versturen ...", "Email sent" => "E-mail verzonden", +"Warning" => "Waarschuwing", "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "De update is niet geslaagd. Meld dit probleem aan bij de <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>.", "The update was successful. Redirecting you to ownCloud now." => "De update is geslaagd. Je wordt teruggeleid naar je eigen ownCloud.", "%s password reset" => "%s wachtwoord reset", @@ -118,7 +119,6 @@ $TRANSLATIONS = array( "Help" => "Help", "Access forbidden" => "Toegang verboden", "Cloud not found" => "Cloud niet gevonden", -"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Hallo daar,\n\n%s deelde %s met jou.\nBekijk: %s\n\nVeel plezier!", "Edit categories" => "Wijzig categorieën", "Add" => "Toevoegen", "Security Warning" => "Beveiligingswaarschuwing", @@ -148,7 +148,6 @@ $TRANSLATIONS = array( "remember" => "onthoud gegevens", "Log in" => "Meld je aan", "Alternative Logins" => "Alternatieve inlogs", -"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Hallo daar,<br><br> %s deelde »%s« met jou.<br><a href=\"%s\">Bekijk!</a><br><br>Veel plezier!", "Updating ownCloud to version %s, this may take a while." => "Updaten ownCloud naar versie %s, dit kan even duren..." ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/core/l10n/nn_NO.php b/core/l10n/nn_NO.php index d596605dbcd..6dff2e63742 100644 --- a/core/l10n/nn_NO.php +++ b/core/l10n/nn_NO.php @@ -103,6 +103,7 @@ $TRANSLATIONS = array( "Error setting expiration date" => "Klarte ikkje setja utløpsdato", "Sending ..." => "Sender …", "Email sent" => "E-post sendt", +"Warning" => "Åtvaring", "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Oppdateringa feila. Ver venleg og rapporter feilen til <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud-fellesskapet</a>.", "The update was successful. Redirecting you to ownCloud now." => "Oppdateringa er fullført. Sender deg vidare til ownCloud no.", "%s password reset" => "%s passordnullstilling", @@ -125,7 +126,6 @@ $TRANSLATIONS = array( "Help" => "Hjelp", "Access forbidden" => "Tilgang forbudt", "Cloud not found" => "Fann ikkje skyen", -"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Hei der,\n\nnemner berre at %s delte %s med deg.\nSjå det her: %s\n\nMe talast!", "Edit categories" => "Endra kategoriar", "Add" => "Legg til", "Security Warning" => "Tryggleiksåtvaring", @@ -155,7 +155,6 @@ $TRANSLATIONS = array( "remember" => "hugs", "Log in" => "Logg inn", "Alternative Logins" => "Alternative innloggingar", -"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Hei der,<br><br>nemner berre at %s delte «%s» med deg.<br><a href=\"%s\">Sjå det!</a><br><br>Me talast!<", "Updating ownCloud to version %s, this may take a while." => "Oppdaterer ownCloud til utgåve %s, dette kan ta ei stund." ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/core/l10n/pa.php b/core/l10n/pa.php index c8078d06c73..156c6dbac14 100644 --- a/core/l10n/pa.php +++ b/core/l10n/pa.php @@ -41,6 +41,7 @@ $TRANSLATIONS = array( "Share" => "ਸਾਂਝਾ ਕਰੋ", "Password" => "ਪਾਸਵਰ", "Send" => "ਭੇਜੋ", +"Warning" => "ਚੇਤਾਵਨੀ", "Username" => "ਯੂਜ਼ਰ-ਨਾਂ", "Security Warning" => "ਸੁਰੱਖਿਆ ਚੇਤਾਵਨੀ" ); diff --git a/core/l10n/pl.php b/core/l10n/pl.php index ad467fe100e..5d60f5d3aa7 100644 --- a/core/l10n/pl.php +++ b/core/l10n/pl.php @@ -95,6 +95,7 @@ $TRANSLATIONS = array( "Error setting expiration date" => "Błąd podczas ustawiania daty wygaśnięcia", "Sending ..." => "Wysyłanie...", "Email sent" => "E-mail wysłany", +"Warning" => "Ostrzeżenie", "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Aktualizacja zakończyła się niepowodzeniem. Zgłoś ten problem <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">spoleczności ownCloud</a>.", "The update was successful. Redirecting you to ownCloud now." => "Aktualizacji zakończyła się powodzeniem. Przekierowuję do ownCloud.", "%s password reset" => "%s reset hasła", @@ -117,7 +118,6 @@ $TRANSLATIONS = array( "Help" => "Pomoc", "Access forbidden" => "Dostęp zabroniony", "Cloud not found" => "Nie odnaleziono chmury", -"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Cześć,\n\nInformuję cię że %s udostępnia ci %s.\nZobacz na: %s\n\nPozdrawiam!", "Edit categories" => "Edytuj kategorie", "Add" => "Dodaj", "Security Warning" => "Ostrzeżenie o zabezpieczeniach", @@ -147,7 +147,6 @@ $TRANSLATIONS = array( "remember" => "pamiętaj", "Log in" => "Zaloguj", "Alternative Logins" => "Alternatywne loginy", -"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Cześć,<br><br>Informuję cię że %s udostępnia ci »%s«.\n<br><a href=\"%s\">Zobacz</a><br><br>Pozdrawiam!", "Updating ownCloud to version %s, this may take a while." => "Aktualizowanie ownCloud do wersji %s. Może to trochę potrwać." ); $PLURAL_FORMS = "nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"; diff --git a/core/l10n/pt_BR.php b/core/l10n/pt_BR.php index 5f8903a8ff5..fc43814ae00 100644 --- a/core/l10n/pt_BR.php +++ b/core/l10n/pt_BR.php @@ -1,6 +1,7 @@ <?php $TRANSLATIONS = array( "%s shared »%s« with you" => "%s compartilhou »%s« com você", +"Couldn't send mail to following users: %s " => "Não foi possível enviar e-mail para os seguintes usuários: %s", "group" => "grupo", "Turned on maintenance mode" => "Ativar modo de manutenção", "Turned off maintenance mode" => "Desligar o modo de manutenção", @@ -92,6 +93,7 @@ $TRANSLATIONS = array( "Resharing is not allowed" => "Não é permitido re-compartilhar", "Shared in {item} with {user}" => "Compartilhado em {item} com {user}", "Unshare" => "Descompartilhar", +"notify user by email" => "notificar usuário por email", "can edit" => "pode editar", "access control" => "controle de acesso", "create" => "criar", @@ -103,6 +105,7 @@ $TRANSLATIONS = array( "Error setting expiration date" => "Erro ao definir data de expiração", "Sending ..." => "Enviando ...", "Email sent" => "E-mail enviado", +"Warning" => "Aviso", "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "A atualização falhou. Por favor, relate este problema para a <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">comunidade ownCloud</a>.", "The update was successful. Redirecting you to ownCloud now." => "A atualização teve êxito. Você será redirecionado ao ownCloud agora.", "%s password reset" => "%s redefinir senha", @@ -125,7 +128,9 @@ $TRANSLATIONS = array( "Help" => "Ajuda", "Access forbidden" => "Acesso proibido", "Cloud not found" => "Cloud não encontrado", -"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Olá,\n\napenas para você saber que %s compartilhou %s com você.\nVeja: %s\n\nAbraços!", +"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Olá,\n\ngostaria que você soubesse que %s compartilhou %s com vecê.\nVeja isto: %s\n\n", +"The share will expire on %s.\n\n" => "O compartilhamento irá expirer em %s.\n\n", +"Cheers!" => "Saúde!", "Edit categories" => "Editar categorias", "Add" => "Adicionar", "Security Warning" => "Aviso de Segurança", @@ -146,6 +151,7 @@ $TRANSLATIONS = array( "Database tablespace" => "Espaço de tabela do banco de dados", "Database host" => "Host do banco de dados", "Finish setup" => "Concluir configuração", +"Finishing …" => "Finalizando ...", "%s is available. Get more information on how to update." => "%s está disponível. Obtenha mais informações sobre como atualizar.", "Log out" => "Sair", "Automatic logon rejected!" => "Entrada Automática no Sistema Rejeitada!", @@ -155,7 +161,8 @@ $TRANSLATIONS = array( "remember" => "lembrar", "Log in" => "Fazer login", "Alternative Logins" => "Logins alternativos", -"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Olá,<br><br>apenas para você saber que %s compartilhou %s com você.<br><a href=\"%s\">Veja: </a><br><br>Abraços!", +"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>" => "Olá,<br><br>só gostaria que você soubesse que %s compartilhou »%s« com você.<br><a href=\"%s\">Veja isto!</a><br><br", +"The share will expire on %s.<br><br>" => "O compartilhamento irá expirar em %s.<br><br>", "Updating ownCloud to version %s, this may take a while." => "Atualizando ownCloud para a versão %s, isto pode levar algum tempo." ); $PLURAL_FORMS = "nplurals=2; plural=(n > 1);"; diff --git a/core/l10n/pt_PT.php b/core/l10n/pt_PT.php index 977d8e38cb2..fd504421199 100644 --- a/core/l10n/pt_PT.php +++ b/core/l10n/pt_PT.php @@ -94,6 +94,7 @@ $TRANSLATIONS = array( "Error setting expiration date" => "Erro ao aplicar a data de expiração", "Sending ..." => "A Enviar...", "Email sent" => "E-mail enviado", +"Warning" => "Aviso", "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "A actualização falhou. Por favor reporte este incidente seguindo este link <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>.", "The update was successful. Redirecting you to ownCloud now." => "A actualização foi concluída com sucesso. Vai ser redireccionado para o ownCloud agora.", "%s password reset" => "%s reposição da password", @@ -116,7 +117,6 @@ $TRANSLATIONS = array( "Help" => "Ajuda", "Access forbidden" => "Acesso interdito", "Cloud not found" => "Cloud nao encontrada", -"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Olá,\n\nApenas para lhe informar que %s partilhou %s consigo.\nVeja-o: %s\n\nCumprimentos!", "Edit categories" => "Editar categorias", "Add" => "Adicionar", "Security Warning" => "Aviso de Segurança", @@ -146,7 +146,6 @@ $TRANSLATIONS = array( "remember" => "lembrar", "Log in" => "Entrar", "Alternative Logins" => "Contas de acesso alternativas", -"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Olá,<br><br>Apenas para lhe informar que %s partilhou »%s« consigo.<br><a href=\"%s\">Consulte-o aqui!</a><br><br>Cumprimentos!", "Updating ownCloud to version %s, this may take a while." => "A actualizar o ownCloud para a versão %s, esta operação pode demorar." ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/core/l10n/ro.php b/core/l10n/ro.php index 12fbfa5f0ca..73350011f1e 100644 --- a/core/l10n/ro.php +++ b/core/l10n/ro.php @@ -90,6 +90,7 @@ $TRANSLATIONS = array( "Error setting expiration date" => "Eroare la specificarea datei de expirare", "Sending ..." => "Se expediază...", "Email sent" => "Mesajul a fost expediat", +"Warning" => "Atenție", "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Actualizarea a eșuat! Raportați problema către <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">comunitatea ownCloud</a>.", "The update was successful. Redirecting you to ownCloud now." => "Actualizare reușită. Ești redirecționat către ownCloud.", "Use the following link to reset your password: {link}" => "Folosește următorul link pentru a reseta parola: {link}", @@ -111,7 +112,6 @@ $TRANSLATIONS = array( "Help" => "Ajutor", "Access forbidden" => "Acces restricționat", "Cloud not found" => "Nu s-a găsit", -"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Salutare,\n\nVă aduc la cunoștință că %s a partajat %s cu tine.\nAccesează la: %s\n\nNumai bine!", "Edit categories" => "Editează categorii", "Add" => "Adaugă", "Security Warning" => "Avertisment de securitate", @@ -141,7 +141,6 @@ $TRANSLATIONS = array( "remember" => "amintește", "Log in" => "Autentificare", "Alternative Logins" => "Conectări alternative", -"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Salutare, <br><br>Vă aduc la cunoștință că %s a partajat %s cu tine.<br><a href=\"%s\">Accesează-l!</a><br><br>Numai bine!", "Updating ownCloud to version %s, this may take a while." => "Actualizăm ownCloud la versiunea %s, aceasta poate dura câteva momente." ); $PLURAL_FORMS = "nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));"; diff --git a/core/l10n/ru.php b/core/l10n/ru.php index 1b3133a1a6f..5cfd013850e 100644 --- a/core/l10n/ru.php +++ b/core/l10n/ru.php @@ -103,6 +103,7 @@ $TRANSLATIONS = array( "Error setting expiration date" => "Ошибка при установке срока доступа", "Sending ..." => "Отправляется ...", "Email sent" => "Письмо отправлено", +"Warning" => "Предупреждение", "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "При обновлении произошла ошибка. Пожалуйста сообщите об этом в <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud сообщество</a>.", "The update was successful. Redirecting you to ownCloud now." => "Обновление прошло успешно. Перенаправляемся в Ваш ownCloud...", "%s password reset" => "%s сброс пароля", @@ -121,11 +122,10 @@ $TRANSLATIONS = array( "Personal" => "Личное", "Users" => "Пользователи", "Apps" => "Приложения", -"Admin" => "Admin", +"Admin" => "Админпанель", "Help" => "Помощь", "Access forbidden" => "Доступ запрещён", "Cloud not found" => "Облако не найдено", -"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Приветствую,⏎\n⏎\nпросто даю знать, что %s поделился %s с вами.⏎\nПосмотреть: %s⏎\n⏎\nУдачи!", "Edit categories" => "Редактировать категрии", "Add" => "Добавить", "Security Warning" => "Предупреждение безопасности", @@ -155,7 +155,6 @@ $TRANSLATIONS = array( "remember" => "запомнить", "Log in" => "Войти", "Alternative Logins" => "Альтернативные имена пользователя", -"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Приветствую,<br><br>просто даю знать, что %s поделился »%s« с вами.<br><a href=\"%s\">Посмотреть!</a><br><br>Удачи!", "Updating ownCloud to version %s, this may take a while." => "Идёт обновление ownCloud до версии %s. Это может занять некоторое время." ); $PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"; diff --git a/core/l10n/si_LK.php b/core/l10n/si_LK.php index 2d922657ea0..065604425bd 100644 --- a/core/l10n/si_LK.php +++ b/core/l10n/si_LK.php @@ -58,6 +58,7 @@ $TRANSLATIONS = array( "Password protected" => "මුර පදයකින් ආරක්ශාකර ඇත", "Error unsetting expiration date" => "කල් ඉකුත් දිනය ඉවත් කිරීමේ දෝෂයක්", "Error setting expiration date" => "කල් ඉකුත් දිනය ස්ථාපනය කිරීමේ දෝෂයක්", +"Warning" => "අවවාදය", "You will receive a link to reset your password via Email." => "ඔබගේ මුරපදය ප්රත්යාරම්භ කිරීම සඳහා යොමුව විද්යුත් තැපෑලෙන් ලැබෙනු ඇත", "Username" => "පරිශීලක නම", "Your password was reset" => "ඔබේ මුරපදය ප්රත්යාරම්භ කරන ලදී", diff --git a/core/l10n/sk_SK.php b/core/l10n/sk_SK.php index ac45947459b..b4bcaac8ae0 100644 --- a/core/l10n/sk_SK.php +++ b/core/l10n/sk_SK.php @@ -89,6 +89,7 @@ $TRANSLATIONS = array( "Error setting expiration date" => "Chyba pri nastavení dátumu expirácie", "Sending ..." => "Odosielam ...", "Email sent" => "Email odoslaný", +"Warning" => "Varovanie", "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Aktualizácia nebola úspešná. Problém nahláste na <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>.", "The update was successful. Redirecting you to ownCloud now." => "Aktualizácia bola úspešná. Presmerovávam na prihlasovaciu stránku.", "%s password reset" => "reset hesla %s", @@ -111,7 +112,6 @@ $TRANSLATIONS = array( "Help" => "Pomoc", "Access forbidden" => "Prístup odmietnutý", "Cloud not found" => "Nenájdené", -"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Ahoj,\n\nChcem Vám oznámiť, že %s s Vami zdieľa %s.\nPozrieť si to môžete tu: %s\n\nVďaka", "Edit categories" => "Upraviť kategórie", "Add" => "Pridať", "Security Warning" => "Bezpečnostné varovanie", @@ -141,7 +141,6 @@ $TRANSLATIONS = array( "remember" => "zapamätať", "Log in" => "Prihlásiť sa", "Alternative Logins" => "Alternatívne prihlasovanie", -"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Ahoj,<br><br>chcem Vám oznámiť, že %s s Vami zdieľa %s.\nPozrieť si to môžete tu: <br><a href=\"%s\">zde</a>.<br><br>Vďaka", "Updating ownCloud to version %s, this may take a while." => "Aktualizujem ownCloud na verziu %s, môže to chvíľu trvať." ); $PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"; diff --git a/core/l10n/sl.php b/core/l10n/sl.php index 84cd83fa2f3..e858284de53 100644 --- a/core/l10n/sl.php +++ b/core/l10n/sl.php @@ -83,6 +83,7 @@ $TRANSLATIONS = array( "Error setting expiration date" => "Napaka med nastavljanjem datuma preteka", "Sending ..." => "Pošiljanje ...", "Email sent" => "Elektronska pošta je poslana", +"Warning" => "Opozorilo", "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Posodobitev ni uspela. Pošljite poročilo o napaki na sistemu <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud</a>.", "The update was successful. Redirecting you to ownCloud now." => "Posodobitev je uspešno končana. Stran bo preusmerjena na oblak ownCloud.", "Use the following link to reset your password: {link}" => "Za ponastavitev gesla uporabite povezavo: {link}", @@ -104,7 +105,6 @@ $TRANSLATIONS = array( "Help" => "Pomoč", "Access forbidden" => "Dostop je prepovedan", "Cloud not found" => "Oblaka ni mogoče najti", -"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Pozdravljen/a,⏎\n⏎\nsporočam, da je %s delil %s s teboj.⏎\nPoglej na: %s⏎\n⏎\nLep pozdrav!", "Edit categories" => "Uredi kategorije", "Add" => "Dodaj", "Security Warning" => "Varnostno opozorilo", @@ -134,7 +134,6 @@ $TRANSLATIONS = array( "remember" => "zapomni si", "Log in" => "Prijava", "Alternative Logins" => "Druge prijavne možnosti", -"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Pozdravljen/a,<br><br>sporočam, da je %s delil »%s« s teboj.<br><a href=\"%s\">Poglej vsebine!</a><br><br>Lep pozdrav!", "Updating ownCloud to version %s, this may take a while." => "Posodabljanje sistema ownCloud na različico %s je lahko dolgotrajno." ); $PLURAL_FORMS = "nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);"; diff --git a/core/l10n/sq.php b/core/l10n/sq.php index e0fde3f1297..2d9649a6483 100644 --- a/core/l10n/sq.php +++ b/core/l10n/sq.php @@ -111,7 +111,6 @@ $TRANSLATIONS = array( "Help" => "Ndihmë", "Access forbidden" => "Ndalohet hyrja", "Cloud not found" => "Cloud-i nuk u gjet", -"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Tungjatjeta,\n\nju njoftojmë që %s ka ndarë %s me ju.\nShikojeni: %s\n\nPëshëndetje!", "Edit categories" => "Ndrysho kategoritë", "Add" => "Shto", "Security Warning" => "Paralajmërim sigurie", @@ -141,7 +140,6 @@ $TRANSLATIONS = array( "remember" => "kujto", "Log in" => "Hyrje", "Alternative Logins" => "Hyrje alternative", -"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Tungjatjeta,<br><br>duam t'ju njoftojmë që %s ka ndarë »%s« me ju.<br><a href=\"%s\">Shikojeni!</a><br><br>Përshëndetje!", "Updating ownCloud to version %s, this may take a while." => "Po azhurnoj ownCloud-in me versionin %s. Mund të zgjasi pak." ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/core/l10n/sr.php b/core/l10n/sr.php index 064984cca5f..666223c6cba 100644 --- a/core/l10n/sr.php +++ b/core/l10n/sr.php @@ -78,6 +78,7 @@ $TRANSLATIONS = array( "Error setting expiration date" => "Грешка код постављања датума истека", "Sending ..." => "Шаљем...", "Email sent" => "Порука је послата", +"Warning" => "Упозорење", "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/sv.php b/core/l10n/sv.php index 0ea3259df68..29936537418 100644 --- a/core/l10n/sv.php +++ b/core/l10n/sv.php @@ -103,6 +103,7 @@ $TRANSLATIONS = array( "Error setting expiration date" => "Fel vid sättning av utgångsdatum", "Sending ..." => "Skickar ...", "Email sent" => "E-post skickat", +"Warning" => "Varning", "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Uppdateringen misslyckades. Rapportera detta problem till <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud Community</a>.", "The update was successful. Redirecting you to ownCloud now." => "Uppdateringen lyckades. Du omdirigeras nu till OwnCloud.", "%s password reset" => "%s återställ lösenord", @@ -125,7 +126,6 @@ $TRANSLATIONS = array( "Help" => "Hjälp", "Access forbidden" => "Åtkomst förbjuden", "Cloud not found" => "Hittade inget moln", -"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Hej där,⏎\n⏎\nville bara meddela dig att %s delade %s med dig.⏎\nTitta på den: %s⏎\n⏎\nVi hörs!", "Edit categories" => "Editera kategorier", "Add" => "Lägg till", "Security Warning" => "Säkerhetsvarning", @@ -155,7 +155,6 @@ $TRANSLATIONS = array( "remember" => "kom ihåg", "Log in" => "Logga in", "Alternative Logins" => "Alternativa inloggningar", -"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Hej där,<br><br>ville bara informera dig om att %s delade »%s« med dig.<br><a href=\"%s\">Titta på den!</a><br><br>Hörs!", "Updating ownCloud to version %s, this may take a while." => "Uppdaterar ownCloud till version %s, detta kan ta en stund." ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/core/l10n/ta_LK.php b/core/l10n/ta_LK.php index 43c7f451e49..1756d22c788 100644 --- a/core/l10n/ta_LK.php +++ b/core/l10n/ta_LK.php @@ -75,6 +75,7 @@ $TRANSLATIONS = array( "Password protected" => "கடவுச்சொல் பாதுகாக்கப்பட்டது", "Error unsetting expiration date" => "காலாவதியாகும் திகதியை குறிப்பிடாமைக்கான வழு", "Error setting expiration date" => "காலாவதியாகும் திகதியை குறிப்பிடுவதில் வழு", +"Warning" => "எச்சரிக்கை", "Use the following link to reset your password: {link}" => "உங்கள் கடவுச்சொல்லை மீளமைக்க பின்வரும் இணைப்பை பயன்படுத்தவும் : {இணைப்பு}", "You will receive a link to reset your password via Email." => "நீங்கள் மின்னஞ்சல் மூலம் உங்களுடைய கடவுச்சொல்லை மீளமைப்பதற்கான இணைப்பை பெறுவீர்கள். ", "Username" => "பயனாளர் பெயர்", diff --git a/core/l10n/th_TH.php b/core/l10n/th_TH.php index 8eab771822d..c6c0e94a32e 100644 --- a/core/l10n/th_TH.php +++ b/core/l10n/th_TH.php @@ -80,6 +80,7 @@ $TRANSLATIONS = array( "Error setting expiration date" => "เกิดข้อผิดพลาดในการตั้งค่าวันที่หมดอายุ", "Sending ..." => "กำลังส่ง...", "Email sent" => "ส่งอีเมล์แล้ว", +"Warning" => "คำเตือน", "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "การอัพเดทไม่เป็นผลสำเร็จ กรุณาแจ้งปัญหาที่เกิดขึ้นไปยัง <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">คอมมูนิตี้ผู้ใช้งาน ownCloud</a>", "The update was successful. Redirecting you to ownCloud now." => "การอัพเดทเสร็จเรียบร้อยแล้ว กำลังเปลี่ยนเส้นทางไปที่ ownCloud อยู่ในขณะนี้", "Use the following link to reset your password: {link}" => "ใช้ลิงค์ต่อไปนี้เพื่อเปลี่ยนรหัสผ่านของคุณใหม่: {link}", diff --git a/core/l10n/tr.php b/core/l10n/tr.php index d8d9709949c..57603895c94 100644 --- a/core/l10n/tr.php +++ b/core/l10n/tr.php @@ -89,6 +89,7 @@ $TRANSLATIONS = array( "Error setting expiration date" => "Geçerlilik tarihi tanımlama hatası", "Sending ..." => "Gönderiliyor...", "Email sent" => "Eposta gönderildi", +"Warning" => "Uyarı", "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Güncelleme başarılı olmadı. Lütfen bu hatayı bildirin <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>.", "The update was successful. Redirecting you to ownCloud now." => "Güncelleme başarılı. ownCloud'a yönlendiriliyor.", "%s password reset" => "%s parola sıfırlama", @@ -111,7 +112,6 @@ $TRANSLATIONS = array( "Help" => "Yardım", "Access forbidden" => "Erişim yasaklı", "Cloud not found" => "Bulut bulunamadı", -"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Merhaba\n\n%s sizinle %s dosyasını paylaştığı\nPaylaşımı gör:%s\n\nİyi günler!", "Edit categories" => "Kategorileri düzenle", "Add" => "Ekle", "Security Warning" => "Güvenlik Uyarisi", @@ -141,7 +141,6 @@ $TRANSLATIONS = array( "remember" => "hatırla", "Log in" => "Giriş yap", "Alternative Logins" => "Alternatif Girişler", -"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Merhaba, <br><br> %s sizinle »%s« paylaşımında bulundu.<br><a href=\"%s\">Paylaşımı gör!</a><br><br>İyi günler!", "Updating ownCloud to version %s, this may take a while." => "Owncloud %s versiyonuna güncelleniyor. Biraz zaman alabilir." ); $PLURAL_FORMS = "nplurals=2; plural=(n > 1);"; diff --git a/core/l10n/ug.php b/core/l10n/ug.php index 36023cb1653..621c45d4d0a 100644 --- a/core/l10n/ug.php +++ b/core/l10n/ug.php @@ -40,6 +40,7 @@ $TRANSLATIONS = array( "Unshare" => "ھەمبەھىرلىمە", "delete" => "ئۆچۈر", "share" => "ھەمبەھىر", +"Warning" => "ئاگاھلاندۇرۇش", "Username" => "ئىشلەتكۈچى ئاتى", "New password" => "يېڭى ئىم", "Personal" => "شەخسىي", diff --git a/core/l10n/uk.php b/core/l10n/uk.php index 23207654731..6bd6901815d 100644 --- a/core/l10n/uk.php +++ b/core/l10n/uk.php @@ -81,6 +81,7 @@ $TRANSLATIONS = array( "Error setting expiration date" => "Помилка при встановленні терміна дії", "Sending ..." => "Надсилання...", "Email sent" => "Ел. пошта надіслана", +"Warning" => "Попередження", "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Оновлення виконалось неуспішно. Будь ласка, повідомте про цю проблему в <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">спільноті ownCloud</a>.", "The update was successful. Redirecting you to ownCloud now." => "Оновлення виконалось успішно. Перенаправляємо вас на ownCloud.", "Use the following link to reset your password: {link}" => "Використовуйте наступне посилання для скидання пароля: {link}", diff --git a/core/l10n/vi.php b/core/l10n/vi.php index 1c99aad9a4d..2e3d9569357 100644 --- a/core/l10n/vi.php +++ b/core/l10n/vi.php @@ -81,6 +81,7 @@ $TRANSLATIONS = array( "Error setting expiration date" => "Lỗi cấu hình ngày kết thúc", "Sending ..." => "Đang gởi ...", "Email sent" => "Email đã được gửi", +"Warning" => "Cảnh báo", "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Cập nhật không thành công . Vui lòng thông báo đến <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\"> Cộng đồng ownCloud </a>.", "The update was successful. Redirecting you to ownCloud now." => "Cập nhật thành công .Hệ thống sẽ đưa bạn tới 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}", diff --git a/core/l10n/zh_CN.php b/core/l10n/zh_CN.php index 04c4630b222..6a5dcb50a95 100644 --- a/core/l10n/zh_CN.php +++ b/core/l10n/zh_CN.php @@ -89,6 +89,7 @@ $TRANSLATIONS = array( "Error setting expiration date" => "设置过期日期时出错", "Sending ..." => "正在发送...", "Email sent" => "邮件已发送", +"Warning" => "警告", "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "更新不成功。请汇报将此问题汇报给 <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud 社区</a>。", "The update was successful. Redirecting you to ownCloud now." => "更新成功。正在重定向至 ownCloud。", "%s password reset" => "重置 %s 的密码", @@ -111,7 +112,6 @@ $TRANSLATIONS = array( "Help" => "帮助", "Access forbidden" => "访问禁止", "Cloud not found" => "未找到云", -"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "您好，\n\n%s 向您分享了 %s。\n查看： %s", "Edit categories" => "编辑分类", "Add" => "增加", "Security Warning" => "安全警告", @@ -141,7 +141,6 @@ $TRANSLATIONS = array( "remember" => "记住", "Log in" => "登录", "Alternative Logins" => "其他登录方式", -"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "您好，<br><br>%s 向您分享了 »%s«。<br><a href=\"%s\">查看</a>", "Updating ownCloud to version %s, this may take a while." => "更新 ownCloud 到版本 %s，这可能需要一些时间。" ); $PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/core/l10n/zh_TW.php b/core/l10n/zh_TW.php index 759a4fdc35e..1483329bbfd 100644 --- a/core/l10n/zh_TW.php +++ b/core/l10n/zh_TW.php @@ -1,6 +1,7 @@ <?php $TRANSLATIONS = array( "%s shared »%s« with you" => "%s 與您分享了 %s", +"Couldn't send mail to following users: %s " => "無法寄送郵件給這些使用者：%s", "group" => "群組", "Turned on maintenance mode" => "已啓用維護模式", "Turned off maintenance mode" => "已停用維護模式", @@ -16,6 +17,11 @@ $TRANSLATIONS = array( "Error adding %s to favorites." => "加入 %s 到最愛時發生錯誤。", "No categories selected for deletion." => "沒有選擇要刪除的分類。", "Error removing %s from favorites." => "從最愛移除 %s 時發生錯誤。", +"No image or file provided" => "未提供圖片或檔案", +"Unknown filetype" => "未知的檔案類型", +"Invalid image" => "無效的圖片", +"No temporary profile picture available, try again" => "沒有臨時用的大頭貼，請再試一次", +"No crop data provided" => "未設定剪裁", "Sunday" => "週日", "Monday" => "週一", "Tuesday" => "週二", @@ -48,11 +54,20 @@ $TRANSLATIONS = array( "last year" => "去年", "years ago" => "幾年前", "Choose" => "選擇", +"Error loading file picker template: {error}" => "載入檔案選擇器樣板出錯： {error}", "Yes" => "是", "No" => "否", "Ok" => "好", -"_{count} file conflict_::_{count} file conflicts_" => array(""), +"Error loading message template: {error}" => "載入訊息樣板出錯： {error}", +"_{count} file conflict_::_{count} file conflicts_" => array("{count} 個檔案衝突"), +"One file conflict" => "一個檔案衝突", +"Which files do you want to keep?" => "您要保留哪一個檔案？", +"If you select both versions, the copied file will have a number added to its name." => "如果您同時選擇兩個版本，被複製的那個檔案名稱後面會加上編號", "Cancel" => "取消", +"Continue" => "繼續", +"(all selected)" => "（已全選）", +"({count} selected)" => "（已選 {count} 項）", +"Error loading file exists template" => "載入檔案存在樣板出錯", "The object type is not specified." => "未指定物件類型。", "Error" => "錯誤", "The app name is not specified." => "沒有指定 app 名稱。", @@ -78,6 +93,7 @@ $TRANSLATIONS = array( "Resharing is not allowed" => "不允許重新分享", "Shared in {item} with {user}" => "已和 {user} 分享 {item}", "Unshare" => "取消分享", +"notify user by email" => "使用郵件通知使用者", "can edit" => "可編輯", "access control" => "存取控制", "create" => "建立", @@ -89,6 +105,7 @@ $TRANSLATIONS = array( "Error setting expiration date" => "設定到期日發生錯誤", "Sending ..." => "正在傳送…", "Email sent" => "Email 已寄出", +"Warning" => "警告", "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "升級失敗，請將此問題回報 <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud 社群</a>。", "The update was successful. Redirecting you to ownCloud now." => "升級成功，正將您重新導向至 ownCloud 。", "%s password reset" => "%s 密碼重設", @@ -111,7 +128,9 @@ $TRANSLATIONS = array( "Help" => "說明", "Access forbidden" => "存取被拒", "Cloud not found" => "找不到網頁", -"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "嗨，\n\n通知您一聲，%s 與您分享了 %s 。\n您可以到 %s 看看", +"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "嗨，\n\n%s 和你分享了 %s ，到這裡看它：%s\n", +"The share will expire on %s.\n\n" => "分享將於 %s 過期\n", +"Cheers!" => "太棒了！", "Edit categories" => "編輯分類", "Add" => "增加", "Security Warning" => "安全性警告", @@ -132,6 +151,7 @@ $TRANSLATIONS = array( "Database tablespace" => "資料庫 tablespace", "Database host" => "資料庫主機", "Finish setup" => "完成設定", +"Finishing …" => "即將完成…", "%s is available. Get more information on how to update." => "%s 已經釋出，瞭解更多資訊以進行更新。", "Log out" => "登出", "Automatic logon rejected!" => "自動登入被拒！", @@ -141,7 +161,8 @@ $TRANSLATIONS = array( "remember" => "記住", "Log in" => "登入", "Alternative Logins" => "其他登入方法", -"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "嗨，<br><br>通知您一聲，%s 與您分享了 %s ，<br><a href=\"%s\">看一下吧</a>", +"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>" => "嗨，<br><br>%s 和你分享了 %s ，到<a href=\"%s\">這裡</a>看它<br><br>", +"The share will expire on %s.<br><br>" => "分享將於 %s 過期<br><br>", "Updating ownCloud to version %s, this may take a while." => "正在將 ownCloud 升級至版本 %s ，這可能需要一點時間。" ); $PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/core/setup.php b/core/setup.php index 4758c23b045..4026a748453 100644 --- a/core/setup.php +++ b/core/setup.php @@ -5,9 +5,18 @@ $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); +} + +$dbIsSet = isset($_POST['dbtype']); +$directoryIsSet = isset($_POST['directory']); +$adminAccountIsSet = isset($_POST['adminlogin']); + +if ($dbIsSet AND $directoryIsSet AND $adminAccountIsSet) { + $_POST['install'] = 'true'; + if( file_exists( $autosetup_file )) { + unlink($autosetup_file); + } } OC_Util::addScript('setup'); @@ -21,7 +30,7 @@ $datadir = OC_Config::getValue('datadirectory', OC::$SERVERROOT.'/data'); $vulnerableToNullByte = false; if(@file_exists(__FILE__."\0Nullbyte")) { // Check if the used PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243) $vulnerableToNullByte = true; -} +} // Protect data directory here, so we can test if the protection is working OC_Setup::protectDataDirectory(); @@ -37,6 +46,8 @@ $opts = array( 'htaccessWorking' => OC_Util::isHtAccessWorking(), 'vulnerableToNullByte' => $vulnerableToNullByte, 'errors' => array(), + 'dbIsSet' => $dbIsSet, + 'directoryIsSet' => $directoryIsSet, ); if(isset($_POST['install']) AND $_POST['install']=='true') { diff --git a/core/skeleton/welcome.txt b/core/skeleton/welcome.txt new file mode 100644 index 00000000000..c86eaf91bbe --- /dev/null +++ b/core/skeleton/welcome.txt @@ -0,0 +1,5 @@ +Welcome to your ownCloud account! + +This is just an example file for developers and git users. +The packaged and released versions will come with better examples. + diff --git a/core/templates/altmail.php b/core/templates/altmail.php index 2551473c6f0..00b67bee456 100644 --- a/core/templates/altmail.php +++ b/core/templates/altmail.php @@ -1,5 +1,9 @@ <?php -print_unescaped($l->t("Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!", array($_['user_displayname'], $_['filename'], $_['link']))); +print_unescaped($l->t("Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n", array($_['user_displayname'], $_['filename'], $_['link']))); +if ( isset($_['expiration']) ) { + print_unescaped($l->t("The share will expire on %s.\n\n", array($_['expiration']))); +} +p($l->t("Cheers!")); ?> -- diff --git a/core/templates/installation.php b/core/templates/installation.php index 8b087706801..5a103762269 100644 --- a/core/templates/installation.php +++ b/core/templates/installation.php @@ -61,8 +61,14 @@ </p> </fieldset> - <fieldset id="datadirField"> + <?php if(!$_['directoryIsSet'] OR !$_['dbIsSet']): ?> + <fieldset id="advancedHeader"> <legend><a id="showAdvanced"><?php p($l->t( 'Advanced' )); ?> <img class="svg" src="<?php print_unescaped(image_path('', 'actions/caret.svg')); ?>" /></a></legend> + </fieldset> + <?php endif; ?> + + <?php if(!$_['directoryIsSet']): ?> + <fieldset id="datadirField"> <div id="datadirContent"> <label for="directory"><?php p($l->t( 'Data folder' )); ?></label> <input type="text" name="directory" id="directory" @@ -70,7 +76,9 @@ value="<?php p(OC_Helper::init_var('directory', $_['directory'])); ?>" /> </div> </fieldset> + <?php endif; ?> + <?php if(!$_['dbIsSet']): ?> <fieldset id='databaseField'> <?php if($_['hasMySQL'] or $_['hasPostgreSQL'] or $_['hasOracle'] or $_['hasMSSQL']) $hasOtherDB = true; else $hasOtherDB =false; //other than SQLite ?> @@ -171,6 +179,7 @@ </div> <?php endif; ?> </fieldset> + <?php endif; ?> - <div class="buttons"><input type="submit" class="primary" value="<?php p($l->t( 'Finish setup' )); ?>" /></div> + <div class="buttons"><input type="submit" class="primary" value="<?php p($l->t( 'Finish setup' )); ?>" data-finishing="<?php p($l->t( 'Finishing …' )); ?>" /></div> </form> diff --git a/core/templates/mail.php b/core/templates/mail.php index de72b136b13..40092f5491f 100644 --- a/core/templates/mail.php +++ b/core/templates/mail.php @@ -12,7 +12,11 @@ <td bgcolor="#f8f8f8" width="20px"> </td> <td bgcolor="#f8f8f8" style="font-weight:normal; font-size:0.8em; line-height:1.2em; font-family:verdana,'arial',sans;"> <?php -print_unescaped($l->t('Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href="%s">View it!</a><br><br>Cheers!', array($_['user_displayname'], $_['filename'], $_['link']))); +print_unescaped($l->t('Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href="%s">View it!</a><br><br>', array($_['user_displayname'], $_['filename'], $_['link']))); +if ( isset($_['expiration']) ) { + print_unescaped($l->t("The share will expire on %s.<br><br>", array($_['expiration']))); +} +p($l->t('Cheers!')); ?> </td> </tr> @@ -22,7 +26,8 @@ print_unescaped($l->t('Hey there,<br><br>just letting you know that %s shared » <td bgcolor="#f8f8f8" style="font-weight:normal; font-size:0.8em; line-height:1.2em; font-family:verdana,'arial',sans;">--<br> <?php p($theme->getName()); ?> - <?php p($theme->getSlogan()); ?> -<br><a href="<?php print_unescaped($theme->getBaseUrl()); ?>"><?php print_unescaped($theme->getBaseUrl());?></a></td> +<br><a href="<?php print_unescaped($theme->getBaseUrl()); ?>"><?php print_unescaped($theme->getBaseUrl());?></a> +</td> </tr> <tr> <td bgcolor="#f8f8f8" colspan="2"> </td> |
