diff options
Diffstat (limited to 'core')
78 files changed, 660 insertions, 442 deletions
diff --git a/core/ajax/update.php b/core/ajax/update.php index db00da02239..43ed75b07f1 100644 --- a/core/ajax/update.php +++ b/core/ajax/update.php @@ -4,113 +4,34 @@ $RUNTIME_NOAPPS = true; require_once '../../lib/base.php'; if (OC::checkUpgrade(false)) { - \OC_DB::enableCaching(false); - OC_Config::setValue('maintenance', true); - $installedVersion = OC_Config::getValue('version', '0.0.0'); - $currentVersion = implode('.', OC_Util::getVersion()); - OC_Log::write('core', 'starting upgrade from ' . $installedVersion . ' to ' . $currentVersion, OC_Log::WARN); - $updateEventSource = new OC_EventSource(); - $watcher = new UpdateWatcher($updateEventSource); - OC_Hook::connect('update', 'success', $watcher, 'success'); - OC_Hook::connect('update', 'error', $watcher, 'error'); - OC_Hook::connect('update', 'failure', $watcher, 'failure'); - $watcher->success('Turned on maintenance mode'); - try { - $result = OC_DB::updateDbFromStructure(OC::$SERVERROOT.'/db_structure.xml'); - $watcher->success('Updated database'); - - // do a file cache upgrade for users with files - // this can take loooooooooooooooooooooooong - __doFileCacheUpgrade($watcher); - } catch (Exception $exception) { - $watcher->failure($exception->getMessage()); - } - OC_Config::setValue('version', implode('.', OC_Util::getVersion())); - OC_App::checkAppsRequirements(); - // load all apps to also upgrade enabled apps - OC_App::loadApps(); - OC_Config::setValue('maintenance', false); - $watcher->success('Turned off maintenance mode'); - $watcher->done(); -} - -/** - * The FileCache Upgrade routine - * - * @param UpdateWatcher $watcher - */ -function __doFileCacheUpgrade($watcher) { - try { - $query = \OC_DB::prepare(' - SELECT DISTINCT `user` - FROM `*PREFIX*fscache` - '); - $result = $query->execute(); - } catch (\Exception $e) { - return; - } - $users = $result->fetchAll(); - if(count($users) == 0) { - return; - } - $step = 100 / count($users); - $percentCompleted = 0; - $lastPercentCompletedOutput = 0; - $startInfoShown = false; - foreach($users as $userRow) { - $user = $userRow['user']; - \OC\Files\Filesystem::initMountPoints($user); - \OC\Files\Cache\Upgrade::doSilentUpgrade($user); - if(!$startInfoShown) { - //We show it only now, because otherwise Info about upgraded apps - //will appear between this and progress info - $watcher->success('Updating filecache, this may take really long...'); - $startInfoShown = true; - } - $percentCompleted += $step; - $out = floor($percentCompleted); - if($out != $lastPercentCompletedOutput) { - $watcher->success('... '. $out.'% done ...'); - $lastPercentCompletedOutput = $out; - } - } - $watcher->success('Updated filecache'); -} - -class UpdateWatcher { - /** - * @var \OC_EventSource $eventSource; - */ - private $eventSource; - - public function __construct($eventSource) { - $this->eventSource = $eventSource; - } - - public function success($message) { - OC_Util::obEnd(); - $this->eventSource->send('success', $message); - ob_start(); - } - - public function error($message) { - OC_Util::obEnd(); - $this->eventSource->send('error', $message); - ob_start(); - } - - public function failure($message) { - OC_Util::obEnd(); - $this->eventSource->send('failure', $message); - $this->eventSource->close(); + $eventSource = new OC_EventSource(); + $updater = new \OC\Updater(\OC_Log::$object); + $updater->listen('\OC\Updater', 'maintenanceStart', function () use ($eventSource) { + $eventSource->send('success', 'Turned on maintenance mode'); + }); + $updater->listen('\OC\Updater', 'maintenanceEnd', function () use ($eventSource) { + $eventSource->send('success', 'Turned off maintenance mode'); + }); + $updater->listen('\OC\Updater', 'dbUpgrade', function () use ($eventSource) { + $eventSource->send('success', 'Updated database'); + }); + $updater->listen('\OC\Updater', 'filecacheStart', function () use ($eventSource) { + $eventSource->send('success', 'Updating filecache, this may take really long...'); + }); + $updater->listen('\OC\Updater', 'filecacheDone', function () use ($eventSource) { + $eventSource->send('success', 'Updated filecache'); + }); + $updater->listen('\OC\Updater', 'filecacheProgress', function ($out) use ($eventSource) { + $eventSource->send('success', '... ' . $out . '% done ...'); + }); + $updater->listen('\OC\Updater', 'failure', function ($message) use ($eventSource) { + $eventSource->send('failure', $message); + $eventSource->close(); OC_Config::setValue('maintenance', false); - die(); - } + }); - public function done() { - OC_Util::obEnd(); - $this->eventSource->send('done', ''); - $this->eventSource->close(); - } + $updater->upgrade(); -}
\ No newline at end of file + $eventSource->send('done', ''); + $eventSource->close(); +} diff --git a/core/css/jquery.ocdialog.css b/core/css/jquery.ocdialog.css index c300b031afd..aa72eaf8474 100644 --- a/core/css/jquery.ocdialog.css +++ b/core/css/jquery.ocdialog.css @@ -35,7 +35,7 @@ position:absolute; top:7px; right:7px; height:20px; width:20px; - background:url('../img/actions/delete.svg') no-repeat center; + background:url('../img/actions/close.svg') no-repeat center; } .oc-dialog-dim { diff --git a/core/css/styles.css b/core/css/styles.css index 40a17a42876..d41577ee3cc 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -3,7 +3,7 @@ See the COPYING-README file. */ html, body, div, span, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, code, del, dfn, em, img, q, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, dialog, figure, footer, header, hgroup, nav, section { margin:0; padding:0; border:0; outline:0; font-weight:inherit; font-size:100%; font-family:inherit; vertical-align:baseline; cursor:default; } -html, body { height:100%; overflow:auto; } +html, body { height:100%; } article, aside, dialog, figure, footer, header, hgroup, nav, section { display:block; } body { line-height:1.5; } table { border-collapse:separate; border-spacing:0; white-space:nowrap; } @@ -19,17 +19,22 @@ 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), inset 0 -2px 10px #222; -webkit-box-shadow:0 0 10px rgba(0, 0, 0, .5), inset 0 -2px 10px #222; box-shadow:0 0 10px rgba(0, 0, 0, .5), inset 0 -2px 10px #222; } -#body-login #header { margin: -2em auto 0; text-align:center; height:10em; padding:1em 0 .5em; - -moz-box-shadow:0 0 1em rgba(0, 0, 0, .5); -webkit-box-shadow:0 0 1em rgba(0, 0, 0, .5); box-shadow:0 0 1em rgba(0, 0, 0, .5); -background:#1d2d44; /* Old browsers */ -background:-moz-linear-gradient(top, #35537a 0%, #1d2d44 100%); /* FF3.6+ */ -background:-webkit-gradient(linear, left top, left bottom, color-stop(0%,#35537a), color-stop(100%,#1d2d44)); /* Chrome,Safari4+ */ -background:-webkit-linear-gradient(top, #35537a 0%,#1d2d44 100%); /* Chrome10+,Safari5.1+ */ -background:-o-linear-gradient(top, #35537a 0%,#1d2d44 100%); /* Opera11.10+ */ -background:-ms-linear-gradient(top, #35537a 0%,#1d2d44 100%); /* IE10+ */ -background:linear-gradient(top, #35537a 0%,#1d2d44 100%); /* W3C */ -filter:progid:DXImageTransform.Microsoft.gradient( startColorstr='#35537a', endColorstr='#1d2d44',GradientType=0 ); /* IE6-9 */ } + -moz-box-shadow:0 0 10px rgba(0, 0, 0, .5), inset 0 -2px 10px #222; + -webkit-box-shadow:0 0 10px rgba(0, 0, 0, .5), inset 0 -2px 10px #222; + box-shadow:0 0 10px rgba(0, 0, 0, .5), inset 0 -2px 10px #222; +} + +#body-login { + text-align: center; + background: #1d2d44; /* Old browsers */ + background: url('../img/noise.png'), -moz-linear-gradient(top, #35537a 0%, #1d2d44 100%); /* FF3.6+ */ + background: url('../img/noise.png'), -webkit-gradient(linear, left top, left bottom, color-stop(0%,#35537a), color-stop(100%,#1d2d44)); /* Chrome,Safari4+ */ + background: url('../img/noise.png'), -webkit-linear-gradient(top, #35537a 0%,#1d2d44 100%); /* Chrome10+,Safari5.1+ */ + background: url('../img/noise.png'), -o-linear-gradient(top, #35537a 0%,#1d2d44 100%); /* Opera11.10+ */ + background: url('../img/noise.png'), -ms-linear-gradient(top, #35537a 0%,#1d2d44 100%); /* IE10+ */ + background: url('../img/noise.png'), linear-gradient(top, #35537a 0%,#1d2d44 100%); /* W3C */ + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#35537a', endColorstr='#1d2d44',GradientType=0 ); /* IE6-9 */ +} #owncloud { position:absolute; top:0; left:0; padding:6px; padding-bottom:0; } .header-right { float:right; vertical-align:middle; padding:0.5em; } @@ -109,30 +114,38 @@ a.disabled, a.disabled:hover, a.disabled:focus { /* Primary action button, use sparingly */ .primary, input[type="submit"].primary, input[type="button"].primary, button.primary, .button.primary { - border:1px solid #1d2d44; - background:#35537a; color:#ddd; text-shadow:#000 0 -1px 0; - -moz-box-shadow:0 0 1px #000,0 1px 1px #6d7d94 inset; -webkit-box-shadow:0 0 1px #000,0 1px 1px #6d7d94 inset; box-shadow:0 0 1px #000,0 1px 1px #6d7d94 inset; + 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:#2d3d54; color:#fff; text-shadow:#000 0 -1px 0; - -moz-box-shadow:0 0 1px #000,0 1px 1px #5d6d84 inset; -webkit-box-shadow:0 0 1px #000,0 1px 1px #5d6d84 inset; box-shadow:0 0 1px #000,0 1px 1px #5d6d84 inset; + 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 #fff,0 1px 1px 0 rgba(0,0,0,.2) inset; -webkit-box-shadow:0 1px 1px #fff,0 1px 1px 0 rgba(0,0,0,.2) inset; box-shadow:0 1px 1px #fff,0 1px 1px 0 rgba(0,0,0,.2) inset; + 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; } -#body-login input { font-size:1.5em; } -#body-login input[type="text"], #body-login input[type="password"] { width:13em; } -#body-login input.login { width:auto; float:right; padding:7px 9px 6px; } -#remember_login { margin:.8em .2em 0 1em; vertical-align:text-bottom; } .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; } -#select_all{ margin-top:.4em !important;} +#select_all{ margin-top:.4em } /* CONTENT ------------------------------------------------------------------ */ #controls { @@ -164,24 +177,67 @@ input[type="submit"].enabled { background:#66f866; border:1px solid #5e5; -moz-b #rightcontent, .rightcontent { position:fixed; top:6.4em; left:24.5em; overflow:auto } + + /* LOG IN & INSTALLATION ------------------------------------------------------------ */ -#body-login { background:#ddd; } + +/* Some whitespace to the top */ +#body-login #header { + padding-top: 100px; +} +/* Fix background gradient */ +#body-login { + background-attachment: fixed; +} + +/* Dark subtle label text */ +#body-login p.info, +#body-login form fieldset legend, +#body-login #datadirContent label, +#body-login form input[type="checkbox"]+label { + text-align: center; + color: #000; + text-shadow: 0 1px 0 rgba(255,255,255,.1); + -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=80)"; + filter: alpha(opacity=80); + opacity: .8; +} + #body-login div.buttons { text-align:center; } -#body-login p.info { width:22em; text-align:center; margin:2em auto; color:#777; text-shadow:#fff 0 1px 0; } -#body-login p.info a { font-weight:bold; color:#777; } +#body-login p.info { + width: 22em; + margin: 0 auto; + padding-top: 20px; +} +#body-login p.info a { + font-weight: bold; +} #body-login #submit.login { margin-right:7px; } /* quick fix for log in button not being aligned with input fields, should be properly fixed by input field width later */ -#login { min-height:30em; margin:2em auto 0; border-bottom:1px solid #f8f8f8; background:#eee; } -#login form { width:22em; margin:2em auto 2em; padding:0; } -#login form fieldset { margin-bottom:20px; } -#login form #adminaccount { margin-bottom:5px; } -#login form fieldset legend, #datadirContent label { - width:100%; text-align:center; - font-weight:bold; color:#999; text-shadow:0 1px 0 white; +#body-login form { width:22em; margin:2em auto 2em; padding:0; } +#body-login form fieldset { + margin-bottom: 20px; + text-align: left; +} +#body-login form #adminaccount { margin-bottom:5px; } +#body-login form fieldset legend, #datadirContent label { + width: 100%; + font-weight: bold; +} +#body-login #datadirContent label { + display: block; + margin: 0; +} +#body-login form #datadirField legend { + margin-bottom: 15px; +} +#body-login #showAdvanced { + padding: 13px; /* increase clickable area of Advanced dropdown */ +} +#body-login #showAdvanced img { + vertical-align: bottom; /* adjust position of Advanced dropdown arrow */ + margin-left: -4px; } -#login form fieldset legend a { color:#999; } -#login #datadirContent label { display:block; margin:0; color:#999; } -#login form #datadirField legend { margin-bottom:15px; } /* Icons for username and password fields to better recognize them */ #adminlogin, #adminpass, #user, #password { width:11.7em!important; padding-left:1.8em; } @@ -193,84 +249,194 @@ input[type="submit"].enabled { background:#66f866; border:1px solid #5e5; -moz-b input[name="password-clone"] { padding-left:1.8em; width:11.7em !important; } input[name="adminpass-clone"] { padding-left:1.8em; width:11.7em !important; } -/* Nicely grouping input field sets */ -.grouptop input { - margin-bottom:0; - border-bottom:0; border-bottom-left-radius:0; border-bottom-right-radius:0; +/* General new input field look */ +#body-login input[type="text"], +#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 3px rgba(0,0,0,.25) inset; + -webkit-box-shadow: 0 1px 0 rgba(255,255,255,.15), 0 1px 3px rgba(0,0,0,.25) inset; + box-shadow: 0 1px 0 rgba(255,255,255,.15), 0 1px 3px rgba(0,0,0,.25) inset; } -.groupmiddle input { - margin-top:0; margin-bottom:0; - border-top:0; border-bottom:0; border-radius:0; - box-shadow:0 1px 1px #fff,0 1px 0 #ddd inset; + +/* Nicely grouping input field sets */ +#body-login .grouptop input { + margin-bottom: 0; + border-bottom: 0; + border-bottom-left-radius: 0; + border-bottom-right-radius: 0; +} +#body-login .groupmiddle input { + margin-top: 0; + margin-bottom: 0; + 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; } -.groupbottom input { - margin-top:0; - border-top:0; border-top-right-radius:0; border-top-left-radius:0; - box-shadow:0 1px 1px #fff,0 1px 0 #ddd inset; +#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; } /* In field labels. No, HTML placeholder does not work as well. */ -#login form label { color:#666; } -#login .groupmiddle label, #login .groupbottom label { top:.65em; } +#body-login .groupmiddle label, #body-login .groupbottom label { top:.65em; } p.infield { position:relative; } label.infield { cursor:text !important; top:1.05em; left:.85em; } -#login form label.infield { /* labels are ellipsized when too long, keep them short */ +#body-login form label.infield { /* labels are ellipsized when too long, keep them short */ position:absolute; width:90%; padding-left:1.4em; font-size:19px; color:#aaa; white-space:nowrap; overflow:hidden; text-overflow:ellipsis; } -#login #databaseField .infield { padding-left:0; } -#login form input[type="checkbox"]+label { position:relative; margin:0; font-size:1em; text-shadow:#fff 0 1px 0; } -#login form .errors { background:#fed7d7; border:1px solid #f00; list-style-indent:inside; margin:0 0 2em; padding:1em; } -#login .success { background:#d7fed7; border:1px solid #0f0; width: 35%; margin: 30px auto; padding:1em; text-align: center;} +#body-login #databaseField .infield { padding-left:0; } +#body-login form input[type="checkbox"]+label { + position: relative; + margin: 0; + font-size: 1em; + padding: 14px; + padding-left: 28px; + margin-left: -28px; +} +#body-login form .errors { background:#fed7d7; border:1px solid #f00; list-style-indent:inside; margin:0 0 2em; padding:1em; } +#body-login .success { background:#d7fed7; border:1px solid #0f0; width: 35%; margin: 30px auto; padding:1em; text-align: center;} /* Show password toggle */ -#show, #dbpassword { position:absolute; right:1em; top:.8em; float:right; } -#show, #dbpassword, #personal-show { display:none; } -#show + label, #dbpassword + label { right:1em; top:1.25em!important; } -#show:checked + label, #dbpassword:checked + label, #personal-show:checked + label { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=80)"; filter:alpha(opacity=80); opacity:.8; } +#show, #dbpassword { + position: absolute; + right: 1em; + top: .8em; + float: right; +} +#show, #dbpassword, #personal-show { + display: none; +} +#show + label, #dbpassword + label { + right: 21px; + top: 15px !important; + margin: -14px !important; + padding: 14px !important; +} +#show:checked + label, #dbpassword:checked + label, #personal-show:checked + label { + -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=80)"; + filter: alpha(opacity=80); + opacity: .8; +} #show + label, #dbpassword + label, #personal-show + label { - position:absolute!important; height:14px; width:24px; - background-image:url("../img/actions/toggle.png"); background-repeat:no-repeat; - -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=30)"; filter:alpha(opacity=30); opacity:.3; + position: absolute !important; + height: 14px; + width: 24px; + background-image: url("../img/actions/toggle.png"); + background-repeat: no-repeat; + background-position: center; + -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=30)"; + filter: alpha(opacity=30); + opacity: .3; +} +#pass2, input[name="personal-password-clone"] { + padding: .6em 2.5em .4em .4em; + width: 8em; +} +#personal-show + label { + margin-top: 1em; + margin-left: -3em; +} +#passwordbutton { + margin-left: .5em; } -#pass2, input[name="personal-password-clone"] { padding:0.6em 2.5em 0.4em 0.4em; width:8em;} -#personal-show + label { margin-top:1em; margin-left:-3em; } -#passwordbutton { margin-left:0.5em; } /* Database selector */ -#login form #selectDbType { text-align:center; } -#login form #selectDbType label { +#body-login form #selectDbType { text-align:center; white-space: nowrap; } +#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; } -#login form #selectDbType label.ui-state-hover, #login form #selectDbType label.ui-state-active { color:#000; background-color:#e8e8e8; } +#body-login form #selectDbType label.ui-state-hover, #body-login form #selectDbType label.ui-state-active { color:#000; background-color:#e8e8e8; } + -/* Warnings, for information */ -.warning { +/* Warnings and errors are the same */ +.warning, .update, .error { display: block; - background-color: #f2dede; - color: #b94a48; - padding: 8px; - margin: 0 7px 5px; - border: 1px solid #eed3d7; + padding: 10px; + color: #dd3b3b; + text-shadow: 0 -1px 0 rgba(0,0,0,.3); + background-color: rgba(0,0,0,.3); + text-align: center; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; border-radius: 5px; + cursor: default; } .warning legend, -.warning a { - color: #b94a48 !important; +.warning a, +.error a { + color: #dd3b3b !important; + font-weight: bold; +} +/* Fixes for log in page, TODO should be removed some time */ +#body-login .update, +#body-login .error { + margin: 35px auto; +} +#body-login .warning { + margin: 0 7px 5px; font-weight: bold; } -/* Errors, for grave states */ -li.update, li.error { width:640px; margin:4em auto; padding:1em 1em 1em 4em; background:#ffe .8em .8em no-repeat; border:1px solid #ccc; -moz-border-radius:10px; -webkit-border-radius:10px; border-radius:10px; cursor:default; } -.error { color:#FF3B3B; } +#body-login .warning legend { + text-shadow: none; + -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; + filter: alpha(opacity=100); + opacity: 1; +} +#body-login a.warning { + cursor: pointer; +} + /* Alternative Logins */ #alternative-logins legend { margin-bottom:10px; } #alternative-logins li { height:40px; display:inline-block; white-space:nowrap; } +/* Log in and install button */ +#body-login input { + font-size: 1.5em; +} +#body-login input[type="text"], +#body-login input[type="password"] { + width: 13em; +} +#body-login input.login { + width: auto; + float: right; +} +#body-login input[type="submit"] { + padding: 10px 20px; /* larger log in and installation buttons */ +} +#remember_login { + margin: 18px 5px 0 18px; + vertical-align: text-bottom; +} + +/* Sticky footer */ +#body-login .wrapper { + min-height: 100%; + margin: 0 auto -70px; + width: 300px; +} +#body-login footer, #body-login .push { + height: 70px; +} + + + /* NAVIGATION ------------------------------------------------------------- */ #navigation { @@ -333,10 +499,16 @@ li.update, li.error { width:640px; margin:4em auto; padding:1em 1em 1em 4em; bac } #expanddiv a { display:block; color:#fff; text-shadow:0 -1px 0 #000; padding:0 8px; - -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=70)"; filter:alpha(opacity=70);opacity:.7; + -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=70)"; + filter:alpha(opacity=70); + opacity:.7; } #expanddiv a img { margin-bottom:-3px; } - #expanddiv a:hover, #expanddiv a:focus, #expanddiv a:active { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1; } + #expanddiv a:hover, #expanddiv a:focus, #expanddiv a:active { + -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; + filter:alpha(opacity=100); + opacity:1; + } /* VARIOUS REUSABLE SELECTORS */ @@ -383,7 +555,6 @@ div.jp-play-bar, div.jp-seek-bar { padding:0; } .pager li { display:inline-block; } .ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { overflow:hidden; text-overflow:ellipsis; } -.hint { background-image:url('../img/actions/info.png'); background-repeat:no-repeat; color:#777; padding-left:25px; background-position:0 0.3em;} .separator { display:inline; border-left:1px solid #d3d3d3; border-right:1px solid #fff; height:10px; width:0px; margin:4px; } a.bookmarklet { background-color:#ddd; border:1px solid #ccc; padding:5px;padding-top:0px;padding-bottom:2px; text-decoration:none; margin-top:5px } @@ -416,7 +587,13 @@ a.bookmarklet { background-color:#ddd; border:1px solid #ccc; padding:5px;paddin #oc-dialog-filepicker-content .filepicker_element_selected { background-color:lightblue;} .ui-dialog {position:fixed !important;} span.ui-icon {float: left; margin: 3px 7px 30px 0;} + .loading { background: url('../img/loading.gif') no-repeat center; cursor: wait; } +.move2trash { /* decrease spinner size */ + width: 16px; + height: 16px; +} + /* ---- CATEGORIES ---- */ #categoryform .scrollarea { position:absolute; left:10px; top:10px; right:10px; bottom:50px; overflow:auto; border:1px solid #ddd; background:#f8f8f8; } @@ -431,7 +608,7 @@ span.ui-icon {float: left; margin: 3px 7px 30px 0;} .popup { background-color:white; border-radius:10px 10px 10px 10px; box-shadow:0 0 20px #888; color:#333; padding:10px; position:fixed !important; z-index:200; } .popup.topright { top:7em; right:1em; } .popup.bottomleft { bottom:1em; left:33em; } -.popup .close { position:absolute; top:0.2em; right:0.2em; height:20px; width:20px; background:url('../img/actions/delete.svg') no-repeat center; } +.popup .close { position:absolute; top:0.2em; right:0.2em; height:20px; width:20px; background:url('../img/actions/close.svg') no-repeat center; } .popup h2 { font-weight:bold; font-size:1.2em; } .arrow { border-bottom:10px solid white; border-left:10px solid transparent; border-right:10px solid transparent; display:block; height:0; position:absolute; width:0; z-index:201; } .arrow.left { left:-13px; bottom:1.2em; -webkit-transform:rotate(270deg); -moz-transform:rotate(270deg); -o-transform:rotate(270deg); -ms-transform:rotate(270deg); transform:rotate(270deg); } @@ -655,19 +832,55 @@ div.crumb:active { /* icons */ .folder-icon { background-image: url('../img/places/folder.svg'); } .delete-icon { background-image: url('../img/actions/delete.svg'); } -.delete-icon:hover { background-image: url('../img/actions/delete-hover.svg'); } .edit-icon { background-image: url('../img/actions/rename.svg'); } /* buttons */ button.loading { background-image: url('../img/loading.gif'); background-position: right 10px center; background-repeat: no-repeat; + background-size: 16px; padding-right: 30px; } + + /* ---- BROWSER-SPECIFIC FIXES ---- */ + +/* remove dotted outlines in Firefox */ ::-moz-focus-inner { - border: 0; /* remove dotted outlines in Firefox */ + border: 0; +} + +/* IE8 needs background to be set to same color to make transparency look good. */ +.lte9 #body-login form input[type="text"] { + border: 1px solid lightgrey; /* use border to add 1px line between input fields */ + background-color: white; /* don't change background on hover */ +} +.lte9 #body-login form input[type="password"] { + /* leave out top border for 1px line between input fields*/ + border-left: 1px solid lightgrey; + border-right: 1px solid lightgrey; + border-bottom: 1px solid lightgrey; + background-color: white; /* don't change background on hover */ +} +.lte9 #body-login form label.infield { + background-color: white; /* don't change background on hover */ + -ms-filter: "progid:DXImageTransform.Microsoft.Chroma(color='white')"; +} +/* disable opacity of info text on gradient + sice we cannot set a good backround color to use the filter&background hack as with the input labels */ +.lte9 #body-login p.info { + filter: initial; +} +/* deactivate show password toggle for IE. Does not work for 8 and 9+ have their own implementation. */ +.ie #show, .ie #show+label { + display: none; + visibility: hidden; +} + +/* fix installation screen rendering issue for IE8+9 */ +.lte9 #body-login { + height: auto !important; } diff --git a/core/img/actions/add.png b/core/img/actions/add.png Binary files differindex 25d472b2dc4..1aac02b8454 100644 --- a/core/img/actions/add.png +++ b/core/img/actions/add.png diff --git a/core/img/actions/add.svg b/core/img/actions/add.svg index 136d6c4b311..250746e1660 100644 --- a/core/img/actions/add.svg +++ b/core/img/actions/add.svg @@ -1,10 +1,6 @@ <?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="22" width="22" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/"> - <defs> - <linearGradient id="a" y2="45.69" gradientUnits="userSpaceOnUse" x2="24.139" gradientTransform="matrix(.53994 0 0 .53668 -1.7557 -1.7859)" y1="6.5317" x1="24.139"> - <stop stop-color="#fff" offset="0"/> - <stop stop-color="#fff" stop-opacity="0" offset="1"/> - </linearGradient> - </defs> - <path opacity=".4" d="m8.5932 8.2152v-5.9948h5v5.9948h6v5.0052h-6v6h-5v-6h-6v-5.0052h6z" fill-rule="evenodd" stroke="url(#a)"/> +<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/"> + <g transform="matrix(-.70711 -.70711 .70711 -.70711 -724.85 752.16)"> + <path d="m1.6361 1040.9 2.8284-2.8284 3.5355 3.5355 3.5355-3.5355 2.8284 2.8284-3.5355 3.5355 3.5356 3.5356-2.8284 2.8284-3.5356-3.5356-3.5357 3.5354-2.8281-2.8281 3.5354-3.5357z"/> + </g> </svg> diff --git a/core/img/actions/caret-dark.png b/core/img/actions/caret-dark.png Binary files differindex 8ac5fbbd198..f84e87e0a82 100644 --- a/core/img/actions/caret-dark.png +++ b/core/img/actions/caret-dark.png diff --git a/core/img/actions/caret-dark.svg b/core/img/actions/caret-dark.svg index be45ad402bf..3a5318e6fa2 100644 --- a/core/img/actions/caret-dark.svg +++ b/core/img/actions/caret-dark.svg @@ -1,5 +1,13 @@ -<?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="10" width="10" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/"> - <path style="block-progression:tb;text-indent:0;color:#000000;text-transform:none" d="m1 2 4 8 4-7.989z" fill="#fff"/> - <path style="block-progression:tb;text-indent:0;color:#000000;text-transform:none" d="m1 1 4 8 4-7.989z" fill="#999"/> +<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" 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 style="block-progression:tb;text-indent:0;color:#000000;text-transform:none;" d="m4,5,4,7,4-6.989z" fill-opacity="0.19607843" fill="#FFF"/> + <path style="block-progression:tb;text-indent:0;color:#000000;text-transform:none;" fill="#000" d="m4,4,4,7,4-6.989z"/> </svg> diff --git a/core/img/actions/delete-hover.png b/core/img/actions/delete-hover.png Binary files differdeleted file mode 100644 index 048d91cee51..00000000000 --- a/core/img/actions/delete-hover.png +++ /dev/null diff --git a/core/img/actions/delete-hover.svg b/core/img/actions/delete-hover.svg deleted file mode 100644 index 3e8d26c9786..00000000000 --- a/core/img/actions/delete-hover.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="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/"> - <g transform="translate(0 -1036.4)"> - <path d="m3 1040.4 1-1 4 3 4-3 1 1-3 4 3 4-1 1-4-3-4 3-1-1 3-4z" fill="#d40000"/> - </g> -</svg> diff --git a/core/img/actions/delete.png b/core/img/actions/delete.png Binary files differindex fa8e18183ed..99f549faf9b 100644 --- a/core/img/actions/delete.png +++ b/core/img/actions/delete.png diff --git a/core/img/actions/delete.svg b/core/img/actions/delete.svg index ef564bfd482..568185c5c70 100644 --- a/core/img/actions/delete.svg +++ b/core/img/actions/delete.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="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/"> - <g transform="translate(0 -1036.4)"> - <path d="m3 1040.4 1-1 4 3 4-3 1 1-3 4 3 4-1 1-4-3-4 3-1-1 3-4z"/> - </g> + <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="#d40000" d="M8,1c-3.866,0-7,3.134-7,7s3.134,7,7,7,7-3.134,7-7-3.134-7-7-7zm-2.8438,2.75l2.8438,2.8438,2.844-2.8438,1.406,1.4062-2.8438,2.8438,2.8438,2.844-1.406,1.406-2.844-2.8438-2.8438,2.8438-1.4062-1.406,2.8438-2.844-2.8438-2.8438,1.4062-1.4062z"/> </svg> diff --git a/core/img/actions/lock.png b/core/img/actions/lock.png Binary files differindex dbcffa3990f..f3121811ea6 100644 --- a/core/img/actions/lock.png +++ b/core/img/actions/lock.png diff --git a/core/img/actions/mail.png b/core/img/actions/mail.png Binary files differindex 8e884fbc0ea..be6142444ae 100644 --- a/core/img/actions/mail.png +++ b/core/img/actions/mail.png diff --git a/core/img/actions/mail.svg b/core/img/actions/mail.svg index 2c63daac034..c01f2c113e7 100644 --- a/core/img/actions/mail.svg +++ b/core/img/actions/mail.svg @@ -1,8 +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" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/"> - <g> - <rect stroke-linejoin="round" height="10.244" width="15.244" stroke="#000" stroke-linecap="square" y="2.6281" x=".37806" stroke-width=".75613"/> - <path d="m-0.6 11 8.6-5l8.6 5" stroke="#fff" stroke-width="1px" fill="none"/> - <path d="m0 2.5 8 6.5 8-6.5" stroke="#fff" stroke-linecap="round" stroke-width="1px"/> - </g> +<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/"> + <path d="m0.88889 3c-0.49245 0-0.88889 0.3968-0.88889 0.8892v8.2228c0 0.492 0.39644 0.888 0.88889 0.888h14.222c0.493 0 0.889-0.396 0.889-0.888v-8.2228c0-0.4924-0.396-0.8892-0.889-0.8892zm0.75 1.0281 6.0833 6.0833h0.52778l6.1111-6.0833 0.61111 0.61111-3.6389 3.6944 2.75 2.8056-0.61111 0.61111-2.8056-2.8056-2.0278 2.0556h-1.2778l-2.0271-2.0552-2.8055 2.8332-0.6111-0.639 2.7777-2.8054-3.6666-3.6944z"/> </svg> diff --git a/core/img/actions/undelete.png b/core/img/actions/undelete.png Binary files differdeleted file mode 100644 index d712527ef61..00000000000 --- a/core/img/actions/undelete.png +++ /dev/null diff --git a/core/img/loader.gif b/core/img/loader.gif Binary files differdeleted file mode 100644 index e192ca895cd..00000000000 --- a/core/img/loader.gif +++ /dev/null diff --git a/core/img/loading-dark.gif b/core/img/loading-dark.gif Binary files differindex 5fe86acabc4..13f0f64eab1 100644 --- a/core/img/loading-dark.gif +++ b/core/img/loading-dark.gif diff --git a/core/img/loading.gif b/core/img/loading.gif Binary files differindex 5b33f7e54f4..f8f3dff6fb9 100644 --- a/core/img/loading.gif +++ b/core/img/loading.gif diff --git a/core/img/remoteStorage-big.png b/core/img/remoteStorage-big.png Binary files differdeleted file mode 100644 index 7e76e21209e..00000000000 --- a/core/img/remoteStorage-big.png +++ /dev/null diff --git a/core/img/weather-clear.png b/core/img/weather-clear.png Binary files differdeleted file mode 100644 index 0acf7a9b2af..00000000000 --- a/core/img/weather-clear.png +++ /dev/null diff --git a/core/js/eventsource.js b/core/js/eventsource.js index ce8c8387c8e..536b180bc8f 100644 --- a/core/js/eventsource.js +++ b/core/js/eventsource.js @@ -110,7 +110,11 @@ OC.EventSource.prototype={ this.listeners[type].push(callback); }else{ this.source.addEventListener(type,function(e){ - callback(JSON.parse(e.data)); + if (typeof e.data != 'undefined') { + callback(JSON.parse(e.data)); + } else { + callback(''); + } },false); } }else{ diff --git a/core/js/js.js b/core/js/js.js index b687c408bca..1d1711383f7 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -287,8 +287,12 @@ var OC={ var path=OC.filePath(app,'css',style+'.css'); if(OC.addStyle.loaded.indexOf(path)===-1){ OC.addStyle.loaded.push(path); - style=$('<link rel="stylesheet" type="text/css" href="'+path+'"/>'); - $('head').append(style); + if (document.createStyleSheet) { + document.createStyleSheet(path); + } else { + style=$('<link rel="stylesheet" type="text/css" href="'+path+'"/>'); + $('head').append(style); + } } }, basename: function(path) { @@ -427,6 +431,44 @@ OC.Notification={ OC.Breadcrumb={ container:null, crumbs:[], + show:function(dir, leafname, leaflink){ + OC.Breadcrumb.clear(); + + // show home + path in subdirectories + if (dir && dir !== '/') { + //add home + var link = OC.linkTo('files','index.php'); + + var crumb=$('<div/>'); + crumb.addClass('crumb'); + + var crumbLink=$('<a/>'); + crumbLink.attr('href',link); + + var crumbImg=$('<img/>'); + crumbImg.attr('src',OC.imagePath('core','places/home')); + crumbLink.append(crumbImg); + crumb.append(crumbLink); + OC.Breadcrumb.container.prepend(crumb); + OC.Breadcrumb.crumbs.push(crumb); + + //add path parts + var segments = dir.split('/'); + var pathurl = ''; + jQuery.each(segments, function(i,name) { + if (name !== '') { + pathurl = pathurl+'/'+name; + var link = OC.linkTo('files','index.php')+'?dir='+encodeURIComponent(pathurl); + OC.Breadcrumb.push(name, link); + } + }); + } + + //add leafname + if (leafname && leaflink) { + OC.Breadcrumb.push(leafname, leaflink); + } + }, push:function(name, link){ if(!OC.Breadcrumb.container){//default OC.Breadcrumb.container=$('#controls'); @@ -444,7 +486,7 @@ OC.Breadcrumb={ existing.removeClass('last'); existing.last().after(crumb); }else{ - OC.Breadcrumb.container.append(crumb); + OC.Breadcrumb.container.prepend(crumb); } OC.Breadcrumb.crumbs.push(crumb); return crumb; @@ -723,8 +765,6 @@ $(document).ready(function(){ $('.selectedActions a').tipsy({gravity:'s', fade:true, live:true}); $('a.delete').tipsy({gravity: 'e', fade:true, live:true}); $('a.action').tipsy({gravity:'s', fade:true, live:true}); - $('#headerSize').tipsy({gravity:'s', fade:true, live:true}); - $('td.filesize').tipsy({gravity:'s', fade:true, live:true}); $('td .modified').tipsy({gravity:'s', fade:true, live:true}); $('input').tipsy({gravity:'w', fade:true}); @@ -754,14 +794,6 @@ function humanFileSize(size) { return relativeSize + ' ' + readableFormat; } -function simpleFileSize(bytes) { - var mbytes = Math.round(bytes/(1024*1024/10))/10; - if(bytes == 0) { return '0'; } - else if(mbytes < 0.1) { return '< 0.1'; } - else if(mbytes > 1000) { return '> 1000'; } - else { return mbytes.toFixed(1); } -} - function formatDate(date){ if(typeof date=='number'){ date=new Date(date); diff --git a/core/js/setup.js b/core/js/setup.js index 76812b29979..c0df1ed96b0 100644 --- a/core/js/setup.js +++ b/core/js/setup.js @@ -11,42 +11,36 @@ $(document).ready(function() { $('#selectDbType').buttonset(); $('#datadirContent').hide(250); $('#databaseField').hide(250); - if($('#hasSQLite').val()=='true'){ + if($('#hasSQLite').val()){ $('#use_other_db').hide(); - $('#dbhost').hide(); - $('#dbhostlabel').hide(); + $('#use_oracle_db').hide(); } $('#adminlogin').change(function(){ $('#adminlogin').val($.trim($('#adminlogin').val())); }); $('#sqlite').click(function() { $('#use_other_db').slideUp(250); - $('#dbhost').hide(250); - $('#dbhostlabel').hide(250); + $('#use_oracle_db').slideUp(250); }); $('#mysql').click(function() { $('#use_other_db').slideDown(250); - $('#dbhost').show(250); - $('#dbhostlabel').show(250); + $('#use_oracle_db').slideUp(250); }); - + $('#pgsql').click(function() { $('#use_other_db').slideDown(250); - $('#dbhost').show(250); - $('#dbhostlabel').show(250); + $('#use_oracle_db').slideUp(250); }); - + $('#oci').click(function() { $('#use_other_db').slideDown(250); - $('#dbhost').show(250); - $('#dbhostlabel').show(250); + $('#use_oracle_db').show(250); }); - + $('#mssql').click(function() { $('#use_other_db').slideDown(250); - $('#dbhost').show(250); - $('#dbhostlabel').show(250); + $('#use_oracle_db').slideUp(250); }); $('input[checked]').trigger('click'); diff --git a/core/js/share.js b/core/js/share.js index 21e352ee1c6..b4b5159b0b5 100644 --- a/core/js/share.js +++ b/core/js/share.js @@ -92,6 +92,7 @@ OC.Share={ } } if (shares) { + OC.Share.statuses[itemSource] = OC.Share.statuses[itemSource] || {}; OC.Share.statuses[itemSource]['link'] = link; } else { delete OC.Share.statuses[itemSource]; @@ -122,7 +123,12 @@ OC.Share={ callback(result.data); } } else { - OC.dialogs.alert(result.data.message, t('core', 'Error while sharing')); + if (result.data && result.data.message) { + var msg = result.data.message; + } else { + var msg = t('core', 'Error'); + } + OC.dialogs.alert(msg, t('core', 'Error while sharing')); } }); }, @@ -161,7 +167,12 @@ OC.Share={ // respective checkbox should be checked or // not. + var publicUploadEnabled = $('#filestable').data('allow-public-upload'); + if (typeof publicUploadEnabled == 'undefined') { + publicUploadEnabled = 'no'; + } var allowPublicUploadStatus = false; + $.each(data.shares, function(key, value) { if (allowPublicUploadStatus) { return true; @@ -181,7 +192,7 @@ OC.Share={ html += '<div id="linkPass">'; html += '<input id="linkPassText" type="password" placeholder="'+t('core', 'Password')+'" />'; html += '</div>'; - if (itemType === 'folder' && (possiblePermissions & OC.PERMISSION_CREATE)) { + if (itemType === 'folder' && (possiblePermissions & OC.PERMISSION_CREATE) && publicUploadEnabled === 'yes') { html += '<div id="allowPublicUploadWrapper" style="display:none;">'; html += '<input type="checkbox" value="1" name="allowPublicUpload" id="sharingDialogAllowPublicUpload"' + ((allowPublicUploadStatus) ? 'checked="checked"' : '') + ' />'; html += '<label for="sharingDialogAllowPublicUpload">' + t('core', 'Allow Public Upload') + '</label>'; @@ -581,8 +592,7 @@ $(document).ready(function() { } // Update the share information - OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, '', permissions, function(data) { - return; + OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, '', permissions, function(data) { }); }); @@ -598,13 +608,26 @@ $(document).ready(function() { }); $(document).on('focusout keyup', '#dropdown #linkPassText', function(event) { - if ( $('#linkPassText').val() != '' && (event.type == 'focusout' || event.keyCode == 13) ) { - var itemType = $('#dropdown').data('item-type'); - var itemSource = $('#dropdown').data('item-source'); - OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, $('#linkPassText').val(), OC.PERMISSION_READ, function() { - console.log("password set to: '" + $('#linkPassText').val() +"' by event: " + event.type); - $('#linkPassText').val(''); - $('#linkPassText').attr('placeholder', t('core', 'Password protected')); + var linkPassText = $('#linkPassText'); + if ( linkPassText.val() != '' && (event.type == 'focusout' || event.keyCode == 13) ) { + + var allowPublicUpload = $('#sharingDialogAllowPublicUpload').is(':checked'); + var dropDown = $('#dropdown'); + var itemType = dropDown.data('item-type'); + var itemSource = dropDown.data('item-source'); + var permissions = 0; + + // Calculate permissions + if (allowPublicUpload) { + permissions = OC.PERMISSION_UPDATE + OC.PERMISSION_CREATE + OC.PERMISSION_READ; + } else { + permissions = OC.PERMISSION_READ; + } + + OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, $('#linkPassText').val(), permissions, function() { + console.log("password set to: '" + linkPassText.val() +"' by event: " + event.type); + linkPassText.val(''); + linkPassText.attr('placeholder', t('core', 'Password protected')); }); } }); diff --git a/core/js/update.js b/core/js/update.js index 8ab02bbf935..2c28e72f7cd 100644 --- a/core/js/update.js +++ b/core/js/update.js @@ -5,6 +5,9 @@ $(document).ready(function () { }); updateEventSource.listen('error', function(message) { $('<span>').addClass('error').append(message).append('<br />').appendTo($('.update')); + message = 'Please reload the page.'; + $('<span>').addClass('error').append(message).append('<br />').appendTo($('.update')); + updateEventSource.close(); }); updateEventSource.listen('failure', function(message) { $('<span>').addClass('error').append(message).append('<br />').appendTo($('.update')); @@ -20,4 +23,4 @@ $(document).ready(function () { window.location.href = OC.webroot; }, 3000); }); -});
\ No newline at end of file +}); diff --git a/core/l10n/ar.php b/core/l10n/ar.php index b18ee712cfa..b236e63082c 100644 --- a/core/l10n/ar.php +++ b/core/l10n/ar.php @@ -102,11 +102,9 @@ "Add" => "اضف", "Security Warning" => "تحذير أمان", "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)", -"Please update your PHP installation to use ownCloud securely." => "Please update your PHP installation to use ownCloud securely.", "No secure random number generator is available, please enable the PHP OpenSSL extension." => "لا يوجد مولّد أرقام عشوائية ، الرجاء تفعيل الـ PHP OpenSSL extension.", "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "بدون وجود مولد أرقام عشوائية آمن قد يتمكن المهاجم من التنبؤ بكلمات اعادة ضبط كلمة المرور والتمكن من السيطرة على حسابك", "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "مجلدات البيانات والملفات الخاصة قد تكون قابلة للوصول اليها عن طريق شبكة الانترنت وذلك بسبب ان ملف .htaccess لا يعمل بشكل صحيح.", -"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "للحصول على معلومات عن كيفية اعداد الخادم الخاص بك , يرجى زيارة الرابط التالي <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>.", "Create an <strong>admin account</strong>" => "أضف </strong>مستخدم رئيسي <strong>", "Advanced" => "تعديلات متقدمه", "Data folder" => "مجلد المعلومات", diff --git a/core/l10n/ca.php b/core/l10n/ca.php index 80f0e558a67..497067b09fb 100644 --- a/core/l10n/ca.php +++ b/core/l10n/ca.php @@ -110,11 +110,11 @@ "Add" => "Afegeix", "Security Warning" => "Avís de seguretat", "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "La versió de PHP que useu és vulnerable a l'atac per NULL Byte (CVE-2006-7243)", -"Please update your PHP installation to use ownCloud securely." => "Actualitzeu la instal·lació de PHP per usar ownCloud de forma segura.", +"Please update your PHP installation to use %s securely." => "Actualitzeu la instal·lació de PHP per usar %s de forma segura.", "No secure random number generator is available, please enable the PHP OpenSSL extension." => "No està disponible el generador de nombres aleatoris segurs, habiliteu l'extensió de PHP OpenSSL.", "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Sense un generador de nombres aleatoris segurs un atacant podria predir els senyals per restablir la contrasenya i prendre-us el compte.", "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "La carpeta de dades i els seus fitxers probablement són accessibles des d'internet perquè el fitxer .htaccess no funciona.", -"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Per més informació sobre com configurar correctament el servidor, mireu la <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentació</a>.", +"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Per informació de com configurar el servidor, comproveu la <a href=\"%s\" target=\"_blank\">documentació</a>.", "Create an <strong>admin account</strong>" => "Crea un <strong>compte d'administrador</strong>", "Advanced" => "Avançat", "Data folder" => "Carpeta de dades", diff --git a/core/l10n/cs_CZ.php b/core/l10n/cs_CZ.php index b0e70938d4a..8974840994a 100644 --- a/core/l10n/cs_CZ.php +++ b/core/l10n/cs_CZ.php @@ -50,7 +50,7 @@ "The object type is not specified." => "Není určen typ objektu.", "Error" => "Chyba", "The app name is not specified." => "Není určen název aplikace.", -"The required file {file} is not installed!" => "Požadovaný soubor {file} není nainstalován.", +"The required file {file} is not installed!" => "Požadovaný soubor {file} není nainstalován!", "Shared" => "Sdílené", "Share" => "Sdílet", "Error while sharing" => "Chyba při sdílení", @@ -88,11 +88,11 @@ "ownCloud password reset" => "Obnovení hesla pro ownCloud", "Use the following link to reset your password: {link}" => "Heslo obnovíte použitím následujícího odkazu: {link}", "The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Odkaz na obnovení hesla byl odeslán na vaši e-mailovou adresu.<br>Pokud jej v krátké době neobdržíte, zkontrolujte váš koš a složku spam.<br>Pokud jej nenaleznete, kontaktujte svého správce.", -"Request failed!<br>Did you make sure your email/username was right?" => "Požadavek selhal.<br>Ujistili jste se, že vaše uživatelské jméno a e-mail jsou správně?", -"You will receive a link to reset your password via Email." => "Bude Vám e-mailem zaslán odkaz pro obnovu hesla.", +"Request failed!<br>Did you make sure your email/username was right?" => "Požadavek selhal!<br>Ujistili jste se, že vaše uživatelské jméno a e-mail jsou správně?", +"You will receive a link to reset your password via Email." => "E-mailem Vám bude zaslán odkaz pro obnovu hesla.", "Username" => "Uživatelské jméno", -"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Vaše soubory jsou šifrovány. Pokud nemáte povolen klíč obnovy, neexistuje způsob jak získat po obnově hesla vaše data. Pokud si nejste jisti co dělat, kontaktujte nejprve svého správce. Opravdu si přejete pokračovat?", -"Yes, I really want to reset my password now" => "Ano, opravdu si nyní přeji obnovit své heslo", +"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Vaše soubory jsou šifrovány. Pokud nemáte povolen klíč pro obnovu, neexistuje způsob jak získat, po změně hesla, vaše data. Pokud si nejste jisti co dělat, kontaktujte nejprve svého správce. Opravdu si přejete pokračovat?", +"Yes, I really want to reset my password now" => "Ano, opravdu si nyní přeji obnovit mé heslo", "Request reset" => "Vyžádat obnovu", "Your password was reset" => "Vaše heslo bylo obnoveno", "To login page" => "Na stránku přihlášení", @@ -105,16 +105,16 @@ "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", +"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í", "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Verze vašeho PHP je napadnutelná pomocí techniky \"NULL Byte\" (CVE-2006-7243)", -"Please update your PHP installation to use ownCloud securely." => "Aktualizujte prosím vaši instanci PHP pro bezpečné používání ownCloud.", +"Please update your PHP installation to use %s securely." => "Aktualizujte prosím vaši instanci PHP pro bezpečné používání %s.", "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Není dostupný žádný bezpečný generátor náhodných čísel. Povolte, prosím, rozšíření OpenSSL v PHP.", "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Bez bezpečného generátoru náhodných čísel může útočník předpovědět token pro obnovu hesla a převzít kontrolu nad Vaším účtem.", "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Váš adresář s daty a soubory jsou dostupné z internetu, protože soubor .htaccess nefunguje.", -"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Pro informace jak správně nastavit váš server se podívejte do <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">dokumentace</a>.", +"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Pro informace, jak správně nastavit váš server, se podívejte do <a href=\"%s\" target=\"_blank\">dokumentace</a>.", "Create an <strong>admin account</strong>" => "Vytvořit <strong>účet správce</strong>", "Advanced" => "Pokročilé", "Data folder" => "Složka s daty", @@ -128,14 +128,14 @@ "Finish setup" => "Dokončit nastavení", "%s is available. Get more information on how to update." => "%s je dostupná. Získejte více informací k postupu aktualizace.", "Log out" => "Odhlásit se", -"Automatic logon rejected!" => "Automatické přihlášení odmítnuto.", -"If you did not change your password recently, your account may be compromised!" => "V nedávné době jste nezměnili své heslo, Váš účet může být kompromitován.", +"Automatic logon rejected!" => "Automatické přihlášení odmítnuto!", +"If you did not change your password recently, your account may be compromised!" => "Pokud jste v nedávné době neměnili své heslo, Váš účet může být kompromitován!", "Please change your password to secure your account again." => "Změňte, prosím, své heslo pro opětovné zabezpečení Vašeho účtu.", "Lost your password?" => "Ztratili jste své heslo?", "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", +"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", "prev" => "předchozí", "next" => "následující", "Updating ownCloud to version %s, this may take a while." => "Aktualizuji ownCloud na verzi %s, bude to chvíli trvat." diff --git a/core/l10n/cy_GB.php b/core/l10n/cy_GB.php index aeb2995e6bd..0f9d9205a60 100644 --- a/core/l10n/cy_GB.php +++ b/core/l10n/cy_GB.php @@ -104,11 +104,9 @@ "Add" => "Ychwanegu", "Security Warning" => "Rhybudd Diogelwch", "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Mae eich fersiwn PHP yn agored i ymosodiad NULL Byte (CVE-2006-7243)", -"Please update your PHP installation to use ownCloud securely." => "Diweddarwch eich PHP i ddefnyddio ownCloud yn ddiogel.", "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Does dim cynhyrchydd rhifau hap diogel ar gael, galluogwch estyniad PHP OpenSSL.", "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Heb gynhyrchydd rhifau hap diogel efallai y gall ymosodwr ragweld tocynnau ailosod cyfrinair a meddiannu eich cyfrif.", "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Mwy na thebyg fod modd cyrraedd eich cyfeiriadur data a ffeilau o'r rhyngrwyd oherwydd nid yw'r ffeil .htaccess yn gweithio. ", -"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Am wybodaeth ar sut i gyflunio'r gweinydd yn gywir, cyfeiriwch at y <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">ddogfennaeth</a>.", "Create an <strong>admin account</strong>" => "Crewch <strong>gyfrif gweinyddol</strong>", "Advanced" => "Uwch", "Data folder" => "Plygell data", diff --git a/core/l10n/da.php b/core/l10n/da.php index 2e84c3ff511..5646acd3dca 100644 --- a/core/l10n/da.php +++ b/core/l10n/da.php @@ -1,4 +1,5 @@ <?php $TRANSLATIONS = array( +"%s shared »%s« with you" => "%s delte »%s« med sig", "Category type not provided." => "Kategori typen ikke er fastsat.", "No category to add?" => "Ingen kategori at tilføje?", "This category already exists: %s" => "Kategorien eksisterer allerede: %s", @@ -61,6 +62,7 @@ "Share with link" => "Del med link", "Password protect" => "Beskyt med adgangskode", "Password" => "Kodeord", +"Allow Public Upload" => "Tillad Offentlig Upload", "Email link to person" => "E-mail link til person", "Send" => "Send", "Set expiration date" => "Vælg udløbsdato", @@ -89,6 +91,7 @@ "Request failed!<br>Did you make sure your email/username was right?" => "Anmodning mislykkedes!<br>Er du sikker på at din e-post / brugernavn var korrekt?", "You will receive a link to reset your password via Email." => "Du vil modtage et link til at nulstille dit kodeord via email.", "Username" => "Brugernavn", +"Yes, I really want to reset my password now" => "Ja, Jeg ønsker virkelig at nulstille mit kodeord", "Request reset" => "Anmod om nulstilling", "Your password was reset" => "Dit kodeord blev nulstillet", "To login page" => "Til login-side", @@ -105,11 +108,10 @@ "Add" => "Tilføj", "Security Warning" => "Sikkerhedsadvarsel", "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Din PHP-version er sårbar overfor et NULL Byte angreb (CVE-2006-7243)", -"Please update your PHP installation to use ownCloud securely." => "Opdater venligs din PHP-installation for at kunne bruge ownCloud sikkert.", +"Please update your PHP installation to use %s securely." => "Opdater venligst din PHP installation for at anvende %s sikkert.", "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Ingen sikker tilfældighedsgenerator til tal er tilgængelig. Aktiver venligst OpenSSL udvidelsen.", "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Uden en sikker tilfældighedsgenerator til tal kan en angriber måske gætte dit gendan kodeord og overtage din konto", "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Dine data mappe og filer er sandsynligvis tilgængelige fra internettet fordi .htaccess filen ikke virker.", -"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "For at vide mere om hvordan du konfigurerer din server ordentligt, se venligst <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">dokumentationen</a>.", "Create an <strong>admin account</strong>" => "Opret en <strong>administratorkonto</strong>", "Advanced" => "Avanceret", "Data folder" => "Datamappe", diff --git a/core/l10n/de.php b/core/l10n/de.php index c33045eb7b6..fe4b3d5fd8e 100644 --- a/core/l10n/de.php +++ b/core/l10n/de.php @@ -62,6 +62,7 @@ "Share with link" => "Über einen Link freigegeben", "Password protect" => "Passwortschutz", "Password" => "Passwort", +"Allow Public Upload" => "Öffentliches Hochladen erlauben", "Email link to person" => "Link per E-Mail verschicken", "Send" => "Senden", "Set expiration date" => "Setze ein Ablaufdatum", @@ -109,11 +110,11 @@ "Add" => "Hinzufügen", "Security Warning" => "Sicherheitswarnung", "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Deine PHP Version ist durch die NULL Byte Attacke (CVE-2006-7243) angreifbar", -"Please update your PHP installation to use ownCloud securely." => "Bitte bringe Deine PHP Installation auf den neuesten Stand, um ownCloud sicher nutzen zu können.", +"Please update your PHP installation to use %s securely." => "Bitte aktualisiere deine PHP-Installation um %s sicher nutzen zu können.", "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Es ist kein sicherer Zufallszahlengenerator verfügbar, bitte aktiviere die PHP-Erweiterung für OpenSSL.", "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Ohne einen sicheren Zufallszahlengenerator sind Angreifer in der Lage die Tokens für das Zurücksetzen der Passwörter vorherzusehen und Konten zu übernehmen.", "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Dein Datenverzeichnis und Deine Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert.", -"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Bitte ließ die <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">Dokumentation</a> für Informationen, wie Du Deinen Server konfigurierst.", +"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Für Informationen, wie du deinen Server richtig konfigurierst lese bitte die <a href=\"%s\" target=\"_blank\">Dokumentation</a>.", "Create an <strong>admin account</strong>" => "<strong>Administrator-Konto</strong> anlegen", "Advanced" => "Fortgeschritten", "Data folder" => "Datenverzeichnis", diff --git a/core/l10n/de_DE.php b/core/l10n/de_DE.php index 9d5a7298e19..4242bbb1aae 100644 --- a/core/l10n/de_DE.php +++ b/core/l10n/de_DE.php @@ -62,7 +62,7 @@ "Share with link" => "Über einen Link teilen", "Password protect" => "Passwortschutz", "Password" => "Passwort", -"Allow Public Upload" => "Erlaube öffentliches hochladen", +"Allow Public Upload" => "Öffentliches Hochladen erlauben", "Email link to person" => "Link per E-Mail verschicken", "Send" => "Senden", "Set expiration date" => "Ein Ablaufdatum setzen", @@ -91,7 +91,7 @@ "Request failed!<br>Did you make sure your email/username was right?" => "Anfrage fehlgeschlagen!<br>Haben Sie darauf geachtet, dass E-Mail-Adresse/Nutzername korrekt waren?", "You will receive a link to reset your password via Email." => "Sie erhalten einen Link per E-Mail, um Ihr Passwort zurückzusetzen.", "Username" => "Benutzername", -"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Ihre Dateien sind verschlüsselt. Wenn Sie den Wiederherstellungsschlüssel nicht aktiviert haben, wird es keinen Weg geben, um Ihre Daten wieder zu bekommen, nachdem Ihr Passwort zurückgesetzt wurde. Wenn Sie sich nicht sicher sind, was Sie tun sollen, wenden Sie sich bitte an Ihren Administrator, bevor Sie fortfahren. Wollen Sie wirklich fortfahren?", +"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Ihre Dateien sind verschlüsselt. Wenn Sie den Wiederherstellungsschlüssel nicht aktiviert haben, wird es keine Möglichkeit geben, um Ihre Daten wiederzubekommen, nachdem Ihr Passwort zurückgesetzt wurde. Wenn Sie sich nicht sicher sind, was Sie tun sollen, wenden Sie sich bitte an Ihren Administrator, bevor Sie fortfahren. Wollen Sie wirklich fortfahren?", "Yes, I really want to reset my password now" => "Ja, ich möchte jetzt mein Passwort wirklich zurücksetzen.", "Request reset" => "Zurücksetzung anfordern", "Your password was reset" => "Ihr Passwort wurde zurückgesetzt.", @@ -110,11 +110,11 @@ "Add" => "Hinzufügen", "Security Warning" => "Sicherheitshinweis", "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Ihre PHP Version ist durch die NULL Byte Attacke (CVE-2006-7243) angreifbar", -"Please update your PHP installation to use ownCloud securely." => "Bitte bringen Sie Ihre PHP Version auf den neuesten Stand um ownCloud sicher nutzen zu können.", +"Please update your PHP installation to use %s securely." => "Bitte aktualisieren Sie Ihre PHP-Installation um %s sicher nutzen zu können.", "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Es ist kein sicherer Zufallszahlengenerator verfügbar, bitte aktivieren Sie die PHP-Erweiterung für OpenSSL.", "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Ohne einen sicheren Zufallszahlengenerator sind Angreifer in der Lage, die Tokens für das Zurücksetzen der Passwörter vorherzusehen und Ihr Konto zu übernehmen.", "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Ihr Datenverzeichnis und Ihre Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert.", -"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Bitte lesen Sie die <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">Dokumentation</a> für Informationen, wie Sie Ihren Server konfigurieren.", +"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Für Informationen, wie Sie Ihren Server richtig konfigurieren lesen Sie bitte die <a href=\"%s\" target=\"_blank\">Dokumentation</a>.", "Create an <strong>admin account</strong>" => "<strong>Administrator-Konto</strong> anlegen", "Advanced" => "Fortgeschritten", "Data folder" => "Datenverzeichnis", diff --git a/core/l10n/el.php b/core/l10n/el.php index 2dcfa1bb698..80f14feafe5 100644 --- a/core/l10n/el.php +++ b/core/l10n/el.php @@ -43,6 +43,7 @@ "years ago" => "χρόνια πριν", "Choose" => "Επιλέξτε", "Cancel" => "Άκυρο", +"Error loading file picker template" => "Σφάλμα φόρτωσης αρχείου επιλογέα προτύπου", "Yes" => "Ναι", "No" => "Όχι", "Ok" => "Οκ", @@ -61,6 +62,7 @@ "Share with link" => "Διαμοιρασμός με σύνδεσμο", "Password protect" => "Προστασία συνθηματικού", "Password" => "Συνθηματικό", +"Allow Public Upload" => "Να επιτρέπεται η Δημόσια Αποστολή", "Email link to person" => "Αποστολή συνδέσμου με email ", "Send" => "Αποστολή", "Set expiration date" => "Ορισμός ημ. λήξης", @@ -108,11 +110,11 @@ "Add" => "Προσθήκη", "Security Warning" => "Προειδοποίηση Ασφαλείας", "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Η PHP ειναι ευαλωτη στην NULL Byte επιθεση (CVE-2006-7243)", -"Please update your PHP installation to use ownCloud securely." => "Παρακαλώ ενημερώστε την εγκατάσταση PHP σας ώστε να χρησιμοποιήσετε ασφαλέστερα το ownCloud.", +"Please update your PHP installation to use %s securely." => "Παρακαλώ ενημερώστε την εγκατάσταση της PHP ώστε να χρησιμοποιήσετε το %s με ασφάλεια.", "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Δεν είναι διαθέσιμο το πρόσθετο δημιουργίας τυχαίων αριθμών ασφαλείας, παρακαλώ ενεργοποιήστε το πρόσθετο της PHP, OpenSSL.", "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Χωρίς το πρόσθετο δημιουργίας τυχαίων αριθμών ασφαλείας, μπορεί να διαρρεύσει ο λογαριασμός σας από επιθέσεις στο διαδίκτυο.", "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Ο κατάλογος δεδομένων και τα αρχεία σας είναι πιθανό προσβάσιμα από το internet γιατί δεν δουλεύει το αρχείο .htaccess.", -"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Για πληροφορίες σχετικά με την σωστή ρύθμιση του διακομιστή σας, δείτε στην <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">τεκμηρίωση</a>.", +"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Για πληροφορίες πως να ρυθμίσετε ορθά τον διακομιστή σας, παρακαλώ δείτε την <a href=\"%s\" target=\"_blank\">τεκμηρίωση</a>.", "Create an <strong>admin account</strong>" => "Δημιουργήστε έναν <strong>λογαριασμό διαχειριστή</strong>", "Advanced" => "Για προχωρημένους", "Data folder" => "Φάκελος δεδομένων", diff --git a/core/l10n/eo.php b/core/l10n/eo.php index 00f925e5274..db611139344 100644 --- a/core/l10n/eo.php +++ b/core/l10n/eo.php @@ -106,7 +106,6 @@ "Add" => "Aldoni", "Security Warning" => "Sekureca averto", "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Via PHP versio estas sendefenda je la NULL bajto atako (CVE-2006-7243)", -"Please update your PHP installation to use ownCloud securely." => "Bonvolu ĝisdatigi vian instalon de PHP por uzi ownCloud-on sekure.", "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Ne disponeblas sekura generilo de hazardaj numeroj; bonvolu kapabligi la OpenSSL-kromaĵon por PHP.", "Create an <strong>admin account</strong>" => "Krei <strong>administran konton</strong>", "Advanced" => "Progresinta", diff --git a/core/l10n/es.php b/core/l10n/es.php index ae98a019db1..84064e54add 100644 --- a/core/l10n/es.php +++ b/core/l10n/es.php @@ -110,11 +110,11 @@ "Add" => "Agregar", "Security Warning" => "Advertencia de seguridad", "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Su versión de PHP es vulnerable al ataque de Byte NULL (CVE-2006-7243)", -"Please update your PHP installation to use ownCloud securely." => "Por favor, actualice su instalación de PHP para utilizar ownCloud de manera segura.", +"Please update your PHP installation to use %s securely." => "Por favor, actualice su instalación PHP para usar %s con seguridad.", "No secure random number generator is available, please enable the PHP OpenSSL extension." => "No está disponible un generador de números aleatorios seguro, por favor habilite la extensión OpenSSL de PHP.", "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Sin un generador de números aleatorios seguro, un atacante podría predecir los tokens de restablecimiento de contraseñas y tomar el control de su cuenta.", "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Su directorio de datos y sus archivos probablemente sean accesibles a través de internet ya que el archivo .htaccess no funciona.", -"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Para información sobre cómo configurar adecuadamente su servidor, por favor vea la <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentación</a>.", +"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Para información de cómo configurar apropiadamente su servidor, por favor vea la <a href=\"%s\" target=\"_blank\">documentación</a>.", "Create an <strong>admin account</strong>" => "Crear una <strong>cuenta de administrador</strong>", "Advanced" => "Avanzado", "Data folder" => "Directorio de datos", diff --git a/core/l10n/es_AR.php b/core/l10n/es_AR.php index 1fac1c88dad..1f8f5a80127 100644 --- a/core/l10n/es_AR.php +++ b/core/l10n/es_AR.php @@ -62,6 +62,7 @@ "Share with link" => "Compartir con enlace", "Password protect" => "Proteger con contraseña ", "Password" => "Contraseña", +"Allow Public Upload" => "Permitir Subida Pública", "Email link to person" => "Enviar el enlace por e-mail.", "Send" => "Mandar", "Set expiration date" => "Asignar fecha de vencimiento", @@ -109,11 +110,9 @@ "Add" => "Agregar", "Security Warning" => "Advertencia de seguridad", "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "La versión de PHP que tenés, es vulnerable al ataque de byte NULL (CVE-2006-7243)", -"Please update your PHP installation to use ownCloud securely." => "Actualizá tu instalación de PHP para usar ownCloud de manera segura.", "No secure random number generator is available, please enable the PHP OpenSSL extension." => "No hay disponible ningún generador de números aleatorios seguro. Por favor, habilitá la extensión OpenSSL de PHP.", "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Sin un generador de números aleatorios seguro un atacante podría predecir las pruebas de reinicio de tu contraseña y tomar control de tu cuenta.", "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Tu directorio de datos y tus archivos probablemente son accesibles a través de internet, ya que el archivo .htaccess no está funcionando.", -"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Para información sobre cómo configurar adecuadamente tu servidor, por favor mirá la <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentación</a>.", "Create an <strong>admin account</strong>" => "Crear una <strong>cuenta de administrador</strong>", "Advanced" => "Avanzado", "Data folder" => "Directorio de almacenamiento", diff --git a/core/l10n/et_EE.php b/core/l10n/et_EE.php index ec850491b79..869972a8b83 100644 --- a/core/l10n/et_EE.php +++ b/core/l10n/et_EE.php @@ -110,11 +110,11 @@ "Add" => "Lisa", "Security Warning" => "Turvahoiatus", "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Sinu PHP versioon on haavatav NULL Baidi (CVE-2006-7243) rünnakuga.", -"Please update your PHP installation to use ownCloud securely." => "Palun uuenda oma paigaldatud PHP-d tagamaks ownCloudi turvalisus.", +"Please update your PHP installation to use %s securely." => "Palun uuenda oma paigaldatud PHP-d tagamaks %s turvalisus.", "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Turvalist juhuslike numbrite generaatorit pole saadaval. Palun luba PHP-s OpenSSL laiendus.", "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Ilma turvalise juhuslike numbrite generaatorita võib ründaja ennustada paroolivahetuse võtme ning hõivata su konto.", "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Su andmete kataloog ja failid on tõenäoliselt internetist vabalt saadaval kuna .htaccess fail ei toimi.", -"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Serveri korrektseks seadistuseks tutvu palun <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">dokumentatsiooniga</a>.", +"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Serveri korrektseks seadistuseks palun tutvu <a href=\"%s\" target=\"_blank\">dokumentatsiooniga</a>.", "Create an <strong>admin account</strong>" => "Loo <strong>admini konto</strong>", "Advanced" => "Täpsem", "Data folder" => "Andmete kaust", diff --git a/core/l10n/eu.php b/core/l10n/eu.php index 4242d975f3b..016e96b751f 100644 --- a/core/l10n/eu.php +++ b/core/l10n/eu.php @@ -1,4 +1,5 @@ <?php $TRANSLATIONS = array( +"%s shared »%s« with you" => "%s-ek »%s« zurekin partekatu du", "Category type not provided." => "Kategoria mota ez da zehaztu.", "No category to add?" => "Ez dago gehitzeko kategoriarik?", "This category already exists: %s" => "Kategoria hau dagoeneko existitzen da: %s", @@ -42,6 +43,7 @@ "years ago" => "urte", "Choose" => "Aukeratu", "Cancel" => "Ezeztatu", +"Error loading file picker template" => "Errorea fitxategi hautatzaile txantiloiak kargatzerakoan", "Yes" => "Bai", "No" => "Ez", "Ok" => "Ados", @@ -60,6 +62,7 @@ "Share with link" => "Elkarbanatu lotura batekin", "Password protect" => "Babestu pasahitzarekin", "Password" => "Pasahitza", +"Allow Public Upload" => "Gaitu igotze publikoa", "Email link to person" => "Postaz bidali lotura ", "Send" => "Bidali", "Set expiration date" => "Ezarri muga data", @@ -84,8 +87,12 @@ "The update was successful. Redirecting you to ownCloud now." => "Eguneraketa ongi egin da. Orain zure ownClouderea berbideratua izango zara.", "ownCloud password reset" => "ownCloud-en pasahitza berrezarri", "Use the following link to reset your password: {link}" => "Eribili hurrengo lotura zure pasahitza berrezartzeko: {link}", +"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Zure pasahitza berrezartzeko lotura zure postara bidalia izan da.<br>Ez baduzu arrazoizko denbora \nepe batean jasotzen begiratu zure zabor-posta karpetan.<br>Hor ere ez badago kudeatzailearekin harremanetan ipini.", +"Request failed!<br>Did you make sure your email/username was right?" => "Eskaerak huts egin du!<br>Ziur zaude posta/pasahitza zuzenak direla?", "You will receive a link to reset your password via Email." => "Zure pashitza berrezartzeko lotura bat jasoko duzu Epostaren bidez.", "Username" => "Erabiltzaile izena", +"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Zure fitxategiak enkriptaturik daude. Ez baduzu berreskuratze gakoa gaitzen pasahitza berrabiaraztean ez da zure fitxategiak berreskuratzeko modurik egongo. Zer egin ziur ez bazaude kudeatzailearekin harremanetan ipini jarraitu aurretik. Ziur zaude aurrera jarraitu nahi duzula?", +"Yes, I really want to reset my password now" => "Bai, nire pasahitza orain berrabiarazi nahi dut", "Request reset" => "Eskaera berrezarri da", "Your password was reset" => "Zure pasahitza berrezarri da", "To login page" => "Sarrera orrira", @@ -98,15 +105,16 @@ "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", "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Zure PHP bertsioa NULL Byte erasoak (CVE-2006-7243) mendera dezake.", -"Please update your PHP installation to use ownCloud securely." => "Mesedez eguneratu zure PHP instalazioa ownCloud modu seguru batean erabiltzeko.", +"Please update your PHP installation to use %s securely." => "Mesedez eguneratu zure PHP instalazioa %s seguru erabiltzeko", "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Ez dago hausazko zenbaki sortzaile segururik eskuragarri, mesedez gatiu PHP OpenSSL extensioa.", "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Hausazko zenbaki sortzaile segururik gabe erasotzaile batek pasahitza berrezartzeko kodeak iragarri ditzake eta zure kontuaz jabetu.", "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Zure data karpeta eta fitxategiak interneten bidez eskuragarri egon daitezke .htaccess fitxategia ez delako funtzionatzen ari.", -"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Zure zerbitzaria ongi konfiguratzeko informazioa eskuratzeko, begiratu <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">dokumentazioa</a>.", +"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Zure zerbitrzaria ongi konfiguratzeko, mezedez <a href=\"%s\" target=\"_blank\">dokumentazioa</a> ikusi.", "Create an <strong>admin account</strong>" => "Sortu <strong>kudeatzaile kontu<strong> bat", "Advanced" => "Aurreratua", "Data folder" => "Datuen karpeta", @@ -118,6 +126,7 @@ "Database tablespace" => "Datu basearen taula-lekua", "Database host" => "Datubasearen hostalaria", "Finish setup" => "Bukatu konfigurazioa", +"%s is available. Get more information on how to update." => "%s erabilgarri dago. Eguneratzeaz argibide gehiago eskuratu.", "Log out" => "Saioa bukatu", "Automatic logon rejected!" => "Saio hasiera automatikoa ez onartuta!", "If you did not change your password recently, your account may be compromised!" => "Zure pasahitza orain dela gutxi ez baduzu aldatu, zure kontua arriskuan egon daiteke!", @@ -126,6 +135,7 @@ "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!", "prev" => "aurrekoa", "next" => "hurrengoa", "Updating ownCloud to version %s, this may take a while." => "ownCloud %s bertsiora eguneratzen, denbora har dezake." diff --git a/core/l10n/fa.php b/core/l10n/fa.php index 02fe2ce1148..c13c6a0e345 100644 --- a/core/l10n/fa.php +++ b/core/l10n/fa.php @@ -110,11 +110,9 @@ "Add" => "افزودن", "Security Warning" => "اخطار امنیتی", "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "نسخه ی PHP شما در برابر حملات NULL Byte آسیب پذیر است.(CVE-2006-7243)", -"Please update your PHP installation to use ownCloud securely." => "لطفا برنامه ی PHP خودتان را بروز کنید تا بتوانید ایمن تر از ownCloud استفاده کنید.", "No secure random number generator is available, please enable the PHP OpenSSL extension." => "هیچ مولد تصادفی امن در دسترس نیست، لطفا فرمت PHP OpenSSL را فعال نمایید.", "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "بدون وجود یک تولید کننده اعداد تصادفی امن ، یک مهاجم ممکن است این قابلیت را داشته باشد که پیشگویی کند پسوورد های راه انداز گرفته شده و کنترلی روی حساب کاربری شما داشته باشد .", "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "فایلها و فهرست های داده های شما قابل از اینترنت قابل دسترسی هستند، چونکه فایل htacces. کار نمی کند.", -"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "برای مطلع شدن از چگونگی تنظیم سرورتان،لطفا <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">این</a> را ببینید.", "Create an <strong>admin account</strong>" => "لطفا یک <strong> شناسه برای مدیر</strong> بسازید", "Advanced" => "پیشرفته", "Data folder" => "پوشه اطلاعاتی", diff --git a/core/l10n/fi_FI.php b/core/l10n/fi_FI.php index 23b697a25c3..75209d260ef 100644 --- a/core/l10n/fi_FI.php +++ b/core/l10n/fi_FI.php @@ -81,6 +81,7 @@ "The update was successful. Redirecting you to ownCloud now." => "Päivitys onnistui. Selain ohjautuu nyt ownCloudiisi.", "ownCloud password reset" => "ownCloud-salasanan nollaus", "Use the following link to reset your password: {link}" => "Voit palauttaa salasanasi seuraavassa osoitteessa: {link}", +"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Linkki salasanan nollaamiseen on lähetetty sähköpostiisi.<br>Jos et saa viestiä pian, tarkista roskapostikansiosi.<br>Jos et löydä viestiä roskapostinkaan seasta, ota yhteys ylläpitäjään.", "Request failed!<br>Did you make sure your email/username was right?" => "Pyyntö epäonnistui!<br>Olihan sähköpostiosoitteesi/käyttäjätunnuksesi oikein?", "You will receive a link to reset your password via Email." => "Saat sähköpostitse linkin nollataksesi salasanan.", "Username" => "Käyttäjätunnus", @@ -102,10 +103,10 @@ "Add" => "Lisää", "Security Warning" => "Turvallisuusvaroitus", "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "PHP-asennuksesi on haavoittuvainen NULL Byte -hyökkäykselle (CVE-2006-7243)", -"Please update your PHP installation to use ownCloud securely." => "Päivitä PHP-asennuksesi käyttääksesi ownCloudia turvallisesti.", +"Please update your PHP installation to use %s securely." => "Päivitä PHP-asennus varmistaaksesi, että %s on turvallinen käyttää.", "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Turvallista satunnaislukugeneraattoria ei ole käytettävissä, ota käyttöön PHP:n OpenSSL-laajennus", "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Datakansiosi ja tiedostosi ovat mitä luultavimmin muiden saavutettavissa internetistä, koska .htaccess-tiedosto ei toimi.", -"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Katso palvelimen asetuksien määrittämiseen liittyvät ohjeet <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">dokumentaatiosta</a>.", +"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Lisätietoja palvelimen asetuksien määrittämisestä on saatavilla <a href=\"%s\" target=\"_blank\">dokumentaatiosta</a>.", "Create an <strong>admin account</strong>" => "Luo <strong>ylläpitäjän tunnus</strong>", "Advanced" => "Lisäasetukset", "Data folder" => "Datakansio", diff --git a/core/l10n/fr.php b/core/l10n/fr.php index bc8a0d28153..055b6c02e41 100644 --- a/core/l10n/fr.php +++ b/core/l10n/fr.php @@ -110,11 +110,9 @@ "Add" => "Ajouter", "Security Warning" => "Avertissement de sécurité", "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Votre version de PHP est vulnérable à l'attaque par caractère NULL (CVE-2006-7243)", -"Please update your PHP installation to use ownCloud securely." => "Veuillez mettre à jour votre installation PHP pour utiliser ownCloud de façon sécurisée.", "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Aucun générateur de nombre aléatoire sécurisé n'est disponible, veuillez activer l'extension PHP OpenSSL", "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Sans générateur de nombre aléatoire sécurisé, un attaquant peut être en mesure de prédire les jetons de réinitialisation du mot de passe, et ainsi prendre le contrôle de votre compte utilisateur.", "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Votre répertoire data est certainement accessible depuis l'internet car le fichier .htaccess ne semble pas fonctionner", -"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Pour les informations de configuration de votre serveur, veuillez lire la <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>.", "Create an <strong>admin account</strong>" => "Créer un <strong>compte administrateur</strong>", "Advanced" => "Avancé", "Data folder" => "Répertoire des données", diff --git a/core/l10n/gl.php b/core/l10n/gl.php index b55daf27c21..02f3e80b9c8 100644 --- a/core/l10n/gl.php +++ b/core/l10n/gl.php @@ -110,11 +110,11 @@ "Add" => "Engadir", "Security Warning" => "Aviso de seguranza", "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "A súa versión de PHP é vulnerábel a un ataque de byte nulo (CVE-2006-7243)", -"Please update your PHP installation to use ownCloud securely." => "Actualice a instalación de PHP para empregar ownCloud de xeito seguro.", +"Please update your PHP installation to use %s securely." => "Actualice a instalación de PHP para empregar %s de xeito seguro.", "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Non hai un xerador de números ao chou dispoñíbel. Active o engadido de OpenSSL para PHP.", "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Sen un xerador seguro de números ao chou podería acontecer que predicindo as cadeas de texto de reinicio de contrasinais se afagan coa súa conta.", "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "O seu directorio de datos e os ficheiros probabelmente sexan accesíbeis desde a Internet xa que o ficheiro .htaccess non está a traballar.", -"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Para obter información sobre como como configurar axeitadamente o seu servidor, vexa a <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentación</a>.", +"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Para obter información sobre como como configurar axeitadamente o seu servidor, vexa a <a href=\"%s\" target=\"_blank\">documentación</a>.", "Create an <strong>admin account</strong>" => "Crear unha <strong>contra de administrador</strong>", "Advanced" => "Avanzado", "Data folder" => "Cartafol de datos", diff --git a/core/l10n/he.php b/core/l10n/he.php index ab002ab64e8..7624fd8491d 100644 --- a/core/l10n/he.php +++ b/core/l10n/he.php @@ -105,11 +105,9 @@ "Add" => "הוספה", "Security Warning" => "אזהרת אבטחה", "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "גרסת ה־PHP פגיעה בפני התקפת בית NULL/ריק (CVE-2006-7243)", -"Please update your PHP installation to use ownCloud securely." => "נא לעדכן את התקנת ה־PHP שלך כדי להשתמש ב־PHP בבטחה.", "No secure random number generator is available, please enable the PHP OpenSSL extension." => "אין מחולל מספרים אקראיים מאובטח, נא להפעיל את ההרחבה OpenSSL ב־PHP.", "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "ללא מחולל מספרים אקראיים מאובטח תוקף יכול לנבא את מחרוזות איפוס הססמה ולהשתלט על החשבון שלך.", "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "תיקיית וקבצי המידע שלך כנראה נגישים מהאינטרנט מכיוון שקובץ ה.htaccess לא עובד.", -"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "לקבלת מידע להגדרה נכונה של השרת שלך, ראה את ה<a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">תיעוד</a>.", "Create an <strong>admin account</strong>" => "יצירת <strong>חשבון מנהל</strong>", "Advanced" => "מתקדם", "Data folder" => "תיקיית נתונים", diff --git a/core/l10n/hu_HU.php b/core/l10n/hu_HU.php index 25abd078901..1d83ad54ce7 100644 --- a/core/l10n/hu_HU.php +++ b/core/l10n/hu_HU.php @@ -62,6 +62,7 @@ "Share with link" => "Link megadásával osztom meg", "Password protect" => "Jelszóval is védem", "Password" => "Jelszó", +"Allow Public Upload" => "Feltöltést is engedélyezek", "Email link to person" => "Email címre küldjük el", "Send" => "Küldjük el", "Set expiration date" => "Legyen lejárati idő", @@ -90,6 +91,7 @@ "Request failed!<br>Did you make sure your email/username was right?" => "A kérést nem sikerült teljesíteni! <br>Biztos, hogy jó emailcímet/felhasználónevet adott meg?", "You will receive a link to reset your password via Email." => "Egy emailben fog értesítést kapni a jelszóbeállítás módjáról.", "Username" => "Felhasználónév", +"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Az Ön állományai titkosítva vannak. Ha nem engedélyezte korábban az adatok visszanyeréséhez szükséges kulcs használatát, akkor a jelszó megváltoztatását követően nem fog hozzáférni az adataihoz. Ha nem biztos abban, hogy mit kellene tennie, akkor kérdezze meg a rendszergazdát, mielőtt továbbmenne. Biztos, hogy folytatni kívánja?", "Yes, I really want to reset my password now" => "Igen, tényleg meg akarom változtatni a jelszavam", "Request reset" => "Visszaállítás igénylése", "Your password was reset" => "Jelszó megváltoztatva", @@ -108,11 +110,11 @@ "Add" => "Hozzáadás", "Security Warning" => "Biztonsági figyelmeztetés", "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Az Ön PHP verziója sebezhető a NULL bájtos támadással szemben (CVE-2006-7243)", -"Please update your PHP installation to use ownCloud securely." => "Kérjük frissítse a telepített PHP csomagjait, hogy biztonságos legyen az ownCloud szolgáltatása.", +"Please update your PHP installation to use %s securely." => "Kérjük frissítse a telepített PHP csomagjait, hogy biztonságos legyen az %s szolgáltatása.", "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Nem érhető el megfelelő véletlenszám-generátor, telepíteni kellene a PHP OpenSSL kiegészítését.", "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Megfelelő véletlenszám-generátor hiányában egy támadó szándékú idegen képes lehet megjósolni a jelszóvisszaállító tokent, és Ön helyett belépni.", "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Az adatkönyvtár és a benne levő állományok valószínűleg közvetlenül is elérhetők az internetről, mert a .htaccess állomány nem érvényesül.", -"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "A kiszolgáló megfelelő beállításához kérjük olvassa el a <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">dokumentációt</a>.", +"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "A kiszolgáló megfelelő beállításához kérjük olvassa el a <a href=\"%sl\" target=\"_blank\">dokumentációt</a>.", "Create an <strong>admin account</strong>" => "<strong>Rendszergazdai belépés</strong> létrehozása", "Advanced" => "Haladó", "Data folder" => "Adatkönyvtár", diff --git a/core/l10n/id.php b/core/l10n/id.php index 2ee9c37ec2d..716cf39d556 100644 --- a/core/l10n/id.php +++ b/core/l10n/id.php @@ -102,11 +102,9 @@ "Add" => "Tambah", "Security Warning" => "Peringatan Keamanan", "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Versi PHP Anda rentan terhadap serangan NULL Byte (CVE-2006-7243)", -"Please update your PHP installation to use ownCloud securely." => "Silakan perbarui instalasi PHP untuk dapat menggunakan ownCloud secara aman.", "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Generator acak yang aman tidak tersedia, silakan aktifkan ekstensi OpenSSL pada PHP.", "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Tanpa generator acak, penyerang mungkin dapat menebak token penyetelan sandi dan mengambil alih akun Anda.", "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Kemungkinan direktori data dan berkas Anda dapat diakses dari internet karena berkas .htaccess tidak berfungsi.", -"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Untuk informasi lebih lanjut tentang pengaturan server yang benar, silakan lihat <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">dokumentasi</a>.", "Create an <strong>admin account</strong>" => "Buat sebuah <strong>akun admin</strong>", "Advanced" => "Lanjutan", "Data folder" => "Folder data", diff --git a/core/l10n/it.php b/core/l10n/it.php index c1c27cdf54c..31ccdb38e66 100644 --- a/core/l10n/it.php +++ b/core/l10n/it.php @@ -1,5 +1,5 @@ <?php $TRANSLATIONS = array( -"%s shared »%s« with you" => "%s ha condiviso »%s« con te", +"%s shared »%s« with you" => "%s ha condiviso «%s» con te", "Category type not provided." => "Tipo di categoria non fornito.", "No category to add?" => "Nessuna categoria da aggiungere?", "This category already exists: %s" => "Questa categoria esiste già: %s", @@ -110,11 +110,11 @@ "Add" => "Aggiungi", "Security Warning" => "Avviso di sicurezza", "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "La tua versione di PHP è vulnerabile all'attacco NULL Byte (CVE-2006-7243)", -"Please update your PHP installation to use ownCloud securely." => "Aggiorna la tua installazione di PHP per utilizzare ownCloud in modo sicuro.", +"Please update your PHP installation to use %s securely." => "Aggiorna la tua installazione di PHP per utilizzare %s in sicurezza.", "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Non è disponibile alcun generatore di numeri casuali sicuro. Abilita l'estensione OpenSSL di PHP", "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Senza un generatore di numeri casuali sicuro, un malintenzionato potrebbe riuscire a individuare i token di ripristino delle password e impossessarsi del tuo account.", "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "La cartella dei dati e i file sono probabilmente accessibili da Internet poiché il file .htaccess non funziona.", -"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Per informazioni su come configurare correttamente il server, vedi la <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentazione</a>.", +"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Per informazioni su come configurare correttamente il tuo server, vedi la <a href=\"%s\" target=\"_blank\">documentazione</a>.", "Create an <strong>admin account</strong>" => "Crea un <strong>account amministratore</strong>", "Advanced" => "Avanzat", "Data folder" => "Cartella dati", @@ -135,7 +135,7 @@ "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>Cheers!" => "Ehilà,<br><br>volevo solamente farti sapere che %s ha condiviso «%s» con te.<br><a href=\"%s\">Guarda!</a><br><br>Saluti!", "prev" => "precedente", "next" => "successivo", "Updating ownCloud to version %s, this may take a while." => "Aggiornamento di ownCloud alla versione %s in corso, ciò potrebbe richiedere del tempo." diff --git a/core/l10n/ja_JP.php b/core/l10n/ja_JP.php index 5f9ca65b627..7c837800b0f 100644 --- a/core/l10n/ja_JP.php +++ b/core/l10n/ja_JP.php @@ -62,7 +62,7 @@ "Share with link" => "URLリンクで共有", "Password protect" => "パスワード保護", "Password" => "パスワード", -"Allow Public Upload" => "パブリックなアップロードを許可", +"Allow Public Upload" => "アップロードを許可", "Email link to person" => "メールリンク", "Send" => "送信", "Set expiration date" => "有効期限を設定", @@ -110,11 +110,9 @@ "Add" => "追加", "Security Warning" => "セキュリティ警告", "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "あなたのPHPのバージョンには、Null Byte攻撃(CVE-2006-7243)という脆弱性が含まれています。", -"Please update your PHP installation to use ownCloud securely." => "ownCloud を安全に利用するに、PHPの更新を行なってください。", "No secure random number generator is available, please enable the PHP OpenSSL extension." => "セキュアな乱数生成器が利用可能ではありません。PHPのOpenSSL拡張を有効にして下さい。", "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "セキュアな乱数生成器が無い場合、攻撃者がパスワードリセットのトークンを予測してアカウントを乗っ取られる可能性があります。", "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => ".htaccess ファイルが動作していないため、おそらくあなたのデータディレクトリもしくはファイルはインターネットからアクセス可能です。", -"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "あなたのサーバの適切な設定に関する情報として、<a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">ドキュメント</a>を参照して下さい。", "Create an <strong>admin account</strong>" => "<strong>管理者アカウント</strong>を作成してください", "Advanced" => "詳細設定", "Data folder" => "データフォルダ", diff --git a/core/l10n/ka_GE.php b/core/l10n/ka_GE.php index 877d66a0db3..f664c9b5ce3 100644 --- a/core/l10n/ka_GE.php +++ b/core/l10n/ka_GE.php @@ -102,11 +102,9 @@ "Add" => "დამატება", "Security Warning" => "უსაფრთხოების გაფრთხილება", "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "თქვენი PHP ვერსია შეიცავს საფრთხეს NULL Byte შეტევებისთვის (CVE-2006-7243)", -"Please update your PHP installation to use ownCloud securely." => "იმისათვის რომ გამოიყენოთ ownCloud უსაფრთხოდ, გთხოვთ განაახლოთ თქვენი PHP ვერსია.", "No secure random number generator is available, please enable the PHP OpenSSL extension." => "შემთხვევითი სიმბოლოების გენერატორი არ არსებობს, გთხოვთ ჩართოთ PHP OpenSSL გაფართოება.", "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "შემთხვევითი სიმბოლოების გენერატორის გარეშე, შემტევმა შეიძლება ამოიცნოს თქვენი პაროლი შეგიცვალოთ ის და დაეუფლოს თქვენს ექაუნთს.", "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "თქვენი data დირექტორია და ფაილები დაშვებადია ინტერნეტში რადგან .htaccess ფაილი არ მუშაობს.", -"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "სერვერის კორექტულად დასაკონფიგურირებლად, ნახეთ შემდეგი <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">დოკუმენტაცია</a>.", "Create an <strong>admin account</strong>" => "შექმენი <strong>ადმინ ექაუნტი</strong>", "Advanced" => "დამატებითი ფუნქციები", "Data folder" => "მონაცემთა საქაღალდე", diff --git a/core/l10n/ko.php b/core/l10n/ko.php index 2ce4f0fd377..e534da85e9e 100644 --- a/core/l10n/ko.php +++ b/core/l10n/ko.php @@ -60,6 +60,7 @@ "Share with link" => "URL 링크로 공유", "Password protect" => "암호 보호", "Password" => "암호", +"Allow Public Upload" => "퍼블릭 업로드 허용", "Email link to person" => "이메일 주소", "Send" => "전송", "Set expiration date" => "만료 날짜 설정", @@ -84,8 +85,10 @@ "The update was successful. Redirecting you to ownCloud now." => "업데이트가 성공하였습니다. ownCloud로 돌아갑니다.", "ownCloud password reset" => "ownCloud 암호 재설정", "Use the following link to reset your password: {link}" => "다음 링크를 사용하여 암호를 재설정할 수 있습니다: {link}", +"Request failed!<br>Did you make sure your email/username was right?" => "요청이 실패했습니다!<br>email 주소와 사용자 명을 정확하게 넣으셨나요?", "You will receive a link to reset your password via Email." => "이메일로 암호 재설정 링크를 보냈습니다.", "Username" => "사용자 이름", +"Yes, I really want to reset my password now" => "네, 전 제 비밀번호를 리셋하길 원합니다", "Request reset" => "요청 초기화", "Your password was reset" => "암호가 재설정되었습니다", "To login page" => "로그인 화면으로", @@ -102,11 +105,9 @@ "Add" => "추가", "Security Warning" => "보안 경고", "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "사용 중인 PHP 버전이 NULL 바이트 공격에 취약합니다 (CVE-2006-7243)", -"Please update your PHP installation to use ownCloud securely." => "ownCloud의 보안을 위하여 PHP 버전을 업데이트하십시오.", "No secure random number generator is available, please enable the PHP OpenSSL extension." => "안전한 난수 생성기를 사용할 수 없습니다. PHP의 OpenSSL 확장을 활성화해 주십시오.", "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "안전한 난수 생성기를 사용하지 않으면 공격자가 암호 초기화 토큰을 추측하여 계정을 탈취할 수 있습니다.", "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => ".htaccess 파일이 처리되지 않아서 데이터 디렉터리와 파일을 인터넷에서 접근할 수 없을 수도 있습니다.", -"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "서버를 올바르게 설정하는 방법을 알아보려면 <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">문서</a>를 참고하십시오..", "Create an <strong>admin account</strong>" => "<strong>관리자 계정</strong> 만들기", "Advanced" => "고급", "Data folder" => "데이터 폴더", diff --git a/core/l10n/lb.php b/core/l10n/lb.php index 96a3222093f..3cf0ef03dad 100644 --- a/core/l10n/lb.php +++ b/core/l10n/lb.php @@ -110,11 +110,9 @@ "Add" => "Dobäisetzen", "Security Warning" => "Sécherheets-Warnung", "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Deng PHP-Versioun ass verwonnbar duerch d'NULL-Byte-Attack (CVE-2006-7243)", -"Please update your PHP installation to use ownCloud securely." => "Aktualiséier w.e.gl deng PHP-Installatioun fir ownCloud sécher benotzen ze kënnen.", "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Et ass kee sécheren Zoufallsgenerator verfügbar. Aktivéier w.e.gl d'OpenSSL-Erweiderung vu PHP.", "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Ouni e sécheren Zoufallsgenerator kann en Ugräifer d'Passwuert-Zrécksetzungs-Schlësselen viraussoen an en Account iwwerhuelen.", "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Däin Daten-Dossier an deng Fichieren si wahrscheinlech iwwert den Internet accessibel well den .htaccess-Fichier net funktionnéiert.", -"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Kuck w.e.gl. an der <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">Dokumentatioun</a> fir Informatiounen iwwert eng uerdentlech Konfiguratioun vum Server.", "Create an <strong>admin account</strong>" => "En <strong>Admin-Account</strong> uleeën", "Advanced" => "Avancéiert", "Data folder" => "Daten-Dossier", diff --git a/core/l10n/lt_LT.php b/core/l10n/lt_LT.php index 4faf7388b23..27744dd7649 100644 --- a/core/l10n/lt_LT.php +++ b/core/l10n/lt_LT.php @@ -105,11 +105,9 @@ "Add" => "Pridėti", "Security Warning" => "Saugumo pranešimas", "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Jūsų PHP versija yra pažeidžiama prieš NULL Byte ataką (CVE-2006-7243)", -"Please update your PHP installation to use ownCloud securely." => "Prašome atnaujinti savo PHP norint naudotis savo ownCloud saugiai.", "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Saugaus atsitiktinių skaičių generatoriaus nėra, prašome įjungti PHP OpenSSL modulį.", "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Be saugaus atsitiktinių skaičių generatoriaus, piktavaliai gali atspėti Jūsų slaptažodį ir pasisavinti paskyrą.", "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Jūsų failai yra tikriausiai prieinami per internetą nes .htaccess failas neveikia.", -"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Norint gauti daugiau informacijos apie tai kaip tinkamai nustatyit savo serverį, prašome perskaityti <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">dokumentaciją</a>.", "Create an <strong>admin account</strong>" => "Sukurti <strong>administratoriaus paskyrą</strong>", "Advanced" => "Išplėstiniai", "Data folder" => "Duomenų katalogas", diff --git a/core/l10n/lv.php b/core/l10n/lv.php index 9552891d7d5..5520d1ff358 100644 --- a/core/l10n/lv.php +++ b/core/l10n/lv.php @@ -104,7 +104,6 @@ "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Nav pieejams drošs nejaušu skaitļu ģenerators. Lūdzu, aktivējiet PHP OpenSSL paplašinājumu.", "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Bez droša nejaušu skaitļu ģeneratora uzbrucējs var paredzēt paroļu atjaunošanas marķierus un pārņem jūsu kontu.", "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Visticamāk, jūsu datu direktorija un datnes ir pieejamas no interneta, jo .htaccess datne nedarbojas.", -"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Lai uzzinātu, kā pareizi jākonfigurē šis serveris, skatiet <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">dokumentāciju</a>.", "Create an <strong>admin account</strong>" => "Izveidot <strong>administratora kontu</strong>", "Advanced" => "Paplašināti", "Data folder" => "Datu mape", diff --git a/core/l10n/nb_NO.php b/core/l10n/nb_NO.php index dfe0cbaeb81..6780a69a22f 100644 --- a/core/l10n/nb_NO.php +++ b/core/l10n/nb_NO.php @@ -1,5 +1,7 @@ <?php $TRANSLATIONS = array( +"%s shared »%s« with you" => "%s delte »%s« med deg", "No category to add?" => "Ingen kategorier å legge til?", +"This category already exists: %s" => "Denne kategorien finnes allerede: %s", "No categories selected for deletion." => "Ingen kategorier merket for sletting.", "Sunday" => "Søndag", "Monday" => "Mandag", @@ -40,8 +42,10 @@ "No" => "Nei", "Ok" => "Ok", "Error" => "Feil", +"Shared" => "Delt", "Share" => "Del", "Error while sharing" => "Feil under deling", +"Shared with you by {owner}" => "Delt med deg av {owner}", "Share with" => "Del med", "Share with link" => "Del med link", "Password protect" => "Passordbeskyttet", @@ -78,6 +82,7 @@ "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", @@ -100,5 +105,6 @@ "remember" => "husk", "Log in" => "Logg inn", "prev" => "forrige", -"next" => "neste" +"next" => "neste", +"Updating ownCloud to version %s, this may take a while." => "Oppdaterer ownCloud til versjon %s, dette kan ta en stund." ); diff --git a/core/l10n/nl.php b/core/l10n/nl.php index 9352f595e76..c2a8f049dba 100644 --- a/core/l10n/nl.php +++ b/core/l10n/nl.php @@ -110,11 +110,9 @@ "Add" => "Toevoegen", "Security Warning" => "Beveiligingswaarschuwing", "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Je PHP-versie is kwetsbaar voor de NULL byte aanval (CVE-2006-7243)", -"Please update your PHP installation to use ownCloud securely." => "Werk je PHP-installatie bij om ownCloud veilig te kunnen gebruiken.", "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Er kon geen willekeurig nummer worden gegenereerd. Zet de PHP OpenSSL-extentie aan.", "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Zonder random nummer generator is het mogelijk voor een aanvaller om de resettokens van wachtwoorden te voorspellen. Dit kan leiden tot het inbreken op uw account.", "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Je gegevensdirectory en bestanden zijn vermoedelijk bereikbaar vanaf het internet omdat het .htaccess-bestand niet werkt.", -"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Informatie over het configureren van uw server is <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">hier</a> te vinden.", "Create an <strong>admin account</strong>" => "Maak een <strong>beheerdersaccount</strong> aan", "Advanced" => "Geavanceerd", "Data folder" => "Gegevensmap", diff --git a/core/l10n/nn_NO.php b/core/l10n/nn_NO.php index 2a4902962bd..d1a7bb4f9ed 100644 --- a/core/l10n/nn_NO.php +++ b/core/l10n/nn_NO.php @@ -104,11 +104,9 @@ "Add" => "Legg til", "Security Warning" => "Tryggleiksåtvaring", "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "PHP-utgåva di er sårbar for NULL-byteåtaket (CVE-2006-7243)", -"Please update your PHP installation to use ownCloud securely." => "Ver venleg og oppdater PHP-installasjonen din så han køyrer ownCloud på ein trygg måte.", "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Ingen tilgjengeleg tilfeldig nummer-generator, ver venleg og aktiver OpenSSL-utvidinga i PHP.", "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Utan ein trygg tilfeldig nummer-generator er det enklare for ein åtakar å gjetta seg fram til passordnullstillingskodar og dimed ta over kontoen din.", "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Datamappa og filene dine er sannsynlegvis tilgjengelege frå Internett sidan .htaccess-fila ikkje fungerer.", -"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Ver venleg og les <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">dokumentasjonen</a> for å læra korleis du set opp tenaren din på rett måte.", "Create an <strong>admin account</strong>" => "Lag ein <strong>admin-konto</strong>", "Advanced" => "Avansert", "Data folder" => "Datamappe", diff --git a/core/l10n/pl.php b/core/l10n/pl.php index 0d7c9eb21c6..6e5b4327c48 100644 --- a/core/l10n/pl.php +++ b/core/l10n/pl.php @@ -91,6 +91,7 @@ "Request failed!<br>Did you make sure your email/username was right?" => "Żądanie niepowiodło się!<br>Czy Twój email/nazwa użytkownika są poprawne?", "You will receive a link to reset your password via Email." => "Odnośnik służący do resetowania hasła zostanie wysłany na adres e-mail.", "Username" => "Nazwa użytkownika", +"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Pliki są szyfrowane. Jeśli nie włączono klucza odzyskiwania, nie będzie możliwe odzyskać dane z powrotem po zresetowaniu hasła. Jeśli nie masz pewności, co zrobić, prosimy o kontakt z administratorem, przed kontynuowaniem. Czy chcesz kontynuować?", "Yes, I really want to reset my password now" => "Tak, naprawdę chcę zresetować hasło teraz", "Request reset" => "Żądanie resetowania", "Your password was reset" => "Zresetowano hasło", @@ -104,15 +105,16 @@ "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", "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Twója wersja PHP jest narażona na NULL Byte attack (CVE-2006-7243)", -"Please update your PHP installation to use ownCloud securely." => "Proszę uaktualnij swoją instalacje PHP, aby używać ownCloud bezpiecznie.", +"Please update your PHP installation to use %s securely." => "Proszę uaktualnij swoją instalacje PHP aby używać %s bezpiecznie.", "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Bezpieczny generator liczb losowych jest niedostępny. Włącz rozszerzenie OpenSSL w PHP.", "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Bez bezpiecznego generatora liczb losowych, osoba atakująca może przewidzieć token resetujący hasło i przejąć kontrolę nad twoim kontem.", "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Twój katalog danych i pliki są prawdopodobnie dostępne z poziomu internetu, ponieważ plik .htaccess nie działa.", -"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Aby uzyskać informacje dotyczące prawidłowej konfiguracji serwera, sięgnij do <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">dokumentacji</a>.", +"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Aby uzyskać informacje jak poprawnie skonfigurować swój serwer, zapoznaj się z <a href=\"%s\" target=\"_blank\">dokumentacją</a>.", "Create an <strong>admin account</strong>" => "Utwórz <strong>konta administratora</strong>", "Advanced" => "Zaawansowane", "Data folder" => "Katalog danych", @@ -133,6 +135,7 @@ "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!", "prev" => "wstecz", "next" => "naprzód", "Updating ownCloud to version %s, this may take a while." => "Aktualizowanie ownCloud do wersji %s. Może to trochę potrwać." diff --git a/core/l10n/pt_BR.php b/core/l10n/pt_BR.php index b36511da600..f612301a3e8 100644 --- a/core/l10n/pt_BR.php +++ b/core/l10n/pt_BR.php @@ -110,11 +110,11 @@ "Add" => "Adicionar", "Security Warning" => "Aviso de Segurança", "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Sua versão do PHP está vulnerável ao ataque NULL Byte (CVE-2006-7243)", -"Please update your PHP installation to use ownCloud securely." => "Por favor atualize sua instalação do PHP para utilizar o ownCloud de forma segura.", +"Please update your PHP installation to use %s securely." => "Por favor, atualize sua instalação PHP para usar %s segurança.", "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Nenhum gerador de número aleatório de segurança disponível. Habilite a extensão OpenSSL do PHP.", "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Sem um gerador de número aleatório de segurança, um invasor pode ser capaz de prever os símbolos de redefinição de senhas e assumir sua conta.", "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Seu diretório de dados e arquivos são provavelmente acessíveis pela internet, porque o .htaccess não funciona.", -"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Para obter informações sobre como configurar corretamente o seu servidor, consulte a <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentação</a>.", +"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Para obter informações sobre como configurar corretamente o seu servidor, consulte a <a href=\"%s\" target=\"_blank\">documentação</a>.", "Create an <strong>admin account</strong>" => "Criar uma <strong>conta de administrador</strong>", "Advanced" => "Avançado", "Data folder" => "Pasta de dados", diff --git a/core/l10n/pt_PT.php b/core/l10n/pt_PT.php index b0afff1ad24..c16e41dce58 100644 --- a/core/l10n/pt_PT.php +++ b/core/l10n/pt_PT.php @@ -1,4 +1,5 @@ <?php $TRANSLATIONS = array( +"%s shared »%s« with you" => "%s partilhado »%s« contigo", "Category type not provided." => "Tipo de categoria não fornecido", "No category to add?" => "Nenhuma categoria para adicionar?", "This category already exists: %s" => "A categoria já existe: %s", @@ -61,6 +62,7 @@ "Share with link" => "Partilhar com link", "Password protect" => "Proteger com palavra-passe", "Password" => "Password", +"Allow Public Upload" => "Permitir Envios Públicos", "Email link to person" => "Enviar o link por e-mail", "Send" => "Enviar", "Set expiration date" => "Especificar data de expiração", @@ -89,6 +91,8 @@ "Request failed!<br>Did you make sure your email/username was right?" => "O pedido falhou! <br> Tem a certeza que introduziu o seu email/username correcto?", "You will receive a link to reset your password via Email." => "Vai receber um endereço para repor a sua password", "Username" => "Nome de utilizador", +"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Os seus ficheiros estão encriptados. Se não activou a chave de recuperação, não vai ser possível recuperar os seus dados no caso da sua password ser reinicializada. Se não tem a certeza do que precisa de fazer, por favor contacte o seu administrador antes de continuar. Tem a certeza que quer continuar?", +"Yes, I really want to reset my password now" => "Sim, tenho a certeza que pretendo redefinir a minha palavra-passe agora.", "Request reset" => "Pedir reposição", "Your password was reset" => "A sua password foi reposta", "To login page" => "Para a página de entrada", @@ -101,15 +105,16 @@ "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", "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "A sua versão do PHP é vulnerável ao ataque Byte Null (CVE-2006-7243)", -"Please update your PHP installation to use ownCloud securely." => "Por favor atualize a sua versão PHP instalada para usar o ownCloud com segurança.", +"Please update your PHP installation to use %s securely." => "Por favor atualize a sua versão PHP instalada para usar o %s com segurança.", "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Não existe nenhum gerador seguro de números aleatórios, por favor, active a extensão OpenSSL no PHP.", "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Sem nenhum gerador seguro de números aleatórios, uma pessoa mal intencionada pode prever a sua password, reiniciar as seguranças adicionais e tomar conta da sua conta. ", "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "A pasta de dados do ownCloud e os respectivos ficheiros, estarão provavelmente acessíveis a partir da internet, pois o ficheiros .htaccess não funciona.", -"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Para obter informações de como configurar correctamente o servidor, veja em: <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>.", +"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Para obter informações de como configurar correctamente o servidor, veja em: <a href=\"%s\" target=\"_blank\">documentação</a>.", "Create an <strong>admin account</strong>" => "Criar uma <strong>conta administrativa</strong>", "Advanced" => "Avançado", "Data folder" => "Pasta de dados", @@ -130,6 +135,7 @@ "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!", "prev" => "anterior", "next" => "seguinte", "Updating ownCloud to version %s, this may take a while." => "A actualizar o ownCloud para a versão %s, esta operação pode demorar." diff --git a/core/l10n/ro.php b/core/l10n/ro.php index 6f23cea1c26..ae7528b5f60 100644 --- a/core/l10n/ro.php +++ b/core/l10n/ro.php @@ -3,11 +3,11 @@ "Category type not provided." => "Tipul de categorie nu a fost specificat.", "No category to add?" => "Nici o categorie de adăugat?", "This category already exists: %s" => "Această categorie deja există: %s", -"Object type not provided." => "Tipul obiectului nu este prevazut", +"Object type not provided." => "Tipul obiectului nu este prevăzut", "%s ID not provided." => "ID-ul %s nu a fost introdus", -"Error adding %s to favorites." => "Eroare la adăugarea %s la favorite", -"No categories selected for deletion." => "Nici o categorie selectată pentru ștergere.", -"Error removing %s from favorites." => "Eroare la ștergerea %s din favorite", +"Error adding %s to favorites." => "Eroare la adăugarea %s la favorite.", +"No categories selected for deletion." => "Nicio categorie selectată pentru ștergere.", +"Error removing %s from favorites." => "Eroare la ștergerea %s din favorite.", "Sunday" => "Duminică", "Monday" => "Luni", "Tuesday" => "Marți", @@ -30,12 +30,12 @@ "Settings" => "Setări", "seconds ago" => "secunde în urmă", "1 minute ago" => "1 minut în urmă", -"{minutes} minutes ago" => "{minutes} minute in urma", -"1 hour ago" => "Acum o ora", +"{minutes} minutes ago" => "{minutes} minute in urmă", +"1 hour ago" => "Acum o oră", "{hours} hours ago" => "{hours} ore în urmă", "today" => "astăzi", "yesterday" => "ieri", -"{days} days ago" => "{days} zile in urma", +"{days} days ago" => "{days} zile in urmă", "last month" => "ultima lună", "{months} months ago" => "{months} luni în urmă", "months ago" => "luni în urmă", @@ -47,9 +47,9 @@ "Yes" => "Da", "No" => "Nu", "Ok" => "Ok", -"The object type is not specified." => "Tipul obiectului nu a fost specificat", +"The object type is not specified." => "Tipul obiectului nu este specificat.", "Error" => "Eroare", -"The app name is not specified." => "Numele aplicației nu a fost specificat", +"The app name is not specified." => "Numele aplicației nu este specificat.", "The required file {file} is not installed!" => "Fișierul obligatoriu {file} nu este instalat!", "Shared" => "Partajat", "Share" => "Partajează", @@ -83,13 +83,13 @@ "Error setting expiration date" => "Eroare la specificarea datei de expirare", "Sending ..." => "Se expediază...", "Email sent" => "Mesajul a fost expediat", -"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Modernizarea a eșuat! <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">Te rugam sa raportezi problema aici.</a>.", -"The update was successful. Redirecting you to ownCloud now." => "Modernizare reusita! Vei fii redirectionat!", +"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.", "ownCloud password reset" => "Resetarea parolei ownCloud ", "Use the following link to reset your password: {link}" => "Folosește următorul link pentru a reseta parola: {link}", "The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Linkul pentru resetarea parolei tale a fost trimis pe email. <br>Daca nu ai primit email-ul intr-un timp rezonabil, verifica folderul spam/junk. <br>Daca nu sunt acolo intreaba administratorul local.", "Request failed!<br>Did you make sure your email/username was right?" => "Cerere esuata!<br>Esti sigur ca email-ul/numele de utilizator sunt corecte?", -"You will receive a link to reset your password via Email." => "Vei primi un mesaj prin care vei putea reseta parola via email", +"You will receive a link to reset your password via Email." => "Vei primi un mesaj prin care vei putea reseta parola via email.", "Username" => "Nume utilizator", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Fișierele tale sunt criptate. Dacă nu ai activat o cheie de recuperare, nu va mai exista nici o metodă prin care să îți recuperezi datele după resetarea parole. Dacă nu ești sigur în privința la ce ai de făcut, contactează un administrator înainte să continuii. Chiar vrei să continui?", "Yes, I really want to reset my password now" => "Da, eu chiar doresc să îmi resetez parola acum", @@ -101,20 +101,20 @@ "Personal" => "Personal", "Users" => "Utilizatori", "Apps" => "Aplicații", -"Admin" => "Admin", +"Admin" => "Administrator", "Help" => "Ajutor", -"Access forbidden" => "Acces interzis", +"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", -"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Versiunea dvs. PHP este vulnerabil la acest atac un octet null (CVE-2006-7243)", -"Please update your PHP installation to use ownCloud securely." => "Vă rugăm să actualizați instalarea dvs. PHP pentru a utiliza ownCloud in siguranță.", -"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Generatorul de numere pentru securitate nu este disponibil, va rog activati extensia PHP OpenSSL", -"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Fara generatorul pentru numere de securitate , un atacator poate afla parola si reseta contul tau", -"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Directorul de date și fișiere sunt, probabil, accesibile de pe Internet, deoarece .htaccess nu funcționează.", -"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Pentru informatii despre configurarea corecta a serverului accesati pagina <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">Documentare</a>.", +"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Versiunea dvs. PHP este vulnerabilă la un atac cu un octet NULL (CVE-2006-7243)", +"Please update your PHP installation to use %s securely." => "Te rog actualizează versiunea PHP pentru a utiliza %s în mod securizat.", +"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Nu este disponibil niciun generator securizat de numere aleatoare, vă rog activați extensia PHP OpenSSL.", +"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Fără generatorul securizat de numere aleatoare , un atacator poate anticipa simbolurile de resetare a parolei și poate prelua controlul asupra contului tău.", +"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Directorul tău de date și fișiere sunt probabil accesibile de pe Internet, deoarece fișierul .htaccess nu funcționează.", +"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Pentru informații despre cum să configurezi serverul, vezi <a href=\"%s\" target=\"_blank\">documentația</a>.", "Create an <strong>admin account</strong>" => "Crează un <strong>cont de administrator</strong>", "Advanced" => "Avansat", "Data folder" => "Director date", @@ -128,9 +128,9 @@ "Finish setup" => "Finalizează instalarea", "%s is available. Get more information on how to update." => "%s este disponibil. Vezi mai multe informații despre procesul de actualizare.", "Log out" => "Ieșire", -"Automatic logon rejected!" => "Logare automata respinsa", -"If you did not change your password recently, your account may be compromised!" => "Daca nu schimbi parola cand de curand , contul tau poate fi conpromis", -"Please change your password to secure your account again." => "Te rog schimba parola pentru ca, contul tau sa fie securizat din nou.", +"Automatic logon rejected!" => "Autentificare automată respinsă!", +"If you did not change your password recently, your account may be compromised!" => "Dacă nu ți-ai schimbat parola recent, contul tău ar putea fi compromis!", +"Please change your password to secure your account again." => "Te rog schimbă-ți parola pentru a-ți securiza din nou contul.", "Lost your password?" => "Ai uitat parola?", "remember" => "amintește", "Log in" => "Autentificare", diff --git a/core/l10n/ru.php b/core/l10n/ru.php index c7707949119..f9c293de9b8 100644 --- a/core/l10n/ru.php +++ b/core/l10n/ru.php @@ -62,6 +62,7 @@ "Share with link" => "Поделиться с ссылкой", "Password protect" => "Защитить паролем", "Password" => "Пароль", +"Allow Public Upload" => "Разрешить открытую загрузку", "Email link to person" => "Почтовая ссылка на персону", "Send" => "Отправить", "Set expiration date" => "Установить срок доступа", @@ -109,11 +110,11 @@ "Add" => "Добавить", "Security Warning" => "Предупреждение безопасности", "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Ваша версия PHP уязвима к атаке NULL Byte (CVE-2006-7243)", -"Please update your PHP installation to use ownCloud securely." => "Пожалуйста обновите Ваш PHP чтобы использовать ownCloud безопасно.", +"Please update your PHP installation to use %s securely." => "Пожалуйста обновите Вашу PHP конфигурацию для безопасного использования %s.", "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Отсутствует защищенный генератор случайных чисел, пожалуйста, включите расширение PHP OpenSSL.", "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Без защищенного генератора случайных чисел злоумышленник может предугадать токены сброса пароля и завладеть Вашей учетной записью.", "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Ваша папка с данными и файлы возможно доступны из интернета потому что файл .htaccess не работает.", -"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Для информации как правильно настроить Ваш сервер, пожалйста загляните в <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">документацию</a>.", +"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Для информации, как правильно настроить Ваш сервер, пожалуйста загляните в <a hrev=\"%s\"target=\"blank\">документацию</a>.", "Create an <strong>admin account</strong>" => "Создать <strong>учётную запись администратора</strong>", "Advanced" => "Дополнительно", "Data folder" => "Директория с данными", diff --git a/core/l10n/sk_SK.php b/core/l10n/sk_SK.php index e9876c52eac..a05c6912d26 100644 --- a/core/l10n/sk_SK.php +++ b/core/l10n/sk_SK.php @@ -62,6 +62,7 @@ "Share with link" => "Zdieľať cez odkaz", "Password protect" => "Chrániť heslom", "Password" => "Heslo", +"Allow Public Upload" => "Povoliť verejné nahrávanie", "Email link to person" => "Odoslať odkaz emailom", "Send" => "Odoslať", "Set expiration date" => "Nastaviť dátum expirácie", @@ -90,6 +91,7 @@ "Request failed!<br>Did you make sure your email/username was right?" => "Požiadavka zlyhala.<br>Uistili ste sa, že Vaše používateľské meno a email sú správne?", "You will receive a link to reset your password via Email." => "Odkaz pre obnovenie hesla obdržíte e-mailom.", "Username" => "Meno používateľa", +"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Vaše súbory sú šifrované. Ak nemáte povolený kľúč obnovy, nie je spôsob, ako získať po obnove hesla Vaše dáta. Ak nie ste si isí tým, čo robíte, obráťte sa najskôr na administrátora. Naozaj chcete pokračovať?", "Yes, I really want to reset my password now" => "Áno, želám si teraz obnoviť svoje heslo", "Request reset" => "Požiadať o obnovenie", "Your password was reset" => "Vaše heslo bolo obnovené", @@ -108,11 +110,9 @@ "Add" => "Pridať", "Security Warning" => "Bezpečnostné varovanie", "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Verzia Vášho PHP je napadnuteľná pomocou techniky \"NULL Byte\" (CVE-2006-7243)", -"Please update your PHP installation to use ownCloud securely." => "Aktualizujte prosím Vašu inštanciu PHP pre bezpečné používanie ownCloud.", "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Nie je dostupný žiadny bezpečný generátor náhodných čísel, prosím, povoľte rozšírenie OpenSSL v PHP.", "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Bez bezpečného generátora náhodných čísel môže útočník predpovedať token pre obnovu hesla a prevziať kontrolu nad vaším kontom.", "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Váš priečinok s dátami a súbormi je dostupný z internetu, lebo súbor .htaccess nefunguje.", -"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Pre informácie, ako správne nastaviť Váš server sa pozrite do <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">dokumentácie</a>.", "Create an <strong>admin account</strong>" => "Vytvoriť <strong>administrátorský účet</strong>", "Advanced" => "Rozšírené", "Data folder" => "Priečinok dát", diff --git a/core/l10n/sl.php b/core/l10n/sl.php index 548a5a3f515..e7b88316ec3 100644 --- a/core/l10n/sl.php +++ b/core/l10n/sl.php @@ -110,11 +110,11 @@ "Add" => "Dodaj", "Security Warning" => "Varnostno opozorilo", "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Uporabljena različica PHP je ranljiva za napad NULL Byte (CVE-2006-7243)", -"Please update your PHP installation to use ownCloud securely." => "Priporočeno je posodobiti namestitev PHP in varno uporabljati oblak ownCloud", +"Please update your PHP installation to use %s securely." => "Za varno uporabo storitve %s posodobite PHP", "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Na voljo ni nobenega varnega ustvarjalnika naključnih števil. Omogočiti je treba razširitev PHP OpenSSL.", "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Brez varnega ustvarjalnika naključnih števil je mogoče napovedati žetone za ponastavitev gesla, s čimer je mogoče prevzeti nadzor nad računom.", "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Podatkovna mapa in datoteke so najverjetneje javno dostopni preko interneta, saj datoteka .htaccess ni ustrezno nastavljena.", -"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Navodila, kako pravilno namestiti strežnik, so na straneh <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">dokumentacije</a>.", +"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Za navodila, kako pravilno nastaviti vaš strežnik, kliknite na povezavo do <a href=\"%s\" target=\"_blank\">dokumentacije</a>.", "Create an <strong>admin account</strong>" => "Ustvari <strong>skrbniški račun</strong>", "Advanced" => "Napredne možnosti", "Data folder" => "Podatkovna mapa", diff --git a/core/l10n/sq.php b/core/l10n/sq.php index 4e6c458f4df..0daeccc4814 100644 --- a/core/l10n/sq.php +++ b/core/l10n/sq.php @@ -42,6 +42,7 @@ "years ago" => "vite më parë", "Choose" => "Zgjidh", "Cancel" => "Anulo", +"Error loading file picker template" => "Veprim i gabuar gjatë ngarkimit të modelit të zgjedhësit të skedarëve", "Yes" => "Po", "No" => "Jo", "Ok" => "Në rregull", @@ -60,6 +61,7 @@ "Share with link" => "Nda me lidhje", "Password protect" => "Mbro me kod", "Password" => "Kodi", +"Allow Public Upload" => "Lejo Ngarkimin Publik", "Email link to person" => "Dërgo email me lidhjen", "Send" => "Dërgo", "Set expiration date" => "Cakto datën e përfundimit", @@ -88,6 +90,7 @@ "Request failed!<br>Did you make sure your email/username was right?" => "Kërkesa dështoi!<br>A u siguruat që email-i/përdoruesi juaj ishte i saktë?", "You will receive a link to reset your password via Email." => "Do t'iu vijë një email që përmban një lidhje për ta rivendosur kodin.", "Username" => "Përdoruesi", +"Yes, I really want to reset my password now" => "Po, dua ta rivendos kodin tani", "Request reset" => "Bëj kërkesë për rivendosjen", "Your password was reset" => "Kodi yt u rivendos", "To login page" => "Tek faqja e hyrjes", @@ -100,15 +103,14 @@ "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", "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Versioni juaj i PHP-së është i cënueshëm nga sulmi NULL Byte (CVE-2006-7243)", -"Please update your PHP installation to use ownCloud securely." => "Ju lutem azhurnoni instalimin tuaj të PHP-së që të përdorni ownCloud-in në mënyrë të sigurt.", "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Nuk disponohet asnjë krijues numrash të rastësishëm, ju lutem aktivizoni shtesën PHP OpenSSL.", "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Pa një krijues numrash të rastësishëm të sigurt një person i huaj mund të jetë në gjendje të parashikojë kodin dhe të marri llogarinë tuaj.", "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Dosja dhe skedarët e të dhënave tuaja mbase janë të arritshme nga interneti sepse skedari .htaccess nuk po punon.", -"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Për më shumë informacion mbi konfigurimin e duhur të serverit tuaj, ju lutem shikoni <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">dokumentacionin</a>.", "Create an <strong>admin account</strong>" => "Krijo një <strong>llogari administruesi</strong>", "Advanced" => "Të përparuara", "Data folder" => "Emri i dosjes", diff --git a/core/l10n/sv.php b/core/l10n/sv.php index d6d4b0ff323..091ae9e2fae 100644 --- a/core/l10n/sv.php +++ b/core/l10n/sv.php @@ -83,7 +83,7 @@ "Error setting expiration date" => "Fel vid sättning av utgångsdatum", "Sending ..." => "Skickar ...", "Email sent" => "E-post skickat", -"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-gemenskapen</a>.", +"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.", "ownCloud password reset" => "ownCloud lösenordsåterställning", "Use the following link to reset your password: {link}" => "Använd följande länk för att återställa lösenordet: {link}", @@ -110,11 +110,11 @@ "Add" => "Lägg till", "Security Warning" => "Säkerhetsvarning", "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Din version av PHP är sårbar för NULL byte attack (CVE-2006-7243)", -"Please update your PHP installation to use ownCloud securely." => "Uppdatera din PHP-installation för att använda ownCloud säkert.", +"Please update your PHP installation to use %s securely." => "Var god uppdatera din PHP-installation för att använda %s säkert.", "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Ingen säker slumptalsgenerator finns tillgänglig. Du bör aktivera PHP OpenSSL-tillägget.", "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Utan en säker slumptalsgenerator kan angripare få möjlighet att förutsäga lösenordsåterställningar och ta över ditt konto.", "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Din datakatalog och filer är förmodligen tillgängliga från Internet, eftersom .htaccess-filen inte fungerar.", -"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "För information hur man korrekt konfigurera servern, var god se <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>.", +"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "För information hur du korrekt konfigurerar din servern, se ownCloud <a href=\"%s\" target=\"_blank\">dokumentationen</a>.", "Create an <strong>admin account</strong>" => "Skapa ett <strong>administratörskonto</strong>", "Advanced" => "Avancerad", "Data folder" => "Datamapp", diff --git a/core/l10n/tr.php b/core/l10n/tr.php index 0a56af94182..063690d0e1f 100644 --- a/core/l10n/tr.php +++ b/core/l10n/tr.php @@ -1,4 +1,5 @@ <?php $TRANSLATIONS = array( +"%s shared »%s« with you" => "%s sizinle »%s« paylaşımında bulundu", "Category type not provided." => "Kategori türü desteklenmemektedir.", "No category to add?" => "Eklenecek kategori yok?", "This category already exists: %s" => "Bu kategori zaten mevcut: %s", @@ -61,6 +62,7 @@ "Share with link" => "Bağlantı ile paylaş", "Password protect" => "Şifre korunması", "Password" => "Parola", +"Allow Public Upload" => "Herkes tarafından yüklemeye izin ver", "Email link to person" => "Kişiye e-posta linki", "Send" => "Gönder", "Set expiration date" => "Son kullanma tarihini ayarla", @@ -89,6 +91,8 @@ "Request failed!<br>Did you make sure your email/username was right?" => "Isteği başarısız oldu!<br>E-posta / kullanıcı adınızı doğru olduğundan emin misiniz?", "You will receive a link to reset your password via Email." => "Parolanızı sıfırlamak için bir bağlantı Eposta olarak gönderilecek.", "Username" => "Kullanıcı Adı", +"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Dosyalarınız şifrelenmiş. Eğer kurtarma anahtarını aktif etmediyseniz parola sıfırlama işleminden sonra verilerinize erişmeniz imkansız olacak. Eğer ne yaptığınızdan emin değilseniz, devam etmeden önce sistem yöneticiniz ile irtibata geçiniz. Gerçekten devam etmek istiyor musunuz?", +"Yes, I really want to reset my password now" => "Evet,Şu anda parolamı sıfırlamak istiyorum.", "Request reset" => "Sıfırlama iste", "Your password was reset" => "Parolanız sıfırlandı", "To login page" => "Giriş sayfasına git", @@ -101,15 +105,14 @@ "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", "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "PHP sürümünüz NULL Byte saldırısına açık (CVE-2006-7243)", -"Please update your PHP installation to use ownCloud securely." => "ownCloud'u güvenli olarak kullanmak için, lütfen PHP kurulumunuzu güncelleyin.", "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Güvenli rasgele sayı üreticisi bulunamadı. Lütfen PHP OpenSSL eklentisini etkinleştirin.", "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Güvenli rasgele sayı üreticisi olmadan saldırganlar parola sıfırlama simgelerini tahmin edip hesabınızı ele geçirebilir.", "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Veri klasörünüz ve dosyalarınız .htaccess dosyası çalışmadığı için internet'ten erişime açık.", -"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Server'ınızı nasıl ayarlayacağınıza dair bilgi için, lütfen bu linki ziyaret edin <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>.", "Create an <strong>admin account</strong>" => "Bir <strong>yönetici hesabı</strong> oluşturun", "Advanced" => "Gelişmiş", "Data folder" => "Veri klasörü", @@ -130,6 +133,7 @@ "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!", "prev" => "önceki", "next" => "sonraki", "Updating ownCloud to version %s, this may take a while." => "Owncloud %s versiyonuna güncelleniyor. Biraz zaman alabilir." diff --git a/core/l10n/uk.php b/core/l10n/uk.php index 8e67a470956..8491590787a 100644 --- a/core/l10n/uk.php +++ b/core/l10n/uk.php @@ -102,11 +102,9 @@ "Add" => "Додати", "Security Warning" => "Попередження про небезпеку", "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Ваша версія PHP вразлива для атак NULL Byte (CVE-2006-7243)", -"Please update your PHP installation to use ownCloud securely." => "Будь ласка, оновіть інсталяцію PHP для безпечного використання ownCloud.", "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Не доступний безпечний генератор випадкових чисел, будь ласка, активуйте PHP OpenSSL додаток.", "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Без безпечного генератора випадкових чисел зловмисник може визначити токени скидання пароля і заволодіти Вашим обліковим записом.", "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Ваші дані каталогів і файлів, ймовірно, доступні з інтернету, тому що .htaccess файл не працює.", -"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Для отримання інформації, як правильно налаштувати сервер, зверніться до <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">документації</a>.", "Create an <strong>admin account</strong>" => "Створити <strong>обліковий запис адміністратора</strong>", "Advanced" => "Додатково", "Data folder" => "Каталог даних", diff --git a/core/l10n/vi.php b/core/l10n/vi.php index 37ed47de765..0ea7dd3a642 100644 --- a/core/l10n/vi.php +++ b/core/l10n/vi.php @@ -104,11 +104,9 @@ "Add" => "Thêm", "Security Warning" => "Cảnh bảo bảo mật", "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Phiên bản PHP của bạn có lỗ hổng NULL Byte attack (CVE-2006-7243)", -"Please update your PHP installation to use ownCloud securely." => "Vui lòng cập nhật bản cài đặt PHP để sử dụng ownCloud một cách an toàn.", "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Không an toàn ! chức năng random number generator đã có sẵn ,vui lòng bật PHP OpenSSL extension.", "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Nếu không có random number generator , Hacker có thể thiết lập lại mật khẩu và chiếm tài khoản của bạn.", "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Thư mục và file dữ liệu của bạn có thể được truy cập từ internet bởi vì file .htaccess không hoạt động", -"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Để biết thêm cách cấu hình máy chủ của bạn, xin xem <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">tài liệu</a>.", "Create an <strong>admin account</strong>" => "Tạo một <strong>tài khoản quản trị</strong>", "Advanced" => "Nâng cao", "Data folder" => "Thư mục dữ liệu", diff --git a/core/l10n/zh_CN.GB2312.php b/core/l10n/zh_CN.GB2312.php index 237f0bb14bb..fce45b3c98a 100644 --- a/core/l10n/zh_CN.GB2312.php +++ b/core/l10n/zh_CN.GB2312.php @@ -1,8 +1,10 @@ <?php $TRANSLATIONS = array( +"%s shared »%s« with you" => "%s 与您共享了 »%s« ", "Category type not provided." => "未选择分类类型。", "No category to add?" => "没有分类添加了?", "This category already exists: %s" => "此分类已存在：%s", "Object type not provided." => "未选择对象类型。", +"%s ID not provided." => "%s 没有提供 ID", "Error adding %s to favorites." => "在添加 %s 到收藏夹时发生错误。", "No categories selected for deletion." => "没有选中要删除的分类。", "Error removing %s from favorites." => "在移除收藏夹中的 %s 时发生错误。", @@ -41,6 +43,7 @@ "years ago" => "年前", "Choose" => "选择", "Cancel" => "取消", +"Error loading file picker template" => "加载文件选取模板出错", "Yes" => "是", "No" => "否", "Ok" => "好的", @@ -59,6 +62,7 @@ "Share with link" => "分享链接", "Password protect" => "密码保护", "Password" => "密码", +"Allow Public Upload" => "允许公众上传", "Email link to person" => "面向个人的电子邮件链接", "Send" => "发送", "Set expiration date" => "设置失效日期", @@ -83,8 +87,12 @@ "The update was successful. Redirecting you to ownCloud now." => "升级成功。现在为您跳转到ownCloud。", "ownCloud password reset" => "私有云密码重置", "Use the following link to reset your password: {link}" => "使用下面的链接来重置你的密码:{link}", +"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "重置密码的连接已经通过邮件到您的邮箱。<br> 如果你没有收到邮件，可能是由于要再等一下，或者检查一下您的垃圾邮件夹。<br> 如果还是没有收到，请联系您的系统管理员。", +"Request failed!<br>Did you make sure your email/username was right?" => "请求失败！<br> 你确定你的邮件地址/用户名是正确的？", "You will receive a link to reset your password via Email." => "你将会收到一个重置密码的链接", "Username" => "用户名", +"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "您的文件是加密的。如果您还没有启用恢复密钥，在重置了密码后，您的数据讲无法恢复回来。如果您不确定是否这么做，请联系您的管理员在继续这个操作。你却是想继续么？", +"Yes, I really want to reset my password now" => "是的，我想现在重置密码。", "Request reset" => "要求重置", "Your password was reset" => "你的密码已经被重置了", "To login page" => "转至登陆页面", @@ -97,14 +105,16 @@ "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" => "安全警告", -"Please update your PHP installation to use ownCloud securely." => "请升级您的PHP版本以稳定运行ownCloud。", +"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "您的PHP版本是会受到NULL字节漏洞攻击的(CVE-2006-7243)", +"Please update your PHP installation to use %s securely." => "请安全地升级您的PHP版本到 %s 。", "No secure random number generator is available, please enable the PHP OpenSSL extension." => "没有安全随机码生成器，请启用 PHP OpenSSL 扩展。", "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "没有安全随机码生成器，黑客可以预测密码重置令牌并接管你的账户。", "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "因为.htaccess文件无效，您的数据文件夹及文件可能可以在互联网上访问。", -"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "要获得大概如何配置您的服务器的相关信息，参见<a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">说明文档</a>。", +"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "有关如何正确地配置您的服务器，请查看 <a href=\"%s\" target=\"_blank\">文档</a>。", "Create an <strong>admin account</strong>" => "建立一个 <strong>管理帐户</strong>", "Advanced" => "进阶", "Data folder" => "数据存放文件夹", @@ -116,6 +126,7 @@ "Database tablespace" => "数据库表格空间", "Database host" => "数据库主机", "Finish setup" => "完成安装", +"%s is available. Get more information on how to update." => "%s 是可用的。获取更多关于升级的信息。", "Log out" => "注销", "Automatic logon rejected!" => "自动登录被拒绝！", "If you did not change your password recently, your account may be compromised!" => "如果您最近没有修改您的密码，那您的帐号可能被攻击了！", @@ -124,6 +135,7 @@ "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><br>\n查看： %s <br><br> 祝顺利！", "prev" => "后退", "next" => "前进", "Updating ownCloud to version %s, this may take a while." => "ownCloud正在升级至 %s 版，这可能需要一点时间。" diff --git a/core/l10n/zh_CN.php b/core/l10n/zh_CN.php index 0c73fe31b3f..ecc97f000b6 100644 --- a/core/l10n/zh_CN.php +++ b/core/l10n/zh_CN.php @@ -110,11 +110,9 @@ "Add" => "增加", "Security Warning" => "安全警告", "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "你的PHP版本容易受到空字节攻击 (CVE-2006-7243)", -"Please update your PHP installation to use ownCloud securely." => "为保证安全使用 ownCloud 请更新您的PHP。", "No secure random number generator is available, please enable the PHP OpenSSL extension." => "随机数生成器无效，请启用PHP的OpenSSL扩展", "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "没有安全随机码生成器，攻击者可能会猜测密码重置信息从而窃取您的账户", "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "您的数据目录和文件可能可以直接被互联网访问，因为 .htaccess 并未正常工作。", -"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "关于如何配置服务器，请参见 <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">此文档</a>。", "Create an <strong>admin account</strong>" => "创建<strong>管理员账号</strong>", "Advanced" => "高级", "Data folder" => "数据目录", diff --git a/core/l10n/zh_TW.php b/core/l10n/zh_TW.php index 4afa6ea116f..bc381329b76 100644 --- a/core/l10n/zh_TW.php +++ b/core/l10n/zh_TW.php @@ -1,4 +1,5 @@ <?php $TRANSLATIONS = array( +"%s shared »%s« with you" => "%s 與您分享了 %s", "Category type not provided." => "未提供分類類型。", "No category to add?" => "沒有可增加的分類？", "This category already exists: %s" => "分類已經存在： %s", @@ -61,6 +62,7 @@ "Share with link" => "使用連結分享", "Password protect" => "密碼保護", "Password" => "密碼", +"Allow Public Upload" => "允許任何人上傳", "Email link to person" => "將連結 email 給別人", "Send" => "寄出", "Set expiration date" => "設置到期日", @@ -87,8 +89,9 @@ "Use the following link to reset your password: {link}" => "請至以下連結重設您的密碼： {link}", "The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "重設密碼的連結已經寄至您的電子郵件信箱，如果您過了一段時間還是沒有收到它，請檢查看看它是不是被放到垃圾郵件了，如果還是沒有的話，請聯絡您的 ownCloud 系統管理員。", "Request failed!<br>Did you make sure your email/username was right?" => "請求失敗！<br>您確定填入的電子郵件地址或是帳號名稱是正確的嗎？", -"You will receive a link to reset your password via Email." => "重設密碼的連結將會寄到你的電子郵件信箱。", +"You will receive a link to reset your password via Email." => "重設密碼的連結將會寄到您的電子郵件信箱。", "Username" => "使用者名稱", +"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "您的檔案已加密，如果您沒有設定還原金鑰，未來重設密碼後將無法取回您的資料。如果您不確定該怎麼做，請洽詢系統管理員後再繼續。您確定要現在繼續嗎？", "Yes, I really want to reset my password now" => "對，我現在想要重設我的密碼。", "Request reset" => "請求重設", "Your password was reset" => "您的密碼已重設", @@ -102,15 +105,16 @@ "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" => "安全性警告", "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "您的 PHP 版本無法抵抗 NULL Byte 攻擊 (CVE-2006-7243)", -"Please update your PHP installation to use ownCloud securely." => "請更新您的 PHP 安裝以更安全地使用 ownCloud 。", +"Please update your PHP installation to use %s securely." => "請更新 PHP 以安全地使用 %s。", "No secure random number generator is available, please enable the PHP OpenSSL extension." => "沒有可用的亂數產生器，請啟用 PHP 中的 OpenSSL 擴充功能。", "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "若沒有安全的亂數產生器，攻擊者可能可以預測密碼重設信物，然後控制您的帳戶。", "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "您的資料目錄看起來可以被 Internet 公開存取，因為 .htaccess 設定並未生效。", -"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "請參考<a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">說明文件</a>以瞭解如何正確設定您的伺服器。", +"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "請參考<a href=\"%s\" target=\"_blank\">說明文件</a>以瞭解如何正確設定您的伺服器。", "Create an <strong>admin account</strong>" => "建立一個<strong>管理者帳號</strong>", "Advanced" => "進階", "Data folder" => "資料夾", @@ -131,6 +135,7 @@ "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>", "prev" => "上一頁", "next" => "下一頁", "Updating ownCloud to version %s, this may take a while." => "正在將 Owncloud 升級至版本 %s ，這可能需要一點時間。" diff --git a/core/templates/404.php b/core/templates/404.php index ee17f0de8e1..bf1e03e6bc9 100644 --- a/core/templates/404.php +++ b/core/templates/404.php @@ -7,9 +7,13 @@ if(!isset($_)) {//also provide standalone error page exit; } ?> -<ul> - <li class='error'> - <?php p($l->t( 'Cloud not found' )); ?><br/> - <p class='hint'><?php if(isset($_['file'])) p($_['file'])?></p> - </li> -</ul> +<?php if (isset($_['content'])): ?> + <?php print_unescaped($_['content']) ?> +<?php else: ?> + <ul> + <li class="error"> + <?php p($l->t( 'Cloud not found' )); ?><br/> + <p class='hint'><?php if(isset($_['file'])) p($_['file'])?></p> + </li> + </ul> +<?php endif; ?> diff --git a/core/templates/altmail.php b/core/templates/altmail.php index a7df29a2446..2551473c6f0 100644 --- a/core/templates/altmail.php +++ b/core/templates/altmail.php @@ -1,9 +1,7 @@ <?php -$defaults = new OC_Defaults(); - 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']))); ?> -- -<?php p($defaults->getName() . ' - ' . $defaults->getSlogan()); ?> -<?php print_unescaped("\n".$defaults->getBaseUrl()); +<?php p($theme->getName() . ' - ' . $theme->getSlogan()); ?> +<?php print_unescaped("\n".$theme->getBaseUrl()); diff --git a/core/templates/installation.php b/core/templates/installation.php index 7f2796a4b31..77c455304d3 100644 --- a/core/templates/installation.php +++ b/core/templates/installation.php @@ -23,7 +23,7 @@ <fieldset class="warning"> <legend><strong><?php p($l->t('Security Warning'));?></strong></legend> <p><?php p($l->t('Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)'));?><br/> - <?php p($l->t('Please update your PHP installation to use ownCloud securely.'));?></p> + <?php p($l->t('Please update your PHP installation to use %s securely.', $theme->getName() )); ?></p> </fieldset> <?php endif; ?> <?php if(!$_['secureRNG']): ?> @@ -37,7 +37,10 @@ <fieldset class="warning"> <legend><strong><?php p($l->t('Security Warning'));?></strong></legend> <p><?php p($l->t('Your data directory and files are probably accessible from the internet because the .htaccess file does not work.'));?><br> - <?php print_unescaped($l->t('For information how to properly configure your server, please see the <a href="http://doc.owncloud.org/server/5.0/admin_manual/installation.html" target="_blank">documentation</a>.'));?></p> + <?php print_unescaped($l->t( + 'For information how to properly configure your server, please see the <a href="%s" target="_blank">documentation</a>.', + $theme->getDocBaseUrl().'/server/5.0/admin_manual/installation.html' + )); ?></p> </fieldset> <?php endif; ?> <fieldset id="adminaccount"> @@ -118,7 +121,7 @@ <?php OC_Helper::init_radio('dbtype', 'oci', 'sqlite'); ?>/> <?php endif; ?> <?php endif; ?> - + <?php if($_['hasMSSQL']): ?> <input type='hidden' id='hasMSSQL' value='true'/> <?php if(!$_['hasSQLite'] and !$_['hasMySQL'] and !$_['hasPostgreSQL'] and !$_['hasOracle']): ?> @@ -128,7 +131,7 @@ <label class="mssql" for="mssql">MS SQL</label> <input type="radio" name="dbtype" value='mssql' id="mssql" <?php OC_Helper::init_radio('dbtype', 'mssql', 'sqlite'); ?>/> <?php endif; ?> - <?php endif; ?> + <?php endif; ?> </div> <?php if($hasOtherDB): ?> @@ -151,22 +154,22 @@ value="<?php p(OC_Helper::init_var('dbname')); ?>" autocomplete="off" pattern="[0-9a-zA-Z$_-]+" /> </p> - </div> - <?php endif; ?> - <?php if($_['hasOracle']): ?> - <div id="use_oracle_db"> - <p class="infield groupmiddle"> - <label for="dbtablespace" class="infield"><?php p($l->t( 'Database tablespace' )); ?></label> - <input type="text" name="dbtablespace" id="dbtablespace" placeholder="" - value="<?php p(OC_Helper::init_var('dbtablespace')); ?>" autocomplete="off" /> + <?php if($_['hasOracle']): ?> + <div id="use_oracle_db"> + <p class="infield groupmiddle"> + <label for="dbtablespace" class="infield"><?php p($l->t( 'Database tablespace' )); ?></label> + <input type="text" name="dbtablespace" id="dbtablespace" placeholder="" + value="<?php p(OC_Helper::init_var('dbtablespace')); ?>" autocomplete="off" /> + </p> + </div> + <?php endif; ?> + <p class="infield groupbottom"> + <label for="dbhost" class="infield"><?php p($l->t( 'Database host' )); ?></label> + <input type="text" name="dbhost" id="dbhost" placeholder="" + value="<?php p(OC_Helper::init_var('dbhost')); ?>" /> </p> </div> <?php endif; ?> - <p class="infield groupbottom"> - <label for="dbhost" class="infield" id="dbhostlabel"><?php p($l->t( 'Database host' )); ?></label> - <input type="text" name="dbhost" id="dbhost" placeholder="" - value="<?php p(OC_Helper::init_var('dbhost')); ?>" /> - </p> </fieldset> <div class="buttons"><input type="submit" class="primary" value="<?php p($l->t( 'Finish setup' )); ?>" /></div> diff --git a/core/templates/layout.base.php b/core/templates/layout.base.php index 09e1006d507..ea10c3042b5 100644 --- a/core/templates/layout.base.php +++ b/core/templates/layout.base.php @@ -6,11 +6,9 @@ <!--[if gt IE 9]><html class="ng-csp ie"><![endif]--> <!--[if !IE]><!--><html class="ng-csp"><!--<![endif]--> - <?php $defaults = new OC_Defaults(); // initialize themable default strings and urls ?> - <head> <title> - <?php p($defaults->getName()); ?> + <?php p($theme->getTitle()); ?> </title> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <link rel="shortcut icon" href="<?php print_unescaped(image_path('', 'favicon.png')); ?>" /> diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php index 329744e3824..9c9eb63382f 100644 --- a/core/templates/layout.guest.php +++ b/core/templates/layout.guest.php @@ -6,11 +6,9 @@ <!--[if gt IE 9]><html class="ng-csp ie"><![endif]--> <!--[if !IE]><!--><html class="ng-csp"><!--<![endif]--> - <?php $defaults = new OC_Defaults(); // initialize themable default strings and urls ?> - <head data-requesttoken="<?php p($_['requesttoken']); ?>"> <title> - <?php p($defaults->getName()); ?> + <?php p($theme->getTitle()); ?> </title> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta name="apple-itunes-app" content="app-id=543672169"> @@ -22,7 +20,7 @@ <?php foreach($_['jsfiles'] as $jsfile): ?> <script type="text/javascript" src="<?php print_unescaped($jsfile); ?>"></script> <?php endforeach; ?> - + <?php foreach($_['headers'] as $header): ?> <?php print_unescaped('<'.$header['tag'].' '); @@ -35,16 +33,21 @@ </head> <body id="body-login"> - <div id="login"> + <div class="wrapper"><!-- for sticky footer --> <header><div id="header"> - <img src="<?php print_unescaped(image_path('', 'logo.svg')); ?>" class="svg" alt="ownCloud" /> - <div id="logo-claim" style="display:none;"><?php p($defaults->getLogoClaim()); ?></div> + <img src="<?php print_unescaped(image_path('', 'logo.svg')); ?>" class="svg" alt="<?php p($theme->getName()); ?>" /> + <div id="logo-claim" style="display:none;"><?php p($theme->getLogoClaim()); ?></div> </div></header> + <?php print_unescaped($_['content']); ?> + + <div class="push"></div><!-- for sticky footer --> </div> + <footer> <p class="info"> - <?php print_unescaped($defaults->getLongFooter()); ?> - </p></footer> + <?php print_unescaped($theme->getLongFooter()); ?> + </p> + </footer> </body> </html> diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index dacbe79bd34..b7405ea273b 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -6,12 +6,10 @@ <!--[if gt IE 9]><html class="ng-csp ie"><![endif]--> <!--[if !IE]><!--><html class="ng-csp"><!--<![endif]--> - <?php $defaults = new OC_Defaults(); // initialize themable default strings and urls ?> - <head data-user="<?php p($_['user_uid']); ?>" data-requesttoken="<?php p($_['requesttoken']); ?>"> <title> <?php p(!empty($_['application'])?$_['application'].' | ':''); - p($defaults->getName()); + p($theme->getTitle()); p(trim($_['user_displayname']) != '' ?' ('.$_['user_displayname'].') ':'') ?> </title> <meta charset="utf-8"> @@ -45,8 +43,8 @@ </div> <header><div id="header"> <a href="<?php print_unescaped(link_to('', 'index.php')); ?>" title="" id="owncloud"><img class="svg" - src="<?php print_unescaped(image_path('', 'logo-wide.svg')); ?>" alt="ownCloud" /></a> - <div id="logo-claim" style="display:none;"><?php p($defaults->getLogoClaim()); ?></div> + src="<?php print_unescaped(image_path('', 'logo-wide.svg')); ?>" alt="<?php p($theme->getName()); ?>" /></a> + <div id="logo-claim" style="display:none;"><?php p($theme->getLogoClaim()); ?></div> <ul id="settings" class="svg"> <span id="expand" tabindex="0" role="link"> <span id="expandDisplayName"><?php p(trim($_['user_displayname']) != '' ? $_['user_displayname'] : $_['user_uid']) ?></span> diff --git a/core/templates/login.php b/core/templates/login.php index 571e0a865d9..9143510f757 100644 --- a/core/templates/login.php +++ b/core/templates/login.php @@ -35,8 +35,8 @@ </a> <?php endif; ?> - <input type="checkbox" name="remember_login" value="1" id="remember_login"/><label - for="remember_login"><?php p($l->t('remember')); ?></label> + <input type="checkbox" name="remember_login" value="1" id="remember_login" checked /> + <label for="remember_login"><?php p($l->t('remember')); ?></label> <input type="hidden" name="timezone-offset" id="timezone-offset"/> <input type="submit" id="submit" class="login primary" value="<?php p($l->t('Log in')); ?>"/> </fieldset> diff --git a/core/templates/mail.php b/core/templates/mail.php index 562ad82e953..de72b136b13 100644 --- a/core/templates/mail.php +++ b/core/templates/mail.php @@ -1,11 +1,10 @@ -<?php $defaults = new OC_Defaults() // initialize themable default strings and urls ?> <table cellspacing="0" cellpadding="0" border="0" width="100%"> <tr><td> <table cellspacing="0" cellpadding="0" border="0" width="600px"> <tr> <td bgcolor="#1d2d44" width="20px"> </td> <td bgcolor="#1d2d44"> -<img src="<?php print_unescaped(OC_Helper::makeURLAbsolute(image_path('', 'logo-mail.gif'))); ?>" alt="ownCloud"/> +<img src="<?php print_unescaped(OC_Helper::makeURLAbsolute(image_path('', 'logo-mail.gif'))); ?>" alt="<?php p($theme->getName()); ?>"/> </td> </tr> <tr><td bgcolor="#f8f8f8" colspan="2"> </td></tr> @@ -21,9 +20,9 @@ print_unescaped($l->t('Hey there,<br><br>just letting you know that %s shared » <tr> <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;">--<br> -<?php p($defaults->getName()); ?> - -<?php p($defaults->getSlogan()); ?> -<br><a href="<?php print_unescaped($defaults->getBaseUrl()); ?>"><?php print_unescaped($defaults->getBaseUrl());?></a></td> +<?php p($theme->getName()); ?> - +<?php p($theme->getSlogan()); ?> +<br><a href="<?php print_unescaped($theme->getBaseUrl()); ?>"><?php print_unescaped($theme->getBaseUrl());?></a></td> </tr> <tr> <td bgcolor="#f8f8f8" colspan="2"> </td> |
