diff --git a/.gitignore b/.gitignore
index 724f2460b04fc743547b3e90798510b593399be6..be69107ca1fa8ea5e412651aee8005b35eb4aa90 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,7 +6,7 @@
/apps/inc.php
# ignore all apps except core ones
-/apps*
+/apps*/*
!/apps/files
!/apps/files_encryption
!/apps/files_external
diff --git a/3rdparty b/3rdparty
index dc87ea630287f27502eba825fbb19fcc33c34c86..98fdc3a4e2f56f7d231470418222162dbf95f46a 160000
--- a/3rdparty
+++ b/3rdparty
@@ -1 +1 @@
-Subproject commit dc87ea630287f27502eba825fbb19fcc33c34c86
+Subproject commit 98fdc3a4e2f56f7d231470418222162dbf95f46a
diff --git a/apps/files/ajax/delete.php b/apps/files/ajax/delete.php
index 5f4856ec790a64f8dc52f6bb86b42266945afe5d..c69f5a8860c692218d1d07330852e0521b0a72f8 100644
--- a/apps/files/ajax/delete.php
+++ b/apps/files/ajax/delete.php
@@ -24,7 +24,7 @@ foreach ($files as $file) {
}
// get array with updated storage stats (e.g. max file size) after upload
-$storageStats = \OCA\files\lib\Helper::buildFileStorageStatistics($dir);
+$storageStats = \OCA\Files\Helper::buildFileStorageStatistics($dir);
if ($success) {
OCP\JSON::success(array("data" => array_merge(array("dir" => $dir, "files" => $files), $storageStats)));
diff --git a/apps/files/ajax/getstoragestats.php b/apps/files/ajax/getstoragestats.php
index 7a2b642a9bd11296f64bc16afd1fb559dbde2443..32a77bff6c3054961a364ce1561b5c5e82f04f85 100644
--- a/apps/files/ajax/getstoragestats.php
+++ b/apps/files/ajax/getstoragestats.php
@@ -6,4 +6,4 @@ $RUNTIME_APPTYPES = array('filesystem');
OCP\JSON::checkLoggedIn();
// send back json
-OCP\JSON::success(array('data' => \OCA\files\lib\Helper::buildFileStorageStatistics('/')));
+OCP\JSON::success(array('data' => \OCA\Files\Helper::buildFileStorageStatistics('/')));
diff --git a/apps/files/ajax/list.php b/apps/files/ajax/list.php
index f1b713b55346714907d6da144d1cb92dc6b36bc2..350fc7fa5f6512bac59c5d6996018ad935c7aec5 100644
--- a/apps/files/ajax/list.php
+++ b/apps/files/ajax/list.php
@@ -20,11 +20,11 @@ $doBreadcrumb = isset($_GET['breadcrumb']);
$data = array();
$baseUrl = OCP\Util::linkTo('files', 'index.php') . '?dir=';
-$permissions = \OCA\files\lib\Helper::getDirPermissions($dir);
+$permissions = \OCA\Files\Helper::getDirPermissions($dir);
// Make breadcrumb
if($doBreadcrumb) {
- $breadcrumb = \OCA\files\lib\Helper::makeBreadcrumb($dir);
+ $breadcrumb = \OCA\Files\Helper::makeBreadcrumb($dir);
$breadcrumbNav = new OCP\Template('files', 'part.breadcrumb', '');
$breadcrumbNav->assign('breadcrumb', $breadcrumb, false);
@@ -34,7 +34,7 @@ if($doBreadcrumb) {
}
// make filelist
-$files = \OCA\files\lib\Helper::getFiles($dir);
+$files = \OCA\Files\Helper::getFiles($dir);
$list = new OCP\Template("files", "part.list", "");
$list->assign('files', $files, false);
diff --git a/apps/files/ajax/rawlist.php b/apps/files/ajax/rawlist.php
index 802a308353360893542fc35e2c5bbbea66bea6c8..531481a84c00e98f46aaeb07ca730d0c91b4568e 100644
--- a/apps/files/ajax/rawlist.php
+++ b/apps/files/ajax/rawlist.php
@@ -28,7 +28,7 @@ if($mimetypes && !in_array('httpd/unix-directory', $mimetypes)) {
$file['directory'] = $dir;
$file['isPreviewAvailable'] = \OC::$server->getPreviewManager()->isMimeSupported($file['mimetype']);
$file["date"] = OCP\Util::formatDate($file["mtime"]);
- $file['mimetype_icon'] = \OCA\files\lib\Helper::determineIcon($file);
+ $file['mimetype_icon'] = \OCA\Files\Helper::determineIcon($file);
$files[] = $file;
}
}
@@ -39,7 +39,7 @@ if (is_array($mimetypes) && count($mimetypes)) {
$file['directory'] = $dir;
$file['isPreviewAvailable'] = \OC::$server->getPreviewManager()->isMimeSupported($file['mimetype']);
$file["date"] = OCP\Util::formatDate($file["mtime"]);
- $file['mimetype_icon'] = \OCA\files\lib\Helper::determineIcon($file);
+ $file['mimetype_icon'] = \OCA\Files\Helper::determineIcon($file);
$files[] = $file;
}
}
@@ -48,7 +48,7 @@ if (is_array($mimetypes) && count($mimetypes)) {
$file['directory'] = $dir;
$file['isPreviewAvailable'] = \OC::$server->getPreviewManager()->isMimeSupported($file['mimetype']);
$file["date"] = OCP\Util::formatDate($file["mtime"]);
- $file['mimetype_icon'] = \OCA\files\lib\Helper::determineIcon($file);
+ $file['mimetype_icon'] = \OCA\Files\Helper::determineIcon($file);
$files[] = $file;
}
}
diff --git a/apps/files/ajax/upload.php b/apps/files/ajax/upload.php
index 1d03cd89f83c9510b3f2a640ce5158eb95cb2c5e..0920bf62109d7adcb42bb8523a2f69b525d06caa 100644
--- a/apps/files/ajax/upload.php
+++ b/apps/files/ajax/upload.php
@@ -53,7 +53,7 @@ OCP\JSON::callCheck();
// get array with current storage stats (e.g. max file size)
-$storageStats = \OCA\files\lib\Helper::buildFileStorageStatistics($dir);
+$storageStats = \OCA\Files\Helper::buildFileStorageStatistics($dir);
if (!isset($_FILES['files'])) {
OCP\JSON::error(array('data' => array_merge(array('message' => $l->t('No file was uploaded. Unknown error')), $storageStats)));
@@ -78,7 +78,7 @@ foreach ($_FILES['files']['error'] as $error) {
}
$files = $_FILES['files'];
-$error = '';
+$error = false;
$maxUploadFileSize = $storageStats['uploadMaxFilesize'];
$maxHumanFileSize = OCP\Util::humanFileSize($maxUploadFileSize);
@@ -98,33 +98,71 @@ $result = array();
if (strpos($dir, '..') === false) {
$fileCount = count($files['name']);
for ($i = 0; $i < $fileCount; $i++) {
- $target = OCP\Files::buildNotExistingFileName(stripslashes($dir), $files['name'][$i]);
// $path needs to be normalized - this failed within drag'n'drop upload to a sub-folder
- $target = \OC\Files\Filesystem::normalizePath($target);
- if (is_uploaded_file($files['tmp_name'][$i]) and \OC\Files\Filesystem::fromTmpFile($files['tmp_name'][$i], $target)) {
+ if (isset($_POST['resolution']) && $_POST['resolution']==='autorename') {
+ // append a number in brackets like 'filename (2).ext'
+ $target = OCP\Files::buildNotExistingFileName(stripslashes($dir), $files['name'][$i]);
+ } else {
+ $target = \OC\Files\Filesystem::normalizePath(stripslashes($dir).'/'.$files['name'][$i]);
+ }
+
+ if ( ! \OC\Files\Filesystem::file_exists($target)
+ || (isset($_POST['resolution']) && $_POST['resolution']==='replace')
+ ) {
+ // upload and overwrite file
+ if (is_uploaded_file($files['tmp_name'][$i]) and \OC\Files\Filesystem::fromTmpFile($files['tmp_name'][$i], $target)) {
+
+ // updated max file size after upload
+ $storageStats = \OCA\Files\Helper::buildFileStorageStatistics($dir);
+
+ $meta = \OC\Files\Filesystem::getFileInfo($target);
+ if ($meta === false) {
+ $error = $l->t('Upload failed. Could not get file info.');
+ } else {
+ $result[] = array('status' => 'success',
+ 'mime' => $meta['mimetype'],
+ 'mtime' => $meta['mtime'],
+ 'size' => $meta['size'],
+ 'id' => $meta['fileid'],
+ 'name' => basename($target),
+ 'originalname' => $files['tmp_name'][$i],
+ 'uploadMaxFilesize' => $maxUploadFileSize,
+ 'maxHumanFilesize' => $maxHumanFileSize,
+ 'permissions' => $meta['permissions'],
+ );
+ }
+
+ } else {
+ $error = $l->t('Upload failed. Could not find uploaded file');
+ }
+
+ } else {
+ // file already exists
$meta = \OC\Files\Filesystem::getFileInfo($target);
- // updated max file size after upload
- $storageStats = \OCA\files\lib\Helper::buildFileStorageStatistics($dir);
if ($meta === false) {
- OCP\JSON::error(array('data' => array_merge(array('message' => $l->t('Upload failed')), $storageStats)));
- exit();
+ $error = $l->t('Upload failed. Could not get file info.');
} else {
- $result[] = array('status' => 'success',
+ $result[] = array('status' => 'existserror',
'mime' => $meta['mimetype'],
+ 'mtime' => $meta['mtime'],
'size' => $meta['size'],
'id' => $meta['fileid'],
'name' => basename($target),
- 'originalname' => $files['name'][$i],
+ 'originalname' => $files['tmp_name'][$i],
'uploadMaxFilesize' => $maxUploadFileSize,
- 'maxHumanFilesize' => $maxHumanFileSize
+ 'maxHumanFilesize' => $maxHumanFileSize,
+ 'permissions' => $meta['permissions'],
);
}
}
}
- OCP\JSON::encodedPrint($result);
- exit();
} else {
$error = $l->t('Invalid directory.');
}
-OCP\JSON::error(array('data' => array_merge(array('message' => $error), $storageStats)));
+if ($error === false) {
+ OCP\JSON::encodedPrint($result);
+ exit();
+} else {
+ OCP\JSON::error(array('data' => array_merge(array('message' => $error), $storageStats)));
+}
diff --git a/apps/files/appinfo/app.php b/apps/files/appinfo/app.php
index bd3245ded3f39a2b73e733653f3a593fb02fec66..909baca92ea7457050d53f6a0a242719836742e9 100644
--- a/apps/files/appinfo/app.php
+++ b/apps/files/appinfo/app.php
@@ -1,5 +1,4 @@
<?php
-OC::$CLASSPATH['OCA\Files\Capabilities'] = 'apps/files/lib/capabilities.php';
$l = OC_L10N::get('files');
diff --git a/apps/files/appinfo/register_command.php b/apps/files/appinfo/register_command.php
new file mode 100644
index 0000000000000000000000000000000000000000..435ce0ab23f272b90cc8a5aad4d44779933d4f19
--- /dev/null
+++ b/apps/files/appinfo/register_command.php
@@ -0,0 +1,9 @@
+<?php
+/**
+ * Copyright (c) 2013 Bart Visscher <bartv@thisnet.nl>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+$application->add(new OCA\Files\Command\Scan(OC_User::getManager()));
diff --git a/apps/files/command/scan.php b/apps/files/command/scan.php
new file mode 100644
index 0000000000000000000000000000000000000000..25ab70af3629a7d50940c589f1b6cd41c52dd62b
--- /dev/null
+++ b/apps/files/command/scan.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * Copyright (c) 2013 Thomas Müller <thomas.mueller@tmit.eu>
+ * Copyright (c) 2013 Bart Visscher <bartv@thisnet.nl>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OCA\Files\Command;
+
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class Scan extends Command {
+
+ /**
+ * @var \OC\User\Manager $userManager
+ */
+ private $userManager;
+
+ public function __construct(\OC\User\Manager $userManager) {
+ $this->userManager = $userManager;
+ parent::__construct();
+ }
+
+ protected function configure() {
+ $this
+ ->setName('files:scan')
+ ->setDescription('rescan filesystem')
+ ->addArgument(
+ 'user_id',
+ InputArgument::OPTIONAL | InputArgument::IS_ARRAY,
+ 'will rescan all files of the given user(s)'
+ )
+ ->addOption(
+ 'all',
+ null,
+ InputOption::VALUE_NONE,
+ 'will rescan all files of all known users'
+ )
+ ;
+ }
+
+ protected function scanFiles($user, OutputInterface $output) {
+ $scanner = new \OC\Files\Utils\Scanner($user);
+ $scanner->listen('\OC\Files\Utils\Scanner', 'scanFile', function($path) use ($output) {
+ $output->writeln("Scanning <info>$path</info>");
+ });
+ $scanner->listen('\OC\Files\Utils\Scanner', 'scanFolder', function($path) use ($output) {
+ $output->writeln("Scanning <info>$path</info>");
+ });
+ $scanner->scan('');
+ }
+
+ protected function execute(InputInterface $input, OutputInterface $output) {
+ if ($input->getOption('all')) {
+ $users = $this->userManager->search('');
+ } else {
+ $users = $input->getArgument('user_id');
+ }
+
+ foreach ($users as $user) {
+ if (is_object($user)) {
+ $user = $user->getUID();
+ }
+ $this->scanFiles($user, $output);
+ }
+ }
+}
diff --git a/apps/files/console/scan.php b/apps/files/console/scan.php
deleted file mode 100644
index 70183fc888af90e21b912de1b85927afe866f031..0000000000000000000000000000000000000000
--- a/apps/files/console/scan.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-if (count($argv) !== 2) {
- echo "Usage:" . PHP_EOL;
- echo " files:scan <user_id>" . PHP_EOL;
- echo " will rescan all files of the given user" . PHP_EOL;
- echo " files:scan --all" . PHP_EOL;
- echo " will rescan all files of all known users" . PHP_EOL;
- return;
-}
-
-function scanFiles($user) {
- $scanner = new \OC\Files\Utils\Scanner($user);
- $scanner->listen('\OC\Files\Utils\Scanner', 'scanFile', function($path) {
- echo "Scanning $path" . PHP_EOL;
- });
- $scanner->listen('\OC\Files\Utils\Scanner', 'scanFolder', function($path) {
- echo "Scanning $path" . PHP_EOL;
- });
- $scanner->scan('');
-}
-
-if ($argv[1] === '--all') {
- $users = OC_User::getUsers();
-} else {
- $users = array($argv[1]);
-}
-
-foreach ($users as $user) {
- scanFiles($user);
-}
diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index 41d9808c56b28be68b20d67151c7dd826e25f528..b3ecd1dab93e4cb62cb167881960c7b6aba9f49b 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -76,6 +76,9 @@
#filestable tbody tr.selected {
background-color: rgb(230,230,230);
}
+#filestable tbody tr.searchresult {
+ background-color: rgb(240,240,240);
+}
tbody a { color:#000; }
span.extension, span.uploading, td.date { color:#999; }
span.extension { text-transform:lowercase; -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=70)"; filter:alpha(opacity=70); opacity:.7; -webkit-transition:opacity 300ms; -moz-transition:opacity 300ms; -o-transition:opacity 300ms; transition:opacity 300ms; }
@@ -357,4 +360,3 @@ table.dragshadow td.size {
.mask.transparent{
opacity: 0;
}
-
diff --git a/apps/files/css/upload.css b/apps/files/css/upload.css
new file mode 100644
index 0000000000000000000000000000000000000000..2d11e41ba88e3b09520d421d4decf28a95a6c339
--- /dev/null
+++ b/apps/files/css/upload.css
@@ -0,0 +1,119 @@
+
+#upload {
+ height:27px; padding:0; margin-left:0.2em; overflow:hidden;
+ vertical-align: top;
+}
+#upload a {
+ position:relative; display:block; width:100%; height:27px;
+ cursor:pointer; z-index:10;
+ background-image:url('%webroot%/core/img/actions/upload.svg');
+ background-repeat:no-repeat;
+ background-position:7px 6px;
+ opacity:0.65;
+}
+.file_upload_target { display:none; }
+.file_upload_form { display:inline; float:left; margin:0; padding:0; cursor:pointer; overflow:visible; }
+#file_upload_start {
+ float: left;
+ left:0; top:0; width:28px; height:27px; padding:0;
+ font-size:1em;
+ -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; filter:alpha(opacity=0); opacity:0;
+ z-index:20; position:relative; cursor:pointer; overflow:hidden;
+}
+
+#uploadprogresswrapper {
+ display: inline-block;
+ vertical-align: top;
+ margin:0.3em;
+ height: 29px;
+}
+#uploadprogressbar {
+ position:relative;
+ float: left;
+ margin-left: 12px;
+ width: 130px;
+ height: 26px;
+ display:inline-block;
+}
+#uploadprogressbar + stop {
+ font-size: 13px;
+}
+
+.oc-dialog .fileexists table {
+ width: 100%;
+}
+.oc-dialog .fileexists th {
+ padding-left: 0;
+ padding-right: 0;
+}
+.oc-dialog .fileexists th input[type='checkbox'] {
+ margin-right: 3px;
+}
+.oc-dialog .fileexists th:first-child {
+ width: 230px;
+}
+.oc-dialog .fileexists th label {
+ font-weight: normal;
+ color:black;
+}
+.oc-dialog .fileexists th .count {
+ margin-left: 3px;
+}
+.oc-dialog .fileexists .conflicts .template {
+ display: none;
+}
+.oc-dialog .fileexists .conflict {
+ width: 100%;
+ height: 85px;
+}
+.oc-dialog .fileexists .conflict .filename {
+ color:#777;
+ word-break: break-all;
+ clear: left;
+}
+.oc-dialog .fileexists .icon {
+ width: 64px;
+ height: 64px;
+ margin: 0px 5px 5px 5px;
+ background-repeat: no-repeat;
+ background-size: 64px 64px;
+ float: left;
+}
+.oc-dialog .fileexists .replacement {
+ float: left;
+ width: 230px;
+}
+.oc-dialog .fileexists .original {
+ float: left;
+ width: 230px;
+}
+.oc-dialog .fileexists .conflicts {
+ overflow-y:scroll;
+ max-height: 225px;
+}
+.oc-dialog .fileexists .conflict input[type='checkbox'] {
+ float: left;
+}
+.oc-dialog .fileexists .toggle {
+ background-image: url('%webroot%/core/img/actions/triangle-e.png');
+ width: 16px;
+ height: 16px;
+}
+.oc-dialog .fileexists #allfileslabel {
+ float:right;
+}
+.oc-dialog .fileexists #allfiles {
+ vertical-align: bottom;
+ position: relative;
+ top: -3px;
+}
+.oc-dialog .fileexists #allfiles + span{
+ vertical-align: bottom;
+}
+.oc-dialog .oc-dialog-buttonrow {
+ width:100%;
+ text-align:right;
+}
+.oc-dialog .oc-dialog-buttonrow .cancel {
+ float:left;
+}
diff --git a/apps/files/index.php b/apps/files/index.php
index d46d8e32eefcce1cc08cd502a4b016bde1a63418..6f22fdfdc19bb4fccfbfae5d0b8b5d2c7b2dd9d5 100644
--- a/apps/files/index.php
+++ b/apps/files/index.php
@@ -26,6 +26,7 @@ OCP\User::checkLoggedIn();
// Load the files we need
OCP\Util::addStyle('files', 'files');
+OCP\Util::addStyle('files', 'upload');
OCP\Util::addscript('files', 'file-upload');
OCP\Util::addscript('files', 'jquery.iframe-transport');
OCP\Util::addscript('files', 'jquery.fileupload');
@@ -73,14 +74,14 @@ if (\OC\Files\Cache\Upgrade::needUpgrade($user)) { //dont load anything if we ne
$ajaxLoad = true;
}
else{
- $files = \OCA\files\lib\Helper::getFiles($dir);
+ $files = \OCA\Files\Helper::getFiles($dir);
}
$freeSpace = \OC\Files\Filesystem::free_space($dir);
$needUpgrade = false;
}
// Make breadcrumb
-$breadcrumb = \OCA\files\lib\Helper::makeBreadcrumb($dir);
+$breadcrumb = \OCA\Files\Helper::makeBreadcrumb($dir);
// make breadcrumb und filelist markup
$list = new OCP\Template('files', 'part.list', '');
@@ -92,7 +93,7 @@ $breadcrumbNav = new OCP\Template('files', 'part.breadcrumb', '');
$breadcrumbNav->assign('breadcrumb', $breadcrumb);
$breadcrumbNav->assign('baseURL', OCP\Util::linkTo('files', 'index.php') . '?dir=');
-$permissions = \OCA\files\lib\Helper::getDirPermissions($dir);
+$permissions = \OCA\Files\Helper::getDirPermissions($dir);
if ($needUpgrade) {
OCP\Util::addscript('files', 'upgrade');
diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js
index aeb2da90d5fc0bb043a5ed5d18e1a8b19172555a..b52221ac1fc1953f234a62823c5cd54cffbab055 100644
--- a/apps/files/js/file-upload.js
+++ b/apps/files/js/file-upload.js
@@ -1,157 +1,436 @@
-$(document).ready(function() {
-
- var file_upload_param = {
- dropZone: $('#content'), // restrict dropZone to content div
- //singleFileUploads is on by default, so the data.files array will always have length 1
- add: function(e, data) {
-
- if(data.files[0].type === '' && data.files[0].size == 4096)
- {
- data.textStatus = 'dirorzero';
- data.errorThrown = t('files','Unable to upload your file as it is a directory or has 0 bytes');
- var fu = $(this).data('blueimp-fileupload') || $(this).data('fileupload');
- fu._trigger('fail', e, data);
- return true; //don't upload this file but go on with next in queue
- }
+/**
+ * The file upload code uses several hooks to interact with blueimps jQuery file upload library:
+ * 1. the core upload handling hooks are added when initializing the plugin,
+ * 2. if the browser supports progress events they are added in a separate set after the initialization
+ * 3. every app can add it's own triggers for fileupload
+ * - files adds d'n'd handlers and also reacts to done events to add new rows to the filelist
+ * - TODO pictures upload button
+ * - TODO music upload button
+ */
- var totalSize=0;
- $.each(data.originalFiles, function(i,file){
- totalSize+=file.size;
- });
+/**
+ * Function that will allow us to know if Ajax uploads are supported
+ * @link https://github.com/New-Bamboo/example-ajax-upload/blob/master/public/index.html
+ * also see article @link http://blog.new-bamboo.co.uk/2012/01/10/ridiculously-simple-ajax-uploads-with-formdata
+ */
+function supportAjaxUploadWithProgress() {
+ return supportFileAPI() && supportAjaxUploadProgressEvents() && supportFormData();
- if(totalSize>$('#max_upload').val()){
- data.textStatus = 'notenoughspace';
- data.errorThrown = t('files','Not enough space available');
- var fu = $(this).data('blueimp-fileupload') || $(this).data('fileupload');
- fu._trigger('fail', e, data);
- return false; //don't upload anything
- }
+ // Is the File API supported?
+ function supportFileAPI() {
+ var fi = document.createElement('INPUT');
+ fi.type = 'file';
+ return 'files' in fi;
+ };
- // start the actual file upload
- var jqXHR = data.submit();
+ // Are progress events supported?
+ function supportAjaxUploadProgressEvents() {
+ var xhr = new XMLHttpRequest();
+ return !! (xhr && ('upload' in xhr) && ('onprogress' in xhr.upload));
+ };
- // remember jqXHR to show warning to user when he navigates away but an upload is still in progress
- if (typeof data.context !== 'undefined' && data.context.data('type') === 'dir') {
- var dirName = data.context.data('file');
- if(typeof uploadingFiles[dirName] === 'undefined') {
- uploadingFiles[dirName] = {};
- }
- uploadingFiles[dirName][data.files[0].name] = jqXHR;
- } else {
- uploadingFiles[data.files[0].name] = jqXHR;
- }
+ // Is FormData supported?
+ function supportFormData() {
+ return !! window.FormData;
+ }
+}
- //show cancel button
- if($('html.lte9').length === 0 && data.dataType !== 'iframe') {
- $('#uploadprogresswrapper input.stop').show();
- }
- },
- submit: function(e, data) {
- if ( ! data.formData ) {
- // noone set update parameters, we set the minimum
- data.formData = {
- requesttoken: oc_requesttoken,
- dir: $('#dir').val()
- };
- }
- },
- /**
- * called after the first add, does NOT have the data param
- * @param e
- */
- start: function(e) {
- //IE < 10 does not fire the necessary events for the progress bar.
- if($('html.lte9').length > 0) {
- return;
+/**
+ * keeps track of uploads in progress and implements callbacks for the conflicts dialog
+ * @type {OC.Upload}
+ */
+OC.Upload = {
+ _uploads: [],
+ /**
+ * cancels a single upload,
+ * @deprecated because it was only used when a file currently beeing uploaded was deleted. Now they are added after
+ * they have been uploaded.
+ * @param {string} dir
+ * @param {string} filename
+ * @returns {unresolved}
+ */
+ cancelUpload:function(dir, filename) {
+ var self = this;
+ var deleted = false;
+ //FIXME _selections
+ jQuery.each(this._uploads, function(i, jqXHR) {
+ if (selection.dir === dir && selection.uploads[filename]) {
+ deleted = self.deleteSelectionUpload(selection, filename);
+ return false; // end searching through selections
}
- $('#uploadprogressbar').progressbar({value:0});
- $('#uploadprogressbar').fadeIn();
- },
- fail: function(e, data) {
- if (typeof data.textStatus !== 'undefined' && data.textStatus !== 'success' ) {
- if (data.textStatus === 'abort') {
- $('#notification').text(t('files', 'Upload cancelled.'));
- } else {
- // HTTP connection problem
- $('#notification').text(data.errorThrown);
- }
- $('#notification').fadeIn();
- //hide notification after 5 sec
- setTimeout(function() {
- $('#notification').fadeOut();
- }, 5000);
- }
- delete uploadingFiles[data.files[0].name];
- },
- progress: function(e, data) {
- // TODO: show nice progress bar in file row
- },
- progressall: function(e, data) {
- //IE < 10 does not fire the necessary events for the progress bar.
- if($('html.lte9').length > 0) {
- return;
+ });
+ return deleted;
+ },
+ /**
+ * deletes the jqHXR object from a data selection
+ * @param {object} data
+ */
+ deleteUpload:function(data) {
+ delete data.jqXHR;
+ },
+ /**
+ * cancels all uploads
+ */
+ cancelUploads:function() {
+ this.log('canceling uploads');
+ jQuery.each(this._uploads,function(i, jqXHR){
+ jqXHR.abort();
+ });
+ this._uploads = [];
+ },
+ rememberUpload:function(jqXHR){
+ if (jqXHR) {
+ this._uploads.push(jqXHR);
+ }
+ },
+ /**
+ * Checks the currently known uploads.
+ * returns true if any hxr has the state 'pending'
+ * @returns {boolean}
+ */
+ isProcessing:function(){
+ var count = 0;
+
+ jQuery.each(this._uploads,function(i, data){
+ if (data.state() === 'pending') {
+ count++;
}
- var progress = (data.loaded/data.total)*100;
- $('#uploadprogressbar').progressbar('value',progress);
- },
- /**
- * called for every successful upload
- * @param e
- * @param data
- */
- done:function(e, data) {
- // handle different responses (json or body from iframe for ie)
- var response;
- if (typeof data.result === 'string') {
- response = data.result;
+ });
+ return count > 0;
+ },
+ /**
+ * callback for the conflicts dialog
+ * @param {object} data
+ */
+ onCancel:function(data) {
+ this.cancelUploads();
+ },
+ /**
+ * callback for the conflicts dialog
+ * calls onSkip, onReplace or onAutorename for each conflict
+ * @param {object} conflicts - list of conflict elements
+ */
+ onContinue:function(conflicts) {
+ var self = this;
+ //iterate over all conflicts
+ jQuery.each(conflicts, function (i, conflict) {
+ conflict = $(conflict);
+ var keepOriginal = conflict.find('.original input[type="checkbox"]:checked').length === 1;
+ var keepReplacement = conflict.find('.replacement input[type="checkbox"]:checked').length === 1;
+ if (keepOriginal && keepReplacement) {
+ // when both selected -> autorename
+ self.onAutorename(conflict.data('data'));
+ } else if (keepReplacement) {
+ // when only replacement selected -> overwrite
+ self.onReplace(conflict.data('data'));
} else {
- //fetch response from iframe
- response = data.result[0].body.innerText;
+ // when only original seleted -> skip
+ // when none selected -> skip
+ self.onSkip(conflict.data('data'));
}
- var result=$.parseJSON(response);
+ });
+ },
+ /**
+ * handle skipping an upload
+ * @param {object} data
+ */
+ onSkip:function(data){
+ this.log('skip', null, data);
+ this.deleteUpload(data);
+ },
+ /**
+ * handle replacing a file on the server with an uploaded file
+ * @param {object} data
+ */
+ onReplace:function(data){
+ this.log('replace', null, data);
+ data.data.append('resolution', 'replace');
+ data.submit();
+ },
+ /**
+ * handle uploading a file and letting the server decide a new name
+ * @param {object} data
+ */
+ onAutorename:function(data){
+ this.log('autorename', null, data);
+ if (data.data) {
+ data.data.append('resolution', 'autorename');
+ } else {
+ data.formData.push({name:'resolution',value:'autorename'}); //hack for ie8
+ }
+ data.submit();
+ },
+ _trace:false, //TODO implement log handler for JS per class?
+ log:function(caption, e, data) {
+ if (this._trace) {
+ console.log(caption);
+ console.log(data);
+ }
+ },
+ /**
+ * TODO checks the list of existing files prior to uploading and shows a simple dialog to choose
+ * skip all, replace all or choose which files to keep
+ * @param {array} selection of files to upload
+ * @param {object} callbacks - object with several callback methods
+ * @param {function} callbacks.onNoConflicts
+ * @param {function} callbacks.onSkipConflicts
+ * @param {function} callbacks.onReplaceConflicts
+ * @param {function} callbacks.onChooseConflicts
+ * @param {function} callbacks.onCancel
+ */
+ checkExistingFiles: function (selection, callbacks){
+ // TODO check filelist before uploading and show dialog on conflicts, use callbacks
+ callbacks.onNoConflicts(selection);
+ }
+};
+
+$(document).ready(function() {
+
+ if ( $('#file_upload_start').exists() ) {
+
+ var file_upload_param = {
+ dropZone: $('#content'), // restrict dropZone to content div
+ autoUpload: false,
+ sequentialUploads: true,
+ //singleFileUploads is on by default, so the data.files array will always have length 1
+ /**
+ * on first add of every selection
+ * - check all files of originalFiles array with files in dir
+ * - on conflict show dialog
+ * - skip all -> remember as single skip action for all conflicting files
+ * - replace all -> remember as single replace action for all conflicting files
+ * - choose -> show choose dialog
+ * - mark files to keep
+ * - when only existing -> remember as single skip action
+ * - when only new -> remember as single replace action
+ * - when both -> remember as single autorename action
+ * - start uploading selection
+ * @param {object} e
+ * @param {object} data
+ * @returns {boolean}
+ */
+ add: function(e, data) {
+ OC.Upload.log('add', e, data);
+ var that = $(this);
+
+ // we need to collect all data upload objects before starting the upload so we can check their existence
+ // and set individual conflict actions. unfortunately there is only one variable that we can use to identify
+ // the selection a data upload is part of, so we have to collect them in data.originalFiles
+ // turning singleFileUploads off is not an option because we want to gracefully handle server errors like
+ // already exists
+
+ // create a container where we can store the data objects
+ if ( ! data.originalFiles.selection ) {
+ // initialize selection and remember number of files to upload
+ data.originalFiles.selection = {
+ uploads: [],
+ filesToUpload: data.originalFiles.length,
+ totalBytes: 0
+ };
+ }
+ var selection = data.originalFiles.selection;
+
+ // add uploads
+ if ( selection.uploads.length < selection.filesToUpload ){
+ // remember upload
+ selection.uploads.push(data);
+ }
+
+ //examine file
+ var file = data.files[0];
+
+ if (file.type === '' && file.size === 4096) {
+ data.textStatus = 'dirorzero';
+ data.errorThrown = t('files', 'Unable to upload {filename} as it is a directory or has 0 bytes',
+ {filename: file.name}
+ );
+ }
+
+ // add size
+ selection.totalBytes += file.size;
+
+ //check max upload size
+ if (selection.totalBytes > $('#max_upload').val()) {
+ data.textStatus = 'notenoughspace';
+ data.errorThrown = t('files', 'Not enough space available');
+ }
+
+ // end upload for whole selection on error
+ if (data.errorThrown) {
+ // trigger fileupload fail
+ var fu = that.data('blueimp-fileupload') || that.data('fileupload');
+ fu._trigger('fail', e, data);
+ return false; //don't upload anything
+ }
- if(typeof result[0] !== 'undefined' && result[0].status === 'success') {
- var filename = result[0].originalname;
+ // check existing files when all is collected
+ if ( selection.uploads.length >= selection.filesToUpload ) {
+
+ //remove our selection hack:
+ delete data.originalFiles.selection;
+
+ var callbacks = {
+
+ onNoConflicts: function (selection) {
+ $.each(selection.uploads, function(i, upload) {
+ upload.submit();
+ });
+ },
+ onSkipConflicts: function (selection) {
+ //TODO mark conflicting files as toskip
+ },
+ onReplaceConflicts: function (selection) {
+ //TODO mark conflicting files as toreplace
+ },
+ onChooseConflicts: function (selection) {
+ //TODO mark conflicting files as chosen
+ },
+ onCancel: function (selection) {
+ $.each(selection.uploads, function(i, upload) {
+ upload.abort();
+ });
+ }
+ };
- // delete jqXHR reference
- if (typeof data.context !== 'undefined' && data.context.data('type') === 'dir') {
- var dirName = data.context.data('file');
- delete uploadingFiles[dirName][filename];
- if ($.assocArraySize(uploadingFiles[dirName]) == 0) {
- delete uploadingFiles[dirName];
+ OC.Upload.checkExistingFiles(selection, callbacks);
+
+ }
+
+ return true; // continue adding files
+ },
+ /**
+ * called after the first add, does NOT have the data param
+ * @param {object} e
+ */
+ start: function(e) {
+ OC.Upload.log('start', e, null);
+ },
+ submit: function(e, data) {
+ OC.Upload.rememberUpload(data);
+ if ( ! data.formData ) {
+ // noone set update parameters, we set the minimum
+ data.formData = {
+ requesttoken: oc_requesttoken,
+ dir: $('#dir').val()
+ };
+ }
+ },
+ fail: function(e, data) {
+ OC.Upload.log('fail', e, data);
+ if (typeof data.textStatus !== 'undefined' && data.textStatus !== 'success' ) {
+ if (data.textStatus === 'abort') {
+ $('#notification').text(t('files', 'Upload cancelled.'));
+ } else {
+ // HTTP connection problem
+ $('#notification').text(data.errorThrown);
}
+ $('#notification').fadeIn();
+ //hide notification after 5 sec
+ setTimeout(function() {
+ $('#notification').fadeOut();
+ }, 5000);
+ }
+ OC.Upload.deleteUpload(data);
+ },
+ /**
+ * called for every successful upload
+ * @param {object} e
+ * @param {object} data
+ */
+ done:function(e, data) {
+ OC.Upload.log('done', e, data);
+ // handle different responses (json or body from iframe for ie)
+ var response;
+ if (typeof data.result === 'string') {
+ response = data.result;
} else {
- delete uploadingFiles[filename];
+ //fetch response from iframe
+ response = data.result[0].body.innerText;
}
- var file = result[0];
- } else {
- data.textStatus = 'servererror';
- data.errorThrown = t('files', result.data.message);
- var fu = $(this).data('blueimp-fileupload') || $(this).data('fileupload');
- fu._trigger('fail', e, data);
- }
- },
- /**
- * called after last upload
- * @param e
- * @param data
- */
- stop: function(e, data) {
- if(data.dataType !== 'iframe') {
- $('#uploadprogresswrapper input.stop').hide();
- }
+ var result=$.parseJSON(response);
- //IE < 10 does not fire the necessary events for the progress bar.
- if($('html.lte9').length > 0) {
- return;
+ delete data.jqXHR;
+
+ if(typeof result[0] === 'undefined') {
+ data.textStatus = 'servererror';
+ data.errorThrown = t('files', 'Could not get result from server.');
+ var fu = $(this).data('blueimp-fileupload') || $(this).data('fileupload');
+ fu._trigger('fail', e, data);
+ } else if (result[0].status === 'existserror') {
+ //show "file already exists" dialog
+ var original = result[0];
+ var replacement = data.files[0];
+ var fu = $(this).data('blueimp-fileupload') || $(this).data('fileupload');
+ OC.dialogs.fileexists(data, original, replacement, OC.Upload, fu);
+ } else if (result[0].status !== 'success') {
+ //delete data.jqXHR;
+ data.textStatus = 'servererror';
+ data.errorThrown = result.data.message; // error message has been translated on server
+ var fu = $(this).data('blueimp-fileupload') || $(this).data('fileupload');
+ fu._trigger('fail', e, data);
+ }
+ },
+ /**
+ * called after last upload
+ * @param {object} e
+ * @param {object} data
+ */
+ stop: function(e, data) {
+ OC.Upload.log('stop', e, data);
}
+ };
+
+ // initialize jquery fileupload (blueimp)
+ var fileupload = $('#file_upload_start').fileupload(file_upload_param);
+ window.file_upload_param = fileupload;
- $('#uploadprogressbar').progressbar('value',100);
- $('#uploadprogressbar').fadeOut();
+ if(supportAjaxUploadWithProgress()) {
+
+ // add progress handlers
+ fileupload.on('fileuploadadd', function(e, data) {
+ OC.Upload.log('progress handle fileuploadadd', e, data);
+ //show cancel button
+ //if(data.dataType !== 'iframe') { //FIXME when is iframe used? only for ie?
+ // $('#uploadprogresswrapper input.stop').show();
+ //}
+ });
+ // add progress handlers
+ fileupload.on('fileuploadstart', function(e, data) {
+ OC.Upload.log('progress handle fileuploadstart', e, data);
+ $('#uploadprogresswrapper input.stop').show();
+ $('#uploadprogressbar').progressbar({value:0});
+ $('#uploadprogressbar').fadeIn();
+ });
+ fileupload.on('fileuploadprogress', function(e, data) {
+ OC.Upload.log('progress handle fileuploadprogress', e, data);
+ //TODO progressbar in row
+ });
+ fileupload.on('fileuploadprogressall', function(e, data) {
+ OC.Upload.log('progress handle fileuploadprogressall', e, data);
+ var progress = (data.loaded / data.total) * 100;
+ $('#uploadprogressbar').progressbar('value', progress);
+ });
+ fileupload.on('fileuploadstop', function(e, data) {
+ OC.Upload.log('progress handle fileuploadstop', e, data);
+
+ $('#uploadprogresswrapper input.stop').fadeOut();
+ $('#uploadprogressbar').fadeOut();
+
+ });
+ fileupload.on('fileuploadfail', function(e, data) {
+ OC.Upload.log('progress handle fileuploadfail', e, data);
+ //if user pressed cancel hide upload progress bar and cancel button
+ if (data.errorThrown === 'abort') {
+ $('#uploadprogresswrapper input.stop').fadeOut();
+ $('#uploadprogressbar').fadeOut();
+ }
+ });
+
+ } else {
+ console.log('skipping file progress because your browser is broken');
}
- };
- $('#file_upload_start').fileupload(file_upload_param);
-
+ }
+
$.assocArraySize = function(obj) {
// http://stackoverflow.com/a/6700/11236
var size = 0, key;
@@ -162,9 +441,9 @@ $(document).ready(function() {
};
// warn user not to leave the page while upload is in progress
- $(window).bind('beforeunload', function(e) {
- if ($.assocArraySize(uploadingFiles) > 0) {
- return t('files','File upload is in progress. Leaving the page now will cancel the upload.');
+ $(window).on('beforeunload', function(e) {
+ if (OC.Upload.isProcessing()) {
+ return t('files', 'File upload is in progress. Leaving the page now will cancel the upload.');
}
});
diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js
index 330fe86f6b3d7a3b0116532be362b273842710a4..67d3d5ead8d87b935e99f379a005ae8a105abb57 100644
--- a/apps/files/js/fileactions.js
+++ b/apps/files/js/fileactions.js
@@ -68,6 +68,9 @@ var FileActions = {
if ($('tr[data-file="'+file+'"]').data('renaming')) {
return;
}
+
+ // recreate fileactions
+ parent.children('a.name').find('.fileactions').remove();
parent.children('a.name').append('<span class="fileactions" />');
var defaultAction = FileActions.getDefault(FileActions.getCurrentMimeType(), FileActions.getCurrentType(), FileActions.getCurrentPermissions());
@@ -117,6 +120,8 @@ var FileActions = {
addAction('Share', actions.Share);
}
+ // remove the existing delete action
+ parent.parent().children().last().find('.action.delete').remove();
if (actions['Delete']) {
var img = FileActions.icons['Delete'];
if (img.call) {
@@ -172,7 +177,7 @@ $(document).ready(function () {
FileActions.register('all', 'Delete', OC.PERMISSION_DELETE, function () {
return OC.imagePath('core', 'actions/delete');
}, function (filename) {
- if (Files.cancelUpload(filename)) {
+ if (OC.Upload.cancelUpload($('#dir').val(), filename)) {
if (filename.substr) {
filename = [filename];
}
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index b50d46c98d3072ef0fffcaa7e3bb23166266e93d..4fc1b95a0ab5612bc48560b2328589cc83ab3179 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -130,7 +130,6 @@ var FileList={
if (hidden) {
tr.hide();
}
- FileActions.display(tr.find('td.filename'));
return tr;
},
addDir:function(name,size,lastModified,hidden){
@@ -643,6 +642,37 @@ var FileList={
if (FileList._maskTimeout){
window.clearTimeout(FileList._maskTimeout);
}
+ },
+ scrollTo:function(file) {
+ //scroll to and highlight preselected file
+ var scrolltorow = $('tr[data-file="'+file+'"]');
+ if (scrolltorow.length > 0) {
+ scrolltorow.addClass('searchresult');
+ $(window).scrollTop(scrolltorow.position().top);
+ //remove highlight when hovered over
+ scrolltorow.one('hover', function(){
+ scrolltorow.removeClass('searchresult');
+ });
+ }
+ },
+ filter:function(query){
+ $('#fileList tr:not(.summary)').each(function(i,e){
+ if ($(e).data('file').toLowerCase().indexOf(query.toLowerCase()) !== -1) {
+ $(e).addClass("searchresult");
+ } else {
+ $(e).removeClass("searchresult");
+ }
+ });
+ //do not use scrollto to prevent removing searchresult css class
+ var first = $('#fileList tr.searchresult').first();
+ if (first.length !== 0) {
+ $(window).scrollTop(first.position().top);
+ }
+ },
+ unfilter:function(){
+ $('#fileList tr.searchresult').each(function(i,e){
+ $(e).removeClass("searchresult");
+ });
}
};
@@ -650,147 +680,167 @@ $(document).ready(function(){
// handle upload events
var file_upload_start = $('#file_upload_start');
+
file_upload_start.on('fileuploaddrop', function(e, data) {
- // only handle drop to dir if fileList exists
- if ($('#fileList').length > 0) {
- var dropTarget = $(e.originalEvent.target).closest('tr');
- if(dropTarget && dropTarget.data('type') === 'dir') { // drag&drop upload to folder
- var dirName = dropTarget.data('file');
- // update folder in form
- data.formData = function(form) {
- var formArray = form.serializeArray();
- // array index 0 contains the max files size
- // array index 1 contains the request token
- // array index 2 contains the directory
- var parentDir = formArray[2]['value'];
- if (parentDir === '/') {
- formArray[2]['value'] += dirName;
- } else {
- formArray[2]['value'] += '/'+dirName;
- }
- return formArray;
+ OC.Upload.log('filelist handle fileuploaddrop', e, data);
+
+ var dropTarget = $(e.originalEvent.target).closest('tr');
+ if(dropTarget && dropTarget.data('type') === 'dir') { // drag&drop upload to folder
+
+ // remember as context
+ data.context = dropTarget;
+
+ var dir = dropTarget.data('file');
+
+ // update folder in form
+ data.formData = function(form) {
+ var formArray = form.serializeArray();
+ // array index 0 contains the max files size
+ // array index 1 contains the request token
+ // array index 2 contains the directory
+ var parentDir = formArray[2]['value'];
+ if (parentDir === '/') {
+ formArray[2]['value'] += dir;
+ } else {
+ formArray[2]['value'] += '/' + dir;
}
- }
- }
+
+ return formArray;
+ };
+ }
+
});
file_upload_start.on('fileuploadadd', function(e, data) {
- // only add to fileList if it exists
- if ($('#fileList').length > 0) {
+ OC.Upload.log('filelist handle fileuploadadd', e, data);
- if(FileList.deleteFiles && FileList.deleteFiles.indexOf(data.files[0].name)!=-1){//finish delete if we are uploading a deleted file
- FileList.finishDelete(null, true); //delete file before continuing
+ //finish delete if we are uploading a deleted file
+ if(FileList.deleteFiles && FileList.deleteFiles.indexOf(data.files[0].name)!==-1){
+ FileList.finishDelete(null, true); //delete file before continuing
+ }
+
+ // add ui visualization to existing folder
+ if(data.context && data.context.data('type') === 'dir') {
+ // add to existing folder
+
+ // update upload counter ui
+ var uploadtext = data.context.find('.uploadtext');
+ var currentUploads = parseInt(uploadtext.attr('currentUploads'));
+ currentUploads += 1;
+ uploadtext.attr('currentUploads', currentUploads);
+
+ var translatedText = n('files', 'Uploading %n file', 'Uploading %n files', currentUploads);
+ if(currentUploads === 1) {
+ var img = OC.imagePath('core', 'loading.gif');
+ data.context.find('td.filename').attr('style','background-image:url('+img+')');
+ uploadtext.text(translatedText);
+ uploadtext.show();
+ } else {
+ uploadtext.text(translatedText);
}
+ }
+
+ });
+ /*
+ * when file upload done successfully add row to filelist
+ * update counter when uploading to sub folder
+ */
+ file_upload_start.on('fileuploaddone', function(e, data) {
+ OC.Upload.log('filelist handle fileuploaddone', e, data);
+
+ var response;
+ if (typeof data.result === 'string') {
+ response = data.result;
+ } else {
+ // fetch response from iframe
+ response = data.result[0].body.innerText;
+ }
+ var result=$.parseJSON(response);
- // add ui visualization to existing folder or as new stand-alone file?
- var dropTarget = $(e.originalEvent.target).closest('tr');
- if(dropTarget && dropTarget.data('type') === 'dir') {
- // add to existing folder
- var dirName = dropTarget.data('file');
+ if(typeof result[0] !== 'undefined' && result[0].status === 'success') {
+ var file = result[0];
- // set dir context
- data.context = $('tr').filterAttr('data-type', 'dir').filterAttr('data-file', dirName);
+ if (data.context && data.context.data('type') === 'dir') {
// update upload counter ui
var uploadtext = data.context.find('.uploadtext');
var currentUploads = parseInt(uploadtext.attr('currentUploads'));
- currentUploads += 1;
+ currentUploads -= 1;
uploadtext.attr('currentUploads', currentUploads);
var translatedText = n('files', 'Uploading %n file', 'Uploading %n files', currentUploads);
- if(currentUploads === 1) {
- var img = OC.imagePath('core', 'loading.gif');
+ if(currentUploads === 0) {
+ var img = OC.imagePath('core', 'filetypes/folder.png');
data.context.find('td.filename').attr('style','background-image:url('+img+')');
uploadtext.text(translatedText);
- uploadtext.show();
+ uploadtext.hide();
} else {
uploadtext.text(translatedText);
}
+
+ // update folder size
+ var size = parseInt(data.context.data('size'));
+ size += parseInt(file.size);
+ data.context.attr('data-size', size);
+ data.context.find('td.filesize').text(humanFileSize(size));
+
} else {
+
// add as stand-alone row to filelist
- var uniqueName = getUniqueName(data.files[0].name);
- var size=t('files','Pending');
- if(data.files[0].size>=0){
+ var size=t('files', 'Pending');
+ if (data.files[0].size>=0){
size=data.files[0].size;
}
var date=new Date();
var param = {};
if ($('#publicUploadRequestToken').length) {
- param.download_url = document.location.href + '&download&path=/' + $('#dir').val() + '/' + uniqueName;
+ param.download_url = document.location.href + '&download&path=/' + $('#dir').val() + '/' + file.name;
}
+ //should the file exist in the list remove it
+ FileList.remove(file.name);
+
// create new file context
- data.context = FileList.addFile(uniqueName,size,date,true,false,param);
+ data.context = FileList.addFile(file.name, file.size, date, false, false, param);
+
+ // update file data
+ data.context.attr('data-mime',file.mime).attr('data-id',file.id);
+
+ var permissions = data.context.data('permissions');
+ if(permissions != file.permissions) {
+ data.context.attr('data-permissions', file.permissions);
+ data.context.data('permissions', file.permissions);
+ }
+ FileActions.display(data.context.find('td.filename'));
+ var path = getPathForPreview(file.name);
+ lazyLoadPreview(path, file.mime, function(previewpath){
+ data.context.find('td.filename').attr('style','background-image:url('+previewpath+')');
+ });
}
}
});
- file_upload_start.on('fileuploaddone', function(e, data) {
- // only update the fileList if it exists
- if ($('#fileList').length > 0) {
- var response;
- if (typeof data.result === 'string') {
- response = data.result;
- } else {
- // fetch response from iframe
- response = data.result[0].body.innerText;
- }
- var result=$.parseJSON(response);
-
- if(typeof result[0] !== 'undefined' && result[0].status === 'success') {
- var file = result[0];
-
- if (data.context.data('type') === 'file') {
- // update file data
- data.context.attr('data-mime',file.mime).attr('data-id',file.id);
- var size = data.context.data('size');
- if(size!=file.size){
- data.context.attr('data-size', file.size);
- data.context.find('td.filesize').text(humanFileSize(file.size));
- }
- if (FileList.loadingDone) {
- FileList.loadingDone(file.name, file.id);
- }
- } else {
- // update upload counter ui
- var uploadtext = data.context.find('.uploadtext');
- var currentUploads = parseInt(uploadtext.attr('currentUploads'));
- currentUploads -= 1;
- uploadtext.attr('currentUploads', currentUploads);
- if(currentUploads === 0) {
- var img = OC.imagePath('core', 'filetypes/folder.png');
- data.context.find('td.filename').attr('style','background-image:url('+img+')');
- uploadtext.text('');
- uploadtext.hide();
- } else {
- uploadtext.text(currentUploads + ' ' + t('files', 'files uploading'));
- }
+ file_upload_start.on('fileuploadstop', function(e, data) {
+ OC.Upload.log('filelist handle fileuploadstop', e, data);
- // update folder size
- var size = parseInt(data.context.data('size'));
- size += parseInt(file.size);
- data.context.attr('data-size', size);
- data.context.find('td.filesize').text(humanFileSize(size));
-
- }
- }
+ //if user pressed cancel hide upload chrome
+ if (data.errorThrown === 'abort') {
+ //cleanup uploading to a dir
+ var uploadtext = $('tr .uploadtext');
+ var img = OC.imagePath('core', 'filetypes/folder.png');
+ uploadtext.parents('td.filename').attr('style','background-image:url('+img+')');
+ uploadtext.fadeOut();
+ uploadtext.attr('currentUploads', 0);
}
});
file_upload_start.on('fileuploadfail', function(e, data) {
- // only update the fileList if it exists
- // cleanup files, error notification has been shown by fileupload code
- var tr = data.context;
- if (typeof tr === 'undefined') {
- tr = $('tr').filterAttr('data-file', data.files[0].name);
- }
- if (tr.attr('data-type') === 'dir') {
+ OC.Upload.log('filelist handle fileuploadfail', e, data);
+
+ //if user pressed cancel hide upload chrome
+ if (data.errorThrown === 'abort') {
//cleanup uploading to a dir
- var uploadtext = tr.find('.uploadtext');
+ var uploadtext = $('tr .uploadtext');
var img = OC.imagePath('core', 'filetypes/folder.png');
- tr.find('td.filename').attr('style','background-image:url('+img+')');
- uploadtext.text('');
- uploadtext.hide(); //TODO really hide already
- } else {
- //remove file
- tr.fadeOut();
- tr.remove();
+ uploadtext.parents('td.filename').attr('style','background-image:url('+img+')');
+ uploadtext.fadeOut();
+ uploadtext.attr('currentUploads', 0);
}
});
@@ -818,16 +868,16 @@ $(document).ready(function(){
FileList.replaceIsNewFile = null;
}
FileList.lastAction = null;
- OC.Notification.hide();
+ OC.Notification.hide();
});
$('#notification:first-child').on('click', '.replace', function() {
- OC.Notification.hide(function() {
- FileList.replace($('#notification > span').attr('data-oldName'), $('#notification > span').attr('data-newName'), $('#notification > span').attr('data-isNewFile'));
- });
+ OC.Notification.hide(function() {
+ FileList.replace($('#notification > span').attr('data-oldName'), $('#notification > span').attr('data-newName'), $('#notification > span').attr('data-isNewFile'));
+ });
});
$('#notification:first-child').on('click', '.suggest', function() {
$('tr').filterAttr('data-file', $('#notification > span').attr('data-oldName')).show();
- OC.Notification.hide();
+ OC.Notification.hide();
});
$('#notification:first-child').on('click', '.cancel', function() {
if ($('#notification > span').attr('data-isNewFile')) {
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index c2418cfa751355f8f0a028a64aa3f13300ffe789..ec688eaf63efff3ea5d0dc70db8e85e08a45f2ac 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -1,31 +1,4 @@
-var uploadingFiles = {};
Files={
- cancelUpload:function(filename) {
- if(uploadingFiles[filename]) {
- uploadingFiles[filename].abort();
- delete uploadingFiles[filename];
- return true;
- }
- return false;
- },
- cancelUploads:function() {
- $.each(uploadingFiles,function(index,file) {
- if(typeof file['abort'] === 'function') {
- file.abort();
- var filename = $('tr').filterAttr('data-file',index);
- filename.hide();
- filename.find('input[type="checkbox"]').removeAttr('checked');
- filename.removeClass('selected');
- } else {
- $.each(file,function(i,f) {
- f.abort();
- delete file[i];
- });
- }
- delete uploadingFiles[index];
- });
- procesSelection();
- },
updateMaxUploadFilesize:function(response) {
if(response == undefined) {
return;
@@ -208,7 +181,8 @@ $(document).ready(function() {
// Trigger cancelling of file upload
$('#uploadprogresswrapper .stop').on('click', function() {
- Files.cancelUploads();
+ OC.Upload.cancelUploads();
+ procesSelection();
});
// Show trash bin
@@ -384,6 +358,11 @@ $(document).ready(function() {
}
});
}
+
+ //scroll to and highlight preselected file
+ if (getURLParameter('scrollto')) {
+ FileList.scrollTo(getURLParameter('scrollto'));
+ }
});
function scanFiles(force, dir, users){
@@ -525,7 +504,7 @@ var folderDropOptions={
$('#notification').fadeIn();
}
} else {
- OC.dialogs.alert(t('Error moving file'), t('core', 'Error'));
+ OC.dialogs.alert(t('files', 'Error moving file'), t('files', 'Error'));
}
});
});
@@ -563,7 +542,7 @@ var crumbDropOptions={
$('#notification').fadeIn();
}
} else {
- OC.dialogs.alert(t('Error moving file'), t('core', 'Error'));
+ OC.dialogs.alert(t('files', 'Error moving file'), t('files', 'Error'));
}
});
});
@@ -653,15 +632,29 @@ function getPathForPreview(name) {
return path;
}
-function lazyLoadPreview(path, mime, ready) {
- getMimeIcon(mime,ready);
- var x = $('#filestable').data('preview-x');
- var y = $('#filestable').data('preview-y');
- var previewURL = OC.Router.generate('core_ajax_preview', {file: encodeURIComponent(path), x:x, y:y});
- $.get(previewURL, function() {
- previewURL = previewURL.replace('(','%28');
- previewURL = previewURL.replace(')','%29');
- ready(previewURL + '&reload=true');
+function lazyLoadPreview(path, mime, ready, width, height) {
+ // get mime icon url
+ getMimeIcon(mime, function(iconURL) {
+ ready(iconURL); // set mimeicon URL
+
+ // now try getting a preview thumbnail URL
+ if ( ! width ) {
+ width = $('#filestable').data('preview-x');
+ }
+ if ( ! height ) {
+ height = $('#filestable').data('preview-y');
+ }
+ if( $('#publicUploadButtonMock').length ) {
+ var previewURL = OC.Router.generate('core_ajax_public_preview', {file: encodeURIComponent(path), x:width, y:height, t:$('#dirToken').val()});
+ } else {
+ var previewURL = OC.Router.generate('core_ajax_preview', {file: encodeURIComponent(path), x:width, y:height});
+ }
+ $.get(previewURL, function() {
+ previewURL = previewURL.replace('(', '%28');
+ previewURL = previewURL.replace(')', '%29');
+ //set preview thumbnail URL
+ ready(previewURL + '&reload=true');
+ });
});
}
diff --git a/apps/files/js/jquery.fileupload.js b/apps/files/js/jquery.fileupload.js
index a89e9dc2c4498fe50c7d8a4985bd952c639310f1..f9f6cc3a3821d0cf0c44d231a5b81a9b09366541 100644
--- a/apps/files/js/jquery.fileupload.js
+++ b/apps/files/js/jquery.fileupload.js
@@ -1,5 +1,5 @@
/*
- * jQuery File Upload Plugin 5.9
+ * jQuery File Upload Plugin 5.32.2
* https://github.com/blueimp/jQuery-File-Upload
*
* Copyright 2010, Sebastian Tschan
@@ -10,7 +10,7 @@
*/
/*jslint nomen: true, unparam: true, regexp: true */
-/*global define, window, document, Blob, FormData, location */
+/*global define, window, document, location, File, Blob, FormData */
(function (factory) {
'use strict';
@@ -27,12 +27,28 @@
}(function ($) {
'use strict';
+ // Detect file input support, based on
+ // http://viljamis.com/blog/2012/file-upload-support-on-mobile/
+ $.support.fileInput = !(new RegExp(
+ // Handle devices which give false positives for the feature detection:
+ '(Android (1\\.[0156]|2\\.[01]))' +
+ '|(Windows Phone (OS 7|8\\.0))|(XBLWP)|(ZuneWP)|(WPDesktop)' +
+ '|(w(eb)?OSBrowser)|(webOS)' +
+ '|(Kindle/(1\\.0|2\\.[05]|3\\.0))'
+ ).test(window.navigator.userAgent) ||
+ // Feature detection for all other devices:
+ $('<input type="file">').prop('disabled'));
+
// The FileReader API is not actually used, but works as feature detection,
// as e.g. Safari supports XHR file uploads via the FormData API,
// but not non-multipart XHR file uploads:
$.support.xhrFileUpload = !!(window.XMLHttpRequestUpload && window.FileReader);
$.support.xhrFormDataFileUpload = !!window.FormData;
+ // Detect support for Blob slicing (required for chunked uploads):
+ $.support.blobSlice = window.Blob && (Blob.prototype.slice ||
+ Blob.prototype.webkitSlice || Blob.prototype.mozSlice);
+
// The fileupload widget listens for change events on file input fields defined
// via fileInput setting and paste or drop events of the given dropZone.
// In addition to the default jQuery Widget methods, the fileupload widget
@@ -44,17 +60,16 @@
$.widget('blueimp.fileupload', {
options: {
- // The namespace used for event handler binding on the dropZone and
- // fileInput collections.
- // If not set, the name of the widget ("fileupload") is used.
- namespace: undefined,
- // The drop target collection, by the default the complete document.
- // Set to null or an empty collection to disable drag & drop support:
+ // The drop target element(s), by the default the complete document.
+ // Set to null to disable drag & drop support:
dropZone: $(document),
- // The file input field collection, that is listened for change events.
+ // The paste target element(s), by the default the complete document.
+ // Set to null to disable paste support:
+ pasteZone: $(document),
+ // The file input field(s), that are listened to for change events.
// If undefined, it is set to the file input fields inside
// of the widget element on plugin initialization.
- // Set to null or an empty collection to disable the change listener.
+ // Set to null to disable the change listener.
fileInput: undefined,
// By default, the file input field is replaced with a clone after
// each input field change event. This is required for iframe transport
@@ -63,7 +78,8 @@
replaceFileInput: true,
// The parameter name for the file form data (the request argument name).
// If undefined or empty, the name property of the file input field is
- // used, or "files[]" if the file input name property is also empty:
+ // used, or "files[]" if the file input name property is also empty,
+ // can be a string or an array of strings:
paramName: undefined,
// By default, each file of a selection is uploaded using an individual
// request for XHR type uploads. Set to false to upload file
@@ -108,6 +124,29 @@
// global progress calculation. Set the following option to false to
// prevent recalculating the global progress data:
recalculateProgress: true,
+ // Interval in milliseconds to calculate and trigger progress events:
+ progressInterval: 100,
+ // Interval in milliseconds to calculate progress bitrate:
+ bitrateInterval: 500,
+ // By default, uploads are started automatically when adding files:
+ autoUpload: true,
+
+ // Error and info messages:
+ messages: {
+ uploadedBytes: 'Uploaded bytes exceed file size'
+ },
+
+ // Translation function, gets the message key to be translated
+ // and an object with context specific data as arguments:
+ i18n: function (message, context) {
+ message = this.messages[message] || message.toString();
+ if (context) {
+ $.each(context, function (key, value) {
+ message = message.replace('{' + key + '}', value);
+ });
+ }
+ return message;
+ },
// Additional form data to be sent along with the file uploads can be set
// using this option, which accepts an array of objects with name and
@@ -121,48 +160,81 @@
// The add callback is invoked as soon as files are added to the fileupload
// widget (via file input selection, drag & drop, paste or add API call).
// If the singleFileUploads option is enabled, this callback will be
- // called once for each file in the selection for XHR file uplaods, else
+ // called once for each file in the selection for XHR file uploads, else
// once for each file selection.
+ //
// The upload starts when the submit method is invoked on the data parameter.
// The data object contains a files property holding the added files
- // and allows to override plugin options as well as define ajax settings.
+ // and allows you to override plugin options as well as define ajax settings.
+ //
// Listeners for this callback can also be bound the following way:
// .bind('fileuploadadd', func);
+ //
// data.submit() returns a Promise object and allows to attach additional
// handlers using jQuery's Deferred callbacks:
// data.submit().done(func).fail(func).always(func);
add: function (e, data) {
- data.submit();
+ if (data.autoUpload || (data.autoUpload !== false &&
+ $(this).fileupload('option', 'autoUpload'))) {
+ data.process().done(function () {
+ data.submit();
+ });
+ }
},
// Other callbacks:
+
// Callback for the submit event of each file upload:
// submit: function (e, data) {}, // .bind('fileuploadsubmit', func);
+
// Callback for the start of each file upload request:
// send: function (e, data) {}, // .bind('fileuploadsend', func);
+
// Callback for successful uploads:
// done: function (e, data) {}, // .bind('fileuploaddone', func);
+
// Callback for failed (abort or error) uploads:
// fail: function (e, data) {}, // .bind('fileuploadfail', func);
+
// Callback for completed (success, abort or error) requests:
// always: function (e, data) {}, // .bind('fileuploadalways', func);
+
// Callback for upload progress events:
// progress: function (e, data) {}, // .bind('fileuploadprogress', func);
+
// Callback for global upload progress events:
// progressall: function (e, data) {}, // .bind('fileuploadprogressall', func);
+
// Callback for uploads start, equivalent to the global ajaxStart event:
// start: function (e) {}, // .bind('fileuploadstart', func);
+
// Callback for uploads stop, equivalent to the global ajaxStop event:
// stop: function (e) {}, // .bind('fileuploadstop', func);
- // Callback for change events of the fileInput collection:
+
+ // Callback for change events of the fileInput(s):
// change: function (e, data) {}, // .bind('fileuploadchange', func);
- // Callback for paste events to the dropZone collection:
+
+ // Callback for paste events to the pasteZone(s):
// paste: function (e, data) {}, // .bind('fileuploadpaste', func);
- // Callback for drop events of the dropZone collection:
+
+ // Callback for drop events of the dropZone(s):
// drop: function (e, data) {}, // .bind('fileuploaddrop', func);
- // Callback for dragover events of the dropZone collection:
+
+ // Callback for dragover events of the dropZone(s):
// dragover: function (e) {}, // .bind('fileuploaddragover', func);
+ // Callback for the start of each chunk upload request:
+ // chunksend: function (e, data) {}, // .bind('fileuploadchunksend', func);
+
+ // Callback for successful chunk uploads:
+ // chunkdone: function (e, data) {}, // .bind('fileuploadchunkdone', func);
+
+ // Callback for failed (abort or error) chunk uploads:
+ // chunkfail: function (e, data) {}, // .bind('fileuploadchunkfail', func);
+
+ // Callback for completed (success, abort or error) chunk upload requests:
+ // chunkalways: function (e, data) {}, // .bind('fileuploadchunkalways', func);
+
// The plugin options are used as settings object for the ajax calls.
// The following are jQuery ajax settings required for the file uploads:
processData: false,
@@ -170,15 +242,36 @@
cache: false
},
- // A list of options that require a refresh after assigning a new value:
- _refreshOptionsList: [
- 'namespace',
- 'dropZone',
+ // A list of options that require reinitializing event listeners and/or
+ // special initialization code:
+ _specialOptions: [
'fileInput',
+ 'dropZone',
+ 'pasteZone',
'multipart',
'forceIframeTransport'
],
+ _blobSlice: $.support.blobSlice && function () {
+ var slice = this.slice || this.webkitSlice || this.mozSlice;
+ return slice.apply(this, arguments);
+ },
+
+ _BitrateTimer: function () {
+ this.timestamp = ((Date.now) ? Date.now() : (new Date()).getTime());
+ this.loaded = 0;
+ this.bitrate = 0;
+ this.getBitrate = function (now, loaded, interval) {
+ var timeDiff = now - this.timestamp;
+ if (!this.bitrate || !interval || timeDiff > interval) {
+ this.bitrate = (loaded - this.loaded) * (1000 / timeDiff) * 8;
+ this.loaded = loaded;
+ this.timestamp = now;
+ }
+ return this.bitrate;
+ };
+ },
+
_isXHRUpload: function (options) {
return !options.forceIframeTransport &&
((!options.multipart && $.support.xhrFileUpload) ||
@@ -189,9 +282,11 @@
var formData;
if (typeof options.formData === 'function') {
return options.formData(options.form);
- } else if ($.isArray(options.formData)) {
+ }
+ if ($.isArray(options.formData)) {
return options.formData;
- } else if (options.formData) {
+ }
+ if ($.type(options.formData) === 'object') {
formData = [];
$.each(options.formData, function (name, value) {
formData.push({name: name, value: value});
@@ -209,28 +304,66 @@
return total;
},
+ _initProgressObject: function (obj) {
+ var progress = {
+ loaded: 0,
+ total: 0,
+ bitrate: 0
+ };
+ if (obj._progress) {
+ $.extend(obj._progress, progress);
+ } else {
+ obj._progress = progress;
+ }
+ },
+
+ _initResponseObject: function (obj) {
+ var prop;
+ if (obj._response) {
+ for (prop in obj._response) {
+ if (obj._response.hasOwnProperty(prop)) {
+ delete obj._response[prop];
+ }
+ }
+ } else {
+ obj._response = {};
+ }
+ },
+
_onProgress: function (e, data) {
if (e.lengthComputable) {
- var total = data.total || this._getTotal(data.files),
- loaded = parseInt(
- e.loaded / e.total * (data.chunkSize || total),
- 10
- ) + (data.uploadedBytes || 0);
- this._loaded += loaded - (data.loaded || data.uploadedBytes || 0);
- data.lengthComputable = true;
- data.loaded = loaded;
- data.total = total;
+ var now = ((Date.now) ? Date.now() : (new Date()).getTime()),
+ loaded;
+ if (data._time && data.progressInterval &&
+ (now - data._time < data.progressInterval) &&
+ e.loaded !== e.total) {
+ return;
+ }
+ data._time = now;
+ loaded = Math.floor(
+ e.loaded / e.total * (data.chunkSize || data._progress.total)
+ ) + (data.uploadedBytes || 0);
+ // Add the difference from the previously loaded state
+ // to the global loaded counter:
+ this._progress.loaded += (loaded - data._progress.loaded);
+ this._progress.bitrate = this._bitrateTimer.getBitrate(
+ now,
+ this._progress.loaded,
+ data.bitrateInterval
+ );
+ data._progress.loaded = data.loaded = loaded;
+ data._progress.bitrate = data.bitrate = data._bitrateTimer.getBitrate(
+ now,
+ loaded,
+ data.bitrateInterval
+ );
// Trigger a custom progress event with a total data property set
// to the file size(s) of the current upload and a loaded data
// property calculated accordingly:
this._trigger('progress', e, data);
// Trigger a global progress event for all current file uploads,
// including ajax calls queued for sequential file uploads:
- this._trigger('progressall', e, {
- lengthComputable: true,
- loaded: this._loaded,
- total: this._total
- });
+ this._trigger('progressall', e, this._progress);
}
},
@@ -254,34 +387,30 @@
}
},
+ _isInstanceOf: function (type, obj) {
+ // Cross-frame instanceof check
+ return Object.prototype.toString.call(obj) === '[object ' + type + ']';
+ },
+
_initXHRData: function (options) {
- var formData,
+ var that = this,
+ formData,
file = options.files[0],
// Ignore non-multipart setting if not supported:
- multipart = options.multipart || !$.support.xhrFileUpload;
- if (!multipart || options.blob) {
- // For non-multipart uploads and chunked uploads,
- // file meta data is not part of the request body,
- // so we transmit this data as part of the HTTP headers.
- // For cross domain requests, these headers must be allowed
- // via Access-Control-Allow-Headers or removed using
- // the beforeSend callback:
- options.headers = $.extend(options.headers, {
- 'X-File-Name': file.name,
- 'X-File-Type': file.type,
- 'X-File-Size': file.size
- });
- if (!options.blob) {
- // Non-chunked non-multipart upload:
- options.contentType = file.type;
- options.data = file;
- } else if (!multipart) {
- // Chunked non-multipart upload:
- options.contentType = 'application/octet-stream';
- options.data = options.blob;
- }
+ multipart = options.multipart || !$.support.xhrFileUpload,
+ paramName = options.paramName[0];
+ options.headers = options.headers || {};
+ if (options.contentRange) {
+ options.headers['Content-Range'] = options.contentRange;
+ }
+ if (!multipart || options.blob || !this._isInstanceOf('File', file)) {
+ options.headers['Content-Disposition'] = 'attachment; filename="' +
+ encodeURI(file.name) + '"';
}
- if (multipart && $.support.xhrFormDataFileUpload) {
+ if (!multipart) {
+ options.contentType = file.type;
+ options.data = options.blob || file;
+ } else if ($.support.xhrFormDataFileUpload) {
if (options.postMessage) {
// window.postMessage does not allow sending FormData
// objects, so we just add the File/Blob objects to
@@ -290,19 +419,19 @@
formData = this._getFormData(options);
if (options.blob) {
formData.push({
- name: options.paramName,
+ name: paramName,
value: options.blob
});
} else {
$.each(options.files, function (index, file) {
formData.push({
- name: options.paramName,
+ name: options.paramName[index] || paramName,
value: file
});
});
}
} else {
- if (options.formData instanceof FormData) {
+ if (that._isInstanceOf('FormData', options.formData)) {
formData = options.formData;
} else {
formData = new FormData();
@@ -311,14 +440,18 @@
});
}
if (options.blob) {
- formData.append(options.paramName, options.blob, file.name);
+ formData.append(paramName, options.blob, file.name);
} else {
$.each(options.files, function (index, file) {
- // File objects are also Blob instances.
// This check allows the tests to run with
// dummy objects:
- if (file instanceof Blob) {
- formData.append(options.paramName, file, file.name);
+ if (that._isInstanceOf('File', file) ||
+ that._isInstanceOf('Blob', file)) {
+ formData.append(
+ options.paramName[index] || paramName,
+ file,
+ file.name
+ );
}
});
}
@@ -330,13 +463,13 @@
},
_initIframeSettings: function (options) {
+ var targetHost = $('<a></a>').prop('href', options.url).prop('host');
// Setting the dataType to iframe enables the iframe transport:
options.dataType = 'iframe ' + (options.dataType || '');
// The iframe transport accepts a serialized array as form data:
options.formData = this._getFormData(options);
// Add redirect url to form data on cross-domain uploads:
- if (options.redirect && $('<a></a>').prop('href', options.url)
- .prop('host') !== location.host) {
+ if (options.redirect && targetHost && targetHost !== location.host) {
options.formData.push({
name: options.redirectParamName || 'redirect',
value: options.redirect
@@ -358,29 +491,58 @@
options.dataType = 'postmessage ' + (options.dataType || '');
}
} else {
- this._initIframeSettings(options, 'iframe');
+ this._initIframeSettings(options);
}
},
+ _getParamName: function (options) {
+ var fileInput = $(options.fileInput),
+ paramName = options.paramName;
+ if (!paramName) {
+ paramName = [];
+ fileInput.each(function () {
+ var input = $(this),
+ name = input.prop('name') || 'files[]',
+ i = (input.prop('files') || [1]).length;
+ while (i) {
+ paramName.push(name);
+ i -= 1;
+ }
+ });
+ if (!paramName.length) {
+ paramName = [fileInput.prop('name') || 'files[]'];
+ }
+ } else if (!$.isArray(paramName)) {
+ paramName = [paramName];
+ }
+ return paramName;
+ },
+
_initFormSettings: function (options) {
// Retrieve missing options from the input field and the
// associated form, if available:
if (!options.form || !options.form.length) {
options.form = $(options.fileInput.prop('form'));
+ // If the given file input doesn't have an associated form,
+ // use the default widget file input's form:
+ if (!options.form.length) {
+ options.form = $(this.options.fileInput.prop('form'));
+ }
}
- if (!options.paramName) {
- options.paramName = options.fileInput.prop('name') ||
- 'files[]';
- }
+ options.paramName = this._getParamName(options);
if (!options.url) {
options.url = options.form.prop('action') || location.href;
}
// The HTTP request method must be "POST" or "PUT":
options.type = (options.type || options.form.prop('method') || '')
.toUpperCase();
- if (options.type !== 'POST' && options.type !== 'PUT') {
+ if (options.type !== 'POST' && options.type !== 'PUT' &&
+ options.type !== 'PATCH') {
options.type = 'POST';
}
+ if (!options.formAcceptCharset) {
+ options.formAcceptCharset = options.form.attr('accept-charset');
+ }
},
_getAJAXSettings: function (data) {
@@ -390,6 +552,21 @@
return options;
},
+ // jQuery 1.6 doesn't provide .state(),
+ // while jQuery 1.8+ removed .isRejected() and .isResolved():
+ _getDeferredState: function (deferred) {
+ if (deferred.state) {
+ return deferred.state();
+ }
+ if (deferred.isResolved()) {
+ return 'resolved';
+ }
+ if (deferred.isRejected()) {
+ return 'rejected';
+ }
+ return 'pending';
+ },
+
// Maps jqXHR callbacks to the equivalent
// methods of the given Promise object:
_enhancePromise: function (promise) {
@@ -414,24 +591,77 @@
return this._enhancePromise(promise);
},
+ // Adds convenience methods to the data callback argument:
+ _addConvenienceMethods: function (e, data) {
+ var that = this,
+ getPromise = function (data) {
+ return $.Deferred().resolveWith(that, [data]).promise();
+ };
+ data.process = function (resolveFunc, rejectFunc) {
+ if (resolveFunc || rejectFunc) {
+ data._processQueue = this._processQueue =
+ (this._processQueue || getPromise(this))
+ .pipe(resolveFunc, rejectFunc);
+ }
+ return this._processQueue || getPromise(this);
+ };
+ data.submit = function () {
+ if (this.state() !== 'pending') {
+ data.jqXHR = this.jqXHR =
+ (that._trigger('submit', e, this) !== false) &&
+ that._onSend(e, this);
+ }
+ return this.jqXHR || that._getXHRPromise();
+ };
+ data.abort = function () {
+ if (this.jqXHR) {
+ return this.jqXHR.abort();
+ }
+ return that._getXHRPromise();
+ };
+ data.state = function () {
+ if (this.jqXHR) {
+ return that._getDeferredState(this.jqXHR);
+ }
+ if (this._processQueue) {
+ return that._getDeferredState(this._processQueue);
+ }
+ };
+ data.progress = function () {
+ return this._progress;
+ };
+ data.response = function () {
+ return this._response;
+ };
+ },
+
+ // Parses the Range header from the server response
+ // and returns the uploaded bytes:
+ _getUploadedBytes: function (jqXHR) {
+ var range = jqXHR.getResponseHeader('Range'),
+ parts = range && range.split('-'),
+ upperBytesPos = parts && parts.length > 1 &&
+ parseInt(parts[1], 10);
+ return upperBytesPos && upperBytesPos + 1;
+ },
+
// Uploads a file in multiple, sequential requests
// by splitting the file up in multiple blob chunks.
// If the second parameter is true, only tests if the file
// should be uploaded in chunks, but does not invoke any
// upload requests:
_chunkedUpload: function (options, testOnly) {
+ options.uploadedBytes = options.uploadedBytes || 0;
var that = this,
file = options.files[0],
fs = file.size,
- ub = options.uploadedBytes = options.uploadedBytes || 0,
+ ub = options.uploadedBytes,
mcs = options.maxChunkSize || fs,
- // Use the Blob methods with the slice implementation
- // according to the W3C Blob API specification:
- slice = file.webkitSlice || file.mozSlice || file.slice,
- upload,
- n,
+ slice = this._blobSlice,
+ dfd = $.Deferred(),
+ promise = dfd.promise(),
jqXHR,
- pipe;
+ upload;
if (!(this._isXHRUpload(options) && slice && (ub || mcs < fs)) ||
options.data) {
return false;
@@ -440,62 +670,84 @@
return true;
}
if (ub >= fs) {
- file.error = 'uploadedBytes';
+ file.error = options.i18n('uploadedBytes');
return this._getXHRPromise(
false,
options.context,
[null, 'error', file.error]
);
}
- // n is the number of blobs to upload,
- // calculated via filesize, uploaded bytes and max chunk size:
- n = Math.ceil((fs - ub) / mcs);
- // The chunk upload method accepting the chunk number as parameter:
- upload = function (i) {
- if (!i) {
- return that._getXHRPromise(true, options.context);
- }
- // Upload the blobs in sequential order:
- return upload(i -= 1).pipe(function () {
- // Clone the options object for each chunk upload:
- var o = $.extend({}, options);
- o.blob = slice.call(
- file,
- ub + i * mcs,
- ub + (i + 1) * mcs
- );
- // Store the current chunk size, as the blob itself
- // will be dereferenced after data processing:
- o.chunkSize = o.blob.size;
- // Process the upload data (the blob and potential form data):
- that._initXHRData(o);
- // Add progress listeners for this chunk upload:
- that._initProgressListener(o);
- jqXHR = ($.ajax(o) || that._getXHRPromise(false, o.context))
- .done(function () {
- // Create a progress event if upload is done and
- // no progress event has been invoked for this chunk:
- if (!o.loaded) {
- that._onProgress($.Event('progress', {
- lengthComputable: true,
- loaded: o.chunkSize,
- total: o.chunkSize
- }), o);
- }
- options.uploadedBytes = o.uploadedBytes +=
- o.chunkSize;
- });
- return jqXHR;
- });
+ // The chunk upload method:
+ upload = function () {
+ // Clone the options object for each chunk upload:
+ var o = $.extend({}, options),
+ currentLoaded = o._progress.loaded;
+ o.blob = slice.call(
+ file,
+ ub,
+ ub + mcs,
+ file.type
+ );
+ // Store the current chunk size, as the blob itself
+ // will be dereferenced after data processing:
+ o.chunkSize = o.blob.size;
+ // Expose the chunk bytes position range:
+ o.contentRange = 'bytes ' + ub + '-' +
+ (ub + o.chunkSize - 1) + '/' + fs;
+ // Process the upload data (the blob and potential form data):
+ that._initXHRData(o);
+ // Add progress listeners for this chunk upload:
+ that._initProgressListener(o);
+ jqXHR = ((that._trigger('chunksend', null, o) !== false && $.ajax(o)) ||
+ that._getXHRPromise(false, o.context))
+ .done(function (result, textStatus, jqXHR) {
+ ub = that._getUploadedBytes(jqXHR) ||
+ (ub + o.chunkSize);
+ // Create a progress event if no final progress event
+ // with loaded equaling total has been triggered
+ // for this chunk:
+ if (currentLoaded + o.chunkSize - o._progress.loaded) {
+ that._onProgress($.Event('progress', {
+ lengthComputable: true,
+ loaded: ub - o.uploadedBytes,
+ total: ub - o.uploadedBytes
+ }), o);
+ }
+ options.uploadedBytes = o.uploadedBytes = ub;
+ o.result = result;
+ o.textStatus = textStatus;
+ o.jqXHR = jqXHR;
+ that._trigger('chunkdone', null, o);
+ that._trigger('chunkalways', null, o);
+ if (ub < fs) {
+ // File upload not yet complete,
+ // continue with the next chunk:
+ upload();
+ } else {
+ dfd.resolveWith(
+ o.context,
+ [result, textStatus, jqXHR]
+ );
+ }
+ })
+ .fail(function (jqXHR, textStatus, errorThrown) {
+ o.jqXHR = jqXHR;
+ o.textStatus = textStatus;
+ o.errorThrown = errorThrown;
+ that._trigger('chunkfail', null, o);
+ that._trigger('chunkalways', null, o);
+ dfd.rejectWith(
+ o.context,
+ [jqXHR, textStatus, errorThrown]
+ );
+ });
};
- // Return the piped Promise object, enhanced with an abort method,
- // which is delegated to the jqXHR object of the current upload,
- // and jqXHR callbacks mapped to the equivalent Promise methods:
- pipe = upload(n);
- pipe.abort = function () {
+ this._enhancePromise(promise);
+ promise.abort = function () {
return jqXHR.abort();
};
- return this._enhancePromise(pipe);
+ upload();
+ return promise;
},
_beforeSend: function (e, data) {
@@ -504,99 +756,113 @@
// and no other uploads are currently running,
// equivalent to the global ajaxStart event:
this._trigger('start');
+ // Set timer for global bitrate progress calculation:
+ this._bitrateTimer = new this._BitrateTimer();
+ // Reset the global progress values:
+ this._progress.loaded = this._progress.total = 0;
+ this._progress.bitrate = 0;
}
+ // Make sure the container objects for the .response() and
+ // .progress() methods on the data object are available
+ // and reset to their initial state:
+ this._initResponseObject(data);
+ this._initProgressObject(data);
+ data._progress.loaded = data.loaded = data.uploadedBytes || 0;
+ data._progress.total = data.total = this._getTotal(data.files) || 1;
+ data._progress.bitrate = data.bitrate = 0;
this._active += 1;
// Initialize the global progress values:
- this._loaded += data.uploadedBytes || 0;
- this._total += this._getTotal(data.files);
+ this._progress.loaded += data.loaded;
+ this._progress.total += data.total;
},
_onDone: function (result, textStatus, jqXHR, options) {
- if (!this._isXHRUpload(options)) {
- // Create a progress event for each iframe load:
+ var total = options._progress.total,
+ response = options._response;
+ if (options._progress.loaded < total) {
+ // Create a progress event if no final progress event
+ // with loaded equaling total has been triggered:
this._onProgress($.Event('progress', {
lengthComputable: true,
- loaded: 1,
- total: 1
+ loaded: total,
+ total: total
}), options);
}
- options.result = result;
- options.textStatus = textStatus;
- options.jqXHR = jqXHR;
+ response.result = options.result = result;
+ response.textStatus = options.textStatus = textStatus;
+ response.jqXHR = options.jqXHR = jqXHR;
this._trigger('done', null, options);
},
_onFail: function (jqXHR, textStatus, errorThrown, options) {
- options.jqXHR = jqXHR;
- options.textStatus = textStatus;
- options.errorThrown = errorThrown;
- this._trigger('fail', null, options);
+ var response = options._response;
if (options.recalculateProgress) {
// Remove the failed (error or abort) file upload from
// the global progress calculation:
- this._loaded -= options.loaded || options.uploadedBytes || 0;
- this._total -= options.total || this._getTotal(options.files);
+ this._progress.loaded -= options._progress.loaded;
+ this._progress.total -= options._progress.total;
}
+ response.jqXHR = options.jqXHR = jqXHR;
+ response.textStatus = options.textStatus = textStatus;
+ response.errorThrown = options.errorThrown = errorThrown;
+ this._trigger('fail', null, options);
},
_onAlways: function (jqXHRorResult, textStatus, jqXHRorError, options) {
- this._active -= 1;
- options.textStatus = textStatus;
- if (jqXHRorError && jqXHRorError.always) {
- options.jqXHR = jqXHRorError;
- options.result = jqXHRorResult;
- } else {
- options.jqXHR = jqXHRorResult;
- options.errorThrown = jqXHRorError;
- }
+ // jqXHRorResult, textStatus and jqXHRorError are added to the
+ // options object via done and fail callbacks
this._trigger('always', null, options);
- if (this._active === 0) {
- // The stop callback is triggered when all uploads have
- // been completed, equivalent to the global ajaxStop event:
- this._trigger('stop');
- // Reset the global progress values:
- this._loaded = this._total = 0;
- }
},
_onSend: function (e, data) {
+ if (!data.submit) {
+ this._addConvenienceMethods(e, data);
+ }
var that = this,
jqXHR,
+ aborted,
slot,
pipe,
options = that._getAJAXSettings(data),
- send = function (resolve, args) {
+ send = function () {
that._sending += 1;
+ // Set timer for bitrate progress calculation:
+ options._bitrateTimer = new that._BitrateTimer();
jqXHR = jqXHR || (
- (resolve !== false &&
- that._trigger('send', e, options) !== false &&
- (that._chunkedUpload(options) || $.ajax(options))) ||
- that._getXHRPromise(false, options.context, args)
+ ((aborted || that._trigger('send', e, options) === false) &&
+ that._getXHRPromise(false, options.context, aborted)) ||
+ that._chunkedUpload(options) || $.ajax(options)
).done(function (result, textStatus, jqXHR) {
that._onDone(result, textStatus, jqXHR, options);
}).fail(function (jqXHR, textStatus, errorThrown) {
that._onFail(jqXHR, textStatus, errorThrown, options);
}).always(function (jqXHRorResult, textStatus, jqXHRorError) {
- that._sending -= 1;
that._onAlways(
jqXHRorResult,
textStatus,
jqXHRorError,
options
);
+ that._sending -= 1;
+ that._active -= 1;
if (options.limitConcurrentUploads &&
options.limitConcurrentUploads > that._sending) {
// Start the next queued upload,
// that has not been aborted:
var nextSlot = that._slots.shift();
while (nextSlot) {
- if (!nextSlot.isRejected()) {
+ if (that._getDeferredState(nextSlot) === 'pending') {
nextSlot.resolve();
break;
}
nextSlot = that._slots.shift();
}
}
+ if (that._active === 0) {
+ // The stop callback is triggered when all uploads have
+ // been completed, equivalent to the global ajaxStop event:
+ that._trigger('stop');
+ }
});
return jqXHR;
};
@@ -609,18 +875,19 @@
this._slots.push(slot);
pipe = slot.pipe(send);
} else {
- pipe = (this._sequence = this._sequence.pipe(send, send));
+ this._sequence = this._sequence.pipe(send, send);
+ pipe = this._sequence;
}
// Return the piped Promise object, enhanced with an abort method,
// which is delegated to the jqXHR object of the current upload,
// and jqXHR callbacks mapped to the equivalent Promise methods:
pipe.abort = function () {
- var args = [undefined, 'abort', 'abort'];
+ aborted = [undefined, 'abort', 'abort'];
if (!jqXHR) {
if (slot) {
- slot.rejectWith(args);
+ slot.rejectWith(options.context, aborted);
}
- return send(false, args);
+ return send();
}
return jqXHR.abort();
};
@@ -634,40 +901,43 @@
result = true,
options = $.extend({}, this.options, data),
limit = options.limitMultiFileUploads,
+ paramName = this._getParamName(options),
+ paramNameSet,
+ paramNameSlice,
fileSet,
i;
if (!(options.singleFileUploads || limit) ||
!this._isXHRUpload(options)) {
fileSet = [data.files];
+ paramNameSet = [paramName];
} else if (!options.singleFileUploads && limit) {
fileSet = [];
+ paramNameSet = [];
for (i = 0; i < data.files.length; i += limit) {
fileSet.push(data.files.slice(i, i + limit));
+ paramNameSlice = paramName.slice(i, i + limit);
+ if (!paramNameSlice.length) {
+ paramNameSlice = paramName;
+ }
+ paramNameSet.push(paramNameSlice);
}
+ } else {
+ paramNameSet = paramName;
}
data.originalFiles = data.files;
$.each(fileSet || data.files, function (index, element) {
- var files = fileSet ? element : [element],
- newData = $.extend({}, data, {files: files});
- newData.submit = function () {
- newData.jqXHR = this.jqXHR =
- (that._trigger('submit', e, this) !== false) &&
- that._onSend(e, this);
- return this.jqXHR;
- };
- return (result = that._trigger('add', e, newData));
+ var newData = $.extend({}, data);
+ newData.files = fileSet ? element : [element];
+ newData.paramName = paramNameSet[index];
+ that._initResponseObject(newData);
+ that._initProgressObject(newData);
+ that._addConvenienceMethods(e, newData);
+ result = that._trigger('add', e, newData);
+ return result;
});
return result;
},
- // File Normalization for Gecko 1.9.1 (Firefox 3.5) support:
- _normalizeFile: function (index, file) {
- if (file.name === undefined && file.size === undefined) {
- file.name = file.fileName;
- file.size = file.fileSize;
- }
- },
-
_replaceFileInput: function (input) {
var inputClone = input.clone(true);
$('<form></form>').append(inputClone)[0].reset();
@@ -677,7 +947,7 @@
// Avoid memory leaks with the detached file input:
$.cleanData(input.unbind('remove'));
// Replace the original file input element in the fileInput
- // collection with the clone, which has been copied including
+ // elements set with the clone, which has been copied including
// event handlers:
this.options.fileInput = this.options.fileInput.map(function (i, el) {
if (el === input[0]) {
@@ -692,102 +962,229 @@
}
},
- _onChange: function (e) {
- var that = e.data.fileupload,
- data = {
- files: $.each($.makeArray(e.target.files), that._normalizeFile),
- fileInput: $(e.target),
- form: $(e.target.form)
- };
- if (!data.files.length) {
+ _handleFileTreeEntry: function (entry, path) {
+ var that = this,
+ dfd = $.Deferred(),
+ errorHandler = function (e) {
+ if (e && !e.entry) {
+ e.entry = entry;
+ }
+ // Since $.when returns immediately if one
+ // Deferred is rejected, we use resolve instead.
+ // This allows valid files and invalid items
+ // to be returned together in one set:
+ dfd.resolve([e]);
+ },
+ dirReader;
+ path = path || '';
+ if (entry.isFile) {
+ if (entry._file) {
+ // Workaround for Chrome bug #149735
+ entry._file.relativePath = path;
+ dfd.resolve(entry._file);
+ } else {
+ entry.file(function (file) {
+ file.relativePath = path;
+ dfd.resolve(file);
+ }, errorHandler);
+ }
+ } else if (entry.isDirectory) {
+ dirReader = entry.createReader();
+ dirReader.readEntries(function (entries) {
+ that._handleFileTreeEntries(
+ entries,
+ path + entry.name + '/'
+ ).done(function (files) {
+ dfd.resolve(files);
+ }).fail(errorHandler);
+ }, errorHandler);
+ } else {
+ // Return an empy list for file system items
+ // other than files or directories:
+ dfd.resolve([]);
+ }
+ return dfd.promise();
+ },
+
+ _handleFileTreeEntries: function (entries, path) {
+ var that = this;
+ return $.when.apply(
+ $,
+ $.map(entries, function (entry) {
+ return that._handleFileTreeEntry(entry, path);
+ })
+ ).pipe(function () {
+ return Array.prototype.concat.apply(
+ [],
+ arguments
+ );
+ });
+ },
+
+ _getDroppedFiles: function (dataTransfer) {
+ dataTransfer = dataTransfer || {};
+ var items = dataTransfer.items;
+ if (items && items.length && (items[0].webkitGetAsEntry ||
+ items[0].getAsEntry)) {
+ return this._handleFileTreeEntries(
+ $.map(items, function (item) {
+ var entry;
+ if (item.webkitGetAsEntry) {
+ entry = item.webkitGetAsEntry();
+ if (entry) {
+ // Workaround for Chrome bug #149735:
+ entry._file = item.getAsFile();
+ }
+ return entry;
+ }
+ return item.getAsEntry();
+ })
+ );
+ }
+ return $.Deferred().resolve(
+ $.makeArray(dataTransfer.files)
+ ).promise();
+ },
+
+ _getSingleFileInputFiles: function (fileInput) {
+ fileInput = $(fileInput);
+ var entries = fileInput.prop('webkitEntries') ||
+ fileInput.prop('entries'),
+ files,
+ value;
+ if (entries && entries.length) {
+ return this._handleFileTreeEntries(entries);
+ }
+ files = $.makeArray(fileInput.prop('files'));
+ if (!files.length) {
+ value = fileInput.prop('value');
+ if (!value) {
+ return $.Deferred().resolve([]).promise();
+ }
// If the files property is not available, the browser does not
// support the File API and we add a pseudo File object with
// the input value as name with path information removed:
- data.files = [{name: e.target.value.replace(/^.*\\/, '')}];
- }
- if (that.options.replaceFileInput) {
- that._replaceFileInput(data.fileInput);
+ files = [{name: value.replace(/^.*\\/, '')}];
+ } else if (files[0].name === undefined && files[0].fileName) {
+ // File normalization for Safari 4 and Firefox 3:
+ $.each(files, function (index, file) {
+ file.name = file.fileName;
+ file.size = file.fileSize;
+ });
}
- if (that._trigger('change', e, data) === false ||
- that._onAdd(e, data) === false) {
- return false;
+ return $.Deferred().resolve(files).promise();
+ },
+
+ _getFileInputFiles: function (fileInput) {
+ if (!(fileInput instanceof $) || fileInput.length === 1) {
+ return this._getSingleFileInputFiles(fileInput);
}
+ return $.when.apply(
+ $,
+ $.map(fileInput, this._getSingleFileInputFiles)
+ ).pipe(function () {
+ return Array.prototype.concat.apply(
+ [],
+ arguments
+ );
+ });
+ },
+
+ _onChange: function (e) {
+ var that = this,
+ data = {
+ fileInput: $(e.target),
+ form: $(e.target.form)
+ };
+ this._getFileInputFiles(data.fileInput).always(function (files) {
+ data.files = files;
+ if (that.options.replaceFileInput) {
+ that._replaceFileInput(data.fileInput);
+ }
+ if (that._trigger('change', e, data) !== false) {
+ that._onAdd(e, data);
+ }
+ });
},
_onPaste: function (e) {
- var that = e.data.fileupload,
- cbd = e.originalEvent.clipboardData,
- items = (cbd && cbd.items) || [],
+ var items = e.originalEvent && e.originalEvent.clipboardData &&
+ e.originalEvent.clipboardData.items,
data = {files: []};
- $.each(items, function (index, item) {
- var file = item.getAsFile && item.getAsFile();
- if (file) {
- data.files.push(file);
+ if (items && items.length) {
+ $.each(items, function (index, item) {
+ var file = item.getAsFile && item.getAsFile();
+ if (file) {
+ data.files.push(file);
+ }
+ });
+ if (this._trigger('paste', e, data) === false ||
+ this._onAdd(e, data) === false) {
+ return false;
}
- });
- if (that._trigger('paste', e, data) === false ||
- that._onAdd(e, data) === false) {
- return false;
}
},
_onDrop: function (e) {
- var that = e.data.fileupload,
- dataTransfer = e.dataTransfer = e.originalEvent.dataTransfer,
- data = {
- files: $.each(
- $.makeArray(dataTransfer && dataTransfer.files),
- that._normalizeFile
- )
- };
- if (that._trigger('drop', e, data) === false ||
- that._onAdd(e, data) === false) {
- return false;
+ e.dataTransfer = e.originalEvent && e.originalEvent.dataTransfer;
+ var that = this,
+ dataTransfer = e.dataTransfer,
+ data = {};
+ if (dataTransfer && dataTransfer.files && dataTransfer.files.length) {
+ e.preventDefault();
+ this._getDroppedFiles(dataTransfer).always(function (files) {
+ data.files = files;
+ if (that._trigger('drop', e, data) !== false) {
+ that._onAdd(e, data);
+ }
+ });
}
- e.preventDefault();
},
_onDragOver: function (e) {
- var that = e.data.fileupload,
- dataTransfer = e.dataTransfer = e.originalEvent.dataTransfer;
- if (that._trigger('dragover', e) === false) {
- return false;
- }
+ e.dataTransfer = e.originalEvent && e.originalEvent.dataTransfer;
+ var dataTransfer = e.dataTransfer;
if (dataTransfer) {
- dataTransfer.dropEffect = dataTransfer.effectAllowed = 'copy';
+ if (this._trigger('dragover', e) === false) {
+ return false;
+ }
+ if ($.inArray('Files', dataTransfer.types) !== -1) {
+ dataTransfer.dropEffect = 'copy';
+ e.preventDefault();
+ }
}
- e.preventDefault();
},
_initEventHandlers: function () {
- var ns = this.options.namespace;
if (this._isXHRUpload(this.options)) {
- this.options.dropZone
- .bind('dragover.' + ns, {fileupload: this}, this._onDragOver)
- .bind('drop.' + ns, {fileupload: this}, this._onDrop)
- .bind('paste.' + ns, {fileupload: this}, this._onPaste);
+ this._on(this.options.dropZone, {
+ dragover: this._onDragOver,
+ drop: this._onDrop
+ });
+ this._on(this.options.pasteZone, {
+ paste: this._onPaste
+ });
+ }
+ if ($.support.fileInput) {
+ this._on(this.options.fileInput, {
+ change: this._onChange
+ });
}
- this.options.fileInput
- .bind('change.' + ns, {fileupload: this}, this._onChange);
},
_destroyEventHandlers: function () {
- var ns = this.options.namespace;
- this.options.dropZone
- .unbind('dragover.' + ns, this._onDragOver)
- .unbind('drop.' + ns, this._onDrop)
- .unbind('paste.' + ns, this._onPaste);
- this.options.fileInput
- .unbind('change.' + ns, this._onChange);
+ this._off(this.options.dropZone, 'dragover drop');
+ this._off(this.options.pasteZone, 'paste');
+ this._off(this.options.fileInput, 'change');
},
_setOption: function (key, value) {
- var refresh = $.inArray(key, this._refreshOptionsList) !== -1;
- if (refresh) {
+ var reinit = $.inArray(key, this._specialOptions) !== -1;
+ if (reinit) {
this._destroyEventHandlers();
}
- $.Widget.prototype._setOption.call(this, key, value);
- if (refresh) {
+ this._super(key, value);
+ if (reinit) {
this._initSpecialOptions();
this._initEventHandlers();
}
@@ -796,42 +1193,68 @@
_initSpecialOptions: function () {
var options = this.options;
if (options.fileInput === undefined) {
- options.fileInput = this.element.is('input:file') ?
- this.element : this.element.find('input:file');
+ options.fileInput = this.element.is('input[type="file"]') ?
+ this.element : this.element.find('input[type="file"]');
} else if (!(options.fileInput instanceof $)) {
options.fileInput = $(options.fileInput);
}
if (!(options.dropZone instanceof $)) {
options.dropZone = $(options.dropZone);
}
+ if (!(options.pasteZone instanceof $)) {
+ options.pasteZone = $(options.pasteZone);
+ }
+ },
+
+ _getRegExp: function (str) {
+ var parts = str.split('/'),
+ modifiers = parts.pop();
+ parts.shift();
+ return new RegExp(parts.join('/'), modifiers);
+ },
+
+ _isRegExpOption: function (key, value) {
+ return key !== 'url' && $.type(value) === 'string' &&
+ /^\/.*\/[igm]{0,3}$/.test(value);
+ },
+
+ _initDataAttributes: function () {
+ var that = this,
+ options = this.options;
+ // Initialize options set via HTML5 data-attributes:
+ $.each(
+ $(this.element[0].cloneNode(false)).data(),
+ function (key, value) {
+ if (that._isRegExpOption(key, value)) {
+ value = that._getRegExp(value);
+ }
+ options[key] = value;
+ }
+ );
},
_create: function () {
- var options = this.options,
- dataOpts = $.extend({}, this.element.data());
- dataOpts[this.widgetName] = undefined;
- $.extend(options, dataOpts);
- options.namespace = options.namespace || this.widgetName;
+ this._initDataAttributes();
this._initSpecialOptions();
this._slots = [];
this._sequence = this._getXHRPromise(true);
- this._sending = this._active = this._loaded = this._total = 0;
+ this._sending = this._active = 0;
+ this._initProgressObject(this);
this._initEventHandlers();
},
- destroy: function () {
- this._destroyEventHandlers();
- $.Widget.prototype.destroy.call(this);
- },
-
- enable: function () {
- $.Widget.prototype.enable.call(this);
- this._initEventHandlers();
+ // This method is exposed to the widget API and allows to query
+ // the number of active uploads:
+ active: function () {
+ return this._active;
},
- disable: function () {
- this._destroyEventHandlers();
- $.Widget.prototype.disable.call(this);
+ // This method is exposed to the widget API and allows to query
+ // the widget upload progress.
+ // It returns an object with loaded, total and bitrate properties
+ // for the running uploads:
+ progress: function () {
+ return this._progress;
},
// This method is exposed to the widget API and allows adding files
@@ -839,21 +1262,65 @@
// must have a files property and can contain additional options:
// .fileupload('add', {files: filesList});
add: function (data) {
+ var that = this;
if (!data || this.options.disabled) {
return;
}
- data.files = $.each($.makeArray(data.files), this._normalizeFile);
- this._onAdd(null, data);
+ if (data.fileInput && !data.files) {
+ this._getFileInputFiles(data.fileInput).always(function (files) {
+ data.files = files;
+ that._onAdd(null, data);
+ });
+ } else {
+ data.files = $.makeArray(data.files);
+ this._onAdd(null, data);
+ }
},
// This method is exposed to the widget API and allows sending files
// using the fileupload API. The data parameter accepts an object which
- // must have a files property and can contain additional options:
+ // must have a files or fileInput property and can contain additional options:
// .fileupload('send', {files: filesList});
// The method returns a Promise object for the file upload call.
send: function (data) {
if (data && !this.options.disabled) {
- data.files = $.each($.makeArray(data.files), this._normalizeFile);
+ if (data.fileInput && !data.files) {
+ var that = this,
+ dfd = $.Deferred(),
+ promise = dfd.promise(),
+ jqXHR,
+ aborted;
+ promise.abort = function () {
+ aborted = true;
+ if (jqXHR) {
+ return jqXHR.abort();
+ }
+ dfd.reject(null, 'abort', 'abort');
+ return promise;
+ };
+ this._getFileInputFiles(data.fileInput).always(
+ function (files) {
+ if (aborted) {
+ return;
+ }
+ if (!files.length) {
+ dfd.reject();
+ return;
+ }
+ data.files = files;
+ jqXHR = that._onSend(null, data).then(
+ function (result, textStatus, jqXHR) {
+ dfd.resolve(result, textStatus, jqXHR);
+ },
+ function (jqXHR, textStatus, errorThrown) {
+ dfd.reject(jqXHR, textStatus, errorThrown);
+ }
+ );
+ }
+ );
+ return this._enhancePromise(promise);
+ }
+ data.files = $.makeArray(data.files);
if (data.files.length) {
return this._onSend(null, data);
}
@@ -863,4 +1330,4 @@
});
-}));
+}));
\ No newline at end of file
diff --git a/apps/files/js/jquery.iframe-transport.js b/apps/files/js/jquery.iframe-transport.js
index d85c0c112973b2f6a433fb4a375adcb1c08f9bf6..5c9df77976bd9044702546dfec120a784c3bbd54 100644
--- a/apps/files/js/jquery.iframe-transport.js
+++ b/apps/files/js/jquery.iframe-transport.js
@@ -1,5 +1,5 @@
/*
- * jQuery Iframe Transport Plugin 1.3
+ * jQuery Iframe Transport Plugin 1.7
* https://github.com/blueimp/jQuery-File-Upload
*
* Copyright 2011, Sebastian Tschan
@@ -30,27 +30,45 @@
// The iframe transport accepts three additional options:
// options.fileInput: a jQuery collection of file input fields
// options.paramName: the parameter name for the file form data,
- // overrides the name property of the file input field(s)
+ // overrides the name property of the file input field(s),
+ // can be a string or an array of strings.
// options.formData: an array of objects with name and value properties,
// equivalent to the return data of .serializeArray(), e.g.:
// [{name: 'a', value: 1}, {name: 'b', value: 2}]
$.ajaxTransport('iframe', function (options) {
- if (options.async && (options.type === 'POST' || options.type === 'GET')) {
+ if (options.async) {
var form,
- iframe;
+ iframe,
+ addParamChar;
return {
send: function (_, completeCallback) {
form = $('<form style="display:none;"></form>');
+ form.attr('accept-charset', options.formAcceptCharset);
+ addParamChar = /\?/.test(options.url) ? '&' : '?';
+ // XDomainRequest only supports GET and POST:
+ if (options.type === 'DELETE') {
+ options.url = options.url + addParamChar + '_method=DELETE';
+ options.type = 'POST';
+ } else if (options.type === 'PUT') {
+ options.url = options.url + addParamChar + '_method=PUT';
+ options.type = 'POST';
+ } else if (options.type === 'PATCH') {
+ options.url = options.url + addParamChar + '_method=PATCH';
+ options.type = 'POST';
+ }
// javascript:false as initial iframe src
// prevents warning popups on HTTPS in IE6.
// IE versions below IE8 cannot set the name property of
// elements that have already been added to the DOM,
// so we set the name along with the iframe HTML markup:
+ counter += 1;
iframe = $(
'<iframe src="javascript:false;" name="iframe-transport-' +
- (counter += 1) + '"></iframe>'
+ counter + '"></iframe>'
).bind('load', function () {
- var fileInputClones;
+ var fileInputClones,
+ paramNames = $.isArray(options.paramName) ?
+ options.paramName : [options.paramName];
iframe
.unbind('load')
.bind('load', function () {
@@ -79,7 +97,12 @@
// (happens on form submits to iframe targets):
$('<iframe src="javascript:false;"></iframe>')
.appendTo(form);
- form.remove();
+ window.setTimeout(function () {
+ // Removing the form in a setTimeout call
+ // allows Chrome's developer tools to display
+ // the response result
+ form.remove();
+ }, 0);
});
form
.prop('target', iframe.prop('name'))
@@ -101,8 +124,11 @@
return fileInputClones[index];
});
if (options.paramName) {
- options.fileInput.each(function () {
- $(this).prop('name', options.paramName);
+ options.fileInput.each(function (index) {
+ $(this).prop(
+ 'name',
+ paramNames[index] || options.paramName
+ );
});
}
// Appending the file input fields to the hidden form
@@ -144,22 +170,36 @@
});
// The iframe transport returns the iframe content document as response.
- // The following adds converters from iframe to text, json, html, and script:
+ // The following adds converters from iframe to text, json, html, xml
+ // and script.
+ // Please note that the Content-Type for JSON responses has to be text/plain
+ // or text/html, if the browser doesn't include application/json in the
+ // Accept header, else IE will show a download dialog.
+ // The Content-Type for XML responses on the other hand has to be always
+ // application/xml or text/xml, so IE properly parses the XML response.
+ // See also
+ // https://github.com/blueimp/jQuery-File-Upload/wiki/Setup#content-type-negotiation
$.ajaxSetup({
converters: {
'iframe text': function (iframe) {
- return $(iframe[0].body).text();
+ return iframe && $(iframe[0].body).text();
},
'iframe json': function (iframe) {
- return $.parseJSON($(iframe[0].body).text());
+ return iframe && $.parseJSON($(iframe[0].body).text());
},
'iframe html': function (iframe) {
- return $(iframe[0].body).html();
+ return iframe && $(iframe[0].body).html();
+ },
+ 'iframe xml': function (iframe) {
+ var xmlDoc = iframe && iframe[0];
+ return xmlDoc && $.isXMLDoc(xmlDoc) ? xmlDoc :
+ $.parseXML((xmlDoc.XMLDocument && xmlDoc.XMLDocument.xml) ||
+ $(xmlDoc.body).html());
},
'iframe script': function (iframe) {
- return $.globalEval($(iframe[0].body).text());
+ return iframe && $.globalEval($(iframe[0].body).text());
}
}
});
-}));
+}));
\ No newline at end of file
diff --git a/apps/files/l10n/ach.php b/apps/files/l10n/ach.php
new file mode 100644
index 0000000000000000000000000000000000000000..3c711e6b78a257d953a010dc2feba5ae4d139369
--- /dev/null
+++ b/apps/files/l10n/ach.php
@@ -0,0 +1,7 @@
+<?php
+$TRANSLATIONS = array(
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
+"_Uploading %n file_::_Uploading %n files_" => array("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files/l10n/af_ZA.php b/apps/files/l10n/af_ZA.php
new file mode 100644
index 0000000000000000000000000000000000000000..0157af093e92200cc7790497227e92e62d80165f
--- /dev/null
+++ b/apps/files/l10n/af_ZA.php
@@ -0,0 +1,7 @@
+<?php
+$TRANSLATIONS = array(
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
+"_Uploading %n file_::_Uploading %n files_" => array("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/ar.php b/apps/files/l10n/ar.php
index 99eb409a3690f2ac4e05296628a746215b6205fd..67a3414819b7e16a320846e4ac01df5aa08d2d7c 100644
--- a/apps/files/l10n/ar.php
+++ b/apps/files/l10n/ar.php
@@ -13,10 +13,8 @@ $TRANSLATIONS = array(
"Missing a temporary folder" => "المجلد المؤقت غير موجود",
"Failed to write to disk" => "خطأ ÙÙŠ الكتابة على القرص الصلب",
"Not enough storage available" => "لا يوجد مساØØ© تخزينية كاÙية",
-"Upload failed" => "عملية الرÙع Ùشلت",
"Invalid directory." => "مسار غير صØÙŠØ.",
"Files" => "الملÙات",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Ùشل ÙÙŠ رÙع ملÙاتك , إما أنها مجلد أو Øجمها 0 بايت",
"Not enough space available" => "لا توجد مساØØ© كاÙية",
"Upload cancelled." => "تم إلغاء عملية رÙع الملÙات .",
"File upload is in progress. Leaving the page now will cancel the upload." => "عملية رÙع الملÙات قيد التنÙيذ. اغلاق الصÙØØ© سو٠يلغي عملية رÙع الملÙات.",
@@ -37,7 +35,6 @@ $TRANSLATIONS = array(
"_%n file_::_%n files_" => array("","","","","",""),
"{dirs} and {files}" => "{dirs} Ùˆ {files}",
"_Uploading %n file_::_Uploading %n files_" => array("","","","","",""),
-"files uploading" => "يتم تØميل الملÙات",
"'.' is an invalid file name." => "\".\" اسم مل٠غير صØÙŠØ.",
"File name cannot be empty." => "اسم المل٠لا يجوز أن يكون Ùارغا",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "اسم غير صØÙŠØ , الرموز '\\', '/', '<', '>', ':', '\"', '|', '?' Ùˆ \"*\" غير Ù…Ø³Ù…ÙˆØ Ø§Ø³ØªØ®Ø¯Ø§Ù…Ù‡Ø§",
diff --git a/apps/files/l10n/be.php b/apps/files/l10n/be.php
new file mode 100644
index 0000000000000000000000000000000000000000..17262d2184dd3787640bf0bf218b7e715ea7b0b7
--- /dev/null
+++ b/apps/files/l10n/be.php
@@ -0,0 +1,7 @@
+<?php
+$TRANSLATIONS = array(
+"_%n folder_::_%n folders_" => array("","","",""),
+"_%n file_::_%n files_" => array("","","",""),
+"_Uploading %n file_::_Uploading %n files_" => array("","","","")
+);
+$PLURAL_FORMS = "nplurals=4; 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/apps/files/l10n/bg_BG.php b/apps/files/l10n/bg_BG.php
index 913875e863ade9f08783553db7bdf07b8c6b9cd0..e7dafd1c43a584c5b7f0efed9c66c89d27f7de85 100644
--- a/apps/files/l10n/bg_BG.php
+++ b/apps/files/l10n/bg_BG.php
@@ -6,7 +6,6 @@ $TRANSLATIONS = array(
"No file was uploaded" => "Фахлът не бе качен",
"Missing a temporary folder" => "ЛипÑва временна папка",
"Failed to write to disk" => "Възникна проблем при Ð·Ð°Ð¿Ð¸Ñ Ð² диÑка",
-"Upload failed" => "Качването е неуÑпешно",
"Invalid directory." => "Ðевалидна директориÑ.",
"Files" => "Файлове",
"Upload cancelled." => "Качването е ÑпрÑно.",
diff --git a/apps/files/l10n/bn_BD.php b/apps/files/l10n/bn_BD.php
index 2265c232a1485ade94e047178910cf0248d11879..66ac3a2165f88e624e616ba8ed1623260a1200f2 100644
--- a/apps/files/l10n/bn_BD.php
+++ b/apps/files/l10n/bn_BD.php
@@ -12,7 +12,6 @@ $TRANSLATIONS = array(
"Failed to write to disk" => "ডিসà§à¦•à§‡ লিখতে বà§à¦¯à¦°à§à¦¥",
"Invalid directory." => "à¦à§à¦² ডিরেকà§à¦Ÿà¦°à¦¿",
"Files" => "ফাইল",
-"Unable to upload your file as it is a directory or has 0 bytes" => "আপনার ফাইলটি আপলোড করা সমà§à¦à¦¬ হলো না, কেননা à¦à¦Ÿà¦¿ হয় à¦à¦•à¦Ÿà¦¿ ফোলà§à¦¡à¦¾à¦° কিংবা à¦à¦° আকার ০ বাইট",
"Not enough space available" => "যথেষà§à¦ পরিমাণ সà§à¦¥à¦¾à¦¨ নেই",
"Upload cancelled." => "আপলোড বাতিল করা হয়েছে।",
"File upload is in progress. Leaving the page now will cancel the upload." => "ফাইল আপলোড চলমান। à¦à¦‡ পৃষà§à¦ া পরিতà§à¦¯à¦¾à¦— করলে আপলোড বাতিল করা হবে।",
diff --git a/apps/files/l10n/bs.php b/apps/files/l10n/bs.php
new file mode 100644
index 0000000000000000000000000000000000000000..8ab07a97761f1863952e9f09b0fd732c4a6d9509
--- /dev/null
+++ b/apps/files/l10n/bs.php
@@ -0,0 +1,12 @@
+<?php
+$TRANSLATIONS = array(
+"Share" => "Podijeli",
+"_%n folder_::_%n folders_" => array("","",""),
+"_%n file_::_%n files_" => array("","",""),
+"_Uploading %n file_::_Uploading %n files_" => array("","",""),
+"Name" => "Ime",
+"Size" => "VeliÄina",
+"Save" => "Spasi",
+"Folder" => "Fasikla"
+);
+$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/apps/files/l10n/ca.php b/apps/files/l10n/ca.php
index eb724d19548ba58523c9e4c60af56228cd4b14f7..5c2cade8d637df60c665026bbccd8f5d1e1aca91 100644
--- a/apps/files/l10n/ca.php
+++ b/apps/files/l10n/ca.php
@@ -13,12 +13,14 @@ $TRANSLATIONS = array(
"Missing a temporary folder" => "Falta un fitxer temporal",
"Failed to write to disk" => "Ha fallat en escriure al disc",
"Not enough storage available" => "No hi ha prou espai disponible",
-"Upload failed" => "La pujada ha fallat",
+"Upload failed. Could not get file info." => "La pujada ha fallat. No s'ha pogut obtenir informació del fitxer.",
+"Upload failed. Could not find uploaded file" => "La pujada ha fallat. El fitxer pujat no s'ha trobat.",
"Invalid directory." => "Directori no và lid.",
"Files" => "Fitxers",
-"Unable to upload your file as it is a directory or has 0 bytes" => "No es pot pujar el fitxer perquè és una carpeta o té 0 bytes",
+"Unable to upload {filename} as it is a directory or has 0 bytes" => "No es pot pujar {filename} perquè és una carpeta o té 0 bytes",
"Not enough space available" => "No hi ha prou espai disponible",
"Upload cancelled." => "La pujada s'ha cancel·lat.",
+"Could not get result from server." => "No hi ha resposta del servidor.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Hi ha una pujada en curs. Si abandoneu la pà gina la pujada es cancel·larà .",
"URL cannot be empty." => "La URL no pot ser buida",
"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Nom de carpeta no và lid. L'ús de 'Shared' està reservat per Owncloud",
@@ -37,7 +39,6 @@ $TRANSLATIONS = array(
"_%n file_::_%n files_" => array("%n fitxer","%n fitxers"),
"{dirs} and {files}" => "{dirs} i {files}",
"_Uploading %n file_::_Uploading %n files_" => array("Pujant %n fitxer","Pujant %n fitxers"),
-"files uploading" => "fitxers pujant",
"'.' is an invalid file name." => "'.' és un nom no và lid per un fitxer.",
"File name cannot be empty." => "El nom del fitxer no pot ser buit.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "El nóm no és và lid, '\\', '/', '<', '>', ':', '\"', '|', '?' i '*' no estan permesos.",
@@ -45,6 +46,7 @@ $TRANSLATIONS = array(
"Your storage is almost full ({usedSpacePercent}%)" => "El vostre espai d'emmagatzemament és gairebé ple ({usedSpacePercent}%)",
"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "L'encriptació s'ha desactivat però els vostres fitxers segueixen encriptats. Aneu a la vostra configuració personal per desencriptar els vostres fitxers.",
"Your download is being prepared. This might take some time if the files are big." => "S'està preparant la baixada. Pot trigar una estona si els fitxers són grans.",
+"Error moving file" => "Error en moure el fitxer",
"Name" => "Nom",
"Size" => "Mida",
"Modified" => "Modificat",
diff --git a/apps/files/l10n/cs_CZ.php b/apps/files/l10n/cs_CZ.php
index 691cc92f1adccb25c68d175232c075aaabb7f869..f67283ec6e846efd790f211500c9490fa1aacad5 100644
--- a/apps/files/l10n/cs_CZ.php
+++ b/apps/files/l10n/cs_CZ.php
@@ -13,10 +13,8 @@ $TRANSLATIONS = array(
"Missing a temporary folder" => "Chybà adresář pro doÄasné soubory",
"Failed to write to disk" => "Zápis na disk selhal",
"Not enough storage available" => "Nedostatek dostupného úložného prostoru",
-"Upload failed" => "OdesÃlánà selhalo",
"Invalid directory." => "Neplatný adresář",
"Files" => "Soubory",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Nelze odeslat Váš soubor, protože je to adresář nebo jeho velikost je 0 bajtů",
"Not enough space available" => "Nedostatek volného mÃsta",
"Upload cancelled." => "OdesÃlánà zruÅ¡eno.",
"File upload is in progress. Leaving the page now will cancel the upload." => "ProbÃhá odesÃlánà souboru. OpuÅ¡tÄ›nà stránky způsobà zruÅ¡enà nahrávánÃ.",
@@ -37,7 +35,6 @@ $TRANSLATIONS = array(
"_%n file_::_%n files_" => array("%n soubor","%n soubory","%n souborů"),
"{dirs} and {files}" => "{dirs} a {files}",
"_Uploading %n file_::_Uploading %n files_" => array("Nahrávám %n soubor","Nahrávám %n soubory","Nahrávám %n souborů"),
-"files uploading" => "soubory se odesÃlajÃ",
"'.' is an invalid file name." => "'.' je neplatným názvem souboru.",
"File name cannot be empty." => "Název souboru nemůže být prázdný řetězec.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Neplatný název, znaky '\\', '/', '<', '>', ':', '\"', '|', '?' a '*' nejsou povoleny.",
diff --git a/apps/files/l10n/cy_GB.php b/apps/files/l10n/cy_GB.php
index 157f4f89a234bf1786a2ed0302cd18957ea510ef..86e5f65e7b0d3d46d037dc90dd1a2b459bfdf2ff 100644
--- a/apps/files/l10n/cy_GB.php
+++ b/apps/files/l10n/cy_GB.php
@@ -11,10 +11,8 @@ $TRANSLATIONS = array(
"Missing a temporary folder" => "Plygell dros dro yn eisiau",
"Failed to write to disk" => "Methwyd ysgrifennu i'r ddisg",
"Not enough storage available" => "Dim digon o le storio ar gael",
-"Upload failed" => "Methwyd llwytho i fyny",
"Invalid directory." => "Cyfeiriadur annilys.",
"Files" => "Ffeiliau",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Methu llwytho'ch ffeil i fyny gan ei fod yn gyferiadur neu'n cynnwys 0 beit",
"Not enough space available" => "Dim digon o le ar gael",
"Upload cancelled." => "Diddymwyd llwytho i fyny.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Mae ffeiliau'n cael eu llwytho i fyny. Bydd gadael y dudalen hon nawr yn diddymu'r broses.",
@@ -33,7 +31,6 @@ $TRANSLATIONS = array(
"_%n folder_::_%n folders_" => array("","","",""),
"_%n file_::_%n files_" => array("","","",""),
"_Uploading %n file_::_Uploading %n files_" => array("","","",""),
-"files uploading" => "ffeiliau'n llwytho i fyny",
"'.' is an invalid file name." => "Mae '.' yn enw ffeil annilys.",
"File name cannot be empty." => "Does dim hawl cael enw ffeil gwag.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Enw annilys, ni chaniateir, '\\', '/', '<', '>', ':', '\"', '|', '?' na '*'.",
diff --git a/apps/files/l10n/da.php b/apps/files/l10n/da.php
index aab12986ec1eb02e6838ab660af47d41e6d31a93..c2a20931ba0457c0657b4a9b6073ca5aba6c4f3d 100644
--- a/apps/files/l10n/da.php
+++ b/apps/files/l10n/da.php
@@ -13,10 +13,8 @@ $TRANSLATIONS = array(
"Missing a temporary folder" => "Manglende midlertidig mappe.",
"Failed to write to disk" => "Fejl ved skrivning til disk.",
"Not enough storage available" => "Der er ikke nok plads til rådlighed",
-"Upload failed" => "Upload fejlede",
"Invalid directory." => "Ugyldig mappe.",
"Files" => "Filer",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Kan ikke uploade din fil - det er enten en mappe eller en fil med et indhold på 0 bytes.",
"Not enough space available" => "ikke nok tilgængelig ledig plads ",
"Upload cancelled." => "Upload afbrudt.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Fil upload kører. Hvis du forlader siden nu, vil uploadet blive annuleret.",
@@ -37,7 +35,6 @@ $TRANSLATIONS = array(
"_%n file_::_%n files_" => array("%n fil","%n filer"),
"{dirs} and {files}" => "{dirs} og {files}",
"_Uploading %n file_::_Uploading %n files_" => array("Uploader %n fil","Uploader %n filer"),
-"files uploading" => "uploader filer",
"'.' is an invalid file name." => "'.' er et ugyldigt filnavn.",
"File name cannot be empty." => "Filnavnet kan ikke stå tomt.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ugyldigt navn, '\\', '/', '<', '>', ':' | '?', '\"', '', og '*' er ikke tilladt.",
diff --git a/apps/files/l10n/de.php b/apps/files/l10n/de.php
index 947d4f07461b9ecbdcbfd84c57cdc1d4af3f6a0d..143a5efc3da07ac4dc2e38dfbc3c5aba5cd42a91 100644
--- a/apps/files/l10n/de.php
+++ b/apps/files/l10n/de.php
@@ -13,12 +13,14 @@ $TRANSLATIONS = array(
"Missing a temporary folder" => "Kein temporärer Ordner vorhanden",
"Failed to write to disk" => "Fehler beim Schreiben auf die Festplatte",
"Not enough storage available" => "Nicht genug Speicher vorhanden.",
-"Upload failed" => "Hochladen fehlgeschlagen",
+"Upload failed. Could not get file info." => "Hochladen fehlgeschlagen. Dateiinformationen konnten nicht abgerufen werden.",
+"Upload failed. Could not find uploaded file" => "Hochladen fehlgeschlagen. Hochgeladene Datei konnte nicht gefunden werden.",
"Invalid directory." => "Ungültiges Verzeichnis.",
"Files" => "Dateien",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Deine Datei kann nicht hochgeladen werden, weil es sich um einen Ordner handelt oder 0 Bytes groß ist.",
+"Unable to upload {filename} as it is a directory or has 0 bytes" => "Datei {filename} kann nicht hochgeladen werden, da sie entweder ein Verzeichnis oder 0 Bytes groß ist",
"Not enough space available" => "Nicht genug Speicherplatz verfügbar",
"Upload cancelled." => "Upload abgebrochen.",
+"Could not get result from server." => "Ergebnis konnte nicht vom Server abgerufen werden.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Dateiupload läuft. Wenn Du die Seite jetzt verlässt, wird der Upload abgebrochen.",
"URL cannot be empty." => "Die URL darf nicht leer sein.",
"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Der Ordnername ist ungültig. Nur ownCloud kann den Ordner \"Shared\" anlegen",
@@ -37,7 +39,6 @@ $TRANSLATIONS = array(
"_%n file_::_%n files_" => array("%n Datei","%n Dateien"),
"{dirs} and {files}" => "{dirs} und {files}",
"_Uploading %n file_::_Uploading %n files_" => array("%n Datei wird hochgeladen","%n Dateien werden hochgeladen"),
-"files uploading" => "Dateien werden hoch geladen",
"'.' is an invalid file name." => "'.' ist kein gültiger Dateiname.",
"File name cannot be empty." => "Der Dateiname darf nicht leer sein.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ungültiger Name, '\\', '/', '<', '>', ':', '\"', '|', '?' und '*' sind nicht zulässig.",
@@ -45,6 +46,7 @@ $TRANSLATIONS = array(
"Your storage is almost full ({usedSpacePercent}%)" => "Dein Speicher ist fast voll ({usedSpacePercent}%)",
"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Die Verschlüsselung wurde deaktiviert, jedoch sind deine Dateien nach wie vor verschlüsselt. Bitte gehe zu deinen persönlichen Einstellungen, um deine Dateien zu entschlüsseln.",
"Your download is being prepared. This might take some time if the files are big." => "Dein Download wird vorbereitet. Dies kann bei größeren Dateien etwas dauern.",
+"Error moving file" => "Fehler beim Verschieben der Datei",
"Name" => "Name",
"Size" => "Größe",
"Modified" => "Geändert",
diff --git a/apps/files/l10n/de_AT.php b/apps/files/l10n/de_AT.php
new file mode 100644
index 0000000000000000000000000000000000000000..0157af093e92200cc7790497227e92e62d80165f
--- /dev/null
+++ b/apps/files/l10n/de_AT.php
@@ -0,0 +1,7 @@
+<?php
+$TRANSLATIONS = array(
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
+"_Uploading %n file_::_Uploading %n files_" => array("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/de_CH.php b/apps/files/l10n/de_CH.php
new file mode 100644
index 0000000000000000000000000000000000000000..a7074a8b1ccb758ef8d4f6ed79f0634099750daf
--- /dev/null
+++ b/apps/files/l10n/de_CH.php
@@ -0,0 +1,74 @@
+<?php
+$TRANSLATIONS = array(
+"Could not move %s - File with this name already exists" => "%s konnte nicht verschoben werden. Eine Datei mit diesem Namen existiert bereits.",
+"Could not move %s" => "Konnte %s nicht verschieben",
+"Unable to set upload directory." => "Das Upload-Verzeichnis konnte nicht gesetzt werden.",
+"Invalid Token" => "Ungültiges Merkmal",
+"No file was uploaded. Unknown error" => "Keine Datei hochgeladen. Unbekannter Fehler",
+"There is no error, the file uploaded with success" => "Es ist kein Fehler aufgetreten. Die Datei wurde erfolgreich hochgeladen.",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Die hochgeladene Datei überschreitet die upload_max_filesize Vorgabe in php.ini",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Die Datei ist grösser, als die MAX_FILE_SIZE Vorgabe erlaubt, die im HTML-Formular spezifiziert ist",
+"The uploaded file was only partially uploaded" => "Die Datei konnte nur teilweise übertragen werden",
+"No file was uploaded" => "Keine Datei konnte übertragen werden.",
+"Missing a temporary folder" => "Kein temporärer Ordner vorhanden",
+"Failed to write to disk" => "Fehler beim Schreiben auf die Festplatte",
+"Not enough storage available" => "Nicht genug Speicher vorhanden.",
+"Invalid directory." => "Ungültiges Verzeichnis.",
+"Files" => "Dateien",
+"Not enough space available" => "Nicht genügend Speicherplatz verfügbar",
+"Upload cancelled." => "Upload abgebrochen.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upload abgebrochen.",
+"URL cannot be empty." => "Die URL darf nicht leer sein.",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Ungültiger Ordnername. Die Verwendung von «Shared» ist ownCloud vorbehalten.",
+"Error" => "Fehler",
+"Share" => "Teilen",
+"Delete permanently" => "Endgültig löschen",
+"Rename" => "Umbenennen",
+"Pending" => "Ausstehend",
+"{new_name} already exists" => "{new_name} existiert bereits",
+"replace" => "ersetzen",
+"suggest name" => "Namen vorschlagen",
+"cancel" => "abbrechen",
+"replaced {new_name} with {old_name}" => "{old_name} wurde ersetzt durch {new_name}",
+"undo" => "rückgängig machen",
+"_%n folder_::_%n folders_" => array("","%n Ordner"),
+"_%n file_::_%n files_" => array("","%n Dateien"),
+"_Uploading %n file_::_Uploading %n files_" => array("%n Datei wird hochgeladen","%n Dateien werden hochgeladen"),
+"'.' is an invalid file name." => "'.' ist kein gültiger Dateiname.",
+"File name cannot be empty." => "Der Dateiname darf nicht leer sein.",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ungültiger Name, «\\», «/», «<», «>», «:», «\"», «|», «?» und «*» sind nicht zulässig.",
+"Your storage is full, files can not be updated or synced anymore!" => "Ihr Speicher ist voll, daher können keine Dateien mehr aktualisiert oder synchronisiert werden!",
+"Your storage is almost full ({usedSpacePercent}%)" => "Ihr Speicher ist fast voll ({usedSpacePercent}%)",
+"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Die Verschlüsselung wurde deaktiviert, jedoch sind Ihre Dateien nach wie vor verschlüsselt. Bitte gehen Sie zu Ihren persönlichen Einstellungen, um Ihre Dateien zu entschlüsseln.",
+"Your download is being prepared. This might take some time if the files are big." => "Ihr Download wird vorbereitet. Dies kann bei grösseren Dateien etwas dauern.",
+"Name" => "Name",
+"Size" => "Grösse",
+"Modified" => "Geändert",
+"%s could not be renamed" => "%s konnte nicht umbenannt werden",
+"Upload" => "Hochladen",
+"File handling" => "Dateibehandlung",
+"Maximum upload size" => "Maximale Upload-Grösse",
+"max. possible: " => "maximal möglich:",
+"Needed for multi-file and folder downloads." => "Für Mehrfachdatei- und Ordnerdownloads benötigt:",
+"Enable ZIP-download" => "ZIP-Download aktivieren",
+"0 is unlimited" => "0 bedeutet unbegrenzt",
+"Maximum input size for ZIP files" => "Maximale Grösse für ZIP-Dateien",
+"Save" => "Speichern",
+"New" => "Neu",
+"Text file" => "Textdatei",
+"Folder" => "Ordner",
+"From link" => "Von einem Link",
+"Deleted files" => "Gelöschte Dateien",
+"Cancel upload" => "Upload abbrechen",
+"You don’t have write permissions here." => "Sie haben hier keine Schreib-Berechtigungen.",
+"Nothing in here. Upload something!" => "Alles leer. Laden Sie etwas hoch!",
+"Download" => "Herunterladen",
+"Unshare" => "Freigabe aufheben",
+"Delete" => "Löschen",
+"Upload too large" => "Der Upload ist zu gross",
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Die Datei überschreitet die Maximalgrösse für Uploads auf diesem Server.",
+"Files are being scanned, please wait." => "Dateien werden gescannt, bitte warten.",
+"Current scanning" => "Scanne",
+"Upgrading filesystem cache..." => "Dateisystem-Cache wird aktualisiert ..."
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/de_DE.php b/apps/files/l10n/de_DE.php
index db07ed7fadd9ca63ae2065108358c30156d1e94e..c58cb4bbe3e23d2c5e11db5a730d944d4cad75d3 100644
--- a/apps/files/l10n/de_DE.php
+++ b/apps/files/l10n/de_DE.php
@@ -13,12 +13,14 @@ $TRANSLATIONS = array(
"Missing a temporary folder" => "Kein temporärer Ordner vorhanden",
"Failed to write to disk" => "Fehler beim Schreiben auf die Festplatte",
"Not enough storage available" => "Nicht genug Speicher vorhanden.",
-"Upload failed" => "Hochladen fehlgeschlagen",
+"Upload failed. Could not get file info." => "Hochladen fehlgeschlagen. Dateiinformationen konnten nicht abgerufen werden.",
+"Upload failed. Could not find uploaded file" => "Hochladen fehlgeschlagen. Hochgeladene Datei konnte nicht gefunden werden.",
"Invalid directory." => "Ungültiges Verzeichnis.",
"Files" => "Dateien",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Ihre Datei kann nicht hochgeladen werden, weil es sich um einen Ordner handelt oder 0 Bytes groß ist.",
+"Unable to upload {filename} as it is a directory or has 0 bytes" => "Datei {filename} kann nicht hochgeladen werden, da sie entweder ein Verzeichnis oder 0 Bytes groß ist",
"Not enough space available" => "Nicht genügend Speicherplatz verfügbar",
"Upload cancelled." => "Upload abgebrochen.",
+"Could not get result from server." => "Ergebnis konnte nicht vom Server abgerufen werden.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upload abgebrochen.",
"URL cannot be empty." => "Die URL darf nicht leer sein.",
"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Ungültiger Ordnername. Die Verwendung von \"Shared\" ist ownCloud vorbehalten.",
@@ -37,7 +39,6 @@ $TRANSLATIONS = array(
"_%n file_::_%n files_" => array("%n Datei","%n Dateien"),
"{dirs} and {files}" => "{dirs} und {files}",
"_Uploading %n file_::_Uploading %n files_" => array("%n Datei wird hoch geladen","%n Dateien werden hoch geladen"),
-"files uploading" => "Dateien werden hoch geladen",
"'.' is an invalid file name." => "'.' ist kein gültiger Dateiname.",
"File name cannot be empty." => "Der Dateiname darf nicht leer sein.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ungültiger Name, '\\', '/', '<', '>', ':', '\"', '|', '?' und '*' sind nicht zulässig.",
@@ -45,6 +46,7 @@ $TRANSLATIONS = array(
"Your storage is almost full ({usedSpacePercent}%)" => "Ihr Speicher ist fast voll ({usedSpacePercent}%)",
"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Die Verschlüsselung wurde deaktiviert, jedoch sind Ihre Dateien nach wie vor verschlüsselt. Bitte gehen Sie zu Ihren persönlichen Einstellungen, um Ihre Dateien zu entschlüsseln.",
"Your download is being prepared. This might take some time if the files are big." => "Ihr Download wird vorbereitet. Dies kann bei größeren Dateien etwas dauern.",
+"Error moving file" => "Fehler beim Verschieben der Datei",
"Name" => "Name",
"Size" => "Größe",
"Modified" => "Geändert",
diff --git a/apps/files/l10n/el.php b/apps/files/l10n/el.php
index 8c89e5e1feb188b80686e00a430c362e021c0858..37a61c6b956405bd3a9f49319db94201274f48c3 100644
--- a/apps/files/l10n/el.php
+++ b/apps/files/l10n/el.php
@@ -13,10 +13,8 @@ $TRANSLATIONS = array(
"Missing a temporary folder" => "Λείπει ο Ï€ÏοσωÏινός φάκελος",
"Failed to write to disk" => "Αποτυχία εγγÏαφής στο δίσκο",
"Not enough storage available" => "Μη επαÏκής διαθÎσιμος αποθηκευτικός χώÏος",
-"Upload failed" => "Η μεταφόÏτωση απÎτυχε",
"Invalid directory." => "Μη ÎγκυÏος φάκελος.",
"Files" => "ΑÏχεία",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Αδυναμία στην αποστολή του αÏχείου σας Î±Ï†Î¿Ï ÎµÎ¯Î½Î±Î¹ φάκελος ή Îχει 0 bytes",
"Not enough space available" => "Δεν υπάÏχει αÏκετός διαθÎσιμος χώÏος",
"Upload cancelled." => "Η αποστολή ακυÏώθηκε.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Η αποστολή του αÏχείου βÏίσκεται σε εξÎλιξη. Το κλείσιμο της σελίδας θα ακυÏώσει την αποστολή.",
@@ -36,7 +34,6 @@ $TRANSLATIONS = array(
"_%n folder_::_%n folders_" => array("%n φάκελος","%n φάκελοι"),
"_%n file_::_%n files_" => array("%n αÏχείο","%n αÏχεία"),
"_Uploading %n file_::_Uploading %n files_" => array("ΑνÎβασμα %n αÏχείου","ΑνÎβασμα %n αÏχείων"),
-"files uploading" => "αÏχεία ανεβαίνουν",
"'.' is an invalid file name." => "'.' είναι μη ÎγκυÏο όνομα αÏχείου.",
"File name cannot be empty." => "Το όνομα αÏχείου δεν μποÏεί να είναι κενό.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Μη ÎγκυÏο όνομα, '\\', '/', '<', '>', ':', '\"', '|', '?' και '*' δεν επιτÏÎπονται.",
diff --git a/apps/files/l10n/en_GB.php b/apps/files/l10n/en_GB.php
new file mode 100644
index 0000000000000000000000000000000000000000..c747555e40be799f635d098e9e4268a973f8342b
--- /dev/null
+++ b/apps/files/l10n/en_GB.php
@@ -0,0 +1,80 @@
+<?php
+$TRANSLATIONS = array(
+"Could not move %s - File with this name already exists" => "Could not move %s - File with this name already exists",
+"Could not move %s" => "Could not move %s",
+"Unable to set upload directory." => "Unable to set upload directory.",
+"Invalid Token" => "Invalid Token",
+"No file was uploaded. Unknown error" => "No file was uploaded. Unknown error",
+"There is no error, the file uploaded with success" => "There is no error, the file uploaded successfully",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "The uploaded file exceeds the upload_max_filesize directive in php.ini: ",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form",
+"The uploaded file was only partially uploaded" => "The uploaded file was only partially uploaded",
+"No file was uploaded" => "No file was uploaded",
+"Missing a temporary folder" => "Missing a temporary folder",
+"Failed to write to disk" => "Failed to write to disk",
+"Not enough storage available" => "Not enough storage available",
+"Upload failed. Could not get file info." => "Upload failed. Could not get file info.",
+"Upload failed. Could not find uploaded file" => "Upload failed. Could not find uploaded file",
+"Invalid directory." => "Invalid directory.",
+"Files" => "Files",
+"Unable to upload {filename} as it is a directory or has 0 bytes" => "Unable to upload {filename} as it is a directory or has 0 bytes",
+"Not enough space available" => "Not enough space available",
+"Upload cancelled." => "Upload cancelled.",
+"Could not get result from server." => "Could not get result from server.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "File upload is in progress. Leaving the page now will cancel the upload.",
+"URL cannot be empty." => "URL cannot be empty.",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Invalid folder name. Usage of 'Shared' is reserved by ownCloud",
+"Error" => "Error",
+"Share" => "Share",
+"Delete permanently" => "Delete permanently",
+"Rename" => "Rename",
+"Pending" => "Pending",
+"{new_name} already exists" => "{new_name} already exists",
+"replace" => "replace",
+"suggest name" => "suggest name",
+"cancel" => "cancel",
+"replaced {new_name} with {old_name}" => "replaced {new_name} with {old_name}",
+"undo" => "undo",
+"_%n folder_::_%n folders_" => array("%n folder","%n folders"),
+"_%n file_::_%n files_" => array("%n file","%n files"),
+"{dirs} and {files}" => "{dirs} and {files}",
+"_Uploading %n file_::_Uploading %n files_" => array("Uploading %n file","Uploading %n files"),
+"'.' is an invalid file name." => "'.' is an invalid file name.",
+"File name cannot be empty." => "File name cannot be empty.",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Invalid name: '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed.",
+"Your storage is full, files can not be updated or synced anymore!" => "Your storage is full, files can not be updated or synced anymore!",
+"Your storage is almost full ({usedSpacePercent}%)" => "Your storage is almost full ({usedSpacePercent}%)",
+"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files.",
+"Your download is being prepared. This might take some time if the files are big." => "Your download is being prepared. This might take some time if the files are big.",
+"Error moving file" => "Error moving file",
+"Name" => "Name",
+"Size" => "Size",
+"Modified" => "Modified",
+"%s could not be renamed" => "%s could not be renamed",
+"Upload" => "Upload",
+"File handling" => "File handling",
+"Maximum upload size" => "Maximum upload size",
+"max. possible: " => "max. possible: ",
+"Needed for multi-file and folder downloads." => "Needed for multi-file and folder downloads.",
+"Enable ZIP-download" => "Enable ZIP-download",
+"0 is unlimited" => "0 is unlimited",
+"Maximum input size for ZIP files" => "Maximum input size for ZIP files",
+"Save" => "Save",
+"New" => "New",
+"Text file" => "Text file",
+"Folder" => "Folder",
+"From link" => "From link",
+"Deleted files" => "Deleted files",
+"Cancel upload" => "Cancel upload",
+"You don’t have write permissions here." => "You don’t have write permission here.",
+"Nothing in here. Upload something!" => "Nothing in here. Upload something!",
+"Download" => "Download",
+"Unshare" => "Unshare",
+"Delete" => "Delete",
+"Upload too large" => "Upload too large",
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "The files you are trying to upload exceed the maximum size for file uploads on this server.",
+"Files are being scanned, please wait." => "Files are being scanned, please wait.",
+"Current scanning" => "Current scanning",
+"Upgrading filesystem cache..." => "Upgrading filesystem cache..."
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/eo.php b/apps/files/l10n/eo.php
index ad538f2f2a92a845d37c56c409e7579953a7cfb5..eb6e6ba2d3905b60c52ed624baaab8699031b78b 100644
--- a/apps/files/l10n/eo.php
+++ b/apps/files/l10n/eo.php
@@ -11,10 +11,8 @@ $TRANSLATIONS = array(
"Missing a temporary folder" => "Mankas provizora dosierujo.",
"Failed to write to disk" => "Malsukcesis skribo al disko",
"Not enough storage available" => "Ne haveblas sufiĉa memoro",
-"Upload failed" => "AlÅuto malsukcesis",
"Invalid directory." => "Nevalida dosierujo.",
"Files" => "Dosieroj",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Ne eblis alÅuti vian dosieron ĉar Äi estas dosierujo aÅ havas 0 duumokojn",
"Not enough space available" => "Ne haveblas sufiĉa spaco",
"Upload cancelled." => "La alÅuto nuliÄis.",
"File upload is in progress. Leaving the page now will cancel the upload." => "DosieralÅuto plenumiÄas. Lasi la paÄon nun nuligus la alÅuton.",
@@ -34,7 +32,6 @@ $TRANSLATIONS = array(
"_%n folder_::_%n folders_" => array("",""),
"_%n file_::_%n files_" => array("",""),
"_Uploading %n file_::_Uploading %n files_" => array("",""),
-"files uploading" => "dosieroj estas alÅutataj",
"'.' is an invalid file name." => "'.' ne estas valida dosiernomo.",
"File name cannot be empty." => "Dosiernomo devas ne malpleni.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nevalida nomo: “\\â€, “/â€, “<â€, “>â€, “:â€, “\"â€, “|â€, “?†kaj “*†ne permesatas.",
diff --git a/apps/files/l10n/es.php b/apps/files/l10n/es.php
index ce92ff8f187e8db16556fa76ed7c2296ad908662..90d760587d9ccd97274e42005b39bd163f407250 100644
--- a/apps/files/l10n/es.php
+++ b/apps/files/l10n/es.php
@@ -13,10 +13,8 @@ $TRANSLATIONS = array(
"Missing a temporary folder" => "Falta la carpeta temporal",
"Failed to write to disk" => "Falló al escribir al disco",
"Not enough storage available" => "No hay suficiente espacio disponible",
-"Upload failed" => "Error en la subida",
"Invalid directory." => "Directorio inválido.",
"Files" => "Archivos",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Incapaz de subir su archivo, es un directorio o tiene 0 bytes",
"Not enough space available" => "No hay suficiente espacio disponible",
"Upload cancelled." => "Subida cancelada.",
"File upload is in progress. Leaving the page now will cancel the upload." => "La subida del archivo está en proceso. Si sale de la página ahora cancelará la subida.",
@@ -37,7 +35,6 @@ $TRANSLATIONS = array(
"_%n file_::_%n files_" => array("","%n archivos"),
"{dirs} and {files}" => "{dirs} y {files}",
"_Uploading %n file_::_Uploading %n files_" => array("Subiendo %n archivo","Subiendo %n archivos"),
-"files uploading" => "subiendo archivos",
"'.' is an invalid file name." => "'.' no es un nombre de archivo válido.",
"File name cannot be empty." => "El nombre de archivo no puede estar vacÃo.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nombre Invalido, \"\\\", \"/\", \"<\", \">\", \":\", \"\", \"|\" \"?\" y \"*\" no están permitidos ",
diff --git a/apps/files/l10n/es_AR.php b/apps/files/l10n/es_AR.php
index d9d103626308028b22cd44b0b997de7aa3eaf6a5..be16f3f99ae8bed39884062348cdf87687b429a6 100644
--- a/apps/files/l10n/es_AR.php
+++ b/apps/files/l10n/es_AR.php
@@ -13,10 +13,8 @@ $TRANSLATIONS = array(
"Missing a temporary folder" => "Falta un directorio temporal",
"Failed to write to disk" => "Error al escribir en el disco",
"Not enough storage available" => "No hay suficiente almacenamiento",
-"Upload failed" => "Error al subir el archivo",
"Invalid directory." => "Directorio inválido.",
"Files" => "Archivos",
-"Unable to upload your file as it is a directory or has 0 bytes" => "No fue posible subir el archivo porque es un directorio o porque su tamaño es 0 bytes",
"Not enough space available" => "No hay suficiente espacio disponible",
"Upload cancelled." => "La subida fue cancelada",
"File upload is in progress. Leaving the page now will cancel the upload." => "La subida del archivo está en proceso. Si salÃs de la página ahora, la subida se cancelará.",
@@ -37,7 +35,6 @@ $TRANSLATIONS = array(
"_%n file_::_%n files_" => array("%n archivo","%n archivos"),
"{dirs} and {files}" => "{carpetas} y {archivos}",
"_Uploading %n file_::_Uploading %n files_" => array("Subiendo %n archivo","Subiendo %n archivos"),
-"files uploading" => "Subiendo archivos",
"'.' is an invalid file name." => "'.' es un nombre de archivo inválido.",
"File name cannot be empty." => "El nombre del archivo no puede quedar vacÃo.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nombre invalido, '\\', '/', '<', '>', ':', '\"', '|', '?' y '*' no están permitidos.",
diff --git a/apps/files/l10n/es_MX.php b/apps/files/l10n/es_MX.php
new file mode 100644
index 0000000000000000000000000000000000000000..0157af093e92200cc7790497227e92e62d80165f
--- /dev/null
+++ b/apps/files/l10n/es_MX.php
@@ -0,0 +1,7 @@
+<?php
+$TRANSLATIONS = array(
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
+"_Uploading %n file_::_Uploading %n files_" => array("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/et_EE.php b/apps/files/l10n/et_EE.php
index 52ba1191706066d39740326e5a7e51f95943ec6c..9f674b27e63ac577b96ac76ec6005ddd6979959b 100644
--- a/apps/files/l10n/et_EE.php
+++ b/apps/files/l10n/et_EE.php
@@ -13,10 +13,8 @@ $TRANSLATIONS = array(
"Missing a temporary folder" => "Ajutiste failide kaust puudub",
"Failed to write to disk" => "Kettale kirjutamine ebaõnnestus",
"Not enough storage available" => "Saadaval pole piisavalt ruumi",
-"Upload failed" => "Üleslaadimine ebaõnnestus",
"Invalid directory." => "Vigane kaust.",
"Files" => "Failid",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Faili ei saa üles laadida, kuna see on kaust või selle suurus on 0 baiti",
"Not enough space available" => "Pole piisavalt ruumi",
"Upload cancelled." => "Üleslaadimine tühistati.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Faili üleslaadimine on töös. Lehelt lahkumine katkestab selle üleslaadimise.",
@@ -37,7 +35,6 @@ $TRANSLATIONS = array(
"_%n file_::_%n files_" => array("%n fail","%n faili"),
"{dirs} and {files}" => "{dirs} ja {files}",
"_Uploading %n file_::_Uploading %n files_" => array("Laadin üles %n faili","Laadin üles %n faili"),
-"files uploading" => "faili üleslaadimisel",
"'.' is an invalid file name." => "'.' on vigane failinimi.",
"File name cannot be empty." => "Faili nimi ei saa olla tühi.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Vigane nimi, '\\', '/', '<', '>', ':', '\"', '|', '?' ja '*' pole lubatud.",
diff --git a/apps/files/l10n/eu.php b/apps/files/l10n/eu.php
index 524be56af02722c07641b3543c5c14b68f39e39e..33ea47d5f04b35fc96567d042eadb091b8e6d67e 100644
--- a/apps/files/l10n/eu.php
+++ b/apps/files/l10n/eu.php
@@ -13,10 +13,8 @@ $TRANSLATIONS = array(
"Missing a temporary folder" => "Aldi bateko karpeta falta da",
"Failed to write to disk" => "Errore bat izan da diskoan idazterakoan",
"Not enough storage available" => "Ez dago behar aina leku erabilgarri,",
-"Upload failed" => "igotzeak huts egin du",
"Invalid directory." => "Baliogabeko karpeta.",
"Files" => "Fitxategiak",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Ezin izan da zure fitxategia igo karpeta bat delako edo 0 byte dituelako",
"Not enough space available" => "Ez dago leku nahikorik.",
"Upload cancelled." => "Igoera ezeztatuta",
"File upload is in progress. Leaving the page now will cancel the upload." => "Fitxategien igoera martxan da. Orria orain uzteak igoera ezeztatutko du.",
@@ -36,7 +34,6 @@ $TRANSLATIONS = array(
"_%n folder_::_%n folders_" => array("karpeta %n","%n karpeta"),
"_%n file_::_%n files_" => array("fitxategi %n","%n fitxategi"),
"_Uploading %n file_::_Uploading %n files_" => array("Fitxategi %n igotzen","%n fitxategi igotzen"),
-"files uploading" => "fitxategiak igotzen",
"'.' is an invalid file name." => "'.' ez da fitxategi izen baliogarria.",
"File name cannot be empty." => "Fitxategi izena ezin da hutsa izan.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "IZen aliogabea, '\\', '/', '<', '>', ':', '\"', '|', '?' eta '*' ez daude baimenduta.",
diff --git a/apps/files/l10n/fa.php b/apps/files/l10n/fa.php
index 24584f715b52b9a0345ad441d1032f70ac24f14c..46d7cfe73efef0518dbe1d76b17970df8e9ec06d 100644
--- a/apps/files/l10n/fa.php
+++ b/apps/files/l10n/fa.php
@@ -13,10 +13,8 @@ $TRANSLATIONS = array(
"Missing a temporary folder" => "یک پوشه موقت گم شده",
"Failed to write to disk" => "نوشتن بر روی دیسک سخت ناموÙÙ‚ بود",
"Not enough storage available" => "Ùضای کاÙÛŒ در دسترس نیست",
-"Upload failed" => "بارگزاری ناموÙÙ‚ بود",
"Invalid directory." => "Ùهرست راهنما نامعتبر Ù…ÛŒ باشد.",
"Files" => "پرونده‌ها",
-"Unable to upload your file as it is a directory or has 0 bytes" => "ناتوان در بارگذاری یا Ùایل یک پوشه است یا 0بایت دارد",
"Not enough space available" => "Ùضای کاÙÛŒ در دسترس نیست",
"Upload cancelled." => "بار گذاری لغو شد",
"File upload is in progress. Leaving the page now will cancel the upload." => "آپلودکردن پرونده در Øال پیشرÙت است. در صورت خروج از صÙØÙ‡ آپلود لغو میگردد. ",
@@ -36,7 +34,6 @@ $TRANSLATIONS = array(
"_%n folder_::_%n folders_" => array(""),
"_%n file_::_%n files_" => array(""),
"_Uploading %n file_::_Uploading %n files_" => array(""),
-"files uploading" => "بارگذاری Ùایل ها",
"'.' is an invalid file name." => "'.' یک نام پرونده نامعتبر است.",
"File name cannot be empty." => "نام پرونده نمی تواند خالی باشد.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "نام نامعتبر ، '\\', '/', '<', '>', ':', '\"', '|', '?' و '*' مجاز نمی باشند.",
diff --git a/apps/files/l10n/fi_FI.php b/apps/files/l10n/fi_FI.php
index 1d29dbf79d209ef9efae347b59e301cbca604e62..5345bad902b392b0668dc96219398fb9e341cf8c 100644
--- a/apps/files/l10n/fi_FI.php
+++ b/apps/files/l10n/fi_FI.php
@@ -11,12 +11,12 @@ $TRANSLATIONS = array(
"Missing a temporary folder" => "Tilapäiskansio puuttuu",
"Failed to write to disk" => "Levylle kirjoitus epäonnistui",
"Not enough storage available" => "Tallennustilaa ei ole riittävästi käytettävissä",
-"Upload failed" => "Lähetys epäonnistui",
"Invalid directory." => "Virheellinen kansio.",
"Files" => "Tiedostot",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Tiedoston lähetys epäonnistui, koska sen koko on 0 tavua tai kyseessä on kansio.",
+"Unable to upload {filename} as it is a directory or has 0 bytes" => "Kohdetta {filename} ei voi lähettää, koska se on joko kansio tai sen koko on 0 tavua",
"Not enough space available" => "Tilaa ei ole riittävästi",
"Upload cancelled." => "Lähetys peruttu.",
+"Could not get result from server." => "Tuloksien saaminen palvelimelta ei onnistunut.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Tiedoston lähetys on meneillään. Sivulta poistuminen nyt peruu tiedoston lähetyksen.",
"URL cannot be empty." => "Verkko-osoite ei voi olla tyhjä",
"Error" => "Virhe",
@@ -39,6 +39,7 @@ $TRANSLATIONS = array(
"Your storage is full, files can not be updated or synced anymore!" => "Tallennustila on loppu, tiedostoja ei voi enää päivittää tai synkronoida!",
"Your storage is almost full ({usedSpacePercent}%)" => "Tallennustila on melkein loppu ({usedSpacePercent}%)",
"Your download is being prepared. This might take some time if the files are big." => "Lataustasi valmistellaan. Tämä saattaa kestää hetken, jos tiedostot ovat suuria kooltaan.",
+"Error moving file" => "Virhe tiedostoa siirrettäessä",
"Name" => "Nimi",
"Size" => "Koko",
"Modified" => "Muokattu",
diff --git a/apps/files/l10n/fr.php b/apps/files/l10n/fr.php
index 2d538262a0a259f64a3343f1f601d4e8fb8ed5ef..03505a2a26988aef322b7f0210b10705b3f5a1fa 100644
--- a/apps/files/l10n/fr.php
+++ b/apps/files/l10n/fr.php
@@ -13,12 +13,14 @@ $TRANSLATIONS = array(
"Missing a temporary folder" => "Absence de dossier temporaire.",
"Failed to write to disk" => "Erreur d'écriture sur le disque",
"Not enough storage available" => "Plus assez d'espace de stockage disponible",
-"Upload failed" => "Échec de l'envoi",
+"Upload failed. Could not get file info." => "L'envoi a échoué. Impossible d'obtenir les informations du fichier.",
+"Upload failed. Could not find uploaded file" => "L'envoi a échoué. Impossible de trouver le fichier envoyé.",
"Invalid directory." => "Dossier invalide.",
"Files" => "Fichiers",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Impossible d'envoyer votre fichier dans la mesure où il s'agit d'un répertoire ou d'un fichier de taille nulle",
+"Unable to upload {filename} as it is a directory or has 0 bytes" => "Impossible d'envoyer {filename} car il s'agit d'un répertoire ou d'un fichier de taille nulle",
"Not enough space available" => "Espace disponible insuffisant",
"Upload cancelled." => "Envoi annulé.",
+"Could not get result from server." => "Ne peut recevoir les résultats du serveur.",
"File upload is in progress. Leaving the page now will cancel the upload." => "L'envoi du fichier est en cours. Quitter cette page maintenant annulera l'envoi du fichier.",
"URL cannot be empty." => "L'URL ne peut-être vide",
"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Nom de dossier invalide. L'utilisation du mot 'Shared' est réservée à Owncloud",
@@ -37,7 +39,6 @@ $TRANSLATIONS = array(
"_%n file_::_%n files_" => array("%n fichier","%n fichiers"),
"{dirs} and {files}" => "{dir} et {files}",
"_Uploading %n file_::_Uploading %n files_" => array("Téléversement de %n fichier","Téléversement de %n fichiers"),
-"files uploading" => "fichiers en cours d'envoi",
"'.' is an invalid file name." => "'.' n'est pas un nom de fichier valide.",
"File name cannot be empty." => "Le nom de fichier ne peut être vide.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nom invalide, les caractères '\\', '/', '<', '>', ':', '\"', '|', '?' et '*' ne sont pas autorisés.",
@@ -45,6 +46,7 @@ $TRANSLATIONS = array(
"Your storage is almost full ({usedSpacePercent}%)" => "Votre espace de stockage est presque plein ({usedSpacePercent}%)",
"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Le chiffrement était désactivé mais vos fichiers sont toujours chiffrés. Veuillez vous rendre sur vos Paramètres personnels pour déchiffrer vos fichiers.",
"Your download is being prepared. This might take some time if the files are big." => "Votre téléchargement est cours de préparation. Ceci peut nécessiter un certain temps si les fichiers sont volumineux.",
+"Error moving file" => "Erreur lors du déplacement du fichier",
"Name" => "Nom",
"Size" => "Taille",
"Modified" => "Modifié",
diff --git a/apps/files/l10n/gl.php b/apps/files/l10n/gl.php
index 01a6b54f8421ff31a42df10e8bb1922d74afc2d9..2766478650a31d707dc2179e6a2d72dae577eda3 100644
--- a/apps/files/l10n/gl.php
+++ b/apps/files/l10n/gl.php
@@ -13,12 +13,14 @@ $TRANSLATIONS = array(
"Missing a temporary folder" => "Falta o cartafol temporal",
"Failed to write to disk" => "Produciuse un erro ao escribir no disco",
"Not enough storage available" => "Non hai espazo de almacenamento abondo",
-"Upload failed" => "Produciuse un fallou no envÃo",
+"Upload failed. Could not get file info." => "O envÃo fracasou. Non foi posÃbel obter información do ficheiro.",
+"Upload failed. Could not find uploaded file" => "O envÃo fracasou. Non foi posÃbel atopar o ficheiro enviado",
"Invalid directory." => "O directorio é incorrecto.",
"Files" => "Ficheiros",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Non foi posÃbel enviar o ficheiro pois ou é un directorio ou ten 0 bytes",
+"Unable to upload {filename} as it is a directory or has 0 bytes" => "Non é posÃbel enviar {filename}, xa que ou é un directorio ou ten 0 bytes",
"Not enough space available" => "O espazo dispoñÃbel é insuficiente",
"Upload cancelled." => "EnvÃo cancelado.",
+"Could not get result from server." => "Non foi posÃbel obter o resultado do servidor.",
"File upload is in progress. Leaving the page now will cancel the upload." => "O envÃo do ficheiro está en proceso. SaÃr agora da páxina cancelará o envÃo.",
"URL cannot be empty." => "O URL non pode quedar baleiro.",
"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Nome de cartafol incorrecto. O uso de «Compartido» e «Shared» está reservado para o ownClod",
@@ -37,7 +39,6 @@ $TRANSLATIONS = array(
"_%n file_::_%n files_" => array("%n ficheiro","%n ficheiros"),
"{dirs} and {files}" => "{dirs} e {files}",
"_Uploading %n file_::_Uploading %n files_" => array("Cargando %n ficheiro","Cargando %n ficheiros"),
-"files uploading" => "ficheiros enviándose",
"'.' is an invalid file name." => "«.» é un nome de ficheiro incorrecto",
"File name cannot be empty." => "O nome de ficheiro non pode estar baleiro",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nome incorrecto, non se permite «\\», «/», «<», «>», «:», «\"», «|», «?» e «*».",
@@ -45,6 +46,7 @@ $TRANSLATIONS = array(
"Your storage is almost full ({usedSpacePercent}%)" => "O seu espazo de almacenamento está case cheo ({usedSpacePercent}%)",
"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "O cifrado foi desactivado, mais os ficheiros están cifrados. Vaia á configuración persoal para descifrar os ficheiros.",
"Your download is being prepared. This might take some time if the files are big." => "Está a prepararse a súa descarga. Isto pode levar bastante tempo se os ficheiros son grandes.",
+"Error moving file" => "Produciuse un erro ao mover o ficheiro",
"Name" => "Nome",
"Size" => "Tamaño",
"Modified" => "Modificado",
diff --git a/apps/files/l10n/he.php b/apps/files/l10n/he.php
index 40d7cc9c5529c3c23e9d47ac6ad6db742366e6de..bc7ecdb0716512d64396497514536800d747fa48 100644
--- a/apps/files/l10n/he.php
+++ b/apps/files/l10n/he.php
@@ -11,10 +11,8 @@ $TRANSLATIONS = array(
"Missing a temporary folder" => "תקיה ×–×ž× ×™×ª חסרה",
"Failed to write to disk" => "הכתיבה ×œ×›×•× ×Ÿ × ×›×©×œ×”",
"Not enough storage available" => "×ין די שטח ×¤× ×•×™ ב×חסון",
-"Upload failed" => "ההעל××” × ×›×©×œ×”",
"Invalid directory." => "תיקייה שגויה.",
"Files" => "קבצי×",
-"Unable to upload your file as it is a directory or has 0 bytes" => "×œ× ×™×›×•×œ להעלות ×ת הקובץ מכיוון שזו תקיה ×ו שמשקל הקובץ 0 בתי×",
"Upload cancelled." => "ההעל××” בוטלה.",
"File upload is in progress. Leaving the page now will cancel the upload." => "מתבצעת כעת העל×ת קבצי×. עזיבה של העמוד תבטל ×ת ההעל××”.",
"URL cannot be empty." => "קישור ××™× ×• יכול להיות ריק.",
@@ -32,7 +30,6 @@ $TRANSLATIONS = array(
"_%n folder_::_%n folders_" => array("",""),
"_%n file_::_%n files_" => array("",""),
"_Uploading %n file_::_Uploading %n files_" => array("",""),
-"files uploading" => "×§×‘×¦×™× ×‘×”×¢×œ××”",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "×”×©× ×©×’×•×™, ×סור להשתמש ×‘×ª×•×•×™× '\\', '/', '<', '>', ':', '\"', '|', '?' ו־'*'.",
"Name" => "ש×",
"Size" => "גודל",
diff --git a/apps/files/l10n/hi.php b/apps/files/l10n/hi.php
index 7d2baab607dd17182c2c13f939a5fc623beb4112..549c928320d2c788764605ce69f055dd4d9c1699 100644
--- a/apps/files/l10n/hi.php
+++ b/apps/files/l10n/hi.php
@@ -5,6 +5,7 @@ $TRANSLATIONS = array(
"_%n folder_::_%n folders_" => array("",""),
"_%n file_::_%n files_" => array("",""),
"_Uploading %n file_::_Uploading %n files_" => array("",""),
+"Upload" => "अपलोड ",
"Save" => "सहेजें"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/hr.php b/apps/files/l10n/hr.php
index 57f1ad9700bc321218345305793d9768d38a0242..60f1da844091fb75b639d4776b9a38fb96f17e2c 100644
--- a/apps/files/l10n/hr.php
+++ b/apps/files/l10n/hr.php
@@ -7,7 +7,6 @@ $TRANSLATIONS = array(
"Missing a temporary folder" => "Nedostaje privremeni direktorij",
"Failed to write to disk" => "Neuspjelo pisanje na disk",
"Files" => "Datoteke",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Nemoguće poslati datoteku jer je prazna ili je direktorij",
"Upload cancelled." => "Slanje poništeno.",
"File upload is in progress. Leaving the page now will cancel the upload." => "UÄitavanje datoteke. NapuÅ¡tanjem stranice će prekinuti uÄitavanje.",
"Error" => "Greška",
@@ -21,7 +20,6 @@ $TRANSLATIONS = array(
"_%n folder_::_%n folders_" => array("","",""),
"_%n file_::_%n files_" => array("","",""),
"_Uploading %n file_::_Uploading %n files_" => array("","",""),
-"files uploading" => "datoteke se uÄitavaju",
"Name" => "Ime",
"Size" => "VeliÄina",
"Modified" => "Zadnja promjena",
diff --git a/apps/files/l10n/hu_HU.php b/apps/files/l10n/hu_HU.php
index 66edbefbca52cf14654cf7cfddbf67bede464c43..5d313ff2488a656f9c61c276d3171e5f9db16c98 100644
--- a/apps/files/l10n/hu_HU.php
+++ b/apps/files/l10n/hu_HU.php
@@ -13,10 +13,8 @@ $TRANSLATIONS = array(
"Missing a temporary folder" => "Hiányzik egy ideiglenes mappa",
"Failed to write to disk" => "Nem sikerült a lemezre történÅ‘ Ãrás",
"Not enough storage available" => "Nincs elég szabad hely.",
-"Upload failed" => "A feltöltés nem sikerült",
"Invalid directory." => "Érvénytelen mappa.",
"Files" => "Fájlok",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Nem tölthető fel, mert mappa volt, vagy 0 byte méretű",
"Not enough space available" => "Nincs elég szabad hely",
"Upload cancelled." => "A feltöltést megszakÃtottuk.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Fájlfeltöltés van folyamatban. Az oldal elhagyása megszakÃtja a feltöltést.",
@@ -36,7 +34,6 @@ $TRANSLATIONS = array(
"_%n folder_::_%n folders_" => array("",""),
"_%n file_::_%n files_" => array("",""),
"_Uploading %n file_::_Uploading %n files_" => array("",""),
-"files uploading" => "fájl töltődik föl",
"'.' is an invalid file name." => "'.' fájlnév érvénytelen.",
"File name cannot be empty." => "A fájlnév nem lehet semmi.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Érvénytelen elnevezés. Ezek a karakterek nem használhatók: '\\', '/', '<', '>', ':', '\"', '|', '?' és '*'",
diff --git a/apps/files/l10n/id.php b/apps/files/l10n/id.php
index ce7cfe5ef4cc26478762f7819f559a931928b9e7..c8b3194eb6b0d182ad71761b2bd88ef116554c65 100644
--- a/apps/files/l10n/id.php
+++ b/apps/files/l10n/id.php
@@ -13,7 +13,6 @@ $TRANSLATIONS = array(
"Not enough storage available" => "Ruang penyimpanan tidak mencukupi",
"Invalid directory." => "Direktori tidak valid.",
"Files" => "Berkas",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Gagal mengunggah berkas Anda karena berupa direktori atau mempunyai ukuran 0 byte",
"Not enough space available" => "Ruang penyimpanan tidak mencukupi",
"Upload cancelled." => "Pengunggahan dibatalkan.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Berkas sedang diunggah. Meninggalkan halaman ini akan membatalkan proses.",
@@ -32,7 +31,6 @@ $TRANSLATIONS = array(
"_%n folder_::_%n folders_" => array(""),
"_%n file_::_%n files_" => array(""),
"_Uploading %n file_::_Uploading %n files_" => array(""),
-"files uploading" => "berkas diunggah",
"'.' is an invalid file name." => "'.' bukan nama berkas yang valid.",
"File name cannot be empty." => "Nama berkas tidak boleh kosong.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nama tidak valid, karakter '\\', '/', '<', '>', ':', '\"', '|', '?' dan '*' tidak diizinkan.",
diff --git a/apps/files/l10n/is.php b/apps/files/l10n/is.php
index 2cf195d0a113adea0c425eca0228fa5fbfb2ebad..ef49341820691d92f570434e5e0313bdea535750 100644
--- a/apps/files/l10n/is.php
+++ b/apps/files/l10n/is.php
@@ -12,7 +12,6 @@ $TRANSLATIONS = array(
"Failed to write to disk" => "Tókst ekki að skrifa á disk",
"Invalid directory." => "Ógild mappa.",
"Files" => "Skrár",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Innsending á skrá mistókst, hugsanlega sendir þú möppu eða skráin er 0 bæti.",
"Not enough space available" => "Ekki nægt pláss tiltækt",
"Upload cancelled." => "Hætt við innsendingu.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Innsending à gangi. Ef þú ferð af þessari sÃðu mun innsending misheppnast.",
diff --git a/apps/files/l10n/it.php b/apps/files/l10n/it.php
index b0ec954d90746834d9261e2b3a6eaa831d9e5d61..c24d30ae368279ade51cf29d4a44752dde50eefd 100644
--- a/apps/files/l10n/it.php
+++ b/apps/files/l10n/it.php
@@ -13,12 +13,14 @@ $TRANSLATIONS = array(
"Missing a temporary folder" => "Manca una cartella temporanea",
"Failed to write to disk" => "Scrittura su disco non riuscita",
"Not enough storage available" => "Spazio di archiviazione insufficiente",
-"Upload failed" => "Caricamento non riuscito",
+"Upload failed. Could not get file info." => "Upload fallito. Impossibile ottenere informazioni sul file",
+"Upload failed. Could not find uploaded file" => "Upload fallit. Impossibile trovare file caricato",
"Invalid directory." => "Cartella non valida.",
"Files" => "File",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Impossibile caricare il file poiché è una cartella o ha una dimensione di 0 byte",
+"Unable to upload {filename} as it is a directory or has 0 bytes" => "Impossibile caricare {filename} poiché è una cartella oppure è di 0 byte",
"Not enough space available" => "Spazio disponibile insufficiente",
"Upload cancelled." => "Invio annullato",
+"Could not get result from server." => "Impossibile ottenere il risultato dal server.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Caricamento del file in corso. La chiusura della pagina annullerà il caricamento.",
"URL cannot be empty." => "L'URL non può essere vuoto.",
"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Nome della cartella non valido. L'uso di 'Shared' è riservato a ownCloud",
@@ -37,7 +39,6 @@ $TRANSLATIONS = array(
"_%n file_::_%n files_" => array("%n file","%n file"),
"{dirs} and {files}" => "{dirs} e {files}",
"_Uploading %n file_::_Uploading %n files_" => array("Caricamento di %n file in corso","Caricamento di %n file in corso"),
-"files uploading" => "caricamento file",
"'.' is an invalid file name." => "'.' non è un nome file valido.",
"File name cannot be empty." => "Il nome del file non può essere vuoto.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nome non valido, '\\', '/', '<', '>', ':', '\"', '|', '?' e '*' non sono consentiti.",
@@ -45,6 +46,7 @@ $TRANSLATIONS = array(
"Your storage is almost full ({usedSpacePercent}%)" => "Lo spazio di archiviazione è quasi pieno ({usedSpacePercent}%)",
"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "La cifratura è stata disabilitata ma i tuoi file sono ancora cifrati. Vai nelle impostazioni personali per decifrare i file.",
"Your download is being prepared. This might take some time if the files are big." => "Il tuo scaricamento è in fase di preparazione. Ciò potrebbe richiedere del tempo se i file sono grandi.",
+"Error moving file" => "Errore durante lo spostamento del file",
"Name" => "Nome",
"Size" => "Dimensione",
"Modified" => "Modificato",
diff --git a/apps/files/l10n/ja_JP.php b/apps/files/l10n/ja_JP.php
index 5438cbb4976c32db4e4d3802f98707d37dd5479b..5944b47434da4947bd07eef8271347888c722d32 100644
--- a/apps/files/l10n/ja_JP.php
+++ b/apps/files/l10n/ja_JP.php
@@ -13,10 +13,8 @@ $TRANSLATIONS = array(
"Missing a temporary folder" => "一時ä¿å˜ãƒ•ã‚©ãƒ«ãƒ€ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“",
"Failed to write to disk" => "ディスクã¸ã®æ›¸ãè¾¼ã¿ã«å¤±æ•—ã—ã¾ã—ãŸ",
"Not enough storage available" => "ストレージã«å分ãªç©ºã容é‡ãŒã‚ã‚Šã¾ã›ã‚“",
-"Upload failed" => "アップãƒãƒ¼ãƒ‰ã«å¤±æ•—",
"Invalid directory." => "無効ãªãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã§ã™ã€‚",
"Files" => "ファイル",
-"Unable to upload your file as it is a directory or has 0 bytes" => "ディレクトリもã—ãã¯0ãƒã‚¤ãƒˆã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ã§ãã¾ã›ã‚“",
"Not enough space available" => "利用å¯èƒ½ãªã‚¹ãƒšãƒ¼ã‚¹ãŒå分ã«ã‚ã‚Šã¾ã›ã‚“",
"Upload cancelled." => "アップãƒãƒ¼ãƒ‰ã¯ã‚ャンセルã•ã‚Œã¾ã—ãŸã€‚",
"File upload is in progress. Leaving the page now will cancel the upload." => "ファイル転é€ã‚’実行ä¸ã§ã™ã€‚今ã“ã®ãƒšãƒ¼ã‚¸ã‹ã‚‰ç§»å‹•ã™ã‚‹ã¨ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ãŒä¸æ¢ã•ã‚Œã¾ã™ã€‚",
@@ -37,7 +35,6 @@ $TRANSLATIONS = array(
"_%n file_::_%n files_" => array("%n個ã®ãƒ•ã‚¡ã‚¤ãƒ«"),
"{dirs} and {files}" => "{dirs} 㨠{files}",
"_Uploading %n file_::_Uploading %n files_" => array("%n 個ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’アップãƒãƒ¼ãƒ‰ä¸"),
-"files uploading" => "ファイルをアップãƒãƒ¼ãƒ‰ä¸",
"'.' is an invalid file name." => "'.' ã¯ç„¡åŠ¹ãªãƒ•ã‚¡ã‚¤ãƒ«åã§ã™ã€‚",
"File name cannot be empty." => "ファイルåを空ã«ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“。",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "無効ãªåå‰ã€'\\', '/', '<', '>', ':', '\"', '|', '?', '*' ã¯ä½¿ç”¨ã§ãã¾ã›ã‚“。",
diff --git a/apps/files/l10n/ka_GE.php b/apps/files/l10n/ka_GE.php
index 455e3211a55744313a9b9b779c78940eddee4f00..b9313957714b6db6c99d5869ffb5ecc1dbd98e42 100644
--- a/apps/files/l10n/ka_GE.php
+++ b/apps/files/l10n/ka_GE.php
@@ -11,10 +11,8 @@ $TRANSLATIONS = array(
"Missing a temporary folder" => "დრáƒáƒ”ბითი სáƒáƒ¥áƒáƒ¦áƒáƒšáƒ“ე áƒáƒ áƒáƒ სებáƒáƒ‘ს",
"Failed to write to disk" => "შეცდáƒáƒ›áƒ დისკზე ჩáƒáƒ¬áƒ”რისáƒáƒ¡",
"Not enough storage available" => "სáƒáƒªáƒáƒ•áƒ¨áƒ˜ სáƒáƒ™áƒ›áƒáƒ ისი áƒáƒ“გილი áƒáƒ áƒáƒ ის",
-"Upload failed" => "áƒáƒ¢áƒ•áƒ˜áƒ თვრვერგáƒáƒœáƒ®áƒáƒ ციელდáƒ",
"Invalid directory." => "დáƒáƒ£áƒ¨áƒ•áƒ”ბელი დირექტáƒáƒ იáƒ.",
"Files" => "ფáƒáƒ˜áƒšáƒ”ბი",
-"Unable to upload your file as it is a directory or has 0 bytes" => "თქვენი ფáƒáƒ˜áƒšáƒ˜áƒ¡ áƒáƒ¢áƒ•áƒ˜áƒ თვრვერმáƒáƒ®áƒ”რხდáƒ. ის áƒáƒ ის სáƒáƒ¥áƒáƒ¦áƒáƒšáƒ“ე დრშეიცáƒáƒ•áƒ¡ 0 ბáƒáƒ˜áƒ¢áƒ¡",
"Not enough space available" => "სáƒáƒ™áƒ›áƒáƒ ისი áƒáƒ“გილი áƒáƒ áƒáƒ ის",
"Upload cancelled." => "áƒáƒ¢áƒ•áƒ˜áƒ თვრშეჩერებულ იქნáƒ.",
"File upload is in progress. Leaving the page now will cancel the upload." => "მიმდინáƒáƒ ეáƒáƒ‘ს ფáƒáƒ˜áƒšáƒ˜áƒ¡ áƒáƒ¢áƒ•áƒ˜áƒ თვáƒ. სხვრგვერდზე გáƒáƒ“áƒáƒ¡áƒ•áƒšáƒ გáƒáƒ›áƒáƒ˜áƒ¬áƒ•áƒ”ვს áƒáƒ¢áƒ•áƒ˜áƒ თვის შეჩერებáƒáƒ¡",
@@ -33,7 +31,6 @@ $TRANSLATIONS = array(
"_%n folder_::_%n folders_" => array(""),
"_%n file_::_%n files_" => array(""),
"_Uploading %n file_::_Uploading %n files_" => array(""),
-"files uploading" => "ფáƒáƒ˜áƒšáƒ”ბი იტვირთებáƒ",
"'.' is an invalid file name." => "'.' áƒáƒ ის დáƒáƒ£áƒ¨áƒ•áƒ”ბელი ფáƒáƒ˜áƒšáƒ˜áƒ¡ სáƒáƒ®áƒ”ლი.",
"File name cannot be empty." => "ფáƒáƒ˜áƒšáƒ˜áƒ¡ სáƒáƒ®áƒ”ლი áƒáƒ შეიძლებრიყáƒáƒ¡ ცáƒáƒ იელი.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "áƒáƒ áƒáƒ“áƒáƒ¨áƒ•áƒ”ბáƒáƒ“ი სáƒáƒ®áƒ”ლი, '\\', '/', '<', '>', ':', '\"', '|', '?' დრ'*' áƒáƒ áƒáƒ ის დáƒáƒ˜áƒ¨áƒ•áƒ”ბული.",
diff --git a/apps/files/l10n/km.php b/apps/files/l10n/km.php
new file mode 100644
index 0000000000000000000000000000000000000000..70ab6572ba466c23b8066e18b9ee2f9cb2a7a827
--- /dev/null
+++ b/apps/files/l10n/km.php
@@ -0,0 +1,7 @@
+<?php
+$TRANSLATIONS = array(
+"_%n folder_::_%n folders_" => array(""),
+"_%n file_::_%n files_" => array(""),
+"_Uploading %n file_::_Uploading %n files_" => array("")
+);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/l10n/kn.php b/apps/files/l10n/kn.php
new file mode 100644
index 0000000000000000000000000000000000000000..70ab6572ba466c23b8066e18b9ee2f9cb2a7a827
--- /dev/null
+++ b/apps/files/l10n/kn.php
@@ -0,0 +1,7 @@
+<?php
+$TRANSLATIONS = array(
+"_%n folder_::_%n folders_" => array(""),
+"_%n file_::_%n files_" => array(""),
+"_Uploading %n file_::_Uploading %n files_" => array("")
+);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/l10n/ko.php b/apps/files/l10n/ko.php
index e2b787e7f91e88c6544e70ca4ab574d17197ace7..502acefcf3aa56fa3b0aadd553dd679126625ce3 100644
--- a/apps/files/l10n/ko.php
+++ b/apps/files/l10n/ko.php
@@ -11,10 +11,8 @@ $TRANSLATIONS = array(
"Missing a temporary folder" => "ìž„ì‹œ í´ë”ê°€ ì—†ìŒ",
"Failed to write to disk" => "디스í¬ì— 쓰지 못했습니다",
"Not enough storage available" => "ì €ìž¥ì†Œê°€ ìš©ëŸ‰ì´ ì¶©ë¶„í•˜ì§€ 않습니다.",
-"Upload failed" => "업로드 실패",
"Invalid directory." => "올바르지 ì•Šì€ ë””ë ‰í„°ë¦¬ìž…ë‹ˆë‹¤.",
"Files" => "파ì¼",
-"Unable to upload your file as it is a directory or has 0 bytes" => "ë””ë ‰í„°ë¦¬ ë° ë¹ˆ 파ì¼ì€ ì—…ë¡œë“œí• ìˆ˜ 없습니다",
"Not enough space available" => "ì—¬ìœ ê³µê°„ì´ ë¶€ì¡±í•©ë‹ˆë‹¤",
"Upload cancelled." => "업로드가 취소ë˜ì—ˆìŠµë‹ˆë‹¤.",
"File upload is in progress. Leaving the page now will cancel the upload." => "íŒŒì¼ ì—…ë¡œë“œê°€ 진행 중입니다. ì´ íŽ˜ì´ì§€ë¥¼ 벗어나면 업로드가 취소ë©ë‹ˆë‹¤.",
@@ -33,7 +31,6 @@ $TRANSLATIONS = array(
"_%n folder_::_%n folders_" => array(""),
"_%n file_::_%n files_" => array(""),
"_Uploading %n file_::_Uploading %n files_" => array(""),
-"files uploading" => "íŒŒì¼ ì—…ë¡œë“œì¤‘",
"'.' is an invalid file name." => "'.' 는 올바르지 ì•Šì€ íŒŒì¼ ì´ë¦„ 입니다.",
"File name cannot be empty." => "íŒŒì¼ ì´ë¦„ì´ ë¹„ì–´ ìžˆì„ ìˆ˜ 없습니다.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "í´ë” ì´ë¦„ì´ ì˜¬ë°”ë¥´ì§€ 않습니다. ì´ë¦„ì— ë¬¸ìž '\\', '/', '<', '>', ':', '\"', '|', '? ', '*'는 ì‚¬ìš©í• ìˆ˜ 없습니다.",
diff --git a/apps/files/l10n/lb.php b/apps/files/l10n/lb.php
index deefe9caa1574b16e32bf5e39181aecc7a9422cc..cd68b2b9ad2ec25562d4369f0eb3c992291867bc 100644
--- a/apps/files/l10n/lb.php
+++ b/apps/files/l10n/lb.php
@@ -7,7 +7,6 @@ $TRANSLATIONS = array(
"Missing a temporary folder" => "Et feelt en temporären Dossier",
"Failed to write to disk" => "Konnt net op den Disk schreiwen",
"Files" => "Dateien",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Kann deng Datei net eroplueden well et en Dossier ass oder 0 byte grouss ass.",
"Upload cancelled." => "Upload ofgebrach.",
"File upload is in progress. Leaving the page now will cancel the upload." => "File Upload am gaang. Wann's de des Säit verléiss gëtt den Upload ofgebrach.",
"Error" => "Fehler",
diff --git a/apps/files/l10n/lt_LT.php b/apps/files/l10n/lt_LT.php
index 83ed8e8688f2f916f38df58e875262df4fa141b0..2b32a129d55a3c183a8c1b36b6acc02512211120 100644
--- a/apps/files/l10n/lt_LT.php
+++ b/apps/files/l10n/lt_LT.php
@@ -13,10 +13,8 @@ $TRANSLATIONS = array(
"Missing a temporary folder" => "NÄ—ra laikinojo katalogo",
"Failed to write to disk" => "Nepavyko įrašyti į diską",
"Not enough storage available" => "Nepakanka vietos serveryje",
-"Upload failed" => "Nusiuntimas nepavyko",
"Invalid directory." => "Neteisingas aplankas",
"Files" => "Failai",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Neįmanoma įkelti failo - jo dydis gali būti 0 bitų arba tai katalogas",
"Not enough space available" => "Nepakanka vietos",
"Upload cancelled." => "Įkėlimas atšauktas.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Failo įkėlimas pradėtas. Jei paliksite šį puslapį, įkėlimas nutrūks.",
@@ -37,7 +35,6 @@ $TRANSLATIONS = array(
"_%n file_::_%n files_" => array("%n failas","%n failai","%n failų"),
"{dirs} and {files}" => "{dirs} ir {files}",
"_Uploading %n file_::_Uploading %n files_" => array("Įkeliamas %n failas","Įkeliami %n failai","Įkeliama %n failų"),
-"files uploading" => "įkeliami failai",
"'.' is an invalid file name." => "'.' yra neleidžiamas failo pavadinime.",
"File name cannot be empty." => "Failo pavadinimas negali bÅ«ti tuÅ¡Äias.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Neleistinas pavadinimas, '\\', '/', '<', '>', ':', '\"', '|', '?' ir '*' yra neleidžiami.",
diff --git a/apps/files/l10n/lv.php b/apps/files/l10n/lv.php
index d24aaca9e4c76bfda88a8d18cb4ad8a8af6603ba..cefaea62818ead578eb1d12b363ecc4a69f1cfae 100644
--- a/apps/files/l10n/lv.php
+++ b/apps/files/l10n/lv.php
@@ -13,10 +13,8 @@ $TRANSLATIONS = array(
"Missing a temporary folder" => "Trūkst pagaidu mapes",
"Failed to write to disk" => "NeizdevÄs saglabÄt diskÄ",
"Not enough storage available" => "Nav pietiekami daudz vietas",
-"Upload failed" => "NeizdevÄs augÅ¡upielÄdÄ“t",
"Invalid directory." => "Nederīga direktorija.",
"Files" => "Datnes",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Nevar augÅ¡upielÄdÄ“t jÅ«su datni, jo tÄ ir direktorija vai arÄ« tÄ ir 0 baitu liela",
"Not enough space available" => "Nepietiek brīvas vietas",
"Upload cancelled." => "AugÅ¡upielÄde ir atcelta.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Notiek augÅ¡upielÄde. Pametot lapu tagad, tiks atcelta augÅ¡upielÄde.",
@@ -36,7 +34,6 @@ $TRANSLATIONS = array(
"_%n folder_::_%n folders_" => array("%n mapes","%n mape","%n mapes"),
"_%n file_::_%n files_" => array("%n faili","%n fails","%n faili"),
"_Uploading %n file_::_Uploading %n files_" => array("%n","AugÅ¡upielÄde %n failu","AugÅ¡upielÄde %n failus"),
-"files uploading" => "fails augÅ¡upielÄdÄ“jas",
"'.' is an invalid file name." => "'.' ir nederīgs datnes nosaukums.",
"File name cannot be empty." => "Datnes nosaukums nevar būt tukšs.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nederīgs nosaukums, nav atļauti '\\', '/', '<', '>', ':', '\"', '|', '?' un '*'.",
diff --git a/apps/files/l10n/mk.php b/apps/files/l10n/mk.php
index 7a9a8641f8082e69ecdf028a932c4b84b732a871..2306db6921a93b3676ca693ac7fd60b9cca30cad 100644
--- a/apps/files/l10n/mk.php
+++ b/apps/files/l10n/mk.php
@@ -9,7 +9,6 @@ $TRANSLATIONS = array(
"Missing a temporary folder" => "ÐедоÑтаÑува привремена папка",
"Failed to write to disk" => "ÐеуÑпеав да запишам на диÑк",
"Files" => "Датотеки",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Ðе може да Ñе преземе вашата датотека бидејќи фолдерот во кој Ñе наоѓа фајлот има големина од 0 бајти",
"Upload cancelled." => "Преземањето е прекинато.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Подигање на датотека е во тек. Ðапуштење на Ñтраницата ќе го прекине.",
"URL cannot be empty." => "ÐдреÑата неможе да биде празна.",
diff --git a/apps/files/l10n/ml_IN.php b/apps/files/l10n/ml_IN.php
new file mode 100644
index 0000000000000000000000000000000000000000..0157af093e92200cc7790497227e92e62d80165f
--- /dev/null
+++ b/apps/files/l10n/ml_IN.php
@@ -0,0 +1,7 @@
+<?php
+$TRANSLATIONS = array(
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
+"_Uploading %n file_::_Uploading %n files_" => array("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/ms_MY.php b/apps/files/l10n/ms_MY.php
index 59d0bbfb339e710032edb1777d8d2ffef019ae66..61bbf81cd8a4d3bd4b0c64cefa6050a57ada4193 100644
--- a/apps/files/l10n/ms_MY.php
+++ b/apps/files/l10n/ms_MY.php
@@ -8,7 +8,6 @@ $TRANSLATIONS = array(
"Missing a temporary folder" => "Direktori sementara hilang",
"Failed to write to disk" => "Gagal untuk disimpan",
"Files" => "Fail-fail",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Tidak boleh memuatnaik fail anda kerana mungkin ianya direktori atau saiz fail 0 bytes",
"Upload cancelled." => "Muatnaik dibatalkan.",
"Error" => "Ralat",
"Share" => "Kongsi",
diff --git a/apps/files/l10n/nb_NO.php b/apps/files/l10n/nb_NO.php
index 55ce978d2a2da683cce8d075358aef8c535b743a..8fda251a2bc072c7e2ee45a8421f128a8bb301e8 100644
--- a/apps/files/l10n/nb_NO.php
+++ b/apps/files/l10n/nb_NO.php
@@ -13,10 +13,8 @@ $TRANSLATIONS = array(
"Missing a temporary folder" => "Mangler midlertidig mappe",
"Failed to write to disk" => "Klarte ikke å skrive til disk",
"Not enough storage available" => "Ikke nok lagringsplass",
-"Upload failed" => "Opplasting feilet",
"Invalid directory." => "Ugyldig katalog.",
"Files" => "Filer",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Kan ikke laste opp filen din siden det er en mappe eller den har 0 bytes",
"Not enough space available" => "Ikke nok lagringsplass",
"Upload cancelled." => "Opplasting avbrutt.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Filopplasting pågår. Forlater du siden nå avbrytes opplastingen.",
@@ -36,7 +34,6 @@ $TRANSLATIONS = array(
"_%n folder_::_%n folders_" => array("%n mappe","%n mapper"),
"_%n file_::_%n files_" => array("%n fil","%n filer"),
"_Uploading %n file_::_Uploading %n files_" => array("Laster opp %n fil","Laster opp %n filer"),
-"files uploading" => "filer lastes opp",
"'.' is an invalid file name." => "'.' er et ugyldig filnavn.",
"File name cannot be empty." => "Filnavn kan ikke være tomt.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ugyldig navn, '\\', '/', '<', '>', ':', '\"', '|', '?' og '*' er ikke tillatt.",
diff --git a/apps/files/l10n/ne.php b/apps/files/l10n/ne.php
new file mode 100644
index 0000000000000000000000000000000000000000..0157af093e92200cc7790497227e92e62d80165f
--- /dev/null
+++ b/apps/files/l10n/ne.php
@@ -0,0 +1,7 @@
+<?php
+$TRANSLATIONS = array(
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
+"_Uploading %n file_::_Uploading %n files_" => array("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/nl.php b/apps/files/l10n/nl.php
index 8e9454e7945fed03a9fa0168149d0f911d982b19..65ad526523795934267b5ee1861ee36c2246cb51 100644
--- a/apps/files/l10n/nl.php
+++ b/apps/files/l10n/nl.php
@@ -13,10 +13,8 @@ $TRANSLATIONS = array(
"Missing a temporary folder" => "Er ontbreekt een tijdelijke map",
"Failed to write to disk" => "Schrijven naar schijf mislukt",
"Not enough storage available" => "Niet genoeg opslagruimte beschikbaar",
-"Upload failed" => "Upload mislukt",
"Invalid directory." => "Ongeldige directory.",
"Files" => "Bestanden",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Het lukt niet om uw bestand te uploaded, omdat het een folder of 0 bytes is",
"Not enough space available" => "Niet genoeg ruimte beschikbaar",
"Upload cancelled." => "Uploaden geannuleerd.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Bestandsupload is bezig. Wanneer de pagina nu verlaten wordt, stopt de upload.",
@@ -37,7 +35,6 @@ $TRANSLATIONS = array(
"_%n file_::_%n files_" => array("","%n bestanden"),
"{dirs} and {files}" => "{dirs} en {files}",
"_Uploading %n file_::_Uploading %n files_" => array("%n bestand aan het uploaden","%n bestanden aan het uploaden"),
-"files uploading" => "bestanden aan het uploaden",
"'.' is an invalid file name." => "'.' is een ongeldige bestandsnaam.",
"File name cannot be empty." => "Bestandsnaam kan niet leeg zijn.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Onjuiste naam; '\\', '/', '<', '>', ':', '\"', '|', '?' en '*' zijn niet toegestaan.",
diff --git a/apps/files/l10n/nn_NO.php b/apps/files/l10n/nn_NO.php
index 58aafac27c4d8c2497b6b8349d6a84ab293893da..e29b1d3ad36b13ba2cea74bfed1dc71039db89b3 100644
--- a/apps/files/l10n/nn_NO.php
+++ b/apps/files/l10n/nn_NO.php
@@ -13,12 +13,14 @@ $TRANSLATIONS = array(
"Missing a temporary folder" => "Manglar ei mellombels mappe",
"Failed to write to disk" => "Klarte ikkje skriva til disk",
"Not enough storage available" => "Ikkje nok lagringsplass tilgjengeleg",
-"Upload failed" => "Feil ved opplasting",
+"Upload failed. Could not get file info." => "Feil ved opplasting. Klarte ikkje å henta filinfo.",
+"Upload failed. Could not find uploaded file" => "Feil ved opplasting. Klarte ikkje å finna opplasta fil.",
"Invalid directory." => "Ugyldig mappe.",
"Files" => "Filer",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Klarte ikkje lasta opp fila sidan ho er ei mappe eller er på 0 byte",
+"Unable to upload {filename} as it is a directory or has 0 bytes" => "Klarte ikkje å lasta opp {filename} sidan det er ei mappe eller er 0 byte.",
"Not enough space available" => "Ikkje nok lagringsplass tilgjengeleg",
"Upload cancelled." => "Opplasting avbroten.",
+"Could not get result from server." => "Klarte ikkje å henta resultat frå tenaren.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Fila lastar no opp. Viss du forlèt sida no vil opplastinga verta avbroten.",
"URL cannot be empty." => "Nettadressa kan ikkje vera tom.",
"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Ugyldig mappenamn. Mappa «Shared» er reservert av ownCloud",
@@ -37,7 +39,6 @@ $TRANSLATIONS = array(
"_%n file_::_%n files_" => array("%n fil","%n filer"),
"{dirs} and {files}" => "{dirs} og {files}",
"_Uploading %n file_::_Uploading %n files_" => array("Lastar opp %n fil","Lastar opp %n filer"),
-"files uploading" => "filer lastar opp",
"'.' is an invalid file name." => "«.» er eit ugyldig filnamn.",
"File name cannot be empty." => "Filnamnet kan ikkje vera tomt.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ugyldig namn, «\\», «/», «<», «>», «:», «\"», «|», «?» og «*» er ikkje tillate.",
@@ -45,6 +46,7 @@ $TRANSLATIONS = array(
"Your storage is almost full ({usedSpacePercent}%)" => "Lagringa di er nesten full ({usedSpacePercent} %)",
"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Kryptering er skrudd av, men filene dine er enno krypterte. Du kan dekryptera filene i personlege innstillingar.",
"Your download is being prepared. This might take some time if the files are big." => "Gjer klar nedlastinga di. Dette kan ta ei stund viss filene er store.",
+"Error moving file" => "Feil ved flytting av fil",
"Name" => "Namn",
"Size" => "Storleik",
"Modified" => "Endra",
diff --git a/apps/files/l10n/nqo.php b/apps/files/l10n/nqo.php
new file mode 100644
index 0000000000000000000000000000000000000000..70ab6572ba466c23b8066e18b9ee2f9cb2a7a827
--- /dev/null
+++ b/apps/files/l10n/nqo.php
@@ -0,0 +1,7 @@
+<?php
+$TRANSLATIONS = array(
+"_%n folder_::_%n folders_" => array(""),
+"_%n file_::_%n files_" => array(""),
+"_Uploading %n file_::_Uploading %n files_" => array("")
+);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/l10n/oc.php b/apps/files/l10n/oc.php
index 63e572059bf8cc4e663be208f989057d9b1bc1c7..a6d8f91458edafc5a7bff0a9d9884f0da2ba03db 100644
--- a/apps/files/l10n/oc.php
+++ b/apps/files/l10n/oc.php
@@ -7,7 +7,6 @@ $TRANSLATIONS = array(
"Missing a temporary folder" => "Un dorsièr temporari manca",
"Failed to write to disk" => "L'escriptura sul disc a fracassat",
"Files" => "Fichièrs",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Impossible d'amontcargar lo teu fichièr qu'es un repertòri o que ten pas que 0 octet.",
"Upload cancelled." => "Amontcargar anullat.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Un amontcargar es a se far. Daissar aquesta pagina ara tamparà lo cargament. ",
"Error" => "Error",
@@ -21,7 +20,6 @@ $TRANSLATIONS = array(
"_%n folder_::_%n folders_" => array("",""),
"_%n file_::_%n files_" => array("",""),
"_Uploading %n file_::_Uploading %n files_" => array("",""),
-"files uploading" => "fichièrs al amontcargar",
"Name" => "Nom",
"Size" => "Talha",
"Modified" => "Modificat",
diff --git a/apps/files/l10n/pa.php b/apps/files/l10n/pa.php
new file mode 100644
index 0000000000000000000000000000000000000000..d8c50f2d1bc4765a7a49e11cd3260647d20845e6
--- /dev/null
+++ b/apps/files/l10n/pa.php
@@ -0,0 +1,16 @@
+<?php
+$TRANSLATIONS = array(
+"Files" => "ਫਾਇਲਾਂ",
+"Error" => "ਗਲਤੀ",
+"Share" => "ਸਾਂà¨à¨¾ ਕਰੋ",
+"Rename" => "ਨਾਂ ਬਦਲੋ",
+"undo" => "ਵਾਪਸ",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
+"_Uploading %n file_::_Uploading %n files_" => array("",""),
+"Upload" => "ਅੱਪਲੋਡ",
+"Cancel upload" => "ਅੱਪਲੋਡ ਰੱਦ ਕਰੋ",
+"Download" => "ਡਾਊਨਲੋਡ",
+"Delete" => "ਹਟਾਓ"
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/pl.php b/apps/files/l10n/pl.php
index d8edf7173a8af5f09b3809cb6f9989d9dd0ec2c1..3ad80975810ad1a0e85e56486103deff9e8a3134 100644
--- a/apps/files/l10n/pl.php
+++ b/apps/files/l10n/pl.php
@@ -13,10 +13,8 @@ $TRANSLATIONS = array(
"Missing a temporary folder" => "Brak folderu tymczasowego",
"Failed to write to disk" => "BÅ‚Ä…d zapisu na dysk",
"Not enough storage available" => "Za mało dostępnego miejsca",
-"Upload failed" => "Wysyłanie nie powiodło się",
"Invalid directory." => "Zła ścieżka.",
"Files" => "Pliki",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Nie można wczytać pliku, ponieważ jest on katalogiem lub ma 0 bajtów",
"Not enough space available" => "Za mało miejsca",
"Upload cancelled." => "Wczytywanie anulowane.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Wysyłanie pliku jest w toku. Jeśli opuścisz tę stronę, wysyłanie zostanie przerwane.",
@@ -37,7 +35,6 @@ $TRANSLATIONS = array(
"_%n file_::_%n files_" => array("%n plik","%n pliki","%n plików"),
"{dirs} and {files}" => "{katalogi} and {pliki}",
"_Uploading %n file_::_Uploading %n files_" => array("Wysyłanie %n pliku","Wysyłanie %n plików","Wysyłanie %n plików"),
-"files uploading" => "pliki wczytane",
"'.' is an invalid file name." => "„.†jest nieprawidłową nazwą pliku.",
"File name cannot be empty." => "Nazwa pliku nie może być pusta.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nieprawidłowa nazwa. Znaki '\\', '/', '<', '>', ':', '\"', '|', '?' oraz '*' są niedozwolone.",
diff --git a/apps/files/l10n/pt_BR.php b/apps/files/l10n/pt_BR.php
index f9915f251b47b7a1dbb4bf2b36ecd84f591409da..cd96020856511a053c2a387c616dd785c1f8c6f0 100644
--- a/apps/files/l10n/pt_BR.php
+++ b/apps/files/l10n/pt_BR.php
@@ -13,12 +13,14 @@ $TRANSLATIONS = array(
"Missing a temporary folder" => "Pasta temporária não encontrada",
"Failed to write to disk" => "Falha ao escrever no disco",
"Not enough storage available" => "Espaço de armazenamento insuficiente",
-"Upload failed" => "Falha no envio",
+"Upload failed. Could not get file info." => "Falha no envio. Não foi possÃvel obter informações do arquivo.",
+"Upload failed. Could not find uploaded file" => "Falha no envio. Não foi possÃvel encontrar o arquivo enviado",
"Invalid directory." => "Diretório inválido.",
"Files" => "Arquivos",
-"Unable to upload your file as it is a directory or has 0 bytes" => "ImpossÃvel enviar seus arquivo por ele ser um diretório ou ter 0 bytes.",
+"Unable to upload {filename} as it is a directory or has 0 bytes" => "Incapaz de fazer o envio de {filename}, pois é um diretório ou tem 0 bytes",
"Not enough space available" => "Espaço de armazenamento insuficiente",
"Upload cancelled." => "Envio cancelado.",
+"Could not get result from server." => "Não foi possÃvel obter o resultado do servidor.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Upload em andamento. Sair da página agora resultará no cancelamento do envio.",
"URL cannot be empty." => "URL não pode ficar em branco",
"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Nome de pasta inválido. O uso do nome 'Compartilhado' é reservado ao ownCloud",
@@ -37,7 +39,6 @@ $TRANSLATIONS = array(
"_%n file_::_%n files_" => array("%n arquivo","%n arquivos"),
"{dirs} and {files}" => "{dirs} e {files}",
"_Uploading %n file_::_Uploading %n files_" => array("Enviando %n arquivo","Enviando %n arquivos"),
-"files uploading" => "enviando arquivos",
"'.' is an invalid file name." => "'.' é um nome de arquivo inválido.",
"File name cannot be empty." => "O nome do arquivo não pode estar vazio.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nome inválido, '\\', '/', '<', '>', ':', '\"', '|', '?' e '*' não são permitidos.",
@@ -45,6 +46,7 @@ $TRANSLATIONS = array(
"Your storage is almost full ({usedSpacePercent}%)" => "Seu armazenamento está quase cheio ({usedSpacePercent}%)",
"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Encriptação foi desabilitada mas seus arquivos continuam encriptados. Por favor vá a suas configurações pessoais para descriptar seus arquivos.",
"Your download is being prepared. This might take some time if the files are big." => "Seu download está sendo preparado. Isto pode levar algum tempo se os arquivos forem grandes.",
+"Error moving file" => "Erro movendo o arquivo",
"Name" => "Nome",
"Size" => "Tamanho",
"Modified" => "Modificado",
diff --git a/apps/files/l10n/pt_PT.php b/apps/files/l10n/pt_PT.php
index 33ec8cddce668c86c290d791043f733772600fcf..f6d61fc9873e6d1d497587147f1f21643c11bd0e 100644
--- a/apps/files/l10n/pt_PT.php
+++ b/apps/files/l10n/pt_PT.php
@@ -13,10 +13,8 @@ $TRANSLATIONS = array(
"Missing a temporary folder" => "Está a faltar a pasta temporária",
"Failed to write to disk" => "Falhou a escrita no disco",
"Not enough storage available" => "Não há espaço suficiente em disco",
-"Upload failed" => "Carregamento falhou",
"Invalid directory." => "Directório Inválido",
"Files" => "Ficheiros",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Não é possÃvel fazer o envio do ficheiro devido a ser uma pasta ou ter 0 bytes",
"Not enough space available" => "Espaço em disco insuficiente!",
"Upload cancelled." => "Envio cancelado.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Envio de ficheiro em progresso. Irá cancelar o envio se sair da página agora.",
@@ -37,7 +35,6 @@ $TRANSLATIONS = array(
"_%n file_::_%n files_" => array("%n ficheiro","%n ficheiros"),
"{dirs} and {files}" => "{dirs} e {files}",
"_Uploading %n file_::_Uploading %n files_" => array("A carregar %n ficheiro","A carregar %n ficheiros"),
-"files uploading" => "A enviar os ficheiros",
"'.' is an invalid file name." => "'.' não é um nome de ficheiro válido!",
"File name cannot be empty." => "O nome do ficheiro não pode estar vazio.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nome Inválido, os caracteres '\\', '/', '<', '>', ':', '\"', '|', '?' e '*' não são permitidos.",
diff --git a/apps/files/l10n/ro.php b/apps/files/l10n/ro.php
index 0a96eaa2479da9d80ec7af3755edee6d7f8b9a18..b1b9af45d38e2ae62f849c23009c4c6cc94e02f6 100644
--- a/apps/files/l10n/ro.php
+++ b/apps/files/l10n/ro.php
@@ -13,12 +13,14 @@ $TRANSLATIONS = array(
"Missing a temporary folder" => "Lipsește un dosar temporar",
"Failed to write to disk" => "Eroare la scrierea discului",
"Not enough storage available" => "Nu este suficient spațiu disponibil",
-"Upload failed" => "Încărcarea a eșuat",
+"Upload failed. Could not get file info." => "Încărcare eșuată. Nu se pot obține informații despre fișier.",
+"Upload failed. Could not find uploaded file" => "Încărcare eșuată. Nu se poate găsi fișierul încărcat",
"Invalid directory." => "registru invalid.",
"Files" => "Fișiere",
-"Unable to upload your file as it is a directory or has 0 bytes" => "lista nu se poate incarca poate fi un fisier sau are 0 bytes",
+"Unable to upload {filename} as it is a directory or has 0 bytes" => "Nu se poate încărca {filename} deoarece este un director sau are mărimea de 0 octeți",
"Not enough space available" => "Nu este suficient spațiu disponibil",
"Upload cancelled." => "Încărcare anulată.",
+"Could not get result from server." => "Nu se poate obține rezultatul de la server.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Fișierul este în curs de încărcare. Părăsirea paginii va întrerupe încărcarea.",
"URL cannot be empty." => "Adresa URL nu poate fi golita",
"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Nume de dosar invalid. Utilizarea 'Shared' e rezervată de ownCloud",
@@ -33,10 +35,10 @@ $TRANSLATIONS = array(
"cancel" => "anulare",
"replaced {new_name} with {old_name}" => "{new_name} inlocuit cu {old_name}",
"undo" => "Anulează ultima acțiune",
-"_%n folder_::_%n folders_" => array("","",""),
-"_%n file_::_%n files_" => array("","",""),
-"_Uploading %n file_::_Uploading %n files_" => array("","",""),
-"files uploading" => "fișiere se încarcă",
+"_%n folder_::_%n folders_" => array("%n director","%n directoare","%n directoare"),
+"_%n file_::_%n files_" => array("%n fișier","%n fișiere","%n fișiere"),
+"{dirs} and {files}" => "{dirs} și {files}",
+"_Uploading %n file_::_Uploading %n files_" => array("Se încarcă %n fișier.","Se încarcă %n fișiere.","Se încarcă %n fișiere."),
"'.' is an invalid file name." => "'.' este un nume invalid de fișier.",
"File name cannot be empty." => "Numele fișierului nu poate rămâne gol.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nume invalide, '\\', '/', '<', '>', ':', '\"', '|', '?' si '*' nu sunt permise.",
@@ -44,6 +46,7 @@ $TRANSLATIONS = array(
"Your storage is almost full ({usedSpacePercent}%)" => "Spatiul de stocare este aproape plin {spatiu folosit}%",
"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "criptarea a fost disactivata dar fisierele sant inca criptate.va rog intrati in setarile personale pentru a decripta fisierele",
"Your download is being prepared. This might take some time if the files are big." => "in curs de descarcare. Aceasta poate să dureze ceva timp dacă fișierele sunt mari.",
+"Error moving file" => "Eroare la mutarea fișierului",
"Name" => "Nume",
"Size" => "Dimensiune",
"Modified" => "Modificat",
diff --git a/apps/files/l10n/ru.php b/apps/files/l10n/ru.php
index 96f52a9045cdc87bbe223274fac5102a43e0620e..143a3379ad4e4e2c3fc4b07d8dd7c1b19f58c9c3 100644
--- a/apps/files/l10n/ru.php
+++ b/apps/files/l10n/ru.php
@@ -13,12 +13,14 @@ $TRANSLATIONS = array(
"Missing a temporary folder" => "ОтÑутÑтвует Ð²Ñ€ÐµÐ¼ÐµÐ½Ð½Ð°Ñ Ð¿Ð°Ð¿ÐºÐ°",
"Failed to write to disk" => "Ошибка запиÑи на диÑк",
"Not enough storage available" => "ÐедоÑтаточно доÑтупного меÑта в хранилище",
-"Upload failed" => "Ошибка загрузки",
+"Upload failed. Could not get file info." => "Загрузка не удалаÑÑŒ. Ðевозможно получить информацию о файле",
+"Upload failed. Could not find uploaded file" => "Загрузка не удалаÑÑŒ. Ðевозможно найти загруженный файл",
"Invalid directory." => "Ðеправильный каталог.",
"Files" => "Файлы",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Файл не был загружен: его размер 0 байт либо Ñто не файл, а директориÑ.",
+"Unable to upload {filename} as it is a directory or has 0 bytes" => "Ðевозможно загрузить файл {filename} так как он ÑвлÑетÑÑ Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸ÐµÐ¹ либо имеет размер 0 байт",
"Not enough space available" => "ÐедоÑтаточно Ñвободного меÑта",
"Upload cancelled." => "Загрузка отменена.",
+"Could not get result from server." => "Ðе получен ответ от Ñервера",
"File upload is in progress. Leaving the page now will cancel the upload." => "Файл в процеÑÑе загрузки. Покинув Ñтраницу вы прервёте загрузку.",
"URL cannot be empty." => "СÑылка не может быть пуÑтой.",
"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Ðеправильное Ð¸Ð¼Ñ ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³Ð°. Ð˜Ð¼Ñ 'Shared' зарезервировано.",
@@ -35,14 +37,16 @@ $TRANSLATIONS = array(
"undo" => "отмена",
"_%n folder_::_%n folders_" => array("%n папка","%n папки","%n папок"),
"_%n file_::_%n files_" => array("%n файл","%n файла","%n файлов"),
+"{dirs} and {files}" => "{dirs} и {files}",
"_Uploading %n file_::_Uploading %n files_" => array("Закачка %n файла","Закачка %n файлов","Закачка %n файлов"),
-"files uploading" => "файлы загружаютÑÑ",
"'.' is an invalid file name." => "'.' - неправильное Ð¸Ð¼Ñ Ñ„Ð°Ð¹Ð»Ð°.",
"File name cannot be empty." => "Ð˜Ð¼Ñ Ñ„Ð°Ð¹Ð»Ð° не может быть пуÑтым.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ðеправильное имÑ, '\\', '/', '<', '>', ':', '\"', '|', '?' и '*' недопуÑтимы.",
"Your storage is full, files can not be updated or synced anymore!" => "Ваше диÑковое проÑтранÑтво полноÑтью заполнено, произведите очиÑтку перед загрузкой новых файлов.",
"Your storage is almost full ({usedSpacePercent}%)" => "Ваше хранилище почти заполнено ({usedSpacePercent}%)",
+"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Шифрование было отключено, но ваши файлы вÑе еще зашифрованы. ПожалуйÑта, зайдите на Ñтраницу перÑональных наÑтроек Ð´Ð»Ñ Ñ‚Ð¾Ð³Ð¾, чтобы раÑшифровать ваши файлы.",
"Your download is being prepared. This might take some time if the files are big." => "Загрузка началаÑÑŒ. Ðто может потребовать много времени, еÑли файл большого размера.",
+"Error moving file" => "Ошибка при перемещении файла",
"Name" => "ИмÑ",
"Size" => "Размер",
"Modified" => "Изменён",
diff --git a/apps/files/l10n/si_LK.php b/apps/files/l10n/si_LK.php
index 1fd18d0c56fdc9fed16401639e76ec8b59f3eead..7d24370a092f06e8f1c22f18e007028c4a5de089 100644
--- a/apps/files/l10n/si_LK.php
+++ b/apps/files/l10n/si_LK.php
@@ -7,7 +7,6 @@ $TRANSLATIONS = array(
"No file was uploaded" => "ගොනුවක් උඩුගචනොවුණි",
"Missing a temporary folder" => "à¶à·à·€à¶šà·à¶½à·’ක ෆොල්ඩරයක් අà¶à·”රුදහන්",
"Failed to write to disk" => "à¶à·à¶§à·’ගචකිරීම අසà·à¶»à·Šà¶®à¶šà¶ºà·’",
-"Upload failed" => "උඩුගචකිරීම අසà·à¶»à·Šà¶®à¶šà¶ºà·’",
"Files" => "ගොනු",
"Upload cancelled." => "උඩුගචකිරීම අà¶à·Š හරින්න ලදී",
"File upload is in progress. Leaving the page now will cancel the upload." => "උඩුගà¶à¶šà·’රීමක් සිදුවේ. පිටුව à·„à·à¶» යà·à¶¸à·™à¶±à·Š එය නà·à·€à¶à·™à¶±à·” ඇà¶",
diff --git a/apps/files/l10n/sk.php b/apps/files/l10n/sk.php
new file mode 100644
index 0000000000000000000000000000000000000000..a3178a95c47c1b1f0afb722e2cda03d5ee75bd17
--- /dev/null
+++ b/apps/files/l10n/sk.php
@@ -0,0 +1,7 @@
+<?php
+$TRANSLATIONS = array(
+"_%n folder_::_%n folders_" => array("","",""),
+"_%n file_::_%n files_" => array("","",""),
+"_Uploading %n file_::_Uploading %n files_" => array("","","")
+);
+$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/apps/files/l10n/sk_SK.php b/apps/files/l10n/sk_SK.php
index b30f263d24461e6fc1cf9b355cd9370f4d960cb9..962ce7d7e9b08e872254153ecdd890def27ffa9c 100644
--- a/apps/files/l10n/sk_SK.php
+++ b/apps/files/l10n/sk_SK.php
@@ -13,10 +13,8 @@ $TRANSLATIONS = array(
"Missing a temporary folder" => "Chýba doÄasný prieÄinok",
"Failed to write to disk" => "Zápis na disk sa nepodaril",
"Not enough storage available" => "Nedostatok dostupného úložného priestoru",
-"Upload failed" => "Odoslanie bolo neúspešné",
"Invalid directory." => "Neplatný prieÄinok.",
"Files" => "Súbory",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Nedá sa odoslaÅ¥ Váš súbor, pretože je to prieÄinok, alebo je jeho veľkosÅ¥ 0 bajtov",
"Not enough space available" => "Nie je k dispozÃcii dostatok miesta",
"Upload cancelled." => "Odosielanie zrušené.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Opustenie stránky zrušà práve prebiehajúce odosielanie súboru.",
@@ -36,7 +34,6 @@ $TRANSLATIONS = array(
"_%n folder_::_%n folders_" => array("%n prieÄinok","%n prieÄinky","%n prieÄinkov"),
"_%n file_::_%n files_" => array("%n súbor","%n súbory","%n súborov"),
"_Uploading %n file_::_Uploading %n files_" => array("Nahrávam %n súbor","Nahrávam %n súbory","Nahrávam %n súborov"),
-"files uploading" => "nahrávanie súborov",
"'.' is an invalid file name." => "'.' je neplatné meno súboru.",
"File name cannot be empty." => "Meno súboru nemôže byť prázdne",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nesprávne meno, '\\', '/', '<', '>', ':', '\"', '|', '?' a '*' nie sú povolené hodnoty.",
diff --git a/apps/files/l10n/sl.php b/apps/files/l10n/sl.php
index 08f789ff8668386ebbdacf74e9bb45f9bd701a49..7190753eac9610b62dd78660de326eff75053e98 100644
--- a/apps/files/l10n/sl.php
+++ b/apps/files/l10n/sl.php
@@ -13,10 +13,8 @@ $TRANSLATIONS = array(
"Missing a temporary folder" => "Manjka zaÄasna mapa",
"Failed to write to disk" => "Pisanje na disk je spodletelo",
"Not enough storage available" => "Na voljo ni dovolj prostora",
-"Upload failed" => "Pošiljanje je spodletelo",
"Invalid directory." => "Neveljavna mapa.",
"Files" => "Datoteke",
-"Unable to upload your file as it is a directory or has 0 bytes" => "PoÅ¡iljanja ni mogoÄe izvesti, saj gre za mapo oziroma datoteko velikosti 0 bajtov.",
"Not enough space available" => "Na voljo ni dovolj prostora.",
"Upload cancelled." => "Pošiljanje je preklicano.",
"File upload is in progress. Leaving the page now will cancel the upload." => "V teku je pošiljanje datoteke. Če zapustite to stran zdaj, bo pošiljanje preklicano.",
@@ -36,7 +34,6 @@ $TRANSLATIONS = array(
"_%n folder_::_%n folders_" => array("","","",""),
"_%n file_::_%n files_" => array("","","",""),
"_Uploading %n file_::_Uploading %n files_" => array("","","",""),
-"files uploading" => "poteka pošiljanje datotek",
"'.' is an invalid file name." => "'.' je neveljavno ime datoteke.",
"File name cannot be empty." => "Ime datoteke ne sme biti prazno polje.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Neveljavno ime, znaki '\\', '/', '<', '>', ':', '\"', '|', '?' in '*' niso dovoljeni.",
diff --git a/apps/files/l10n/sq.php b/apps/files/l10n/sq.php
index 3207e3a165c9f6684edcf58fdf1f6835b12c6d48..ecc066a284c9a5f526151a2b00ff2d1ea8349d4b 100644
--- a/apps/files/l10n/sq.php
+++ b/apps/files/l10n/sq.php
@@ -13,10 +13,8 @@ $TRANSLATIONS = array(
"Missing a temporary folder" => "Një dosje e përkohshme nuk u gjet",
"Failed to write to disk" => "Ruajtja në disk dështoi",
"Not enough storage available" => "Nuk ka mbetur hapësirë memorizimi e mjaftueshme",
-"Upload failed" => "Ngarkimi dështoi",
"Invalid directory." => "Dosje e pavlefshme.",
"Files" => "Skedarët",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Nuk është i mundur ngarkimi i skedarit tuaj sepse është dosje ose ka dimension 0 byte",
"Not enough space available" => "Nuk ka hapësirë memorizimi e mjaftueshme",
"Upload cancelled." => "Ngarkimi u anulua.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Ngarkimi i skedarit është në vazhdim. Nqse ndërroni faqen tani ngarkimi do të anulohet.",
@@ -37,7 +35,6 @@ $TRANSLATIONS = array(
"_%n file_::_%n files_" => array("%n skedar","%n skedarë"),
"{dirs} and {files}" => "{dirs} dhe {files}",
"_Uploading %n file_::_Uploading %n files_" => array("Po ngarkoj %n skedar","Po ngarkoj %n skedarë"),
-"files uploading" => "po ngarkoj skedarët",
"'.' is an invalid file name." => "'.' është emër i pavlefshëm.",
"File name cannot be empty." => "Emri i skedarit nuk mund të jetë bosh.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Emër i pavlefshëm, '\\', '/', '<', '>', ':', '\"', '|', '?' dhe '*' nuk lejohen.",
diff --git a/apps/files/l10n/sr.php b/apps/files/l10n/sr.php
index 73f8ace5c81b76501a3b3ec730e23e268f313d19..fd3b2a2912f8fa474b4a8cfbd32de7d6c7d8a4d0 100644
--- a/apps/files/l10n/sr.php
+++ b/apps/files/l10n/sr.php
@@ -11,10 +11,8 @@ $TRANSLATIONS = array(
"Missing a temporary folder" => "ÐедоÑтаје привремена фаÑцикла",
"Failed to write to disk" => "Ðе могу да пишем на диÑк",
"Not enough storage available" => "Ðема довољно проÑтора",
-"Upload failed" => "Отпремање није уÑпело",
"Invalid directory." => "неиÑправна фаÑцикла.",
"Files" => "Датотеке",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Ðе могу да отпремим датотеку као фаÑциклу или она има 0 бајтова",
"Not enough space available" => "Ðема довољно проÑтора",
"Upload cancelled." => "Отпремање је прекинуто.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Отпремање датотеке је у току. Ðко Ñада напуÑтите Ñтраницу, прекинућете отпремање.",
@@ -33,7 +31,6 @@ $TRANSLATIONS = array(
"_%n folder_::_%n folders_" => array("","",""),
"_%n file_::_%n files_" => array("","",""),
"_Uploading %n file_::_Uploading %n files_" => array("","",""),
-"files uploading" => "датотеке Ñе отпремају",
"'.' is an invalid file name." => "Датотека „.“ је неиÑправног имена.",
"File name cannot be empty." => "Име датотеке не може бити празно.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "ÐеиÑправан назив. Следећи знакови ниÑу дозвољени: \\, /, <, >, :, \", |, ? и *.",
diff --git a/apps/files/l10n/sr@latin.php b/apps/files/l10n/sr@latin.php
index 1965479fe664ffc83a71d05515abc2e2c291e34d..8831d1a1bef0ee736f95b15be17888f0f28ed215 100644
--- a/apps/files/l10n/sr@latin.php
+++ b/apps/files/l10n/sr@latin.php
@@ -6,6 +6,8 @@ $TRANSLATIONS = array(
"No file was uploaded" => "Nijedan fajl nije poslat",
"Missing a temporary folder" => "Nedostaje privremena fascikla",
"Files" => "Fajlovi",
+"Error" => "Greška",
+"Share" => "Podeli",
"_%n folder_::_%n folders_" => array("","",""),
"_%n file_::_%n files_" => array("","",""),
"_Uploading %n file_::_Uploading %n files_" => array("","",""),
@@ -17,6 +19,7 @@ $TRANSLATIONS = array(
"Save" => "Snimi",
"Nothing in here. Upload something!" => "Ovde nema niÄeg. PoÅ¡aljite neÅ¡to!",
"Download" => "Preuzmi",
+"Unshare" => "Ukljoni deljenje",
"Delete" => "Obriši",
"Upload too large" => "Pošiljka je prevelika",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Fajlovi koje želite da poÅ¡aljete prevazilaze ograniÄenje maksimalne veliÄine poÅ¡iljke na ovom serveru."
diff --git a/apps/files/l10n/sv.php b/apps/files/l10n/sv.php
index fbbe1f1591092861131e7c80cc5fb4de638e7f94..208dcd4ea12d83ddd617cf390e88874e77396c76 100644
--- a/apps/files/l10n/sv.php
+++ b/apps/files/l10n/sv.php
@@ -13,10 +13,8 @@ $TRANSLATIONS = array(
"Missing a temporary folder" => "En temporär mapp saknas",
"Failed to write to disk" => "Misslyckades spara till disk",
"Not enough storage available" => "Inte tillräckligt med lagringsutrymme tillgängligt",
-"Upload failed" => "Misslyckad uppladdning",
"Invalid directory." => "Felaktig mapp.",
"Files" => "Filer",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Kan inte ladda upp din fil eftersom det är en katalog eller har 0 bytes",
"Not enough space available" => "Inte tillräckligt med utrymme tillgängligt",
"Upload cancelled." => "Uppladdning avbruten.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Filuppladdning pågår. Lämnar du sidan så avbryts uppladdningen.",
@@ -37,7 +35,6 @@ $TRANSLATIONS = array(
"_%n file_::_%n files_" => array("%n fil","%n filer"),
"{dirs} and {files}" => "{dirs} och {files}",
"_Uploading %n file_::_Uploading %n files_" => array("Laddar upp %n fil","Laddar upp %n filer"),
-"files uploading" => "filer laddas upp",
"'.' is an invalid file name." => "'.' är ett ogiltigt filnamn.",
"File name cannot be empty." => "Filnamn kan inte vara tomt.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ogiltigt namn, '\\', '/', '<', '>', ':', '\"', '|', '?' och '*' är inte tillåtet.",
diff --git a/apps/files/l10n/sw_KE.php b/apps/files/l10n/sw_KE.php
new file mode 100644
index 0000000000000000000000000000000000000000..0157af093e92200cc7790497227e92e62d80165f
--- /dev/null
+++ b/apps/files/l10n/sw_KE.php
@@ -0,0 +1,7 @@
+<?php
+$TRANSLATIONS = array(
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
+"_Uploading %n file_::_Uploading %n files_" => array("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/ta_LK.php b/apps/files/l10n/ta_LK.php
index 154e0d6796ec55c7cbbf91829ace929e93b95ded..f05990b94f00f39152dcbbafd57e0f1d9c9bb59d 100644
--- a/apps/files/l10n/ta_LK.php
+++ b/apps/files/l10n/ta_LK.php
@@ -7,9 +7,7 @@ $TRANSLATIONS = array(
"No file was uploaded" => "எநà¯à®¤ கோபà¯à®ªà¯à®®à¯ பதிவேறà¯à®±à®ªà¯à®ªà®Ÿà®µà®¿à®²à¯à®²à¯ˆ",
"Missing a temporary folder" => "ஒர௠தறà¯à®•à®¾à®²à®¿à®•à®®à®¾à®© கோபà¯à®ªà¯à®±à¯ˆà®¯à¯ˆ காணவிலà¯à®²à¯ˆ",
"Failed to write to disk" => "வடà¯à®Ÿà®¿à®²à¯ எழà¯à®¤ à®®à¯à®Ÿà®¿à®¯à®µà®¿à®²à¯à®²à¯ˆ",
-"Upload failed" => "பதிவேறà¯à®±à®²à¯ தோலà¯à®µà®¿à®¯à¯à®±à¯à®±à®¤à¯",
"Files" => "கோபà¯à®ªà¯à®•à®³à¯",
-"Unable to upload your file as it is a directory or has 0 bytes" => "அடைவ௠அலà¯à®²à®¤à¯ 0 bytes ஠கொணà¯à®Ÿà¯à®³à¯à®³à®¤à®¾à®²à¯ உஙà¯à®•à®³à¯à®Ÿà¯ˆà®¯ கோபà¯à®ªà¯ˆ பதிவேறà¯à®± à®®à¯à®Ÿà®¿à®¯à®µà®¿à®²à¯à®²à¯ˆ",
"Upload cancelled." => "பதிவேறà¯à®±à®²à¯ இரதà¯à®¤à¯ செயà¯à®¯à®ªà¯à®ªà®Ÿà¯à®Ÿà¯à®³à¯à®³à®¤à¯",
"File upload is in progress. Leaving the page now will cancel the upload." => "கோபà¯à®ªà¯ பதிவேறà¯à®±à®®à¯ செயலà¯à®ªà®¾à®Ÿà¯à®Ÿà®¿à®²à¯ உளà¯à®³à®¤à¯. இநà¯à®¤à®ªà¯ பகà¯à®•à®¤à¯à®¤à®¿à®²à®¿à®°à¯à®¨à¯à®¤à¯ வெறியேறà¯à®µà®¤à®¾à®©à®¤à¯ பதிவேறà¯à®±à®²à¯ˆ இரதà¯à®¤à¯ செயà¯à®¯à¯à®®à¯.",
"URL cannot be empty." => "URL வெறà¯à®®à¯ˆà®¯à®¾à®• இரà¯à®•à¯à®•à®®à¯à®Ÿà®¿à®¯à®¾à®¤à¯.",
diff --git a/apps/files/l10n/th_TH.php b/apps/files/l10n/th_TH.php
index aa8cf4e9b500506ab48328eeeee28fbb66c93ba6..37144ebc8836d6079f55fab879f1939522e6b577 100644
--- a/apps/files/l10n/th_TH.php
+++ b/apps/files/l10n/th_TH.php
@@ -11,10 +11,8 @@ $TRANSLATIONS = array(
"Missing a temporary folder" => "โฟลเดà¸à¸£à¹Œà¸Šà¸±à¹ˆà¸§à¸„ราวเà¸à¸´à¸”à¸à¸²à¸£à¸ªà¸¹à¸à¸«à¸²à¸¢",
"Failed to write to disk" => "เขียนข้à¸à¸¡à¸¹à¸¥à¸¥à¸‡à¹à¸œà¹ˆà¸™à¸”ิสà¸à¹Œà¸¥à¹‰à¸¡à¹€à¸«à¸¥à¸§",
"Not enough storage available" => "เหลืà¸à¸žà¸·à¹‰à¸™à¸—ี่ไม่เพียงสำหรับใช้งาน",
-"Upload failed" => "à¸à¸±à¸žà¹‚หลดล้มเหลว",
"Invalid directory." => "ไดเร็à¸à¸—à¸à¸£à¸µà¹ˆà¹„ม่ถูà¸à¸•à¹‰à¸à¸‡",
"Files" => "ไฟล์",
-"Unable to upload your file as it is a directory or has 0 bytes" => "ไม่สามารถà¸à¸±à¸žà¹‚หลดไฟล์ขà¸à¸‡à¸„ุณได้ เนื่à¸à¸‡à¸ˆà¸²à¸à¹„ฟล์ดังà¸à¸¥à¹ˆà¸²à¸§à¹€à¸›à¹‡à¸™à¹„ดเร็à¸à¸—à¸à¸£à¸µà¹ˆ หรืภมีขนาดไฟล์ 0 ไบต์",
"Not enough space available" => "มีพื้นที่เหลืà¸à¹„ม่เพียงพà¸",
"Upload cancelled." => "à¸à¸²à¸£à¸à¸±à¸žà¹‚หลดถูà¸à¸¢à¸à¹€à¸¥à¸´à¸",
"File upload is in progress. Leaving the page now will cancel the upload." => "à¸à¸²à¸£à¸à¸±à¸žà¹‚หลดไฟล์à¸à¸³à¸¥à¸±à¸‡à¸à¸¢à¸¹à¹ˆà¹ƒà¸™à¸£à¸°à¸«à¸§à¹ˆà¸²à¸‡à¸”ำเนินà¸à¸²à¸£ à¸à¸²à¸£à¸à¸à¸à¸ˆà¸²à¸à¸«à¸™à¹‰à¸²à¹€à¸§à¹‡à¸šà¸™à¸µà¹‰à¸ˆà¸°à¸—ำให้à¸à¸²à¸£à¸à¸±à¸žà¹‚หลดถูà¸à¸¢à¸à¹€à¸¥à¸´à¸",
@@ -32,7 +30,6 @@ $TRANSLATIONS = array(
"_%n folder_::_%n folders_" => array(""),
"_%n file_::_%n files_" => array(""),
"_Uploading %n file_::_Uploading %n files_" => array(""),
-"files uploading" => "à¸à¸²à¸£à¸à¸±à¸žà¹‚หลดไฟล์",
"'.' is an invalid file name." => "'.' เป็นชื่à¸à¹„ฟล์ที่ไม่ถูà¸à¸•à¹‰à¸à¸‡",
"File name cannot be empty." => "ชื่à¸à¹„ฟล์ไม่สามารถเว้นว่างได้",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "ชื่à¸à¸—ี่ใช้ไม่ถูà¸à¸•à¹‰à¸à¸‡, '\\', '/', '<', '>', ':', '\"', '|', '?' à¹à¸¥à¸° '*' ไม่ได้รับà¸à¸™à¸¸à¸à¸²à¸•à¹ƒà¸«à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¹„ด้",
diff --git a/apps/files/l10n/tr.php b/apps/files/l10n/tr.php
index dd089757d5f9142fdc6eb44733c3569b23bf5817..8cb05e16ace42b30fb161c1e449769a978206c32 100644
--- a/apps/files/l10n/tr.php
+++ b/apps/files/l10n/tr.php
@@ -13,10 +13,8 @@ $TRANSLATIONS = array(
"Missing a temporary folder" => "Geçici dizin eksik",
"Failed to write to disk" => "Diske yazılamadı",
"Not enough storage available" => "Yeterli disk alanı yok",
-"Upload failed" => "Yükleme başarısız",
"Invalid directory." => "Geçersiz dizin.",
"Files" => "Dosyalar",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Dosyanızın boyutu 0 byte olduğundan veya bir dizin olduğundan yüklenemedi",
"Not enough space available" => "Yeterli disk alanı yok",
"Upload cancelled." => "Yükleme iptal edildi.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Dosya yükleme işlemi sürüyor. Şimdi sayfadan ayrılırsanız işleminiz iptal olur.",
@@ -36,7 +34,6 @@ $TRANSLATIONS = array(
"_%n folder_::_%n folders_" => array("%n dizin","%n dizin"),
"_%n file_::_%n files_" => array("%n dosya","%n dosya"),
"_Uploading %n file_::_Uploading %n files_" => array("%n dosya yükleniyor","%n dosya yükleniyor"),
-"files uploading" => "Dosyalar yükleniyor",
"'.' is an invalid file name." => "'.' geçersiz dosya adı.",
"File name cannot be empty." => "Dosya adı boş olamaz.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Geçersiz isim, '\\', '/', '<', '>', ':', '\"', '|', '?' ve '*' karakterlerine izin verilmemektedir.",
diff --git a/apps/files/l10n/ug.php b/apps/files/l10n/ug.php
index 920d077e4ebc94c3927e9710bcbc9e7ceb309c0d..a38ce706ef9ea1b988de3cc896033c513d6e1ce8 100644
--- a/apps/files/l10n/ug.php
+++ b/apps/files/l10n/ug.php
@@ -23,7 +23,6 @@ $TRANSLATIONS = array(
"_%n folder_::_%n folders_" => array(""),
"_%n file_::_%n files_" => array(""),
"_Uploading %n file_::_Uploading %n files_" => array(""),
-"files uploading" => "ھۆججەت يۈكلىنىۋاتىدۇ",
"Name" => "ئاتى",
"Size" => "Ú†ÙˆÚلۇقى",
"Modified" => "ئۆزگەرتكەن",
diff --git a/apps/files/l10n/uk.php b/apps/files/l10n/uk.php
index bea1d930799d4ee0e47045efdcf5b1b18106eb12..fac7cea529ae8241ff708918417d544f3d8d748b 100644
--- a/apps/files/l10n/uk.php
+++ b/apps/files/l10n/uk.php
@@ -12,10 +12,8 @@ $TRANSLATIONS = array(
"Missing a temporary folder" => "ВідÑутній тимчаÑовий каталог",
"Failed to write to disk" => "ÐевдалоÑÑ Ð·Ð°Ð¿Ð¸Ñати на диÑк",
"Not enough storage available" => "МіÑÑ†Ñ Ð±Ñ–Ð»ÑŒÑˆÐµ немає",
-"Upload failed" => "Помилка завантаженнÑ",
"Invalid directory." => "Ðевірний каталог.",
"Files" => "Файли",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Ðеможливо завантажити ваш файл тому, що він тека або файл розміром 0 байт",
"Not enough space available" => "МіÑÑ†Ñ Ð±Ñ–Ð»ÑŒÑˆÐµ немає",
"Upload cancelled." => "Ð—Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ð¿ÐµÑ€ÐµÑ€Ð²Ð°Ð½Ð¾.",
"File upload is in progress. Leaving the page now will cancel the upload." => "ВиконуєтьÑÑ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñƒ. Ð—Ð°ÐºÑ€Ð¸Ñ‚Ñ‚Ñ Ñ†Ñ–Ñ”Ñ— Ñторінки приведе до відміни завантаженнÑ.",
@@ -34,7 +32,6 @@ $TRANSLATIONS = array(
"_%n folder_::_%n folders_" => array("","",""),
"_%n file_::_%n files_" => array("","",""),
"_Uploading %n file_::_Uploading %n files_" => array("","",""),
-"files uploading" => "файли завантажуютьÑÑ",
"'.' is an invalid file name." => "'.' це невірне ім'Ñ Ñ„Ð°Ð¹Ð»Ñƒ.",
"File name cannot be empty." => " Ім'Ñ Ñ„Ð°Ð¹Ð»Ñƒ не може бути порожнім.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ðевірне ім'Ñ, '\\', '/', '<', '>', ':', '\"', '|', '?' та '*' не дозволені.",
diff --git a/apps/files/l10n/vi.php b/apps/files/l10n/vi.php
index b98a14f6d7bd3b7dcbdf968c4d5b6739d91a3eb4..2d63128aa264abdb48d3e0c85f6d88e03e29f85f 100644
--- a/apps/files/l10n/vi.php
+++ b/apps/files/l10n/vi.php
@@ -11,10 +11,8 @@ $TRANSLATIONS = array(
"Missing a temporary folder" => "Không tìm thấy thư mục tạm",
"Failed to write to disk" => "Không thể ghi ",
"Not enough storage available" => "Không đủ không gian lưu trữ",
-"Upload failed" => "Tải lên thất bại",
"Invalid directory." => "Thư mục không hợp lệ",
"Files" => "Táºp tin",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Không thể tải lên táºp tin của bạn ,nó nhÆ° là má»™t thÆ° mục hoặc có 0 byte",
"Not enough space available" => "Không đủ chỗ trống cần thiết",
"Upload cancelled." => "Hủy tải lên",
"File upload is in progress. Leaving the page now will cancel the upload." => "Táºp tin tải lên Ä‘ang được xá» lý. Nếu bạn rá»i khá»i trang bây giá» sẽ hủy quá trình nà y.",
@@ -33,7 +31,6 @@ $TRANSLATIONS = array(
"_%n folder_::_%n folders_" => array(""),
"_%n file_::_%n files_" => array(""),
"_Uploading %n file_::_Uploading %n files_" => array(""),
-"files uploading" => "tệp tin đang được tải lên",
"'.' is an invalid file name." => "'.' là một tên file không hợp lệ",
"File name cannot be empty." => "Tên file không được rỗng",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Tên không hợp lệ, '\\', '/', '<', '>', ':', '\"', '|', '?' và '*' thì không được phép dùng.",
diff --git a/apps/files/l10n/zh_CN.php b/apps/files/l10n/zh_CN.php
index 59b09ad950b71818c8cc2dabd19eca3ff8549edd..b739b72ce7e264773a2cd974e4c06025f009f637 100644
--- a/apps/files/l10n/zh_CN.php
+++ b/apps/files/l10n/zh_CN.php
@@ -13,10 +13,8 @@ $TRANSLATIONS = array(
"Missing a temporary folder" => "缺少临时目录",
"Failed to write to disk" => "写入ç£ç›˜å¤±è´¥",
"Not enough storage available" => "没有足够的å˜å‚¨ç©ºé—´",
-"Upload failed" => "ä¸Šä¼ å¤±è´¥",
"Invalid directory." => "æ— æ•ˆæ–‡ä»¶å¤¹ã€‚",
"Files" => "文件",
-"Unable to upload your file as it is a directory or has 0 bytes" => "æ— æ³•ä¸Šä¼ æ‚¨çš„æ–‡ä»¶ï¼Œæ–‡ä»¶å¤¹æˆ–è€…ç©ºæ–‡ä»¶",
"Not enough space available" => "没有足够å¯ç”¨ç©ºé—´",
"Upload cancelled." => "ä¸Šä¼ å·²å–消",
"File upload is in progress. Leaving the page now will cancel the upload." => "文件æ£åœ¨ä¸Šä¼ ä¸ã€‚现在离开æ¤é¡µä¼šå¯¼è‡´ä¸Šä¼ 动作被å–消。",
@@ -36,7 +34,6 @@ $TRANSLATIONS = array(
"_%n folder_::_%n folders_" => array("%n 文件夹"),
"_%n file_::_%n files_" => array("%n个文件"),
"_Uploading %n file_::_Uploading %n files_" => array(""),
-"files uploading" => "æ–‡ä»¶ä¸Šä¼ ä¸",
"'.' is an invalid file name." => "'.' æ˜¯ä¸€ä¸ªæ— æ•ˆçš„æ–‡ä»¶å。",
"File name cannot be empty." => "文件åä¸èƒ½ä¸ºç©ºã€‚",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "æ— æ•ˆå称，'\\', '/', '<', '>', ':', '\"', '|', '?' å’Œ '*' ä¸è¢«å…许使用。",
diff --git a/apps/files/l10n/zh_TW.php b/apps/files/l10n/zh_TW.php
index 21c929f81a6b17a1fb8de8bb386692c7a7b1bb5e..214812d7adaf6270faca6af413113b929aa7c07a 100644
--- a/apps/files/l10n/zh_TW.php
+++ b/apps/files/l10n/zh_TW.php
@@ -13,10 +13,8 @@ $TRANSLATIONS = array(
"Missing a temporary folder" => "找ä¸åˆ°æš«å˜è³‡æ–™å¤¾",
"Failed to write to disk" => "寫入硬碟失敗",
"Not enough storage available" => "儲å˜ç©ºé–“ä¸è¶³",
-"Upload failed" => "上傳失敗",
"Invalid directory." => "無效的資料夾",
"Files" => "檔案",
-"Unable to upload your file as it is a directory or has 0 bytes" => "ç„¡æ³•ä¸Šå‚³æ‚¨çš„æª”æ¡ˆï¼Œå› ç‚ºå®ƒå¯èƒ½æ˜¯ä¸€å€‹ç›®éŒ„或檔案大å°ç‚º0",
"Not enough space available" => "æ²’æœ‰è¶³å¤ çš„å¯ç”¨ç©ºé–“",
"Upload cancelled." => "上傳已å–消",
"File upload is in progress. Leaving the page now will cancel the upload." => "檔案上傳ä¸ï¼Œé›¢é–‹æ¤é é¢å°‡æœƒå–消上傳。",
@@ -37,7 +35,6 @@ $TRANSLATIONS = array(
"_%n file_::_%n files_" => array("%n 個檔案"),
"{dirs} and {files}" => "{dirs} 和 {files}",
"_Uploading %n file_::_Uploading %n files_" => array("%n 個檔案æ£åœ¨ä¸Šå‚³"),
-"files uploading" => "檔案上傳ä¸",
"'.' is an invalid file name." => "'.' 是ä¸åˆæ³•çš„檔å",
"File name cannot be empty." => "檔åä¸èƒ½ç‚ºç©º",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "檔åä¸åˆæ³•ï¼Œä¸å…許 \\ / < > : \" | ? * å—å…ƒ",
diff --git a/apps/files/lib/helper.php b/apps/files/lib/helper.php
index f0d3560b878397506bfc6048a798c29ca207d3a9..709d78a4d45cb65aab21c3f8f00613e141337055 100644
--- a/apps/files/lib/helper.php
+++ b/apps/files/lib/helper.php
@@ -1,6 +1,6 @@
<?php
-namespace OCA\files\lib;
+namespace OCA\Files;
class Helper
{
@@ -39,8 +39,8 @@ class Helper
}
if($file['isPreviewAvailable']) {
- $relativePath = substr($file['path'], 6);
- return \OC_Helper::previewIcon($relativePath);
+ $pathForPreview = $file['directory'] . '/' . $file['name'];
+ return \OC_Helper::previewIcon($pathForPreview);
}
return \OC_Helper::mimetypeIcon($file['mimetype']);
}
@@ -85,11 +85,11 @@ class Helper
}
$i['directory'] = $dir;
$i['isPreviewAvailable'] = \OC::$server->getPreviewManager()->isMimeSupported($i['mimetype']);
- $i['icon'] = \OCA\files\lib\Helper::determineIcon($i);
+ $i['icon'] = \OCA\Files\Helper::determineIcon($i);
$files[] = $i;
}
- usort($files, array('\OCA\files\lib\Helper', 'fileCmp'));
+ usort($files, array('\OCA\Files\Helper', 'fileCmp'));
return $files;
}
diff --git a/apps/files/templates/fileexists.html b/apps/files/templates/fileexists.html
new file mode 100644
index 0000000000000000000000000000000000000000..662177ac7ed79b56ed12360f998b807131e27e2b
--- /dev/null
+++ b/apps/files/templates/fileexists.html
@@ -0,0 +1,26 @@
+<div id="{dialog_name}" title="{title}" class="fileexists">
+ <span class="why">{why}<!-- Which files do you want to keep --></span><br/>
+ <span class="what">{what}<!-- If you select both versions, the copied file will have a number added to its name. --></span><br/>
+ <br/>
+ <table>
+ <th><label><input class="allnewfiles" type="checkbox" />New Files<span class="count"></span></label></th>
+ <th><label><input class="allexistingfiles" type="checkbox" />Already existing files<span class="count"></span></label></th>
+ </table>
+ <div class="conflicts">
+ <div class="template">
+ <div class="filename"></div>
+ <div class="replacement">
+ <input type="checkbox" />
+ <span class="svg icon"></span>
+ <div class="mtime"></div>
+ <div class="size"></div>
+ </div>
+ <div class="original">
+ <input type="checkbox" />
+ <span class="svg icon"></span>
+ <div class="mtime"></div>
+ <div class="size"></div>
+ </div>
+ </div>
+ </div>
+</div>
diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php
index bd991c3fcb04f0f27df4d50079b82bde457b9716..96a80738989667198f4605f7705a0b55b6e9e858 100644
--- a/apps/files/templates/index.php
+++ b/apps/files/templates/index.php
@@ -47,7 +47,7 @@
<input type="hidden" name="permissions" value="<?php p($_['permissions']); ?>" id="permissions">
</div>
-<div id="emptycontent" <?php if (!isset($_['files']) or !$_['isCreatable'] or count($_['files']) > 0 or !$_['ajaxLoad']):?>class="hidden"<?php endif; ?>><?php p($l->t('Nothing in here. Upload something!'))?></div>
+<div id="emptycontent" <?php if (!isset($_['files']) or !$_['isCreatable'] or count($_['files']) > 0 or $_['ajaxLoad']):?>class="hidden"<?php endif; ?>><?php p($l->t('Nothing in here. Upload something!'))?></div>
<input type="hidden" id="disableSharing" data-status="<?php p($_['disableSharing']); ?>"></input>
diff --git a/apps/files_encryption/appinfo/app.php b/apps/files_encryption/appinfo/app.php
index 90a9984e27f17ea1b1922b09279ac8c2124ea41c..5b62b84e22366a2ed5233d6fa1bcf72b4bb2e7a7 100644
--- a/apps/files_encryption/appinfo/app.php
+++ b/apps/files_encryption/appinfo/app.php
@@ -25,7 +25,9 @@ if (!OC_Config::getValue('maintenance', false)) {
// App manager related hooks
OCA\Encryption\Helper::registerAppHooks();
- stream_wrapper_register('crypt', 'OCA\Encryption\Stream');
+ if(!in_array('crypt', stream_get_wrappers())) {
+ stream_wrapper_register('crypt', 'OCA\Encryption\Stream');
+ }
// check if we are logged in
if (OCP\User::isLoggedIn()) {
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index 85169e6a1d099d46389de25fd771c40dcabfc209..d9221c6e828a2539ed61ffe184f7e589ca978444 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -44,17 +44,22 @@ class Hooks {
\OC_Util::setupFS($params['uid']);
}
- $util = new Util($view, $params['uid']);
-
- //check if all requirements are met
- if(!$util->ready() && (!Helper::checkRequirements() || !Helper::checkConfiguration())) {
- $error_msg = $l->t("Missing requirements.");
- $hint = $l->t('Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled.');
- \OC_App::disable('files_encryption');
- \OCP\Util::writeLog('Encryption library', $error_msg . ' ' . $hint, \OCP\Util::ERROR);
- \OCP\Template::printErrorPage($error_msg, $hint);
+ $privateKey = \OCA\Encryption\Keymanager::getPrivateKey($view, $params['uid']);
+
+ // if no private key exists, check server configuration
+ if(!$privateKey) {
+ //check if all requirements are met
+ if(!Helper::checkRequirements() || !Helper::checkConfiguration()) {
+ $error_msg = $l->t("Missing requirements.");
+ $hint = $l->t('Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled.');
+ \OC_App::disable('files_encryption');
+ \OCP\Util::writeLog('Encryption library', $error_msg . ' ' . $hint, \OCP\Util::ERROR);
+ \OCP\Template::printErrorPage($error_msg, $hint);
+ }
}
+ $util = new Util($view, $params['uid']);
+
// setup user, if user not ready force relogin
if (Helper::setupUser($util, $params['password']) === false) {
return false;
@@ -73,7 +78,7 @@ class Hooks {
$userView = new \OC_FilesystemView('/' . $params['uid']);
- // Set legacy encryption key if it exists, to support
+ // Set legacy encryption key if it exists, to support
// depreciated encryption system
if (
$userView->file_exists('encryption.key')
@@ -249,7 +254,7 @@ class Hooks {
$params['run'] = false;
$params['error'] = $l->t('Following users are not set up for encryption:') . ' ' . join(', ' , $notConfigured);
}
-
+
}
/**
@@ -260,7 +265,7 @@ class Hooks {
// NOTE: $params has keys:
// [itemType] => file
// itemSource -> int, filecache file ID
- // [parent] =>
+ // [parent] =>
// [itemTarget] => /13
// shareWith -> string, uid of user being shared to
// fileTarget -> path of file being shared
@@ -301,13 +306,13 @@ class Hooks {
// NOTE: parent is folder but shared was a file!
// we try to rebuild the missing path
// some examples we face here
- // user1 share folder1 with user2 folder1 has
- // the following structure
+ // user1 share folder1 with user2 folder1 has
+ // the following structure
// /folder1/subfolder1/subsubfolder1/somefile.txt
// user2 re-share subfolder2 with user3
// user3 re-share somefile.txt user4
- // so our path should be
- // /Shared/subfolder1/subsubfolder1/somefile.txt
+ // so our path should be
+ // /Shared/subfolder1/subsubfolder1/somefile.txt
// while user3 is sharing
if ($params['itemType'] === 'file') {
diff --git a/apps/files_encryption/l10n/bs.php b/apps/files_encryption/l10n/bs.php
new file mode 100644
index 0000000000000000000000000000000000000000..708e045adebb6fa3a36e65fea2416ead10d58b93
--- /dev/null
+++ b/apps/files_encryption/l10n/bs.php
@@ -0,0 +1,5 @@
+<?php
+$TRANSLATIONS = array(
+"Saving..." => "Spašavam..."
+);
+$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/apps/files_encryption/l10n/de_CH.php b/apps/files_encryption/l10n/de_CH.php
new file mode 100644
index 0000000000000000000000000000000000000000..aa867645c8d6c8064a64cc92175bb7d9b300d515
--- /dev/null
+++ b/apps/files_encryption/l10n/de_CH.php
@@ -0,0 +1,39 @@
+<?php
+$TRANSLATIONS = array(
+"Recovery key successfully enabled" => "Der Wiederherstellungsschlüssel wurde erfolgreich aktiviert.",
+"Could not enable recovery key. Please check your recovery key password!" => "Der Wiederherstellungsschlüssel konnte nicht aktiviert werden. Bitte überprüfen Sie das Passwort für den Wiederherstellungsschlüssel!",
+"Recovery key successfully disabled" => "Der Wiederherstellungsschlüssel wurde erfolgreich deaktiviert.",
+"Could not disable recovery key. Please check your recovery key password!" => "Der Wiederherstellungsschlüssel konnte nicht deaktiviert werden. Bitte überprüfen Sie das Passwort für den Wiederherstellungsschlüssel!",
+"Password successfully changed." => "Das Passwort wurde erfolgreich geändert.",
+"Could not change the password. Maybe the old password was not correct." => "Das Passwort konnte nicht geändert werden. Vielleicht war das alte Passwort nicht richtig.",
+"Private key password successfully updated." => "Das Passwort des privaten Schlüssels wurde erfolgreich aktualisiert.",
+"Could not update the private key password. Maybe the old password was not correct." => "Das Passwort des privaten Schlüssels konnte nicht aktualisiert werden. Vielleicht war das alte Passwort nicht richtig.",
+"Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Ihr privater Schlüssel ist ungültig. Möglicher Weise wurde von ausserhalb Ihr Passwort geändert (z.B. in Ihrem gemeinsamen Verzeichnis). Sie können das Passwort Ihres privaten Schlüssels in den persönlichen Einstellungen aktualisieren, um wieder an Ihre Dateien zu gelangen.",
+"Missing requirements." => "Fehlende Voraussetzungen",
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Bitte stellen Sie sicher, dass PHP 5.3.3 oder neuer installiert und das OpenSSL zusammen mit der PHP-Erweiterung aktiviert und richtig konfiguriert ist. Zur Zeit ist die Verschlüsselungs-App deaktiviert.",
+"Following users are not set up for encryption:" => "Für folgende Nutzer ist keine Verschlüsselung eingerichtet:",
+"Saving..." => "Speichern...",
+"Your private key is not valid! Maybe the your password was changed from outside." => "Ihr privater Schlüssel ist ungültig! Vielleicht wurde Ihr Passwort von ausserhalb geändert.",
+"You can unlock your private key in your " => "Sie können den privaten Schlüssel ändern und zwar in Ihrem",
+"personal settings" => "Persönliche Einstellungen",
+"Encryption" => "Verschlüsselung",
+"Enable recovery key (allow to recover users files in case of password loss):" => "Aktivieren Sie den Wiederherstellungsschlüssel (erlaubt die Wiederherstellung des Zugangs zu den Benutzerdateien, wenn das Passwort verloren geht).",
+"Recovery key password" => "Wiederherstellungschlüsselpasswort",
+"Enabled" => "Aktiviert",
+"Disabled" => "Deaktiviert",
+"Change recovery key password:" => "Wiederherstellungsschlüsselpasswort ändern",
+"Old Recovery key password" => "Altes Wiederherstellungsschlüsselpasswort",
+"New Recovery key password" => "Neues Wiederherstellungsschlüsselpasswort ",
+"Change Password" => "Passwort ändern",
+"Your private key password no longer match your log-in password:" => "Das Privatschlüsselpasswort darf nicht länger mit den Login-Passwort übereinstimmen.",
+"Set your old private key password to your current log-in password." => "Setzen Sie Ihr altes Privatschlüsselpasswort auf Ihr aktuelles LogIn-Passwort.",
+" If you don't remember your old password you can ask your administrator to recover your files." => "Falls Sie sich nicht an Ihr altes Passwort erinnern können, fragen Sie bitte Ihren Administrator, um Ihre Dateien wiederherzustellen.",
+"Old log-in password" => "Altes Login-Passwort",
+"Current log-in password" => "Momentanes Login-Passwort",
+"Update Private Key Password" => "Das Passwort des privaten Schlüssels aktualisieren",
+"Enable password recovery:" => "Die Passwort-Wiederherstellung aktivieren:",
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Durch die Aktivierung dieser Option haben Sie die Möglichkeit, wieder auf Ihre verschlüsselten Dateien zugreifen zu können, wenn Sie Ihr Passwort verloren haben.",
+"File recovery settings updated" => "Die Einstellungen für die Dateiwiederherstellung wurden aktualisiert.",
+"Could not update file recovery" => "Die Dateiwiederherstellung konnte nicht aktualisiert werden."
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/en_GB.php b/apps/files_encryption/l10n/en_GB.php
new file mode 100644
index 0000000000000000000000000000000000000000..c220a4bdf045c81a57707c04a1a746cf076befe5
--- /dev/null
+++ b/apps/files_encryption/l10n/en_GB.php
@@ -0,0 +1,39 @@
+<?php
+$TRANSLATIONS = array(
+"Recovery key successfully enabled" => "Recovery key enabled successfully",
+"Could not enable recovery key. Please check your recovery key password!" => "Could not enable recovery key. Please check your recovery key password!",
+"Recovery key successfully disabled" => "Recovery key disabled successfully",
+"Could not disable recovery key. Please check your recovery key password!" => "Could not disable recovery key. Please check your recovery key password!",
+"Password successfully changed." => "Password changed successfully.",
+"Could not change the password. Maybe the old password was not correct." => "Could not change the password. Maybe the old password was incorrect.",
+"Private key password successfully updated." => "Private key password updated successfully.",
+"Could not update the private key password. Maybe the old password was not correct." => "Could not update the private key password. Maybe the old password was not correct.",
+"Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files.",
+"Missing requirements." => "Missing requirements.",
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled.",
+"Following users are not set up for encryption:" => "Following users are not set up for encryption:",
+"Saving..." => "Saving...",
+"Your private key is not valid! Maybe the your password was changed from outside." => "Your private key is not valid! Maybe the your password was changed externally.",
+"You can unlock your private key in your " => "You can unlock your private key in your ",
+"personal settings" => "personal settings",
+"Encryption" => "Encryption",
+"Enable recovery key (allow to recover users files in case of password loss):" => "Enable recovery key (allow to recover users files in case of password loss):",
+"Recovery key password" => "Recovery key password",
+"Enabled" => "Enabled",
+"Disabled" => "Disabled",
+"Change recovery key password:" => "Change recovery key password:",
+"Old Recovery key password" => "Old Recovery key password",
+"New Recovery key password" => "New Recovery key password",
+"Change Password" => "Change Password",
+"Your private key password no longer match your log-in password:" => "Your private key password no longer match your login password:",
+"Set your old private key password to your current log-in password." => "Set your old private key password to your current login password.",
+" If you don't remember your old password you can ask your administrator to recover your files." => " If you don't remember your old password you can ask your administrator to recover your files.",
+"Old log-in password" => "Old login password",
+"Current log-in password" => "Current login password",
+"Update Private Key Password" => "Update Private Key Password",
+"Enable password recovery:" => "Enable password recovery:",
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss",
+"File recovery settings updated" => "File recovery settings updated",
+"Could not update file recovery" => "Could not update file recovery"
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/pa.php b/apps/files_encryption/l10n/pa.php
new file mode 100644
index 0000000000000000000000000000000000000000..586709904094e5ac740fa2f317b1feb80b9d9612
--- /dev/null
+++ b/apps/files_encryption/l10n/pa.php
@@ -0,0 +1,5 @@
+<?php
+$TRANSLATIONS = array(
+"Saving..." => "...ਸੰà¨à¨¾à¨²à¨¿à¨† ਜਾ ਰਿਹਾ ਹੈ"
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/te.php b/apps/files_encryption/l10n/te.php
new file mode 100644
index 0000000000000000000000000000000000000000..10c7a08a554c9b78c8e208b376c7ba82e228b1b5
--- /dev/null
+++ b/apps/files_encryption/l10n/te.php
@@ -0,0 +1,5 @@
+<?php
+$TRANSLATIONS = array(
+"personal settings" => "à°µà±à°¯à°•à±à°¤à°¿à°—à°¤ అమరికలà±"
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index d40c5d1a97774c7b8fb8946f058087edc181e0de..df4d35cab0b42076108403b380e0249425f13e33 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -201,10 +201,11 @@ class Util {
if (false === $this->recoveryEnabledForUser()) {
// create database configuration
- $sql = 'INSERT INTO `*PREFIX*encryption` (`uid`,`mode`,`recovery_enabled`) VALUES (?,?,?)';
+ $sql = 'INSERT INTO `*PREFIX*encryption` (`uid`,`mode`,`recovery_enabled`,`migration_status`) VALUES (?,?,?,?)';
$args = array(
$this->userId,
'server-side',
+ 0,
0
);
$query = \OCP\DB::prepare($sql);
diff --git a/apps/files_external/l10n/de_CH.php b/apps/files_external/l10n/de_CH.php
new file mode 100644
index 0000000000000000000000000000000000000000..85e2f2d91fdee12e3da8a9d81f259e79acb1c7a5
--- /dev/null
+++ b/apps/files_external/l10n/de_CH.php
@@ -0,0 +1,28 @@
+<?php
+$TRANSLATIONS = array(
+"Access granted" => "Zugriff gestattet",
+"Error configuring Dropbox storage" => "Fehler beim Einrichten von Dropbox",
+"Grant access" => "Zugriff gestatten",
+"Please provide a valid Dropbox app key and secret." => "Bitte tragen Sie einen gültigen Dropbox-App-Key mit Secret ein.",
+"Error configuring Google Drive storage" => "Fehler beim Einrichten von Google Drive",
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Warnung:</b> «smbclient» ist nicht installiert. Das Einhängen von CIFS/SMB-Freigaben ist nicht möglich. Bitten Sie Ihren Systemadministrator, dies zu installieren.",
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>Warnung::</b> Die FTP Unterstützung von PHP ist nicht aktiviert oder installiert. Bitte wenden Sie sich an Ihren Systemadministrator.",
+"<b>Warning:</b> The Curl support in PHP is not enabled or installed. Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask your system administrator to install it." => "<b>Achtung:</b> Die Curl-Unterstützung von PHP ist nicht aktiviert oder installiert. Das Laden von ownCloud / WebDAV oder GoogleDrive Freigaben ist nicht möglich. Bitte Sie Ihren Systemadministrator, das Modul zu installieren.",
+"External Storage" => "Externer Speicher",
+"Folder name" => "Ordnername",
+"External storage" => "Externer Speicher",
+"Configuration" => "Konfiguration",
+"Options" => "Optionen",
+"Applicable" => "Zutreffend",
+"Add storage" => "Speicher hinzufügen",
+"None set" => "Nicht definiert",
+"All Users" => "Alle Benutzer",
+"Groups" => "Gruppen",
+"Users" => "Benutzer",
+"Delete" => "Löschen",
+"Enable User External Storage" => "Externen Speicher für Benutzer aktivieren",
+"Allow users to mount their own external storage" => "Erlaubt Benutzern, ihre eigenen externen Speicher einzubinden",
+"SSL root certificates" => "SSL-Root-Zertifikate",
+"Import Root Certificate" => "Root-Zertifikate importieren"
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/en_GB.php b/apps/files_external/l10n/en_GB.php
new file mode 100644
index 0000000000000000000000000000000000000000..8adca794dda125ab1b6db8f238421070719b3c8e
--- /dev/null
+++ b/apps/files_external/l10n/en_GB.php
@@ -0,0 +1,28 @@
+<?php
+$TRANSLATIONS = array(
+"Access granted" => "Access granted",
+"Error configuring Dropbox storage" => "Error configuring Dropbox storage",
+"Grant access" => "Grant access",
+"Please provide a valid Dropbox app key and secret." => "Please provide a valid Dropbox app key and secret.",
+"Error configuring Google Drive storage" => "Error configuring Google Drive storage",
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it.",
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it.",
+"<b>Warning:</b> The Curl support in PHP is not enabled or installed. Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask your system administrator to install it." => "<b>Warning:</b> The Curl support in PHP is not enabled or installed. Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask your system administrator to install it.",
+"External Storage" => "External Storage",
+"Folder name" => "Folder name",
+"External storage" => "External storage",
+"Configuration" => "Configuration",
+"Options" => "Options",
+"Applicable" => "Applicable",
+"Add storage" => "Add storage",
+"None set" => "None set",
+"All Users" => "All Users",
+"Groups" => "Groups",
+"Users" => "Users",
+"Delete" => "Delete",
+"Enable User External Storage" => "Enable User External Storage",
+"Allow users to mount their own external storage" => "Allow users to mount their own external storage",
+"SSL root certificates" => "SSL root certificates",
+"Import Root Certificate" => "Import Root Certificate"
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/pa.php b/apps/files_external/l10n/pa.php
new file mode 100644
index 0000000000000000000000000000000000000000..d633784f5ce17303420e1d208da83d4746395e0c
--- /dev/null
+++ b/apps/files_external/l10n/pa.php
@@ -0,0 +1,6 @@
+<?php
+$TRANSLATIONS = array(
+"Groups" => "ਗਰà©à©±à¨ª",
+"Delete" => "ਹਟਾਓ"
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/js/public.js b/apps/files_sharing/js/public.js
index acabc9a5c10f8e48550bc0649e0ce30462237767..67320b1cdb690878d77eb9c408edbade129b70f9 100644
--- a/apps/files_sharing/js/public.js
+++ b/apps/files_sharing/js/public.js
@@ -62,6 +62,9 @@ $(document).ready(function() {
$('#controls').append($('#additional_controls div#uploadprogresswrapper'));
// Cancel upload trigger
- $('#cancel_upload_button').click(Files.cancelUploads);
+ $('#cancel_upload_button').click(function() {
+ OC.Upload.cancelUploads();
+ procesSelection();
+ });
});
diff --git a/apps/files_sharing/l10n/de_CH.php b/apps/files_sharing/l10n/de_CH.php
new file mode 100644
index 0000000000000000000000000000000000000000..1bd24f9d9c4bf47ebb1020c2f4a14e3b256a617a
--- /dev/null
+++ b/apps/files_sharing/l10n/de_CH.php
@@ -0,0 +1,19 @@
+<?php
+$TRANSLATIONS = array(
+"The password is wrong. Try again." => "Das Passwort ist falsch. Bitte versuchen Sie es erneut.",
+"Password" => "Passwort",
+"Submit" => "Bestätigen",
+"Sorry, this link doesn’t seem to work anymore." => "Entschuldigung, dieser Link scheint nicht mehr zu funktionieren.",
+"Reasons might be:" => "Gründe könnten sein:",
+"the item was removed" => "Das Element wurde entfernt",
+"the link expired" => "Der Link ist abgelaufen",
+"sharing is disabled" => "Teilen ist deaktiviert",
+"For more info, please ask the person who sent this link." => "Für mehr Informationen, fragen Sie bitte die Person, die Ihnen diesen Link geschickt hat.",
+"%s shared the folder %s with you" => "%s hat den Ordner %s mit Ihnen geteilt",
+"%s shared the file %s with you" => "%s hat die Datei %s mit Ihnen geteilt",
+"Download" => "Herunterladen",
+"Upload" => "Hochladen",
+"Cancel upload" => "Upload abbrechen",
+"No preview available for" => "Es ist keine Vorschau verfügbar für"
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/en_GB.php b/apps/files_sharing/l10n/en_GB.php
new file mode 100644
index 0000000000000000000000000000000000000000..337c108651eb0c793382e950ffb44a557d343857
--- /dev/null
+++ b/apps/files_sharing/l10n/en_GB.php
@@ -0,0 +1,19 @@
+<?php
+$TRANSLATIONS = array(
+"The password is wrong. Try again." => "The password is wrong. Try again.",
+"Password" => "Password",
+"Submit" => "Submit",
+"Sorry, this link doesn’t seem to work anymore." => "Sorry, this link doesn’t seem to work anymore.",
+"Reasons might be:" => "Reasons might be:",
+"the item was removed" => "the item was removed",
+"the link expired" => "the link expired",
+"sharing is disabled" => "sharing is disabled",
+"For more info, please ask the person who sent this link." => "For more info, please ask the person who sent this link.",
+"%s shared the folder %s with you" => "%s shared the folder %s with you",
+"%s shared the file %s with you" => "%s shared the file %s with you",
+"Download" => "Download",
+"Upload" => "Upload",
+"Cancel upload" => "Cancel upload",
+"No preview available for" => "No preview available for"
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/hi.php b/apps/files_sharing/l10n/hi.php
index 74a2c320438158d5d3dfb359556d07927acc09bc..63a5d528f3bcc7b52d844692a503c3cf647e41a0 100644
--- a/apps/files_sharing/l10n/hi.php
+++ b/apps/files_sharing/l10n/hi.php
@@ -1,5 +1,6 @@
<?php
$TRANSLATIONS = array(
-"Password" => "पासवरà¥à¤¡"
+"Password" => "पासवरà¥à¤¡",
+"Upload" => "अपलोड "
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/pa.php b/apps/files_sharing/l10n/pa.php
new file mode 100644
index 0000000000000000000000000000000000000000..6c14eda59df9ebcf295c54e2b5dcaf5634f59884
--- /dev/null
+++ b/apps/files_sharing/l10n/pa.php
@@ -0,0 +1,8 @@
+<?php
+$TRANSLATIONS = array(
+"Password" => "ਪਾਸਵਰ",
+"Download" => "ਡਾਊਨਲੋਡ",
+"Upload" => "ਅੱਪਲੋਡ",
+"Cancel upload" => "ਅੱਪਲੋਡ ਰੱਦ ਕਰੋ"
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php
index 8d474e87b48e979e7f9de3d96b2695b254ef1f10..eff38dcc0fd5fce37baf3d39ae3206381d1cfdfa 100644
--- a/apps/files_sharing/public.php
+++ b/apps/files_sharing/public.php
@@ -22,7 +22,7 @@ function fileCmp($a, $b) {
function determineIcon($file, $sharingRoot, $sharingToken) {
// for folders we simply reuse the files logic
if($file['type'] == 'dir') {
- return \OCA\files\lib\Helper::determineIcon($file);
+ return \OCA\Files\Helper::determineIcon($file);
}
$relativePath = substr($file['path'], 6);
@@ -170,6 +170,7 @@ if (isset($path)) {
$tmpl->assign('dir', $getPath);
OCP\Util::addStyle('files', 'files');
+ OCP\Util::addStyle('files', 'upload');
OCP\Util::addScript('files', 'files');
OCP\Util::addScript('files', 'filelist');
OCP\Util::addscript('files', 'keyboardshortcuts');
diff --git a/apps/files_trashbin/ajax/list.php b/apps/files_trashbin/ajax/list.php
index e72e67b01d7e504f6a5fa5f54278e6fde67a28b5..c9dc13b7840ba650d32cddf8f6afa330e6dabcf9 100644
--- a/apps/files_trashbin/ajax/list.php
+++ b/apps/files_trashbin/ajax/list.php
@@ -15,7 +15,7 @@ $data = array();
// Make breadcrumb
if($doBreadcrumb) {
- $breadcrumb = \OCA\files_trashbin\lib\Helper::makeBreadcrumb($dir);
+ $breadcrumb = \OCA\Files_Trashbin\Helper::makeBreadcrumb($dir);
$breadcrumbNav = new OCP\Template('files_trashbin', 'part.breadcrumb', '');
$breadcrumbNav->assign('breadcrumb', $breadcrumb, false);
@@ -26,7 +26,7 @@ if($doBreadcrumb) {
}
// make filelist
-$files = \OCA\files_trashbin\lib\Helper::getTrashFiles($dir);
+$files = \OCA\Files_Trashbin\Helper::getTrashFiles($dir);
if ($files === null){
header("HTTP/1.0 404 Not Found");
diff --git a/apps/files_trashbin/appinfo/app.php b/apps/files_trashbin/appinfo/app.php
index 2c101f0a723b18cbb0890d9271c51b712719a62a..d30a601ef564c0282fdbed5715cf62f394cd114d 100644
--- a/apps/files_trashbin/appinfo/app.php
+++ b/apps/files_trashbin/appinfo/app.php
@@ -1,7 +1,7 @@
<?php
-OC::$CLASSPATH['OCA\Files_Trashbin\Hooks'] = 'files_trashbin/lib/hooks.php';
-OC::$CLASSPATH['OCA\Files_Trashbin\Trashbin'] = 'files_trashbin/lib/trash.php';
+//OC::$CLASSPATH['OCA\Files_Trashbin\Hooks'] = 'files_trashbin/lib/hooks.php';
+//OC::$CLASSPATH['OCA\Files_Trashbin\Trashbin'] = 'files_trashbin/lib/trash.php';
// register hooks
\OCA\Files_Trashbin\Trashbin::registerHooks();
diff --git a/apps/files_trashbin/index.php b/apps/files_trashbin/index.php
index 9f17448a757ecce21f03e57f3ea9fff70674de09..d8661e170a58cd69ebde886cb0fa92192969916f 100644
--- a/apps/files_trashbin/index.php
+++ b/apps/files_trashbin/index.php
@@ -36,7 +36,7 @@ if ($isIE8 && isset($_GET['dir'])){
$ajaxLoad = false;
if (!$isIE8){
- $files = \OCA\files_trashbin\lib\Helper::getTrashFiles($dir);
+ $files = \OCA\Files_Trashbin\Helper::getTrashFiles($dir);
}
else{
$files = array();
@@ -54,7 +54,7 @@ if ($dir && $dir !== '/') {
$dirlisting = true;
}
-$breadcrumb = \OCA\files_trashbin\lib\Helper::makeBreadcrumb($dir);
+$breadcrumb = \OCA\Files_Trashbin\Helper::makeBreadcrumb($dir);
$breadcrumbNav = new OCP\Template('files_trashbin', 'part.breadcrumb', '');
$breadcrumbNav->assign('breadcrumb', $breadcrumb);
diff --git a/apps/files_trashbin/l10n/ach.php b/apps/files_trashbin/l10n/ach.php
new file mode 100644
index 0000000000000000000000000000000000000000..5569f410cc96d23883a8b3d3d0a58dc4e0f51f6a
--- /dev/null
+++ b/apps/files_trashbin/l10n/ach.php
@@ -0,0 +1,6 @@
+<?php
+$TRANSLATIONS = array(
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files_trashbin/l10n/af_ZA.php b/apps/files_trashbin/l10n/af_ZA.php
new file mode 100644
index 0000000000000000000000000000000000000000..0acad00e8b58f9aeba594f70d8957213bf899c9a
--- /dev/null
+++ b/apps/files_trashbin/l10n/af_ZA.php
@@ -0,0 +1,6 @@
+<?php
+$TRANSLATIONS = array(
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/be.php b/apps/files_trashbin/l10n/be.php
new file mode 100644
index 0000000000000000000000000000000000000000..50df7ff5a972ed321c03533ed72e520d7d3a496c
--- /dev/null
+++ b/apps/files_trashbin/l10n/be.php
@@ -0,0 +1,6 @@
+<?php
+$TRANSLATIONS = array(
+"_%n folder_::_%n folders_" => array("","","",""),
+"_%n file_::_%n files_" => array("","","","")
+);
+$PLURAL_FORMS = "nplurals=4; 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/apps/files_trashbin/l10n/bs.php b/apps/files_trashbin/l10n/bs.php
new file mode 100644
index 0000000000000000000000000000000000000000..af7033bd1832e7243ab3e19486a21727eeedb32d
--- /dev/null
+++ b/apps/files_trashbin/l10n/bs.php
@@ -0,0 +1,7 @@
+<?php
+$TRANSLATIONS = array(
+"Name" => "Ime",
+"_%n folder_::_%n folders_" => array("","",""),
+"_%n file_::_%n files_" => array("","","")
+);
+$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/apps/files_trashbin/l10n/de_AT.php b/apps/files_trashbin/l10n/de_AT.php
new file mode 100644
index 0000000000000000000000000000000000000000..0acad00e8b58f9aeba594f70d8957213bf899c9a
--- /dev/null
+++ b/apps/files_trashbin/l10n/de_AT.php
@@ -0,0 +1,6 @@
+<?php
+$TRANSLATIONS = array(
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/de_CH.php b/apps/files_trashbin/l10n/de_CH.php
new file mode 100644
index 0000000000000000000000000000000000000000..92290a0de50f438389d010a038c8e65392bb1ede
--- /dev/null
+++ b/apps/files_trashbin/l10n/de_CH.php
@@ -0,0 +1,19 @@
+<?php
+$TRANSLATIONS = array(
+"Couldn't delete %s permanently" => "Konnte %s nicht dauerhaft löschen",
+"Couldn't restore %s" => "Konnte %s nicht wiederherstellen",
+"perform restore operation" => "Wiederherstellung ausführen",
+"Error" => "Fehler",
+"delete file permanently" => "Datei dauerhaft löschen",
+"Delete permanently" => "Endgültig löschen",
+"Name" => "Name",
+"Deleted" => "Gelöscht",
+"_%n folder_::_%n folders_" => array("%n Ordner","%n Ordner"),
+"_%n file_::_%n files_" => array("%n Datei","%n Dateien"),
+"restored" => "Wiederhergestellt",
+"Nothing in here. Your trash bin is empty!" => "Nichts zu löschen, Ihr Papierkorb ist leer!",
+"Restore" => "Wiederherstellen",
+"Delete" => "Löschen",
+"Deleted Files" => "Gelöschte Dateien"
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/en@pirate.php b/apps/files_trashbin/l10n/en@pirate.php
new file mode 100644
index 0000000000000000000000000000000000000000..0acad00e8b58f9aeba594f70d8957213bf899c9a
--- /dev/null
+++ b/apps/files_trashbin/l10n/en@pirate.php
@@ -0,0 +1,6 @@
+<?php
+$TRANSLATIONS = array(
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/en_GB.php b/apps/files_trashbin/l10n/en_GB.php
new file mode 100644
index 0000000000000000000000000000000000000000..be9d8b9f520dca6890f1bcf6f4d2cb94282e8113
--- /dev/null
+++ b/apps/files_trashbin/l10n/en_GB.php
@@ -0,0 +1,19 @@
+<?php
+$TRANSLATIONS = array(
+"Couldn't delete %s permanently" => "Couldn't delete %s permanently",
+"Couldn't restore %s" => "Couldn't restore %s",
+"perform restore operation" => "perform restore operation",
+"Error" => "Error",
+"delete file permanently" => "delete file permanently",
+"Delete permanently" => "Delete permanently",
+"Name" => "Name",
+"Deleted" => "Deleted",
+"_%n folder_::_%n folders_" => array("%n folder","%n folders"),
+"_%n file_::_%n files_" => array("%n file","%n files"),
+"restored" => "restored",
+"Nothing in here. Your trash bin is empty!" => "Nothing in here. Your recycle bin is empty!",
+"Restore" => "Restore",
+"Delete" => "Delete",
+"Deleted Files" => "Deleted Files"
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/es_MX.php b/apps/files_trashbin/l10n/es_MX.php
new file mode 100644
index 0000000000000000000000000000000000000000..0acad00e8b58f9aeba594f70d8957213bf899c9a
--- /dev/null
+++ b/apps/files_trashbin/l10n/es_MX.php
@@ -0,0 +1,6 @@
+<?php
+$TRANSLATIONS = array(
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/hi.php b/apps/files_trashbin/l10n/hi.php
new file mode 100644
index 0000000000000000000000000000000000000000..71711218b14dad40bfa6fafa6987278cdd1b45e0
--- /dev/null
+++ b/apps/files_trashbin/l10n/hi.php
@@ -0,0 +1,7 @@
+<?php
+$TRANSLATIONS = array(
+"Error" => "तà¥à¤°à¥à¤Ÿà¤¿",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/ka.php b/apps/files_trashbin/l10n/ka.php
new file mode 100644
index 0000000000000000000000000000000000000000..70f10d7c0bf5f12667a902c57aeb1cb8215703ef
--- /dev/null
+++ b/apps/files_trashbin/l10n/ka.php
@@ -0,0 +1,6 @@
+<?php
+$TRANSLATIONS = array(
+"_%n folder_::_%n folders_" => array(""),
+"_%n file_::_%n files_" => array("")
+);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_trashbin/l10n/km.php b/apps/files_trashbin/l10n/km.php
new file mode 100644
index 0000000000000000000000000000000000000000..70f10d7c0bf5f12667a902c57aeb1cb8215703ef
--- /dev/null
+++ b/apps/files_trashbin/l10n/km.php
@@ -0,0 +1,6 @@
+<?php
+$TRANSLATIONS = array(
+"_%n folder_::_%n folders_" => array(""),
+"_%n file_::_%n files_" => array("")
+);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_trashbin/l10n/kn.php b/apps/files_trashbin/l10n/kn.php
new file mode 100644
index 0000000000000000000000000000000000000000..70f10d7c0bf5f12667a902c57aeb1cb8215703ef
--- /dev/null
+++ b/apps/files_trashbin/l10n/kn.php
@@ -0,0 +1,6 @@
+<?php
+$TRANSLATIONS = array(
+"_%n folder_::_%n folders_" => array(""),
+"_%n file_::_%n files_" => array("")
+);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_trashbin/l10n/ml_IN.php b/apps/files_trashbin/l10n/ml_IN.php
new file mode 100644
index 0000000000000000000000000000000000000000..0acad00e8b58f9aeba594f70d8957213bf899c9a
--- /dev/null
+++ b/apps/files_trashbin/l10n/ml_IN.php
@@ -0,0 +1,6 @@
+<?php
+$TRANSLATIONS = array(
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/my_MM.php b/apps/files_trashbin/l10n/my_MM.php
new file mode 100644
index 0000000000000000000000000000000000000000..70f10d7c0bf5f12667a902c57aeb1cb8215703ef
--- /dev/null
+++ b/apps/files_trashbin/l10n/my_MM.php
@@ -0,0 +1,6 @@
+<?php
+$TRANSLATIONS = array(
+"_%n folder_::_%n folders_" => array(""),
+"_%n file_::_%n files_" => array("")
+);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_trashbin/l10n/ne.php b/apps/files_trashbin/l10n/ne.php
new file mode 100644
index 0000000000000000000000000000000000000000..0acad00e8b58f9aeba594f70d8957213bf899c9a
--- /dev/null
+++ b/apps/files_trashbin/l10n/ne.php
@@ -0,0 +1,6 @@
+<?php
+$TRANSLATIONS = array(
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/nqo.php b/apps/files_trashbin/l10n/nqo.php
new file mode 100644
index 0000000000000000000000000000000000000000..70f10d7c0bf5f12667a902c57aeb1cb8215703ef
--- /dev/null
+++ b/apps/files_trashbin/l10n/nqo.php
@@ -0,0 +1,6 @@
+<?php
+$TRANSLATIONS = array(
+"_%n folder_::_%n folders_" => array(""),
+"_%n file_::_%n files_" => array("")
+);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_trashbin/l10n/pa.php b/apps/files_trashbin/l10n/pa.php
new file mode 100644
index 0000000000000000000000000000000000000000..e53707fd7077c2fdcada3484af32c770f87b841f
--- /dev/null
+++ b/apps/files_trashbin/l10n/pa.php
@@ -0,0 +1,8 @@
+<?php
+$TRANSLATIONS = array(
+"Error" => "ਗਲਤੀ",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
+"Delete" => "ਹਟਾਓ"
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/ro.php b/apps/files_trashbin/l10n/ro.php
index 0b1d2cd9e179cb5020e2538fd02912daddaced54..12377bb065249cf371c38a6e7730baf988541877 100644
--- a/apps/files_trashbin/l10n/ro.php
+++ b/apps/files_trashbin/l10n/ro.php
@@ -3,8 +3,8 @@ $TRANSLATIONS = array(
"Error" => "Eroare",
"Delete permanently" => "Stergere permanenta",
"Name" => "Nume",
-"_%n folder_::_%n folders_" => array("","",""),
-"_%n file_::_%n files_" => array("","",""),
+"_%n folder_::_%n folders_" => array("","","%n directoare"),
+"_%n file_::_%n files_" => array("","","%n fișiere"),
"Delete" => "Șterge"
);
$PLURAL_FORMS = "nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));";
diff --git a/apps/files_trashbin/l10n/sk.php b/apps/files_trashbin/l10n/sk.php
new file mode 100644
index 0000000000000000000000000000000000000000..94aaf9b3a94937649bf432d87449003038f80c7d
--- /dev/null
+++ b/apps/files_trashbin/l10n/sk.php
@@ -0,0 +1,6 @@
+<?php
+$TRANSLATIONS = array(
+"_%n folder_::_%n folders_" => array("","",""),
+"_%n file_::_%n files_" => array("","","")
+);
+$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/apps/files_trashbin/l10n/sr@latin.php b/apps/files_trashbin/l10n/sr@latin.php
index 483d1e3ca2b89bb2451fc108921db95f82bbbdf7..fa30afcf4bf53d8ca8e5c79382df29212513d315 100644
--- a/apps/files_trashbin/l10n/sr@latin.php
+++ b/apps/files_trashbin/l10n/sr@latin.php
@@ -1,5 +1,6 @@
<?php
$TRANSLATIONS = array(
+"Error" => "Greška",
"Name" => "Ime",
"_%n folder_::_%n folders_" => array("","",""),
"_%n file_::_%n files_" => array("","",""),
diff --git a/apps/files_trashbin/l10n/sw_KE.php b/apps/files_trashbin/l10n/sw_KE.php
new file mode 100644
index 0000000000000000000000000000000000000000..0acad00e8b58f9aeba594f70d8957213bf899c9a
--- /dev/null
+++ b/apps/files_trashbin/l10n/sw_KE.php
@@ -0,0 +1,6 @@
+<?php
+$TRANSLATIONS = array(
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/lib/helper.php b/apps/files_trashbin/lib/helper.php
index 4cb5e8a39022929b40fff2e474e254bd8a1d3ee8..4f442ee930471cf39023059c071a79cd53376bf8 100644
--- a/apps/files_trashbin/lib/helper.php
+++ b/apps/files_trashbin/lib/helper.php
@@ -1,6 +1,6 @@
<?php
-namespace OCA\files_trashbin\lib;
+namespace OCA\Files_Trashbin;
class Helper
{
@@ -62,11 +62,11 @@ class Helper
}
$i['permissions'] = \OCP\PERMISSION_READ;
$i['isPreviewAvailable'] = \OC::$server->getPreviewManager()->isMimeSupported($r['mime']);
- $i['icon'] = \OCA\files\lib\Helper::determineIcon($i);
+ $i['icon'] = \OCA\Files\Helper::determineIcon($i);
$files[] = $i;
}
- usort($files, array('\OCA\files\lib\Helper', 'fileCmp'));
+ usort($files, array('\OCA\Files\Helper', 'fileCmp'));
return $files;
}
diff --git a/apps/files_trashbin/lib/trash.php b/apps/files_trashbin/lib/trashbin.php
similarity index 100%
rename from apps/files_trashbin/lib/trash.php
rename to apps/files_trashbin/lib/trashbin.php
diff --git a/apps/files_versions/l10n/cy_GB.php b/apps/files_versions/l10n/cy_GB.php
new file mode 100644
index 0000000000000000000000000000000000000000..fa35dfd5218edd267f6aa125323a6b9d6bc8b6e3
--- /dev/null
+++ b/apps/files_versions/l10n/cy_GB.php
@@ -0,0 +1,5 @@
+<?php
+$TRANSLATIONS = array(
+"Restore" => "Adfer"
+);
+$PLURAL_FORMS = "nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;";
diff --git a/apps/files_versions/l10n/de_CH.php b/apps/files_versions/l10n/de_CH.php
new file mode 100644
index 0000000000000000000000000000000000000000..c8b45eee5005516a2e916d685cf3f05645efa049
--- /dev/null
+++ b/apps/files_versions/l10n/de_CH.php
@@ -0,0 +1,10 @@
+<?php
+$TRANSLATIONS = array(
+"Could not revert: %s" => "Konnte %s nicht zurücksetzen",
+"Versions" => "Versionen",
+"Failed to revert {file} to revision {timestamp}." => "Konnte {file} der Revision {timestamp} nicht rückgänging machen.",
+"More versions..." => "Mehrere Versionen...",
+"No other versions available" => "Keine anderen Versionen verfügbar",
+"Restore" => "Wiederherstellen"
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_versions/l10n/en_GB.php b/apps/files_versions/l10n/en_GB.php
new file mode 100644
index 0000000000000000000000000000000000000000..af22b8fb0b2a54570b2c1be6ed69435cf28356d0
--- /dev/null
+++ b/apps/files_versions/l10n/en_GB.php
@@ -0,0 +1,10 @@
+<?php
+$TRANSLATIONS = array(
+"Could not revert: %s" => "Could not revert: %s",
+"Versions" => "Versions",
+"Failed to revert {file} to revision {timestamp}." => "Failed to revert {file} to revision {timestamp}.",
+"More versions..." => "More versions...",
+"No other versions available" => "No other versions available",
+"Restore" => "Restore"
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_versions/l10n/sq.php b/apps/files_versions/l10n/sq.php
new file mode 100644
index 0000000000000000000000000000000000000000..5a7a23a217f91eea40971049f133ff998a635bd4
--- /dev/null
+++ b/apps/files_versions/l10n/sq.php
@@ -0,0 +1,5 @@
+<?php
+$TRANSLATIONS = array(
+"Restore" => "Rivendos"
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/de_CH.php b/apps/user_ldap/l10n/de_CH.php
new file mode 100644
index 0000000000000000000000000000000000000000..df9175e73b1d399c6c7561e3f5fc57ba5b7d7b21
--- /dev/null
+++ b/apps/user_ldap/l10n/de_CH.php
@@ -0,0 +1,87 @@
+<?php
+$TRANSLATIONS = array(
+"Failed to clear the mappings." => "Löschen der Zuordnung fehlgeschlagen.",
+"Failed to delete the server configuration" => "Löschen der Serverkonfiguration fehlgeschlagen",
+"The configuration is valid and the connection could be established!" => "Die Konfiguration ist gültig und die Verbindung konnte hergestellt werden!",
+"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Die Konfiguration ist gültig aber die Verbindung ist fehlgeschlagen. Bitte überprüfen Sie die Servereinstellungen und die Anmeldeinformationen.",
+"The configuration is invalid. Please look in the ownCloud log for further details." => "Die Konfiguration ist ungültig, sehen Sie für weitere Details bitte im ownCloud Log nach",
+"Deletion failed" => "Löschen fehlgeschlagen",
+"Take over settings from recent server configuration?" => "Einstellungen von letzter Konfiguration übernehmen?",
+"Keep settings?" => "Einstellungen beibehalten?",
+"Cannot add server configuration" => "Das Hinzufügen der Serverkonfiguration schlug fehl",
+"mappings cleared" => "Zuordnungen gelöscht",
+"Success" => "Erfolg",
+"Error" => "Fehler",
+"Connection test succeeded" => "Verbindungstest erfolgreich",
+"Connection test failed" => "Verbindungstest fehlgeschlagen",
+"Do you really want to delete the current Server Configuration?" => "Möchten Sie die aktuelle Serverkonfiguration wirklich löschen?",
+"Confirm Deletion" => "Löschung bestätigen",
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." => "<b>Warnung:</b> Die Anwendungen user_ldap und user_webdavauth sind inkompatibel. Es kann demzufolge zu unerwarteten Verhalten kommen. Bitten Sie Ihren Systemadministator eine der beiden Anwendungen zu deaktivieren.",
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Warnung:</b> Da das PHP-Modul für LDAP nicht installiert ist, wird das Backend nicht funktionieren. Bitten Sie Ihren Systemadministrator das Modul zu installieren.",
+"Server configuration" => "Serverkonfiguration",
+"Add Server Configuration" => "Serverkonfiguration hinzufügen",
+"Host" => "Host",
+"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Sie können das Protokoll auslassen, ausser wenn Sie SSL benötigen. Beginnen Sie dann mit ldaps://",
+"Base DN" => "Basis-DN",
+"One Base DN per line" => "Ein Basis-DN pro Zeile",
+"You can specify Base DN for users and groups in the Advanced tab" => "Sie können Basis-DN für Benutzer und Gruppen in dem «Erweitert»-Reiter konfigurieren",
+"User DN" => "Benutzer-DN",
+"The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." => "Der DN des Benutzers für LDAP-Bind, z.B.: uid=agent,dc=example,dc=com. Für einen anonymen Zugriff lassen Sie DN und Passwort leer.",
+"Password" => "Passwort",
+"For anonymous access, leave DN and Password empty." => "Lassen Sie die Felder DN und Passwort für einen anonymen Zugang leer.",
+"User Login Filter" => "Benutzer-Login-Filter",
+"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Bestimmt den Filter, welcher bei einer Anmeldung angewandt wird. %%uid ersetzt den Benutzernamen bei der Anmeldung. Beispiel: \"uid=%%uid\"",
+"User List Filter" => "Benutzer-Filter-Liste",
+"Defines the filter to apply, when retrieving users (no placeholders). Example: \"objectClass=person\"" => "Definiert den Filter für die Wiederherstellung eines Benutzers (kein Platzhalter). Beispiel: \"objectClass=person\"",
+"Group Filter" => "Gruppen-Filter",
+"Defines the filter to apply, when retrieving groups (no placeholders). Example: \"objectClass=posixGroup\"" => "Definiert den Filter für die Wiederherstellung einer Gruppe (kein Platzhalter). Beispiel: \"objectClass=posixGroup\"",
+"Connection Settings" => "Verbindungseinstellungen",
+"Configuration Active" => "Konfiguration aktiv",
+"When unchecked, this configuration will be skipped." => "Wenn nicht angehakt, wird diese Konfiguration übersprungen.",
+"Port" => "Port",
+"Backup (Replica) Host" => "Backup Host (Kopie)",
+"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Geben Sie einen optionalen Backup Host an. Es muss sich um eine Kopie des Haupt LDAP/AD Servers handeln.",
+"Backup (Replica) Port" => "Backup Port",
+"Disable Main Server" => "Hauptserver deaktivieren",
+"Only connect to the replica server." => "Nur zum Replikat-Server verbinden.",
+"Use TLS" => "Nutze TLS",
+"Do not use it additionally for LDAPS connections, it will fail." => "Benutzen Sie es nicht in Verbindung mit LDAPS Verbindungen, es wird fehlschlagen.",
+"Case insensitve LDAP server (Windows)" => "LDAP-Server (Windows: Gross- und Kleinschreibung bleibt unbeachtet)",
+"Turn off SSL certificate validation." => "Schalten Sie die SSL-Zertifikatsprüfung aus.",
+"Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Nur für Testzwecke geeignet, sollte Standardmäßig nicht verwendet werden. Falls die Verbindung nur mit dieser Option funktioniert, importieren Sie das SSL-Zertifikat des LDAP-Servers in Ihren %s Server.",
+"Cache Time-To-Live" => "Speichere Time-To-Live zwischen",
+"in seconds. A change empties the cache." => "in Sekunden. Eine Änderung leert den Cache.",
+"Directory Settings" => "Ordnereinstellungen",
+"User Display Name Field" => "Feld für den Anzeigenamen des Benutzers",
+"The LDAP attribute to use to generate the user's display name." => "Das LDAP-Attribut zur Generierung des Anzeigenamens des Benutzers.",
+"Base User Tree" => "Basis-Benutzerbaum",
+"One User Base DN per line" => "Ein Benutzer Basis-DN pro Zeile",
+"User Search Attributes" => "Benutzersucheigenschaften",
+"Optional; one attribute per line" => "Optional; ein Attribut pro Zeile",
+"Group Display Name Field" => "Feld für den Anzeigenamen der Gruppe",
+"The LDAP attribute to use to generate the groups's display name." => "Das LDAP-Attribut zur Generierung des Anzeigenamens der Gruppen.",
+"Base Group Tree" => "Basis-Gruppenbaum",
+"One Group Base DN per line" => "Ein Gruppen Basis-DN pro Zeile",
+"Group Search Attributes" => "Gruppensucheigenschaften",
+"Group-Member association" => "Assoziation zwischen Gruppe und Benutzer",
+"Special Attributes" => "Spezielle Eigenschaften",
+"Quota Field" => "Kontingent-Feld",
+"Quota Default" => "Standard-Kontingent",
+"in bytes" => "in Bytes",
+"Email Field" => "E-Mail-Feld",
+"User Home Folder Naming Rule" => "Benennungsregel für das Home-Verzeichnis des Benutzers",
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Ohne Eingabe wird der Benutzername (Standard) verwendet. Anderenfalls tragen Sie bitte ein LDAP/AD-Attribut ein.",
+"Internal Username" => "Interner Benutzername",
+"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behavior as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users." => "Standardmässig wird der interne Benutzername mittels des UUID-Attributes erzeugt. Dies stellt sicher, dass der Benutzername einzigartig ist und keinerlei Zeichen konvertiert werden müssen. Der interne Benutzername unterliegt Beschränkungen, die nur die nachfolgenden Zeichen erlauben: [ a-zA-Z0-9_.@- ]. Andere Zeichen werden mittels ihrer korrespondierenden Zeichen ersetzt oder einfach ausgelassen. Bei Kollisionen wird ein Zähler hinzugefügt bzw. der Zähler um einen Wert erhöht. Der interne Benutzername wird benutzt, um einen Benutzer intern zu identifizieren. Es ist ebenso der standardmässig vorausgewählte Namen des Heimatverzeichnisses. Es ist auch ein Teil der Remote-URLs - zum Beispiel für alle *DAV-Dienste. Mit dieser Einstellung kann das Standardverhalten überschrieben werden. Um ein ähnliches Verhalten wie vor ownCloud 5 zu erzielen, fügen Sie das anzuzeigende Attribut des Benutzernamens in das nachfolgende Feld ein. Lassen Sie dies hingegen für das Standardverhalten leer. Die Änderungen werden sich nur auf neu gemappte (hinzugefügte) LDAP-Benutzer auswirken.",
+"Internal Username Attribute:" => "Interne Eigenschaften des Benutzers:",
+"Override UUID detection" => "UUID-Erkennung überschreiben",
+"By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." => "Standardmässig wird die UUID-Eigenschaft automatisch erkannt. Die UUID-Eigenschaft wird genutzt, um einen LDAP-Benutzer und Gruppen einwandfrei zu identifizieren. Ausserdem wird der interne Benutzername erzeugt, der auf Eigenschaften der UUID basiert, wenn es oben nicht anders angegeben wurde. Sie müssen allerdings sicherstellen, dass Ihre gewählten Eigenschaften zur Identifikation der Benutzer und Gruppen eindeutig sind und zugeordnet werden können. Lassen Sie es frei, um es beim Standardverhalten zu belassen. Änderungen wirken sich nur auf neu gemappte (hinzugefügte) LDAP-Benutzer und -Gruppen aus.",
+"UUID Attribute:" => "UUID-Attribut:",
+"Username-LDAP User Mapping" => "LDAP-Benutzernamenzuordnung",
+"Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." => "Die Benutzernamen werden genutzt, um (Meta)Daten zuzuordnen und zu speichern. Um Benutzer eindeutig und präzise zu identifizieren, hat jeder LDAP-Benutzer einen internen Benutzernamen. Dies erfordert eine Zuordnung (mappen) von Benutzernamen zum LDAP-Benutzer. Der erstellte Benutzername wird der UUID des LDAP-Benutzernamens zugeordnet. Zusätzlich wird der DN zwischengespeichert, um die Interaktion mit dem LDAP zu minimieren, was aber nicht der Identifikation dient. Ändert sich der DN, werden die Änderungen durch gefunden. Der interne Benutzername, wird in überall verwendet. Werden die Zuordnungen gelöscht, bleiben überall Reste zurück. Die Löschung der Zuordnungen kann nicht in der Konfiguration vorgenommen werden, beeinflusst aber die LDAP-Konfiguration! Löschen Sie niemals die Zuordnungen in einer produktiven Umgebung. Löschen Sie die Zuordnungen nur in einer Test- oder Experimentierumgebung.",
+"Clear Username-LDAP User Mapping" => "Lösche LDAP-Benutzernamenzuordnung",
+"Clear Groupname-LDAP Group Mapping" => "Lösche LDAP-Gruppennamenzuordnung",
+"Test Configuration" => "Testkonfiguration",
+"Help" => "Hilfe"
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/en_GB.php b/apps/user_ldap/l10n/en_GB.php
new file mode 100644
index 0000000000000000000000000000000000000000..d613be34868158b1386040061e459435952527ec
--- /dev/null
+++ b/apps/user_ldap/l10n/en_GB.php
@@ -0,0 +1,87 @@
+<?php
+$TRANSLATIONS = array(
+"Failed to clear the mappings." => "Failed to clear the mappings.",
+"Failed to delete the server configuration" => "Failed to delete the server configuration",
+"The configuration is valid and the connection could be established!" => "The configuration is valid and the connection could be established!",
+"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "The configuration is valid, but the Bind failed. Please check the server settings and credentials.",
+"The configuration is invalid. Please look in the ownCloud log for further details." => "The configuration is invalid. Please look in the ownCloud log for further details.",
+"Deletion failed" => "Deletion failed",
+"Take over settings from recent server configuration?" => "Take over settings from recent server configuration?",
+"Keep settings?" => "Keep settings?",
+"Cannot add server configuration" => "Cannot add server configuration",
+"mappings cleared" => "mappings cleared",
+"Success" => "Success",
+"Error" => "Error",
+"Connection test succeeded" => "Connection test succeeded",
+"Connection test failed" => "Connection test failed",
+"Do you really want to delete the current Server Configuration?" => "Do you really want to delete the current Server Configuration?",
+"Confirm Deletion" => "Confirm Deletion",
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." => "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them.",
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it.",
+"Server configuration" => "Server configuration",
+"Add Server Configuration" => "Add Server Configuration",
+"Host" => "Host",
+"You can omit the protocol, except you require SSL. Then start with ldaps://" => "You can omit the protocol, except you require SSL. Then start with ldaps://",
+"Base DN" => "Base DN",
+"One Base DN per line" => "One Base DN per line",
+"You can specify Base DN for users and groups in the Advanced tab" => "You can specify Base DN for users and groups in the Advanced tab",
+"User DN" => "User DN",
+"The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." => "The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty.",
+"Password" => "Password",
+"For anonymous access, leave DN and Password empty." => "For anonymous access, leave DN and Password empty.",
+"User Login Filter" => "User Login Filter",
+"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"",
+"User List Filter" => "User List Filter",
+"Defines the filter to apply, when retrieving users (no placeholders). Example: \"objectClass=person\"" => "Defines the filter to apply, when retrieving users (no placeholders). Example: \"objectClass=person\"",
+"Group Filter" => "Group Filter",
+"Defines the filter to apply, when retrieving groups (no placeholders). Example: \"objectClass=posixGroup\"" => "Defines the filter to apply, when retrieving groups (no placeholders). Example: \"objectClass=posixGroup\"",
+"Connection Settings" => "Connection Settings",
+"Configuration Active" => "Configuration Active",
+"When unchecked, this configuration will be skipped." => "When unchecked, this configuration will be skipped.",
+"Port" => "Port",
+"Backup (Replica) Host" => "Backup (Replica) Host",
+"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Give an optional backup host. It must be a replica of the main LDAP/AD server.",
+"Backup (Replica) Port" => "Backup (Replica) Port",
+"Disable Main Server" => "Disable Main Server",
+"Only connect to the replica server." => "Only connect to the replica server.",
+"Use TLS" => "Use TLS",
+"Do not use it additionally for LDAPS connections, it will fail." => "Do not use it additionally for LDAPS connections, it will fail.",
+"Case insensitve LDAP server (Windows)" => "Case insensitve LDAP server (Windows)",
+"Turn off SSL certificate validation." => "Turn off SSL certificate validation.",
+"Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server.",
+"Cache Time-To-Live" => "Cache Time-To-Live",
+"in seconds. A change empties the cache." => "in seconds. A change empties the cache.",
+"Directory Settings" => "Directory Settings",
+"User Display Name Field" => "User Display Name Field",
+"The LDAP attribute to use to generate the user's display name." => "The LDAP attribute to use to generate the user's display name.",
+"Base User Tree" => "Base User Tree",
+"One User Base DN per line" => "One User Base DN per line",
+"User Search Attributes" => "User Search Attributes",
+"Optional; one attribute per line" => "Optional; one attribute per line",
+"Group Display Name Field" => "Group Display Name Field",
+"The LDAP attribute to use to generate the groups's display name." => "The LDAP attribute to use to generate the group's display name.",
+"Base Group Tree" => "Base Group Tree",
+"One Group Base DN per line" => "One Group Base DN per line",
+"Group Search Attributes" => "Group Search Attributes",
+"Group-Member association" => "Group-Member association",
+"Special Attributes" => "Special Attributes",
+"Quota Field" => "Quota Field",
+"Quota Default" => "Quota Default",
+"in bytes" => "in bytes",
+"Email Field" => "Email Field",
+"User Home Folder Naming Rule" => "User Home Folder Naming Rule",
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute.",
+"Internal Username" => "Internal Username",
+"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behavior as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users." => "By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behaviour as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users.",
+"Internal Username Attribute:" => "Internal Username Attribute:",
+"Override UUID detection" => "Override UUID detection",
+"By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." => "By default, the UUID attribute is automatically detected. The UUID attribute is used to unambiguously identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users and groups.",
+"UUID Attribute:" => "UUID Attribute:",
+"Username-LDAP User Mapping" => "Username-LDAP User Mapping",
+"Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." => "Usernames are used to store and assign (meta) data. In order to precisely identify and recognise users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage.",
+"Clear Username-LDAP User Mapping" => "Clear Username-LDAP User Mapping",
+"Clear Groupname-LDAP Group Mapping" => "Clear Groupname-LDAP Group Mapping",
+"Test Configuration" => "Test Configuration",
+"Help" => "Help"
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/lt_LT.php b/apps/user_ldap/l10n/lt_LT.php
index 2c3b938fcfeed5a45343a65fffad100359a94387..f0522016825353a2bfbf26997d39c68a0e694928 100644
--- a/apps/user_ldap/l10n/lt_LT.php
+++ b/apps/user_ldap/l10n/lt_LT.php
@@ -1,13 +1,57 @@
<?php
$TRANSLATIONS = array(
+"Failed to clear the mappings." => "Nepavyko išvalyti sąsajų.",
+"Failed to delete the server configuration" => "Nepavyko pašalinti serverio konfigūracijos",
"Deletion failed" => "IÅ¡trinti nepavyko",
+"Keep settings?" => "IÅ¡laikyti nustatymus?",
+"mappings cleared" => "susiejimai išvalyti",
+"Success" => "SÄ—kmingai",
"Error" => "Klaida",
+"Connection test succeeded" => "Ryšio patikrinimas pavyko",
+"Connection test failed" => "Ryšio patikrinimas nepavyko",
+"Do you really want to delete the current Server Configuration?" => "Ar tikrai norite ištrinti dabartinę serverio konfigūraciją?",
+"Confirm Deletion" => "Patvirtinkite trynimÄ…",
+"Server configuration" => "Serverio konfigūravimas",
+"Add Server Configuration" => "Pridėti serverio konfigūraciją",
"Host" => "Mazgas",
+"Base DN" => "Bazinis DN",
+"One Base DN per line" => "Vienas bazinis DN eilutÄ—je",
+"User DN" => "Naudotojas DN",
"Password" => "Slaptažodis",
+"For anonymous access, leave DN and Password empty." => "Anoniminiam prisijungimui, palikite DN ir Slaptažodis laukus tuÅ¡Äius.",
+"User Login Filter" => "Naudotojo prisijungimo filtras",
+"User List Filter" => "Naudotojo sąrašo filtras",
"Group Filter" => "GrupÄ—s filtras",
+"Connection Settings" => "Ryšio nustatymai",
+"Configuration Active" => "Konfigūracija aktyvi",
+"When unchecked, this configuration will be skipped." => "Kai nepažymėta, ši konfigūracija bus praleista.",
"Port" => "Prievadas",
+"Backup (Replica) Host" => "AtsarginÄ—s kopijos (Replica) mazgas",
+"Backup (Replica) Port" => "AtsarginÄ—s kopijos (Replica) prievadas",
+"Disable Main Server" => "Išjungti pagrindinį serverį",
+"Only connect to the replica server." => "Tik prisijungti prie reprodukcinio (replica) serverio.",
"Use TLS" => "Naudoti TLS",
"Turn off SSL certificate validation." => "IÅ¡jungti SSL sertifikato tikrinimÄ….",
+"Directory Settings" => "Katalogo nustatymai",
+"Base User Tree" => "Bazinis naudotojo medis",
+"User Search Attributes" => "Naudotojo paieškos atributai",
+"Base Group Tree" => "Bazinis grupÄ—s medis",
+"Group Search Attributes" => "Grupės paieškos atributai",
+"Group-Member association" => "GrupÄ—s-Nario sÄ…saja",
+"Special Attributes" => "Specialūs atributai",
+"Quota Field" => "Kvotos laukas",
+"Quota Default" => "Numatyta kvota",
+"in bytes" => "baitais",
+"Email Field" => "El. pašto laukas",
+"User Home Folder Naming Rule" => "Naudotojo namų aplanko pavadinimo taisyklė",
+"Internal Username" => "Vidinis naudotojo vardas",
+"Internal Username Attribute:" => "Vidinis naudotojo vardo atributas:",
+"Override UUID detection" => "Perrašyti UUID aptikimą",
+"UUID Attribute:" => "UUID atributas:",
+"Username-LDAP User Mapping" => "Naudotojo vardo - LDAP naudotojo sÄ…saja",
+"Clear Username-LDAP User Mapping" => "IÅ¡valyti naudotojo vardo - LDAP naudotojo sÄ…sajÄ…",
+"Clear Groupname-LDAP Group Mapping" => "IÅ¡valyti grupÄ—s pavadinimo - LDAP naudotojo sÄ…sajÄ…",
+"Test Configuration" => "Bandyti konfigūraciją",
"Help" => "Pagalba"
);
$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/user_ldap/l10n/pa.php b/apps/user_ldap/l10n/pa.php
new file mode 100644
index 0000000000000000000000000000000000000000..ac486a8ca2fb80bbc2075c698d694734ca63f7dc
--- /dev/null
+++ b/apps/user_ldap/l10n/pa.php
@@ -0,0 +1,6 @@
+<?php
+$TRANSLATIONS = array(
+"Error" => "ਗਲਤੀ",
+"Password" => "ਪਾਸਵਰ"
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/ru.php b/apps/user_ldap/l10n/ru.php
index f26e26f1e77cd04c3f36864c45f773545d34774b..f1cf51dc51bffe35c0d84b60722b07927214375b 100644
--- a/apps/user_ldap/l10n/ru.php
+++ b/apps/user_ldap/l10n/ru.php
@@ -30,8 +30,11 @@ $TRANSLATIONS = array(
"Password" => "Пароль",
"For anonymous access, leave DN and Password empty." => "Ð”Ð»Ñ Ð°Ð½Ð¾Ð½Ð¸Ð¼Ð½Ð¾Ð³Ð¾ доÑтупа оÑтавьте DN и пароль пуÑтыми.",
"User Login Filter" => "Фильтр входа пользователей",
+"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "ОпределÑет фильтр Ð´Ð»Ñ Ð¿Ñ€Ð¸Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¸ попытке входа. %%uid заменÑет Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¿Ñ€Ð¸ входе в ÑиÑтему. Ðапример: \"uid=%%uid\"",
"User List Filter" => "Фильтр ÑпиÑка пользователей",
+"Defines the filter to apply, when retrieving users (no placeholders). Example: \"objectClass=person\"" => "ОпределÑет фильтр, иÑпользующийÑÑ Ð¿Ñ€Ð¸ получении пользователей (без подмены переменных). Ðапример: \"objectClass=person\"",
"Group Filter" => "Фильтр группы",
+"Defines the filter to apply, when retrieving groups (no placeholders). Example: \"objectClass=posixGroup\"" => "ОпределÑет фильтр, иÑпользующийÑÑ Ð¿Ñ€Ð¸ получении групп (без подмены переменных). Ðапример: \"objectClass=posixGroup\"",
"Connection Settings" => "ÐаÑтройки подключениÑ",
"Configuration Active" => "ÐšÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ Ð°ÐºÑ‚Ð¸Ð²Ð½Ð°",
"When unchecked, this configuration will be skipped." => "Когда галочка ÑнÑта, Ñта ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ Ð±ÑƒÐ´ÐµÑ‚ пропущена.",
@@ -40,19 +43,23 @@ $TRANSLATIONS = array(
"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Укажите дополнительный резервный Ñервер. Он должен быть репликой главного LDAP/AD Ñервера.",
"Backup (Replica) Port" => "Порт резервного Ñервера",
"Disable Main Server" => "Отключение главного Ñервера",
+"Only connect to the replica server." => "Только подключение к Ñерверу реплик.",
"Use TLS" => "ИÑпользовать TLS",
"Do not use it additionally for LDAPS connections, it will fail." => "Ðе иÑпользуйте ÑовмеÑтно Ñ Ð±ÐµÐ·Ð¾Ð¿Ð°Ñными подключениÑми (LDAPS), Ñто не Ñработает.",
"Case insensitve LDAP server (Windows)" => "ÐечувÑтвительный к региÑтру Ñервер LDAP (Windows)",
"Turn off SSL certificate validation." => "Отключить проверку Ñертификата SSL.",
+"Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Ðе рекомендуетÑÑ, иÑпользуйте только в режиме теÑтированиÑ! ЕÑли Ñоединение работает только Ñ Ñтой опцией, импортируйте на ваш %s Ñервер Ñертификат SSL Ñервера LDAP.",
"Cache Time-To-Live" => "КÑш времени жизни",
"in seconds. A change empties the cache." => "в Ñекундах. Изменение очиÑтит кÑш.",
"Directory Settings" => "ÐаÑтройки каталога",
"User Display Name Field" => "Поле отображаемого имени пользователÑ",
+"The LDAP attribute to use to generate the user's display name." => "Ðтрибут LDAP, который иÑпользуетÑÑ Ð´Ð»Ñ Ð³ÐµÐ½ÐµÑ€Ð°Ñ†Ð¸Ð¸ отображаемого имени пользователÑ.",
"Base User Tree" => "База пользовательÑкого дерева",
"One User Base DN per line" => "По одной базовому DN пользователей в Ñтроке.",
"User Search Attributes" => "ПоиÑковые атрибуты пользователÑ",
"Optional; one attribute per line" => "Опционально; один атрибут на линию",
"Group Display Name Field" => "Поле отображаемого имени группы",
+"The LDAP attribute to use to generate the groups's display name." => "Ðтрибут LDAP, который иÑпользуетÑÑ Ð´Ð»Ñ Ð³ÐµÐ½ÐµÑ€Ð°Ñ†Ð¸Ð¸ отображаемого имени группы.",
"Base Group Tree" => "База группового дерева",
"One Group Base DN per line" => "По одной базовому DN групп в Ñтроке.",
"Group Search Attributes" => "Ðтрибуты поиÑка Ð´Ð»Ñ Ð³Ñ€ÑƒÐ¿Ð¿Ñ‹",
@@ -65,10 +72,13 @@ $TRANSLATIONS = array(
"User Home Folder Naming Rule" => "Правило Ð¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ð½Ð¸Ñ Ð”Ð¾Ð¼Ð°ÑˆÐ½ÐµÐ¹ Папки ПользователÑ",
"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "ОÑтавьте Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¿ÑƒÑтым (по умолчанию). Иначе укажите атрибут LDAP/AD.",
"Internal Username" => "Внутреннее Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ",
+"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behavior as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users." => "По-умолчанию внутреннее Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð±ÑƒÐ´ÐµÑ‚ Ñоздано из атрибута UUID. Таким образом Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ ÑтановитÑÑ ÑƒÐ½Ð¸ÐºÐ°Ð»ÑŒÐ½Ñ‹Ð¼ и не требует конвертации Ñимволов. Внутреннее Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¼Ð¾Ð¶ÐµÑ‚ ÑоÑтоÑÑ‚ÑŒ только из Ñледующих Ñимволов: [ a-zA-Z0-9_.@- ]. ОÑтальные Ñимволы замещаютÑÑ ÑоответÑтвиÑми из таблицы ASCII или же проÑто пропуÑкаютÑÑ. При Ñовпадении к имени будет добавлено чиÑло. Внутреннее Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¸ÑпользуетÑÑ Ð´Ð»Ñ Ð²Ð½ÑƒÑ‚Ñ€ÐµÐ½Ð½ÐµÐ¹ идентификации пользователÑ. Также оно ÑвлÑетÑÑ Ð¸Ð¼ÐµÐ½ÐµÐ¼ по-умолчанию Ð´Ð»Ñ Ð¿Ð°Ð¿ÐºÐ¸ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð² ownCloud. Оно также портом Ð´Ð»Ñ ÑƒÐ´Ð°Ð»ÐµÐ½Ð½Ñ‹Ñ… ÑÑылок, к примеру, Ð´Ð»Ñ Ð²Ñех ÑервиÑов *DAV. С помощию данной наÑтройки можно изменить поведение по-умолчанию. Чтобы доÑтичь поведениÑ, как было наÑтроено до изменениÑ, ownCloud 5 выводит атрибут имени Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð² Ñтом поле. ОÑтавьте его пуÑтым Ð´Ð»Ñ Ñ€ÐµÐ¶Ð¸Ð¼Ð° по-умолчанию. Ð˜Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð±ÑƒÐ´ÑƒÑ‚ иметь Ñффект только Ð´Ð»Ñ Ð½Ð¾Ð²Ñ‹Ñ… подключенных (добавленных) пользователей LDAP.",
"Internal Username Attribute:" => "Ðттрибут Ð´Ð»Ñ Ð²Ð½ÑƒÑ‚Ñ€ÐµÐ½Ð½ÐµÐ³Ð¾ имени:",
"Override UUID detection" => "Переопределить нахождение UUID",
+"By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." => "По-умолчанию, ownCloud определÑет атрибут UUID автоматичеÑки. Ðтот атрибут иÑпользуетÑÑ Ð´Ð»Ñ Ñ‚Ð¾Ð³Ð¾, чтобы доÑтоверно индентифицировать пользователей и группы LDAP. Также, на оÑновании атрибута UUID ÑоздаетÑÑ Ð²Ð½ÑƒÑ‚Ñ€ÐµÐ½Ð½ÐµÐµ Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ, еÑли выше не указано иначе. Ð’Ñ‹ можете переопределить Ñту наÑтройку и указать Ñвой атрибут по выбору. Ð’Ñ‹ должны удоÑтоверитьÑÑ, что выбранный вами атрибут может быть выбран Ð´Ð»Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¹ и групп, а также то, что он уникальный. ОÑтавьте поле пуÑтым Ð´Ð»Ñ Ð¿Ð¾Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ð¿Ð¾-умолчанию. Ð˜Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð²ÑтупÑÑ‚ в Ñилу только Ð´Ð»Ñ Ð½Ð¾Ð²Ñ‹Ñ… подключенных (добавленных) пользователей и групп LDAP.",
"UUID Attribute:" => "Ðттрибут Ð´Ð»Ñ UUID:",
"Username-LDAP User Mapping" => "СоответÑÑ‚Ð²Ð¸Ñ Ð˜Ð¼Ñ-Пользователь LDAP",
+"Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." => "ownCloud иÑпользует имена пользователей Ð´Ð»Ñ Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð¸ Ð½Ð°Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð¼ÐµÑ‚Ð°Ð´Ð°Ð½Ð½Ñ‹Ñ…. Ð”Ð»Ñ Ñ‚Ð¾Ñ‡Ð½Ð¾Ð¹ идентификации и раÑÐ¿Ð¾Ð·Ð½Ð°Ð²Ð°Ð½Ð¸Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¹, каждый пользователь LDAP будет иметь Ñвое внутреннее Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ. Ðто требует привÑзки имени Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ ownCloud к пользователю LDAP. При Ñоздании Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð½Ð°Ð·Ð½Ð°Ñ‡Ð°ÐµÑ‚ÑÑ Ð¸Ð´ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ‚Ð¾Ñ€Ñƒ UUID Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ LDAP. Помимо Ñтого кешируетÑÑ Ð´Ð¾Ð¼ÐµÐ½Ð½Ð¾Ðµ Ð¸Ð¼Ñ (DN) Ð´Ð»Ñ ÑƒÐ¼ÐµÐ½ÑŒÑˆÐµÐ½Ð¸Ñ Ñ‡Ð¸Ñла обращений к LDAP, однако оно не иÑпользуетÑÑ Ð´Ð»Ñ Ð¸Ð´ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ð¸. ЕÑли доменное Ð¸Ð¼Ñ Ð±Ñ‹Ð»Ð¾ изменено, об Ñтом Ñтанет извеÑтно ownCloud. Внутреннее Ð¸Ð¼Ñ ownCloud иÑпользуетÑÑ Ð¿Ð¾Ð²ÑемеÑтно в ownCloud. ПоÑле ÑброÑа привÑзок в базе могут ÑохранитьÑÑ Ð¾Ñтатки Ñтарой информации. Ð¡Ð±Ñ€Ð¾Ñ Ð¿Ñ€Ð¸Ð²Ñзок не привÑзан к конфигурации, он повлиÑет на вÑе LDAP подключениÑ! Ðи в коем Ñлучае не рекомендуетÑÑ ÑбраÑывать привÑзки еÑли ÑиÑтема уже находитÑÑ Ð² ÑкÑплуатации, только на Ñтапе теÑтированиÑ.",
"Clear Username-LDAP User Mapping" => "ОчиÑтить ÑоответÑÑ‚Ð²Ð¸Ñ Ð˜Ð¼Ñ-Пользователь LDAP",
"Clear Groupname-LDAP Group Mapping" => "ОчиÑтить ÑоответÑÑ‚Ð²Ð¸Ñ Ð“Ñ€ÑƒÐ¿Ð¿Ð°-Группа LDAP",
"Test Configuration" => "ТеÑÑ‚Ð¾Ð²Ð°Ñ ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ",
diff --git a/apps/user_ldap/l10n/sr@latin.php b/apps/user_ldap/l10n/sr@latin.php
index 07db505ecf338e8baee5dd1267f696579f433355..24fff94fc656d41d6563bc7dfa76e748025dbcc1 100644
--- a/apps/user_ldap/l10n/sr@latin.php
+++ b/apps/user_ldap/l10n/sr@latin.php
@@ -1,5 +1,6 @@
<?php
$TRANSLATIONS = array(
+"Error" => "Greška",
"Password" => "Lozinka",
"Help" => "Pomoć"
);
diff --git a/apps/user_webdavauth/l10n/de_CH.php b/apps/user_webdavauth/l10n/de_CH.php
new file mode 100644
index 0000000000000000000000000000000000000000..2c31957d2515627eae7aa19daa946e6291568a44
--- /dev/null
+++ b/apps/user_webdavauth/l10n/de_CH.php
@@ -0,0 +1,7 @@
+<?php
+$TRANSLATIONS = array(
+"WebDAV Authentication" => "WebDAV-Authentifizierung",
+"Address: " => "Adresse:",
+"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "Die Benutzerdaten werden an diese Adresse gesendet. Dieses Plugin prüft die Antwort und wird die HTTP-Statuscodes 401 und 403 als ungültige Daten interpretieren und alle anderen Antworten als gültige Daten."
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/en_GB.php b/apps/user_webdavauth/l10n/en_GB.php
new file mode 100644
index 0000000000000000000000000000000000000000..c0982083377141e2f7e89bb27d504197c6396c7a
--- /dev/null
+++ b/apps/user_webdavauth/l10n/en_GB.php
@@ -0,0 +1,7 @@
+<?php
+$TRANSLATIONS = array(
+"WebDAV Authentication" => "WebDAV Authentication",
+"Address: " => "Address: ",
+"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials."
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/fa.php b/apps/user_webdavauth/l10n/fa.php
new file mode 100644
index 0000000000000000000000000000000000000000..ad061226d43f20b9bdf3f80d6c5947f4cc629a69
--- /dev/null
+++ b/apps/user_webdavauth/l10n/fa.php
@@ -0,0 +1,5 @@
+<?php
+$TRANSLATIONS = array(
+"WebDAV Authentication" => "اعتبار سنجی WebDAV "
+);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/console.php b/console.php
index fbe09d9bb689078424aca6e323e00c52fcc8917b..25b8b312539309e2c4ff8b4dcdb29d98602e7470 100644
--- a/console.php
+++ b/console.php
@@ -1,4 +1,3 @@
-
<?php
/**
* Copyright (c) 2013 Bart Visscher <bartv@thisnet.nl>
@@ -7,6 +6,8 @@
* See the COPYING-README file.
*/
+use Symfony\Component\Console\Application;
+
$RUNTIME_NOAPPS = true;
require_once 'lib/base.php';
@@ -21,32 +22,13 @@ if (!OC::$CLI) {
exit(0);
}
-$self = basename($argv[0]);
-if ($argc <= 1) {
- $argv[1] = "help";
-}
-
-$command = $argv[1];
-array_shift($argv);
-
-switch ($command) {
- case 'files:scan':
- require_once 'apps/files/console/scan.php';
- break;
- case 'status':
- require_once 'status.php';
- break;
- case 'help':
- echo "Usage:" . PHP_EOL;
- echo " " . $self . " <command>" . PHP_EOL;
- echo PHP_EOL;
- echo "Available commands:" . PHP_EOL;
- echo " files:scan -> rescan filesystem" .PHP_EOL;
- echo " status -> show some status information" .PHP_EOL;
- echo " help -> show this help screen" .PHP_EOL;
- break;
- default:
- echo "Unknown command '$command'" . PHP_EOL;
- echo "For available commands type ". $self . " help" . PHP_EOL;
- break;
+$defaults = new OC_Defaults;
+$application = new Application($defaults->getName(), \OC_Util::getVersionString());
+require_once 'core/register_command.php';
+foreach(OC_App::getAllApps() as $app) {
+ $file = OC_App::getAppPath($app).'/appinfo/register_command.php';
+ if(file_exists($file)) {
+ require $file;
+ }
}
+$application->run();
diff --git a/core/command/status.php b/core/command/status.php
new file mode 100644
index 0000000000000000000000000000000000000000..ea9825b0f619fbf4006335fa68e5867dd348a604
--- /dev/null
+++ b/core/command/status.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Copyright (c) 2013 Bart Visscher <bartv@thisnet.nl>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\Core\Command;
+
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class Status extends Command {
+ protected function configure() {
+ $this
+ ->setName('status')
+ ->setDescription('show some status information')
+ ;
+ }
+
+ protected function execute(InputInterface $input, OutputInterface $output) {
+ $values = array(
+ 'installed' => \OC_Config::getValue('installed') ? 'true' : 'false',
+ 'version' => implode('.', \OC_Util::getVersion()),
+ 'versionstring' => \OC_Util::getVersionString(),
+ 'edition' => \OC_Util::getEditionString(),
+ );
+ print_r($values);
+ }
+}
diff --git a/core/img/actions/triangle-e.png b/core/img/actions/triangle-e.png
new file mode 100644
index 0000000000000000000000000000000000000000..09d398f602e7985787925f20826dc839cde6f7df
Binary files /dev/null and b/core/img/actions/triangle-e.png differ
diff --git a/core/img/actions/triangle-e.svg b/core/img/actions/triangle-e.svg
new file mode 100644
index 0000000000000000000000000000000000000000..c3d908b366f8eda379ba03347060c336d38e0f7d
--- /dev/null
+++ b/core/img/actions/triangle-e.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16px" width="16px" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <path style="block-progression:tb;color:#000000;text-transform:none;text-indent:0" d="m4 12 8-4-7.989-4z"/>
+</svg>
diff --git a/core/js/avatar.js b/core/js/avatar.js
index 410182f01bf86d6a432968aba18612d5582dc4ed..57e6daa0930251fba4fa314bf36864e5209da8f2 100644
--- a/core/js/avatar.js
+++ b/core/js/avatar.js
@@ -1,7 +1,9 @@
$(document).ready(function(){
- $('#header .avatardiv').avatar(OC.currentUser, 32);
- // Personal settings
- $('#avatar .avatardiv').avatar(OC.currentUser, 128);
+ if (OC.currentUser) {
+ $('#header .avatardiv').avatar(OC.currentUser, 32);
+ // Personal settings
+ $('#avatar .avatardiv').avatar(OC.currentUser, 128);
+ }
// User settings
$.each($('td.avatar .avatardiv'), function(i, element) {
$(element).avatar($(element).parent().parent().data('uid'), 32);
diff --git a/core/js/jquery.ocdialog.js b/core/js/jquery.ocdialog.js
index f1836fd4727f7d09d8ed5c97e80d4d0f62d93149..02cd6ac146635895de58127b0f38a03b0d1a88eb 100644
--- a/core/js/jquery.ocdialog.js
+++ b/core/js/jquery.ocdialog.js
@@ -103,6 +103,9 @@
}
$.each(value, function(idx, val) {
var $button = $('<button>').text(val.text);
+ if (val.classes) {
+ $button.addClass(val.classes);
+ }
if(val.defaultButton) {
$button.addClass('primary');
self.$defaultButton = $button;
diff --git a/core/js/js.js b/core/js/js.js
index c09f80369f921e7e5155448fce19d082ad946b62..b7f7ff1ac15b53ac86ffbd7e0c761abe3ad655ee 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -723,11 +723,17 @@ $(document).ready(function(){
}
}else if(event.keyCode===27){//esc
OC.search.hide();
+ if (FileList && typeof FileList.unfilter === 'function') { //TODO add hook system
+ FileList.unfilter();
+ }
}else{
var query=$('#searchbox').val();
if(OC.search.lastQuery!==query){
OC.search.lastQuery=query;
OC.search.currentResult=-1;
+ if (FileList && typeof FileList.filter === 'function') { //TODO add hook system
+ FileList.filter(query);
+ }
if(query.length>2){
OC.search(query);
}else{
@@ -840,6 +846,13 @@ function formatDate(date){
return $.datepicker.formatDate(datepickerFormatDate, date)+' '+date.getHours()+':'+((date.getMinutes()<10)?'0':'')+date.getMinutes();
}
+// taken from http://stackoverflow.com/questions/1403888/get-url-parameter-with-jquery
+function getURLParameter(name) {
+ return decodeURI(
+ (RegExp(name + '=' + '(.+?)(&|$)').exec(location.search) || [, null])[1]
+ );
+}
+
/**
* takes an absolute timestamp and return a string with a human-friendly relative date
* @param int a Unix timestamp
@@ -906,7 +919,7 @@ OC.set=function(name, value) {
* @param {type} start
* @param {type} end
*/
-$.fn.selectRange = function(start, end) {
+jQuery.fn.selectRange = function(start, end) {
return this.each(function() {
if (this.setSelectionRange) {
this.focus();
@@ -921,6 +934,15 @@ $.fn.selectRange = function(start, end) {
});
};
+/**
+ * check if an element exists.
+ * allows you to write if ($('#myid').exists()) to increase readability
+ * @link http://stackoverflow.com/questions/31044/is-there-an-exists-function-for-jquery
+ */
+jQuery.fn.exists = function(){
+ return this.length > 0;
+}
+
/**
* Calls the server periodically every 15 mins to ensure that session doesnt
* time out
diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js
index 8e8a477772b3859919b140351c142fe8498d8548..ac37b109e76a2ea17c6f7e101e5747f8aae1cbc3 100644
--- a/core/js/oc-dialogs.js
+++ b/core/js/oc-dialogs.js
@@ -220,6 +220,245 @@ var OCdialogs = {
}
});
},
+ _fileexistsshown: false,
+ /**
+ * Displays file exists dialog
+ * @param {object} data upload object
+ * @param {object} original file with name, size and mtime
+ * @param {object} replacement file with name, size and mtime
+ * @param {object} controller with onCancel, onSkip, onReplace and onRename methods
+ */
+ fileexists:function(data, original, replacement, controller) {
+ var self = this;
+
+ var getCroppedPreview = function(file) {
+ var deferred = new $.Deferred();
+ // Only process image files.
+ var type = file.type.split('/').shift();
+ if (window.FileReader && type === 'image') {
+ var reader = new FileReader();
+ reader.onload = function (e) {
+ var blob = new Blob([e.target.result]);
+ window.URL = window.URL || window.webkitURL;
+ var originalUrl = window.URL.createObjectURL(blob);
+ var image = new Image();
+ image.src = originalUrl;
+ image.onload = function () {
+ var url = crop(image);
+ deferred.resolve(url);
+ }
+ };
+ reader.readAsArrayBuffer(file);
+ } else {
+ deferred.reject();
+ }
+ return deferred;
+ };
+
+ var crop = function(img) {
+ var canvas = document.createElement('canvas'),
+ width = img.width,
+ height = img.height,
+ x, y, size;
+
+ // calculate the width and height, constraining the proportions
+ if (width > height) {
+ y = 0;
+ x = (width - height) / 2;
+ } else {
+ y = (height - width) / 2;
+ x = 0;
+ }
+ size = Math.min(width, height);
+
+ // resize the canvas and draw the image data into it
+ canvas.width = 64;
+ canvas.height = 64;
+ var ctx = canvas.getContext("2d");
+ ctx.drawImage(img, x, y, size, size, 0, 0, 64, 64);
+ return canvas.toDataURL("image/png", 0.7);
+ };
+
+ var addConflict = function(conflicts, original, replacement) {
+
+ var conflict = conflicts.find('.template').clone().removeClass('template').addClass('conflict');
+
+ conflict.data('data',data);
+
+ conflict.find('.filename').text(original.name);
+ conflict.find('.original .size').text(humanFileSize(original.size));
+ conflict.find('.original .mtime').text(formatDate(original.mtime*1000));
+ // ie sucks
+ if (replacement.size && replacement.lastModifiedDate) {
+ conflict.find('.replacement .size').text(humanFileSize(replacement.size));
+ conflict.find('.replacement .mtime').text(formatDate(replacement.lastModifiedDate));
+ }
+ var path = getPathForPreview(original.name);
+ lazyLoadPreview(path, original.type, function(previewpath){
+ conflict.find('.original .icon').css('background-image','url('+previewpath+')');
+ }, 96, 96);
+ getCroppedPreview(replacement).then(
+ function(path){
+ conflict.find('.replacement .icon').css('background-image','url(' + path + ')');
+ }, function(){
+ getMimeIcon(replacement.type,function(path){
+ conflict.find('.replacement .icon').css('background-image','url(' + path + ')');
+ });
+ }
+ );
+ conflicts.append(conflict);
+
+ //set more recent mtime bold
+ // ie sucks
+ if (replacement.lastModifiedDate && replacement.lastModifiedDate.getTime() > original.mtime*1000) {
+ conflict.find('.replacement .mtime').css('font-weight', 'bold');
+ } else if (replacement.lastModifiedDate && replacement.lastModifiedDate.getTime() < original.mtime*1000) {
+ conflict.find('.original .mtime').css('font-weight', 'bold');
+ } else {
+ //TODO add to same mtime collection?
+ }
+
+ // set bigger size bold
+ if (replacement.size && replacement.size > original.size) {
+ conflict.find('.replacement .size').css('font-weight', 'bold');
+ } else if (replacement.size && replacement.size < original.size) {
+ conflict.find('.original .size').css('font-weight', 'bold');
+ } else {
+ //TODO add to same size collection?
+ }
+
+ //TODO show skip action for files with same size and mtime in bottom row
+
+ };
+ //var selection = controller.getSelection(data.originalFiles);
+ //if (selection.defaultAction) {
+ // controller[selection.defaultAction](data);
+ //} else {
+ var dialog_name = 'oc-dialog-fileexists-content';
+ var dialog_id = '#' + dialog_name;
+ if (this._fileexistsshown) {
+ // add conflict
+
+ var conflicts = $(dialog_id+ ' .conflicts');
+ addConflict(conflicts, original, replacement);
+
+ var count = $(dialog_id+ ' .conflict').length;
+ var title = n('files',
+ '{count} file conflict',
+ '{count} file conflicts',
+ count,
+ {count:count}
+ );
+ $(dialog_id).parent().children('.oc-dialog-title').text(title);
+
+ //recalculate dimensions
+ $(window).trigger('resize');
+
+ } else {
+ //create dialog
+ this._fileexistsshown = true;
+ $.when(this._getFileExistsTemplate()).then(function($tmpl) {
+ var title = t('files','One file conflict');
+ var $dlg = $tmpl.octemplate({
+ dialog_name: dialog_name,
+ title: title,
+ type: 'fileexists',
+
+ why: t('files','Which files do you want to keep?'),
+ what: t('files','If you select both versions, the copied file will have a number added to its name.')
+ });
+ $('body').append($dlg);
+
+ var conflicts = $($dlg).find('.conflicts');
+ addConflict(conflicts, original, replacement);
+
+ buttonlist = [{
+ text: t('core', 'Cancel'),
+ classes: 'cancel',
+ click: function(){
+ if ( typeof controller.onCancel !== 'undefined') {
+ controller.onCancel(data);
+ }
+ $(dialog_id).ocdialog('close');
+ }
+ },
+ {
+ text: t('core', 'Continue'),
+ classes: 'continue',
+ click: function(){
+ if ( typeof controller.onContinue !== 'undefined') {
+ controller.onContinue($(dialog_id + ' .conflict'));
+ }
+ $(dialog_id).ocdialog('close');
+ }
+ }];
+
+ $(dialog_id).ocdialog({
+ width: 500,
+ closeOnEscape: true,
+ modal: true,
+ buttons: buttonlist,
+ closeButton: null,
+ close: function(event, ui) {
+ self._fileexistsshown = false;
+ $(this).ocdialog('destroy').remove();
+ }
+ });
+
+ $(dialog_id).css('height','auto');
+
+ //add checkbox toggling actions
+ $(dialog_id).find('.allnewfiles').on('click', function() {
+ var checkboxes = $(dialog_id).find('.conflict .replacement input[type="checkbox"]');
+ checkboxes.prop('checked', $(this).prop('checked'));
+ });
+ $(dialog_id).find('.allexistingfiles').on('click', function() {
+ var checkboxes = $(dialog_id).find('.conflict .original input[type="checkbox"]');
+ checkboxes.prop('checked', $(this).prop('checked'));
+ });
+ $(dialog_id).find('.conflicts').on('click', '.replacement,.original', function() {
+ var checkbox = $(this).find('input[type="checkbox"]');
+ checkbox.prop('checked', !checkbox.prop('checked'));
+ });
+ $(dialog_id).find('.conflicts').on('click', 'input[type="checkbox"]', function() {
+ var checkbox = $(this);
+ checkbox.prop('checked', !checkbox.prop('checked'));
+ });
+
+ //update counters
+ $(dialog_id).on('click', '.replacement,.allnewfiles', function() {
+ var count = $(dialog_id).find('.conflict .replacement input[type="checkbox"]:checked').length;
+ if (count === $(dialog_id+ ' .conflict').length) {
+ $(dialog_id).find('.allnewfiles').prop('checked', true);
+ $(dialog_id).find('.allnewfiles + .count').text(t('files','(all selected)'));
+ } else if (count > 0) {
+ $(dialog_id).find('.allnewfiles').prop('checked', false);
+ $(dialog_id).find('.allnewfiles + .count').text(t('files','({count} selected)',{count:count}));
+ } else {
+ $(dialog_id).find('.allnewfiles').prop('checked', false);
+ $(dialog_id).find('.allnewfiles + .count').text('');
+ }
+ });
+ $(dialog_id).on('click', '.original,.allexistingfiles', function(){
+ var count = $(dialog_id).find('.conflict .original input[type="checkbox"]:checked').length;
+ if (count === $(dialog_id+ ' .conflict').length) {
+ $(dialog_id).find('.allexistingfiles').prop('checked', true);
+ $(dialog_id).find('.allexistingfiles + .count').text(t('files','(all selected)'));
+ } else if (count > 0) {
+ $(dialog_id).find('.allexistingfiles').prop('checked', false);
+ $(dialog_id).find('.allexistingfiles + .count').text(t('files','({count} selected)',{count:count}));
+ } else {
+ $(dialog_id).find('.allexistingfiles').prop('checked', false);
+ $(dialog_id).find('.allexistingfiles + .count').text('');
+ }
+ });
+ })
+ .fail(function() {
+ alert(t('core', 'Error loading file exists template'));
+ });
+ }
+ //}
+ },
_getFilePickerTemplate: function() {
var defer = $.Deferred();
if(!this.$filePickerTemplate) {
@@ -253,6 +492,22 @@ var OCdialogs = {
}
return defer.promise();
},
+ _getFileExistsTemplate: function () {
+ var defer = $.Deferred();
+ if (!this.$fileexistsTemplate) {
+ var self = this;
+ $.get(OC.filePath('files', 'templates', 'fileexists.html'), function (tmpl) {
+ self.$fileexistsTemplate = $(tmpl);
+ defer.resolve(self.$fileexistsTemplate);
+ })
+ .fail(function () {
+ defer.reject();
+ });
+ } else {
+ defer.resolve(this.$fileexistsTemplate);
+ }
+ return defer.promise();
+ },
_getFileList: function(dir, mimeType) {
if (typeof(mimeType) === "string") {
mimeType = [mimeType];
diff --git a/core/js/share.js b/core/js/share.js
index 5d34faf8a5db15d9fb26aeee33903a49276247ac..f54f13c95e34c764e41feddbf7ca4b2377765e72 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -483,7 +483,7 @@ $(document).ready(function() {
if (!$('.cruds', this).is(':visible')) {
$('a', this).hide();
if (!$('input[name="edit"]', this).is(':checked')) {
- $('input:[type=checkbox]', this).hide();
+ $('input[type="checkbox"]', this).hide();
$('label', this).hide();
}
} else {
@@ -603,7 +603,18 @@ $(document).ready(function() {
if (!$('#showPassword').is(':checked') ) {
var itemType = $('#dropdown').data('item-type');
var itemSource = $('#dropdown').data('item-source');
- OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, '', OC.PERMISSION_READ);
+ var allowPublicUpload = $('#sharingDialogAllowPublicUpload').is(':checked');
+ var permissions = 0;
+
+ // Calculate permissions
+ if (allowPublicUpload) {
+ permissions = OC.PERMISSION_UPDATE + OC.PERMISSION_CREATE + OC.PERMISSION_READ;
+ } else {
+ permissions = OC.PERMISSION_READ;
+ }
+
+
+ OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, '', permissions);
} else {
$('#linkPassText').focus();
}
diff --git a/core/l10n/ach.php b/core/l10n/ach.php
index 25f1137e8cd8173b9e7c63d1baed29103ac33b5c..2cbbaa45ca708af81c9ba205949910e6be3c48d4 100644
--- a/core/l10n/ach.php
+++ b/core/l10n/ach.php
@@ -3,6 +3,7 @@ $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("","")
+"_%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/af_ZA.php b/core/l10n/af_ZA.php
index 41447055609ac20e495b90d2ba0afb8b076adee5..6a0bbc53ac92497fbacadabf6cb1451d7dd676fc 100644
--- a/core/l10n/af_ZA.php
+++ b/core/l10n/af_ZA.php
@@ -5,6 +5,7 @@ $TRANSLATIONS = 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("",""),
"Password" => "Wagwoord",
"Use the following link to reset your password: {link}" => "Gebruik die volgende skakel om jou wagwoord te herstel: {link}",
"You will receive a link to reset your password via Email." => "Jy sal `n skakel via e-pos ontvang om jou wagwoord te herstel.",
diff --git a/core/l10n/ar.php b/core/l10n/ar.php
index 17c3ab293c6f4eb9047b1f53d07b1f3f6ddcd443..f61014e19e14097f4cd718a8325dd2897ad3af88 100644
--- a/core/l10n/ar.php
+++ b/core/l10n/ar.php
@@ -44,6 +44,8 @@ $TRANSLATIONS = array(
"Yes" => "نعم",
"No" => "لا",
"Ok" => "مواÙÙ‚",
+"_{count} file conflict_::_{count} file conflicts_" => array("","","","","",""),
+"Cancel" => "الغاء",
"The object type is not specified." => "نوع العنصر غير Ù…Øدد.",
"Error" => "خطأ",
"The app name is not specified." => "اسم التطبيق غير Ù…Øدد.",
@@ -82,6 +84,8 @@ $TRANSLATIONS = array(
"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}",
+"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> اذا لم تستقبل البريد خلال Ùترة زمنية قصيره, ابØØ« ÙÙŠ سلة مهملات بريدك.",
+"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" => "إسم المستخدم",
"Request reset" => "طلب تعديل",
diff --git a/core/l10n/be.php b/core/l10n/be.php
index 83f0d99a2e44c0d08351dbda44ff501e7906ec8d..2481806bcb9cb86338c27f57feefb5b697f42b15 100644
--- a/core/l10n/be.php
+++ b/core/l10n/be.php
@@ -4,6 +4,7 @@ $TRANSLATIONS = 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("","","",""),
"Advanced" => "ДаÑведчаны",
"Finish setup" => "ЗавÑршыць ÑžÑтаноўку."
);
diff --git a/core/l10n/bg_BG.php b/core/l10n/bg_BG.php
index 8afe42f206b4bf1d794f8073c12b2b569caa0870..4f5ae5993f4a07a338664083ca12ccfabcb57c76 100644
--- a/core/l10n/bg_BG.php
+++ b/core/l10n/bg_BG.php
@@ -34,6 +34,8 @@ $TRANSLATIONS = array(
"Yes" => "Да",
"No" => "Ðе",
"Ok" => "Добре",
+"_{count} file conflict_::_{count} file conflicts_" => array("",""),
+"Cancel" => "Отказ",
"Error" => "Грешка",
"Share" => "СподелÑне",
"Share with" => "Споделено Ñ",
diff --git a/core/l10n/bn_BD.php b/core/l10n/bn_BD.php
index 5e65d681ec203453078413f747e01794fb4f4833..3b4b990ac289b0e45d94ae108bd2a88abf2ba61c 100644
--- a/core/l10n/bn_BD.php
+++ b/core/l10n/bn_BD.php
@@ -42,6 +42,8 @@ $TRANSLATIONS = array(
"Yes" => "হà§à¦¯à¦¾à¦",
"No" => "না",
"Ok" => "তথাসà§à¦¤à§",
+"_{count} file conflict_::_{count} file conflicts_" => array("",""),
+"Cancel" => "বাতির",
"The object type is not specified." => "অবজেকà§à¦Ÿà§‡à¦° ধরণটি সà§à¦¨à¦¿à¦°à§à¦¦à¦¿à¦·à§à¦Ÿ নয়।",
"Error" => "সমসà§à¦¯à¦¾",
"The app name is not specified." => "অà§à¦¯à¦¾à¦ªà§‡à¦° নামটি সà§à¦¨à¦¿à¦°à§à¦¦à¦¿à¦·à§à¦Ÿ নয়।",
diff --git a/core/l10n/bs.php b/core/l10n/bs.php
index 885518f913689366a4274b61380a69195a6218bc..ee8196e9741b05470db200beaf9e9c8b4377124c 100644
--- a/core/l10n/bs.php
+++ b/core/l10n/bs.php
@@ -4,6 +4,7 @@ $TRANSLATIONS = 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("","",""),
"Share" => "Podijeli",
"Add" => "Dodaj"
);
diff --git a/core/l10n/ca.php b/core/l10n/ca.php
index c86af43ada64d1759c0d809ad1560ece76a7fdfb..938d668b362beb2c085996fcd42a51bfbccb414a 100644
--- a/core/l10n/ca.php
+++ b/core/l10n/ca.php
@@ -16,6 +16,11 @@ $TRANSLATIONS = array(
"Error adding %s to favorites." => "Error en afegir %s als preferits.",
"No categories selected for deletion." => "No hi ha categories per eliminar.",
"Error removing %s from favorites." => "Error en eliminar %s dels preferits.",
+"No image or file provided" => "No s'han proporcionat imatges o fitxers",
+"Unknown filetype" => "Tipus de fitxer desconegut",
+"Invalid image" => "Imatge no và lida",
+"No temporary profile picture available, try again" => "No hi ha imatge temporal de perfil disponible, torneu a intentar-ho",
+"No crop data provided" => "No heu proporcionat dades del retall",
"Sunday" => "Diumenge",
"Monday" => "Dilluns",
"Tuesday" => "Dimarts",
@@ -48,9 +53,20 @@ $TRANSLATIONS = array(
"last year" => "l'any passat",
"years ago" => "anys enrere",
"Choose" => "Escull",
+"Error loading file picker template: {error}" => "Error en carregar la plantilla de cà rrega de fitxers: {error}",
"Yes" => "SÃ",
"No" => "No",
"Ok" => "D'acord",
+"Error loading message template: {error}" => "Error en carregar la plantilla de missatge: {error}",
+"_{count} file conflict_::_{count} file conflicts_" => array("{count} conflicte de fitxer","{count} conflictes de fitxer"),
+"One file conflict" => "Un fitxer en conflicte",
+"Which files do you want to keep?" => "Quin fitxer voleu conservar?",
+"If you select both versions, the copied file will have a number added to its name." => "Si seleccioneu les dues versions, el fitxer copiat tindrà un número afegit al seu nom.",
+"Cancel" => "Cancel·la",
+"Continue" => "Continua",
+"(all selected)" => "(selecciona-ho tot)",
+"({count} selected)" => "({count} seleccionats)",
+"Error loading file exists template" => "Error en carregar la plantilla de fitxer existent",
"The object type is not specified." => "No s'ha especificat el tipus d'objecte.",
"Error" => "Error",
"The app name is not specified." => "No s'ha especificat el nom de l'aplicació.",
diff --git a/core/l10n/cs_CZ.php b/core/l10n/cs_CZ.php
index be7af770015c13dfcc471c9122dc531495f1baa4..449a49f56867dd30c958a2d4b1aef32ee35f30d0 100644
--- a/core/l10n/cs_CZ.php
+++ b/core/l10n/cs_CZ.php
@@ -16,6 +16,11 @@ $TRANSLATIONS = array(
"Error adding %s to favorites." => "Chyba pÅ™i pÅ™idávánà %s k oblÃbeným.",
"No categories selected for deletion." => "Žádné kategorie nebyly vybrány ke smazánÃ.",
"Error removing %s from favorites." => "Chyba pÅ™i odebÃránà %s z oblÃbených.",
+"No image or file provided" => "Soubor nebo obrázek nebyl zadán",
+"Unknown filetype" => "Neznámý typ souboru",
+"Invalid image" => "Chybný obrázek",
+"No temporary profile picture available, try again" => "DoÄasný profilový obrázek nenà k dispozici, zkuste to znovu",
+"No crop data provided" => "Nebyla poskytnuta data pro oÅ™Ãznutà obrázku",
"Sunday" => "Neděle",
"Monday" => "PondÄ›lÃ",
"Tuesday" => "Úterý",
@@ -48,9 +53,13 @@ $TRANSLATIONS = array(
"last year" => "minulý rok",
"years ago" => "před lety",
"Choose" => "Vybrat",
+"Error loading file picker template: {error}" => "Chyba při nahrávánà šablony výběru souborů: {error}",
"Yes" => "Ano",
"No" => "Ne",
"Ok" => "Ok",
+"Error loading message template: {error}" => "Chyba při nahrávánà šablony zprávy: {error}",
+"_{count} file conflict_::_{count} file conflicts_" => array("","",""),
+"Cancel" => "Zrušit",
"The object type is not specified." => "Nenà urÄen typ objektu.",
"Error" => "Chyba",
"The app name is not specified." => "Nenà urÄen název aplikace.",
diff --git a/core/l10n/cy_GB.php b/core/l10n/cy_GB.php
index 1f6c50524b3d04d76b75a58cdc8ad009095ff121..78eb6ba96981ee0a9fb54d749ab1072490a36473 100644
--- a/core/l10n/cy_GB.php
+++ b/core/l10n/cy_GB.php
@@ -44,6 +44,8 @@ $TRANSLATIONS = array(
"Yes" => "Ie",
"No" => "Na",
"Ok" => "Iawn",
+"_{count} file conflict_::_{count} file conflicts_" => array("","","",""),
+"Cancel" => "Diddymu",
"The object type is not specified." => "Nid yw'r math o wrthrych wedi cael ei nodi.",
"Error" => "Gwall",
"The app name is not specified." => "Nid yw enw'r pecyn wedi cael ei nodi.",
diff --git a/core/l10n/da.php b/core/l10n/da.php
index 3fd0fff94efd17324cd0ae1c6481d26e5546fe19..e2399fdc5cccb29bea0bd817372cbf441097cdef 100644
--- a/core/l10n/da.php
+++ b/core/l10n/da.php
@@ -51,6 +51,8 @@ $TRANSLATIONS = array(
"Yes" => "Ja",
"No" => "Nej",
"Ok" => "OK",
+"_{count} file conflict_::_{count} file conflicts_" => array("",""),
+"Cancel" => "Annuller",
"The object type is not specified." => "Objekttypen er ikke angivet.",
"Error" => "Fejl",
"The app name is not specified." => "Den app navn er ikke angivet.",
diff --git a/core/l10n/de.php b/core/l10n/de.php
index f248734d01cb7326c04fadce9f92909c5abc3e10..b5ff8826ad8c2a82b5e422aee0219f62817ab335 100644
--- a/core/l10n/de.php
+++ b/core/l10n/de.php
@@ -16,6 +16,11 @@ $TRANSLATIONS = array(
"Error adding %s to favorites." => "Fehler beim Hinzufügen von %s zu den Favoriten.",
"No categories selected for deletion." => "Es wurde keine Kategorien zum Löschen ausgewählt.",
"Error removing %s from favorites." => "Fehler beim Entfernen von %s von den Favoriten.",
+"No image or file provided" => "Kein Bild oder Datei zur Verfügung gestellt",
+"Unknown filetype" => "Unbekannter Dateityp",
+"Invalid image" => "Ungültiges Bild",
+"No temporary profile picture available, try again" => "Kein temporäres Profilbild verfügbar, bitte versuche es nochmal",
+"No crop data provided" => "Keine Zuschnittdaten zur Verfügung gestellt",
"Sunday" => "Sonntag",
"Monday" => "Montag",
"Tuesday" => "Dienstag",
@@ -48,9 +53,20 @@ $TRANSLATIONS = array(
"last year" => "Letztes Jahr",
"years ago" => "Vor Jahren",
"Choose" => "Auswählen",
+"Error loading file picker template: {error}" => "Fehler beim Laden der Dateiauswahlvorlage: {error}",
"Yes" => "Ja",
"No" => "Nein",
"Ok" => "OK",
+"Error loading message template: {error}" => "Fehler beim Laden der Nachrichtenvorlage: {error}",
+"_{count} file conflict_::_{count} file conflicts_" => array("{count} Dateikonflikt","{count} Dateikonflikte"),
+"One file conflict" => "Ein Dateikonflikt",
+"Which files do you want to keep?" => "Welche Dateien möchtest du behalten?",
+"If you select both versions, the copied file will have a number added to its name." => "Wenn du beide Versionen auswählst, erhält die kopierte Datei eine Zahl am Ende des Dateinamens.",
+"Cancel" => "Abbrechen",
+"Continue" => "Fortsetzen",
+"(all selected)" => "(Alle ausgewählt)",
+"({count} selected)" => "({count} ausgewählt)",
+"Error loading file exists template" => "Fehler beim Laden der vorhanden Dateivorlage",
"The object type is not specified." => "Der Objekttyp ist nicht angegeben.",
"Error" => "Fehler",
"The app name is not specified." => "Der App-Name ist nicht angegeben.",
diff --git a/core/l10n/de_AT.php b/core/l10n/de_AT.php
index 93c8e33f3e2d95d19676fafd4be3416cee37855d..ffcdde48d47cbbe4730b36aec880f7e1642688fb 100644
--- a/core/l10n/de_AT.php
+++ b/core/l10n/de_AT.php
@@ -3,6 +3,7 @@ $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("","")
+"_%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/de_CH.php b/core/l10n/de_CH.php
index 5ac614b25758be9801d3dd5bc8895111d869fe83..1fc6f6b7e1e5d7d7b38a2e95909d8be41022c5c7 100644
--- a/core/l10n/de_CH.php
+++ b/core/l10n/de_CH.php
@@ -45,6 +45,8 @@ $TRANSLATIONS = array(
"Yes" => "Ja",
"No" => "Nein",
"Ok" => "OK",
+"_{count} file conflict_::_{count} file conflicts_" => array("",""),
+"Cancel" => "Abbrechen",
"The object type is not specified." => "Der Objekttyp ist nicht angegeben.",
"Error" => "Fehler",
"The app name is not specified." => "Der App-Name ist nicht angegeben.",
diff --git a/core/l10n/de_DE.php b/core/l10n/de_DE.php
index 4616f50c2be33e6784bba8403f3faae23ad1e944..5b9b199f416d60d5a1ec4fc614fbee41e2c05315 100644
--- a/core/l10n/de_DE.php
+++ b/core/l10n/de_DE.php
@@ -16,6 +16,11 @@ $TRANSLATIONS = array(
"Error adding %s to favorites." => "Fehler beim Hinzufügen von %s zu den Favoriten.",
"No categories selected for deletion." => "Es wurden keine Kategorien zum Löschen ausgewählt.",
"Error removing %s from favorites." => "Fehler beim Entfernen von %s von den Favoriten.",
+"No image or file provided" => "Kein Bild oder Datei zur Verfügung gestellt",
+"Unknown filetype" => "Unbekannter Dateityp",
+"Invalid image" => "Ungültiges Bild",
+"No temporary profile picture available, try again" => "Kein temporäres Profilbild verfügbar, bitte versuchen Sie es nochmal",
+"No crop data provided" => "Keine Zuschnittdaten zur Verfügung gestellt",
"Sunday" => "Sonntag",
"Monday" => "Montag",
"Tuesday" => "Dienstag",
@@ -48,9 +53,20 @@ $TRANSLATIONS = array(
"last year" => "Letztes Jahr",
"years ago" => "Vor Jahren",
"Choose" => "Auswählen",
+"Error loading file picker template: {error}" => "Fehler beim Laden der Dateiauswahlvorlage: {error}",
"Yes" => "Ja",
"No" => "Nein",
"Ok" => "OK",
+"Error loading message template: {error}" => "Fehler beim Laden der Nachrichtenvorlage: {error}",
+"_{count} file conflict_::_{count} file conflicts_" => array("{count} Dateikonflikt","{count} Dateikonflikte"),
+"One file conflict" => "Ein Dateikonflikt",
+"Which files do you want to keep?" => "Welche Dateien möchten Sie behalten?",
+"If you select both versions, the copied file will have a number added to its name." => "Wenn Siebeide Versionen auswählen, erhält die kopierte Datei eine Zahl am Ende des Dateinamens.",
+"Cancel" => "Abbrechen",
+"Continue" => "Fortsetzen",
+"(all selected)" => "(Alle ausgewählt)",
+"({count} selected)" => "({count} ausgewählt)",
+"Error loading file exists template" => "Fehler beim Laden der vorhanden Dateivorlage",
"The object type is not specified." => "Der Objekttyp ist nicht angegeben.",
"Error" => "Fehler",
"The app name is not specified." => "Der App-Name ist nicht angegeben.",
diff --git a/core/l10n/el.php b/core/l10n/el.php
index 6e0733b7060d546bc7df7c9e469f14c3a5ee9268..7fc58ca3527bbe0dc85f8782df282778b3a6ab62 100644
--- a/core/l10n/el.php
+++ b/core/l10n/el.php
@@ -45,6 +45,8 @@ $TRANSLATIONS = array(
"Yes" => "Îαι",
"No" => "Όχι",
"Ok" => "Οκ",
+"_{count} file conflict_::_{count} file conflicts_" => array("",""),
+"Cancel" => "ΆκυÏο",
"The object type is not specified." => "Δεν καθοÏίστηκε ο Ï„Ïπος του αντικειμÎνου.",
"Error" => "Σφάλμα",
"The app name is not specified." => "Δεν καθοÏίστηκε το όνομα της εφαÏμογής.",
diff --git a/core/l10n/en@pirate.php b/core/l10n/en@pirate.php
index 997d1f88c46a11c0627e470a875340fbc076da5e..461a44dd235a0e42fecfac16c211d3bbf9273ead 100644
--- a/core/l10n/en@pirate.php
+++ b/core/l10n/en@pirate.php
@@ -4,6 +4,7 @@ $TRANSLATIONS = 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("",""),
"Password" => "Passcode"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/en_GB.php b/core/l10n/en_GB.php
index 7ccdcbe532737935cf77b33c0dffea512e8f8efa..bb26f1469dd9c4fe7b6e81d62cd153e392358c11 100644
--- a/core/l10n/en_GB.php
+++ b/core/l10n/en_GB.php
@@ -16,6 +16,11 @@ $TRANSLATIONS = array(
"Error adding %s to favorites." => "Error adding %s to favourites.",
"No categories selected for deletion." => "No categories selected for deletion.",
"Error removing %s from favorites." => "Error removing %s from favourites.",
+"No image or file provided" => "No image or file provided",
+"Unknown filetype" => "Unknown filetype",
+"Invalid image" => "Invalid image",
+"No temporary profile picture available, try again" => "No temporary profile picture available, try again",
+"No crop data provided" => "No crop data provided",
"Sunday" => "Sunday",
"Monday" => "Monday",
"Tuesday" => "Tuesday",
@@ -48,9 +53,20 @@ $TRANSLATIONS = array(
"last year" => "last year",
"years ago" => "years ago",
"Choose" => "Choose",
+"Error loading file picker template: {error}" => "Error loading file picker template: {error}",
"Yes" => "Yes",
"No" => "No",
"Ok" => "OK",
+"Error loading message template: {error}" => "Error loading message template: {error}",
+"_{count} file conflict_::_{count} file conflicts_" => array("{count} file conflict","{count} file conflicts"),
+"One file conflict" => "One file conflict",
+"Which files do you want to keep?" => "Which files do you wish to keep?",
+"If you select both versions, the copied file will have a number added to its name." => "If you select both versions, the copied file will have a number added to its name.",
+"Cancel" => "Cancel",
+"Continue" => "Continue",
+"(all selected)" => "(all selected)",
+"({count} selected)" => "({count} selected)",
+"Error loading file exists template" => "Error loading file exists template",
"The object type is not specified." => "The object type is not specified.",
"Error" => "Error",
"The app name is not specified." => "The app name is not specified.",
@@ -93,7 +109,7 @@ $TRANSLATIONS = array(
"Use the following link to reset your password: {link}" => "Use the following link to reset your password: {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 ." => "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 .",
"Request failed!<br>Did you make sure your email/username was right?" => "Request failed!<br>Did you make sure your email/username was correct?",
-"You will receive a link to reset your password via Email." => "You will receive a link to reset your password via Email.",
+"You will receive a link to reset your password via Email." => "You will receive a link to reset your password via email.",
"Username" => "Username",
"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?",
"Yes, I really want to reset my password now" => "Yes, I really want to reset my password now",
diff --git a/core/l10n/eo.php b/core/l10n/eo.php
index 669f677d46d8bc2e84a471f8ff909c8743a3c702..712f97538f3455879b804494aef7e1f27f5dd56a 100644
--- a/core/l10n/eo.php
+++ b/core/l10n/eo.php
@@ -45,6 +45,8 @@ $TRANSLATIONS = array(
"Yes" => "Jes",
"No" => "Ne",
"Ok" => "Akcepti",
+"_{count} file conflict_::_{count} file conflicts_" => array("",""),
+"Cancel" => "Nuligi",
"The object type is not specified." => "Ne indikiÄis tipo de la objekto.",
"Error" => "Eraro",
"The app name is not specified." => "Ne indikiÄis nomo de la aplikaĵo.",
diff --git a/core/l10n/es.php b/core/l10n/es.php
index a38050bccc2016f3eb6b52805a5e6a20f860299d..3aa0c3f732c6472562f344f48bf0718fd6c61bef 100644
--- a/core/l10n/es.php
+++ b/core/l10n/es.php
@@ -51,6 +51,8 @@ $TRANSLATIONS = array(
"Yes" => "SÃ",
"No" => "No",
"Ok" => "Aceptar",
+"_{count} file conflict_::_{count} file conflicts_" => array("",""),
+"Cancel" => "Cancelar",
"The object type is not specified." => "El tipo de objeto no está especificado.",
"Error" => "Error",
"The app name is not specified." => "El nombre de la aplicación no está especificado.",
diff --git a/core/l10n/es_AR.php b/core/l10n/es_AR.php
index 2c699266c516149abc05a4e519567345ef547a8b..6dce47f760d08dbdfb5600e3343fa29a46f1fcca 100644
--- a/core/l10n/es_AR.php
+++ b/core/l10n/es_AR.php
@@ -51,6 +51,8 @@ $TRANSLATIONS = array(
"Yes" => "SÃ",
"No" => "No",
"Ok" => "Aceptar",
+"_{count} file conflict_::_{count} file conflicts_" => array("",""),
+"Cancel" => "Cancelar",
"The object type is not specified." => "El tipo de objeto no está especificado. ",
"Error" => "Error",
"The app name is not specified." => "El nombre de la App no está especificado.",
diff --git a/core/l10n/es_MX.php b/core/l10n/es_MX.php
index 93c8e33f3e2d95d19676fafd4be3416cee37855d..ffcdde48d47cbbe4730b36aec880f7e1642688fb 100644
--- a/core/l10n/es_MX.php
+++ b/core/l10n/es_MX.php
@@ -3,6 +3,7 @@ $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("","")
+"_%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/et_EE.php b/core/l10n/et_EE.php
index 59c8e77a389b0479517afb245361721331cf90db..17ce89543a6514a6973d042bcee8db63527d1ddf 100644
--- a/core/l10n/et_EE.php
+++ b/core/l10n/et_EE.php
@@ -16,6 +16,11 @@ $TRANSLATIONS = array(
"Error adding %s to favorites." => "Viga %s lisamisel lemmikutesse.",
"No categories selected for deletion." => "Kustutamiseks pole kategooriat valitud.",
"Error removing %s from favorites." => "Viga %s eemaldamisel lemmikutest.",
+"No image or file provided" => "Ühtegi pilti või faili ei pakutud",
+"Unknown filetype" => "Tundmatu failitüüp",
+"Invalid image" => "Vigane pilt",
+"No temporary profile picture available, try again" => "Ãœhtegi ajutist profiili pilti pole saadaval, proovi uuesti",
+"No crop data provided" => "Lõikeandmeid ei leitud",
"Sunday" => "Pühapäev",
"Monday" => "Esmaspäev",
"Tuesday" => "Teisipäev",
@@ -48,9 +53,13 @@ $TRANSLATIONS = array(
"last year" => "viimasel aastal",
"years ago" => "aastat tagasi",
"Choose" => "Vali",
+"Error loading file picker template: {error}" => "Viga faili valija malli laadimisel: {error}",
"Yes" => "Jah",
"No" => "Ei",
"Ok" => "Ok",
+"Error loading message template: {error}" => "Viga sõnumi malli laadimisel: {error}",
+"_{count} file conflict_::_{count} file conflicts_" => array("",""),
+"Cancel" => "Loobu",
"The object type is not specified." => "Objekti tüüp pole määratletud.",
"Error" => "Viga",
"The app name is not specified." => "Rakenduse nimi ole määratletud.",
diff --git a/core/l10n/eu.php b/core/l10n/eu.php
index 1c11caee9e8cb742973f668c0f69762229395ac3..1e6594adf6fec37102183fdd14e008218c661a68 100644
--- a/core/l10n/eu.php
+++ b/core/l10n/eu.php
@@ -45,6 +45,8 @@ $TRANSLATIONS = array(
"Yes" => "Bai",
"No" => "Ez",
"Ok" => "Ados",
+"_{count} file conflict_::_{count} file conflicts_" => array("",""),
+"Cancel" => "Ezeztatu",
"The object type is not specified." => "Objetu mota ez dago zehaztuta.",
"Error" => "Errorea",
"The app name is not specified." => "App izena ez dago zehaztuta.",
diff --git a/core/l10n/fa.php b/core/l10n/fa.php
index b0423577b0caa9fdc16b73901c390cfafa712050..930a5b0dcbce4b9809bb6af1cbd64355401d9958 100644
--- a/core/l10n/fa.php
+++ b/core/l10n/fa.php
@@ -45,6 +45,8 @@ $TRANSLATIONS = array(
"Yes" => "بله",
"No" => "نه",
"Ok" => "قبول",
+"_{count} file conflict_::_{count} file conflicts_" => array(""),
+"Cancel" => "منصر٠شدن",
"The object type is not specified." => "نوع شی تعیین نشده است.",
"Error" => "خطا",
"The app name is not specified." => "نام برنامه تعیین نشده است.",
diff --git a/core/l10n/fi_FI.php b/core/l10n/fi_FI.php
index 25f5f466ef9635839e28bac3b7370cf40adf5ef9..cf215159c39564cdf9e72f745c64c5024b942e2d 100644
--- a/core/l10n/fi_FI.php
+++ b/core/l10n/fi_FI.php
@@ -14,6 +14,9 @@ $TRANSLATIONS = array(
"Error adding %s to favorites." => "Virhe lisätessä kohdetta %s suosikkeihin.",
"No categories selected for deletion." => "Luokkia ei valittu poistettavaksi.",
"Error removing %s from favorites." => "Virhe poistaessa kohdetta %s suosikeista.",
+"Unknown filetype" => "Tuntematon tiedostotyyppi",
+"Invalid image" => "Virhellinen kuva",
+"No temporary profile picture available, try again" => "Väliaikaista profiilikuvaa ei ole käytettävissä, yritä uudelleen",
"Sunday" => "sunnuntai",
"Monday" => "maanantai",
"Tuesday" => "tiistai",
@@ -49,6 +52,11 @@ $TRANSLATIONS = array(
"Yes" => "Kyllä",
"No" => "Ei",
"Ok" => "Ok",
+"_{count} file conflict_::_{count} file conflicts_" => array("",""),
+"Cancel" => "Peru",
+"Continue" => "Jatka",
+"(all selected)" => "(kaikki valittu)",
+"({count} selected)" => "({count} valittu)",
"Error" => "Virhe",
"The app name is not specified." => "Sovelluksen nimeä ei ole määritelty.",
"The required file {file} is not installed!" => "Vaadittua tiedostoa {file} ei ole asennettu!",
diff --git a/core/l10n/fr.php b/core/l10n/fr.php
index 8b8b7c19f2a46d6e5d11dcc8bd6ac7395b24bc62..29489e86b7fd1ac978079ce8ebf682dc047aeed7 100644
--- a/core/l10n/fr.php
+++ b/core/l10n/fr.php
@@ -16,6 +16,9 @@ $TRANSLATIONS = array(
"Error adding %s to favorites." => "Erreur lors de l'ajout de %s aux favoris.",
"No categories selected for deletion." => "Pas de catégorie sélectionnée pour la suppression.",
"Error removing %s from favorites." => "Erreur lors de la suppression de %s des favoris.",
+"No image or file provided" => "Aucune image ou fichier fourni",
+"Unknown filetype" => "Type de fichier inconnu",
+"Invalid image" => "Image invalide",
"Sunday" => "Dimanche",
"Monday" => "Lundi",
"Tuesday" => "Mardi",
@@ -48,9 +51,17 @@ $TRANSLATIONS = array(
"last year" => "l'année dernière",
"years ago" => "il y a plusieurs années",
"Choose" => "Choisir",
+"Error loading file picker template: {error}" => "Erreur de chargement du modèle de sélectionneur de fichiers : {error}",
"Yes" => "Oui",
"No" => "Non",
"Ok" => "Ok",
+"Error loading message template: {error}" => "Erreur de chargement du modèle de message : {error}",
+"_{count} file conflict_::_{count} file conflicts_" => array("{count} fichier en conflit","{count} fichiers en conflit"),
+"One file conflict" => "Un conflit de fichier",
+"Which files do you want to keep?" => "Quels fichiers désirez-vous garder ?",
+"If you select both versions, the copied file will have a number added to its name." => "Si vous sélectionnez les deux versions, un nombre sera ajouté au nom du fichier copié.",
+"Cancel" => "Annuler",
+"({count} selected)" => "({count} sélectionnés)",
"The object type is not specified." => "Le type d'objet n'est pas spécifié.",
"Error" => "Erreur",
"The app name is not specified." => "Le nom de l'application n'est pas spécifié.",
diff --git a/core/l10n/gl.php b/core/l10n/gl.php
index ca07e510a30178391f58896effe66c295f51b52b..e3be94537e5a02207c3f3b8753c152f61b8f6de5 100644
--- a/core/l10n/gl.php
+++ b/core/l10n/gl.php
@@ -16,6 +16,11 @@ $TRANSLATIONS = array(
"Error adding %s to favorites." => "Produciuse un erro ao engadir %s aos favoritos.",
"No categories selected for deletion." => "Non se seleccionaron categorÃas para eliminación.",
"Error removing %s from favorites." => "Produciuse un erro ao eliminar %s dos favoritos.",
+"No image or file provided" => "Non forneceu ningunha imaxe ou ficheiro",
+"Unknown filetype" => "Tipo de ficheiro descoñecido",
+"Invalid image" => "Imaxe incorrecta",
+"No temporary profile picture available, try again" => "Non hai unha imaxe temporal de perfil dispoñÃbel, volva tentalo",
+"No crop data provided" => "Non indicou como recortar",
"Sunday" => "Domingo",
"Monday" => "Luns",
"Tuesday" => "Martes",
@@ -48,9 +53,20 @@ $TRANSLATIONS = array(
"last year" => "último ano",
"years ago" => "anos atrás",
"Choose" => "Escoller",
+"Error loading file picker template: {error}" => "Produciuse un erro ao cargar o modelo do selector: {error}",
"Yes" => "Si",
"No" => "Non",
"Ok" => "Aceptar",
+"Error loading message template: {error}" => "Produciuse un erro ao cargar o modelo da mensaxe: {error}",
+"_{count} file conflict_::_{count} file conflicts_" => array("{count} conflito de ficheiro","{count} conflitos de ficheiros"),
+"One file conflict" => "Un conflito de ficheiro",
+"Which files do you want to keep?" => "Que ficheiros quere conservar?",
+"If you select both versions, the copied file will have a number added to its name." => "Se selecciona ambas versións, o ficheiro copiado terá un número engadido ao nome.",
+"Cancel" => "Cancelar",
+"Continue" => "Continuar",
+"(all selected)" => "(todo o seleccionado)",
+"({count} selected)" => "({count} seleccionados)",
+"Error loading file exists template" => "Produciuse un erro ao cargar o modelo de ficheiro existente",
"The object type is not specified." => "Non se especificou o tipo de obxecto.",
"Error" => "Erro",
"The app name is not specified." => "Non se especificou o nome do aplicativo.",
diff --git a/core/l10n/he.php b/core/l10n/he.php
index a10765c3a80603d1e2da93c3f4f0d2ae43701173..704755da07f33fedbdfe7cc7a5570693f66f1e46 100644
--- a/core/l10n/he.php
+++ b/core/l10n/he.php
@@ -45,6 +45,8 @@ $TRANSLATIONS = array(
"Yes" => "כן",
"No" => "ל×",
"Ok" => "בסדר",
+"_{count} file conflict_::_{count} file conflicts_" => array("",""),
+"Cancel" => "ביטול",
"The object type is not specified." => "סוג הפריט ×œ× ×¦×•×™×Ÿ.",
"Error" => "שגי××”",
"The app name is not specified." => "×©× ×”×™×™×©×•× ×œ× ×¦×•×™×Ÿ.",
diff --git a/core/l10n/hi.php b/core/l10n/hi.php
index 29e67f68abffafdca0bfe8daaba9c28920be4ee1..e783ec88d1771ac29f05ef076e53f64e7cf1909e 100644
--- a/core/l10n/hi.php
+++ b/core/l10n/hi.php
@@ -27,11 +27,13 @@ $TRANSLATIONS = 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("",""),
"Error" => "तà¥à¤°à¥à¤Ÿà¤¿",
"Share" => "साà¤à¤¾ करें",
"Share with" => "के साथ साà¤à¤¾",
"Password" => "पासवरà¥à¤¡",
"Send" => "à¤à¥‡à¤œà¥‡à¤‚",
+"No people found" => "कोई वà¥à¤¯à¤•à¥à¤¤à¤¿ नहीं मिले ",
"Sending ..." => "à¤à¥‡à¤œà¤¾ जा रहा है",
"Email sent" => "ईमेल à¤à¥‡à¤œ दिया गया है ",
"Use the following link to reset your password: {link}" => "आगे दिये गये लिंक का उपयोग पासवरà¥à¤¡ बदलने के लिये किजीये: {link}",
@@ -45,6 +47,7 @@ $TRANSLATIONS = array(
"Help" => "सहयोग",
"Cloud not found" => "कà¥à¤²à¥Œà¤¡ नहीं मिला ",
"Add" => "डाले",
+"Security Warning" => "सà¥à¤°à¤•à¥à¤·à¤¾ चेतावनी ",
"Create an <strong>admin account</strong>" => "वà¥à¤¯à¤µà¤¸à¥à¤¥à¤¾à¤ªà¤• खाता बनाà¤à¤",
"Advanced" => "उनà¥à¤¨à¤¤",
"Data folder" => "डाटा फोलà¥à¤¡à¤°",
diff --git a/core/l10n/hr.php b/core/l10n/hr.php
index 97fbfb8b97fe8fd4b754129bfe6129d79493d85d..7fa81db8a21b4515887e8373c237349a9a5a17bf 100644
--- a/core/l10n/hr.php
+++ b/core/l10n/hr.php
@@ -37,6 +37,8 @@ $TRANSLATIONS = array(
"Yes" => "Da",
"No" => "Ne",
"Ok" => "U redu",
+"_{count} file conflict_::_{count} file conflicts_" => array("","",""),
+"Cancel" => "Odustani",
"Error" => "Greška",
"Share" => "Podijeli",
"Error while sharing" => "Greška prilikom djeljenja",
diff --git a/core/l10n/hu_HU.php b/core/l10n/hu_HU.php
index 92e51d977efa6d336455d4af8282e35efcfa6f02..d893269ee810f04c7e2560027855bb5eae36a458 100644
--- a/core/l10n/hu_HU.php
+++ b/core/l10n/hu_HU.php
@@ -45,6 +45,8 @@ $TRANSLATIONS = array(
"Yes" => "Igen",
"No" => "Nem",
"Ok" => "Ok",
+"_{count} file conflict_::_{count} file conflicts_" => array("",""),
+"Cancel" => "Mégsem",
"The object type is not specified." => "Az objektum tÃpusa nincs megadva.",
"Error" => "Hiba",
"The app name is not specified." => "Az alkalmazás neve nincs megadva.",
diff --git a/core/l10n/hy.php b/core/l10n/hy.php
index 9965d4731b08fc18f238c9a2fb1685e87693198f..d2b68819c727d690a5c126b0a6b74ae696f67c16 100644
--- a/core/l10n/hy.php
+++ b/core/l10n/hy.php
@@ -22,6 +22,7 @@ $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("","")
+"_%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/ia.php b/core/l10n/ia.php
index 0556d5d1295d469e9a411e28ae47485039d00d9e..48d2588c002fcc75397522e0c07136eda1cc4bf0 100644
--- a/core/l10n/ia.php
+++ b/core/l10n/ia.php
@@ -24,6 +24,8 @@ $TRANSLATIONS = 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("",""),
+"Cancel" => "Cancellar",
"Error" => "Error",
"Share" => "Compartir",
"Password" => "Contrasigno",
diff --git a/core/l10n/id.php b/core/l10n/id.php
index 0f222918c9547c967f8be4a8c93a0a9ae0e96f4c..69993d440559660065600969dbd4ecbe10f99ef9 100644
--- a/core/l10n/id.php
+++ b/core/l10n/id.php
@@ -44,6 +44,8 @@ $TRANSLATIONS = array(
"Yes" => "Ya",
"No" => "Tidak",
"Ok" => "Oke",
+"_{count} file conflict_::_{count} file conflicts_" => array(""),
+"Cancel" => "Batal",
"The object type is not specified." => "Tipe objek tidak ditentukan.",
"Error" => "Galat",
"The app name is not specified." => "Nama aplikasi tidak ditentukan.",
diff --git a/core/l10n/is.php b/core/l10n/is.php
index 8211421cf359ead84d510b2841804db45cd4a726..729aaa4c9e6beb158d413c278dc2ec2dff5772d0 100644
--- a/core/l10n/is.php
+++ b/core/l10n/is.php
@@ -42,6 +42,8 @@ $TRANSLATIONS = array(
"Yes" => "Já",
"No" => "Nei",
"Ok" => "Ã lagi",
+"_{count} file conflict_::_{count} file conflicts_" => array("",""),
+"Cancel" => "Hætta við",
"The object type is not specified." => "Tegund ekki tilgreind",
"Error" => "Villa",
"The app name is not specified." => "Nafn forrits ekki tilgreint",
diff --git a/core/l10n/it.php b/core/l10n/it.php
index a8f9a6901f84f02f2a2c72ad1924636cac6c287f..94395b0226126da364328c51dc1b15ced55d0db1 100644
--- a/core/l10n/it.php
+++ b/core/l10n/it.php
@@ -16,6 +16,11 @@ $TRANSLATIONS = array(
"Error adding %s to favorites." => "Errore durante l'aggiunta di %s ai preferiti.",
"No categories selected for deletion." => "Nessuna categoria selezionata per l'eliminazione.",
"Error removing %s from favorites." => "Errore durante la rimozione di %s dai preferiti.",
+"No image or file provided" => "Non è stata fornita alcun immagine o file",
+"Unknown filetype" => "Tipo di file sconosciuto",
+"Invalid image" => "Immagine non valida",
+"No temporary profile picture available, try again" => "Nessuna immagine di profilo provvisoria disponibile, riprova",
+"No crop data provided" => "Dati di ritaglio non forniti",
"Sunday" => "Domenica",
"Monday" => "Lunedì",
"Tuesday" => "Martedì",
@@ -48,9 +53,20 @@ $TRANSLATIONS = array(
"last year" => "anno scorso",
"years ago" => "anni fa",
"Choose" => "Scegli",
+"Error loading file picker template: {error}" => "Errore nel caricamento del modello del selettore file: {error}",
"Yes" => "Sì",
"No" => "No",
"Ok" => "Ok",
+"Error loading message template: {error}" => "Errore nel caricamento del modello di messaggio: {error}",
+"_{count} file conflict_::_{count} file conflicts_" => array("{count} file in conflitto","{count} file in conflitto"),
+"One file conflict" => "Un conflitto tra file",
+"Which files do you want to keep?" => "Quali file vuoi mantenere?",
+"If you select both versions, the copied file will have a number added to its name." => "Se selezioni entrambe le versioni, verrà aggiunto un numero al nome del file copiato.",
+"Cancel" => "Annulla",
+"Continue" => "Continua",
+"(all selected)" => "(tutti selezionati)",
+"({count} selected)" => "({count} selezionati)",
+"Error loading file exists template" => "Errore durante il caricamento del modello del file esistente",
"The object type is not specified." => "Il tipo di oggetto non è specificato.",
"Error" => "Errore",
"The app name is not specified." => "Il nome dell'applicazione non è specificato.",
diff --git a/core/l10n/ja_JP.php b/core/l10n/ja_JP.php
index 343fffd09b06e47ddc654f3f9cc0eaf0a249e501..0baab441f956bd62c1536c1a53a1cf9e3cceac05 100644
--- a/core/l10n/ja_JP.php
+++ b/core/l10n/ja_JP.php
@@ -16,6 +16,10 @@ $TRANSLATIONS = array(
"Error adding %s to favorites." => "ãŠæ°—ã«å…¥ã‚Šã« %s ã‚’è¿½åŠ ã‚¨ãƒ©ãƒ¼",
"No categories selected for deletion." => "削除ã™ã‚‹ã‚«ãƒ†ã‚´ãƒªãŒé¸æŠžã•ã‚Œã¦ã„ã¾ã›ã‚“。",
"Error removing %s from favorites." => "ãŠæ°—ã«å…¥ã‚Šã‹ã‚‰ %s ã®å‰Šé™¤ã‚¨ãƒ©ãƒ¼",
+"No image or file provided" => "ç”»åƒã‚‚ã—ãã¯ãƒ•ã‚¡ã‚¤ãƒ«ãŒæä¾›ã•ã‚Œã¦ã„ã¾ã›ã‚“",
+"Unknown filetype" => "ä¸æ˜Žãªãƒ•ã‚¡ã‚¤ãƒ«ã‚¿ã‚¤ãƒ—",
+"Invalid image" => "無効ãªç”»åƒ",
+"No temporary profile picture available, try again" => "一時的ãªãƒ—ãƒãƒ•ã‚¡ã‚¤ãƒ«ç”¨ç”»åƒãŒåˆ©ç”¨ã§ãã¾ã›ã‚“。もã†ä¸€åº¦è©¦ã—ã¦ä¸‹ã•ã„",
"Sunday" => "æ—¥",
"Monday" => "月",
"Tuesday" => "ç«",
@@ -48,9 +52,13 @@ $TRANSLATIONS = array(
"last year" => "一年å‰",
"years ago" => "å¹´å‰",
"Choose" => "é¸æŠž",
+"Error loading file picker template: {error}" => "ファイルé¸æŠžãƒ†ãƒ³ãƒ—レートã®èªã¿è¾¼ã¿ã‚¨ãƒ©ãƒ¼: {error}",
"Yes" => "ã¯ã„",
"No" => "ã„ã„ãˆ",
"Ok" => "OK",
+"Error loading message template: {error}" => "メッセージテンプレートã®èªã¿è¾¼ã¿ã‚¨ãƒ©ãƒ¼: {error}",
+"_{count} file conflict_::_{count} file conflicts_" => array(""),
+"Cancel" => "ã‚ャンセル",
"The object type is not specified." => "オブジェクタイプãŒæŒ‡å®šã•ã‚Œã¦ã„ã¾ã›ã‚“。",
"Error" => "エラー",
"The app name is not specified." => "アプリåãŒã—ã¦ã„ã•ã‚Œã¦ã„ã¾ã›ã‚“。",
diff --git a/core/l10n/ka.php b/core/l10n/ka.php
index b6700f00f94c26b8960dd03024e53769013e6722..4805886c32c83aa141cd0b64d45256261e289c54 100644
--- a/core/l10n/ka.php
+++ b/core/l10n/ka.php
@@ -7,6 +7,7 @@ $TRANSLATIONS = array(
"yesterday" => "გუშინ",
"_%n day ago_::_%n days ago_" => array(""),
"_%n month ago_::_%n months ago_" => array(""),
+"_{count} file conflict_::_{count} file conflicts_" => array(""),
"Password" => "პáƒáƒ áƒáƒšáƒ˜",
"Personal" => "პერსáƒáƒœáƒ",
"Users" => "მáƒáƒ›áƒ®áƒ›áƒáƒ ებლები",
diff --git a/core/l10n/ka_GE.php b/core/l10n/ka_GE.php
index 15cacc8b218c13728b2438eecd1970034e15c916..e051f9ce1d208df3d78cc7e54f3ebc8d40b72f5f 100644
--- a/core/l10n/ka_GE.php
+++ b/core/l10n/ka_GE.php
@@ -44,6 +44,8 @@ $TRANSLATIONS = array(
"Yes" => "კი",
"No" => "áƒáƒ áƒ",
"Ok" => "დიáƒáƒ®",
+"_{count} file conflict_::_{count} file conflicts_" => array(""),
+"Cancel" => "უáƒáƒ ყáƒáƒ¤áƒ",
"The object type is not specified." => "áƒáƒ‘იექტის ტიპი áƒáƒ áƒáƒ ის მითითებული.",
"Error" => "შეცდáƒáƒ›áƒ",
"The app name is not specified." => "áƒáƒžáƒšáƒ˜áƒ™áƒáƒªáƒ˜áƒ˜áƒ¡ სáƒáƒ®áƒ”ლი áƒáƒ áƒáƒ ის მითითებული.",
diff --git a/core/l10n/km.php b/core/l10n/km.php
index 556cca20dac815a4de6b07d0e85de9636715742e..dbedde7e637fc27c397b763e7b58eeca8338d6d2 100644
--- a/core/l10n/km.php
+++ b/core/l10n/km.php
@@ -3,6 +3,7 @@ $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("")
+"_%n month ago_::_%n months ago_" => array(""),
+"_{count} file conflict_::_{count} file conflicts_" => array("")
);
$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/kn.php b/core/l10n/kn.php
index 556cca20dac815a4de6b07d0e85de9636715742e..dbedde7e637fc27c397b763e7b58eeca8338d6d2 100644
--- a/core/l10n/kn.php
+++ b/core/l10n/kn.php
@@ -3,6 +3,7 @@ $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("")
+"_%n month ago_::_%n months ago_" => array(""),
+"_{count} file conflict_::_{count} file conflicts_" => array("")
);
$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/ko.php b/core/l10n/ko.php
index 0265f38dc07ec6322dba2bffc8ef156a227b5015..947f5e9ee26492fb4d4a071921407d12a3df99d9 100644
--- a/core/l10n/ko.php
+++ b/core/l10n/ko.php
@@ -44,6 +44,8 @@ $TRANSLATIONS = array(
"Yes" => "예",
"No" => "아니요",
"Ok" => "승ë½",
+"_{count} file conflict_::_{count} file conflicts_" => array(""),
+"Cancel" => "취소",
"The object type is not specified." => "ê°ì²´ ìœ í˜•ì´ ì§€ì •ë˜ì§€ 않았습니다.",
"Error" => "오류",
"The app name is not specified." => "앱 ì´ë¦„ì´ ì§€ì •ë˜ì§€ 않았습니다.",
diff --git a/core/l10n/ku_IQ.php b/core/l10n/ku_IQ.php
index 5ce6ce9c821e3e634ca3d51e5500da3c9839b581..2feb6db272318fe7e6a9187fdb042858a1edf1a4 100644
--- a/core/l10n/ku_IQ.php
+++ b/core/l10n/ku_IQ.php
@@ -5,6 +5,7 @@ $TRANSLATIONS = 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("",""),
"Error" => "هه‌ڵه",
"Share" => "هاوبەشی کردن",
"Password" => "وشەی تێپەربو",
diff --git a/core/l10n/lb.php b/core/l10n/lb.php
index 6a0b41b667971fbae287e69d68996ff5088b4094..9e127d867c68b8128690fc1d707c1838a0c48c19 100644
--- a/core/l10n/lb.php
+++ b/core/l10n/lb.php
@@ -45,6 +45,8 @@ $TRANSLATIONS = array(
"Yes" => "Jo",
"No" => "Nee",
"Ok" => "OK",
+"_{count} file conflict_::_{count} file conflicts_" => array("",""),
+"Cancel" => "Ofbriechen",
"The object type is not specified." => "Den Typ vum Object ass net uginn.",
"Error" => "Feeler",
"The app name is not specified." => "Den Numm vun der App ass net uginn.",
diff --git a/core/l10n/lt_LT.php b/core/l10n/lt_LT.php
index 7b5ad39b81ef074eb6f4038db2a4d409b62e19be..492aee12c1d8a150202aa1462e0caa7dd87b71bc 100644
--- a/core/l10n/lt_LT.php
+++ b/core/l10n/lt_LT.php
@@ -16,6 +16,11 @@ $TRANSLATIONS = array(
"Error adding %s to favorites." => "Klaida perkeliant %s į jūsų mėgstamiausius.",
"No categories selected for deletion." => "Trynimui nepasirinkta jokia kategorija.",
"Error removing %s from favorites." => "Klaida ištrinant %s iš jūsų mėgstamiausius.",
+"No image or file provided" => "Nenurodytas paveikslÄ—lis ar failas",
+"Unknown filetype" => "Nežinomas failo tipas",
+"Invalid image" => "Netinkamas paveikslÄ—lis",
+"No temporary profile picture available, try again" => "NÄ—ra laikino profilio paveikslÄ—lio, bandykite dar kartÄ…",
+"No crop data provided" => "Nenurodyti apkirpimo duomenys",
"Sunday" => "Sekmadienis",
"Monday" => "Pirmadienis",
"Tuesday" => "Antradienis",
@@ -48,9 +53,13 @@ $TRANSLATIONS = array(
"last year" => "praeitais metais",
"years ago" => "prieš metus",
"Choose" => "Pasirinkite",
+"Error loading file picker template: {error}" => "Klaida įkeliant failo parinkimo ruošinį: {error}",
"Yes" => "Taip",
"No" => "Ne",
"Ok" => "Gerai",
+"Error loading message template: {error}" => "Klaida įkeliant žinutės ruošinį: {error}",
+"_{count} file conflict_::_{count} file conflicts_" => array("","",""),
+"Cancel" => "Atšaukti",
"The object type is not specified." => "Objekto tipas nenurodytas.",
"Error" => "Klaida",
"The app name is not specified." => "Nenurodytas programos pavadinimas.",
diff --git a/core/l10n/lv.php b/core/l10n/lv.php
index 465a497e8800a84a188e7cc224c2974fb8c12915..6bdbeaf5e209e3e2b1e0c40ce05ab2aeed744267 100644
--- a/core/l10n/lv.php
+++ b/core/l10n/lv.php
@@ -45,6 +45,8 @@ $TRANSLATIONS = array(
"Yes" => "JÄ",
"No" => "NÄ“",
"Ok" => "Labi",
+"_{count} file conflict_::_{count} file conflicts_" => array("","",""),
+"Cancel" => "Atcelt",
"The object type is not specified." => "Nav norÄdÄ«ts objekta tips.",
"Error" => "Kļūda",
"The app name is not specified." => "Nav norÄdÄ«ts lietotnes nosaukums.",
diff --git a/core/l10n/mk.php b/core/l10n/mk.php
index 6a8ec50061c6b29dae56fb6a743866be3110ef83..1c998bb636a9ffed923cc8d8c3f32ddcd9d68258 100644
--- a/core/l10n/mk.php
+++ b/core/l10n/mk.php
@@ -43,6 +43,8 @@ $TRANSLATIONS = array(
"Yes" => "Да",
"No" => "Ðе",
"Ok" => "Во ред",
+"_{count} file conflict_::_{count} file conflicts_" => array("",""),
+"Cancel" => "Откажи",
"The object type is not specified." => "Ðе е Ñпецифициран типот на објект.",
"Error" => "Грешка",
"The app name is not specified." => "Името на апликацијата не е Ñпецифицирано.",
diff --git a/core/l10n/ml_IN.php b/core/l10n/ml_IN.php
index 93c8e33f3e2d95d19676fafd4be3416cee37855d..ffcdde48d47cbbe4730b36aec880f7e1642688fb 100644
--- a/core/l10n/ml_IN.php
+++ b/core/l10n/ml_IN.php
@@ -3,6 +3,7 @@ $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("","")
+"_%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/ms_MY.php b/core/l10n/ms_MY.php
index fc3698d58d168f628023e62a620192eccc6d9577..5aea25a3fd40d1a437d20c4e1d8c50d87c9d3e59 100644
--- a/core/l10n/ms_MY.php
+++ b/core/l10n/ms_MY.php
@@ -29,6 +29,8 @@ $TRANSLATIONS = array(
"Yes" => "Ya",
"No" => "Tidak",
"Ok" => "Ok",
+"_{count} file conflict_::_{count} file conflicts_" => array(""),
+"Cancel" => "Batal",
"Error" => "Ralat",
"Share" => "Kongsi",
"Password" => "Kata laluan",
diff --git a/core/l10n/my_MM.php b/core/l10n/my_MM.php
index 1016ec5f512e7807f365133e3178b266d6e94956..0a07d151185c28b16952c92a3fbd2f218fc5dc4f 100644
--- a/core/l10n/my_MM.php
+++ b/core/l10n/my_MM.php
@@ -28,6 +28,8 @@ $TRANSLATIONS = array(
"Yes" => "ဟုá€á€º",
"No" => "မဟုá€á€ºá€˜á€°á€¸",
"Ok" => "အá€á€¯á€€á€±",
+"_{count} file conflict_::_{count} file conflicts_" => array(""),
+"Cancel" => "ပယ်ဖျက်မည်",
"Password" => "စကားá€á€¾á€€á€º",
"Set expiration date" => "သက်á€á€™á€ºá€¸á€€á€¯á€”်ဆုံးမည့်ရက်သá€á€ºá€™á€¾á€á€ºá€™á€Šá€º",
"Expiration date" => "သက်á€á€™á€ºá€¸á€€á€¯á€”်ဆုံးမည့်ရက်",
diff --git a/core/l10n/nb_NO.php b/core/l10n/nb_NO.php
index 132b65daab2bf9e8550e416704aa0db81d7cdf53..01dec8855743dcc8ae57e9e1c9b52404b4208961 100644
--- a/core/l10n/nb_NO.php
+++ b/core/l10n/nb_NO.php
@@ -40,6 +40,8 @@ $TRANSLATIONS = array(
"Yes" => "Ja",
"No" => "Nei",
"Ok" => "Ok",
+"_{count} file conflict_::_{count} file conflicts_" => array("",""),
+"Cancel" => "Avbryt",
"Error" => "Feil",
"Shared" => "Delt",
"Share" => "Del",
diff --git a/core/l10n/ne.php b/core/l10n/ne.php
index 93c8e33f3e2d95d19676fafd4be3416cee37855d..ffcdde48d47cbbe4730b36aec880f7e1642688fb 100644
--- a/core/l10n/ne.php
+++ b/core/l10n/ne.php
@@ -3,6 +3,7 @@ $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("","")
+"_%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/nl.php b/core/l10n/nl.php
index e181eee702ab547f7cab164f379300ff61688fea..3dcdeaedec243af7ae09404f4161464fd1db9e3e 100644
--- a/core/l10n/nl.php
+++ b/core/l10n/nl.php
@@ -2,6 +2,12 @@
$TRANSLATIONS = array(
"%s shared »%s« with you" => "%s deelde »%s« met jou",
"group" => "groep",
+"Turned on maintenance mode" => "Onderhoudsmodus ingeschakeld",
+"Turned off maintenance mode" => "Onderhoudsmodus uitgeschakeld",
+"Updated database" => "Database bijgewerkt",
+"Updating filecache, this may take really long..." => "Bijwerken bestandscache. Dit kan even duren...",
+"Updated filecache" => "Bestandscache bijgewerkt",
+"... %d%% done ..." => "... %d%% gereed ...",
"Category type not provided." => "Categorie type niet opgegeven.",
"No category to add?" => "Geen categorie om toe te voegen?",
"This category already exists: %s" => "Deze categorie bestaat al: %s",
@@ -10,6 +16,11 @@ $TRANSLATIONS = array(
"Error adding %s to favorites." => "Toevoegen van %s aan favorieten is mislukt.",
"No categories selected for deletion." => "Geen categorie geselecteerd voor verwijdering.",
"Error removing %s from favorites." => "Verwijderen %s van favorieten is mislukt.",
+"No image or file provided" => "Geen afbeelding of bestand opgegeven",
+"Unknown filetype" => "Onbekend bestandsformaat",
+"Invalid image" => "Ongeldige afbeelding",
+"No temporary profile picture available, try again" => "Geen tijdelijke profielafbeelding beschikbaar. Probeer het opnieuw",
+"No crop data provided" => "Geen bijsnijdingsgegevens opgegeven",
"Sunday" => "zondag",
"Monday" => "maandag",
"Tuesday" => "dinsdag",
@@ -42,9 +53,13 @@ $TRANSLATIONS = array(
"last year" => "vorig jaar",
"years ago" => "jaar geleden",
"Choose" => "Kies",
+"Error loading file picker template: {error}" => "Fout bij laden bestandenselecteur sjabloon: {error}",
"Yes" => "Ja",
"No" => "Nee",
"Ok" => "Ok",
+"Error loading message template: {error}" => "Fout bij laden berichtensjabloon: {error}",
+"_{count} file conflict_::_{count} file conflicts_" => array("",""),
+"Cancel" => "Annuleer",
"The object type is not specified." => "Het object type is niet gespecificeerd.",
"Error" => "Fout",
"The app name is not specified." => "De app naam is niet gespecificeerd.",
diff --git a/core/l10n/nn_NO.php b/core/l10n/nn_NO.php
index 86c46471a1413412778722ed0c971bfd986df751..d596605dbcd4c10bacea5c647be200592b379c65 100644
--- a/core/l10n/nn_NO.php
+++ b/core/l10n/nn_NO.php
@@ -16,6 +16,11 @@ $TRANSLATIONS = array(
"Error adding %s to favorites." => "Klarte ikkje leggja til %s i favorittar.",
"No categories selected for deletion." => "Ingen kategoriar valt for sletting.",
"Error removing %s from favorites." => "Klarte ikkje fjerna %s frå favorittar.",
+"No image or file provided" => "Inga bilete eller fil gitt",
+"Unknown filetype" => "Ukjend filtype",
+"Invalid image" => "Ugyldig bilete",
+"No temporary profile picture available, try again" => "Inga midlertidig profilbilete tilgjengeleg, prøv igjen",
+"No crop data provided" => "Ingen beskjeringsdata gitt",
"Sunday" => "Søndag",
"Monday" => "MÃ¥ndag",
"Tuesday" => "Tysdag",
@@ -48,9 +53,20 @@ $TRANSLATIONS = array(
"last year" => "i fjor",
"years ago" => "Ã¥r sidan",
"Choose" => "Vel",
+"Error loading file picker template: {error}" => "Klarte ikkje å lasta filplukkarmal: {error}",
"Yes" => "Ja",
"No" => "Nei",
"Ok" => "Greitt",
+"Error loading message template: {error}" => "Klarte ikkje å lasta meldingsmal: {error}",
+"_{count} file conflict_::_{count} file conflicts_" => array("{count} filkonflikt","{count} filkonfliktar"),
+"One file conflict" => "Éin filkonflikt",
+"Which files do you want to keep?" => "Kva filer vil du spara?",
+"If you select both versions, the copied file will have a number added to its name." => "Viss du vel begge utgåvene, vil den kopierte fila få eit tal lagt til namnet.",
+"Cancel" => "Avbryt",
+"Continue" => "GÃ¥ vidare",
+"(all selected)" => "(alle valte)",
+"({count} selected)" => "({count} valte)",
+"Error loading file exists template" => "Klarte ikkje å lasta fil-finst-mal",
"The object type is not specified." => "Objekttypen er ikkje spesifisert.",
"Error" => "Feil",
"The app name is not specified." => "Programnamnet er ikkje spesifisert.",
diff --git a/core/l10n/nqo.php b/core/l10n/nqo.php
index 556cca20dac815a4de6b07d0e85de9636715742e..dbedde7e637fc27c397b763e7b58eeca8338d6d2 100644
--- a/core/l10n/nqo.php
+++ b/core/l10n/nqo.php
@@ -3,6 +3,7 @@ $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("")
+"_%n month ago_::_%n months ago_" => array(""),
+"_{count} file conflict_::_{count} file conflicts_" => array("")
);
$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/oc.php b/core/l10n/oc.php
index 0ca3cc427a01b9ac14985e953d5805683b18a23e..fd84d0b2e3079a8c627622861cb766822caca378 100644
--- a/core/l10n/oc.php
+++ b/core/l10n/oc.php
@@ -38,6 +38,8 @@ $TRANSLATIONS = array(
"Yes" => "Ã’c",
"No" => "Non",
"Ok" => "D'accòrdi",
+"_{count} file conflict_::_{count} file conflicts_" => array("",""),
+"Cancel" => "Annula",
"Error" => "Error",
"Share" => "Parteja",
"Error while sharing" => "Error al partejar",
diff --git a/core/l10n/pa.php b/core/l10n/pa.php
new file mode 100644
index 0000000000000000000000000000000000000000..c8078d06c73149a17a2995a62b66cde1bb33c3b0
--- /dev/null
+++ b/core/l10n/pa.php
@@ -0,0 +1,47 @@
+<?php
+$TRANSLATIONS = array(
+"Sunday" => "à¨à¨¤à¨µà¨¾à¨°",
+"Monday" => "ਸੋਮਵਾਰ",
+"Tuesday" => "ਮੰਗਲਵਾਰ",
+"Wednesday" => "ਬà©à©±à¨§à¨µà¨¾à¨°",
+"Thursday" => "ਵੀਰਵਾਰ",
+"Friday" => "ਸ਼à©à©±à¨•à¨°à¨µà¨¾à¨°",
+"Saturday" => "ਸ਼ਨਿੱਚਰਵਾਰ",
+"January" => "ਜਨਵਰੀ",
+"February" => "ਫਰਵਰੀ",
+"March" => "ਮਾਰਚ",
+"April" => "ਅਪਰੈ",
+"May" => "ਮਈ",
+"June" => "ਜੂਨ",
+"July" => "ਜà©à¨²à¨¾à¨ˆ",
+"August" => "ਅਗਸਤ",
+"September" => "ਸਤੰਬ",
+"October" => "ਅਕਤੂਬਰ",
+"November" => "ਨਵੰਬ",
+"December" => "ਦਸੰਬਰ",
+"Settings" => "ਸੈਟਿੰਗ",
+"seconds ago" => "ਸਕਿੰਟ ਪਹਿਲਾਂ",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
+"today" => "ਅੱਜ",
+"yesterday" => "ਕੱਲà©à¨¹",
+"_%n day ago_::_%n days ago_" => array("",""),
+"last month" => "ਪਿਛਲੇ ਮਹੀਨੇ",
+"_%n month ago_::_%n months ago_" => array("",""),
+"months ago" => "ਮਹੀਨੇ ਪਹਿਲਾਂ",
+"last year" => "ਪਿਛਲੇ ਸਾਲ",
+"years ago" => "ਸਾਲਾਂ ਪਹਿਲਾਂ",
+"Choose" => "ਚà©à¨£à©‹",
+"Yes" => "ਹਾਂ",
+"No" => "ਨਹੀਂ",
+"Ok" => "ਠੀਕ ਹੈ",
+"_{count} file conflict_::_{count} file conflicts_" => array("",""),
+"Cancel" => "ਰੱਦ ਕਰੋ",
+"Error" => "ਗਲ",
+"Share" => "ਸਾਂà¨à¨¾ ਕਰੋ",
+"Password" => "ਪਾਸਵਰ",
+"Send" => "à¨à©‡à¨œà©‹",
+"Username" => "ਯੂਜ਼ਰ-ਨਾਂ",
+"Security Warning" => "ਸà©à¨°à©±à¨–ਿਆ ਚੇਤਾਵਨੀ"
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/pl.php b/core/l10n/pl.php
index deb4b4c81c813b43459513be889710071618004b..621038f79f7a2de7ec1de05ec5c822d5128e7a73 100644
--- a/core/l10n/pl.php
+++ b/core/l10n/pl.php
@@ -51,6 +51,8 @@ $TRANSLATIONS = array(
"Yes" => "Tak",
"No" => "Nie",
"Ok" => "OK",
+"_{count} file conflict_::_{count} file conflicts_" => array("","",""),
+"Cancel" => "Anuluj",
"The object type is not specified." => "Nie określono typu obiektu.",
"Error" => "BÅ‚Ä…d",
"The app name is not specified." => "Nie określono nazwy aplikacji.",
diff --git a/core/l10n/pt_BR.php b/core/l10n/pt_BR.php
index f758c0e9bc36a40e128954d4df36f41363e6ba61..5f8903a8ff5071779af5b8fb24f0f6afac6066cb 100644
--- a/core/l10n/pt_BR.php
+++ b/core/l10n/pt_BR.php
@@ -16,6 +16,11 @@ $TRANSLATIONS = array(
"Error adding %s to favorites." => "Erro ao adicionar %s aos favoritos.",
"No categories selected for deletion." => "Nenhuma categoria selecionada para remoção.",
"Error removing %s from favorites." => "Erro ao remover %s dos favoritos.",
+"No image or file provided" => "Nenhuma imagem ou arquivo fornecido",
+"Unknown filetype" => "Tipo de arquivo desconhecido",
+"Invalid image" => "Imagem inválida",
+"No temporary profile picture available, try again" => "Sem imagem no perfil temporário disponÃvel, tente novamente",
+"No crop data provided" => "Nenhum dado para coleta foi fornecido",
"Sunday" => "Domingo",
"Monday" => "Segunda-feira",
"Tuesday" => "Terça-feira",
@@ -48,9 +53,20 @@ $TRANSLATIONS = array(
"last year" => "último ano",
"years ago" => "anos atrás",
"Choose" => "Escolha",
+"Error loading file picker template: {error}" => "Erro no seletor de carregamento modelo de arquivos: {error}",
"Yes" => "Sim",
"No" => "Não",
"Ok" => "Ok",
+"Error loading message template: {error}" => "Erro no carregamento de modelo de mensagem: {error}",
+"_{count} file conflict_::_{count} file conflicts_" => array("{count} conflito de arquivo","{count} conflitos de arquivos"),
+"One file conflict" => "Conflito em um arquivo",
+"Which files do you want to keep?" => "Qual arquivo você quer manter?",
+"If you select both versions, the copied file will have a number added to its name." => "Se você selecionar ambas as versões, o arquivo copiado terá um número adicionado ao seu nome.",
+"Cancel" => "Cancelar",
+"Continue" => "Continuar",
+"(all selected)" => "(todos os selecionados)",
+"({count} selected)" => "({count} selecionados)",
+"Error loading file exists template" => "Erro ao carregar arquivo existe modelo",
"The object type is not specified." => "O tipo de objeto não foi especificado.",
"Error" => "Erro",
"The app name is not specified." => "O nome do app não foi especificado.",
diff --git a/core/l10n/pt_PT.php b/core/l10n/pt_PT.php
index 4554b64d4054f80feb7cff996747c04f865efa81..977d8e38cb27536e25a2f74c60f3c71c7fef23da 100644
--- a/core/l10n/pt_PT.php
+++ b/core/l10n/pt_PT.php
@@ -16,6 +16,10 @@ $TRANSLATIONS = array(
"Error adding %s to favorites." => "Erro a adicionar %s aos favoritos",
"No categories selected for deletion." => "Nenhuma categoria seleccionada para eliminar.",
"Error removing %s from favorites." => "Erro a remover %s dos favoritos.",
+"No image or file provided" => "Não foi selecionado nenhum ficheiro para importar",
+"Unknown filetype" => "Ficheiro desconhecido",
+"Invalid image" => "Imagem inválida",
+"No temporary profile picture available, try again" => "Foto temporária de perfil indisponÃvel, tente novamente",
"Sunday" => "Domingo",
"Monday" => "Segunda",
"Tuesday" => "Terça",
@@ -51,6 +55,9 @@ $TRANSLATIONS = array(
"Yes" => "Sim",
"No" => "Não",
"Ok" => "Ok",
+"Error loading message template: {error}" => "Erro ao carregar o template: {error}",
+"_{count} file conflict_::_{count} file conflicts_" => array("",""),
+"Cancel" => "Cancelar",
"The object type is not specified." => "O tipo de objecto não foi especificado",
"Error" => "Erro",
"The app name is not specified." => "O nome da aplicação não foi especificado",
diff --git a/core/l10n/ro.php b/core/l10n/ro.php
index 8b274cb140942ebb6bfaf0dec8932a767d54adaa..12fbfa5f0ca4a0bc609a3fa262ada234e8db6560 100644
--- a/core/l10n/ro.php
+++ b/core/l10n/ro.php
@@ -2,6 +2,7 @@
$TRANSLATIONS = array(
"%s shared »%s« with you" => "%s Partajat »%s« cu tine de",
"group" => "grup",
+"Updated database" => "Bază de date actualizată",
"Category type not provided." => "Tipul de categorie nu a fost specificat.",
"No category to add?" => "Nici o categorie de adăugat?",
"This category already exists: %s" => "Această categorie deja există: %s",
@@ -10,6 +11,8 @@ $TRANSLATIONS = array(
"Error adding %s to favorites." => "Eroare la adăugarea %s la favorite.",
"No categories selected for deletion." => "Nicio categorie selectată pentru ștergere.",
"Error removing %s from favorites." => "Eroare la ștergerea %s din favorite.",
+"Unknown filetype" => "Tip fișier necunoscut",
+"Invalid image" => "Imagine invalidă",
"Sunday" => "Duminică",
"Monday" => "Luni",
"Tuesday" => "Marți",
@@ -31,11 +34,11 @@ $TRANSLATIONS = array(
"December" => "Decembrie",
"Settings" => "Setări",
"seconds ago" => "secunde în urmă",
-"_%n minute ago_::_%n minutes ago_" => array("","",""),
-"_%n hour ago_::_%n hours ago_" => array("","",""),
+"_%n minute ago_::_%n minutes ago_" => array("acum %n minut","acum %n minute","acum %n minute"),
+"_%n hour ago_::_%n hours ago_" => array("acum %n oră","acum %n ore","acum %n ore"),
"today" => "astăzi",
"yesterday" => "ieri",
-"_%n day ago_::_%n days ago_" => array("","",""),
+"_%n day ago_::_%n days ago_" => array("acum %n zi","acum %n zile","acum %n zile"),
"last month" => "ultima lună",
"_%n month ago_::_%n months ago_" => array("","",""),
"months ago" => "luni în urmă",
@@ -45,6 +48,12 @@ $TRANSLATIONS = array(
"Yes" => "Da",
"No" => "Nu",
"Ok" => "Ok",
+"_{count} file conflict_::_{count} file conflicts_" => array("","",""),
+"One file conflict" => "Un conflict de fișier",
+"Which files do you want to keep?" => "Ce fișiere vrei să păstrezi?",
+"If you select both versions, the copied file will have a number added to its name." => "Dacă alegi ambele versiuni, fișierul copiat va avea un număr atașat la denumirea sa.",
+"Cancel" => "Anulare",
+"Continue" => "Continuă",
"The object type is not specified." => "Tipul obiectului nu este specificat.",
"Error" => "Eroare",
"The app name is not specified." => "Numele aplicației nu este specificat.",
diff --git a/core/l10n/ru.php b/core/l10n/ru.php
index 0fe2e860917be03175b5893e4c1b346899fec712..1b3133a1a6f002ec85bfd565630020f1f1ba4f34 100644
--- a/core/l10n/ru.php
+++ b/core/l10n/ru.php
@@ -2,6 +2,12 @@
$TRANSLATIONS = array(
"%s shared »%s« with you" => "%s поделилÑÑ Â»%s« Ñ Ð²Ð°Ð¼Ð¸",
"group" => "группа",
+"Turned on maintenance mode" => "Режим отладки включён",
+"Turned off maintenance mode" => "Режим отладки отключён",
+"Updated database" => "База данных обновлена",
+"Updating filecache, this may take really long..." => "Обновление файлового кÑша, Ñто может занÑÑ‚ÑŒ некоторое времÑ...",
+"Updated filecache" => "Обновлен файловый кÑш",
+"... %d%% done ..." => "... %d%% завершено ...",
"Category type not provided." => "Тип категории не предоÑтавлен",
"No category to add?" => "Ðет категорий Ð´Ð»Ñ Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ñ?",
"This category already exists: %s" => "Ðта ÐºÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ ÑƒÐ¶Ðµ ÑущеÑтвует: %s",
@@ -10,6 +16,11 @@ $TRANSLATIONS = array(
"Error adding %s to favorites." => "Ошибка Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ñ %s в избранное",
"No categories selected for deletion." => "Ðет категорий Ð´Ð»Ñ ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ.",
"Error removing %s from favorites." => "Ошибка ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ %s из избранного",
+"No image or file provided" => "Ðе указано изображение или файл",
+"Unknown filetype" => "ÐеизвеÑтный тип файла",
+"Invalid image" => "Изображение повреждено",
+"No temporary profile picture available, try again" => "Ð’Ñ€ÐµÐ¼ÐµÐ½Ð½Ð°Ñ ÐºÐ°Ñ€Ñ‚Ð¸Ð½ÐºÐ° Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ñ Ð½ÐµÐ´Ð¾Ñтупна, повторите попытку",
+"No crop data provided" => "Ðе указана Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾ кадрировании",
"Sunday" => "ВоÑкреÑенье",
"Monday" => "Понедельник",
"Tuesday" => "Вторник",
@@ -42,9 +53,20 @@ $TRANSLATIONS = array(
"last year" => "в прошлом году",
"years ago" => "неÑколько лет назад",
"Choose" => "Выбрать",
+"Error loading file picker template: {error}" => "Ошибка при загрузке шаблона выбора файлов: {error}",
"Yes" => "Да",
"No" => "Ðет",
"Ok" => "Ок",
+"Error loading message template: {error}" => "Ошибка загрузки шаблона Ñообщений: {error}",
+"_{count} file conflict_::_{count} file conflicts_" => array("{count} конфликт в файлах","{count} конфликта в файлах","{count} конфликтов в файлах"),
+"One file conflict" => "Один конфликт в файлах",
+"Which files do you want to keep?" => "Какие файлы вы хотите Ñохранить?",
+"If you select both versions, the copied file will have a number added to its name." => "При выборе обоих верÑий, к названию копируемого файла будет добавлена цифра",
+"Cancel" => "Отменить",
+"Continue" => "Продолжить",
+"(all selected)" => "(выбраны вÑе)",
+"({count} selected)" => "({count} выбрано)",
+"Error loading file exists template" => "Ошибка при загрузке шаблона ÑущеÑтвующего файла",
"The object type is not specified." => "Тип объекта не указан",
"Error" => "Ошибка",
"The app name is not specified." => "Ð˜Ð¼Ñ Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð½Ðµ указано",
@@ -118,8 +140,8 @@ $TRANSLATIONS = array(
"Data folder" => "Ð”Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ñ Ð´Ð°Ð½Ð½Ñ‹Ð¼Ð¸",
"Configure the database" => "ÐаÑтройка базы данных",
"will be used" => "будет иÑпользовано",
-"Database user" => "Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð´Ð»Ñ Ð±Ð°Ð·Ñ‹ данных",
-"Database password" => "Пароль Ð´Ð»Ñ Ð±Ð°Ð·Ñ‹ данных",
+"Database user" => "Пользователь базы данных",
+"Database password" => "Пароль базы данных",
"Database name" => "Ðазвание базы данных",
"Database tablespace" => "Табличое проÑтранÑтво базы данных",
"Database host" => "ХоÑÑ‚ базы данных",
diff --git a/core/l10n/si_LK.php b/core/l10n/si_LK.php
index 184566b5f1cabc1a1fd83e71c413e5454d761af8..2d922657ea0a84274fd22ff4bd4c9e4717f341f3 100644
--- a/core/l10n/si_LK.php
+++ b/core/l10n/si_LK.php
@@ -37,6 +37,8 @@ $TRANSLATIONS = array(
"Yes" => "ඔව්",
"No" => "එපà·",
"Ok" => "හරි",
+"_{count} file conflict_::_{count} file conflicts_" => array("",""),
+"Cancel" => "එපà·",
"Error" => "දà·à·‚යක්",
"Share" => "බෙද෠හද෠ගන්න",
"Share with" => "බෙදà·à¶œà¶±à·Šà¶±",
diff --git a/core/l10n/sk.php b/core/l10n/sk.php
index 7285020288b5ca50fc0a189246f93133fa1727d0..50c3ecaf6643bdaaff33bb2c56213d0b2746b161 100644
--- a/core/l10n/sk.php
+++ b/core/l10n/sk.php
@@ -3,6 +3,7 @@ $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("","","")
+"_%n month ago_::_%n months ago_" => array("","",""),
+"_{count} file conflict_::_{count} file conflicts_" => array("","","")
);
$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/core/l10n/sk_SK.php b/core/l10n/sk_SK.php
index f36445950a14c2b8154c1cdc729e281ab8511693..ac45947459b2d329c94ca7ba8f7b7de55fcfb9fe 100644
--- a/core/l10n/sk_SK.php
+++ b/core/l10n/sk_SK.php
@@ -51,6 +51,8 @@ $TRANSLATIONS = array(
"Yes" => "Ãno",
"No" => "Nie",
"Ok" => "Ok",
+"_{count} file conflict_::_{count} file conflicts_" => array("","",""),
+"Cancel" => "Zrušiť",
"The object type is not specified." => "Nešpecifikovaný typ objektu.",
"Error" => "Chyba",
"The app name is not specified." => "Nešpecifikované meno aplikácie.",
diff --git a/core/l10n/sl.php b/core/l10n/sl.php
index e88b7a6fb5ac8fc534b9b1b5321318ed25f75a19..84cd83fa2f3700e86afc1051670476e9b5d12478 100644
--- a/core/l10n/sl.php
+++ b/core/l10n/sl.php
@@ -45,6 +45,8 @@ $TRANSLATIONS = array(
"Yes" => "Da",
"No" => "Ne",
"Ok" => "V redu",
+"_{count} file conflict_::_{count} file conflicts_" => array("","","",""),
+"Cancel" => "PrekliÄi",
"The object type is not specified." => "Vrsta predmeta ni podana.",
"Error" => "Napaka",
"The app name is not specified." => "Ime programa ni podano.",
diff --git a/core/l10n/sq.php b/core/l10n/sq.php
index c8462573ffa0f7b613c43b9d048eefbe62b82b27..e0fde3f1297bef7a7f25b2b48e7eca307d0ba856 100644
--- a/core/l10n/sq.php
+++ b/core/l10n/sq.php
@@ -51,6 +51,8 @@ $TRANSLATIONS = array(
"Yes" => "Po",
"No" => "Jo",
"Ok" => "Në rregull",
+"_{count} file conflict_::_{count} file conflicts_" => array("",""),
+"Cancel" => "Anulo",
"The object type is not specified." => "Nuk është specifikuar tipi i objektit.",
"Error" => "Veprim i gabuar",
"The app name is not specified." => "Nuk është specifikuar emri i app-it.",
diff --git a/core/l10n/sr.php b/core/l10n/sr.php
index 89c13c4925479a3b42710fab4cc629fd14914340..064984cca5f26d93460040f6253a17ee9a8451c0 100644
--- a/core/l10n/sr.php
+++ b/core/l10n/sr.php
@@ -43,6 +43,8 @@ $TRANSLATIONS = array(
"Yes" => "Да",
"No" => "Ðе",
"Ok" => "У реду",
+"_{count} file conflict_::_{count} file conflicts_" => array("","",""),
+"Cancel" => "Откажи",
"The object type is not specified." => "Ð’Ñ€Ñта објекта није подешена.",
"Error" => "Грешка",
"The app name is not specified." => "Име програма није унето.",
diff --git a/core/l10n/sr@latin.php b/core/l10n/sr@latin.php
index 62ed061ca06dc30e495221d127c85296e2a2eaff..8c0d28ef1c080dfa337379fe64f0ccc6e6343141 100644
--- a/core/l10n/sr@latin.php
+++ b/core/l10n/sr@latin.php
@@ -1,5 +1,13 @@
<?php
$TRANSLATIONS = array(
+"Category type not provided." => "Tip kategorije nije zadan.",
+"No category to add?" => "Bez dodavanja kategorije?",
+"This category already exists: %s" => "Kategorija već postoji: %s",
+"Object type not provided." => "Tip objekta nije zadan.",
+"%s ID not provided." => "%s ID nije zadan.",
+"Error adding %s to favorites." => "Greška u dodavanju %s u omiljeno.",
+"No categories selected for deletion." => "Kategorije za brisanje nisu izabrane.",
+"Error removing %s from favorites." => "Greška u uklanjanju %s iz omiljeno.",
"Sunday" => "Nedelja",
"Monday" => "Ponedeljak",
"Tuesday" => "Utorak",
@@ -20,15 +28,66 @@ $TRANSLATIONS = array(
"November" => "Novembar",
"December" => "Decembar",
"Settings" => "Podešavanja",
+"seconds ago" => "Pre par sekundi",
"_%n minute ago_::_%n minutes ago_" => array("","",""),
"_%n hour ago_::_%n hours ago_" => array("","",""),
+"today" => "Danas",
+"yesterday" => "juÄe",
"_%n day ago_::_%n days ago_" => array("","",""),
+"last month" => "prošlog meseca",
"_%n month ago_::_%n months ago_" => array("","",""),
+"months ago" => "pre nekoliko meseci",
+"last year" => "prošle godine",
+"years ago" => "pre nekoliko godina",
+"Choose" => "Izaberi",
+"Yes" => "Da",
+"No" => "Ne",
+"Ok" => "Ok",
+"_{count} file conflict_::_{count} file conflicts_" => array("","",""),
+"Cancel" => "Otkaži",
+"The object type is not specified." => "Tip objekta nije zadan.",
+"Error" => "Greška",
+"The app name is not specified." => "Ime aplikacije nije precizirano.",
+"The required file {file} is not installed!" => "Potreban fajl {file} nije instaliran!",
+"Shared" => "Deljeno",
+"Share" => "Podeli",
+"Error while sharing" => "Greška pri deljenju",
+"Error while unsharing" => "Greška u uklanjanju deljenja",
+"Error while changing permissions" => "Greška u promeni dozvola",
+"Shared with you and the group {group} by {owner}" => "{owner} podelio sa Vama i grupom {group} ",
+"Shared with you by {owner}" => "Sa vama podelio {owner}",
+"Share with" => "Podeli sa",
+"Share with link" => "Podeli koristei link",
+"Password protect" => "Zaštita lozinkom",
"Password" => "Lozinka",
+"Email link to person" => "Pošalji link e-mailom",
+"Send" => "Pošalji",
+"Set expiration date" => "Datum isteka",
+"Expiration date" => "Datum isteka",
+"Share via email:" => "Deli putem e-maila",
+"No people found" => "Nema pronađenih ljudi",
+"Resharing is not allowed" => "Dalje deljenje nije dozvoljeno",
+"Shared in {item} with {user}" => "Deljeno u {item} sa {user}",
+"Unshare" => "Ukljoni deljenje",
+"can edit" => "dozvoljene izmene",
+"access control" => "kontrola pristupa",
+"create" => "napravi",
+"update" => "ažuriranje",
+"delete" => "brisanje",
+"share" => "deljenje",
+"Password protected" => "Zaštćeno lozinkom",
+"Error unsetting expiration date" => "Greška u uklanjanju datuma isteka",
+"Error setting expiration date" => "Greška u postavljanju datuma isteka",
+"Sending ..." => "Slanje...",
+"Email sent" => "Email poslat",
+"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.",
"Username" => "KorisniÄko ime",
"Request reset" => "Zahtevaj resetovanje",
"Your password was reset" => "Vaša lozinka je resetovana",
+"To login page" => "Na login stranicu",
"New password" => "Nova lozinka",
"Reset password" => "Resetuj lozinku",
"Personal" => "LiÄno",
@@ -36,18 +95,28 @@ $TRANSLATIONS = array(
"Apps" => "Programi",
"Admin" => "Adninistracija",
"Help" => "Pomoć",
+"Access forbidden" => "Pristup zabranjen",
"Cloud not found" => "Oblak nije nađen",
+"Edit categories" => "Izmena kategorija",
+"Add" => "Dodaj",
+"Security Warning" => "Bezbednosno upozorenje",
+"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Vaša PHP verzija je ranjiva na ",
+"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Nije dostupan generator sluÄajnog broja, molimo omogućite PHP OpenSSL ekstenziju.",
+"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Bez generatora sluÄajnog broja napadaÄ može predvideti token za reset lozinke i preuzeti VaÅ¡ nalog.",
+"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Vaši podaci i direktorijumi su verovatno dostupni sa interneta jer .htaccess fajl ne funkcioniše.",
"Create an <strong>admin account</strong>" => "Napravi <strong>administrativni nalog</strong>",
"Advanced" => "Napredno",
-"Data folder" => "Facikla podataka",
+"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",
+"Database tablespace" => "tablespace baze",
"Database host" => "Domaćin baze",
"Finish setup" => "Završi podešavanje",
"Log out" => "Odjava",
+"Automatic logon rejected!" => "Automatsko logovanje odbijeno!",
"Lost your password?" => "Izgubili ste lozinku?",
"remember" => "upamti"
);
diff --git a/core/l10n/sv.php b/core/l10n/sv.php
index b358fdc8a97ced5a7efab7a65e09f3ccf5a69169..660cab0a62078aaaec5b4a3a2032182ccb3c8e78 100644
--- a/core/l10n/sv.php
+++ b/core/l10n/sv.php
@@ -51,6 +51,8 @@ $TRANSLATIONS = array(
"Yes" => "Ja",
"No" => "Nej",
"Ok" => "Ok",
+"_{count} file conflict_::_{count} file conflicts_" => array("",""),
+"Cancel" => "Avbryt",
"The object type is not specified." => "Objekttypen är inte specificerad.",
"Error" => "Fel",
"The app name is not specified." => " Namnet på appen är inte specificerad.",
diff --git a/core/l10n/sw_KE.php b/core/l10n/sw_KE.php
index 93c8e33f3e2d95d19676fafd4be3416cee37855d..ffcdde48d47cbbe4730b36aec880f7e1642688fb 100644
--- a/core/l10n/sw_KE.php
+++ b/core/l10n/sw_KE.php
@@ -3,6 +3,7 @@ $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("","")
+"_%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/ta_LK.php b/core/l10n/ta_LK.php
index a1a286275ebadfbc9727d174c5f5d38fcb62862b..43c7f451e499f7c47c33597483b6433e335ef9b1 100644
--- a/core/l10n/ta_LK.php
+++ b/core/l10n/ta_LK.php
@@ -43,6 +43,8 @@ $TRANSLATIONS = array(
"Yes" => "ஆமà¯",
"No" => "இலà¯à®²à¯ˆ",
"Ok" => "சரி",
+"_{count} file conflict_::_{count} file conflicts_" => array("",""),
+"Cancel" => "இரதà¯à®¤à¯ செயà¯à®•",
"The object type is not specified." => "பொரà¯à®³à¯ வகை கà¯à®±à®¿à®ªà¯à®ªà®¿à®Ÿà®ªà¯à®ªà®Ÿà®µà®¿à®²à¯à®²à¯ˆ.",
"Error" => "வழà¯",
"The app name is not specified." => "செயலி பெயர௠கà¯à®±à®¿à®ªà¯à®ªà®¿à®Ÿà®ªà¯à®ªà®Ÿà®µà®¿à®²à¯à®²à¯ˆ.",
diff --git a/core/l10n/te.php b/core/l10n/te.php
index 2e2bb8f8fe8da655d07678b89dd6a8fcd28bbb33..d54eeabb69223a8b58fac0dbe18dd0da2bf5d34b 100644
--- a/core/l10n/te.php
+++ b/core/l10n/te.php
@@ -35,6 +35,8 @@ $TRANSLATIONS = array(
"Yes" => "à°…à°µà±à°¨à±",
"No" => "కాదà±",
"Ok" => "సరే",
+"_{count} file conflict_::_{count} file conflicts_" => array("",""),
+"Cancel" => "à°°à°¦à±à°¦à±à°šà±‡à°¯à°¿",
"Error" => "పొరపాటà±",
"Password" => "సంకేతపదం",
"Send" => "పంపించà±",
diff --git a/core/l10n/th_TH.php b/core/l10n/th_TH.php
index 90fec245c952148049bf8fb6141b3556ceb9d891..8eab771822d3d0071d21b86b4cf01e763143b78a 100644
--- a/core/l10n/th_TH.php
+++ b/core/l10n/th_TH.php
@@ -43,6 +43,8 @@ $TRANSLATIONS = array(
"Yes" => "ตà¸à¸¥à¸‡",
"No" => "ไม่ตà¸à¸¥à¸‡",
"Ok" => "ตà¸à¸¥à¸‡",
+"_{count} file conflict_::_{count} file conflicts_" => array(""),
+"Cancel" => "ยà¸à¹€à¸¥à¸´à¸",
"The object type is not specified." => "ชนิดขà¸à¸‡à¸§à¸±à¸•à¸–ุยังไม่ได้รับà¸à¸²à¸£à¸£à¸°à¸šà¸¸",
"Error" => "ข้à¸à¸œà¸´à¸”พลาด",
"The app name is not specified." => "ชื่à¸à¸‚à¸à¸‡à¹à¸à¸›à¸¢à¸±à¸‡à¹„ม่ได้รับà¸à¸²à¸£à¸£à¸°à¸šà¸¸à¸Šà¸·à¹ˆà¸",
diff --git a/core/l10n/tr.php b/core/l10n/tr.php
index a4c80638d82bdaacd33b5f9994eeb987ec4bf64c..d8d9709949c9ad137bcb4a3e1ae6cc3b48db1a95 100644
--- a/core/l10n/tr.php
+++ b/core/l10n/tr.php
@@ -51,6 +51,8 @@ $TRANSLATIONS = array(
"Yes" => "Evet",
"No" => "Hayır",
"Ok" => "Tamam",
+"_{count} file conflict_::_{count} file conflicts_" => array("",""),
+"Cancel" => "Ä°ptal",
"The object type is not specified." => "Nesne türü belirtilmemiş.",
"Error" => "Hata",
"The app name is not specified." => "uygulama adı belirtilmedi.",
diff --git a/core/l10n/ug.php b/core/l10n/ug.php
index e77718233de3dc8350e4d6c0018718873e293bac..36023cb165338e4d80aa6818f366987e683573d0 100644
--- a/core/l10n/ug.php
+++ b/core/l10n/ug.php
@@ -30,6 +30,8 @@ $TRANSLATIONS = array(
"Yes" => "ھەئە",
"No" => "ياق",
"Ok" => "جەزملە",
+"_{count} file conflict_::_{count} file conflicts_" => array(""),
+"Cancel" => "ۋاز كەچ",
"Error" => "خاتالىق",
"Share" => "ھەمبەھىر",
"Share with" => "ھەمبەھىر",
diff --git a/core/l10n/uk.php b/core/l10n/uk.php
index 8e74855dd084cbffc9fcb74f965f11b10644977e..23207654731654d15d7812547fdd33e54be0222b 100644
--- a/core/l10n/uk.php
+++ b/core/l10n/uk.php
@@ -44,6 +44,8 @@ $TRANSLATIONS = array(
"Yes" => "Так",
"No" => "ÐÑ–",
"Ok" => "Ok",
+"_{count} file conflict_::_{count} file conflicts_" => array("","",""),
+"Cancel" => "Відмінити",
"The object type is not specified." => "Ðе визначено тип об'єкту.",
"Error" => "Помилка",
"The app name is not specified." => "Ðе визначено ім'Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¸.",
diff --git a/core/l10n/ur_PK.php b/core/l10n/ur_PK.php
index 96871a54d0b23b521d0f41f97c77c90dee5e04bc..fc736779122e2b90d1b2d002f989e6a23ab2d636 100644
--- a/core/l10n/ur_PK.php
+++ b/core/l10n/ur_PK.php
@@ -23,6 +23,8 @@ $TRANSLATIONS = array(
"Yes" => "Ûاں",
"No" => "Ù†Ûیں",
"Ok" => "اوکے",
+"_{count} file conflict_::_{count} file conflicts_" => array("",""),
+"Cancel" => "منسوخ کریں",
"Error" => "ایرر",
"Error while sharing" => "شئیرنگ کے دوران ایرر",
"Error while unsharing" => "شئیرنگ ختم کرنے کے دوران ایرر",
diff --git a/core/l10n/vi.php b/core/l10n/vi.php
index 1ccf03c0aaa37521a46a5a3f74f19dbc46d28efd..1c99aad9a4d3264b5a0b21ac6279bf361eccb6f9 100644
--- a/core/l10n/vi.php
+++ b/core/l10n/vi.php
@@ -44,6 +44,8 @@ $TRANSLATIONS = array(
"Yes" => "Có",
"No" => "Không",
"Ok" => "Äồng ý",
+"_{count} file conflict_::_{count} file conflicts_" => array(""),
+"Cancel" => "Hủy",
"The object type is not specified." => "Loại đối tượng không được chỉ định.",
"Error" => "Lá»—i",
"The app name is not specified." => "Tên ứng dụng không được chỉ định.",
diff --git a/core/l10n/zh_CN.php b/core/l10n/zh_CN.php
index ce61618111a70ebfaae5f6e8660d7b98efda895b..04c4630b2221d3d87b7d308a456e32454f7fe7c5 100644
--- a/core/l10n/zh_CN.php
+++ b/core/l10n/zh_CN.php
@@ -51,6 +51,8 @@ $TRANSLATIONS = array(
"Yes" => "是",
"No" => "å¦",
"Ok" => "好",
+"_{count} file conflict_::_{count} file conflicts_" => array(""),
+"Cancel" => "å–消",
"The object type is not specified." => "未指定对象类型。",
"Error" => "错误",
"The app name is not specified." => "未指定应用å称。",
diff --git a/core/l10n/zh_HK.php b/core/l10n/zh_HK.php
index 8bfa1f58616dbb9d020e36d0cc5c9d40e115970b..f6c4003af616cb95205d97a23dbae7d2137bffcf 100644
--- a/core/l10n/zh_HK.php
+++ b/core/l10n/zh_HK.php
@@ -31,6 +31,8 @@ $TRANSLATIONS = array(
"Yes" => "Yes",
"No" => "No",
"Ok" => "OK",
+"_{count} file conflict_::_{count} file conflicts_" => array(""),
+"Cancel" => "å–消",
"Error" => "錯誤",
"Shared" => "已分享",
"Share" => "分享",
diff --git a/core/l10n/zh_TW.php b/core/l10n/zh_TW.php
index a6e2588e0d70ad645a744a530a5729d34cd2039b..759a4fdc35e57b416f41fbcec7c6966fb91fabe2 100644
--- a/core/l10n/zh_TW.php
+++ b/core/l10n/zh_TW.php
@@ -51,6 +51,8 @@ $TRANSLATIONS = array(
"Yes" => "是",
"No" => "å¦",
"Ok" => "好",
+"_{count} file conflict_::_{count} file conflicts_" => array(""),
+"Cancel" => "å–消",
"The object type is not specified." => "未指定物件類型。",
"Error" => "錯誤",
"The app name is not specified." => "沒有指定 app å稱。",
diff --git a/core/register_command.php b/core/register_command.php
new file mode 100644
index 0000000000000000000000000000000000000000..1eed347b7b51f94b12442d84a15f38cdd014858a
--- /dev/null
+++ b/core/register_command.php
@@ -0,0 +1,9 @@
+<?php
+/**
+ * Copyright (c) 2013 Bart Visscher <bartv@thisnet.nl>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+$application->add(new OC\Core\Command\Status);
diff --git a/cron.php b/cron.php
index d39800c8849466b081ba01b6a0335f0962790c0d..8e1a3376d53dba768a9e891adc8c3a38c1766d5a 100644
--- a/cron.php
+++ b/cron.php
@@ -79,7 +79,7 @@ try {
// We call ownCloud from the CLI (aka cron)
if ($appmode != 'cron') {
- // Use cron in feature!
+ // Use cron in future!
OC_BackgroundJob::setExecutionType('cron');
}
diff --git a/db_structure.xml b/db_structure.xml
index 24742c242ee3e724debbc5f0d884f20d90e1536c..86f9989e1c237e7c035c40157e01dddbd3ca7340 100644
--- a/db_structure.xml
+++ b/db_structure.xml
@@ -299,7 +299,7 @@
<field>
<name>unencrypted_size</name>
<type>integer</type>
- <default></default>
+ <default>0</default>
<notnull>true</notnull>
<length>8</length>
</field>
diff --git a/l10n/ach/core.po b/l10n/ach/core.po
index f61d3994eea526a6a7a49ea25ed308ac04c71212..070293766e8d780b6bff86c813b19e34dc1b43fe 100644
--- a/l10n/ach/core.po
+++ b/l10n/ach/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Acoli (http://www.transifex.com/projects/p/owncloud/language/ach/)\n"
"MIME-Version: 1.0\n"
@@ -190,55 +190,55 @@ msgstr ""
msgid "Settings"
msgstr ""
-#: js/js.js:853
+#: js/js.js:866
msgid "seconds ago"
msgstr ""
-#: js/js.js:854
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:855
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:856
+#: js/js.js:869
msgid "today"
msgstr ""
-#: js/js.js:857
+#: js/js.js:870
msgid "yesterday"
msgstr ""
-#: js/js.js:858
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:859
+#: js/js.js:872
msgid "last month"
msgstr ""
-#: js/js.js:860
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:861
+#: js/js.js:874
msgid "months ago"
msgstr ""
-#: js/js.js:862
+#: js/js.js:875
msgid "last year"
msgstr ""
-#: js/js.js:863
+#: js/js.js:876
msgid "years ago"
msgstr ""
@@ -266,6 +266,46 @@ msgstr ""
msgid "Error loading message template: {error}"
msgstr ""
+#: js/oc-dialogs.js:347
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:367
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:376
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:386
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:457
+msgid "Error loading file exists template"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/ach/files.po b/l10n/ach/files.po
index 1edc94cfa5f557056fd497ac67b4fc7fecd70d30..b8a81660f4d313cce3166f790deac20af47592f8 100644
--- a/l10n/ach/files.po
+++ b/l10n/ach/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-07 04:39-0400\n"
-"PO-Revision-Date: 2013-09-07 07:27+0000\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Acoli (http://www.transifex.com/projects/p/owncloud/language/ach/)\n"
"MIME-Version: 1.0\n"
@@ -74,11 +74,15 @@ msgstr ""
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:109
-msgid "Upload failed"
+#: ajax/upload.php:120 ajax/upload.php:143
+msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:127
+#: ajax/upload.php:136
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
+
+#: ajax/upload.php:160
msgid "Invalid directory."
msgstr ""
@@ -86,144 +90,148 @@ msgstr ""
msgid "Files"
msgstr ""
-#: js/file-upload.js:11
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
+#: js/file-upload.js:244
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr ""
-#: js/file-upload.js:24
+#: js/file-upload.js:255
msgid "Not enough space available"
msgstr ""
-#: js/file-upload.js:64
+#: js/file-upload.js:322
msgid "Upload cancelled."
msgstr ""
-#: js/file-upload.js:165
+#: js/file-upload.js:356
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:446
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/file-upload.js:239
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr ""
-#: js/file-upload.js:244 lib/app.php:53
+#: js/file-upload.js:525 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550
+#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545
msgid "Error"
msgstr ""
-#: js/fileactions.js:116
+#: js/fileactions.js:119
msgid "Share"
msgstr ""
-#: js/fileactions.js:126
+#: js/fileactions.js:131
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:192
+#: js/fileactions.js:197
msgid "Rename"
msgstr ""
-#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr ""
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr ""
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr ""
-#: js/filelist.js:307
+#: js/filelist.js:416
msgid "suggest name"
msgstr ""
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr ""
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr ""
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "undo"
msgstr ""
-#: js/filelist.js:424 js/filelist.js:490 js/files.js:581
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:425 js/filelist.js:491 js/files.js:587
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:432
+#: js/filelist.js:541
msgid "{dirs} and {files}"
msgstr ""
-#: js/filelist.js:563
+#: js/filelist.js:731 js/filelist.js:769
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:628
-msgid "files uploading"
-msgstr ""
-
-#: js/files.js:52
+#: js/files.js:25
msgid "'.' is an invalid file name."
msgstr ""
-#: js/files.js:56
+#: js/files.js:29
msgid "File name cannot be empty."
msgstr ""
-#: js/files.js:64
+#: js/files.js:37
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: js/files.js:78
+#: js/files.js:51
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr ""
-#: js/files.js:82
+#: js/files.js:55
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:94
+#: js/files.js:67
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
msgstr ""
-#: js/files.js:245
+#: js/files.js:296
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/files.js:563 templates/index.php:69
+#: js/files.js:507 js/files.js:545
+msgid "Error moving file"
+msgstr ""
+
+#: js/files.js:558 templates/index.php:61
msgid "Name"
msgstr ""
-#: js/files.js:564 templates/index.php:81
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr ""
-#: js/files.js:565 templates/index.php:83
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr ""
@@ -232,7 +240,7 @@ msgstr ""
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:11 templates/index.php:18
+#: lib/helper.php:11 templates/index.php:17
msgid "Upload"
msgstr ""
@@ -268,65 +276,65 @@ msgstr ""
msgid "Save"
msgstr ""
-#: templates/index.php:7
+#: templates/index.php:6
msgid "New"
msgstr ""
-#: templates/index.php:10
+#: templates/index.php:9
msgid "Text file"
msgstr ""
-#: templates/index.php:12
+#: templates/index.php:11
msgid "Folder"
msgstr ""
-#: templates/index.php:14
+#: templates/index.php:13
msgid "From link"
msgstr ""
-#: templates/index.php:41
+#: templates/index.php:33
msgid "Deleted files"
msgstr ""
-#: templates/index.php:46
+#: templates/index.php:39
msgid "Cancel upload"
msgstr ""
-#: templates/index.php:52
+#: templates/index.php:45
msgid "You don’t have write permissions here."
msgstr ""
-#: templates/index.php:59
+#: templates/index.php:50
msgid "Nothing in here. Upload something!"
msgstr ""
-#: templates/index.php:75
+#: templates/index.php:67
msgid "Download"
msgstr ""
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr ""
-#: templates/index.php:94 templates/index.php:95
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr ""
-#: templates/index.php:108
+#: templates/index.php:100
msgid "Upload too large"
msgstr ""
-#: templates/index.php:110
+#: templates/index.php:102
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: templates/index.php:115
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:118
+#: templates/index.php:110
msgid "Current scanning"
msgstr ""
diff --git a/l10n/ach/settings.po b/l10n/ach/settings.po
index 391035008ee3f35e4348441a1cee7b1cda2d9d90..591268ad3876e2a936da818d7090bc24d954d2d8 100644
--- a/l10n/ach/settings.po
+++ b/l10n/ach/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:45-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Acoli (http://www.transifex.com/projects/p/owncloud/language/ach/)\n"
"MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgid "Unable to load list from App Store"
msgstr ""
#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
-#: ajax/togglegroups.php:20
+#: ajax/togglegroups.php:20 changepassword/controller.php:55
msgid "Authentication error"
msgstr ""
@@ -84,6 +84,35 @@ msgstr ""
msgid "Couldn't update app."
msgstr ""
+#: changepassword/controller.php:20
+msgid "Wrong password"
+msgstr ""
+
+#: changepassword/controller.php:42
+msgid "No user supplied"
+msgstr ""
+
+#: changepassword/controller.php:74
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr ""
+
+#: changepassword/controller.php:79
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr ""
+
+#: changepassword/controller.php:87
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr ""
+
+#: changepassword/controller.php:92 changepassword/controller.php:103
+msgid "Unable to change password"
+msgstr ""
+
#: js/apps.js:43
msgid "Update to {appversion}"
msgstr ""
@@ -128,15 +157,15 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:217
+#: js/personal.js:220
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:262
+#: js/personal.js:265
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:284
+#: js/personal.js:287
msgid "Saving..."
msgstr ""
diff --git a/l10n/af_ZA/core.po b/l10n/af_ZA/core.po
index 67360d8c1077fd63e0e50fab7358ba68d759880a..ba46eb4cfa690b5fbfb13cb4750117225634b08c 100644
--- a/l10n/af_ZA/core.po
+++ b/l10n/af_ZA/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:33+0000\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
"MIME-Version: 1.0\n"
@@ -190,55 +190,55 @@ msgstr ""
msgid "Settings"
msgstr "Instellings"
-#: js/js.js:853
+#: js/js.js:866
msgid "seconds ago"
msgstr ""
-#: js/js.js:854
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:855
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:856
+#: js/js.js:869
msgid "today"
msgstr ""
-#: js/js.js:857
+#: js/js.js:870
msgid "yesterday"
msgstr ""
-#: js/js.js:858
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:859
+#: js/js.js:872
msgid "last month"
msgstr ""
-#: js/js.js:860
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:861
+#: js/js.js:874
msgid "months ago"
msgstr ""
-#: js/js.js:862
+#: js/js.js:875
msgid "last year"
msgstr ""
-#: js/js.js:863
+#: js/js.js:876
msgid "years ago"
msgstr ""
@@ -266,6 +266,46 @@ msgstr ""
msgid "Error loading message template: {error}"
msgstr ""
+#: js/oc-dialogs.js:347
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:367
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:376
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:386
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:457
+msgid "Error loading file exists template"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/af_ZA/files.po b/l10n/af_ZA/files.po
index e02365d6370df92d4ba4ead7d22e37e013cd4558..1a0f6c3fbf7d70be410a235c8dab7d79018f886e 100644
--- a/l10n/af_ZA/files.po
+++ b/l10n/af_ZA/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-30 09:31-0400\n"
-"PO-Revision-Date: 2013-08-30 13:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
"MIME-Version: 1.0\n"
@@ -74,11 +74,15 @@ msgstr ""
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:109
-msgid "Upload failed"
+#: ajax/upload.php:120 ajax/upload.php:143
+msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:127
+#: ajax/upload.php:136
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
+
+#: ajax/upload.php:160
msgid "Invalid directory."
msgstr ""
@@ -86,144 +90,148 @@ msgstr ""
msgid "Files"
msgstr ""
-#: js/file-upload.js:11
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
+#: js/file-upload.js:244
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr ""
-#: js/file-upload.js:24
+#: js/file-upload.js:255
msgid "Not enough space available"
msgstr ""
-#: js/file-upload.js:64
+#: js/file-upload.js:322
msgid "Upload cancelled."
msgstr ""
-#: js/file-upload.js:165
+#: js/file-upload.js:356
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:446
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/file-upload.js:239
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr ""
-#: js/file-upload.js:244 lib/app.php:53
+#: js/file-upload.js:525 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
+#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545
msgid "Error"
msgstr ""
-#: js/fileactions.js:116
+#: js/fileactions.js:119
msgid "Share"
msgstr ""
-#: js/fileactions.js:126
+#: js/fileactions.js:131
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:192
+#: js/fileactions.js:197
msgid "Rename"
msgstr ""
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr ""
-#: js/filelist.js:305 js/filelist.js:307
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr ""
-#: js/filelist.js:305 js/filelist.js:307
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr ""
-#: js/filelist.js:305
+#: js/filelist.js:416
msgid "suggest name"
msgstr ""
-#: js/filelist.js:305 js/filelist.js:307
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr ""
-#: js/filelist.js:352
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr ""
-#: js/filelist.js:352
+#: js/filelist.js:463
msgid "undo"
msgstr ""
-#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:430
+#: js/filelist.js:541
msgid "{dirs} and {files}"
msgstr ""
-#: js/filelist.js:561
+#: js/filelist.js:731 js/filelist.js:769
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:626
-msgid "files uploading"
-msgstr ""
-
-#: js/files.js:52
+#: js/files.js:25
msgid "'.' is an invalid file name."
msgstr ""
-#: js/files.js:56
+#: js/files.js:29
msgid "File name cannot be empty."
msgstr ""
-#: js/files.js:64
+#: js/files.js:37
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: js/files.js:78
+#: js/files.js:51
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr ""
-#: js/files.js:82
+#: js/files.js:55
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:94
+#: js/files.js:67
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
msgstr ""
-#: js/files.js:245
+#: js/files.js:296
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/files.js:562 templates/index.php:67
+#: js/files.js:507 js/files.js:545
+msgid "Error moving file"
+msgstr ""
+
+#: js/files.js:558 templates/index.php:61
msgid "Name"
msgstr ""
-#: js/files.js:563 templates/index.php:78
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr ""
-#: js/files.js:564 templates/index.php:80
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr ""
@@ -232,7 +240,7 @@ msgstr ""
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:11 templates/index.php:18
+#: lib/helper.php:11 templates/index.php:17
msgid "Upload"
msgstr ""
@@ -268,65 +276,65 @@ msgstr ""
msgid "Save"
msgstr ""
-#: templates/index.php:7
+#: templates/index.php:6
msgid "New"
msgstr ""
-#: templates/index.php:10
+#: templates/index.php:9
msgid "Text file"
msgstr ""
-#: templates/index.php:12
+#: templates/index.php:11
msgid "Folder"
msgstr ""
-#: templates/index.php:14
+#: templates/index.php:13
msgid "From link"
msgstr ""
-#: templates/index.php:41
+#: templates/index.php:33
msgid "Deleted files"
msgstr ""
-#: templates/index.php:46
+#: templates/index.php:39
msgid "Cancel upload"
msgstr ""
-#: templates/index.php:52
+#: templates/index.php:45
msgid "You don’t have write permissions here."
msgstr ""
-#: templates/index.php:59
+#: templates/index.php:50
msgid "Nothing in here. Upload something!"
msgstr ""
-#: templates/index.php:73
+#: templates/index.php:67
msgid "Download"
msgstr ""
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr ""
-#: templates/index.php:91 templates/index.php:92
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr ""
-#: templates/index.php:105
+#: templates/index.php:100
msgid "Upload too large"
msgstr ""
-#: templates/index.php:107
+#: templates/index.php:102
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: templates/index.php:112
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:115
+#: templates/index.php:110
msgid "Current scanning"
msgstr ""
diff --git a/l10n/af_ZA/settings.po b/l10n/af_ZA/settings.po
index a7e66145986c34f46b9c8e96ddb722dab73a1df1..1a474f8b038839e3113b46efee077c4b650be7b5 100644
--- a/l10n/af_ZA/settings.po
+++ b/l10n/af_ZA/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:45-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
"MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgid "Unable to load list from App Store"
msgstr ""
#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
-#: ajax/togglegroups.php:20
+#: ajax/togglegroups.php:20 changepassword/controller.php:55
msgid "Authentication error"
msgstr ""
@@ -84,6 +84,35 @@ msgstr ""
msgid "Couldn't update app."
msgstr ""
+#: changepassword/controller.php:20
+msgid "Wrong password"
+msgstr ""
+
+#: changepassword/controller.php:42
+msgid "No user supplied"
+msgstr ""
+
+#: changepassword/controller.php:74
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr ""
+
+#: changepassword/controller.php:79
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr ""
+
+#: changepassword/controller.php:87
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr ""
+
+#: changepassword/controller.php:92 changepassword/controller.php:103
+msgid "Unable to change password"
+msgstr ""
+
#: js/apps.js:43
msgid "Update to {appversion}"
msgstr ""
@@ -128,15 +157,15 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:217
+#: js/personal.js:220
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:262
+#: js/personal.js:265
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:284
+#: js/personal.js:287
msgid "Saving..."
msgstr ""
diff --git a/l10n/ar/core.po b/l10n/ar/core.po
index 362057faca756ea5fb26a60e32bb87cc54b81a86..56e2c293e47ab7e2d9dedc146382ebc033c4a4bf 100644
--- a/l10n/ar/core.po
+++ b/l10n/ar/core.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# blackcoder <tarek.taha@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:33+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-22 12:55-0400\n"
+"PO-Revision-Date: 2013-09-22 00:50+0000\n"
+"Last-Translator: blackcoder <tarek.taha@gmail.com>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -190,11 +191,11 @@ msgstr "كانون الاول"
msgid "Settings"
msgstr "إعدادات"
-#: js/js.js:853
+#: js/js.js:866
msgid "seconds ago"
msgstr "منذ ثواني"
-#: js/js.js:854
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
@@ -204,7 +205,7 @@ msgstr[3] ""
msgstr[4] ""
msgstr[5] ""
-#: js/js.js:855
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
@@ -214,15 +215,15 @@ msgstr[3] ""
msgstr[4] ""
msgstr[5] ""
-#: js/js.js:856
+#: js/js.js:869
msgid "today"
msgstr "اليوم"
-#: js/js.js:857
+#: js/js.js:870
msgid "yesterday"
msgstr "يوم أمس"
-#: js/js.js:858
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
@@ -232,11 +233,11 @@ msgstr[3] ""
msgstr[4] ""
msgstr[5] ""
-#: js/js.js:859
+#: js/js.js:872
msgid "last month"
msgstr "الشهر الماضي"
-#: js/js.js:860
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
@@ -246,15 +247,15 @@ msgstr[3] ""
msgstr[4] ""
msgstr[5] ""
-#: js/js.js:861
+#: js/js.js:874
msgid "months ago"
msgstr "شهر مضى"
-#: js/js.js:862
+#: js/js.js:875
msgid "last year"
msgstr "السنةالماضية"
-#: js/js.js:863
+#: js/js.js:876
msgid "years ago"
msgstr "سنة مضت"
@@ -282,6 +283,50 @@ msgstr "مواÙÙ‚"
msgid "Error loading message template: {error}"
msgstr ""
+#: js/oc-dialogs.js:347
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:367
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:376
+msgid "Cancel"
+msgstr "الغاء"
+
+#: js/oc-dialogs.js:386
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:457
+msgid "Error loading file exists template"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -456,11 +501,11 @@ msgid ""
"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 ."
-msgstr ""
+msgstr "وصلة تØديث كلمة المرور بعثت الى بريدك الالكتروني.<br> اذا لم تستقبل البريد خلال Ùترة زمنية قصيره, ابØØ« ÙÙŠ سلة مهملات بريدك."
#: lostpassword/templates/lostpassword.php:12
msgid "Request failed!<br>Did you make sure your email/username was right?"
-msgstr ""
+msgstr "الطلب رÙض! <br> هل انت متأكد أن الاسم/العنوان البريدي صØÙŠØØŸ"
#: lostpassword/templates/lostpassword.php:15
msgid "You will receive a link to reset your password via Email."
diff --git a/l10n/ar/files.po b/l10n/ar/files.po
index 565d98c14c1351c818b33e6a945c6e0284333c26..5e431360f9609e2d6010baf2ca7e2459dbef29a2 100644
--- a/l10n/ar/files.po
+++ b/l10n/ar/files.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:00+0000\n"
-"Last-Translator: ibrahim_9090 <ibrahim9090@gmail.com>\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -75,11 +75,15 @@ msgstr "خطأ ÙÙŠ الكتابة على القرص الصلب"
msgid "Not enough storage available"
msgstr "لا يوجد مساØØ© تخزينية كاÙية"
-#: ajax/upload.php:109
-msgid "Upload failed"
-msgstr "عملية الرÙع Ùشلت"
+#: ajax/upload.php:120 ajax/upload.php:143
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:136
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
-#: ajax/upload.php:127
+#: ajax/upload.php:160
msgid "Invalid directory."
msgstr "مسار غير صØÙŠØ."
@@ -87,76 +91,80 @@ msgstr "مسار غير صØÙŠØ."
msgid "Files"
msgstr "الملÙات"
-#: js/file-upload.js:11
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Ùشل ÙÙŠ رÙع ملÙاتك , إما أنها مجلد أو Øجمها 0 بايت"
+#: js/file-upload.js:244
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
+msgstr ""
-#: js/file-upload.js:24
+#: js/file-upload.js:255
msgid "Not enough space available"
msgstr "لا توجد مساØØ© كاÙية"
-#: js/file-upload.js:64
+#: js/file-upload.js:322
msgid "Upload cancelled."
msgstr "تم إلغاء عملية رÙع الملÙات ."
-#: js/file-upload.js:165
+#: js/file-upload.js:356
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:446
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "عملية رÙع الملÙات قيد التنÙيذ. اغلاق الصÙØØ© سو٠يلغي عملية رÙع الملÙات."
-#: js/file-upload.js:239
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr "عنوان ال URL لا يجوز أن يكون Ùارغا."
-#: js/file-upload.js:244 lib/app.php:53
+#: js/file-upload.js:525 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr "تسمية مل٠غير صالØØ©. استخدام الاسم \"shared\" Ù…Øجوز بواسطة ownCloud"
-#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550
+#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545
msgid "Error"
msgstr "خطأ"
-#: js/fileactions.js:116
+#: js/fileactions.js:119
msgid "Share"
msgstr "شارك"
-#: js/fileactions.js:126
+#: js/fileactions.js:131
msgid "Delete permanently"
msgstr "Øذ٠بشكل دائم"
-#: js/fileactions.js:192
+#: js/fileactions.js:197
msgid "Rename"
msgstr "إعادة تسميه"
-#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "قيد الانتظار"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{new_name} موجود مسبقا"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "استبدال"
-#: js/filelist.js:307
+#: js/filelist.js:416
msgid "suggest name"
msgstr "Ø§Ù‚ØªØ±Ø Ø¥Ø³Ù…"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "إلغاء"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr "استبدل {new_name} بـ {old_name}"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "undo"
msgstr "تراجع"
-#: js/filelist.js:424 js/filelist.js:490 js/files.js:581
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
@@ -166,7 +174,7 @@ msgstr[3] ""
msgstr[4] ""
msgstr[5] ""
-#: js/filelist.js:425 js/filelist.js:491 js/files.js:587
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
@@ -176,11 +184,11 @@ msgstr[3] ""
msgstr[4] ""
msgstr[5] ""
-#: js/filelist.js:432
+#: js/filelist.js:541
msgid "{dirs} and {files}"
msgstr "{dirs} Ùˆ {files}"
-#: js/filelist.js:563
+#: js/filelist.js:731 js/filelist.js:769
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
@@ -190,53 +198,53 @@ msgstr[3] ""
msgstr[4] ""
msgstr[5] ""
-#: js/filelist.js:628
-msgid "files uploading"
-msgstr "يتم تØميل الملÙات"
-
-#: js/files.js:52
+#: js/files.js:25
msgid "'.' is an invalid file name."
msgstr "\".\" اسم مل٠غير صØÙŠØ."
-#: js/files.js:56
+#: js/files.js:29
msgid "File name cannot be empty."
msgstr "اسم المل٠لا يجوز أن يكون Ùارغا"
-#: js/files.js:64
+#: js/files.js:37
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "اسم غير صØÙŠØ , الرموز '\\', '/', '<', '>', ':', '\"', '|', '?' Ùˆ \"*\" غير Ù…Ø³Ù…ÙˆØ Ø§Ø³ØªØ®Ø¯Ø§Ù…Ù‡Ø§"
-#: js/files.js:78
+#: js/files.js:51
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr "مساØتك التخزينية ممتلئة, لا يمكم تØديث ملÙاتك أو مزامنتها بعد الآن !"
-#: js/files.js:82
+#: js/files.js:55
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "مساØتك التخزينية امتلأت تقريبا "
-#: js/files.js:94
+#: js/files.js:67
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
msgstr "تم تعطيل التشÙير لكن ملÙاتك لا تزال مشÙرة. Ùضلا اذهب إلى الإعدادات الشخصية لإزالة التشÙير عن ملÙاتك."
-#: js/files.js:245
+#: js/files.js:296
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "جاري تجهيز عملية التØميل. قد تستغرق بعض الوقت اذا كان Øجم الملÙات كبير."
-#: js/files.js:563 templates/index.php:69
+#: js/files.js:507 js/files.js:545
+msgid "Error moving file"
+msgstr ""
+
+#: js/files.js:558 templates/index.php:61
msgid "Name"
msgstr "اسم"
-#: js/files.js:564 templates/index.php:81
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "Øجم"
-#: js/files.js:565 templates/index.php:83
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr "معدل"
@@ -245,7 +253,7 @@ msgstr "معدل"
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:11 templates/index.php:18
+#: lib/helper.php:11 templates/index.php:17
msgid "Upload"
msgstr "رÙع"
@@ -281,65 +289,65 @@ msgstr "الØد الأقصى Ø§Ù„Ù…Ø³Ù…ÙˆØ Ø¨Ù‡ لملÙات ZIP"
msgid "Save"
msgstr "ØÙظ"
-#: templates/index.php:7
+#: templates/index.php:6
msgid "New"
msgstr "جديد"
-#: templates/index.php:10
+#: templates/index.php:9
msgid "Text file"
msgstr "ملÙ"
-#: templates/index.php:12
+#: templates/index.php:11
msgid "Folder"
msgstr "مجلد"
-#: templates/index.php:14
+#: templates/index.php:13
msgid "From link"
msgstr "من رابط"
-#: templates/index.php:41
+#: templates/index.php:33
msgid "Deleted files"
msgstr "Øذ٠الملÙات"
-#: templates/index.php:46
+#: templates/index.php:39
msgid "Cancel upload"
msgstr "إلغاء رÙع الملÙات"
-#: templates/index.php:52
+#: templates/index.php:45
msgid "You don’t have write permissions here."
msgstr "لا تملك صلاØيات الكتابة هنا."
-#: templates/index.php:59
+#: templates/index.php:50
msgid "Nothing in here. Upload something!"
msgstr "لا يوجد شيء هنا. إرÙع بعض الملÙات!"
-#: templates/index.php:75
+#: templates/index.php:67
msgid "Download"
msgstr "تØميل"
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr "إلغاء مشاركة"
-#: templates/index.php:94 templates/index.php:95
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "إلغاء"
-#: templates/index.php:108
+#: templates/index.php:100
msgid "Upload too large"
msgstr "Øجم الترÙيع أعلى من المسموØ"
-#: templates/index.php:110
+#: templates/index.php:102
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Øجم الملÙات التي تريد ترÙيعها أعلى من Ø§Ù„Ù…Ø³Ù…ÙˆØ Ø¹Ù„Ù‰ الخادم."
-#: templates/index.php:115
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr "يرجى الانتظار , جاري ÙØص الملÙات ."
-#: templates/index.php:118
+#: templates/index.php:110
msgid "Current scanning"
msgstr "الÙØص الØالي"
diff --git a/l10n/ar/settings.po b/l10n/ar/settings.po
index 89f4050805f3e11be65d8184a5ceabb622d344e4..42761603ac661050fcc6eea598c8a6cc1083767b 100644
--- a/l10n/ar/settings.po
+++ b/l10n/ar/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:45-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgid "Unable to load list from App Store"
msgstr "Ùشل تØميل القائمة من الآب ستور"
#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
-#: ajax/togglegroups.php:20
+#: ajax/togglegroups.php:20 changepassword/controller.php:55
msgid "Authentication error"
msgstr "لم يتم التأكد من الشخصية بنجاØ"
@@ -84,6 +84,35 @@ msgstr "Ùشل إزالة المستخدم من المجموعة %s"
msgid "Couldn't update app."
msgstr "تعذر تØديث التطبيق."
+#: changepassword/controller.php:20
+msgid "Wrong password"
+msgstr ""
+
+#: changepassword/controller.php:42
+msgid "No user supplied"
+msgstr ""
+
+#: changepassword/controller.php:74
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr ""
+
+#: changepassword/controller.php:79
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr ""
+
+#: changepassword/controller.php:87
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr ""
+
+#: changepassword/controller.php:92 changepassword/controller.php:103
+msgid "Unable to change password"
+msgstr ""
+
#: js/apps.js:43
msgid "Update to {appversion}"
msgstr "تم التØديث الى "
@@ -128,15 +157,15 @@ msgstr "Øدث"
msgid "Updated"
msgstr "تم التØديث بنجاØ"
-#: js/personal.js:217
+#: js/personal.js:220
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:262
+#: js/personal.js:265
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:284
+#: js/personal.js:287
msgid "Saving..."
msgstr "جاري الØÙظ..."
diff --git a/l10n/be/core.po b/l10n/be/core.po
index 7e415d6b9d2af8b07715f96f7a4004570d96565f..9b8d51d257546a2754399a9305cc5659199c7e11 100644
--- a/l10n/be/core.po
+++ b/l10n/be/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:33+0000\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
"MIME-Version: 1.0\n"
@@ -190,11 +190,11 @@ msgstr ""
msgid "Settings"
msgstr ""
-#: js/js.js:853
+#: js/js.js:866
msgid "seconds ago"
msgstr ""
-#: js/js.js:854
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
@@ -202,7 +202,7 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: js/js.js:855
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
@@ -210,15 +210,15 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: js/js.js:856
+#: js/js.js:869
msgid "today"
msgstr ""
-#: js/js.js:857
+#: js/js.js:870
msgid "yesterday"
msgstr ""
-#: js/js.js:858
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
@@ -226,11 +226,11 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: js/js.js:859
+#: js/js.js:872
msgid "last month"
msgstr ""
-#: js/js.js:860
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
@@ -238,15 +238,15 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: js/js.js:861
+#: js/js.js:874
msgid "months ago"
msgstr ""
-#: js/js.js:862
+#: js/js.js:875
msgid "last year"
msgstr ""
-#: js/js.js:863
+#: js/js.js:876
msgid "years ago"
msgstr ""
@@ -274,6 +274,48 @@ msgstr ""
msgid "Error loading message template: {error}"
msgstr ""
+#: js/oc-dialogs.js:347
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:367
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:376
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:386
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:457
+msgid "Error loading file exists template"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/be/files.po b/l10n/be/files.po
index ef6881506f8bff642b27d47ea6c2bf84614e839c..ebc97c0f97ef2ee812a803676377fdd0fd75ad2e 100644
--- a/l10n/be/files.po
+++ b/l10n/be/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-30 09:31-0400\n"
-"PO-Revision-Date: 2013-08-30 13:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
"MIME-Version: 1.0\n"
@@ -74,11 +74,15 @@ msgstr ""
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:109
-msgid "Upload failed"
+#: ajax/upload.php:120 ajax/upload.php:143
+msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:127
+#: ajax/upload.php:136
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
+
+#: ajax/upload.php:160
msgid "Invalid directory."
msgstr ""
@@ -86,76 +90,80 @@ msgstr ""
msgid "Files"
msgstr ""
-#: js/file-upload.js:11
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
+#: js/file-upload.js:244
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr ""
-#: js/file-upload.js:24
+#: js/file-upload.js:255
msgid "Not enough space available"
msgstr ""
-#: js/file-upload.js:64
+#: js/file-upload.js:322
msgid "Upload cancelled."
msgstr ""
-#: js/file-upload.js:165
+#: js/file-upload.js:356
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:446
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/file-upload.js:239
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr ""
-#: js/file-upload.js:244 lib/app.php:53
+#: js/file-upload.js:525 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
+#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545
msgid "Error"
msgstr ""
-#: js/fileactions.js:116
+#: js/fileactions.js:119
msgid "Share"
msgstr ""
-#: js/fileactions.js:126
+#: js/fileactions.js:131
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:192
+#: js/fileactions.js:197
msgid "Rename"
msgstr ""
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr ""
-#: js/filelist.js:305 js/filelist.js:307
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr ""
-#: js/filelist.js:305 js/filelist.js:307
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr ""
-#: js/filelist.js:305
+#: js/filelist.js:416
msgid "suggest name"
msgstr ""
-#: js/filelist.js:305 js/filelist.js:307
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr ""
-#: js/filelist.js:352
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr ""
-#: js/filelist.js:352
+#: js/filelist.js:463
msgid "undo"
msgstr ""
-#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
@@ -163,7 +171,7 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
@@ -171,11 +179,11 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: js/filelist.js:430
+#: js/filelist.js:541
msgid "{dirs} and {files}"
msgstr ""
-#: js/filelist.js:561
+#: js/filelist.js:731 js/filelist.js:769
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
@@ -183,53 +191,53 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: js/filelist.js:626
-msgid "files uploading"
-msgstr ""
-
-#: js/files.js:52
+#: js/files.js:25
msgid "'.' is an invalid file name."
msgstr ""
-#: js/files.js:56
+#: js/files.js:29
msgid "File name cannot be empty."
msgstr ""
-#: js/files.js:64
+#: js/files.js:37
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: js/files.js:78
+#: js/files.js:51
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr ""
-#: js/files.js:82
+#: js/files.js:55
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:94
+#: js/files.js:67
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
msgstr ""
-#: js/files.js:245
+#: js/files.js:296
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/files.js:562 templates/index.php:67
+#: js/files.js:507 js/files.js:545
+msgid "Error moving file"
+msgstr ""
+
+#: js/files.js:558 templates/index.php:61
msgid "Name"
msgstr ""
-#: js/files.js:563 templates/index.php:78
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr ""
-#: js/files.js:564 templates/index.php:80
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr ""
@@ -238,7 +246,7 @@ msgstr ""
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:11 templates/index.php:18
+#: lib/helper.php:11 templates/index.php:17
msgid "Upload"
msgstr ""
@@ -274,65 +282,65 @@ msgstr ""
msgid "Save"
msgstr ""
-#: templates/index.php:7
+#: templates/index.php:6
msgid "New"
msgstr ""
-#: templates/index.php:10
+#: templates/index.php:9
msgid "Text file"
msgstr ""
-#: templates/index.php:12
+#: templates/index.php:11
msgid "Folder"
msgstr ""
-#: templates/index.php:14
+#: templates/index.php:13
msgid "From link"
msgstr ""
-#: templates/index.php:41
+#: templates/index.php:33
msgid "Deleted files"
msgstr ""
-#: templates/index.php:46
+#: templates/index.php:39
msgid "Cancel upload"
msgstr ""
-#: templates/index.php:52
+#: templates/index.php:45
msgid "You don’t have write permissions here."
msgstr ""
-#: templates/index.php:59
+#: templates/index.php:50
msgid "Nothing in here. Upload something!"
msgstr ""
-#: templates/index.php:73
+#: templates/index.php:67
msgid "Download"
msgstr ""
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr ""
-#: templates/index.php:91 templates/index.php:92
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr ""
-#: templates/index.php:105
+#: templates/index.php:100
msgid "Upload too large"
msgstr ""
-#: templates/index.php:107
+#: templates/index.php:102
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: templates/index.php:112
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:115
+#: templates/index.php:110
msgid "Current scanning"
msgstr ""
diff --git a/l10n/be/settings.po b/l10n/be/settings.po
index 914222534717493714c135d6a371930fc005692a..28e5d3884cb6ea222255197ec010ac71afe16a59 100644
--- a/l10n/be/settings.po
+++ b/l10n/be/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:45-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
"MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgid "Unable to load list from App Store"
msgstr ""
#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
-#: ajax/togglegroups.php:20
+#: ajax/togglegroups.php:20 changepassword/controller.php:55
msgid "Authentication error"
msgstr ""
@@ -84,6 +84,35 @@ msgstr ""
msgid "Couldn't update app."
msgstr ""
+#: changepassword/controller.php:20
+msgid "Wrong password"
+msgstr ""
+
+#: changepassword/controller.php:42
+msgid "No user supplied"
+msgstr ""
+
+#: changepassword/controller.php:74
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr ""
+
+#: changepassword/controller.php:79
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr ""
+
+#: changepassword/controller.php:87
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr ""
+
+#: changepassword/controller.php:92 changepassword/controller.php:103
+msgid "Unable to change password"
+msgstr ""
+
#: js/apps.js:43
msgid "Update to {appversion}"
msgstr ""
@@ -128,15 +157,15 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:217
+#: js/personal.js:220
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:262
+#: js/personal.js:265
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:284
+#: js/personal.js:287
msgid "Saving..."
msgstr ""
diff --git a/l10n/bg_BG/core.po b/l10n/bg_BG/core.po
index fa51807332dfcd15f63013f4f0a7485b3b7bdb58..432e35d9270cbd826c1f966f7cb5b8ef873b4f0f 100644
--- a/l10n/bg_BG/core.po
+++ b/l10n/bg_BG/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:33+0000\n"
+"POT-Creation-Date: 2013-09-22 12:55-0400\n"
+"PO-Revision-Date: 2013-09-20 15:01+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
@@ -190,55 +190,55 @@ msgstr "Декември"
msgid "Settings"
msgstr "ÐаÑтройки"
-#: js/js.js:853
+#: js/js.js:866
msgid "seconds ago"
msgstr "преди Ñекунди"
-#: js/js.js:854
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:855
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:856
+#: js/js.js:869
msgid "today"
msgstr "днеÑ"
-#: js/js.js:857
+#: js/js.js:870
msgid "yesterday"
msgstr "вчера"
-#: js/js.js:858
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:859
+#: js/js.js:872
msgid "last month"
msgstr "поÑледниÑÑ‚ меÑец"
-#: js/js.js:860
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:861
+#: js/js.js:874
msgid "months ago"
msgstr ""
-#: js/js.js:862
+#: js/js.js:875
msgid "last year"
msgstr "поÑледната година"
-#: js/js.js:863
+#: js/js.js:876
msgid "years ago"
msgstr "поÑледните години"
@@ -266,6 +266,46 @@ msgstr "Добре"
msgid "Error loading message template: {error}"
msgstr ""
+#: js/oc-dialogs.js:347
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:367
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:376
+msgid "Cancel"
+msgstr "Отказ"
+
+#: js/oc-dialogs.js:386
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:457
+msgid "Error loading file exists template"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/bg_BG/files.po b/l10n/bg_BG/files.po
index 69c221b386c95420f585a48e91b3516596450874..58667fa74a826045791193a3247804b7c73d350a 100644
--- a/l10n/bg_BG/files.po
+++ b/l10n/bg_BG/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:00+0000\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
@@ -74,11 +74,15 @@ msgstr "Възникна проблем при Ð·Ð°Ð¿Ð¸Ñ Ð² диÑка"
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:109
-msgid "Upload failed"
-msgstr "Качването е неуÑпешно"
+#: ajax/upload.php:120 ajax/upload.php:143
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:136
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
-#: ajax/upload.php:127
+#: ajax/upload.php:160
msgid "Invalid directory."
msgstr "Ðевалидна директориÑ."
@@ -86,144 +90,148 @@ msgstr "Ðевалидна директориÑ."
msgid "Files"
msgstr "Файлове"
-#: js/file-upload.js:11
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
+#: js/file-upload.js:244
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr ""
-#: js/file-upload.js:24
+#: js/file-upload.js:255
msgid "Not enough space available"
msgstr ""
-#: js/file-upload.js:64
+#: js/file-upload.js:322
msgid "Upload cancelled."
msgstr "Качването е ÑпрÑно."
-#: js/file-upload.js:165
+#: js/file-upload.js:356
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:446
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/file-upload.js:239
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr ""
-#: js/file-upload.js:244 lib/app.php:53
+#: js/file-upload.js:525 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550
+#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545
msgid "Error"
msgstr "Грешка"
-#: js/fileactions.js:116
+#: js/fileactions.js:119
msgid "Share"
msgstr "СподелÑне"
-#: js/fileactions.js:126
+#: js/fileactions.js:131
msgid "Delete permanently"
msgstr "Изтриване завинаги"
-#: js/fileactions.js:192
+#: js/fileactions.js:197
msgid "Rename"
msgstr "Преименуване"
-#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "Чакащо"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr ""
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "препокриване"
-#: js/filelist.js:307
+#: js/filelist.js:416
msgid "suggest name"
msgstr ""
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "отказ"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr ""
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "undo"
msgstr "възтановÑване"
-#: js/filelist.js:424 js/filelist.js:490 js/files.js:581
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:425 js/filelist.js:491 js/files.js:587
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:432
+#: js/filelist.js:541
msgid "{dirs} and {files}"
msgstr ""
-#: js/filelist.js:563
+#: js/filelist.js:731 js/filelist.js:769
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:628
-msgid "files uploading"
-msgstr ""
-
-#: js/files.js:52
+#: js/files.js:25
msgid "'.' is an invalid file name."
msgstr ""
-#: js/files.js:56
+#: js/files.js:29
msgid "File name cannot be empty."
msgstr ""
-#: js/files.js:64
+#: js/files.js:37
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: js/files.js:78
+#: js/files.js:51
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr ""
-#: js/files.js:82
+#: js/files.js:55
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:94
+#: js/files.js:67
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
msgstr ""
-#: js/files.js:245
+#: js/files.js:296
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/files.js:563 templates/index.php:69
+#: js/files.js:507 js/files.js:545
+msgid "Error moving file"
+msgstr ""
+
+#: js/files.js:558 templates/index.php:61
msgid "Name"
msgstr "Име"
-#: js/files.js:564 templates/index.php:81
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "Размер"
-#: js/files.js:565 templates/index.php:83
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr "Променено"
@@ -232,7 +240,7 @@ msgstr "Променено"
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:11 templates/index.php:18
+#: lib/helper.php:11 templates/index.php:17
msgid "Upload"
msgstr "Качване"
@@ -268,65 +276,65 @@ msgstr ""
msgid "Save"
msgstr "ЗапиÑ"
-#: templates/index.php:7
+#: templates/index.php:6
msgid "New"
msgstr "Ðово"
-#: templates/index.php:10
+#: templates/index.php:9
msgid "Text file"
msgstr "ТекÑтов файл"
-#: templates/index.php:12
+#: templates/index.php:11
msgid "Folder"
msgstr "Папка"
-#: templates/index.php:14
+#: templates/index.php:13
msgid "From link"
msgstr ""
-#: templates/index.php:41
+#: templates/index.php:33
msgid "Deleted files"
msgstr ""
-#: templates/index.php:46
+#: templates/index.php:39
msgid "Cancel upload"
msgstr "Спри качването"
-#: templates/index.php:52
+#: templates/index.php:45
msgid "You don’t have write permissions here."
msgstr ""
-#: templates/index.php:59
+#: templates/index.php:50
msgid "Nothing in here. Upload something!"
msgstr "ÐÑма нищо тук. Качете нещо."
-#: templates/index.php:75
+#: templates/index.php:67
msgid "Download"
msgstr "ИзтеглÑне"
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr ""
-#: templates/index.php:94 templates/index.php:95
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "Изтриване"
-#: templates/index.php:108
+#: templates/index.php:100
msgid "Upload too large"
msgstr "Файлът който Ñте избрали за качване е прекалено голÑм"
-#: templates/index.php:110
+#: templates/index.php:102
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Файловете които Ñе опитвате да качите Ñа по-големи от позволеното за Ñървъра."
-#: templates/index.php:115
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr "Файловете Ñе претърÑват, изчакайте."
-#: templates/index.php:118
+#: templates/index.php:110
msgid "Current scanning"
msgstr ""
diff --git a/l10n/bg_BG/settings.po b/l10n/bg_BG/settings.po
index f83f6218c72d6a2d8cd81e3d94e6bca293745cf4..215c00671748a45d83ceb047342d3f4fc3c54b0d 100644
--- a/l10n/bg_BG/settings.po
+++ b/l10n/bg_BG/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:45-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgid "Unable to load list from App Store"
msgstr ""
#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
-#: ajax/togglegroups.php:20
+#: ajax/togglegroups.php:20 changepassword/controller.php:55
msgid "Authentication error"
msgstr "Възникна проблем Ñ Ð¸Ð´ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ñта"
@@ -84,6 +84,35 @@ msgstr ""
msgid "Couldn't update app."
msgstr ""
+#: changepassword/controller.php:20
+msgid "Wrong password"
+msgstr ""
+
+#: changepassword/controller.php:42
+msgid "No user supplied"
+msgstr ""
+
+#: changepassword/controller.php:74
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr ""
+
+#: changepassword/controller.php:79
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr ""
+
+#: changepassword/controller.php:87
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr ""
+
+#: changepassword/controller.php:92 changepassword/controller.php:103
+msgid "Unable to change password"
+msgstr ""
+
#: js/apps.js:43
msgid "Update to {appversion}"
msgstr "ОбновÑване до {appversion}"
@@ -128,15 +157,15 @@ msgstr "ОбновÑване"
msgid "Updated"
msgstr "Обновено"
-#: js/personal.js:217
+#: js/personal.js:220
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:262
+#: js/personal.js:265
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:284
+#: js/personal.js:287
msgid "Saving..."
msgstr "ЗапиÑване..."
diff --git a/l10n/bn_BD/core.po b/l10n/bn_BD/core.po
index d42a8ce0459c1921d246c88c3ca763cc7ab6bdd1..36e98dacdad8bfbf11ba427b53d3d7947210c50c 100644
--- a/l10n/bn_BD/core.po
+++ b/l10n/bn_BD/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:33+0000\n"
+"POT-Creation-Date: 2013-09-22 12:55-0400\n"
+"PO-Revision-Date: 2013-09-20 15:01+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
@@ -190,55 +190,55 @@ msgstr "ডিসেমà§à¦¬à¦°"
msgid "Settings"
msgstr "নিয়ামকসমূহ"
-#: js/js.js:853
+#: js/js.js:866
msgid "seconds ago"
msgstr "সেকেনà§à¦¡ পূরà§à¦¬à§‡"
-#: js/js.js:854
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:855
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:856
+#: js/js.js:869
msgid "today"
msgstr "আজ"
-#: js/js.js:857
+#: js/js.js:870
msgid "yesterday"
msgstr "গতকাল"
-#: js/js.js:858
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:859
+#: js/js.js:872
msgid "last month"
msgstr "গত মাস"
-#: js/js.js:860
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:861
+#: js/js.js:874
msgid "months ago"
msgstr "মাস পূরà§à¦¬à§‡"
-#: js/js.js:862
+#: js/js.js:875
msgid "last year"
msgstr "গত বছর"
-#: js/js.js:863
+#: js/js.js:876
msgid "years ago"
msgstr "বছর পূরà§à¦¬à§‡"
@@ -266,6 +266,46 @@ msgstr "তথাসà§à¦¤à§"
msgid "Error loading message template: {error}"
msgstr ""
+#: js/oc-dialogs.js:347
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:367
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:376
+msgid "Cancel"
+msgstr "বাতির"
+
+#: js/oc-dialogs.js:386
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:457
+msgid "Error loading file exists template"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/bn_BD/files.po b/l10n/bn_BD/files.po
index e2785070c36f7936d2a285f359ef0cb9b3e3cdd6..10ce6739f1104f8a4ab71f67c7a4fa86b7060995 100644
--- a/l10n/bn_BD/files.po
+++ b/l10n/bn_BD/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:00+0000\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
@@ -74,11 +74,15 @@ msgstr "ডিসà§à¦•à§‡ লিখতে বà§à¦¯à¦°à§à¦¥"
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:109
-msgid "Upload failed"
+#: ajax/upload.php:120 ajax/upload.php:143
+msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:127
+#: ajax/upload.php:136
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
+
+#: ajax/upload.php:160
msgid "Invalid directory."
msgstr "à¦à§à¦² ডিরেকà§à¦Ÿà¦°à¦¿"
@@ -86,144 +90,148 @@ msgstr "à¦à§à¦² ডিরেকà§à¦Ÿà¦°à¦¿"
msgid "Files"
msgstr "ফাইল"
-#: js/file-upload.js:11
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "আপনার ফাইলটি আপলোড করা সমà§à¦à¦¬ হলো না, কেননা à¦à¦Ÿà¦¿ হয় à¦à¦•à¦Ÿà¦¿ ফোলà§à¦¡à¦¾à¦° কিংবা à¦à¦° আকার ০ বাইট"
+#: js/file-upload.js:244
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
+msgstr ""
-#: js/file-upload.js:24
+#: js/file-upload.js:255
msgid "Not enough space available"
msgstr "যথেষà§à¦ পরিমাণ সà§à¦¥à¦¾à¦¨ নেই"
-#: js/file-upload.js:64
+#: js/file-upload.js:322
msgid "Upload cancelled."
msgstr "আপলোড বাতিল করা হয়েছে।"
-#: js/file-upload.js:165
+#: js/file-upload.js:356
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:446
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "ফাইল আপলোড চলমান। à¦à¦‡ পৃষà§à¦ া পরিতà§à¦¯à¦¾à¦— করলে আপলোড বাতিল করা হবে।"
-#: js/file-upload.js:239
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr "URL ফাà¦à¦•à¦¾ রাখা যাবে না।"
-#: js/file-upload.js:244 lib/app.php:53
+#: js/file-upload.js:525 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550
+#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545
msgid "Error"
msgstr "সমসà§à¦¯à¦¾"
-#: js/fileactions.js:116
+#: js/fileactions.js:119
msgid "Share"
msgstr "à¦à¦¾à¦—াà¦à¦¾à¦—ি কর"
-#: js/fileactions.js:126
+#: js/fileactions.js:131
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:192
+#: js/fileactions.js:197
msgid "Rename"
msgstr "পূনঃনামকরণ"
-#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "মà§à¦²à¦¤à§à¦¬à¦¿"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{new_name} টি বিদà§à¦¯à¦®à¦¾à¦¨"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "পà§à¦°à¦¤à¦¿à¦¸à§à¦¥à¦¾à¦ªà¦¨"
-#: js/filelist.js:307
+#: js/filelist.js:416
msgid "suggest name"
msgstr "নাম সà§à¦ªà¦¾à¦°à¦¿à¦¶ করà§à¦¨"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "বাতিল"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr "{new_name} কে {old_name} নামে পà§à¦°à¦¤à¦¿à¦¸à§à¦¥à¦¾à¦ªà¦¨ করা হয়েছে"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "undo"
msgstr "কà§à¦°à¦¿à§Ÿà¦¾ পà§à¦°à¦¤à§à¦¯à¦¾à¦¹à¦¾à¦°"
-#: js/filelist.js:424 js/filelist.js:490 js/files.js:581
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:425 js/filelist.js:491 js/files.js:587
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:432
+#: js/filelist.js:541
msgid "{dirs} and {files}"
msgstr ""
-#: js/filelist.js:563
+#: js/filelist.js:731 js/filelist.js:769
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:628
-msgid "files uploading"
-msgstr ""
-
-#: js/files.js:52
+#: js/files.js:25
msgid "'.' is an invalid file name."
msgstr "টি à¦à¦•à¦Ÿà¦¿ অননà§à¦®à§‹à¦¦à¦¿à¦¤ নাম।"
-#: js/files.js:56
+#: js/files.js:29
msgid "File name cannot be empty."
msgstr "ফাইলের নামটি ফাà¦à¦•à¦¾ রাখা যাবে না।"
-#: js/files.js:64
+#: js/files.js:37
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "নামটি সঠিক নয়, '\\', '/', '<', '>', ':', '\"', '|', '?' à¦à¦¬à¦‚ '*' অনà§à¦®à§‹à¦¦à¦¿à¦¤ নয়।"
-#: js/files.js:78
+#: js/files.js:51
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr ""
-#: js/files.js:82
+#: js/files.js:55
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:94
+#: js/files.js:67
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
msgstr ""
-#: js/files.js:245
+#: js/files.js:296
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/files.js:563 templates/index.php:69
+#: js/files.js:507 js/files.js:545
+msgid "Error moving file"
+msgstr ""
+
+#: js/files.js:558 templates/index.php:61
msgid "Name"
msgstr "রাম"
-#: js/files.js:564 templates/index.php:81
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "আকার"
-#: js/files.js:565 templates/index.php:83
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr "পরিবরà§à¦¤à¦¿à¦¤"
@@ -232,7 +240,7 @@ msgstr "পরিবরà§à¦¤à¦¿à¦¤"
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:11 templates/index.php:18
+#: lib/helper.php:11 templates/index.php:17
msgid "Upload"
msgstr "আপলোড"
@@ -268,65 +276,65 @@ msgstr "ZIP ফাইলের ইনপà§à¦Ÿà§‡à¦° সরà§à¦¬à§‹à¦šà§à¦š
msgid "Save"
msgstr "সংরকà§à¦·à¦£"
-#: templates/index.php:7
+#: templates/index.php:6
msgid "New"
msgstr "নতà§à¦¨"
-#: templates/index.php:10
+#: templates/index.php:9
msgid "Text file"
msgstr "টেকà§à¦¸à¦Ÿ ফাইল"
-#: templates/index.php:12
+#: templates/index.php:11
msgid "Folder"
msgstr "ফোলà§à¦¡à¦¾à¦°"
-#: templates/index.php:14
+#: templates/index.php:13
msgid "From link"
msgstr " লিংক থেকে"
-#: templates/index.php:41
+#: templates/index.php:33
msgid "Deleted files"
msgstr ""
-#: templates/index.php:46
+#: templates/index.php:39
msgid "Cancel upload"
msgstr "আপলোড বাতিল কর"
-#: templates/index.php:52
+#: templates/index.php:45
msgid "You don’t have write permissions here."
msgstr ""
-#: templates/index.php:59
+#: templates/index.php:50
msgid "Nothing in here. Upload something!"
msgstr "à¦à¦–ানে কিছà§à¦‡ নেই। কিছৠআপলোড করà§à¦¨ !"
-#: templates/index.php:75
+#: templates/index.php:67
msgid "Download"
msgstr "ডাউনলোড"
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr "à¦à¦¾à¦—াà¦à¦¾à¦—ি বাতিল "
-#: templates/index.php:94 templates/index.php:95
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "মà§à¦›à§‡"
-#: templates/index.php:108
+#: templates/index.php:100
msgid "Upload too large"
msgstr "আপলোডের আকারটি অনেক বড়"
-#: templates/index.php:110
+#: templates/index.php:102
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "আপনি à¦à¦‡ সারà§à¦à¦¾à¦°à§‡ আপলোড করার জনà§à¦¯ অনà§à¦®à§‹à¦¦à¦¿à¦¤ ফাইলের সরà§à¦¬à§‹à¦šà§à¦š আকারের চেয়ে বৃহদাকার ফাইল আপলোড করার চেষà§à¦Ÿà¦¾ করছেন "
-#: templates/index.php:115
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr "ফাইলগà§à¦²à§‹ সà§à¦•à§à¦¯à¦¾à¦¨ করা হচà§à¦›à§‡, দয়া করে অপেকà§à¦·à¦¾ করà§à¦¨à¥¤"
-#: templates/index.php:118
+#: templates/index.php:110
msgid "Current scanning"
msgstr "বরà§à¦¤à¦®à¦¾à¦¨ সà§à¦•à§à¦¯à¦¾à¦¨à¦¿à¦‚"
diff --git a/l10n/bn_BD/settings.po b/l10n/bn_BD/settings.po
index dc3e3ab4aec6e4781c3b5927cf7e6e80ddfc0984..b36011a8a59505889ed756e5ff1a9569e128b244 100644
--- a/l10n/bn_BD/settings.po
+++ b/l10n/bn_BD/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:45-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgid "Unable to load list from App Store"
msgstr "অà§à¦¯à¦¾à¦ªà¦¸à§à¦Ÿà§‹à¦° থেকে তালিকা লোড করতে সকà§à¦·à¦® নয়"
#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
-#: ajax/togglegroups.php:20
+#: ajax/togglegroups.php:20 changepassword/controller.php:55
msgid "Authentication error"
msgstr "অনà§à¦®à§‹à¦¦à¦¨ ঘটিত সমসà§à¦¯à¦¾"
@@ -84,6 +84,35 @@ msgstr "%s গোষà§à¦ ী থেকে বà§à¦¯à¦¬à¦¹à¦¾à¦°à¦•à¦¾à¦°à§€à¦•
msgid "Couldn't update app."
msgstr ""
+#: changepassword/controller.php:20
+msgid "Wrong password"
+msgstr ""
+
+#: changepassword/controller.php:42
+msgid "No user supplied"
+msgstr ""
+
+#: changepassword/controller.php:74
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr ""
+
+#: changepassword/controller.php:79
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr ""
+
+#: changepassword/controller.php:87
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr ""
+
+#: changepassword/controller.php:92 changepassword/controller.php:103
+msgid "Unable to change password"
+msgstr ""
+
#: js/apps.js:43
msgid "Update to {appversion}"
msgstr ""
@@ -128,15 +157,15 @@ msgstr "পরিবরà§à¦§à¦¨"
msgid "Updated"
msgstr ""
-#: js/personal.js:217
+#: js/personal.js:220
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:262
+#: js/personal.js:265
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:284
+#: js/personal.js:287
msgid "Saving..."
msgstr "সংরকà§à¦·à¦£ করা হচà§à¦›à§‡.."
diff --git a/l10n/bs/core.po b/l10n/bs/core.po
index b8e1e43613ab765de571b895ca1231a2facebb5e..5b4df12a3c84e2739fabf4dd5b2a3729037b5ac6 100644
--- a/l10n/bs/core.po
+++ b/l10n/bs/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n"
"MIME-Version: 1.0\n"
@@ -190,59 +190,59 @@ msgstr ""
msgid "Settings"
msgstr ""
-#: js/js.js:853
+#: js/js.js:866
msgid "seconds ago"
msgstr ""
-#: js/js.js:854
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:855
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:856
+#: js/js.js:869
msgid "today"
msgstr ""
-#: js/js.js:857
+#: js/js.js:870
msgid "yesterday"
msgstr ""
-#: js/js.js:858
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:859
+#: js/js.js:872
msgid "last month"
msgstr ""
-#: js/js.js:860
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:861
+#: js/js.js:874
msgid "months ago"
msgstr ""
-#: js/js.js:862
+#: js/js.js:875
msgid "last year"
msgstr ""
-#: js/js.js:863
+#: js/js.js:876
msgid "years ago"
msgstr ""
@@ -270,6 +270,47 @@ msgstr ""
msgid "Error loading message template: {error}"
msgstr ""
+#: js/oc-dialogs.js:347
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:367
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:376
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:386
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:457
+msgid "Error loading file exists template"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/bs/files.po b/l10n/bs/files.po
index 6c304b9289908f04cb790f93e66bbadce26b7e39..f825923a72bf7b63b93dad73b4f7a33311b2f18a 100644
--- a/l10n/bs/files.po
+++ b/l10n/bs/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-30 09:31-0400\n"
-"PO-Revision-Date: 2013-08-30 13:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n"
"MIME-Version: 1.0\n"
@@ -74,11 +74,15 @@ msgstr ""
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:109
-msgid "Upload failed"
+#: ajax/upload.php:120 ajax/upload.php:143
+msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:127
+#: ajax/upload.php:136
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
+
+#: ajax/upload.php:160
msgid "Invalid directory."
msgstr ""
@@ -86,147 +90,151 @@ msgstr ""
msgid "Files"
msgstr ""
-#: js/file-upload.js:11
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
+#: js/file-upload.js:244
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr ""
-#: js/file-upload.js:24
+#: js/file-upload.js:255
msgid "Not enough space available"
msgstr ""
-#: js/file-upload.js:64
+#: js/file-upload.js:322
msgid "Upload cancelled."
msgstr ""
-#: js/file-upload.js:165
+#: js/file-upload.js:356
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:446
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/file-upload.js:239
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr ""
-#: js/file-upload.js:244 lib/app.php:53
+#: js/file-upload.js:525 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
+#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545
msgid "Error"
msgstr ""
-#: js/fileactions.js:116
+#: js/fileactions.js:119
msgid "Share"
msgstr "Podijeli"
-#: js/fileactions.js:126
+#: js/fileactions.js:131
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:192
+#: js/fileactions.js:197
msgid "Rename"
msgstr ""
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr ""
-#: js/filelist.js:305 js/filelist.js:307
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr ""
-#: js/filelist.js:305 js/filelist.js:307
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr ""
-#: js/filelist.js:305
+#: js/filelist.js:416
msgid "suggest name"
msgstr ""
-#: js/filelist.js:305 js/filelist.js:307
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr ""
-#: js/filelist.js:352
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr ""
-#: js/filelist.js:352
+#: js/filelist.js:463
msgid "undo"
msgstr ""
-#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/filelist.js:430
+#: js/filelist.js:541
msgid "{dirs} and {files}"
msgstr ""
-#: js/filelist.js:561
+#: js/filelist.js:731 js/filelist.js:769
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/filelist.js:626
-msgid "files uploading"
-msgstr ""
-
-#: js/files.js:52
+#: js/files.js:25
msgid "'.' is an invalid file name."
msgstr ""
-#: js/files.js:56
+#: js/files.js:29
msgid "File name cannot be empty."
msgstr ""
-#: js/files.js:64
+#: js/files.js:37
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: js/files.js:78
+#: js/files.js:51
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr ""
-#: js/files.js:82
+#: js/files.js:55
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:94
+#: js/files.js:67
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
msgstr ""
-#: js/files.js:245
+#: js/files.js:296
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/files.js:562 templates/index.php:67
+#: js/files.js:507 js/files.js:545
+msgid "Error moving file"
+msgstr ""
+
+#: js/files.js:558 templates/index.php:61
msgid "Name"
msgstr "Ime"
-#: js/files.js:563 templates/index.php:78
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "VeliÄina"
-#: js/files.js:564 templates/index.php:80
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr ""
@@ -235,7 +243,7 @@ msgstr ""
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:11 templates/index.php:18
+#: lib/helper.php:11 templates/index.php:17
msgid "Upload"
msgstr ""
@@ -271,65 +279,65 @@ msgstr ""
msgid "Save"
msgstr "Spasi"
-#: templates/index.php:7
+#: templates/index.php:6
msgid "New"
msgstr ""
-#: templates/index.php:10
+#: templates/index.php:9
msgid "Text file"
msgstr ""
-#: templates/index.php:12
+#: templates/index.php:11
msgid "Folder"
msgstr "Fasikla"
-#: templates/index.php:14
+#: templates/index.php:13
msgid "From link"
msgstr ""
-#: templates/index.php:41
+#: templates/index.php:33
msgid "Deleted files"
msgstr ""
-#: templates/index.php:46
+#: templates/index.php:39
msgid "Cancel upload"
msgstr ""
-#: templates/index.php:52
+#: templates/index.php:45
msgid "You don’t have write permissions here."
msgstr ""
-#: templates/index.php:59
+#: templates/index.php:50
msgid "Nothing in here. Upload something!"
msgstr ""
-#: templates/index.php:73
+#: templates/index.php:67
msgid "Download"
msgstr ""
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr ""
-#: templates/index.php:91 templates/index.php:92
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr ""
-#: templates/index.php:105
+#: templates/index.php:100
msgid "Upload too large"
msgstr ""
-#: templates/index.php:107
+#: templates/index.php:102
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: templates/index.php:112
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:115
+#: templates/index.php:110
msgid "Current scanning"
msgstr ""
diff --git a/l10n/bs/settings.po b/l10n/bs/settings.po
index b77acd17b7fc195d257338d7a4f8b1b93b7b3f16..87fe921d4527378005bac40d6e5d1311b8fb7f79 100644
--- a/l10n/bs/settings.po
+++ b/l10n/bs/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:45-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n"
"MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgid "Unable to load list from App Store"
msgstr ""
#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
-#: ajax/togglegroups.php:20
+#: ajax/togglegroups.php:20 changepassword/controller.php:55
msgid "Authentication error"
msgstr ""
@@ -84,6 +84,35 @@ msgstr ""
msgid "Couldn't update app."
msgstr ""
+#: changepassword/controller.php:20
+msgid "Wrong password"
+msgstr ""
+
+#: changepassword/controller.php:42
+msgid "No user supplied"
+msgstr ""
+
+#: changepassword/controller.php:74
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr ""
+
+#: changepassword/controller.php:79
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr ""
+
+#: changepassword/controller.php:87
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr ""
+
+#: changepassword/controller.php:92 changepassword/controller.php:103
+msgid "Unable to change password"
+msgstr ""
+
#: js/apps.js:43
msgid "Update to {appversion}"
msgstr ""
@@ -128,15 +157,15 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:217
+#: js/personal.js:220
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:262
+#: js/personal.js:265
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:284
+#: js/personal.js:287
msgid "Saving..."
msgstr "Spašavam..."
diff --git a/l10n/ca/core.po b/l10n/ca/core.po
index 900c6cb8f00387e7c56a12a98954ce134b07b8df..aaabc519ac8d951ef67f9f2a4be3b0ab7d897b30 100644
--- a/l10n/ca/core.po
+++ b/l10n/ca/core.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:33+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-22 12:55-0400\n"
+"PO-Revision-Date: 2013-09-20 15:30+0000\n"
+"Last-Translator: rogerc\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -94,23 +94,23 @@ msgstr "Error en eliminar %s dels preferits."
#: avatar/controller.php:62
msgid "No image or file provided"
-msgstr ""
+msgstr "No s'han proporcionat imatges o fitxers"
#: avatar/controller.php:81
msgid "Unknown filetype"
-msgstr ""
+msgstr "Tipus de fitxer desconegut"
#: avatar/controller.php:85
msgid "Invalid image"
-msgstr ""
+msgstr "Imatge no và lida"
#: avatar/controller.php:115 avatar/controller.php:142
msgid "No temporary profile picture available, try again"
-msgstr ""
+msgstr "No hi ha imatge temporal de perfil disponible, torneu a intentar-ho"
#: avatar/controller.php:135
msgid "No crop data provided"
-msgstr ""
+msgstr "No heu proporcionat dades del retall"
#: js/config.php:32
msgid "Sunday"
@@ -192,55 +192,55 @@ msgstr "Desembre"
msgid "Settings"
msgstr "Configuració"
-#: js/js.js:853
+#: js/js.js:866
msgid "seconds ago"
msgstr "segons enrere"
-#: js/js.js:854
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "fa %n minut"
msgstr[1] "fa %n minuts"
-#: js/js.js:855
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "fa %n hora"
msgstr[1] "fa %n hores"
-#: js/js.js:856
+#: js/js.js:869
msgid "today"
msgstr "avui"
-#: js/js.js:857
+#: js/js.js:870
msgid "yesterday"
msgstr "ahir"
-#: js/js.js:858
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "fa %n dies"
msgstr[1] "fa %n dies"
-#: js/js.js:859
+#: js/js.js:872
msgid "last month"
msgstr "el mes passat"
-#: js/js.js:860
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "fa %n mes"
msgstr[1] "fa %n mesos"
-#: js/js.js:861
+#: js/js.js:874
msgid "months ago"
msgstr "mesos enrere"
-#: js/js.js:862
+#: js/js.js:875
msgid "last year"
msgstr "l'any passat"
-#: js/js.js:863
+#: js/js.js:876
msgid "years ago"
msgstr "anys enrere"
@@ -250,7 +250,7 @@ msgstr "Escull"
#: js/oc-dialogs.js:146
msgid "Error loading file picker template: {error}"
-msgstr ""
+msgstr "Error en carregar la plantilla de cà rrega de fitxers: {error}"
#: js/oc-dialogs.js:172
msgid "Yes"
@@ -266,7 +266,47 @@ msgstr "D'acord"
#: js/oc-dialogs.js:219
msgid "Error loading message template: {error}"
-msgstr ""
+msgstr "Error en carregar la plantilla de missatge: {error}"
+
+#: js/oc-dialogs.js:347
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] "{count} conflicte de fitxer"
+msgstr[1] "{count} conflictes de fitxer"
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr "Un fitxer en conflicte"
+
+#: js/oc-dialogs.js:367
+msgid "Which files do you want to keep?"
+msgstr "Quin fitxer voleu conservar?"
+
+#: js/oc-dialogs.js:368
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr "Si seleccioneu les dues versions, el fitxer copiat tindrà un número afegit al seu nom."
+
+#: js/oc-dialogs.js:376
+msgid "Cancel"
+msgstr "Cancel·la"
+
+#: js/oc-dialogs.js:386
+msgid "Continue"
+msgstr "Continua"
+
+#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+msgid "(all selected)"
+msgstr "(selecciona-ho tot)"
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "({count} selected)"
+msgstr "({count} seleccionats)"
+
+#: js/oc-dialogs.js:457
+msgid "Error loading file exists template"
+msgstr "Error en carregar la plantilla de fitxer existent"
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
diff --git a/l10n/ca/files.po b/l10n/ca/files.po
index ca6a5240892c10680eab318bbbc6aa0c5609ac64..82091cf75b36b3e4691d1e2f2139d2c0fcd68c6d 100644
--- a/l10n/ca/files.po
+++ b/l10n/ca/files.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:00+0000\n"
+"POT-Creation-Date: 2013-09-24 12:58-0400\n"
+"PO-Revision-Date: 2013-09-24 15:10+0000\n"
"Last-Translator: rogerc\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
@@ -76,156 +76,164 @@ msgstr "Ha fallat en escriure al disc"
msgid "Not enough storage available"
msgstr "No hi ha prou espai disponible"
-#: ajax/upload.php:109
-msgid "Upload failed"
-msgstr "La pujada ha fallat"
+#: ajax/upload.php:120 ajax/upload.php:143
+msgid "Upload failed. Could not get file info."
+msgstr "La pujada ha fallat. No s'ha pogut obtenir informació del fitxer."
-#: ajax/upload.php:127
+#: ajax/upload.php:136
+msgid "Upload failed. Could not find uploaded file"
+msgstr "La pujada ha fallat. El fitxer pujat no s'ha trobat."
+
+#: ajax/upload.php:160
msgid "Invalid directory."
msgstr "Directori no và lid."
-#: appinfo/app.php:12
+#: appinfo/app.php:11
msgid "Files"
msgstr "Fitxers"
-#: js/file-upload.js:11
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "No es pot pujar el fitxer perquè és una carpeta o té 0 bytes"
+#: js/file-upload.js:244
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
+msgstr "No es pot pujar {filename} perquè és una carpeta o té 0 bytes"
-#: js/file-upload.js:24
+#: js/file-upload.js:255
msgid "Not enough space available"
msgstr "No hi ha prou espai disponible"
-#: js/file-upload.js:64
+#: js/file-upload.js:322
msgid "Upload cancelled."
msgstr "La pujada s'ha cancel·lat."
-#: js/file-upload.js:165
+#: js/file-upload.js:356
+msgid "Could not get result from server."
+msgstr "No hi ha resposta del servidor."
+
+#: js/file-upload.js:446
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Hi ha una pujada en curs. Si abandoneu la pà gina la pujada es cancel·larà ."
-#: js/file-upload.js:239
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr "La URL no pot ser buida"
-#: js/file-upload.js:244 lib/app.php:53
+#: js/file-upload.js:525 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr "Nom de carpeta no và lid. L'ús de 'Shared' està reservat per Owncloud"
-#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550
+#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545
msgid "Error"
msgstr "Error"
-#: js/fileactions.js:116
+#: js/fileactions.js:119
msgid "Share"
msgstr "Comparteix"
-#: js/fileactions.js:126
+#: js/fileactions.js:131
msgid "Delete permanently"
msgstr "Esborra permanentment"
-#: js/fileactions.js:192
+#: js/fileactions.js:197
msgid "Rename"
msgstr "Reanomena"
-#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "Pendent"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{new_name} ja existeix"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "substitueix"
-#: js/filelist.js:307
+#: js/filelist.js:416
msgid "suggest name"
msgstr "sugereix un nom"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "cancel·la"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr "s'ha substituït {old_name} per {new_name}"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "undo"
msgstr "desfés"
-#: js/filelist.js:424 js/filelist.js:490 js/files.js:581
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "%n carpeta"
msgstr[1] "%n carpetes"
-#: js/filelist.js:425 js/filelist.js:491 js/files.js:587
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "%n fitxer"
msgstr[1] "%n fitxers"
-#: js/filelist.js:432
+#: js/filelist.js:541
msgid "{dirs} and {files}"
msgstr "{dirs} i {files}"
-#: js/filelist.js:563
+#: js/filelist.js:731 js/filelist.js:769
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "Pujant %n fitxer"
msgstr[1] "Pujant %n fitxers"
-#: js/filelist.js:628
-msgid "files uploading"
-msgstr "fitxers pujant"
-
-#: js/files.js:52
+#: js/files.js:25
msgid "'.' is an invalid file name."
msgstr "'.' és un nom no và lid per un fitxer."
-#: js/files.js:56
+#: js/files.js:29
msgid "File name cannot be empty."
msgstr "El nom del fitxer no pot ser buit."
-#: js/files.js:64
+#: js/files.js:37
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "El nóm no és và lid, '\\', '/', '<', '>', ':', '\"', '|', '?' i '*' no estan permesos."
-#: js/files.js:78
+#: js/files.js:51
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr "El vostre espai d'emmagatzemament és ple, els fitxers ja no es poden actualitzar o sincronitzar!"
-#: js/files.js:82
+#: js/files.js:55
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "El vostre espai d'emmagatzemament és gairebé ple ({usedSpacePercent}%)"
-#: js/files.js:94
+#: js/files.js:67
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
msgstr "L'encriptació s'ha desactivat però els vostres fitxers segueixen encriptats. Aneu a la vostra configuració personal per desencriptar els vostres fitxers."
-#: js/files.js:245
+#: js/files.js:296
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "S'està preparant la baixada. Pot trigar una estona si els fitxers són grans."
-#: js/files.js:563 templates/index.php:69
+#: js/files.js:507 js/files.js:545
+msgid "Error moving file"
+msgstr "Error en moure el fitxer"
+
+#: js/files.js:558 templates/index.php:61
msgid "Name"
msgstr "Nom"
-#: js/files.js:564 templates/index.php:81
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "Mida"
-#: js/files.js:565 templates/index.php:83
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr "Modificat"
@@ -234,7 +242,7 @@ msgstr "Modificat"
msgid "%s could not be renamed"
msgstr "%s no es pot canviar el nom"
-#: lib/helper.php:11 templates/index.php:18
+#: lib/helper.php:11 templates/index.php:17
msgid "Upload"
msgstr "Puja"
@@ -270,65 +278,65 @@ msgstr "Mida mà xima d'entrada per fitxers ZIP"
msgid "Save"
msgstr "Desa"
-#: templates/index.php:7
+#: templates/index.php:6
msgid "New"
msgstr "Nou"
-#: templates/index.php:10
+#: templates/index.php:9
msgid "Text file"
msgstr "Fitxer de text"
-#: templates/index.php:12
+#: templates/index.php:11
msgid "Folder"
msgstr "Carpeta"
-#: templates/index.php:14
+#: templates/index.php:13
msgid "From link"
msgstr "Des d'enllaç"
-#: templates/index.php:41
+#: templates/index.php:33
msgid "Deleted files"
msgstr "Fitxers esborrats"
-#: templates/index.php:46
+#: templates/index.php:39
msgid "Cancel upload"
msgstr "Cancel·la la pujada"
-#: templates/index.php:52
+#: templates/index.php:45
msgid "You don’t have write permissions here."
msgstr "No teniu permisos d'escriptura aquÃ."
-#: templates/index.php:59
+#: templates/index.php:50
msgid "Nothing in here. Upload something!"
msgstr "Res per aquÃ. Pugeu alguna cosa!"
-#: templates/index.php:75
+#: templates/index.php:67
msgid "Download"
msgstr "Baixa"
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr "Deixa de compartir"
-#: templates/index.php:94 templates/index.php:95
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "Esborra"
-#: templates/index.php:108
+#: templates/index.php:100
msgid "Upload too large"
msgstr "La pujada és massa gran"
-#: templates/index.php:110
+#: templates/index.php:102
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Els fitxers que esteu intentant pujar excedeixen la mida mà xima de pujada del servidor"
-#: templates/index.php:115
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr "S'estan escanejant els fitxers, espereu"
-#: templates/index.php:118
+#: templates/index.php:110
msgid "Current scanning"
msgstr "Actualment escanejant"
diff --git a/l10n/ca/lib.po b/l10n/ca/lib.po
index 641242729f71c9352ab7dd2944d89d6cf3b678d8..c82e5efacb6ed72d492e653c99490ff73a044c21 100644
--- a/l10n/ca/lib.po
+++ b/l10n/ca/lib.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-18 11:47-0400\n"
+"PO-Revision-Date: 2013-09-17 13:32+0000\n"
+"Last-Translator: rogerc\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -56,15 +56,15 @@ msgstr "Ha fallat l'actualització \"%s\"."
#: avatar.php:56
msgid "Custom profile pictures don't work with encryption yet"
-msgstr ""
+msgstr "Les imatges de perfil personals encara no funcionen amb encriptació"
#: avatar.php:64
msgid "Unknown filetype"
-msgstr ""
+msgstr "Tipus de fitxer desconegut"
#: avatar.php:69
msgid "Invalid image"
-msgstr ""
+msgstr "Imatge no và lida"
#: defaults.php:35
msgid "web services under your control"
diff --git a/l10n/ca/settings.po b/l10n/ca/settings.po
index 7f010b29f54acf69c9981a03f3f101cc536f672d..1053dcb2434dd984f9431d48d6e3070d331d320d 100644
--- a/l10n/ca/settings.po
+++ b/l10n/ca/settings.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-22 12:56-0400\n"
+"PO-Revision-Date: 2013-09-20 15:20+0000\n"
+"Last-Translator: rogerc\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -24,7 +24,7 @@ msgid "Unable to load list from App Store"
msgstr "No s'ha pogut carregar la llista des de l'App Store"
#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
-#: ajax/togglegroups.php:20
+#: ajax/togglegroups.php:20 changepassword/controller.php:55
msgid "Authentication error"
msgstr "Error d'autenticació"
@@ -86,6 +86,35 @@ msgstr "No es pot eliminar l'usuari del grup %s"
msgid "Couldn't update app."
msgstr "No s'ha pogut actualitzar l'aplicació."
+#: changepassword/controller.php:20
+msgid "Wrong password"
+msgstr "Contrasenya incorrecta"
+
+#: changepassword/controller.php:42
+msgid "No user supplied"
+msgstr "No heu proporcionat cap usuari"
+
+#: changepassword/controller.php:74
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr "Sisplau, proporcioneu una contrasenya de recuperació d'administrador, altrament totes les dades d'usuari es perdran"
+
+#: changepassword/controller.php:79
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr "La contrasenya de recuperació d'administrador és incorrecta. Comproveu-la i torneu-ho a intentar."
+
+#: changepassword/controller.php:87
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr "El dorsal no permet canviar la contrasenya, però la clau d'encripació d'usuaris s'ha actualitzat correctament."
+
+#: changepassword/controller.php:92 changepassword/controller.php:103
+msgid "Unable to change password"
+msgstr "No es pot canviar la contrasenya"
+
#: js/apps.js:43
msgid "Update to {appversion}"
msgstr "Actualitza a {appversion}"
@@ -130,15 +159,15 @@ msgstr "Actualitza"
msgid "Updated"
msgstr "Actualitzada"
-#: js/personal.js:217
+#: js/personal.js:220
msgid "Select a profile picture"
-msgstr ""
+msgstr "Seleccioneu una imatge de perfil"
-#: js/personal.js:262
+#: js/personal.js:265
msgid "Decrypting files... Please wait, this can take some time."
msgstr "Desencriptant fitxers... Espereu, això pot trigar una estona."
-#: js/personal.js:284
+#: js/personal.js:287
msgid "Saving..."
msgstr "Desant..."
@@ -462,31 +491,31 @@ msgstr "Ompliu el correu electrònic per activar la recuperació de contrasenya"
#: templates/personal.php:86
msgid "Profile picture"
-msgstr ""
+msgstr "Foto de perfil"
#: templates/personal.php:90
msgid "Upload new"
-msgstr ""
+msgstr "Puja'n una de nova"
#: templates/personal.php:92
msgid "Select new from Files"
-msgstr ""
+msgstr "Selecciona'n una de nova dels fitxers"
#: templates/personal.php:93
msgid "Remove image"
-msgstr ""
+msgstr "Elimina imatge"
#: templates/personal.php:94
msgid "Either png or jpg. Ideally square but you will be able to crop it."
-msgstr ""
+msgstr "Pot ser png o jpg. Idealment quadrada, però podreu retallar-la."
#: templates/personal.php:97
msgid "Abort"
-msgstr ""
+msgstr "Cancel·la"
#: templates/personal.php:98
msgid "Choose as profile image"
-msgstr ""
+msgstr "Selecciona com a imatge de perfil"
#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
diff --git a/l10n/cs_CZ/core.po b/l10n/cs_CZ/core.po
index e16afa26bb1bc5c8b0e96d4f5cc4bb32dec2756b..61a7e861b2a9ca5bc14c45513e635168031d2ed5 100644
--- a/l10n/cs_CZ/core.po
+++ b/l10n/cs_CZ/core.po
@@ -12,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-09-22 12:55-0400\n"
+"PO-Revision-Date: 2013-09-20 15:01+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
@@ -97,23 +97,23 @@ msgstr "Chyba pÅ™i odebÃránà %s z oblÃbených."
#: avatar/controller.php:62
msgid "No image or file provided"
-msgstr ""
+msgstr "Soubor nebo obrázek nebyl zadán"
#: avatar/controller.php:81
msgid "Unknown filetype"
-msgstr ""
+msgstr "Neznámý typ souboru"
#: avatar/controller.php:85
msgid "Invalid image"
-msgstr ""
+msgstr "Chybný obrázek"
#: avatar/controller.php:115 avatar/controller.php:142
msgid "No temporary profile picture available, try again"
-msgstr ""
+msgstr "DoÄasný profilový obrázek nenà k dispozici, zkuste to znovu"
#: avatar/controller.php:135
msgid "No crop data provided"
-msgstr ""
+msgstr "Nebyla poskytnuta data pro oÅ™Ãznutà obrázku"
#: js/config.php:32
msgid "Sunday"
@@ -195,59 +195,59 @@ msgstr "Prosinec"
msgid "Settings"
msgstr "NastavenÃ"
-#: js/js.js:853
+#: js/js.js:866
msgid "seconds ago"
msgstr "před pár vteřinami"
-#: js/js.js:854
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "před %n minutou"
msgstr[1] "před %n minutami"
msgstr[2] "před %n minutami"
-#: js/js.js:855
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "před %n hodinou"
msgstr[1] "před %n hodinami"
msgstr[2] "před %n hodinami"
-#: js/js.js:856
+#: js/js.js:869
msgid "today"
msgstr "dnes"
-#: js/js.js:857
+#: js/js.js:870
msgid "yesterday"
msgstr "vÄera"
-#: js/js.js:858
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "před %n dnem"
msgstr[1] "před %n dny"
msgstr[2] "před %n dny"
-#: js/js.js:859
+#: js/js.js:872
msgid "last month"
msgstr "minulý mÄ›sÃc"
-#: js/js.js:860
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "pÅ™ed %n mÄ›sÃcem"
msgstr[1] "pÅ™ed %n mÄ›sÃci"
msgstr[2] "pÅ™ed %n mÄ›sÃci"
-#: js/js.js:861
+#: js/js.js:874
msgid "months ago"
msgstr "pÅ™ed mÄ›sÃci"
-#: js/js.js:862
+#: js/js.js:875
msgid "last year"
msgstr "minulý rok"
-#: js/js.js:863
+#: js/js.js:876
msgid "years ago"
msgstr "před lety"
@@ -257,7 +257,7 @@ msgstr "Vybrat"
#: js/oc-dialogs.js:146
msgid "Error loading file picker template: {error}"
-msgstr ""
+msgstr "Chyba při nahrávánà šablony výběru souborů: {error}"
#: js/oc-dialogs.js:172
msgid "Yes"
@@ -273,6 +273,47 @@ msgstr "Ok"
#: js/oc-dialogs.js:219
msgid "Error loading message template: {error}"
+msgstr "Chyba při nahrávánà šablony zprávy: {error}"
+
+#: js/oc-dialogs.js:347
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:367
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:376
+msgid "Cancel"
+msgstr "Zrušit"
+
+#: js/oc-dialogs.js:386
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:457
+msgid "Error loading file exists template"
msgstr ""
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
diff --git a/l10n/cs_CZ/files.po b/l10n/cs_CZ/files.po
index 92e790b87852b027163a0fbffc99bfbb5be13d29..7ce4b33052159b99a4626f186c2e6e49c9b6f9a3 100644
--- a/l10n/cs_CZ/files.po
+++ b/l10n/cs_CZ/files.po
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:00+0000\n"
-"Last-Translator: pstast <petr@stastny.eu>\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -78,11 +78,15 @@ msgstr "Zápis na disk selhal"
msgid "Not enough storage available"
msgstr "Nedostatek dostupného úložného prostoru"
-#: ajax/upload.php:109
-msgid "Upload failed"
-msgstr "OdesÃlánà selhalo"
+#: ajax/upload.php:120 ajax/upload.php:143
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:136
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
-#: ajax/upload.php:127
+#: ajax/upload.php:160
msgid "Invalid directory."
msgstr "Neplatný adresář"
@@ -90,147 +94,151 @@ msgstr "Neplatný adresář"
msgid "Files"
msgstr "Soubory"
-#: js/file-upload.js:11
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Nelze odeslat Váš soubor, protože je to adresář nebo jeho velikost je 0 bajtů"
+#: js/file-upload.js:244
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
+msgstr ""
-#: js/file-upload.js:24
+#: js/file-upload.js:255
msgid "Not enough space available"
msgstr "Nedostatek volného mÃsta"
-#: js/file-upload.js:64
+#: js/file-upload.js:322
msgid "Upload cancelled."
msgstr "OdesÃlánà zruÅ¡eno."
-#: js/file-upload.js:165
+#: js/file-upload.js:356
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:446
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "ProbÃhá odesÃlánà souboru. OpuÅ¡tÄ›nà stránky způsobà zruÅ¡enà nahrávánÃ."
-#: js/file-upload.js:239
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr "URL nemůže být prázdná."
-#: js/file-upload.js:244 lib/app.php:53
+#: js/file-upload.js:525 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr "Název složky nelze použÃt. Použità názvu 'Shared' je ownCloudem rezervováno"
-#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550
+#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545
msgid "Error"
msgstr "Chyba"
-#: js/fileactions.js:116
+#: js/fileactions.js:119
msgid "Share"
msgstr "SdÃlet"
-#: js/fileactions.js:126
+#: js/fileactions.js:131
msgid "Delete permanently"
msgstr "Trvale odstranit"
-#: js/fileactions.js:192
+#: js/fileactions.js:197
msgid "Rename"
msgstr "Přejmenovat"
-#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "NevyÅ™Ãzené"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{new_name} již existuje"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "nahradit"
-#: js/filelist.js:307
+#: js/filelist.js:416
msgid "suggest name"
msgstr "navrhnout název"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "zrušit"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr "nahrazeno {new_name} s {old_name}"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "undo"
msgstr "vrátit zpět"
-#: js/filelist.js:424 js/filelist.js:490 js/files.js:581
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "%n složka"
msgstr[1] "%n složky"
msgstr[2] "%n složek"
-#: js/filelist.js:425 js/filelist.js:491 js/files.js:587
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "%n soubor"
msgstr[1] "%n soubory"
msgstr[2] "%n souborů"
-#: js/filelist.js:432
+#: js/filelist.js:541
msgid "{dirs} and {files}"
msgstr "{dirs} a {files}"
-#: js/filelist.js:563
+#: js/filelist.js:731 js/filelist.js:769
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "Nahrávám %n soubor"
msgstr[1] "Nahrávám %n soubory"
msgstr[2] "Nahrávám %n souborů"
-#: js/filelist.js:628
-msgid "files uploading"
-msgstr "soubory se odesÃlajÃ"
-
-#: js/files.js:52
+#: js/files.js:25
msgid "'.' is an invalid file name."
msgstr "'.' je neplatným názvem souboru."
-#: js/files.js:56
+#: js/files.js:29
msgid "File name cannot be empty."
msgstr "Název souboru nemůže být prázdný řetězec."
-#: js/files.js:64
+#: js/files.js:37
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Neplatný název, znaky '\\', '/', '<', '>', ':', '\"', '|', '?' a '*' nejsou povoleny."
-#: js/files.js:78
+#: js/files.js:51
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr "Vaše úložiště je plné, nelze aktualizovat ani synchronizovat soubory."
-#: js/files.js:82
+#: js/files.js:55
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Vaše úložiště je téměř plné ({usedSpacePercent}%)"
-#: js/files.js:94
+#: js/files.js:67
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
msgstr "Å ifrovánà bylo vypnuto, vaÅ¡e soubory jsou vÅ¡ak stále zaÅ¡ifrované. Běžte prosÃm do osobnÃho nastavenÃ, kde soubory odÅ¡ifrujete."
-#: js/files.js:245
+#: js/files.js:296
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "VaÅ¡e soubory ke staženà se pÅ™ipravujÃ. Pokud jsou velké, může to chvÃli trvat."
-#: js/files.js:563 templates/index.php:69
+#: js/files.js:507 js/files.js:545
+msgid "Error moving file"
+msgstr ""
+
+#: js/files.js:558 templates/index.php:61
msgid "Name"
msgstr "Název"
-#: js/files.js:564 templates/index.php:81
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "Velikost"
-#: js/files.js:565 templates/index.php:83
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr "Upraveno"
@@ -239,7 +247,7 @@ msgstr "Upraveno"
msgid "%s could not be renamed"
msgstr "%s nemůže být přejmenován"
-#: lib/helper.php:11 templates/index.php:18
+#: lib/helper.php:11 templates/index.php:17
msgid "Upload"
msgstr "Odeslat"
@@ -275,65 +283,65 @@ msgstr "Maximálnà velikost vstupu pro ZIP soubory"
msgid "Save"
msgstr "Uložit"
-#: templates/index.php:7
+#: templates/index.php:6
msgid "New"
msgstr "Nový"
-#: templates/index.php:10
+#: templates/index.php:9
msgid "Text file"
msgstr "Textový soubor"
-#: templates/index.php:12
+#: templates/index.php:11
msgid "Folder"
msgstr "Složka"
-#: templates/index.php:14
+#: templates/index.php:13
msgid "From link"
msgstr "Z odkazu"
-#: templates/index.php:41
+#: templates/index.php:33
msgid "Deleted files"
msgstr "Odstraněné soubory"
-#: templates/index.php:46
+#: templates/index.php:39
msgid "Cancel upload"
msgstr "ZruÅ¡it odesÃlánÃ"
-#: templates/index.php:52
+#: templates/index.php:45
msgid "You don’t have write permissions here."
msgstr "Nemáte zde práva zápisu."
-#: templates/index.php:59
+#: templates/index.php:50
msgid "Nothing in here. Upload something!"
msgstr "Žádný obsah. Nahrajte něco."
-#: templates/index.php:75
+#: templates/index.php:67
msgid "Download"
msgstr "Stáhnout"
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr "ZruÅ¡it sdÃlenÃ"
-#: templates/index.php:94 templates/index.php:95
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "Smazat"
-#: templates/index.php:108
+#: templates/index.php:100
msgid "Upload too large"
msgstr "OdesÃlaný soubor je pÅ™ÃliÅ¡ velký"
-#: templates/index.php:110
+#: templates/index.php:102
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Soubory, které se snažÃte odeslat, pÅ™ekraÄujà limit velikosti odesÃlánà na tomto serveru."
-#: templates/index.php:115
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr "Soubory se prohledávajÃ, prosÃm Äekejte."
-#: templates/index.php:118
+#: templates/index.php:110
msgid "Current scanning"
msgstr "Aktuálnà prohledávánÃ"
diff --git a/l10n/cs_CZ/lib.po b/l10n/cs_CZ/lib.po
index 183bc420e8006874254a758089dc925e03bf4a08..ef75336427f2a0bda8343db33ffdfda14e5ac595 100644
--- a/l10n/cs_CZ/lib.po
+++ b/l10n/cs_CZ/lib.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-18 11:47-0400\n"
+"PO-Revision-Date: 2013-09-17 18:20+0000\n"
+"Last-Translator: pstast <petr@stastny.eu>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -58,15 +58,15 @@ msgstr "Selhala aktualizace verze \"%s\"."
#: avatar.php:56
msgid "Custom profile pictures don't work with encryption yet"
-msgstr ""
+msgstr "Vlastnà profilové obrázky zatÃm nefungujà v kombinaci se Å¡ifrovánÃm"
#: avatar.php:64
msgid "Unknown filetype"
-msgstr ""
+msgstr "Neznámý typ souboru"
#: avatar.php:69
msgid "Invalid image"
-msgstr ""
+msgstr "Chybný obrázek"
#: defaults.php:35
msgid "web services under your control"
diff --git a/l10n/cs_CZ/settings.po b/l10n/cs_CZ/settings.po
index 3d030548d8b65024459b15327109fa0c2944d996..b979460916a764f7a852469637596425e8739de0 100644
--- a/l10n/cs_CZ/settings.po
+++ b/l10n/cs_CZ/settings.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:45-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgid "Unable to load list from App Store"
msgstr "Nelze naÄÃst seznam z App Store"
#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
-#: ajax/togglegroups.php:20
+#: ajax/togglegroups.php:20 changepassword/controller.php:55
msgid "Authentication error"
msgstr "Chyba pÅ™ihlášenÃ"
@@ -88,6 +88,35 @@ msgstr "Nelze odebrat uživatele ze skupiny %s"
msgid "Couldn't update app."
msgstr "Nelze aktualizovat aplikaci."
+#: changepassword/controller.php:20
+msgid "Wrong password"
+msgstr "Nesprávné heslo"
+
+#: changepassword/controller.php:42
+msgid "No user supplied"
+msgstr "Nebyl uveden uživatel"
+
+#: changepassword/controller.php:74
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr "Zadejte prosÃm administrátorské heslo pro obnovu, jinak budou vÅ¡echna data ztracena"
+
+#: changepassword/controller.php:79
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr "Chybné administrátorské heslo pro obnovu. Překontrolujte správnost hesla a zkuste to znovu."
+
+#: changepassword/controller.php:87
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr "ÚložiÅ¡tÄ› nepodporuje zmÄ›nu hesla, ale Å¡ifrovacà klÃÄ uživatelů byl úspěšnÄ› zmÄ›nÄ›n."
+
+#: changepassword/controller.php:92 changepassword/controller.php:103
+msgid "Unable to change password"
+msgstr "Změna hesla se nezdařila"
+
#: js/apps.js:43
msgid "Update to {appversion}"
msgstr "Aktualizovat na {appversion}"
@@ -132,15 +161,15 @@ msgstr "Aktualizovat"
msgid "Updated"
msgstr "Aktualizováno"
-#: js/personal.js:217
+#: js/personal.js:220
msgid "Select a profile picture"
-msgstr ""
+msgstr "Vyberte profilový obrázek"
-#: js/personal.js:262
+#: js/personal.js:265
msgid "Decrypting files... Please wait, this can take some time."
msgstr "ProbÃhá deÅ¡ifrovánà souborů... ÄŒekejte prosÃm, tato operace může trvat nÄ›jakou dobu."
-#: js/personal.js:284
+#: js/personal.js:287
msgid "Saving..."
msgstr "Ukládám..."
@@ -464,31 +493,31 @@ msgstr "Pro povolenà obnovy hesla vyplňte e-mailovou adresu"
#: templates/personal.php:86
msgid "Profile picture"
-msgstr ""
+msgstr "Profilová fotka"
#: templates/personal.php:90
msgid "Upload new"
-msgstr ""
+msgstr "Nahrát nový"
#: templates/personal.php:92
msgid "Select new from Files"
-msgstr ""
+msgstr "Vyberte nový ze souborů"
#: templates/personal.php:93
msgid "Remove image"
-msgstr ""
+msgstr "Odebrat obrázek"
#: templates/personal.php:94
msgid "Either png or jpg. Ideally square but you will be able to crop it."
-msgstr ""
+msgstr "png nebo jpg, nejlépe Ätvercový, ale budete mÃt možnost jej oÅ™Ãznout."
#: templates/personal.php:97
msgid "Abort"
-msgstr ""
+msgstr "Přerušit"
#: templates/personal.php:98
msgid "Choose as profile image"
-msgstr ""
+msgstr "Vybrat jako profilový obrázek"
#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
diff --git a/l10n/cy_GB/core.po b/l10n/cy_GB/core.po
index fbafa1ed11d3c25e7acf617243f1f578bd6969d2..1e0692c377bcd6687e23ab3b275b872009ad1074 100644
--- a/l10n/cy_GB/core.po
+++ b/l10n/cy_GB/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:33+0000\n"
+"POT-Creation-Date: 2013-09-22 12:55-0400\n"
+"PO-Revision-Date: 2013-09-20 15:01+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
"MIME-Version: 1.0\n"
@@ -191,11 +191,11 @@ msgstr "Rhagfyr"
msgid "Settings"
msgstr "Gosodiadau"
-#: js/js.js:853
+#: js/js.js:866
msgid "seconds ago"
msgstr "eiliad yn ôl"
-#: js/js.js:854
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
@@ -203,7 +203,7 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: js/js.js:855
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
@@ -211,15 +211,15 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: js/js.js:856
+#: js/js.js:869
msgid "today"
msgstr "heddiw"
-#: js/js.js:857
+#: js/js.js:870
msgid "yesterday"
msgstr "ddoe"
-#: js/js.js:858
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
@@ -227,11 +227,11 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: js/js.js:859
+#: js/js.js:872
msgid "last month"
msgstr "mis diwethaf"
-#: js/js.js:860
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
@@ -239,15 +239,15 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: js/js.js:861
+#: js/js.js:874
msgid "months ago"
msgstr "misoedd yn ôl"
-#: js/js.js:862
+#: js/js.js:875
msgid "last year"
msgstr "y llynedd"
-#: js/js.js:863
+#: js/js.js:876
msgid "years ago"
msgstr "blwyddyn yn ôl"
@@ -275,6 +275,48 @@ msgstr "Iawn"
msgid "Error loading message template: {error}"
msgstr ""
+#: js/oc-dialogs.js:347
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:367
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:376
+msgid "Cancel"
+msgstr "Diddymu"
+
+#: js/oc-dialogs.js:386
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:457
+msgid "Error loading file exists template"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/cy_GB/files.po b/l10n/cy_GB/files.po
index aa6678894309872a0abae1e696ca684bce1f799e..e2d27216bbb5e2e9488b06f9aeacd9552246a464 100644
--- a/l10n/cy_GB/files.po
+++ b/l10n/cy_GB/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:00+0000\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
"MIME-Version: 1.0\n"
@@ -74,11 +74,15 @@ msgstr "Methwyd ysgrifennu i'r ddisg"
msgid "Not enough storage available"
msgstr "Dim digon o le storio ar gael"
-#: ajax/upload.php:109
-msgid "Upload failed"
-msgstr "Methwyd llwytho i fyny"
+#: ajax/upload.php:120 ajax/upload.php:143
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:136
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
-#: ajax/upload.php:127
+#: ajax/upload.php:160
msgid "Invalid directory."
msgstr "Cyfeiriadur annilys."
@@ -86,76 +90,80 @@ msgstr "Cyfeiriadur annilys."
msgid "Files"
msgstr "Ffeiliau"
-#: js/file-upload.js:11
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Methu llwytho'ch ffeil i fyny gan ei fod yn gyferiadur neu'n cynnwys 0 beit"
+#: js/file-upload.js:244
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
+msgstr ""
-#: js/file-upload.js:24
+#: js/file-upload.js:255
msgid "Not enough space available"
msgstr "Dim digon o le ar gael"
-#: js/file-upload.js:64
+#: js/file-upload.js:322
msgid "Upload cancelled."
msgstr "Diddymwyd llwytho i fyny."
-#: js/file-upload.js:165
+#: js/file-upload.js:356
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:446
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Mae ffeiliau'n cael eu llwytho i fyny. Bydd gadael y dudalen hon nawr yn diddymu'r broses."
-#: js/file-upload.js:239
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr "Does dim hawl cael URL gwag."
-#: js/file-upload.js:244 lib/app.php:53
+#: js/file-upload.js:525 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550
+#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545
msgid "Error"
msgstr "Gwall"
-#: js/fileactions.js:116
+#: js/fileactions.js:119
msgid "Share"
msgstr "Rhannu"
-#: js/fileactions.js:126
+#: js/fileactions.js:131
msgid "Delete permanently"
msgstr "Dileu'n barhaol"
-#: js/fileactions.js:192
+#: js/fileactions.js:197
msgid "Rename"
msgstr "Ailenwi"
-#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "I ddod"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{new_name} yn bodoli'n barod"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "amnewid"
-#: js/filelist.js:307
+#: js/filelist.js:416
msgid "suggest name"
msgstr "awgrymu enw"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "diddymu"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr "newidiwyd {new_name} yn lle {old_name}"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "undo"
msgstr "dadwneud"
-#: js/filelist.js:424 js/filelist.js:490 js/files.js:581
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
@@ -163,7 +171,7 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: js/filelist.js:425 js/filelist.js:491 js/files.js:587
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
@@ -171,11 +179,11 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: js/filelist.js:432
+#: js/filelist.js:541
msgid "{dirs} and {files}"
msgstr ""
-#: js/filelist.js:563
+#: js/filelist.js:731 js/filelist.js:769
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
@@ -183,53 +191,53 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: js/filelist.js:628
-msgid "files uploading"
-msgstr "ffeiliau'n llwytho i fyny"
-
-#: js/files.js:52
+#: js/files.js:25
msgid "'.' is an invalid file name."
msgstr "Mae '.' yn enw ffeil annilys."
-#: js/files.js:56
+#: js/files.js:29
msgid "File name cannot be empty."
msgstr "Does dim hawl cael enw ffeil gwag."
-#: js/files.js:64
+#: js/files.js:37
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Enw annilys, ni chaniateir, '\\', '/', '<', '>', ':', '\"', '|', '?' na '*'."
-#: js/files.js:78
+#: js/files.js:51
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr "Mae eich storfa'n llawn, ni ellir diweddaru a chydweddu ffeiliau mwyach!"
-#: js/files.js:82
+#: js/files.js:55
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Mae eich storfa bron a bod yn llawn ({usedSpacePercent}%)"
-#: js/files.js:94
+#: js/files.js:67
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
msgstr ""
-#: js/files.js:245
+#: js/files.js:296
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "Wrthi'n paratoi i lwytho i lawr. Gall gymryd peth amser os yw'r ffeiliau'n fawr."
-#: js/files.js:563 templates/index.php:69
+#: js/files.js:507 js/files.js:545
+msgid "Error moving file"
+msgstr ""
+
+#: js/files.js:558 templates/index.php:61
msgid "Name"
msgstr "Enw"
-#: js/files.js:564 templates/index.php:81
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "Maint"
-#: js/files.js:565 templates/index.php:83
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr "Addaswyd"
@@ -238,7 +246,7 @@ msgstr "Addaswyd"
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:11 templates/index.php:18
+#: lib/helper.php:11 templates/index.php:17
msgid "Upload"
msgstr "Llwytho i fyny"
@@ -274,65 +282,65 @@ msgstr "Maint mewnbynnu mwyaf ffeiliau ZIP"
msgid "Save"
msgstr "Cadw"
-#: templates/index.php:7
+#: templates/index.php:6
msgid "New"
msgstr "Newydd"
-#: templates/index.php:10
+#: templates/index.php:9
msgid "Text file"
msgstr "Ffeil destun"
-#: templates/index.php:12
+#: templates/index.php:11
msgid "Folder"
msgstr "Plygell"
-#: templates/index.php:14
+#: templates/index.php:13
msgid "From link"
msgstr "Dolen o"
-#: templates/index.php:41
+#: templates/index.php:33
msgid "Deleted files"
msgstr "Ffeiliau ddilewyd"
-#: templates/index.php:46
+#: templates/index.php:39
msgid "Cancel upload"
msgstr "Diddymu llwytho i fyny"
-#: templates/index.php:52
+#: templates/index.php:45
msgid "You don’t have write permissions here."
msgstr "Nid oes gennych hawliau ysgrifennu fan hyn."
-#: templates/index.php:59
+#: templates/index.php:50
msgid "Nothing in here. Upload something!"
msgstr "Does dim byd fan hyn. Llwythwch rhywbeth i fyny!"
-#: templates/index.php:75
+#: templates/index.php:67
msgid "Download"
msgstr "Llwytho i lawr"
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr "Dad-rannu"
-#: templates/index.php:94 templates/index.php:95
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "Dileu"
-#: templates/index.php:108
+#: templates/index.php:100
msgid "Upload too large"
msgstr "Maint llwytho i fyny'n rhy fawr"
-#: templates/index.php:110
+#: templates/index.php:102
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Mae'r ffeiliau rydych yn ceisio llwytho i fyny'n fwy na maint mwyaf llwytho ffeiliau i fyny ar y gweinydd hwn."
-#: templates/index.php:115
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr "Arhoswch, mae ffeiliau'n cael eu sganio."
-#: templates/index.php:118
+#: templates/index.php:110
msgid "Current scanning"
msgstr "Sganio cyfredol"
diff --git a/l10n/cy_GB/settings.po b/l10n/cy_GB/settings.po
index 98cd0448cb053e2d3d34817325c8bcc85e6221e7..6a1d7704d0f30fba1733a73812488f7baec6fa90 100644
--- a/l10n/cy_GB/settings.po
+++ b/l10n/cy_GB/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:45-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
"MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgid "Unable to load list from App Store"
msgstr ""
#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
-#: ajax/togglegroups.php:20
+#: ajax/togglegroups.php:20 changepassword/controller.php:55
msgid "Authentication error"
msgstr "Gwall dilysu"
@@ -84,6 +84,35 @@ msgstr ""
msgid "Couldn't update app."
msgstr ""
+#: changepassword/controller.php:20
+msgid "Wrong password"
+msgstr ""
+
+#: changepassword/controller.php:42
+msgid "No user supplied"
+msgstr ""
+
+#: changepassword/controller.php:74
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr ""
+
+#: changepassword/controller.php:79
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr ""
+
+#: changepassword/controller.php:87
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr ""
+
+#: changepassword/controller.php:92 changepassword/controller.php:103
+msgid "Unable to change password"
+msgstr ""
+
#: js/apps.js:43
msgid "Update to {appversion}"
msgstr ""
@@ -128,15 +157,15 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:217
+#: js/personal.js:220
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:262
+#: js/personal.js:265
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:284
+#: js/personal.js:287
msgid "Saving..."
msgstr "Yn cadw..."
diff --git a/l10n/da/core.po b/l10n/da/core.po
index 534ae03e955c5ce2b7851b53c542e016ca3e9149..690bb46c211ded5855430685188cb9f9d634874b 100644
--- a/l10n/da/core.po
+++ b/l10n/da/core.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:33+0000\n"
+"POT-Creation-Date: 2013-09-22 12:55-0400\n"
+"PO-Revision-Date: 2013-09-20 15:01+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
@@ -194,55 +194,55 @@ msgstr "December"
msgid "Settings"
msgstr "Indstillinger"
-#: js/js.js:853
+#: js/js.js:866
msgid "seconds ago"
msgstr "sekunder siden"
-#: js/js.js:854
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n minut siden"
msgstr[1] "%n minutter siden"
-#: js/js.js:855
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n time siden"
msgstr[1] "%n timer siden"
-#: js/js.js:856
+#: js/js.js:869
msgid "today"
msgstr "i dag"
-#: js/js.js:857
+#: js/js.js:870
msgid "yesterday"
msgstr "i går"
-#: js/js.js:858
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n dag siden"
msgstr[1] "%n dage siden"
-#: js/js.js:859
+#: js/js.js:872
msgid "last month"
msgstr "sidste måned"
-#: js/js.js:860
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n måned siden"
msgstr[1] "%n måneder siden"
-#: js/js.js:861
+#: js/js.js:874
msgid "months ago"
msgstr "måneder siden"
-#: js/js.js:862
+#: js/js.js:875
msgid "last year"
msgstr "sidste år"
-#: js/js.js:863
+#: js/js.js:876
msgid "years ago"
msgstr "Ã¥r siden"
@@ -270,6 +270,46 @@ msgstr "OK"
msgid "Error loading message template: {error}"
msgstr ""
+#: js/oc-dialogs.js:347
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:367
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:376
+msgid "Cancel"
+msgstr "Annuller"
+
+#: js/oc-dialogs.js:386
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:457
+msgid "Error loading file exists template"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/da/files.po b/l10n/da/files.po
index 81e48316becba6488811ab53d99c8a286458a754..b6cf95c8d9c8bce02cb1bb77f711d54587d067ed 100644
--- a/l10n/da/files.po
+++ b/l10n/da/files.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:00+0000\n"
-"Last-Translator: Sappe\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -77,11 +77,15 @@ msgstr "Fejl ved skrivning til disk."
msgid "Not enough storage available"
msgstr "Der er ikke nok plads til rådlighed"
-#: ajax/upload.php:109
-msgid "Upload failed"
-msgstr "Upload fejlede"
+#: ajax/upload.php:120 ajax/upload.php:143
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:136
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
-#: ajax/upload.php:127
+#: ajax/upload.php:160
msgid "Invalid directory."
msgstr "Ugyldig mappe."
@@ -89,144 +93,148 @@ msgstr "Ugyldig mappe."
msgid "Files"
msgstr "Filer"
-#: js/file-upload.js:11
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Kan ikke uploade din fil - det er enten en mappe eller en fil med et indhold på 0 bytes."
+#: js/file-upload.js:244
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
+msgstr ""
-#: js/file-upload.js:24
+#: js/file-upload.js:255
msgid "Not enough space available"
msgstr "ikke nok tilgængelig ledig plads "
-#: js/file-upload.js:64
+#: js/file-upload.js:322
msgid "Upload cancelled."
msgstr "Upload afbrudt."
-#: js/file-upload.js:165
+#: js/file-upload.js:356
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:446
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Fil upload kører. Hvis du forlader siden nu, vil uploadet blive annuleret."
-#: js/file-upload.js:239
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr "URLen kan ikke være tom."
-#: js/file-upload.js:244 lib/app.php:53
+#: js/file-upload.js:525 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr "Ugyldigt mappenavn. Brug af 'Shared' er forbeholdt af ownCloud"
-#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550
+#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545
msgid "Error"
msgstr "Fejl"
-#: js/fileactions.js:116
+#: js/fileactions.js:119
msgid "Share"
msgstr "Del"
-#: js/fileactions.js:126
+#: js/fileactions.js:131
msgid "Delete permanently"
msgstr "Slet permanent"
-#: js/fileactions.js:192
+#: js/fileactions.js:197
msgid "Rename"
msgstr "Omdøb"
-#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "Afventer"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{new_name} eksisterer allerede"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "erstat"
-#: js/filelist.js:307
+#: js/filelist.js:416
msgid "suggest name"
msgstr "foreslå navn"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "fortryd"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr "erstattede {new_name} med {old_name}"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "undo"
msgstr "fortryd"
-#: js/filelist.js:424 js/filelist.js:490 js/files.js:581
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "%n mappe"
msgstr[1] "%n mapper"
-#: js/filelist.js:425 js/filelist.js:491 js/files.js:587
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "%n fil"
msgstr[1] "%n filer"
-#: js/filelist.js:432
+#: js/filelist.js:541
msgid "{dirs} and {files}"
msgstr "{dirs} og {files}"
-#: js/filelist.js:563
+#: js/filelist.js:731 js/filelist.js:769
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "Uploader %n fil"
msgstr[1] "Uploader %n filer"
-#: js/filelist.js:628
-msgid "files uploading"
-msgstr "uploader filer"
-
-#: js/files.js:52
+#: js/files.js:25
msgid "'.' is an invalid file name."
msgstr "'.' er et ugyldigt filnavn."
-#: js/files.js:56
+#: js/files.js:29
msgid "File name cannot be empty."
msgstr "Filnavnet kan ikke stå tomt."
-#: js/files.js:64
+#: js/files.js:37
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Ugyldigt navn, '\\', '/', '<', '>', ':' | '?', '\"', '', og '*' er ikke tilladt."
-#: js/files.js:78
+#: js/files.js:51
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr "Din opbevaringsplads er fyldt op, filer kan ikke opdateres eller synkroniseres længere!"
-#: js/files.js:82
+#: js/files.js:55
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Din opbevaringsplads er næsten fyldt op ({usedSpacePercent}%)"
-#: js/files.js:94
+#: js/files.js:67
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
msgstr "Krypteringen blev deaktiveret, men dine filer er stadig krypteret. GÃ¥ venligst til dine personlige indstillinger for at dekryptere dine filer. "
-#: js/files.js:245
+#: js/files.js:296
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "Dit download forberedes. Dette kan tage lidt tid ved større filer."
-#: js/files.js:563 templates/index.php:69
+#: js/files.js:507 js/files.js:545
+msgid "Error moving file"
+msgstr ""
+
+#: js/files.js:558 templates/index.php:61
msgid "Name"
msgstr "Navn"
-#: js/files.js:564 templates/index.php:81
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "Størrelse"
-#: js/files.js:565 templates/index.php:83
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr "Ændret"
@@ -235,7 +243,7 @@ msgstr "Ændret"
msgid "%s could not be renamed"
msgstr "%s kunne ikke omdøbes"
-#: lib/helper.php:11 templates/index.php:18
+#: lib/helper.php:11 templates/index.php:17
msgid "Upload"
msgstr "Upload"
@@ -271,65 +279,65 @@ msgstr "Maksimal størrelse på ZIP filer"
msgid "Save"
msgstr "Gem"
-#: templates/index.php:7
+#: templates/index.php:6
msgid "New"
msgstr "Ny"
-#: templates/index.php:10
+#: templates/index.php:9
msgid "Text file"
msgstr "Tekstfil"
-#: templates/index.php:12
+#: templates/index.php:11
msgid "Folder"
msgstr "Mappe"
-#: templates/index.php:14
+#: templates/index.php:13
msgid "From link"
msgstr "Fra link"
-#: templates/index.php:41
+#: templates/index.php:33
msgid "Deleted files"
msgstr "Slettede filer"
-#: templates/index.php:46
+#: templates/index.php:39
msgid "Cancel upload"
msgstr "Fortryd upload"
-#: templates/index.php:52
+#: templates/index.php:45
msgid "You don’t have write permissions here."
msgstr "Du har ikke skriverettigheder her."
-#: templates/index.php:59
+#: templates/index.php:50
msgid "Nothing in here. Upload something!"
msgstr "Her er tomt. Upload noget!"
-#: templates/index.php:75
+#: templates/index.php:67
msgid "Download"
msgstr "Download"
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr "Fjern deling"
-#: templates/index.php:94 templates/index.php:95
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "Slet"
-#: templates/index.php:108
+#: templates/index.php:100
msgid "Upload too large"
msgstr "Upload er for stor"
-#: templates/index.php:110
+#: templates/index.php:102
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Filerne, du prøver at uploade, er større end den maksimale størrelse for fil-upload på denne server."
-#: templates/index.php:115
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr "Filerne bliver indlæst, vent venligst."
-#: templates/index.php:118
+#: templates/index.php:110
msgid "Current scanning"
msgstr "Indlæser"
diff --git a/l10n/da/settings.po b/l10n/da/settings.po
index faa811aa785c6a40e9e98de53cdf4ae7f304e893..7251a13d4ff37edd1c999b7d1b3003da702dd27c 100644
--- a/l10n/da/settings.po
+++ b/l10n/da/settings.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-24 12:58-0400\n"
+"PO-Revision-Date: 2013-09-24 16:59+0000\n"
+"Last-Translator: Sappe\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -25,7 +25,7 @@ msgid "Unable to load list from App Store"
msgstr "Kunne ikke indlæse listen fra App Store"
#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
-#: ajax/togglegroups.php:20
+#: ajax/togglegroups.php:20 changepassword/controller.php:55
msgid "Authentication error"
msgstr "Adgangsfejl"
@@ -87,15 +87,44 @@ msgstr "Brugeren kan ikke fjernes fra gruppen %s"
msgid "Couldn't update app."
msgstr "Kunne ikke opdatere app'en."
+#: changepassword/controller.php:20
+msgid "Wrong password"
+msgstr "Forkert kodeord"
+
+#: changepassword/controller.php:42
+msgid "No user supplied"
+msgstr "Intet brugernavn givet"
+
+#: changepassword/controller.php:74
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr "Angiv venligst en admininstrator gendannelseskode, ellers vil alt brugerdata gå tabt"
+
+#: changepassword/controller.php:79
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr "Forkert admin gendannelseskode. Se venligst koden efter og prøv igen."
+
+#: changepassword/controller.php:87
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr "Serveren understøtter ikke kodeordsskifte, men brugernes krypteringsnøgle blev opdateret."
+
+#: changepassword/controller.php:92 changepassword/controller.php:103
+msgid "Unable to change password"
+msgstr ""
+
#: js/apps.js:43
msgid "Update to {appversion}"
msgstr "Opdatér til {appversion}"
-#: js/apps.js:49 js/apps.js:82 js/apps.js:108
+#: js/apps.js:49 js/apps.js:82 js/apps.js:110
msgid "Disable"
msgstr "Deaktiver"
-#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
+#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
msgid "Enable"
msgstr "Aktiver"
@@ -103,43 +132,43 @@ msgstr "Aktiver"
msgid "Please wait...."
msgstr "Vent venligst..."
-#: js/apps.js:79 js/apps.js:80 js/apps.js:100
+#: js/apps.js:79 js/apps.js:80 js/apps.js:101
msgid "Error while disabling app"
msgstr "Kunne ikke deaktivere app"
-#: js/apps.js:99 js/apps.js:112 js/apps.js:113
+#: js/apps.js:100 js/apps.js:114 js/apps.js:115
msgid "Error while enabling app"
msgstr "Kunne ikke aktivere app"
-#: js/apps.js:123
+#: js/apps.js:125
msgid "Updating...."
msgstr "Opdaterer...."
-#: js/apps.js:126
+#: js/apps.js:128
msgid "Error while updating app"
msgstr "Der opstod en fejl under app opgraderingen"
-#: js/apps.js:126
+#: js/apps.js:128
msgid "Error"
msgstr "Fejl"
-#: js/apps.js:127 templates/apps.php:43
+#: js/apps.js:129 templates/apps.php:43
msgid "Update"
msgstr "Opdater"
-#: js/apps.js:130
+#: js/apps.js:132
msgid "Updated"
msgstr "Opdateret"
-#: js/personal.js:217
+#: js/personal.js:220
msgid "Select a profile picture"
-msgstr ""
+msgstr "Vælg et profilbillede"
-#: js/personal.js:262
+#: js/personal.js:265
msgid "Decrypting files... Please wait, this can take some time."
msgstr "Dekryptere filer... Vent venligst, dette kan tage lang tid. "
-#: js/personal.js:284
+#: js/personal.js:287
msgid "Saving..."
msgstr "Gemmer..."
@@ -463,31 +492,31 @@ msgstr "Indtast en emailadresse for at kunne få påmindelse om adgangskode"
#: templates/personal.php:86
msgid "Profile picture"
-msgstr ""
+msgstr "Profilbillede"
#: templates/personal.php:90
msgid "Upload new"
-msgstr ""
+msgstr "Upload nyt"
#: templates/personal.php:92
msgid "Select new from Files"
-msgstr ""
+msgstr "Vælg nyt fra Filer"
#: templates/personal.php:93
msgid "Remove image"
-msgstr ""
+msgstr "Fjern billede"
#: templates/personal.php:94
msgid "Either png or jpg. Ideally square but you will be able to crop it."
-msgstr ""
+msgstr "Enten png eller jpg. Ideelt firkantet men du har mulighed for at beskære det. "
#: templates/personal.php:97
msgid "Abort"
-msgstr ""
+msgstr "Afbryd"
#: templates/personal.php:98
msgid "Choose as profile image"
-msgstr ""
+msgstr "Vælg som profilbillede"
#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
diff --git a/l10n/de/core.po b/l10n/de/core.po
index fa8b284b671e4c35d44825d1f0817679c4bae14e..44eb6eec04088b407a54ffc3366c883f7998f3b0 100644
--- a/l10n/de/core.po
+++ b/l10n/de/core.po
@@ -15,9 +15,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-22 12:55-0400\n"
+"PO-Revision-Date: 2013-09-21 10:00+0000\n"
+"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
"Language-Team: German <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -100,23 +100,23 @@ msgstr "Fehler beim Entfernen von %s von den Favoriten."
#: avatar/controller.php:62
msgid "No image or file provided"
-msgstr ""
+msgstr "Kein Bild oder Datei zur Verfügung gestellt"
#: avatar/controller.php:81
msgid "Unknown filetype"
-msgstr ""
+msgstr "Unbekannter Dateityp"
#: avatar/controller.php:85
msgid "Invalid image"
-msgstr ""
+msgstr "Ungültiges Bild"
#: avatar/controller.php:115 avatar/controller.php:142
msgid "No temporary profile picture available, try again"
-msgstr ""
+msgstr "Kein temporäres Profilbild verfügbar, bitte versuche es nochmal"
#: avatar/controller.php:135
msgid "No crop data provided"
-msgstr ""
+msgstr "Keine Zuschnittdaten zur Verfügung gestellt"
#: js/config.php:32
msgid "Sunday"
@@ -198,55 +198,55 @@ msgstr "Dezember"
msgid "Settings"
msgstr "Einstellungen"
-#: js/js.js:853
+#: js/js.js:866
msgid "seconds ago"
msgstr "Gerade eben"
-#: js/js.js:854
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "Vor %n Minute"
msgstr[1] "Vor %n Minuten"
-#: js/js.js:855
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "Vor %n Stunde"
msgstr[1] "Vor %n Stunden"
-#: js/js.js:856
+#: js/js.js:869
msgid "today"
msgstr "Heute"
-#: js/js.js:857
+#: js/js.js:870
msgid "yesterday"
msgstr "Gestern"
-#: js/js.js:858
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "Vor %n Tag"
msgstr[1] "Vor %n Tagen"
-#: js/js.js:859
+#: js/js.js:872
msgid "last month"
msgstr "Letzten Monat"
-#: js/js.js:860
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "Vor %n Monat"
msgstr[1] "Vor %n Monaten"
-#: js/js.js:861
+#: js/js.js:874
msgid "months ago"
msgstr "Vor Monaten"
-#: js/js.js:862
+#: js/js.js:875
msgid "last year"
msgstr "Letztes Jahr"
-#: js/js.js:863
+#: js/js.js:876
msgid "years ago"
msgstr "Vor Jahren"
@@ -256,7 +256,7 @@ msgstr "Auswählen"
#: js/oc-dialogs.js:146
msgid "Error loading file picker template: {error}"
-msgstr ""
+msgstr "Fehler beim Laden der Dateiauswahlvorlage: {error}"
#: js/oc-dialogs.js:172
msgid "Yes"
@@ -272,7 +272,47 @@ msgstr "OK"
#: js/oc-dialogs.js:219
msgid "Error loading message template: {error}"
-msgstr ""
+msgstr "Fehler beim Laden der Nachrichtenvorlage: {error}"
+
+#: js/oc-dialogs.js:347
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] "{count} Dateikonflikt"
+msgstr[1] "{count} Dateikonflikte"
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr "Ein Dateikonflikt"
+
+#: js/oc-dialogs.js:367
+msgid "Which files do you want to keep?"
+msgstr "Welche Dateien möchtest du behalten?"
+
+#: js/oc-dialogs.js:368
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr "Wenn du beide Versionen auswählst, erhält die kopierte Datei eine Zahl am Ende des Dateinamens."
+
+#: js/oc-dialogs.js:376
+msgid "Cancel"
+msgstr "Abbrechen"
+
+#: js/oc-dialogs.js:386
+msgid "Continue"
+msgstr "Fortsetzen"
+
+#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+msgid "(all selected)"
+msgstr "(Alle ausgewählt)"
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "({count} selected)"
+msgstr "({count} ausgewählt)"
+
+#: js/oc-dialogs.js:457
+msgid "Error loading file exists template"
+msgstr "Fehler beim Laden der vorhanden Dateivorlage"
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
diff --git a/l10n/de/files.po b/l10n/de/files.po
index 3e0c024b6cb6d40d820c65deb61380da6934f04e..06bce6446387eb8109c664cdc080e6f07909f97b 100644
--- a/l10n/de/files.po
+++ b/l10n/de/files.po
@@ -13,8 +13,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:00+0000\n"
+"POT-Creation-Date: 2013-09-22 12:51-0400\n"
+"PO-Revision-Date: 2013-09-21 10:00+0000\n"
"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
"Language-Team: German <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
@@ -80,156 +80,164 @@ msgstr "Fehler beim Schreiben auf die Festplatte"
msgid "Not enough storage available"
msgstr "Nicht genug Speicher vorhanden."
-#: ajax/upload.php:109
-msgid "Upload failed"
-msgstr "Hochladen fehlgeschlagen"
+#: ajax/upload.php:120 ajax/upload.php:143
+msgid "Upload failed. Could not get file info."
+msgstr "Hochladen fehlgeschlagen. Dateiinformationen konnten nicht abgerufen werden."
-#: ajax/upload.php:127
+#: ajax/upload.php:136
+msgid "Upload failed. Could not find uploaded file"
+msgstr "Hochladen fehlgeschlagen. Hochgeladene Datei konnte nicht gefunden werden."
+
+#: ajax/upload.php:160
msgid "Invalid directory."
msgstr "Ungültiges Verzeichnis."
-#: appinfo/app.php:12
+#: appinfo/app.php:11
msgid "Files"
msgstr "Dateien"
-#: js/file-upload.js:11
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Deine Datei kann nicht hochgeladen werden, weil es sich um einen Ordner handelt oder 0 Bytes groß ist."
+#: js/file-upload.js:244
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
+msgstr "Datei {filename} kann nicht hochgeladen werden, da sie entweder ein Verzeichnis oder 0 Bytes groß ist"
-#: js/file-upload.js:24
+#: js/file-upload.js:255
msgid "Not enough space available"
msgstr "Nicht genug Speicherplatz verfügbar"
-#: js/file-upload.js:64
+#: js/file-upload.js:322
msgid "Upload cancelled."
msgstr "Upload abgebrochen."
-#: js/file-upload.js:165
+#: js/file-upload.js:356
+msgid "Could not get result from server."
+msgstr "Ergebnis konnte nicht vom Server abgerufen werden."
+
+#: js/file-upload.js:446
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Dateiupload läuft. Wenn Du die Seite jetzt verlässt, wird der Upload abgebrochen."
-#: js/file-upload.js:239
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr "Die URL darf nicht leer sein."
-#: js/file-upload.js:244 lib/app.php:53
+#: js/file-upload.js:525 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr "Der Ordnername ist ungültig. Nur ownCloud kann den Ordner \"Shared\" anlegen"
-#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550
+#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545
msgid "Error"
msgstr "Fehler"
-#: js/fileactions.js:116
+#: js/fileactions.js:119
msgid "Share"
msgstr "Teilen"
-#: js/fileactions.js:126
+#: js/fileactions.js:131
msgid "Delete permanently"
msgstr "Endgültig löschen"
-#: js/fileactions.js:192
+#: js/fileactions.js:197
msgid "Rename"
msgstr "Umbenennen"
-#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "Ausstehend"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{new_name} existiert bereits"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "ersetzen"
-#: js/filelist.js:307
+#: js/filelist.js:416
msgid "suggest name"
msgstr "Namen vorschlagen"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "abbrechen"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr "{old_name} ersetzt durch {new_name}"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "undo"
msgstr "rückgängig machen"
-#: js/filelist.js:424 js/filelist.js:490 js/files.js:581
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "%n Ordner"
msgstr[1] "%n Ordner"
-#: js/filelist.js:425 js/filelist.js:491 js/files.js:587
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "%n Datei"
msgstr[1] "%n Dateien"
-#: js/filelist.js:432
+#: js/filelist.js:541
msgid "{dirs} and {files}"
msgstr "{dirs} und {files}"
-#: js/filelist.js:563
+#: js/filelist.js:731 js/filelist.js:769
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "%n Datei wird hochgeladen"
msgstr[1] "%n Dateien werden hochgeladen"
-#: js/filelist.js:628
-msgid "files uploading"
-msgstr "Dateien werden hoch geladen"
-
-#: js/files.js:52
+#: js/files.js:25
msgid "'.' is an invalid file name."
msgstr "'.' ist kein gültiger Dateiname."
-#: js/files.js:56
+#: js/files.js:29
msgid "File name cannot be empty."
msgstr "Der Dateiname darf nicht leer sein."
-#: js/files.js:64
+#: js/files.js:37
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Ungültiger Name, '\\', '/', '<', '>', ':', '\"', '|', '?' und '*' sind nicht zulässig."
-#: js/files.js:78
+#: js/files.js:51
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr "Dein Speicher ist voll, daher können keine Dateien mehr aktualisiert oder synchronisiert werden!"
-#: js/files.js:82
+#: js/files.js:55
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Dein Speicher ist fast voll ({usedSpacePercent}%)"
-#: js/files.js:94
+#: js/files.js:67
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
msgstr "Die Verschlüsselung wurde deaktiviert, jedoch sind deine Dateien nach wie vor verschlüsselt. Bitte gehe zu deinen persönlichen Einstellungen, um deine Dateien zu entschlüsseln."
-#: js/files.js:245
+#: js/files.js:296
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "Dein Download wird vorbereitet. Dies kann bei größeren Dateien etwas dauern."
-#: js/files.js:563 templates/index.php:69
+#: js/files.js:507 js/files.js:545
+msgid "Error moving file"
+msgstr "Fehler beim Verschieben der Datei"
+
+#: js/files.js:558 templates/index.php:61
msgid "Name"
msgstr "Name"
-#: js/files.js:564 templates/index.php:81
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "Größe"
-#: js/files.js:565 templates/index.php:83
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr "Geändert"
@@ -238,7 +246,7 @@ msgstr "Geändert"
msgid "%s could not be renamed"
msgstr "%s konnte nicht umbenannt werden"
-#: lib/helper.php:11 templates/index.php:18
+#: lib/helper.php:11 templates/index.php:17
msgid "Upload"
msgstr "Hochladen"
@@ -274,65 +282,65 @@ msgstr "Maximale Größe für ZIP-Dateien"
msgid "Save"
msgstr "Speichern"
-#: templates/index.php:7
+#: templates/index.php:6
msgid "New"
msgstr "Neu"
-#: templates/index.php:10
+#: templates/index.php:9
msgid "Text file"
msgstr "Textdatei"
-#: templates/index.php:12
+#: templates/index.php:11
msgid "Folder"
msgstr "Ordner"
-#: templates/index.php:14
+#: templates/index.php:13
msgid "From link"
msgstr "Von einem Link"
-#: templates/index.php:41
+#: templates/index.php:33
msgid "Deleted files"
msgstr "Gelöschte Dateien"
-#: templates/index.php:46
+#: templates/index.php:39
msgid "Cancel upload"
msgstr "Upload abbrechen"
-#: templates/index.php:52
+#: templates/index.php:45
msgid "You don’t have write permissions here."
msgstr "Du hast hier keine Schreib-Berechtigung."
-#: templates/index.php:59
+#: templates/index.php:50
msgid "Nothing in here. Upload something!"
msgstr "Alles leer. Lade etwas hoch!"
-#: templates/index.php:75
+#: templates/index.php:67
msgid "Download"
msgstr "Herunterladen"
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr "Freigabe aufheben"
-#: templates/index.php:94 templates/index.php:95
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "Löschen"
-#: templates/index.php:108
+#: templates/index.php:100
msgid "Upload too large"
msgstr "Der Upload ist zu groß"
-#: templates/index.php:110
+#: templates/index.php:102
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Die Datei überschreitet die Maximalgröße für Uploads auf diesem Server."
-#: templates/index.php:115
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr "Dateien werden gescannt, bitte warten."
-#: templates/index.php:118
+#: templates/index.php:110
msgid "Current scanning"
msgstr "Scanne"
diff --git a/l10n/de/lib.po b/l10n/de/lib.po
index 2a01484425cace872f0abffaf9ae6ea25df12abd..c054df799c0356172ae0002bdef4a7104e0c24fb 100644
--- a/l10n/de/lib.po
+++ b/l10n/de/lib.po
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-18 11:47-0400\n"
+"PO-Revision-Date: 2013-09-17 13:05+0000\n"
+"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
"Language-Team: German <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -59,15 +59,15 @@ msgstr "Konnte \"%s\" nicht aktualisieren."
#: avatar.php:56
msgid "Custom profile pictures don't work with encryption yet"
-msgstr ""
+msgstr "Individuelle Profilbilder werden noch nicht von der Verschlüsselung unterstützt"
#: avatar.php:64
msgid "Unknown filetype"
-msgstr ""
+msgstr "Unbekannter Dateityp"
#: avatar.php:69
msgid "Invalid image"
-msgstr ""
+msgstr "Ungültiges Bild"
#: defaults.php:35
msgid "web services under your control"
diff --git a/l10n/de/settings.po b/l10n/de/settings.po
index 1a8503a37915b590d56bd6054e76206a3d215e5b..4cf53d6658dc8c787aab553e0eb33c64a1cabdd7 100644
--- a/l10n/de/settings.po
+++ b/l10n/de/settings.po
@@ -12,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:45-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: German <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgid "Unable to load list from App Store"
msgstr "Die Liste der Anwendungen im Store konnte nicht geladen werden."
#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
-#: ajax/togglegroups.php:20
+#: ajax/togglegroups.php:20 changepassword/controller.php:55
msgid "Authentication error"
msgstr "Fehler bei der Anmeldung"
@@ -89,6 +89,35 @@ msgstr "Der Benutzer konnte nicht aus der Gruppe %s entfernt werden"
msgid "Couldn't update app."
msgstr "Die App konnte nicht aktualisiert werden."
+#: changepassword/controller.php:20
+msgid "Wrong password"
+msgstr "Falsches Passwort"
+
+#: changepassword/controller.php:42
+msgid "No user supplied"
+msgstr "Keinen Benutzer übermittelt"
+
+#: changepassword/controller.php:74
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr "Bitte gib ein Wiederherstellungspasswort für das Admin-Konto an, da sonst alle Benutzer Daten verloren gehen können"
+
+#: changepassword/controller.php:79
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr "Falsches Wiederherstellungspasswort für das Admin-Konto. Bitte überprüfe das Passwort und versuche es erneut."
+
+#: changepassword/controller.php:87
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr "Das Back-End unterstützt die Passwortänderung nicht, aber der Benutzerschlüssel wurde erfolgreich aktualisiert."
+
+#: changepassword/controller.php:92 changepassword/controller.php:103
+msgid "Unable to change password"
+msgstr "Passwort konnte nicht geändert werden"
+
#: js/apps.js:43
msgid "Update to {appversion}"
msgstr "Aktualisiere zu {appversion}"
@@ -133,15 +162,15 @@ msgstr "Aktualisierung durchführen"
msgid "Updated"
msgstr "Aktualisiert"
-#: js/personal.js:217
+#: js/personal.js:220
msgid "Select a profile picture"
-msgstr ""
+msgstr "Wähle ein Profilbild"
-#: js/personal.js:262
+#: js/personal.js:265
msgid "Decrypting files... Please wait, this can take some time."
msgstr "Entschlüssle Dateien ... Bitte warten, denn dieser Vorgang kann einige Zeit beanspruchen."
-#: js/personal.js:284
+#: js/personal.js:287
msgid "Saving..."
msgstr "Speichern..."
@@ -465,31 +494,31 @@ msgstr "Trage eine E-Mail-Adresse ein, um die Passwort-Wiederherstellung zu akti
#: templates/personal.php:86
msgid "Profile picture"
-msgstr ""
+msgstr "Profilbild"
#: templates/personal.php:90
msgid "Upload new"
-msgstr ""
+msgstr "Neues hochladen"
#: templates/personal.php:92
msgid "Select new from Files"
-msgstr ""
+msgstr "Neues aus den Dateien wählen"
#: templates/personal.php:93
msgid "Remove image"
-msgstr ""
+msgstr "Bild entfernen"
#: templates/personal.php:94
msgid "Either png or jpg. Ideally square but you will be able to crop it."
-msgstr ""
+msgstr "Entweder PNG oder JPG. Im Idealfall quadratisch, aber du kannst es zuschneiden."
#: templates/personal.php:97
msgid "Abort"
-msgstr ""
+msgstr "Abbrechen"
#: templates/personal.php:98
msgid "Choose as profile image"
-msgstr ""
+msgstr "Als Profilbild wählen"
#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
diff --git a/l10n/de_AT/core.po b/l10n/de_AT/core.po
index 6812c21bb5aa6b752e8938de784bcd54ab363b8f..0c8f3a25ae20d635034ebaf7305e2cd1fdc569cd 100644
--- a/l10n/de_AT/core.po
+++ b/l10n/de_AT/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: German (Austria) (http://www.transifex.com/projects/p/owncloud/language/de_AT/)\n"
"MIME-Version: 1.0\n"
@@ -191,55 +191,55 @@ msgstr ""
msgid "Settings"
msgstr ""
-#: js/js.js:853
+#: js/js.js:866
msgid "seconds ago"
msgstr ""
-#: js/js.js:854
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:855
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:856
+#: js/js.js:869
msgid "today"
msgstr ""
-#: js/js.js:857
+#: js/js.js:870
msgid "yesterday"
msgstr ""
-#: js/js.js:858
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:859
+#: js/js.js:872
msgid "last month"
msgstr ""
-#: js/js.js:860
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:861
+#: js/js.js:874
msgid "months ago"
msgstr ""
-#: js/js.js:862
+#: js/js.js:875
msgid "last year"
msgstr ""
-#: js/js.js:863
+#: js/js.js:876
msgid "years ago"
msgstr ""
@@ -267,6 +267,46 @@ msgstr ""
msgid "Error loading message template: {error}"
msgstr ""
+#: js/oc-dialogs.js:347
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:367
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:376
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:386
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:457
+msgid "Error loading file exists template"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/de_AT/files.po b/l10n/de_AT/files.po
index d3f9d2d42185af41ae79e8dc41bdeee7693bfe31..7c47140c8437327a1450bc8776d789a2d4696794 100644
--- a/l10n/de_AT/files.po
+++ b/l10n/de_AT/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-30 09:31-0400\n"
-"PO-Revision-Date: 2013-08-30 13:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: German (Austria) (http://www.transifex.com/projects/p/owncloud/language/de_AT/)\n"
"MIME-Version: 1.0\n"
@@ -74,11 +74,15 @@ msgstr ""
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:109
-msgid "Upload failed"
+#: ajax/upload.php:120 ajax/upload.php:143
+msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:127
+#: ajax/upload.php:136
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
+
+#: ajax/upload.php:160
msgid "Invalid directory."
msgstr ""
@@ -86,144 +90,148 @@ msgstr ""
msgid "Files"
msgstr ""
-#: js/file-upload.js:11
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
+#: js/file-upload.js:244
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr ""
-#: js/file-upload.js:24
+#: js/file-upload.js:255
msgid "Not enough space available"
msgstr ""
-#: js/file-upload.js:64
+#: js/file-upload.js:322
msgid "Upload cancelled."
msgstr ""
-#: js/file-upload.js:165
+#: js/file-upload.js:356
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:446
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/file-upload.js:239
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr ""
-#: js/file-upload.js:244 lib/app.php:53
+#: js/file-upload.js:525 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
+#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545
msgid "Error"
msgstr ""
-#: js/fileactions.js:116
+#: js/fileactions.js:119
msgid "Share"
msgstr ""
-#: js/fileactions.js:126
+#: js/fileactions.js:131
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:192
+#: js/fileactions.js:197
msgid "Rename"
msgstr ""
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr ""
-#: js/filelist.js:305 js/filelist.js:307
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr ""
-#: js/filelist.js:305 js/filelist.js:307
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr ""
-#: js/filelist.js:305
+#: js/filelist.js:416
msgid "suggest name"
msgstr ""
-#: js/filelist.js:305 js/filelist.js:307
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr ""
-#: js/filelist.js:352
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr ""
-#: js/filelist.js:352
+#: js/filelist.js:463
msgid "undo"
msgstr ""
-#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:430
+#: js/filelist.js:541
msgid "{dirs} and {files}"
msgstr ""
-#: js/filelist.js:561
+#: js/filelist.js:731 js/filelist.js:769
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:626
-msgid "files uploading"
-msgstr ""
-
-#: js/files.js:52
+#: js/files.js:25
msgid "'.' is an invalid file name."
msgstr ""
-#: js/files.js:56
+#: js/files.js:29
msgid "File name cannot be empty."
msgstr ""
-#: js/files.js:64
+#: js/files.js:37
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: js/files.js:78
+#: js/files.js:51
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr ""
-#: js/files.js:82
+#: js/files.js:55
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:94
+#: js/files.js:67
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
msgstr ""
-#: js/files.js:245
+#: js/files.js:296
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/files.js:562 templates/index.php:67
+#: js/files.js:507 js/files.js:545
+msgid "Error moving file"
+msgstr ""
+
+#: js/files.js:558 templates/index.php:61
msgid "Name"
msgstr ""
-#: js/files.js:563 templates/index.php:78
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr ""
-#: js/files.js:564 templates/index.php:80
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr ""
@@ -232,7 +240,7 @@ msgstr ""
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:11 templates/index.php:18
+#: lib/helper.php:11 templates/index.php:17
msgid "Upload"
msgstr ""
@@ -268,65 +276,65 @@ msgstr ""
msgid "Save"
msgstr ""
-#: templates/index.php:7
+#: templates/index.php:6
msgid "New"
msgstr ""
-#: templates/index.php:10
+#: templates/index.php:9
msgid "Text file"
msgstr ""
-#: templates/index.php:12
+#: templates/index.php:11
msgid "Folder"
msgstr ""
-#: templates/index.php:14
+#: templates/index.php:13
msgid "From link"
msgstr ""
-#: templates/index.php:41
+#: templates/index.php:33
msgid "Deleted files"
msgstr ""
-#: templates/index.php:46
+#: templates/index.php:39
msgid "Cancel upload"
msgstr ""
-#: templates/index.php:52
+#: templates/index.php:45
msgid "You don’t have write permissions here."
msgstr ""
-#: templates/index.php:59
+#: templates/index.php:50
msgid "Nothing in here. Upload something!"
msgstr ""
-#: templates/index.php:73
+#: templates/index.php:67
msgid "Download"
msgstr ""
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr ""
-#: templates/index.php:91 templates/index.php:92
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr ""
-#: templates/index.php:105
+#: templates/index.php:100
msgid "Upload too large"
msgstr ""
-#: templates/index.php:107
+#: templates/index.php:102
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: templates/index.php:112
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:115
+#: templates/index.php:110
msgid "Current scanning"
msgstr ""
diff --git a/l10n/de_AT/settings.po b/l10n/de_AT/settings.po
index d75c8166a6e20f10491c0299bdef2c6d70132487..c39c070ed506915444d48734ff21089b5d679321 100644
--- a/l10n/de_AT/settings.po
+++ b/l10n/de_AT/settings.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# I Robot <owncloud-bot@tmit.eu>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:45-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: German (Austria) (http://www.transifex.com/projects/p/owncloud/language/de_AT/)\n"
"MIME-Version: 1.0\n"
@@ -22,7 +23,7 @@ msgid "Unable to load list from App Store"
msgstr ""
#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
-#: ajax/togglegroups.php:20
+#: ajax/togglegroups.php:20 changepassword/controller.php:55
msgid "Authentication error"
msgstr ""
@@ -84,6 +85,35 @@ msgstr ""
msgid "Couldn't update app."
msgstr ""
+#: changepassword/controller.php:20
+msgid "Wrong password"
+msgstr ""
+
+#: changepassword/controller.php:42
+msgid "No user supplied"
+msgstr ""
+
+#: changepassword/controller.php:74
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr ""
+
+#: changepassword/controller.php:79
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr ""
+
+#: changepassword/controller.php:87
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr ""
+
+#: changepassword/controller.php:92 changepassword/controller.php:103
+msgid "Unable to change password"
+msgstr ""
+
#: js/apps.js:43
msgid "Update to {appversion}"
msgstr ""
@@ -128,15 +158,15 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:217
+#: js/personal.js:220
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:262
+#: js/personal.js:265
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:284
+#: js/personal.js:287
msgid "Saving..."
msgstr ""
@@ -183,7 +213,7 @@ msgstr ""
#: personal.php:45 personal.php:46
msgid "__language_name__"
-msgstr ""
+msgstr "Deutsch (Österreich)"
#: templates/admin.php:15
msgid "Security Warning"
diff --git a/l10n/de_CH/core.po b/l10n/de_CH/core.po
index 827bc1f7a699c1071afee8d067b724b8afdcf99f..cb7631fdc2f0c33104338e2d28144aa399e0e791 100644
--- a/l10n/de_CH/core.po
+++ b/l10n/de_CH/core.po
@@ -16,8 +16,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-09-22 12:55-0400\n"
+"PO-Revision-Date: 2013-09-20 15:01+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n"
"MIME-Version: 1.0\n"
@@ -199,55 +199,55 @@ msgstr "Dezember"
msgid "Settings"
msgstr "Einstellungen"
-#: js/js.js:853
+#: js/js.js:866
msgid "seconds ago"
msgstr "Gerade eben"
-#: js/js.js:854
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "Vor %n Minute"
msgstr[1] "Vor %n Minuten"
-#: js/js.js:855
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "Vor %n Stunde"
msgstr[1] "Vor %n Stunden"
-#: js/js.js:856
+#: js/js.js:869
msgid "today"
msgstr "Heute"
-#: js/js.js:857
+#: js/js.js:870
msgid "yesterday"
msgstr "Gestern"
-#: js/js.js:858
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "Vor %n Tag"
msgstr[1] "Vor %n Tagen"
-#: js/js.js:859
+#: js/js.js:872
msgid "last month"
msgstr "Letzten Monat"
-#: js/js.js:860
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "Vor %n Monat"
msgstr[1] "Vor %n Monaten"
-#: js/js.js:861
+#: js/js.js:874
msgid "months ago"
msgstr "Vor Monaten"
-#: js/js.js:862
+#: js/js.js:875
msgid "last year"
msgstr "Letztes Jahr"
-#: js/js.js:863
+#: js/js.js:876
msgid "years ago"
msgstr "Vor Jahren"
@@ -275,6 +275,46 @@ msgstr "OK"
msgid "Error loading message template: {error}"
msgstr ""
+#: js/oc-dialogs.js:347
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:367
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:376
+msgid "Cancel"
+msgstr "Abbrechen"
+
+#: js/oc-dialogs.js:386
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:457
+msgid "Error loading file exists template"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/de_CH/files.po b/l10n/de_CH/files.po
index bd65b087c356c38600a2e4e7c915517b4509a3ba..0d4817bb295c3369d1de86bd14ac0744f375690a 100644
--- a/l10n/de_CH/files.po
+++ b/l10n/de_CH/files.po
@@ -16,8 +16,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:00+0000\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n"
"MIME-Version: 1.0\n"
@@ -83,11 +83,15 @@ msgstr "Fehler beim Schreiben auf die Festplatte"
msgid "Not enough storage available"
msgstr "Nicht genug Speicher vorhanden."
-#: ajax/upload.php:109
-msgid "Upload failed"
-msgstr "Hochladen fehlgeschlagen"
+#: ajax/upload.php:120 ajax/upload.php:143
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:136
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
-#: ajax/upload.php:127
+#: ajax/upload.php:160
msgid "Invalid directory."
msgstr "Ungültiges Verzeichnis."
@@ -95,144 +99,148 @@ msgstr "Ungültiges Verzeichnis."
msgid "Files"
msgstr "Dateien"
-#: js/file-upload.js:11
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Ihre Datei kann nicht hochgeladen werden, weil es sich um einen Ordner handelt oder 0 Bytes gross ist."
+#: js/file-upload.js:244
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
+msgstr ""
-#: js/file-upload.js:24
+#: js/file-upload.js:255
msgid "Not enough space available"
msgstr "Nicht genügend Speicherplatz verfügbar"
-#: js/file-upload.js:64
+#: js/file-upload.js:322
msgid "Upload cancelled."
msgstr "Upload abgebrochen."
-#: js/file-upload.js:165
+#: js/file-upload.js:356
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:446
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upload abgebrochen."
-#: js/file-upload.js:239
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr "Die URL darf nicht leer sein."
-#: js/file-upload.js:244 lib/app.php:53
+#: js/file-upload.js:525 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr "Ungültiger Ordnername. Die Verwendung von «Shared» ist ownCloud vorbehalten."
-#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550
+#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545
msgid "Error"
msgstr "Fehler"
-#: js/fileactions.js:116
+#: js/fileactions.js:119
msgid "Share"
msgstr "Teilen"
-#: js/fileactions.js:126
+#: js/fileactions.js:131
msgid "Delete permanently"
msgstr "Endgültig löschen"
-#: js/fileactions.js:192
+#: js/fileactions.js:197
msgid "Rename"
msgstr "Umbenennen"
-#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "Ausstehend"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{new_name} existiert bereits"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "ersetzen"
-#: js/filelist.js:307
+#: js/filelist.js:416
msgid "suggest name"
msgstr "Namen vorschlagen"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "abbrechen"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr "{old_name} wurde ersetzt durch {new_name}"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "undo"
msgstr "rückgängig machen"
-#: js/filelist.js:424 js/filelist.js:490 js/files.js:581
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] "%n Ordner"
-#: js/filelist.js:425 js/filelist.js:491 js/files.js:587
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] "%n Dateien"
-#: js/filelist.js:432
+#: js/filelist.js:541
msgid "{dirs} and {files}"
msgstr ""
-#: js/filelist.js:563
+#: js/filelist.js:731 js/filelist.js:769
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "%n Datei wird hochgeladen"
msgstr[1] "%n Dateien werden hochgeladen"
-#: js/filelist.js:628
-msgid "files uploading"
-msgstr "Dateien werden hoch geladen"
-
-#: js/files.js:52
+#: js/files.js:25
msgid "'.' is an invalid file name."
msgstr "'.' ist kein gültiger Dateiname."
-#: js/files.js:56
+#: js/files.js:29
msgid "File name cannot be empty."
msgstr "Der Dateiname darf nicht leer sein."
-#: js/files.js:64
+#: js/files.js:37
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Ungültiger Name, «\\», «/», «<», «>», «:», «\"», «|», «?» und «*» sind nicht zulässig."
-#: js/files.js:78
+#: js/files.js:51
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr "Ihr Speicher ist voll, daher können keine Dateien mehr aktualisiert oder synchronisiert werden!"
-#: js/files.js:82
+#: js/files.js:55
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Ihr Speicher ist fast voll ({usedSpacePercent}%)"
-#: js/files.js:94
+#: js/files.js:67
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
msgstr "Die Verschlüsselung wurde deaktiviert, jedoch sind Ihre Dateien nach wie vor verschlüsselt. Bitte gehen Sie zu Ihren persönlichen Einstellungen, um Ihre Dateien zu entschlüsseln."
-#: js/files.js:245
+#: js/files.js:296
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "Ihr Download wird vorbereitet. Dies kann bei grösseren Dateien etwas dauern."
-#: js/files.js:563 templates/index.php:69
+#: js/files.js:507 js/files.js:545
+msgid "Error moving file"
+msgstr ""
+
+#: js/files.js:558 templates/index.php:61
msgid "Name"
msgstr "Name"
-#: js/files.js:564 templates/index.php:81
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "Grösse"
-#: js/files.js:565 templates/index.php:83
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr "Geändert"
@@ -241,7 +249,7 @@ msgstr "Geändert"
msgid "%s could not be renamed"
msgstr "%s konnte nicht umbenannt werden"
-#: lib/helper.php:11 templates/index.php:18
+#: lib/helper.php:11 templates/index.php:17
msgid "Upload"
msgstr "Hochladen"
@@ -277,65 +285,65 @@ msgstr "Maximale Grösse für ZIP-Dateien"
msgid "Save"
msgstr "Speichern"
-#: templates/index.php:7
+#: templates/index.php:6
msgid "New"
msgstr "Neu"
-#: templates/index.php:10
+#: templates/index.php:9
msgid "Text file"
msgstr "Textdatei"
-#: templates/index.php:12
+#: templates/index.php:11
msgid "Folder"
msgstr "Ordner"
-#: templates/index.php:14
+#: templates/index.php:13
msgid "From link"
msgstr "Von einem Link"
-#: templates/index.php:41
+#: templates/index.php:33
msgid "Deleted files"
msgstr "Gelöschte Dateien"
-#: templates/index.php:46
+#: templates/index.php:39
msgid "Cancel upload"
msgstr "Upload abbrechen"
-#: templates/index.php:52
+#: templates/index.php:45
msgid "You don’t have write permissions here."
msgstr "Sie haben hier keine Schreib-Berechtigungen."
-#: templates/index.php:59
+#: templates/index.php:50
msgid "Nothing in here. Upload something!"
msgstr "Alles leer. Laden Sie etwas hoch!"
-#: templates/index.php:75
+#: templates/index.php:67
msgid "Download"
msgstr "Herunterladen"
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr "Freigabe aufheben"
-#: templates/index.php:94 templates/index.php:95
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "Löschen"
-#: templates/index.php:108
+#: templates/index.php:100
msgid "Upload too large"
msgstr "Der Upload ist zu gross"
-#: templates/index.php:110
+#: templates/index.php:102
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Die Datei überschreitet die Maximalgrösse für Uploads auf diesem Server."
-#: templates/index.php:115
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr "Dateien werden gescannt, bitte warten."
-#: templates/index.php:118
+#: templates/index.php:110
msgid "Current scanning"
msgstr "Scanne"
diff --git a/l10n/de_CH/settings.po b/l10n/de_CH/settings.po
index 0e4f92b5e6a030cc446e8fe3fa6c13ce9393437e..745b7eec826794434a294a4716cf4e3175364434 100644
--- a/l10n/de_CH/settings.po
+++ b/l10n/de_CH/settings.po
@@ -7,6 +7,7 @@
# a.tangemann <a.tangemann@web.de>, 2013
# FlorianScholz <work@bgstyle.de>, 2013
# FlorianScholz <work@bgstyle.de>, 2013
+# I Robot <owncloud-bot@tmit.eu>, 2013
# kabum <uu.kabum@gmail.com>, 2013
# Mario Siegmann <mario_siegmann@web.de>, 2013
# Mirodin <blobbyjj@ymail.com>, 2013
@@ -15,8 +16,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:45-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n"
"MIME-Version: 1.0\n"
@@ -30,7 +31,7 @@ msgid "Unable to load list from App Store"
msgstr "Die Liste der Anwendungen im Store konnte nicht geladen werden."
#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
-#: ajax/togglegroups.php:20
+#: ajax/togglegroups.php:20 changepassword/controller.php:55
msgid "Authentication error"
msgstr "Authentifizierungs-Fehler"
@@ -92,6 +93,35 @@ msgstr "Der Benutzer konnte nicht aus der Gruppe %s entfernt werden"
msgid "Couldn't update app."
msgstr "Die App konnte nicht aktualisiert werden."
+#: changepassword/controller.php:20
+msgid "Wrong password"
+msgstr ""
+
+#: changepassword/controller.php:42
+msgid "No user supplied"
+msgstr ""
+
+#: changepassword/controller.php:74
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr ""
+
+#: changepassword/controller.php:79
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr ""
+
+#: changepassword/controller.php:87
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr ""
+
+#: changepassword/controller.php:92 changepassword/controller.php:103
+msgid "Unable to change password"
+msgstr ""
+
#: js/apps.js:43
msgid "Update to {appversion}"
msgstr "Update zu {appversion}"
@@ -136,15 +166,15 @@ msgstr "Update durchführen"
msgid "Updated"
msgstr "Aktualisiert"
-#: js/personal.js:217
+#: js/personal.js:220
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:262
+#: js/personal.js:265
msgid "Decrypting files... Please wait, this can take some time."
msgstr "Entschlüssel Dateien ... Bitte warten Sie, denn dieser Vorgang kann einige Zeit beanspruchen."
-#: js/personal.js:284
+#: js/personal.js:287
msgid "Saving..."
msgstr "Speichern..."
@@ -191,7 +221,7 @@ msgstr "Es muss ein gültiges Passwort angegeben werden"
#: personal.php:45 personal.php:46
msgid "__language_name__"
-msgstr "Deutsch (Förmlich: Sie)"
+msgstr "Deutsch (Schweiz)"
#: templates/admin.php:15
msgid "Security Warning"
diff --git a/l10n/de_DE/core.po b/l10n/de_DE/core.po
index f1d1a4a9c64db174671a9c58137482d8083b7a37..cfdcd679973914db06b578c7421a0e32cb882e48 100644
--- a/l10n/de_DE/core.po
+++ b/l10n/de_DE/core.po
@@ -15,9 +15,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-22 12:55-0400\n"
+"PO-Revision-Date: 2013-09-21 10:00+0000\n"
+"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
"Language-Team: German (Germany) <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -100,23 +100,23 @@ msgstr "Fehler beim Entfernen von %s von den Favoriten."
#: avatar/controller.php:62
msgid "No image or file provided"
-msgstr ""
+msgstr "Kein Bild oder Datei zur Verfügung gestellt"
#: avatar/controller.php:81
msgid "Unknown filetype"
-msgstr ""
+msgstr "Unbekannter Dateityp"
#: avatar/controller.php:85
msgid "Invalid image"
-msgstr ""
+msgstr "Ungültiges Bild"
#: avatar/controller.php:115 avatar/controller.php:142
msgid "No temporary profile picture available, try again"
-msgstr ""
+msgstr "Kein temporäres Profilbild verfügbar, bitte versuchen Sie es nochmal"
#: avatar/controller.php:135
msgid "No crop data provided"
-msgstr ""
+msgstr "Keine Zuschnittdaten zur Verfügung gestellt"
#: js/config.php:32
msgid "Sunday"
@@ -198,55 +198,55 @@ msgstr "Dezember"
msgid "Settings"
msgstr "Einstellungen"
-#: js/js.js:853
+#: js/js.js:866
msgid "seconds ago"
msgstr "Gerade eben"
-#: js/js.js:854
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "Vor %n Minute"
msgstr[1] "Vor %n Minuten"
-#: js/js.js:855
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "Vor %n Stunde"
msgstr[1] "Vor %n Stunden"
-#: js/js.js:856
+#: js/js.js:869
msgid "today"
msgstr "Heute"
-#: js/js.js:857
+#: js/js.js:870
msgid "yesterday"
msgstr "Gestern"
-#: js/js.js:858
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "Vor %n Tag"
msgstr[1] "Vor %n Tagen"
-#: js/js.js:859
+#: js/js.js:872
msgid "last month"
msgstr "Letzten Monat"
-#: js/js.js:860
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "Vor %n Monat"
msgstr[1] "Vor %n Monaten"
-#: js/js.js:861
+#: js/js.js:874
msgid "months ago"
msgstr "Vor Monaten"
-#: js/js.js:862
+#: js/js.js:875
msgid "last year"
msgstr "Letztes Jahr"
-#: js/js.js:863
+#: js/js.js:876
msgid "years ago"
msgstr "Vor Jahren"
@@ -256,7 +256,7 @@ msgstr "Auswählen"
#: js/oc-dialogs.js:146
msgid "Error loading file picker template: {error}"
-msgstr ""
+msgstr "Fehler beim Laden der Dateiauswahlvorlage: {error}"
#: js/oc-dialogs.js:172
msgid "Yes"
@@ -272,7 +272,47 @@ msgstr "OK"
#: js/oc-dialogs.js:219
msgid "Error loading message template: {error}"
-msgstr ""
+msgstr "Fehler beim Laden der Nachrichtenvorlage: {error}"
+
+#: js/oc-dialogs.js:347
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] "{count} Dateikonflikt"
+msgstr[1] "{count} Dateikonflikte"
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr "Ein Dateikonflikt"
+
+#: js/oc-dialogs.js:367
+msgid "Which files do you want to keep?"
+msgstr "Welche Dateien möchten Sie behalten?"
+
+#: js/oc-dialogs.js:368
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr "Wenn Siebeide Versionen auswählen, erhält die kopierte Datei eine Zahl am Ende des Dateinamens."
+
+#: js/oc-dialogs.js:376
+msgid "Cancel"
+msgstr "Abbrechen"
+
+#: js/oc-dialogs.js:386
+msgid "Continue"
+msgstr "Fortsetzen"
+
+#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+msgid "(all selected)"
+msgstr "(Alle ausgewählt)"
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "({count} selected)"
+msgstr "({count} ausgewählt)"
+
+#: js/oc-dialogs.js:457
+msgid "Error loading file exists template"
+msgstr "Fehler beim Laden der vorhanden Dateivorlage"
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
diff --git a/l10n/de_DE/files.po b/l10n/de_DE/files.po
index e236b674b776d55bcfebce52417e3814fd758c3b..ce852eb583f656cf5e097b31239fa1e82a247c53 100644
--- a/l10n/de_DE/files.po
+++ b/l10n/de_DE/files.po
@@ -16,8 +16,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:00+0000\n"
+"POT-Creation-Date: 2013-09-22 12:51-0400\n"
+"PO-Revision-Date: 2013-09-21 10:00+0000\n"
"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
"Language-Team: German (Germany) <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
@@ -83,156 +83,164 @@ msgstr "Fehler beim Schreiben auf die Festplatte"
msgid "Not enough storage available"
msgstr "Nicht genug Speicher vorhanden."
-#: ajax/upload.php:109
-msgid "Upload failed"
-msgstr "Hochladen fehlgeschlagen"
+#: ajax/upload.php:120 ajax/upload.php:143
+msgid "Upload failed. Could not get file info."
+msgstr "Hochladen fehlgeschlagen. Dateiinformationen konnten nicht abgerufen werden."
-#: ajax/upload.php:127
+#: ajax/upload.php:136
+msgid "Upload failed. Could not find uploaded file"
+msgstr "Hochladen fehlgeschlagen. Hochgeladene Datei konnte nicht gefunden werden."
+
+#: ajax/upload.php:160
msgid "Invalid directory."
msgstr "Ungültiges Verzeichnis."
-#: appinfo/app.php:12
+#: appinfo/app.php:11
msgid "Files"
msgstr "Dateien"
-#: js/file-upload.js:11
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Ihre Datei kann nicht hochgeladen werden, weil es sich um einen Ordner handelt oder 0 Bytes groß ist."
+#: js/file-upload.js:244
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
+msgstr "Datei {filename} kann nicht hochgeladen werden, da sie entweder ein Verzeichnis oder 0 Bytes groß ist"
-#: js/file-upload.js:24
+#: js/file-upload.js:255
msgid "Not enough space available"
msgstr "Nicht genügend Speicherplatz verfügbar"
-#: js/file-upload.js:64
+#: js/file-upload.js:322
msgid "Upload cancelled."
msgstr "Upload abgebrochen."
-#: js/file-upload.js:165
+#: js/file-upload.js:356
+msgid "Could not get result from server."
+msgstr "Ergebnis konnte nicht vom Server abgerufen werden."
+
+#: js/file-upload.js:446
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upload abgebrochen."
-#: js/file-upload.js:239
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr "Die URL darf nicht leer sein."
-#: js/file-upload.js:244 lib/app.php:53
+#: js/file-upload.js:525 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr "Ungültiger Ordnername. Die Verwendung von \"Shared\" ist ownCloud vorbehalten."
-#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550
+#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545
msgid "Error"
msgstr "Fehler"
-#: js/fileactions.js:116
+#: js/fileactions.js:119
msgid "Share"
msgstr "Teilen"
-#: js/fileactions.js:126
+#: js/fileactions.js:131
msgid "Delete permanently"
msgstr "Endgültig löschen"
-#: js/fileactions.js:192
+#: js/fileactions.js:197
msgid "Rename"
msgstr "Umbenennen"
-#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "Ausstehend"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{new_name} existiert bereits"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "ersetzen"
-#: js/filelist.js:307
+#: js/filelist.js:416
msgid "suggest name"
msgstr "Namen vorschlagen"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "abbrechen"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr "{old_name} wurde ersetzt durch {new_name}"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "undo"
msgstr "rückgängig machen"
-#: js/filelist.js:424 js/filelist.js:490 js/files.js:581
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "%n Ordner"
msgstr[1] "%n Ordner"
-#: js/filelist.js:425 js/filelist.js:491 js/files.js:587
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "%n Datei"
msgstr[1] "%n Dateien"
-#: js/filelist.js:432
+#: js/filelist.js:541
msgid "{dirs} and {files}"
msgstr "{dirs} und {files}"
-#: js/filelist.js:563
+#: js/filelist.js:731 js/filelist.js:769
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "%n Datei wird hoch geladen"
msgstr[1] "%n Dateien werden hoch geladen"
-#: js/filelist.js:628
-msgid "files uploading"
-msgstr "Dateien werden hoch geladen"
-
-#: js/files.js:52
+#: js/files.js:25
msgid "'.' is an invalid file name."
msgstr "'.' ist kein gültiger Dateiname."
-#: js/files.js:56
+#: js/files.js:29
msgid "File name cannot be empty."
msgstr "Der Dateiname darf nicht leer sein."
-#: js/files.js:64
+#: js/files.js:37
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Ungültiger Name, '\\', '/', '<', '>', ':', '\"', '|', '?' und '*' sind nicht zulässig."
-#: js/files.js:78
+#: js/files.js:51
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr "Ihr Speicher ist voll, daher können keine Dateien mehr aktualisiert oder synchronisiert werden!"
-#: js/files.js:82
+#: js/files.js:55
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Ihr Speicher ist fast voll ({usedSpacePercent}%)"
-#: js/files.js:94
+#: js/files.js:67
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
msgstr "Die Verschlüsselung wurde deaktiviert, jedoch sind Ihre Dateien nach wie vor verschlüsselt. Bitte gehen Sie zu Ihren persönlichen Einstellungen, um Ihre Dateien zu entschlüsseln."
-#: js/files.js:245
+#: js/files.js:296
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "Ihr Download wird vorbereitet. Dies kann bei größeren Dateien etwas dauern."
-#: js/files.js:563 templates/index.php:69
+#: js/files.js:507 js/files.js:545
+msgid "Error moving file"
+msgstr "Fehler beim Verschieben der Datei"
+
+#: js/files.js:558 templates/index.php:61
msgid "Name"
msgstr "Name"
-#: js/files.js:564 templates/index.php:81
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "Größe"
-#: js/files.js:565 templates/index.php:83
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr "Geändert"
@@ -241,7 +249,7 @@ msgstr "Geändert"
msgid "%s could not be renamed"
msgstr "%s konnte nicht umbenannt werden"
-#: lib/helper.php:11 templates/index.php:18
+#: lib/helper.php:11 templates/index.php:17
msgid "Upload"
msgstr "Hochladen"
@@ -277,65 +285,65 @@ msgstr "Maximale Größe für ZIP-Dateien"
msgid "Save"
msgstr "Speichern"
-#: templates/index.php:7
+#: templates/index.php:6
msgid "New"
msgstr "Neu"
-#: templates/index.php:10
+#: templates/index.php:9
msgid "Text file"
msgstr "Textdatei"
-#: templates/index.php:12
+#: templates/index.php:11
msgid "Folder"
msgstr "Ordner"
-#: templates/index.php:14
+#: templates/index.php:13
msgid "From link"
msgstr "Von einem Link"
-#: templates/index.php:41
+#: templates/index.php:33
msgid "Deleted files"
msgstr "Gelöschte Dateien"
-#: templates/index.php:46
+#: templates/index.php:39
msgid "Cancel upload"
msgstr "Upload abbrechen"
-#: templates/index.php:52
+#: templates/index.php:45
msgid "You don’t have write permissions here."
msgstr "Sie haben hier keine Schreib-Berechtigungen."
-#: templates/index.php:59
+#: templates/index.php:50
msgid "Nothing in here. Upload something!"
msgstr "Alles leer. Laden Sie etwas hoch!"
-#: templates/index.php:75
+#: templates/index.php:67
msgid "Download"
msgstr "Herunterladen"
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr "Freigabe aufheben"
-#: templates/index.php:94 templates/index.php:95
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "Löschen"
-#: templates/index.php:108
+#: templates/index.php:100
msgid "Upload too large"
msgstr "Der Upload ist zu groß"
-#: templates/index.php:110
+#: templates/index.php:102
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Die Datei überschreitet die Maximalgröße für Uploads auf diesem Server."
-#: templates/index.php:115
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr "Dateien werden gescannt, bitte warten."
-#: templates/index.php:118
+#: templates/index.php:110
msgid "Current scanning"
msgstr "Scanne"
diff --git a/l10n/de_DE/lib.po b/l10n/de_DE/lib.po
index 76d7fef1489aa328d352bc13cdfed7940009b43d..e70bc08de29a0cb215cc018f31e5fa4cc1c2f787 100644
--- a/l10n/de_DE/lib.po
+++ b/l10n/de_DE/lib.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-18 11:47-0400\n"
+"PO-Revision-Date: 2013-09-17 13:05+0000\n"
+"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
"Language-Team: German (Germany) <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -58,15 +58,15 @@ msgstr "Konnte \"%s\" nicht aktualisieren."
#: avatar.php:56
msgid "Custom profile pictures don't work with encryption yet"
-msgstr ""
+msgstr "Individuelle Profilbilder werden noch nicht von der Verschlüsselung unterstützt"
#: avatar.php:64
msgid "Unknown filetype"
-msgstr ""
+msgstr "Unbekannter Dateityp"
#: avatar.php:69
msgid "Invalid image"
-msgstr ""
+msgstr "Ungültiges Bild"
#: defaults.php:35
msgid "web services under your control"
diff --git a/l10n/de_DE/settings.po b/l10n/de_DE/settings.po
index bd55435a00eb3deeb56329eed99e93f4fb424b2b..3a889bcbca6b35a5b76cd3dc715e1bb33f8f1b73 100644
--- a/l10n/de_DE/settings.po
+++ b/l10n/de_DE/settings.po
@@ -14,8 +14,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:45-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: German (Germany) <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
@@ -29,7 +29,7 @@ msgid "Unable to load list from App Store"
msgstr "Die Liste der Anwendungen im Store konnte nicht geladen werden."
#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
-#: ajax/togglegroups.php:20
+#: ajax/togglegroups.php:20 changepassword/controller.php:55
msgid "Authentication error"
msgstr "Authentifizierungs-Fehler"
@@ -91,6 +91,35 @@ msgstr "Der Benutzer konnte nicht aus der Gruppe %s entfernt werden"
msgid "Couldn't update app."
msgstr "Die App konnte nicht aktualisiert werden."
+#: changepassword/controller.php:20
+msgid "Wrong password"
+msgstr "Falsches Passwort"
+
+#: changepassword/controller.php:42
+msgid "No user supplied"
+msgstr "Keinen Benutzer übermittelt"
+
+#: changepassword/controller.php:74
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr "Bitte geben Sie ein Wiederherstellungspasswort für das Admin-Konto an, da sonst alle Benutzer Daten verloren gehen können"
+
+#: changepassword/controller.php:79
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr "Falsches Wiederherstellungspasswort für das Admin-Konto. Bitte überprüfen Sie das Passwort und versuchen Sie es erneut."
+
+#: changepassword/controller.php:87
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr "Das Back-End unterstützt die Passwortänderung nicht, aber der Benutzerschlüssel wurde erfolgreich aktualisiert."
+
+#: changepassword/controller.php:92 changepassword/controller.php:103
+msgid "Unable to change password"
+msgstr "Passwort konnte nicht geändert werden"
+
#: js/apps.js:43
msgid "Update to {appversion}"
msgstr "Update zu {appversion}"
@@ -135,15 +164,15 @@ msgstr "Update durchführen"
msgid "Updated"
msgstr "Aktualisiert"
-#: js/personal.js:217
+#: js/personal.js:220
msgid "Select a profile picture"
-msgstr ""
+msgstr "Wählen Sie ein Profilbild"
-#: js/personal.js:262
+#: js/personal.js:265
msgid "Decrypting files... Please wait, this can take some time."
msgstr "Entschlüssle Dateien ... Bitte warten Sie, denn dieser Vorgang kann einige Zeit beanspruchen."
-#: js/personal.js:284
+#: js/personal.js:287
msgid "Saving..."
msgstr "Speichern..."
@@ -467,31 +496,31 @@ msgstr "Bitte tragen Sie eine E-Mail-Adresse ein, um die Passwort-Wiederherstell
#: templates/personal.php:86
msgid "Profile picture"
-msgstr ""
+msgstr "Profilbild"
#: templates/personal.php:90
msgid "Upload new"
-msgstr ""
+msgstr "Neues hochladen"
#: templates/personal.php:92
msgid "Select new from Files"
-msgstr ""
+msgstr "Neues aus den Dateien wählen"
#: templates/personal.php:93
msgid "Remove image"
-msgstr ""
+msgstr "Bild entfernen"
#: templates/personal.php:94
msgid "Either png or jpg. Ideally square but you will be able to crop it."
-msgstr ""
+msgstr "Entweder PNG oder JPG. Im Idealfall quadratisch, aber Sie können es zuschneiden."
#: templates/personal.php:97
msgid "Abort"
-msgstr ""
+msgstr "Abbrechen"
#: templates/personal.php:98
msgid "Choose as profile image"
-msgstr ""
+msgstr "Als Profilbild wählen"
#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
diff --git a/l10n/el/core.po b/l10n/el/core.po
index f9d610d2032931b66bf9f63058424e6ef1bfa399..9b88a333be16ee51479db8468d8159bb74ad6a4f 100644
--- a/l10n/el/core.po
+++ b/l10n/el/core.po
@@ -14,8 +14,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:33+0000\n"
+"POT-Creation-Date: 2013-09-22 12:55-0400\n"
+"PO-Revision-Date: 2013-09-20 15:01+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
@@ -197,55 +197,55 @@ msgstr "ΔεκÎμβÏιος"
msgid "Settings"
msgstr "Ρυθμίσεις"
-#: js/js.js:853
+#: js/js.js:866
msgid "seconds ago"
msgstr "δευτεÏόλεπτα Ï€Ïιν"
-#: js/js.js:854
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:855
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:856
+#: js/js.js:869
msgid "today"
msgstr "σήμεÏα"
-#: js/js.js:857
+#: js/js.js:870
msgid "yesterday"
msgstr "χτες"
-#: js/js.js:858
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:859
+#: js/js.js:872
msgid "last month"
msgstr "τελευταίο μήνα"
-#: js/js.js:860
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:861
+#: js/js.js:874
msgid "months ago"
msgstr "μήνες Ï€Ïιν"
-#: js/js.js:862
+#: js/js.js:875
msgid "last year"
msgstr "τελευταίο χÏόνο"
-#: js/js.js:863
+#: js/js.js:876
msgid "years ago"
msgstr "χÏόνια Ï€Ïιν"
@@ -273,6 +273,46 @@ msgstr "Οκ"
msgid "Error loading message template: {error}"
msgstr ""
+#: js/oc-dialogs.js:347
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:367
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:376
+msgid "Cancel"
+msgstr "ΆκυÏο"
+
+#: js/oc-dialogs.js:386
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:457
+msgid "Error loading file exists template"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/el/files.po b/l10n/el/files.po
index 24da73a436f028212d64dc675aa50d6199f8a03b..f6b7bcf82a416d52fd62da5da7916e7beb066648 100644
--- a/l10n/el/files.po
+++ b/l10n/el/files.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:00+0000\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
@@ -77,11 +77,15 @@ msgstr "Αποτυχία εγγÏαφής στο δίσκο"
msgid "Not enough storage available"
msgstr "Μη επαÏκής διαθÎσιμος αποθηκευτικός χώÏος"
-#: ajax/upload.php:109
-msgid "Upload failed"
-msgstr "Η μεταφόÏτωση απÎτυχε"
+#: ajax/upload.php:120 ajax/upload.php:143
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:136
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
-#: ajax/upload.php:127
+#: ajax/upload.php:160
msgid "Invalid directory."
msgstr "Μη ÎγκυÏος φάκελος."
@@ -89,144 +93,148 @@ msgstr "Μη ÎγκυÏος φάκελος."
msgid "Files"
msgstr "ΑÏχεία"
-#: js/file-upload.js:11
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Αδυναμία στην αποστολή του αÏχείου σας Î±Ï†Î¿Ï ÎµÎ¯Î½Î±Î¹ φάκελος ή Îχει 0 bytes"
+#: js/file-upload.js:244
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
+msgstr ""
-#: js/file-upload.js:24
+#: js/file-upload.js:255
msgid "Not enough space available"
msgstr "Δεν υπάÏχει αÏκετός διαθÎσιμος χώÏος"
-#: js/file-upload.js:64
+#: js/file-upload.js:322
msgid "Upload cancelled."
msgstr "Η αποστολή ακυÏώθηκε."
-#: js/file-upload.js:165
+#: js/file-upload.js:356
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:446
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Η αποστολή του αÏχείου βÏίσκεται σε εξÎλιξη. Το κλείσιμο της σελίδας θα ακυÏώσει την αποστολή."
-#: js/file-upload.js:239
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr "Η URL δεν μποÏεί να είναι κενή."
-#: js/file-upload.js:244 lib/app.php:53
+#: js/file-upload.js:525 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr "Μη ÎγκυÏο όνομα φακÎλου. Η χÏήση του 'ΚοινόχÏηστος' χÏησιμοποιείται από το ownCloud"
-#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550
+#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545
msgid "Error"
msgstr "Σφάλμα"
-#: js/fileactions.js:116
+#: js/fileactions.js:119
msgid "Share"
msgstr "ΔιαμοιÏασμός"
-#: js/fileactions.js:126
+#: js/fileactions.js:131
msgid "Delete permanently"
msgstr "Μόνιμη διαγÏαφή"
-#: js/fileactions.js:192
+#: js/fileactions.js:197
msgid "Rename"
msgstr "Μετονομασία"
-#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "ΕκκÏεμεί"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{new_name} υπάÏχει ήδη"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "αντικατÎστησε"
-#: js/filelist.js:307
+#: js/filelist.js:416
msgid "suggest name"
msgstr "συνιστώμενο όνομα"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "ακÏÏωση"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr "αντικαταστάθηκε το {new_name} με {old_name}"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "undo"
msgstr "αναίÏεση"
-#: js/filelist.js:424 js/filelist.js:490 js/files.js:581
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "%n φάκελος"
msgstr[1] "%n φάκελοι"
-#: js/filelist.js:425 js/filelist.js:491 js/files.js:587
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "%n αÏχείο"
msgstr[1] "%n αÏχεία"
-#: js/filelist.js:432
+#: js/filelist.js:541
msgid "{dirs} and {files}"
msgstr ""
-#: js/filelist.js:563
+#: js/filelist.js:731 js/filelist.js:769
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "ΑνÎβασμα %n αÏχείου"
msgstr[1] "ΑνÎβασμα %n αÏχείων"
-#: js/filelist.js:628
-msgid "files uploading"
-msgstr "αÏχεία ανεβαίνουν"
-
-#: js/files.js:52
+#: js/files.js:25
msgid "'.' is an invalid file name."
msgstr "'.' είναι μη ÎγκυÏο όνομα αÏχείου."
-#: js/files.js:56
+#: js/files.js:29
msgid "File name cannot be empty."
msgstr "Το όνομα αÏχείου δεν μποÏεί να είναι κενό."
-#: js/files.js:64
+#: js/files.js:37
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Μη ÎγκυÏο όνομα, '\\', '/', '<', '>', ':', '\"', '|', '?' και '*' δεν επιτÏÎπονται."
-#: js/files.js:78
+#: js/files.js:51
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr "Ο αποθηκευτικός σας χώÏος είναι γεμάτος, τα αÏχεία δεν μποÏοÏν να ενημεÏωθοÏν ή να συγχÏονιστοÏν πια!"
-#: js/files.js:82
+#: js/files.js:55
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Ο αποθηκευτικός χώÏος είναι σχεδόν γεμάτος ({usedSpacePercent}%)"
-#: js/files.js:94
+#: js/files.js:67
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
msgstr "Η κÏυπτογÏάφηση απενεÏγοποιήθηκε, αλλά τα αÏχεία σας είναι ακόμα κÏυπτογÏαφημÎνα. ΠαÏακαλοÏμε απενεÏγοποιήσετε την κÏυπτογÏάφηση αÏχείων από τις Ï€ÏοσωπικÎÏ‚ σας Ïυθμίσεις"
-#: js/files.js:245
+#: js/files.js:296
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "Η λήψη Ï€Ïοετοιμάζεται. Αυτό μποÏεί να πάÏει ÏŽÏα εάν τα αÏχεία Îχουν μεγάλο μÎγεθος."
-#: js/files.js:563 templates/index.php:69
+#: js/files.js:507 js/files.js:545
+msgid "Error moving file"
+msgstr ""
+
+#: js/files.js:558 templates/index.php:61
msgid "Name"
msgstr "Όνομα"
-#: js/files.js:564 templates/index.php:81
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "ÎœÎγεθος"
-#: js/files.js:565 templates/index.php:83
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr "ΤÏοποποιήθηκε"
@@ -235,7 +243,7 @@ msgstr "ΤÏοποποιήθηκε"
msgid "%s could not be renamed"
msgstr "Αδυναμία μετονομασίας του %s"
-#: lib/helper.php:11 templates/index.php:18
+#: lib/helper.php:11 templates/index.php:17
msgid "Upload"
msgstr "ΜεταφόÏτωση"
@@ -271,65 +279,65 @@ msgstr "ÎœÎγιστο μÎγεθος για αÏχεία ZIP"
msgid "Save"
msgstr "Αποθήκευση"
-#: templates/index.php:7
+#: templates/index.php:6
msgid "New"
msgstr "ÎÎο"
-#: templates/index.php:10
+#: templates/index.php:9
msgid "Text file"
msgstr "ΑÏχείο κειμÎνου"
-#: templates/index.php:12
+#: templates/index.php:11
msgid "Folder"
msgstr "Φάκελος"
-#: templates/index.php:14
+#: templates/index.php:13
msgid "From link"
msgstr "Από σÏνδεσμο"
-#: templates/index.php:41
+#: templates/index.php:33
msgid "Deleted files"
msgstr "ΔιαγÏαμμÎνα αÏχεία"
-#: templates/index.php:46
+#: templates/index.php:39
msgid "Cancel upload"
msgstr "ΑκÏÏωση αποστολής"
-#: templates/index.php:52
+#: templates/index.php:45
msgid "You don’t have write permissions here."
msgstr "Δεν Îχετε δικαιώματα εγγÏαφής εδώ."
-#: templates/index.php:59
+#: templates/index.php:50
msgid "Nothing in here. Upload something!"
msgstr "Δεν υπάÏχει τίποτα εδώ. Ανεβάστε κάτι!"
-#: templates/index.php:75
+#: templates/index.php:67
msgid "Download"
msgstr "Λήψη"
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr "Σταμάτημα διαμοιÏασμοÏ"
-#: templates/index.php:94 templates/index.php:95
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "ΔιαγÏαφή"
-#: templates/index.php:108
+#: templates/index.php:100
msgid "Upload too large"
msgstr "Î Î¿Î»Ï Î¼ÎµÎ³Î¬Î»Î¿ αÏχείο Ï€Ïος αποστολή"
-#: templates/index.php:110
+#: templates/index.php:102
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Τα αÏχεία που Ï€Ïοσπαθείτε να ανεβάσετε υπεÏβαίνουν το μÎγιστο μÎγεθος αποστολής αÏχείων σε αυτόν τον διακομιστή."
-#: templates/index.php:115
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr "Τα αÏχεία σαÏώνονται, παÏακαλώ πεÏιμÎνετε."
-#: templates/index.php:118
+#: templates/index.php:110
msgid "Current scanning"
msgstr "ΤÏÎχουσα ανίχνευση"
diff --git a/l10n/el/settings.po b/l10n/el/settings.po
index 20c03f9adc2197a869acbbbc7b45032530c3056e..1e84a673d35bec3e9ce12cd24527a3025f4f793d 100644
--- a/l10n/el/settings.po
+++ b/l10n/el/settings.po
@@ -13,8 +13,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:45-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
@@ -28,7 +28,7 @@ msgid "Unable to load list from App Store"
msgstr "Σφάλμα στην φόÏτωση της λίστας από το App Store"
#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
-#: ajax/togglegroups.php:20
+#: ajax/togglegroups.php:20 changepassword/controller.php:55
msgid "Authentication error"
msgstr "Σφάλμα πιστοποίησης"
@@ -90,6 +90,35 @@ msgstr "Αδυναμία αφαίÏεσης χÏήστη από την ομάδ
msgid "Couldn't update app."
msgstr "Αδυναμία ενημÎÏωσης εφαÏμογής"
+#: changepassword/controller.php:20
+msgid "Wrong password"
+msgstr ""
+
+#: changepassword/controller.php:42
+msgid "No user supplied"
+msgstr ""
+
+#: changepassword/controller.php:74
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr ""
+
+#: changepassword/controller.php:79
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr ""
+
+#: changepassword/controller.php:87
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr ""
+
+#: changepassword/controller.php:92 changepassword/controller.php:103
+msgid "Unable to change password"
+msgstr ""
+
#: js/apps.js:43
msgid "Update to {appversion}"
msgstr "ΕνημÎÏωση σε {appversion}"
@@ -134,15 +163,15 @@ msgstr "ΕνημÎÏωση"
msgid "Updated"
msgstr "ΕνημεÏώθηκε"
-#: js/personal.js:217
+#: js/personal.js:220
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:262
+#: js/personal.js:265
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:284
+#: js/personal.js:287
msgid "Saving..."
msgstr "Γίνεται αποθήκευση..."
@@ -466,7 +495,7 @@ msgstr "ΣυμπληÏώστε μια διεÏθυνση ηλεκτÏονικο
#: templates/personal.php:86
msgid "Profile picture"
-msgstr ""
+msgstr "ΦωτογÏαφία Ï€Ïοφίλ"
#: templates/personal.php:90
msgid "Upload new"
diff --git a/l10n/en@pirate/core.po b/l10n/en@pirate/core.po
index 14e0eb573caf67d9f585ba23923cef4334e033d3..8f786dfe211811d24c856364740767b95f23961e 100644
--- a/l10n/en@pirate/core.po
+++ b/l10n/en@pirate/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
"MIME-Version: 1.0\n"
@@ -191,55 +191,55 @@ msgstr ""
msgid "Settings"
msgstr ""
-#: js/js.js:853
+#: js/js.js:866
msgid "seconds ago"
msgstr ""
-#: js/js.js:854
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:855
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:856
+#: js/js.js:869
msgid "today"
msgstr ""
-#: js/js.js:857
+#: js/js.js:870
msgid "yesterday"
msgstr ""
-#: js/js.js:858
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:859
+#: js/js.js:872
msgid "last month"
msgstr ""
-#: js/js.js:860
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:861
+#: js/js.js:874
msgid "months ago"
msgstr ""
-#: js/js.js:862
+#: js/js.js:875
msgid "last year"
msgstr ""
-#: js/js.js:863
+#: js/js.js:876
msgid "years ago"
msgstr ""
@@ -267,6 +267,46 @@ msgstr ""
msgid "Error loading message template: {error}"
msgstr ""
+#: js/oc-dialogs.js:347
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:367
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:376
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:386
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:457
+msgid "Error loading file exists template"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/en@pirate/files.po b/l10n/en@pirate/files.po
index 5874adaf38d3cbeada65f1a1eea1e9e889a2b9b3..ea57ff8382adcb90d04ac58fb60bfa1103223710 100644
--- a/l10n/en@pirate/files.po
+++ b/l10n/en@pirate/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-30 09:31-0400\n"
-"PO-Revision-Date: 2013-08-30 13:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
"MIME-Version: 1.0\n"
@@ -74,11 +74,15 @@ msgstr ""
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:109
-msgid "Upload failed"
+#: ajax/upload.php:120 ajax/upload.php:143
+msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:127
+#: ajax/upload.php:136
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
+
+#: ajax/upload.php:160
msgid "Invalid directory."
msgstr ""
@@ -86,144 +90,148 @@ msgstr ""
msgid "Files"
msgstr ""
-#: js/file-upload.js:11
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
+#: js/file-upload.js:244
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr ""
-#: js/file-upload.js:24
+#: js/file-upload.js:255
msgid "Not enough space available"
msgstr ""
-#: js/file-upload.js:64
+#: js/file-upload.js:322
msgid "Upload cancelled."
msgstr ""
-#: js/file-upload.js:165
+#: js/file-upload.js:356
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:446
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/file-upload.js:239
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr ""
-#: js/file-upload.js:244 lib/app.php:53
+#: js/file-upload.js:525 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
+#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545
msgid "Error"
msgstr ""
-#: js/fileactions.js:116
+#: js/fileactions.js:119
msgid "Share"
msgstr ""
-#: js/fileactions.js:126
+#: js/fileactions.js:131
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:192
+#: js/fileactions.js:197
msgid "Rename"
msgstr ""
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr ""
-#: js/filelist.js:305 js/filelist.js:307
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr ""
-#: js/filelist.js:305 js/filelist.js:307
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr ""
-#: js/filelist.js:305
+#: js/filelist.js:416
msgid "suggest name"
msgstr ""
-#: js/filelist.js:305 js/filelist.js:307
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr ""
-#: js/filelist.js:352
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr ""
-#: js/filelist.js:352
+#: js/filelist.js:463
msgid "undo"
msgstr ""
-#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:430
+#: js/filelist.js:541
msgid "{dirs} and {files}"
msgstr ""
-#: js/filelist.js:561
+#: js/filelist.js:731 js/filelist.js:769
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:626
-msgid "files uploading"
-msgstr ""
-
-#: js/files.js:52
+#: js/files.js:25
msgid "'.' is an invalid file name."
msgstr ""
-#: js/files.js:56
+#: js/files.js:29
msgid "File name cannot be empty."
msgstr ""
-#: js/files.js:64
+#: js/files.js:37
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: js/files.js:78
+#: js/files.js:51
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr ""
-#: js/files.js:82
+#: js/files.js:55
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:94
+#: js/files.js:67
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
msgstr ""
-#: js/files.js:245
+#: js/files.js:296
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/files.js:562 templates/index.php:67
+#: js/files.js:507 js/files.js:545
+msgid "Error moving file"
+msgstr ""
+
+#: js/files.js:558 templates/index.php:61
msgid "Name"
msgstr ""
-#: js/files.js:563 templates/index.php:78
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr ""
-#: js/files.js:564 templates/index.php:80
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr ""
@@ -232,7 +240,7 @@ msgstr ""
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:11 templates/index.php:18
+#: lib/helper.php:11 templates/index.php:17
msgid "Upload"
msgstr ""
@@ -268,65 +276,65 @@ msgstr ""
msgid "Save"
msgstr ""
-#: templates/index.php:7
+#: templates/index.php:6
msgid "New"
msgstr ""
-#: templates/index.php:10
+#: templates/index.php:9
msgid "Text file"
msgstr ""
-#: templates/index.php:12
+#: templates/index.php:11
msgid "Folder"
msgstr ""
-#: templates/index.php:14
+#: templates/index.php:13
msgid "From link"
msgstr ""
-#: templates/index.php:41
+#: templates/index.php:33
msgid "Deleted files"
msgstr ""
-#: templates/index.php:46
+#: templates/index.php:39
msgid "Cancel upload"
msgstr ""
-#: templates/index.php:52
+#: templates/index.php:45
msgid "You don’t have write permissions here."
msgstr ""
-#: templates/index.php:59
+#: templates/index.php:50
msgid "Nothing in here. Upload something!"
msgstr ""
-#: templates/index.php:73
+#: templates/index.php:67
msgid "Download"
msgstr "Download"
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr ""
-#: templates/index.php:91 templates/index.php:92
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr ""
-#: templates/index.php:105
+#: templates/index.php:100
msgid "Upload too large"
msgstr ""
-#: templates/index.php:107
+#: templates/index.php:102
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: templates/index.php:112
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:115
+#: templates/index.php:110
msgid "Current scanning"
msgstr ""
diff --git a/l10n/en@pirate/settings.po b/l10n/en@pirate/settings.po
index b03ef2fbfbcc1c8e6735bff96ee22e1540b97fe7..df5539ce0c643e2e082a721b8b26499362f601e7 100644
--- a/l10n/en@pirate/settings.po
+++ b/l10n/en@pirate/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:45-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
"MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgid "Unable to load list from App Store"
msgstr ""
#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
-#: ajax/togglegroups.php:20
+#: ajax/togglegroups.php:20 changepassword/controller.php:55
msgid "Authentication error"
msgstr ""
@@ -84,6 +84,35 @@ msgstr ""
msgid "Couldn't update app."
msgstr ""
+#: changepassword/controller.php:20
+msgid "Wrong password"
+msgstr ""
+
+#: changepassword/controller.php:42
+msgid "No user supplied"
+msgstr ""
+
+#: changepassword/controller.php:74
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr ""
+
+#: changepassword/controller.php:79
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr ""
+
+#: changepassword/controller.php:87
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr ""
+
+#: changepassword/controller.php:92 changepassword/controller.php:103
+msgid "Unable to change password"
+msgstr ""
+
#: js/apps.js:43
msgid "Update to {appversion}"
msgstr ""
@@ -128,15 +157,15 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:217
+#: js/personal.js:220
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:262
+#: js/personal.js:265
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:284
+#: js/personal.js:287
msgid "Saving..."
msgstr ""
diff --git a/l10n/en_GB/core.po b/l10n/en_GB/core.po
index c58c6317903aa456084fb6bdd3e8d8930ab3c446..f9b0f0d24fa9aa0f3a1e0ab69e6dbb75dc985d50 100644
--- a/l10n/en_GB/core.po
+++ b/l10n/en_GB/core.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-24 12:58-0400\n"
+"PO-Revision-Date: 2013-09-23 16:10+0000\n"
+"Last-Translator: mnestis <transifex@mnestis.net>\n"
"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -93,23 +93,23 @@ msgstr "Error removing %s from favourites."
#: avatar/controller.php:62
msgid "No image or file provided"
-msgstr ""
+msgstr "No image or file provided"
#: avatar/controller.php:81
msgid "Unknown filetype"
-msgstr ""
+msgstr "Unknown filetype"
#: avatar/controller.php:85
msgid "Invalid image"
-msgstr ""
+msgstr "Invalid image"
#: avatar/controller.php:115 avatar/controller.php:142
msgid "No temporary profile picture available, try again"
-msgstr ""
+msgstr "No temporary profile picture available, try again"
#: avatar/controller.php:135
msgid "No crop data provided"
-msgstr ""
+msgstr "No crop data provided"
#: js/config.php:32
msgid "Sunday"
@@ -191,55 +191,55 @@ msgstr "December"
msgid "Settings"
msgstr "Settings"
-#: js/js.js:853
+#: js/js.js:866
msgid "seconds ago"
msgstr "seconds ago"
-#: js/js.js:854
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n minute ago"
msgstr[1] "%n minutes ago"
-#: js/js.js:855
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n hour ago"
msgstr[1] "%n hours ago"
-#: js/js.js:856
+#: js/js.js:869
msgid "today"
msgstr "today"
-#: js/js.js:857
+#: js/js.js:870
msgid "yesterday"
msgstr "yesterday"
-#: js/js.js:858
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n day ago"
msgstr[1] "%n days ago"
-#: js/js.js:859
+#: js/js.js:872
msgid "last month"
msgstr "last month"
-#: js/js.js:860
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n month ago"
msgstr[1] "%n months ago"
-#: js/js.js:861
+#: js/js.js:874
msgid "months ago"
msgstr "months ago"
-#: js/js.js:862
+#: js/js.js:875
msgid "last year"
msgstr "last year"
-#: js/js.js:863
+#: js/js.js:876
msgid "years ago"
msgstr "years ago"
@@ -249,7 +249,7 @@ msgstr "Choose"
#: js/oc-dialogs.js:146
msgid "Error loading file picker template: {error}"
-msgstr ""
+msgstr "Error loading file picker template: {error}"
#: js/oc-dialogs.js:172
msgid "Yes"
@@ -265,7 +265,47 @@ msgstr "OK"
#: js/oc-dialogs.js:219
msgid "Error loading message template: {error}"
-msgstr ""
+msgstr "Error loading message template: {error}"
+
+#: js/oc-dialogs.js:347
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] "{count} file conflict"
+msgstr[1] "{count} file conflicts"
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr "One file conflict"
+
+#: js/oc-dialogs.js:367
+msgid "Which files do you want to keep?"
+msgstr "Which files do you wish to keep?"
+
+#: js/oc-dialogs.js:368
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr "If you select both versions, the copied file will have a number added to its name."
+
+#: js/oc-dialogs.js:376
+msgid "Cancel"
+msgstr "Cancel"
+
+#: js/oc-dialogs.js:386
+msgid "Continue"
+msgstr "Continue"
+
+#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+msgid "(all selected)"
+msgstr "(all selected)"
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "({count} selected)"
+msgstr "({count} selected)"
+
+#: js/oc-dialogs.js:457
+msgid "Error loading file exists template"
+msgstr "Error loading file exists template"
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
@@ -276,7 +316,7 @@ msgstr "The object type is not specified."
#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
-#: js/share.js:645 js/share.js:657
+#: js/share.js:656 js/share.js:668
msgid "Error"
msgstr "Error"
@@ -296,7 +336,7 @@ msgstr "Shared"
msgid "Share"
msgstr "Share"
-#: js/share.js:131 js/share.js:685
+#: js/share.js:131 js/share.js:696
msgid "Error while sharing"
msgstr "Error whilst sharing"
@@ -396,23 +436,23 @@ msgstr "delete"
msgid "share"
msgstr "share"
-#: js/share.js:400 js/share.js:632
+#: js/share.js:400 js/share.js:643
msgid "Password protected"
msgstr "Password protected"
-#: js/share.js:645
+#: js/share.js:656
msgid "Error unsetting expiration date"
msgstr "Error unsetting expiration date"
-#: js/share.js:657
+#: js/share.js:668
msgid "Error setting expiration date"
msgstr "Error setting expiration date"
-#: js/share.js:672
+#: js/share.js:683
msgid "Sending ..."
msgstr "Sending ..."
-#: js/share.js:683
+#: js/share.js:694
msgid "Email sent"
msgstr "Email sent"
@@ -449,7 +489,7 @@ msgstr "Request failed!<br>Did you make sure your email/username was correct?"
#: lostpassword/templates/lostpassword.php:15
msgid "You will receive a link to reset your password via Email."
-msgstr "You will receive a link to reset your password via Email."
+msgstr "You will receive a link to reset your password via email."
#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
#: templates/login.php:19
diff --git a/l10n/en_GB/files.po b/l10n/en_GB/files.po
index ee07f5bbe41a0b1834a2f3ee9a021d6518711850..bf8e9374348519fed92117ba8310a4e3cbaac06f 100644
--- a/l10n/en_GB/files.po
+++ b/l10n/en_GB/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:00+0000\n"
+"POT-Creation-Date: 2013-09-24 12:58-0400\n"
+"PO-Revision-Date: 2013-09-24 16:00+0000\n"
"Last-Translator: mnestis <transifex@mnestis.net>\n"
"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n"
"MIME-Version: 1.0\n"
@@ -75,156 +75,164 @@ msgstr "Failed to write to disk"
msgid "Not enough storage available"
msgstr "Not enough storage available"
-#: ajax/upload.php:109
-msgid "Upload failed"
-msgstr "Upload failed"
+#: ajax/upload.php:120 ajax/upload.php:143
+msgid "Upload failed. Could not get file info."
+msgstr "Upload failed. Could not get file info."
-#: ajax/upload.php:127
+#: ajax/upload.php:136
+msgid "Upload failed. Could not find uploaded file"
+msgstr "Upload failed. Could not find uploaded file"
+
+#: ajax/upload.php:160
msgid "Invalid directory."
msgstr "Invalid directory."
-#: appinfo/app.php:12
+#: appinfo/app.php:11
msgid "Files"
msgstr "Files"
-#: js/file-upload.js:11
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Unable to upload your file as it is a directory or has 0 bytes"
+#: js/file-upload.js:244
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
+msgstr "Unable to upload {filename} as it is a directory or has 0 bytes"
-#: js/file-upload.js:24
+#: js/file-upload.js:255
msgid "Not enough space available"
msgstr "Not enough space available"
-#: js/file-upload.js:64
+#: js/file-upload.js:322
msgid "Upload cancelled."
msgstr "Upload cancelled."
-#: js/file-upload.js:165
+#: js/file-upload.js:356
+msgid "Could not get result from server."
+msgstr "Could not get result from server."
+
+#: js/file-upload.js:446
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "File upload is in progress. Leaving the page now will cancel the upload."
-#: js/file-upload.js:239
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr "URL cannot be empty."
-#: js/file-upload.js:244 lib/app.php:53
+#: js/file-upload.js:525 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550
+#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545
msgid "Error"
msgstr "Error"
-#: js/fileactions.js:116
+#: js/fileactions.js:119
msgid "Share"
msgstr "Share"
-#: js/fileactions.js:126
+#: js/fileactions.js:131
msgid "Delete permanently"
msgstr "Delete permanently"
-#: js/fileactions.js:192
+#: js/fileactions.js:197
msgid "Rename"
msgstr "Rename"
-#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "Pending"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{new_name} already exists"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "replace"
-#: js/filelist.js:307
+#: js/filelist.js:416
msgid "suggest name"
msgstr "suggest name"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "cancel"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr "replaced {new_name} with {old_name}"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "undo"
msgstr "undo"
-#: js/filelist.js:424 js/filelist.js:490 js/files.js:581
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "%n folder"
msgstr[1] "%n folders"
-#: js/filelist.js:425 js/filelist.js:491 js/files.js:587
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "%n file"
msgstr[1] "%n files"
-#: js/filelist.js:432
+#: js/filelist.js:541
msgid "{dirs} and {files}"
msgstr "{dirs} and {files}"
-#: js/filelist.js:563
+#: js/filelist.js:731 js/filelist.js:769
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "Uploading %n file"
msgstr[1] "Uploading %n files"
-#: js/filelist.js:628
-msgid "files uploading"
-msgstr "files uploading"
-
-#: js/files.js:52
+#: js/files.js:25
msgid "'.' is an invalid file name."
msgstr "'.' is an invalid file name."
-#: js/files.js:56
+#: js/files.js:29
msgid "File name cannot be empty."
msgstr "File name cannot be empty."
-#: js/files.js:64
+#: js/files.js:37
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
-msgstr "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed."
+msgstr "Invalid name: '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed."
-#: js/files.js:78
+#: js/files.js:51
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr "Your storage is full, files can not be updated or synced anymore!"
-#: js/files.js:82
+#: js/files.js:55
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Your storage is almost full ({usedSpacePercent}%)"
-#: js/files.js:94
+#: js/files.js:67
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
msgstr "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files."
-#: js/files.js:245
+#: js/files.js:296
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "Your download is being prepared. This might take some time if the files are big."
-#: js/files.js:563 templates/index.php:69
+#: js/files.js:507 js/files.js:545
+msgid "Error moving file"
+msgstr "Error moving file"
+
+#: js/files.js:558 templates/index.php:61
msgid "Name"
msgstr "Name"
-#: js/files.js:564 templates/index.php:81
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "Size"
-#: js/files.js:565 templates/index.php:83
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr "Modified"
@@ -233,7 +241,7 @@ msgstr "Modified"
msgid "%s could not be renamed"
msgstr "%s could not be renamed"
-#: lib/helper.php:11 templates/index.php:18
+#: lib/helper.php:11 templates/index.php:17
msgid "Upload"
msgstr "Upload"
@@ -269,65 +277,65 @@ msgstr "Maximum input size for ZIP files"
msgid "Save"
msgstr "Save"
-#: templates/index.php:7
+#: templates/index.php:6
msgid "New"
msgstr "New"
-#: templates/index.php:10
+#: templates/index.php:9
msgid "Text file"
msgstr "Text file"
-#: templates/index.php:12
+#: templates/index.php:11
msgid "Folder"
msgstr "Folder"
-#: templates/index.php:14
+#: templates/index.php:13
msgid "From link"
msgstr "From link"
-#: templates/index.php:41
+#: templates/index.php:33
msgid "Deleted files"
msgstr "Deleted files"
-#: templates/index.php:46
+#: templates/index.php:39
msgid "Cancel upload"
msgstr "Cancel upload"
-#: templates/index.php:52
+#: templates/index.php:45
msgid "You don’t have write permissions here."
msgstr "You don’t have write permission here."
-#: templates/index.php:59
+#: templates/index.php:50
msgid "Nothing in here. Upload something!"
msgstr "Nothing in here. Upload something!"
-#: templates/index.php:75
+#: templates/index.php:67
msgid "Download"
msgstr "Download"
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr "Unshare"
-#: templates/index.php:94 templates/index.php:95
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "Delete"
-#: templates/index.php:108
+#: templates/index.php:100
msgid "Upload too large"
msgstr "Upload too large"
-#: templates/index.php:110
+#: templates/index.php:102
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "The files you are trying to upload exceed the maximum size for file uploads on this server."
-#: templates/index.php:115
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr "Files are being scanned, please wait."
-#: templates/index.php:118
+#: templates/index.php:110
msgid "Current scanning"
msgstr "Current scanning"
diff --git a/l10n/en_GB/files_external.po b/l10n/en_GB/files_external.po
index fc51da0a011fd65d0441e173e6d697807bc54116..6190c958520e668424f15466702eae9eaa6ab2c3 100644
--- a/l10n/en_GB/files_external.po
+++ b/l10n/en_GB/files_external.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-30 09:32-0400\n"
-"PO-Revision-Date: 2013-08-29 17:00+0000\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-18 16:45+0000\n"
"Last-Translator: mnestis <transifex@mnestis.net>\n"
"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/en_GB/files_sharing.po b/l10n/en_GB/files_sharing.po
index 99cac4331f6fc1e5be673e84ad1a06c55e6881ab..a0f4b32037f646e1965bcd31f6f3d47393ed5b6d 100644
--- a/l10n/en_GB/files_sharing.po
+++ b/l10n/en_GB/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:01+0000\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-18 16:46+0000\n"
"Last-Translator: mnestis <transifex@mnestis.net>\n"
"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/en_GB/files_trashbin.po b/l10n/en_GB/files_trashbin.po
index ae821adafa1f9d0144a48b882c5923c7df84a324..6b87c1ddd491eb1735c1b63b833e144ca47c83f9 100644
--- a/l10n/en_GB/files_trashbin.po
+++ b/l10n/en_GB/files_trashbin.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-30 09:32-0400\n"
-"PO-Revision-Date: 2013-08-29 17:10+0000\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-18 16:48+0000\n"
"Last-Translator: mnestis <transifex@mnestis.net>\n"
"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n"
"MIME-Version: 1.0\n"
@@ -44,24 +44,24 @@ msgstr "delete file permanently"
msgid "Delete permanently"
msgstr "Delete permanently"
-#: js/trash.js:184 templates/index.php:17
+#: js/trash.js:190 templates/index.php:21
msgid "Name"
msgstr "Name"
-#: js/trash.js:185 templates/index.php:27
+#: js/trash.js:191 templates/index.php:31
msgid "Deleted"
msgstr "Deleted"
-#: js/trash.js:193
+#: js/trash.js:199
msgid "%n folder"
msgid_plural "%n folders"
-msgstr[0] ""
+msgstr[0] "%n folder"
msgstr[1] "%n folders"
-#: js/trash.js:199
+#: js/trash.js:205
msgid "%n file"
msgid_plural "%n files"
-msgstr[0] ""
+msgstr[0] "%n file"
msgstr[1] "%n files"
#: lib/trash.php:814 lib/trash.php:816
@@ -72,11 +72,11 @@ msgstr "restored"
msgid "Nothing in here. Your trash bin is empty!"
msgstr "Nothing in here. Your recycle bin is empty!"
-#: templates/index.php:20 templates/index.php:22
+#: templates/index.php:24 templates/index.php:26
msgid "Restore"
msgstr "Restore"
-#: templates/index.php:30 templates/index.php:31
+#: templates/index.php:34 templates/index.php:35
msgid "Delete"
msgstr "Delete"
diff --git a/l10n/en_GB/files_versions.po b/l10n/en_GB/files_versions.po
index e727185fa79aa1945d4d4152aa9a168f7dada940..cc791b517d362736d8e6f09e78b315c906ac48f5 100644
--- a/l10n/en_GB/files_versions.po
+++ b/l10n/en_GB/files_versions.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-30 09:32-0400\n"
-"PO-Revision-Date: 2013-08-29 17:10+0000\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-18 16:49+0000\n"
"Last-Translator: mnestis <transifex@mnestis.net>\n"
"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/en_GB/lib.po b/l10n/en_GB/lib.po
index 6f6346036727b008ad4ea28ee7a630ce41574efb..14e6d1c7a8b64f60c4aaffc3102e4116b259d959 100644
--- a/l10n/en_GB/lib.po
+++ b/l10n/en_GB/lib.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-18 11:47-0400\n"
+"PO-Revision-Date: 2013-09-18 13:32+0000\n"
+"Last-Translator: mnestis <transifex@mnestis.net>\n"
"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -56,15 +56,15 @@ msgstr "Failed to upgrade \"%s\"."
#: avatar.php:56
msgid "Custom profile pictures don't work with encryption yet"
-msgstr ""
+msgstr "Custom profile pictures don't work with encryption yet"
#: avatar.php:64
msgid "Unknown filetype"
-msgstr ""
+msgstr "Unknown filetype"
#: avatar.php:69
msgid "Invalid image"
-msgstr ""
+msgstr "Invalid image"
#: defaults.php:35
msgid "web services under your control"
@@ -284,13 +284,13 @@ msgstr "seconds ago"
#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
-msgstr[0] ""
+msgstr[0] "%n minute ago"
msgstr[1] "%n minutes ago"
#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
-msgstr[0] ""
+msgstr[0] "%n hour ago"
msgstr[1] "%n hours ago"
#: template/functions.php:99
@@ -304,7 +304,7 @@ msgstr "yesterday"
#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
-msgstr[0] ""
+msgstr[0] "%n day go"
msgstr[1] "%n days ago"
#: template/functions.php:102
@@ -314,7 +314,7 @@ msgstr "last month"
#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
-msgstr[0] ""
+msgstr[0] "%n month ago"
msgstr[1] "%n months ago"
#: template/functions.php:104
diff --git a/l10n/en_GB/settings.po b/l10n/en_GB/settings.po
index 7187857ac83379f7b594019f874dd33f0c30e138..bcc1f4f64a0bcfd6e3cfa32aeed0df32deade797 100644
--- a/l10n/en_GB/settings.po
+++ b/l10n/en_GB/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:45-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n"
"MIME-Version: 1.0\n"
@@ -23,7 +23,7 @@ msgid "Unable to load list from App Store"
msgstr "Unable to load list from App Store"
#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
-#: ajax/togglegroups.php:20
+#: ajax/togglegroups.php:20 changepassword/controller.php:55
msgid "Authentication error"
msgstr "Authentication error"
@@ -85,6 +85,35 @@ msgstr "Unable to remove user from group %s"
msgid "Couldn't update app."
msgstr "Couldn't update app."
+#: changepassword/controller.php:20
+msgid "Wrong password"
+msgstr "Incorrect password"
+
+#: changepassword/controller.php:42
+msgid "No user supplied"
+msgstr "No user supplied"
+
+#: changepassword/controller.php:74
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr "Please provide an admin recovery password, otherwise all user data will be lost"
+
+#: changepassword/controller.php:79
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr "Incorrect admin recovery password. Please check the password and try again."
+
+#: changepassword/controller.php:87
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr "Back-end doesn't support password change, but the user's encryption key was successfully updated."
+
+#: changepassword/controller.php:92 changepassword/controller.php:103
+msgid "Unable to change password"
+msgstr "Unable to change password"
+
#: js/apps.js:43
msgid "Update to {appversion}"
msgstr "Update to {appversion}"
@@ -129,15 +158,15 @@ msgstr "Update"
msgid "Updated"
msgstr "Updated"
-#: js/personal.js:217
+#: js/personal.js:220
msgid "Select a profile picture"
-msgstr ""
+msgstr "Select a profile picture"
-#: js/personal.js:262
+#: js/personal.js:265
msgid "Decrypting files... Please wait, this can take some time."
msgstr "Decrypting files... Please wait, this can take some time."
-#: js/personal.js:284
+#: js/personal.js:287
msgid "Saving..."
msgstr "Saving..."
@@ -222,7 +251,7 @@ msgstr "Module 'fileinfo' missing"
msgid ""
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
"module to get best results with mime-type detection."
-msgstr "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection."
+msgstr "The PHP module 'fileinfo' is missing. We strongly recommend enabling this module to get best results with mime-type detection."
#: templates/admin.php:58
msgid "Locale not working"
@@ -360,7 +389,7 @@ msgid ""
"licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" "
"target=\"_blank\"><abbr title=\"Affero General Public "
"License\">AGPL</abbr></a>."
-msgstr "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
+msgstr "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public Licence\">AGPL</abbr></a>."
#: templates/apps.php:13
msgid "Add your App"
@@ -461,31 +490,31 @@ msgstr "Fill in an email address to enable password recovery"
#: templates/personal.php:86
msgid "Profile picture"
-msgstr ""
+msgstr "Profile picture"
#: templates/personal.php:90
msgid "Upload new"
-msgstr ""
+msgstr "Upload new"
#: templates/personal.php:92
msgid "Select new from Files"
-msgstr ""
+msgstr "Select new from Files"
#: templates/personal.php:93
msgid "Remove image"
-msgstr ""
+msgstr "Remove image"
#: templates/personal.php:94
msgid "Either png or jpg. Ideally square but you will be able to crop it."
-msgstr ""
+msgstr "Either png or jpg. Ideally square but you will be able to crop it."
#: templates/personal.php:97
msgid "Abort"
-msgstr ""
+msgstr "Abort"
#: templates/personal.php:98
msgid "Choose as profile image"
-msgstr ""
+msgstr "Choose as profile image"
#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
diff --git a/l10n/en_GB/user_webdavauth.po b/l10n/en_GB/user_webdavauth.po
index 210787a40fa15151fd45e116611886e3eb3310c4..7688c63036a6ce69553304c1036dc08fb0de4e7f 100644
--- a/l10n/en_GB/user_webdavauth.po
+++ b/l10n/en_GB/user_webdavauth.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-30 09:32-0400\n"
-"PO-Revision-Date: 2013-08-29 16:40+0000\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-18 16:43+0000\n"
"Last-Translator: mnestis <transifex@mnestis.net>\n"
"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/eo/core.po b/l10n/eo/core.po
index b3f65dc4fbc9dff90b98ad0ae30d2ed4635fa050..1ea5a607492784974565d40ec60ddb8e749a6f55 100644
--- a/l10n/eo/core.po
+++ b/l10n/eo/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:33+0000\n"
+"POT-Creation-Date: 2013-09-22 12:55-0400\n"
+"PO-Revision-Date: 2013-09-20 15:01+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
@@ -192,55 +192,55 @@ msgstr "Decembro"
msgid "Settings"
msgstr "Agordo"
-#: js/js.js:853
+#: js/js.js:866
msgid "seconds ago"
msgstr "sekundoj antaÅe"
-#: js/js.js:854
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:855
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:856
+#: js/js.js:869
msgid "today"
msgstr "hodiaÅ"
-#: js/js.js:857
+#: js/js.js:870
msgid "yesterday"
msgstr "hieraÅ"
-#: js/js.js:858
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:859
+#: js/js.js:872
msgid "last month"
msgstr "lastamonate"
-#: js/js.js:860
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:861
+#: js/js.js:874
msgid "months ago"
msgstr "monatoj antaÅe"
-#: js/js.js:862
+#: js/js.js:875
msgid "last year"
msgstr "lastajare"
-#: js/js.js:863
+#: js/js.js:876
msgid "years ago"
msgstr "jaroj antaÅe"
@@ -268,6 +268,46 @@ msgstr "Akcepti"
msgid "Error loading message template: {error}"
msgstr ""
+#: js/oc-dialogs.js:347
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:367
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:376
+msgid "Cancel"
+msgstr "Nuligi"
+
+#: js/oc-dialogs.js:386
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:457
+msgid "Error loading file exists template"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/eo/files.po b/l10n/eo/files.po
index 7458946888271220f221d02a35d12fc5d2b75267..0f9a143e22a751fe069fc3e89638d5aa21de3685 100644
--- a/l10n/eo/files.po
+++ b/l10n/eo/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:00+0000\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
@@ -75,11 +75,15 @@ msgstr "Malsukcesis skribo al disko"
msgid "Not enough storage available"
msgstr "Ne haveblas sufiĉa memoro"
-#: ajax/upload.php:109
-msgid "Upload failed"
-msgstr "AlÅuto malsukcesis"
+#: ajax/upload.php:120 ajax/upload.php:143
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:136
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
-#: ajax/upload.php:127
+#: ajax/upload.php:160
msgid "Invalid directory."
msgstr "Nevalida dosierujo."
@@ -87,144 +91,148 @@ msgstr "Nevalida dosierujo."
msgid "Files"
msgstr "Dosieroj"
-#: js/file-upload.js:11
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Ne eblis alÅuti vian dosieron ĉar Äi estas dosierujo aÅ havas 0 duumokojn"
+#: js/file-upload.js:244
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
+msgstr ""
-#: js/file-upload.js:24
+#: js/file-upload.js:255
msgid "Not enough space available"
msgstr "Ne haveblas sufiĉa spaco"
-#: js/file-upload.js:64
+#: js/file-upload.js:322
msgid "Upload cancelled."
msgstr "La alÅuto nuliÄis."
-#: js/file-upload.js:165
+#: js/file-upload.js:356
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:446
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "DosieralÅuto plenumiÄas. Lasi la paÄon nun nuligus la alÅuton."
-#: js/file-upload.js:239
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr "URL ne povas esti malplena."
-#: js/file-upload.js:244 lib/app.php:53
+#: js/file-upload.js:525 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr "Nevalida dosierujnomo. La uzo de “Shared†estas rezervita de ownCloud."
-#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550
+#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545
msgid "Error"
msgstr "Eraro"
-#: js/fileactions.js:116
+#: js/fileactions.js:119
msgid "Share"
msgstr "Kunhavigi"
-#: js/fileactions.js:126
+#: js/fileactions.js:131
msgid "Delete permanently"
msgstr "Forigi por ĉiam"
-#: js/fileactions.js:192
+#: js/fileactions.js:197
msgid "Rename"
msgstr "Alinomigi"
-#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "Traktotaj"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{new_name} jam ekzistas"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "anstataÅigi"
-#: js/filelist.js:307
+#: js/filelist.js:416
msgid "suggest name"
msgstr "sugesti nomon"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "nuligi"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr "anstataÅiÄis {new_name} per {old_name}"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "undo"
msgstr "malfari"
-#: js/filelist.js:424 js/filelist.js:490 js/files.js:581
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:425 js/filelist.js:491 js/files.js:587
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:432
+#: js/filelist.js:541
msgid "{dirs} and {files}"
msgstr ""
-#: js/filelist.js:563
+#: js/filelist.js:731 js/filelist.js:769
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:628
-msgid "files uploading"
-msgstr "dosieroj estas alÅutataj"
-
-#: js/files.js:52
+#: js/files.js:25
msgid "'.' is an invalid file name."
msgstr "'.' ne estas valida dosiernomo."
-#: js/files.js:56
+#: js/files.js:29
msgid "File name cannot be empty."
msgstr "Dosiernomo devas ne malpleni."
-#: js/files.js:64
+#: js/files.js:37
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Nevalida nomo: “\\â€, “/â€, “<â€, “>â€, “:â€, “\"â€, “|â€, “?†kaj “*†ne permesatas."
-#: js/files.js:78
+#: js/files.js:51
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr "Via memoro plenas, ne plu eblas Äisdatigi aÅ sinkronigi dosierojn!"
-#: js/files.js:82
+#: js/files.js:55
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Via memoro preskaÅ plenas ({usedSpacePercent}%)"
-#: js/files.js:94
+#: js/files.js:67
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
msgstr ""
-#: js/files.js:245
+#: js/files.js:296
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "Via elÅuto pretiÄatas. Ĉi tio povas daÅri iom da tempo se la dosieroj grandas."
-#: js/files.js:563 templates/index.php:69
+#: js/files.js:507 js/files.js:545
+msgid "Error moving file"
+msgstr ""
+
+#: js/files.js:558 templates/index.php:61
msgid "Name"
msgstr "Nomo"
-#: js/files.js:564 templates/index.php:81
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "Grando"
-#: js/files.js:565 templates/index.php:83
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr "Modifita"
@@ -233,7 +241,7 @@ msgstr "Modifita"
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:11 templates/index.php:18
+#: lib/helper.php:11 templates/index.php:17
msgid "Upload"
msgstr "AlÅuti"
@@ -269,65 +277,65 @@ msgstr "Maksimuma enirgrando por ZIP-dosieroj"
msgid "Save"
msgstr "Konservi"
-#: templates/index.php:7
+#: templates/index.php:6
msgid "New"
msgstr "Nova"
-#: templates/index.php:10
+#: templates/index.php:9
msgid "Text file"
msgstr "Tekstodosiero"
-#: templates/index.php:12
+#: templates/index.php:11
msgid "Folder"
msgstr "Dosierujo"
-#: templates/index.php:14
+#: templates/index.php:13
msgid "From link"
msgstr "El ligilo"
-#: templates/index.php:41
+#: templates/index.php:33
msgid "Deleted files"
msgstr "Forigitaj dosieroj"
-#: templates/index.php:46
+#: templates/index.php:39
msgid "Cancel upload"
msgstr "Nuligi alÅuton"
-#: templates/index.php:52
+#: templates/index.php:45
msgid "You don’t have write permissions here."
msgstr "Vi ne havas permeson skribi ĉi tie."
-#: templates/index.php:59
+#: templates/index.php:50
msgid "Nothing in here. Upload something!"
msgstr "Nenio estas ĉi tie. AlÅutu ion!"
-#: templates/index.php:75
+#: templates/index.php:67
msgid "Download"
msgstr "ElÅuti"
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr "Malkunhavigi"
-#: templates/index.php:94 templates/index.php:95
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "Forigi"
-#: templates/index.php:108
+#: templates/index.php:100
msgid "Upload too large"
msgstr "AlÅuto tro larÄa"
-#: templates/index.php:110
+#: templates/index.php:102
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "La dosieroj, kiujn vi provas alÅuti, transpasas la maksimuman grandon por dosieralÅutoj en ĉi tiu servilo."
-#: templates/index.php:115
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr "Dosieroj estas skanataj, bonvolu atendi."
-#: templates/index.php:118
+#: templates/index.php:110
msgid "Current scanning"
msgstr "Nuna skano"
diff --git a/l10n/eo/settings.po b/l10n/eo/settings.po
index 405b43ad00d68ba9e86582aba90731fb9ea6cd37..d049887b7b2301a7902859f3c06b4e9433f4262a 100644
--- a/l10n/eo/settings.po
+++ b/l10n/eo/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:45-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgid "Unable to load list from App Store"
msgstr "Ne eblis Åargi liston el aplikaĵovendejo"
#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
-#: ajax/togglegroups.php:20
+#: ajax/togglegroups.php:20 changepassword/controller.php:55
msgid "Authentication error"
msgstr "AÅtentiga eraro"
@@ -84,6 +84,35 @@ msgstr "Ne eblis forigi la uzantan el la grupo %s"
msgid "Couldn't update app."
msgstr ""
+#: changepassword/controller.php:20
+msgid "Wrong password"
+msgstr ""
+
+#: changepassword/controller.php:42
+msgid "No user supplied"
+msgstr ""
+
+#: changepassword/controller.php:74
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr ""
+
+#: changepassword/controller.php:79
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr ""
+
+#: changepassword/controller.php:87
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr ""
+
+#: changepassword/controller.php:92 changepassword/controller.php:103
+msgid "Unable to change password"
+msgstr ""
+
#: js/apps.js:43
msgid "Update to {appversion}"
msgstr ""
@@ -128,15 +157,15 @@ msgstr "Äœisdatigi"
msgid "Updated"
msgstr ""
-#: js/personal.js:217
+#: js/personal.js:220
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:262
+#: js/personal.js:265
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:284
+#: js/personal.js:287
msgid "Saving..."
msgstr "Konservante..."
@@ -460,7 +489,7 @@ msgstr "Enigu retpoÅtadreson por kapabligi pasvortan restaÅron"
#: templates/personal.php:86
msgid "Profile picture"
-msgstr ""
+msgstr "Profila bildo"
#: templates/personal.php:90
msgid "Upload new"
diff --git a/l10n/es/core.po b/l10n/es/core.po
index 8b73e83c2053392605ab39eb10940756698451d7..5e96058e82f7255f6df62da85563fe0cd978917f 100644
--- a/l10n/es/core.po
+++ b/l10n/es/core.po
@@ -17,8 +17,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-09-22 12:55-0400\n"
+"PO-Revision-Date: 2013-09-20 15:01+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
@@ -200,55 +200,55 @@ msgstr "Diciembre"
msgid "Settings"
msgstr "Ajustes"
-#: js/js.js:853
+#: js/js.js:866
msgid "seconds ago"
msgstr "segundos antes"
-#: js/js.js:854
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "Hace %n minuto"
msgstr[1] "Hace %n minutos"
-#: js/js.js:855
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "Hace %n hora"
msgstr[1] "Hace %n horas"
-#: js/js.js:856
+#: js/js.js:869
msgid "today"
msgstr "hoy"
-#: js/js.js:857
+#: js/js.js:870
msgid "yesterday"
msgstr "ayer"
-#: js/js.js:858
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "Hace %n dÃa"
msgstr[1] "Hace %n dÃas"
-#: js/js.js:859
+#: js/js.js:872
msgid "last month"
msgstr "el mes pasado"
-#: js/js.js:860
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "Hace %n mes"
msgstr[1] "Hace %n meses"
-#: js/js.js:861
+#: js/js.js:874
msgid "months ago"
msgstr "meses antes"
-#: js/js.js:862
+#: js/js.js:875
msgid "last year"
msgstr "el año pasado"
-#: js/js.js:863
+#: js/js.js:876
msgid "years ago"
msgstr "años antes"
@@ -276,6 +276,46 @@ msgstr "Aceptar"
msgid "Error loading message template: {error}"
msgstr ""
+#: js/oc-dialogs.js:347
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:367
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:376
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: js/oc-dialogs.js:386
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:457
+msgid "Error loading file exists template"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/es/files.po b/l10n/es/files.po
index e68841cb875646b54c04c956c6d464b36aaddb56..a4058e8958c7e29d4294dabfbf61af090f1eec6a 100644
--- a/l10n/es/files.po
+++ b/l10n/es/files.po
@@ -13,9 +13,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-13 23:50+0000\n"
-"Last-Translator: Korrosivo <yo@rubendelcampo.es>\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -80,11 +80,15 @@ msgstr "Falló al escribir al disco"
msgid "Not enough storage available"
msgstr "No hay suficiente espacio disponible"
-#: ajax/upload.php:109
-msgid "Upload failed"
-msgstr "Error en la subida"
+#: ajax/upload.php:120 ajax/upload.php:143
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:136
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
-#: ajax/upload.php:127
+#: ajax/upload.php:160
msgid "Invalid directory."
msgstr "Directorio inválido."
@@ -92,144 +96,148 @@ msgstr "Directorio inválido."
msgid "Files"
msgstr "Archivos"
-#: js/file-upload.js:11
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Incapaz de subir su archivo, es un directorio o tiene 0 bytes"
+#: js/file-upload.js:244
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
+msgstr ""
-#: js/file-upload.js:24
+#: js/file-upload.js:255
msgid "Not enough space available"
msgstr "No hay suficiente espacio disponible"
-#: js/file-upload.js:64
+#: js/file-upload.js:322
msgid "Upload cancelled."
msgstr "Subida cancelada."
-#: js/file-upload.js:165
+#: js/file-upload.js:356
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:446
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "La subida del archivo está en proceso. Si sale de la página ahora cancelará la subida."
-#: js/file-upload.js:239
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr "La URL no puede estar vacÃa."
-#: js/file-upload.js:244 lib/app.php:53
+#: js/file-upload.js:525 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr "Nombre de carpeta invalido. El uso de \"Shared\" está reservado por ownCloud"
-#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550
+#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545
msgid "Error"
msgstr "Error"
-#: js/fileactions.js:116
+#: js/fileactions.js:119
msgid "Share"
msgstr "Compartir"
-#: js/fileactions.js:126
+#: js/fileactions.js:131
msgid "Delete permanently"
msgstr "Eliminar permanentemente"
-#: js/fileactions.js:192
+#: js/fileactions.js:197
msgid "Rename"
msgstr "Renombrar"
-#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "Pendiente"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{new_name} ya existe"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "reemplazar"
-#: js/filelist.js:307
+#: js/filelist.js:416
msgid "suggest name"
msgstr "sugerir nombre"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "cancelar"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr "reemplazado {new_name} con {old_name}"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "undo"
msgstr "deshacer"
-#: js/filelist.js:424 js/filelist.js:490 js/files.js:581
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] "%n carpetas"
-#: js/filelist.js:425 js/filelist.js:491 js/files.js:587
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] "%n archivos"
-#: js/filelist.js:432
+#: js/filelist.js:541
msgid "{dirs} and {files}"
msgstr "{dirs} y {files}"
-#: js/filelist.js:563
+#: js/filelist.js:731 js/filelist.js:769
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "Subiendo %n archivo"
msgstr[1] "Subiendo %n archivos"
-#: js/filelist.js:628
-msgid "files uploading"
-msgstr "subiendo archivos"
-
-#: js/files.js:52
+#: js/files.js:25
msgid "'.' is an invalid file name."
msgstr "'.' no es un nombre de archivo válido."
-#: js/files.js:56
+#: js/files.js:29
msgid "File name cannot be empty."
msgstr "El nombre de archivo no puede estar vacÃo."
-#: js/files.js:64
+#: js/files.js:37
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Nombre Invalido, \"\\\", \"/\", \"<\", \">\", \":\", \"\", \"|\" \"?\" y \"*\" no están permitidos "
-#: js/files.js:78
+#: js/files.js:51
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr "Su almacenamiento está lleno, ¡no se pueden actualizar o sincronizar más!"
-#: js/files.js:82
+#: js/files.js:55
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Su almacenamiento está casi lleno ({usedSpacePercent}%)"
-#: js/files.js:94
+#: js/files.js:67
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
msgstr "El cifrado ha sido deshabilitado pero tus archivos permanecen cifrados. Por favor, ve a tus ajustes personales para descifrar tus archivos."
-#: js/files.js:245
+#: js/files.js:296
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "Su descarga está siendo preparada. Esto puede tardar algún tiempo si los archivos son grandes."
-#: js/files.js:563 templates/index.php:69
+#: js/files.js:507 js/files.js:545
+msgid "Error moving file"
+msgstr ""
+
+#: js/files.js:558 templates/index.php:61
msgid "Name"
msgstr "Nombre"
-#: js/files.js:564 templates/index.php:81
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "Tamaño"
-#: js/files.js:565 templates/index.php:83
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr "Modificado"
@@ -238,7 +246,7 @@ msgstr "Modificado"
msgid "%s could not be renamed"
msgstr "%s no se pudo renombrar"
-#: lib/helper.php:11 templates/index.php:18
+#: lib/helper.php:11 templates/index.php:17
msgid "Upload"
msgstr "Subir"
@@ -274,65 +282,65 @@ msgstr "Tamaño máximo para archivos ZIP de entrada"
msgid "Save"
msgstr "Guardar"
-#: templates/index.php:7
+#: templates/index.php:6
msgid "New"
msgstr "Nuevo"
-#: templates/index.php:10
+#: templates/index.php:9
msgid "Text file"
msgstr "Archivo de texto"
-#: templates/index.php:12
+#: templates/index.php:11
msgid "Folder"
msgstr "Carpeta"
-#: templates/index.php:14
+#: templates/index.php:13
msgid "From link"
msgstr "Desde enlace"
-#: templates/index.php:41
+#: templates/index.php:33
msgid "Deleted files"
msgstr "Archivos eliminados"
-#: templates/index.php:46
+#: templates/index.php:39
msgid "Cancel upload"
msgstr "Cancelar subida"
-#: templates/index.php:52
+#: templates/index.php:45
msgid "You don’t have write permissions here."
msgstr "No tiene permisos de escritura aquÃ."
-#: templates/index.php:59
+#: templates/index.php:50
msgid "Nothing in here. Upload something!"
msgstr "No hay nada aquÃ. ¡Suba algo!"
-#: templates/index.php:75
+#: templates/index.php:67
msgid "Download"
msgstr "Descargar"
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr "Dejar de compartir"
-#: templates/index.php:94 templates/index.php:95
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "Eliminar"
-#: templates/index.php:108
+#: templates/index.php:100
msgid "Upload too large"
msgstr "Subida demasido grande"
-#: templates/index.php:110
+#: templates/index.php:102
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Los archivos que estás intentando subir sobrepasan el tamaño máximo permitido en este servidor."
-#: templates/index.php:115
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr "Los archivos están siendo escaneados, por favor espere."
-#: templates/index.php:118
+#: templates/index.php:110
msgid "Current scanning"
msgstr "Escaneo actual"
diff --git a/l10n/es/settings.po b/l10n/es/settings.po
index 32d2de1aad91fec66804e7f99d647b9e97d1978d..f11743ea9540e9259807146b56064850ce611a49 100644
--- a/l10n/es/settings.po
+++ b/l10n/es/settings.po
@@ -4,6 +4,7 @@
#
# Translators:
# Art O. Pal <artopal@fastmail.fm>, 2013
+# asaez <asaez@asaez.eu>, 2013
# eadeprado <eadeprado@outlook.com>, 2013
# ggam <ggam@brainleakage.com>, 2013
# pablomillaquen <pablomillaquen@gmail.com>, 2013
@@ -15,8 +16,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:45-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
@@ -30,7 +31,7 @@ msgid "Unable to load list from App Store"
msgstr "Imposible cargar la lista desde el App Store"
#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
-#: ajax/togglegroups.php:20
+#: ajax/togglegroups.php:20 changepassword/controller.php:55
msgid "Authentication error"
msgstr "Error de autenticación"
@@ -92,6 +93,35 @@ msgstr "No se pudo eliminar al usuario del grupo %s"
msgid "Couldn't update app."
msgstr "No se pudo actualizar la aplicacion."
+#: changepassword/controller.php:20
+msgid "Wrong password"
+msgstr ""
+
+#: changepassword/controller.php:42
+msgid "No user supplied"
+msgstr ""
+
+#: changepassword/controller.php:74
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr "Por favor facilite una contraseña de recuperación de administrador, sino se perderán todos los datos de usuario"
+
+#: changepassword/controller.php:79
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr "Contraseña de recuperación de administrador incorrecta. Por favor compruebe la contraseña e inténtelo de nuevo."
+
+#: changepassword/controller.php:87
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr ""
+
+#: changepassword/controller.php:92 changepassword/controller.php:103
+msgid "Unable to change password"
+msgstr "No se ha podido cambiar la contraseña"
+
#: js/apps.js:43
msgid "Update to {appversion}"
msgstr "Actualizado a {appversion}"
@@ -136,15 +166,15 @@ msgstr "Actualizar"
msgid "Updated"
msgstr "Actualizado"
-#: js/personal.js:217
+#: js/personal.js:220
msgid "Select a profile picture"
-msgstr ""
+msgstr "Seleccionar una imagen de perfil"
-#: js/personal.js:262
+#: js/personal.js:265
msgid "Decrypting files... Please wait, this can take some time."
msgstr "Descifrando archivos... Espere por favor, esto puede llevar algo de tiempo."
-#: js/personal.js:284
+#: js/personal.js:287
msgid "Saving..."
msgstr "Guardando..."
@@ -468,19 +498,19 @@ msgstr "Escriba una dirección de correo electrónico para restablecer la contra
#: templates/personal.php:86
msgid "Profile picture"
-msgstr ""
+msgstr "Foto del perfil"
#: templates/personal.php:90
msgid "Upload new"
-msgstr ""
+msgstr "Subir nuevo"
#: templates/personal.php:92
msgid "Select new from Files"
-msgstr ""
+msgstr "Seleccionar nuevo desde Ficheros"
#: templates/personal.php:93
msgid "Remove image"
-msgstr ""
+msgstr "Borrar imagen"
#: templates/personal.php:94
msgid "Either png or jpg. Ideally square but you will be able to crop it."
@@ -488,11 +518,11 @@ msgstr ""
#: templates/personal.php:97
msgid "Abort"
-msgstr ""
+msgstr "Abortar"
#: templates/personal.php:98
msgid "Choose as profile image"
-msgstr ""
+msgstr "Seleccionar como imagen de perfil"
#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
diff --git a/l10n/es_AR/core.po b/l10n/es_AR/core.po
index 570b13d5cca97ddcad7cba426cf3173b1c413432..6c72e8a9b003fb54bd63d93216da4fa921fc6403 100644
--- a/l10n/es_AR/core.po
+++ b/l10n/es_AR/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:33+0000\n"
+"POT-Creation-Date: 2013-09-22 12:55-0400\n"
+"PO-Revision-Date: 2013-09-20 15:01+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
@@ -191,55 +191,55 @@ msgstr "diciembre"
msgid "Settings"
msgstr "Configuración"
-#: js/js.js:853
+#: js/js.js:866
msgid "seconds ago"
msgstr "segundos atrás"
-#: js/js.js:854
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "Hace %n minuto"
msgstr[1] "Hace %n minutos"
-#: js/js.js:855
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "Hace %n hora"
msgstr[1] "Hace %n horas"
-#: js/js.js:856
+#: js/js.js:869
msgid "today"
msgstr "hoy"
-#: js/js.js:857
+#: js/js.js:870
msgid "yesterday"
msgstr "ayer"
-#: js/js.js:858
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "Hace %n dÃa"
msgstr[1] "Hace %n dÃas"
-#: js/js.js:859
+#: js/js.js:872
msgid "last month"
msgstr "el mes pasado"
-#: js/js.js:860
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "Hace %n mes"
msgstr[1] "Hace %n meses"
-#: js/js.js:861
+#: js/js.js:874
msgid "months ago"
msgstr "meses atrás"
-#: js/js.js:862
+#: js/js.js:875
msgid "last year"
msgstr "el año pasado"
-#: js/js.js:863
+#: js/js.js:876
msgid "years ago"
msgstr "años atrás"
@@ -267,6 +267,46 @@ msgstr "Aceptar"
msgid "Error loading message template: {error}"
msgstr ""
+#: js/oc-dialogs.js:347
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:367
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:376
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: js/oc-dialogs.js:386
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:457
+msgid "Error loading file exists template"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/es_AR/files.po b/l10n/es_AR/files.po
index 68680594d1868f332d8c1aab648977bcaf48cd81..f502ba71685d650b478b77f3d70a653605f29c4f 100644
--- a/l10n/es_AR/files.po
+++ b/l10n/es_AR/files.po
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:00+0000\n"
-"Last-Translator: cnngimenez\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -78,11 +78,15 @@ msgstr "Error al escribir en el disco"
msgid "Not enough storage available"
msgstr "No hay suficiente almacenamiento"
-#: ajax/upload.php:109
-msgid "Upload failed"
-msgstr "Error al subir el archivo"
+#: ajax/upload.php:120 ajax/upload.php:143
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:136
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
-#: ajax/upload.php:127
+#: ajax/upload.php:160
msgid "Invalid directory."
msgstr "Directorio inválido."
@@ -90,144 +94,148 @@ msgstr "Directorio inválido."
msgid "Files"
msgstr "Archivos"
-#: js/file-upload.js:11
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "No fue posible subir el archivo porque es un directorio o porque su tamaño es 0 bytes"
+#: js/file-upload.js:244
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
+msgstr ""
-#: js/file-upload.js:24
+#: js/file-upload.js:255
msgid "Not enough space available"
msgstr "No hay suficiente espacio disponible"
-#: js/file-upload.js:64
+#: js/file-upload.js:322
msgid "Upload cancelled."
msgstr "La subida fue cancelada"
-#: js/file-upload.js:165
+#: js/file-upload.js:356
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:446
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "La subida del archivo está en proceso. Si salÃs de la página ahora, la subida se cancelará."
-#: js/file-upload.js:239
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr "La URL no puede estar vacÃa"
-#: js/file-upload.js:244 lib/app.php:53
+#: js/file-upload.js:525 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr "Nombre de directorio inválido. El uso de \"Shared\" está reservado por ownCloud"
-#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550
+#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545
msgid "Error"
msgstr "Error"
-#: js/fileactions.js:116
+#: js/fileactions.js:119
msgid "Share"
msgstr "Compartir"
-#: js/fileactions.js:126
+#: js/fileactions.js:131
msgid "Delete permanently"
msgstr "Borrar permanentemente"
-#: js/fileactions.js:192
+#: js/fileactions.js:197
msgid "Rename"
msgstr "Cambiar nombre"
-#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "Pendientes"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{new_name} ya existe"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "reemplazar"
-#: js/filelist.js:307
+#: js/filelist.js:416
msgid "suggest name"
msgstr "sugerir nombre"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "cancelar"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr "se reemplazó {new_name} con {old_name}"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "undo"
msgstr "deshacer"
-#: js/filelist.js:424 js/filelist.js:490 js/files.js:581
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "%n carpeta"
msgstr[1] "%n carpetas"
-#: js/filelist.js:425 js/filelist.js:491 js/files.js:587
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "%n archivo"
msgstr[1] "%n archivos"
-#: js/filelist.js:432
+#: js/filelist.js:541
msgid "{dirs} and {files}"
msgstr "{carpetas} y {archivos}"
-#: js/filelist.js:563
+#: js/filelist.js:731 js/filelist.js:769
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "Subiendo %n archivo"
msgstr[1] "Subiendo %n archivos"
-#: js/filelist.js:628
-msgid "files uploading"
-msgstr "Subiendo archivos"
-
-#: js/files.js:52
+#: js/files.js:25
msgid "'.' is an invalid file name."
msgstr "'.' es un nombre de archivo inválido."
-#: js/files.js:56
+#: js/files.js:29
msgid "File name cannot be empty."
msgstr "El nombre del archivo no puede quedar vacÃo."
-#: js/files.js:64
+#: js/files.js:37
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Nombre invalido, '\\', '/', '<', '>', ':', '\"', '|', '?' y '*' no están permitidos."
-#: js/files.js:78
+#: js/files.js:51
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr "El almacenamiento está lleno, los archivos no se pueden seguir actualizando ni sincronizando"
-#: js/files.js:82
+#: js/files.js:55
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "El almacenamiento está casi lleno ({usedSpacePercent}%)"
-#: js/files.js:94
+#: js/files.js:67
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
msgstr "El proceso de cifrado se ha desactivado, pero los archivos aún están encriptados. Por favor, vaya a la configuración personal para descifrar los archivos."
-#: js/files.js:245
+#: js/files.js:296
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "Tu descarga se está preparando. Esto puede demorar si los archivos son muy grandes."
-#: js/files.js:563 templates/index.php:69
+#: js/files.js:507 js/files.js:545
+msgid "Error moving file"
+msgstr ""
+
+#: js/files.js:558 templates/index.php:61
msgid "Name"
msgstr "Nombre"
-#: js/files.js:564 templates/index.php:81
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "Tamaño"
-#: js/files.js:565 templates/index.php:83
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr "Modificado"
@@ -236,7 +244,7 @@ msgstr "Modificado"
msgid "%s could not be renamed"
msgstr "No se pudo renombrar %s"
-#: lib/helper.php:11 templates/index.php:18
+#: lib/helper.php:11 templates/index.php:17
msgid "Upload"
msgstr "Subir"
@@ -272,65 +280,65 @@ msgstr "Tamaño máximo para archivos ZIP de entrada"
msgid "Save"
msgstr "Guardar"
-#: templates/index.php:7
+#: templates/index.php:6
msgid "New"
msgstr "Nuevo"
-#: templates/index.php:10
+#: templates/index.php:9
msgid "Text file"
msgstr "Archivo de texto"
-#: templates/index.php:12
+#: templates/index.php:11
msgid "Folder"
msgstr "Carpeta"
-#: templates/index.php:14
+#: templates/index.php:13
msgid "From link"
msgstr "Desde enlace"
-#: templates/index.php:41
+#: templates/index.php:33
msgid "Deleted files"
msgstr "Archivos borrados"
-#: templates/index.php:46
+#: templates/index.php:39
msgid "Cancel upload"
msgstr "Cancelar subida"
-#: templates/index.php:52
+#: templates/index.php:45
msgid "You don’t have write permissions here."
msgstr "No tenés permisos de escritura acá."
-#: templates/index.php:59
+#: templates/index.php:50
msgid "Nothing in here. Upload something!"
msgstr "No hay nada. ¡Subà contenido!"
-#: templates/index.php:75
+#: templates/index.php:67
msgid "Download"
msgstr "Descargar"
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr "Dejar de compartir"
-#: templates/index.php:94 templates/index.php:95
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "Borrar"
-#: templates/index.php:108
+#: templates/index.php:100
msgid "Upload too large"
msgstr "El tamaño del archivo que querés subir es demasiado grande"
-#: templates/index.php:110
+#: templates/index.php:102
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Los archivos que intentás subir sobrepasan el tamaño máximo "
-#: templates/index.php:115
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr "Se están escaneando los archivos, por favor esperá."
-#: templates/index.php:118
+#: templates/index.php:110
msgid "Current scanning"
msgstr "Escaneo actual"
diff --git a/l10n/es_AR/settings.po b/l10n/es_AR/settings.po
index e91cf0d7808c484422ba982372190cf4351ee3d0..faf86eb46038a9ef441f0b098b6f1d20de403c8f 100644
--- a/l10n/es_AR/settings.po
+++ b/l10n/es_AR/settings.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:45-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
@@ -25,7 +25,7 @@ msgid "Unable to load list from App Store"
msgstr "Imposible cargar la lista desde el App Store"
#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
-#: ajax/togglegroups.php:20
+#: ajax/togglegroups.php:20 changepassword/controller.php:55
msgid "Authentication error"
msgstr "Error al autenticar"
@@ -87,6 +87,35 @@ msgstr "No es posible borrar al usuario del grupo %s"
msgid "Couldn't update app."
msgstr "No se pudo actualizar la App."
+#: changepassword/controller.php:20
+msgid "Wrong password"
+msgstr ""
+
+#: changepassword/controller.php:42
+msgid "No user supplied"
+msgstr ""
+
+#: changepassword/controller.php:74
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr ""
+
+#: changepassword/controller.php:79
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr ""
+
+#: changepassword/controller.php:87
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr ""
+
+#: changepassword/controller.php:92 changepassword/controller.php:103
+msgid "Unable to change password"
+msgstr ""
+
#: js/apps.js:43
msgid "Update to {appversion}"
msgstr "Actualizar a {appversion}"
@@ -131,15 +160,15 @@ msgstr "Actualizar"
msgid "Updated"
msgstr "Actualizado"
-#: js/personal.js:217
+#: js/personal.js:220
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:262
+#: js/personal.js:265
msgid "Decrypting files... Please wait, this can take some time."
msgstr "Desencriptando archivos... Por favor espere, esto puede tardar."
-#: js/personal.js:284
+#: js/personal.js:287
msgid "Saving..."
msgstr "Guardando..."
@@ -483,7 +512,7 @@ msgstr ""
#: templates/personal.php:97
msgid "Abort"
-msgstr ""
+msgstr "Abortar"
#: templates/personal.php:98
msgid "Choose as profile image"
diff --git a/l10n/es_MX/core.po b/l10n/es_MX/core.po
index 9a6e9cbb0958352f290f5f24a2338382c4f801b8..d351beb1b75e7a83daf99191e1793c12f5492579 100644
--- a/l10n/es_MX/core.po
+++ b/l10n/es_MX/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/owncloud/language/es_MX/)\n"
"MIME-Version: 1.0\n"
@@ -190,55 +190,55 @@ msgstr ""
msgid "Settings"
msgstr ""
-#: js/js.js:853
+#: js/js.js:866
msgid "seconds ago"
msgstr ""
-#: js/js.js:854
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:855
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:856
+#: js/js.js:869
msgid "today"
msgstr ""
-#: js/js.js:857
+#: js/js.js:870
msgid "yesterday"
msgstr ""
-#: js/js.js:858
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:859
+#: js/js.js:872
msgid "last month"
msgstr ""
-#: js/js.js:860
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:861
+#: js/js.js:874
msgid "months ago"
msgstr ""
-#: js/js.js:862
+#: js/js.js:875
msgid "last year"
msgstr ""
-#: js/js.js:863
+#: js/js.js:876
msgid "years ago"
msgstr ""
@@ -266,6 +266,46 @@ msgstr ""
msgid "Error loading message template: {error}"
msgstr ""
+#: js/oc-dialogs.js:347
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:367
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:376
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:386
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:457
+msgid "Error loading file exists template"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/es_MX/files.po b/l10n/es_MX/files.po
index 0e1dc47804e166ac011bc067bc435335282227a3..7405f7a77b613c39666949060f713ff4b00311b6 100644
--- a/l10n/es_MX/files.po
+++ b/l10n/es_MX/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-07 04:39-0400\n"
-"PO-Revision-Date: 2013-09-07 07:27+0000\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/owncloud/language/es_MX/)\n"
"MIME-Version: 1.0\n"
@@ -74,11 +74,15 @@ msgstr ""
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:109
-msgid "Upload failed"
+#: ajax/upload.php:120 ajax/upload.php:143
+msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:127
+#: ajax/upload.php:136
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
+
+#: ajax/upload.php:160
msgid "Invalid directory."
msgstr ""
@@ -86,144 +90,148 @@ msgstr ""
msgid "Files"
msgstr ""
-#: js/file-upload.js:11
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
+#: js/file-upload.js:244
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr ""
-#: js/file-upload.js:24
+#: js/file-upload.js:255
msgid "Not enough space available"
msgstr ""
-#: js/file-upload.js:64
+#: js/file-upload.js:322
msgid "Upload cancelled."
msgstr ""
-#: js/file-upload.js:165
+#: js/file-upload.js:356
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:446
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/file-upload.js:239
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr ""
-#: js/file-upload.js:244 lib/app.php:53
+#: js/file-upload.js:525 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550
+#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545
msgid "Error"
msgstr ""
-#: js/fileactions.js:116
+#: js/fileactions.js:119
msgid "Share"
msgstr ""
-#: js/fileactions.js:126
+#: js/fileactions.js:131
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:192
+#: js/fileactions.js:197
msgid "Rename"
msgstr ""
-#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr ""
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr ""
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr ""
-#: js/filelist.js:307
+#: js/filelist.js:416
msgid "suggest name"
msgstr ""
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr ""
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr ""
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "undo"
msgstr ""
-#: js/filelist.js:424 js/filelist.js:490 js/files.js:581
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:425 js/filelist.js:491 js/files.js:587
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:432
+#: js/filelist.js:541
msgid "{dirs} and {files}"
msgstr ""
-#: js/filelist.js:563
+#: js/filelist.js:731 js/filelist.js:769
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:628
-msgid "files uploading"
-msgstr ""
-
-#: js/files.js:52
+#: js/files.js:25
msgid "'.' is an invalid file name."
msgstr ""
-#: js/files.js:56
+#: js/files.js:29
msgid "File name cannot be empty."
msgstr ""
-#: js/files.js:64
+#: js/files.js:37
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: js/files.js:78
+#: js/files.js:51
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr ""
-#: js/files.js:82
+#: js/files.js:55
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:94
+#: js/files.js:67
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
msgstr ""
-#: js/files.js:245
+#: js/files.js:296
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/files.js:563 templates/index.php:69
+#: js/files.js:507 js/files.js:545
+msgid "Error moving file"
+msgstr ""
+
+#: js/files.js:558 templates/index.php:61
msgid "Name"
msgstr ""
-#: js/files.js:564 templates/index.php:81
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr ""
-#: js/files.js:565 templates/index.php:83
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr ""
@@ -232,7 +240,7 @@ msgstr ""
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:11 templates/index.php:18
+#: lib/helper.php:11 templates/index.php:17
msgid "Upload"
msgstr ""
@@ -268,65 +276,65 @@ msgstr ""
msgid "Save"
msgstr ""
-#: templates/index.php:7
+#: templates/index.php:6
msgid "New"
msgstr ""
-#: templates/index.php:10
+#: templates/index.php:9
msgid "Text file"
msgstr ""
-#: templates/index.php:12
+#: templates/index.php:11
msgid "Folder"
msgstr ""
-#: templates/index.php:14
+#: templates/index.php:13
msgid "From link"
msgstr ""
-#: templates/index.php:41
+#: templates/index.php:33
msgid "Deleted files"
msgstr ""
-#: templates/index.php:46
+#: templates/index.php:39
msgid "Cancel upload"
msgstr ""
-#: templates/index.php:52
+#: templates/index.php:45
msgid "You don’t have write permissions here."
msgstr ""
-#: templates/index.php:59
+#: templates/index.php:50
msgid "Nothing in here. Upload something!"
msgstr ""
-#: templates/index.php:75
+#: templates/index.php:67
msgid "Download"
msgstr ""
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr ""
-#: templates/index.php:94 templates/index.php:95
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr ""
-#: templates/index.php:108
+#: templates/index.php:100
msgid "Upload too large"
msgstr ""
-#: templates/index.php:110
+#: templates/index.php:102
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: templates/index.php:115
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:118
+#: templates/index.php:110
msgid "Current scanning"
msgstr ""
diff --git a/l10n/es_MX/settings.po b/l10n/es_MX/settings.po
index e4d80e5f68314614bbaf3c9763dce75daca3dc1e..7b7e92dc23dad4c9619df0f305b382b2101fbad1 100644
--- a/l10n/es_MX/settings.po
+++ b/l10n/es_MX/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:45-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/owncloud/language/es_MX/)\n"
"MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgid "Unable to load list from App Store"
msgstr ""
#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
-#: ajax/togglegroups.php:20
+#: ajax/togglegroups.php:20 changepassword/controller.php:55
msgid "Authentication error"
msgstr ""
@@ -84,6 +84,35 @@ msgstr ""
msgid "Couldn't update app."
msgstr ""
+#: changepassword/controller.php:20
+msgid "Wrong password"
+msgstr ""
+
+#: changepassword/controller.php:42
+msgid "No user supplied"
+msgstr ""
+
+#: changepassword/controller.php:74
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr ""
+
+#: changepassword/controller.php:79
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr ""
+
+#: changepassword/controller.php:87
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr ""
+
+#: changepassword/controller.php:92 changepassword/controller.php:103
+msgid "Unable to change password"
+msgstr ""
+
#: js/apps.js:43
msgid "Update to {appversion}"
msgstr ""
@@ -128,15 +157,15 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:217
+#: js/personal.js:220
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:262
+#: js/personal.js:265
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:284
+#: js/personal.js:287
msgid "Saving..."
msgstr ""
diff --git a/l10n/et_EE/core.po b/l10n/et_EE/core.po
index 7e163f5efcd16d348e8dcd1e40727c5d143eb6fb..872a66ae6aa6b9445381bcb4dcf8934c639d801a 100644
--- a/l10n/et_EE/core.po
+++ b/l10n/et_EE/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-09-22 12:55-0400\n"
+"PO-Revision-Date: 2013-09-20 15:01+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
@@ -94,23 +94,23 @@ msgstr "Viga %s eemaldamisel lemmikutest."
#: avatar/controller.php:62
msgid "No image or file provided"
-msgstr ""
+msgstr "Ühtegi pilti või faili ei pakutud"
#: avatar/controller.php:81
msgid "Unknown filetype"
-msgstr ""
+msgstr "Tundmatu failitüüp"
#: avatar/controller.php:85
msgid "Invalid image"
-msgstr ""
+msgstr "Vigane pilt"
#: avatar/controller.php:115 avatar/controller.php:142
msgid "No temporary profile picture available, try again"
-msgstr ""
+msgstr "Ãœhtegi ajutist profiili pilti pole saadaval, proovi uuesti"
#: avatar/controller.php:135
msgid "No crop data provided"
-msgstr ""
+msgstr "Lõikeandmeid ei leitud"
#: js/config.php:32
msgid "Sunday"
@@ -192,55 +192,55 @@ msgstr "Detsember"
msgid "Settings"
msgstr "Seaded"
-#: js/js.js:853
+#: js/js.js:866
msgid "seconds ago"
msgstr "sekundit tagasi"
-#: js/js.js:854
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n minut tagasi"
msgstr[1] "%n minutit tagasi"
-#: js/js.js:855
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n tund tagasi"
msgstr[1] "%n tundi tagasi"
-#: js/js.js:856
+#: js/js.js:869
msgid "today"
msgstr "täna"
-#: js/js.js:857
+#: js/js.js:870
msgid "yesterday"
msgstr "eile"
-#: js/js.js:858
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n päev tagasi"
msgstr[1] "%n päeva tagasi"
-#: js/js.js:859
+#: js/js.js:872
msgid "last month"
msgstr "viimasel kuul"
-#: js/js.js:860
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n kuu tagasi"
msgstr[1] "%n kuud tagasi"
-#: js/js.js:861
+#: js/js.js:874
msgid "months ago"
msgstr "kuu tagasi"
-#: js/js.js:862
+#: js/js.js:875
msgid "last year"
msgstr "viimasel aastal"
-#: js/js.js:863
+#: js/js.js:876
msgid "years ago"
msgstr "aastat tagasi"
@@ -250,7 +250,7 @@ msgstr "Vali"
#: js/oc-dialogs.js:146
msgid "Error loading file picker template: {error}"
-msgstr ""
+msgstr "Viga faili valija malli laadimisel: {error}"
#: js/oc-dialogs.js:172
msgid "Yes"
@@ -266,6 +266,46 @@ msgstr "Ok"
#: js/oc-dialogs.js:219
msgid "Error loading message template: {error}"
+msgstr "Viga sõnumi malli laadimisel: {error}"
+
+#: js/oc-dialogs.js:347
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:367
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:376
+msgid "Cancel"
+msgstr "Loobu"
+
+#: js/oc-dialogs.js:386
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:457
+msgid "Error loading file exists template"
msgstr ""
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
diff --git a/l10n/et_EE/files.po b/l10n/et_EE/files.po
index 943c2186c0caf433528600d07e894f60b4a70a53..52bcf2de8f04e82466ccc2940d99a846869586a7 100644
--- a/l10n/et_EE/files.po
+++ b/l10n/et_EE/files.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:00+0000\n"
-"Last-Translator: pisike.sipelgas <pisike.sipelgas@gmail.com>\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -76,11 +76,15 @@ msgstr "Kettale kirjutamine ebaõnnestus"
msgid "Not enough storage available"
msgstr "Saadaval pole piisavalt ruumi"
-#: ajax/upload.php:109
-msgid "Upload failed"
-msgstr "Üleslaadimine ebaõnnestus"
+#: ajax/upload.php:120 ajax/upload.php:143
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:136
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
-#: ajax/upload.php:127
+#: ajax/upload.php:160
msgid "Invalid directory."
msgstr "Vigane kaust."
@@ -88,144 +92,148 @@ msgstr "Vigane kaust."
msgid "Files"
msgstr "Failid"
-#: js/file-upload.js:11
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Faili ei saa üles laadida, kuna see on kaust või selle suurus on 0 baiti"
+#: js/file-upload.js:244
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
+msgstr ""
-#: js/file-upload.js:24
+#: js/file-upload.js:255
msgid "Not enough space available"
msgstr "Pole piisavalt ruumi"
-#: js/file-upload.js:64
+#: js/file-upload.js:322
msgid "Upload cancelled."
msgstr "Üleslaadimine tühistati."
-#: js/file-upload.js:165
+#: js/file-upload.js:356
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:446
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Faili üleslaadimine on töös. Lehelt lahkumine katkestab selle üleslaadimise."
-#: js/file-upload.js:239
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr "URL ei saa olla tühi."
-#: js/file-upload.js:244 lib/app.php:53
+#: js/file-upload.js:525 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr "Vigane kausta nimi. 'Shared' kasutamine on reserveeritud ownCloud poolt."
-#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550
+#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545
msgid "Error"
msgstr "Viga"
-#: js/fileactions.js:116
+#: js/fileactions.js:119
msgid "Share"
msgstr "Jaga"
-#: js/fileactions.js:126
+#: js/fileactions.js:131
msgid "Delete permanently"
msgstr "Kustuta jäädavalt"
-#: js/fileactions.js:192
+#: js/fileactions.js:197
msgid "Rename"
msgstr "Nimeta ümber"
-#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "Ootel"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{new_name} on juba olemas"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "asenda"
-#: js/filelist.js:307
+#: js/filelist.js:416
msgid "suggest name"
msgstr "soovita nime"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "loobu"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr "asendas nime {old_name} nimega {new_name}"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "undo"
msgstr "tagasi"
-#: js/filelist.js:424 js/filelist.js:490 js/files.js:581
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "%n kataloog"
msgstr[1] "%n kataloogi"
-#: js/filelist.js:425 js/filelist.js:491 js/files.js:587
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "%n fail"
msgstr[1] "%n faili"
-#: js/filelist.js:432
+#: js/filelist.js:541
msgid "{dirs} and {files}"
msgstr "{dirs} ja {files}"
-#: js/filelist.js:563
+#: js/filelist.js:731 js/filelist.js:769
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "Laadin üles %n faili"
msgstr[1] "Laadin üles %n faili"
-#: js/filelist.js:628
-msgid "files uploading"
-msgstr "faili üleslaadimisel"
-
-#: js/files.js:52
+#: js/files.js:25
msgid "'.' is an invalid file name."
msgstr "'.' on vigane failinimi."
-#: js/files.js:56
+#: js/files.js:29
msgid "File name cannot be empty."
msgstr "Faili nimi ei saa olla tühi."
-#: js/files.js:64
+#: js/files.js:37
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Vigane nimi, '\\', '/', '<', '>', ':', '\"', '|', '?' ja '*' pole lubatud."
-#: js/files.js:78
+#: js/files.js:51
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr "Sinu andmemaht on täis! Faile ei uuendata ega sünkroniseerita!"
-#: js/files.js:82
+#: js/files.js:55
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Su andmemaht on peaaegu täis ({usedSpacePercent}%)"
-#: js/files.js:94
+#: js/files.js:67
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
msgstr "Krüpteering on keelatud, kuid sinu failid on endiselt krüpteeritud. Palun vaata oma personaalseid seadeid oma failide dekrüpteerimiseks."
-#: js/files.js:245
+#: js/files.js:296
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "Valmistatakse allalaadimist. See võib võtta veidi aega, kui on tegu suurte failidega. "
-#: js/files.js:563 templates/index.php:69
+#: js/files.js:507 js/files.js:545
+msgid "Error moving file"
+msgstr ""
+
+#: js/files.js:558 templates/index.php:61
msgid "Name"
msgstr "Nimi"
-#: js/files.js:564 templates/index.php:81
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "Suurus"
-#: js/files.js:565 templates/index.php:83
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr "Muudetud"
@@ -234,7 +242,7 @@ msgstr "Muudetud"
msgid "%s could not be renamed"
msgstr "%s ümbernimetamine ebaõnnestus"
-#: lib/helper.php:11 templates/index.php:18
+#: lib/helper.php:11 templates/index.php:17
msgid "Upload"
msgstr "Lae üles"
@@ -270,65 +278,65 @@ msgstr "Maksimaalne ZIP-faili sisestatava faili suurus"
msgid "Save"
msgstr "Salvesta"
-#: templates/index.php:7
+#: templates/index.php:6
msgid "New"
msgstr "Uus"
-#: templates/index.php:10
+#: templates/index.php:9
msgid "Text file"
msgstr "Tekstifail"
-#: templates/index.php:12
+#: templates/index.php:11
msgid "Folder"
msgstr "Kaust"
-#: templates/index.php:14
+#: templates/index.php:13
msgid "From link"
msgstr "Allikast"
-#: templates/index.php:41
+#: templates/index.php:33
msgid "Deleted files"
msgstr "Kustutatud failid"
-#: templates/index.php:46
+#: templates/index.php:39
msgid "Cancel upload"
msgstr "Tühista üleslaadimine"
-#: templates/index.php:52
+#: templates/index.php:45
msgid "You don’t have write permissions here."
msgstr "Siin puudvad sul kirjutamisõigused."
-#: templates/index.php:59
+#: templates/index.php:50
msgid "Nothing in here. Upload something!"
msgstr "Siin pole midagi. Lae midagi üles!"
-#: templates/index.php:75
+#: templates/index.php:67
msgid "Download"
msgstr "Lae alla"
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr "Lõpeta jagamine"
-#: templates/index.php:94 templates/index.php:95
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "Kustuta"
-#: templates/index.php:108
+#: templates/index.php:100
msgid "Upload too large"
msgstr "Ãœleslaadimine on liiga suur"
-#: templates/index.php:110
+#: templates/index.php:102
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Failid, mida sa proovid üles laadida, ületab serveri poolt üleslaetavatele failidele määratud maksimaalse suuruse."
-#: templates/index.php:115
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr "Faile skannitakse, palun oota."
-#: templates/index.php:118
+#: templates/index.php:110
msgid "Current scanning"
msgstr "Praegune skannimine"
diff --git a/l10n/et_EE/lib.po b/l10n/et_EE/lib.po
index 4883978e98ac1df34aba9f85a57eda3c7ce4c23a..70416438c1697bb616156da03333adfece834c5c 100644
--- a/l10n/et_EE/lib.po
+++ b/l10n/et_EE/lib.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-18 11:47-0400\n"
+"PO-Revision-Date: 2013-09-18 08:20+0000\n"
+"Last-Translator: pisike.sipelgas <pisike.sipelgas@gmail.com>\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -57,15 +57,15 @@ msgstr "Ebaõnnestunud uuendus \"%s\"."
#: avatar.php:56
msgid "Custom profile pictures don't work with encryption yet"
-msgstr ""
+msgstr "Kohandatud profiili pildid ei toimi veel koos krüpteeringuga"
#: avatar.php:64
msgid "Unknown filetype"
-msgstr ""
+msgstr "Tundmatu failitüüp"
#: avatar.php:69
msgid "Invalid image"
-msgstr ""
+msgstr "Vigane pilt"
#: defaults.php:35
msgid "web services under your control"
diff --git a/l10n/et_EE/settings.po b/l10n/et_EE/settings.po
index 99a5ced11e1104422e6c8a025f360165ed71e104..72d666a7d0bca3b7d2bf895d3f7de6c08144698e 100644
--- a/l10n/et_EE/settings.po
+++ b/l10n/et_EE/settings.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:45-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
@@ -24,7 +24,7 @@ msgid "Unable to load list from App Store"
msgstr "App Store'i nimekirja laadimine ebaõnnestus"
#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
-#: ajax/togglegroups.php:20
+#: ajax/togglegroups.php:20 changepassword/controller.php:55
msgid "Authentication error"
msgstr "Autentimise viga"
@@ -86,6 +86,35 @@ msgstr "Kasutajat ei saa eemaldada grupist %s"
msgid "Couldn't update app."
msgstr "Rakenduse uuendamine ebaõnnestus."
+#: changepassword/controller.php:20
+msgid "Wrong password"
+msgstr "Vale parool"
+
+#: changepassword/controller.php:42
+msgid "No user supplied"
+msgstr "Kasutajat ei sisestatud"
+
+#: changepassword/controller.php:74
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr "Palun sisesta administraatori taasteparool, muidu kaotad kõik kasutajate andmed"
+
+#: changepassword/controller.php:79
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr "Vale administraatori taasteparool. Palun kontrolli parooli ning proovi uuesti."
+
+#: changepassword/controller.php:87
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr "Tagarakend ei toeta parooli vahetust, kuid kasutaja krüptimisvõti uuendati edukalt."
+
+#: changepassword/controller.php:92 changepassword/controller.php:103
+msgid "Unable to change password"
+msgstr "Ei suuda parooli muuta"
+
#: js/apps.js:43
msgid "Update to {appversion}"
msgstr "Uuenda versioonile {appversion}"
@@ -130,15 +159,15 @@ msgstr "Uuenda"
msgid "Updated"
msgstr "Uuendatud"
-#: js/personal.js:217
+#: js/personal.js:220
msgid "Select a profile picture"
-msgstr ""
+msgstr "Vali profiili pilt"
-#: js/personal.js:262
+#: js/personal.js:265
msgid "Decrypting files... Please wait, this can take some time."
msgstr "Dekrüpteerin faile... Palun oota, see võib võtta veidi aega."
-#: js/personal.js:284
+#: js/personal.js:287
msgid "Saving..."
msgstr "Salvestamine..."
@@ -462,31 +491,31 @@ msgstr "Parooli taastamise sisse lülitamiseks sisesta e-posti aadress"
#: templates/personal.php:86
msgid "Profile picture"
-msgstr ""
+msgstr "Profiili pilt"
#: templates/personal.php:90
msgid "Upload new"
-msgstr ""
+msgstr "Laadi uus"
#: templates/personal.php:92
msgid "Select new from Files"
-msgstr ""
+msgstr "Vali failidest uus"
#: templates/personal.php:93
msgid "Remove image"
-msgstr ""
+msgstr "Eemalda pilt"
#: templates/personal.php:94
msgid "Either png or jpg. Ideally square but you will be able to crop it."
-msgstr ""
+msgstr "Kas png või jpg. Võimalikult ruudukujuline, kuid Sul on võimalus veel lõigata."
#: templates/personal.php:97
msgid "Abort"
-msgstr ""
+msgstr "Katkesta"
#: templates/personal.php:98
msgid "Choose as profile image"
-msgstr ""
+msgstr "Vali kui profiili pilt"
#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
diff --git a/l10n/eu/core.po b/l10n/eu/core.po
index 6c943bef9ee54a746dfef0bc35f4657e1301863e..456f415e68465aa26ed9f4be4a5219ed581ee08a 100644
--- a/l10n/eu/core.po
+++ b/l10n/eu/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:33+0000\n"
+"POT-Creation-Date: 2013-09-22 12:55-0400\n"
+"PO-Revision-Date: 2013-09-20 15:01+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
@@ -192,55 +192,55 @@ msgstr "Abendua"
msgid "Settings"
msgstr "Ezarpenak"
-#: js/js.js:853
+#: js/js.js:866
msgid "seconds ago"
msgstr "segundu"
-#: js/js.js:854
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "orain dela minutu %n"
msgstr[1] "orain dela %n minutu"
-#: js/js.js:855
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "orain dela ordu %n"
msgstr[1] "orain dela %n ordu"
-#: js/js.js:856
+#: js/js.js:869
msgid "today"
msgstr "gaur"
-#: js/js.js:857
+#: js/js.js:870
msgid "yesterday"
msgstr "atzo"
-#: js/js.js:858
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "orain dela egun %n"
msgstr[1] "orain dela %n egun"
-#: js/js.js:859
+#: js/js.js:872
msgid "last month"
msgstr "joan den hilabetean"
-#: js/js.js:860
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "orain dela hilabete %n"
msgstr[1] "orain dela %n hilabete"
-#: js/js.js:861
+#: js/js.js:874
msgid "months ago"
msgstr "hilabete"
-#: js/js.js:862
+#: js/js.js:875
msgid "last year"
msgstr "joan den urtean"
-#: js/js.js:863
+#: js/js.js:876
msgid "years ago"
msgstr "urte"
@@ -268,6 +268,46 @@ msgstr "Ados"
msgid "Error loading message template: {error}"
msgstr ""
+#: js/oc-dialogs.js:347
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:367
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:376
+msgid "Cancel"
+msgstr "Ezeztatu"
+
+#: js/oc-dialogs.js:386
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:457
+msgid "Error loading file exists template"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/eu/files.po b/l10n/eu/files.po
index d48f767a56af8acc4d979fd65d61d9221a94e7f2..46b992abc377bd4e6e6aad9e66de80f2100753e2 100644
--- a/l10n/eu/files.po
+++ b/l10n/eu/files.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:00+0000\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
@@ -76,11 +76,15 @@ msgstr "Errore bat izan da diskoan idazterakoan"
msgid "Not enough storage available"
msgstr "Ez dago behar aina leku erabilgarri,"
-#: ajax/upload.php:109
-msgid "Upload failed"
-msgstr "igotzeak huts egin du"
+#: ajax/upload.php:120 ajax/upload.php:143
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:136
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
-#: ajax/upload.php:127
+#: ajax/upload.php:160
msgid "Invalid directory."
msgstr "Baliogabeko karpeta."
@@ -88,144 +92,148 @@ msgstr "Baliogabeko karpeta."
msgid "Files"
msgstr "Fitxategiak"
-#: js/file-upload.js:11
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Ezin izan da zure fitxategia igo karpeta bat delako edo 0 byte dituelako"
+#: js/file-upload.js:244
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
+msgstr ""
-#: js/file-upload.js:24
+#: js/file-upload.js:255
msgid "Not enough space available"
msgstr "Ez dago leku nahikorik."
-#: js/file-upload.js:64
+#: js/file-upload.js:322
msgid "Upload cancelled."
msgstr "Igoera ezeztatuta"
-#: js/file-upload.js:165
+#: js/file-upload.js:356
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:446
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Fitxategien igoera martxan da. Orria orain uzteak igoera ezeztatutko du."
-#: js/file-upload.js:239
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr "URLa ezin da hutsik egon."
-#: js/file-upload.js:244 lib/app.php:53
+#: js/file-upload.js:525 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr "Karpeta izne baliogabea. \"Shared\" karpeta erabilpena OwnCloudentzat erreserbaturik dago."
-#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550
+#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545
msgid "Error"
msgstr "Errorea"
-#: js/fileactions.js:116
+#: js/fileactions.js:119
msgid "Share"
msgstr "Elkarbanatu"
-#: js/fileactions.js:126
+#: js/fileactions.js:131
msgid "Delete permanently"
msgstr "Ezabatu betirako"
-#: js/fileactions.js:192
+#: js/fileactions.js:197
msgid "Rename"
msgstr "Berrizendatu"
-#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "Zain"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{new_name} dagoeneko existitzen da"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "ordeztu"
-#: js/filelist.js:307
+#: js/filelist.js:416
msgid "suggest name"
msgstr "aholkatu izena"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "ezeztatu"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr " {new_name}-k {old_name} ordezkatu du"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "undo"
msgstr "desegin"
-#: js/filelist.js:424 js/filelist.js:490 js/files.js:581
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "karpeta %n"
msgstr[1] "%n karpeta"
-#: js/filelist.js:425 js/filelist.js:491 js/files.js:587
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "fitxategi %n"
msgstr[1] "%n fitxategi"
-#: js/filelist.js:432
+#: js/filelist.js:541
msgid "{dirs} and {files}"
msgstr ""
-#: js/filelist.js:563
+#: js/filelist.js:731 js/filelist.js:769
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "Fitxategi %n igotzen"
msgstr[1] "%n fitxategi igotzen"
-#: js/filelist.js:628
-msgid "files uploading"
-msgstr "fitxategiak igotzen"
-
-#: js/files.js:52
+#: js/files.js:25
msgid "'.' is an invalid file name."
msgstr "'.' ez da fitxategi izen baliogarria."
-#: js/files.js:56
+#: js/files.js:29
msgid "File name cannot be empty."
msgstr "Fitxategi izena ezin da hutsa izan."
-#: js/files.js:64
+#: js/files.js:37
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "IZen aliogabea, '\\', '/', '<', '>', ':', '\"', '|', '?' eta '*' ez daude baimenduta."
-#: js/files.js:78
+#: js/files.js:51
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr "Zure biltegiratzea beterik dago, ezingo duzu aurrerantzean fitxategirik igo edo sinkronizatu!"
-#: js/files.js:82
+#: js/files.js:55
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Zure biltegiratzea nahiko beterik dago (%{usedSpacePercent})"
-#: js/files.js:94
+#: js/files.js:67
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
msgstr "Enkriptazioa desgaitua izan da baina zure fitxategiak oraindik enkriptatuta daude. Mesedez jo zure ezarpen pertsonaletara zure fitxategiak dekodifikatzeko."
-#: js/files.js:245
+#: js/files.js:296
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "Zure deskarga prestatu egin behar da. Denbora bat har lezake fitxategiak handiak badira. "
-#: js/files.js:563 templates/index.php:69
+#: js/files.js:507 js/files.js:545
+msgid "Error moving file"
+msgstr ""
+
+#: js/files.js:558 templates/index.php:61
msgid "Name"
msgstr "Izena"
-#: js/files.js:564 templates/index.php:81
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "Tamaina"
-#: js/files.js:565 templates/index.php:83
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr "Aldatuta"
@@ -234,7 +242,7 @@ msgstr "Aldatuta"
msgid "%s could not be renamed"
msgstr "%s ezin da berrizendatu"
-#: lib/helper.php:11 templates/index.php:18
+#: lib/helper.php:11 templates/index.php:17
msgid "Upload"
msgstr "Igo"
@@ -270,65 +278,65 @@ msgstr "ZIP fitxategien gehienezko tamaina"
msgid "Save"
msgstr "Gorde"
-#: templates/index.php:7
+#: templates/index.php:6
msgid "New"
msgstr "Berria"
-#: templates/index.php:10
+#: templates/index.php:9
msgid "Text file"
msgstr "Testu fitxategia"
-#: templates/index.php:12
+#: templates/index.php:11
msgid "Folder"
msgstr "Karpeta"
-#: templates/index.php:14
+#: templates/index.php:13
msgid "From link"
msgstr "Estekatik"
-#: templates/index.php:41
+#: templates/index.php:33
msgid "Deleted files"
msgstr "Ezabatutako fitxategiak"
-#: templates/index.php:46
+#: templates/index.php:39
msgid "Cancel upload"
msgstr "Ezeztatu igoera"
-#: templates/index.php:52
+#: templates/index.php:45
msgid "You don’t have write permissions here."
msgstr "Ez duzu hemen idazteko baimenik."
-#: templates/index.php:59
+#: templates/index.php:50
msgid "Nothing in here. Upload something!"
msgstr "Ez dago ezer. Igo zerbait!"
-#: templates/index.php:75
+#: templates/index.php:67
msgid "Download"
msgstr "Deskargatu"
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr "Ez elkarbanatu"
-#: templates/index.php:94 templates/index.php:95
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "Ezabatu"
-#: templates/index.php:108
+#: templates/index.php:100
msgid "Upload too large"
msgstr "Igoera handiegia da"
-#: templates/index.php:110
+#: templates/index.php:102
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Igotzen saiatzen ari zaren fitxategiak zerbitzari honek igotzeko onartzen duena baino handiagoak dira."
-#: templates/index.php:115
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr "Fitxategiak eskaneatzen ari da, itxoin mezedez."
-#: templates/index.php:118
+#: templates/index.php:110
msgid "Current scanning"
msgstr "Orain eskaneatzen ari da"
diff --git a/l10n/eu/settings.po b/l10n/eu/settings.po
index 2255ef9ef785a52f122c789ecd622f071529895f..fc5007d8579ca4c521cea726e599ba9112e7aa8a 100644
--- a/l10n/eu/settings.po
+++ b/l10n/eu/settings.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:45-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
@@ -24,7 +24,7 @@ msgid "Unable to load list from App Store"
msgstr "Ezin izan da App Dendatik zerrenda kargatu"
#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
-#: ajax/togglegroups.php:20
+#: ajax/togglegroups.php:20 changepassword/controller.php:55
msgid "Authentication error"
msgstr "Autentifikazio errorea"
@@ -86,6 +86,35 @@ msgstr "Ezin izan da erabiltzailea %s taldetik ezabatu"
msgid "Couldn't update app."
msgstr "Ezin izan da aplikazioa eguneratu."
+#: changepassword/controller.php:20
+msgid "Wrong password"
+msgstr ""
+
+#: changepassword/controller.php:42
+msgid "No user supplied"
+msgstr ""
+
+#: changepassword/controller.php:74
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr ""
+
+#: changepassword/controller.php:79
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr ""
+
+#: changepassword/controller.php:87
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr ""
+
+#: changepassword/controller.php:92 changepassword/controller.php:103
+msgid "Unable to change password"
+msgstr ""
+
#: js/apps.js:43
msgid "Update to {appversion}"
msgstr "Eguneratu {appversion}-ra"
@@ -130,15 +159,15 @@ msgstr "Eguneratu"
msgid "Updated"
msgstr "Eguneratuta"
-#: js/personal.js:217
+#: js/personal.js:220
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:262
+#: js/personal.js:265
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:284
+#: js/personal.js:287
msgid "Saving..."
msgstr "Gordetzen..."
@@ -462,7 +491,7 @@ msgstr "Idatz ezazu e-posta bat pasahitza berreskuratu ahal izateko"
#: templates/personal.php:86
msgid "Profile picture"
-msgstr ""
+msgstr "Profilaren irudia"
#: templates/personal.php:90
msgid "Upload new"
diff --git a/l10n/fa/core.po b/l10n/fa/core.po
index c0dfd2514b83815b52fbe4073c352568e73e7bd9..971a51aa87d4922df501a2467e3e5d5421d0bf24 100644
--- a/l10n/fa/core.po
+++ b/l10n/fa/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:33+0000\n"
+"POT-Creation-Date: 2013-09-22 12:55-0400\n"
+"PO-Revision-Date: 2013-09-20 15:01+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
@@ -191,51 +191,51 @@ msgstr "دسامبر"
msgid "Settings"
msgstr "تنظیمات"
-#: js/js.js:853
+#: js/js.js:866
msgid "seconds ago"
msgstr "ثانیه‌ها پیش"
-#: js/js.js:854
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: js/js.js:855
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: js/js.js:856
+#: js/js.js:869
msgid "today"
msgstr "امروز"
-#: js/js.js:857
+#: js/js.js:870
msgid "yesterday"
msgstr "دیروز"
-#: js/js.js:858
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
-#: js/js.js:859
+#: js/js.js:872
msgid "last month"
msgstr "ماه قبل"
-#: js/js.js:860
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: js/js.js:861
+#: js/js.js:874
msgid "months ago"
msgstr "ماه‌های قبل"
-#: js/js.js:862
+#: js/js.js:875
msgid "last year"
msgstr "سال قبل"
-#: js/js.js:863
+#: js/js.js:876
msgid "years ago"
msgstr "سال‌های قبل"
@@ -263,6 +263,45 @@ msgstr "قبول"
msgid "Error loading message template: {error}"
msgstr ""
+#: js/oc-dialogs.js:347
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:367
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:376
+msgid "Cancel"
+msgstr "منصر٠شدن"
+
+#: js/oc-dialogs.js:386
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:457
+msgid "Error loading file exists template"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/fa/files.po b/l10n/fa/files.po
index 4c7fbe5528e00fdc66d1171ed1a938eb61575f1f..b6b078cb364677190b8f0c488da46da9b4f40873 100644
--- a/l10n/fa/files.po
+++ b/l10n/fa/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:00+0000\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
@@ -75,11 +75,15 @@ msgstr "نوشتن بر روی دیسک سخت ناموÙÙ‚ بود"
msgid "Not enough storage available"
msgstr "Ùضای کاÙÛŒ در دسترس نیست"
-#: ajax/upload.php:109
-msgid "Upload failed"
-msgstr "بارگزاری ناموÙÙ‚ بود"
+#: ajax/upload.php:120 ajax/upload.php:143
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:136
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
-#: ajax/upload.php:127
+#: ajax/upload.php:160
msgid "Invalid directory."
msgstr "Ùهرست راهنما نامعتبر Ù…ÛŒ باشد."
@@ -87,141 +91,145 @@ msgstr "Ùهرست راهنما نامعتبر Ù…ÛŒ باشد."
msgid "Files"
msgstr "پرونده‌ها"
-#: js/file-upload.js:11
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "ناتوان در بارگذاری یا Ùایل یک پوشه است یا 0بایت دارد"
+#: js/file-upload.js:244
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
+msgstr ""
-#: js/file-upload.js:24
+#: js/file-upload.js:255
msgid "Not enough space available"
msgstr "Ùضای کاÙÛŒ در دسترس نیست"
-#: js/file-upload.js:64
+#: js/file-upload.js:322
msgid "Upload cancelled."
msgstr "بار گذاری لغو شد"
-#: js/file-upload.js:165
+#: js/file-upload.js:356
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:446
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "آپلودکردن پرونده در Øال پیشرÙت است. در صورت خروج از صÙØÙ‡ آپلود لغو میگردد. "
-#: js/file-upload.js:239
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr "URL نمی تواند خالی باشد."
-#: js/file-upload.js:244 lib/app.php:53
+#: js/file-upload.js:525 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr "نام پوشه نامعتبر است. استÙاده از 'به اشتراک گذاشته شده' متعلق به ownCloud میباشد."
-#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550
+#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545
msgid "Error"
msgstr "خطا"
-#: js/fileactions.js:116
+#: js/fileactions.js:119
msgid "Share"
msgstr "اشتراک‌گذاری"
-#: js/fileactions.js:126
+#: js/fileactions.js:131
msgid "Delete permanently"
msgstr "Øذ٠قطعی"
-#: js/fileactions.js:192
+#: js/fileactions.js:197
msgid "Rename"
msgstr "تغییرنام"
-#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "در انتظار"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{نام _جدید} در Øال Øاضر وجود دارد."
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "جایگزین"
-#: js/filelist.js:307
+#: js/filelist.js:416
msgid "suggest name"
msgstr "پیشنهاد نام"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "لغو"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr "{نام_جدید} با { نام_قدیمی} جایگزین شد."
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "undo"
msgstr "بازگشت"
-#: js/filelist.js:424 js/filelist.js:490 js/files.js:581
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
-#: js/filelist.js:425 js/filelist.js:491 js/files.js:587
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
-#: js/filelist.js:432
+#: js/filelist.js:541
msgid "{dirs} and {files}"
msgstr ""
-#: js/filelist.js:563
+#: js/filelist.js:731 js/filelist.js:769
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
-#: js/filelist.js:628
-msgid "files uploading"
-msgstr "بارگذاری Ùایل ها"
-
-#: js/files.js:52
+#: js/files.js:25
msgid "'.' is an invalid file name."
msgstr "'.' یک نام پرونده نامعتبر است."
-#: js/files.js:56
+#: js/files.js:29
msgid "File name cannot be empty."
msgstr "نام پرونده نمی تواند خالی باشد."
-#: js/files.js:64
+#: js/files.js:37
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "نام نامعتبر ، '\\', '/', '<', '>', ':', '\"', '|', '?' و '*' مجاز نمی باشند."
-#: js/files.js:78
+#: js/files.js:51
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr "Ùضای ذخیره ÛŒ شما کاملا پر است، بیش از این Ùایلها بهنگام یا همگام سازی نمی توانند بشوند!"
-#: js/files.js:82
+#: js/files.js:55
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Ùضای ذخیره ÛŒ شما تقریبا پر است ({usedSpacePercent}%)"
-#: js/files.js:94
+#: js/files.js:67
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
msgstr ""
-#: js/files.js:245
+#: js/files.js:296
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "دانلود شما در Øال آماده شدن است. در صورتیکه پرونده ها بزرگ باشند ممکن است مدتی طول بکشد."
-#: js/files.js:563 templates/index.php:69
+#: js/files.js:507 js/files.js:545
+msgid "Error moving file"
+msgstr ""
+
+#: js/files.js:558 templates/index.php:61
msgid "Name"
msgstr "نام"
-#: js/files.js:564 templates/index.php:81
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "اندازه"
-#: js/files.js:565 templates/index.php:83
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr "تاریخ"
@@ -230,7 +238,7 @@ msgstr "تاریخ"
msgid "%s could not be renamed"
msgstr "%s نمیتواند تغییر نام دهد."
-#: lib/helper.php:11 templates/index.php:18
+#: lib/helper.php:11 templates/index.php:17
msgid "Upload"
msgstr "بارگزاری"
@@ -266,65 +274,65 @@ msgstr "Øداکثرمقدار برای بار گزاری پرونده های Ù
msgid "Save"
msgstr "ذخیره"
-#: templates/index.php:7
+#: templates/index.php:6
msgid "New"
msgstr "جدید"
-#: templates/index.php:10
+#: templates/index.php:9
msgid "Text file"
msgstr "Ùایل متنی"
-#: templates/index.php:12
+#: templates/index.php:11
msgid "Folder"
msgstr "پوشه"
-#: templates/index.php:14
+#: templates/index.php:13
msgid "From link"
msgstr "از پیوند"
-#: templates/index.php:41
+#: templates/index.php:33
msgid "Deleted files"
msgstr "Ùایل های Øذ٠شده"
-#: templates/index.php:46
+#: templates/index.php:39
msgid "Cancel upload"
msgstr "متوق٠کردن بار گذاری"
-#: templates/index.php:52
+#: templates/index.php:45
msgid "You don’t have write permissions here."
msgstr "شما اجازه ی نوشتن در اینجا را ندارید"
-#: templates/index.php:59
+#: templates/index.php:50
msgid "Nothing in here. Upload something!"
msgstr "اینجا هیچ چیز نیست."
-#: templates/index.php:75
+#: templates/index.php:67
msgid "Download"
msgstr "دانلود"
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr "لغو اشتراک"
-#: templates/index.php:94 templates/index.php:95
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "ØØ°Ù"
-#: templates/index.php:108
+#: templates/index.php:100
msgid "Upload too large"
msgstr "سایز Ùایل برای آپلود زیاد است(Ù….تنظیمات در php.ini)"
-#: templates/index.php:110
+#: templates/index.php:102
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Ùایلها بیش از Øد تعیین شده در این سرور هستند\nمترجم:با تغییر Ùایل php,ini میتوان این Ù…Øدودیت را برطر٠کرد"
-#: templates/index.php:115
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr "پرونده ها در Øال بازرسی هستند لطÙا صبر کنید"
-#: templates/index.php:118
+#: templates/index.php:110
msgid "Current scanning"
msgstr "بازرسی کنونی"
diff --git a/l10n/fa/settings.po b/l10n/fa/settings.po
index 2682e4f12368a144fe1be97fdbd450df814f1181..7a3f31a719578a9029284557c81befb2c732819a 100644
--- a/l10n/fa/settings.po
+++ b/l10n/fa/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:45-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
@@ -23,7 +23,7 @@ msgid "Unable to load list from App Store"
msgstr "قادر به بارگذاری لیست از Ùروشگاه اپ نیستم"
#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
-#: ajax/togglegroups.php:20
+#: ajax/togglegroups.php:20 changepassword/controller.php:55
msgid "Authentication error"
msgstr "خطا در اعتبار سنجی"
@@ -85,6 +85,35 @@ msgstr "امکان Øذ٠کاربر از گروه %s نیست"
msgid "Couldn't update app."
msgstr "برنامه را نمی توان به هنگام ساخت."
+#: changepassword/controller.php:20
+msgid "Wrong password"
+msgstr ""
+
+#: changepassword/controller.php:42
+msgid "No user supplied"
+msgstr ""
+
+#: changepassword/controller.php:74
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr ""
+
+#: changepassword/controller.php:79
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr ""
+
+#: changepassword/controller.php:87
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr ""
+
+#: changepassword/controller.php:92 changepassword/controller.php:103
+msgid "Unable to change password"
+msgstr ""
+
#: js/apps.js:43
msgid "Update to {appversion}"
msgstr "بهنگام شده به {appversion}"
@@ -129,15 +158,15 @@ msgstr "به روز رسانی"
msgid "Updated"
msgstr "بروز رسانی انجام شد"
-#: js/personal.js:217
+#: js/personal.js:220
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:262
+#: js/personal.js:265
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:284
+#: js/personal.js:287
msgid "Saving..."
msgstr "در Øال ذخیره سازی..."
@@ -461,7 +490,7 @@ msgstr "پست الکترونیکی را پرکنید تا بازیابی گذ
#: templates/personal.php:86
msgid "Profile picture"
-msgstr ""
+msgstr "تصویر پروÙایل"
#: templates/personal.php:90
msgid "Upload new"
diff --git a/l10n/fi_FI/core.po b/l10n/fi_FI/core.po
index 7935371a417301c577cab56a9761b2cb2a2f9881..2a2872e255064f2b9055f652039ca48935301792 100644
--- a/l10n/fi_FI/core.po
+++ b/l10n/fi_FI/core.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:33+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-22 12:55-0400\n"
+"PO-Revision-Date: 2013-09-21 10:30+0000\n"
+"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -98,15 +98,15 @@ msgstr ""
#: avatar/controller.php:81
msgid "Unknown filetype"
-msgstr ""
+msgstr "Tuntematon tiedostotyyppi"
#: avatar/controller.php:85
msgid "Invalid image"
-msgstr ""
+msgstr "Virhellinen kuva"
#: avatar/controller.php:115 avatar/controller.php:142
msgid "No temporary profile picture available, try again"
-msgstr ""
+msgstr "Väliaikaista profiilikuvaa ei ole käytettävissä, yritä uudelleen"
#: avatar/controller.php:135
msgid "No crop data provided"
@@ -192,55 +192,55 @@ msgstr "joulukuu"
msgid "Settings"
msgstr "Asetukset"
-#: js/js.js:853
+#: js/js.js:866
msgid "seconds ago"
msgstr "sekuntia sitten"
-#: js/js.js:854
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n minuutti sitten"
msgstr[1] "%n minuuttia sitten"
-#: js/js.js:855
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n tunti sitten"
msgstr[1] "%n tuntia sitten"
-#: js/js.js:856
+#: js/js.js:869
msgid "today"
msgstr "tänään"
-#: js/js.js:857
+#: js/js.js:870
msgid "yesterday"
msgstr "eilen"
-#: js/js.js:858
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n päivä sitten"
msgstr[1] "%n päivää sitten"
-#: js/js.js:859
+#: js/js.js:872
msgid "last month"
msgstr "viime kuussa"
-#: js/js.js:860
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n kuukausi sitten"
msgstr[1] "%n kuukautta sitten"
-#: js/js.js:861
+#: js/js.js:874
msgid "months ago"
msgstr "kuukautta sitten"
-#: js/js.js:862
+#: js/js.js:875
msgid "last year"
msgstr "viime vuonna"
-#: js/js.js:863
+#: js/js.js:876
msgid "years ago"
msgstr "vuotta sitten"
@@ -268,6 +268,46 @@ msgstr "Ok"
msgid "Error loading message template: {error}"
msgstr ""
+#: js/oc-dialogs.js:347
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:367
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:376
+msgid "Cancel"
+msgstr "Peru"
+
+#: js/oc-dialogs.js:386
+msgid "Continue"
+msgstr "Jatka"
+
+#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+msgid "(all selected)"
+msgstr "(kaikki valittu)"
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "({count} selected)"
+msgstr "({count} valittu)"
+
+#: js/oc-dialogs.js:457
+msgid "Error loading file exists template"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/fi_FI/files.po b/l10n/fi_FI/files.po
index 34fe35c6ce93a0a8f53942034074203314869cf5..3e4e67e31d9c1c13f6223f9739dceb0e6a381dc6 100644
--- a/l10n/fi_FI/files.po
+++ b/l10n/fi_FI/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:00+0000\n"
+"POT-Creation-Date: 2013-09-22 12:51-0400\n"
+"PO-Revision-Date: 2013-09-21 10:30+0000\n"
"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
"MIME-Version: 1.0\n"
@@ -75,156 +75,164 @@ msgstr "Levylle kirjoitus epäonnistui"
msgid "Not enough storage available"
msgstr "Tallennustilaa ei ole riittävästi käytettävissä"
-#: ajax/upload.php:109
-msgid "Upload failed"
-msgstr "Lähetys epäonnistui"
+#: ajax/upload.php:120 ajax/upload.php:143
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:136
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
-#: ajax/upload.php:127
+#: ajax/upload.php:160
msgid "Invalid directory."
msgstr "Virheellinen kansio."
-#: appinfo/app.php:12
+#: appinfo/app.php:11
msgid "Files"
msgstr "Tiedostot"
-#: js/file-upload.js:11
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Tiedoston lähetys epäonnistui, koska sen koko on 0 tavua tai kyseessä on kansio."
+#: js/file-upload.js:244
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
+msgstr "Kohdetta {filename} ei voi lähettää, koska se on joko kansio tai sen koko on 0 tavua"
-#: js/file-upload.js:24
+#: js/file-upload.js:255
msgid "Not enough space available"
msgstr "Tilaa ei ole riittävästi"
-#: js/file-upload.js:64
+#: js/file-upload.js:322
msgid "Upload cancelled."
msgstr "Lähetys peruttu."
-#: js/file-upload.js:165
+#: js/file-upload.js:356
+msgid "Could not get result from server."
+msgstr "Tuloksien saaminen palvelimelta ei onnistunut."
+
+#: js/file-upload.js:446
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Tiedoston lähetys on meneillään. Sivulta poistuminen nyt peruu tiedoston lähetyksen."
-#: js/file-upload.js:239
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr "Verkko-osoite ei voi olla tyhjä"
-#: js/file-upload.js:244 lib/app.php:53
+#: js/file-upload.js:525 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550
+#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545
msgid "Error"
msgstr "Virhe"
-#: js/fileactions.js:116
+#: js/fileactions.js:119
msgid "Share"
msgstr "Jaa"
-#: js/fileactions.js:126
+#: js/fileactions.js:131
msgid "Delete permanently"
msgstr "Poista pysyvästi"
-#: js/fileactions.js:192
+#: js/fileactions.js:197
msgid "Rename"
msgstr "Nimeä uudelleen"
-#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "Odottaa"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{new_name} on jo olemassa"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "korvaa"
-#: js/filelist.js:307
+#: js/filelist.js:416
msgid "suggest name"
msgstr "ehdota nimeä"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "peru"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr ""
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "undo"
msgstr "kumoa"
-#: js/filelist.js:424 js/filelist.js:490 js/files.js:581
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "%n kansio"
msgstr[1] "%n kansiota"
-#: js/filelist.js:425 js/filelist.js:491 js/files.js:587
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "%n tiedosto"
msgstr[1] "%n tiedostoa"
-#: js/filelist.js:432
+#: js/filelist.js:541
msgid "{dirs} and {files}"
msgstr "{dirs} ja {files}"
-#: js/filelist.js:563
+#: js/filelist.js:731 js/filelist.js:769
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "Lähetetään %n tiedosto"
msgstr[1] "Lähetetään %n tiedostoa"
-#: js/filelist.js:628
-msgid "files uploading"
-msgstr ""
-
-#: js/files.js:52
+#: js/files.js:25
msgid "'.' is an invalid file name."
msgstr "'.' on virheellinen nimi tiedostolle."
-#: js/files.js:56
+#: js/files.js:29
msgid "File name cannot be empty."
msgstr "Tiedoston nimi ei voi olla tyhjä."
-#: js/files.js:64
+#: js/files.js:37
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Virheellinen nimi, merkit '\\', '/', '<', '>', ':', '\"', '|', '?' ja '*' eivät ole sallittuja."
-#: js/files.js:78
+#: js/files.js:51
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr "Tallennustila on loppu, tiedostoja ei voi enää päivittää tai synkronoida!"
-#: js/files.js:82
+#: js/files.js:55
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Tallennustila on melkein loppu ({usedSpacePercent}%)"
-#: js/files.js:94
+#: js/files.js:67
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
msgstr ""
-#: js/files.js:245
+#: js/files.js:296
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "Lataustasi valmistellaan. Tämä saattaa kestää hetken, jos tiedostot ovat suuria kooltaan."
-#: js/files.js:563 templates/index.php:69
+#: js/files.js:507 js/files.js:545
+msgid "Error moving file"
+msgstr "Virhe tiedostoa siirrettäessä"
+
+#: js/files.js:558 templates/index.php:61
msgid "Name"
msgstr "Nimi"
-#: js/files.js:564 templates/index.php:81
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "Koko"
-#: js/files.js:565 templates/index.php:83
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr "Muokattu"
@@ -233,7 +241,7 @@ msgstr "Muokattu"
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:11 templates/index.php:18
+#: lib/helper.php:11 templates/index.php:17
msgid "Upload"
msgstr "Lähetä"
@@ -269,65 +277,65 @@ msgstr "ZIP-tiedostojen enimmäiskoko"
msgid "Save"
msgstr "Tallenna"
-#: templates/index.php:7
+#: templates/index.php:6
msgid "New"
msgstr "Uusi"
-#: templates/index.php:10
+#: templates/index.php:9
msgid "Text file"
msgstr "Tekstitiedosto"
-#: templates/index.php:12
+#: templates/index.php:11
msgid "Folder"
msgstr "Kansio"
-#: templates/index.php:14
+#: templates/index.php:13
msgid "From link"
msgstr "Linkistä"
-#: templates/index.php:41
+#: templates/index.php:33
msgid "Deleted files"
msgstr "Poistetut tiedostot"
-#: templates/index.php:46
+#: templates/index.php:39
msgid "Cancel upload"
msgstr "Peru lähetys"
-#: templates/index.php:52
+#: templates/index.php:45
msgid "You don’t have write permissions here."
msgstr "Tunnuksellasi ei ole kirjoitusoikeuksia tänne."
-#: templates/index.php:59
+#: templates/index.php:50
msgid "Nothing in here. Upload something!"
msgstr "Täällä ei ole mitään. Lähetä tänne jotakin!"
-#: templates/index.php:75
+#: templates/index.php:67
msgid "Download"
msgstr "Lataa"
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr "Peru jakaminen"
-#: templates/index.php:94 templates/index.php:95
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "Poista"
-#: templates/index.php:108
+#: templates/index.php:100
msgid "Upload too large"
msgstr "Lähetettävä tiedosto on liian suuri"
-#: templates/index.php:110
+#: templates/index.php:102
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Lähetettäväksi valitsemasi tiedostot ylittävät palvelimen salliman tiedostokoon rajan."
-#: templates/index.php:115
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr "Tiedostoja tarkistetaan, odota hetki."
-#: templates/index.php:118
+#: templates/index.php:110
msgid "Current scanning"
msgstr "Tämänhetkinen tutkinta"
diff --git a/l10n/fi_FI/lib.po b/l10n/fi_FI/lib.po
index f6134419be07d161a3ccc1ea227451e13a2efe65..41e7241ad3d22d3042fe141715fc1fe7bb4e383c 100644
--- a/l10n/fi_FI/lib.po
+++ b/l10n/fi_FI/lib.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-18 11:47-0400\n"
+"PO-Revision-Date: 2013-09-17 13:05+0000\n"
+"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -27,7 +27,7 @@ msgstr "Sovellusta \"%s\" ei voi asentaa, koska se ei ole yhteensopiva käytöss
#: app.php:250
msgid "No app name specified"
-msgstr ""
+msgstr "Sovelluksen nimeä ei määritelty"
#: app.php:361
msgid "Help"
@@ -52,19 +52,19 @@ msgstr "Ylläpitäjä"
#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
-msgstr ""
+msgstr "Kohteen \"%s\" päivitys epäonnistui."
#: avatar.php:56
msgid "Custom profile pictures don't work with encryption yet"
-msgstr ""
+msgstr "Omavalintaiset profiilikuvat eivät toimi salauksen kanssa vielä"
#: avatar.php:64
msgid "Unknown filetype"
-msgstr ""
+msgstr "Tuntematon tiedostotyyppi"
#: avatar.php:69
msgid "Invalid image"
-msgstr ""
+msgstr "Virheellinen kuva"
#: defaults.php:35
msgid "web services under your control"
@@ -124,13 +124,13 @@ msgstr "Sovellus ei sisällä info.xml-tiedostoa"
#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
-msgstr ""
+msgstr "Sovellusta ei voi asentaa, koska sovellus sisältää kiellettyä koodia"
#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
-msgstr ""
+msgstr "Sovellusta ei voi asentaa, koska se ei ole yhteensopiva käytössä olevan ownCloud-version kanssa"
#: installer.php:146
msgid ""
diff --git a/l10n/fi_FI/settings.po b/l10n/fi_FI/settings.po
index b9581c966b466fbf1838a0ed913f2499a2a6eaa6..2b9b270367a7d780f64ae7b1cf5fbc7214ea56f1 100644
--- a/l10n/fi_FI/settings.po
+++ b/l10n/fi_FI/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:45-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
"MIME-Version: 1.0\n"
@@ -23,7 +23,7 @@ msgid "Unable to load list from App Store"
msgstr "Ei pystytä lataamaan listaa sovellusvarastosta (App Store)"
#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
-#: ajax/togglegroups.php:20
+#: ajax/togglegroups.php:20 changepassword/controller.php:55
msgid "Authentication error"
msgstr "Tunnistautumisvirhe"
@@ -85,6 +85,35 @@ msgstr "Käyttäjän poistaminen ryhmästä %s ei onnistu"
msgid "Couldn't update app."
msgstr "Sovelluksen päivitys epäonnistui."
+#: changepassword/controller.php:20
+msgid "Wrong password"
+msgstr "Väärä salasana"
+
+#: changepassword/controller.php:42
+msgid "No user supplied"
+msgstr ""
+
+#: changepassword/controller.php:74
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr ""
+
+#: changepassword/controller.php:79
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr ""
+
+#: changepassword/controller.php:87
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr ""
+
+#: changepassword/controller.php:92 changepassword/controller.php:103
+msgid "Unable to change password"
+msgstr "Salasanan vaihto ei onnistunut"
+
#: js/apps.js:43
msgid "Update to {appversion}"
msgstr "Päivitä versioon {appversion}"
@@ -129,15 +158,15 @@ msgstr "Päivitä"
msgid "Updated"
msgstr "Päivitetty"
-#: js/personal.js:217
+#: js/personal.js:220
msgid "Select a profile picture"
-msgstr ""
+msgstr "Valitse profiilikuva"
-#: js/personal.js:262
+#: js/personal.js:265
msgid "Decrypting files... Please wait, this can take some time."
msgstr "Puretaan tiedostojen salausta... Odota, tämä voi kestää jonkin aikaa."
-#: js/personal.js:284
+#: js/personal.js:287
msgid "Saving..."
msgstr "Tallennetaan..."
@@ -461,31 +490,31 @@ msgstr "Anna sähköpostiosoitteesi, jotta unohdettu salasana on mahdollista pal
#: templates/personal.php:86
msgid "Profile picture"
-msgstr ""
+msgstr "Profiilikuva"
#: templates/personal.php:90
msgid "Upload new"
-msgstr ""
+msgstr "Lähetä uusi"
#: templates/personal.php:92
msgid "Select new from Files"
-msgstr ""
+msgstr "Valitse uusi tiedostoista"
#: templates/personal.php:93
msgid "Remove image"
-msgstr ""
+msgstr "Poista kuva"
#: templates/personal.php:94
msgid "Either png or jpg. Ideally square but you will be able to crop it."
-msgstr ""
+msgstr "Joko png- tai jpg-kuva. Mieluite neliö, voit kuitenkin rajata kuvaa."
#: templates/personal.php:97
msgid "Abort"
-msgstr ""
+msgstr "Keskeytä"
#: templates/personal.php:98
msgid "Choose as profile image"
-msgstr ""
+msgstr "Valitse profiilikuvaksi"
#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
diff --git a/l10n/fr/core.po b/l10n/fr/core.po
index 7ba9214216e748ddb57bd22f76387a0b25bbf216..4c7f6be045ab795e3a79d219fb8bc1c66f4c85f7 100644
--- a/l10n/fr/core.po
+++ b/l10n/fr/core.po
@@ -6,15 +6,16 @@
# Adalberto Rodrigues <rodrigues_adalberto@yahoo.fr>, 2013
# Christophe Lherieau <skimpax@gmail.com>, 2013
# msoko <sokolovitch@yahoo.com>, 2013
+# ogre_sympathique <ogre.sympathique@speed.1s.fr>, 2013
# plachance <patlachance@gmail.com>, 2013
# red0ne <red-0ne@smarty-concept.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:33+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-24 12:58-0400\n"
+"PO-Revision-Date: 2013-09-23 19:40+0000\n"
+"Last-Translator: ogre_sympathique <ogre.sympathique@speed.1s.fr>\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -97,15 +98,15 @@ msgstr "Erreur lors de la suppression de %s des favoris."
#: avatar/controller.php:62
msgid "No image or file provided"
-msgstr ""
+msgstr "Aucune image ou fichier fourni"
#: avatar/controller.php:81
msgid "Unknown filetype"
-msgstr ""
+msgstr "Type de fichier inconnu"
#: avatar/controller.php:85
msgid "Invalid image"
-msgstr ""
+msgstr "Image invalide"
#: avatar/controller.php:115 avatar/controller.php:142
msgid "No temporary profile picture available, try again"
@@ -195,55 +196,55 @@ msgstr "décembre"
msgid "Settings"
msgstr "Paramètres"
-#: js/js.js:853
+#: js/js.js:866
msgid "seconds ago"
msgstr "il y a quelques secondes"
-#: js/js.js:854
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "il y a %n minute"
msgstr[1] "il y a %n minutes"
-#: js/js.js:855
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "Il y a %n heure"
msgstr[1] "Il y a %n heures"
-#: js/js.js:856
+#: js/js.js:869
msgid "today"
msgstr "aujourd'hui"
-#: js/js.js:857
+#: js/js.js:870
msgid "yesterday"
msgstr "hier"
-#: js/js.js:858
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "il y a %n jour"
msgstr[1] "il y a %n jours"
-#: js/js.js:859
+#: js/js.js:872
msgid "last month"
msgstr "le mois dernier"
-#: js/js.js:860
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "Il y a %n mois"
msgstr[1] "Il y a %n mois"
-#: js/js.js:861
+#: js/js.js:874
msgid "months ago"
msgstr "il y a plusieurs mois"
-#: js/js.js:862
+#: js/js.js:875
msgid "last year"
msgstr "l'année dernière"
-#: js/js.js:863
+#: js/js.js:876
msgid "years ago"
msgstr "il y a plusieurs années"
@@ -253,7 +254,7 @@ msgstr "Choisir"
#: js/oc-dialogs.js:146
msgid "Error loading file picker template: {error}"
-msgstr ""
+msgstr "Erreur de chargement du modèle de sélectionneur de fichiers : {error}"
#: js/oc-dialogs.js:172
msgid "Yes"
@@ -269,6 +270,46 @@ msgstr "Ok"
#: js/oc-dialogs.js:219
msgid "Error loading message template: {error}"
+msgstr "Erreur de chargement du modèle de message : {error}"
+
+#: js/oc-dialogs.js:347
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] "{count} fichier en conflit"
+msgstr[1] "{count} fichiers en conflit"
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr "Un conflit de fichier"
+
+#: js/oc-dialogs.js:367
+msgid "Which files do you want to keep?"
+msgstr "Quels fichiers désirez-vous garder ?"
+
+#: js/oc-dialogs.js:368
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr "Si vous sélectionnez les deux versions, un nombre sera ajouté au nom du fichier copié."
+
+#: js/oc-dialogs.js:376
+msgid "Cancel"
+msgstr "Annuler"
+
+#: js/oc-dialogs.js:386
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "({count} selected)"
+msgstr "({count} sélectionnés)"
+
+#: js/oc-dialogs.js:457
+msgid "Error loading file exists template"
msgstr ""
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
@@ -280,7 +321,7 @@ msgstr "Le type d'objet n'est pas spécifié."
#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
-#: js/share.js:645 js/share.js:657
+#: js/share.js:656 js/share.js:668
msgid "Error"
msgstr "Erreur"
@@ -300,7 +341,7 @@ msgstr "Partagé"
msgid "Share"
msgstr "Partager"
-#: js/share.js:131 js/share.js:685
+#: js/share.js:131 js/share.js:696
msgid "Error while sharing"
msgstr "Erreur lors de la mise en partage"
@@ -400,23 +441,23 @@ msgstr "supprimer"
msgid "share"
msgstr "partager"
-#: js/share.js:400 js/share.js:632
+#: js/share.js:400 js/share.js:643
msgid "Password protected"
msgstr "Protégé par un mot de passe"
-#: js/share.js:645
+#: js/share.js:656
msgid "Error unsetting expiration date"
msgstr "Une erreur est survenue pendant la suppression de la date d'expiration"
-#: js/share.js:657
+#: js/share.js:668
msgid "Error setting expiration date"
msgstr "Erreur lors de la spécification de la date d'expiration"
-#: js/share.js:672
+#: js/share.js:683
msgid "Sending ..."
msgstr "En cours d'envoi ..."
-#: js/share.js:683
+#: js/share.js:694
msgid "Email sent"
msgstr "Email envoyé"
diff --git a/l10n/fr/files.po b/l10n/fr/files.po
index f3e3767ce8b2aae20738ce071c098da6f5bb0254..72963e3573fd773385e070bf64815be0cf51340e 100644
--- a/l10n/fr/files.po
+++ b/l10n/fr/files.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:00+0000\n"
+"POT-Creation-Date: 2013-09-24 12:58-0400\n"
+"PO-Revision-Date: 2013-09-23 19:30+0000\n"
"Last-Translator: ogre_sympathique <ogre.sympathique@speed.1s.fr>\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
@@ -78,156 +78,164 @@ msgstr "Erreur d'écriture sur le disque"
msgid "Not enough storage available"
msgstr "Plus assez d'espace de stockage disponible"
-#: ajax/upload.php:109
-msgid "Upload failed"
-msgstr "Échec de l'envoi"
+#: ajax/upload.php:120 ajax/upload.php:143
+msgid "Upload failed. Could not get file info."
+msgstr "L'envoi a échoué. Impossible d'obtenir les informations du fichier."
-#: ajax/upload.php:127
+#: ajax/upload.php:136
+msgid "Upload failed. Could not find uploaded file"
+msgstr "L'envoi a échoué. Impossible de trouver le fichier envoyé."
+
+#: ajax/upload.php:160
msgid "Invalid directory."
msgstr "Dossier invalide."
-#: appinfo/app.php:12
+#: appinfo/app.php:11
msgid "Files"
msgstr "Fichiers"
-#: js/file-upload.js:11
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Impossible d'envoyer votre fichier dans la mesure où il s'agit d'un répertoire ou d'un fichier de taille nulle"
+#: js/file-upload.js:244
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
+msgstr "Impossible d'envoyer {filename} car il s'agit d'un répertoire ou d'un fichier de taille nulle"
-#: js/file-upload.js:24
+#: js/file-upload.js:255
msgid "Not enough space available"
msgstr "Espace disponible insuffisant"
-#: js/file-upload.js:64
+#: js/file-upload.js:322
msgid "Upload cancelled."
msgstr "Envoi annulé."
-#: js/file-upload.js:165
+#: js/file-upload.js:356
+msgid "Could not get result from server."
+msgstr "Ne peut recevoir les résultats du serveur."
+
+#: js/file-upload.js:446
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "L'envoi du fichier est en cours. Quitter cette page maintenant annulera l'envoi du fichier."
-#: js/file-upload.js:239
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr "L'URL ne peut-être vide"
-#: js/file-upload.js:244 lib/app.php:53
+#: js/file-upload.js:525 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr "Nom de dossier invalide. L'utilisation du mot 'Shared' est réservée à Owncloud"
-#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550
+#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545
msgid "Error"
msgstr "Erreur"
-#: js/fileactions.js:116
+#: js/fileactions.js:119
msgid "Share"
msgstr "Partager"
-#: js/fileactions.js:126
+#: js/fileactions.js:131
msgid "Delete permanently"
msgstr "Supprimer de façon définitive"
-#: js/fileactions.js:192
+#: js/fileactions.js:197
msgid "Rename"
msgstr "Renommer"
-#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "En attente"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{new_name} existe déjà "
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "remplacer"
-#: js/filelist.js:307
+#: js/filelist.js:416
msgid "suggest name"
msgstr "Suggérer un nom"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "annuler"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr "{new_name} a été remplacé par {old_name}"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "undo"
msgstr "annuler"
-#: js/filelist.js:424 js/filelist.js:490 js/files.js:581
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "%n dossier"
msgstr[1] "%n dossiers"
-#: js/filelist.js:425 js/filelist.js:491 js/files.js:587
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "%n fichier"
msgstr[1] "%n fichiers"
-#: js/filelist.js:432
+#: js/filelist.js:541
msgid "{dirs} and {files}"
msgstr "{dir} et {files}"
-#: js/filelist.js:563
+#: js/filelist.js:731 js/filelist.js:769
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "Téléversement de %n fichier"
msgstr[1] "Téléversement de %n fichiers"
-#: js/filelist.js:628
-msgid "files uploading"
-msgstr "fichiers en cours d'envoi"
-
-#: js/files.js:52
+#: js/files.js:25
msgid "'.' is an invalid file name."
msgstr "'.' n'est pas un nom de fichier valide."
-#: js/files.js:56
+#: js/files.js:29
msgid "File name cannot be empty."
msgstr "Le nom de fichier ne peut être vide."
-#: js/files.js:64
+#: js/files.js:37
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Nom invalide, les caractères '\\', '/', '<', '>', ':', '\"', '|', '?' et '*' ne sont pas autorisés."
-#: js/files.js:78
+#: js/files.js:51
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr "Votre espage de stockage est plein, les fichiers ne peuvent plus être téléversés ou synchronisés !"
-#: js/files.js:82
+#: js/files.js:55
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Votre espace de stockage est presque plein ({usedSpacePercent}%)"
-#: js/files.js:94
+#: js/files.js:67
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
msgstr "Le chiffrement était désactivé mais vos fichiers sont toujours chiffrés. Veuillez vous rendre sur vos Paramètres personnels pour déchiffrer vos fichiers."
-#: js/files.js:245
+#: js/files.js:296
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "Votre téléchargement est cours de préparation. Ceci peut nécessiter un certain temps si les fichiers sont volumineux."
-#: js/files.js:563 templates/index.php:69
+#: js/files.js:507 js/files.js:545
+msgid "Error moving file"
+msgstr "Erreur lors du déplacement du fichier"
+
+#: js/files.js:558 templates/index.php:61
msgid "Name"
msgstr "Nom"
-#: js/files.js:564 templates/index.php:81
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "Taille"
-#: js/files.js:565 templates/index.php:83
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr "Modifié"
@@ -236,7 +244,7 @@ msgstr "Modifié"
msgid "%s could not be renamed"
msgstr "%s ne peut être renommé"
-#: lib/helper.php:11 templates/index.php:18
+#: lib/helper.php:11 templates/index.php:17
msgid "Upload"
msgstr "Envoyer"
@@ -272,65 +280,65 @@ msgstr "Taille maximale pour les fichiers ZIP"
msgid "Save"
msgstr "Sauvegarder"
-#: templates/index.php:7
+#: templates/index.php:6
msgid "New"
msgstr "Nouveau"
-#: templates/index.php:10
+#: templates/index.php:9
msgid "Text file"
msgstr "Fichier texte"
-#: templates/index.php:12
+#: templates/index.php:11
msgid "Folder"
msgstr "Dossier"
-#: templates/index.php:14
+#: templates/index.php:13
msgid "From link"
msgstr "Depuis le lien"
-#: templates/index.php:41
+#: templates/index.php:33
msgid "Deleted files"
msgstr "Fichiers supprimés"
-#: templates/index.php:46
+#: templates/index.php:39
msgid "Cancel upload"
msgstr "Annuler l'envoi"
-#: templates/index.php:52
+#: templates/index.php:45
msgid "You don’t have write permissions here."
msgstr "Vous n'avez pas le droit d'écriture ici."
-#: templates/index.php:59
+#: templates/index.php:50
msgid "Nothing in here. Upload something!"
msgstr "Il n'y a rien ici ! Envoyez donc quelque chose :)"
-#: templates/index.php:75
+#: templates/index.php:67
msgid "Download"
msgstr "Télécharger"
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr "Ne plus partager"
-#: templates/index.php:94 templates/index.php:95
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "Supprimer"
-#: templates/index.php:108
+#: templates/index.php:100
msgid "Upload too large"
msgstr "Téléversement trop volumineux"
-#: templates/index.php:110
+#: templates/index.php:102
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Les fichiers que vous essayez d'envoyer dépassent la taille maximale permise par ce serveur."
-#: templates/index.php:115
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr "Les fichiers sont en cours d'analyse, veuillez patienter."
-#: templates/index.php:118
+#: templates/index.php:110
msgid "Current scanning"
msgstr "Analyse en cours"
diff --git a/l10n/fr/lib.po b/l10n/fr/lib.po
index 547f24c023034e544fb3c0bb222c48a8d16a2ddb..792ec31010552bf3dc7a96dd04df132e5cb4cee3 100644
--- a/l10n/fr/lib.po
+++ b/l10n/fr/lib.po
@@ -5,13 +5,14 @@
# Translators:
# Christophe Lherieau <skimpax@gmail.com>, 2013
# Cyril Glapa <kyriog@gmail.com>, 2013
+# ogre_sympathique <ogre.sympathique@speed.1s.fr>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-20 10:45-0400\n"
+"PO-Revision-Date: 2013-09-19 13:10+0000\n"
+"Last-Translator: ogre_sympathique <ogre.sympathique@speed.1s.fr>\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -57,15 +58,15 @@ msgstr "Echec de la mise à niveau \"%s\"."
#: avatar.php:56
msgid "Custom profile pictures don't work with encryption yet"
-msgstr ""
+msgstr "Les images de profil personnalisées ne fonctionnent pas encore avec le système de chiffrement."
#: avatar.php:64
msgid "Unknown filetype"
-msgstr ""
+msgstr "Type de fichier inconnu"
#: avatar.php:69
msgid "Invalid image"
-msgstr ""
+msgstr "Image invalide"
#: defaults.php:35
msgid "web services under your control"
@@ -166,15 +167,15 @@ msgstr "Erreur d'authentification"
msgid "Token expired. Please reload page."
msgstr "La session a expiré. Veuillez recharger la page."
-#: search/provider/file.php:17 search/provider/file.php:35
+#: search/provider/file.php:18 search/provider/file.php:36
msgid "Files"
msgstr "Fichiers"
-#: search/provider/file.php:26 search/provider/file.php:33
+#: search/provider/file.php:27 search/provider/file.php:34
msgid "Text"
msgstr "Texte"
-#: search/provider/file.php:29
+#: search/provider/file.php:30
msgid "Images"
msgstr "Images"
diff --git a/l10n/fr/settings.po b/l10n/fr/settings.po
index aab0b21d49725b3b715839be75686bcc84cbd5a4..529e2e8c356fd7b2d3775e9734314d63899de3ea 100644
--- a/l10n/fr/settings.po
+++ b/l10n/fr/settings.po
@@ -6,13 +6,15 @@
# Adalberto Rodrigues <rodrigues_adalberto@yahoo.fr>, 2013
# Christophe Lherieau <skimpax@gmail.com>, 2013
# lyly95, 2013
+# Mystyle <maelvstyle@gmail.com>, 2013
+# ogre_sympathique <ogre.sympathique@speed.1s.fr>, 2013
# red0ne <red-0ne@smarty-concept.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:45-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
@@ -26,7 +28,7 @@ msgid "Unable to load list from App Store"
msgstr "Impossible de charger la liste depuis l'App Store"
#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
-#: ajax/togglegroups.php:20
+#: ajax/togglegroups.php:20 changepassword/controller.php:55
msgid "Authentication error"
msgstr "Erreur d'authentification"
@@ -88,6 +90,35 @@ msgstr "Impossible de supprimer l'utilisateur du groupe %s"
msgid "Couldn't update app."
msgstr "Impossible de mettre à jour l'application"
+#: changepassword/controller.php:20
+msgid "Wrong password"
+msgstr "Mot de passe incorrect"
+
+#: changepassword/controller.php:42
+msgid "No user supplied"
+msgstr "Aucun utilisateur fourni"
+
+#: changepassword/controller.php:74
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr ""
+
+#: changepassword/controller.php:79
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr ""
+
+#: changepassword/controller.php:87
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr ""
+
+#: changepassword/controller.php:92 changepassword/controller.php:103
+msgid "Unable to change password"
+msgstr "Impossible de modifier le mot de passe"
+
#: js/apps.js:43
msgid "Update to {appversion}"
msgstr "Mettre à jour vers {appversion}"
@@ -132,15 +163,15 @@ msgstr "Mettre à jour"
msgid "Updated"
msgstr "Mise à jour effectuée avec succès"
-#: js/personal.js:217
+#: js/personal.js:220
msgid "Select a profile picture"
-msgstr ""
+msgstr "Selectionner une photo de profil "
-#: js/personal.js:262
+#: js/personal.js:265
msgid "Decrypting files... Please wait, this can take some time."
msgstr "Déchiffrement en cours... Cela peut prendre un certain temps."
-#: js/personal.js:284
+#: js/personal.js:287
msgid "Saving..."
msgstr "Enregistrement..."
@@ -464,31 +495,31 @@ msgstr "Entrez votre adresse e-mail pour permettre la réinitialisation du mot d
#: templates/personal.php:86
msgid "Profile picture"
-msgstr ""
+msgstr "Photo de profil"
#: templates/personal.php:90
msgid "Upload new"
-msgstr ""
+msgstr "Télécharger nouveau"
#: templates/personal.php:92
msgid "Select new from Files"
-msgstr ""
+msgstr "Sélectionner un nouveau depuis les documents"
#: templates/personal.php:93
msgid "Remove image"
-msgstr ""
+msgstr "Supprimer l'image"
#: templates/personal.php:94
msgid "Either png or jpg. Ideally square but you will be able to crop it."
-msgstr ""
+msgstr "Soit png ou jpg. idéalement carée mais vous pourrez la recadrer ."
#: templates/personal.php:97
msgid "Abort"
-msgstr ""
+msgstr "Abandonner"
#: templates/personal.php:98
msgid "Choose as profile image"
-msgstr ""
+msgstr "Choisir en temps que photo de profil "
#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
diff --git a/l10n/gl/core.po b/l10n/gl/core.po
index ac5a3fc0f0a4e4700922ddaa3645723bd0d6665d..b8bcfd4eea811c69b0e3a9ca06f2aaeefcf57994 100644
--- a/l10n/gl/core.po
+++ b/l10n/gl/core.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:33+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-24 12:58-0400\n"
+"PO-Revision-Date: 2013-09-23 10:30+0000\n"
+"Last-Translator: mbouzada <mbouzada@gmail.com>\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -93,23 +93,23 @@ msgstr "Produciuse un erro ao eliminar %s dos favoritos."
#: avatar/controller.php:62
msgid "No image or file provided"
-msgstr ""
+msgstr "Non forneceu ningunha imaxe ou ficheiro"
#: avatar/controller.php:81
msgid "Unknown filetype"
-msgstr ""
+msgstr "Tipo de ficheiro descoñecido"
#: avatar/controller.php:85
msgid "Invalid image"
-msgstr ""
+msgstr "Imaxe incorrecta"
#: avatar/controller.php:115 avatar/controller.php:142
msgid "No temporary profile picture available, try again"
-msgstr ""
+msgstr "Non hai unha imaxe temporal de perfil dispoñÃbel, volva tentalo"
#: avatar/controller.php:135
msgid "No crop data provided"
-msgstr ""
+msgstr "Non indicou como recortar"
#: js/config.php:32
msgid "Sunday"
@@ -191,55 +191,55 @@ msgstr "decembro"
msgid "Settings"
msgstr "Axustes"
-#: js/js.js:853
+#: js/js.js:866
msgid "seconds ago"
msgstr "segundos atrás"
-#: js/js.js:854
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "hai %n minuto"
msgstr[1] "hai %n minutos"
-#: js/js.js:855
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "hai %n hora"
msgstr[1] "hai %n horas"
-#: js/js.js:856
+#: js/js.js:869
msgid "today"
msgstr "hoxe"
-#: js/js.js:857
+#: js/js.js:870
msgid "yesterday"
msgstr "onte"
-#: js/js.js:858
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "hai %n dÃa"
msgstr[1] "hai %n dÃas"
-#: js/js.js:859
+#: js/js.js:872
msgid "last month"
msgstr "último mes"
-#: js/js.js:860
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "hai %n mes"
msgstr[1] "hai %n meses"
-#: js/js.js:861
+#: js/js.js:874
msgid "months ago"
msgstr "meses atrás"
-#: js/js.js:862
+#: js/js.js:875
msgid "last year"
msgstr "último ano"
-#: js/js.js:863
+#: js/js.js:876
msgid "years ago"
msgstr "anos atrás"
@@ -249,7 +249,7 @@ msgstr "Escoller"
#: js/oc-dialogs.js:146
msgid "Error loading file picker template: {error}"
-msgstr ""
+msgstr "Produciuse un erro ao cargar o modelo do selector: {error}"
#: js/oc-dialogs.js:172
msgid "Yes"
@@ -265,7 +265,47 @@ msgstr "Aceptar"
#: js/oc-dialogs.js:219
msgid "Error loading message template: {error}"
-msgstr ""
+msgstr "Produciuse un erro ao cargar o modelo da mensaxe: {error}"
+
+#: js/oc-dialogs.js:347
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] "{count} conflito de ficheiro"
+msgstr[1] "{count} conflitos de ficheiros"
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr "Un conflito de ficheiro"
+
+#: js/oc-dialogs.js:367
+msgid "Which files do you want to keep?"
+msgstr "Que ficheiros quere conservar?"
+
+#: js/oc-dialogs.js:368
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr "Se selecciona ambas versións, o ficheiro copiado terá un número engadido ao nome."
+
+#: js/oc-dialogs.js:376
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: js/oc-dialogs.js:386
+msgid "Continue"
+msgstr "Continuar"
+
+#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+msgid "(all selected)"
+msgstr "(todo o seleccionado)"
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "({count} selected)"
+msgstr "({count} seleccionados)"
+
+#: js/oc-dialogs.js:457
+msgid "Error loading file exists template"
+msgstr "Produciuse un erro ao cargar o modelo de ficheiro existente"
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
@@ -276,7 +316,7 @@ msgstr "Non se especificou o tipo de obxecto."
#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
-#: js/share.js:645 js/share.js:657
+#: js/share.js:656 js/share.js:668
msgid "Error"
msgstr "Erro"
@@ -296,7 +336,7 @@ msgstr "Compartir"
msgid "Share"
msgstr "Compartir"
-#: js/share.js:131 js/share.js:685
+#: js/share.js:131 js/share.js:696
msgid "Error while sharing"
msgstr "Produciuse un erro ao compartir"
@@ -396,23 +436,23 @@ msgstr "eliminar"
msgid "share"
msgstr "compartir"
-#: js/share.js:400 js/share.js:632
+#: js/share.js:400 js/share.js:643
msgid "Password protected"
msgstr "Protexido con contrasinal"
-#: js/share.js:645
+#: js/share.js:656
msgid "Error unsetting expiration date"
msgstr "Produciuse un erro ao retirar a data de caducidade"
-#: js/share.js:657
+#: js/share.js:668
msgid "Error setting expiration date"
msgstr "Produciuse un erro ao definir a data de caducidade"
-#: js/share.js:672
+#: js/share.js:683
msgid "Sending ..."
msgstr "Enviando..."
-#: js/share.js:683
+#: js/share.js:694
msgid "Email sent"
msgstr "Correo enviado"
diff --git a/l10n/gl/files.po b/l10n/gl/files.po
index f1ef8190bbcf80c83a7736ffd4c815d13874c03a..33e76e84873d4681ee7e72e25428a0a9dc5df899 100644
--- a/l10n/gl/files.po
+++ b/l10n/gl/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:00+0000\n"
+"POT-Creation-Date: 2013-09-24 12:58-0400\n"
+"PO-Revision-Date: 2013-09-23 10:30+0000\n"
"Last-Translator: mbouzada <mbouzada@gmail.com>\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
@@ -75,156 +75,164 @@ msgstr "Produciuse un erro ao escribir no disco"
msgid "Not enough storage available"
msgstr "Non hai espazo de almacenamento abondo"
-#: ajax/upload.php:109
-msgid "Upload failed"
-msgstr "Produciuse un fallou no envÃo"
+#: ajax/upload.php:120 ajax/upload.php:143
+msgid "Upload failed. Could not get file info."
+msgstr "O envÃo fracasou. Non foi posÃbel obter información do ficheiro."
-#: ajax/upload.php:127
+#: ajax/upload.php:136
+msgid "Upload failed. Could not find uploaded file"
+msgstr "O envÃo fracasou. Non foi posÃbel atopar o ficheiro enviado"
+
+#: ajax/upload.php:160
msgid "Invalid directory."
msgstr "O directorio é incorrecto."
-#: appinfo/app.php:12
+#: appinfo/app.php:11
msgid "Files"
msgstr "Ficheiros"
-#: js/file-upload.js:11
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Non foi posÃbel enviar o ficheiro pois ou é un directorio ou ten 0 bytes"
+#: js/file-upload.js:244
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
+msgstr "Non é posÃbel enviar {filename}, xa que ou é un directorio ou ten 0 bytes"
-#: js/file-upload.js:24
+#: js/file-upload.js:255
msgid "Not enough space available"
msgstr "O espazo dispoñÃbel é insuficiente"
-#: js/file-upload.js:64
+#: js/file-upload.js:322
msgid "Upload cancelled."
msgstr "EnvÃo cancelado."
-#: js/file-upload.js:165
+#: js/file-upload.js:356
+msgid "Could not get result from server."
+msgstr "Non foi posÃbel obter o resultado do servidor."
+
+#: js/file-upload.js:446
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "O envÃo do ficheiro está en proceso. SaÃr agora da páxina cancelará o envÃo."
-#: js/file-upload.js:239
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr "O URL non pode quedar baleiro."
-#: js/file-upload.js:244 lib/app.php:53
+#: js/file-upload.js:525 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr "Nome de cartafol incorrecto. O uso de «Compartido» e «Shared» está reservado para o ownClod"
-#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550
+#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545
msgid "Error"
msgstr "Erro"
-#: js/fileactions.js:116
+#: js/fileactions.js:119
msgid "Share"
msgstr "Compartir"
-#: js/fileactions.js:126
+#: js/fileactions.js:131
msgid "Delete permanently"
msgstr "Eliminar permanentemente"
-#: js/fileactions.js:192
+#: js/fileactions.js:197
msgid "Rename"
msgstr "Renomear"
-#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "Pendentes"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "Xa existe un {new_name}"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "substituÃr"
-#: js/filelist.js:307
+#: js/filelist.js:416
msgid "suggest name"
msgstr "suxerir nome"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "cancelar"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr "substituÃr {new_name} por {old_name}"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "undo"
msgstr "desfacer"
-#: js/filelist.js:424 js/filelist.js:490 js/files.js:581
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "%n cartafol"
msgstr[1] "%n cartafoles"
-#: js/filelist.js:425 js/filelist.js:491 js/files.js:587
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "%n ficheiro"
msgstr[1] "%n ficheiros"
-#: js/filelist.js:432
+#: js/filelist.js:541
msgid "{dirs} and {files}"
msgstr "{dirs} e {files}"
-#: js/filelist.js:563
+#: js/filelist.js:731 js/filelist.js:769
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "Cargando %n ficheiro"
msgstr[1] "Cargando %n ficheiros"
-#: js/filelist.js:628
-msgid "files uploading"
-msgstr "ficheiros enviándose"
-
-#: js/files.js:52
+#: js/files.js:25
msgid "'.' is an invalid file name."
msgstr "«.» é un nome de ficheiro incorrecto"
-#: js/files.js:56
+#: js/files.js:29
msgid "File name cannot be empty."
msgstr "O nome de ficheiro non pode estar baleiro"
-#: js/files.js:64
+#: js/files.js:37
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Nome incorrecto, non se permite «\\», «/», «<», «>», «:», «\"», «|», «?» e «*»."
-#: js/files.js:78
+#: js/files.js:51
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr "O seu espazo de almacenamento está cheo, non é posÃbel actualizar ou sincronizar máis os ficheiros!"
-#: js/files.js:82
+#: js/files.js:55
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "O seu espazo de almacenamento está case cheo ({usedSpacePercent}%)"
-#: js/files.js:94
+#: js/files.js:67
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
msgstr "O cifrado foi desactivado, mais os ficheiros están cifrados. Vaia á configuración persoal para descifrar os ficheiros."
-#: js/files.js:245
+#: js/files.js:296
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "Está a prepararse a súa descarga. Isto pode levar bastante tempo se os ficheiros son grandes."
-#: js/files.js:563 templates/index.php:69
+#: js/files.js:507 js/files.js:545
+msgid "Error moving file"
+msgstr "Produciuse un erro ao mover o ficheiro"
+
+#: js/files.js:558 templates/index.php:61
msgid "Name"
msgstr "Nome"
-#: js/files.js:564 templates/index.php:81
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "Tamaño"
-#: js/files.js:565 templates/index.php:83
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr "Modificado"
@@ -233,7 +241,7 @@ msgstr "Modificado"
msgid "%s could not be renamed"
msgstr "%s non pode cambiar de nome"
-#: lib/helper.php:11 templates/index.php:18
+#: lib/helper.php:11 templates/index.php:17
msgid "Upload"
msgstr "Enviar"
@@ -269,65 +277,65 @@ msgstr "Tamaño máximo de descarga para os ficheiros ZIP"
msgid "Save"
msgstr "Gardar"
-#: templates/index.php:7
+#: templates/index.php:6
msgid "New"
msgstr "Novo"
-#: templates/index.php:10
+#: templates/index.php:9
msgid "Text file"
msgstr "Ficheiro de texto"
-#: templates/index.php:12
+#: templates/index.php:11
msgid "Folder"
msgstr "Cartafol"
-#: templates/index.php:14
+#: templates/index.php:13
msgid "From link"
msgstr "Desde a ligazón"
-#: templates/index.php:41
+#: templates/index.php:33
msgid "Deleted files"
msgstr "Ficheiros eliminados"
-#: templates/index.php:46
+#: templates/index.php:39
msgid "Cancel upload"
msgstr "Cancelar o envÃo"
-#: templates/index.php:52
+#: templates/index.php:45
msgid "You don’t have write permissions here."
msgstr "Non ten permisos para escribir aquÃ."
-#: templates/index.php:59
+#: templates/index.php:50
msgid "Nothing in here. Upload something!"
msgstr "Aquà non hai nada. EnvÃe algo."
-#: templates/index.php:75
+#: templates/index.php:67
msgid "Download"
msgstr "Descargar"
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr "Deixar de compartir"
-#: templates/index.php:94 templates/index.php:95
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "Eliminar"
-#: templates/index.php:108
+#: templates/index.php:100
msgid "Upload too large"
msgstr "EnvÃo demasiado grande"
-#: templates/index.php:110
+#: templates/index.php:102
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Os ficheiros que tenta enviar exceden do tamaño máximo permitido neste servidor"
-#: templates/index.php:115
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr "Estanse analizando os ficheiros. Agarde."
-#: templates/index.php:118
+#: templates/index.php:110
msgid "Current scanning"
msgstr "Análise actual"
diff --git a/l10n/gl/lib.po b/l10n/gl/lib.po
index 430902b2c236cc8cee610343c9880d75034d0bfc..9cb8c43c361d5030f85bc2849985a704dcce660b 100644
--- a/l10n/gl/lib.po
+++ b/l10n/gl/lib.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-18 11:47-0400\n"
+"PO-Revision-Date: 2013-09-17 13:05+0000\n"
+"Last-Translator: mbouzada <mbouzada@gmail.com>\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -56,15 +56,15 @@ msgstr "Non foi posÃbel anovar «%s»."
#: avatar.php:56
msgid "Custom profile pictures don't work with encryption yet"
-msgstr ""
+msgstr "As imaxes personalizadas de perfil aÃnda non funcionan co cifrado"
#: avatar.php:64
msgid "Unknown filetype"
-msgstr ""
+msgstr "Tipo de ficheiro descoñecido"
#: avatar.php:69
msgid "Invalid image"
-msgstr ""
+msgstr "Imaxe incorrecta"
#: defaults.php:35
msgid "web services under your control"
diff --git a/l10n/gl/settings.po b/l10n/gl/settings.po
index 58154e88f4970b26e90edcb68fd3b3d4c8f556ae..8533d9c17c63ce58305b627f1111397c5afb0bac 100644
--- a/l10n/gl/settings.po
+++ b/l10n/gl/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:45-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
@@ -23,7 +23,7 @@ msgid "Unable to load list from App Store"
msgstr "Non foi posÃbel cargar a lista desde a App Store"
#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
-#: ajax/togglegroups.php:20
+#: ajax/togglegroups.php:20 changepassword/controller.php:55
msgid "Authentication error"
msgstr "Produciuse un erro de autenticación"
@@ -85,6 +85,35 @@ msgstr "Non é posÃbel eliminar o usuario do grupo %s"
msgid "Couldn't update app."
msgstr "Non foi posÃbel actualizar o aplicativo."
+#: changepassword/controller.php:20
+msgid "Wrong password"
+msgstr "Contrasinal incorrecto"
+
+#: changepassword/controller.php:42
+msgid "No user supplied"
+msgstr "Non subministrado polo usuario"
+
+#: changepassword/controller.php:74
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr "Forneza un contrasinal de recuperación do administrador de recuperación, senón perderanse todos os datos do usuario"
+
+#: changepassword/controller.php:79
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr "Contrasinal de recuperación do administrador incorrecto. Comprobe o contrasinal e tenteo de novo."
+
+#: changepassword/controller.php:87
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr "A infraestrutura non admite o cambio de contrasinal, mais a chave de cifrado dos usuarios foi actualizada correctamente."
+
+#: changepassword/controller.php:92 changepassword/controller.php:103
+msgid "Unable to change password"
+msgstr "Non é posÃbel cambiar o contrasinal"
+
#: js/apps.js:43
msgid "Update to {appversion}"
msgstr "Actualizar á {appversion}"
@@ -129,15 +158,15 @@ msgstr "Actualizar"
msgid "Updated"
msgstr "Actualizado"
-#: js/personal.js:217
+#: js/personal.js:220
msgid "Select a profile picture"
-msgstr ""
+msgstr "Seleccione unha imaxe para o perfil"
-#: js/personal.js:262
+#: js/personal.js:265
msgid "Decrypting files... Please wait, this can take some time."
msgstr "Descifrando ficheiros... isto pode levar un anaco."
-#: js/personal.js:284
+#: js/personal.js:287
msgid "Saving..."
msgstr "Gardando..."
@@ -461,31 +490,31 @@ msgstr "Escriba un enderezo de correo para activar o contrasinal de recuperació
#: templates/personal.php:86
msgid "Profile picture"
-msgstr ""
+msgstr "Imaxe do perfil"
#: templates/personal.php:90
msgid "Upload new"
-msgstr ""
+msgstr "Novo envÃo"
#: templates/personal.php:92
msgid "Select new from Files"
-msgstr ""
+msgstr "Seleccione unha nova de ficheiros"
#: templates/personal.php:93
msgid "Remove image"
-msgstr ""
+msgstr "Retirar a imaxe"
#: templates/personal.php:94
msgid "Either png or jpg. Ideally square but you will be able to crop it."
-msgstr ""
+msgstr "Calquera png ou jpg. É preferÃbel que sexa cadrada, mais poderá recortala."
#: templates/personal.php:97
msgid "Abort"
-msgstr ""
+msgstr "Cancelar"
#: templates/personal.php:98
msgid "Choose as profile image"
-msgstr ""
+msgstr "Escolla unha imaxe para o perfil"
#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
diff --git a/l10n/he/core.po b/l10n/he/core.po
index ecb35c7ac736654ecd8ee83e8e94f472fbc76c26..c8ae1beb1e5fd92044829627135f701f7582ada1 100644
--- a/l10n/he/core.po
+++ b/l10n/he/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:33+0000\n"
+"POT-Creation-Date: 2013-09-22 12:55-0400\n"
+"PO-Revision-Date: 2013-09-20 15:01+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
@@ -192,55 +192,55 @@ msgstr "דצמבר"
msgid "Settings"
msgstr "הגדרות"
-#: js/js.js:853
+#: js/js.js:866
msgid "seconds ago"
msgstr "×©× ×™×•×ª"
-#: js/js.js:854
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "×œ×¤× ×™ %n דקה"
msgstr[1] "×œ×¤× ×™ %n דקות"
-#: js/js.js:855
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "×œ×¤× ×™ %n שעה"
msgstr[1] "×œ×¤× ×™ %n שעות"
-#: js/js.js:856
+#: js/js.js:869
msgid "today"
msgstr "היו×"
-#: js/js.js:857
+#: js/js.js:870
msgid "yesterday"
msgstr "×תמול"
-#: js/js.js:858
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "×œ×¤× ×™ %n יו×"
msgstr[1] "×œ×¤× ×™ %n ימי×"
-#: js/js.js:859
+#: js/js.js:872
msgid "last month"
msgstr "חודש שעבר"
-#: js/js.js:860
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "×œ×¤× ×™ %n חודש"
msgstr[1] "×œ×¤× ×™ %n חודשי×"
-#: js/js.js:861
+#: js/js.js:874
msgid "months ago"
msgstr "חודשי×"
-#: js/js.js:862
+#: js/js.js:875
msgid "last year"
msgstr "×©× ×” שעברה"
-#: js/js.js:863
+#: js/js.js:876
msgid "years ago"
msgstr "×©× ×™×"
@@ -268,6 +268,46 @@ msgstr "בסדר"
msgid "Error loading message template: {error}"
msgstr ""
+#: js/oc-dialogs.js:347
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:367
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:376
+msgid "Cancel"
+msgstr "ביטול"
+
+#: js/oc-dialogs.js:386
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:457
+msgid "Error loading file exists template"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/he/files.po b/l10n/he/files.po
index 653e107a6e2a4a512531b5d5040067f05db08db7..15a0138955b493a0862daa1ef3814745da7b89d7 100644
--- a/l10n/he/files.po
+++ b/l10n/he/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:00+0000\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
@@ -75,11 +75,15 @@ msgstr "הכתיבה ×œ×›×•× ×Ÿ × ×›×©×œ×”"
msgid "Not enough storage available"
msgstr "×ין די שטח ×¤× ×•×™ ב×חסון"
-#: ajax/upload.php:109
-msgid "Upload failed"
-msgstr "ההעל××” × ×›×©×œ×”"
+#: ajax/upload.php:120 ajax/upload.php:143
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:136
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
-#: ajax/upload.php:127
+#: ajax/upload.php:160
msgid "Invalid directory."
msgstr "תיקייה שגויה."
@@ -87,144 +91,148 @@ msgstr "תיקייה שגויה."
msgid "Files"
msgstr "קבצי×"
-#: js/file-upload.js:11
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "×œ× ×™×›×•×œ להעלות ×ת הקובץ מכיוון שזו תקיה ×ו שמשקל הקובץ 0 בתי×"
+#: js/file-upload.js:244
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
+msgstr ""
-#: js/file-upload.js:24
+#: js/file-upload.js:255
msgid "Not enough space available"
msgstr ""
-#: js/file-upload.js:64
+#: js/file-upload.js:322
msgid "Upload cancelled."
msgstr "ההעל××” בוטלה."
-#: js/file-upload.js:165
+#: js/file-upload.js:356
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:446
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "מתבצעת כעת העל×ת קבצי×. עזיבה של העמוד תבטל ×ת ההעל××”."
-#: js/file-upload.js:239
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr "קישור ××™× ×• יכול להיות ריק."
-#: js/file-upload.js:244 lib/app.php:53
+#: js/file-upload.js:525 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550
+#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545
msgid "Error"
msgstr "שגי××”"
-#: js/fileactions.js:116
+#: js/fileactions.js:119
msgid "Share"
msgstr "שתף"
-#: js/fileactions.js:126
+#: js/fileactions.js:131
msgid "Delete permanently"
msgstr "מחק לצמיתות"
-#: js/fileactions.js:192
+#: js/fileactions.js:197
msgid "Rename"
msgstr "×©×™× ×•×™ ש×"
-#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "ממתין"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{new_name} כבר קיי×"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "החלפה"
-#: js/filelist.js:307
+#: js/filelist.js:416
msgid "suggest name"
msgstr "הצעת ש×"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "ביטול"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr "{new_name} הוחלף ב־{old_name}"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "undo"
msgstr "ביטול"
-#: js/filelist.js:424 js/filelist.js:490 js/files.js:581
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:425 js/filelist.js:491 js/files.js:587
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:432
+#: js/filelist.js:541
msgid "{dirs} and {files}"
msgstr ""
-#: js/filelist.js:563
+#: js/filelist.js:731 js/filelist.js:769
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:628
-msgid "files uploading"
-msgstr "×§×‘×¦×™× ×‘×”×¢×œ××”"
-
-#: js/files.js:52
+#: js/files.js:25
msgid "'.' is an invalid file name."
msgstr ""
-#: js/files.js:56
+#: js/files.js:29
msgid "File name cannot be empty."
msgstr ""
-#: js/files.js:64
+#: js/files.js:37
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "×”×©× ×©×’×•×™, ×סור להשתמש ×‘×ª×•×•×™× '\\', '/', '<', '>', ':', '\"', '|', '?' ו־'*'."
-#: js/files.js:78
+#: js/files.js:51
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr ""
-#: js/files.js:82
+#: js/files.js:55
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:94
+#: js/files.js:67
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
msgstr ""
-#: js/files.js:245
+#: js/files.js:296
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/files.js:563 templates/index.php:69
+#: js/files.js:507 js/files.js:545
+msgid "Error moving file"
+msgstr ""
+
+#: js/files.js:558 templates/index.php:61
msgid "Name"
msgstr "ש×"
-#: js/files.js:564 templates/index.php:81
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "גודל"
-#: js/files.js:565 templates/index.php:83
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr "זמן ×©×™× ×•×™"
@@ -233,7 +241,7 @@ msgstr "זמן ×©×™× ×•×™"
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:11 templates/index.php:18
+#: lib/helper.php:11 templates/index.php:17
msgid "Upload"
msgstr "העל××”"
@@ -269,65 +277,65 @@ msgstr "גודל הקלט המרבי לקובצי ZIP"
msgid "Save"
msgstr "שמירה"
-#: templates/index.php:7
+#: templates/index.php:6
msgid "New"
msgstr "חדש"
-#: templates/index.php:10
+#: templates/index.php:9
msgid "Text file"
msgstr "קובץ טקסט"
-#: templates/index.php:12
+#: templates/index.php:11
msgid "Folder"
msgstr "תיקייה"
-#: templates/index.php:14
+#: templates/index.php:13
msgid "From link"
msgstr "מקישור"
-#: templates/index.php:41
+#: templates/index.php:33
msgid "Deleted files"
msgstr ""
-#: templates/index.php:46
+#: templates/index.php:39
msgid "Cancel upload"
msgstr "ביטול ההעל××”"
-#: templates/index.php:52
+#: templates/index.php:45
msgid "You don’t have write permissions here."
msgstr ""
-#: templates/index.php:59
+#: templates/index.php:50
msgid "Nothing in here. Upload something!"
msgstr "×ין ×›×ן ×©×•× ×“×‘×¨. ×ולי ×‘×¨×¦×•× ×š להעלות משהו?"
-#: templates/index.php:75
+#: templates/index.php:67
msgid "Download"
msgstr "הורדה"
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr "הסר שיתוף"
-#: templates/index.php:94 templates/index.php:95
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "מחיקה"
-#: templates/index.php:108
+#: templates/index.php:100
msgid "Upload too large"
msgstr "העל××” גדולה מידי"
-#: templates/index.php:110
+#: templates/index.php:102
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "×”×§×‘×¦×™× ×©× ×™×¡×™×ª להעלות חרגו מהגודל המקסימלי להעל×ת ×§×‘×¦×™× ×¢×œ שרת ×–×”."
-#: templates/index.php:115
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr "×”×§×‘×¦×™× × ×¡×¨×§×™×, × × ×œ×”×ž×ª×™×Ÿ."
-#: templates/index.php:118
+#: templates/index.php:110
msgid "Current scanning"
msgstr "הסריקה ×”× ×•×›×—×™×ª"
diff --git a/l10n/he/settings.po b/l10n/he/settings.po
index 7115b110ec1d7ff79d23d33a603b1aa79a710030..25d1901bcce6e47afc9601c64f71d6595957e766 100644
--- a/l10n/he/settings.po
+++ b/l10n/he/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:45-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
@@ -23,7 +23,7 @@ msgid "Unable to load list from App Store"
msgstr "×œ× × ×™×ª×Ÿ לטעון רשימה מה־App Store"
#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
-#: ajax/togglegroups.php:20
+#: ajax/togglegroups.php:20 changepassword/controller.php:55
msgid "Authentication error"
msgstr "שגי×ת הזדהות"
@@ -85,6 +85,35 @@ msgstr "×œ× × ×™×ª×Ÿ להסיר משתמש מהקבוצה %s"
msgid "Couldn't update app."
msgstr "×œ× × ×™×ª×Ÿ לעדכן ×ת היישו×."
+#: changepassword/controller.php:20
+msgid "Wrong password"
+msgstr ""
+
+#: changepassword/controller.php:42
+msgid "No user supplied"
+msgstr ""
+
+#: changepassword/controller.php:74
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr ""
+
+#: changepassword/controller.php:79
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr ""
+
+#: changepassword/controller.php:87
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr ""
+
+#: changepassword/controller.php:92 changepassword/controller.php:103
+msgid "Unable to change password"
+msgstr ""
+
#: js/apps.js:43
msgid "Update to {appversion}"
msgstr "עדכון לגרסה {appversion}"
@@ -129,15 +158,15 @@ msgstr "עדכון"
msgid "Updated"
msgstr "מעודכן"
-#: js/personal.js:217
+#: js/personal.js:220
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:262
+#: js/personal.js:265
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:284
+#: js/personal.js:287
msgid "Saving..."
msgstr "שמירה…"
@@ -461,7 +490,7 @@ msgstr "× × ×œ×ž×œ× ×ת כתובת הדו×״ל שלך כדי ל×פשר שח
#: templates/personal.php:86
msgid "Profile picture"
-msgstr ""
+msgstr "×ª×ž×•× ×ª פרופיל"
#: templates/personal.php:90
msgid "Upload new"
diff --git a/l10n/hi/core.po b/l10n/hi/core.po
index c90f0a411370cabfa6f5f82b80b02340c4b89fae..834b2c48eba68cf6084af191c90cffdd754c8c77 100644
--- a/l10n/hi/core.po
+++ b/l10n/hi/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:33+0000\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
"MIME-Version: 1.0\n"
@@ -192,55 +192,55 @@ msgstr "दिसमà¥à¤¬à¤°"
msgid "Settings"
msgstr "सेटिंगà¥à¤¸"
-#: js/js.js:853
+#: js/js.js:866
msgid "seconds ago"
msgstr ""
-#: js/js.js:854
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:855
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:856
+#: js/js.js:869
msgid "today"
msgstr ""
-#: js/js.js:857
+#: js/js.js:870
msgid "yesterday"
msgstr ""
-#: js/js.js:858
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:859
+#: js/js.js:872
msgid "last month"
msgstr ""
-#: js/js.js:860
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:861
+#: js/js.js:874
msgid "months ago"
msgstr ""
-#: js/js.js:862
+#: js/js.js:875
msgid "last year"
msgstr ""
-#: js/js.js:863
+#: js/js.js:876
msgid "years ago"
msgstr ""
@@ -268,6 +268,46 @@ msgstr ""
msgid "Error loading message template: {error}"
msgstr ""
+#: js/oc-dialogs.js:347
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:367
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:376
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:386
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:457
+msgid "Error loading file exists template"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -359,7 +399,7 @@ msgstr ""
#: js/share.js:245
msgid "No people found"
-msgstr ""
+msgstr "कोई वà¥à¤¯à¤•à¥à¤¤à¤¿ नहीं मिले "
#: js/share.js:283
msgid "Resharing is not allowed"
@@ -539,7 +579,7 @@ msgstr "डाले"
#: templates/installation.php:24 templates/installation.php:31
#: templates/installation.php:38
msgid "Security Warning"
-msgstr ""
+msgstr "सà¥à¤°à¤•à¥à¤·à¤¾ चेतावनी "
#: templates/installation.php:25
msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
diff --git a/l10n/hi/files.po b/l10n/hi/files.po
index 67aa5d887df0bfbc1ef2a059450500b857ec1e7c..f6fcb10b392d49e74822a8f46161b47514a2d852 100644
--- a/l10n/hi/files.po
+++ b/l10n/hi/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-30 09:31-0400\n"
-"PO-Revision-Date: 2013-08-30 13:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
"MIME-Version: 1.0\n"
@@ -74,11 +74,15 @@ msgstr ""
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:109
-msgid "Upload failed"
+#: ajax/upload.php:120 ajax/upload.php:143
+msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:127
+#: ajax/upload.php:136
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
+
+#: ajax/upload.php:160
msgid "Invalid directory."
msgstr ""
@@ -86,144 +90,148 @@ msgstr ""
msgid "Files"
msgstr ""
-#: js/file-upload.js:11
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
+#: js/file-upload.js:244
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr ""
-#: js/file-upload.js:24
+#: js/file-upload.js:255
msgid "Not enough space available"
msgstr ""
-#: js/file-upload.js:64
+#: js/file-upload.js:322
msgid "Upload cancelled."
msgstr ""
-#: js/file-upload.js:165
+#: js/file-upload.js:356
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:446
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/file-upload.js:239
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr ""
-#: js/file-upload.js:244 lib/app.php:53
+#: js/file-upload.js:525 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
+#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545
msgid "Error"
msgstr "तà¥à¤°à¥à¤Ÿà¤¿"
-#: js/fileactions.js:116
+#: js/fileactions.js:119
msgid "Share"
msgstr "साà¤à¤¾ करें"
-#: js/fileactions.js:126
+#: js/fileactions.js:131
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:192
+#: js/fileactions.js:197
msgid "Rename"
msgstr ""
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr ""
-#: js/filelist.js:305 js/filelist.js:307
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr ""
-#: js/filelist.js:305 js/filelist.js:307
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr ""
-#: js/filelist.js:305
+#: js/filelist.js:416
msgid "suggest name"
msgstr ""
-#: js/filelist.js:305 js/filelist.js:307
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr ""
-#: js/filelist.js:352
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr ""
-#: js/filelist.js:352
+#: js/filelist.js:463
msgid "undo"
msgstr ""
-#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:430
+#: js/filelist.js:541
msgid "{dirs} and {files}"
msgstr ""
-#: js/filelist.js:561
+#: js/filelist.js:731 js/filelist.js:769
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:626
-msgid "files uploading"
-msgstr ""
-
-#: js/files.js:52
+#: js/files.js:25
msgid "'.' is an invalid file name."
msgstr ""
-#: js/files.js:56
+#: js/files.js:29
msgid "File name cannot be empty."
msgstr ""
-#: js/files.js:64
+#: js/files.js:37
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: js/files.js:78
+#: js/files.js:51
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr ""
-#: js/files.js:82
+#: js/files.js:55
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:94
+#: js/files.js:67
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
msgstr ""
-#: js/files.js:245
+#: js/files.js:296
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/files.js:562 templates/index.php:67
+#: js/files.js:507 js/files.js:545
+msgid "Error moving file"
+msgstr ""
+
+#: js/files.js:558 templates/index.php:61
msgid "Name"
msgstr ""
-#: js/files.js:563 templates/index.php:78
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr ""
-#: js/files.js:564 templates/index.php:80
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr ""
@@ -232,9 +240,9 @@ msgstr ""
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:11 templates/index.php:18
+#: lib/helper.php:11 templates/index.php:17
msgid "Upload"
-msgstr ""
+msgstr "अपलोड "
#: templates/admin.php:5
msgid "File handling"
@@ -268,65 +276,65 @@ msgstr ""
msgid "Save"
msgstr "सहेजें"
-#: templates/index.php:7
+#: templates/index.php:6
msgid "New"
msgstr ""
-#: templates/index.php:10
+#: templates/index.php:9
msgid "Text file"
msgstr ""
-#: templates/index.php:12
+#: templates/index.php:11
msgid "Folder"
msgstr ""
-#: templates/index.php:14
+#: templates/index.php:13
msgid "From link"
msgstr ""
-#: templates/index.php:41
+#: templates/index.php:33
msgid "Deleted files"
msgstr ""
-#: templates/index.php:46
+#: templates/index.php:39
msgid "Cancel upload"
msgstr ""
-#: templates/index.php:52
+#: templates/index.php:45
msgid "You don’t have write permissions here."
msgstr ""
-#: templates/index.php:59
+#: templates/index.php:50
msgid "Nothing in here. Upload something!"
msgstr ""
-#: templates/index.php:73
+#: templates/index.php:67
msgid "Download"
msgstr ""
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr ""
-#: templates/index.php:91 templates/index.php:92
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr ""
-#: templates/index.php:105
+#: templates/index.php:100
msgid "Upload too large"
msgstr ""
-#: templates/index.php:107
+#: templates/index.php:102
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: templates/index.php:112
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:115
+#: templates/index.php:110
msgid "Current scanning"
msgstr ""
diff --git a/l10n/hi/files_sharing.po b/l10n/hi/files_sharing.po
index c9f6dc720fd32f77fdf7b3401a4b15e42d93bfdb..546e758e1c79ce0c9a079ed67e4241c624feb618 100644
--- a/l10n/hi/files_sharing.po
+++ b/l10n/hi/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+0000\n"
+"POT-Creation-Date: 2013-09-18 11:47-0400\n"
+"PO-Revision-Date: 2013-09-17 13:14+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
"MIME-Version: 1.0\n"
@@ -69,7 +69,7 @@ msgstr ""
#: templates/public.php:43 templates/public.php:46
msgid "Upload"
-msgstr ""
+msgstr "अपलोड "
#: templates/public.php:56
msgid "Cancel upload"
diff --git a/l10n/hi/settings.po b/l10n/hi/settings.po
index 4e7d9242b24799c39e8e74a41a84c134c1e7a915..fc8e5837c9ca3bdef8516cba463b0e2bb4c8e55c 100644
--- a/l10n/hi/settings.po
+++ b/l10n/hi/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:45-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
"MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgid "Unable to load list from App Store"
msgstr ""
#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
-#: ajax/togglegroups.php:20
+#: ajax/togglegroups.php:20 changepassword/controller.php:55
msgid "Authentication error"
msgstr ""
@@ -84,6 +84,35 @@ msgstr ""
msgid "Couldn't update app."
msgstr ""
+#: changepassword/controller.php:20
+msgid "Wrong password"
+msgstr ""
+
+#: changepassword/controller.php:42
+msgid "No user supplied"
+msgstr ""
+
+#: changepassword/controller.php:74
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr ""
+
+#: changepassword/controller.php:79
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr ""
+
+#: changepassword/controller.php:87
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr ""
+
+#: changepassword/controller.php:92 changepassword/controller.php:103
+msgid "Unable to change password"
+msgstr ""
+
#: js/apps.js:43
msgid "Update to {appversion}"
msgstr ""
@@ -128,15 +157,15 @@ msgstr "अदà¥à¤¯à¤¤à¤¨"
msgid "Updated"
msgstr ""
-#: js/personal.js:217
+#: js/personal.js:220
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:262
+#: js/personal.js:265
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:284
+#: js/personal.js:287
msgid "Saving..."
msgstr ""
@@ -187,7 +216,7 @@ msgstr ""
#: templates/admin.php:15
msgid "Security Warning"
-msgstr ""
+msgstr "सà¥à¤°à¤•à¥à¤·à¤¾ चेतावनी "
#: templates/admin.php:18
msgid ""
@@ -480,7 +509,7 @@ msgstr ""
#: templates/personal.php:97
msgid "Abort"
-msgstr ""
+msgstr "रदà¥à¤¦ करना "
#: templates/personal.php:98
msgid "Choose as profile image"
diff --git a/l10n/hr/core.po b/l10n/hr/core.po
index d8b8a3018c3cb93e1dcc32a3f7fe2866ce760e5a..59f10907b078a4324336b83371580486087c23aa 100644
--- a/l10n/hr/core.po
+++ b/l10n/hr/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:33+0000\n"
+"POT-Creation-Date: 2013-09-22 12:55-0400\n"
+"PO-Revision-Date: 2013-09-20 15:01+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
@@ -190,59 +190,59 @@ msgstr "Prosinac"
msgid "Settings"
msgstr "Postavke"
-#: js/js.js:853
+#: js/js.js:866
msgid "seconds ago"
msgstr "sekundi prije"
-#: js/js.js:854
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:855
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:856
+#: js/js.js:869
msgid "today"
msgstr "danas"
-#: js/js.js:857
+#: js/js.js:870
msgid "yesterday"
msgstr "juÄer"
-#: js/js.js:858
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:859
+#: js/js.js:872
msgid "last month"
msgstr "prošli mjesec"
-#: js/js.js:860
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:861
+#: js/js.js:874
msgid "months ago"
msgstr "mjeseci"
-#: js/js.js:862
+#: js/js.js:875
msgid "last year"
msgstr "prošlu godinu"
-#: js/js.js:863
+#: js/js.js:876
msgid "years ago"
msgstr "godina"
@@ -270,6 +270,47 @@ msgstr "U redu"
msgid "Error loading message template: {error}"
msgstr ""
+#: js/oc-dialogs.js:347
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:367
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:376
+msgid "Cancel"
+msgstr "Odustani"
+
+#: js/oc-dialogs.js:386
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:457
+msgid "Error loading file exists template"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/hr/files.po b/l10n/hr/files.po
index fad167ba7b8685d5c5f8c5acbdc14e15311f3d91..3eab0bfde87b557e1d4e112451ba21e0cc4f8b9e 100644
--- a/l10n/hr/files.po
+++ b/l10n/hr/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:00+0000\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
@@ -74,11 +74,15 @@ msgstr "Neuspjelo pisanje na disk"
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:109
-msgid "Upload failed"
+#: ajax/upload.php:120 ajax/upload.php:143
+msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:127
+#: ajax/upload.php:136
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
+
+#: ajax/upload.php:160
msgid "Invalid directory."
msgstr ""
@@ -86,147 +90,151 @@ msgstr ""
msgid "Files"
msgstr "Datoteke"
-#: js/file-upload.js:11
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Nemoguće poslati datoteku jer je prazna ili je direktorij"
+#: js/file-upload.js:244
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
+msgstr ""
-#: js/file-upload.js:24
+#: js/file-upload.js:255
msgid "Not enough space available"
msgstr ""
-#: js/file-upload.js:64
+#: js/file-upload.js:322
msgid "Upload cancelled."
msgstr "Slanje poništeno."
-#: js/file-upload.js:165
+#: js/file-upload.js:356
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:446
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "UÄitavanje datoteke. NapuÅ¡tanjem stranice će prekinuti uÄitavanje."
-#: js/file-upload.js:239
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr ""
-#: js/file-upload.js:244 lib/app.php:53
+#: js/file-upload.js:525 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550
+#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545
msgid "Error"
msgstr "Greška"
-#: js/fileactions.js:116
+#: js/fileactions.js:119
msgid "Share"
msgstr "Podijeli"
-#: js/fileactions.js:126
+#: js/fileactions.js:131
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:192
+#: js/fileactions.js:197
msgid "Rename"
msgstr "Promjeni ime"
-#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "U tijeku"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr ""
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "zamjeni"
-#: js/filelist.js:307
+#: js/filelist.js:416
msgid "suggest name"
msgstr "predloži ime"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "odustani"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr ""
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "undo"
msgstr "vrati"
-#: js/filelist.js:424 js/filelist.js:490 js/files.js:581
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/filelist.js:425 js/filelist.js:491 js/files.js:587
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/filelist.js:432
+#: js/filelist.js:541
msgid "{dirs} and {files}"
msgstr ""
-#: js/filelist.js:563
+#: js/filelist.js:731 js/filelist.js:769
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/filelist.js:628
-msgid "files uploading"
-msgstr "datoteke se uÄitavaju"
-
-#: js/files.js:52
+#: js/files.js:25
msgid "'.' is an invalid file name."
msgstr ""
-#: js/files.js:56
+#: js/files.js:29
msgid "File name cannot be empty."
msgstr ""
-#: js/files.js:64
+#: js/files.js:37
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: js/files.js:78
+#: js/files.js:51
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr ""
-#: js/files.js:82
+#: js/files.js:55
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:94
+#: js/files.js:67
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
msgstr ""
-#: js/files.js:245
+#: js/files.js:296
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/files.js:563 templates/index.php:69
+#: js/files.js:507 js/files.js:545
+msgid "Error moving file"
+msgstr ""
+
+#: js/files.js:558 templates/index.php:61
msgid "Name"
msgstr "Ime"
-#: js/files.js:564 templates/index.php:81
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "VeliÄina"
-#: js/files.js:565 templates/index.php:83
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr "Zadnja promjena"
@@ -235,7 +243,7 @@ msgstr "Zadnja promjena"
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:11 templates/index.php:18
+#: lib/helper.php:11 templates/index.php:17
msgid "Upload"
msgstr "UÄitaj"
@@ -271,65 +279,65 @@ msgstr "Maksimalna veliÄina za ZIP datoteke"
msgid "Save"
msgstr "Snimi"
-#: templates/index.php:7
+#: templates/index.php:6
msgid "New"
msgstr "novo"
-#: templates/index.php:10
+#: templates/index.php:9
msgid "Text file"
msgstr "tekstualna datoteka"
-#: templates/index.php:12
+#: templates/index.php:11
msgid "Folder"
msgstr "mapa"
-#: templates/index.php:14
+#: templates/index.php:13
msgid "From link"
msgstr ""
-#: templates/index.php:41
+#: templates/index.php:33
msgid "Deleted files"
msgstr ""
-#: templates/index.php:46
+#: templates/index.php:39
msgid "Cancel upload"
msgstr "Prekini upload"
-#: templates/index.php:52
+#: templates/index.php:45
msgid "You don’t have write permissions here."
msgstr ""
-#: templates/index.php:59
+#: templates/index.php:50
msgid "Nothing in here. Upload something!"
msgstr "Nema niÄega u ovoj mapi. PoÅ¡alji neÅ¡to!"
-#: templates/index.php:75
+#: templates/index.php:67
msgid "Download"
msgstr "Preuzimanje"
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr "Makni djeljenje"
-#: templates/index.php:94 templates/index.php:95
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "Obriši"
-#: templates/index.php:108
+#: templates/index.php:100
msgid "Upload too large"
msgstr "Prijenos je preobiman"
-#: templates/index.php:110
+#: templates/index.php:102
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Datoteke koje pokuÅ¡avate prenijeti prelaze maksimalnu veliÄinu za prijenos datoteka na ovom poslužitelju."
-#: templates/index.php:115
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr "Datoteke se skeniraju, molimo priÄekajte."
-#: templates/index.php:118
+#: templates/index.php:110
msgid "Current scanning"
msgstr "Trenutno skeniranje"
diff --git a/l10n/hr/settings.po b/l10n/hr/settings.po
index 13772a829053312053212779a9dc32343cfcf912..aec94bb5dfb042bf008db39f528c769c3e8c0a3b 100644
--- a/l10n/hr/settings.po
+++ b/l10n/hr/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:45-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgid "Unable to load list from App Store"
msgstr "Nemogićnost uÄitavanja liste sa Apps Stora"
#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
-#: ajax/togglegroups.php:20
+#: ajax/togglegroups.php:20 changepassword/controller.php:55
msgid "Authentication error"
msgstr "Greška kod autorizacije"
@@ -84,6 +84,35 @@ msgstr ""
msgid "Couldn't update app."
msgstr ""
+#: changepassword/controller.php:20
+msgid "Wrong password"
+msgstr ""
+
+#: changepassword/controller.php:42
+msgid "No user supplied"
+msgstr ""
+
+#: changepassword/controller.php:74
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr ""
+
+#: changepassword/controller.php:79
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr ""
+
+#: changepassword/controller.php:87
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr ""
+
+#: changepassword/controller.php:92 changepassword/controller.php:103
+msgid "Unable to change password"
+msgstr ""
+
#: js/apps.js:43
msgid "Update to {appversion}"
msgstr ""
@@ -128,15 +157,15 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:217
+#: js/personal.js:220
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:262
+#: js/personal.js:265
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:284
+#: js/personal.js:287
msgid "Saving..."
msgstr "Spremanje..."
diff --git a/l10n/hu_HU/core.po b/l10n/hu_HU/core.po
index 18378d4b15d30c7e185841ca1c912d2dde3749f2..7b484995d4b18d8aa196d60184637f122e60eb01 100644
--- a/l10n/hu_HU/core.po
+++ b/l10n/hu_HU/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:33+0000\n"
+"POT-Creation-Date: 2013-09-22 12:55-0400\n"
+"PO-Revision-Date: 2013-09-20 15:01+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
@@ -192,55 +192,55 @@ msgstr "december"
msgid "Settings"
msgstr "BeállÃtások"
-#: js/js.js:853
+#: js/js.js:866
msgid "seconds ago"
msgstr "pár másodperce"
-#: js/js.js:854
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:855
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:856
+#: js/js.js:869
msgid "today"
msgstr "ma"
-#: js/js.js:857
+#: js/js.js:870
msgid "yesterday"
msgstr "tegnap"
-#: js/js.js:858
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:859
+#: js/js.js:872
msgid "last month"
msgstr "múlt hónapban"
-#: js/js.js:860
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:861
+#: js/js.js:874
msgid "months ago"
msgstr "több hónapja"
-#: js/js.js:862
+#: js/js.js:875
msgid "last year"
msgstr "tavaly"
-#: js/js.js:863
+#: js/js.js:876
msgid "years ago"
msgstr "több éve"
@@ -268,6 +268,46 @@ msgstr "Ok"
msgid "Error loading message template: {error}"
msgstr ""
+#: js/oc-dialogs.js:347
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:367
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:376
+msgid "Cancel"
+msgstr "Mégsem"
+
+#: js/oc-dialogs.js:386
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:457
+msgid "Error loading file exists template"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/hu_HU/files.po b/l10n/hu_HU/files.po
index 7843881e215c9bc997b8f0a2a8e5a7a49c780883..51bd0806da3826712d4f5673a5b3aa9f6a21bbff 100644
--- a/l10n/hu_HU/files.po
+++ b/l10n/hu_HU/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:00+0000\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
@@ -75,11 +75,15 @@ msgstr "Nem sikerült a lemezre történÅ‘ Ãrás"
msgid "Not enough storage available"
msgstr "Nincs elég szabad hely."
-#: ajax/upload.php:109
-msgid "Upload failed"
-msgstr "A feltöltés nem sikerült"
+#: ajax/upload.php:120 ajax/upload.php:143
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:136
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
-#: ajax/upload.php:127
+#: ajax/upload.php:160
msgid "Invalid directory."
msgstr "Érvénytelen mappa."
@@ -87,144 +91,148 @@ msgstr "Érvénytelen mappa."
msgid "Files"
msgstr "Fájlok"
-#: js/file-upload.js:11
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Nem tölthető fel, mert mappa volt, vagy 0 byte méretű"
+#: js/file-upload.js:244
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
+msgstr ""
-#: js/file-upload.js:24
+#: js/file-upload.js:255
msgid "Not enough space available"
msgstr "Nincs elég szabad hely"
-#: js/file-upload.js:64
+#: js/file-upload.js:322
msgid "Upload cancelled."
msgstr "A feltöltést megszakÃtottuk."
-#: js/file-upload.js:165
+#: js/file-upload.js:356
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:446
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Fájlfeltöltés van folyamatban. Az oldal elhagyása megszakÃtja a feltöltést."
-#: js/file-upload.js:239
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr "Az URL nem lehet semmi."
-#: js/file-upload.js:244 lib/app.php:53
+#: js/file-upload.js:525 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr "Érvénytelen mappanév. A 'Shared' az ownCloud számára fenntartott elnevezés"
-#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550
+#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545
msgid "Error"
msgstr "Hiba"
-#: js/fileactions.js:116
+#: js/fileactions.js:119
msgid "Share"
msgstr "Megosztás"
-#: js/fileactions.js:126
+#: js/fileactions.js:131
msgid "Delete permanently"
msgstr "Végleges törlés"
-#: js/fileactions.js:192
+#: js/fileactions.js:197
msgid "Rename"
msgstr "Ãtnevezés"
-#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "Folyamatban"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{new_name} már létezik"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "Ãrjuk fölül"
-#: js/filelist.js:307
+#: js/filelist.js:416
msgid "suggest name"
msgstr "legyen más neve"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "mégse"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr "{new_name} fájlt kicseréltük ezzel: {old_name}"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "undo"
msgstr "visszavonás"
-#: js/filelist.js:424 js/filelist.js:490 js/files.js:581
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:425 js/filelist.js:491 js/files.js:587
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:432
+#: js/filelist.js:541
msgid "{dirs} and {files}"
msgstr ""
-#: js/filelist.js:563
+#: js/filelist.js:731 js/filelist.js:769
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:628
-msgid "files uploading"
-msgstr "fájl töltődik föl"
-
-#: js/files.js:52
+#: js/files.js:25
msgid "'.' is an invalid file name."
msgstr "'.' fájlnév érvénytelen."
-#: js/files.js:56
+#: js/files.js:29
msgid "File name cannot be empty."
msgstr "A fájlnév nem lehet semmi."
-#: js/files.js:64
+#: js/files.js:37
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Érvénytelen elnevezés. Ezek a karakterek nem használhatók: '\\', '/', '<', '>', ':', '\"', '|', '?' és '*'"
-#: js/files.js:78
+#: js/files.js:51
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr "A tároló tele van, a fájlok nem frissÃthetÅ‘ek vagy szinkronizálhatóak a jövÅ‘ben."
-#: js/files.js:82
+#: js/files.js:55
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "A tároló majdnem tele van ({usedSpacePercent}%)"
-#: js/files.js:94
+#: js/files.js:67
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
msgstr ""
-#: js/files.js:245
+#: js/files.js:296
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "Készül a letöltendő állomány. Ez eltarthat egy ideig, ha nagyok a fájlok."
-#: js/files.js:563 templates/index.php:69
+#: js/files.js:507 js/files.js:545
+msgid "Error moving file"
+msgstr ""
+
+#: js/files.js:558 templates/index.php:61
msgid "Name"
msgstr "Név"
-#: js/files.js:564 templates/index.php:81
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "Méret"
-#: js/files.js:565 templates/index.php:83
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr "MódosÃtva"
@@ -233,7 +241,7 @@ msgstr "MódosÃtva"
msgid "%s could not be renamed"
msgstr "%s átnevezése nem sikerült"
-#: lib/helper.php:11 templates/index.php:18
+#: lib/helper.php:11 templates/index.php:17
msgid "Upload"
msgstr "Feltöltés"
@@ -269,65 +277,65 @@ msgstr "ZIP-fájlok maximális kiindulási mérete"
msgid "Save"
msgstr "Mentés"
-#: templates/index.php:7
+#: templates/index.php:6
msgid "New"
msgstr "Új"
-#: templates/index.php:10
+#: templates/index.php:9
msgid "Text file"
msgstr "Szövegfájl"
-#: templates/index.php:12
+#: templates/index.php:11
msgid "Folder"
msgstr "Mappa"
-#: templates/index.php:14
+#: templates/index.php:13
msgid "From link"
msgstr "Feltöltés linkről"
-#: templates/index.php:41
+#: templates/index.php:33
msgid "Deleted files"
msgstr "Törölt fájlok"
-#: templates/index.php:46
+#: templates/index.php:39
msgid "Cancel upload"
msgstr "A feltöltés megszakÃtása"
-#: templates/index.php:52
+#: templates/index.php:45
msgid "You don’t have write permissions here."
msgstr "Itt nincs Ãrásjoga."
-#: templates/index.php:59
+#: templates/index.php:50
msgid "Nothing in here. Upload something!"
msgstr "Itt nincs semmi. Töltsön fel valamit!"
-#: templates/index.php:75
+#: templates/index.php:67
msgid "Download"
msgstr "Letöltés"
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr "A megosztás visszavonása"
-#: templates/index.php:94 templates/index.php:95
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "Törlés"
-#: templates/index.php:108
+#: templates/index.php:100
msgid "Upload too large"
msgstr "A feltöltés túl nagy"
-#: templates/index.php:110
+#: templates/index.php:102
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "A feltöltendő állományok mérete meghaladja a kiszolgálón megengedett maximális méretet."
-#: templates/index.php:115
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr "A fájllista ellenőrzése zajlik, kis türelmet!"
-#: templates/index.php:118
+#: templates/index.php:110
msgid "Current scanning"
msgstr "Ellenőrzés alatt"
diff --git a/l10n/hu_HU/settings.po b/l10n/hu_HU/settings.po
index 93228ebc6c70bc8abe1f253e412fd2fbf25126d2..7ef4a07d1aea0084180b2f83c757e3133feb1cd3 100644
--- a/l10n/hu_HU/settings.po
+++ b/l10n/hu_HU/settings.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:45-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
@@ -25,7 +25,7 @@ msgid "Unable to load list from App Store"
msgstr "Nem tölthető le a lista az App Store-ból"
#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
-#: ajax/togglegroups.php:20
+#: ajax/togglegroups.php:20 changepassword/controller.php:55
msgid "Authentication error"
msgstr "AzonosÃtási hiba"
@@ -87,6 +87,35 @@ msgstr "A felhasználó nem távolÃtható el ebbÅ‘l a csoportból: %s"
msgid "Couldn't update app."
msgstr "A program frissÃtése nem sikerült."
+#: changepassword/controller.php:20
+msgid "Wrong password"
+msgstr ""
+
+#: changepassword/controller.php:42
+msgid "No user supplied"
+msgstr ""
+
+#: changepassword/controller.php:74
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr ""
+
+#: changepassword/controller.php:79
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr ""
+
+#: changepassword/controller.php:87
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr ""
+
+#: changepassword/controller.php:92 changepassword/controller.php:103
+msgid "Unable to change password"
+msgstr ""
+
#: js/apps.js:43
msgid "Update to {appversion}"
msgstr "FrissÃtés erre a verzióra: {appversion}"
@@ -131,15 +160,15 @@ msgstr "FrissÃtés"
msgid "Updated"
msgstr "FrissÃtve"
-#: js/personal.js:217
+#: js/personal.js:220
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:262
+#: js/personal.js:265
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:284
+#: js/personal.js:287
msgid "Saving..."
msgstr "Mentés..."
@@ -463,7 +492,7 @@ msgstr "Adja meg az email cÃmét, hogy jelszó-emlékeztetÅ‘t kérhessen, ha el
#: templates/personal.php:86
msgid "Profile picture"
-msgstr ""
+msgstr "Profilkép"
#: templates/personal.php:90
msgid "Upload new"
diff --git a/l10n/hy/core.po b/l10n/hy/core.po
index 3200bbb85343c97003c0f552b398a514d7ff6e22..cfc83cf7733755bdedb9aa2ad3999a7a1be76521 100644
--- a/l10n/hy/core.po
+++ b/l10n/hy/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
"MIME-Version: 1.0\n"
@@ -190,55 +190,55 @@ msgstr "Ô´Õ¥Õ¯Õ¿Õ¥Õ´Õ¢Õ¥Ö€"
msgid "Settings"
msgstr ""
-#: js/js.js:853
+#: js/js.js:866
msgid "seconds ago"
msgstr ""
-#: js/js.js:854
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:855
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:856
+#: js/js.js:869
msgid "today"
msgstr ""
-#: js/js.js:857
+#: js/js.js:870
msgid "yesterday"
msgstr ""
-#: js/js.js:858
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:859
+#: js/js.js:872
msgid "last month"
msgstr ""
-#: js/js.js:860
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:861
+#: js/js.js:874
msgid "months ago"
msgstr ""
-#: js/js.js:862
+#: js/js.js:875
msgid "last year"
msgstr ""
-#: js/js.js:863
+#: js/js.js:876
msgid "years ago"
msgstr ""
@@ -266,6 +266,46 @@ msgstr ""
msgid "Error loading message template: {error}"
msgstr ""
+#: js/oc-dialogs.js:347
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:367
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:376
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:386
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:457
+msgid "Error loading file exists template"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/hy/files.po b/l10n/hy/files.po
index 6c477202b4d2ed0f6099f8f3963ece55c3873eac..46e6544393b83d0ec2dfe86de6dca8e93e67d674 100644
--- a/l10n/hy/files.po
+++ b/l10n/hy/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-30 09:31-0400\n"
-"PO-Revision-Date: 2013-08-30 13:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
"MIME-Version: 1.0\n"
@@ -74,11 +74,15 @@ msgstr ""
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:109
-msgid "Upload failed"
+#: ajax/upload.php:120 ajax/upload.php:143
+msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:127
+#: ajax/upload.php:136
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
+
+#: ajax/upload.php:160
msgid "Invalid directory."
msgstr ""
@@ -86,144 +90,148 @@ msgstr ""
msgid "Files"
msgstr ""
-#: js/file-upload.js:11
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
+#: js/file-upload.js:244
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr ""
-#: js/file-upload.js:24
+#: js/file-upload.js:255
msgid "Not enough space available"
msgstr ""
-#: js/file-upload.js:64
+#: js/file-upload.js:322
msgid "Upload cancelled."
msgstr ""
-#: js/file-upload.js:165
+#: js/file-upload.js:356
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:446
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/file-upload.js:239
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr ""
-#: js/file-upload.js:244 lib/app.php:53
+#: js/file-upload.js:525 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
+#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545
msgid "Error"
msgstr ""
-#: js/fileactions.js:116
+#: js/fileactions.js:119
msgid "Share"
msgstr ""
-#: js/fileactions.js:126
+#: js/fileactions.js:131
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:192
+#: js/fileactions.js:197
msgid "Rename"
msgstr ""
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr ""
-#: js/filelist.js:305 js/filelist.js:307
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr ""
-#: js/filelist.js:305 js/filelist.js:307
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr ""
-#: js/filelist.js:305
+#: js/filelist.js:416
msgid "suggest name"
msgstr ""
-#: js/filelist.js:305 js/filelist.js:307
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr ""
-#: js/filelist.js:352
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr ""
-#: js/filelist.js:352
+#: js/filelist.js:463
msgid "undo"
msgstr ""
-#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:430
+#: js/filelist.js:541
msgid "{dirs} and {files}"
msgstr ""
-#: js/filelist.js:561
+#: js/filelist.js:731 js/filelist.js:769
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:626
-msgid "files uploading"
-msgstr ""
-
-#: js/files.js:52
+#: js/files.js:25
msgid "'.' is an invalid file name."
msgstr ""
-#: js/files.js:56
+#: js/files.js:29
msgid "File name cannot be empty."
msgstr ""
-#: js/files.js:64
+#: js/files.js:37
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: js/files.js:78
+#: js/files.js:51
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr ""
-#: js/files.js:82
+#: js/files.js:55
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:94
+#: js/files.js:67
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
msgstr ""
-#: js/files.js:245
+#: js/files.js:296
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/files.js:562 templates/index.php:67
+#: js/files.js:507 js/files.js:545
+msgid "Error moving file"
+msgstr ""
+
+#: js/files.js:558 templates/index.php:61
msgid "Name"
msgstr ""
-#: js/files.js:563 templates/index.php:78
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr ""
-#: js/files.js:564 templates/index.php:80
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr ""
@@ -232,7 +240,7 @@ msgstr ""
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:11 templates/index.php:18
+#: lib/helper.php:11 templates/index.php:17
msgid "Upload"
msgstr ""
@@ -268,65 +276,65 @@ msgstr ""
msgid "Save"
msgstr "ÕŠÕ¡Õ°ÕºÕ¡Õ¶Õ¥Õ¬"
-#: templates/index.php:7
+#: templates/index.php:6
msgid "New"
msgstr ""
-#: templates/index.php:10
+#: templates/index.php:9
msgid "Text file"
msgstr ""
-#: templates/index.php:12
+#: templates/index.php:11
msgid "Folder"
msgstr ""
-#: templates/index.php:14
+#: templates/index.php:13
msgid "From link"
msgstr ""
-#: templates/index.php:41
+#: templates/index.php:33
msgid "Deleted files"
msgstr ""
-#: templates/index.php:46
+#: templates/index.php:39
msgid "Cancel upload"
msgstr ""
-#: templates/index.php:52
+#: templates/index.php:45
msgid "You don’t have write permissions here."
msgstr ""
-#: templates/index.php:59
+#: templates/index.php:50
msgid "Nothing in here. Upload something!"
msgstr ""
-#: templates/index.php:73
+#: templates/index.php:67
msgid "Download"
msgstr "Ô²Õ¥Õ¼Õ¶Õ¥Õ¬"
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr ""
-#: templates/index.php:91 templates/index.php:92
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "Õ‹Õ¶Õ»Õ¥Õ¬"
-#: templates/index.php:105
+#: templates/index.php:100
msgid "Upload too large"
msgstr ""
-#: templates/index.php:107
+#: templates/index.php:102
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: templates/index.php:112
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:115
+#: templates/index.php:110
msgid "Current scanning"
msgstr ""
diff --git a/l10n/hy/settings.po b/l10n/hy/settings.po
index 35712856251f8c3f8fb4a6beb38561a5ef88f0fa..ecc4b3e278875ee2ac6d68f145bbe51cf9eca0f5 100644
--- a/l10n/hy/settings.po
+++ b/l10n/hy/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:45-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
"MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgid "Unable to load list from App Store"
msgstr ""
#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
-#: ajax/togglegroups.php:20
+#: ajax/togglegroups.php:20 changepassword/controller.php:55
msgid "Authentication error"
msgstr ""
@@ -84,6 +84,35 @@ msgstr ""
msgid "Couldn't update app."
msgstr ""
+#: changepassword/controller.php:20
+msgid "Wrong password"
+msgstr ""
+
+#: changepassword/controller.php:42
+msgid "No user supplied"
+msgstr ""
+
+#: changepassword/controller.php:74
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr ""
+
+#: changepassword/controller.php:79
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr ""
+
+#: changepassword/controller.php:87
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr ""
+
+#: changepassword/controller.php:92 changepassword/controller.php:103
+msgid "Unable to change password"
+msgstr ""
+
#: js/apps.js:43
msgid "Update to {appversion}"
msgstr ""
@@ -128,15 +157,15 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:217
+#: js/personal.js:220
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:262
+#: js/personal.js:265
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:284
+#: js/personal.js:287
msgid "Saving..."
msgstr ""
diff --git a/l10n/ia/core.po b/l10n/ia/core.po
index 51ad0cc856fe0f50ad0fbefeec25995373ac82ea..194b8863fffe30d8918b1cbd48e23c4e7f1fcb59 100644
--- a/l10n/ia/core.po
+++ b/l10n/ia/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:33+0000\n"
+"POT-Creation-Date: 2013-09-22 12:55-0400\n"
+"PO-Revision-Date: 2013-09-20 15:01+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
@@ -190,55 +190,55 @@ msgstr "Decembre"
msgid "Settings"
msgstr "Configurationes"
-#: js/js.js:853
+#: js/js.js:866
msgid "seconds ago"
msgstr ""
-#: js/js.js:854
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:855
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:856
+#: js/js.js:869
msgid "today"
msgstr ""
-#: js/js.js:857
+#: js/js.js:870
msgid "yesterday"
msgstr ""
-#: js/js.js:858
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:859
+#: js/js.js:872
msgid "last month"
msgstr ""
-#: js/js.js:860
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:861
+#: js/js.js:874
msgid "months ago"
msgstr ""
-#: js/js.js:862
+#: js/js.js:875
msgid "last year"
msgstr ""
-#: js/js.js:863
+#: js/js.js:876
msgid "years ago"
msgstr ""
@@ -266,6 +266,46 @@ msgstr ""
msgid "Error loading message template: {error}"
msgstr ""
+#: js/oc-dialogs.js:347
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:367
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:376
+msgid "Cancel"
+msgstr "Cancellar"
+
+#: js/oc-dialogs.js:386
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:457
+msgid "Error loading file exists template"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/ia/files.po b/l10n/ia/files.po
index 391f76c987c833f86490b4ecfedf662ee2ea7f7d..5244ffda6257a0aa717fd147d6df0b44792c80e6 100644
--- a/l10n/ia/files.po
+++ b/l10n/ia/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:00+0000\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
@@ -74,11 +74,15 @@ msgstr ""
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:109
-msgid "Upload failed"
+#: ajax/upload.php:120 ajax/upload.php:143
+msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:127
+#: ajax/upload.php:136
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
+
+#: ajax/upload.php:160
msgid "Invalid directory."
msgstr ""
@@ -86,144 +90,148 @@ msgstr ""
msgid "Files"
msgstr "Files"
-#: js/file-upload.js:11
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
+#: js/file-upload.js:244
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr ""
-#: js/file-upload.js:24
+#: js/file-upload.js:255
msgid "Not enough space available"
msgstr ""
-#: js/file-upload.js:64
+#: js/file-upload.js:322
msgid "Upload cancelled."
msgstr ""
-#: js/file-upload.js:165
+#: js/file-upload.js:356
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:446
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/file-upload.js:239
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr ""
-#: js/file-upload.js:244 lib/app.php:53
+#: js/file-upload.js:525 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550
+#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545
msgid "Error"
msgstr "Error"
-#: js/fileactions.js:116
+#: js/fileactions.js:119
msgid "Share"
msgstr "Compartir"
-#: js/fileactions.js:126
+#: js/fileactions.js:131
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:192
+#: js/fileactions.js:197
msgid "Rename"
msgstr ""
-#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr ""
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr ""
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr ""
-#: js/filelist.js:307
+#: js/filelist.js:416
msgid "suggest name"
msgstr ""
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr ""
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr ""
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "undo"
msgstr ""
-#: js/filelist.js:424 js/filelist.js:490 js/files.js:581
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:425 js/filelist.js:491 js/files.js:587
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:432
+#: js/filelist.js:541
msgid "{dirs} and {files}"
msgstr ""
-#: js/filelist.js:563
+#: js/filelist.js:731 js/filelist.js:769
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:628
-msgid "files uploading"
-msgstr ""
-
-#: js/files.js:52
+#: js/files.js:25
msgid "'.' is an invalid file name."
msgstr ""
-#: js/files.js:56
+#: js/files.js:29
msgid "File name cannot be empty."
msgstr ""
-#: js/files.js:64
+#: js/files.js:37
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: js/files.js:78
+#: js/files.js:51
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr ""
-#: js/files.js:82
+#: js/files.js:55
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:94
+#: js/files.js:67
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
msgstr ""
-#: js/files.js:245
+#: js/files.js:296
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/files.js:563 templates/index.php:69
+#: js/files.js:507 js/files.js:545
+msgid "Error moving file"
+msgstr ""
+
+#: js/files.js:558 templates/index.php:61
msgid "Name"
msgstr "Nomine"
-#: js/files.js:564 templates/index.php:81
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "Dimension"
-#: js/files.js:565 templates/index.php:83
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr "Modificate"
@@ -232,7 +240,7 @@ msgstr "Modificate"
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:11 templates/index.php:18
+#: lib/helper.php:11 templates/index.php:17
msgid "Upload"
msgstr "Incargar"
@@ -268,65 +276,65 @@ msgstr ""
msgid "Save"
msgstr "Salveguardar"
-#: templates/index.php:7
+#: templates/index.php:6
msgid "New"
msgstr "Nove"
-#: templates/index.php:10
+#: templates/index.php:9
msgid "Text file"
msgstr "File de texto"
-#: templates/index.php:12
+#: templates/index.php:11
msgid "Folder"
msgstr "Dossier"
-#: templates/index.php:14
+#: templates/index.php:13
msgid "From link"
msgstr ""
-#: templates/index.php:41
+#: templates/index.php:33
msgid "Deleted files"
msgstr ""
-#: templates/index.php:46
+#: templates/index.php:39
msgid "Cancel upload"
msgstr ""
-#: templates/index.php:52
+#: templates/index.php:45
msgid "You don’t have write permissions here."
msgstr ""
-#: templates/index.php:59
+#: templates/index.php:50
msgid "Nothing in here. Upload something!"
msgstr "Nihil hic. Incarga alcun cosa!"
-#: templates/index.php:75
+#: templates/index.php:67
msgid "Download"
msgstr "Discargar"
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr ""
-#: templates/index.php:94 templates/index.php:95
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "Deler"
-#: templates/index.php:108
+#: templates/index.php:100
msgid "Upload too large"
msgstr "Incargamento troppo longe"
-#: templates/index.php:110
+#: templates/index.php:102
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: templates/index.php:115
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:118
+#: templates/index.php:110
msgid "Current scanning"
msgstr ""
diff --git a/l10n/ia/settings.po b/l10n/ia/settings.po
index dfe9a6ffe847681a5b39094182f25646743db5b3..3097b240fc68c3fc3191691282dd88c8c574684d 100644
--- a/l10n/ia/settings.po
+++ b/l10n/ia/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:45-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgid "Unable to load list from App Store"
msgstr ""
#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
-#: ajax/togglegroups.php:20
+#: ajax/togglegroups.php:20 changepassword/controller.php:55
msgid "Authentication error"
msgstr ""
@@ -84,6 +84,35 @@ msgstr ""
msgid "Couldn't update app."
msgstr ""
+#: changepassword/controller.php:20
+msgid "Wrong password"
+msgstr ""
+
+#: changepassword/controller.php:42
+msgid "No user supplied"
+msgstr ""
+
+#: changepassword/controller.php:74
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr ""
+
+#: changepassword/controller.php:79
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr ""
+
+#: changepassword/controller.php:87
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr ""
+
+#: changepassword/controller.php:92 changepassword/controller.php:103
+msgid "Unable to change password"
+msgstr ""
+
#: js/apps.js:43
msgid "Update to {appversion}"
msgstr ""
@@ -128,15 +157,15 @@ msgstr "Actualisar"
msgid "Updated"
msgstr ""
-#: js/personal.js:217
+#: js/personal.js:220
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:262
+#: js/personal.js:265
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:284
+#: js/personal.js:287
msgid "Saving..."
msgstr ""
@@ -460,7 +489,7 @@ msgstr ""
#: templates/personal.php:86
msgid "Profile picture"
-msgstr ""
+msgstr "Imagine de profilo"
#: templates/personal.php:90
msgid "Upload new"
diff --git a/l10n/id/core.po b/l10n/id/core.po
index 6330d1f9d2e95bb689e78a136646d37e0d56a19f..2a8ac8b61c464e483d51f1cb3c5597ab4e44b5e6 100644
--- a/l10n/id/core.po
+++ b/l10n/id/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-09-22 12:55-0400\n"
+"PO-Revision-Date: 2013-09-20 15:01+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
@@ -190,51 +190,51 @@ msgstr "Desember"
msgid "Settings"
msgstr "Setelan"
-#: js/js.js:853
+#: js/js.js:866
msgid "seconds ago"
msgstr "beberapa detik yang lalu"
-#: js/js.js:854
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: js/js.js:855
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: js/js.js:856
+#: js/js.js:869
msgid "today"
msgstr "hari ini"
-#: js/js.js:857
+#: js/js.js:870
msgid "yesterday"
msgstr "kemarin"
-#: js/js.js:858
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
-#: js/js.js:859
+#: js/js.js:872
msgid "last month"
msgstr "bulan kemarin"
-#: js/js.js:860
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: js/js.js:861
+#: js/js.js:874
msgid "months ago"
msgstr "beberapa bulan lalu"
-#: js/js.js:862
+#: js/js.js:875
msgid "last year"
msgstr "tahun kemarin"
-#: js/js.js:863
+#: js/js.js:876
msgid "years ago"
msgstr "beberapa tahun lalu"
@@ -262,6 +262,45 @@ msgstr "Oke"
msgid "Error loading message template: {error}"
msgstr ""
+#: js/oc-dialogs.js:347
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:367
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:376
+msgid "Cancel"
+msgstr "Batal"
+
+#: js/oc-dialogs.js:386
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:457
+msgid "Error loading file exists template"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/id/files.po b/l10n/id/files.po
index 2ce822890c644ee73610b3488c1bacf210622483..dc0c2272b6b574babb87bb9825d3e479b93ba6a7 100644
--- a/l10n/id/files.po
+++ b/l10n/id/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:00+0000\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
@@ -74,11 +74,15 @@ msgstr "Gagal menulis ke disk"
msgid "Not enough storage available"
msgstr "Ruang penyimpanan tidak mencukupi"
-#: ajax/upload.php:109
-msgid "Upload failed"
+#: ajax/upload.php:120 ajax/upload.php:143
+msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:127
+#: ajax/upload.php:136
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
+
+#: ajax/upload.php:160
msgid "Invalid directory."
msgstr "Direktori tidak valid."
@@ -86,141 +90,145 @@ msgstr "Direktori tidak valid."
msgid "Files"
msgstr "Berkas"
-#: js/file-upload.js:11
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Gagal mengunggah berkas Anda karena berupa direktori atau mempunyai ukuran 0 byte"
+#: js/file-upload.js:244
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
+msgstr ""
-#: js/file-upload.js:24
+#: js/file-upload.js:255
msgid "Not enough space available"
msgstr "Ruang penyimpanan tidak mencukupi"
-#: js/file-upload.js:64
+#: js/file-upload.js:322
msgid "Upload cancelled."
msgstr "Pengunggahan dibatalkan."
-#: js/file-upload.js:165
+#: js/file-upload.js:356
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:446
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Berkas sedang diunggah. Meninggalkan halaman ini akan membatalkan proses."
-#: js/file-upload.js:239
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr "URL tidak boleh kosong"
-#: js/file-upload.js:244 lib/app.php:53
+#: js/file-upload.js:525 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550
+#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545
msgid "Error"
msgstr "Galat"
-#: js/fileactions.js:116
+#: js/fileactions.js:119
msgid "Share"
msgstr "Bagikan"
-#: js/fileactions.js:126
+#: js/fileactions.js:131
msgid "Delete permanently"
msgstr "Hapus secara permanen"
-#: js/fileactions.js:192
+#: js/fileactions.js:197
msgid "Rename"
msgstr "Ubah nama"
-#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "Menunggu"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{new_name} sudah ada"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "ganti"
-#: js/filelist.js:307
+#: js/filelist.js:416
msgid "suggest name"
msgstr "sarankan nama"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "batalkan"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr "mengganti {new_name} dengan {old_name}"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "undo"
msgstr "urungkan"
-#: js/filelist.js:424 js/filelist.js:490 js/files.js:581
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
-#: js/filelist.js:425 js/filelist.js:491 js/files.js:587
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
-#: js/filelist.js:432
+#: js/filelist.js:541
msgid "{dirs} and {files}"
msgstr ""
-#: js/filelist.js:563
+#: js/filelist.js:731 js/filelist.js:769
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
-#: js/filelist.js:628
-msgid "files uploading"
-msgstr "berkas diunggah"
-
-#: js/files.js:52
+#: js/files.js:25
msgid "'.' is an invalid file name."
msgstr "'.' bukan nama berkas yang valid."
-#: js/files.js:56
+#: js/files.js:29
msgid "File name cannot be empty."
msgstr "Nama berkas tidak boleh kosong."
-#: js/files.js:64
+#: js/files.js:37
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Nama tidak valid, karakter '\\', '/', '<', '>', ':', '\"', '|', '?' dan '*' tidak diizinkan."
-#: js/files.js:78
+#: js/files.js:51
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr "Ruang penyimpanan Anda penuh, berkas tidak dapat diperbarui atau disinkronkan lagi!"
-#: js/files.js:82
+#: js/files.js:55
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Ruang penyimpanan hampir penuh ({usedSpacePercent}%)"
-#: js/files.js:94
+#: js/files.js:67
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
msgstr ""
-#: js/files.js:245
+#: js/files.js:296
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "Unduhan Anda sedang disiapkan. Prosesnya dapat berlangsung agak lama jika ukuran berkasnya besar."
-#: js/files.js:563 templates/index.php:69
+#: js/files.js:507 js/files.js:545
+msgid "Error moving file"
+msgstr ""
+
+#: js/files.js:558 templates/index.php:61
msgid "Name"
msgstr "Nama"
-#: js/files.js:564 templates/index.php:81
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "Ukuran"
-#: js/files.js:565 templates/index.php:83
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr "Dimodifikasi"
@@ -229,7 +237,7 @@ msgstr "Dimodifikasi"
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:11 templates/index.php:18
+#: lib/helper.php:11 templates/index.php:17
msgid "Upload"
msgstr "Unggah"
@@ -265,65 +273,65 @@ msgstr "Ukuran masukan maksimum untuk berkas ZIP"
msgid "Save"
msgstr "Simpan"
-#: templates/index.php:7
+#: templates/index.php:6
msgid "New"
msgstr "Baru"
-#: templates/index.php:10
+#: templates/index.php:9
msgid "Text file"
msgstr "Berkas teks"
-#: templates/index.php:12
+#: templates/index.php:11
msgid "Folder"
msgstr "Folder"
-#: templates/index.php:14
+#: templates/index.php:13
msgid "From link"
msgstr "Dari tautan"
-#: templates/index.php:41
+#: templates/index.php:33
msgid "Deleted files"
msgstr "Berkas yang dihapus"
-#: templates/index.php:46
+#: templates/index.php:39
msgid "Cancel upload"
msgstr "Batal pengunggahan"
-#: templates/index.php:52
+#: templates/index.php:45
msgid "You don’t have write permissions here."
msgstr "Anda tidak memiliki izin menulis di sini."
-#: templates/index.php:59
+#: templates/index.php:50
msgid "Nothing in here. Upload something!"
msgstr "Tidak ada apa-apa di sini. Unggah sesuatu!"
-#: templates/index.php:75
+#: templates/index.php:67
msgid "Download"
msgstr "Unduh"
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr "Batalkan berbagi"
-#: templates/index.php:94 templates/index.php:95
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "Hapus"
-#: templates/index.php:108
+#: templates/index.php:100
msgid "Upload too large"
msgstr "Yang diunggah terlalu besar"
-#: templates/index.php:110
+#: templates/index.php:102
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Berkas yang dicoba untuk diunggah melebihi ukuran maksimum pengunggahan berkas di server ini."
-#: templates/index.php:115
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr "Berkas sedang dipindai, silakan tunggu."
-#: templates/index.php:118
+#: templates/index.php:110
msgid "Current scanning"
msgstr "Yang sedang dipindai"
diff --git a/l10n/id/settings.po b/l10n/id/settings.po
index 5f0fefa325daa6d3c31e014294beab7a8d234f17..7f2ef31f5527d87ea05365834fdc28196657da0d 100644
--- a/l10n/id/settings.po
+++ b/l10n/id/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:45-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgid "Unable to load list from App Store"
msgstr "Tidak dapat memuat daftar dari App Store"
#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
-#: ajax/togglegroups.php:20
+#: ajax/togglegroups.php:20 changepassword/controller.php:55
msgid "Authentication error"
msgstr "Galat saat autentikasi"
@@ -84,6 +84,35 @@ msgstr "Tidak dapat menghapus pengguna dari grup %s"
msgid "Couldn't update app."
msgstr "Tidak dapat memperbarui aplikasi."
+#: changepassword/controller.php:20
+msgid "Wrong password"
+msgstr ""
+
+#: changepassword/controller.php:42
+msgid "No user supplied"
+msgstr ""
+
+#: changepassword/controller.php:74
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr ""
+
+#: changepassword/controller.php:79
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr ""
+
+#: changepassword/controller.php:87
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr ""
+
+#: changepassword/controller.php:92 changepassword/controller.php:103
+msgid "Unable to change password"
+msgstr ""
+
#: js/apps.js:43
msgid "Update to {appversion}"
msgstr "Perbarui ke {appversion}"
@@ -128,15 +157,15 @@ msgstr "Perbarui"
msgid "Updated"
msgstr "Diperbarui"
-#: js/personal.js:217
+#: js/personal.js:220
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:262
+#: js/personal.js:265
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:284
+#: js/personal.js:287
msgid "Saving..."
msgstr "Menyimpan..."
diff --git a/l10n/is/core.po b/l10n/is/core.po
index a9ac3082288d25ae014f0d3fbcbd30cb24ed3d93..f2fe78f0c1cc2c0218102237326277f77c24e026 100644
--- a/l10n/is/core.po
+++ b/l10n/is/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:33+0000\n"
+"POT-Creation-Date: 2013-09-22 12:55-0400\n"
+"PO-Revision-Date: 2013-09-20 15:01+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
@@ -191,55 +191,55 @@ msgstr "Desember"
msgid "Settings"
msgstr "Stillingar"
-#: js/js.js:853
+#: js/js.js:866
msgid "seconds ago"
msgstr "sek."
-#: js/js.js:854
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:855
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:856
+#: js/js.js:869
msgid "today"
msgstr "Ã dag"
-#: js/js.js:857
+#: js/js.js:870
msgid "yesterday"
msgstr "à gær"
-#: js/js.js:858
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:859
+#: js/js.js:872
msgid "last month"
msgstr "sÃðasta mánuði"
-#: js/js.js:860
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:861
+#: js/js.js:874
msgid "months ago"
msgstr "mánuðir sÃðan"
-#: js/js.js:862
+#: js/js.js:875
msgid "last year"
msgstr "sÃðasta ári"
-#: js/js.js:863
+#: js/js.js:876
msgid "years ago"
msgstr "einhverjum árum"
@@ -267,6 +267,46 @@ msgstr "Ã lagi"
msgid "Error loading message template: {error}"
msgstr ""
+#: js/oc-dialogs.js:347
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:367
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:376
+msgid "Cancel"
+msgstr "Hætta við"
+
+#: js/oc-dialogs.js:386
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:457
+msgid "Error loading file exists template"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/is/files.po b/l10n/is/files.po
index b5561e490042112115f0cbe1199f6e5b76df9eef..e53fa55a725da9f8186457b4410acd69b3b652d9 100644
--- a/l10n/is/files.po
+++ b/l10n/is/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:00+0000\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
@@ -74,11 +74,15 @@ msgstr "Tókst ekki að skrifa á disk"
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:109
-msgid "Upload failed"
+#: ajax/upload.php:120 ajax/upload.php:143
+msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:127
+#: ajax/upload.php:136
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
+
+#: ajax/upload.php:160
msgid "Invalid directory."
msgstr "Ógild mappa."
@@ -86,144 +90,148 @@ msgstr "Ógild mappa."
msgid "Files"
msgstr "Skrár"
-#: js/file-upload.js:11
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Innsending á skrá mistókst, hugsanlega sendir þú möppu eða skráin er 0 bæti."
+#: js/file-upload.js:244
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
+msgstr ""
-#: js/file-upload.js:24
+#: js/file-upload.js:255
msgid "Not enough space available"
msgstr "Ekki nægt pláss tiltækt"
-#: js/file-upload.js:64
+#: js/file-upload.js:322
msgid "Upload cancelled."
msgstr "Hætt við innsendingu."
-#: js/file-upload.js:165
+#: js/file-upload.js:356
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:446
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Innsending à gangi. Ef þú ferð af þessari sÃðu mun innsending misheppnast."
-#: js/file-upload.js:239
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr "Vefslóð má ekki vera tóm."
-#: js/file-upload.js:244 lib/app.php:53
+#: js/file-upload.js:525 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550
+#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545
msgid "Error"
msgstr "Villa"
-#: js/fileactions.js:116
+#: js/fileactions.js:119
msgid "Share"
msgstr "Deila"
-#: js/fileactions.js:126
+#: js/fileactions.js:131
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:192
+#: js/fileactions.js:197
msgid "Rename"
msgstr "Endurskýra"
-#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "BÃður"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{new_name} er þegar til"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "yfirskrifa"
-#: js/filelist.js:307
+#: js/filelist.js:416
msgid "suggest name"
msgstr "stinga upp á nafni"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "hætta við"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr "yfirskrifaði {new_name} með {old_name}"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "undo"
msgstr "afturkalla"
-#: js/filelist.js:424 js/filelist.js:490 js/files.js:581
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:425 js/filelist.js:491 js/files.js:587
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:432
+#: js/filelist.js:541
msgid "{dirs} and {files}"
msgstr ""
-#: js/filelist.js:563
+#: js/filelist.js:731 js/filelist.js:769
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:628
-msgid "files uploading"
-msgstr ""
-
-#: js/files.js:52
+#: js/files.js:25
msgid "'.' is an invalid file name."
msgstr "'.' er ekki leyfilegt nafn."
-#: js/files.js:56
+#: js/files.js:29
msgid "File name cannot be empty."
msgstr "Nafn skráar má ekki vera tómt"
-#: js/files.js:64
+#: js/files.js:37
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Ógilt nafn, táknin '\\', '/', '<', '>', ':', '\"', '|', '?' og '*' eru ekki leyfð."
-#: js/files.js:78
+#: js/files.js:51
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr ""
-#: js/files.js:82
+#: js/files.js:55
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:94
+#: js/files.js:67
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
msgstr ""
-#: js/files.js:245
+#: js/files.js:296
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/files.js:563 templates/index.php:69
+#: js/files.js:507 js/files.js:545
+msgid "Error moving file"
+msgstr ""
+
+#: js/files.js:558 templates/index.php:61
msgid "Name"
msgstr "Nafn"
-#: js/files.js:564 templates/index.php:81
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "Stærð"
-#: js/files.js:565 templates/index.php:83
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr "Breytt"
@@ -232,7 +240,7 @@ msgstr "Breytt"
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:11 templates/index.php:18
+#: lib/helper.php:11 templates/index.php:17
msgid "Upload"
msgstr "Senda inn"
@@ -268,65 +276,65 @@ msgstr "Hámarks inntaksstærð fyrir ZIP skrár"
msgid "Save"
msgstr "Vista"
-#: templates/index.php:7
+#: templates/index.php:6
msgid "New"
msgstr "Nýtt"
-#: templates/index.php:10
+#: templates/index.php:9
msgid "Text file"
msgstr "Texta skrá"
-#: templates/index.php:12
+#: templates/index.php:11
msgid "Folder"
msgstr "Mappa"
-#: templates/index.php:14
+#: templates/index.php:13
msgid "From link"
msgstr "Af tengli"
-#: templates/index.php:41
+#: templates/index.php:33
msgid "Deleted files"
msgstr ""
-#: templates/index.php:46
+#: templates/index.php:39
msgid "Cancel upload"
msgstr "Hætta við innsendingu"
-#: templates/index.php:52
+#: templates/index.php:45
msgid "You don’t have write permissions here."
msgstr ""
-#: templates/index.php:59
+#: templates/index.php:50
msgid "Nothing in here. Upload something!"
msgstr "Ekkert hér. Settu eitthvað inn!"
-#: templates/index.php:75
+#: templates/index.php:67
msgid "Download"
msgstr "Niðurhal"
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr "Hætta deilingu"
-#: templates/index.php:94 templates/index.php:95
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "Eyða"
-#: templates/index.php:108
+#: templates/index.php:100
msgid "Upload too large"
msgstr "Innsend skrá er of stór"
-#: templates/index.php:110
+#: templates/index.php:102
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Skrárnar sem þú ert að senda inn eru stærri en hámarks innsendingarstærð á þessum netþjóni."
-#: templates/index.php:115
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr "Verið er að skima skrár, vinsamlegast hinkraðu."
-#: templates/index.php:118
+#: templates/index.php:110
msgid "Current scanning"
msgstr "Er að skima"
diff --git a/l10n/is/settings.po b/l10n/is/settings.po
index f444914ef0d0a1e49d77659542e2cf7d8278c414..928b1480018805102dd75bf61f66b4d7b65cd425 100644
--- a/l10n/is/settings.po
+++ b/l10n/is/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:45-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
@@ -23,7 +23,7 @@ msgid "Unable to load list from App Store"
msgstr "Ekki tókst að hlaða lista frá forrita sÃðu"
#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
-#: ajax/togglegroups.php:20
+#: ajax/togglegroups.php:20 changepassword/controller.php:55
msgid "Authentication error"
msgstr "Villa við auðkenningu"
@@ -85,6 +85,35 @@ msgstr "Ekki tókst að fjarlægja notanda úr hópnum %s"
msgid "Couldn't update app."
msgstr ""
+#: changepassword/controller.php:20
+msgid "Wrong password"
+msgstr ""
+
+#: changepassword/controller.php:42
+msgid "No user supplied"
+msgstr ""
+
+#: changepassword/controller.php:74
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr ""
+
+#: changepassword/controller.php:79
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr ""
+
+#: changepassword/controller.php:87
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr ""
+
+#: changepassword/controller.php:92 changepassword/controller.php:103
+msgid "Unable to change password"
+msgstr ""
+
#: js/apps.js:43
msgid "Update to {appversion}"
msgstr ""
@@ -129,15 +158,15 @@ msgstr "Uppfæra"
msgid "Updated"
msgstr "Uppfært"
-#: js/personal.js:217
+#: js/personal.js:220
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:262
+#: js/personal.js:265
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:284
+#: js/personal.js:287
msgid "Saving..."
msgstr "Er að vista ..."
diff --git a/l10n/it/core.po b/l10n/it/core.po
index 10f3e72f5d7a00e7728ce2d2c479cf2ad9dd47f9..d587e959539042f7a14900a9f639534614edbad8 100644
--- a/l10n/it/core.po
+++ b/l10n/it/core.po
@@ -3,6 +3,7 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# nappo <leone@inventati.org>, 2013
# idetao <marcxosm@gmail.com>, 2013
# polxmod <paolo.velati@gmail.com>, 2013
# Vincenzo Reale <vinx.reale@gmail.com>, 2013
@@ -10,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:33+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-22 12:55-0400\n"
+"PO-Revision-Date: 2013-09-22 13:40+0000\n"
+"Last-Translator: nappo <leone@inventati.org>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -95,23 +96,23 @@ msgstr "Errore durante la rimozione di %s dai preferiti."
#: avatar/controller.php:62
msgid "No image or file provided"
-msgstr ""
+msgstr "Non è stata fornita alcun immagine o file"
#: avatar/controller.php:81
msgid "Unknown filetype"
-msgstr ""
+msgstr "Tipo di file sconosciuto"
#: avatar/controller.php:85
msgid "Invalid image"
-msgstr ""
+msgstr "Immagine non valida"
#: avatar/controller.php:115 avatar/controller.php:142
msgid "No temporary profile picture available, try again"
-msgstr ""
+msgstr "Nessuna immagine di profilo provvisoria disponibile, riprova"
#: avatar/controller.php:135
msgid "No crop data provided"
-msgstr ""
+msgstr "Dati di ritaglio non forniti"
#: js/config.php:32
msgid "Sunday"
@@ -193,55 +194,55 @@ msgstr "Dicembre"
msgid "Settings"
msgstr "Impostazioni"
-#: js/js.js:853
+#: js/js.js:866
msgid "seconds ago"
msgstr "secondi fa"
-#: js/js.js:854
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n minuto fa"
msgstr[1] "%n minuti fa"
-#: js/js.js:855
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n ora fa"
msgstr[1] "%n ore fa"
-#: js/js.js:856
+#: js/js.js:869
msgid "today"
msgstr "oggi"
-#: js/js.js:857
+#: js/js.js:870
msgid "yesterday"
msgstr "ieri"
-#: js/js.js:858
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n giorno fa"
msgstr[1] "%n giorni fa"
-#: js/js.js:859
+#: js/js.js:872
msgid "last month"
msgstr "mese scorso"
-#: js/js.js:860
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n mese fa"
msgstr[1] "%n mesi fa"
-#: js/js.js:861
+#: js/js.js:874
msgid "months ago"
msgstr "mesi fa"
-#: js/js.js:862
+#: js/js.js:875
msgid "last year"
msgstr "anno scorso"
-#: js/js.js:863
+#: js/js.js:876
msgid "years ago"
msgstr "anni fa"
@@ -251,7 +252,7 @@ msgstr "Scegli"
#: js/oc-dialogs.js:146
msgid "Error loading file picker template: {error}"
-msgstr ""
+msgstr "Errore nel caricamento del modello del selettore file: {error}"
#: js/oc-dialogs.js:172
msgid "Yes"
@@ -267,7 +268,47 @@ msgstr "Ok"
#: js/oc-dialogs.js:219
msgid "Error loading message template: {error}"
-msgstr ""
+msgstr "Errore nel caricamento del modello di messaggio: {error}"
+
+#: js/oc-dialogs.js:347
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] "{count} file in conflitto"
+msgstr[1] "{count} file in conflitto"
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr "Un conflitto tra file"
+
+#: js/oc-dialogs.js:367
+msgid "Which files do you want to keep?"
+msgstr "Quali file vuoi mantenere?"
+
+#: js/oc-dialogs.js:368
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr "Se selezioni entrambe le versioni, verrà aggiunto un numero al nome del file copiato."
+
+#: js/oc-dialogs.js:376
+msgid "Cancel"
+msgstr "Annulla"
+
+#: js/oc-dialogs.js:386
+msgid "Continue"
+msgstr "Continua"
+
+#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+msgid "(all selected)"
+msgstr "(tutti selezionati)"
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "({count} selected)"
+msgstr "({count} selezionati)"
+
+#: js/oc-dialogs.js:457
+msgid "Error loading file exists template"
+msgstr "Errore durante il caricamento del modello del file esistente"
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
diff --git a/l10n/it/files.po b/l10n/it/files.po
index b97ed259366acd5b96a26dea3b943d4e64df90d9..4711aa723a8fc7177aa443e5da5d1c033dc45739 100644
--- a/l10n/it/files.po
+++ b/l10n/it/files.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:00+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"POT-Creation-Date: 2013-09-22 12:51-0400\n"
+"PO-Revision-Date: 2013-09-21 17:50+0000\n"
+"Last-Translator: polxmod <paolo.velati@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -76,156 +76,164 @@ msgstr "Scrittura su disco non riuscita"
msgid "Not enough storage available"
msgstr "Spazio di archiviazione insufficiente"
-#: ajax/upload.php:109
-msgid "Upload failed"
-msgstr "Caricamento non riuscito"
+#: ajax/upload.php:120 ajax/upload.php:143
+msgid "Upload failed. Could not get file info."
+msgstr "Upload fallito. Impossibile ottenere informazioni sul file"
-#: ajax/upload.php:127
+#: ajax/upload.php:136
+msgid "Upload failed. Could not find uploaded file"
+msgstr "Upload fallit. Impossibile trovare file caricato"
+
+#: ajax/upload.php:160
msgid "Invalid directory."
msgstr "Cartella non valida."
-#: appinfo/app.php:12
+#: appinfo/app.php:11
msgid "Files"
msgstr "File"
-#: js/file-upload.js:11
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Impossibile caricare il file poiché è una cartella o ha una dimensione di 0 byte"
+#: js/file-upload.js:244
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
+msgstr "Impossibile caricare {filename} poiché è una cartella oppure è di 0 byte"
-#: js/file-upload.js:24
+#: js/file-upload.js:255
msgid "Not enough space available"
msgstr "Spazio disponibile insufficiente"
-#: js/file-upload.js:64
+#: js/file-upload.js:322
msgid "Upload cancelled."
msgstr "Invio annullato"
-#: js/file-upload.js:165
+#: js/file-upload.js:356
+msgid "Could not get result from server."
+msgstr "Impossibile ottenere il risultato dal server."
+
+#: js/file-upload.js:446
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Caricamento del file in corso. La chiusura della pagina annullerà il caricamento."
-#: js/file-upload.js:239
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr "L'URL non può essere vuoto."
-#: js/file-upload.js:244 lib/app.php:53
+#: js/file-upload.js:525 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr "Nome della cartella non valido. L'uso di 'Shared' è riservato a ownCloud"
-#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550
+#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545
msgid "Error"
msgstr "Errore"
-#: js/fileactions.js:116
+#: js/fileactions.js:119
msgid "Share"
msgstr "Condividi"
-#: js/fileactions.js:126
+#: js/fileactions.js:131
msgid "Delete permanently"
msgstr "Elimina definitivamente"
-#: js/fileactions.js:192
+#: js/fileactions.js:197
msgid "Rename"
msgstr "Rinomina"
-#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "In corso"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{new_name} esiste già "
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "sostituisci"
-#: js/filelist.js:307
+#: js/filelist.js:416
msgid "suggest name"
msgstr "suggerisci nome"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "annulla"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr "sostituito {new_name} con {old_name}"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "undo"
msgstr "annulla"
-#: js/filelist.js:424 js/filelist.js:490 js/files.js:581
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "%n cartella"
msgstr[1] "%n cartelle"
-#: js/filelist.js:425 js/filelist.js:491 js/files.js:587
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "%n file"
msgstr[1] "%n file"
-#: js/filelist.js:432
+#: js/filelist.js:541
msgid "{dirs} and {files}"
msgstr "{dirs} e {files}"
-#: js/filelist.js:563
+#: js/filelist.js:731 js/filelist.js:769
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "Caricamento di %n file in corso"
msgstr[1] "Caricamento di %n file in corso"
-#: js/filelist.js:628
-msgid "files uploading"
-msgstr "caricamento file"
-
-#: js/files.js:52
+#: js/files.js:25
msgid "'.' is an invalid file name."
msgstr "'.' non è un nome file valido."
-#: js/files.js:56
+#: js/files.js:29
msgid "File name cannot be empty."
msgstr "Il nome del file non può essere vuoto."
-#: js/files.js:64
+#: js/files.js:37
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Nome non valido, '\\', '/', '<', '>', ':', '\"', '|', '?' e '*' non sono consentiti."
-#: js/files.js:78
+#: js/files.js:51
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr "Lo spazio di archiviazione è pieno, i file non possono essere più aggiornati o sincronizzati!"
-#: js/files.js:82
+#: js/files.js:55
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Lo spazio di archiviazione è quasi pieno ({usedSpacePercent}%)"
-#: js/files.js:94
+#: js/files.js:67
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
msgstr "La cifratura è stata disabilitata ma i tuoi file sono ancora cifrati. Vai nelle impostazioni personali per decifrare i file."
-#: js/files.js:245
+#: js/files.js:296
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "Il tuo scaricamento è in fase di preparazione. Ciò potrebbe richiedere del tempo se i file sono grandi."
-#: js/files.js:563 templates/index.php:69
+#: js/files.js:507 js/files.js:545
+msgid "Error moving file"
+msgstr "Errore durante lo spostamento del file"
+
+#: js/files.js:558 templates/index.php:61
msgid "Name"
msgstr "Nome"
-#: js/files.js:564 templates/index.php:81
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "Dimensione"
-#: js/files.js:565 templates/index.php:83
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr "Modificato"
@@ -234,7 +242,7 @@ msgstr "Modificato"
msgid "%s could not be renamed"
msgstr "%s non può essere rinominato"
-#: lib/helper.php:11 templates/index.php:18
+#: lib/helper.php:11 templates/index.php:17
msgid "Upload"
msgstr "Carica"
@@ -270,65 +278,65 @@ msgstr "Dimensione massima per i file ZIP"
msgid "Save"
msgstr "Salva"
-#: templates/index.php:7
+#: templates/index.php:6
msgid "New"
msgstr "Nuovo"
-#: templates/index.php:10
+#: templates/index.php:9
msgid "Text file"
msgstr "File di testo"
-#: templates/index.php:12
+#: templates/index.php:11
msgid "Folder"
msgstr "Cartella"
-#: templates/index.php:14
+#: templates/index.php:13
msgid "From link"
msgstr "Da collegamento"
-#: templates/index.php:41
+#: templates/index.php:33
msgid "Deleted files"
msgstr "File eliminati"
-#: templates/index.php:46
+#: templates/index.php:39
msgid "Cancel upload"
msgstr "Annulla invio"
-#: templates/index.php:52
+#: templates/index.php:45
msgid "You don’t have write permissions here."
msgstr "Qui non hai i permessi di scrittura."
-#: templates/index.php:59
+#: templates/index.php:50
msgid "Nothing in here. Upload something!"
msgstr "Non c'è niente qui. Carica qualcosa!"
-#: templates/index.php:75
+#: templates/index.php:67
msgid "Download"
msgstr "Scarica"
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr "Rimuovi condivisione"
-#: templates/index.php:94 templates/index.php:95
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "Elimina"
-#: templates/index.php:108
+#: templates/index.php:100
msgid "Upload too large"
msgstr "Caricamento troppo grande"
-#: templates/index.php:110
+#: templates/index.php:102
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "I file che stai provando a caricare superano la dimensione massima consentita su questo server."
-#: templates/index.php:115
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr "Scansione dei file in corso, attendi"
-#: templates/index.php:118
+#: templates/index.php:110
msgid "Current scanning"
msgstr "Scansione corrente"
diff --git a/l10n/it/lib.po b/l10n/it/lib.po
index 2fa3217657f64a7ab1556e5a41a94b9a6d4a86f9..27b7c76e85e1ba49620f6c453fc9b39281adc9f3 100644
--- a/l10n/it/lib.po
+++ b/l10n/it/lib.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-20 10:45-0400\n"
+"PO-Revision-Date: 2013-09-19 05:50+0000\n"
+"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -58,15 +58,15 @@ msgstr "Aggiornamento non riuscito \"%s\"."
#: avatar.php:56
msgid "Custom profile pictures don't work with encryption yet"
-msgstr ""
+msgstr "Le immagini personalizzate del profilo non funzionano ancora con la cifratura"
#: avatar.php:64
msgid "Unknown filetype"
-msgstr ""
+msgstr "Tipo di file sconosciuto"
#: avatar.php:69
msgid "Invalid image"
-msgstr ""
+msgstr "Immagine non valida"
#: defaults.php:35
msgid "web services under your control"
@@ -167,15 +167,15 @@ msgstr "Errore di autenticazione"
msgid "Token expired. Please reload page."
msgstr "Token scaduto. Ricarica la pagina."
-#: search/provider/file.php:17 search/provider/file.php:35
+#: search/provider/file.php:18 search/provider/file.php:36
msgid "Files"
msgstr "File"
-#: search/provider/file.php:26 search/provider/file.php:33
+#: search/provider/file.php:27 search/provider/file.php:34
msgid "Text"
msgstr "Testo"
-#: search/provider/file.php:29
+#: search/provider/file.php:30
msgid "Images"
msgstr "Immagini"
diff --git a/l10n/it/settings.po b/l10n/it/settings.po
index cb888134db5f9224a414545142d6f162e87dacd9..0e5f28a4d151641520d1ba2fb623a8a164e304b3 100644
--- a/l10n/it/settings.po
+++ b/l10n/it/settings.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:45-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgid "Unable to load list from App Store"
msgstr "Impossibile caricare l'elenco dall'App Store"
#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
-#: ajax/togglegroups.php:20
+#: ajax/togglegroups.php:20 changepassword/controller.php:55
msgid "Authentication error"
msgstr "Errore di autenticazione"
@@ -88,6 +88,35 @@ msgstr "Impossibile rimuovere l'utente dal gruppo %s"
msgid "Couldn't update app."
msgstr "Impossibile aggiornate l'applicazione."
+#: changepassword/controller.php:20
+msgid "Wrong password"
+msgstr "Password errata"
+
+#: changepassword/controller.php:42
+msgid "No user supplied"
+msgstr "Non è stato fornito alcun utente"
+
+#: changepassword/controller.php:74
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr "Fornisci una password amministrativa di ripristino altrimenti tutti i dati degli utenti saranno persi."
+
+#: changepassword/controller.php:79
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr "Password amministrativa di ripristino errata. Controlla la password e prova ancora."
+
+#: changepassword/controller.php:87
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr "Il motore non supporta la modifica della password, ma la chiave di cifratura dell'utente è stata aggiornata correttamente."
+
+#: changepassword/controller.php:92 changepassword/controller.php:103
+msgid "Unable to change password"
+msgstr "Impossibile cambiare la password"
+
#: js/apps.js:43
msgid "Update to {appversion}"
msgstr "Aggiorna a {appversion}"
@@ -132,15 +161,15 @@ msgstr "Aggiorna"
msgid "Updated"
msgstr "Aggiornato"
-#: js/personal.js:217
+#: js/personal.js:220
msgid "Select a profile picture"
-msgstr ""
+msgstr "Seleziona un'immagine del profilo"
-#: js/personal.js:262
+#: js/personal.js:265
msgid "Decrypting files... Please wait, this can take some time."
msgstr "Decifratura dei file in corso... Attendi, potrebbe richiedere del tempo."
-#: js/personal.js:284
+#: js/personal.js:287
msgid "Saving..."
msgstr "Salvataggio in corso..."
@@ -464,31 +493,31 @@ msgstr "Inserisci il tuo indirizzo email per abilitare il recupero della passwor
#: templates/personal.php:86
msgid "Profile picture"
-msgstr ""
+msgstr "Immagine del profilo"
#: templates/personal.php:90
msgid "Upload new"
-msgstr ""
+msgstr "Carica nuova"
#: templates/personal.php:92
msgid "Select new from Files"
-msgstr ""
+msgstr "Seleziona nuova da file"
#: templates/personal.php:93
msgid "Remove image"
-msgstr ""
+msgstr "Rimuovi immagine"
#: templates/personal.php:94
msgid "Either png or jpg. Ideally square but you will be able to crop it."
-msgstr ""
+msgstr "Sia png che jpg. Preferibilmente quadrata, ma potrai ritagliarla."
#: templates/personal.php:97
msgid "Abort"
-msgstr ""
+msgstr "Interrompi"
#: templates/personal.php:98
msgid "Choose as profile image"
-msgstr ""
+msgstr "Scegli come immagine del profilo"
#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
diff --git a/l10n/ja_JP/core.po b/l10n/ja_JP/core.po
index b9f05311701ae6b19b93a77151615815e895f669..0e8b19b17e312d2533ec78a819741644ecb4d510 100644
--- a/l10n/ja_JP/core.po
+++ b/l10n/ja_JP/core.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:33+0000\n"
+"POT-Creation-Date: 2013-09-22 12:55-0400\n"
+"PO-Revision-Date: 2013-09-20 15:01+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
@@ -96,19 +96,19 @@ msgstr "ãŠæ°—ã«å…¥ã‚Šã‹ã‚‰ %s ã®å‰Šé™¤ã‚¨ãƒ©ãƒ¼"
#: avatar/controller.php:62
msgid "No image or file provided"
-msgstr ""
+msgstr "ç”»åƒã‚‚ã—ãã¯ãƒ•ã‚¡ã‚¤ãƒ«ãŒæä¾›ã•ã‚Œã¦ã„ã¾ã›ã‚“"
#: avatar/controller.php:81
msgid "Unknown filetype"
-msgstr ""
+msgstr "ä¸æ˜Žãªãƒ•ã‚¡ã‚¤ãƒ«ã‚¿ã‚¤ãƒ—"
#: avatar/controller.php:85
msgid "Invalid image"
-msgstr ""
+msgstr "無効ãªç”»åƒ"
#: avatar/controller.php:115 avatar/controller.php:142
msgid "No temporary profile picture available, try again"
-msgstr ""
+msgstr "一時的ãªãƒ—ãƒãƒ•ã‚¡ã‚¤ãƒ«ç”¨ç”»åƒãŒåˆ©ç”¨ã§ãã¾ã›ã‚“。もã†ä¸€åº¦è©¦ã—ã¦ä¸‹ã•ã„"
#: avatar/controller.php:135
msgid "No crop data provided"
@@ -194,51 +194,51 @@ msgstr "12月"
msgid "Settings"
msgstr "è¨å®š"
-#: js/js.js:853
+#: js/js.js:866
msgid "seconds ago"
msgstr "数秒å‰"
-#: js/js.js:854
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n 分å‰"
-#: js/js.js:855
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n 時間後"
-#: js/js.js:856
+#: js/js.js:869
msgid "today"
msgstr "今日"
-#: js/js.js:857
+#: js/js.js:870
msgid "yesterday"
msgstr "昨日"
-#: js/js.js:858
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n 日後"
-#: js/js.js:859
+#: js/js.js:872
msgid "last month"
msgstr "一月å‰"
-#: js/js.js:860
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n カ月後"
-#: js/js.js:861
+#: js/js.js:874
msgid "months ago"
msgstr "月å‰"
-#: js/js.js:862
+#: js/js.js:875
msgid "last year"
msgstr "一年å‰"
-#: js/js.js:863
+#: js/js.js:876
msgid "years ago"
msgstr "å¹´å‰"
@@ -248,7 +248,7 @@ msgstr "é¸æŠž"
#: js/oc-dialogs.js:146
msgid "Error loading file picker template: {error}"
-msgstr ""
+msgstr "ファイルé¸æŠžãƒ†ãƒ³ãƒ—レートã®èªã¿è¾¼ã¿ã‚¨ãƒ©ãƒ¼: {error}"
#: js/oc-dialogs.js:172
msgid "Yes"
@@ -264,6 +264,45 @@ msgstr "OK"
#: js/oc-dialogs.js:219
msgid "Error loading message template: {error}"
+msgstr "メッセージテンプレートã®èªã¿è¾¼ã¿ã‚¨ãƒ©ãƒ¼: {error}"
+
+#: js/oc-dialogs.js:347
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:367
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:376
+msgid "Cancel"
+msgstr "ã‚ャンセル"
+
+#: js/oc-dialogs.js:386
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:457
+msgid "Error loading file exists template"
msgstr ""
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
diff --git a/l10n/ja_JP/files.po b/l10n/ja_JP/files.po
index bcb42ff87e3f57768f13ff12b5ea76121f475f3e..b712c8b95a9d2d506226485360c7ce5e9d8b68ba 100644
--- a/l10n/ja_JP/files.po
+++ b/l10n/ja_JP/files.po
@@ -12,9 +12,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:00+0000\n"
-"Last-Translator: tt yn <tetuyano+transi@gmail.com>\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -79,11 +79,15 @@ msgstr "ディスクã¸ã®æ›¸ãè¾¼ã¿ã«å¤±æ•—ã—ã¾ã—ãŸ"
msgid "Not enough storage available"
msgstr "ストレージã«å分ãªç©ºã容é‡ãŒã‚ã‚Šã¾ã›ã‚“"
-#: ajax/upload.php:109
-msgid "Upload failed"
-msgstr "アップãƒãƒ¼ãƒ‰ã«å¤±æ•—"
+#: ajax/upload.php:120 ajax/upload.php:143
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:136
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
-#: ajax/upload.php:127
+#: ajax/upload.php:160
msgid "Invalid directory."
msgstr "無効ãªãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã§ã™ã€‚"
@@ -91,141 +95,145 @@ msgstr "無効ãªãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã§ã™ã€‚"
msgid "Files"
msgstr "ファイル"
-#: js/file-upload.js:11
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "ディレクトリもã—ãã¯0ãƒã‚¤ãƒˆã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ã§ãã¾ã›ã‚“"
+#: js/file-upload.js:244
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
+msgstr ""
-#: js/file-upload.js:24
+#: js/file-upload.js:255
msgid "Not enough space available"
msgstr "利用å¯èƒ½ãªã‚¹ãƒšãƒ¼ã‚¹ãŒå分ã«ã‚ã‚Šã¾ã›ã‚“"
-#: js/file-upload.js:64
+#: js/file-upload.js:322
msgid "Upload cancelled."
msgstr "アップãƒãƒ¼ãƒ‰ã¯ã‚ャンセルã•ã‚Œã¾ã—ãŸã€‚"
-#: js/file-upload.js:165
+#: js/file-upload.js:356
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:446
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "ファイル転é€ã‚’実行ä¸ã§ã™ã€‚今ã“ã®ãƒšãƒ¼ã‚¸ã‹ã‚‰ç§»å‹•ã™ã‚‹ã¨ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ãŒä¸æ¢ã•ã‚Œã¾ã™ã€‚"
-#: js/file-upload.js:239
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr "URLã¯ç©ºã«ã§ãã¾ã›ã‚“。"
-#: js/file-upload.js:244 lib/app.php:53
+#: js/file-upload.js:525 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr "無効ãªãƒ•ã‚©ãƒ«ãƒ€åã§ã™ã€‚'Shared' ã®åˆ©ç”¨ã¯ownCloudã§äºˆç´„済ã¿ã§ã™"
-#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550
+#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545
msgid "Error"
msgstr "エラー"
-#: js/fileactions.js:116
+#: js/fileactions.js:119
msgid "Share"
msgstr "共有"
-#: js/fileactions.js:126
+#: js/fileactions.js:131
msgid "Delete permanently"
msgstr "完全ã«å‰Šé™¤ã™ã‚‹"
-#: js/fileactions.js:192
+#: js/fileactions.js:197
msgid "Rename"
msgstr "åå‰ã®å¤‰æ›´"
-#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "ä¸æ–"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{new_name} ã¯ã™ã§ã«å˜åœ¨ã—ã¦ã„ã¾ã™"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "ç½®ãæ›ãˆ"
-#: js/filelist.js:307
+#: js/filelist.js:416
msgid "suggest name"
msgstr "推奨å称"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "ã‚ャンセル"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr "{old_name} ã‚’ {new_name} ã«ç½®æ›"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "undo"
msgstr "å…ƒã«æˆ»ã™"
-#: js/filelist.js:424 js/filelist.js:490 js/files.js:581
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "%n個ã®ãƒ•ã‚©ãƒ«ãƒ€"
-#: js/filelist.js:425 js/filelist.js:491 js/files.js:587
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "%n個ã®ãƒ•ã‚¡ã‚¤ãƒ«"
-#: js/filelist.js:432
+#: js/filelist.js:541
msgid "{dirs} and {files}"
msgstr "{dirs} 㨠{files}"
-#: js/filelist.js:563
+#: js/filelist.js:731 js/filelist.js:769
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "%n 個ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’アップãƒãƒ¼ãƒ‰ä¸"
-#: js/filelist.js:628
-msgid "files uploading"
-msgstr "ファイルをアップãƒãƒ¼ãƒ‰ä¸"
-
-#: js/files.js:52
+#: js/files.js:25
msgid "'.' is an invalid file name."
msgstr "'.' ã¯ç„¡åŠ¹ãªãƒ•ã‚¡ã‚¤ãƒ«åã§ã™ã€‚"
-#: js/files.js:56
+#: js/files.js:29
msgid "File name cannot be empty."
msgstr "ファイルåを空ã«ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“。"
-#: js/files.js:64
+#: js/files.js:37
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "無効ãªåå‰ã€'\\', '/', '<', '>', ':', '\"', '|', '?', '*' ã¯ä½¿ç”¨ã§ãã¾ã›ã‚“。"
-#: js/files.js:78
+#: js/files.js:51
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr "ã‚ãªãŸã®ã‚¹ãƒˆãƒ¬ãƒ¼ã‚¸ã¯ä¸€æ¯ã§ã™ã€‚ファイルã®æ›´æ–°ã¨åŒæœŸã¯ã‚‚ã†ã§ãã¾ã›ã‚“ï¼"
-#: js/files.js:82
+#: js/files.js:55
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "ã‚ãªãŸã®ã‚¹ãƒˆãƒ¬ãƒ¼ã‚¸ã¯ã»ã¼ä¸€æ¯ã§ã™ï¼ˆ{usedSpacePercent}%）"
-#: js/files.js:94
+#: js/files.js:67
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
msgstr "æš—å·åŒ–ã®æ©Ÿèƒ½ã¯ç„¡åŠ¹åŒ–ã•ã‚Œã¾ã—ãŸãŒã€ãƒ•ã‚¡ã‚¤ãƒ«ã¯ã™ã§ã«æš—å·åŒ–ã•ã‚Œã¦ã„ã¾ã™ã€‚個人è¨å®šã‹ã‚‰ãƒ•ã‚¡ã‚¤ãƒ«ã‚’複åˆã‚’è¡Œã£ã¦ãã ã•ã„。"
-#: js/files.js:245
+#: js/files.js:296
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "ダウンãƒãƒ¼ãƒ‰ã®æº–å‚™ä¸ã§ã™ã€‚ファイルサイズãŒå¤§ãã„å ´åˆã¯å°‘ã—時間ãŒã‹ã‹ã‚‹ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“。"
-#: js/files.js:563 templates/index.php:69
+#: js/files.js:507 js/files.js:545
+msgid "Error moving file"
+msgstr ""
+
+#: js/files.js:558 templates/index.php:61
msgid "Name"
msgstr "åå‰"
-#: js/files.js:564 templates/index.php:81
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "サイズ"
-#: js/files.js:565 templates/index.php:83
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr "変更"
@@ -234,7 +242,7 @@ msgstr "変更"
msgid "%s could not be renamed"
msgstr "%sã®åå‰ã‚’変更ã§ãã¾ã›ã‚“ã§ã—ãŸ"
-#: lib/helper.php:11 templates/index.php:18
+#: lib/helper.php:11 templates/index.php:17
msgid "Upload"
msgstr "アップãƒãƒ¼ãƒ‰"
@@ -270,65 +278,65 @@ msgstr "ZIPファイルã¸ã®æœ€å¤§å…¥åŠ›ã‚µã‚¤ã‚º"
msgid "Save"
msgstr "ä¿å˜"
-#: templates/index.php:7
+#: templates/index.php:6
msgid "New"
msgstr "æ–°è¦ä½œæˆ"
-#: templates/index.php:10
+#: templates/index.php:9
msgid "Text file"
msgstr "テã‚ストファイル"
-#: templates/index.php:12
+#: templates/index.php:11
msgid "Folder"
msgstr "フォルダ"
-#: templates/index.php:14
+#: templates/index.php:13
msgid "From link"
msgstr "リンク"
-#: templates/index.php:41
+#: templates/index.php:33
msgid "Deleted files"
msgstr "削除ファイル"
-#: templates/index.php:46
+#: templates/index.php:39
msgid "Cancel upload"
msgstr "アップãƒãƒ¼ãƒ‰ã‚’ã‚ャンセル"
-#: templates/index.php:52
+#: templates/index.php:45
msgid "You don’t have write permissions here."
msgstr "ã‚ãªãŸã«ã¯æ›¸ãè¾¼ã¿æ¨©é™ãŒã‚ã‚Šã¾ã›ã‚“。"
-#: templates/index.php:59
+#: templates/index.php:50
msgid "Nothing in here. Upload something!"
msgstr "ã“ã“ã«ã¯ä½•ã‚‚ã‚ã‚Šã¾ã›ã‚“。何ã‹ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ã—ã¦ãã ã•ã„。"
-#: templates/index.php:75
+#: templates/index.php:67
msgid "Download"
msgstr "ダウンãƒãƒ¼ãƒ‰"
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr "共有解除"
-#: templates/index.php:94 templates/index.php:95
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "削除"
-#: templates/index.php:108
+#: templates/index.php:100
msgid "Upload too large"
msgstr "アップãƒãƒ¼ãƒ‰ã«ã¯å¤§ãã™ãŽã¾ã™ã€‚"
-#: templates/index.php:110
+#: templates/index.php:102
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "アップãƒãƒ¼ãƒ‰ã—よã†ã¨ã—ã¦ã„るファイルã¯ã€ã‚µãƒ¼ãƒã§è¦å®šã•ã‚ŒãŸæœ€å¤§ã‚µã‚¤ã‚ºã‚’超ãˆã¦ã„ã¾ã™ã€‚"
-#: templates/index.php:115
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr "ファイルをスã‚ャンã—ã¦ã„ã¾ã™ã€ã—ã°ã‚‰ããŠå¾…ã¡ãã ã•ã„。"
-#: templates/index.php:118
+#: templates/index.php:110
msgid "Current scanning"
msgstr "スã‚ャンä¸"
diff --git a/l10n/ja_JP/lib.po b/l10n/ja_JP/lib.po
index c910ea9099386bf8072c93865df270a2f2dfd673..6b0484f521d94f4656e0dc090bf73e87a1641d02 100644
--- a/l10n/ja_JP/lib.po
+++ b/l10n/ja_JP/lib.po
@@ -3,6 +3,7 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2013
# plazmism <gomidori@live.jp>, 2013
# Koichi MATSUMOTO <mzch@me.com>, 2013
# tt yn <tetuyano+transi@gmail.com>, 2013
@@ -10,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-22 12:56-0400\n"
+"PO-Revision-Date: 2013-09-21 13:50+0000\n"
+"Last-Translator: tt yn <tetuyano+transi@gmail.com>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -58,15 +59,15 @@ msgstr "\"%s\" ã¸ã®ã‚¢ãƒƒãƒ—グレードã«å¤±æ•—ã—ã¾ã—ãŸã€‚"
#: avatar.php:56
msgid "Custom profile pictures don't work with encryption yet"
-msgstr ""
+msgstr "æš—å·ç„¡ã—ã§ã¯åˆ©ç”¨ä¸å¯ãªã‚«ã‚¹ã‚¿ãƒ プãƒãƒ•ã‚£ãƒ¼ãƒ«ç”»åƒ"
#: avatar.php:64
msgid "Unknown filetype"
-msgstr ""
+msgstr "ä¸æ˜Žãªãƒ•ã‚¡ã‚¤ãƒ«ã‚¿ã‚¤ãƒ—"
#: avatar.php:69
msgid "Invalid image"
-msgstr ""
+msgstr "無効ãªç”»åƒ"
#: defaults.php:35
msgid "web services under your control"
@@ -167,15 +168,15 @@ msgstr "èªè¨¼ã‚¨ãƒ©ãƒ¼"
msgid "Token expired. Please reload page."
msgstr "トークンãŒç„¡åŠ¹ã«ãªã‚Šã¾ã—ãŸã€‚ページをå†èªè¾¼ã—ã¦ãã ã•ã„。"
-#: search/provider/file.php:17 search/provider/file.php:35
+#: search/provider/file.php:18 search/provider/file.php:36
msgid "Files"
msgstr "ファイル"
-#: search/provider/file.php:26 search/provider/file.php:33
+#: search/provider/file.php:27 search/provider/file.php:34
msgid "Text"
msgstr "TTY TDD"
-#: search/provider/file.php:29
+#: search/provider/file.php:30
msgid "Images"
msgstr "ç”»åƒ"
diff --git a/l10n/ja_JP/settings.po b/l10n/ja_JP/settings.po
index b0dd14f55848f0fc87d4e36bc06959ba504e54a1..c9851b54dea5c54a55ea9fe780ed35aacbb7d7e3 100644
--- a/l10n/ja_JP/settings.po
+++ b/l10n/ja_JP/settings.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:45-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
@@ -25,7 +25,7 @@ msgid "Unable to load list from App Store"
msgstr "アプリストアã‹ã‚‰ãƒªã‚¹ãƒˆã‚’ãƒãƒ¼ãƒ‰ã§ãã¾ã›ã‚“"
#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
-#: ajax/togglegroups.php:20
+#: ajax/togglegroups.php:20 changepassword/controller.php:55
msgid "Authentication error"
msgstr "èªè¨¼ã‚¨ãƒ©ãƒ¼"
@@ -87,6 +87,35 @@ msgstr "ユーザをグループ %s ã‹ã‚‰å‰Šé™¤ã§ãã¾ã›ã‚“"
msgid "Couldn't update app."
msgstr "アプリを更新出æ¥ã¾ã›ã‚“ã§ã—ãŸã€‚"
+#: changepassword/controller.php:20
+msgid "Wrong password"
+msgstr ""
+
+#: changepassword/controller.php:42
+msgid "No user supplied"
+msgstr ""
+
+#: changepassword/controller.php:74
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr ""
+
+#: changepassword/controller.php:79
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr ""
+
+#: changepassword/controller.php:87
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr ""
+
+#: changepassword/controller.php:92 changepassword/controller.php:103
+msgid "Unable to change password"
+msgstr ""
+
#: js/apps.js:43
msgid "Update to {appversion}"
msgstr "{appversion} ã«æ›´æ–°"
@@ -131,15 +160,15 @@ msgstr "æ›´æ–°"
msgid "Updated"
msgstr "更新済ã¿"
-#: js/personal.js:217
+#: js/personal.js:220
msgid "Select a profile picture"
-msgstr ""
+msgstr "プãƒãƒ•ã‚¡ã‚¤ãƒ«ç”»åƒã‚’é¸æŠž"
-#: js/personal.js:262
+#: js/personal.js:265
msgid "Decrypting files... Please wait, this can take some time."
msgstr "ファイルを複åˆä¸... ã—ã°ã‚‰ããŠå¾…ã¡ãã ã•ã„ã€ã“ã®å‡¦ç†ã«ã¯å°‘ã—時間ãŒã‹ã‹ã‚‹ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“。"
-#: js/personal.js:284
+#: js/personal.js:287
msgid "Saving..."
msgstr "ä¿å˜ä¸..."
@@ -463,7 +492,7 @@ msgstr "※パスワード回復を有効ã«ã™ã‚‹ã«ã¯ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ã®
#: templates/personal.php:86
msgid "Profile picture"
-msgstr ""
+msgstr "プãƒãƒ•ã‚£ãƒ¼ãƒ«å†™çœŸ"
#: templates/personal.php:90
msgid "Upload new"
@@ -475,7 +504,7 @@ msgstr ""
#: templates/personal.php:93
msgid "Remove image"
-msgstr ""
+msgstr "ç”»åƒã‚’削除"
#: templates/personal.php:94
msgid "Either png or jpg. Ideally square but you will be able to crop it."
@@ -483,11 +512,11 @@ msgstr ""
#: templates/personal.php:97
msgid "Abort"
-msgstr ""
+msgstr "ä¸æ¢"
#: templates/personal.php:98
msgid "Choose as profile image"
-msgstr ""
+msgstr "プãƒãƒ•ã‚¡ã‚¤ãƒ«ç”»åƒã¨ã—ã¦é¸æŠž"
#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
diff --git a/l10n/ka/core.po b/l10n/ka/core.po
index 90fa5a82e67fed35081fb9508702314ae9a01300..e6a62126ccca6d15123b24a2be3797f35cbc1af0 100644
--- a/l10n/ka/core.po
+++ b/l10n/ka/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:33+0000\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
"MIME-Version: 1.0\n"
@@ -190,51 +190,51 @@ msgstr ""
msgid "Settings"
msgstr ""
-#: js/js.js:853
+#: js/js.js:866
msgid "seconds ago"
msgstr "წáƒáƒ›áƒ˜áƒ¡ წინ"
-#: js/js.js:854
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: js/js.js:855
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: js/js.js:856
+#: js/js.js:869
msgid "today"
msgstr "დღეს"
-#: js/js.js:857
+#: js/js.js:870
msgid "yesterday"
msgstr "გუშინ"
-#: js/js.js:858
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
-#: js/js.js:859
+#: js/js.js:872
msgid "last month"
msgstr ""
-#: js/js.js:860
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: js/js.js:861
+#: js/js.js:874
msgid "months ago"
msgstr ""
-#: js/js.js:862
+#: js/js.js:875
msgid "last year"
msgstr ""
-#: js/js.js:863
+#: js/js.js:876
msgid "years ago"
msgstr ""
@@ -262,6 +262,45 @@ msgstr ""
msgid "Error loading message template: {error}"
msgstr ""
+#: js/oc-dialogs.js:347
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:367
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:376
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:386
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:457
+msgid "Error loading file exists template"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/ka/files.po b/l10n/ka/files.po
index 8189ecec47028ccd45a988dc48215b1a5ac43dda..84143c9cd2adf7a506c212df82eb35f8b2efdc53 100644
--- a/l10n/ka/files.po
+++ b/l10n/ka/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-30 09:31-0400\n"
-"PO-Revision-Date: 2013-08-30 13:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
"MIME-Version: 1.0\n"
@@ -74,11 +74,15 @@ msgstr ""
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:109
-msgid "Upload failed"
+#: ajax/upload.php:120 ajax/upload.php:143
+msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:127
+#: ajax/upload.php:136
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
+
+#: ajax/upload.php:160
msgid "Invalid directory."
msgstr ""
@@ -86,141 +90,145 @@ msgstr ""
msgid "Files"
msgstr "ფáƒáƒ˜áƒšáƒ”ბი"
-#: js/file-upload.js:11
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
+#: js/file-upload.js:244
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr ""
-#: js/file-upload.js:24
+#: js/file-upload.js:255
msgid "Not enough space available"
msgstr ""
-#: js/file-upload.js:64
+#: js/file-upload.js:322
msgid "Upload cancelled."
msgstr ""
-#: js/file-upload.js:165
+#: js/file-upload.js:356
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:446
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/file-upload.js:239
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr ""
-#: js/file-upload.js:244 lib/app.php:53
+#: js/file-upload.js:525 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
+#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545
msgid "Error"
msgstr ""
-#: js/fileactions.js:116
+#: js/fileactions.js:119
msgid "Share"
msgstr ""
-#: js/fileactions.js:126
+#: js/fileactions.js:131
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:192
+#: js/fileactions.js:197
msgid "Rename"
msgstr ""
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr ""
-#: js/filelist.js:305 js/filelist.js:307
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr ""
-#: js/filelist.js:305 js/filelist.js:307
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr ""
-#: js/filelist.js:305
+#: js/filelist.js:416
msgid "suggest name"
msgstr ""
-#: js/filelist.js:305 js/filelist.js:307
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr ""
-#: js/filelist.js:352
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr ""
-#: js/filelist.js:352
+#: js/filelist.js:463
msgid "undo"
msgstr ""
-#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
-#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
-#: js/filelist.js:430
+#: js/filelist.js:541
msgid "{dirs} and {files}"
msgstr ""
-#: js/filelist.js:561
+#: js/filelist.js:731 js/filelist.js:769
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
-#: js/filelist.js:626
-msgid "files uploading"
-msgstr ""
-
-#: js/files.js:52
+#: js/files.js:25
msgid "'.' is an invalid file name."
msgstr ""
-#: js/files.js:56
+#: js/files.js:29
msgid "File name cannot be empty."
msgstr ""
-#: js/files.js:64
+#: js/files.js:37
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: js/files.js:78
+#: js/files.js:51
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr ""
-#: js/files.js:82
+#: js/files.js:55
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:94
+#: js/files.js:67
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
msgstr ""
-#: js/files.js:245
+#: js/files.js:296
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/files.js:562 templates/index.php:67
+#: js/files.js:507 js/files.js:545
+msgid "Error moving file"
+msgstr ""
+
+#: js/files.js:558 templates/index.php:61
msgid "Name"
msgstr ""
-#: js/files.js:563 templates/index.php:78
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr ""
-#: js/files.js:564 templates/index.php:80
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr ""
@@ -229,7 +237,7 @@ msgstr ""
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:11 templates/index.php:18
+#: lib/helper.php:11 templates/index.php:17
msgid "Upload"
msgstr ""
@@ -265,65 +273,65 @@ msgstr ""
msgid "Save"
msgstr ""
-#: templates/index.php:7
+#: templates/index.php:6
msgid "New"
msgstr ""
-#: templates/index.php:10
+#: templates/index.php:9
msgid "Text file"
msgstr ""
-#: templates/index.php:12
+#: templates/index.php:11
msgid "Folder"
msgstr ""
-#: templates/index.php:14
+#: templates/index.php:13
msgid "From link"
msgstr ""
-#: templates/index.php:41
+#: templates/index.php:33
msgid "Deleted files"
msgstr ""
-#: templates/index.php:46
+#: templates/index.php:39
msgid "Cancel upload"
msgstr ""
-#: templates/index.php:52
+#: templates/index.php:45
msgid "You don’t have write permissions here."
msgstr ""
-#: templates/index.php:59
+#: templates/index.php:50
msgid "Nothing in here. Upload something!"
msgstr ""
-#: templates/index.php:73
+#: templates/index.php:67
msgid "Download"
msgstr "გáƒáƒ“მáƒáƒ¬áƒ”რáƒ"
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr ""
-#: templates/index.php:91 templates/index.php:92
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr ""
-#: templates/index.php:105
+#: templates/index.php:100
msgid "Upload too large"
msgstr ""
-#: templates/index.php:107
+#: templates/index.php:102
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: templates/index.php:112
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:115
+#: templates/index.php:110
msgid "Current scanning"
msgstr ""
diff --git a/l10n/ka/settings.po b/l10n/ka/settings.po
index 8e2b2cb50db2fb51eecbfbd7160ff65caa819182..86e902ed4f42d08dc2bcd38e8b9da2471cc28e75 100644
--- a/l10n/ka/settings.po
+++ b/l10n/ka/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:45-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
"MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgid "Unable to load list from App Store"
msgstr ""
#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
-#: ajax/togglegroups.php:20
+#: ajax/togglegroups.php:20 changepassword/controller.php:55
msgid "Authentication error"
msgstr ""
@@ -84,6 +84,35 @@ msgstr ""
msgid "Couldn't update app."
msgstr ""
+#: changepassword/controller.php:20
+msgid "Wrong password"
+msgstr ""
+
+#: changepassword/controller.php:42
+msgid "No user supplied"
+msgstr ""
+
+#: changepassword/controller.php:74
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr ""
+
+#: changepassword/controller.php:79
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr ""
+
+#: changepassword/controller.php:87
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr ""
+
+#: changepassword/controller.php:92 changepassword/controller.php:103
+msgid "Unable to change password"
+msgstr ""
+
#: js/apps.js:43
msgid "Update to {appversion}"
msgstr ""
@@ -128,15 +157,15 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:217
+#: js/personal.js:220
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:262
+#: js/personal.js:265
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:284
+#: js/personal.js:287
msgid "Saving..."
msgstr ""
diff --git a/l10n/ka_GE/core.po b/l10n/ka_GE/core.po
index 64a9519691be8fc5c2e7a4faf75180b78af8bac2..5c70d01e3e1043dc0a33e6ab307ee5595c5d1ac7 100644
--- a/l10n/ka_GE/core.po
+++ b/l10n/ka_GE/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:33+0000\n"
+"POT-Creation-Date: 2013-09-22 12:55-0400\n"
+"PO-Revision-Date: 2013-09-20 15:01+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
"MIME-Version: 1.0\n"
@@ -190,51 +190,51 @@ msgstr "დეკემბერი"
msgid "Settings"
msgstr "პáƒáƒ áƒáƒ›áƒ”ტრები"
-#: js/js.js:853
+#: js/js.js:866
msgid "seconds ago"
msgstr "წáƒáƒ›áƒ˜áƒ¡ წინ"
-#: js/js.js:854
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: js/js.js:855
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: js/js.js:856
+#: js/js.js:869
msgid "today"
msgstr "დღეს"
-#: js/js.js:857
+#: js/js.js:870
msgid "yesterday"
msgstr "გუშინ"
-#: js/js.js:858
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
-#: js/js.js:859
+#: js/js.js:872
msgid "last month"
msgstr "გáƒáƒ¡áƒ£áƒš თვეში"
-#: js/js.js:860
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: js/js.js:861
+#: js/js.js:874
msgid "months ago"
msgstr "თვის წინ"
-#: js/js.js:862
+#: js/js.js:875
msgid "last year"
msgstr "ბáƒáƒšáƒ წელს"
-#: js/js.js:863
+#: js/js.js:876
msgid "years ago"
msgstr "წლის წინ"
@@ -262,6 +262,45 @@ msgstr "დიáƒáƒ®"
msgid "Error loading message template: {error}"
msgstr ""
+#: js/oc-dialogs.js:347
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:367
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:376
+msgid "Cancel"
+msgstr "უáƒáƒ ყáƒáƒ¤áƒ"
+
+#: js/oc-dialogs.js:386
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:457
+msgid "Error loading file exists template"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/ka_GE/files.po b/l10n/ka_GE/files.po
index 56fff63712a8e4dd150b3195aee2aa2d02a6a299..a9e38b7176add9122264d158b809b07c3355aa0b 100644
--- a/l10n/ka_GE/files.po
+++ b/l10n/ka_GE/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:00+0000\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
"MIME-Version: 1.0\n"
@@ -74,11 +74,15 @@ msgstr "შეცდáƒáƒ›áƒ დისკზე ჩáƒáƒ¬áƒ”რისáƒáƒ¡"
msgid "Not enough storage available"
msgstr "სáƒáƒªáƒáƒ•áƒ¨áƒ˜ სáƒáƒ™áƒ›áƒáƒ ისი áƒáƒ“გილი áƒáƒ áƒáƒ ის"
-#: ajax/upload.php:109
-msgid "Upload failed"
-msgstr "áƒáƒ¢áƒ•áƒ˜áƒ თვრვერგáƒáƒœáƒ®áƒáƒ ციელდáƒ"
+#: ajax/upload.php:120 ajax/upload.php:143
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:136
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
-#: ajax/upload.php:127
+#: ajax/upload.php:160
msgid "Invalid directory."
msgstr "დáƒáƒ£áƒ¨áƒ•áƒ”ბელი დირექტáƒáƒ იáƒ."
@@ -86,141 +90,145 @@ msgstr "დáƒáƒ£áƒ¨áƒ•áƒ”ბელი დირექტáƒáƒ იáƒ."
msgid "Files"
msgstr "ფáƒáƒ˜áƒšáƒ”ბი"
-#: js/file-upload.js:11
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "თქვენი ფáƒáƒ˜áƒšáƒ˜áƒ¡ áƒáƒ¢áƒ•áƒ˜áƒ თვრვერმáƒáƒ®áƒ”რხდáƒ. ის áƒáƒ ის სáƒáƒ¥áƒáƒ¦áƒáƒšáƒ“ე დრშეიცáƒáƒ•áƒ¡ 0 ბáƒáƒ˜áƒ¢áƒ¡"
+#: js/file-upload.js:244
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
+msgstr ""
-#: js/file-upload.js:24
+#: js/file-upload.js:255
msgid "Not enough space available"
msgstr "სáƒáƒ™áƒ›áƒáƒ ისი áƒáƒ“გილი áƒáƒ áƒáƒ ის"
-#: js/file-upload.js:64
+#: js/file-upload.js:322
msgid "Upload cancelled."
msgstr "áƒáƒ¢áƒ•áƒ˜áƒ თვრშეჩერებულ იქნáƒ."
-#: js/file-upload.js:165
+#: js/file-upload.js:356
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:446
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "მიმდინáƒáƒ ეáƒáƒ‘ს ფáƒáƒ˜áƒšáƒ˜áƒ¡ áƒáƒ¢áƒ•áƒ˜áƒ თვáƒ. სხვრგვერდზე გáƒáƒ“áƒáƒ¡áƒ•áƒšáƒ გáƒáƒ›áƒáƒ˜áƒ¬áƒ•áƒ”ვს áƒáƒ¢áƒ•áƒ˜áƒ თვის შეჩერებáƒáƒ¡"
-#: js/file-upload.js:239
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr "URL áƒáƒ შეიძლებრიყáƒáƒ¡ ცáƒáƒ იელი."
-#: js/file-upload.js:244 lib/app.php:53
+#: js/file-upload.js:525 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550
+#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545
msgid "Error"
msgstr "შეცდáƒáƒ›áƒ"
-#: js/fileactions.js:116
+#: js/fileactions.js:119
msgid "Share"
msgstr "გáƒáƒ–იáƒáƒ ებáƒ"
-#: js/fileactions.js:126
+#: js/fileactions.js:131
msgid "Delete permanently"
msgstr "სრულáƒáƒ“ წáƒáƒ¨áƒšáƒ"
-#: js/fileactions.js:192
+#: js/fileactions.js:197
msgid "Rename"
msgstr "გáƒáƒ“áƒáƒ ქმევáƒ"
-#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "მáƒáƒªáƒ“ის რეჟიმში"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{new_name} უკვე áƒáƒ სებáƒáƒ‘ს"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "შეცვლáƒ"
-#: js/filelist.js:307
+#: js/filelist.js:416
msgid "suggest name"
msgstr "სáƒáƒ®áƒ”ლის შემáƒáƒ—áƒáƒ•áƒáƒ–ებáƒ"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "უáƒáƒ ყáƒáƒ¤áƒ"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr "{new_name} შეცვლილირ{old_name}–ით"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "undo"
msgstr "დáƒáƒ‘რუნებáƒ"
-#: js/filelist.js:424 js/filelist.js:490 js/files.js:581
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
-#: js/filelist.js:425 js/filelist.js:491 js/files.js:587
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
-#: js/filelist.js:432
+#: js/filelist.js:541
msgid "{dirs} and {files}"
msgstr ""
-#: js/filelist.js:563
+#: js/filelist.js:731 js/filelist.js:769
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
-#: js/filelist.js:628
-msgid "files uploading"
-msgstr "ფáƒáƒ˜áƒšáƒ”ბი იტვირთებáƒ"
-
-#: js/files.js:52
+#: js/files.js:25
msgid "'.' is an invalid file name."
msgstr "'.' áƒáƒ ის დáƒáƒ£áƒ¨áƒ•áƒ”ბელი ფáƒáƒ˜áƒšáƒ˜áƒ¡ სáƒáƒ®áƒ”ლი."
-#: js/files.js:56
+#: js/files.js:29
msgid "File name cannot be empty."
msgstr "ფáƒáƒ˜áƒšáƒ˜áƒ¡ სáƒáƒ®áƒ”ლი áƒáƒ შეიძლებრიყáƒáƒ¡ ცáƒáƒ იელი."
-#: js/files.js:64
+#: js/files.js:37
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "áƒáƒ áƒáƒ“áƒáƒ¨áƒ•áƒ”ბáƒáƒ“ი სáƒáƒ®áƒ”ლი, '\\', '/', '<', '>', ':', '\"', '|', '?' დრ'*' áƒáƒ áƒáƒ ის დáƒáƒ˜áƒ¨áƒ•áƒ”ბული."
-#: js/files.js:78
+#: js/files.js:51
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr "თქვენი სáƒáƒªáƒáƒ•áƒ˜ გáƒáƒ“áƒáƒ˜áƒ•áƒ¡áƒ. ფáƒáƒ˜áƒšáƒ”ბის გáƒáƒœáƒáƒ®áƒšáƒ”ბრდრსინქრáƒáƒœáƒ˜áƒ–ირებრვერმáƒáƒ®áƒ”რხდებáƒ!"
-#: js/files.js:82
+#: js/files.js:55
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "თქვენი სáƒáƒªáƒáƒ•áƒ˜ თითქმის გáƒáƒ“áƒáƒ˜áƒ•áƒ¡áƒ ({usedSpacePercent}%)"
-#: js/files.js:94
+#: js/files.js:67
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
msgstr ""
-#: js/files.js:245
+#: js/files.js:296
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "გáƒáƒ“მáƒáƒ¬áƒ”რის მáƒáƒ—ხáƒáƒ•áƒœáƒ მუშáƒáƒ•áƒ“ებáƒ. ის მáƒáƒ˜áƒ—ხáƒáƒ•áƒ¡ გáƒáƒ კვეულ დრáƒáƒ¡ რáƒáƒ’დáƒáƒœ ფáƒáƒ˜áƒšáƒ”ბი áƒáƒ ის დიდი ზáƒáƒ›áƒ˜áƒ¡."
-#: js/files.js:563 templates/index.php:69
+#: js/files.js:507 js/files.js:545
+msgid "Error moving file"
+msgstr ""
+
+#: js/files.js:558 templates/index.php:61
msgid "Name"
msgstr "სáƒáƒ®áƒ”ლი"
-#: js/files.js:564 templates/index.php:81
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "ზáƒáƒ›áƒ"
-#: js/files.js:565 templates/index.php:83
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr "შეცვლილიáƒ"
@@ -229,7 +237,7 @@ msgstr "შეცვლილიáƒ"
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:11 templates/index.php:18
+#: lib/helper.php:11 templates/index.php:17
msgid "Upload"
msgstr "áƒáƒ¢áƒ•áƒ˜áƒ თვáƒ"
@@ -265,65 +273,65 @@ msgstr "ZIP ფáƒáƒ˜áƒšáƒ”ბის მáƒáƒ¥áƒ¡áƒ˜áƒ›áƒ£áƒ› დáƒáƒ¡áƒáƒ¨áƒ•
msgid "Save"
msgstr "შენáƒáƒ®áƒ•áƒ"
-#: templates/index.php:7
+#: templates/index.php:6
msgid "New"
msgstr "áƒáƒ®áƒáƒšáƒ˜"
-#: templates/index.php:10
+#: templates/index.php:9
msgid "Text file"
msgstr "ტექსტური ფáƒáƒ˜áƒšáƒ˜"
-#: templates/index.php:12
+#: templates/index.php:11
msgid "Folder"
msgstr "სáƒáƒ¥áƒáƒ¦áƒáƒšáƒ“ე"
-#: templates/index.php:14
+#: templates/index.php:13
msgid "From link"
msgstr "მისáƒáƒ›áƒáƒ თიდáƒáƒœ"
-#: templates/index.php:41
+#: templates/index.php:33
msgid "Deleted files"
msgstr "წáƒáƒ¨áƒšáƒ˜áƒšáƒ˜ ფáƒáƒ˜áƒšáƒ”ბი"
-#: templates/index.php:46
+#: templates/index.php:39
msgid "Cancel upload"
msgstr "áƒáƒ¢áƒ•áƒ˜áƒ თვის გáƒáƒ£áƒ¥áƒ›áƒ”ბáƒ"
-#: templates/index.php:52
+#: templates/index.php:45
msgid "You don’t have write permissions here."
msgstr "თქვენ áƒáƒ გáƒáƒ¥áƒ•áƒ— ჩáƒáƒ¬áƒ”რის უფლებრáƒáƒ¥."
-#: templates/index.php:59
+#: templates/index.php:50
msgid "Nothing in here. Upload something!"
msgstr "áƒáƒ¥ áƒáƒ áƒáƒ¤áƒ”რი áƒáƒ áƒáƒ ის. áƒáƒ¢áƒ•áƒ˜áƒ თე რáƒáƒ›áƒ”!"
-#: templates/index.php:75
+#: templates/index.php:67
msgid "Download"
msgstr "ჩáƒáƒ›áƒáƒ¢áƒ•áƒ˜áƒ თვáƒ"
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr "გáƒáƒ£áƒ–იáƒáƒ ებáƒáƒ“ი"
-#: templates/index.php:94 templates/index.php:95
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "წáƒáƒ¨áƒšáƒ"
-#: templates/index.php:108
+#: templates/index.php:100
msgid "Upload too large"
msgstr "áƒáƒ¡áƒáƒ¢áƒ•áƒ˜áƒ თი ფáƒáƒ˜áƒšáƒ˜ ძáƒáƒšáƒ˜áƒáƒœ დიდიáƒ"
-#: templates/index.php:110
+#: templates/index.php:102
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "ფáƒáƒ˜áƒšáƒ˜áƒ¡ ზáƒáƒ›áƒ რáƒáƒ›áƒšáƒ˜áƒ¡ áƒáƒ¢áƒ•áƒ˜áƒ თვáƒáƒ¡áƒáƒª თქვენ áƒáƒžáƒ˜áƒ ებთ, áƒáƒáƒáƒ ბებს სერვერზე დáƒáƒ¨áƒ•áƒ”ბულ მáƒáƒ¥áƒ¡áƒ˜áƒ›áƒ£áƒ›áƒ¡."
-#: templates/index.php:115
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr "მიმდინáƒáƒ ეáƒáƒ‘ს ფáƒáƒ˜áƒšáƒ”ბის სკáƒáƒœáƒ˜áƒ ებáƒ, გთხáƒáƒ•áƒ— დáƒáƒ”ლáƒáƒ“áƒáƒ—."
-#: templates/index.php:118
+#: templates/index.php:110
msgid "Current scanning"
msgstr "მიმდინáƒáƒ ე სკáƒáƒœáƒ˜áƒ ებáƒ"
diff --git a/l10n/ka_GE/settings.po b/l10n/ka_GE/settings.po
index b2b70884df168f9ea96dcd5b68db80aac3a4e34d..fc613d4b9ee9f764c235b677c5e641b2660a3831 100644
--- a/l10n/ka_GE/settings.po
+++ b/l10n/ka_GE/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:45-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
"MIME-Version: 1.0\n"
@@ -23,7 +23,7 @@ msgid "Unable to load list from App Store"
msgstr "áƒáƒžáƒšáƒ˜áƒ™áƒáƒªáƒ˜áƒ”ბის სირვერჩáƒáƒ›áƒáƒ˜áƒ¢áƒ•áƒ˜áƒ თრApp Store"
#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
-#: ajax/togglegroups.php:20
+#: ajax/togglegroups.php:20 changepassword/controller.php:55
msgid "Authentication error"
msgstr "áƒáƒ•áƒ—ენტიფიკáƒáƒªáƒ˜áƒ˜áƒ¡ შეცდáƒáƒ›áƒ"
@@ -85,6 +85,35 @@ msgstr "მáƒáƒ›áƒ®áƒ›áƒáƒ ებლის წáƒáƒ¨áƒšáƒ ვერმáƒáƒ®
msgid "Couldn't update app."
msgstr "ვერმáƒáƒ®áƒ”რხდრáƒáƒžáƒšáƒ˜áƒ™áƒáƒªáƒ˜áƒ˜áƒ¡ გáƒáƒœáƒáƒ®áƒšáƒ”ბáƒ."
+#: changepassword/controller.php:20
+msgid "Wrong password"
+msgstr ""
+
+#: changepassword/controller.php:42
+msgid "No user supplied"
+msgstr ""
+
+#: changepassword/controller.php:74
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr ""
+
+#: changepassword/controller.php:79
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr ""
+
+#: changepassword/controller.php:87
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr ""
+
+#: changepassword/controller.php:92 changepassword/controller.php:103
+msgid "Unable to change password"
+msgstr ""
+
#: js/apps.js:43
msgid "Update to {appversion}"
msgstr "გáƒáƒœáƒáƒáƒ®áƒšáƒ” {appversion}–მდე"
@@ -129,15 +158,15 @@ msgstr "გáƒáƒœáƒáƒ®áƒšáƒ”ბáƒ"
msgid "Updated"
msgstr "გáƒáƒœáƒáƒ®áƒšáƒ”ბულიáƒ"
-#: js/personal.js:217
+#: js/personal.js:220
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:262
+#: js/personal.js:265
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:284
+#: js/personal.js:287
msgid "Saving..."
msgstr "შენáƒáƒ®áƒ•áƒ..."
diff --git a/l10n/km/core.po b/l10n/km/core.po
index 1ae42ef89fbffeae12555336c2c907a24c9b6873..437612ba9d98ffaa5a8eb89a6e4b447780093b07 100644
--- a/l10n/km/core.po
+++ b/l10n/km/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Khmer (http://www.transifex.com/projects/p/owncloud/language/km/)\n"
"MIME-Version: 1.0\n"
@@ -190,51 +190,51 @@ msgstr ""
msgid "Settings"
msgstr ""
-#: js/js.js:853
+#: js/js.js:866
msgid "seconds ago"
msgstr ""
-#: js/js.js:854
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: js/js.js:855
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: js/js.js:856
+#: js/js.js:869
msgid "today"
msgstr ""
-#: js/js.js:857
+#: js/js.js:870
msgid "yesterday"
msgstr ""
-#: js/js.js:858
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
-#: js/js.js:859
+#: js/js.js:872
msgid "last month"
msgstr ""
-#: js/js.js:860
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: js/js.js:861
+#: js/js.js:874
msgid "months ago"
msgstr ""
-#: js/js.js:862
+#: js/js.js:875
msgid "last year"
msgstr ""
-#: js/js.js:863
+#: js/js.js:876
msgid "years ago"
msgstr ""
@@ -262,6 +262,45 @@ msgstr ""
msgid "Error loading message template: {error}"
msgstr ""
+#: js/oc-dialogs.js:347
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:367
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:376
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:386
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:457
+msgid "Error loading file exists template"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/km/files.po b/l10n/km/files.po
index 286dded35fb9ce14d609c8cb16788c9ab20a6aca..a6b9b1775e166ec41166f8ee0099913f15b3e974 100644
--- a/l10n/km/files.po
+++ b/l10n/km/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-12 11:11+0000\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Khmer (http://www.transifex.com/projects/p/owncloud/language/km/)\n"
"MIME-Version: 1.0\n"
@@ -74,11 +74,15 @@ msgstr ""
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:109
-msgid "Upload failed"
+#: ajax/upload.php:120 ajax/upload.php:143
+msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:127
+#: ajax/upload.php:136
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
+
+#: ajax/upload.php:160
msgid "Invalid directory."
msgstr ""
@@ -86,141 +90,145 @@ msgstr ""
msgid "Files"
msgstr ""
-#: js/file-upload.js:11
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
+#: js/file-upload.js:244
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr ""
-#: js/file-upload.js:24
+#: js/file-upload.js:255
msgid "Not enough space available"
msgstr ""
-#: js/file-upload.js:64
+#: js/file-upload.js:322
msgid "Upload cancelled."
msgstr ""
-#: js/file-upload.js:165
+#: js/file-upload.js:356
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:446
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/file-upload.js:239
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr ""
-#: js/file-upload.js:244 lib/app.php:53
+#: js/file-upload.js:525 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550
+#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545
msgid "Error"
msgstr ""
-#: js/fileactions.js:116
+#: js/fileactions.js:119
msgid "Share"
msgstr ""
-#: js/fileactions.js:126
+#: js/fileactions.js:131
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:192
+#: js/fileactions.js:197
msgid "Rename"
msgstr ""
-#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr ""
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr ""
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr ""
-#: js/filelist.js:307
+#: js/filelist.js:416
msgid "suggest name"
msgstr ""
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr ""
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr ""
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "undo"
msgstr ""
-#: js/filelist.js:424 js/filelist.js:490 js/files.js:581
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
-#: js/filelist.js:425 js/filelist.js:491 js/files.js:587
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
-#: js/filelist.js:432
+#: js/filelist.js:541
msgid "{dirs} and {files}"
msgstr ""
-#: js/filelist.js:563
+#: js/filelist.js:731 js/filelist.js:769
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
-#: js/filelist.js:628
-msgid "files uploading"
-msgstr ""
-
-#: js/files.js:52
+#: js/files.js:25
msgid "'.' is an invalid file name."
msgstr ""
-#: js/files.js:56
+#: js/files.js:29
msgid "File name cannot be empty."
msgstr ""
-#: js/files.js:64
+#: js/files.js:37
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: js/files.js:78
+#: js/files.js:51
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr ""
-#: js/files.js:82
+#: js/files.js:55
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:94
+#: js/files.js:67
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
msgstr ""
-#: js/files.js:245
+#: js/files.js:296
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/files.js:563 templates/index.php:69
+#: js/files.js:507 js/files.js:545
+msgid "Error moving file"
+msgstr ""
+
+#: js/files.js:558 templates/index.php:61
msgid "Name"
msgstr ""
-#: js/files.js:564 templates/index.php:81
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr ""
-#: js/files.js:565 templates/index.php:83
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr ""
@@ -229,7 +237,7 @@ msgstr ""
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:11 templates/index.php:18
+#: lib/helper.php:11 templates/index.php:17
msgid "Upload"
msgstr ""
@@ -265,65 +273,65 @@ msgstr ""
msgid "Save"
msgstr ""
-#: templates/index.php:7
+#: templates/index.php:6
msgid "New"
msgstr ""
-#: templates/index.php:10
+#: templates/index.php:9
msgid "Text file"
msgstr ""
-#: templates/index.php:12
+#: templates/index.php:11
msgid "Folder"
msgstr ""
-#: templates/index.php:14
+#: templates/index.php:13
msgid "From link"
msgstr ""
-#: templates/index.php:41
+#: templates/index.php:33
msgid "Deleted files"
msgstr ""
-#: templates/index.php:46
+#: templates/index.php:39
msgid "Cancel upload"
msgstr ""
-#: templates/index.php:52
+#: templates/index.php:45
msgid "You don’t have write permissions here."
msgstr ""
-#: templates/index.php:59
+#: templates/index.php:50
msgid "Nothing in here. Upload something!"
msgstr ""
-#: templates/index.php:75
+#: templates/index.php:67
msgid "Download"
msgstr ""
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr ""
-#: templates/index.php:94 templates/index.php:95
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr ""
-#: templates/index.php:108
+#: templates/index.php:100
msgid "Upload too large"
msgstr ""
-#: templates/index.php:110
+#: templates/index.php:102
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: templates/index.php:115
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:118
+#: templates/index.php:110
msgid "Current scanning"
msgstr ""
diff --git a/l10n/km/settings.po b/l10n/km/settings.po
index e32f2e8796c08cbfb1175339a4bab0783d8a292d..c46c22d8be39e2f83cb671efd65beb52ae139717 100644
--- a/l10n/km/settings.po
+++ b/l10n/km/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:45-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Khmer (http://www.transifex.com/projects/p/owncloud/language/km/)\n"
"MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgid "Unable to load list from App Store"
msgstr ""
#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
-#: ajax/togglegroups.php:20
+#: ajax/togglegroups.php:20 changepassword/controller.php:55
msgid "Authentication error"
msgstr ""
@@ -84,6 +84,35 @@ msgstr ""
msgid "Couldn't update app."
msgstr ""
+#: changepassword/controller.php:20
+msgid "Wrong password"
+msgstr ""
+
+#: changepassword/controller.php:42
+msgid "No user supplied"
+msgstr ""
+
+#: changepassword/controller.php:74
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr ""
+
+#: changepassword/controller.php:79
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr ""
+
+#: changepassword/controller.php:87
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr ""
+
+#: changepassword/controller.php:92 changepassword/controller.php:103
+msgid "Unable to change password"
+msgstr ""
+
#: js/apps.js:43
msgid "Update to {appversion}"
msgstr ""
@@ -128,15 +157,15 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:217
+#: js/personal.js:220
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:262
+#: js/personal.js:265
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:284
+#: js/personal.js:287
msgid "Saving..."
msgstr ""
diff --git a/l10n/kn/core.po b/l10n/kn/core.po
index 3ee58ec5314a49fab06a4ab5225b8f1d104da3ce..c5dd4fc62ea7ddf9812df2f0413f313515592a87 100644
--- a/l10n/kn/core.po
+++ b/l10n/kn/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:33+0000\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
"MIME-Version: 1.0\n"
@@ -190,51 +190,51 @@ msgstr ""
msgid "Settings"
msgstr ""
-#: js/js.js:853
+#: js/js.js:866
msgid "seconds ago"
msgstr ""
-#: js/js.js:854
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: js/js.js:855
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: js/js.js:856
+#: js/js.js:869
msgid "today"
msgstr ""
-#: js/js.js:857
+#: js/js.js:870
msgid "yesterday"
msgstr ""
-#: js/js.js:858
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
-#: js/js.js:859
+#: js/js.js:872
msgid "last month"
msgstr ""
-#: js/js.js:860
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: js/js.js:861
+#: js/js.js:874
msgid "months ago"
msgstr ""
-#: js/js.js:862
+#: js/js.js:875
msgid "last year"
msgstr ""
-#: js/js.js:863
+#: js/js.js:876
msgid "years ago"
msgstr ""
@@ -262,6 +262,45 @@ msgstr ""
msgid "Error loading message template: {error}"
msgstr ""
+#: js/oc-dialogs.js:347
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:367
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:376
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:386
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:457
+msgid "Error loading file exists template"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/kn/files.po b/l10n/kn/files.po
index 59f02ce2c4f0fff4573781100180e59e0a02812a..3297285e0e53e026d5b4d1684f9695d4b20a9e19 100644
--- a/l10n/kn/files.po
+++ b/l10n/kn/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-30 09:31-0400\n"
-"PO-Revision-Date: 2013-08-30 13:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
"MIME-Version: 1.0\n"
@@ -74,11 +74,15 @@ msgstr ""
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:109
-msgid "Upload failed"
+#: ajax/upload.php:120 ajax/upload.php:143
+msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:127
+#: ajax/upload.php:136
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
+
+#: ajax/upload.php:160
msgid "Invalid directory."
msgstr ""
@@ -86,141 +90,145 @@ msgstr ""
msgid "Files"
msgstr ""
-#: js/file-upload.js:11
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
+#: js/file-upload.js:244
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr ""
-#: js/file-upload.js:24
+#: js/file-upload.js:255
msgid "Not enough space available"
msgstr ""
-#: js/file-upload.js:64
+#: js/file-upload.js:322
msgid "Upload cancelled."
msgstr ""
-#: js/file-upload.js:165
+#: js/file-upload.js:356
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:446
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/file-upload.js:239
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr ""
-#: js/file-upload.js:244 lib/app.php:53
+#: js/file-upload.js:525 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
+#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545
msgid "Error"
msgstr ""
-#: js/fileactions.js:116
+#: js/fileactions.js:119
msgid "Share"
msgstr ""
-#: js/fileactions.js:126
+#: js/fileactions.js:131
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:192
+#: js/fileactions.js:197
msgid "Rename"
msgstr ""
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr ""
-#: js/filelist.js:305 js/filelist.js:307
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr ""
-#: js/filelist.js:305 js/filelist.js:307
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr ""
-#: js/filelist.js:305
+#: js/filelist.js:416
msgid "suggest name"
msgstr ""
-#: js/filelist.js:305 js/filelist.js:307
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr ""
-#: js/filelist.js:352
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr ""
-#: js/filelist.js:352
+#: js/filelist.js:463
msgid "undo"
msgstr ""
-#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
-#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
-#: js/filelist.js:430
+#: js/filelist.js:541
msgid "{dirs} and {files}"
msgstr ""
-#: js/filelist.js:561
+#: js/filelist.js:731 js/filelist.js:769
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
-#: js/filelist.js:626
-msgid "files uploading"
-msgstr ""
-
-#: js/files.js:52
+#: js/files.js:25
msgid "'.' is an invalid file name."
msgstr ""
-#: js/files.js:56
+#: js/files.js:29
msgid "File name cannot be empty."
msgstr ""
-#: js/files.js:64
+#: js/files.js:37
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: js/files.js:78
+#: js/files.js:51
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr ""
-#: js/files.js:82
+#: js/files.js:55
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:94
+#: js/files.js:67
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
msgstr ""
-#: js/files.js:245
+#: js/files.js:296
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/files.js:562 templates/index.php:67
+#: js/files.js:507 js/files.js:545
+msgid "Error moving file"
+msgstr ""
+
+#: js/files.js:558 templates/index.php:61
msgid "Name"
msgstr ""
-#: js/files.js:563 templates/index.php:78
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr ""
-#: js/files.js:564 templates/index.php:80
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr ""
@@ -229,7 +237,7 @@ msgstr ""
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:11 templates/index.php:18
+#: lib/helper.php:11 templates/index.php:17
msgid "Upload"
msgstr ""
@@ -265,65 +273,65 @@ msgstr ""
msgid "Save"
msgstr ""
-#: templates/index.php:7
+#: templates/index.php:6
msgid "New"
msgstr ""
-#: templates/index.php:10
+#: templates/index.php:9
msgid "Text file"
msgstr ""
-#: templates/index.php:12
+#: templates/index.php:11
msgid "Folder"
msgstr ""
-#: templates/index.php:14
+#: templates/index.php:13
msgid "From link"
msgstr ""
-#: templates/index.php:41
+#: templates/index.php:33
msgid "Deleted files"
msgstr ""
-#: templates/index.php:46
+#: templates/index.php:39
msgid "Cancel upload"
msgstr ""
-#: templates/index.php:52
+#: templates/index.php:45
msgid "You don’t have write permissions here."
msgstr ""
-#: templates/index.php:59
+#: templates/index.php:50
msgid "Nothing in here. Upload something!"
msgstr ""
-#: templates/index.php:73
+#: templates/index.php:67
msgid "Download"
msgstr ""
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr ""
-#: templates/index.php:91 templates/index.php:92
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr ""
-#: templates/index.php:105
+#: templates/index.php:100
msgid "Upload too large"
msgstr ""
-#: templates/index.php:107
+#: templates/index.php:102
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: templates/index.php:112
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:115
+#: templates/index.php:110
msgid "Current scanning"
msgstr ""
diff --git a/l10n/kn/settings.po b/l10n/kn/settings.po
index aa346b34b34e886be0a08ddf827016899e01c34b..21659f91a5b79ac8dbfcf25156cb4f3ad8037951 100644
--- a/l10n/kn/settings.po
+++ b/l10n/kn/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:45-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
"MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgid "Unable to load list from App Store"
msgstr ""
#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
-#: ajax/togglegroups.php:20
+#: ajax/togglegroups.php:20 changepassword/controller.php:55
msgid "Authentication error"
msgstr ""
@@ -84,6 +84,35 @@ msgstr ""
msgid "Couldn't update app."
msgstr ""
+#: changepassword/controller.php:20
+msgid "Wrong password"
+msgstr ""
+
+#: changepassword/controller.php:42
+msgid "No user supplied"
+msgstr ""
+
+#: changepassword/controller.php:74
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr ""
+
+#: changepassword/controller.php:79
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr ""
+
+#: changepassword/controller.php:87
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr ""
+
+#: changepassword/controller.php:92 changepassword/controller.php:103
+msgid "Unable to change password"
+msgstr ""
+
#: js/apps.js:43
msgid "Update to {appversion}"
msgstr ""
@@ -128,15 +157,15 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:217
+#: js/personal.js:220
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:262
+#: js/personal.js:265
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:284
+#: js/personal.js:287
msgid "Saving..."
msgstr ""
diff --git a/l10n/ko/core.po b/l10n/ko/core.po
index f1c6f8bdfc44ef9e2d29830e6863bbc2dfb43274..ee7f0753f7e616eaebc183e0206b0bfcaa3bef07 100644
--- a/l10n/ko/core.po
+++ b/l10n/ko/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:33+0000\n"
+"POT-Creation-Date: 2013-09-22 12:55-0400\n"
+"PO-Revision-Date: 2013-09-20 15:01+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
@@ -192,51 +192,51 @@ msgstr "12ì›”"
msgid "Settings"
msgstr "ì„¤ì •"
-#: js/js.js:853
+#: js/js.js:866
msgid "seconds ago"
msgstr "ì´ˆ ì „"
-#: js/js.js:854
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n분 ì „ "
-#: js/js.js:855
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n시간 ì „ "
-#: js/js.js:856
+#: js/js.js:869
msgid "today"
msgstr "오늘"
-#: js/js.js:857
+#: js/js.js:870
msgid "yesterday"
msgstr "ì–´ì œ"
-#: js/js.js:858
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%nì¼ ì „ "
-#: js/js.js:859
+#: js/js.js:872
msgid "last month"
msgstr "지난 달"
-#: js/js.js:860
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n달 ì „ "
-#: js/js.js:861
+#: js/js.js:874
msgid "months ago"
msgstr "개월 ì „"
-#: js/js.js:862
+#: js/js.js:875
msgid "last year"
msgstr "ìž‘ë…„"
-#: js/js.js:863
+#: js/js.js:876
msgid "years ago"
msgstr "ë…„ ì „"
@@ -264,6 +264,45 @@ msgstr "승ë½"
msgid "Error loading message template: {error}"
msgstr ""
+#: js/oc-dialogs.js:347
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:367
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:376
+msgid "Cancel"
+msgstr "취소"
+
+#: js/oc-dialogs.js:386
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:457
+msgid "Error loading file exists template"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/ko/files.po b/l10n/ko/files.po
index 1ab0e4053abb68f728e6a605201a33b12b3acd92..b2497ad3499ca6e15a294bfe3c796d1b8f624729 100644
--- a/l10n/ko/files.po
+++ b/l10n/ko/files.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:00+0000\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
@@ -76,11 +76,15 @@ msgstr "디스í¬ì— 쓰지 못했습니다"
msgid "Not enough storage available"
msgstr "ì €ìž¥ì†Œê°€ ìš©ëŸ‰ì´ ì¶©ë¶„í•˜ì§€ 않습니다."
-#: ajax/upload.php:109
-msgid "Upload failed"
-msgstr "업로드 실패"
+#: ajax/upload.php:120 ajax/upload.php:143
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:136
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
-#: ajax/upload.php:127
+#: ajax/upload.php:160
msgid "Invalid directory."
msgstr "올바르지 ì•Šì€ ë””ë ‰í„°ë¦¬ìž…ë‹ˆë‹¤."
@@ -88,141 +92,145 @@ msgstr "올바르지 ì•Šì€ ë””ë ‰í„°ë¦¬ìž…ë‹ˆë‹¤."
msgid "Files"
msgstr "파ì¼"
-#: js/file-upload.js:11
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "ë””ë ‰í„°ë¦¬ ë° ë¹ˆ 파ì¼ì€ ì—…ë¡œë“œí• ìˆ˜ 없습니다"
+#: js/file-upload.js:244
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
+msgstr ""
-#: js/file-upload.js:24
+#: js/file-upload.js:255
msgid "Not enough space available"
msgstr "ì—¬ìœ ê³µê°„ì´ ë¶€ì¡±í•©ë‹ˆë‹¤"
-#: js/file-upload.js:64
+#: js/file-upload.js:322
msgid "Upload cancelled."
msgstr "업로드가 취소ë˜ì—ˆìŠµë‹ˆë‹¤."
-#: js/file-upload.js:165
+#: js/file-upload.js:356
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:446
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "íŒŒì¼ ì—…ë¡œë“œê°€ 진행 중입니다. ì´ íŽ˜ì´ì§€ë¥¼ 벗어나면 업로드가 취소ë©ë‹ˆë‹¤."
-#: js/file-upload.js:239
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr "URLì„ ìž…ë ¥í•´ì•¼ 합니다."
-#: js/file-upload.js:244 lib/app.php:53
+#: js/file-upload.js:525 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550
+#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545
msgid "Error"
msgstr "오류"
-#: js/fileactions.js:116
+#: js/fileactions.js:119
msgid "Share"
msgstr "ê³µìœ "
-#: js/fileactions.js:126
+#: js/fileactions.js:131
msgid "Delete permanently"
msgstr "ì˜ì›ížˆ ì‚ì œ"
-#: js/fileactions.js:192
+#: js/fileactions.js:197
msgid "Rename"
msgstr "ì´ë¦„ 바꾸기"
-#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "대기 중"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{new_name}ì´(ê°€) ì´ë¯¸ 존재함"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "바꾸기"
-#: js/filelist.js:307
+#: js/filelist.js:416
msgid "suggest name"
msgstr "ì´ë¦„ ì œì•ˆ"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "취소"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr "{old_name}ì´(ê°€) {new_name}(으)ë¡œ 대체ë¨"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "undo"
msgstr "ë˜ëŒë¦¬ê¸°"
-#: js/filelist.js:424 js/filelist.js:490 js/files.js:581
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
-#: js/filelist.js:425 js/filelist.js:491 js/files.js:587
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
-#: js/filelist.js:432
+#: js/filelist.js:541
msgid "{dirs} and {files}"
msgstr ""
-#: js/filelist.js:563
+#: js/filelist.js:731 js/filelist.js:769
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
-#: js/filelist.js:628
-msgid "files uploading"
-msgstr "íŒŒì¼ ì—…ë¡œë“œì¤‘"
-
-#: js/files.js:52
+#: js/files.js:25
msgid "'.' is an invalid file name."
msgstr "'.' 는 올바르지 ì•Šì€ íŒŒì¼ ì´ë¦„ 입니다."
-#: js/files.js:56
+#: js/files.js:29
msgid "File name cannot be empty."
msgstr "íŒŒì¼ ì´ë¦„ì´ ë¹„ì–´ ìžˆì„ ìˆ˜ 없습니다."
-#: js/files.js:64
+#: js/files.js:37
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "í´ë” ì´ë¦„ì´ ì˜¬ë°”ë¥´ì§€ 않습니다. ì´ë¦„ì— ë¬¸ìž '\\', '/', '<', '>', ':', '\"', '|', '? ', '*'는 ì‚¬ìš©í• ìˆ˜ 없습니다."
-#: js/files.js:78
+#: js/files.js:51
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr "ì €ìž¥ ê³µê°„ì´ ê°€ë“ ì°¼ìŠµë‹ˆë‹¤. 파ì¼ì„ ì—…ë°ì´íŠ¸í•˜ê±°ë‚˜ ë™ê¸°í™”í• ìˆ˜ 없습니다!"
-#: js/files.js:82
+#: js/files.js:55
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "ì €ìž¥ ê³µê°„ì´ ê±°ì˜ ê°€ë“ ì°¼ìŠµë‹ˆë‹¤ ({usedSpacePercent}%)"
-#: js/files.js:94
+#: js/files.js:67
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
msgstr ""
-#: js/files.js:245
+#: js/files.js:296
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "다운로드가 준비 중입니다. íŒŒì¼ í¬ê¸°ê°€ í¬ë‹¤ë©´ ì‹œê°„ì´ ì˜¤ëž˜ 걸릴 ìˆ˜ë„ ìžˆìŠµë‹ˆë‹¤."
-#: js/files.js:563 templates/index.php:69
+#: js/files.js:507 js/files.js:545
+msgid "Error moving file"
+msgstr ""
+
+#: js/files.js:558 templates/index.php:61
msgid "Name"
msgstr "ì´ë¦„"
-#: js/files.js:564 templates/index.php:81
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "í¬ê¸°"
-#: js/files.js:565 templates/index.php:83
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr "ìˆ˜ì •ë¨"
@@ -231,7 +239,7 @@ msgstr "ìˆ˜ì •ë¨"
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:11 templates/index.php:18
+#: lib/helper.php:11 templates/index.php:17
msgid "Upload"
msgstr "업로드"
@@ -267,65 +275,65 @@ msgstr "ZIP íŒŒì¼ ìµœëŒ€ í¬ê¸°"
msgid "Save"
msgstr "ì €ìž¥"
-#: templates/index.php:7
+#: templates/index.php:6
msgid "New"
msgstr "새로 만들기"
-#: templates/index.php:10
+#: templates/index.php:9
msgid "Text file"
msgstr "í…스트 파ì¼"
-#: templates/index.php:12
+#: templates/index.php:11
msgid "Folder"
msgstr "í´ë”"
-#: templates/index.php:14
+#: templates/index.php:13
msgid "From link"
msgstr "ë§í¬ì—ì„œ"
-#: templates/index.php:41
+#: templates/index.php:33
msgid "Deleted files"
msgstr "íŒŒì¼ ì‚ì œë¨"
-#: templates/index.php:46
+#: templates/index.php:39
msgid "Cancel upload"
msgstr "업로드 취소"
-#: templates/index.php:52
+#: templates/index.php:45
msgid "You don’t have write permissions here."
msgstr "ë‹¹ì‹ ì€ ì—¬ê¸°ì— ì“°ê¸°ë¥¼ í• ìˆ˜ 있는 ê¶Œí•œì´ ì—†ìŠµë‹ˆë‹¤."
-#: templates/index.php:59
+#: templates/index.php:50
msgid "Nothing in here. Upload something!"
msgstr "ë‚´ìš©ì´ ì—†ìŠµë‹ˆë‹¤. ì—…ë¡œë“œí• ìˆ˜ 있습니다!"
-#: templates/index.php:75
+#: templates/index.php:67
msgid "Download"
msgstr "다운로드"
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr "ê³µìœ í•´ì œ"
-#: templates/index.php:94 templates/index.php:95
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "ì‚ì œ"
-#: templates/index.php:108
+#: templates/index.php:100
msgid "Upload too large"
msgstr "업로드한 파ì¼ì´ 너무 í¼"
-#: templates/index.php:110
+#: templates/index.php:102
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "ì´ íŒŒì¼ì´ 서버ì—ì„œ 허용하는 최대 업로드 가능 용량보다 í½ë‹ˆë‹¤."
-#: templates/index.php:115
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr "파ì¼ì„ ê²€ìƒ‰í•˜ê³ ìžˆìŠµë‹ˆë‹¤. ê¸°ë‹¤ë ¤ 주ì‹ì‹œì˜¤."
-#: templates/index.php:118
+#: templates/index.php:110
msgid "Current scanning"
msgstr "현재 검색"
diff --git a/l10n/ko/settings.po b/l10n/ko/settings.po
index 59c2ed9d37573cef4431237c9fee1789d908d7ce..8b3678ceec6f42160980b927a2b1d4b1180df5fe 100644
--- a/l10n/ko/settings.po
+++ b/l10n/ko/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:45-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
@@ -23,7 +23,7 @@ msgid "Unable to load list from App Store"
msgstr "앱 ìŠ¤í† ì–´ì—ì„œ 목ë¡ì„ ê°€ì ¸ì˜¬ 수 없습니다"
#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
-#: ajax/togglegroups.php:20
+#: ajax/togglegroups.php:20 changepassword/controller.php:55
msgid "Authentication error"
msgstr "ì¸ì¦ 오류"
@@ -85,6 +85,35 @@ msgstr "그룹 %sì—ì„œ 사용ìžë¥¼ ì‚ì œí• ìˆ˜ ì—†ìŒ"
msgid "Couldn't update app."
msgstr "ì•±ì„ ì—…ë°ì´íŠ¸í• 수 없습니다."
+#: changepassword/controller.php:20
+msgid "Wrong password"
+msgstr ""
+
+#: changepassword/controller.php:42
+msgid "No user supplied"
+msgstr ""
+
+#: changepassword/controller.php:74
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr ""
+
+#: changepassword/controller.php:79
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr ""
+
+#: changepassword/controller.php:87
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr ""
+
+#: changepassword/controller.php:92 changepassword/controller.php:103
+msgid "Unable to change password"
+msgstr ""
+
#: js/apps.js:43
msgid "Update to {appversion}"
msgstr "ë²„ì „ {appversion}(으)ë¡œ ì—…ë°ì´íŠ¸"
@@ -129,15 +158,15 @@ msgstr "ì—…ë°ì´íŠ¸"
msgid "Updated"
msgstr "ì—…ë°ì´íŠ¸ë¨"
-#: js/personal.js:217
+#: js/personal.js:220
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:262
+#: js/personal.js:265
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:284
+#: js/personal.js:287
msgid "Saving..."
msgstr "ì €ìž¥ 중..."
@@ -461,7 +490,7 @@ msgstr "암호 찾기 ê¸°ëŠ¥ì„ ì‚¬ìš©í•˜ë ¤ë©´ ì´ë©”ì¼ ì£¼ì†Œë¥¼ ìž…ë ¥í•˜ì‹
#: templates/personal.php:86
msgid "Profile picture"
-msgstr ""
+msgstr "프로필 사진"
#: templates/personal.php:90
msgid "Upload new"
diff --git a/l10n/ku_IQ/core.po b/l10n/ku_IQ/core.po
index b1c2c88c0ddbaac7d47e57e9d405b6ae7d11e27f..e29ae2d8757022d66f031e9d2adcef524dc44e79 100644
--- a/l10n/ku_IQ/core.po
+++ b/l10n/ku_IQ/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:33+0000\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
"MIME-Version: 1.0\n"
@@ -190,55 +190,55 @@ msgstr ""
msgid "Settings"
msgstr "ده‌ستكاری"
-#: js/js.js:853
+#: js/js.js:866
msgid "seconds ago"
msgstr ""
-#: js/js.js:854
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:855
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:856
+#: js/js.js:869
msgid "today"
msgstr ""
-#: js/js.js:857
+#: js/js.js:870
msgid "yesterday"
msgstr ""
-#: js/js.js:858
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:859
+#: js/js.js:872
msgid "last month"
msgstr ""
-#: js/js.js:860
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:861
+#: js/js.js:874
msgid "months ago"
msgstr ""
-#: js/js.js:862
+#: js/js.js:875
msgid "last year"
msgstr ""
-#: js/js.js:863
+#: js/js.js:876
msgid "years ago"
msgstr ""
@@ -266,6 +266,46 @@ msgstr ""
msgid "Error loading message template: {error}"
msgstr ""
+#: js/oc-dialogs.js:347
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:367
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:376
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:386
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:457
+msgid "Error loading file exists template"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/ku_IQ/files.po b/l10n/ku_IQ/files.po
index 99b5793ea0de4e1da8fb6d8507fd60834df960f3..9bb3b4faa5f38f65560bad6628b6e1cf3e674527 100644
--- a/l10n/ku_IQ/files.po
+++ b/l10n/ku_IQ/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:00+0000\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
"MIME-Version: 1.0\n"
@@ -74,11 +74,15 @@ msgstr ""
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:109
-msgid "Upload failed"
+#: ajax/upload.php:120 ajax/upload.php:143
+msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:127
+#: ajax/upload.php:136
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
+
+#: ajax/upload.php:160
msgid "Invalid directory."
msgstr ""
@@ -86,144 +90,148 @@ msgstr ""
msgid "Files"
msgstr ""
-#: js/file-upload.js:11
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
+#: js/file-upload.js:244
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr ""
-#: js/file-upload.js:24
+#: js/file-upload.js:255
msgid "Not enough space available"
msgstr ""
-#: js/file-upload.js:64
+#: js/file-upload.js:322
msgid "Upload cancelled."
msgstr ""
-#: js/file-upload.js:165
+#: js/file-upload.js:356
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:446
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/file-upload.js:239
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr "ناونیشانی به‌سته‌ر نابێت به‌تاڵ بێت."
-#: js/file-upload.js:244 lib/app.php:53
+#: js/file-upload.js:525 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550
+#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545
msgid "Error"
msgstr "هه‌ڵه"
-#: js/fileactions.js:116
+#: js/fileactions.js:119
msgid "Share"
msgstr "هاوبەشی کردن"
-#: js/fileactions.js:126
+#: js/fileactions.js:131
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:192
+#: js/fileactions.js:197
msgid "Rename"
msgstr ""
-#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr ""
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr ""
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr ""
-#: js/filelist.js:307
+#: js/filelist.js:416
msgid "suggest name"
msgstr ""
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr ""
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr ""
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "undo"
msgstr ""
-#: js/filelist.js:424 js/filelist.js:490 js/files.js:581
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:425 js/filelist.js:491 js/files.js:587
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:432
+#: js/filelist.js:541
msgid "{dirs} and {files}"
msgstr ""
-#: js/filelist.js:563
+#: js/filelist.js:731 js/filelist.js:769
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:628
-msgid "files uploading"
-msgstr ""
-
-#: js/files.js:52
+#: js/files.js:25
msgid "'.' is an invalid file name."
msgstr ""
-#: js/files.js:56
+#: js/files.js:29
msgid "File name cannot be empty."
msgstr ""
-#: js/files.js:64
+#: js/files.js:37
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: js/files.js:78
+#: js/files.js:51
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr ""
-#: js/files.js:82
+#: js/files.js:55
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:94
+#: js/files.js:67
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
msgstr ""
-#: js/files.js:245
+#: js/files.js:296
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/files.js:563 templates/index.php:69
+#: js/files.js:507 js/files.js:545
+msgid "Error moving file"
+msgstr ""
+
+#: js/files.js:558 templates/index.php:61
msgid "Name"
msgstr "ناو"
-#: js/files.js:564 templates/index.php:81
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr ""
-#: js/files.js:565 templates/index.php:83
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr ""
@@ -232,7 +240,7 @@ msgstr ""
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:11 templates/index.php:18
+#: lib/helper.php:11 templates/index.php:17
msgid "Upload"
msgstr "بارکردن"
@@ -268,65 +276,65 @@ msgstr ""
msgid "Save"
msgstr "پاشکه‌وتکردن"
-#: templates/index.php:7
+#: templates/index.php:6
msgid "New"
msgstr ""
-#: templates/index.php:10
+#: templates/index.php:9
msgid "Text file"
msgstr ""
-#: templates/index.php:12
+#: templates/index.php:11
msgid "Folder"
msgstr "بوخچه"
-#: templates/index.php:14
+#: templates/index.php:13
msgid "From link"
msgstr ""
-#: templates/index.php:41
+#: templates/index.php:33
msgid "Deleted files"
msgstr ""
-#: templates/index.php:46
+#: templates/index.php:39
msgid "Cancel upload"
msgstr ""
-#: templates/index.php:52
+#: templates/index.php:45
msgid "You don’t have write permissions here."
msgstr ""
-#: templates/index.php:59
+#: templates/index.php:50
msgid "Nothing in here. Upload something!"
msgstr ""
-#: templates/index.php:75
+#: templates/index.php:67
msgid "Download"
msgstr "داگرتن"
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr ""
-#: templates/index.php:94 templates/index.php:95
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr ""
-#: templates/index.php:108
+#: templates/index.php:100
msgid "Upload too large"
msgstr ""
-#: templates/index.php:110
+#: templates/index.php:102
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: templates/index.php:115
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:118
+#: templates/index.php:110
msgid "Current scanning"
msgstr ""
diff --git a/l10n/ku_IQ/settings.po b/l10n/ku_IQ/settings.po
index e9b1bff8adc36e1f79abcf9c4f0e3b1a33380831..6ea9fd128b04ecd597b402a7db25e6182ca0cdb7 100644
--- a/l10n/ku_IQ/settings.po
+++ b/l10n/ku_IQ/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:45-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
"MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgid "Unable to load list from App Store"
msgstr ""
#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
-#: ajax/togglegroups.php:20
+#: ajax/togglegroups.php:20 changepassword/controller.php:55
msgid "Authentication error"
msgstr ""
@@ -84,6 +84,35 @@ msgstr ""
msgid "Couldn't update app."
msgstr ""
+#: changepassword/controller.php:20
+msgid "Wrong password"
+msgstr ""
+
+#: changepassword/controller.php:42
+msgid "No user supplied"
+msgstr ""
+
+#: changepassword/controller.php:74
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr ""
+
+#: changepassword/controller.php:79
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr ""
+
+#: changepassword/controller.php:87
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr ""
+
+#: changepassword/controller.php:92 changepassword/controller.php:103
+msgid "Unable to change password"
+msgstr ""
+
#: js/apps.js:43
msgid "Update to {appversion}"
msgstr ""
@@ -128,15 +157,15 @@ msgstr "نوێکردنه‌وه"
msgid "Updated"
msgstr ""
-#: js/personal.js:217
+#: js/personal.js:220
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:262
+#: js/personal.js:265
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:284
+#: js/personal.js:287
msgid "Saving..."
msgstr "پاشکه‌وتده‌کات..."
diff --git a/l10n/lb/core.po b/l10n/lb/core.po
index d3769f82671d0029f7e4e5635dd5519978ae55ac..0ee9039e60367c500380ab9ed734f989b55f7789 100644
--- a/l10n/lb/core.po
+++ b/l10n/lb/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:33+0000\n"
+"POT-Creation-Date: 2013-09-22 12:55-0400\n"
+"PO-Revision-Date: 2013-09-20 15:01+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
@@ -191,55 +191,55 @@ msgstr "Dezember"
msgid "Settings"
msgstr "Astellungen"
-#: js/js.js:853
+#: js/js.js:866
msgid "seconds ago"
msgstr "Sekonnen hir"
-#: js/js.js:854
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:855
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:856
+#: js/js.js:869
msgid "today"
msgstr "haut"
-#: js/js.js:857
+#: js/js.js:870
msgid "yesterday"
msgstr "gëschter"
-#: js/js.js:858
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:859
+#: js/js.js:872
msgid "last month"
msgstr "leschte Mount"
-#: js/js.js:860
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:861
+#: js/js.js:874
msgid "months ago"
msgstr "Méint hir"
-#: js/js.js:862
+#: js/js.js:875
msgid "last year"
msgstr "Lescht Joer"
-#: js/js.js:863
+#: js/js.js:876
msgid "years ago"
msgstr "Joren hir"
@@ -267,6 +267,46 @@ msgstr "OK"
msgid "Error loading message template: {error}"
msgstr ""
+#: js/oc-dialogs.js:347
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:367
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:376
+msgid "Cancel"
+msgstr "Ofbriechen"
+
+#: js/oc-dialogs.js:386
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:457
+msgid "Error loading file exists template"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/lb/files.po b/l10n/lb/files.po
index 94e9d242643f8a6aa15c6138d6909da7a497c875..40727c4472ddddcf7a924d35ddafe3611742d0e9 100644
--- a/l10n/lb/files.po
+++ b/l10n/lb/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:00+0000\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
@@ -74,11 +74,15 @@ msgstr "Konnt net op den Disk schreiwen"
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:109
-msgid "Upload failed"
+#: ajax/upload.php:120 ajax/upload.php:143
+msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:127
+#: ajax/upload.php:136
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
+
+#: ajax/upload.php:160
msgid "Invalid directory."
msgstr ""
@@ -86,144 +90,148 @@ msgstr ""
msgid "Files"
msgstr "Dateien"
-#: js/file-upload.js:11
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Kann deng Datei net eroplueden well et en Dossier ass oder 0 byte grouss ass."
+#: js/file-upload.js:244
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
+msgstr ""
-#: js/file-upload.js:24
+#: js/file-upload.js:255
msgid "Not enough space available"
msgstr ""
-#: js/file-upload.js:64
+#: js/file-upload.js:322
msgid "Upload cancelled."
msgstr "Upload ofgebrach."
-#: js/file-upload.js:165
+#: js/file-upload.js:356
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:446
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "File Upload am gaang. Wann's de des Säit verléiss gëtt den Upload ofgebrach."
-#: js/file-upload.js:239
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr ""
-#: js/file-upload.js:244 lib/app.php:53
+#: js/file-upload.js:525 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550
+#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545
msgid "Error"
msgstr "Fehler"
-#: js/fileactions.js:116
+#: js/fileactions.js:119
msgid "Share"
msgstr "Deelen"
-#: js/fileactions.js:126
+#: js/fileactions.js:131
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:192
+#: js/fileactions.js:197
msgid "Rename"
msgstr ""
-#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr ""
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr ""
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "ersetzen"
-#: js/filelist.js:307
+#: js/filelist.js:416
msgid "suggest name"
msgstr ""
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "ofbriechen"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr ""
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "undo"
msgstr "réckgängeg man"
-#: js/filelist.js:424 js/filelist.js:490 js/files.js:581
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:425 js/filelist.js:491 js/files.js:587
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:432
+#: js/filelist.js:541
msgid "{dirs} and {files}"
msgstr ""
-#: js/filelist.js:563
+#: js/filelist.js:731 js/filelist.js:769
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:628
-msgid "files uploading"
-msgstr ""
-
-#: js/files.js:52
+#: js/files.js:25
msgid "'.' is an invalid file name."
msgstr ""
-#: js/files.js:56
+#: js/files.js:29
msgid "File name cannot be empty."
msgstr ""
-#: js/files.js:64
+#: js/files.js:37
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: js/files.js:78
+#: js/files.js:51
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr ""
-#: js/files.js:82
+#: js/files.js:55
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:94
+#: js/files.js:67
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
msgstr ""
-#: js/files.js:245
+#: js/files.js:296
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/files.js:563 templates/index.php:69
+#: js/files.js:507 js/files.js:545
+msgid "Error moving file"
+msgstr ""
+
+#: js/files.js:558 templates/index.php:61
msgid "Name"
msgstr "Numm"
-#: js/files.js:564 templates/index.php:81
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "Gréisst"
-#: js/files.js:565 templates/index.php:83
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr "Geännert"
@@ -232,7 +240,7 @@ msgstr "Geännert"
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:11 templates/index.php:18
+#: lib/helper.php:11 templates/index.php:17
msgid "Upload"
msgstr "Eroplueden"
@@ -268,65 +276,65 @@ msgstr "Maximal Gréisst fir ZIP Fichieren"
msgid "Save"
msgstr "Späicheren"
-#: templates/index.php:7
+#: templates/index.php:6
msgid "New"
msgstr "Nei"
-#: templates/index.php:10
+#: templates/index.php:9
msgid "Text file"
msgstr "Text Fichier"
-#: templates/index.php:12
+#: templates/index.php:11
msgid "Folder"
msgstr "Dossier"
-#: templates/index.php:14
+#: templates/index.php:13
msgid "From link"
msgstr ""
-#: templates/index.php:41
+#: templates/index.php:33
msgid "Deleted files"
msgstr ""
-#: templates/index.php:46
+#: templates/index.php:39
msgid "Cancel upload"
msgstr "Upload ofbriechen"
-#: templates/index.php:52
+#: templates/index.php:45
msgid "You don’t have write permissions here."
msgstr ""
-#: templates/index.php:59
+#: templates/index.php:50
msgid "Nothing in here. Upload something!"
msgstr "Hei ass näischt. Lued eppes rop!"
-#: templates/index.php:75
+#: templates/index.php:67
msgid "Download"
msgstr "Download"
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr "Net méi deelen"
-#: templates/index.php:94 templates/index.php:95
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "Läschen"
-#: templates/index.php:108
+#: templates/index.php:100
msgid "Upload too large"
msgstr "Upload ze grouss"
-#: templates/index.php:110
+#: templates/index.php:102
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Déi Dateien déi Dir probéiert erop ze lueden sinn méi grouss wei déi Maximal Gréisst déi op dësem Server erlaabt ass."
-#: templates/index.php:115
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr "Fichieren gi gescannt, war weg."
-#: templates/index.php:118
+#: templates/index.php:110
msgid "Current scanning"
msgstr "Momentane Scan"
diff --git a/l10n/lb/settings.po b/l10n/lb/settings.po
index 7f406ee863e4883686ba0763d53fc4f8deacdefd..d09ca81058c7135d3826710275cb38a369760037 100644
--- a/l10n/lb/settings.po
+++ b/l10n/lb/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:45-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
@@ -23,7 +23,7 @@ msgid "Unable to load list from App Store"
msgstr "Konnt Lescht net vum App Store lueden"
#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
-#: ajax/togglegroups.php:20
+#: ajax/togglegroups.php:20 changepassword/controller.php:55
msgid "Authentication error"
msgstr "Authentifikatioun's Fehler"
@@ -85,6 +85,35 @@ msgstr ""
msgid "Couldn't update app."
msgstr ""
+#: changepassword/controller.php:20
+msgid "Wrong password"
+msgstr ""
+
+#: changepassword/controller.php:42
+msgid "No user supplied"
+msgstr ""
+
+#: changepassword/controller.php:74
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr ""
+
+#: changepassword/controller.php:79
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr ""
+
+#: changepassword/controller.php:87
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr ""
+
+#: changepassword/controller.php:92 changepassword/controller.php:103
+msgid "Unable to change password"
+msgstr ""
+
#: js/apps.js:43
msgid "Update to {appversion}"
msgstr ""
@@ -129,15 +158,15 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:217
+#: js/personal.js:220
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:262
+#: js/personal.js:265
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:284
+#: js/personal.js:287
msgid "Saving..."
msgstr "Speicheren..."
diff --git a/l10n/lt_LT/core.po b/l10n/lt_LT/core.po
index 23fb315c5196eb633d3f251b0561ccbff5ae4d89..f340c7a46db57a87bc630805c51b01c0faaf11ab 100644
--- a/l10n/lt_LT/core.po
+++ b/l10n/lt_LT/core.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:33+0000\n"
+"POT-Creation-Date: 2013-09-22 12:55-0400\n"
+"PO-Revision-Date: 2013-09-20 15:01+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
@@ -96,23 +96,23 @@ msgstr "Klaida ištrinant %s iš jūsų mėgstamiausius."
#: avatar/controller.php:62
msgid "No image or file provided"
-msgstr ""
+msgstr "Nenurodytas paveikslÄ—lis ar failas"
#: avatar/controller.php:81
msgid "Unknown filetype"
-msgstr ""
+msgstr "Nežinomas failo tipas"
#: avatar/controller.php:85
msgid "Invalid image"
-msgstr ""
+msgstr "Netinkamas paveikslÄ—lis"
#: avatar/controller.php:115 avatar/controller.php:142
msgid "No temporary profile picture available, try again"
-msgstr ""
+msgstr "NÄ—ra laikino profilio paveikslÄ—lio, bandykite dar kartÄ…"
#: avatar/controller.php:135
msgid "No crop data provided"
-msgstr ""
+msgstr "Nenurodyti apkirpimo duomenys"
#: js/config.php:32
msgid "Sunday"
@@ -194,59 +194,59 @@ msgstr "Gruodis"
msgid "Settings"
msgstr "Nustatymai"
-#: js/js.js:853
+#: js/js.js:866
msgid "seconds ago"
msgstr "prieš sekundę"
-#: js/js.js:854
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] " prieš %n minutę"
msgstr[1] " prieÅ¡ %n minuÄių"
msgstr[2] " prieÅ¡ %n minuÄių"
-#: js/js.js:855
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "prieš %n valandą"
msgstr[1] "prieš %n valandų"
msgstr[2] "prieš %n valandų"
-#: js/js.js:856
+#: js/js.js:869
msgid "today"
msgstr "Å¡iandien"
-#: js/js.js:857
+#: js/js.js:870
msgid "yesterday"
msgstr "vakar"
-#: js/js.js:858
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "prieš %n dieną"
msgstr[1] "prieš %n dienas"
msgstr[2] "prieš %n dienų"
-#: js/js.js:859
+#: js/js.js:872
msgid "last month"
msgstr "praeitą mėnesį"
-#: js/js.js:860
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "prieš %n mėnesį"
msgstr[1] "prieš %n mėnesius"
msgstr[2] "prieš %n mėnesių"
-#: js/js.js:861
+#: js/js.js:874
msgid "months ago"
msgstr "prieš mėnesį"
-#: js/js.js:862
+#: js/js.js:875
msgid "last year"
msgstr "praeitais metais"
-#: js/js.js:863
+#: js/js.js:876
msgid "years ago"
msgstr "prieš metus"
@@ -256,7 +256,7 @@ msgstr "Pasirinkite"
#: js/oc-dialogs.js:146
msgid "Error loading file picker template: {error}"
-msgstr ""
+msgstr "Klaida įkeliant failo parinkimo ruošinį: {error}"
#: js/oc-dialogs.js:172
msgid "Yes"
@@ -272,6 +272,47 @@ msgstr "Gerai"
#: js/oc-dialogs.js:219
msgid "Error loading message template: {error}"
+msgstr "Klaida įkeliant žinutės ruošinį: {error}"
+
+#: js/oc-dialogs.js:347
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:367
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:376
+msgid "Cancel"
+msgstr "Atšaukti"
+
+#: js/oc-dialogs.js:386
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:457
+msgid "Error loading file exists template"
msgstr ""
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
diff --git a/l10n/lt_LT/files.po b/l10n/lt_LT/files.po
index 13c09972ea52edca46f56d4602c1b73bd59ec2c2..da69b0a419bf11cc830235eae937fe76592b884b 100644
--- a/l10n/lt_LT/files.po
+++ b/l10n/lt_LT/files.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:00+0000\n"
-"Last-Translator: Liudas Ališauskas <liudas.alisauskas@gmail.com>\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -76,11 +76,15 @@ msgstr "Nepavyko įrašyti į diską"
msgid "Not enough storage available"
msgstr "Nepakanka vietos serveryje"
-#: ajax/upload.php:109
-msgid "Upload failed"
-msgstr "Nusiuntimas nepavyko"
+#: ajax/upload.php:120 ajax/upload.php:143
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:136
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
-#: ajax/upload.php:127
+#: ajax/upload.php:160
msgid "Invalid directory."
msgstr "Neteisingas aplankas"
@@ -88,147 +92,151 @@ msgstr "Neteisingas aplankas"
msgid "Files"
msgstr "Failai"
-#: js/file-upload.js:11
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Neįmanoma įkelti failo - jo dydis gali būti 0 bitų arba tai katalogas"
+#: js/file-upload.js:244
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
+msgstr ""
-#: js/file-upload.js:24
+#: js/file-upload.js:255
msgid "Not enough space available"
msgstr "Nepakanka vietos"
-#: js/file-upload.js:64
+#: js/file-upload.js:322
msgid "Upload cancelled."
msgstr "Įkėlimas atšauktas."
-#: js/file-upload.js:165
+#: js/file-upload.js:356
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:446
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Failo įkėlimas pradėtas. Jei paliksite šį puslapį, įkėlimas nutrūks."
-#: js/file-upload.js:239
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr "URL negali bÅ«ti tuÅ¡Äias."
-#: js/file-upload.js:244 lib/app.php:53
+#: js/file-upload.js:525 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr "Negalimas aplanko pavadinimas. 'Shared' pavadinimas yra rezervuotas ownCloud"
-#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550
+#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545
msgid "Error"
msgstr "Klaida"
-#: js/fileactions.js:116
+#: js/fileactions.js:119
msgid "Share"
msgstr "Dalintis"
-#: js/fileactions.js:126
+#: js/fileactions.js:131
msgid "Delete permanently"
msgstr "Ištrinti negrįžtamai"
-#: js/fileactions.js:192
+#: js/fileactions.js:197
msgid "Rename"
msgstr "Pervadinti"
-#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "Laukiantis"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{new_name} jau egzistuoja"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "pakeisti"
-#: js/filelist.js:307
+#: js/filelist.js:416
msgid "suggest name"
msgstr "pasiūlyti pavadinimą"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "atšaukti"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr "pakeiskite {new_name} į {old_name}"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "undo"
msgstr "anuliuoti"
-#: js/filelist.js:424 js/filelist.js:490 js/files.js:581
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "%n aplankas"
msgstr[1] "%n aplankai"
msgstr[2] "%n aplankų"
-#: js/filelist.js:425 js/filelist.js:491 js/files.js:587
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "%n failas"
msgstr[1] "%n failai"
msgstr[2] "%n failų"
-#: js/filelist.js:432
+#: js/filelist.js:541
msgid "{dirs} and {files}"
msgstr "{dirs} ir {files}"
-#: js/filelist.js:563
+#: js/filelist.js:731 js/filelist.js:769
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "Įkeliamas %n failas"
msgstr[1] "Įkeliami %n failai"
msgstr[2] "Įkeliama %n failų"
-#: js/filelist.js:628
-msgid "files uploading"
-msgstr "įkeliami failai"
-
-#: js/files.js:52
+#: js/files.js:25
msgid "'.' is an invalid file name."
msgstr "'.' yra neleidžiamas failo pavadinime."
-#: js/files.js:56
+#: js/files.js:29
msgid "File name cannot be empty."
msgstr "Failo pavadinimas negali bÅ«ti tuÅ¡Äias."
-#: js/files.js:64
+#: js/files.js:37
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Neleistinas pavadinimas, '\\', '/', '<', '>', ':', '\"', '|', '?' ir '*' yra neleidžiami."
-#: js/files.js:78
+#: js/files.js:51
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr "Jūsų visa vieta serveryje užimta"
-#: js/files.js:82
+#: js/files.js:55
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Jūsų vieta serveryje beveik visa užimta ({usedSpacePercent}%)"
-#: js/files.js:94
+#: js/files.js:67
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
msgstr "Šifravimas buvo išjungtas, bet Jūsų failai vis dar užšifruoti. Prašome eiti į asmeninius nustatymus ir iššifruoti savo failus."
-#: js/files.js:245
+#: js/files.js:296
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "JÅ«sų atsisiuntimas yra paruoÅ¡iamas. tai gali užtrukti jei atsisiunÄiamas didelis failas."
-#: js/files.js:563 templates/index.php:69
+#: js/files.js:507 js/files.js:545
+msgid "Error moving file"
+msgstr ""
+
+#: js/files.js:558 templates/index.php:61
msgid "Name"
msgstr "Pavadinimas"
-#: js/files.js:564 templates/index.php:81
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "Dydis"
-#: js/files.js:565 templates/index.php:83
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr "Pakeista"
@@ -237,7 +245,7 @@ msgstr "Pakeista"
msgid "%s could not be renamed"
msgstr "%s negali būti pervadintas"
-#: lib/helper.php:11 templates/index.php:18
+#: lib/helper.php:11 templates/index.php:17
msgid "Upload"
msgstr "Įkelti"
@@ -273,65 +281,65 @@ msgstr "Maksimalus ZIP archyvo failo dydis"
msgid "Save"
msgstr "IÅ¡saugoti"
-#: templates/index.php:7
+#: templates/index.php:6
msgid "New"
msgstr "Naujas"
-#: templates/index.php:10
+#: templates/index.php:9
msgid "Text file"
msgstr "Teksto failas"
-#: templates/index.php:12
+#: templates/index.php:11
msgid "Folder"
msgstr "Katalogas"
-#: templates/index.php:14
+#: templates/index.php:13
msgid "From link"
msgstr "IÅ¡ nuorodos"
-#: templates/index.php:41
+#: templates/index.php:33
msgid "Deleted files"
msgstr "IÅ¡trinti failai"
-#: templates/index.php:46
+#: templates/index.php:39
msgid "Cancel upload"
msgstr "Atšaukti siuntimą"
-#: templates/index.php:52
+#: templates/index.php:45
msgid "You don’t have write permissions here."
msgstr "Jūs neturite rašymo leidimo."
-#: templates/index.php:59
+#: templates/index.php:50
msgid "Nothing in here. Upload something!"
msgstr "ÄŒia tuÅ¡Äia. Ä®kelkite kÄ… nors!"
-#: templates/index.php:75
+#: templates/index.php:67
msgid "Download"
msgstr "Atsisiųsti"
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr "Nebesidalinti"
-#: templates/index.php:94 templates/index.php:95
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "IÅ¡trinti"
-#: templates/index.php:108
+#: templates/index.php:100
msgid "Upload too large"
msgstr "Įkėlimui failas per didelis"
-#: templates/index.php:110
+#: templates/index.php:102
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Bandomų įkelti failų dydis viršija maksimalų, kuris leidžiamas šiame serveryje"
-#: templates/index.php:115
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr "Skenuojami failai, prašome palaukti."
-#: templates/index.php:118
+#: templates/index.php:110
msgid "Current scanning"
msgstr "Å iuo metu skenuojama"
diff --git a/l10n/lt_LT/lib.po b/l10n/lt_LT/lib.po
index 7b189b6247cef2f1b2296002a9fa547be82c5683..811ca96268b83abd8adf7d0792ea00f1cc413574 100644
--- a/l10n/lt_LT/lib.po
+++ b/l10n/lt_LT/lib.po
@@ -4,15 +4,16 @@
#
# Translators:
# fizikiukas <fizikiukas@gmail.com>, 2013
+# Liudas Ališauskas <liudas.alisauskas@gmail.com>, 2013
# Liudas <liudas@aksioma.lt>, 2013
# fizikiukas <fizikiukas@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-18 11:47-0400\n"
+"PO-Revision-Date: 2013-09-18 14:50+0000\n"
+"Last-Translator: Liudas Ališauskas <liudas.alisauskas@gmail.com>\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -58,15 +59,15 @@ msgstr "Nepavyko pakelti „%s“ versijos."
#: avatar.php:56
msgid "Custom profile pictures don't work with encryption yet"
-msgstr ""
+msgstr "Saviti profilio paveiksliukai dar neveikia su Å¡ifravimu"
#: avatar.php:64
msgid "Unknown filetype"
-msgstr ""
+msgstr "Nežinomas failo tipas"
#: avatar.php:69
msgid "Invalid image"
-msgstr ""
+msgstr "Netinkamas paveikslÄ—lis"
#: defaults.php:35
msgid "web services under your control"
diff --git a/l10n/lt_LT/settings.po b/l10n/lt_LT/settings.po
index ce270478859f9374e60d724a5eed18644485ba32..14592409dd94e4985f636edf01acf7697458e37f 100644
--- a/l10n/lt_LT/settings.po
+++ b/l10n/lt_LT/settings.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:45-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgid "Unable to load list from App Store"
msgstr "Neįmanoma įkelti sąrašo iš Programų Katalogo"
#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
-#: ajax/togglegroups.php:20
+#: ajax/togglegroups.php:20 changepassword/controller.php:55
msgid "Authentication error"
msgstr "Autentikacijos klaida"
@@ -88,6 +88,35 @@ msgstr "Nepavyko ištrinti vartotojo iš grupės %s"
msgid "Couldn't update app."
msgstr "Nepavyko atnaujinti programos."
+#: changepassword/controller.php:20
+msgid "Wrong password"
+msgstr ""
+
+#: changepassword/controller.php:42
+msgid "No user supplied"
+msgstr ""
+
+#: changepassword/controller.php:74
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr ""
+
+#: changepassword/controller.php:79
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr ""
+
+#: changepassword/controller.php:87
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr ""
+
+#: changepassword/controller.php:92 changepassword/controller.php:103
+msgid "Unable to change password"
+msgstr ""
+
#: js/apps.js:43
msgid "Update to {appversion}"
msgstr "Atnaujinti iki {appversion}"
@@ -132,15 +161,15 @@ msgstr "Atnaujinti"
msgid "Updated"
msgstr "Atnaujinta"
-#: js/personal.js:217
+#: js/personal.js:220
msgid "Select a profile picture"
-msgstr ""
+msgstr "Pažymėkite profilio paveikslėlį"
-#: js/personal.js:262
+#: js/personal.js:265
msgid "Decrypting files... Please wait, this can take some time."
msgstr "Iššifruojami failai... Prašome palaukti, tai gali užtrukti."
-#: js/personal.js:284
+#: js/personal.js:287
msgid "Saving..."
msgstr "Saugoma..."
@@ -464,31 +493,31 @@ msgstr "Pamiršto slaptažodžio atkūrimui įveskite savo el. pašto adresą"
#: templates/personal.php:86
msgid "Profile picture"
-msgstr ""
+msgstr "Profilio paveikslÄ—lis"
#: templates/personal.php:90
msgid "Upload new"
-msgstr ""
+msgstr "Įkelti naują"
#: templates/personal.php:92
msgid "Select new from Files"
-msgstr ""
+msgstr "Pasirinkti naują iš failų"
#: templates/personal.php:93
msgid "Remove image"
-msgstr ""
+msgstr "Pašalinti paveikslėlį"
#: templates/personal.php:94
msgid "Either png or jpg. Ideally square but you will be able to crop it."
-msgstr ""
+msgstr "Arba png arba jpg. Geriausia kvadratinį, bet galėsite jį apkarpyti."
#: templates/personal.php:97
msgid "Abort"
-msgstr ""
+msgstr "Atšaukti"
#: templates/personal.php:98
msgid "Choose as profile image"
-msgstr ""
+msgstr "Pasirinkite profilio paveiksliukÄ…"
#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
diff --git a/l10n/lt_LT/user_ldap.po b/l10n/lt_LT/user_ldap.po
index 5baac49ff31abd327f7d805e80b5105fad2c53c9..6649922b22b8c40e8ff8ee36dc6d7c71bd9f23a3 100644
--- a/l10n/lt_LT/user_ldap.po
+++ b/l10n/lt_LT/user_ldap.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Liudas <liudas@aksioma.lt>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-13 21:47-0400\n"
-"PO-Revision-Date: 2013-09-12 21:00+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-18 11:47-0400\n"
+"PO-Revision-Date: 2013-09-17 13:05+0000\n"
+"Last-Translator: Liudas Ališauskas <liudas.alisauskas@gmail.com>\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,11 +20,11 @@ msgstr ""
#: ajax/clearMappings.php:34
msgid "Failed to clear the mappings."
-msgstr ""
+msgstr "Nepavyko išvalyti sąsajų."
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
-msgstr ""
+msgstr "Nepavyko pašalinti serverio konfigūracijos"
#: ajax/testConfiguration.php:36
msgid "The configuration is valid and the connection could be established!"
@@ -51,7 +52,7 @@ msgstr ""
#: js/settings.js:83
msgid "Keep settings?"
-msgstr ""
+msgstr "IÅ¡laikyti nustatymus?"
#: js/settings.js:97
msgid "Cannot add server configuration"
@@ -59,11 +60,11 @@ msgstr ""
#: js/settings.js:111
msgid "mappings cleared"
-msgstr ""
+msgstr "susiejimai išvalyti"
#: js/settings.js:112
msgid "Success"
-msgstr ""
+msgstr "SÄ—kmingai"
#: js/settings.js:117
msgid "Error"
@@ -71,19 +72,19 @@ msgstr "Klaida"
#: js/settings.js:141
msgid "Connection test succeeded"
-msgstr ""
+msgstr "Ryšio patikrinimas pavyko"
#: js/settings.js:146
msgid "Connection test failed"
-msgstr ""
+msgstr "Ryšio patikrinimas nepavyko"
#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
-msgstr ""
+msgstr "Ar tikrai norite ištrinti dabartinę serverio konfigūraciją?"
#: js/settings.js:157
msgid "Confirm Deletion"
-msgstr ""
+msgstr "Patvirtinkite trynimÄ…"
#: templates/settings.php:9
msgid ""
@@ -100,11 +101,11 @@ msgstr ""
#: templates/settings.php:16
msgid "Server configuration"
-msgstr ""
+msgstr "Serverio konfigūravimas"
#: templates/settings.php:32
msgid "Add Server Configuration"
-msgstr ""
+msgstr "Pridėti serverio konfigūraciją"
#: templates/settings.php:37
msgid "Host"
@@ -117,11 +118,11 @@ msgstr ""
#: templates/settings.php:40
msgid "Base DN"
-msgstr ""
+msgstr "Bazinis DN"
#: templates/settings.php:41
msgid "One Base DN per line"
-msgstr ""
+msgstr "Vienas bazinis DN eilutÄ—je"
#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
@@ -129,7 +130,7 @@ msgstr ""
#: templates/settings.php:44
msgid "User DN"
-msgstr ""
+msgstr "Naudotojas DN"
#: templates/settings.php:46
msgid ""
@@ -144,11 +145,11 @@ msgstr "Slaptažodis"
#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
-msgstr ""
+msgstr "Anoniminiam prisijungimui, palikite DN ir Slaptažodis laukus tuÅ¡Äius."
#: templates/settings.php:51
msgid "User Login Filter"
-msgstr ""
+msgstr "Naudotojo prisijungimo filtras"
#: templates/settings.php:54
#, php-format
@@ -159,7 +160,7 @@ msgstr ""
#: templates/settings.php:55
msgid "User List Filter"
-msgstr ""
+msgstr "Naudotojo sąrašo filtras"
#: templates/settings.php:58
msgid ""
@@ -179,15 +180,15 @@ msgstr ""
#: templates/settings.php:66
msgid "Connection Settings"
-msgstr ""
+msgstr "Ryšio nustatymai"
#: templates/settings.php:68
msgid "Configuration Active"
-msgstr ""
+msgstr "Konfigūracija aktyvi"
#: templates/settings.php:68
msgid "When unchecked, this configuration will be skipped."
-msgstr ""
+msgstr "Kai nepažymėta, ši konfigūracija bus praleista."
#: templates/settings.php:69
msgid "Port"
@@ -195,7 +196,7 @@ msgstr "Prievadas"
#: templates/settings.php:70
msgid "Backup (Replica) Host"
-msgstr ""
+msgstr "AtsarginÄ—s kopijos (Replica) mazgas"
#: templates/settings.php:70
msgid ""
@@ -205,15 +206,15 @@ msgstr ""
#: templates/settings.php:71
msgid "Backup (Replica) Port"
-msgstr ""
+msgstr "AtsarginÄ—s kopijos (Replica) prievadas"
#: templates/settings.php:72
msgid "Disable Main Server"
-msgstr ""
+msgstr "Išjungti pagrindinį serverį"
#: templates/settings.php:72
msgid "Only connect to the replica server."
-msgstr ""
+msgstr "Tik prisijungti prie reprodukcinio (replica) serverio."
#: templates/settings.php:73
msgid "Use TLS"
@@ -248,7 +249,7 @@ msgstr ""
#: templates/settings.php:78
msgid "Directory Settings"
-msgstr ""
+msgstr "Katalogo nustatymai"
#: templates/settings.php:80
msgid "User Display Name Field"
@@ -260,7 +261,7 @@ msgstr ""
#: templates/settings.php:81
msgid "Base User Tree"
-msgstr ""
+msgstr "Bazinis naudotojo medis"
#: templates/settings.php:81
msgid "One User Base DN per line"
@@ -268,7 +269,7 @@ msgstr ""
#: templates/settings.php:82
msgid "User Search Attributes"
-msgstr ""
+msgstr "Naudotojo paieškos atributai"
#: templates/settings.php:82 templates/settings.php:85
msgid "Optional; one attribute per line"
@@ -284,7 +285,7 @@ msgstr ""
#: templates/settings.php:84
msgid "Base Group Tree"
-msgstr ""
+msgstr "Bazinis grupÄ—s medis"
#: templates/settings.php:84
msgid "One Group Base DN per line"
@@ -292,35 +293,35 @@ msgstr ""
#: templates/settings.php:85
msgid "Group Search Attributes"
-msgstr ""
+msgstr "Grupės paieškos atributai"
#: templates/settings.php:86
msgid "Group-Member association"
-msgstr ""
+msgstr "GrupÄ—s-Nario sÄ…saja"
#: templates/settings.php:88
msgid "Special Attributes"
-msgstr ""
+msgstr "Specialūs atributai"
#: templates/settings.php:90
msgid "Quota Field"
-msgstr ""
+msgstr "Kvotos laukas"
#: templates/settings.php:91
msgid "Quota Default"
-msgstr ""
+msgstr "Numatyta kvota"
#: templates/settings.php:91
msgid "in bytes"
-msgstr ""
+msgstr "baitais"
#: templates/settings.php:92
msgid "Email Field"
-msgstr ""
+msgstr "El. pašto laukas"
#: templates/settings.php:93
msgid "User Home Folder Naming Rule"
-msgstr ""
+msgstr "Naudotojo namų aplanko pavadinimo taisyklė"
#: templates/settings.php:93
msgid ""
@@ -330,7 +331,7 @@ msgstr ""
#: templates/settings.php:98
msgid "Internal Username"
-msgstr ""
+msgstr "Vidinis naudotojo vardas"
#: templates/settings.php:99
msgid ""
@@ -350,11 +351,11 @@ msgstr ""
#: templates/settings.php:100
msgid "Internal Username Attribute:"
-msgstr ""
+msgstr "Vidinis naudotojo vardo atributas:"
#: templates/settings.php:101
msgid "Override UUID detection"
-msgstr ""
+msgstr "Perrašyti UUID aptikimą"
#: templates/settings.php:102
msgid ""
@@ -369,11 +370,11 @@ msgstr ""
#: templates/settings.php:103
msgid "UUID Attribute:"
-msgstr ""
+msgstr "UUID atributas:"
#: templates/settings.php:104
msgid "Username-LDAP User Mapping"
-msgstr ""
+msgstr "Naudotojo vardo - LDAP naudotojo sÄ…saja"
#: templates/settings.php:105
msgid ""
@@ -391,15 +392,15 @@ msgstr ""
#: templates/settings.php:106
msgid "Clear Username-LDAP User Mapping"
-msgstr ""
+msgstr "IÅ¡valyti naudotojo vardo - LDAP naudotojo sÄ…sajÄ…"
#: templates/settings.php:106
msgid "Clear Groupname-LDAP Group Mapping"
-msgstr ""
+msgstr "IÅ¡valyti grupÄ—s pavadinimo - LDAP naudotojo sÄ…sajÄ…"
#: templates/settings.php:108
msgid "Test Configuration"
-msgstr ""
+msgstr "Bandyti konfigūraciją"
#: templates/settings.php:108
msgid "Help"
diff --git a/l10n/lv/core.po b/l10n/lv/core.po
index a0a14df889d8a1cdf0f46a511306940d82dd1d73..813a5545833429e20835f2301e22861d92156303 100644
--- a/l10n/lv/core.po
+++ b/l10n/lv/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:33+0000\n"
+"POT-Creation-Date: 2013-09-22 12:55-0400\n"
+"PO-Revision-Date: 2013-09-20 15:01+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
@@ -191,59 +191,59 @@ msgstr "Decembris"
msgid "Settings"
msgstr "Iestatījumi"
-#: js/js.js:853
+#: js/js.js:866
msgid "seconds ago"
msgstr "sekundes atpakaļ"
-#: js/js.js:854
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "Tagad, %n minūtes"
msgstr[1] "Pirms %n minūtes"
msgstr[2] "Pirms %n minūtēm"
-#: js/js.js:855
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "Å odien, %n stundas"
msgstr[1] "Pirms %n stundas"
msgstr[2] "Pirms %n stundÄm"
-#: js/js.js:856
+#: js/js.js:869
msgid "today"
msgstr "Å¡odien"
-#: js/js.js:857
+#: js/js.js:870
msgid "yesterday"
msgstr "vakar"
-#: js/js.js:858
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "Å odien, %n dienas"
msgstr[1] "Pirms %n dienas"
msgstr[2] "Pirms %n dienÄm"
-#: js/js.js:859
+#: js/js.js:872
msgid "last month"
msgstr "pagÄjuÅ¡ajÄ mÄ“nesÄ«"
-#: js/js.js:860
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "Šomēnes, %n mēneši"
msgstr[1] "Pirms %n mēneša"
msgstr[2] "Pirms %n mēnešiem"
-#: js/js.js:861
+#: js/js.js:874
msgid "months ago"
msgstr "mēnešus atpakaļ"
-#: js/js.js:862
+#: js/js.js:875
msgid "last year"
msgstr "gÄjuÅ¡ajÄ gadÄ"
-#: js/js.js:863
+#: js/js.js:876
msgid "years ago"
msgstr "gadus atpakaļ"
@@ -271,6 +271,47 @@ msgstr "Labi"
msgid "Error loading message template: {error}"
msgstr ""
+#: js/oc-dialogs.js:347
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:367
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:376
+msgid "Cancel"
+msgstr "Atcelt"
+
+#: js/oc-dialogs.js:386
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:457
+msgid "Error loading file exists template"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/lv/files.po b/l10n/lv/files.po
index c173b6e331c65ad18a71a1f8c36a79dc9689f422..c2bec93c45863210fd56395c38a1c9ea8cb52627 100644
--- a/l10n/lv/files.po
+++ b/l10n/lv/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:00+0000\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
@@ -75,11 +75,15 @@ msgstr "NeizdevÄs saglabÄt diskÄ"
msgid "Not enough storage available"
msgstr "Nav pietiekami daudz vietas"
-#: ajax/upload.php:109
-msgid "Upload failed"
-msgstr "NeizdevÄs augÅ¡upielÄdÄ“t"
+#: ajax/upload.php:120 ajax/upload.php:143
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:136
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
-#: ajax/upload.php:127
+#: ajax/upload.php:160
msgid "Invalid directory."
msgstr "Nederīga direktorija."
@@ -87,147 +91,151 @@ msgstr "Nederīga direktorija."
msgid "Files"
msgstr "Datnes"
-#: js/file-upload.js:11
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Nevar augÅ¡upielÄdÄ“t jÅ«su datni, jo tÄ ir direktorija vai arÄ« tÄ ir 0 baitu liela"
+#: js/file-upload.js:244
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
+msgstr ""
-#: js/file-upload.js:24
+#: js/file-upload.js:255
msgid "Not enough space available"
msgstr "Nepietiek brīvas vietas"
-#: js/file-upload.js:64
+#: js/file-upload.js:322
msgid "Upload cancelled."
msgstr "AugÅ¡upielÄde ir atcelta."
-#: js/file-upload.js:165
+#: js/file-upload.js:356
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:446
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Notiek augÅ¡upielÄde. Pametot lapu tagad, tiks atcelta augÅ¡upielÄde."
-#: js/file-upload.js:239
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr "URL nevar būt tukšs."
-#: js/file-upload.js:244 lib/app.php:53
+#: js/file-upload.js:525 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr "Kļūdains mapes nosaukums. 'Shared' lietošana ir rezervēta no ownCloud"
-#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550
+#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545
msgid "Error"
msgstr "Kļūda"
-#: js/fileactions.js:116
+#: js/fileactions.js:119
msgid "Share"
msgstr "Dalīties"
-#: js/fileactions.js:126
+#: js/fileactions.js:131
msgid "Delete permanently"
msgstr "Dzēst pavisam"
-#: js/fileactions.js:192
+#: js/fileactions.js:197
msgid "Rename"
msgstr "PÄrsaukt"
-#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "Gaida savu kÄrtu"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{new_name} jau eksistē"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "aizvietot"
-#: js/filelist.js:307
+#: js/filelist.js:416
msgid "suggest name"
msgstr "ieteiktais nosaukums"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "atcelt"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr "aizvietoja {new_name} ar {old_name}"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "undo"
msgstr "atsaukt"
-#: js/filelist.js:424 js/filelist.js:490 js/files.js:581
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "%n mapes"
msgstr[1] "%n mape"
msgstr[2] "%n mapes"
-#: js/filelist.js:425 js/filelist.js:491 js/files.js:587
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "%n faili"
msgstr[1] "%n fails"
msgstr[2] "%n faili"
-#: js/filelist.js:432
+#: js/filelist.js:541
msgid "{dirs} and {files}"
msgstr ""
-#: js/filelist.js:563
+#: js/filelist.js:731 js/filelist.js:769
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "%n"
msgstr[1] "AugÅ¡upielÄde %n failu"
msgstr[2] "AugÅ¡upielÄde %n failus"
-#: js/filelist.js:628
-msgid "files uploading"
-msgstr "fails augÅ¡upielÄdÄ“jas"
-
-#: js/files.js:52
+#: js/files.js:25
msgid "'.' is an invalid file name."
msgstr "'.' ir nederīgs datnes nosaukums."
-#: js/files.js:56
+#: js/files.js:29
msgid "File name cannot be empty."
msgstr "Datnes nosaukums nevar būt tukšs."
-#: js/files.js:64
+#: js/files.js:37
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Nederīgs nosaukums, nav atļauti '\\', '/', '<', '>', ':', '\"', '|', '?' un '*'."
-#: js/files.js:78
+#: js/files.js:51
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr "JÅ«su krÄtuve ir pilna, datnes vairs nevar augÅ¡upielÄdÄ“t vai sinhronizÄ“t!"
-#: js/files.js:82
+#: js/files.js:55
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "JÅ«su krÄtuve ir gandrÄ«z pilna ({usedSpacePercent}%)"
-#: js/files.js:94
+#: js/files.js:67
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
msgstr "Å ifrÄ“Å¡ana tika atslÄ“gta, tomÄ“r jÅ«su faili joprojÄm ir Å¡ifrÄ“ti. AtÅ¡ifrÄ“t failus var Personiskajos uzstÄdÄ«jumos."
-#: js/files.js:245
+#: js/files.js:296
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "Tiek sagatavota lejupielÄde. Tas var aizņemt kÄdu laiciņu, ja datnes ir lielas."
-#: js/files.js:563 templates/index.php:69
+#: js/files.js:507 js/files.js:545
+msgid "Error moving file"
+msgstr ""
+
+#: js/files.js:558 templates/index.php:61
msgid "Name"
msgstr "Nosaukums"
-#: js/files.js:564 templates/index.php:81
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "Izmērs"
-#: js/files.js:565 templates/index.php:83
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr "Mainīts"
@@ -236,7 +244,7 @@ msgstr "Mainīts"
msgid "%s could not be renamed"
msgstr "%s nevar tikt pÄrsaukts"
-#: lib/helper.php:11 templates/index.php:18
+#: lib/helper.php:11 templates/index.php:17
msgid "Upload"
msgstr "AugÅ¡upielÄdÄ“t"
@@ -272,65 +280,65 @@ msgstr "MaksimÄlais ievades izmÄ“rs ZIP datnÄ“m"
msgid "Save"
msgstr "SaglabÄt"
-#: templates/index.php:7
+#: templates/index.php:6
msgid "New"
msgstr "Jauna"
-#: templates/index.php:10
+#: templates/index.php:9
msgid "Text file"
msgstr "Teksta datne"
-#: templates/index.php:12
+#: templates/index.php:11
msgid "Folder"
msgstr "Mape"
-#: templates/index.php:14
+#: templates/index.php:13
msgid "From link"
msgstr "No saites"
-#: templates/index.php:41
+#: templates/index.php:33
msgid "Deleted files"
msgstr "DzÄ“stÄs datnes"
-#: templates/index.php:46
+#: templates/index.php:39
msgid "Cancel upload"
msgstr "Atcelt augÅ¡upielÄdi"
-#: templates/index.php:52
+#: templates/index.php:45
msgid "You don’t have write permissions here."
msgstr "Jums nav tiesību šeit rakstīt."
-#: templates/index.php:59
+#: templates/index.php:50
msgid "Nothing in here. Upload something!"
msgstr "Te vÄ“l nekas nav. RÄ«kojies, sÄc augÅ¡upielÄdÄ“t!"
-#: templates/index.php:75
+#: templates/index.php:67
msgid "Download"
msgstr "LejupielÄdÄ“t"
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr "PÄrtraukt dalÄ«Å¡anos"
-#: templates/index.php:94 templates/index.php:95
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "Dzēst"
-#: templates/index.php:108
+#: templates/index.php:100
msgid "Upload too large"
msgstr "Datne ir par lielu, lai to augÅ¡upielÄdÄ“tu"
-#: templates/index.php:110
+#: templates/index.php:102
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "AugÅ¡upielÄdÄ“jamÄs datnes pÄrsniedz servera pieļaujamo datņu augÅ¡upielÄdes apjomu"
-#: templates/index.php:115
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr "Datnes šobrīd tiek caurskatītas, lūdzu, uzgaidiet."
-#: templates/index.php:118
+#: templates/index.php:110
msgid "Current scanning"
msgstr "Šobrīd tiek caurskatīts"
diff --git a/l10n/lv/settings.po b/l10n/lv/settings.po
index f04b2af573eeed30fbc74898a97e318e758b9406..68f2e3c4db40446d33f155f7190c16cffc43ddfb 100644
--- a/l10n/lv/settings.po
+++ b/l10n/lv/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:45-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
@@ -23,7 +23,7 @@ msgid "Unable to load list from App Store"
msgstr "Nevar lejupielÄdÄ“t sarakstu no lietotņu veikala"
#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
-#: ajax/togglegroups.php:20
+#: ajax/togglegroups.php:20 changepassword/controller.php:55
msgid "Authentication error"
msgstr "AutentifikÄcijas kļūda"
@@ -85,6 +85,35 @@ msgstr "Nevar izņemt lietotÄju no grupas %s"
msgid "Couldn't update app."
msgstr "NevarÄ“ja atjauninÄt lietotni."
+#: changepassword/controller.php:20
+msgid "Wrong password"
+msgstr ""
+
+#: changepassword/controller.php:42
+msgid "No user supplied"
+msgstr ""
+
+#: changepassword/controller.php:74
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr ""
+
+#: changepassword/controller.php:79
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr ""
+
+#: changepassword/controller.php:87
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr ""
+
+#: changepassword/controller.php:92 changepassword/controller.php:103
+msgid "Unable to change password"
+msgstr ""
+
#: js/apps.js:43
msgid "Update to {appversion}"
msgstr "AtjauninÄt uz {appversion}"
@@ -129,15 +158,15 @@ msgstr "AtjauninÄt"
msgid "Updated"
msgstr "AtjauninÄta"
-#: js/personal.js:217
+#: js/personal.js:220
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:262
+#: js/personal.js:265
msgid "Decrypting files... Please wait, this can take some time."
msgstr "AtÅ¡ifrÄ“ju failus... Uzgaidiet tas var ilgt kÄdu laiku."
-#: js/personal.js:284
+#: js/personal.js:287
msgid "Saving..."
msgstr "SaglabÄ..."
diff --git a/l10n/mk/core.po b/l10n/mk/core.po
index 4adcd52cb6cd3e8c42a868704851c6769b0767f7..c1f6fdbed94e2edb0a26854dc12b9827cbc4025f 100644
--- a/l10n/mk/core.po
+++ b/l10n/mk/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:33+0000\n"
+"POT-Creation-Date: 2013-09-22 12:55-0400\n"
+"PO-Revision-Date: 2013-09-20 15:01+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
@@ -190,55 +190,55 @@ msgstr "Декември"
msgid "Settings"
msgstr "ПодеÑувања"
-#: js/js.js:853
+#: js/js.js:866
msgid "seconds ago"
msgstr "пред Ñекунди"
-#: js/js.js:854
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:855
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:856
+#: js/js.js:869
msgid "today"
msgstr "денеÑка"
-#: js/js.js:857
+#: js/js.js:870
msgid "yesterday"
msgstr "вчера"
-#: js/js.js:858
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:859
+#: js/js.js:872
msgid "last month"
msgstr "минатиот меÑец"
-#: js/js.js:860
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:861
+#: js/js.js:874
msgid "months ago"
msgstr "пред меÑеци"
-#: js/js.js:862
+#: js/js.js:875
msgid "last year"
msgstr "минатата година"
-#: js/js.js:863
+#: js/js.js:876
msgid "years ago"
msgstr "пред години"
@@ -266,6 +266,46 @@ msgstr "Во ред"
msgid "Error loading message template: {error}"
msgstr ""
+#: js/oc-dialogs.js:347
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:367
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:376
+msgid "Cancel"
+msgstr "Откажи"
+
+#: js/oc-dialogs.js:386
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:457
+msgid "Error loading file exists template"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/mk/files.po b/l10n/mk/files.po
index 3d0602225b04da07352a44f5638b2a191c8c0006..a075f4d8f849307eaa272816f95072e1caa9069f 100644
--- a/l10n/mk/files.po
+++ b/l10n/mk/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:00+0000\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
@@ -74,11 +74,15 @@ msgstr "ÐеуÑпеав да запишам на диÑк"
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:109
-msgid "Upload failed"
+#: ajax/upload.php:120 ajax/upload.php:143
+msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:127
+#: ajax/upload.php:136
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
+
+#: ajax/upload.php:160
msgid "Invalid directory."
msgstr ""
@@ -86,144 +90,148 @@ msgstr ""
msgid "Files"
msgstr "Датотеки"
-#: js/file-upload.js:11
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Ðе може да Ñе преземе вашата датотека бидејќи фолдерот во кој Ñе наоѓа фајлот има големина од 0 бајти"
+#: js/file-upload.js:244
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
+msgstr ""
-#: js/file-upload.js:24
+#: js/file-upload.js:255
msgid "Not enough space available"
msgstr ""
-#: js/file-upload.js:64
+#: js/file-upload.js:322
msgid "Upload cancelled."
msgstr "Преземањето е прекинато."
-#: js/file-upload.js:165
+#: js/file-upload.js:356
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:446
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Подигање на датотека е во тек. Ðапуштење на Ñтраницата ќе го прекине."
-#: js/file-upload.js:239
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr "ÐдреÑата неможе да биде празна."
-#: js/file-upload.js:244 lib/app.php:53
+#: js/file-upload.js:525 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550
+#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545
msgid "Error"
msgstr "Грешка"
-#: js/fileactions.js:116
+#: js/fileactions.js:119
msgid "Share"
msgstr "Сподели"
-#: js/fileactions.js:126
+#: js/fileactions.js:131
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:192
+#: js/fileactions.js:197
msgid "Rename"
msgstr "Преименувај"
-#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "Чека"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{new_name} веќе поÑтои"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "замени"
-#: js/filelist.js:307
+#: js/filelist.js:416
msgid "suggest name"
msgstr "предложи име"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "откажи"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr "заменета {new_name} Ñо {old_name}"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "undo"
msgstr "врати"
-#: js/filelist.js:424 js/filelist.js:490 js/files.js:581
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:425 js/filelist.js:491 js/files.js:587
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:432
+#: js/filelist.js:541
msgid "{dirs} and {files}"
msgstr ""
-#: js/filelist.js:563
+#: js/filelist.js:731 js/filelist.js:769
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:628
-msgid "files uploading"
-msgstr ""
-
-#: js/files.js:52
+#: js/files.js:25
msgid "'.' is an invalid file name."
msgstr ""
-#: js/files.js:56
+#: js/files.js:29
msgid "File name cannot be empty."
msgstr ""
-#: js/files.js:64
+#: js/files.js:37
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Ðеправилно име. , '\\', '/', '<', '>', ':', '\"', '|', '?' и '*' не Ñе дозволени."
-#: js/files.js:78
+#: js/files.js:51
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr ""
-#: js/files.js:82
+#: js/files.js:55
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:94
+#: js/files.js:67
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
msgstr ""
-#: js/files.js:245
+#: js/files.js:296
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/files.js:563 templates/index.php:69
+#: js/files.js:507 js/files.js:545
+msgid "Error moving file"
+msgstr ""
+
+#: js/files.js:558 templates/index.php:61
msgid "Name"
msgstr "Име"
-#: js/files.js:564 templates/index.php:81
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "Големина"
-#: js/files.js:565 templates/index.php:83
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr "Променето"
@@ -232,7 +240,7 @@ msgstr "Променето"
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:11 templates/index.php:18
+#: lib/helper.php:11 templates/index.php:17
msgid "Upload"
msgstr "Подигни"
@@ -268,65 +276,65 @@ msgstr "МакÑимална големина за Ð²Ð½ÐµÑ Ð½Ð° ZIP датот
msgid "Save"
msgstr "Сними"
-#: templates/index.php:7
+#: templates/index.php:6
msgid "New"
msgstr "Ðово"
-#: templates/index.php:10
+#: templates/index.php:9
msgid "Text file"
msgstr "ТекÑтуална датотека"
-#: templates/index.php:12
+#: templates/index.php:11
msgid "Folder"
msgstr "Папка"
-#: templates/index.php:14
+#: templates/index.php:13
msgid "From link"
msgstr "Од врÑка"
-#: templates/index.php:41
+#: templates/index.php:33
msgid "Deleted files"
msgstr ""
-#: templates/index.php:46
+#: templates/index.php:39
msgid "Cancel upload"
msgstr "Откажи прикачување"
-#: templates/index.php:52
+#: templates/index.php:45
msgid "You don’t have write permissions here."
msgstr ""
-#: templates/index.php:59
+#: templates/index.php:50
msgid "Nothing in here. Upload something!"
msgstr "Тука нема ништо. Снимете нешто!"
-#: templates/index.php:75
+#: templates/index.php:67
msgid "Download"
msgstr "Преземи"
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr "Ðе Ñподелувај"
-#: templates/index.php:94 templates/index.php:95
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "Избриши"
-#: templates/index.php:108
+#: templates/index.php:100
msgid "Upload too large"
msgstr "Фајлот кој Ñе вчитува е преголем"
-#: templates/index.php:110
+#: templates/index.php:102
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Датотеките кои Ñе обидувате да ги подигнете ја надминуваат макÑималната големина за подигнување датотеки на овој Ñервер."
-#: templates/index.php:115
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr "Се Ñкенираат датотеки, ве молам почекајте."
-#: templates/index.php:118
+#: templates/index.php:110
msgid "Current scanning"
msgstr "Моментално Ñкенирам"
diff --git a/l10n/mk/settings.po b/l10n/mk/settings.po
index 38fa0d44ed1f67a2e01e7cd375be6cb2c6b28daf..d8573ecf006253b2bdee41247c2553649225e441 100644
--- a/l10n/mk/settings.po
+++ b/l10n/mk/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:45-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgid "Unable to load list from App Store"
msgstr "Ðеможам да вчитам лиÑта од App Store"
#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
-#: ajax/togglegroups.php:20
+#: ajax/togglegroups.php:20 changepassword/controller.php:55
msgid "Authentication error"
msgstr "Грешка во автентикација"
@@ -84,6 +84,35 @@ msgstr "Ðеможе да избришам кориÑник од група %s"
msgid "Couldn't update app."
msgstr ""
+#: changepassword/controller.php:20
+msgid "Wrong password"
+msgstr ""
+
+#: changepassword/controller.php:42
+msgid "No user supplied"
+msgstr ""
+
+#: changepassword/controller.php:74
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr ""
+
+#: changepassword/controller.php:79
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr ""
+
+#: changepassword/controller.php:87
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr ""
+
+#: changepassword/controller.php:92 changepassword/controller.php:103
+msgid "Unable to change password"
+msgstr ""
+
#: js/apps.js:43
msgid "Update to {appversion}"
msgstr ""
@@ -128,15 +157,15 @@ msgstr "Ðжурирај"
msgid "Updated"
msgstr ""
-#: js/personal.js:217
+#: js/personal.js:220
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:262
+#: js/personal.js:265
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:284
+#: js/personal.js:287
msgid "Saving..."
msgstr "Снимам..."
@@ -460,7 +489,7 @@ msgstr "Пополни ја адреÑата за е-пошта за да мож
#: templates/personal.php:86
msgid "Profile picture"
-msgstr ""
+msgstr "Фотографија за профил"
#: templates/personal.php:90
msgid "Upload new"
diff --git a/l10n/ml_IN/core.po b/l10n/ml_IN/core.po
index 18bc15e9ed70fea5de8bcebe4af616ee2c63a531..8e7523af26c2b0d7b3e65fb903ea17b3b6aaf8ac 100644
--- a/l10n/ml_IN/core.po
+++ b/l10n/ml_IN/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Malayalam (India) (http://www.transifex.com/projects/p/owncloud/language/ml_IN/)\n"
"MIME-Version: 1.0\n"
@@ -190,55 +190,55 @@ msgstr ""
msgid "Settings"
msgstr ""
-#: js/js.js:853
+#: js/js.js:866
msgid "seconds ago"
msgstr ""
-#: js/js.js:854
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:855
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:856
+#: js/js.js:869
msgid "today"
msgstr ""
-#: js/js.js:857
+#: js/js.js:870
msgid "yesterday"
msgstr ""
-#: js/js.js:858
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:859
+#: js/js.js:872
msgid "last month"
msgstr ""
-#: js/js.js:860
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:861
+#: js/js.js:874
msgid "months ago"
msgstr ""
-#: js/js.js:862
+#: js/js.js:875
msgid "last year"
msgstr ""
-#: js/js.js:863
+#: js/js.js:876
msgid "years ago"
msgstr ""
@@ -266,6 +266,46 @@ msgstr ""
msgid "Error loading message template: {error}"
msgstr ""
+#: js/oc-dialogs.js:347
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:367
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:376
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:386
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:457
+msgid "Error loading file exists template"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/ml_IN/files.po b/l10n/ml_IN/files.po
index 6f1d3f841e585554c8c25f2c2f8b9ae0cfcf90da..5a25ca39107bf7e61aaecd6c323451082cbd93ea 100644
--- a/l10n/ml_IN/files.po
+++ b/l10n/ml_IN/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-30 09:31-0400\n"
-"PO-Revision-Date: 2013-08-30 13:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Malayalam (India) (http://www.transifex.com/projects/p/owncloud/language/ml_IN/)\n"
"MIME-Version: 1.0\n"
@@ -74,11 +74,15 @@ msgstr ""
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:109
-msgid "Upload failed"
+#: ajax/upload.php:120 ajax/upload.php:143
+msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:127
+#: ajax/upload.php:136
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
+
+#: ajax/upload.php:160
msgid "Invalid directory."
msgstr ""
@@ -86,144 +90,148 @@ msgstr ""
msgid "Files"
msgstr ""
-#: js/file-upload.js:11
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
+#: js/file-upload.js:244
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr ""
-#: js/file-upload.js:24
+#: js/file-upload.js:255
msgid "Not enough space available"
msgstr ""
-#: js/file-upload.js:64
+#: js/file-upload.js:322
msgid "Upload cancelled."
msgstr ""
-#: js/file-upload.js:165
+#: js/file-upload.js:356
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:446
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/file-upload.js:239
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr ""
-#: js/file-upload.js:244 lib/app.php:53
+#: js/file-upload.js:525 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
+#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545
msgid "Error"
msgstr ""
-#: js/fileactions.js:116
+#: js/fileactions.js:119
msgid "Share"
msgstr ""
-#: js/fileactions.js:126
+#: js/fileactions.js:131
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:192
+#: js/fileactions.js:197
msgid "Rename"
msgstr ""
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr ""
-#: js/filelist.js:305 js/filelist.js:307
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr ""
-#: js/filelist.js:305 js/filelist.js:307
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr ""
-#: js/filelist.js:305
+#: js/filelist.js:416
msgid "suggest name"
msgstr ""
-#: js/filelist.js:305 js/filelist.js:307
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr ""
-#: js/filelist.js:352
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr ""
-#: js/filelist.js:352
+#: js/filelist.js:463
msgid "undo"
msgstr ""
-#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:430
+#: js/filelist.js:541
msgid "{dirs} and {files}"
msgstr ""
-#: js/filelist.js:561
+#: js/filelist.js:731 js/filelist.js:769
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:626
-msgid "files uploading"
-msgstr ""
-
-#: js/files.js:52
+#: js/files.js:25
msgid "'.' is an invalid file name."
msgstr ""
-#: js/files.js:56
+#: js/files.js:29
msgid "File name cannot be empty."
msgstr ""
-#: js/files.js:64
+#: js/files.js:37
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: js/files.js:78
+#: js/files.js:51
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr ""
-#: js/files.js:82
+#: js/files.js:55
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:94
+#: js/files.js:67
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
msgstr ""
-#: js/files.js:245
+#: js/files.js:296
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/files.js:562 templates/index.php:67
+#: js/files.js:507 js/files.js:545
+msgid "Error moving file"
+msgstr ""
+
+#: js/files.js:558 templates/index.php:61
msgid "Name"
msgstr ""
-#: js/files.js:563 templates/index.php:78
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr ""
-#: js/files.js:564 templates/index.php:80
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr ""
@@ -232,7 +240,7 @@ msgstr ""
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:11 templates/index.php:18
+#: lib/helper.php:11 templates/index.php:17
msgid "Upload"
msgstr ""
@@ -268,65 +276,65 @@ msgstr ""
msgid "Save"
msgstr ""
-#: templates/index.php:7
+#: templates/index.php:6
msgid "New"
msgstr ""
-#: templates/index.php:10
+#: templates/index.php:9
msgid "Text file"
msgstr ""
-#: templates/index.php:12
+#: templates/index.php:11
msgid "Folder"
msgstr ""
-#: templates/index.php:14
+#: templates/index.php:13
msgid "From link"
msgstr ""
-#: templates/index.php:41
+#: templates/index.php:33
msgid "Deleted files"
msgstr ""
-#: templates/index.php:46
+#: templates/index.php:39
msgid "Cancel upload"
msgstr ""
-#: templates/index.php:52
+#: templates/index.php:45
msgid "You don’t have write permissions here."
msgstr ""
-#: templates/index.php:59
+#: templates/index.php:50
msgid "Nothing in here. Upload something!"
msgstr ""
-#: templates/index.php:73
+#: templates/index.php:67
msgid "Download"
msgstr ""
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr ""
-#: templates/index.php:91 templates/index.php:92
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr ""
-#: templates/index.php:105
+#: templates/index.php:100
msgid "Upload too large"
msgstr ""
-#: templates/index.php:107
+#: templates/index.php:102
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: templates/index.php:112
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:115
+#: templates/index.php:110
msgid "Current scanning"
msgstr ""
diff --git a/l10n/ml_IN/settings.po b/l10n/ml_IN/settings.po
index 860543d098407525ea63869661d24681852a45f9..127decca7902ec16f5d898185ac22c2951e1825b 100644
--- a/l10n/ml_IN/settings.po
+++ b/l10n/ml_IN/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:45-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Malayalam (India) (http://www.transifex.com/projects/p/owncloud/language/ml_IN/)\n"
"MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgid "Unable to load list from App Store"
msgstr ""
#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
-#: ajax/togglegroups.php:20
+#: ajax/togglegroups.php:20 changepassword/controller.php:55
msgid "Authentication error"
msgstr ""
@@ -84,6 +84,35 @@ msgstr ""
msgid "Couldn't update app."
msgstr ""
+#: changepassword/controller.php:20
+msgid "Wrong password"
+msgstr ""
+
+#: changepassword/controller.php:42
+msgid "No user supplied"
+msgstr ""
+
+#: changepassword/controller.php:74
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr ""
+
+#: changepassword/controller.php:79
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr ""
+
+#: changepassword/controller.php:87
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr ""
+
+#: changepassword/controller.php:92 changepassword/controller.php:103
+msgid "Unable to change password"
+msgstr ""
+
#: js/apps.js:43
msgid "Update to {appversion}"
msgstr ""
@@ -128,15 +157,15 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:217
+#: js/personal.js:220
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:262
+#: js/personal.js:265
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:284
+#: js/personal.js:287
msgid "Saving..."
msgstr ""
diff --git a/l10n/ms_MY/core.po b/l10n/ms_MY/core.po
index 18895df227efd53a93ec9a9eb2098c671eed5478..3809aef14ed0680ceb0e98e14bf88c8eb90e66ce 100644
--- a/l10n/ms_MY/core.po
+++ b/l10n/ms_MY/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:33+0000\n"
+"POT-Creation-Date: 2013-09-22 12:55-0400\n"
+"PO-Revision-Date: 2013-09-20 15:01+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
@@ -190,51 +190,51 @@ msgstr "Disember"
msgid "Settings"
msgstr "Tetapan"
-#: js/js.js:853
+#: js/js.js:866
msgid "seconds ago"
msgstr ""
-#: js/js.js:854
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: js/js.js:855
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: js/js.js:856
+#: js/js.js:869
msgid "today"
msgstr ""
-#: js/js.js:857
+#: js/js.js:870
msgid "yesterday"
msgstr ""
-#: js/js.js:858
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
-#: js/js.js:859
+#: js/js.js:872
msgid "last month"
msgstr ""
-#: js/js.js:860
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: js/js.js:861
+#: js/js.js:874
msgid "months ago"
msgstr ""
-#: js/js.js:862
+#: js/js.js:875
msgid "last year"
msgstr ""
-#: js/js.js:863
+#: js/js.js:876
msgid "years ago"
msgstr ""
@@ -262,6 +262,45 @@ msgstr "Ok"
msgid "Error loading message template: {error}"
msgstr ""
+#: js/oc-dialogs.js:347
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:367
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:376
+msgid "Cancel"
+msgstr "Batal"
+
+#: js/oc-dialogs.js:386
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:457
+msgid "Error loading file exists template"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/ms_MY/files.po b/l10n/ms_MY/files.po
index 27f7519e9d30467fb6598da63fa59767e24fe0f1..05de8db4dcc332015c57d1b5769786908e421071 100644
--- a/l10n/ms_MY/files.po
+++ b/l10n/ms_MY/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:00+0000\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
@@ -74,11 +74,15 @@ msgstr "Gagal untuk disimpan"
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:109
-msgid "Upload failed"
+#: ajax/upload.php:120 ajax/upload.php:143
+msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:127
+#: ajax/upload.php:136
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
+
+#: ajax/upload.php:160
msgid "Invalid directory."
msgstr ""
@@ -86,141 +90,145 @@ msgstr ""
msgid "Files"
msgstr "Fail-fail"
-#: js/file-upload.js:11
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Tidak boleh memuatnaik fail anda kerana mungkin ianya direktori atau saiz fail 0 bytes"
+#: js/file-upload.js:244
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
+msgstr ""
-#: js/file-upload.js:24
+#: js/file-upload.js:255
msgid "Not enough space available"
msgstr ""
-#: js/file-upload.js:64
+#: js/file-upload.js:322
msgid "Upload cancelled."
msgstr "Muatnaik dibatalkan."
-#: js/file-upload.js:165
+#: js/file-upload.js:356
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:446
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/file-upload.js:239
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr ""
-#: js/file-upload.js:244 lib/app.php:53
+#: js/file-upload.js:525 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550
+#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545
msgid "Error"
msgstr "Ralat"
-#: js/fileactions.js:116
+#: js/fileactions.js:119
msgid "Share"
msgstr "Kongsi"
-#: js/fileactions.js:126
+#: js/fileactions.js:131
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:192
+#: js/fileactions.js:197
msgid "Rename"
msgstr ""
-#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "Dalam proses"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr ""
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "ganti"
-#: js/filelist.js:307
+#: js/filelist.js:416
msgid "suggest name"
msgstr ""
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "Batal"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr ""
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "undo"
msgstr ""
-#: js/filelist.js:424 js/filelist.js:490 js/files.js:581
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
-#: js/filelist.js:425 js/filelist.js:491 js/files.js:587
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
-#: js/filelist.js:432
+#: js/filelist.js:541
msgid "{dirs} and {files}"
msgstr ""
-#: js/filelist.js:563
+#: js/filelist.js:731 js/filelist.js:769
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
-#: js/filelist.js:628
-msgid "files uploading"
-msgstr ""
-
-#: js/files.js:52
+#: js/files.js:25
msgid "'.' is an invalid file name."
msgstr ""
-#: js/files.js:56
+#: js/files.js:29
msgid "File name cannot be empty."
msgstr ""
-#: js/files.js:64
+#: js/files.js:37
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: js/files.js:78
+#: js/files.js:51
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr ""
-#: js/files.js:82
+#: js/files.js:55
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:94
+#: js/files.js:67
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
msgstr ""
-#: js/files.js:245
+#: js/files.js:296
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/files.js:563 templates/index.php:69
+#: js/files.js:507 js/files.js:545
+msgid "Error moving file"
+msgstr ""
+
+#: js/files.js:558 templates/index.php:61
msgid "Name"
msgstr "Nama"
-#: js/files.js:564 templates/index.php:81
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "Saiz"
-#: js/files.js:565 templates/index.php:83
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr "Dimodifikasi"
@@ -229,7 +237,7 @@ msgstr "Dimodifikasi"
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:11 templates/index.php:18
+#: lib/helper.php:11 templates/index.php:17
msgid "Upload"
msgstr "Muat naik"
@@ -265,65 +273,65 @@ msgstr "Saiz maksimum input untuk fail ZIP"
msgid "Save"
msgstr "Simpan"
-#: templates/index.php:7
+#: templates/index.php:6
msgid "New"
msgstr "Baru"
-#: templates/index.php:10
+#: templates/index.php:9
msgid "Text file"
msgstr "Fail teks"
-#: templates/index.php:12
+#: templates/index.php:11
msgid "Folder"
msgstr "Folder"
-#: templates/index.php:14
+#: templates/index.php:13
msgid "From link"
msgstr ""
-#: templates/index.php:41
+#: templates/index.php:33
msgid "Deleted files"
msgstr ""
-#: templates/index.php:46
+#: templates/index.php:39
msgid "Cancel upload"
msgstr "Batal muat naik"
-#: templates/index.php:52
+#: templates/index.php:45
msgid "You don’t have write permissions here."
msgstr ""
-#: templates/index.php:59
+#: templates/index.php:50
msgid "Nothing in here. Upload something!"
msgstr "Tiada apa-apa di sini. Muat naik sesuatu!"
-#: templates/index.php:75
+#: templates/index.php:67
msgid "Download"
msgstr "Muat turun"
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr ""
-#: templates/index.php:94 templates/index.php:95
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "Padam"
-#: templates/index.php:108
+#: templates/index.php:100
msgid "Upload too large"
msgstr "Muatnaik terlalu besar"
-#: templates/index.php:110
+#: templates/index.php:102
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Fail yang cuba dimuat naik melebihi saiz maksimum fail upload server"
-#: templates/index.php:115
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr "Fail sedang diimbas, harap bersabar."
-#: templates/index.php:118
+#: templates/index.php:110
msgid "Current scanning"
msgstr "Imbasan semasa"
diff --git a/l10n/ms_MY/settings.po b/l10n/ms_MY/settings.po
index 96dcca28a937981dc45727293ca3b07a0763ba85..c144cf2096c142534f47654b790cb2cfa740548e 100644
--- a/l10n/ms_MY/settings.po
+++ b/l10n/ms_MY/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:45-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgid "Unable to load list from App Store"
msgstr ""
#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
-#: ajax/togglegroups.php:20
+#: ajax/togglegroups.php:20 changepassword/controller.php:55
msgid "Authentication error"
msgstr "Ralat pengesahan"
@@ -84,6 +84,35 @@ msgstr ""
msgid "Couldn't update app."
msgstr ""
+#: changepassword/controller.php:20
+msgid "Wrong password"
+msgstr ""
+
+#: changepassword/controller.php:42
+msgid "No user supplied"
+msgstr ""
+
+#: changepassword/controller.php:74
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr ""
+
+#: changepassword/controller.php:79
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr ""
+
+#: changepassword/controller.php:87
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr ""
+
+#: changepassword/controller.php:92 changepassword/controller.php:103
+msgid "Unable to change password"
+msgstr ""
+
#: js/apps.js:43
msgid "Update to {appversion}"
msgstr ""
@@ -128,15 +157,15 @@ msgstr "Kemaskini"
msgid "Updated"
msgstr ""
-#: js/personal.js:217
+#: js/personal.js:220
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:262
+#: js/personal.js:265
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:284
+#: js/personal.js:287
msgid "Saving..."
msgstr "Simpan..."
@@ -460,7 +489,7 @@ msgstr "Isi alamat emel anda untuk membolehkan pemulihan kata laluan"
#: templates/personal.php:86
msgid "Profile picture"
-msgstr ""
+msgstr "Gambar profil"
#: templates/personal.php:90
msgid "Upload new"
diff --git a/l10n/my_MM/core.po b/l10n/my_MM/core.po
index 3732fcec7ab13548006f154efb390c9b047198fc..f2f4b06658f0553a551d2790b3840cbe6d8e5d77 100644
--- a/l10n/my_MM/core.po
+++ b/l10n/my_MM/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:33+0000\n"
+"POT-Creation-Date: 2013-09-22 12:55-0400\n"
+"PO-Revision-Date: 2013-09-20 15:01+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
"MIME-Version: 1.0\n"
@@ -190,51 +190,51 @@ msgstr "ဒီဇင်ဘာ"
msgid "Settings"
msgstr ""
-#: js/js.js:853
+#: js/js.js:866
msgid "seconds ago"
msgstr "စက္ကန့်အနည်းငယ်က"
-#: js/js.js:854
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: js/js.js:855
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: js/js.js:856
+#: js/js.js:869
msgid "today"
msgstr "ယနေ့"
-#: js/js.js:857
+#: js/js.js:870
msgid "yesterday"
msgstr "မနေ့က"
-#: js/js.js:858
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
-#: js/js.js:859
+#: js/js.js:872
msgid "last month"
msgstr "ပြီးá€á€²á€·á€žá€±á€¬á€œ"
-#: js/js.js:860
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: js/js.js:861
+#: js/js.js:874
msgid "months ago"
msgstr ""
-#: js/js.js:862
+#: js/js.js:875
msgid "last year"
msgstr "မနှစ်က"
-#: js/js.js:863
+#: js/js.js:876
msgid "years ago"
msgstr "နှစ် အရင်က"
@@ -262,6 +262,45 @@ msgstr "အá€á€¯á€€á€±"
msgid "Error loading message template: {error}"
msgstr ""
+#: js/oc-dialogs.js:347
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:367
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:376
+msgid "Cancel"
+msgstr "ပယ်ဖျက်မည်"
+
+#: js/oc-dialogs.js:386
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:457
+msgid "Error loading file exists template"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/my_MM/files.po b/l10n/my_MM/files.po
index 65da5b1877877cc42d1a7253e6910709255daf52..a143e196594eac6d7cc8e3f63acdac8f5bac7dd2 100644
--- a/l10n/my_MM/files.po
+++ b/l10n/my_MM/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-30 09:31-0400\n"
-"PO-Revision-Date: 2013-08-30 13:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
"MIME-Version: 1.0\n"
@@ -74,11 +74,15 @@ msgstr ""
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:109
-msgid "Upload failed"
+#: ajax/upload.php:120 ajax/upload.php:143
+msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:127
+#: ajax/upload.php:136
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
+
+#: ajax/upload.php:160
msgid "Invalid directory."
msgstr ""
@@ -86,141 +90,145 @@ msgstr ""
msgid "Files"
msgstr "ဖá€á€¯á€„်များ"
-#: js/file-upload.js:11
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
+#: js/file-upload.js:244
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr ""
-#: js/file-upload.js:24
+#: js/file-upload.js:255
msgid "Not enough space available"
msgstr ""
-#: js/file-upload.js:64
+#: js/file-upload.js:322
msgid "Upload cancelled."
msgstr ""
-#: js/file-upload.js:165
+#: js/file-upload.js:356
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:446
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/file-upload.js:239
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr ""
-#: js/file-upload.js:244 lib/app.php:53
+#: js/file-upload.js:525 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
+#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545
msgid "Error"
msgstr ""
-#: js/fileactions.js:116
+#: js/fileactions.js:119
msgid "Share"
msgstr ""
-#: js/fileactions.js:126
+#: js/fileactions.js:131
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:192
+#: js/fileactions.js:197
msgid "Rename"
msgstr ""
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr ""
-#: js/filelist.js:305 js/filelist.js:307
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr ""
-#: js/filelist.js:305 js/filelist.js:307
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr ""
-#: js/filelist.js:305
+#: js/filelist.js:416
msgid "suggest name"
msgstr ""
-#: js/filelist.js:305 js/filelist.js:307
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr ""
-#: js/filelist.js:352
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr ""
-#: js/filelist.js:352
+#: js/filelist.js:463
msgid "undo"
msgstr ""
-#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
-#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
-#: js/filelist.js:430
+#: js/filelist.js:541
msgid "{dirs} and {files}"
msgstr ""
-#: js/filelist.js:561
+#: js/filelist.js:731 js/filelist.js:769
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
-#: js/filelist.js:626
-msgid "files uploading"
-msgstr ""
-
-#: js/files.js:52
+#: js/files.js:25
msgid "'.' is an invalid file name."
msgstr ""
-#: js/files.js:56
+#: js/files.js:29
msgid "File name cannot be empty."
msgstr ""
-#: js/files.js:64
+#: js/files.js:37
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: js/files.js:78
+#: js/files.js:51
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr ""
-#: js/files.js:82
+#: js/files.js:55
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:94
+#: js/files.js:67
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
msgstr ""
-#: js/files.js:245
+#: js/files.js:296
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/files.js:562 templates/index.php:67
+#: js/files.js:507 js/files.js:545
+msgid "Error moving file"
+msgstr ""
+
+#: js/files.js:558 templates/index.php:61
msgid "Name"
msgstr ""
-#: js/files.js:563 templates/index.php:78
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr ""
-#: js/files.js:564 templates/index.php:80
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr ""
@@ -229,7 +237,7 @@ msgstr ""
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:11 templates/index.php:18
+#: lib/helper.php:11 templates/index.php:17
msgid "Upload"
msgstr ""
@@ -265,65 +273,65 @@ msgstr ""
msgid "Save"
msgstr ""
-#: templates/index.php:7
+#: templates/index.php:6
msgid "New"
msgstr ""
-#: templates/index.php:10
+#: templates/index.php:9
msgid "Text file"
msgstr ""
-#: templates/index.php:12
+#: templates/index.php:11
msgid "Folder"
msgstr ""
-#: templates/index.php:14
+#: templates/index.php:13
msgid "From link"
msgstr ""
-#: templates/index.php:41
+#: templates/index.php:33
msgid "Deleted files"
msgstr ""
-#: templates/index.php:46
+#: templates/index.php:39
msgid "Cancel upload"
msgstr ""
-#: templates/index.php:52
+#: templates/index.php:45
msgid "You don’t have write permissions here."
msgstr ""
-#: templates/index.php:59
+#: templates/index.php:50
msgid "Nothing in here. Upload something!"
msgstr ""
-#: templates/index.php:73
+#: templates/index.php:67
msgid "Download"
msgstr "ဒေါင်းလုá€á€º"
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr ""
-#: templates/index.php:91 templates/index.php:92
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr ""
-#: templates/index.php:105
+#: templates/index.php:100
msgid "Upload too large"
msgstr ""
-#: templates/index.php:107
+#: templates/index.php:102
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: templates/index.php:112
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:115
+#: templates/index.php:110
msgid "Current scanning"
msgstr ""
diff --git a/l10n/my_MM/settings.po b/l10n/my_MM/settings.po
index 985e6ce0a42179df73f5d043619aaaa387c37b38..144af1c4211039ac3784bdb4300be871c0b15ab9 100644
--- a/l10n/my_MM/settings.po
+++ b/l10n/my_MM/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:45-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
"MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgid "Unable to load list from App Store"
msgstr ""
#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
-#: ajax/togglegroups.php:20
+#: ajax/togglegroups.php:20 changepassword/controller.php:55
msgid "Authentication error"
msgstr "á€á€½á€„့်ပြုá€á€»á€€á€ºá€™á€¡á€±á€¬á€„်မြင်"
@@ -84,6 +84,35 @@ msgstr ""
msgid "Couldn't update app."
msgstr ""
+#: changepassword/controller.php:20
+msgid "Wrong password"
+msgstr ""
+
+#: changepassword/controller.php:42
+msgid "No user supplied"
+msgstr ""
+
+#: changepassword/controller.php:74
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr ""
+
+#: changepassword/controller.php:79
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr ""
+
+#: changepassword/controller.php:87
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr ""
+
+#: changepassword/controller.php:92 changepassword/controller.php:103
+msgid "Unable to change password"
+msgstr ""
+
#: js/apps.js:43
msgid "Update to {appversion}"
msgstr ""
@@ -128,15 +157,15 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:217
+#: js/personal.js:220
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:262
+#: js/personal.js:265
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:284
+#: js/personal.js:287
msgid "Saving..."
msgstr ""
diff --git a/l10n/nb_NO/core.po b/l10n/nb_NO/core.po
index 74f64d6762bffe14a4d48bad8450e06ad27a0044..b9a4a85d03bcbaf3e4729567c50d8529197be522 100644
--- a/l10n/nb_NO/core.po
+++ b/l10n/nb_NO/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:33+0000\n"
+"POT-Creation-Date: 2013-09-22 12:55-0400\n"
+"PO-Revision-Date: 2013-09-20 15:01+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
@@ -191,55 +191,55 @@ msgstr "Desember"
msgid "Settings"
msgstr "Innstillinger"
-#: js/js.js:853
+#: js/js.js:866
msgid "seconds ago"
msgstr "sekunder siden"
-#: js/js.js:854
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:855
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:856
+#: js/js.js:869
msgid "today"
msgstr "i dag"
-#: js/js.js:857
+#: js/js.js:870
msgid "yesterday"
msgstr "i går"
-#: js/js.js:858
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:859
+#: js/js.js:872
msgid "last month"
msgstr "forrige måned"
-#: js/js.js:860
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:861
+#: js/js.js:874
msgid "months ago"
msgstr "måneder siden"
-#: js/js.js:862
+#: js/js.js:875
msgid "last year"
msgstr "forrige år"
-#: js/js.js:863
+#: js/js.js:876
msgid "years ago"
msgstr "Ã¥r siden"
@@ -267,6 +267,46 @@ msgstr "Ok"
msgid "Error loading message template: {error}"
msgstr ""
+#: js/oc-dialogs.js:347
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:367
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:376
+msgid "Cancel"
+msgstr "Avbryt"
+
+#: js/oc-dialogs.js:386
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:457
+msgid "Error loading file exists template"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/nb_NO/files.po b/l10n/nb_NO/files.po
index 318d4d445a5a3db5c2c175c5cf5d77f942323136..e5f3ebc6c84e2f35158cea78d6a56a467d0bfa60 100644
--- a/l10n/nb_NO/files.po
+++ b/l10n/nb_NO/files.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:00+0000\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
@@ -77,11 +77,15 @@ msgstr "Klarte ikke å skrive til disk"
msgid "Not enough storage available"
msgstr "Ikke nok lagringsplass"
-#: ajax/upload.php:109
-msgid "Upload failed"
-msgstr "Opplasting feilet"
+#: ajax/upload.php:120 ajax/upload.php:143
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:136
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
-#: ajax/upload.php:127
+#: ajax/upload.php:160
msgid "Invalid directory."
msgstr "Ugyldig katalog."
@@ -89,144 +93,148 @@ msgstr "Ugyldig katalog."
msgid "Files"
msgstr "Filer"
-#: js/file-upload.js:11
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Kan ikke laste opp filen din siden det er en mappe eller den har 0 bytes"
+#: js/file-upload.js:244
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
+msgstr ""
-#: js/file-upload.js:24
+#: js/file-upload.js:255
msgid "Not enough space available"
msgstr "Ikke nok lagringsplass"
-#: js/file-upload.js:64
+#: js/file-upload.js:322
msgid "Upload cancelled."
msgstr "Opplasting avbrutt."
-#: js/file-upload.js:165
+#: js/file-upload.js:356
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:446
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Filopplasting pågår. Forlater du siden nå avbrytes opplastingen."
-#: js/file-upload.js:239
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr "URL-en kan ikke være tom."
-#: js/file-upload.js:244 lib/app.php:53
+#: js/file-upload.js:525 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr "Ugyldig mappenavn. Bruk av \"Shared\" er reservert av ownCloud."
-#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550
+#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545
msgid "Error"
msgstr "Feil"
-#: js/fileactions.js:116
+#: js/fileactions.js:119
msgid "Share"
msgstr "Del"
-#: js/fileactions.js:126
+#: js/fileactions.js:131
msgid "Delete permanently"
msgstr "Slett permanent"
-#: js/fileactions.js:192
+#: js/fileactions.js:197
msgid "Rename"
msgstr "Gi nytt navn"
-#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "Ventende"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{new_name} finnes allerede"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "erstatt"
-#: js/filelist.js:307
+#: js/filelist.js:416
msgid "suggest name"
msgstr "foreslå navn"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "avbryt"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr "erstattet {new_name} med {old_name}"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "undo"
msgstr "angre"
-#: js/filelist.js:424 js/filelist.js:490 js/files.js:581
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "%n mappe"
msgstr[1] "%n mapper"
-#: js/filelist.js:425 js/filelist.js:491 js/files.js:587
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "%n fil"
msgstr[1] "%n filer"
-#: js/filelist.js:432
+#: js/filelist.js:541
msgid "{dirs} and {files}"
msgstr ""
-#: js/filelist.js:563
+#: js/filelist.js:731 js/filelist.js:769
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "Laster opp %n fil"
msgstr[1] "Laster opp %n filer"
-#: js/filelist.js:628
-msgid "files uploading"
-msgstr "filer lastes opp"
-
-#: js/files.js:52
+#: js/files.js:25
msgid "'.' is an invalid file name."
msgstr "'.' er et ugyldig filnavn."
-#: js/files.js:56
+#: js/files.js:29
msgid "File name cannot be empty."
msgstr "Filnavn kan ikke være tomt."
-#: js/files.js:64
+#: js/files.js:37
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Ugyldig navn, '\\', '/', '<', '>', ':', '\"', '|', '?' og '*' er ikke tillatt."
-#: js/files.js:78
+#: js/files.js:51
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr "Lagringsplass er oppbrukt, filer kan ikke lenger oppdateres eller synkroniseres!"
-#: js/files.js:82
+#: js/files.js:55
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Lagringsplass er nesten brukt opp ([usedSpacePercent}%)"
-#: js/files.js:94
+#: js/files.js:67
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
msgstr ""
-#: js/files.js:245
+#: js/files.js:296
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "Nedlastingen din klargjøres. Hvis filene er store kan dette ta litt tid."
-#: js/files.js:563 templates/index.php:69
+#: js/files.js:507 js/files.js:545
+msgid "Error moving file"
+msgstr ""
+
+#: js/files.js:558 templates/index.php:61
msgid "Name"
msgstr "Navn"
-#: js/files.js:564 templates/index.php:81
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "Størrelse"
-#: js/files.js:565 templates/index.php:83
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr "Endret"
@@ -235,7 +243,7 @@ msgstr "Endret"
msgid "%s could not be renamed"
msgstr "Kunne ikke gi nytt navn til %s"
-#: lib/helper.php:11 templates/index.php:18
+#: lib/helper.php:11 templates/index.php:17
msgid "Upload"
msgstr "Last opp"
@@ -271,65 +279,65 @@ msgstr "Maksimal størrelse på ZIP-filer"
msgid "Save"
msgstr "Lagre"
-#: templates/index.php:7
+#: templates/index.php:6
msgid "New"
msgstr "Ny"
-#: templates/index.php:10
+#: templates/index.php:9
msgid "Text file"
msgstr "Tekstfil"
-#: templates/index.php:12
+#: templates/index.php:11
msgid "Folder"
msgstr "Mappe"
-#: templates/index.php:14
+#: templates/index.php:13
msgid "From link"
msgstr "Fra link"
-#: templates/index.php:41
+#: templates/index.php:33
msgid "Deleted files"
msgstr "Slettet filer"
-#: templates/index.php:46
+#: templates/index.php:39
msgid "Cancel upload"
msgstr "Avbryt opplasting"
-#: templates/index.php:52
+#: templates/index.php:45
msgid "You don’t have write permissions here."
msgstr "Du har ikke skrivetilgang her."
-#: templates/index.php:59
+#: templates/index.php:50
msgid "Nothing in here. Upload something!"
msgstr "Ingenting her. Last opp noe!"
-#: templates/index.php:75
+#: templates/index.php:67
msgid "Download"
msgstr "Last ned"
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr "Avslutt deling"
-#: templates/index.php:94 templates/index.php:95
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "Slett"
-#: templates/index.php:108
+#: templates/index.php:100
msgid "Upload too large"
msgstr "Filen er for stor"
-#: templates/index.php:110
+#: templates/index.php:102
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Filene du prøver å laste opp er for store for å laste opp til denne serveren."
-#: templates/index.php:115
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr "Skanner filer, vennligst vent."
-#: templates/index.php:118
+#: templates/index.php:110
msgid "Current scanning"
msgstr "Pågående skanning"
diff --git a/l10n/nb_NO/settings.po b/l10n/nb_NO/settings.po
index ff63353afc02c682183f34d0429a4f86ebe627c2..fe0d19856afe9337880e373beba5231e1b6f478f 100644
--- a/l10n/nb_NO/settings.po
+++ b/l10n/nb_NO/settings.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:45-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
@@ -24,7 +24,7 @@ msgid "Unable to load list from App Store"
msgstr "Lasting av liste fra App Store feilet."
#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
-#: ajax/togglegroups.php:20
+#: ajax/togglegroups.php:20 changepassword/controller.php:55
msgid "Authentication error"
msgstr "Autentiseringsfeil"
@@ -86,6 +86,35 @@ msgstr "Kan ikke slette bruker fra gruppen %s"
msgid "Couldn't update app."
msgstr "Kunne ikke oppdatere app."
+#: changepassword/controller.php:20
+msgid "Wrong password"
+msgstr ""
+
+#: changepassword/controller.php:42
+msgid "No user supplied"
+msgstr ""
+
+#: changepassword/controller.php:74
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr ""
+
+#: changepassword/controller.php:79
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr ""
+
+#: changepassword/controller.php:87
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr ""
+
+#: changepassword/controller.php:92 changepassword/controller.php:103
+msgid "Unable to change password"
+msgstr ""
+
#: js/apps.js:43
msgid "Update to {appversion}"
msgstr "Oppdater til {appversion}"
@@ -130,15 +159,15 @@ msgstr "Oppdater"
msgid "Updated"
msgstr "Oppdatert"
-#: js/personal.js:217
+#: js/personal.js:220
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:262
+#: js/personal.js:265
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:284
+#: js/personal.js:287
msgid "Saving..."
msgstr "Lagrer..."
@@ -462,7 +491,7 @@ msgstr "Oppi epostadressen du vil tilbakestille passordet for"
#: templates/personal.php:86
msgid "Profile picture"
-msgstr ""
+msgstr "Profilbilde"
#: templates/personal.php:90
msgid "Upload new"
diff --git a/l10n/ne/core.po b/l10n/ne/core.po
index 10549b66bad487def45d04010caf80c80d8748c9..52425ae2ab0ee6b70872b56c062ad02900a06d8b 100644
--- a/l10n/ne/core.po
+++ b/l10n/ne/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:33+0000\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
"MIME-Version: 1.0\n"
@@ -190,55 +190,55 @@ msgstr ""
msgid "Settings"
msgstr ""
-#: js/js.js:853
+#: js/js.js:866
msgid "seconds ago"
msgstr ""
-#: js/js.js:854
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:855
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:856
+#: js/js.js:869
msgid "today"
msgstr ""
-#: js/js.js:857
+#: js/js.js:870
msgid "yesterday"
msgstr ""
-#: js/js.js:858
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:859
+#: js/js.js:872
msgid "last month"
msgstr ""
-#: js/js.js:860
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:861
+#: js/js.js:874
msgid "months ago"
msgstr ""
-#: js/js.js:862
+#: js/js.js:875
msgid "last year"
msgstr ""
-#: js/js.js:863
+#: js/js.js:876
msgid "years ago"
msgstr ""
@@ -266,6 +266,46 @@ msgstr ""
msgid "Error loading message template: {error}"
msgstr ""
+#: js/oc-dialogs.js:347
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:367
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:376
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:386
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:457
+msgid "Error loading file exists template"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/ne/files.po b/l10n/ne/files.po
index 16ee27473723136e968cea3249f7f6a2a6f642cd..99b4c5422106f83dcbcfedbd3a4448985dd2f962 100644
--- a/l10n/ne/files.po
+++ b/l10n/ne/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-30 09:31-0400\n"
-"PO-Revision-Date: 2013-08-30 13:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
"MIME-Version: 1.0\n"
@@ -74,11 +74,15 @@ msgstr ""
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:109
-msgid "Upload failed"
+#: ajax/upload.php:120 ajax/upload.php:143
+msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:127
+#: ajax/upload.php:136
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
+
+#: ajax/upload.php:160
msgid "Invalid directory."
msgstr ""
@@ -86,144 +90,148 @@ msgstr ""
msgid "Files"
msgstr ""
-#: js/file-upload.js:11
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
+#: js/file-upload.js:244
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr ""
-#: js/file-upload.js:24
+#: js/file-upload.js:255
msgid "Not enough space available"
msgstr ""
-#: js/file-upload.js:64
+#: js/file-upload.js:322
msgid "Upload cancelled."
msgstr ""
-#: js/file-upload.js:165
+#: js/file-upload.js:356
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:446
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/file-upload.js:239
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr ""
-#: js/file-upload.js:244 lib/app.php:53
+#: js/file-upload.js:525 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
+#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545
msgid "Error"
msgstr ""
-#: js/fileactions.js:116
+#: js/fileactions.js:119
msgid "Share"
msgstr ""
-#: js/fileactions.js:126
+#: js/fileactions.js:131
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:192
+#: js/fileactions.js:197
msgid "Rename"
msgstr ""
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr ""
-#: js/filelist.js:305 js/filelist.js:307
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr ""
-#: js/filelist.js:305 js/filelist.js:307
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr ""
-#: js/filelist.js:305
+#: js/filelist.js:416
msgid "suggest name"
msgstr ""
-#: js/filelist.js:305 js/filelist.js:307
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr ""
-#: js/filelist.js:352
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr ""
-#: js/filelist.js:352
+#: js/filelist.js:463
msgid "undo"
msgstr ""
-#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:430
+#: js/filelist.js:541
msgid "{dirs} and {files}"
msgstr ""
-#: js/filelist.js:561
+#: js/filelist.js:731 js/filelist.js:769
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:626
-msgid "files uploading"
-msgstr ""
-
-#: js/files.js:52
+#: js/files.js:25
msgid "'.' is an invalid file name."
msgstr ""
-#: js/files.js:56
+#: js/files.js:29
msgid "File name cannot be empty."
msgstr ""
-#: js/files.js:64
+#: js/files.js:37
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: js/files.js:78
+#: js/files.js:51
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr ""
-#: js/files.js:82
+#: js/files.js:55
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:94
+#: js/files.js:67
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
msgstr ""
-#: js/files.js:245
+#: js/files.js:296
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/files.js:562 templates/index.php:67
+#: js/files.js:507 js/files.js:545
+msgid "Error moving file"
+msgstr ""
+
+#: js/files.js:558 templates/index.php:61
msgid "Name"
msgstr ""
-#: js/files.js:563 templates/index.php:78
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr ""
-#: js/files.js:564 templates/index.php:80
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr ""
@@ -232,7 +240,7 @@ msgstr ""
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:11 templates/index.php:18
+#: lib/helper.php:11 templates/index.php:17
msgid "Upload"
msgstr ""
@@ -268,65 +276,65 @@ msgstr ""
msgid "Save"
msgstr ""
-#: templates/index.php:7
+#: templates/index.php:6
msgid "New"
msgstr ""
-#: templates/index.php:10
+#: templates/index.php:9
msgid "Text file"
msgstr ""
-#: templates/index.php:12
+#: templates/index.php:11
msgid "Folder"
msgstr ""
-#: templates/index.php:14
+#: templates/index.php:13
msgid "From link"
msgstr ""
-#: templates/index.php:41
+#: templates/index.php:33
msgid "Deleted files"
msgstr ""
-#: templates/index.php:46
+#: templates/index.php:39
msgid "Cancel upload"
msgstr ""
-#: templates/index.php:52
+#: templates/index.php:45
msgid "You don’t have write permissions here."
msgstr ""
-#: templates/index.php:59
+#: templates/index.php:50
msgid "Nothing in here. Upload something!"
msgstr ""
-#: templates/index.php:73
+#: templates/index.php:67
msgid "Download"
msgstr ""
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr ""
-#: templates/index.php:91 templates/index.php:92
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr ""
-#: templates/index.php:105
+#: templates/index.php:100
msgid "Upload too large"
msgstr ""
-#: templates/index.php:107
+#: templates/index.php:102
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: templates/index.php:112
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:115
+#: templates/index.php:110
msgid "Current scanning"
msgstr ""
diff --git a/l10n/ne/settings.po b/l10n/ne/settings.po
index c3ea7fab118786b73a967e5ba07e412b557d8318..855bab38ba26902b466ee5f9051fa943996da95d 100644
--- a/l10n/ne/settings.po
+++ b/l10n/ne/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:45-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
"MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgid "Unable to load list from App Store"
msgstr ""
#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
-#: ajax/togglegroups.php:20
+#: ajax/togglegroups.php:20 changepassword/controller.php:55
msgid "Authentication error"
msgstr ""
@@ -84,6 +84,35 @@ msgstr ""
msgid "Couldn't update app."
msgstr ""
+#: changepassword/controller.php:20
+msgid "Wrong password"
+msgstr ""
+
+#: changepassword/controller.php:42
+msgid "No user supplied"
+msgstr ""
+
+#: changepassword/controller.php:74
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr ""
+
+#: changepassword/controller.php:79
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr ""
+
+#: changepassword/controller.php:87
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr ""
+
+#: changepassword/controller.php:92 changepassword/controller.php:103
+msgid "Unable to change password"
+msgstr ""
+
#: js/apps.js:43
msgid "Update to {appversion}"
msgstr ""
@@ -128,15 +157,15 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:217
+#: js/personal.js:220
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:262
+#: js/personal.js:265
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:284
+#: js/personal.js:287
msgid "Saving..."
msgstr ""
diff --git a/l10n/nl/core.po b/l10n/nl/core.po
index 5212bcfb804725d95d0e8c0fbd8933d414b5b6d7..1c2702b714dd2dd1679180f4163cf8d05f5ccf76 100644
--- a/l10n/nl/core.po
+++ b/l10n/nl/core.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:33+0000\n"
+"POT-Creation-Date: 2013-09-22 12:55-0400\n"
+"PO-Revision-Date: 2013-09-20 15:01+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
@@ -31,28 +31,28 @@ msgstr "groep"
#: ajax/update.php:11
msgid "Turned on maintenance mode"
-msgstr ""
+msgstr "Onderhoudsmodus ingeschakeld"
#: ajax/update.php:14
msgid "Turned off maintenance mode"
-msgstr ""
+msgstr "Onderhoudsmodus uitgeschakeld"
#: ajax/update.php:17
msgid "Updated database"
-msgstr ""
+msgstr "Database bijgewerkt"
#: ajax/update.php:20
msgid "Updating filecache, this may take really long..."
-msgstr ""
+msgstr "Bijwerken bestandscache. Dit kan even duren..."
#: ajax/update.php:23
msgid "Updated filecache"
-msgstr ""
+msgstr "Bestandscache bijgewerkt"
#: ajax/update.php:26
#, php-format
msgid "... %d%% done ..."
-msgstr ""
+msgstr "... %d%% gereed ..."
#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
msgid "Category type not provided."
@@ -95,23 +95,23 @@ msgstr "Verwijderen %s van favorieten is mislukt."
#: avatar/controller.php:62
msgid "No image or file provided"
-msgstr ""
+msgstr "Geen afbeelding of bestand opgegeven"
#: avatar/controller.php:81
msgid "Unknown filetype"
-msgstr ""
+msgstr "Onbekend bestandsformaat"
#: avatar/controller.php:85
msgid "Invalid image"
-msgstr ""
+msgstr "Ongeldige afbeelding"
#: avatar/controller.php:115 avatar/controller.php:142
msgid "No temporary profile picture available, try again"
-msgstr ""
+msgstr "Geen tijdelijke profielafbeelding beschikbaar. Probeer het opnieuw"
#: avatar/controller.php:135
msgid "No crop data provided"
-msgstr ""
+msgstr "Geen bijsnijdingsgegevens opgegeven"
#: js/config.php:32
msgid "Sunday"
@@ -193,55 +193,55 @@ msgstr "december"
msgid "Settings"
msgstr "Instellingen"
-#: js/js.js:853
+#: js/js.js:866
msgid "seconds ago"
msgstr "seconden geleden"
-#: js/js.js:854
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] "%n minuten geleden"
-#: js/js.js:855
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] "%n uur geleden"
-#: js/js.js:856
+#: js/js.js:869
msgid "today"
msgstr "vandaag"
-#: js/js.js:857
+#: js/js.js:870
msgid "yesterday"
msgstr "gisteren"
-#: js/js.js:858
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] "%n dagen geleden"
-#: js/js.js:859
+#: js/js.js:872
msgid "last month"
msgstr "vorige maand"
-#: js/js.js:860
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] "%n maanden geleden"
-#: js/js.js:861
+#: js/js.js:874
msgid "months ago"
msgstr "maanden geleden"
-#: js/js.js:862
+#: js/js.js:875
msgid "last year"
msgstr "vorig jaar"
-#: js/js.js:863
+#: js/js.js:876
msgid "years ago"
msgstr "jaar geleden"
@@ -251,7 +251,7 @@ msgstr "Kies"
#: js/oc-dialogs.js:146
msgid "Error loading file picker template: {error}"
-msgstr ""
+msgstr "Fout bij laden bestandenselecteur sjabloon: {error}"
#: js/oc-dialogs.js:172
msgid "Yes"
@@ -267,6 +267,46 @@ msgstr "Ok"
#: js/oc-dialogs.js:219
msgid "Error loading message template: {error}"
+msgstr "Fout bij laden berichtensjabloon: {error}"
+
+#: js/oc-dialogs.js:347
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:367
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:376
+msgid "Cancel"
+msgstr "Annuleer"
+
+#: js/oc-dialogs.js:386
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:457
+msgid "Error loading file exists template"
msgstr ""
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
diff --git a/l10n/nl/files.po b/l10n/nl/files.po
index e8546df4ad2db31a45b1f77bb325fdfbebd74abf..68d1ce8e06bdea155bc011f62214f072eae3d725 100644
--- a/l10n/nl/files.po
+++ b/l10n/nl/files.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:00+0000\n"
-"Last-Translator: kwillems <kwillems@zonnet.nl>\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -76,11 +76,15 @@ msgstr "Schrijven naar schijf mislukt"
msgid "Not enough storage available"
msgstr "Niet genoeg opslagruimte beschikbaar"
-#: ajax/upload.php:109
-msgid "Upload failed"
-msgstr "Upload mislukt"
+#: ajax/upload.php:120 ajax/upload.php:143
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:136
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
-#: ajax/upload.php:127
+#: ajax/upload.php:160
msgid "Invalid directory."
msgstr "Ongeldige directory."
@@ -88,144 +92,148 @@ msgstr "Ongeldige directory."
msgid "Files"
msgstr "Bestanden"
-#: js/file-upload.js:11
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Het lukt niet om uw bestand te uploaded, omdat het een folder of 0 bytes is"
+#: js/file-upload.js:244
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
+msgstr ""
-#: js/file-upload.js:24
+#: js/file-upload.js:255
msgid "Not enough space available"
msgstr "Niet genoeg ruimte beschikbaar"
-#: js/file-upload.js:64
+#: js/file-upload.js:322
msgid "Upload cancelled."
msgstr "Uploaden geannuleerd."
-#: js/file-upload.js:165
+#: js/file-upload.js:356
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:446
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Bestandsupload is bezig. Wanneer de pagina nu verlaten wordt, stopt de upload."
-#: js/file-upload.js:239
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr "URL kan niet leeg zijn."
-#: js/file-upload.js:244 lib/app.php:53
+#: js/file-upload.js:525 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr "Ongeldige mapnaam. Gebruik van 'Gedeeld' is voorbehouden aan Owncloud zelf"
-#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550
+#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545
msgid "Error"
msgstr "Fout"
-#: js/fileactions.js:116
+#: js/fileactions.js:119
msgid "Share"
msgstr "Delen"
-#: js/fileactions.js:126
+#: js/fileactions.js:131
msgid "Delete permanently"
msgstr "Verwijder definitief"
-#: js/fileactions.js:192
+#: js/fileactions.js:197
msgid "Rename"
msgstr "Hernoem"
-#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "In behandeling"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{new_name} bestaat al"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "vervang"
-#: js/filelist.js:307
+#: js/filelist.js:416
msgid "suggest name"
msgstr "Stel een naam voor"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "annuleren"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr "verving {new_name} met {old_name}"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "undo"
msgstr "ongedaan maken"
-#: js/filelist.js:424 js/filelist.js:490 js/files.js:581
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] "%n mappen"
-#: js/filelist.js:425 js/filelist.js:491 js/files.js:587
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] "%n bestanden"
-#: js/filelist.js:432
+#: js/filelist.js:541
msgid "{dirs} and {files}"
msgstr "{dirs} en {files}"
-#: js/filelist.js:563
+#: js/filelist.js:731 js/filelist.js:769
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "%n bestand aan het uploaden"
msgstr[1] "%n bestanden aan het uploaden"
-#: js/filelist.js:628
-msgid "files uploading"
-msgstr "bestanden aan het uploaden"
-
-#: js/files.js:52
+#: js/files.js:25
msgid "'.' is an invalid file name."
msgstr "'.' is een ongeldige bestandsnaam."
-#: js/files.js:56
+#: js/files.js:29
msgid "File name cannot be empty."
msgstr "Bestandsnaam kan niet leeg zijn."
-#: js/files.js:64
+#: js/files.js:37
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Onjuiste naam; '\\', '/', '<', '>', ':', '\"', '|', '?' en '*' zijn niet toegestaan."
-#: js/files.js:78
+#: js/files.js:51
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr "Uw opslagruimte zit vol, Bestanden kunnen niet meer worden ge-upload of gesynchroniseerd!"
-#: js/files.js:82
+#: js/files.js:55
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Uw opslagruimte zit bijna vol ({usedSpacePercent}%)"
-#: js/files.js:94
+#: js/files.js:67
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
msgstr "Encryptie is uitgeschakeld maar uw bestanden zijn nog steeds versleuteld. Ga naar uw persoonlijke instellingen om uw bestanden te decoderen."
-#: js/files.js:245
+#: js/files.js:296
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "Uw download wordt voorbereid. Dit kan enige tijd duren bij grote bestanden."
-#: js/files.js:563 templates/index.php:69
+#: js/files.js:507 js/files.js:545
+msgid "Error moving file"
+msgstr ""
+
+#: js/files.js:558 templates/index.php:61
msgid "Name"
msgstr "Naam"
-#: js/files.js:564 templates/index.php:81
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "Grootte"
-#: js/files.js:565 templates/index.php:83
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr "Aangepast"
@@ -234,7 +242,7 @@ msgstr "Aangepast"
msgid "%s could not be renamed"
msgstr "%s kon niet worden hernoemd"
-#: lib/helper.php:11 templates/index.php:18
+#: lib/helper.php:11 templates/index.php:17
msgid "Upload"
msgstr "Uploaden"
@@ -270,65 +278,65 @@ msgstr "Maximale grootte voor ZIP bestanden"
msgid "Save"
msgstr "Bewaren"
-#: templates/index.php:7
+#: templates/index.php:6
msgid "New"
msgstr "Nieuw"
-#: templates/index.php:10
+#: templates/index.php:9
msgid "Text file"
msgstr "Tekstbestand"
-#: templates/index.php:12
+#: templates/index.php:11
msgid "Folder"
msgstr "Map"
-#: templates/index.php:14
+#: templates/index.php:13
msgid "From link"
msgstr "Vanaf link"
-#: templates/index.php:41
+#: templates/index.php:33
msgid "Deleted files"
msgstr "Verwijderde bestanden"
-#: templates/index.php:46
+#: templates/index.php:39
msgid "Cancel upload"
msgstr "Upload afbreken"
-#: templates/index.php:52
+#: templates/index.php:45
msgid "You don’t have write permissions here."
msgstr "U hebt hier geen schrijfpermissies."
-#: templates/index.php:59
+#: templates/index.php:50
msgid "Nothing in here. Upload something!"
msgstr "Er bevindt zich hier niets. Upload een bestand!"
-#: templates/index.php:75
+#: templates/index.php:67
msgid "Download"
msgstr "Downloaden"
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr "Stop met delen"
-#: templates/index.php:94 templates/index.php:95
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "Verwijder"
-#: templates/index.php:108
+#: templates/index.php:100
msgid "Upload too large"
msgstr "Upload is te groot"
-#: templates/index.php:110
+#: templates/index.php:102
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "De bestanden die u probeert te uploaden zijn groter dan de maximaal toegestane bestandsgrootte voor deze server."
-#: templates/index.php:115
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr "Bestanden worden gescand, even wachten."
-#: templates/index.php:118
+#: templates/index.php:110
msgid "Current scanning"
msgstr "Er wordt gescand"
diff --git a/l10n/nl/lib.po b/l10n/nl/lib.po
index 2c3f2413cdba5a5906c5cf43fd249cf4785e8714..918f3b09a7a87edb0b9bac121006599915f6c144 100644
--- a/l10n/nl/lib.po
+++ b/l10n/nl/lib.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-18 11:47-0400\n"
+"PO-Revision-Date: 2013-09-17 13:05+0000\n"
+"Last-Translator: André Koot <meneer@tken.net>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -25,7 +25,7 @@ msgstr ""
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
-msgstr ""
+msgstr "App \"%s\" kan niet worden geïnstalleerd omdat die niet compatible is met deze versie van ownCloud."
#: app.php:250
msgid "No app name specified"
@@ -58,15 +58,15 @@ msgstr "Upgrade \"%s\" mislukt."
#: avatar.php:56
msgid "Custom profile pictures don't work with encryption yet"
-msgstr ""
+msgstr "Maatwerk profielafbeelding werkt nog niet met versleuteling"
#: avatar.php:64
msgid "Unknown filetype"
-msgstr ""
+msgstr "Onbekend bestandsformaat"
#: avatar.php:69
msgid "Invalid image"
-msgstr ""
+msgstr "Ongeldige afbeelding"
#: defaults.php:35
msgid "web services under your control"
@@ -101,59 +101,59 @@ msgstr "Download de bestanden in kleinere brokken, appart of vraag uw administra
#: installer.php:63
msgid "No source specified when installing app"
-msgstr ""
+msgstr "Geen bron opgegeven bij installatie van de app"
#: installer.php:70
msgid "No href specified when installing app from http"
-msgstr ""
+msgstr "Geen href opgegeven bij installeren van de app vanaf http"
#: installer.php:75
msgid "No path specified when installing app from local file"
-msgstr ""
+msgstr "Geen pad opgegeven bij installeren van de app vanaf een lokaal bestand"
#: installer.php:89
#, php-format
msgid "Archives of type %s are not supported"
-msgstr ""
+msgstr "Archiefbestanden van type %s niet ondersteund"
#: installer.php:103
msgid "Failed to open archive when installing app"
-msgstr ""
+msgstr "Kon archiefbestand bij installatie van de app niet openen"
#: installer.php:125
msgid "App does not provide an info.xml file"
-msgstr ""
+msgstr "De app heeft geen info.xml bestand"
#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
-msgstr ""
+msgstr "De app kan niet worden geïnstalleerd wegens onjuiste code in de app"
#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
-msgstr ""
+msgstr "De app kan niet worden geïnstalleerd omdat die niet compatible is met deze versie van ownCloud"
#: installer.php:146
msgid ""
"App can't be installed because it contains the <shipped>true</shipped> tag "
"which is not allowed for non shipped apps"
-msgstr ""
+msgstr "De app kan niet worden geïnstallerd omdat het de <shipped>true</shipped> tag bevat die niet is toegestaan voor niet gepubliceerde apps"
#: installer.php:152
msgid ""
"App can't be installed because the version in info.xml/version is not the "
"same as the version reported from the app store"
-msgstr ""
+msgstr "De app kan niet worden geïnstalleerd omdat de versie in info.xml/version niet dezelfde is als de versie zoals die in de app store staat vermeld"
#: installer.php:162
msgid "App directory already exists"
-msgstr ""
+msgstr "App directory bestaat al"
#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
-msgstr ""
+msgstr "Kan de app map niet aanmaken, Herstel de permissies. %s"
#: json.php:28
msgid "Application is not enabled"
diff --git a/l10n/nl/settings.po b/l10n/nl/settings.po
index 96f0a92125ed17c32344b45cd05359ed9f49eaef..68edba7080a90edb42cc9bf83458d7fee7734129 100644
--- a/l10n/nl/settings.po
+++ b/l10n/nl/settings.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:45-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgid "Unable to load list from App Store"
msgstr "Kan de lijst niet van de App store laden"
#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
-#: ajax/togglegroups.php:20
+#: ajax/togglegroups.php:20 changepassword/controller.php:55
msgid "Authentication error"
msgstr "Authenticatie fout"
@@ -88,6 +88,35 @@ msgstr "Niet in staat om gebruiker te verwijderen uit groep %s"
msgid "Couldn't update app."
msgstr "Kon de app niet bijwerken."
+#: changepassword/controller.php:20
+msgid "Wrong password"
+msgstr ""
+
+#: changepassword/controller.php:42
+msgid "No user supplied"
+msgstr ""
+
+#: changepassword/controller.php:74
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr ""
+
+#: changepassword/controller.php:79
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr ""
+
+#: changepassword/controller.php:87
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr ""
+
+#: changepassword/controller.php:92 changepassword/controller.php:103
+msgid "Unable to change password"
+msgstr ""
+
#: js/apps.js:43
msgid "Update to {appversion}"
msgstr "Bijwerken naar {appversion}"
@@ -132,15 +161,15 @@ msgstr "Bijwerken"
msgid "Updated"
msgstr "Bijgewerkt"
-#: js/personal.js:217
+#: js/personal.js:220
msgid "Select a profile picture"
-msgstr ""
+msgstr "Kies een profielafbeelding"
-#: js/personal.js:262
+#: js/personal.js:265
msgid "Decrypting files... Please wait, this can take some time."
msgstr "Bestanden worden gedecodeerd... Even geduld alstublieft, dit kan even duren."
-#: js/personal.js:284
+#: js/personal.js:287
msgid "Saving..."
msgstr "Opslaan"
@@ -464,31 +493,31 @@ msgstr "Vul een mailadres in om je wachtwoord te kunnen herstellen"
#: templates/personal.php:86
msgid "Profile picture"
-msgstr ""
+msgstr "Profielafbeelding"
#: templates/personal.php:90
msgid "Upload new"
-msgstr ""
+msgstr "Upload een nieuwe"
#: templates/personal.php:92
msgid "Select new from Files"
-msgstr ""
+msgstr "Selecteer een nieuwe vanuit bestanden"
#: templates/personal.php:93
msgid "Remove image"
-msgstr ""
+msgstr "Verwijder afbeelding"
#: templates/personal.php:94
msgid "Either png or jpg. Ideally square but you will be able to crop it."
-msgstr ""
+msgstr "Of png, of jpg. Bij voorkeur vierkant, maar u kunt bijsnijden."
#: templates/personal.php:97
msgid "Abort"
-msgstr ""
+msgstr "Afbreken"
#: templates/personal.php:98
msgid "Choose as profile image"
-msgstr ""
+msgstr "Kies als profielafbeelding"
#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
diff --git a/l10n/nn_NO/core.po b/l10n/nn_NO/core.po
index 87a27da4b851c0367f9b2cf410b0723988b1cfb1..e16776a09863157188574d46f7c9bf1cefbc4957 100644
--- a/l10n/nn_NO/core.po
+++ b/l10n/nn_NO/core.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:33+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-24 12:58-0400\n"
+"PO-Revision-Date: 2013-09-24 08:30+0000\n"
+"Last-Translator: unhammer <unhammer+dill@mm.st>\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -95,23 +95,23 @@ msgstr "Klarte ikkje fjerna %s frå favorittar."
#: avatar/controller.php:62
msgid "No image or file provided"
-msgstr ""
+msgstr "Inga bilete eller fil gitt"
#: avatar/controller.php:81
msgid "Unknown filetype"
-msgstr ""
+msgstr "Ukjend filtype"
#: avatar/controller.php:85
msgid "Invalid image"
-msgstr ""
+msgstr "Ugyldig bilete"
#: avatar/controller.php:115 avatar/controller.php:142
msgid "No temporary profile picture available, try again"
-msgstr ""
+msgstr "Inga midlertidig profilbilete tilgjengeleg, prøv igjen"
#: avatar/controller.php:135
msgid "No crop data provided"
-msgstr ""
+msgstr "Ingen beskjeringsdata gitt"
#: js/config.php:32
msgid "Sunday"
@@ -193,55 +193,55 @@ msgstr "Desember"
msgid "Settings"
msgstr "Innstillingar"
-#: js/js.js:853
+#: js/js.js:866
msgid "seconds ago"
msgstr "sekund sidan"
-#: js/js.js:854
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n minutt sidan"
msgstr[1] "%n minutt sidan"
-#: js/js.js:855
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n time sidan"
msgstr[1] "%n timar sidan"
-#: js/js.js:856
+#: js/js.js:869
msgid "today"
msgstr "i dag"
-#: js/js.js:857
+#: js/js.js:870
msgid "yesterday"
msgstr "i går"
-#: js/js.js:858
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n dag sidan"
msgstr[1] "%n dagar sidan"
-#: js/js.js:859
+#: js/js.js:872
msgid "last month"
msgstr "førre månad"
-#: js/js.js:860
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n månad sidan"
msgstr[1] "%n månadar sidan"
-#: js/js.js:861
+#: js/js.js:874
msgid "months ago"
msgstr "månadar sidan"
-#: js/js.js:862
+#: js/js.js:875
msgid "last year"
msgstr "i fjor"
-#: js/js.js:863
+#: js/js.js:876
msgid "years ago"
msgstr "Ã¥r sidan"
@@ -251,7 +251,7 @@ msgstr "Vel"
#: js/oc-dialogs.js:146
msgid "Error loading file picker template: {error}"
-msgstr ""
+msgstr "Klarte ikkje å lasta filplukkarmal: {error}"
#: js/oc-dialogs.js:172
msgid "Yes"
@@ -267,7 +267,47 @@ msgstr "Greitt"
#: js/oc-dialogs.js:219
msgid "Error loading message template: {error}"
-msgstr ""
+msgstr "Klarte ikkje å lasta meldingsmal: {error}"
+
+#: js/oc-dialogs.js:347
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] "{count} filkonflikt"
+msgstr[1] "{count} filkonfliktar"
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr "Éin filkonflikt"
+
+#: js/oc-dialogs.js:367
+msgid "Which files do you want to keep?"
+msgstr "Kva filer vil du spara?"
+
+#: js/oc-dialogs.js:368
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr "Viss du vel begge utgåvene, vil den kopierte fila få eit tal lagt til namnet."
+
+#: js/oc-dialogs.js:376
+msgid "Cancel"
+msgstr "Avbryt"
+
+#: js/oc-dialogs.js:386
+msgid "Continue"
+msgstr "GÃ¥ vidare"
+
+#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+msgid "(all selected)"
+msgstr "(alle valte)"
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "({count} selected)"
+msgstr "({count} valte)"
+
+#: js/oc-dialogs.js:457
+msgid "Error loading file exists template"
+msgstr "Klarte ikkje å lasta fil-finst-mal"
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
@@ -278,7 +318,7 @@ msgstr "Objekttypen er ikkje spesifisert."
#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
-#: js/share.js:645 js/share.js:657
+#: js/share.js:656 js/share.js:668
msgid "Error"
msgstr "Feil"
@@ -298,7 +338,7 @@ msgstr "Delt"
msgid "Share"
msgstr "Del"
-#: js/share.js:131 js/share.js:685
+#: js/share.js:131 js/share.js:696
msgid "Error while sharing"
msgstr "Feil ved deling"
@@ -398,23 +438,23 @@ msgstr "slett"
msgid "share"
msgstr "del"
-#: js/share.js:400 js/share.js:632
+#: js/share.js:400 js/share.js:643
msgid "Password protected"
msgstr "Passordverna"
-#: js/share.js:645
+#: js/share.js:656
msgid "Error unsetting expiration date"
msgstr "Klarte ikkje fjerna utløpsdato"
-#: js/share.js:657
+#: js/share.js:668
msgid "Error setting expiration date"
msgstr "Klarte ikkje setja utløpsdato"
-#: js/share.js:672
+#: js/share.js:683
msgid "Sending ..."
msgstr "Sender …"
-#: js/share.js:683
+#: js/share.js:694
msgid "Email sent"
msgstr "E-post sendt"
diff --git a/l10n/nn_NO/files.po b/l10n/nn_NO/files.po
index 049246c47e1bfe1bd5f128b0f5d6bdf110382b19..dc82bdca1b74917dde1234f75ffaf338a70332d1 100644
--- a/l10n/nn_NO/files.po
+++ b/l10n/nn_NO/files.po
@@ -5,12 +5,13 @@
# Translators:
# unhammer <unhammer+dill@mm.st>, 2013
# unhammer <unhammer+dill@mm.st>, 2013
+# unhammer <unhammer+dill@mm.st>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:00+0000\n"
+"POT-Creation-Date: 2013-09-24 12:58-0400\n"
+"PO-Revision-Date: 2013-09-24 08:20+0000\n"
"Last-Translator: unhammer <unhammer+dill@mm.st>\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
@@ -76,156 +77,164 @@ msgstr "Klarte ikkje skriva til disk"
msgid "Not enough storage available"
msgstr "Ikkje nok lagringsplass tilgjengeleg"
-#: ajax/upload.php:109
-msgid "Upload failed"
-msgstr "Feil ved opplasting"
+#: ajax/upload.php:120 ajax/upload.php:143
+msgid "Upload failed. Could not get file info."
+msgstr "Feil ved opplasting. Klarte ikkje å henta filinfo."
+
+#: ajax/upload.php:136
+msgid "Upload failed. Could not find uploaded file"
+msgstr "Feil ved opplasting. Klarte ikkje å finna opplasta fil."
-#: ajax/upload.php:127
+#: ajax/upload.php:160
msgid "Invalid directory."
msgstr "Ugyldig mappe."
-#: appinfo/app.php:12
+#: appinfo/app.php:11
msgid "Files"
msgstr "Filer"
-#: js/file-upload.js:11
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Klarte ikkje lasta opp fila sidan ho er ei mappe eller er på 0 byte"
+#: js/file-upload.js:244
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
+msgstr "Klarte ikkje å lasta opp {filename} sidan det er ei mappe eller er 0 byte."
-#: js/file-upload.js:24
+#: js/file-upload.js:255
msgid "Not enough space available"
msgstr "Ikkje nok lagringsplass tilgjengeleg"
-#: js/file-upload.js:64
+#: js/file-upload.js:322
msgid "Upload cancelled."
msgstr "Opplasting avbroten."
-#: js/file-upload.js:165
+#: js/file-upload.js:356
+msgid "Could not get result from server."
+msgstr "Klarte ikkje å henta resultat frå tenaren."
+
+#: js/file-upload.js:446
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Fila lastar no opp. Viss du forlèt sida no vil opplastinga verta avbroten."
-#: js/file-upload.js:239
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr "Nettadressa kan ikkje vera tom."
-#: js/file-upload.js:244 lib/app.php:53
+#: js/file-upload.js:525 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr "Ugyldig mappenamn. Mappa «Shared» er reservert av ownCloud"
-#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550
+#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545
msgid "Error"
msgstr "Feil"
-#: js/fileactions.js:116
+#: js/fileactions.js:119
msgid "Share"
msgstr "Del"
-#: js/fileactions.js:126
+#: js/fileactions.js:131
msgid "Delete permanently"
msgstr "Slett for godt"
-#: js/fileactions.js:192
+#: js/fileactions.js:197
msgid "Rename"
msgstr "Endra namn"
-#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "Under vegs"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{new_name} finst allereie"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "byt ut"
-#: js/filelist.js:307
+#: js/filelist.js:416
msgid "suggest name"
msgstr "føreslå namn"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "avbryt"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr "bytte ut {new_name} med {old_name}"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "undo"
msgstr "angre"
-#: js/filelist.js:424 js/filelist.js:490 js/files.js:581
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "%n mappe"
msgstr[1] "%n mapper"
-#: js/filelist.js:425 js/filelist.js:491 js/files.js:587
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "%n fil"
msgstr[1] "%n filer"
-#: js/filelist.js:432
+#: js/filelist.js:541
msgid "{dirs} and {files}"
msgstr "{dirs} og {files}"
-#: js/filelist.js:563
+#: js/filelist.js:731 js/filelist.js:769
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "Lastar opp %n fil"
msgstr[1] "Lastar opp %n filer"
-#: js/filelist.js:628
-msgid "files uploading"
-msgstr "filer lastar opp"
-
-#: js/files.js:52
+#: js/files.js:25
msgid "'.' is an invalid file name."
msgstr "«.» er eit ugyldig filnamn."
-#: js/files.js:56
+#: js/files.js:29
msgid "File name cannot be empty."
msgstr "Filnamnet kan ikkje vera tomt."
-#: js/files.js:64
+#: js/files.js:37
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Ugyldig namn, «\\», «/», «<», «>», «:», «\"», «|», «?» og «*» er ikkje tillate."
-#: js/files.js:78
+#: js/files.js:51
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr "Lagringa di er full, kan ikkje lenger oppdatera eller synkronisera!"
-#: js/files.js:82
+#: js/files.js:55
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Lagringa di er nesten full ({usedSpacePercent} %)"
-#: js/files.js:94
+#: js/files.js:67
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
msgstr "Kryptering er skrudd av, men filene dine er enno krypterte. Du kan dekryptera filene i personlege innstillingar."
-#: js/files.js:245
+#: js/files.js:296
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "Gjer klar nedlastinga di. Dette kan ta ei stund viss filene er store."
-#: js/files.js:563 templates/index.php:69
+#: js/files.js:507 js/files.js:545
+msgid "Error moving file"
+msgstr "Feil ved flytting av fil"
+
+#: js/files.js:558 templates/index.php:61
msgid "Name"
msgstr "Namn"
-#: js/files.js:564 templates/index.php:81
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "Storleik"
-#: js/files.js:565 templates/index.php:83
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr "Endra"
@@ -234,7 +243,7 @@ msgstr "Endra"
msgid "%s could not be renamed"
msgstr "Klarte ikkje å omdøypa på %s"
-#: lib/helper.php:11 templates/index.php:18
+#: lib/helper.php:11 templates/index.php:17
msgid "Upload"
msgstr "Last opp"
@@ -270,65 +279,65 @@ msgstr "Maksimal storleik for ZIP-filer"
msgid "Save"
msgstr "Lagre"
-#: templates/index.php:7
+#: templates/index.php:6
msgid "New"
msgstr "Ny"
-#: templates/index.php:10
+#: templates/index.php:9
msgid "Text file"
msgstr "Tekst fil"
-#: templates/index.php:12
+#: templates/index.php:11
msgid "Folder"
msgstr "Mappe"
-#: templates/index.php:14
+#: templates/index.php:13
msgid "From link"
msgstr "Frå lenkje"
-#: templates/index.php:41
+#: templates/index.php:33
msgid "Deleted files"
msgstr "Sletta filer"
-#: templates/index.php:46
+#: templates/index.php:39
msgid "Cancel upload"
msgstr "Avbryt opplasting"
-#: templates/index.php:52
+#: templates/index.php:45
msgid "You don’t have write permissions here."
msgstr "Du har ikkje skriverettar her."
-#: templates/index.php:59
+#: templates/index.php:50
msgid "Nothing in here. Upload something!"
msgstr "Ingenting her. Last noko opp!"
-#: templates/index.php:75
+#: templates/index.php:67
msgid "Download"
msgstr "Last ned"
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr "Udel"
-#: templates/index.php:94 templates/index.php:95
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "Slett"
-#: templates/index.php:108
+#: templates/index.php:100
msgid "Upload too large"
msgstr "For stor opplasting"
-#: templates/index.php:110
+#: templates/index.php:102
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Filene du prøver å lasta opp er større enn maksgrensa til denne tenaren."
-#: templates/index.php:115
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr "Skannar filer, ver venleg og vent."
-#: templates/index.php:118
+#: templates/index.php:110
msgid "Current scanning"
msgstr "Køyrande skanning"
diff --git a/l10n/nn_NO/lib.po b/l10n/nn_NO/lib.po
index dd499893e3ce6a6d369f8c04a54547ba5616015d..9e73f6fe6aa9165b968b984866d6c0b7f4e5a6cb 100644
--- a/l10n/nn_NO/lib.po
+++ b/l10n/nn_NO/lib.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-09-24 12:58-0400\n"
+"PO-Revision-Date: 2013-09-24 08:30+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
@@ -61,11 +61,11 @@ msgstr ""
#: avatar.php:64
msgid "Unknown filetype"
-msgstr ""
+msgstr "Ukjend filtype"
#: avatar.php:69
msgid "Invalid image"
-msgstr ""
+msgstr "Ugyldig bilete"
#: defaults.php:35
msgid "web services under your control"
@@ -166,15 +166,15 @@ msgstr "Feil i autentisering"
msgid "Token expired. Please reload page."
msgstr ""
-#: search/provider/file.php:17 search/provider/file.php:35
+#: search/provider/file.php:18 search/provider/file.php:36
msgid "Files"
msgstr "Filer"
-#: search/provider/file.php:26 search/provider/file.php:33
+#: search/provider/file.php:27 search/provider/file.php:34
msgid "Text"
msgstr "Tekst"
-#: search/provider/file.php:29
+#: search/provider/file.php:30
msgid "Images"
msgstr ""
diff --git a/l10n/nn_NO/settings.po b/l10n/nn_NO/settings.po
index 50ceb17f76cfe8968c9b36846adca139df3759db..761b9f46275e14fbc81700f1979c6d1df9e14748 100644
--- a/l10n/nn_NO/settings.po
+++ b/l10n/nn_NO/settings.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-24 12:58-0400\n"
+"PO-Revision-Date: 2013-09-24 08:30+0000\n"
+"Last-Translator: unhammer <unhammer+dill@mm.st>\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -25,7 +25,7 @@ msgid "Unable to load list from App Store"
msgstr "Klarer ikkje å lasta inn liste fra app-butikken"
#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
-#: ajax/togglegroups.php:20
+#: ajax/togglegroups.php:20 changepassword/controller.php:55
msgid "Authentication error"
msgstr "Autentiseringsfeil"
@@ -87,15 +87,44 @@ msgstr "Klarte ikkje fjerna brukaren frå gruppa %s"
msgid "Couldn't update app."
msgstr "Klarte ikkje oppdatera programmet."
+#: changepassword/controller.php:20
+msgid "Wrong password"
+msgstr "Feil passord"
+
+#: changepassword/controller.php:42
+msgid "No user supplied"
+msgstr "Ingen brukar gitt"
+
+#: changepassword/controller.php:74
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr "Ver venleg og gi eit admingjenopprettingspassord, elles vil all brukardata gå tapt."
+
+#: changepassword/controller.php:79
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr "Feil admingjenopprettingspassord. Ver venleg og sjekk passordet og prøv igjen."
+
+#: changepassword/controller.php:87
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr "Bakstykket støttar ikkje passordendring, men krypteringsnøkkelen til brukaren blei oppdatert."
+
+#: changepassword/controller.php:92 changepassword/controller.php:103
+msgid "Unable to change password"
+msgstr "Klarte ikkje å endra passordet"
+
#: js/apps.js:43
msgid "Update to {appversion}"
msgstr "Oppdater til {appversion}"
-#: js/apps.js:49 js/apps.js:82 js/apps.js:108
+#: js/apps.js:49 js/apps.js:82 js/apps.js:110
msgid "Disable"
msgstr "Slå av"
-#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
+#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
msgid "Enable"
msgstr "Slå på"
@@ -103,43 +132,43 @@ msgstr "Slå på"
msgid "Please wait...."
msgstr "Ver venleg og vent …"
-#: js/apps.js:79 js/apps.js:80 js/apps.js:100
+#: js/apps.js:79 js/apps.js:80 js/apps.js:101
msgid "Error while disabling app"
msgstr "Klarte ikkje å skru av programmet"
-#: js/apps.js:99 js/apps.js:112 js/apps.js:113
+#: js/apps.js:100 js/apps.js:114 js/apps.js:115
msgid "Error while enabling app"
msgstr "Klarte ikkje å skru på programmet"
-#: js/apps.js:123
+#: js/apps.js:125
msgid "Updating...."
msgstr "Oppdaterer …"
-#: js/apps.js:126
+#: js/apps.js:128
msgid "Error while updating app"
msgstr "Feil ved oppdatering av app"
-#: js/apps.js:126
+#: js/apps.js:128
msgid "Error"
msgstr "Feil"
-#: js/apps.js:127 templates/apps.php:43
+#: js/apps.js:129 templates/apps.php:43
msgid "Update"
msgstr "Oppdater"
-#: js/apps.js:130
+#: js/apps.js:132
msgid "Updated"
msgstr "Oppdatert"
-#: js/personal.js:217
+#: js/personal.js:220
msgid "Select a profile picture"
-msgstr ""
+msgstr "Vel eit profilbilete"
-#: js/personal.js:262
+#: js/personal.js:265
msgid "Decrypting files... Please wait, this can take some time."
msgstr "Dekrypterer filer … Ver venleg og vent, dette kan ta ei stund."
-#: js/personal.js:284
+#: js/personal.js:287
msgid "Saving..."
msgstr "Lagrar …"
@@ -463,31 +492,31 @@ msgstr "Fyll inn e-postadressa di for å gjera passordgjenoppretting mogleg"
#: templates/personal.php:86
msgid "Profile picture"
-msgstr ""
+msgstr "Profilbilete"
#: templates/personal.php:90
msgid "Upload new"
-msgstr ""
+msgstr "Last opp ny"
#: templates/personal.php:92
msgid "Select new from Files"
-msgstr ""
+msgstr "Vel ny frå Filer"
#: templates/personal.php:93
msgid "Remove image"
-msgstr ""
+msgstr "Fjern bilete"
#: templates/personal.php:94
msgid "Either png or jpg. Ideally square but you will be able to crop it."
-msgstr ""
+msgstr "Anten PNG eller JPG. Helst kvadratisk, men du får moglegheita til å beskjera det."
#: templates/personal.php:97
msgid "Abort"
-msgstr ""
+msgstr "Avbryt"
#: templates/personal.php:98
msgid "Choose as profile image"
-msgstr ""
+msgstr "Vel som profilbilete"
#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
diff --git a/l10n/nqo/core.po b/l10n/nqo/core.po
index 27d872844d4509524b55e71f69e1fffba83745de..e50801d30bab899fe77bbe766ab2a2cd8a4ba137 100644
--- a/l10n/nqo/core.po
+++ b/l10n/nqo/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: N'ko (http://www.transifex.com/projects/p/owncloud/language/nqo/)\n"
"MIME-Version: 1.0\n"
@@ -190,51 +190,51 @@ msgstr ""
msgid "Settings"
msgstr ""
-#: js/js.js:853
+#: js/js.js:866
msgid "seconds ago"
msgstr ""
-#: js/js.js:854
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: js/js.js:855
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: js/js.js:856
+#: js/js.js:869
msgid "today"
msgstr ""
-#: js/js.js:857
+#: js/js.js:870
msgid "yesterday"
msgstr ""
-#: js/js.js:858
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
-#: js/js.js:859
+#: js/js.js:872
msgid "last month"
msgstr ""
-#: js/js.js:860
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: js/js.js:861
+#: js/js.js:874
msgid "months ago"
msgstr ""
-#: js/js.js:862
+#: js/js.js:875
msgid "last year"
msgstr ""
-#: js/js.js:863
+#: js/js.js:876
msgid "years ago"
msgstr ""
@@ -262,6 +262,45 @@ msgstr ""
msgid "Error loading message template: {error}"
msgstr ""
+#: js/oc-dialogs.js:347
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:367
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:376
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:386
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:457
+msgid "Error loading file exists template"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/nqo/files.po b/l10n/nqo/files.po
index ee3f40afbc436a32e6c98b66bae1ff95e2425adb..4749e89f2645d1d866c22b173d48b797c353ea84 100644
--- a/l10n/nqo/files.po
+++ b/l10n/nqo/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-07 04:39-0400\n"
-"PO-Revision-Date: 2013-09-07 07:28+0000\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: N'ko (http://www.transifex.com/projects/p/owncloud/language/nqo/)\n"
"MIME-Version: 1.0\n"
@@ -74,11 +74,15 @@ msgstr ""
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:109
-msgid "Upload failed"
+#: ajax/upload.php:120 ajax/upload.php:143
+msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:127
+#: ajax/upload.php:136
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
+
+#: ajax/upload.php:160
msgid "Invalid directory."
msgstr ""
@@ -86,141 +90,145 @@ msgstr ""
msgid "Files"
msgstr ""
-#: js/file-upload.js:11
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
+#: js/file-upload.js:244
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr ""
-#: js/file-upload.js:24
+#: js/file-upload.js:255
msgid "Not enough space available"
msgstr ""
-#: js/file-upload.js:64
+#: js/file-upload.js:322
msgid "Upload cancelled."
msgstr ""
-#: js/file-upload.js:165
+#: js/file-upload.js:356
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:446
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/file-upload.js:239
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr ""
-#: js/file-upload.js:244 lib/app.php:53
+#: js/file-upload.js:525 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550
+#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545
msgid "Error"
msgstr ""
-#: js/fileactions.js:116
+#: js/fileactions.js:119
msgid "Share"
msgstr ""
-#: js/fileactions.js:126
+#: js/fileactions.js:131
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:192
+#: js/fileactions.js:197
msgid "Rename"
msgstr ""
-#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr ""
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr ""
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr ""
-#: js/filelist.js:307
+#: js/filelist.js:416
msgid "suggest name"
msgstr ""
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr ""
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr ""
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "undo"
msgstr ""
-#: js/filelist.js:424 js/filelist.js:490 js/files.js:581
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
-#: js/filelist.js:425 js/filelist.js:491 js/files.js:587
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
-#: js/filelist.js:432
+#: js/filelist.js:541
msgid "{dirs} and {files}"
msgstr ""
-#: js/filelist.js:563
+#: js/filelist.js:731 js/filelist.js:769
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
-#: js/filelist.js:628
-msgid "files uploading"
-msgstr ""
-
-#: js/files.js:52
+#: js/files.js:25
msgid "'.' is an invalid file name."
msgstr ""
-#: js/files.js:56
+#: js/files.js:29
msgid "File name cannot be empty."
msgstr ""
-#: js/files.js:64
+#: js/files.js:37
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: js/files.js:78
+#: js/files.js:51
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr ""
-#: js/files.js:82
+#: js/files.js:55
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:94
+#: js/files.js:67
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
msgstr ""
-#: js/files.js:245
+#: js/files.js:296
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/files.js:563 templates/index.php:69
+#: js/files.js:507 js/files.js:545
+msgid "Error moving file"
+msgstr ""
+
+#: js/files.js:558 templates/index.php:61
msgid "Name"
msgstr ""
-#: js/files.js:564 templates/index.php:81
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr ""
-#: js/files.js:565 templates/index.php:83
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr ""
@@ -229,7 +237,7 @@ msgstr ""
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:11 templates/index.php:18
+#: lib/helper.php:11 templates/index.php:17
msgid "Upload"
msgstr ""
@@ -265,65 +273,65 @@ msgstr ""
msgid "Save"
msgstr ""
-#: templates/index.php:7
+#: templates/index.php:6
msgid "New"
msgstr ""
-#: templates/index.php:10
+#: templates/index.php:9
msgid "Text file"
msgstr ""
-#: templates/index.php:12
+#: templates/index.php:11
msgid "Folder"
msgstr ""
-#: templates/index.php:14
+#: templates/index.php:13
msgid "From link"
msgstr ""
-#: templates/index.php:41
+#: templates/index.php:33
msgid "Deleted files"
msgstr ""
-#: templates/index.php:46
+#: templates/index.php:39
msgid "Cancel upload"
msgstr ""
-#: templates/index.php:52
+#: templates/index.php:45
msgid "You don’t have write permissions here."
msgstr ""
-#: templates/index.php:59
+#: templates/index.php:50
msgid "Nothing in here. Upload something!"
msgstr ""
-#: templates/index.php:75
+#: templates/index.php:67
msgid "Download"
msgstr ""
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr ""
-#: templates/index.php:94 templates/index.php:95
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr ""
-#: templates/index.php:108
+#: templates/index.php:100
msgid "Upload too large"
msgstr ""
-#: templates/index.php:110
+#: templates/index.php:102
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: templates/index.php:115
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:118
+#: templates/index.php:110
msgid "Current scanning"
msgstr ""
diff --git a/l10n/nqo/settings.po b/l10n/nqo/settings.po
index 8faee77648b17473500c10eea38f994da7132a76..aafbac399b08451fff752ad403cd908028722bcc 100644
--- a/l10n/nqo/settings.po
+++ b/l10n/nqo/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:45-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: N'ko (http://www.transifex.com/projects/p/owncloud/language/nqo/)\n"
"MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgid "Unable to load list from App Store"
msgstr ""
#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
-#: ajax/togglegroups.php:20
+#: ajax/togglegroups.php:20 changepassword/controller.php:55
msgid "Authentication error"
msgstr ""
@@ -84,6 +84,35 @@ msgstr ""
msgid "Couldn't update app."
msgstr ""
+#: changepassword/controller.php:20
+msgid "Wrong password"
+msgstr ""
+
+#: changepassword/controller.php:42
+msgid "No user supplied"
+msgstr ""
+
+#: changepassword/controller.php:74
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr ""
+
+#: changepassword/controller.php:79
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr ""
+
+#: changepassword/controller.php:87
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr ""
+
+#: changepassword/controller.php:92 changepassword/controller.php:103
+msgid "Unable to change password"
+msgstr ""
+
#: js/apps.js:43
msgid "Update to {appversion}"
msgstr ""
@@ -128,15 +157,15 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:217
+#: js/personal.js:220
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:262
+#: js/personal.js:265
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:284
+#: js/personal.js:287
msgid "Saving..."
msgstr ""
diff --git a/l10n/oc/core.po b/l10n/oc/core.po
index 42aeba0c1890601439a631baca587ead5fafaaf3..10cb24643137dea8ce1da74c456cafe90c77dd55 100644
--- a/l10n/oc/core.po
+++ b/l10n/oc/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:33+0000\n"
+"POT-Creation-Date: 2013-09-22 12:55-0400\n"
+"PO-Revision-Date: 2013-09-20 15:01+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
"MIME-Version: 1.0\n"
@@ -190,55 +190,55 @@ msgstr "Decembre"
msgid "Settings"
msgstr "Configuracion"
-#: js/js.js:853
+#: js/js.js:866
msgid "seconds ago"
msgstr "segonda a"
-#: js/js.js:854
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:855
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:856
+#: js/js.js:869
msgid "today"
msgstr "uèi"
-#: js/js.js:857
+#: js/js.js:870
msgid "yesterday"
msgstr "ièr"
-#: js/js.js:858
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:859
+#: js/js.js:872
msgid "last month"
msgstr "mes passat"
-#: js/js.js:860
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:861
+#: js/js.js:874
msgid "months ago"
msgstr "meses a"
-#: js/js.js:862
+#: js/js.js:875
msgid "last year"
msgstr "an passat"
-#: js/js.js:863
+#: js/js.js:876
msgid "years ago"
msgstr "ans a"
@@ -266,6 +266,46 @@ msgstr "D'accòrdi"
msgid "Error loading message template: {error}"
msgstr ""
+#: js/oc-dialogs.js:347
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:367
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:376
+msgid "Cancel"
+msgstr "Annula"
+
+#: js/oc-dialogs.js:386
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:457
+msgid "Error loading file exists template"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/oc/files.po b/l10n/oc/files.po
index 1630f022556051969ff6c5e51ff4f77741716190..df81825fe3f912fe8718c8a8d75f7e1e0ee9a325 100644
--- a/l10n/oc/files.po
+++ b/l10n/oc/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:00+0000\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
"MIME-Version: 1.0\n"
@@ -74,11 +74,15 @@ msgstr "L'escriptura sul disc a fracassat"
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:109
-msgid "Upload failed"
+#: ajax/upload.php:120 ajax/upload.php:143
+msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:127
+#: ajax/upload.php:136
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
+
+#: ajax/upload.php:160
msgid "Invalid directory."
msgstr ""
@@ -86,144 +90,148 @@ msgstr ""
msgid "Files"
msgstr "Fichièrs"
-#: js/file-upload.js:11
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Impossible d'amontcargar lo teu fichièr qu'es un repertòri o que ten pas que 0 octet."
+#: js/file-upload.js:244
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
+msgstr ""
-#: js/file-upload.js:24
+#: js/file-upload.js:255
msgid "Not enough space available"
msgstr ""
-#: js/file-upload.js:64
+#: js/file-upload.js:322
msgid "Upload cancelled."
msgstr "Amontcargar anullat."
-#: js/file-upload.js:165
+#: js/file-upload.js:356
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:446
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Un amontcargar es a se far. Daissar aquesta pagina ara tamparà lo cargament. "
-#: js/file-upload.js:239
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr ""
-#: js/file-upload.js:244 lib/app.php:53
+#: js/file-upload.js:525 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550
+#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545
msgid "Error"
msgstr "Error"
-#: js/fileactions.js:116
+#: js/fileactions.js:119
msgid "Share"
msgstr "Parteja"
-#: js/fileactions.js:126
+#: js/fileactions.js:131
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:192
+#: js/fileactions.js:197
msgid "Rename"
msgstr "Torna nomenar"
-#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "Al esperar"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr ""
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "remplaça"
-#: js/filelist.js:307
+#: js/filelist.js:416
msgid "suggest name"
msgstr "nom prepausat"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "anulla"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr ""
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "undo"
msgstr "defar"
-#: js/filelist.js:424 js/filelist.js:490 js/files.js:581
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:425 js/filelist.js:491 js/files.js:587
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:432
+#: js/filelist.js:541
msgid "{dirs} and {files}"
msgstr ""
-#: js/filelist.js:563
+#: js/filelist.js:731 js/filelist.js:769
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:628
-msgid "files uploading"
-msgstr "fichièrs al amontcargar"
-
-#: js/files.js:52
+#: js/files.js:25
msgid "'.' is an invalid file name."
msgstr ""
-#: js/files.js:56
+#: js/files.js:29
msgid "File name cannot be empty."
msgstr ""
-#: js/files.js:64
+#: js/files.js:37
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: js/files.js:78
+#: js/files.js:51
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr ""
-#: js/files.js:82
+#: js/files.js:55
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:94
+#: js/files.js:67
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
msgstr ""
-#: js/files.js:245
+#: js/files.js:296
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/files.js:563 templates/index.php:69
+#: js/files.js:507 js/files.js:545
+msgid "Error moving file"
+msgstr ""
+
+#: js/files.js:558 templates/index.php:61
msgid "Name"
msgstr "Nom"
-#: js/files.js:564 templates/index.php:81
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "Talha"
-#: js/files.js:565 templates/index.php:83
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr "Modificat"
@@ -232,7 +240,7 @@ msgstr "Modificat"
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:11 templates/index.php:18
+#: lib/helper.php:11 templates/index.php:17
msgid "Upload"
msgstr "Amontcarga"
@@ -268,65 +276,65 @@ msgstr "Talha maximum de dintrada per fichièrs ZIP"
msgid "Save"
msgstr "Enregistra"
-#: templates/index.php:7
+#: templates/index.php:6
msgid "New"
msgstr "Nòu"
-#: templates/index.php:10
+#: templates/index.php:9
msgid "Text file"
msgstr "Fichièr de tèxte"
-#: templates/index.php:12
+#: templates/index.php:11
msgid "Folder"
msgstr "Dorsièr"
-#: templates/index.php:14
+#: templates/index.php:13
msgid "From link"
msgstr ""
-#: templates/index.php:41
+#: templates/index.php:33
msgid "Deleted files"
msgstr ""
-#: templates/index.php:46
+#: templates/index.php:39
msgid "Cancel upload"
msgstr " Anulla l'amontcargar"
-#: templates/index.php:52
+#: templates/index.php:45
msgid "You don’t have write permissions here."
msgstr ""
-#: templates/index.php:59
+#: templates/index.php:50
msgid "Nothing in here. Upload something!"
msgstr "Pas res dedins. Amontcarga qualquaren"
-#: templates/index.php:75
+#: templates/index.php:67
msgid "Download"
msgstr "Avalcarga"
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr "Pas partejador"
-#: templates/index.php:94 templates/index.php:95
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "Escafa"
-#: templates/index.php:108
+#: templates/index.php:100
msgid "Upload too large"
msgstr "Amontcargament tròp gròs"
-#: templates/index.php:110
+#: templates/index.php:102
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Los fichièrs que sias a amontcargar son tròp pesucs per la talha maxi pel servidor."
-#: templates/index.php:115
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr "Los fiichièrs son a èsser explorats, "
-#: templates/index.php:118
+#: templates/index.php:110
msgid "Current scanning"
msgstr "Exploracion en cors"
diff --git a/l10n/oc/settings.po b/l10n/oc/settings.po
index bbc9fecb0b722ec8d4580bd4a8c292be1ca20aef..bd0c36692d28e2f0df2978e6336610d6eeb86829 100644
--- a/l10n/oc/settings.po
+++ b/l10n/oc/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:45-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
"MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgid "Unable to load list from App Store"
msgstr "Pas possible de cargar la tièra dempuèi App Store"
#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
-#: ajax/togglegroups.php:20
+#: ajax/togglegroups.php:20 changepassword/controller.php:55
msgid "Authentication error"
msgstr "Error d'autentificacion"
@@ -84,6 +84,35 @@ msgstr "Pas capable de tira un usancièr del grop %s"
msgid "Couldn't update app."
msgstr ""
+#: changepassword/controller.php:20
+msgid "Wrong password"
+msgstr ""
+
+#: changepassword/controller.php:42
+msgid "No user supplied"
+msgstr ""
+
+#: changepassword/controller.php:74
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr ""
+
+#: changepassword/controller.php:79
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr ""
+
+#: changepassword/controller.php:87
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr ""
+
+#: changepassword/controller.php:92 changepassword/controller.php:103
+msgid "Unable to change password"
+msgstr ""
+
#: js/apps.js:43
msgid "Update to {appversion}"
msgstr ""
@@ -128,15 +157,15 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:217
+#: js/personal.js:220
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:262
+#: js/personal.js:265
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:284
+#: js/personal.js:287
msgid "Saving..."
msgstr "Enregistra..."
diff --git a/l10n/pa/core.po b/l10n/pa/core.po
new file mode 100644
index 0000000000000000000000000000000000000000..184ac05da0136f08cf6f5df3050e528f01c643ba
--- /dev/null
+++ b/l10n/pa/core.po
@@ -0,0 +1,712 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+# A S Alam <apreet.alam@gmail.com>, 2013
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-09-22 12:55-0400\n"
+"PO-Revision-Date: 2013-09-20 15:01+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/owncloud/language/pa/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pa\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/share.php:97
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr ""
+
+#: ajax/share.php:227
+msgid "group"
+msgstr ""
+
+#: ajax/update.php:11
+msgid "Turned on maintenance mode"
+msgstr ""
+
+#: ajax/update.php:14
+msgid "Turned off maintenance mode"
+msgstr ""
+
+#: ajax/update.php:17
+msgid "Updated database"
+msgstr ""
+
+#: ajax/update.php:20
+msgid "Updating filecache, this may take really long..."
+msgstr ""
+
+#: ajax/update.php:23
+msgid "Updated filecache"
+msgstr ""
+
+#: ajax/update.php:26
+#, php-format
+msgid "... %d%% done ..."
+msgstr ""
+
+#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
+msgid "Category type not provided."
+msgstr ""
+
+#: ajax/vcategories/add.php:30
+msgid "No category to add?"
+msgstr ""
+
+#: ajax/vcategories/add.php:37
+#, php-format
+msgid "This category already exists: %s"
+msgstr ""
+
+#: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
+#: ajax/vcategories/favorites.php:24
+#: ajax/vcategories/removeFromFavorites.php:26
+msgid "Object type not provided."
+msgstr ""
+
+#: ajax/vcategories/addToFavorites.php:30
+#: ajax/vcategories/removeFromFavorites.php:30
+#, php-format
+msgid "%s ID not provided."
+msgstr ""
+
+#: ajax/vcategories/addToFavorites.php:35
+#, php-format
+msgid "Error adding %s to favorites."
+msgstr ""
+
+#: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: ajax/vcategories/removeFromFavorites.php:35
+#, php-format
+msgid "Error removing %s from favorites."
+msgstr ""
+
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr ""
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr ""
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr ""
+
+#: js/config.php:32
+msgid "Sunday"
+msgstr "à¨à¨¤à¨µà¨¾à¨°"
+
+#: js/config.php:33
+msgid "Monday"
+msgstr "ਸੋਮਵਾਰ"
+
+#: js/config.php:34
+msgid "Tuesday"
+msgstr "ਮੰਗਲਵਾਰ"
+
+#: js/config.php:35
+msgid "Wednesday"
+msgstr "ਬà©à©±à¨§à¨µà¨¾à¨°"
+
+#: js/config.php:36
+msgid "Thursday"
+msgstr "ਵੀਰਵਾਰ"
+
+#: js/config.php:37
+msgid "Friday"
+msgstr "ਸ਼à©à©±à¨•à¨°à¨µà¨¾à¨°"
+
+#: js/config.php:38
+msgid "Saturday"
+msgstr "ਸ਼ਨਿੱਚਰਵਾਰ"
+
+#: js/config.php:43
+msgid "January"
+msgstr "ਜਨਵਰੀ"
+
+#: js/config.php:44
+msgid "February"
+msgstr "ਫਰਵਰੀ"
+
+#: js/config.php:45
+msgid "March"
+msgstr "ਮਾਰਚ"
+
+#: js/config.php:46
+msgid "April"
+msgstr "ਅਪਰੈ"
+
+#: js/config.php:47
+msgid "May"
+msgstr "ਮਈ"
+
+#: js/config.php:48
+msgid "June"
+msgstr "ਜੂਨ"
+
+#: js/config.php:49
+msgid "July"
+msgstr "ਜà©à¨²à¨¾à¨ˆ"
+
+#: js/config.php:50
+msgid "August"
+msgstr "ਅਗਸਤ"
+
+#: js/config.php:51
+msgid "September"
+msgstr "ਸਤੰਬ"
+
+#: js/config.php:52
+msgid "October"
+msgstr "ਅਕਤੂਬਰ"
+
+#: js/config.php:53
+msgid "November"
+msgstr "ਨਵੰਬ"
+
+#: js/config.php:54
+msgid "December"
+msgstr "ਦਸੰਬਰ"
+
+#: js/js.js:387
+msgid "Settings"
+msgstr "ਸੈਟਿੰਗ"
+
+#: js/js.js:866
+msgid "seconds ago"
+msgstr "ਸਕਿੰਟ ਪਹਿਲਾਂ"
+
+#: js/js.js:867
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:868
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:869
+msgid "today"
+msgstr "ਅੱਜ"
+
+#: js/js.js:870
+msgid "yesterday"
+msgstr "ਕੱਲà©à¨¹"
+
+#: js/js.js:871
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:872
+msgid "last month"
+msgstr "ਪਿਛਲੇ ਮਹੀਨੇ"
+
+#: js/js.js:873
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:874
+msgid "months ago"
+msgstr "ਮਹੀਨੇ ਪਹਿਲਾਂ"
+
+#: js/js.js:875
+msgid "last year"
+msgstr "ਪਿਛਲੇ ਸਾਲ"
+
+#: js/js.js:876
+msgid "years ago"
+msgstr "ਸਾਲਾਂ ਪਹਿਲਾਂ"
+
+#: js/oc-dialogs.js:123
+msgid "Choose"
+msgstr "ਚà©à¨£à©‹"
+
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:172
+msgid "Yes"
+msgstr "ਹਾਂ"
+
+#: js/oc-dialogs.js:182
+msgid "No"
+msgstr "ਨਹੀਂ"
+
+#: js/oc-dialogs.js:199
+msgid "Ok"
+msgstr "ਠੀਕ ਹੈ"
+
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:347
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:367
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:376
+msgid "Cancel"
+msgstr "ਰੱਦ ਕਰੋ"
+
+#: js/oc-dialogs.js:386
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:457
+msgid "Error loading file exists template"
+msgstr ""
+
+#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
+#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
+msgid "The object type is not specified."
+msgstr ""
+
+#: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
+#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
+#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
+#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
+#: js/share.js:645 js/share.js:657
+msgid "Error"
+msgstr "ਗਲ"
+
+#: js/oc-vcategories.js:179
+msgid "The app name is not specified."
+msgstr ""
+
+#: js/oc-vcategories.js:194
+msgid "The required file {file} is not installed!"
+msgstr ""
+
+#: js/share.js:30 js/share.js:45 js/share.js:87
+msgid "Shared"
+msgstr ""
+
+#: js/share.js:90
+msgid "Share"
+msgstr "ਸਾਂà¨à¨¾ ਕਰੋ"
+
+#: js/share.js:131 js/share.js:685
+msgid "Error while sharing"
+msgstr ""
+
+#: js/share.js:142
+msgid "Error while unsharing"
+msgstr ""
+
+#: js/share.js:149
+msgid "Error while changing permissions"
+msgstr ""
+
+#: js/share.js:158
+msgid "Shared with you and the group {group} by {owner}"
+msgstr ""
+
+#: js/share.js:160
+msgid "Shared with you by {owner}"
+msgstr ""
+
+#: js/share.js:183
+msgid "Share with"
+msgstr ""
+
+#: js/share.js:188
+msgid "Share with link"
+msgstr ""
+
+#: js/share.js:191
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:193 templates/installation.php:57 templates/login.php:26
+msgid "Password"
+msgstr "ਪਾਸਵਰ"
+
+#: js/share.js:198
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:202
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:203
+msgid "Send"
+msgstr "à¨à©‡à¨œà©‹"
+
+#: js/share.js:208
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:209
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:242
+msgid "Share via email:"
+msgstr ""
+
+#: js/share.js:245
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:283
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:319
+msgid "Shared in {item} with {user}"
+msgstr ""
+
+#: js/share.js:340
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:352
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:354
+msgid "access control"
+msgstr ""
+
+#: js/share.js:357
+msgid "create"
+msgstr ""
+
+#: js/share.js:360
+msgid "update"
+msgstr ""
+
+#: js/share.js:363
+msgid "delete"
+msgstr ""
+
+#: js/share.js:366
+msgid "share"
+msgstr ""
+
+#: js/share.js:400 js/share.js:632
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:645
+msgid "Error unsetting expiration date"
+msgstr ""
+
+#: js/share.js:657
+msgid "Error setting expiration date"
+msgstr ""
+
+#: js/share.js:672
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:683
+msgid "Email sent"
+msgstr ""
+
+#: js/update.js:17
+msgid ""
+"The update was unsuccessful. Please report this issue to the <a "
+"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
+"community</a>."
+msgstr ""
+
+#: js/update.js:21
+msgid "The update was successful. Redirecting you to ownCloud now."
+msgstr ""
+
+#: lostpassword/controller.php:62
+#, php-format
+msgid "%s password reset"
+msgstr ""
+
+#: lostpassword/templates/email.php:2
+msgid "Use the following link to reset your password: {link}"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:4
+msgid ""
+"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 ."
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:12
+msgid "Request failed!<br>Did you make sure your email/username was right?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:15
+msgid "You will receive a link to reset your password via Email."
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
+#: templates/login.php:19
+msgid "Username"
+msgstr "ਯੂਜ਼ਰ-ਨਾਂ"
+
+#: lostpassword/templates/lostpassword.php:22
+msgid ""
+"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?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:27
+msgid "Request reset"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:4
+msgid "Your password was reset"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:5
+msgid "To login page"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:8
+msgid "New password"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:11
+msgid "Reset password"
+msgstr ""
+
+#: strings.php:5
+msgid "Personal"
+msgstr ""
+
+#: strings.php:6
+msgid "Users"
+msgstr ""
+
+#: strings.php:7 templates/layout.user.php:108
+msgid "Apps"
+msgstr ""
+
+#: strings.php:8
+msgid "Admin"
+msgstr ""
+
+#: strings.php:9
+msgid "Help"
+msgstr ""
+
+#: templates/403.php:12
+msgid "Access forbidden"
+msgstr ""
+
+#: templates/404.php:15
+msgid "Cloud not found"
+msgstr ""
+
+#: templates/altmail.php:2
+#, php-format
+msgid ""
+"Hey there,\n"
+"\n"
+"just letting you know that %s shared %s with you.\n"
+"View it: %s\n"
+"\n"
+"Cheers!"
+msgstr ""
+
+#: templates/edit_categories_dialog.php:4
+msgid "Edit categories"
+msgstr ""
+
+#: templates/edit_categories_dialog.php:16
+msgid "Add"
+msgstr ""
+
+#: templates/installation.php:24 templates/installation.php:31
+#: templates/installation.php:38
+msgid "Security Warning"
+msgstr "ਸà©à¨°à©±à¨–ਿਆ ਚੇਤਾਵਨੀ"
+
+#: templates/installation.php:25
+msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
+msgstr ""
+
+#: templates/installation.php:26
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
+msgstr ""
+
+#: templates/installation.php:32
+msgid ""
+"No secure random number generator is available, please enable the PHP "
+"OpenSSL extension."
+msgstr ""
+
+#: templates/installation.php:33
+msgid ""
+"Without a secure random number generator an attacker may be able to predict "
+"password reset tokens and take over your account."
+msgstr ""
+
+#: templates/installation.php:39
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
+#: templates/installation.php:41
+#, php-format
+msgid ""
+"For information how to properly configure your server, please see the <a "
+"href=\"%s\" target=\"_blank\">documentation</a>."
+msgstr ""
+
+#: templates/installation.php:47
+msgid "Create an <strong>admin account</strong>"
+msgstr ""
+
+#: templates/installation.php:65
+msgid "Advanced"
+msgstr ""
+
+#: templates/installation.php:67
+msgid "Data folder"
+msgstr ""
+
+#: templates/installation.php:77
+msgid "Configure the database"
+msgstr ""
+
+#: templates/installation.php:82 templates/installation.php:94
+#: templates/installation.php:105 templates/installation.php:116
+#: templates/installation.php:128
+msgid "will be used"
+msgstr ""
+
+#: templates/installation.php:140
+msgid "Database user"
+msgstr ""
+
+#: templates/installation.php:147
+msgid "Database password"
+msgstr ""
+
+#: templates/installation.php:152
+msgid "Database name"
+msgstr ""
+
+#: templates/installation.php:160
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:167
+msgid "Database host"
+msgstr ""
+
+#: templates/installation.php:175
+msgid "Finish setup"
+msgstr ""
+
+#: templates/layout.user.php:41
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr ""
+
+#: templates/layout.user.php:69
+msgid "Log out"
+msgstr ""
+
+#: templates/login.php:9
+msgid "Automatic logon rejected!"
+msgstr ""
+
+#: templates/login.php:10
+msgid ""
+"If you did not change your password recently, your account may be "
+"compromised!"
+msgstr ""
+
+#: templates/login.php:12
+msgid "Please change your password to secure your account again."
+msgstr ""
+
+#: templates/login.php:32
+msgid "Lost your password?"
+msgstr ""
+
+#: templates/login.php:37
+msgid "remember"
+msgstr ""
+
+#: templates/login.php:39
+msgid "Log in"
+msgstr ""
+
+#: templates/login.php:45
+msgid "Alternative Logins"
+msgstr ""
+
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
+"href=\"%s\">View it!</a><br><br>Cheers!"
+msgstr ""
+
+#: templates/update.php:3
+#, php-format
+msgid "Updating ownCloud to version %s, this may take a while."
+msgstr ""
diff --git a/l10n/pa/files.po b/l10n/pa/files.po
new file mode 100644
index 0000000000000000000000000000000000000000..93b8cdfacd0b9bd95374d0a2892dd5947cc2e8e6
--- /dev/null
+++ b/l10n/pa/files.po
@@ -0,0 +1,343 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/owncloud/language/pa/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pa\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+msgstr ""
+
+#: ajax/move.php:27 ajax/move.php:30
+#, php-format
+msgid "Could not move %s"
+msgstr ""
+
+#: ajax/upload.php:16 ajax/upload.php:45
+msgid "Unable to set upload directory."
+msgstr ""
+
+#: ajax/upload.php:22
+msgid "Invalid Token"
+msgstr ""
+
+#: ajax/upload.php:59
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: ajax/upload.php:66
+msgid "There is no error, the file uploaded with success"
+msgstr ""
+
+#: ajax/upload.php:67
+msgid ""
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
+msgstr ""
+
+#: ajax/upload.php:69
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form"
+msgstr ""
+
+#: ajax/upload.php:70
+msgid "The uploaded file was only partially uploaded"
+msgstr ""
+
+#: ajax/upload.php:71
+msgid "No file was uploaded"
+msgstr ""
+
+#: ajax/upload.php:72
+msgid "Missing a temporary folder"
+msgstr ""
+
+#: ajax/upload.php:73
+msgid "Failed to write to disk"
+msgstr ""
+
+#: ajax/upload.php:91
+msgid "Not enough storage available"
+msgstr ""
+
+#: ajax/upload.php:120 ajax/upload.php:143
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:136
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
+
+#: ajax/upload.php:160
+msgid "Invalid directory."
+msgstr ""
+
+#: appinfo/app.php:12
+msgid "Files"
+msgstr "ਫਾਇਲਾਂ"
+
+#: js/file-upload.js:244
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/file-upload.js:255
+msgid "Not enough space available"
+msgstr ""
+
+#: js/file-upload.js:322
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/file-upload.js:356
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:446
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/file-upload.js:520
+msgid "URL cannot be empty."
+msgstr ""
+
+#: js/file-upload.js:525 lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545
+msgid "Error"
+msgstr "ਗਲਤੀ"
+
+#: js/fileactions.js:119
+msgid "Share"
+msgstr "ਸਾਂà¨à¨¾ ਕਰੋ"
+
+#: js/fileactions.js:131
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:197
+msgid "Rename"
+msgstr "ਨਾਂ ਬਦਲੋ"
+
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
+msgid "Pending"
+msgstr ""
+
+#: js/filelist.js:416 js/filelist.js:418
+msgid "{new_name} already exists"
+msgstr ""
+
+#: js/filelist.js:416 js/filelist.js:418
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:416
+msgid "suggest name"
+msgstr ""
+
+#: js/filelist.js:416 js/filelist.js:418
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:463
+msgid "replaced {new_name} with {old_name}"
+msgstr ""
+
+#: js/filelist.js:463
+msgid "undo"
+msgstr "ਵਾਪਸ"
+
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:541
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: js/filelist.js:731 js/filelist.js:769
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/files.js:25
+msgid "'.' is an invalid file name."
+msgstr ""
+
+#: js/files.js:29
+msgid "File name cannot be empty."
+msgstr ""
+
+#: js/files.js:37
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr ""
+
+#: js/files.js:51
+msgid "Your storage is full, files can not be updated or synced anymore!"
+msgstr ""
+
+#: js/files.js:55
+msgid "Your storage is almost full ({usedSpacePercent}%)"
+msgstr ""
+
+#: js/files.js:67
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:296
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
+
+#: js/files.js:507 js/files.js:545
+msgid "Error moving file"
+msgstr ""
+
+#: js/files.js:558 templates/index.php:61
+msgid "Name"
+msgstr ""
+
+#: js/files.js:559 templates/index.php:73
+msgid "Size"
+msgstr ""
+
+#: js/files.js:560 templates/index.php:75
+msgid "Modified"
+msgstr ""
+
+#: lib/app.php:73
+#, php-format
+msgid "%s could not be renamed"
+msgstr ""
+
+#: lib/helper.php:11 templates/index.php:17
+msgid "Upload"
+msgstr "ਅੱਪਲੋਡ"
+
+#: templates/admin.php:5
+msgid "File handling"
+msgstr ""
+
+#: templates/admin.php:7
+msgid "Maximum upload size"
+msgstr ""
+
+#: templates/admin.php:10
+msgid "max. possible: "
+msgstr ""
+
+#: templates/admin.php:15
+msgid "Needed for multi-file and folder downloads."
+msgstr ""
+
+#: templates/admin.php:17
+msgid "Enable ZIP-download"
+msgstr ""
+
+#: templates/admin.php:20
+msgid "0 is unlimited"
+msgstr ""
+
+#: templates/admin.php:22
+msgid "Maximum input size for ZIP files"
+msgstr ""
+
+#: templates/admin.php:26
+msgid "Save"
+msgstr ""
+
+#: templates/index.php:6
+msgid "New"
+msgstr ""
+
+#: templates/index.php:9
+msgid "Text file"
+msgstr ""
+
+#: templates/index.php:11
+msgid "Folder"
+msgstr ""
+
+#: templates/index.php:13
+msgid "From link"
+msgstr ""
+
+#: templates/index.php:33
+msgid "Deleted files"
+msgstr ""
+
+#: templates/index.php:39
+msgid "Cancel upload"
+msgstr "ਅੱਪਲੋਡ ਰੱਦ ਕਰੋ"
+
+#: templates/index.php:45
+msgid "You don’t have write permissions here."
+msgstr ""
+
+#: templates/index.php:50
+msgid "Nothing in here. Upload something!"
+msgstr ""
+
+#: templates/index.php:67
+msgid "Download"
+msgstr "ਡਾਊਨਲੋਡ"
+
+#: templates/index.php:80 templates/index.php:81
+msgid "Unshare"
+msgstr ""
+
+#: templates/index.php:86 templates/index.php:87
+msgid "Delete"
+msgstr "ਹਟਾਓ"
+
+#: templates/index.php:100
+msgid "Upload too large"
+msgstr ""
+
+#: templates/index.php:102
+msgid ""
+"The files you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: templates/index.php:107
+msgid "Files are being scanned, please wait."
+msgstr ""
+
+#: templates/index.php:110
+msgid "Current scanning"
+msgstr ""
+
+#: templates/upgrade.php:2
+msgid "Upgrading filesystem cache..."
+msgstr ""
diff --git a/l10n/pa/files_encryption.po b/l10n/pa/files_encryption.po
new file mode 100644
index 0000000000000000000000000000000000000000..c49ed353a6ce8d7db8702a325cff04d7107a786e
--- /dev/null
+++ b/l10n/pa/files_encryption.po
@@ -0,0 +1,176 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-09-18 11:46-0400\n"
+"PO-Revision-Date: 2013-09-17 13:14+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/owncloud/language/pa/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pa\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:51
+msgid "Private key password successfully updated."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:53
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr ""
+
+#: files/error.php:7
+msgid ""
+"Your private key is not valid! Likely your password was changed outside the "
+"ownCloud system (e.g. your corporate directory). You can update your private"
+" key password in your personal settings to recover access to your encrypted "
+"files."
+msgstr ""
+
+#: hooks/hooks.php:53
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:54
+msgid ""
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
+"together with the PHP extension is enabled and configured properly. For now,"
+" the encryption app has been disabled."
+msgstr ""
+
+#: hooks/hooks.php:255
+msgid "Following users are not set up for encryption:"
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "...ਸੰà¨à¨¾à¨²à¨¿à¨† ਜਾ ਰਿਹਾ ਹੈ"
+
+#: templates/invalid_private_key.php:5
+msgid ""
+"Your private key is not valid! Maybe the your password was changed from "
+"outside."
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "You can unlock your private key in your "
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "personal settings"
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings-admin.php:10
+msgid ""
+"Enable recovery key (allow to recover users files in case of password loss):"
+msgstr ""
+
+#: templates/settings-admin.php:14
+msgid "Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:21 templates/settings-personal.php:54
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:29 templates/settings-personal.php:62
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:34
+msgid "Change recovery key password:"
+msgstr ""
+
+#: templates/settings-admin.php:41
+msgid "Old Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:48
+msgid "New Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:53
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:11
+msgid "Your private key password no longer match your log-in password:"
+msgstr ""
+
+#: templates/settings-personal.php:14
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:16
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:24
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:30
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:35
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:45
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:47
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files in case of password loss"
+msgstr ""
+
+#: templates/settings-personal.php:63
+msgid "File recovery settings updated"
+msgstr ""
+
+#: templates/settings-personal.php:64
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/pa/files_external.po b/l10n/pa/files_external.po
new file mode 100644
index 0000000000000000000000000000000000000000..95660c84dbc55f3eaeb924712fe5e773eccc137e
--- /dev/null
+++ b/l10n/pa/files_external.po
@@ -0,0 +1,123 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-09-18 11:47-0400\n"
+"PO-Revision-Date: 2013-09-17 13:14+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/owncloud/language/pa/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pa\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
+msgid "Access granted"
+msgstr ""
+
+#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+msgid "Error configuring Dropbox storage"
+msgstr ""
+
+#: js/dropbox.js:65 js/google.js:86
+msgid "Grant access"
+msgstr ""
+
+#: js/dropbox.js:101
+msgid "Please provide a valid Dropbox app key and secret."
+msgstr ""
+
+#: js/google.js:42 js/google.js:121
+msgid "Error configuring Google Drive storage"
+msgstr ""
+
+#: lib/config.php:453
+msgid ""
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
+"is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:457
+msgid ""
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
+" of FTP shares is not possible. Please ask your system administrator to "
+"install it."
+msgstr ""
+
+#: lib/config.php:460
+msgid ""
+"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
+"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
+"your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:9 templates/settings.php:28
+msgid "Folder name"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "External storage"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:33
+msgid "Add storage"
+msgstr ""
+
+#: templates/settings.php:90
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:92
+msgid "Groups"
+msgstr "ਗਰà©à©±à¨ª"
+
+#: templates/settings.php:100
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:113 templates/settings.php:114
+#: templates/settings.php:149 templates/settings.php:150
+msgid "Delete"
+msgstr "ਹਟਾਓ"
+
+#: templates/settings.php:129
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:130
+msgid "Allow users to mount their own external storage"
+msgstr ""
+
+#: templates/settings.php:141
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:159
+msgid "Import Root Certificate"
+msgstr ""
diff --git a/l10n/pa/files_sharing.po b/l10n/pa/files_sharing.po
new file mode 100644
index 0000000000000000000000000000000000000000..5857f609be9fbad2aab683ec89f93c85b7a54709
--- /dev/null
+++ b/l10n/pa/files_sharing.po
@@ -0,0 +1,80 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-09-18 11:47-0400\n"
+"PO-Revision-Date: 2013-09-17 13:20+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/owncloud/language/pa/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pa\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: templates/authenticate.php:4
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:7
+msgid "Password"
+msgstr "ਪਾਸਵਰ"
+
+#: templates/authenticate.php:9
+msgid "Submit"
+msgstr ""
+
+#: templates/part.404.php:3
+msgid "Sorry, this link doesn’t seem to work anymore."
+msgstr ""
+
+#: templates/part.404.php:4
+msgid "Reasons might be:"
+msgstr ""
+
+#: templates/part.404.php:6
+msgid "the item was removed"
+msgstr ""
+
+#: templates/part.404.php:7
+msgid "the link expired"
+msgstr ""
+
+#: templates/part.404.php:8
+msgid "sharing is disabled"
+msgstr ""
+
+#: templates/part.404.php:10
+msgid "For more info, please ask the person who sent this link."
+msgstr ""
+
+#: templates/public.php:15
+#, php-format
+msgid "%s shared the folder %s with you"
+msgstr ""
+
+#: templates/public.php:18
+#, php-format
+msgid "%s shared the file %s with you"
+msgstr ""
+
+#: templates/public.php:26 templates/public.php:92
+msgid "Download"
+msgstr "ਡਾਊਨਲੋਡ"
+
+#: templates/public.php:43 templates/public.php:46
+msgid "Upload"
+msgstr "ਅੱਪਲੋਡ"
+
+#: templates/public.php:56
+msgid "Cancel upload"
+msgstr "ਅੱਪਲੋਡ ਰੱਦ ਕਰੋ"
+
+#: templates/public.php:89
+msgid "No preview available for"
+msgstr ""
diff --git a/l10n/pa/files_trashbin.po b/l10n/pa/files_trashbin.po
new file mode 100644
index 0000000000000000000000000000000000000000..b6c92523c505857a763d592b990c611c8abd87f8
--- /dev/null
+++ b/l10n/pa/files_trashbin.po
@@ -0,0 +1,84 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-09-18 11:47-0400\n"
+"PO-Revision-Date: 2013-09-17 13:14+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/owncloud/language/pa/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pa\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/delete.php:42
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:42
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/trash.js:7 js/trash.js:102
+msgid "perform restore operation"
+msgstr ""
+
+#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148
+msgid "Error"
+msgstr "ਗਲਤੀ"
+
+#: js/trash.js:37
+msgid "delete file permanently"
+msgstr ""
+
+#: js/trash.js:129
+msgid "Delete permanently"
+msgstr ""
+
+#: js/trash.js:190 templates/index.php:21
+msgid "Name"
+msgstr ""
+
+#: js/trash.js:191 templates/index.php:31
+msgid "Deleted"
+msgstr ""
+
+#: js/trash.js:199
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/trash.js:205
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lib/trash.php:814 lib/trash.php:816
+msgid "restored"
+msgstr ""
+
+#: templates/index.php:9
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr ""
+
+#: templates/index.php:24 templates/index.php:26
+msgid "Restore"
+msgstr ""
+
+#: templates/index.php:34 templates/index.php:35
+msgid "Delete"
+msgstr "ਹਟਾਓ"
+
+#: templates/part.breadcrumb.php:9
+msgid "Deleted Files"
+msgstr ""
diff --git a/l10n/pa/files_versions.po b/l10n/pa/files_versions.po
new file mode 100644
index 0000000000000000000000000000000000000000..92bc707a3d61b51360899564497434c4ab3777c5
--- /dev/null
+++ b/l10n/pa/files_versions.po
@@ -0,0 +1,43 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-09-18 11:47-0400\n"
+"PO-Revision-Date: 2013-09-16 20:50+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/owncloud/language/pa/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pa\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/rollbackVersion.php:13
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: js/versions.js:7
+msgid "Versions"
+msgstr ""
+
+#: js/versions.js:53
+msgid "Failed to revert {file} to revision {timestamp}."
+msgstr ""
+
+#: js/versions.js:79
+msgid "More versions..."
+msgstr ""
+
+#: js/versions.js:116
+msgid "No other versions available"
+msgstr ""
+
+#: js/versions.js:145
+msgid "Restore"
+msgstr ""
diff --git a/l10n/pa/lib.po b/l10n/pa/lib.po
new file mode 100644
index 0000000000000000000000000000000000000000..6747e51ba073af1ad36a8a6f14b86a8b3fae81fb
--- /dev/null
+++ b/l10n/pa/lib.po
@@ -0,0 +1,334 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-09-18 11:47-0400\n"
+"PO-Revision-Date: 2013-09-17 13:14+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/owncloud/language/pa/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pa\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: app.php:239
+#, php-format
+msgid ""
+"App \"%s\" can't be installed because it is not compatible with this version"
+" of ownCloud."
+msgstr ""
+
+#: app.php:250
+msgid "No app name specified"
+msgstr ""
+
+#: app.php:361
+msgid "Help"
+msgstr ""
+
+#: app.php:374
+msgid "Personal"
+msgstr ""
+
+#: app.php:385
+msgid "Settings"
+msgstr "ਸੈਟਿੰਗ"
+
+#: app.php:397
+msgid "Users"
+msgstr ""
+
+#: app.php:410
+msgid "Admin"
+msgstr ""
+
+#: app.php:839
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr ""
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr ""
+
+#: defaults.php:35
+msgid "web services under your control"
+msgstr ""
+
+#: files.php:66 files.php:98
+#, php-format
+msgid "cannot open \"%s\""
+msgstr ""
+
+#: files.php:226
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: files.php:227
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: files.php:228 files.php:256
+msgid "Back to Files"
+msgstr ""
+
+#: files.php:253
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: files.php:254
+msgid ""
+"Download the files in smaller chunks, seperately or kindly ask your "
+"administrator."
+msgstr ""
+
+#: installer.php:63
+msgid "No source specified when installing app"
+msgstr ""
+
+#: installer.php:70
+msgid "No href specified when installing app from http"
+msgstr ""
+
+#: installer.php:75
+msgid "No path specified when installing app from local file"
+msgstr ""
+
+#: installer.php:89
+#, php-format
+msgid "Archives of type %s are not supported"
+msgstr ""
+
+#: installer.php:103
+msgid "Failed to open archive when installing app"
+msgstr ""
+
+#: installer.php:125
+msgid "App does not provide an info.xml file"
+msgstr ""
+
+#: installer.php:131
+msgid "App can't be installed because of not allowed code in the App"
+msgstr ""
+
+#: installer.php:140
+msgid ""
+"App can't be installed because it is not compatible with this version of "
+"ownCloud"
+msgstr ""
+
+#: installer.php:146
+msgid ""
+"App can't be installed because it contains the <shipped>true</shipped> tag "
+"which is not allowed for non shipped apps"
+msgstr ""
+
+#: installer.php:152
+msgid ""
+"App can't be installed because the version in info.xml/version is not the "
+"same as the version reported from the app store"
+msgstr ""
+
+#: installer.php:162
+msgid "App directory already exists"
+msgstr ""
+
+#: installer.php:175
+#, php-format
+msgid "Can't create app folder. Please fix permissions. %s"
+msgstr ""
+
+#: json.php:28
+msgid "Application is not enabled"
+msgstr ""
+
+#: json.php:39 json.php:62 json.php:73
+msgid "Authentication error"
+msgstr ""
+
+#: json.php:51
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: search/provider/file.php:17 search/provider/file.php:35
+msgid "Files"
+msgstr "ਫਾਇਲਾਂ"
+
+#: search/provider/file.php:26 search/provider/file.php:33
+msgid "Text"
+msgstr ""
+
+#: search/provider/file.php:29
+msgid "Images"
+msgstr ""
+
+#: setup/abstractdatabase.php:22
+#, php-format
+msgid "%s enter the database username."
+msgstr ""
+
+#: setup/abstractdatabase.php:25
+#, php-format
+msgid "%s enter the database name."
+msgstr ""
+
+#: setup/abstractdatabase.php:28
+#, php-format
+msgid "%s you may not use dots in the database name"
+msgstr ""
+
+#: setup/mssql.php:20
+#, php-format
+msgid "MS SQL username and/or password not valid: %s"
+msgstr ""
+
+#: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114
+#: setup/postgresql.php:24 setup/postgresql.php:70
+msgid "You need to enter either an existing account or the administrator."
+msgstr ""
+
+#: setup/mysql.php:12
+msgid "MySQL username and/or password not valid"
+msgstr ""
+
+#: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147
+#: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181
+#: setup/oci.php:189 setup/oci.php:198 setup/oci.php:204
+#: setup/postgresql.php:89 setup/postgresql.php:98 setup/postgresql.php:115
+#: setup/postgresql.php:125 setup/postgresql.php:134
+#, php-format
+msgid "DB Error: \"%s\""
+msgstr ""
+
+#: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:148
+#: setup/oci.php:155 setup/oci.php:166 setup/oci.php:182 setup/oci.php:190
+#: setup/oci.php:199 setup/postgresql.php:90 setup/postgresql.php:99
+#: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135
+#, php-format
+msgid "Offending command was: \"%s\""
+msgstr ""
+
+#: setup/mysql.php:85
+#, php-format
+msgid "MySQL user '%s'@'localhost' exists already."
+msgstr ""
+
+#: setup/mysql.php:86
+msgid "Drop this user from MySQL"
+msgstr ""
+
+#: setup/mysql.php:91
+#, php-format
+msgid "MySQL user '%s'@'%%' already exists"
+msgstr ""
+
+#: setup/mysql.php:92
+msgid "Drop this user from MySQL."
+msgstr ""
+
+#: setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr ""
+
+#: setup/oci.php:41 setup/oci.php:113
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup/oci.php:173 setup/oci.php:205
+#, php-format
+msgid "Offending command was: \"%s\", name: %s, password: %s"
+msgstr ""
+
+#: setup/postgresql.php:23 setup/postgresql.php:69
+msgid "PostgreSQL username and/or password not valid"
+msgstr ""
+
+#: setup.php:28
+msgid "Set an admin username."
+msgstr ""
+
+#: setup.php:31
+msgid "Set an admin password."
+msgstr ""
+
+#: setup.php:184
+msgid ""
+"Your web server is not yet properly setup to allow files synchronization "
+"because the WebDAV interface seems to be broken."
+msgstr ""
+
+#: setup.php:185
+#, php-format
+msgid "Please double check the <a href='%s'>installation guides</a>."
+msgstr ""
+
+#: template/functions.php:96
+msgid "seconds ago"
+msgstr "ਸਕਿੰਟ ਪਹਿਲਾਂ"
+
+#: template/functions.php:97
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: template/functions.php:98
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: template/functions.php:99
+msgid "today"
+msgstr "ਅੱਜ"
+
+#: template/functions.php:100
+msgid "yesterday"
+msgstr "ਕੱਲà©à¨¹"
+
+#: template/functions.php:101
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: template/functions.php:102
+msgid "last month"
+msgstr "ਪਿਛਲੇ ਮਹੀਨੇ"
+
+#: template/functions.php:103
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: template/functions.php:104
+msgid "last year"
+msgstr "ਪਿਛਲੇ ਸਾਲ"
+
+#: template/functions.php:105
+msgid "years ago"
+msgstr "ਸਾਲਾਂ ਪਹਿਲਾਂ"
+
+#: template.php:297
+msgid "Caused by:"
+msgstr ""
+
+#: vcategories.php:188 vcategories.php:249
+#, php-format
+msgid "Could not find category \"%s\""
+msgstr ""
diff --git a/l10n/pa/settings.po b/l10n/pa/settings.po
new file mode 100644
index 0000000000000000000000000000000000000000..8095ea1076f6a5b984af8411cfc3d2f0fc8411e1
--- /dev/null
+++ b/l10n/pa/settings.po
@@ -0,0 +1,602 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+# A S Alam <apreet.alam@gmail.com>, 2013
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-09-20 10:45-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/owncloud/language/pa/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pa\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/apps/ocs.php:20
+msgid "Unable to load list from App Store"
+msgstr ""
+
+#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/togglegroups.php:20 changepassword/controller.php:55
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/changedisplayname.php:31
+msgid "Your display name has been changed."
+msgstr ""
+
+#: ajax/changedisplayname.php:34
+msgid "Unable to change display name"
+msgstr ""
+
+#: ajax/creategroup.php:10
+msgid "Group already exists"
+msgstr ""
+
+#: ajax/creategroup.php:19
+msgid "Unable to add group"
+msgstr ""
+
+#: ajax/lostpassword.php:12
+msgid "Email saved"
+msgstr ""
+
+#: ajax/lostpassword.php:14
+msgid "Invalid email"
+msgstr ""
+
+#: ajax/removegroup.php:13
+msgid "Unable to delete group"
+msgstr ""
+
+#: ajax/removeuser.php:25
+msgid "Unable to delete user"
+msgstr ""
+
+#: ajax/setlanguage.php:15
+msgid "Language changed"
+msgstr "à¨à¨¾à¨¶à¨¾ ਬਦਲੀ"
+
+#: ajax/setlanguage.php:17 ajax/setlanguage.php:20
+msgid "Invalid request"
+msgstr ""
+
+#: ajax/togglegroups.php:12
+msgid "Admins can't remove themself from the admin group"
+msgstr ""
+
+#: ajax/togglegroups.php:30
+#, php-format
+msgid "Unable to add user to group %s"
+msgstr ""
+
+#: ajax/togglegroups.php:36
+#, php-format
+msgid "Unable to remove user from group %s"
+msgstr ""
+
+#: ajax/updateapp.php:14
+msgid "Couldn't update app."
+msgstr ""
+
+#: changepassword/controller.php:20
+msgid "Wrong password"
+msgstr ""
+
+#: changepassword/controller.php:42
+msgid "No user supplied"
+msgstr ""
+
+#: changepassword/controller.php:74
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr ""
+
+#: changepassword/controller.php:79
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr ""
+
+#: changepassword/controller.php:87
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr ""
+
+#: changepassword/controller.php:92 changepassword/controller.php:103
+msgid "Unable to change password"
+msgstr ""
+
+#: js/apps.js:43
+msgid "Update to {appversion}"
+msgstr ""
+
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
+msgid "Disable"
+msgstr "ਬੰਦ"
+
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
+msgid "Enable"
+msgstr "ਚਾਲੂ"
+
+#: js/apps.js:71
+msgid "Please wait...."
+msgstr "...ਉਡੀਕੋ ਜੀ"
+
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
+msgid "Error while disabling app"
+msgstr ""
+
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
+msgid "Error while enabling app"
+msgstr ""
+
+#: js/apps.js:123
+msgid "Updating...."
+msgstr "...ਅੱਪਡੇਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
+
+#: js/apps.js:126
+msgid "Error while updating app"
+msgstr ""
+
+#: js/apps.js:126
+msgid "Error"
+msgstr "ਗਲਤੀ"
+
+#: js/apps.js:127 templates/apps.php:43
+msgid "Update"
+msgstr ""
+
+#: js/apps.js:130
+msgid "Updated"
+msgstr "ਅੱਪਡੇਟ ਕੀਤਾ"
+
+#: js/personal.js:220
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:265
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:287
+msgid "Saving..."
+msgstr "...ਸੰà¨à¨¾à¨²à¨¿à¨† ਜਾ ਰਿਹਾ ਹੈ"
+
+#: js/users.js:47
+msgid "deleted"
+msgstr "ਹਟਾਈ"
+
+#: js/users.js:47
+msgid "undo"
+msgstr "ਵਾਪਸ"
+
+#: js/users.js:79
+msgid "Unable to remove user"
+msgstr ""
+
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
+msgid "Groups"
+msgstr "ਗਰà©à©±à¨ª"
+
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
+msgid "Group Admin"
+msgstr "ਗਰà©à©±à¨ª à¨à¨¡à¨®à¨¿à¨¨"
+
+#: js/users.js:120 templates/users.php:170
+msgid "Delete"
+msgstr "ਹਟਾਓ"
+
+#: js/users.js:277
+msgid "add group"
+msgstr "ਗਰà©à©±à¨ª ਸ਼ਾਮਲ"
+
+#: js/users.js:436
+msgid "A valid username must be provided"
+msgstr ""
+
+#: js/users.js:437 js/users.js:443 js/users.js:458
+msgid "Error creating user"
+msgstr ""
+
+#: js/users.js:442
+msgid "A valid password must be provided"
+msgstr ""
+
+#: personal.php:45 personal.php:46
+msgid "__language_name__"
+msgstr "__à¨à¨¾à¨¶à¨¾_ਨਾਂ__"
+
+#: templates/admin.php:15
+msgid "Security Warning"
+msgstr "ਸà©à¨°à©±à¨–ਿਆ ਚੇਤਾਵਨੀ"
+
+#: templates/admin.php:18
+msgid ""
+"Your data directory and your files are probably accessible from the "
+"internet. The .htaccess file is not working. We strongly suggest that you "
+"configure your webserver in a way that the data directory is no longer "
+"accessible or you move the data directory outside the webserver document "
+"root."
+msgstr ""
+
+#: templates/admin.php:29
+msgid "Setup Warning"
+msgstr "ਸੈਟਅੱਪ ਚੇਤਾਵਨੀ"
+
+#: templates/admin.php:32
+msgid ""
+"Your web server is not yet properly setup to allow files synchronization "
+"because the WebDAV interface seems to be broken."
+msgstr ""
+
+#: templates/admin.php:33
+#, php-format
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Module 'fileinfo' missing"
+msgstr ""
+
+#: templates/admin.php:47
+msgid ""
+"The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
+"module to get best results with mime-type detection."
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Locale not working"
+msgstr ""
+
+#: templates/admin.php:63
+#, php-format
+msgid ""
+"System locale can't be set to %s. This means that there might be problems "
+"with certain characters in file names. We strongly suggest to install the "
+"required packages on your system to support %s."
+msgstr ""
+
+#: templates/admin.php:75
+msgid "Internet connection not working"
+msgstr ""
+
+#: templates/admin.php:78
+msgid ""
+"This server has no working internet connection. This means that some of the "
+"features like mounting of external storage, notifications about updates or "
+"installation of 3rd party apps don´t work. Accessing files from remote and "
+"sending of notification emails might also not work. We suggest to enable "
+"internet connection for this server if you want to have all features."
+msgstr ""
+
+#: templates/admin.php:92
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:99
+msgid "Execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:107
+msgid ""
+"cron.php is registered at a webcron service to call cron.php once a minute "
+"over http."
+msgstr ""
+
+#: templates/admin.php:115
+msgid "Use systems cron service to call the cron.php file once a minute."
+msgstr ""
+
+#: templates/admin.php:120
+msgid "Sharing"
+msgstr ""
+
+#: templates/admin.php:126
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:127
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:134
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:135
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:143
+msgid "Allow public uploads"
+msgstr ""
+
+#: templates/admin.php:144
+msgid ""
+"Allow users to enable others to upload into their publicly shared folders"
+msgstr ""
+
+#: templates/admin.php:152
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:153
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:160
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:163
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:170
+msgid "Security"
+msgstr ""
+
+#: templates/admin.php:183
+msgid "Enforce HTTPS"
+msgstr ""
+
+#: templates/admin.php:185
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
+msgstr ""
+
+#: templates/admin.php:191
+#, php-format
+msgid ""
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
+msgstr ""
+
+#: templates/admin.php:203
+msgid "Log"
+msgstr ""
+
+#: templates/admin.php:204
+msgid "Log level"
+msgstr ""
+
+#: templates/admin.php:235
+msgid "More"
+msgstr ""
+
+#: templates/admin.php:236
+msgid "Less"
+msgstr ""
+
+#: templates/admin.php:242 templates/personal.php:161
+msgid "Version"
+msgstr ""
+
+#: templates/admin.php:246 templates/personal.php:164
+msgid ""
+"Developed by the <a href=\"http://ownCloud.org/contact\" "
+"target=\"_blank\">ownCloud community</a>, the <a "
+"href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is "
+"licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" "
+"target=\"_blank\"><abbr title=\"Affero General Public "
+"License\">AGPL</abbr></a>."
+msgstr ""
+
+#: templates/apps.php:13
+msgid "Add your App"
+msgstr ""
+
+#: templates/apps.php:28
+msgid "More Apps"
+msgstr ""
+
+#: templates/apps.php:33
+msgid "Select an App"
+msgstr ""
+
+#: templates/apps.php:39
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:41
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+msgstr ""
+
+#: templates/help.php:4
+msgid "User Documentation"
+msgstr ""
+
+#: templates/help.php:6
+msgid "Administrator Documentation"
+msgstr ""
+
+#: templates/help.php:9
+msgid "Online Documentation"
+msgstr ""
+
+#: templates/help.php:11
+msgid "Forum"
+msgstr ""
+
+#: templates/help.php:14
+msgid "Bugtracker"
+msgstr ""
+
+#: templates/help.php:17
+msgid "Commercial Support"
+msgstr ""
+
+#: templates/personal.php:8
+msgid "Get the apps to sync your files"
+msgstr ""
+
+#: templates/personal.php:19
+msgid "Show First Run Wizard again"
+msgstr ""
+
+#: templates/personal.php:27
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr ""
+
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+msgid "Password"
+msgstr "ਪਾਸਵਰ"
+
+#: templates/personal.php:40
+msgid "Your password was changed"
+msgstr ""
+
+#: templates/personal.php:41
+msgid "Unable to change your password"
+msgstr ""
+
+#: templates/personal.php:42
+msgid "Current password"
+msgstr ""
+
+#: templates/personal.php:44
+msgid "New password"
+msgstr ""
+
+#: templates/personal.php:46
+msgid "Change password"
+msgstr "ਪਾਸਵਰਡ ਬਦਲੋ"
+
+#: templates/personal.php:58 templates/users.php:88
+msgid "Display Name"
+msgstr ""
+
+#: templates/personal.php:73
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:75
+msgid "Your email address"
+msgstr ""
+
+#: templates/personal.php:76
+msgid "Fill in an email address to enable password recovery"
+msgstr ""
+
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Abort"
+msgstr ""
+
+#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:106 templates/personal.php:107
+msgid "Language"
+msgstr ""
+
+#: templates/personal.php:119
+msgid "Help translate"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "WebDAV"
+msgstr ""
+
+#: templates/personal.php:127
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
+"target=\"_blank\">access your Files via WebDAV</a>"
+msgstr ""
+
+#: templates/personal.php:138
+msgid "Encryption"
+msgstr ""
+
+#: templates/personal.php:140
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:146
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:151
+msgid "Decrypt all Files"
+msgstr ""
+
+#: templates/users.php:21
+msgid "Login Name"
+msgstr ""
+
+#: templates/users.php:30
+msgid "Create"
+msgstr ""
+
+#: templates/users.php:36
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:37 templates/users.php:38
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr ""
+
+#: templates/users.php:42
+msgid "Default Storage"
+msgstr ""
+
+#: templates/users.php:48 templates/users.php:148
+msgid "Unlimited"
+msgstr ""
+
+#: templates/users.php:66 templates/users.php:163
+msgid "Other"
+msgstr ""
+
+#: templates/users.php:87
+msgid "Username"
+msgstr "ਯੂਜ਼ਰ-ਨਾਂ"
+
+#: templates/users.php:94
+msgid "Storage"
+msgstr ""
+
+#: templates/users.php:108
+msgid "change display name"
+msgstr ""
+
+#: templates/users.php:112
+msgid "set new password"
+msgstr ""
+
+#: templates/users.php:143
+msgid "Default"
+msgstr ""
diff --git a/l10n/pa/user_ldap.po b/l10n/pa/user_ldap.po
new file mode 100644
index 0000000000000000000000000000000000000000..0c8fff503980b2065876743db909456d7de3868f
--- /dev/null
+++ b/l10n/pa/user_ldap.po
@@ -0,0 +1,406 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-09-18 11:47-0400\n"
+"PO-Revision-Date: 2013-09-17 13:14+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/owncloud/language/pa/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pa\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
+#: ajax/deleteConfiguration.php:34
+msgid "Failed to delete the server configuration"
+msgstr ""
+
+#: ajax/testConfiguration.php:36
+msgid "The configuration is valid and the connection could be established!"
+msgstr ""
+
+#: ajax/testConfiguration.php:39
+msgid ""
+"The configuration is valid, but the Bind failed. Please check the server "
+"settings and credentials."
+msgstr ""
+
+#: ajax/testConfiguration.php:43
+msgid ""
+"The configuration is invalid. Please look in the ownCloud log for further "
+"details."
+msgstr ""
+
+#: js/settings.js:66
+msgid "Deletion failed"
+msgstr ""
+
+#: js/settings.js:82
+msgid "Take over settings from recent server configuration?"
+msgstr ""
+
+#: js/settings.js:83
+msgid "Keep settings?"
+msgstr ""
+
+#: js/settings.js:97
+msgid "Cannot add server configuration"
+msgstr ""
+
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "ਗਲਤੀ"
+
+#: js/settings.js:141
+msgid "Connection test succeeded"
+msgstr ""
+
+#: js/settings.js:146
+msgid "Connection test failed"
+msgstr ""
+
+#: js/settings.js:156
+msgid "Do you really want to delete the current Server Configuration?"
+msgstr ""
+
+#: js/settings.js:157
+msgid "Confirm Deletion"
+msgstr ""
+
+#: templates/settings.php:9
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behavior. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:12
+msgid ""
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:16
+msgid "Server configuration"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "Add Server Configuration"
+msgstr ""
+
+#: templates/settings.php:37
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:40
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:41
+msgid "One Base DN per line"
+msgstr ""
+
+#: templates/settings.php:42
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:44
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:46
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:47
+msgid "Password"
+msgstr "ਪਾਸਵਰ"
+
+#: templates/settings.php:50
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:51
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:54
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action. Example: \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:55
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
+msgstr ""
+
+#: templates/settings.php:59
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
+msgstr ""
+
+#: templates/settings.php:66
+msgid "Connection Settings"
+msgstr ""
+
+#: templates/settings.php:68
+msgid "Configuration Active"
+msgstr ""
+
+#: templates/settings.php:68
+msgid "When unchecked, this configuration will be skipped."
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:70
+msgid "Backup (Replica) Host"
+msgstr ""
+
+#: templates/settings.php:70
+msgid ""
+"Give an optional backup host. It must be a replica of the main LDAP/AD "
+"server."
+msgstr ""
+
+#: templates/settings.php:71
+msgid "Backup (Replica) Port"
+msgstr ""
+
+#: templates/settings.php:72
+msgid "Disable Main Server"
+msgstr ""
+
+#: templates/settings.php:72
+msgid "Only connect to the replica server."
+msgstr ""
+
+#: templates/settings.php:73
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:73
+msgid "Do not use it additionally for LDAPS connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:74
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:75
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:75
+#, php-format
+msgid ""
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
+msgstr ""
+
+#: templates/settings.php:76
+msgid "Cache Time-To-Live"
+msgstr ""
+
+#: templates/settings.php:76
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:78
+msgid "Directory Settings"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "The LDAP attribute to use to generate the user's display name."
+msgstr ""
+
+#: templates/settings.php:81
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:81
+msgid "One User Base DN per line"
+msgstr ""
+
+#: templates/settings.php:82
+msgid "User Search Attributes"
+msgstr ""
+
+#: templates/settings.php:82 templates/settings.php:85
+msgid "Optional; one attribute per line"
+msgstr ""
+
+#: templates/settings.php:83
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:83
+msgid "The LDAP attribute to use to generate the groups's display name."
+msgstr ""
+
+#: templates/settings.php:84
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:84
+msgid "One Group Base DN per line"
+msgstr ""
+
+#: templates/settings.php:85
+msgid "Group Search Attributes"
+msgstr ""
+
+#: templates/settings.php:86
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "Special Attributes"
+msgstr ""
+
+#: templates/settings.php:90
+msgid "Quota Field"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "Quota Default"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:92
+msgid "Email Field"
+msgstr ""
+
+#: templates/settings.php:93
+msgid "User Home Folder Naming Rule"
+msgstr ""
+
+#: templates/settings.php:93
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:98
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:99
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder. It is also"
+" a part of remote URLs, for instance for all *DAV services. With this "
+"setting, the default behavior can be overridden. To achieve a similar "
+"behavior as before ownCloud 5 enter the user display name attribute in the "
+"following field. Leave it empty for default behavior. Changes will have "
+"effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:100
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:101
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default, the UUID attribute is automatically detected. The UUID attribute"
+" is used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behavior. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"Usernames are used to store and assign (meta) data. In order to precisely "
+"identify and recognize users, each LDAP user will have a internal username. "
+"This requires a mapping from username to LDAP user. The created username is "
+"mapped to the UUID of the LDAP user. Additionally the DN is cached as well "
+"to reduce LDAP interaction, but it is not used for identification. If the DN"
+" changes, the changes will be found. The internal username is used all over."
+" Clearing the mappings will have leftovers everywhere. Clearing the mappings"
+" is not configuration sensitive, it affects all LDAP configurations! Never "
+"clear the mappings in a production environment, only in a testing or "
+"experimental stage."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:106
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Test Configuration"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Help"
+msgstr ""
diff --git a/l10n/pa/user_webdavauth.po b/l10n/pa/user_webdavauth.po
new file mode 100644
index 0000000000000000000000000000000000000000..ffc527fb288fd052bb3e12120dc840c743f30a30
--- /dev/null
+++ b/l10n/pa/user_webdavauth.po
@@ -0,0 +1,33 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-09-18 11:47-0400\n"
+"PO-Revision-Date: 2013-09-16 20:50+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/owncloud/language/pa/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pa\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Address: "
+msgstr ""
+
+#: templates/settings.php:7
+msgid ""
+"The user credentials will be sent to this address. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
+msgstr ""
diff --git a/l10n/pl/core.po b/l10n/pl/core.po
index 7e3a4dd2baa6872116af964d496b5126a5399b28..3d7aae83baeb37eaa90d13be4f9588b73e918af4 100644
--- a/l10n/pl/core.po
+++ b/l10n/pl/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:33+0000\n"
+"POT-Creation-Date: 2013-09-22 12:55-0400\n"
+"PO-Revision-Date: 2013-09-20 15:01+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
@@ -192,59 +192,59 @@ msgstr "Grudzień"
msgid "Settings"
msgstr "Ustawienia"
-#: js/js.js:853
+#: js/js.js:866
msgid "seconds ago"
msgstr "sekund temu"
-#: js/js.js:854
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n minute temu"
msgstr[1] "%n minut temu"
msgstr[2] "%n minut temu"
-#: js/js.js:855
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n godzine temu"
msgstr[1] "%n godzin temu"
msgstr[2] "%n godzin temu"
-#: js/js.js:856
+#: js/js.js:869
msgid "today"
msgstr "dziÅ›"
-#: js/js.js:857
+#: js/js.js:870
msgid "yesterday"
msgstr "wczoraj"
-#: js/js.js:858
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n dzień temu"
msgstr[1] "%n dni temu"
msgstr[2] "%n dni temu"
-#: js/js.js:859
+#: js/js.js:872
msgid "last month"
msgstr "w zeszłym miesiącu"
-#: js/js.js:860
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n miesiÄ…c temu"
msgstr[1] "%n miesięcy temu"
msgstr[2] "%n miesięcy temu"
-#: js/js.js:861
+#: js/js.js:874
msgid "months ago"
msgstr "miesięcy temu"
-#: js/js.js:862
+#: js/js.js:875
msgid "last year"
msgstr "w zeszłym roku"
-#: js/js.js:863
+#: js/js.js:876
msgid "years ago"
msgstr "lat temu"
@@ -272,6 +272,47 @@ msgstr "OK"
msgid "Error loading message template: {error}"
msgstr ""
+#: js/oc-dialogs.js:347
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:367
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:376
+msgid "Cancel"
+msgstr "Anuluj"
+
+#: js/oc-dialogs.js:386
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:457
+msgid "Error loading file exists template"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/pl/files.po b/l10n/pl/files.po
index 780faa39bcc43c2b3d6d98518cd38bfdae1b2518..b94335006bb021b959ebebc674d546b2916c7236 100644
--- a/l10n/pl/files.po
+++ b/l10n/pl/files.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:00+0000\n"
-"Last-Translator: Cyryl Sochacki <cyrylsochacki@gmail.com>\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -77,11 +77,15 @@ msgstr "BÅ‚Ä…d zapisu na dysk"
msgid "Not enough storage available"
msgstr "Za mało dostępnego miejsca"
-#: ajax/upload.php:109
-msgid "Upload failed"
-msgstr "Wysyłanie nie powiodło się"
+#: ajax/upload.php:120 ajax/upload.php:143
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:136
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
-#: ajax/upload.php:127
+#: ajax/upload.php:160
msgid "Invalid directory."
msgstr "Zła ścieżka."
@@ -89,147 +93,151 @@ msgstr "Zła ścieżka."
msgid "Files"
msgstr "Pliki"
-#: js/file-upload.js:11
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Nie można wczytać pliku, ponieważ jest on katalogiem lub ma 0 bajtów"
+#: js/file-upload.js:244
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
+msgstr ""
-#: js/file-upload.js:24
+#: js/file-upload.js:255
msgid "Not enough space available"
msgstr "Za mało miejsca"
-#: js/file-upload.js:64
+#: js/file-upload.js:322
msgid "Upload cancelled."
msgstr "Wczytywanie anulowane."
-#: js/file-upload.js:165
+#: js/file-upload.js:356
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:446
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Wysyłanie pliku jest w toku. Jeśli opuścisz tę stronę, wysyłanie zostanie przerwane."
-#: js/file-upload.js:239
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr "URL nie może być pusty."
-#: js/file-upload.js:244 lib/app.php:53
+#: js/file-upload.js:525 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr "Nieprawidłowa nazwa folderu. Wykorzystanie 'Shared' jest zarezerwowane przez ownCloud"
-#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550
+#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545
msgid "Error"
msgstr "BÅ‚Ä…d"
-#: js/fileactions.js:116
+#: js/fileactions.js:119
msgid "Share"
msgstr "Udostępnij"
-#: js/fileactions.js:126
+#: js/fileactions.js:131
msgid "Delete permanently"
msgstr "Trwale usuń"
-#: js/fileactions.js:192
+#: js/fileactions.js:197
msgid "Rename"
msgstr "Zmień nazwę"
-#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "OczekujÄ…ce"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{new_name} już istnieje"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "zastÄ…p"
-#: js/filelist.js:307
+#: js/filelist.js:416
msgid "suggest name"
msgstr "zasugeruj nazwÄ™"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "anuluj"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr "zastÄ…piono {new_name} przez {old_name}"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "undo"
msgstr "cofnij"
-#: js/filelist.js:424 js/filelist.js:490 js/files.js:581
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "%n katalog"
msgstr[1] "%n katalogi"
msgstr[2] "%n katalogów"
-#: js/filelist.js:425 js/filelist.js:491 js/files.js:587
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "%n plik"
msgstr[1] "%n pliki"
msgstr[2] "%n plików"
-#: js/filelist.js:432
+#: js/filelist.js:541
msgid "{dirs} and {files}"
msgstr "{katalogi} and {pliki}"
-#: js/filelist.js:563
+#: js/filelist.js:731 js/filelist.js:769
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "Wysyłanie %n pliku"
msgstr[1] "Wysyłanie %n plików"
msgstr[2] "Wysyłanie %n plików"
-#: js/filelist.js:628
-msgid "files uploading"
-msgstr "pliki wczytane"
-
-#: js/files.js:52
+#: js/files.js:25
msgid "'.' is an invalid file name."
msgstr "„.†jest nieprawidłową nazwą pliku."
-#: js/files.js:56
+#: js/files.js:29
msgid "File name cannot be empty."
msgstr "Nazwa pliku nie może być pusta."
-#: js/files.js:64
+#: js/files.js:37
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Nieprawidłowa nazwa. Znaki '\\', '/', '<', '>', ':', '\"', '|', '?' oraz '*' są niedozwolone."
-#: js/files.js:78
+#: js/files.js:51
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr "Magazyn jest pełny. Pliki nie mogą zostać zaktualizowane lub zsynchronizowane!"
-#: js/files.js:82
+#: js/files.js:55
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Twój magazyn jest prawie pełny ({usedSpacePercent}%)"
-#: js/files.js:94
+#: js/files.js:67
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
msgstr "Szyfrowanie zostało wyłączone, ale nadal pliki są zaszyfrowane. Przejdź do ustawień osobistych i tam odszyfruj pliki."
-#: js/files.js:245
+#: js/files.js:296
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "Pobieranie jest przygotowywane. Może to zająć trochę czasu jeśli pliki są duże."
-#: js/files.js:563 templates/index.php:69
+#: js/files.js:507 js/files.js:545
+msgid "Error moving file"
+msgstr ""
+
+#: js/files.js:558 templates/index.php:61
msgid "Name"
msgstr "Nazwa"
-#: js/files.js:564 templates/index.php:81
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "Rozmiar"
-#: js/files.js:565 templates/index.php:83
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr "Modyfikacja"
@@ -238,7 +246,7 @@ msgstr "Modyfikacja"
msgid "%s could not be renamed"
msgstr "%s nie można zmienić nazwy"
-#: lib/helper.php:11 templates/index.php:18
+#: lib/helper.php:11 templates/index.php:17
msgid "Upload"
msgstr "Wyślij"
@@ -274,65 +282,65 @@ msgstr "Maksymalna wielkość pliku wejściowego ZIP "
msgid "Save"
msgstr "Zapisz"
-#: templates/index.php:7
+#: templates/index.php:6
msgid "New"
msgstr "Nowy"
-#: templates/index.php:10
+#: templates/index.php:9
msgid "Text file"
msgstr "Plik tekstowy"
-#: templates/index.php:12
+#: templates/index.php:11
msgid "Folder"
msgstr "Folder"
-#: templates/index.php:14
+#: templates/index.php:13
msgid "From link"
msgstr "Z odnośnika"
-#: templates/index.php:41
+#: templates/index.php:33
msgid "Deleted files"
msgstr "Pliki usunięte"
-#: templates/index.php:46
+#: templates/index.php:39
msgid "Cancel upload"
msgstr "Anuluj wysyłanie"
-#: templates/index.php:52
+#: templates/index.php:45
msgid "You don’t have write permissions here."
msgstr "Nie masz uprawnień do zapisu w tym miejscu."
-#: templates/index.php:59
+#: templates/index.php:50
msgid "Nothing in here. Upload something!"
msgstr "Pusto. Wyślij coś!"
-#: templates/index.php:75
+#: templates/index.php:67
msgid "Download"
msgstr "Pobierz"
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr "Zatrzymaj współdzielenie"
-#: templates/index.php:94 templates/index.php:95
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "Usuń"
-#: templates/index.php:108
+#: templates/index.php:100
msgid "Upload too large"
msgstr "Åadowany plik jest za duży"
-#: templates/index.php:110
+#: templates/index.php:102
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Pliki, które próbujesz przesłać, przekraczają maksymalną dopuszczalną wielkość."
-#: templates/index.php:115
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr "Skanowanie plików, proszę czekać."
-#: templates/index.php:118
+#: templates/index.php:110
msgid "Current scanning"
msgstr "Aktualnie skanowane"
diff --git a/l10n/pl/settings.po b/l10n/pl/settings.po
index d0f1cfcc15d7cef7abc735fa36610f8f9c5e06db..5b5e435ef1cc589e02c57f455b25717a77e76aea 100644
--- a/l10n/pl/settings.po
+++ b/l10n/pl/settings.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:45-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
@@ -24,7 +24,7 @@ msgid "Unable to load list from App Store"
msgstr "Nie można wczytać listy aplikacji"
#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
-#: ajax/togglegroups.php:20
+#: ajax/togglegroups.php:20 changepassword/controller.php:55
msgid "Authentication error"
msgstr "BÅ‚Ä…d uwierzytelniania"
@@ -86,6 +86,35 @@ msgstr "Nie można usunąć użytkownika z grupy %s"
msgid "Couldn't update app."
msgstr "Nie można uaktualnić aplikacji."
+#: changepassword/controller.php:20
+msgid "Wrong password"
+msgstr ""
+
+#: changepassword/controller.php:42
+msgid "No user supplied"
+msgstr ""
+
+#: changepassword/controller.php:74
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr ""
+
+#: changepassword/controller.php:79
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr ""
+
+#: changepassword/controller.php:87
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr ""
+
+#: changepassword/controller.php:92 changepassword/controller.php:103
+msgid "Unable to change password"
+msgstr ""
+
#: js/apps.js:43
msgid "Update to {appversion}"
msgstr "Aktualizacja do {appversion}"
@@ -130,15 +159,15 @@ msgstr "Aktualizuj"
msgid "Updated"
msgstr "Zaktualizowano"
-#: js/personal.js:217
+#: js/personal.js:220
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:262
+#: js/personal.js:265
msgid "Decrypting files... Please wait, this can take some time."
msgstr "Odszyfrowuje pliki... Proszę czekać, to może zająć jakiś czas."
-#: js/personal.js:284
+#: js/personal.js:287
msgid "Saving..."
msgstr "Zapisywanie..."
@@ -462,7 +491,7 @@ msgstr "Podaj adres e-mail, aby uzyskać możliwość odzyskania hasła"
#: templates/personal.php:86
msgid "Profile picture"
-msgstr ""
+msgstr "Zdjęcie profilu"
#: templates/personal.php:90
msgid "Upload new"
@@ -482,7 +511,7 @@ msgstr ""
#: templates/personal.php:97
msgid "Abort"
-msgstr ""
+msgstr "Anuluj"
#: templates/personal.php:98
msgid "Choose as profile image"
diff --git a/l10n/pt_BR/core.po b/l10n/pt_BR/core.po
index f8c924a94752d4f90c14c59898b257f906f0ea68..281471b1b940247f0e632b06152751020920ac4b 100644
--- a/l10n/pt_BR/core.po
+++ b/l10n/pt_BR/core.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:33+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-22 12:55-0400\n"
+"PO-Revision-Date: 2013-09-20 16:40+0000\n"
+"Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -94,23 +94,23 @@ msgstr "Erro ao remover %s dos favoritos."
#: avatar/controller.php:62
msgid "No image or file provided"
-msgstr ""
+msgstr "Nenhuma imagem ou arquivo fornecido"
#: avatar/controller.php:81
msgid "Unknown filetype"
-msgstr ""
+msgstr "Tipo de arquivo desconhecido"
#: avatar/controller.php:85
msgid "Invalid image"
-msgstr ""
+msgstr "Imagem inválida"
#: avatar/controller.php:115 avatar/controller.php:142
msgid "No temporary profile picture available, try again"
-msgstr ""
+msgstr "Sem imagem no perfil temporário disponÃvel, tente novamente"
#: avatar/controller.php:135
msgid "No crop data provided"
-msgstr ""
+msgstr "Nenhum dado para coleta foi fornecido"
#: js/config.php:32
msgid "Sunday"
@@ -192,55 +192,55 @@ msgstr "dezembro"
msgid "Settings"
msgstr "Ajustes"
-#: js/js.js:853
+#: js/js.js:866
msgid "seconds ago"
msgstr "segundos atrás"
-#: js/js.js:854
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] " ha %n minuto"
msgstr[1] "ha %n minutos"
-#: js/js.js:855
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "ha %n hora"
msgstr[1] "ha %n horas"
-#: js/js.js:856
+#: js/js.js:869
msgid "today"
msgstr "hoje"
-#: js/js.js:857
+#: js/js.js:870
msgid "yesterday"
msgstr "ontem"
-#: js/js.js:858
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "ha %n dia"
msgstr[1] "ha %n dias"
-#: js/js.js:859
+#: js/js.js:872
msgid "last month"
msgstr "último mês"
-#: js/js.js:860
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "ha %n mês"
msgstr[1] "ha %n meses"
-#: js/js.js:861
+#: js/js.js:874
msgid "months ago"
msgstr "meses atrás"
-#: js/js.js:862
+#: js/js.js:875
msgid "last year"
msgstr "último ano"
-#: js/js.js:863
+#: js/js.js:876
msgid "years ago"
msgstr "anos atrás"
@@ -250,7 +250,7 @@ msgstr "Escolha"
#: js/oc-dialogs.js:146
msgid "Error loading file picker template: {error}"
-msgstr ""
+msgstr "Erro no seletor de carregamento modelo de arquivos: {error}"
#: js/oc-dialogs.js:172
msgid "Yes"
@@ -266,7 +266,47 @@ msgstr "Ok"
#: js/oc-dialogs.js:219
msgid "Error loading message template: {error}"
-msgstr ""
+msgstr "Erro no carregamento de modelo de mensagem: {error}"
+
+#: js/oc-dialogs.js:347
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] "{count} conflito de arquivo"
+msgstr[1] "{count} conflitos de arquivos"
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr "Conflito em um arquivo"
+
+#: js/oc-dialogs.js:367
+msgid "Which files do you want to keep?"
+msgstr "Qual arquivo você quer manter?"
+
+#: js/oc-dialogs.js:368
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr "Se você selecionar ambas as versões, o arquivo copiado terá um número adicionado ao seu nome."
+
+#: js/oc-dialogs.js:376
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: js/oc-dialogs.js:386
+msgid "Continue"
+msgstr "Continuar"
+
+#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+msgid "(all selected)"
+msgstr "(todos os selecionados)"
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "({count} selected)"
+msgstr "({count} selecionados)"
+
+#: js/oc-dialogs.js:457
+msgid "Error loading file exists template"
+msgstr "Erro ao carregar arquivo existe modelo"
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
diff --git a/l10n/pt_BR/files.po b/l10n/pt_BR/files.po
index b38bee5e90237933da95304db4296fb5f3558827..1b491703bdd63ab43659d3e1dff79abf93821b85 100644
--- a/l10n/pt_BR/files.po
+++ b/l10n/pt_BR/files.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:00+0000\n"
+"POT-Creation-Date: 2013-09-22 12:51-0400\n"
+"PO-Revision-Date: 2013-09-20 16:40+0000\n"
"Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
@@ -77,156 +77,164 @@ msgstr "Falha ao escrever no disco"
msgid "Not enough storage available"
msgstr "Espaço de armazenamento insuficiente"
-#: ajax/upload.php:109
-msgid "Upload failed"
-msgstr "Falha no envio"
+#: ajax/upload.php:120 ajax/upload.php:143
+msgid "Upload failed. Could not get file info."
+msgstr "Falha no envio. Não foi possÃvel obter informações do arquivo."
-#: ajax/upload.php:127
+#: ajax/upload.php:136
+msgid "Upload failed. Could not find uploaded file"
+msgstr "Falha no envio. Não foi possÃvel encontrar o arquivo enviado"
+
+#: ajax/upload.php:160
msgid "Invalid directory."
msgstr "Diretório inválido."
-#: appinfo/app.php:12
+#: appinfo/app.php:11
msgid "Files"
msgstr "Arquivos"
-#: js/file-upload.js:11
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "ImpossÃvel enviar seus arquivo por ele ser um diretório ou ter 0 bytes."
+#: js/file-upload.js:244
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
+msgstr "Incapaz de fazer o envio de {filename}, pois é um diretório ou tem 0 bytes"
-#: js/file-upload.js:24
+#: js/file-upload.js:255
msgid "Not enough space available"
msgstr "Espaço de armazenamento insuficiente"
-#: js/file-upload.js:64
+#: js/file-upload.js:322
msgid "Upload cancelled."
msgstr "Envio cancelado."
-#: js/file-upload.js:165
+#: js/file-upload.js:356
+msgid "Could not get result from server."
+msgstr "Não foi possÃvel obter o resultado do servidor."
+
+#: js/file-upload.js:446
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Upload em andamento. Sair da página agora resultará no cancelamento do envio."
-#: js/file-upload.js:239
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr "URL não pode ficar em branco"
-#: js/file-upload.js:244 lib/app.php:53
+#: js/file-upload.js:525 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr "Nome de pasta inválido. O uso do nome 'Compartilhado' é reservado ao ownCloud"
-#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550
+#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545
msgid "Error"
msgstr "Erro"
-#: js/fileactions.js:116
+#: js/fileactions.js:119
msgid "Share"
msgstr "Compartilhar"
-#: js/fileactions.js:126
+#: js/fileactions.js:131
msgid "Delete permanently"
msgstr "Excluir permanentemente"
-#: js/fileactions.js:192
+#: js/fileactions.js:197
msgid "Rename"
msgstr "Renomear"
-#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "Pendente"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{new_name} já existe"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "substituir"
-#: js/filelist.js:307
+#: js/filelist.js:416
msgid "suggest name"
msgstr "sugerir nome"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "cancelar"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr "SubstituÃdo {old_name} por {new_name} "
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "undo"
msgstr "desfazer"
-#: js/filelist.js:424 js/filelist.js:490 js/files.js:581
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "%n pasta"
msgstr[1] "%n pastas"
-#: js/filelist.js:425 js/filelist.js:491 js/files.js:587
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "%n arquivo"
msgstr[1] "%n arquivos"
-#: js/filelist.js:432
+#: js/filelist.js:541
msgid "{dirs} and {files}"
msgstr "{dirs} e {files}"
-#: js/filelist.js:563
+#: js/filelist.js:731 js/filelist.js:769
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "Enviando %n arquivo"
msgstr[1] "Enviando %n arquivos"
-#: js/filelist.js:628
-msgid "files uploading"
-msgstr "enviando arquivos"
-
-#: js/files.js:52
+#: js/files.js:25
msgid "'.' is an invalid file name."
msgstr "'.' é um nome de arquivo inválido."
-#: js/files.js:56
+#: js/files.js:29
msgid "File name cannot be empty."
msgstr "O nome do arquivo não pode estar vazio."
-#: js/files.js:64
+#: js/files.js:37
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Nome inválido, '\\', '/', '<', '>', ':', '\"', '|', '?' e '*' não são permitidos."
-#: js/files.js:78
+#: js/files.js:51
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr "Seu armazenamento está cheio, arquivos não podem mais ser atualizados ou sincronizados!"
-#: js/files.js:82
+#: js/files.js:55
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Seu armazenamento está quase cheio ({usedSpacePercent}%)"
-#: js/files.js:94
+#: js/files.js:67
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
msgstr "Encriptação foi desabilitada mas seus arquivos continuam encriptados. Por favor vá a suas configurações pessoais para descriptar seus arquivos."
-#: js/files.js:245
+#: js/files.js:296
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "Seu download está sendo preparado. Isto pode levar algum tempo se os arquivos forem grandes."
-#: js/files.js:563 templates/index.php:69
+#: js/files.js:507 js/files.js:545
+msgid "Error moving file"
+msgstr "Erro movendo o arquivo"
+
+#: js/files.js:558 templates/index.php:61
msgid "Name"
msgstr "Nome"
-#: js/files.js:564 templates/index.php:81
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "Tamanho"
-#: js/files.js:565 templates/index.php:83
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr "Modificado"
@@ -235,7 +243,7 @@ msgstr "Modificado"
msgid "%s could not be renamed"
msgstr "%s não pode ser renomeado"
-#: lib/helper.php:11 templates/index.php:18
+#: lib/helper.php:11 templates/index.php:17
msgid "Upload"
msgstr "Upload"
@@ -271,65 +279,65 @@ msgstr "Tamanho máximo para arquivo ZIP"
msgid "Save"
msgstr "Guardar"
-#: templates/index.php:7
+#: templates/index.php:6
msgid "New"
msgstr "Novo"
-#: templates/index.php:10
+#: templates/index.php:9
msgid "Text file"
msgstr "Arquivo texto"
-#: templates/index.php:12
+#: templates/index.php:11
msgid "Folder"
msgstr "Pasta"
-#: templates/index.php:14
+#: templates/index.php:13
msgid "From link"
msgstr "Do link"
-#: templates/index.php:41
+#: templates/index.php:33
msgid "Deleted files"
msgstr "Arquivos apagados"
-#: templates/index.php:46
+#: templates/index.php:39
msgid "Cancel upload"
msgstr "Cancelar upload"
-#: templates/index.php:52
+#: templates/index.php:45
msgid "You don’t have write permissions here."
msgstr "Você não possui permissão de escrita aqui."
-#: templates/index.php:59
+#: templates/index.php:50
msgid "Nothing in here. Upload something!"
msgstr "Nada aqui.Carrege alguma coisa!"
-#: templates/index.php:75
+#: templates/index.php:67
msgid "Download"
msgstr "Baixar"
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr "Descompartilhar"
-#: templates/index.php:94 templates/index.php:95
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "Excluir"
-#: templates/index.php:108
+#: templates/index.php:100
msgid "Upload too large"
msgstr "Upload muito grande"
-#: templates/index.php:110
+#: templates/index.php:102
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Os arquivos que você está tentando carregar excedeu o tamanho máximo para arquivos no servidor."
-#: templates/index.php:115
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr "Arquivos sendo escaneados, por favor aguarde."
-#: templates/index.php:118
+#: templates/index.php:110
msgid "Current scanning"
msgstr "Scanning atual"
diff --git a/l10n/pt_BR/lib.po b/l10n/pt_BR/lib.po
index 31eb50030d04a4e5f80ba478be415b5f3554783c..315979949498424652cdeffe3f1f7bf856922fcd 100644
--- a/l10n/pt_BR/lib.po
+++ b/l10n/pt_BR/lib.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-18 11:47-0400\n"
+"PO-Revision-Date: 2013-09-17 13:05+0000\n"
+"Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -56,15 +56,15 @@ msgstr "Falha na atualização de \"%s\"."
#: avatar.php:56
msgid "Custom profile pictures don't work with encryption yet"
-msgstr ""
+msgstr "Fotos de perfil personalizados ainda não funcionam com criptografia"
#: avatar.php:64
msgid "Unknown filetype"
-msgstr ""
+msgstr "Tipo de arquivo desconhecido"
#: avatar.php:69
msgid "Invalid image"
-msgstr ""
+msgstr "Imagem inválida"
#: defaults.php:35
msgid "web services under your control"
diff --git a/l10n/pt_BR/settings.po b/l10n/pt_BR/settings.po
index dac1766f084b7e6616f13292c4073b53d6df6b66..c8608696d6129c5450f2d0bd65dba1e64b8adc39 100644
--- a/l10n/pt_BR/settings.po
+++ b/l10n/pt_BR/settings.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:45-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
@@ -24,7 +24,7 @@ msgid "Unable to load list from App Store"
msgstr "Não foi possÃvel carregar lista da App Store"
#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
-#: ajax/togglegroups.php:20
+#: ajax/togglegroups.php:20 changepassword/controller.php:55
msgid "Authentication error"
msgstr "Erro de autenticação"
@@ -86,6 +86,35 @@ msgstr "Não foi possÃvel remover usuário do grupo %s"
msgid "Couldn't update app."
msgstr "Não foi possÃvel atualizar a app."
+#: changepassword/controller.php:20
+msgid "Wrong password"
+msgstr "Senha errada"
+
+#: changepassword/controller.php:42
+msgid "No user supplied"
+msgstr "Nenhum usuário fornecido"
+
+#: changepassword/controller.php:74
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr "Por favor, forneça uma senha de recuperação admin, caso contrário todos os dados do usuário serão perdidos"
+
+#: changepassword/controller.php:79
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr "Senha de recuperação do administrador errada. Por favor verifique a senha e tente novamente."
+
+#: changepassword/controller.php:87
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr "Back-end não suporta alteração de senha, mas a chave de criptografia de usuários foi atualizado com sucesso...."
+
+#: changepassword/controller.php:92 changepassword/controller.php:103
+msgid "Unable to change password"
+msgstr "ImpossÃvel modificar senha"
+
#: js/apps.js:43
msgid "Update to {appversion}"
msgstr "Atualizar para {appversion}"
@@ -130,15 +159,15 @@ msgstr "Atualizar"
msgid "Updated"
msgstr "Atualizado"
-#: js/personal.js:217
+#: js/personal.js:220
msgid "Select a profile picture"
-msgstr ""
+msgstr "Selecione uma imagem para o perfil"
-#: js/personal.js:262
+#: js/personal.js:265
msgid "Decrypting files... Please wait, this can take some time."
msgstr "Decriptando arquivos... Por favor aguarde, isso pode levar algum tempo."
-#: js/personal.js:284
+#: js/personal.js:287
msgid "Saving..."
msgstr "Salvando..."
@@ -462,31 +491,31 @@ msgstr "Preencha um endereço de e-mail para habilitar a recuperação de senha"
#: templates/personal.php:86
msgid "Profile picture"
-msgstr ""
+msgstr "Imagem para o perfil"
#: templates/personal.php:90
msgid "Upload new"
-msgstr ""
+msgstr "Enviar nova foto"
#: templates/personal.php:92
msgid "Select new from Files"
-msgstr ""
+msgstr "Selecinar uma nova dos Arquivos"
#: templates/personal.php:93
msgid "Remove image"
-msgstr ""
+msgstr "Remover imagem"
#: templates/personal.php:94
msgid "Either png or jpg. Ideally square but you will be able to crop it."
-msgstr ""
+msgstr "Ou png ou jpg. O ideal é quadrado, mas você vai ser capaz de cortá-la."
#: templates/personal.php:97
msgid "Abort"
-msgstr ""
+msgstr "Abortar"
#: templates/personal.php:98
msgid "Choose as profile image"
-msgstr ""
+msgstr "Escolha como imagem para o perfil"
#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
diff --git a/l10n/pt_PT/core.po b/l10n/pt_PT/core.po
index b355ad56e022a0f37bbc1b12f633bb7034909942..974950a164f9325612c3b96425ccfc6257119a6c 100644
--- a/l10n/pt_PT/core.po
+++ b/l10n/pt_PT/core.po
@@ -6,13 +6,14 @@
# Bruno Martins <bruno@bmartins.eu>, 2013
# bmgmatias <bmgmatias@gmail.com>, 2013
# Mouxy <daniel@mouxy.net>, 2013
+# Gontxi <goncalo.baiao@gmail.com>, 2013
# Helder Meneses <helder.meneses@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:33+0000\n"
+"POT-Creation-Date: 2013-09-22 12:55-0400\n"
+"PO-Revision-Date: 2013-09-20 15:01+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
@@ -96,19 +97,19 @@ msgstr "Erro a remover %s dos favoritos."
#: avatar/controller.php:62
msgid "No image or file provided"
-msgstr ""
+msgstr "Não foi selecionado nenhum ficheiro para importar"
#: avatar/controller.php:81
msgid "Unknown filetype"
-msgstr ""
+msgstr "Ficheiro desconhecido"
#: avatar/controller.php:85
msgid "Invalid image"
-msgstr ""
+msgstr "Imagem inválida"
#: avatar/controller.php:115 avatar/controller.php:142
msgid "No temporary profile picture available, try again"
-msgstr ""
+msgstr "Foto temporária de perfil indisponÃvel, tente novamente"
#: avatar/controller.php:135
msgid "No crop data provided"
@@ -194,55 +195,55 @@ msgstr "Dezembro"
msgid "Settings"
msgstr "Configurações"
-#: js/js.js:853
+#: js/js.js:866
msgid "seconds ago"
msgstr "Minutos atrás"
-#: js/js.js:854
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n minuto atrás"
msgstr[1] "%n minutos atrás"
-#: js/js.js:855
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n hora atrás"
msgstr[1] "%n horas atrás"
-#: js/js.js:856
+#: js/js.js:869
msgid "today"
msgstr "hoje"
-#: js/js.js:857
+#: js/js.js:870
msgid "yesterday"
msgstr "ontem"
-#: js/js.js:858
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n dia atrás"
msgstr[1] "%n dias atrás"
-#: js/js.js:859
+#: js/js.js:872
msgid "last month"
msgstr "ultÃmo mês"
-#: js/js.js:860
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n mês atrás"
msgstr[1] "%n meses atrás"
-#: js/js.js:861
+#: js/js.js:874
msgid "months ago"
msgstr "meses atrás"
-#: js/js.js:862
+#: js/js.js:875
msgid "last year"
msgstr "ano passado"
-#: js/js.js:863
+#: js/js.js:876
msgid "years ago"
msgstr "anos atrás"
@@ -268,6 +269,46 @@ msgstr "Ok"
#: js/oc-dialogs.js:219
msgid "Error loading message template: {error}"
+msgstr "Erro ao carregar o template: {error}"
+
+#: js/oc-dialogs.js:347
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:367
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:376
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: js/oc-dialogs.js:386
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:457
+msgid "Error loading file exists template"
msgstr ""
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
diff --git a/l10n/pt_PT/files.po b/l10n/pt_PT/files.po
index 7bd460d366bacfac9f7216123040297b02f15a34..7a35987288855c2f70278e21c25cc1b773a23f60 100644
--- a/l10n/pt_PT/files.po
+++ b/l10n/pt_PT/files.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:00+0000\n"
-"Last-Translator: Helder Meneses <helder.meneses@gmail.com>\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -77,11 +77,15 @@ msgstr "Falhou a escrita no disco"
msgid "Not enough storage available"
msgstr "Não há espaço suficiente em disco"
-#: ajax/upload.php:109
-msgid "Upload failed"
-msgstr "Carregamento falhou"
+#: ajax/upload.php:120 ajax/upload.php:143
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:136
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
-#: ajax/upload.php:127
+#: ajax/upload.php:160
msgid "Invalid directory."
msgstr "Directório Inválido"
@@ -89,144 +93,148 @@ msgstr "Directório Inválido"
msgid "Files"
msgstr "Ficheiros"
-#: js/file-upload.js:11
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Não é possÃvel fazer o envio do ficheiro devido a ser uma pasta ou ter 0 bytes"
+#: js/file-upload.js:244
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
+msgstr ""
-#: js/file-upload.js:24
+#: js/file-upload.js:255
msgid "Not enough space available"
msgstr "Espaço em disco insuficiente!"
-#: js/file-upload.js:64
+#: js/file-upload.js:322
msgid "Upload cancelled."
msgstr "Envio cancelado."
-#: js/file-upload.js:165
+#: js/file-upload.js:356
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:446
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Envio de ficheiro em progresso. Irá cancelar o envio se sair da página agora."
-#: js/file-upload.js:239
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr "O URL não pode estar vazio."
-#: js/file-upload.js:244 lib/app.php:53
+#: js/file-upload.js:525 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr "Nome da pasta inválido. Palavra 'Shared' é reservado pela ownCloud"
-#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550
+#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545
msgid "Error"
msgstr "Erro"
-#: js/fileactions.js:116
+#: js/fileactions.js:119
msgid "Share"
msgstr "Partilhar"
-#: js/fileactions.js:126
+#: js/fileactions.js:131
msgid "Delete permanently"
msgstr "Eliminar permanentemente"
-#: js/fileactions.js:192
+#: js/fileactions.js:197
msgid "Rename"
msgstr "Renomear"
-#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "Pendente"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "O nome {new_name} já existe"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "substituir"
-#: js/filelist.js:307
+#: js/filelist.js:416
msgid "suggest name"
msgstr "sugira um nome"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "cancelar"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr "substituido {new_name} por {old_name}"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "undo"
msgstr "desfazer"
-#: js/filelist.js:424 js/filelist.js:490 js/files.js:581
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "%n pasta"
msgstr[1] "%n pastas"
-#: js/filelist.js:425 js/filelist.js:491 js/files.js:587
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "%n ficheiro"
msgstr[1] "%n ficheiros"
-#: js/filelist.js:432
+#: js/filelist.js:541
msgid "{dirs} and {files}"
msgstr "{dirs} e {files}"
-#: js/filelist.js:563
+#: js/filelist.js:731 js/filelist.js:769
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "A carregar %n ficheiro"
msgstr[1] "A carregar %n ficheiros"
-#: js/filelist.js:628
-msgid "files uploading"
-msgstr "A enviar os ficheiros"
-
-#: js/files.js:52
+#: js/files.js:25
msgid "'.' is an invalid file name."
msgstr "'.' não é um nome de ficheiro válido!"
-#: js/files.js:56
+#: js/files.js:29
msgid "File name cannot be empty."
msgstr "O nome do ficheiro não pode estar vazio."
-#: js/files.js:64
+#: js/files.js:37
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Nome Inválido, os caracteres '\\', '/', '<', '>', ':', '\"', '|', '?' e '*' não são permitidos."
-#: js/files.js:78
+#: js/files.js:51
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr "O seu armazenamento está cheio, os ficheiros não podem ser sincronizados."
-#: js/files.js:82
+#: js/files.js:55
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "O seu espaço de armazenamento está quase cheiro ({usedSpacePercent}%)"
-#: js/files.js:94
+#: js/files.js:67
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
msgstr "A encriptação foi desactivada mas os seus ficheiros continuam encriptados. Por favor consulte as suas definições pessoais para desencriptar os ficheiros."
-#: js/files.js:245
+#: js/files.js:296
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "O seu download está a ser preparado. Este processo pode demorar algum tempo se os ficheiros forem grandes."
-#: js/files.js:563 templates/index.php:69
+#: js/files.js:507 js/files.js:545
+msgid "Error moving file"
+msgstr ""
+
+#: js/files.js:558 templates/index.php:61
msgid "Name"
msgstr "Nome"
-#: js/files.js:564 templates/index.php:81
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "Tamanho"
-#: js/files.js:565 templates/index.php:83
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr "Modificado"
@@ -235,7 +243,7 @@ msgstr "Modificado"
msgid "%s could not be renamed"
msgstr "%s não pode ser renomeada"
-#: lib/helper.php:11 templates/index.php:18
+#: lib/helper.php:11 templates/index.php:17
msgid "Upload"
msgstr "Carregar"
@@ -271,65 +279,65 @@ msgstr "Tamanho máximo para ficheiros ZIP"
msgid "Save"
msgstr "Guardar"
-#: templates/index.php:7
+#: templates/index.php:6
msgid "New"
msgstr "Novo"
-#: templates/index.php:10
+#: templates/index.php:9
msgid "Text file"
msgstr "Ficheiro de texto"
-#: templates/index.php:12
+#: templates/index.php:11
msgid "Folder"
msgstr "Pasta"
-#: templates/index.php:14
+#: templates/index.php:13
msgid "From link"
msgstr "Da ligação"
-#: templates/index.php:41
+#: templates/index.php:33
msgid "Deleted files"
msgstr "Ficheiros eliminados"
-#: templates/index.php:46
+#: templates/index.php:39
msgid "Cancel upload"
msgstr "Cancelar envio"
-#: templates/index.php:52
+#: templates/index.php:45
msgid "You don’t have write permissions here."
msgstr "Não tem permissões de escrita aqui."
-#: templates/index.php:59
+#: templates/index.php:50
msgid "Nothing in here. Upload something!"
msgstr "Vazio. Envie alguma coisa!"
-#: templates/index.php:75
+#: templates/index.php:67
msgid "Download"
msgstr "Transferir"
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr "Deixar de partilhar"
-#: templates/index.php:94 templates/index.php:95
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "Eliminar"
-#: templates/index.php:108
+#: templates/index.php:100
msgid "Upload too large"
msgstr "Upload muito grande"
-#: templates/index.php:110
+#: templates/index.php:102
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Os ficheiro que está a tentar enviar excedem o tamanho máximo de envio neste servidor."
-#: templates/index.php:115
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr "Os ficheiros estão a ser analisados, por favor aguarde."
-#: templates/index.php:118
+#: templates/index.php:110
msgid "Current scanning"
msgstr "Análise actual"
diff --git a/l10n/pt_PT/lib.po b/l10n/pt_PT/lib.po
index a71bf02322231a5f0accb9cf9c925b3017daf558..937940f95720b21d5619814c5ffd34e914ea3946 100644
--- a/l10n/pt_PT/lib.po
+++ b/l10n/pt_PT/lib.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:45-0400\n"
+"PO-Revision-Date: 2013-09-19 18:40+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
@@ -60,11 +60,11 @@ msgstr ""
#: avatar.php:64
msgid "Unknown filetype"
-msgstr ""
+msgstr "Ficheiro desconhecido"
#: avatar.php:69
msgid "Invalid image"
-msgstr ""
+msgstr "Imagem inválida"
#: defaults.php:35
msgid "web services under your control"
@@ -165,15 +165,15 @@ msgstr "Erro na autenticação"
msgid "Token expired. Please reload page."
msgstr "O token expirou. Por favor recarregue a página."
-#: search/provider/file.php:17 search/provider/file.php:35
+#: search/provider/file.php:18 search/provider/file.php:36
msgid "Files"
msgstr "Ficheiros"
-#: search/provider/file.php:26 search/provider/file.php:33
+#: search/provider/file.php:27 search/provider/file.php:34
msgid "Text"
msgstr "Texto"
-#: search/provider/file.php:29
+#: search/provider/file.php:30
msgid "Images"
msgstr "Imagens"
diff --git a/l10n/pt_PT/settings.po b/l10n/pt_PT/settings.po
index 62b80e989cafea1af55e3d489b86272b4d679fad..f171929bbc34639fa82f7bd71ce00cd7c6978e55 100644
--- a/l10n/pt_PT/settings.po
+++ b/l10n/pt_PT/settings.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:45-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgid "Unable to load list from App Store"
msgstr "Incapaz de carregar a lista da App Store"
#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
-#: ajax/togglegroups.php:20
+#: ajax/togglegroups.php:20 changepassword/controller.php:55
msgid "Authentication error"
msgstr "Erro na autenticação"
@@ -88,6 +88,35 @@ msgstr "ImpossÃvel apagar utilizador do grupo %s"
msgid "Couldn't update app."
msgstr "Não foi possÃvel actualizar a aplicação."
+#: changepassword/controller.php:20
+msgid "Wrong password"
+msgstr ""
+
+#: changepassword/controller.php:42
+msgid "No user supplied"
+msgstr ""
+
+#: changepassword/controller.php:74
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr ""
+
+#: changepassword/controller.php:79
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr ""
+
+#: changepassword/controller.php:87
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr ""
+
+#: changepassword/controller.php:92 changepassword/controller.php:103
+msgid "Unable to change password"
+msgstr ""
+
#: js/apps.js:43
msgid "Update to {appversion}"
msgstr "Actualizar para a versão {appversion}"
@@ -132,15 +161,15 @@ msgstr "Actualizar"
msgid "Updated"
msgstr "Actualizado"
-#: js/personal.js:217
+#: js/personal.js:220
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:262
+#: js/personal.js:265
msgid "Decrypting files... Please wait, this can take some time."
msgstr "A desencriptar os ficheiros... Por favor aguarde, esta operação pode demorar algum tempo."
-#: js/personal.js:284
+#: js/personal.js:287
msgid "Saving..."
msgstr "A guardar..."
@@ -464,7 +493,7 @@ msgstr "Preencha com o seu endereço de email para ativar a recuperação da pal
#: templates/personal.php:86
msgid "Profile picture"
-msgstr ""
+msgstr "Foto do perfil"
#: templates/personal.php:90
msgid "Upload new"
@@ -484,7 +513,7 @@ msgstr ""
#: templates/personal.php:97
msgid "Abort"
-msgstr ""
+msgstr "Abortar"
#: templates/personal.php:98
msgid "Choose as profile image"
diff --git a/l10n/ro/core.po b/l10n/ro/core.po
index 171346b912a4561e8d315fe69dd1f37776fa004e..5e6a50773fd0744115f8a23f048df2dba98d0446 100644
--- a/l10n/ro/core.po
+++ b/l10n/ro/core.po
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:33+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-22 12:55-0400\n"
+"PO-Revision-Date: 2013-09-21 20:00+0000\n"
+"Last-Translator: corneliu.e <corneliueva@yahoo.com>\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -40,7 +40,7 @@ msgstr ""
#: ajax/update.php:17
msgid "Updated database"
-msgstr ""
+msgstr "Bază de date actualizată"
#: ajax/update.php:20
msgid "Updating filecache, this may take really long..."
@@ -100,11 +100,11 @@ msgstr ""
#: avatar/controller.php:81
msgid "Unknown filetype"
-msgstr ""
+msgstr "Tip fișier necunoscut"
#: avatar/controller.php:85
msgid "Invalid image"
-msgstr ""
+msgstr "Imagine invalidă"
#: avatar/controller.php:115 avatar/controller.php:142
msgid "No temporary profile picture available, try again"
@@ -194,59 +194,59 @@ msgstr "Decembrie"
msgid "Settings"
msgstr "Setări"
-#: js/js.js:853
+#: js/js.js:866
msgid "seconds ago"
msgstr "secunde în urmă"
-#: js/js.js:854
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "acum %n minut"
+msgstr[1] "acum %n minute"
+msgstr[2] "acum %n minute"
-#: js/js.js:855
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "acum %n oră"
+msgstr[1] "acum %n ore"
+msgstr[2] "acum %n ore"
-#: js/js.js:856
+#: js/js.js:869
msgid "today"
msgstr "astăzi"
-#: js/js.js:857
+#: js/js.js:870
msgid "yesterday"
msgstr "ieri"
-#: js/js.js:858
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "acum %n zi"
+msgstr[1] "acum %n zile"
+msgstr[2] "acum %n zile"
-#: js/js.js:859
+#: js/js.js:872
msgid "last month"
msgstr "ultima lună"
-#: js/js.js:860
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:861
+#: js/js.js:874
msgid "months ago"
msgstr "luni în urmă"
-#: js/js.js:862
+#: js/js.js:875
msgid "last year"
msgstr "ultimul an"
-#: js/js.js:863
+#: js/js.js:876
msgid "years ago"
msgstr "ani în urmă"
@@ -274,6 +274,47 @@ msgstr "Ok"
msgid "Error loading message template: {error}"
msgstr ""
+#: js/oc-dialogs.js:347
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr "Un conflict de fișier"
+
+#: js/oc-dialogs.js:367
+msgid "Which files do you want to keep?"
+msgstr "Ce fișiere vrei să păstrezi?"
+
+#: js/oc-dialogs.js:368
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr "Dacă alegi ambele versiuni, fișierul copiat va avea un număr atașat la denumirea sa."
+
+#: js/oc-dialogs.js:376
+msgid "Cancel"
+msgstr "Anulare"
+
+#: js/oc-dialogs.js:386
+msgid "Continue"
+msgstr "Continuă"
+
+#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:457
+msgid "Error loading file exists template"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/ro/files.po b/l10n/ro/files.po
index 0ac14ca3c9100e59bbcdd247218ff75f214f6dd0..85ce986ea03d688e71cdadcde0e42befc8d28d29 100644
--- a/l10n/ro/files.po
+++ b/l10n/ro/files.po
@@ -3,6 +3,7 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# corneliu.e <corneliueva@yahoo.com>, 2013
# dimaursu16 <dima@ceata.org>, 2013
# inaina <ina.c.ina@gmail.com>, 2013
# ripkid666 <ripkid666@gmail.com>, 2013
@@ -11,9 +12,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:00+0000\n"
-"Last-Translator: inaina <ina.c.ina@gmail.com>\n"
+"POT-Creation-Date: 2013-09-22 12:51-0400\n"
+"PO-Revision-Date: 2013-09-21 16:50+0000\n"
+"Last-Translator: corneliu.e <corneliueva@yahoo.com>\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -78,159 +79,167 @@ msgstr "Eroare la scrierea discului"
msgid "Not enough storage available"
msgstr "Nu este suficient spațiu disponibil"
-#: ajax/upload.php:109
-msgid "Upload failed"
-msgstr "Încărcarea a eșuat"
+#: ajax/upload.php:120 ajax/upload.php:143
+msgid "Upload failed. Could not get file info."
+msgstr "Încărcare eșuată. Nu se pot obține informații despre fișier."
-#: ajax/upload.php:127
+#: ajax/upload.php:136
+msgid "Upload failed. Could not find uploaded file"
+msgstr "Încărcare eșuată. Nu se poate găsi fișierul încărcat"
+
+#: ajax/upload.php:160
msgid "Invalid directory."
msgstr "registru invalid."
-#: appinfo/app.php:12
+#: appinfo/app.php:11
msgid "Files"
msgstr "Fișiere"
-#: js/file-upload.js:11
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "lista nu se poate incarca poate fi un fisier sau are 0 bytes"
+#: js/file-upload.js:244
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
+msgstr "Nu se poate încărca {filename} deoarece este un director sau are mărimea de 0 octeți"
-#: js/file-upload.js:24
+#: js/file-upload.js:255
msgid "Not enough space available"
msgstr "Nu este suficient spațiu disponibil"
-#: js/file-upload.js:64
+#: js/file-upload.js:322
msgid "Upload cancelled."
msgstr "Încărcare anulată."
-#: js/file-upload.js:165
+#: js/file-upload.js:356
+msgid "Could not get result from server."
+msgstr "Nu se poate obține rezultatul de la server."
+
+#: js/file-upload.js:446
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Fișierul este în curs de încărcare. Părăsirea paginii va întrerupe încărcarea."
-#: js/file-upload.js:239
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr "Adresa URL nu poate fi golita"
-#: js/file-upload.js:244 lib/app.php:53
+#: js/file-upload.js:525 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr "Nume de dosar invalid. Utilizarea 'Shared' e rezervată de ownCloud"
-#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550
+#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545
msgid "Error"
msgstr "Eroare"
-#: js/fileactions.js:116
+#: js/fileactions.js:119
msgid "Share"
msgstr "a imparti"
-#: js/fileactions.js:126
+#: js/fileactions.js:131
msgid "Delete permanently"
msgstr "Stergere permanenta"
-#: js/fileactions.js:192
+#: js/fileactions.js:197
msgid "Rename"
msgstr "Redenumire"
-#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "in timpul"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{new_name} deja exista"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "înlocuire"
-#: js/filelist.js:307
+#: js/filelist.js:416
msgid "suggest name"
msgstr "sugerează nume"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "anulare"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr "{new_name} inlocuit cu {old_name}"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "undo"
msgstr "Anulează ultima acțiune"
-#: js/filelist.js:424 js/filelist.js:490 js/files.js:581
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
msgid "%n folder"
msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%n director"
+msgstr[1] "%n directoare"
+msgstr[2] "%n directoare"
-#: js/filelist.js:425 js/filelist.js:491 js/files.js:587
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
msgid "%n file"
msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%n fișier"
+msgstr[1] "%n fișiere"
+msgstr[2] "%n fișiere"
-#: js/filelist.js:432
+#: js/filelist.js:541
msgid "{dirs} and {files}"
-msgstr ""
+msgstr "{dirs} și {files}"
-#: js/filelist.js:563
+#: js/filelist.js:731 js/filelist.js:769
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: js/filelist.js:628
-msgid "files uploading"
-msgstr "fișiere se încarcă"
+msgstr[0] "Se încarcă %n fișier."
+msgstr[1] "Se încarcă %n fișiere."
+msgstr[2] "Se încarcă %n fișiere."
-#: js/files.js:52
+#: js/files.js:25
msgid "'.' is an invalid file name."
msgstr "'.' este un nume invalid de fișier."
-#: js/files.js:56
+#: js/files.js:29
msgid "File name cannot be empty."
msgstr "Numele fișierului nu poate rămâne gol."
-#: js/files.js:64
+#: js/files.js:37
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Nume invalide, '\\', '/', '<', '>', ':', '\"', '|', '?' si '*' nu sunt permise."
-#: js/files.js:78
+#: js/files.js:51
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr "Spatiul de stocare este plin, fisierele nu mai pot fi actualizate sau sincronizate"
-#: js/files.js:82
+#: js/files.js:55
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Spatiul de stocare este aproape plin {spatiu folosit}%"
-#: js/files.js:94
+#: js/files.js:67
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
msgstr "criptarea a fost disactivata dar fisierele sant inca criptate.va rog intrati in setarile personale pentru a decripta fisierele"
-#: js/files.js:245
+#: js/files.js:296
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "in curs de descarcare. Aceasta poate să dureze ceva timp dacă fișierele sunt mari."
-#: js/files.js:563 templates/index.php:69
+#: js/files.js:507 js/files.js:545
+msgid "Error moving file"
+msgstr "Eroare la mutarea fișierului"
+
+#: js/files.js:558 templates/index.php:61
msgid "Name"
msgstr "Nume"
-#: js/files.js:564 templates/index.php:81
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "Dimensiune"
-#: js/files.js:565 templates/index.php:83
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr "Modificat"
@@ -239,7 +248,7 @@ msgstr "Modificat"
msgid "%s could not be renamed"
msgstr "%s nu a putut fi redenumit"
-#: lib/helper.php:11 templates/index.php:18
+#: lib/helper.php:11 templates/index.php:17
msgid "Upload"
msgstr "Încărcare"
@@ -275,65 +284,65 @@ msgstr "Dimensiunea maximă de intrare pentru fișiere compresate"
msgid "Save"
msgstr "Salvează"
-#: templates/index.php:7
+#: templates/index.php:6
msgid "New"
msgstr "Nou"
-#: templates/index.php:10
+#: templates/index.php:9
msgid "Text file"
msgstr "lista"
-#: templates/index.php:12
+#: templates/index.php:11
msgid "Folder"
msgstr "Dosar"
-#: templates/index.php:14
+#: templates/index.php:13
msgid "From link"
msgstr "de la adresa"
-#: templates/index.php:41
+#: templates/index.php:33
msgid "Deleted files"
msgstr "Sterge fisierele"
-#: templates/index.php:46
+#: templates/index.php:39
msgid "Cancel upload"
msgstr "Anulează încărcarea"
-#: templates/index.php:52
+#: templates/index.php:45
msgid "You don’t have write permissions here."
msgstr "Nu ai permisiunea de a scrie aici."
-#: templates/index.php:59
+#: templates/index.php:50
msgid "Nothing in here. Upload something!"
msgstr "Nimic aici. Încarcă ceva!"
-#: templates/index.php:75
+#: templates/index.php:67
msgid "Download"
msgstr "Descarcă"
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr "Anulare"
-#: templates/index.php:94 templates/index.php:95
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "Șterge"
-#: templates/index.php:108
+#: templates/index.php:100
msgid "Upload too large"
msgstr "Fișierul încărcat este prea mare"
-#: templates/index.php:110
+#: templates/index.php:102
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Fișierul care l-ai încărcat a depășită limita maximă admisă la încărcare pe acest server."
-#: templates/index.php:115
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr "Fișierele sunt scanate, asteptati va rog"
-#: templates/index.php:118
+#: templates/index.php:110
msgid "Current scanning"
msgstr "ÃŽn curs de scanare"
diff --git a/l10n/ro/files_trashbin.po b/l10n/ro/files_trashbin.po
index 59197c9f4fdbc2a1e04b6cba64f83558ae65818e..916fba8a41d0e41e02ea76c59221505c321c3751 100644
--- a/l10n/ro/files_trashbin.po
+++ b/l10n/ro/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-09-22 12:54-0400\n"
+"PO-Revision-Date: 2013-09-21 16:50+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
@@ -27,45 +27,45 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/trash.js:7 js/trash.js:100
+#: js/trash.js:7 js/trash.js:102
msgid "perform restore operation"
msgstr ""
-#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
+#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148
msgid "Error"
msgstr "Eroare"
-#: js/trash.js:36
+#: js/trash.js:37
msgid "delete file permanently"
msgstr ""
-#: js/trash.js:127
+#: js/trash.js:129
msgid "Delete permanently"
msgstr "Stergere permanenta"
-#: js/trash.js:182 templates/index.php:17
+#: js/trash.js:190 templates/index.php:21
msgid "Name"
msgstr "Nume"
-#: js/trash.js:183 templates/index.php:27
+#: js/trash.js:191 templates/index.php:31
msgid "Deleted"
msgstr ""
-#: js/trash.js:191
+#: js/trash.js:199
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-msgstr[2] ""
+msgstr[2] "%n directoare"
-#: js/trash.js:197
+#: js/trash.js:205
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-msgstr[2] ""
+msgstr[2] "%n fișiere"
-#: lib/trash.php:819 lib/trash.php:821
+#: lib/trashbin.php:814 lib/trashbin.php:816
msgid "restored"
msgstr ""
@@ -73,11 +73,11 @@ msgstr ""
msgid "Nothing in here. Your trash bin is empty!"
msgstr ""
-#: templates/index.php:20 templates/index.php:22
+#: templates/index.php:24 templates/index.php:26
msgid "Restore"
msgstr ""
-#: templates/index.php:30 templates/index.php:31
+#: templates/index.php:34 templates/index.php:35
msgid "Delete"
msgstr "Șterge"
diff --git a/l10n/ro/lib.po b/l10n/ro/lib.po
index eae9302c753fb0a8db099f1b38b1751b9310b37c..8f288b515edc0bcffd8a121ea26292fc840efbab 100644
--- a/l10n/ro/lib.po
+++ b/l10n/ro/lib.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-09-22 12:56-0400\n"
+"PO-Revision-Date: 2013-09-21 20:00+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
@@ -60,11 +60,11 @@ msgstr ""
#: avatar.php:64
msgid "Unknown filetype"
-msgstr ""
+msgstr "Tip fișier necunoscut"
#: avatar.php:69
msgid "Invalid image"
-msgstr ""
+msgstr "Imagine invalidă"
#: defaults.php:35
msgid "web services under your control"
@@ -165,15 +165,15 @@ msgstr "Eroare la autentificare"
msgid "Token expired. Please reload page."
msgstr "Token expirat. Te rugăm să reîncarci pagina."
-#: search/provider/file.php:17 search/provider/file.php:35
+#: search/provider/file.php:18 search/provider/file.php:36
msgid "Files"
msgstr "Fișiere"
-#: search/provider/file.php:26 search/provider/file.php:33
+#: search/provider/file.php:27 search/provider/file.php:34
msgid "Text"
msgstr "Text"
-#: search/provider/file.php:29
+#: search/provider/file.php:30
msgid "Images"
msgstr "Imagini"
@@ -286,14 +286,14 @@ msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-msgstr[2] ""
+msgstr[2] "acum %n minute"
#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-msgstr[2] ""
+msgstr[2] "acum %n ore"
#: template/functions.php:99
msgid "today"
@@ -308,7 +308,7 @@ msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-msgstr[2] ""
+msgstr[2] "acum %n zile"
#: template/functions.php:102
msgid "last month"
diff --git a/l10n/ro/settings.po b/l10n/ro/settings.po
index 7e003bd6db65e008295934ace49bbef3ccd587eb..6f79f4b1e0580d4c6ee9eeb9c4dd45a7e76aba39 100644
--- a/l10n/ro/settings.po
+++ b/l10n/ro/settings.po
@@ -3,14 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# corneliu.e <corneliueva@yahoo.com>, 2013
# sergiu_sechel <sergiu.sechel@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-22 12:56-0400\n"
+"PO-Revision-Date: 2013-09-21 20:00+0000\n"
+"Last-Translator: corneliu.e <corneliueva@yahoo.com>\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -23,7 +24,7 @@ msgid "Unable to load list from App Store"
msgstr "Imposibil de actualizat lista din App Store."
#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
-#: ajax/togglegroups.php:20
+#: ajax/togglegroups.php:20 changepassword/controller.php:55
msgid "Authentication error"
msgstr "Eroare la autentificare"
@@ -49,7 +50,7 @@ msgstr "E-mail salvat"
#: ajax/lostpassword.php:14
msgid "Invalid email"
-msgstr "E-mail nevalid"
+msgstr "E-mail invalid"
#: ajax/removegroup.php:13
msgid "Unable to delete group"
@@ -85,6 +86,35 @@ msgstr "Nu s-a putut elimina utilizatorul din grupul %s"
msgid "Couldn't update app."
msgstr "Aplicaţia nu s-a putut actualiza."
+#: changepassword/controller.php:20
+msgid "Wrong password"
+msgstr "Parolă greșită"
+
+#: changepassword/controller.php:42
+msgid "No user supplied"
+msgstr ""
+
+#: changepassword/controller.php:74
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr ""
+
+#: changepassword/controller.php:79
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr ""
+
+#: changepassword/controller.php:87
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr ""
+
+#: changepassword/controller.php:92 changepassword/controller.php:103
+msgid "Unable to change password"
+msgstr "Imposibil de schimbat parola"
+
#: js/apps.js:43
msgid "Update to {appversion}"
msgstr "Actualizat la {versiuneaaplicaţiei}"
@@ -129,15 +159,15 @@ msgstr "Actualizare"
msgid "Updated"
msgstr "Actualizat"
-#: js/personal.js:217
+#: js/personal.js:220
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:262
+#: js/personal.js:265
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:284
+#: js/personal.js:287
msgid "Saving..."
msgstr "Se salvează..."
@@ -289,7 +319,7 @@ msgstr "Permite utilizatorilor să partajeze fișiere în mod public prin legăt
#: templates/admin.php:143
msgid "Allow public uploads"
-msgstr ""
+msgstr "Permite încărcări publice"
#: templates/admin.php:144
msgid ""
@@ -461,7 +491,7 @@ msgstr "Completează o adresă de mail pentru a-ți putea recupera parola"
#: templates/personal.php:86
msgid "Profile picture"
-msgstr ""
+msgstr "Imagine de profil"
#: templates/personal.php:90
msgid "Upload new"
@@ -473,7 +503,7 @@ msgstr ""
#: templates/personal.php:93
msgid "Remove image"
-msgstr ""
+msgstr "Înlătură imagine"
#: templates/personal.php:94
msgid "Either png or jpg. Ideally square but you will be able to crop it."
@@ -485,7 +515,7 @@ msgstr ""
#: templates/personal.php:98
msgid "Choose as profile image"
-msgstr ""
+msgstr "Alege drept imagine de profil"
#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
@@ -562,11 +592,11 @@ msgstr "Stocare"
#: templates/users.php:108
msgid "change display name"
-msgstr ""
+msgstr "schimbă numele afișat"
#: templates/users.php:112
msgid "set new password"
-msgstr ""
+msgstr "setează parolă nouă"
#: templates/users.php:143
msgid "Default"
diff --git a/l10n/ru/core.po b/l10n/ru/core.po
index 1f90ed5e5ef75af72d0da101921c4839a3288bd5..f5720110be1a6c16127e472794f45dcd618db559 100644
--- a/l10n/ru/core.po
+++ b/l10n/ru/core.po
@@ -3,10 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Alex <atrigub@gmail.com>, 2013
# alfsoft <alfsoft@gmail.com>, 2013
# lord93 <lordakryl@gmail.com>, 2013
# foool <andrglad@mail.ru>, 2013
+# jekader <jekader@gmail.com>, 2013
# eurekafag <rkfg@rkfg.me>, 2013
+# sk.avenger <sk.avenger@adygnet.ru>, 2013
# Victor Bravo <>, 2013
# Vyacheslav Muranov <s@neola.ru>, 2013
# Den4md <denstarr@mail.md>, 2013
@@ -15,9 +18,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:33+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-22 12:55-0400\n"
+"PO-Revision-Date: 2013-09-22 12:00+0000\n"
+"Last-Translator: jekader <jekader@gmail.com>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -36,28 +39,28 @@ msgstr "группа"
#: ajax/update.php:11
msgid "Turned on maintenance mode"
-msgstr ""
+msgstr "Режим отладки включён"
#: ajax/update.php:14
msgid "Turned off maintenance mode"
-msgstr ""
+msgstr "Режим отладки отключён"
#: ajax/update.php:17
msgid "Updated database"
-msgstr ""
+msgstr "База данных обновлена"
#: ajax/update.php:20
msgid "Updating filecache, this may take really long..."
-msgstr ""
+msgstr "Обновление файлового кÑша, Ñто может занÑÑ‚ÑŒ некоторое времÑ..."
#: ajax/update.php:23
msgid "Updated filecache"
-msgstr ""
+msgstr "Обновлен файловый кÑш"
#: ajax/update.php:26
#, php-format
msgid "... %d%% done ..."
-msgstr ""
+msgstr "... %d%% завершено ..."
#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
msgid "Category type not provided."
@@ -100,23 +103,23 @@ msgstr "Ошибка ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ %s из избранного"
#: avatar/controller.php:62
msgid "No image or file provided"
-msgstr ""
+msgstr "Ðе указано изображение или файл"
#: avatar/controller.php:81
msgid "Unknown filetype"
-msgstr ""
+msgstr "ÐеизвеÑтный тип файла"
#: avatar/controller.php:85
msgid "Invalid image"
-msgstr ""
+msgstr "Изображение повреждено"
#: avatar/controller.php:115 avatar/controller.php:142
msgid "No temporary profile picture available, try again"
-msgstr ""
+msgstr "Ð’Ñ€ÐµÐ¼ÐµÐ½Ð½Ð°Ñ ÐºÐ°Ñ€Ñ‚Ð¸Ð½ÐºÐ° Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ñ Ð½ÐµÐ´Ð¾Ñтупна, повторите попытку"
#: avatar/controller.php:135
msgid "No crop data provided"
-msgstr ""
+msgstr "Ðе указана Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾ кадрировании"
#: js/config.php:32
msgid "Sunday"
@@ -198,59 +201,59 @@ msgstr "Декабрь"
msgid "Settings"
msgstr "КонфигурациÑ"
-#: js/js.js:853
+#: js/js.js:866
msgid "seconds ago"
msgstr "неÑколько Ñекунд назад"
-#: js/js.js:854
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n минуту назад"
msgstr[1] "%n минуты назад"
msgstr[2] "%n минут назад"
-#: js/js.js:855
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n Ñ‡Ð°Ñ Ð½Ð°Ð·Ð°Ð´"
msgstr[1] "%n чаÑа назад"
msgstr[2] "%n чаÑов назад"
-#: js/js.js:856
+#: js/js.js:869
msgid "today"
msgstr "ÑегоднÑ"
-#: js/js.js:857
+#: js/js.js:870
msgid "yesterday"
msgstr "вчера"
-#: js/js.js:858
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n день назад"
msgstr[1] "%n Ð´Ð½Ñ Ð½Ð°Ð·Ð°Ð´"
msgstr[2] "%n дней назад"
-#: js/js.js:859
+#: js/js.js:872
msgid "last month"
msgstr "в прошлом меÑÑце"
-#: js/js.js:860
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n меÑÑц назад"
msgstr[1] "%n меÑÑца назад"
msgstr[2] "%n меÑÑцев назад"
-#: js/js.js:861
+#: js/js.js:874
msgid "months ago"
msgstr "неÑколько меÑÑцев назад"
-#: js/js.js:862
+#: js/js.js:875
msgid "last year"
msgstr "в прошлом году"
-#: js/js.js:863
+#: js/js.js:876
msgid "years ago"
msgstr "неÑколько лет назад"
@@ -260,7 +263,7 @@ msgstr "Выбрать"
#: js/oc-dialogs.js:146
msgid "Error loading file picker template: {error}"
-msgstr ""
+msgstr "Ошибка при загрузке шаблона выбора файлов: {error}"
#: js/oc-dialogs.js:172
msgid "Yes"
@@ -276,7 +279,48 @@ msgstr "Ок"
#: js/oc-dialogs.js:219
msgid "Error loading message template: {error}"
-msgstr ""
+msgstr "Ошибка загрузки шаблона Ñообщений: {error}"
+
+#: js/oc-dialogs.js:347
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] "{count} конфликт в файлах"
+msgstr[1] "{count} конфликта в файлах"
+msgstr[2] "{count} конфликтов в файлах"
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr "Один конфликт в файлах"
+
+#: js/oc-dialogs.js:367
+msgid "Which files do you want to keep?"
+msgstr "Какие файлы вы хотите Ñохранить?"
+
+#: js/oc-dialogs.js:368
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr "При выборе обоих верÑий, к названию копируемого файла будет добавлена цифра"
+
+#: js/oc-dialogs.js:376
+msgid "Cancel"
+msgstr "Отменить"
+
+#: js/oc-dialogs.js:386
+msgid "Continue"
+msgstr "Продолжить"
+
+#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+msgid "(all selected)"
+msgstr "(выбраны вÑе)"
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "({count} selected)"
+msgstr "({count} выбрано)"
+
+#: js/oc-dialogs.js:457
+msgid "Error loading file exists template"
+msgstr "Ошибка при загрузке шаблона ÑущеÑтвующего файла"
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
@@ -609,11 +653,11 @@ msgstr "будет иÑпользовано"
#: templates/installation.php:140
msgid "Database user"
-msgstr "Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð´Ð»Ñ Ð±Ð°Ð·Ñ‹ данных"
+msgstr "Пользователь базы данных"
#: templates/installation.php:147
msgid "Database password"
-msgstr "Пароль Ð´Ð»Ñ Ð±Ð°Ð·Ñ‹ данных"
+msgstr "Пароль базы данных"
#: templates/installation.php:152
msgid "Database name"
diff --git a/l10n/ru/files.po b/l10n/ru/files.po
index 2db89c27daa313b2b6c948946bcf7838f49ce6fa..114807f53033c5a5b3422ebee69b85944112615e 100644
--- a/l10n/ru/files.po
+++ b/l10n/ru/files.po
@@ -4,17 +4,19 @@
#
# Translators:
# lord93 <lordakryl@gmail.com>, 2013
+# jekader <jekader@gmail.com>, 2013
# eurekafag <rkfg@rkfg.me>, 2013
# Victor Bravo <>, 2013
+# navigator666 <yuriy.malyovaniy@gmail.com>, 2013
# hackproof <hackproof.ai@gmail.com>, 2013
# Friktor <antonshramko@yandex.ru>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:00+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-22 12:51-0400\n"
+"PO-Revision-Date: 2013-09-21 12:30+0000\n"
+"Last-Translator: jekader <jekader@gmail.com>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -79,159 +81,167 @@ msgstr "Ошибка запиÑи на диÑк"
msgid "Not enough storage available"
msgstr "ÐедоÑтаточно доÑтупного меÑта в хранилище"
-#: ajax/upload.php:109
-msgid "Upload failed"
-msgstr "Ошибка загрузки"
+#: ajax/upload.php:120 ajax/upload.php:143
+msgid "Upload failed. Could not get file info."
+msgstr "Загрузка не удалаÑÑŒ. Ðевозможно получить информацию о файле"
-#: ajax/upload.php:127
+#: ajax/upload.php:136
+msgid "Upload failed. Could not find uploaded file"
+msgstr "Загрузка не удалаÑÑŒ. Ðевозможно найти загруженный файл"
+
+#: ajax/upload.php:160
msgid "Invalid directory."
msgstr "Ðеправильный каталог."
-#: appinfo/app.php:12
+#: appinfo/app.php:11
msgid "Files"
msgstr "Файлы"
-#: js/file-upload.js:11
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Файл не был загружен: его размер 0 байт либо Ñто не файл, а директориÑ."
+#: js/file-upload.js:244
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
+msgstr "Ðевозможно загрузить файл {filename} так как он ÑвлÑетÑÑ Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸ÐµÐ¹ либо имеет размер 0 байт"
-#: js/file-upload.js:24
+#: js/file-upload.js:255
msgid "Not enough space available"
msgstr "ÐедоÑтаточно Ñвободного меÑта"
-#: js/file-upload.js:64
+#: js/file-upload.js:322
msgid "Upload cancelled."
msgstr "Загрузка отменена."
-#: js/file-upload.js:165
+#: js/file-upload.js:356
+msgid "Could not get result from server."
+msgstr "Ðе получен ответ от Ñервера"
+
+#: js/file-upload.js:446
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Файл в процеÑÑе загрузки. Покинув Ñтраницу вы прервёте загрузку."
-#: js/file-upload.js:239
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr "СÑылка не может быть пуÑтой."
-#: js/file-upload.js:244 lib/app.php:53
+#: js/file-upload.js:525 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr "Ðеправильное Ð¸Ð¼Ñ ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³Ð°. Ð˜Ð¼Ñ 'Shared' зарезервировано."
-#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550
+#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545
msgid "Error"
msgstr "Ошибка"
-#: js/fileactions.js:116
+#: js/fileactions.js:119
msgid "Share"
msgstr "Открыть доÑтуп"
-#: js/fileactions.js:126
+#: js/fileactions.js:131
msgid "Delete permanently"
msgstr "Удалено навÑегда"
-#: js/fileactions.js:192
+#: js/fileactions.js:197
msgid "Rename"
msgstr "Переименовать"
-#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "Ожидание"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{new_name} уже ÑущеÑтвует"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "заменить"
-#: js/filelist.js:307
+#: js/filelist.js:416
msgid "suggest name"
msgstr "предложить название"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "отмена"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr "заменено {new_name} на {old_name}"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "undo"
msgstr "отмена"
-#: js/filelist.js:424 js/filelist.js:490 js/files.js:581
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "%n папка"
msgstr[1] "%n папки"
msgstr[2] "%n папок"
-#: js/filelist.js:425 js/filelist.js:491 js/files.js:587
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "%n файл"
msgstr[1] "%n файла"
msgstr[2] "%n файлов"
-#: js/filelist.js:432
+#: js/filelist.js:541
msgid "{dirs} and {files}"
-msgstr ""
+msgstr "{dirs} и {files}"
-#: js/filelist.js:563
+#: js/filelist.js:731 js/filelist.js:769
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "Закачка %n файла"
msgstr[1] "Закачка %n файлов"
msgstr[2] "Закачка %n файлов"
-#: js/filelist.js:628
-msgid "files uploading"
-msgstr "файлы загружаютÑÑ"
-
-#: js/files.js:52
+#: js/files.js:25
msgid "'.' is an invalid file name."
msgstr "'.' - неправильное Ð¸Ð¼Ñ Ñ„Ð°Ð¹Ð»Ð°."
-#: js/files.js:56
+#: js/files.js:29
msgid "File name cannot be empty."
msgstr "Ð˜Ð¼Ñ Ñ„Ð°Ð¹Ð»Ð° не может быть пуÑтым."
-#: js/files.js:64
+#: js/files.js:37
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Ðеправильное имÑ, '\\', '/', '<', '>', ':', '\"', '|', '?' и '*' недопуÑтимы."
-#: js/files.js:78
+#: js/files.js:51
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr "Ваше диÑковое проÑтранÑтво полноÑтью заполнено, произведите очиÑтку перед загрузкой новых файлов."
-#: js/files.js:82
+#: js/files.js:55
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Ваше хранилище почти заполнено ({usedSpacePercent}%)"
-#: js/files.js:94
+#: js/files.js:67
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
-msgstr ""
+msgstr "Шифрование было отключено, но ваши файлы вÑе еще зашифрованы. ПожалуйÑта, зайдите на Ñтраницу перÑональных наÑтроек Ð´Ð»Ñ Ñ‚Ð¾Ð³Ð¾, чтобы раÑшифровать ваши файлы."
-#: js/files.js:245
+#: js/files.js:296
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "Загрузка началаÑÑŒ. Ðто может потребовать много времени, еÑли файл большого размера."
-#: js/files.js:563 templates/index.php:69
+#: js/files.js:507 js/files.js:545
+msgid "Error moving file"
+msgstr "Ошибка при перемещении файла"
+
+#: js/files.js:558 templates/index.php:61
msgid "Name"
msgstr "ИмÑ"
-#: js/files.js:564 templates/index.php:81
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "Размер"
-#: js/files.js:565 templates/index.php:83
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr "Изменён"
@@ -240,7 +250,7 @@ msgstr "Изменён"
msgid "%s could not be renamed"
msgstr "%s не может быть переименован"
-#: lib/helper.php:11 templates/index.php:18
+#: lib/helper.php:11 templates/index.php:17
msgid "Upload"
msgstr "Загрузка"
@@ -276,65 +286,65 @@ msgstr "МакÑимальный иÑходный размер Ð´Ð»Ñ ZIP фай
msgid "Save"
msgstr "Сохранить"
-#: templates/index.php:7
+#: templates/index.php:6
msgid "New"
msgstr "Ðовый"
-#: templates/index.php:10
+#: templates/index.php:9
msgid "Text file"
msgstr "ТекÑтовый файл"
-#: templates/index.php:12
+#: templates/index.php:11
msgid "Folder"
msgstr "Папка"
-#: templates/index.php:14
+#: templates/index.php:13
msgid "From link"
msgstr "Из ÑÑылки"
-#: templates/index.php:41
+#: templates/index.php:33
msgid "Deleted files"
msgstr "Удалённые файлы"
-#: templates/index.php:46
+#: templates/index.php:39
msgid "Cancel upload"
msgstr "Отмена загрузки"
-#: templates/index.php:52
+#: templates/index.php:45
msgid "You don’t have write permissions here."
msgstr "У Ð²Ð°Ñ Ð½ÐµÑ‚ разрешений на запиÑÑŒ здеÑÑŒ."
-#: templates/index.php:59
+#: templates/index.php:50
msgid "Nothing in here. Upload something!"
msgstr "ЗдеÑÑŒ ничего нет. Загрузите что-нибудь!"
-#: templates/index.php:75
+#: templates/index.php:67
msgid "Download"
msgstr "Скачать"
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr "Закрыть общий доÑтуп"
-#: templates/index.php:94 templates/index.php:95
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "Удалить"
-#: templates/index.php:108
+#: templates/index.php:100
msgid "Upload too large"
msgstr "Файл Ñлишком велик"
-#: templates/index.php:110
+#: templates/index.php:102
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Файлы, которые вы пытаетеÑÑŒ загрузить, превышают лимит Ð´Ð»Ñ Ñ„Ð°Ð¹Ð»Ð¾Ð² на Ñтом Ñервере."
-#: templates/index.php:115
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr "Подождите, файлы ÑканируютÑÑ."
-#: templates/index.php:118
+#: templates/index.php:110
msgid "Current scanning"
msgstr "Текущее Ñканирование"
diff --git a/l10n/ru/lib.po b/l10n/ru/lib.po
index 2f638c5bcd0ac30d3df9bb529f849b9f50bed066..35f307084051d16b0eaa04f705cb8dfb130e1078 100644
--- a/l10n/ru/lib.po
+++ b/l10n/ru/lib.po
@@ -4,15 +4,18 @@
#
# Translators:
# Alexander Shashkevych <alex@stunpix.com>, 2013
+# jekader <jekader@gmail.com>, 2013
# eurekafag <rkfg@rkfg.me>, 2013
+# sk.avenger <sk.avenger@adygnet.ru>, 2013
+# navigator666 <yuriy.malyovaniy@gmail.com>, 2013
# Friktor <antonshramko@yandex.ru>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-22 12:56-0400\n"
+"PO-Revision-Date: 2013-09-21 11:50+0000\n"
+"Last-Translator: jekader <jekader@gmail.com>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -25,11 +28,11 @@ msgstr ""
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
-msgstr ""
+msgstr "Приложение \"%s\" Ð½ÐµÐ»ÑŒÐ·Ñ ÑƒÑтановить, так как оно не ÑовмеÑтимо Ñ Ñ‚ÐµÐºÑƒÑ‰ÐµÐ¹ верÑией ownCloud."
#: app.php:250
msgid "No app name specified"
-msgstr ""
+msgstr "Ðе выбрано Ð¸Ð¼Ñ Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ"
#: app.php:361
msgid "Help"
@@ -58,15 +61,15 @@ msgstr "Ðе Ñмог обновить \"%s\"."
#: avatar.php:56
msgid "Custom profile pictures don't work with encryption yet"
-msgstr ""
+msgstr "ПользовательÑкие картинки Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ñ ÐµÑ‰Ñ‘ не поддерживают шифрование"
#: avatar.php:64
msgid "Unknown filetype"
-msgstr ""
+msgstr "ÐеизвеÑтный тип файла"
#: avatar.php:69
msgid "Invalid image"
-msgstr ""
+msgstr "Изображение повреждено"
#: defaults.php:35
msgid "web services under your control"
@@ -101,59 +104,59 @@ msgstr "Загрузите файл маленьшими порциÑми, ра
#: installer.php:63
msgid "No source specified when installing app"
-msgstr ""
+msgstr "Ðе указан иÑточник при уÑтановке приложениÑ"
#: installer.php:70
msgid "No href specified when installing app from http"
-msgstr ""
+msgstr "Ðе указан атрибут href при уÑтановке Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ñ‡ÐµÑ€ÐµÐ· http"
#: installer.php:75
msgid "No path specified when installing app from local file"
-msgstr ""
+msgstr "Ðе указан путь при уÑтановке Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð¸Ð· локального файла"
#: installer.php:89
#, php-format
msgid "Archives of type %s are not supported"
-msgstr ""
+msgstr "Ðрхивы %s не поддерживаютÑÑ"
#: installer.php:103
msgid "Failed to open archive when installing app"
-msgstr ""
+msgstr "Ðе возможно открыть архив при уÑтановке приложениÑ"
#: installer.php:125
msgid "App does not provide an info.xml file"
-msgstr ""
+msgstr "Приложение не имеет файла info.xml"
#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
-msgstr ""
+msgstr "Приложение невозможно уÑтановить. Ð’ нем ÑодержитÑÑ Ð·Ð°Ð¿Ñ€ÐµÑ‰ÐµÐ½Ð½Ñ‹Ð¹ код."
#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
-msgstr ""
+msgstr "Приложение невозможно уÑтановить. Ðе ÑовмеÑтимо Ñ Ñ‚ÐµÐºÑƒÑ‰ÐµÐ¹ верÑией ownCloud."
#: installer.php:146
msgid ""
"App can't be installed because it contains the <shipped>true</shipped> tag "
"which is not allowed for non shipped apps"
-msgstr ""
+msgstr "Приложение невозможно уÑтановить. Оно Ñодержит параметр <shipped>true</shipped> который не допуÑтим Ð´Ð»Ñ Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ð¹, не входÑщих в поÑтавку."
#: installer.php:152
msgid ""
"App can't be installed because the version in info.xml/version is not the "
"same as the version reported from the app store"
-msgstr ""
+msgstr "Приложение невозможно уÑтановить. ВерÑÐ¸Ñ Ð² info.xml/version не Ñовпадает Ñ Ð²ÐµÑ€Ñией заÑвленной в магазине приложений"
#: installer.php:162
msgid "App directory already exists"
-msgstr ""
+msgstr "Папка Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ ÑƒÐ¶Ðµ ÑущеÑтвует"
#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
-msgstr ""
+msgstr "Ðе удалоÑÑŒ Ñоздать директорию. ИÑправьте права доÑтупа. %s"
#: json.php:28
msgid "Application is not enabled"
@@ -167,15 +170,15 @@ msgstr "Ошибка аутентификации"
msgid "Token expired. Please reload page."
msgstr "Токен проÑрочен. Перезагрузите Ñтраницу."
-#: search/provider/file.php:17 search/provider/file.php:35
+#: search/provider/file.php:18 search/provider/file.php:36
msgid "Files"
msgstr "Файлы"
-#: search/provider/file.php:26 search/provider/file.php:33
+#: search/provider/file.php:27 search/provider/file.php:34
msgid "Text"
msgstr "ТекÑÑ‚"
-#: search/provider/file.php:29
+#: search/provider/file.php:30
msgid "Images"
msgstr "ИзображениÑ"
diff --git a/l10n/ru/settings.po b/l10n/ru/settings.po
index 1d7aae06c0f03e3fc0a01b2cf468b14bd5ee3107..94e073154dff9a0a1a5b33ec0135711c2aab585d 100644
--- a/l10n/ru/settings.po
+++ b/l10n/ru/settings.po
@@ -7,16 +7,18 @@
# Alexander Shashkevych <alex@stunpix.com>, 2013
# alfsoft <alfsoft@gmail.com>, 2013
# lord93 <lordakryl@gmail.com>, 2013
+# jekader <jekader@gmail.com>, 2013
# eurekafag <rkfg@rkfg.me>, 2013
+# navigator666 <yuriy.malyovaniy@gmail.com>, 2013
# hackproof <hackproof.ai@gmail.com>, 2013
# Friktor <antonshramko@yandex.ru>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-22 12:56-0400\n"
+"PO-Revision-Date: 2013-09-21 11:20+0000\n"
+"Last-Translator: jekader <jekader@gmail.com>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -29,7 +31,7 @@ msgid "Unable to load list from App Store"
msgstr "Ðе удалоÑÑŒ загрузить ÑпиÑок из App Store"
#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
-#: ajax/togglegroups.php:20
+#: ajax/togglegroups.php:20 changepassword/controller.php:55
msgid "Authentication error"
msgstr "Ошибка аутентификации"
@@ -91,6 +93,35 @@ msgstr "Ðевозможно удалить Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¸Ð· гру
msgid "Couldn't update app."
msgstr "Ðевозможно обновить приложение"
+#: changepassword/controller.php:20
+msgid "Wrong password"
+msgstr "Ðеправильный пароль"
+
+#: changepassword/controller.php:42
+msgid "No user supplied"
+msgstr "Пользователь не задан"
+
+#: changepassword/controller.php:74
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr "ПожалуйÑта введите админиÑтраторÑкий пароль воÑÑтановлениÑ, иначе вÑе пользовательÑкие данные будут утерÑны"
+
+#: changepassword/controller.php:79
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr "Ðеправильный пароль воÑÑтановлениÑ. Проверьте пароль и попробуйте еще раз."
+
+#: changepassword/controller.php:87
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr "ИÑпользуемый механизм не поддерживает Ñмену паролей, но пользовательÑкий ключ ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð±Ñ‹Ð» уÑпешно обновлён"
+
+#: changepassword/controller.php:92 changepassword/controller.php:103
+msgid "Unable to change password"
+msgstr "Ðевозможно изменить пароль"
+
#: js/apps.js:43
msgid "Update to {appversion}"
msgstr "Обновить до {верÑÐ¸Ñ Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ}"
@@ -109,11 +140,11 @@ msgstr "Подождите..."
#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
-msgstr ""
+msgstr "Ошибка Ð¾Ñ‚ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ"
#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
-msgstr ""
+msgstr "Ошибка Ð²ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ"
#: js/apps.js:123
msgid "Updating...."
@@ -135,15 +166,15 @@ msgstr "Обновить"
msgid "Updated"
msgstr "Обновлено"
-#: js/personal.js:217
+#: js/personal.js:220
msgid "Select a profile picture"
-msgstr ""
+msgstr "Выберите картинку профилÑ"
-#: js/personal.js:262
+#: js/personal.js:265
msgid "Decrypting files... Please wait, this can take some time."
msgstr "РаÑшифровка файлов... ПожалуйÑта, подождите, Ñто может занÑÑ‚ÑŒ некоторое времÑ."
-#: js/personal.js:284
+#: js/personal.js:287
msgid "Saving..."
msgstr "Сохранение..."
@@ -467,31 +498,31 @@ msgstr "Введите Ð°Ð´Ñ€ÐµÑ Ñлектронной почты чтобы
#: templates/personal.php:86
msgid "Profile picture"
-msgstr ""
+msgstr "Фото профилÑ"
#: templates/personal.php:90
msgid "Upload new"
-msgstr ""
+msgstr "Закачать новую"
#: templates/personal.php:92
msgid "Select new from Files"
-msgstr ""
+msgstr "Выберите новый из файлов"
#: templates/personal.php:93
msgid "Remove image"
-msgstr ""
+msgstr "Удалить изображение"
#: templates/personal.php:94
msgid "Either png or jpg. Ideally square but you will be able to crop it."
-msgstr ""
+msgstr "Либо png, либо jpg. Изображение должно быть квадратным, но вы Ñможете обрезать его позже."
#: templates/personal.php:97
msgid "Abort"
-msgstr ""
+msgstr "Отмена"
#: templates/personal.php:98
msgid "Choose as profile image"
-msgstr ""
+msgstr "Выберите изображение профилÑ"
#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
@@ -518,15 +549,15 @@ msgstr "Шифрование"
#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
-msgstr ""
+msgstr "Приложение ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð½Ðµ активно, отмените шифрование вÑех ваших файлов."
#: templates/personal.php:146
msgid "Log-in password"
-msgstr ""
+msgstr "Пароль входа"
#: templates/personal.php:151
msgid "Decrypt all Files"
-msgstr ""
+msgstr "СнÑÑ‚ÑŒ шифрование Ñо вÑех файлов"
#: templates/users.php:21
msgid "Login Name"
diff --git a/l10n/ru/user_ldap.po b/l10n/ru/user_ldap.po
index b231595c2f925f08ae8ef0a2355745a49cd4228c..68e53bc41e1371e2d0c7f45f50e313897094be40 100644
--- a/l10n/ru/user_ldap.po
+++ b/l10n/ru/user_ldap.po
@@ -6,13 +6,15 @@
# Alexander Shashkevych <alex@stunpix.com>, 2013
# Fenuks <fenuksuh@ya.ru>, 2013
# alfsoft <alfsoft@gmail.com>, 2013
+# jekader <jekader@gmail.com>, 2013
+# navigator666 <yuriy.malyovaniy@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-22 12:54-0400\n"
+"PO-Revision-Date: 2013-09-21 11:40+0000\n"
+"Last-Translator: jekader <jekader@gmail.com>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -158,7 +160,7 @@ msgstr "Фильтр входа пользователей"
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action. Example: \"uid=%%uid\""
-msgstr ""
+msgstr "ОпределÑет фильтр Ð´Ð»Ñ Ð¿Ñ€Ð¸Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¸ попытке входа. %%uid заменÑет Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¿Ñ€Ð¸ входе в ÑиÑтему. Ðапример: \"uid=%%uid\""
#: templates/settings.php:55
msgid "User List Filter"
@@ -168,7 +170,7 @@ msgstr "Фильтр ÑпиÑка пользователей"
msgid ""
"Defines the filter to apply, when retrieving users (no placeholders). "
"Example: \"objectClass=person\""
-msgstr ""
+msgstr "ОпределÑет фильтр, иÑпользующийÑÑ Ð¿Ñ€Ð¸ получении пользователей (без подмены переменных). Ðапример: \"objectClass=person\""
#: templates/settings.php:59
msgid "Group Filter"
@@ -178,7 +180,7 @@ msgstr "Фильтр группы"
msgid ""
"Defines the filter to apply, when retrieving groups (no placeholders). "
"Example: \"objectClass=posixGroup\""
-msgstr ""
+msgstr "ОпределÑет фильтр, иÑпользующийÑÑ Ð¿Ñ€Ð¸ получении групп (без подмены переменных). Ðапример: \"objectClass=posixGroup\""
#: templates/settings.php:66
msgid "Connection Settings"
@@ -216,7 +218,7 @@ msgstr "Отключение главного Ñервера"
#: templates/settings.php:72
msgid "Only connect to the replica server."
-msgstr ""
+msgstr "Только подключение к Ñерверу реплик."
#: templates/settings.php:73
msgid "Use TLS"
@@ -239,7 +241,7 @@ msgstr "Отключить проверку Ñертификата SSL."
msgid ""
"Not recommended, use it for testing only! If connection only works with this"
" option, import the LDAP server's SSL certificate in your %s server."
-msgstr ""
+msgstr "Ðе рекомендуетÑÑ, иÑпользуйте только в режиме теÑтированиÑ! ЕÑли Ñоединение работает только Ñ Ñтой опцией, импортируйте на ваш %s Ñервер Ñертификат SSL Ñервера LDAP."
#: templates/settings.php:76
msgid "Cache Time-To-Live"
@@ -259,7 +261,7 @@ msgstr "Поле отображаемого имени пользователÑ"
#: templates/settings.php:80
msgid "The LDAP attribute to use to generate the user's display name."
-msgstr ""
+msgstr "Ðтрибут LDAP, который иÑпользуетÑÑ Ð´Ð»Ñ Ð³ÐµÐ½ÐµÑ€Ð°Ñ†Ð¸Ð¸ отображаемого имени пользователÑ."
#: templates/settings.php:81
msgid "Base User Tree"
@@ -283,7 +285,7 @@ msgstr "Поле отображаемого имени группы"
#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the groups's display name."
-msgstr ""
+msgstr "Ðтрибут LDAP, который иÑпользуетÑÑ Ð´Ð»Ñ Ð³ÐµÐ½ÐµÑ€Ð°Ñ†Ð¸Ð¸ отображаемого имени группы."
#: templates/settings.php:84
msgid "Base Group Tree"
@@ -349,7 +351,7 @@ msgid ""
"behavior as before ownCloud 5 enter the user display name attribute in the "
"following field. Leave it empty for default behavior. Changes will have "
"effect only on newly mapped (added) LDAP users."
-msgstr ""
+msgstr "По-умолчанию внутреннее Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð±ÑƒÐ´ÐµÑ‚ Ñоздано из атрибута UUID. Таким образом Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ ÑтановитÑÑ ÑƒÐ½Ð¸ÐºÐ°Ð»ÑŒÐ½Ñ‹Ð¼ и не требует конвертации Ñимволов. Внутреннее Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¼Ð¾Ð¶ÐµÑ‚ ÑоÑтоÑÑ‚ÑŒ только из Ñледующих Ñимволов: [ a-zA-Z0-9_.@- ]. ОÑтальные Ñимволы замещаютÑÑ ÑоответÑтвиÑми из таблицы ASCII или же проÑто пропуÑкаютÑÑ. При Ñовпадении к имени будет добавлено чиÑло. Внутреннее Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¸ÑпользуетÑÑ Ð´Ð»Ñ Ð²Ð½ÑƒÑ‚Ñ€ÐµÐ½Ð½ÐµÐ¹ идентификации пользователÑ. Также оно ÑвлÑетÑÑ Ð¸Ð¼ÐµÐ½ÐµÐ¼ по-умолчанию Ð´Ð»Ñ Ð¿Ð°Ð¿ÐºÐ¸ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð² ownCloud. Оно также портом Ð´Ð»Ñ ÑƒÐ´Ð°Ð»ÐµÐ½Ð½Ñ‹Ñ… ÑÑылок, к примеру, Ð´Ð»Ñ Ð²Ñех ÑервиÑов *DAV. С помощию данной наÑтройки можно изменить поведение по-умолчанию. Чтобы доÑтичь поведениÑ, как было наÑтроено до изменениÑ, ownCloud 5 выводит атрибут имени Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð² Ñтом поле. ОÑтавьте его пуÑтым Ð´Ð»Ñ Ñ€ÐµÐ¶Ð¸Ð¼Ð° по-умолчанию. Ð˜Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð±ÑƒÐ´ÑƒÑ‚ иметь Ñффект только Ð´Ð»Ñ Ð½Ð¾Ð²Ñ‹Ñ… подключенных (добавленных) пользователей LDAP."
#: templates/settings.php:100
msgid "Internal Username Attribute:"
@@ -368,7 +370,7 @@ msgid ""
"You must make sure that the attribute of your choice can be fetched for both"
" users and groups and it is unique. Leave it empty for default behavior. "
"Changes will have effect only on newly mapped (added) LDAP users and groups."
-msgstr ""
+msgstr "По-умолчанию, ownCloud определÑет атрибут UUID автоматичеÑки. Ðтот атрибут иÑпользуетÑÑ Ð´Ð»Ñ Ñ‚Ð¾Ð³Ð¾, чтобы доÑтоверно индентифицировать пользователей и группы LDAP. Также, на оÑновании атрибута UUID ÑоздаетÑÑ Ð²Ð½ÑƒÑ‚Ñ€ÐµÐ½Ð½ÐµÐµ Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ, еÑли выше не указано иначе. Ð’Ñ‹ можете переопределить Ñту наÑтройку и указать Ñвой атрибут по выбору. Ð’Ñ‹ должны удоÑтоверитьÑÑ, что выбранный вами атрибут может быть выбран Ð´Ð»Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¹ и групп, а также то, что он уникальный. ОÑтавьте поле пуÑтым Ð´Ð»Ñ Ð¿Ð¾Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ð¿Ð¾-умолчанию. Ð˜Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð²ÑтупÑÑ‚ в Ñилу только Ð´Ð»Ñ Ð½Ð¾Ð²Ñ‹Ñ… подключенных (добавленных) пользователей и групп LDAP."
#: templates/settings.php:103
msgid "UUID Attribute:"
@@ -390,7 +392,7 @@ msgid ""
" is not configuration sensitive, it affects all LDAP configurations! Never "
"clear the mappings in a production environment, only in a testing or "
"experimental stage."
-msgstr ""
+msgstr "ownCloud иÑпользует имена пользователей Ð´Ð»Ñ Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð¸ Ð½Ð°Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð¼ÐµÑ‚Ð°Ð´Ð°Ð½Ð½Ñ‹Ñ…. Ð”Ð»Ñ Ñ‚Ð¾Ñ‡Ð½Ð¾Ð¹ идентификации и раÑÐ¿Ð¾Ð·Ð½Ð°Ð²Ð°Ð½Ð¸Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¹, каждый пользователь LDAP будет иметь Ñвое внутреннее Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ. Ðто требует привÑзки имени Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ ownCloud к пользователю LDAP. При Ñоздании Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð½Ð°Ð·Ð½Ð°Ñ‡Ð°ÐµÑ‚ÑÑ Ð¸Ð´ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ‚Ð¾Ñ€Ñƒ UUID Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ LDAP. Помимо Ñтого кешируетÑÑ Ð´Ð¾Ð¼ÐµÐ½Ð½Ð¾Ðµ Ð¸Ð¼Ñ (DN) Ð´Ð»Ñ ÑƒÐ¼ÐµÐ½ÑŒÑˆÐµÐ½Ð¸Ñ Ñ‡Ð¸Ñла обращений к LDAP, однако оно не иÑпользуетÑÑ Ð´Ð»Ñ Ð¸Ð´ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ð¸. ЕÑли доменное Ð¸Ð¼Ñ Ð±Ñ‹Ð»Ð¾ изменено, об Ñтом Ñтанет извеÑтно ownCloud. Внутреннее Ð¸Ð¼Ñ ownCloud иÑпользуетÑÑ Ð¿Ð¾Ð²ÑемеÑтно в ownCloud. ПоÑле ÑброÑа привÑзок в базе могут ÑохранитьÑÑ Ð¾Ñтатки Ñтарой информации. Ð¡Ð±Ñ€Ð¾Ñ Ð¿Ñ€Ð¸Ð²Ñзок не привÑзан к конфигурации, он повлиÑет на вÑе LDAP подключениÑ! Ðи в коем Ñлучае не рекомендуетÑÑ ÑбраÑывать привÑзки еÑли ÑиÑтема уже находитÑÑ Ð² ÑкÑплуатации, только на Ñтапе теÑтированиÑ."
#: templates/settings.php:106
msgid "Clear Username-LDAP User Mapping"
diff --git a/l10n/si_LK/core.po b/l10n/si_LK/core.po
index a83cde1f4e2209b90c578aa0db94d6b4a5a24401..e0d22e9b2b2cf6288a64ea427b6fcd6770674aae 100644
--- a/l10n/si_LK/core.po
+++ b/l10n/si_LK/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:33+0000\n"
+"POT-Creation-Date: 2013-09-22 12:55-0400\n"
+"PO-Revision-Date: 2013-09-20 15:01+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
"MIME-Version: 1.0\n"
@@ -190,55 +190,55 @@ msgstr "දෙසà·à¶¸à·Šà¶¶à¶»à·Š"
msgid "Settings"
msgstr "සිටුවම්"
-#: js/js.js:853
+#: js/js.js:866
msgid "seconds ago"
msgstr "à¶à¶à·Šà¶´à¶»à¶ºà¶±à·Šà¶§ පෙර"
-#: js/js.js:854
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:855
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:856
+#: js/js.js:869
msgid "today"
msgstr "අද"
-#: js/js.js:857
+#: js/js.js:870
msgid "yesterday"
msgstr "ඊයේ"
-#: js/js.js:858
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:859
+#: js/js.js:872
msgid "last month"
msgstr "පෙර මà·à·ƒà¶ºà·š"
-#: js/js.js:860
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:861
+#: js/js.js:874
msgid "months ago"
msgstr "මà·à·ƒ කීපයකට පෙර"
-#: js/js.js:862
+#: js/js.js:875
msgid "last year"
msgstr "පෙර අවුරුද්දේ"
-#: js/js.js:863
+#: js/js.js:876
msgid "years ago"
msgstr "අවුරුදු කීපයකට පෙර"
@@ -266,6 +266,46 @@ msgstr "හරි"
msgid "Error loading message template: {error}"
msgstr ""
+#: js/oc-dialogs.js:347
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:367
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:376
+msgid "Cancel"
+msgstr "එපà·"
+
+#: js/oc-dialogs.js:386
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:457
+msgid "Error loading file exists template"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/si_LK/files.po b/l10n/si_LK/files.po
index 00c7fd92b176f3c08f63e81f34407510ab77fd18..6a62c6c1ea15ed622a37e7932379963fada6d118 100644
--- a/l10n/si_LK/files.po
+++ b/l10n/si_LK/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:00+0000\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
"MIME-Version: 1.0\n"
@@ -74,11 +74,15 @@ msgstr "à¶à·à¶§à·’ගචකිරීම අසà·à¶»à·Šà¶®à¶šà¶ºà·’"
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:109
-msgid "Upload failed"
-msgstr "උඩුගචකිරීම අසà·à¶»à·Šà¶®à¶šà¶ºà·’"
+#: ajax/upload.php:120 ajax/upload.php:143
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:136
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
-#: ajax/upload.php:127
+#: ajax/upload.php:160
msgid "Invalid directory."
msgstr ""
@@ -86,144 +90,148 @@ msgstr ""
msgid "Files"
msgstr "ගොනු"
-#: js/file-upload.js:11
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
+#: js/file-upload.js:244
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr ""
-#: js/file-upload.js:24
+#: js/file-upload.js:255
msgid "Not enough space available"
msgstr ""
-#: js/file-upload.js:64
+#: js/file-upload.js:322
msgid "Upload cancelled."
msgstr "උඩුගචකිරීම අà¶à·Š හරින්න ලදී"
-#: js/file-upload.js:165
+#: js/file-upload.js:356
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:446
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "උඩුගà¶à¶šà·’රීමක් සිදුවේ. පිටුව à·„à·à¶» යà·à¶¸à·™à¶±à·Š එය නà·à·€à¶à·™à¶±à·” ඇà¶"
-#: js/file-upload.js:239
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr "යොමුව හිස් විය නොහà·à¶š"
-#: js/file-upload.js:244 lib/app.php:53
+#: js/file-upload.js:525 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550
+#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545
msgid "Error"
msgstr "දà·à·‚යක්"
-#: js/fileactions.js:116
+#: js/fileactions.js:119
msgid "Share"
msgstr "බෙද෠හද෠ගන්න"
-#: js/fileactions.js:126
+#: js/fileactions.js:131
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:192
+#: js/fileactions.js:197
msgid "Rename"
msgstr "නà·à·€à¶ නම් කරන්න"
-#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr ""
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr ""
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "ප්â€à¶»à¶à·’ස්ථà·à¶´à¶±à¶º කරන්න"
-#: js/filelist.js:307
+#: js/filelist.js:416
msgid "suggest name"
msgstr "නමක් යà·à¶¢à¶±à· කරන්න"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "අà¶à·Š හරින්න"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr ""
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "undo"
msgstr "නිෂ්ප්â€à¶»à¶· කරන්න"
-#: js/filelist.js:424 js/filelist.js:490 js/files.js:581
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:425 js/filelist.js:491 js/files.js:587
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:432
+#: js/filelist.js:541
msgid "{dirs} and {files}"
msgstr ""
-#: js/filelist.js:563
+#: js/filelist.js:731 js/filelist.js:769
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:628
-msgid "files uploading"
-msgstr ""
-
-#: js/files.js:52
+#: js/files.js:25
msgid "'.' is an invalid file name."
msgstr ""
-#: js/files.js:56
+#: js/files.js:29
msgid "File name cannot be empty."
msgstr ""
-#: js/files.js:64
+#: js/files.js:37
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: js/files.js:78
+#: js/files.js:51
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr ""
-#: js/files.js:82
+#: js/files.js:55
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:94
+#: js/files.js:67
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
msgstr ""
-#: js/files.js:245
+#: js/files.js:296
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/files.js:563 templates/index.php:69
+#: js/files.js:507 js/files.js:545
+msgid "Error moving file"
+msgstr ""
+
+#: js/files.js:558 templates/index.php:61
msgid "Name"
msgstr "නම"
-#: js/files.js:564 templates/index.php:81
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "ප්â€à¶»à¶¸à·à¶«à¶º"
-#: js/files.js:565 templates/index.php:83
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr "වෙනස් කළ"
@@ -232,7 +240,7 @@ msgstr "වෙනස් කළ"
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:11 templates/index.php:18
+#: lib/helper.php:11 templates/index.php:17
msgid "Upload"
msgstr "උඩුගචකරන්න"
@@ -268,65 +276,65 @@ msgstr "ZIP ගොනු සඳහ෠දà·à¶¸à·’ය à·„à·à¶šà·’ උපරි
msgid "Save"
msgstr "සුරකින්න"
-#: templates/index.php:7
+#: templates/index.php:6
msgid "New"
msgstr "නව"
-#: templates/index.php:10
+#: templates/index.php:9
msgid "Text file"
msgstr "පෙළ ගොනුව"
-#: templates/index.php:12
+#: templates/index.php:11
msgid "Folder"
msgstr "à·†à·à¶½à·Šà¶©à¶»à¶º"
-#: templates/index.php:14
+#: templates/index.php:13
msgid "From link"
msgstr "යොමුවෙන්"
-#: templates/index.php:41
+#: templates/index.php:33
msgid "Deleted files"
msgstr ""
-#: templates/index.php:46
+#: templates/index.php:39
msgid "Cancel upload"
msgstr "උඩුගචකිරීම අà¶à·Š හරින්න"
-#: templates/index.php:52
+#: templates/index.php:45
msgid "You don’t have write permissions here."
msgstr ""
-#: templates/index.php:59
+#: templates/index.php:50
msgid "Nothing in here. Upload something!"
msgstr "මෙහි කිසිවක් නොමà·à¶. යමක් උඩුගචකරන්න"
-#: templates/index.php:75
+#: templates/index.php:67
msgid "Download"
msgstr "බà·à¶±à·Šà¶±"
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr "නොබෙදු"
-#: templates/index.php:94 templates/index.php:95
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "මක෠දමන්න"
-#: templates/index.php:108
+#: templates/index.php:100
msgid "Upload too large"
msgstr "උඩුගචකිරීම විà·à·à¶½ à·€à·à¶©à·’ය"
-#: templates/index.php:110
+#: templates/index.php:102
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "ඔබ උඩුගචකිරීමට à¶à·à¶à·Š කරන ගොනු මෙම සේවà·à¶¯à·à¶ºà¶šà¶ºà· උඩුගචකිරීමට ඉඩදී ඇà¶à·’ උපරිම ගොනු විà·à·à¶½à¶à·Šà·€à¶ºà¶§ වඩ෠වà·à¶©à·’ය"
-#: templates/index.php:115
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr "ගොනු පරික්ෂ෠කෙරේ. මඳක් රà·à¶³à·“ සිටින්න"
-#: templates/index.php:118
+#: templates/index.php:110
msgid "Current scanning"
msgstr "වර්à¶à¶¸à·à¶± පරික්ෂà·à·€"
diff --git a/l10n/si_LK/settings.po b/l10n/si_LK/settings.po
index b5b546155828587c9517aef69875e6ddedd02df0..dede6a46ee8292ccf7925461e7917604c08a6515 100644
--- a/l10n/si_LK/settings.po
+++ b/l10n/si_LK/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:45-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
"MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgid "Unable to load list from App Store"
msgstr ""
#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
-#: ajax/togglegroups.php:20
+#: ajax/togglegroups.php:20 changepassword/controller.php:55
msgid "Authentication error"
msgstr "à·ƒà¶à·Šâ€à¶ºà·à¶´à¶± දà·à·‚යක්"
@@ -84,6 +84,35 @@ msgstr "පරිà·à·“ලකය෠%s කණ්ඩà·à¶ºà¶¸à·’න් ඉවà¶
msgid "Couldn't update app."
msgstr ""
+#: changepassword/controller.php:20
+msgid "Wrong password"
+msgstr ""
+
+#: changepassword/controller.php:42
+msgid "No user supplied"
+msgstr ""
+
+#: changepassword/controller.php:74
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr ""
+
+#: changepassword/controller.php:79
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr ""
+
+#: changepassword/controller.php:87
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr ""
+
+#: changepassword/controller.php:92 changepassword/controller.php:103
+msgid "Unable to change password"
+msgstr ""
+
#: js/apps.js:43
msgid "Update to {appversion}"
msgstr ""
@@ -128,15 +157,15 @@ msgstr "යà·à·€à¶à·Šà¶šà·à¶½ කිරීම"
msgid "Updated"
msgstr ""
-#: js/personal.js:217
+#: js/personal.js:220
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:262
+#: js/personal.js:265
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:284
+#: js/personal.js:287
msgid "Saving..."
msgstr "සුරà·à¶šà·™à¶¸à·’න් පවà¶à·“..."
diff --git a/l10n/sk/core.po b/l10n/sk/core.po
index 0d0fc7e389df4f467d9515af345f785bedfab82d..6970d1b3c74273abe9b4b1370d8233a9c5f13edf 100644
--- a/l10n/sk/core.po
+++ b/l10n/sk/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:33+0000\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
"MIME-Version: 1.0\n"
@@ -190,59 +190,59 @@ msgstr ""
msgid "Settings"
msgstr ""
-#: js/js.js:853
+#: js/js.js:866
msgid "seconds ago"
msgstr ""
-#: js/js.js:854
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:855
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:856
+#: js/js.js:869
msgid "today"
msgstr ""
-#: js/js.js:857
+#: js/js.js:870
msgid "yesterday"
msgstr ""
-#: js/js.js:858
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:859
+#: js/js.js:872
msgid "last month"
msgstr ""
-#: js/js.js:860
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:861
+#: js/js.js:874
msgid "months ago"
msgstr ""
-#: js/js.js:862
+#: js/js.js:875
msgid "last year"
msgstr ""
-#: js/js.js:863
+#: js/js.js:876
msgid "years ago"
msgstr ""
@@ -270,6 +270,47 @@ msgstr ""
msgid "Error loading message template: {error}"
msgstr ""
+#: js/oc-dialogs.js:347
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:367
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:376
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:386
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:457
+msgid "Error loading file exists template"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/sk/files.po b/l10n/sk/files.po
index 17be34bd16c359e1460d9a5915a6fff4b2ef7d05..070448f726fb24af4565a68843d66b0694be98d1 100644
--- a/l10n/sk/files.po
+++ b/l10n/sk/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-30 09:31-0400\n"
-"PO-Revision-Date: 2013-08-30 13:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
"MIME-Version: 1.0\n"
@@ -74,11 +74,15 @@ msgstr ""
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:109
-msgid "Upload failed"
+#: ajax/upload.php:120 ajax/upload.php:143
+msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:127
+#: ajax/upload.php:136
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
+
+#: ajax/upload.php:160
msgid "Invalid directory."
msgstr ""
@@ -86,147 +90,151 @@ msgstr ""
msgid "Files"
msgstr ""
-#: js/file-upload.js:11
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
+#: js/file-upload.js:244
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr ""
-#: js/file-upload.js:24
+#: js/file-upload.js:255
msgid "Not enough space available"
msgstr ""
-#: js/file-upload.js:64
+#: js/file-upload.js:322
msgid "Upload cancelled."
msgstr ""
-#: js/file-upload.js:165
+#: js/file-upload.js:356
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:446
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/file-upload.js:239
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr ""
-#: js/file-upload.js:244 lib/app.php:53
+#: js/file-upload.js:525 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
+#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545
msgid "Error"
msgstr ""
-#: js/fileactions.js:116
+#: js/fileactions.js:119
msgid "Share"
msgstr ""
-#: js/fileactions.js:126
+#: js/fileactions.js:131
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:192
+#: js/fileactions.js:197
msgid "Rename"
msgstr ""
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr ""
-#: js/filelist.js:305 js/filelist.js:307
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr ""
-#: js/filelist.js:305 js/filelist.js:307
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr ""
-#: js/filelist.js:305
+#: js/filelist.js:416
msgid "suggest name"
msgstr ""
-#: js/filelist.js:305 js/filelist.js:307
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr ""
-#: js/filelist.js:352
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr ""
-#: js/filelist.js:352
+#: js/filelist.js:463
msgid "undo"
msgstr ""
-#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/filelist.js:430
+#: js/filelist.js:541
msgid "{dirs} and {files}"
msgstr ""
-#: js/filelist.js:561
+#: js/filelist.js:731 js/filelist.js:769
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/filelist.js:626
-msgid "files uploading"
-msgstr ""
-
-#: js/files.js:52
+#: js/files.js:25
msgid "'.' is an invalid file name."
msgstr ""
-#: js/files.js:56
+#: js/files.js:29
msgid "File name cannot be empty."
msgstr ""
-#: js/files.js:64
+#: js/files.js:37
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: js/files.js:78
+#: js/files.js:51
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr ""
-#: js/files.js:82
+#: js/files.js:55
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:94
+#: js/files.js:67
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
msgstr ""
-#: js/files.js:245
+#: js/files.js:296
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/files.js:562 templates/index.php:67
+#: js/files.js:507 js/files.js:545
+msgid "Error moving file"
+msgstr ""
+
+#: js/files.js:558 templates/index.php:61
msgid "Name"
msgstr ""
-#: js/files.js:563 templates/index.php:78
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr ""
-#: js/files.js:564 templates/index.php:80
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr ""
@@ -235,7 +243,7 @@ msgstr ""
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:11 templates/index.php:18
+#: lib/helper.php:11 templates/index.php:17
msgid "Upload"
msgstr ""
@@ -271,65 +279,65 @@ msgstr ""
msgid "Save"
msgstr ""
-#: templates/index.php:7
+#: templates/index.php:6
msgid "New"
msgstr ""
-#: templates/index.php:10
+#: templates/index.php:9
msgid "Text file"
msgstr ""
-#: templates/index.php:12
+#: templates/index.php:11
msgid "Folder"
msgstr ""
-#: templates/index.php:14
+#: templates/index.php:13
msgid "From link"
msgstr ""
-#: templates/index.php:41
+#: templates/index.php:33
msgid "Deleted files"
msgstr ""
-#: templates/index.php:46
+#: templates/index.php:39
msgid "Cancel upload"
msgstr ""
-#: templates/index.php:52
+#: templates/index.php:45
msgid "You don’t have write permissions here."
msgstr ""
-#: templates/index.php:59
+#: templates/index.php:50
msgid "Nothing in here. Upload something!"
msgstr ""
-#: templates/index.php:73
+#: templates/index.php:67
msgid "Download"
msgstr ""
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr ""
-#: templates/index.php:91 templates/index.php:92
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr ""
-#: templates/index.php:105
+#: templates/index.php:100
msgid "Upload too large"
msgstr ""
-#: templates/index.php:107
+#: templates/index.php:102
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: templates/index.php:112
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:115
+#: templates/index.php:110
msgid "Current scanning"
msgstr ""
diff --git a/l10n/sk/settings.po b/l10n/sk/settings.po
index f3a3428961177913e48365a13897849d2de2f59c..864614817b2d36ad5034c7da4b8a209471f9d7f2 100644
--- a/l10n/sk/settings.po
+++ b/l10n/sk/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:45-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
"MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgid "Unable to load list from App Store"
msgstr ""
#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
-#: ajax/togglegroups.php:20
+#: ajax/togglegroups.php:20 changepassword/controller.php:55
msgid "Authentication error"
msgstr ""
@@ -84,6 +84,35 @@ msgstr ""
msgid "Couldn't update app."
msgstr ""
+#: changepassword/controller.php:20
+msgid "Wrong password"
+msgstr ""
+
+#: changepassword/controller.php:42
+msgid "No user supplied"
+msgstr ""
+
+#: changepassword/controller.php:74
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr ""
+
+#: changepassword/controller.php:79
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr ""
+
+#: changepassword/controller.php:87
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr ""
+
+#: changepassword/controller.php:92 changepassword/controller.php:103
+msgid "Unable to change password"
+msgstr ""
+
#: js/apps.js:43
msgid "Update to {appversion}"
msgstr ""
@@ -128,15 +157,15 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:217
+#: js/personal.js:220
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:262
+#: js/personal.js:265
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:284
+#: js/personal.js:287
msgid "Saving..."
msgstr ""
diff --git a/l10n/sk_SK/core.po b/l10n/sk_SK/core.po
index d1abe24db2da5d9b964c843ddfa942984179cdf2..7c9758b4cc8ad3929153bfbf60a2aa839594f321 100644
--- a/l10n/sk_SK/core.po
+++ b/l10n/sk_SK/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:33+0000\n"
+"POT-Creation-Date: 2013-09-22 12:55-0400\n"
+"PO-Revision-Date: 2013-09-20 15:01+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
@@ -192,59 +192,59 @@ msgstr "December"
msgid "Settings"
msgstr "Nastavenia"
-#: js/js.js:853
+#: js/js.js:866
msgid "seconds ago"
msgstr "pred sekundami"
-#: js/js.js:854
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "pred %n minútou"
msgstr[1] "pred %n minútami"
msgstr[2] "pred %n minútami"
-#: js/js.js:855
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "pred %n hodinou"
msgstr[1] "pred %n hodinami"
msgstr[2] "pred %n hodinami"
-#: js/js.js:856
+#: js/js.js:869
msgid "today"
msgstr "dnes"
-#: js/js.js:857
+#: js/js.js:870
msgid "yesterday"
msgstr "vÄera"
-#: js/js.js:858
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "pred %n dňom"
msgstr[1] "pred %n dňami"
msgstr[2] "pred %n dňami"
-#: js/js.js:859
+#: js/js.js:872
msgid "last month"
msgstr "minulý mesiac"
-#: js/js.js:860
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "pred %n mesiacom"
msgstr[1] "pred %n mesiacmi"
msgstr[2] "pred %n mesiacmi"
-#: js/js.js:861
+#: js/js.js:874
msgid "months ago"
msgstr "pred mesiacmi"
-#: js/js.js:862
+#: js/js.js:875
msgid "last year"
msgstr "minulý rok"
-#: js/js.js:863
+#: js/js.js:876
msgid "years ago"
msgstr "pred rokmi"
@@ -272,6 +272,47 @@ msgstr "Ok"
msgid "Error loading message template: {error}"
msgstr ""
+#: js/oc-dialogs.js:347
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:367
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:376
+msgid "Cancel"
+msgstr "Zrušiť"
+
+#: js/oc-dialogs.js:386
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:457
+msgid "Error loading file exists template"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/sk_SK/files.po b/l10n/sk_SK/files.po
index 13b2c321e869f721d9ebf7d84587a54871fcc791..fd554f6c97366575ffb8806c1a6daa3688748451 100644
--- a/l10n/sk_SK/files.po
+++ b/l10n/sk_SK/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:00+0000\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
@@ -75,11 +75,15 @@ msgstr "Zápis na disk sa nepodaril"
msgid "Not enough storage available"
msgstr "Nedostatok dostupného úložného priestoru"
-#: ajax/upload.php:109
-msgid "Upload failed"
-msgstr "Odoslanie bolo neúspešné"
+#: ajax/upload.php:120 ajax/upload.php:143
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:136
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
-#: ajax/upload.php:127
+#: ajax/upload.php:160
msgid "Invalid directory."
msgstr "Neplatný prieÄinok."
@@ -87,147 +91,151 @@ msgstr "Neplatný prieÄinok."
msgid "Files"
msgstr "Súbory"
-#: js/file-upload.js:11
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Nedá sa odoslaÅ¥ Váš súbor, pretože je to prieÄinok, alebo je jeho veľkosÅ¥ 0 bajtov"
+#: js/file-upload.js:244
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
+msgstr ""
-#: js/file-upload.js:24
+#: js/file-upload.js:255
msgid "Not enough space available"
msgstr "Nie je k dispozÃcii dostatok miesta"
-#: js/file-upload.js:64
+#: js/file-upload.js:322
msgid "Upload cancelled."
msgstr "Odosielanie zrušené."
-#: js/file-upload.js:165
+#: js/file-upload.js:356
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:446
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Opustenie stránky zrušà práve prebiehajúce odosielanie súboru."
-#: js/file-upload.js:239
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr "URL nemôže byť prázdne."
-#: js/file-upload.js:244 lib/app.php:53
+#: js/file-upload.js:525 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr "Neplatný názov prieÄinka. Názov \"Shared\" je rezervovaný pre ownCloud"
-#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550
+#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545
msgid "Error"
msgstr "Chyba"
-#: js/fileactions.js:116
+#: js/fileactions.js:119
msgid "Share"
msgstr "Zdieľať"
-#: js/fileactions.js:126
+#: js/fileactions.js:131
msgid "Delete permanently"
msgstr "Zmazať trvalo"
-#: js/fileactions.js:192
+#: js/fileactions.js:197
msgid "Rename"
msgstr "Premenovať"
-#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "Prebieha"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{new_name} už existuje"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "nahradiť"
-#: js/filelist.js:307
+#: js/filelist.js:416
msgid "suggest name"
msgstr "pomôcť s menom"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "zrušiť"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr "prepÃsaný {new_name} súborom {old_name}"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "undo"
msgstr "vrátiť"
-#: js/filelist.js:424 js/filelist.js:490 js/files.js:581
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "%n prieÄinok"
msgstr[1] "%n prieÄinky"
msgstr[2] "%n prieÄinkov"
-#: js/filelist.js:425 js/filelist.js:491 js/files.js:587
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "%n súbor"
msgstr[1] "%n súbory"
msgstr[2] "%n súborov"
-#: js/filelist.js:432
+#: js/filelist.js:541
msgid "{dirs} and {files}"
msgstr ""
-#: js/filelist.js:563
+#: js/filelist.js:731 js/filelist.js:769
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "Nahrávam %n súbor"
msgstr[1] "Nahrávam %n súbory"
msgstr[2] "Nahrávam %n súborov"
-#: js/filelist.js:628
-msgid "files uploading"
-msgstr "nahrávanie súborov"
-
-#: js/files.js:52
+#: js/files.js:25
msgid "'.' is an invalid file name."
msgstr "'.' je neplatné meno súboru."
-#: js/files.js:56
+#: js/files.js:29
msgid "File name cannot be empty."
msgstr "Meno súboru nemôže byť prázdne"
-#: js/files.js:64
+#: js/files.js:37
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Nesprávne meno, '\\', '/', '<', '>', ':', '\"', '|', '?' a '*' nie sú povolené hodnoty."
-#: js/files.js:78
+#: js/files.js:51
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr "Vaše úložisko je plné. Súbory nemožno aktualizovať ani synchronizovať!"
-#: js/files.js:82
+#: js/files.js:55
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Vaše úložisko je takmer plné ({usedSpacePercent}%)"
-#: js/files.js:94
+#: js/files.js:67
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
msgstr "Å ifrovanie bolo zakázané, ale vaÅ¡e súbory sú stále zaÅ¡ifrované. ProsÃm, choÄte do osobného nastavenia pre deÅ¡ifrovanie súborov."
-#: js/files.js:245
+#: js/files.js:296
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "VaÅ¡e sÅ¥ahovanie sa pripravuje. Ak sú sÅ¥ahované súbory veľké, môže to chvÃľu trvaÅ¥."
-#: js/files.js:563 templates/index.php:69
+#: js/files.js:507 js/files.js:545
+msgid "Error moving file"
+msgstr ""
+
+#: js/files.js:558 templates/index.php:61
msgid "Name"
msgstr "Názov"
-#: js/files.js:564 templates/index.php:81
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "Veľkosť"
-#: js/files.js:565 templates/index.php:83
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr "Upravené"
@@ -236,7 +244,7 @@ msgstr "Upravené"
msgid "%s could not be renamed"
msgstr "%s nemohol byť premenovaný"
-#: lib/helper.php:11 templates/index.php:18
+#: lib/helper.php:11 templates/index.php:17
msgid "Upload"
msgstr "Odoslať"
@@ -272,65 +280,65 @@ msgstr "NajväÄÅ¡ia veľkosÅ¥ ZIP súborov"
msgid "Save"
msgstr "Uložiť"
-#: templates/index.php:7
+#: templates/index.php:6
msgid "New"
msgstr "Nová"
-#: templates/index.php:10
+#: templates/index.php:9
msgid "Text file"
msgstr "Textový súbor"
-#: templates/index.php:12
+#: templates/index.php:11
msgid "Folder"
msgstr "PrieÄinok"
-#: templates/index.php:14
+#: templates/index.php:13
msgid "From link"
msgstr "Z odkazu"
-#: templates/index.php:41
+#: templates/index.php:33
msgid "Deleted files"
msgstr "Zmazané súbory"
-#: templates/index.php:46
+#: templates/index.php:39
msgid "Cancel upload"
msgstr "Zrušiť odosielanie"
-#: templates/index.php:52
+#: templates/index.php:45
msgid "You don’t have write permissions here."
msgstr "Nemáte oprávnenie na zápis."
-#: templates/index.php:59
+#: templates/index.php:50
msgid "Nothing in here. Upload something!"
msgstr "Žiadny súbor. Nahrajte nieÄo!"
-#: templates/index.php:75
+#: templates/index.php:67
msgid "Download"
msgstr "SÅ¥ahovanie"
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr "Zrušiť zdieľanie"
-#: templates/index.php:94 templates/index.php:95
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "Zmazať"
-#: templates/index.php:108
+#: templates/index.php:100
msgid "Upload too large"
msgstr "Nahrávanie je prÃliÅ¡ veľké"
-#: templates/index.php:110
+#: templates/index.php:102
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Súbory, ktoré sa snažÃte nahraÅ¥, presahujú maximálnu veľkosÅ¥ pre nahratie súborov na tento server."
-#: templates/index.php:115
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr "Čakajte, súbory sú prehľadávané."
-#: templates/index.php:118
+#: templates/index.php:110
msgid "Current scanning"
msgstr "Práve prezerané"
diff --git a/l10n/sk_SK/settings.po b/l10n/sk_SK/settings.po
index 5417b89d08b57e651e5e01a6e1f1213228777ff9..961d19a242b52b4679a126964a6ed9326713bbd5 100644
--- a/l10n/sk_SK/settings.po
+++ b/l10n/sk_SK/settings.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:45-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
@@ -24,7 +24,7 @@ msgid "Unable to load list from App Store"
msgstr "Nie je možné nahrať zoznam z App Store"
#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
-#: ajax/togglegroups.php:20
+#: ajax/togglegroups.php:20 changepassword/controller.php:55
msgid "Authentication error"
msgstr "Chyba autentifikácie"
@@ -86,6 +86,35 @@ msgstr "Nie je možné odstrániÅ¥ použÃvateľa zo skupiny %s"
msgid "Couldn't update app."
msgstr "Nemožno aktualizovať aplikáciu."
+#: changepassword/controller.php:20
+msgid "Wrong password"
+msgstr ""
+
+#: changepassword/controller.php:42
+msgid "No user supplied"
+msgstr ""
+
+#: changepassword/controller.php:74
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr ""
+
+#: changepassword/controller.php:79
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr ""
+
+#: changepassword/controller.php:87
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr ""
+
+#: changepassword/controller.php:92 changepassword/controller.php:103
+msgid "Unable to change password"
+msgstr ""
+
#: js/apps.js:43
msgid "Update to {appversion}"
msgstr "Aktualizovať na {appversion}"
@@ -130,15 +159,15 @@ msgstr "Aktualizovať"
msgid "Updated"
msgstr "Aktualizované"
-#: js/personal.js:217
+#: js/personal.js:220
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:262
+#: js/personal.js:265
msgid "Decrypting files... Please wait, this can take some time."
msgstr "DeÅ¡ifrujem súbory ... PoÄkajte prosÃm, môže to chvÃľu trvaÅ¥."
-#: js/personal.js:284
+#: js/personal.js:287
msgid "Saving..."
msgstr "Ukladám..."
@@ -462,7 +491,7 @@ msgstr "Vyplňte emailovú adresu pre aktivovanie obnovy hesla"
#: templates/personal.php:86
msgid "Profile picture"
-msgstr ""
+msgstr "Profilová fotka"
#: templates/personal.php:90
msgid "Upload new"
diff --git a/l10n/sl/core.po b/l10n/sl/core.po
index 5df1c0fa5c19e36988ba89e5e59102569b2b2849..57c093c4eeb08b4dff00b62e19d3ed3e5394bfe4 100644
--- a/l10n/sl/core.po
+++ b/l10n/sl/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:33+0000\n"
+"POT-Creation-Date: 2013-09-22 12:55-0400\n"
+"PO-Revision-Date: 2013-09-20 15:01+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
@@ -192,11 +192,11 @@ msgstr "december"
msgid "Settings"
msgstr "Nastavitve"
-#: js/js.js:853
+#: js/js.js:866
msgid "seconds ago"
msgstr "pred nekaj sekundami"
-#: js/js.js:854
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
@@ -204,7 +204,7 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: js/js.js:855
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
@@ -212,15 +212,15 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: js/js.js:856
+#: js/js.js:869
msgid "today"
msgstr "danes"
-#: js/js.js:857
+#: js/js.js:870
msgid "yesterday"
msgstr "vÄeraj"
-#: js/js.js:858
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
@@ -228,11 +228,11 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: js/js.js:859
+#: js/js.js:872
msgid "last month"
msgstr "zadnji mesec"
-#: js/js.js:860
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
@@ -240,15 +240,15 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: js/js.js:861
+#: js/js.js:874
msgid "months ago"
msgstr "mesecev nazaj"
-#: js/js.js:862
+#: js/js.js:875
msgid "last year"
msgstr "lansko leto"
-#: js/js.js:863
+#: js/js.js:876
msgid "years ago"
msgstr "let nazaj"
@@ -276,6 +276,48 @@ msgstr "V redu"
msgid "Error loading message template: {error}"
msgstr ""
+#: js/oc-dialogs.js:347
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:367
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:376
+msgid "Cancel"
+msgstr "PrekliÄi"
+
+#: js/oc-dialogs.js:386
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:457
+msgid "Error loading file exists template"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/sl/files.po b/l10n/sl/files.po
index 6b461d6107b5fa1867783e411b86235affd14dcc..d8dee234cc0a94bce12cc9c01cf206764e3caf89 100644
--- a/l10n/sl/files.po
+++ b/l10n/sl/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:00+0000\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
@@ -75,11 +75,15 @@ msgstr "Pisanje na disk je spodletelo"
msgid "Not enough storage available"
msgstr "Na voljo ni dovolj prostora"
-#: ajax/upload.php:109
-msgid "Upload failed"
-msgstr "Pošiljanje je spodletelo"
+#: ajax/upload.php:120 ajax/upload.php:143
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:136
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
-#: ajax/upload.php:127
+#: ajax/upload.php:160
msgid "Invalid directory."
msgstr "Neveljavna mapa."
@@ -87,76 +91,80 @@ msgstr "Neveljavna mapa."
msgid "Files"
msgstr "Datoteke"
-#: js/file-upload.js:11
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "PoÅ¡iljanja ni mogoÄe izvesti, saj gre za mapo oziroma datoteko velikosti 0 bajtov."
+#: js/file-upload.js:244
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
+msgstr ""
-#: js/file-upload.js:24
+#: js/file-upload.js:255
msgid "Not enough space available"
msgstr "Na voljo ni dovolj prostora."
-#: js/file-upload.js:64
+#: js/file-upload.js:322
msgid "Upload cancelled."
msgstr "Pošiljanje je preklicano."
-#: js/file-upload.js:165
+#: js/file-upload.js:356
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:446
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "V teku je pošiljanje datoteke. Če zapustite to stran zdaj, bo pošiljanje preklicano."
-#: js/file-upload.js:239
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr "Naslov URL ne sme biti prazna vrednost."
-#: js/file-upload.js:244 lib/app.php:53
+#: js/file-upload.js:525 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr "Ime mape je neveljavno. Uporaba oznake \"Souporaba\" je rezervirana za ownCloud"
-#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550
+#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545
msgid "Error"
msgstr "Napaka"
-#: js/fileactions.js:116
+#: js/fileactions.js:119
msgid "Share"
msgstr "Souporaba"
-#: js/fileactions.js:126
+#: js/fileactions.js:131
msgid "Delete permanently"
msgstr "IzbriÅ¡i dokonÄno"
-#: js/fileactions.js:192
+#: js/fileactions.js:197
msgid "Rename"
msgstr "Preimenuj"
-#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "V Äakanju ..."
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{new_name} že obstaja"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "zamenjaj"
-#: js/filelist.js:307
+#: js/filelist.js:416
msgid "suggest name"
msgstr "predlagaj ime"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "prekliÄi"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr "preimenovano ime {new_name} z imenom {old_name}"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "undo"
msgstr "razveljavi"
-#: js/filelist.js:424 js/filelist.js:490 js/files.js:581
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
@@ -164,7 +172,7 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: js/filelist.js:425 js/filelist.js:491 js/files.js:587
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
@@ -172,11 +180,11 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: js/filelist.js:432
+#: js/filelist.js:541
msgid "{dirs} and {files}"
msgstr ""
-#: js/filelist.js:563
+#: js/filelist.js:731 js/filelist.js:769
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
@@ -184,53 +192,53 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: js/filelist.js:628
-msgid "files uploading"
-msgstr "poteka pošiljanje datotek"
-
-#: js/files.js:52
+#: js/files.js:25
msgid "'.' is an invalid file name."
msgstr "'.' je neveljavno ime datoteke."
-#: js/files.js:56
+#: js/files.js:29
msgid "File name cannot be empty."
msgstr "Ime datoteke ne sme biti prazno polje."
-#: js/files.js:64
+#: js/files.js:37
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Neveljavno ime, znaki '\\', '/', '<', '>', ':', '\"', '|', '?' in '*' niso dovoljeni."
-#: js/files.js:78
+#: js/files.js:51
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr "Shramba je povsem napolnjena. Datotek ni veÄ mogoÄe posodabljati in usklajevati!"
-#: js/files.js:82
+#: js/files.js:55
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Mesto za shranjevanje je skoraj polno ({usedSpacePercent}%)"
-#: js/files.js:94
+#: js/files.js:67
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
msgstr ""
-#: js/files.js:245
+#: js/files.js:296
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "Postopek priprave datoteke za prejem je lahko dolgotrajen, Äe je datoteka zelo velika."
-#: js/files.js:563 templates/index.php:69
+#: js/files.js:507 js/files.js:545
+msgid "Error moving file"
+msgstr ""
+
+#: js/files.js:558 templates/index.php:61
msgid "Name"
msgstr "Ime"
-#: js/files.js:564 templates/index.php:81
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "Velikost"
-#: js/files.js:565 templates/index.php:83
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr "Spremenjeno"
@@ -239,7 +247,7 @@ msgstr "Spremenjeno"
msgid "%s could not be renamed"
msgstr "%s ni bilo mogoÄe preimenovati"
-#: lib/helper.php:11 templates/index.php:18
+#: lib/helper.php:11 templates/index.php:17
msgid "Upload"
msgstr "Pošlji"
@@ -275,65 +283,65 @@ msgstr "NajveÄja vhodna velikost za datoteke ZIP"
msgid "Save"
msgstr "Shrani"
-#: templates/index.php:7
+#: templates/index.php:6
msgid "New"
msgstr "Novo"
-#: templates/index.php:10
+#: templates/index.php:9
msgid "Text file"
msgstr "Besedilna datoteka"
-#: templates/index.php:12
+#: templates/index.php:11
msgid "Folder"
msgstr "Mapa"
-#: templates/index.php:14
+#: templates/index.php:13
msgid "From link"
msgstr "Iz povezave"
-#: templates/index.php:41
+#: templates/index.php:33
msgid "Deleted files"
msgstr "Izbrisane datoteke"
-#: templates/index.php:46
+#: templates/index.php:39
msgid "Cancel upload"
msgstr "PrekliÄi poÅ¡iljanje"
-#: templates/index.php:52
+#: templates/index.php:45
msgid "You don’t have write permissions here."
msgstr "Za to mesto ni ustreznih dovoljenj za pisanje."
-#: templates/index.php:59
+#: templates/index.php:50
msgid "Nothing in here. Upload something!"
msgstr "Tukaj Å¡e ni niÄesar. Najprej je treba kakÅ¡no datoteko poslati v oblak!"
-#: templates/index.php:75
+#: templates/index.php:67
msgid "Download"
msgstr "Prejmi"
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr "PrekliÄi souporabo"
-#: templates/index.php:94 templates/index.php:95
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "Izbriši"
-#: templates/index.php:108
+#: templates/index.php:100
msgid "Upload too large"
msgstr "PrekoraÄenje omejitve velikosti"
-#: templates/index.php:110
+#: templates/index.php:102
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Datoteke, ki jih želite poslati, presegajo najveÄjo dovoljeno velikost na strežniku."
-#: templates/index.php:115
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr "Poteka preuÄevanje datotek, poÄakajte ..."
-#: templates/index.php:118
+#: templates/index.php:110
msgid "Current scanning"
msgstr "Trenutno poteka preuÄevanje"
diff --git a/l10n/sl/settings.po b/l10n/sl/settings.po
index c9e719828cf462ff05605f386da508b15d24755c..dd0437a4bdd3f86fa69b950999ffb6990e6ad4ad 100644
--- a/l10n/sl/settings.po
+++ b/l10n/sl/settings.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:45-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
@@ -24,7 +24,7 @@ msgid "Unable to load list from App Store"
msgstr "Ni mogoÄe naložiti seznama iz programskega srediÅ¡Äa"
#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
-#: ajax/togglegroups.php:20
+#: ajax/togglegroups.php:20 changepassword/controller.php:55
msgid "Authentication error"
msgstr "Napaka med overjanjem"
@@ -86,6 +86,35 @@ msgstr "Uporabnika ni mogoÄe odstraniti iz skupine %s"
msgid "Couldn't update app."
msgstr "Programa ni mogoÄe posodobiti."
+#: changepassword/controller.php:20
+msgid "Wrong password"
+msgstr ""
+
+#: changepassword/controller.php:42
+msgid "No user supplied"
+msgstr ""
+
+#: changepassword/controller.php:74
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr ""
+
+#: changepassword/controller.php:79
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr ""
+
+#: changepassword/controller.php:87
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr ""
+
+#: changepassword/controller.php:92 changepassword/controller.php:103
+msgid "Unable to change password"
+msgstr ""
+
#: js/apps.js:43
msgid "Update to {appversion}"
msgstr "Posodobi na {appversion}"
@@ -130,15 +159,15 @@ msgstr "Posodobi"
msgid "Updated"
msgstr "Posodobljeno"
-#: js/personal.js:217
+#: js/personal.js:220
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:262
+#: js/personal.js:265
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:284
+#: js/personal.js:287
msgid "Saving..."
msgstr "Poteka shranjevanje ..."
@@ -462,7 +491,7 @@ msgstr "VpiÅ¡ite osebni elektronski naslov in s tem omogoÄite obnovitev gesla"
#: templates/personal.php:86
msgid "Profile picture"
-msgstr ""
+msgstr "Slika profila"
#: templates/personal.php:90
msgid "Upload new"
diff --git a/l10n/sq/core.po b/l10n/sq/core.po
index d87486309e3f7a7f6f5e53bab5dbfc06e6dc94d9..c2395b2d0be052ca57a50b42b1c193fbb407dcc2 100644
--- a/l10n/sq/core.po
+++ b/l10n/sq/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:33+0000\n"
+"POT-Creation-Date: 2013-09-22 12:55-0400\n"
+"PO-Revision-Date: 2013-09-20 15:01+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
"MIME-Version: 1.0\n"
@@ -192,55 +192,55 @@ msgstr "Dhjetor"
msgid "Settings"
msgstr "Parametra"
-#: js/js.js:853
+#: js/js.js:866
msgid "seconds ago"
msgstr "sekonda më parë"
-#: js/js.js:854
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n minut më parë"
msgstr[1] "%n minuta më parë"
-#: js/js.js:855
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n orë më parë"
msgstr[1] "%n orë më parë"
-#: js/js.js:856
+#: js/js.js:869
msgid "today"
msgstr "sot"
-#: js/js.js:857
+#: js/js.js:870
msgid "yesterday"
msgstr "dje"
-#: js/js.js:858
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n ditë më parë"
msgstr[1] "%n ditë më parë"
-#: js/js.js:859
+#: js/js.js:872
msgid "last month"
msgstr "muajin e shkuar"
-#: js/js.js:860
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n muaj më parë"
msgstr[1] "%n muaj më parë"
-#: js/js.js:861
+#: js/js.js:874
msgid "months ago"
msgstr "muaj më parë"
-#: js/js.js:862
+#: js/js.js:875
msgid "last year"
msgstr "vitin e shkuar"
-#: js/js.js:863
+#: js/js.js:876
msgid "years ago"
msgstr "vite më parë"
@@ -268,6 +268,46 @@ msgstr "Në rregull"
msgid "Error loading message template: {error}"
msgstr ""
+#: js/oc-dialogs.js:347
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:367
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:376
+msgid "Cancel"
+msgstr "Anulo"
+
+#: js/oc-dialogs.js:386
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:457
+msgid "Error loading file exists template"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/sq/files.po b/l10n/sq/files.po
index 3bf0e4962c0823e69fd09c8489f5029c0e2fb5ec..a5b9a669e2950e3b88cf92508e47d9a15938f916 100644
--- a/l10n/sq/files.po
+++ b/l10n/sq/files.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:00+0000\n"
-"Last-Translator: Odeen <rapid_odeen@zoho.com>\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -75,11 +75,15 @@ msgstr "Ruajtja në disk dështoi"
msgid "Not enough storage available"
msgstr "Nuk ka mbetur hapësirë memorizimi e mjaftueshme"
-#: ajax/upload.php:109
-msgid "Upload failed"
-msgstr "Ngarkimi dështoi"
+#: ajax/upload.php:120 ajax/upload.php:143
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:136
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
-#: ajax/upload.php:127
+#: ajax/upload.php:160
msgid "Invalid directory."
msgstr "Dosje e pavlefshme."
@@ -87,144 +91,148 @@ msgstr "Dosje e pavlefshme."
msgid "Files"
msgstr "Skedarët"
-#: js/file-upload.js:11
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Nuk është i mundur ngarkimi i skedarit tuaj sepse është dosje ose ka dimension 0 byte"
+#: js/file-upload.js:244
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
+msgstr ""
-#: js/file-upload.js:24
+#: js/file-upload.js:255
msgid "Not enough space available"
msgstr "Nuk ka hapësirë memorizimi e mjaftueshme"
-#: js/file-upload.js:64
+#: js/file-upload.js:322
msgid "Upload cancelled."
msgstr "Ngarkimi u anulua."
-#: js/file-upload.js:165
+#: js/file-upload.js:356
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:446
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Ngarkimi i skedarit është në vazhdim. Nqse ndërroni faqen tani ngarkimi do të anulohet."
-#: js/file-upload.js:239
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr "URL-i nuk mund të jetë bosh."
-#: js/file-upload.js:244 lib/app.php:53
+#: js/file-upload.js:525 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr "Emri i dosjes është i pavlefshëm. Përdorimi i \"Shared\" është i rezervuar nga Owncloud-i"
-#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550
+#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545
msgid "Error"
msgstr "Veprim i gabuar"
-#: js/fileactions.js:116
+#: js/fileactions.js:119
msgid "Share"
msgstr "Nda"
-#: js/fileactions.js:126
+#: js/fileactions.js:131
msgid "Delete permanently"
msgstr "Elimino përfundimisht"
-#: js/fileactions.js:192
+#: js/fileactions.js:197
msgid "Rename"
msgstr "Riemërto"
-#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "Pezulluar"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{new_name} ekziston"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "zëvëndëso"
-#: js/filelist.js:307
+#: js/filelist.js:416
msgid "suggest name"
msgstr "sugjero një emër"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "anulo"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr "U zëvëndësua {new_name} me {old_name}"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "undo"
msgstr "anulo"
-#: js/filelist.js:424 js/filelist.js:490 js/files.js:581
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "%n dosje"
msgstr[1] "%n dosje"
-#: js/filelist.js:425 js/filelist.js:491 js/files.js:587
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "%n skedar"
msgstr[1] "%n skedarë"
-#: js/filelist.js:432
+#: js/filelist.js:541
msgid "{dirs} and {files}"
msgstr "{dirs} dhe {files}"
-#: js/filelist.js:563
+#: js/filelist.js:731 js/filelist.js:769
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "Po ngarkoj %n skedar"
msgstr[1] "Po ngarkoj %n skedarë"
-#: js/filelist.js:628
-msgid "files uploading"
-msgstr "po ngarkoj skedarët"
-
-#: js/files.js:52
+#: js/files.js:25
msgid "'.' is an invalid file name."
msgstr "'.' është emër i pavlefshëm."
-#: js/files.js:56
+#: js/files.js:29
msgid "File name cannot be empty."
msgstr "Emri i skedarit nuk mund të jetë bosh."
-#: js/files.js:64
+#: js/files.js:37
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Emër i pavlefshëm, '\\', '/', '<', '>', ':', '\"', '|', '?' dhe '*' nuk lejohen."
-#: js/files.js:78
+#: js/files.js:51
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr "Hapësira juaj e memorizimit është plot, nuk mund të ngarkoni apo sinkronizoni më skedarët."
-#: js/files.js:82
+#: js/files.js:55
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Hapësira juaj e memorizimit është gati plot ({usedSpacePercent}%)"
-#: js/files.js:94
+#: js/files.js:67
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
msgstr "Kodifikimi u çaktivizua por skedarët tuaj vazhdojnë të jenë të kodifikuar. Ju lutem shkoni tek parametrat personale për të dekodifikuar skedarët tuaj."
-#: js/files.js:245
+#: js/files.js:296
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "Shkarkimi juaj po përgatitet. Mund të duhet pak kohë nqse skedarët janë të mëdhenj."
-#: js/files.js:563 templates/index.php:69
+#: js/files.js:507 js/files.js:545
+msgid "Error moving file"
+msgstr ""
+
+#: js/files.js:558 templates/index.php:61
msgid "Name"
msgstr "Emri"
-#: js/files.js:564 templates/index.php:81
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "Dimensioni"
-#: js/files.js:565 templates/index.php:83
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr "Modifikuar"
@@ -233,7 +241,7 @@ msgstr "Modifikuar"
msgid "%s could not be renamed"
msgstr "Nuk është i mundur riemërtimi i %s"
-#: lib/helper.php:11 templates/index.php:18
+#: lib/helper.php:11 templates/index.php:17
msgid "Upload"
msgstr "Ngarko"
@@ -269,65 +277,65 @@ msgstr "Dimensioni maksimal i ngarkimit të skedarëve ZIP"
msgid "Save"
msgstr "Ruaj"
-#: templates/index.php:7
+#: templates/index.php:6
msgid "New"
msgstr "I ri"
-#: templates/index.php:10
+#: templates/index.php:9
msgid "Text file"
msgstr "Skedar teksti"
-#: templates/index.php:12
+#: templates/index.php:11
msgid "Folder"
msgstr "Dosje"
-#: templates/index.php:14
+#: templates/index.php:13
msgid "From link"
msgstr "Nga lidhja"
-#: templates/index.php:41
+#: templates/index.php:33
msgid "Deleted files"
msgstr "Skedarë të eliminuar"
-#: templates/index.php:46
+#: templates/index.php:39
msgid "Cancel upload"
msgstr "Anulo ngarkimin"
-#: templates/index.php:52
+#: templates/index.php:45
msgid "You don’t have write permissions here."
msgstr "Nuk keni të drejta për të shkruar këtu."
-#: templates/index.php:59
+#: templates/index.php:50
msgid "Nothing in here. Upload something!"
msgstr "Këtu nuk ka asgjë. Ngarkoni diçka!"
-#: templates/index.php:75
+#: templates/index.php:67
msgid "Download"
msgstr "Shkarko"
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr "Hiq ndarjen"
-#: templates/index.php:94 templates/index.php:95
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "Elimino"
-#: templates/index.php:108
+#: templates/index.php:100
msgid "Upload too large"
msgstr "Ngarkimi është shumë i madh"
-#: templates/index.php:110
+#: templates/index.php:102
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Skedarët që doni të ngarkoni tejkalojnë dimensionet maksimale për ngarkimet në këtë server."
-#: templates/index.php:115
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr "Skedarët po analizohen, ju lutemi pritni."
-#: templates/index.php:118
+#: templates/index.php:110
msgid "Current scanning"
msgstr "Analizimi aktual"
diff --git a/l10n/sq/settings.po b/l10n/sq/settings.po
index 1aad69565c531f0935e16d9062d4cf89bcef062b..033a815c20c5dec990267cf799995cf3f891b633 100644
--- a/l10n/sq/settings.po
+++ b/l10n/sq/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:45-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
"MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgid "Unable to load list from App Store"
msgstr ""
#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
-#: ajax/togglegroups.php:20
+#: ajax/togglegroups.php:20 changepassword/controller.php:55
msgid "Authentication error"
msgstr "Veprim i gabuar gjatë vërtetimit të identitetit"
@@ -84,6 +84,35 @@ msgstr ""
msgid "Couldn't update app."
msgstr ""
+#: changepassword/controller.php:20
+msgid "Wrong password"
+msgstr ""
+
+#: changepassword/controller.php:42
+msgid "No user supplied"
+msgstr ""
+
+#: changepassword/controller.php:74
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr ""
+
+#: changepassword/controller.php:79
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr ""
+
+#: changepassword/controller.php:87
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr ""
+
+#: changepassword/controller.php:92 changepassword/controller.php:103
+msgid "Unable to change password"
+msgstr ""
+
#: js/apps.js:43
msgid "Update to {appversion}"
msgstr ""
@@ -128,15 +157,15 @@ msgstr "Azhurno"
msgid "Updated"
msgstr ""
-#: js/personal.js:217
+#: js/personal.js:220
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:262
+#: js/personal.js:265
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:284
+#: js/personal.js:287
msgid "Saving..."
msgstr ""
diff --git a/l10n/sr/core.po b/l10n/sr/core.po
index c146f275ab38446cf7bd594fe46a57eb232995a0..b0063f1a94260114ea27cefad7d98b6f9763df30 100644
--- a/l10n/sr/core.po
+++ b/l10n/sr/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:33+0000\n"
+"POT-Creation-Date: 2013-09-22 12:55-0400\n"
+"PO-Revision-Date: 2013-09-20 15:01+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
@@ -190,59 +190,59 @@ msgstr "Децембар"
msgid "Settings"
msgstr "ПоÑтавке"
-#: js/js.js:853
+#: js/js.js:866
msgid "seconds ago"
msgstr "пре неколико Ñекунди"
-#: js/js.js:854
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:855
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:856
+#: js/js.js:869
msgid "today"
msgstr "данаÑ"
-#: js/js.js:857
+#: js/js.js:870
msgid "yesterday"
msgstr "јуче"
-#: js/js.js:858
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:859
+#: js/js.js:872
msgid "last month"
msgstr "прошлог меÑеца"
-#: js/js.js:860
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:861
+#: js/js.js:874
msgid "months ago"
msgstr "меÑеци раније"
-#: js/js.js:862
+#: js/js.js:875
msgid "last year"
msgstr "прошле године"
-#: js/js.js:863
+#: js/js.js:876
msgid "years ago"
msgstr "година раније"
@@ -270,6 +270,47 @@ msgstr "У реду"
msgid "Error loading message template: {error}"
msgstr ""
+#: js/oc-dialogs.js:347
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:367
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:376
+msgid "Cancel"
+msgstr "Откажи"
+
+#: js/oc-dialogs.js:386
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:457
+msgid "Error loading file exists template"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/sr/files.po b/l10n/sr/files.po
index 31dda625a60f04644bb70cabcbd42e10af4f2038..58518b339beadfd160960c6550a2de45780ee87a 100644
--- a/l10n/sr/files.po
+++ b/l10n/sr/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:00+0000\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
@@ -74,11 +74,15 @@ msgstr "Ðе могу да пишем на диÑк"
msgid "Not enough storage available"
msgstr "Ðема довољно проÑтора"
-#: ajax/upload.php:109
-msgid "Upload failed"
-msgstr "Отпремање није уÑпело"
+#: ajax/upload.php:120 ajax/upload.php:143
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:136
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
-#: ajax/upload.php:127
+#: ajax/upload.php:160
msgid "Invalid directory."
msgstr "неиÑправна фаÑцикла."
@@ -86,147 +90,151 @@ msgstr "неиÑправна фаÑцикла."
msgid "Files"
msgstr "Датотеке"
-#: js/file-upload.js:11
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Ðе могу да отпремим датотеку као фаÑциклу или она има 0 бајтова"
+#: js/file-upload.js:244
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
+msgstr ""
-#: js/file-upload.js:24
+#: js/file-upload.js:255
msgid "Not enough space available"
msgstr "Ðема довољно проÑтора"
-#: js/file-upload.js:64
+#: js/file-upload.js:322
msgid "Upload cancelled."
msgstr "Отпремање је прекинуто."
-#: js/file-upload.js:165
+#: js/file-upload.js:356
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:446
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Отпремање датотеке је у току. Ðко Ñада напуÑтите Ñтраницу, прекинућете отпремање."
-#: js/file-upload.js:239
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr "ÐдреÑа не може бити празна."
-#: js/file-upload.js:244 lib/app.php:53
+#: js/file-upload.js:525 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550
+#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545
msgid "Error"
msgstr "Грешка"
-#: js/fileactions.js:116
+#: js/fileactions.js:119
msgid "Share"
msgstr "Дели"
-#: js/fileactions.js:126
+#: js/fileactions.js:131
msgid "Delete permanently"
msgstr "Обриши за Ñтално"
-#: js/fileactions.js:192
+#: js/fileactions.js:197
msgid "Rename"
msgstr "Преименуј"
-#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "Ðа чекању"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{new_name} већ поÑтоји"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "замени"
-#: js/filelist.js:307
+#: js/filelist.js:416
msgid "suggest name"
msgstr "предложи назив"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "откажи"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr "замењено {new_name} Ñа {old_name}"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "undo"
msgstr "опозови"
-#: js/filelist.js:424 js/filelist.js:490 js/files.js:581
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/filelist.js:425 js/filelist.js:491 js/files.js:587
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/filelist.js:432
+#: js/filelist.js:541
msgid "{dirs} and {files}"
msgstr ""
-#: js/filelist.js:563
+#: js/filelist.js:731 js/filelist.js:769
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/filelist.js:628
-msgid "files uploading"
-msgstr "датотеке Ñе отпремају"
-
-#: js/files.js:52
+#: js/files.js:25
msgid "'.' is an invalid file name."
msgstr "Датотека „.“ је неиÑправног имена."
-#: js/files.js:56
+#: js/files.js:29
msgid "File name cannot be empty."
msgstr "Име датотеке не може бити празно."
-#: js/files.js:64
+#: js/files.js:37
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "ÐеиÑправан назив. Следећи знакови ниÑу дозвољени: \\, /, <, >, :, \", |, ? и *."
-#: js/files.js:78
+#: js/files.js:51
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr "Ваше Ñкладиште је пуно. Датотеке више не могу бити ажуриране ни Ñинхронизоване."
-#: js/files.js:82
+#: js/files.js:55
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Ваше Ñкладиште је Ñкоро па пуно ({usedSpacePercent}%)"
-#: js/files.js:94
+#: js/files.js:67
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
msgstr ""
-#: js/files.js:245
+#: js/files.js:296
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "Припремам преузимање. Ово може да потраје ако Ñу датотеке велике."
-#: js/files.js:563 templates/index.php:69
+#: js/files.js:507 js/files.js:545
+msgid "Error moving file"
+msgstr ""
+
+#: js/files.js:558 templates/index.php:61
msgid "Name"
msgstr "Име"
-#: js/files.js:564 templates/index.php:81
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "Величина"
-#: js/files.js:565 templates/index.php:83
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr "Измењено"
@@ -235,7 +243,7 @@ msgstr "Измењено"
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:11 templates/index.php:18
+#: lib/helper.php:11 templates/index.php:17
msgid "Upload"
msgstr "Отпреми"
@@ -271,65 +279,65 @@ msgstr "Ðајвећа величина ZIP датотека"
msgid "Save"
msgstr "Сачувај"
-#: templates/index.php:7
+#: templates/index.php:6
msgid "New"
msgstr "Ðова"
-#: templates/index.php:10
+#: templates/index.php:9
msgid "Text file"
msgstr "текÑтуална датотека"
-#: templates/index.php:12
+#: templates/index.php:11
msgid "Folder"
msgstr "фаÑцикла"
-#: templates/index.php:14
+#: templates/index.php:13
msgid "From link"
msgstr "Са везе"
-#: templates/index.php:41
+#: templates/index.php:33
msgid "Deleted files"
msgstr "ОбриÑане датотеке"
-#: templates/index.php:46
+#: templates/index.php:39
msgid "Cancel upload"
msgstr "Прекини отпремање"
-#: templates/index.php:52
+#: templates/index.php:45
msgid "You don’t have write permissions here."
msgstr "Овде немате дозволу за пиÑање."
-#: templates/index.php:59
+#: templates/index.php:50
msgid "Nothing in here. Upload something!"
msgstr "Овде нема ничег. Отпремите нешто!"
-#: templates/index.php:75
+#: templates/index.php:67
msgid "Download"
msgstr "Преузми"
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr "Укини дељење"
-#: templates/index.php:94 templates/index.php:95
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "Обриши"
-#: templates/index.php:108
+#: templates/index.php:100
msgid "Upload too large"
msgstr "Датотека је превелика"
-#: templates/index.php:110
+#: templates/index.php:102
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Датотеке које желите да отпремите прелазе ограничење у величини."
-#: templates/index.php:115
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr "Скенирам датотеке…"
-#: templates/index.php:118
+#: templates/index.php:110
msgid "Current scanning"
msgstr "Тренутно Ñкенирање"
diff --git a/l10n/sr/settings.po b/l10n/sr/settings.po
index 9f2fe8c7c89c0c03ce2a21ca44bcbdbea10bd254..ee77f11fb6ea3ce106d7d6c13f2f8e44c8402ded 100644
--- a/l10n/sr/settings.po
+++ b/l10n/sr/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:45-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgid "Unable to load list from App Store"
msgstr "Грешка приликом учитавања ÑпиÑка из Складишта Програма"
#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
-#: ajax/togglegroups.php:20
+#: ajax/togglegroups.php:20 changepassword/controller.php:55
msgid "Authentication error"
msgstr "Грешка при провери идентитета"
@@ -84,6 +84,35 @@ msgstr "Ðе могу да уклоним кориÑника из групе %s"
msgid "Couldn't update app."
msgstr "Ðе могу да ажурирам апликацију."
+#: changepassword/controller.php:20
+msgid "Wrong password"
+msgstr ""
+
+#: changepassword/controller.php:42
+msgid "No user supplied"
+msgstr ""
+
+#: changepassword/controller.php:74
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr ""
+
+#: changepassword/controller.php:79
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr ""
+
+#: changepassword/controller.php:87
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr ""
+
+#: changepassword/controller.php:92 changepassword/controller.php:103
+msgid "Unable to change password"
+msgstr ""
+
#: js/apps.js:43
msgid "Update to {appversion}"
msgstr "Ðжурирај на {appversion}"
@@ -128,15 +157,15 @@ msgstr "Ðжурирај"
msgid "Updated"
msgstr "Ðжурирано"
-#: js/personal.js:217
+#: js/personal.js:220
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:262
+#: js/personal.js:265
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:284
+#: js/personal.js:287
msgid "Saving..."
msgstr "Чување у току..."
diff --git a/l10n/sr@latin/core.po b/l10n/sr@latin/core.po
index 89721e4a20ba3347e367c7d9dfca8a11f8b84486..da5af6328b4d647a97d5f2920238d0c83dd2d7c8 100644
--- a/l10n/sr@latin/core.po
+++ b/l10n/sr@latin/core.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# lemi667 <lemi667@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:33+0000\n"
+"POT-Creation-Date: 2013-09-22 12:55-0400\n"
+"PO-Revision-Date: 2013-09-20 15:01+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
@@ -53,42 +54,42 @@ msgstr ""
#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
msgid "Category type not provided."
-msgstr ""
+msgstr "Tip kategorije nije zadan."
#: ajax/vcategories/add.php:30
msgid "No category to add?"
-msgstr ""
+msgstr "Bez dodavanja kategorije?"
#: ajax/vcategories/add.php:37
#, php-format
msgid "This category already exists: %s"
-msgstr ""
+msgstr "Kategorija već postoji: %s"
#: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
#: ajax/vcategories/favorites.php:24
#: ajax/vcategories/removeFromFavorites.php:26
msgid "Object type not provided."
-msgstr ""
+msgstr "Tip objekta nije zadan."
#: ajax/vcategories/addToFavorites.php:30
#: ajax/vcategories/removeFromFavorites.php:30
#, php-format
msgid "%s ID not provided."
-msgstr ""
+msgstr "%s ID nije zadan."
#: ajax/vcategories/addToFavorites.php:35
#, php-format
msgid "Error adding %s to favorites."
-msgstr ""
+msgstr "Greška u dodavanju %s u omiljeno."
#: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
msgid "No categories selected for deletion."
-msgstr ""
+msgstr "Kategorije za brisanje nisu izabrane."
#: ajax/vcategories/removeFromFavorites.php:35
#, php-format
msgid "Error removing %s from favorites."
-msgstr ""
+msgstr "Greška u uklanjanju %s iz omiljeno."
#: avatar/controller.php:62
msgid "No image or file provided"
@@ -190,65 +191,65 @@ msgstr "Decembar"
msgid "Settings"
msgstr "Podešavanja"
-#: js/js.js:853
+#: js/js.js:866
msgid "seconds ago"
-msgstr ""
+msgstr "Pre par sekundi"
-#: js/js.js:854
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:855
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:856
+#: js/js.js:869
msgid "today"
-msgstr ""
+msgstr "Danas"
-#: js/js.js:857
+#: js/js.js:870
msgid "yesterday"
-msgstr ""
+msgstr "juÄe"
-#: js/js.js:858
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:859
+#: js/js.js:872
msgid "last month"
-msgstr ""
+msgstr "prošlog meseca"
-#: js/js.js:860
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:861
+#: js/js.js:874
msgid "months ago"
-msgstr ""
+msgstr "pre nekoliko meseci"
-#: js/js.js:862
+#: js/js.js:875
msgid "last year"
-msgstr ""
+msgstr "prošle godine"
-#: js/js.js:863
+#: js/js.js:876
msgid "years ago"
-msgstr ""
+msgstr "pre nekoliko godina"
#: js/oc-dialogs.js:123
msgid "Choose"
-msgstr ""
+msgstr "Izaberi"
#: js/oc-dialogs.js:146
msgid "Error loading file picker template: {error}"
@@ -256,24 +257,65 @@ msgstr ""
#: js/oc-dialogs.js:172
msgid "Yes"
-msgstr ""
+msgstr "Da"
#: js/oc-dialogs.js:182
msgid "No"
-msgstr ""
+msgstr "Ne"
#: js/oc-dialogs.js:199
msgid "Ok"
-msgstr ""
+msgstr "Ok"
#: js/oc-dialogs.js:219
msgid "Error loading message template: {error}"
msgstr ""
+#: js/oc-dialogs.js:347
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:367
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:376
+msgid "Cancel"
+msgstr "Otkaži"
+
+#: js/oc-dialogs.js:386
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:457
+msgid "Error loading file exists template"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
-msgstr ""
+msgstr "Tip objekta nije zadan."
#: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
@@ -281,55 +323,55 @@ msgstr ""
#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
#: js/share.js:645 js/share.js:657
msgid "Error"
-msgstr ""
+msgstr "Greška"
#: js/oc-vcategories.js:179
msgid "The app name is not specified."
-msgstr ""
+msgstr "Ime aplikacije nije precizirano."
#: js/oc-vcategories.js:194
msgid "The required file {file} is not installed!"
-msgstr ""
+msgstr "Potreban fajl {file} nije instaliran!"
#: js/share.js:30 js/share.js:45 js/share.js:87
msgid "Shared"
-msgstr ""
+msgstr "Deljeno"
#: js/share.js:90
msgid "Share"
-msgstr ""
+msgstr "Podeli"
#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
-msgstr ""
+msgstr "Greška pri deljenju"
#: js/share.js:142
msgid "Error while unsharing"
-msgstr ""
+msgstr "Greška u uklanjanju deljenja"
#: js/share.js:149
msgid "Error while changing permissions"
-msgstr ""
+msgstr "Greška u promeni dozvola"
#: js/share.js:158
msgid "Shared with you and the group {group} by {owner}"
-msgstr ""
+msgstr "{owner} podelio sa Vama i grupom {group} "
#: js/share.js:160
msgid "Shared with you by {owner}"
-msgstr ""
+msgstr "Sa vama podelio {owner}"
#: js/share.js:183
msgid "Share with"
-msgstr ""
+msgstr "Podeli sa"
#: js/share.js:188
msgid "Share with link"
-msgstr ""
+msgstr "Podeli koristei link"
#: js/share.js:191
msgid "Password protect"
-msgstr ""
+msgstr "Zaštita lozinkom"
#: js/share.js:193 templates/installation.php:57 templates/login.php:26
msgid "Password"
@@ -341,94 +383,94 @@ msgstr ""
#: js/share.js:202
msgid "Email link to person"
-msgstr ""
+msgstr "Pošalji link e-mailom"
#: js/share.js:203
msgid "Send"
-msgstr ""
+msgstr "Pošalji"
#: js/share.js:208
msgid "Set expiration date"
-msgstr ""
+msgstr "Datum isteka"
#: js/share.js:209
msgid "Expiration date"
-msgstr ""
+msgstr "Datum isteka"
#: js/share.js:242
msgid "Share via email:"
-msgstr ""
+msgstr "Deli putem e-maila"
#: js/share.js:245
msgid "No people found"
-msgstr ""
+msgstr "Nema pronađenih ljudi"
#: js/share.js:283
msgid "Resharing is not allowed"
-msgstr ""
+msgstr "Dalje deljenje nije dozvoljeno"
#: js/share.js:319
msgid "Shared in {item} with {user}"
-msgstr ""
+msgstr "Deljeno u {item} sa {user}"
#: js/share.js:340
msgid "Unshare"
-msgstr ""
+msgstr "Ukljoni deljenje"
#: js/share.js:352
msgid "can edit"
-msgstr ""
+msgstr "dozvoljene izmene"
#: js/share.js:354
msgid "access control"
-msgstr ""
+msgstr "kontrola pristupa"
#: js/share.js:357
msgid "create"
-msgstr ""
+msgstr "napravi"
#: js/share.js:360
msgid "update"
-msgstr ""
+msgstr "ažuriranje"
#: js/share.js:363
msgid "delete"
-msgstr ""
+msgstr "brisanje"
#: js/share.js:366
msgid "share"
-msgstr ""
+msgstr "deljenje"
#: js/share.js:400 js/share.js:632
msgid "Password protected"
-msgstr ""
+msgstr "Zaštćeno lozinkom"
#: js/share.js:645
msgid "Error unsetting expiration date"
-msgstr ""
+msgstr "Greška u uklanjanju datuma isteka"
#: js/share.js:657
msgid "Error setting expiration date"
-msgstr ""
+msgstr "Greška u postavljanju datuma isteka"
#: js/share.js:672
msgid "Sending ..."
-msgstr ""
+msgstr "Slanje..."
#: js/share.js:683
msgid "Email sent"
-msgstr ""
+msgstr "Email poslat"
#: js/update.js:17
msgid ""
"The update was unsuccessful. Please report this issue to the <a "
"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
"community</a>."
-msgstr ""
+msgstr "Ažuriranje nije uspelo. Molimo obavestite <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud zajednicu</a>."
#: js/update.js:21
msgid "The update was successful. Redirecting you to ownCloud now."
-msgstr ""
+msgstr "Ažuriranje je uspelo. Prosleđivanje na ownCloud."
#: lostpassword/controller.php:62
#, php-format
@@ -437,7 +479,7 @@ msgstr ""
#: lostpassword/templates/email.php:2
msgid "Use the following link to reset your password: {link}"
-msgstr ""
+msgstr "Koristite sledeći link za reset lozinke: {link}"
#: lostpassword/templates/lostpassword.php:4
msgid ""
@@ -481,7 +523,7 @@ msgstr "Vaša lozinka je resetovana"
#: lostpassword/templates/resetpassword.php:5
msgid "To login page"
-msgstr ""
+msgstr "Na login stranicu"
#: lostpassword/templates/resetpassword.php:8
msgid "New password"
@@ -513,7 +555,7 @@ msgstr "Pomoć"
#: templates/403.php:12
msgid "Access forbidden"
-msgstr ""
+msgstr "Pristup zabranjen"
#: templates/404.php:15
msgid "Cloud not found"
@@ -532,20 +574,20 @@ msgstr ""
#: templates/edit_categories_dialog.php:4
msgid "Edit categories"
-msgstr ""
+msgstr "Izmena kategorija"
#: templates/edit_categories_dialog.php:16
msgid "Add"
-msgstr ""
+msgstr "Dodaj"
#: templates/installation.php:24 templates/installation.php:31
#: templates/installation.php:38
msgid "Security Warning"
-msgstr ""
+msgstr "Bezbednosno upozorenje"
#: templates/installation.php:25
msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
-msgstr ""
+msgstr "Vaša PHP verzija je ranjiva na "
#: templates/installation.php:26
#, php-format
@@ -556,19 +598,19 @@ msgstr ""
msgid ""
"No secure random number generator is available, please enable the PHP "
"OpenSSL extension."
-msgstr ""
+msgstr "Nije dostupan generator sluÄajnog broja, molimo omogućite PHP OpenSSL ekstenziju."
#: templates/installation.php:33
msgid ""
"Without a secure random number generator an attacker may be able to predict "
"password reset tokens and take over your account."
-msgstr ""
+msgstr "Bez generatora sluÄajnog broja napadaÄ može predvideti token za reset lozinke i preuzeti VaÅ¡ nalog."
#: templates/installation.php:39
msgid ""
"Your data directory and files are probably accessible from the internet "
"because the .htaccess file does not work."
-msgstr ""
+msgstr "Vaši podaci i direktorijumi su verovatno dostupni sa interneta jer .htaccess fajl ne funkcioniše."
#: templates/installation.php:41
#, php-format
@@ -587,7 +629,7 @@ msgstr "Napredno"
#: templates/installation.php:67
msgid "Data folder"
-msgstr "Facikla podataka"
+msgstr "Fascikla podataka"
#: templates/installation.php:77
msgid "Configure the database"
@@ -613,7 +655,7 @@ msgstr "Ime baze"
#: templates/installation.php:160
msgid "Database tablespace"
-msgstr ""
+msgstr "tablespace baze"
#: templates/installation.php:167
msgid "Database host"
@@ -634,7 +676,7 @@ msgstr "Odjava"
#: templates/login.php:9
msgid "Automatic logon rejected!"
-msgstr ""
+msgstr "Automatsko logovanje odbijeno!"
#: templates/login.php:10
msgid ""
diff --git a/l10n/sr@latin/files.po b/l10n/sr@latin/files.po
index c1b281b797fc1d0c0e3532eb8447f7c8f93a865d..72c25ecb2ed0b3f017cf18be4693315b834e3048 100644
--- a/l10n/sr@latin/files.po
+++ b/l10n/sr@latin/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:00+0000\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
@@ -74,11 +74,15 @@ msgstr ""
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:109
-msgid "Upload failed"
+#: ajax/upload.php:120 ajax/upload.php:143
+msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:127
+#: ajax/upload.php:136
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
+
+#: ajax/upload.php:160
msgid "Invalid directory."
msgstr ""
@@ -86,147 +90,151 @@ msgstr ""
msgid "Files"
msgstr "Fajlovi"
-#: js/file-upload.js:11
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
+#: js/file-upload.js:244
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr ""
-#: js/file-upload.js:24
+#: js/file-upload.js:255
msgid "Not enough space available"
msgstr ""
-#: js/file-upload.js:64
+#: js/file-upload.js:322
msgid "Upload cancelled."
msgstr ""
-#: js/file-upload.js:165
+#: js/file-upload.js:356
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:446
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/file-upload.js:239
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr ""
-#: js/file-upload.js:244 lib/app.php:53
+#: js/file-upload.js:525 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550
+#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545
msgid "Error"
-msgstr ""
+msgstr "Greška"
-#: js/fileactions.js:116
+#: js/fileactions.js:119
msgid "Share"
-msgstr ""
+msgstr "Podeli"
-#: js/fileactions.js:126
+#: js/fileactions.js:131
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:192
+#: js/fileactions.js:197
msgid "Rename"
msgstr ""
-#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr ""
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr ""
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr ""
-#: js/filelist.js:307
+#: js/filelist.js:416
msgid "suggest name"
msgstr ""
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr ""
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr ""
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "undo"
msgstr ""
-#: js/filelist.js:424 js/filelist.js:490 js/files.js:581
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/filelist.js:425 js/filelist.js:491 js/files.js:587
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/filelist.js:432
+#: js/filelist.js:541
msgid "{dirs} and {files}"
msgstr ""
-#: js/filelist.js:563
+#: js/filelist.js:731 js/filelist.js:769
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/filelist.js:628
-msgid "files uploading"
-msgstr ""
-
-#: js/files.js:52
+#: js/files.js:25
msgid "'.' is an invalid file name."
msgstr ""
-#: js/files.js:56
+#: js/files.js:29
msgid "File name cannot be empty."
msgstr ""
-#: js/files.js:64
+#: js/files.js:37
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: js/files.js:78
+#: js/files.js:51
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr ""
-#: js/files.js:82
+#: js/files.js:55
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:94
+#: js/files.js:67
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
msgstr ""
-#: js/files.js:245
+#: js/files.js:296
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/files.js:563 templates/index.php:69
+#: js/files.js:507 js/files.js:545
+msgid "Error moving file"
+msgstr ""
+
+#: js/files.js:558 templates/index.php:61
msgid "Name"
msgstr "Ime"
-#: js/files.js:564 templates/index.php:81
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "VeliÄina"
-#: js/files.js:565 templates/index.php:83
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr "Zadnja izmena"
@@ -235,7 +243,7 @@ msgstr "Zadnja izmena"
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:11 templates/index.php:18
+#: lib/helper.php:11 templates/index.php:17
msgid "Upload"
msgstr "Pošalji"
@@ -271,65 +279,65 @@ msgstr ""
msgid "Save"
msgstr "Snimi"
-#: templates/index.php:7
+#: templates/index.php:6
msgid "New"
msgstr ""
-#: templates/index.php:10
+#: templates/index.php:9
msgid "Text file"
msgstr ""
-#: templates/index.php:12
+#: templates/index.php:11
msgid "Folder"
msgstr ""
-#: templates/index.php:14
+#: templates/index.php:13
msgid "From link"
msgstr ""
-#: templates/index.php:41
+#: templates/index.php:33
msgid "Deleted files"
msgstr ""
-#: templates/index.php:46
+#: templates/index.php:39
msgid "Cancel upload"
msgstr ""
-#: templates/index.php:52
+#: templates/index.php:45
msgid "You don’t have write permissions here."
msgstr ""
-#: templates/index.php:59
+#: templates/index.php:50
msgid "Nothing in here. Upload something!"
msgstr "Ovde nema niÄeg. PoÅ¡aljite neÅ¡to!"
-#: templates/index.php:75
+#: templates/index.php:67
msgid "Download"
msgstr "Preuzmi"
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
-msgstr ""
+msgstr "Ukljoni deljenje"
-#: templates/index.php:94 templates/index.php:95
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "Obriši"
-#: templates/index.php:108
+#: templates/index.php:100
msgid "Upload too large"
msgstr "Pošiljka je prevelika"
-#: templates/index.php:110
+#: templates/index.php:102
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Fajlovi koje želite da poÅ¡aljete prevazilaze ograniÄenje maksimalne veliÄine poÅ¡iljke na ovom serveru."
-#: templates/index.php:115
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:118
+#: templates/index.php:110
msgid "Current scanning"
msgstr ""
diff --git a/l10n/sr@latin/files_trashbin.po b/l10n/sr@latin/files_trashbin.po
index f1524d3b935fdb17169d7f30bb0262913f51ea9a..0c52072bbaadffd70f27d85ad221c54e51e9d3a9 100644
--- a/l10n/sr@latin/files_trashbin.po
+++ b/l10n/sr@latin/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-20 07:30+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
@@ -27,45 +27,45 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/trash.js:7 js/trash.js:100
+#: js/trash.js:7 js/trash.js:102
msgid "perform restore operation"
msgstr ""
-#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
+#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148
msgid "Error"
-msgstr ""
+msgstr "Greška"
-#: js/trash.js:36
+#: js/trash.js:37
msgid "delete file permanently"
msgstr ""
-#: js/trash.js:127
+#: js/trash.js:129
msgid "Delete permanently"
msgstr ""
-#: js/trash.js:182 templates/index.php:17
+#: js/trash.js:190 templates/index.php:21
msgid "Name"
msgstr "Ime"
-#: js/trash.js:183 templates/index.php:27
+#: js/trash.js:191 templates/index.php:31
msgid "Deleted"
msgstr ""
-#: js/trash.js:191
+#: js/trash.js:199
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/trash.js:197
+#: js/trash.js:205
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: lib/trash.php:819 lib/trash.php:821
+#: lib/trash.php:814 lib/trash.php:816
msgid "restored"
msgstr ""
@@ -73,11 +73,11 @@ msgstr ""
msgid "Nothing in here. Your trash bin is empty!"
msgstr ""
-#: templates/index.php:20 templates/index.php:22
+#: templates/index.php:24 templates/index.php:26
msgid "Restore"
msgstr ""
-#: templates/index.php:30 templates/index.php:31
+#: templates/index.php:34 templates/index.php:35
msgid "Delete"
msgstr "Obriši"
diff --git a/l10n/sr@latin/lib.po b/l10n/sr@latin/lib.po
index 6af1411e01bbda82fa741ec1b9f0ee05fb6455ae..afa426b476b94c1e2456c1012e25db4c7604d480 100644
--- a/l10n/sr@latin/lib.po
+++ b/l10n/sr@latin/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:45-0400\n"
+"PO-Revision-Date: 2013-09-20 07:30+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
@@ -164,15 +164,15 @@ msgstr "Greška pri autentifikaciji"
msgid "Token expired. Please reload page."
msgstr ""
-#: search/provider/file.php:17 search/provider/file.php:35
+#: search/provider/file.php:18 search/provider/file.php:36
msgid "Files"
msgstr "Fajlovi"
-#: search/provider/file.php:26 search/provider/file.php:33
+#: search/provider/file.php:27 search/provider/file.php:34
msgid "Text"
msgstr "Tekst"
-#: search/provider/file.php:29
+#: search/provider/file.php:30
msgid "Images"
msgstr ""
@@ -278,7 +278,7 @@ msgstr ""
#: template/functions.php:96
msgid "seconds ago"
-msgstr ""
+msgstr "Pre par sekundi"
#: template/functions.php:97
msgid "%n minute ago"
@@ -296,11 +296,11 @@ msgstr[2] ""
#: template/functions.php:99
msgid "today"
-msgstr ""
+msgstr "Danas"
#: template/functions.php:100
msgid "yesterday"
-msgstr ""
+msgstr "juÄe"
#: template/functions.php:101
msgid "%n day go"
@@ -311,7 +311,7 @@ msgstr[2] ""
#: template/functions.php:102
msgid "last month"
-msgstr ""
+msgstr "prošlog meseca"
#: template/functions.php:103
msgid "%n month ago"
@@ -322,11 +322,11 @@ msgstr[2] ""
#: template/functions.php:104
msgid "last year"
-msgstr ""
+msgstr "prošle godine"
#: template/functions.php:105
msgid "years ago"
-msgstr ""
+msgstr "pre nekoliko godina"
#: template.php:297
msgid "Caused by:"
diff --git a/l10n/sr@latin/settings.po b/l10n/sr@latin/settings.po
index cc6f3b2d5bd6524e261d2954f83ba9763030b381..eaddf7af119678029c6420d06353320f43027c9d 100644
--- a/l10n/sr@latin/settings.po
+++ b/l10n/sr@latin/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:45-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgid "Unable to load list from App Store"
msgstr ""
#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
-#: ajax/togglegroups.php:20
+#: ajax/togglegroups.php:20 changepassword/controller.php:55
msgid "Authentication error"
msgstr "Greška pri autentifikaciji"
@@ -84,6 +84,35 @@ msgstr ""
msgid "Couldn't update app."
msgstr ""
+#: changepassword/controller.php:20
+msgid "Wrong password"
+msgstr ""
+
+#: changepassword/controller.php:42
+msgid "No user supplied"
+msgstr ""
+
+#: changepassword/controller.php:74
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr ""
+
+#: changepassword/controller.php:79
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr ""
+
+#: changepassword/controller.php:87
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr ""
+
+#: changepassword/controller.php:92 changepassword/controller.php:103
+msgid "Unable to change password"
+msgstr ""
+
#: js/apps.js:43
msgid "Update to {appversion}"
msgstr ""
@@ -118,7 +147,7 @@ msgstr ""
#: js/apps.js:126
msgid "Error"
-msgstr ""
+msgstr "Greška"
#: js/apps.js:127 templates/apps.php:43
msgid "Update"
@@ -128,15 +157,15 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:217
+#: js/personal.js:220
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:262
+#: js/personal.js:265
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:284
+#: js/personal.js:287
msgid "Saving..."
msgstr ""
@@ -187,7 +216,7 @@ msgstr ""
#: templates/admin.php:15
msgid "Security Warning"
-msgstr ""
+msgstr "Bezbednosno upozorenje"
#: templates/admin.php:18
msgid ""
diff --git a/l10n/sr@latin/user_ldap.po b/l10n/sr@latin/user_ldap.po
index cdb427f5c8c90c127ba695e3b72f9ee299634c8b..32f10400a2cdc7ed29b39804287e657590500823 100644
--- a/l10n/sr@latin/user_ldap.po
+++ b/l10n/sr@latin/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+0000\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-20 07:30+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
@@ -67,7 +67,7 @@ msgstr ""
#: js/settings.js:117
msgid "Error"
-msgstr ""
+msgstr "Greška"
#: js/settings.js:141
msgid "Connection test succeeded"
diff --git a/l10n/sv/core.po b/l10n/sv/core.po
index 4ed86320a277bcbb23e2303578d5623fe193f080..649594981628c4730b08af95c3aa10ff06614644 100644
--- a/l10n/sv/core.po
+++ b/l10n/sv/core.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:33+0000\n"
+"POT-Creation-Date: 2013-09-22 12:55-0400\n"
+"PO-Revision-Date: 2013-09-20 15:01+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
@@ -194,55 +194,55 @@ msgstr "December"
msgid "Settings"
msgstr "Inställningar"
-#: js/js.js:853
+#: js/js.js:866
msgid "seconds ago"
msgstr "sekunder sedan"
-#: js/js.js:854
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n minut sedan"
msgstr[1] "%n minuter sedan"
-#: js/js.js:855
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n timme sedan"
msgstr[1] "%n timmar sedan"
-#: js/js.js:856
+#: js/js.js:869
msgid "today"
msgstr "i dag"
-#: js/js.js:857
+#: js/js.js:870
msgid "yesterday"
msgstr "i går"
-#: js/js.js:858
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n dag sedan"
msgstr[1] "%n dagar sedan"
-#: js/js.js:859
+#: js/js.js:872
msgid "last month"
msgstr "förra månaden"
-#: js/js.js:860
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n månad sedan"
msgstr[1] "%n månader sedan"
-#: js/js.js:861
+#: js/js.js:874
msgid "months ago"
msgstr "månader sedan"
-#: js/js.js:862
+#: js/js.js:875
msgid "last year"
msgstr "förra året"
-#: js/js.js:863
+#: js/js.js:876
msgid "years ago"
msgstr "Ã¥r sedan"
@@ -270,6 +270,46 @@ msgstr "Ok"
msgid "Error loading message template: {error}"
msgstr ""
+#: js/oc-dialogs.js:347
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:367
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:376
+msgid "Cancel"
+msgstr "Avbryt"
+
+#: js/oc-dialogs.js:386
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:457
+msgid "Error loading file exists template"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/sv/files.po b/l10n/sv/files.po
index 6b498778cf9443d23193d5a36f0609733e4fa6fa..3fe12b46d57223948dd35ebc24f1f1fe491d3082 100644
--- a/l10n/sv/files.po
+++ b/l10n/sv/files.po
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:00+0000\n"
-"Last-Translator: Magnus Höglund <magnus@linux.com>\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -78,11 +78,15 @@ msgstr "Misslyckades spara till disk"
msgid "Not enough storage available"
msgstr "Inte tillräckligt med lagringsutrymme tillgängligt"
-#: ajax/upload.php:109
-msgid "Upload failed"
-msgstr "Misslyckad uppladdning"
+#: ajax/upload.php:120 ajax/upload.php:143
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:136
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
-#: ajax/upload.php:127
+#: ajax/upload.php:160
msgid "Invalid directory."
msgstr "Felaktig mapp."
@@ -90,144 +94,148 @@ msgstr "Felaktig mapp."
msgid "Files"
msgstr "Filer"
-#: js/file-upload.js:11
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Kan inte ladda upp din fil eftersom det är en katalog eller har 0 bytes"
+#: js/file-upload.js:244
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
+msgstr ""
-#: js/file-upload.js:24
+#: js/file-upload.js:255
msgid "Not enough space available"
msgstr "Inte tillräckligt med utrymme tillgängligt"
-#: js/file-upload.js:64
+#: js/file-upload.js:322
msgid "Upload cancelled."
msgstr "Uppladdning avbruten."
-#: js/file-upload.js:165
+#: js/file-upload.js:356
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:446
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Filuppladdning pågår. Lämnar du sidan så avbryts uppladdningen."
-#: js/file-upload.js:239
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr "URL kan inte vara tom."
-#: js/file-upload.js:244 lib/app.php:53
+#: js/file-upload.js:525 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr "Ogiltigt mappnamn. Användning av 'Shared' är reserverad av ownCloud"
-#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550
+#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545
msgid "Error"
msgstr "Fel"
-#: js/fileactions.js:116
+#: js/fileactions.js:119
msgid "Share"
msgstr "Dela"
-#: js/fileactions.js:126
+#: js/fileactions.js:131
msgid "Delete permanently"
msgstr "Radera permanent"
-#: js/fileactions.js:192
+#: js/fileactions.js:197
msgid "Rename"
msgstr "Byt namn"
-#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "Väntar"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{new_name} finns redan"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "ersätt"
-#: js/filelist.js:307
+#: js/filelist.js:416
msgid "suggest name"
msgstr "föreslå namn"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "avbryt"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr "ersatt {new_name} med {old_name}"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "undo"
msgstr "Ã¥ngra"
-#: js/filelist.js:424 js/filelist.js:490 js/files.js:581
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "%n mapp"
msgstr[1] "%n mappar"
-#: js/filelist.js:425 js/filelist.js:491 js/files.js:587
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "%n fil"
msgstr[1] "%n filer"
-#: js/filelist.js:432
+#: js/filelist.js:541
msgid "{dirs} and {files}"
msgstr "{dirs} och {files}"
-#: js/filelist.js:563
+#: js/filelist.js:731 js/filelist.js:769
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "Laddar upp %n fil"
msgstr[1] "Laddar upp %n filer"
-#: js/filelist.js:628
-msgid "files uploading"
-msgstr "filer laddas upp"
-
-#: js/files.js:52
+#: js/files.js:25
msgid "'.' is an invalid file name."
msgstr "'.' är ett ogiltigt filnamn."
-#: js/files.js:56
+#: js/files.js:29
msgid "File name cannot be empty."
msgstr "Filnamn kan inte vara tomt."
-#: js/files.js:64
+#: js/files.js:37
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Ogiltigt namn, '\\', '/', '<', '>', ':', '\"', '|', '?' och '*' är inte tillåtet."
-#: js/files.js:78
+#: js/files.js:51
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr "Ditt lagringsutrymme är fullt, filer kan inte längre uppdateras eller synkroniseras!"
-#: js/files.js:82
+#: js/files.js:55
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Ditt lagringsutrymme är nästan fullt ({usedSpacePercent}%)"
-#: js/files.js:94
+#: js/files.js:67
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
msgstr "Kryptering inaktiverades men dina filer är fortfarande krypterade. Vänligen gå till sidan för dina personliga inställningar för att dekryptera dina filer."
-#: js/files.js:245
+#: js/files.js:296
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "Din nedladdning förbereds. Det kan ta tid om det är stora filer."
-#: js/files.js:563 templates/index.php:69
+#: js/files.js:507 js/files.js:545
+msgid "Error moving file"
+msgstr ""
+
+#: js/files.js:558 templates/index.php:61
msgid "Name"
msgstr "Namn"
-#: js/files.js:564 templates/index.php:81
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "Storlek"
-#: js/files.js:565 templates/index.php:83
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr "Ändrad"
@@ -236,7 +244,7 @@ msgstr "Ändrad"
msgid "%s could not be renamed"
msgstr "%s kunde inte namnändras"
-#: lib/helper.php:11 templates/index.php:18
+#: lib/helper.php:11 templates/index.php:17
msgid "Upload"
msgstr "Ladda upp"
@@ -272,65 +280,65 @@ msgstr "Största tillåtna storlek för ZIP-filer"
msgid "Save"
msgstr "Spara"
-#: templates/index.php:7
+#: templates/index.php:6
msgid "New"
msgstr "Ny"
-#: templates/index.php:10
+#: templates/index.php:9
msgid "Text file"
msgstr "Textfil"
-#: templates/index.php:12
+#: templates/index.php:11
msgid "Folder"
msgstr "Mapp"
-#: templates/index.php:14
+#: templates/index.php:13
msgid "From link"
msgstr "Från länk"
-#: templates/index.php:41
+#: templates/index.php:33
msgid "Deleted files"
msgstr "Raderade filer"
-#: templates/index.php:46
+#: templates/index.php:39
msgid "Cancel upload"
msgstr "Avbryt uppladdning"
-#: templates/index.php:52
+#: templates/index.php:45
msgid "You don’t have write permissions here."
msgstr "Du saknar skrivbehörighet här."
-#: templates/index.php:59
+#: templates/index.php:50
msgid "Nothing in here. Upload something!"
msgstr "Ingenting här. Ladda upp något!"
-#: templates/index.php:75
+#: templates/index.php:67
msgid "Download"
msgstr "Ladda ner"
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr "Sluta dela"
-#: templates/index.php:94 templates/index.php:95
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "Radera"
-#: templates/index.php:108
+#: templates/index.php:100
msgid "Upload too large"
msgstr "För stor uppladdning"
-#: templates/index.php:110
+#: templates/index.php:102
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Filerna du försöker ladda upp överstiger den maximala storleken för filöverföringar på servern."
-#: templates/index.php:115
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr "Filer skannas, var god vänta"
-#: templates/index.php:118
+#: templates/index.php:110
msgid "Current scanning"
msgstr "Aktuell skanning"
diff --git a/l10n/sv/settings.po b/l10n/sv/settings.po
index bed6751c586bba7f14dd3fb5219241cb8aa89227..284b1287a8775d1ebf5ee2cb3891694bef537ee3 100644
--- a/l10n/sv/settings.po
+++ b/l10n/sv/settings.po
@@ -13,8 +13,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:45-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
@@ -28,7 +28,7 @@ msgid "Unable to load list from App Store"
msgstr "Kan inte ladda listan från App Store"
#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
-#: ajax/togglegroups.php:20
+#: ajax/togglegroups.php:20 changepassword/controller.php:55
msgid "Authentication error"
msgstr "Fel vid autentisering"
@@ -90,6 +90,35 @@ msgstr "Kan inte radera användare från gruppen %s"
msgid "Couldn't update app."
msgstr "Kunde inte uppdatera appen."
+#: changepassword/controller.php:20
+msgid "Wrong password"
+msgstr ""
+
+#: changepassword/controller.php:42
+msgid "No user supplied"
+msgstr ""
+
+#: changepassword/controller.php:74
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr ""
+
+#: changepassword/controller.php:79
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr ""
+
+#: changepassword/controller.php:87
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr ""
+
+#: changepassword/controller.php:92 changepassword/controller.php:103
+msgid "Unable to change password"
+msgstr ""
+
#: js/apps.js:43
msgid "Update to {appversion}"
msgstr "Uppdatera till {appversion}"
@@ -134,15 +163,15 @@ msgstr "Uppdatera"
msgid "Updated"
msgstr "Uppdaterad"
-#: js/personal.js:217
+#: js/personal.js:220
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:262
+#: js/personal.js:265
msgid "Decrypting files... Please wait, this can take some time."
msgstr "Dekrypterar filer... Vänligen vänta, detta kan ta en stund."
-#: js/personal.js:284
+#: js/personal.js:287
msgid "Saving..."
msgstr "Sparar..."
@@ -466,7 +495,7 @@ msgstr "Fyll i en e-postadress för att aktivera återställning av lösenord"
#: templates/personal.php:86
msgid "Profile picture"
-msgstr ""
+msgstr "Profilbild"
#: templates/personal.php:90
msgid "Upload new"
diff --git a/l10n/sw_KE/core.po b/l10n/sw_KE/core.po
index 46d6c564324311463e94e4cca3cc0338209a53b6..7b0e7105489c579feadf7968b9c0af01c5588bbf 100644
--- a/l10n/sw_KE/core.po
+++ b/l10n/sw_KE/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:33+0000\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
"MIME-Version: 1.0\n"
@@ -190,55 +190,55 @@ msgstr ""
msgid "Settings"
msgstr ""
-#: js/js.js:853
+#: js/js.js:866
msgid "seconds ago"
msgstr ""
-#: js/js.js:854
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:855
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:856
+#: js/js.js:869
msgid "today"
msgstr ""
-#: js/js.js:857
+#: js/js.js:870
msgid "yesterday"
msgstr ""
-#: js/js.js:858
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:859
+#: js/js.js:872
msgid "last month"
msgstr ""
-#: js/js.js:860
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:861
+#: js/js.js:874
msgid "months ago"
msgstr ""
-#: js/js.js:862
+#: js/js.js:875
msgid "last year"
msgstr ""
-#: js/js.js:863
+#: js/js.js:876
msgid "years ago"
msgstr ""
@@ -266,6 +266,46 @@ msgstr ""
msgid "Error loading message template: {error}"
msgstr ""
+#: js/oc-dialogs.js:347
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:367
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:376
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:386
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:457
+msgid "Error loading file exists template"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/sw_KE/files.po b/l10n/sw_KE/files.po
index f32f2a01fde8240f0182defc699ae1ec827973b0..b12e3fb13dcd62be84232ccd513c97028d7faa24 100644
--- a/l10n/sw_KE/files.po
+++ b/l10n/sw_KE/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-30 09:31-0400\n"
-"PO-Revision-Date: 2013-08-30 13:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
"MIME-Version: 1.0\n"
@@ -74,11 +74,15 @@ msgstr ""
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:109
-msgid "Upload failed"
+#: ajax/upload.php:120 ajax/upload.php:143
+msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:127
+#: ajax/upload.php:136
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
+
+#: ajax/upload.php:160
msgid "Invalid directory."
msgstr ""
@@ -86,144 +90,148 @@ msgstr ""
msgid "Files"
msgstr ""
-#: js/file-upload.js:11
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
+#: js/file-upload.js:244
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr ""
-#: js/file-upload.js:24
+#: js/file-upload.js:255
msgid "Not enough space available"
msgstr ""
-#: js/file-upload.js:64
+#: js/file-upload.js:322
msgid "Upload cancelled."
msgstr ""
-#: js/file-upload.js:165
+#: js/file-upload.js:356
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:446
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/file-upload.js:239
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr ""
-#: js/file-upload.js:244 lib/app.php:53
+#: js/file-upload.js:525 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
+#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545
msgid "Error"
msgstr ""
-#: js/fileactions.js:116
+#: js/fileactions.js:119
msgid "Share"
msgstr ""
-#: js/fileactions.js:126
+#: js/fileactions.js:131
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:192
+#: js/fileactions.js:197
msgid "Rename"
msgstr ""
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr ""
-#: js/filelist.js:305 js/filelist.js:307
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr ""
-#: js/filelist.js:305 js/filelist.js:307
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr ""
-#: js/filelist.js:305
+#: js/filelist.js:416
msgid "suggest name"
msgstr ""
-#: js/filelist.js:305 js/filelist.js:307
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr ""
-#: js/filelist.js:352
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr ""
-#: js/filelist.js:352
+#: js/filelist.js:463
msgid "undo"
msgstr ""
-#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:430
+#: js/filelist.js:541
msgid "{dirs} and {files}"
msgstr ""
-#: js/filelist.js:561
+#: js/filelist.js:731 js/filelist.js:769
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:626
-msgid "files uploading"
-msgstr ""
-
-#: js/files.js:52
+#: js/files.js:25
msgid "'.' is an invalid file name."
msgstr ""
-#: js/files.js:56
+#: js/files.js:29
msgid "File name cannot be empty."
msgstr ""
-#: js/files.js:64
+#: js/files.js:37
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: js/files.js:78
+#: js/files.js:51
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr ""
-#: js/files.js:82
+#: js/files.js:55
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:94
+#: js/files.js:67
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
msgstr ""
-#: js/files.js:245
+#: js/files.js:296
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/files.js:562 templates/index.php:67
+#: js/files.js:507 js/files.js:545
+msgid "Error moving file"
+msgstr ""
+
+#: js/files.js:558 templates/index.php:61
msgid "Name"
msgstr ""
-#: js/files.js:563 templates/index.php:78
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr ""
-#: js/files.js:564 templates/index.php:80
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr ""
@@ -232,7 +240,7 @@ msgstr ""
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:11 templates/index.php:18
+#: lib/helper.php:11 templates/index.php:17
msgid "Upload"
msgstr ""
@@ -268,65 +276,65 @@ msgstr ""
msgid "Save"
msgstr ""
-#: templates/index.php:7
+#: templates/index.php:6
msgid "New"
msgstr ""
-#: templates/index.php:10
+#: templates/index.php:9
msgid "Text file"
msgstr ""
-#: templates/index.php:12
+#: templates/index.php:11
msgid "Folder"
msgstr ""
-#: templates/index.php:14
+#: templates/index.php:13
msgid "From link"
msgstr ""
-#: templates/index.php:41
+#: templates/index.php:33
msgid "Deleted files"
msgstr ""
-#: templates/index.php:46
+#: templates/index.php:39
msgid "Cancel upload"
msgstr ""
-#: templates/index.php:52
+#: templates/index.php:45
msgid "You don’t have write permissions here."
msgstr ""
-#: templates/index.php:59
+#: templates/index.php:50
msgid "Nothing in here. Upload something!"
msgstr ""
-#: templates/index.php:73
+#: templates/index.php:67
msgid "Download"
msgstr ""
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr ""
-#: templates/index.php:91 templates/index.php:92
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr ""
-#: templates/index.php:105
+#: templates/index.php:100
msgid "Upload too large"
msgstr ""
-#: templates/index.php:107
+#: templates/index.php:102
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: templates/index.php:112
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:115
+#: templates/index.php:110
msgid "Current scanning"
msgstr ""
diff --git a/l10n/sw_KE/settings.po b/l10n/sw_KE/settings.po
index 4d21326ffb095541d28c285d4d59a40201d1a61d..da40717273393e1717897c7d65dcd0cecae11adc 100644
--- a/l10n/sw_KE/settings.po
+++ b/l10n/sw_KE/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:45-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
"MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgid "Unable to load list from App Store"
msgstr ""
#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
-#: ajax/togglegroups.php:20
+#: ajax/togglegroups.php:20 changepassword/controller.php:55
msgid "Authentication error"
msgstr ""
@@ -84,6 +84,35 @@ msgstr ""
msgid "Couldn't update app."
msgstr ""
+#: changepassword/controller.php:20
+msgid "Wrong password"
+msgstr ""
+
+#: changepassword/controller.php:42
+msgid "No user supplied"
+msgstr ""
+
+#: changepassword/controller.php:74
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr ""
+
+#: changepassword/controller.php:79
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr ""
+
+#: changepassword/controller.php:87
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr ""
+
+#: changepassword/controller.php:92 changepassword/controller.php:103
+msgid "Unable to change password"
+msgstr ""
+
#: js/apps.js:43
msgid "Update to {appversion}"
msgstr ""
@@ -128,15 +157,15 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:217
+#: js/personal.js:220
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:262
+#: js/personal.js:265
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:284
+#: js/personal.js:287
msgid "Saving..."
msgstr ""
diff --git a/l10n/ta_LK/core.po b/l10n/ta_LK/core.po
index a9b2566a89e61176316e84167d47f09ca588795a..85ae869a75217733d1859cc847155701990a56bb 100644
--- a/l10n/ta_LK/core.po
+++ b/l10n/ta_LK/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:33+0000\n"
+"POT-Creation-Date: 2013-09-22 12:55-0400\n"
+"PO-Revision-Date: 2013-09-20 15:01+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
@@ -190,55 +190,55 @@ msgstr "மாரà¯à®•à®´à®¿"
msgid "Settings"
msgstr "அமைபà¯à®ªà¯à®•à®³à¯"
-#: js/js.js:853
+#: js/js.js:866
msgid "seconds ago"
msgstr "செகà¯à®•à®©à¯à®•à®³à¯à®•à¯à®•à¯ à®®à¯à®©à¯"
-#: js/js.js:854
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:855
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:856
+#: js/js.js:869
msgid "today"
msgstr "இனà¯à®±à¯"
-#: js/js.js:857
+#: js/js.js:870
msgid "yesterday"
msgstr "நேறà¯à®±à¯"
-#: js/js.js:858
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:859
+#: js/js.js:872
msgid "last month"
msgstr "கடநà¯à®¤ மாதமà¯"
-#: js/js.js:860
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:861
+#: js/js.js:874
msgid "months ago"
msgstr "மாதஙà¯à®•à®³à¯à®•à¯à®•à¯ à®®à¯à®©à¯"
-#: js/js.js:862
+#: js/js.js:875
msgid "last year"
msgstr "கடநà¯à®¤ வரà¯à®Ÿà®®à¯"
-#: js/js.js:863
+#: js/js.js:876
msgid "years ago"
msgstr "வரà¯à®Ÿà®™à¯à®•à®³à¯à®•à¯à®•à¯ à®®à¯à®©à¯"
@@ -266,6 +266,46 @@ msgstr "சரி"
msgid "Error loading message template: {error}"
msgstr ""
+#: js/oc-dialogs.js:347
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:367
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:376
+msgid "Cancel"
+msgstr "இரதà¯à®¤à¯ செயà¯à®•"
+
+#: js/oc-dialogs.js:386
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:457
+msgid "Error loading file exists template"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/ta_LK/files.po b/l10n/ta_LK/files.po
index cb81b1d0b54c673cbc184ce03b6497fa2ea56440..dd4a7dcf141cd56b51dec91eaab208e1d5c62914 100644
--- a/l10n/ta_LK/files.po
+++ b/l10n/ta_LK/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:00+0000\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
@@ -74,11 +74,15 @@ msgstr "வடà¯à®Ÿà®¿à®²à¯ எழà¯à®¤ à®®à¯à®Ÿà®¿à®¯à®µà®¿à®²à¯à®²à¯ˆ"
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:109
-msgid "Upload failed"
-msgstr "பதிவேறà¯à®±à®²à¯ தோலà¯à®µà®¿à®¯à¯à®±à¯à®±à®¤à¯"
+#: ajax/upload.php:120 ajax/upload.php:143
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:136
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
-#: ajax/upload.php:127
+#: ajax/upload.php:160
msgid "Invalid directory."
msgstr ""
@@ -86,144 +90,148 @@ msgstr ""
msgid "Files"
msgstr "கோபà¯à®ªà¯à®•à®³à¯"
-#: js/file-upload.js:11
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "அடைவ௠அலà¯à®²à®¤à¯ 0 bytes ஠கொணà¯à®Ÿà¯à®³à¯à®³à®¤à®¾à®²à¯ உஙà¯à®•à®³à¯à®Ÿà¯ˆà®¯ கோபà¯à®ªà¯ˆ பதிவேறà¯à®± à®®à¯à®Ÿà®¿à®¯à®µà®¿à®²à¯à®²à¯ˆ"
+#: js/file-upload.js:244
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
+msgstr ""
-#: js/file-upload.js:24
+#: js/file-upload.js:255
msgid "Not enough space available"
msgstr ""
-#: js/file-upload.js:64
+#: js/file-upload.js:322
msgid "Upload cancelled."
msgstr "பதிவேறà¯à®±à®²à¯ இரதà¯à®¤à¯ செயà¯à®¯à®ªà¯à®ªà®Ÿà¯à®Ÿà¯à®³à¯à®³à®¤à¯"
-#: js/file-upload.js:165
+#: js/file-upload.js:356
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:446
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "கோபà¯à®ªà¯ பதிவேறà¯à®±à®®à¯ செயலà¯à®ªà®¾à®Ÿà¯à®Ÿà®¿à®²à¯ உளà¯à®³à®¤à¯. இநà¯à®¤à®ªà¯ பகà¯à®•à®¤à¯à®¤à®¿à®²à®¿à®°à¯à®¨à¯à®¤à¯ வெறியேறà¯à®µà®¤à®¾à®©à®¤à¯ பதிவேறà¯à®±à®²à¯ˆ இரதà¯à®¤à¯ செயà¯à®¯à¯à®®à¯."
-#: js/file-upload.js:239
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr "URL வெறà¯à®®à¯ˆà®¯à®¾à®• இரà¯à®•à¯à®•à®®à¯à®Ÿà®¿à®¯à®¾à®¤à¯."
-#: js/file-upload.js:244 lib/app.php:53
+#: js/file-upload.js:525 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550
+#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545
msgid "Error"
msgstr "வழà¯"
-#: js/fileactions.js:116
+#: js/fileactions.js:119
msgid "Share"
msgstr "பகிரà¯à®µà¯"
-#: js/fileactions.js:126
+#: js/fileactions.js:131
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:192
+#: js/fileactions.js:197
msgid "Rename"
msgstr "பெயரà¯à®®à®¾à®±à¯à®±à®®à¯"
-#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "நிலà¯à®µà¯ˆà®¯à®¿à®²à¯à®³à¯à®³"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{new_name} à®à®±à¯à®•à®©à®µà¯‡ உளà¯à®³à®¤à¯"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "மாறà¯à®±à®¿à®Ÿà¯à®•"
-#: js/filelist.js:307
+#: js/filelist.js:416
msgid "suggest name"
msgstr "பெயரை பரிநà¯à®¤à¯à®°à¯ˆà®•à¯à®•"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "இரதà¯à®¤à¯ செயà¯à®•"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr "{new_name} ஆனத௠{old_name} இனால௠மாறà¯à®±à®ªà¯à®ªà®Ÿà¯à®Ÿà®¤à¯"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "undo"
msgstr "à®®à¯à®©à¯ செயல௠நீகà¯à®•à®®à¯ "
-#: js/filelist.js:424 js/filelist.js:490 js/files.js:581
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:425 js/filelist.js:491 js/files.js:587
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:432
+#: js/filelist.js:541
msgid "{dirs} and {files}"
msgstr ""
-#: js/filelist.js:563
+#: js/filelist.js:731 js/filelist.js:769
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:628
-msgid "files uploading"
-msgstr ""
-
-#: js/files.js:52
+#: js/files.js:25
msgid "'.' is an invalid file name."
msgstr ""
-#: js/files.js:56
+#: js/files.js:29
msgid "File name cannot be empty."
msgstr ""
-#: js/files.js:64
+#: js/files.js:37
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "செலà¯à®²à¯à®ªà®Ÿà®¿à®¯à®±à¯à®± பெயரà¯,'\\', '/', '<', '>', ':', '\"', '|', '?' மறà¯à®±à¯à®®à¯ '*' ஆகியன அனà¯à®®à®¤à®¿à®•à¯à®•à®ªà¯à®ªà®Ÿà®®à®¾à®Ÿà¯à®Ÿà®¾à®¤à¯."
-#: js/files.js:78
+#: js/files.js:51
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr ""
-#: js/files.js:82
+#: js/files.js:55
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:94
+#: js/files.js:67
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
msgstr ""
-#: js/files.js:245
+#: js/files.js:296
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/files.js:563 templates/index.php:69
+#: js/files.js:507 js/files.js:545
+msgid "Error moving file"
+msgstr ""
+
+#: js/files.js:558 templates/index.php:61
msgid "Name"
msgstr "பெயரà¯"
-#: js/files.js:564 templates/index.php:81
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "அளவà¯"
-#: js/files.js:565 templates/index.php:83
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr "மாறà¯à®±à®ªà¯à®ªà®Ÿà¯à®Ÿà®¤à¯"
@@ -232,7 +240,7 @@ msgstr "மாறà¯à®±à®ªà¯à®ªà®Ÿà¯à®Ÿà®¤à¯"
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:11 templates/index.php:18
+#: lib/helper.php:11 templates/index.php:17
msgid "Upload"
msgstr "பதிவேறà¯à®±à¯à®•"
@@ -268,65 +276,65 @@ msgstr "ZIP கோபà¯à®ªà¯à®•à®³à¯à®•à¯à®•à®¾à®© ஆககà¯à®•à¯‚டி
msgid "Save"
msgstr "சேமிகà¯à®• "
-#: templates/index.php:7
+#: templates/index.php:6
msgid "New"
msgstr "பà¯à®¤à®¿à®¯"
-#: templates/index.php:10
+#: templates/index.php:9
msgid "Text file"
msgstr "கோபà¯à®ªà¯ உரை"
-#: templates/index.php:12
+#: templates/index.php:11
msgid "Folder"
msgstr "கோபà¯à®ªà¯à®±à¯ˆ"
-#: templates/index.php:14
+#: templates/index.php:13
msgid "From link"
msgstr "இணைபà¯à®ªà®¿à®²à®¿à®°à¯à®¨à¯à®¤à¯"
-#: templates/index.php:41
+#: templates/index.php:33
msgid "Deleted files"
msgstr ""
-#: templates/index.php:46
+#: templates/index.php:39
msgid "Cancel upload"
msgstr "பதிவேறà¯à®±à®²à¯ˆ இரதà¯à®¤à¯ செயà¯à®•"
-#: templates/index.php:52
+#: templates/index.php:45
msgid "You don’t have write permissions here."
msgstr ""
-#: templates/index.php:59
+#: templates/index.php:50
msgid "Nothing in here. Upload something!"
msgstr "இஙà¯à®•à¯ ஒனà¯à®±à¯à®®à¯ இலà¯à®²à¯ˆ. à®à®¤à®¾à®µà®¤à¯ பதிவேறà¯à®±à¯à®•!"
-#: templates/index.php:75
+#: templates/index.php:67
msgid "Download"
msgstr "பதிவிறகà¯à®•à¯à®•"
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr "பகிரபà¯à®ªà®Ÿà®¾à®¤à®¤à¯"
-#: templates/index.php:94 templates/index.php:95
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "நீகà¯à®•à¯à®•"
-#: templates/index.php:108
+#: templates/index.php:100
msgid "Upload too large"
msgstr "பதிவேறà¯à®±à®²à¯ மிகபà¯à®ªà¯†à®°à®¿à®¯à®¤à¯"
-#: templates/index.php:110
+#: templates/index.php:102
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "நீஙà¯à®•à®³à¯ பதிவேறà¯à®± à®®à¯à®¯à®±à¯à®šà®¿à®•à¯à®•à¯à®®à¯ கோபà¯à®ªà¯à®•à®³à®¾à®©à®¤à¯ இநà¯à®¤ சேவையகதà¯à®¤à®¿à®²à¯ கோபà¯à®ªà¯ பதிவேறà¯à®±à®•à¯à®•à¯‚டிய ஆககà¯à®•à¯‚டிய அளவிலà¯à®®à¯ கூடியதà¯."
-#: templates/index.php:115
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr "கோபà¯à®ªà¯à®•à®³à¯ வரà¯à®Ÿà®ªà¯à®ªà®Ÿà¯à®•à®¿à®©à¯à®±à®©, தயவà¯à®šà¯†à®¯à¯à®¤à¯ காதà¯à®¤à®¿à®°à¯à®™à¯à®•à®³à¯."
-#: templates/index.php:118
+#: templates/index.php:110
msgid "Current scanning"
msgstr "தறà¯à®ªà¯‹à®¤à¯ வரà¯à®Ÿà®ªà¯à®ªà®Ÿà¯à®ªà®µà¯ˆ"
diff --git a/l10n/ta_LK/settings.po b/l10n/ta_LK/settings.po
index 0e74f284b29fcbc0e7db083ded50ae7a77284b51..cafed635ec952f37241968237c860b8077005bd1 100644
--- a/l10n/ta_LK/settings.po
+++ b/l10n/ta_LK/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:45-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgid "Unable to load list from App Store"
msgstr "செயலி சேமிபà¯à®ªà®¿à®²à®¿à®°à¯à®¨à¯à®¤à¯ படà¯à®Ÿà®¿à®¯à®²à¯ˆ à®à®±à¯à®±à®®à¯à®Ÿà®¿à®¯à®¾à®¤à¯à®³à¯à®³à®¤à¯"
#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
-#: ajax/togglegroups.php:20
+#: ajax/togglegroups.php:20 changepassword/controller.php:55
msgid "Authentication error"
msgstr "அதà¯à®¤à®¾à®Ÿà¯à®šà®¿à®ªà¯à®ªà®Ÿà¯à®¤à¯à®¤à®²à®¿à®²à¯ வழà¯"
@@ -84,6 +84,35 @@ msgstr "கà¯à®´à¯ %s இலிரà¯à®¨à¯à®¤à¯ பயனாளரை நீ
msgid "Couldn't update app."
msgstr ""
+#: changepassword/controller.php:20
+msgid "Wrong password"
+msgstr ""
+
+#: changepassword/controller.php:42
+msgid "No user supplied"
+msgstr ""
+
+#: changepassword/controller.php:74
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr ""
+
+#: changepassword/controller.php:79
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr ""
+
+#: changepassword/controller.php:87
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr ""
+
+#: changepassword/controller.php:92 changepassword/controller.php:103
+msgid "Unable to change password"
+msgstr ""
+
#: js/apps.js:43
msgid "Update to {appversion}"
msgstr ""
@@ -128,15 +157,15 @@ msgstr "இறà¯à®±à¯ˆà®ªà¯à®ªà®Ÿà¯à®¤à¯à®¤à®²à¯"
msgid "Updated"
msgstr ""
-#: js/personal.js:217
+#: js/personal.js:220
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:262
+#: js/personal.js:265
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:284
+#: js/personal.js:287
msgid "Saving..."
msgstr "சேமிகà¯à®•à®ªà¯à®ªà®Ÿà¯à®•à®¿à®±à®¤à¯..."
diff --git a/l10n/te/core.po b/l10n/te/core.po
index 9c2ae9cdb2d674db4a9025f5534d21576f272ff3..fa997fc7fcc78ca010d5fce75850acc805d1b601 100644
--- a/l10n/te/core.po
+++ b/l10n/te/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:33+0000\n"
+"POT-Creation-Date: 2013-09-22 12:55-0400\n"
+"PO-Revision-Date: 2013-09-20 15:01+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
"MIME-Version: 1.0\n"
@@ -190,55 +190,55 @@ msgstr "డిసెంబరà±"
msgid "Settings"
msgstr "అమరికలà±"
-#: js/js.js:853
+#: js/js.js:866
msgid "seconds ago"
msgstr "à°•à±à°·à°£à°¾à°² à°•à±à°°à°¿à°¤à°‚"
-#: js/js.js:854
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:855
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:856
+#: js/js.js:869
msgid "today"
msgstr "ఈరోజà±"
-#: js/js.js:857
+#: js/js.js:870
msgid "yesterday"
msgstr "నినà±à°¨"
-#: js/js.js:858
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:859
+#: js/js.js:872
msgid "last month"
msgstr "పోయిన నెల"
-#: js/js.js:860
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:861
+#: js/js.js:874
msgid "months ago"
msgstr "నెలల à°•à±à°°à°¿à°¤à°‚"
-#: js/js.js:862
+#: js/js.js:875
msgid "last year"
msgstr "పోయిన సంవతà±à°¸à°°à°‚"
-#: js/js.js:863
+#: js/js.js:876
msgid "years ago"
msgstr "సంవతà±à°¸à°°à°¾à°² à°•à±à°°à°¿à°¤à°‚"
@@ -266,6 +266,46 @@ msgstr "సరే"
msgid "Error loading message template: {error}"
msgstr ""
+#: js/oc-dialogs.js:347
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:367
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:376
+msgid "Cancel"
+msgstr "à°°à°¦à±à°¦à±à°šà±‡à°¯à°¿"
+
+#: js/oc-dialogs.js:386
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:457
+msgid "Error loading file exists template"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/te/files.po b/l10n/te/files.po
index f414cfe474d2b1e9801a8c57b7b1ed47dc7759d4..6c0c87d21816ce534a684316f4fc30a196507f20 100644
--- a/l10n/te/files.po
+++ b/l10n/te/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-30 09:31-0400\n"
-"PO-Revision-Date: 2013-08-30 13:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
"MIME-Version: 1.0\n"
@@ -74,11 +74,15 @@ msgstr ""
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:109
-msgid "Upload failed"
+#: ajax/upload.php:120 ajax/upload.php:143
+msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:127
+#: ajax/upload.php:136
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
+
+#: ajax/upload.php:160
msgid "Invalid directory."
msgstr ""
@@ -86,144 +90,148 @@ msgstr ""
msgid "Files"
msgstr ""
-#: js/file-upload.js:11
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
+#: js/file-upload.js:244
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr ""
-#: js/file-upload.js:24
+#: js/file-upload.js:255
msgid "Not enough space available"
msgstr ""
-#: js/file-upload.js:64
+#: js/file-upload.js:322
msgid "Upload cancelled."
msgstr ""
-#: js/file-upload.js:165
+#: js/file-upload.js:356
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:446
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/file-upload.js:239
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr ""
-#: js/file-upload.js:244 lib/app.php:53
+#: js/file-upload.js:525 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
+#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545
msgid "Error"
msgstr "పొరపాటà±"
-#: js/fileactions.js:116
+#: js/fileactions.js:119
msgid "Share"
msgstr ""
-#: js/fileactions.js:126
+#: js/fileactions.js:131
msgid "Delete permanently"
msgstr "శాశà±à°µà°¤à°‚à°—à°¾ తొలగించà±"
-#: js/fileactions.js:192
+#: js/fileactions.js:197
msgid "Rename"
msgstr ""
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr ""
-#: js/filelist.js:305 js/filelist.js:307
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr ""
-#: js/filelist.js:305 js/filelist.js:307
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr ""
-#: js/filelist.js:305
+#: js/filelist.js:416
msgid "suggest name"
msgstr ""
-#: js/filelist.js:305 js/filelist.js:307
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "à°°à°¦à±à°¦à±à°šà±‡à°¯à°¿"
-#: js/filelist.js:352
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr ""
-#: js/filelist.js:352
+#: js/filelist.js:463
msgid "undo"
msgstr ""
-#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:430
+#: js/filelist.js:541
msgid "{dirs} and {files}"
msgstr ""
-#: js/filelist.js:561
+#: js/filelist.js:731 js/filelist.js:769
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:626
-msgid "files uploading"
-msgstr ""
-
-#: js/files.js:52
+#: js/files.js:25
msgid "'.' is an invalid file name."
msgstr ""
-#: js/files.js:56
+#: js/files.js:29
msgid "File name cannot be empty."
msgstr ""
-#: js/files.js:64
+#: js/files.js:37
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: js/files.js:78
+#: js/files.js:51
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr ""
-#: js/files.js:82
+#: js/files.js:55
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:94
+#: js/files.js:67
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
msgstr ""
-#: js/files.js:245
+#: js/files.js:296
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/files.js:562 templates/index.php:67
+#: js/files.js:507 js/files.js:545
+msgid "Error moving file"
+msgstr ""
+
+#: js/files.js:558 templates/index.php:61
msgid "Name"
msgstr "పేరà±"
-#: js/files.js:563 templates/index.php:78
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "పరిమాణం"
-#: js/files.js:564 templates/index.php:80
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr ""
@@ -232,7 +240,7 @@ msgstr ""
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:11 templates/index.php:18
+#: lib/helper.php:11 templates/index.php:17
msgid "Upload"
msgstr ""
@@ -268,65 +276,65 @@ msgstr ""
msgid "Save"
msgstr "à°à°¦à±à°°à°ªà°°à°šà±"
-#: templates/index.php:7
+#: templates/index.php:6
msgid "New"
msgstr ""
-#: templates/index.php:10
+#: templates/index.php:9
msgid "Text file"
msgstr ""
-#: templates/index.php:12
+#: templates/index.php:11
msgid "Folder"
msgstr "సంచయం"
-#: templates/index.php:14
+#: templates/index.php:13
msgid "From link"
msgstr ""
-#: templates/index.php:41
+#: templates/index.php:33
msgid "Deleted files"
msgstr ""
-#: templates/index.php:46
+#: templates/index.php:39
msgid "Cancel upload"
msgstr ""
-#: templates/index.php:52
+#: templates/index.php:45
msgid "You don’t have write permissions here."
msgstr ""
-#: templates/index.php:59
+#: templates/index.php:50
msgid "Nothing in here. Upload something!"
msgstr ""
-#: templates/index.php:73
+#: templates/index.php:67
msgid "Download"
msgstr ""
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr ""
-#: templates/index.php:91 templates/index.php:92
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "తొలగించà±"
-#: templates/index.php:105
+#: templates/index.php:100
msgid "Upload too large"
msgstr ""
-#: templates/index.php:107
+#: templates/index.php:102
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: templates/index.php:112
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:115
+#: templates/index.php:110
msgid "Current scanning"
msgstr ""
diff --git a/l10n/te/settings.po b/l10n/te/settings.po
index 38c9a149cc5b6b29498d03dc097877e49dcbc2c0..b9bb6933e6add143469768a37ceec63ef384e2a4 100644
--- a/l10n/te/settings.po
+++ b/l10n/te/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:45-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
"MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgid "Unable to load list from App Store"
msgstr ""
#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
-#: ajax/togglegroups.php:20
+#: ajax/togglegroups.php:20 changepassword/controller.php:55
msgid "Authentication error"
msgstr ""
@@ -84,6 +84,35 @@ msgstr ""
msgid "Couldn't update app."
msgstr ""
+#: changepassword/controller.php:20
+msgid "Wrong password"
+msgstr ""
+
+#: changepassword/controller.php:42
+msgid "No user supplied"
+msgstr ""
+
+#: changepassword/controller.php:74
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr ""
+
+#: changepassword/controller.php:79
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr ""
+
+#: changepassword/controller.php:87
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr ""
+
+#: changepassword/controller.php:92 changepassword/controller.php:103
+msgid "Unable to change password"
+msgstr ""
+
#: js/apps.js:43
msgid "Update to {appversion}"
msgstr ""
@@ -128,15 +157,15 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:217
+#: js/personal.js:220
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:262
+#: js/personal.js:265
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:284
+#: js/personal.js:287
msgid "Saving..."
msgstr ""
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 5f6e94f4ea7c2fabea2ac74c32a1759ed73bbcc3..a57486f5ed2f7aaeb12487421e7ec5b0fa1b354e 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 5.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"POT-Creation-Date: 2013-09-24 12:58-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -191,55 +191,55 @@ msgstr ""
msgid "Settings"
msgstr ""
-#: js/js.js:853
+#: js/js.js:866
msgid "seconds ago"
msgstr ""
-#: js/js.js:854
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:855
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:856
+#: js/js.js:869
msgid "today"
msgstr ""
-#: js/js.js:857
+#: js/js.js:870
msgid "yesterday"
msgstr ""
-#: js/js.js:858
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:859
+#: js/js.js:872
msgid "last month"
msgstr ""
-#: js/js.js:860
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:861
+#: js/js.js:874
msgid "months ago"
msgstr ""
-#: js/js.js:862
+#: js/js.js:875
msgid "last year"
msgstr ""
-#: js/js.js:863
+#: js/js.js:876
msgid "years ago"
msgstr ""
@@ -267,6 +267,46 @@ msgstr ""
msgid "Error loading message template: {error}"
msgstr ""
+#: js/oc-dialogs.js:347
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:367
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid ""
+"If you select both versions, the copied file will have a number added to its "
+"name."
+msgstr ""
+
+#: js/oc-dialogs.js:376
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:386
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:457
+msgid "Error loading file exists template"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -276,7 +316,7 @@ msgstr ""
#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
-#: js/share.js:645 js/share.js:657
+#: js/share.js:656 js/share.js:668
msgid "Error"
msgstr ""
@@ -296,7 +336,7 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:131 js/share.js:685
+#: js/share.js:131 js/share.js:696
msgid "Error while sharing"
msgstr ""
@@ -396,23 +436,23 @@ msgstr ""
msgid "share"
msgstr ""
-#: js/share.js:400 js/share.js:632
+#: js/share.js:400 js/share.js:643
msgid "Password protected"
msgstr ""
-#: js/share.js:645
+#: js/share.js:656
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:657
+#: js/share.js:668
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:672
+#: js/share.js:683
msgid "Sending ..."
msgstr ""
-#: js/share.js:683
+#: js/share.js:694
msgid "Email sent"
msgstr ""
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 161d9755eb527b3e6ef8a52abe15ee81a72589a9..23d0cd0b17bafed4594ea9cf8bbdce044224255c 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 5.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"POT-Creation-Date: 2013-09-24 12:58-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -75,156 +75,164 @@ msgstr ""
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:109
-msgid "Upload failed"
+#: ajax/upload.php:120 ajax/upload.php:143
+msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:127
+#: ajax/upload.php:136
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
+
+#: ajax/upload.php:160
msgid "Invalid directory."
msgstr ""
-#: appinfo/app.php:12
+#: appinfo/app.php:11
msgid "Files"
msgstr ""
-#: js/file-upload.js:11
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
+#: js/file-upload.js:244
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr ""
-#: js/file-upload.js:24
+#: js/file-upload.js:255
msgid "Not enough space available"
msgstr ""
-#: js/file-upload.js:73
+#: js/file-upload.js:322
msgid "Upload cancelled."
msgstr ""
-#: js/file-upload.js:167
+#: js/file-upload.js:356
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:446
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/file-upload.js:241
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr ""
-#: js/file-upload.js:246 lib/app.php:53
+#: js/file-upload.js:525 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:278 js/file-upload.js:294 js/files.js:528 js/files.js:566
+#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545
msgid "Error"
msgstr ""
-#: js/fileactions.js:116
+#: js/fileactions.js:119
msgid "Share"
msgstr ""
-#: js/fileactions.js:126
+#: js/fileactions.js:131
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:192
+#: js/fileactions.js:197
msgid "Rename"
msgstr ""
-#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:710
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr ""
-#: js/filelist.js:417 js/filelist.js:419
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr ""
-#: js/filelist.js:417 js/filelist.js:419
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr ""
-#: js/filelist.js:417
+#: js/filelist.js:416
msgid "suggest name"
msgstr ""
-#: js/filelist.js:417 js/filelist.js:419
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr ""
-#: js/filelist.js:464
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr ""
-#: js/filelist.js:464
+#: js/filelist.js:463
msgid "undo"
msgstr ""
-#: js/filelist.js:534 js/filelist.js:600 js/files.js:597
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:535 js/filelist.js:601 js/files.js:603
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:542
+#: js/filelist.js:541
msgid "{dirs} and {files}"
msgstr ""
-#: js/filelist.js:698
+#: js/filelist.js:731 js/filelist.js:769
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:763
-msgid "files uploading"
-msgstr ""
-
-#: js/files.js:52
+#: js/files.js:25
msgid "'.' is an invalid file name."
msgstr ""
-#: js/files.js:56
+#: js/files.js:29
msgid "File name cannot be empty."
msgstr ""
-#: js/files.js:64
+#: js/files.js:37
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: js/files.js:78
+#: js/files.js:51
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr ""
-#: js/files.js:82
+#: js/files.js:55
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:94
+#: js/files.js:67
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
msgstr ""
-#: js/files.js:322
+#: js/files.js:296
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/files.js:579 templates/index.php:61
+#: js/files.js:507 js/files.js:545
+msgid "Error moving file"
+msgstr ""
+
+#: js/files.js:558 templates/index.php:61
msgid "Name"
msgstr ""
-#: js/files.js:580 templates/index.php:73
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr ""
-#: js/files.js:581 templates/index.php:75
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr ""
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index 4ecbd811f4127c42627202e123e209718a9f231d..44e17a2fcb2d72644ddbf9f1a51aa49c4880da2f 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 5.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"POT-Creation-Date: 2013-09-24 12:58-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -60,18 +60,18 @@ msgid ""
"files."
msgstr ""
-#: hooks/hooks.php:51
+#: hooks/hooks.php:53
msgid "Missing requirements."
msgstr ""
-#: hooks/hooks.php:52
+#: hooks/hooks.php:54
msgid ""
"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
"together with the PHP extension is enabled and configured properly. For now, "
"the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:250
+#: hooks/hooks.php:255
msgid "Following users are not set up for encryption:"
msgstr ""
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index 99b523228e48e51ad12c4d7f1c56c34b88b5e1f1..abdd985cfdf15998cc49579877f1e11ce044cad2 100644
--- a/l10n/templates/files_external.pot
+++ b/l10n/templates/files_external.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 5.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"POT-Creation-Date: 2013-09-24 12:58-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index 864993c2e536017f5c4a98bf1e29fe427d8e6dfb..34ed992660b6948b39c33a0a4a24bced9ae47186 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 5.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"POT-Creation-Date: 2013-09-24 12:58-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot
index 21e54096a87f05ff52d6b526e49db04a94ea8b54..45fa700a43b7d86df80652dea02d5b662135edfc 100644
--- a/l10n/templates/files_trashbin.pot
+++ b/l10n/templates/files_trashbin.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 5.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"POT-Creation-Date: 2013-09-24 12:58-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -64,7 +64,7 @@ msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-#: lib/trash.php:814 lib/trash.php:816
+#: lib/trashbin.php:814 lib/trashbin.php:816
msgid "restored"
msgstr ""
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index 013e4ee266d2a9d315fa3722dcfefa8df10b25f5..2e73cce980ac0268ab71c9da69cda9bffc0e63a0 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 5.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"POT-Creation-Date: 2013-09-24 12:58-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index 662cfdfdd6c87b26f1574ec4bf4a5df0ff2b572c..0733e0c27371b8d24894fd2b317c7f2bfedc092a 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 5.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"POT-Creation-Date: 2013-09-24 12:58-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -165,15 +165,15 @@ msgstr ""
msgid "Token expired. Please reload page."
msgstr ""
-#: search/provider/file.php:17 search/provider/file.php:35
+#: search/provider/file.php:18 search/provider/file.php:36
msgid "Files"
msgstr ""
-#: search/provider/file.php:26 search/provider/file.php:33
+#: search/provider/file.php:27 search/provider/file.php:34
msgid "Text"
msgstr ""
-#: search/provider/file.php:29
+#: search/provider/file.php:30
msgid "Images"
msgstr ""
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index e405f9529eab474b643d6026a057c3dddcfccb99..66c00629bd93166dfa5d1c2870d26cfbbb08d172 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 5.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"POT-Creation-Date: 2013-09-24 12:58-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -22,7 +22,7 @@ msgid "Unable to load list from App Store"
msgstr ""
#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
-#: ajax/togglegroups.php:20
+#: ajax/togglegroups.php:20 changepassword/controller.php:55
msgid "Authentication error"
msgstr ""
@@ -84,15 +84,43 @@ msgstr ""
msgid "Couldn't update app."
msgstr ""
+#: changepassword/controller.php:20
+msgid "Wrong password"
+msgstr ""
+
+#: changepassword/controller.php:42
+msgid "No user supplied"
+msgstr ""
+
+#: changepassword/controller.php:74
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr ""
+
+#: changepassword/controller.php:79
+msgid "Wrong admin recovery password. Please check the password and try again."
+msgstr ""
+
+#: changepassword/controller.php:87
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr ""
+
+#: changepassword/controller.php:92 changepassword/controller.php:103
+msgid "Unable to change password"
+msgstr ""
+
#: js/apps.js:43
msgid "Update to {appversion}"
msgstr ""
-#: js/apps.js:49 js/apps.js:82 js/apps.js:108
+#: js/apps.js:49 js/apps.js:82 js/apps.js:110
msgid "Disable"
msgstr ""
-#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
+#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
msgid "Enable"
msgstr ""
@@ -100,43 +128,43 @@ msgstr ""
msgid "Please wait...."
msgstr ""
-#: js/apps.js:79 js/apps.js:80 js/apps.js:100
+#: js/apps.js:79 js/apps.js:80 js/apps.js:101
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:99 js/apps.js:112 js/apps.js:113
+#: js/apps.js:100 js/apps.js:114 js/apps.js:115
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:123
+#: js/apps.js:125
msgid "Updating...."
msgstr ""
-#: js/apps.js:126
+#: js/apps.js:128
msgid "Error while updating app"
msgstr ""
-#: js/apps.js:126
+#: js/apps.js:128
msgid "Error"
msgstr ""
-#: js/apps.js:127 templates/apps.php:43
+#: js/apps.js:129 templates/apps.php:43
msgid "Update"
msgstr ""
-#: js/apps.js:130
+#: js/apps.js:132
msgid "Updated"
msgstr ""
-#: js/personal.js:217
+#: js/personal.js:220
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:262
+#: js/personal.js:265
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:284
+#: js/personal.js:287
msgid "Saving..."
msgstr ""
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index 28316ceea3bea6117f60329f2ae351c3ea8bbf73..919a39b405949ff36dd12146201c00e97aaeef20 100644
--- a/l10n/templates/user_ldap.pot
+++ b/l10n/templates/user_ldap.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 5.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"POT-Creation-Date: 2013-09-24 12:58-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot
index 8f3c15b8d887ea0adcdbd6585fe35fb15b81d3fa..dfb732ed0c930ea90801c48f48aaa7ba098144f2 100644
--- a/l10n/templates/user_webdavauth.pot
+++ b/l10n/templates/user_webdavauth.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 5.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
+"POT-Creation-Date: 2013-09-24 12:58-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/th_TH/core.po b/l10n/th_TH/core.po
index 3ab10d3bf6f60a00e7e49014341e4ecce7361aa8..8700d149b0f036ee45fb7f2b4ca827ac72ef71d8 100644
--- a/l10n/th_TH/core.po
+++ b/l10n/th_TH/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:33+0000\n"
+"POT-Creation-Date: 2013-09-22 12:55-0400\n"
+"PO-Revision-Date: 2013-09-20 15:01+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
@@ -190,51 +190,51 @@ msgstr "ธันวาคม"
msgid "Settings"
msgstr "ตั้งค่า"
-#: js/js.js:853
+#: js/js.js:866
msgid "seconds ago"
msgstr "วินาที à¸à¹ˆà¸à¸™à¸«à¸™à¹‰à¸²à¸™à¸µà¹‰"
-#: js/js.js:854
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: js/js.js:855
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: js/js.js:856
+#: js/js.js:869
msgid "today"
msgstr "วันนี้"
-#: js/js.js:857
+#: js/js.js:870
msgid "yesterday"
msgstr "เมื่à¸à¸§à¸²à¸™à¸™à¸µà¹‰"
-#: js/js.js:858
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
-#: js/js.js:859
+#: js/js.js:872
msgid "last month"
msgstr "เดืà¸à¸™à¸—ี่à¹à¸¥à¹‰à¸§"
-#: js/js.js:860
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: js/js.js:861
+#: js/js.js:874
msgid "months ago"
msgstr "เดืà¸à¸™ ที่ผ่านมา"
-#: js/js.js:862
+#: js/js.js:875
msgid "last year"
msgstr "ปีที่à¹à¸¥à¹‰à¸§"
-#: js/js.js:863
+#: js/js.js:876
msgid "years ago"
msgstr "ปี ที่ผ่านมา"
@@ -262,6 +262,45 @@ msgstr "ตà¸à¸¥à¸‡"
msgid "Error loading message template: {error}"
msgstr ""
+#: js/oc-dialogs.js:347
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:367
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:376
+msgid "Cancel"
+msgstr "ยà¸à¹€à¸¥à¸´à¸"
+
+#: js/oc-dialogs.js:386
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:457
+msgid "Error loading file exists template"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/th_TH/files.po b/l10n/th_TH/files.po
index 2bb54ad25e0cff2b36e919490427ed1829c86d5c..c6f593331857e1658d9a3afde500bde8c6339bdc 100644
--- a/l10n/th_TH/files.po
+++ b/l10n/th_TH/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:00+0000\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
@@ -74,11 +74,15 @@ msgstr "เขียนข้à¸à¸¡à¸¹à¸¥à¸¥à¸‡à¹à¸œà¹ˆà¸™à¸”ิสà¸à¹Œà¸¥à¹‰
msgid "Not enough storage available"
msgstr "เหลืà¸à¸žà¸·à¹‰à¸™à¸—ี่ไม่เพียงสำหรับใช้งาน"
-#: ajax/upload.php:109
-msgid "Upload failed"
-msgstr "à¸à¸±à¸žà¹‚หลดล้มเหลว"
+#: ajax/upload.php:120 ajax/upload.php:143
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:136
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
-#: ajax/upload.php:127
+#: ajax/upload.php:160
msgid "Invalid directory."
msgstr "ไดเร็à¸à¸—à¸à¸£à¸µà¹ˆà¹„ม่ถูà¸à¸•à¹‰à¸à¸‡"
@@ -86,141 +90,145 @@ msgstr "ไดเร็à¸à¸—à¸à¸£à¸µà¹ˆà¹„ม่ถูà¸à¸•à¹‰à¸à¸‡"
msgid "Files"
msgstr "ไฟล์"
-#: js/file-upload.js:11
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "ไม่สามารถà¸à¸±à¸žà¹‚หลดไฟล์ขà¸à¸‡à¸„ุณได้ เนื่à¸à¸‡à¸ˆà¸²à¸à¹„ฟล์ดังà¸à¸¥à¹ˆà¸²à¸§à¹€à¸›à¹‡à¸™à¹„ดเร็à¸à¸—à¸à¸£à¸µà¹ˆ หรืภมีขนาดไฟล์ 0 ไบต์"
+#: js/file-upload.js:244
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
+msgstr ""
-#: js/file-upload.js:24
+#: js/file-upload.js:255
msgid "Not enough space available"
msgstr "มีพื้นที่เหลืà¸à¹„ม่เพียงพà¸"
-#: js/file-upload.js:64
+#: js/file-upload.js:322
msgid "Upload cancelled."
msgstr "à¸à¸²à¸£à¸à¸±à¸žà¹‚หลดถูà¸à¸¢à¸à¹€à¸¥à¸´à¸"
-#: js/file-upload.js:165
+#: js/file-upload.js:356
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:446
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "à¸à¸²à¸£à¸à¸±à¸žà¹‚หลดไฟล์à¸à¸³à¸¥à¸±à¸‡à¸à¸¢à¸¹à¹ˆà¹ƒà¸™à¸£à¸°à¸«à¸§à¹ˆà¸²à¸‡à¸”ำเนินà¸à¸²à¸£ à¸à¸²à¸£à¸à¸à¸à¸ˆà¸²à¸à¸«à¸™à¹‰à¸²à¹€à¸§à¹‡à¸šà¸™à¸µà¹‰à¸ˆà¸°à¸—ำให้à¸à¸²à¸£à¸à¸±à¸žà¹‚หลดถูà¸à¸¢à¸à¹€à¸¥à¸´à¸"
-#: js/file-upload.js:239
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr "URL ไม่สามารถเว้นว่างได้"
-#: js/file-upload.js:244 lib/app.php:53
+#: js/file-upload.js:525 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550
+#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545
msgid "Error"
msgstr "ข้à¸à¸œà¸´à¸”พลาด"
-#: js/fileactions.js:116
+#: js/fileactions.js:119
msgid "Share"
msgstr "à¹à¸Šà¸£à¹Œ"
-#: js/fileactions.js:126
+#: js/fileactions.js:131
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:192
+#: js/fileactions.js:197
msgid "Rename"
msgstr "เปลี่ยนชื่à¸"
-#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "à¸à¸¢à¸¹à¹ˆà¸£à¸°à¸«à¸§à¹ˆà¸²à¸‡à¸”ำเนินà¸à¸²à¸£"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{new_name} มีà¸à¸¢à¸¹à¹ˆà¹à¸¥à¹‰à¸§à¹ƒà¸™à¸£à¸°à¸šà¸š"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "à¹à¸—นที่"
-#: js/filelist.js:307
+#: js/filelist.js:416
msgid "suggest name"
msgstr "à¹à¸™à¸°à¸™à¸³à¸Šà¸·à¹ˆà¸"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "ยà¸à¹€à¸¥à¸´à¸"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr "à¹à¸—นที่ {new_name} ด้วย {old_name} à¹à¸¥à¹‰à¸§"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "undo"
msgstr "เลิà¸à¸—ำ"
-#: js/filelist.js:424 js/filelist.js:490 js/files.js:581
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
-#: js/filelist.js:425 js/filelist.js:491 js/files.js:587
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
-#: js/filelist.js:432
+#: js/filelist.js:541
msgid "{dirs} and {files}"
msgstr ""
-#: js/filelist.js:563
+#: js/filelist.js:731 js/filelist.js:769
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
-#: js/filelist.js:628
-msgid "files uploading"
-msgstr "à¸à¸²à¸£à¸à¸±à¸žà¹‚หลดไฟล์"
-
-#: js/files.js:52
+#: js/files.js:25
msgid "'.' is an invalid file name."
msgstr "'.' เป็นชื่à¸à¹„ฟล์ที่ไม่ถูà¸à¸•à¹‰à¸à¸‡"
-#: js/files.js:56
+#: js/files.js:29
msgid "File name cannot be empty."
msgstr "ชื่à¸à¹„ฟล์ไม่สามารถเว้นว่างได้"
-#: js/files.js:64
+#: js/files.js:37
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "ชื่à¸à¸—ี่ใช้ไม่ถูà¸à¸•à¹‰à¸à¸‡, '\\', '/', '<', '>', ':', '\"', '|', '?' à¹à¸¥à¸° '*' ไม่ได้รับà¸à¸™à¸¸à¸à¸²à¸•à¹ƒà¸«à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¹„ด้"
-#: js/files.js:78
+#: js/files.js:51
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr "พื้นที่จัดเà¸à¹‡à¸šà¸‚้à¸à¸¡à¸¹à¸¥à¸‚à¸à¸‡à¸„ุณเต็มà¹à¸¥à¹‰à¸§ ไม่สามารถà¸à¸±à¸žà¹€à¸”ทหรืà¸à¸œà¸ªà¸²à¸™à¹„ฟล์ต่างๆได้à¸à¸µà¸à¸•à¹ˆà¸à¹„ป"
-#: js/files.js:82
+#: js/files.js:55
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "พื้นที่จัดเà¸à¹‡à¸šà¸‚้à¸à¸¡à¸¹à¸¥à¸‚à¸à¸‡à¸„ุณใà¸à¸¥à¹‰à¹€à¸•à¹‡à¸¡à¹à¸¥à¹‰à¸§ ({usedSpacePercent}%)"
-#: js/files.js:94
+#: js/files.js:67
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
msgstr ""
-#: js/files.js:245
+#: js/files.js:296
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "à¸à¸³à¸¥à¸±à¸‡à¹€à¸•à¸£à¸µà¸¢à¸¡à¸”าวน์โหลดข้à¸à¸¡à¸¹à¸¥ หาà¸à¹„ฟล์มีขนาดใหà¸à¹ˆ à¸à¸²à¸ˆà¹ƒà¸Šà¹‰à¹€à¸§à¸¥à¸²à¸ªà¸±à¸à¸„รู่"
-#: js/files.js:563 templates/index.php:69
+#: js/files.js:507 js/files.js:545
+msgid "Error moving file"
+msgstr ""
+
+#: js/files.js:558 templates/index.php:61
msgid "Name"
msgstr "ชื่à¸"
-#: js/files.js:564 templates/index.php:81
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "ขนาด"
-#: js/files.js:565 templates/index.php:83
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr "à¹à¸à¹‰à¹„ขà¹à¸¥à¹‰à¸§"
@@ -229,7 +237,7 @@ msgstr "à¹à¸à¹‰à¹„ขà¹à¸¥à¹‰à¸§"
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:11 templates/index.php:18
+#: lib/helper.php:11 templates/index.php:17
msgid "Upload"
msgstr "à¸à¸±à¸žà¹‚หลด"
@@ -265,65 +273,65 @@ msgstr "ขนาดไฟล์ ZIP สูงสุด"
msgid "Save"
msgstr "บันทึà¸"
-#: templates/index.php:7
+#: templates/index.php:6
msgid "New"
msgstr "à¸à¸±à¸žà¹‚หลดไฟล์ใหม่"
-#: templates/index.php:10
+#: templates/index.php:9
msgid "Text file"
msgstr "ไฟล์ข้à¸à¸„วาม"
-#: templates/index.php:12
+#: templates/index.php:11
msgid "Folder"
msgstr "à¹à¸Ÿà¹‰à¸¡à¹€à¸à¸à¸ªà¸²à¸£"
-#: templates/index.php:14
+#: templates/index.php:13
msgid "From link"
msgstr "จาà¸à¸¥à¸´à¸‡à¸à¹Œ"
-#: templates/index.php:41
+#: templates/index.php:33
msgid "Deleted files"
msgstr ""
-#: templates/index.php:46
+#: templates/index.php:39
msgid "Cancel upload"
msgstr "ยà¸à¹€à¸¥à¸´à¸à¸à¸²à¸£à¸à¸±à¸žà¹‚หลด"
-#: templates/index.php:52
+#: templates/index.php:45
msgid "You don’t have write permissions here."
msgstr ""
-#: templates/index.php:59
+#: templates/index.php:50
msgid "Nothing in here. Upload something!"
msgstr "ยังไม่มีไฟล์ใดๆà¸à¸¢à¸¹à¹ˆà¸—ี่นี่ à¸à¸£à¸¸à¸“าà¸à¸±à¸žà¹‚หลดไฟล์!"
-#: templates/index.php:75
+#: templates/index.php:67
msgid "Download"
msgstr "ดาวน์โหลด"
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr "ยà¸à¹€à¸¥à¸´à¸à¸à¸²à¸£à¹à¸Šà¸£à¹Œ"
-#: templates/index.php:94 templates/index.php:95
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "ลบ"
-#: templates/index.php:108
+#: templates/index.php:100
msgid "Upload too large"
msgstr "ไฟล์ที่à¸à¸±à¸žà¹‚หลดมีขนาดใหà¸à¹ˆà¹€à¸à¸´à¸™à¹„ป"
-#: templates/index.php:110
+#: templates/index.php:102
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "ไฟล์ที่คุณพยายามที่จะà¸à¸±à¸žà¹‚หลดมีขนาดเà¸à¸´à¸™à¸à¸§à¹ˆà¸²à¸‚นาดสูงสุดที่à¸à¸³à¸«à¸™à¸”ไว้ให้à¸à¸±à¸žà¹‚หลดได้สำหรับเซิร์ฟเวà¸à¸£à¹Œà¸™à¸µà¹‰"
-#: templates/index.php:115
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr "ไฟล์à¸à¸³à¸¥à¸±à¸‡à¸à¸¢à¸¹à¹ˆà¸£à¸°à¸«à¸§à¹ˆà¸²à¸‡à¸à¸²à¸£à¸ªà¹à¸à¸™, à¸à¸£à¸¸à¸“ารà¸à¸ªà¸±à¸à¸„รู่."
-#: templates/index.php:118
+#: templates/index.php:110
msgid "Current scanning"
msgstr "ไฟล์ที่à¸à¸³à¸¥à¸±à¸‡à¸ªà¹à¸à¸™à¸à¸¢à¸¹à¹ˆà¸‚ณะนี้"
diff --git a/l10n/th_TH/settings.po b/l10n/th_TH/settings.po
index 3426744f01f0f33d67f4e8c0b3c32af1c5f09955..1b369b9b75b0adf00a42a51f8f80971badac2a1e 100644
--- a/l10n/th_TH/settings.po
+++ b/l10n/th_TH/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:45-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgid "Unable to load list from App Store"
msgstr "ไม่สามารถโหลดรายà¸à¸²à¸£à¸ˆà¸²à¸ App Store ได้"
#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
-#: ajax/togglegroups.php:20
+#: ajax/togglegroups.php:20 changepassword/controller.php:55
msgid "Authentication error"
msgstr "เà¸à¸´à¸”ข้à¸à¸œà¸´à¸”พลาดในสิทธิ์à¸à¸²à¸£à¹€à¸‚้าใช้งาน"
@@ -84,6 +84,35 @@ msgstr "ไม่สามารถลบผู้ใช้งานà¸à¸à¸à¸ˆ
msgid "Couldn't update app."
msgstr "ไม่สามารถà¸à¸±à¸žà¹€à¸”ทà¹à¸à¸›à¸¯"
+#: changepassword/controller.php:20
+msgid "Wrong password"
+msgstr ""
+
+#: changepassword/controller.php:42
+msgid "No user supplied"
+msgstr ""
+
+#: changepassword/controller.php:74
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr ""
+
+#: changepassword/controller.php:79
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr ""
+
+#: changepassword/controller.php:87
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr ""
+
+#: changepassword/controller.php:92 changepassword/controller.php:103
+msgid "Unable to change password"
+msgstr ""
+
#: js/apps.js:43
msgid "Update to {appversion}"
msgstr "à¸à¸±à¸žà¹€à¸”ทไปเป็นรุ่น {appversion}"
@@ -128,15 +157,15 @@ msgstr "à¸à¸±à¸žà¹€à¸”ท"
msgid "Updated"
msgstr "à¸à¸±à¸žà¹€à¸”ทà¹à¸¥à¹‰à¸§"
-#: js/personal.js:217
+#: js/personal.js:220
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:262
+#: js/personal.js:265
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:284
+#: js/personal.js:287
msgid "Saving..."
msgstr "à¸à¸³à¸¥à¸±à¸‡à¸šà¸±à¸™à¸—ึà¸à¸‚้à¸à¸¡à¸¹à¸¥..."
@@ -460,7 +489,7 @@ msgstr "à¸à¸£à¸à¸à¸—ี่à¸à¸¢à¸¹à¹ˆà¸à¸µà¹€à¸¡à¸¥à¹Œà¸‚à¸à¸‡à¸„ุณเ
#: templates/personal.php:86
msgid "Profile picture"
-msgstr ""
+msgstr "รูปภาพโปรไฟล์"
#: templates/personal.php:90
msgid "Upload new"
diff --git a/l10n/tr/core.po b/l10n/tr/core.po
index eed4853b177a5797d9b5b2144b1d3060dd845631..286f827c66c9b51ac36004a643c7817035094fc8 100644
--- a/l10n/tr/core.po
+++ b/l10n/tr/core.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:33+0000\n"
+"POT-Creation-Date: 2013-09-22 12:55-0400\n"
+"PO-Revision-Date: 2013-09-20 15:01+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
@@ -193,55 +193,55 @@ msgstr "Aralık"
msgid "Settings"
msgstr "Ayarlar"
-#: js/js.js:853
+#: js/js.js:866
msgid "seconds ago"
msgstr "saniye önce"
-#: js/js.js:854
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n dakika önce"
msgstr[1] "%n dakika önce"
-#: js/js.js:855
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n saat önce"
msgstr[1] "%n saat önce"
-#: js/js.js:856
+#: js/js.js:869
msgid "today"
msgstr "bugün"
-#: js/js.js:857
+#: js/js.js:870
msgid "yesterday"
msgstr "dün"
-#: js/js.js:858
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n gün önce"
msgstr[1] "%n gün önce"
-#: js/js.js:859
+#: js/js.js:872
msgid "last month"
msgstr "geçen ay"
-#: js/js.js:860
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n ay önce"
msgstr[1] "%n ay önce"
-#: js/js.js:861
+#: js/js.js:874
msgid "months ago"
msgstr "ay önce"
-#: js/js.js:862
+#: js/js.js:875
msgid "last year"
msgstr "geçen yıl"
-#: js/js.js:863
+#: js/js.js:876
msgid "years ago"
msgstr "yıl önce"
@@ -269,6 +269,46 @@ msgstr "Tamam"
msgid "Error loading message template: {error}"
msgstr ""
+#: js/oc-dialogs.js:347
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:367
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:376
+msgid "Cancel"
+msgstr "Ä°ptal"
+
+#: js/oc-dialogs.js:386
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:457
+msgid "Error loading file exists template"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/tr/files.po b/l10n/tr/files.po
index e4878d5cdeec6dfe03cb4db1710db0702c56e4f9..05c4ef5679771fad7e4c26343816fa53a84daa7a 100644
--- a/l10n/tr/files.po
+++ b/l10n/tr/files.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:00+0000\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
@@ -77,11 +77,15 @@ msgstr "Diske yazılamadı"
msgid "Not enough storage available"
msgstr "Yeterli disk alanı yok"
-#: ajax/upload.php:109
-msgid "Upload failed"
-msgstr "Yükleme başarısız"
+#: ajax/upload.php:120 ajax/upload.php:143
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:136
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
-#: ajax/upload.php:127
+#: ajax/upload.php:160
msgid "Invalid directory."
msgstr "Geçersiz dizin."
@@ -89,144 +93,148 @@ msgstr "Geçersiz dizin."
msgid "Files"
msgstr "Dosyalar"
-#: js/file-upload.js:11
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Dosyanızın boyutu 0 byte olduğundan veya bir dizin olduğundan yüklenemedi"
+#: js/file-upload.js:244
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
+msgstr ""
-#: js/file-upload.js:24
+#: js/file-upload.js:255
msgid "Not enough space available"
msgstr "Yeterli disk alanı yok"
-#: js/file-upload.js:64
+#: js/file-upload.js:322
msgid "Upload cancelled."
msgstr "Yükleme iptal edildi."
-#: js/file-upload.js:165
+#: js/file-upload.js:356
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:446
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Dosya yükleme işlemi sürüyor. Şimdi sayfadan ayrılırsanız işleminiz iptal olur."
-#: js/file-upload.js:239
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr "URL boÅŸ olamaz."
-#: js/file-upload.js:244 lib/app.php:53
+#: js/file-upload.js:525 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr "Geçersiz dizin adı. 'Shared' dizin ismi kullanımı ownCloud tarafından rezerve edilmiştir."
-#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550
+#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545
msgid "Error"
msgstr "Hata"
-#: js/fileactions.js:116
+#: js/fileactions.js:119
msgid "Share"
msgstr "PaylaÅŸ"
-#: js/fileactions.js:126
+#: js/fileactions.js:131
msgid "Delete permanently"
msgstr "Kalıcı olarak sil"
-#: js/fileactions.js:192
+#: js/fileactions.js:197
msgid "Rename"
msgstr "Ä°sim deÄŸiÅŸtir."
-#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "Bekliyor"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{new_name} zaten mevcut"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "deÄŸiÅŸtir"
-#: js/filelist.js:307
+#: js/filelist.js:416
msgid "suggest name"
msgstr "Öneri ad"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "iptal"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr "{new_name} ismi {old_name} ile deÄŸiÅŸtirildi"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "undo"
msgstr "geri al"
-#: js/filelist.js:424 js/filelist.js:490 js/files.js:581
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "%n dizin"
msgstr[1] "%n dizin"
-#: js/filelist.js:425 js/filelist.js:491 js/files.js:587
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "%n dosya"
msgstr[1] "%n dosya"
-#: js/filelist.js:432
+#: js/filelist.js:541
msgid "{dirs} and {files}"
msgstr ""
-#: js/filelist.js:563
+#: js/filelist.js:731 js/filelist.js:769
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "%n dosya yükleniyor"
msgstr[1] "%n dosya yükleniyor"
-#: js/filelist.js:628
-msgid "files uploading"
-msgstr "Dosyalar yükleniyor"
-
-#: js/files.js:52
+#: js/files.js:25
msgid "'.' is an invalid file name."
msgstr "'.' geçersiz dosya adı."
-#: js/files.js:56
+#: js/files.js:29
msgid "File name cannot be empty."
msgstr "Dosya adı boş olamaz."
-#: js/files.js:64
+#: js/files.js:37
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Geçersiz isim, '\\', '/', '<', '>', ':', '\"', '|', '?' ve '*' karakterlerine izin verilmemektedir."
-#: js/files.js:78
+#: js/files.js:51
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr "Depolama alanınız dolu, artık dosyalar güncellenmeyecek yada senkronizasyon edilmeyecek."
-#: js/files.js:82
+#: js/files.js:55
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Depolama alanınız neredeyse dolu ({usedSpacePercent}%)"
-#: js/files.js:94
+#: js/files.js:67
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
msgstr "Şifreleme işlemi durduruldu ancak dosyalarınız şifreli. Dosyalarınızın şifresini kaldırmak için lütfen kişisel ayarlar kısmına geçiniz."
-#: js/files.js:245
+#: js/files.js:296
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "İndirmeniz hazırlanıyor. Dosya büyük ise biraz zaman alabilir."
-#: js/files.js:563 templates/index.php:69
+#: js/files.js:507 js/files.js:545
+msgid "Error moving file"
+msgstr ""
+
+#: js/files.js:558 templates/index.php:61
msgid "Name"
msgstr "Ä°sim"
-#: js/files.js:564 templates/index.php:81
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "Boyut"
-#: js/files.js:565 templates/index.php:83
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr "DeÄŸiÅŸtirilme"
@@ -235,7 +243,7 @@ msgstr "DeÄŸiÅŸtirilme"
msgid "%s could not be renamed"
msgstr "%s yeniden adlandırılamadı"
-#: lib/helper.php:11 templates/index.php:18
+#: lib/helper.php:11 templates/index.php:17
msgid "Upload"
msgstr "Yükle"
@@ -271,65 +279,65 @@ msgstr "ZIP dosyaları için en fazla girdi sayısı"
msgid "Save"
msgstr "Kaydet"
-#: templates/index.php:7
+#: templates/index.php:6
msgid "New"
msgstr "Yeni"
-#: templates/index.php:10
+#: templates/index.php:9
msgid "Text file"
msgstr "Metin dosyası"
-#: templates/index.php:12
+#: templates/index.php:11
msgid "Folder"
msgstr "Klasör"
-#: templates/index.php:14
+#: templates/index.php:13
msgid "From link"
msgstr "Bağlantıdan"
-#: templates/index.php:41
+#: templates/index.php:33
msgid "Deleted files"
msgstr "Dosyalar silindi"
-#: templates/index.php:46
+#: templates/index.php:39
msgid "Cancel upload"
msgstr "Yüklemeyi iptal et"
-#: templates/index.php:52
+#: templates/index.php:45
msgid "You don’t have write permissions here."
msgstr "Buraya erişim hakkınız yok."
-#: templates/index.php:59
+#: templates/index.php:50
msgid "Nothing in here. Upload something!"
msgstr "Burada hiçbir şey yok. Birşeyler yükleyin!"
-#: templates/index.php:75
+#: templates/index.php:67
msgid "Download"
msgstr "Ä°ndir"
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr "Paylaşılmayan"
-#: templates/index.php:94 templates/index.php:95
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "Sil"
-#: templates/index.php:108
+#: templates/index.php:100
msgid "Upload too large"
msgstr "Yükleme çok büyük"
-#: templates/index.php:110
+#: templates/index.php:102
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Yüklemeye çalıştığınız dosyalar bu sunucudaki maksimum yükleme boyutunu aşıyor."
-#: templates/index.php:115
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr "Dosyalar taranıyor, lütfen bekleyin."
-#: templates/index.php:118
+#: templates/index.php:110
msgid "Current scanning"
msgstr "Güncel tarama"
diff --git a/l10n/tr/settings.po b/l10n/tr/settings.po
index b7a8e8384978219c8cfe89cb55b010ce8c237763..8d168dd065d7db93937376c52b29e97d2cb47d56 100644
--- a/l10n/tr/settings.po
+++ b/l10n/tr/settings.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:45-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgid "Unable to load list from App Store"
msgstr "App Store'dan liste yüklenemiyor"
#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
-#: ajax/togglegroups.php:20
+#: ajax/togglegroups.php:20 changepassword/controller.php:55
msgid "Authentication error"
msgstr "Kimlik doğrulama hatası"
@@ -88,6 +88,35 @@ msgstr "%s grubundan kullanıcı kaldırılamıyor"
msgid "Couldn't update app."
msgstr "Uygulama güncellenemedi."
+#: changepassword/controller.php:20
+msgid "Wrong password"
+msgstr ""
+
+#: changepassword/controller.php:42
+msgid "No user supplied"
+msgstr ""
+
+#: changepassword/controller.php:74
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr ""
+
+#: changepassword/controller.php:79
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr ""
+
+#: changepassword/controller.php:87
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr ""
+
+#: changepassword/controller.php:92 changepassword/controller.php:103
+msgid "Unable to change password"
+msgstr ""
+
#: js/apps.js:43
msgid "Update to {appversion}"
msgstr "{appversion} Güncelle"
@@ -132,15 +161,15 @@ msgstr "Güncelleme"
msgid "Updated"
msgstr "Güncellendi"
-#: js/personal.js:217
+#: js/personal.js:220
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:262
+#: js/personal.js:265
msgid "Decrypting files... Please wait, this can take some time."
msgstr "Dosyaların şifresi çözülüyor... Lütfen bekleyin, bu biraz zaman alabilir."
-#: js/personal.js:284
+#: js/personal.js:287
msgid "Saving..."
msgstr "Kaydediliyor..."
@@ -464,7 +493,7 @@ msgstr "Parola kurtarmayı etkinleştirmek için bir eposta adresi girin"
#: templates/personal.php:86
msgid "Profile picture"
-msgstr ""
+msgstr "Profil resmi"
#: templates/personal.php:90
msgid "Upload new"
diff --git a/l10n/ug/core.po b/l10n/ug/core.po
index 385f716e96f7d08d3bb0984f52bb91f48bcf1338..2550b6d4ad0ba11e62acfd78fee13390a2dc6af6 100644
--- a/l10n/ug/core.po
+++ b/l10n/ug/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-09-22 12:55-0400\n"
+"PO-Revision-Date: 2013-09-20 15:01+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Uighur <uqkun@outlook.com>\n"
"MIME-Version: 1.0\n"
@@ -190,51 +190,51 @@ msgstr "ÙƒÛ†Ù†Û•Ùƒ"
msgid "Settings"
msgstr "تەÚشەكلەر"
-#: js/js.js:853
+#: js/js.js:866
msgid "seconds ago"
msgstr ""
-#: js/js.js:854
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: js/js.js:855
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: js/js.js:856
+#: js/js.js:869
msgid "today"
msgstr "بۈگۈن"
-#: js/js.js:857
+#: js/js.js:870
msgid "yesterday"
msgstr "تۈنۈگۈن"
-#: js/js.js:858
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
-#: js/js.js:859
+#: js/js.js:872
msgid "last month"
msgstr ""
-#: js/js.js:860
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: js/js.js:861
+#: js/js.js:874
msgid "months ago"
msgstr ""
-#: js/js.js:862
+#: js/js.js:875
msgid "last year"
msgstr ""
-#: js/js.js:863
+#: js/js.js:876
msgid "years ago"
msgstr ""
@@ -262,6 +262,45 @@ msgstr "جەزملە"
msgid "Error loading message template: {error}"
msgstr ""
+#: js/oc-dialogs.js:347
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:367
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:376
+msgid "Cancel"
+msgstr "ۋاز كەچ"
+
+#: js/oc-dialogs.js:386
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:457
+msgid "Error loading file exists template"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/ug/files.po b/l10n/ug/files.po
index 3eabab5235bd4672fb550159aafb48f7a0bf069d..c029562d869208d4b0bce0e2e0e4215bb5a1c4f3 100644
--- a/l10n/ug/files.po
+++ b/l10n/ug/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:00+0000\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Uighur <uqkun@outlook.com>\n"
"MIME-Version: 1.0\n"
@@ -74,11 +74,15 @@ msgstr "دىسكىغا يازالمىدى"
msgid "Not enough storage available"
msgstr "ÙŠÛتەرلىك ساقلاش بوشلۇقى يوق"
-#: ajax/upload.php:109
-msgid "Upload failed"
+#: ajax/upload.php:120 ajax/upload.php:143
+msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:127
+#: ajax/upload.php:136
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
+
+#: ajax/upload.php:160
msgid "Invalid directory."
msgstr ""
@@ -86,141 +90,145 @@ msgstr ""
msgid "Files"
msgstr "ھۆججەتلەر"
-#: js/file-upload.js:11
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
+#: js/file-upload.js:244
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr ""
-#: js/file-upload.js:24
+#: js/file-upload.js:255
msgid "Not enough space available"
msgstr "ÙŠÛتەرلىك بوشلۇق يوق"
-#: js/file-upload.js:64
+#: js/file-upload.js:322
msgid "Upload cancelled."
msgstr "يۈكلەشتىن ۋاز كەچتى."
-#: js/file-upload.js:165
+#: js/file-upload.js:356
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:446
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "ھۆججەت يۈكلەش مەشغۇلاتى ئÛلىپ بÛرىلىۋاتىدۇ. Leaving the page now will cancel the upload."
-#: js/file-upload.js:239
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr ""
-#: js/file-upload.js:244 lib/app.php:53
+#: js/file-upload.js:525 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550
+#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545
msgid "Error"
msgstr "خاتالىق"
-#: js/fileactions.js:116
+#: js/fileactions.js:119
msgid "Share"
msgstr "ھەمبەھىر"
-#: js/fileactions.js:126
+#: js/fileactions.js:131
msgid "Delete permanently"
msgstr "Ù…Û•ÚÚ¯ÛˆÙ„ÛˆÙƒ ئۆچۈر"
-#: js/fileactions.js:192
+#: js/fileactions.js:197
msgid "Rename"
msgstr "ئات ئۆزگەرت"
-#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "كۈتۈۋاتىدۇ"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{new_name} مەۋجۇت"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "ئالماشتۇر"
-#: js/filelist.js:307
+#: js/filelist.js:416
msgid "suggest name"
msgstr "تەۋسىيە ئات"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "ۋاز كەچ"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr ""
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "undo"
msgstr "ÙŠÛنىۋال"
-#: js/filelist.js:424 js/filelist.js:490 js/files.js:581
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
-#: js/filelist.js:425 js/filelist.js:491 js/files.js:587
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
-#: js/filelist.js:432
+#: js/filelist.js:541
msgid "{dirs} and {files}"
msgstr ""
-#: js/filelist.js:563
+#: js/filelist.js:731 js/filelist.js:769
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
-#: js/filelist.js:628
-msgid "files uploading"
-msgstr "ھۆججەت يۈكلىنىۋاتىدۇ"
-
-#: js/files.js:52
+#: js/files.js:25
msgid "'.' is an invalid file name."
msgstr ""
-#: js/files.js:56
+#: js/files.js:29
msgid "File name cannot be empty."
msgstr ""
-#: js/files.js:64
+#: js/files.js:37
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: js/files.js:78
+#: js/files.js:51
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr ""
-#: js/files.js:82
+#: js/files.js:55
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:94
+#: js/files.js:67
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
msgstr ""
-#: js/files.js:245
+#: js/files.js:296
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/files.js:563 templates/index.php:69
+#: js/files.js:507 js/files.js:545
+msgid "Error moving file"
+msgstr ""
+
+#: js/files.js:558 templates/index.php:61
msgid "Name"
msgstr "ئاتى"
-#: js/files.js:564 templates/index.php:81
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "Ú†ÙˆÚلۇقى"
-#: js/files.js:565 templates/index.php:83
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr "ئۆزگەرتكەن"
@@ -229,7 +237,7 @@ msgstr "ئۆزگەرتكەن"
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:11 templates/index.php:18
+#: lib/helper.php:11 templates/index.php:17
msgid "Upload"
msgstr "يۈكلە"
@@ -265,65 +273,65 @@ msgstr ""
msgid "Save"
msgstr "ساقلا"
-#: templates/index.php:7
+#: templates/index.php:6
msgid "New"
msgstr "ÙŠÛÚÙ‰"
-#: templates/index.php:10
+#: templates/index.php:9
msgid "Text file"
msgstr "تÛكىست ھۆججەت"
-#: templates/index.php:12
+#: templates/index.php:11
msgid "Folder"
msgstr "قىسقۇچ"
-#: templates/index.php:14
+#: templates/index.php:13
msgid "From link"
msgstr ""
-#: templates/index.php:41
+#: templates/index.php:33
msgid "Deleted files"
msgstr "ئۆچۈرۈلگەن ھۆججەتلەر"
-#: templates/index.php:46
+#: templates/index.php:39
msgid "Cancel upload"
msgstr "يۈكلەشتىن ۋاز كەچ"
-#: templates/index.php:52
+#: templates/index.php:45
msgid "You don’t have write permissions here."
msgstr ""
-#: templates/index.php:59
+#: templates/index.php:50
msgid "Nothing in here. Upload something!"
msgstr "بۇ جايدا Ú¾ÛÚ†Ù†ÛÙ…Û• يوق. Upload something!"
-#: templates/index.php:75
+#: templates/index.php:67
msgid "Download"
msgstr "چۈشۈر"
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr "ھەمبەھىرلىمە"
-#: templates/index.php:94 templates/index.php:95
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "ئۆچۈر"
-#: templates/index.php:108
+#: templates/index.php:100
msgid "Upload too large"
msgstr "يۈكلەندىغىنى بەك Ú†ÙˆÚ"
-#: templates/index.php:110
+#: templates/index.php:102
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: templates/index.php:115
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:118
+#: templates/index.php:110
msgid "Current scanning"
msgstr ""
diff --git a/l10n/ug/settings.po b/l10n/ug/settings.po
index b6ec1cd7f02dd1adfc48519c75bc7715da969722..84bd5ebb2a5f004221150ef074cfafed9931b8f9 100644
--- a/l10n/ug/settings.po
+++ b/l10n/ug/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:45-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Uighur <uqkun@outlook.com>\n"
"MIME-Version: 1.0\n"
@@ -23,7 +23,7 @@ msgid "Unable to load list from App Store"
msgstr "ئەپ بازىرىدىن تىزىمنى يۈكلىيەلمىدى"
#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
-#: ajax/togglegroups.php:20
+#: ajax/togglegroups.php:20 changepassword/controller.php:55
msgid "Authentication error"
msgstr "سالاھىيەت دەلىللەش خاتالىقى"
@@ -85,6 +85,35 @@ msgstr "ئىشلەتكۈچىنى %s گۇرۇپپىدىن چىقىرىۋÛتەل
msgid "Couldn't update app."
msgstr "ئەپنى ÙŠÛÚىلىيالمايدۇ."
+#: changepassword/controller.php:20
+msgid "Wrong password"
+msgstr ""
+
+#: changepassword/controller.php:42
+msgid "No user supplied"
+msgstr ""
+
+#: changepassword/controller.php:74
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr ""
+
+#: changepassword/controller.php:79
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr ""
+
+#: changepassword/controller.php:87
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr ""
+
+#: changepassword/controller.php:92 changepassword/controller.php:103
+msgid "Unable to change password"
+msgstr ""
+
#: js/apps.js:43
msgid "Update to {appversion}"
msgstr "{appversion} غا ÙŠÛÚىلايدۇ"
@@ -129,15 +158,15 @@ msgstr "ÙŠÛÚىلا"
msgid "Updated"
msgstr "ÙŠÛÚىلاندى"
-#: js/personal.js:217
+#: js/personal.js:220
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:262
+#: js/personal.js:265
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:284
+#: js/personal.js:287
msgid "Saving..."
msgstr "ساقلاۋاتىدۇ…"
diff --git a/l10n/uk/core.po b/l10n/uk/core.po
index 888399d1dc7544a3e9a15622b05fae7a59b87c90..2deda9a93d507fa45b638bfb94b84ef6927176c9 100644
--- a/l10n/uk/core.po
+++ b/l10n/uk/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:33+0000\n"
+"POT-Creation-Date: 2013-09-22 12:55-0400\n"
+"PO-Revision-Date: 2013-09-20 15:01+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
@@ -190,59 +190,59 @@ msgstr "Грудень"
msgid "Settings"
msgstr "ÐалаштуваннÑ"
-#: js/js.js:853
+#: js/js.js:866
msgid "seconds ago"
msgstr "Ñекунди тому"
-#: js/js.js:854
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:855
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:856
+#: js/js.js:869
msgid "today"
msgstr "Ñьогодні"
-#: js/js.js:857
+#: js/js.js:870
msgid "yesterday"
msgstr "вчора"
-#: js/js.js:858
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:859
+#: js/js.js:872
msgid "last month"
msgstr "минулого міÑÑцÑ"
-#: js/js.js:860
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:861
+#: js/js.js:874
msgid "months ago"
msgstr "міÑÑці тому"
-#: js/js.js:862
+#: js/js.js:875
msgid "last year"
msgstr "минулого року"
-#: js/js.js:863
+#: js/js.js:876
msgid "years ago"
msgstr "роки тому"
@@ -270,6 +270,47 @@ msgstr "Ok"
msgid "Error loading message template: {error}"
msgstr ""
+#: js/oc-dialogs.js:347
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:367
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:376
+msgid "Cancel"
+msgstr "Відмінити"
+
+#: js/oc-dialogs.js:386
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:457
+msgid "Error loading file exists template"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/uk/files.po b/l10n/uk/files.po
index 13cbcf246160f6c582047424af40f1eba7defd3b..23349e0800dd98d7be0b2d45431cf8d59e67ded9 100644
--- a/l10n/uk/files.po
+++ b/l10n/uk/files.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:00+0000\n"
-"Last-Translator: zubr139 <zubr139@ukr.net>\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -75,11 +75,15 @@ msgstr "ÐевдалоÑÑ Ð·Ð°Ð¿Ð¸Ñати на диÑк"
msgid "Not enough storage available"
msgstr "МіÑÑ†Ñ Ð±Ñ–Ð»ÑŒÑˆÐµ немає"
-#: ajax/upload.php:109
-msgid "Upload failed"
-msgstr "Помилка завантаженнÑ"
+#: ajax/upload.php:120 ajax/upload.php:143
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:136
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
-#: ajax/upload.php:127
+#: ajax/upload.php:160
msgid "Invalid directory."
msgstr "Ðевірний каталог."
@@ -87,147 +91,151 @@ msgstr "Ðевірний каталог."
msgid "Files"
msgstr "Файли"
-#: js/file-upload.js:11
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Ðеможливо завантажити ваш файл тому, що він тека або файл розміром 0 байт"
+#: js/file-upload.js:244
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
+msgstr ""
-#: js/file-upload.js:24
+#: js/file-upload.js:255
msgid "Not enough space available"
msgstr "МіÑÑ†Ñ Ð±Ñ–Ð»ÑŒÑˆÐµ немає"
-#: js/file-upload.js:64
+#: js/file-upload.js:322
msgid "Upload cancelled."
msgstr "Ð—Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ð¿ÐµÑ€ÐµÑ€Ð²Ð°Ð½Ð¾."
-#: js/file-upload.js:165
+#: js/file-upload.js:356
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:446
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "ВиконуєтьÑÑ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñƒ. Ð—Ð°ÐºÑ€Ð¸Ñ‚Ñ‚Ñ Ñ†Ñ–Ñ”Ñ— Ñторінки приведе до відміни завантаженнÑ."
-#: js/file-upload.js:239
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr "URL не може бути пуÑтим."
-#: js/file-upload.js:244 lib/app.php:53
+#: js/file-upload.js:525 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550
+#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545
msgid "Error"
msgstr "Помилка"
-#: js/fileactions.js:116
+#: js/fileactions.js:119
msgid "Share"
msgstr "ПоділитиÑÑ"
-#: js/fileactions.js:126
+#: js/fileactions.js:131
msgid "Delete permanently"
msgstr "Видалити назавжди"
-#: js/fileactions.js:192
+#: js/fileactions.js:197
msgid "Rename"
msgstr "Перейменувати"
-#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "ОчікуваннÑ"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{new_name} вже Ñ–Ñнує"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "заміна"
-#: js/filelist.js:307
+#: js/filelist.js:416
msgid "suggest name"
msgstr "запропонуйте назву"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "відміна"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr "замінено {new_name} на {old_name}"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "undo"
msgstr "відмінити"
-#: js/filelist.js:424 js/filelist.js:490 js/files.js:581
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/filelist.js:425 js/filelist.js:491 js/files.js:587
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/filelist.js:432
+#: js/filelist.js:541
msgid "{dirs} and {files}"
msgstr ""
-#: js/filelist.js:563
+#: js/filelist.js:731 js/filelist.js:769
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/filelist.js:628
-msgid "files uploading"
-msgstr "файли завантажуютьÑÑ"
-
-#: js/files.js:52
+#: js/files.js:25
msgid "'.' is an invalid file name."
msgstr "'.' це невірне ім'Ñ Ñ„Ð°Ð¹Ð»Ñƒ."
-#: js/files.js:56
+#: js/files.js:29
msgid "File name cannot be empty."
msgstr " Ім'Ñ Ñ„Ð°Ð¹Ð»Ñƒ не може бути порожнім."
-#: js/files.js:64
+#: js/files.js:37
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Ðевірне ім'Ñ, '\\', '/', '<', '>', ':', '\"', '|', '?' та '*' не дозволені."
-#: js/files.js:78
+#: js/files.js:51
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr "Ваше Ñховище переповнене, файли більше не можуть бути оновлені або Ñинхронізовані !"
-#: js/files.js:82
+#: js/files.js:55
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Ваше Ñховище майже повне ({usedSpacePercent}%)"
-#: js/files.js:94
+#: js/files.js:67
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
msgstr ""
-#: js/files.js:245
+#: js/files.js:296
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "Ваше Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ð³Ð¾Ñ‚ÑƒÑ”Ñ‚ÑŒÑÑ. Це може зайнÑти деÑкий чаÑ, Ñкщо файли завеликі."
-#: js/files.js:563 templates/index.php:69
+#: js/files.js:507 js/files.js:545
+msgid "Error moving file"
+msgstr ""
+
+#: js/files.js:558 templates/index.php:61
msgid "Name"
msgstr "Ім'Ñ"
-#: js/files.js:564 templates/index.php:81
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "Розмір"
-#: js/files.js:565 templates/index.php:83
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr "Змінено"
@@ -236,7 +244,7 @@ msgstr "Змінено"
msgid "%s could not be renamed"
msgstr "%s не може бути перейменований"
-#: lib/helper.php:11 templates/index.php:18
+#: lib/helper.php:11 templates/index.php:17
msgid "Upload"
msgstr "Вивантажити"
@@ -272,65 +280,65 @@ msgstr "МакÑимальний розмір завантажуємого ZIP
msgid "Save"
msgstr "Зберегти"
-#: templates/index.php:7
+#: templates/index.php:6
msgid "New"
msgstr "Створити"
-#: templates/index.php:10
+#: templates/index.php:9
msgid "Text file"
msgstr "ТекÑтовий файл"
-#: templates/index.php:12
+#: templates/index.php:11
msgid "Folder"
msgstr "Папка"
-#: templates/index.php:14
+#: templates/index.php:13
msgid "From link"
msgstr "З поÑиланнÑ"
-#: templates/index.php:41
+#: templates/index.php:33
msgid "Deleted files"
msgstr "Видалено файлів"
-#: templates/index.php:46
+#: templates/index.php:39
msgid "Cancel upload"
msgstr "Перервати завантаженнÑ"
-#: templates/index.php:52
+#: templates/index.php:45
msgid "You don’t have write permissions here."
msgstr "У Ð²Ð°Ñ Ñ‚ÑƒÑ‚ немає прав на запиÑ."
-#: templates/index.php:59
+#: templates/index.php:50
msgid "Nothing in here. Upload something!"
msgstr "Тут нічого немає. Відвантажте що-небудь!"
-#: templates/index.php:75
+#: templates/index.php:67
msgid "Download"
msgstr "Завантажити"
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr "Закрити доÑтуп"
-#: templates/index.php:94 templates/index.php:95
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "Видалити"
-#: templates/index.php:108
+#: templates/index.php:100
msgid "Upload too large"
msgstr "Файл занадто великий"
-#: templates/index.php:110
+#: templates/index.php:102
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Файли,що ви намагаєтеÑÑŒ відвантажити перевищують макÑимальний дозволений розмір файлів на цьому Ñервері."
-#: templates/index.php:115
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr "Файли ÑкануютьÑÑ, зачекайте, будь-лаÑка."
-#: templates/index.php:118
+#: templates/index.php:110
msgid "Current scanning"
msgstr "Поточне ÑкануваннÑ"
diff --git a/l10n/uk/files_encryption.po b/l10n/uk/files_encryption.po
index d36a9a3a538c816013d0761f230a0d01519cc369..46c45f13fea117b1947bdd631f74af7ba6e334c2 100644
--- a/l10n/uk/files_encryption.po
+++ b/l10n/uk/files_encryption.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 13:31+0000\n"
+"POT-Creation-Date: 2013-09-18 11:46-0400\n"
+"PO-Revision-Date: 2013-09-17 13:05+0000\n"
"Last-Translator: zubr139 <zubr139@ukr.net>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
@@ -62,18 +62,18 @@ msgid ""
"files."
msgstr ""
-#: hooks/hooks.php:51
+#: hooks/hooks.php:53
msgid "Missing requirements."
msgstr ""
-#: hooks/hooks.php:52
+#: hooks/hooks.php:54
msgid ""
"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
"together with the PHP extension is enabled and configured properly. For now,"
" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:250
+#: hooks/hooks.php:255
msgid "Following users are not set up for encryption:"
msgstr ""
diff --git a/l10n/uk/settings.po b/l10n/uk/settings.po
index 3611f7952d7d08e74ea36df838f180d07b9eae09..a96bef5878c1c39a62f0edfc43588292f9668820 100644
--- a/l10n/uk/settings.po
+++ b/l10n/uk/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:45-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgid "Unable to load list from App Store"
msgstr "Ðе вдалоÑÑ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶Ð¸Ñ‚Ð¸ ÑпиÑок з App Store"
#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
-#: ajax/togglegroups.php:20
+#: ajax/togglegroups.php:20 changepassword/controller.php:55
msgid "Authentication error"
msgstr "Помилка автентифікації"
@@ -84,6 +84,35 @@ msgstr "Ðе вдалоÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ кориÑтувача із гру
msgid "Couldn't update app."
msgstr "Ðе вдалоÑÑ Ð¾Ð½Ð¾Ð²Ð¸Ñ‚Ð¸ програму. "
+#: changepassword/controller.php:20
+msgid "Wrong password"
+msgstr ""
+
+#: changepassword/controller.php:42
+msgid "No user supplied"
+msgstr ""
+
+#: changepassword/controller.php:74
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr ""
+
+#: changepassword/controller.php:79
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr ""
+
+#: changepassword/controller.php:87
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr ""
+
+#: changepassword/controller.php:92 changepassword/controller.php:103
+msgid "Unable to change password"
+msgstr ""
+
#: js/apps.js:43
msgid "Update to {appversion}"
msgstr "Оновити до {appversion}"
@@ -128,15 +157,15 @@ msgstr "Оновити"
msgid "Updated"
msgstr "Оновлено"
-#: js/personal.js:217
+#: js/personal.js:220
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:262
+#: js/personal.js:265
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:284
+#: js/personal.js:287
msgid "Saving..."
msgstr "Зберігаю..."
diff --git a/l10n/uk/user_webdavauth.po b/l10n/uk/user_webdavauth.po
index b25b14fad21794e1691f012d96be7d2c3772c6d4..7f61f7a3e37c105655cc118c4ab4f2f510de1493 100644
--- a/l10n/uk/user_webdavauth.po
+++ b/l10n/uk/user_webdavauth.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 13:52+0000\n"
+"POT-Creation-Date: 2013-09-18 11:47-0400\n"
+"PO-Revision-Date: 2013-09-17 13:04+0000\n"
"Last-Translator: zubr139 <zubr139@ukr.net>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ur_PK/core.po b/l10n/ur_PK/core.po
index 5e22263ec5f195d9870042214b7f3ed7d3f7294a..ab9aac58cff8ec3981eaad50151935bc3524b535 100644
--- a/l10n/ur_PK/core.po
+++ b/l10n/ur_PK/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:33+0000\n"
+"POT-Creation-Date: 2013-09-22 12:55-0400\n"
+"PO-Revision-Date: 2013-09-20 15:01+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
"MIME-Version: 1.0\n"
@@ -190,55 +190,55 @@ msgstr "دسمبر"
msgid "Settings"
msgstr "سیٹینگز"
-#: js/js.js:853
+#: js/js.js:866
msgid "seconds ago"
msgstr ""
-#: js/js.js:854
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:855
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:856
+#: js/js.js:869
msgid "today"
msgstr ""
-#: js/js.js:857
+#: js/js.js:870
msgid "yesterday"
msgstr ""
-#: js/js.js:858
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:859
+#: js/js.js:872
msgid "last month"
msgstr ""
-#: js/js.js:860
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:861
+#: js/js.js:874
msgid "months ago"
msgstr ""
-#: js/js.js:862
+#: js/js.js:875
msgid "last year"
msgstr ""
-#: js/js.js:863
+#: js/js.js:876
msgid "years ago"
msgstr ""
@@ -266,6 +266,46 @@ msgstr "اوکے"
msgid "Error loading message template: {error}"
msgstr ""
+#: js/oc-dialogs.js:347
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:367
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:376
+msgid "Cancel"
+msgstr "منسوخ کریں"
+
+#: js/oc-dialogs.js:386
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:457
+msgid "Error loading file exists template"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/ur_PK/files.po b/l10n/ur_PK/files.po
index e92fc72d7f31c8a6a9af4a8c0a8e26453425a608..2efc8cf7473f0759276ae4f143c6882a4124985d 100644
--- a/l10n/ur_PK/files.po
+++ b/l10n/ur_PK/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-30 09:31-0400\n"
-"PO-Revision-Date: 2013-08-30 13:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
"MIME-Version: 1.0\n"
@@ -74,11 +74,15 @@ msgstr ""
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:109
-msgid "Upload failed"
+#: ajax/upload.php:120 ajax/upload.php:143
+msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:127
+#: ajax/upload.php:136
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
+
+#: ajax/upload.php:160
msgid "Invalid directory."
msgstr ""
@@ -86,144 +90,148 @@ msgstr ""
msgid "Files"
msgstr ""
-#: js/file-upload.js:11
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
+#: js/file-upload.js:244
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr ""
-#: js/file-upload.js:24
+#: js/file-upload.js:255
msgid "Not enough space available"
msgstr ""
-#: js/file-upload.js:64
+#: js/file-upload.js:322
msgid "Upload cancelled."
msgstr ""
-#: js/file-upload.js:165
+#: js/file-upload.js:356
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:446
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/file-upload.js:239
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr ""
-#: js/file-upload.js:244 lib/app.php:53
+#: js/file-upload.js:525 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549
+#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545
msgid "Error"
msgstr "ایرر"
-#: js/fileactions.js:116
+#: js/fileactions.js:119
msgid "Share"
msgstr ""
-#: js/fileactions.js:126
+#: js/fileactions.js:131
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:192
+#: js/fileactions.js:197
msgid "Rename"
msgstr ""
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr ""
-#: js/filelist.js:305 js/filelist.js:307
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr ""
-#: js/filelist.js:305 js/filelist.js:307
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr ""
-#: js/filelist.js:305
+#: js/filelist.js:416
msgid "suggest name"
msgstr ""
-#: js/filelist.js:305 js/filelist.js:307
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr ""
-#: js/filelist.js:352
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr ""
-#: js/filelist.js:352
+#: js/filelist.js:463
msgid "undo"
msgstr ""
-#: js/filelist.js:422 js/filelist.js:488 js/files.js:580
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:423 js/filelist.js:489 js/files.js:586
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:430
+#: js/filelist.js:541
msgid "{dirs} and {files}"
msgstr ""
-#: js/filelist.js:561
+#: js/filelist.js:731 js/filelist.js:769
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:626
-msgid "files uploading"
-msgstr ""
-
-#: js/files.js:52
+#: js/files.js:25
msgid "'.' is an invalid file name."
msgstr ""
-#: js/files.js:56
+#: js/files.js:29
msgid "File name cannot be empty."
msgstr ""
-#: js/files.js:64
+#: js/files.js:37
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: js/files.js:78
+#: js/files.js:51
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr ""
-#: js/files.js:82
+#: js/files.js:55
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:94
+#: js/files.js:67
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
msgstr ""
-#: js/files.js:245
+#: js/files.js:296
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/files.js:562 templates/index.php:67
+#: js/files.js:507 js/files.js:545
+msgid "Error moving file"
+msgstr ""
+
+#: js/files.js:558 templates/index.php:61
msgid "Name"
msgstr ""
-#: js/files.js:563 templates/index.php:78
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr ""
-#: js/files.js:564 templates/index.php:80
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr ""
@@ -232,7 +240,7 @@ msgstr ""
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:11 templates/index.php:18
+#: lib/helper.php:11 templates/index.php:17
msgid "Upload"
msgstr ""
@@ -268,65 +276,65 @@ msgstr ""
msgid "Save"
msgstr ""
-#: templates/index.php:7
+#: templates/index.php:6
msgid "New"
msgstr ""
-#: templates/index.php:10
+#: templates/index.php:9
msgid "Text file"
msgstr ""
-#: templates/index.php:12
+#: templates/index.php:11
msgid "Folder"
msgstr ""
-#: templates/index.php:14
+#: templates/index.php:13
msgid "From link"
msgstr ""
-#: templates/index.php:41
+#: templates/index.php:33
msgid "Deleted files"
msgstr ""
-#: templates/index.php:46
+#: templates/index.php:39
msgid "Cancel upload"
msgstr ""
-#: templates/index.php:52
+#: templates/index.php:45
msgid "You don’t have write permissions here."
msgstr ""
-#: templates/index.php:59
+#: templates/index.php:50
msgid "Nothing in here. Upload something!"
msgstr ""
-#: templates/index.php:73
+#: templates/index.php:67
msgid "Download"
msgstr ""
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr "شئیرنگ ختم کریں"
-#: templates/index.php:91 templates/index.php:92
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr ""
-#: templates/index.php:105
+#: templates/index.php:100
msgid "Upload too large"
msgstr ""
-#: templates/index.php:107
+#: templates/index.php:102
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: templates/index.php:112
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:115
+#: templates/index.php:110
msgid "Current scanning"
msgstr ""
diff --git a/l10n/ur_PK/settings.po b/l10n/ur_PK/settings.po
index 4c01294a252e75369accd6f3357c9999cc88ed31..2893f058698b459184db1abe193bf36800b79e67 100644
--- a/l10n/ur_PK/settings.po
+++ b/l10n/ur_PK/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:45-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
"MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgid "Unable to load list from App Store"
msgstr ""
#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
-#: ajax/togglegroups.php:20
+#: ajax/togglegroups.php:20 changepassword/controller.php:55
msgid "Authentication error"
msgstr ""
@@ -84,6 +84,35 @@ msgstr ""
msgid "Couldn't update app."
msgstr ""
+#: changepassword/controller.php:20
+msgid "Wrong password"
+msgstr ""
+
+#: changepassword/controller.php:42
+msgid "No user supplied"
+msgstr ""
+
+#: changepassword/controller.php:74
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr ""
+
+#: changepassword/controller.php:79
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr ""
+
+#: changepassword/controller.php:87
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr ""
+
+#: changepassword/controller.php:92 changepassword/controller.php:103
+msgid "Unable to change password"
+msgstr ""
+
#: js/apps.js:43
msgid "Update to {appversion}"
msgstr ""
@@ -128,15 +157,15 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:217
+#: js/personal.js:220
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:262
+#: js/personal.js:265
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:284
+#: js/personal.js:287
msgid "Saving..."
msgstr ""
diff --git a/l10n/vi/core.po b/l10n/vi/core.po
index 6cdb4d2458ee60d967844ac8c673f8f8b1cef041..d2f455e39e96e78cee3081683b7bf3fcb8a4d1aa 100644
--- a/l10n/vi/core.po
+++ b/l10n/vi/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:33+0000\n"
+"POT-Creation-Date: 2013-09-22 12:55-0400\n"
+"PO-Revision-Date: 2013-09-20 15:01+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
@@ -191,51 +191,51 @@ msgstr "Tháng 12"
msgid "Settings"
msgstr "Cà i đặt"
-#: js/js.js:853
+#: js/js.js:866
msgid "seconds ago"
msgstr "và i giây trước"
-#: js/js.js:854
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: js/js.js:855
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: js/js.js:856
+#: js/js.js:869
msgid "today"
msgstr "hôm nay"
-#: js/js.js:857
+#: js/js.js:870
msgid "yesterday"
msgstr "hôm qua"
-#: js/js.js:858
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
-#: js/js.js:859
+#: js/js.js:872
msgid "last month"
msgstr "tháng trước"
-#: js/js.js:860
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: js/js.js:861
+#: js/js.js:874
msgid "months ago"
msgstr "tháng trước"
-#: js/js.js:862
+#: js/js.js:875
msgid "last year"
msgstr "năm trước"
-#: js/js.js:863
+#: js/js.js:876
msgid "years ago"
msgstr "năm trước"
@@ -263,6 +263,45 @@ msgstr "Äồng ý"
msgid "Error loading message template: {error}"
msgstr ""
+#: js/oc-dialogs.js:347
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:367
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:376
+msgid "Cancel"
+msgstr "Hủy"
+
+#: js/oc-dialogs.js:386
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:457
+msgid "Error loading file exists template"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/vi/files.po b/l10n/vi/files.po
index ffc9063f5d7a4b0037a498de9c73bc04ba9fd648..df0a42f78e5ce8bc4e8f8df7a873ab9a85941953 100644
--- a/l10n/vi/files.po
+++ b/l10n/vi/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:00+0000\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
@@ -75,11 +75,15 @@ msgstr "Không thể ghi "
msgid "Not enough storage available"
msgstr "Không đủ không gian lưu trữ"
-#: ajax/upload.php:109
-msgid "Upload failed"
-msgstr "Tải lên thất bại"
+#: ajax/upload.php:120 ajax/upload.php:143
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:136
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
-#: ajax/upload.php:127
+#: ajax/upload.php:160
msgid "Invalid directory."
msgstr "Thư mục không hợp lệ"
@@ -87,141 +91,145 @@ msgstr "Thư mục không hợp lệ"
msgid "Files"
msgstr "Táºp tin"
-#: js/file-upload.js:11
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Không thể tải lên táºp tin của bạn ,nó nhÆ° là má»™t thÆ° mục hoặc có 0 byte"
+#: js/file-upload.js:244
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
+msgstr ""
-#: js/file-upload.js:24
+#: js/file-upload.js:255
msgid "Not enough space available"
msgstr "Không đủ chỗ trống cần thiết"
-#: js/file-upload.js:64
+#: js/file-upload.js:322
msgid "Upload cancelled."
msgstr "Hủy tải lên"
-#: js/file-upload.js:165
+#: js/file-upload.js:356
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:446
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Táºp tin tải lên Ä‘ang được xá» lý. Nếu bạn rá»i khá»i trang bây giá» sẽ hủy quá trình nà y."
-#: js/file-upload.js:239
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr "URL không được để trống."
-#: js/file-upload.js:244 lib/app.php:53
+#: js/file-upload.js:525 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550
+#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545
msgid "Error"
msgstr "Lá»—i"
-#: js/fileactions.js:116
+#: js/fileactions.js:119
msgid "Share"
msgstr "Chia sẻ"
-#: js/fileactions.js:126
+#: js/fileactions.js:131
msgid "Delete permanently"
msgstr "Xóa vĩnh vễn"
-#: js/fileactions.js:192
+#: js/fileactions.js:197
msgid "Rename"
msgstr "Sá»a tên"
-#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "Äang chá»"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{new_name} đã tồn tại"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "thay thế"
-#: js/filelist.js:307
+#: js/filelist.js:416
msgid "suggest name"
msgstr "tên gợi ý"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "hủy"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr "đã thay thế {new_name} bằng {old_name}"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "undo"
msgstr "lùi lại"
-#: js/filelist.js:424 js/filelist.js:490 js/files.js:581
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
-#: js/filelist.js:425 js/filelist.js:491 js/files.js:587
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
-#: js/filelist.js:432
+#: js/filelist.js:541
msgid "{dirs} and {files}"
msgstr ""
-#: js/filelist.js:563
+#: js/filelist.js:731 js/filelist.js:769
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
-#: js/filelist.js:628
-msgid "files uploading"
-msgstr "tệp tin đang được tải lên"
-
-#: js/files.js:52
+#: js/files.js:25
msgid "'.' is an invalid file name."
msgstr "'.' là một tên file không hợp lệ"
-#: js/files.js:56
+#: js/files.js:29
msgid "File name cannot be empty."
msgstr "Tên file không được rỗng"
-#: js/files.js:64
+#: js/files.js:37
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Tên không hợp lệ, '\\', '/', '<', '>', ':', '\"', '|', '?' và '*' thì không được phép dùng."
-#: js/files.js:78
+#: js/files.js:51
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr "Your storage is full, files can not be updated or synced anymore!"
-#: js/files.js:82
+#: js/files.js:55
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Your storage is almost full ({usedSpacePercent}%)"
-#: js/files.js:94
+#: js/files.js:67
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
msgstr ""
-#: js/files.js:245
+#: js/files.js:296
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "Your download is being prepared. This might take some time if the files are big."
-#: js/files.js:563 templates/index.php:69
+#: js/files.js:507 js/files.js:545
+msgid "Error moving file"
+msgstr ""
+
+#: js/files.js:558 templates/index.php:61
msgid "Name"
msgstr "Tên"
-#: js/files.js:564 templates/index.php:81
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "KÃch cỡ"
-#: js/files.js:565 templates/index.php:83
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr "Thay đổi"
@@ -230,7 +238,7 @@ msgstr "Thay đổi"
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:11 templates/index.php:18
+#: lib/helper.php:11 templates/index.php:17
msgid "Upload"
msgstr "Tải lên"
@@ -266,65 +274,65 @@ msgstr "KÃch thÆ°á»›c tối Ä‘a cho các táºp tin ZIP"
msgid "Save"
msgstr "LÆ°u"
-#: templates/index.php:7
+#: templates/index.php:6
msgid "New"
msgstr "Má»›i"
-#: templates/index.php:10
+#: templates/index.php:9
msgid "Text file"
msgstr "Táºp tin văn bản"
-#: templates/index.php:12
+#: templates/index.php:11
msgid "Folder"
msgstr "Thư mục"
-#: templates/index.php:14
+#: templates/index.php:13
msgid "From link"
msgstr "Từ liên kết"
-#: templates/index.php:41
+#: templates/index.php:33
msgid "Deleted files"
msgstr "File đã bị xóa"
-#: templates/index.php:46
+#: templates/index.php:39
msgid "Cancel upload"
msgstr "Hủy upload"
-#: templates/index.php:52
+#: templates/index.php:45
msgid "You don’t have write permissions here."
msgstr "Bạn không có quyá»n ghi và o đây."
-#: templates/index.php:59
+#: templates/index.php:50
msgid "Nothing in here. Upload something!"
msgstr "Không có gì ở đây .Hãy tải lên một cái gì đó !"
-#: templates/index.php:75
+#: templates/index.php:67
msgid "Download"
msgstr "Tải vá»"
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr "BỠchia sẻ"
-#: templates/index.php:94 templates/index.php:95
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "Xóa"
-#: templates/index.php:108
+#: templates/index.php:100
msgid "Upload too large"
msgstr "Táºp tin tải lên quá lá»›n"
-#: templates/index.php:110
+#: templates/index.php:102
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Các táºp tin bạn Ä‘ang tải lên vượt quá kÃch thÆ°á»›c tối Ä‘a cho phép trên máy chủ ."
-#: templates/index.php:115
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr "Táºp tin Ä‘ang được quét ,vui lòng chá»."
-#: templates/index.php:118
+#: templates/index.php:110
msgid "Current scanning"
msgstr "Hiện tại đang quét"
diff --git a/l10n/vi/settings.po b/l10n/vi/settings.po
index 1297da2664f428b91b8b082c06b79501989e4de5..a34995956113d595aa5eba2caa252d06cd16a377 100644
--- a/l10n/vi/settings.po
+++ b/l10n/vi/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:45-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgid "Unable to load list from App Store"
msgstr "Không thể tải danh sách ứng dụng từ App Store"
#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
-#: ajax/togglegroups.php:20
+#: ajax/togglegroups.php:20 changepassword/controller.php:55
msgid "Authentication error"
msgstr "Lỗi xác thực"
@@ -84,6 +84,35 @@ msgstr "Không thể xóa ngÆ°á»i dùng từ nhóm %s"
msgid "Couldn't update app."
msgstr "Không thể cáºp nháºt ứng dụng"
+#: changepassword/controller.php:20
+msgid "Wrong password"
+msgstr ""
+
+#: changepassword/controller.php:42
+msgid "No user supplied"
+msgstr ""
+
+#: changepassword/controller.php:74
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr ""
+
+#: changepassword/controller.php:79
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr ""
+
+#: changepassword/controller.php:87
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr ""
+
+#: changepassword/controller.php:92 changepassword/controller.php:103
+msgid "Unable to change password"
+msgstr ""
+
#: js/apps.js:43
msgid "Update to {appversion}"
msgstr "Cáºp nháºt lên {appversion}"
@@ -128,15 +157,15 @@ msgstr "Cáºp nháºt"
msgid "Updated"
msgstr "Äã cáºp nháºt"
-#: js/personal.js:217
+#: js/personal.js:220
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:262
+#: js/personal.js:265
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:284
+#: js/personal.js:287
msgid "Saving..."
msgstr "Äang lÆ°u..."
diff --git a/l10n/zh_CN/core.po b/l10n/zh_CN/core.po
index 8d4cdaa172a2016fe1139062a181d1e949112ddb..f321e4cfc4b406ee70a70195ab4b5ad7aba7bc3f 100644
--- a/l10n/zh_CN/core.po
+++ b/l10n/zh_CN/core.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:33+0000\n"
+"POT-Creation-Date: 2013-09-22 12:55-0400\n"
+"PO-Revision-Date: 2013-09-20 15:01+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
@@ -193,51 +193,51 @@ msgstr "å二月"
msgid "Settings"
msgstr "设置"
-#: js/js.js:853
+#: js/js.js:866
msgid "seconds ago"
msgstr "秒å‰"
-#: js/js.js:854
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n 分钟å‰"
-#: js/js.js:855
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n å°æ—¶å‰"
-#: js/js.js:856
+#: js/js.js:869
msgid "today"
msgstr "今天"
-#: js/js.js:857
+#: js/js.js:870
msgid "yesterday"
msgstr "昨天"
-#: js/js.js:858
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n 天å‰"
-#: js/js.js:859
+#: js/js.js:872
msgid "last month"
msgstr "上月"
-#: js/js.js:860
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n 月å‰"
-#: js/js.js:861
+#: js/js.js:874
msgid "months ago"
msgstr "月å‰"
-#: js/js.js:862
+#: js/js.js:875
msgid "last year"
msgstr "去年"
-#: js/js.js:863
+#: js/js.js:876
msgid "years ago"
msgstr "å¹´å‰"
@@ -265,6 +265,45 @@ msgstr "好"
msgid "Error loading message template: {error}"
msgstr ""
+#: js/oc-dialogs.js:347
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:367
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:376
+msgid "Cancel"
+msgstr "å–消"
+
+#: js/oc-dialogs.js:386
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:457
+msgid "Error loading file exists template"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/zh_CN/files.po b/l10n/zh_CN/files.po
index e68d22da13a3f9de93649ffdbb140c62e0bdd3d6..26678e7a4538a41164ae367dd0dd89bdab04bae3 100644
--- a/l10n/zh_CN/files.po
+++ b/l10n/zh_CN/files.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:00+0000\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
@@ -77,11 +77,15 @@ msgstr "写入ç£ç›˜å¤±è´¥"
msgid "Not enough storage available"
msgstr "没有足够的å˜å‚¨ç©ºé—´"
-#: ajax/upload.php:109
-msgid "Upload failed"
-msgstr "ä¸Šä¼ å¤±è´¥"
+#: ajax/upload.php:120 ajax/upload.php:143
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:136
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
-#: ajax/upload.php:127
+#: ajax/upload.php:160
msgid "Invalid directory."
msgstr "æ— æ•ˆæ–‡ä»¶å¤¹ã€‚"
@@ -89,141 +93,145 @@ msgstr "æ— æ•ˆæ–‡ä»¶å¤¹ã€‚"
msgid "Files"
msgstr "文件"
-#: js/file-upload.js:11
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "æ— æ³•ä¸Šä¼ æ‚¨çš„æ–‡ä»¶ï¼Œæ–‡ä»¶å¤¹æˆ–è€…ç©ºæ–‡ä»¶"
+#: js/file-upload.js:244
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
+msgstr ""
-#: js/file-upload.js:24
+#: js/file-upload.js:255
msgid "Not enough space available"
msgstr "没有足够å¯ç”¨ç©ºé—´"
-#: js/file-upload.js:64
+#: js/file-upload.js:322
msgid "Upload cancelled."
msgstr "ä¸Šä¼ å·²å–消"
-#: js/file-upload.js:165
+#: js/file-upload.js:356
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:446
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "文件æ£åœ¨ä¸Šä¼ ä¸ã€‚现在离开æ¤é¡µä¼šå¯¼è‡´ä¸Šä¼ 动作被å–消。"
-#: js/file-upload.js:239
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr "URLä¸èƒ½ä¸ºç©º"
-#: js/file-upload.js:244 lib/app.php:53
+#: js/file-upload.js:525 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr "æ— æ•ˆçš„æ–‡ä»¶å¤¹å。â€Shared“ 是 Owncloud 预留的文件夹"
-#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550
+#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545
msgid "Error"
msgstr "错误"
-#: js/fileactions.js:116
+#: js/fileactions.js:119
msgid "Share"
msgstr "分享"
-#: js/fileactions.js:126
+#: js/fileactions.js:131
msgid "Delete permanently"
msgstr "æ°¸ä¹…åˆ é™¤"
-#: js/fileactions.js:192
+#: js/fileactions.js:197
msgid "Rename"
msgstr "é‡å‘½å"
-#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "ç‰å¾…"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{new_name} å·²å˜åœ¨"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "替æ¢"
-#: js/filelist.js:307
+#: js/filelist.js:416
msgid "suggest name"
msgstr "建议å称"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "å–消"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr "已将 {old_name}替æ¢æˆ {new_name}"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "undo"
msgstr "撤销"
-#: js/filelist.js:424 js/filelist.js:490 js/files.js:581
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "%n 文件夹"
-#: js/filelist.js:425 js/filelist.js:491 js/files.js:587
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "%n个文件"
-#: js/filelist.js:432
+#: js/filelist.js:541
msgid "{dirs} and {files}"
msgstr ""
-#: js/filelist.js:563
+#: js/filelist.js:731 js/filelist.js:769
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
-#: js/filelist.js:628
-msgid "files uploading"
-msgstr "æ–‡ä»¶ä¸Šä¼ ä¸"
-
-#: js/files.js:52
+#: js/files.js:25
msgid "'.' is an invalid file name."
msgstr "'.' æ˜¯ä¸€ä¸ªæ— æ•ˆçš„æ–‡ä»¶å。"
-#: js/files.js:56
+#: js/files.js:29
msgid "File name cannot be empty."
msgstr "文件åä¸èƒ½ä¸ºç©ºã€‚"
-#: js/files.js:64
+#: js/files.js:37
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "æ— æ•ˆå称，'\\', '/', '<', '>', ':', '\"', '|', '?' å’Œ '*' ä¸è¢«å…许使用。"
-#: js/files.js:78
+#: js/files.js:51
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr "您的å˜å‚¨ç©ºé—´å·²æ»¡ï¼Œæ–‡ä»¶å°†æ— 法更新或åŒæ¥ï¼"
-#: js/files.js:82
+#: js/files.js:55
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "您的å˜å‚¨ç©ºé—´å³å°†ç”¨å®Œ ({usedSpacePercent}%)"
-#: js/files.js:94
+#: js/files.js:67
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
msgstr ""
-#: js/files.js:245
+#: js/files.js:296
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "下载æ£åœ¨å‡†å¤‡ä¸ã€‚如果文件较大å¯èƒ½ä¼šèŠ±è´¹ä¸€äº›æ—¶é—´ã€‚"
-#: js/files.js:563 templates/index.php:69
+#: js/files.js:507 js/files.js:545
+msgid "Error moving file"
+msgstr ""
+
+#: js/files.js:558 templates/index.php:61
msgid "Name"
msgstr "å称"
-#: js/files.js:564 templates/index.php:81
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "大å°"
-#: js/files.js:565 templates/index.php:83
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr "修改日期"
@@ -232,7 +240,7 @@ msgstr "修改日期"
msgid "%s could not be renamed"
msgstr "%s ä¸èƒ½è¢«é‡å‘½å"
-#: lib/helper.php:11 templates/index.php:18
+#: lib/helper.php:11 templates/index.php:17
msgid "Upload"
msgstr "ä¸Šä¼ "
@@ -268,65 +276,65 @@ msgstr "ZIP 文件的最大输入大å°"
msgid "Save"
msgstr "ä¿å˜"
-#: templates/index.php:7
+#: templates/index.php:6
msgid "New"
msgstr "新建"
-#: templates/index.php:10
+#: templates/index.php:9
msgid "Text file"
msgstr "文本文件"
-#: templates/index.php:12
+#: templates/index.php:11
msgid "Folder"
msgstr "文件夹"
-#: templates/index.php:14
+#: templates/index.php:13
msgid "From link"
msgstr "æ¥è‡ªé“¾æŽ¥"
-#: templates/index.php:41
+#: templates/index.php:33
msgid "Deleted files"
msgstr "å·²åˆ é™¤æ–‡ä»¶"
-#: templates/index.php:46
+#: templates/index.php:39
msgid "Cancel upload"
msgstr "å–æ¶ˆä¸Šä¼ "
-#: templates/index.php:52
+#: templates/index.php:45
msgid "You don’t have write permissions here."
msgstr "您没有写æƒé™"
-#: templates/index.php:59
+#: templates/index.php:50
msgid "Nothing in here. Upload something!"
msgstr "è¿™é‡Œè¿˜ä»€ä¹ˆéƒ½æ²¡æœ‰ã€‚ä¸Šä¼ äº›ä¸œè¥¿å§ï¼"
-#: templates/index.php:75
+#: templates/index.php:67
msgid "Download"
msgstr "下载"
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr "å–消共享"
-#: templates/index.php:94 templates/index.php:95
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "åˆ é™¤"
-#: templates/index.php:108
+#: templates/index.php:100
msgid "Upload too large"
msgstr "ä¸Šä¼ æ–‡ä»¶è¿‡å¤§"
-#: templates/index.php:110
+#: templates/index.php:102
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "您æ£å°è¯•ä¸Šä¼ 的文件超过了æ¤æœåŠ¡å™¨å¯ä»¥ä¸Šä¼ 的最大容é‡é™åˆ¶"
-#: templates/index.php:115
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr "文件æ£åœ¨è¢«æ‰«æ，请ç¨å€™ã€‚"
-#: templates/index.php:118
+#: templates/index.php:110
msgid "Current scanning"
msgstr "当å‰æ‰«æ"
diff --git a/l10n/zh_CN/settings.po b/l10n/zh_CN/settings.po
index f6c57de60cb255f4c32408b7b3c80c0f74c6e76e..fc3228827b0d9cd0f3a8ca14f14411619481a439 100644
--- a/l10n/zh_CN/settings.po
+++ b/l10n/zh_CN/settings.po
@@ -12,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:45-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgid "Unable to load list from App Store"
msgstr "æ— æ³•ä»Žåº”ç”¨å•†åº—è½½å…¥åˆ—è¡¨"
#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
-#: ajax/togglegroups.php:20
+#: ajax/togglegroups.php:20 changepassword/controller.php:55
msgid "Authentication error"
msgstr "认è¯å‡ºé”™"
@@ -89,6 +89,35 @@ msgstr "æ— æ³•ä»Žç»„%sä¸ç§»é™¤ç”¨æˆ·"
msgid "Couldn't update app."
msgstr "æ— æ³•æ›´æ–° app。"
+#: changepassword/controller.php:20
+msgid "Wrong password"
+msgstr ""
+
+#: changepassword/controller.php:42
+msgid "No user supplied"
+msgstr ""
+
+#: changepassword/controller.php:74
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr ""
+
+#: changepassword/controller.php:79
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr ""
+
+#: changepassword/controller.php:87
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr ""
+
+#: changepassword/controller.php:92 changepassword/controller.php:103
+msgid "Unable to change password"
+msgstr ""
+
#: js/apps.js:43
msgid "Update to {appversion}"
msgstr "更新至 {appversion}"
@@ -133,15 +162,15 @@ msgstr "æ›´æ–°"
msgid "Updated"
msgstr "已更新"
-#: js/personal.js:217
+#: js/personal.js:220
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:262
+#: js/personal.js:265
msgid "Decrypting files... Please wait, this can take some time."
msgstr "æ£åœ¨è§£å¯†æ–‡ä»¶... 请ç¨ç‰ï¼Œå¯èƒ½éœ€è¦ä¸€äº›æ—¶é—´ã€‚"
-#: js/personal.js:284
+#: js/personal.js:287
msgid "Saving..."
msgstr "ä¿å˜ä¸"
@@ -465,7 +494,7 @@ msgstr "填写电å邮件地å€ä»¥å¯ç”¨å¯†ç æ¢å¤åŠŸèƒ½"
#: templates/personal.php:86
msgid "Profile picture"
-msgstr ""
+msgstr "è”系人图片"
#: templates/personal.php:90
msgid "Upload new"
diff --git a/l10n/zh_HK/core.po b/l10n/zh_HK/core.po
index 51efb5c3cf65be439d639b50111817287217e1b4..b4aef3cc566c26c7df2f843445c8698d0166968d 100644
--- a/l10n/zh_HK/core.po
+++ b/l10n/zh_HK/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:33+0000\n"
+"POT-Creation-Date: 2013-09-22 12:55-0400\n"
+"PO-Revision-Date: 2013-09-20 15:01+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
@@ -190,51 +190,51 @@ msgstr "å二月"
msgid "Settings"
msgstr "è¨å®š"
-#: js/js.js:853
+#: js/js.js:866
msgid "seconds ago"
msgstr ""
-#: js/js.js:854
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: js/js.js:855
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: js/js.js:856
+#: js/js.js:869
msgid "today"
msgstr "今日"
-#: js/js.js:857
+#: js/js.js:870
msgid "yesterday"
msgstr "昨日"
-#: js/js.js:858
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
-#: js/js.js:859
+#: js/js.js:872
msgid "last month"
msgstr "å‰ä¸€æœˆ"
-#: js/js.js:860
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: js/js.js:861
+#: js/js.js:874
msgid "months ago"
msgstr "個月之å‰"
-#: js/js.js:862
+#: js/js.js:875
msgid "last year"
msgstr ""
-#: js/js.js:863
+#: js/js.js:876
msgid "years ago"
msgstr ""
@@ -262,6 +262,45 @@ msgstr "OK"
msgid "Error loading message template: {error}"
msgstr ""
+#: js/oc-dialogs.js:347
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:367
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:376
+msgid "Cancel"
+msgstr "å–消"
+
+#: js/oc-dialogs.js:386
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:457
+msgid "Error loading file exists template"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/zh_HK/files.po b/l10n/zh_HK/files.po
index ef901a270fc65148fcece1dcd9a45d1b5c5d65af..20aca3cb37e20ea744d09f020c050b6d9ecc1e11 100644
--- a/l10n/zh_HK/files.po
+++ b/l10n/zh_HK/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:00+0000\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
@@ -74,11 +74,15 @@ msgstr ""
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:109
-msgid "Upload failed"
+#: ajax/upload.php:120 ajax/upload.php:143
+msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:127
+#: ajax/upload.php:136
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
+
+#: ajax/upload.php:160
msgid "Invalid directory."
msgstr ""
@@ -86,141 +90,145 @@ msgstr ""
msgid "Files"
msgstr "文件"
-#: js/file-upload.js:11
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
+#: js/file-upload.js:244
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr ""
-#: js/file-upload.js:24
+#: js/file-upload.js:255
msgid "Not enough space available"
msgstr ""
-#: js/file-upload.js:64
+#: js/file-upload.js:322
msgid "Upload cancelled."
msgstr ""
-#: js/file-upload.js:165
+#: js/file-upload.js:356
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:446
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/file-upload.js:239
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr ""
-#: js/file-upload.js:244 lib/app.php:53
+#: js/file-upload.js:525 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550
+#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545
msgid "Error"
msgstr "錯誤"
-#: js/fileactions.js:116
+#: js/fileactions.js:119
msgid "Share"
msgstr "分享"
-#: js/fileactions.js:126
+#: js/fileactions.js:131
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:192
+#: js/fileactions.js:197
msgid "Rename"
msgstr ""
-#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr ""
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr ""
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr ""
-#: js/filelist.js:307
+#: js/filelist.js:416
msgid "suggest name"
msgstr ""
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr ""
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr ""
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "undo"
msgstr ""
-#: js/filelist.js:424 js/filelist.js:490 js/files.js:581
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
-#: js/filelist.js:425 js/filelist.js:491 js/files.js:587
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
-#: js/filelist.js:432
+#: js/filelist.js:541
msgid "{dirs} and {files}"
msgstr ""
-#: js/filelist.js:563
+#: js/filelist.js:731 js/filelist.js:769
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
-#: js/filelist.js:628
-msgid "files uploading"
-msgstr ""
-
-#: js/files.js:52
+#: js/files.js:25
msgid "'.' is an invalid file name."
msgstr ""
-#: js/files.js:56
+#: js/files.js:29
msgid "File name cannot be empty."
msgstr ""
-#: js/files.js:64
+#: js/files.js:37
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: js/files.js:78
+#: js/files.js:51
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr ""
-#: js/files.js:82
+#: js/files.js:55
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:94
+#: js/files.js:67
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
msgstr ""
-#: js/files.js:245
+#: js/files.js:296
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/files.js:563 templates/index.php:69
+#: js/files.js:507 js/files.js:545
+msgid "Error moving file"
+msgstr ""
+
+#: js/files.js:558 templates/index.php:61
msgid "Name"
msgstr "å稱"
-#: js/files.js:564 templates/index.php:81
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr ""
-#: js/files.js:565 templates/index.php:83
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr ""
@@ -229,7 +237,7 @@ msgstr ""
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:11 templates/index.php:18
+#: lib/helper.php:11 templates/index.php:17
msgid "Upload"
msgstr "上傳"
@@ -265,65 +273,65 @@ msgstr ""
msgid "Save"
msgstr "儲å˜"
-#: templates/index.php:7
+#: templates/index.php:6
msgid "New"
msgstr ""
-#: templates/index.php:10
+#: templates/index.php:9
msgid "Text file"
msgstr ""
-#: templates/index.php:12
+#: templates/index.php:11
msgid "Folder"
msgstr ""
-#: templates/index.php:14
+#: templates/index.php:13
msgid "From link"
msgstr ""
-#: templates/index.php:41
+#: templates/index.php:33
msgid "Deleted files"
msgstr ""
-#: templates/index.php:46
+#: templates/index.php:39
msgid "Cancel upload"
msgstr ""
-#: templates/index.php:52
+#: templates/index.php:45
msgid "You don’t have write permissions here."
msgstr ""
-#: templates/index.php:59
+#: templates/index.php:50
msgid "Nothing in here. Upload something!"
msgstr ""
-#: templates/index.php:75
+#: templates/index.php:67
msgid "Download"
msgstr "下載"
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr "å–消分享"
-#: templates/index.php:94 templates/index.php:95
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "刪除"
-#: templates/index.php:108
+#: templates/index.php:100
msgid "Upload too large"
msgstr ""
-#: templates/index.php:110
+#: templates/index.php:102
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: templates/index.php:115
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:118
+#: templates/index.php:110
msgid "Current scanning"
msgstr ""
diff --git a/l10n/zh_HK/settings.po b/l10n/zh_HK/settings.po
index ac0290157fb287f42a32fda3d9b86dc8b5fc2fdc..079b4a52ddfdca50a9f63c4996078552fefedf71 100644
--- a/l10n/zh_HK/settings.po
+++ b/l10n/zh_HK/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:45-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgid "Unable to load list from App Store"
msgstr ""
#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
-#: ajax/togglegroups.php:20
+#: ajax/togglegroups.php:20 changepassword/controller.php:55
msgid "Authentication error"
msgstr ""
@@ -84,6 +84,35 @@ msgstr ""
msgid "Couldn't update app."
msgstr ""
+#: changepassword/controller.php:20
+msgid "Wrong password"
+msgstr ""
+
+#: changepassword/controller.php:42
+msgid "No user supplied"
+msgstr ""
+
+#: changepassword/controller.php:74
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr ""
+
+#: changepassword/controller.php:79
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr ""
+
+#: changepassword/controller.php:87
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr ""
+
+#: changepassword/controller.php:92 changepassword/controller.php:103
+msgid "Unable to change password"
+msgstr ""
+
#: js/apps.js:43
msgid "Update to {appversion}"
msgstr ""
@@ -128,15 +157,15 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:217
+#: js/personal.js:220
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:262
+#: js/personal.js:265
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:284
+#: js/personal.js:287
msgid "Saving..."
msgstr ""
diff --git a/l10n/zh_TW/core.po b/l10n/zh_TW/core.po
index 405447f8111abb7cf4055e81344d4c6833d104aa..4db9d316b844049b7a271b30b45e5247599050b6 100644
--- a/l10n/zh_TW/core.po
+++ b/l10n/zh_TW/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:33+0000\n"
+"POT-Creation-Date: 2013-09-22 12:55-0400\n"
+"PO-Revision-Date: 2013-09-20 15:01+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
@@ -192,51 +192,51 @@ msgstr "å二月"
msgid "Settings"
msgstr "è¨å®š"
-#: js/js.js:853
+#: js/js.js:866
msgid "seconds ago"
msgstr "幾秒å‰"
-#: js/js.js:854
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n 分é˜å‰"
-#: js/js.js:855
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n å°æ™‚å‰"
-#: js/js.js:856
+#: js/js.js:869
msgid "today"
msgstr "今天"
-#: js/js.js:857
+#: js/js.js:870
msgid "yesterday"
msgstr "昨天"
-#: js/js.js:858
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n 天å‰"
-#: js/js.js:859
+#: js/js.js:872
msgid "last month"
msgstr "上個月"
-#: js/js.js:860
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n 個月å‰"
-#: js/js.js:861
+#: js/js.js:874
msgid "months ago"
msgstr "幾個月å‰"
-#: js/js.js:862
+#: js/js.js:875
msgid "last year"
msgstr "去年"
-#: js/js.js:863
+#: js/js.js:876
msgid "years ago"
msgstr "幾年å‰"
@@ -264,6 +264,45 @@ msgstr "好"
msgid "Error loading message template: {error}"
msgstr ""
+#: js/oc-dialogs.js:347
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:367
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:376
+msgid "Cancel"
+msgstr "å–消"
+
+#: js/oc-dialogs.js:386
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:457
+msgid "Error loading file exists template"
+msgstr ""
+
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
diff --git a/l10n/zh_TW/files.po b/l10n/zh_TW/files.po
index cc65168506e663d1fb9a2b1b481f275b768a1a1e..60f8fdf7a0d9e27f103383d652fdff47d1a645de 100644
--- a/l10n/zh_TW/files.po
+++ b/l10n/zh_TW/files.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-13 21:46-0400\n"
-"PO-Revision-Date: 2013-09-14 00:00+0000\n"
-"Last-Translator: pellaeon <nfsmwlin@gmail.com>\n"
+"POT-Creation-Date: 2013-09-20 10:44-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -75,11 +75,15 @@ msgstr "寫入硬碟失敗"
msgid "Not enough storage available"
msgstr "儲å˜ç©ºé–“ä¸è¶³"
-#: ajax/upload.php:109
-msgid "Upload failed"
-msgstr "上傳失敗"
+#: ajax/upload.php:120 ajax/upload.php:143
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:136
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
-#: ajax/upload.php:127
+#: ajax/upload.php:160
msgid "Invalid directory."
msgstr "無效的資料夾"
@@ -87,141 +91,145 @@ msgstr "無效的資料夾"
msgid "Files"
msgstr "檔案"
-#: js/file-upload.js:11
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "ç„¡æ³•ä¸Šå‚³æ‚¨çš„æª”æ¡ˆï¼Œå› ç‚ºå®ƒå¯èƒ½æ˜¯ä¸€å€‹ç›®éŒ„或檔案大å°ç‚º0"
+#: js/file-upload.js:244
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
+msgstr ""
-#: js/file-upload.js:24
+#: js/file-upload.js:255
msgid "Not enough space available"
msgstr "æ²’æœ‰è¶³å¤ çš„å¯ç”¨ç©ºé–“"
-#: js/file-upload.js:64
+#: js/file-upload.js:322
msgid "Upload cancelled."
msgstr "上傳已å–消"
-#: js/file-upload.js:165
+#: js/file-upload.js:356
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:446
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "檔案上傳ä¸ï¼Œé›¢é–‹æ¤é é¢å°‡æœƒå–消上傳。"
-#: js/file-upload.js:239
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr "URL ä¸èƒ½ç‚ºç©º"
-#: js/file-upload.js:244 lib/app.php:53
+#: js/file-upload.js:525 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr "無效的資料夾å稱，'Shared' 的使用被 ownCloud ä¿ç•™"
-#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550
+#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545
msgid "Error"
msgstr "錯誤"
-#: js/fileactions.js:116
+#: js/fileactions.js:119
msgid "Share"
msgstr "分享"
-#: js/fileactions.js:126
+#: js/fileactions.js:131
msgid "Delete permanently"
msgstr "永久刪除"
-#: js/fileactions.js:192
+#: js/fileactions.js:197
msgid "Rename"
msgstr "é‡æ–°å‘½å"
-#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "ç‰å€™ä¸"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{new_name} 已經å˜åœ¨"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "å–代"
-#: js/filelist.js:307
+#: js/filelist.js:416
msgid "suggest name"
msgstr "建è°æª”å"
-#: js/filelist.js:307 js/filelist.js:309
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "å–消"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr "使用 {new_name} å–代 {old_name}"
-#: js/filelist.js:354
+#: js/filelist.js:463
msgid "undo"
msgstr "復原"
-#: js/filelist.js:424 js/filelist.js:490 js/files.js:581
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "%n 個資料夾"
-#: js/filelist.js:425 js/filelist.js:491 js/files.js:587
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "%n 個檔案"
-#: js/filelist.js:432
+#: js/filelist.js:541
msgid "{dirs} and {files}"
msgstr "{dirs} 和 {files}"
-#: js/filelist.js:563
+#: js/filelist.js:731 js/filelist.js:769
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "%n 個檔案æ£åœ¨ä¸Šå‚³"
-#: js/filelist.js:628
-msgid "files uploading"
-msgstr "檔案上傳ä¸"
-
-#: js/files.js:52
+#: js/files.js:25
msgid "'.' is an invalid file name."
msgstr "'.' 是ä¸åˆæ³•çš„檔å"
-#: js/files.js:56
+#: js/files.js:29
msgid "File name cannot be empty."
msgstr "檔åä¸èƒ½ç‚ºç©º"
-#: js/files.js:64
+#: js/files.js:37
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "檔åä¸åˆæ³•ï¼Œä¸å…許 \\ / < > : \" | ? * å—å…ƒ"
-#: js/files.js:78
+#: js/files.js:51
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr "您的儲å˜ç©ºé–“已滿，沒有辦法å†æ›´æ–°æˆ–是åŒæ¥æª”案ï¼"
-#: js/files.js:82
+#: js/files.js:55
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "您的儲å˜ç©ºé–“å¿«è¦æ»¿äº† ({usedSpacePercent}%)"
-#: js/files.js:94
+#: js/files.js:67
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
msgstr "åŠ å¯†å·²ç¶“è¢«åœç”¨ï¼Œä½†æ˜¯æ‚¨çš„èˆŠæª”æ¡ˆé‚„æ˜¯è™•æ–¼å·²åŠ å¯†çš„ç‹€æ…‹ï¼Œè«‹å‰å¾€å€‹äººè¨å®šä»¥è§£å¯†é€™äº›æª”案。"
-#: js/files.js:245
+#: js/files.js:296
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "æ£åœ¨æº–備您的下載，若您的檔案較大，將會需è¦æ›´å¤šæ™‚間。"
-#: js/files.js:563 templates/index.php:69
+#: js/files.js:507 js/files.js:545
+msgid "Error moving file"
+msgstr ""
+
+#: js/files.js:558 templates/index.php:61
msgid "Name"
msgstr "å稱"
-#: js/files.js:564 templates/index.php:81
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "大å°"
-#: js/files.js:565 templates/index.php:83
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr "修改時間"
@@ -230,7 +238,7 @@ msgstr "修改時間"
msgid "%s could not be renamed"
msgstr "無法é‡æ–°å‘½å %s"
-#: lib/helper.php:11 templates/index.php:18
+#: lib/helper.php:11 templates/index.php:17
msgid "Upload"
msgstr "上傳"
@@ -266,65 +274,65 @@ msgstr "ZIP 壓縮å‰çš„原始大å°é™åˆ¶"
msgid "Save"
msgstr "儲å˜"
-#: templates/index.php:7
+#: templates/index.php:6
msgid "New"
msgstr "新增"
-#: templates/index.php:10
+#: templates/index.php:9
msgid "Text file"
msgstr "æ–‡å—檔"
-#: templates/index.php:12
+#: templates/index.php:11
msgid "Folder"
msgstr "資料夾"
-#: templates/index.php:14
+#: templates/index.php:13
msgid "From link"
msgstr "從連çµ"
-#: templates/index.php:41
+#: templates/index.php:33
msgid "Deleted files"
msgstr "回收桶"
-#: templates/index.php:46
+#: templates/index.php:39
msgid "Cancel upload"
msgstr "å–消上傳"
-#: templates/index.php:52
+#: templates/index.php:45
msgid "You don’t have write permissions here."
msgstr "您在這裡沒有編輯權"
-#: templates/index.php:59
+#: templates/index.php:50
msgid "Nothing in here. Upload something!"
msgstr "這裡還沒有æ±è¥¿ï¼Œä¸Šå‚³ä¸€äº›å§ï¼"
-#: templates/index.php:75
+#: templates/index.php:67
msgid "Download"
msgstr "下載"
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr "å–消分享"
-#: templates/index.php:94 templates/index.php:95
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "刪除"
-#: templates/index.php:108
+#: templates/index.php:100
msgid "Upload too large"
msgstr "上傳éŽå¤§"
-#: templates/index.php:110
+#: templates/index.php:102
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "您試圖上傳的檔案大å°è¶…éŽä¼ºæœå™¨çš„é™åˆ¶ã€‚"
-#: templates/index.php:115
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr "æ£åœ¨æŽƒæ檔案，請ç¨ç‰ã€‚"
-#: templates/index.php:118
+#: templates/index.php:110
msgid "Current scanning"
msgstr "æ£åœ¨æŽƒæ"
diff --git a/l10n/zh_TW/settings.po b/l10n/zh_TW/settings.po
index 207a0b4670bc35c5399f1a79cca929f6d0b5c1ca..5c24961e5cb323bf56bf9d2263e11a5ac45e8f2a 100644
--- a/l10n/zh_TW/settings.po
+++ b/l10n/zh_TW/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-09-20 10:45-0400\n"
+"PO-Revision-Date: 2013-09-20 14:45+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
@@ -23,7 +23,7 @@ msgid "Unable to load list from App Store"
msgstr "無法從 App Store 讀å–清單"
#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
-#: ajax/togglegroups.php:20
+#: ajax/togglegroups.php:20 changepassword/controller.php:55
msgid "Authentication error"
msgstr "èªè‰éŒ¯èª¤"
@@ -85,6 +85,35 @@ msgstr "使用者移出群組 %s 錯誤"
msgid "Couldn't update app."
msgstr "無法更新應用程å¼"
+#: changepassword/controller.php:20
+msgid "Wrong password"
+msgstr ""
+
+#: changepassword/controller.php:42
+msgid "No user supplied"
+msgstr ""
+
+#: changepassword/controller.php:74
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr ""
+
+#: changepassword/controller.php:79
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr ""
+
+#: changepassword/controller.php:87
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr ""
+
+#: changepassword/controller.php:92 changepassword/controller.php:103
+msgid "Unable to change password"
+msgstr ""
+
#: js/apps.js:43
msgid "Update to {appversion}"
msgstr "更新至 {appversion}"
@@ -129,15 +158,15 @@ msgstr "æ›´æ–°"
msgid "Updated"
msgstr "已更新"
-#: js/personal.js:217
+#: js/personal.js:220
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:262
+#: js/personal.js:265
msgid "Decrypting files... Please wait, this can take some time."
msgstr "檔案解密ä¸ï¼Œè«‹ç¨å€™ã€‚"
-#: js/personal.js:284
+#: js/personal.js:287
msgid "Saving..."
msgstr "儲å˜ä¸..."
@@ -461,7 +490,7 @@ msgstr "請填入電å郵件信箱以便回復密碼"
#: templates/personal.php:86
msgid "Profile picture"
-msgstr ""
+msgstr "個人資料照片"
#: templates/personal.php:90
msgid "Upload new"
diff --git a/lib/base.php b/lib/base.php
index 0650361be91f7d99bfda70e3acd68a8425bef39d..58894be03ee112bb5df109cfdd8a2285199446a1 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -371,6 +371,7 @@ class OC {
self::$loader->registerPrefix('Doctrine\\Common', 'doctrine/common/lib');
self::$loader->registerPrefix('Doctrine\\DBAL', 'doctrine/dbal/lib');
self::$loader->registerPrefix('Symfony\\Component\\Routing', 'symfony/routing');
+ self::$loader->registerPrefix('Symfony\\Component\\Console', 'symfony/console');
self::$loader->registerPrefix('Sabre\\VObject', '3rdparty');
self::$loader->registerPrefix('Sabre_', '3rdparty');
self::$loader->registerPrefix('Patchwork', '3rdparty');
diff --git a/lib/db.php b/lib/db.php
index b9505b88d8274769ec5d58d008a6d50a7d83e142..1e5d12649df0be92dedd794e5408cb7fade84b33 100644
--- a/lib/db.php
+++ b/lib/db.php
@@ -87,6 +87,7 @@ class OC_DB {
'driver' => 'pdo_sqlite',
);
$connectionParams['adapter'] = '\OC\DB\AdapterSqlite';
+ $connectionParams['wrapperClass'] = 'OC\DB\Connection';
break;
case 'mysql':
$connectionParams = array(
@@ -99,6 +100,7 @@ class OC_DB {
'driver' => 'pdo_mysql',
);
$connectionParams['adapter'] = '\OC\DB\Adapter';
+ $connectionParams['wrapperClass'] = 'OC\DB\Connection';
break;
case 'pgsql':
$connectionParams = array(
@@ -110,6 +112,7 @@ class OC_DB {
'driver' => 'pdo_pgsql',
);
$connectionParams['adapter'] = '\OC\DB\AdapterPgSql';
+ $connectionParams['wrapperClass'] = 'OC\DB\Connection';
break;
case 'oci':
$connectionParams = array(
@@ -124,6 +127,7 @@ class OC_DB {
$connectionParams['port'] = $port;
}
$connectionParams['adapter'] = '\OC\DB\AdapterOCI8';
+ $connectionParams['wrapperClass'] = 'OC\DB\OracleConnection';
$eventManager->addEventSubscriber(new \Doctrine\DBAL\Event\Listeners\OracleSessionInit);
break;
case 'mssql':
@@ -137,11 +141,11 @@ class OC_DB {
'driver' => 'pdo_sqlsrv',
);
$connectionParams['adapter'] = '\OC\DB\AdapterSQLSrv';
+ $connectionParams['wrapperClass'] = 'OC\DB\Connection';
break;
default:
return false;
}
- $connectionParams['wrapperClass'] = 'OC\DB\Connection';
$connectionParams['tablePrefix'] = OC_Config::getValue('dbtableprefix', 'oc_' );
try {
self::$connection = \Doctrine\DBAL\DriverManager::getConnection($connectionParams, $config, $eventManager);
diff --git a/lib/db/oracleconnection.php b/lib/db/oracleconnection.php
new file mode 100644
index 0000000000000000000000000000000000000000..e2fc4644f479e62e5e4a7961b8244e039aea75b8
--- /dev/null
+++ b/lib/db/oracleconnection.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Copyright (c) 2013 Bart Visscher <bartv@thisnet.nl>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\DB;
+
+class OracleConnection extends Connection {
+ /**
+ * Quote the keys of the array
+ */
+ private function quoteKeys(array $data) {
+ $return = array();
+ foreach($data as $key => $value) {
+ $return[$this->quoteIdentifier($key)] = $value;
+ }
+ return $return;
+ }
+
+ /*
+ * {@inheritDoc}
+ */
+ public function insert($tableName, array $data, array $types = array()) {
+ $tableName = $this->quoteIdentifier($tableName);
+ $data = $this->quoteKeys($data);
+ return parent::insert($tableName, $data, $types);
+ }
+
+ /*
+ * {@inheritDoc}
+ */
+ public function update($tableName, array $data, array $identifier, array $types = array()) {
+ $tableName = $this->quoteIdentifier($tableName);
+ $data = $this->quoteKeys($data);
+ $identifier = $this->quoteKeys($identifier);
+ return parent::update($tableName, $data, $identifier, $types);
+ }
+
+ /*
+ * {@inheritDoc}
+ */
+ public function delete($tableName, array $identifier) {
+ $tableName = $this->quoteIdentifier($tableName);
+ $identifier = $this->quoteKeys($identifier);
+ return parent::delete($tableName, $identifier);
+ }
+}
diff --git a/lib/files/cache/cache.php b/lib/files/cache/cache.php
index 39e36684b7ba1a4bc878e6253cb61081fd2a7e30..e69733727af88bcf869bb51e3cdec7dbe3da4e3f 100644
--- a/lib/files/cache/cache.php
+++ b/lib/files/cache/cache.php
@@ -201,7 +201,6 @@ class Cache {
$data['path'] = $file;
$data['parent'] = $this->getParentId($file);
$data['name'] = \OC_Util::basename($file);
- $data['encrypted'] = isset($data['encrypted']) ? ((int)$data['encrypted']) : 0;
list($queryParts, $params) = $this->buildParts($data);
$queryParts[] = '`storage`';
@@ -265,6 +264,9 @@ class Cache {
$params[] = $value;
$queryParts[] = '`mtime`';
}
+ } elseif ($name === 'encrypted') {
+ // Boolean to integer conversion
+ $value = $value ? 1 : 0;
}
$params[] = $value;
$queryParts[] = '`' . $name . '`';
diff --git a/lib/files/cache/scanner.php b/lib/files/cache/scanner.php
index 9d180820e9d28f7fd1f501110f145b7a39694663..96f84609cf231fb45374c24b0f70a87459eef638 100644
--- a/lib/files/cache/scanner.php
+++ b/lib/files/cache/scanner.php
@@ -36,6 +36,11 @@ class Scanner extends BasicEmitter {
*/
private $cache;
+ /**
+ * @var \OC\Files\Cache\Permissions $permissionsCache
+ */
+ private $permissionsCache;
+
const SCAN_RECURSIVE = true;
const SCAN_SHALLOW = false;
@@ -46,6 +51,7 @@ class Scanner extends BasicEmitter {
$this->storage = $storage;
$this->storageId = $this->storage->getId();
$this->cache = $storage->getCache();
+ $this->permissionsCache = $storage->getPermissionsCache();
}
/**
@@ -96,22 +102,48 @@ class Scanner extends BasicEmitter {
}
}
$newData = $data;
- if ($reuseExisting and $cacheData = $this->cache->get($file)) {
- // only reuse data if the file hasn't explicitly changed
- if (isset($data['mtime']) && isset($cacheData['mtime']) && $data['mtime'] === $cacheData['mtime']) {
- if (($reuseExisting & self::REUSE_SIZE) && ($data['size'] === -1)) {
- $data['size'] = $cacheData['size'];
+ $cacheData = $this->cache->get($file);
+ if ($cacheData) {
+ $this->permissionsCache->remove($cacheData['fileid']);
+ if ($reuseExisting) {
+ // prevent empty etag
+ $etag = $cacheData['etag'];
+ $propagateETagChange = false;
+ if (empty($etag)) {
+ $etag = $data['etag'];
+ $propagateETagChange = true;
}
- if ($reuseExisting & self::REUSE_ETAG) {
- $data['etag'] = $cacheData['etag'];
+ // only reuse data if the file hasn't explicitly changed
+ if (isset($data['mtime']) && isset($cacheData['mtime']) && $data['mtime'] === $cacheData['mtime']) {
+ if (($reuseExisting & self::REUSE_SIZE) && ($data['size'] === -1)) {
+ $data['size'] = $cacheData['size'];
+ }
+ if ($reuseExisting & self::REUSE_ETAG) {
+ $data['etag'] = $etag;
+ if ($propagateETagChange) {
+ $parent = $file;
+ while ($parent !== '') {
+ $parent = dirname($parent);
+ if ($parent === '.') {
+ $parent = '';
+ }
+ $parentCacheData = $this->cache->get($parent);
+ $this->cache->update($parentCacheData['fileid'], array(
+ 'etag' => $this->storage->getETag($parent),
+ ));
+ }
+ }
+ }
}
+ // Only update metadata that has changed
+ $newData = array_diff($data, $cacheData);
}
- // Only update metadata that has changed
- $newData = array_diff($data, $cacheData);
}
if (!empty($newData)) {
$this->cache->put($file, $newData);
}
+ } else {
+ $this->cache->remove($file);
}
return $data;
}
@@ -159,7 +191,7 @@ class Scanner extends BasicEmitter {
$newChildren = array();
if ($this->storage->is_dir($path) && ($dh = $this->storage->opendir($path))) {
\OC_DB::beginTransaction();
- if(is_resource($dh)) {
+ if (is_resource($dh)) {
while (($file = readdir($dh)) !== false) {
$child = ($path) ? $path . '/' . $file : $file;
if (!Filesystem::isIgnoredDir($file)) {
diff --git a/lib/files/view.php b/lib/files/view.php
index 968b755a66185226a2768568a19da6432dc4df80..aa08a5f7cc9f2ad48ec756068283281850ff6d22 100644
--- a/lib/files/view.php
+++ b/lib/files/view.php
@@ -500,7 +500,7 @@ class View {
} else {
if ($this->is_dir($path1) && ($dh = $this->opendir($path1))) {
$result = $this->mkdir($path2);
- if(is_resource($dh)) {
+ if (is_resource($dh)) {
while (($file = readdir($dh)) !== false) {
if (!Filesystem::isIgnoredDir($file)) {
$result = $this->copy($path1 . '/' . $file, $path2 . '/' . $file);
@@ -975,7 +975,7 @@ class View {
/**
* search for files by mimetype
*
- * @param string $query
+ * @param string $mimetype
* @return array
*/
public function searchByMime($mimetype) {
@@ -998,7 +998,7 @@ class View {
$results = $cache->$method($query);
foreach ($results as $result) {
- if (substr($mountPoint . $result['path'], 0, $rootLength) === $this->fakeRoot) {
+ if (substr($mountPoint . $result['path'], 0, $rootLength + 1) === $this->fakeRoot . '/') {
$result['path'] = substr($mountPoint . $result['path'], $rootLength);
$files[] = $result;
}
@@ -1012,9 +1012,11 @@ class View {
$relativeMountPoint = substr($mountPoint, $rootLength);
$results = $cache->$method($query);
- foreach ($results as $result) {
- $result['path'] = $relativeMountPoint . $result['path'];
- $files[] = $result;
+ if ($results) {
+ foreach ($results as $result) {
+ $result['path'] = $relativeMountPoint . $result['path'];
+ $files[] = $result;
+ }
}
}
}
diff --git a/lib/l10n/ca.php b/lib/l10n/ca.php
index 166455e652c8c3a16d6f0d1c018e10c3037fc644..a8769224705c72faad677e15f27c1b5004939d4b 100644
--- a/lib/l10n/ca.php
+++ b/lib/l10n/ca.php
@@ -8,6 +8,9 @@ $TRANSLATIONS = array(
"Users" => "Usuaris",
"Admin" => "Administració",
"Failed to upgrade \"%s\"." => "Ha fallat l'actualització \"%s\".",
+"Custom profile pictures don't work with encryption yet" => "Les imatges de perfil personals encara no funcionen amb encriptació",
+"Unknown filetype" => "Tipus de fitxer desconegut",
+"Invalid image" => "Imatge no và lida",
"web services under your control" => "controleu els vostres serveis web",
"cannot open \"%s\"" => "no es pot obrir \"%s\"",
"ZIP download is turned off." => "La baixada en ZIP està desactivada.",
diff --git a/lib/l10n/cs_CZ.php b/lib/l10n/cs_CZ.php
index fed9ad03c010dbeda0ee0266ed84ce74fc12fccc..ed31ae795298eed30cd0bbde520730dd46563862 100644
--- a/lib/l10n/cs_CZ.php
+++ b/lib/l10n/cs_CZ.php
@@ -8,6 +8,9 @@ $TRANSLATIONS = array(
"Users" => "Uživatelé",
"Admin" => "Administrace",
"Failed to upgrade \"%s\"." => "Selhala aktualizace verze \"%s\".",
+"Custom profile pictures don't work with encryption yet" => "Vlastnà profilové obrázky zatÃm nefungujà v kombinaci se Å¡ifrovánÃm",
+"Unknown filetype" => "Neznámý typ souboru",
+"Invalid image" => "Chybný obrázek",
"web services under your control" => "webové služby pod Vašà kontrolou",
"cannot open \"%s\"" => "nelze otevÅ™Ãt \"%s\"",
"ZIP download is turned off." => "Stahovánà v ZIPu je vypnuto.",
diff --git a/lib/l10n/de.php b/lib/l10n/de.php
index 7a3e2c43e6ba6f060e6e35dc086bff5263bf1292..87e7a67b47bc0ca5edeb7bff110d9175618e1cd1 100644
--- a/lib/l10n/de.php
+++ b/lib/l10n/de.php
@@ -8,6 +8,9 @@ $TRANSLATIONS = array(
"Users" => "Benutzer",
"Admin" => "Administration",
"Failed to upgrade \"%s\"." => "Konnte \"%s\" nicht aktualisieren.",
+"Custom profile pictures don't work with encryption yet" => "Individuelle Profilbilder werden noch nicht von der Verschlüsselung unterstützt",
+"Unknown filetype" => "Unbekannter Dateityp",
+"Invalid image" => "Ungültiges Bild",
"web services under your control" => "Web-Services unter Deiner Kontrolle",
"cannot open \"%s\"" => "Öffnen von \"%s\" fehlgeschlagen",
"ZIP download is turned off." => "Der ZIP-Download ist deaktiviert.",
diff --git a/lib/l10n/de_DE.php b/lib/l10n/de_DE.php
index 0a72f443e4d75a6aa28cb8ac07214b353c55596d..09be0eea22de34f7fb9a0cb64576de4442a6d322 100644
--- a/lib/l10n/de_DE.php
+++ b/lib/l10n/de_DE.php
@@ -8,6 +8,9 @@ $TRANSLATIONS = array(
"Users" => "Benutzer",
"Admin" => "Administrator",
"Failed to upgrade \"%s\"." => "Konnte \"%s\" nicht aktualisieren.",
+"Custom profile pictures don't work with encryption yet" => "Individuelle Profilbilder werden noch nicht von der Verschlüsselung unterstützt",
+"Unknown filetype" => "Unbekannter Dateityp",
+"Invalid image" => "Ungültiges Bild",
"web services under your control" => "Web-Services unter Ihrer Kontrolle",
"cannot open \"%s\"" => "Öffnen von \"%s\" fehlgeschlagen",
"ZIP download is turned off." => "Der ZIP-Download ist deaktiviert.",
diff --git a/lib/l10n/en_GB.php b/lib/l10n/en_GB.php
index f799c071c76180d856a4033da5c1c901f12a799e..d02f553eda8e08f415d4bcc499b89b5855517414 100644
--- a/lib/l10n/en_GB.php
+++ b/lib/l10n/en_GB.php
@@ -8,6 +8,9 @@ $TRANSLATIONS = array(
"Users" => "Users",
"Admin" => "Admin",
"Failed to upgrade \"%s\"." => "Failed to upgrade \"%s\".",
+"Custom profile pictures don't work with encryption yet" => "Custom profile pictures don't work with encryption yet",
+"Unknown filetype" => "Unknown filetype",
+"Invalid image" => "Invalid image",
"web services under your control" => "web services under your control",
"cannot open \"%s\"" => "cannot open \"%s\"",
"ZIP download is turned off." => "ZIP download is turned off.",
@@ -54,13 +57,13 @@ $TRANSLATIONS = array(
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Your web server is not yet properly setup to allow files synchronisation because the WebDAV interface seems to be broken.",
"Please double check the <a href='%s'>installation guides</a>." => "Please double check the <a href='%s'>installation guides</a>.",
"seconds ago" => "seconds ago",
-"_%n minute ago_::_%n minutes ago_" => array("","%n minutes ago"),
-"_%n hour ago_::_%n hours ago_" => array("","%n hours ago"),
+"_%n minute ago_::_%n minutes ago_" => array("%n minute ago","%n minutes ago"),
+"_%n hour ago_::_%n hours ago_" => array("%n hour ago","%n hours ago"),
"today" => "today",
"yesterday" => "yesterday",
-"_%n day go_::_%n days ago_" => array("","%n days ago"),
+"_%n day go_::_%n days ago_" => array("%n day go","%n days ago"),
"last month" => "last month",
-"_%n month ago_::_%n months ago_" => array("","%n months ago"),
+"_%n month ago_::_%n months ago_" => array("%n month ago","%n months ago"),
"last year" => "last year",
"years ago" => "years ago",
"Caused by:" => "Caused by:",
diff --git a/lib/l10n/et_EE.php b/lib/l10n/et_EE.php
index 8e3aa55c4ed9ced40f266f8a8bd7627251699385..85dfaeb52d57f3ba85f5714efd6bc1f0892bc030 100644
--- a/lib/l10n/et_EE.php
+++ b/lib/l10n/et_EE.php
@@ -8,6 +8,9 @@ $TRANSLATIONS = array(
"Users" => "Kasutajad",
"Admin" => "Admin",
"Failed to upgrade \"%s\"." => "Ebaõnnestunud uuendus \"%s\".",
+"Custom profile pictures don't work with encryption yet" => "Kohandatud profiili pildid ei toimi veel koos krüpteeringuga",
+"Unknown filetype" => "Tundmatu failitüüp",
+"Invalid image" => "Vigane pilt",
"web services under your control" => "veebitenused sinu kontrolli all",
"cannot open \"%s\"" => "ei suuda avada \"%s\"",
"ZIP download is turned off." => "ZIP-ina allalaadimine on välja lülitatud.",
diff --git a/lib/l10n/fi_FI.php b/lib/l10n/fi_FI.php
index 2e69df43ad2e20a321272f6b9f9e23fa9fe380da..1d2bdab749c829750fcd12b2e9b24884df30538e 100644
--- a/lib/l10n/fi_FI.php
+++ b/lib/l10n/fi_FI.php
@@ -1,11 +1,16 @@
<?php
$TRANSLATIONS = array(
"App \"%s\" can't be installed because it is not compatible with this version of ownCloud." => "Sovellusta \"%s\" ei voi asentaa, koska se ei ole yhteensopiva käytössä olevan ownCloud-version kanssa.",
+"No app name specified" => "Sovelluksen nimeä ei määritelty",
"Help" => "Ohje",
"Personal" => "Henkilökohtainen",
"Settings" => "Asetukset",
"Users" => "Käyttäjät",
"Admin" => "Ylläpitäjä",
+"Failed to upgrade \"%s\"." => "Kohteen \"%s\" päivitys epäonnistui.",
+"Custom profile pictures don't work with encryption yet" => "Omavalintaiset profiilikuvat eivät toimi salauksen kanssa vielä",
+"Unknown filetype" => "Tuntematon tiedostotyyppi",
+"Invalid image" => "Virheellinen kuva",
"web services under your control" => "verkkopalvelut hallinnassasi",
"ZIP download is turned off." => "ZIP-lataus on poistettu käytöstä.",
"Files need to be downloaded one by one." => "Tiedostot on ladattava yksittäin.",
@@ -15,6 +20,8 @@ $TRANSLATIONS = array(
"No path specified when installing app from local file" => "Polkua ei määritelty sovellusta asennettaessa paikallisesta tiedostosta",
"Archives of type %s are not supported" => "Tyypin %s arkistot eivät ole tuettuja",
"App does not provide an info.xml file" => "Sovellus ei sisällä info.xml-tiedostoa",
+"App can't be installed because of not allowed code in the App" => "Sovellusta ei voi asentaa, koska sovellus sisältää kiellettyä koodia",
+"App can't be installed because it is not compatible with this version of ownCloud" => "Sovellusta ei voi asentaa, koska se ei ole yhteensopiva käytössä olevan ownCloud-version kanssa",
"App directory already exists" => "Sovelluskansio on jo olemassa",
"Can't create app folder. Please fix permissions. %s" => "Sovelluskansion luominen ei onnistu. Korjaa käyttöoikeudet. %s",
"Application is not enabled" => "Sovellusta ei ole otettu käyttöön",
diff --git a/lib/l10n/fr.php b/lib/l10n/fr.php
index da3ec4ce37283158ccf33055d2b27069948d086c..ab3d618849e8a6aaa4f63aaa18b21b76202f4c7a 100644
--- a/lib/l10n/fr.php
+++ b/lib/l10n/fr.php
@@ -8,6 +8,9 @@ $TRANSLATIONS = array(
"Users" => "Utilisateurs",
"Admin" => "Administration",
"Failed to upgrade \"%s\"." => "Echec de la mise à niveau \"%s\".",
+"Custom profile pictures don't work with encryption yet" => "Les images de profil personnalisées ne fonctionnent pas encore avec le système de chiffrement.",
+"Unknown filetype" => "Type de fichier inconnu",
+"Invalid image" => "Image invalide",
"web services under your control" => "services web sous votre contrôle",
"cannot open \"%s\"" => "impossible d'ouvrir \"%s\"",
"ZIP download is turned off." => "Téléchargement ZIP désactivé.",
diff --git a/lib/l10n/gl.php b/lib/l10n/gl.php
index a8fee3b1bc1f090ecabe2d78739b5327cbbc889e..406272d690fca4416d3aa5b0f771cdd49450a87e 100644
--- a/lib/l10n/gl.php
+++ b/lib/l10n/gl.php
@@ -8,6 +8,9 @@ $TRANSLATIONS = array(
"Users" => "Usuarios",
"Admin" => "Administración",
"Failed to upgrade \"%s\"." => "Non foi posÃbel anovar «%s».",
+"Custom profile pictures don't work with encryption yet" => "As imaxes personalizadas de perfil aÃnda non funcionan co cifrado",
+"Unknown filetype" => "Tipo de ficheiro descoñecido",
+"Invalid image" => "Imaxe incorrecta",
"web services under your control" => "servizos web baixo o seu control",
"cannot open \"%s\"" => "non foi posÃbel abrir «%s»",
"ZIP download is turned off." => "As descargas ZIP están desactivadas.",
diff --git a/lib/l10n/it.php b/lib/l10n/it.php
index c3a040048ecc3c563b4349b7f157288241d84e1b..b00789bc86f73bb1fb1d7a1de02ec7f8cc1811c3 100644
--- a/lib/l10n/it.php
+++ b/lib/l10n/it.php
@@ -8,6 +8,9 @@ $TRANSLATIONS = array(
"Users" => "Utenti",
"Admin" => "Admin",
"Failed to upgrade \"%s\"." => "Aggiornamento non riuscito \"%s\".",
+"Custom profile pictures don't work with encryption yet" => "Le immagini personalizzate del profilo non funzionano ancora con la cifratura",
+"Unknown filetype" => "Tipo di file sconosciuto",
+"Invalid image" => "Immagine non valida",
"web services under your control" => "servizi web nelle tue mani",
"cannot open \"%s\"" => "impossibile aprire \"%s\"",
"ZIP download is turned off." => "Lo scaricamento in formato ZIP è stato disabilitato.",
diff --git a/lib/l10n/ja_JP.php b/lib/l10n/ja_JP.php
index 2d37001ca19ba8abd0da7aae65258b472f96e425..b9e6a0e69248674747e93acdb6a1971c5b3a0e74 100644
--- a/lib/l10n/ja_JP.php
+++ b/lib/l10n/ja_JP.php
@@ -8,6 +8,9 @@ $TRANSLATIONS = array(
"Users" => "ユーザ",
"Admin" => "管ç†",
"Failed to upgrade \"%s\"." => "\"%s\" ã¸ã®ã‚¢ãƒƒãƒ—グレードã«å¤±æ•—ã—ã¾ã—ãŸã€‚",
+"Custom profile pictures don't work with encryption yet" => "æš—å·ç„¡ã—ã§ã¯åˆ©ç”¨ä¸å¯ãªã‚«ã‚¹ã‚¿ãƒ プãƒãƒ•ã‚£ãƒ¼ãƒ«ç”»åƒ",
+"Unknown filetype" => "ä¸æ˜Žãªãƒ•ã‚¡ã‚¤ãƒ«ã‚¿ã‚¤ãƒ—",
+"Invalid image" => "無効ãªç”»åƒ",
"web services under your control" => "管ç†ä¸‹ã®ã‚¦ã‚§ãƒ–サービス",
"cannot open \"%s\"" => "\"%s\" ãŒé–‹ã‘ã¾ã›ã‚“",
"ZIP download is turned off." => "ZIPダウンãƒãƒ¼ãƒ‰ã¯ç„¡åŠ¹ã§ã™ã€‚",
diff --git a/lib/l10n/lt_LT.php b/lib/l10n/lt_LT.php
index 1fd9b9ea6346adcb594433c2823d5311ce7adfc9..db8d96c1018505e5310eecd47ac225938d84b9c6 100644
--- a/lib/l10n/lt_LT.php
+++ b/lib/l10n/lt_LT.php
@@ -8,6 +8,9 @@ $TRANSLATIONS = array(
"Users" => "Vartotojai",
"Admin" => "Administravimas",
"Failed to upgrade \"%s\"." => "Nepavyko pakelti „%s“ versijos.",
+"Custom profile pictures don't work with encryption yet" => "Saviti profilio paveiksliukai dar neveikia su Å¡ifravimu",
+"Unknown filetype" => "Nežinomas failo tipas",
+"Invalid image" => "Netinkamas paveikslÄ—lis",
"web services under your control" => "jūsų valdomos web paslaugos",
"cannot open \"%s\"" => "nepavyksta atverti „%s“",
"ZIP download is turned off." => "ZIP atsisiuntimo galimybė yra išjungta.",
diff --git a/lib/l10n/nl.php b/lib/l10n/nl.php
index e546c1f3179c7fc8d1a302b8fc0efefcb66a7a67..20374f1f0f894598615c171f2e52c1d98bcc48c5 100644
--- a/lib/l10n/nl.php
+++ b/lib/l10n/nl.php
@@ -1,5 +1,6 @@
<?php
$TRANSLATIONS = array(
+"App \"%s\" can't be installed because it is not compatible with this version of ownCloud." => "App \"%s\" kan niet worden geïnstalleerd omdat die niet compatible is met deze versie van ownCloud.",
"No app name specified" => "De app naam is niet gespecificeerd.",
"Help" => "Help",
"Personal" => "Persoonlijk",
@@ -7,6 +8,9 @@ $TRANSLATIONS = array(
"Users" => "Gebruikers",
"Admin" => "Beheerder",
"Failed to upgrade \"%s\"." => "Upgrade \"%s\" mislukt.",
+"Custom profile pictures don't work with encryption yet" => "Maatwerk profielafbeelding werkt nog niet met versleuteling",
+"Unknown filetype" => "Onbekend bestandsformaat",
+"Invalid image" => "Ongeldige afbeelding",
"web services under your control" => "Webdiensten in eigen beheer",
"cannot open \"%s\"" => "Kon \"%s\" niet openen",
"ZIP download is turned off." => "ZIP download is uitgeschakeld.",
@@ -14,6 +18,18 @@ $TRANSLATIONS = array(
"Back to Files" => "Terug naar bestanden",
"Selected files too large to generate zip file." => "De geselecteerde bestanden zijn te groot om een zip bestand te maken.",
"Download the files in smaller chunks, seperately or kindly ask your administrator." => "Download de bestanden in kleinere brokken, appart of vraag uw administrator.",
+"No source specified when installing app" => "Geen bron opgegeven bij installatie van de app",
+"No href specified when installing app from http" => "Geen href opgegeven bij installeren van de app vanaf http",
+"No path specified when installing app from local file" => "Geen pad opgegeven bij installeren van de app vanaf een lokaal bestand",
+"Archives of type %s are not supported" => "Archiefbestanden van type %s niet ondersteund",
+"Failed to open archive when installing app" => "Kon archiefbestand bij installatie van de app niet openen",
+"App does not provide an info.xml file" => "De app heeft geen info.xml bestand",
+"App can't be installed because of not allowed code in the App" => "De app kan niet worden geïnstalleerd wegens onjuiste code in de app",
+"App can't be installed because it is not compatible with this version of ownCloud" => "De app kan niet worden geïnstalleerd omdat die niet compatible is met deze versie van ownCloud",
+"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" => "De app kan niet worden geïnstallerd omdat het de <shipped>true</shipped> tag bevat die niet is toegestaan voor niet gepubliceerde apps",
+"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "De app kan niet worden geïnstalleerd omdat de versie in info.xml/version niet dezelfde is als de versie zoals die in de app store staat vermeld",
+"App directory already exists" => "App directory bestaat al",
+"Can't create app folder. Please fix permissions. %s" => "Kan de app map niet aanmaken, Herstel de permissies. %s",
"Application is not enabled" => "De applicatie is niet actief",
"Authentication error" => "Authenticatie fout",
"Token expired. Please reload page." => "Token verlopen. Herlaad de pagina.",
diff --git a/lib/l10n/nn_NO.php b/lib/l10n/nn_NO.php
index d5da8c64415db73e0d19fe10d260d79e40cfd7a0..e8bf8dfdef46ad74f49f927f695a0c8e076375bf 100644
--- a/lib/l10n/nn_NO.php
+++ b/lib/l10n/nn_NO.php
@@ -5,6 +5,8 @@ $TRANSLATIONS = array(
"Settings" => "Innstillingar",
"Users" => "Brukarar",
"Admin" => "Administrer",
+"Unknown filetype" => "Ukjend filtype",
+"Invalid image" => "Ugyldig bilete",
"web services under your control" => "Vev tjenester under din kontroll",
"Authentication error" => "Feil i autentisering",
"Files" => "Filer",
diff --git a/lib/l10n/pa.php b/lib/l10n/pa.php
new file mode 100644
index 0000000000000000000000000000000000000000..069fea6e710feb1d20fcb59cdeee66ea8bedddae
--- /dev/null
+++ b/lib/l10n/pa.php
@@ -0,0 +1,16 @@
+<?php
+$TRANSLATIONS = array(
+"Settings" => "ਸੈਟਿੰਗ",
+"Files" => "ਫਾਇਲਾਂ",
+"seconds ago" => "ਸਕਿੰਟ ਪਹਿਲਾਂ",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
+"today" => "ਅੱਜ",
+"yesterday" => "ਕੱਲà©à¨¹",
+"_%n day go_::_%n days ago_" => array("",""),
+"last month" => "ਪਿਛਲੇ ਮਹੀਨੇ",
+"_%n month ago_::_%n months ago_" => array("",""),
+"last year" => "ਪਿਛਲੇ ਸਾਲ",
+"years ago" => "ਸਾਲਾਂ ਪਹਿਲਾਂ"
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/pt_BR.php b/lib/l10n/pt_BR.php
index 72bc1f36a1e14b2e8549a107ce6e61d021604937..7a580799701095a1b80b401c366785cc0df0d329 100644
--- a/lib/l10n/pt_BR.php
+++ b/lib/l10n/pt_BR.php
@@ -8,6 +8,9 @@ $TRANSLATIONS = array(
"Users" => "Usuários",
"Admin" => "Admin",
"Failed to upgrade \"%s\"." => "Falha na atualização de \"%s\".",
+"Custom profile pictures don't work with encryption yet" => "Fotos de perfil personalizados ainda não funcionam com criptografia",
+"Unknown filetype" => "Tipo de arquivo desconhecido",
+"Invalid image" => "Imagem inválida",
"web services under your control" => "serviços web sob seu controle",
"cannot open \"%s\"" => "não pode abrir \"%s\"",
"ZIP download is turned off." => "Download ZIP está desligado.",
diff --git a/lib/l10n/pt_PT.php b/lib/l10n/pt_PT.php
index bf540012249a3997a007f10ae5d33c33933c4b42..6e2bcba7b10c43bbb11eace544e20ce94fba363d 100644
--- a/lib/l10n/pt_PT.php
+++ b/lib/l10n/pt_PT.php
@@ -6,6 +6,8 @@ $TRANSLATIONS = array(
"Users" => "Utilizadores",
"Admin" => "Admin",
"Failed to upgrade \"%s\"." => "A actualização \"%s\" falhou.",
+"Unknown filetype" => "Ficheiro desconhecido",
+"Invalid image" => "Imagem inválida",
"web services under your control" => "serviços web sob o seu controlo",
"cannot open \"%s\"" => "Não foi possÃvel abrir \"%s\"",
"ZIP download is turned off." => "Descarregamento em ZIP está desligado.",
diff --git a/lib/l10n/ro.php b/lib/l10n/ro.php
index b338b3492395d8a512bd3f846fd107c090d51d4c..76dafcd03e05489e9f9d3ae1aff53fb4de3125bb 100644
--- a/lib/l10n/ro.php
+++ b/lib/l10n/ro.php
@@ -5,6 +5,8 @@ $TRANSLATIONS = array(
"Settings" => "Setări",
"Users" => "Utilizatori",
"Admin" => "Admin",
+"Unknown filetype" => "Tip fișier necunoscut",
+"Invalid image" => "Imagine invalidă",
"web services under your control" => "servicii web controlate de tine",
"ZIP download is turned off." => "Descărcarea ZIP este dezactivată.",
"Files need to be downloaded one by one." => "Fișierele trebuie descărcate unul câte unul.",
@@ -19,11 +21,11 @@ $TRANSLATIONS = array(
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Serverul de web nu este încă setat corespunzător pentru a permite sincronizarea fișierelor deoarece interfața WebDAV pare a fi întreruptă.",
"Please double check the <a href='%s'>installation guides</a>." => "Vă rugăm să verificați <a href='%s'>ghiduri de instalare</a>.",
"seconds ago" => "secunde în urmă",
-"_%n minute ago_::_%n minutes ago_" => array("","",""),
-"_%n hour ago_::_%n hours ago_" => array("","",""),
+"_%n minute ago_::_%n minutes ago_" => array("","","acum %n minute"),
+"_%n hour ago_::_%n hours ago_" => array("","","acum %n ore"),
"today" => "astăzi",
"yesterday" => "ieri",
-"_%n day go_::_%n days ago_" => array("","",""),
+"_%n day go_::_%n days ago_" => array("","","acum %n zile"),
"last month" => "ultima lună",
"_%n month ago_::_%n months ago_" => array("","",""),
"last year" => "ultimul an",
diff --git a/lib/l10n/ru.php b/lib/l10n/ru.php
index c3b6a077b72f6b0dcb4c404c9641880346bcf34b..501065f8b5f391d40bf7195e46f0b20a97a00d55 100644
--- a/lib/l10n/ru.php
+++ b/lib/l10n/ru.php
@@ -1,11 +1,16 @@
<?php
$TRANSLATIONS = array(
+"App \"%s\" can't be installed because it is not compatible with this version of ownCloud." => "Приложение \"%s\" Ð½ÐµÐ»ÑŒÐ·Ñ ÑƒÑтановить, так как оно не ÑовмеÑтимо Ñ Ñ‚ÐµÐºÑƒÑ‰ÐµÐ¹ верÑией ownCloud.",
+"No app name specified" => "Ðе выбрано Ð¸Ð¼Ñ Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ",
"Help" => "Помощь",
"Personal" => "Личное",
"Settings" => "КонфигурациÑ",
"Users" => "Пользователи",
"Admin" => "Admin",
"Failed to upgrade \"%s\"." => "Ðе Ñмог обновить \"%s\".",
+"Custom profile pictures don't work with encryption yet" => "ПользовательÑкие картинки Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ñ ÐµÑ‰Ñ‘ не поддерживают шифрование",
+"Unknown filetype" => "ÐеизвеÑтный тип файла",
+"Invalid image" => "Изображение повреждено",
"web services under your control" => "веб-ÑервиÑÑ‹ под вашим управлением",
"cannot open \"%s\"" => "не могу открыть \"%s\"",
"ZIP download is turned off." => "ZIP-Ñкачивание отключено.",
@@ -13,6 +18,18 @@ $TRANSLATIONS = array(
"Back to Files" => "Ðазад к файлам",
"Selected files too large to generate zip file." => "Выбранные файлы Ñлишком велики, чтобы Ñоздать zip файл.",
"Download the files in smaller chunks, seperately or kindly ask your administrator." => "Загрузите файл маленьшими порциÑми, раздельно или вежливо попроÑите Вашего админиÑтратора.",
+"No source specified when installing app" => "Ðе указан иÑточник при уÑтановке приложениÑ",
+"No href specified when installing app from http" => "Ðе указан атрибут href при уÑтановке Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ñ‡ÐµÑ€ÐµÐ· http",
+"No path specified when installing app from local file" => "Ðе указан путь при уÑтановке Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð¸Ð· локального файла",
+"Archives of type %s are not supported" => "Ðрхивы %s не поддерживаютÑÑ",
+"Failed to open archive when installing app" => "Ðе возможно открыть архив при уÑтановке приложениÑ",
+"App does not provide an info.xml file" => "Приложение не имеет файла info.xml",
+"App can't be installed because of not allowed code in the App" => "Приложение невозможно уÑтановить. Ð’ нем ÑодержитÑÑ Ð·Ð°Ð¿Ñ€ÐµÑ‰ÐµÐ½Ð½Ñ‹Ð¹ код.",
+"App can't be installed because it is not compatible with this version of ownCloud" => "Приложение невозможно уÑтановить. Ðе ÑовмеÑтимо Ñ Ñ‚ÐµÐºÑƒÑ‰ÐµÐ¹ верÑией ownCloud.",
+"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" => "Приложение невозможно уÑтановить. Оно Ñодержит параметр <shipped>true</shipped> который не допуÑтим Ð´Ð»Ñ Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ð¹, не входÑщих в поÑтавку.",
+"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "Приложение невозможно уÑтановить. ВерÑÐ¸Ñ Ð² info.xml/version не Ñовпадает Ñ Ð²ÐµÑ€Ñией заÑвленной в магазине приложений",
+"App directory already exists" => "Папка Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ ÑƒÐ¶Ðµ ÑущеÑтвует",
+"Can't create app folder. Please fix permissions. %s" => "Ðе удалоÑÑŒ Ñоздать директорию. ИÑправьте права доÑтупа. %s",
"Application is not enabled" => "Приложение не разрешено",
"Authentication error" => "Ошибка аутентификации",
"Token expired. Please reload page." => "Токен проÑрочен. Перезагрузите Ñтраницу.",
diff --git a/lib/l10n/sr@latin.php b/lib/l10n/sr@latin.php
index 5ba51bc0ba708e4de0adc9dcae752a4ff1f65584..d8fa9289221541c00591b73a2a2e413e51f22a55 100644
--- a/lib/l10n/sr@latin.php
+++ b/lib/l10n/sr@latin.php
@@ -8,9 +8,15 @@ $TRANSLATIONS = array(
"Authentication error" => "Greška pri autentifikaciji",
"Files" => "Fajlovi",
"Text" => "Tekst",
+"seconds ago" => "Pre par sekundi",
"_%n minute ago_::_%n minutes ago_" => array("","",""),
"_%n hour ago_::_%n hours ago_" => array("","",""),
+"today" => "Danas",
+"yesterday" => "juÄe",
"_%n day go_::_%n days ago_" => array("","",""),
-"_%n month ago_::_%n months ago_" => array("","","")
+"last month" => "prošlog meseca",
+"_%n month ago_::_%n months ago_" => array("","",""),
+"last year" => "prošle godine",
+"years ago" => "pre nekoliko godina"
);
$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/lib/legacy/preferences.php b/lib/legacy/preferences.php
new file mode 100644
index 0000000000000000000000000000000000000000..a663db7598b5bf2925c32c5a201aae5819484caa
--- /dev/null
+++ b/lib/legacy/preferences.php
@@ -0,0 +1,146 @@
+<?php
+/**
+ * ownCloud
+ *
+ * @author Frank Karlitschek
+ * @author Jakob Sack
+ * @copyright 2012 Frank Karlitschek frank@owncloud.org
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * This class provides an easy way for storing user preferences.
+ */
+OC_Preferences::$object = new \OC\Preferences(OC_DB::getConnection());
+class OC_Preferences{
+ public static $object;
+ /**
+ * @brief Get all users using the preferences
+ * @return array with user ids
+ *
+ * This function returns a list of all users that have at least one entry
+ * in the preferences table.
+ */
+ public static function getUsers() {
+ return self::$object->getUsers();
+ }
+
+ /**
+ * @brief Get all apps of a user
+ * @param string $user user
+ * @return array with app ids
+ *
+ * This function returns a list of all apps of the user that have at least
+ * one entry in the preferences table.
+ */
+ public static function getApps( $user ) {
+ return self::$object->getApps( $user );
+ }
+
+ /**
+ * @brief Get the available keys for an app
+ * @param string $user user
+ * @param string $app the app we are looking for
+ * @return array with key names
+ *
+ * This function gets all keys of an app of an user. Please note that the
+ * values are not returned.
+ */
+ public static function getKeys( $user, $app ) {
+ return self::$object->getKeys( $user, $app );
+ }
+
+ /**
+ * @brief Gets the preference
+ * @param string $user user
+ * @param string $app app
+ * @param string $key key
+ * @param string $default = null, default value if the key does not exist
+ * @return string the value or $default
+ *
+ * This function gets a value from the preferences table. If the key does
+ * not exist the default value will be returned
+ */
+ public static function getValue( $user, $app, $key, $default = null ) {
+ return self::$object->getValue( $user, $app, $key, $default );
+ }
+
+ /**
+ * @brief sets a value in the preferences
+ * @param string $user user
+ * @param string $app app
+ * @param string $key key
+ * @param string $value value
+ * @return bool
+ *
+ * Adds a value to the preferences. If the key did not exist before, it
+ * will be added automagically.
+ */
+ public static function setValue( $user, $app, $key, $value ) {
+ self::$object->setValue( $user, $app, $key, $value );
+ return true;
+ }
+
+ /**
+ * @brief Deletes a key
+ * @param string $user user
+ * @param string $app app
+ * @param string $key key
+ *
+ * Deletes a key.
+ */
+ public static function deleteKey( $user, $app, $key ) {
+ self::$object->deleteKey( $user, $app, $key );
+ return true;
+ }
+
+ /**
+ * @brief Remove app of user from preferences
+ * @param string $user user
+ * @param string $app app
+ * @return bool
+ *
+ * Removes all keys in preferences belonging to the app and the user.
+ */
+ public static function deleteApp( $user, $app ) {
+ self::$object->deleteApp( $user, $app );
+ return true;
+ }
+
+ /**
+ * @brief Remove user from preferences
+ * @param string $user user
+ * @return bool
+ *
+ * Removes all keys in preferences belonging to the user.
+ */
+ public static function deleteUser( $user ) {
+ self::$object->deleteUser( $user );
+ return true;
+ }
+
+ /**
+ * @brief Remove app from all users
+ * @param string $app app
+ * @return bool
+ *
+ * Removes all keys in preferences belonging to the app.
+ */
+ public static function deleteAppFromAllUsers( $app ) {
+ self::$object->deleteAppFromAllUsers( $app );
+ return true;
+ }
+}
diff --git a/lib/preferences.php b/lib/preferences.php
index 11ca760830edea40b35ead1154e02d516fc92328..359d9a83589923e688f20a3ef92e3fb2a8ed380d 100644
--- a/lib/preferences.php
+++ b/lib/preferences.php
@@ -34,10 +34,21 @@
*
*/
+namespace OC;
+
+use \OC\DB\Connection;
+
+
/**
* This class provides an easy way for storing user preferences.
*/
-class OC_Preferences{
+class Preferences {
+ protected $conn;
+
+ public function __construct(Connection $conn) {
+ $this->conn = $conn;
+ }
+
/**
* @brief Get all users using the preferences
* @return array with user ids
@@ -45,14 +56,13 @@ class OC_Preferences{
* This function returns a list of all users that have at least one entry
* in the preferences table.
*/
- public static function getUsers() {
- // No need for more comments
- $query = OC_DB::prepare( 'SELECT DISTINCT( `userid` ) FROM `*PREFIX*preferences`' );
- $result = $query->execute();
+ public function getUsers() {
+ $query = 'SELECT DISTINCT `userid` FROM `*PREFIX*preferences`';
+ $result = $this->conn->executeQuery( $query );
$users = array();
- while( $row = $result->fetchRow()) {
- $users[] = $row["userid"];
+ while( $userid = $result->fetchColumn()) {
+ $users[] = $userid;
}
return $users;
@@ -66,14 +76,13 @@ class OC_Preferences{
* This function returns a list of all apps of the user that have at least
* one entry in the preferences table.
*/
- public static function getApps( $user ) {
- // No need for more comments
- $query = OC_DB::prepare( 'SELECT DISTINCT( `appid` ) FROM `*PREFIX*preferences` WHERE `userid` = ?' );
- $result = $query->execute( array( $user ));
+ public function getApps( $user ) {
+ $query = 'SELECT DISTINCT `appid` FROM `*PREFIX*preferences` WHERE `userid` = ?';
+ $result = $this->conn->executeQuery( $query, array( $user ) );
$apps = array();
- while( $row = $result->fetchRow()) {
- $apps[] = $row["appid"];
+ while( $appid = $result->fetchColumn()) {
+ $apps[] = $appid;
}
return $apps;
@@ -88,14 +97,13 @@ class OC_Preferences{
* This function gets all keys of an app of an user. Please note that the
* values are not returned.
*/
- public static function getKeys( $user, $app ) {
- // No need for more comments
- $query = OC_DB::prepare( 'SELECT `configkey` FROM `*PREFIX*preferences` WHERE `userid` = ? AND `appid` = ?' );
- $result = $query->execute( array( $user, $app ));
+ public function getKeys( $user, $app ) {
+ $query = 'SELECT `configkey` FROM `*PREFIX*preferences` WHERE `userid` = ? AND `appid` = ?';
+ $result = $this->conn->executeQuery( $query, array( $user, $app ));
$keys = array();
- while( $row = $result->fetchRow()) {
- $keys[] = $row["configkey"];
+ while( $key = $result->fetchColumn()) {
+ $keys[] = $key;
}
return $keys;
@@ -112,16 +120,14 @@ class OC_Preferences{
* This function gets a value from the preferences table. If the key does
* not exist the default value will be returned
*/
- public static function getValue( $user, $app, $key, $default = null ) {
+ public function getValue( $user, $app, $key, $default = null ) {
// Try to fetch the value, return default if not exists.
- $query = OC_DB::prepare( 'SELECT `configvalue` FROM `*PREFIX*preferences`'
- .' WHERE `userid` = ? AND `appid` = ? AND `configkey` = ?' );
- $result = $query->execute( array( $user, $app, $key ));
-
- $row = $result->fetchRow();
+ $query = 'SELECT `configvalue` FROM `*PREFIX*preferences`'
+ .' WHERE `userid` = ? AND `appid` = ? AND `configkey` = ?';
+ $row = $this->conn->fetchAssoc( $query, array( $user, $app, $key ));
if($row) {
return $row["configvalue"];
- }else{
+ } else {
return $default;
}
}
@@ -132,29 +138,36 @@ class OC_Preferences{
* @param string $app app
* @param string $key key
* @param string $value value
- * @return bool
*
* Adds a value to the preferences. If the key did not exist before, it
* will be added automagically.
*/
- public static function setValue( $user, $app, $key, $value ) {
+ public function setValue( $user, $app, $key, $value ) {
// Check if the key does exist
- $query = OC_DB::prepare( 'SELECT `configvalue` FROM `*PREFIX*preferences`'
- .' WHERE `userid` = ? AND `appid` = ? AND `configkey` = ?' );
- $values=$query->execute(array($user, $app, $key))->fetchAll();
- $exists=(count($values)>0);
+ $query = 'SELECT COUNT(*) FROM `*PREFIX*preferences`'
+ .' WHERE `userid` = ? AND `appid` = ? AND `configkey` = ?';
+ $count = $this->conn->fetchColumn( $query, array( $user, $app, $key ));
+ $exists = $count > 0;
if( !$exists ) {
- $query = OC_DB::prepare( 'INSERT INTO `*PREFIX*preferences`'
- .' ( `userid`, `appid`, `configkey`, `configvalue` ) VALUES( ?, ?, ?, ? )' );
- $query->execute( array( $user, $app, $key, $value ));
+ $data = array(
+ 'userid' => $user,
+ 'appid' => $app,
+ 'configkey' => $key,
+ 'configvalue' => $value,
+ );
+ $this->conn->insert('*PREFIX*preferences', $data);
+ } else {
+ $data = array(
+ 'configvalue' => $value,
+ );
+ $where = array(
+ 'userid' => $user,
+ 'appid' => $app,
+ 'configkey' => $key,
+ );
+ $this->conn->update('*PREFIX*preferences', $data, $where);
}
- else{
- $query = OC_DB::prepare( 'UPDATE `*PREFIX*preferences` SET `configvalue` = ?'
- .' WHERE `userid` = ? AND `appid` = ? AND `configkey` = ?' );
- $query->execute( array( $value, $user, $app, $key ));
- }
- return true;
}
/**
@@ -162,62 +175,58 @@ class OC_Preferences{
* @param string $user user
* @param string $app app
* @param string $key key
- * @return bool
*
* Deletes a key.
*/
- public static function deleteKey( $user, $app, $key ) {
- // No need for more comments
- $query = OC_DB::prepare( 'DELETE FROM `*PREFIX*preferences`'
- .' WHERE `userid` = ? AND `appid` = ? AND `configkey` = ?' );
- $query->execute( array( $user, $app, $key ));
-
- return true;
+ public function deleteKey( $user, $app, $key ) {
+ $where = array(
+ 'userid' => $user,
+ 'appid' => $app,
+ 'configkey' => $key,
+ );
+ $this->conn->delete('*PREFIX*preferences', $where);
}
/**
* @brief Remove app of user from preferences
* @param string $user user
* @param string $app app
- * @return bool
*
- * Removes all keys in appconfig belonging to the app and the user.
+ * Removes all keys in preferences belonging to the app and the user.
*/
- public static function deleteApp( $user, $app ) {
- // No need for more comments
- $query = OC_DB::prepare( 'DELETE FROM `*PREFIX*preferences` WHERE `userid` = ? AND `appid` = ?' );
- $query->execute( array( $user, $app ));
-
- return true;
+ public function deleteApp( $user, $app ) {
+ $where = array(
+ 'userid' => $user,
+ 'appid' => $app,
+ );
+ $this->conn->delete('*PREFIX*preferences', $where);
}
/**
* @brief Remove user from preferences
* @param string $user user
- * @return bool
*
- * Removes all keys in appconfig belonging to the user.
+ * Removes all keys in preferences belonging to the user.
*/
- public static function deleteUser( $user ) {
- // No need for more comments
- $query = OC_DB::prepare( 'DELETE FROM `*PREFIX*preferences` WHERE `userid` = ?' );
- $query->execute( array( $user ));
-
- return true;
+ public function deleteUser( $user ) {
+ $where = array(
+ 'userid' => $user,
+ );
+ $this->conn->delete('*PREFIX*preferences', $where);
}
/**
* @brief Remove app from all users
* @param string $app app
- * @return bool
*
* Removes all keys in preferences belonging to the app.
*/
- public static function deleteAppFromAllUsers( $app ) {
- // No need for more comments
- $query = OC_DB::prepare( 'DELETE FROM `*PREFIX*preferences` WHERE `appid` = ?' );
- $query->execute( array( $app ));
-
- return true;
+ public function deleteAppFromAllUsers( $app ) {
+ $where = array(
+ 'appid' => $app,
+ );
+ $this->conn->delete('*PREFIX*preferences', $where);
}
}
+
+require_once __DIR__.'/legacy/'.basename(__FILE__);
diff --git a/lib/public/share.php b/lib/public/share.php
index 9ab956d84b9a79616fb66647a54454ce899866f3..7a8a183574bd892ff121f86a8775d8c3af972ed5 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -106,22 +106,22 @@ class Share {
}
return false;
}
-
+
/**
* @brief Prepare a path to be passed to DB as file_target
* @return string Prepared path
*/
public static function prepFileTarget( $path ) {
-
+
// Paths in DB are stored with leading slashes, so add one if necessary
if ( substr( $path, 0, 1 ) !== '/' ) {
-
+
$path = '/' . $path;
-
+
}
-
+
return $path;
-
+
}
/**
@@ -256,7 +256,7 @@ class Share {
return self::getItems($itemType, $itemTarget, self::$shareTypeUserAndGroups, \OC_User::getUser(), null, $format,
$parameters, 1, $includeCollections);
}
-
+
/**
* @brief Get the item of item type shared with the current user by source
* @param string Item type
@@ -293,7 +293,18 @@ class Share {
if (\OC_DB::isError($result)) {
\OC_Log::write('OCP\Share', \OC_DB::getErrorMessage($result) . ', token=' . $token, \OC_Log::ERROR);
}
- return $result->fetchRow();
+ $row = $result->fetchRow();
+
+ if (!empty($row['expiration'])) {
+ $now = new \DateTime();
+ $expirationDate = new \DateTime($row['expiration'], new \DateTimeZone('UTC'));
+ if ($now > $expirationDate) {
+ self::delete($row['id']);
+ return false;
+ }
+ }
+
+ return $row;
}
/**
@@ -450,6 +461,7 @@ class Share {
$uidOwner, self::FORMAT_NONE, null, 1)) {
// remember old token
$oldToken = $checkExists['token'];
+ $oldPermissions = $checkExists['permissions'];
//delete the old share
self::delete($checkExists['id']);
}
@@ -460,8 +472,11 @@ class Share {
$hasher = new \PasswordHash(8, $forcePortable);
$shareWith = $hasher->HashPassword($shareWith.\OC_Config::getValue('passwordsalt', ''));
} else {
- // reuse the already set password
- $shareWith = $checkExists['share_with'];
+ // reuse the already set password, but only if we change permissions
+ // otherwise the user disabled the password protection
+ if ($checkExists && (int)$permissions !== (int)$oldPermissions) {
+ $shareWith = $checkExists['share_with'];
+ }
}
// Generate token
diff --git a/lib/search/provider/file.php b/lib/search/provider/file.php
index 4d88c2a87f1735b3b5a6bd547371c8ac67cc7ac2..9bd509315179b93688e26e97d79b9d8d62f81789 100644
--- a/lib/search/provider/file.php
+++ b/lib/search/provider/file.php
@@ -10,6 +10,7 @@ class OC_Search_Provider_File extends OC_Search_Provider{
$mime = $fileData['mimetype'];
$name = basename($path);
+ $container = dirname($path);
$text = '';
$skip = false;
if($mime=='httpd/unix-directory') {
@@ -37,7 +38,7 @@ class OC_Search_Provider_File extends OC_Search_Provider{
}
}
if(!$skip) {
- $results[] = new OC_Search_Result($name, $text, $link, $type);
+ $results[] = new OC_Search_Result($name, $text, $link, $type, $container);
}
}
return $results;
diff --git a/lib/search/result.php b/lib/search/result.php
index 08beaea151ca77657521532e87db9c841df6c1d4..42275c2df11500efaf9b73d87b1fea304a5ceb33 100644
--- a/lib/search/result.php
+++ b/lib/search/result.php
@@ -7,6 +7,7 @@ class OC_Search_Result{
public $text;
public $link;
public $type;
+ public $container;
/**
* create a new search result
@@ -15,10 +16,11 @@ class OC_Search_Result{
* @param string $link link for the result
* @param string $type the type of result as human readable string ('File', 'Music', etc)
*/
- public function __construct($name, $text, $link, $type) {
+ public function __construct($name, $text, $link, $type, $container) {
$this->name=$name;
$this->text=$text;
$this->link=$link;
$this->type=$type;
+ $this->container=$container;
}
}
diff --git a/search/css/results.css b/search/css/results.css
index 4ae7d67afb3c83bbe34e67d3568cb2917aeeef3d..8a32b0b995db749afd23362ed70ae4e18ab7021a 100644
--- a/search/css/results.css
+++ b/search/css/results.css
@@ -14,7 +14,7 @@
position:fixed;
right:0;
text-overflow:ellipsis;
- top:20px;
+ top:45px;
width:380px;
z-index:75;
}
@@ -43,10 +43,16 @@
}
#searchresults td {
- vertical-align:top;
padding:0 .3em;
+ height: 32px;
+}
+#searchresults tr.template {
+ display: none;
}
+#searchresults td.result {
+ width:250px;
+}
#searchresults td.result div.text {
padding-left:1em;
white-space:nowrap;
@@ -56,6 +62,18 @@
cursor:pointer;
}
+#searchresults td.container {
+ width:20px;
+}
+
+#searchresults td.container img {
+ vertical-align: middle;
+ display:none;
+}
+#searchresults tr:hover td.container img {
+ display:inline;
+}
+
#searchresults td.type {
border-bottom:none;
border-right:1px solid #aaa;
diff --git a/search/js/result.js b/search/js/result.js
index 78fa8efc8e9d04d3a5648eb03ddf721ebad3a67a..780f513edcf08b03b84f51eae4f5f1250c6bff89 100644
--- a/search/js/result.js
+++ b/search/js/result.js
@@ -8,15 +8,23 @@ OC.search.catagorizeResults=function(results){
types[type].push(results[i]);
}
return types;
-}
+};
OC.search.hide=function(){
$('#searchresults').hide();
if($('#searchbox').val().length>2){
$('#searchbox').val('');
+ if (FileList && typeof FileList.unfilter === 'function') { //TODO add hook system
+ FileList.unfilter();
+ }
};
-}
+ if ($('#searchbox').val().length === 0) {
+ if (FileList && typeof FileList.unfilter === 'function') { //TODO add hook system
+ FileList.unfilter();
+ }
+ }
+};
OC.search.showResults=function(results){
- if(results.length==0){
+ if(results.length === 0){
return;
}
if(!OC.search.showResults.loaded){
@@ -30,6 +38,9 @@ OC.search.showResults=function(results){
});
$(document).click(function(event){
OC.search.hide();
+ if (FileList && typeof FileList.unfilter === 'function') { //TODO add hook system
+ FileList.unfilter();
+ }
});
OC.search.lastResults=results;
OC.search.showResults(results);
@@ -39,30 +50,52 @@ OC.search.showResults=function(results){
$('#searchresults').show();
$('#searchresults tr.result').remove();
var index=0;
- for(var name in types){
- var type=types[name];
+ for(var typeid in types){
+ var type=types[typeid];
if(type.length>0){
for(var i=0;i<type.length;i++){
var row=$('#searchresults tr.template').clone();
row.removeClass('template');
row.addClass('result');
- if (i == 0){
- row.children('td.type').text(name);
+ row.data('type', typeid);
+ row.data('name', type[i].name);
+ row.data('text', type[i].text);
+ row.data('container', type[i].container);
+ if (i === 0){
+ row.children('td.type').text(typeid);
}
- row.find('td.result a').attr('href',type[i].link);
row.find('td.result div.name').text(type[i].name);
row.find('td.result div.text').text(type[i].text);
+ if (type[i].container) {
+ var containerName = OC.basename(type[i].container);
+ if (containerName === '') {
+ containerName = '/';
+ }
+ var containerLink = OC.linkTo('files', 'index.php')
+ +'?dir='+encodeURIComponent(type[i].container)
+ +'&scrollto='+encodeURIComponent(type[i].name);
+ row.find('td.result a')
+ .attr('href', containerLink)
+ .attr('title', t('core', 'Show in {folder}', {folder: containerName}));
+ } else {
+ row.find('td.result a').attr('href', type[i].link);
+ }
row.data('index',index);
index++;
- if(OC.search.customResults[name]){//give plugins the ability to customize the entries in here
- OC.search.customResults[name](row,type[i]);
+ if(OC.search.customResults[typeid]){//give plugins the ability to customize the entries in here
+ OC.search.customResults[typeid](row,type[i]);
}
$('#searchresults tbody').append(row);
}
}
}
+ $('#searchresults').on('click', 'result', function () {
+ if ($(this).data('type') === 'Files') {
+ //FIXME use ajax to navigate to folder & highlight file
+ }
+ });
}
-}
+};
OC.search.showResults.loaded=false;
OC.search.renderCurrent=function(){
@@ -71,4 +104,4 @@ OC.search.renderCurrent=function(){
$('#searchresults tr.result').removeClass('current');
$(result).addClass('current');
}
-}
+};
diff --git a/search/templates/part.results.php b/search/templates/part.results.php
index 9e39a1c2c8ba07dd5f44c61fb89411e246607557..b6e7bad4a2f897be9db9a426850be79b14b81c16 100644
--- a/search/templates/part.results.php
+++ b/search/templates/part.results.php
@@ -1,12 +1,12 @@
-<div id='searchresults'>
+<div id="searchresults">
<table>
<tbody>
- <tr class='template '>
- <td class='type'></td>
- <td class='result'>
+ <tr class="template">
+ <td class="type"></td>
+ <td class="result">
<a>
- <div class='name'></div>
- <div class='text'></div>
+ <div class="name"></div>
+ <div class="text"></div>
</a>
</td>
</tr>
diff --git a/settings/ajax/changepassword.php b/settings/ajax/changepassword.php
deleted file mode 100644
index 47ceb5ab87379956fe5b5419f4f880e7958b3cab..0000000000000000000000000000000000000000
--- a/settings/ajax/changepassword.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-
-// Check if we are a user
-OCP\JSON::callCheck();
-OC_JSON::checkLoggedIn();
-
-// Manually load apps to ensure hooks work correctly (workaround for issue 1503)
-OC_APP::loadApps();
-
-$username = isset($_POST['username']) ? $_POST['username'] : OC_User::getUser();
-$password = isset($_POST['personal-password']) ? $_POST['personal-password'] : null;
-$oldPassword = isset($_POST['oldpassword']) ? $_POST['oldpassword'] : '';
-$recoveryPassword = isset($_POST['recoveryPassword']) ? $_POST['recoveryPassword'] : null;
-
-$userstatus = null;
-if (OC_User::isAdminUser(OC_User::getUser())) {
- $userstatus = 'admin';
-}
-if (OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username)) {
- $userstatus = 'subadmin';
-}
-if (OC_User::getUser() === $username && OC_User::checkPassword($username, $oldPassword)) {
- $userstatus = 'user';
-}
-
-if (is_null($userstatus)) {
- OC_JSON::error(array('data' => array('message' => 'Authentication error')));
- exit();
-}
-
-if (\OCP\App::isEnabled('files_encryption') && $userstatus !== 'user') {
- //handle the recovery case
- $util = new \OCA\Encryption\Util(new \OC_FilesystemView('/'), $username);
- $recoveryAdminEnabled = OC_Appconfig::getValue('files_encryption', 'recoveryAdminEnabled');
-
- $validRecoveryPassword = false;
- $recoveryPasswordSupported = false;
- if ($recoveryAdminEnabled) {
- $validRecoveryPassword = $util->checkRecoveryPassword($recoveryPassword);
- $recoveryEnabledForUser = $util->recoveryEnabledForUser();
- }
-
- if ($recoveryEnabledForUser && $recoveryPassword === '') {
- OC_JSON::error(array('data' => array('message' => 'Please provide a admin recovery password, otherwise all user data will be lost')));
- } elseif ($recoveryEnabledForUser && ! $validRecoveryPassword) {
- OC_JSON::error(array('data' => array('message' => 'Wrong admin recovery password. Please check the password and try again.')));
- } else { // now we know that everything is fine regarding the recovery password, let's try to change the password
- $result = OC_User::setPassword($username, $password, $recoveryPassword);
- if (!$result && $recoveryPasswordSupported) {
- OC_JSON::error(array("data" => array( "message" => "Back-end doesn't support password change, but the users encryption key was successfully updated." )));
- } elseif (!$result && !$recoveryPasswordSupported) {
- OC_JSON::error(array("data" => array( "message" => "Unable to change password" )));
- } else {
- OC_JSON::success(array("data" => array( "username" => $username )));
- }
-
- }
-} else { // if user changes his own password or if encryption is disabled, proceed
- if (!is_null($password) && OC_User::setPassword($username, $password)) {
- OC_JSON::success(array('data' => array('username' => $username)));
- } else {
- OC_JSON::error(array('data' => array('message' => 'Unable to change password')));
- }
-}
diff --git a/settings/changepassword/controller.php b/settings/changepassword/controller.php
new file mode 100644
index 0000000000000000000000000000000000000000..e8c2a1943f3b0e28d156b7410c2662a83cd5fe07
--- /dev/null
+++ b/settings/changepassword/controller.php
@@ -0,0 +1,107 @@
+<?php
+
+namespace OC\Settings\ChangePassword;
+
+class Controller {
+ public static function changePersonalPassword($args) {
+ // Check if we are an user
+ \OC_JSON::callCheck();
+ \OC_JSON::checkLoggedIn();
+
+ // Manually load apps to ensure hooks work correctly (workaround for issue 1503)
+ \OC_App::loadApps();
+
+ $username = \OC_User::getUser();
+ $password = isset($_POST['personal-password']) ? $_POST['personal-password'] : null;
+ $oldPassword = isset($_POST['oldpassword']) ? $_POST['oldpassword'] : '';
+
+ if (!\OC_User::checkPassword($username, $oldPassword)) {
+ $l = new \OC_L10n('settings');
+ \OC_JSON::error(array("data" => array("message" => $l->t("Wrong password")) ));
+ exit();
+ }
+ if (!is_null($password) && \OC_User::setPassword($username, $password)) {
+ \OC_JSON::success();
+ } else {
+ \OC_JSON::error();
+ }
+ }
+
+ public static function changeUserPassword($args) {
+ // Check if we are an user
+ \OC_JSON::callCheck();
+ \OC_JSON::checkLoggedIn();
+
+ // Manually load apps to ensure hooks work correctly (workaround for issue 1503)
+ \OC_App::loadApps();
+
+ if (isset($_POST['username'])) {
+ $username = $_POST['username'];
+ } else {
+ $l = new \OC_L10n('settings');
+ \OC_JSON::error(array('data' => array('message' => $l->t('No user supplied')) ));
+ exit();
+ }
+
+ $password = isset($_POST['password']) ? $_POST['password'] : null;
+ $recoveryPassword = isset($_POST['recoveryPassword']) ? $_POST['recoveryPassword'] : null;
+
+ if (\OC_User::isAdminUser(\OC_User::getUser())) {
+ $userstatus = 'admin';
+ } elseif (\OC_SubAdmin::isUserAccessible(\OC_User::getUser(), $username)) {
+ $userstatus = 'subadmin';
+ } else {
+ $l = new \OC_L10n('settings');
+ \OC_JSON::error(array('data' => array('message' => $l->t('Authentication error')) ));
+ exit();
+ }
+
+ if (\OC_App::isEnabled('files_encryption')) {
+ //handle the recovery case
+ $util = new \OCA\Encryption\Util(new \OC_FilesystemView('/'), $username);
+ $recoveryAdminEnabled = \OC_Appconfig::getValue('files_encryption', 'recoveryAdminEnabled');
+
+ $validRecoveryPassword = false;
+ $recoveryPasswordSupported = false;
+ if ($recoveryAdminEnabled) {
+ $validRecoveryPassword = $util->checkRecoveryPassword($recoveryPassword);
+ $recoveryEnabledForUser = $util->recoveryEnabledForUser();
+ }
+
+ if ($recoveryEnabledForUser && $recoveryPassword === '') {
+ $l = new \OC_L10n('settings');
+ \OC_JSON::error(array('data' => array(
+ 'message' => $l->t('Please provide an admin recovery password, otherwise all user data will be lost')
+ )));
+ } elseif ($recoveryEnabledForUser && ! $validRecoveryPassword) {
+ $l = new \OC_L10n('settings');
+ \OC_JSON::error(array('data' => array(
+ 'message' => $l->t('Wrong admin recovery password. Please check the password and try again.')
+ )));
+ } else { // now we know that everything is fine regarding the recovery password, let's try to change the password
+ $result = \OC_User::setPassword($username, $password, $recoveryPassword);
+ if (!$result && $recoveryPasswordSupported) {
+ $l = new \OC_L10n('settings');
+ \OC_JSON::error(array(
+ "data" => array(
+ "message" => $l->t("Back-end doesn't support password change, but the users encryption key was successfully updated.")
+ )
+ ));
+ } elseif (!$result && !$recoveryPasswordSupported) {
+ $l = new \OC_L10n('settings');
+ \OC_JSON::error(array("data" => array( "message" => $l->t("Unable to change password" ) )));
+ } else {
+ \OC_JSON::success(array("data" => array( "username" => $username )));
+ }
+
+ }
+ } else { // if encryption is disabled, proceed
+ if (!is_null($password) && \OC_User::setPassword($username, $password)) {
+ \OC_JSON::success(array('data' => array('username' => $username)));
+ } else {
+ $l = new \OC_L10n('settings');
+ \OC_JSON::error(array('data' => array('message' => $l->t('Unable to change password'))));
+ }
+ }
+ }
+}
diff --git a/settings/js/apps.js b/settings/js/apps.js
index 54810776d2b1d7fae93a06ce0fb2efd717e97b23..a55c55e24cf4ccd64462fe722754570490d6fef2 100644
--- a/settings/js/apps.js
+++ b/settings/js/apps.js
@@ -84,6 +84,7 @@ OC.Settings.Apps = OC.Settings.Apps || {
}
else {
appitem.data('active',false);
+ element.data('active',false);
OC.Settings.Apps.removeNavigation(appid);
appitem.removeClass('active');
element.val(t('settings','Enable'));
@@ -104,6 +105,7 @@ OC.Settings.Apps = OC.Settings.Apps || {
} else {
OC.Settings.Apps.addNavigation(appid);
appitem.data('active',true);
+ element.data('active',true);
appitem.addClass('active');
element.val(t('settings','Disable'));
}
@@ -158,7 +160,7 @@ OC.Settings.Apps = OC.Settings.Apps || {
if(response.status === 'success'){
var navIds=response.nav_ids;
for(var i=0; i< navIds.length; i++){
- $('#apps').children('li[data-id="'+navIds[i]+'"]').remove();
+ $('#apps .wrapper').children('li[data-id="'+navIds[i]+'"]').remove();
}
}
});
diff --git a/settings/js/personal.js b/settings/js/personal.js
index fab32b83b64cb7bd375b02a002e3e1b373db073d..eaaca32f5d8bad58881ae0b1d384d80748c30511 100644
--- a/settings/js/personal.js
+++ b/settings/js/personal.js
@@ -124,14 +124,17 @@ $(document).ready(function(){
$('#passwordchanged').hide();
$('#passworderror').hide();
// Ajax foo
- $.post( 'ajax/changepassword.php', post, function(data){
+ $.post(OC.Router.generate('settings_personal_changepassword'), post, function(data){
if( data.status === "success" ){
$('#pass1').val('');
$('#pass2').val('');
$('#passwordchanged').show();
- }
- else{
- $('#passworderror').html( data.data.message );
+ } else{
+ if (typeof(data.data) !== "undefined") {
+ $('#passworderror').html(data.data.message);
+ } else {
+ $('#passworderror').html(t('Unable to change password'));
+ }
$('#passworderror').show();
}
});
diff --git a/settings/js/users.js b/settings/js/users.js
index 01a845367e252192f04be52f95670d9e4848d7fd..48c4529527ba93913e1de425797a5dfd546a6a8d 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -361,7 +361,7 @@ $(document).ready(function () {
if ($(this).val().length > 0) {
var recoveryPasswordVal = $('input:password[id="recoveryPassword"]').val();
$.post(
- OC.filePath('settings', 'ajax', 'changepassword.php'),
+ OC.Router.generate('settings_users_changepassword'),
{username: uid, password: $(this).val(), recoveryPassword: recoveryPasswordVal},
function (result) {
if (result.status != 'success') {
diff --git a/settings/l10n/ca.php b/settings/l10n/ca.php
index 6de7d4518c315713186111cf0f9ee6adff406511..c4c61c0354af5814dc27df9f71a1a325a200aa2f 100644
--- a/settings/l10n/ca.php
+++ b/settings/l10n/ca.php
@@ -16,6 +16,12 @@ $TRANSLATIONS = array(
"Unable to add user to group %s" => "No es pot afegir l'usuari al grup %s",
"Unable to remove user from group %s" => "No es pot eliminar l'usuari del grup %s",
"Couldn't update app." => "No s'ha pogut actualitzar l'aplicació.",
+"Wrong password" => "Contrasenya incorrecta",
+"No user supplied" => "No heu proporcionat cap usuari",
+"Please provide an admin recovery password, otherwise all user data will be lost" => "Sisplau, proporcioneu una contrasenya de recuperació d'administrador, altrament totes les dades d'usuari es perdran",
+"Wrong admin recovery password. Please check the password and try again." => "La contrasenya de recuperació d'administrador és incorrecta. Comproveu-la i torneu-ho a intentar.",
+"Back-end doesn't support password change, but the users encryption key was successfully updated." => "El dorsal no permet canviar la contrasenya, però la clau d'encripació d'usuaris s'ha actualitzat correctament.",
+"Unable to change password" => "No es pot canviar la contrasenya",
"Update to {appversion}" => "Actualitza a {appversion}",
"Disable" => "Desactiva",
"Enable" => "Habilita",
@@ -27,6 +33,7 @@ $TRANSLATIONS = array(
"Error" => "Error",
"Update" => "Actualitza",
"Updated" => "Actualitzada",
+"Select a profile picture" => "Seleccioneu una imatge de perfil",
"Decrypting files... Please wait, this can take some time." => "Desencriptant fitxers... Espereu, això pot trigar una estona.",
"Saving..." => "Desant...",
"deleted" => "esborrat",
@@ -100,6 +107,13 @@ $TRANSLATIONS = array(
"Email" => "Correu electrònic",
"Your email address" => "Correu electrònic",
"Fill in an email address to enable password recovery" => "Ompliu el correu electrònic per activar la recuperació de contrasenya",
+"Profile picture" => "Foto de perfil",
+"Upload new" => "Puja'n una de nova",
+"Select new from Files" => "Selecciona'n una de nova dels fitxers",
+"Remove image" => "Elimina imatge",
+"Either png or jpg. Ideally square but you will be able to crop it." => "Pot ser png o jpg. Idealment quadrada, però podreu retallar-la.",
+"Abort" => "Cancel·la",
+"Choose as profile image" => "Selecciona com a imatge de perfil",
"Language" => "Idioma",
"Help translate" => "Ajudeu-nos amb la traducció",
"WebDAV" => "WebDAV",
diff --git a/settings/l10n/cs_CZ.php b/settings/l10n/cs_CZ.php
index 09caacbb5ae43accf0c8ba7e39307a360d55096a..9873d4d20acf62a2eda0eeea94c3d2394ad5ca19 100644
--- a/settings/l10n/cs_CZ.php
+++ b/settings/l10n/cs_CZ.php
@@ -16,6 +16,12 @@ $TRANSLATIONS = array(
"Unable to add user to group %s" => "Nelze přidat uživatele do skupiny %s",
"Unable to remove user from group %s" => "Nelze odebrat uživatele ze skupiny %s",
"Couldn't update app." => "Nelze aktualizovat aplikaci.",
+"Wrong password" => "Nesprávné heslo",
+"No user supplied" => "Nebyl uveden uživatel",
+"Please provide an admin recovery password, otherwise all user data will be lost" => "Zadejte prosÃm administrátorské heslo pro obnovu, jinak budou vÅ¡echna data ztracena",
+"Wrong admin recovery password. Please check the password and try again." => "Chybné administrátorské heslo pro obnovu. Překontrolujte správnost hesla a zkuste to znovu.",
+"Back-end doesn't support password change, but the users encryption key was successfully updated." => "ÚložiÅ¡tÄ› nepodporuje zmÄ›nu hesla, ale Å¡ifrovacà klÃÄ uživatelů byl úspěšnÄ› zmÄ›nÄ›n.",
+"Unable to change password" => "Změna hesla se nezdařila",
"Update to {appversion}" => "Aktualizovat na {appversion}",
"Disable" => "Zakázat",
"Enable" => "Povolit",
@@ -27,6 +33,7 @@ $TRANSLATIONS = array(
"Error" => "Chyba",
"Update" => "Aktualizovat",
"Updated" => "Aktualizováno",
+"Select a profile picture" => "Vyberte profilový obrázek",
"Decrypting files... Please wait, this can take some time." => "ProbÃhá deÅ¡ifrovánà souborů... ÄŒekejte prosÃm, tato operace může trvat nÄ›jakou dobu.",
"Saving..." => "Ukládám...",
"deleted" => "smazáno",
@@ -100,6 +107,13 @@ $TRANSLATIONS = array(
"Email" => "E-mail",
"Your email address" => "Vaše e-mailová adresa",
"Fill in an email address to enable password recovery" => "Pro povolenà obnovy hesla vyplňte e-mailovou adresu",
+"Profile picture" => "Profilová fotka",
+"Upload new" => "Nahrát nový",
+"Select new from Files" => "Vyberte nový ze souborů",
+"Remove image" => "Odebrat obrázek",
+"Either png or jpg. Ideally square but you will be able to crop it." => "png nebo jpg, nejlépe Ätvercový, ale budete mÃt možnost jej oÅ™Ãznout.",
+"Abort" => "Přerušit",
+"Choose as profile image" => "Vybrat jako profilový obrázek",
"Language" => "Jazyk",
"Help translate" => "Pomoci s překladem",
"WebDAV" => "WebDAV",
diff --git a/settings/l10n/da.php b/settings/l10n/da.php
index b34625f75e1296c01e04b5fb4ee7028805463ffb..fcff9dbcfd9d2ec4e98efbfa55380fede4723497 100644
--- a/settings/l10n/da.php
+++ b/settings/l10n/da.php
@@ -16,6 +16,11 @@ $TRANSLATIONS = array(
"Unable to add user to group %s" => "Brugeren kan ikke tilføjes til gruppen %s",
"Unable to remove user from group %s" => "Brugeren kan ikke fjernes fra gruppen %s",
"Couldn't update app." => "Kunne ikke opdatere app'en.",
+"Wrong password" => "Forkert kodeord",
+"No user supplied" => "Intet brugernavn givet",
+"Please provide an admin recovery password, otherwise all user data will be lost" => "Angiv venligst en admininstrator gendannelseskode, ellers vil alt brugerdata gå tabt",
+"Wrong admin recovery password. Please check the password and try again." => "Forkert admin gendannelseskode. Se venligst koden efter og prøv igen.",
+"Back-end doesn't support password change, but the users encryption key was successfully updated." => "Serveren understøtter ikke kodeordsskifte, men brugernes krypteringsnøgle blev opdateret.",
"Update to {appversion}" => "Opdatér til {appversion}",
"Disable" => "Deaktiver",
"Enable" => "Aktiver",
@@ -27,6 +32,7 @@ $TRANSLATIONS = array(
"Error" => "Fejl",
"Update" => "Opdater",
"Updated" => "Opdateret",
+"Select a profile picture" => "Vælg et profilbillede",
"Decrypting files... Please wait, this can take some time." => "Dekryptere filer... Vent venligst, dette kan tage lang tid. ",
"Saving..." => "Gemmer...",
"deleted" => "Slettet",
@@ -100,6 +106,13 @@ $TRANSLATIONS = array(
"Email" => "E-mail",
"Your email address" => "Din emailadresse",
"Fill in an email address to enable password recovery" => "Indtast en emailadresse for at kunne få påmindelse om adgangskode",
+"Profile picture" => "Profilbillede",
+"Upload new" => "Upload nyt",
+"Select new from Files" => "Vælg nyt fra Filer",
+"Remove image" => "Fjern billede",
+"Either png or jpg. Ideally square but you will be able to crop it." => "Enten png eller jpg. Ideelt firkantet men du har mulighed for at beskære det. ",
+"Abort" => "Afbryd",
+"Choose as profile image" => "Vælg som profilbillede",
"Language" => "Sprog",
"Help translate" => "Hjælp med oversættelsen",
"WebDAV" => "WebDAV",
diff --git a/settings/l10n/de.php b/settings/l10n/de.php
index 87e935a93c6cf19f61b0efde6fd3a1800324ffb3..ae2165873ea9b2256b3e9465dfde8af2dfe8423d 100644
--- a/settings/l10n/de.php
+++ b/settings/l10n/de.php
@@ -16,6 +16,12 @@ $TRANSLATIONS = array(
"Unable to add user to group %s" => "Der Benutzer konnte nicht zur Gruppe %s hinzugefügt werden",
"Unable to remove user from group %s" => "Der Benutzer konnte nicht aus der Gruppe %s entfernt werden",
"Couldn't update app." => "Die App konnte nicht aktualisiert werden.",
+"Wrong password" => "Falsches Passwort",
+"No user supplied" => "Keinen Benutzer übermittelt",
+"Please provide an admin recovery password, otherwise all user data will be lost" => "Bitte gib ein Wiederherstellungspasswort für das Admin-Konto an, da sonst alle Benutzer Daten verloren gehen können",
+"Wrong admin recovery password. Please check the password and try again." => "Falsches Wiederherstellungspasswort für das Admin-Konto. Bitte überprüfe das Passwort und versuche es erneut.",
+"Back-end doesn't support password change, but the users encryption key was successfully updated." => "Das Back-End unterstützt die Passwortänderung nicht, aber der Benutzerschlüssel wurde erfolgreich aktualisiert.",
+"Unable to change password" => "Passwort konnte nicht geändert werden",
"Update to {appversion}" => "Aktualisiere zu {appversion}",
"Disable" => "Deaktivieren",
"Enable" => "Aktivieren",
@@ -27,6 +33,7 @@ $TRANSLATIONS = array(
"Error" => "Fehler",
"Update" => "Aktualisierung durchführen",
"Updated" => "Aktualisiert",
+"Select a profile picture" => "Wähle ein Profilbild",
"Decrypting files... Please wait, this can take some time." => "Entschlüssle Dateien ... Bitte warten, denn dieser Vorgang kann einige Zeit beanspruchen.",
"Saving..." => "Speichern...",
"deleted" => "gelöscht",
@@ -100,6 +107,13 @@ $TRANSLATIONS = array(
"Email" => "E-Mail",
"Your email address" => "Deine E-Mail-Adresse",
"Fill in an email address to enable password recovery" => "Trage eine E-Mail-Adresse ein, um die Passwort-Wiederherstellung zu aktivieren.",
+"Profile picture" => "Profilbild",
+"Upload new" => "Neues hochladen",
+"Select new from Files" => "Neues aus den Dateien wählen",
+"Remove image" => "Bild entfernen",
+"Either png or jpg. Ideally square but you will be able to crop it." => "Entweder PNG oder JPG. Im Idealfall quadratisch, aber du kannst es zuschneiden.",
+"Abort" => "Abbrechen",
+"Choose as profile image" => "Als Profilbild wählen",
"Language" => "Sprache",
"Help translate" => "Hilf bei der Ãœbersetzung",
"WebDAV" => "WebDAV",
diff --git a/settings/l10n/de_AT.php b/settings/l10n/de_AT.php
new file mode 100644
index 0000000000000000000000000000000000000000..d70f365826c98cccc7104eaef19f9e9bc16fad1f
--- /dev/null
+++ b/settings/l10n/de_AT.php
@@ -0,0 +1,5 @@
+<?php
+$TRANSLATIONS = array(
+"__language_name__" => "Deutsch (Österreich)"
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/de_CH.php b/settings/l10n/de_CH.php
index 45650a3b44065dfec62854e800388127e166c32c..558071b3cbfa83062ea3026698aaf69744051ec6 100644
--- a/settings/l10n/de_CH.php
+++ b/settings/l10n/de_CH.php
@@ -39,7 +39,7 @@ $TRANSLATIONS = array(
"A valid username must be provided" => "Es muss ein gültiger Benutzername angegeben werden",
"Error creating user" => "Beim Erstellen des Benutzers ist ein Fehler aufgetreten",
"A valid password must be provided" => "Es muss ein gültiges Passwort angegeben werden",
-"__language_name__" => "Deutsch (Förmlich: Sie)",
+"__language_name__" => "Deutsch (Schweiz)",
"Security Warning" => "Sicherheitshinweis",
"Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Ihr Datenverzeichnis und Ihre Dateien sind möglicher Weise aus dem Internet erreichbar. Die .htaccess-Datei funktioniert nicht. Wir raten Ihnen dringend, dass Sie Ihren Webserver dahingehend konfigurieren, dass Ihr Datenverzeichnis nicht länger aus dem Internet erreichbar ist, oder Sie verschieben das Datenverzeichnis ausserhalb des Wurzelverzeichnisses des Webservers.",
"Setup Warning" => "Einrichtungswarnung",
diff --git a/settings/l10n/de_DE.php b/settings/l10n/de_DE.php
index 6998b51042bd58b1328c362abe56feee696ea14e..924792aa62b720ca6156b23fd674e8c74d5d7811 100644
--- a/settings/l10n/de_DE.php
+++ b/settings/l10n/de_DE.php
@@ -16,6 +16,12 @@ $TRANSLATIONS = array(
"Unable to add user to group %s" => "Der Benutzer konnte nicht zur Gruppe %s hinzugefügt werden",
"Unable to remove user from group %s" => "Der Benutzer konnte nicht aus der Gruppe %s entfernt werden",
"Couldn't update app." => "Die App konnte nicht aktualisiert werden.",
+"Wrong password" => "Falsches Passwort",
+"No user supplied" => "Keinen Benutzer übermittelt",
+"Please provide an admin recovery password, otherwise all user data will be lost" => "Bitte geben Sie ein Wiederherstellungspasswort für das Admin-Konto an, da sonst alle Benutzer Daten verloren gehen können",
+"Wrong admin recovery password. Please check the password and try again." => "Falsches Wiederherstellungspasswort für das Admin-Konto. Bitte überprüfen Sie das Passwort und versuchen Sie es erneut.",
+"Back-end doesn't support password change, but the users encryption key was successfully updated." => "Das Back-End unterstützt die Passwortänderung nicht, aber der Benutzerschlüssel wurde erfolgreich aktualisiert.",
+"Unable to change password" => "Passwort konnte nicht geändert werden",
"Update to {appversion}" => "Update zu {appversion}",
"Disable" => "Deaktivieren",
"Enable" => "Aktivieren",
@@ -27,6 +33,7 @@ $TRANSLATIONS = array(
"Error" => "Fehler",
"Update" => "Update durchführen",
"Updated" => "Aktualisiert",
+"Select a profile picture" => "Wählen Sie ein Profilbild",
"Decrypting files... Please wait, this can take some time." => "Entschlüssle Dateien ... Bitte warten Sie, denn dieser Vorgang kann einige Zeit beanspruchen.",
"Saving..." => "Speichern...",
"deleted" => "gelöscht",
@@ -100,6 +107,13 @@ $TRANSLATIONS = array(
"Email" => "E-Mail",
"Your email address" => "Ihre E-Mail-Adresse",
"Fill in an email address to enable password recovery" => "Bitte tragen Sie eine E-Mail-Adresse ein, um die Passwort-Wiederherstellung zu aktivieren.",
+"Profile picture" => "Profilbild",
+"Upload new" => "Neues hochladen",
+"Select new from Files" => "Neues aus den Dateien wählen",
+"Remove image" => "Bild entfernen",
+"Either png or jpg. Ideally square but you will be able to crop it." => "Entweder PNG oder JPG. Im Idealfall quadratisch, aber Sie können es zuschneiden.",
+"Abort" => "Abbrechen",
+"Choose as profile image" => "Als Profilbild wählen",
"Language" => "Sprache",
"Help translate" => "Helfen Sie bei der Ãœbersetzung",
"WebDAV" => "WebDAV",
diff --git a/settings/l10n/el.php b/settings/l10n/el.php
index 8daa9ccf8bc68c2e7720587b952427b6e51f2dbb..a4876d854df9fb2bcf299c346d0b1ba5ca7aafd6 100644
--- a/settings/l10n/el.php
+++ b/settings/l10n/el.php
@@ -87,6 +87,7 @@ $TRANSLATIONS = array(
"Email" => "Ηλ. ταχυδÏομείο",
"Your email address" => "Η διεÏθυνση ηλεκτÏÎ¿Î½Î¹ÎºÎ¿Ï Ï„Î±Ï‡Ï…Î´Ïομείου σας",
"Fill in an email address to enable password recovery" => "ΣυμπληÏώστε μια διεÏθυνση ηλεκτÏÎ¿Î½Î¹ÎºÎ¿Ï Ï„Î±Ï‡Ï…Î´Ïομείου για να ενεÏγοποιηθεί η ανάκτηση συνθηματικοÏ",
+"Profile picture" => "ΦωτογÏαφία Ï€Ïοφίλ",
"Language" => "Γλώσσα",
"Help translate" => "Βοηθήστε στη μετάφÏαση",
"WebDAV" => "WebDAV",
diff --git a/settings/l10n/en_GB.php b/settings/l10n/en_GB.php
index e1a00643908340dd331e78571d3b56826ba5dcae..abbc92709e56688b9c50b480392307bc151f22ee 100644
--- a/settings/l10n/en_GB.php
+++ b/settings/l10n/en_GB.php
@@ -16,6 +16,12 @@ $TRANSLATIONS = array(
"Unable to add user to group %s" => "Unable to add user to group %s",
"Unable to remove user from group %s" => "Unable to remove user from group %s",
"Couldn't update app." => "Couldn't update app.",
+"Wrong password" => "Incorrect password",
+"No user supplied" => "No user supplied",
+"Please provide an admin recovery password, otherwise all user data will be lost" => "Please provide an admin recovery password, otherwise all user data will be lost",
+"Wrong admin recovery password. Please check the password and try again." => "Incorrect admin recovery password. Please check the password and try again.",
+"Back-end doesn't support password change, but the users encryption key was successfully updated." => "Back-end doesn't support password change, but the user's encryption key was successfully updated.",
+"Unable to change password" => "Unable to change password",
"Update to {appversion}" => "Update to {appversion}",
"Disable" => "Disable",
"Enable" => "Enable",
@@ -27,6 +33,7 @@ $TRANSLATIONS = array(
"Error" => "Error",
"Update" => "Update",
"Updated" => "Updated",
+"Select a profile picture" => "Select a profile picture",
"Decrypting files... Please wait, this can take some time." => "Decrypting files... Please wait, this can take some time.",
"Saving..." => "Saving...",
"deleted" => "deleted",
@@ -46,7 +53,7 @@ $TRANSLATIONS = array(
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Your web server is not yet properly setup to allow files synchronisation because the WebDAV interface seems to be broken.",
"Please double check the <a href=\"%s\">installation guides</a>." => "Please double check the <a href=\"%s\">installation guides</a>.",
"Module 'fileinfo' missing" => "Module 'fileinfo' missing",
-"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection.",
+"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "The PHP module 'fileinfo' is missing. We strongly recommend enabling this module to get best results with mime-type detection.",
"Locale not working" => "Locale not working",
"System locale can't be set to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "System locale can't be set to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s.",
"Internet connection not working" => "Internet connection not working",
@@ -75,7 +82,7 @@ $TRANSLATIONS = array(
"More" => "More",
"Less" => "Less",
"Version" => "Version",
-"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public Licence\">AGPL</abbr></a>.",
"Add your App" => "Add your App",
"More Apps" => "More Apps",
"Select an App" => "Select an App",
@@ -100,6 +107,13 @@ $TRANSLATIONS = array(
"Email" => "Email",
"Your email address" => "Your email address",
"Fill in an email address to enable password recovery" => "Fill in an email address to enable password recovery",
+"Profile picture" => "Profile picture",
+"Upload new" => "Upload new",
+"Select new from Files" => "Select new from Files",
+"Remove image" => "Remove image",
+"Either png or jpg. Ideally square but you will be able to crop it." => "Either png or jpg. Ideally square but you will be able to crop it.",
+"Abort" => "Abort",
+"Choose as profile image" => "Choose as profile image",
"Language" => "Language",
"Help translate" => "Help translate",
"WebDAV" => "WebDAV",
diff --git a/settings/l10n/eo.php b/settings/l10n/eo.php
index 6c3adf2ddcb161259c561bba9f996fe17f1557a3..4c797e1a8dd074975760a6a12527863b554cdbd2 100644
--- a/settings/l10n/eo.php
+++ b/settings/l10n/eo.php
@@ -64,6 +64,7 @@ $TRANSLATIONS = array(
"Email" => "RetpoÅto",
"Your email address" => "Via retpoÅta adreso",
"Fill in an email address to enable password recovery" => "Enigu retpoÅtadreson por kapabligi pasvortan restaÅron",
+"Profile picture" => "Profila bildo",
"Language" => "Lingvo",
"Help translate" => "Helpu traduki",
"WebDAV" => "WebDAV",
diff --git a/settings/l10n/es.php b/settings/l10n/es.php
index 52610e1c4fe504bf4ea27c5fbcc84fa345170c86..b20a4acb29971c1696fb55df5d6228ae33060b3a 100644
--- a/settings/l10n/es.php
+++ b/settings/l10n/es.php
@@ -16,6 +16,9 @@ $TRANSLATIONS = array(
"Unable to add user to group %s" => "No se pudo añadir el usuario al grupo %s",
"Unable to remove user from group %s" => "No se pudo eliminar al usuario del grupo %s",
"Couldn't update app." => "No se pudo actualizar la aplicacion.",
+"Please provide an admin recovery password, otherwise all user data will be lost" => "Por favor facilite una contraseña de recuperación de administrador, sino se perderán todos los datos de usuario",
+"Wrong admin recovery password. Please check the password and try again." => "Contraseña de recuperación de administrador incorrecta. Por favor compruebe la contraseña e inténtelo de nuevo.",
+"Unable to change password" => "No se ha podido cambiar la contraseña",
"Update to {appversion}" => "Actualizado a {appversion}",
"Disable" => "Desactivar",
"Enable" => "Activar",
@@ -27,6 +30,7 @@ $TRANSLATIONS = array(
"Error" => "Error",
"Update" => "Actualizar",
"Updated" => "Actualizado",
+"Select a profile picture" => "Seleccionar una imagen de perfil",
"Decrypting files... Please wait, this can take some time." => "Descifrando archivos... Espere por favor, esto puede llevar algo de tiempo.",
"Saving..." => "Guardando...",
"deleted" => "Eliminado",
@@ -100,6 +104,12 @@ $TRANSLATIONS = array(
"Email" => "E-mail",
"Your email address" => "Su dirección de correo",
"Fill in an email address to enable password recovery" => "Escriba una dirección de correo electrónico para restablecer la contraseña",
+"Profile picture" => "Foto del perfil",
+"Upload new" => "Subir nuevo",
+"Select new from Files" => "Seleccionar nuevo desde Ficheros",
+"Remove image" => "Borrar imagen",
+"Abort" => "Abortar",
+"Choose as profile image" => "Seleccionar como imagen de perfil",
"Language" => "Idioma",
"Help translate" => "Ayúdanos a traducir",
"WebDAV" => "WebDAV",
diff --git a/settings/l10n/es_AR.php b/settings/l10n/es_AR.php
index 252692ea4c34e211837d0cebf60ff712fe25c8fa..aba4b604a2dc4888e60e05931a98752e1510bb33 100644
--- a/settings/l10n/es_AR.php
+++ b/settings/l10n/es_AR.php
@@ -100,6 +100,7 @@ $TRANSLATIONS = array(
"Email" => "e-mail",
"Your email address" => "Tu dirección de e-mail",
"Fill in an email address to enable password recovery" => "Escribà una dirección de e-mail para restablecer la contraseña",
+"Abort" => "Abortar",
"Language" => "Idioma",
"Help translate" => "Ayudanos a traducir",
"WebDAV" => "WebDAV",
diff --git a/settings/l10n/et_EE.php b/settings/l10n/et_EE.php
index d779a36cb9b3412f744a5b00bb6a8778f05a2b34..a93ea8174224e3837705ecdf4f0b56027915a248 100644
--- a/settings/l10n/et_EE.php
+++ b/settings/l10n/et_EE.php
@@ -16,6 +16,12 @@ $TRANSLATIONS = array(
"Unable to add user to group %s" => "Kasutajat ei saa lisada gruppi %s",
"Unable to remove user from group %s" => "Kasutajat ei saa eemaldada grupist %s",
"Couldn't update app." => "Rakenduse uuendamine ebaõnnestus.",
+"Wrong password" => "Vale parool",
+"No user supplied" => "Kasutajat ei sisestatud",
+"Please provide an admin recovery password, otherwise all user data will be lost" => "Palun sisesta administraatori taasteparool, muidu kaotad kõik kasutajate andmed",
+"Wrong admin recovery password. Please check the password and try again." => "Vale administraatori taasteparool. Palun kontrolli parooli ning proovi uuesti.",
+"Back-end doesn't support password change, but the users encryption key was successfully updated." => "Tagarakend ei toeta parooli vahetust, kuid kasutaja krüptimisvõti uuendati edukalt.",
+"Unable to change password" => "Ei suuda parooli muuta",
"Update to {appversion}" => "Uuenda versioonile {appversion}",
"Disable" => "Lülita välja",
"Enable" => "Lülita sisse",
@@ -27,6 +33,7 @@ $TRANSLATIONS = array(
"Error" => "Viga",
"Update" => "Uuenda",
"Updated" => "Uuendatud",
+"Select a profile picture" => "Vali profiili pilt",
"Decrypting files... Please wait, this can take some time." => "Dekrüpteerin faile... Palun oota, see võib võtta veidi aega.",
"Saving..." => "Salvestamine...",
"deleted" => "kustutatud",
@@ -100,6 +107,13 @@ $TRANSLATIONS = array(
"Email" => "E-post",
"Your email address" => "Sinu e-posti aadress",
"Fill in an email address to enable password recovery" => "Parooli taastamise sisse lülitamiseks sisesta e-posti aadress",
+"Profile picture" => "Profiili pilt",
+"Upload new" => "Laadi uus",
+"Select new from Files" => "Vali failidest uus",
+"Remove image" => "Eemalda pilt",
+"Either png or jpg. Ideally square but you will be able to crop it." => "Kas png või jpg. Võimalikult ruudukujuline, kuid Sul on võimalus veel lõigata.",
+"Abort" => "Katkesta",
+"Choose as profile image" => "Vali kui profiili pilt",
"Language" => "Keel",
"Help translate" => "Aita tõlkida",
"WebDAV" => "WebDAV",
diff --git a/settings/l10n/eu.php b/settings/l10n/eu.php
index 6491c7fc2dd09423bc90112193ec9bb5602dab5e..63a3bf3f62bd1ab1002377f7e85b52ad69c468c6 100644
--- a/settings/l10n/eu.php
+++ b/settings/l10n/eu.php
@@ -94,6 +94,7 @@ $TRANSLATIONS = array(
"Email" => "E-posta",
"Your email address" => "Zure e-posta",
"Fill in an email address to enable password recovery" => "Idatz ezazu e-posta bat pasahitza berreskuratu ahal izateko",
+"Profile picture" => "Profilaren irudia",
"Language" => "Hizkuntza",
"Help translate" => "Lagundu itzultzen",
"WebDAV" => "WebDAV",
diff --git a/settings/l10n/fa.php b/settings/l10n/fa.php
index 74a49b9b05dcfcf35434abbfd807d588d3c0dcb6..b4ae186e300313b0d721aebd5601e042feec7cc2 100644
--- a/settings/l10n/fa.php
+++ b/settings/l10n/fa.php
@@ -87,6 +87,7 @@ $TRANSLATIONS = array(
"Email" => "ایمیل",
"Your email address" => "پست الکترونیکی شما",
"Fill in an email address to enable password recovery" => "پست الکترونیکی را پرکنید تا بازیابی گذرواژه Ùعال شود",
+"Profile picture" => "تصویر پروÙایل",
"Language" => "زبان",
"Help translate" => "به ترجمه آن کمک کنید",
"WebDAV" => "WebDAV",
diff --git a/settings/l10n/fi_FI.php b/settings/l10n/fi_FI.php
index cf2ff5041c120a81068bf45aacafb04e35247ed7..d50dc87e0144dfdd43162e10371f68cec5ef5891 100644
--- a/settings/l10n/fi_FI.php
+++ b/settings/l10n/fi_FI.php
@@ -16,6 +16,8 @@ $TRANSLATIONS = array(
"Unable to add user to group %s" => "Käyttäjän tai ryhmän %s lisääminen ei onnistu",
"Unable to remove user from group %s" => "Käyttäjän poistaminen ryhmästä %s ei onnistu",
"Couldn't update app." => "Sovelluksen päivitys epäonnistui.",
+"Wrong password" => "Väärä salasana",
+"Unable to change password" => "Salasanan vaihto ei onnistunut",
"Update to {appversion}" => "Päivitä versioon {appversion}",
"Disable" => "Poista käytöstä",
"Enable" => "Käytä",
@@ -27,6 +29,7 @@ $TRANSLATIONS = array(
"Error" => "Virhe",
"Update" => "Päivitä",
"Updated" => "Päivitetty",
+"Select a profile picture" => "Valitse profiilikuva",
"Decrypting files... Please wait, this can take some time." => "Puretaan tiedostojen salausta... Odota, tämä voi kestää jonkin aikaa.",
"Saving..." => "Tallennetaan...",
"deleted" => "poistettu",
@@ -87,6 +90,13 @@ $TRANSLATIONS = array(
"Email" => "Sähköpostiosoite",
"Your email address" => "Sähköpostiosoitteesi",
"Fill in an email address to enable password recovery" => "Anna sähköpostiosoitteesi, jotta unohdettu salasana on mahdollista palauttaa",
+"Profile picture" => "Profiilikuva",
+"Upload new" => "Lähetä uusi",
+"Select new from Files" => "Valitse uusi tiedostoista",
+"Remove image" => "Poista kuva",
+"Either png or jpg. Ideally square but you will be able to crop it." => "Joko png- tai jpg-kuva. Mieluite neliö, voit kuitenkin rajata kuvaa.",
+"Abort" => "Keskeytä",
+"Choose as profile image" => "Valitse profiilikuvaksi",
"Language" => "Kieli",
"Help translate" => "Auta kääntämisessä",
"WebDAV" => "WebDAV",
diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php
index d973ab30afd8e95df76418aec43ab03446070118..55c0e7fe9a81206f358366e448e9bc925ad7168b 100644
--- a/settings/l10n/fr.php
+++ b/settings/l10n/fr.php
@@ -16,6 +16,9 @@ $TRANSLATIONS = array(
"Unable to add user to group %s" => "Impossible d'ajouter l'utilisateur au groupe %s",
"Unable to remove user from group %s" => "Impossible de supprimer l'utilisateur du groupe %s",
"Couldn't update app." => "Impossible de mettre à jour l'application",
+"Wrong password" => "Mot de passe incorrect",
+"No user supplied" => "Aucun utilisateur fourni",
+"Unable to change password" => "Impossible de modifier le mot de passe",
"Update to {appversion}" => "Mettre à jour vers {appversion}",
"Disable" => "Désactiver",
"Enable" => "Activer",
@@ -27,6 +30,7 @@ $TRANSLATIONS = array(
"Error" => "Erreur",
"Update" => "Mettre à jour",
"Updated" => "Mise à jour effectuée avec succès",
+"Select a profile picture" => "Selectionner une photo de profil ",
"Decrypting files... Please wait, this can take some time." => "Déchiffrement en cours... Cela peut prendre un certain temps.",
"Saving..." => "Enregistrement...",
"deleted" => "supprimé",
@@ -100,6 +104,13 @@ $TRANSLATIONS = array(
"Email" => "Adresse mail",
"Your email address" => "Votre adresse e-mail",
"Fill in an email address to enable password recovery" => "Entrez votre adresse e-mail pour permettre la réinitialisation du mot de passe",
+"Profile picture" => "Photo de profil",
+"Upload new" => "Télécharger nouveau",
+"Select new from Files" => "Sélectionner un nouveau depuis les documents",
+"Remove image" => "Supprimer l'image",
+"Either png or jpg. Ideally square but you will be able to crop it." => "Soit png ou jpg. idéalement carée mais vous pourrez la recadrer .",
+"Abort" => "Abandonner",
+"Choose as profile image" => "Choisir en temps que photo de profil ",
"Language" => "Langue",
"Help translate" => "Aidez à traduire",
"WebDAV" => "WebDAV",
diff --git a/settings/l10n/gl.php b/settings/l10n/gl.php
index b3e3dfec91b1cd032b816e9516d121ae43f81856..62a2f7b8739225469f3773c4f333bd8a0c8f3e52 100644
--- a/settings/l10n/gl.php
+++ b/settings/l10n/gl.php
@@ -16,6 +16,12 @@ $TRANSLATIONS = array(
"Unable to add user to group %s" => "Non é posÃbel engadir o usuario ao grupo %s",
"Unable to remove user from group %s" => "Non é posÃbel eliminar o usuario do grupo %s",
"Couldn't update app." => "Non foi posÃbel actualizar o aplicativo.",
+"Wrong password" => "Contrasinal incorrecto",
+"No user supplied" => "Non subministrado polo usuario",
+"Please provide an admin recovery password, otherwise all user data will be lost" => "Forneza un contrasinal de recuperación do administrador de recuperación, senón perderanse todos os datos do usuario",
+"Wrong admin recovery password. Please check the password and try again." => "Contrasinal de recuperación do administrador incorrecto. Comprobe o contrasinal e tenteo de novo.",
+"Back-end doesn't support password change, but the users encryption key was successfully updated." => "A infraestrutura non admite o cambio de contrasinal, mais a chave de cifrado dos usuarios foi actualizada correctamente.",
+"Unable to change password" => "Non é posÃbel cambiar o contrasinal",
"Update to {appversion}" => "Actualizar á {appversion}",
"Disable" => "Desactivar",
"Enable" => "Activar",
@@ -27,6 +33,7 @@ $TRANSLATIONS = array(
"Error" => "Erro",
"Update" => "Actualizar",
"Updated" => "Actualizado",
+"Select a profile picture" => "Seleccione unha imaxe para o perfil",
"Decrypting files... Please wait, this can take some time." => "Descifrando ficheiros... isto pode levar un anaco.",
"Saving..." => "Gardando...",
"deleted" => "eliminado",
@@ -100,6 +107,13 @@ $TRANSLATIONS = array(
"Email" => "Correo",
"Your email address" => "O seu enderezo de correo",
"Fill in an email address to enable password recovery" => "Escriba un enderezo de correo para activar o contrasinal de recuperación",
+"Profile picture" => "Imaxe do perfil",
+"Upload new" => "Novo envÃo",
+"Select new from Files" => "Seleccione unha nova de ficheiros",
+"Remove image" => "Retirar a imaxe",
+"Either png or jpg. Ideally square but you will be able to crop it." => "Calquera png ou jpg. É preferÃbel que sexa cadrada, mais poderá recortala.",
+"Abort" => "Cancelar",
+"Choose as profile image" => "Escolla unha imaxe para o perfil",
"Language" => "Idioma",
"Help translate" => "Axude na tradución",
"WebDAV" => "WebDAV",
diff --git a/settings/l10n/he.php b/settings/l10n/he.php
index 5207a05de10f0a6648a7669c6f2cb65c0b468e2a..bdfa7f5699b184b3107b49d64a77ec4b0255eee3 100644
--- a/settings/l10n/he.php
+++ b/settings/l10n/he.php
@@ -85,6 +85,7 @@ $TRANSLATIONS = array(
"Email" => "דו×ר ××œ×§×˜×¨×•× ×™",
"Your email address" => "כתובת הדו×״ל שלך",
"Fill in an email address to enable password recovery" => "× × ×œ×ž×œ× ×ת כתובת הדו×״ל שלך כדי ל×פשר שחזור ססמה",
+"Profile picture" => "×ª×ž×•× ×ª פרופיל",
"Language" => "פה",
"Help translate" => "עזרה בתרגו×",
"WebDAV" => "WebDAV",
diff --git a/settings/l10n/hi.php b/settings/l10n/hi.php
index 094a9dba298e69ab2e883486fb25f15f3c5062f6..2c65a26dae538189d581186194bb440c0e2c05da 100644
--- a/settings/l10n/hi.php
+++ b/settings/l10n/hi.php
@@ -2,8 +2,10 @@
$TRANSLATIONS = array(
"Error" => "तà¥à¤°à¥à¤Ÿà¤¿",
"Update" => "अदà¥à¤¯à¤¤à¤¨",
+"Security Warning" => "सà¥à¤°à¤•à¥à¤·à¤¾ चेतावनी ",
"Password" => "पासवरà¥à¤¡",
"New password" => "नया पासवरà¥à¤¡",
+"Abort" => "रदà¥à¤¦ करना ",
"Username" => "पà¥à¤°à¤¯à¥‹à¤•à¥à¤¤à¤¾ का नाम"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/hu_HU.php b/settings/l10n/hu_HU.php
index f5a469e3c26705dc93cf39a776a1628db08da372..f31826c149f5ef99ac61dac205a5ebf721eb4b4f 100644
--- a/settings/l10n/hu_HU.php
+++ b/settings/l10n/hu_HU.php
@@ -97,6 +97,7 @@ $TRANSLATIONS = array(
"Email" => "Email",
"Your email address" => "Az Ön email cÃme",
"Fill in an email address to enable password recovery" => "Adja meg az email cÃmét, hogy jelszó-emlékeztetÅ‘t kérhessen, ha elfelejtette a jelszavát!",
+"Profile picture" => "Profilkép",
"Language" => "Nyelv",
"Help translate" => "SegÃtsen a fordÃtásban!",
"WebDAV" => "WebDAV",
diff --git a/settings/l10n/ia.php b/settings/l10n/ia.php
index 91df05ada3fd3b452b68940ecee272ad5b069410..b51bc32a2f5a76d67137600f5d0e465b41e1f862 100644
--- a/settings/l10n/ia.php
+++ b/settings/l10n/ia.php
@@ -19,6 +19,7 @@ $TRANSLATIONS = array(
"Change password" => "Cambiar contrasigno",
"Email" => "E-posta",
"Your email address" => "Tu adresse de e-posta",
+"Profile picture" => "Imagine de profilo",
"Language" => "Linguage",
"Help translate" => "Adjuta a traducer",
"Create" => "Crear",
diff --git a/settings/l10n/it.php b/settings/l10n/it.php
index 29594a95dcf6096b4f6ac51b849d02d25e00e8b5..fc91bc5f170f506fa834959ec918f334fc442c57 100644
--- a/settings/l10n/it.php
+++ b/settings/l10n/it.php
@@ -16,6 +16,12 @@ $TRANSLATIONS = array(
"Unable to add user to group %s" => "Impossibile aggiungere l'utente al gruppo %s",
"Unable to remove user from group %s" => "Impossibile rimuovere l'utente dal gruppo %s",
"Couldn't update app." => "Impossibile aggiornate l'applicazione.",
+"Wrong password" => "Password errata",
+"No user supplied" => "Non è stato fornito alcun utente",
+"Please provide an admin recovery password, otherwise all user data will be lost" => "Fornisci una password amministrativa di ripristino altrimenti tutti i dati degli utenti saranno persi.",
+"Wrong admin recovery password. Please check the password and try again." => "Password amministrativa di ripristino errata. Controlla la password e prova ancora.",
+"Back-end doesn't support password change, but the users encryption key was successfully updated." => "Il motore non supporta la modifica della password, ma la chiave di cifratura dell'utente è stata aggiornata correttamente.",
+"Unable to change password" => "Impossibile cambiare la password",
"Update to {appversion}" => "Aggiorna a {appversion}",
"Disable" => "Disabilita",
"Enable" => "Abilita",
@@ -27,6 +33,7 @@ $TRANSLATIONS = array(
"Error" => "Errore",
"Update" => "Aggiorna",
"Updated" => "Aggiornato",
+"Select a profile picture" => "Seleziona un'immagine del profilo",
"Decrypting files... Please wait, this can take some time." => "Decifratura dei file in corso... Attendi, potrebbe richiedere del tempo.",
"Saving..." => "Salvataggio in corso...",
"deleted" => "eliminati",
@@ -100,6 +107,13 @@ $TRANSLATIONS = array(
"Email" => "Posta elettronica",
"Your email address" => "Il tuo indirizzo email",
"Fill in an email address to enable password recovery" => "Inserisci il tuo indirizzo email per abilitare il recupero della password",
+"Profile picture" => "Immagine del profilo",
+"Upload new" => "Carica nuova",
+"Select new from Files" => "Seleziona nuova da file",
+"Remove image" => "Rimuovi immagine",
+"Either png or jpg. Ideally square but you will be able to crop it." => "Sia png che jpg. Preferibilmente quadrata, ma potrai ritagliarla.",
+"Abort" => "Interrompi",
+"Choose as profile image" => "Scegli come immagine del profilo",
"Language" => "Lingua",
"Help translate" => "Migliora la traduzione",
"WebDAV" => "WebDAV",
diff --git a/settings/l10n/ja_JP.php b/settings/l10n/ja_JP.php
index 63e83cab4ddf8aab21b53ff69028d5508d5565b1..12784e3f5379841b85e1d0c776905fad75a77fd2 100644
--- a/settings/l10n/ja_JP.php
+++ b/settings/l10n/ja_JP.php
@@ -27,6 +27,7 @@ $TRANSLATIONS = array(
"Error" => "エラー",
"Update" => "æ›´æ–°",
"Updated" => "更新済ã¿",
+"Select a profile picture" => "プãƒãƒ•ã‚¡ã‚¤ãƒ«ç”»åƒã‚’é¸æŠž",
"Decrypting files... Please wait, this can take some time." => "ファイルを複åˆä¸... ã—ã°ã‚‰ããŠå¾…ã¡ãã ã•ã„ã€ã“ã®å‡¦ç†ã«ã¯å°‘ã—時間ãŒã‹ã‹ã‚‹ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“。",
"Saving..." => "ä¿å˜ä¸...",
"deleted" => "削除",
@@ -100,6 +101,10 @@ $TRANSLATIONS = array(
"Email" => "メール",
"Your email address" => "ã‚ãªãŸã®ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹",
"Fill in an email address to enable password recovery" => "※パスワード回復を有効ã«ã™ã‚‹ã«ã¯ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ã®å…¥åŠ›ãŒå¿…è¦ã§ã™",
+"Profile picture" => "プãƒãƒ•ã‚£ãƒ¼ãƒ«å†™çœŸ",
+"Remove image" => "ç”»åƒã‚’削除",
+"Abort" => "ä¸æ¢",
+"Choose as profile image" => "プãƒãƒ•ã‚¡ã‚¤ãƒ«ç”»åƒã¨ã—ã¦é¸æŠž",
"Language" => "言語",
"Help translate" => "翻訳ã«å”力ã™ã‚‹",
"WebDAV" => "WebDAV",
diff --git a/settings/l10n/ko.php b/settings/l10n/ko.php
index 5feb1d5694f23e407e19e2ef02a466a0599419aa..cbf693d71267ae1c561f56cffcb3196b5ee635d6 100644
--- a/settings/l10n/ko.php
+++ b/settings/l10n/ko.php
@@ -87,6 +87,7 @@ $TRANSLATIONS = array(
"Email" => "ì´ë©”ì¼",
"Your email address" => "ì´ë©”ì¼ ì£¼ì†Œ",
"Fill in an email address to enable password recovery" => "암호 찾기 ê¸°ëŠ¥ì„ ì‚¬ìš©í•˜ë ¤ë©´ ì´ë©”ì¼ ì£¼ì†Œë¥¼ ìž…ë ¥í•˜ì‹ì‹œì˜¤",
+"Profile picture" => "프로필 사진",
"Language" => "언어",
"Help translate" => "ë²ˆì— ë•ê¸°",
"WebDAV" => "WebDAV",
diff --git a/settings/l10n/lt_LT.php b/settings/l10n/lt_LT.php
index 31c9e2be59fe0b8f467d6efc62d6bf395a7c97d8..a23d21ed7f7bee21e58b2cf1b4421ddeb9da9477 100644
--- a/settings/l10n/lt_LT.php
+++ b/settings/l10n/lt_LT.php
@@ -27,6 +27,7 @@ $TRANSLATIONS = array(
"Error" => "Klaida",
"Update" => "Atnaujinti",
"Updated" => "Atnaujinta",
+"Select a profile picture" => "Pažymėkite profilio paveikslėlį",
"Decrypting files... Please wait, this can take some time." => "Iššifruojami failai... Prašome palaukti, tai gali užtrukti.",
"Saving..." => "Saugoma...",
"deleted" => "ištrinta",
@@ -100,6 +101,13 @@ $TRANSLATIONS = array(
"Email" => "El. Paštas",
"Your email address" => "Jūsų el. pašto adresas",
"Fill in an email address to enable password recovery" => "Pamiršto slaptažodžio atkūrimui įveskite savo el. pašto adresą",
+"Profile picture" => "Profilio paveikslÄ—lis",
+"Upload new" => "Įkelti naują",
+"Select new from Files" => "Pasirinkti naują iš failų",
+"Remove image" => "Pašalinti paveikslėlį",
+"Either png or jpg. Ideally square but you will be able to crop it." => "Arba png arba jpg. Geriausia kvadratinį, bet galėsite jį apkarpyti.",
+"Abort" => "Atšaukti",
+"Choose as profile image" => "Pasirinkite profilio paveiksliukÄ…",
"Language" => "Kalba",
"Help translate" => "Padėkite išversti",
"WebDAV" => "WebDAV",
diff --git a/settings/l10n/mk.php b/settings/l10n/mk.php
index 42d83115647f51a2d2e43dac278e54615d925df3..901ef9106e2839a9653e957bf6d5da4049d0c15a 100644
--- a/settings/l10n/mk.php
+++ b/settings/l10n/mk.php
@@ -50,6 +50,7 @@ $TRANSLATIONS = array(
"Email" => "Е-пошта",
"Your email address" => "Вашата адреÑа за е-пошта",
"Fill in an email address to enable password recovery" => "Пополни ја адреÑата за е-пошта за да може да ја обновуваш лозинката",
+"Profile picture" => "Фотографија за профил",
"Language" => "Јазик",
"Help translate" => "Помогни во преводот",
"WebDAV" => "WebDAV",
diff --git a/settings/l10n/ms_MY.php b/settings/l10n/ms_MY.php
index 3d14df3d6575b89d5b9bab3dc58293cb60e0e7f0..0ba601dd729fc2c806b00bf95f79a6a7f08074c0 100644
--- a/settings/l10n/ms_MY.php
+++ b/settings/l10n/ms_MY.php
@@ -29,6 +29,7 @@ $TRANSLATIONS = array(
"Email" => "Email",
"Your email address" => "Alamat emel anda",
"Fill in an email address to enable password recovery" => "Isi alamat emel anda untuk membolehkan pemulihan kata laluan",
+"Profile picture" => "Gambar profil",
"Language" => "Bahasa",
"Help translate" => "Bantu terjemah",
"Create" => "Buat",
diff --git a/settings/l10n/nb_NO.php b/settings/l10n/nb_NO.php
index e017e965e988e435a882480b6ac648f0b496611e..ba46cd654e8a7967c8aef00a5ab2a8e6062beac8 100644
--- a/settings/l10n/nb_NO.php
+++ b/settings/l10n/nb_NO.php
@@ -87,6 +87,7 @@ $TRANSLATIONS = array(
"Email" => "Epost",
"Your email address" => "Din e-postadresse",
"Fill in an email address to enable password recovery" => "Oppi epostadressen du vil tilbakestille passordet for",
+"Profile picture" => "Profilbilde",
"Language" => "Språk",
"Help translate" => "Bidra til oversettelsen",
"WebDAV" => "WebDAV",
diff --git a/settings/l10n/nl.php b/settings/l10n/nl.php
index 6e82c9c92f691b84cad25656408d4ff2c5f6697d..7b486768b06ffeb3a803398059563faf1bd7d3f0 100644
--- a/settings/l10n/nl.php
+++ b/settings/l10n/nl.php
@@ -27,6 +27,7 @@ $TRANSLATIONS = array(
"Error" => "Fout",
"Update" => "Bijwerken",
"Updated" => "Bijgewerkt",
+"Select a profile picture" => "Kies een profielafbeelding",
"Decrypting files... Please wait, this can take some time." => "Bestanden worden gedecodeerd... Even geduld alstublieft, dit kan even duren.",
"Saving..." => "Opslaan",
"deleted" => "verwijderd",
@@ -100,6 +101,13 @@ $TRANSLATIONS = array(
"Email" => "E-mailadres",
"Your email address" => "Uw e-mailadres",
"Fill in an email address to enable password recovery" => "Vul een mailadres in om je wachtwoord te kunnen herstellen",
+"Profile picture" => "Profielafbeelding",
+"Upload new" => "Upload een nieuwe",
+"Select new from Files" => "Selecteer een nieuwe vanuit bestanden",
+"Remove image" => "Verwijder afbeelding",
+"Either png or jpg. Ideally square but you will be able to crop it." => "Of png, of jpg. Bij voorkeur vierkant, maar u kunt bijsnijden.",
+"Abort" => "Afbreken",
+"Choose as profile image" => "Kies als profielafbeelding",
"Language" => "Taal",
"Help translate" => "Help met vertalen",
"WebDAV" => "WebDAV",
diff --git a/settings/l10n/nn_NO.php b/settings/l10n/nn_NO.php
index 822a17e783133545e4d564acd8f67381c5ba6eeb..9eb31a887bd3c0a27e69b34565fd45e1b6c22122 100644
--- a/settings/l10n/nn_NO.php
+++ b/settings/l10n/nn_NO.php
@@ -16,6 +16,12 @@ $TRANSLATIONS = array(
"Unable to add user to group %s" => "Klarte ikkje leggja til brukaren til gruppa %s",
"Unable to remove user from group %s" => "Klarte ikkje fjerna brukaren frå gruppa %s",
"Couldn't update app." => "Klarte ikkje oppdatera programmet.",
+"Wrong password" => "Feil passord",
+"No user supplied" => "Ingen brukar gitt",
+"Please provide an admin recovery password, otherwise all user data will be lost" => "Ver venleg og gi eit admingjenopprettingspassord, elles vil all brukardata gå tapt.",
+"Wrong admin recovery password. Please check the password and try again." => "Feil admingjenopprettingspassord. Ver venleg og sjekk passordet og prøv igjen.",
+"Back-end doesn't support password change, but the users encryption key was successfully updated." => "Bakstykket støttar ikkje passordendring, men krypteringsnøkkelen til brukaren blei oppdatert.",
+"Unable to change password" => "Klarte ikkje å endra passordet",
"Update to {appversion}" => "Oppdater til {appversion}",
"Disable" => "Slå av",
"Enable" => "Slå på",
@@ -27,6 +33,7 @@ $TRANSLATIONS = array(
"Error" => "Feil",
"Update" => "Oppdater",
"Updated" => "Oppdatert",
+"Select a profile picture" => "Vel eit profilbilete",
"Decrypting files... Please wait, this can take some time." => "Dekrypterer filer … Ver venleg og vent, dette kan ta ei stund.",
"Saving..." => "Lagrar …",
"deleted" => "sletta",
@@ -100,6 +107,13 @@ $TRANSLATIONS = array(
"Email" => "E-post",
"Your email address" => "Di epost-adresse",
"Fill in an email address to enable password recovery" => "Fyll inn e-postadressa di for å gjera passordgjenoppretting mogleg",
+"Profile picture" => "Profilbilete",
+"Upload new" => "Last opp ny",
+"Select new from Files" => "Vel ny frå Filer",
+"Remove image" => "Fjern bilete",
+"Either png or jpg. Ideally square but you will be able to crop it." => "Anten PNG eller JPG. Helst kvadratisk, men du får moglegheita til å beskjera det.",
+"Abort" => "Avbryt",
+"Choose as profile image" => "Vel som profilbilete",
"Language" => "Språk",
"Help translate" => "Hjelp oss å omsetja",
"WebDAV" => "WebDAV",
diff --git a/settings/l10n/pa.php b/settings/l10n/pa.php
new file mode 100644
index 0000000000000000000000000000000000000000..795a80f7d421a000f5ef56e2cb8d72d78773e14c
--- /dev/null
+++ b/settings/l10n/pa.php
@@ -0,0 +1,24 @@
+<?php
+$TRANSLATIONS = array(
+"Language changed" => "à¨à¨¾à¨¶à¨¾ ਬਦਲੀ",
+"Disable" => "ਬੰਦ",
+"Enable" => "ਚਾਲੂ",
+"Please wait...." => "...ਉਡੀਕੋ ਜੀ",
+"Updating...." => "...ਅੱਪਡੇਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ",
+"Error" => "ਗਲਤੀ",
+"Updated" => "ਅੱਪਡੇਟ ਕੀਤਾ",
+"Saving..." => "...ਸੰà¨à¨¾à¨²à¨¿à¨† ਜਾ ਰਿਹਾ ਹੈ",
+"deleted" => "ਹਟਾਈ",
+"undo" => "ਵਾਪਸ",
+"Groups" => "ਗਰà©à©±à¨ª",
+"Group Admin" => "ਗਰà©à©±à¨ª à¨à¨¡à¨®à¨¿à¨¨",
+"Delete" => "ਹਟਾਓ",
+"add group" => "ਗਰà©à©±à¨ª ਸ਼ਾਮਲ",
+"__language_name__" => "__à¨à¨¾à¨¶à¨¾_ਨਾਂ__",
+"Security Warning" => "ਸà©à¨°à©±à¨–ਿਆ ਚੇਤਾਵਨੀ",
+"Setup Warning" => "ਸੈਟਅੱਪ ਚੇਤਾਵਨੀ",
+"Password" => "ਪਾਸਵਰ",
+"Change password" => "ਪਾਸਵਰਡ ਬਦਲੋ",
+"Username" => "ਯੂਜ਼ਰ-ਨਾਂ"
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/pl.php b/settings/l10n/pl.php
index a8bc60ffed613c63ab30766dee9b1e0c07fc8ac2..d07d1f7a4d22e30f6fb44795fdf1f290dfce4e88 100644
--- a/settings/l10n/pl.php
+++ b/settings/l10n/pl.php
@@ -100,6 +100,8 @@ $TRANSLATIONS = array(
"Email" => "Email",
"Your email address" => "Twój adres e-mail",
"Fill in an email address to enable password recovery" => "Podaj adres e-mail, aby uzyskać możliwość odzyskania hasła",
+"Profile picture" => "Zdjęcie profilu",
+"Abort" => "Anuluj",
"Language" => "Język",
"Help translate" => "Pomóż w tłumaczeniu",
"WebDAV" => "WebDAV",
diff --git a/settings/l10n/pt_BR.php b/settings/l10n/pt_BR.php
index 7b51025356b2183c952765dcf79deb039a2003af..6f3312fa78bc7f67fbe683339696c08d38bcd081 100644
--- a/settings/l10n/pt_BR.php
+++ b/settings/l10n/pt_BR.php
@@ -16,6 +16,12 @@ $TRANSLATIONS = array(
"Unable to add user to group %s" => "Não foi possÃvel adicionar usuário ao grupo %s",
"Unable to remove user from group %s" => "Não foi possÃvel remover usuário do grupo %s",
"Couldn't update app." => "Não foi possÃvel atualizar a app.",
+"Wrong password" => "Senha errada",
+"No user supplied" => "Nenhum usuário fornecido",
+"Please provide an admin recovery password, otherwise all user data will be lost" => "Por favor, forneça uma senha de recuperação admin, caso contrário todos os dados do usuário serão perdidos",
+"Wrong admin recovery password. Please check the password and try again." => "Senha de recuperação do administrador errada. Por favor verifique a senha e tente novamente.",
+"Back-end doesn't support password change, but the users encryption key was successfully updated." => "Back-end não suporta alteração de senha, mas a chave de criptografia de usuários foi atualizado com sucesso....",
+"Unable to change password" => "ImpossÃvel modificar senha",
"Update to {appversion}" => "Atualizar para {appversion}",
"Disable" => "Desabilitar",
"Enable" => "Habilitar",
@@ -27,6 +33,7 @@ $TRANSLATIONS = array(
"Error" => "Erro",
"Update" => "Atualizar",
"Updated" => "Atualizado",
+"Select a profile picture" => "Selecione uma imagem para o perfil",
"Decrypting files... Please wait, this can take some time." => "Decriptando arquivos... Por favor aguarde, isso pode levar algum tempo.",
"Saving..." => "Salvando...",
"deleted" => "excluÃdo",
@@ -100,6 +107,13 @@ $TRANSLATIONS = array(
"Email" => "E-mail",
"Your email address" => "Seu endereço de e-mail",
"Fill in an email address to enable password recovery" => "Preencha um endereço de e-mail para habilitar a recuperação de senha",
+"Profile picture" => "Imagem para o perfil",
+"Upload new" => "Enviar nova foto",
+"Select new from Files" => "Selecinar uma nova dos Arquivos",
+"Remove image" => "Remover imagem",
+"Either png or jpg. Ideally square but you will be able to crop it." => "Ou png ou jpg. O ideal é quadrado, mas você vai ser capaz de cortá-la.",
+"Abort" => "Abortar",
+"Choose as profile image" => "Escolha como imagem para o perfil",
"Language" => "Idioma",
"Help translate" => "Ajude a traduzir",
"WebDAV" => "WebDAV",
diff --git a/settings/l10n/pt_PT.php b/settings/l10n/pt_PT.php
index e1299bb96492b167921d144ef6ca31fb8ebc2a83..b664d2be3db7ca554bb2b2814729e826e9404574 100644
--- a/settings/l10n/pt_PT.php
+++ b/settings/l10n/pt_PT.php
@@ -100,6 +100,8 @@ $TRANSLATIONS = array(
"Email" => "Email",
"Your email address" => "O seu endereço de email",
"Fill in an email address to enable password recovery" => "Preencha com o seu endereço de email para ativar a recuperação da palavra-chave",
+"Profile picture" => "Foto do perfil",
+"Abort" => "Abortar",
"Language" => "Idioma",
"Help translate" => "Ajude a traduzir",
"WebDAV" => "WebDAV",
diff --git a/settings/l10n/ro.php b/settings/l10n/ro.php
index b0735af4aab281064827a3dbd7cf9f50e19757bc..c3483f83deb1f2372273c1a53d0180206df26e65 100644
--- a/settings/l10n/ro.php
+++ b/settings/l10n/ro.php
@@ -7,7 +7,7 @@ $TRANSLATIONS = array(
"Group already exists" => "Grupul există deja",
"Unable to add group" => "Nu s-a putut adăuga grupul",
"Email saved" => "E-mail salvat",
-"Invalid email" => "E-mail nevalid",
+"Invalid email" => "E-mail invalid",
"Unable to delete group" => "Nu s-a putut șterge grupul",
"Unable to delete user" => "Nu s-a putut șterge utilizatorul",
"Language changed" => "Limba a fost schimbată",
@@ -16,6 +16,8 @@ $TRANSLATIONS = array(
"Unable to add user to group %s" => "Nu s-a putut adăuga utilizatorul la grupul %s",
"Unable to remove user from group %s" => "Nu s-a putut elimina utilizatorul din grupul %s",
"Couldn't update app." => "Aplicaţia nu s-a putut actualiza.",
+"Wrong password" => "Parolă greșită",
+"Unable to change password" => "Imposibil de schimbat parola",
"Update to {appversion}" => "Actualizat la {versiuneaaplicaţiei}",
"Disable" => "Dezactivați",
"Enable" => "Activare",
@@ -51,6 +53,7 @@ $TRANSLATIONS = array(
"Allow apps to use the Share API" => "Permite aplicațiilor să folosească API-ul de partajare",
"Allow links" => "Pemite legături",
"Allow users to share items to the public with links" => "Permite utilizatorilor să partajeze fișiere în mod public prin legături",
+"Allow public uploads" => "Permite încărcări publice",
"Allow resharing" => "Permite repartajarea",
"Allow users to share items shared with them again" => "Permite utilizatorilor să repartajeze fișiere partajate cu ei",
"Allow users to share with anyone" => "Permite utilizatorilor să partajeze cu oricine",
@@ -84,6 +87,9 @@ $TRANSLATIONS = array(
"Email" => "Email",
"Your email address" => "Adresa ta de email",
"Fill in an email address to enable password recovery" => "Completează o adresă de mail pentru a-ți putea recupera parola",
+"Profile picture" => "Imagine de profil",
+"Remove image" => "Înlătură imagine",
+"Choose as profile image" => "Alege drept imagine de profil",
"Language" => "Limba",
"Help translate" => "Ajută la traducere",
"WebDAV" => "WebDAV",
@@ -94,6 +100,8 @@ $TRANSLATIONS = array(
"Other" => "Altele",
"Username" => "Nume utilizator",
"Storage" => "Stocare",
+"change display name" => "schimbă numele afișat",
+"set new password" => "setează parolă nouă",
"Default" => "Implicită"
);
$PLURAL_FORMS = "nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));";
diff --git a/settings/l10n/ru.php b/settings/l10n/ru.php
index 63e502b8d5b7086fb45d99b2e925f392119ead18..1bce6332c76c9620fe28cee489a85e3e3c9713ed 100644
--- a/settings/l10n/ru.php
+++ b/settings/l10n/ru.php
@@ -16,15 +16,24 @@ $TRANSLATIONS = array(
"Unable to add user to group %s" => "Ðевозможно добавить Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð² группу %s",
"Unable to remove user from group %s" => "Ðевозможно удалить Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¸Ð· группы %s",
"Couldn't update app." => "Ðевозможно обновить приложение",
+"Wrong password" => "Ðеправильный пароль",
+"No user supplied" => "Пользователь не задан",
+"Please provide an admin recovery password, otherwise all user data will be lost" => "ПожалуйÑта введите админиÑтраторÑкий пароль воÑÑтановлениÑ, иначе вÑе пользовательÑкие данные будут утерÑны",
+"Wrong admin recovery password. Please check the password and try again." => "Ðеправильный пароль воÑÑтановлениÑ. Проверьте пароль и попробуйте еще раз.",
+"Back-end doesn't support password change, but the users encryption key was successfully updated." => "ИÑпользуемый механизм не поддерживает Ñмену паролей, но пользовательÑкий ключ ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð±Ñ‹Ð» уÑпешно обновлён",
+"Unable to change password" => "Ðевозможно изменить пароль",
"Update to {appversion}" => "Обновить до {верÑÐ¸Ñ Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ}",
"Disable" => "Выключить",
"Enable" => "Включить",
"Please wait...." => "Подождите...",
+"Error while disabling app" => "Ошибка Ð¾Ñ‚ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ",
+"Error while enabling app" => "Ошибка Ð²ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ",
"Updating...." => "Обновление...",
"Error while updating app" => "Ошибка при обновлении приложениÑ",
"Error" => "Ошибка",
"Update" => "Обновить",
"Updated" => "Обновлено",
+"Select a profile picture" => "Выберите картинку профилÑ",
"Decrypting files... Please wait, this can take some time." => "РаÑшифровка файлов... ПожалуйÑта, подождите, Ñто может занÑÑ‚ÑŒ некоторое времÑ.",
"Saving..." => "Сохранение...",
"deleted" => "удален",
@@ -98,11 +107,21 @@ $TRANSLATIONS = array(
"Email" => "E-mail",
"Your email address" => "Ваш Ð°Ð´Ñ€ÐµÑ Ñлектронной почты",
"Fill in an email address to enable password recovery" => "Введите Ð°Ð´Ñ€ÐµÑ Ñлектронной почты чтобы поÑвилаÑÑŒ возможноÑÑ‚ÑŒ воÑÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð¿Ð°Ñ€Ð¾Ð»Ñ",
+"Profile picture" => "Фото профилÑ",
+"Upload new" => "Закачать новую",
+"Select new from Files" => "Выберите новый из файлов",
+"Remove image" => "Удалить изображение",
+"Either png or jpg. Ideally square but you will be able to crop it." => "Либо png, либо jpg. Изображение должно быть квадратным, но вы Ñможете обрезать его позже.",
+"Abort" => "Отмена",
+"Choose as profile image" => "Выберите изображение профилÑ",
"Language" => "Язык",
"Help translate" => "Помочь Ñ Ð¿ÐµÑ€ÐµÐ²Ð¾Ð´Ð¾Ð¼",
"WebDAV" => "WebDAV",
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "ИÑпользуйте Ñтот Ð°Ð´Ñ€ÐµÑ Ñ‡Ñ‚Ð¾Ð±Ñ‹ получить доÑтуп к вашим файлам через WebDav - <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">",
"Encryption" => "Шифрование",
+"The encryption app is no longer enabled, decrypt all your file" => "Приложение ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð½Ðµ активно, отмените шифрование вÑех ваших файлов.",
+"Log-in password" => "Пароль входа",
+"Decrypt all Files" => "СнÑÑ‚ÑŒ шифрование Ñо вÑех файлов",
"Login Name" => "Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ",
"Create" => "Создать",
"Admin Recovery Password" => "ВоÑÑтановление ÐŸÐ°Ñ€Ð¾Ð»Ñ ÐдминиÑтратора",
diff --git a/settings/l10n/sk_SK.php b/settings/l10n/sk_SK.php
index b83407fc3bc3453aaa6b0873190f2295b4941c67..cd44e5f94c52f24d6afb3aec412ed9230acf6bc0 100644
--- a/settings/l10n/sk_SK.php
+++ b/settings/l10n/sk_SK.php
@@ -100,6 +100,7 @@ $TRANSLATIONS = array(
"Email" => "Email",
"Your email address" => "Vaša emailová adresa",
"Fill in an email address to enable password recovery" => "Vyplňte emailovú adresu pre aktivovanie obnovy hesla",
+"Profile picture" => "Profilová fotka",
"Language" => "Jazyk",
"Help translate" => "Pomôcť s prekladom",
"WebDAV" => "WebDAV",
diff --git a/settings/l10n/sl.php b/settings/l10n/sl.php
index 63477b0b9feb4df80d2831e72d467ce7b946e83a..0fbf32480285eba99228f87a865047dc7499a17f 100644
--- a/settings/l10n/sl.php
+++ b/settings/l10n/sl.php
@@ -87,6 +87,7 @@ $TRANSLATIONS = array(
"Email" => "Elektronski naslov",
"Your email address" => "Osebni elektronski naslov",
"Fill in an email address to enable password recovery" => "VpiÅ¡ite osebni elektronski naslov in s tem omogoÄite obnovitev gesla",
+"Profile picture" => "Slika profila",
"Language" => "Jezik",
"Help translate" => "Sodelujte pri prevajanju",
"WebDAV" => "WebDAV",
diff --git a/settings/l10n/sr@latin.php b/settings/l10n/sr@latin.php
index f23e665bb27acf15dce52035d38f57ec0013694e..b89f710c28012860818baeaeb2058fdd9b68f39c 100644
--- a/settings/l10n/sr@latin.php
+++ b/settings/l10n/sr@latin.php
@@ -3,8 +3,10 @@ $TRANSLATIONS = array(
"Authentication error" => "Greška pri autentifikaciji",
"Language changed" => "Jezik je izmenjen",
"Invalid request" => "Neispravan zahtev",
+"Error" => "Greška",
"Groups" => "Grupe",
"Delete" => "Obriši",
+"Security Warning" => "Bezbednosno upozorenje",
"Select an App" => "Izaberite program",
"Password" => "Lozinka",
"Unable to change your password" => "Ne mogu da izmenim vašu lozinku",
diff --git a/settings/l10n/sv.php b/settings/l10n/sv.php
index 15e0ca9b8d5643e580a38b6098cdfedecb8214eb..5f6313f1829f31ef07aacee9fdf43fa11510770a 100644
--- a/settings/l10n/sv.php
+++ b/settings/l10n/sv.php
@@ -100,6 +100,7 @@ $TRANSLATIONS = array(
"Email" => "E-post",
"Your email address" => "Din e-postadress",
"Fill in an email address to enable password recovery" => "Fyll i en e-postadress för att aktivera återställning av lösenord",
+"Profile picture" => "Profilbild",
"Language" => "Språk",
"Help translate" => "Hjälp att översätta",
"WebDAV" => "WebDAV",
diff --git a/settings/l10n/th_TH.php b/settings/l10n/th_TH.php
index ef62f185c5c9ace9dacc7631098f439f082d92ab..900423425595d8ace671e7f33fc932bd2579cf49 100644
--- a/settings/l10n/th_TH.php
+++ b/settings/l10n/th_TH.php
@@ -71,6 +71,7 @@ $TRANSLATIONS = array(
"Email" => "à¸à¸µà¹€à¸¡à¸¥",
"Your email address" => "ที่à¸à¸¢à¸¹à¹ˆà¸à¸µà¹€à¸¡à¸¥à¹Œà¸‚à¸à¸‡à¸„ุณ",
"Fill in an email address to enable password recovery" => "à¸à¸£à¸à¸à¸—ี่à¸à¸¢à¸¹à¹ˆà¸à¸µà¹€à¸¡à¸¥à¹Œà¸‚à¸à¸‡à¸„ุณเพื่à¸à¹€à¸›à¸´à¸”ให้มีà¸à¸²à¸£à¸à¸¹à¹‰à¸„ืนรหัสผ่านได้",
+"Profile picture" => "รูปภาพโปรไฟล์",
"Language" => "ภาษา",
"Help translate" => "ช่วยà¸à¸±à¸™à¹à¸›à¸¥",
"WebDAV" => "WebDAV",
diff --git a/settings/l10n/tr.php b/settings/l10n/tr.php
index cd90d2f8a01502504765f0180053da85499ff02b..1f4ce98f555f8108d1df1cdb81e49f90d84044fb 100644
--- a/settings/l10n/tr.php
+++ b/settings/l10n/tr.php
@@ -100,6 +100,7 @@ $TRANSLATIONS = array(
"Email" => "Eposta",
"Your email address" => "Eposta adresiniz",
"Fill in an email address to enable password recovery" => "Parola kurtarmayı etkinleştirmek için bir eposta adresi girin",
+"Profile picture" => "Profil resmi",
"Language" => "Dil",
"Help translate" => "Çevirilere yardım edin",
"WebDAV" => "WebDAV",
diff --git a/settings/l10n/zh_CN.php b/settings/l10n/zh_CN.php
index cc14a3648a847622da2ee11156b880bcdcf36208..659c5bea1a601036a26e186cc364b51daf884f9c 100644
--- a/settings/l10n/zh_CN.php
+++ b/settings/l10n/zh_CN.php
@@ -100,6 +100,7 @@ $TRANSLATIONS = array(
"Email" => "电å邮件",
"Your email address" => "您的电å邮件",
"Fill in an email address to enable password recovery" => "填写电å邮件地å€ä»¥å¯ç”¨å¯†ç æ¢å¤åŠŸèƒ½",
+"Profile picture" => "è”系人图片",
"Language" => "è¯è¨€",
"Help translate" => "帮助翻译",
"WebDAV" => "WebDAV",
diff --git a/settings/l10n/zh_TW.php b/settings/l10n/zh_TW.php
index 73c015d17afa99163cd8858092bf43488a43fd23..add2f1fe0029836d392f7cb8d9d8d3f20a9c37a7 100644
--- a/settings/l10n/zh_TW.php
+++ b/settings/l10n/zh_TW.php
@@ -100,6 +100,7 @@ $TRANSLATIONS = array(
"Email" => "ä¿¡ç®±",
"Your email address" => "您的電å郵件信箱",
"Fill in an email address to enable password recovery" => "請填入電å郵件信箱以便回復密碼",
+"Profile picture" => "個人資料照片",
"Language" => "語言",
"Help translate" => "幫助翻è¯",
"WebDAV" => "WebDAV",
diff --git a/settings/routes.php b/settings/routes.php
index 73ee70d1d5cbca819c9014ff32968152857270be..60f9d8e100193c87fcb248021bb9efde135982bd 100644
--- a/settings/routes.php
+++ b/settings/routes.php
@@ -37,11 +37,15 @@ $this->create('settings_ajax_togglesubadmins', '/settings/ajax/togglesubadmins.p
->actionInclude('settings/ajax/togglesubadmins.php');
$this->create('settings_ajax_removegroup', '/settings/ajax/removegroup.php')
->actionInclude('settings/ajax/removegroup.php');
-$this->create('settings_ajax_changepassword', '/settings/ajax/changepassword.php')
- ->actionInclude('settings/ajax/changepassword.php');
+$this->create('settings_users_changepassword', '/settings/users/changepassword')
+ ->post()
+ ->action('OC\Settings\ChangePassword\Controller', 'changeUserPassword');
$this->create('settings_ajax_changedisplayname', '/settings/ajax/changedisplayname.php')
->actionInclude('settings/ajax/changedisplayname.php');
-// personel
+// personal
+$this->create('settings_personal_changepassword', '/settings/personal/changepassword')
+ ->post()
+ ->action('OC\Settings\ChangePassword\Controller', 'changePersonalPassword');
$this->create('settings_ajax_lostpassword', '/settings/ajax/lostpassword.php')
->actionInclude('settings/ajax/lostpassword.php');
$this->create('settings_ajax_setlanguage', '/settings/ajax/setlanguage.php')
diff --git a/tests/lib/files/cache/permissions.php b/tests/lib/files/cache/permissions.php
index 7e6e11e2eb29c09e6fe9a5fdcf2dd293f7e82c98..4b284c2c8e287f6bdaf87cd8b24d1f95e27e20a5 100644
--- a/tests/lib/files/cache/permissions.php
+++ b/tests/lib/files/cache/permissions.php
@@ -8,6 +8,8 @@
namespace Test\Files\Cache;
+use OC\Files\Storage\Temporary;
+
class Permissions extends \PHPUnit_Framework_TestCase {
/***
* @var \OC\Files\Cache\Permissions $permissionsCache
@@ -55,4 +57,19 @@ class Permissions extends \PHPUnit_Framework_TestCase {
$this->permissionsCache->removeMultiple($ids, $user);
}
+
+ public function testUpdatePermissionsOnRescan() {
+ $storage = new Temporary(array());
+ $scanner = $storage->getScanner();
+ $cache = $storage->getCache();
+ $permissionsCache = $storage->getPermissionsCache();
+
+ $storage->file_put_contents('foo.txt', 'bar');
+ $scanner->scan('');
+ $id = $cache->getId('foo.txt');
+ $permissionsCache->set($id, 'test', 1);
+
+ $scanner->scan('');
+ $this->assertEquals(-1, $permissionsCache->get($id, 'test'));
+ }
}
diff --git a/tests/lib/files/cache/scanner.php b/tests/lib/files/cache/scanner.php
index f6deb93a49e1a37215878327bd7cd056b1078af4..3f3a045377a8efba7351a4987f59dd749b748a99 100644
--- a/tests/lib/files/cache/scanner.php
+++ b/tests/lib/files/cache/scanner.php
@@ -24,6 +24,21 @@ class Scanner extends \PHPUnit_Framework_TestCase {
*/
private $cache;
+ function setUp() {
+ $this->storage = new \OC\Files\Storage\Temporary(array());
+ $this->scanner = new \OC\Files\Cache\Scanner($this->storage);
+ $this->cache = new \OC\Files\Cache\Cache($this->storage);
+ }
+
+ function tearDown() {
+ if ($this->cache) {
+ $ids = $this->cache->getAll();
+ $permissionsCache = $this->storage->getPermissionsCache();
+ $permissionsCache->removeMultiple($ids, \OC_User::getUser());
+ $this->cache->clear();
+ }
+ }
+
function testFile() {
$data = "dummy file data\n";
$this->storage->file_put_contents('foo.txt', $data);
@@ -184,18 +199,38 @@ class Scanner extends \PHPUnit_Framework_TestCase {
$this->assertFalse($this->cache->inCache('folder/bar.txt'));
}
- function setUp() {
- $this->storage = new \OC\Files\Storage\Temporary(array());
- $this->scanner = new \OC\Files\Cache\Scanner($this->storage);
- $this->cache = new \OC\Files\Cache\Cache($this->storage);
+ public function testScanRemovedFile(){
+ $this->fillTestFolders();
+
+ $this->scanner->scan('');
+ $this->assertTrue($this->cache->inCache('folder/bar.txt'));
+ $this->storage->unlink('folder/bar.txt');
+ $this->scanner->scanFile('folder/bar.txt');
+ $this->assertFalse($this->cache->inCache('folder/bar.txt'));
}
- function tearDown() {
- if ($this->cache) {
- $ids = $this->cache->getAll();
- $permissionsCache = $this->storage->getPermissionsCache();
- $permissionsCache->removeMultiple($ids, \OC_User::getUser());
- $this->cache->clear();
- }
+ public function testETagRecreation() {
+ $this->fillTestFolders();
+
+ $this->scanner->scan('folder/bar.txt');
+
+ // manipulate etag to simulate an empty etag
+ $this->scanner->scan('', \OC\Files\Cache\Scanner::SCAN_SHALLOW, \OC\Files\Cache\Scanner::REUSE_ETAG);
+ $data0 = $this->cache->get('folder/bar.txt');
+ $data1 = $this->cache->get('folder');
+ $data2 = $this->cache->get('');
+ $data0['etag'] = '';
+ $this->cache->put('folder/bar.txt', $data0);
+
+ // rescan
+ $this->scanner->scan('folder/bar.txt', \OC\Files\Cache\Scanner::SCAN_SHALLOW, \OC\Files\Cache\Scanner::REUSE_ETAG);
+
+ // verify cache content
+ $newData0 = $this->cache->get('folder/bar.txt');
+ $newData1 = $this->cache->get('folder');
+ $newData2 = $this->cache->get('');
+ $this->assertNotEmpty($newData0['etag']);
+ $this->assertNotEquals($data1['etag'], $newData1['etag']);
+ $this->assertNotEquals($data2['etag'], $newData2['etag']);
}
}
diff --git a/tests/lib/files/view.php b/tests/lib/files/view.php
index 0de436f570a5ddbc35b0ecf37293a50ef98fd408..3043f132b73ea118af1e7bcd1f6e4f752c613f70 100644
--- a/tests/lib/files/view.php
+++ b/tests/lib/files/view.php
@@ -354,8 +354,22 @@ class View extends \PHPUnit_Framework_TestCase {
$this->hookPath = $params['path'];
}
+ public function testSearchNotOutsideView() {
+ $storage1 = $this->getTestStorage();
+ \OC\Files\Filesystem::mount($storage1, array(), '/');
+ $storage1->rename('folder', 'foo');
+ $scanner = $storage1->getScanner();
+ $scanner->scan('');
+
+ $view = new \OC\Files\View('/foo');
+
+ $result = $view->search('.txt');
+ $this->assertCount(1, $result);
+ }
+
/**
* @param bool $scan
+ * @param string $class
* @return \OC\Files\Storage\Storage
*/
private function getTestStorage($scan = true, $class = '\OC\Files\Storage\Temporary') {
diff --git a/tests/lib/preferences.php b/tests/lib/preferences.php
index 612cc81926ba8e33302513f89b5dde73d42e2617..68b794e9ea9526d574710d10552978a0c36efc24 100644
--- a/tests/lib/preferences.php
+++ b/tests/lib/preferences.php
@@ -1,6 +1,7 @@
<?php
/**
* Copyright (c) 2013 Christopher Schäpers <christopher@schaepers.it>
+ * Copyright (c) 2013 Bart Visscher <bartv@thisnet.nl>
* This file is licensed under the Affero General Public License version 3 or
* later.
* See the COPYING-README file.
@@ -124,3 +125,181 @@ class Test_Preferences extends PHPUnit_Framework_TestCase {
$this->assertEquals(0, $result->numRows());
}
}
+
+class Test_Preferences_Object extends PHPUnit_Framework_TestCase {
+ public function testGetUsers()
+ {
+ $statementMock = $this->getMock('\Doctrine\DBAL\Statement', array(), array(), '', false);
+ $statementMock->expects($this->exactly(2))
+ ->method('fetchColumn')
+ ->will($this->onConsecutiveCalls('foo', false));
+ $connectionMock = $this->getMock('\OC\DB\Connection', array(), array(), '', false);
+ $connectionMock->expects($this->once())
+ ->method('executeQuery')
+ ->with($this->equalTo('SELECT DISTINCT `userid` FROM `*PREFIX*preferences`'))
+ ->will($this->returnValue($statementMock));
+
+ $preferences = new OC\Preferences($connectionMock);
+ $apps = $preferences->getUsers();
+ $this->assertEquals(array('foo'), $apps);
+ }
+
+ public function testGetApps()
+ {
+ $statementMock = $this->getMock('\Doctrine\DBAL\Statement', array(), array(), '', false);
+ $statementMock->expects($this->exactly(2))
+ ->method('fetchColumn')
+ ->will($this->onConsecutiveCalls('foo', false));
+ $connectionMock = $this->getMock('\OC\DB\Connection', array(), array(), '', false);
+ $connectionMock->expects($this->once())
+ ->method('executeQuery')
+ ->with($this->equalTo('SELECT DISTINCT `appid` FROM `*PREFIX*preferences` WHERE `userid` = ?'),
+ $this->equalTo(array('bar')))
+ ->will($this->returnValue($statementMock));
+
+ $preferences = new OC\Preferences($connectionMock);
+ $apps = $preferences->getApps('bar');
+ $this->assertEquals(array('foo'), $apps);
+ }
+
+ public function testGetKeys()
+ {
+ $statementMock = $this->getMock('\Doctrine\DBAL\Statement', array(), array(), '', false);
+ $statementMock->expects($this->exactly(2))
+ ->method('fetchColumn')
+ ->will($this->onConsecutiveCalls('foo', false));
+ $connectionMock = $this->getMock('\OC\DB\Connection', array(), array(), '', false);
+ $connectionMock->expects($this->once())
+ ->method('executeQuery')
+ ->with($this->equalTo('SELECT `configkey` FROM `*PREFIX*preferences` WHERE `userid` = ? AND `appid` = ?'),
+ $this->equalTo(array('bar', 'moo')))
+ ->will($this->returnValue($statementMock));
+
+ $preferences = new OC\Preferences($connectionMock);
+ $keys = $preferences->getKeys('bar', 'moo');
+ $this->assertEquals(array('foo'), $keys);
+ }
+
+ public function testGetValue()
+ {
+ $connectionMock = $this->getMock('\OC\DB\Connection', array(), array(), '', false);
+ $connectionMock->expects($this->exactly(2))
+ ->method('fetchAssoc')
+ ->with($this->equalTo('SELECT `configvalue` FROM `*PREFIX*preferences` WHERE `userid` = ? AND `appid` = ? AND `configkey` = ?'),
+ $this->equalTo(array('grg', 'bar', 'red')))
+ ->will($this->onConsecutiveCalls(array('configvalue'=>'foo'), null));
+
+ $preferences = new OC\Preferences($connectionMock);
+ $value = $preferences->getValue('grg', 'bar', 'red');
+ $this->assertEquals('foo', $value);
+ $value = $preferences->getValue('grg', 'bar', 'red', 'def');
+ $this->assertEquals('def', $value);
+ }
+
+ public function testSetValue()
+ {
+ $connectionMock = $this->getMock('\OC\DB\Connection', array(), array(), '', false);
+ $connectionMock->expects($this->exactly(2))
+ ->method('fetchColumn')
+ ->with($this->equalTo('SELECT COUNT(*) FROM `*PREFIX*preferences`'
+ .' WHERE `userid` = ? AND `appid` = ? AND `configkey` = ?'),
+ $this->equalTo(array('grg', 'bar', 'foo')))
+ ->will($this->onConsecutiveCalls(0, 1));
+ $connectionMock->expects($this->once())
+ ->method('insert')
+ ->with($this->equalTo('*PREFIX*preferences'),
+ $this->equalTo(
+ array(
+ 'userid' => 'grg',
+ 'appid' => 'bar',
+ 'configkey' => 'foo',
+ 'configvalue' => 'v1',
+ )
+ ));
+ $connectionMock->expects($this->once())
+ ->method('update')
+ ->with($this->equalTo('*PREFIX*preferences'),
+ $this->equalTo(
+ array(
+ 'configvalue' => 'v2',
+ )),
+ $this->equalTo(
+ array(
+ 'userid' => 'grg',
+ 'appid' => 'bar',
+ 'configkey' => 'foo',
+ )
+ ));
+
+ $preferences = new OC\Preferences($connectionMock);
+ $preferences->setValue('grg', 'bar', 'foo', 'v1');
+ $preferences->setValue('grg', 'bar', 'foo', 'v2');
+ }
+
+ public function testDeleteKey()
+ {
+ $connectionMock = $this->getMock('\OC\DB\Connection', array(), array(), '', false);
+ $connectionMock->expects($this->once())
+ ->method('delete')
+ ->with($this->equalTo('*PREFIX*preferences'),
+ $this->equalTo(
+ array(
+ 'userid' => 'grg',
+ 'appid' => 'bar',
+ 'configkey' => 'foo',
+ )
+ ));
+
+ $preferences = new OC\Preferences($connectionMock);
+ $preferences->deleteKey('grg', 'bar', 'foo');
+ }
+
+ public function testDeleteApp()
+ {
+ $connectionMock = $this->getMock('\OC\DB\Connection', array(), array(), '', false);
+ $connectionMock->expects($this->once())
+ ->method('delete')
+ ->with($this->equalTo('*PREFIX*preferences'),
+ $this->equalTo(
+ array(
+ 'userid' => 'grg',
+ 'appid' => 'bar',
+ )
+ ));
+
+ $preferences = new OC\Preferences($connectionMock);
+ $preferences->deleteApp('grg', 'bar');
+ }
+
+ public function testDeleteUser()
+ {
+ $connectionMock = $this->getMock('\OC\DB\Connection', array(), array(), '', false);
+ $connectionMock->expects($this->once())
+ ->method('delete')
+ ->with($this->equalTo('*PREFIX*preferences'),
+ $this->equalTo(
+ array(
+ 'userid' => 'grg',
+ )
+ ));
+
+ $preferences = new OC\Preferences($connectionMock);
+ $preferences->deleteUser('grg');
+ }
+
+ public function testDeleteAppFromAllUsers()
+ {
+ $connectionMock = $this->getMock('\OC\DB\Connection', array(), array(), '', false);
+ $connectionMock->expects($this->once())
+ ->method('delete')
+ ->with($this->equalTo('*PREFIX*preferences'),
+ $this->equalTo(
+ array(
+ 'appid' => 'bar',
+ )
+ ));
+
+ $preferences = new OC\Preferences($connectionMock);
+ $preferences->deleteAppFromAllUsers('bar');
+ }
+}
diff --git a/tests/lib/share/share.php b/tests/lib/share/share.php
index e02b0e4354d1bda4c359895afe328439cf74d7d0..8e9eef65d320fad8bb5d8f4af1211f78c9ae0fb0 100644
--- a/tests/lib/share/share.php
+++ b/tests/lib/share/share.php
@@ -535,4 +535,52 @@ class Test_Share extends PHPUnit_Framework_TestCase {
'Failed asserting that user 3 still has access to test.txt after expiration date has been set.'
);
}
+
+ protected function getShareByValidToken($token) {
+ $row = OCP\Share::getShareByToken($token);
+ $this->assertInternalType(
+ 'array',
+ $row,
+ "Failed asserting that a share for token $token exists."
+ );
+ return $row;
+ }
+
+ public function testShareItemWithLink() {
+ OC_User::setUserId($this->user1);
+ $token = OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_LINK, null, OCP\PERMISSION_READ);
+ $this->assertInternalType(
+ 'string',
+ $token,
+ 'Failed asserting that user 1 successfully shared text.txt as link with token.'
+ );
+
+ // testGetShareByTokenNoExpiration
+ $row = $this->getShareByValidToken($token);
+ $this->assertEmpty(
+ $row['expiration'],
+ 'Failed asserting that the returned row does not have an expiration date.'
+ );
+
+ // testGetShareByTokenExpirationValid
+ $this->assertTrue(
+ OCP\Share::setExpirationDate('test', 'test.txt', $this->dateInFuture),
+ 'Failed asserting that user 1 successfully set a future expiration date for the test.txt share.'
+ );
+ $row = $this->getShareByValidToken($token);
+ $this->assertNotEmpty(
+ $row['expiration'],
+ 'Failed asserting that the returned row has an expiration date.'
+ );
+
+ // testGetShareByTokenExpirationExpired
+ $this->assertTrue(
+ OCP\Share::setExpirationDate('test', 'test.txt', $this->dateInPast),
+ 'Failed asserting that user 1 successfully set a past expiration date for the test.txt share.'
+ );
+ $this->assertFalse(
+ OCP\Share::getShareByToken($token),
+ 'Failed asserting that an expired share could not be found.'
+ );
+ }
}