diff options
Diffstat (limited to 'core')
114 files changed, 1720 insertions, 721 deletions
diff --git a/core/ajax/update.php b/core/ajax/update.php index 55e8ab15ec2..84d7a21209e 100644 --- a/core/ajax/update.php +++ b/core/ajax/update.php @@ -15,6 +15,14 @@ if (OC::checkUpgrade(false)) { $updater->listen('\OC\Updater', 'dbUpgrade', function () use ($eventSource, $l) { $eventSource->send('success', (string)$l->t('Updated database')); }); + $updater->listen('\OC\Updater', 'disabledApps', function ($appList) use ($eventSource, $l) { + $list = array(); + foreach ($appList as $appId) { + $info = OC_App::getAppInfo($appId); + $list[] = $info['name'] . ' (' . $info['id'] . ')'; + } + $eventSource->send('success', (string)$l->t('Disabled incompatible apps: %s', implode(', ', $list))); + }); $updater->listen('\OC\Updater', 'failure', function ($message) use ($eventSource) { $eventSource->send('failure', $message); $eventSource->close(); diff --git a/core/avatar/controller.php b/core/avatar/controller.php index 06efbec3f3c..03eb9da1dc5 100644 --- a/core/avatar/controller.php +++ b/core/avatar/controller.php @@ -46,7 +46,12 @@ class Controller { if (isset($_POST['path'])) { $path = stripslashes($_POST['path']); $view = new \OC\Files\View('/'.$user.'/files'); - $newAvatar = $view->file_get_contents($path); + $fileInfo = $view->getFileInfo($path); + if($fileInfo['encrypted'] === true) { + $fileName = $view->toTmpFile($path); + } else { + $fileName = $view->getLocalFile($path); + } } elseif (!empty($_FILES)) { $files = $_FILES['files']; if ( @@ -54,7 +59,9 @@ class Controller { is_uploaded_file($files['tmp_name'][0]) && !\OC\Files\Filesystem::isFileBlacklisted($files['tmp_name'][0]) ) { - $newAvatar = file_get_contents($files['tmp_name'][0]); + \OC\Cache::set('avatar_upload', file_get_contents($files['tmp_name'][0]), 7200); + $view = new \OC\Files\View('/'.$user.'/cache'); + $fileName = $view->getLocalFile('avatar_upload'); unlink($files['tmp_name'][0]); } } else { @@ -64,11 +71,9 @@ class Controller { } try { - $avatar = new \OC_Avatar($user); - $avatar->set($newAvatar); - \OC_JSON::success(); - } catch (\OC\NotSquareException $e) { - $image = new \OC_Image($newAvatar); + $image = new \OC_Image(); + $image->loadFromFile($fileName); + $image->fixOrientation(); if ($image->valid()) { \OC\Cache::set('tmpavatar', $image->data(), 7200); diff --git a/core/command/maintenance/mode.php b/core/command/maintenance/mode.php new file mode 100644 index 00000000000..f26a11384a8 --- /dev/null +++ b/core/command/maintenance/mode.php @@ -0,0 +1,61 @@ +<?php +/** + * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com> and + * Copyright (c) 2014 Stephen Colebrook <scolebrook@mac.com> + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +namespace OC\Core\Command\Maintenance; + +use OC\Config; + +use Symfony\Component\Console\Command\Command; +use Symfony\Component\Console\Input\InputInterface; +use Symfony\Component\Console\Input\InputOption; +use Symfony\Component\Console\Output\OutputInterface; + +class Mode extends Command { + + protected $config; + + public function __construct(Config $config) { + $this->config = $config; + parent::__construct(); + } + + protected function configure() { + $this + ->setName('maintenance:mode') + ->setDescription('set maintenance mode') + ->addOption( + 'on', + null, + InputOption::VALUE_NONE, + 'enable maintenance mode' + ) + ->addOption( + 'off', + null, + InputOption::VALUE_NONE, + 'disable maintenance mode' + ); + } + + protected function execute(InputInterface $input, OutputInterface $output) { + if ($input->getOption('on')) { + $this->config->setValue('maintenance', true); + $output->writeln('Maintenance mode enabled'); + } elseif ($input->getOption('off')) { + $this->config->setValue('maintenance', false); + $output->writeln('Maintenance mode disabled'); + } else { + if ($this->config->getValue('maintenance', false)) { + $output->writeln('Maintenance mode is currently enabled'); + } else { + $output->writeln('Maintenance mode is currently disabled'); + } + } + } +} diff --git a/core/command/upgrade.php b/core/command/upgrade.php index ed72d136e24..8ce8ef9b6e5 100644 --- a/core/command/upgrade.php +++ b/core/command/upgrade.php @@ -56,6 +56,9 @@ class Upgrade extends Command { $updater->listen('\OC\Updater', 'dbUpgrade', function () use($output) { $output->writeln('<info>Updated database</info>'); }); + $updater->listen('\OC\Updater', 'disabledApps', function ($appList) use($output) { + $output->writeln('<info>Disabled incompatible apps: ' . implode(', ', $appList) . '</info>'); + }); $updater->listen('\OC\Updater', 'failure', function ($message) use($output) { $output->writeln($message); diff --git a/core/command/user/lastseen.php b/core/command/user/lastseen.php new file mode 100644 index 00000000000..7a8db013e3a --- /dev/null +++ b/core/command/user/lastseen.php @@ -0,0 +1,47 @@ +<?php +/** + * Copyright (c) 2014 Arthur Schiwon <blizzz@owncloud.com> + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +namespace OC\Core\Command\User; + +use Symfony\Component\Console\Command\Command; +use Symfony\Component\Console\Input\InputInterface; +use Symfony\Component\Console\Output\OutputInterface; +use Symfony\Component\Console\Input\InputArgument; + +class LastSeen extends Command { + protected function configure() { + $this + ->setName('user:lastseen') + ->setDescription('shows when the user was logged it last time') + ->addArgument( + 'uid', + InputArgument::REQUIRED, + 'the username' + ); + } + + protected function execute(InputInterface $input, OutputInterface $output) { + $userManager = \OC::$server->getUserManager(); + $user = $userManager->get($input->getArgument('uid')); + if(is_null($user)) { + $output->writeln('User does not exist'); + return; + } + + $lastLogin = $user->getLastLogin(); + if($lastLogin === 0) { + $output->writeln('User ' . $user->getUID() . + ' has never logged in, yet.'); + } else { + $date = new \DateTime(); + $date->setTimestamp($lastLogin); + $output->writeln($user->getUID() . + '`s last login: ' . $date->format('d.m.Y H:i')); + } + } +} diff --git a/core/command/user/resetpassword.php b/core/command/user/resetpassword.php new file mode 100644 index 00000000000..d7893c291e4 --- /dev/null +++ b/core/command/user/resetpassword.php @@ -0,0 +1,79 @@ +<?php +/** + * Copyright (c) 2014 Christopher Schäpers <christopher@schaepers.it> + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +namespace OC\Core\Command\User; + +use Symfony\Component\Console\Command\Command; +use Symfony\Component\Console\Input\InputInterface; +use Symfony\Component\Console\Input\InputArgument; +use Symfony\Component\Console\Output\OutputInterface; + +class ResetPassword extends Command { + + /** @var \OC\User\Manager */ + protected $userManager; + + public function __construct(\OC\User\Manager $userManager) { + $this->userManager = $userManager; + parent::__construct(); + } + + protected function configure() { + $this + ->setName('user:resetpassword') + ->setDescription('Resets the password of the named user') + ->addArgument( + 'user', + InputArgument::REQUIRED, + 'Username to reset password' + ) + ; + } + + protected function execute(InputInterface $input, OutputInterface $output) { + $username = $input->getArgument('user'); + + /** @var $user \OC\User\User */ + $user = $this->userManager->get($username); + if (is_null($user)) { + $output->writeln("<error>There is no user called " . $username . "</error>"); + return 1; + } + + if ($input->isInteractive()) { + /** @var $dialog \Symfony\Component\Console\Helper\DialogHelper */ + $dialog = $this->getHelperSet()->get('dialog'); + $password = $dialog->askHiddenResponse( + $output, + '<question>Enter a new password: </question>', + false + ); + $confirm = $dialog->askHiddenResponse( + $output, + '<question>Confirm the new password: </question>', + false + ); + + if ($password === $confirm) { + $success = $user->setPassword($password); + if ($success) { + $output->writeln("<info>Successfully reset password for " . $username . "</info>"); + } else { + $output->writeln("<error>Error while resetting password!</error>"); + return 1; + } + } else { + $output->writeln("<error>Passwords did not match!</error>"); + return 1; + } + } else { + $output->writeln("<error>Interactive input is needed for entering a new password!</error>"); + return 1; + } + } +} diff --git a/core/css/apps.css b/core/css/apps.css index 377878467c0..18e299552e5 100644 --- a/core/css/apps.css +++ b/core/css/apps.css @@ -10,7 +10,7 @@ /* Navigation: folder like structure */ #app-navigation { - width: 300px; + width: 230px; height: 100%; float: left; -moz-box-sizing: border-box; box-sizing: border-box; @@ -19,6 +19,7 @@ padding-bottom: 44px; } #app-navigation > ul { + position: relative; height: 100%; overflow: auto; -moz-box-sizing: border-box; box-sizing: border-box; @@ -174,7 +175,7 @@ /* settings area */ #app-settings { position: fixed; - width: 299px; + width: 229px; bottom: 0; border-top: 1px solid #ccc; } @@ -277,3 +278,12 @@ button.loading { .appear.transparent { opacity: 0; } + + +/* do not use italic typeface style, instead lighter color */ +em { + font-style: normal; + -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)"; + filter: alpha(opacity=50); + opacity: .5; +} diff --git a/core/css/fixes.css b/core/css/fixes.css index 15635950746..acea53258eb 100644 --- a/core/css/fixes.css +++ b/core/css/fixes.css @@ -5,6 +5,16 @@ border: 0; } +/* fix height of select boxes for OS X */ +select { + height: 32px; +} + +/* reset typeface for IE8 because OpenSans renders too small */ +.ie8 body { + font-family: Frutiger, Calibri, 'Myriad Pro', Myriad, Arial, sans-serif; +} + .lte8 .delete-icon { background-image: url('../img/actions/delete.png'); } .lte8 .delete-icon:hover, .delete-icon:focus { background-image: url('../img/actions/delete-hover.png'); @@ -37,10 +47,6 @@ 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 since we cannot set a good backround color to use the filter&background hack as with the input labels */ @@ -71,7 +77,7 @@ /* IE8 isn't able to display transparent background. So it is specified using a gradient */ .ie8 #nojavascript { - filter: progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr='#4c320000', endColorstr='#4c320000'); /* IE */ + filter: progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr='#4c320000', endColorstr='#4c320000'); } /* IE8 doesn't have rounded corners, so the strengthify bar should be wider */ @@ -79,3 +85,4 @@ width: 271px; left: 6px; } + diff --git a/core/css/fonts.css b/core/css/fonts.css new file mode 100644 index 00000000000..aa6e71bef21 --- /dev/null +++ b/core/css/fonts.css @@ -0,0 +1,13 @@ +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: normal; + src: local('Open Sans'), local('OpenSans'), url(../fonts/OpenSans-Regular.woff) format('woff'); +} + +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: bold; + src: local('Open Sans Bold'), local('OpenSans-Bold'), url(../fonts/OpenSans-Bold.woff) format('woff'); +}
\ No newline at end of file diff --git a/core/css/icons.css b/core/css/icons.css index cdfdd8e43ef..75d66a773a1 100644 --- a/core/css/icons.css +++ b/core/css/icons.css @@ -22,11 +22,6 @@ background-image: url('../img/loading-small.gif'); } -.icon-noise { - background-image: url('../img/noise.png'); - background-repeat: repeat; -} - diff --git a/core/css/mobile.css b/core/css/mobile.css index 01852613062..025bee6415a 100644 --- a/core/css/mobile.css +++ b/core/css/mobile.css @@ -111,11 +111,14 @@ -/* shift to account for missing navigation */ +/* shift to account for missing app list */ #body-user #controls, #body-settings #controls { padding-left: 0; } +#body-user .app-files #controls { + left: 230px !important; /* sidebar only */ +} /* don’t require a minimum width for controls bar */ #controls { diff --git a/core/css/share.css b/core/css/share.css index 1527a3a0c0f..0859c195858 100644 --- a/core/css/share.css +++ b/core/css/share.css @@ -8,7 +8,7 @@ border-bottom-right-radius: 5px; box-shadow:0 1px 1px #777; display:block; - margin-right:112px; + margin-right: 0; position:absolute; right:0; width:420px; diff --git a/core/css/styles.css b/core/css/styles.css index d21e6bc6907..595b5532674 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -16,7 +16,10 @@ ul { list-style:none; } body { background: #fefefe; - font: normal .8em/1.6em "Helvetica Neue",Helvetica,Arial,FreeSans,sans-serif; + font-weight: normal; + font-size: .8em; + line-height: 1.6em; + font-family: 'Open Sans', Frutiger, Calibri, 'Myriad Pro', Myriad, sans-serif; color: #000; height: auto; } @@ -33,7 +36,7 @@ body { z-index: 100; height: 45px; line-height: 2.5em; - background: #1d2d44 url('../img/noise.png') repeat; + background-color: #1d2d44; -moz-box-sizing: border-box; box-sizing: border-box; } @@ -41,12 +44,12 @@ body { #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 */ + 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 */ } @@ -204,10 +207,26 @@ input img, button img, .button img { } +/* prevent ugly selection effect on accidental selection */ +#header, +#navigation, +#expanddiv { + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; +} + + /* SCROLLING */ -::-webkit-scrollbar { width:8px; } -::-webkit-scrollbar-track-piece { background-color:transparent; } -::-webkit-scrollbar-thumb { background:#ddd; } +::-webkit-scrollbar { + width: 8px; +} +::-webkit-scrollbar-track-piece { + background-color: transparent; +} +::-webkit-scrollbar-thumb { + background: #ccc; +} /* BUTTONS */ @@ -293,7 +312,7 @@ input[type="submit"].enabled { position: fixed; top:45px; right: 0; - left: 0; + left:0; height: 44px; width: 100%; padding: 0; @@ -370,6 +389,16 @@ input[type="submit"].enabled { opacity: .6; } +#body-login .update h2 { + font-weight: bold; + font-size: 18px; + margin-bottom: 30px; +} + +#body-login .infogroup { + margin-bottom: 15px; +} + #body-login p#message img { vertical-align: middle; padding: 5px; @@ -443,14 +472,14 @@ input[name='password-clone'] { #user+label+img, #password-icon { position: absolute; - left: 1.25em; - top: 1.65em; + left: 16px; + top: 20px; -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=30)"; filter: alpha(opacity=30); opacity: .3; } #adminpass-icon, #password-icon { - top: 1.1em; + top: 15px; } /* General new input field look */ @@ -463,6 +492,11 @@ input[name='password-clone'] { } /* Nicely grouping input field sets */ +.grouptop, +.groupmiddle, +.groupbottom { + position: relative; +} #body-login .grouptop input { margin-bottom: 0; border-bottom: 0; @@ -485,23 +519,11 @@ input[name='password-clone'] { box-shadow: 0 1px 0 rgba(0,0,0,.1) inset !important; } -/* In field labels. No, HTML placeholder does not work as well. */ -#body-login .groupmiddle label, #body-login .groupbottom label { top:.65em; } -p.infield { position:relative; } -label.infield { cursor:text !important; top:1.05em; left:.85em; } -#body-login form label.infield { /* labels are ellipsized when too long, keep them short */ - position: absolute; - width: 82%; - margin-left: 26px; - font-size: 19px; - color: #aaa; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; -} -#body-login #databaseField .infield { - margin-left: 0; +/* keep the labels for screen readers but hide them since we use placeholders */ +label.infield { + display: none; } + #body-login form input[type="checkbox"]+label { position: relative; margin: 0; @@ -532,7 +554,7 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; } } -#body-login p.info{ +#body-login footer .info { white-space: nowrap; } @@ -559,7 +581,7 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; } } #show + label, #dbpassword + label, #personal-show + label { position: absolute !important; - height: 14px; + height: 20px; width: 24px; background-image: url("../img/actions/toggle.png"); background-repeat: no-repeat; @@ -573,8 +595,9 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; } width: 8em; } #personal-show + label { - margin-top: 1em; - margin-left: -3em; + height: 14px; + margin-top: 14px; + margin-left: -36px; } #passwordbutton { margin-left: .5em; @@ -659,7 +682,7 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; } #body-login input { font-size: 20px; margin: 5px; - padding: 12px 10px 8px; + padding: 11px 10px 9px; } #body-login input[type="text"], #body-login input[type="password"] { @@ -699,12 +722,10 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; } width: 80px; margin-top:45px; z-index: 75; - background: #383c43 url('../img/noise.png') repeat; + background-color: #383c43; overflow-y: auto; overflow-x: hidden; -moz-box-sizing:border-box; box-sizing:border-box; - /* prevent ugly selection effect on accidental selection */ - -webkit-user-select: none; -moz-user-select: none; -ms-user-select: none; user-select: none; } #apps { height: 100%; @@ -784,19 +805,16 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; } display: block; padding: 7px 12px 6px 7px; cursor: pointer; - font-weight: bold; } #expand:hover, #expand:focus, #expand:active { color:#fff; } #expand img { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=70)"; filter:alpha(opacity=70); opacity:.7; margin-bottom:-2px; } #expand:hover img, #expand:focus img, #expand:active img { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1; } #expanddiv { position:absolute; right:0; top:45px; z-index:76; display:none; - background:#383c43 url('../img/noise.png') repeat; + background-color: #383c43; border-bottom-left-radius:7px; border-bottom:1px #333 solid; border-left:1px #333 solid; box-shadow:0 0 7px rgb(29,45,68); -moz-box-sizing: border-box; box-sizing: border-box; - /* prevent ugly selection effect on accidental selection */ - -webkit-user-select: none; -moz-user-select: none; -ms-user-select: none; user-select: none; } #expanddiv a { display: block; @@ -953,15 +971,6 @@ span.ui-icon {float: left; margin: 3px 7px 30px 0;} .arrow.left { left:-13px; bottom:1.2em; -webkit-transform:rotate(270deg); -moz-transform:rotate(270deg); -o-transform:rotate(270deg); -ms-transform:rotate(270deg); transform:rotate(270deg); } .arrow.up { top:-8px; right:6px; } .arrow.down { -webkit-transform:rotate(180deg); -moz-transform:rotate(180deg); -o-transform:rotate(180deg); -ms-transform:rotate(180deg); transform:rotate(180deg); } -.help-includes { - overflow: hidden; - width: 100%; - height: 100%; - -moz-box-sizing: border-box; - box-sizing: border-box; - padding-top: 44px; -} -.help-iframe {width: 100%; height: 100%; margin: 0;padding: 0; border: 0; overflow: auto;} /* ---- BREADCRUMB ---- */ diff --git a/core/fonts/LICENSE.txt b/core/fonts/LICENSE.txt new file mode 100644 index 00000000000..75b52484ea4 --- /dev/null +++ b/core/fonts/LICENSE.txt @@ -0,0 +1,202 @@ +
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
diff --git a/core/fonts/OpenSans-Bold.woff b/core/fonts/OpenSans-Bold.woff Binary files differnew file mode 100644 index 00000000000..ee2ea797d1c --- /dev/null +++ b/core/fonts/OpenSans-Bold.woff diff --git a/core/fonts/OpenSans-Regular.woff b/core/fonts/OpenSans-Regular.woff Binary files differnew file mode 100644 index 00000000000..2abc3ed69fd --- /dev/null +++ b/core/fonts/OpenSans-Regular.woff diff --git a/core/img/noise.png b/core/img/noise.png Binary files differdeleted file mode 100644 index 6c06c8a4d6d..00000000000 --- a/core/img/noise.png +++ /dev/null diff --git a/core/js/avatar.js b/core/js/avatar.js index 67d6b9b7b95..6835f6ef0ac 100644 --- a/core/js/avatar.js +++ b/core/js/avatar.js @@ -7,7 +7,9 @@ $(document).ready(function(){ } }; - $('#header .avatardiv').avatar(OC.currentUser, 32, undefined, true, callback); + $('#header .avatardiv').avatar( + OC.currentUser, 32, undefined, true, callback + ); // Personal settings $('#avatar .avatardiv').avatar(OC.currentUser, 128); } diff --git a/core/js/compatibility.js b/core/js/compatibility.js index c07288857f2..ac942d202e8 100644 --- a/core/js/compatibility.js +++ b/core/js/compatibility.js @@ -42,8 +42,9 @@ if (!Array.prototype.filter) { for (var i = 0; i < len; i++) { if (i in this) { var val = this[i]; // in case fun mutates this - if (fun.call(thisp, val, i, this)) + if (fun.call(thisp, val, i, this)) { res.push(val); + } } } return res; diff --git a/core/js/core.json b/core/js/core.json index f1e0ba883d0..4815116c338 100644 --- a/core/js/core.json +++ b/core/js/core.json @@ -4,7 +4,6 @@ "jquery-migrate-1.2.1.min.js", "jquery-ui-1.10.0.custom.js", "jquery-showpassword.js", - "jquery.infieldlabel.js", "jquery.placeholder.js", "jquery-tipsy.js", "underscore.js" diff --git a/core/js/eventsource.js b/core/js/eventsource.js index 70f4a2a9aa8..ce2a13d4676 100644 --- a/core/js/eventsource.js +++ b/core/js/eventsource.js @@ -20,10 +20,12 @@ */ /** - * Wrapper for server side events (http://en.wikipedia.org/wiki/Server-sent_events) + * Wrapper for server side events + * (http://en.wikipedia.org/wiki/Server-sent_events) * includes a fallback for older browsers and IE * - * Use server side events with caution, too many open requests can hang the server + * use server side events with caution, too many open requests can hang the + * server */ /** @@ -43,7 +45,7 @@ OC.EventSource=function(src,data){ dataStr+='requesttoken='+oc_requesttoken; if(!this.useFallBack && typeof EventSource !='undefined'){ var joinChar = '&'; - if(src.indexOf('?') == -1) { + if(src.indexOf('?') === -1) { joinChar = '?'; } this.source=new EventSource(src+joinChar+dataStr); @@ -60,13 +62,13 @@ OC.EventSource=function(src,data){ this.iframe.hide(); var joinChar = '&'; - if(src.indexOf('?') == -1) { + if(src.indexOf('?') === -1) { joinChar = '?'; } this.iframe.attr('src',src+joinChar+'fallback=true&fallback_id='+OC.EventSource.iframeCount+'&'+dataStr); $('body').append(this.iframe); this.useFallBack=true; - OC.EventSource.iframeCount++ + OC.EventSource.iframeCount++; } //add close listener this.listen('__internal__',function(data){ diff --git a/core/js/jquery.infieldlabel.js b/core/js/jquery.infieldlabel.js deleted file mode 100644 index fad15102bcb..00000000000 --- a/core/js/jquery.infieldlabel.js +++ /dev/null @@ -1,177 +0,0 @@ -/* - * jquery.infieldlabel - * A simple jQuery plugin for adding labels that sit over a form field and fade away when the fields are populated. - * - * Copyright (c) 2009 - 2013 Doug Neiner <doug@dougneiner.com> (http://code.dougneiner.com) - * Source: https://github.com/dcneiner/In-Field-Labels-jQuery-Plugin - * Dual licensed MIT or GPL - * MIT (http://www.opensource.org/licenses/mit-license) - * GPL (http://www.opensource.org/licenses/gpl-license) - * - * @version 0.1.3 - */ -(function ($) { - - $.InFieldLabels = function (label, field, options) { - // To avoid scope issues, use 'base' instead of 'this' - // to reference this class from internal events and functions. - var base = this; - - // Access to jQuery and DOM versions of each element - base.$label = $(label); - base.label = label; - - base.$field = $(field); - base.field = field; - - base.$label.data("InFieldLabels", base); - base.showing = true; - - base.init = function () { - var initialSet; - - // Merge supplied options with default options - base.options = $.extend({}, $.InFieldLabels.defaultOptions, options); - - // Check if the field is already filled in - // add a short delay to handle autocomplete - setTimeout(function() { - if (base.$field.val() !== "") { - base.$label.hide(); - base.showing = false; - } else { - base.$label.show(); - base.showing = true; - } - }, 200); - - base.$field.focus(function () { - base.fadeOnFocus(); - }).blur(function () { - base.checkForEmpty(true); - }).bind('keydown.infieldlabel', function (e) { - // Use of a namespace (.infieldlabel) allows us to - // unbind just this method later - base.hideOnChange(e); - }).bind('paste', function () { - // Since you can not paste an empty string we can assume - // that the fieldis not empty and the label can be cleared. - base.setOpacity(0.0); - }).change(function () { - base.checkForEmpty(); - }).bind('onPropertyChange', function () { - base.checkForEmpty(); - }).bind('keyup.infieldlabel', function () { - base.checkForEmpty(); - }); - - if ( base.options.pollDuration > 0 ) { - initialSet = setInterval( function () { - if (base.$field.val() !== "") { - base.$label.hide(); - base.showing = false; - clearInterval( initialSet ); - } - }, base.options.pollDuration ); - - } - }; - - // If the label is currently showing - // then fade it down to the amount - // specified in the settings - base.fadeOnFocus = function () { - if (base.showing) { - base.setOpacity(base.options.fadeOpacity); - } - }; - - base.setOpacity = function (opacity) { - base.$label.stop().animate({ opacity: opacity }, base.options.fadeDuration); - base.showing = (opacity > 0.0); - }; - - // Checks for empty as a fail safe - // set blur to true when passing from - // the blur event - base.checkForEmpty = function (blur) { - if (base.$field.val() === "") { - base.prepForShow(); - base.setOpacity(blur ? 1.0 : base.options.fadeOpacity); - } else { - base.setOpacity(0.0); - } - }; - - base.prepForShow = function () { - if (!base.showing) { - // Prepare for a animate in... - base.$label.css({opacity: 0.0}).show(); - - // Reattach the keydown event - base.$field.bind('keydown.infieldlabel', function (e) { - base.hideOnChange(e); - }); - } - }; - - base.hideOnChange = function (e) { - if ( - (e.keyCode === 16) || // Skip Shift - (e.keyCode === 9) // Skip Tab - ) { - return; - } - - if (base.showing) { - base.$label.hide(); - base.showing = false; - } - - // Remove keydown event to save on CPU processing - base.$field.unbind('keydown.infieldlabel'); - }; - - // Run the initialization method - base.init(); - }; - - $.InFieldLabels.defaultOptions = { - fadeOpacity: 0.5, // Once a field has focus, how transparent should the label be - fadeDuration: 300, // How long should it take to animate from 1.0 opacity to the fadeOpacity - pollDuration: 0, // If set to a number greater than zero, this will poll until content is detected in a field - enabledInputTypes: [ "text", "search", "tel", "url", "email", "password", "number", "textarea" ] - }; - - - $.fn.inFieldLabels = function (options) { - var allowed_types = options && options.enabledInputTypes || $.InFieldLabels.defaultOptions.enabledInputTypes; - - return this.each(function () { - // Find input or textarea based on for= attribute - // The for attribute on the label must contain the ID - // of the input or textarea element - var for_attr = $(this).attr('for'), field, restrict_type; - if (!for_attr) { - return; // Nothing to attach, since the for field wasn't used - } - - // Find the referenced input or textarea element - field = document.getElementById( for_attr ); - if ( !field ) { - return; // No element found - } - - // Restrict input type - restrict_type = $.inArray( field.type, allowed_types ); - - if ( restrict_type === -1 && field.nodeName !== "TEXTAREA" ) { - return; // Again, nothing to attach - } - - // Only create object for matched input types and textarea - (new $.InFieldLabels(this, field, options)); - }); - }; - -}(jQuery)); diff --git a/core/js/jquery.ocdialog.js b/core/js/jquery.ocdialog.js index e2433f5f980..af32591ce52 100644 --- a/core/js/jquery.ocdialog.js +++ b/core/js/jquery.ocdialog.js @@ -35,11 +35,18 @@ }); $(document).on('keydown keyup', function(event) { - if(event.target !== self.$dialog.get(0) && self.$dialog.find($(event.target)).length === 0) { + if ( + event.target !== self.$dialog.get(0) && + self.$dialog.find($(event.target)).length === 0 + ) { return; } // Escape - if(event.keyCode === 27 && event.type === 'keydown' && self.options.closeOnEscape) { + if ( + event.keyCode === 27 && + event.type === 'keydown' && + self.options.closeOnEscape + ) { event.stopImmediatePropagation(); self.close(); return false; @@ -52,7 +59,10 @@ return false; } // If no button is selected we trigger the primary - if(self.$buttonrow && self.$buttonrow.find($(event.target)).length === 0) { + if ( + self.$buttonrow && + self.$buttonrow.find($(event.target)).length === 0 + ) { var $button = self.$buttonrow.find('button.primary'); if($button) { $button.trigger('click'); diff --git a/core/js/js.js b/core/js/js.js index 38b97590430..834916b2e3f 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -1,7 +1,7 @@ /** * Disable console output unless DEBUG mode is enabled. * Add - * define('DEBUG', true); + * define('DEBUG', true); * To the end of config/config.php to enable debug mode. * The undefined checks fix the broken ie8 console */ @@ -23,7 +23,10 @@ if (typeof oc_webroot === "undefined") { oc_webroot = oc_webroot.substr(0, oc_webroot.lastIndexOf('/')); } } -if (oc_debug !== true || typeof console === "undefined" || typeof console.log === "undefined") { +if ( + oc_debug !== true || typeof console === "undefined" || + typeof console.log === "undefined" +) { if (!window.console) { window.console = {}; } @@ -37,7 +40,8 @@ if (oc_debug !== true || typeof console === "undefined" || typeof console.log == function initL10N(app) { if (!( t.cache[app] )) { $.ajax(OC.filePath('core', 'ajax', 'translations.php'), { - async: false,//todo a proper solution for this without sync ajax calls + // TODO a proper solution for this without sync ajax calls + async: false, data: {'app': app}, type: 'POST', success: function (jsondata) { @@ -75,8 +79,8 @@ function initL10N(app) { /* We used to use eval, but it seems IE has issues with it. * We now use "new Function", though it carries a slightly * bigger performance hit. - var code = 'function (n) { var plural; var nplurals; '+pf+' return { "nplural" : nplurals, "plural" : (plural === true ? 1 : plural ? plural : 0) }; };'; - Gettext._locale_data[domain].head.plural_func = eval("("+code+")"); + var code = 'function (n) { var plural; var nplurals; '+pf+' return { "nplural" : nplurals, "plural" : (plural === true ? 1 : plural ? plural : 0) }; };'; + Gettext._locale_data[domain].head.plural_func = eval("("+code+")"); */ var code = 'var plural; var nplurals; '+pf+' return { "nplural" : nplurals, "plural" : (plural === true ? 1 : plural ? plural : 0) };'; t.plural_function[app] = new Function("n", code); @@ -154,7 +158,7 @@ function n(app, text_singular, text_plural, count, vars) { * @return {string} Sanitized string */ function escapeHTML(s) { - return s.toString().split('&').join('&').split('<').join('<').split('"').join('"'); + return s.toString().split('&').join('&').split('<').join('<').split('>').join('>').split('"').join('"').split('\'').join('''); } /** @@ -175,11 +179,16 @@ var OC={ PERMISSION_DELETE:8, PERMISSION_SHARE:16, PERMISSION_ALL:31, + /* jshint camelcase: false */ webroot:oc_webroot, appswebroots:(typeof oc_appswebroots !== 'undefined') ? oc_appswebroots:false, currentUser:(typeof oc_current_user!=='undefined')?oc_current_user:false, + config: window.oc_config, + appConfig: window.oc_appconfig || {}, + theme: window.oc_defaults || {}, coreApps:['', 'admin','log','search','settings','core','3rdparty'], - + menuSpeed: 100, + /** * Get an absolute url to a file in an app * @param {string} app the id of the app the file belongs to @@ -207,7 +216,16 @@ var OC={ linkToRemote:function(service) { return window.location.protocol + '//' + window.location.host + OC.linkToRemoteBase(service); }, - + + /** + * Gets the base path for the given OCS API service. + * @param {string} service name + * @return {string} OCS API base path + */ + linkToOCS: function(service) { + return window.location.protocol + '//' + window.location.host + OC.webroot + '/ocs/v1.php/' + service + '/'; + }, + /** * Generates the absolute url for the given relative url, which can contain parameters. * @param {string} url @@ -518,7 +536,7 @@ var OC={ $toggle.addClass('menutoggle'); $toggle.on('click.menu', function(event) { if ($menuEl.is(OC._currentMenu)) { - $menuEl.hide(); + $menuEl.slideUp(OC.menuSpeed); OC._currentMenu = null; OC._currentMenuToggle = null; return false; @@ -528,7 +546,7 @@ var OC={ // close it OC._currentMenu.hide(); } - $menuEl.show(); + $menuEl.slideToggle(OC.menuSpeed); OC._currentMenu = $menuEl; OC._currentMenuToggle = $toggle; return false; @@ -541,7 +559,7 @@ var OC={ unregisterMenu: function($toggle, $menuEl) { // close menu if opened if ($menuEl.is(OC._currentMenu)) { - $menuEl.hide(); + $menuEl.slideUp(OC.menuSpeed); OC._currentMenu = null; OC._currentMenuToggle = null; } @@ -935,39 +953,6 @@ function object(o) { } /** - * Fills height of window. (more precise than height: 100%;) - * @param selector - */ -function fillHeight(selector) { - if (selector.length === 0) { - return; - } - var height = parseFloat($(window).height())-selector.offset().top; - selector.css('height', height + 'px'); - if(selector.outerHeight() > selector.height()){ - selector.css('height', height-(selector.outerHeight()-selector.height()) + 'px'); - } - console.warn("This function is deprecated! Use CSS instead"); -} - -/** - * Fills height and width of window. (more precise than height: 100%; or width: 100%;) - * @param selector - */ -function fillWindow(selector) { - if (selector.length === 0) { - return; - } - fillHeight(selector); - var width = parseFloat($(window).width())-selector.offset().left; - selector.css('width', width + 'px'); - if(selector.outerWidth() > selector.width()){ - selector.css('width', width-(selector.outerWidth()-selector.width()) + 'px'); - } - console.warn("This function is deprecated! Use CSS instead"); -} - -/** * Initializes core */ function initCore() { @@ -1054,11 +1039,6 @@ function initCore() { setShowPassword($('#pass2'), $('label[for=personal-show]')); setShowPassword($('#dbpass'), $('label[for=dbpassword]')); - //use infield labels - $("label.infield").inFieldLabels({ - pollDuration: 100 - }); - var checkShowCredentials = function() { var empty = false; $('input#user, input#password').each(function() { @@ -1088,7 +1068,7 @@ function initCore() { } }); $('#settings #expand').click(function(event) { - $('#settings #expanddiv').slideToggle(200); + $('#settings #expanddiv').slideToggle(OC.menuSpeed); event.stopPropagation(); }); $('#settings #expanddiv').click(function(event){ @@ -1096,7 +1076,7 @@ function initCore() { }); //hide the user menu when clicking outside it $(document).click(function(){ - $('#settings #expanddiv').slideUp(200); + $('#settings #expanddiv').slideUp(OC.menuSpeed); }); // all the tipsy stuff needs to be here (in reverse order) to work @@ -1107,6 +1087,7 @@ function initCore() { $('a.action.delete').tipsy({gravity:'e', fade:true, live:true}); $('a.action').tipsy({gravity:'s', fade:true, live:true}); $('td .modified').tipsy({gravity:'s', fade:true, live:true}); + $('td.lastLogin').tipsy({gravity:'s', fade:true, html:true}); $('input').tipsy({gravity:'w', fade:true}); // toggle for menus @@ -1117,7 +1098,7 @@ function initCore() { return false; } if (OC._currentMenu) { - OC._currentMenu.hide(); + OC._currentMenu.slideUp(OC.menuSpeed); } OC._currentMenu = null; OC._currentMenuToggle = null; @@ -1183,9 +1164,10 @@ $.fn.filterAttr = function(attr_name, attr_value) { /** * Returns a human readable file size * @param {number} size Size in bytes + * @param {boolean} skipSmallSizes return '< 1 kB' for small files * @return {string} */ -function humanFileSize(size) { +function humanFileSize(size, skipSmallSizes) { var humanList = ['B', 'kB', 'MB', 'GB', 'TB']; // Calculate Log with base 1024: size = 1024 ** order var order = size?Math.floor(Math.log(size) / Math.log(1024)):0; @@ -1193,6 +1175,13 @@ function humanFileSize(size) { order = Math.min(humanList.length - 1, order); var readableFormat = humanList[order]; var relativeSize = (size / Math.pow(1024, order)).toFixed(1); + if(skipSmallSizes === true && order === 0) { + if(relativeSize !== "0.0"){ + return '< 1 kB'; + } else { + return '0 kB'; + } + } if(order < 2){ relativeSize = parseFloat(relativeSize).toFixed(0); } @@ -1270,7 +1259,7 @@ OC.Util = { * @return {string} fixed image path with png extension if SVG is not supported */ replaceSVGIcon: function(file) { - if (!OC.Util.hasSVGSupport()) { + if (file && !OC.Util.hasSVGSupport()) { var i = file.lastIndexOf('.svg'); if (i >= 0) { file = file.substr(0, i) + '.png' + file.substr(i+4); diff --git a/core/js/listview.js b/core/js/listview.js index 18d0bdeaf7c..71466c90207 100644 --- a/core/js/listview.js +++ b/core/js/listview.js @@ -46,7 +46,7 @@ ListView.prototype={ $.each(this.hoverElement,function(index,collumn){ $.each(collumn,function(index,element){ var html='<a href="#" title="'+element.title+'" class="hoverElement"/>'; - var element=$(html); + element = $(html); element.append($('<img src="'+element.icon+'"/>')); element.click(element.callback); tr.children('td.'+collumn).append(element); @@ -59,9 +59,9 @@ ListView.prototype={ hoverHandelerOut:function(tr){ tr.find('*.hoverElement').remove(); }, - addHoverElement:function(collumn,icon,title,callback){ - if(!this.hoverElements[collumn]){ - this.hoverElements[collumn]=[]; + addHoverElement:function(column,icon,title,callback){ + if(!this.hoverElements[column]){ + this.hoverElements[column] = []; } this.hoverElements[row].push({icon:icon,callback:callback,title:title}); }, diff --git a/core/js/multiselect.js b/core/js/multiselect.js index 02699636a20..565b793200f 100644 --- a/core/js/multiselect.js +++ b/core/js/multiselect.js @@ -1,14 +1,19 @@ /** - * @param 'createCallback' A function to be called when a new entry is created. Two arguments are supplied to this function: - * The select element used and the value of the option. If the function returns false addition will be cancelled. If it returns - * anything else it will be used as the value of the newly added option. + * @param 'createCallback' A function to be called when a new entry is created. + * Two arguments are supplied to this function: + * The select element used and the value of the option. If the function + * returns false addition will be cancelled. If it returns + * anything else it will be used as the value of the newly added option. * @param 'createText' The placeholder text for the create action. * @param 'title' The title to show if no options are selected. - * @param 'checked' An array containing values for options that should be checked. Any options which are already selected will be added to this array. + * @param 'checked' An array containing values for options that should be + * checked. Any options which are already selected will be added to this array. * @param 'labels' The corresponding labels to show for the checked items. - * @param 'oncheck' Callback function which will be called when a checkbox/radiobutton is selected. If the function returns false the input will be unchecked. + * @param 'oncheck' Callback function which will be called when a + * checkbox/radiobutton is selected. If the function returns false the input will be unchecked. * @param 'onuncheck' @see 'oncheck'. - * @param 'singleSelect' If true radiobuttons will be used instead of checkboxes. + * @param 'singleSelect' If true radiobuttons will be used instead of + * checkboxes. */ (function( $ ){ var multiSelectId=-1; @@ -32,12 +37,18 @@ $.extend(settings,options); $.each(this.children(),function(i,option) { // If the option is selected, but not in the checked array, add it. - if($(option).attr('selected') && settings.checked.indexOf($(option).val()) === -1) { + if ( + $(option).attr('selected') && + settings.checked.indexOf($(option).val()) === -1 + ) { settings.checked.push($(option).val()); settings.labels.push($(option).text().trim()); } // If the option is in the checked array but not selected, select it. - else if(settings.checked.indexOf($(option).val()) !== -1 && !$(option).attr('selected')) { + else if ( + settings.checked.indexOf($(option).val()) !== -1 && + !$(option).attr('selected') + ) { $(option).attr('selected', 'selected'); settings.labels.push($(option).text().trim()); } @@ -104,7 +115,7 @@ var label=$('<label/>'); label.attr('for',id); label.text(element.text() || item); - if(settings.checked.indexOf(item)!=-1 || checked) { + if(settings.checked.indexOf(item) !== -1 || checked) { input.attr('checked', true); } if(checked){ @@ -151,17 +162,21 @@ settings.labels.splice(index,1); } var oldWidth=button.width(); - button.children('span').first().text(settings.labels.length > 0 + button.children('span').first().text(settings.labels.length > 0 ? settings.labels.join(', ') : settings.title); - var newOuterWidth=Math.max((button.outerWidth()-2),settings.minOuterWidth)+'px'; + var newOuterWidth = Math.max( + (button.outerWidth() - 2), + settings.minOuterWidth + ) + 'px'; var newWidth=Math.max(button.width(),settings.minWidth); var pos=button.position(); button.css('width',oldWidth); button.animate({'width':newWidth},undefined,undefined,function(){ button.css('width',''); }); - list.animate({'width':newOuterWidth,'left':pos.left+3}); + list.animate({'width':newOuterWidth,'left':pos.left}); + self.change(); }); var li=$('<li></li>'); li.append(input).append(label); @@ -184,7 +199,7 @@ input.css('width',button.innerWidth()); button.parent().data('preventHide',true); input.keypress(function(event) { - if(event.keyCode == 13) { + if(event.keyCode === 13) { event.preventDefault(); event.stopPropagation(); var value = $(this).val(); @@ -222,7 +237,7 @@ select.append(option); li.prev().children('input').prop('checked', true).trigger('change'); button.parent().data('preventHide',false); - button.children('span').first().text(settings.labels.length > 0 + button.children('span').first().text(settings.labels.length > 0 ? settings.labels.join(', ') : settings.title); if(self.menuDirection === 'up') { @@ -265,13 +280,13 @@ } list.append(list.find('li.creator')); var pos=button.position(); - if(($(document).height() > (button.offset().top+button.outerHeight() + list.children().length * button.height()) - && $(document).height() - button.offset().top > (button.offset().top+button.outerHeight() + list.children().length * button.height())) - || $(document).height()/2 > button.offset().top + if(($(document).height() > (button.offset().top + button.outerHeight() + list.children().length * button.height()) && + $(document).height() - button.offset().top > (button.offset().top+button.outerHeight() + list.children().length * button.height())) || + $(document).height() / 2 > button.offset().top ) { list.css({ top:pos.top+button.outerHeight()-5, - left:pos.left+3, + left:pos.left, width:(button.outerWidth()-2)+'px', 'max-height':($(document).height()-(button.offset().top+button.outerHeight()+10))+'px' }); @@ -282,7 +297,7 @@ list.css('max-height', $(document).height()-($(document).height()-(pos.top)+50)+'px'); list.css({ top:pos.top - list.height(), - left:pos.left+3, + left:pos.left, width:(button.outerWidth()-2)+'px' }); diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js index 54b9442af27..0e4c346e8cc 100644 --- a/core/js/oc-dialogs.js +++ b/core/js/oc-dialogs.js @@ -38,7 +38,14 @@ var OCdialogs = { * @param modal make the dialog modal */ alert:function(text, title, callback, modal) { - this.message(text, title, 'alert', OCdialogs.OK_BUTTON, callback, modal); + this.message( + text, + title, + 'alert', + OCdialogs.OK_BUTTON, + callback, + modal + ); }, /** * displays info dialog @@ -59,7 +66,14 @@ var OCdialogs = { * @param modal make the dialog modal */ confirm:function(text, title, callback, modal) { - this.message(text, title, 'notice', OCdialogs.YES_NO_BUTTONS, callback, modal); + this.message( + text, + title, + 'notice', + OCdialogs.YES_NO_BUTTONS, + callback, + modal + ); }, /** * displays prompt dialog diff --git a/core/js/octemplate.js b/core/js/octemplate.js index aab705059d2..67aa7d69cce 100644 --- a/core/js/octemplate.js +++ b/core/js/octemplate.js @@ -1,7 +1,8 @@ /** * jQuery plugin for micro templates * - * Strings are automatically escaped, but that can be disabled by setting escapeFunction to null. + * Strings are automatically escaped, but that can be disabled by setting + * escapeFunction to null. * * Usage examples: * @@ -11,13 +12,15 @@ * var htmlStr = '<p>Welcome back {user}</p>'; * $(htmlStr).octemplate({user: 'John Q. Public'}, {escapeFunction: null}); * - * Be aware that the target string must be wrapped in an HTML element for the plugin to work. The following won't work: + * Be aware that the target string must be wrapped in an HTML element for the + * plugin to work. The following won't work: * * var textStr = 'Welcome back {user}'; * $(textStr).octemplate({user: 'John Q. Public'}); * - * For anything larger than one-liners, you can use a simple $.get() ajax request to get the template, - * or you can embed them it the page using the text/template type: + * For anything larger than one-liners, you can use a simple $.get() ajax + * request to get the template, or you can embed them it the page using the + * text/template type: * * <script id="contactListItemTemplate" type="text/template"> * <tr class="contact" data-id="{id}"> diff --git a/core/js/placeholders.js b/core/js/placeholders.js new file mode 100644 index 00000000000..e63f429d40f --- /dev/null +++ b/core/js/placeholders.js @@ -0,0 +1,459 @@ +/* + * The MIT License + * + * Copyright (c) 2012 James Allardice + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +// Defines the global Placeholders object along with various utility methods +(function (global) { + + "use strict"; + + // Cross-browser DOM event binding + function addEventListener(elem, event, fn) { + if (elem.addEventListener) { + return elem.addEventListener(event, fn, false); + } + if (elem.attachEvent) { + return elem.attachEvent("on" + event, fn); + } + } + + // Check whether an item is in an array (we don't use Array.prototype.indexOf so we don't clobber any existing polyfills - this is a really simple alternative) + function inArray(arr, item) { + var i, len; + for (i = 0, len = arr.length; i < len; i++) { + if (arr[i] === item) { + return true; + } + } + return false; + } + + // Move the caret to the index position specified. Assumes that the element has focus + function moveCaret(elem, index) { + var range; + if (elem.createTextRange) { + range = elem.createTextRange(); + range.move("character", index); + range.select(); + } else if (elem.selectionStart) { + elem.focus(); + elem.setSelectionRange(index, index); + } + } + + // Attempt to change the type property of an input element + function changeType(elem, type) { + try { + elem.type = type; + return true; + } catch (e) { + // You can't change input type in IE8 and below + return false; + } + } + + // Expose public methods + global.Placeholders = { + Utils: { + addEventListener: addEventListener, + inArray: inArray, + moveCaret: moveCaret, + changeType: changeType + } + }; + +}(this)); + +(function (global) { + + "use strict"; + + var validTypes = [ + "text", + "search", + "url", + "tel", + "email", + "password", + "number", + "textarea" + ], + + // The list of keycodes that are not allowed when the polyfill is configured to hide-on-input + badKeys = [ + + // The following keys all cause the caret to jump to the end of the input value + 27, // Escape + 33, // Page up + 34, // Page down + 35, // End + 36, // Home + + // Arrow keys allow you to move the caret manually, which should be prevented when the placeholder is visible + 37, // Left + 38, // Up + 39, // Right + 40, // Down + + // The following keys allow you to modify the placeholder text by removing characters, which should be prevented when the placeholder is visible + 8, // Backspace + 46 // Delete + ], + + // Styling variables + placeholderStyleColor = "#ccc", + placeholderClassName = "placeholdersjs", + classNameRegExp = new RegExp("(?:^|\\s)" + placeholderClassName + "(?!\\S)"), + + // These will hold references to all elements that can be affected. NodeList objects are live, so we only need to get those references once + inputs, textareas, + + // The various data-* attributes used by the polyfill + ATTR_CURRENT_VAL = "data-placeholder-value", + ATTR_ACTIVE = "data-placeholder-active", + ATTR_INPUT_TYPE = "data-placeholder-type", + ATTR_FORM_HANDLED = "data-placeholder-submit", + ATTR_EVENTS_BOUND = "data-placeholder-bound", + ATTR_OPTION_FOCUS = "data-placeholder-focus", + ATTR_OPTION_LIVE = "data-placeholder-live", + ATTR_MAXLENGTH = "data-placeholder-maxlength", + + // Various other variables used throughout the rest of the script + test = document.createElement("input"), + head = document.getElementsByTagName("head")[0], + root = document.documentElement, + Placeholders = global.Placeholders, + Utils = Placeholders.Utils, + hideOnInput, liveUpdates, keydownVal, styleElem, styleRules, placeholder, timer, form, elem, len, i; + + // No-op (used in place of public methods when native support is detected) + function noop() {} + + // Avoid IE9 activeElement of death when an iframe is used. + // More info: + // http://bugs.jquery.com/ticket/13393 + // https://github.com/jquery/jquery/commit/85fc5878b3c6af73f42d61eedf73013e7faae408 + function safeActiveElement() { + try { + return document.activeElement; + } catch (err) {} + } + + // Hide the placeholder value on a single element. Returns true if the placeholder was hidden and false if it was not (because it wasn't visible in the first place) + function hidePlaceholder(elem, keydownValue) { + var type, + maxLength, + valueChanged = (!!keydownValue && elem.value !== keydownValue), + isPlaceholderValue = (elem.value === elem.getAttribute(ATTR_CURRENT_VAL)); + + if ((valueChanged || isPlaceholderValue) && elem.getAttribute(ATTR_ACTIVE) === "true") { + elem.removeAttribute(ATTR_ACTIVE); + elem.value = elem.value.replace(elem.getAttribute(ATTR_CURRENT_VAL), ""); + elem.className = elem.className.replace(classNameRegExp, ""); + + // Restore the maxlength value + maxLength = elem.getAttribute(ATTR_MAXLENGTH); + if (parseInt(maxLength, 10) >= 0) { // Old FF returns -1 if attribute not set (see GH-56) + elem.setAttribute("maxLength", maxLength); + elem.removeAttribute(ATTR_MAXLENGTH); + } + + // If the polyfill has changed the type of the element we need to change it back + type = elem.getAttribute(ATTR_INPUT_TYPE); + if (type) { + elem.type = type; + } + return true; + } + return false; + } + + // Show the placeholder value on a single element. Returns true if the placeholder was shown and false if it was not (because it was already visible) + function showPlaceholder(elem) { + var type, + maxLength, + val = elem.getAttribute(ATTR_CURRENT_VAL); + if (elem.value === "" && val) { + elem.setAttribute(ATTR_ACTIVE, "true"); + elem.value = val; + elem.className += " " + placeholderClassName; + + // Store and remove the maxlength value + maxLength = elem.getAttribute(ATTR_MAXLENGTH); + if (!maxLength) { + elem.setAttribute(ATTR_MAXLENGTH, elem.maxLength); + elem.removeAttribute("maxLength"); + } + + // If the type of element needs to change, change it (e.g. password inputs) + type = elem.getAttribute(ATTR_INPUT_TYPE); + if (type) { + elem.type = "text"; + } else if (elem.type === "password") { + if (Utils.changeType(elem, "text")) { + elem.setAttribute(ATTR_INPUT_TYPE, "password"); + } + } + return true; + } + return false; + } + + function handleElem(node, callback) { + + var handleInputsLength, handleTextareasLength, handleInputs, handleTextareas, elem, len, i; + + // Check if the passed in node is an input/textarea (in which case it can't have any affected descendants) + if (node && node.getAttribute(ATTR_CURRENT_VAL)) { + callback(node); + } else { + + // If an element was passed in, get all affected descendants. Otherwise, get all affected elements in document + handleInputs = node ? node.getElementsByTagName("input") : inputs; + handleTextareas = node ? node.getElementsByTagName("textarea") : textareas; + + handleInputsLength = handleInputs ? handleInputs.length : 0; + handleTextareasLength = handleTextareas ? handleTextareas.length : 0; + + // Run the callback for each element + for (i = 0, len = handleInputsLength + handleTextareasLength; i < len; i++) { + elem = i < handleInputsLength ? handleInputs[i] : handleTextareas[i - handleInputsLength]; + callback(elem); + } + } + } + + // Return all affected elements to their normal state (remove placeholder value if present) + function disablePlaceholders(node) { + handleElem(node, hidePlaceholder); + } + + // Show the placeholder value on all appropriate elements + function enablePlaceholders(node) { + handleElem(node, showPlaceholder); + } + + // Returns a function that is used as a focus event handler + function makeFocusHandler(elem) { + return function () { + + // Only hide the placeholder value if the (default) hide-on-focus behaviour is enabled + if (hideOnInput && elem.value === elem.getAttribute(ATTR_CURRENT_VAL) && elem.getAttribute(ATTR_ACTIVE) === "true") { + + // Move the caret to the start of the input (this mimics the behaviour of all browsers that do not hide the placeholder on focus) + Utils.moveCaret(elem, 0); + + } else { + + // Remove the placeholder + hidePlaceholder(elem); + } + }; + } + + // Returns a function that is used as a blur event handler + function makeBlurHandler(elem) { + return function () { + showPlaceholder(elem); + }; + } + + // Functions that are used as a event handlers when the hide-on-input behaviour has been activated - very basic implementation of the "input" event + function makeKeydownHandler(elem) { + return function (e) { + keydownVal = elem.value; + + //Prevent the use of the arrow keys (try to keep the cursor before the placeholder) + if (elem.getAttribute(ATTR_ACTIVE) === "true") { + if (keydownVal === elem.getAttribute(ATTR_CURRENT_VAL) && Utils.inArray(badKeys, e.keyCode)) { + if (e.preventDefault) { + e.preventDefault(); + } + return false; + } + } + }; + } + function makeKeyupHandler(elem) { + return function () { + hidePlaceholder(elem, keydownVal); + + // If the element is now empty we need to show the placeholder + if (elem.value === "") { + elem.blur(); + Utils.moveCaret(elem, 0); + } + }; + } + function makeClickHandler(elem) { + return function () { + if (elem === safeActiveElement() && elem.value === elem.getAttribute(ATTR_CURRENT_VAL) && elem.getAttribute(ATTR_ACTIVE) === "true") { + Utils.moveCaret(elem, 0); + } + }; + } + + // Returns a function that is used as a submit event handler on form elements that have children affected by this polyfill + function makeSubmitHandler(form) { + return function () { + + // Turn off placeholders on all appropriate descendant elements + disablePlaceholders(form); + }; + } + + // Bind event handlers to an element that we need to affect with the polyfill + function newElement(elem) { + + // If the element is part of a form, make sure the placeholder string is not submitted as a value + if (elem.form) { + form = elem.form; + + // If the type of the property is a string then we have a "form" attribute and need to get the real form + if (typeof form === "string") { + form = document.getElementById(form); + } + + // Set a flag on the form so we know it's been handled (forms can contain multiple inputs) + if (!form.getAttribute(ATTR_FORM_HANDLED)) { + Utils.addEventListener(form, "submit", makeSubmitHandler(form)); + form.setAttribute(ATTR_FORM_HANDLED, "true"); + } + } + + // Bind event handlers to the element so we can hide/show the placeholder as appropriate + Utils.addEventListener(elem, "focus", makeFocusHandler(elem)); + Utils.addEventListener(elem, "blur", makeBlurHandler(elem)); + + // If the placeholder should hide on input rather than on focus we need additional event handlers + if (hideOnInput) { + Utils.addEventListener(elem, "keydown", makeKeydownHandler(elem)); + Utils.addEventListener(elem, "keyup", makeKeyupHandler(elem)); + Utils.addEventListener(elem, "click", makeClickHandler(elem)); + } + + // Remember that we've bound event handlers to this element + elem.setAttribute(ATTR_EVENTS_BOUND, "true"); + elem.setAttribute(ATTR_CURRENT_VAL, placeholder); + + // If the element doesn't have a value and is not focussed, set it to the placeholder string + if (hideOnInput || elem !== safeActiveElement()) { + showPlaceholder(elem); + } + } + + Placeholders.nativeSupport = test.placeholder !== void 0; + + if (!Placeholders.nativeSupport) { + + // Get references to all the input and textarea elements currently in the DOM (live NodeList objects to we only need to do this once) + inputs = document.getElementsByTagName("input"); + textareas = document.getElementsByTagName("textarea"); + + // Get any settings declared as data-* attributes on the root element (currently the only options are whether to hide the placeholder on focus or input and whether to auto-update) + hideOnInput = root.getAttribute(ATTR_OPTION_FOCUS) === "false"; + liveUpdates = root.getAttribute(ATTR_OPTION_LIVE) !== "false"; + + // Create style element for placeholder styles (instead of directly setting style properties on elements - allows for better flexibility alongside user-defined styles) + styleElem = document.createElement("style"); + styleElem.type = "text/css"; + + // Create style rules as text node + styleRules = document.createTextNode("." + placeholderClassName + " { color:" + placeholderStyleColor + "; }"); + + // Append style rules to newly created stylesheet + if (styleElem.styleSheet) { + styleElem.styleSheet.cssText = styleRules.nodeValue; + } else { + styleElem.appendChild(styleRules); + } + + // Prepend new style element to the head (before any existing stylesheets, so user-defined rules take precedence) + head.insertBefore(styleElem, head.firstChild); + + // Set up the placeholders + for (i = 0, len = inputs.length + textareas.length; i < len; i++) { + elem = i < inputs.length ? inputs[i] : textareas[i - inputs.length]; + + // Get the value of the placeholder attribute, if any. IE10 emulating IE7 fails with getAttribute, hence the use of the attributes node + placeholder = elem.attributes.placeholder; + if (placeholder) { + + // IE returns an empty object instead of undefined if the attribute is not present + placeholder = placeholder.nodeValue; + + // Only apply the polyfill if this element is of a type that supports placeholders, and has a placeholder attribute with a non-empty value + if (placeholder && Utils.inArray(validTypes, elem.type)) { + newElement(elem); + } + } + } + + // If enabled, the polyfill will repeatedly check for changed/added elements and apply to those as well + timer = setInterval(function () { + for (i = 0, len = inputs.length + textareas.length; i < len; i++) { + elem = i < inputs.length ? inputs[i] : textareas[i - inputs.length]; + + // Only apply the polyfill if this element is of a type that supports placeholders, and has a placeholder attribute with a non-empty value + placeholder = elem.attributes.placeholder; + if (placeholder) { + placeholder = placeholder.nodeValue; + if (placeholder && Utils.inArray(validTypes, elem.type)) { + + // If the element hasn't had event handlers bound to it then add them + if (!elem.getAttribute(ATTR_EVENTS_BOUND)) { + newElement(elem); + } + + // If the placeholder value has changed or not been initialised yet we need to update the display + if (placeholder !== elem.getAttribute(ATTR_CURRENT_VAL) || (elem.type === "password" && !elem.getAttribute(ATTR_INPUT_TYPE))) { + + // Attempt to change the type of password inputs (fails in IE < 9) + if (elem.type === "password" && !elem.getAttribute(ATTR_INPUT_TYPE) && Utils.changeType(elem, "text")) { + elem.setAttribute(ATTR_INPUT_TYPE, "password"); + } + + // If the placeholder value has changed and the placeholder is currently on display we need to change it + if (elem.value === elem.getAttribute(ATTR_CURRENT_VAL)) { + elem.value = placeholder; + } + + // Keep a reference to the current placeholder value in case it changes via another script + elem.setAttribute(ATTR_CURRENT_VAL, placeholder); + } + } + } else if (elem.getAttribute(ATTR_ACTIVE)) { + hidePlaceholder(elem); + elem.removeAttribute(ATTR_CURRENT_VAL); + } + } + + // If live updates are not enabled cancel the timer + if (!liveUpdates) { + clearInterval(timer); + } + }, 100); + } + + Utils.addEventListener(global, "beforeunload", function () { + Placeholders.disable(); + }); + + // Expose public methods + Placeholders.disable = Placeholders.nativeSupport ? noop : disablePlaceholders; + Placeholders.enable = Placeholders.nativeSupport ? noop : enablePlaceholders; + +}(this)); diff --git a/core/js/setup.js b/core/js/setup.js index 96719540f96..3b2c13bd421 100644 --- a/core/js/setup.js +++ b/core/js/setup.js @@ -13,6 +13,8 @@ $(document).ready(function() { if($('#hasSQLite').val()){ $('#use_other_db').hide(); $('#use_oracle_db').hide(); + } else { + $('#sqliteInformation').hide(); } $('#adminlogin').change(function(){ $('#adminlogin').val($.trim($('#adminlogin').val())); @@ -20,16 +22,19 @@ $(document).ready(function() { $('#sqlite').click(function() { $('#use_other_db').slideUp(250); $('#use_oracle_db').slideUp(250); + $('#sqliteInformation').show(); }); $('#mysql,#pgsql,#mssql').click(function() { $('#use_other_db').slideDown(250); $('#use_oracle_db').slideUp(250); + $('#sqliteInformation').hide(); }); $('#oci').click(function() { $('#use_other_db').slideDown(250); $('#use_oracle_db').show(250); + $('#sqliteInformation').hide(); }); $('input[checked]').trigger('click'); @@ -72,7 +77,10 @@ $(document).ready(function() { $('input[type="radio"]').first().click(); } - if (currentDbType === 'sqlite' || (dbtypes.sqlite && currentDbType === undefined)){ + if ( + currentDbType === 'sqlite' || + (dbtypes.sqlite && currentDbType === undefined) + ){ $('#datadirContent').hide(250); $('#databaseBackend').hide(250); $('#databaseField').hide(250); diff --git a/core/js/share.js b/core/js/share.js index 583f92dd39d..bcc04225b9f 100644 --- a/core/js/share.js +++ b/core/js/share.js @@ -7,65 +7,100 @@ OC.Share={ statuses:{}, droppedDown:false, /** - * Loads ALL share statuses from server, stores them in OC.Share.statuses then - * calls OC.Share.updateIcons() to update the files "Share" icon to "Shared" - * according to their share status and share type. + * Loads ALL share statuses from server, stores them in + * OC.Share.statuses then calls OC.Share.updateIcons() to update the + * files "Share" icon to "Shared" according to their share status and + * share type. + * + * @param itemType item type + * @param fileList file list instance, defaults to OCA.Files.App.fileList */ - loadIcons:function(itemType) { + loadIcons:function(itemType, fileList) { // Load all share icons - $.get(OC.filePath('core', 'ajax', 'share.php'), { fetch: 'getItemsSharedStatuses', itemType: itemType }, function(result) { - if (result && result.status === 'success') { - OC.Share.statuses = {}; - $.each(result.data, function(item, data) { - OC.Share.statuses[item] = data; - }); - OC.Share.updateIcons(itemType); + $.get( + OC.filePath('core', 'ajax', 'share.php'), + { + fetch: 'getItemsSharedStatuses', + itemType: itemType + }, function(result) { + if (result && result.status === 'success') { + OC.Share.statuses = {}; + $.each(result.data, function(item, data) { + OC.Share.statuses[item] = data; + }); + OC.Share.updateIcons(itemType, fileList); + } } - }); + ); }, /** * Updates the files' "Share" icons according to the known * sharing states stored in OC.Share.statuses. * (not reloaded from server) + * + * @param itemType item type + * @param fileList file list instance + * defaults to OCA.Files.App.fileList */ - updateIcons:function(itemType){ + updateIcons:function(itemType, fileList){ var item; + var $fileList; + var currentDir; + if (!fileList && OCA.Files) { + fileList = OCA.Files.App.fileList; + } + // fileList is usually only defined in the files app + if (fileList) { + $fileList = fileList.$fileList; + currentDir = fileList.getCurrentDirectory(); + } for (item in OC.Share.statuses){ + var image = OC.imagePath('core', 'actions/shared'); var data = OC.Share.statuses[item]; - - var hasLink = data['link']; + var hasLink = data.link; // Links override shared in terms of icon display if (hasLink) { - var image = OC.imagePath('core', 'actions/public'); - } else { - var image = OC.imagePath('core', 'actions/shared'); + image = OC.imagePath('core', 'actions/public'); } - if (itemType != 'file' && itemType != 'folder') { - $('a.share[data-item="'+item+'"]').css('background', 'url('+image+') no-repeat center'); + if (itemType !== 'file' && itemType !== 'folder') { + $fileList.find('a.share[data-item="'+item+'"]').css('background', 'url('+image+') no-repeat center'); } else { - var file = $('tr[data-id="'+item+'"]'); + var file = $fileList.find('tr[data-id="'+item+'"]'); + var shareFolder = OC.imagePath('core', 'filetypes/folder-shared'); + var img; if (file.length > 0) { + var type = file.data('type'); + if (type === 'dir') { + file.children('.filename').css('background-image', 'url('+shareFolder+')'); + } var action = $(file).find('.fileactions .action[data-action="Share"]'); - var img = action.find('img').attr('src', image); + img = action.find('img').attr('src', image); action.addClass('permanent'); action.html(' <span>'+t('core', 'Shared')+'</span>').prepend(img); } else { - var dir = $('#dir').val(); + var dir = currentDir; if (dir.length > 1) { var last = ''; var path = dir; // Search for possible parent folders that are shared while (path != last) { - if (path == data['path'] && !data['link']) { - var actions = $('.fileactions .action[data-action="Share"]'); - $.each(actions, function(index, action) { - var img = $(action).find('img'); - if (img.attr('src') != OC.imagePath('core', 'actions/public')) { + if (path === data.path && !data.link) { + var actions = $fileList.find('.fileactions .action[data-action="Share"]'); + var files = $fileList.find('.filename'); + var i; + for (i = 0; i < actions.length; i++) { + img = $(actions[i]).find('img'); + if (img.attr('src') !== OC.imagePath('core', 'actions/public')) { img.attr('src', image); - $(action).addClass('permanent'); - $(action).html(' <span>'+t('core', 'Shared')+'</span>').prepend(img); + $(actions[i]).addClass('permanent'); + $(actions[i]).html(' <span>'+t('core', 'Shared')+'</span>').prepend(img); } - }); + } + for(i = 0; i < files.length; i++) { + if ($(files[i]).closest('tr').data('type') === 'dir') { + $(files[i]).css('background-image', 'url('+shareFolder+')'); + } + } } last = path; path = OC.Share.dirname(path); @@ -99,15 +134,27 @@ OC.Share={ } else { var file = $('tr').filterAttr('data-id', String(itemSource)); if (file.length > 0) { - var action = $(file).find('.fileactions .action').filterAttr('data-action', 'Share'); - var img = action.find('img').attr('src', image); - if (shares) { - action.addClass('permanent'); - action.html(' <span>'+ escapeHTML(t('core', 'Shared'))+'</span>').prepend(img); - } else { - action.removeClass('permanent'); - action.html(' <span>'+ escapeHTML(t('core', 'Share'))+'</span>').prepend(img); + var type = file.data('type'); + var shareFolder = OC.imagePath('core', 'filetypes/folder'); + if (type === 'dir' && shares) { + shareFolder = OC.imagePath('core', 'filetypes/folder-shared'); + file.children('.filename').css('background-image', 'url('+shareFolder+')'); + } else if (type === 'dir') { + file.children('.filename').css('background-image', 'url('+shareFolder+')'); } + var action = $(file).find('.fileactions .action').filterAttr('data-action', 'Share'); + // in case of multiple lists/rows, there might be more than one visible + action.each(function() { + var action = $(this); + var img = action.find('img').attr('src', image); + if (shares) { + action.addClass('permanent'); + action.html(' <span>'+ escapeHTML(t('core', 'Shared'))+'</span>').prepend(img); + } else { + action.removeClass('permanent'); + action.html(' <span>'+ escapeHTML(t('core', 'Share'))+'</span>').prepend(img); + } + }); } } if (shares) { @@ -162,19 +209,20 @@ OC.Share={ itemSourceName: itemSourceName, expirationDate: expirationDate }, function (result) { - if (result && result.status === 'success') { - if (callback) { - callback(result.data); - } - } else { - if (result.data && result.data.message) { - var msg = result.data.message; + if (result && result.status === 'success') { + if (callback) { + callback(result.data); + } } else { - var msg = t('core', 'Error'); + 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')); } - OC.dialogs.alert(msg, t('core', 'Error while sharing')); } - }); + ); }, unshare:function(itemType, itemSource, shareType, shareWith, callback) { $.post(OC.filePath('core', 'ajax', 'share.php'), { action: 'unshare', itemType: itemType, itemSource: itemSource, shareType: shareType, shareWith: shareWith }, function(result) { @@ -451,7 +499,7 @@ OC.Share={ } var html = '<li style="clear: both;" data-share-type="'+escapeHTML(shareType)+'" data-share-with="'+escapeHTML(shareWith)+'" title="' + escapeHTML(shareWith) + '">'; var showCrudsButton; - html += '<a href="#" class="unshare"><img class="svg" alt="'+t('core', 'Unshare')+'" src="'+OC.imagePath('core', 'actions/delete')+'"/></a>'; + html += '<a href="#" class="unshare"><img class="svg" alt="'+t('core', 'Unshare')+'" title="'+t('core', 'Unshare')+'" src="'+OC.imagePath('core', 'actions/delete')+'"/></a>'; html += '<span class="username">' + escapeHTML(shareWithDisplayName) + '</span>'; var mailNotificationEnabled = $('input:hidden[name=mailNotificationEnabled]').val(); if (mailNotificationEnabled === 'yes') { @@ -464,7 +512,7 @@ OC.Share={ if (possiblePermissions & OC.PERMISSION_CREATE || possiblePermissions & OC.PERMISSION_UPDATE || possiblePermissions & OC.PERMISSION_DELETE) { html += '<label><input type="checkbox" name="edit" class="permissions" '+editChecked+' />'+t('core', 'can edit')+'</label> '; } - showCrudsButton = '<a href="#" class="showCruds"><img class="svg" alt="'+t('core', 'access control')+'" src="'+OC.imagePath('core', 'actions/triangle-s')+'"/></a>'; + showCrudsButton = '<a href="#" class="showCruds"><img class="svg" alt="'+t('core', 'access control')+'" title="'+t('core', 'access control')+'" src="'+OC.imagePath('core', 'actions/triangle-s')+'"/></a>'; html += '<div class="cruds" style="display:none;">'; if (possiblePermissions & OC.PERMISSION_CREATE) { html += '<label><input type="checkbox" name="create" class="permissions" '+createChecked+' data-permissions="'+OC.PERMISSION_CREATE+'" />'+t('core', 'create')+'</label>'; @@ -495,10 +543,10 @@ OC.Share={ showLink:function(token, password, itemSource) { OC.Share.itemShares[OC.Share.SHARE_TYPE_LINK] = true; $('#linkCheckbox').attr('checked', true); - + //check itemType var linkSharetype=$('#dropdown').data('item-type'); - + if (! token) { //fallback to pre token link var filename = $('tr').filterAttr('data-id', String(itemSource)).data('file'); @@ -518,7 +566,7 @@ OC.Share={ }else{ service=linkSharetype; } - + var link = parent.location.protocol+'//'+location.host+OC.linkTo('', 'public.php')+'?service='+service+'&t='+token; } diff --git a/core/js/singleselect.js b/core/js/singleselect.js index e2d94a9f287..c22b5232207 100644 --- a/core/js/singleselect.js +++ b/core/js/singleselect.js @@ -2,7 +2,7 @@ $.fn.singleSelect = function () { return this.each(function (i, select) { var input = $('<input/>'), - inputTooltip = $(select).attr('data-inputtitle'); + inputTooltip = $(select).attr('data-inputtitle'); if (inputTooltip){ input.attr('title', inputTooltip); } @@ -84,5 +84,5 @@ } }); }); - } + }; })(jQuery); diff --git a/core/js/tags.js b/core/js/tags.js index 32a930259a6..dd9ea005302 100644 --- a/core/js/tags.js +++ b/core/js/tags.js @@ -1,7 +1,13 @@ OC.Tags= { edit:function(type, cb) { if(!type && !this.type) { - throw { name: 'MissingParameter', message: t('core', 'The object type is not specified.') }; + throw { + name: 'MissingParameter', + message: t( + 'core', + 'The object type is not specified.' + ) + }; } type = type ? type : this.type; var self = this; @@ -25,11 +31,23 @@ OC.Tags= { }); self.deleteButton = { text: t('core', 'Delete'), - click: function() {self._deleteTags(self, type, self._selectedIds())} + click: function() { + self._deleteTags( + self, + type, + self._selectedIds() + ); + } }; self.addButton = { text: t('core', 'Add'), - click: function() {self._addTag(self, type, self.$taginput.val())} + click: function() { + self._addTag( + self, + type, + self.$taginput.val() + ); + } }; self._fillTagList(type, self.$taglist); @@ -184,7 +202,10 @@ OC.Tags= { type = type ? type : this.type; var defer = $.Deferred(), self = this, - url = OC.generateUrl('/tags/{type}/favorite/{id}/', {type: type, id: id}); + url = OC.generateUrl( + '/tags/{type}/favorite/{id}/', + {type: type, id: id} + ); $.post(url, function(response) { if(response.status === 'success') { defer.resolve(response); @@ -208,7 +229,10 @@ OC.Tags= { type = type ? type : this.type; var defer = $.Deferred(), self = this, - url = OC.generateUrl('/tags/{type}/unfavorite/{id}/', {type: type, id: id}); + url = OC.generateUrl( + '/tags/{type}/unfavorite/{id}/', + {type: type, id: id} + ); $.post(url, function(response) { if(response.status === 'success') { defer.resolve(); diff --git a/core/js/tests/specHelper.js b/core/js/tests/specHelper.js index b9be9188a4e..fc5043c2f49 100644 --- a/core/js/tests/specHelper.js +++ b/core/js/tests/specHelper.js @@ -89,7 +89,8 @@ window.oc_defaults = {}; "Content-Type": "application/json" }, '{"data": [], "plural_form": "nplurals=2; plural=(n != 1);"}' - ]); + ] + ); // make it globally available, so that other tests can define // custom responses diff --git a/core/js/tests/specs/coreSpec.js b/core/js/tests/specs/coreSpec.js index 65f768fbc51..37b5ceeec9e 100644 --- a/core/js/tests/specs/coreSpec.js +++ b/core/js/tests/specs/coreSpec.js @@ -124,6 +124,17 @@ describe('Core base tests', function() { expect(OC.dirname('/subdir/')).toEqual('/subdir'); }); }); + describe('escapeHTML', function() { + it('Returns nothing if no string was given', function() { + expect(escapeHTML('')).toEqual(''); + }); + it('Returns a sanitized string if a string containing HTML is given', function() { + expect(escapeHTML('There needs to be a <script>alert(\"Unit\" + \'test\')</script> for it!')).toEqual('There needs to be a <script>alert("Unit" + 'test')</script> for it!'); + }); + it('Returns the string without modification if no potentially dangerous character is passed.', function() { + expect(escapeHTML('This is a good string without HTML.')).toEqual('This is a good string without HTML.'); + }); + }); describe('Link functions', function() { var TESTAPP = 'testapp'; var TESTAPP_ROOT = OC.webroot + '/appsx/testapp'; @@ -182,24 +193,24 @@ describe('Core base tests', function() { unicode: '汉字' })).toEqual('unicode=%E6%B1%89%E5%AD%97'); expect(OC.buildQueryString({ - b: 'spaace value', - 'space key': 'normalvalue', - 'slash/this': 'amp&ersand' + b: 'spaace value', + 'space key': 'normalvalue', + 'slash/this': 'amp&ersand' })).toEqual('b=spaace%20value&space%20key=normalvalue&slash%2Fthis=amp%26ersand'); }); it('Encodes data types and empty values', function() { expect(OC.buildQueryString({ 'keywithemptystring': '', - 'keywithnull': null, - 'keywithundefined': null, + 'keywithnull': null, + 'keywithundefined': null, something: 'else' })).toEqual('keywithemptystring=&keywithnull&keywithundefined&something=else'); expect(OC.buildQueryString({ - 'booleanfalse': false, + 'booleanfalse': false, 'booleantrue': true })).toEqual('booleanfalse=false&booleantrue=true'); expect(OC.buildQueryString({ - 'number': 123 + 'number': 123 })).toEqual('number=123'); }); }); @@ -348,8 +359,10 @@ describe('Core base tests', function() { var oldMatchMedia; var $toggle; var $navigation; + var clock; beforeEach(function() { + clock = sinon.useFakeTimers(); oldMatchMedia = OC._matchMedia; // a separate method was needed because window.matchMedia // cannot be stubbed due to a bug in PhantomJS: @@ -365,6 +378,7 @@ describe('Core base tests', function() { afterEach(function() { OC._matchMedia = oldMatchMedia; + clock.restore(); }); it('Sets up menu toggle in mobile mode', function() { OC._matchMedia.returns({matches: true}); @@ -402,8 +416,10 @@ describe('Core base tests', function() { $navigation.hide(); // normally done through media query triggered CSS expect($navigation.is(':visible')).toEqual(false); $toggle.click(); + clock.tick(1 * 1000); expect($navigation.is(':visible')).toEqual(true); $toggle.click(); + clock.tick(1 * 1000); expect($navigation.is(':visible')).toEqual(false); }); it('Clicking menu toggle does not toggle navigation in desktop mode', function() { @@ -437,6 +453,7 @@ describe('Core base tests', function() { window.initCore(); expect($navigation.is(':visible')).toEqual(false); $toggle.click(); + clock.tick(1 * 1000); expect($navigation.is(':visible')).toEqual(true); mq.matches = false; $(window).trigger('resize'); @@ -445,6 +462,7 @@ describe('Core base tests', function() { $(window).trigger('resize'); expect($navigation.is(':visible')).toEqual(false); $toggle.click(); + clock.tick(1 * 1000); expect($navigation.is(':visible')).toEqual(true); }); }); @@ -489,6 +507,19 @@ describe('Core base tests', function() { expect(OC.Util.humanFileSize(data[i][0])).toEqual(data[i][1]); } }); + it('renders file sizes with the correct unit for small sizes', function() { + var data = [ + [0, '0 kB'], + [125, '< 1 kB'], + [128000, '125 kB'], + [128000000, '122.1 MB'], + [128000000000, '119.2 GB'], + [128000000000000, '116.4 TB'] + ]; + for (var i = 0; i < data.length; i++) { + expect(OC.Util.humanFileSize(data[i][0], true)).toEqual(data[i][1]); + } + }); }); }); }); diff --git a/core/js/update.js b/core/js/update.js index b1b7f6e37e8..cc0f541bd79 100644 --- a/core/js/update.js +++ b/core/js/update.js @@ -1,26 +1,86 @@ -$(document).ready(function () { - var updateEventSource = new OC.EventSource(OC.webroot+'/core/ajax/update.php'); - updateEventSource.listen('success', function(message) { - $('<span>').append(message).append('<br />').appendTo($('.update')); - }); - updateEventSource.listen('error', function(message) { - $('<span>').addClass('error').append(message).append('<br />').appendTo($('.update')); - message = t('core', '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')); - $('<span>') - .addClass('error bold') - .append('<br />') - .append(t('core', 'The update was unsuccessful. Please report this issue to the <a href="https://github.com/owncloud/core/issues" target="_blank">ownCloud community</a>.')) - .appendTo($('.update')); - }); - updateEventSource.listen('done', function(message) { - $('<span>').addClass('bold').append('<br />').append(t('core', 'The update was successful. Redirecting you to ownCloud now.')).appendTo($('.update')); - setTimeout(function () { - window.location.href = OC.webroot; - }, 3000); +/* + * Copyright (c) 2014 + * + * This file is licensed under the Affero General Public License version 3 + * or later. + * + * See the COPYING-README file. + * + */ + +(function() { + OC.Update = { + _started : false, + + /** + * Start the upgrade process. + * + * @param $el progress list element + */ + start: function($el) { + if (this._started) { + return; + } + + this.$el = $el; + + this._started = true; + this.addMessage(t( + 'core', + 'Updating {productName} to version {version}, this may take a while.', { + productName: OC.theme.name, + version: OC.config.versionstring + }), + 'bold' + ).append('<br />'); // FIXME: these should be ul/li with CSS paddings! + + var updateEventSource = new OC.EventSource(OC.webroot+'/core/ajax/update.php'); + updateEventSource.listen('success', function(message) { + $('<span>').append(message).append('<br />').appendTo($el); + }); + updateEventSource.listen('error', function(message) { + $('<span>').addClass('error').append(message).append('<br />').appendTo($el); + message = t('core', 'Please reload the page.'); + $('<span>').addClass('error').append(message).append('<br />').appendTo($el); + updateEventSource.close(); + }); + updateEventSource.listen('failure', function(message) { + $('<span>').addClass('error').append(message).append('<br />').appendTo($el); + $('<span>') + .addClass('error bold') + .append('<br />') + .append(t('core', 'The update was unsuccessful.' + + 'Please report this issue to the ' + + '<a href="https://github.com/owncloud/core/issues" target="_blank">ownCloud community</a>.')) + .appendTo($el); + }); + updateEventSource.listen('done', function() { + // FIXME: use product name + $('<span>').addClass('bold') + .append('<br />') + .append(t('core', 'The update was successful. Redirecting you to ownCloud now.')) + .appendTo($el); + setTimeout(function () { + OC.redirect(OC.webroot); + }, 3000); + }); + }, + + addMessage: function(message, className) { + var $span = $('<span>'); + $span.addClass(className).append(message).append('<br />').appendTo(this.$el); + return $span; + } + }; + +})(); + +$(document).ready(function() { + $('.updateButton').on('click', function() { + var $progressEl = $('.updateProgress'); + $progressEl.removeClass('hidden'); + $('.updateOverview').addClass('hidden'); + OC.Update.start($progressEl); + return false; }); }); diff --git a/core/js/visitortimezone.js b/core/js/visitortimezone.js index d9b63a10879..9146e00aade 100644 --- a/core/js/visitortimezone.js +++ b/core/js/visitortimezone.js @@ -7,4 +7,5 @@ $(document).ready(function () { if ($loginForm.length) { $loginForm.find('input#submit').prop('disabled', false); } -}); + } +); diff --git a/core/l10n/af_ZA.php b/core/l10n/af_ZA.php index 91dd5db3cd3..978bbb0fc01 100644 --- a/core/l10n/af_ZA.php +++ b/core/l10n/af_ZA.php @@ -82,9 +82,9 @@ $TRANSLATIONS = array( "Error setting expiration date" => "Fout met opstel van verval datum", "Sending ..." => "Stuur ...", "Email sent" => "E-pos gestuur", +"Warning" => "Waarskuwing", "The object type is not specified." => "Hierdie objek tipe is nie gespesifiseer nie.", "Add" => "Voeg by", -"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Die opdatering was nie suksesvol nie. Rapporteer die probleem by <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>.", "The update was successful. Redirecting you to ownCloud now." => "Die opdatering was suksesvol. Jy word nou aan ownCloud terug gelei.", "%s password reset" => "%s wagwoord herstel", "Use the following link to reset your password: {link}" => "Gebruik die volgende skakel om jou wagwoord te herstel: {link}", @@ -115,7 +115,6 @@ $TRANSLATIONS = array( "Password" => "Wagwoord", "Data folder" => "Data vouer", "Configure the database" => "Stel databasis op", -"will be used" => "sal gebruik word", "Database user" => "Databasis-gebruiker", "Database password" => "Databasis-wagwoord", "Database name" => "Databasis naam", @@ -131,7 +130,6 @@ $TRANSLATIONS = array( "remember" => "onthou", "Log in" => "Teken aan", "Alternative Logins" => "Alternatiewe aantekeninge", -"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" => "Halo daar,<br><br>wou jou net laat weet dat %s <strong>%s</strong> met jou gedeel het.<br><a href=\"%s\">Sien alles!</a><br><br>", -"Updating ownCloud to version %s, this may take a while." => "Opdatering a ownCloud versie %s - dit kan 'n tydjie vat." +"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" => "Halo daar,<br><br>wou jou net laat weet dat %s <strong>%s</strong> met jou gedeel het.<br><a href=\"%s\">Sien alles!</a><br><br>" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/core/l10n/ar.php b/core/l10n/ar.php index 1eeb7f1eac6..4bb07293f5d 100644 --- a/core/l10n/ar.php +++ b/core/l10n/ar.php @@ -80,7 +80,6 @@ $TRANSLATIONS = array( "The object type is not specified." => "نوع العنصر غير محدد.", "Delete" => "إلغاء", "Add" => "اضف", -"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "حصل خطأ في عملية التحديث, يرجى ارسال تقرير بهذه المشكلة الى <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>.", "The update was successful. Redirecting you to ownCloud now." => "تم التحديث بنجاح , يتم اعادة توجيهك الان الى Owncloud", "%s password reset" => "تمت إعادة ضبط كلمة مرور %s", "Use the following link to reset your password: {link}" => "استخدم هذه الوصلة لاسترجاع كلمة السر: {link}", @@ -111,7 +110,6 @@ $TRANSLATIONS = array( "Password" => "كلمة المرور", "Data folder" => "مجلد المعلومات", "Configure the database" => "أسس قاعدة البيانات", -"will be used" => "سيتم استخدمه", "Database user" => "مستخدم قاعدة البيانات", "Database password" => "كلمة سر مستخدم قاعدة البيانات", "Database name" => "إسم قاعدة البيانات", @@ -125,7 +123,6 @@ $TRANSLATIONS = array( "Lost your password?" => "هل نسيت كلمة السر؟", "remember" => "تذكر", "Log in" => "أدخل", -"Alternative Logins" => "اسماء دخول بديلة", -"Updating ownCloud to version %s, this may take a while." => "جاري تحديث Owncloud الى اصدار %s , قد يستغرق هذا بعض الوقت." +"Alternative Logins" => "اسماء دخول بديلة" ); $PLURAL_FORMS = "nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;"; diff --git a/core/l10n/ast.php b/core/l10n/ast.php index f0e1a039497..65ec8192744 100644 --- a/core/l10n/ast.php +++ b/core/l10n/ast.php @@ -1,7 +1,14 @@ <?php $TRANSLATIONS = array( +"Couldn't send mail to following users: %s " => "Nun pudo dunviase'l corréu a los usuarios siguientes: %s", +"Turned on maintenance mode" => "Activáu el mou de mantenimientu", +"Turned off maintenance mode" => "Apagáu el mou de mantenimientu", "Updated database" => "Base de datos anovada", +"No image or file provided" => "Nun s'especificó nenguna imaxe o ficheru", +"Unknown filetype" => "Triba de ficheru desconocida", "Invalid image" => "Imaxe inválida", +"No temporary profile picture available, try again" => "Nengún perfil d'imaxe temporal disponible, intentalo de nueves", +"No crop data provided" => "Nun s'apurrió'l retayu de datos", "Sunday" => "Domingu", "Monday" => "Llunes", "Tuesday" => "Martes", @@ -36,11 +43,19 @@ $TRANSLATIONS = array( "Yes" => "Sí", "No" => "Non", "Choose" => "Esbillar", +"Error loading file picker template: {error}" => "Fallu cargando'l ficheru de plantía d'escoyeta: {error}", "Ok" => "Aceutar", -"_{count} file conflict_::_{count} file conflicts_" => array("",""), +"Error loading message template: {error}" => "Fallu cargando'l mensaxe de la plantía: {error}", +"_{count} file conflict_::_{count} file conflicts_" => array("{count} conflictu de ficheru","{count} conflictos de ficheru "), +"One file conflict" => "Conflictu nun ficheru", +"New Files" => "Ficheros nuevos", +"Already existing files" => "Ficheros qu'esisten yá", "Which files do you want to keep?" => "¿Qué ficheros quies caltener?", +"If you select both versions, the copied file will have a number added to its name." => "Si seleiciones dames versiones, el ficheru copiáu tendrá un númberu amestáu al so nome", "Cancel" => "Encaboxar", "Continue" => "Continuar", +"(all selected)" => "(esbillao too)", +"({count} selected)" => "(esbillaos {count})", "Very weak password" => "Contraseña mui feble", "Weak password" => "Contraseña feble", "So-so password" => "Contraseña pasable", @@ -56,6 +71,8 @@ $TRANSLATIONS = array( "Shared with you by {owner}" => "Compartíu contigo por {owner}", "Share link" => "Compartir enllaz", "Password protect" => "Protexer con contraseña", +"Choose a password for the public link" => "Escueyi una contraseña pal enllaz públicu", +"Allow Public Upload" => "Permitir xuba pública", "Email link to person" => "Enlláz de corréu electrónicu a la persona", "Send" => "Unviar", "Set expiration date" => "Afitar la data de caducidá", @@ -83,16 +100,22 @@ $TRANSLATIONS = array( "Delete" => "Desaniciar", "Add" => "Amestar", "Edit tags" => "Editar etiquetes", -"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "L'anovamientu fízose con ésitu. Por favor, informa d'esti problema a la <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">comuña ownCloud</a>.", +"Please reload the page." => "Por favor, recarga la páxina", "The update was successful. Redirecting you to ownCloud now." => "L'anovamientu fízose con ésitu. Redirixiendo agora al to ownCloud.", +"%s password reset" => "%s restablecer contraseña", "Use the following link to reset your password: {link}" => "Usa'l siguiente enllaz pa restablecer la to contraseña: {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 ." => "Dunviósete al to corréu l'enllaz pa reaniciar la to contraseña.<br>Si nun lu recibes dientro de dellos minutos, comprueba les tos carpetes de corréu puxarra.<br>Sinón, pues entrugar al to alministrador llocal.", +"Request failed!<br>Did you make sure your email/username was right?" => "¡Petición fallida!<br>¿Asegurástite qué'l to nome d'usuariu/corréu tean bien?", "You will receive a link to reset your password via Email." => "Vas recibir un enllaz vía Corréu-e pa restablecer la to contraseña", "Username" => "Nome d'usuariu", +"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?" => "Los tos ficheros tan cifraos. Si nun habilitesti la clave de recuperación, nun habrá forma de recuperar los tos datos dempués de que la contraseña se reanicie. Si nun tas seguru que facer, por favor contauta col to alministrador enantes de siguir. ¿De xuru quies continuar?", +"Yes, I really want to reset my password now" => "Sí, quiero reaniciar daveres la mio contraseña agora", "Reset" => "Reaniciar", "Your password was reset" => "Restablecióse la contraseña", "To login page" => "Aniciar sesión na páxina", "New password" => "Contraseña nueva", "Reset password" => "Restablecer contraseña", +"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X nun ta sofitáu y %s nun furrulará afayadizamente nesta plataforma. ¡Úsalu baxo'l to riesgu!", "For the best results, please consider using a GNU/Linux server instead." => "Pa los meyores resultaos, por favor considera l'usu d'un sirvidor GNU/Linux nel so llugar.", "Personal" => "Personal", "Users" => "Usuarios", @@ -101,16 +124,19 @@ $TRANSLATIONS = array( "Help" => "Ayuda", "Access forbidden" => "Accesu denegáu", "Cloud not found" => "Ñube non atopada", +"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Hola, ¿qué hai?\n\nnamái déxanos dicite que %s compartió %s contigo.\nVelu: %s\n\n", "Cheers!" => "¡Salú!", "Security Warning" => "Avisu de seguridá", +"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "La to versión de PHP ye vulnerable al ataque NULL Byte (CVE-2006-7243)", +"Please update your PHP installation to use %s securely." => "Por favor, anova la to instalación de PHP pa usar %s de mou seguru.", "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Nun ta disponible'l xenerador de númberos al debalu, por favor activa la estensión PHP OpenSSL.", "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Ensin un xenerador de númberos al debalu, un atacante podría aldovinar los tokens pa restablecer la contraseña y tomar el control de la cuenta.", "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "El to direutoriu de datos y ficheros seique ye accesible dende internet por mor qu'el ficheru .htaccess nun furrula.", +"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Pa informase de cómo configurar el so sirvidor, por favor güeya la <a href=\"%s\" target=\"_blank\">documentación</a>.", "Create an <strong>admin account</strong>" => "Crea una <strong>cuenta d'alministrador</strong>", "Password" => "Contraseña", "Data folder" => "Carpeta de datos", "Configure the database" => "Configura la base de datos", -"will be used" => "usaráse", "Database user" => "Usuariu de la base de datos", "Database password" => "Contraseña de la base de datos", "Database name" => "Nome de la base de datos", @@ -118,9 +144,14 @@ $TRANSLATIONS = array( "Database host" => "Agospiador de la base de datos", "Finish setup" => "Finar la configuración ", "Finishing …" => "Finando ...", +"%s is available. Get more information on how to update." => "Ta disponible %s. Consigui más información en como anovar·", "Log out" => "Zarrar sesión", "Automatic logon rejected!" => "¡Aniciu de sesión automáticu refugáu!", +"If you did not change your password recently, your account may be compromised!" => "¡Si nun camudó la so contraseña últimamente, la so cuenta pue tar comprometida!", +"Please change your password to secure your account again." => "Por favor, camude la so contraseña p'asegurar la so cuenta de nueves", +"Please contact your administrator." => "Por favor, contauta col to alministrador", "Lost your password?" => "¿Escaeciesti la to contraseña?", +"remember" => "recordar", "Log in" => "Aniciar sesión", "Alternative Logins" => "Anicios de sesión alternativos", "Thank you for your patience." => "Gracies pola to paciencia." diff --git a/core/l10n/bg_BG.php b/core/l10n/bg_BG.php index 8653f2435cd..320c6d21708 100644 --- a/core/l10n/bg_BG.php +++ b/core/l10n/bg_BG.php @@ -87,7 +87,6 @@ $TRANSLATIONS = array( "Password" => "Парола", "Data folder" => "Директория за данни", "Configure the database" => "Конфигуриране на базата", -"will be used" => "ще се ползва", "Database user" => "Потребител за базата", "Database password" => "Парола за базата", "Database name" => "Име на базата", diff --git a/core/l10n/bn_BD.php b/core/l10n/bn_BD.php index c7a1c6545bb..f0b86c23ae7 100644 --- a/core/l10n/bn_BD.php +++ b/core/l10n/bn_BD.php @@ -89,7 +89,6 @@ $TRANSLATIONS = array( "Password" => "কূটশব্দ", "Data folder" => "ডাটা ফোল্ডার ", "Configure the database" => "ডাটাবেচ কনফিগার করুন", -"will be used" => "ব্যবহৃত হবে", "Database user" => "ডাটাবেজ ব্যবহারকারী", "Database password" => "ডাটাবেজ কূটশব্দ", "Database name" => "ডাটাবেজের নাম", @@ -99,7 +98,6 @@ $TRANSLATIONS = array( "Log out" => "প্রস্থান", "Lost your password?" => "কূটশব্দ হারিয়েছেন?", "remember" => "মনে রাখ", -"Log in" => "প্রবেশ", -"Updating ownCloud to version %s, this may take a while." => "%s ভার্সনে ownCloud পরিবর্ধন করা হচ্ছে, এজন্য কিছু সময় প্রয়োজন।" +"Log in" => "প্রবেশ" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/core/l10n/ca.php b/core/l10n/ca.php index 455b57f4f99..31217c9fe01 100644 --- a/core/l10n/ca.php +++ b/core/l10n/ca.php @@ -106,7 +106,6 @@ $TRANSLATIONS = array( "Error loading dialog template: {error}" => "Error en carregar la plantilla de diàleg: {error}", "No tags selected for deletion." => "No heu seleccionat les etiquetes a eliminar.", "Please reload the page." => "Carregueu la pàgina de nou.", -"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "L'actualització ha estat incorrecte. Comuniqueu aquest error a <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">la comunitat ownCloud</a>.", "The update was successful. Redirecting you to ownCloud now." => "L'actualització ha estat correcte. Ara us redirigim a ownCloud.", "%s password reset" => "restableix la contrasenya %s", "A problem has occurred whilst sending the email, please contact your administrator." => "Hi ha hagut un problema enviant el correu, parleu amb el vostre administrador.", @@ -153,7 +152,6 @@ $TRANSLATIONS = array( "Storage & database" => "Emmagatzematge i base de dades", "Data folder" => "Carpeta de dades", "Configure the database" => "Configura la base de dades", -"will be used" => "s'usarà", "Database user" => "Usuari de la base de dades", "Database password" => "Contrasenya de la base de dades", "Database name" => "Nom de la base de dades", @@ -178,7 +176,6 @@ $TRANSLATIONS = array( "This means only administrators can use the instance." => "Això significa que només els administradors poden usar la instància.", "Contact your system administrator if this message persists or appeared unexpectedly." => "Contacteu amb l'administrador del sistema si aquest missatge persisteix o apareix inesperadament.", "Thank you for your patience." => "Gràcies per la paciència.", -"Updating ownCloud to version %s, this may take a while." => "S'està actualitzant ownCloud a la versió %s, pot trigar una estona.", "This ownCloud instance is currently being updated, which may take a while." => "Aquesta instància d'ownCloud s'està actualitzant i podria trigar una estona.", "Please reload this page after a short time to continue using ownCloud." => "Carregueu de nou aquesta pàgina d'aquí a poc temps per continuar usant ownCloud." ); diff --git a/core/l10n/ca@valencia.php b/core/l10n/ca@valencia.php new file mode 100644 index 00000000000..ffcdde48d47 --- /dev/null +++ b/core/l10n/ca@valencia.php @@ -0,0 +1,9 @@ +<?php +$TRANSLATIONS = array( +"_%n minute ago_::_%n minutes ago_" => array("",""), +"_%n hour ago_::_%n hours ago_" => array("",""), +"_%n day ago_::_%n days ago_" => array("",""), +"_%n month ago_::_%n months ago_" => array("",""), +"_{count} file conflict_::_{count} file conflicts_" => array("","") +); +$PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/core/l10n/cs_CZ.php b/core/l10n/cs_CZ.php index d4ca4acd5e8..c8b81262d2b 100644 --- a/core/l10n/cs_CZ.php +++ b/core/l10n/cs_CZ.php @@ -73,7 +73,10 @@ $TRANSLATIONS = array( "Shared with you by {owner}" => "S Vámi sdílí {owner}", "Share with user or group …" => "Sdílet s uživatelem nebo skupinou", "Share link" => "Sdílet odkaz", +"The public link will expire no later than {days} days after it is created" => "Veřejný odkaz nevyprší dříve než za {days} dní po svém vytvoření", +"By default the public link will expire after {days} days" => "Ve výchozím nastavení vyprší veřejný odkaz za {days} dní", "Password protect" => "Chránit heslem", +"Choose a password for the public link" => "Zadej heslo pro tento veřejný odkaz", "Allow Public Upload" => "Povolit veřejné nahrávání", "Email link to person" => "Odeslat osobě odkaz e-mailem", "Send" => "Odeslat", @@ -106,7 +109,6 @@ $TRANSLATIONS = array( "Error loading dialog template: {error}" => "Chyba při načítání šablony dialogu: {error}", "No tags selected for deletion." => "Žádné štítky nebyly vybrány ke smazání.", "Please reload the page." => "Načtěte stránku znovu, prosím.", -"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Aktualizace neproběhla úspěšně. Nahlaste prosím problém do <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">evidence chyb ownCloud</a>", "The update was successful. Redirecting you to ownCloud now." => "Aktualizace byla úspěšná. Přesměrovávám na ownCloud.", "%s password reset" => "reset hesla %s", "A problem has occurred whilst sending the email, please contact your administrator." => "Při odesílání e-mailu nastala chyba, kontaktujte prosím svého administrátora.", @@ -153,7 +155,6 @@ $TRANSLATIONS = array( "Storage & database" => "Úložiště & databáze", "Data folder" => "Složka s daty", "Configure the database" => "Nastavit databázi", -"will be used" => "bude použito", "Database user" => "Uživatel databáze", "Database password" => "Heslo databáze", "Database name" => "Název databáze", @@ -178,7 +179,6 @@ $TRANSLATIONS = array( "This means only administrators can use the instance." => "To znamená, že pouze správci systému mohou aplikaci používat.", "Contact your system administrator if this message persists or appeared unexpectedly." => "Kontaktujte, prosím, správce systému, pokud se tato zpráva objevuje opakovaně nebo nečekaně.", "Thank you for your patience." => "Děkuji za trpělivost.", -"Updating ownCloud to version %s, this may take a while." => "Aktualizuji ownCloud na verzi %s, bude to chvíli trvat.", "This ownCloud instance is currently being updated, which may take a while." => "Tato instalace ownCloud je právě aktualizována, může to chvíli trvat.", "Please reload this page after a short time to continue using ownCloud." => "Pro pokračování načtěte, prosím, stránku po chvíli znovu." ); diff --git a/core/l10n/cy_GB.php b/core/l10n/cy_GB.php index 737f9aa7c15..ccf6f5fae98 100644 --- a/core/l10n/cy_GB.php +++ b/core/l10n/cy_GB.php @@ -71,7 +71,6 @@ $TRANSLATIONS = array( "The object type is not specified." => "Nid yw'r math o wrthrych wedi cael ei nodi.", "Delete" => "Dileu", "Add" => "Ychwanegu", -"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Methodd y diweddariad. Adroddwch y mater hwn i <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">gymuned ownCloud</a>.", "The update was successful. Redirecting you to ownCloud now." => "Roedd y diweddariad yn llwyddiannus. Cewch eich ailgyfeirio i ownCloud nawr.", "Use the following link to reset your password: {link}" => "Defnyddiwch y ddolen hon i ailosod eich cyfrinair: {link}", "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 ." => "Anfonwyd y ddolen i ailosod eich cyfrinair i'ch cyfeiriad ebost.<br>Os nad yw'n cyrraedd o fewn amser rhesymol gwiriwch eich plygell spam/sothach.<br>Os nad yw yno, cysylltwch â'ch gweinyddwr lleol.", @@ -98,7 +97,6 @@ $TRANSLATIONS = array( "Password" => "Cyfrinair", "Data folder" => "Plygell data", "Configure the database" => "Cyflunio'r gronfa ddata", -"will be used" => "ddefnyddir", "Database user" => "Defnyddiwr cronfa ddata", "Database password" => "Cyfrinair cronfa ddata", "Database name" => "Enw cronfa ddata", @@ -113,7 +111,6 @@ $TRANSLATIONS = array( "Lost your password?" => "Wedi colli'ch cyfrinair?", "remember" => "cofio", "Log in" => "Mewngofnodi", -"Alternative Logins" => "Mewngofnodiadau Amgen", -"Updating ownCloud to version %s, this may take a while." => "Yn diweddaru owncloud i fersiwn %s, gall hyn gymryd amser." +"Alternative Logins" => "Mewngofnodiadau Amgen" ); $PLURAL_FORMS = "nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;"; diff --git a/core/l10n/da.php b/core/l10n/da.php index 99b5c239738..73e1791fab5 100644 --- a/core/l10n/da.php +++ b/core/l10n/da.php @@ -106,7 +106,6 @@ $TRANSLATIONS = array( "Error loading dialog template: {error}" => "Fejl ved indlæsning dialog skabelon: {error}", "No tags selected for deletion." => "Ingen tags markeret til sletning.", "Please reload the page." => "Genindlæs venligst siden", -"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Opdateringen blev ikke udført korrekt. Rapporter venligst problemet til <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownClouds community</a>.", "The update was successful. Redirecting you to ownCloud now." => "Opdateringen blev udført korrekt. Du bliver nu viderestillet til ownCloud.", "%s password reset" => "%s adgangskode nulstillet", "A problem has occurred whilst sending the email, please contact your administrator." => "Der opstod et problem under afsending af emailen. Kontakt venligst systemadministratoren.", @@ -153,7 +152,6 @@ $TRANSLATIONS = array( "Storage & database" => "Lager & database", "Data folder" => "Datamappe", "Configure the database" => "Konfigurer databasen", -"will be used" => "vil blive brugt", "Database user" => "Databasebruger", "Database password" => "Databasekodeord", "Database name" => "Navn på database", @@ -178,7 +176,6 @@ $TRANSLATIONS = array( "This means only administrators can use the instance." => "Det betyder at det kun er administrator, som kan benytte ownCloud.", "Contact your system administrator if this message persists or appeared unexpectedly." => "Kontakt systemadministratoren, hvis denne meddelelse fortsætter eller optrådte uventet.", "Thank you for your patience." => "Tak for din tålmodighed.", -"Updating ownCloud to version %s, this may take a while." => "Opdatere Owncloud til version %s, dette kan tage et stykke tid.", "This ownCloud instance is currently being updated, which may take a while." => "Opdatere Owncloud, dette kan tage et stykke tid.", "Please reload this page after a short time to continue using ownCloud." => "Genindlæs denne side efter kort tid til at fortsætte med at bruge ownCloud." ); diff --git a/core/l10n/de.php b/core/l10n/de.php index c3f912bdc90..b3a30a228ef 100644 --- a/core/l10n/de.php +++ b/core/l10n/de.php @@ -5,6 +5,7 @@ $TRANSLATIONS = array( "Turned on maintenance mode" => "Wartungsmodus eingeschaltet", "Turned off maintenance mode" => "Wartungsmodus ausgeschaltet", "Updated database" => "Datenbank aktualisiert", +"Disabled incompatible apps: %s" => "Deaktivierte inkompatible Apps: %s", "No image or file provided" => "Kein Bild oder Datei zur Verfügung gestellt", "Unknown filetype" => "Unbekannter Dateityp", "Invalid image" => "Ungültiges Bild", @@ -108,8 +109,9 @@ $TRANSLATIONS = array( "Edit tags" => "Schlagwörter bearbeiten", "Error loading dialog template: {error}" => "Fehler beim Laden der Dialogvorlage: {error}", "No tags selected for deletion." => "Es wurden keine Schlagwörter zum Löschen ausgewählt.", +"Updating {productName} to version {version}, this may take a while." => "Aktualisiere {productName} auf Version {version}. Dies könnte eine Weile dauern.", "Please reload the page." => "Bitte lade diese Seite neu.", -"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Das Update ist fehlgeschlagen. Bitte melde dieses Problem an die <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud Community</a>.", +"The update was unsuccessful." => "Die Aktualisierung war erfolgreich.", "The update was successful. Redirecting you to ownCloud now." => "Das Update war erfolgreich. Du wirst nun zu ownCloud weitergeleitet.", "%s password reset" => "%s-Passwort zurücksetzen", "A problem has occurred whilst sending the email, please contact your administrator." => "Beim Senden der E-Mail ist ein Fehler aufgetreten, bitte kontaktiere deinen Administrator.", @@ -156,7 +158,6 @@ $TRANSLATIONS = array( "Storage & database" => "Speicher & Datenbank", "Data folder" => "Datenverzeichnis", "Configure the database" => "Datenbank einrichten", -"will be used" => "wird verwendet", "Database user" => "Datenbank-Benutzer", "Database password" => "Datenbank-Passwort", "Database name" => "Datenbank-Name", @@ -181,7 +182,11 @@ $TRANSLATIONS = array( "This means only administrators can use the instance." => "Dies bedeutet, dass diese Instanz nur von Administratoren genutzt werden kann.", "Contact your system administrator if this message persists or appeared unexpectedly." => "Kontaktiere Deinen Systemadministrator, wenn diese Meldung dauerhaft oder unerwartet erscheint.", "Thank you for your patience." => "Vielen Dank für Deine Geduld.", -"Updating ownCloud to version %s, this may take a while." => "Aktualisiere ownCloud auf Version %s. Dies könnte eine Weile dauern.", +"%s will be updated to version %s." => "%s wird auf Version %s aktualisiert.", +"The following apps will be disabled:" => "Die folgenden Apps werden deaktiviert:", +"The theme %s has been disabled." => "Das Theme %s wurde deaktiviert.", +"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." => "Stelle vor dem Fortsetzen sicher, dass die Datenbank, der Konfigurationsordner und der Datenordner gesichert wurde.", +"Start update" => "Aktualisierung starten", "This ownCloud instance is currently being updated, which may take a while." => "Diese OwnCloud-Instanz wird gerade aktualisiert, was eine Weile dauert.", "Please reload this page after a short time to continue using ownCloud." => "Bitte lade diese Seite nach kurzer Zeit neu, um mit der Nutzung von OwnCloud fortzufahren." ); diff --git a/core/l10n/de_CH.php b/core/l10n/de_CH.php index a0c303b6cdb..3d377a6f821 100644 --- a/core/l10n/de_CH.php +++ b/core/l10n/de_CH.php @@ -76,7 +76,6 @@ $TRANSLATIONS = array( "The object type is not specified." => "Der Objekttyp ist nicht angegeben.", "Delete" => "Löschen", "Add" => "Hinzufügen", -"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Das Update ist fehlgeschlagen. Bitte melden Sie dieses Problem an die <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud Community</a>.", "The update was successful. Redirecting you to ownCloud now." => "Das Update war erfolgreich. Sie werden nun zu ownCloud weitergeleitet.", "%s password reset" => "%s-Passwort zurücksetzen", "Use the following link to reset your password: {link}" => "Nutzen Sie den nachfolgenden Link, um Ihr Passwort zurückzusetzen: {link}", @@ -109,7 +108,6 @@ $TRANSLATIONS = array( "Password" => "Passwort", "Data folder" => "Datenverzeichnis", "Configure the database" => "Datenbank einrichten", -"will be used" => "wird verwendet", "Database user" => "Datenbank-Benutzer", "Database password" => "Datenbank-Passwort", "Database name" => "Datenbank-Name", @@ -124,7 +122,6 @@ $TRANSLATIONS = array( "Lost your password?" => "Passwort vergessen?", "remember" => "merken", "Log in" => "Einloggen", -"Alternative Logins" => "Alternative Logins", -"Updating ownCloud to version %s, this may take a while." => "Aktualisiere ownCloud auf Version %s. Dies könnte eine Weile dauern." +"Alternative Logins" => "Alternative Logins" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/core/l10n/de_DE.php b/core/l10n/de_DE.php index b638d1a4c8c..dfceff4113f 100644 --- a/core/l10n/de_DE.php +++ b/core/l10n/de_DE.php @@ -5,6 +5,7 @@ $TRANSLATIONS = array( "Turned on maintenance mode" => "Wartungsmodus eingeschaltet ", "Turned off maintenance mode" => "Wartungsmodus ausgeschaltet", "Updated database" => "Datenbank aktualisiert", +"Disabled incompatible apps: %s" => "Deaktivierte inkompatible Apps: %s", "No image or file provided" => "Weder Bild noch ein Datei wurden zur Verfügung gestellt", "Unknown filetype" => "Unbekannter Dateityp", "Invalid image" => "Ungültiges Bild", @@ -108,8 +109,9 @@ $TRANSLATIONS = array( "Edit tags" => "Schlagwörter bearbeiten", "Error loading dialog template: {error}" => "Fehler beim Laden der Dialogvorlage: {error}", "No tags selected for deletion." => "Es wurden keine Schlagwörter zum Löschen ausgewählt.", +"Updating {productName} to version {version}, this may take a while." => "Aktualisiere {productName} auf Version {version}. Dies könnte eine Weile dauern.", "Please reload the page." => "Bitte laden Sie diese Seite neu.", -"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Das Update ist fehlgeschlagen. Bitte melden Sie dieses Problem an die <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud Community</a>.", +"The update was unsuccessful." => "Die Aktualisierung war erfolgreich.", "The update was successful. Redirecting you to ownCloud now." => "Das Update war erfolgreich. Sie werden nun zu ownCloud weitergeleitet.", "%s password reset" => "%s-Passwort zurücksetzen", "A problem has occurred whilst sending the email, please contact your administrator." => "Beim Senden der E-Mail ist ein Problem aufgetreten, bitte kontaktieren Sie Ihren Administrator.", @@ -156,7 +158,6 @@ $TRANSLATIONS = array( "Storage & database" => "Speicher & Datenbank", "Data folder" => "Datenverzeichnis", "Configure the database" => "Datenbank einrichten", -"will be used" => "wird verwendet", "Database user" => "Datenbank-Benutzer", "Database password" => "Datenbank-Passwort", "Database name" => "Datenbank-Name", @@ -181,7 +182,11 @@ $TRANSLATIONS = array( "This means only administrators can use the instance." => "Dies bedeutet, dass diese Instanz nur von Administratoren genutzt werden kann.", "Contact your system administrator if this message persists or appeared unexpectedly." => "Kontaktieren Sie Ihren Systemadministrator, wenn diese Meldung dauerhaft oder unerwartet erscheint.", "Thank you for your patience." => "Vielen Dank für Ihre Geduld.", -"Updating ownCloud to version %s, this may take a while." => "Aktualisiere ownCloud auf Version %s. Dies könnte eine Weile dauern.", +"%s will be updated to version %s." => "%s wird auf Version %s aktualisiert.", +"The following apps will be disabled:" => "Die folgenden Apps werden deaktiviert:", +"The theme %s has been disabled." => "Das Theme %s wurde deaktiviert.", +"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." => "Stellen Sie vor dem Fortsetzen sicher, dass die Datenbank, der Konfigurationsordner und der Datenordner gesichert wurde.", +"Start update" => "Aktualisierung starten", "This ownCloud instance is currently being updated, which may take a while." => "Diese ownCloud-Instanz wird gerade aktualisiert, was eine Weile dauert.", "Please reload this page after a short time to continue using ownCloud." => "Bitte laden Sie diese Seite nach kurzer Zeit neu, um mit der Nutzung von ownCloud fortzufahren." ); diff --git a/core/l10n/el.php b/core/l10n/el.php index fc754d9309f..500b4df3c10 100644 --- a/core/l10n/el.php +++ b/core/l10n/el.php @@ -5,6 +5,7 @@ $TRANSLATIONS = array( "Turned on maintenance mode" => "Η κατάσταση συντήρησης ενεργοποιήθηκε", "Turned off maintenance mode" => "Η κατάσταση συντήρησης απενεργοποιήθηκε", "Updated database" => "Ενημερωμένη βάση δεδομένων", +"Disabled incompatible apps: %s" => "Απενεργοποιημένες μη συμβατές εφαρμογές: %s", "No image or file provided" => "Δεν δόθηκε εικόνα ή αρχείο", "Unknown filetype" => "Άγνωστος τύπος αρχείου", "Invalid image" => "Μη έγκυρη εικόνα", @@ -76,6 +77,7 @@ $TRANSLATIONS = array( "The public link will expire no later than {days} days after it is created" => "Ο δημόσιος σύνδεσμος θα απενεργοποιηθεί το πολύ {days} ημέρες μετά την δημιουργία του", "By default the public link will expire after {days} days" => "Ο δημόσιος σύνδεσμος θα απενεργοποιηθεί ερήμην μετά από {days} ημέρες", "Password protect" => "Προστασία συνθηματικού", +"Choose a password for the public link" => "Επιλέξτε κωδικό για τον δημόσιο σύνδεσμο", "Allow Public Upload" => "Επιτρέπεται η Δημόσια Αποστολή", "Email link to person" => "Αποστολή συνδέσμου με email ", "Send" => "Αποστολή", @@ -107,8 +109,9 @@ $TRANSLATIONS = array( "Edit tags" => "Επεξεργασία ετικετών", "Error loading dialog template: {error}" => "Σφάλμα φόρτωσης προτύπου διαλόγων: {σφάλμα}", "No tags selected for deletion." => "Καμμία ετικέτα δεν επιλέχθηκε για διαγραφή.", +"Updating {productName} to version {version}, this may take a while." => "Ενημέρωση του {productName} στην έκδοση {version}, αυτό μπορεί να διαρκέσει λίγη ώρα.", "Please reload the page." => "Παρακαλώ επαναφορτώστε τη σελίδα.", -"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Η ενημέρωση ήταν ανεπιτυχής. Παρακαλώ στείλτε αναφορά στην <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">κοινότητα ownCloud</a>.", +"The update was unsuccessful." => "Η ενημέρωση δεν ήταν επιτυχής.", "The update was successful. Redirecting you to ownCloud now." => "Η ενημέρωση ήταν επιτυχής. Μετάβαση στο ownCloud.", "%s password reset" => "%s επαναφορά κωδικού πρόσβασης", "A problem has occurred whilst sending the email, please contact your administrator." => "Παρουσιάστηκε σφάλμα κατά την αποστολή email, παρακαλώ επικοινωνήστε με τον διαχειριστή.", @@ -155,7 +158,6 @@ $TRANSLATIONS = array( "Storage & database" => "Αποθήκευση & βάση δεδομένων", "Data folder" => "Φάκελος δεδομένων", "Configure the database" => "Ρύθμιση της βάσης δεδομένων", -"will be used" => "θα χρησιμοποιηθούν", "Database user" => "Χρήστης της βάσης δεδομένων", "Database password" => "Συνθηματικό βάσης δεδομένων", "Database name" => "Όνομα βάσης δεδομένων", @@ -180,7 +182,11 @@ $TRANSLATIONS = array( "This means only administrators can use the instance." => "Αυτό σημαίνει ότι μόνο διαχειριστές μπορούν να χρησιμοποιήσουν την εγκατάσταση.", "Contact your system administrator if this message persists or appeared unexpectedly." => "Επικοινωνήστε με το διαχειριστή του συστήματος αν αυτό το μήνυμα συνεχίζει να εμφανίζεται ή εμφανίστηκε απρόσμενα.", "Thank you for your patience." => "Σας ευχαριστούμε για την υπομονή σας.", -"Updating ownCloud to version %s, this may take a while." => "Ενημερώνοντας το ownCloud στην έκδοση %s,μπορεί να πάρει λίγο χρόνο.", +"%s will be updated to version %s." => "Το %s θα ενημερωθεί στην έκδοση %s.", +"The following apps will be disabled:" => "Οι παρακάτω εφαρμογές θα απενεργοποιηθούν:", +"The theme %s has been disabled." => "Το θέμα %s έχει απενεργοποιηθεί.", +"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." => "Παρακαλώ βεβαιωθείτε ότι έχουν ληψθεί αντίγραφα ασφαλείας της βάσης δεδομένων, του φακέλου ρυθμίσεων και του φακέλου δεδομένων πριν προχωρήσετε.", +"Start update" => "Έναρξη ενημέρωσης", "This ownCloud instance is currently being updated, which may take a while." => "Αυτή η εγκατάσταση ownCloud ενημερώνεται, το οποίο μπορεί να πάρει κάποιο χρόνο.", "Please reload this page after a short time to continue using ownCloud." => "Παρακαλώ ανανεώστε αυτή τη σελίδα μετά από ένα σύντομο χρονικό διάστημα ώστε να συνεχίσετε να χρησιμοποιείτε το ownCloud." ); diff --git a/core/l10n/en_GB.php b/core/l10n/en_GB.php index a2bda0a286e..ad55d831d65 100644 --- a/core/l10n/en_GB.php +++ b/core/l10n/en_GB.php @@ -5,6 +5,7 @@ $TRANSLATIONS = array( "Turned on maintenance mode" => "Turned on maintenance mode", "Turned off maintenance mode" => "Turned off maintenance mode", "Updated database" => "Updated database", +"Disabled incompatible apps: %s" => "Disabled incompatible apps: %s", "No image or file provided" => "No image or file provided", "Unknown filetype" => "Unknown filetype", "Invalid image" => "Invalid image", @@ -108,8 +109,9 @@ $TRANSLATIONS = array( "Edit tags" => "Edit tags", "Error loading dialog template: {error}" => "Error loading dialog template: {error}", "No tags selected for deletion." => "No tags selected for deletion.", +"Updating {productName} to version {version}, this may take a while." => "Updating {productName} to version {version}, this may take a while.", "Please reload the page." => "Please reload the page.", -"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>.", +"The update was unsuccessful." => "The update was unsuccessful.", "The update was successful. Redirecting you to ownCloud now." => "The update was successful. Redirecting you to ownCloud now.", "%s password reset" => "%s password reset", "A problem has occurred whilst sending the email, please contact your administrator." => "A problem has occurred whilst sending the email, please contact your administrator.", @@ -156,7 +158,6 @@ $TRANSLATIONS = array( "Storage & database" => "Storage & database", "Data folder" => "Data folder", "Configure the database" => "Configure the database", -"will be used" => "will be used", "Database user" => "Database user", "Database password" => "Database password", "Database name" => "Database name", @@ -181,7 +182,11 @@ $TRANSLATIONS = array( "This means only administrators can use the instance." => "This means only administrators can use the instance.", "Contact your system administrator if this message persists or appeared unexpectedly." => "Contact your system administrator if this message persists or appeared unexpectedly.", "Thank you for your patience." => "Thank you for your patience.", -"Updating ownCloud to version %s, this may take a while." => "Updating ownCloud to version %s, this may take a while.", +"%s will be updated to version %s." => "%s will be updated to version %s.", +"The following apps will be disabled:" => "The following apps will be disabled:", +"The theme %s has been disabled." => "The theme %s has been disabled.", +"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." => "Please make sure that the database, the config folder and the data folder have been backed up before proceeding.", +"Start update" => "Start update", "This ownCloud instance is currently being updated, which may take a while." => "This ownCloud instance is currently being updated, which may take a while.", "Please reload this page after a short time to continue using ownCloud." => "Please reload this page after a short time to continue using ownCloud." ); diff --git a/core/l10n/eo.php b/core/l10n/eo.php index 7f57facc520..9efd1dfd8e7 100644 --- a/core/l10n/eo.php +++ b/core/l10n/eo.php @@ -46,6 +46,11 @@ $TRANSLATIONS = array( "Cancel" => "Nuligi", "(all selected)" => "(ĉiuj elektitas)", "({count} selected)" => "({count} elektitas)", +"Very weak password" => "Tre malforta pasvorto", +"Weak password" => "Malforta pasvorto", +"So-so password" => "Mezaĉa pasvorto", +"Good password" => "Bona pasvorto", +"Strong password" => "Forta pasvorto", "Shared" => "Dividita", "Share" => "Kunhavigi", "Error" => "Eraro", @@ -87,7 +92,6 @@ $TRANSLATIONS = array( "Edit tags" => "Redakti etikedojn", "No tags selected for deletion." => "Neniu etikedo elektitas por forigo.", "Please reload the page." => "Bonvolu reŝargi la paĝon.", -"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "La ĝisdatigo estis malsukcese. Bonvolu raporti tiun problemon al la <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownClouda komunumo</a>.", "The update was successful. Redirecting you to ownCloud now." => "La ĝisdatigo estis sukcesa. Alidirektante nun al ownCloud.", "Use the following link to reset your password: {link}" => "Uzu la jenan ligilon por restarigi vian pasvorton: {link}", "Request failed!<br>Did you make sure your email/username was right?" => "La peto malsukcesis!<br />Ĉu vi certiĝis, ke via retpoŝto/uzantonomo ĝustas?", @@ -118,7 +122,6 @@ $TRANSLATIONS = array( "Password" => "Pasvorto", "Data folder" => "Datuma dosierujo", "Configure the database" => "Agordi la datumbazon", -"will be used" => "estos uzata", "Database user" => "Datumbaza uzanto", "Database password" => "Datumbaza pasvorto", "Database name" => "Datumbaza nomo", @@ -136,7 +139,6 @@ $TRANSLATIONS = array( "remember" => "memori", "Log in" => "Ensaluti", "Alternative Logins" => "Alternativaj ensalutoj", -"Thank you for your patience." => "Dankon pro via pacienco.", -"Updating ownCloud to version %s, this may take a while." => "ownCloud ĝisdatiĝas al eldono %s, tio ĉi povas daŭri je iom da tempo." +"Thank you for your patience." => "Dankon pro via pacienco." ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/core/l10n/es.php b/core/l10n/es.php index e64ad6aa29a..1cb5d0f2b2c 100644 --- a/core/l10n/es.php +++ b/core/l10n/es.php @@ -5,6 +5,7 @@ $TRANSLATIONS = array( "Turned on maintenance mode" => "Modo mantenimiento activado", "Turned off maintenance mode" => "Modo mantenimiento desactivado", "Updated database" => "Base de datos actualizada", +"Disabled incompatible apps: %s" => "Aplicaciones incompatibles desactivadas: %s", "No image or file provided" => "No se especificó ningún archivo o imagen", "Unknown filetype" => "Tipo de archivo desconocido", "Invalid image" => "Imagen inválida", @@ -108,8 +109,9 @@ $TRANSLATIONS = array( "Edit tags" => "Editar etiquetas", "Error loading dialog template: {error}" => "Error cargando plantilla de diálogo: {error}", "No tags selected for deletion." => "No hay etiquetas seleccionadas para borrar.", +"Updating {productName} to version {version}, this may take a while." => "Actualizando {productName} a la versión {version}. Esto puede tardar un poco.", "Please reload the page." => "Recargue/Actualice la página", -"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "La actualización ha fracasado. Por favor, informe de este problema a la <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">Comunidad de ownCloud</a>.", +"The update was unsuccessful." => "La actualización fue exitosa.", "The update was successful. Redirecting you to ownCloud now." => "La actualización se ha realizado con éxito. Redireccionando a ownCloud ahora.", "%s password reset" => "%s restablecer contraseña", "A problem has occurred whilst sending the email, please contact your administrator." => "Ocurrió un problema al enviar el mensaje de correo electrónico. Contacte a su administrador.", @@ -156,7 +158,6 @@ $TRANSLATIONS = array( "Storage & database" => "Almacenamiento y base de datos", "Data folder" => "Directorio de datos", "Configure the database" => "Configurar la base de datos", -"will be used" => "se utilizarán", "Database user" => "Usuario de la base de datos", "Database password" => "Contraseña de la base de datos", "Database name" => "Nombre de la base de datos", @@ -181,7 +182,11 @@ $TRANSLATIONS = array( "This means only administrators can use the instance." => "Esto quiere decir que solo un administrador puede usarla.", "Contact your system administrator if this message persists or appeared unexpectedly." => "Contacte con su administrador de sistemas si este mensaje persiste o aparece de forma inesperada.", "Thank you for your patience." => "Gracias por su paciencia.", -"Updating ownCloud to version %s, this may take a while." => "Actualizando ownCloud a la versión %s, esto puede demorar un tiempo.", +"%s will be updated to version %s." => "%s será actualizado a la versión %s.", +"The following apps will be disabled:" => "Las siguientes aplicaciones serán desactivadas:", +"The theme %s has been disabled." => "El tema %s ha sido desactivado.", +"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." => "Antes de proceder, asegúrese de que se haya hecho un respaldo de la base de datos, la carpeta de configuración y la carpeta de datos.", +"Start update" => "Iniciar actualización", "This ownCloud instance is currently being updated, which may take a while." => "Esta versión de owncloud se está actualizando, esto puede demorar un tiempo.", "Please reload this page after a short time to continue using ownCloud." => "Por favor, recargue la página tras un corto periodo de tiempo para continuar usando ownCloud" ); diff --git a/core/l10n/es_AR.php b/core/l10n/es_AR.php index b287d3769e4..d8f78ee4a28 100644 --- a/core/l10n/es_AR.php +++ b/core/l10n/es_AR.php @@ -104,7 +104,6 @@ $TRANSLATIONS = array( "Error loading dialog template: {error}" => "Error cargando la plantilla de dialogo: {error}", "No tags selected for deletion." => "No se han seleccionado etiquetas para eliminar.", "Please reload the page." => "Por favor, recargue la página.", -"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "La actualización no pudo ser completada. Por favor, reportá el inconveniente a la comunidad <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud</a>.", "The update was successful. Redirecting you to ownCloud now." => "La actualización fue exitosa. Estás siendo redirigido a ownCloud.", "%s password reset" => "%s restablecer contraseña", "Use the following link to reset your password: {link}" => "Usá este enlace para restablecer tu contraseña: {link}", @@ -147,7 +146,6 @@ $TRANSLATIONS = array( "Password" => "Contraseña", "Data folder" => "Directorio de almacenamiento", "Configure the database" => "Configurar la base de datos", -"will be used" => "se usarán", "Database user" => "Usuario de la base de datos", "Database password" => "Contraseña de la base de datos", "Database name" => "Nombre de la base de datos", @@ -171,7 +169,6 @@ $TRANSLATIONS = array( "This means only administrators can use the instance." => "Esto significa que solo administradores pueden usar esta instancia.", "Contact your system administrator if this message persists or appeared unexpectedly." => "Contacte su administrador de sistema si este mensaje persiste o aparece inesperadamente.", "Thank you for your patience." => "Gracias por su paciencia.", -"Updating ownCloud to version %s, this may take a while." => "Actualizando ownCloud a la versión %s, puede demorar un rato.", "This ownCloud instance is currently being updated, which may take a while." => "Esta instancia de ownClod está siendo actualizada, puede tardar un momento.", "Please reload this page after a short time to continue using ownCloud." => "Por favor, recargue esta página después de un tiempo para continuar usando ownCloud." ); diff --git a/core/l10n/es_MX.php b/core/l10n/es_MX.php index e19724fa45e..152b1812b3b 100644 --- a/core/l10n/es_MX.php +++ b/core/l10n/es_MX.php @@ -98,7 +98,6 @@ $TRANSLATIONS = array( "Error loading dialog template: {error}" => "Error cargando plantilla de diálogo: {error}", "No tags selected for deletion." => "No hay etiquetas seleccionadas para borrar.", "Please reload the page." => "Vuelva a cargar la página.", -"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "La actualización ha fracasado. Por favor, informe de este problema a la <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">Comunidad de ownCloud</a>.", "The update was successful. Redirecting you to ownCloud now." => "La actualización se ha realizado con éxito. Redireccionando a ownCloud ahora.", "%s password reset" => "%s restablecer contraseña", "Use the following link to reset your password: {link}" => "Utilice el siguiente enlace para restablecer su contraseña: {link}", @@ -141,7 +140,6 @@ $TRANSLATIONS = array( "Password" => "Contraseña", "Data folder" => "Directorio de datos", "Configure the database" => "Configurar la base de datos", -"will be used" => "se utilizarán", "Database user" => "Usuario de la base de datos", "Database password" => "Contraseña de la base de datos", "Database name" => "Nombre de la base de datos", @@ -165,7 +163,6 @@ $TRANSLATIONS = array( "This means only administrators can use the instance." => "Esto quiere decir que solo un administrador puede usarla.", "Contact your system administrator if this message persists or appeared unexpectedly." => "Contacte con su administrador de sistemas si este mensaje persiste o aparece de forma inesperada.", "Thank you for your patience." => "Gracias por su paciencia.", -"Updating ownCloud to version %s, this may take a while." => "Actualizando ownCloud a la versión %s, esto puede demorar un tiempo.", "This ownCloud instance is currently being updated, which may take a while." => "Esta versión de ownCloud se está actualizando, esto puede demorar un tiempo.", "Please reload this page after a short time to continue using ownCloud." => "Por favor, recargue esta instancia de onwcloud tras un corto periodo de tiempo y continue usándolo." ); diff --git a/core/l10n/et_EE.php b/core/l10n/et_EE.php index 86f60c8c5c4..f39d78b4d58 100644 --- a/core/l10n/et_EE.php +++ b/core/l10n/et_EE.php @@ -73,7 +73,10 @@ $TRANSLATIONS = array( "Shared with you by {owner}" => "Sinuga jagas {owner}", "Share with user or group …" => "Jaga kasutaja või grupiga ...", "Share link" => "Jaga linki", +"The public link will expire no later than {days} days after it is created" => "Avalik link aegub mitte hiljem kui pärast {days} päeva selle loomist", +"By default the public link will expire after {days} days" => "Avalik link aegub vaikimisi pärast {days} päeva", "Password protect" => "Parooliga kaitstud", +"Choose a password for the public link" => "Vali avaliku lingi jaoks parool", "Allow Public Upload" => "Luba avalik üleslaadimine", "Email link to person" => "Saada link isikule e-postiga", "Send" => "Saada", @@ -106,7 +109,6 @@ $TRANSLATIONS = array( "Error loading dialog template: {error}" => "Viga dialoogi malli laadimisel: {error}", "No tags selected for deletion." => "Kustutamiseks pole ühtegi silti valitud.", "Please reload the page." => "Palun laadi see uuesti.", -"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Uuendus ebaõnnestus. Palun teavita probleemidest <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud kogukonda</a>.", "The update was successful. Redirecting you to ownCloud now." => "Uuendus oli edukas. Kohe suunatakse Sind ownCloudi.", "%s password reset" => "%s parooli lähtestus", "A problem has occurred whilst sending the email, please contact your administrator." => "Tekkis tõrge e-posti saatmisel, palun kontakteeru administraatoriga.", @@ -153,7 +155,6 @@ $TRANSLATIONS = array( "Storage & database" => "Andmehoidla ja andmebaas", "Data folder" => "Andmete kaust", "Configure the database" => "Seadista andmebaasi", -"will be used" => "kasutatakse", "Database user" => "Andmebaasi kasutaja", "Database password" => "Andmebaasi parool", "Database name" => "Andmebasi nimi", @@ -178,7 +179,6 @@ $TRANSLATIONS = array( "This means only administrators can use the instance." => "See tähendab, et seda saavad kasutada ainult administraatorid.", "Contact your system administrator if this message persists or appeared unexpectedly." => "Kontakteeru oma süsteemihalduriga, kui see teade püsib või on tekkinud ootamatult.", "Thank you for your patience." => "Täname kannatlikkuse eest.", -"Updating ownCloud to version %s, this may take a while." => "ownCloudi uuendamine versioonile %s. See võib veidi aega võtta.", "This ownCloud instance is currently being updated, which may take a while." => "Seda ownCloud instantsi hetkel uuendatakse, võib võtta veidi aega.", "Please reload this page after a short time to continue using ownCloud." => "Palun laadi see leht uuesti veidi aja pärast jätkamaks ownCloud kasutamist." ); diff --git a/core/l10n/eu.php b/core/l10n/eu.php index 0e9d4c5fe76..88d94241c7a 100644 --- a/core/l10n/eu.php +++ b/core/l10n/eu.php @@ -106,7 +106,6 @@ $TRANSLATIONS = array( "Error loading dialog template: {error}" => "Errorea elkarrizketa txantiloia kargatzean: {errorea}", "No tags selected for deletion." => "Ez dira ezabatzeko etiketak hautatu.", "Please reload the page." => "Mesedez birkargatu orria.", -"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Eguneraketa ez da ongi egin. Mesedez egin arazoaren txosten bat <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud komunitatearentzako</a>.", "The update was successful. Redirecting you to ownCloud now." => "Eguneraketa ongi egin da. Orain zure ownClouderea berbideratua izango zara.", "%s password reset" => "%s pasahitza berrezarri", "A problem has occurred whilst sending the email, please contact your administrator." => "Arazo bat gertatu da posta elektronikoa bidaltzerakoan, mesedez jarri harremanetan zure administrariarekin.", @@ -152,7 +151,6 @@ $TRANSLATIONS = array( "Storage & database" => "Biltegia & datubasea", "Data folder" => "Datuen karpeta", "Configure the database" => "Konfiguratu datu basea", -"will be used" => "erabiliko da", "Database user" => "Datubasearen erabiltzailea", "Database password" => "Datubasearen pasahitza", "Database name" => "Datubasearen izena", @@ -177,7 +175,6 @@ $TRANSLATIONS = array( "This means only administrators can use the instance." => "Honek administradoreak bakarrik erabili dezakeela esan nahi du.", "Contact your system administrator if this message persists or appeared unexpectedly." => "Jarri harremanetan zure sistema administratzailearekin mezu hau irauten badu edo bat-batean agertu bada.", "Thank you for your patience." => "Milesker zure patzientziagatik.", -"Updating ownCloud to version %s, this may take a while." => "ownCloud %s bertsiora eguneratzen, denbora har dezake.", "This ownCloud instance is currently being updated, which may take a while." => "ownCloud instantzia hau eguneratzen ari da, honek denbora har dezake.", "Please reload this page after a short time to continue using ownCloud." => "Mesedez birkargatu orri hau denbora gutxi barru ownCloud erabiltzen jarraitzeko." ); diff --git a/core/l10n/fa.php b/core/l10n/fa.php index 28a53095ae8..661a54f19ef 100644 --- a/core/l10n/fa.php +++ b/core/l10n/fa.php @@ -81,7 +81,6 @@ $TRANSLATIONS = array( "The object type is not specified." => "نوع شی تعیین نشده است.", "Delete" => "حذف", "Add" => "افزودن", -"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "به روز رسانی ناموفق بود. لطفا این خطا را به <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">جامعه ی OwnCloud</a> گزارش نمایید.", "The update was successful. Redirecting you to ownCloud now." => "به روزرسانی موفقیت آمیز بود. در حال انتقال شما به OwnCloud.", "Use the following link to reset your password: {link}" => "از لینک زیر جهت دوباره سازی پسورد استفاده کنید :\n{link}", "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>در صورت نبودن از مدیر خود بپرسید.", @@ -113,7 +112,6 @@ $TRANSLATIONS = array( "Storage & database" => "انبارش و پایگاه داده", "Data folder" => "پوشه اطلاعاتی", "Configure the database" => "پایگاه داده برنامه ریزی شدند", -"will be used" => "استفاده خواهد شد", "Database user" => "شناسه پایگاه داده", "Database password" => "پسورد پایگاه داده", "Database name" => "نام پایگاه داده", @@ -128,7 +126,6 @@ $TRANSLATIONS = array( "Lost your password?" => "آیا گذرواژه تان را به یاد نمی آورید؟", "remember" => "بیاد آوری", "Log in" => "ورود", -"Alternative Logins" => "ورود متناوب", -"Updating ownCloud to version %s, this may take a while." => "به روز رسانی OwnCloud به نسخه ی %s، این عملیات ممکن است زمان بر باشد." +"Alternative Logins" => "ورود متناوب" ); $PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/core/l10n/fi_FI.php b/core/l10n/fi_FI.php index 25da5ef81d9..716f6fdd4a8 100644 --- a/core/l10n/fi_FI.php +++ b/core/l10n/fi_FI.php @@ -5,6 +5,7 @@ $TRANSLATIONS = array( "Turned on maintenance mode" => "Siirrytty ylläpitotilaan", "Turned off maintenance mode" => "Ylläpitotila laitettu pois päältä", "Updated database" => "Tietokanta ajan tasalla", +"Disabled incompatible apps: %s" => "Yhteensopimattomat sovellukset poistettiin käytöstä: %s", "No image or file provided" => "Kuvaa tai tiedostoa ei määritelty", "Unknown filetype" => "Tuntematon tiedostotyyppi", "Invalid image" => "Virhellinen kuva", @@ -108,8 +109,9 @@ $TRANSLATIONS = array( "Edit tags" => "Muokkaa tunnisteita", "Error loading dialog template: {error}" => "Virhe ladatessa keskustelupohja: {error}", "No tags selected for deletion." => "Tunnisteita ei valittu poistettavaksi.", +"Updating {productName} to version {version}, this may take a while." => "Päivitetään {productName} versioon {version}, tämä saattaa kestää hetken.", "Please reload the page." => "Päivitä sivu.", -"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Päivitys epäonnistui. Ilmoita ongelmasta <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud-yhteisölle</a>.", +"The update was unsuccessful." => "Päivitys epäonnistui.", "The update was successful. Redirecting you to ownCloud now." => "Päivitys onnistui. Selain ohjautuu nyt ownCloudiisi.", "%s password reset" => "%s salasanan nollaus", "A problem has occurred whilst sending the email, please contact your administrator." => "Sähköpostia lähettäessä tapahtui virhe, ota yhteys järjestelmän ylläpitäjään.", @@ -156,7 +158,6 @@ $TRANSLATIONS = array( "Storage & database" => "Tallennus ja tietokanta", "Data folder" => "Datakansio", "Configure the database" => "Muokkaa tietokantaa", -"will be used" => "käytetään", "Database user" => "Tietokannan käyttäjä", "Database password" => "Tietokannan salasana", "Database name" => "Tietokannan nimi", @@ -181,7 +182,11 @@ $TRANSLATIONS = array( "This means only administrators can use the instance." => "Se tarkoittaa, että vain ylläpitäjät voivat nyt käyttää tätä ownCloudia.", "Contact your system administrator if this message persists or appeared unexpectedly." => "Ota yhteys järjestelmän ylläpitäjään, jos tämä viesti ilmenee uudelleen tai odottamatta.", "Thank you for your patience." => "Kiitos kärsivällisyydestäsi.", -"Updating ownCloud to version %s, this may take a while." => "Päivitetään ownCloud versioon %s, tämä saattaa kestää hetken.", +"%s will be updated to version %s." => "%s päivitetään versioon %s.", +"The following apps will be disabled:" => "Seuraavat sovellukset poistetaan käytöstä:", +"The theme %s has been disabled." => "Teema %s on poistettu käytöstä.", +"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." => "Varmista ennen jatkamista, että tietokanta, asetuskansio ja datakansio on varmuuskopioitu.", +"Start update" => "Käynnistä päivitys", "This ownCloud instance is currently being updated, which may take a while." => "Tätä ownCloud-asennusta päivitetään parhaillaan, siinä saattaa kestää hetki.", "Please reload this page after a short time to continue using ownCloud." => "Päivitä tämä sivu hetken kuluttua jatkaaksesi ownCloudin käyttämistä." ); diff --git a/core/l10n/fr.php b/core/l10n/fr.php index 1c4b3ea4362..6b628e03dda 100644 --- a/core/l10n/fr.php +++ b/core/l10n/fr.php @@ -5,6 +5,7 @@ $TRANSLATIONS = array( "Turned on maintenance mode" => "Basculé en mode maintenance", "Turned off maintenance mode" => "Basculé en mode production (non maintenance)", "Updated database" => "Base de données mise à jour", +"Disabled incompatible apps: %s" => "Applications incompatibles désactivées: %s", "No image or file provided" => "Aucune image ou fichier fourni", "Unknown filetype" => "Type de fichier inconnu", "Invalid image" => "Image invalide", @@ -73,7 +74,10 @@ $TRANSLATIONS = array( "Shared with you by {owner}" => "Partagé avec vous par {owner}", "Share with user or group …" => "Partager avec un utilisateur ou un groupe...", "Share link" => "Partager le lien", +"The public link will expire no later than {days} days after it is created" => "Ce lien public expirera au plus tard, dans {days} jours après sa création.", +"By default the public link will expire after {days} days" => "Par défaut, le lien public expire après {days} jour(s).", "Password protect" => "Protéger par un mot de passe", +"Choose a password for the public link" => "Choisissez un mot de passe pour le lien public.", "Allow Public Upload" => "Autoriser l'upload par les utilisateurs non enregistrés", "Email link to person" => "Envoyez le lien par email", "Send" => "Envoyer", @@ -105,8 +109,9 @@ $TRANSLATIONS = array( "Edit tags" => "Modifier les balises", "Error loading dialog template: {error}" => "Erreur de chargement du modèle de dialogue : {error}", "No tags selected for deletion." => "Aucune balise sélectionnée pour la suppression.", +"Updating {productName} to version {version}, this may take a while." => "Mise à jour en cours de {productName} vers la version {version}, cela peut prendre du temps.", "Please reload the page." => "Veuillez recharger la page.", -"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "La mise à jour a échoué. Veuillez signaler ce problème à la <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">communauté ownCloud</a>.", +"The update was unsuccessful." => "La mise à jour a échoué.", "The update was successful. Redirecting you to ownCloud now." => "La mise à jour a réussi. Vous êtes redirigé maintenant vers ownCloud.", "%s password reset" => "Réinitialisation de votre mot de passe %s", "A problem has occurred whilst sending the email, please contact your administrator." => "Une erreur est survenue lors de l'envoi de l'e-mail. Veuillez contacter votre administrateur.", @@ -153,7 +158,6 @@ $TRANSLATIONS = array( "Storage & database" => "Support de stockage & base de données", "Data folder" => "Répertoire des données", "Configure the database" => "Configurer la base de données", -"will be used" => "sera utilisé", "Database user" => "Utilisateur pour la base de données", "Database password" => "Mot de passe de la base de données", "Database name" => "Nom de la base de données", @@ -178,7 +182,11 @@ $TRANSLATIONS = array( "This means only administrators can use the instance." => "Cela signifie que uniquement les administrateurs peuvent utiliser l'instance.", "Contact your system administrator if this message persists or appeared unexpectedly." => "Contactez votre administrateur système si ce message persiste ou apparaît de façon innatendue.", "Thank you for your patience." => "Merci de votre patience.", -"Updating ownCloud to version %s, this may take a while." => "Mise à jour en cours d'ownCloud vers la version %s, cela peut prendre du temps.", +"%s will be updated to version %s." => "%s sera mis à jour vers la version %s.", +"The following apps will be disabled:" => "Les applications suivantes seront désactivées :", +"The theme %s has been disabled." => "Le thème %s a été désactivé.", +"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." => "Veuillez vous assurer qu'une copie de sauvegarde de la base de données, du dossier de configuration et du dossier de données a été réalisée avant le commencement de la procédure.", +"Start update" => "Démarrer la mise à jour.", "This ownCloud instance is currently being updated, which may take a while." => "Cette instance d'ownCloud est en cours de mise à jour, cela peut prendre du temps.", "Please reload this page after a short time to continue using ownCloud." => "Merci de recharger cette page après un moment pour continuer à utiliser ownCloud." ); diff --git a/core/l10n/gl.php b/core/l10n/gl.php index 88ba544b16e..a6dd114c021 100644 --- a/core/l10n/gl.php +++ b/core/l10n/gl.php @@ -5,6 +5,7 @@ $TRANSLATIONS = array( "Turned on maintenance mode" => "Modo de mantemento activado", "Turned off maintenance mode" => "Modo de mantemento desactivado", "Updated database" => "Base de datos actualizada", +"Disabled incompatible apps: %s" => "Aplicativos incompatíbeis desactivados: %s", "No image or file provided" => "Non forneceu ningunha imaxe ou ficheiro", "Unknown filetype" => "Tipo de ficheiro descoñecido", "Invalid image" => "Imaxe incorrecta", @@ -108,8 +109,9 @@ $TRANSLATIONS = array( "Edit tags" => "Editar etiquetas", "Error loading dialog template: {error}" => "Produciuse un erro ao cargar o modelo do dialogo: {error}", "No tags selected for deletion." => "Non se seleccionaron etiquetas para borrado.", +"Updating {productName} to version {version}, this may take a while." => "Actualizando {productName} a versión {version}, isto pode levar un anaco.", "Please reload the page." => "Volva a cargar a páxina.", -"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "A actualización non foi satisfactoria, informe deste problema á <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">comunidade de ownCloud</a>.", +"The update was unsuccessful." => "A actualización foi satisfactoria.", "The update was successful. Redirecting you to ownCloud now." => "A actualización realizouse correctamente. Redirixíndoo agora á ownCloud.", "%s password reset" => "Restabelecer o contrasinal %s", "A problem has occurred whilst sending the email, please contact your administrator." => "Produciuse un problema ao mesmo tempo que enviaba o correo, póñase en contacto co administrador.", @@ -156,7 +158,6 @@ $TRANSLATIONS = array( "Storage & database" => "Almacenamento e base de datos", "Data folder" => "Cartafol de datos", "Configure the database" => "Configurar a base de datos", -"will be used" => "vai ser utilizado", "Database user" => "Usuario da base de datos", "Database password" => "Contrasinal da base de datos", "Database name" => "Nome da base de datos", @@ -181,7 +182,11 @@ $TRANSLATIONS = array( "This means only administrators can use the instance." => "Isto significa que só os administradores poden utilizar a instancia.", "Contact your system administrator if this message persists or appeared unexpectedly." => "Póñase en contacto co administrador do sistema se persiste esta mensaxe ou se aparece de forma inesperada.", "Thank you for your patience." => "Grazas pola súa paciencia.", -"Updating ownCloud to version %s, this may take a while." => "Actualizando ownCloud a versión %s, esto pode levar un anaco.", +"%s will be updated to version %s." => "%s actualizarase á versión %s.", +"The following apps will be disabled:" => "Os seguintes aplicativos van desactivarse:", +"The theme %s has been disabled." => "O tema %s foi desactivado.", +"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." => "Asegúrese de ter feito unha copia de seguranza da base de datos, do cartafol de configuración e do cartafol de datos, antes de proceder.", +"Start update" => "Iniciar a actualización", "This ownCloud instance is currently being updated, which may take a while." => "Esta instancia do ownCloud está actualizandose neste momento, pode levarlle un chisco.", "Please reload this page after a short time to continue using ownCloud." => "Volva cargar a páxina de aquí a pouco para para continuar co ownCloud." ); diff --git a/core/l10n/he.php b/core/l10n/he.php index 5c7fbba0c4f..d4d2824aed6 100644 --- a/core/l10n/he.php +++ b/core/l10n/he.php @@ -72,7 +72,6 @@ $TRANSLATIONS = array( "The object type is not specified." => "סוג הפריט לא צוין.", "Delete" => "מחיקה", "Add" => "הוספה", -"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "תהליך העדכון לא הושלם בהצלחה. נא דווח את הבעיה ב<a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">קהילת ownCloud</a>.", "The update was successful. Redirecting you to ownCloud now." => "תהליך העדכון הסתיים בהצלחה. עכשיו מנתב אותך אל ownCloud.", "Use the following link to reset your password: {link}" => "יש להשתמש בקישור הבא כדי לאפס את הססמה שלך: {link}", "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>אם ההודעה לא שם, כדאי לשאול את מנהל הרשת שלך .", @@ -101,7 +100,6 @@ $TRANSLATIONS = array( "Password" => "סיסמא", "Data folder" => "תיקיית נתונים", "Configure the database" => "הגדרת מסד הנתונים", -"will be used" => "ינוצלו", "Database user" => "שם משתמש במסד הנתונים", "Database password" => "ססמת מסד הנתונים", "Database name" => "שם מסד הנתונים", @@ -116,7 +114,6 @@ $TRANSLATIONS = array( "Lost your password?" => "שכחת את ססמתך?", "remember" => "שמירת הססמה", "Log in" => "כניסה", -"Alternative Logins" => "כניסות אלטרנטיביות", -"Updating ownCloud to version %s, this may take a while." => "מעדכן את ownCloud אל גרסא %s, זה עלול לקחת זמן מה." +"Alternative Logins" => "כניסות אלטרנטיביות" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/core/l10n/hi.php b/core/l10n/hi.php index 1b156291681..ada4970a029 100644 --- a/core/l10n/hi.php +++ b/core/l10n/hi.php @@ -48,7 +48,6 @@ $TRANSLATIONS = array( "Password" => "पासवर्ड", "Data folder" => "डाटा फोल्डर", "Configure the database" => "डेटाबेस कॉन्फ़िगर करें ", -"will be used" => "उपयोग होगा", "Database user" => "डेटाबेस उपयोगकर्ता", "Database password" => "डेटाबेस पासवर्ड", "Database name" => "डेटाबेस का नाम", diff --git a/core/l10n/hr.php b/core/l10n/hr.php index 248a56e4fa1..f85e4a5175f 100644 --- a/core/l10n/hr.php +++ b/core/l10n/hr.php @@ -78,7 +78,6 @@ $TRANSLATIONS = array( "Password" => "Lozinka", "Data folder" => "Mapa baze podataka", "Configure the database" => "Konfiguriraj bazu podataka", -"will be used" => "će se koristiti", "Database user" => "Korisnik baze podataka", "Database password" => "Lozinka baze podataka", "Database name" => "Ime baze podataka", diff --git a/core/l10n/hu_HU.php b/core/l10n/hu_HU.php index b1e8bf98e55..d0c6fae6581 100644 --- a/core/l10n/hu_HU.php +++ b/core/l10n/hu_HU.php @@ -4,11 +4,11 @@ $TRANSLATIONS = array( "Couldn't send mail to following users: %s " => "Nem sikerült e-mailt küldeni a következő felhasználóknak: %s", "Turned on maintenance mode" => "A karbantartási mód bekapcsolva", "Turned off maintenance mode" => "A karbantartási mód kikapcsolva", -"Updated database" => "Frissítet adatbázis", +"Updated database" => "Az adatbázis frissítése megtörtént", "No image or file provided" => "Nincs kép vagy file megadva", -"Unknown filetype" => "Ismeretlen file tipús", +"Unknown filetype" => "Ismeretlen fájltípus", "Invalid image" => "Hibás kép", -"No temporary profile picture available, try again" => "Az átmeneti profil kép nem elérhető, próbáld újra", +"No temporary profile picture available, try again" => "Az átmeneti profilkép nem elérhető, próbálja újra", "No crop data provided" => "Vágáshoz nincs adat megadva", "Sunday" => "vasárnap", "Monday" => "hétfő", @@ -50,14 +50,14 @@ $TRANSLATIONS = array( "_{count} file conflict_::_{count} file conflicts_" => array("{count} fájl ütközik","{count} fájl ütközik"), "One file conflict" => "Egy file ütközik", "New Files" => "Új fájlok", -"Already existing files" => "A fájlok már láteznek", -"Which files do you want to keep?" => "Melyik file-okat akarod megtartani?", -"If you select both versions, the copied file will have a number added to its name." => "Ha kiválasztod mindazokaz a verziókat, a másolt fileok neve sorszámozva lesz.", +"Already existing files" => "A fájlok már léteznek", +"Which files do you want to keep?" => "Melyik fájlokat akarja megtartani?", +"If you select both versions, the copied file will have a number added to its name." => "Ha mindkét verziót kiválasztja, a másolt fájlok neve sorszámozva lesz.", "Cancel" => "Mégsem", "Continue" => "Folytatás", "(all selected)" => "(az összes ki lett választva)", "({count} selected)" => "({count} lett kiválasztva)", -"Error loading file exists template" => "Hiba a létező sablon betöltésekor", +"Error loading file exists template" => "Hiba a létezőfájl-sablon betöltésekor", "Very weak password" => "Nagyon gyenge jelszó", "Weak password" => "Gyenge jelszó", "So-so password" => "Nem túl jó jelszó", @@ -73,7 +73,10 @@ $TRANSLATIONS = array( "Shared with you by {owner}" => "Megosztotta Önnel: {owner}", "Share with user or group …" => "Megosztani egy felhasználóval vagy csoporttal ...", "Share link" => "Megosztás hivatkozással", +"The public link will expire no later than {days} days after it is created" => "A nyilvános link érvényessége legkorábban {days} nappal a létrehozása után jár csak le", +"By default the public link will expire after {days} days" => "A nyilvános link érvényessége alapértelmezetten {days} nap múlva jár le", "Password protect" => "Jelszóval is védem", +"Choose a password for the public link" => "Válasszon egy jelszót a nyilvános linkhez", "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", @@ -105,8 +108,7 @@ $TRANSLATIONS = array( "Edit tags" => "Címkék szerkesztése", "Error loading dialog template: {error}" => "Hiba a párbeszédpanel-sablon betöltésekor: {error}", "No tags selected for deletion." => "Nincs törlésre kijelölt címke.", -"Please reload the page." => "Kérlek tölts be újra az oldalt", -"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "A frissítés nem sikerült. Kérem értesítse erről a problémáról az <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud közösséget</a>.", +"Please reload the page." => "Kérjük frissítse az oldalt!", "The update was successful. Redirecting you to ownCloud now." => "A frissítés sikeres volt. Visszairányítjuk az ownCloud szolgáltatáshoz.", "%s password reset" => "%s jelszó visszaállítás", "A problem has occurred whilst sending the email, please contact your administrator." => "Hiba történt e-mail küldése közben. Érdemes az adminisztrátort értesíteni.", @@ -118,7 +120,7 @@ $TRANSLATIONS = array( "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", "Reset" => "Visszaállítás", -"Your password was reset" => "Jelszó megváltoztatva", +"Your password was reset" => "A jelszava megváltozott", "To login page" => "A bejelentkező ablakhoz", "New password" => "Az új jelszó", "Reset password" => "Jelszó-visszaállítás", @@ -138,7 +140,7 @@ $TRANSLATIONS = array( "Error unfavoriting" => "Hiba a kedvencekből törléskor", "Access forbidden" => "A hozzáférés nem engedélyezett", "Cloud not found" => "A felhő nem található", -"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Szia!\\n\n\\n\nÉrtesítünk, hogy %s megosztotta veled a következőt: %s.\\n\nItt tudod megnézni: %s\\n\n\\n", +"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Üdv!\\n\n\\n\nÉrtesítjük, hogy %s megosztotta Önnel a következőt: %s.\\n\nItt lehet megnézni: %s\\n\n\\n", "The share will expire on %s." => "A megosztás lejár ekkor %s", "Cheers!" => "Üdv.", "Security Warning" => "Biztonsági figyelmeztetés", @@ -150,10 +152,9 @@ $TRANSLATIONS = array( "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", "Password" => "Jelszó", -"Storage & database" => "Tárolás & adatbázis", +"Storage & database" => "Tárolás és adatbázis", "Data folder" => "Adatkönyvtár", "Configure the database" => "Adatbázis konfigurálása", -"will be used" => "adatbázist fogunk használni", "Database user" => "Adatbázis felhasználónév", "Database password" => "Adatbázis jelszó", "Database name" => "Az adatbázis neve", @@ -161,7 +162,7 @@ $TRANSLATIONS = array( "Database host" => "Adatbázis szerver", "Finish setup" => "A beállítások befejezése", "Finishing …" => "Befejezés ...", -"This application requires JavaScript to be enabled for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and re-load this interface." => "Az alkalmazás megfelelő működéséhez szükség van JavaScript-re. <a href=\"http://enable-javascript.com/\" target=\"_blank\">Engedélyezd a JavaScript-et</a> és töltsd újra az interfészt.", +"This application requires JavaScript to be enabled for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and re-load this interface." => "Az alkalmazás megfelelő működéséhez szükség van JavaScriptre. <a href=\"http://enable-javascript.com/\" target=\"_blank\">Engedélyezze a JavaScriptet</a> és frissítse az oldalt!", "%s is available. Get more information on how to update." => "%s rendelkezésre áll. További információ a frissítéshez.", "Log out" => "Kilépés", "Automatic logon rejected!" => "Az automatikus bejelentkezés sikertelen!", @@ -173,12 +174,12 @@ $TRANSLATIONS = array( "remember" => "emlékezzen", "Log in" => "Bejelentkezés", "Alternative Logins" => "Alternatív bejelentkezés", -"This ownCloud instance is currently in single user mode." => "Az Owncloud frissítés elezdődött egy felhasználós módban.", +"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" => "Üdvözöljük!<br><br>\n\nÉrtesítjük, hogy %s megosztotta Önnel ezt az állományt: <strong>%s</strong><br>\n<a href=\"%s\">Itt lehet megnézni!</a><br><br>", +"This ownCloud instance is currently in single user mode." => "Ez az ownCloud szolgáltatás jelenleg egyfelhasználós üzemmódban működik.", "This means only administrators can use the instance." => "Ez azt jelenti, hogy csak az adminisztrátor használhatja ezt a példányt", -"Contact your system administrator if this message persists or appeared unexpectedly." => "Ha ezt az üzenetet már többször látod akkor keresd meg a rendszer adminját.", +"Contact your system administrator if this message persists or appeared unexpectedly." => "Ha ez az üzenet ismételten vagy indokolatlanul megjelenik, akkor keresse a rendszergazda segítségét!", "Thank you for your patience." => "Köszönjük a türelmét.", -"Updating ownCloud to version %s, this may take a while." => "Owncloud frissítés a %s verzióra folyamatban. Kis türelmet.", -"This ownCloud instance is currently being updated, which may take a while." => "Az Owncloud frissítés elezdődött, eltarthat egy ideig.", -"Please reload this page after a short time to continue using ownCloud." => "Frissitsd az oldalt ha \"Please reload this page after a short time to continue using ownCloud. \"" +"This ownCloud instance is currently being updated, which may take a while." => "Az ownCloud frissítés elkezdődött, ez eltarthat egy ideig.", +"Please reload this page after a short time to continue using ownCloud." => "Frissitse az oldalt egy kis idő múlva, ha folytatni kívánja az ownCloud használatát." ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/core/l10n/ia.php b/core/l10n/ia.php index fcf64fa8f67..e2f32407e0d 100644 --- a/core/l10n/ia.php +++ b/core/l10n/ia.php @@ -96,7 +96,6 @@ $TRANSLATIONS = array( "Add" => "Adder", "Edit tags" => "Modifica etiquettas", "Please reload the page." => "Pro favor recarga le pagina.", -"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Le actualisation terminava sin successo. Pro favor tu reporta iste problema al <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>.", "The update was successful. Redirecting you to ownCloud now." => "Le actualisation terminava con successo. On redirige nunc a tu ownCloud.", "%s password reset" => "%s contrasigno re-fixate", "A problem has occurred whilst sending the email, please contact your administrator." => "Un problema ha occurrite quando on inviava le message de e-posta, pro favor continge tu administrator.", @@ -126,7 +125,6 @@ $TRANSLATIONS = array( "Storage & database" => "Immagazinage & base de datos", "Data folder" => "Dossier de datos", "Configure the database" => "Configurar le base de datos", -"will be used" => "essera usate", "Database user" => "Usator de base de datos", "Database password" => "Contrasigno de base de datos", "Database name" => "Nomine de base de datos", diff --git a/core/l10n/id.php b/core/l10n/id.php index c8b7853365e..b69ea283de9 100644 --- a/core/l10n/id.php +++ b/core/l10n/id.php @@ -105,7 +105,6 @@ $TRANSLATIONS = array( "Error loading dialog template: {error}" => "Galat memuat templat dialog: {error}", "No tags selected for deletion." => "Tidak ada tag yang terpilih untuk dihapus.", "Please reload the page." => "Silakan muat ulang halaman.", -"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Pembaruan gagal. Silakan laporkan masalah ini ke <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">komunitas ownCloud</a>.", "The update was successful. Redirecting you to ownCloud now." => "Pembaruan sukses. Anda akan diarahkan ulang ke ownCloud.", "%s password reset" => "%s sandi diatur ulang", "A problem has occurred whilst sending the email, please contact your administrator." => "Terjadi masalah saat mengirim email, silakan hubungi administrator Anda.", @@ -152,7 +151,6 @@ $TRANSLATIONS = array( "Storage & database" => "Penyimpanan & Basis data", "Data folder" => "Folder data", "Configure the database" => "Konfigurasikan basis data", -"will be used" => "akan digunakan", "Database user" => "Pengguna basis data", "Database password" => "Sandi basis data", "Database name" => "Nama basis data", @@ -176,7 +174,6 @@ $TRANSLATIONS = array( "This means only administrators can use the instance." => "Ini berarti hanya administrator yang dapat menggunakan ownCloud.", "Contact your system administrator if this message persists or appeared unexpectedly." => "Hubungi administrator sistem anda jika pesan ini terus muncul atau muncul tiba-tiba.", "Thank you for your patience." => "Terima kasih atas kesabaran anda.", -"Updating ownCloud to version %s, this may take a while." => "Memperbarui ownCloud ke versi %s, prosesnya akan berlangsung beberapa saat.", "This ownCloud instance is currently being updated, which may take a while." => "ownCloud ini sedang diperbarui, yang mungkin memakan waktu cukup lama.", "Please reload this page after a short time to continue using ownCloud." => "Muat ulang halaman ini setelah beberapa saat untuk tetap menggunakan ownCloud." ); diff --git a/core/l10n/is.php b/core/l10n/is.php index dcce228e243..e592352e599 100644 --- a/core/l10n/is.php +++ b/core/l10n/is.php @@ -92,7 +92,6 @@ $TRANSLATIONS = array( "Password" => "Lykilorð", "Data folder" => "Gagnamappa", "Configure the database" => "Stilla gagnagrunn", -"will be used" => "verður notað", "Database user" => "Gagnagrunns notandi", "Database password" => "Gagnagrunns lykilorð", "Database name" => "Nafn gagnagrunns", @@ -106,7 +105,6 @@ $TRANSLATIONS = array( "Please change your password to secure your account again." => "Vinsamlegast breyttu lykilorðinu þínu til að tryggja öryggi þitt.", "Lost your password?" => "Týndir þú lykilorðinu?", "remember" => "muna eftir mér", -"Log in" => "<strong>Skrá inn</strong>", -"Updating ownCloud to version %s, this may take a while." => "Uppfæri ownCloud í útgáfu %s, það gæti tekið smá stund." +"Log in" => "<strong>Skrá inn</strong>" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/core/l10n/it.php b/core/l10n/it.php index 2c420dff250..3aa35741d49 100644 --- a/core/l10n/it.php +++ b/core/l10n/it.php @@ -109,7 +109,6 @@ $TRANSLATIONS = array( "Error loading dialog template: {error}" => "Errore durante il caricamento del modello di finestra: {error}", "No tags selected for deletion." => "Nessuna etichetta selezionata per l'eliminazione.", "Please reload the page." => "Ricarica la pagina.", -"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "L'aggiornamento non è riuscito. Segnala il problema alla <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">comunità di ownCloud</a>.", "The update was successful. Redirecting you to ownCloud now." => "L'aggiornamento è stato effettuato correttamente. Stai per essere reindirizzato a ownCloud.", "%s password reset" => "Ripristino password di %s", "A problem has occurred whilst sending the email, please contact your administrator." => "Si è verificato un problema durante l'invio della email, contatta il tuo amministratore.", @@ -156,7 +155,6 @@ $TRANSLATIONS = array( "Storage & database" => "Archiviazione e database", "Data folder" => "Cartella dati", "Configure the database" => "Configura il database", -"will be used" => "sarà utilizzato", "Database user" => "Utente del database", "Database password" => "Password del database", "Database name" => "Nome del database", @@ -181,7 +179,6 @@ $TRANSLATIONS = array( "This means only administrators can use the instance." => "Ciò significa che solo gli amministratori possono utilizzare l'istanza.", "Contact your system administrator if this message persists or appeared unexpectedly." => "Contatta il tuo amministratore di sistema se questo messaggio persiste o appare inaspettatamente.", "Thank you for your patience." => "Grazie per la pazienza.", -"Updating ownCloud to version %s, this may take a while." => "Aggiornamento di ownCloud alla versione %s in corso, ciò potrebbe richiedere del tempo.", "This ownCloud instance is currently being updated, which may take a while." => "Questa istanza di ownCloud è in fase di aggiornamento, potrebbe richiedere del tempo.", "Please reload this page after a short time to continue using ownCloud." => "Ricarica questa pagina per poter continuare ad usare ownCloud." ); diff --git a/core/l10n/ja.php b/core/l10n/ja.php index 51d0df65f32..7c2c40dc509 100644 --- a/core/l10n/ja.php +++ b/core/l10n/ja.php @@ -50,8 +50,8 @@ $TRANSLATIONS = array( "_{count} file conflict_::_{count} file conflicts_" => array("{count} ファイルが競合"), "One file conflict" => "1ファイルが競合", "New Files" => "新しいファイル", -"Already existing files" => "ファイルがすでに存在します", -"Which files do you want to keep?" => "どちらのファイルを保持したいですか？", +"Already existing files" => "既存のファイル", +"Which files do you want to keep?" => "どちらのファイルを保持しますか？", "If you select both versions, the copied file will have a number added to its name." => "両方のバージョンを選択した場合は、ファイル名の後ろに数字を追加したファイルのコピーを作成します。", "Cancel" => "キャンセル", "Continue" => "続ける", @@ -73,7 +73,10 @@ $TRANSLATIONS = array( "Shared with you by {owner}" => "{owner} と共有中", "Share with user or group …" => "ユーザーもしくはグループと共有 ...", "Share link" => "URLで共有", +"The public link will expire no later than {days} days after it is created" => "公開用リンクは、作成してから {days} 日以内に有効期限切れになります", +"By default the public link will expire after {days} days" => "デフォルトの設定では、公開用リンクは {days} 日後に有効期限切れになります", "Password protect" => "パスワード保護", +"Choose a password for the public link" => "公開用リンクのパスワードを選択", "Allow Public Upload" => "アップロードを許可", "Email link to person" => "メールリンク", "Send" => "送信", @@ -106,7 +109,6 @@ $TRANSLATIONS = array( "Error loading dialog template: {error}" => "メッセージテンプレートの読み込みエラー: {error}", "No tags selected for deletion." => "削除するタグが選択されていません。", "Please reload the page." => "ページをリロードしてください。", -"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "アップデートに失敗しました。この問題を <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a> にレポートしてください。", "The update was successful. Redirecting you to ownCloud now." => "アップデートに成功しました。今すぐownCloudにリダイレクトします。", "%s password reset" => "%s パスワードリセット", "A problem has occurred whilst sending the email, please contact your administrator." => "メールの送信中に問題が発生しました。管理者に問い合わせください。", @@ -153,7 +155,6 @@ $TRANSLATIONS = array( "Storage & database" => "ストレージとデータベース", "Data folder" => "データフォルダー", "Configure the database" => "データベースを設定してください", -"will be used" => "が使用されます", "Database user" => "データベースのユーザー名", "Database password" => "データベースのパスワード", "Database name" => "データベース名", @@ -178,7 +179,6 @@ $TRANSLATIONS = array( "This means only administrators can use the instance." => "これは、管理者のみがインスタンスを利用できることを意味しています。", "Contact your system administrator if this message persists or appeared unexpectedly." => "このメッセージが引き続きもしくは予期せず現れる場合は、システム管理者に連絡してください。", "Thank you for your patience." => "しばらくお待ちください。", -"Updating ownCloud to version %s, this may take a while." => "ownCloud をバージョン %s に更新しています、しばらくお待ちください。", "This ownCloud instance is currently being updated, which may take a while." => "この ownCloud インスタンスは現在アップデート中のため、しばらく時間がかかります。", "Please reload this page after a short time to continue using ownCloud." => "ownCloud を続けて利用するには、しばらくした後でページをリロードしてください。" ); diff --git a/core/l10n/ka_GE.php b/core/l10n/ka_GE.php index 5d1d14ecb0e..7091d86b53f 100644 --- a/core/l10n/ka_GE.php +++ b/core/l10n/ka_GE.php @@ -72,7 +72,6 @@ $TRANSLATIONS = array( "The object type is not specified." => "ობიექტის ტიპი არ არის მითითებული.", "Delete" => "წაშლა", "Add" => "დამატება", -"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "განახლება ვერ განხორციელდა. გთხოვთ შეგვატყობინოთ ამ პრობლემის შესახებ აქ: <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>.", "The update was successful. Redirecting you to ownCloud now." => "განახლება ვერ განხორციელდა. გადამისამართება თქვენს ownCloud–ზე.", "Use the following link to reset your password: {link}" => "გამოიყენე შემდეგი ლინკი პაროლის შესაცვლელად: {link}", "You will receive a link to reset your password via Email." => "თქვენ მოგივათ პაროლის შესაცვლელი ლინკი მეილზე", @@ -97,7 +96,6 @@ $TRANSLATIONS = array( "Password" => "პაროლი", "Data folder" => "მონაცემთა საქაღალდე", "Configure the database" => "მონაცემთა ბაზის კონფიგურირება", -"will be used" => "გამოყენებული იქნება", "Database user" => "მონაცემთა ბაზის მომხმარებელი", "Database password" => "მონაცემთა ბაზის პაროლი", "Database name" => "მონაცემთა ბაზის სახელი", @@ -111,7 +109,6 @@ $TRANSLATIONS = array( "Lost your password?" => "დაგავიწყდათ პაროლი?", "remember" => "დამახსოვრება", "Log in" => "შესვლა", -"Alternative Logins" => "ალტერნატიული Login–ი", -"Updating ownCloud to version %s, this may take a while." => "ownCloud–ის განახლება %s–ვერსიამდე. ეს მოითხოვს გარკვეულ დროს." +"Alternative Logins" => "ალტერნატიული Login–ი" ); $PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/core/l10n/km.php b/core/l10n/km.php index 0ba2e2f92cf..0b55a81a72c 100644 --- a/core/l10n/km.php +++ b/core/l10n/km.php @@ -101,7 +101,6 @@ $TRANSLATIONS = array( "Storage & database" => "ឃ្លាំងផ្ទុក & មូលដ្ឋានទិន្នន័យ", "Data folder" => "ថតទិន្នន័យ", "Configure the database" => "កំណត់សណ្ឋានមូលដ្ឋានទិន្នន័យ", -"will be used" => "នឹងត្រូវបានប្រើ", "Database user" => "អ្នកប្រើមូលដ្ឋានទិន្នន័យ", "Database password" => "ពាក្យសម្ងាត់មូលដ្ឋានទិន្នន័យ", "Database name" => "ឈ្មោះមូលដ្ឋានទិន្នន័យ", @@ -114,7 +113,6 @@ $TRANSLATIONS = array( "Lost your password?" => "បាត់ពាក្យសម្ងាត់របស់អ្នក?", "remember" => "ចងចាំ", "Log in" => "ចូល", -"Alternative Logins" => "ការចូលជំនួស", -"Updating ownCloud to version %s, this may take a while." => "ការធ្វើបច្ចុប្បន្នភាព ownCloud ទៅកំណែ %s អាចចំណាយពេលមួយសំទុះ។" +"Alternative Logins" => "ការចូលជំនួស" ); $PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/core/l10n/ko.php b/core/l10n/ko.php index bf509c31c4b..3137ec9ed2a 100644 --- a/core/l10n/ko.php +++ b/core/l10n/ko.php @@ -103,7 +103,6 @@ $TRANSLATIONS = array( "Error loading dialog template: {error}" => "대화 상자 템플릿을 불러오는 중 오류 발생: {error}", "No tags selected for deletion." => "삭제할 태그를 선택하지 않았습니다.", "Please reload the page." => "페이지를 새로 고치십시오.", -"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "업데이트가 실패하였습니다. 이 문제를 <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud 커뮤니티</a>에 보고해 주십시오.", "The update was successful. Redirecting you to ownCloud now." => "업데이트가 성공하였습니다. ownCloud로 돌아갑니다.", "%s password reset" => "%s 암호 재설정", "Use the following link to reset your password: {link}" => "다음 링크를 사용하여 암호를 재설정할 수 있습니다: {link}", @@ -147,7 +146,6 @@ $TRANSLATIONS = array( "Storage & database" => "스토리지 & 데이터베이스", "Data folder" => "데이터 폴더", "Configure the database" => "데이터베이스 설정", -"will be used" => "사용될 예정", "Database user" => "데이터베이스 사용자", "Database password" => "데이터베이스 암호", "Database name" => "데이터베이스 이름", @@ -171,7 +169,6 @@ $TRANSLATIONS = array( "This means only administrators can use the instance." => "현재 시스템 관리자만 인스턴스를 사용할 수 있습니다.", "Contact your system administrator if this message persists or appeared unexpectedly." => "이 메시지가 계속 표시되거나, 예상하지 못하였을 때 표시된다면 시스템 관리자에게 연락하십시오", "Thank you for your patience." => "기다려 주셔서 감사합니다.", -"Updating ownCloud to version %s, this may take a while." => "ownCloud를 버전 %s(으)로 업데이트합니다. 잠시 기다려 주십시오.", "This ownCloud instance is currently being updated, which may take a while." => "ownCloud 인스턴스가 현재 업데이트 중입니다. 잠시만 기다려 주십시오.", "Please reload this page after a short time to continue using ownCloud." => "잠시 후 페이지를 다시 불러온 다음 ownCloud를 사용해 주십시오." ); diff --git a/core/l10n/lb.php b/core/l10n/lb.php index 913a16d892f..88891bf4571 100644 --- a/core/l10n/lb.php +++ b/core/l10n/lb.php @@ -86,7 +86,6 @@ $TRANSLATIONS = array( "Delete" => "Läschen", "Add" => "Dobäisetzen", "Edit tags" => "Tags editéieren", -"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Den Update war net erfollegräich. Mell dëse Problem w.e.gl der<a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud-Community</a>.", "The update was successful. Redirecting you to ownCloud now." => "Den Update war erfollegräich. Du gëss elo bei d'ownCloud ëmgeleet.", "%s password reset" => "%s Passwuert ass nei gesat", "Use the following link to reset your password: {link}" => "Benotz folgende Link fir däi Passwuert zréckzesetzen: {link}", @@ -121,7 +120,6 @@ $TRANSLATIONS = array( "Password" => "Passwuert", "Data folder" => "Daten-Dossier", "Configure the database" => "D'Datebank konfiguréieren", -"will be used" => "wärt benotzt ginn", "Database user" => "Datebank-Benotzer", "Database password" => "Datebank-Passwuert", "Database name" => "Datebank Numm", @@ -138,7 +136,6 @@ $TRANSLATIONS = array( "remember" => "verhalen", "Log in" => "Umellen", "Alternative Logins" => "Alternativ Umeldungen", -"Thank you for your patience." => "Merci fir deng Gedold.", -"Updating ownCloud to version %s, this may take a while." => "ownCloud gëtt op d'Versioun %s aktualiséiert, dat kéint e Moment daueren." +"Thank you for your patience." => "Merci fir deng Gedold." ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/core/l10n/lt_LT.php b/core/l10n/lt_LT.php index 15d09e9308d..81ff611ecf1 100644 --- a/core/l10n/lt_LT.php +++ b/core/l10n/lt_LT.php @@ -98,7 +98,6 @@ $TRANSLATIONS = array( "Error loading dialog template: {error}" => "Klaida įkeliant dialogo ruošinį: {error}", "No tags selected for deletion." => "Trynimui nepasirinkta jokia žymė.", "Please reload the page." => "Prašome perkrauti puslapį.", -"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Atnaujinimas buvo nesėkmingas. PApie tai prašome pranešti the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud bendruomenei</a>.", "The update was successful. Redirecting you to ownCloud now." => "Atnaujinimas buvo sėkmingas. Nukreipiame į jūsų ownCloud.", "%s password reset" => "%s slaptažodžio atnaujinimas", "Use the following link to reset your password: {link}" => "Slaptažodio atkūrimui naudokite šią nuorodą: {link}", @@ -141,7 +140,6 @@ $TRANSLATIONS = array( "Password" => "Slaptažodis", "Data folder" => "Duomenų katalogas", "Configure the database" => "Nustatyti duomenų bazę", -"will be used" => "bus naudojama", "Database user" => "Duomenų bazės vartotojas", "Database password" => "Duomenų bazės slaptažodis", "Database name" => "Duomenų bazės pavadinimas", @@ -165,7 +163,6 @@ $TRANSLATIONS = array( "This means only administrators can use the instance." => "Tai reiškia, kad tik administratorius gali naudotis sistema.", "Contact your system administrator if this message persists or appeared unexpectedly." => "Susisiekite su savo sistemos administratoriumi jei šis pranešimas nedingsta arba jei jis pasirodė netikėtai.", "Thank you for your patience." => "Dėkojame už jūsų kantrumą.", -"Updating ownCloud to version %s, this may take a while." => "Atnaujinama ownCloud į %s versiją. tai gali šiek tiek užtrukti.", "This ownCloud instance is currently being updated, which may take a while." => "Šiuo metu vyksta ownCloud atnaujinamas, tai gali šiek tiek užtrukti.", "Please reload this page after a short time to continue using ownCloud." => "Po trupučio laiko atnaujinkite šį puslapį kad galėtumėte toliau naudoti ownCloud." ); diff --git a/core/l10n/lv.php b/core/l10n/lv.php index e0e59e7eae8..3b038b355fe 100644 --- a/core/l10n/lv.php +++ b/core/l10n/lv.php @@ -73,7 +73,6 @@ $TRANSLATIONS = array( "The object type is not specified." => "Nav norādīts objekta tips.", "Delete" => "Dzēst", "Add" => "Pievienot", -"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Atjaunināšana beidzās nesekmīgi. Lūdzu, ziņojiet par šo problēmu <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud kopienai</a>.", "The update was successful. Redirecting you to ownCloud now." => "Atjaunināšana beidzās sekmīgi. Tagad pārsūta jūs uz ownCloud.", "%s password reset" => "%s paroles maiņa", "Use the following link to reset your password: {link}" => "Izmantojiet šo saiti, lai mainītu paroli: {link}", @@ -105,7 +104,6 @@ $TRANSLATIONS = array( "Password" => "Parole", "Data folder" => "Datu mape", "Configure the database" => "Konfigurēt datubāzi", -"will be used" => "tiks izmantots", "Database user" => "Datubāzes lietotājs", "Database password" => "Datubāzes parole", "Database name" => "Datubāzes nosaukums", @@ -120,7 +118,6 @@ $TRANSLATIONS = array( "Lost your password?" => "Aizmirsāt paroli?", "remember" => "atcerēties", "Log in" => "Ierakstīties", -"Alternative Logins" => "Alternatīvās pieteikšanās", -"Updating ownCloud to version %s, this may take a while." => "Atjaunina ownCloud uz versiju %s. Tas var aizņemt kādu laiciņu." +"Alternative Logins" => "Alternatīvās pieteikšanās" ); $PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);"; diff --git a/core/l10n/mk.php b/core/l10n/mk.php index e27f5a6af6d..d12ff0203b3 100644 --- a/core/l10n/mk.php +++ b/core/l10n/mk.php @@ -88,7 +88,6 @@ $TRANSLATIONS = array( "Add" => "Додади", "Edit tags" => "Уреди ги таговите", "No tags selected for deletion." => "Не се селектирани тагови за бришење.", -"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Надградбата беше неуспешна. Ве молиме пријавете го овој проблем на <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>.", "The update was successful. Redirecting you to ownCloud now." => "Надградбата беше успешна. Веднаш ве префрлам на вашиот ownCloud.", "%s password reset" => "%s ресетирање на лозинката", "Use the following link to reset your password: {link}" => "Користете ја следната врска да ја ресетирате Вашата лозинка: {link}", @@ -123,7 +122,6 @@ $TRANSLATIONS = array( "Password" => "Лозинка", "Data folder" => "Фолдер со податоци", "Configure the database" => "Конфигурирај ја базата", -"will be used" => "ќе биде користено", "Database user" => "Корисник на база", "Database password" => "Лозинка на база", "Database name" => "Име на база", @@ -143,7 +141,6 @@ $TRANSLATIONS = array( "Alternative Logins" => "Алтернативни најавувања", "Contact your system administrator if this message persists or appeared unexpectedly." => "Контактирајте го вашиот систем администратор до колку оваа порака продолжи да се појавува или пак се појавува ненадејно.", "Thank you for your patience." => "Благодариме на вашето трпение.", -"Updating ownCloud to version %s, this may take a while." => "Надградбата на ownCloud на верзијата %s, може да потрае.", "This ownCloud instance is currently being updated, which may take a while." => "Оваа инстанца на ownCloud во моментов се надградува, што може малку да потрае.", "Please reload this page after a short time to continue using ownCloud." => "Повторно вчитајте ја оваа страница по кратко време за да продолжите да го користите ownCloud." ); diff --git a/core/l10n/ms_MY.php b/core/l10n/ms_MY.php index b32888238c1..745e63402e9 100644 --- a/core/l10n/ms_MY.php +++ b/core/l10n/ms_MY.php @@ -54,7 +54,6 @@ $TRANSLATIONS = array( "Password" => "Kata laluan", "Data folder" => "Fail data", "Configure the database" => "Konfigurasi pangkalan data", -"will be used" => "akan digunakan", "Database user" => "Nama pengguna pangkalan data", "Database password" => "Kata laluan pangkalan data", "Database name" => "Nama pangkalan data", diff --git a/core/l10n/nb_NO.php b/core/l10n/nb_NO.php index c832544d15c..b714b739ce4 100644 --- a/core/l10n/nb_NO.php +++ b/core/l10n/nb_NO.php @@ -1,9 +1,11 @@ <?php $TRANSLATIONS = array( +"Expiration date is in the past." => "Utløpsdato er tilbake i tid.", "Couldn't send mail to following users: %s " => "Klarte ikke å sende mail til følgende brukere: %s", "Turned on maintenance mode" => "Slo på vedlikeholdsmodus", "Turned off maintenance mode" => "Slo av vedlikeholdsmodus", "Updated database" => "Oppdaterte databasen", +"Disabled incompatible apps: %s" => "Deaktiverte ukompatible apper: %s", "No image or file provided" => "Bilde eller fil ikke angitt", "Unknown filetype" => "Ukjent filtype", "Invalid image" => "Ugyldig bilde", @@ -48,6 +50,8 @@ $TRANSLATIONS = array( "Error loading message template: {error}" => "Feil ved lasting av meldingsmal: {error}", "_{count} file conflict_::_{count} file conflicts_" => array("{count} filkonflikt","{count} filkonflikter"), "One file conflict" => "En filkonflikt", +"New Files" => "Nye filer", +"Already existing files" => "Allerede eksisterende filer", "Which files do you want to keep?" => "Hvilke filer vil du beholde?", "If you select both versions, the copied file will have a number added to its name." => "Hvis du velger begge versjonene vil den kopierte filen få et nummer lagt til i navnet.", "Cancel" => "Avbryt", @@ -57,6 +61,7 @@ $TRANSLATIONS = array( "Error loading file exists template" => "Feil ved lasting av \"filen eksisterer\"-mal", "Very weak password" => "Veldig svakt passord", "Weak password" => "Svakt passord", +"So-so password" => "So-so-passord", "Good password" => "Bra passord", "Strong password" => "Sterkt passord", "Shared" => "Delt", @@ -69,7 +74,10 @@ $TRANSLATIONS = array( "Shared with you by {owner}" => "Delt med deg av {owner}", "Share with user or group …" => "Del med bruker eller gruppe …", "Share link" => "Del lenke", +"The public link will expire no later than {days} days after it is created" => "Den offentlige lenken vil utløpe senest {days} dager etter at den lages", +"By default the public link will expire after {days} days" => "Som standard vil den offentlige lenken utløpe etter {days} dager", "Password protect" => "Passordbeskyttet", +"Choose a password for the public link" => "Velg et passord for den offentlige lenken", "Allow Public Upload" => "Tillat Offentlig Opplasting", "Email link to person" => "Email lenke til person", "Send" => "Send", @@ -101,10 +109,12 @@ $TRANSLATIONS = array( "Edit tags" => "Rediger merkelapper", "Error loading dialog template: {error}" => "Feil ved lasting av dialogmal: {error}", "No tags selected for deletion." => "Ingen merkelapper valgt for sletting.", +"Updating {productName} to version {version}, this may take a while." => "Oppdaterer {productName} til versjon {version}. Dette kan ta litt tid.", "Please reload the page." => "Vennligst last siden på nytt.", -"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Oppdateringen mislyktes. Vennligst rapporter dette problemet til <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud-fellesskapet</a>.", +"The update was unsuccessful." => "Oppdateringen var vellykket.", "The update was successful. Redirecting you to ownCloud now." => "Oppdateringen var vellykket. Du omdirigeres nå til ownCloud.", "%s password reset" => "%s nullstilling av passord", +"A problem has occurred whilst sending the email, please contact your administrator." => "Et problem oppstod ved sending av mailen. Kontakt administratoren.", "Use the following link to reset your password: {link}" => "Bruk følgende lenke for å tilbakestille passordet ditt: {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 ." => "Lenken for nullstilling av passordet ditt er sendt til din email.<br>Hvis du ikke mottar den innen rimelig tid, sjekk spam- og søppelmappene i epost-programmet.<br>Hvis den ikke er der, kontakt din lokale administrator .", "Request failed!<br>Did you make sure your email/username was right?" => "Anmodning feilet!<br>Forsikret du deg om at din email/brukernavn var korrekt?", @@ -117,6 +127,8 @@ $TRANSLATIONS = array( "To login page" => "Til innlogginssiden", "New password" => "Nytt passord", "Reset password" => "Tilbakestill passord", +"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X støttes ikke og %s vil ikke fungere korrekt på denne plattformen. Bruk på egen risiko!", +"For the best results, please consider using a GNU/Linux server instead." => "For beste resultat, vurder å bruke en GNU/Linux-server i stedet.", "Personal" => "Personlig", "Users" => "Brukere", "Apps" => "Apper", @@ -146,7 +158,6 @@ $TRANSLATIONS = array( "Storage & database" => "Lagring og database", "Data folder" => "Datamappe", "Configure the database" => "Konfigurer databasen", -"will be used" => "vil bli brukt", "Database user" => "Databasebruker", "Database password" => "Databasepassord", "Database name" => "Databasenavn", @@ -166,11 +177,16 @@ $TRANSLATIONS = array( "remember" => "husk", "Log in" => "Logg inn", "Alternative Logins" => "Alternative innlogginger", +"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" => "Hei der,<br><br>bare informerer om at %s delte <strong>%s</strong> med deg.<br><a href=\"%s\">Vis!</a><br><br>", "This ownCloud instance is currently in single user mode." => "Denne ownCloud-instansen er for øyeblikket i enbrukermodus.", "This means only administrators can use the instance." => "Dette betyr at kun administratorer kan bruke instansen.", "Contact your system administrator if this message persists or appeared unexpectedly." => "Kontakt systemadministratoren hvis denne meldingen var uventet eller ikke forsvinner.", "Thank you for your patience." => "Takk for din tålmodighet.", -"Updating ownCloud to version %s, this may take a while." => "Oppdaterer ownCloud til versjon %s, dette kan ta en stund.", +"%s will be updated to version %s." => "%s vil bli oppdatert til versjon %s.", +"The following apps will be disabled:" => "Følgende apps vil bli deaktivert:", +"The theme %s has been disabled." => "Temaet %s har blitt deaktivert.", +"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." => "Forsikre deg om at databasen, config-mappen og datamappen er blitt sikkerhetskopiert før du fortsetter.", +"Start update" => "Start oppdatering", "This ownCloud instance is currently being updated, which may take a while." => "Denne ownCloud-instansen oppdateres for øyeblikket, noe som kan ta litt tid.", "Please reload this page after a short time to continue using ownCloud." => "Vennligst last denne siden på nytt om en liten stund for å fortsette å bruke ownCloud." ); diff --git a/core/l10n/nl.php b/core/l10n/nl.php index 595266f6f4a..1a5ee85a14e 100644 --- a/core/l10n/nl.php +++ b/core/l10n/nl.php @@ -5,6 +5,7 @@ $TRANSLATIONS = array( "Turned on maintenance mode" => "Onderhoudsmodus ingeschakeld", "Turned off maintenance mode" => "Onderhoudsmodus uitgeschakeld", "Updated database" => "Database bijgewerkt", +"Disabled incompatible apps: %s" => "Gedeactiveerde incompatibele apps: %s", "No image or file provided" => "Geen afbeelding of bestand opgegeven", "Unknown filetype" => "Onbekend bestandsformaat", "Invalid image" => "Ongeldige afbeelding", @@ -76,6 +77,7 @@ $TRANSLATIONS = array( "The public link will expire no later than {days} days after it is created" => "De openbare link vervalt niet eerder dan {days} dagen na het aanmaken", "By default the public link will expire after {days} days" => "Standaard vervalt een openbare link na {days} dagen", "Password protect" => "Wachtwoord beveiligd", +"Choose a password for the public link" => "Kies een wachtwoord voor de openbare link", "Allow Public Upload" => "Sta publieke uploads toe", "Email link to person" => "E-mail link naar persoon", "Send" => "Versturen", @@ -107,8 +109,9 @@ $TRANSLATIONS = array( "Edit tags" => "Bewerken tags", "Error loading dialog template: {error}" => "Fout bij laden dialoog sjabloon: {error}", "No tags selected for deletion." => "Geen tags geselecteerd voor verwijdering.", +"Updating {productName} to version {version}, this may take a while." => "Bijwerken {productName} naar versie {version}, dit kan even duren.", "Please reload the page." => "Herlaad deze pagina.", -"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "De update is niet geslaagd. Meld dit probleem bij de <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>.", +"The update was unsuccessful." => "De update is niet geslaagd.", "The update was successful. Redirecting you to ownCloud now." => "De update is geslaagd. U wordt teruggeleid naar uw eigen ownCloud.", "%s password reset" => "%s wachtwoord reset", "A problem has occurred whilst sending the email, please contact your administrator." => "Er ontstond een probleem bij het versturen van het e-mailbericht, neem contact op met uw beheerder.", @@ -155,7 +158,6 @@ $TRANSLATIONS = array( "Storage & database" => "Opslag & database", "Data folder" => "Gegevensmap", "Configure the database" => "Configureer de database", -"will be used" => "zal gebruikt worden", "Database user" => "Gebruiker database", "Database password" => "Wachtwoord database", "Database name" => "Naam database", @@ -180,7 +182,11 @@ $TRANSLATIONS = array( "This means only administrators can use the instance." => "Dat betekent dat alleen beheerders deze installatie kunnen gebruiken.", "Contact your system administrator if this message persists or appeared unexpectedly." => "Beem contact op met uw systeembeheerder als deze melding aanhoudt of plotseling verscheen.", "Thank you for your patience." => "Bedankt voor uw geduld.", -"Updating ownCloud to version %s, this may take a while." => "Updaten ownCloud naar versie %s, dit kan even duren...", +"%s will be updated to version %s." => "%s wordt bijgewerkt naar versie %s.", +"The following apps will be disabled:" => "De volgende apps worden gedeactiveerd:", +"The theme %s has been disabled." => "Het thema %s is gedeactiveerd.", +"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." => "Let erop dat de database, de config map en de data map zijn gebackupped voordat u verder gaat.", +"Start update" => "Begin de update", "This ownCloud instance is currently being updated, which may take a while." => "Deze ownCloud dienst wordt nu bijgewerkt, dat kan even duren.", "Please reload this page after a short time to continue using ownCloud." => "Laad deze pagina straks opnieuw om verder te gaan met ownCloud." ); diff --git a/core/l10n/nn_NO.php b/core/l10n/nn_NO.php index a0b9b88729b..cc61caf3a38 100644 --- a/core/l10n/nn_NO.php +++ b/core/l10n/nn_NO.php @@ -90,7 +90,6 @@ $TRANSLATIONS = array( "The object type is not specified." => "Objekttypen er ikkje spesifisert.", "Delete" => "Slett", "Add" => "Legg til", -"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Oppdateringa feila. Ver venleg og rapporter feilen til <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud-fellesskapet</a>.", "The update was successful. Redirecting you to ownCloud now." => "Oppdateringa er fullført. Sender deg vidare til ownCloud no.", "%s password reset" => "%s passordnullstilling", "Use the following link to reset your password: {link}" => "Klikk følgjande lenkje til å nullstilla passordet ditt: {link}", @@ -122,7 +121,6 @@ $TRANSLATIONS = array( "Password" => "Passord", "Data folder" => "Datamappe", "Configure the database" => "Set opp databasen", -"will be used" => "vil verta nytta", "Database user" => "Databasebrukar", "Database password" => "Databasepassord", "Database name" => "Databasenamn", @@ -137,7 +135,6 @@ $TRANSLATIONS = array( "Lost your password?" => "Gløymt passordet?", "remember" => "hugs", "Log in" => "Logg inn", -"Alternative Logins" => "Alternative innloggingar", -"Updating ownCloud to version %s, this may take a while." => "Oppdaterer ownCloud til utgåve %s, dette kan ta ei stund." +"Alternative Logins" => "Alternative innloggingar" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/core/l10n/oc.php b/core/l10n/oc.php index f4dc0a01263..4ef1442012d 100644 --- a/core/l10n/oc.php +++ b/core/l10n/oc.php @@ -80,7 +80,6 @@ $TRANSLATIONS = array( "Password" => "Senhal", "Data folder" => "Dorsièr de donadas", "Configure the database" => "Configura la basa de donadas", -"will be used" => "serà utilizat", "Database user" => "Usancièr de la basa de donadas", "Database password" => "Senhal de la basa de donadas", "Database name" => "Nom de la basa de donadas", diff --git a/core/l10n/pl.php b/core/l10n/pl.php index 4a7e212d0ad..028c82008d2 100644 --- a/core/l10n/pl.php +++ b/core/l10n/pl.php @@ -5,6 +5,7 @@ $TRANSLATIONS = array( "Turned on maintenance mode" => "Włączony tryb konserwacji", "Turned off maintenance mode" => "Wyłączony tryb konserwacji", "Updated database" => "Zaktualizuj bazę", +"Disabled incompatible apps: %s" => "Wyłączone niekompatybilne aplikacja: %s", "No image or file provided" => "Brak obrazu lub pliku dostarczonego", "Unknown filetype" => "Nieznany typ pliku", "Invalid image" => "Nieprawidłowe zdjęcie", @@ -108,8 +109,9 @@ $TRANSLATIONS = array( "Edit tags" => "Edytuj tagi", "Error loading dialog template: {error}" => "Błąd podczas ładowania szablonu dialogu: {error}", "No tags selected for deletion." => "Nie zaznaczono tagów do usunięcia.", +"Updating {productName} to version {version}, this may take a while." => "Aktualizuję {productName} do wersji {version}, to może chwilę potrwać.", "Please reload the page." => "Proszę przeładować stronę", -"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Aktualizacja zakończyła się niepowodzeniem. Zgłoś ten problem <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">spoleczności ownCloud</a>.", +"The update was unsuccessful." => "Aktualizacja nie powiodła się.", "The update was successful. Redirecting you to ownCloud now." => "Aktualizacji zakończyła się powodzeniem. Przekierowuję do ownCloud.", "%s password reset" => "%s reset hasła", "A problem has occurred whilst sending the email, please contact your administrator." => "Pojawił się problem podczas wysyłania wiadomości email, skontaktuj się z administratorem", @@ -156,7 +158,6 @@ $TRANSLATIONS = array( "Storage & database" => "Zasoby dysku & baza danych", "Data folder" => "Katalog danych", "Configure the database" => "Skonfiguruj bazę danych", -"will be used" => "zostanie użyte", "Database user" => "Użytkownik bazy danych", "Database password" => "Hasło do bazy danych", "Database name" => "Nazwa bazy danych", @@ -181,7 +182,11 @@ $TRANSLATIONS = array( "This means only administrators can use the instance." => "To oznacza, że tylko administratorzy mogą w tej chwili używać aplikacji.", "Contact your system administrator if this message persists or appeared unexpectedly." => "Skontaktuj się z administratorem, jeśli ten komunikat pojawił się nieoczekiwanie lub wyświetla się ciągle.", "Thank you for your patience." => "Dziękuję za cierpliwość.", -"Updating ownCloud to version %s, this may take a while." => "Aktualizowanie ownCloud do wersji %s. Może to trochę potrwać.", +"%s will be updated to version %s." => "%s zostanie zaktualizowane do wersji %s.", +"The following apps will be disabled:" => "Następujące aplikacje zostaną zablokowane:", +"The theme %s has been disabled." => "Motyw %s został wyłączony.", +"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." => "Proszę się upewnić, że baza danych, folder konfiguracji oraz folder danych zostały zarchiwizowane przed przejściem dalej.", +"Start update" => "Rozpocznij aktualizację", "This ownCloud instance is currently being updated, which may take a while." => "Ta instalacja ownCloud jest w tej chwili aktualizowana, co może chwilę potrwać", "Please reload this page after a short time to continue using ownCloud." => "Proszę przeładować tę stronę za chwilę, aby kontynuować pracę w ownCloud" ); diff --git a/core/l10n/pt_BR.php b/core/l10n/pt_BR.php index d6b802dacfb..a139b22d9e4 100644 --- a/core/l10n/pt_BR.php +++ b/core/l10n/pt_BR.php @@ -5,6 +5,7 @@ $TRANSLATIONS = array( "Turned on maintenance mode" => "Ativar modo de manutenção", "Turned off maintenance mode" => "Desligar o modo de manutenção", "Updated database" => "Atualizar o banco de dados", +"Disabled incompatible apps: %s" => "Desabilitar aplicativos incompatíveis : %s", "No image or file provided" => "Nenhuma imagem ou arquivo fornecido", "Unknown filetype" => "Tipo de arquivo desconhecido", "Invalid image" => "Imagem inválida", @@ -108,8 +109,9 @@ $TRANSLATIONS = array( "Edit tags" => "Editar etiqueta", "Error loading dialog template: {error}" => "Erro carregando diálogo de formatação:{error}", "No tags selected for deletion." => "Nenhuma etiqueta selecionada para deleção.", +"Updating {productName} to version {version}, this may take a while." => "Atualizando {productName} para a versão {version}, isso pode demorar um pouco.", "Please reload the page." => "Por favor recarregue a página", -"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "A atualização falhou. Por favor, relate este problema para a <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">comunidade ownCloud</a>.", +"The update was unsuccessful." => "A atualização não foi bem sucedida.", "The update was successful. Redirecting you to ownCloud now." => "A atualização teve êxito. Você será redirecionado ao ownCloud agora.", "%s password reset" => "%s redefinir senha", "A problem has occurred whilst sending the email, please contact your administrator." => "Um problema ocorreu durante o envio do e-mail, por favor, contate o administrador.", @@ -156,7 +158,6 @@ $TRANSLATIONS = array( "Storage & database" => "Armazenamento & banco de dados", "Data folder" => "Pasta de dados", "Configure the database" => "Configurar o banco de dados", -"will be used" => "será usado", "Database user" => "Usuário do banco de dados", "Database password" => "Senha do banco de dados", "Database name" => "Nome do banco de dados", @@ -181,7 +182,11 @@ $TRANSLATIONS = array( "This means only administrators can use the instance." => "Isso significa que apenas os administradores podem usar o exemplo.", "Contact your system administrator if this message persists or appeared unexpectedly." => "Contacte o seu administrador do sistema se esta mensagem persistir ou aparecer inesperadamente.", "Thank you for your patience." => "Obrigado pela sua paciência.", -"Updating ownCloud to version %s, this may take a while." => "Atualizando ownCloud para a versão %s, isto pode levar algum tempo.", +"%s will be updated to version %s." => "%s será atualizado para a versão %s.", +"The following apps will be disabled:" => "Os seguintes aplicativos serão desativados:", +"The theme %s has been disabled." => "O tema %s foi desativado.", +"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." => "Por favor, certifique-se de que o banco de dados, a pasta config e a pasta de dados foram copiados antes de prosseguir.", +"Start update" => "Iniciar atualização", "This ownCloud instance is currently being updated, which may take a while." => "Esta instância do ownCloud está sendo atualizada, o que pode demorar um pouco.", "Please reload this page after a short time to continue using ownCloud." => "Por favor, atualize esta página depois de um curto período de tempo para continuar usando ownCloud." ); diff --git a/core/l10n/pt_PT.php b/core/l10n/pt_PT.php index 19842d6e6e5..e78bfe1617f 100644 --- a/core/l10n/pt_PT.php +++ b/core/l10n/pt_PT.php @@ -73,7 +73,10 @@ $TRANSLATIONS = array( "Shared with you by {owner}" => "Partilhado consigo por {owner}", "Share with user or group …" => "Partilhar com utilizador ou grupo...", "Share link" => "Partilhar o link", +"The public link will expire no later than {days} days after it is created" => "O link público expira, o mais tardar {days} dias após sua criação", +"By default the public link will expire after {days} days" => "Por defeito, o link publico irá expirar depois de {days} dias", "Password protect" => "Proteger com palavra-passe", +"Choose a password for the public link" => "Defina a palavra-passe para o link público", "Allow Public Upload" => "Permitir Envios Públicos", "Email link to person" => "Enviar o link por e-mail", "Send" => "Enviar", @@ -106,7 +109,6 @@ $TRANSLATIONS = array( "Error loading dialog template: {error}" => "Erro ao carregar modelo de diálogo: {error}", "No tags selected for deletion." => "Não foram escolhidas etiquetas para apagar.", "Please reload the page." => "Por favor recarregue a página.", -"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "A actualização falhou. Por favor reporte este incidente seguindo este link <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>.", "The update was successful. Redirecting you to ownCloud now." => "A actualização foi concluída com sucesso. Vai ser redireccionado para o ownCloud agora.", "%s password reset" => "%s reposição da password", "A problem has occurred whilst sending the email, please contact your administrator." => "Ocorreu um problema com o envio do e-mail, por favor contactar o administrador.", @@ -153,7 +155,6 @@ $TRANSLATIONS = array( "Storage & database" => "Armazenamento e base de dados", "Data folder" => "Pasta de dados", "Configure the database" => "Configure a base de dados", -"will be used" => "vai ser usada", "Database user" => "Utilizador da base de dados", "Database password" => "Password da base de dados", "Database name" => "Nome da base de dados", @@ -178,7 +179,6 @@ $TRANSLATIONS = array( "This means only administrators can use the instance." => "Isto significa que apenas os administradores podem usar a instância.", "Contact your system administrator if this message persists or appeared unexpectedly." => "Contacte o seu administrador de sistema se esta mensagem continuar a aparecer ou apareceu inesperadamente.", "Thank you for your patience." => "Obrigado pela sua paciência.", -"Updating ownCloud to version %s, this may take a while." => "A actualizar o ownCloud para a versão %s, esta operação pode demorar.", "This ownCloud instance is currently being updated, which may take a while." => "Esta instância do ownCloud está a ser actualizada, poderá demorar algum tempo.", "Please reload this page after a short time to continue using ownCloud." => "Por favo recarregue esta página após algum tempo para continuar a usar ownCloud." ); diff --git a/core/l10n/ro.php b/core/l10n/ro.php index cb62d71ee19..3816625772c 100644 --- a/core/l10n/ro.php +++ b/core/l10n/ro.php @@ -81,7 +81,6 @@ $TRANSLATIONS = array( "The object type is not specified." => "Tipul obiectului nu este specificat.", "Delete" => "Șterge", "Add" => "Adaugă", -"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Actualizarea a eșuat! Raportați problema către <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">comunitatea ownCloud</a>.", "The update was successful. Redirecting you to ownCloud now." => "Actualizare reușită. Ești redirecționat către ownCloud.", "Use the following link to reset your password: {link}" => "Folosește următorul link pentru a reseta parola: {link}", "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.", @@ -112,7 +111,6 @@ $TRANSLATIONS = array( "Password" => "Parolă", "Data folder" => "Director date", "Configure the database" => "Configurează baza de date", -"will be used" => "vor fi folosite", "Database user" => "Utilizatorul bazei de date", "Database password" => "Parola bazei de date", "Database name" => "Numele bazei de date", @@ -127,7 +125,6 @@ $TRANSLATIONS = array( "Lost your password?" => "Ai uitat parola?", "remember" => "amintește", "Log in" => "Autentificare", -"Alternative Logins" => "Conectări alternative", -"Updating ownCloud to version %s, this may take a while." => "Actualizăm ownCloud la versiunea %s, aceasta poate dura câteva momente." +"Alternative Logins" => "Conectări alternative" ); $PLURAL_FORMS = "nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));"; diff --git a/core/l10n/ru.php b/core/l10n/ru.php index 09757f41a1c..4fcdaeec185 100644 --- a/core/l10n/ru.php +++ b/core/l10n/ru.php @@ -50,6 +50,7 @@ $TRANSLATIONS = array( "_{count} file conflict_::_{count} file conflicts_" => array("{count} конфликт в файлах","{count} конфликта в файлах","{count} конфликтов в файлах"), "One file conflict" => "Один конфликт в файлах", "New Files" => "Новые файлы", +"Already existing files" => "Существующие файлы", "Which files do you want to keep?" => "Какие файлы вы хотите сохранить?", "If you select both versions, the copied file will have a number added to its name." => "При выборе обоих версий, к названию копируемого файла будет добавлена цифра", "Cancel" => "Отменить", @@ -72,8 +73,11 @@ $TRANSLATIONS = array( "Shared with you by {owner}" => "{owner} открыл доступ для Вас", "Share with user or group …" => "Поделиться с пользователем или группой...", "Share link" => "Поделиться ссылкой", +"The public link will expire no later than {days} days after it is created" => "Срок действия публичной ссылки истекает не позже чем через {days} дней, после её создания", +"By default the public link will expire after {days} days" => "По умолчанию срок действия публичной ссылки истекает через {days} дней", "Password protect" => "Защитить паролем", -"Allow Public Upload" => "Разрешить открытую загрузку", +"Choose a password for the public link" => "Выберите пароль для публичной ссылки", +"Allow Public Upload" => "Разрешить загрузку", "Email link to person" => "Почтовая ссылка на персону", "Send" => "Отправить", "Set expiration date" => "Установить срок доступа", @@ -105,7 +109,6 @@ $TRANSLATIONS = array( "Error loading dialog template: {error}" => "Ошибка загрузки шаблона диалога: {error}", "No tags selected for deletion." => "Не выбраны меток для удаления.", "Please reload the page." => "Пожалуйста, перезагрузите страницу.", -"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "При обновлении произошла ошибка. Пожалуйста сообщите об этом в <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud сообщество</a>.", "The update was successful. Redirecting you to ownCloud now." => "Обновление прошло успешно. Перенаправляемся в Ваш ownCloud...", "%s password reset" => "%s сброс пароля", "A problem has occurred whilst sending the email, please contact your administrator." => "Произошла ошибка при отправке сообщения электронной почты, пожалуйста, свяжитесь с Вашим администратором.", @@ -137,9 +140,9 @@ $TRANSLATIONS = array( "Error unfavoriting" => "Ошибка удаления из любимых", "Access forbidden" => "Доступ запрещён", "Cloud not found" => "Облако не найдено", -"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Здравствуйте,\n\nпросто даём вам знать, что %s расшарил %s для вас.\nПосмотреть: %s\n\n", +"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Здравствуйте,\n\n%s предоставил Вам доступ к %s.\nПосмотреть: %s\n\n", "The share will expire on %s." => "Доступ пропадет в %s", -"Cheers!" => "Приветствуем!", +"Cheers!" => "Удачи!", "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 %s securely." => "Пожалуйста обновите Вашу PHP конфигурацию для безопасного использования %s.", @@ -152,7 +155,6 @@ $TRANSLATIONS = array( "Storage & database" => "Система хранения данных & база данных", "Data folder" => "Директория с данными", "Configure the database" => "Настройка базы данных", -"will be used" => "будет использовано", "Database user" => "Пользователь базы данных", "Database password" => "Пароль базы данных", "Database name" => "Название базы данных", @@ -172,12 +174,12 @@ $TRANSLATIONS = array( "remember" => "запомнить", "Log in" => "Войти", "Alternative Logins" => "Альтернативные имена пользователя", -"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" => "Здравствуйте,<br><br>просто даём вам знать, что %s открыл доступ к %s для вас.<br><a href=\"%s\">Посмотреть!</a><br><br>", +"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" => "Здравствуйте,<br><br>%s предоставил Вам доступ к <strong>%s</strong>.<br><a href=\"%s\">Посмотреть</a><br><br>", "This ownCloud instance is currently in single user mode." => "Эта установка ownCloud в настоящее время в однопользовательском режиме.", "This means only administrators can use the instance." => "Это значит, что только администраторы могут использовать эту установку.", "Contact your system administrator if this message persists or appeared unexpectedly." => "Обратитесь к вашему системному администратору если это сообщение не исчезает или появляется неожиданно.", "Thank you for your patience." => "Спасибо за терпение.", -"Updating ownCloud to version %s, this may take a while." => "Идёт обновление ownCloud до версии %s. Это может занять некоторое время.", +"Start update" => "Запустить обновление", "This ownCloud instance is currently being updated, which may take a while." => "Производится обновление ownCloud, это может занять некоторое время.", "Please reload this page after a short time to continue using ownCloud." => "Перезагрузите эту страницу через некоторое время чтобы продолжить использовать ownCloud." ); diff --git a/core/l10n/si_LK.php b/core/l10n/si_LK.php index 1ce41214e91..cd9d1011487 100644 --- a/core/l10n/si_LK.php +++ b/core/l10n/si_LK.php @@ -75,7 +75,6 @@ $TRANSLATIONS = array( "Password" => "මුර පදය", "Data folder" => "දත්ත ෆෝල්ඩරය", "Configure the database" => "දත්ත සමුදාය හැඩගැසීම", -"will be used" => "භාවිතා වනු ඇත", "Database user" => "දත්තගබඩා භාවිතාකරු", "Database password" => "දත්තගබඩාවේ මුරපදය", "Database name" => "දත්තගබඩාවේ නම", diff --git a/core/l10n/sk_SK.php b/core/l10n/sk_SK.php index 40a3aad7ac5..68fd163e871 100644 --- a/core/l10n/sk_SK.php +++ b/core/l10n/sk_SK.php @@ -106,7 +106,6 @@ $TRANSLATIONS = array( "Error loading dialog template: {error}" => "Chyba pri načítaní šablóny dialógu: {error}", "No tags selected for deletion." => "Nie sú vybraté štítky na zmazanie.", "Please reload the page." => "Obnovte prosím stránku.", -"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Aktualizácia nebola úspešná. Problém nahláste <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud comunite</a>.", "The update was successful. Redirecting you to ownCloud now." => "Aktualizácia bola úspešná. Presmerovávam vás na prihlasovaciu stránku.", "%s password reset" => "reset hesla %s", "A problem has occurred whilst sending the email, please contact your administrator." => "Vyskytol sa problém pri odosielaní emailu, prosím obráťte sa na správcu.", @@ -153,7 +152,6 @@ $TRANSLATIONS = array( "Storage & database" => "Úložislo & databáza", "Data folder" => "Priečinok dát", "Configure the database" => "Nastaviť databázu", -"will be used" => "bude použité", "Database user" => "Používateľ databázy", "Database password" => "Heslo databázy", "Database name" => "Meno databázy", @@ -178,7 +176,6 @@ $TRANSLATIONS = array( "This means only administrators can use the instance." => "Len správca systému môže používať túto inštanciu.", "Contact your system administrator if this message persists or appeared unexpectedly." => "Kontaktujte prosím správcu systému, ak sa táto správa objavuje opakovane alebo neočakávane.", "Thank you for your patience." => "Ďakujeme za Vašu trpezlivosť.", -"Updating ownCloud to version %s, this may take a while." => "Aktualizujem ownCloud na verziu %s, môže to chvíľu trvať.", "This ownCloud instance is currently being updated, which may take a while." => "Táto inštancia ownCloud sa práve aktualizuje, čo môže nejaký čas trvať.", "Please reload this page after a short time to continue using ownCloud." => "Prosím obnovte túto stránku a po krátkej dobe môžete pokračovať v používaní." ); diff --git a/core/l10n/sl.php b/core/l10n/sl.php index f7a634df07a..f0b09ca3a17 100644 --- a/core/l10n/sl.php +++ b/core/l10n/sl.php @@ -106,7 +106,6 @@ $TRANSLATIONS = array( "Error loading dialog template: {error}" => "Napaka nalaganja predloge pogovornega okna: {error}", "No tags selected for deletion." => "Ni izbranih oznak za izbris.", "Please reload the page." => "Stran je treba ponovno naložiti", -"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Posodobitev ni uspela. Pošljite poročilo o napaki na sistemu <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud</a>.", "The update was successful. Redirecting you to ownCloud now." => "Posodobitev je uspešno končana. Stran bo preusmerjena na oblak ownCloud.", "%s password reset" => "Ponastavitev gesla %s", "A problem has occurred whilst sending the email, please contact your administrator." => "Prišlo je do napake med pošiljanjem elektronskega sporočila. Stopite v stik s skrbnikom sistema.", @@ -153,7 +152,6 @@ $TRANSLATIONS = array( "Storage & database" => "Shramba in podatkovna zbirka", "Data folder" => "Podatkovna mapa", "Configure the database" => "Nastavi podatkovno zbirko", -"will be used" => "bo uporabljen", "Database user" => "Uporabnik podatkovne zbirke", "Database password" => "Geslo podatkovne zbirke", "Database name" => "Ime podatkovne zbirke", @@ -178,7 +176,6 @@ $TRANSLATIONS = array( "This means only administrators can use the instance." => "To pomeni, da lahko oblak uporabljajo le osebe s skrbniškimi dovoljenji.", "Contact your system administrator if this message persists or appeared unexpectedly." => "Stopite v stik s skrbnikom sistema, če se bo sporočilo še naprej nepričakovano prikazovalo.", "Thank you for your patience." => "Hvala za potrpežljivost!", -"Updating ownCloud to version %s, this may take a while." => "Posodabljanje sistema ownCloud na različico %s je lahko dolgotrajno.", "This ownCloud instance is currently being updated, which may take a while." => "Nastavitev oblaka ownCloud se trenutno posodablja. Opravilo je lahko dolgotrajno ...", "Please reload this page after a short time to continue using ownCloud." => "Ponovno naložite to stran po krajšem preteku časa in nadaljujte z uporabo oblaka ownCloud." ); diff --git a/core/l10n/sq.php b/core/l10n/sq.php index efe07d0791b..3fce8e9d84a 100644 --- a/core/l10n/sq.php +++ b/core/l10n/sq.php @@ -74,7 +74,6 @@ $TRANSLATIONS = array( "The object type is not specified." => "Nuk është specifikuar tipi i objektit.", "Delete" => "Elimino", "Add" => "Shto", -"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Azhurnimi dështoi. Ju lutemi njoftoni për këtë problem <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">komunitetin ownCloud</a>.", "The update was successful. Redirecting you to ownCloud now." => "Azhurnimi u krye. Tani do t'ju kaloj tek ownCloud-i.", "%s password reset" => "Kodi i %s -it u rivendos", "Use the following link to reset your password: {link}" => "Përdorni lidhjen në vijim për të rivendosur kodin: {link}", @@ -106,7 +105,6 @@ $TRANSLATIONS = array( "Password" => "Kodi", "Data folder" => "Emri i dosjes", "Configure the database" => "Konfiguro database-in", -"will be used" => "do të përdoret", "Database user" => "Përdoruesi i database-it", "Database password" => "Kodi i database-it", "Database name" => "Emri i database-it", @@ -121,7 +119,6 @@ $TRANSLATIONS = array( "Lost your password?" => "Ke humbur kodin?", "remember" => "kujto", "Log in" => "Hyrje", -"Alternative Logins" => "Hyrje alternative", -"Updating ownCloud to version %s, this may take a while." => "Po azhurnoj ownCloud-in me versionin %s. Mund të zgjasi pak." +"Alternative Logins" => "Hyrje alternative" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/core/l10n/sr.php b/core/l10n/sr.php index a597d671981..e41bd5ae717 100644 --- a/core/l10n/sr.php +++ b/core/l10n/sr.php @@ -90,7 +90,6 @@ $TRANSLATIONS = array( "Password" => "Лозинка", "Data folder" => "Фацикла података", "Configure the database" => "Подешавање базе", -"will be used" => "ће бити коришћен", "Database user" => "Корисник базе", "Database password" => "Лозинка базе", "Database name" => "Име базе", @@ -103,7 +102,6 @@ $TRANSLATIONS = array( "Please change your password to secure your account again." => "Промените лозинку да бисте обезбедили налог.", "Lost your password?" => "Изгубили сте лозинку?", "remember" => "упамти", -"Log in" => "Пријава", -"Updating ownCloud to version %s, this may take a while." => "Надоградња ownCloud-а на верзију %s, сачекајте тренутак." +"Log in" => "Пријава" ); $PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"; diff --git a/core/l10n/sr@latin.php b/core/l10n/sr@latin.php index 9b10179b722..40c37b5b079 100644 --- a/core/l10n/sr@latin.php +++ b/core/l10n/sr@latin.php @@ -68,7 +68,6 @@ $TRANSLATIONS = array( "The object type is not specified." => "Tip objekta nije zadan.", "Delete" => "Obriši", "Add" => "Dodaj", -"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Ažuriranje nije uspelo. Molimo obavestite <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud zajednicu</a>.", "The update was successful. Redirecting you to ownCloud now." => "Ažuriranje je uspelo. Prosleđivanje na ownCloud.", "Use the following link to reset your password: {link}" => "Koristite sledeći link za reset lozinke: {link}", "You will receive a link to reset your password via Email." => "Dobićete vezu za resetovanje lozinke putem e-pošte.", @@ -93,7 +92,6 @@ $TRANSLATIONS = array( "Password" => "Lozinka", "Data folder" => "Fascikla podataka", "Configure the database" => "Podešavanje baze", -"will be used" => "će biti korišćen", "Database user" => "Korisnik baze", "Database password" => "Lozinka baze", "Database name" => "Ime baze", diff --git a/core/l10n/sv.php b/core/l10n/sv.php index 3258d03caf3..d965a5618c0 100644 --- a/core/l10n/sv.php +++ b/core/l10n/sv.php @@ -5,6 +5,7 @@ $TRANSLATIONS = array( "Turned on maintenance mode" => "Aktiverade underhållsläge", "Turned off maintenance mode" => "Deaktiverade underhållsläge", "Updated database" => "Uppdaterade databasen", +"Disabled incompatible apps: %s" => "Inaktiverade inkompatibla appar: %s", "No image or file provided" => "Ingen bild eller fil har tillhandahållits", "Unknown filetype" => "Okänd filtyp", "Invalid image" => "Ogiltig bild", @@ -108,8 +109,9 @@ $TRANSLATIONS = array( "Edit tags" => "Editera taggar", "Error loading dialog template: {error}" => "Fel under laddning utav dialog mall: {fel}", "No tags selected for deletion." => "Inga taggar valda för borttagning.", +"Updating {productName} to version {version}, this may take a while." => "Uppdaterar {productName} till version {version}, detta kan ta en stund.", "Please reload the page." => "Vänligen ladda om sidan.", -"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 unsuccessful." => "Uppdateringen misslyckades.", "The update was successful. Redirecting you to ownCloud now." => "Uppdateringen lyckades. Du omdirigeras nu till OwnCloud.", "%s password reset" => "%s återställ lösenord", "A problem has occurred whilst sending the email, please contact your administrator." => "Ett problem har uppstått under tiden e-post sändes, vänligen kontakta din administratör.", @@ -156,7 +158,6 @@ $TRANSLATIONS = array( "Storage & database" => "Lagring & databas", "Data folder" => "Datamapp", "Configure the database" => "Konfigurera databasen", -"will be used" => "kommer att användas", "Database user" => "Databasanvändare", "Database password" => "Lösenord till databasen", "Database name" => "Databasnamn", @@ -181,7 +182,11 @@ $TRANSLATIONS = array( "This means only administrators can use the instance." => "Detta betyder att endast administartörer kan använda instansen.", "Contact your system administrator if this message persists or appeared unexpectedly." => "Hör av dig till din system administratör ifall detta meddelande fortsätter eller visas oväntat.", "Thank you for your patience." => "Tack för ditt tålamod.", -"Updating ownCloud to version %s, this may take a while." => "Uppdaterar ownCloud till version %s, detta kan ta en stund.", +"%s will be updated to version %s." => "%s kommer att uppdateras till version %s.", +"The following apps will be disabled:" => "Följande appar kommer att inaktiveras:", +"The theme %s has been disabled." => "Temat %s har blivit inaktiverat.", +"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." => "Vänligen säkerställ att en säkerhetskopia har gjorts av databasen, konfigurations- och datamappen innan du fortsätter.", +"Start update" => "Starta uppdateringen", "This ownCloud instance is currently being updated, which may take a while." => "Denna ownCloud instans håller på att uppdatera, vilket kan ta ett tag.", "Please reload this page after a short time to continue using ownCloud." => "Var god och ladda om denna sida efter en kort stund för att fortsätta använda ownCloud." ); diff --git a/core/l10n/ta_LK.php b/core/l10n/ta_LK.php index 53c8cb13333..2e0db9e973d 100644 --- a/core/l10n/ta_LK.php +++ b/core/l10n/ta_LK.php @@ -87,7 +87,6 @@ $TRANSLATIONS = array( "Password" => "கடவுச்சொல்", "Data folder" => "தரவு கோப்புறை", "Configure the database" => "தரவுத்தளத்தை தகவமைக்க", -"will be used" => "பயன்படுத்தப்படும்", "Database user" => "தரவுத்தள பயனாளர்", "Database password" => "தரவுத்தள கடவுச்சொல்", "Database name" => "தரவுத்தள பெயர்", diff --git a/core/l10n/th_TH.php b/core/l10n/th_TH.php index 314fa3e8655..7b7396b7ab2 100644 --- a/core/l10n/th_TH.php +++ b/core/l10n/th_TH.php @@ -72,7 +72,6 @@ $TRANSLATIONS = array( "The object type is not specified." => "ชนิดของวัตถุยังไม่ได้รับการระบุ", "Delete" => "ลบ", "Add" => "เพิ่ม", -"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "การอัพเดทไม่เป็นผลสำเร็จ กรุณาแจ้งปัญหาที่เกิดขึ้นไปยัง <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">คอมมูนิตี้ผู้ใช้งาน ownCloud</a>", "The update was successful. Redirecting you to ownCloud now." => "การอัพเดทเสร็จเรียบร้อยแล้ว กำลังเปลี่ยนเส้นทางไปที่ ownCloud อยู่ในขณะนี้", "Use the following link to reset your password: {link}" => "ใช้ลิงค์ต่อไปนี้เพื่อเปลี่ยนรหัสผ่านของคุณใหม่: {link}", "You will receive a link to reset your password via Email." => "คุณจะได้รับลิงค์เพื่อกำหนดรหัสผ่านใหม่ทางอีเมล์", @@ -95,7 +94,6 @@ $TRANSLATIONS = array( "Password" => "รหัสผ่าน", "Data folder" => "โฟลเดอร์เก็บข้อมูล", "Configure the database" => "กำหนดค่าฐานข้อมูล", -"will be used" => "จะถูกใช้", "Database user" => "ชื่อผู้ใช้งานฐานข้อมูล", "Database password" => "รหัสผ่านฐานข้อมูล", "Database name" => "ชื่อฐานข้อมูล", @@ -108,7 +106,6 @@ $TRANSLATIONS = array( "Please change your password to secure your account again." => "กรุณาเปลี่ยนรหัสผ่านของคุณอีกครั้ง เพื่อป้องกันบัญชีของคุณให้ปลอดภัย", "Lost your password?" => "ลืมรหัสผ่าน?", "remember" => "จำรหัสผ่าน", -"Log in" => "เข้าสู่ระบบ", -"Updating ownCloud to version %s, this may take a while." => "กำลังอัพเดท ownCloud ไปเป็นรุ่น %s, กรุณารอสักครู่" +"Log in" => "เข้าสู่ระบบ" ); $PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/core/l10n/tr.php b/core/l10n/tr.php index 80b60ddaca8..c13420e87c0 100644 --- a/core/l10n/tr.php +++ b/core/l10n/tr.php @@ -5,6 +5,7 @@ $TRANSLATIONS = array( "Turned on maintenance mode" => "Bakım kipi etkinleştirildi", "Turned off maintenance mode" => "Bakım kipi kapatıldı", "Updated database" => "Veritabanı güncellendi", +"Disabled incompatible apps: %s" => "Uyumsuz uygulamalar devre dışı bırakıldı: %s", "No image or file provided" => "Resim veya dosya belirtilmedi", "Unknown filetype" => "Bilinmeyen dosya türü", "Invalid image" => "Geçersiz resim", @@ -108,8 +109,9 @@ $TRANSLATIONS = array( "Edit tags" => "Etiketleri düzenle", "Error loading dialog template: {error}" => "İletişim şablonu yüklenirken hata: {error}", "No tags selected for deletion." => "Silmek için bir etiket seçilmedi.", +"Updating {productName} to version {version}, this may take a while." => "{productName}, {version} sürümüne güncelleniyor, bu biraz zaman alabilir.", "Please reload the page." => "Lütfen sayfayı yeniden yükleyin.", -"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Güncelleme başarısız oldu. Lütfen bu hatayı <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud topluluğu</a>na bildirin.", +"The update was unsuccessful." => "Güncelleme başarısız oldu.", "The update was successful. Redirecting you to ownCloud now." => "Güncelleme başarılı. Şimdi ownCloud'a yönlendiriliyorsunuz.", "%s password reset" => "%s parola sıfırlama", "A problem has occurred whilst sending the email, please contact your administrator." => "E-posta gönderilirken bir hata oluştu. Lütfen yöneticinizle iletişime geçin.", @@ -156,7 +158,6 @@ $TRANSLATIONS = array( "Storage & database" => "Depolama ve veritabanı", "Data folder" => "Veri klasörü", "Configure the database" => "Veritabanını yapılandır", -"will be used" => "kullanılacak", "Database user" => "Veritabanı kullanıcı adı", "Database password" => "Veritabanı parolası", "Database name" => "Veritabanı adı", @@ -181,7 +182,11 @@ $TRANSLATIONS = array( "This means only administrators can use the instance." => "Bu, örneği sadece yöneticiler kullanabilir demektir.", "Contact your system administrator if this message persists or appeared unexpectedly." => "Eğer bu ileti görünmeye devam ederse veya beklenmedik şekilde ortaya çıkmışsa sistem yöneticinizle iletişime geçin.", "Thank you for your patience." => "Sabrınız için teşekkür ederiz.", -"Updating ownCloud to version %s, this may take a while." => "ownCloud %s sürümüne güncelleniyor. Biraz zaman alabilir.", +"%s will be updated to version %s." => "%s, %s sürümüne güncellenecek.", +"The following apps will be disabled:" => "Aşağıdaki uygulamalar devre dışı bırakılacak:", +"The theme %s has been disabled." => "%s teması devre dışı bırakıldı.", +"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." => "Devam etmeden önce lütfen veritabanının, config ve data klasörlerinin yedeklenmiş olduğundan emin olun.", +"Start update" => "Güncellemeyi başlat", "This ownCloud instance is currently being updated, which may take a while." => "Bu ownCloud örneği şu anda güncelleniyor, bu biraz zaman alabilir.", "Please reload this page after a short time to continue using ownCloud." => "ownCloud kullanmaya devam etmek için kısa bir süre sonra lütfen sayfayı yenileyin." ); diff --git a/core/l10n/uk.php b/core/l10n/uk.php index 95de28ce0cc..d3017f35a2d 100644 --- a/core/l10n/uk.php +++ b/core/l10n/uk.php @@ -104,7 +104,6 @@ $TRANSLATIONS = array( "Error loading dialog template: {error}" => "Помилка при завантаженні шаблону діалогу: {error}", "No tags selected for deletion." => "Жодних тегів не обрано для видалення.", "Please reload the page." => "Будь ласка, перезавантажте сторінку.", -"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Оновлення виконалось неуспішно. Будь ласка, повідомте про цю проблему в <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">спільноті ownCloud</a>.", "The update was successful. Redirecting you to ownCloud now." => "Оновлення виконалось успішно. Перенаправляємо вас на ownCloud.", "%s password reset" => "%s пароль скинуто", "Use the following link to reset your password: {link}" => "Використовуйте наступне посилання для скидання пароля: {link}", @@ -148,7 +147,6 @@ $TRANSLATIONS = array( "Password" => "Пароль", "Data folder" => "Каталог даних", "Configure the database" => "Налаштування бази даних", -"will be used" => "буде використано", "Database user" => "Користувач бази даних", "Database password" => "Пароль для бази даних", "Database name" => "Назва бази даних", @@ -172,7 +170,6 @@ $TRANSLATIONS = array( "This means only administrators can use the instance." => "Це означає, що лише адміністратори можуть використовувати цей екземпляр.", "Contact your system administrator if this message persists or appeared unexpectedly." => "Зверніться до системного адміністратора, якщо це повідомлення зберігається або з'являєтья несподівано.", "Thank you for your patience." => "Дякуємо за ваше терпіння.", -"Updating ownCloud to version %s, this may take a while." => "Оновлення ownCloud до версії %s, це може зайняти деякий час.", "This ownCloud instance is currently being updated, which may take a while." => "Цей ownCloud зараз оновлюється, це може тривати певний час.", "Please reload this page after a short time to continue using ownCloud." => "Будь ласка, перезавантажте незабаром цю сторінку, щоб продовжити користуватися OwnCloud." ); diff --git a/core/l10n/ur_PK.php b/core/l10n/ur_PK.php index 50a0e14c684..25b80daf777 100644 --- a/core/l10n/ur_PK.php +++ b/core/l10n/ur_PK.php @@ -7,6 +7,7 @@ $TRANSLATIONS = array( "No image or file provided" => "کوئی تصویر یا فائل فراہم نہیں", "Unknown filetype" => "غیر معرروف قسم کی فائل", "Invalid image" => "غلط تصویر", +"No crop data provided" => "کوئی کروپ ڈیٹا ميسر نہیں ", "Sunday" => "اتوار", "Monday" => "سوموار", "Tuesday" => "منگل", @@ -29,7 +30,7 @@ $TRANSLATIONS = array( "Settings" => "ترتیبات", "Saving..." => "محفوظ ھو رہا ہے ...", "seconds ago" => "سیکنڈز پہلے", -"_%n minute ago_::_%n minutes ago_" => array("",""), +"_%n minute ago_::_%n minutes ago_" => array("%n منٹس پہلے","%n منٹس پہلے"), "_%n hour ago_::_%n hours ago_" => array("",""), "today" => "آج", "yesterday" => "کل", @@ -42,9 +43,11 @@ $TRANSLATIONS = array( "No" => "نہیں", "Choose" => "منتخب کریں", "Ok" => "اوکے", -"_{count} file conflict_::_{count} file conflicts_" => array("",""), +"_{count} file conflict_::_{count} file conflicts_" => array("{گنتی} فائل متصادم ","{گنتی} فائل متصادم "), +"One file conflict" => "اایک فائل متصادم ہے", "New Files" => "جدید فائلیں", "Already existing files" => "پہلے سے موجودجدید فائلیں", +"Which files do you want to keep?" => "آپ کون سی فائلیں رکھنا چاہتے ہیں ؟", "Cancel" => "منسوخ کریں", "Continue" => "جاری", "(all selected)" => "(سب منتخب شدہ)", @@ -97,10 +100,10 @@ $TRANSLATIONS = array( "Add" => "شامل کریں", "Edit tags" => "ترمیم ٹیگز", "Please reload the page." => "براہ مہربانی صفحہ دوبارہ لوڈ کریں.", -"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "اپ ڈیٹ نا کامیاب تھی۔ براہ مہربانی اس مسلے کو رپورٹ کریں اس پے <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>. ", "The update was successful. Redirecting you to ownCloud now." => "اپ ڈیٹ کامیاب تھی۔ اپ کو اون کلوڈ سے منسلک کیا جا رہا ہے", "A problem has occurred whilst sending the email, please contact your administrator." => "ای میل بھیجنے کے دوران ایک مسئلہ پیش آیا ہے , براہ مہربانی اپنےایڈمنسٹریٹر سے رابطہ کریں.", "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" => "یوزر نیم", @@ -120,14 +123,15 @@ $TRANSLATIONS = array( "Cheers!" => "واہ!", "Security Warning" => "حفاظتی انتباہ", "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "آپ کا پی ایچ پی ورین نل بائٹ کے حملے کے خطرے سے دوچار ہے (CVE-2006-7243)", +"Please update your PHP installation to use %s securely." => " براہ مہربانی %s کو بحفاظت استعمال کرنے کے پی ایچ پی کی تنصیب اپڈیٹ کریں", "No secure random number generator is available, please enable the 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. فائل کام نہیں کرتا ہے", "Create an <strong>admin account</strong>" => "ایک<strong> ایڈمن اکاؤنٹ</strong> بنائیں", "Password" => "پاسورڈ", "Storage & database" => "ذخیرہ اور ڈیٹا بیس", "Data folder" => "ڈیٹا فولڈر", "Configure the database" => "ڈیٹا بیس کونفگر کریں", -"will be used" => "استعمال ہو گا", "Database user" => "ڈیٹابیس یوزر", "Database password" => "ڈیٹابیس پاسورڈ", "Database name" => "ڈیٹابیس کا نام", @@ -144,7 +148,6 @@ $TRANSLATIONS = array( "remember" => "یاد رکھیں", "Log in" => "لاگ ان", "Alternative Logins" => "متبادل لاگ ان ", -"Thank you for your patience." => "آپ کے صبر کا شکریہ", -"Updating ownCloud to version %s, this may take a while." => "اون کلوڈ اپ ڈیٹ ہو رہا ہے ورژن %s میں, یہ تھوڑی دیر لےگا" +"Thank you for your patience." => "آپ کے صبر کا شکریہ" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/core/l10n/vi.php b/core/l10n/vi.php index 07ac648c91b..7aca8549fad 100644 --- a/core/l10n/vi.php +++ b/core/l10n/vi.php @@ -99,7 +99,6 @@ $TRANSLATIONS = array( "Error loading dialog template: {error}" => "Lỗi khi tải mẫu hội thoại: {error}", "No tags selected for deletion." => "Không có thẻ nào được chọn để xóa", "Please reload the page." => "Vui lòng tải lại trang.", -"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Cập nhật không thành công . Vui lòng thông báo đến <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\"> Cộng đồng ownCloud </a>.", "The update was successful. Redirecting you to ownCloud now." => "Cập nhật thành công .Hệ thống sẽ đưa bạn tới ownCloud.", "%s password reset" => "%s thiết lập lại mật khẩu", "Use the following link to reset your password: {link}" => "Dùng đường dẫn sau để khôi phục lại mật khẩu : {link}", @@ -140,7 +139,6 @@ $TRANSLATIONS = array( "Password" => "Mật khẩu", "Data folder" => "Thư mục dữ liệu", "Configure the database" => "Cấu hình cơ sở dữ liệu", -"will be used" => "được sử dụng", "Database user" => "Người dùng cơ sở dữ liệu", "Database password" => "Mật khẩu cơ sở dữ liệu", "Database name" => "Tên cơ sở dữ liệu", @@ -164,7 +162,6 @@ $TRANSLATIONS = array( "This means only administrators can use the instance." => "Điều này có nghĩa chỉ có người quản trị có thể sử dụng trong trường hợp này.", "Contact your system administrator if this message persists or appeared unexpectedly." => "Liên hệ với người quản trị nếu lỗi này vẫn tồn tại hoặc xuất hiện bất ngờ.", "Thank you for your patience." => "Cảm ơn sự kiên nhẫn của bạn.", -"Updating ownCloud to version %s, this may take a while." => "Cập nhật ownCloud lên phiên bản %s, có thể sẽ mất thời gian", "This ownCloud instance is currently being updated, which may take a while." => "Phiên bản ownCloud này hiện đang được cập nhật, có thể sẽ mất một ít thời gian.", "Please reload this page after a short time to continue using ownCloud." => "Xin vui lòng tải lại trang này để tiếp tục sử dụng ownCloud." ); diff --git a/core/l10n/zh_CN.php b/core/l10n/zh_CN.php index 46510f5a1a4..d30dc0f0fbd 100644 --- a/core/l10n/zh_CN.php +++ b/core/l10n/zh_CN.php @@ -73,7 +73,10 @@ $TRANSLATIONS = array( "Shared with you by {owner}" => "{owner} 与您共享", "Share with user or group …" => "分享给其他用户或组 ...", "Share link" => "分享链接", +"The public link will expire no later than {days} days after it is created" => "这个共享链接将在创建后 {days} 天失效", +"By default the public link will expire after {days} days" => "默认共享链接失效天数为 {days} ", "Password protect" => "密码保护", +"Choose a password for the public link" => "为共享链接设置密码", "Allow Public Upload" => "允许公开上传", "Email link to person" => "发送链接到个人", "Send" => "发送", @@ -106,7 +109,6 @@ $TRANSLATIONS = array( "Error loading dialog template: {error}" => "加载对话框模板出错: {error}", "No tags selected for deletion." => "请选择要删除的标签。", "Please reload the page." => "请重新加载页面。", -"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "更新不成功。请汇报将此问题汇报给 <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud 社区</a>。", "The update was successful. Redirecting you to ownCloud now." => "更新成功。正在重定向至 ownCloud。", "%s password reset" => "重置 %s 的密码", "A problem has occurred whilst sending the email, please contact your administrator." => "发送电子邮件时发生问题，请和管理员联系。", @@ -153,7 +155,6 @@ $TRANSLATIONS = array( "Storage & database" => "存储 & 数据库", "Data folder" => "数据目录", "Configure the database" => "配置数据库", -"will be used" => "将被使用", "Database user" => "数据库用户", "Database password" => "数据库密码", "Database name" => "数据库名", @@ -178,7 +179,6 @@ $TRANSLATIONS = array( "This means only administrators can use the instance." => "这意味着只有管理员才能在实例上操作。", "Contact your system administrator if this message persists or appeared unexpectedly." => "如果这个消息一直存在或不停出现，请联系你的系统管理员。", "Thank you for your patience." => "感谢让你久等了。", -"Updating ownCloud to version %s, this may take a while." => "更新 ownCloud 到版本 %s，这可能需要一些时间。", "This ownCloud instance is currently being updated, which may take a while." => "当前ownCloud实例正在更新，可能需要一段时间。", "Please reload this page after a short time to continue using ownCloud." => "请稍后重新加载这个页面，以继续使用ownCloud。" ); diff --git a/core/l10n/zh_HK.php b/core/l10n/zh_HK.php index 57653c1fab2..8b210e68851 100644 --- a/core/l10n/zh_HK.php +++ b/core/l10n/zh_HK.php @@ -73,7 +73,6 @@ $TRANSLATIONS = array( "Create an <strong>admin account</strong>" => "建立管理員帳戶", "Password" => "密碼", "Configure the database" => "設定資料庫", -"will be used" => "將被使用", "Database user" => "資料庫帳戶", "Database password" => "資料庫密碼", "Database name" => "資料庫名稱", @@ -83,7 +82,6 @@ $TRANSLATIONS = array( "Please change your password to secure your account again." => "請更改你的密碼以保護你的帳戶", "Lost your password?" => "忘記密碼", "remember" => "記住", -"Log in" => "登入", -"Updating ownCloud to version %s, this may take a while." => "ownCloud (ver. %s)更新中, 請耐心等侯" +"Log in" => "登入" ); $PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/core/l10n/zh_TW.php b/core/l10n/zh_TW.php index dffb890f137..38503f2a09c 100644 --- a/core/l10n/zh_TW.php +++ b/core/l10n/zh_TW.php @@ -103,7 +103,6 @@ $TRANSLATIONS = array( "Edit tags" => "編輯標籤", "Error loading dialog template: {error}" => "載入對話樣板出錯：{error}", "No tags selected for deletion." => "沒有選擇要刪除的標籤", -"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "升級失敗，請將此問題回報 <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud 社群</a>。", "The update was successful. Redirecting you to ownCloud now." => "升級成功，正將您重新導向至 ownCloud 。", "%s password reset" => "%s 密碼重設", "Use the following link to reset your password: {link}" => "請至以下連結重設您的密碼： {link}", @@ -144,7 +143,6 @@ $TRANSLATIONS = array( "Password" => "密碼", "Data folder" => "資料儲存位置", "Configure the database" => "設定資料庫", -"will be used" => "將會使用", "Database user" => "資料庫使用者", "Database password" => "資料庫密碼", "Database name" => "資料庫名稱", @@ -165,7 +163,6 @@ $TRANSLATIONS = array( "Alternative Logins" => "其他登入方法", "Contact your system administrator if this message persists or appeared unexpectedly." => "若這個訊息持續出現，請聯絡系統管理員", "Thank you for your patience." => "感謝您的耐心", -"Updating ownCloud to version %s, this may take a while." => "正在將 ownCloud 升級至版本 %s ，這可能需要一點時間。", "This ownCloud instance is currently being updated, which may take a while." => "ownCloud 正在升級，請稍待一會。", "Please reload this page after a short time to continue using ownCloud." => "請稍後重新載入這個頁面就可以繼續使用 ownCloud" ); diff --git a/core/lostpassword/css/lostpassword.css b/core/lostpassword/css/lostpassword.css index 85cce9f9407..b7f7023648d 100644 --- a/core/lostpassword/css/lostpassword.css +++ b/core/lostpassword/css/lostpassword.css @@ -1,11 +1,6 @@ #body-login -input[type="text"], -input[type="submit"] { - margin: 5px 0; -} - input[type="text"]#user{ - padding-right: 12px; + padding-right: 20px; padding-left: 41px; } diff --git a/core/lostpassword/templates/lostpassword.php b/core/lostpassword/templates/lostpassword.php index 83a23f7b239..fdfa32344ec 100644 --- a/core/lostpassword/templates/lostpassword.php +++ b/core/lostpassword/templates/lostpassword.php @@ -16,15 +16,17 @@ OCP\Util::addStyle('lostpassword', 'lostpassword'); </p></div> <?php endif; ?> <div class="update"><?php print_unescaped($l->t('You will receive a link to reset your password via Email.')); ?></div> - <p class="infield"> - <input type="text" name="user" id="user" placeholder="" value="" autocomplete="off" required autofocus /> + <p> + <input type="text" name="user" id="user" + placeholder="<?php print_unescaped($l->t( 'Username' )); ?>" + value="" autocomplete="off" required autofocus /> <label for="user" class="infield"><?php print_unescaped($l->t( 'Username' )); ?></label> <img class="svg" src="<?php print_unescaped(image_path('', 'actions/user.svg')); ?>" alt=""/> <?php if ($_['isEncrypted']): ?> - <br /><br /> - <?php print_unescaped($l->t("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?")); ?><br /> + <br /> + <p class="warning"><?php print_unescaped($l->t("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?")); ?><br /> <input type="checkbox" name="continue" value="Yes" /> - <?php print_unescaped($l->t('Yes, I really want to reset my password now')); ?><br/><br/> + <?php print_unescaped($l->t('Yes, I really want to reset my password now')); ?></p> <?php endif; ?> </p> <input type="submit" id="submit" value="<?php print_unescaped($l->t('Reset')); ?>" /> diff --git a/core/lostpassword/templates/resetpassword.php b/core/lostpassword/templates/resetpassword.php index 881455f5a9d..11dce9f112b 100644 --- a/core/lostpassword/templates/resetpassword.php +++ b/core/lostpassword/templates/resetpassword.php @@ -4,9 +4,11 @@ <h1><?php p($l->t('Your password was reset')); ?></h1> <p><a href="<?php print_unescaped(OC_Helper::linkTo('', 'index.php')) ?>/"><?php p($l->t('To login page')); ?></a></p> <?php else: ?> - <p class="infield"> + <p> <label for="password" class="infield"><?php p($l->t('New password')); ?></label> - <input type="password" name="password" id="password" value="" required /> + <input type="password" name="password" id="password" + placeholder="<?php p($l->t('New password')); ?>" + value="" required /> </p> <input type="submit" id="submit" value="<?php p($l->t('Reset password')); ?>" /> <?php endif; ?> diff --git a/core/register_command.php b/core/register_command.php index f1361c859fc..9ced377bee3 100644 --- a/core/register_command.php +++ b/core/register_command.php @@ -12,8 +12,11 @@ $application->add(new OC\Core\Command\Db\GenerateChangeScript()); $application->add(new OC\Core\Command\Db\ConvertType(OC_Config::getObject(), new \OC\DB\ConnectionFactory())); $application->add(new OC\Core\Command\Upgrade()); $application->add(new OC\Core\Command\Maintenance\SingleUser()); +$application->add(new OC\Core\Command\Maintenance\Mode(OC_Config::getObject())); $application->add(new OC\Core\Command\App\Disable()); $application->add(new OC\Core\Command\App\Enable()); $application->add(new OC\Core\Command\App\ListApps()); $application->add(new OC\Core\Command\Maintenance\Repair(new \OC\Repair())); $application->add(new OC\Core\Command\User\Report()); +$application->add(new OC\Core\Command\User\ResetPassword(\OC::$server->getUserManager())); +$application->add(new OC\Core\Command\User\LastSeen()); diff --git a/core/templates/installation.php b/core/templates/installation.php index 709207e7977..f934e3a86c2 100644 --- a/core/templates/installation.php +++ b/core/templates/installation.php @@ -46,15 +46,17 @@ <?php endif; ?> <fieldset id="adminaccount"> <legend><?php print_unescaped($l->t( 'Create an <strong>admin account</strong>' )); ?></legend> - <p class="infield grouptop"> - <input type="text" name="adminlogin" id="adminlogin" placeholder="" + <p class="grouptop"> + <input type="text" name="adminlogin" id="adminlogin" + placeholder="<?php p($l->t( 'Username' )); ?>" value="<?php p($_['adminlogin']); ?>" autocomplete="off" autocapitalize="off" autocorrect="off" autofocus required /> <label for="adminlogin" class="infield"><?php p($l->t( 'Username' )); ?></label> <img class="svg" src="<?php p(image_path('', 'actions/user.svg')); ?>" alt="" /> </p> - <p class="infield groupbottom"> - <input type="password" name="adminpass" data-typetoggle="#show" id="adminpass" placeholder="" + <p class="groupbottom"> + <input type="password" name="adminpass" data-typetoggle="#show" id="adminpass" + placeholder="<?php p($l->t( 'Password' )); ?>" value="<?php p($_['adminpass']); ?>" autocomplete="off" autocapitalize="off" autocorrect="off" required /> <label for="adminpass" class="infield"><?php p($l->t( 'Password' )); ?></label> @@ -91,7 +93,7 @@ <div id="selectDbType"> <?php foreach($_['databases'] as $type => $label): ?> <?php if(count($_['databases']) === 1): ?> - <p class="info"><?php p($label . ' ' . $l->t( 'will be used' )); ?>.</p> + <p class="info"><?php p($l->t( 'Only %s is available.', array($label) )); ?>.</p> <input type="hidden" id="dbtype" name="dbtype" value="<?php p($type) ?>" /> <?php else: ?> <input type="radio" name="dbtype" value="<?php p($type) ?>" id="<?php p($type) ?>" @@ -105,40 +107,45 @@ <?php if($hasOtherDB): ?> <fieldset id='databaseField'> <div id="use_other_db"> - <p class="infield grouptop"> + <p class="grouptop"> <label for="dbuser" class="infield"><?php p($l->t( 'Database user' )); ?></label> - <input type="text" name="dbuser" id="dbuser" placeholder="" + <input type="text" name="dbuser" id="dbuser" + placeholder="<?php p($l->t( 'Database user' )); ?>" value="<?php p($_['dbuser']); ?>" autocomplete="off" autocapitalize="off" autocorrect="off" /> </p> - <p class="infield groupmiddle"> - <input type="password" name="dbpass" id="dbpass" placeholder="" data-typetoggle="#dbpassword" + <p class="groupmiddle"> + <input type="password" name="dbpass" id="dbpass" data-typetoggle="#dbpassword" + placeholder="<?php p($l->t( 'Database password' )); ?>" value="<?php p($_['dbpass']); ?>" autocomplete="off" autocapitalize="off" autocorrect="off" /> <label for="dbpass" class="infield"><?php p($l->t( 'Database password' )); ?></label> <input type="checkbox" id="dbpassword" name="dbpassword" /> <label for="dbpassword"></label> </p> - <p class="infield groupmiddle"> + <p class="groupmiddle"> <label for="dbname" class="infield"><?php p($l->t( 'Database name' )); ?></label> - <input type="text" name="dbname" id="dbname" placeholder="" + <input type="text" name="dbname" id="dbname" + placeholder="<?php p($l->t( 'Database name' )); ?>" value="<?php p($_['dbname']); ?>" autocomplete="off" autocapitalize="off" autocorrect="off" pattern="[0-9a-zA-Z$_-]+" /> </p> <?php if($_['hasOracle']): ?> <div id="use_oracle_db"> - <p class="infield groupmiddle"> + <p class="groupmiddle"> <label for="dbtablespace" class="infield"><?php p($l->t( 'Database tablespace' )); ?></label> - <input type="text" name="dbtablespace" id="dbtablespace" placeholder="" + <input type="text" name="dbtablespace" id="dbtablespace" + placeholder="<?php p($l->t( 'Database tablespace' )); ?>" value="<?php p($_['dbtablespace']); ?>" autocomplete="off" autocapitalize="off" autocorrect="off" /> </p> </div> <?php endif; ?> - <p class="infield groupbottom"> + <p class="groupbottom"> <label for="dbhost" class="infield"><?php p($l->t( 'Database host' )); ?></label> - <input type="text" name="dbhost" id="dbhost" placeholder="" + <input type="text" name="dbhost" id="dbhost" + placeholder="<?php p($l->t( 'Database host' )); ?>" value="<?php p($_['dbhost']); ?>" autocomplete="off" autocapitalize="off" autocorrect="off" /> </p> @@ -147,5 +154,7 @@ <?php endif; ?> <?php endif; ?> + <p id="sqliteInformation" class="info"><?php p($l->t('SQLite will be used as database. For larger installations we recommend to change this.'));?></p> + <div class="buttons"><input type="submit" class="primary" value="<?php p($l->t( 'Finish setup' )); ?>" data-finishing="<?php p($l->t( 'Finishing …' )); ?>" /></div> </form> diff --git a/core/templates/layout.base.php b/core/templates/layout.base.php index c519388fa3b..b99f603fe0b 100644 --- a/core/templates/layout.base.php +++ b/core/templates/layout.base.php @@ -1,10 +1,10 @@ <!DOCTYPE html> -<!--[if lt IE 7]><html class="ng-csp ie ie6 lte9 lte8 lte7"><![endif]--> -<!--[if IE 7]><html class="ng-csp ie ie7 lte9 lte8 lte7"><![endif]--> -<!--[if IE 8]><html class="ng-csp ie ie8 lte9 lte8"><![endif]--> -<!--[if IE 9]><html class="ng-csp ie ie9 lte9"><![endif]--> -<!--[if gt IE 9]><html class="ng-csp ie"><![endif]--> -<!--[if !IE]><!--><html class="ng-csp"><!--<![endif]--> +<!--[if lt IE 7]><html class="ng-csp ie ie6 lte9 lte8 lte7" data-placeholder-focus="false"><![endif]--> +<!--[if IE 7]><html class="ng-csp ie ie7 lte9 lte8 lte7" data-placeholder-focus="false"><![endif]--> +<!--[if IE 8]><html class="ng-csp ie ie8 lte9 lte8" data-placeholder-focus="false"><![endif]--> +<!--[if IE 9]><html class="ng-csp ie ie9 lte9" data-placeholder-focus="false"><![endif]--> +<!--[if gt IE 9]><html class="ng-csp ie" data-placeholder-focus="false"><![endif]--> +<!--[if !IE]><!--><html class="ng-csp" data-placeholder-focus="false"><!--<![endif]--> <head> <title> diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php index d38dc24d9ce..c4b69a950a0 100644 --- a/core/templates/layout.guest.php +++ b/core/templates/layout.guest.php @@ -1,10 +1,10 @@ <!DOCTYPE html> -<!--[if lt IE 7]><html class="ng-csp ie ie6 lte9 lte8 lte7"><![endif]--> -<!--[if IE 7]><html class="ng-csp ie ie7 lte9 lte8 lte7"><![endif]--> -<!--[if IE 8]><html class="ng-csp ie ie8 lte9 lte8"><![endif]--> -<!--[if IE 9]><html class="ng-csp ie ie9 lte9"><![endif]--> -<!--[if gt IE 9]><html class="ng-csp ie"><![endif]--> -<!--[if !IE]><!--><html class="ng-csp"><!--<![endif]--> +<!--[if lt IE 7]><html class="ng-csp ie ie6 lte9 lte8 lte7" data-placeholder-focus="false"><![endif]--> +<!--[if IE 7]><html class="ng-csp ie ie7 lte9 lte8 lte7" data-placeholder-focus="false"><![endif]--> +<!--[if IE 8]><html class="ng-csp ie ie8 lte9 lte8" data-placeholder-focus="false"><![endif]--> +<!--[if IE 9]><html class="ng-csp ie ie9 lte9" data-placeholder-focus="false"><![endif]--> +<!--[if gt IE 9]><html class="ng-csp ie" data-placeholder-focus="false"><![endif]--> +<!--[if !IE]><!--><html class="ng-csp" data-placeholder-focus="false"><!--<![endif]--> <head data-requesttoken="<?php p($_['requesttoken']); ?>"> <title> diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index b0ae8637acc..d551c53521b 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -1,10 +1,10 @@ <!DOCTYPE html> -<!--[if lt IE 7]><html class="ng-csp ie ie6 lte9 lte8 lte7"><![endif]--> -<!--[if IE 7]><html class="ng-csp ie ie7 lte9 lte8 lte7"><![endif]--> -<!--[if IE 8]><html class="ng-csp ie ie8 lte9 lte8"><![endif]--> -<!--[if IE 9]><html class="ng-csp ie ie9 lte9"><![endif]--> -<!--[if gt IE 9]><html class="ng-csp ie"><![endif]--> -<!--[if !IE]><!--><html class="ng-csp"><!--<![endif]--> +<!--[if lt IE 7]><html class="ng-csp ie ie6 lte9 lte8 lte7" data-placeholder-focus="false"><![endif]--> +<!--[if IE 7]><html class="ng-csp ie ie7 lte9 lte8 lte7" data-placeholder-focus="false"><![endif]--> +<!--[if IE 8]><html class="ng-csp ie ie8 lte9 lte8" data-placeholder-focus="false"><![endif]--> +<!--[if IE 9]><html class="ng-csp ie ie9 lte9" data-placeholder-focus="false"><![endif]--> +<!--[if gt IE 9]><html class="ng-csp ie" data-placeholder-focus="false"><![endif]--> +<!--[if !IE]><!--><html class="ng-csp" data-placeholder-focus="false"><!--<![endif]--> <head data-user="<?php p($_['user_uid']); ?>" data-requesttoken="<?php p($_['requesttoken']); ?>"> <title> diff --git a/core/templates/login.php b/core/templates/login.php index 669d20b32e4..6af3d769690 100644 --- a/core/templates/login.php +++ b/core/templates/login.php @@ -1,3 +1,5 @@ +<?php /** @var $l OC_L10N */ ?> + <!--[if IE 8]><style>input[type="checkbox"]{padding:0;}</style><![endif]--> <form method="post" name="login"> <fieldset> @@ -24,19 +26,21 @@ <!-- the following div ensures that the spinner is always inside the #message div --> <div style="clear: both;"></div> </p> - <p class="infield grouptop"> - <input type="text" name="user" id="user" placeholder="" - value="<?php p($_['username']); ?>" - <?php p($_['user_autofocus'] ? 'autofocus' : ''); ?> - autocomplete="on" autocapitalize="off" autocorrect="off" required /> + <p class="grouptop"> + <input type="text" name="user" id="user" + placeholder="<?php p($l->t('Username')); ?>" + value="<?php p($_['username']); ?>" + <?php p($_['user_autofocus'] ? 'autofocus' : ''); ?> + autocomplete="on" autocapitalize="off" autocorrect="off" required /> <label for="user" class="infield"><?php p($l->t('Username')); ?></label> <img class="svg" src="<?php print_unescaped(image_path('', 'actions/user.svg')); ?>" alt=""/> </p> - <p class="infield groupbottom"> - <input type="password" name="password" id="password" value="" placeholder="" - <?php p($_['user_autofocus'] ? '' : 'autofocus'); ?> - autocomplete="on" autocapitalize="off" autocorrect="off" required /> + <p class="groupbottom"> + <input type="password" name="password" id="password" value="" + placeholder="<?php p($l->t('Password')); ?>" + <?php p($_['user_autofocus'] ? '' : 'autofocus'); ?> + autocomplete="on" autocapitalize="off" autocorrect="off" required /> <label for="password" class="infield"><?php p($l->t('Password')); ?></label> <img class="svg" id="password-icon" src="<?php print_unescaped(image_path('', 'actions/password.svg')); ?>" alt=""/> </p> @@ -51,6 +55,7 @@ <label for="remember_login"><?php p($l->t('remember')); ?></label> <?php endif; ?> <input type="hidden" name="timezone-offset" id="timezone-offset"/> + <input type="hidden" name="requesttoken" value="<?php p($_['requesttoken']) ?>" /> <input type="submit" id="submit" class="login primary" value="<?php p($l->t('Log in')); ?>" disabled="disabled"/> </fieldset> </form> diff --git a/core/templates/update.admin.php b/core/templates/update.admin.php index a652d5f195a..a09e2d07bf4 100644 --- a/core/templates/update.admin.php +++ b/core/templates/update.admin.php @@ -1,6 +1,27 @@ -<ul> - <li class='update'> - <?php p($l->t('Updating ownCloud to version %s, this may take a while.', - array($_['version']))); ?><br /><br /> - </li> -</ul> +<div class="update"> + <div class="updateOverview"> + <h2 class="title bold"><?php p($l->t('%s will be updated to version %s.', + array($_['productName'], $_['version']))); ?></h2> + <?php if (!empty($_['appList'])) { ?> + <div class="infogroup"> + <span class="bold"><?php p($l->t('The following apps will be disabled:')) ?></span> + <ul class="content appList"> + <?php foreach ($_['appList'] as $appInfo) { ?> + <li><?php p($appInfo['name']) ?> (<?php p($appInfo['id']) ?>)</li> + <?php } ?> + </ul> + </div> + <?php } ?> + <?php if (!empty($_['oldTheme'])) { ?> + <div class="infogroup bold"> + <?php p($l->t('The theme %s has been disabled.', array($_['oldTheme']))) ?> + </div> + <?php } ?> + <div class="infogroup bold"> + <?php p($l->t('Please make sure that the database, the config folder and the data folder have been backed up before proceeding.')) ?> + </div> + <input class="updateButton" type="button" value="<?php p($l->t('Start update')) ?>"> + </div> + + <div class="updateProgress hidden"></div> +</div> |
