diff --git a/.gitignore b/.gitignore
index 43f3cab9121ba3a64d453d6e51d82c0498ef94c0..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
@@ -82,6 +82,9 @@ nbproject
# Tests
/tests/phpunit.xml
+# Node Modules
+/build/node_modules/
+
# Tests - auto-generated files
/data-autotest
/tests/coverage*
diff --git a/3rdparty b/3rdparty
index 2f3ae9f56a9838b45254393e13c14f8a8c380d6b..98fdc3a4e2f56f7d231470418222162dbf95f46a 160000
--- a/3rdparty
+++ b/3rdparty
@@ -1 +1 @@
-Subproject commit 2f3ae9f56a9838b45254393e13c14f8a8c380d6b
+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 c50e96b2429075f09fb3e42de2516a8fa4d67cf6..350fc7fa5f6512bac59c5d6996018ad935c7aec5 100644
--- a/apps/files/ajax/list.php
+++ b/apps/files/ajax/list.php
@@ -10,35 +10,38 @@ OCP\JSON::checkLoggedIn();
// Load the files
$dir = isset( $_GET['dir'] ) ? $_GET['dir'] : '';
+
+if (!\OC\Files\Filesystem::is_dir($dir . '/')) {
+ header("HTTP/1.0 404 Not Found");
+ exit();
+}
+
$doBreadcrumb = isset($_GET['breadcrumb']);
$data = array();
+$baseUrl = OCP\Util::linkTo('files', 'index.php') . '?dir=';
+
+$permissions = \OCA\Files\Helper::getDirPermissions($dir);
// Make breadcrumb
if($doBreadcrumb) {
- $breadcrumb = array();
- $pathtohere = "/";
- foreach( explode( "/", $dir ) as $i ) {
- if( $i != "" ) {
- $pathtohere .= "$i/";
- $breadcrumb[] = array( "dir" => $pathtohere, "name" => $i );
- }
- }
-
- $breadcrumbNav = new OCP\Template( "files", "part.breadcrumb", "" );
- $breadcrumbNav->assign( "breadcrumb", $breadcrumb, false );
+ $breadcrumb = \OCA\Files\Helper::makeBreadcrumb($dir);
+
+ $breadcrumbNav = new OCP\Template('files', 'part.breadcrumb', '');
+ $breadcrumbNav->assign('breadcrumb', $breadcrumb, false);
+ $breadcrumbNav->assign('baseURL', $baseUrl);
$data['breadcrumb'] = $breadcrumbNav->fetchPage();
}
// make filelist
-$files = array();
-foreach( \OC\Files\Filesystem::getDirectoryContent( $dir ) as $i ) {
- $i["date"] = OCP\Util::formatDate($i["mtime"] );
- $files[] = $i;
-}
-
-$list = new OCP\Template( "files", "part.list", "" );
-$list->assign( "files", $files, false );
-$data = array('files' => $list->fetchPage());
+$files = \OCA\Files\Helper::getFiles($dir);
+
+$list = new OCP\Template("files", "part.list", "");
+$list->assign('files', $files, false);
+$list->assign('baseURL', $baseUrl, false);
+$list->assign('downloadURL', OCP\Util::linkToRoute('download', array('file' => '/')));
+$list->assign('isPublic', false);
+$data['files'] = $list->fetchPage();
+$data['permissions'] = $permissions;
OCP\JSON::success(array('data' => $data));
diff --git a/apps/files/ajax/newfile.php b/apps/files/ajax/newfile.php
index d224e79d01ba2dca4be3fc254ac5f3186cd48249..76c03c87a51fae369584d99af1b93f86bd6adaf2 100644
--- a/apps/files/ajax/newfile.php
+++ b/apps/files/ajax/newfile.php
@@ -79,7 +79,7 @@ if($source) {
$success = false;
if (!$content) {
$templateManager = OC_Helper::getFileTemplateManager();
- $mimeType = OC_Helper::getMimeType($target);
+ $mimeType = OC_Helper::getMimetypeDetector()->detectPath($target);
$content = $templateManager->getTemplate($mimeType);
}
diff --git a/apps/files/ajax/rawlist.php b/apps/files/ajax/rawlist.php
index f568afad4da44f87f4d74cd301cee93202c8aa9b..531481a84c00e98f46aaeb07ca730d0c91b4568e 100644
--- a/apps/files/ajax/rawlist.php
+++ b/apps/files/ajax/rawlist.php
@@ -11,22 +11,54 @@ OCP\JSON::checkLoggedIn();
// Load the files
$dir = isset( $_GET['dir'] ) ? $_GET['dir'] : '';
-$mimetype = isset($_GET['mimetype']) ? $_GET['mimetype'] : '';
+$mimetypes = isset($_GET['mimetypes']) ? json_decode($_GET['mimetypes'], true) : '';
+
+// Clean up duplicates from array and deal with non-array requests
+if (is_array($mimetypes)) {
+ $mimetypes = array_unique($mimetypes);
+} elseif (is_null($mimetypes)) {
+ $mimetypes = array($_GET['mimetypes']);
+}
// make filelist
$files = array();
// If a type other than directory is requested first load them.
-if($mimetype && strpos($mimetype, 'httpd/unix-directory') === false) {
- foreach( \OC\Files\Filesystem::getDirectoryContent( $dir, 'httpd/unix-directory' ) as $i ) {
- $i["date"] = OCP\Util::formatDate($i["mtime"] );
- $i['mimetype_icon'] = $i['type'] == 'dir' ? \mimetype_icon('dir'): \mimetype_icon($i['mimetype']);
- $files[] = $i;
+if($mimetypes && !in_array('httpd/unix-directory', $mimetypes)) {
+ foreach( \OC\Files\Filesystem::getDirectoryContent( $dir, 'httpd/unix-directory' ) as $file ) {
+ $file['directory'] = $dir;
+ $file['isPreviewAvailable'] = \OC::$server->getPreviewManager()->isMimeSupported($file['mimetype']);
+ $file["date"] = OCP\Util::formatDate($file["mtime"]);
+ $file['mimetype_icon'] = \OCA\Files\Helper::determineIcon($file);
+ $files[] = $file;
}
}
-foreach( \OC\Files\Filesystem::getDirectoryContent( $dir, $mimetype ) as $i ) {
- $i["date"] = OCP\Util::formatDate($i["mtime"] );
- $i['mimetype_icon'] = $i['type'] == 'dir' ? \mimetype_icon('dir'): \mimetype_icon($i['mimetype']);
- $files[] = $i;
+
+if (is_array($mimetypes) && count($mimetypes)) {
+ foreach ($mimetypes as $mimetype) {
+ foreach( \OC\Files\Filesystem::getDirectoryContent( $dir, $mimetype ) as $file ) {
+ $file['directory'] = $dir;
+ $file['isPreviewAvailable'] = \OC::$server->getPreviewManager()->isMimeSupported($file['mimetype']);
+ $file["date"] = OCP\Util::formatDate($file["mtime"]);
+ $file['mimetype_icon'] = \OCA\Files\Helper::determineIcon($file);
+ $files[] = $file;
+ }
+ }
+} else {
+ foreach( \OC\Files\Filesystem::getDirectoryContent( $dir ) as $file ) {
+ $file['directory'] = $dir;
+ $file['isPreviewAvailable'] = \OC::$server->getPreviewManager()->isMimeSupported($file['mimetype']);
+ $file["date"] = OCP\Util::formatDate($file["mtime"]);
+ $file['mimetype_icon'] = \OCA\Files\Helper::determineIcon($file);
+ $files[] = $file;
+ }
}
-OCP\JSON::success(array('data' => $files));
+// Sort by name
+usort($files, function ($a, $b) {
+ if ($a['name'] === $b['name']) {
+ return 0;
+ }
+ return ($a['name'] < $b['name']) ? -1 : 1;
+});
+
+OC_JSON::success(array('data' => $files));
diff --git a/apps/files/ajax/upload.php b/apps/files/ajax/upload.php
index dde5d3c50af32e032567a812ce1be2465e96b13b..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,29 +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);
-
- $result[] = array('status' => 'success',
- 'mime' => $meta['mimetype'],
- 'size' => $meta['size'],
- 'id' => $meta['fileid'],
- 'name' => basename($target),
- 'originalname' => $files['name'][$i],
- 'uploadMaxFilesize' => $maxUploadFileSize,
- 'maxHumanFilesize' => $maxHumanFileSize
- );
+ if ($meta === false) {
+ $error = $l->t('Upload failed. Could not get file info.');
+ } else {
+ $result[] = array('status' => 'existserror',
+ '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'],
+ );
+ }
}
}
- 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/appinfo/remote.php b/apps/files/appinfo/remote.php
index 9b114ca2e37209ddc8fd739ff99c5456c6341f23..0c1f2e6580c778f4fc995236b3c5c3929906db03 100644
--- a/apps/files/appinfo/remote.php
+++ b/apps/files/appinfo/remote.php
@@ -48,6 +48,7 @@ $defaults = new OC_Defaults();
$server->addPlugin(new Sabre_DAV_Auth_Plugin($authBackend, $defaults->getName()));
$server->addPlugin(new Sabre_DAV_Locks_Plugin($lockBackend));
$server->addPlugin(new Sabre_DAV_Browser_Plugin(false)); // Show something in the Browser, but no upload
+$server->addPlugin(new OC_Connector_Sabre_AbortedUploadDetectionPlugin());
$server->addPlugin(new OC_Connector_Sabre_QuotaPlugin());
$server->addPlugin(new OC_Connector_Sabre_MaintenancePlugin());
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 7d5fe6445b7d04456a5b456b5d40d9d452606ba9..b3ecd1dab93e4cb62cb167881960c7b6aba9f49b 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -19,10 +19,13 @@
background:#f8f8f8; border:1px solid #ddd; border-radius:10px; border-top-left-radius:0;
box-shadow:0 2px 7px rgba(170,170,170,.4);
}
-#new>ul>li { height:20px; margin:.3em; padding-left:2em; padding-bottom:0.1em;
+#new>ul>li { height:36px; margin:.3em; padding-left:3em; padding-bottom:0.1em;
background-repeat:no-repeat; cursor:pointer; }
-#new>ul>li>p { cursor:pointer; }
-#new>ul>li>form>input { padding:0.3em; margin:-0.3em; }
+#new>ul>li>p { cursor:pointer; padding-top: 7px; padding-bottom: 7px;}
+#new>ul>li>form>input {
+ padding: 5px;
+ margin: 2px 0;
+}
#trash { margin: 0 1em; z-index:1010; float: right; }
@@ -65,74 +68,175 @@
/* FILE TABLE */
-#emptyfolder {
- position:absolute;
- margin:10em 0 0 10em;
- font-size:1.5em; font-weight:bold;
- color:#888; text-shadow:#fff 0 1px 0;
-}
#filestable { position: relative; top:37px; width:100%; }
-tbody tr { background-color:#fff; height:2.5em; }
-tbody tr:hover, tbody tr:active {
+#filestable tbody tr { background-color:#fff; height:2.5em; }
+#filestable tbody tr:hover, tbody tr:active {
background-color: rgb(240,240,240);
}
-tbody tr.selected {
+#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; }
tr:hover span.extension { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1; color:#777; }
table tr.mouseOver td { background-color:#eee; }
table th { height:2em; padding:0 .5em; color:#999; }
-table th .name { float:left; margin-left:.5em; }
+table th .name {
+ position: absolute;
+ left: 55px;
+ top: 15px;
+}
table th, table td { border-bottom:1px solid #ddd; text-align:left; font-weight:normal; }
-table td { border-bottom:1px solid #eee; font-style:normal; background-position:1em .5em; background-repeat:no-repeat; }
-table th#headerName { width:100em; /* not really sure why this works better than 100% … table styling */ }
-table th#headerSize, table td.filesize { min-width:3em; padding:0 1em; text-align:right; }
-table th#headerDate, table td.date { min-width:11em; padding:0 .1em 0 1em; text-align:left; }
+table td {
+ border-bottom: 1px solid #eee;
+ font-style: normal;
+ background-position: 8px center;
+ background-repeat: no-repeat;
+}
+table th#headerName {
+ position: relative;
+ width: 100em; /* not really sure why this works better than 100% … table styling */
+ padding: 0;
+}
+#headerName-container {
+ position: relative;
+ height: 50px;
+}
+table th#headerSize, table td.filesize {
+ min-width: 3em;
+ padding: 0 1em;
+ text-align: right;
+}
+table th#headerDate, table td.date {
+ -moz-box-sizing: border-box;
+ box-sizing: border-box;
+ position: relative;
+ min-width: 11em;
+ display: block;
+ height: 51px;
+}
/* Multiselect bar */
-#filestable.multiselect { top:63px; }
+#filestable.multiselect {
+ top: 88px;
+}
table.multiselect thead { position:fixed; top:82px; z-index:1; -moz-box-sizing: border-box; box-sizing: border-box; left: 0; padding-left: 80px; width:100%; }
+
table.multiselect thead th {
background-color: rgba(210,210,210,.7);
color: #000;
font-weight: bold;
border-bottom: 0;
}
-table.multiselect #headerName { width: 100%; }
+table.multiselect #headerName {
+ position: relative;
+ width: 100%;
+}
table td.selection, table th.selection, table td.fileaction { width:2em; text-align:center; }
-table td.filename a.name { display:block; height:1.5em; vertical-align:middle; margin-left:3em; }
+table td.filename a.name {
+ position:relative; /* Firefox needs to explicitly have this default set … */
+ -moz-box-sizing: border-box;
+ box-sizing: border-box;
+ display: block;
+ height: 50px;
+ vertical-align: middle;
+ padding: 0;
+}
table tr[data-type="dir"] td.filename a.name span.nametext {font-weight:bold; }
-table td.filename input.filename { width:100%; cursor:text; }
-table td.filename a, table td.login, table td.logout, table td.download, table td.upload, table td.create, table td.delete { padding:.2em .5em .5em 0; }
+table td.filename input.filename {
+ width: 80%;
+ font-size: 14px;
+ margin-top: 8px;
+ margin-left: 2px;
+ cursor: text;
+}
+table td.filename a, table td.login, table td.logout, table td.download, table td.upload, table td.create, table td.delete { padding:.2em .5em .5em .3em; }
table td.filename .nametext, .uploadtext, .modified { float:left; padding:.3em 0; }
+
+#modified {
+ position: absolute;
+ top: 15px;
+}
+.modified {
+ position: relative;
+ top: 11px;
+ left: 5px;
+}
+
/* TODO fix usability bug (accidental file/folder selection) */
-table td.filename .nametext { overflow:hidden; text-overflow:ellipsis; max-width:800px; }
+table td.filename .nametext {
+ position: absolute;
+ top: 16px;
+ left: 55px;
+ padding: 0;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ max-width: 800px;
+}
table td.filename .uploadtext { font-weight:normal; margin-left:.5em; }
table td.filename form { font-size:.85em; margin-left:3em; margin-right:3em; }
+
/* File checkboxes */
-#fileList tr td.filename>input[type="checkbox"]:first-child { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; filter:alpha(opacity=0); opacity:0; float:left; margin:.7em 0 0 1em; /* bigger clickable area doesn’t work in FF width:2.8em; height:2.4em;*/ -webkit-transition:opacity 200ms; -moz-transition:opacity 200ms; -o-transition:opacity 200ms; transition:opacity 200ms; }
-#fileList tr td.filename>input[type="checkbox"]:hover:first-child { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=80)"; filter:alpha(opacity=80); opacity:.8; }
-/* Always show checkbox when selected */
-#fileList tr td.filename>input[type="checkbox"]:checked:first-child { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1; }
-#fileList tr.selected td.filename>input[type="checkbox"]:first-child { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1; }
+#fileList tr td.filename>input[type="checkbox"]:first-child {
+ -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
+ filter: alpha(opacity=0);
+ opacity: 0;
+ float: left;
+ margin: 32px 0 4px 32px; /* bigger clickable area doesn’t work in FF width:2.8em; height:2.4em;*/
+}
+/* Show checkbox when hovering, checked, or selected */
+#fileList tr:hover td.filename>input[type="checkbox"]:first-child,
+#fileList tr td.filename>input[type="checkbox"]:checked:first-child,
+#fileList tr.selected td.filename>input[type="checkbox"]:first-child {
+ opacity: 1;
+}
+.lte9 #fileList tr:hover td.filename>input[type="checkbox"]:first-child,
+.lte9 #fileList tr td.filename>input[type="checkbox"][checked=checked]:first-child,
+.lte9 #fileList tr.selected td.filename>input[type="checkbox"]:first-child {
+ -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
+ filter: alpha(opacity=100);
+}
+
+/* Use label to have bigger clickable size for checkbox */
+#fileList tr td.filename>input[type="checkbox"] + label,
+#select_all + label {
+ height: 50px;
+ position: absolute;
+ width: 50px;
+ z-index: 5;
+}
+#fileList tr td.filename>input[type="checkbox"] + label {
+ left: 0;
+}
+#select_all + label {
+ top: 0;
+}
+#select_all {
+ position: absolute;
+ top: 18px;
+ left: 18px;
+}
+
#fileList tr td.filename {
position:relative; width:100%;
-webkit-transition:background-image 500ms; -moz-transition:background-image 500ms; -o-transition:background-image 500ms; transition:background-image 500ms;
}
-#select_all { float:left; margin:.4em 0.6em 0 .5em; }
+
#uploadsize-message,#delete-confirm { display:none; }
/* File actions */
.fileactions {
- position:absolute; top:.6em; right:0;
- font-size:.8em;
+ position: absolute;
+ top: 16px;
+ right: 0;
+ font-size: 11px;
}
-#fileList .name { position:relative; /* Firefox needs to explicitly have this default set … */ }
#fileList tr:hover .fileactions { /* background to distinguish when overlaying with file names */
background-color: rgba(240,240,240,0.898);
box-shadow: -5px 0 7px rgba(240,240,240,0.898);
@@ -142,15 +246,39 @@ table td.filename form { font-size:.85em; margin-left:3em; margin-right:3em; }
box-shadow: -5px 0 7px rgba(230,230,230,.9);
}
#fileList .fileactions a.action img { position:relative; top:.2em; }
-#fileList a.action { display:inline; margin:-.5em 0; padding:1em .5em 1em .5em !important; }
+
#fileList img.move2trash { display:inline; margin:-.5em 0; padding:1em .5em 1em .5em !important; float:right; }
-a.action.delete { float:right; }
+#fileList a.action.delete {
+ position: absolute;
+ right: 0;
+ top: 0;
+ margin: 0;
+ padding: 15px 14px 19px !important;
+}
a.action>img { max-height:16px; max-width:16px; vertical-align:text-bottom; }
-.selectedActions { display:none; float:right; }
-.selectedActions a { display:inline; margin:-.5em 0; padding:.5em !important; }
-.selectedActions a img { position:relative; top:.3em; }
+
+/* Actions for selected files */
+.selectedActions {
+ display: none;
+ position: absolute;
+ top: -1px;
+ right: 0;
+ padding: 15px 8px;
+}
+.selectedActions a {
+ display: inline;
+ padding: 17px 5px;
+}
+.selectedActions a img {
+ position:relative;
+ top:.3em;
+}
+
#fileList a.action {
+ display: inline;
+ margin: -.5em 0;
+ padding: 18px 8px !important;
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
filter: alpha(opacity=0);
opacity: 0;
@@ -170,11 +298,23 @@ a.action>img { max-height:16px; max-width:16px; vertical-align:text-bottom; }
}
.summary {
- opacity: .5;
+ -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=30)";
+ filter: alpha(opacity=30);
+ opacity: .3;
+ height: 70px;
+}
+
+.summary:hover, .summary, table tr.summary td {
+ background-color: transparent;
}
+.summary td {
+ padding-top: 8px;
+ padding-bottom: 8px;
+ border-bottom: none;
+}
.summary .info {
- margin-left: 3em;
+ margin-left: 55px;
}
#scanning-message{ top:40%; left:40%; position:absolute; display:none; }
@@ -199,3 +339,24 @@ table.dragshadow td.size {
text-align: center;
margin-left: -200px;
}
+.mask {
+ z-index: 50;
+ position: fixed;
+ top: 0;
+ left: 0;
+ right: 0;
+ bottom: 0;
+ background-color: white;
+ background-repeat: no-repeat no-repeat;
+ background-position: 50%;
+ opacity: 0.7;
+ filter: alpha(opacity=70);
+ transition: opacity 100ms;
+ -moz-transition: opacity 100ms;
+ -o-transition: opacity 100ms;
+ -ms-transition: opacity 100ms;
+ -webkit-transition: opacity 100ms;
+}
+.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 e4d8e353858e185e3b5b654f8cd4814761080b12..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');
@@ -41,77 +42,58 @@ if (!\OC\Files\Filesystem::is_dir($dir . '/')) {
exit();
}
-function fileCmp($a, $b) {
- if ($a['type'] == 'dir' and $b['type'] != 'dir') {
- return -1;
- } elseif ($a['type'] != 'dir' and $b['type'] == 'dir') {
- return 1;
- } else {
- return strnatcasecmp($a['name'], $b['name']);
+$isIE8 = false;
+preg_match('/MSIE (.*?);/', $_SERVER['HTTP_USER_AGENT'], $matches);
+if (count($matches) > 0 && $matches[1] <= 8){
+ $isIE8 = true;
+}
+
+// if IE8 and "?dir=path" was specified, reformat the URL to use a hash like "#?dir=path"
+if ($isIE8 && isset($_GET['dir'])){
+ if ($dir === ''){
+ $dir = '/';
}
+ header('Location: ' . OCP\Util::linkTo('files', 'index.php') . '#?dir=' . \OCP\Util::encodePath($dir));
+ exit();
}
+$ajaxLoad = false;
$files = array();
$user = OC_User::getUser();
if (\OC\Files\Cache\Upgrade::needUpgrade($user)) { //dont load anything if we need to upgrade the cache
- $content = array();
$needUpgrade = true;
$freeSpace = 0;
} else {
- $content = \OC\Files\Filesystem::getDirectoryContent($dir);
+ if ($isIE8){
+ // after the redirect above, the URL will have a format
+ // like "files#?dir=path" which means that no path was given
+ // (dir is not set). In that specific case, we don't return any
+ // files because the client will take care of switching the dir
+ // to the one from the hash, then ajax-load the initial file list
+ $files = array();
+ $ajaxLoad = true;
+ }
+ else{
+ $files = \OCA\Files\Helper::getFiles($dir);
+ }
$freeSpace = \OC\Files\Filesystem::free_space($dir);
$needUpgrade = false;
}
-foreach ($content as $i) {
- $i['date'] = OCP\Util::formatDate($i['mtime']);
- if ($i['type'] == 'file') {
- $fileinfo = pathinfo($i['name']);
- $i['basename'] = $fileinfo['filename'];
- if (!empty($fileinfo['extension'])) {
- $i['extension'] = '.' . $fileinfo['extension'];
- } else {
- $i['extension'] = '';
- }
- }
- $i['directory'] = $dir;
- $files[] = $i;
-}
-
-usort($files, "fileCmp");
// Make breadcrumb
-$breadcrumb = array();
-$pathtohere = '';
-foreach (explode('/', $dir) as $i) {
- if ($i != '') {
- $pathtohere .= '/' . $i;
- $breadcrumb[] = array('dir' => $pathtohere, 'name' => $i);
- }
-}
+$breadcrumb = \OCA\Files\Helper::makeBreadcrumb($dir);
// make breadcrumb und filelist markup
$list = new OCP\Template('files', 'part.list', '');
$list->assign('files', $files);
$list->assign('baseURL', OCP\Util::linkTo('files', 'index.php') . '?dir=');
$list->assign('downloadURL', OCP\Util::linkToRoute('download', array('file' => '/')));
-$list->assign('disableSharing', false);
+$list->assign('isPublic', false);
$breadcrumbNav = new OCP\Template('files', 'part.breadcrumb', '');
$breadcrumbNav->assign('breadcrumb', $breadcrumb);
$breadcrumbNav->assign('baseURL', OCP\Util::linkTo('files', 'index.php') . '?dir=');
-$permissions = OCP\PERMISSION_READ;
-if (\OC\Files\Filesystem::isCreatable($dir . '/')) {
- $permissions |= OCP\PERMISSION_CREATE;
-}
-if (\OC\Files\Filesystem::isUpdatable($dir . '/')) {
- $permissions |= OCP\PERMISSION_UPDATE;
-}
-if (\OC\Files\Filesystem::isDeletable($dir . '/')) {
- $permissions |= OCP\PERMISSION_DELETE;
-}
-if (\OC\Files\Filesystem::isSharable($dir . '/')) {
- $permissions |= OCP\PERMISSION_SHARE;
-}
+$permissions = \OCA\Files\Helper::getDirPermissions($dir);
if ($needUpgrade) {
OCP\Util::addscript('files', 'upgrade');
@@ -151,5 +133,7 @@ if ($needUpgrade) {
$tmpl->assign('isPublic', false);
$tmpl->assign('publicUploadEnabled', $publicUploadEnabled);
$tmpl->assign("encryptedFiles", \OCP\Util::encryptedFiles());
+ $tmpl->assign('disableSharing', false);
+ $tmpl->assign('ajaxLoad', $ajaxLoad);
$tmpl->printPage();
}
diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js
index f262f11f06539a112f3a13f6656127f1c743a63a..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();
- }
- },
- /**
- * 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;
- }
- $('#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);
+/**
+ * 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
}
- 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);
+ }
+};
- if(typeof result[0] !== 'undefined' && result[0].status === 'success') {
- 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);
- }
+$(document).ready(function() {
- var filename = result[0].originalname;
+ if ( $('#file_upload_start').exists() ) {
- // 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];
+ 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
}
- } else {
- delete uploadingFiles[filename];
- }
- },
- /**
- * called after last upload
- * @param e
- * @param data
- */
- stop: function(e, data) {
- if(data.dataType !== 'iframe') {
- $('#uploadprogresswrapper input.stop').hide();
- }
+ // 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();
+ });
+ }
+ };
+
+ 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 {
+ //fetch response from iframe
+ response = data.result[0].body.innerText;
+ }
+ 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);
}
+ };
- $('#uploadprogressbar').progressbar('value',100);
- $('#uploadprogressbar').fadeOut();
- }
- };
- var file_upload_handler = function() {
- $('#file_upload_start').fileupload(file_upload_param);
- };
+ // initialize jquery fileupload (blueimp)
+ var fileupload = $('#file_upload_start').fileupload(file_upload_param);
+ window.file_upload_param = fileupload;
+ 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();
+ }
+ });
- if ( document.getElementById('data-upload-form') ) {
- $(file_upload_handler);
+ } else {
+ console.log('skipping file progress because your browser is broken');
+ }
}
+
$.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.');
}
});
@@ -229,7 +508,7 @@ $(document).ready(function() {
$(this).data('text',text);
$(this).children('p').remove();
var form=$('<form></form>');
- var input=$('<input>');
+ var input=$('<input type="text">');
form.append(input);
$(this).append(form);
input.focus();
@@ -270,8 +549,9 @@ $(document).ready(function() {
tr.attr('data-mime',result.data.mime);
tr.attr('data-id', result.data.id);
tr.find('.filesize').text(humanFileSize(result.data.size));
- getMimeIcon(result.data.mime,function(path){
- tr.find('td.filename').attr('style','background-image:url('+path+')');
+ var path = getPathForPreview(name);
+ lazyLoadPreview(path, result.data.mime, function(previewpath){
+ tr.find('td.filename').attr('style','background-image:url('+previewpath+')');
});
} else {
OC.dialogs.alert(result.data.message, t('core', 'Error'));
@@ -332,8 +612,9 @@ $(document).ready(function() {
var tr=$('tr').filterAttr('data-file',localName);
tr.data('mime',mime).data('id',id);
tr.attr('data-id', id);
- getMimeIcon(mime,function(path){
- tr.find('td.filename').attr('style','background-image:url('+path+')');
+ var path = $('#dir').val()+'/'+localName;
+ lazyLoadPreview(path, mime, function(previewpath){
+ tr.find('td.filename').attr('style','background-image:url('+previewpath+')');
});
});
eventSource.listen('error',function(error){
@@ -344,8 +625,12 @@ $(document).ready(function() {
}
var li=form.parent();
form.remove();
+ /* workaround for IE 9&10 click event trap, 2 lines: */
+ $('input').first().focus();
+ $('#content').focus();
li.append('<p>'+li.data('text')+'</p>');
$('#new>a').click();
});
});
+ window.file_upload_param = file_upload_param;
});
diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js
index 097fe521aa63e767b375f43e22f3e5a283a5c05d..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];
}
@@ -196,13 +201,12 @@ FileActions.register('all', 'Rename', OC.PERMISSION_UPDATE, function () {
FileList.rename(filename);
});
-
FileActions.register('dir', 'Open', OC.PERMISSION_READ, '', function (filename) {
- var dir = $('#dir').val();
+ var dir = $('#dir').val() || '/';
if (dir !== '/') {
dir = dir + '/';
}
- window.location = OC.linkTo('files', 'index.php') + '?dir=' + encodeURIComponent(dir + filename);
+ FileList.changeDirectory(dir + filename);
});
FileActions.setDefault('dir', 'Open');
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 10801af3eadd7fffd28d021d2c6b5bd1dd35b7bf..4fc1b95a0ab5612bc48560b2328589cc83ab3179 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -1,7 +1,28 @@
var FileList={
useUndo:true,
+ postProcessList: function(){
+ $('#fileList tr').each(function(){
+ //little hack to set unescape filenames in attribute
+ $(this).attr('data-file',decodeURIComponent($(this).attr('data-file')));
+ });
+ },
update:function(fileListHtml) {
- $('#fileList').empty().html(fileListHtml);
+ var $fileList = $('#fileList'),
+ permissions = $('#permissions').val(),
+ isCreatable = (permissions & OC.PERMISSION_CREATE) !== 0;
+ $fileList.empty().html(fileListHtml);
+ $('#emptycontent').toggleClass('hidden', !isCreatable || $fileList.find('tr').length > 0);
+ $fileList.find('tr').each(function () {
+ FileActions.display($(this).children('td.filename'));
+ });
+ $fileList.trigger(jQuery.Event("fileActionsReady"));
+ FileList.postProcessList();
+ // "Files" might not be loaded in extending apps
+ if (window.Files){
+ Files.setupDragAndDrop();
+ }
+ FileList.updateFileSummary();
+ $fileList.trigger(jQuery.Event("updated"));
},
createRow:function(type, name, iconurl, linktarget, size, lastModified, permissions){
var td, simpleSize, basename, extension;
@@ -15,9 +36,10 @@ var FileList={
// filename td
td = $('<td></td>').attr({
"class": "filename",
- "style": 'background-image:url('+iconurl+'); background-size: 16px;'
+ "style": 'background-image:url('+iconurl+'); background-size: 32px;'
});
- td.append('<input type="checkbox" />');
+ var rand = Math.random().toString(16).slice(2);
+ td.append('<input id="select-'+rand+'" type="checkbox" /><label for="select-'+rand+'"></label>');
var link_elem = $('<a></a>').attr({
"class": "name",
"href": linktarget
@@ -108,7 +130,6 @@ var FileList={
if (hidden) {
tr.hide();
}
- FileActions.display(tr.find('td.filename'));
return tr;
},
addDir:function(name,size,lastModified,hidden){
@@ -133,19 +154,109 @@ var FileList={
FileActions.display(tr.find('td.filename'));
return tr;
},
- refresh:function(data) {
- var result = jQuery.parseJSON(data.responseText);
+ /**
+ * @brief Changes the current directory and reload the file list.
+ * @param targetDir target directory (non URL encoded)
+ * @param changeUrl false if the URL must not be changed (defaults to true)
+ */
+ changeDirectory: function(targetDir, changeUrl, force){
+ var $dir = $('#dir'),
+ url,
+ currentDir = $dir.val() || '/';
+ targetDir = targetDir || '/';
+ if (!force && currentDir === targetDir){
+ return;
+ }
+ FileList.setCurrentDir(targetDir, changeUrl);
+ FileList.reload();
+ },
+ linkTo: function(dir){
+ return OC.linkTo('files', 'index.php')+"?dir="+ encodeURIComponent(dir).replace(/%2F/g, '/');
+ },
+ setCurrentDir: function(targetDir, changeUrl){
+ $('#dir').val(targetDir);
+ if (changeUrl !== false){
+ if (window.history.pushState && changeUrl !== false){
+ url = FileList.linkTo(targetDir);
+ window.history.pushState({dir: targetDir}, '', url);
+ }
+ // use URL hash for IE8
+ else{
+ window.location.hash = '?dir='+ encodeURIComponent(targetDir).replace(/%2F/g, '/');
+ }
+ }
+ },
+ /**
+ * @brief Reloads the file list using ajax call
+ */
+ reload: function(){
+ FileList.showMask();
+ if (FileList._reloadCall){
+ FileList._reloadCall.abort();
+ }
+ FileList._reloadCall = $.ajax({
+ url: OC.filePath('files','ajax','list.php'),
+ data: {
+ dir : $('#dir').val(),
+ breadcrumb: true
+ },
+ error: function(result){
+ FileList.reloadCallback(result);
+ },
+ success: function(result) {
+ FileList.reloadCallback(result);
+ }
+ });
+ },
+ reloadCallback: function(result){
+ var $controls = $('#controls');
+
+ delete FileList._reloadCall;
+ FileList.hideMask();
+
+ if (!result || result.status === 'error') {
+ OC.Notification.show(result.data.message);
+ return;
+ }
+
+ if (result.status === 404){
+ // go back home
+ FileList.changeDirectory('/');
+ return;
+ }
+
+ if (result.data.permissions){
+ FileList.setDirectoryPermissions(result.data.permissions);
+ }
+
if(typeof(result.data.breadcrumb) != 'undefined'){
- updateBreadcrumb(result.data.breadcrumb);
+ $controls.find('.crumb').remove();
+ $controls.prepend(result.data.breadcrumb);
+
+ var width = $(window).width();
+ Files.initBreadCrumbs();
+ Files.resizeBreadcrumbs(width, true);
+
+ // in case svg is not supported by the browser we need to execute the fallback mechanism
+ if(!SVGSupport()) {
+ replaceSVG();
+ }
}
+
FileList.update(result.data.files);
- resetFileActionPanel();
+ },
+ setDirectoryPermissions: function(permissions){
+ var isCreatable = (permissions & OC.PERMISSION_CREATE) !== 0;
+ $('#permissions').val(permissions);
+ $('.creatable').toggleClass('hidden', !isCreatable);
+ $('.notCreatable').toggleClass('hidden', isCreatable);
},
remove:function(name){
$('tr').filterAttr('data-file',name).find('td.filename').draggable('destroy');
$('tr').filterAttr('data-file',name).remove();
+ FileList.updateFileSummary();
if($('tr[data-file]').length==0){
- $('#emptyfolder').show();
+ $('#emptycontent').removeClass('hidden');
}
},
insertElement:function(name,type,element){
@@ -175,7 +286,8 @@ var FileList={
}else{
$('#fileList').append(element);
}
- $('#emptyfolder').hide();
+ $('#emptycontent').addClass('hidden');
+ FileList.updateFileSummary();
},
loadingDone:function(name, id){
var mime, tr=$('tr').filterAttr('data-file',name);
@@ -185,8 +297,9 @@ var FileList={
if (id != null) {
tr.attr('data-id', id);
}
- getMimeIcon(mime,function(path){
- tr.find('td.filename').attr('style','background-image:url('+path+')');
+ var path = getPathForPreview(name);
+ lazyLoadPreview(path, mime, function(previewpath){
+ tr.find('td.filename').attr('style','background-image:url('+previewpath+')');
});
tr.find('td.filename').draggable(dragOptions);
},
@@ -198,7 +311,7 @@ var FileList={
tr=$('tr').filterAttr('data-file',name);
tr.data('renaming',true);
td=tr.children('td.filename');
- input=$('<input class="filename"/>').val(name);
+ input=$('<input type="text" class="filename"/>').val(name);
form=$('<form></form>');
form.append(input);
td.children('a.name').hide();
@@ -391,6 +504,7 @@ var FileList={
});
procesSelection();
checkTrashStatus();
+ FileList.updateFileSummary();
} else {
$.each(files,function(index,file) {
var deleteAction = $('tr').filterAttr('data-file',files[i]).children("td.date").children(".action.delete");
@@ -398,6 +512,167 @@ var FileList={
});
}
});
+ },
+ createFileSummary: function() {
+ if( $('#fileList tr').length > 0 ) {
+ var totalDirs = 0;
+ var totalFiles = 0;
+ var totalSize = 0;
+
+ // Count types and filesize
+ $.each($('tr[data-file]'), function(index, value) {
+ if ($(value).data('type') === 'dir') {
+ totalDirs++;
+ } else if ($(value).data('type') === 'file') {
+ totalFiles++;
+ }
+ totalSize += parseInt($(value).data('size'));
+ });
+
+ // Get translations
+ var directoryInfo = n('files', '%n folder', '%n folders', totalDirs);
+ var fileInfo = n('files', '%n file', '%n files', totalFiles);
+
+ var infoVars = {
+ dirs: '<span class="dirinfo">'+directoryInfo+'</span><span class="connector">',
+ files: '</span><span class="fileinfo">'+fileInfo+'</span>'
+ }
+
+ var info = t('files', '{dirs} and {files}', infoVars);
+
+ // don't show the filesize column, if filesize is NaN (e.g. in trashbin)
+ if (isNaN(totalSize)) {
+ var fileSize = '';
+ } else {
+ var fileSize = '<td class="filesize">'+humanFileSize(totalSize)+'</td>';
+ }
+
+ $('#fileList').append('<tr class="summary"><td><span class="info">'+info+'</span></td>'+fileSize+'<td></td></tr>');
+
+ var $dirInfo = $('.summary .dirinfo');
+ var $fileInfo = $('.summary .fileinfo');
+ var $connector = $('.summary .connector');
+
+ // Show only what's necessary, e.g.: no files: don't show "0 files"
+ if ($dirInfo.html().charAt(0) === "0") {
+ $dirInfo.hide();
+ $connector.hide();
+ }
+ if ($fileInfo.html().charAt(0) === "0") {
+ $fileInfo.hide();
+ $connector.hide();
+ }
+ }
+ },
+ updateFileSummary: function() {
+ var $summary = $('.summary');
+
+ // Check if we should remove the summary to show "Upload something"
+ if ($('#fileList tr').length === 1 && $summary.length === 1) {
+ $summary.remove();
+ }
+ // If there's no summary create one (createFileSummary checks if there's data)
+ else if ($summary.length === 0) {
+ FileList.createFileSummary();
+ }
+ // There's a summary and data -> Update the summary
+ else if ($('#fileList tr').length > 1 && $summary.length === 1) {
+ var totalDirs = 0;
+ var totalFiles = 0;
+ var totalSize = 0;
+ $.each($('tr[data-file]'), function(index, value) {
+ if ($(value).data('type') === 'dir') {
+ totalDirs++;
+ } else if ($(value).data('type') === 'file') {
+ totalFiles++;
+ }
+ if ($(value).data('size') !== undefined) {
+ totalSize += parseInt($(value).data('size'));
+ }
+ });
+
+ var $dirInfo = $('.summary .dirinfo');
+ var $fileInfo = $('.summary .fileinfo');
+ var $connector = $('.summary .connector');
+
+ // Substitute old content with new translations
+ $dirInfo.html(n('files', '%n folder', '%n folders', totalDirs));
+ $fileInfo.html(n('files', '%n file', '%n files', totalFiles));
+ $('.summary .filesize').html(humanFileSize(totalSize));
+
+ // Show only what's necessary (may be hidden)
+ if ($dirInfo.html().charAt(0) === "0") {
+ $dirInfo.hide();
+ $connector.hide();
+ } else {
+ $dirInfo.show();
+ }
+ if ($fileInfo.html().charAt(0) === "0") {
+ $fileInfo.hide();
+ $connector.hide();
+ } else {
+ $fileInfo.show();
+ }
+ if ($dirInfo.html().charAt(0) !== "0" && $fileInfo.html().charAt(0) !== "0") {
+ $connector.show();
+ }
+ }
+ },
+ showMask: function(){
+ // in case one was shown before
+ var $mask = $('#content .mask');
+ if ($mask.length){
+ return;
+ }
+
+ $mask = $('<div class="mask transparent"></div>');
+
+ $mask.css('background-image', 'url('+ OC.imagePath('core', 'loading.gif') + ')');
+ $mask.css('background-repeat', 'no-repeat');
+ $('#content').append($mask);
+
+ // block UI, but only make visible in case loading takes longer
+ FileList._maskTimeout = window.setTimeout(function(){
+ // reset opacity
+ $mask.removeClass('transparent');
+ }, 250);
+ },
+ hideMask: function(){
+ var $mask = $('#content .mask').remove();
+ 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");
+ });
}
};
@@ -405,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);
+
+ //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);
- 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
+ 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);
}
+ }
- // 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');
+ });
+ /*
+ * 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);
- // set dir context
- data.context = $('tr').filterAttr('data-type', 'dir').filterAttr('data-file', dirName);
+ if(typeof result[0] !== 'undefined' && result[0].status === 'success') {
+ var file = result[0];
+
+ 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);
}
});
@@ -573,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')) {
@@ -599,4 +894,56 @@ $(document).ready(function(){
$(window).unload(function (){
$(window).trigger('beforeunload');
});
+
+ function parseHashQuery(){
+ var hash = window.location.hash,
+ pos = hash.indexOf('?'),
+ query;
+ if (pos >= 0){
+ return hash.substr(pos + 1);
+ }
+ return '';
+ }
+
+ function parseCurrentDirFromUrl(){
+ var query = parseHashQuery(),
+ params,
+ dir = '/';
+ // try and parse from URL hash first
+ if (query){
+ params = OC.parseQueryString(query);
+ }
+ // else read from query attributes
+ if (!params){
+ params = OC.parseQueryString(location.search);
+ }
+ return (params && params.dir) || '/';
+ }
+
+ // fallback to hashchange when no history support
+ if (!window.history.pushState){
+ $(window).on('hashchange', function(){
+ FileList.changeDirectory(parseCurrentDirFromUrl(), false);
+ });
+ }
+ window.onpopstate = function(e){
+ var targetDir;
+ if (e.state && e.state.dir){
+ targetDir = e.state.dir;
+ }
+ else{
+ // read from URL
+ targetDir = parseCurrentDirFromUrl();
+ }
+ if (targetDir){
+ FileList.changeDirectory(targetDir, false);
+ }
+ }
+
+ if (parseInt($('#ajaxLoad').val(), 10) === 1){
+ // need to initially switch the dir to the one from the hash (IE8)
+ FileList.changeDirectory(parseCurrentDirFromUrl(), false, true);
+ }
+
+ FileList.createFileSummary();
});
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index 87311237e36cf6c9300c0c4415457f95c8b2b02c..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;
@@ -94,29 +67,106 @@ Files={
OC.Notification.show(t('files_encryption', 'Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files.'));
return;
}
+ },
+
+ setupDragAndDrop: function(){
+ var $fileList = $('#fileList');
+
+ //drag/drop of files
+ $fileList.find('tr td.filename').each(function(i,e){
+ if ($(e).parent().data('permissions') & OC.PERMISSION_DELETE) {
+ $(e).draggable(dragOptions);
+ }
+ });
+
+ $fileList.find('tr[data-type="dir"] td.filename').each(function(i,e){
+ if ($(e).parent().data('permissions') & OC.PERMISSION_CREATE){
+ $(e).droppable(folderDropOptions);
+ }
+ });
+ },
+
+ lastWidth: 0,
+
+ initBreadCrumbs: function () {
+ Files.lastWidth = 0;
+ Files.breadcrumbs = [];
+
+ // initialize with some extra space
+ Files.breadcrumbsWidth = 64;
+ if ( document.getElementById("navigation") ) {
+ Files.breadcrumbsWidth += $('#navigation').get(0).offsetWidth;
+ }
+ Files.hiddenBreadcrumbs = 0;
+
+ $.each($('.crumb'), function(index, breadcrumb) {
+ Files.breadcrumbs[index] = breadcrumb;
+ Files.breadcrumbsWidth += $(breadcrumb).get(0).offsetWidth;
+ });
+
+ $.each($('#controls .actions>div'), function(index, action) {
+ Files.breadcrumbsWidth += $(action).get(0).offsetWidth;
+ });
+
+ // event handlers for breadcrumb items
+ $('#controls .crumb a').on('click', onClickBreadcrumb);
+ },
+
+ resizeBreadcrumbs: function (width, firstRun) {
+ if (width != Files.lastWidth) {
+ if ((width < Files.lastWidth || firstRun) && width < Files.breadcrumbsWidth) {
+ if (Files.hiddenBreadcrumbs == 0) {
+ Files.breadcrumbsWidth -= $(Files.breadcrumbs[1]).get(0).offsetWidth;
+ $(Files.breadcrumbs[1]).find('a').hide();
+ $(Files.breadcrumbs[1]).append('<span>...</span>');
+ Files.breadcrumbsWidth += $(Files.breadcrumbs[1]).get(0).offsetWidth;
+ Files.hiddenBreadcrumbs = 2;
+ }
+ var i = Files.hiddenBreadcrumbs;
+ while (width < Files.breadcrumbsWidth && i > 1 && i < Files.breadcrumbs.length - 1) {
+ Files.breadcrumbsWidth -= $(Files.breadcrumbs[i]).get(0).offsetWidth;
+ $(Files.breadcrumbs[i]).hide();
+ Files.hiddenBreadcrumbs = i;
+ i++
+ }
+ } else if (width > Files.lastWidth && Files.hiddenBreadcrumbs > 0) {
+ var i = Files.hiddenBreadcrumbs;
+ while (width > Files.breadcrumbsWidth && i > 0) {
+ if (Files.hiddenBreadcrumbs == 1) {
+ Files.breadcrumbsWidth -= $(Files.breadcrumbs[1]).get(0).offsetWidth;
+ $(Files.breadcrumbs[1]).find('span').remove();
+ $(Files.breadcrumbs[1]).find('a').show();
+ Files.breadcrumbsWidth += $(Files.breadcrumbs[1]).get(0).offsetWidth;
+ } else {
+ $(Files.breadcrumbs[i]).show();
+ Files.breadcrumbsWidth += $(Files.breadcrumbs[i]).get(0).offsetWidth;
+ if (Files.breadcrumbsWidth > width) {
+ Files.breadcrumbsWidth -= $(Files.breadcrumbs[i]).get(0).offsetWidth;
+ $(Files.breadcrumbs[i]).hide();
+ break;
+ }
+ }
+ i--;
+ Files.hiddenBreadcrumbs = i;
+ }
+ }
+ Files.lastWidth = width;
+ }
}
};
$(document).ready(function() {
+ // FIXME: workaround for trashbin app
+ if (window.trashBinApp){
+ return;
+ }
Files.displayEncryptionWarning();
Files.bindKeyboardShortcuts(document, jQuery);
- $('#fileList tr').each(function(){
- //little hack to set unescape filenames in attribute
- $(this).attr('data-file',decodeURIComponent($(this).attr('data-file')));
- });
+
+ FileList.postProcessList();
+ Files.setupDragAndDrop();
$('#file_action_panel').attr('activeAction', false);
- //drag/drop of files
- $('#fileList tr td.filename').each(function(i,e){
- if ($(e).parent().data('permissions') & OC.PERMISSION_DELETE) {
- $(e).draggable(dragOptions);
- }
- });
- $('#fileList tr[data-type="dir"] td.filename').each(function(i,e){
- if ($(e).parent().data('permissions') & OC.PERMISSION_CREATE){
- $(e).droppable(folderDropOptions);
- }
- });
$('div.crumb:not(.last)').droppable(crumbDropOptions);
$('ul#apps>li:first-child').data('dir','');
if($('div.crumb').length){
@@ -131,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
@@ -268,72 +319,15 @@ $(document).ready(function() {
//do a background scan if needed
scanFiles();
- var lastWidth = 0;
- var breadcrumbs = [];
- var breadcrumbsWidth = 0;
- if ( document.getElementById("navigation") ) {
- breadcrumbsWidth = $('#navigation').get(0).offsetWidth;
- }
- var hiddenBreadcrumbs = 0;
-
- $.each($('.crumb'), function(index, breadcrumb) {
- breadcrumbs[index] = breadcrumb;
- breadcrumbsWidth += $(breadcrumb).get(0).offsetWidth;
- });
-
-
- $.each($('#controls .actions>div'), function(index, action) {
- breadcrumbsWidth += $(action).get(0).offsetWidth;
- });
-
- function resizeBreadcrumbs(firstRun) {
- var width = $(this).width();
- if (width != lastWidth) {
- if ((width < lastWidth || firstRun) && width < breadcrumbsWidth) {
- if (hiddenBreadcrumbs == 0) {
- breadcrumbsWidth -= $(breadcrumbs[1]).get(0).offsetWidth;
- $(breadcrumbs[1]).find('a').hide();
- $(breadcrumbs[1]).append('<span>...</span>');
- breadcrumbsWidth += $(breadcrumbs[1]).get(0).offsetWidth;
- hiddenBreadcrumbs = 2;
- }
- var i = hiddenBreadcrumbs;
- while (width < breadcrumbsWidth && i > 1 && i < breadcrumbs.length - 1) {
- breadcrumbsWidth -= $(breadcrumbs[i]).get(0).offsetWidth;
- $(breadcrumbs[i]).hide();
- hiddenBreadcrumbs = i;
- i++
- }
- } else if (width > lastWidth && hiddenBreadcrumbs > 0) {
- var i = hiddenBreadcrumbs;
- while (width > breadcrumbsWidth && i > 0) {
- if (hiddenBreadcrumbs == 1) {
- breadcrumbsWidth -= $(breadcrumbs[1]).get(0).offsetWidth;
- $(breadcrumbs[1]).find('span').remove();
- $(breadcrumbs[1]).find('a').show();
- breadcrumbsWidth += $(breadcrumbs[1]).get(0).offsetWidth;
- } else {
- $(breadcrumbs[i]).show();
- breadcrumbsWidth += $(breadcrumbs[i]).get(0).offsetWidth;
- if (breadcrumbsWidth > width) {
- breadcrumbsWidth -= $(breadcrumbs[i]).get(0).offsetWidth;
- $(breadcrumbs[i]).hide();
- break;
- }
- }
- i--;
- hiddenBreadcrumbs = i;
- }
- }
- lastWidth = width;
- }
- }
+ Files.initBreadCrumbs();
$(window).resize(function() {
- resizeBreadcrumbs(false);
+ var width = $(this).width();
+ Files.resizeBreadcrumbs(width, false);
});
- resizeBreadcrumbs(true);
+ var width = $(this).width();
+ Files.resizeBreadcrumbs(width, true);
// display storage warnings
setTimeout ( "Files.displayStorageWarnings()", 100 );
@@ -364,6 +358,11 @@ $(document).ready(function() {
}
});
}
+
+ //scroll to and highlight preselected file
+ if (getURLParameter('scrollto')) {
+ FileList.scrollTo(getURLParameter('scrollto'));
+ }
});
function scanFiles(force, dir, users){
@@ -415,10 +414,6 @@ function boolOperationFinished(data, callback) {
}
}
-function updateBreadcrumb(breadcrumbHtml) {
- $('p.nav').empty().html(breadcrumbHtml);
-}
-
var createDragShadow = function(event){
//select dragged file
var isDragSelected = $(event.target).parents('tr').find('td input:first').prop('checked');
@@ -454,8 +449,9 @@ var createDragShadow = function(event){
if (elem.type === 'dir') {
newtr.find('td.filename').attr('style','background-image:url('+OC.imagePath('core', 'filetypes/folder.png')+')');
} else {
- getMimeIcon(elem.mime,function(path){
- newtr.find('td.filename').attr('style','background-image:url('+path+')');
+ var path = getPathForPreview(elem.name);
+ lazyLoadPreview(path, elem.mime, function(previewpath){
+ newtr.find('td.filename').attr('style','background-image:url('+previewpath+')');
});
}
});
@@ -508,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'));
}
});
});
@@ -546,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'));
}
});
});
@@ -631,6 +627,37 @@ function getMimeIcon(mime, ready){
}
getMimeIcon.cache={};
+function getPathForPreview(name) {
+ var path = $('#dir').val() + '/' + name;
+ return path;
+}
+
+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');
+ });
+ });
+}
+
function getUniqueName(name){
if($('tr').filterAttr('data-file',name).length>0){
var parts=name.split('.');
@@ -663,3 +690,9 @@ function checkTrashStatus() {
}
});
}
+
+function onClickBreadcrumb(e){
+ var $el = $(e.target).closest('.crumb');
+ e.preventDefault();
+ FileList.changeDirectory(decodeURIComponent($el.data('dir')));
+}
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 a6c4e65530ce4cc01c64c59a0a4697b3cfbc777a..67a3414819b7e16a320846e4ac01df5aa08d2d7c 100644
--- a/apps/files/l10n/ar.php
+++ b/apps/files/l10n/ar.php
@@ -2,6 +2,8 @@
$TRANSLATIONS = array(
"Could not move %s - File with this name already exists" => "فشل في نقل الملف %s - يوجد ملف بنفس هذا الاسم",
"Could not move %s" => "فشل في نقل %s",
+"Unable to set upload directory." => "غير قادر على تحميل المجلد",
+"Invalid Token" => "علامة غير صالحة",
"No file was uploaded. Unknown error" => "لم يتم رفع أي ملف , خطأ غير معروف",
"There is no error, the file uploaded with success" => "تم ترفيع الملفات بنجاح.",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "حجم الملف المرفوع تجاوز قيمة upload_max_filesize الموجودة في ملف php.ini ",
@@ -13,10 +15,11 @@ $TRANSLATIONS = array(
"Not enough storage available" => "لا يوجد مساحة تخزينية كافية",
"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." => "عملية رفع الملفات قيد التنفيذ. اغلاق الصفحة سوف يلغي عملية رفع الملفات.",
"URL cannot be empty." => "عنوان ال URL لا يجوز أن يكون فارغا.",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "تسمية ملف غير صالحة. استخدام الاسم \"shared\" محجوز بواسطة ownCloud",
"Error" => "خطأ",
"Share" => "شارك",
"Delete permanently" => "حذف بشكل دائم",
@@ -28,18 +31,20 @@ $TRANSLATIONS = array(
"cancel" => "إلغاء",
"replaced {new_name} with {old_name}" => "استبدل {new_name} بـ {old_name}",
"undo" => "تراجع",
+"_%n folder_::_%n folders_" => array("","","","","",""),
+"_%n file_::_%n files_" => array("","","","","",""),
+"{dirs} and {files}" => "{dirs} و {files}",
"_Uploading %n file_::_Uploading %n files_" => array("","","","","",""),
"'.' 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}%)" => "مساحتك التخزينية امتلأت تقريبا ",
+"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." => "جاري تجهيز عملية التحميل. قد تستغرق بعض الوقت اذا كان حجم الملفات كبير.",
"Name" => "اسم",
"Size" => "حجم",
"Modified" => "معدل",
-"_%n folder_::_%n folders_" => array("","","","","",""),
-"_%n file_::_%n files_" => array("","","","","",""),
"Upload" => "رفع",
"File handling" => "التعامل مع الملف",
"Maximum upload size" => "الحد الأقصى لحجم الملفات التي يمكن رفعها",
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 1e2104370ba5dc8042e8fdfbceaf9fbb2ded7bba..e7dafd1c43a584c5b7f0efed9c66c89d27f7de85 100644
--- a/apps/files/l10n/bg_BG.php
+++ b/apps/files/l10n/bg_BG.php
@@ -17,12 +17,12 @@ $TRANSLATIONS = array(
"replace" => "препокриване",
"cancel" => "отказ",
"undo" => "възтановяване",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
"_Uploading %n file_::_Uploading %n files_" => array("",""),
"Name" => "Име",
"Size" => "Размер",
"Modified" => "Променено",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
"Upload" => "Качване",
"Maximum upload size" => "Максимален размер за качване",
"0 is unlimited" => "Ползвайте 0 за без ограничения",
@@ -36,7 +36,6 @@ $TRANSLATIONS = array(
"Delete" => "Изтриване",
"Upload too large" => "Файлът който сте избрали за качване е прекалено голям",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Файловете които се опитвате да качите са по-големи от позволеното за сървъра.",
-"Files are being scanned, please wait." => "Файловете се претърсват, изчакайте.",
-"file" => "файл"
+"Files are being scanned, please wait." => "Файловете се претърсват, изчакайте."
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/bn_BD.php b/apps/files/l10n/bn_BD.php
index 9efde85f0ce9ddda80dbe354620fda0173db158d..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." => "ফাইল আপলোড চলমান। এই পৃষ্ঠা পরিত্যাগ করলে আপলোড বাতিল করা হবে।",
@@ -27,6 +26,8 @@ $TRANSLATIONS = array(
"cancel" => "বাতিল",
"replaced {new_name} with {old_name}" => "{new_name} কে {old_name} নামে প্রতিস্থাপন করা হয়েছে",
"undo" => "ক্রিয়া প্রত্যাহার",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
"_Uploading %n file_::_Uploading %n files_" => array("",""),
"'.' is an invalid file name." => "টি একটি অননুমোদিত নাম।",
"File name cannot be empty." => "ফাইলের নামটি ফাঁকা রাখা যাবে না।",
@@ -34,8 +35,6 @@ $TRANSLATIONS = array(
"Name" => "রাম",
"Size" => "আকার",
"Modified" => "পরিবর্তিত",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
"Upload" => "আপলোড",
"File handling" => "ফাইল হ্যার্ডলিং",
"Maximum upload size" => "আপলোডের সর্বোচ্চ আকার",
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 f7d0069217776a55cc6b16fe4af80d9c2433b3d1..5c2cade8d637df60c665026bbccd8f5d1e1aca91 100644
--- a/apps/files/l10n/ca.php
+++ b/apps/files/l10n/ca.php
@@ -13,11 +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. 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",
@@ -32,8 +35,10 @@ $TRANSLATIONS = array(
"cancel" => "cancel·la",
"replaced {new_name} with {old_name}" => "s'ha substituït {old_name} per {new_name}",
"undo" => "desfés",
+"_%n folder_::_%n folders_" => array("%n carpeta","%n carpetes"),
+"_%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.",
@@ -41,11 +46,10 @@ $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",
-"_%n folder_::_%n folders_" => array("%n carpeta","%n carpetes"),
-"_%n file_::_%n files_" => array("%n fitxer","%n fitxers"),
"%s could not be renamed" => "%s no es pot canviar el nom",
"Upload" => "Puja",
"File handling" => "Gestió de fitxers",
@@ -71,10 +75,6 @@ $TRANSLATIONS = array(
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Els fitxers que esteu intentant pujar excedeixen la mida màxima de pujada del servidor",
"Files are being scanned, please wait." => "S'estan escanejant els fitxers, espereu",
"Current scanning" => "Actualment escanejant",
-"directory" => "directori",
-"directories" => "directoris",
-"file" => "fitxer",
-"files" => "fitxers",
"Upgrading filesystem cache..." => "Actualitzant la memòria de cau del sistema de fitxers..."
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/cs_CZ.php b/apps/files/l10n/cs_CZ.php
index dd243eb5761276a74e91ed27bfefd1bbfaf75ee1..f1e54ee5fc39e9581300141c094827a05dc33022 100644
--- a/apps/files/l10n/cs_CZ.php
+++ b/apps/files/l10n/cs_CZ.php
@@ -15,7 +15,6 @@ $TRANSLATIONS = array(
"Not enough storage available" => "Nedostatek dostupného úložného prostoru",
"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í.",
@@ -32,20 +31,21 @@ $TRANSLATIONS = array(
"cancel" => "zrušit",
"replaced {new_name} with {old_name}" => "nahrazeno {new_name} s {old_name}",
"undo" => "vrátit zpět",
+"_%n folder_::_%n folders_" => array("%n složka","%n složky","%n složek"),
+"_%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.",
"Your storage is full, files can not be updated or synced anymore!" => "Vaše úložiště je plné, nelze aktualizovat ani synchronizovat soubory.",
"Your storage is almost full ({usedSpacePercent}%)" => "Vaše úložiště je téměř plné ({usedSpacePercent}%)",
-"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Šifrování bylo zrušeno, soubory jsou však stále zašifrované. Běžte prosím do osobního nastavení, kde si složky odšifrujete.",
+"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Š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.",
"Your download is being prepared. This might take some time if the files are big." => "Vaše soubory ke stažení se připravují. Pokud jsou velké, může to chvíli trvat.",
+"Error moving file" => "Chyba při přesunu souboru",
"Name" => "Název",
"Size" => "Velikost",
"Modified" => "Upraveno",
-"_%n folder_::_%n folders_" => array("%n složka","%n složky","%n složek"),
-"_%n file_::_%n files_" => array("%n soubor","%n soubory","%n souborů"),
"%s could not be renamed" => "%s nemůže být přejmenován",
"Upload" => "Odeslat",
"File handling" => "Zacházení se soubory",
@@ -71,10 +71,6 @@ $TRANSLATIONS = array(
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Soubory, které se snažíte odeslat, překračují limit velikosti odesílání na tomto serveru.",
"Files are being scanned, please wait." => "Soubory se prohledávají, prosím čekejte.",
"Current scanning" => "Aktuální prohledávání",
-"directory" => "adresář",
-"directories" => "adresáře",
-"file" => "soubor",
-"files" => "soubory",
"Upgrading filesystem cache..." => "Aktualizuji mezipaměť souborového systému..."
);
$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/apps/files/l10n/cy_GB.php b/apps/files/l10n/cy_GB.php
index f614fbee47cf6b9fc3754856342b21b937f90a9e..86e5f65e7b0d3d46d037dc90dd1a2b459bfdf2ff 100644
--- a/apps/files/l10n/cy_GB.php
+++ b/apps/files/l10n/cy_GB.php
@@ -13,7 +13,6 @@ $TRANSLATIONS = array(
"Not enough storage available" => "Dim digon o le storio ar gael",
"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.",
@@ -29,8 +28,9 @@ $TRANSLATIONS = array(
"cancel" => "diddymu",
"replaced {new_name} with {old_name}" => "newidiwyd {new_name} yn lle {old_name}",
"undo" => "dadwneud",
+"_%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 '*'.",
@@ -40,8 +40,6 @@ $TRANSLATIONS = array(
"Name" => "Enw",
"Size" => "Maint",
"Modified" => "Addaswyd",
-"_%n folder_::_%n folders_" => array("","","",""),
-"_%n file_::_%n files_" => array("","","",""),
"Upload" => "Llwytho i fyny",
"File handling" => "Trafod ffeiliau",
"Maximum upload size" => "Maint mwyaf llwytho i fyny",
diff --git a/apps/files/l10n/da.php b/apps/files/l10n/da.php
index a891bcfb378348ecdd531139fae77dc973a44989..c2a20931ba0457c0657b4a9b6073ca5aba6c4f3d 100644
--- a/apps/files/l10n/da.php
+++ b/apps/files/l10n/da.php
@@ -15,7 +15,6 @@ $TRANSLATIONS = array(
"Not enough storage available" => "Der er ikke nok plads til rådlighed",
"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.",
@@ -32,8 +31,10 @@ $TRANSLATIONS = array(
"cancel" => "fortryd",
"replaced {new_name} with {old_name}" => "erstattede {new_name} med {old_name}",
"undo" => "fortryd",
+"_%n folder_::_%n folders_" => array("%n mappe","%n mapper"),
+"_%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.",
@@ -44,8 +45,6 @@ $TRANSLATIONS = array(
"Name" => "Navn",
"Size" => "Størrelse",
"Modified" => "Ændret",
-"_%n folder_::_%n folders_" => array("%n mappe","%n mapper"),
-"_%n file_::_%n files_" => array("%n fil","%n filer"),
"%s could not be renamed" => "%s kunne ikke omdøbes",
"Upload" => "Upload",
"File handling" => "Filhåndtering",
@@ -71,10 +70,6 @@ $TRANSLATIONS = array(
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Filerne, du prøver at uploade, er større end den maksimale størrelse for fil-upload på denne server.",
"Files are being scanned, please wait." => "Filerne bliver indlæst, vent venligst.",
"Current scanning" => "Indlæser",
-"directory" => "mappe",
-"directories" => "Mapper",
-"file" => "fil",
-"files" => "filer",
"Upgrading filesystem cache..." => "Opgraderer filsystems cachen..."
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/de.php b/apps/files/l10n/de.php
index 53f9b1a23645d6342415c60bac4336464096ddb1..143a5efc3da07ac4dc2e38dfbc3c5aba5cd42a91 100644
--- a/apps/files/l10n/de.php
+++ b/apps/files/l10n/de.php
@@ -13,11 +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. 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",
@@ -32,8 +35,10 @@ $TRANSLATIONS = array(
"cancel" => "abbrechen",
"replaced {new_name} with {old_name}" => "{old_name} ersetzt durch {new_name}",
"undo" => "rückgängig machen",
+"_%n folder_::_%n folders_" => array("%n Ordner","%n Ordner"),
+"_%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.",
@@ -41,11 +46,10 @@ $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",
-"_%n folder_::_%n folders_" => array("%n Ordner","%n Ordner"),
-"_%n file_::_%n files_" => array("%n Datei","%n Dateien"),
"%s could not be renamed" => "%s konnte nicht umbenannt werden",
"Upload" => "Hochladen",
"File handling" => "Dateibehandlung",
@@ -71,10 +75,6 @@ $TRANSLATIONS = array(
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Die Datei überschreitet die Maximalgröße für Uploads auf diesem Server.",
"Files are being scanned, please wait." => "Dateien werden gescannt, bitte warten.",
"Current scanning" => "Scanne",
-"directory" => "Verzeichnis",
-"directories" => "Verzeichnisse",
-"file" => "Datei",
-"files" => "Dateien",
"Upgrading filesystem cache..." => "Dateisystem-Cache wird aktualisiert ..."
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
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 8ea824c9c1af6bd7d589e102590c09263cb1aa27..c58cb4bbe3e23d2c5e11db5a730d944d4cad75d3 100644
--- a/apps/files/l10n/de_DE.php
+++ b/apps/files/l10n/de_DE.php
@@ -13,11 +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. 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.",
@@ -32,8 +35,10 @@ $TRANSLATIONS = array(
"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 Ordner"),
+"_%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.",
@@ -41,11 +46,10 @@ $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",
-"_%n folder_::_%n folders_" => array("%n Ordner","%n Ordner"),
-"_%n file_::_%n files_" => array("%n Datei","%n Dateien"),
"%s could not be renamed" => "%s konnte nicht umbenannt werden",
"Upload" => "Hochladen",
"File handling" => "Dateibehandlung",
@@ -71,10 +75,6 @@ $TRANSLATIONS = array(
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Die Datei überschreitet die Maximalgröße für Uploads auf diesem Server.",
"Files are being scanned, please wait." => "Dateien werden gescannt, bitte warten.",
"Current scanning" => "Scanne",
-"directory" => "Verzeichnis",
-"directories" => "Verzeichnisse",
-"file" => "Datei",
-"files" => "Dateien",
"Upgrading filesystem cache..." => "Dateisystem-Cache wird aktualisiert ..."
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/el.php b/apps/files/l10n/el.php
index 41645acb522b517bd2f7a35306a6d0933a2bd4ff..de524f4dd904a5b1f46e5f93bca243f0e0d8fc58 100644
--- a/apps/files/l10n/el.php
+++ b/apps/files/l10n/el.php
@@ -15,7 +15,6 @@ $TRANSLATIONS = array(
"Not enough storage available" => "Μη επαρκής διαθέσιμος αποθηκευτικός χώρος",
"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." => "Η αποστολή του αρχείου βρίσκεται σε εξέλιξη. Το κλείσιμο της σελίδας θα ακυρώσει την αποστολή.",
@@ -32,19 +31,20 @@ $TRANSLATIONS = array(
"cancel" => "ακύρωση",
"replaced {new_name} with {old_name}" => "αντικαταστάθηκε το {new_name} με {old_name}",
"undo" => "αναίρεση",
-"_Uploading %n file_::_Uploading %n files_" => array("",""),
-"files uploading" => "αρχεία ανεβαίνουν",
+"_%n folder_::_%n folders_" => array("%n φάκελος","%n φάκελοι"),
+"_%n file_::_%n files_" => array("%n αρχείο","%n αρχεία"),
+"_Uploading %n file_::_Uploading %n files_" => array("Ανέβασμα %n αρχείου","Ανέβασμα %n αρχείων"),
"'.' 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" => "Τροποποιήθηκε",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
"%s could not be renamed" => "Αδυναμία μετονομασίας του %s",
"Upload" => "Μεταφόρτωση",
"File handling" => "Διαχείριση αρχείων",
@@ -70,10 +70,6 @@ $TRANSLATIONS = array(
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Τα αρχεία που προσπαθείτε να ανεβάσετε υπερβαίνουν το μέγιστο μέγεθος αποστολής αρχείων σε αυτόν τον διακομιστή.",
"Files are being scanned, please wait." => "Τα αρχεία σαρώνονται, παρακαλώ περιμένετε.",
"Current scanning" => "Τρέχουσα ανίχνευση",
-"directory" => "κατάλογος",
-"directories" => "κατάλογοι",
-"file" => "αρχείο",
-"files" => "αρχεία",
"Upgrading filesystem cache..." => "Ενημέρωση της μνήμης cache του συστήματος αρχείων..."
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/en@pirate.php b/apps/files/l10n/en@pirate.php
index 83351f265f09031629b06b63f476892adfdbb7af..128f527aef186c5afc9d7418d1ff130f10a9b22f 100644
--- a/apps/files/l10n/en@pirate.php
+++ b/apps/files/l10n/en@pirate.php
@@ -1,8 +1,8 @@
<?php
$TRANSLATIONS = array(
-"_Uploading %n file_::_Uploading %n files_" => array("",""),
"_%n folder_::_%n folders_" => array("",""),
"_%n file_::_%n files_" => array("",""),
+"_Uploading %n file_::_Uploading %n files_" => array("",""),
"Download" => "Download"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
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 59ac4e1c398ba4a097258ca1222e3bb70d033302..eb6e6ba2d3905b60c52ed624baaab8699031b78b 100644
--- a/apps/files/l10n/eo.php
+++ b/apps/files/l10n/eo.php
@@ -13,7 +13,6 @@ $TRANSLATIONS = array(
"Not enough storage available" => "Ne haveblas sufiĉa memoro",
"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.",
@@ -30,8 +29,9 @@ $TRANSLATIONS = array(
"cancel" => "nuligi",
"replaced {new_name} with {old_name}" => "anstataŭiĝis {new_name} per {old_name}",
"undo" => "malfari",
+"_%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.",
@@ -41,8 +41,6 @@ $TRANSLATIONS = array(
"Name" => "Nomo",
"Size" => "Grando",
"Modified" => "Modifita",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
"Upload" => "Alŝuti",
"File handling" => "Dosieradministro",
"Maximum upload size" => "Maksimuma alŝutogrando",
@@ -67,8 +65,6 @@ $TRANSLATIONS = array(
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "La dosieroj, kiujn vi provas alŝuti, transpasas la maksimuman grandon por dosieralŝutoj en ĉi tiu servilo.",
"Files are being scanned, please wait." => "Dosieroj estas skanataj, bonvolu atendi.",
"Current scanning" => "Nuna skano",
-"file" => "dosiero",
-"files" => "dosieroj",
"Upgrading filesystem cache..." => "Ĝisdatiĝas dosiersistema kaŝmemoro..."
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/es.php b/apps/files/l10n/es.php
index 415d23ae890598dfbd3de9e19c47e674cfb5b353..90d760587d9ccd97274e42005b39bd163f407250 100644
--- a/apps/files/l10n/es.php
+++ b/apps/files/l10n/es.php
@@ -15,7 +15,6 @@ $TRANSLATIONS = array(
"Not enough storage available" => "No hay suficiente espacio disponible",
"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.",
@@ -32,19 +31,20 @@ $TRANSLATIONS = array(
"cancel" => "cancelar",
"replaced {new_name} with {old_name}" => "reemplazado {new_name} con {old_name}",
"undo" => "deshacer",
-"_Uploading %n file_::_Uploading %n files_" => array("",""),
-"files uploading" => "subiendo archivos",
+"_%n folder_::_%n folders_" => array("","%n carpetas"),
+"_%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"),
"'.' 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 ",
"Your storage is full, files can not be updated or synced anymore!" => "Su almacenamiento está lleno, ¡no se pueden actualizar o sincronizar más!",
"Your storage is almost full ({usedSpacePercent}%)" => "Su almacenamiento está casi lleno ({usedSpacePercent}%)",
+"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "El cifrado ha sido deshabilitado pero tus archivos permanecen cifrados. Por favor, ve a tus ajustes personales para descifrar tus archivos.",
"Your download is being prepared. This might take some time if the files are big." => "Su descarga está siendo preparada. Esto puede tardar algún tiempo si los archivos son grandes.",
"Name" => "Nombre",
"Size" => "Tamaño",
"Modified" => "Modificado",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
"%s could not be renamed" => "%s no se pudo renombrar",
"Upload" => "Subir",
"File handling" => "Manejo de archivos",
@@ -70,10 +70,6 @@ $TRANSLATIONS = array(
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Los archivos que estás intentando subir sobrepasan el tamaño máximo permitido en este servidor.",
"Files are being scanned, please wait." => "Los archivos están siendo escaneados, por favor espere.",
"Current scanning" => "Escaneo actual",
-"directory" => "carpeta",
-"directories" => "carpetas",
-"file" => "archivo",
-"files" => "archivos",
"Upgrading filesystem cache..." => "Actualizando caché del sistema de archivos"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/es_AR.php b/apps/files/l10n/es_AR.php
index 4c0eb691f67eaf0665089171d97a066c4aa8491b..be16f3f99ae8bed39884062348cdf87687b429a6 100644
--- a/apps/files/l10n/es_AR.php
+++ b/apps/files/l10n/es_AR.php
@@ -15,7 +15,6 @@ $TRANSLATIONS = array(
"Not enough storage available" => "No hay suficiente almacenamiento",
"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á.",
@@ -32,19 +31,20 @@ $TRANSLATIONS = array(
"cancel" => "cancelar",
"replaced {new_name} with {old_name}" => "se reemplazó {new_name} con {old_name}",
"undo" => "deshacer",
-"_Uploading %n file_::_Uploading %n files_" => array("",""),
-"files uploading" => "Subiendo archivos",
+"_%n folder_::_%n folders_" => array("%n carpeta","%n carpetas"),
+"_%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"),
"'.' 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.",
"Your storage is full, files can not be updated or synced anymore!" => "El almacenamiento está lleno, los archivos no se pueden seguir actualizando ni sincronizando",
"Your storage is almost full ({usedSpacePercent}%)" => "El almacenamiento está casi lleno ({usedSpacePercent}%)",
+"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "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.",
"Your download is being prepared. This might take some time if the files are big." => "Tu descarga se está preparando. Esto puede demorar si los archivos son muy grandes.",
"Name" => "Nombre",
"Size" => "Tamaño",
"Modified" => "Modificado",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
"%s could not be renamed" => "No se pudo renombrar %s",
"Upload" => "Subir",
"File handling" => "Tratamiento de archivos",
@@ -70,10 +70,6 @@ $TRANSLATIONS = array(
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Los archivos que intentás subir sobrepasan el tamaño máximo ",
"Files are being scanned, please wait." => "Se están escaneando los archivos, por favor esperá.",
"Current scanning" => "Escaneo actual",
-"directory" => "directorio",
-"directories" => "directorios",
-"file" => "archivo",
-"files" => "archivos",
"Upgrading filesystem cache..." => "Actualizando el cache del sistema de archivos"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
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 13198a9f881b15f1eb1c9c93c95ca54b758c07f6..9f674b27e63ac577b96ac76ec6005ddd6979959b 100644
--- a/apps/files/l10n/et_EE.php
+++ b/apps/files/l10n/et_EE.php
@@ -15,7 +15,6 @@ $TRANSLATIONS = array(
"Not enough storage available" => "Saadaval pole piisavalt ruumi",
"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.",
@@ -32,8 +31,10 @@ $TRANSLATIONS = array(
"cancel" => "loobu",
"replaced {new_name} with {old_name}" => "asendas nime {old_name} nimega {new_name}",
"undo" => "tagasi",
+"_%n folder_::_%n folders_" => array("%n kataloog","%n kataloogi"),
+"_%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.",
@@ -44,8 +45,6 @@ $TRANSLATIONS = array(
"Name" => "Nimi",
"Size" => "Suurus",
"Modified" => "Muudetud",
-"_%n folder_::_%n folders_" => array("%n kataloog","%n kataloogi"),
-"_%n file_::_%n files_" => array("%n fail","%n faili"),
"%s could not be renamed" => "%s ümbernimetamine ebaõnnestus",
"Upload" => "Lae üles",
"File handling" => "Failide käsitlemine",
@@ -71,10 +70,6 @@ $TRANSLATIONS = array(
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Failid, mida sa proovid üles laadida, ületab serveri poolt üleslaetavatele failidele määratud maksimaalse suuruse.",
"Files are being scanned, please wait." => "Faile skannitakse, palun oota.",
"Current scanning" => "Praegune skannimine",
-"directory" => "kaust",
-"directories" => "kaustad",
-"file" => "fail",
-"files" => "faili",
"Upgrading filesystem cache..." => "Failisüsteemi puhvri uuendamine..."
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/eu.php b/apps/files/l10n/eu.php
index 359b40ddefd3feb7cd0caa977d03d9ccbf5a2aa6..33ea47d5f04b35fc96567d042eadb091b8e6d67e 100644
--- a/apps/files/l10n/eu.php
+++ b/apps/files/l10n/eu.php
@@ -15,7 +15,6 @@ $TRANSLATIONS = array(
"Not enough storage available" => "Ez dago behar aina leku erabilgarri,",
"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.",
@@ -32,8 +31,9 @@ $TRANSLATIONS = array(
"cancel" => "ezeztatu",
"replaced {new_name} with {old_name}" => " {new_name}-k {old_name} ordezkatu du",
"undo" => "desegin",
+"_%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.",
@@ -44,8 +44,6 @@ $TRANSLATIONS = array(
"Name" => "Izena",
"Size" => "Tamaina",
"Modified" => "Aldatuta",
-"_%n folder_::_%n folders_" => array("karpeta %n","%n karpeta"),
-"_%n file_::_%n files_" => array("fitxategi %n","%n fitxategi"),
"%s could not be renamed" => "%s ezin da berrizendatu",
"Upload" => "Igo",
"File handling" => "Fitxategien kudeaketa",
@@ -71,10 +69,6 @@ $TRANSLATIONS = array(
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Igotzen saiatzen ari zaren fitxategiak zerbitzari honek igotzeko onartzen duena baino handiagoak dira.",
"Files are being scanned, please wait." => "Fitxategiak eskaneatzen ari da, itxoin mezedez.",
"Current scanning" => "Orain eskaneatzen ari da",
-"directory" => "direktorioa",
-"directories" => "direktorioak",
-"file" => "fitxategia",
-"files" => "fitxategiak",
"Upgrading filesystem cache..." => "Fitxategi sistemaren katxea eguneratzen..."
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/fa.php b/apps/files/l10n/fa.php
index e0b9fe028166e94ccc501292203eb129fc44fe26..46d7cfe73efef0518dbe1d76b17970df8e9ec06d 100644
--- a/apps/files/l10n/fa.php
+++ b/apps/files/l10n/fa.php
@@ -15,7 +15,6 @@ $TRANSLATIONS = array(
"Not enough storage available" => "فضای کافی در دسترس نیست",
"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,8 +31,9 @@ $TRANSLATIONS = array(
"cancel" => "لغو",
"replaced {new_name} with {old_name}" => "{نام_جدید} با { نام_قدیمی} جایگزین شد.",
"undo" => "بازگشت",
+"_%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." => "نام نامعتبر ، '\\', '/', '<', '>', ':', '\"', '|', '?' و '*' مجاز نمی باشند.",
@@ -43,8 +43,6 @@ $TRANSLATIONS = array(
"Name" => "نام",
"Size" => "اندازه",
"Modified" => "تاریخ",
-"_%n folder_::_%n folders_" => array(""),
-"_%n file_::_%n files_" => array(""),
"%s could not be renamed" => "%s نمیتواند تغییر نام دهد.",
"Upload" => "بارگزاری",
"File handling" => "اداره پرونده ها",
@@ -70,10 +68,6 @@ $TRANSLATIONS = array(
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "فایلها بیش از حد تعیین شده در این سرور هستند\nمترجم:با تغییر فایل php,ini میتوان این محدودیت را برطرف کرد",
"Files are being scanned, please wait." => "پرونده ها در حال بازرسی هستند لطفا صبر کنید",
"Current scanning" => "بازرسی کنونی",
-"directory" => "پوشه",
-"directories" => "پوشه ها",
-"file" => "پرونده",
-"files" => "پرونده ها",
"Upgrading filesystem cache..." => "بهبود فایل سیستمی ذخیره گاه..."
);
$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/l10n/fi_FI.php b/apps/files/l10n/fi_FI.php
index b48f44665bc282e9a164fac4d22127f0460e0c1e..5345bad902b392b0668dc96219398fb9e341cf8c 100644
--- a/apps/files/l10n/fi_FI.php
+++ b/apps/files/l10n/fi_FI.php
@@ -13,9 +13,10 @@ $TRANSLATIONS = array(
"Not enough storage available" => "Tallennustilaa ei ole riittävästi käytettävissä",
"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",
@@ -28,6 +29,9 @@ $TRANSLATIONS = array(
"suggest name" => "ehdota nimeä",
"cancel" => "peru",
"undo" => "kumoa",
+"_%n folder_::_%n folders_" => array("%n kansio","%n kansiota"),
+"_%n file_::_%n files_" => array("%n tiedosto","%n tiedostoa"),
+"{dirs} and {files}" => "{dirs} ja {files}",
"_Uploading %n file_::_Uploading %n files_" => array("Lähetetään %n tiedosto","Lähetetään %n tiedostoa"),
"'.' is an invalid file name." => "'.' on virheellinen nimi tiedostolle.",
"File name cannot be empty." => "Tiedoston nimi ei voi olla tyhjä.",
@@ -35,11 +39,10 @@ $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",
-"_%n folder_::_%n folders_" => array("%n kansio","%n kansiota"),
-"_%n file_::_%n files_" => array("%n tiedosto","%n tiedostoa"),
"Upload" => "Lähetä",
"File handling" => "Tiedostonhallinta",
"Maximum upload size" => "Lähetettävän tiedoston suurin sallittu koko",
@@ -64,10 +67,6 @@ $TRANSLATIONS = array(
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Lähetettäväksi valitsemasi tiedostot ylittävät palvelimen salliman tiedostokoon rajan.",
"Files are being scanned, please wait." => "Tiedostoja tarkistetaan, odota hetki.",
"Current scanning" => "Tämänhetkinen tutkinta",
-"directory" => "kansio",
-"directories" => "kansiota",
-"file" => "tiedosto",
-"files" => "tiedostoa",
"Upgrading filesystem cache..." => "Päivitetään tiedostojärjestelmän välimuistia..."
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/fr.php b/apps/files/l10n/fr.php
index 44895eab28e3651c757e00fc1c574c65cf59e03c..03505a2a26988aef322b7f0210b10705b3f5a1fa 100644
--- a/apps/files/l10n/fr.php
+++ b/apps/files/l10n/fr.php
@@ -6,18 +6,21 @@ $TRANSLATIONS = array(
"Invalid Token" => "Jeton non valide",
"No file was uploaded. Unknown error" => "Aucun fichier n'a été envoyé. Erreur inconnue",
"There is no error, the file uploaded with success" => "Aucune erreur, le fichier a été envoyé avec succès.",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Le fichier envoyé dépasse la valeur upload_max_filesize située dans le fichier php.ini:",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Le fichier envoyé dépasse la directive MAX_FILE_SIZE qui est spécifiée dans le formulaire HTML.",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Le fichier envoyé dépasse l'instruction upload_max_filesize située dans le fichier php.ini:",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Le fichier envoyé dépasse l'instruction MAX_FILE_SIZE qui est spécifiée dans le formulaire HTML.",
"The uploaded file was only partially uploaded" => "Le fichier n'a été que partiellement envoyé.",
"No file was uploaded" => "Pas de fichier envoyé.",
"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. 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",
@@ -32,19 +35,21 @@ $TRANSLATIONS = array(
"cancel" => "annuler",
"replaced {new_name} with {old_name}" => "{new_name} a été remplacé par {old_name}",
"undo" => "annuler",
-"_Uploading %n file_::_Uploading %n files_" => array("",""),
-"files uploading" => "fichiers en cours d'envoi",
+"_%n folder_::_%n folders_" => array("%n dossier","%n dossiers"),
+"_%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"),
"'.' 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.",
"Your storage is full, files can not be updated or synced anymore!" => "Votre espage de stockage est plein, les fichiers ne peuvent plus être téléversés ou synchronisés !",
"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é",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
"%s could not be renamed" => "%s ne peut être renommé",
"Upload" => "Envoyer",
"File handling" => "Gestion des fichiers",
@@ -70,10 +75,6 @@ $TRANSLATIONS = array(
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Les fichiers que vous essayez d'envoyer dépassent la taille maximale permise par ce serveur.",
"Files are being scanned, please wait." => "Les fichiers sont en cours d'analyse, veuillez patienter.",
"Current scanning" => "Analyse en cours",
-"directory" => "dossier",
-"directories" => "dossiers",
-"file" => "fichier",
-"files" => "fichiers",
"Upgrading filesystem cache..." => "Mise à niveau du cache du système de fichier"
);
$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files/l10n/gl.php b/apps/files/l10n/gl.php
index c98263c08ff3e8ba42d571daefaa2f13b26514c8..2766478650a31d707dc2179e6a2d72dae577eda3 100644
--- a/apps/files/l10n/gl.php
+++ b/apps/files/l10n/gl.php
@@ -13,11 +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. 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",
@@ -32,8 +35,10 @@ $TRANSLATIONS = array(
"cancel" => "cancelar",
"replaced {new_name} with {old_name}" => "substituír {new_name} por {old_name}",
"undo" => "desfacer",
+"_%n folder_::_%n folders_" => array("%n cartafol","%n cartafoles"),
+"_%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 «*».",
@@ -41,11 +46,10 @@ $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",
-"_%n folder_::_%n folders_" => array("%n cartafol","%n cartafoles"),
-"_%n file_::_%n files_" => array("%n ficheiro","%n ficheiros"),
"%s could not be renamed" => "%s non pode cambiar de nome",
"Upload" => "Enviar",
"File handling" => "Manexo de ficheiro",
@@ -71,10 +75,6 @@ $TRANSLATIONS = array(
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Os ficheiros que tenta enviar exceden do tamaño máximo permitido neste servidor",
"Files are being scanned, please wait." => "Estanse analizando os ficheiros. Agarde.",
"Current scanning" => "Análise actual",
-"directory" => "directorio",
-"directories" => "directorios",
-"file" => "ficheiro",
-"files" => "ficheiros",
"Upgrading filesystem cache..." => "Anovando a caché do sistema de ficheiros..."
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/he.php b/apps/files/l10n/he.php
index ef98e2d2188fd2c46ff41ece7aec0efe4dbd250c..bc7ecdb0716512d64396497514536800d747fa48 100644
--- a/apps/files/l10n/he.php
+++ b/apps/files/l10n/he.php
@@ -13,7 +13,6 @@ $TRANSLATIONS = array(
"Not enough storage available" => "אין די שטח פנוי באחסון",
"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." => "קישור אינו יכול להיות ריק.",
@@ -28,14 +27,13 @@ $TRANSLATIONS = array(
"cancel" => "ביטול",
"replaced {new_name} with {old_name}" => "{new_name} הוחלף ב־{old_name}",
"undo" => "ביטול",
+"_%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" => "גודל",
"Modified" => "זמן שינוי",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
"Upload" => "העלאה",
"File handling" => "טיפול בקבצים",
"Maximum upload size" => "גודל העלאה מקסימלי",
@@ -57,8 +55,6 @@ $TRANSLATIONS = array(
"Upload too large" => "העלאה גדולה מידי",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "הקבצים שניסית להעלות חרגו מהגודל המקסימלי להעלאת קבצים על שרת זה.",
"Files are being scanned, please wait." => "הקבצים נסרקים, נא להמתין.",
-"Current scanning" => "הסריקה הנוכחית",
-"file" => "קובץ",
-"files" => "קבצים"
+"Current scanning" => "הסריקה הנוכחית"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/hi.php b/apps/files/l10n/hi.php
index 7fb5a5b09d3c98629a280914bab27f3295451256..549c928320d2c788764605ce69f055dd4d9c1699 100644
--- a/apps/files/l10n/hi.php
+++ b/apps/files/l10n/hi.php
@@ -2,9 +2,10 @@
$TRANSLATIONS = array(
"Error" => "त्रुटि",
"Share" => "साझा करें",
-"_Uploading %n file_::_Uploading %n files_" => 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 8f74dea092f0bd332e108cbc3ca1295cc182c7e9..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",
@@ -18,13 +17,12 @@ $TRANSLATIONS = array(
"suggest name" => "predloži ime",
"cancel" => "odustani",
"undo" => "vrati",
+"_%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",
-"_%n folder_::_%n folders_" => array("","",""),
-"_%n file_::_%n files_" => array("","",""),
"Upload" => "Učitaj",
"File handling" => "datoteka za rukovanje",
"Maximum upload size" => "Maksimalna veličina prijenosa",
@@ -45,8 +43,6 @@ $TRANSLATIONS = array(
"Upload too large" => "Prijenos je preobiman",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Datoteke koje pokušavate prenijeti prelaze maksimalnu veličinu za prijenos datoteka na ovom poslužitelju.",
"Files are being scanned, please wait." => "Datoteke se skeniraju, molimo pričekajte.",
-"Current scanning" => "Trenutno skeniranje",
-"file" => "datoteka",
-"files" => "datoteke"
+"Current scanning" => "Trenutno skeniranje"
);
$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/hu_HU.php b/apps/files/l10n/hu_HU.php
index e8d3b8c86766db555b970954a939fb3630243f26..4dd6a13d320f34831efecfe648df757caefe8eec 100644
--- a/apps/files/l10n/hu_HU.php
+++ b/apps/files/l10n/hu_HU.php
@@ -13,11 +13,14 @@ $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. Could not get file info." => "A feltöltés nem sikerült. Az állományt leíró információk nem érhetők el.",
+"Upload failed. Could not find uploaded file" => "A feltöltés nem sikerült. Nem található a feltöltendő állomány.",
"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ű",
+"Unable to upload {filename} as it is a directory or has 0 bytes" => "A(z) {filename} állomány nem tölthető fel, mert ez vagy egy mappa, vagy pedig 0 bájtból áll.",
"Not enough space available" => "Nincs elég szabad hely",
"Upload cancelled." => "A feltöltést megszakítottuk.",
+"Could not get result from server." => "A kiszolgálótól nem kapható meg az eredmény.",
"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.",
"URL cannot be empty." => "Az URL nem lehet semmi.",
"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Érvénytelen mappanév. A 'Shared' az ownCloud számára fenntartott elnevezés",
@@ -32,19 +35,21 @@ $TRANSLATIONS = array(
"cancel" => "mégse",
"replaced {new_name} with {old_name}" => "{new_name} fájlt kicseréltük ezzel: {old_name}",
"undo" => "visszavonás",
-"_Uploading %n file_::_Uploading %n files_" => array("",""),
-"files uploading" => "fájl töltődik föl",
+"_%n folder_::_%n folders_" => array("%n mappa","%n mappa"),
+"_%n file_::_%n files_" => array("%n állomány","%n állomány"),
+"{dirs} and {files}" => "{dirs} és {files}",
+"_Uploading %n file_::_Uploading %n files_" => array("%n állomány feltöltése","%n állomány feltöltése"),
"'.' 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 '*'",
"Your storage is full, files can not be updated or synced anymore!" => "A tároló tele van, a fájlok nem frissíthetőek vagy szinkronizálhatóak a jövőben.",
"Your storage is almost full ({usedSpacePercent}%)" => "A tároló majdnem tele van ({usedSpacePercent}%)",
+"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "A titkosítási funkciót kikapcsolták, de az Ön állományai még mindig titkosított állapotban vannak. A személyes beállításoknál tudja a titkosítást feloldani.",
"Your download is being prepared. This might take some time if the files are big." => "Készül a letöltendő állomány. Ez eltarthat egy ideig, ha nagyok a fájlok.",
+"Error moving file" => "Az állomány áthelyezése nem sikerült.",
"Name" => "Név",
"Size" => "Méret",
"Modified" => "Módosítva",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
"%s could not be renamed" => "%s átnevezése nem sikerült",
"Upload" => "Feltöltés",
"File handling" => "Fájlkezelés",
@@ -70,10 +75,6 @@ $TRANSLATIONS = array(
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "A feltöltendő állományok mérete meghaladja a kiszolgálón megengedett maximális méretet.",
"Files are being scanned, please wait." => "A fájllista ellenőrzése zajlik, kis türelmet!",
"Current scanning" => "Ellenőrzés alatt",
-"directory" => "mappa",
-"directories" => "mappa",
-"file" => "fájl",
-"files" => "fájlok",
"Upgrading filesystem cache..." => "A fájlrendszer gyorsítótárának frissítése zajlik..."
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/hy.php b/apps/files/l10n/hy.php
index a419a74cc972b362f7b5cc20be7c7796e8656a2c..9a5ebb862a9f150acb2fbb4c1a9c4ba170136fdc 100644
--- a/apps/files/l10n/hy.php
+++ b/apps/files/l10n/hy.php
@@ -1,8 +1,8 @@
<?php
$TRANSLATIONS = array(
-"_Uploading %n file_::_Uploading %n files_" => array("",""),
"_%n folder_::_%n folders_" => array("",""),
"_%n file_::_%n files_" => array("",""),
+"_Uploading %n file_::_Uploading %n files_" => array("",""),
"Save" => "Պահպանել",
"Download" => "Բեռնել",
"Delete" => "Ջնջել"
diff --git a/apps/files/l10n/ia.php b/apps/files/l10n/ia.php
index 202375636a1ea638be137b8be71c06e94b956178..1560687f6c4e646a9ba845b923ae213a56971d3c 100644
--- a/apps/files/l10n/ia.php
+++ b/apps/files/l10n/ia.php
@@ -6,12 +6,12 @@ $TRANSLATIONS = array(
"Files" => "Files",
"Error" => "Error",
"Share" => "Compartir",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
"_Uploading %n file_::_Uploading %n files_" => array("",""),
"Name" => "Nomine",
"Size" => "Dimension",
"Modified" => "Modificate",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
"Upload" => "Incargar",
"Maximum upload size" => "Dimension maxime de incargamento",
"Save" => "Salveguardar",
diff --git a/apps/files/l10n/id.php b/apps/files/l10n/id.php
index 84d9ba2020f1ba163b6068febcf7c482770134b2..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.",
@@ -29,8 +28,9 @@ $TRANSLATIONS = array(
"cancel" => "batalkan",
"replaced {new_name} with {old_name}" => "mengganti {new_name} dengan {old_name}",
"undo" => "urungkan",
+"_%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.",
@@ -40,8 +40,6 @@ $TRANSLATIONS = array(
"Name" => "Nama",
"Size" => "Ukuran",
"Modified" => "Dimodifikasi",
-"_%n folder_::_%n folders_" => array(""),
-"_%n file_::_%n files_" => array(""),
"Upload" => "Unggah",
"File handling" => "Penanganan berkas",
"Maximum upload size" => "Ukuran pengunggahan maksimum",
@@ -66,8 +64,6 @@ $TRANSLATIONS = array(
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Berkas yang dicoba untuk diunggah melebihi ukuran maksimum pengunggahan berkas di server ini.",
"Files are being scanned, please wait." => "Berkas sedang dipindai, silakan tunggu.",
"Current scanning" => "Yang sedang dipindai",
-"file" => "berkas",
-"files" => "berkas-berkas",
"Upgrading filesystem cache..." => "Meningkatkan tembolok sistem berkas..."
);
$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/l10n/is.php b/apps/files/l10n/is.php
index 36116001bce9b163f6912cad313f48ff6982cedb..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.",
@@ -27,6 +26,8 @@ $TRANSLATIONS = array(
"cancel" => "hætta við",
"replaced {new_name} with {old_name}" => "yfirskrifaði {new_name} með {old_name}",
"undo" => "afturkalla",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
"_Uploading %n file_::_Uploading %n files_" => array("",""),
"'.' is an invalid file name." => "'.' er ekki leyfilegt nafn.",
"File name cannot be empty." => "Nafn skráar má ekki vera tómt",
@@ -34,8 +35,6 @@ $TRANSLATIONS = array(
"Name" => "Nafn",
"Size" => "Stærð",
"Modified" => "Breytt",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
"Upload" => "Senda inn",
"File handling" => "Meðhöndlun skrár",
"Maximum upload size" => "Hámarks stærð innsendingar",
diff --git a/apps/files/l10n/it.php b/apps/files/l10n/it.php
index 9be317fba992234d2a952f9f9eccf3d5a7b0a058..44b4e341956df3b771bfdee982230d317ff87296 100644
--- a/apps/files/l10n/it.php
+++ b/apps/files/l10n/it.php
@@ -13,11 +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. Could not get file info." => "Caricamento non riuscito. Impossibile ottenere informazioni sul file.",
+"Upload failed. Could not find uploaded file" => "Caricamento non riuscito. Impossibile trovare il 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 ha una dimensione 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",
@@ -32,8 +35,10 @@ $TRANSLATIONS = array(
"cancel" => "annulla",
"replaced {new_name} with {old_name}" => "sostituito {new_name} con {old_name}",
"undo" => "annulla",
+"_%n folder_::_%n folders_" => array("%n cartella","%n cartelle"),
+"_%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.",
@@ -41,11 +46,10 @@ $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",
-"_%n folder_::_%n folders_" => array("%n cartella","%n cartelle"),
-"_%n file_::_%n files_" => array("%n file","%n file"),
"%s could not be renamed" => "%s non può essere rinominato",
"Upload" => "Carica",
"File handling" => "Gestione file",
@@ -71,10 +75,6 @@ $TRANSLATIONS = array(
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "I file che stai provando a caricare superano la dimensione massima consentita su questo server.",
"Files are being scanned, please wait." => "Scansione dei file in corso, attendi",
"Current scanning" => "Scansione corrente",
-"directory" => "cartella",
-"directories" => "cartelle",
-"file" => "file",
-"files" => "file",
"Upgrading filesystem cache..." => "Aggiornamento della cache del filesystem in corso..."
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/ja_JP.php b/apps/files/l10n/ja_JP.php
index 902cc82e0363e233343afce94e42eebe6d76596f..07ee96f1eb6c1d36aff8205ee7773bee55a76064 100644
--- a/apps/files/l10n/ja_JP.php
+++ b/apps/files/l10n/ja_JP.php
@@ -13,11 +13,14 @@ $TRANSLATIONS = array(
"Missing a temporary folder" => "一時保存フォルダが見つかりません",
"Failed to write to disk" => "ディスクへの書き込みに失敗しました",
"Not enough storage available" => "ストレージに十分な空き容量がありません",
+"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" => "ディレクトリもしくは0バイトのため {filename} をアップロードできません",
"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." => "URLは空にできません。",
"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "無効なフォルダ名です。'Shared' の利用はownCloudで予約済みです",
@@ -32,8 +35,10 @@ $TRANSLATIONS = array(
"cancel" => "キャンセル",
"replaced {new_name} with {old_name}" => "{old_name} を {new_name} に置換",
"undo" => "元に戻す",
+"_%n folder_::_%n folders_" => array("%n個のフォルダ"),
+"_%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." => "無効な名前、'\\', '/', '<', '>', ':', '\"', '|', '?', '*' は使用できません。",
@@ -41,11 +46,10 @@ $TRANSLATIONS = array(
"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" => "変更",
-"_%n folder_::_%n folders_" => array("%n個のフォルダ"),
-"_%n file_::_%n files_" => array("%n個のファイル"),
"%s could not be renamed" => "%sの名前を変更できませんでした",
"Upload" => "アップロード",
"File handling" => "ファイル操作",
@@ -71,10 +75,6 @@ $TRANSLATIONS = array(
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "アップロードしようとしているファイルは、サーバで規定された最大サイズを超えています。",
"Files are being scanned, please wait." => "ファイルをスキャンしています、しばらくお待ちください。",
"Current scanning" => "スキャン中",
-"directory" => "ディレクトリ",
-"directories" => "ディレクトリ",
-"file" => "ファイル",
-"files" => "ファイル",
"Upgrading filesystem cache..." => "ファイルシステムキャッシュを更新中..."
);
$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/l10n/ka.php b/apps/files/l10n/ka.php
index 527a2c49b1cc3446cfc2816d1e69303dea949c36..544e8168c548e6d5351f06ccd90428a0748f4e06 100644
--- a/apps/files/l10n/ka.php
+++ b/apps/files/l10n/ka.php
@@ -1,9 +1,9 @@
<?php
$TRANSLATIONS = array(
"Files" => "ფაილები",
-"_Uploading %n file_::_Uploading %n files_" => array(""),
"_%n folder_::_%n folders_" => array(""),
"_%n file_::_%n files_" => array(""),
+"_Uploading %n file_::_Uploading %n files_" => array(""),
"Download" => "გადმოწერა"
);
$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/l10n/ka_GE.php b/apps/files/l10n/ka_GE.php
index 3e70d3294c1b3353c6061354c026715572e9d570..b9313957714b6db6c99d5869ffb5ecc1dbd98e42 100644
--- a/apps/files/l10n/ka_GE.php
+++ b/apps/files/l10n/ka_GE.php
@@ -13,7 +13,6 @@ $TRANSLATIONS = array(
"Not enough storage available" => "საცავში საკმარისი ადგილი არ არის",
"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." => "მიმდინარეობს ფაილის ატვირთვა. სხვა გვერდზე გადასვლა გამოიწვევს ატვირთვის შეჩერებას",
@@ -29,8 +28,9 @@ $TRANSLATIONS = array(
"cancel" => "უარყოფა",
"replaced {new_name} with {old_name}" => "{new_name} შეცვლილია {old_name}–ით",
"undo" => "დაბრუნება",
+"_%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." => "არადაშვებადი სახელი, '\\', '/', '<', '>', ':', '\"', '|', '?' და '*' არ არის დაიშვებული.",
@@ -40,8 +40,6 @@ $TRANSLATIONS = array(
"Name" => "სახელი",
"Size" => "ზომა",
"Modified" => "შეცვლილია",
-"_%n folder_::_%n folders_" => array(""),
-"_%n file_::_%n files_" => array(""),
"Upload" => "ატვირთვა",
"File handling" => "ფაილის დამუშავება",
"Maximum upload size" => "მაქსიმუმ ატვირთის ზომა",
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 f53c9e8e38e49bfbb679592624addec26cc74f9d..0174f8d0d21a4b480587d5190bea6f202d713057 100644
--- a/apps/files/l10n/ko.php
+++ b/apps/files/l10n/ko.php
@@ -2,6 +2,8 @@
$TRANSLATIONS = array(
"Could not move %s - File with this name already exists" => "%s 항목을 이동시키지 못하였음 - 파일 이름이 이미 존재함",
"Could not move %s" => "%s 항목을 이딩시키지 못하였음",
+"Unable to set upload directory." => "업로드 디렉터리를 정할수 없습니다",
+"Invalid Token" => "잘못된 토큰",
"No file was uploaded. Unknown error" => "파일이 업로드되지 않았습니다. 알 수 없는 오류입니다",
"There is no error, the file uploaded with success" => "파일 업로드에 성공하였습니다.",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "업로드한 파일이 php.ini의 upload_max_filesize보다 큽니다:",
@@ -11,13 +13,17 @@ $TRANSLATIONS = array(
"Missing a temporary folder" => "임시 폴더가 없음",
"Failed to write to disk" => "디스크에 쓰지 못했습니다",
"Not enough storage available" => "저장소가 용량이 충분하지 않습니다.",
+"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" => "디렉터리 및 빈 파일은 업로드할 수 없습니다",
+"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." => "URL을 입력해야 합니다.",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "유효하지 않은 폴더명입니다. \"Shared\" 이름의 사용은 OwnCloud 가 이미 예약하고 있습니다.",
"Error" => "오류",
"Share" => "공유",
"Delete permanently" => "영원히 삭제",
@@ -29,19 +35,22 @@ $TRANSLATIONS = array(
"cancel" => "취소",
"replaced {new_name} with {old_name}" => "{old_name}이(가) {new_name}(으)로 대체됨",
"undo" => "되돌리기",
-"_Uploading %n file_::_Uploading %n files_" => array(""),
-"files uploading" => "파일 업로드중",
+"_%n folder_::_%n folders_" => array("폴더 %n"),
+"_%n file_::_%n files_" => array("파일 %n 개"),
+"{dirs} and {files}" => "{dirs} 그리고 {files}",
+"_Uploading %n file_::_Uploading %n files_" => array("%n 개의 파일을 업로드중"),
"'.' 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" => "수정됨",
-"_%n folder_::_%n folders_" => array(""),
-"_%n file_::_%n files_" => array(""),
+"%s could not be renamed" => "%s 의 이름을 변경할수 없습니다",
"Upload" => "업로드",
"File handling" => "파일 처리",
"Maximum upload size" => "최대 업로드 크기",
@@ -66,8 +75,6 @@ $TRANSLATIONS = array(
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "이 파일이 서버에서 허용하는 최대 업로드 가능 용량보다 큽니다.",
"Files are being scanned, please wait." => "파일을 검색하고 있습니다. 기다려 주십시오.",
"Current scanning" => "현재 검색",
-"file" => "파일",
-"files" => "파일",
"Upgrading filesystem cache..." => "파일 시스템 캐시 업그레이드 중..."
);
$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/l10n/ku_IQ.php b/apps/files/l10n/ku_IQ.php
index 81177f9bea07221749f112997e332ad5e91a1dce..d98848a71f099a262830da1784c277ddde68b566 100644
--- a/apps/files/l10n/ku_IQ.php
+++ b/apps/files/l10n/ku_IQ.php
@@ -2,10 +2,11 @@
$TRANSLATIONS = array(
"URL cannot be empty." => "ناونیشانی بهستهر نابێت بهتاڵ بێت.",
"Error" => "ههڵه",
-"_Uploading %n file_::_Uploading %n files_" => array("",""),
-"Name" => "ناو",
+"Share" => "هاوبەشی کردن",
"_%n folder_::_%n folders_" => array("",""),
"_%n file_::_%n files_" => array("",""),
+"_Uploading %n file_::_Uploading %n files_" => array("",""),
+"Name" => "ناو",
"Upload" => "بارکردن",
"Save" => "پاشکهوتکردن",
"Folder" => "بوخچه",
diff --git a/apps/files/l10n/lb.php b/apps/files/l10n/lb.php
index c57eebd9e765fed8e90f8e91f4778dcf1359bf32..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",
@@ -15,12 +14,12 @@ $TRANSLATIONS = array(
"replace" => "ersetzen",
"cancel" => "ofbriechen",
"undo" => "réckgängeg man",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
"_Uploading %n file_::_Uploading %n files_" => array("",""),
"Name" => "Numm",
"Size" => "Gréisst",
"Modified" => "Geännert",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
"Upload" => "Eroplueden",
"File handling" => "Fichier handling",
"Maximum upload size" => "Maximum Upload Gréisst ",
@@ -41,8 +40,6 @@ $TRANSLATIONS = array(
"Upload too large" => "Upload ze grouss",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "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.",
"Files are being scanned, please wait." => "Fichieren gi gescannt, war weg.",
-"Current scanning" => "Momentane Scan",
-"file" => "Datei",
-"files" => "Dateien"
+"Current scanning" => "Momentane Scan"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/lt_LT.php b/apps/files/l10n/lt_LT.php
index a4dd5008afb96969828900b9fe85bdd0bc47331b..d064b0c6523c23e9a8fcd96d3c902ad0e3369629 100644
--- a/apps/files/l10n/lt_LT.php
+++ b/apps/files/l10n/lt_LT.php
@@ -2,6 +2,8 @@
$TRANSLATIONS = array(
"Could not move %s - File with this name already exists" => "Nepavyko perkelti %s - failas su tokiu pavadinimu jau egzistuoja",
"Could not move %s" => "Nepavyko perkelti %s",
+"Unable to set upload directory." => "Nepavyksta nustatyti įkėlimų katalogo.",
+"Invalid Token" => "Netinkamas ženklas",
"No file was uploaded. Unknown error" => "Failai nebuvo įkelti dėl nežinomos priežasties",
"There is no error, the file uploaded with success" => "Failas įkeltas sėkmingai, be klaidų",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Įkeliamas failas yra didesnis nei leidžia upload_max_filesize php.ini faile:",
@@ -11,11 +13,14 @@ $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. Could not get file info." => "Įkėlimas nepavyko. Nepavyko gauti failo informacijos.",
+"Upload failed. Could not find uploaded file" => "Įkėlimas nepavyko. Nepavyko rasti įkelto failo",
"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",
+"Unable to upload {filename} as it is a directory or has 0 bytes" => "Nepavyksta įkelti {filename}, nes tai katalogas arba yra 0 baitų dydžio",
"Not enough space available" => "Nepakanka vietos",
"Upload cancelled." => "Įkėlimas atšauktas.",
+"Could not get result from server." => "Nepavyko gauti rezultato iš serverio.",
"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.",
"URL cannot be empty." => "URL negali būti tuščias.",
"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Negalimas aplanko pavadinimas. 'Shared' pavadinimas yra rezervuotas ownCloud",
@@ -30,19 +35,22 @@ $TRANSLATIONS = array(
"cancel" => "atšaukti",
"replaced {new_name} with {old_name}" => "pakeiskite {new_name} į {old_name}",
"undo" => "anuliuoti",
-"_Uploading %n file_::_Uploading %n files_" => array("","",""),
-"files uploading" => "įkeliami failai",
+"_%n folder_::_%n folders_" => array("%n aplankas","%n aplankai","%n aplankų"),
+"_%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ų"),
"'.' 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.",
"Your storage is full, files can not be updated or synced anymore!" => "Jūsų visa vieta serveryje užimta",
"Your storage is almost full ({usedSpacePercent}%)" => "Jūsų vieta serveryje beveik visa užimta ({usedSpacePercent}%)",
+"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Šifravimas buvo išjungtas, bet Jūsų failai vis dar užšifruoti. Prašome eiti į asmeninius nustatymus ir iššifruoti savo failus.",
"Your download is being prepared. This might take some time if the files are big." => "Jūsų atsisiuntimas yra paruošiamas. tai gali užtrukti jei atsisiunčiamas didelis failas.",
+"Error moving file" => "Klaida perkeliant failą",
"Name" => "Pavadinimas",
"Size" => "Dydis",
"Modified" => "Pakeista",
-"_%n folder_::_%n folders_" => array("","",""),
-"_%n file_::_%n files_" => array("","",""),
+"%s could not be renamed" => "%s negali būti pervadintas",
"Upload" => "Įkelti",
"File handling" => "Failų tvarkymas",
"Maximum upload size" => "Maksimalus įkeliamo failo dydis",
@@ -67,8 +75,6 @@ $TRANSLATIONS = array(
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Bandomų įkelti failų dydis viršija maksimalų, kuris leidžiamas šiame serveryje",
"Files are being scanned, please wait." => "Skenuojami failai, prašome palaukti.",
"Current scanning" => "Šiuo metu skenuojama",
-"file" => "failas",
-"files" => "failai",
"Upgrading filesystem cache..." => "Atnaujinamas sistemos kešavimas..."
);
$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/files/l10n/lv.php b/apps/files/l10n/lv.php
index b1435b46096224fcd38eb514126eddccbc7aaddf..cefaea62818ead578eb1d12b363ecc4a69f1cfae 100644
--- a/apps/files/l10n/lv.php
+++ b/apps/files/l10n/lv.php
@@ -15,7 +15,6 @@ $TRANSLATIONS = array(
"Not enough storage available" => "Nav pietiekami daudz vietas",
"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.",
@@ -32,8 +31,9 @@ $TRANSLATIONS = array(
"cancel" => "atcelt",
"replaced {new_name} with {old_name}" => "aizvietoja {new_name} ar {old_name}",
"undo" => "atsaukt",
+"_%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 '*'.",
@@ -44,8 +44,6 @@ $TRANSLATIONS = array(
"Name" => "Nosaukums",
"Size" => "Izmērs",
"Modified" => "Mainīts",
-"_%n folder_::_%n folders_" => array("%n mapes","%n mape","%n mapes"),
-"_%n file_::_%n files_" => array("%n faili","%n fails","%n faili"),
"%s could not be renamed" => "%s nevar tikt pārsaukts",
"Upload" => "Augšupielādēt",
"File handling" => "Datņu pārvaldība",
@@ -71,10 +69,6 @@ $TRANSLATIONS = array(
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Augšupielādējamās datnes pārsniedz servera pieļaujamo datņu augšupielādes apjomu",
"Files are being scanned, please wait." => "Datnes šobrīd tiek caurskatītas, lūdzu, uzgaidiet.",
"Current scanning" => "Šobrīd tiek caurskatīts",
-"directory" => "direktorija",
-"directories" => "direktorijas",
-"file" => "fails",
-"files" => "faili",
"Upgrading filesystem cache..." => "Uzlabo datņu sistēmas kešatmiņu..."
);
$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);";
diff --git a/apps/files/l10n/mk.php b/apps/files/l10n/mk.php
index 20fed43ab20eda052ce74f16776f44bbfe278266..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." => "Адресата неможе да биде празна.",
@@ -23,13 +22,13 @@ $TRANSLATIONS = array(
"cancel" => "откажи",
"replaced {new_name} with {old_name}" => "заменета {new_name} со {old_name}",
"undo" => "врати",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
"_Uploading %n file_::_Uploading %n files_" => array("",""),
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Неправилно име. , '\\', '/', '<', '>', ':', '\"', '|', '?' и '*' не се дозволени.",
"Name" => "Име",
"Size" => "Големина",
"Modified" => "Променето",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
"Upload" => "Подигни",
"File handling" => "Ракување со датотеки",
"Maximum upload size" => "Максимална големина за подигање",
@@ -51,8 +50,6 @@ $TRANSLATIONS = array(
"Upload too large" => "Фајлот кој се вчитува е преголем",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Датотеките кои се обидувате да ги подигнете ја надминуваат максималната големина за подигнување датотеки на овој сервер.",
"Files are being scanned, please wait." => "Се скенираат датотеки, ве молам почекајте.",
-"Current scanning" => "Моментално скенирам",
-"file" => "датотека",
-"files" => "датотеки"
+"Current scanning" => "Моментално скенирам"
);
$PLURAL_FORMS = "nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;";
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 86b70faefda3b07a977c4f8b768e655dc43fb72c..61bbf81cd8a4d3bd4b0c64cefa6050a57ada4193 100644
--- a/apps/files/l10n/ms_MY.php
+++ b/apps/files/l10n/ms_MY.php
@@ -8,19 +8,18 @@ $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",
"Pending" => "Dalam proses",
"replace" => "ganti",
"cancel" => "Batal",
+"_%n folder_::_%n folders_" => array(""),
+"_%n file_::_%n files_" => array(""),
"_Uploading %n file_::_Uploading %n files_" => array(""),
"Name" => "Nama",
"Size" => "Saiz",
"Modified" => "Dimodifikasi",
-"_%n folder_::_%n folders_" => array(""),
-"_%n file_::_%n files_" => array(""),
"Upload" => "Muat naik",
"File handling" => "Pengendalian fail",
"Maximum upload size" => "Saiz maksimum muat naik",
@@ -40,8 +39,6 @@ $TRANSLATIONS = array(
"Upload too large" => "Muatnaik terlalu besar",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Fail yang cuba dimuat naik melebihi saiz maksimum fail upload server",
"Files are being scanned, please wait." => "Fail sedang diimbas, harap bersabar.",
-"Current scanning" => "Imbasan semasa",
-"file" => "fail",
-"files" => "fail"
+"Current scanning" => "Imbasan semasa"
);
$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/l10n/my_MM.php b/apps/files/l10n/my_MM.php
index 4dc63ffee2d7b03637e751ca3e61c686c9810786..497ecc0949250ba65a5512e9fed53b5484a4f244 100644
--- a/apps/files/l10n/my_MM.php
+++ b/apps/files/l10n/my_MM.php
@@ -1,9 +1,9 @@
<?php
$TRANSLATIONS = array(
"Files" => "ဖိုင်များ",
-"_Uploading %n file_::_Uploading %n files_" => array(""),
"_%n folder_::_%n folders_" => array(""),
"_%n file_::_%n files_" => array(""),
+"_Uploading %n file_::_Uploading %n files_" => array(""),
"Download" => "ဒေါင်းလုတ်"
);
$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/l10n/nb_NO.php b/apps/files/l10n/nb_NO.php
index 72c4153c6efd9550b5f8e6ef9def9dbcf0fe91ad..8fda251a2bc072c7e2ee45a8421f128a8bb301e8 100644
--- a/apps/files/l10n/nb_NO.php
+++ b/apps/files/l10n/nb_NO.php
@@ -15,7 +15,6 @@ $TRANSLATIONS = array(
"Not enough storage available" => "Ikke nok lagringsplass",
"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.",
@@ -32,8 +31,9 @@ $TRANSLATIONS = array(
"cancel" => "avbryt",
"replaced {new_name} with {old_name}" => "erstattet {new_name} med {old_name}",
"undo" => "angre",
+"_%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.",
@@ -43,8 +43,6 @@ $TRANSLATIONS = array(
"Name" => "Navn",
"Size" => "Størrelse",
"Modified" => "Endret",
-"_%n folder_::_%n folders_" => array("%n mappe","%n mapper"),
-"_%n file_::_%n files_" => array("%n fil","%n filer"),
"%s could not be renamed" => "Kunne ikke gi nytt navn til %s",
"Upload" => "Last opp",
"File handling" => "Filhåndtering",
@@ -70,10 +68,6 @@ $TRANSLATIONS = array(
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Filene du prøver å laste opp er for store for å laste opp til denne serveren.",
"Files are being scanned, please wait." => "Skanner filer, vennligst vent.",
"Current scanning" => "Pågående skanning",
-"directory" => "katalog",
-"directories" => "kataloger",
-"file" => "fil",
-"files" => "filer",
"Upgrading filesystem cache..." => "Oppgraderer filsystemets mellomlager..."
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
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 422fa8ba130414b7396bdae295a3b108e75309c6..65ad526523795934267b5ee1861ee36c2246cb51 100644
--- a/apps/files/l10n/nl.php
+++ b/apps/files/l10n/nl.php
@@ -15,7 +15,6 @@ $TRANSLATIONS = array(
"Not enough storage available" => "Niet genoeg opslagruimte beschikbaar",
"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.",
@@ -32,8 +31,10 @@ $TRANSLATIONS = array(
"cancel" => "annuleren",
"replaced {new_name} with {old_name}" => "verving {new_name} met {old_name}",
"undo" => "ongedaan maken",
+"_%n folder_::_%n folders_" => array("","%n mappen"),
+"_%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.",
@@ -44,8 +45,6 @@ $TRANSLATIONS = array(
"Name" => "Naam",
"Size" => "Grootte",
"Modified" => "Aangepast",
-"_%n folder_::_%n folders_" => array("","%n mappen"),
-"_%n file_::_%n files_" => array("","%n bestanden"),
"%s could not be renamed" => "%s kon niet worden hernoemd",
"Upload" => "Uploaden",
"File handling" => "Bestand",
@@ -71,10 +70,6 @@ $TRANSLATIONS = array(
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "De bestanden die u probeert te uploaden zijn groter dan de maximaal toegestane bestandsgrootte voor deze server.",
"Files are being scanned, please wait." => "Bestanden worden gescand, even wachten.",
"Current scanning" => "Er wordt gescand",
-"directory" => "directory",
-"directories" => "directories",
-"file" => "bestand",
-"files" => "bestanden",
"Upgrading filesystem cache..." => "Upgraden bestandssysteem cache..."
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/nn_NO.php b/apps/files/l10n/nn_NO.php
index abaaa5ffe8edb47c30c6b0ddc70ee45404bb9cb9..e29b1d3ad36b13ba2cea74bfed1dc71039db89b3 100644
--- a/apps/files/l10n/nn_NO.php
+++ b/apps/files/l10n/nn_NO.php
@@ -2,6 +2,8 @@
$TRANSLATIONS = array(
"Could not move %s - File with this name already exists" => "Klarte ikkje flytta %s – det finst allereie ei fil med dette namnet",
"Could not move %s" => "Klarte ikkje flytta %s",
+"Unable to set upload directory." => "Klarte ikkje å endra opplastingsmappa.",
+"Invalid Token" => "Ugyldig token",
"No file was uploaded. Unknown error" => "Ingen filer lasta opp. Ukjend feil",
"There is no error, the file uploaded with success" => "Ingen feil, fila vart lasta opp",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Fila du lasta opp er større enn det «upload_max_filesize» i php.ini tillater: ",
@@ -11,11 +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. 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",
@@ -30,19 +35,22 @@ $TRANSLATIONS = array(
"cancel" => "avbryt",
"replaced {new_name} with {old_name}" => "bytte ut {new_name} med {old_name}",
"undo" => "angre",
-"_Uploading %n file_::_Uploading %n files_" => array("",""),
-"files uploading" => "filer lastar opp",
+"_%n folder_::_%n folders_" => array("%n mappe","%n mapper"),
+"_%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"),
"'.' 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.",
"Your storage is full, files can not be updated or synced anymore!" => "Lagringa di er full, kan ikkje lenger oppdatera eller synkronisera!",
"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",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
+"%s could not be renamed" => "Klarte ikkje å omdøypa på %s",
"Upload" => "Last opp",
"File handling" => "Filhandtering",
"Maximum upload size" => "Maksimal opplastingsstorleik",
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 552d72bef59cfa1ff15a2a6b7db4f711fae4827a..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",
@@ -18,13 +17,12 @@ $TRANSLATIONS = array(
"suggest name" => "nom prepausat",
"cancel" => "anulla",
"undo" => "defar",
+"_%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",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
"Upload" => "Amontcarga",
"File handling" => "Manejament de fichièr",
"Maximum upload size" => "Talha maximum d'amontcargament",
@@ -45,8 +43,6 @@ $TRANSLATIONS = array(
"Upload too large" => "Amontcargament tròp gròs",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Los fichièrs que sias a amontcargar son tròp pesucs per la talha maxi pel servidor.",
"Files are being scanned, please wait." => "Los fiichièrs son a èsser explorats, ",
-"Current scanning" => "Exploracion en cors",
-"file" => "fichièr",
-"files" => "fichièrs"
+"Current scanning" => "Exploracion en cors"
);
$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
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 d858248f29fe7f059f2e818fb1ea84b7c52be7e9..50a247d2e0f4acd85b1b58d7e8f7080cbe489b0e 100644
--- a/apps/files/l10n/pl.php
+++ b/apps/files/l10n/pl.php
@@ -13,11 +13,14 @@ $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. Could not get file info." => "Nieudane przesłanie. Nie można pobrać informacji o pliku.",
+"Upload failed. Could not find uploaded file" => "Nieudane przesłanie. Nie można znaleźć przesyłanego pliku",
"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",
+"Unable to upload {filename} as it is a directory or has 0 bytes" => "Nie można przesłać {filename} być może jest katalogiem lub posiada 0 bajtów",
"Not enough space available" => "Za mało miejsca",
"Upload cancelled." => "Wczytywanie anulowane.",
+"Could not get result from server." => "Nie można uzyskać wyniku z serwera.",
"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.",
"URL cannot be empty." => "URL nie może być pusty.",
"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Nieprawidłowa nazwa folderu. Wykorzystanie 'Shared' jest zarezerwowane przez ownCloud",
@@ -32,19 +35,21 @@ $TRANSLATIONS = array(
"cancel" => "anuluj",
"replaced {new_name} with {old_name}" => "zastąpiono {new_name} przez {old_name}",
"undo" => "cofnij",
-"_Uploading %n file_::_Uploading %n files_" => array("","",""),
-"files uploading" => "pliki wczytane",
+"_%n folder_::_%n folders_" => array("%n katalog","%n katalogi","%n katalogów"),
+"_%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"),
"'.' 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.",
"Your storage is full, files can not be updated or synced anymore!" => "Magazyn jest pełny. Pliki nie mogą zostać zaktualizowane lub zsynchronizowane!",
"Your storage is almost full ({usedSpacePercent}%)" => "Twój magazyn jest prawie pełny ({usedSpacePercent}%)",
+"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Szyfrowanie zostało wyłączone, ale nadal pliki są zaszyfrowane. Przejdź do ustawień osobistych i tam odszyfruj pliki.",
"Your download is being prepared. This might take some time if the files are big." => "Pobieranie jest przygotowywane. Może to zająć trochę czasu jeśli pliki są duże.",
+"Error moving file" => "Błąd prz przenoszeniu pliku",
"Name" => "Nazwa",
"Size" => "Rozmiar",
"Modified" => "Modyfikacja",
-"_%n folder_::_%n folders_" => array("","",""),
-"_%n file_::_%n files_" => array("","",""),
"%s could not be renamed" => "%s nie można zmienić nazwy",
"Upload" => "Wyślij",
"File handling" => "Zarządzanie plikami",
@@ -70,10 +75,6 @@ $TRANSLATIONS = array(
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Pliki, które próbujesz przesłać, przekraczają maksymalną dopuszczalną wielkość.",
"Files are being scanned, please wait." => "Skanowanie plików, proszę czekać.",
"Current scanning" => "Aktualnie skanowane",
-"directory" => "Katalog",
-"directories" => "Katalogi",
-"file" => "plik",
-"files" => "pliki",
"Upgrading filesystem cache..." => "Uaktualnianie plików pamięci podręcznej..."
);
$PLURAL_FORMS = "nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/files/l10n/pt_BR.php b/apps/files/l10n/pt_BR.php
index b42b81d040ba10d4643a8840a02cd6bde2cc89f9..cd96020856511a053c2a387c616dd785c1f8c6f0 100644
--- a/apps/files/l10n/pt_BR.php
+++ b/apps/files/l10n/pt_BR.php
@@ -13,11 +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. 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",
@@ -32,19 +35,21 @@ $TRANSLATIONS = array(
"cancel" => "cancelar",
"replaced {new_name} with {old_name}" => "Substituído {old_name} por {new_name} ",
"undo" => "desfazer",
-"_Uploading %n file_::_Uploading %n files_" => array("",""),
-"files uploading" => "enviando arquivos",
+"_%n folder_::_%n folders_" => array("%n pasta","%n pastas"),
+"_%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"),
"'.' 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.",
"Your storage is full, files can not be updated or synced anymore!" => "Seu armazenamento está cheio, arquivos não podem mais ser atualizados ou sincronizados!",
"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",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
"%s could not be renamed" => "%s não pode ser renomeado",
"Upload" => "Upload",
"File handling" => "Tratamento de Arquivo",
@@ -70,10 +75,6 @@ $TRANSLATIONS = array(
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Os arquivos que você está tentando carregar excedeu o tamanho máximo para arquivos no servidor.",
"Files are being scanned, please wait." => "Arquivos sendo escaneados, por favor aguarde.",
"Current scanning" => "Scanning atual",
-"directory" => "diretório",
-"directories" => "diretórios",
-"file" => "arquivo",
-"files" => "arquivos",
"Upgrading filesystem cache..." => "Atualizando cache do sistema de arquivos..."
);
$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files/l10n/pt_PT.php b/apps/files/l10n/pt_PT.php
index 50a33de6db3d7930d4770c1ce0355ef2bbda7a6c..f6d61fc9873e6d1d497587147f1f21643c11bd0e 100644
--- a/apps/files/l10n/pt_PT.php
+++ b/apps/files/l10n/pt_PT.php
@@ -15,7 +15,6 @@ $TRANSLATIONS = array(
"Not enough storage available" => "Não há espaço suficiente em disco",
"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.",
@@ -32,19 +31,20 @@ $TRANSLATIONS = array(
"cancel" => "cancelar",
"replaced {new_name} with {old_name}" => "substituido {new_name} por {old_name}",
"undo" => "desfazer",
-"_Uploading %n file_::_Uploading %n files_" => array("",""),
-"files uploading" => "A enviar os ficheiros",
+"_%n folder_::_%n folders_" => array("%n pasta","%n pastas"),
+"_%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"),
"'.' 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.",
"Your storage is full, files can not be updated or synced anymore!" => "O seu armazenamento está cheio, os ficheiros não podem ser sincronizados.",
"Your storage is almost full ({usedSpacePercent}%)" => "O seu espaço de armazenamento está quase cheiro ({usedSpacePercent}%)",
+"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "A encriptação foi desactivada mas os seus ficheiros continuam encriptados. Por favor consulte as suas definições pessoais para desencriptar os ficheiros.",
"Your download is being prepared. This might take some time if the files are big." => "O seu download está a ser preparado. Este processo pode demorar algum tempo se os ficheiros forem grandes.",
"Name" => "Nome",
"Size" => "Tamanho",
"Modified" => "Modificado",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
"%s could not be renamed" => "%s não pode ser renomeada",
"Upload" => "Carregar",
"File handling" => "Manuseamento de ficheiros",
@@ -70,10 +70,6 @@ $TRANSLATIONS = array(
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Os ficheiro que está a tentar enviar excedem o tamanho máximo de envio neste servidor.",
"Files are being scanned, please wait." => "Os ficheiros estão a ser analisados, por favor aguarde.",
"Current scanning" => "Análise actual",
-"directory" => "diretório",
-"directories" => "diretórios",
-"file" => "ficheiro",
-"files" => "ficheiros",
"Upgrading filesystem cache..." => "Atualizar cache do sistema de ficheiros..."
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/ro.php b/apps/files/l10n/ro.php
index 7c78c6f0767ad7742dfe85c101543d3d6cceaf65..b1b9af45d38e2ae62f849c23009c4c6cc94e02f6 100644
--- a/apps/files/l10n/ro.php
+++ b/apps/files/l10n/ro.php
@@ -6,74 +6,75 @@ $TRANSLATIONS = array(
"Invalid Token" => "Jeton Invalid",
"No file was uploaded. Unknown error" => "Nici un fișier nu a fost încărcat. Eroare necunoscută",
"There is no error, the file uploaded with success" => "Nu a apărut nici o eroare, fișierul a fost încărcat cu succes",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Fisierul incarcat depaseste upload_max_filesize permisi in php.ini: ",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Fisierul incarcat depaseste marimea maxima permisa in php.ini: ",
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Fișierul are o dimensiune mai mare decât variabile MAX_FILE_SIZE specificată în formularul HTML",
"The uploaded file was only partially uploaded" => "Fișierul a fost încărcat doar parțial",
"No file was uploaded" => "Nu a fost încărcat nici un fișier",
-"Missing a temporary folder" => "Lipsește un director temporar",
-"Failed to write to disk" => "Eroare la scriere pe disc",
+"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",
-"Invalid directory." => "Director invalid.",
+"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" => "Nu s-a putut încărca fișierul tău deoarece pare să fie un director 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 goală.",
+"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",
"Error" => "Eroare",
-"Share" => "Partajează",
+"Share" => "a imparti",
"Delete permanently" => "Stergere permanenta",
"Rename" => "Redenumire",
-"Pending" => "În așteptare",
+"Pending" => "in timpul",
"{new_name} already exists" => "{new_name} deja exista",
"replace" => "înlocuire",
"suggest name" => "sugerează nume",
"cancel" => "anulare",
"replaced {new_name} with {old_name}" => "{new_name} inlocuit cu {old_name}",
"undo" => "Anulează ultima acțiune",
-"_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 invalid, '\\', '/', '<', '>', ':', '\"', '|', '?' si '*' nu sunt permise.",
-"Your storage is full, files can not be updated or synced anymore!" => "Spatiul de stocare este plin, nu mai puteti incarca s-au sincroniza alte fisiere.",
-"Your storage is almost full ({usedSpacePercent}%)" => "Spatiul de stocare este aproape plin ({usedSpacePercent}%)",
-"Your download is being prepared. This might take some time if the files are big." => "Se pregătește descărcarea. Aceasta poate să dureze ceva timp dacă fișierele sunt mari.",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nume invalide, '\\', '/', '<', '>', ':', '\"', '|', '?' si '*' nu sunt permise.",
+"Your storage is full, files can not be updated or synced anymore!" => "Spatiul de stocare este plin, fisierele nu mai pot fi actualizate sau sincronizate",
+"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",
-"_%n folder_::_%n folders_" => array("","",""),
-"_%n file_::_%n files_" => array("","",""),
"%s could not be renamed" => "%s nu a putut fi redenumit",
"Upload" => "Încărcare",
"File handling" => "Manipulare fișiere",
"Maximum upload size" => "Dimensiune maximă admisă la încărcare",
"max. possible: " => "max. posibil:",
-"Needed for multi-file and folder downloads." => "Necesar pentru descărcarea mai multor fișiere și a dosarelor",
-"Enable ZIP-download" => "Activează descărcare fișiere compresate",
+"Needed for multi-file and folder downloads." => "necesar la descarcarea mai multor liste si fisiere",
+"Enable ZIP-download" => "permite descarcarea codurilor ZIP",
"0 is unlimited" => "0 e nelimitat",
"Maximum input size for ZIP files" => "Dimensiunea maximă de intrare pentru fișiere compresate",
"Save" => "Salvează",
"New" => "Nou",
-"Text file" => "Fișier text",
+"Text file" => "lista",
"Folder" => "Dosar",
"From link" => "de la adresa",
"Deleted files" => "Sterge fisierele",
"Cancel upload" => "Anulează încărcarea",
-"You don’t have write permissions here." => "Nu ai permisiunea de a sterge fisiere aici.",
+"You don’t have write permissions here." => "Nu ai permisiunea de a scrie aici.",
"Nothing in here. Upload something!" => "Nimic aici. Încarcă ceva!",
"Download" => "Descarcă",
-"Unshare" => "Anulare partajare",
+"Unshare" => "Anulare",
"Delete" => "Șterge",
"Upload too large" => "Fișierul încărcat este prea mare",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Fișierul care l-ai încărcat a depășită limita maximă admisă la încărcare pe acest server.",
-"Files are being scanned, please wait." => "Fișierele sunt scanate, te rog așteptă.",
+"Files are being scanned, please wait." => "Fișierele sunt scanate, asteptati va rog",
"Current scanning" => "În curs de scanare",
-"directory" => "catalog",
-"directories" => "cataloage",
-"file" => "fișier",
-"files" => "fișiere",
"Upgrading filesystem cache..." => "Modernizare fisiere de sistem cache.."
);
$PLURAL_FORMS = "nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));";
diff --git a/apps/files/l10n/ru.php b/apps/files/l10n/ru.php
index 782817be0ae73ec5fabaef226eb12a983bdd340d..143a3379ad4e4e2c3fc4b07d8dd7c1b19f58c9c3 100644
--- a/apps/files/l10n/ru.php
+++ b/apps/files/l10n/ru.php
@@ -13,11 +13,14 @@ $TRANSLATIONS = array(
"Missing a temporary folder" => "Отсутствует временная папка",
"Failed to write to disk" => "Ошибка записи на диск",
"Not enough storage available" => "Недостаточно доступного места в хранилище",
+"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' зарезервировано.",
@@ -32,19 +35,21 @@ $TRANSLATIONS = array(
"cancel" => "отмена",
"replaced {new_name} with {old_name}" => "заменено {new_name} на {old_name}",
"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" => "Изменён",
-"_%n folder_::_%n folders_" => array("%n папка","%n папки","%n папок"),
-"_%n file_::_%n files_" => array("%n файл","%n файла","%n файлов"),
"%s could not be renamed" => "%s не может быть переименован",
"Upload" => "Загрузка",
"File handling" => "Управление файлами",
@@ -70,10 +75,6 @@ $TRANSLATIONS = array(
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Файлы, которые вы пытаетесь загрузить, превышают лимит для файлов на этом сервере.",
"Files are being scanned, please wait." => "Подождите, файлы сканируются.",
"Current scanning" => "Текущее сканирование",
-"directory" => "директория",
-"directories" => "директории",
-"file" => "файл",
-"files" => "файлы",
"Upgrading filesystem cache..." => "Обновление кэша файловой системы..."
);
$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/si_LK.php b/apps/files/l10n/si_LK.php
index ffb28e09584aa2b0e5d1094c1ff8e07aec9c9d0b..7d24370a092f06e8f1c22f18e007028c4a5de089 100644
--- a/apps/files/l10n/si_LK.php
+++ b/apps/files/l10n/si_LK.php
@@ -18,12 +18,12 @@ $TRANSLATIONS = array(
"suggest name" => "නමක් යෝජනා කරන්න",
"cancel" => "අත් හරින්න",
"undo" => "නිෂ්ප්රභ කරන්න",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
"_Uploading %n file_::_Uploading %n files_" => array("",""),
"Name" => "නම",
"Size" => "ප්රමාණය",
"Modified" => "වෙනස් කළ",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
"Upload" => "උඩුගත කරන්න",
"File handling" => "ගොනු පරිහරණය",
"Maximum upload size" => "උඩුගත කිරීමක උපරිම ප්රමාණය",
@@ -45,8 +45,6 @@ $TRANSLATIONS = array(
"Upload too large" => "උඩුගත කිරීම විශාල වැඩිය",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "ඔබ උඩුගත කිරීමට තැත් කරන ගොනු මෙම සේවාදායකයා උඩුගත කිරීමට ඉඩදී ඇති උපරිම ගොනු විශාලත්වයට වඩා වැඩිය",
"Files are being scanned, please wait." => "ගොනු පරික්ෂා කෙරේ. මඳක් රැඳී සිටින්න",
-"Current scanning" => "වර්තමාන පරික්ෂාව",
-"file" => "ගොනුව",
-"files" => "ගොනු"
+"Current scanning" => "වර්තමාන පරික්ෂාව"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
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 9c84579448560a9f9cf17d24a2d13d9d53341a0a..962ce7d7e9b08e872254153ecdd890def27ffa9c 100644
--- a/apps/files/l10n/sk_SK.php
+++ b/apps/files/l10n/sk_SK.php
@@ -15,7 +15,6 @@ $TRANSLATIONS = array(
"Not enough storage available" => "Nedostatok dostupného úložného priestoru",
"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.",
@@ -32,8 +31,9 @@ $TRANSLATIONS = array(
"cancel" => "zrušiť",
"replaced {new_name} with {old_name}" => "prepísaný {new_name} súborom {old_name}",
"undo" => "vrátiť",
+"_%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.",
@@ -44,8 +44,6 @@ $TRANSLATIONS = array(
"Name" => "Názov",
"Size" => "Veľkosť",
"Modified" => "Upravené",
-"_%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"),
"%s could not be renamed" => "%s nemohol byť premenovaný",
"Upload" => "Odoslať",
"File handling" => "Nastavenie správania sa k súborom",
@@ -71,10 +69,6 @@ $TRANSLATIONS = array(
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Súbory, ktoré sa snažíte nahrať, presahujú maximálnu veľkosť pre nahratie súborov na tento server.",
"Files are being scanned, please wait." => "Čakajte, súbory sú prehľadávané.",
"Current scanning" => "Práve prezerané",
-"directory" => "priečinok",
-"directories" => "priečinky",
-"file" => "súbor",
-"files" => "súbory",
"Upgrading filesystem cache..." => "Aktualizujem medzipamäť súborového systému..."
);
$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/apps/files/l10n/sl.php b/apps/files/l10n/sl.php
index 79296c804923cc302d8c480f3639b936a263a7f4..7190753eac9610b62dd78660de326eff75053e98 100644
--- a/apps/files/l10n/sl.php
+++ b/apps/files/l10n/sl.php
@@ -15,7 +15,6 @@ $TRANSLATIONS = array(
"Not enough storage available" => "Na voljo ni dovolj prostora",
"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.",
@@ -32,8 +31,9 @@ $TRANSLATIONS = array(
"cancel" => "prekliči",
"replaced {new_name} with {old_name}" => "preimenovano ime {new_name} z imenom {old_name}",
"undo" => "razveljavi",
+"_%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.",
@@ -43,8 +43,6 @@ $TRANSLATIONS = array(
"Name" => "Ime",
"Size" => "Velikost",
"Modified" => "Spremenjeno",
-"_%n folder_::_%n folders_" => array("","","",""),
-"_%n file_::_%n files_" => array("","","",""),
"%s could not be renamed" => "%s ni bilo mogoče preimenovati",
"Upload" => "Pošlji",
"File handling" => "Upravljanje z datotekami",
@@ -70,10 +68,6 @@ $TRANSLATIONS = array(
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Datoteke, ki jih želite poslati, presegajo največjo dovoljeno velikost na strežniku.",
"Files are being scanned, please wait." => "Poteka preučevanje datotek, počakajte ...",
"Current scanning" => "Trenutno poteka preučevanje",
-"directory" => "direktorij",
-"directories" => "direktoriji",
-"file" => "datoteka",
-"files" => "datoteke",
"Upgrading filesystem cache..." => "Nadgrajevanje predpomnilnika datotečnega sistema ..."
);
$PLURAL_FORMS = "nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);";
diff --git a/apps/files/l10n/sq.php b/apps/files/l10n/sq.php
index 838bcc5ef23dfebd63a183271b710e95e3401aef..ecc066a284c9a5f526151a2b00ff2d1ea8349d4b 100644
--- a/apps/files/l10n/sq.php
+++ b/apps/files/l10n/sq.php
@@ -2,6 +2,8 @@
$TRANSLATIONS = array(
"Could not move %s - File with this name already exists" => "%s nuk u spostua - Aty ekziston një skedar me të njëjtin emër",
"Could not move %s" => "%s nuk u spostua",
+"Unable to set upload directory." => "Nuk është i mundur caktimi i dosjes së ngarkimit.",
+"Invalid Token" => "Përmbajtje e pavlefshme",
"No file was uploaded. Unknown error" => "Nuk u ngarkua asnjë skedar. Veprim i gabuar i panjohur",
"There is no error, the file uploaded with success" => "Nuk pati veprime të gabuara, skedari u ngarkua me sukses",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Skedari i ngarkuar tejkalon udhëzimin upload_max_filesize tek php.ini:",
@@ -13,11 +15,11 @@ $TRANSLATIONS = array(
"Not enough storage available" => "Nuk ka mbetur hapësirë memorizimi e mjaftueshme",
"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.",
"URL cannot be empty." => "URL-i nuk mund të jetë bosh.",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Emri i dosjes është i pavlefshëm. Përdorimi i \"Shared\" është i rezervuar nga Owncloud-i",
"Error" => "Veprim i gabuar",
"Share" => "Nda",
"Delete permanently" => "Elimino përfundimisht",
@@ -29,19 +31,21 @@ $TRANSLATIONS = array(
"cancel" => "anulo",
"replaced {new_name} with {old_name}" => "U zëvëndësua {new_name} me {old_name}",
"undo" => "anulo",
-"_Uploading %n file_::_Uploading %n files_" => array("",""),
-"files uploading" => "po ngarkoj skedarët",
+"_%n folder_::_%n folders_" => array("%n dosje","%n dosje"),
+"_%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ë"),
"'.' 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.",
"Your storage is full, files can not be updated or synced anymore!" => "Hapësira juaj e memorizimit është plot, nuk mund të ngarkoni apo sinkronizoni më skedarët.",
"Your storage is almost full ({usedSpacePercent}%)" => "Hapësira juaj e memorizimit është gati plot ({usedSpacePercent}%)",
+"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "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.",
"Your download is being prepared. This might take some time if the files are big." => "Shkarkimi juaj po përgatitet. Mund të duhet pak kohë nqse skedarët janë të mëdhenj.",
"Name" => "Emri",
"Size" => "Dimensioni",
"Modified" => "Modifikuar",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
+"%s could not be renamed" => "Nuk është i mundur riemërtimi i %s",
"Upload" => "Ngarko",
"File handling" => "Trajtimi i skedarit",
"Maximum upload size" => "Dimensioni maksimal i ngarkimit",
diff --git a/apps/files/l10n/sr.php b/apps/files/l10n/sr.php
index d4dcbd14ee5fbcb8d950bb795e30077168df431a..fd3b2a2912f8fa474b4a8cfbd32de7d6c7d8a4d0 100644
--- a/apps/files/l10n/sr.php
+++ b/apps/files/l10n/sr.php
@@ -13,7 +13,6 @@ $TRANSLATIONS = array(
"Not enough storage available" => "Нема довољно простора",
"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." => "Отпремање датотеке је у току. Ако сада напустите страницу, прекинућете отпремање.",
@@ -29,8 +28,9 @@ $TRANSLATIONS = array(
"cancel" => "откажи",
"replaced {new_name} with {old_name}" => "замењено {new_name} са {old_name}",
"undo" => "опозови",
+"_%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." => "Неисправан назив. Следећи знакови нису дозвољени: \\, /, <, >, :, \", |, ? и *.",
@@ -40,8 +40,6 @@ $TRANSLATIONS = array(
"Name" => "Име",
"Size" => "Величина",
"Modified" => "Измењено",
-"_%n folder_::_%n folders_" => array("","",""),
-"_%n file_::_%n files_" => array("","",""),
"Upload" => "Отпреми",
"File handling" => "Управљање датотекама",
"Maximum upload size" => "Највећа величина датотеке",
diff --git a/apps/files/l10n/sr@latin.php b/apps/files/l10n/sr@latin.php
index bc7b11b8c53f44f3144ea22de969e5ecc60060f1..8831d1a1bef0ee736f95b15be17888f0f28ed215 100644
--- a/apps/files/l10n/sr@latin.php
+++ b/apps/files/l10n/sr@latin.php
@@ -6,17 +6,20 @@ $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("","",""),
"Name" => "Ime",
"Size" => "Veličina",
"Modified" => "Zadnja izmena",
-"_%n folder_::_%n folders_" => array("","",""),
-"_%n file_::_%n files_" => array("","",""),
"Upload" => "Pošalji",
"Maximum upload size" => "Maksimalna veličina pošiljke",
"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 0f72443a5f95be11a70a5261f62decf47ed133b7..208dcd4ea12d83ddd617cf390e88874e77396c76 100644
--- a/apps/files/l10n/sv.php
+++ b/apps/files/l10n/sv.php
@@ -15,7 +15,6 @@ $TRANSLATIONS = array(
"Not enough storage available" => "Inte tillräckligt med lagringsutrymme tillgängligt",
"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.",
@@ -32,8 +31,10 @@ $TRANSLATIONS = array(
"cancel" => "avbryt",
"replaced {new_name} with {old_name}" => "ersatt {new_name} med {old_name}",
"undo" => "ångra",
+"_%n folder_::_%n folders_" => array("%n mapp","%n mappar"),
+"_%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.",
@@ -44,8 +45,6 @@ $TRANSLATIONS = array(
"Name" => "Namn",
"Size" => "Storlek",
"Modified" => "Ändrad",
-"_%n folder_::_%n folders_" => array("%n mapp","%n mappar"),
-"_%n file_::_%n files_" => array("%n fil","%n filer"),
"%s could not be renamed" => "%s kunde inte namnändras",
"Upload" => "Ladda upp",
"File handling" => "Filhantering",
@@ -71,10 +70,6 @@ $TRANSLATIONS = array(
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Filerna du försöker ladda upp överstiger den maximala storleken för filöverföringar på servern.",
"Files are being scanned, please wait." => "Filer skannas, var god vänta",
"Current scanning" => "Aktuell skanning",
-"directory" => "mapp",
-"directories" => "mappar",
-"file" => "fil",
-"files" => "filer",
"Upgrading filesystem cache..." => "Uppgraderar filsystemets cache..."
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
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 eb39218e48d85e34a15e14e4dfef9716a637607b..f05990b94f00f39152dcbbafd57e0f1d9c9bb59d 100644
--- a/apps/files/l10n/ta_LK.php
+++ b/apps/files/l10n/ta_LK.php
@@ -8,7 +8,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 bytes ஐ கொண்டுள்ளதால் உங்களுடைய கோப்பை பதிவேற்ற முடியவில்லை",
"Upload cancelled." => "பதிவேற்றல் இரத்து செய்யப்பட்டுள்ளது",
"File upload is in progress. Leaving the page now will cancel the upload." => "கோப்பு பதிவேற்றம் செயல்பாட்டில் உள்ளது. இந்தப் பக்கத்திலிருந்து வெறியேறுவதானது பதிவேற்றலை இரத்து செய்யும்.",
"URL cannot be empty." => "URL வெறுமையாக இருக்கமுடியாது.",
@@ -22,13 +21,13 @@ $TRANSLATIONS = array(
"cancel" => "இரத்து செய்க",
"replaced {new_name} with {old_name}" => "{new_name} ஆனது {old_name} இனால் மாற்றப்பட்டது",
"undo" => "முன் செயல் நீக்கம் ",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
"_Uploading %n file_::_Uploading %n files_" => array("",""),
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "செல்லுபடியற்ற பெயர்,'\\', '/', '<', '>', ':', '\"', '|', '?' மற்றும் '*' ஆகியன அனுமதிக்கப்படமாட்டாது.",
"Name" => "பெயர்",
"Size" => "அளவு",
"Modified" => "மாற்றப்பட்டது",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
"Upload" => "பதிவேற்றுக",
"File handling" => "கோப்பு கையாளுதல்",
"Maximum upload size" => "பதிவேற்றக்கூடிய ஆகக்கூடிய அளவு ",
diff --git a/apps/files/l10n/te.php b/apps/files/l10n/te.php
index 5a108274dd9c2654ea06c7f2fa4fd64562ff9d66..60aabc8a3655753f2cc3c393371c8e8372f76a79 100644
--- a/apps/files/l10n/te.php
+++ b/apps/files/l10n/te.php
@@ -3,11 +3,11 @@ $TRANSLATIONS = array(
"Error" => "పొరపాటు",
"Delete permanently" => "శాశ్వతంగా తొలగించు",
"cancel" => "రద్దుచేయి",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
"_Uploading %n file_::_Uploading %n files_" => array("",""),
"Name" => "పేరు",
"Size" => "పరిమాణం",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
"Save" => "భద్రపరచు",
"Folder" => "సంచయం",
"Delete" => "తొలగించు"
diff --git a/apps/files/l10n/th_TH.php b/apps/files/l10n/th_TH.php
index ac2da6aed9154836c9db7298ec40d6e95a6fed73..37144ebc8836d6079f55fab879f1939522e6b577 100644
--- a/apps/files/l10n/th_TH.php
+++ b/apps/files/l10n/th_TH.php
@@ -13,7 +13,6 @@ $TRANSLATIONS = array(
"Not enough storage available" => "เหลือพื้นที่ไม่เพียงสำหรับใช้งาน",
"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." => "การอัพโหลดไฟล์กำลังอยู่ในระหว่างดำเนินการ การออกจากหน้าเว็บนี้จะทำให้การอัพโหลดถูกยกเลิก",
@@ -28,8 +27,9 @@ $TRANSLATIONS = array(
"cancel" => "ยกเลิก",
"replaced {new_name} with {old_name}" => "แทนที่ {new_name} ด้วย {old_name} แล้ว",
"undo" => "เลิกทำ",
+"_%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." => "ชื่อที่ใช้ไม่ถูกต้อง, '\\', '/', '<', '>', ':', '\"', '|', '?' และ '*' ไม่ได้รับอนุญาตให้ใช้งานได้",
@@ -39,8 +39,6 @@ $TRANSLATIONS = array(
"Name" => "ชื่อ",
"Size" => "ขนาด",
"Modified" => "แก้ไขแล้ว",
-"_%n folder_::_%n folders_" => array(""),
-"_%n file_::_%n files_" => array(""),
"Upload" => "อัพโหลด",
"File handling" => "การจัดกาไฟล์",
"Maximum upload size" => "ขนาดไฟล์สูงสุดที่อัพโหลดได้",
@@ -63,8 +61,6 @@ $TRANSLATIONS = array(
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "ไฟล์ที่คุณพยายามที่จะอัพโหลดมีขนาดเกินกว่าขนาดสูงสุดที่กำหนดไว้ให้อัพโหลดได้สำหรับเซิร์ฟเวอร์นี้",
"Files are being scanned, please wait." => "ไฟล์กำลังอยู่ระหว่างการสแกน, กรุณารอสักครู่.",
"Current scanning" => "ไฟล์ที่กำลังสแกนอยู่ขณะนี้",
-"file" => "ไฟล์",
-"files" => "ไฟล์",
"Upgrading filesystem cache..." => "กำลังอัพเกรดหน่วยความจำแคชของระบบไฟล์..."
);
$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/l10n/tr.php b/apps/files/l10n/tr.php
index 650e4ead88c7a7e8b351388006befbe4e0ff35ab..8cb05e16ace42b30fb161c1e449769a978206c32 100644
--- a/apps/files/l10n/tr.php
+++ b/apps/files/l10n/tr.php
@@ -15,7 +15,6 @@ $TRANSLATIONS = array(
"Not enough storage available" => "Yeterli disk alanı yok",
"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.",
@@ -32,8 +31,9 @@ $TRANSLATIONS = array(
"cancel" => "iptal",
"replaced {new_name} with {old_name}" => "{new_name} ismi {old_name} ile değiştirildi",
"undo" => "geri al",
+"_%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.",
@@ -44,8 +44,6 @@ $TRANSLATIONS = array(
"Name" => "İsim",
"Size" => "Boyut",
"Modified" => "Değiştirilme",
-"_%n folder_::_%n folders_" => array("%n dizin","%n dizin"),
-"_%n file_::_%n files_" => array("%n dosya","%n dosya"),
"%s could not be renamed" => "%s yeniden adlandırılamadı",
"Upload" => "Yükle",
"File handling" => "Dosya taşıma",
@@ -71,10 +69,6 @@ $TRANSLATIONS = array(
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Yüklemeye çalıştığınız dosyalar bu sunucudaki maksimum yükleme boyutunu aşıyor.",
"Files are being scanned, please wait." => "Dosyalar taranıyor, lütfen bekleyin.",
"Current scanning" => "Güncel tarama",
-"directory" => "dizin",
-"directories" => "dizinler",
-"file" => "dosya",
-"files" => "dosyalar",
"Upgrading filesystem cache..." => "Sistem dosyası önbelleği güncelleniyor"
);
$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files/l10n/ug.php b/apps/files/l10n/ug.php
index 2eceeea44a87880a6dee33508a591b9b19784710..a38ce706ef9ea1b988de3cc896033c513d6e1ce8 100644
--- a/apps/files/l10n/ug.php
+++ b/apps/files/l10n/ug.php
@@ -20,13 +20,12 @@ $TRANSLATIONS = array(
"suggest name" => "تەۋسىيە ئات",
"cancel" => "ۋاز كەچ",
"undo" => "يېنىۋال",
+"_%n folder_::_%n folders_" => array(""),
+"_%n file_::_%n files_" => array(""),
"_Uploading %n file_::_Uploading %n files_" => array(""),
-"files uploading" => "ھۆججەت يۈكلىنىۋاتىدۇ",
"Name" => "ئاتى",
"Size" => "چوڭلۇقى",
"Modified" => "ئۆزگەرتكەن",
-"_%n folder_::_%n folders_" => array(""),
-"_%n file_::_%n files_" => array(""),
"Upload" => "يۈكلە",
"Save" => "ساقلا",
"New" => "يېڭى",
diff --git a/apps/files/l10n/uk.php b/apps/files/l10n/uk.php
index 49747caef1967c7cb33cfdb224c1258bc580ad06..4aaeca255422ce889863a60613ac83d58261bceb 100644
--- a/apps/files/l10n/uk.php
+++ b/apps/files/l10n/uk.php
@@ -2,6 +2,7 @@
$TRANSLATIONS = array(
"Could not move %s - File with this name already exists" => "Не вдалося перемістити %s - Файл з таким ім'ям вже існує",
"Could not move %s" => "Не вдалося перемістити %s",
+"Unable to set upload directory." => "Не вдалося встановити каталог завантаження.",
"No file was uploaded. Unknown error" => "Не завантажено жодного файлу. Невідома помилка",
"There is no error, the file uploaded with success" => "Файл успішно вивантажено без помилок.",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Розмір звантаження перевищує upload_max_filesize параметра в php.ini: ",
@@ -13,11 +14,11 @@ $TRANSLATIONS = array(
"Not enough storage available" => "Місця більше немає",
"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." => "Виконується завантаження файлу. Закриття цієї сторінки приведе до відміни завантаження.",
"URL cannot be empty." => "URL не може бути пустим.",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Неправильне ім'я теки. Використання 'Shared' зарезервовано ownCloud",
"Error" => "Помилка",
"Share" => "Поділитися",
"Delete permanently" => "Видалити назавжди",
@@ -29,8 +30,9 @@ $TRANSLATIONS = array(
"cancel" => "відміна",
"replaced {new_name} with {old_name}" => "замінено {new_name} на {old_name}",
"undo" => "відмінити",
+"_%n folder_::_%n folders_" => array("%n тека","%n тека","%n теки"),
+"_%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." => "Невірне ім'я, '\\', '/', '<', '>', ':', '\"', '|', '?' та '*' не дозволені.",
@@ -40,8 +42,6 @@ $TRANSLATIONS = array(
"Name" => "Ім'я",
"Size" => "Розмір",
"Modified" => "Змінено",
-"_%n folder_::_%n folders_" => array("","",""),
-"_%n file_::_%n files_" => array("","",""),
"%s could not be renamed" => "%s не може бути перейменований",
"Upload" => "Вивантажити",
"File handling" => "Робота з файлами",
@@ -54,7 +54,7 @@ $TRANSLATIONS = array(
"Save" => "Зберегти",
"New" => "Створити",
"Text file" => "Текстовий файл",
-"Folder" => "Папка",
+"Folder" => "Тека",
"From link" => "З посилання",
"Deleted files" => "Видалено файлів",
"Cancel upload" => "Перервати завантаження",
@@ -67,10 +67,6 @@ $TRANSLATIONS = array(
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Файли,що ви намагаєтесь відвантажити перевищують максимальний дозволений розмір файлів на цьому сервері.",
"Files are being scanned, please wait." => "Файли скануються, зачекайте, будь-ласка.",
"Current scanning" => "Поточне сканування",
-"directory" => "каталог",
-"directories" => "каталоги",
-"file" => "файл",
-"files" => "файли",
"Upgrading filesystem cache..." => "Оновлення кеша файлової системи..."
);
$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/ur_PK.php b/apps/files/l10n/ur_PK.php
index 15c24700df0bb02f3dba942e2b67ae19615e9983..6854c421587594c1eb30dd97924044e0cfebd3f5 100644
--- a/apps/files/l10n/ur_PK.php
+++ b/apps/files/l10n/ur_PK.php
@@ -1,9 +1,9 @@
<?php
$TRANSLATIONS = array(
"Error" => "ایرر",
-"_Uploading %n file_::_Uploading %n files_" => array("",""),
"_%n folder_::_%n folders_" => array("",""),
"_%n file_::_%n files_" => array("",""),
+"_Uploading %n file_::_Uploading %n files_" => array("",""),
"Unshare" => "شئیرنگ ختم کریں"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/vi.php b/apps/files/l10n/vi.php
index 9c6e1c2a57babf8fd9b12f34edc6c48439402763..2d63128aa264abdb48d3e0c85f6d88e03e29f85f 100644
--- a/apps/files/l10n/vi.php
+++ b/apps/files/l10n/vi.php
@@ -13,7 +13,6 @@ $TRANSLATIONS = array(
"Not enough storage available" => "Không đủ không gian lưu trữ",
"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.",
@@ -29,8 +28,9 @@ $TRANSLATIONS = array(
"cancel" => "hủy",
"replaced {new_name} with {old_name}" => "đã thay thế {new_name} bằng {old_name}",
"undo" => "lùi lại",
+"_%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.",
@@ -40,8 +40,6 @@ $TRANSLATIONS = array(
"Name" => "Tên",
"Size" => "Kích cỡ",
"Modified" => "Thay đổi",
-"_%n folder_::_%n folders_" => array(""),
-"_%n file_::_%n files_" => array(""),
"Upload" => "Tải lên",
"File handling" => "Xử lý tập tin",
"Maximum upload size" => "Kích thước tối đa ",
@@ -66,8 +64,6 @@ $TRANSLATIONS = array(
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "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ủ .",
"Files are being scanned, please wait." => "Tập tin đang được quét ,vui lòng chờ.",
"Current scanning" => "Hiện tại đang quét",
-"file" => "file",
-"files" => "files",
"Upgrading filesystem cache..." => "Đang nâng cấp bộ nhớ đệm cho tập tin hệ thống..."
);
$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/l10n/zh_CN.php b/apps/files/l10n/zh_CN.php
index ad9733f059a728050430b8fa19836657d0840b62..b739b72ce7e264773a2cd974e4c06025f009f637 100644
--- a/apps/files/l10n/zh_CN.php
+++ b/apps/files/l10n/zh_CN.php
@@ -15,7 +15,6 @@ $TRANSLATIONS = array(
"Not enough storage available" => "没有足够的存储空间",
"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." => "文件正在上传中。现在离开此页会导致上传动作被取消。",
@@ -32,8 +31,9 @@ $TRANSLATIONS = array(
"cancel" => "取消",
"replaced {new_name} with {old_name}" => "已将 {old_name}替换成 {new_name}",
"undo" => "撤销",
+"_%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." => "无效名称，'\\', '/', '<', '>', ':', '\"', '|', '?' 和 '*' 不被允许使用。",
@@ -43,8 +43,6 @@ $TRANSLATIONS = array(
"Name" => "名称",
"Size" => "大小",
"Modified" => "修改日期",
-"_%n folder_::_%n folders_" => array("%n 文件夹"),
-"_%n file_::_%n files_" => array("%n个文件"),
"%s could not be renamed" => "%s 不能被重命名",
"Upload" => "上传",
"File handling" => "文件处理",
@@ -70,8 +68,6 @@ $TRANSLATIONS = array(
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "您正尝试上传的文件超过了此服务器可以上传的最大容量限制",
"Files are being scanned, please wait." => "文件正在被扫描，请稍候。",
"Current scanning" => "当前扫描",
-"file" => "文件",
-"files" => "文件",
"Upgrading filesystem cache..." => "正在更新文件系统缓存..."
);
$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/l10n/zh_HK.php b/apps/files/l10n/zh_HK.php
index a9064fa7f780944989cfb4b7629a8655a4306b52..febed4fe8fb68048048ac876a81ba9ed6b5b53c3 100644
--- a/apps/files/l10n/zh_HK.php
+++ b/apps/files/l10n/zh_HK.php
@@ -3,10 +3,10 @@ $TRANSLATIONS = array(
"Files" => "文件",
"Error" => "錯誤",
"Share" => "分享",
-"_Uploading %n file_::_Uploading %n files_" => array(""),
-"Name" => "名稱",
"_%n folder_::_%n folders_" => array(""),
"_%n file_::_%n files_" => array(""),
+"_Uploading %n file_::_Uploading %n files_" => array(""),
+"Name" => "名稱",
"Upload" => "上傳",
"Save" => "儲存",
"Download" => "下載",
diff --git a/apps/files/l10n/zh_TW.php b/apps/files/l10n/zh_TW.php
index 5cca3e0fd857477471012ead5589078df6547230..214812d7adaf6270faca6af413113b929aa7c07a 100644
--- a/apps/files/l10n/zh_TW.php
+++ b/apps/files/l10n/zh_TW.php
@@ -1,11 +1,11 @@
<?php
$TRANSLATIONS = array(
-"Could not move %s - File with this name already exists" => "無法移動 %s - 同名的檔案已經存在",
+"Could not move %s - File with this name already exists" => "無法移動 %s ，同名的檔案已經存在",
"Could not move %s" => "無法移動 %s",
-"Unable to set upload directory." => "無法設定上傳目錄。",
+"Unable to set upload directory." => "無法設定上傳目錄",
"Invalid Token" => "無效的 token",
-"No file was uploaded. Unknown error" => "沒有檔案被上傳。未知的錯誤。",
-"There is no error, the file uploaded with success" => "無錯誤，檔案上傳成功",
+"No file was uploaded. Unknown error" => "沒有檔案被上傳，原因未知",
+"There is no error, the file uploaded with success" => "一切都順利，檔案上傳成功",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "上傳的檔案大小超過 php.ini 當中 upload_max_filesize 參數的設定：",
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "上傳的檔案大小超過 HTML 表單中 MAX_FILE_SIZE 的限制",
"The uploaded file was only partially uploaded" => "只有檔案的一部分被上傳",
@@ -13,13 +13,12 @@ $TRANSLATIONS = array(
"Missing a temporary folder" => "找不到暫存資料夾",
"Failed to write to disk" => "寫入硬碟失敗",
"Not enough storage available" => "儲存空間不足",
-"Invalid directory." => "無效的資料夾。",
+"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." => "檔案上傳中。離開此頁面將會取消上傳。",
-"URL cannot be empty." => "URL 不能為空白。",
+"File upload is in progress. Leaving the page now will cancel the upload." => "檔案上傳中，離開此頁面將會取消上傳。",
+"URL cannot be empty." => "URL 不能為空",
"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "無效的資料夾名稱，'Shared' 的使用被 ownCloud 保留",
"Error" => "錯誤",
"Share" => "分享",
@@ -32,49 +31,45 @@ $TRANSLATIONS = array(
"cancel" => "取消",
"replaced {new_name} with {old_name}" => "使用 {new_name} 取代 {old_name}",
"undo" => "復原",
+"_%n folder_::_%n folders_" => array("%n 個資料夾"),
+"_%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." => "檔名不合法，不允許 '\\', '/', '<', '>', ':', '\"', '|', '?' 和 '*' 。",
+"'.' 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." => "正在準備您的下載，若您的檔案較大，將會需要更多時間。",
"Name" => "名稱",
"Size" => "大小",
-"Modified" => "修改",
-"_%n folder_::_%n folders_" => array("%n 個資料夾"),
-"_%n file_::_%n files_" => array("%n 個檔案"),
+"Modified" => "修改時間",
"%s could not be renamed" => "無法重新命名 %s",
"Upload" => "上傳",
"File handling" => "檔案處理",
-"Maximum upload size" => "最大上傳檔案大小",
+"Maximum upload size" => "上傳限制",
"max. possible: " => "最大允許：",
-"Needed for multi-file and folder downloads." => "針對多檔案和目錄下載是必填的。",
-"Enable ZIP-download" => "啟用 Zip 下載",
+"Needed for multi-file and folder downloads." => "下載多檔案和目錄時，此項是必填的。",
+"Enable ZIP-download" => "啟用 ZIP 下載",
"0 is unlimited" => "0代表沒有限制",
-"Maximum input size for ZIP files" => "針對 ZIP 檔案最大輸入大小",
+"Maximum input size for ZIP files" => "ZIP 壓縮前的原始大小限制",
"Save" => "儲存",
"New" => "新增",
"Text file" => "文字檔",
"Folder" => "資料夾",
"From link" => "從連結",
-"Deleted files" => "已刪除的檔案",
+"Deleted files" => "回收桶",
"Cancel upload" => "取消上傳",
-"You don’t have write permissions here." => "您在這裡沒有編輯權。",
-"Nothing in here. Upload something!" => "這裡什麼也沒有，上傳一些東西吧！",
+"You don’t have write permissions here." => "您在這裡沒有編輯權",
+"Nothing in here. Upload something!" => "這裡還沒有東西，上傳一些吧！",
"Download" => "下載",
-"Unshare" => "取消共享",
+"Unshare" => "取消分享",
"Delete" => "刪除",
"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." => "正在掃描檔案，請稍等。",
-"Current scanning" => "目前掃描",
-"directory" => "目錄",
-"directories" => "目錄",
-"file" => "檔案",
-"files" => "檔案",
-"Upgrading filesystem cache..." => "正在升級檔案系統快取..."
+"Current scanning" => "正在掃描",
+"Upgrading filesystem cache..." => "正在升級檔案系統快取…"
);
$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/lib/helper.php b/apps/files/lib/helper.php
index 7135ef9f656525fbc18b3fd7c87b95873ce481a2..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
{
@@ -17,4 +17,120 @@ class Helper
'maxHumanFilesize' => $maxHumanFilesize,
'usedSpacePercent' => (int)$storageInfo['relative']);
}
+
+ public static function determineIcon($file) {
+ if($file['type'] === 'dir') {
+ $dir = $file['directory'];
+ $absPath = \OC\Files\Filesystem::getView()->getAbsolutePath($dir.'/'.$file['name']);
+ $mount = \OC\Files\Filesystem::getMountManager()->find($absPath);
+ if (!is_null($mount)) {
+ $sid = $mount->getStorageId();
+ if (!is_null($sid)) {
+ $sid = explode(':', $sid);
+ if ($sid[0] === 'shared') {
+ return \OC_Helper::mimetypeIcon('dir-shared');
+ }
+ if ($sid[0] !== 'local') {
+ return \OC_Helper::mimetypeIcon('dir-external');
+ }
+ }
+ }
+ return \OC_Helper::mimetypeIcon('dir');
+ }
+
+ if($file['isPreviewAvailable']) {
+ $pathForPreview = $file['directory'] . '/' . $file['name'];
+ return \OC_Helper::previewIcon($pathForPreview);
+ }
+ return \OC_Helper::mimetypeIcon($file['mimetype']);
+ }
+
+ /**
+ * Comparator function to sort files alphabetically and have
+ * the directories appear first
+ * @param array $a file
+ * @param array $b file
+ * @return -1 if $a must come before $b, 1 otherwise
+ */
+ public static function fileCmp($a, $b) {
+ if ($a['type'] === 'dir' and $b['type'] !== 'dir') {
+ return -1;
+ } elseif ($a['type'] !== 'dir' and $b['type'] === 'dir') {
+ return 1;
+ } else {
+ return strnatcasecmp($a['name'], $b['name']);
+ }
+ }
+
+ /**
+ * Retrieves the contents of the given directory and
+ * returns it as a sorted array.
+ * @param string $dir path to the directory
+ * @return array of files
+ */
+ public static function getFiles($dir) {
+ $content = \OC\Files\Filesystem::getDirectoryContent($dir);
+ $files = array();
+
+ foreach ($content as $i) {
+ $i['date'] = \OCP\Util::formatDate($i['mtime']);
+ if ($i['type'] === 'file') {
+ $fileinfo = pathinfo($i['name']);
+ $i['basename'] = $fileinfo['filename'];
+ if (!empty($fileinfo['extension'])) {
+ $i['extension'] = '.' . $fileinfo['extension'];
+ } else {
+ $i['extension'] = '';
+ }
+ }
+ $i['directory'] = $dir;
+ $i['isPreviewAvailable'] = \OC::$server->getPreviewManager()->isMimeSupported($i['mimetype']);
+ $i['icon'] = \OCA\Files\Helper::determineIcon($i);
+ $files[] = $i;
+ }
+
+ usort($files, array('\OCA\Files\Helper', 'fileCmp'));
+
+ return $files;
+ }
+
+ /**
+ * Splits the given path into a breadcrumb structure.
+ * @param string $dir path to process
+ * @return array where each entry is a hash of the absolute
+ * directory path and its name
+ */
+ public static function makeBreadcrumb($dir){
+ $breadcrumb = array();
+ $pathtohere = '';
+ foreach (explode('/', $dir) as $i) {
+ if ($i !== '') {
+ $pathtohere .= '/' . $i;
+ $breadcrumb[] = array('dir' => $pathtohere, 'name' => $i);
+ }
+ }
+ return $breadcrumb;
+ }
+
+ /**
+ * Returns the numeric permissions for the given directory.
+ * @param string $dir directory without trailing slash
+ * @return numeric permissions
+ */
+ public static function getDirPermissions($dir){
+ $permissions = \OCP\PERMISSION_READ;
+ if (\OC\Files\Filesystem::isCreatable($dir . '/')) {
+ $permissions |= \OCP\PERMISSION_CREATE;
+ }
+ if (\OC\Files\Filesystem::isUpdatable($dir . '/')) {
+ $permissions |= \OCP\PERMISSION_UPDATE;
+ }
+ if (\OC\Files\Filesystem::isDeletable($dir . '/')) {
+ $permissions |= \OCP\PERMISSION_DELETE;
+ }
+ if (\OC\Files\Filesystem::isSharable($dir . '/')) {
+ $permissions |= \OCP\PERMISSION_SHARE;
+ }
+ return $permissions;
+ }
}
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 360874103f830a5805d89f28d8c539e93dce112e..96a80738989667198f4605f7705a0b55b6e9e858 100644
--- a/apps/files/templates/index.php
+++ b/apps/files/templates/index.php
@@ -1,8 +1,7 @@
<!--[if IE 8]><style>input[type="checkbox"]{padding:0;}table td{position:static !important;}</style><![endif]-->
<div id="controls">
<?php print_unescaped($_['breadcrumb']); ?>
- <?php if ($_['isCreatable']):?>
- <div class="actions <?php if (isset($_['files']) and count($_['files'])==0):?>emptyfolder<?php endif; ?>">
+ <div class="actions creatable <?php if (!$_['isCreatable']):?>hidden<?php endif; ?> <?php if (isset($_['files']) and count($_['files'])==0):?>emptycontent<?php endif; ?>">
<div id="new" class="button">
<a><?php p($l->t('New'));?></a>
<ul>
@@ -10,35 +9,29 @@
data-type='file'><p><?php p($l->t('Text file'));?></p></li>
<li style="background-image:url('<?php p(OCP\mimetype_icon('dir')) ?>')"
data-type='folder'><p><?php p($l->t('Folder'));?></p></li>
- <li style="background-image:url('<?php p(OCP\image_path('core', 'actions/public.png')) ?>')"
+ <li style="background-image:url('<?php p(OCP\image_path('core', 'filetypes/web.svg')) ?>')"
data-type='web'><p><?php p($l->t('From link'));?></p></li>
</ul>
</div>
<div id="upload" class="button"
title="<?php p($l->t('Upload') . ' max. '.$_['uploadMaxHumanFilesize']) ?>">
- <form data-upload-id='1'
- id="data-upload-form"
- class="file_upload_form"
- action="<?php print_unescaped(OCP\Util::linkTo('files', 'ajax/upload.php')); ?>"
- method="post"
- enctype="multipart/form-data"
- target="file_upload_target_1">
<?php if($_['uploadMaxFilesize'] >= 0):?>
<input type="hidden" name="MAX_FILE_SIZE" id="max_upload"
value="<?php p($_['uploadMaxFilesize']) ?>">
<?php endif;?>
<!-- Send the requesttoken, this is needed for older IE versions
because they don't send the CSRF token via HTTP header in this case -->
- <input type="hidden" name="requesttoken" value="<?php p($_['requesttoken']) ?>" id="requesttoken">
<input type="hidden" class="max_human_file_size"
value="(max <?php p($_['uploadMaxHumanFilesize']); ?>)">
<input type="hidden" name="dir" value="<?php p($_['dir']) ?>" id="dir">
- <input type="file" id="file_upload_start" name='files[]'/>
+ <input type="file" id="file_upload_start" name='files[]'
+ data-url="<?php print_unescaped(OCP\Util::linkTo('files', 'ajax/upload.php')); ?>" />
<a href="#" class="svg"></a>
- </form>
</div>
<?php if ($_['trash'] ): ?>
- <input id="trash" type="button" value="<?php p($l->t('Deleted files'));?>" class="button" <?php $_['trashEmpty'] ? p('disabled') : '' ?>></input>
+ <div id="trash" class="button" <?php $_['trashEmpty'] ? p('disabled') : '' ?>>
+ <a><?php p($l->t('Deleted files'));?></a>
+ </div>
<?php endif; ?>
<div id="uploadprogresswrapper">
<div id="uploadprogressbar"></div>
@@ -48,38 +41,40 @@
</div>
</div>
<div id="file_action_panel"></div>
- <?php elseif( !$_['isPublic'] ):?>
- <div class="actions"><input type="button" disabled value="<?php p($l->t('You don’t have write permissions here.'))?>"></div>
- <input type="hidden" name="dir" value="<?php p($_['dir']) ?>" id="dir">
- <?php endif;?>
+ <div class="notCreatable notPublic <?php if ($_['isCreatable'] or $_['isPublic'] ):?>hidden<?php endif; ?>">
+ <div class="actions"><input type="button" disabled value="<?php p($l->t('You don’t have write permissions here.'))?>"></div>
+ </div>
<input type="hidden" name="permissions" value="<?php p($_['permissions']); ?>" id="permissions">
</div>
-<?php if (isset($_['files']) and $_['isCreatable'] and count($_['files'])==0):?>
- <div id="emptyfolder"><?php p($l->t('Nothing in here. Upload something!'))?></div>
-<?php endif; ?>
+<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>
-<table id="filestable" data-allow-public-upload="<?php p($_['publicUploadEnabled'])?>">
+<table id="filestable" data-allow-public-upload="<?php p($_['publicUploadEnabled'])?>" data-preview-x="36" data-preview-y="36">
<thead>
<tr>
<th id='headerName'>
- <input type="checkbox" id="select_all" />
- <span class='name'><?php p($l->t( 'Name' )); ?></span>
- <span class='selectedActions'>
- <?php if($_['allowZipDownload']) : ?>
- <a href="" class="download">
- <img class="svg" alt="Download"
- src="<?php print_unescaped(OCP\image_path("core", "actions/download.svg")); ?>" />
- <?php p($l->t('Download'))?>
- </a>
- <?php endif; ?>
- </span>
+ <div id="headerName-container">
+ <input type="checkbox" id="select_all" />
+ <label for="select_all"></label>
+ <span class="name"><?php p($l->t( 'Name' )); ?></span>
+ <span class="selectedActions">
+ <?php if($_['allowZipDownload']) : ?>
+ <a href="" class="download">
+ <img class="svg" alt="Download"
+ src="<?php print_unescaped(OCP\image_path("core", "actions/download.svg")); ?>" />
+ <?php p($l->t('Download'))?>
+ </a>
+ <?php endif; ?>
+ </span>
+ </div>
</th>
<th id="headerSize"><?php p($l->t('Size')); ?></th>
<th id="headerDate">
<span id="modified"><?php p($l->t( 'Modified' )); ?></span>
<?php if ($_['permissions'] & OCP\PERMISSION_DELETE): ?>
-<!-- NOTE: Temporary fix to allow unsharing of files in root of Shared folder -->
+<!-- NOTE: Temporary fix to allow unsharing of files in root of Shared folder -->
<?php if ($_['dir'] == '/Shared'): ?>
<span class="selectedActions"><a href="" class="delete-selected">
<?php p($l->t('Unshare'))?>
@@ -101,7 +96,7 @@
<?php print_unescaped($_['fileList']); ?>
</tbody>
</table>
-<div id="editor"></div>
+<div id="editor"></div><!-- FIXME Do not use this div in your app! It is deprecated and will be removed in the future! -->
<div id="uploadsize-message" title="<?php p($l->t('Upload too large'))?>">
<p>
<?php p($l->t('The files you are trying to upload exceed the maximum size for file uploads on this server.'));?>
@@ -117,6 +112,7 @@
</div>
<!-- config hints for javascript -->
+<input type="hidden" name="ajaxLoad" id="ajaxLoad" value="<?php p($_['ajaxLoad']); ?>" />
<input type="hidden" name="allowZipDownload" id="allowZipDownload" value="<?php p($_['allowZipDownload']); ?>" />
<input type="hidden" name="usedSpacePercent" id="usedSpacePercent" value="<?php p($_['usedSpacePercent']); ?>" />
<input type="hidden" name="encryptedFiles" id="encryptedFiles" value="<?php $_['encryptedFiles'] ? p('1') : p('0'); ?>" />
diff --git a/apps/files/templates/part.list.php b/apps/files/templates/part.list.php
index 0c7d6936697fb5ce09222a47896710307ce15308..1e4d4d11c98dbfa6344abe6ec9a1f48e993d7588 100644
--- a/apps/files/templates/part.list.php
+++ b/apps/files/templates/part.list.php
@@ -1,14 +1,7 @@
-<input type="hidden" id="disableSharing" data-status="<?php p($_['disableSharing']); ?>">
<?php $totalfiles = 0;
$totaldirs = 0;
$totalsize = 0; ?>
<?php foreach($_['files'] as $file):
- $totalsize += $file['size'];
- if ($file['type'] === 'dir') {
- $totaldirs++;
- } else {
- $totalfiles++;
- }
// the bigger the file, the darker the shade of grey; megabytes*2
$simple_size_color = intval(160-$file['size']/(1024*1024)*2);
if($simple_size_color<0) $simple_size_color = 0;
@@ -22,16 +15,19 @@ $totalsize = 0; ?>
data-file="<?php p($name);?>"
data-type="<?php ($file['type'] == 'dir')?p('dir'):p('file')?>"
data-mime="<?php p($file['mimetype'])?>"
- data-size='<?php p($file['size']);?>'
- data-permissions='<?php p($file['permissions']); ?>'>
- <td class="filename svg"
- <?php if($file['type'] == 'dir'): ?>
- style="background-image:url(<?php print_unescaped(OCP\mimetype_icon('dir')); ?>)"
+ data-size="<?php p($file['size']);?>"
+ data-permissions="<?php p($file['permissions']); ?>">
+ <?php if($file['isPreviewAvailable']): ?>
+ <td class="filename svg preview-icon"
<?php else: ?>
- style="background-image:url(<?php print_unescaped(OCP\mimetype_icon($file['mimetype'])); ?>)"
+ <td class="filename svg"
<?php endif; ?>
+ style="background-image:url(<?php print_unescaped($file['icon']); ?>)"
>
- <?php if(!isset($_['readonly']) || !$_['readonly']): ?><input type="checkbox" /><?php endif; ?>
+ <?php if(!isset($_['readonly']) || !$_['readonly']): ?>
+ <input id="select-<?php p($file['fileid']); ?>" type="checkbox" />
+ <label for="select-<?php p($file['fileid']); ?>"></label>
+ <?php endif; ?>
<?php if($file['type'] == 'dir'): ?>
<a class="name" href="<?php p(rtrim($_['baseURL'],'/').'/'.trim($directory,'/').'/'.$name); ?>" title="">
<?php else: ?>
@@ -64,33 +60,4 @@ $totalsize = 0; ?>
</span>
</td>
</tr>
-<?php endforeach; ?>
- <?php if ($totaldirs !== 0 || $totalfiles !== 0): ?>
- <tr class="summary">
- <td><span class="info">
- <?php if ($totaldirs !== 0) {
- p($totaldirs.' ');
- if ($totaldirs === 1) {
- p($l->t('directory'));
- } else {
- p($l->t('directories'));
- }
- }
- if ($totaldirs !== 0 && $totalfiles !== 0) {
- p(' & ');
- }
- if ($totalfiles !== 0) {
- p($totalfiles.' ');
- if ($totalfiles === 1) {
- p($l->t('file'));
- } else {
- p($l->t('files'));
- }
- } ?>
- </span></td>
- <td class="filesize">
- <?php print_unescaped(OCP\human_file_size($totalsize)); ?>
- </td>
- <td></td>
- </tr>
- <?php endif;
+<?php endforeach;
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/appinfo/info.xml b/apps/files_encryption/appinfo/info.xml
index 46f1375c9875a41bc558a29e49db1db619d93b8e..9d495916d26495482312b6838e70e5e1772ea9ec 100644
--- a/apps/files_encryption/appinfo/info.xml
+++ b/apps/files_encryption/appinfo/info.xml
@@ -7,6 +7,7 @@
<author>Sam Tuke, Bjoern Schiessle, Florin Peter</author>
<require>4</require>
<shipped>true</shipped>
+ <rememberlogin>false</rememberlogin>
<types>
<filesystem/>
</types>
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index de306462d79062a7fcd7ba876a9e8e624936dc06..d9221c6e828a2539ed61ffe184f7e589ca978444 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -36,14 +36,6 @@ class Hooks {
*/
public static function login($params) {
$l = new \OC_L10N('files_encryption');
- //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);
- }
$view = new \OC_FilesystemView('/');
@@ -52,6 +44,20 @@ class Hooks {
\OC_Util::setupFS($params['uid']);
}
+ $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
@@ -72,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')
@@ -248,7 +254,7 @@ class Hooks {
$params['run'] = false;
$params['error'] = $l->t('Following users are not set up for encryption:') . ' ' . join(', ' , $notConfigured);
}
-
+
}
/**
@@ -259,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
@@ -300,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/es.php b/apps/files_encryption/l10n/es.php
index 8341bafc9fdab992bdc942f13d6cf41f1b29e8bb..2d644708c59ed3ece59af8046b5fab59205c280b 100644
--- a/apps/files_encryption/l10n/es.php
+++ b/apps/files_encryption/l10n/es.php
@@ -10,6 +10,8 @@ $TRANSLATIONS = array(
"Could not update the private key password. Maybe the old password was not correct." => "No se pudo cambiar la contraseña. Puede que la contraseña antigua no sea correcta.",
"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." => "¡Su clave privada no es válida! Tal vez su contraseña ha sido cambiada desde fuera. Puede actualizar su clave privada en sus opciones personales para recuperar el acceso a sus ficheros.",
"Missing requirements." => "Requisitos incompletos.",
+"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." => "Por favor, asegúrese de que PHP 5.3.3 o posterior está instalado y que la extensión OpenSSL de PHP está habilitada y configurada correctamente. Por el momento, la aplicación de cifrado ha sido deshabilitada.",
+"Following users are not set up for encryption:" => "Los siguientes usuarios no han sido configurados para el cifrado:",
"Saving..." => "Guardando...",
"Your private key is not valid! Maybe the your password was changed from outside." => "¡Su clave privada no es válida! Tal vez su contraseña ha sido cambiada desde fuera.",
"You can unlock your private key in your " => "Puede desbloquear su clave privada en su",
diff --git a/apps/files_encryption/l10n/es_AR.php b/apps/files_encryption/l10n/es_AR.php
index cac8c465362b83b47dc5b0b1064ede90814c3aa8..666ea59687c404bb19e088ce0e2a43a7288dd3de 100644
--- a/apps/files_encryption/l10n/es_AR.php
+++ b/apps/files_encryption/l10n/es_AR.php
@@ -10,6 +10,8 @@ $TRANSLATIONS = array(
"Could not update the private key password. Maybe the old password was not correct." => "No fue posible actualizar la contraseña de clave privada. Tal vez la contraseña anterior no es correcta.",
"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." => "¡Tu clave privada no es válida! Tal vez tu contraseña fue cambiada desde fuera del sistema de ownCloud (por ej. desde tu cuenta de sistema). Podés actualizar tu clave privada en la sección de \"configuración personal\", para recuperar el acceso a tus archivos.",
"Missing requirements." => "Requisitos incompletos.",
+"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." => "Por favor, asegúrese de que PHP 5.3.3 o una versión más reciente esté instalado y que OpenSSL junto con la extensión PHP esté habilitado y configurado apropiadamente. Por ahora, la aplicación de encriptación ha sido deshabilitada.",
+"Following users are not set up for encryption:" => "Los siguientes usuarios no fueron configurados para encriptar:",
"Saving..." => "Guardando...",
"Your private key is not valid! Maybe the your password was changed from outside." => "¡Tu clave privada no es válida! Tal vez tu contraseña fue cambiada desde afuera.",
"You can unlock your private key in your " => "Podés desbloquear tu clave privada en tu",
diff --git a/apps/files_encryption/l10n/fi_FI.php b/apps/files_encryption/l10n/fi_FI.php
index 53b0a6b25cd9e8cbb785ee47cd69ee0488fa49de..b3df41b1f423440e467b8942011d2fd0f85d836c 100644
--- a/apps/files_encryption/l10n/fi_FI.php
+++ b/apps/files_encryption/l10n/fi_FI.php
@@ -1,11 +1,21 @@
<?php
$TRANSLATIONS = array(
+"Recovery key successfully enabled" => "Palautusavain kytketty päälle onnistuneesti",
"Password successfully changed." => "Salasana vaihdettiin onnistuneesti.",
"Could not change the password. Maybe the old password was not correct." => "Salasanan vaihto epäonnistui. Kenties vanha salasana oli väärin.",
+"Following users are not set up for encryption:" => "Seuraavat käyttäjät eivät ole määrittäneet salausta:",
"Saving..." => "Tallennetaan...",
+"personal settings" => "henkilökohtaiset asetukset",
"Encryption" => "Salaus",
+"Recovery key password" => "Palautusavaimen salasana",
"Enabled" => "Käytössä",
"Disabled" => "Ei käytössä",
-"Change Password" => "Vaihda salasana"
+"Change recovery key password:" => "Vaihda palautusavaimen salasana:",
+"Old Recovery key password" => "Vanha palautusavaimen salasana",
+"New Recovery key password" => "Uusi palautusavaimen salasana",
+"Change Password" => "Vaihda salasana",
+"Old log-in password" => "Vanha kirjautumis-salasana",
+"Current log-in password" => "Nykyinen kirjautumis-salasana",
+"Enable password recovery:" => "Ota salasanan palautus käyttöön:"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/fr.php b/apps/files_encryption/l10n/fr.php
index 12af810139434711b7fa653b28921c3589d127c4..358937441e2c1cf4caef09b746b6b502e179e1f4 100644
--- a/apps/files_encryption/l10n/fr.php
+++ b/apps/files_encryption/l10n/fr.php
@@ -10,6 +10,8 @@ $TRANSLATIONS = array(
"Could not update the private key password. Maybe the old password was not correct." => "Impossible de mettre à jour le mot de passe de la clé privé. Peut-être que l'ancien mot de passe n'était pas correcte.",
"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." => "Votre clé de sécurité privée n'est pas valide! Il est probable que votre mot de passe ait été changé sans passer par le système ownCloud (par éxemple: le serveur de votre entreprise). Ain d'avoir à nouveau accès à vos fichiers cryptés, vous pouvez mettre à jour votre clé de sécurité privée dans les paramètres personnels de votre compte.",
"Missing requirements." => "Système minimum requis non respecté.",
+"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." => "Veuillez vous assurer qu'une version de PHP 5.3.3 ou supérieure est installée et qu'OpenSSL et son extension PHP sont activés et configurés correctement. En attendant, l'application de chiffrement été désactivée.",
+"Following users are not set up for encryption:" => "Les utilisateurs suivants ne sont pas configurés pour le chiffrement :",
"Saving..." => "Enregistrement...",
"Your private key is not valid! Maybe the your password was changed from outside." => "Votre clef privée est invalide ! Votre mot de passe a peut-être été modifié depuis l'extérieur.",
"You can unlock your private key in your " => "Vous pouvez déverrouiller votre clé privée dans votre",
diff --git a/apps/files_encryption/l10n/hu_HU.php b/apps/files_encryption/l10n/hu_HU.php
index 49dcf817fb7680c486b8021179f00eb3758ab27c..323291bbfbe9fb7172c381012d315b5d3b51038a 100644
--- a/apps/files_encryption/l10n/hu_HU.php
+++ b/apps/files_encryption/l10n/hu_HU.php
@@ -1,6 +1,18 @@
<?php
$TRANSLATIONS = array(
+"Recovery key successfully disabled" => "Visszaállítási kulcs sikeresen kikapcsolva",
+"Password successfully changed." => "Jelszó sikeresen megváltoztatva.",
+"Could not change the password. Maybe the old password was not correct." => "A jelszót nem lehet megváltoztatni! Lehet, hogy hibás volt a régi jelszó.",
+"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." => "Kérlek győződj meg arról, hogy PHP 5.3.3 vagy annál frissebb van telepítve, valamint a PHP-hez tartozó OpenSSL bővítmény be van-e kapcsolva és az helyesen van-e konfigurálva! Ki lett kapcsolva ideiglenesen a titkosító alkalmazás.",
"Saving..." => "Mentés...",
-"Encryption" => "Titkosítás"
+"personal settings" => "személyes beállítások",
+"Encryption" => "Titkosítás",
+"Enabled" => "Bekapcsolva",
+"Disabled" => "Kikapcsolva",
+"Change Password" => "Jelszó megváltoztatása",
+"Old log-in password" => "Régi bejelentkezési jelszó",
+"Current log-in password" => "Jelenlegi bejelentkezési jelszó",
+"Update Private Key Password" => "Privát kulcs jelszó frissítése",
+"Enable password recovery:" => "Jelszó-visszaállítás bekapcsolása"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/lt_LT.php b/apps/files_encryption/l10n/lt_LT.php
index 9fbf7b296046029bc85f376afdd9b90df55cfdc3..4ededb716f4e16badeef5a02d1ff36ba341bcc79 100644
--- a/apps/files_encryption/l10n/lt_LT.php
+++ b/apps/files_encryption/l10n/lt_LT.php
@@ -6,12 +6,34 @@ $TRANSLATIONS = array(
"Could not disable recovery key. Please check your recovery key password!" => "Neišėjo išjungti jūsų atkūrimo rakto. Prašome jį patikrinti!",
"Password successfully changed." => "Slaptažodis sėkmingai pakeistas",
"Could not change the password. Maybe the old password was not correct." => "Slaptažodis nebuvo pakeistas. Gali būti, kad buvo neteisingai suvestas senasis.",
+"Private key password successfully updated." => "Privataus rakto slaptažodis buvo sėkmingai atnaujintas.",
+"Could not update the private key password. Maybe the old password was not correct." => "Nepavyko atnaujinti privataus rakto slaptažodžio. Gali būti, kad buvo neteisingai suvestas senasis.",
+"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." => "Jūsų privatus raktas yra netinkamas! Panašu, kad Jūsų slaptažodis buvo pakeistas išorėje ownCloud sistemos (pvz. Jūsų organizacijos kataloge). Galite atnaujinti savo privataus rakto slaptažodį savo asmeniniuose nustatymuose, kad atkurti prieigą prie savo šifruotų failų.",
+"Missing requirements." => "Trūkstami laukai.",
+"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." => "Prašome įsitikinti, kad PHP 5.3.3 ar naujesnė yra įdiegta ir kad OpenSSL kartu su PHP plėtiniu yra šjungti ir teisingai sukonfigūruoti. Kol kas šifravimo programa bus išjungta.",
+"Following users are not set up for encryption:" => "Sekantys naudotojai nenustatyti šifravimui:",
"Saving..." => "Saugoma...",
+"Your private key is not valid! Maybe the your password was changed from outside." => "Jūsų privatus raktas yra netinkamas! Galbūt Jūsų slaptažodis buvo pakeistas iš išorės?",
+"You can unlock your private key in your " => "Galite atrakinti savo privatų raktą savo",
+"personal settings" => "asmeniniai nustatymai",
"Encryption" => "Šifravimas",
+"Enable recovery key (allow to recover users files in case of password loss):" => "Įjunkite atkūrimo raktą, (leisti atkurti naudotojų failus praradus slaptažodį):",
+"Recovery key password" => "Atkūrimo rakto slaptažodis",
"Enabled" => "Įjungta",
"Disabled" => "Išjungta",
+"Change recovery key password:" => "Pakeisti atkūrimo rakto slaptažodį:",
+"Old Recovery key password" => "Senas atkūrimo rakto slaptažodis",
+"New Recovery key password" => "Naujas atkūrimo rakto slaptažodis",
"Change Password" => "Pakeisti slaptažodį",
-"File recovery settings updated" => "Failų atstatymo nustatymai pakeisti",
+"Your private key password no longer match your log-in password:" => "Privatus rakto slaptažodis daugiau neatitinka Jūsų prisijungimo slaptažodžio:",
+"Set your old private key password to your current log-in password." => "Nustatyti Jūsų privataus rakto slaptažodį į Jūsų dabartinį prisijungimo.",
+" If you don't remember your old password you can ask your administrator to recover your files." => "Jei nepamenate savo seno slaptažodžio, galite paprašyti administratoriaus atkurti Jūsų failus.",
+"Old log-in password" => "Senas prisijungimo slaptažodis",
+"Current log-in password" => "Dabartinis prisijungimo slaptažodis",
+"Update Private Key Password" => "Atnaujinti privataus rakto slaptažodį",
+"Enable password recovery:" => "Įjungti slaptažodžio atkūrimą:",
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Įjungus šią funkciją jums bus suteiktas pakartotinis priėjimas prie Jūsų šifruotų failų pamiršus slaptažodį.",
+"File recovery settings updated" => "Failų atkūrimo nustatymai pakeisti",
"Could not update file recovery" => "Neišėjo atnaujinti failų atkūrimo"
);
$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/files_encryption/l10n/nn_NO.php b/apps/files_encryption/l10n/nn_NO.php
index b99d0751540d4008389f1b53ebb8b775d0a24f1f..bb30d69c592a803fe5846cfd5ab0d9099ef95ca3 100644
--- a/apps/files_encryption/l10n/nn_NO.php
+++ b/apps/files_encryption/l10n/nn_NO.php
@@ -1,5 +1,6 @@
<?php
$TRANSLATIONS = array(
-"Saving..." => "Lagrar …"
+"Saving..." => "Lagrar …",
+"Encryption" => "Kryptering"
);
$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/sk_SK.php b/apps/files_encryption/l10n/sk_SK.php
index a723d80773b6751b7fb9f465995f2a2c56a55aec..a80eb3e65214a8bbbc4d70dff8a801be95cababc 100644
--- a/apps/files_encryption/l10n/sk_SK.php
+++ b/apps/files_encryption/l10n/sk_SK.php
@@ -8,12 +8,22 @@ $TRANSLATIONS = array(
"Could not change the password. Maybe the old password was not correct." => "Nemožno zmeniť heslo. Pravdepodobne nebolo staré heslo zadané správne.",
"Private key password successfully updated." => "Heslo súkromného kľúča je úspešne aktualizované.",
"Could not update the private key password. Maybe the old password was not correct." => "Nemožno aktualizovať heslo súkromného kľúča. Možno nebolo staré heslo správne.",
+"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." => "Váš privátny kľúč je nesprávny! Pravdepodobne bolo zmenené vaše heslo mimo systému ownCloud (napr. váš korporátny adresár). Môžte aktualizovať vaše heslo privátneho kľúča v osobných nastaveniach za účelom obnovenia prístupu k zašifrovaným súborom.",
+"Missing requirements." => "Chýbajúce požiadavky.",
+"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." => "Prosím uistite sa, že PHP verzie 5.3.3 alebo novšej je nainštalované a tiež, že OpenSSL knižnica spolu z PHP rozšírením je povolená a konfigurovaná správne. Nateraz bola aplikácia šifrovania zablokovaná.",
+"Following users are not set up for encryption:" => "Nasledujúci používatelia nie sú nastavení pre šifrovanie:",
"Saving..." => "Ukladám...",
"Your private key is not valid! Maybe the your password was changed from outside." => "Váš súkromný kľúč je neplatný. Možno bolo Vaše heslo zmenené z vonku.",
+"You can unlock your private key in your " => "Môžte odomknúť váš privátny kľúč v",
"personal settings" => "osobné nastavenia",
"Encryption" => "Šifrovanie",
+"Enable recovery key (allow to recover users files in case of password loss):" => "Povoliť obnovovací kľúč (umožňuje obnoviť používateľské súbory v prípade straty hesla):",
+"Recovery key password" => "Heslo obnovovacieho kľúča",
"Enabled" => "Povolené",
"Disabled" => "Zakázané",
+"Change recovery key password:" => "Zmeniť heslo obnovovacieho kľúča:",
+"Old Recovery key password" => "Staré heslo obnovovacieho kľúča",
+"New Recovery key password" => "Nové heslo obnovovacieho kľúča",
"Change Password" => "Zmeniť heslo",
"Your private key password no longer match your log-in password:" => "Vaše heslo súkromného kľúča je rovnaké ako Vaše prihlasovacie heslo:",
"Set your old private key password to your current log-in password." => "Nastavte si staré heslo súkromného kľúča k Vášmu súčasnému prihlasovaciemu heslu.",
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/l10n/uk.php b/apps/files_encryption/l10n/uk.php
index 680beddfe680f72a72753efa561323cf9c0f19ff..5260dd3f2f7eb2b321e3ec0a4ba197a5708e5193 100644
--- a/apps/files_encryption/l10n/uk.php
+++ b/apps/files_encryption/l10n/uk.php
@@ -1,6 +1,8 @@
<?php
$TRANSLATIONS = array(
"Saving..." => "Зберігаю...",
-"Encryption" => "Шифрування"
+"personal settings" => "особисті налаштування",
+"Encryption" => "Шифрування",
+"Change Password" => "Змінити Пароль"
);
$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/lib/crypt.php b/apps/files_encryption/lib/crypt.php
index e129bc9313ef3836b0ff3709e26d8428efaf35ca..c009718160ae360d47b4abce3822d9c9fea6fcde 100755
--- a/apps/files_encryption/lib/crypt.php
+++ b/apps/files_encryption/lib/crypt.php
@@ -52,14 +52,14 @@ class Crypt {
$return = false;
- $res = openssl_pkey_new(array('private_key_bits' => 4096));
+ $res = Helper::getOpenSSLPkey();
if ($res === false) {
\OCP\Util::writeLog('Encryption library', 'couldn\'t generate users key-pair for ' . \OCP\User::getUser(), \OCP\Util::ERROR);
while ($msg = openssl_error_string()) {
\OCP\Util::writeLog('Encryption library', 'openssl_pkey_new() fails: ' . $msg, \OCP\Util::ERROR);
}
- } elseif (openssl_pkey_export($res, $privateKey)) {
+ } elseif (openssl_pkey_export($res, $privateKey, null, Helper::getOpenSSLConfig())) {
// Get public key
$keyDetails = openssl_pkey_get_details($res);
$publicKey = $keyDetails['key'];
@@ -70,7 +70,9 @@ class Crypt {
);
} else {
\OCP\Util::writeLog('Encryption library', 'couldn\'t export users private key, please check your servers openSSL configuration.' . \OCP\User::getUser(), \OCP\Util::ERROR);
- \OCP\Util::writeLog('Encryption library', openssl_error_string(), \OCP\Util::ERROR);
+ while($errMsg = openssl_error_string()) {
+ \OCP\Util::writeLog('Encryption library', $errMsg, \OCP\Util::ERROR);
+ }
}
return $return;
diff --git a/apps/files_encryption/lib/helper.php b/apps/files_encryption/lib/helper.php
index 0209a5d18b78a555bfd17397428aed58cded46e1..445d7ff8ca796ed911833df22685935578d2b316 100755
--- a/apps/files_encryption/lib/helper.php
+++ b/apps/files_encryption/lib/helper.php
@@ -265,7 +265,7 @@ class Helper {
* @return bool true if configuration seems to be OK
*/
public static function checkConfiguration() {
- if(openssl_pkey_new(array('private_key_bits' => 4096))) {
+ if(self::getOpenSSLPkey()) {
return true;
} else {
while ($msg = openssl_error_string()) {
@@ -275,6 +275,26 @@ class Helper {
}
}
+ /**
+ * Create an openssl pkey with config-supplied settings
+ * WARNING: This initializes a new private keypair, which is computationally expensive
+ * @return resource The pkey resource created
+ */
+ public static function getOpenSSLPkey() {
+ return openssl_pkey_new(self::getOpenSSLConfig());
+ }
+
+ /**
+ * Return an array of OpenSSL config options, default + config
+ * Used for multiple OpenSSL functions
+ * @return array The combined defaults and config settings
+ */
+ public static function getOpenSSLConfig() {
+ $config = array('private_key_bits' => 4096);
+ $config = array_merge(\OCP\Config::getSystemValue('openssl', array()), $config);
+ return $config;
+ }
+
/**
* @brief glob uses different pattern than regular expressions, escape glob pattern only
* @param unescaped path
diff --git a/apps/files_encryption/lib/keymanager.php b/apps/files_encryption/lib/keymanager.php
index 5386de486e190d93aa5671e577d53aa2ba651033..7143fcff0f63b7719849abc40f2450ed90179494 100755
--- a/apps/files_encryption/lib/keymanager.php
+++ b/apps/files_encryption/lib/keymanager.php
@@ -40,11 +40,14 @@ class Keymanager {
public static function getPrivateKey(\OC_FilesystemView $view, $user) {
$path = '/' . $user . '/' . 'files_encryption' . '/' . $user . '.private.key';
+ $key = false;
$proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
- $key = $view->file_get_contents($path);
+ if ($view->file_exists($path)) {
+ $key = $view->file_get_contents($path);
+ }
\OC_FileProxy::$enabled = $proxyStatus;
@@ -220,22 +223,10 @@ class Keymanager {
*/
public static function getFileKey(\OC_FilesystemView $view, $userId, $filePath) {
- // try reusing key file if part file
- if (self::isPartialFilePath($filePath)) {
-
- $result = self::getFileKey($view, $userId, self::fixPartialFilePath($filePath));
-
- if ($result) {
-
- return $result;
-
- }
-
- }
-
$util = new Util($view, \OCP\User::getUser());
list($owner, $filename) = $util->getUidAndFilename($filePath);
+ $filename = self::fixPartialFilePath($filename);
$filePath_f = ltrim($filename, '/');
// in case of system wide mount points the keys are stored directly in the data directory
@@ -424,18 +415,6 @@ class Keymanager {
public static function getShareKey(\OC_FilesystemView $view, $userId, $filePath) {
// try reusing key file if part file
- if (self::isPartialFilePath($filePath)) {
-
- $result = self::getShareKey($view, $userId, self::fixPartialFilePath($filePath));
-
- if ($result) {
-
- return $result;
-
- }
-
- }
-
$proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
@@ -443,7 +422,7 @@ class Keymanager {
$util = new Util($view, \OCP\User::getUser());
list($owner, $filename) = $util->getUidAndFilename($filePath);
-
+ $filename = self::fixPartialFilePath($filename);
// in case of system wide mount points the keys are stored directly in the data directory
if ($util->isSystemWideMountPoint($filename)) {
$shareKeyPath = '/files_encryption/share-keys/' . $filename . '.' . $userId . '.shareKey';
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index eb7ba60cb9d17821b62cd74a3f1f68b0f387b8cb..4ec810a51996e817cca39324e8a9bbf0ec4fe6c5 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -50,9 +50,8 @@ class Proxy extends \OC_FileProxy {
private static function shouldEncrypt($path) {
if (is_null(self::$enableEncryption)) {
-
if (
- \OCP\Config::getAppValue('files_encryption', 'enable_encryption', 'true') === 'true'
+ \OCP\App::isEnabled('files_encryption') === true
&& Crypt::mode() === 'server'
) {
@@ -200,7 +199,7 @@ class Proxy extends \OC_FileProxy {
*/
public function preUnlink($path) {
- // let the trashbin handle this
+ // let the trashbin handle this
if (\OCP\App::isEnabled('files_trashbin')) {
return true;
}
@@ -291,7 +290,7 @@ class Proxy extends \OC_FileProxy {
// Close the original encrypted file
fclose($result);
- // Open the file using the crypto stream wrapper
+ // Open the file using the crypto stream wrapper
// protocol and let it do the decryption work instead
$result = fopen('crypt://' . $path, $meta['mode']);
diff --git a/apps/files_encryption/lib/stream.php b/apps/files_encryption/lib/stream.php
index 335ea3733eb2f90565bfe2e2098dbe82876732e3..083b33c03cbf2be40e674a8e509c3d5743975fb7 100644
--- a/apps/files_encryption/lib/stream.php
+++ b/apps/files_encryption/lib/stream.php
@@ -81,7 +81,7 @@ class Stream {
* @return bool
*/
public function stream_open($path, $mode, $options, &$opened_path) {
-
+
// assume that the file already exist before we decide it finally in getKey()
$this->newFile = false;
@@ -106,12 +106,12 @@ class Stream {
if ($this->relPath === false) {
$this->relPath = Helper::getPathToRealFile($this->rawPath);
}
-
+
if($this->relPath === false) {
\OCP\Util::writeLog('Encryption library', 'failed to open file "' . $this->rawPath . '" expecting a path to user/files or to user/files_versions', \OCP\Util::ERROR);
return false;
}
-
+
// Disable fileproxies so we can get the file size and open the source file without recursive encryption
$proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
@@ -188,7 +188,7 @@ class Stream {
}
// Get the data from the file handle
- $data = fread($this->handle, 8192);
+ $data = fread($this->handle, $count);
$result = null;
@@ -272,7 +272,7 @@ class Stream {
} else {
$this->newFile = true;
-
+
return false;
}
@@ -296,9 +296,9 @@ class Stream {
return strlen($data);
}
- // Disable the file proxies so that encryption is not
- // automatically attempted when the file is written to disk -
- // we are handling that separately here and we don't want to
+ // Disable the file proxies so that encryption is not
+ // automatically attempted when the file is written to disk -
+ // we are handling that separately here and we don't want to
// get into an infinite loop
$proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
@@ -311,7 +311,7 @@ class Stream {
$pointer = ftell($this->handle);
// Get / generate the keyfile for the file we're handling
- // If we're writing a new file (not overwriting an existing
+ // If we're writing a new file (not overwriting an existing
// one), save the newly generated keyfile
if (!$this->getKey()) {
@@ -319,7 +319,7 @@ class Stream {
}
- // If extra data is left over from the last round, make sure it
+ // If extra data is left over from the last round, make sure it
// is integrated into the next 6126 / 8192 block
if ($this->writeCache) {
@@ -344,12 +344,12 @@ class Stream {
if ($remainingLength < 6126) {
// Set writeCache to contents of $data
- // The writeCache will be carried over to the
- // next write round, and added to the start of
- // $data to ensure that written blocks are
- // always the correct length. If there is still
- // data in writeCache after the writing round
- // has finished, then the data will be written
+ // The writeCache will be carried over to the
+ // next write round, and added to the start of
+ // $data to ensure that written blocks are
+ // always the correct length. If there is still
+ // data in writeCache after the writing round
+ // has finished, then the data will be written
// to disk by $this->flush().
$this->writeCache = $data;
@@ -363,7 +363,7 @@ class Stream {
$encrypted = $this->preWriteEncrypt($chunk, $this->plainKey);
- // Write the data chunk to disk. This will be
+ // Write the data chunk to disk. This will be
// attended to the last data chunk if the file
// being handled totals more than 6126 bytes
fwrite($this->handle, $encrypted);
@@ -488,6 +488,7 @@ class Stream {
$this->meta['mode'] !== 'rb' &&
$this->size > 0
) {
+
// only write keyfiles if it was a new file
if ($this->newFile === true) {
@@ -535,6 +536,7 @@ class Stream {
// set fileinfo
$this->rootView->putFileInfo($this->rawPath, $fileInfo);
+
}
return fclose($this->handle);
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index b8d6862349395efa1a02b7039b267cee87faa700..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);
@@ -329,72 +330,73 @@ class Util {
$this->view->is_dir($directory)
&& $handle = $this->view->opendir($directory)
) {
-
- while (false !== ($file = readdir($handle))) {
-
- if (
- $file !== "."
- && $file !== ".."
- ) {
-
- $filePath = $directory . '/' . $this->view->getRelativePath('/' . $file);
- $relPath = \OCA\Encryption\Helper::stripUserFilesPath($filePath);
-
- // If the path is a directory, search
- // its contents
- if ($this->view->is_dir($filePath)) {
-
- $this->findEncFiles($filePath, $found);
-
- // If the path is a file, determine
- // its encryption status
- } elseif ($this->view->is_file($filePath)) {
-
- // Disable proxies again, some-
- // where they got re-enabled :/
- \OC_FileProxy::$enabled = false;
-
- $isEncryptedPath = $this->isEncryptedPath($filePath);
- // If the file is encrypted
- // NOTE: If the userId is
- // empty or not set, file will
- // detected as plain
- // NOTE: This is inefficient;
- // scanning every file like this
- // will eat server resources :(
- if (
- Keymanager::getFileKey($this->view, $this->userId, $relPath)
- && $isEncryptedPath
- ) {
-
- $found['encrypted'][] = array(
- 'name' => $file,
- 'path' => $filePath
- );
-
- // If the file uses old
- // encryption system
- } elseif (Crypt::isLegacyEncryptedContent($isEncryptedPath, $relPath)) {
-
- $found['legacy'][] = array(
- 'name' => $file,
- 'path' => $filePath
- );
-
- // If the file is not encrypted
- } else {
-
- $found['plain'][] = array(
- 'name' => $file,
- 'path' => $relPath
- );
+ if(is_resource($handle)) {
+ while (false !== ($file = readdir($handle))) {
+
+ if (
+ $file !== "."
+ && $file !== ".."
+ ) {
+
+ $filePath = $directory . '/' . $this->view->getRelativePath('/' . $file);
+ $relPath = \OCA\Encryption\Helper::stripUserFilesPath($filePath);
+
+ // If the path is a directory, search
+ // its contents
+ if ($this->view->is_dir($filePath)) {
+
+ $this->findEncFiles($filePath, $found);
+
+ // If the path is a file, determine
+ // its encryption status
+ } elseif ($this->view->is_file($filePath)) {
+
+ // Disable proxies again, some-
+ // where they got re-enabled :/
+ \OC_FileProxy::$enabled = false;
+
+ $isEncryptedPath = $this->isEncryptedPath($filePath);
+ // If the file is encrypted
+ // NOTE: If the userId is
+ // empty or not set, file will
+ // detected as plain
+ // NOTE: This is inefficient;
+ // scanning every file like this
+ // will eat server resources :(
+ if (
+ Keymanager::getFileKey($this->view, $this->userId, $relPath)
+ && $isEncryptedPath
+ ) {
+
+ $found['encrypted'][] = array(
+ 'name' => $file,
+ 'path' => $filePath
+ );
+
+ // If the file uses old
+ // encryption system
+ } elseif (Crypt::isLegacyEncryptedContent($isEncryptedPath, $relPath)) {
+
+ $found['legacy'][] = array(
+ 'name' => $file,
+ 'path' => $filePath
+ );
+
+ // If the file is not encrypted
+ } else {
+
+ $found['plain'][] = array(
+ 'name' => $file,
+ 'path' => $relPath
+ );
+
+ }
}
}
}
-
}
\OC_FileProxy::$enabled = true;
@@ -508,10 +510,11 @@ class Util {
// get the size from filesystem
$fullPath = $this->view->getLocalFile($path);
- $size = filesize($fullPath);
+ $size = $this->view->filesize($path);
// calculate last chunk nr
$lastChunkNr = floor($size / 8192);
+ $lastChunkSize = $size - ($lastChunkNr * 8192);
// open stream
$stream = fopen('crypt://' . $path, "r");
@@ -524,7 +527,7 @@ class Util {
fseek($stream, $lastChunckPos);
// get the content of the last chunk
- $lastChunkContent = fread($stream, 8192);
+ $lastChunkContent = fread($stream, $lastChunkSize);
// calc the real file size with the size of the last chunk
$realSize = (($lastChunkNr * 6126) + strlen($lastChunkContent));
@@ -1136,6 +1139,11 @@ class Util {
// Make sure that a share key is generated for the owner too
list($owner, $ownerPath) = $this->getUidAndFilename($filePath);
+ $pathinfo = pathinfo($ownerPath);
+ if(array_key_exists('extension', $pathinfo) && $pathinfo['extension'] === 'part') {
+ $ownerPath = $pathinfo['dirname'] . '/' . $pathinfo['filename'];
+ }
+
$userIds = array();
if ($sharingEnabled) {
@@ -1289,8 +1297,25 @@ class Util {
*/
public function getUidAndFilename($path) {
+ $pathinfo = pathinfo($path);
+ $partfile = false;
+ $parentFolder = false;
+ if (array_key_exists('extension', $pathinfo) && $pathinfo['extension'] === 'part') {
+ // if the real file exists we check this file
+ $filePath = $this->userFilesDir . '/' .$pathinfo['dirname'] . '/' . $pathinfo['filename'];
+ if ($this->view->file_exists($filePath)) {
+ $pathToCheck = $pathinfo['dirname'] . '/' . $pathinfo['filename'];
+ } else { // otherwise we look for the parent
+ $pathToCheck = $pathinfo['dirname'];
+ $parentFolder = true;
+ }
+ $partfile = true;
+ } else {
+ $pathToCheck = $path;
+ }
+
$view = new \OC\Files\View($this->userFilesDir);
- $fileOwnerUid = $view->getOwner($path);
+ $fileOwnerUid = $view->getOwner($pathToCheck);
// handle public access
if ($this->isPublic) {
@@ -1319,12 +1344,18 @@ class Util {
$filename = $path;
} else {
-
- $info = $view->getFileInfo($path);
+ $info = $view->getFileInfo($pathToCheck);
$ownerView = new \OC\Files\View('/' . $fileOwnerUid . '/files');
// Fetch real file path from DB
- $filename = $ownerView->getPath($info['fileid']); // TODO: Check that this returns a path without including the user data dir
+ $filename = $ownerView->getPath($info['fileid']);
+ if ($parentFolder) {
+ $filename = $filename . '/'. $pathinfo['filename'];
+ }
+
+ if ($partfile) {
+ $filename = $filename . '.' . $pathinfo['extension'];
+ }
}
@@ -1333,10 +1364,9 @@ class Util {
\OC_Filesystem::normalizePath($filename)
);
}
-
-
}
+
/**
* @brief go recursively through a dir and collect all files and sub files.
* @param string $dir relative to the users files folder
diff --git a/apps/files_external/3rdparty/Dropbox/API.php b/apps/files_external/3rdparty/Dropbox/API.php
new file mode 100644
index 0000000000000000000000000000000000000000..8cdce678e1c8101d756cd72d36f4d9fbb49c18df
--- /dev/null
+++ b/apps/files_external/3rdparty/Dropbox/API.php
@@ -0,0 +1,380 @@
+<?php
+
+/**
+ * Dropbox API class
+ *
+ * @package Dropbox
+ * @copyright Copyright (C) 2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/dropbox-php/wiki/License MIT
+ */
+class Dropbox_API {
+
+ /**
+ * Sandbox root-path
+ */
+ const ROOT_SANDBOX = 'sandbox';
+
+ /**
+ * Dropbox root-path
+ */
+ const ROOT_DROPBOX = 'dropbox';
+
+ /**
+ * API URl
+ */
+ protected $api_url = 'https://api.dropbox.com/1/';
+
+ /**
+ * Content API URl
+ */
+ protected $api_content_url = 'https://api-content.dropbox.com/1/';
+
+ /**
+ * OAuth object
+ *
+ * @var Dropbox_OAuth
+ */
+ protected $oauth;
+
+ /**
+ * Default root-path, this will most likely be 'sandbox' or 'dropbox'
+ *
+ * @var string
+ */
+ protected $root;
+ protected $useSSL;
+
+ /**
+ * Constructor
+ *
+ * @param Dropbox_OAuth Dropbox_Auth object
+ * @param string $root default root path (sandbox or dropbox)
+ */
+ public function __construct(Dropbox_OAuth $oauth, $root = self::ROOT_DROPBOX, $useSSL = true) {
+
+ $this->oauth = $oauth;
+ $this->root = $root;
+ $this->useSSL = $useSSL;
+ if (!$this->useSSL)
+ {
+ throw new Dropbox_Exception('Dropbox REST API now requires that all requests use SSL');
+ }
+
+ }
+
+ /**
+ * Returns information about the current dropbox account
+ *
+ * @return stdclass
+ */
+ public function getAccountInfo() {
+
+ $data = $this->oauth->fetch($this->api_url . 'account/info');
+ return json_decode($data['body'],true);
+
+ }
+
+ /**
+ * Returns a file's contents
+ *
+ * @param string $path path
+ * @param string $root Use this to override the default root path (sandbox/dropbox)
+ * @return string
+ */
+ public function getFile($path = '', $root = null) {
+
+ if (is_null($root)) $root = $this->root;
+ $path = str_replace(array('%2F','~'), array('/','%7E'), rawurlencode($path));
+ $result = $this->oauth->fetch($this->api_content_url . 'files/' . $root . '/' . ltrim($path,'/'));
+ return $result['body'];
+
+ }
+
+ /**
+ * Uploads a new file
+ *
+ * @param string $path Target path (including filename)
+ * @param string $file Either a path to a file or a stream resource
+ * @param string $root Use this to override the default root path (sandbox/dropbox)
+ * @return bool
+ */
+ public function putFile($path, $file, $root = null) {
+
+ $directory = dirname($path);
+ $filename = basename($path);
+
+ if($directory==='.') $directory = '';
+ $directory = str_replace(array('%2F','~'), array('/','%7E'), rawurlencode($directory));
+// $filename = str_replace('~', '%7E', rawurlencode($filename));
+ if (is_null($root)) $root = $this->root;
+
+ if (is_string($file)) {
+
+ $file = fopen($file,'rb');
+
+ } elseif (!is_resource($file)) {
+ throw new Dropbox_Exception('File must be a file-resource or a string');
+ }
+ $result=$this->multipartFetch($this->api_content_url . 'files/' .
+ $root . '/' . trim($directory,'/'), $file, $filename);
+
+ if(!isset($result["httpStatus"]) || $result["httpStatus"] != 200)
+ throw new Dropbox_Exception("Uploading file to Dropbox failed");
+
+ return true;
+ }
+
+
+ /**
+ * Copies a file or directory from one location to another
+ *
+ * This method returns the file information of the newly created file.
+ *
+ * @param string $from source path
+ * @param string $to destination path
+ * @param string $root Use this to override the default root path (sandbox/dropbox)
+ * @return stdclass
+ */
+ public function copy($from, $to, $root = null) {
+
+ if (is_null($root)) $root = $this->root;
+ $response = $this->oauth->fetch($this->api_url . 'fileops/copy', array('from_path' => $from, 'to_path' => $to, 'root' => $root), 'POST');
+
+ return json_decode($response['body'],true);
+
+ }
+
+ /**
+ * Creates a new folder
+ *
+ * This method returns the information from the newly created directory
+ *
+ * @param string $path
+ * @param string $root Use this to override the default root path (sandbox/dropbox)
+ * @return stdclass
+ */
+ public function createFolder($path, $root = null) {
+
+ if (is_null($root)) $root = $this->root;
+
+ // Making sure the path starts with a /
+// $path = '/' . ltrim($path,'/');
+
+ $response = $this->oauth->fetch($this->api_url . 'fileops/create_folder', array('path' => $path, 'root' => $root),'POST');
+ return json_decode($response['body'],true);
+
+ }
+
+ /**
+ * Deletes a file or folder.
+ *
+ * This method will return the metadata information from the deleted file or folder, if successful.
+ *
+ * @param string $path Path to new folder
+ * @param string $root Use this to override the default root path (sandbox/dropbox)
+ * @return array
+ */
+ public function delete($path, $root = null) {
+
+ if (is_null($root)) $root = $this->root;
+ $response = $this->oauth->fetch($this->api_url . 'fileops/delete', array('path' => $path, 'root' => $root), 'POST');
+ return json_decode($response['body']);
+
+ }
+
+ /**
+ * Moves a file or directory to a new location
+ *
+ * This method returns the information from the newly created directory
+ *
+ * @param mixed $from Source path
+ * @param mixed $to destination path
+ * @param string $root Use this to override the default root path (sandbox/dropbox)
+ * @return stdclass
+ */
+ public function move($from, $to, $root = null) {
+
+ if (is_null($root)) $root = $this->root;
+ $response = $this->oauth->fetch($this->api_url . 'fileops/move', array('from_path' => rawurldecode($from), 'to_path' => rawurldecode($to), 'root' => $root), 'POST');
+
+ return json_decode($response['body'],true);
+
+ }
+
+ /**
+ * Returns file and directory information
+ *
+ * @param string $path Path to receive information from
+ * @param bool $list When set to true, this method returns information from all files in a directory. When set to false it will only return infromation from the specified directory.
+ * @param string $hash If a hash is supplied, this method simply returns true if nothing has changed since the last request. Good for caching.
+ * @param int $fileLimit Maximum number of file-information to receive
+ * @param string $root Use this to override the default root path (sandbox/dropbox)
+ * @return array|true
+ */
+ public function getMetaData($path, $list = true, $hash = null, $fileLimit = null, $root = null) {
+
+ if (is_null($root)) $root = $this->root;
+
+ $args = array(
+ 'list' => $list,
+ );
+
+ if (!is_null($hash)) $args['hash'] = $hash;
+ if (!is_null($fileLimit)) $args['file_limit'] = $fileLimit;
+
+ $path = str_replace(array('%2F','~'), array('/','%7E'), rawurlencode($path));
+ $response = $this->oauth->fetch($this->api_url . 'metadata/' . $root . '/' . ltrim($path,'/'), $args);
+
+ /* 304 is not modified */
+ if ($response['httpStatus']==304) {
+ return true;
+ } else {
+ return json_decode($response['body'],true);
+ }
+
+ }
+
+ /**
+ * A way of letting you keep up with changes to files and folders in a user's Dropbox. You can periodically call /delta to get a list of "delta entries", which are instructions on how to update your local state to match the server's state.
+ *
+ * This method returns the information from the newly created directory
+ *
+ * @param string $cursor A string that is used to keep track of your current state. On the next call pass in this value to return delta entries that have been recorded since the cursor was returned.
+ * @return stdclass
+ */
+ public function delta($cursor) {
+
+ $arg['cursor'] = $cursor;
+
+ $response = $this->oauth->fetch($this->api_url . 'delta', $arg, 'POST');
+ return json_decode($response['body'],true);
+
+ }
+
+ /**
+ * Returns a thumbnail (as a string) for a file path.
+ *
+ * @param string $path Path to file
+ * @param string $size small, medium or large
+ * @param string $root Use this to override the default root path (sandbox/dropbox)
+ * @return string
+ */
+ public function getThumbnail($path, $size = 'small', $root = null) {
+
+ if (is_null($root)) $root = $this->root;
+ $path = str_replace(array('%2F','~'), array('/','%7E'), rawurlencode($path));
+ $response = $this->oauth->fetch($this->api_content_url . 'thumbnails/' . $root . '/' . ltrim($path,'/'),array('size' => $size));
+
+ return $response['body'];
+
+ }
+
+ /**
+ * This method is used to generate multipart POST requests for file upload
+ *
+ * @param string $uri
+ * @param array $arguments
+ * @return bool
+ */
+ protected function multipartFetch($uri, $file, $filename) {
+
+ /* random string */
+ $boundary = 'R50hrfBj5JYyfR3vF3wR96GPCC9Fd2q2pVMERvEaOE3D8LZTgLLbRpNwXek3';
+
+ $headers = array(
+ 'Content-Type' => 'multipart/form-data; boundary=' . $boundary,
+ );
+
+ $body="--" . $boundary . "\r\n";
+ $body.="Content-Disposition: form-data; name=file; filename=".rawurldecode($filename)."\r\n";
+ $body.="Content-type: application/octet-stream\r\n";
+ $body.="\r\n";
+ $body.=stream_get_contents($file);
+ $body.="\r\n";
+ $body.="--" . $boundary . "--";
+
+ // Dropbox requires the filename to also be part of the regular arguments, so it becomes
+ // part of the signature.
+ $uri.='?file=' . $filename;
+
+ return $this->oauth->fetch($uri, $body, 'POST', $headers);
+
+ }
+
+
+ /**
+ * Search
+ *
+ * Returns metadata for all files and folders that match the search query.
+ *
+ * @added by: diszo.sasil
+ *
+ * @param string $query
+ * @param string $root Use this to override the default root path (sandbox/dropbox)
+ * @param string $path
+ * @return array
+ */
+ public function search($query = '', $root = null, $path = ''){
+ if (is_null($root)) $root = $this->root;
+ if(!empty($path)){
+ $path = str_replace(array('%2F','~'), array('/','%7E'), rawurlencode($path));
+ }
+ $response = $this->oauth->fetch($this->api_url . 'search/' . $root . '/' . ltrim($path,'/'),array('query' => $query));
+ return json_decode($response['body'],true);
+ }
+
+ /**
+ * Creates and returns a shareable link to files or folders.
+ *
+ * Note: Links created by the /shares API call expire after thirty days.
+ *
+ * @param type $path
+ * @param type $root
+ * @return type
+ */
+ public function share($path, $root = null) {
+ if (is_null($root)) $root = $this->root;
+ $path = str_replace(array('%2F','~'), array('/','%7E'), rawurlencode($path));
+ $response = $this->oauth->fetch($this->api_url. 'shares/'. $root . '/' . ltrim($path, '/'), array(), 'POST');
+ return json_decode($response['body'],true);
+
+ }
+
+ /**
+ * Returns a link directly to a file.
+ * Similar to /shares. The difference is that this bypasses the Dropbox webserver, used to provide a preview of the file, so that you can effectively stream the contents of your media.
+ *
+ * Note: The /media link expires after four hours, allotting enough time to stream files, but not enough to leave a connection open indefinitely.
+ *
+ * @param type $path
+ * @param type $root
+ * @return type
+ */
+ public function media($path, $root = null) {
+
+ if (is_null($root)) $root = $this->root;
+ $path = str_replace(array('%2F','~'), array('/','%7E'), rawurlencode($path));
+ $response = $this->oauth->fetch($this->api_url. 'media/'. $root . '/' . ltrim($path, '/'), array(), 'POST');
+ return json_decode($response['body'],true);
+
+ }
+
+ /**
+ * Creates and returns a copy_ref to a file. This reference string can be used to copy that file to another user's Dropbox by passing it in as the from_copy_ref parameter on /fileops/copy.
+ *
+ * @param type $path
+ * @param type $root
+ * @return type
+ */
+ public function copy_ref($path, $root = null) {
+
+ if (is_null($root)) $root = $this->root;
+ $path = str_replace(array('%2F','~'), array('/','%7E'), rawurlencode($path));
+ $response = $this->oauth->fetch($this->api_url. 'copy_ref/'. $root . '/' . ltrim($path, '/'));
+ return json_decode($response['body'],true);
+
+ }
+
+
+}
diff --git a/apps/files_external/3rdparty/Dropbox/Exception.php b/apps/files_external/3rdparty/Dropbox/Exception.php
new file mode 100644
index 0000000000000000000000000000000000000000..50cbc4c79150e821841cae2cb7383a63d88b2e3b
--- /dev/null
+++ b/apps/files_external/3rdparty/Dropbox/Exception.php
@@ -0,0 +1,15 @@
+<?php
+
+/**
+ * Dropbox base exception
+ *
+ * @package Dropbox
+ * @copyright Copyright (C) 2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/dropbox-php/wiki/License MIT
+ */
+
+/**
+ * Base exception class
+ */
+class Dropbox_Exception extends Exception { }
diff --git a/apps/files_external/3rdparty/Dropbox/Exception/Forbidden.php b/apps/files_external/3rdparty/Dropbox/Exception/Forbidden.php
new file mode 100644
index 0000000000000000000000000000000000000000..5f0378cfc7405f688b1a77075ee62ba7bb18c850
--- /dev/null
+++ b/apps/files_external/3rdparty/Dropbox/Exception/Forbidden.php
@@ -0,0 +1,18 @@
+<?php
+
+/**
+ * Dropbox Forbidden exception
+ *
+ * @package Dropbox
+ * @copyright Copyright (C) 2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/dropbox-php/wiki/License MIT
+ */
+
+/**
+ * This exception is thrown when we receive the 403 forbidden response
+ */
+class Dropbox_Exception_Forbidden extends Dropbox_Exception {
+
+
+}
diff --git a/apps/files_external/3rdparty/Dropbox/Exception/NotFound.php b/apps/files_external/3rdparty/Dropbox/Exception/NotFound.php
new file mode 100644
index 0000000000000000000000000000000000000000..3deaf90d76bc1d6aff5ac0f3671f945c89d33947
--- /dev/null
+++ b/apps/files_external/3rdparty/Dropbox/Exception/NotFound.php
@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * Dropbox Not Found exception
+ *
+ * @package Dropbox
+ * @copyright Copyright (C) 2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/dropbox-php/wiki/License MIT
+ */
+
+/**
+ * This exception is thrown when a non-existant uri is accessed.
+ *
+ * Basically, this exception is used when we get back a 404.
+ */
+class Dropbox_Exception_NotFound extends Dropbox_Exception {
+
+
+}
diff --git a/apps/files_external/3rdparty/Dropbox/Exception/OverQuota.php b/apps/files_external/3rdparty/Dropbox/Exception/OverQuota.php
new file mode 100644
index 0000000000000000000000000000000000000000..86e5425dbd8a150c8fe622806837ce310cafa05e
--- /dev/null
+++ b/apps/files_external/3rdparty/Dropbox/Exception/OverQuota.php
@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * Dropbox Over Quota exception
+ *
+ * @package Dropbox
+ * @copyright Copyright (C) 2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/dropbox-php/wiki/License MIT
+ */
+
+/**
+ * This exception is thrown when the operation required more space than the available quota.
+ *
+ * Basically, this exception is used when we get back a 507.
+ */
+class Dropbox_Exception_OverQuota extends Dropbox_Exception {
+
+
+}
diff --git a/apps/files_external/3rdparty/Dropbox/Exception/RequestToken.php b/apps/files_external/3rdparty/Dropbox/Exception/RequestToken.php
new file mode 100644
index 0000000000000000000000000000000000000000..5b117f2c6b00a99a48305d457586940815cf559e
--- /dev/null
+++ b/apps/files_external/3rdparty/Dropbox/Exception/RequestToken.php
@@ -0,0 +1,18 @@
+<?php
+
+/**
+ * Dropbox RequestToken exception
+ *
+ * @package Dropbox
+ * @copyright Copyright (C) 2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/dropbox-php/wiki/License MIT
+ */
+
+/**
+ * This exception is thrown when an error occured during the request_token process.
+ */
+class Dropbox_Exception_RequestToken extends Dropbox_Exception {
+
+
+}
diff --git a/apps/files_external/3rdparty/Dropbox/LICENSE.txt b/apps/files_external/3rdparty/Dropbox/LICENSE.txt
new file mode 100644
index 0000000000000000000000000000000000000000..cd3512acee6c33f90fcebbcfc778fa0c5c31c146
--- /dev/null
+++ b/apps/files_external/3rdparty/Dropbox/LICENSE.txt
@@ -0,0 +1,19 @@
+Copyright (c) 2010 Rooftop Solutions
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/apps/files_external/3rdparty/Dropbox/OAuth.php b/apps/files_external/3rdparty/Dropbox/OAuth.php
new file mode 100644
index 0000000000000000000000000000000000000000..905cc2da1c6f8e95add3dc0a85b1410d98b952b2
--- /dev/null
+++ b/apps/files_external/3rdparty/Dropbox/OAuth.php
@@ -0,0 +1,151 @@
+<?php
+
+/**
+ * Dropbox OAuth
+ *
+ * @package Dropbox
+ * @copyright Copyright (C) 2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/dropbox-php/wiki/License MIT
+ */
+
+
+/**
+ * This class is an abstract OAuth class.
+ *
+ * It must be extended by classes who wish to provide OAuth functionality
+ * using different libraries.
+ */
+abstract class Dropbox_OAuth {
+
+ /**
+ * After a user has authorized access, dropbox can redirect the user back
+ * to this url.
+ *
+ * @var string
+ */
+ public $authorizeCallbackUrl = null;
+
+ /**
+ * Uri used to fetch request tokens
+ *
+ * @var string
+ */
+ const URI_REQUEST_TOKEN = 'https://api.dropbox.com/1/oauth/request_token';
+
+ /**
+ * Uri used to redirect the user to for authorization.
+ *
+ * @var string
+ */
+ const URI_AUTHORIZE = 'https://www.dropbox.com/1/oauth/authorize';
+
+ /**
+ * Uri used to
+ *
+ * @var string
+ */
+ const URI_ACCESS_TOKEN = 'https://api.dropbox.com/1/oauth/access_token';
+
+ /**
+ * An OAuth request token.
+ *
+ * @var string
+ */
+ protected $oauth_token = null;
+
+ /**
+ * OAuth token secret
+ *
+ * @var string
+ */
+ protected $oauth_token_secret = null;
+
+
+ /**
+ * Constructor
+ *
+ * @param string $consumerKey
+ * @param string $consumerSecret
+ */
+ abstract public function __construct($consumerKey, $consumerSecret);
+
+ /**
+ * Sets the request token and secret.
+ *
+ * The tokens can also be passed as an array into the first argument.
+ * The array must have the elements token and token_secret.
+ *
+ * @param string|array $token
+ * @param string $token_secret
+ * @return void
+ */
+ public function setToken($token, $token_secret = null) {
+
+ if (is_array($token)) {
+ $this->oauth_token = $token['token'];
+ $this->oauth_token_secret = $token['token_secret'];
+ } else {
+ $this->oauth_token = $token;
+ $this->oauth_token_secret = $token_secret;
+ }
+
+ }
+
+ /**
+ * Returns the oauth request tokens as an associative array.
+ *
+ * The array will contain the elements 'token' and 'token_secret'.
+ *
+ * @return array
+ */
+ public function getToken() {
+
+ return array(
+ 'token' => $this->oauth_token,
+ 'token_secret' => $this->oauth_token_secret,
+ );
+
+ }
+
+ /**
+ * Returns the authorization url
+ *
+ * @param string $callBack Specify a callback url to automatically redirect the user back
+ * @return string
+ */
+ public function getAuthorizeUrl($callBack = null) {
+
+ // Building the redirect uri
+ $token = $this->getToken();
+ $uri = self::URI_AUTHORIZE . '?oauth_token=' . $token['token'];
+ if ($callBack) $uri.='&oauth_callback=' . $callBack;
+ return $uri;
+ }
+
+ /**
+ * Fetches a secured oauth url and returns the response body.
+ *
+ * @param string $uri
+ * @param mixed $arguments
+ * @param string $method
+ * @param array $httpHeaders
+ * @return string
+ */
+ public abstract function fetch($uri, $arguments = array(), $method = 'GET', $httpHeaders = array());
+
+ /**
+ * Requests the OAuth request token.
+ *
+ * @return array
+ */
+ abstract public function getRequestToken();
+
+ /**
+ * Requests the OAuth access tokens.
+ *
+ * @return array
+ */
+ abstract public function getAccessToken();
+
+}
diff --git a/apps/files_external/3rdparty/Dropbox/OAuth/Consumer/Dropbox.php b/apps/files_external/3rdparty/Dropbox/OAuth/Consumer/Dropbox.php
new file mode 100644
index 0000000000000000000000000000000000000000..204a659de00653ec702cb27fedd7ade19653ddcd
--- /dev/null
+++ b/apps/files_external/3rdparty/Dropbox/OAuth/Consumer/Dropbox.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * HTTP OAuth Consumer
+ *
+ * Adapted from halldirector's code in
+ * http://code.google.com/p/dropbox-php/issues/detail?id=36#c5
+ *
+ * @package Dropbox
+ * @copyright Copyright (C) 2011 Joe Constant / halldirector. All rights reserved.
+ * @author Joe Constant / halldirector
+ * @license http://code.google.com/p/dropbox-php/wiki/License MIT
+ */
+
+require_once 'HTTP/OAuth.php';
+require_once 'HTTP/OAuth/Consumer.php';
+
+/*
+ * This class is to help work around aomw ssl issues.
+ */
+class Dropbox_OAuth_Consumer_Dropbox extends HTTP_OAuth_Consumer
+{
+ public function getOAuthConsumerRequest()
+ {
+ if (!$this->consumerRequest instanceof HTTP_OAuth_Consumer_Request) {
+ $this->consumerRequest = new HTTP_OAuth_Consumer_Request;
+ }
+
+ // TODO: Change this and add in code to validate the SSL cert.
+ // see https://github.com/bagder/curl/blob/master/lib/mk-ca-bundle.pl
+ $this->consumerRequest->setConfig(array(
+ 'ssl_verify_peer' => false,
+ 'ssl_verify_host' => false
+ ));
+
+ return $this->consumerRequest;
+ }
+}
diff --git a/apps/files_external/3rdparty/Dropbox/OAuth/Curl.php b/apps/files_external/3rdparty/Dropbox/OAuth/Curl.php
new file mode 100644
index 0000000000000000000000000000000000000000..b75b27bb3637363910676c04fc1fcd8886b3d7cf
--- /dev/null
+++ b/apps/files_external/3rdparty/Dropbox/OAuth/Curl.php
@@ -0,0 +1,282 @@
+<?php
+
+/**
+ * Dropbox OAuth
+ *
+ * @package Dropbox
+ * @copyright Copyright (C) 2011 Daniel Huesken
+ * @author Daniel Huesken (http://www.danielhuesken.de/)
+ * @license MIT
+ */
+
+/**
+ * This class is used to sign all requests to dropbox.
+ *
+ * This specific class uses WordPress WP_Http to authenticate.
+ */
+class Dropbox_OAuth_Curl extends Dropbox_OAuth {
+
+ /**
+ *
+ * @var string ConsumerKey
+ */
+ protected $consumerKey = null;
+ /**
+ *
+ * @var string ConsumerSecret
+ */
+ protected $consumerSecret = null;
+ /**
+ *
+ * @var string ProzessCallBack
+ */
+ public $ProgressFunction = false;
+
+ /**
+ * Constructor
+ *
+ * @param string $consumerKey
+ * @param string $consumerSecret
+ */
+ public function __construct($consumerKey, $consumerSecret) {
+ if (!function_exists('curl_exec'))
+ throw new Dropbox_Exception('The PHP curl functions not available!');
+
+ $this->consumerKey = $consumerKey;
+ $this->consumerSecret = $consumerSecret;
+ }
+
+ /**
+ * Fetches a secured oauth url and returns the response body.
+ *
+ * @param string $uri
+ * @param mixed $arguments
+ * @param string $method
+ * @param array $httpHeaders
+ * @return string
+ */
+ public function fetch($uri, $arguments = array(), $method = 'GET', $httpHeaders = array()) {
+
+ $uri=str_replace('http://', 'https://', $uri); // all https, upload makes problems if not
+ if (is_string($arguments) and strtoupper($method) == 'POST') {
+ preg_match("/\?file=(.*)$/i", $uri, $matches);
+ if (isset($matches[1])) {
+ $uri = str_replace($matches[0], "", $uri);
+ $filename = $matches[1];
+ $httpHeaders=array_merge($httpHeaders,$this->getOAuthHeader($uri, array("file" => $filename), $method));
+ }
+ } else {
+ $httpHeaders=array_merge($httpHeaders,$this->getOAuthHeader($uri, $arguments, $method));
+ }
+ $ch = curl_init();
+ if (strtoupper($method) == 'POST') {
+ curl_setopt($ch, CURLOPT_URL, $uri);
+ curl_setopt($ch, CURLOPT_POST, true);
+// if (is_array($arguments))
+// $arguments=http_build_query($arguments);
+ curl_setopt($ch, CURLOPT_POSTFIELDS, $arguments);
+// $httpHeaders['Content-Length']=strlen($arguments);
+ } else {
+ curl_setopt($ch, CURLOPT_URL, $uri.'?'.http_build_query($arguments));
+ curl_setopt($ch, CURLOPT_POST, false);
+ }
+ curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+ curl_setopt($ch, CURLOPT_TIMEOUT, 300);
+ curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, true);
+ curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 2);
+// curl_setopt($ch, CURLOPT_CAINFO, "rootca");
+ curl_setopt($ch, CURLOPT_FRESH_CONNECT, true);
+ //Build header
+ $headers = array();
+ foreach ($httpHeaders as $name => $value) {
+ $headers[] = "{$name}: $value";
+ }
+ curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
+ if (!ini_get('safe_mode') && !ini_get('open_basedir'))
+ curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true );
+ if (function_exists($this->ProgressFunction) and defined('CURLOPT_PROGRESSFUNCTION')) {
+ curl_setopt($ch, CURLOPT_NOPROGRESS, false);
+ curl_setopt($ch, CURLOPT_PROGRESSFUNCTION, $this->ProgressFunction);
+ curl_setopt($ch, CURLOPT_BUFFERSIZE, 512);
+ }
+ $response=curl_exec($ch);
+ $errorno=curl_errno($ch);
+ $error=curl_error($ch);
+ $status=curl_getinfo($ch,CURLINFO_HTTP_CODE);
+ curl_close($ch);
+
+
+ if (!empty($errorno))
+ throw new Dropbox_Exception_NotFound('Curl error: ('.$errorno.') '.$error."\n");
+
+ if ($status>=300) {
+ $body = json_decode($response,true);
+ switch ($status) {
+ // Not modified
+ case 304 :
+ return array(
+ 'httpStatus' => 304,
+ 'body' => null,
+ );
+ break;
+ case 403 :
+ throw new Dropbox_Exception_Forbidden('Forbidden.
+ This could mean a bad OAuth request, or a file or folder already existing at the target location.
+ ' . $body["error"] . "\n");
+ case 404 :
+ throw new Dropbox_Exception_NotFound('Resource at uri: ' . $uri . ' could not be found. ' .
+ $body["error"] . "\n");
+ case 507 :
+ throw new Dropbox_Exception_OverQuota('This dropbox is full. ' .
+ $body["error"] . "\n");
+ }
+ if (!empty($body["error"]))
+ throw new Dropbox_Exception_RequestToken('Error: ('.$status.') '.$body["error"]."\n");
+ }
+
+ return array(
+ 'body' => $response,
+ 'httpStatus' => $status
+ );
+ }
+
+ /**
+ * Returns named array with oauth parameters for further use
+ * @return array Array with oauth_ parameters
+ */
+ private function getOAuthBaseParams() {
+ $params['oauth_version'] = '1.0';
+ $params['oauth_signature_method'] = 'HMAC-SHA1';
+
+ $params['oauth_consumer_key'] = $this->consumerKey;
+ $tokens = $this->getToken();
+ if (isset($tokens['token']) && $tokens['token']) {
+ $params['oauth_token'] = $tokens['token'];
+ }
+ $params['oauth_timestamp'] = time();
+ $params['oauth_nonce'] = md5(microtime() . mt_rand());
+ return $params;
+ }
+
+ /**
+ * Creates valid Authorization header for OAuth, based on URI and Params
+ *
+ * @param string $uri
+ * @param array $params
+ * @param string $method GET or POST, standard is GET
+ * @param array $oAuthParams optional, pass your own oauth_params here
+ * @return array Array for request's headers section like
+ * array('Authorization' => 'OAuth ...');
+ */
+ private function getOAuthHeader($uri, $params, $method = 'GET', $oAuthParams = null) {
+ $oAuthParams = $oAuthParams ? $oAuthParams : $this->getOAuthBaseParams();
+
+ // create baseString to encode for the sent parameters
+ $baseString = $method . '&';
+ $baseString .= $this->oauth_urlencode($uri) . "&";
+
+ // OAuth header does not include GET-Parameters
+ $signatureParams = array_merge($params, $oAuthParams);
+
+ // sorting the parameters
+ ksort($signatureParams);
+
+ $encodedParams = array();
+ foreach ($signatureParams as $key => $value) {
+ $encodedParams[] = $this->oauth_urlencode($key) . '=' . $this->oauth_urlencode($value);
+ }
+
+ $baseString .= $this->oauth_urlencode(implode('&', $encodedParams));
+
+ // encode the signature
+ $tokens = $this->getToken();
+ $hash = $this->hash_hmac_sha1($this->consumerSecret.'&'.$tokens['token_secret'], $baseString);
+ $signature = base64_encode($hash);
+
+ // add signature to oAuthParams
+ $oAuthParams['oauth_signature'] = $signature;
+
+ $oAuthEncoded = array();
+ foreach ($oAuthParams as $key => $value) {
+ $oAuthEncoded[] = $key . '="' . $this->oauth_urlencode($value) . '"';
+ }
+
+ return array('Authorization' => 'OAuth ' . implode(', ', $oAuthEncoded));
+ }
+
+ /**
+ * Requests the OAuth request token.
+ *
+ * @return void
+ */
+ public function getRequestToken() {
+ $result = $this->fetch(self::URI_REQUEST_TOKEN, array(), 'POST');
+ if ($result['httpStatus'] == "200") {
+ $tokens = array();
+ parse_str($result['body'], $tokens);
+ $this->setToken($tokens['oauth_token'], $tokens['oauth_token_secret']);
+ return $this->getToken();
+ } else {
+ throw new Dropbox_Exception_RequestToken('We were unable to fetch request tokens. This likely means that your consumer key and/or secret are incorrect.');
+ }
+ }
+
+ /**
+ * Requests the OAuth access tokens.
+ *
+ * This method requires the 'unauthorized' request tokens
+ * and, if successful will set the authorized request tokens.
+ *
+ * @return void
+ */
+ public function getAccessToken() {
+ $result = $this->fetch(self::URI_ACCESS_TOKEN, array(), 'POST');
+ if ($result['httpStatus'] == "200") {
+ $tokens = array();
+ parse_str($result['body'], $tokens);
+ $this->setToken($tokens['oauth_token'], $tokens['oauth_token_secret']);
+ return $this->getToken();
+ } else {
+ throw new Dropbox_Exception_RequestToken('We were unable to fetch request tokens. This likely means that your consumer key and/or secret are incorrect.');
+ }
+ }
+
+ /**
+ * Helper function to properly urlencode parameters.
+ * See http://php.net/manual/en/function.oauth-urlencode.php
+ *
+ * @param string $string
+ * @return string
+ */
+ private function oauth_urlencode($string) {
+ return str_replace('%E7', '~', rawurlencode($string));
+ }
+
+ /**
+ * Hash function for hmac_sha1; uses native function if available.
+ *
+ * @param string $key
+ * @param string $data
+ * @return string
+ */
+ private function hash_hmac_sha1($key, $data) {
+ if (function_exists('hash_hmac') && in_array('sha1', hash_algos())) {
+ return hash_hmac('sha1', $data, $key, true);
+ } else {
+ $blocksize = 64;
+ $hashfunc = 'sha1';
+ if (strlen($key) > $blocksize) {
+ $key = pack('H*', $hashfunc($key));
+ }
+
+ $key = str_pad($key, $blocksize, chr(0x00));
+ $ipad = str_repeat(chr(0x36), $blocksize);
+ $opad = str_repeat(chr(0x5c), $blocksize);
+ $hash = pack('H*', $hashfunc(( $key ^ $opad ) . pack('H*', $hashfunc(($key ^ $ipad) . $data))));
+
+ return $hash;
+ }
+ }
+
+
+}
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/Dropbox/README.md b/apps/files_external/3rdparty/Dropbox/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..54e05db762b723c0722edaa57c13080250cb290c
--- /dev/null
+++ b/apps/files_external/3rdparty/Dropbox/README.md
@@ -0,0 +1,31 @@
+Dropbox-php
+===========
+
+This PHP library allows you to easily integrate dropbox with PHP.
+
+The following PHP extension is required:
+
+* json
+
+The library makes use of OAuth. At the moment you can use either of these libraries:
+
+[PHP OAuth extension](http://pecl.php.net/package/oauth)
+[PEAR's HTTP_OAUTH package](http://pear.php.net/package/http_oauth)
+
+The extension is recommended, but if you can't install php extensions you should go for the pear package.
+Installing
+----------
+
+ pear channel-discover pear.dropbox-php.com
+ pear install dropbox-php/Dropbox-alpha
+
+Documentation
+-------------
+Check out the [documentation](http://www.dropbox-php.com/docs).
+
+Questions?
+----------
+
+[Dropbox-php Mailing list](http://groups.google.com/group/dropbox-php)
+[Official Dropbox developer forum](http://forums.dropbox.com/forum.php?id=5)
+
diff --git a/apps/files_external/3rdparty/Dropbox/autoload.php b/apps/files_external/3rdparty/Dropbox/autoload.php
new file mode 100644
index 0000000000000000000000000000000000000000..5388ea6334a23a3e318a0e967404cafdd8827f47
--- /dev/null
+++ b/apps/files_external/3rdparty/Dropbox/autoload.php
@@ -0,0 +1,29 @@
+<?php
+
+/**
+ * This file registers a new autoload function using spl_autoload_register.
+ *
+ * @package Dropbox
+ * @copyright Copyright (C) 2010 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://code.google.com/p/dropbox-php/wiki/License MIT
+ */
+
+/**
+ * Autoloader function
+ *
+ * @param $className string
+ * @return void
+ */
+function Dropbox_autoload($className) {
+
+ if(strpos($className,'Dropbox_')===0) {
+
+ include dirname(__FILE__) . '/' . str_replace('_','/',substr($className,8)) . '.php';
+
+ }
+
+}
+
+spl_autoload_register('Dropbox_autoload');
+
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/Prods.inc.php b/apps/files_external/3rdparty/irodsphp/prods/src/Prods.inc.php
index e7fa44b34d17e4062a29c35a8b0629bea27c5de4..7e0fafdad83c452b92d459fe476c05f04e7f6517 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/Prods.inc.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/Prods.inc.php
@@ -1,4 +1,3 @@
<?php
require_once("autoload.inc.php");
require_once("ProdsConfig.inc.php");
-?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/ProdsConfig.inc.php b/apps/files_external/3rdparty/irodsphp/prods/src/ProdsConfig.inc.php
index 478c90d631f20c5281eaf342630ef86168f15308..1089932a3e208200e1cd3f017cd1c651ff87e1ac 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/ProdsConfig.inc.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/ProdsConfig.inc.php
@@ -15,5 +15,3 @@ if (file_exists(__DIR__ . "/prods.ini")) {
else {
$GLOBALS['PRODS_CONFIG'] = array();
}
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/ProdsPath.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/ProdsPath.class.php
index be7c6c567882b0e45b71391e3305120331e6ff92..fdf100b77a4ba85fa7c1ad2b18605ba6ee27d2f5 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/ProdsPath.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/ProdsPath.class.php
@@ -279,5 +279,3 @@ abstract class ProdsPath
}
}
-
-?>
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/ProdsQuery.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/ProdsQuery.class.php
index 62469725970100076c712fd0556cb60c23a192b0..5e8dc92d594d8b3ce43767a05dea46c4435f9766 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/ProdsQuery.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/ProdsQuery.class.php
@@ -103,5 +103,3 @@ class ProdsQuery
}
}
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/ProdsRule.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/ProdsRule.class.php
index 42308d9cc35190095f9b637eff2b17f46921a5ee..d14d87ad1aa9aed61948facbf21ae0235c907641 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/ProdsRule.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/ProdsRule.class.php
@@ -58,5 +58,3 @@ class ProdsRule
return $result;
}
}
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/ProdsStreamer.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/ProdsStreamer.class.php
index 27b927bb0331ff4b32306a645b6da74ef366c2de..67ef096c5c5be494099d1d5c368eba49fa918762 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/ProdsStreamer.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/ProdsStreamer.class.php
@@ -432,5 +432,3 @@ stream_wrapper_register('rods', 'ProdsStreamer')
or die ('Failed to register protocol:rods');
stream_wrapper_register('rods+ticket', 'ProdsStreamer')
or die ('Failed to register protocol:rods');
-?>
-
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/RODSAccount.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/RODSAccount.class.php
index f47f85bc238393fbddf2f4dd1cb5b3975c914eb7..ba4c5ad96b053da6bf38001d8398e5f91caaee56 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/RODSAccount.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/RODSAccount.class.php
@@ -199,5 +199,3 @@ class RODSAccount
return $dir->toURI();
}
}
-
-?>
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/RODSConn.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/RODSConn.class.php
index 0498f42cfaa7a43821222ee3b0513d58b043d328..c10f880a5cc435da896b161edc6e531751680788 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/RODSConn.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/RODSConn.class.php
@@ -1611,5 +1611,3 @@ class RODSConn
return $results;
}
}
-
-?>
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/RODSConnManager.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/RODSConnManager.class.php
index 830e01bde8447f97d10a806e589209f939411321..b3e8155da4d60a0927d1fca87da02e8168815826 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/RODSConnManager.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/RODSConnManager.class.php
@@ -77,5 +77,3 @@ class RODSConnManager
}
}
}
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/RODSException.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/RODSException.class.php
index 52eb95bbfb5c3c8f55fa51103b2438f86c9cbd54..97116a102c1ce5e2ae37235b6ce4d4c09de921be 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/RODSException.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/RODSException.class.php
@@ -180,5 +180,3 @@ class RODSException extends Exception
}
}
-
-?>
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/RODSGenQueConds.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/RODSGenQueConds.class.php
index 848f29e85e95c83ad4fc77781f56124f8a066921..4bc10cc549fc4b35e14ef0c385c17ad626e0193c 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/RODSGenQueConds.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/RODSGenQueConds.class.php
@@ -110,5 +110,3 @@ class RODSGenQueConds
return $this->cond;
}
}
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/RODSGenQueResults.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/RODSGenQueResults.class.php
index 41be1069afd8dc3ecea38280b67565b0e05ff72f..899b4f0e3b40a8d987572e90b378c629d3169a9f 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/RODSGenQueResults.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/RODSGenQueResults.class.php
@@ -95,5 +95,3 @@ class RODSGenQueResults
return $this->numrow;
}
}
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/RODSGenQueSelFlds.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/RODSGenQueSelFlds.class.php
index 10a32f6614faecbc424127f592ddad10f9b0ca95..aa391613d07c1e4018b86051b3f85cdf63ae741d 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/RODSGenQueSelFlds.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/RODSGenQueSelFlds.class.php
@@ -156,5 +156,3 @@ class RODSGenQueSelFlds
}
}
-
-?>
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/RODSKeyValPair.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/RODSKeyValPair.class.php
index 31b720cf19cb419f5bcdd810f0292db7c32ca33c..f347f7c988af2fc7235184fe8548ef05f97a0102 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/RODSKeyValPair.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/RODSKeyValPair.class.php
@@ -46,5 +46,3 @@ class RODSKeyValPair
return $new_keyval;
}
}
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/RODSMessage.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/RODSMessage.class.php
index ca3e8bc23a6055ab34e42c5e5d35a781591088c9..243903a42dfe7d3ca02f97e52cd4cf1a8d180cfb 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/RODSMessage.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/RODSMessage.class.php
@@ -181,5 +181,3 @@ class RODSMessage
return $rods_msg->pack();
}
}
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/RODSObjIOOpr.inc.php b/apps/files_external/3rdparty/irodsphp/prods/src/RODSObjIOOpr.inc.php
index 95807d12ea8d3ba89f4b440ef2265be4d3bfcbef..1d367e900bc955ded06eee80e2219c5f9e5bb151 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/RODSObjIOOpr.inc.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/RODSObjIOOpr.inc.php
@@ -17,4 +17,3 @@ define ("RSYNC_OPR", 14);
define ("PHYMV_OPR", 15);
define ("PHYMV_SRC", 16);
define ("PHYMV_DEST", 17);
-?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/RodsAPINum.inc.php b/apps/files_external/3rdparty/irodsphp/prods/src/RodsAPINum.inc.php
index c4e2c031174ecb1589089138cfb6339ca96236d1..258dfcab39d3a3cdc04c8d3197e47055584a3084 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/RodsAPINum.inc.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/RodsAPINum.inc.php
@@ -214,4 +214,3 @@ $GLOBALS['PRODS_API_NUMS_REV'] = array(
'1100' => 'SSL_START_AN',
'1101' => 'SSL_END_AN',
);
-?>
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/RodsConst.inc.php b/apps/files_external/3rdparty/irodsphp/prods/src/RodsConst.inc.php
index 1d51f619197a287eacb0de25bc491ffa57254aad..ecc2f5c2593ddf3f2fbd89163e8bb5d296903284 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/RodsConst.inc.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/RodsConst.inc.php
@@ -4,5 +4,3 @@
// are doing!
define ("ORDER_BY", 0x400);
define ("ORDER_BY_DESC", 0x800);
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/RodsErrorTable.inc.php b/apps/files_external/3rdparty/irodsphp/prods/src/RodsErrorTable.inc.php
index 7c4bb170d4a631a985f6e5f580055fa863799e26..177ca5b12600fb26b51442f33e40529f3f046330 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/RodsErrorTable.inc.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/RodsErrorTable.inc.php
@@ -584,4 +584,3 @@ $GLOBALS['PRODS_ERR_CODES_REV'] = array(
'-993000' => 'PAM_AUTH_PASSWORD_FAILED',
'-994000' => 'PAM_AUTH_PASSWORD_INVALID_TTL',
);
-?>
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/RodsGenQueryKeyWd.inc.php b/apps/files_external/3rdparty/irodsphp/prods/src/RodsGenQueryKeyWd.inc.php
index ff830c6d6aabe1a8da5b35134aaa566f74fb53c6..55ad02e3b82a8e2a915990ab9836a5713ccd0cf3 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/RodsGenQueryKeyWd.inc.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/RodsGenQueryKeyWd.inc.php
@@ -222,4 +222,3 @@ $GLOBALS['PRODS_GENQUE_KEYWD_REV'] = array(
"lastExeTime" => 'RULE_LAST_EXE_TIME_KW',
"exeStatus" => 'RULE_EXE_STATUS_KW',
);
-?>
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/RodsGenQueryNum.inc.php b/apps/files_external/3rdparty/irodsphp/prods/src/RodsGenQueryNum.inc.php
index 82de94095b21787a653129cbc5d22b87b92d692d..a65823ec8778569b0e6b3924e44a769fd8425a54 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/RodsGenQueryNum.inc.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/RodsGenQueryNum.inc.php
@@ -232,4 +232,3 @@ $GLOBALS['PRODS_GENQUE_NUMS_REV'] = array(
'1105' => 'COL_TOKEN_VALUE3',
'1106' => 'COL_TOKEN_COMMENT',
);
-?>
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RODSPacket.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RODSPacket.class.php
index 89040882d20f053bb16e827e45d23a4d84cca0b6..e5cff1f60e3adfbf38eaad58db61126b8890207a 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RODSPacket.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RODSPacket.class.php
@@ -246,5 +246,3 @@ class RODSPacket
}
*/
}
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_BinBytesBuf.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_BinBytesBuf.class.php
index 8cabcd0ae423ccc1dd1d431c99d0618d942d314a..a7598bb7e62938e27ba12f877710c00c39ed3cee 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_BinBytesBuf.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_BinBytesBuf.class.php
@@ -10,5 +10,3 @@ class RP_BinBytesBuf extends RODSPacket
}
}
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_CollInp.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_CollInp.class.php
index b7ad6fd0cad02dc2f4892da951b38146756f091b..05c51cf56c0caaf9e2b3b0ee99e96cc55c6cc1e9 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_CollInp.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_CollInp.class.php
@@ -15,5 +15,3 @@ class RP_CollInp extends RODSPacket
}
}
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_CollOprStat.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_CollOprStat.class.php
index 939d2e3759641a1ba07ec22e0a7bb62dcb60890c..a9140050bc7be3c8c1839a19b218878f1cdc4c7f 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_CollOprStat.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_CollOprStat.class.php
@@ -13,5 +13,3 @@ class RP_CollOprStat extends RODSPacket
}
}
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_DataObjCopyInp.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_DataObjCopyInp.class.php
index c16b3628f5ebd901905de52e9dbc8816462b391f..481ff34a22ab172f55bcfcb49fc6522bb3159c5c 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_DataObjCopyInp.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_DataObjCopyInp.class.php
@@ -15,5 +15,3 @@ class RP_DataObjCopyInp extends RODSPacket
}
}
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_DataObjInp.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_DataObjInp.class.php
index f7a8f939b82d6bfdf5158f7138380e06ae58f777..f6200d1761c6948aa91832e0bc41548d17246a5f 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_DataObjInp.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_DataObjInp.class.php
@@ -18,5 +18,3 @@ class RP_DataObjInp extends RODSPacket
}
}
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_ExecCmdOut.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_ExecCmdOut.class.php
index 55dcb02383d12179e423dc53d5733e573ca5d2fd..a7559e3c2566045233826f56e00e657f7c1b44e9 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_ExecCmdOut.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_ExecCmdOut.class.php
@@ -52,5 +52,3 @@ class RP_ExecCmdOut extends RODSPacket
}
}
}
-
-?>
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_ExecMyRuleInp.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_ExecMyRuleInp.class.php
index 88a62fc2b0c6515de6614f285df0f482f1db2384..2eb5dbd6ff95c461a29f3f12a007030b7818599b 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_ExecMyRuleInp.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_ExecMyRuleInp.class.php
@@ -18,5 +18,3 @@ class RP_ExecMyRuleInp extends RODSPacket
}
}
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_GenQueryInp.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_GenQueryInp.class.php
index 2e1e29a2bfeb440c6572c0f7138c5294c518b9b8..cf4bf3406067408a6ef6738589ea6e17e781b76c 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_GenQueryInp.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_GenQueryInp.class.php
@@ -21,5 +21,3 @@ class RP_GenQueryInp extends RODSPacket
}
}
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_GenQueryOut.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_GenQueryOut.class.php
index e9f31dd5368be60e68382a17add633fb3d1ca11f..afec88c45b16ab4440782601a2f292508164cb73 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_GenQueryOut.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_GenQueryOut.class.php
@@ -18,5 +18,3 @@ class RP_GenQueryOut extends RODSPacket
}
}
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_InxIvalPair.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_InxIvalPair.class.php
index ac56bc93df8cf67a8cd77638c49efd32a732df33..e8af5c9fc5c8f2e4350e390621e1f5087730acfd 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_InxIvalPair.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_InxIvalPair.class.php
@@ -23,5 +23,3 @@ class RP_InxIvalPair extends RODSPacket
}
}
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_InxValPair.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_InxValPair.class.php
index 787d27fd1031f5b6e0dab90573c35324b2205fa6..4a08780f4a3415afca1b3909194f6be10ea86b26 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_InxValPair.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_InxValPair.class.php
@@ -40,5 +40,3 @@ class RP_InxValPair extends RODSPacket
}
}
}
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_KeyValPair.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_KeyValPair.class.php
index 6d8dd12ff1263577a6796e68bcb9371f9b506ea6..905d88bc8a2191000c4b7adebe782c49c19ab1ac 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_KeyValPair.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_KeyValPair.class.php
@@ -43,5 +43,3 @@ class RP_KeyValPair extends RODSPacket
}
}
}
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_MiscSvrInfo.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_MiscSvrInfo.class.php
index 65ee3580e97043dcb0790448327a14b734e79ab6..4f54c9c4e76ded758adbc8ce73284dd81234eb27 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_MiscSvrInfo.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_MiscSvrInfo.class.php
@@ -13,5 +13,3 @@ class RP_MiscSvrInfo extends RODSPacket
}
}
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_ModAVUMetadataInp.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_ModAVUMetadataInp.class.php
index b67b7083d44667f65f751e33228fed76099abdb9..467541734dfd2ff1deaf41421223f3df2d80895e 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_ModAVUMetadataInp.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_ModAVUMetadataInp.class.php
@@ -14,5 +14,3 @@ class RP_ModAVUMetadataInp extends RODSPacket
}
}
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_MsParam.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_MsParam.class.php
index abf9bc471bbf0ecee958e4e5dce2d246f916ca7b..fa5d4fcc3dc690d36cf405f7ebd58445b1cb00c0 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_MsParam.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_MsParam.class.php
@@ -41,5 +41,3 @@ class RP_MsParam extends RODSPacket
}
}
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_MsParamArray.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_MsParamArray.class.php
index b747c098dd21d79fd955ce67690c28f18f8311bb..b664abe62bc69da99855c2fbd1b946f8e4ed2a86 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_MsParamArray.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_MsParamArray.class.php
@@ -17,5 +17,3 @@ class RP_MsParamArray extends RODSPacket
}
}
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_MsgHeader.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_MsgHeader.class.php
index 0249da9a05d2f1406620a5d9a4e33ad639c5e3e2..f1b03f779d13b0703f8a60e73011ece66747d161 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_MsgHeader.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_MsgHeader.class.php
@@ -12,6 +12,3 @@ class RP_MsgHeader extends RODSPacket
}
}
-
-?>
-
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_RHostAddr.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_RHostAddr.class.php
index 28602f3150f4d3e62fe282e5fa4a7d26bbbc8018..2ac70dc22cceb6ec611f31047791d7decf2bc31b 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_RHostAddr.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_RHostAddr.class.php
@@ -11,5 +11,3 @@ class RP_RHostAddr extends RODSPacket
}
}
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_RodsObjStat.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_RodsObjStat.class.php
index 290a4c9a5b0ff5cf0f9409e7362efd615d697e3a..96f427a2de5a2dc2d59be26cfc4eb256ee0fe4bc 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_RodsObjStat.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_RodsObjStat.class.php
@@ -16,5 +16,3 @@ class RP_RodsObjStat extends RODSPacket
}
}
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_STR.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_STR.class.php
index 3f5a91a35d053e023295a8e89882e4ee7bd550e8..af7739988d4f22164452bd2b7bae6fff9cf510b5 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_STR.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_STR.class.php
@@ -10,5 +10,3 @@ class RP_STR extends RODSPacket
}
}
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_SqlResult.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_SqlResult.class.php
index 1950f096f1307a7f553ec2f8abd8b75912985336..e6ee1c3adbb6eb0fc81f3ad506e96dac41e6aab1 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_SqlResult.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_SqlResult.class.php
@@ -11,5 +11,3 @@ class RP_SqlResult extends RODSPacket
}
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_StartupPack.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_StartupPack.class.php
index a411bd7425b01bf759ed0b9474314a08d2db08a7..700fbd34428c03f26c9066a4d065907c121ee16d 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_StartupPack.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_StartupPack.class.php
@@ -14,5 +14,3 @@ class RP_StartupPack extends RODSPacket
}
}
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_TransStat.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_TransStat.class.php
index bb591f01343a0eb2031ddf14a867c2dfa0f72b37..5c962649df0f627efc1949b15fa9be7f709e70bd 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_TransStat.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_TransStat.class.php
@@ -12,5 +12,3 @@ class RP_TransStat extends RODSPacket
}
}
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_Version.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_Version.class.php
index a08cb6cc24c6340206aee7149cf394ae0e81a6bf..9fa9b7d1c3517b7b5d75f99e7c21867a0b2321d0 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_Version.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_Version.class.php
@@ -12,5 +12,3 @@ class RP_Version extends RODSPacket
}
}
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_authRequestOut.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_authRequestOut.class.php
index 9dc87140635980e9f515f8b5fce6569a3d305feb..a702650c0eb4259a7d6a221c63e1483db7c05274 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_authRequestOut.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_authRequestOut.class.php
@@ -10,5 +10,3 @@ class RP_authRequestOut extends RODSPacket
}
}
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_authResponseInp.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_authResponseInp.class.php
index 23d754df0acff8989bacd99fabf0115191d14393..3f9cbc618f7e5087ffdfa2a9fa7a1df97923a2bc 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_authResponseInp.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_authResponseInp.class.php
@@ -10,5 +10,3 @@ class RP_authResponseInp extends RODSPacket
}
}
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_dataObjCloseInp.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_dataObjCloseInp.class.php
index d16e1b3f3a44b4472b76b2d530a8c71c94fdc3c7..d37afe23c9539065240b09b0fb9c466eb1d4e9ad 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_dataObjCloseInp.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_dataObjCloseInp.class.php
@@ -12,5 +12,3 @@ class RP_dataObjCloseInp extends RODSPacket
}
}
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_dataObjReadInp.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_dataObjReadInp.class.php
index 29bd1b68e35577025c0b14cb3ee754b3a1a06175..31b12354714e90907ae2f61a424584c635f7afb8 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_dataObjReadInp.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_dataObjReadInp.class.php
@@ -12,5 +12,3 @@ class RP_dataObjReadInp extends RODSPacket
}
}
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_dataObjWriteInp.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_dataObjWriteInp.class.php
index 5327d7a8932a9daec965efcf4e4f5cb63f51b311..175b7e834029c6d9260fe14e946d80f8479eb528 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_dataObjWriteInp.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_dataObjWriteInp.class.php
@@ -12,5 +12,3 @@ class RP_dataObjWriteInp extends RODSPacket
}
}
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_fileLseekInp.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_fileLseekInp.class.php
index e28a7b3b49870fd96c45375d5343a73218200855..83b77f4704fce5d802c57e0ab7e8ad8abc987436 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_fileLseekInp.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_fileLseekInp.class.php
@@ -12,5 +12,3 @@ class RP_fileLseekInp extends RODSPacket
}
}
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_fileLseekOut.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_fileLseekOut.class.php
index cf01741bea605e0de73404a94dafe21850320127..45811e7ca68e8c2ef1e39ddfd25682ef5ed419b2 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_fileLseekOut.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_fileLseekOut.class.php
@@ -11,5 +11,3 @@ class RP_fileLseekOut extends RODSPacket
}
}
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_getTempPasswordOut.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_getTempPasswordOut.class.php
index ba073e979398e85e6359dff6d39b72a34348bc29..29c1001df68c27dbd47ec7117602f63a8be1cc69 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_getTempPasswordOut.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_getTempPasswordOut.class.php
@@ -10,5 +10,3 @@ class RP_getTempPasswordOut extends RODSPacket
}
}
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_pamAuthRequestInp.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_pamAuthRequestInp.class.php
index 0bbc2334a827738875ed43033d0247bd01714bce..e42ac918d459d44b1b529cc33cb019c2c8696125 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_pamAuthRequestInp.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_pamAuthRequestInp.class.php
@@ -10,4 +10,3 @@ class RP_pamAuthRequestInp extends RODSPacket
}
}
-?>
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_pamAuthRequestOut.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_pamAuthRequestOut.class.php
index 01959954c97f6c5c0e186f25614a37289b9b52cf..b3ec13065569a48d9cfaacf29a08952257fb70ee 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_pamAuthRequestOut.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_pamAuthRequestOut.class.php
@@ -10,4 +10,3 @@ class RP_pamAuthRequestOut extends RODSPacket
}
}
-?>
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_sslEndInp.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_sslEndInp.class.php
index 530f304860442b04aaf180ca23275d24d496232f..26470378a7df6052921bcde2e5e7c279c2594ad7 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_sslEndInp.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_sslEndInp.class.php
@@ -10,4 +10,3 @@ class RP_sslEndInp extends RODSPacket
}
}
-?>
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_sslStartInp.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_sslStartInp.class.php
index 03c8365898e698671b4237f10eb147b434447eb5..a23756e78601cdee8eba1b51aaede158b5443f1b 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_sslStartInp.class.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_sslStartInp.class.php
@@ -10,4 +10,3 @@ class RP_sslStartInp extends RODSPacket
}
}
-?>
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/setRodsAPINum.php b/apps/files_external/3rdparty/irodsphp/prods/src/setRodsAPINum.php
index 382a85c051e0866bfb53bcf42a51d4ea97bb62e1..98c1f6cabdfcb18f41a10684dad686d9b11dca7a 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/setRodsAPINum.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/setRodsAPINum.php
@@ -66,5 +66,3 @@ $outputstr = $outputstr . ");\n";
$outputstr = $outputstr . "?>\n";
file_put_contents($prods_api_num_file, $outputstr);
-
-?>
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/setRodsErrorCodes.php b/apps/files_external/3rdparty/irodsphp/prods/src/setRodsErrorCodes.php
index d5c4377384525434aa7e0e42db41bbfe0f1bb841..142b4af57020e47f50661ef4890523ed880a4f2f 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/setRodsErrorCodes.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/setRodsErrorCodes.php
@@ -71,5 +71,3 @@ $outputstr = $outputstr . ");\n";
$outputstr = $outputstr . "?>\n";
file_put_contents($prods_error_table_file, $outputstr);
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/setRodsGenQueryKeyWd.php b/apps/files_external/3rdparty/irodsphp/prods/src/setRodsGenQueryKeyWd.php
index 4372a849aac0703523a714795572d995dad19d08..5a5968d25af99bd62a510b71876c575badd46dfa 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/setRodsGenQueryKeyWd.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/setRodsGenQueryKeyWd.php
@@ -69,5 +69,3 @@ $outputstr = $outputstr . ");\n";
$outputstr = $outputstr . "?>\n";
file_put_contents($prods_genque_keywd_file, $outputstr);
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/setRodsGenQueryNum.php b/apps/files_external/3rdparty/irodsphp/prods/src/setRodsGenQueryNum.php
index 03fa051f092a4ef70c18484b8e0092eec151e0ca..0be297826e642dfa234e0c654e20fd57696963f5 100644
--- a/apps/files_external/3rdparty/irodsphp/prods/src/setRodsGenQueryNum.php
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/setRodsGenQueryNum.php
@@ -59,5 +59,3 @@ $outputstr = $outputstr . ");\n";
$outputstr = $outputstr . "?>\n";
file_put_contents($prods_genque_num_file, $outputstr);
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/smb4php/smb.php b/apps/files_external/3rdparty/smb4php/smb.php
new file mode 100644
index 0000000000000000000000000000000000000000..e7d1dfa09fec9ba8f42c3ba1f0290191231fd472
--- /dev/null
+++ b/apps/files_external/3rdparty/smb4php/smb.php
@@ -0,0 +1,484 @@
+<?php
+###################################################################
+# smb.php
+# This class implements a SMB stream wrapper based on 'smbclient'
+#
+# Date: lun oct 22 10:35:35 CEST 2007
+#
+# Homepage: http://www.phpclasses.org/smb4php
+#
+# Copyright (c) 2007 Victor M. Varela <vmvarela@gmail.com>
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program 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 General Public License for more details.
+#
+###################################################################
+
+define ('SMB4PHP_VERSION', '0.8');
+
+###################################################################
+# CONFIGURATION SECTION - Change for your needs
+###################################################################
+
+define ('SMB4PHP_SMBCLIENT', 'smbclient');
+define ('SMB4PHP_SMBOPTIONS', 'TCP_NODELAY IPTOS_LOWDELAY SO_KEEPALIVE SO_RCVBUF=8192 SO_SNDBUF=8192');
+define ('SMB4PHP_AUTHMODE', 'arg'); # set to 'env' to use USER enviroment variable
+
+###################################################################
+# SMB - commands that does not need an instance
+###################################################################
+
+$GLOBALS['__smb_cache'] = array ('stat' => array (), 'dir' => array ());
+
+class smb {
+
+ function parse_url ($url) {
+ $pu = parse_url (trim($url));
+ foreach (array ('domain', 'user', 'pass', 'host', 'port', 'path') as $i) {
+ if (! isset($pu[$i])) {
+ $pu[$i] = '';
+ }
+ }
+ if (count ($userdomain = explode (';', urldecode ($pu['user']))) > 1) {
+ @list ($pu['domain'], $pu['user']) = $userdomain;
+ }
+ $path = preg_replace (array ('/^\//', '/\/$/'), '', urldecode ($pu['path']));
+ list ($pu['share'], $pu['path']) = (preg_match ('/^([^\/]+)\/(.*)/', $path, $regs))
+ ? array ($regs[1], preg_replace ('/\//', '\\', $regs[2]))
+ : array ($path, '');
+ $pu['type'] = $pu['path'] ? 'path' : ($pu['share'] ? 'share' : ($pu['host'] ? 'host' : '**error**'));
+ if (! ($pu['port'] = intval(@$pu['port']))) {
+ $pu['port'] = 139;
+ }
+
+ // decode user and password
+ $pu['user'] = urldecode($pu['user']);
+ $pu['pass'] = urldecode($pu['pass']);
+ return $pu;
+ }
+
+
+ function look ($purl) {
+ return smb::client ('-L ' . escapeshellarg ($purl['host']), $purl);
+ }
+
+
+ function execute ($command, $purl) {
+ return smb::client ('-d 0 '
+ . escapeshellarg ('//' . $purl['host'] . '/' . $purl['share'])
+ . ' -c ' . escapeshellarg ($command), $purl
+ );
+ }
+
+ function client ($params, $purl) {
+
+ static $regexp = array (
+ '^added interface ip=(.*) bcast=(.*) nmask=(.*)$' => 'skip',
+ 'Anonymous login successful' => 'skip',
+ '^Domain=\[(.*)\] OS=\[(.*)\] Server=\[(.*)\]$' => 'skip',
+ '^\tSharename[ ]+Type[ ]+Comment$' => 'shares',
+ '^\t---------[ ]+----[ ]+-------$' => 'skip',
+ '^\tServer [ ]+Comment$' => 'servers',
+ '^\t---------[ ]+-------$' => 'skip',
+ '^\tWorkgroup[ ]+Master$' => 'workg',
+ '^\t(.*)[ ]+(Disk|IPC)[ ]+IPC.*$' => 'skip',
+ '^\tIPC\\\$(.*)[ ]+IPC' => 'skip',
+ '^\t(.*)[ ]+(Disk)[ ]+(.*)$' => 'share',
+ '^\t(.*)[ ]+(Printer)[ ]+(.*)$' => 'skip',
+ '([0-9]+) blocks of size ([0-9]+)\. ([0-9]+) blocks available' => 'skip',
+ 'Got a positive name query response from ' => 'skip',
+ '^(session setup failed): (.*)$' => 'error',
+ '^(.*): ERRSRV - ERRbadpw' => 'error',
+ '^Error returning browse list: (.*)$' => 'error',
+ '^tree connect failed: (.*)$' => 'error',
+ '^(Connection to .* failed)(.*)$' => 'error-connect',
+ '^NT_STATUS_(.*) ' => 'error',
+ '^NT_STATUS_(.*)\$' => 'error',
+ 'ERRDOS - ERRbadpath \((.*).\)' => 'error',
+ 'cd (.*): (.*)$' => 'error',
+ '^cd (.*): NT_STATUS_(.*)' => 'error',
+ '^\t(.*)$' => 'srvorwg',
+ '^([0-9]+)[ ]+([0-9]+)[ ]+(.*)$' => 'skip',
+ '^Job ([0-9]+) cancelled' => 'skip',
+ '^[ ]+(.*)[ ]+([0-9]+)[ ]+(Mon|Tue|Wed|Thu|Fri|Sat|Sun)[ ](Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)[ ]+([0-9]+)[ ]+([0-9]{2}:[0-9]{2}:[0-9]{2})[ ]([0-9]{4})$' => 'files',
+ '^message start: ERRSRV - (ERRmsgoff)' => 'error'
+ );
+
+ if (SMB4PHP_AUTHMODE == 'env') {
+ putenv("USER={$purl['user']}%{$purl['pass']}");
+ $auth = '';
+ } else {
+ $auth = ($purl['user'] <> '' ? (' -U ' . escapeshellarg ($purl['user'] . '%' . $purl['pass'])) : '');
+ }
+ if ($purl['domain'] <> '') {
+ $auth .= ' -W ' . escapeshellarg ($purl['domain']);
+ }
+ $port = ($purl['port'] <> 139 ? ' -p ' . escapeshellarg ($purl['port']) : '');
+ $options = '-O ' . escapeshellarg(SMB4PHP_SMBOPTIONS);
+
+ // this put env is necessary to read the output of smbclient correctly
+ $old_locale = getenv('LC_ALL');
+ putenv('LC_ALL=en_US.UTF-8');
+ $output = popen (SMB4PHP_SMBCLIENT." -N {$auth} {$options} {$port} {$options} {$params} 2>/dev/null", 'r');
+ $info = array ();
+ $info['info']= array ();
+ $mode = '';
+ while ($line = fgets ($output, 4096)) {
+ list ($tag, $regs, $i) = array ('skip', array (), array ());
+ reset ($regexp);
+ foreach ($regexp as $r => $t) if (preg_match ('/'.$r.'/', $line, $regs)) {
+ $tag = $t;
+ break;
+ }
+ switch ($tag) {
+ case 'skip': continue;
+ case 'shares': $mode = 'shares'; break;
+ case 'servers': $mode = 'servers'; break;
+ case 'workg': $mode = 'workgroups'; break;
+ case 'share':
+ list($name, $type) = array (
+ trim(substr($line, 1, 15)),
+ trim(strtolower(substr($line, 17, 10)))
+ );
+ $i = ($type <> 'disk' && preg_match('/^(.*) Disk/', $line, $regs))
+ ? array(trim($regs[1]), 'disk')
+ : array($name, 'disk');
+ break;
+ case 'srvorwg':
+ list ($name, $master) = array (
+ strtolower(trim(substr($line,1,21))),
+ strtolower(trim(substr($line, 22)))
+ );
+ $i = ($mode == 'servers') ? array ($name, "server") : array ($name, "workgroup", $master);
+ break;
+ case 'files':
+ list ($attr, $name) = preg_match ("/^(.*)[ ]+([D|A|H|S|R]+)$/", trim ($regs[1]), $regs2)
+ ? array (trim ($regs2[2]), trim ($regs2[1]))
+ : array ('', trim ($regs[1]));
+ list ($his, $im) = array (
+ explode(':', $regs[6]), 1 + strpos("JanFebMarAprMayJunJulAugSepOctNovDec", $regs[4]) / 3);
+ $i = ($name <> '.' && $name <> '..')
+ ? array (
+ $name,
+ (strpos($attr,'D') === FALSE) ? 'file' : 'folder',
+ 'attr' => $attr,
+ 'size' => intval($regs[2]),
+ 'time' => mktime ($his[0], $his[1], $his[2], $im, $regs[5], $regs[7])
+ )
+ : array();
+ break;
+ case 'error':
+ if(substr($regs[0],0,22)=='NT_STATUS_NO_SUCH_FILE'){
+ return false;
+ }elseif(substr($regs[0],0,31)=='NT_STATUS_OBJECT_NAME_COLLISION'){
+ return false;
+ }elseif(substr($regs[0],0,31)=='NT_STATUS_OBJECT_PATH_NOT_FOUND'){
+ return false;
+ }elseif(substr($regs[0],0,29)=='NT_STATUS_FILE_IS_A_DIRECTORY'){
+ return false;
+ }
+ trigger_error($regs[0].' params('.$params.')', E_USER_ERROR);
+ case 'error-connect':
+ return false;
+ }
+ if ($i) switch ($i[1]) {
+ case 'file':
+ case 'folder': $info['info'][$i[0]] = $i;
+ case 'disk':
+ case 'server':
+ case 'workgroup': $info[$i[1]][] = $i[0];
+ }
+ }
+ pclose($output);
+
+
+ // restore previous locale
+ if ($old_locale===false) {
+ putenv('LC_ALL');
+ } else {
+ putenv('LC_ALL='.$old_locale);
+ }
+
+ return $info;
+ }
+
+
+ # stats
+
+ function url_stat ($url, $flags = STREAM_URL_STAT_LINK) {
+ if ($s = smb::getstatcache($url)) {
+ return $s;
+ }
+ list ($stat, $pu) = array (false, smb::parse_url ($url));
+ switch ($pu['type']) {
+ case 'host':
+ if ($o = smb::look ($pu))
+ $stat = stat ("/tmp");
+ else
+ trigger_error ("url_stat(): list failed for host '{$pu['host']}'", E_USER_WARNING);
+ break;
+ case 'share':
+ if ($o = smb::look ($pu)) {
+ $found = FALSE;
+ $lshare = strtolower ($pu['share']); # fix by Eric Leung
+ foreach ($o['disk'] as $s) if ($lshare == strtolower($s)) {
+ $found = TRUE;
+ $stat = stat ("/tmp");
+ break;
+ }
+ if (! $found)
+ trigger_error ("url_stat(): disk resource '{$lshare}' not found in '{$pu['host']}'", E_USER_WARNING);
+ }
+ break;
+ case 'path':
+ if ($o = smb::execute ('dir "'.$pu['path'].'"', $pu)) {
+ $p = explode('\\', $pu['path']);
+ $name = $p[count($p)-1];
+ if (isset ($o['info'][$name])) {
+ $stat = smb::addstatcache ($url, $o['info'][$name]);
+ } else {
+ trigger_error ("url_stat(): path '{$pu['path']}' not found", E_USER_WARNING);
+ }
+ } else {
+ return false;
+// trigger_error ("url_stat(): dir failed for path '{$pu['path']}'", E_USER_WARNING);
+ }
+ break;
+ default: trigger_error ('error in URL', E_USER_ERROR);
+ }
+ return $stat;
+ }
+
+ function addstatcache ($url, $info) {
+ $url = str_replace('//', '/', $url);
+ $url = rtrim($url, '/');
+ global $__smb_cache;
+ $is_file = (strpos ($info['attr'],'D') === FALSE);
+ $s = ($is_file) ? stat ('/etc/passwd') : stat ('/tmp');
+ $s[7] = $s['size'] = $info['size'];
+ $s[8] = $s[9] = $s[10] = $s['atime'] = $s['mtime'] = $s['ctime'] = $info['time'];
+ return $__smb_cache['stat'][$url] = $s;
+ }
+
+ function getstatcache ($url) {
+ $url = str_replace('//', '/', $url);
+ $url = rtrim($url, '/');
+ global $__smb_cache;
+ return isset ($__smb_cache['stat'][$url]) ? $__smb_cache['stat'][$url] : FALSE;
+ }
+
+ function clearstatcache ($url='') {
+ $url = str_replace('//', '/', $url);
+ $url = rtrim($url, '/');
+ global $__smb_cache;
+ if ($url == '') $__smb_cache['stat'] = array (); else unset ($__smb_cache['stat'][$url]);
+ }
+
+
+ # commands
+
+ function unlink ($url) {
+ $pu = smb::parse_url($url);
+ if ($pu['type'] <> 'path') trigger_error('unlink(): error in URL', E_USER_ERROR);
+ smb::clearstatcache ($url);
+ smb_stream_wrapper::cleardircache (dirname($url));
+ return smb::execute ('del "'.$pu['path'].'"', $pu);
+ }
+
+ function rename ($url_from, $url_to) {
+ list ($from, $to) = array (smb::parse_url($url_from), smb::parse_url($url_to));
+ if ($from['host'] <> $to['host'] ||
+ $from['share'] <> $to['share'] ||
+ $from['user'] <> $to['user'] ||
+ $from['pass'] <> $to['pass'] ||
+ $from['domain'] <> $to['domain']) {
+ trigger_error('rename(): FROM & TO must be in same server-share-user-pass-domain', E_USER_ERROR);
+ }
+ if ($from['type'] <> 'path' || $to['type'] <> 'path') {
+ trigger_error('rename(): error in URL', E_USER_ERROR);
+ }
+ smb::clearstatcache ($url_from);
+ return smb::execute ('rename "'.$from['path'].'" "'.$to['path'].'"', $to);
+ }
+
+ function mkdir ($url, $mode, $options) {
+ $pu = smb::parse_url($url);
+ if ($pu['type'] <> 'path') trigger_error('mkdir(): error in URL', E_USER_ERROR);
+ return smb::execute ('mkdir "'.$pu['path'].'"', $pu)!==false;
+ }
+
+ function rmdir ($url) {
+ $pu = smb::parse_url($url);
+ if ($pu['type'] <> 'path') trigger_error('rmdir(): error in URL', E_USER_ERROR);
+ smb::clearstatcache ($url);
+ smb_stream_wrapper::cleardircache (dirname($url));
+ return smb::execute ('rmdir "'.$pu['path'].'"', $pu)!==false;
+ }
+
+}
+
+###################################################################
+# SMB_STREAM_WRAPPER - class to be registered for smb:// URLs
+###################################################################
+
+class smb_stream_wrapper extends smb {
+
+ # variables
+
+ private $stream, $url, $parsed_url = array (), $mode, $tmpfile;
+ private $need_flush = FALSE;
+ private $dir = array (), $dir_index = -1;
+
+
+ # directories
+
+ function dir_opendir ($url, $options) {
+ if ($d = $this->getdircache ($url)) {
+ $this->dir = $d;
+ $this->dir_index = 0;
+ return TRUE;
+ }
+ $pu = smb::parse_url ($url);
+ switch ($pu['type']) {
+ case 'host':
+ if ($o = smb::look ($pu)) {
+ $this->dir = $o['disk'];
+ $this->dir_index = 0;
+ } else {
+ trigger_error ("dir_opendir(): list failed for host '{$pu['host']}'", E_USER_WARNING);
+ return false;
+ }
+ break;
+ case 'share':
+ case 'path':
+ if (is_array($o = smb::execute ('dir "'.$pu['path'].'\*"', $pu))) {
+ $this->dir = array_keys($o['info']);
+ $this->dir_index = 0;
+ $this->adddircache ($url, $this->dir);
+ if(substr($url,-1,1)=='/'){
+ $url=substr($url,0,-1);
+ }
+ foreach ($o['info'] as $name => $info) {
+ smb::addstatcache($url . '/' . $name, $info);
+ }
+ } else {
+ trigger_error ("dir_opendir(): dir failed for path '".$pu['path']."'", E_USER_WARNING);
+ return false;
+ }
+ break;
+ default:
+ trigger_error ('dir_opendir(): error in URL', E_USER_ERROR);
+ return false;
+ }
+ return TRUE;
+ }
+
+ function dir_readdir () {
+ return ($this->dir_index < count($this->dir)) ? $this->dir[$this->dir_index++] : FALSE;
+ }
+
+ function dir_rewinddir () { $this->dir_index = 0; }
+
+ function dir_closedir () { $this->dir = array(); $this->dir_index = -1; return TRUE; }
+
+
+ # cache
+
+ function adddircache ($url, $content) {
+ $url = str_replace('//', '/', $url);
+ $url = rtrim($url, '/');
+ global $__smb_cache;
+ return $__smb_cache['dir'][$url] = $content;
+ }
+
+ function getdircache ($url) {
+ $url = str_replace('//', '/', $url);
+ $url = rtrim($url, '/');
+ global $__smb_cache;
+ return isset ($__smb_cache['dir'][$url]) ? $__smb_cache['dir'][$url] : FALSE;
+ }
+
+ function cleardircache ($url='') {
+ $url = str_replace('//', '/', $url);
+ $url = rtrim($url, '/');
+ global $__smb_cache;
+ if ($url == ''){
+ $__smb_cache['dir'] = array ();
+ }else{
+ unset ($__smb_cache['dir'][$url]);
+ }
+ }
+
+
+ # streams
+
+ function stream_open ($url, $mode, $options, $opened_path) {
+ $this->url = $url;
+ $this->mode = $mode;
+ $this->parsed_url = $pu = smb::parse_url($url);
+ if ($pu['type'] <> 'path') trigger_error('stream_open(): error in URL', E_USER_ERROR);
+ switch ($mode) {
+ case 'r':
+ case 'r+':
+ case 'rb':
+ case 'a':
+ case 'a+': $this->tmpfile = tempnam('/tmp', 'smb.down.');
+ smb::execute ('get "'.$pu['path'].'" "'.$this->tmpfile.'"', $pu);
+ break;
+ case 'w':
+ case 'w+':
+ case 'wb':
+ case 'x':
+ case 'x+': $this->cleardircache();
+ $this->tmpfile = tempnam('/tmp', 'smb.up.');
+ $this->need_flush=true;
+ }
+ $this->stream = fopen ($this->tmpfile, $mode);
+ return TRUE;
+ }
+
+ function stream_close () { return fclose($this->stream); }
+
+ function stream_read ($count) { return fread($this->stream, $count); }
+
+ function stream_write ($data) { $this->need_flush = TRUE; return fwrite($this->stream, $data); }
+
+ function stream_eof () { return feof($this->stream); }
+
+ function stream_tell () { return ftell($this->stream); }
+
+ function stream_seek ($offset, $whence=null) { return fseek($this->stream, $offset, $whence); }
+
+ function stream_flush () {
+ if ($this->mode <> 'r' && $this->need_flush) {
+ smb::clearstatcache ($this->url);
+ smb::execute ('put "'.$this->tmpfile.'" "'.$this->parsed_url['path'].'"', $this->parsed_url);
+ $this->need_flush = FALSE;
+ }
+ }
+
+ function stream_stat () { return smb::url_stat ($this->url); }
+
+ function __destruct () {
+ if ($this->tmpfile <> '') {
+ if ($this->need_flush) $this->stream_flush ();
+ unlink ($this->tmpfile);
+
+ }
+ }
+
+}
+
+###################################################################
+# Register 'smb' protocol !
+###################################################################
+
+stream_wrapper_register('smb', 'smb_stream_wrapper')
+ or die ('Failed to register protocol');
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_external/lib/amazons3.php b/apps/files_external/lib/amazons3.php
index 2d7bcd4ac376b5d69f15f0899824e7d38fe6fee3..c08a266b48c23d36e897cae68b319af36d4963df 100644
--- a/apps/files_external/lib/amazons3.php
+++ b/apps/files_external/lib/amazons3.php
@@ -183,17 +183,20 @@ class AmazonS3 extends \OC\Files\Storage\Common {
}
$dh = $this->opendir($path);
- while (($file = readdir($dh)) !== false) {
- if ($file === '.' || $file === '..') {
- continue;
- }
- if ($this->is_dir($path . '/' . $file)) {
- $this->rmdir($path . '/' . $file);
- } else {
- $this->unlink($path . '/' . $file);
+ if(is_resource($dh)) {
+ while (($file = readdir($dh)) !== false) {
+ if ($file === '.' || $file === '..') {
+ continue;
+ }
+
+ if ($this->is_dir($path . '/' . $file)) {
+ $this->rmdir($path . '/' . $file);
+ } else {
+ $this->unlink($path . '/' . $file);
+ }
}
- }
+ }
try {
$result = $this->connection->deleteObject(array(
@@ -464,15 +467,17 @@ class AmazonS3 extends \OC\Files\Storage\Common {
}
$dh = $this->opendir($path1);
- while (($file = readdir($dh)) !== false) {
- if ($file === '.' || $file === '..') {
- continue;
+ if(is_resource($dh)) {
+ while (($file = readdir($dh)) !== false) {
+ if ($file === '.' || $file === '..') {
+ continue;
+ }
+
+ $source = $path1 . '/' . $file;
+ $target = $path2 . '/' . $file;
+ $this->copy($source, $target);
}
-
- $source = $path1 . '/' . $file;
- $target = $path2 . '/' . $file;
- $this->copy($source, $target);
- }
+ }
}
return true;
diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php
index 1935740cd2e4a5748c4e1763cf73093885d26c58..659959e662e439fcbd5ca80878fd482b277b4c5f 100755
--- a/apps/files_external/lib/config.php
+++ b/apps/files_external/lib/config.php
@@ -378,7 +378,7 @@ class OC_Mount_Config {
}
$result = array();
$handle = opendir($path);
- if ( ! $handle) {
+ if(!is_resource($handle)) {
return array();
}
while (false !== ($file = readdir($handle))) {
diff --git a/apps/files_external/lib/dropbox.php b/apps/files_external/lib/dropbox.php
index 081c54788814788ba2d7cd63142dbb08ba103543..b6deab6e5a712e93805cc6ad2f97092e82268b05 100755
--- a/apps/files_external/lib/dropbox.php
+++ b/apps/files_external/lib/dropbox.php
@@ -22,7 +22,7 @@
namespace OC\Files\Storage;
-require_once 'Dropbox/autoload.php';
+require_once __DIR__ . '/../3rdparty/Dropbox/autoload.php';
class Dropbox extends \OC\Files\Storage\Common {
diff --git a/apps/files_external/lib/google.php b/apps/files_external/lib/google.php
index 215bdcda6c2356a645f631eeef2ab10fed746e16..b63b5885de1ac80287c334e3e821b8c8523e7390 100644
--- a/apps/files_external/lib/google.php
+++ b/apps/files_external/lib/google.php
@@ -206,14 +206,16 @@ class Google extends \OC\Files\Storage\Common {
public function rmdir($path) {
if (trim($path, '/') === '') {
$dir = $this->opendir($path);
- while (($file = readdir($dh)) !== false) {
- if (!\OC\Files\Filesystem::isIgnoredDir($file)) {
- if (!$this->unlink($path.'/'.$file)) {
- return false;
+ if(is_resource($dir)) {
+ while (($file = readdir($dir)) !== false) {
+ if (!\OC\Files\Filesystem::isIgnoredDir($file)) {
+ if (!$this->unlink($path.'/'.$file)) {
+ return false;
+ }
}
}
+ closedir($dir);
}
- closedir($dir);
$this->driveFiles = array();
return true;
} else {
diff --git a/apps/files_external/lib/irods.php b/apps/files_external/lib/irods.php
index 7ec3b3a0cfc09f32cfcb02aa289a5f73b7386386..6d4f66e856e1a72f0300fca229c7bbf9658cdf60 100644
--- a/apps/files_external/lib/irods.php
+++ b/apps/files_external/lib/irods.php
@@ -27,12 +27,12 @@ class iRODS extends \OC\Files\Storage\StreamWrapper{
private $auth_mode;
public function __construct($params) {
- if (isset($params['host']) && isset($params['user']) && isset($params['password'])) {
+ if (isset($params['host'])) {
$this->host = $params['host'];
- $this->port = $params['port'];
- $this->user = $params['user'];
- $this->password = $params['password'];
- $this->use_logon_credentials = $params['use_logon_credentials'];
+ $this->port = isset($params['port']) ? $params['port'] : 1247;
+ $this->user = isset($params['user']) ? $params['user'] : '';
+ $this->password = isset($params['password']) ? $params['password'] : '';
+ $this->use_logon_credentials = ($params['use_logon_credentials'] === 'true');
$this->zone = $params['zone'];
$this->auth_mode = isset($params['auth_mode']) ? $params['auth_mode'] : '';
@@ -42,10 +42,11 @@ class iRODS extends \OC\Files\Storage\StreamWrapper{
}
// take user and password from the session
- if ($this->use_logon_credentials && isset($_SESSION['irods-credentials']) )
+ if ($this->use_logon_credentials && \OC::$session->exists('irods-credentials'))
{
- $this->user = $_SESSION['irods-credentials']['uid'];
- $this->password = $_SESSION['irods-credentials']['password'];
+ $params = \OC::$session->get('irods-credentials');
+ $this->user = $params['uid'];
+ $this->password = $params['password'];
}
//create the root folder if necessary
@@ -55,11 +56,11 @@ class iRODS extends \OC\Files\Storage\StreamWrapper{
} else {
throw new \Exception();
}
-
+
}
public static function login( $params ) {
- $_SESSION['irods-credentials'] = $params;
+ \OC::$session->set('irods-credentials', $params);
}
public function getId(){
@@ -137,11 +138,13 @@ class iRODS extends \OC\Files\Storage\StreamWrapper{
private function collectionMTime($path) {
$dh = $this->opendir($path);
$lastCTime = $this->filemtime($path);
- while (($file = readdir($dh)) !== false) {
- if ($file != '.' and $file != '..') {
- $time = $this->filemtime($file);
- if ($time > $lastCTime) {
- $lastCTime = $time;
+ if(is_resource($dh)) {
+ while (($file = readdir($dh)) !== false) {
+ if ($file != '.' and $file != '..') {
+ $time = $this->filemtime($file);
+ if ($time > $lastCTime) {
+ $lastCTime = $time;
+ }
}
}
}
diff --git a/apps/files_external/lib/smb.php b/apps/files_external/lib/smb.php
index dc4e02731f1431ee8a66f6e94457bd7370f0bcf8..ecd4dae04849a19dccd316bb0f11d0e1f9411b78 100644
--- a/apps/files_external/lib/smb.php
+++ b/apps/files_external/lib/smb.php
@@ -8,7 +8,7 @@
namespace OC\Files\Storage;
-require_once 'smb4php/smb.php';
+require_once __DIR__ . '/../3rdparty/smb4php/smb.php';
class SMB extends \OC\Files\Storage\StreamWrapper{
private $password;
@@ -99,11 +99,13 @@ class SMB extends \OC\Files\Storage\StreamWrapper{
private function shareMTime() {
$dh=$this->opendir('');
$lastCtime=0;
- while (($file = readdir($dh)) !== false) {
- if ($file!='.' and $file!='..') {
- $ctime=$this->filemtime($file);
- if ($ctime>$lastCtime) {
- $lastCtime=$ctime;
+ if(is_resource($dh)) {
+ while (($file = readdir($dh)) !== false) {
+ if ($file!='.' and $file!='..') {
+ $ctime=$this->filemtime($file);
+ if ($ctime>$lastCtime) {
+ $lastCtime=$ctime;
+ }
}
}
}
diff --git a/apps/files_sharing/ajax/publicpreview.php b/apps/files_sharing/ajax/publicpreview.php
new file mode 100644
index 0000000000000000000000000000000000000000..41a1c178a48f64243343c41842cdcadfa64c82e7
--- /dev/null
+++ b/apps/files_sharing/ajax/publicpreview.php
@@ -0,0 +1,85 @@
+<?php
+/**
+ * Copyright (c) 2013 Georg Ehrke georg@ownCloud.com
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+if(!\OC_App::isEnabled('files_sharing')){
+ exit;
+}
+
+$file = array_key_exists('file', $_GET) ? (string) urldecode($_GET['file']) : '';
+$maxX = array_key_exists('x', $_GET) ? (int) $_GET['x'] : '36';
+$maxY = array_key_exists('y', $_GET) ? (int) $_GET['y'] : '36';
+$scalingUp = array_key_exists('scalingup', $_GET) ? (bool) $_GET['scalingup'] : true;
+$token = array_key_exists('t', $_GET) ? (string) $_GET['t'] : '';
+
+if($token === ''){
+ \OC_Response::setStatus(400); //400 Bad Request
+ \OC_Log::write('core-preview', 'No token parameter was passed', \OC_Log::DEBUG);
+ exit;
+}
+
+$linkedItem = \OCP\Share::getShareByToken($token);
+if($linkedItem === false || ($linkedItem['item_type'] !== 'file' && $linkedItem['item_type'] !== 'folder')) {
+ \OC_Response::setStatus(404);
+ \OC_Log::write('core-preview', 'Passed token parameter is not valid', \OC_Log::DEBUG);
+ exit;
+}
+
+if(!isset($linkedItem['uid_owner']) || !isset($linkedItem['file_source'])) {
+ \OC_Response::setStatus(500);
+ \OC_Log::write('core-preview', 'Passed token seems to be valid, but it does not contain all necessary information . ("' . $token . '")', \OC_Log::WARN);
+ exit;
+}
+
+$userId = $linkedItem['uid_owner'];
+\OC_Util::setupFS($userId);
+
+$pathId = $linkedItem['file_source'];
+$path = \OC\Files\Filesystem::getPath($pathId);
+$pathInfo = \OC\Files\Filesystem::getFileInfo($path);
+$sharedFile = null;
+
+if($linkedItem['item_type'] === 'folder') {
+ $isvalid = \OC\Files\Filesystem::isValidPath($file);
+ if(!$isvalid) {
+ \OC_Response::setStatus(400); //400 Bad Request
+ \OC_Log::write('core-preview', 'Passed filename is not valid, might be malicious (file:"' . $file . '";ip:"' . $_SERVER['REMOTE_ADDR'] . '")', \OC_Log::WARN);
+ exit;
+ }
+ $sharedFile = \OC\Files\Filesystem::normalizePath($file);
+}
+
+if($linkedItem['item_type'] === 'file') {
+ $parent = $pathInfo['parent'];
+ $path = \OC\Files\Filesystem::getPath($parent);
+ $sharedFile = $pathInfo['name'];
+}
+
+$path = \OC\Files\Filesystem::normalizePath($path, false);
+if(substr($path, 0, 1) === '/') {
+ $path = substr($path, 1);
+}
+
+if($maxX === 0 || $maxY === 0) {
+ \OC_Response::setStatus(400); //400 Bad Request
+ \OC_Log::write('core-preview', 'x and/or y set to 0', \OC_Log::DEBUG);
+ exit;
+}
+
+$root = 'files/' . $path;
+
+try{
+ $preview = new \OC\Preview($userId, $root);
+ $preview->setFile($sharedFile);
+ $preview->setMaxX($maxX);
+ $preview->setMaxY($maxY);
+ $preview->setScalingUp($scalingUp);
+
+ $preview->show();
+} catch (\Exception $e) {
+ \OC_Response::setStatus(500);
+ \OC_Log::write('core', $e->getmessage(), \OC_Log::DEBUG);
+}
\ No newline at end of file
diff --git a/apps/files_sharing/appinfo/routes.php b/apps/files_sharing/appinfo/routes.php
new file mode 100644
index 0000000000000000000000000000000000000000..02815b5eb42919936c19278333517faf562c1cb1
--- /dev/null
+++ b/apps/files_sharing/appinfo/routes.php
@@ -0,0 +1,5 @@
+<?php
+$this->create('core_ajax_public_preview', '/publicpreview.png')->action(
+function() {
+ require_once __DIR__ . '/../ajax/publicpreview.php';
+});
\ No newline at end of file
diff --git a/apps/files_sharing/js/public.js b/apps/files_sharing/js/public.js
index 7ffd5e068730ce53eeb76236a3ff38e647dcbfae..67320b1cdb690878d77eb9c408edbade129b70f9 100644
--- a/apps/files_sharing/js/public.js
+++ b/apps/files_sharing/js/public.js
@@ -7,8 +7,6 @@ function fileDownloadPath(dir, file) {
return url;
}
-var form_data;
-
$(document).ready(function() {
$('#data-upload-form').tipsy({gravity:'ne', fade:true});
@@ -16,7 +14,7 @@ $(document).ready(function() {
if (typeof FileActions !== 'undefined') {
var mimetype = $('#mimetype').val();
// Show file preview if previewer is available, images are already handled by the template
- if (mimetype.substr(0, mimetype.indexOf('/')) != 'image') {
+ if (mimetype.substr(0, mimetype.indexOf('/')) != 'image' && $('.publicpreview').length === 0) {
// Trigger default action if not download TODO
var action = FileActions.getDefault(mimetype, 'file', OC.PERMISSION_READ);
if (typeof action === 'undefined') {
@@ -50,19 +48,23 @@ $(document).ready(function() {
});
}
- // Add some form data to the upload handler
- file_upload_param.formData = {
- MAX_FILE_SIZE: $('#uploadMaxFilesize').val(),
- requesttoken: $('#publicUploadRequestToken').val(),
- dirToken: $('#dirToken').val(),
- appname: 'files_sharing',
- subdir: $('input#dir').val()
- };
+ var file_upload_start = $('#file_upload_start');
+ file_upload_start.on('fileuploadadd', function(e, data) {
+ // Add custom data to the upload handler
+ data.formData = {
+ requesttoken: $('#publicUploadRequestToken').val(),
+ dirToken: $('#dirToken').val(),
+ subdir: $('input#dir').val()
+ };
+ });
- // Add Uploadprogress Wrapper to controls bar
- $('#controls').append($('#additional_controls div#uploadprogresswrapper'));
+ // Add Uploadprogress Wrapper to controls bar
+ $('#controls').append($('#additional_controls div#uploadprogresswrapper'));
- // Cancel upload trigger
- $('#cancel_upload_button').click(Files.cancelUploads);
+ // Cancel upload trigger
+ $('#cancel_upload_button').click(function() {
+ OC.Upload.cancelUploads();
+ procesSelection();
+ });
});
diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js
index 3be89a39fa0c135fac4d3aeeafeb2efc9382dd0f..03ed02f41ef0cf2557ad13013d24beba03d27e9d 100644
--- a/apps/files_sharing/js/share.js
+++ b/apps/files_sharing/js/share.js
@@ -4,7 +4,7 @@ $(document).ready(function() {
if (typeof OC.Share !== 'undefined' && typeof FileActions !== 'undefined' && !disableSharing) {
- $('#fileList').one('fileActionsReady',function(){
+ $('#fileList').on('fileActionsReady',function(){
OC.Share.loadIcons('file');
});
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/es.php b/apps/files_sharing/l10n/es.php
index 1f238d083fbdb07945ba2980ee1266b34f71c460..e163da766f34bd0edcb518bea57cacc48e386ba2 100644
--- a/apps/files_sharing/l10n/es.php
+++ b/apps/files_sharing/l10n/es.php
@@ -3,7 +3,7 @@ $TRANSLATIONS = array(
"The password is wrong. Try again." => "La contraseña introducida es errónea. Inténtelo de nuevo.",
"Password" => "Contraseña",
"Submit" => "Enviar",
-"Sorry, this link doesn’t seem to work anymore." => "Este enlace parece no funcionar más.",
+"Sorry, this link doesn’t seem to work anymore." => "Vaya, este enlace parece que no volverá a funcionar.",
"Reasons might be:" => "Las causas podrían ser:",
"the item was removed" => "el elemento fue eliminado",
"the link expired" => "el enlace expiró",
diff --git a/apps/files_sharing/l10n/es_AR.php b/apps/files_sharing/l10n/es_AR.php
index fed0b1e7b30f9b4ed4520296b79b3ca1f23b14bb..7c9dcb94ac19b4f258195d0a8148b595cae5a1a3 100644
--- a/apps/files_sharing/l10n/es_AR.php
+++ b/apps/files_sharing/l10n/es_AR.php
@@ -3,6 +3,12 @@ $TRANSLATIONS = array(
"The password is wrong. Try again." => "La contraseña no es correcta. Probá de nuevo.",
"Password" => "Contraseña",
"Submit" => "Enviar",
+"Sorry, this link doesn’t seem to work anymore." => "Perdón, este enlace parece no funcionar más.",
+"Reasons might be:" => "Las causas podrían ser:",
+"the item was removed" => "el elemento fue borrado",
+"the link expired" => "el enlace expiró",
+"sharing is disabled" => "compartir está desactivado",
+"For more info, please ask the person who sent this link." => "Para mayor información, contactá a la persona que te mandó el enlace.",
"%s shared the folder %s with you" => "%s compartió la carpeta %s con vos",
"%s shared the file %s with you" => "%s compartió el archivo %s con vos",
"Download" => "Descargar",
diff --git a/apps/files_sharing/l10n/fr.php b/apps/files_sharing/l10n/fr.php
index b263cd87959d17c21270c8e6b03ff3fea41826a1..c97a1db97e4a2170e7e398841928d84a7b6c8e14 100644
--- a/apps/files_sharing/l10n/fr.php
+++ b/apps/files_sharing/l10n/fr.php
@@ -3,6 +3,12 @@ $TRANSLATIONS = array(
"The password is wrong. Try again." => "Le mot de passe est incorrect. Veuillez réessayer.",
"Password" => "Mot de passe",
"Submit" => "Envoyer",
+"Sorry, this link doesn’t seem to work anymore." => "Désolé, mais le lien semble ne plus fonctionner.",
+"Reasons might be:" => "Les raisons peuvent être :",
+"the item was removed" => "l'item a été supprimé",
+"the link expired" => "le lien a expiré",
+"sharing is disabled" => "le partage est désactivé",
+"For more info, please ask the person who sent this link." => "Pour plus d'informations, veuillez contacter la personne qui a envoyé ce lien.",
"%s shared the folder %s with you" => "%s a partagé le répertoire %s avec vous",
"%s shared the file %s with you" => "%s a partagé le fichier %s avec vous",
"Download" => "Télécharger",
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/ko.php b/apps/files_sharing/l10n/ko.php
index f3a94a70979a25676f57553b41abb90b41c48446..f7eab1ac5500c2e6169c33ddeba0f9a0be7a85aa 100644
--- a/apps/files_sharing/l10n/ko.php
+++ b/apps/files_sharing/l10n/ko.php
@@ -1,7 +1,14 @@
<?php
$TRANSLATIONS = array(
+"The password is wrong. Try again." => "비밀번호가 틀립니다. 다시 입력해주세요.",
"Password" => "암호",
"Submit" => "제출",
+"Sorry, this link doesn’t seem to work anymore." => "죄송합니다만 이 링크는 더이상 작동되지 않습니다.",
+"Reasons might be:" => "이유는 다음과 같을 수 있습니다:",
+"the item was removed" => "이 항목은 삭제되었습니다",
+"the link expired" => "링크가 만료되었습니다",
+"sharing is disabled" => "공유가 비활성되었습니다",
+"For more info, please ask the person who sent this link." => "더 자세한 설명은 링크를 보내신 분에게 여쭤보십시오",
"%s shared the folder %s with you" => "%s 님이 폴더 %s을(를) 공유하였습니다",
"%s shared the file %s with you" => "%s 님이 파일 %s을(를) 공유하였습니다",
"Download" => "다운로드",
diff --git a/apps/files_sharing/l10n/lt_LT.php b/apps/files_sharing/l10n/lt_LT.php
index 5d0e58e2fb295dc0023bd474c08b839542cb5aca..90ae6a39a074378f25e6ae33d84cc8079bd58d21 100644
--- a/apps/files_sharing/l10n/lt_LT.php
+++ b/apps/files_sharing/l10n/lt_LT.php
@@ -1,7 +1,14 @@
<?php
$TRANSLATIONS = array(
+"The password is wrong. Try again." => "Netinka slaptažodis: Bandykite dar kartą.",
"Password" => "Slaptažodis",
"Submit" => "Išsaugoti",
+"Sorry, this link doesn’t seem to work anymore." => "Atleiskite, panašu, kad nuoroda yra neveiksni.",
+"Reasons might be:" => "Galimos priežastys:",
+"the item was removed" => "elementas buvo pašalintas",
+"the link expired" => "baigėsi nuorodos galiojimo laikas",
+"sharing is disabled" => "dalinimasis yra išjungtas",
+"For more info, please ask the person who sent this link." => "Dėl tikslesnės informacijos susisiekite su asmeniu atsiuntusiu nuorodą.",
"%s shared the folder %s with you" => "%s pasidalino su jumis %s aplanku",
"%s shared the file %s with you" => "%s pasidalino su jumis %s failu",
"Download" => "Atsisiųsti",
diff --git a/apps/files_sharing/l10n/nn_NO.php b/apps/files_sharing/l10n/nn_NO.php
index bcb6538b09f22b1a6b880ff63f8eec2b56239185..94272943e40b9606c30a56bd7226363d307379cc 100644
--- a/apps/files_sharing/l10n/nn_NO.php
+++ b/apps/files_sharing/l10n/nn_NO.php
@@ -1,7 +1,14 @@
<?php
$TRANSLATIONS = array(
+"The password is wrong. Try again." => "Passordet er gale. Prøv igjen.",
"Password" => "Passord",
"Submit" => "Send",
+"Sorry, this link doesn’t seem to work anymore." => "Orsak, denne lenkja fungerer visst ikkje lenger.",
+"Reasons might be:" => "Moglege grunnar:",
+"the item was removed" => "fila/mappa er fjerna",
+"the link expired" => "lenkja har gått ut på dato",
+"sharing is disabled" => "deling er slått av",
+"For more info, please ask the person who sent this link." => "Spør den som sende deg lenkje om du vil ha meir informasjon.",
"%s shared the folder %s with you" => "%s delte mappa %s med deg",
"%s shared the file %s with you" => "%s delte fila %s med deg",
"Download" => "Last ned",
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/l10n/sq.php b/apps/files_sharing/l10n/sq.php
index ae29e5738ffdd8f67c3ad72b96a497e55cf09907..d2077663e8d7bef61be1aa4a445f6623226492d1 100644
--- a/apps/files_sharing/l10n/sq.php
+++ b/apps/files_sharing/l10n/sq.php
@@ -1,7 +1,14 @@
<?php
$TRANSLATIONS = array(
+"The password is wrong. Try again." => "Kodi është i gabuar. Provojeni përsëri.",
"Password" => "Kodi",
"Submit" => "Parashtro",
+"Sorry, this link doesn’t seem to work anymore." => "Ju kërkojmë ndjesë, kjo lidhje duket sikur nuk punon më.",
+"Reasons might be:" => "Arsyet mund të jenë:",
+"the item was removed" => "elementi është eliminuar",
+"the link expired" => "lidhja ka skaduar",
+"sharing is disabled" => "ndarja është çaktivizuar",
+"For more info, please ask the person who sent this link." => "Për më shumë informacione, ju lutem pyesni personin që iu dërgoi këtë lidhje.",
"%s shared the folder %s with you" => "%s ndau me ju dosjen %s",
"%s shared the file %s with you" => "%s ndau me ju skedarin %s",
"Download" => "Shkarko",
diff --git a/apps/files_sharing/l10n/zh_TW.php b/apps/files_sharing/l10n/zh_TW.php
index 56d67ea7ce71f7c22f1f092e40549d7da4ace4f8..5cc33fd3830c5c7eadeea8b63947e246e2500d54 100644
--- a/apps/files_sharing/l10n/zh_TW.php
+++ b/apps/files_sharing/l10n/zh_TW.php
@@ -1,9 +1,9 @@
<?php
$TRANSLATIONS = array(
-"The password is wrong. Try again." => "請檢查您的密碼並再試一次。",
+"The password is wrong. Try again." => "請檢查您的密碼並再試一次",
"Password" => "密碼",
"Submit" => "送出",
-"Sorry, this link doesn’t seem to work anymore." => "抱歉，這連結看來已經不能用了。",
+"Sorry, this link doesn’t seem to work anymore." => "抱歉，此連結已經失效",
"Reasons might be:" => "可能的原因：",
"the item was removed" => "項目已經移除",
"the link expired" => "連結過期",
diff --git a/apps/files_sharing/lib/cache.php b/apps/files_sharing/lib/cache.php
index 33cd14288998bed926760e3b7baba6953db6f9b0..123268e240afee61b59c179df4166e631a9d6eaa 100644
--- a/apps/files_sharing/lib/cache.php
+++ b/apps/files_sharing/lib/cache.php
@@ -20,6 +20,7 @@
*/
namespace OC\Files\Cache;
+use OCP\Share_Backend_Collection;
/**
* Metadata cache for shared files
@@ -226,7 +227,36 @@ class Shared_Cache extends Cache {
* @return array of file data
*/
public function search($pattern) {
- // TODO
+
+ // normalize pattern
+ $pattern = $this->normalize($pattern);
+
+ $ids = $this->getAll();
+
+ $files = array();
+
+ // divide into 1k chunks
+ $chunks = array_chunk($ids, 1000);
+
+ foreach ($chunks as $chunk) {
+ $placeholders = join(',', array_fill(0, count($chunk), '?'));
+
+ $sql = 'SELECT `fileid`, `storage`, `path`, `parent`, `name`, `mimetype`, `mimepart`, `size`, `mtime`,
+ `encrypted`, `unencrypted_size`, `etag`
+ FROM `*PREFIX*filecache` WHERE `name` LIKE ? AND `fileid` IN (' . $placeholders . ')';
+
+ $result = \OC_DB::executeAudited($sql, array_merge(array($pattern), $chunk));
+
+ while ($row = $result->fetchRow()) {
+ if (substr($row['path'], 0, 6)==='files/') {
+ $row['path'] = substr($row['path'],6); // remove 'files/' from path as it's relative to '/Shared'
+ }
+ $row['mimetype'] = $this->getMimetype($row['mimetype']);
+ $row['mimepart'] = $this->getMimetype($row['mimepart']);
+ $files[] = $row;
+ }
+ }
+ return $files;
}
/**
@@ -244,13 +274,30 @@ class Shared_Cache extends Cache {
}
$mimetype = $this->getMimetypeId($mimetype);
$ids = $this->getAll();
- $placeholders = join(',', array_fill(0, count($ids), '?'));
- $query = \OC_DB::prepare('
- SELECT `fileid`, `storage`, `path`, `parent`, `name`, `mimetype`, `mimepart`, `size`, `mtime`, `encrypted`
- FROM `*PREFIX*filecache` WHERE ' . $where . ' AND `fileid` IN (' . $placeholders . ')'
- );
- $result = $query->execute(array_merge(array($mimetype), $ids));
- return $result->fetchAll();
+
+ $files = array();
+
+ // divide into 1k chunks
+ $chunks = array_chunk($ids, 1000);
+
+ foreach ($chunks as $chunk) {
+ $placeholders = join(',', array_fill(0, count($ids), '?'));
+ $sql = 'SELECT `fileid`, `storage`, `path`, `parent`, `name`, `mimetype`, `mimepart`, `size`, `mtime`,
+ `encrypted`, `unencrypted_size`, `etag`
+ FROM `*PREFIX*filecache` WHERE ' . $where . ' AND `fileid` IN (' . $placeholders . ')';
+
+ $result = \OC_DB::executeAudited($sql, array_merge(array($mimetype), $chunk));
+
+ while ($row = $result->fetchRow()) {
+ if (substr($row['path'], 0, 6)==='files/') {
+ $row['path'] = substr($row['path'],6); // remove 'files/' from path as it's relative to '/Shared'
+ }
+ $row['mimetype'] = $this->getMimetype($row['mimetype']);
+ $row['mimepart'] = $this->getMimetype($row['mimepart']);
+ $files[] = $row;
+ }
+ }
+ return $files;
}
/**
@@ -272,7 +319,20 @@ class Shared_Cache extends Cache {
* @return int[]
*/
public function getAll() {
- return \OCP\Share::getItemsSharedWith('file', \OC_Share_Backend_File::FORMAT_GET_ALL);
+ $ids = \OCP\Share::getItemsSharedWith('file', \OC_Share_Backend_File::FORMAT_GET_ALL);
+ $folderBackend = \OCP\Share::getBackend('folder');
+ if ($folderBackend instanceof Share_Backend_Collection) {
+ foreach ($ids as $file) {
+ /** @var $folderBackend Share_Backend_Collection */
+ $children = $folderBackend->getChildren($file);
+ foreach ($children as $child) {
+ $ids[] = (int)$child['source'];
+ }
+
+ }
+ }
+
+ return $ids;
}
/**
diff --git a/apps/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php
index 7384b094cb04dd74049f4394ce5429622a85c1e2..257da89c84e52e3a68ae27d4282109301b461563 100644
--- a/apps/files_sharing/lib/sharedstorage.php
+++ b/apps/files_sharing/lib/sharedstorage.php
@@ -221,7 +221,8 @@ class Shared extends \OC\Files\Storage\Common {
public function filemtime($path) {
if ($path == '' || $path == '/') {
$mtime = 0;
- if ($dh = $this->opendir($path)) {
+ $dh = $this->opendir($path);
+ if(is_resource($dh)) {
while (($filename = readdir($dh)) !== false) {
$tempmtime = $this->filemtime($filename);
if ($tempmtime > $mtime) {
@@ -362,9 +363,13 @@ class Shared extends \OC\Files\Storage\Common {
case 'xb':
case 'a':
case 'ab':
- if (!$this->isUpdatable($path)) {
- return false;
- }
+ $exists = $this->file_exists($path);
+ if ($exists && !$this->isUpdatable($path)) {
+ return false;
+ }
+ if (!$exists && !$this->isCreatable(dirname($path))) {
+ return false;
+ }
}
$info = array(
'target' => $this->sharedFolder.$path,
diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php
index e9fdf6e4c9514aae2a7f3c27a856b75e86ff4e61..eff38dcc0fd5fce37baf3d39ae3206381d1cfdfa 100644
--- a/apps/files_sharing/public.php
+++ b/apps/files_sharing/public.php
@@ -19,6 +19,20 @@ function fileCmp($a, $b) {
}
}
+function determineIcon($file, $sharingRoot, $sharingToken) {
+ // for folders we simply reuse the files logic
+ if($file['type'] == 'dir') {
+ return \OCA\Files\Helper::determineIcon($file);
+ }
+
+ $relativePath = substr($file['path'], 6);
+ $relativePath = substr($relativePath, strlen($sharingRoot));
+ if($file['isPreviewAvailable']) {
+ return OCP\publicPreview_icon($relativePath, $sharingToken);
+ }
+ return OCP\mimetype_icon($file['mimetype']);
+}
+
if (isset($_GET['t'])) {
$token = $_GET['t'];
$linkItem = OCP\Share::getShareByToken($token);
@@ -133,6 +147,7 @@ if (isset($path)) {
$tmpl->assign('mimetype', \OC\Files\Filesystem::getMimeType($path));
$tmpl->assign('fileTarget', basename($linkItem['file_target']));
$tmpl->assign('dirToken', $linkItem['token']);
+ $tmpl->assign('disableSharing', true);
$allowPublicUploadEnabled = (bool) ($linkItem['permissions'] & OCP\PERMISSION_CREATE);
if (\OCP\App::isEnabled('files_encryption')) {
$allowPublicUploadEnabled = false;
@@ -155,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');
@@ -172,9 +188,11 @@ if (isset($path)) {
} else {
$i['extension'] = '';
}
+ $i['isPreviewAvailable'] = \OC::$server->getPreviewManager()->isMimeSupported($i['mimetype']);
}
$i['directory'] = $getPath;
$i['permissions'] = OCP\PERMISSION_READ;
+ $i['icon'] = determineIcon($i, $basePath, $token);
$files[] = $i;
}
usort($files, "fileCmp");
@@ -190,10 +208,12 @@ if (isset($path)) {
}
$list = new OCP\Template('files', 'part.list', '');
$list->assign('files', $files);
- $list->assign('disableSharing', true);
$list->assign('baseURL', OCP\Util::linkToPublic('files') . $urlLinkIdentifiers . '&path=');
$list->assign('downloadURL',
OCP\Util::linkToPublic('files') . $urlLinkIdentifiers . '&download&path=');
+ $list->assign('isPublic', true);
+ $list->assign('sharingtoken', $token);
+ $list->assign('sharingroot', $basePath);
$breadcrumbNav = new OCP\Template('files', 'part.breadcrumb', '');
$breadcrumbNav->assign('breadcrumb', $breadcrumb);
$breadcrumbNav->assign('baseURL', OCP\Util::linkToPublic('files') . $urlLinkIdentifiers . '&path=');
diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php
index 746a715f3cc3d95d6e523c348399e49ae9ab3684..c164b3ea2b791f214ffd4ce5326dcd08b18a54f1 100644
--- a/apps/files_sharing/templates/public.php
+++ b/apps/files_sharing/templates/public.php
@@ -79,6 +79,10 @@
<source src="<?php p($_['downloadURL']); ?>" type="<?php p($_['mimetype']); ?>" />
</video>
</div>
+ <?php elseif (\OC\Preview::isMimeSupported($_['mimetype'])): ?>
+ <div id="imgframe">
+ <img src="<?php p(OCP\Util::linkToRoute( 'core_ajax_public_preview', array('x' => 500, 'y' => 500, 'file' => urlencode($_['directory_path']), 't' => $_['dirToken']))); ?>" class="publicpreview"/>
+ </div>
<?php else: ?>
<ul id="noPreview">
<li class="error">
diff --git a/apps/files_trashbin/ajax/list.php b/apps/files_trashbin/ajax/list.php
new file mode 100644
index 0000000000000000000000000000000000000000..c9dc13b7840ba650d32cddf8f6afa330e6dabcf9
--- /dev/null
+++ b/apps/files_trashbin/ajax/list.php
@@ -0,0 +1,51 @@
+<?php
+
+// only need filesystem apps
+$RUNTIME_APPTYPES=array('filesystem');
+
+// Init owncloud
+
+
+OCP\JSON::checkLoggedIn();
+
+// Load the files
+$dir = isset( $_GET['dir'] ) ? $_GET['dir'] : '';
+$doBreadcrumb = isset( $_GET['breadcrumb'] ) ? true : false;
+$data = array();
+
+// Make breadcrumb
+if($doBreadcrumb) {
+ $breadcrumb = \OCA\Files_Trashbin\Helper::makeBreadcrumb($dir);
+
+ $breadcrumbNav = new OCP\Template('files_trashbin', 'part.breadcrumb', '');
+ $breadcrumbNav->assign('breadcrumb', $breadcrumb, false);
+ $breadcrumbNav->assign('baseURL', OCP\Util::linkTo('files_trashbin', 'index.php') . '?dir=');
+ $breadcrumbNav->assign('home', OCP\Util::linkTo('files', 'index.php'));
+
+ $data['breadcrumb'] = $breadcrumbNav->fetchPage();
+}
+
+// make filelist
+$files = \OCA\Files_Trashbin\Helper::getTrashFiles($dir);
+
+if ($files === null){
+ header("HTTP/1.0 404 Not Found");
+ exit();
+}
+
+$dirlisting = false;
+if ($dir && $dir !== '/') {
+ $dirlisting = true;
+}
+
+$encodedDir = \OCP\Util::encodePath($dir);
+$list = new OCP\Template('files_trashbin', 'part.list', '');
+$list->assign('files', $files, false);
+$list->assign('baseURL', OCP\Util::linkTo('files_trashbin', 'index.php'). '?dir='.$encodedDir);
+$list->assign('downloadURL', OCP\Util::linkToRoute('download', array('file' => '/')));
+$list->assign('dirlisting', $dirlisting);
+$list->assign('disableDownloadActions', true);
+$data['files'] = $list->fetchPage();
+
+OCP\JSON::success(array('data' => $data));
+
diff --git a/apps/files_trashbin/ajax/preview.php b/apps/files_trashbin/ajax/preview.php
new file mode 100644
index 0000000000000000000000000000000000000000..a0846b051c7217ff270ae88ad9a9258330a1be88
--- /dev/null
+++ b/apps/files_trashbin/ajax/preview.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Copyright (c) 2013 Georg Ehrke georg@ownCloud.com
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+\OC_Util::checkLoggedIn();
+
+if(!\OC_App::isEnabled('files_trashbin')){
+ exit;
+}
+
+$file = array_key_exists('file', $_GET) ? (string) urldecode($_GET['file']) : '';
+$maxX = array_key_exists('x', $_GET) ? (int) $_GET['x'] : '44';
+$maxY = array_key_exists('y', $_GET) ? (int) $_GET['y'] : '44';
+$scalingUp = array_key_exists('scalingup', $_GET) ? (bool) $_GET['scalingup'] : true;
+
+if($file === '') {
+ \OC_Response::setStatus(400); //400 Bad Request
+ \OC_Log::write('core-preview', 'No file parameter was passed', \OC_Log::DEBUG);
+ exit;
+}
+
+if($maxX === 0 || $maxY === 0) {
+ \OC_Response::setStatus(400); //400 Bad Request
+ \OC_Log::write('core-preview', 'x and/or y set to 0', \OC_Log::DEBUG);
+ exit;
+}
+
+try{
+ $preview = new \OC\Preview(\OC_User::getUser(), 'files_trashbin/files');
+ $preview->setFile($file);
+ $preview->setMaxX($maxX);
+ $preview->setMaxY($maxY);
+ $preview->setScalingUp($scalingUp);
+
+ $preview->showPreview();
+}catch(\Exception $e) {
+ \OC_Response::setStatus(500);
+ \OC_Log::write('core', $e->getmessage(), \OC_Log::DEBUG);
+}
\ No newline at end of file
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/appinfo/routes.php b/apps/files_trashbin/appinfo/routes.php
new file mode 100644
index 0000000000000000000000000000000000000000..b1c3f02741edde288e37139dad7a59d9dba63969
--- /dev/null
+++ b/apps/files_trashbin/appinfo/routes.php
@@ -0,0 +1,5 @@
+<?php
+$this->create('core_ajax_trashbin_preview', '/preview.png')->action(
+function() {
+ require_once __DIR__ . '/../ajax/preview.php';
+});
\ No newline at end of file
diff --git a/apps/files_trashbin/index.php b/apps/files_trashbin/index.php
index 27f8407db0641c13d5e803db502b62071f54b6df..d8661e170a58cd69ebde886cb0fa92192969916f 100644
--- a/apps/files_trashbin/index.php
+++ b/apps/files_trashbin/index.php
@@ -10,90 +10,52 @@ OCP\Util::addScript('files_trashbin', 'disableDefaultActions');
OCP\Util::addScript('files', 'fileactions');
$tmpl = new OCP\Template('files_trashbin', 'index', 'user');
-$user = \OCP\User::getUser();
-$view = new OC_Filesystemview('/'.$user.'/files_trashbin/files');
-
OCP\Util::addStyle('files', 'files');
OCP\Util::addScript('files', 'filelist');
+// filelist overrides
+OCP\Util::addScript('files_trashbin', 'filelist');
+OCP\Util::addscript('files', 'files');
$dir = isset($_GET['dir']) ? stripslashes($_GET['dir']) : '';
-$result = array();
-if ($dir) {
- $dirlisting = true;
- $dirContent = $view->opendir($dir);
- $i = 0;
- while(($entryName = readdir($dirContent)) !== false) {
- if (!\OC\Files\Filesystem::isIgnoredDir($entryName)) {
- $pos = strpos($dir.'/', '/', 1);
- $tmp = substr($dir, 0, $pos);
- $pos = strrpos($tmp, '.d');
- $timestamp = substr($tmp, $pos+2);
- $result[] = array(
- 'id' => $entryName,
- 'timestamp' => $timestamp,
- 'mime' => $view->getMimeType($dir.'/'.$entryName),
- 'type' => $view->is_dir($dir.'/'.$entryName) ? 'dir' : 'file',
- 'location' => $dir,
- );
- }
- }
- closedir($dirContent);
-
-} else {
- $dirlisting = false;
- $query = \OC_DB::prepare('SELECT `id`,`location`,`timestamp`,`type`,`mime` FROM `*PREFIX*files_trash` WHERE `user` = ?');
- $result = $query->execute(array($user))->fetchAll();
+$isIE8 = false;
+preg_match('/MSIE (.*?);/', $_SERVER['HTTP_USER_AGENT'], $matches);
+if (count($matches) > 0 && $matches[1] <= 8){
+ $isIE8 = true;
}
-$files = array();
-foreach ($result as $r) {
- $i = array();
- $i['name'] = $r['id'];
- $i['date'] = OCP\Util::formatDate($r['timestamp']);
- $i['timestamp'] = $r['timestamp'];
- $i['mimetype'] = $r['mime'];
- $i['type'] = $r['type'];
- if ($i['type'] === 'file') {
- $fileinfo = pathinfo($r['id']);
- $i['basename'] = $fileinfo['filename'];
- $i['extension'] = isset($fileinfo['extension']) ? ('.'.$fileinfo['extension']) : '';
+// if IE8 and "?dir=path" was specified, reformat the URL to use a hash like "#?dir=path"
+if ($isIE8 && isset($_GET['dir'])){
+ if ($dir === ''){
+ $dir = '/';
}
- $i['directory'] = $r['location'];
- if ($i['directory'] === '/') {
- $i['directory'] = '';
- }
- $i['permissions'] = OCP\PERMISSION_READ;
- $files[] = $i;
+ header('Location: ' . OCP\Util::linkTo('files_trashbin', 'index.php') . '#?dir=' . \OCP\Util::encodePath($dir));
+ exit();
}
-function fileCmp($a, $b) {
- if ($a['type'] === 'dir' and $b['type'] !== 'dir') {
- return -1;
- } elseif ($a['type'] !== 'dir' and $b['type'] === 'dir') {
- return 1;
- } else {
- return strnatcasecmp($a['name'], $b['name']);
- }
+$ajaxLoad = false;
+
+if (!$isIE8){
+ $files = \OCA\Files_Trashbin\Helper::getTrashFiles($dir);
+}
+else{
+ $files = array();
+ $ajaxLoad = true;
}
-usort($files, "fileCmp");
-
-// Make breadcrumb
-$pathtohere = '';
-$breadcrumb = array();
-foreach (explode('/', $dir) as $i) {
- if ($i !== '') {
- if ( preg_match('/^(.+)\.d[0-9]+$/', $i, $match) ) {
- $name = $match[1];
- } else {
- $name = $i;
- }
- $pathtohere .= '/' . $i;
- $breadcrumb[] = array('dir' => $pathtohere, 'name' => $name);
- }
+// Redirect if directory does not exist
+if ($files === null){
+ header('Location: ' . OCP\Util::linkTo('files_trashbin', 'index.php'));
+ exit();
}
+$dirlisting = false;
+if ($dir && $dir !== '/') {
+ $dirlisting = true;
+}
+
+$breadcrumb = \OCA\Files_Trashbin\Helper::makeBreadcrumb($dir);
+
$breadcrumbNav = new OCP\Template('files_trashbin', 'part.breadcrumb', '');
$breadcrumbNav->assign('breadcrumb', $breadcrumb);
$breadcrumbNav->assign('baseURL', OCP\Util::linkTo('files_trashbin', 'index.php') . '?dir=');
@@ -105,7 +67,6 @@ $list->assign('files', $files);
$encodedDir = \OCP\Util::encodePath($dir);
$list->assign('baseURL', OCP\Util::linkTo('files_trashbin', 'index.php'). '?dir='.$encodedDir);
$list->assign('downloadURL', OCP\Util::linkTo('files_trashbin', 'download.php') . '?file='.$encodedDir);
-$list->assign('disableSharing', true);
$list->assign('dirlisting', $dirlisting);
$list->assign('disableDownloadActions', true);
@@ -113,6 +74,8 @@ $tmpl->assign('dirlisting', $dirlisting);
$tmpl->assign('breadcrumb', $breadcrumbNav->fetchPage());
$tmpl->assign('fileList', $list->fetchPage());
$tmpl->assign('files', $files);
-$tmpl->assign('dir', \OC\Files\Filesystem::normalizePath($view->getAbsolutePath()));
+$tmpl->assign('dir', $dir);
+$tmpl->assign('disableSharing', true);
+$tmpl->assign('ajaxLoad', true);
$tmpl->printPage();
diff --git a/apps/files_trashbin/js/filelist.js b/apps/files_trashbin/js/filelist.js
new file mode 100644
index 0000000000000000000000000000000000000000..cd5a67ddfe002d502d013074b1baf496a948cbbf
--- /dev/null
+++ b/apps/files_trashbin/js/filelist.js
@@ -0,0 +1,24 @@
+// override reload with own ajax call
+FileList.reload = function(){
+ FileList.showMask();
+ if (FileList._reloadCall){
+ FileList._reloadCall.abort();
+ }
+ $.ajax({
+ url: OC.filePath('files_trashbin','ajax','list.php'),
+ data: {
+ dir : $('#dir').val(),
+ breadcrumb: true
+ },
+ error: function(result) {
+ FileList.reloadCallback(result);
+ },
+ success: function(result) {
+ FileList.reloadCallback(result);
+ }
+ });
+}
+
+FileList.linkTo = function(dir){
+ return OC.linkTo('files_trashbin', 'index.php')+"?dir="+ encodeURIComponent(dir).replace(/%2F/g, '/');
+}
diff --git a/apps/files_trashbin/js/trash.js b/apps/files_trashbin/js/trash.js
index b14a7240cbe5d0c211b9665492d302136b8e6428..d73eadb6011d40ac73797b617e4e26bb493e5c45 100644
--- a/apps/files_trashbin/js/trash.js
+++ b/apps/files_trashbin/js/trash.js
@@ -20,6 +20,7 @@ $(document).ready(function() {
OC.dialogs.alert(result.data.message, t('core', 'Error'));
}
enableActions();
+ FileList.updateFileSummary();
});
});
@@ -48,6 +49,7 @@ $(document).ready(function() {
OC.dialogs.alert(result.data.message, t('core', 'Error'));
}
enableActions();
+ FileList.updateFileSummary();
});
});
@@ -169,9 +171,15 @@ $(document).ready(function() {
action(filename);
}
}
+
+ // event handlers for breadcrumb items
+ $('#controls').delegate('.crumb:not(.home) a', 'click', onClickBreadcrumb);
});
- FileActions.actions.dir = {};
+ FileActions.actions.dir = {
+ // only keep 'Open' action for navigation
+ 'Open': FileActions.actions.dir.Open
+ };
});
function processSelection(){
@@ -244,3 +252,9 @@ function disableActions() {
$(".action").css("display", "none");
$(":input:checkbox").css("display", "none");
}
+function onClickBreadcrumb(e){
+ var $el = $(e.target).closest('.crumb');
+ e.preventDefault();
+ FileList.changeDirectory(decodeURIComponent($el.data('dir')));
+}
+
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/el.php b/apps/files_trashbin/l10n/el.php
index 759e5299e4200c58acca5df8a0801e1d5f2f5ba8..939c7fed6143e7879254bf7f1ec9eece441fd298 100644
--- a/apps/files_trashbin/l10n/el.php
+++ b/apps/files_trashbin/l10n/el.php
@@ -8,8 +8,8 @@ $TRANSLATIONS = array(
"Delete permanently" => "Μόνιμη διαγραφή",
"Name" => "Όνομα",
"Deleted" => "Διαγράφηκε",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
+"_%n folder_::_%n folders_" => array("","%n φάκελοι"),
+"_%n file_::_%n files_" => array("","%n αρχεία"),
"restored" => "έγινε επαναφορά",
"Nothing in here. Your trash bin is empty!" => "Δεν υπάρχει τίποτα εδώ. Ο κάδος σας είναι άδειος!",
"Restore" => "Επαναφορά",
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.php b/apps/files_trashbin/l10n/es.php
index 956d89ae6880d44befddef8290d8ea46c3947562..a5639c2c71454d6d1e5aa4210b4b94acec21b7c6 100644
--- a/apps/files_trashbin/l10n/es.php
+++ b/apps/files_trashbin/l10n/es.php
@@ -8,8 +8,8 @@ $TRANSLATIONS = array(
"Delete permanently" => "Eliminar permanentemente",
"Name" => "Nombre",
"Deleted" => "Eliminado",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
+"_%n folder_::_%n folders_" => array("%n carpeta","%n carpetas"),
+"_%n file_::_%n files_" => array("%n archivo","%n archivos"),
"restored" => "recuperado",
"Nothing in here. Your trash bin is empty!" => "No hay nada aquí. ¡Tu papelera esta vacía!",
"Restore" => "Recuperar",
diff --git a/apps/files_trashbin/l10n/es_AR.php b/apps/files_trashbin/l10n/es_AR.php
index 6f47255b50652bf06c450dc91f35bfc8df1d7385..0cb969a3483b4f1ce7c83aabfe6f6867510bacdd 100644
--- a/apps/files_trashbin/l10n/es_AR.php
+++ b/apps/files_trashbin/l10n/es_AR.php
@@ -8,8 +8,9 @@ $TRANSLATIONS = array(
"Delete permanently" => "Borrar de manera permanente",
"Name" => "Nombre",
"Deleted" => "Borrado",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
+"_%n folder_::_%n folders_" => array("%n directorio","%n directorios"),
+"_%n file_::_%n files_" => array("%n archivo","%n archivos"),
+"restored" => "recuperado",
"Nothing in here. Your trash bin is empty!" => "No hay nada acá. ¡La papelera está vacía!",
"Restore" => "Recuperar",
"Delete" => "Borrar",
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/fr.php b/apps/files_trashbin/l10n/fr.php
index 8854190e2ceb7827bc8d7e26ea85b96bbecad34f..45527805ce1af23c00193da2c838a7cfb3d50f3a 100644
--- a/apps/files_trashbin/l10n/fr.php
+++ b/apps/files_trashbin/l10n/fr.php
@@ -8,8 +8,9 @@ $TRANSLATIONS = array(
"Delete permanently" => "Supprimer de façon définitive",
"Name" => "Nom",
"Deleted" => "Effacé",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
+"_%n folder_::_%n folders_" => array("","%n dossiers"),
+"_%n file_::_%n files_" => array("","%n fichiers"),
+"restored" => "restauré",
"Nothing in here. Your trash bin is empty!" => "Il n'y a rien ici. Votre corbeille est vide !",
"Restore" => "Restaurer",
"Delete" => "Supprimer",
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/hu_HU.php b/apps/files_trashbin/l10n/hu_HU.php
index aac6cf780001a1b143f0943ce40b8615616ecb2c..766ddcbce4de9dd91d471315cd81f663239091b1 100644
--- a/apps/files_trashbin/l10n/hu_HU.php
+++ b/apps/files_trashbin/l10n/hu_HU.php
@@ -8,8 +8,8 @@ $TRANSLATIONS = array(
"Delete permanently" => "Végleges törlés",
"Name" => "Név",
"Deleted" => "Törölve",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
+"_%n folder_::_%n folders_" => array("","%n mappa"),
+"_%n file_::_%n files_" => array("","%n állomány"),
"restored" => "visszaállítva",
"Nothing in here. Your trash bin is empty!" => "Itt nincs semmi. Az Ön szemetes mappája üres!",
"Restore" => "Visszaállítás",
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/ko.php b/apps/files_trashbin/l10n/ko.php
index f2e604d75915416e9825bae5b97db30f9f1883a7..9ac5f9802c683671fe3d156e9fb39655fddbcda9 100644
--- a/apps/files_trashbin/l10n/ko.php
+++ b/apps/files_trashbin/l10n/ko.php
@@ -1,11 +1,19 @@
<?php
$TRANSLATIONS = array(
+"Couldn't delete %s permanently" => "%s를 영구적으로 삭제할수 없습니다",
+"Couldn't restore %s" => "%s를 복원할수 없습니다",
+"perform restore operation" => "복원 작업중",
"Error" => "오류",
+"delete file permanently" => "영구적으로 파일 삭제하기",
"Delete permanently" => "영원히 삭제",
"Name" => "이름",
-"_%n folder_::_%n folders_" => array(""),
-"_%n file_::_%n files_" => array(""),
+"Deleted" => "삭제됨",
+"_%n folder_::_%n folders_" => array("폴더 %n개"),
+"_%n file_::_%n files_" => array("파일 %n개 "),
+"restored" => "복원됨",
+"Nothing in here. Your trash bin is empty!" => "현재 휴지통은 비어있습니다!",
"Restore" => "복원",
-"Delete" => "삭제"
+"Delete" => "삭제",
+"Deleted Files" => "삭제된 파일들"
);
$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_trashbin/l10n/lt_LT.php b/apps/files_trashbin/l10n/lt_LT.php
index c4a12ff21755aff9c89634d80665430c68699333..0a51290f4d99bf12f2ffea6417eb951179df7efc 100644
--- a/apps/files_trashbin/l10n/lt_LT.php
+++ b/apps/files_trashbin/l10n/lt_LT.php
@@ -8,8 +8,9 @@ $TRANSLATIONS = array(
"Delete permanently" => "Ištrinti negrįžtamai",
"Name" => "Pavadinimas",
"Deleted" => "Ištrinti",
-"_%n folder_::_%n folders_" => array("","",""),
-"_%n file_::_%n files_" => array("","",""),
+"_%n folder_::_%n folders_" => array("","","%n aplankų"),
+"_%n file_::_%n files_" => array("","","%n failų"),
+"restored" => "atstatyta",
"Nothing in here. Your trash bin is empty!" => "Nieko nėra. Jūsų šiukšliadėžė tuščia!",
"Restore" => "Atstatyti",
"Delete" => "Ištrinti",
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/nn_NO.php b/apps/files_trashbin/l10n/nn_NO.php
index 9e351668e33626bd279e9638c59a2939bc8a27bf..73fe48211c293719e167c1c4c0f7722cfd0cc735 100644
--- a/apps/files_trashbin/l10n/nn_NO.php
+++ b/apps/files_trashbin/l10n/nn_NO.php
@@ -8,8 +8,9 @@ $TRANSLATIONS = array(
"Delete permanently" => "Slett for godt",
"Name" => "Namn",
"Deleted" => "Sletta",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
+"_%n folder_::_%n folders_" => array("%n mappe","%n mapper"),
+"_%n file_::_%n files_" => array("%n fil","%n filer"),
+"restored" => "gjenoppretta",
"Nothing in here. Your trash bin is empty!" => "Ingenting her. Papirkorga di er tom!",
"Restore" => "Gjenopprett",
"Delete" => "Slett",
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/pl.php b/apps/files_trashbin/l10n/pl.php
index e8295e2ff038bd599cc2962ef918d8a3fac93018..c838a6b956c2e583964dcc186fc9d7ebaac6509b 100644
--- a/apps/files_trashbin/l10n/pl.php
+++ b/apps/files_trashbin/l10n/pl.php
@@ -8,8 +8,8 @@ $TRANSLATIONS = array(
"Delete permanently" => "Trwale usuń",
"Name" => "Nazwa",
"Deleted" => "Usunięte",
-"_%n folder_::_%n folders_" => array("","",""),
-"_%n file_::_%n files_" => array("","",""),
+"_%n folder_::_%n folders_" => array("","","%n katalogów"),
+"_%n file_::_%n files_" => array("","","%n plików"),
"restored" => "przywrócony",
"Nothing in here. Your trash bin is empty!" => "Nic tu nie ma. Twój kosz jest pusty!",
"Restore" => "Przywróć",
diff --git a/apps/files_trashbin/l10n/pt_BR.php b/apps/files_trashbin/l10n/pt_BR.php
index 1e3c67ba027a48389c527fa45287e80e0b9675eb..e0e8c8faec6b7f87f0e62a6e3557474514fac548 100644
--- a/apps/files_trashbin/l10n/pt_BR.php
+++ b/apps/files_trashbin/l10n/pt_BR.php
@@ -8,8 +8,8 @@ $TRANSLATIONS = array(
"Delete permanently" => "Excluir permanentemente",
"Name" => "Nome",
"Deleted" => "Excluído",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
+"_%n folder_::_%n folders_" => array("","%n pastas"),
+"_%n file_::_%n files_" => array("%n arquivo","%n arquivos"),
"restored" => "restaurado",
"Nothing in here. Your trash bin is empty!" => "Nada aqui. Sua lixeira está vazia!",
"Restore" => "Restaurar",
diff --git a/apps/files_trashbin/l10n/pt_PT.php b/apps/files_trashbin/l10n/pt_PT.php
index 0c88d132b5cc00eb299bbf25a4c7f1d975071b87..9dccc773cb1adfcb222cb46cab541f9dc7d3e9b4 100644
--- a/apps/files_trashbin/l10n/pt_PT.php
+++ b/apps/files_trashbin/l10n/pt_PT.php
@@ -8,8 +8,8 @@ $TRANSLATIONS = array(
"Delete permanently" => "Eliminar permanentemente",
"Name" => "Nome",
"Deleted" => "Apagado",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
+"_%n folder_::_%n folders_" => array("%n pasta","%n pastas"),
+"_%n file_::_%n files_" => array("%n ficheiro","%n ficheiros"),
"restored" => "Restaurado",
"Nothing in here. Your trash bin is empty!" => "Não hà ficheiros. O lixo está vazio!",
"Restore" => "Restaurar",
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/sq.php b/apps/files_trashbin/l10n/sq.php
index 1b7b5b828c81e08db327277b77d964d062fd0cfa..50ca7d901b598f10dd6502c22e4e24f955d01f97 100644
--- a/apps/files_trashbin/l10n/sq.php
+++ b/apps/files_trashbin/l10n/sq.php
@@ -8,8 +8,9 @@ $TRANSLATIONS = array(
"Delete permanently" => "Elimino përfundimisht",
"Name" => "Emri",
"Deleted" => "Eliminuar",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
+"_%n folder_::_%n folders_" => array("%n dosje","%n dosje"),
+"_%n file_::_%n files_" => array("%n skedar","%n skedarë"),
+"restored" => "rivendosur",
"Nothing in here. Your trash bin is empty!" => "Këtu nuk ka asgjë. Koshi juaj është bosh!",
"Restore" => "Rivendos",
"Delete" => "Elimino",
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/l10n/zh_TW.php b/apps/files_trashbin/l10n/zh_TW.php
index 2dfc484fc7faa60b4e95adedb2aa91ec4c8303ce..bfc2fc659de35b74a49a5db6452b28f6004a24ba 100644
--- a/apps/files_trashbin/l10n/zh_TW.php
+++ b/apps/files_trashbin/l10n/zh_TW.php
@@ -11,7 +11,7 @@ $TRANSLATIONS = array(
"_%n folder_::_%n folders_" => array("%n 個資料夾"),
"_%n file_::_%n files_" => array("%n 個檔案"),
"restored" => "已還原",
-"Nothing in here. Your trash bin is empty!" => "您的垃圾桶是空的！",
+"Nothing in here. Your trash bin is empty!" => "您的回收桶是空的！",
"Restore" => "還原",
"Delete" => "刪除",
"Deleted Files" => "已刪除的檔案"
diff --git a/apps/files_trashbin/lib/helper.php b/apps/files_trashbin/lib/helper.php
new file mode 100644
index 0000000000000000000000000000000000000000..4f442ee930471cf39023059c071a79cd53376bf8
--- /dev/null
+++ b/apps/files_trashbin/lib/helper.php
@@ -0,0 +1,97 @@
+<?php
+
+namespace OCA\Files_Trashbin;
+
+class Helper
+{
+ /**
+ * Retrieves the contents of a trash bin directory.
+ * @param string $dir path to the directory inside the trashbin
+ * or empty to retrieve the root of the trashbin
+ * @return array of files
+ */
+ public static function getTrashFiles($dir){
+ $result = array();
+ $user = \OCP\User::getUser();
+
+ if ($dir && $dir !== '/') {
+ $view = new \OC_Filesystemview('/'.$user.'/files_trashbin/files');
+ $dirContent = $view->opendir($dir);
+ if ($dirContent === false){
+ return null;
+ }
+ if(is_resource($dirContent)){
+ while(($entryName = readdir($dirContent)) !== false) {
+ if (!\OC\Files\Filesystem::isIgnoredDir($entryName)) {
+ $pos = strpos($dir.'/', '/', 1);
+ $tmp = substr($dir, 0, $pos);
+ $pos = strrpos($tmp, '.d');
+ $timestamp = substr($tmp, $pos+2);
+ $result[] = array(
+ 'id' => $entryName,
+ 'timestamp' => $timestamp,
+ 'mime' => $view->getMimeType($dir.'/'.$entryName),
+ 'type' => $view->is_dir($dir.'/'.$entryName) ? 'dir' : 'file',
+ 'location' => $dir,
+ );
+ }
+ }
+ closedir($dirContent);
+ }
+ } else {
+ $query = \OC_DB::prepare('SELECT `id`,`location`,`timestamp`,`type`,`mime` FROM `*PREFIX*files_trash` WHERE `user` = ?');
+ $result = $query->execute(array($user))->fetchAll();
+ }
+
+ $files = array();
+ foreach ($result as $r) {
+ $i = array();
+ $i['name'] = $r['id'];
+ $i['date'] = \OCP\Util::formatDate($r['timestamp']);
+ $i['timestamp'] = $r['timestamp'];
+ $i['mimetype'] = $r['mime'];
+ $i['type'] = $r['type'];
+ if ($i['type'] === 'file') {
+ $fileinfo = pathinfo($r['id']);
+ $i['basename'] = $fileinfo['filename'];
+ $i['extension'] = isset($fileinfo['extension']) ? ('.'.$fileinfo['extension']) : '';
+ }
+ $i['directory'] = $r['location'];
+ if ($i['directory'] === '/') {
+ $i['directory'] = '';
+ }
+ $i['permissions'] = \OCP\PERMISSION_READ;
+ $i['isPreviewAvailable'] = \OC::$server->getPreviewManager()->isMimeSupported($r['mime']);
+ $i['icon'] = \OCA\Files\Helper::determineIcon($i);
+ $files[] = $i;
+ }
+
+ usort($files, array('\OCA\Files\Helper', 'fileCmp'));
+
+ return $files;
+ }
+
+ /**
+ * Splits the given path into a breadcrumb structure.
+ * @param string $dir path to process
+ * @return array where each entry is a hash of the absolute
+ * directory path and its name
+ */
+ public static function makeBreadcrumb($dir){
+ // Make breadcrumb
+ $pathtohere = '';
+ $breadcrumb = array();
+ foreach (explode('/', $dir) as $i) {
+ if ($i !== '') {
+ if ( preg_match('/^(.+)\.d[0-9]+$/', $i, $match) ) {
+ $name = $match[1];
+ } else {
+ $name = $i;
+ }
+ $pathtohere .= '/' . $i;
+ $breadcrumb[] = array('dir' => $pathtohere, 'name' => $name);
+ }
+ }
+ return $breadcrumb;
+ }
+}
diff --git a/apps/files_trashbin/lib/trash.php b/apps/files_trashbin/lib/trashbin.php
similarity index 99%
rename from apps/files_trashbin/lib/trash.php
rename to apps/files_trashbin/lib/trashbin.php
index 0dcb2fc82e188ef6822ec6c838b72261e79a3199..c79afdc0c2ec91c11a3bd1f968335d0607d77103 100644
--- a/apps/files_trashbin/lib/trash.php
+++ b/apps/files_trashbin/lib/trashbin.php
@@ -72,11 +72,6 @@ class Trashbin {
$mime = $view->getMimeType('files' . $file_path);
if ($view->is_dir('files' . $file_path)) {
- $dirContent = $view->getDirectoryContent('files' . $file_path);
- // no need to move empty folders to the trash bin
- if (empty($dirContent)) {
- return true;
- }
$type = 'dir';
} else {
$type = 'file';
@@ -909,4 +904,7 @@ class Trashbin {
return true;
}
+ public static function preview_icon($path) {
+ return \OC_Helper::linkToRoute( 'core_ajax_trashbin_preview', array('x' => 36, 'y' => 36, 'file' => urlencode($path) ));
+ }
}
diff --git a/apps/files_trashbin/templates/index.php b/apps/files_trashbin/templates/index.php
index 371765fa69a658783cef13020e8d8d5d167fe531..82ba0608834c95e6fcdc2632dd694235c90613b7 100644
--- a/apps/files_trashbin/templates/index.php
+++ b/apps/files_trashbin/templates/index.php
@@ -5,10 +5,14 @@
</div>
<div id='notification'></div>
-<?php if (isset($_['files']) && count($_['files']) === 0 && $_['dirlisting'] === false):?>
- <div id="emptyfolder"><?php p($l->t('Nothing in here. Your trash bin is empty!'))?></div>
+<?php if (isset($_['files']) && count($_['files']) === 0 && $_['dirlisting'] === false && !$_['ajaxLoad']):?>
+ <div id="emptycontent"><?php p($l->t('Nothing in here. Your trash bin is empty!'))?></div>
<?php endif; ?>
+<input type="hidden" name="ajaxLoad" id="ajaxLoad" value="<?php p($_['ajaxLoad']); ?>" />
+<input type="hidden" id="disableSharing" data-status="<?php p($_['disableSharing']); ?>"></input>
+<input type="hidden" name="dir" value="<?php p($_['dir']) ?>" id="dir">
+
<table id="filestable">
<thead>
<tr>
diff --git a/apps/files_trashbin/templates/part.breadcrumb.php b/apps/files_trashbin/templates/part.breadcrumb.php
index 8ecab58e5c809c462580d8e31f28fe3ad393b994..4acc298adbe3c2cdb65e59eb56148f5335e06608 100644
--- a/apps/files_trashbin/templates/part.breadcrumb.php
+++ b/apps/files_trashbin/templates/part.breadcrumb.php
@@ -1,11 +1,11 @@
-<div class="crumb">
+<div class="crumb home">
<a href="<?php print_unescaped($_['home']); ?>">
<img src="<?php print_unescaped(OCP\image_path('core', 'places/home.svg'));?>" class="svg" />
</a>
</div>
<?php if(count($_["breadcrumb"])):?>
<div class="crumb svg"
- data-dir='<?php print_unescaped($_['baseURL']); ?>'>
+ data-dir='/'>
<a href="<?php p($_['baseURL']); ?>"><?php p($l->t("Deleted Files")); ?></a>
</div>
<?php endif;?>
diff --git a/apps/files_trashbin/templates/part.list.php b/apps/files_trashbin/templates/part.list.php
index 254b08dd36a31e39d0a289ef35e7ded6547fa255..78709d986ae32a3e90425d6467e0673a34ecb53d 100644
--- a/apps/files_trashbin/templates/part.list.php
+++ b/apps/files_trashbin/templates/part.list.php
@@ -1,4 +1,3 @@
-<input type="hidden" id="disableSharing" data-status="<?php p($_['disableSharing']); ?>">
<?php foreach($_['files'] as $file):
$relative_deleted_date = OCP\relative_modified_date($file['timestamp']);
// the older the file, the brighter the shade of grey; days*14
@@ -12,7 +11,7 @@
data-permissions='<?php p($file['permissions']); ?>'
<?php if ( $_['dirlisting'] ): ?>
id="<?php p($file['directory'].'/'.$file['name']);?>"
- data-file="<?php p($file['directory'].'/'.$file['name']);?>"
+ data-file="<?php p($name);?>"
data-timestamp=''
data-dirlisting=1
<?php else: ?>
@@ -21,11 +20,19 @@
data-timestamp='<?php p($file['timestamp']);?>'
data-dirlisting=0
<?php endif; ?>>
+ <?php if($file['isPreviewAvailable']): ?>
+ <td class="filename svg preview-icon"
+ <?php else: ?>
<td class="filename svg"
+ <?php endif; ?>
<?php if($file['type'] === 'dir'): ?>
style="background-image:url(<?php print_unescaped(OCP\mimetype_icon('dir')); ?>)"
<?php else: ?>
- style="background-image:url(<?php print_unescaped(OCP\mimetype_icon($file['mimetype'])); ?>)"
+ <?php if($file['isPreviewAvailable']): ?>
+ style="background-image:url(<?php print_unescaped(OCA\Files_Trashbin\Trashbin::preview_icon(!$_['dirlisting'] ? ($file['name'].'.d'.$file['timestamp']) : ($file['directory'].'/'.$file['name']))); ?>)"
+ <?php else: ?>
+ style="background-image:url(<?php print_unescaped(OCP\mimetype_icon($file['mimetype'])); ?>)"
+ <?php endif; ?>
<?php endif; ?>
>
<?php if(!isset($_['readonly']) || !$_['readonly']): ?><input type="checkbox" /><?php endif; ?>
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/es.php b/apps/files_versions/l10n/es.php
index a6031698e06ba7b0944e638551ddf6f4d12033e8..b7acc3769786c5579c97ca8b81a93170a2b04d78 100644
--- a/apps/files_versions/l10n/es.php
+++ b/apps/files_versions/l10n/es.php
@@ -3,7 +3,7 @@ $TRANSLATIONS = array(
"Could not revert: %s" => "No se puede revertir: %s",
"Versions" => "Revisiones",
"Failed to revert {file} to revision {timestamp}." => "No se ha podido revertir {archivo} a revisión {timestamp}.",
-"More versions..." => "Más...",
+"More versions..." => "Más versiones...",
"No other versions available" => "No hay otras versiones disponibles",
"Restore" => "Recuperar"
);
diff --git a/apps/files_versions/l10n/es_AR.php b/apps/files_versions/l10n/es_AR.php
index 068f835d0afe84dd2ae43a304ec118eeac5bc18f..3008220122f5365f37c3ae45298de7977c14a8c0 100644
--- a/apps/files_versions/l10n/es_AR.php
+++ b/apps/files_versions/l10n/es_AR.php
@@ -2,6 +2,9 @@
$TRANSLATIONS = array(
"Could not revert: %s" => "No se pudo revertir: %s ",
"Versions" => "Versiones",
+"Failed to revert {file} to revision {timestamp}." => "Falló al revertir {file} a la revisión {timestamp}.",
+"More versions..." => "Más versiones...",
+"No other versions available" => "No hay más versiones disponibles",
"Restore" => "Recuperar"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_versions/l10n/fr.php b/apps/files_versions/l10n/fr.php
index 537783e6c9f867a3237f6c764344ac2a74192220..7f3df1bce41c27d13f78c94eda1a1821bb3e128a 100644
--- a/apps/files_versions/l10n/fr.php
+++ b/apps/files_versions/l10n/fr.php
@@ -2,6 +2,9 @@
$TRANSLATIONS = array(
"Could not revert: %s" => "Impossible de restaurer %s",
"Versions" => "Versions",
+"Failed to revert {file} to revision {timestamp}." => "Échec du retour du fichier {file} à la révision {timestamp}.",
+"More versions..." => "Plus de versions...",
+"No other versions available" => "Aucune autre version disponible",
"Restore" => "Restaurer"
);
$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files_versions/l10n/ko.php b/apps/files_versions/l10n/ko.php
index 365adc25115977ce91d91d504df6e14c398cbf87..ba951c4107a1d68cb5f3988d1f66f45ce90ebd0b 100644
--- a/apps/files_versions/l10n/ko.php
+++ b/apps/files_versions/l10n/ko.php
@@ -2,6 +2,9 @@
$TRANSLATIONS = array(
"Could not revert: %s" => "되돌릴 수 없습니다: %s",
"Versions" => "버전",
+"Failed to revert {file} to revision {timestamp}." => "{timestamp} 판의 {file}로 돌리는데 실패했습니다.",
+"More versions..." => "더 많은 버전들...",
+"No other versions available" => "다른 버전을 사용할수 없습니다",
"Restore" => "복원"
);
$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_versions/l10n/lt_LT.php b/apps/files_versions/l10n/lt_LT.php
index 4e1af5fcc29ce58b7c82cb7e2cbba0fc42542b74..3afcfbe3b5f63aa263dce40a7dc9bf0e8a6b8dec 100644
--- a/apps/files_versions/l10n/lt_LT.php
+++ b/apps/files_versions/l10n/lt_LT.php
@@ -2,6 +2,9 @@
$TRANSLATIONS = array(
"Could not revert: %s" => "Nepavyko atstatyti: %s",
"Versions" => "Versijos",
+"Failed to revert {file} to revision {timestamp}." => "Nepavyko atstatyti {file} į būseną {timestamp}.",
+"More versions..." => "Daugiau versijų...",
+"No other versions available" => "Nėra daugiau versijų",
"Restore" => "Atstatyti"
);
$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/files_versions/l10n/nn_NO.php b/apps/files_versions/l10n/nn_NO.php
index 79b518bc18d0ec398ad66195c63640318bccbe32..608d72aaaed6bc5151addb0f0b214c117a98592a 100644
--- a/apps/files_versions/l10n/nn_NO.php
+++ b/apps/files_versions/l10n/nn_NO.php
@@ -2,6 +2,9 @@
$TRANSLATIONS = array(
"Could not revert: %s" => "Klarte ikkje å tilbakestilla: %s",
"Versions" => "Utgåver",
+"Failed to revert {file} to revision {timestamp}." => "Klarte ikkje å tilbakestilla {file} til utgåva {timestamp}.",
+"More versions..." => "Fleire utgåver …",
+"No other versions available" => "Ingen andre utgåver tilgjengeleg",
"Restore" => "Gjenopprett"
);
$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/cs_CZ.php b/apps/user_ldap/l10n/cs_CZ.php
index 9f4c31c068ba118864cc4b118cd79fce8028ea55..9109a8c710a82e09152ca0ec3a72ebb0940c6b04 100644
--- a/apps/user_ldap/l10n/cs_CZ.php
+++ b/apps/user_ldap/l10n/cs_CZ.php
@@ -30,11 +30,11 @@ $TRANSLATIONS = array(
"Password" => "Heslo",
"For anonymous access, leave DN and Password empty." => "Pro anonymní přístup ponechte údaje DN and heslo prázdné.",
"User Login Filter" => "Filtr přihlášení uživatelů",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Určuje použitý filtr, při pokusu o přihlášení. %%uid nahrazuje uživatelské jméno v činnosti přihlášení. Příklad \"uid=%%uid\"",
+"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Určuje použitý filtr při pokusu o přihlášení. %%uid nahrazuje uživatelské jméno v činnosti přihlášení. Příklad: \"uid=%%uid\"",
"User List Filter" => "Filtr seznamu uživatelů",
-"Defines the filter to apply, when retrieving users (no placeholders). Example: \"objectClass=person\"" => "Určuje použitý filtr pro získávaní uživatelů (bez zástupných znaků). Příklad: \"objectClass=person\"",
+"Defines the filter to apply, when retrieving users (no placeholders). Example: \"objectClass=person\"" => "Určuje použitý filtr při získávání uživatelů (bez zástupných znaků). Příklad: \"objectClass=person\"",
"Group Filter" => "Filtr skupin",
-"Defines the filter to apply, when retrieving groups (no placeholders). Example: \"objectClass=posixGroup\"" => "Určuje použitý filtr, pro získávaní skupin (bez zástupných znaků). Příklad: \"objectClass=posixGroup\"",
+"Defines the filter to apply, when retrieving groups (no placeholders). Example: \"objectClass=posixGroup\"" => "Určuje použitý filtr při získávání skupin (bez zástupných znaků). Příklad: \"objectClass=posixGroup\"",
"Connection Settings" => "Nastavení spojení",
"Configuration Active" => "Nastavení aktivní",
"When unchecked, this configuration will be skipped." => "Pokud není zaškrtnuto, bude toto nastavení přeskočeno.",
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/es.php b/apps/user_ldap/l10n/es.php
index e59942736359a3ea784f40e795f9c27b3bebe688..4f37d5177a79a5015fb08e09dd7ffca9090bfb73 100644
--- a/apps/user_ldap/l10n/es.php
+++ b/apps/user_ldap/l10n/es.php
@@ -16,6 +16,7 @@ $TRANSLATIONS = array(
"Connection test failed" => "La prueba de conexión falló",
"Do you really want to delete the current Server Configuration?" => "¿Realmente desea eliminar la configuración actual del servidor?",
"Confirm Deletion" => "Confirmar eliminación",
+"<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>Advertencia:</b> Las apps user_ldap y user_webdavauth son incompatibles. Puede que experimente un comportamiento inesperado. Pregunte al su administrador de sistemas para desactivar uno de ellos.",
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Advertencia:</b> El módulo LDAP de PHP no está instalado, el sistema no funcionará. Por favor consulte al administrador del sistema para instalarlo.",
"Server configuration" => "Configuración del Servidor",
"Add Server Configuration" => "Agregar configuracion del servidor",
@@ -29,8 +30,11 @@ $TRANSLATIONS = array(
"Password" => "Contraseña",
"For anonymous access, leave DN and Password empty." => "Para acceso anónimo, deje DN y contraseña vacíos.",
"User Login Filter" => "Filtro de inicio de sesión de usuario",
+"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Define el filtro a aplicar cuando se intenta identificar. %%uid remplazará al nombre de usuario en el proceso de identificación. Por ejemplo: \"uid=%%uid\"",
"User List Filter" => "Lista de filtros de usuario",
+"Defines the filter to apply, when retrieving users (no placeholders). Example: \"objectClass=person\"" => "Define el filtro a aplicar, cuando se obtienen usuarios (sin comodines). Por ejemplo: \"objectClass=person\"",
"Group Filter" => "Filtro de grupo",
+"Defines the filter to apply, when retrieving groups (no placeholders). Example: \"objectClass=posixGroup\"" => "Define el filtro a aplicar, cuando se obtienen grupos (sin comodines). Por ejemplo: \"objectClass=posixGroup\"",
"Connection Settings" => "Configuración de conexión",
"Configuration Active" => "Configuracion activa",
"When unchecked, this configuration will be skipped." => "Cuando deseleccione, esta configuracion sera omitida.",
@@ -39,19 +43,23 @@ $TRANSLATIONS = array(
"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Dar un servidor de copia de seguridad opcional. Debe ser una réplica del servidor principal LDAP / AD.",
"Backup (Replica) Port" => "Puerto para copias de seguridad (Replica)",
"Disable Main Server" => "Deshabilitar servidor principal",
+"Only connect to the replica server." => "Conectar sólo con el servidor de réplica.",
"Use TLS" => "Usar TLS",
"Do not use it additionally for LDAPS connections, it will fail." => "No lo use para conexiones LDAPS, Fallará.",
"Case insensitve LDAP server (Windows)" => "Servidor de LDAP no sensible a mayúsculas/minúsculas (Windows)",
"Turn off SSL certificate validation." => "Apagar la validación por certificado 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." => "No se recomienda, ¡utilízalo únicamente para pruebas! Si la conexión únicamente funciona con esta opción, importa el certificado SSL del servidor LDAP en tu servidor %s.",
"Cache Time-To-Live" => "Cache TTL",
"in seconds. A change empties the cache." => "en segundos. Un cambio vacía la caché.",
"Directory Settings" => "Configuracion de directorio",
"User Display Name Field" => "Campo de nombre de usuario a mostrar",
+"The LDAP attribute to use to generate the user's display name." => "El campo LDAP a usar para generar el nombre para mostrar del usuario.",
"Base User Tree" => "Árbol base de usuario",
"One User Base DN per line" => "Un DN Base de Usuario por línea",
"User Search Attributes" => "Atributos de la busqueda de usuario",
"Optional; one attribute per line" => "Opcional; un atributo por linea",
"Group Display Name Field" => "Campo de nombre de grupo a mostrar",
+"The LDAP attribute to use to generate the groups's display name." => "El campo LDAP a usar para generar el nombre para mostrar del grupo.",
"Base Group Tree" => "Árbol base de grupo",
"One Group Base DN per line" => "Un DN Base de Grupo por línea",
"Group Search Attributes" => "Atributos de busqueda de grupo",
@@ -64,10 +72,13 @@ $TRANSLATIONS = array(
"User Home Folder Naming Rule" => "Regla para la carpeta Home de usuario",
"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Vacío para el nombre de usuario (por defecto). En otro caso, especifique un atributo LDAP/AD.",
"Internal Username" => "Nombre de usuario interno",
+"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." => "El nombre de usuario interno será creado de forma predeterminada desde el atributo UUID. Esto asegura que el nombre de usuario es único y los caracteres no necesitan ser convertidos. En el nombre de usuario interno sólo se pueden usar estos caracteres: [ a-zA-Z0-9_.@- ]. El resto de caracteres son sustituidos por su correspondiente en ASCII o simplemente omitidos. En caso de duplicidades, se añadirá o incrementará un número. El nombre de usuario interno es usado para identificar un usuario. Es también el nombre predeterminado para la carpeta personal del usuario en ownCloud. También es parte de URLs remotas, por ejemplo, para todos los servicios *DAV. Con esta configuración el comportamiento predeterminado puede ser cambiado. Para conseguir un comportamiento similar a como era antes de ownCloud 5, introduzca el campo del nombre para mostrar del usuario en la siguiente caja. Déjelo vacío para el comportamiento predeterminado. Los cambios solo tendrán efecto en los usuarios LDAP mapeados (añadidos) recientemente.",
"Internal Username Attribute:" => "Atributo Nombre de usuario Interno:",
"Override UUID detection" => "Sobrescribir la detección 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." => "Por defecto, el atributo UUID es autodetectado. Este atributo es usado para identificar indudablemente usuarios y grupos LDAP. Además, el nombre de usuario interno será creado en base al UUID, si no ha sido especificado otro comportamiento arriba. Puedes sobrescribir la configuración y pasar un atributo de tu elección. Debes asegurarte de que el atributo de tu elección sea accesible por los usuarios y grupos y ser único. Déjalo en blanco para usar el comportamiento por defecto. Los cambios tendrán efecto solo en los usuarios y grupos de LDAP mapeados (añadidos) recientemente.",
"UUID Attribute:" => "Atributo UUID:",
"Username-LDAP User Mapping" => "Asignación del Nombre de usuario de un usuario 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." => "Los usuarios son usados para almacenar y asignar (meta) datos. Con el fin de identificar de forma precisa y reconocer usuarios, cada usuario de LDAP tendrá un nombre de usuario interno. Esto requiere un mapeo entre el nombre de usuario y el usuario del LDAP. El nombre de usuario creado es mapeado respecto al UUID del usuario en el LDAP. De forma adicional, el DN es cacheado para reducir la interacción entre el LDAP, pero no es usado para identificar. Si el DN cambia, los cambios serán aplicados. El nombre de usuario interno es usado por encima de todo. Limpiar los mapeos dejará restos por todas partes, no es sensible a configuración, ¡afecta a todas las configuraciones del LDAP! Nunca limpies los mapeos en un entorno de producción, únicamente en una fase de desarrollo o experimental.",
"Clear Username-LDAP User Mapping" => "Borrar la asignación de los Nombres de usuario de los usuarios LDAP",
"Clear Groupname-LDAP Group Mapping" => "Borrar la asignación de los Nombres de grupo de los grupos de LDAP",
"Test Configuration" => "Configuración de prueba",
diff --git a/apps/user_ldap/l10n/es_AR.php b/apps/user_ldap/l10n/es_AR.php
index ecfcae32f46e387bc0d9db48aa9a9fca2169f5d4..2436df8de7747baf96c523b2f96e34975a7385c3 100644
--- a/apps/user_ldap/l10n/es_AR.php
+++ b/apps/user_ldap/l10n/es_AR.php
@@ -16,6 +16,7 @@ $TRANSLATIONS = array(
"Connection test failed" => "Falló es test de conexión",
"Do you really want to delete the current Server Configuration?" => "¿Realmente desea borrar la configuración actual del servidor?",
"Confirm Deletion" => "Confirmar borrado",
+"<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>Advertencia:</b> Las apps user_ldap y user_webdavauth son incompatibles. Puede ser que experimentes comportamientos inesperados. Pedile al administrador que desactive uno de ellos.",
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Atención:</b> El módulo PHP LDAP no está instalado, este elemento no va a funcionar. Por favor, pedile al administrador que lo instale.",
"Server configuration" => "Configuración del Servidor",
"Add Server Configuration" => "Añadir Configuración del Servidor",
@@ -29,8 +30,11 @@ $TRANSLATIONS = array(
"Password" => "Contraseña",
"For anonymous access, leave DN and Password empty." => "Para acceso anónimo, dejá DN y contraseña vacíos.",
"User Login Filter" => "Filtro de inicio de sesión de usuario",
+"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Define el filtro a aplicar cuando se intenta ingresar. %%uid remplaza el nombre de usuario en el proceso de identificación. Por ejemplo: \"uid=%%uid\"",
"User List Filter" => "Lista de filtros de usuario",
+"Defines the filter to apply, when retrieving users (no placeholders). Example: \"objectClass=person\"" => "Define el filtro a aplicar al obtener usuarios (sin comodines). Por ejemplo: \"objectClass=person\"",
"Group Filter" => "Filtro de grupo",
+"Defines the filter to apply, when retrieving groups (no placeholders). Example: \"objectClass=posixGroup\"" => "Define el filtro a aplicar al obtener grupos (sin comodines). Por ejemplo: \"objectClass=posixGroup\"",
"Connection Settings" => "Configuración de Conección",
"Configuration Active" => "Configuración activa",
"When unchecked, this configuration will be skipped." => "Si no está seleccionada, esta configuración será omitida.",
@@ -39,19 +43,23 @@ $TRANSLATIONS = array(
"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Dar un servidor de copia de seguridad opcional. Debe ser una réplica del servidor principal LDAP/AD.",
"Backup (Replica) Port" => "Puerto para copia de seguridad (réplica)",
"Disable Main Server" => "Deshabilitar el Servidor Principal",
+"Only connect to the replica server." => "Conectarse únicamente al servidor de réplica.",
"Use TLS" => "Usar TLS",
"Do not use it additionally for LDAPS connections, it will fail." => "No usar adicionalmente para conexiones LDAPS, las mismas fallarán",
"Case insensitve LDAP server (Windows)" => "Servidor de LDAP sensible a mayúsculas/minúsculas (Windows)",
"Turn off SSL certificate validation." => "Desactivar la validación por certificado 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." => "No es recomendado, ¡Usalo solamente para pruebas! Si la conexión únicamente funciona con esta opción, importá el certificado SSL del servidor LDAP en tu servidor %s.",
"Cache Time-To-Live" => "Tiempo de vida del caché",
"in seconds. A change empties the cache." => "en segundos. Cambiarlo vacía la cache.",
"Directory Settings" => "Configuración de Directorio",
"User Display Name Field" => "Campo de nombre de usuario a mostrar",
+"The LDAP attribute to use to generate the user's display name." => "El atributo LDAP a usar para generar el nombre de usuario mostrado.",
"Base User Tree" => "Árbol base de usuario",
"One User Base DN per line" => "Una DN base de usuario por línea",
"User Search Attributes" => "Atributos de la búsqueda de usuario",
"Optional; one attribute per line" => "Opcional; un atributo por linea",
"Group Display Name Field" => "Campo de nombre de grupo a mostrar",
+"The LDAP attribute to use to generate the groups's display name." => "El atributo LDAP a usar para generar el nombre de grupo mostrado.",
"Base Group Tree" => "Árbol base de grupo",
"One Group Base DN per line" => "Una DN base de grupo por línea",
"Group Search Attributes" => "Atributos de búsqueda de grupo",
@@ -64,10 +72,13 @@ $TRANSLATIONS = array(
"User Home Folder Naming Rule" => "Regla de nombre de los directorios de usuario",
"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Vacío para el nombre de usuario (por defecto). En otro caso, especificá un atributo LDAP/AD.",
"Internal Username" => "Nombre interno de usuario",
+"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." => "Por defecto, el nombre de usuario interno es creado a partir del atributo UUID. Esto asegura que el nombre de usuario es único y no es necesaria una conversión de caracteres. El nombre de usuario interno sólo se pueden usar estos caracteres: [ a-zA-Z0-9_.@- ]. El resto de caracteres son sustituidos por su correspondiente en ASCII o simplemente omitidos. En caso colisiones, se agregará o incrementará un número. El nombre de usuario interno es usado para identificar un usuario. Es también el nombre predeterminado para el directorio personal del usuario en ownCloud. También es parte de las URLs remotas, por ejemplo, para los servicios *DAV. Con esta opción, se puede cambiar el comportamiento por defecto. Para conseguir un comportamiento similar a versiones anteriores a ownCloud 5, ingresá el atributo del nombre mostrado en el campo siguiente. Dejalo vacío para el comportamiento por defecto. Los cambios solo tendrán efecto en los nuevos usuarios LDAP mapeados (agregados).",
"Internal Username Attribute:" => "Atributo Nombre Interno de usuario:",
"Override UUID detection" => "Sobrescribir la detección 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." => "Por defecto, el atributo UUID es detectado automáticamente. Este atributo es usado para identificar de manera certera usuarios y grupos LDAP. Además, el nombre de usuario interno será creado en base al UUID, si no fue especificado otro comportamiento más arriba. Podés sobrescribir la configuración y pasar un atributo de tu elección. Tenés que asegurarte que el atributo de tu elección sea accesible por los usuarios y grupos y que sea único. Dejalo en blanco para usar el comportamiento por defecto. Los cambios tendrán efecto sólo en los nuevos usuarios y grupos de LDAP mapeados (agregados).",
"UUID Attribute:" => "Atributo UUID:",
"Username-LDAP User Mapping" => "Asignación del Nombre de usuario de un usuario 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." => "Los usuarios son usados para almacenar y asignar datos (metadatos). Con el fin de identificar de forma precisa y reconocer usuarios, a cada usuario de LDAP se será asignado un nombre de usuario interno. Esto requiere un mapeo entre el nombre de usuario y el usuario del LDAP. El nombre de usuario creado es mapeado respecto al UUID del usuario en el LDAP. De forma adicional, el DN es dejado en caché para reducir la interacción entre el LDAP, pero no es usado para la identificación. Si el DN cambia, los cambios van a ser aplicados. El nombre de usuario interno es usado en todos los lugares. Vaciar los mapeos, deja restos por todas partes. Vaciar los mapeos, no es sensible a configuración, ¡afecta a todas las configuraciones del LDAP! Nunca limpies los mapeos en un entorno de producción, solamente en fase de desarrollo o experimental.",
"Clear Username-LDAP User Mapping" => "Borrar la asignación de los Nombres de usuario de los usuarios LDAP",
"Clear Groupname-LDAP Group Mapping" => "Borrar la asignación de los Nombres de grupo de los grupos de LDAP",
"Test Configuration" => "Probar configuración",
diff --git a/apps/user_ldap/l10n/fr.php b/apps/user_ldap/l10n/fr.php
index 0c7d3ad078f83e328589bab8a57951bb9f8b486e..8b6027b81e6dda2c16df98ffb705ec60510ea692 100644
--- a/apps/user_ldap/l10n/fr.php
+++ b/apps/user_ldap/l10n/fr.php
@@ -16,6 +16,7 @@ $TRANSLATIONS = array(
"Connection test failed" => "Test de connexion échoué",
"Do you really want to delete the current Server Configuration?" => "Êtes-vous vraiment sûr de vouloir effacer la configuration actuelle du serveur ?",
"Confirm Deletion" => "Confirmer la suppression",
+"<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>Avertissement :</b> Les applications user_ldap et user_webdavauth sont incompatibles. Des dysfonctionnements peuvent survenir. Contactez votre administrateur système pour qu'il désactive l'une d'elles.",
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Attention :</b> Le module php LDAP n'est pas installé, par conséquent cette extension ne pourra fonctionner. Veuillez contacter votre administrateur système afin qu'il l'installe.",
"Server configuration" => "Configuration du serveur",
"Add Server Configuration" => "Ajouter une configuration du serveur",
@@ -29,8 +30,11 @@ $TRANSLATIONS = array(
"Password" => "Mot de passe",
"For anonymous access, leave DN and Password empty." => "Pour un accès anonyme, laisser le DN utilisateur et le mot de passe vides.",
"User Login Filter" => "Modèle d'authentification utilisateurs",
+"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Définit le filtre à appliquer lors d'une tentative de connexion. %%uid remplace le nom d'utilisateur lors de la connexion. Exemple : \"uid=%%uid\"",
"User List Filter" => "Filtre d'utilisateurs",
+"Defines the filter to apply, when retrieving users (no placeholders). Example: \"objectClass=person\"" => "Définit le filtre à appliquer lors de la récupération des utilisateurs. Exemple : \"objectClass=person\"",
"Group Filter" => "Filtre de groupes",
+"Defines the filter to apply, when retrieving groups (no placeholders). Example: \"objectClass=posixGroup\"" => "Définit le filtre à appliquer lors de la récupération des groupes. Exemple : \"objectClass=posixGroup\"",
"Connection Settings" => "Paramètres de connexion",
"Configuration Active" => "Configuration active",
"When unchecked, this configuration will be skipped." => "Lorsque non cochée, la configuration sera ignorée.",
@@ -39,19 +43,23 @@ $TRANSLATIONS = array(
"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Fournir un serveur de backup optionnel. Il doit s'agir d'une réplique du serveur LDAP/AD principal.",
"Backup (Replica) Port" => "Port du serveur de backup (réplique)",
"Disable Main Server" => "Désactiver le serveur principal",
+"Only connect to the replica server." => "Se connecter uniquement au serveur de replica.",
"Use TLS" => "Utiliser TLS",
"Do not use it additionally for LDAPS connections, it will fail." => "À ne pas utiliser pour les connexions LDAPS (cela échouera).",
"Case insensitve LDAP server (Windows)" => "Serveur LDAP insensible à la casse (Windows)",
"Turn off SSL certificate validation." => "Désactiver la validation du certificat 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." => "Non recommandé, à utiliser à des fins de tests uniquement. Si la connexion ne fonctionne qu'avec cette option, importez le certificat SSL du serveur LDAP dans le serveur %s.",
"Cache Time-To-Live" => "Durée de vie du cache",
"in seconds. A change empties the cache." => "en secondes. Tout changement vide le cache.",
"Directory Settings" => "Paramètres du répertoire",
"User Display Name Field" => "Champ \"nom d'affichage\" de l'utilisateur",
+"The LDAP attribute to use to generate the user's display name." => "L'attribut LDAP utilisé pour générer le nom d'utilisateur affiché.",
"Base User Tree" => "DN racine de l'arbre utilisateurs",
"One User Base DN per line" => "Un DN racine utilisateur par ligne",
"User Search Attributes" => "Recherche des attributs utilisateur",
"Optional; one attribute per line" => "Optionnel, un attribut par ligne",
"Group Display Name Field" => "Champ \"nom d'affichage\" du groupe",
+"The LDAP attribute to use to generate the groups's display name." => "L'attribut LDAP utilisé pour générer le nom de groupe affiché.",
"Base Group Tree" => "DN racine de l'arbre groupes",
"One Group Base DN per line" => "Un DN racine groupe par ligne",
"Group Search Attributes" => "Recherche des attributs du groupe",
@@ -64,10 +72,13 @@ $TRANSLATIONS = array(
"User Home Folder Naming Rule" => "Convention de nommage du répertoire utilisateur",
"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Laisser vide ",
"Internal Username" => "Nom d'utilisateur interne",
+"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." => "Par défaut le nom d'utilisateur interne sera créé à partir de l'attribut UUID. Ceci permet d'assurer que le nom d'utilisateur est unique et que les caractères ne nécessitent pas de conversion. Le nom d'utilisateur interne doit contenir uniquement les caractères suivants : [ a-zA-Z0-9_.@- ]. Les autres caractères sont remplacés par leur correspondance ASCII ou simplement omis. En cas de collision, un nombre est incrémenté/décrémenté. Le nom d'utilisateur interne est utilisé pour identifier l'utilisateur au sein du système. C'est aussi le nom par défaut du répertoire utilisateur dans ownCloud. C'est aussi le port d'URLs distants, par exemple pour tous les services *DAV. Le comportement par défaut peut être modifié à l'aide de ce paramètre. Pour obtenir un comportement similaire aux versions précédentes à ownCloud 5, saisir le nom d'utilisateur à afficher dans le champ suivant. Laissez à blanc pour le comportement par défaut. Les modifications prendront effet seulement pour les nouveaux (ajoutés) utilisateurs LDAP.",
"Internal Username Attribute:" => "Nom d'utilisateur interne:",
"Override UUID detection" => "Surcharger la détection d'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." => "Par défaut, l'attribut UUID est automatiquement détecté. Cet attribut est utilisé pour identifier les utilisateurs et groupes de façon fiable. Un nom d'utilisateur interne basé sur l'UUID sera automatiquement créé, sauf s'il est spécifié autrement ci-dessus. Vous pouvez modifier ce comportement et définir l'attribut de votre choix. Vous devez alors vous assurer que l'attribut de votre choix peut être récupéré pour les utilisateurs ainsi que pour les groupes et qu'il soit unique. Laisser à blanc pour le comportement par défaut. Les modifications seront effectives uniquement pour les nouveaux (ajoutés) utilisateurs et groupes LDAP.",
"UUID Attribute:" => "Attribut UUID :",
"Username-LDAP User Mapping" => "Association Nom d'utilisateur-Utilisateur 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." => "Les noms d'utilisateurs sont utilisés pour le stockage et l'assignation de (meta) données. Pour identifier et reconnaitre précisément les utilisateurs, chaque utilisateur LDAP aura un nom interne spécifique. Cela requiert l'association d'un nom d'utilisateur ownCloud à un nom d'utilisateur LDAP. Le nom d'utilisateur créé est associé à l'attribut UUID de l'utilisateur LDAP. Par ailleurs, le DN est mémorisé en cache pour limiter les interactions LDAP mais il n'est pas utilisé pour l'identification. Si le DN est modifié, ces modifications seront retrouvées. Seul le nom interne à ownCloud est utilisé au sein du produit. Supprimer les associations créera des orphelins et l'action affectera toutes les configurations LDAP. NE JAMAIS SUPPRIMER LES ASSOCIATIONS EN ENVIRONNEMENT DE PRODUCTION, mais uniquement sur des environnements de tests et d'expérimentation.",
"Clear Username-LDAP User Mapping" => "Supprimer l'association utilisateur interne-utilisateur LDAP",
"Clear Groupname-LDAP Group Mapping" => "Supprimer l'association nom de groupe-groupe LDAP",
"Test Configuration" => "Tester la configuration",
diff --git a/apps/user_ldap/l10n/hu_HU.php b/apps/user_ldap/l10n/hu_HU.php
index 6961869f3e06906d98704342e03ff22f10e3794b..b43dcbc2c8769cbed8d6b2a23b6bb23e24479758 100644
--- a/apps/user_ldap/l10n/hu_HU.php
+++ b/apps/user_ldap/l10n/hu_HU.php
@@ -16,6 +16,7 @@ $TRANSLATIONS = array(
"Connection test failed" => "A kapcsolatellenőrzés eredménye: nem sikerült",
"Do you really want to delete the current Server Configuration?" => "Tényleg törölni szeretné a kiszolgáló beállításait?",
"Confirm Deletion" => "A törlés megerősítése",
+"<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>Figyelem:</b> a user_ldap és user_webdavauth alkalmazások nem kompatibilisek. Együttes használatuk váratlan eredményekhez vezethet. Kérje meg a rendszergazdát, hogy a kettő közül kapcsolja ki az egyiket.",
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Figyelmeztetés:</b> Az LDAP PHP modul nincs telepítve, ezért ez az alrendszer nem fog működni. Kérje meg a rendszergazdát, hogy telepítse!",
"Server configuration" => "A kiszolgálók beállításai",
"Add Server Configuration" => "Új kiszolgáló beállításának hozzáadása",
@@ -29,8 +30,11 @@ $TRANSLATIONS = array(
"Password" => "Jelszó",
"For anonymous access, leave DN and Password empty." => "Bejelentkezés nélküli eléréshez ne töltse ki a DN és Jelszó mezőket!",
"User Login Filter" => "Szűrő a bejelentkezéshez",
+"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Ez a szűrő érvényes a bejelentkezés megkísérlésekor. Ekkor az %%uid változó helyére a bejelentkezési név kerül. Például: \"uid=%%uid\"",
"User List Filter" => "A felhasználók szűrője",
+"Defines the filter to apply, when retrieving users (no placeholders). Example: \"objectClass=person\"" => "Ez a szűrő érvényes a felhasználók listázásakor (nincs helyettesíthető változó). Például: \"objectClass=person\"",
"Group Filter" => "A csoportok szűrője",
+"Defines the filter to apply, when retrieving groups (no placeholders). Example: \"objectClass=posixGroup\"" => "Ez a szűrő érvényes a csoportok listázásakor (nincs helyettesíthető változó). Például: \"objectClass=posixGroup\"",
"Connection Settings" => "Kapcsolati beállítások",
"Configuration Active" => "A beállítás aktív",
"When unchecked, this configuration will be skipped." => "Ha nincs kipipálva, ez a beállítás kihagyódik.",
@@ -39,19 +43,23 @@ $TRANSLATIONS = array(
"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Adjon meg egy opcionális másodkiszolgálót. Ez a fő LDAP/AD kiszolgáló szinkron másolata (replikája) kell legyen.",
"Backup (Replica) Port" => "A másodkiszolgáló (replika) portszáma",
"Disable Main Server" => "A fő szerver kihagyása",
+"Only connect to the replica server." => "Csak a másodlagos (másolati) kiszolgálóhoz kapcsolódjunk.",
"Use TLS" => "Használjunk TLS-t",
"Do not use it additionally for LDAPS connections, it will fail." => "LDAPS kapcsolatok esetén ne kapcsoljuk be, mert nem fog működni.",
"Case insensitve LDAP server (Windows)" => "Az LDAP-kiszolgáló nem tesz különbséget a kis- és nagybetűk között (Windows)",
"Turn off SSL certificate validation." => "Ne ellenőrizzük az SSL-tanúsítvány érvényességét",
+"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." => "Használata nem javasolt (kivéve tesztelési céllal). Ha a kapcsolat csak ezzel a beállítással működik, akkor importálja az LDAP-kiszolgáló SSL tanúsítványát a(z) %s kiszolgálóra!",
"Cache Time-To-Live" => "A gyorsítótár tárolási időtartama",
"in seconds. A change empties the cache." => "másodpercben. A változtatás törli a cache tartalmát.",
"Directory Settings" => "Címtár beállítások",
"User Display Name Field" => "A felhasználónév mezője",
+"The LDAP attribute to use to generate the user's display name." => "Ebből az LDAP attribútumból képződik a felhasználó megjelenítendő neve.",
"Base User Tree" => "A felhasználói fa gyökere",
"One User Base DN per line" => "Soronként egy felhasználói fa gyökerét adhatjuk meg",
"User Search Attributes" => "A felhasználók lekérdezett attribútumai",
"Optional; one attribute per line" => "Nem kötelező megadni, soronként egy attribútum",
"Group Display Name Field" => "A csoport nevének mezője",
+"The LDAP attribute to use to generate the groups's display name." => "Ebből az LDAP attribútumból képződik a csoport megjelenítendő neve.",
"Base Group Tree" => "A csoportfa gyökere",
"One Group Base DN per line" => "Soronként egy csoportfa gyökerét adhatjuk meg",
"Group Search Attributes" => "A csoportok lekérdezett attribútumai",
@@ -64,6 +72,7 @@ $TRANSLATIONS = array(
"User Home Folder Naming Rule" => "A home könyvtár elérési útvonala",
"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Hagyja üresen, ha a felhasználónevet kívánja használni. Ellenkező esetben adjon meg egy LDAP/AD attribútumot!",
"Internal Username" => "Belső felhasználónév",
+"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." => "Alapértelmezetten a belső felhasználónév az UUID tulajdonságból jön létre. Ez biztosítja a felhasználónév egyediségét és hogy a nem kell konvertálni a karaktereket benne. A belső felhasználónévnél a megkötés az, hogy csak a következő karakterek engdélyezettek benne: [ a-zA-Z0-9_.@- ]. Ezeken a karaktereken kivül minden karakter le lesz cserélve az adott karakter ASCII kódtáblában használható párjára vagy ha ilyen nincs akkor egyszerűen ki lesz hagyva. Ha így mégis ütköznének a nevek akkor hozzá lesz füzve egy folyamatosan növekvő számláló rész. A belső felhasználónevet lehet használni a felhasználó azonosítására a programon belül. Illetve ez lesz az alapáértelmezett neve a felhasználó kezdő könyvtárának az ownCloud-ban. Illetve...............................",
"Internal Username Attribute:" => "A belső felhasználónév attribútuma:",
"Override UUID detection" => "Az UUID-felismerés felülbírálása",
"UUID Attribute:" => "UUID attribútum:",
diff --git a/apps/user_ldap/l10n/lt_LT.php b/apps/user_ldap/l10n/lt_LT.php
index 7e8b389af7f318e49a6f6b436935a1af8bf48121..f0522016825353a2bfbf26997d39c68a0e694928 100644
--- a/apps/user_ldap/l10n/lt_LT.php
+++ b/apps/user_ldap/l10n/lt_LT.php
@@ -1,12 +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/nn_NO.php b/apps/user_ldap/l10n/nn_NO.php
index 5e584aa31e35e07ffb8bcf5f755867d0476d7864..470114d9359ea55f56a6d2e3c4a2a637c2dd0a45 100644
--- a/apps/user_ldap/l10n/nn_NO.php
+++ b/apps/user_ldap/l10n/nn_NO.php
@@ -2,6 +2,7 @@
$TRANSLATIONS = array(
"Deletion failed" => "Feil ved sletting",
"Error" => "Feil",
+"Host" => "Tenar",
"Password" => "Passord",
"Help" => "Hjelp"
);
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/sk_SK.php b/apps/user_ldap/l10n/sk_SK.php
index c5bb6a8a50c3f17abefdde988c2e096b29291be1..df71a71e933b5463b3b6ec70c4a162a7582b77bc 100644
--- a/apps/user_ldap/l10n/sk_SK.php
+++ b/apps/user_ldap/l10n/sk_SK.php
@@ -30,8 +30,11 @@ $TRANSLATIONS = array(
"Password" => "Heslo",
"For anonymous access, leave DN and Password empty." => "Pre anonymný prístup ponechajte údaje DN a Heslo prázdne.",
"User Login Filter" => "Filter prihlásenia používateľov",
+"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Určuje použitý filter, pri pokuse o prihlásenie. %%uid nahradzuje používateľské meno v činnosti prihlásenia. Napríklad: \"uid=%%uid\"",
"User List Filter" => "Filter zoznamov používateľov",
+"Defines the filter to apply, when retrieving users (no placeholders). Example: \"objectClass=person\"" => "Definuje použitý filter, pri získavaní používateľov (bez \"placeholderov\"). Napríklad: \"objectClass=osoba\"",
"Group Filter" => "Filter skupiny",
+"Defines the filter to apply, when retrieving groups (no placeholders). Example: \"objectClass=posixGroup\"" => "Definuje použitý filter, pri získavaní skupín (bez \"placeholderov\"). Napríklad: \"objectClass=posixSkupina\"",
"Connection Settings" => "Nastavenie pripojenia",
"Configuration Active" => "Nastavenia sú aktívne ",
"When unchecked, this configuration will be skipped." => "Ak nie je zaškrtnuté, nastavenie bude preskočené.",
@@ -45,6 +48,7 @@ $TRANSLATIONS = array(
"Do not use it additionally for LDAPS connections, it will fail." => "Nepoužívajte pre pripojenie LDAPS, zlyhá.",
"Case insensitve LDAP server (Windows)" => "LDAP server nerozlišuje veľkosť znakov (Windows)",
"Turn off SSL certificate validation." => "Vypnúť overovanie SSL certifikátu.",
+"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." => "Neodporúčané, použite iba pri testovaní! Pokiaľ spojenie funguje iba z daným nastavením, importujte SSL certifikát LDAP servera do vášho %s servera.",
"Cache Time-To-Live" => "Životnosť objektov v cache",
"in seconds. A change empties the cache." => "v sekundách. Zmena vyprázdni vyrovnávaciu pamäť.",
"Directory Settings" => "Nastavenie priečinka",
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_ldap/l10n/sv.php b/apps/user_ldap/l10n/sv.php
index c7fb33195d74de4267a08077cd35ea18665e6648..3288438c09b94a44617d0b14ece333e530510984 100644
--- a/apps/user_ldap/l10n/sv.php
+++ b/apps/user_ldap/l10n/sv.php
@@ -30,8 +30,11 @@ $TRANSLATIONS = array(
"Password" => "Lösenord",
"For anonymous access, leave DN and Password empty." => "För anonym åtkomst, lämna DN och lösenord tomt.",
"User Login Filter" => "Filter logga in användare",
+"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Definierar filter som tillämpas vid inloggning. %%uid ersätter användarnamn vid inloggningen. Exempel: \"uid=%%uid\"",
"User List Filter" => "Filter lista användare",
+"Defines the filter to apply, when retrieving users (no placeholders). Example: \"objectClass=person\"" => "Definierar filter som tillämpas vid sökning efter användare (inga platshållare). Exempel: \"objectClass=person\"",
"Group Filter" => "Gruppfilter",
+"Defines the filter to apply, when retrieving groups (no placeholders). Example: \"objectClass=posixGroup\"" => "Definierar filter som tillämpas vid sökning efter grupper (inga platshållare). Exempel: \"objectClass=posixGroup\"",
"Connection Settings" => "Uppkopplingsinställningar",
"Configuration Active" => "Konfiguration aktiv",
"When unchecked, this configuration will be skipped." => "Ifall denna är avbockad så kommer konfigurationen att skippas.",
@@ -45,6 +48,7 @@ $TRANSLATIONS = array(
"Do not use it additionally for LDAPS connections, it will fail." => "Använd inte för LDAPS-anslutningar, det kommer inte att fungera.",
"Case insensitve LDAP server (Windows)" => "LDAP-servern är okänslig för gemener och versaler (Windows)",
"Turn off SSL certificate validation." => "Stäng av verifiering av SSL-certifikat.",
+"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." => "Rekommenderas inte, använd endast för test! Om anslutningen bara fungerar med denna inställning behöver du importera LDAP-serverns SSL-certifikat till din %s server.",
"Cache Time-To-Live" => "Cache Time-To-Live",
"in seconds. A change empties the cache." => "i sekunder. En förändring tömmer cache.",
"Directory Settings" => "Mappinställningar",
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/es.php b/apps/user_webdavauth/l10n/es.php
index cd8ec6659a4f519e21a8b333282215c3555e0f6b..951aabe24aed434a87e6cf46c4f298c41920ac8b 100644
--- a/apps/user_webdavauth/l10n/es.php
+++ b/apps/user_webdavauth/l10n/es.php
@@ -1,7 +1,7 @@
<?php
$TRANSLATIONS = array(
-"WebDAV Authentication" => "Autenticación de WevDAV",
+"WebDAV Authentication" => "Autenticación mediante WevDAV",
"Address: " => "Dirección:",
-"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." => "onwCloud enviará las credenciales de usuario a esta dirección. Este complemento verifica la respuesta e interpretará los códigos de respuesta HTTP 401 y 403 como credenciales inválidas y todas las otras respuestas como credenciales válidas."
+"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." => "Las credenciales de usuario se enviarán a esta dirección. Este complemento verifica la respuesta e interpretará los códigos de respuesta HTTP 401 y 403 como credenciales inválidas y todas las otras respuestas como credenciales válidas."
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/es_AR.php b/apps/user_webdavauth/l10n/es_AR.php
index 608b0ad817938738d8db88727e0427e45e81a36f..4ec0bf5a626c55dd0429a983fc89b0f611a702af 100644
--- a/apps/user_webdavauth/l10n/es_AR.php
+++ b/apps/user_webdavauth/l10n/es_AR.php
@@ -1,5 +1,7 @@
<?php
$TRANSLATIONS = array(
-"WebDAV Authentication" => "Autenticación de WevDAV"
+"WebDAV Authentication" => "Autenticación de WebDAV",
+"Address: " => "Dirección:",
+"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." => "Las credenciales del usuario serán enviadas a esta dirección. Este plug-in verificará la respuesta e interpretará los códigos de estado HTTP 401 y 403 como credenciales inválidas y cualquier otra respuesta como válida."
);
$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/apps/user_webdavauth/l10n/fr.php b/apps/user_webdavauth/l10n/fr.php
index 0130e35c816a62fca579fffc657d50226d1a421c..709fa53dac5b807362b794bb588f020d0917da16 100644
--- a/apps/user_webdavauth/l10n/fr.php
+++ b/apps/user_webdavauth/l10n/fr.php
@@ -1,5 +1,7 @@
<?php
$TRANSLATIONS = array(
-"WebDAV Authentication" => "Authentification WebDAV"
+"WebDAV Authentication" => "Authentification WebDAV",
+"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." => "Les informations de connexion de l'utilisateur seront envoyées à cette adresse. Ce module analyse le code de la réponse HTTP et considère les codes 401 et 403 comme une authentification invalide et tout autre valeur comme une authentification valide."
);
$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/user_webdavauth/l10n/hu_HU.php b/apps/user_webdavauth/l10n/hu_HU.php
index 63fc084ff4cf7f2a73754d3f960d3db8f8eb9cdc..0b946e25e70fa212f198c9076bb835c42b1c02a0 100644
--- a/apps/user_webdavauth/l10n/hu_HU.php
+++ b/apps/user_webdavauth/l10n/hu_HU.php
@@ -1,5 +1,7 @@
<?php
$TRANSLATIONS = array(
-"WebDAV Authentication" => "WebDAV hitelesítés"
+"WebDAV Authentication" => "WebDAV hitelesítés",
+"Address: " => "Címek:",
+"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." => "A felhasználói hitelesítő adatai el lesznek küldve erre a címre. Ez a bővítőmodul leellenőrzi a választ és ha a HTTP hibakód nem 401 vagy 403 azaz érvénytelen a hitelesítő adat, akkor minden más válasz érvényes lesz."
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/lt_LT.php b/apps/user_webdavauth/l10n/lt_LT.php
index 90fc2d5ac3ef78e253f0e061694a9a331e719141..41a7fa9502d52832ac244ad9d05e3d2acb3b97fc 100644
--- a/apps/user_webdavauth/l10n/lt_LT.php
+++ b/apps/user_webdavauth/l10n/lt_LT.php
@@ -1,5 +1,7 @@
<?php
$TRANSLATIONS = array(
-"WebDAV Authentication" => "WebDAV autorizavimas"
+"WebDAV Authentication" => "WebDAV autentikacija",
+"Address: " => "Adresas:",
+"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." => "Naudotojo duomenys bus nusiųsti šiuo adresu. Šis įskiepis patikrins gautą atsakymą ir interpretuos HTTP būsenos kodą 401 ir 403 kaip negaliojančius duomenis, ir visus kitus gautus atsakymus kaip galiojančius duomenis. "
);
$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_webdavauth/l10n/nn_NO.php b/apps/user_webdavauth/l10n/nn_NO.php
index 519b942f9f53b750709090673b377bdbba73c61b..909231b5f5826ca6c91bd72e77bec3bc5b03d24e 100644
--- a/apps/user_webdavauth/l10n/nn_NO.php
+++ b/apps/user_webdavauth/l10n/nn_NO.php
@@ -1,5 +1,7 @@
<?php
$TRANSLATIONS = array(
-"WebDAV Authentication" => "WebDAV-autentisering"
+"WebDAV Authentication" => "WebDAV-autentisering",
+"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." => "Innloggingsinformasjon blir sendt til denne nettadressa. Dette programtillegget kontrollerer svaret og tolkar HTTP-statuskodane 401 og 403 som ugyldige, og alle andre svar som gyldige."
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/uk.php b/apps/user_webdavauth/l10n/uk.php
index fcde044ec753d256dea8b03b62b13f09ebeca92f..dff8b308c5d5f0f2ba36c02b34d8f9977b6e63f4 100644
--- a/apps/user_webdavauth/l10n/uk.php
+++ b/apps/user_webdavauth/l10n/uk.php
@@ -1,5 +1,6 @@
<?php
$TRANSLATIONS = array(
-"WebDAV Authentication" => "Аутентифікація WebDAV"
+"WebDAV Authentication" => "Аутентифікація WebDAV",
+"Address: " => "Адреса:"
);
$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/user_webdavauth/l10n/zh_CN.php b/apps/user_webdavauth/l10n/zh_CN.php
index 69046042160cdb6cde7fd9e865d648bc613d5c9d..a225ea7f577edf1c76ee2a0e43e65c7b194b27a6 100644
--- a/apps/user_webdavauth/l10n/zh_CN.php
+++ b/apps/user_webdavauth/l10n/zh_CN.php
@@ -1,5 +1,7 @@
<?php
$TRANSLATIONS = array(
-"WebDAV Authentication" => "WebDAV 认证"
+"WebDAV Authentication" => "WebDAV 认证",
+"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." => "用户的身份将会被发送到此 URL。这个插件检查返回值并且将 HTTP 状态编码 401 和 403 解释为非法身份，其他所有返回值为合法身份。"
);
$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/autotest.sh b/autotest.sh
index a343f6a25ab7bb887b2d1135614e9229316315e3..83f184fa9c065fa12088d700536b4405d4b57182 100755
--- a/autotest.sh
+++ b/autotest.sh
@@ -142,12 +142,7 @@ EOF
rm -rf coverage-html-$1
mkdir coverage-html-$1
php -f enable_all.php
- if [ "$1" == "sqlite" ] ; then
- # coverage only with sqlite - causes segfault on ci.tmit.eu - reason unknown
- phpunit --configuration phpunit-autotest.xml --log-junit autotest-results-$1.xml --coverage-clover autotest-clover-$1.xml --coverage-html coverage-html-$1 $2 $3
- else
- phpunit --configuration phpunit-autotest.xml --log-junit autotest-results-$1.xml $2 $3
- fi
+ phpunit --configuration phpunit-autotest.xml --log-junit autotest-results-$1.xml --coverage-clover autotest-clover-$1.xml --coverage-html coverage-html-$1 $2 $3
}
#
diff --git a/config/config.sample.php b/config/config.sample.php
index 24ba541ac5c8d5f268df6b66db305a0aafc42bb4..29085af4716240f866ad22087180fc86cab2edda 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -71,9 +71,6 @@ $CONFIG = array(
/* Enable the help menu item in the settings */
"knowledgebaseenabled" => true,
-/* URL to use for the help page, server should understand OCS */
-"knowledgebaseurl" => "http://api.apps.owncloud.com/v1",
-
/* Enable installing apps from the appstore */
"appstoreenabled" => true,
@@ -141,10 +138,22 @@ $CONFIG = array(
/* Loglevel to start logging at. 0=DEBUG, 1=INFO, 2=WARN, 3=ERROR (default is WARN) */
"loglevel" => "",
+/* date format to be used while writing to the owncloud logfile */
+'logdateformat' => 'F d, Y H:i:s',
+
/* Append all database queries and parameters to the log file.
(watch out, this option can increase the size of your log file)*/
"log_query" => false,
+/*
+ * Configure the size in bytes log rotation should happen, 0 or false disables the rotation.
+ * This rotates the current owncloud logfile to a new name, this way the total log usage
+ * will stay limited and older entries are available for a while longer. The
+ * total disk usage is twice the configured size.
+ * WARNING: When you use this, the log entries will eventually be lost.
+ */
+'log_rotate_size' => false, // 104857600, // 100 MiB
+
/* Lifetime of the remember login cookie, default is 15 days */
"remember_login_cookie_lifetime" => 60*60*24*15,
@@ -190,6 +199,24 @@ $CONFIG = array(
'customclient_android' => '', //https://play.google.com/store/apps/details?id=com.owncloud.android
'customclient_ios' => '', //https://itunes.apple.com/us/app/owncloud/id543672169?mt=8
-// date format to be used while writing to the owncloud logfile
-'logdateformat' => 'F d, Y H:i:s'
+// PREVIEW
+'enable_previews' => true,
+/* the max width of a generated preview, if value is null, there is no limit */
+'preview_max_x' => null,
+/* the max height of a generated preview, if value is null, there is no limit */
+'preview_max_y' => null,
+/* the max factor to scale a preview, default is set to 10 */
+'preview_max_scale_factor' => 10,
+/* custom path for libreoffice / openoffice binary */
+'preview_libreoffice_path' => '/usr/bin/libreoffice',
+/* cl parameters for libreoffice / openoffice */
+'preview_office_cl_parameters' => '',
+
+/* whether avatars should be enabled */
+'enable_avatars' => true,
+
+// Extra SSL options to be used for configuration
+'openssl' => array(
+ //'config' => '/absolute/location/of/openssl.cnf',
+),
);
diff --git a/console.php b/console.php
index 4aec5bdc24ffe1bb32ca0ddb0d9bc8f1b4499457..25b8b312539309e2c4ff8b4dcdb29d98602e7470 100644
--- a/console.php
+++ b/console.php
@@ -6,6 +6,8 @@
* See the COPYING-README file.
*/
+use Symfony\Component\Console\Application;
+
$RUNTIME_NOAPPS = true;
require_once 'lib/base.php';
@@ -20,17 +22,13 @@ if (!OC::$CLI) {
exit(0);
}
-if ($argc <= 1) {
- echo "Usage:" . PHP_EOL;
- echo " " . basename($argv[0]) . " <command>" . PHP_EOL;
- exit(0);
-}
-
-$command = $argv[1];
-array_shift($argv);
-
-if ($command === 'files:scan') {
- require_once 'apps/files/console/scan.php';
-} else {
- echo "Unknown command '$command'" . PHP_EOL;
+$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/ajax/preview.php b/core/ajax/preview.php
new file mode 100644
index 0000000000000000000000000000000000000000..af0f0493f4ce67e8e7706ab2709f1a7afe930312
--- /dev/null
+++ b/core/ajax/preview.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Copyright (c) 2013 Georg Ehrke georg@ownCloud.com
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+\OC_Util::checkLoggedIn();
+
+$file = array_key_exists('file', $_GET) ? (string) urldecode($_GET['file']) : '';
+$maxX = array_key_exists('x', $_GET) ? (int) $_GET['x'] : '36';
+$maxY = array_key_exists('y', $_GET) ? (int) $_GET['y'] : '36';
+$scalingUp = array_key_exists('scalingup', $_GET) ? (bool) $_GET['scalingup'] : true;
+
+if($file === '') {
+ //400 Bad Request
+ \OC_Response::setStatus(400);
+ \OC_Log::write('core-preview', 'No file parameter was passed', \OC_Log::DEBUG);
+ exit;
+}
+
+if($maxX === 0 || $maxY === 0) {
+ //400 Bad Request
+ \OC_Response::setStatus(400);
+ \OC_Log::write('core-preview', 'x and/or y set to 0', \OC_Log::DEBUG);
+ exit;
+}
+
+try{
+ $preview = new \OC\Preview(\OC_User::getUser(), 'files');
+ $preview->setFile($file);
+ $preview->setMaxX($maxX);
+ $preview->setMaxY($maxY);
+ $preview->setScalingUp($scalingUp);
+
+ $preview->show();
+}catch(\Exception $e) {
+ \OC_Response::setStatus(500);
+ \OC_Log::write('core', $e->getmessage(), \OC_Log::DEBUG);
+}
\ No newline at end of file
diff --git a/core/ajax/share.php b/core/ajax/share.php
index bdcb61284ecdd8603a7165790c4d7420fed49d53..648f0a71bd44da7c93fbaccb88388c7db92aac99 100644
--- a/core/ajax/share.php
+++ b/core/ajax/share.php
@@ -181,10 +181,10 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
// }
// }
// }
+ $groups = OC_Group::getGroups($_GET['search']);
if ($sharePolicy == 'groups_only') {
- $groups = OC_Group::getUserGroups(OC_User::getUser());
- } else {
- $groups = OC_Group::getGroups();
+ $usergroups = OC_Group::getUserGroups(OC_User::getUser());
+ $groups = array_intersect($groups, $usergroups);
}
$count = 0;
$users = array();
@@ -213,15 +213,18 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
}
}
$count = 0;
+
+ // enable l10n support
+ $l = OC_L10N::get('core');
+
foreach ($groups as $group) {
if ($count < 15) {
- if (stripos($group, $_GET['search']) !== false
- && (!isset($_GET['itemShares'])
+ if (!isset($_GET['itemShares'])
|| !isset($_GET['itemShares'][OCP\Share::SHARE_TYPE_GROUP])
|| !is_array($_GET['itemShares'][OCP\Share::SHARE_TYPE_GROUP])
- || !in_array($group, $_GET['itemShares'][OCP\Share::SHARE_TYPE_GROUP]))) {
+ || !in_array($group, $_GET['itemShares'][OCP\Share::SHARE_TYPE_GROUP])) {
$shareWith[] = array(
- 'label' => $group.' (group)',
+ 'label' => $group.' ('.$l->t('group').')',
'value' => array(
'shareType' => OCP\Share::SHARE_TYPE_GROUP,
'shareWith' => $group
diff --git a/core/avatar/controller.php b/core/avatar/controller.php
new file mode 100644
index 0000000000000000000000000000000000000000..22693824461d70fe87d8c1c0ee13db9bbce0621e
--- /dev/null
+++ b/core/avatar/controller.php
@@ -0,0 +1,158 @@
+<?php
+/**
+ * Copyright (c) 2013 Christopher Schäpers <christopher@schaepers.it>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\Core\Avatar;
+
+class Controller {
+ public static function getAvatar($args) {
+ \OC_JSON::checkLoggedIn();
+ \OC_JSON::callCheck();
+
+ $user = stripslashes($args['user']);
+ $size = (int)$args['size'];
+ if ($size > 2048) {
+ $size = 2048;
+ }
+ // Undefined size
+ elseif ($size === 0) {
+ $size = 64;
+ }
+
+ $avatar = new \OC_Avatar($user);
+ $image = $avatar->get($size);
+
+ \OC_Response::disableCaching();
+ \OC_Response::setLastModifiedHeader(time());
+ if ($image instanceof \OC_Image) {
+ \OC_Response::setETagHeader(crc32($image->data()));
+ $image->show();
+ } else {
+ // Signalizes $.avatar() to display a defaultavatar
+ \OC_JSON::success(array("data"=> array("displayname"=> \OC_User::getDisplayName($user)) ));
+ }
+ }
+
+ public static function postAvatar($args) {
+ \OC_JSON::checkLoggedIn();
+ \OC_JSON::callCheck();
+
+ $user = \OC_User::getUser();
+
+ if (isset($_POST['path'])) {
+ $path = stripslashes($_POST['path']);
+ $view = new \OC\Files\View('/'.$user.'/files');
+ $newAvatar = $view->file_get_contents($path);
+ } elseif (!empty($_FILES)) {
+ $files = $_FILES['files'];
+ if (
+ $files['error'][0] === 0 &&
+ is_uploaded_file($files['tmp_name'][0]) &&
+ !\OC\Files\Filesystem::isFileBlacklisted($files['tmp_name'][0])
+ ) {
+ $newAvatar = file_get_contents($files['tmp_name'][0]);
+ unlink($files['tmp_name'][0]);
+ }
+ } else {
+ $l = new \OC_L10n('core');
+ \OC_JSON::error(array("data" => array("message" => $l->t("No image or file provided")) ));
+ return;
+ }
+
+ try {
+ $avatar = new \OC_Avatar($user);
+ $avatar->set($newAvatar);
+ \OC_JSON::success();
+ } catch (\OC\NotSquareException $e) {
+ $image = new \OC_Image($newAvatar);
+
+ if ($image->valid()) {
+ \OC_Cache::set('tmpavatar', $image->data(), 7200);
+ \OC_JSON::error(array("data" => "notsquare"));
+ } else {
+ $l = new \OC_L10n('core');
+
+ $mimeType = $image->mimeType();
+ if ($mimeType !== 'image/jpeg' && $mimeType !== 'image/png') {
+ \OC_JSON::error(array("data" => array("message" => $l->t("Unknown filetype")) ));
+ }
+
+ if (!$image->valid()) {
+ \OC_JSON::error(array("data" => array("message" => $l->t("Invalid image")) ));
+ }
+ }
+ } catch (\Exception $e) {
+ \OC_JSON::error(array("data" => array("message" => $e->getMessage()) ));
+ }
+ }
+
+ public static function deleteAvatar($args) {
+ \OC_JSON::checkLoggedIn();
+ \OC_JSON::callCheck();
+
+ $user = \OC_User::getUser();
+
+ try {
+ $avatar = new \OC_Avatar($user);
+ $avatar->remove();
+ \OC_JSON::success();
+ } catch (\Exception $e) {
+ \OC_JSON::error(array("data" => array("message" => $e->getMessage()) ));
+ }
+ }
+
+ public static function getTmpAvatar($args) {
+ \OC_JSON::checkLoggedIn();
+ \OC_JSON::callCheck();
+
+ $tmpavatar = \OC_Cache::get('tmpavatar');
+ if (is_null($tmpavatar)) {
+ $l = new \OC_L10n('core');
+ \OC_JSON::error(array("data" => array("message" => $l->t("No temporary profile picture available, try again")) ));
+ return;
+ }
+
+ $image = new \OC_Image($tmpavatar);
+ \OC_Response::disableCaching();
+ \OC_Response::setLastModifiedHeader(time());
+ \OC_Response::setETagHeader(crc32($image->data()));
+ $image->show();
+ }
+
+ public static function postCroppedAvatar($args) {
+ \OC_JSON::checkLoggedIn();
+ \OC_JSON::callCheck();
+
+ $user = \OC_User::getUser();
+ if (isset($_POST['crop'])) {
+ $crop = $_POST['crop'];
+ } else {
+ $l = new \OC_L10n('core');
+ \OC_JSON::error(array("data" => array("message" => $l->t("No crop data provided")) ));
+ return;
+ }
+
+ $tmpavatar = \OC_Cache::get('tmpavatar');
+ if (is_null($tmpavatar)) {
+ $l = new \OC_L10n('core');
+ \OC_JSON::error(array("data" => array("message" => $l->t("No temporary profile picture available, try again")) ));
+ return;
+ }
+
+ $image = new \OC_Image($tmpavatar);
+ $image->crop($crop['x'], $crop['y'], $crop['w'], $crop['h']);
+ try {
+ $avatar = new \OC_Avatar($user);
+ $avatar->set($image->data());
+ // Clean up
+ \OC_Cache::remove('tmpavatar');
+ \OC_JSON::success();
+ } catch (\Exception $e) {
+ \OC_JSON::error(array("data" => array("message" => $e->getMessage()) ));
+ }
+ }
+}
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/css/apps.css b/core/css/apps.css
new file mode 100644
index 0000000000000000000000000000000000000000..f6c20e6cc6a420d3da2f854f639ed464bf47c5c2
--- /dev/null
+++ b/core/css/apps.css
@@ -0,0 +1,238 @@
+/* ---- APP STYLING ---- */
+
+#app {
+ height: 100%;
+ width: 100%;
+}
+#app * {
+ -moz-box-sizing: border-box; box-sizing: border-box;
+}
+
+/* Navigation: folder like structure */
+#app-navigation {
+ width: 300px;
+ height: 100%;
+ float: left;
+ -moz-box-sizing: border-box; box-sizing: border-box;
+ background-color: #f8f8f8;
+ border-right: 1px solid #ccc;
+ padding-bottom: 44px;
+}
+#app-navigation > ul {
+ height: 100%;
+ overflow: auto;
+ -moz-box-sizing: border-box; box-sizing: border-box;
+}
+#app-navigation li {
+ position: relative;
+ width: 100%;
+ -moz-box-sizing: border-box; box-sizing: border-box;
+ text-shadow: 0 1px 0 rgba(255,255,255,.9);
+}
+#app-navigation .active,
+#app-navigation .active a,
+#app-navigation li:hover > a {
+ background-color: #ddd;
+ text-shadow: 0 1px 0 rgba(255,255,255,.7);
+}
+
+/* special rules for first-level entries and folders */
+#app-navigation > ul > li {
+ background-color: #f8f8f8;
+}
+
+#app-navigation .with-icon a {
+ padding-left: 44px;
+ background-size: 16px 16px;
+ background-position: 14px center;
+ background-repeat: no-repeat;
+}
+
+#app-navigation li > a {
+ display: block;
+ width: 100%;
+ line-height: 44px;
+ padding: 0 12px;
+ overflow: hidden;
+ -moz-box-sizing: border-box; box-sizing: border-box;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ color: #333;
+}
+
+#app-navigation .collapse {
+ display: none; /* hide collapse button intially */
+}
+#app-navigation .collapsible > .collapse {
+ position: absolute;
+ height: 44px;
+ width: 44px;
+ margin: 0;
+ padding: 0;
+ background: none; background-image: url('../img/actions/triangle-s.svg');
+ background-size: 16px; background-repeat: no-repeat; background-position: center;
+ border: none;
+ border-radius: 0;
+ outline: none !important;
+ box-shadow: none;
+}
+#app-navigation .collapsible:hover > a {
+ background-image: none;
+}
+#app-navigation .collapsible:hover > .collapse {
+ display: block;
+}
+
+#app-navigation .collapsible .collapse {
+ -moz-transform: rotate(-90deg);
+ -webkit-transform: rotate(-90deg);
+ -ms-transform:rotate(-90deg);
+ -o-transform:rotate(-90deg);
+ transform: rotate(-90deg);
+}
+#app-navigation .collapsible.open .collapse {
+ -moz-transform: rotate(0);
+ -webkit-transform: rotate(0);
+ -ms-transform:rotate(0);
+ -o-transform:rotate(0);
+ transform: rotate(0);
+}
+
+/* Second level nesting for lists */
+#app-navigation > ul ul {
+ display: none;
+}
+#app-navigation > ul ul li > a {
+ padding-left: 32px;
+}
+#app-navigation > .with-icon ul li > a {
+ padding-left: 48px;
+ background-position: 24px center;
+}
+
+#app-navigation .open {
+ background-image: linear-gradient(top, rgb(238,238,238) 0%, rgb(245,245,245) 100%);
+ background-image: -o-linear-gradient(top, rgb(238,238,238) 0%, rgb(245,245,245) 100%);
+ background-image: -moz-linear-gradient(top, rgb(238,238,238) 0%, rgb(245,245,245) 100%);
+ background-image: -webkit-linear-gradient(top, rgb(238,238,238) 0%, rgb(245,245,245) 100%);
+ background-image: -ms-linear-gradient(top, rgb(238,238,238) 0%, rgb(245,245,245) 100%);
+}
+
+#app-navigation > ul .open:hover {
+ -moz-box-shadow: inset 0 0 3px #ccc; -webkit-box-shadow: inset 0 0 3px #ccc; box-shadow: inset 0 0 3px #ccc;
+}
+
+#app-navigation > ul .open ul {
+ display: block;
+}
+
+
+/* counter and actions */
+#app-navigation .utils {
+ position: absolute;
+ padding: 7px 7px 0 0;
+ right: 0;
+ top: 0;
+ bottom: 0;
+ font-size: 12px;
+}
+ #app-navigation .utils button,
+ #app-navigation .utils .counter {
+ width: 44px;
+ height: 44px;
+ padding-top: 12px;
+ }
+
+
+/* drag and drop */
+#app-navigation .drag-and-drop {
+ -moz-transition: padding-bottom 500ms ease 0s;
+ -o-transition: padding-bottom 500ms ease 0s;
+ -webkit-transition: padding-bottom 500ms ease 0s;
+ -ms-transition: padding-bottom 500ms ease 0s;
+ transition: padding-bottom 500ms ease 0s;
+ padding-bottom: 40px;
+}
+#app-navigation .personalblock > legend { /* TODO @Raydiation: still needed? */
+ padding: 10px 0; margin: 0;
+}
+#app-navigation .error {
+ color: #dd1144;
+}
+
+#app-navigation .app-navigation-separator {
+ border-bottom: 1px solid #ddd;
+}
+
+
+
+/* Part where the content will be loaded into */
+#app-content {
+ height: 100%;
+ overflow-y: auto;
+}
+
+/* settings area */
+#app-settings {
+ position: fixed;
+ width: 299px;
+ bottom: 0;
+ border-top: 1px solid #ccc;
+}
+#app-settings-header {
+ background-color: #eee;
+}
+#app-settings-content {
+ display: none;
+ padding: 10px;
+ background-color: #eee;
+}
+#app-settings.open #app-settings-content {
+ display: block;
+}
+
+.settings-button {
+ display: block;
+ height: 44px;
+ width: 100%;
+ padding: 0;
+ margin: 0;
+ background-color: transparent; background-image: url('../img/actions/settings.svg');
+ background-position: 10px center; background-repeat: no-repeat;
+ box-shadow: none;
+ border: 0;
+ border-radius: 0;
+}
+.settings-button:hover {
+ background-color: #ddd;
+}
+
+/* icons */
+.folder-icon, .delete-icon, .edit-icon, .progress-icon {
+ background-repeat: no-repeat;
+ background-position: center;
+}
+.folder-icon { background-image: url('../img/places/folder.svg'); }
+.delete-icon { background-image: url('../img/actions/delete.svg'); }
+.delete-icon:hover, .delete-icon:focus {
+ background-image: url('../img/actions/delete-hover.svg');
+}
+.edit-icon { background-image: url('../img/actions/rename.svg'); }
+.progress-icon {
+ background-image: url('../img/loading.gif');
+ background-size: 16px;
+ /* force show the loading icon, not only on hover */
+ -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
+ filter:alpha(opacity=100);
+ opacity: 1 !important;
+ display: inline !important;
+}
+
+/* buttons */
+button.loading {
+ background-image: url('../img/loading.gif');
+ background-position: right 10px center; background-repeat: no-repeat;
+ background-size: 16px;
+ padding-right: 30px;
+}
+
diff --git a/core/css/fixes.css b/core/css/fixes.css
new file mode 100644
index 0000000000000000000000000000000000000000..a33bd94bb10f0f3e20015e3f9babc8e07c63e27f
--- /dev/null
+++ b/core/css/fixes.css
@@ -0,0 +1,50 @@
+/* ---- BROWSER-SPECIFIC FIXES ---- */
+
+/* remove dotted outlines in Firefox */
+::-moz-focus-inner {
+ border: 0;
+}
+
+.lte8 .delete-icon { background-image: url('../img/actions/delete.png'); }
+.lte8 .delete-icon:hover, .delete-icon:focus {
+ background-image: url('../img/actions/delete-hover.png');
+}
+
+/* IE8 needs background to be set to same color to make transparency look good. */
+.lte9 #body-login form input[type="text"] {
+ border: 1px solid lightgrey; /* use border to add 1px line between input fields */
+ background-color: white; /* don't change background on hover */
+}
+.lte9 #body-login form input[type="password"] {
+ /* leave out top border for 1px line between input fields*/
+ border-left: 1px solid lightgrey;
+ border-right: 1px solid lightgrey;
+ border-bottom: 1px solid lightgrey;
+ background-color: white; /* don't change background on hover */
+}
+.lte9 #body-login form label.infield {
+ background-color: white; /* don't change background on hover */
+ -ms-filter: "progid:DXImageTransform.Microsoft.Chroma(color='white')";
+}
+
+/* disable opacity of info text on gradient
+ since we cannot set a good backround color to use the filter&background hack as with the input labels */
+.lte9 #body-login p.info {
+ filter: initial;
+}
+
+/* deactivate show password toggle for IE. Does not work for 8 and 9+ have their own implementation. */
+.ie #show, .ie #show+label {
+ display: none;
+ visibility: hidden;
+}
+
+/* fix installation screen rendering issue for IE8+9 */
+.lte9 #body-login {
+ height: auto !important;
+}
+
+/* oc-dialog only uses box shadow which is not supported by ie8 */
+.ie8 .oc-dialog {
+ border: 1px solid #888888;
+}
diff --git a/core/css/styles.css b/core/css/styles.css
index dee0778afbb3edeeed1d5e4881fec299ea0c35d3..dcdeda8a9c95d7aecf57db686a81bb23f23b8e4f 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -40,6 +40,11 @@ body { background:#fefefe; font:normal .8em/1.6em "Helvetica Neue",Helvetica,Ari
.header-right { float:right; vertical-align:middle; padding:0.5em; }
.header-right > * { vertical-align:middle; }
+#header .avatardiv {
+ text-shadow: none;
+ float: left;
+ display: inline-block;
+}
/* INPUTS */
input[type="text"], input[type="password"], input[type="search"], input[type="number"], input[type="email"], input[type="url"],
@@ -145,18 +150,25 @@ a.disabled, a.disabled:hover, a.disabled:focus {
.searchbox input[type="search"] { font-size:1.2em; padding:.2em .5em .2em 1.5em; background:#fff url('../img/actions/search.svg') no-repeat .5em center; border:0; -moz-border-radius:1em; -webkit-border-radius:1em; border-radius:1em; -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=70)"; filter:alpha(opacity=70);opacity:.7; -webkit-transition:opacity 300ms; -moz-transition:opacity 300ms; -o-transition:opacity 300ms; transition:opacity 300ms; margin-top:10px; float:right; }
input[type="submit"].enabled { background:#66f866; border:1px solid #5e5; -moz-box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #cfc inset; -webkit-box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #cfc inset; box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #cfc inset; }
-#select_all{ margin-top:.4em }
+
+
/* CONTENT ------------------------------------------------------------------ */
#controls {
- position:fixed;
- height:2.8em; width:100%;
- padding:0 70px 0 0.5em; margin:0;
- -moz-box-sizing:border-box; box-sizing:border-box;
- -moz-box-shadow:0 -3px 7px #000; -webkit-box-shadow:0 -3px 7px #000; box-shadow:0 -3px 7px #000;
- background:#eee; border-bottom:1px solid #e7e7e7; z-index:50;
+ position: fixed;
+ height: 36px;
+ width: 100%;
+ padding: 0 75px 0 6px;
+ margin: 0;
+ background: #eee;
+ border-bottom: 1px solid #e7e7e7;
+ z-index: 50;
+ -moz-box-sizing: border-box; box-sizing: border-box;
+ -moz-box-shadow: 0 -3px 7px #000; -webkit-box-shadow: 0 -3px 7px #000; box-shadow: 0 -3px 7px #000;
+}
+#controls .button {
+ display: inline-block;
}
-#controls .button { display:inline-block; }
#content { position:relative; height:100%; width:100%; }
#content .hascontrols { position: relative; top: 2.9em; }
@@ -176,7 +188,14 @@ input[type="submit"].enabled { background:#66f866; border:1px solid #5e5; -moz-b
#leftcontent a { height:100%; display:block; margin:0; padding:0 1em 0 0; float:left; }
#rightcontent, .rightcontent { position:fixed; top:6.4em; left:24.5em; overflow:auto }
-
+#emptycontent {
+ font-size:1.5em; font-weight:bold;
+ color:#888; text-shadow:#fff 0 1px 0;
+ position: absolute;
+ text-align: center;
+ top: 50%;
+ width: 100%;
+}
/* LOG IN & INSTALLATION ------------------------------------------------------------ */
@@ -255,9 +274,9 @@ input[name="adminpass-clone"] { padding-left:1.8em; width:11.7em !important; }
#body-login input[type="password"],
#body-login input[type="email"] {
border: 1px solid #323233;
- -moz-box-shadow: 0 1px 0 rgba(255,255,255,.15), 0 1px 3px rgba(0,0,0,.25) inset;
- -webkit-box-shadow: 0 1px 0 rgba(255,255,255,.15), 0 1px 3px rgba(0,0,0,.25) inset;
- box-shadow: 0 1px 0 rgba(255,255,255,.15), 0 1px 3px rgba(0,0,0,.25) inset;
+ -moz-box-shadow: 0 1px 0 rgba(255,255,255,.15), 0 1px 1px rgba(0,0,0,.25) inset;
+ -webkit-box-shadow: 0 1px 0 rgba(255,255,255,.15), 0 1px 1px rgba(0,0,0,.25) inset;
+ box-shadow: 0 1px 0 rgba(255,255,255,.15), 0 1px 1px rgba(0,0,0,.25) inset;
}
/* Nicely grouping input field sets */
@@ -501,6 +520,9 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; }
#navigation:hover {
overflow-y: auto; /* show scrollbar only on hover */
}
+#apps {
+ height: 100%;
+}
#navigation a span {
display: block;
text-decoration: none;
@@ -545,14 +567,39 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; }
padding-top: 20px;
}
+/* Apps management as sticky footer, less obtrusive in the list */
+#navigation .wrapper {
+ min-height: 100%;
+ margin: 0 auto -72px;
+}
+#apps-management, #navigation .push {
+ height: 70px;
+}
#apps-management {
+ -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=60)";
+ filter: alpha(opacity=60);
opacity: .6;
}
+#apps-management .icon {
+ padding-bottom: 0;
+}
+
+
/* USER MENU */
-#settings { float:right; margin-top:7px; color:#bbb; text-shadow:0 -1px 0 #000; }
-#expand { padding:15px; cursor:pointer; font-weight:bold; }
+#settings {
+ float: right;
+ margin-top: 7px;
+ margin-left: 10px;
+ color: #bbb;
+ text-shadow: 0 -1px 0 #000;
+}
+#expand {
+ padding: 15px 15px 15px 5px;
+ cursor: pointer;
+ font-weight: bold;
+}
#expand:hover, #expand:focus, #expand:active { color:#fff; }
#expand img { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=70)"; filter:alpha(opacity=70); opacity:.7; margin-bottom:-2px; }
#expand:hover img, #expand:focus img, #expand:active img { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1; }
@@ -592,6 +639,7 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; }
.hidden { display:none; }
.bold { font-weight:bold; }
.center { text-align:center; }
+.inlineblock { display: inline-block; }
#notification-container { position: fixed; top: 0px; width: 100%; text-align: center; z-index: 101; line-height: 1.2;}
#notification, #update-notification { z-index:101; background-color:#fc4; border:0; padding:0 .7em .3em; display:none; position: relative; top:0; -moz-border-radius-bottomleft:1em; -webkit-border-bottom-left-radius:1em; border-bottom-left-radius:1em; -moz-border-radius-bottomright:1em; -webkit-border-bottom-right-radius:1em; border-bottom-right-radius:1em; }
@@ -658,8 +706,21 @@ a.bookmarklet { background-color:#ddd; border:1px solid #ccc; padding:5px;paddin
background-color:white;
width:100%;
}
-#oc-dialog-filepicker-content .filelist img { margin: 2px 1em 0 4px; }
-#oc-dialog-filepicker-content .filelist .date { float:right;margin-right:1em; }
+#oc-dialog-filepicker-content .filelist li {
+ position: relative;
+}
+#oc-dialog-filepicker-content .filelist .filename {
+ position: absolute;
+ top: 8px;
+}
+#oc-dialog-filepicker-content .filelist img {
+ margin: 2px 1em 0 4px;
+}
+#oc-dialog-filepicker-content .filelist .date {
+ float: right;
+ margin-right: 1em;
+ margin-top: 8px;
+}
#oc-dialog-filepicker-content .filepicker_element_selected { background-color:lightblue;}
.ui-dialog {position:fixed !important;}
span.ui-icon {float: left; margin: 3px 7px 30px 0;}
@@ -709,286 +770,3 @@ div.crumb:active {
opacity:.7;
}
-
-
-/* ---- APP STYLING ---- */
-#app {
- height: 100%;
- width: 100%;
-}
-#app * {
- -moz-box-sizing: border-box; box-sizing: border-box;
-}
-
-/* Navigation: folder like structure */
-#app-navigation {
- width: 300px;
- height: 100%;
- float: left;
- -moz-box-sizing: border-box; box-sizing: border-box;
- background-color: #f8f8f8;
- border-right: 1px solid #ccc;
-}
-#app-navigation > ul {
- height: 100%;
- overflow: auto;
- -moz-box-sizing: border-box; box-sizing: border-box;
-}
-#app-navigation li {
- position: relative;
- width: 100%;
- -moz-box-sizing: border-box; box-sizing: border-box;
- text-shadow: 0 1px 0 rgba(255,255,255,.9);
-}
-#app-navigation .active,
-#app-navigation .active a,
-#app-navigation li:hover > a {
- background-color: #ddd;
- text-shadow: 0 1px 0 rgba(255,255,255,.7);
-}
-
-/* special rules for first-level entries and folders */
-#app-navigation > ul > li {
- background-color: #f8f8f8;
-}
-
-#app-navigation .with-icon a {
- padding-left: 44px;
- background-size: 16px 16px;
- background-position: 14px center;
- background-repeat: no-repeat;
-}
-
-#app-navigation li > a {
- display: block;
- width: 100%;
- height: 44px;
- padding: 12px;
- overflow: hidden;
- -moz-box-sizing: border-box; box-sizing: border-box;
- white-space: nowrap;
- text-overflow: ellipsis;
- color: #333;
-}
-
-#app-navigation .collapse {
- display: none; /* hide collapse button intially */
-}
-#app-navigation .collapsible > .collapse {
- position: absolute;
- height: 44px;
- width: 44px;
- margin: 0;
- padding: 0;
- background: none; background-image: url('../img/actions/triangle-s.svg');
- background-size: 16px; background-repeat: no-repeat; background-position: center;
- border: none;
- border-radius: 0;
- outline: none !important;
- box-shadow: none;
-}
-#app-navigation .collapsible:hover > a {
- background-image: none;
-}
-#app-navigation .collapsible:hover > .collapse {
- display: block;
-}
-
-#app-navigation .collapsible .collapse {
- -moz-transform: rotate(-90deg);
- -webkit-transform: rotate(-90deg);
- -ms-transform:rotate(-90deg);
- -o-transform:rotate(-90deg);
- transform: rotate(-90deg);
-}
-#app-navigation .collapsible.open .collapse {
- -moz-transform: rotate(0);
- -webkit-transform: rotate(0);
- -ms-transform:rotate(0);
- -o-transform:rotate(0);
- transform: rotate(0);
-}
-
-/* Second level nesting for lists */
-#app-navigation > ul ul {
- display: none;
-}
-#app-navigation > ul ul li > a {
- padding-left: 32px;
-}
-#app-navigation > .with-icon ul li > a {
- padding-left: 48px;
- background-position: 24px center;
-}
-
-#app-navigation .open {
- background-image: linear-gradient(top, rgb(238,238,238) 0%, rgb(245,245,245) 100%);
- background-image: -o-linear-gradient(top, rgb(238,238,238) 0%, rgb(245,245,245) 100%);
- background-image: -moz-linear-gradient(top, rgb(238,238,238) 0%, rgb(245,245,245) 100%);
- background-image: -webkit-linear-gradient(top, rgb(238,238,238) 0%, rgb(245,245,245) 100%);
- background-image: -ms-linear-gradient(top, rgb(238,238,238) 0%, rgb(245,245,245) 100%);
-}
-
-#app-navigation > ul .open:hover {
- -moz-box-shadow: inset 0 0 3px #ccc; -webkit-box-shadow: inset 0 0 3px #ccc; box-shadow: inset 0 0 3px #ccc;
-}
-
-#app-navigation > ul .open ul {
- display: block;
-}
-
-
-/* counter and actions */
-#app-navigation .utils {
- position: absolute;
- right: 0;
- top: 0;
- bottom: 0;
- font-size: 12px;
-}
- #app-navigation .utils button,
- #app-navigation .utils .counter {
- width: 44px;
- height: 44px;
- padding-top: 12px;
- }
-
-
-/* drag and drop */
-#app-navigation .drag-and-drop {
- -moz-transition: padding-bottom 500ms ease 0s;
- -o-transition: padding-bottom 500ms ease 0s;
- -webkit-transition: padding-bottom 500ms ease 0s;
- -ms-transition: padding-bottom 500ms ease 0s;
- transition: padding-bottom 500ms ease 0s;
- padding-bottom: 40px;
-}
-#app-navigation .personalblock > legend { /* TODO @Raydiation: still needed? */
- padding: 10px 0; margin: 0;
-}
-#app-navigation .error {
- color: #dd1144;
-}
-
-#app-navigation .app-navigation-separator {
- border-bottom: 1px solid #ddd;
-}
-
-
-
-/* Part where the content will be loaded into */
-#app-content {
- height: 100%;
- overflow-y: auto;
-}
-
-/* settings area */
-#app-settings {
- position: fixed;
- width: 299px;
- bottom: 0;
- border-top: 1px solid #ccc;
-}
-#app-settings-header {
- background-color: #eee;
-}
-#app-settings-content {
- display: none;
- padding: 10px;
- background-color: #eee;
-}
-#app-settings.open #app-settings-content {
- display: block;
-}
-
-.settings-button {
- display: block;
- height: 32px;
- width: 100%;
- padding: 0;
- margin: 0;
- background-color: transparent; background-image: url('../img/actions/settings.svg');
- background-position: 10px center; background-repeat: no-repeat;
- box-shadow: none;
- border: 0;
- border-radius: 0;
-}
-.settings-button:hover {
- background-color: #ddd;
-}
-
-/* icons */
-.folder-icon, .delete-icon, .edit-icon, .progress-icon {
- background-repeat: no-repeat;
- background-position: center;
-}
-.folder-icon { background-image: url('../img/places/folder.svg'); }
-.delete-icon { background-image: url('../img/actions/delete.svg'); }
-.delete-icon:hover, .delete-icon:focus {
- background-image: url('../img/actions/delete-hover.svg');
-}
-.edit-icon { background-image: url('../img/actions/rename.svg'); }
-.progress-icon {
- background-image: url('../img/loading.gif');
- background-size: 16px;
- /* force show the loading icon, not only on hover */
- -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
- filter:alpha(opacity=100);
- opacity: 1 !important;
- display: inline !important;
-}
-
-/* buttons */
-button.loading {
- background-image: url('../img/loading.gif');
- background-position: right 10px center; background-repeat: no-repeat;
- background-size: 16px;
- padding-right: 30px;
-}
-
-
-
-
-
-/* ---- BROWSER-SPECIFIC FIXES ---- */
-
-/* remove dotted outlines in Firefox */
-::-moz-focus-inner {
- border: 0;
-}
-.lte8 .delete-icon { background-image: url('../img/actions/delete.png'); }
-.lte8 .delete-icon:hover, .delete-icon:focus {
- background-image: url('../img/actions/delete-hover.png');
-}
-
-/* IE8 needs background to be set to same color to make transparency look good. */
-.lte9 #body-login form input[type="text"] {
- border: 1px solid lightgrey; /* use border to add 1px line between input fields */
- background-color: white; /* don't change background on hover */
-}
-.lte9 #body-login form input[type="password"] {
- /* leave out top border for 1px line between input fields*/
- border-left: 1px solid lightgrey;
- border-right: 1px solid lightgrey;
- border-bottom: 1px solid lightgrey;
- background-color: white; /* don't change background on hover */
-}
-.lte9 #body-login form label.infield {
- background-color: white; /* don't change background on hover */
- -ms-filter: "progid:DXImageTransform.Microsoft.Chroma(color='white')";
-}
-/* disable opacity of info text on gradient
- sice we cannot set a good backround color to use the filter&background hack as with the input labels */
-.lte9 #body-login p.info {
- filter: initial;
-}
-/* deactivate show password toggle for IE. Does not work for 8 and 9+ have their own implementation. */
-.ie #show, .ie #show+label {
- display: none;
- visibility: hidden;
-}
-
-/* fix installation screen rendering issue for IE8+9 */
-.lte9 #body-login {
- height: auto !important;
-}
diff --git a/core/img/actions/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/img/filetypes/application-epub+zip.png b/core/img/filetypes/application-epub+zip.png
new file mode 100644
index 0000000000000000000000000000000000000000..b3e3b28b4d51b91305d967d445879de4cf25fcbe
Binary files /dev/null and b/core/img/filetypes/application-epub+zip.png differ
diff --git a/core/img/filetypes/application-epub+zip.svg b/core/img/filetypes/application-epub+zip.svg
new file mode 100644
index 0000000000000000000000000000000000000000..041f9f15e6847977c52600f94b917124ab2ea6ad
--- /dev/null
+++ b/core/img/filetypes/application-epub+zip.svg
@@ -0,0 +1,761 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="32px"
+ height="32px"
+ id="svg3194"
+ version="1.1"
+ inkscape:version="0.48.3.1 r9886"
+ sodipodi:docname="application-epub+zip.svg"
+ inkscape:export-filename="application-epub+zip.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <defs
+ id="defs3196">
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3195"
+ id="linearGradient3066"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.502671,0,0,0.64629877,3.711822,0.79617735)"
+ x1="23.99999"
+ y1="14.915504"
+ x2="23.99999"
+ y2="32.595779" />
+ <linearGradient
+ id="linearGradient3195">
+ <stop
+ id="stop3197"
+ style="stop-color:#ffffff;stop-opacity:1"
+ offset="0" />
+ <stop
+ id="stop3199"
+ style="stop-color:#ffffff;stop-opacity:0.23529412"
+ offset="0.12291458" />
+ <stop
+ id="stop3201"
+ style="stop-color:#ffffff;stop-opacity:0.15686275"
+ offset="0.93706012" />
+ <stop
+ id="stop3203"
+ style="stop-color:#ffffff;stop-opacity:0.39215687"
+ offset="1" />
+ </linearGradient>
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-641-289-620-227-114-444-680-744-8-7"
+ id="radialGradient3069"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0,0.96917483,-0.82965977,0,24.014205,-1.7852207)"
+ cx="10.90426"
+ cy="8.4497671"
+ fx="10.90426"
+ fy="8.4497671"
+ r="19.99999" />
+ <linearGradient
+ id="linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-641-289-620-227-114-444-680-744-8-7">
+ <stop
+ id="stop5430-8-6"
+ style="stop-color:#5f5f5f;stop-opacity:1"
+ offset="0" />
+ <stop
+ id="stop5432-3-5"
+ style="stop-color:#4f4f4f;stop-opacity:1"
+ offset="0.26238" />
+ <stop
+ id="stop5434-1-6"
+ style="stop-color:#3b3b3b;stop-opacity:1"
+ offset="0.704952" />
+ <stop
+ id="stop5436-8-9"
+ style="stop-color:#2b2b2b;stop-opacity:1"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3707-319-631-407-324-616-674-812-821-107-178-392-400-6-7"
+ id="linearGradient3071"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.65627449,0,0,0.6892852,1.2531134,-0.21112011)"
+ x1="24"
+ y1="44"
+ x2="24"
+ y2="3.8990016" />
+ <linearGradient
+ id="linearGradient3707-319-631-407-324-616-674-812-821-107-178-392-400-6-7">
+ <stop
+ id="stop5440-4-4"
+ style="stop-color:#272727;stop-opacity:1"
+ offset="0" />
+ <stop
+ id="stop5442-3-5"
+ style="stop-color:#454545;stop-opacity:1"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3731"
+ id="linearGradient3075"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.56756757,0,0,0.67567567,2.3783793,-0.21620881)"
+ x1="23.99999"
+ y1="4.999989"
+ x2="23.99999"
+ y2="43" />
+ <linearGradient
+ id="linearGradient3731">
+ <stop
+ id="stop3733"
+ style="stop-color:#ffffff;stop-opacity:1"
+ offset="0" />
+ <stop
+ id="stop3735"
+ style="stop-color:#ffffff;stop-opacity:0.23529412"
+ offset="0.02706478" />
+ <stop
+ id="stop3737"
+ style="stop-color:#ffffff;stop-opacity:0.15686275"
+ offset="0.97377032" />
+ <stop
+ id="stop3739"
+ style="stop-color:#ffffff;stop-opacity:0.39215687"
+ offset="1" />
+ </linearGradient>
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-641-289-620-227-114-444-680-744-8"
+ id="radialGradient3078"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.165708e-8,1.6179162,-1.483354,-2.9808191e-8,28.734063,-9.2240923)"
+ cx="7.4956832"
+ cy="8.4497671"
+ fx="7.4956832"
+ fy="8.4497671"
+ r="19.99999" />
+ <linearGradient
+ id="linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-641-289-620-227-114-444-680-744-8">
+ <stop
+ id="stop5430-8"
+ style="stop-color:#5f5f5f;stop-opacity:1"
+ offset="0" />
+ <stop
+ id="stop5432-3"
+ style="stop-color:#4f4f4f;stop-opacity:1"
+ offset="0.26238" />
+ <stop
+ id="stop5434-1"
+ style="stop-color:#3b3b3b;stop-opacity:1"
+ offset="0.704952" />
+ <stop
+ id="stop5436-8"
+ style="stop-color:#2b2b2b;stop-opacity:1"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3707-319-631-407-324-616-674-812-821-107-178-392-400-6"
+ id="linearGradient3080"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.60000001,0,0,0.69230771,1.8000008,-0.61538474)"
+ x1="24"
+ y1="44"
+ x2="24"
+ y2="3.8990016" />
+ <linearGradient
+ id="linearGradient3707-319-631-407-324-616-674-812-821-107-178-392-400-6">
+ <stop
+ id="stop5440-4"
+ style="stop-color:#272727;stop-opacity:1"
+ offset="0" />
+ <stop
+ id="stop5442-3"
+ style="stop-color:#454545;stop-opacity:1"
+ offset="1" />
+ </linearGradient>
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient8967-1"
+ id="radialGradient3083"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0,1.8069473,-2.0594306,0,30.190262,-41.983847)"
+ cx="24.501682"
+ cy="6.6475959"
+ fx="24.501682"
+ fy="6.6475959"
+ r="17.49832" />
+ <linearGradient
+ id="linearGradient8967">
+ <stop
+ id="stop8969"
+ style="stop-color:#ddcfbd;stop-opacity:1"
+ offset="0" />
+ <stop
+ id="stop8971"
+ style="stop-color:#856f50;stop-opacity:1"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3319-1"
+ id="linearGradient3085"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.45330736,0,0,0.48530928,1.9941631,0.11705426)"
+ x1="32.901409"
+ y1="4.6481781"
+ x2="32.901409"
+ y2="61.481758" />
+ <linearGradient
+ id="linearGradient3319">
+ <stop
+ id="stop3321"
+ style="stop-color:#a79071;stop-opacity:1"
+ offset="0" />
+ <stop
+ id="stop3323"
+ style="stop-color:#6f5d45;stop-opacity:1"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2346"
+ id="linearGradient3088"
+ gradientUnits="userSpaceOnUse"
+ x1="10.654308"
+ y1="1"
+ x2="10.654308"
+ y2="3"
+ gradientTransform="matrix(0.60000001,0,0,0.75000464,0.6000147,0.12497942)" />
+ <linearGradient
+ id="linearGradient2346">
+ <stop
+ id="stop2348"
+ style="stop-color:#eeeeee;stop-opacity:1"
+ offset="0" />
+ <stop
+ id="stop2350"
+ style="stop-color:#d9d9da;stop-opacity:1"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3707-319-631-407-324-616-674-812-821-107-178-392-400-6-2"
+ id="linearGradient3090"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.60000001,0,0,0.07692307,1.8001714,0.15384638)"
+ x1="24"
+ y1="44"
+ x2="24"
+ y2="3.8990016" />
+ <linearGradient
+ id="linearGradient3707-319-631-407-324-616-674-812-821-107-178-392-400-6-2">
+ <stop
+ id="stop5440-4-8"
+ style="stop-color:#272727;stop-opacity:1"
+ offset="0" />
+ <stop
+ id="stop5442-3-8"
+ style="stop-color:#454545;stop-opacity:1"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3101">
+ <stop
+ offset="0"
+ style="stop-color:#9b876c;stop-opacity:1"
+ id="stop3103" />
+ <stop
+ offset="0.95429963"
+ style="stop-color:#9b876c;stop-opacity:1"
+ id="stop3105" />
+ <stop
+ offset="0.95717829"
+ style="stop-color:#c2c2c2;stop-opacity:1"
+ id="stop3107" />
+ <stop
+ offset="1"
+ style="stop-color:#c2c2c2;stop-opacity:1"
+ id="stop3109" />
+ </linearGradient>
+ <linearGradient
+ y2="4.882647"
+ x2="24.640038"
+ y1="3.1234391"
+ x1="24.62738"
+ gradientTransform="matrix(0.69041563,0,0,1.0164576,0.2501926,-2.4916513)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient3190"
+ xlink:href="#linearGradient2346"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="0.065301567"
+ x2="54.887218"
+ y1="0.065301567"
+ x1="5.2122574"
+ gradientTransform="matrix(0.49253714,0,0,0.4937733,0.8902917,0.14413039)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient3192"
+ xlink:href="#linearGradient3911"
+ inkscape:collect="always" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3688-166-749"
+ id="radialGradient2976"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
+ cx="4.9929786"
+ cy="43.5"
+ fx="4.9929786"
+ fy="43.5"
+ r="2.5" />
+ <linearGradient
+ id="linearGradient3688-166-749">
+ <stop
+ id="stop2883"
+ style="stop-color:#181818;stop-opacity:1"
+ offset="0" />
+ <stop
+ id="stop2885"
+ style="stop-color:#181818;stop-opacity:0"
+ offset="1" />
+ </linearGradient>
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3688-464-309"
+ id="radialGradient2978"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
+ cx="4.9929786"
+ cy="43.5"
+ fx="4.9929786"
+ fy="43.5"
+ r="2.5" />
+ <linearGradient
+ id="linearGradient3688-464-309">
+ <stop
+ id="stop2889"
+ style="stop-color:#181818;stop-opacity:1"
+ offset="0" />
+ <stop
+ id="stop2891"
+ style="stop-color:#181818;stop-opacity:0"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3702-501-757"
+ id="linearGradient2980"
+ gradientUnits="userSpaceOnUse"
+ x1="25.058096"
+ y1="47.027729"
+ x2="25.058096"
+ y2="39.999443" />
+ <linearGradient
+ id="linearGradient3702-501-757">
+ <stop
+ id="stop2895"
+ style="stop-color:#181818;stop-opacity:0"
+ offset="0" />
+ <stop
+ id="stop2897"
+ style="stop-color:#181818;stop-opacity:1"
+ offset="0.5" />
+ <stop
+ id="stop2899"
+ style="stop-color:#181818;stop-opacity:0"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3100"
+ id="linearGradient3072"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.40540539,0,0,0.45945944,-21.967425,1.9253706)"
+ x1="23.99999"
+ y1="4.431067"
+ x2="24.107431"
+ y2="43.758408" />
+ <linearGradient
+ id="linearGradient3100">
+ <stop
+ offset="0"
+ style="stop-color:#ffffff;stop-opacity:1"
+ id="stop3102" />
+ <stop
+ offset="0.06169702"
+ style="stop-color:#ffffff;stop-opacity:0.23529412"
+ id="stop3104" />
+ <stop
+ offset="0.93279684"
+ style="stop-color:#ffffff;stop-opacity:0.15686275"
+ id="stop3106" />
+ <stop
+ offset="1"
+ style="stop-color:#ffffff;stop-opacity:0.39215687"
+ id="stop3108" />
+ </linearGradient>
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-641-289-620-227-114-444-680-744-8-3"
+ id="radialGradient3075"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0,1.1385335,-0.98890268,-2.0976135e-8,-4.5816524,-4.7978939)"
+ cx="7.4956832"
+ cy="8.4497671"
+ fx="7.4956832"
+ fy="8.4497671"
+ r="19.99999" />
+ <linearGradient
+ id="linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-641-289-620-227-114-444-680-744-8-3">
+ <stop
+ id="stop5430-8-4"
+ style="stop-color:#5f5f5f;stop-opacity:1"
+ offset="0" />
+ <stop
+ id="stop5432-3-0"
+ style="stop-color:#4f4f4f;stop-opacity:1"
+ offset="0.26238" />
+ <stop
+ id="stop5434-1-7"
+ style="stop-color:#3b3b3b;stop-opacity:1"
+ offset="0.704952" />
+ <stop
+ id="stop5436-8-7"
+ style="stop-color:#2b2b2b;stop-opacity:1"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3707-319-631-407-324-616-674-812-821-107-178-392-400-6-77"
+ id="linearGradient3077"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.40000001,0,0,0.48717951,-22.537695,1.2600855)"
+ x1="24"
+ y1="44"
+ x2="24"
+ y2="3.8990016" />
+ <linearGradient
+ id="linearGradient3707-319-631-407-324-616-674-812-821-107-178-392-400-6-77">
+ <stop
+ id="stop5440-4-82"
+ style="stop-color:#272727;stop-opacity:1"
+ offset="0" />
+ <stop
+ id="stop5442-3-9"
+ style="stop-color:#454545;stop-opacity:1"
+ offset="1" />
+ </linearGradient>
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient8967-1"
+ id="radialGradient3080"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0,1.2711776,-1.4972812,0,-1.7843744,-27.838648)"
+ cx="24.501682"
+ cy="6.6475959"
+ fx="24.501682"
+ fy="6.6475959"
+ r="17.49832" />
+ <linearGradient
+ id="linearGradient8967-1">
+ <stop
+ id="stop8969-2"
+ style="stop-color:#c4ea71;stop-opacity:1;"
+ offset="0" />
+ <stop
+ id="stop8971-2"
+ style="stop-color:#7c9d35;stop-opacity:1;"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3319-1"
+ id="linearGradient3082"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.32957099,0,0,0.34141245,-22.283968,1.7791087)"
+ x1="32.901409"
+ y1="4.6481781"
+ x2="32.901409"
+ y2="61.481758" />
+ <linearGradient
+ id="linearGradient3319-1">
+ <stop
+ id="stop3321-3"
+ style="stop-color:#96bf3e;stop-opacity:1;"
+ offset="0" />
+ <stop
+ id="stop3323-6"
+ style="stop-color:#4d6b0d;stop-opacity:1;"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2346-4"
+ id="linearGradient3085-0"
+ gradientUnits="userSpaceOnUse"
+ x1="10.654308"
+ y1="1"
+ x2="10.654308"
+ y2="3"
+ gradientTransform="matrix(0.39999999,0,0,0.50000335,-23.337674,1.202378)" />
+ <linearGradient
+ id="linearGradient2346-4">
+ <stop
+ id="stop2348-6"
+ style="stop-color:#eeeeee;stop-opacity:1"
+ offset="0" />
+ <stop
+ id="stop2350-4"
+ style="stop-color:#d9d9da;stop-opacity:1"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3707-319-631-407-324-616-674-812-821-107-178-392-400-6-2-9"
+ id="linearGradient3087"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.39999999,0,0,0.05128207,-22.537569,1.2216233)"
+ x1="24"
+ y1="44"
+ x2="24"
+ y2="3.8990016" />
+ <linearGradient
+ id="linearGradient3707-319-631-407-324-616-674-812-821-107-178-392-400-6-2-9">
+ <stop
+ id="stop5440-4-8-9"
+ style="stop-color:#272727;stop-opacity:1"
+ offset="0" />
+ <stop
+ id="stop5442-3-8-1"
+ style="stop-color:#454545;stop-opacity:1"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2346-4"
+ id="linearGradient3090-0"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.52589466,0,0,1.0164584,-24.496147,-1.5392617)"
+ x1="24.640038"
+ y1="3.3805361"
+ x2="24.640038"
+ y2="4.4969802" />
+ <linearGradient
+ id="linearGradient3159">
+ <stop
+ id="stop3161"
+ style="stop-color:#eeeeee;stop-opacity:1"
+ offset="0" />
+ <stop
+ id="stop3163"
+ style="stop-color:#d9d9da;stop-opacity:1"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3911"
+ id="linearGradient3092"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.37516915,0,0,0.49377366,-24.008579,1.096522)"
+ x1="10.199131"
+ y1="0.065301567"
+ x2="54.887218"
+ y2="0.065301567" />
+ <linearGradient
+ id="linearGradient3911">
+ <stop
+ id="stop3913"
+ style="stop-color:#96bf3e;stop-opacity:1;"
+ offset="0" />
+ <stop
+ id="stop3915"
+ style="stop-color:#4d6b0d;stop-opacity:1;"
+ offset="1" />
+ </linearGradient>
+ <radialGradient
+ r="2.5"
+ fy="43.5"
+ fx="4.9929786"
+ cy="43.5"
+ cx="4.9929786"
+ gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
+ gradientUnits="userSpaceOnUse"
+ id="radialGradient3082-993"
+ xlink:href="#linearGradient3688-166-749-49"
+ inkscape:collect="always" />
+ <linearGradient
+ id="linearGradient3688-166-749-49">
+ <stop
+ offset="0"
+ style="stop-color:#181818;stop-opacity:1"
+ id="stop3079" />
+ <stop
+ offset="1"
+ style="stop-color:#181818;stop-opacity:0"
+ id="stop3081" />
+ </linearGradient>
+ <radialGradient
+ r="2.5"
+ fy="43.5"
+ fx="4.9929786"
+ cy="43.5"
+ cx="4.9929786"
+ gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
+ gradientUnits="userSpaceOnUse"
+ id="radialGradient3084-992"
+ xlink:href="#linearGradient3688-464-309-276"
+ inkscape:collect="always" />
+ <linearGradient
+ id="linearGradient3688-464-309-276">
+ <stop
+ offset="0"
+ style="stop-color:#181818;stop-opacity:1"
+ id="stop3085" />
+ <stop
+ offset="1"
+ style="stop-color:#181818;stop-opacity:0"
+ id="stop3087" />
+ </linearGradient>
+ <linearGradient
+ y2="39.999443"
+ x2="25.058096"
+ y1="47.027729"
+ x1="25.058096"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient3086-631"
+ xlink:href="#linearGradient3702-501-757-979"
+ inkscape:collect="always" />
+ <linearGradient
+ id="linearGradient3702-501-757-979">
+ <stop
+ offset="0"
+ style="stop-color:#181818;stop-opacity:0"
+ id="stop3091" />
+ <stop
+ offset="0.5"
+ style="stop-color:#181818;stop-opacity:1"
+ id="stop3093" />
+ <stop
+ offset="1"
+ style="stop-color:#181818;stop-opacity:0"
+ id="stop3095" />
+ </linearGradient>
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="6.0877475"
+ inkscape:cx="26.638683"
+ inkscape:cy="15.835736"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:grid-bbox="true"
+ inkscape:document-units="px"
+ inkscape:window-width="1075"
+ inkscape:window-height="715"
+ inkscape:window-x="289"
+ inkscape:window-y="24"
+ inkscape:window-maximized="0" />
+ <metadata
+ id="metadata3199">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ id="layer1"
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer">
+ <g
+ style="display:inline"
+ id="g2036"
+ transform="matrix(0.64999974,0,0,0.3333336,0.39999974,15.33333)">
+ <g
+ style="opacity:0.4"
+ id="g3712"
+ transform="matrix(1.052632,0,0,1.285713,-1.263158,-13.42854)">
+ <rect
+ style="fill:url(#radialGradient2976);fill-opacity:1;stroke:none"
+ id="rect2801"
+ y="40"
+ x="38"
+ height="7"
+ width="5" />
+ <rect
+ style="fill:url(#radialGradient2978);fill-opacity:1;stroke:none"
+ id="rect3696"
+ transform="scale(-1,-1)"
+ y="-47"
+ x="-10"
+ height="7"
+ width="5" />
+ <rect
+ style="fill:url(#linearGradient2980);fill-opacity:1;stroke:none"
+ id="rect3700"
+ y="40"
+ x="10"
+ height="7.0000005"
+ width="28" />
+ </g>
+ </g>
+ <path
+ inkscape:connector-curvature="0"
+ style="fill:url(#linearGradient3190);fill-opacity:1;stroke:url(#linearGradient3192);stroke-width:1.01739752;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
+ id="path2723"
+ d="M 27.491301,2.3043778 C 27.288172,1.6493136 27.414776,1.1334476 27.302585,0.5086989 l -20.7938863,0 0.1227276,1.9826025" />
+ <path
+ inkscape:connector-curvature="0"
+ style="color:#000000;fill:url(#linearGradient3088);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3090);stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="rect5505-21-3-9"
+ d="m 7.5001709,3.5 -2.4000002,0 C 4.7576618,3.5 4.5001708,3.46825 4.5001708,3.426829 l 0,-2.0973288 c 0,-0.66594375 0.3354193,-0.82950023 0.7745366,-0.82950023 l 2.2254635,0" />
+ <rect
+ ry="0.5"
+ style="fill:url(#radialGradient3083);fill-opacity:1.0;stroke:url(#linearGradient3085);stroke-width:1.01904130000000004;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
+ id="rect2719"
+ y="2.5095644"
+ x="5.5095205"
+ rx="0.5"
+ height="26.980959"
+ width="21.980959" />
+ <path
+ inkscape:connector-curvature="0"
+ style="color:#000000;fill:url(#radialGradient3078);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3080);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="rect5505-21-3"
+ d="m 7.5,2.5000001 c 0,0 0,18.7742959 0,26.9999999 l -2.4,0 c -0.3425089,0 -0.6,-0.285772 -0.6,-0.658537 l 0,-26.3414629 z" />
+ <rect
+ style="opacity:0.5;fill:none;stroke:url(#linearGradient3075);stroke-width:0.99999988;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ id="rect6741-0"
+ y="3.5000002"
+ x="5.5"
+ height="25"
+ width="21" />
+ <path
+ id="path3859"
+ d="m 16.999886,20.304641 -3.77084,-3.713998 3.77084,-3.71347 1.25705,1.237774 -2.514099,2.475696 1.256974,1.237999 3.770839,-3.713469 -3.284841,-3.235063 c -0.268233,-0.264393 -0.703306,-0.264393 -0.971768,0 l -5.312867,5.232353 c -0.268232,0.264166 -0.268232,0.692646 0,0.95704 l 5.312944,5.232203 c 0.268462,0.264392 0.703534,0.264392 0.971766,0 l 5.312942,-5.232203 c 0.268231,-0.264394 0.268231,-0.692874 0,-0.95704 l -0.77128,-0.759367 -5.02766,4.951545 z"
+ inkscape:connector-curvature="0"
+ style="opacity:0.2;fill:#000000;fill-opacity:1" />
+ <path
+ style="fill:#ffffff;fill-opacity:1"
+ inkscape:connector-curvature="0"
+ d="m 16.999886,19.122826 -3.77084,-3.713998 3.77084,-3.713469 1.25705,1.237773 -2.514099,2.475696 1.256974,1.238 3.770839,-3.71347 -3.284841,-3.2350632 c -0.268233,-0.2643933 -0.703306,-0.2643933 -0.971768,0 l -5.312867,5.2323532 c -0.268232,0.264167 -0.268232,0.692647 0,0.95704 l 5.312944,5.232203 c 0.268462,0.264392 0.703534,0.264392 0.971766,0 l 5.312942,-5.232203 c 0.268231,-0.264393 0.268231,-0.692873 0,-0.95704 l -0.77128,-0.759366 -5.02766,4.951544 z"
+ id="path10" />
+ </g>
+</svg>
diff --git a/core/img/filetypes/application-msexcel.png b/core/img/filetypes/application-msexcel.png
deleted file mode 100644
index b977d7e52e2446ea01201c5c7209ac3a05f12c9f..0000000000000000000000000000000000000000
Binary files a/core/img/filetypes/application-msexcel.png and /dev/null differ
diff --git a/core/img/filetypes/application-mspowerpoint.png b/core/img/filetypes/application-mspowerpoint.png
deleted file mode 100644
index c4eff0387d5888c638ba09473ba6d2369f7b56f0..0000000000000000000000000000000000000000
Binary files a/core/img/filetypes/application-mspowerpoint.png and /dev/null differ
diff --git a/core/img/filetypes/application-msword.png b/core/img/filetypes/application-msword.png
deleted file mode 100644
index ae8ecbf47672a874c0958d0d113a56162c2bd364..0000000000000000000000000000000000000000
Binary files a/core/img/filetypes/application-msword.png and /dev/null differ
diff --git a/core/img/filetypes/application-pdf.png b/core/img/filetypes/application-pdf.png
index 8f8095e46fa4965700afe1f9d065d8a37b101676..a9ab6d279b6147ad8d0f6319ecdde08a637c8e70 100644
Binary files a/core/img/filetypes/application-pdf.png and b/core/img/filetypes/application-pdf.png differ
diff --git a/core/img/filetypes/application-pdf.svg b/core/img/filetypes/application-pdf.svg
new file mode 100644
index 0000000000000000000000000000000000000000..47c2caabdad0fb841017072628e05a6252fe8152
--- /dev/null
+++ b/core/img/filetypes/application-pdf.svg
@@ -0,0 +1,52 @@
+<?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="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <defs>
+ <linearGradient id="e" y2="43" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(.62162 0 0 .62162 1.0811 2.0811)" y1="5" x1="24">
+ <stop stop-color="#fff" offset="0"/>
+ <stop stop-color="#fff" stop-opacity=".23529" offset=".063165"/>
+ <stop stop-color="#fff" stop-opacity=".15686" offset=".95056"/>
+ <stop stop-color="#fff" stop-opacity=".39216" offset="1"/>
+ </linearGradient>
+ <linearGradient id="d" y2="54.78" gradientUnits="userSpaceOnUse" x2="167.98" gradientTransform="matrix(.44444 0 0 .44444 -24 2.7778)" y1="8.5081" x1="167.98">
+ <stop stop-color="#fffdf3" offset="0"/>
+ <stop stop-color="#fbebeb" offset="1"/>
+ </linearGradient>
+ <radialGradient id="a" gradientUnits="userSpaceOnUse" cy="9.9941" cx="8.2761" gradientTransform="matrix(0 4.2742 -5.2474 0 68.489 -37.143)" r="12.672">
+ <stop stop-color="#f89b7e" offset="0"/>
+ <stop stop-color="#e35d4f" offset=".26238"/>
+ <stop stop-color="#c6262e" offset=".66094"/>
+ <stop stop-color="#690b2c" offset="1"/>
+ </radialGradient>
+ <radialGradient id="c" gradientUnits="userSpaceOnUse" cy="43.5" cx="4.993" gradientTransform="matrix(2.0038 0 0 1.4 27.988 -17.4)" r="2.5">
+ <stop stop-color="#181818" offset="0"/>
+ <stop stop-color="#181818" stop-opacity="0" offset="1"/>
+ </radialGradient>
+ <radialGradient id="b" gradientUnits="userSpaceOnUse" cy="43.5" cx="4.993" gradientTransform="matrix(2.0038 0 0 1.4 -20.012 -104.4)" r="2.5">
+ <stop stop-color="#181818" offset="0"/>
+ <stop stop-color="#181818" stop-opacity="0" offset="1"/>
+ </radialGradient>
+ <linearGradient id="f" y2="39.999" gradientUnits="userSpaceOnUse" x2="25.058" y1="47.028" x1="25.058">
+ <stop stop-color="#181818" stop-opacity="0" offset="0"/>
+ <stop stop-color="#181818" offset=".5"/>
+ <stop stop-color="#181818" stop-opacity="0" offset="1"/>
+ </linearGradient>
+ </defs>
+ <g transform="matrix(0.7 0 0 .33333 -0.8 15.333)">
+ <g opacity=".4" transform="matrix(1.0526 0 0 1.2857 -1.2632 -13.429)">
+ <rect height="7" width="5" y="40" x="38" fill="url(#c)"/>
+ <rect transform="scale(-1)" height="7" width="5" y="-47" x="-10" fill="url(#b)"/>
+ <rect height="7" width="28" y="40" x="10" fill="url(#f)"/>
+ </g>
+ </g>
+ <g>
+ <g>
+ <rect style="color:#000000" rx="2" ry="2" height="25" width="25" y="4.5" x="3.5" fill="url(#a)"/>
+ <path opacity=".15" style="color:#000000" d="m18.188 4.9688a1.0386 1.0386 0 0 0 -0.46875 0.25c-8.0692 6.9232-12.522 7.7862-13.782 7.8752a1.0386 1.0386 0 0 0 -0.4375 0.125v8.7187a1.0386 1.0386 0 0 0 0.5 0.125c1.2408 0 3.1922 0.83225 5.0625 2.2812 1.726 1.337 3.383 3.164 4.594 5.156h12.844c1.108 0 2-0.892 2-2v-0.125c-1.2349-2.981-2.1282-7.0748-2.8125-10.781-0.003-0.023 0.003-0.0395 0-0.0625-0.61012-4.7373 0.28634-8.959 0.625-10.281a1.0386 1.0386 0 0 0 -1 -1.2812h-6.9062a1.0386 1.0386 0 0 0 -0.21875 0zm0 4.875c-0.19809 1.3497-0.34502 2.9178-0.46875 4.7812-0.23961 3.6087-0.31211 8.3302-0.34375 13.438-1.2326-2.3066-3.3956-4.6736-5.8438-6.6875-1.4134-1.1626-2.8465-2.1591-4.125-2.9062-0.81148-0.4742-1.5307-0.8115-2.2188-1.0312 1.5275-0.29509 3.8744-0.90217 6.625-2.625 2.3056-1.4441 4.5975-3.3663 6.375-4.9687z" fill-rule="evenodd" fill="#661215"/>
+ <path opacity=".3" style="color:#000000" d="m18.406 6c-8.18 7.019-12.852 8.016-14.406 8.125v2.5312c1.1732-0.164 4.1092-0.751 7.25-2.718 4.027-2.523 8.844-7.313 8.844-7.313-1.302 2.5536-1.684 11.312-1.719 22.875h8.125c0.60271 0 1.1339-0.26843 1.5-0.6875 0.00027-0.0105 0-0.0207 0-0.0312-1.565-3.227-2.576-7.895-3.344-12.062-0.655-4.973 0.298-9.3183 0.656-10.719h-6.9062zm-14.406 12.219v2.8125c3.2857 0 8.2665 3.8155 10.875 8.4688h2.2188c-1.665-4.451-10.589-11.282-13.094-11.282z" fill-rule="evenodd" fill="#661215"/>
+ <path style="color:#000000" d="m18.408 5c-8.18 7.019-12.854 8.01-14.408 8.119v2.5225c1.1732-0.16382 4.1224-0.73265 7.2632-2.6998 4.0274-2.5225 8.8421-7.3113 8.8421-7.3113-1.32 2.5898-1.705 11.522-1.73 23.333h8.441c0.661 0 1.184-0.523 1.184-1.183-1.565-3.227-2.588-7.893-3.355-12.06-0.656-4.973 0.312-9.3203 0.671-10.721h-6.9079zm-14.408 12.23v2.7938c3.3961 0 8.6171 4.0752 11.143 8.9398h2.1215c-1.187-4.423-10.673-11.734-13.264-11.734z" fill="url(#d)"/>
+ </g>
+ <path opacity=".05" d="m25.688 5.0313c-3.216 1.9588-13.74 7.9437-21.688 7.1877v5.4062s17.674 2.6262 24-2.5938v-8.7187c0-0.69873-0.55021-1.2812-1.25-1.2812h-1.0625zm2.312 12.25c-3.181 3.168-6.45 7.386-8.625 11.719h2.5312c1.761-2.975 4.072-6.235 6.094-8.25v-3.4688z" fill-rule="evenodd"/>
+ </g>
+ <rect opacity=".5" stroke-linejoin="round" rx="1" ry="1" height="23" width="23" stroke="url(#e)" stroke-linecap="round" y="5.5" x="4.5" fill="none"/>
+ <rect opacity=".35" stroke-linejoin="round" style="color:#000000" rx="2" ry="2" height="25" width="25" stroke="#410000" stroke-linecap="round" y="4.5" x="3.5" fill="none"/>
+</svg>
diff --git a/core/img/filetypes/application-rss+xml.png b/core/img/filetypes/application-rss+xml.png
index 315c4f4fa62cb720326ba3f54259666ba3999e42..e5bb322c5733e7d2961fd27e049e4249a0d2a5c1 100644
Binary files a/core/img/filetypes/application-rss+xml.png and b/core/img/filetypes/application-rss+xml.png differ
diff --git a/core/img/filetypes/application-rss+xml.svg b/core/img/filetypes/application-rss+xml.svg
new file mode 100644
index 0000000000000000000000000000000000000000..4fd98545a7de5cc4e476a4a80b3a1e64677b333e
--- /dev/null
+++ b/core/img/filetypes/application-rss+xml.svg
@@ -0,0 +1,40 @@
+<?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="32px" width="32px" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <defs>
+ <linearGradient id="g" y2="43" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(.57063 0 0 .57063 2.3049 3.3049)" y1="5.5641" x1="24">
+ <stop stop-color="#fff" offset="0"/>
+ <stop stop-color="#fff" stop-opacity=".23529" offset=".036262"/>
+ <stop stop-color="#fff" stop-opacity=".15686" offset=".95056"/>
+ <stop stop-color="#fff" stop-opacity=".39216" offset="1"/>
+ </linearGradient>
+ <radialGradient id="b" fx="7.2758" gradientUnits="userSpaceOnUse" cy="9.9571" cx="7.8061" gradientTransform="matrix(-1.0673e-7 3.4663 -5.3421 -1.0405e-7 69.185 -26.355)" r="12.672">
+ <stop stop-color="#ffcd7d" offset="0"/>
+ <stop stop-color="#fc8f36" offset=".26238"/>
+ <stop stop-color="#e23a0e" offset=".70495"/>
+ <stop stop-color="#ac441f" offset="1"/>
+ </radialGradient>
+ <linearGradient id="f" y2=".91791" gradientUnits="userSpaceOnUse" x2="25" gradientTransform="matrix(.66015 0 0 .52505 .15636 5.186)" y1="47.935" x1="25">
+ <stop stop-color="#ba3d12" offset="0"/>
+ <stop stop-color="#db6737" offset="1"/>
+ </linearGradient>
+ <radialGradient id="d" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(.015663 0 0 .0082353 17.61 24.981)" r="117.14"/>
+ <linearGradient id="a">
+ <stop offset="0"/>
+ <stop stop-opacity="0" offset="1"/>
+ </linearGradient>
+ <radialGradient id="c" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-.015663 0 0 .0082353 14.39 24.981)" r="117.14"/>
+ <linearGradient id="e" y2="609.51" gradientUnits="userSpaceOnUse" y1="366.65" gradientTransform="matrix(.045769 0 0 .0082353 -.54232 24.981)" x2="302.86" x1="302.86">
+ <stop stop-opacity="0" offset="0"/>
+ <stop offset=".5"/>
+ <stop stop-opacity="0" offset="1"/>
+ </linearGradient>
+ </defs>
+ <g>
+ <rect opacity=".15" height="2" width="22.1" y="28" x="4.95" fill="url(#e)"/>
+ <path opacity=".15" d="m4.95 28v1.9999c-0.80662 0.0038-1.95-0.44807-1.95-1.0001 0-0.552 0.90012-0.99982 1.95-0.99982z" fill="url(#c)"/>
+ <path opacity=".15" d="m27.05 28v1.9999c0.80661 0.0038 1.95-0.44807 1.95-1.0001 0-0.552-0.90012-0.99982-1.95-0.99982z" fill="url(#d)"/>
+ <path stroke-linejoin="round" style="color:#000000" d="m4.4473 5.4473c5.2946 0 23.105 0.00147 23.105 0.00147l0.000029 23.104h-23.105v-23.105z" stroke="url(#f)" stroke-width=".89464" fill="url(#b)"/>
+ </g>
+ <path opacity=".5" stroke-linejoin="round" d="m26.557 27.557h-21.113v-21.113h21.113z" stroke="url(#g)" stroke-linecap="round" stroke-width=".88668" fill="none"/>
+ <path d="m7.0633 24.902c0-0.30708 0.10601-0.56488 0.31803-0.7734 0.21203-0.2123 0.47138-0.31845 0.77805-0.31846 0.2991 0.000007 0.55277 0.10616 0.76101 0.31846 0.21202 0.20852 0.31803 0.46632 0.31803 0.7734 0 0.29951-0.10601 0.55541-0.31803 0.76771-0.20824 0.20852-0.46191 0.31278-0.76101 0.31277-0.30667 0.000007-0.56603-0.10425-0.77805-0.31277-0.2121-0.209-0.3181-0.465-0.3181-0.768m-0.0633-4.931v1.816c2.3202 0 4.2047 1.8882 4.2047 4.2129h1.8223c0-3.33-2.7035-6.0293-6.027-6.0293zm0.00312-3.9745v2.0078c4.4053 0 7.9822 3.5816 7.9822 7.9928h2.0147c0.000015-5.5219-4.4823-10.001-9.9969-10.001z" fill="#fff"/>
+</svg>
diff --git a/core/img/filetypes/application-sgf.png b/core/img/filetypes/application-sgf.png
deleted file mode 100644
index 48996c54394314e0f78157c6b06e472d90ce6038..0000000000000000000000000000000000000000
Binary files a/core/img/filetypes/application-sgf.png and /dev/null differ
diff --git a/core/img/filetypes/application-vnd.oasis.opendocument.formula.png b/core/img/filetypes/application-vnd.oasis.opendocument.formula.png
deleted file mode 100644
index e0cf49542d44e8a72f53a170b524bf73b6c94fef..0000000000000000000000000000000000000000
Binary files a/core/img/filetypes/application-vnd.oasis.opendocument.formula.png and /dev/null differ
diff --git a/core/img/filetypes/application-vnd.oasis.opendocument.graphics.png b/core/img/filetypes/application-vnd.oasis.opendocument.graphics.png
deleted file mode 100644
index b326a0543a5e4505ecea5aba7bbb0ebe07bfc902..0000000000000000000000000000000000000000
Binary files a/core/img/filetypes/application-vnd.oasis.opendocument.graphics.png and /dev/null differ
diff --git a/core/img/filetypes/application-vnd.oasis.opendocument.presentation.png b/core/img/filetypes/application-vnd.oasis.opendocument.presentation.png
deleted file mode 100644
index 7c6fd24684095b2e90d6706e80dfae9d4ad394a7..0000000000000000000000000000000000000000
Binary files a/core/img/filetypes/application-vnd.oasis.opendocument.presentation.png and /dev/null differ
diff --git a/core/img/filetypes/application-vnd.oasis.opendocument.spreadsheet.png b/core/img/filetypes/application-vnd.oasis.opendocument.spreadsheet.png
deleted file mode 100644
index 8b0e85b067039c2bd583db7fd94d746a6848547b..0000000000000000000000000000000000000000
Binary files a/core/img/filetypes/application-vnd.oasis.opendocument.spreadsheet.png and /dev/null differ
diff --git a/core/img/filetypes/application-vnd.oasis.opendocument.text.png b/core/img/filetypes/application-vnd.oasis.opendocument.text.png
deleted file mode 100644
index 48452eb3e864edda22f57c862e72945879f58321..0000000000000000000000000000000000000000
Binary files a/core/img/filetypes/application-vnd.oasis.opendocument.text.png and /dev/null differ
diff --git a/core/img/filetypes/application-x-7z-compressed.png b/core/img/filetypes/application-x-7z-compressed.png
deleted file mode 100644
index 2cd08aebf954b1fbd87e53856815e091d7b29d16..0000000000000000000000000000000000000000
Binary files a/core/img/filetypes/application-x-7z-compressed.png and /dev/null differ
diff --git a/core/img/filetypes/application-x-bzip-compressed-tar.png b/core/img/filetypes/application-x-bzip-compressed-tar.png
deleted file mode 100644
index 2cd08aebf954b1fbd87e53856815e091d7b29d16..0000000000000000000000000000000000000000
Binary files a/core/img/filetypes/application-x-bzip-compressed-tar.png and /dev/null differ
diff --git a/core/img/filetypes/application-x-bzip.png b/core/img/filetypes/application-x-bzip.png
deleted file mode 100644
index 2cd08aebf954b1fbd87e53856815e091d7b29d16..0000000000000000000000000000000000000000
Binary files a/core/img/filetypes/application-x-bzip.png and /dev/null differ
diff --git a/core/img/filetypes/application-x-compressed-tar.png b/core/img/filetypes/application-x-compressed-tar.png
deleted file mode 100644
index 2cd08aebf954b1fbd87e53856815e091d7b29d16..0000000000000000000000000000000000000000
Binary files a/core/img/filetypes/application-x-compressed-tar.png and /dev/null differ
diff --git a/core/img/filetypes/application-x-deb.png b/core/img/filetypes/application-x-deb.png
deleted file mode 100644
index 2cd08aebf954b1fbd87e53856815e091d7b29d16..0000000000000000000000000000000000000000
Binary files a/core/img/filetypes/application-x-deb.png and /dev/null differ
diff --git a/core/img/filetypes/application-x-debian-package.png b/core/img/filetypes/application-x-debian-package.png
deleted file mode 100644
index 1d6db5f933a4adcdc492dd91c4c75017005f4fcf..0000000000000000000000000000000000000000
Binary files a/core/img/filetypes/application-x-debian-package.png and /dev/null differ
diff --git a/core/img/filetypes/application-x-gzip.png b/core/img/filetypes/application-x-gzip.png
deleted file mode 100644
index 2cd08aebf954b1fbd87e53856815e091d7b29d16..0000000000000000000000000000000000000000
Binary files a/core/img/filetypes/application-x-gzip.png and /dev/null differ
diff --git a/core/img/filetypes/application-x-lzma-compressed-tar.png b/core/img/filetypes/application-x-lzma-compressed-tar.png
deleted file mode 100644
index 2cd08aebf954b1fbd87e53856815e091d7b29d16..0000000000000000000000000000000000000000
Binary files a/core/img/filetypes/application-x-lzma-compressed-tar.png and /dev/null differ
diff --git a/core/img/filetypes/application-x-rar.png b/core/img/filetypes/application-x-rar.png
deleted file mode 100644
index 2cd08aebf954b1fbd87e53856815e091d7b29d16..0000000000000000000000000000000000000000
Binary files a/core/img/filetypes/application-x-rar.png and /dev/null differ
diff --git a/core/img/filetypes/application-x-rpm.png b/core/img/filetypes/application-x-rpm.png
deleted file mode 100644
index 2cd08aebf954b1fbd87e53856815e091d7b29d16..0000000000000000000000000000000000000000
Binary files a/core/img/filetypes/application-x-rpm.png and /dev/null differ
diff --git a/core/img/filetypes/application-x-tar.png b/core/img/filetypes/application-x-tar.png
deleted file mode 100644
index 2cd08aebf954b1fbd87e53856815e091d7b29d16..0000000000000000000000000000000000000000
Binary files a/core/img/filetypes/application-x-tar.png and /dev/null differ
diff --git a/core/img/filetypes/application-x-tarz.png b/core/img/filetypes/application-x-tarz.png
deleted file mode 100644
index 2cd08aebf954b1fbd87e53856815e091d7b29d16..0000000000000000000000000000000000000000
Binary files a/core/img/filetypes/application-x-tarz.png and /dev/null differ
diff --git a/core/img/filetypes/application-zip.png b/core/img/filetypes/application-zip.png
deleted file mode 100644
index 2cd08aebf954b1fbd87e53856815e091d7b29d16..0000000000000000000000000000000000000000
Binary files a/core/img/filetypes/application-zip.png and /dev/null differ
diff --git a/core/img/filetypes/application.png b/core/img/filetypes/application.png
index 1dee9e366094e87db68c606d0522d72d4b939818..9152cc1b744f1c06d0d5ae87c2965311f117fc1c 100644
Binary files a/core/img/filetypes/application.png and b/core/img/filetypes/application.png differ
diff --git a/core/img/filetypes/application.svg b/core/img/filetypes/application.svg
new file mode 100644
index 0000000000000000000000000000000000000000..870a4ac24671ef2562c30a86ddcda62e23f8d635
--- /dev/null
+++ b/core/img/filetypes/application.svg
@@ -0,0 +1,59 @@
+<?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="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <defs>
+ <linearGradient id="e" y2="25" xlink:href="#a" gradientUnits="userSpaceOnUse" x2="16" gradientTransform="matrix(1 0 0 -1 0 34.004)" y1="9" x1="16"/>
+ <linearGradient id="a">
+ <stop offset="0"/>
+ <stop stop-opacity="0" offset="1"/>
+ </linearGradient>
+ <linearGradient id="f" y2="25" xlink:href="#a" gradientUnits="userSpaceOnUse" x2="16" y1="9" x1="16"/>
+ <linearGradient id="g" y2="4.9969" gradientUnits="userSpaceOnUse" x2="19.927" gradientTransform="matrix(.66667 0 0 .66667 0.0000011 .33333)" y1="44.949" x1="19.927">
+ <stop stop-color="#505050" offset="0"/>
+ <stop stop-color="#8e8e8e" offset="1"/>
+ </linearGradient>
+ <linearGradient id="i" y2="43" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(.62162 0 0 .62162 1.0811 2.0811)" y1="5" x1="24">
+ <stop stop-color="#fff" offset="0"/>
+ <stop stop-color="#fff" stop-opacity=".23529" offset=".063165"/>
+ <stop stop-color="#fff" stop-opacity=".15686" offset=".95056"/>
+ <stop stop-color="#fff" stop-opacity=".39216" offset="1"/>
+ </linearGradient>
+ <radialGradient id="b" gradientUnits="userSpaceOnUse" cy="8.4498" cx="7.4957" gradientTransform="matrix(1.2454e-8 1.4981 -1.5848 -2.76e-8 29.391 -6.3556)" r="20">
+ <stop stop-color="#c7c7c7" offset="0"/>
+ <stop stop-color="#a6a6a6" offset=".26238"/>
+ <stop stop-color="#7b7b7b" offset=".70495"/>
+ <stop stop-color="#595959" offset="1"/>
+ </radialGradient>
+ <linearGradient id="h" y2="3.899" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(.64103 0 0 .64103 .61539 1.6154)" y1="44" x1="24">
+ <stop stop-color="#505050" offset="0"/>
+ <stop stop-color="#8e8e8e" offset="1"/>
+ </linearGradient>
+ <radialGradient id="d" gradientUnits="userSpaceOnUse" cy="43.5" cx="4.993" gradientTransform="matrix(2.0038 0 0 1.4 27.988 -17.4)" r="2.5">
+ <stop stop-color="#181818" offset="0"/>
+ <stop stop-color="#181818" stop-opacity="0" offset="1"/>
+ </radialGradient>
+ <radialGradient id="c" gradientUnits="userSpaceOnUse" cy="43.5" cx="4.993" gradientTransform="matrix(2.0038 0 0 1.4 -20.012 -104.4)" r="2.5">
+ <stop stop-color="#181818" offset="0"/>
+ <stop stop-color="#181818" stop-opacity="0" offset="1"/>
+ </radialGradient>
+ <linearGradient id="j" y2="39.999" gradientUnits="userSpaceOnUse" x2="25.058" y1="47.028" x1="25.058">
+ <stop stop-color="#181818" stop-opacity="0" offset="0"/>
+ <stop stop-color="#181818" offset=".5"/>
+ <stop stop-color="#181818" stop-opacity="0" offset="1"/>
+ </linearGradient>
+ </defs>
+ <g transform="matrix(0.7 0 0 .33333 -0.8 15.333)">
+ <g opacity=".4" transform="matrix(1.0526 0 0 1.2857 -1.2632 -13.429)">
+ <rect height="7" width="5" y="40" x="38" fill="url(#d)"/>
+ <rect transform="scale(-1)" height="7" width="5" y="-47" x="-10" fill="url(#c)"/>
+ <rect height="7" width="28" y="40" x="10" fill="url(#j)"/>
+ </g>
+ </g>
+ <rect stroke-linejoin="round" height="25" stroke="url(#h)" stroke-linecap="round" fill="url(#b)" style="color:#000000" rx="2" ry="2" width="25" y="4.5" x="3.5"/>
+ <rect opacity=".5" stroke-linejoin="round" rx="1" ry="1" height="23" width="23" stroke="url(#i)" stroke-linecap="round" y="5.5" x="4.5" fill="none"/>
+ <g>
+ <path opacity="0.41" style="color:#000000" d="m15 10c-0.277 0-0.5 0.223-0.5 0.5v1.6875c-0.54864 0.14074-1.055 0.37601-1.5312 0.65625l-1.219-1.219c-0.19587-0.19587-0.49163-0.19587-0.6875 0l-1.437 1.437c-0.19587 0.19587-0.19587 0.49163 0 0.6875l1.2188 1.2188c-0.28 0.476-0.516 0.982-0.656 1.531h-1.688c-0.277 0-0.5 0.223-0.5 0.5v2c0 0.277 0.223 0.5 0.5 0.5h1.6875c0.14074 0.54864 0.37601 1.055 0.65625 1.5312l-1.219 1.219c-0.19587 0.19587-0.19587 0.49163 0 0.6875l1.4375 1.4375c0.19587 0.19587 0.49163 0.19587 0.6875 0l1.2188-1.2188c0.47623 0.28024 0.98261 0.51551 1.5312 0.65625v1.6875c0 0.277 0.223 0.5 0.5 0.5h2c0.277 0 0.5-0.223 0.5-0.5v-1.6875c0.54864-0.14074 1.055-0.37601 1.5312-0.65625l1.219 1.219c0.19587 0.19587 0.49163 0.19587 0.6875 0l1.4375-1.4375c0.19587-0.19587 0.19587-0.49163 0-0.6875l-1.22-1.219c0.28-0.476 0.516-0.982 0.656-1.531h1.6875c0.277 0 0.5-0.223 0.5-0.5v-2c0-0.277-0.223-0.5-0.5-0.5h-1.6875c-0.14-0.549-0.376-1.055-0.656-1.531l1.219-1.219c0.19587-0.19587 0.19587-0.49163 0-0.6875l-1.437-1.437c-0.19587-0.19587-0.49163-0.19587-0.6875 0l-1.2188 1.2188c-0.476-0.28-0.982-0.516-1.531-0.656v-1.688c0-0.277-0.223-0.5-0.5-0.5h-2zm1 5c1.6569 0 3 1.3431 3 3s-1.3431 3-3 3-3-1.3431-3-3 1.3431-3 3-3z" fill="#fff"/>
+ <path style="color:#000000" d="m15 9c-0.277 0-0.5 0.223-0.5 0.5v1.6875c-0.54864 0.14074-1.055 0.37601-1.5312 0.65625l-1.219-1.219c-0.19587-0.19587-0.49163-0.19587-0.6875 0l-1.437 1.437c-0.19587 0.19587-0.19587 0.49163 0 0.6875l1.2188 1.2188c-0.28 0.476-0.516 0.982-0.656 1.531h-1.688c-0.277 0-0.5 0.223-0.5 0.5v2c0 0.277 0.223 0.5 0.5 0.5h1.6875c0.14074 0.54864 0.37601 1.055 0.65625 1.5312l-1.219 1.219c-0.19587 0.19587-0.19587 0.49163 0 0.6875l1.4375 1.4375c0.19587 0.19587 0.49163 0.19587 0.6875 0l1.2188-1.2188c0.47623 0.28024 0.98261 0.51551 1.5312 0.65625v1.6875c0 0.277 0.223 0.5 0.5 0.5h2c0.277 0 0.5-0.223 0.5-0.5v-1.6875c0.54864-0.14074 1.055-0.37601 1.5312-0.65625l1.219 1.219c0.19587 0.19587 0.49163 0.19587 0.6875 0l1.4375-1.4375c0.19587-0.19587 0.19587-0.49163 0-0.6875l-1.22-1.219c0.28-0.476 0.516-0.982 0.656-1.531h1.6875c0.277 0 0.5-0.223 0.5-0.5v-2c0-0.277-0.223-0.5-0.5-0.5h-1.6875c-0.14-0.549-0.376-1.055-0.656-1.531l1.219-1.219c0.19587-0.19587 0.19587-0.49163 0-0.6875l-1.437-1.437c-0.19587-0.19587-0.49163-0.19587-0.6875 0l-1.2188 1.2188c-0.476-0.28-0.982-0.516-1.531-0.656v-1.688c0-0.277-0.223-0.5-0.5-0.5h-2zm1 5c1.6569 0 3 1.3431 3 3s-1.3431 3-3 3-3-1.3431-3-3 1.3431-3 3-3z" fill="url(#g)"/>
+ <path opacity=".1" stroke-linejoin="round" style="color:#000000" d="m15.062 9.5625c-0.02465 0.61514 0.0508 1.2431-0.0404 1.8499-0.22156 0.48267-0.86813 0.38946-1.2591 0.66131-0.35888 0.1777-0.83286 0.55716-1.2005 0.17633l-1.1562-1.1562-1.3125 1.3125c0.41328 0.43651 0.87815 0.8308 1.2579 1.2948 0.23668 0.48316-0.28717 0.88122-0.39325 1.3266-0.17191 0.37402-0.17866 1.0023-0.7161 1.0335-0.55991 0.0032-1.1199 0.000478-1.6798 0.0014v1.875c0.61514 0.02465 1.2431-0.0508 1.8499 0.0404 0.48267 0.22156 0.38946 0.86813 0.66131 1.2591 0.1777 0.35888 0.55716 0.83286 0.17633 1.2005l-1.1562 1.1562 1.3125 1.3125c0.43651-0.41328 0.8308-0.87815 1.2948-1.2579 0.48316-0.23668 0.88122 0.28717 1.3266 0.39325 0.37402 0.17191 1.0023 0.17866 1.0335 0.7161 0.0032 0.55991 0.000478 1.1199 0.0014 1.6798h1.875c0.02465-0.61514-0.0508-1.2431 0.0404-1.8499 0.22156-0.48267 0.86813-0.38946 1.2591-0.66131 0.35888-0.1777 0.83286-0.55716 1.2005-0.17633l1.1562 1.1562 1.3125-1.3125c-0.41328-0.43651-0.87815-0.8308-1.2579-1.2948-0.23668-0.48316 0.28717-0.88122 0.39325-1.3266 0.17191-0.37402 0.17866-1.0023 0.7161-1.0335 0.55991-0.0032 1.1199-0.000478 1.6798-0.0014v-1.875c-0.61514-0.02465-1.2431 0.0508-1.8499-0.0404-0.482-0.222-0.389-0.869-0.661-1.26-0.177-0.359-0.557-0.833-0.176-1.201l1.1562-1.1562-1.3125-1.3125c-0.43651 0.41328-0.8308 0.87815-1.2948 1.2579-0.48316 0.23668-0.88122-0.28717-1.3266-0.39325-0.37402-0.17191-1.0023-0.17866-1.0335-0.7161-0.0032-0.55991-0.000478-1.1199-0.0014-1.6798h-1.875z" stroke="url(#f)" fill="none"/>
+ <path opacity=".1" stroke-linejoin="round" style="color:#000000" d="m16 20.566c1.9374 0.05315 3.6634-1.7201 3.5613-3.6545 0.004-1.9389-1.8147-3.6163-3.7447-3.4659-1.9392 0.04516-3.5671 1.9074-3.3688 3.832 0.10413 1.8114 1.739 3.3229 3.5521 3.2884z" stroke="url(#e)" fill="none"/>
+ </g>
+</svg>
diff --git a/core/img/filetypes/audio.png b/core/img/filetypes/audio.png
index a8b3ede3df956f8d505543b190bc8d1b5b4dce75..3f56a7e2a9a976c91965495dfe7bc76667df5f75 100644
Binary files a/core/img/filetypes/audio.png and b/core/img/filetypes/audio.png differ
diff --git a/core/img/filetypes/audio.svg b/core/img/filetypes/audio.svg
new file mode 100644
index 0000000000000000000000000000000000000000..d5eda38e8aaf39c5a54521ed95d185903f6d2643
--- /dev/null
+++ b/core/img/filetypes/audio.svg
@@ -0,0 +1,49 @@
+<?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="32px" width="32px" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <defs>
+ <linearGradient id="e" y2="24.628" gradientUnits="userSpaceOnUse" x2="20.055" gradientTransform="matrix(.52104 0 0 .81327 3.4707 .35442)" y1="15.298" x1="16.626">
+ <stop stop-color="#fff" offset="0"/>
+ <stop stop-color="#fff" stop-opacity="0" offset="1"/>
+ </linearGradient>
+ <linearGradient id="d" y2="43" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(.62162 0 0 .62162 1.0811 2.0811)" y1="5" x1="24">
+ <stop stop-color="#fff" offset="0"/>
+ <stop stop-color="#fff" stop-opacity=".23529" offset=".063165"/>
+ <stop stop-color="#fff" stop-opacity=".15686" offset=".95056"/>
+ <stop stop-color="#fff" stop-opacity=".39216" offset="1"/>
+ </linearGradient>
+ <radialGradient id="a" gradientUnits="userSpaceOnUse" cy="8.4498" cx="7.4957" gradientTransform="matrix(1.2454e-8 1.4981 -1.5848 -2.76e-8 29.391 -6.3556)" r="20">
+ <stop stop-color="#3e3e3e" offset="0"/>
+ <stop stop-color="#343434" offset=".26238"/>
+ <stop stop-color="#272727" offset=".70495"/>
+ <stop stop-color="#1d1d1d" offset="1"/>
+ </radialGradient>
+ <radialGradient id="c" gradientUnits="userSpaceOnUse" cy="43.5" cx="4.993" gradientTransform="matrix(2.0038 0 0 1.4 27.988 -17.4)" r="2.5">
+ <stop stop-color="#181818" offset="0"/>
+ <stop stop-color="#181818" stop-opacity="0" offset="1"/>
+ </radialGradient>
+ <radialGradient id="b" gradientUnits="userSpaceOnUse" cy="43.5" cx="4.993" gradientTransform="matrix(2.0038 0 0 1.4 -20.012 -104.4)" r="2.5">
+ <stop stop-color="#181818" offset="0"/>
+ <stop stop-color="#181818" stop-opacity="0" offset="1"/>
+ </radialGradient>
+ <linearGradient id="f" y2="39.999" gradientUnits="userSpaceOnUse" x2="25.058" y1="47.028" x1="25.058">
+ <stop stop-color="#181818" stop-opacity="0" offset="0"/>
+ <stop stop-color="#181818" offset=".5"/>
+ <stop stop-color="#181818" stop-opacity="0" offset="1"/>
+ </linearGradient>
+ </defs>
+ <g transform="matrix(0.7 0 0 .33333 -0.8 15.333)">
+ <g opacity=".4" transform="matrix(1.0526 0 0 1.2857 -1.2632 -13.429)">
+ <rect height="7" width="5" y="40" x="38" fill="url(#c)"/>
+ <rect transform="scale(-1)" height="7" width="5" y="-47" x="-10" fill="url(#b)"/>
+ <rect height="7" width="28" y="40" x="10" fill="url(#f)"/>
+ </g>
+ </g>
+ <rect style="color:#000000" height="25" width="25" y="4.5" x="3.5" fill="url(#a)"/>
+ <rect opacity=".7" style="color:#000000" height="25" width="25" stroke="#000" y="4.5" x="3.5" fill="none"/>
+ <rect opacity=".5" height="23" width="23" stroke="url(#d)" stroke-linecap="round" y="5.5" x="4.5" fill="none"/>
+ <g>
+ <path opacity=".1" d="m4 5 0.008 15c0.6904-0.015 23.468-5.529 23.992-5.795v-9.205z" fill-rule="evenodd" fill="url(#e)"/>
+ <path opacity=".1" style="color:#000000" d="m16.467 8.0001c-0.53931-0.077588-0.45336 0.42193-0.44484 0.7731-0.0059 4.1692 0.01172 8.3407-0.0088 12.508-0.145 0.32452-0.55212 0.0099-0.80112 0.07215-1.7342-0.05405-3.6017 1.1946-3.847 3.0302-0.25326 1.3789 1.032 2.5932 2.3216 2.6149 1.9178 0.05257 3.5779-1.8787 3.3343-3.8146 0.0065-3.3283-0.01298-6.6593 0.0097-9.9859 0.13139-0.31618 0.4856-0.01847 0.65097 0.09458 1.5212 0.9203 2.8505 2.4463 2.9447 4.3279 0.0815 1.0885-0.14664 2.173-0.46032 3.2072 1.3984-2.3007 1.3227-5.5038-0.40514-7.6054-1.3305-1.3884-2.5797-3.0451-2.8335-5.0311-0.04896-0.18667-0.30655-0.18423-0.46044-0.19158z" fill="#fff"/>
+ <path opacity=".9" style="color:#000000" d="m16.467 7.0001c-0.53931-0.077588-0.45336 0.42193-0.44484 0.7731-0.0059 4.1692 0.01172 8.3407-0.0088 12.508-0.145 0.32452-0.55212 0.0099-0.80112 0.07215-1.7342-0.05405-3.6017 1.1946-3.847 3.0302-0.25326 1.3789 1.032 2.5932 2.3216 2.6149 1.9178 0.05257 3.5779-1.8787 3.3343-3.8146 0.0065-3.3283-0.01298-6.6593 0.0097-9.9859 0.13139-0.31618 0.4856-0.01847 0.65097 0.09458 1.5212 0.9203 2.8505 2.4463 2.9447 4.3279 0.0815 1.0885-0.14664 2.173-0.46032 3.2072 1.3984-2.3007 1.3227-5.5038-0.40514-7.6054-1.33-1.388-2.58-3.0443-2.833-5.0303-0.049-0.1866-0.307-0.1842-0.461-0.1916z"/>
+ </g>
+</svg>
diff --git a/core/img/filetypes/calendar.png b/core/img/filetypes/calendar.png
new file mode 100644
index 0000000000000000000000000000000000000000..d85b1db651c258b22d7707dbdf57a19bc92f832a
Binary files /dev/null and b/core/img/filetypes/calendar.png differ
diff --git a/core/img/filetypes/calendar.svg b/core/img/filetypes/calendar.svg
new file mode 100644
index 0000000000000000000000000000000000000000..0016749b93614c3dfb2a95e24001e17e85417ad4
--- /dev/null
+++ b/core/img/filetypes/calendar.svg
@@ -0,0 +1,94 @@
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <defs>
+ <radialGradient id="radialGradient3134" spreadMethod="reflect" gradientUnits="userSpaceOnUse" cy="4.9179" cx="14" gradientTransform="matrix(1.0912316,-1.8501946e-8,3.7499995e-8,1.5922783,7.222757,-4.4685113)" r="2">
+ <stop stop-color="#FFF" offset="0"/>
+ <stop stop-color="#8f8f8f" offset="1"/>
+ </radialGradient>
+ <radialGradient id="radialGradient3139" spreadMethod="reflect" gradientUnits="userSpaceOnUse" cy="4.9179" cx="14" gradientTransform="matrix(1.0912316,-1.8501946e-8,3.7499995e-8,1.5922783,-5.7772427,-4.4685114)" r="2">
+ <stop stop-color="#FFF" offset="0"/>
+ <stop stop-color="#8f8f8f" offset="1"/>
+ </radialGradient>
+ <linearGradient id="linearGradient3144" y2="43" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(0.60000361,0,0,0.64185429,1.599978,-16.778802)" y1="5" x1="24">
+ <stop stop-color="#FFF" offset="0"/>
+ <stop stop-color="#FFF" stop-opacity="0.23529412" offset="0.063165"/>
+ <stop stop-color="#FFF" stop-opacity="0.15686275" offset="0.95056"/>
+ <stop stop-color="#FFF" stop-opacity="0.39215687" offset="1"/>
+ </linearGradient>
+ <linearGradient id="linearGradient3147" y2="43" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(0.62162164,0,0,0.62162164,1.0810837,2.0810874)" y1="5" x1="24">
+ <stop stop-color="#FFF" offset="0"/>
+ <stop stop-color="#FFF" stop-opacity="0.23529412" offset="0.063165"/>
+ <stop stop-color="#FFF" stop-opacity="0.15686275" offset="0.95056"/>
+ <stop stop-color="#FFF" stop-opacity="0.39215687" offset="1"/>
+ </linearGradient>
+ <radialGradient id="radialGradient3150" gradientUnits="userSpaceOnUse" cy="8.4498" cx="7.4957" gradientTransform="matrix(0,0.90632943,-1.9732085,-3.8243502e-8,32.673223,-1.9201377)" r="20">
+ <stop stop-color="#f89b7e" offset="0"/>
+ <stop stop-color="#e35d4f" offset="0.26238"/>
+ <stop stop-color="#c6262e" offset="0.66094"/>
+ <stop stop-color="#690b2c" offset="1"/>
+ </radialGradient>
+ <linearGradient id="linearGradient3152" y2="3.899" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(0.64102567,0,0,0.64102567,0.6153831,1.615384)" y1="44" x1="24">
+ <stop stop-color="#791235" offset="0"/>
+ <stop stop-color="#dd3b27" offset="1"/>
+ </linearGradient>
+ <linearGradient id="linearGradient3155" y2="18.684" gradientUnits="userSpaceOnUse" x2="23.954" gradientTransform="matrix(0.65,0,0,0.50000001,0.4000028,3.9999996)" y1="15.999" x1="23.954">
+ <stop stop-color="#000" offset="0"/>
+ <stop stop-color="#000" stop-opacity="0" offset="1"/>
+ </linearGradient>
+ <linearGradient id="linearGradient3158" y2="44.984" gradientUnits="userSpaceOnUse" x2="19.36" gradientTransform="matrix(0.64102564,0,0,0.64185429,0.6153845,0.95838337)" y1="16.138" x1="19.36">
+ <stop stop-color="#f4f4f4" offset="0"/>
+ <stop stop-color="#dbdbdb" offset="1"/>
+ </linearGradient>
+ <linearGradient id="linearGradient3160" y2="3.8905" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(0.64102564,0,0,0.64185429,0.6153845,1.5793381)" y1="44" x1="24">
+ <stop stop-color="#787878" offset="0"/>
+ <stop stop-color="#AAA" offset="1"/>
+ </linearGradient>
+ <radialGradient id="radialGradient2976" gradientUnits="userSpaceOnUse" cy="43.5" cx="4.993" gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)" r="2.5">
+ <stop stop-color="#181818" offset="0"/>
+ <stop stop-color="#181818" stop-opacity="0" offset="1"/>
+ </radialGradient>
+ <radialGradient id="radialGradient2978" gradientUnits="userSpaceOnUse" cy="43.5" cx="4.993" gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)" r="2.5">
+ <stop stop-color="#181818" offset="0"/>
+ <stop stop-color="#181818" stop-opacity="0" offset="1"/>
+ </radialGradient>
+ <linearGradient id="linearGradient2980" y2="39.999" gradientUnits="userSpaceOnUse" x2="25.058" y1="47.028" x1="25.058">
+ <stop stop-color="#181818" stop-opacity="0" offset="0"/>
+ <stop stop-color="#181818" offset="0.5"/>
+ <stop stop-color="#181818" stop-opacity="0" offset="1"/>
+ </linearGradient>
+ <linearGradient id="linearGradient3566" y2="3.899" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(0.64102567,0,0,0.64102567,0.6153831,0.6153843)" y1="44" x1="24">
+ <stop stop-color="#791235" offset="0"/>
+ <stop stop-color="#dd3b27" offset="1"/>
+ </linearGradient>
+ </defs>
+ <metadata>
+ <rdf:RDF>
+ <cc:Work rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+ <dc:title/>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <path stroke-linejoin="round" style="enable-background:accumulate;color:#000000;" d="m5.5,3.5c7.0683,0.00685,14.137-0.013705,21.205,0.010288,1.238,0.083322,1.9649,1.3578,1.7949,2.5045l-24.99-0.7199c0.081-0.9961,0.9903-1.8161,1.9897-1.7949z" stroke-dashoffset="0" stroke="url(#linearGradient3566)" stroke-linecap="round" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="1" fill="none"/>
+ <g transform="matrix(0.6999997,0,0,0.3333336,-0.8000003,15.33333)">
+ <g opacity="0.4" transform="matrix(1.052632,0,0,1.285713,-1.263158,-13.42854)">
+ <rect height="7" width="5" y="40" x="38" fill="url(#radialGradient2976)"/>
+ <rect transform="scale(-1,-1)" height="7" width="5" y="-47" x="-10" fill="url(#radialGradient2978)"/>
+ <rect height="7" width="28" y="40" x="10" fill="url(#linearGradient2980)"/>
+ </g>
+ </g>
+ <path stroke-linejoin="round" style="enable-background:accumulate;color:#000000;" d="m28.5,7.0148s0.0137,13.794-0.01029,20.69c-0.084,1.238-1.358,1.965-2.505,1.795-6.896-0.007-13.794,0.014-20.69-0.01-1.238-0.084-1.9649-1.358-1.7949-2.505,0.0068-6.896,0.0103-20.69,0.0103-20.69z" fill-rule="nonzero" stroke-dashoffset="0" stroke="url(#linearGradient3160)" stroke-linecap="round" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="0.99999994" fill="url(#linearGradient3158)"/>
+ <rect opacity="0.3" style="enable-background:accumulate;" fill-rule="nonzero" rx="0" ry="0" height="2" width="26" y="12" x="3" fill="url(#linearGradient3155)"/>
+ <path stroke-linejoin="round" style="enable-background:accumulate;color:#000000;" d="m5.5,4.5c7.0683,0.00685,14.137-0.013705,21.205,0.010288,1.238,0.083322,1.9649,1.3578,1.7949,2.5045l0.073,4.4852h-25.073l0.0103-5.2051c0.081-0.9961,0.9903-1.8161,1.9897-1.7949z" fill-rule="nonzero" stroke-dashoffset="0" stroke="url(#linearGradient3152)" stroke-linecap="round" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="1" fill="url(#radialGradient3150)"/>
+ <rect opacity="0.5" stroke-linejoin="round" stroke-dasharray="none" stroke-dashoffset="0" rx="1" ry="1" height="23" width="23" stroke="url(#linearGradient3147)" stroke-linecap="round" stroke-miterlimit="4" y="5.5" x="4.5" stroke-width="1" fill="none"/>
+ <path opacity="0.5" stroke-linejoin="round" d="m26.5,10.5h-21" stroke-dashoffset="0" stroke="url(#linearGradient3144)" stroke-linecap="square" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="0.99999982" fill="none"/>
+ <rect opacity="0.4" style="enable-background:accumulate;" fill-rule="nonzero" rx="1.8086" ry="1.5304" height="7.0604" width="3" y="2.9396" x="8" fill="#FFF"/>
+ <rect style="enable-background:accumulate;" fill-rule="nonzero" rx="1.5869" ry="1.5869" height="2.7652" width="3" y="6.2348" x="8" fill="#cc3429"/>
+ <rect style="enable-background:accumulate;" fill-rule="nonzero" rx="1.8086" ry="1.3912" height="7" width="3" y="1.0188" x="8" fill="url(#radialGradient3139)"/>
+ <rect opacity="0.4" style="enable-background:accumulate;" fill-rule="nonzero" rx="1.8086" ry="1.5304" height="7.0604" width="3" y="2.9396" x="21" fill="#FFF"/>
+ <rect style="enable-background:accumulate;" fill-rule="nonzero" rx="1.5869" ry="1.5869" height="2.7652" width="3" y="6.2348" x="21" fill="#cc3429"/>
+ <rect style="enable-background:accumulate;" fill-rule="nonzero" rx="1.8086" ry="1.3912" height="7" width="3" y="1.0188" x="21" fill="url(#radialGradient3134)"/>
+ <rect style="enable-background:accumulate;color:#000000;" height="3.9477" width="19.876" y="14.023" x="6.1231" fill="#c5c5c5"/>
+ <path opacity="0.3" stroke-linejoin="round" style="enable-background:accumulate;color:#000000;" d="M6.5182,14.553,25.505,14.564,25.415,26.505,6.4289,26.494zm0.33122,8.8955,18.622,0.01098m-18.89-2.957,18.622,0.01098m-18.532-14.898,18.622,0.011m-3.6545-2.8956-0.0893,11.828m-2.9014-11.783-0.0893,11.828m-2.902-11.917-0.089,11.827m-2.9014-11.783-0.0893,11.828m-2.8347-11.839-0.0893,11.828" stroke-dashoffset="0" stroke="#000" stroke-linecap="round" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="1" fill="none"/>
+</svg>
diff --git a/core/img/filetypes/code-script.png b/core/img/filetypes/code-script.png
deleted file mode 100644
index 63fe6ceff5bfcedb9670279d4bb8d25807f6ecee..0000000000000000000000000000000000000000
Binary files a/core/img/filetypes/code-script.png and /dev/null differ
diff --git a/core/img/filetypes/code.png b/core/img/filetypes/code.png
deleted file mode 100644
index 0c76bd1297751b66230f74719504b2adb02b1615..0000000000000000000000000000000000000000
Binary files a/core/img/filetypes/code.png and /dev/null differ
diff --git a/core/img/filetypes/database.png b/core/img/filetypes/database.png
index 3d09261a26eb97c6dedc1d3504cbc2cf915eb642..24788b2a37f04a4d44d09fabc5ef8c062015fa42 100644
Binary files a/core/img/filetypes/database.png and b/core/img/filetypes/database.png differ
diff --git a/core/img/filetypes/database.svg b/core/img/filetypes/database.svg
new file mode 100644
index 0000000000000000000000000000000000000000..6dfac54e68b2de928371dbaa1fd30f43a78fd7cb
--- /dev/null
+++ b/core/img/filetypes/database.svg
@@ -0,0 +1,54 @@
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <defs>
+ <linearGradient id="linearGradient3136" y2="-24.582" spreadMethod="reflect" gradientUnits="userSpaceOnUse" x2="102.31" gradientTransform="matrix(0.4581255,0,0,0.4388939,-31.619713,14.933095)" y1="-2.3925" x1="102.31">
+ <stop stop-color="#a5a6a8" offset="0"/>
+ <stop stop-color="#e8e8e8" offset="1"/>
+ </linearGradient>
+ <linearGradient id="linearGradient3138" y2="-2.3758" gradientUnits="userSpaceOnUse" x2="109.96" gradientTransform="matrix(0.4581255,0,0,0.4388939,-31.619713,14.933095)" y1="-24.911" x1="109.96">
+ <stop stop-color="#b3b3b3" offset="0"/>
+ <stop stop-color="#dadada" offset="1"/>
+ </linearGradient>
+ <linearGradient id="linearGradient3141" y2="-7.6657" xlink:href="#linearGradient2793" spreadMethod="reflect" gradientUnits="userSpaceOnUse" x2="89.424" gradientTransform="matrix(0.4578345,0,0,0.432286,-31.591968,18.911518)" y1="-7.6657" x1="103.95"/>
+ <linearGradient id="linearGradient2793">
+ <stop stop-color="#868688" offset="0"/>
+ <stop stop-color="#d9d9da" offset="1"/>
+ </linearGradient>
+ <linearGradient id="linearGradient3143" y2="27.546" xlink:href="#linearGradient3858" gradientUnits="userSpaceOnUse" x2="89.018" gradientTransform="translate(-78.157465,-9.546111)" y1="22.537" x1="89.018"/>
+ <linearGradient id="linearGradient3858">
+ <stop stop-color="#a0a0a0" offset="0"/>
+ <stop stop-color="#4a4a4a" offset="1"/>
+ </linearGradient>
+ <linearGradient id="linearGradient3147" y2="-7.6657" xlink:href="#linearGradient2793" spreadMethod="reflect" gradientUnits="userSpaceOnUse" x2="89.424" gradientTransform="matrix(0.4578345,0,0,0.432286,-31.591968,24.911518)" y1="-7.6657" x1="103.95"/>
+ <linearGradient id="linearGradient3149" y2="27.546" xlink:href="#linearGradient3858" gradientUnits="userSpaceOnUse" x2="89.018" gradientTransform="translate(-78.157465,-3.546111)" y1="22.537" x1="89.018"/>
+ <linearGradient id="linearGradient3153" y2="-7.6657" xlink:href="#linearGradient2793" spreadMethod="reflect" gradientUnits="userSpaceOnUse" x2="89.424" gradientTransform="matrix(0.4578345,0,0,0.432286,-31.591968,30.911518)" y1="-7.6657" x1="103.95"/>
+ <linearGradient id="linearGradient3155" y2="27.546" xlink:href="#linearGradient3858" gradientUnits="userSpaceOnUse" x2="89.018" gradientTransform="translate(-78.157465,2.453889)" y1="22.537" x1="89.018"/>
+ <linearGradient id="linearGradient3098" y2="44.137" gradientUnits="userSpaceOnUse" x2="21.381" gradientTransform="matrix(0.59999998,0,0,0.60526317,1.6000001,2.1710523)" y1="5.0525" x1="21.381">
+ <stop stop-color="#FFF" offset="0"/>
+ <stop stop-color="#FFF" stop-opacity="0.23529412" offset="0.081258"/>
+ <stop stop-color="#FFF" stop-opacity="0.15686275" offset="0.92328"/>
+ <stop stop-color="#FFF" stop-opacity="0.39215687" offset="1"/>
+ </linearGradient>
+ <radialGradient id="radialGradient3232" gradientUnits="userSpaceOnUse" cy="41.636" cx="23.335" gradientTransform="matrix(0.5745243,0,0,0.2209368,2.59375,17.801069)" r="22.627">
+ <stop stop-color="#000" offset="0"/>
+ <stop stop-color="#000" stop-opacity="0" offset="1"/>
+ </radialGradient>
+ </defs>
+ <metadata>
+ <rdf:RDF>
+ <cc:Work rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+ <dc:title/>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <path opacity="0.3" d="m29,27c0.0011,2.7613-5.8195,5-13,5s-13.001-2.239-13-5c-0.0011-2.761,5.8195-5,13-5s13.001,2.2387,13,5z" fill-rule="evenodd" fill="url(#radialGradient3232)"/>
+ <path d="m27.49,25.068c0,2.4466-5.1487,4.4322-11.493,4.4322-6.344,0-11.493-1.9856-11.493-4.4322,0.11446-5.4694-1.4047-4.34,11.493-4.4322,13.193-0.0952,11.331-1.1267,11.493,4.4322z" stroke="url(#linearGradient3155)" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="1" fill="url(#linearGradient3153)"/>
+ <path d="m27.5,21c0,2.4853-5.1487,4.5-11.5,4.5s-11.5-2.0147-11.5-4.5,5.1487-4.5,11.5-4.5,11.5,2.0147,11.5,4.5z" stroke="#d8d8d8" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="1" fill="#868688"/>
+ <path d="m27.49,19.068c0,2.4466-5.1487,4.4322-11.493,4.4322-6.344,0-11.493-1.9856-11.493-4.4322,0.11446-5.4694-1.4047-4.34,11.493-4.4322,13.193-0.0952,11.331-1.1267,11.493,4.4322z" stroke="url(#linearGradient3149)" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="1" fill="url(#linearGradient3147)"/>
+ <path d="m27.5,15c0,2.4853-5.1487,4.5-11.5,4.5s-11.5-2.0147-11.5-4.5,5.1487-4.5,11.5-4.5,11.5,2.0147,11.5,4.5z" stroke="#d8d8d8" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="1" fill="#868688"/>
+ <path d="M27.49,13.068c0,2.446-5.149,4.432-11.493,4.432-6.3435,0-11.492-1.986-11.492-4.432,0.1144-5.4697-1.4047-4.3402,11.492-4.4325,13.193-0.0952,11.331-1.1267,11.493,4.4325z" stroke="url(#linearGradient3143)" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="1" fill="url(#linearGradient3141)"/>
+ <path d="m27.5,9c0,2.4853-5.1487,4.5-11.5,4.5s-11.5-2.015-11.5-4.5c0-2.4853,5.1487-4.5,11.5-4.5,6.351,0,11.5,2.0147,11.5,4.5z" stroke="url(#linearGradient3138)" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="1" fill="url(#linearGradient3136)"/>
+ <rect opacity="0.5" style="enable-background:accumulate;color:#000000;" rx="17.5" ry="4" height="23" width="21" stroke="url(#linearGradient3098)" y="5.5" x="5.5" stroke-width="1" fill="none"/>
+</svg>
diff --git a/core/img/filetypes/file.png b/core/img/filetypes/file.png
index 8b8b1ca0000bc8fa8d0379926736029f8fabe364..c20f13c2e13af5bccf96b77dd66a6a0df0508c90 100644
Binary files a/core/img/filetypes/file.png and b/core/img/filetypes/file.png differ
diff --git a/core/img/filetypes/file.svg b/core/img/filetypes/file.svg
new file mode 100644
index 0000000000000000000000000000000000000000..3d91c3411439a69c131882426d83008dc00c4ba0
--- /dev/null
+++ b/core/img/filetypes/file.svg
@@ -0,0 +1,36 @@
+<?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="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <defs>
+ <linearGradient id="a">
+ <stop offset="0"/>
+ <stop stop-opacity="0" offset="1"/>
+ </linearGradient>
+ <linearGradient id="f" y2="43" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(.56757 0 0 .72973 2.3784 -2.5135)" y1="5.5641" x1="24">
+ <stop stop-color="#fff" offset="0"/>
+ <stop stop-color="#fff" stop-opacity=".23529" offset=".036262"/>
+ <stop stop-color="#fff" stop-opacity=".15686" offset=".95056"/>
+ <stop stop-color="#fff" stop-opacity=".39216" offset="1"/>
+ </linearGradient>
+ <linearGradient id="e" y2="47.013" gradientUnits="userSpaceOnUse" x2="25.132" gradientTransform="matrix(.65714 0 0 .63012 .22856 -1.0896)" y1=".98521" x1="25.132">
+ <stop stop-color="#f4f4f4" offset="0"/>
+ <stop stop-color="#dbdbdb" offset="1"/>
+ </linearGradient>
+ <radialGradient id="c" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(.015663 0 0 .0082353 17.61 25.981)" r="117.14"/>
+ <radialGradient id="b" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-.015663 0 0 .0082353 14.39 25.981)" r="117.14"/>
+ <linearGradient id="d" y2="609.51" gradientUnits="userSpaceOnUse" x2="302.86" gradientTransform="matrix(.045769 0 0 .0082353 -.54232 25.981)" y1="366.65" x1="302.86">
+ <stop stop-opacity="0" offset="0"/>
+ <stop offset=".5"/>
+ <stop stop-opacity="0" offset="1"/>
+ </linearGradient>
+ </defs>
+ <g>
+ <g>
+ <rect opacity=".15" height="2" width="22.1" y="29" x="4.95" fill="url(#d)"/>
+ <path opacity=".15" d="m4.95 29v1.9999c-0.80662 0.0038-1.95-0.44807-1.95-1.0001 0-0.552 0.90012-0.99982 1.95-0.99982z" fill="url(#b)"/>
+ <path opacity=".15" d="m27.05 29v1.9999c0.80661 0.0038 1.95-0.44807 1.95-1.0001 0-0.552-0.90012-0.99982-1.95-0.99982z" fill="url(#c)"/>
+ </g>
+ <path d="m4.5 0.49996c5.2705 0 23 0.00185 23 0.00185l0.000028 28.998h-23v-29z" fill="url(#e)"/>
+ </g>
+ <path stroke-linejoin="round" d="m26.5 28.5h-21v-27h21z" stroke="url(#f)" stroke-linecap="round" fill="none"/>
+ <path stroke-linejoin="round" opacity=".3" d="m4.5 0.49996c5.2705 0 23 0.00185 23 0.00185l0.000028 28.998h-23v-29z" stroke="#000" stroke-width=".99992" fill="none"/>
+</svg>
diff --git a/core/img/filetypes/flash.png b/core/img/filetypes/flash.png
index 9f5db634a4fb42ad33c7a78f5488f03308d3317c..bcde641da3ca196a8212a5b6d91a62013f1430ab 100644
Binary files a/core/img/filetypes/flash.png and b/core/img/filetypes/flash.png differ
diff --git a/core/img/filetypes/flash.svg b/core/img/filetypes/flash.svg
new file mode 100644
index 0000000000000000000000000000000000000000..cb823703d9b42c512a3c1c15765ed82163fef4d5
--- /dev/null
+++ b/core/img/filetypes/flash.svg
@@ -0,0 +1,60 @@
+<?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="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <defs>
+ <linearGradient id="a">
+ <stop offset="0"/>
+ <stop stop-opacity="0" offset="1"/>
+ </linearGradient>
+ <linearGradient id="j" y2="43" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(.56757 0 0 .72973 2.3784 -2.5135)" y1="5.5641" x1="24">
+ <stop stop-color="#fff" offset="0"/>
+ <stop stop-color="#fff" stop-opacity=".23529" offset=".036262"/>
+ <stop stop-color="#fff" stop-opacity=".15686" offset=".95056"/>
+ <stop stop-color="#fff" stop-opacity=".39216" offset="1"/>
+ </linearGradient>
+ <linearGradient id="i" y2="47.013" gradientUnits="userSpaceOnUse" x2="25.132" gradientTransform="matrix(.65714 0 0 .63012 .22856 -1.0896)" y1=".98521" x1="25.132">
+ <stop stop-color="#f4f4f4" offset="0"/>
+ <stop stop-color="#dbdbdb" offset="1"/>
+ </linearGradient>
+ <radialGradient id="d" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(.015663 0 0 .0082353 17.61 25.981)" r="117.14"/>
+ <radialGradient id="c" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-.015663 0 0 .0082353 14.39 25.981)" r="117.14"/>
+ <linearGradient id="h" y2="609.51" gradientUnits="userSpaceOnUse" x2="302.86" gradientTransform="matrix(.045769 0 0 .0082353 -.54232 25.981)" y1="366.65" x1="302.86">
+ <stop stop-opacity="0" offset="0"/>
+ <stop offset=".5"/>
+ <stop stop-opacity="0" offset="1"/>
+ </linearGradient>
+ <linearGradient id="g" y2="25.726" gradientUnits="userSpaceOnUse" x2="27.401" gradientTransform="matrix(.65714 0 0 .65901 .22856 .17230)" y1="22.442" x1="27.401">
+ <stop offset="0"/>
+ <stop stop-opacity="0" offset="1"/>
+ </linearGradient>
+ <linearGradient id="f" y2="35" gradientUnits="userSpaceOnUse" x2="25" gradientTransform="matrix(.65714 0 0 .65901 .22856 .17230)" y1="12" x1="25">
+ <stop offset="0"/>
+ <stop stop-opacity="0" offset="1"/>
+ </linearGradient>
+ <radialGradient id="b" fx="30.345" gradientUnits="userSpaceOnUse" cy="10.417" cx="28.897" gradientTransform="matrix(.85740 -2.1584e-8 0 1.4143 -9.1048 9.1644)" r="20">
+ <stop stop-color="#f8b17e" offset="0"/>
+ <stop stop-color="#e35d4f" offset=".26238"/>
+ <stop stop-color="#c6262e" offset=".66094"/>
+ <stop stop-color="#690b54" offset="1"/>
+ </radialGradient>
+ <linearGradient id="e" y2="36.647" gradientUnits="userSpaceOnUse" x2="21.587" gradientTransform="matrix(.65714 0 0 .65901 -0.1 -.12653)" y1="11.492" x1="21.587">
+ <stop stop-color="#911313" offset="0"/>
+ <stop stop-color="#bc301e" offset="1"/>
+ </linearGradient>
+ </defs>
+ <g>
+ <g>
+ <rect opacity=".15" height="2" width="22.1" y="29" x="4.95" fill="url(#h)"/>
+ <path opacity=".15" d="m4.95 29v1.9999c-0.80662 0.0038-1.95-0.44807-1.95-1.0001 0-0.552 0.90012-0.99982 1.95-0.99982z" fill="url(#c)"/>
+ <path opacity=".15" d="m27.05 29v1.9999c0.80661 0.0038 1.95-0.44807 1.95-1.0001 0-0.552-0.90012-0.99982-1.95-0.99982z" fill="url(#d)"/>
+ </g>
+ <path d="m4.5 0.49996c5.2705 0 23 0.00185 23 0.00185l0.000028 28.998h-23v-29z" fill="url(#i)"/>
+ </g>
+ <path stroke-linejoin="round" d="m26.5 28.5h-21v-27h21z" stroke="url(#j)" stroke-linecap="round" fill="none"/>
+ <path stroke-linejoin="round" opacity=".3" d="m4.5 0.49996c5.2705 0 23 0.00185 23 0.00185l0.000028 28.998h-23v-29z" stroke="#000" stroke-width=".99992" fill="none"/>
+ <path opacity=".6" style="color:#000000" d="m22.499 8.0004c-2.6636-0.029674-5.0587 1.658-6.5324 3.7793-0.94364 1.305-1.5732 2.7991-2.0832 4.3148-0.69136 1.6778-1.5201 3.4583-3.0765 4.5016-0.45903 0.43459-1.0981 0.2-1.5957 0.43224-0.34845 0.3228-0.14701 0.84514-0.20078 1.2625 0.014388 0.76734-0.029122 1.5402 0.022375 2.304 0.18898 0.54758 0.88853 0.37796 1.3325 0.38828 2.2257-0.09973 4.2002-1.5034 5.3804-3.336 0.54977-0.82122 0.97797-1.7194 1.3143-2.6473 1.5061-0.0077 3.0142 0.01532 4.519-0.01144 0.47522-0.09148 0.43944-0.63085 0.42264-1.001-0.0162-0.88446 0.03272-1.7755-0.02502-2.6558-0.16487-0.50455-0.76136-0.34818-1.1638-0.37106h-1.4529c0.52776-1.2578 1.4889-2.5011 2.8611-2.8681 0.36161 0.0036 0.81834-0.19473 0.77518-0.62481-0.01611-1.0312 0.03245-2.0689-0.02468-3.096-0.06232-0.20565-0.25794-0.35925-0.47259-0.37101z" fill="#fff"/>
+ <g stroke-linecap="round">
+ <path stroke-linejoin="round" style="color:#000000" d="m9.5 20.5v3s4.9977 0.73959 7.2131-6c0.14685-0.000002 4.7869 0 4.7869 0v-3h-3s1.2833-3.7081 4-4l-0.000016-3s-5.0297-0.35936-7.7464 6.7199c-2.35 6.933-5.254 6.28-5.254 6.28z" stroke="url(#e)" fill="url(#b)"/>
+ <path opacity=".1" style="color:#000000" d="m21.5 9.8357v-1.2407c-1.6165 0.19395-3.8735 2.0585-4.8706 4.0955-0.67454 1.078-0.96187 2.016-1.4144 3.1932-0.81519 1.9428-2.1324 4.1368-4.0625 5.1513" stroke="url(#f)" fill="none"/>
+ <path opacity=".1" style="color:#000000" d="m20.5 16.656v-1.1418l-2.3993-0.02926" stroke="url(#g)" fill="none"/>
+ </g>
+</svg>
diff --git a/core/img/filetypes/folder-drag-accept.png b/core/img/filetypes/folder-drag-accept.png
new file mode 100644
index 0000000000000000000000000000000000000000..19c2d2eebd41e50454157f035df9c69dbcfc5717
Binary files /dev/null and b/core/img/filetypes/folder-drag-accept.png differ
diff --git a/core/img/filetypes/folder-drag-accept.svg b/core/img/filetypes/folder-drag-accept.svg
new file mode 100644
index 0000000000000000000000000000000000000000..a7885c80be77e1c4d9ecd1f73c2a4259856ff6f1
--- /dev/null
+++ b/core/img/filetypes/folder-drag-accept.svg
@@ -0,0 +1,335 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="32px"
+ height="32px"
+ id="svg17313"
+ version="1.1"
+ inkscape:version="0.48.3.1 r9886"
+ sodipodi:docname="folder-drag-accept.svg"
+ inkscape:export-filename="folder-drag-accept.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <defs
+ id="defs17315">
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3454-2-5-0-3-4"
+ id="linearGradient8576"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.89186139,0,0,0.86792712,3.12074,9.575029)"
+ x1="27.557428"
+ y1="7.162672"
+ x2="27.557428"
+ y2="21.386522" />
+ <linearGradient
+ id="linearGradient3454-2-5-0-3-4">
+ <stop
+ offset="0"
+ style="stop-color:#ffffff;stop-opacity:1"
+ id="stop3456-4-9-38-1-8" />
+ <stop
+ offset="0.0097359"
+ style="stop-color:#ffffff;stop-opacity:0.23529412"
+ id="stop3458-39-80-3-5-5" />
+ <stop
+ offset="0.99001008"
+ style="stop-color:#ffffff;stop-opacity:0.15686275"
+ id="stop3460-7-0-2-4-2" />
+ <stop
+ offset="1"
+ style="stop-color:#ffffff;stop-opacity:0.39215687"
+ id="stop3462-0-9-8-7-2" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient6129-963-697-142-998-580-273-5"
+ id="linearGradient8564"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.7467531,0,0,0.5519934,-1.92198,5.720099)"
+ x1="22.934725"
+ y1="49.629246"
+ x2="22.809399"
+ y2="36.657963" />
+ <linearGradient
+ id="linearGradient6129-963-697-142-998-580-273-5">
+ <stop
+ id="stop2661-1"
+ style="stop-color:#0a0a0a;stop-opacity:0.498"
+ offset="0" />
+ <stop
+ id="stop2663-85"
+ style="stop-color:#0a0a0a;stop-opacity:0"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4632-0-6-4-3-4"
+ id="linearGradient8568"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.64444432,0,0,0.54135319,0.53343,5.488719)"
+ x1="35.792694"
+ y1="17.118193"
+ x2="35.792694"
+ y2="43.761127" />
+ <linearGradient
+ id="linearGradient4632-0-6-4-3-4">
+ <stop
+ style="stop-color:#b4cee1;stop-opacity:1;"
+ offset="0"
+ id="stop4634-4-4-7-7-4" />
+ <stop
+ style="stop-color:#5d9fcd;stop-opacity:1;"
+ offset="1"
+ id="stop4636-3-1-5-1-3" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5048-585-0"
+ id="linearGradient16107"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.05114282,0,0,0.01591575,-2.4899573,22.29927)"
+ x1="302.85715"
+ y1="366.64789"
+ x2="302.85715"
+ y2="609.50507" />
+ <linearGradient
+ id="linearGradient5048-585-0">
+ <stop
+ id="stop2667-18"
+ style="stop-color:#000000;stop-opacity:0"
+ offset="0" />
+ <stop
+ id="stop2669-9"
+ style="stop-color:#000000;stop-opacity:1"
+ offset="0.5" />
+ <stop
+ id="stop2671-33"
+ style="stop-color:#000000;stop-opacity:0"
+ offset="1" />
+ </linearGradient>
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5060-179-67"
+ id="radialGradient16109"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.01983573,0,0,0.01591575,16.38765,22.29927)"
+ cx="605.71429"
+ cy="486.64789"
+ fx="605.71429"
+ fy="486.64789"
+ r="117.14286" />
+ <linearGradient
+ id="linearGradient5060-179-67">
+ <stop
+ id="stop2675-81"
+ style="stop-color:#000000;stop-opacity:1"
+ offset="0" />
+ <stop
+ id="stop2677-2"
+ style="stop-color:#000000;stop-opacity:0"
+ offset="1" />
+ </linearGradient>
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5060-820-4"
+ id="radialGradient16111"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(-0.01983573,0,0,0.01591575,15.60139,22.29927)"
+ cx="605.71429"
+ cy="486.64789"
+ fx="605.71429"
+ fy="486.64789"
+ r="117.14286" />
+ <linearGradient
+ id="linearGradient5060-820-4">
+ <stop
+ id="stop2681-5"
+ style="stop-color:#000000;stop-opacity:1"
+ offset="0" />
+ <stop
+ id="stop2683-00"
+ style="stop-color:#000000;stop-opacity:0"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4325"
+ id="linearGradient8584"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.54383556,0,0,0.61466406,3.26879,5.091139)"
+ x1="21.37039"
+ y1="4.73244"
+ x2="21.37039"
+ y2="34.143417" />
+ <linearGradient
+ id="linearGradient4325">
+ <stop
+ offset="0"
+ style="stop-color:#ffffff;stop-opacity:1"
+ id="stop4327" />
+ <stop
+ offset="0.1106325"
+ style="stop-color:#ffffff;stop-opacity:0.23529412"
+ id="stop4329" />
+ <stop
+ offset="0.99001008"
+ style="stop-color:#ffffff;stop-opacity:0.15686275"
+ id="stop4331" />
+ <stop
+ offset="1"
+ style="stop-color:#ffffff;stop-opacity:0.39215687"
+ id="stop4333" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4646-7-4-3-5"
+ id="linearGradient8580"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.61904762,0,0,0.61904762,-30.3919,1.428569)"
+ x1="62.988873"
+ y1="17.469706"
+ x2="62.988873"
+ y2="20.469706" />
+ <linearGradient
+ id="linearGradient4646-7-4-3-5">
+ <stop
+ offset="0"
+ style="stop-color:#f9f9f9;stop-opacity:1"
+ id="stop4648-8-0-3-6" />
+ <stop
+ offset="1"
+ style="stop-color:#d8d8d8;stop-opacity:1"
+ id="stop4650-1-7-3-4" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3104-8-8-97-4-6-11-5-5-0">
+ <stop
+ offset="0"
+ style="stop-color:#000000;stop-opacity:0.32173914"
+ id="stop3106-5-4-3-5-0-2-1-0-6" />
+ <stop
+ offset="1"
+ style="stop-color:#000000;stop-opacity:0.27826086"
+ id="stop3108-4-3-7-8-2-0-7-9-1" />
+ </linearGradient>
+ <linearGradient
+ y2="3.6336823"
+ x2="-51.786404"
+ y1="53.514328"
+ x1="-51.786404"
+ gradientTransform="matrix(0.50703384,0,0,0.50300255,68.02913,1.329769)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient17311"
+ xlink:href="#linearGradient3104-8-8-97-4-6-11-5-5-0"
+ inkscape:collect="always" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="11.197802"
+ inkscape:cx="16"
+ inkscape:cy="16"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:grid-bbox="true"
+ inkscape:document-units="px"
+ inkscape:window-width="1366"
+ inkscape:window-height="744"
+ inkscape:window-x="0"
+ inkscape:window-y="24"
+ inkscape:window-maximized="1" />
+ <metadata
+ id="metadata17318">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ id="layer1"
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer">
+ <path
+ style="opacity:0.8;color:#000000;fill:none;stroke:url(#linearGradient17311);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="use8307"
+ inkscape:connector-curvature="0"
+ d="m 4.00009,6.500079 c -0.43342,0.005 -0.5,0.21723 -0.5,0.6349 l 0,1.36502 c -1.24568,0 -1,-0.002 -1,0.54389 l 0,9.45611 27,-1.36005 0,-8.09606 c 0,-0.41767 -0.34799,-0.54876 -0.78141,-0.54389 l -14.21859,0 0,-1.36502 c 0,-0.41767 -0.26424,-0.63977 -0.69767,-0.6349 z"
+ sodipodi:nodetypes="csccccsccscc" />
+ <path
+ id="use8309"
+ d="m 4.00009,6.999999 0,2 -1,0 0,6 26,0 0,-6 -15,0 0,-2 z"
+ style="color:#000000;fill:url(#linearGradient8580);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccccccc" />
+ <path
+ id="use8311"
+ d="m 4.50009,7.499999 0,2 -1,0 0,6 25,0 0,-6 -15,0 0,-2 z"
+ style="color:#000000;fill:none;stroke:url(#linearGradient8584);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccccccc" />
+ <g
+ id="use8313"
+ transform="translate(9e-5,-1.000001)">
+ <rect
+ style="opacity:0.3;fill:url(#linearGradient16107);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
+ id="rect16101"
+ y="28.134747"
+ x="3.6471815"
+ height="3.8652544"
+ width="24.694677" />
+ <path
+ style="opacity:0.3;fill:url(#radialGradient16109);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
+ id="path16103"
+ inkscape:connector-curvature="0"
+ d="m 28.341859,28.13488 c 0,0 0,3.865041 0,3.865041 1.021491,0.0073 2.469468,-0.86596 2.469468,-1.932769 0,-1.06681 -1.139908,-1.932272 -2.469468,-1.932272 z" />
+ <path
+ style="opacity:0.3;fill:url(#radialGradient16111);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
+ id="path16105"
+ inkscape:connector-curvature="0"
+ d="m 3.6471816,28.13488 c 0,0 0,3.865041 0,3.865041 -1.0214912,0.0073 -2.4694678,-0.86596 -2.4694678,-1.932769 0,-1.06681 1.1399068,-1.932272 2.4694678,-1.932272 z" />
+ </g>
+ <path
+ style="color:#000000;fill:url(#linearGradient8568);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.9176628;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="use8315"
+ inkscape:connector-curvature="0"
+ d="m 0.92644,14.421049 c -0.69105,0.067 -0.32196,0.76007 -0.37705,1.14977 0.0802,0.25184 1.5982,13.2362 1.5982,13.68205 0,0.38752 0.22667,0.32187 0.80101,0.32187 8.4994,0 17.89808,0 26.39748,0 0.61872,0.012 0.48796,0.006 0.48796,-0.32797 0.0452,-0.17069 1.63945,-14.29767 1.66234,-14.52079 0,-0.23495 0.0581,-0.30493 -0.30493,-0.30493 -9.0765,0 -21.1885,0 -30.26501,0 z"
+ sodipodi:nodetypes="ccsscccsc" />
+ <path
+ style="opacity:0.4;fill:url(#linearGradient8564);fill-opacity:1;stroke:none"
+ id="use8317"
+ inkscape:connector-curvature="0"
+ d="m 0.68182,13.999999 30.63618,2.3e-4 c 0.4137,0 0.68181,0.24597 0.68181,0.55177 l -1.67322,14.91546 c 0.01,0.38693 -0.1364,0.54035 -0.61707,0.53224 l -27.25613,-0.01 c -0.4137,0 -0.83086,-0.22836 -0.83086,-0.53417 L 0,14.551709 c 0,-0.3058 0.26812,-0.55199 0.68182,-0.55199 z"
+ sodipodi:nodetypes="cscccccccc" />
+ <path
+ sodipodi:nodetypes="ccccc"
+ inkscape:connector-curvature="0"
+ id="use8572"
+ d="m 1.49991,15.411759 1.62516,13.17647 25.74917,0 1.62467,-13.17647 z"
+ style="opacity:0.5;color:#000000;fill:none;stroke:url(#linearGradient8576);stroke-width:0.90748531;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ <path
+ style="opacity:0.3;color:#000000;fill:none;stroke:#000000;stroke-width:0.9176628;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="use8315-2"
+ inkscape:connector-curvature="0"
+ d="m 0.92644,14.42105 c -0.69105,0.067 -0.32196,0.76007 -0.37705,1.14977 0.0802,0.25184 1.5982,13.236199 1.5982,13.682049 0,0.38752 0.22667,0.32187 0.80101,0.32187 8.4994,0 17.89808,0 26.39748,0 0.61872,0.012 0.48796,0.006 0.48796,-0.32797 0.0452,-0.17069 1.63945,-14.297669 1.66234,-14.520789 0,-0.23495 0.0581,-0.30493 -0.30493,-0.30493 -9.0765,0 -21.1885,0 -30.26501,0 z"
+ sodipodi:nodetypes="ccsscccsc" />
+ </g>
+</svg>
diff --git a/core/img/filetypes/folder-external.png b/core/img/filetypes/folder-external.png
new file mode 100644
index 0000000000000000000000000000000000000000..997f07b2bacc1ae5bb09b5addb1539254fffb6c6
Binary files /dev/null and b/core/img/filetypes/folder-external.png differ
diff --git a/core/img/filetypes/folder-external.svg b/core/img/filetypes/folder-external.svg
new file mode 100644
index 0000000000000000000000000000000000000000..89ec9a8ecaae43de01426d4946890aae0e2ec016
--- /dev/null
+++ b/core/img/filetypes/folder-external.svg
@@ -0,0 +1,68 @@
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32px" width="32px" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <metadata>
+ <rdf:RDF>
+ <cc:Work rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+ <dc:title/>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs>
+ <linearGradient id="c" y2="21.387" gradientUnits="userSpaceOnUse" x2="27.557" gradientTransform="matrix(.89186 0 0 1.0539 3.1208 5.4125)" y1="7.1627" x1="27.557">
+ <stop stop-color="#fff" offset="0"/>
+ <stop stop-color="#fff" stop-opacity=".23529" offset="0.0097359"/>
+ <stop stop-color="#fff" stop-opacity=".15686" offset="0.99001"/>
+ <stop stop-color="#fff" stop-opacity=".39216" offset="1"/>
+ </linearGradient>
+ <linearGradient id="d" y2="36.658" gradientUnits="userSpaceOnUse" x2="22.809" gradientTransform="matrix(0.74675,0,0,0.65549,-1.9219,3.1676)" y1="49.629" x1="22.935">
+ <stop stop-color="#0a0a0a" stop-opacity=".498" offset="0"/>
+ <stop stop-color="#0a0a0a" stop-opacity="0" offset="1"/>
+ </linearGradient>
+ <linearGradient id="e" y2="43.761" gradientUnits="userSpaceOnUse" x2="35.793" gradientTransform="matrix(.64444 0 0 .64286 .53352 .89286)" y1="17.118" x1="35.793">
+ <stop stop-color="#b4cee1" offset="0"/>
+ <stop stop-color="#5d9fcd" offset="1"/>
+ </linearGradient>
+ <linearGradient id="f" y2="609.51" gradientUnits="userSpaceOnUse" x2="302.86" gradientTransform="matrix(.051143 0 0 .015916 -2.49 22.299)" y1="366.65" x1="302.86">
+ <stop stop-opacity="0" offset="0"/>
+ <stop offset="0.5"/>
+ <stop stop-opacity="0" offset="1"/>
+ </linearGradient>
+ <radialGradient id="b" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(.019836 0 0 .015916 16.388 22.299)" r="117.14">
+ <stop offset="0"/>
+ <stop stop-opacity="0" offset="1"/>
+ </radialGradient>
+ <radialGradient id="a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-.019836 0 0 .015916 15.601 22.299)" r="117.14">
+ <stop offset="0"/>
+ <stop stop-opacity="0" offset="1"/>
+ </radialGradient>
+ <linearGradient id="g" y2="34.143" gradientUnits="userSpaceOnUse" x2="21.37" gradientTransform="matrix(.54384 0 0 .61466 3.2689 5.0911)" y1="4.7324" x1="21.37">
+ <stop stop-color="#fff" offset="0"/>
+ <stop stop-color="#fff" stop-opacity=".23529" offset="0.11063"/>
+ <stop stop-color="#fff" stop-opacity=".15686" offset="0.99001"/>
+ <stop stop-color="#fff" stop-opacity=".39216" offset="1"/>
+ </linearGradient>
+ <linearGradient id="h" y2="16" gradientUnits="userSpaceOnUse" x2="62.989" gradientTransform="matrix(.61905 0 0 .61905 -30.392 1.4286)" y1="13" x1="62.989">
+ <stop stop-color="#f9f9f9" offset="0"/>
+ <stop stop-color="#d8d8d8" offset="1"/>
+ </linearGradient>
+ <linearGradient id="i" y2="3.6337" gradientUnits="userSpaceOnUse" y1="53.514" gradientTransform="matrix(.50703 0 0 0.503 68.029 1.3298)" x2="-51.786" x1="-51.786">
+ <stop stop-opacity=".32174" offset="0"/>
+ <stop stop-opacity=".27826" offset="1"/>
+ </linearGradient>
+ </defs>
+ <path opacity=".8" style="color:#000000;" d="m4.0002,6.5001c-0.43342,0.005-0.5,0.21723-0.5,0.6349v1.365c-1.2457,0-1-0.002-1,0.54389,0.0216,6.5331,0,6.9014,0,7.4561,0.90135,0,27-2.349,27-3.36v-4.0961c0-0.41767-0.34799-0.54876-0.78141-0.54389h-14.219v-1.365c0-0.41767-0.26424-0.63977-0.69767-0.6349h-9.8023z" stroke="url(#i)" fill="none"/>
+ <path style="color:#000000;" d="m4.0002,7v2h-1v4h26v-4h-15v-2h-10z" fill="url(#h)"/>
+ <path style="color:#000000;" d="m4.5002,7.5v2h-1v4h25v-4h-15v-2h-9z" stroke="url(#g)" stroke-linecap="round" fill="none"/>
+ <g transform="translate(.00017936 -1)">
+ <rect opacity="0.3" height="3.8653" width="24.695" y="28.135" x="3.6472" fill="url(#f)"/>
+ <path opacity=".3" d="m28.342,28.135v3.865c1.0215,0.0073,2.4695-0.86596,2.4695-1.9328s-1.1399-1.9323-2.4695-1.9323z" fill="url(#b)"/>
+ <path opacity=".3" d="m3.6472,28.135v3.865c-1.0215,0.0073-2.4695-0.86596-2.4695-1.9328s1.1399-1.9323,2.4695-1.9323z" fill="url(#a)"/>
+ </g>
+ <path style="color:#000000;" d="m1.927,11.5c-0.69105,0.0796-0.32196,0.90258-0.37705,1.3654,0.0802,0.29906,0.59771,15.718,0.59771,16.247,0,0.46018,0.22667,0.38222,0.80101,0.38222h26.397c0.61872,0.0143,0.48796,0.007,0.48796-0.38947,0.0452-0.20269,0.63993-16.978,0.66282-17.243,0-0.279,0.0581-0.3621-0.30493-0.3621h-28.265z" fill="url(#e)"/>
+ <path opacity="0.4" fill="url(#d)" d="m1.682,13,28.636,0.00027c0.4137,0,0.68181,0.29209,0.68181,0.65523l-0.6735,17.712c0.01,0.45948-0.1364,0.64166-0.61707,0.63203l-27.256-0.0115c-0.4137,0-0.83086-0.27118-0.83086-0.63432l-0.62244-17.698c0-0.36314,0.26812-0.65549,0.68182-0.65549z"/>
+ <path opacity=".5" style="color:#000000;" d="m2.5002,12.5,0.62498,16h25.749l0.62498-16z" stroke="url(#c)" stroke-linecap="round" fill="none"/>
+ <path opacity=".3" stroke-linejoin="round" style="color:#000000;" d="m1.927,11.5c-0.69105,0.0796-0.32196,0.90258-0.37705,1.3654,0.0802,0.29906,0.59771,15.718,0.59771,16.247,0,0.46018,0.22667,0.38222,0.80101,0.38222h26.397c0.61872,0.0143,0.48796,0.007,0.48796-0.38947,0.0452-0.20269,0.63993-16.978,0.66282-17.243,0-0.279,0.0581-0.3621-0.30493-0.3621h-28.265z" stroke="#000" stroke-linecap="round" fill="none"/>
+ <path opacity="0.3" fill="#FFF" d="m16,16,2,2-3,3,2,2,3-3,2,2,0-6-6,0zm-4,1c-0.554,0-1,0.446-1,1v8c0,0.554,0.446,1,1,1h8c0.554,0,1-0.446,1-1v-3l-1-1v4h-8v-8h4l-1-1h-3z"/>
+ <path opacity="0.7" fill="#000" d="m16,15,2,2-3,3,2,2,3-3,2,2,0-6-6,0zm-4,1c-0.554,0-1,0.446-1,1v8c0,0.554,0.446,1,1,1h8c0.554,0,1-0.446,1-1v-3l-1-1v4h-8v-8h4l-1-1h-3z"/>
+</svg>
diff --git a/core/img/filetypes/folder-public.png b/core/img/filetypes/folder-public.png
new file mode 100644
index 0000000000000000000000000000000000000000..c716607e26e3c2cf8f82dd754e820d475cb99f70
Binary files /dev/null and b/core/img/filetypes/folder-public.png differ
diff --git a/core/img/filetypes/folder-public.svg b/core/img/filetypes/folder-public.svg
new file mode 100644
index 0000000000000000000000000000000000000000..a949833f95a49f570750c3faed1016db06f4a0a2
--- /dev/null
+++ b/core/img/filetypes/folder-public.svg
@@ -0,0 +1,68 @@
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32px" width="32px" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <metadata>
+ <rdf:RDF>
+ <cc:Work rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+ <dc:title/>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs>
+ <linearGradient id="c" y2="21.387" gradientUnits="userSpaceOnUse" x2="27.557" gradientTransform="matrix(.89186 0 0 1.0539 3.1208 5.4125)" y1="7.1627" x1="27.557">
+ <stop stop-color="#fff" offset="0"/>
+ <stop stop-color="#fff" stop-opacity=".23529" offset="0.0097359"/>
+ <stop stop-color="#fff" stop-opacity=".15686" offset="0.99001"/>
+ <stop stop-color="#fff" stop-opacity=".39216" offset="1"/>
+ </linearGradient>
+ <linearGradient id="d" y2="36.658" gradientUnits="userSpaceOnUse" x2="22.809" gradientTransform="matrix(0.74675,0,0,0.65549,-1.9219,3.1676)" y1="49.629" x1="22.935">
+ <stop stop-color="#0a0a0a" stop-opacity=".498" offset="0"/>
+ <stop stop-color="#0a0a0a" stop-opacity="0" offset="1"/>
+ </linearGradient>
+ <linearGradient id="e" y2="43.761" gradientUnits="userSpaceOnUse" x2="35.793" gradientTransform="matrix(.64444 0 0 .64286 .53352 .89286)" y1="17.118" x1="35.793">
+ <stop stop-color="#b4cee1" offset="0"/>
+ <stop stop-color="#5d9fcd" offset="1"/>
+ </linearGradient>
+ <linearGradient id="f" y2="609.51" gradientUnits="userSpaceOnUse" x2="302.86" gradientTransform="matrix(.051143 0 0 .015916 -2.49 22.299)" y1="366.65" x1="302.86">
+ <stop stop-opacity="0" offset="0"/>
+ <stop offset="0.5"/>
+ <stop stop-opacity="0" offset="1"/>
+ </linearGradient>
+ <radialGradient id="b" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(.019836 0 0 .015916 16.388 22.299)" r="117.14">
+ <stop offset="0"/>
+ <stop stop-opacity="0" offset="1"/>
+ </radialGradient>
+ <radialGradient id="a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-.019836 0 0 .015916 15.601 22.299)" r="117.14">
+ <stop offset="0"/>
+ <stop stop-opacity="0" offset="1"/>
+ </radialGradient>
+ <linearGradient id="g" y2="34.143" gradientUnits="userSpaceOnUse" x2="21.37" gradientTransform="matrix(.54384 0 0 .61466 3.2689 5.0911)" y1="4.7324" x1="21.37">
+ <stop stop-color="#fff" offset="0"/>
+ <stop stop-color="#fff" stop-opacity=".23529" offset="0.11063"/>
+ <stop stop-color="#fff" stop-opacity=".15686" offset="0.99001"/>
+ <stop stop-color="#fff" stop-opacity=".39216" offset="1"/>
+ </linearGradient>
+ <linearGradient id="h" y2="16" gradientUnits="userSpaceOnUse" x2="62.989" gradientTransform="matrix(.61905 0 0 .61905 -30.392 1.4286)" y1="13" x1="62.989">
+ <stop stop-color="#f9f9f9" offset="0"/>
+ <stop stop-color="#d8d8d8" offset="1"/>
+ </linearGradient>
+ <linearGradient id="i" y2="3.6337" gradientUnits="userSpaceOnUse" y1="53.514" gradientTransform="matrix(.50703 0 0 0.503 68.029 1.3298)" x2="-51.786" x1="-51.786">
+ <stop stop-opacity=".32174" offset="0"/>
+ <stop stop-opacity=".27826" offset="1"/>
+ </linearGradient>
+ </defs>
+ <path opacity=".8" style="color:#000000;" d="m4.0002,6.5001c-0.43342,0.005-0.5,0.21723-0.5,0.6349v1.365c-1.2457,0-1-0.002-1,0.54389,0.0216,6.5331,0,6.9014,0,7.4561,0.90135,0,27-2.349,27-3.36v-4.0961c0-0.41767-0.34799-0.54876-0.78141-0.54389h-14.219v-1.365c0-0.41767-0.26424-0.63977-0.69767-0.6349h-9.8023z" stroke="url(#i)" fill="none"/>
+ <path style="color:#000000;" d="m4.0002,7v2h-1v4h26v-4h-15v-2h-10z" fill="url(#h)"/>
+ <path style="color:#000000;" d="m4.5002,7.5v2h-1v4h25v-4h-15v-2h-9z" stroke="url(#g)" stroke-linecap="round" fill="none"/>
+ <g transform="translate(.00017936 -1)">
+ <rect opacity="0.3" height="3.8653" width="24.695" y="28.135" x="3.6472" fill="url(#f)"/>
+ <path opacity=".3" d="m28.342,28.135v3.865c1.0215,0.0073,2.4695-0.86596,2.4695-1.9328s-1.1399-1.9323-2.4695-1.9323z" fill="url(#b)"/>
+ <path opacity=".3" d="m3.6472,28.135v3.865c-1.0215,0.0073-2.4695-0.86596-2.4695-1.9328s1.1399-1.9323,2.4695-1.9323z" fill="url(#a)"/>
+ </g>
+ <path style="color:#000000;" d="m1.927,11.5c-0.69105,0.0796-0.32196,0.90258-0.37705,1.3654,0.0802,0.29906,0.59771,15.718,0.59771,16.247,0,0.46018,0.22667,0.38222,0.80101,0.38222h26.397c0.61872,0.0143,0.48796,0.007,0.48796-0.38947,0.0452-0.20269,0.63993-16.978,0.66282-17.243,0-0.279,0.0581-0.3621-0.30493-0.3621h-28.265z" fill="url(#e)"/>
+ <path opacity="0.4" fill="url(#d)" d="m1.682,13,28.636,0.00027c0.4137,0,0.68181,0.29209,0.68181,0.65523l-0.6735,17.712c0.01,0.45948-0.1364,0.64166-0.61707,0.63203l-27.256-0.0115c-0.4137,0-0.83086-0.27118-0.83086-0.63432l-0.62244-17.698c0-0.36314,0.26812-0.65549,0.68182-0.65549z"/>
+ <path opacity=".5" style="color:#000000;" d="m2.5002,12.5,0.62498,16h25.749l0.62498-16z" stroke="url(#c)" stroke-linecap="round" fill="none"/>
+ <path opacity=".3" stroke-linejoin="round" style="color:#000000;" d="m1.927,11.5c-0.69105,0.0796-0.32196,0.90258-0.37705,1.3654,0.0802,0.29906,0.59771,15.718,0.59771,16.247,0,0.46018,0.22667,0.38222,0.80101,0.38222h26.397c0.61872,0.0143,0.48796,0.007,0.48796-0.38947,0.0452-0.20269,0.63993-16.978,0.66282-17.243,0-0.279,0.0581-0.3621-0.30493-0.3621h-28.265z" stroke="#000" stroke-linecap="round" fill="none"/>
+ <path opacity="0.3" fill="#FFF" d="m16,14c-3.866,0-7,3.134-7,7s3.134,7,7,7,7-3.134,7-7-3.134-7-7-7zm0.80208,0.89323c1.2011,0.02671,2.2625,0.74821,3.3359,1.2214l1.732,2.3971-0.274,1.03,0.529,0.3281-0.009,1.2213c-0.0121,0.34937,0.005,0.69921-0.0091,1.0482-0.16635,0.66235-0.55063,1.2666-0.875,1.8685-0.21989,0.10841,0.02005-0.7185-0.11849-0.97526,0.032-0.5934-0.471-0.566-0.811-0.2364-0.421,0.2454-1.346,0.3194-1.376-0.3464-0.239-0.8001-0.035-1.6526,0.291-2.3971l-0.537-0.6563,0.191-1.6862-0.857-0.8658,0.201-0.948-1.0028-0.5651c-0.1977-0.1552-0.5738-0.2166-0.6563-0.4284,0.0814-0.0046,0.166-0.0109,0.2461-0.0091zm-2.4609,0.0091c0.03144,0.0046,0.06999,0.02643,0.1276,0.07292,0.338,0.1857-0.0825,0.3964-0.1823,0.5925-0.5398,0.3651,0.166,0.6641,0.401,0.957,0.3767-0.1082,0.7535-0.6467,1.3034-0.483,0.7034-0.2195,0.5913,0.5891,0.9935,0.9479,0.0522,0.1689,0.88,0.7185,0.3828,0.5377-0.4095-0.3174-0.8649-0.2935-1.1576,0.1641-0.7909,0.4286-0.3228-0.8252-0.7018-1.1302-0.5729-0.6392-0.3328,0.4775-0.401,0.8112-0.3725-0.0081-1.0681-0.2866-1.4492,0.1641l0.3736,0.6106,0.4467-0.6836c0.1085-0.2474,0.2447,0.1923,0.3645,0.2735,0.1431,0.2759,0.823,0.7434,0.3099,0.875-0.7606,0.4219-1.3589,1.0618-2.0052,1.6315-0.218,0.46-0.663,0.4074-0.9388,0.0273-0.6672-0.4105-0.6177,0.6566-0.5833,1.0573l0.58333-0.36458v0.60156c-0.0165,0.1138-0.0024,0.2322-0.0091,0.3464-0.4087,0.427-0.8207-0.5995-1.1758-0.8295l-0.0273-1.5039c0.0129-0.4225-0.0763-0.8551,0.0091-1.2669,0.8038-0.8625,1.6202-1.7561,2.0964-2.8529h0.78385c0.5478,0.2654,0.2357-0.5881,0.4557-0.556zm-1.1576,7.8204c0.0951-0.01014,0.20328,0.01157,0.31901,0.07292,0.73794,0.10562,1.2897,0.6409,1.8776,1.0482,0.46872,0.46452,1.4828,0.31578,1.5951,1.1029-0.17061,0.85375-1.0105,1.3122-1.75,1.6133-0.1846,0.103-0.383,0.185-0.5925,0.219-0.6856,0.171-0.982-0.532-1.1211-1.058-0.3104-0.65-1.0862-1.142-0.9752-1.941,0.0182-0.397,0.235-1.0134,0.6471-1.0573z"/>
+ <path opacity="0.7" d="m16,13c-3.866,0-7,3.134-7,7s3.134,7,7,7,7-3.134,7-7-3.134-7-7-7zm0.80208,0.89323c1.2011,0.02671,2.2625,0.74821,3.3359,1.2214l1.732,2.3971-0.274,1.03,0.529,0.3281-0.009,1.2213c-0.0121,0.34937,0.005,0.69921-0.0091,1.0482-0.16635,0.66235-0.55063,1.2666-0.875,1.8685-0.21989,0.10841,0.02005-0.7185-0.11849-0.97526,0.032-0.5934-0.471-0.566-0.811-0.2364-0.421,0.2454-1.346,0.3194-1.376-0.3464-0.239-0.8001-0.035-1.6526,0.291-2.3971l-0.537-0.6563,0.191-1.6862-0.857-0.8658,0.201-0.948-1.0028-0.5651c-0.1977-0.1552-0.5738-0.2166-0.6563-0.4284,0.0814-0.0046,0.166-0.0109,0.2461-0.0091zm-2.4609,0.0091c0.03144,0.0046,0.06999,0.02643,0.1276,0.07292,0.338,0.1857-0.0825,0.3964-0.1823,0.5925-0.5398,0.3651,0.166,0.6641,0.401,0.957,0.3767-0.1082,0.7535-0.6467,1.3034-0.483,0.7034-0.2195,0.5913,0.5891,0.9935,0.9479,0.0522,0.1689,0.88,0.7185,0.3828,0.5377-0.4095-0.3174-0.8649-0.2935-1.1576,0.1641-0.7909,0.4286-0.3228-0.8252-0.7018-1.1302-0.5729-0.6392-0.3328,0.4775-0.401,0.8112-0.3725-0.0081-1.0681-0.2866-1.4492,0.1641l0.3736,0.6106,0.4467-0.6836c0.1085-0.2474,0.2447,0.1923,0.3645,0.2735,0.1431,0.2759,0.823,0.7434,0.3099,0.875-0.7606,0.4219-1.3589,1.0618-2.0052,1.6315-0.218,0.46-0.663,0.4074-0.9388,0.0273-0.6672-0.4105-0.6177,0.6566-0.5833,1.0573l0.58333-0.36458v0.60156c-0.0165,0.1138-0.0024,0.2322-0.0091,0.3464-0.4087,0.427-0.8207-0.5995-1.1758-0.8295l-0.0273-1.5039c0.0129-0.4225-0.0763-0.8551,0.0091-1.2669,0.8038-0.8625,1.6202-1.7561,2.0964-2.8529h0.78385c0.5478,0.2654,0.2357-0.5881,0.4557-0.556zm-1.1576,7.8204c0.0951-0.01014,0.20328,0.01157,0.31901,0.07292,0.73794,0.10562,1.2897,0.6409,1.8776,1.0482,0.46872,0.46452,1.4828,0.31578,1.5951,1.1029-0.17061,0.85375-1.0105,1.3122-1.75,1.6133-0.1846,0.103-0.383,0.185-0.5925,0.219-0.6856,0.171-0.982-0.532-1.1211-1.058-0.3104-0.65-1.0862-1.142-0.9752-1.941,0.0182-0.397,0.235-1.0134,0.6471-1.0573z"/>
+</svg>
diff --git a/core/img/filetypes/folder-shared.png b/core/img/filetypes/folder-shared.png
new file mode 100644
index 0000000000000000000000000000000000000000..e547a242062eb9687929fb640e99d33468e85500
Binary files /dev/null and b/core/img/filetypes/folder-shared.png differ
diff --git a/core/img/filetypes/folder-shared.svg b/core/img/filetypes/folder-shared.svg
new file mode 100644
index 0000000000000000000000000000000000000000..56aa9634d27306803bc02897f76afc5a52c772a2
--- /dev/null
+++ b/core/img/filetypes/folder-shared.svg
@@ -0,0 +1,68 @@
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32px" width="32px" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <metadata>
+ <rdf:RDF>
+ <cc:Work rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+ <dc:title/>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs>
+ <linearGradient id="c" y2="21.387" gradientUnits="userSpaceOnUse" x2="27.557" gradientTransform="matrix(.89186 0 0 1.0539 3.1208 5.4125)" y1="7.1627" x1="27.557">
+ <stop stop-color="#fff" offset="0"/>
+ <stop stop-color="#fff" stop-opacity=".23529" offset="0.0097359"/>
+ <stop stop-color="#fff" stop-opacity=".15686" offset="0.99001"/>
+ <stop stop-color="#fff" stop-opacity=".39216" offset="1"/>
+ </linearGradient>
+ <linearGradient id="d" y2="36.658" gradientUnits="userSpaceOnUse" x2="22.809" gradientTransform="matrix(.74675 0 0 .65549 -1.9219 1.1676)" y1="49.629" x1="22.935">
+ <stop stop-color="#0a0a0a" stop-opacity=".498" offset="0"/>
+ <stop stop-color="#0a0a0a" stop-opacity="0" offset="1"/>
+ </linearGradient>
+ <linearGradient id="e" y2="43.761" gradientUnits="userSpaceOnUse" x2="35.793" gradientTransform="matrix(.64444 0 0 .64286 .53352 .89286)" y1="17.118" x1="35.793">
+ <stop stop-color="#b4cee1" offset="0"/>
+ <stop stop-color="#5d9fcd" offset="1"/>
+ </linearGradient>
+ <linearGradient id="f" y2="609.51" gradientUnits="userSpaceOnUse" x2="302.86" gradientTransform="matrix(.051143 0 0 .015916 -2.49 22.299)" y1="366.65" x1="302.86">
+ <stop stop-opacity="0" offset="0"/>
+ <stop offset="0.5"/>
+ <stop stop-opacity="0" offset="1"/>
+ </linearGradient>
+ <radialGradient id="b" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(.019836 0 0 .015916 16.388 22.299)" r="117.14">
+ <stop offset="0"/>
+ <stop stop-opacity="0" offset="1"/>
+ </radialGradient>
+ <radialGradient id="a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-.019836 0 0 .015916 15.601 22.299)" r="117.14">
+ <stop offset="0"/>
+ <stop stop-opacity="0" offset="1"/>
+ </radialGradient>
+ <linearGradient id="g" y2="34.143" gradientUnits="userSpaceOnUse" x2="21.37" gradientTransform="matrix(.54384 0 0 .61466 3.2689 5.0911)" y1="4.7324" x1="21.37">
+ <stop stop-color="#fff" offset="0"/>
+ <stop stop-color="#fff" stop-opacity=".23529" offset="0.11063"/>
+ <stop stop-color="#fff" stop-opacity=".15686" offset="0.99001"/>
+ <stop stop-color="#fff" stop-opacity=".39216" offset="1"/>
+ </linearGradient>
+ <linearGradient id="h" y2="16" gradientUnits="userSpaceOnUse" x2="62.989" gradientTransform="matrix(.61905 0 0 .61905 -30.392 1.4286)" y1="13" x1="62.989">
+ <stop stop-color="#f9f9f9" offset="0"/>
+ <stop stop-color="#d8d8d8" offset="1"/>
+ </linearGradient>
+ <linearGradient id="i" y2="3.6337" gradientUnits="userSpaceOnUse" y1="53.514" gradientTransform="matrix(.50703 0 0 0.503 68.029 1.3298)" x2="-51.786" x1="-51.786">
+ <stop stop-opacity=".32174" offset="0"/>
+ <stop stop-opacity=".27826" offset="1"/>
+ </linearGradient>
+ </defs>
+ <path opacity=".8" style="color:#000000;" d="m4.0002,6.5001c-0.43342,0.005-0.5,0.21723-0.5,0.6349v1.365c-1.2457,0-1-0.002-1,0.54389,0.0216,6.5331,0,6.9014,0,7.4561,0.90135,0,27-2.349,27-3.36v-4.0961c0-0.41767-0.34799-0.54876-0.78141-0.54389h-14.219v-1.365c0-0.41767-0.26424-0.63977-0.69767-0.6349h-9.8023z" stroke="url(#i)" fill="none"/>
+ <path style="color:#000000;" d="m4.0002,7v2h-1v4h26v-4h-15v-2h-10z" fill="url(#h)"/>
+ <path style="color:#000000;" d="m4.5002,7.5v2h-1v4h25v-4h-15v-2h-9z" stroke="url(#g)" stroke-linecap="round" fill="none"/>
+ <g transform="translate(.00017936 -1)">
+ <rect opacity="0.3" height="3.8653" width="24.695" y="28.135" x="3.6472" fill="url(#f)"/>
+ <path opacity=".3" d="m28.342,28.135v3.865c1.0215,0.0073,2.4695-0.86596,2.4695-1.9328s-1.1399-1.9323-2.4695-1.9323z" fill="url(#b)"/>
+ <path opacity=".3" d="m3.6472,28.135v3.865c-1.0215,0.0073-2.4695-0.86596-2.4695-1.9328s1.1399-1.9323,2.4695-1.9323z" fill="url(#a)"/>
+ </g>
+ <path style="color:#000000;" d="m1.927,11.5c-0.69105,0.0796-0.32196,0.90258-0.37705,1.3654,0.0802,0.29906,0.59771,15.718,0.59771,16.247,0,0.46018,0.22667,0.38222,0.80101,0.38222h26.397c0.61872,0.0143,0.48796,0.007,0.48796-0.38947,0.0452-0.20269,0.63993-16.978,0.66282-17.243,0-0.279,0.0581-0.3621-0.30493-0.3621h-28.265z" fill="url(#e)"/>
+ <path opacity=".4" d="m1.682,11,28.636,0.00027c0.4137,0,0.68181,0.29209,0.68181,0.65523l-0.6735,17.712c0.01,0.45948-0.1364,0.64166-0.61707,0.63203l-27.256-0.0115c-0.4137,0-0.83086-0.27118-0.83086-0.63432l-0.62244-17.698c0-0.36314,0.26812-0.65549,0.68182-0.65549z" fill="url(#d)"/>
+ <path opacity=".5" style="color:#000000;" d="m2.5002,12.5,0.62498,16h25.749l0.62498-16z" stroke="url(#c)" stroke-linecap="round" fill="none"/>
+ <path opacity=".3" stroke-linejoin="round" style="color:#000000;" d="m1.927,11.5c-0.69105,0.0796-0.32196,0.90258-0.37705,1.3654,0.0802,0.29906,0.59771,15.718,0.59771,16.247,0,0.46018,0.22667,0.38222,0.80101,0.38222h26.397c0.61872,0.0143,0.48796,0.007,0.48796-0.38947,0.0452-0.20269,0.63993-16.978,0.66282-17.243,0-0.279,0.0581-0.3621-0.30493-0.3621h-28.265z" stroke="#000" stroke-linecap="round" fill="none"/>
+ <path opacity="0.3" style="block-progression:tb;text-indent:0;color:#000000;text-transform:none;" fill="#FFF" d="m12.388,16.483c-0.96482,0-1.7833,0.70559-1.7833,1.6162,0.0069,0.28781,0.03259,0.64272,0.20434,1.3933v0.01858l0.01857,0.01857c0.05513,0.15793,0.13537,0.24827,0.24149,0.37154,0.10612,0.12326,0.23263,0.26834,0.35294,0.39011,0.01415,0.01433,0.02323,0.0232,0.03715,0.03716,0.02386,0.10383,0.05276,0.21557,0.0743,0.3158,0.05732,0.26668,0.05144,0.45553,0.03716,0.52015-0.4146,0.1454-0.9304,0.3187-1.3932,0.5199-0.2598,0.113-0.4949,0.2139-0.6873,0.3344-0.1923,0.1206-0.3836,0.2116-0.4458,0.483-0.000797,0.01237-0.000797,0.02479,0,0.03716-0.06076,0.55788-0.15266,1.3783-0.22291,1.932-0.015166,0.11656,0.046264,0.23943,0.14861,0.29723,0.84033,0.45393,2.1312,0.63663,3.418,0.63161,1.2868-0.005,2.5674-0.19845,3.3808-0.63161,0.10234-0.0578,0.16378-0.18067,0.14861-0.29723-0.0224-0.173-0.05-0.5633-0.0743-0.9474-0.0243-0.384-0.0454-0.7617-0.0743-0.9845-0.0101-0.0552-0.0362-0.1074-0.0743-0.1486-0.2584-0.3086-0.6445-0.4973-1.096-0.6874-0.4122-0.1735-0.8954-0.3538-1.3746-0.5573-0.02682-0.05975-0.05346-0.23358,0-0.50157,0.01436-0.07196,0.03684-0.14903,0.05573-0.22292,0.04503-0.05044,0.08013-0.09166,0.13003-0.14861,0.1064-0.1215,0.2207-0.2489,0.3157-0.3715,0.0951-0.1226,0.1728-0.2279,0.223-0.3715l0.01857-0.01858c0.1941-0.7837,0.1942-1.1107,0.2043-1.3933v-0.01857c0-0.91058-0.81848-1.6162-1.7833-1.6162zm5.101-1.4831c-1.4067,0-2.6,1.0287-2.6,2.3562,0.01,0.4196,0.04751,0.93701,0.29791,2.0312v0.02708l0.02708,0.02708c0.08038,0.23025,0.19736,0.36196,0.35208,0.54166s0.33917,0.39121,0.51458,0.56874c0.02064,0.02089,0.03386,0.03383,0.05416,0.05418,0.03479,0.15137,0.07693,0.31428,0.10833,0.46041,0.08357,0.38879,0.07499,0.66411,0.05417,0.75832-0.6045,0.2122-1.3565,0.465-2.0312,0.7583-0.3789,0.1647-0.7217,0.3118-1.0021,0.4875-0.28044,0.17574-0.55934,0.30851-0.64999,0.70416-0.0012,0.01804-0.0012,0.03613,0,0.05418-0.08858,0.81334-0.22257,2.0094-0.325,2.8166-0.02211,0.16993,0.06745,0.34906,0.21666,0.43333,1.2252,0.66179,3.1072,0.92814,4.9833,0.92082,1.8761-0.0073,3.7431-0.28932,4.9291-0.92082,0.14921-0.08427,0.23878-0.2634,0.21666-0.43333-0.0327-0.25234-0.07287-0.82136-0.10833-1.3812-0.03546-0.55988-0.06625-1.1106-0.10833-1.4354-0.01468-0.0805-0.05274-0.15661-0.10833-0.21666-0.377-0.4498-0.94-0.7248-1.598-1.002-0.601-0.253-1.306-0.5158-2.004-0.8125-0.0391-0.08711-0.07795-0.34054,0-0.73124,0.02093-0.10491,0.05371-0.21727,0.08125-0.325,0.06566-0.07354,0.11683-0.13363,0.18958-0.21666,0.15516-0.17709,0.32189-0.36287,0.46041-0.54166s0.25186-0.33217,0.325-0.54166l0.02708-0.02708c0.28309-1.1425,0.28324-1.6193,0.29792-2.0312v-0.02708c0-1.3275-1.1933-2.3562-2.6-2.3562z"/>
+ <path opacity="0.7" style="block-progression:tb;color:#000000;text-transform:none;text-indent:0;" d="m12.388,15.483c-0.96482,0-1.7833,0.70559-1.7833,1.6162,0.0069,0.28781,0.03259,0.64272,0.20434,1.3933v0.01858l0.01857,0.01857c0.05513,0.15793,0.13537,0.24827,0.24149,0.37154,0.10612,0.12326,0.23263,0.26834,0.35294,0.39011,0.01415,0.01433,0.02323,0.0232,0.03715,0.03716,0.02386,0.10383,0.05276,0.21557,0.0743,0.3158,0.05732,0.26668,0.05144,0.45553,0.03716,0.52015-0.4146,0.1454-0.9304,0.3187-1.3932,0.5199-0.2598,0.113-0.4949,0.2139-0.6873,0.3344-0.1923,0.1206-0.3836,0.2116-0.4458,0.483-0.000797,0.01237-0.000797,0.02479,0,0.03716-0.06076,0.55788-0.15266,1.3783-0.22291,1.932-0.015166,0.11656,0.046264,0.23943,0.14861,0.29723,0.84033,0.45393,2.1312,0.63663,3.418,0.63161,1.2868-0.005,2.5674-0.19845,3.3808-0.63161,0.10234-0.0578,0.16378-0.18067,0.14861-0.29723-0.0224-0.173-0.05-0.5633-0.0743-0.9474-0.0243-0.384-0.0454-0.7617-0.0743-0.9845-0.0101-0.0552-0.0362-0.1074-0.0743-0.1486-0.2584-0.3086-0.6445-0.4973-1.096-0.6874-0.4122-0.1735-0.8954-0.3538-1.3746-0.5573-0.02682-0.05975-0.05346-0.23358,0-0.50157,0.01436-0.07196,0.03684-0.14903,0.05573-0.22292,0.04503-0.05044,0.08013-0.09166,0.13003-0.14861,0.1064-0.1215,0.2207-0.2489,0.3157-0.3715,0.0951-0.1226,0.1728-0.2279,0.223-0.3715l0.01857-0.01858c0.1941-0.7837,0.1942-1.1107,0.2043-1.3933v-0.01857c0-0.91058-0.81848-1.6162-1.7833-1.6162zm5.101-1.4831c-1.4067,0-2.6,1.0287-2.6,2.3562,0.01,0.4196,0.04751,0.93701,0.29791,2.0312v0.02708l0.02708,0.02708c0.08038,0.23025,0.19736,0.36196,0.35208,0.54166s0.33917,0.39121,0.51458,0.56874c0.02064,0.02089,0.03386,0.03383,0.05416,0.05418,0.03479,0.15137,0.07693,0.31428,0.10833,0.46041,0.08357,0.38879,0.07499,0.66411,0.05417,0.75832-0.6045,0.2122-1.3565,0.465-2.0312,0.7583-0.3789,0.1647-0.7217,0.3118-1.0021,0.4875-0.28044,0.17574-0.55934,0.30851-0.64999,0.70416-0.0012,0.01804-0.0012,0.03613,0,0.05418-0.08858,0.81334-0.22257,2.0094-0.325,2.8166-0.02211,0.16993,0.06745,0.34906,0.21666,0.43333,1.2252,0.66179,3.1072,0.92814,4.9833,0.92082,1.8761-0.0073,3.7431-0.28932,4.9291-0.92082,0.14921-0.08427,0.23878-0.2634,0.21666-0.43333-0.0327-0.25234-0.07287-0.82136-0.10833-1.3812-0.03546-0.55988-0.06625-1.1106-0.10833-1.4354-0.01468-0.0805-0.05274-0.15661-0.10833-0.21666-0.377-0.4498-0.94-0.7248-1.598-1.002-0.601-0.253-1.306-0.5158-2.004-0.8125-0.0391-0.08711-0.07795-0.34054,0-0.73124,0.02093-0.10491,0.05371-0.21727,0.08125-0.325,0.06566-0.07354,0.11683-0.13363,0.18958-0.21666,0.15516-0.17709,0.32189-0.36287,0.46041-0.54166s0.25186-0.33217,0.325-0.54166l0.02708-0.02708c0.28309-1.1425,0.28324-1.6193,0.29792-2.0312v-0.02708c0-1.3275-1.1933-2.3562-2.6-2.3562z"/>
+</svg>
diff --git a/core/img/filetypes/folder.png b/core/img/filetypes/folder.png
index 784e8fa48234f4f64b6922a6758f254ee0ca08ec..b7be63d58369d5da485f12ead9ca6982c8e8e563 100644
Binary files a/core/img/filetypes/folder.png and b/core/img/filetypes/folder.png differ
diff --git a/core/img/filetypes/folder.svg b/core/img/filetypes/folder.svg
new file mode 100644
index 0000000000000000000000000000000000000000..92d4cc2271816f50eabae1e5b092f117561adc1a
--- /dev/null
+++ b/core/img/filetypes/folder.svg
@@ -0,0 +1,60 @@
+<?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="32px" width="32px" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <defs>
+ <linearGradient id="c" y2="21.387" gradientUnits="userSpaceOnUse" x2="27.557" gradientTransform="matrix(.89186 0 0 1.0539 3.1208 5.4125)" y1="7.1627" x1="27.557">
+ <stop stop-color="#fff" offset="0"/>
+ <stop stop-color="#fff" stop-opacity=".23529" offset=".0097359"/>
+ <stop stop-color="#fff" stop-opacity=".15686" offset=".99001"/>
+ <stop stop-color="#fff" stop-opacity=".39216" offset="1"/>
+ </linearGradient>
+ <linearGradient id="d" y2="36.658" gradientUnits="userSpaceOnUse" x2="22.809" gradientTransform="matrix(.74675 0 0 .65549 -1.9219 1.1676)" y1="49.629" x1="22.935">
+ <stop stop-color="#0a0a0a" stop-opacity=".498" offset="0"/>
+ <stop stop-color="#0a0a0a" stop-opacity="0" offset="1"/>
+ </linearGradient>
+ <linearGradient id="e" y2="43.761" gradientUnits="userSpaceOnUse" x2="35.793" gradientTransform="matrix(.64444 0 0 .64286 .53352 .89286)" y1="17.118" x1="35.793">
+ <stop stop-color="#b4cee1" offset="0"/>
+ <stop stop-color="#5d9fcd" offset="1"/>
+ </linearGradient>
+ <linearGradient id="f" y2="609.51" gradientUnits="userSpaceOnUse" x2="302.86" gradientTransform="matrix(.051143 0 0 .015916 -2.49 22.299)" y1="366.65" x1="302.86">
+ <stop stop-opacity="0" offset="0"/>
+ <stop offset=".5"/>
+ <stop stop-opacity="0" offset="1"/>
+ </linearGradient>
+ <radialGradient id="b" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(.019836 0 0 .015916 16.388 22.299)" r="117.14">
+ <stop offset="0"/>
+ <stop stop-opacity="0" offset="1"/>
+ </radialGradient>
+ <radialGradient id="a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-.019836 0 0 .015916 15.601 22.299)" r="117.14">
+ <stop offset="0"/>
+ <stop stop-opacity="0" offset="1"/>
+ </radialGradient>
+ <linearGradient id="g" y2="34.143" gradientUnits="userSpaceOnUse" x2="21.37" gradientTransform="matrix(.54384 0 0 .61466 3.2689 5.0911)" y1="4.7324" x1="21.37">
+ <stop stop-color="#fff" offset="0"/>
+ <stop stop-color="#fff" stop-opacity=".23529" offset=".11063"/>
+ <stop stop-color="#fff" stop-opacity=".15686" offset=".99001"/>
+ <stop stop-color="#fff" stop-opacity=".39216" offset="1"/>
+ </linearGradient>
+ <linearGradient id="h" y2="16" gradientUnits="userSpaceOnUse" x2="62.989" gradientTransform="matrix(.61905 0 0 .61905 -30.392 1.4286)" y1="13" x1="62.989">
+ <stop stop-color="#f9f9f9" offset="0"/>
+ <stop stop-color="#d8d8d8" offset="1"/>
+ </linearGradient>
+ <linearGradient id="i" y2="3.6337" gradientUnits="userSpaceOnUse" y1="53.514" gradientTransform="matrix(.50703 0 0 0.503 68.029 1.3298)" x2="-51.786" x1="-51.786">
+ <stop stop-opacity=".32174" offset="0"/>
+ <stop stop-opacity=".27826" offset="1"/>
+ </linearGradient>
+ </defs>
+ <g>
+ <path opacity=".8" style="color:#000000" d="m4.0002 6.5001c-0.43342 0.005-0.5 0.21723-0.5 0.6349v1.365c-1.2457 0-1-0.002-1 0.54389 0.0216 6.5331 0 6.9014 0 7.4561 0.90135 0 27-2.349 27-3.36v-4.0961c0-0.41767-0.34799-0.54876-0.78141-0.54389h-14.219v-1.365c0-0.41767-0.26424-0.63977-0.69767-0.6349h-9.8023z" stroke="url(#i)" fill="none"/>
+ <path style="color:#000000" d="m4.0002 7v2h-1v4h26v-4h-15v-2h-10z" fill="url(#h)"/>
+ <path style="color:#000000" d="m4.5002 7.5v2h-1v4h25v-4h-15v-2h-9z" stroke="url(#g)" stroke-linecap="round" fill="none"/>
+ </g>
+ <g transform="translate(.00017936 -1)">
+ <rect opacity=".3" height="3.8653" width="24.695" y="28.135" x="3.6472" fill="url(#f)"/>
+ <path opacity=".3" d="m28.342 28.135v3.865c1.0215 0.0073 2.4695-0.86596 2.4695-1.9328s-1.1399-1.9323-2.4695-1.9323z" fill="url(#b)"/>
+ <path opacity=".3" d="m3.6472 28.135v3.865c-1.0215 0.0073-2.4695-0.86596-2.4695-1.9328s1.1399-1.9323 2.4695-1.9323z" fill="url(#a)"/>
+ </g>
+ <path style="color:#000000" d="m1.927 11.5c-0.69105 0.0796-0.32196 0.90258-0.37705 1.3654 0.0802 0.29906 0.59771 15.718 0.59771 16.247 0 0.46018 0.22667 0.38222 0.80101 0.38222h26.397c0.61872 0.0143 0.48796 0.007 0.48796-0.38947 0.0452-0.20269 0.63993-16.978 0.66282-17.243 0-0.279 0.0581-0.3621-0.30493-0.3621h-28.265z" fill="url(#e)"/>
+ <path opacity=".4" d="m1.682 11 28.636 0.00027c0.4137 0 0.68181 0.29209 0.68181 0.65523l-0.6735 17.712c0.01 0.45948-0.1364 0.64166-0.61707 0.63203l-27.256-0.0115c-0.4137 0-0.83086-0.27118-0.83086-0.63432l-0.62244-17.698c0-0.36314 0.26812-0.65549 0.68182-0.65549z" fill="url(#d)"/>
+ <path opacity=".5" style="color:#000000" d="m2.5002 12.5 0.62498 16h25.749l0.62498-16z" stroke="url(#c)" stroke-linecap="round" fill="none"/>
+ <path opacity=".3" stroke-linejoin="round" style="color:#000000" d="m1.927 11.5c-0.69105 0.0796-0.32196 0.90258-0.37705 1.3654 0.0802 0.29906 0.59771 15.718 0.59771 16.247 0 0.46018 0.22667 0.38222 0.80101 0.38222h26.397c0.61872 0.0143 0.48796 0.007 0.48796-0.38947 0.0452-0.20269 0.63993-16.978 0.66282-17.243 0-0.279 0.0581-0.3621-0.30493-0.3621h-28.265z" stroke="#000" stroke-linecap="round" fill="none"/>
+</svg>
diff --git a/core/img/filetypes/font.png b/core/img/filetypes/font.png
index 81e41de7d3a9bcc50267b34d0005487d5c7cc7c0..9404c3ca6ac330d3639a00e0b4c618e52172c2a2 100644
Binary files a/core/img/filetypes/font.png and b/core/img/filetypes/font.png differ
diff --git a/core/img/filetypes/font.svg b/core/img/filetypes/font.svg
new file mode 100644
index 0000000000000000000000000000000000000000..8fca5ff9eff1ba40f42db87a027ded7dd235e70f
--- /dev/null
+++ b/core/img/filetypes/font.svg
@@ -0,0 +1,37 @@
+<?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="32" width="32" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <defs>
+ <linearGradient id="a">
+ <stop offset="0"/>
+ <stop stop-opacity="0" offset="1"/>
+ </linearGradient>
+ <linearGradient id="h" y2="45.497" gradientUnits="userSpaceOnUse" x2="22.056" gradientTransform="matrix(.85825 0 0 .86435 .35576 -11.07)" y1="15.834" x1="22.056">
+ <stop stop-color="#575757" offset="0"/>
+ <stop stop-color="#333" offset="1"/>
+ </linearGradient>
+ <radialGradient id="e" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="36.686" cx="-6.1603" gradientTransform="matrix(.25444 0 0 .18504 6.1544 20.059)" r="14.098"/>
+ <radialGradient id="d" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="36.686" cx="-6.1603" gradientTransform="matrix(.83270 0 0 .18284 17.869 20.171)" r="14.098"/>
+ <radialGradient id="c" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="36.686" cx="-6.1603" gradientTransform="matrix(.69391 0 0 .18504 25.492 20.059)" r="14.098"/>
+ <linearGradient id="g" y2="103.13" gradientUnits="userSpaceOnUse" x2="143.92" gradientTransform="matrix(.97891 0 0 .95244 -119.66 -63.433)" y1="75.221" x1="143.92">
+ <stop stop-color="#f8b17e" offset="0"/>
+ <stop stop-color="#e35d4f" offset=".31210"/>
+ <stop stop-color="#c6262e" offset=".57054"/>
+ <stop stop-color="#690b54" offset="1"/>
+ </linearGradient>
+ <linearGradient id="f" y2="75.221" gradientUnits="userSpaceOnUse" x2="153.41" gradientTransform="matrix(.97891 0 0 .95244 -119.66 -63.433)" y1="98.785" x1="153.41">
+ <stop stop-color="#791235" offset="0"/>
+ <stop stop-color="#dd3b27" offset="1"/>
+ </linearGradient>
+ <radialGradient id="b" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="36.686" cx="-6.1603" gradientTransform="matrix(.25444 0 0 .18504 22.459 20.059)" r="14.098"/>
+ </defs>
+ <g>
+ <g fill-rule="evenodd">
+ <path opacity=".2" d="m24.478 26.848a3.587 2.6087 0 1 1 -7.1739 0 3.587 2.6087 0 1 1 7.1739 0z" fill="url(#b)"/>
+ <path d="m29.106 9.9132c-0.478-1.0813-1.642-0.968-2.441-1.1397-2.646-0.3044-5.287 0.181-7.504 1.6705-2.1399 1.4497-4.0763 3.4112-5.4365 5.9425-1.1823 2.2548-1.7132 5.267-0.96727 8.1364 0.58709 1.9316 2.3544 3.1247 3.845 2.803 2.2818-0.38055 3.9079-2.4984 5.2493-4.5646 0.60658-0.85208 0.97918-1.9805 1.6952-2.6966-0.1019 1.8363-0.14753 3.7435 0.26981 5.6082 0.2372 1.0995 1.1049 1.9662 1.9843 1.9261 0.89467-0.10266 1.5757-0.87918 2.3174-1.386 0.66706-0.59088 1.4312-1.0989 1.9035-1.9532-0.08137-1.4151-1.3465-0.52654-1.7881-0.04084-0.61732 0.97151-1.8927 0.19955-1.6199-1.1225 0.14283-3.0198 0.84698-5.8557 1.4425-8.7028 0.3348-1.5009 0.68722-2.9931 1.0492-4.4802h-0.000001zm-3.696 1.8848c-1.1333 3.5797-2.3575 7.223-4.4519 9.9984-0.98815 1.2662-2.437 2.4144-4.0344 1.8053-1.1039-0.48951-1.3597-2.0989-1.3836-3.3097-0.14247-3.5752 1.5838-6.5362 3.7419-8.3224 1.5043-1.1975 3.4487-1.7396 5.3479-1.1547 0.35854 0.1335 0.74746 0.47906 0.78012 0.983v-0.000001z" stroke="url(#f)" fill="url(#g)"/>
+ <path opacity=".2" d="m31 26.848a9.7826 2.6087 0 1 1 -19.565 0 9.7826 2.6087 0 1 1 19.565 0z" fill="url(#c)"/>
+ <path opacity=".05" d="m24.478 26.879a11.739 2.5777 0 1 1 -23.478 0 11.739 2.5777 0 1 1 23.478 0z" fill="url(#d)"/>
+ <path opacity=".2" d="m8.1739 26.848a3.587 2.6087 0 1 1 -7.1739 0 3.587 2.6087 0 1 1 7.1739 0z" fill="url(#e)"/>
+ </g>
+ <path d="m19.663 27.5c-0.79147-2.2568-1.583-4.5913-2.3744-6.8481h-9.7253c-0.8117 2.284-1.6229 4.564-2.4341 6.848h-3.1514c3.0005-8.2609 6.001-15.739 9.0016-24h2.8497c3.0061 8.2609 6.0122 15.739 9.0183 24h-3.1849zm-3.337-10.109-3.913-10.391-3.913 10.391z" stroke="#333" stroke-width="1px" fill="url(#h)"/>
+ </g>
+</svg>
diff --git a/core/img/filetypes/image-svg+xml.png b/core/img/filetypes/image-svg+xml.png
index a1291c2dfad75b289f88ab762a3a32ccb436c1ed..e3dd52489d3772962e22cdf47569b53616fe73eb 100644
Binary files a/core/img/filetypes/image-svg+xml.png and b/core/img/filetypes/image-svg+xml.png differ
diff --git a/core/img/filetypes/image-svg+xml.svg b/core/img/filetypes/image-svg+xml.svg
new file mode 100644
index 0000000000000000000000000000000000000000..06df5f54da62e2a1413c6b76279eb6b909c364d5
--- /dev/null
+++ b/core/img/filetypes/image-svg+xml.svg
@@ -0,0 +1,56 @@
+<?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="32px" width="32px" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <defs>
+ <linearGradient id="h" y2="43" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(.56757 0 0 .72973 2.3784 -2.5135)" y1="5.5641" x1="24">
+ <stop stop-color="#fff" offset="0"/>
+ <stop stop-color="#fff" stop-opacity=".23529" offset=".036262"/>
+ <stop stop-color="#fff" stop-opacity=".15686" offset=".95056"/>
+ <stop stop-color="#fff" stop-opacity=".39216" offset="1"/>
+ </linearGradient>
+ <linearGradient id="g" y2="47.013" gradientUnits="userSpaceOnUse" x2="25.132" gradientTransform="matrix(.65714 0 0 .63012 .22856 -1.0896)" y1=".98521" x1="25.132">
+ <stop stop-color="#f4f4f4" offset="0"/>
+ <stop stop-color="#dbdbdb" offset="1"/>
+ </linearGradient>
+ <linearGradient id="f" y2="2.9062" gradientUnits="userSpaceOnUse" x2="-51.786" gradientTransform="matrix(.53064 0 0 .58970 39.27 -1.7919)" y1="50.786" x1="-51.786">
+ <stop stop-color="#a0a0a0" offset="0"/>
+ <stop stop-color="#bebebe" offset="1"/>
+ </linearGradient>
+ <radialGradient id="c" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(.015663 0 0 .0082353 17.61 25.981)" r="117.14"/>
+ <linearGradient id="a">
+ <stop offset="0"/>
+ <stop stop-opacity="0" offset="1"/>
+ </linearGradient>
+ <radialGradient id="b" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-.015663 0 0 .0082353 14.39 25.981)" r="117.14"/>
+ <linearGradient id="e" y2="609.51" gradientUnits="userSpaceOnUse" y1="366.65" gradientTransform="matrix(.045769 0 0 .0082353 -.54232 25.981)" x2="302.86" x1="302.86">
+ <stop stop-opacity="0" offset="0"/>
+ <stop offset=".5"/>
+ <stop stop-opacity="0" offset="1"/>
+ </linearGradient>
+ <linearGradient id="d" y2="13.664" gradientUnits="userSpaceOnUse" x2="16.887" gradientTransform="matrix(.65943 0 0 .64652 -27.821 1.2237)" y1="24.24" x1="28.534">
+ <stop stop-color="#fda852" offset="0"/>
+ <stop stop-color="#fff" stop-opacity="0" offset="1"/>
+ </linearGradient>
+ </defs>
+ <g>
+ <g>
+ <rect opacity=".15" height="2" width="22.1" y="29" x="4.95" fill="url(#e)"/>
+ <path opacity=".15" d="m4.95 29v1.9999c-0.80662 0.0038-1.95-0.44807-1.95-1.0001 0-0.552 0.90012-0.99982 1.95-0.99982z" fill="url(#b)"/>
+ <path opacity=".15" d="m27.05 29v1.9999c0.80661 0.0038 1.95-0.44807 1.95-1.0001 0-0.552-0.90012-0.99982-1.95-0.99982z" fill="url(#c)"/>
+ </g>
+ <path stroke-linejoin="round" d="m4.5 0.49996c5.2705 0 23 0.00185 23 0.00185l0.000028 28.998h-23v-29z" stroke="url(#f)" stroke-width=".99992" fill="url(#g)"/>
+ </g>
+ <path stroke-linejoin="round" d="m26.5 28.5h-21v-27h21z" stroke="url(#h)" stroke-linecap="round" fill="none"/>
+ <g transform="translate(27.788 -2.3184)">
+ <g>
+ <path d="m-17.037 24.229c2.7541 1.8316 8.7672-0.61882 3.7681-7.1764-4.9538-6.4982 4.9219-10.76 7.8525-3.2453" fill-rule="evenodd" stroke="#ea541a" stroke-width="1px" fill="url(#d)"/>
+ <rect height="2" width="2" y="22.818" x="-18.788" fill="#ea541a"/>
+ <rect height="2" width="2" y="12.818" x="-6.788" fill="#ea541a"/>
+ </g>
+ <path d="m-17.699 11.147 9.5001 12.316" stroke="#ea541a" stroke-width="1px" fill="none"/>
+ <g>
+ <path d="m-16.288 11.318c0.000372 0.55218-0.44745 1-1 1s-1.0004-0.44782-1-1c-0.000372-0.55218 0.44745-1 1-1s1.0004 0.44782 1 1z" stroke="#ea541a" fill="#e6e6e6"/>
+ <path d="m-7.288 23.318c0.000373 0.55218-0.44745 1-1 1s-1.0004-0.44782-1-1c-0.000372-0.55218 0.44745-1 1-1s1.0004 0.44782 1 1z" stroke="#ea541a" fill="#e6e6e6"/>
+ <rect height="2" width="2" y="15.818" x="-14.788" fill="#ea541a"/>
+ </g>
+ </g>
+</svg>
diff --git a/core/img/filetypes/image.png b/core/img/filetypes/image.png
index 4a158fef7e0da8fd19525f574f2c4966443866cf..087f5dcdbdf61777512cbf7985715f0a12124a19 100644
Binary files a/core/img/filetypes/image.png and b/core/img/filetypes/image.png differ
diff --git a/core/img/filetypes/image.svg b/core/img/filetypes/image.svg
new file mode 100644
index 0000000000000000000000000000000000000000..50991f7359df5cb322ca24ac1b41250fb3091bcd
--- /dev/null
+++ b/core/img/filetypes/image.svg
@@ -0,0 +1,61 @@
+<?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="32" width="32" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <defs>
+ <radialGradient id="c" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(.028917 0 0 .012353 26.973 38.471)" r="117.14"/>
+ <linearGradient id="a">
+ <stop offset="0"/>
+ <stop stop-opacity="0" offset="1"/>
+ </linearGradient>
+ <radialGradient id="b" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-.028917 0 0 .012353 21.027 38.471)" r="117.14"/>
+ <linearGradient id="k" y2="609.51" gradientUnits="userSpaceOnUse" x2="302.86" gradientTransform="matrix(.084497 0 0 .012353 -6.5396 38.471)" y1="366.65" x1="302.86">
+ <stop stop-opacity="0" offset="0"/>
+ <stop offset=".5"/>
+ <stop stop-opacity="0" offset="1"/>
+ </linearGradient>
+ <linearGradient id="e" y2="24.628" gradientUnits="userSpaceOnUse" x2="20.055" gradientTransform="matrix(.57894 0 0 .65062 2.0784 1.9502)" y1="15.298" x1="16.626">
+ <stop stop-color="#fff" offset="0"/>
+ <stop stop-color="#fff" stop-opacity="0" offset="1"/>
+ </linearGradient>
+ <linearGradient id="h" y2="43" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(.77477 0 0 .61261 -2.5946 1.2973)" y1="5.5641" x1="24">
+ <stop stop-color="#fff" offset="0"/>
+ <stop stop-color="#fff" stop-opacity=".23529" offset=".036262"/>
+ <stop stop-color="#fff" stop-opacity=".15686" offset=".95056"/>
+ <stop stop-color="#fff" stop-opacity=".39216" offset="1"/>
+ </linearGradient>
+ <linearGradient id="g" y2="47.013" gradientUnits="userSpaceOnUse" x2="25.132" gradientTransform="matrix(.85714 0 0 .52148 -4.5714 2.6844)" y1=".98521" x1="25.132">
+ <stop stop-color="#f4f4f4" offset="0"/>
+ <stop stop-color="#dbdbdb" offset="1"/>
+ </linearGradient>
+ <linearGradient id="f" y2="2.9062" gradientUnits="userSpaceOnUse" x2="-51.786" gradientTransform="matrix(.69214 0 0 .48803 46.352 2.1033)" y1="50.786" x1="-51.786">
+ <stop stop-color="#a0a0a0" offset="0"/>
+ <stop stop-color="#bebebe" offset="1"/>
+ </linearGradient>
+ <linearGradient id="j" y2="96.253" gradientUnits="userSpaceOnUse" x2="45.567" gradientTransform="matrix(.32723 0 0 .25356 -38.234 -30.559)" y1="15.27" x1="45.414">
+ <stop stop-color="#262626" offset="0"/>
+ <stop stop-color="#4d4d4d" offset="1"/>
+ </linearGradient>
+ <linearGradient id="i" y2="-40.164" gradientUnits="userSpaceOnUse" x2="-24.098" gradientTransform="matrix(.74286 0 0 .74074 1.8384 4.0069)" y1="-13.091" x1="-24.032">
+ <stop stop-color="#1d1d1d" offset="0"/>
+ <stop offset="1"/>
+ </linearGradient>
+ <linearGradient id="d" y2="-174.97" gradientUnits="userSpaceOnUse" x2="149.98" gradientTransform="matrix(.28088 0 0 .28276 -22.128 49.806)" y1="-104.24" x1="149.98">
+ <stop stop-color="#272727" offset="0"/>
+ <stop stop-color="#454545" offset="1"/>
+ </linearGradient>
+ </defs>
+ <g>
+ <g opacity=".4" transform="matrix(.66667 0 0 .66667 0 -1.6667)" stroke-width=".0225">
+ <rect height="3" width="40.8" y="43" x="3.6" fill="url(#k)"/>
+ <path d="m3.6 43v2.9998c-1.4891 0.006-3.6-0.672-3.6-1.5s1.6618-1.5 3.6-1.5z" fill="url(#b)"/>
+ <path d="m44.4 43v2.9998c1.4891 0.0056 3.6-0.67211 3.6-1.5001 0-0.828-1.6618-1.4997-3.6-1.4997z" fill="url(#c)"/>
+ </g>
+ <path stroke-linejoin="round" d="m0.99997 4c6.8745 0 30 0.0015 30 0.0015l0.000036 23.999h-30v-24z" stroke="url(#f)" stroke-width=".0066667" fill="url(#g)"/>
+ <path stroke-linejoin="round" d="m30.333 27.333h-28.667v-22.667h28.667z" stroke="url(#h)" stroke-linecap="round" stroke-width=".0066667" fill="none"/>
+ </g>
+ <g>
+ <rect transform="matrix(-.99999 .0037552 .0024409 -1 0 0)" rx="0" ry="0" height="19.903" width="25.952" stroke="url(#i)" stroke-linecap="round" y="-26.012" x="-29.015" stroke-width=".0066668" fill="url(#j)"/>
+ <path style="color:#000000" d="m14.458 9.5417c-0.73638 0-1.3333 1.1939-1.3333 2.6667 0 0.24505 0.01072 0.48294 0.04167 0.70833-0.15826-0.15989-0.30816-0.33156-0.5-0.47917-1.1673-0.89808-2.4885-1.1461-2.9375-0.5625-0.44904 0.58363 0.14525 1.7894 1.3125 2.6875 0.22148 0.1704 0.44175 0.29391 0.66667 0.41667-0.25479 0.03257-0.52266 0.08822-0.79167 0.16667-1.4139 0.41232-2.3937 1.3347-2.1875 2.0417 0.20616 0.70693 1.5236 0.93315 2.9375 0.52083 0.2651-0.07731 0.52042-0.1633 0.75-0.27083-0.05604 0.10202-0.11595 0.20204-0.16667 0.3125-2.7782 2.4796-5.0625 7.2292-5.0625 7.2292l0.95833 0.02083c0.5207-1.25 1.8077-3.994 3.7925-6.293-0.28085 1.1684-0.0992 2.2006 0.5 2.4167 0.69271 0.24982 1.667-0.67708 2.1667-2.0625 0.04494-0.12462 0.06976-0.25209 0.10417-0.375 0.05396 0.11891 0.10152 0.23517 0.16667 0.35417 0.70727 1.2918 1.8124 2.062 2.4583 1.7083 0.64591-0.35364 0.58227-1.6874-0.125-2.9792-0.04035-0.07369-0.08227-0.13821-0.125-0.20833 0.07835 0.02437 0.14794 0.04131 0.22917 0.0625 1.4251 0.37181 2.7308 0.10836 2.9167-0.60417 0.18591-0.71253-0.82495-1.5865-2.25-1.9583-0.02183-0.0057-0.04073-0.01544-0.0625-0.02083 0.01921-0.01078 0.04331-0.0098 0.0625-0.02083 1.2754-0.73638 2.014-1.8623 1.6458-2.5-0.36819-0.63772-1.7037-0.54888-2.9792 0.1875-0.40854 0.23587-0.74162 0.50638-1.0208 0.79167 0.10589-0.38234 0.16667-0.82364 0.16667-1.2917 0-1.4728-0.59695-2.6667-1.3333-2.6667zm0.042 4.4583c0.92048 0 1.6667 0.74619 1.6667 1.6667 0 0.92047-0.74619 1.6667-1.6667 1.6667-0.92048 0-1.6667-0.74619-1.6667-1.6667 0-0.921 0.747-1.667 1.667-1.667z" fill="url(#d)"/>
+ <path fill="#d2d2d2" d="m14.458 10.188c-0.73638 0-1.3333 1.1939-1.3333 2.6667 0 0.24504 0.01072 0.48294 0.04167 0.70833-0.15826-0.15989-0.30816-0.33156-0.5-0.47917-1.1673-0.89808-2.4885-1.1461-2.9375-0.5625-0.44904 0.58363 0.14525 1.7894 1.3125 2.6875 0.22148 0.1704 0.44175 0.29391 0.66667 0.41667-0.25479 0.03257-0.52266 0.08822-0.79167 0.16667-1.4139 0.41232-2.3937 1.3347-2.1875 2.0417 0.20616 0.70693 1.5236 0.93315 2.9375 0.52083 0.2651-0.07731 0.52042-0.1633 0.75-0.27083-0.05604 0.10202-0.11595 0.20204-0.16667 0.3125-2.7782 2.479-5.0625 7.229-5.0625 7.229l0.95833 0.02083c0.52039-1.2493 1.8073-3.9927 3.7917-6.2917-0.28085 1.1684-0.0992 2.2006 0.5 2.4167 0.69271 0.24982 1.667-0.67708 2.1667-2.0625 0.04494-0.12462 0.06976-0.25209 0.10417-0.375 0.05396 0.11891 0.10152 0.23517 0.16667 0.35417 0.70727 1.2918 1.8124 2.062 2.4583 1.7083 0.64591-0.35364 0.58227-1.6874-0.125-2.9792-0.04035-0.07369-0.08227-0.13821-0.125-0.20833 0.07835 0.02437 0.14794 0.04131 0.22917 0.0625 1.4251 0.37181 2.7308 0.10836 2.9167-0.60417 0.18591-0.71253-0.82495-1.5865-2.25-1.9583-0.02183-0.0057-0.04073-0.01544-0.0625-0.02083 0.01921-0.01078 0.04331-0.0098 0.0625-0.02083 1.2754-0.73638 2.014-1.8623 1.6458-2.5-0.36819-0.63772-1.7037-0.54888-2.9792 0.1875-0.40854 0.23587-0.74162 0.50638-1.0208 0.79167 0.10589-0.38234 0.16667-0.82364 0.16667-1.2917 0-1.4728-0.59695-2.6667-1.3333-2.6667zm0.042 4.458c0.92048 0 1.6667 0.74619 1.6667 1.6667 0 0.92048-0.74619 1.6667-1.6667 1.6667-0.92048 0-1.6667-0.74619-1.6667-1.6667 0-0.92048 0.74619-1.6667 1.6667-1.6667z"/>
+ <path opacity=".15" d="m2.6667 5.6667 0.0087 12c0.7672-0.012 26.076-4.424 26.658-4.636l-0.000092-7.3644z" fill-rule="evenodd" fill="url(#e)"/>
+ </g>
+</svg>
diff --git a/core/img/filetypes/link.png b/core/img/filetypes/link.png
deleted file mode 100644
index 68f21d30116710e48a8bf462cb32441e51fad5f6..0000000000000000000000000000000000000000
Binary files a/core/img/filetypes/link.png and /dev/null differ
diff --git a/core/img/filetypes/model.png b/core/img/filetypes/model.png
deleted file mode 100644
index 7851cf34c946e5667221e3478668503eb1cd733f..0000000000000000000000000000000000000000
Binary files a/core/img/filetypes/model.png and /dev/null differ
diff --git a/core/img/filetypes/ms-excel.png b/core/img/filetypes/ms-excel.png
deleted file mode 100644
index b977d7e52e2446ea01201c5c7209ac3a05f12c9f..0000000000000000000000000000000000000000
Binary files a/core/img/filetypes/ms-excel.png and /dev/null differ
diff --git a/core/img/filetypes/ms-powerpoint.png b/core/img/filetypes/ms-powerpoint.png
deleted file mode 100644
index c4eff0387d5888c638ba09473ba6d2369f7b56f0..0000000000000000000000000000000000000000
Binary files a/core/img/filetypes/ms-powerpoint.png and /dev/null differ
diff --git a/core/img/filetypes/package-x-generic.png b/core/img/filetypes/package-x-generic.png
new file mode 100644
index 0000000000000000000000000000000000000000..e08cc5480ce6d314765a370c2d9012772305c7fe
Binary files /dev/null and b/core/img/filetypes/package-x-generic.png differ
diff --git a/core/img/filetypes/package-x-generic.svg b/core/img/filetypes/package-x-generic.svg
new file mode 100644
index 0000000000000000000000000000000000000000..13ab5b7550e2daa8661925a1508cb5f96ccbeb17
--- /dev/null
+++ b/core/img/filetypes/package-x-generic.svg
@@ -0,0 +1,62 @@
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <metadata>
+ <rdf:RDF>
+ <cc:Work rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+ <dc:title/>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs>
+ <linearGradient id="linearGradient2886" y2="17.5" spreadMethod="reflect" gradientUnits="userSpaceOnUse" x2="3.0052" gradientTransform="matrix(0.70749164,0,0,0.69402746,-0.97979919,-1.6454802)" y1="17.5" x1="44.995">
+ <stop stop-color="#FFF" stop-opacity="0" offset="0"/>
+ <stop stop-color="#FFF" offset="0.245"/>
+ <stop stop-color="#FFF" offset="0.7735"/>
+ <stop stop-color="#FFF" stop-opacity="0" offset="1"/>
+ </linearGradient>
+ <linearGradient id="linearGradient2889" y2="8" gradientUnits="userSpaceOnUse" x2="26" gradientTransform="matrix(0.99999976,0,0,0.71428568,-7.9999942,-1.7142862)" y1="22" x1="26">
+ <stop stop-color="#FFF" offset="0"/>
+ <stop stop-color="#FFF" offset="0.30213"/>
+ <stop stop-color="#FFF" stop-opacity="0.6901961" offset="0.39747"/>
+ <stop stop-color="#FFF" stop-opacity="0" offset="1"/>
+ </linearGradient>
+ <linearGradient id="linearGradient2892" y2="45.934" gradientUnits="userSpaceOnUse" x2="43.007" gradientTransform="matrix(0.90694933,0,0,0.81526518,-5.2693853,-5.0638302)" y1="30.555" x1="23.452">
+ <stop stop-color="#FFF" stop-opacity="0" offset="0"/>
+ <stop stop-color="#FFF" stop-opacity="0" offset="1"/>
+ </linearGradient>
+ <linearGradient id="linearGradient2895" y2="37.277" gradientUnits="userSpaceOnUse" x2="24.997" gradientTransform="matrix(0.90694933,0,0,1.0807825,-5.2693853,-11.995491)" y1="15.378" x1="24.823">
+ <stop stop-color="#dac197" offset="0"/>
+ <stop stop-color="#c1a581" offset="0.23942"/>
+ <stop stop-color="#dbc298" offset="0.27582"/>
+ <stop stop-color="#a68b60" offset="1"/>
+ </linearGradient>
+ <linearGradient id="linearGradient2897" y2="45.042" gradientUnits="userSpaceOnUse" x2="15.464" gradientTransform="matrix(0.70732457,0,0,0.69402746,-0.97578945,-1.3832872)" y1="7.9757" x1="15.464">
+ <stop stop-color="#c9af8b" offset="0"/>
+ <stop stop-color="#ad8757" offset="0.23942"/>
+ <stop stop-color="#c2a57f" offset="0.27582"/>
+ <stop stop-color="#9d7d53" offset="1"/>
+ </linearGradient>
+ <radialGradient id="radialGradient2903" xlink:href="#linearGradient3681" gradientUnits="userSpaceOnUse" cy="41.5" cx="5" gradientTransform="matrix(0.5938225,0,0,1.5366531,-6.6594735,-103.93618)" r="5"/>
+ <linearGradient id="linearGradient3681">
+ <stop stop-color="#000" offset="0"/>
+ <stop stop-color="#000" stop-opacity="0" offset="1"/>
+ </linearGradient>
+ <linearGradient id="linearGradient2905" y2="35" gradientUnits="userSpaceOnUse" x2="17.554" gradientTransform="matrix(1.7570316,0,0,1.3969574,-17.394014,-16.411698)" y1="46" x1="17.554">
+ <stop stop-color="#000" stop-opacity="0" offset="0"/>
+ <stop stop-color="#000" offset="0.5"/>
+ <stop stop-color="#000" stop-opacity="0" offset="1"/>
+ </linearGradient>
+ <radialGradient id="radialGradient2983" xlink:href="#linearGradient3681" gradientUnits="userSpaceOnUse" cy="41.5" cx="5" gradientTransform="matrix(0.5938225,0,0,1.5366531,41.140892,-103.93618)" r="5"/>
+ </defs>
+ <g opacity="0.4" transform="matrix(0.6905424,0,0,0.6781532,-0.50408884,-0.4485072)">
+ <rect transform="scale(-1,-1)" height="15.367" width="2.9602" y="-47.848" x="-3.6904" fill="url(#radialGradient2903)"/>
+ <rect height="15.367" width="40.412" y="32.482" x="3.6904" fill="url(#linearGradient2905)"/>
+ <rect transform="scale(1,-1)" height="15.367" width="2.9602" y="-47.848" x="44.11" fill="url(#radialGradient2983)"/>
+ </g>
+ <path stroke-linejoin="miter" d="m5.3977,4.5159,20.864,0c1.218,0,1.7661-0.19887,2.116,0.69403l2.1232,5.29v18.081c0,1.078,0.0728,0.91332-1.1452,0.91332h-26.712c-1.218,0-1.1452,0.16471-1.1452-0.91332v-18.081l2.1232-5.29c0.3401-0.87486,0.55789-0.69403,1.7759-0.69403z" fill-rule="nonzero" stroke-dashoffset="0" display="block" stroke="url(#linearGradient2897)" stroke-linecap="round" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="0.99420077" fill="url(#linearGradient2895)"/>
+ <path opacity="0.50549454" stroke-linejoin="miter" d="m6.0608,5.219,19.56,0c1.1418,0,1.8485,0.38625,2.3268,1.4478l1.6473,4.4555v16.063c0,1.0137-0.57913,1.5241-1.721,1.5241h-23.86c-1.1418,0-1.6076-0.56135-1.6076-1.5751v-16.012l1.5942-4.551c0.31884-0.82269,0.91924-1.3522,2.0611-1.3522z" stroke-dashoffset="0" display="block" stroke="url(#linearGradient2892)" stroke-linecap="butt" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="0.74211526" fill="none"/>
+ <path opacity="0.4" style="enable-background:accumulate;" d="m14,4h4v10h-1.1812-1.2094-0.97359-0.63585v-10z" fill-rule="nonzero" fill="url(#linearGradient2889)"/>
+ <path opacity="0.4" stroke-linejoin="miter" d="m1.5001,10.5,29,0" stroke="url(#linearGradient2886)" stroke-linecap="square" stroke-width="0.99999994px" fill="none"/>
+</svg>
diff --git a/core/img/filetypes/presentation.png b/core/img/filetypes/presentation.png
deleted file mode 100644
index b4aaad9a45c9abbee2d47611a6963101b64a8023..0000000000000000000000000000000000000000
Binary files a/core/img/filetypes/presentation.png and /dev/null differ
diff --git a/core/img/filetypes/readme-2.txt b/core/img/filetypes/readme-2.txt
deleted file mode 100644
index 5a606f9a0bb06cd53594eb4bd7cb0028dc48c686..0000000000000000000000000000000000000000
--- a/core/img/filetypes/readme-2.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-15.02.2012
-
-Following new icons have been added:
-core/img/filetypes/application-vnd.oasis.opendocument.formula.png
-core/img/filetypes/application-vnd.oasis.opendocument.graphics.png
-core/img/filetypes/application-vnd.oasis.opendocument.presentation.png
-core/img/filetypes/application-vnd.oasis.opendocument.spreadsheet.png
-core/img/filetypes/application-vnd.oasis.opendocument.text.png
- Download: http://odftoolkit.org/ODF-Icons#ODF_Icons
- License: Apache 2.0
-
-core/img/filetypes/application-x-7z-compressed.png
-core/img/filetypes/application-x-bzip-compressed-tar.png
-core/img/filetypes/application-x-bzip.png
-core/img/filetypes/application-x-compressed-tar.png
-core/img/filetypes/application-x-deb.png
-core/img/filetypes/application-x-debian-package.png
-core/img/filetypes/application-x-gzip.png
-core/img/filetypes/application-x-lzma-compressed-tar.png
-core/img/filetypes/application-x-rar.png
-core/img/filetypes/application-x-rpm.png
-core/img/filetypes/application-x-tar.png
-core/img/filetypes/application-x-tarz.png
-core/img/filetypes/application-zip.png
- Author: Gomez Hyuuga
- License: Creative Commons Attribution-Share Alike 3.0 Unported License
- Download: http://kde-look.org/content/show.php/?content=101767
-
diff --git a/core/img/filetypes/readme.txt b/core/img/filetypes/readme.txt
deleted file mode 100644
index 400a64d7857425f6aa49877a91a9bf8a5737400a..0000000000000000000000000000000000000000
--- a/core/img/filetypes/readme.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-Silk icon set 1.3
-
-_________________________________________
-Mark James
-http://www.famfamfam.com/lab/icons/silk/
-_________________________________________
-
-This work is licensed under a
-Creative Commons Attribution 2.5 License.
-[ http://creativecommons.org/licenses/by/2.5/ ]
-
-This means you may use it for any purpose,
-and make any changes you like.
-All I ask is that you include a link back
-to this page in your credits.
-
-Are you using this icon set? Send me an email
-(including a link or picture if available) to
-mjames@gmail.com
-
-Any other questions about this icon set please
-contact mjames@gmail.com
\ No newline at end of file
diff --git a/core/img/filetypes/ruby.png b/core/img/filetypes/ruby.png
deleted file mode 100644
index f59b7c4365fa1720af1aa04eb47167ddaa6eeed4..0000000000000000000000000000000000000000
Binary files a/core/img/filetypes/ruby.png and /dev/null differ
diff --git a/core/img/filetypes/spreadsheet.png b/core/img/filetypes/spreadsheet.png
deleted file mode 100644
index abcd93689a08ec9bdbf0984927e8da06c043c7cd..0000000000000000000000000000000000000000
Binary files a/core/img/filetypes/spreadsheet.png and /dev/null differ
diff --git a/core/img/filetypes/text-calendar.png b/core/img/filetypes/text-calendar.png
deleted file mode 100644
index 658913852d60fc6ca8557568d26b8e93e7d56525..0000000000000000000000000000000000000000
Binary files a/core/img/filetypes/text-calendar.png and /dev/null differ
diff --git a/core/img/filetypes/text-code.png b/core/img/filetypes/text-code.png
new file mode 100644
index 0000000000000000000000000000000000000000..753d151f538842c2636a94e0f9231fc4ef1c301f
Binary files /dev/null and b/core/img/filetypes/text-code.png differ
diff --git a/core/img/filetypes/text-code.svg b/core/img/filetypes/text-code.svg
new file mode 100644
index 0000000000000000000000000000000000000000..61a5c19f5119a7e7d655f29c9460daaac95e29e0
--- /dev/null
+++ b/core/img/filetypes/text-code.svg
@@ -0,0 +1,66 @@
+<?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="32px" width="32px" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <defs>
+ <linearGradient id="g" y2="43" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(.56757 0 0 .72973 2.3784 -2.5135)" y1="5.5641" x1="24">
+ <stop stop-color="#fff" offset="0"/>
+ <stop stop-color="#fff" stop-opacity=".23529" offset=".036262"/>
+ <stop stop-color="#fff" stop-opacity=".15686" offset=".95056"/>
+ <stop stop-color="#fff" stop-opacity=".39216" offset="1"/>
+ </linearGradient>
+ <linearGradient id="f" y2="47.013" gradientUnits="userSpaceOnUse" x2="25.132" gradientTransform="matrix(.65714 0 0 .63012 .22856 -1.0896)" y1=".98521" x1="25.132">
+ <stop stop-color="#f4f4f4" offset="0"/>
+ <stop stop-color="#dbdbdb" offset="1"/>
+ </linearGradient>
+ <linearGradient id="e" y2="2.9062" gradientUnits="userSpaceOnUse" x2="-51.786" gradientTransform="matrix(.53064 0 0 .58970 39.27 -1.7919)" y1="50.786" x1="-51.786">
+ <stop stop-color="#a0a0a0" offset="0"/>
+ <stop stop-color="#bebebe" offset="1"/>
+ </linearGradient>
+ <radialGradient id="c" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(.015663 0 0 .0082353 17.61 25.981)" r="117.14"/>
+ <linearGradient id="a">
+ <stop offset="0"/>
+ <stop stop-opacity="0" offset="1"/>
+ </linearGradient>
+ <radialGradient id="b" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-.015663 0 0 .0082353 14.39 25.981)" r="117.14"/>
+ <linearGradient id="d" y2="609.51" gradientUnits="userSpaceOnUse" y1="366.65" gradientTransform="matrix(.045769 0 0 .0082353 -.54232 25.981)" x2="302.86" x1="302.86">
+ <stop stop-opacity="0" offset="0"/>
+ <stop offset=".5"/>
+ <stop stop-opacity="0" offset="1"/>
+ </linearGradient>
+ </defs>
+ <g>
+ <g>
+ <rect opacity=".15" height="2" width="22.1" y="29" x="4.95" fill="url(#d)"/>
+ <path opacity=".15" d="m4.95 29v1.9999c-0.80662 0.0038-1.95-0.44807-1.95-1.0001 0-0.552 0.90012-0.99982 1.95-0.99982z" fill="url(#b)"/>
+ <path opacity=".15" d="m27.05 29v1.9999c0.80661 0.0038 1.95-0.44807 1.95-1.0001 0-0.552-0.90012-0.99982-1.95-0.99982z" fill="url(#c)"/>
+ </g>
+ <path stroke-linejoin="round" d="m4.5 0.49996c5.2705 0 23 0.00185 23 0.00185l0.000028 28.998h-23v-29z" stroke="url(#e)" stroke-width=".99992" fill="url(#f)"/>
+ </g>
+ <path stroke-linejoin="round" d="m26.5 28.5h-21v-27h21z" stroke="url(#g)" stroke-linecap="round" fill="none"/>
+ <path d="m8 5.505h2.3438zm2.6875 0h2.1875zm2.5312 0h1.9375zm2.25 0h0.84375zm-7.4688 2h3.6562zm4.0625 0h1.75zm2.0625 0h0.875zm1.2188 0h1.5938zm1.9375 0h1.625zm-9.282 1.995h4.2812zm4.625 0h4.625zm1.703 8h0.84375zm1.1875 0h1.875zm2.25 0h4.9062zm-2.6875 2.075h1.8438zm-1.028 5.925h2.9688zm3.8562 0h1.1875z" stroke="#89adc2" stroke-width="1px" fill="none"/>
+ <g transform="translate(27.06 6.7752)">
+ <path d="m-15.57 10.277h0.93368v1h-0.93368z" fill="#d48eb3"/>
+ <path d="m-14.483 10.277h0.41011v1h-0.41011z" fill="#d48eb3"/>
+ <path opacity=".7" d="m-19.06 16.277h1.9967v1h-1.9967v-1z" fill="#666"/>
+ <path opacity=".7" d="m-16.907 16.277h2.1395v1h-2.1395v-1z" fill="#666"/>
+ <g fill="#d48eb3">
+ <path d="m-14.611 16.277h0.85436v1h-0.85436v-1z"/>
+ <path d="m-13.6 16.277h2.0125v1h-2.0125v-1z"/>
+ <path d="m-9.8967 16.277h0.53704v1h-0.53704v-1z"/>
+ <path d="m-11.431 16.277h1.3779v1h-1.3779v-1z"/>
+ <path d="m-9.2031 16.277h0.31492v1h-0.31492v-1z"/>
+ <path d="m-8.7317 16.277h0.85436v1h-0.85436v-1z"/>
+ <path d="m-16.466 12.277h2.3933v1h-2.3933z"/>
+ </g>
+ <path d="m-19.06 14.277h1.8063v1h-1.8063v-1z" fill="#94d48e"/>
+ <path d="m-17.105 14.277h0.56877v1h-0.56877v-1z" fill="#94d48e"/>
+ <path opacity=".7" d="m-16.387 14.277h1.2986v1h-1.2986v-1z" fill="#666"/>
+ <path opacity=".7" d="m-14.939 14.277h0.88609v1h-0.88609v-1z" fill="#666"/>
+ <path d="m-19.06 18.277h1.4875v1h-1.4875v-1z" fill="#de6161"/>
+ <path opacity=".7" d="m-17.334 18.277h2.6472v1h-2.6472v-1z" fill="#666"/>
+ </g>
+ <g>
+ <path d="m8 12v1h3.0625v-1h-3.062zm0 2v1h3.0938v-1h-3.094z" fill="#b78ed4"/>
+ <path d="m12.406 12v1h5.594v-1zm0.03125 2v1h5.0938v-1z" fill="#d48eb3"/>
+ <path d="m8 17v1h2.5312v-1zm0 2.031v0.969h2.2188v-0.96875z" fill="#94d48e"/>
+ </g>
+</svg>
diff --git a/core/img/filetypes/text-css.png b/core/img/filetypes/text-css.png
deleted file mode 100644
index 23f3101811f2e402b8c581ba2e39977a675e0295..0000000000000000000000000000000000000000
Binary files a/core/img/filetypes/text-css.png and /dev/null differ
diff --git a/core/img/filetypes/text-html.png b/core/img/filetypes/text-html.png
index 55d1072eafda48abb0a5fcecb98b114d866077b9..dd17b7501034216c35e9273dc7e3858d486d2aed 100644
Binary files a/core/img/filetypes/text-html.png and b/core/img/filetypes/text-html.png differ
diff --git a/core/img/filetypes/text-html.svg b/core/img/filetypes/text-html.svg
new file mode 100644
index 0000000000000000000000000000000000000000..c41964738d00009d54bb1f773ae9ba1fc3e59c27
--- /dev/null
+++ b/core/img/filetypes/text-html.svg
@@ -0,0 +1,49 @@
+<?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="32px" width="32px" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <defs>
+ <linearGradient id="g" y2="43" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(.56757 0 0 .72973 2.3784 -2.5135)" y1="5.5641" x1="24">
+ <stop stop-color="#fff" offset="0"/>
+ <stop stop-color="#fff" stop-opacity=".23529" offset=".036262"/>
+ <stop stop-color="#fff" stop-opacity=".15686" offset=".95056"/>
+ <stop stop-color="#fff" stop-opacity=".39216" offset="1"/>
+ </linearGradient>
+ <linearGradient id="f" y2="47.013" gradientUnits="userSpaceOnUse" x2="25.132" gradientTransform="matrix(.65714 0 0 .63012 .22856 -1.0896)" y1=".98521" x1="25.132">
+ <stop stop-color="#f4f4f4" offset="0"/>
+ <stop stop-color="#dbdbdb" offset="1"/>
+ </linearGradient>
+ <linearGradient id="e" y2="2.9062" gradientUnits="userSpaceOnUse" x2="-51.786" gradientTransform="matrix(.53064 0 0 .58970 39.27 -1.7919)" y1="50.786" x1="-51.786">
+ <stop stop-color="#a0a0a0" offset="0"/>
+ <stop stop-color="#bebebe" offset="1"/>
+ </linearGradient>
+ <radialGradient id="c" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(.015663 0 0 .0082353 17.61 25.981)" r="117.14"/>
+ <linearGradient id="a">
+ <stop offset="0"/>
+ <stop stop-opacity="0" offset="1"/>
+ </linearGradient>
+ <radialGradient id="b" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-.015663 0 0 .0082353 14.39 25.981)" r="117.14"/>
+ <linearGradient id="d" y2="609.51" gradientUnits="userSpaceOnUse" y1="366.65" gradientTransform="matrix(.045769 0 0 .0082353 -.54232 25.981)" x2="302.86" x1="302.86">
+ <stop stop-opacity="0" offset="0"/>
+ <stop offset=".5"/>
+ <stop stop-opacity="0" offset="1"/>
+ </linearGradient>
+ </defs>
+ <g>
+ <g>
+ <rect opacity=".15" height="2" width="22.1" y="29" x="4.95" fill="url(#d)"/>
+ <path opacity=".15" d="m4.95 29v1.9999c-0.80662 0.0038-1.95-0.44807-1.95-1.0001 0-0.552 0.90012-0.99982 1.95-0.99982z" fill="url(#b)"/>
+ <path opacity=".15" d="m27.05 29v1.9999c0.80661 0.0038 1.95-0.44807 1.95-1.0001 0-0.552-0.90012-0.99982-1.95-0.99982z" fill="url(#c)"/>
+ </g>
+ <path stroke-linejoin="round" d="m4.5 0.49996c5.2705 0 23 0.00185 23 0.00185l0.000028 28.998h-23v-29z" stroke="url(#e)" stroke-width=".99992" fill="url(#f)"/>
+ </g>
+ <path stroke-linejoin="round" d="m26.5 28.5h-21v-27h21z" stroke="url(#g)" stroke-linecap="round" fill="none"/>
+ <g fill="#fff">
+ <rect opacity=".6" style="color:#000000" fill-rule="evenodd" transform="matrix(1 0 -.42525 .90508 0 0)" height="8.839" width="1.2412" y="14.363" x="23.867"/>
+ <path opacity=".6" d="m23.142 16.907-2.939-3.68 0.979-1.227 3.818 4.907-3.919 5.093-1.081-1.12 3.142-3.973z"/>
+ <path opacity=".6" d="m8.8581 16.907 2.9389-3.68-0.979-1.227-3.818 4.907 3.919 5.093 1.081-1.12-3.1419-3.973z"/>
+ </g>
+ <g>
+ <path opacity=".4" d="m8.8581 15.907 2.9389-3.68-0.979-1.227-3.818 4.907 3.919 5.093 1.081-1.12-3.1419-3.973z" fill="#666"/>
+ <rect opacity=".4" style="color:#000000" fill-rule="evenodd" transform="matrix(1 0 -.42525 .90508 0 0)" height="8.839" width="1.2412" y="13.259" x="23.397"/>
+ <path opacity=".4" d="m23.142 15.907-2.939-3.68 0.979-1.227 3.818 4.907-3.919 5.093-1.081-1.12 3.142-3.973z" fill="#666"/>
+ </g>
+</svg>
diff --git a/core/img/filetypes/text-vcard.png b/core/img/filetypes/text-vcard.png
index c02f315d20749098a50e79bd9525eed3cda7be6b..2e52d1ecb3a51b897b64d06b8db16e89c398b9e6 100644
Binary files a/core/img/filetypes/text-vcard.png and b/core/img/filetypes/text-vcard.png differ
diff --git a/core/img/filetypes/text-vcard.svg b/core/img/filetypes/text-vcard.svg
new file mode 100644
index 0000000000000000000000000000000000000000..27054be57e62f3536a56f15796debd964895f693
--- /dev/null
+++ b/core/img/filetypes/text-vcard.svg
@@ -0,0 +1,60 @@
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <defs>
+ <linearGradient id="linearGradient5060">
+ <stop stop-color="#000" offset="0"/>
+ <stop stop-color="#000" stop-opacity="0" offset="1"/>
+ </linearGradient>
+ <linearGradient id="linearGradient3013" y2="43" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(0.56756757,0,0,0.72972971,2.378382,-2.5135063)" y1="5.5641" x1="24">
+ <stop stop-color="#FFF" offset="0"/>
+ <stop stop-color="#FFF" stop-opacity="0.23529412" offset="0.036262"/>
+ <stop stop-color="#FFF" stop-opacity="0.15686275" offset="0.95056"/>
+ <stop stop-color="#FFF" stop-opacity="0.39215687" offset="1"/>
+ </linearGradient>
+ <linearGradient id="linearGradient3016" y2="47.013" gradientUnits="userSpaceOnUse" x2="25.132" gradientTransform="matrix(0.65714319,0,0,0.63012397,0.228556,-1.0896478)" y1="0.98521" x1="25.132">
+ <stop stop-color="#f4f4f4" offset="0"/>
+ <stop stop-color="#dbdbdb" offset="1"/>
+ </linearGradient>
+ <radialGradient id="radialGradient3021" xlink:href="#linearGradient5060" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(0.01566318,0,0,0.00823529,17.610433,25.980565)" r="117.14"/>
+ <radialGradient id="radialGradient3024" xlink:href="#linearGradient5060" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-0.01566318,0,0,0.00823529,14.389566,25.980565)" r="117.14"/>
+ <linearGradient id="linearGradient3027" y2="609.51" gradientUnits="userSpaceOnUse" x2="302.86" gradientTransform="matrix(0.04576928,0,0,0.00823529,-0.5423243,25.980548)" y1="366.65" x1="302.86">
+ <stop stop-color="#000" stop-opacity="0" offset="0"/>
+ <stop stop-color="#000" offset="0.5"/>
+ <stop stop-color="#000" stop-opacity="0" offset="1"/>
+ </linearGradient>
+ <linearGradient id="linearGradient3032" y2="32.596" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(0.502671,0,0,0.64629877,2.711822,0.7961773)" y1="14.916" x1="24">
+ <stop stop-color="#FFF" offset="0"/>
+ <stop stop-color="#FFF" stop-opacity="0.23529412" offset="0.12291"/>
+ <stop stop-color="#FFF" stop-opacity="0.15686275" offset="0.93706"/>
+ <stop stop-color="#FFF" stop-opacity="0.39215687" offset="1"/>
+ </linearGradient>
+ <radialGradient id="radialGradient3035" gradientUnits="userSpaceOnUse" cy="8.4498" cx="10.904" gradientTransform="matrix(0,0.96917483,-0.82965977,0,23.014205,-1.785221)" r="20">
+ <stop stop-color="#5f5f5f" offset="0"/>
+ <stop stop-color="#4f4f4f" offset="0.26238"/>
+ <stop stop-color="#3b3b3b" offset="0.70495"/>
+ <stop stop-color="#2b2b2b" offset="1"/>
+ </radialGradient>
+ <linearGradient id="linearGradient3037" y2="3.899" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(0.65627449,0,0,0.6892852,0.2531134,-0.2111202)" y1="44" x1="24">
+ <stop stop-color="#272727" offset="0"/>
+ <stop stop-color="#454545" offset="1"/>
+ </linearGradient>
+ </defs>
+ <metadata>
+ <rdf:RDF>
+ <cc:Work rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+ <dc:title/>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <rect opacity="0.15" fill-rule="nonzero" height="2" width="22.1" y="29" x="4.95" fill="url(#linearGradient3027)"/>
+ <path opacity="0.15" d="m4.95,29v1.9999c-0.80662,0.0038-1.95-0.44807-1.95-1.0001,0-0.552,0.90012-0.99982,1.95-0.99982z" fill-rule="nonzero" fill="url(#radialGradient3024)"/>
+ <path opacity="0.15" d="m27.05,29v1.9999c0.80661,0.0038,1.95-0.44807,1.95-1.0001,0-0.552-0.90012-0.99982-1.95-0.99982z" fill-rule="nonzero" fill="url(#radialGradient3021)"/>
+ <path d="m4.5,0.49996c5.2705,0,23,0.00185,23,0.00185l0.000028,28.998h-23v-29z" fill="url(#linearGradient3016)"/>
+ <path stroke-linejoin="round" d="m26.5,28.5-21,0,0-27,21,0z" stroke-dashoffset="0" stroke="url(#linearGradient3013)" stroke-linecap="round" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="0.99999994" fill="none"/>
+ <path stroke-linejoin="round" opacity="0.3" d="m4.5,0.49996c5.2705,0,23,0.00185,23,0.00185l0.000028,28.998h-23v-29z" stroke-dashoffset="0" stroke="#000" stroke-linecap="butt" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="0.99992186000000005" fill="none"/>
+ <path opacity="0.4" style="enable-background:accumulate;" d="m15.942,10c-0.43193-0.00263-0.8112,0.0802-1.0693,0.25173-0.33304,0.22128-0.47989,0.24937-0.57286,0.09682-0.08897-0.14595-0.16986-0.12965-0.24824,0.07745-0.06628,0.17515-0.20484,0.25511-0.36281,0.19364-0.15062-0.05862-0.21239-0.03973-0.15276,0.05809,0.05729,0.09402,0.02929,0.17427-0.05728,0.17427s-0.36382,0.2966-0.61105,0.65837c-0.39411,0.57668-0.45839,0.84025-0.45829,2.0526,0.000055,0.76062,0.07517,1.5012-0.15276,1.5491-0.13368,0.02806-0.12095,0.55674-0.05728,1.1037,0.08325,0.71528,0.20761,1.0657,0.55377,1.3942,0.53917,0.51164,1.0312,1.3973,1.0312,1.8783,0,0.65888-1.5163,1.812-3.7844,2.8648l-0.001,1.647h11.999l0.001-1.818c-1.8832-0.86856-3.4418-2.0704-3.4418-2.6933,0-0.47982,0.47343-1.3672,1.0121-1.8783,0.34616-0.32849,0.48961-0.6789,0.57286-1.3942,0.06366-0.54699,0.07227-1.0601-0.05728-1.1037-0.17854-0.06014-0.17188-0.79471-0.17188-1.5491-0.000001-1.0814-0.06787-1.4838-0.34372-1.9364-0.54889-0.9006-2.3323-1.6188-3.6281-1.6265z" fill-rule="evenodd" fill="#FFF"/>
+ <path stroke-linejoin="round" style="enable-background:accumulate;color:#000000;" d="m15.942,9.5292c-0.6255-0.1462-1.3748,0.30347-1.3748,0.30347l-0.6729,0.33632s-0.72918,0.63672-0.73698,0.85303c-0.41044,0.72679-0.22336,1.6075-0.26498,2.4026,0.03999,0.68261-0.43452,1.1887-0.1965,1.8808-0.03472,0.66822,0.51558,1.0601,0.86937,1.5434,0.39816,0.61145,0.93889,1.4093,0.51306,2.141-0.78719,1.1416-2.0959,1.7466-3.2907,2.3686-0.4059,0.04157-0.25309,0.43145-0.28027,0.70942-0.000647,0.22106-0.07334,0.51408,0.25088,0.41058h10.742v-1.1474c-1.1567-0.58611-2.3639-1.2139-3.1747-2.2562-0.48709-0.69808,0.0011-1.5369,0.38553-2.1576,0.2993-0.51701,0.92489-0.84736,0.93383-1.5066,0.23004-0.66882-0.1171-1.2225-0.18189-1.8604-0.08471-0.84572,0.14453-1.7705-0.25914-2.5574-0.54732-0.80518-1.5498-1.1578-2.4596-1.3737-0.26389-0.053253-0.53234-0.088037-0.80184-0.09011z" fill-rule="nonzero" stroke-dashoffset="0" stroke="url(#linearGradient3037)" stroke-linecap="round" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="0.99999994" fill="url(#radialGradient3035)"/>
+ <path opacity="0.5" stroke-linejoin="round" style="enable-background:accumulate;color:#000000;" d="m15.797,10.502c-0.10657-0.01105-0.27196,0.03765-0.51076,0.15329-0.17676,0.08559-0.43781,0.15994-0.7045,0.21077l0.01761,0.01916c-0.0033,0.002-0.1837,0.11082-0.29941,0.19161-0.02225,0.01554-0.034,0.0057-0.05284,0.01916-0.0059,0.0083-0.01447,0.01546-0.01761,0.01916-0.07635,0.08979-0.22535,0.27657-0.33464,0.47903-0.11417,0.2115-0.16633,0.4404-0.15851,0.49819a0.52517,0.57134,0,0,1,0.01761,0.13413c-0.05039,0.58523,0.11775,1.3768-0.1409,2.261a0.52517,0.57134,0,0,1,-0.035,0.115c-0.09831,0.18139-0.02434,0.78987,0.1409,1.2455,0.54115,0.61932,1.1974,1.4444,1.18,2.5676a0.52517,0.57134,0,0,1,-0.0176,0.13412c-0.28591,1.0661-1.1672,1.5797-1.726,2.0119a0.52517,0.57134,0,0,1,-0.01761,0.01916c-0.524,0.378-1.084,0.623-1.637,0.919h9c-1.027-0.52495-2.0438-1.1451-2.8532-2.1077-0.0057-0.0069-0.0119-0.01231-0.01761-0.01916-0.37728-0.42677-0.45342-1.0116-0.36986-1.4754,0.08208-0.45566,0.27492-0.83741,0.45793-1.1497,0.0063-0.01067,0.01139-0.02783,0.01761-0.03833,0.18432-0.36085,0.41144-0.60748,0.5636-0.80477,0.15849-0.2055,0.22438-0.31795,0.22896-0.47903a0.52517,0.57134,0,0,1,0.03523,-0.15329c0.05659-0.18584,0.03263-0.33442-0.01761-0.57483-0.04928-0.23579-0.14777-0.55211-0.17612-0.9389-0.000556-0.0075,0.000501-0.01151,0-0.01916-0.04688-0.50185,0.0086-0.95368,0-1.3413-0.0086-0.3855-0.07421-0.66627-0.22896-0.90057-0.0021-0.0024,0.0021-0.01679,0-0.01916-0.54915-0.61896-1.4523-0.93653-2.3073-0.97721a0.52517,0.57134,0,0,1,-0.03523,0z" stroke-dashoffset="0" stroke="url(#linearGradient3032)" stroke-linecap="round" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="1" fill="none"/>
+</svg>
diff --git a/core/img/filetypes/text-x-c++.png b/core/img/filetypes/text-x-c++.png
deleted file mode 100644
index a87cf847cb768acb8c600759ce433ce1bad3cdc0..0000000000000000000000000000000000000000
Binary files a/core/img/filetypes/text-x-c++.png and /dev/null differ
diff --git a/core/img/filetypes/text-x-c.png b/core/img/filetypes/text-x-c.png
index 34a05cccf064b35701b61ba1d395048873d7b48e..b9edd1e866e457027339e21329e367e84f9dd304 100644
Binary files a/core/img/filetypes/text-x-c.png and b/core/img/filetypes/text-x-c.png differ
diff --git a/core/img/filetypes/text-x-c.svg b/core/img/filetypes/text-x-c.svg
new file mode 100644
index 0000000000000000000000000000000000000000..35a6a0cdfe2840ce53d8156732bc3f9171f650dd
--- /dev/null
+++ b/core/img/filetypes/text-x-c.svg
@@ -0,0 +1,75 @@
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32.002" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <defs>
+ <linearGradient id="linearGradient3161" y2="14" xlink:href="#linearGradient3830" gradientUnits="userSpaceOnUse" x2="25" gradientTransform="translate(0,-4.6093084e-4)" y1="43" x1="25"/>
+ <linearGradient id="linearGradient3830">
+ <stop stop-color="#FFF" offset="0"/>
+ <stop stop-color="#FFF" stop-opacity="0" offset="1"/>
+ </linearGradient>
+ <linearGradient id="linearGradient3164" y2="28.585" xlink:href="#linearGradient3830" gradientUnits="userSpaceOnUse" x2="30" gradientTransform="translate(0,-4.6093084e-4)" y1="9.9828" x1="30"/>
+ <radialGradient id="radialGradient3167" fx="7.2758" gradientUnits="userSpaceOnUse" cy="9.9571" cx="7.8061" gradientTransform="matrix(-1.6167311e-7,6.6018651,-8.0922115,-1.9817022e-7,104.56429,-60.072946)" r="12.672">
+ <stop stop-color="#90dbec" offset="0"/>
+ <stop stop-color="#55c1ec" offset="0.26238"/>
+ <stop stop-color="#3689e6" offset="0.70495"/>
+ <stop stop-color="#2b63a0" offset="1"/>
+ </radialGradient>
+ <linearGradient id="linearGradient3169" y2="0.91791" gradientUnits="userSpaceOnUse" x2="25" gradientTransform="translate(0,-4.6093084e-4)" y1="47.935" x1="25">
+ <stop stop-color="#185f9a" offset="0"/>
+ <stop stop-color="#599ec9" offset="1"/>
+ </linearGradient>
+ <radialGradient id="radialGradient3172" gradientUnits="userSpaceOnUse" cy="63.965" cx="15.116" gradientTransform="matrix(1.139227,0,0,0.4068666,6.7799989,7.7466159)" r="12.289">
+ <stop stop-color="#000" offset="0"/>
+ <stop stop-color="#000" stop-opacity="0" offset="1"/>
+ </radialGradient>
+ <linearGradient id="linearGradient3243" y2="0.50543" gradientUnits="userSpaceOnUse" x2="21.253" gradientTransform="translate(0,0.99953907)" y1="44.301" x1="21.253">
+ <stop stop-color="#AAA" offset="0"/>
+ <stop stop-color="#c8c8c8" offset="1"/>
+ </linearGradient>
+ <linearGradient id="linearGradient3988" y2="43" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(0.89189189,0,0,1.1351351,2.5945999,-4.7432314)" y1="5.5641" x1="24">
+ <stop stop-color="#FFF" offset="0"/>
+ <stop stop-color="#FFF" stop-opacity="0.23529412" offset="0.036262"/>
+ <stop stop-color="#FFF" stop-opacity="0.15686275" offset="0.95056"/>
+ <stop stop-color="#FFF" stop-opacity="0.39215687" offset="1"/>
+ </linearGradient>
+ <linearGradient id="linearGradient3322" y2="47.013" gradientUnits="userSpaceOnUse" x2="25.132" gradientTransform="matrix(1,0,0,0.9561695,-9.9999999e-8,-1.9149218)" y1="0.98521" x1="25.132">
+ <stop stop-color="#f4f4f4" offset="0"/>
+ <stop stop-color="#dbdbdb" offset="1"/>
+ </linearGradient>
+ <linearGradient id="linearGradient3324" y2="2.9062" gradientUnits="userSpaceOnUse" x2="-51.786" gradientTransform="matrix(0.8074968,0,0,0.8948322,59.410232,-2.9805531)" y1="50.786" x1="-51.786">
+ <stop stop-color="#a0a0a0" offset="0"/>
+ <stop stop-color="#bebebe" offset="1"/>
+ </linearGradient>
+ <radialGradient id="radialGradient3327" xlink:href="#linearGradient5060" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(0.02303995,0,0,0.01470022,26.360882,37.040176)" r="117.14"/>
+ <linearGradient id="linearGradient5060">
+ <stop stop-color="#000" offset="0"/>
+ <stop stop-color="#000" stop-opacity="0" offset="1"/>
+ </linearGradient>
+ <radialGradient id="radialGradient3330" xlink:href="#linearGradient5060" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-0.02303994,0,0,0.01470022,21.62311,37.040176)" r="117.14"/>
+ <linearGradient id="linearGradient4091" y2="609.51" gradientUnits="userSpaceOnUse" x2="302.86" gradientTransform="matrix(0.06732488,0,0,0.01470022,-0.3411391,37.040146)" y1="366.65" x1="302.86">
+ <stop stop-color="#000" stop-opacity="0" offset="0"/>
+ <stop stop-color="#000" offset="0.5"/>
+ <stop stop-color="#000" stop-opacity="0" offset="1"/>
+ </linearGradient>
+ </defs>
+ <metadata>
+ <rdf:RDF>
+ <cc:Work rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+ <dc:title/>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g transform="matrix(0.66666667,0,0,0.66666667,0,0.00184133)">
+ <rect opacity="0.3" fill-rule="nonzero" height="3.5701" width="32.508" y="42.43" x="7.7378" fill="url(#linearGradient4091)"/>
+ <path opacity="0.3" d="m7.7378,42.43v3.5699c-1.1865,0.0067-2.8684-0.79982-2.8684-1.7852,0-0.98533,1.324-1.7847,2.8684-1.7847z" fill-rule="nonzero" fill="url(#radialGradient3330)"/>
+ <path opacity="0.3" d="m40.246,42.43v3.5699c1.1865,0.0067,2.8684-0.79982,2.8684-1.7852,0-0.98533-1.324-1.7847-2.8684-1.7847z" fill-rule="nonzero" fill="url(#radialGradient3327)"/>
+ <path stroke-linejoin="round" d="M6.5,0.4972c8.02,0,35,0.0028,35,0.0028l0.000042,44.003h-35v-44.006z" stroke-dashoffset="0" stroke="url(#linearGradient3324)" stroke-linecap="butt" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="0.99992186" fill="url(#linearGradient3322)"/>
+ <path stroke-linejoin="round" d="m40.5,43.5-33,0,0-42,33,0z" stroke-dashoffset="0" stroke="url(#linearGradient3988)" stroke-linecap="round" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="1" fill="none"/>
+ <path d="m11,6.9995,0,1,2.375,0,0-1zm2.6875,0,0,1,2.25,0,0-1zm2.5625,0,0,1,1.9688,0,0-1zm2.2812,0,0,1,0.875,0,0-1zm1.1875,0,0,1,1.9375,0,0-1zm2.2812,0,0,1,5,0,0-1zm-11,2,0,1,3.7812,0,0-1zm4.1562,0,0,1,1.8125,0,0-1zm2.1562,0,0,1,0.84375,0,0-1zm1.2188,0,0,1,1.625,0,0-1zm2,0,0,1,1.625,0,0-1zm1.9688,0,0,1,2.6562,0,0-1zm3.0312,0,0,1,3.4688,0,0-1zm-16.904,2.0005v1h4.1875v-1zm4.5,0,0,1,4.5,0,0-1zm-4.5,2,0,1,2.3125,0,0-1zm2.625,0,0,1,2.1562,0,0-1zm2.4688,0,0,1,1.9062,0,0-1zm-5.0938,3,0,1,3.0625,0,0-1zm3.4062,0,0,1,5.5938,0,0-1zm-3.4062,2,0,1,3.0938,0,0-1zm3.4375,0,0,1,5.0938,0,0-1c-2.793,2.816-6.7194,8.5464-5.0938,0zm5.4688,0,0,1,1.9062,0,0-1zm2.2188,0,0,1,1.9062,0,0-1zm2.2188,0,0,1,2.75,0,0-1zm3.0938,0,0,1,0.5625,0,0-1zm-16.438,3,0,1,2.3438,0,0-1zm0,2,0,1,1,0,0-1zm0,2,0,1,2.75,0,0-1zm9,0,0,1,2.3438,0,0-1zm2.6562,0,0,1,2.1875,0,0-1zm2.5,0,0,1,1.8438,0,0-1zm-14.156,2,0,1,2.9375,0,0-1zm9,0,0,1,1.875,0,0-1zm2.1875,0,0,1,4.8125,0,0-1zm5.125,0,0,1,3.6875,0,0-1zm-16.312,2,0,1,2.5312,0,0-1zm9,0,0,1,2.4375,0,0-1zm2.7812,0,0,1,4.2812,0,0-1zm4.5938,0,0,1,2.9375,0,0-1zm-16.376,2.156v0.96875h2.2188v-0.96875zm2.5625,0,0,0.96875,2.125,0,0-0.96875zm-2.562,2.844v1h4.2812v-1zm4.625,0,0,1,4.5938,0,0-1zm11.75,0,0,1,2.9688,0,0-1zm3.2812,0,0,1,1.1562,0,0-1zm1.5,0,0,1,0.6875,0,0-1zm1,0,0,1,1.8438,0,0-1zm-22.156,2,0,1,3.6875,0,0-1zm3.9688,0,0,1,1.7812,0,0-1zm2.1562,0,0,1,0.8125,0,0-1zm1.0312,0,0,1,1.625,0,0-1zm1.875,0,0,1,1.625,0,0-1zm2.125,0,0,1,2.5938,0,0-1zm2.9062,0,0,1,3.375,0,0-1zm3.8438,0,0,1,2.2812,0,0-1zm2.5625,0,0,1,0.53125,0,0-1zm-20.469,2,0,1,3.0312,0,0-1zm3.3438,0,0,1,3.3438,0,0-1zm5.5938,0,0,1,2.4375,0,0-1zm2.75,0,0,1,2.25,0,0-1zm2.5938,0,0,1,1.9375,0,0-1zm2.25,0,0,1,3.0938,0,0-1zm3.4375,0,0,1,5.0312,0,0-1z" fill="url(#linearGradient3243)"/>
+ <path opacity="0.3" d="M38,33.772c0.002,2.762-6.267,5.001-14,5.001s-14.002-2.239-14-5.001c-0.0015-2.762,6.267-5.001,14-5.001,7.7331,0,14.002,2.2392,14,5.001z" fill="url(#radialGradient3172)"/>
+ <path stroke-linejoin="round" style="enable-background:accumulate;" d="m24,10.5c-6.9,0-12.5,5.6-12.5,12.5s5.6,12.5,12.5,12.5c5.1254,0,10-3.5,11.553-8h-5.536c-1.3314,1.7506-3.794,3-6.0175,3-4.14,0-7.5-3.36-7.5-7.5-0.000002-4.14,3.36-7.5,7.5-7.5,2.6674,0,5.1835,1.9004,6.5132,4h4.9491c-0.46238-4.5-5.9604-9-11.462-9z" fill-rule="nonzero" stroke-dashoffset="0" stroke="url(#linearGradient3169)" stroke-linecap="square" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="1" fill="url(#radialGradient3167)"/>
+ <path opacity="0.5" stroke-linejoin="miter" style="enable-background:accumulate;" d="m34.125,17.937c-1.85-3.7875-5.876-6.4337-10.125-6.375-4.4493-0.06217-8.7511,2.7592-10.485,6.8537-1.8453,4.1071-0.95053,9.2567,2.2024,12.479,2.1403,2.3057,5.2836,3.5679,8.4064,3.5424" stroke-dashoffset="0" stroke="url(#linearGradient3164)" stroke-linecap="square" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="1" fill="none"/>
+ <path opacity="0.5" stroke-linejoin="miter" style="enable-background:accumulate;" d="m23.561,14.448c-4.0197,0.13299-7.6119,3.4686-8.0541,7.4638-0.56609,3.8529,1.8882,7.8464,5.5554,9.1288,3.0106,1.1697,7.3287,0.17216,9.3618-2.5497h4.5763" stroke-dashoffset="0" stroke="url(#linearGradient3161)" stroke-linecap="square" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="1" fill="none"/>
+ </g>
+</svg>
diff --git a/core/img/filetypes/text-x-csharp.png b/core/img/filetypes/text-x-csharp.png
deleted file mode 100644
index ffb8fc932f321d19049a51e0134459e7d6549226..0000000000000000000000000000000000000000
Binary files a/core/img/filetypes/text-x-csharp.png and /dev/null differ
diff --git a/core/img/filetypes/text-x-h.png b/core/img/filetypes/text-x-h.png
index e902abb07671254da98cd4eb0f7d21fab89d2332..37a8805b50696aa9cf36c610871a96cb1d5b3bba 100644
Binary files a/core/img/filetypes/text-x-h.png and b/core/img/filetypes/text-x-h.png differ
diff --git a/core/img/filetypes/text-x-h.svg b/core/img/filetypes/text-x-h.svg
new file mode 100644
index 0000000000000000000000000000000000000000..38ed04690fc7e27c88f13dc47e2131b95b551bde
--- /dev/null
+++ b/core/img/filetypes/text-x-h.svg
@@ -0,0 +1,79 @@
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32.002" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <defs>
+ <linearGradient id="linearGradient3471" y2="36.456" gradientUnits="userSpaceOnUse" x2="21.038" gradientTransform="matrix(0.58514285,0,0,0.60235363,3.8713637,10.911281)" y1="29.845" x1="21.038">
+ <stop stop-color="#FFF" offset="0"/>
+ <stop stop-color="#FFF" stop-opacity="0" offset="1"/>
+ </linearGradient>
+ <linearGradient id="linearGradient4596-7" y2="34.607" gradientUnits="userSpaceOnUse" x2="26.884" gradientTransform="translate(4.1160985,-1.6069009)" y1="12.607" x1="26.884">
+ <stop stop-color="#FFF" offset="0"/>
+ <stop stop-color="#FFF" stop-opacity="0.23529412" offset="0.090909"/>
+ <stop stop-color="#FFF" stop-opacity="0.15686275" offset="0.95455"/>
+ <stop stop-color="#FFF" stop-opacity="0.39215687" offset="1"/>
+ </linearGradient>
+ <radialGradient id="radialGradient3394" fx="9.3065" xlink:href="#linearGradient3242-6-6" gradientUnits="userSpaceOnUse" cy="10.244" cx="9.8368" gradientTransform="matrix(0,7.1403659,-7.3430977,0,93.723115,-67.567174)" r="12.672"/>
+ <linearGradient id="linearGradient3242-6-6">
+ <stop stop-color="#f8b17e" offset="0"/>
+ <stop stop-color="#e35d4f" offset="0.26238"/>
+ <stop stop-color="#c6262e" offset="0.66094"/>
+ <stop stop-color="#690b54" offset="1"/>
+ </linearGradient>
+ <linearGradient id="linearGradient3396" y2="4.9451" xlink:href="#linearGradient2490-6-6" gradientUnits="userSpaceOnUse" x2="25" gradientTransform="matrix(0.98529211,0,0,1.0090832,-3.0293205,-2.6661519)" y1="49.945" x1="25"/>
+ <linearGradient id="linearGradient2490-6-6">
+ <stop stop-color="#791235" offset="0"/>
+ <stop stop-color="#dd3b27" offset="1"/>
+ </linearGradient>
+ <radialGradient id="radialGradient3399" fx="9.3065" xlink:href="#linearGradient3242-6-6" gradientUnits="userSpaceOnUse" cy="10.244" cx="9.8368" gradientTransform="matrix(0,7.1403659,-7.3430977,0,93.723115,-67.168075)" r="12.672"/>
+ <linearGradient id="linearGradient3401" y2="4.9451" xlink:href="#linearGradient2490-6-6" gradientUnits="userSpaceOnUse" x2="25" gradientTransform="matrix(0.98529211,0,0,1.0090832,-3.0293205,-2.2670529)" y1="49.945" x1="25"/>
+ <linearGradient id="linearGradient3797" y2="0.4976" gradientUnits="userSpaceOnUse" x2="23.749" y1="44.759" x1="23.749">
+ <stop stop-color="#a3a3a3" offset="0"/>
+ <stop stop-color="#bababa" offset="1"/>
+ </linearGradient>
+ <linearGradient id="linearGradient3988" y2="43" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(0.89189189,0,0,1.1351351,2.5945999,-4.7432314)" y1="5.5641" x1="24">
+ <stop stop-color="#FFF" offset="0"/>
+ <stop stop-color="#FFF" stop-opacity="0.23529412" offset="0.036262"/>
+ <stop stop-color="#FFF" stop-opacity="0.15686275" offset="0.95056"/>
+ <stop stop-color="#FFF" stop-opacity="0.39215687" offset="1"/>
+ </linearGradient>
+ <linearGradient id="linearGradient3322" y2="47.013" gradientUnits="userSpaceOnUse" x2="25.132" gradientTransform="matrix(1,0,0,0.9561695,-9.9999999e-8,-1.9149218)" y1="0.98521" x1="25.132">
+ <stop stop-color="#f4f4f4" offset="0"/>
+ <stop stop-color="#dbdbdb" offset="1"/>
+ </linearGradient>
+ <linearGradient id="linearGradient3324" y2="2.9062" gradientUnits="userSpaceOnUse" x2="-51.786" gradientTransform="matrix(0.8074968,0,0,0.8948322,59.410232,-2.9805531)" y1="50.786" x1="-51.786">
+ <stop stop-color="#a0a0a0" offset="0"/>
+ <stop stop-color="#bebebe" offset="1"/>
+ </linearGradient>
+ <radialGradient id="radialGradient3327" xlink:href="#linearGradient5060" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(0.02303995,0,0,0.01470022,26.360882,37.040176)" r="117.14"/>
+ <linearGradient id="linearGradient5060">
+ <stop stop-color="#000" offset="0"/>
+ <stop stop-color="#000" stop-opacity="0" offset="1"/>
+ </linearGradient>
+ <radialGradient id="radialGradient3330" xlink:href="#linearGradient5060" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-0.02303994,0,0,0.01470022,21.62311,37.040176)" r="117.14"/>
+ <linearGradient id="linearGradient4333" y2="609.51" gradientUnits="userSpaceOnUse" x2="302.86" gradientTransform="matrix(0.06732488,0,0,0.01470022,-0.3411391,37.040146)" y1="366.65" x1="302.86">
+ <stop stop-color="#000" stop-opacity="0" offset="0"/>
+ <stop stop-color="#000" offset="0.5"/>
+ <stop stop-color="#000" stop-opacity="0" offset="1"/>
+ </linearGradient>
+ </defs>
+ <metadata>
+ <rdf:RDF>
+ <cc:Work rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+ <dc:title/>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g transform="matrix(0.66666667,0,0,0.66666667,0,0.00184133)">
+ <rect opacity="0.3" fill-rule="nonzero" height="3.5701" width="32.508" y="42.43" x="7.7378" fill="url(#linearGradient4333)"/>
+ <path opacity="0.3" d="m7.7378,42.43v3.5699c-1.1865,0.0067-2.8684-0.79982-2.8684-1.7852,0-0.98533,1.324-1.7847,2.8684-1.7847z" fill-rule="nonzero" fill="url(#radialGradient3330)"/>
+ <path opacity="0.3" d="m40.246,42.43v3.5699c1.1865,0.0067,2.8684-0.79982,2.8684-1.7852,0-0.98533-1.324-1.7847-2.8684-1.7847z" fill-rule="nonzero" fill="url(#radialGradient3327)"/>
+ <path stroke-linejoin="round" d="M6.5,0.4972c8.02,0,35,0.0028,35,0.0028l0.000042,44.003h-35v-44.006z" stroke-dashoffset="0" stroke="url(#linearGradient3324)" stroke-linecap="butt" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="0.99992186" fill="url(#linearGradient3322)"/>
+ <path stroke-linejoin="round" d="m40.5,43.5-33,0,0-42,33,0z" stroke-dashoffset="0" stroke="url(#linearGradient3988)" stroke-linecap="round" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="1" fill="none"/>
+ <path d="m11,21,0,1,2.3438,0,0-1h-2.344zm0,4,0,1,2.75,0,0-1-2.75,0zm0,2,0,1,2.9375,0,0-1h-5.282zm0,2,0,1,2.5312,0,0-1h-4.875zm0,2.1562,0,0.96875,2.2188,0,0-0.96875-2.2188,0zm0.406-10.156v1h2.25v-1h-2.25zm-2.75,2,0,1,1,0,0-1-1,0zm3.1562,2,0,1,1.8438,0,0-1-1.8438,0zm0.125,2,0,1,2.7188,0,0-1-2.7188,0zm-0.34375,2,0,1,2.0625,0,0-1-2.0625,0zm-0.375,2.1562,0,0.96875,2.125,0,0-0.96875-2.125,0zm-2.562,2.844v1h4.2812v-1h-4.281zm0,2,0,1,3.6875,0,0-1h-3.688zm3.9688,0,0,1,1.7812,0,0-1-1.7812,0zm-0.625,2,0,1,3.3438,0,0-1-3.3438,0zm-3.344,0h3.0367v1h-3.037v-1zm3.4062-22,0,1,5.5938,0,0-1-5.5938,0zm0.03125,2,0,1,5.0938,0,0-1-5.0938,0zm1.1875,16,0,1,4.5938,0,0-1-4.5938,0zm4.9375,0,0,1,1.8125,0,0-1-1.8125,0zm2.1562,0,0,1,4.3125,0,0-1-4.3125,0zm4.6562,0,0,1,2.9688,0,0-1-2.9688,0zm3.2812,0,0,1,1.1562,0,0-1-1.1562,0zm1.5,0,0,1,0.6875,0,0-1-0.6875,0zm1,0,0,1,1.8438,0,0-1-1.8438,0zm-16.031,2,0,1,0.8125,0,0-1-0.8125,0zm1.0312,0,0,1,1.625,0,0-1-1.625,0zm1.875,0,0,1,1.625,0,0-1-1.625,0zm2.125,0,0,1,2.5938,0,0-1-2.5938,0zm2.9062,0,0,1,3.375,0,0-1-3.375,0zm3.8438,0,0,1,2.2812,0,0-1-2.2812,0zm2.5625,0,0,1h0.532v-1h-0.531zm-20.468-20v1h3.0625v-1h-3.062zm0,2,0,1,3.0938,0,0-1h-3.094zm0-11,0,1,2.375,0,0-1-2.375,0zm2.6875,0,0,1,2.25,0,0-1-2.25,0zm2.5625,0,0,1,1.9688,0,0-1-1.9688,0zm2.2812,0,0,1,0.875,0,0-1-0.875,0zm1.1875,0,0,1,1.9375,0,0-1-1.9375,0zm2.2812,0,0,1,5,0,0-1-5,0zm-11,2l0.001,1h3.7812v-1h-3.7812zm4.1562,0,0,1,1.8125,0,0-1-1.8125,0zm2.1562,0,0,1,0.84375,0,0-1-0.84375,0zm1.2188,0,0,1,1.625,0,0-1-1.625,0zm2,0,0,1,1.625,0,0-1-1.625,0zm1.9688,0,0,1,2.6562,0,0-1-2.6562,0zm3.0312,0,0,1,3.4688,0,0-1-3.4688,0zm-14.53,2v1h4.1875v-1h-4.188zm4.5,0,0,1,4.5,0,0-1-4.5,0zm-4.5,2,0,1,2.3125,0,0-1h-2.312zm2.625,0,0,1,2.1562,0,0-1-2.1562,0zm2.4688,0,0,1,1.9062,0,0-1-1.9062,0zm3.8125,5,0,1,1.9062,0,0-1-1.9062,0zm2.2188,0,0,1,1.9062,0,0-1-1.9062,0zm2.2188,0,0,1,2.75,0,0-1-2.75,0zm3.0938,0,0,1,0.5625,0,0-1-0.5625,0zm-7.438,7v1h2.3438v-1h-2.344zm2.6562,0,0,1,2.1875,0,0-1-2.1875,0zm2.5,0,0,1h1.844v-1h-1.844zm-5.156,2v1h1.875v-1h-1.875zm2.1875,0,0,1,4.8125,0,0-1-4.8125,0zm5.125,0,0,1,3.6875,0,0-1-3.6875,0zm-7.313,2v1h2.4375v-1h-2.438zm2.7812,0,0,1,4.2812,0,0-1-4.2812,0zm4.5938,0,0,1,2.9375,0,0-1-2.9375,0zm-7.375,2.125v0.96875h1.875v-0.96875h-1.875zm2.1875,0,0,0.96875,1.9062,0,0-0.96875-1.9062,0zm2.2188,0,0,0.96875,2.7188,0,0-0.96875-2.7188,0zm3.0312,0,0,0.96875,0.5625,0,0-0.96875-0.5625,0zm0.875,0,0,0.96875,3.5312,0,0-0.96875-3.5312,0zm-8.375,6.875,0,1,2.4375,0,0-1-2.4375,0zm2.75,0,0,1,2.25,0,0-1-2.25,0zm2.5938,0,0,1,1.9375,0,0-1-1.9375,0zm2.25,0,0,1,3.0938,0,0-1-3.0938,0zm3.4375,0,0,1,5.0312,0,0-1-5.0312,0z" fill="url(#linearGradient3797)"/>
+ <path stroke-linejoin="round" style="color:#000000;enable-background:accumulate;" d="m34.549,33.5-4.4021,0,0-9.6523c-0.000012-1.1924-0.18283-2.0842-0.54845-2.6754-0.35602-0.6011-0.90929-0.90166-1.6598-0.90167-0.56771,0.000013-1.044,0.11826-1.4289,0.35476-0.38489,0.23652-0.69279,0.58634-0.92371,1.0495-0.23094,0.46316-0.39451,1.0347-0.49072,1.7147-0.09623,0.67996-0.14434,1.4584-0.14433,2.3355v7.7751h-4.4021v-23h4.4021l0.02888,8.588c0.47147-0.85731,1.0728-1.4732,1.8041-1.8477,0.73126-0.3843,1.5588-0.57646,2.4825-0.57648,0.79861,0.000017,1.5203,0.11827,2.1649,0.35476,0.65428,0.22666,1.2124,0.58635,1.6742,1.079,0.46184,0.49273,0.81785,1.1234,1.068,1.892,0.25016,0.7588,0.37524,1.6703,0.37526,2.7346v10.776z" fill-rule="nonzero" stroke-dashoffset="0" stroke="url(#linearGradient3401)" stroke-linecap="butt" stroke-miterlimit="4" stroke-width="0.99999994" fill="url(#radialGradient3399)"/>
+ <path stroke-linejoin="round" style="color:#000000;enable-background:accumulate;" d="m11.5,30.987c-0.000001-0.46315,0.06254-0.8524,0.18763-1.1677,0.1347-0.32519,0.31752-0.58633,0.54845-0.78342,0.23092-0.19708,0.50034-0.33997,0.80825-0.42866,0.3079-0.08868,0.63986-0.13303,0.99588-0.13303,0.33676,0.000004,0.65429,0.04435,0.95258,0.13303,0.3079,0.08869,0.57731,0.23158,0.80825,0.42866,0.23092,0.19709,0.41374,0.45823,0.54845,0.78342,0.1347,0.31534,0.20206,0.70459,0.20206,1.1677-0.000007,0.44345-0.06736,0.82284-0.20206,1.1382-0.13471,0.31534-0.31753,0.57648-0.54845,0.78342-0.23093,0.20694-0.50035,0.35476-0.80825,0.44344-0.299,0.1-0.616,0.149-0.953,0.149-0.35602,0-0.68798-0.04927-0.99588-0.14782-0.30791-0.08869-0.57732-0.2365-0.80825-0.44344s-0.41375-0.46808-0.54845-0.78342c-0.12509-0.31534-0.18763-0.69473-0.18763-1.1382" fill-rule="nonzero" stroke-dashoffset="0" stroke="url(#linearGradient3396)" stroke-linecap="butt" stroke-miterlimit="4" stroke-width="0.99999994" fill="url(#radialGradient3394)"/>
+ <path stroke-linejoin="round" opacity="0.5" style="color:#000000;enable-background:accumulate;" d="m18.531,11.75,0,20.719,2.4062,0,0-6.6875c-0.000007-0.91545,0.051-1.7426,0.15625-2.4688,0.11019-0.76037,0.32838-1.4191,0.625-2,0.30993-0.60695,0.75513-1.1031,1.3125-1.4375,0.54784-0.32869,1.2249-0.53123,1.9688-0.53125,1.0265,0.000018,1.9995,0.53062,2.5312,1.375h0.03125c0.0051,0.008-0.005,0.02321,0,0.03125,0.52572,0.84456,0.71874,1.9068,0.71875,3.1875v8.5312h2.4062v-9.6562c-0.000015-0.95546-0.12792-1.7045-0.34375-2.3438a1.0305,1.0305,0,0,1,0,-0.03125c-0.218-0.661-0.505-1.118-0.842-1.469-0.357-0.372-0.809-0.674-1.312-0.844-0.52338-0.18746-1.1259-0.28124-1.8438-0.28125-0.80443,0.000015-1.4868,0.14206-2.0625,0.4375-0.52554,0.26278-0.96905,0.71674-1.375,1.4375a1.0305,1.0305,0,0,1,-0.907,0.53h-0.25a1.0305,1.0305,0,0,1,-1.0312,-1.0938c0.03222-0.47267,0.08842-0.92314,0.125-1.3438,0.02673-0.34755,0.04266-0.73126,0.0625-1.1875,0.01907-0.44831,0.03124-0.89069,0.03125-1.2812v-3.5938h-2.4062z" transform="matrix(1,0,0,1.0135747,2.96875,-0.44075226)" stroke-dashoffset="0" stroke="url(#linearGradient4596-7)" stroke-linecap="butt" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="0.99328101" fill="none"/>
+ <path stroke-linejoin="round" opacity="0.5" style="color:#000000;enable-background:accumulate;" d="m12.5,31c-0.000001-0.27647,0.03714-0.50882,0.11143-0.69706,0.08-0.19412,0.18857-0.35,0.32571-0.46765,0.13714-0.11764,0.29714-0.20294,0.48-0.25588,0.18286-0.05293,0.38-0.07941,0.59143-0.07941,0.2,0.000003,0.38857,0.02647,0.56571,0.07941,0.18285,0.05294,0.34285,0.13824,0.48,0.25588,0.13714,0.11765,0.24571,0.27353,0.32571,0.46765,0.08,0.18824,0.12,0.42059,0.12,0.69706-0.000004,0.26471-0.04001,0.49118-0.12,0.67941-0.08,0.18824-0.18858,0.34412-0.32571,0.46765-0.13715,0.12353-0.29715,0.21176-0.48,0.26471-0.17715,0.05882-0.36572,0.08823-0.56571,0.08823-0.21143,0-0.40857-0.02941-0.59143-0.08823-0.18286-0.05294-0.34286-0.14118-0.48-0.26471-0.137-0.123-0.246-0.279-0.326-0.468-0.074-0.188-0.111-0.414-0.111-0.679" stroke-dashoffset="0" stroke="url(#linearGradient3471)" stroke-linecap="butt" stroke-miterlimit="4" stroke-width="0.99999994" fill="none"/>
+ </g>
+</svg>
diff --git a/core/img/filetypes/text-x-javascript.png b/core/img/filetypes/text-x-javascript.png
new file mode 100644
index 0000000000000000000000000000000000000000..24d09ce978181c4b08b67c879553a75fc3c1e97a
Binary files /dev/null and b/core/img/filetypes/text-x-javascript.png differ
diff --git a/core/img/filetypes/text-x-javascript.svg b/core/img/filetypes/text-x-javascript.svg
new file mode 100644
index 0000000000000000000000000000000000000000..0cc52ce6ba7ccd4cf2c8d1c568f67dd684739845
--- /dev/null
+++ b/core/img/filetypes/text-x-javascript.svg
@@ -0,0 +1,76 @@
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <defs>
+ <linearGradient id="linearGradient4596" y2="34.607" gradientUnits="userSpaceOnUse" x2="29.465" gradientTransform="translate(4.1160985,-1.6069009)" y1="17.607" x1="29.465">
+ <stop stop-color="#FFF" offset="0"/>
+ <stop stop-color="#FFF" stop-opacity="0.23529412" offset="0.17647"/>
+ <stop stop-color="#FFF" stop-opacity="0.15686275" offset="0.82353"/>
+ <stop stop-color="#FFF" stop-opacity="0.39215687" offset="1"/>
+ </linearGradient>
+ <linearGradient id="linearGradient4467-5" y2="41.607" gradientUnits="userSpaceOnUse" x2="13.884" gradientTransform="translate(4.1160985,-1.6069009)" y1="12.607" x1="13.884">
+ <stop stop-color="#FFF" offset="0"/>
+ <stop stop-color="#FFF" stop-opacity="0.23529412" offset="0.036262"/>
+ <stop stop-color="#FFF" stop-opacity="0.15686275" offset="0.82759"/>
+ <stop stop-color="#FFF" stop-opacity="0.39215687" offset="1"/>
+ </linearGradient>
+ <linearGradient id="linearGradient3797" y2="0.4976" gradientUnits="userSpaceOnUse" x2="23.749" y1="44.759" x1="23.749">
+ <stop stop-color="#a3a3a3" offset="0"/>
+ <stop stop-color="#bababa" offset="1"/>
+ </linearGradient>
+ <linearGradient id="linearGradient3988" y2="43" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(0.89189189,0,0,1.1351351,2.5945999,-4.7432314)" y1="5.5641" x1="24">
+ <stop stop-color="#FFF" offset="0"/>
+ <stop stop-color="#FFF" stop-opacity="0.23529412" offset="0.036262"/>
+ <stop stop-color="#FFF" stop-opacity="0.15686275" offset="0.95056"/>
+ <stop stop-color="#FFF" stop-opacity="0.39215687" offset="1"/>
+ </linearGradient>
+ <linearGradient id="linearGradient3322" y2="47.013" gradientUnits="userSpaceOnUse" x2="25.132" gradientTransform="matrix(1,0,0,0.9561695,-9.9999999e-8,-1.9149218)" y1="0.98521" x1="25.132">
+ <stop stop-color="#f4f4f4" offset="0"/>
+ <stop stop-color="#dbdbdb" offset="1"/>
+ </linearGradient>
+ <linearGradient id="linearGradient3324" y2="2.9062" gradientUnits="userSpaceOnUse" x2="-51.786" gradientTransform="matrix(0.8074968,0,0,0.8948322,59.410232,-2.9805531)" y1="50.786" x1="-51.786">
+ <stop stop-color="#a0a0a0" offset="0"/>
+ <stop stop-color="#bebebe" offset="1"/>
+ </linearGradient>
+ <radialGradient id="radialGradient3327" xlink:href="#linearGradient5060" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(0.02303995,0,0,0.01470022,26.360882,37.040176)" r="117.14"/>
+ <linearGradient id="linearGradient5060">
+ <stop stop-color="#000" offset="0"/>
+ <stop stop-color="#000" stop-opacity="0" offset="1"/>
+ </linearGradient>
+ <radialGradient id="radialGradient3330" xlink:href="#linearGradient5060" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-0.02303994,0,0,0.01470022,21.62311,37.040176)" r="117.14"/>
+ <linearGradient id="linearGradient4704" y2="609.51" gradientUnits="userSpaceOnUse" x2="302.86" gradientTransform="matrix(0.06732488,0,0,0.01470022,-0.3411391,37.040146)" y1="366.65" x1="302.86">
+ <stop stop-color="#000" stop-opacity="0" offset="0"/>
+ <stop stop-color="#000" offset="0.5"/>
+ <stop stop-color="#000" stop-opacity="0" offset="1"/>
+ </linearGradient>
+ <radialGradient id="radialGradient3815" fx="8.5513" gradientUnits="userSpaceOnUse" cy="10.244" cx="9.0816" gradientTransform="matrix(0,7.0760926,-7.4527115,0,100.32061,-66.261922)" r="12.672">
+ <stop stop-color="#ffcd7d" offset="0"/>
+ <stop stop-color="#fc8f36" offset="0.26238"/>
+ <stop stop-color="#e23a0e" offset="0.70495"/>
+ <stop stop-color="#ac441f" offset="1"/>
+ </radialGradient>
+ <linearGradient id="linearGradient3817" y2="4.9451" gradientUnits="userSpaceOnUse" x2="25" gradientTransform="translate(2.123909,-1.9451008)" y1="49.945" x1="25">
+ <stop stop-color="#ba3d12" offset="0"/>
+ <stop stop-color="#db6737" offset="1"/>
+ </linearGradient>
+ </defs>
+ <metadata>
+ <rdf:RDF>
+ <cc:Work rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+ <dc:title/>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g transform="scale(0.66666667,0.66666667)">
+ <rect opacity="0.3" fill-rule="nonzero" height="3.5701" width="32.508" y="42.43" x="7.7378" fill="url(#linearGradient4704)"/>
+ <path opacity="0.3" d="m7.7378,42.43v3.5699c-1.1865,0.0067-2.8684-0.79982-2.8684-1.7852,0-0.98533,1.324-1.7847,2.8684-1.7847z" fill-rule="nonzero" fill="url(#radialGradient3330)"/>
+ <path opacity="0.3" d="m40.246,42.43v3.5699c1.1865,0.0067,2.8684-0.79982,2.8684-1.7852,0-0.98533-1.324-1.7847-2.8684-1.7847z" fill-rule="nonzero" fill="url(#radialGradient3327)"/>
+ <path stroke-linejoin="round" d="M6.5,0.4972c8.02,0,35,0.0028,35,0.0028l0.000042,44.003h-35v-44.006z" stroke-dashoffset="0" stroke="url(#linearGradient3324)" stroke-linecap="butt" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="0.99992186" fill="url(#linearGradient3322)"/>
+ <path stroke-linejoin="round" d="m40.5,43.5-33,0,0-42,33,0z" stroke-dashoffset="0" stroke="url(#linearGradient3988)" stroke-linecap="round" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="1" fill="none"/>
+ <path d="m11,21,0,1,2.3438,0,0-1h-2.344zm0,4,0,1,2.75,0,0-1-2.75,0zm0,2,0,1,2.9375,0,0-1h-5.282zm0,2,0,1,2.5312,0,0-1h-4.875zm0,2.1562,0,0.96875,2.2188,0,0-0.96875-2.2188,0zm0.406-10.156v1h2.25v-1h-2.25zm-2.75,2,0,1,1,0,0-1-1,0zm3.1562,2,0,1,1.8438,0,0-1-1.8438,0zm0.125,2,0,1,2.7188,0,0-1-2.7188,0zm-0.34375,2,0,1,2.0625,0,0-1-2.0625,0zm-0.375,2.1562,0,0.96875,2.125,0,0-0.96875-2.125,0zm-2.562,2.844v1h4.2812v-1h-4.281zm0,2,0,1,3.6875,0,0-1h-3.688zm3.9688,0,0,1,1.7812,0,0-1-1.7812,0zm-0.625,2,0,1,3.3438,0,0-1-3.3438,0zm-3.344,0h3.0367v1h-3.037v-1zm3.4062-22,0,1,5.5938,0,0-1-5.5938,0zm0.03125,2,0,1,5.0938,0,0-1-5.0938,0zm1.1875,16,0,1,4.5938,0,0-1-4.5938,0zm4.9375,0,0,1,1.8125,0,0-1-1.8125,0zm2.1562,0,0,1,4.3125,0,0-1-4.3125,0zm4.6562,0,0,1,2.9688,0,0-1-2.9688,0zm3.2812,0,0,1,1.1562,0,0-1-1.1562,0zm1.5,0,0,1,0.6875,0,0-1-0.6875,0zm1,0,0,1,1.8438,0,0-1-1.8438,0zm-16.031,2,0,1,0.8125,0,0-1-0.8125,0zm1.0312,0,0,1,1.625,0,0-1-1.625,0zm1.875,0,0,1,1.625,0,0-1-1.625,0zm2.125,0,0,1,2.5938,0,0-1-2.5938,0zm2.9062,0,0,1,3.375,0,0-1-3.375,0zm3.8438,0,0,1,2.2812,0,0-1-2.2812,0zm2.5625,0,0,1h0.532v-1h-0.531zm-20.468-20v1h3.0625v-1h-3.062zm0,2,0,1,3.0938,0,0-1h-3.094zm0-11,0,1,2.375,0,0-1-2.375,0zm2.6875,0,0,1,2.25,0,0-1-2.25,0zm2.5625,0,0,1,1.9688,0,0-1-1.9688,0zm2.2812,0,0,1,0.875,0,0-1-0.875,0zm1.1875,0,0,1,1.9375,0,0-1-1.9375,0zm2.2812,0,0,1,5,0,0-1-5,0zm-11,2l0.001,1h3.7812v-1h-3.7812zm4.1562,0,0,1,1.8125,0,0-1-1.8125,0zm2.1562,0,0,1,0.84375,0,0-1-0.84375,0zm1.2188,0,0,1,1.625,0,0-1-1.625,0zm2,0,0,1,1.625,0,0-1-1.625,0zm1.9688,0,0,1,2.6562,0,0-1-2.6562,0zm3.0312,0,0,1,3.4688,0,0-1-3.4688,0zm-14.53,2v1h4.1875v-1h-4.188zm4.5,0,0,1,4.5,0,0-1-4.5,0zm-4.5,2,0,1,2.3125,0,0-1h-2.312zm2.625,0,0,1,2.1562,0,0-1-2.1562,0zm2.4688,0,0,1,1.9062,0,0-1-1.9062,0zm3.8125,5,0,1,1.9062,0,0-1-1.9062,0zm2.2188,0,0,1,1.9062,0,0-1-1.9062,0zm2.2188,0,0,1,2.75,0,0-1-2.75,0zm3.0938,0,0,1,0.5625,0,0-1-0.5625,0zm-7.438,7v1h2.3438v-1h-2.344zm2.6562,0,0,1,2.1875,0,0-1-2.1875,0zm2.5,0,0,1h1.844v-1h-1.844zm-5.156,2v1h1.875v-1h-1.875zm2.1875,0,0,1,4.8125,0,0-1-4.8125,0zm5.125,0,0,1,3.6875,0,0-1-3.6875,0zm-7.313,2v1h2.4375v-1h-2.438zm2.7812,0,0,1,4.2812,0,0-1-4.2812,0zm4.5938,0,0,1,2.9375,0,0-1-2.9375,0zm-7.375,2.125v0.96875h1.875v-0.96875h-1.875zm2.1875,0,0,0.96875,1.9062,0,0-0.96875-1.9062,0zm2.2188,0,0,0.96875,2.7188,0,0-0.96875-2.7188,0zm3.0312,0,0,0.96875,0.5625,0,0-0.96875-0.5625,0zm0.875,0,0,0.96875,3.5312,0,0-0.96875-3.5312,0zm-8.375,6.875,0,1,2.4375,0,0-1-2.4375,0zm2.75,0,0,1,2.25,0,0-1-2.25,0zm2.5938,0,0,1,1.9375,0,0-1-1.9375,0zm2.25,0,0,1,3.0938,0,0-1-3.0938,0zm3.4375,0,0,1,5.0312,0,0-1-5.0312,0z" fill="url(#linearGradient3797)"/>
+ <path stroke-linejoin="round" style="color:#000000;" d="m37.105,28.194c-0.000013,0.91667-0.16668,1.7188-0.5,2.4062-0.33335,0.6875-0.8073,1.2604-1.4219,1.7188-0.61459,0.45833-1.3594,0.80208-2.2344,1.0312-0.87501,0.22917-1.8542,0.34375-2.9375,0.34375-0.57292,0-1.1042-0.02083-1.5938-0.0625-0.48959-0.03125-0.95313-0.08854-1.3906-0.17188-0.4375-0.08333-0.85938-0.1875-1.2656-0.3125-0.40625-0.125-0.81771-0.28125-1.2344-0.46875v-3.9375c0.4375,0.21876,0.89583,0.41667,1.375,0.59375,0.48958,0.17709,0.97395,0.33334,1.4531,0.46875,0.47916,0.125,0.9427,0.22396,1.3906,0.29688,0.45833,0.07292,0.8802,0.10938,1.2656,0.10938,0.42708,0.000004,0.79166-0.03646,1.0938-0.10938,0.30208-0.08333,0.54687-0.1927,0.73438-0.32812,0.19791-0.14583,0.33853-0.3125,0.42188-0.5,0.09374-0.19791,0.14062-0.40624,0.14062-0.625-0.000008-0.21874-0.03647-0.41145-0.10938-0.57812-0.06251-0.17708-0.21355-0.35937-0.45312-0.54688-0.23959-0.19791-0.59376-0.41666-1.0625-0.65625-0.45834-0.24999-1.0781-0.55208-1.8594-0.90625-0.76042-0.34374-1.4219-0.68228-1.9844-1.0156-0.55209-0.34374-1.0104-0.72395-1.375-1.1406-0.35417-0.41666-0.61979-0.89061-0.79688-1.4219-0.17708-0.54166-0.26563-1.1823-0.26562-1.9219-0.000001-0.81249,0.15625-1.5208,0.46875-2.125,0.3125-0.61457,0.75521-1.125,1.3281-1.5312,0.57291-0.40623,1.2604-0.70832,2.0625-0.90625,0.8125-0.20832,1.7135-0.31248,2.7031-0.3125,1.0417,0.000018,2.0312,0.11981,2.9688,0.35938,0.93749,0.2396,1.901,0.59898,2.8906,1.0781l-1.4375,3.375c-0.794-0.376-1.549-0.683-2.268-0.923-0.71876-0.23957-1.4375-0.35936-2.1562-0.35938-0.64584,0.000015-1.1146,0.1146-1.4062,0.34375-0.28126,0.22918-0.42188,0.54168-0.42188,0.9375-0.000005,0.20835,0.03645,0.39585,0.10938,0.5625,0.07291,0.15626,0.21874,0.32293,0.4375,0.5,0.21874,0.16668,0.52603,0.35418,0.92188,0.5625,0.39582,0.19793,0.91145,0.44272,1.5469,0.73438,0.73957,0.32293,1.4062,0.64584,2,0.96875,0.59374,0.31251,1.1042,0.67188,1.5312,1.0781,0.42707,0.40626,0.7552,0.88022,0.98438,1.4219,0.22915,0.54167,0.34374,1.1979,0.34375,1.9688m-24.526,11.906c-0.67708-0.000006-1.2708-0.03646-1.7812-0.10938-0.511-0.063-0.9428-0.141-1.297-0.235v-4.0312c0.38542,0.08333,0.79167,0.15625,1.2188,0.21875,0.41667,0.0625,0.875,0.09375,1.375,0.09375,0.47917-0.000002,0.92188-0.05209,1.3281-0.15625,0.41666-0.10417,0.77604-0.28646,1.0781-0.54688,0.3125-0.25,0.55208-0.58854,0.71875-1.0156,0.17708-0.42708,0.26562-0.96354,0.26562-1.6094v-22.172h5.0906v22.016c0,1.3125-0.19272,2.4427-0.57812,3.3906-0.37501,0.94791-0.90626,1.7292-1.5938,2.3438-0.67709,0.625-1.4896,1.0833-2.4375,1.375-0.948,0.29-1.995,0.436-3.141,0.436z" fill-rule="nonzero" stroke-dashoffset="0" stroke="url(#linearGradient3817)" stroke-linecap="butt" stroke-miterlimit="4" stroke-width="1" fill="url(#radialGradient3815)"/>
+ <path opacity="0.5" stroke-linejoin="round" style="enable-background:accumulate;color:#000000;" d="m16.531,11.562,0,21.156c-0.000003,0.74521-0.14604,1.4057-0.375,1.9688h0.03125c-0.0053,0.01356-0.02582,0.01774-0.03125,0.03125-0.21291,0.52977-0.51641,1.033-0.96875,1.4062-0.01075,0.0093-0.02039,0.02213-0.03125,0.03125-0.42364,0.35547-0.94402,0.58756-1.4688,0.71875-0.5068,0.12994-1.0399,0.1875-1.5938,0.1875-0.54293,0-1.0548-0.02228-1.5312-0.09375-0.01053-0.0015-0.02074,0.0016-0.03125,0v1.9375c0.14199,0.02453,0.25,0.04337,0.40625,0.0625a1.0305,1.0305,0,0,1,0.03125,0c0.4327,0.06181,0.93779,0.09374,1.5938,0.09375h0.25c1.0584-0.000006,2.0104-0.14984,2.8438-0.40625,0.8161-0.25111,1.5028-0.60837,2.0625-1.125a1.0305,1.0305,0,0,1,0,-0.03125c0.56066-0.5012,0.98871-1.119,1.3125-1.9375,0.32074-0.78887,0.5-1.7802,0.5-3v-21h-3z" stroke-dashoffset="0" stroke="url(#linearGradient4467-5)" stroke-linecap="butt" stroke-miterlimit="4" stroke-width="1" fill="none"/>
+ <path opacity="0.5" stroke-linejoin="round" style="enable-background:accumulate;color:#000000;" d="m31.062,16.625c-0.91729,0.000017-1.7568,0.09872-2.4688,0.28125-0.6983,0.17232-1.2665,0.42933-1.7188,0.75-0.43783,0.31048-0.75495,0.67432-1,1.1562-0.22591,0.43677-0.34375,0.97587-0.34375,1.6562-0.000001,0.67187,0.0572,1.1952,0.1875,1.5938,0.13076,0.39228,0.3626,0.74863,0.625,1.0625,0.27891,0.31876,0.63321,0.6313,1.125,0.9375,0.54028,0.32018,1.1571,0.64423,1.875,0.96875,0.78022,0.35371,1.4056,0.66564,1.9062,0.9375,0.0091,0.0047,0.02219-0.0047,0.03125,0,0.48031,0.2467,0.86296,0.48708,1.1875,0.75,0.01,0.0081,0.02142,0.02313,0.03125,0.03125,0.29407,0.23569,0.56733,0.5282,0.71875,0.90625,0.0064,0.0161-0.006,0.04609,0,0.0625,0.0023,0.0064,0.02897-0.0065,0.03125,0,0.11318,0.2766,0.18749,0.5805,0.1875,0.9375-0.000015,0.40344-0.11735,0.74498-0.25,1.0312-0.0031,0.0069,0.0032,0.02432,0,0.03125h-0.03125c-0.14902,0.31791-0.36691,0.67002-0.6875,0.90625a1.0305,1.0305,0,0,1,-0.03125,0c-0.37162,0.26839-0.71579,0.37311-1.0625,0.46875a1.0305,1.0305,0,0,1,-0.03125,0c-0.376,0.092-0.832,0.157-1.343,0.157-0.47826,0.000005-0.9298-0.0492-1.4062-0.125-0.45579-0.07419-0.96671-0.17338-1.5-0.3125a1.0305,1.0305,0,0,1,-0.03125,0c-0.50955-0.144-0.9949-0.3173-1.5-0.5v1.6562c0.16564,0.0631,0.33735,0.13746,0.5,0.1875,0.3613,0.11117,0.74977,0.23508,1.1562,0.3125,0.37252,0.07096,0.77865,0.09491,1.25,0.125a1.0305,1.0305,0,0,1,0.03125,0c0.45573,0.03879,0.95205,0.0625,1.5,0.0625,1.0107,0,1.9133-0.10974,2.6875-0.3125,0.77223-0.20225,1.389-0.48131,1.875-0.84375,0.4815-0.35909,0.82413-0.78767,1.0938-1.3438,0.25489-0.52574,0.40624-1.177,0.40625-1.9688-0.000011-0.66872-0.08918-1.1823-0.25-1.5625-0.17948-0.42419-0.42147-0.74998-0.75-1.0625-0.35949-0.34194-0.77277-0.66986-1.2812-0.9375a1.0305,1.0305,0,0,1,-0.03125,0c-0.56267-0.306-1.1894-0.62451-1.9062-0.9375a1.0305,1.0305,0,0,1,-0.03125,0c-0.62352-0.28619-1.1526-0.52942-1.5938-0.75-0.43674-0.22984-0.78885-0.44773-1.0625-0.65625a1.0305,1.0305,0,0,1,-0.03125,0c-0.29046-0.23511-0.54194-0.49605-0.71875-0.875a1.0305,1.0305,0,0,1,0,-0.03125c-0.11448-0.26163-0.21876-0.58868-0.21875-0.96875-0.000008-0.667,0.32053-1.3491,0.8125-1.75a1.0305,1.0305,0,0,1,0.03125,0c0.58219-0.45741,1.2635-0.56248,2.0312-0.5625,0.81828,0.000017,1.6395,0.12985,2.4688,0.40625,0.46119,0.15374,0.94101,0.36068,1.4062,0.5625l0.625-1.4375c-0.604-0.25-1.22-0.541-1.783-0.684-0.838-0.215-1.746-0.313-2.719-0.313z" stroke-dashoffset="0" stroke="url(#linearGradient4596)" stroke-linecap="butt" stroke-miterlimit="4" stroke-width="1" fill="none"/>
+ </g>
+</svg>
diff --git a/core/img/filetypes/text-x-php.png b/core/img/filetypes/text-x-php.png
deleted file mode 100644
index 7868a25945cd5e5cb7daaca9591927511ca65c0f..0000000000000000000000000000000000000000
Binary files a/core/img/filetypes/text-x-php.png and /dev/null differ
diff --git a/core/img/filetypes/text-x-python.png b/core/img/filetypes/text-x-python.png
new file mode 100644
index 0000000000000000000000000000000000000000..57148f4b90d401b26b324d3eaf530f11032b4726
Binary files /dev/null and b/core/img/filetypes/text-x-python.png differ
diff --git a/core/img/filetypes/text-x-python.svg b/core/img/filetypes/text-x-python.svg
new file mode 100644
index 0000000000000000000000000000000000000000..00755e6d0c26cdb96ac77cbc40dcab1d5b4e96b7
--- /dev/null
+++ b/core/img/filetypes/text-x-python.svg
@@ -0,0 +1,87 @@
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32.002" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <defs>
+ <linearGradient id="linearGradient4326" y2="41.607" gradientUnits="userSpaceOnUse" x2="49.884" gradientTransform="translate(-15.883902,-1.6069009)" y1="20.607" x1="49.884">
+ <stop stop-color="#FFF" offset="0"/>
+ <stop stop-color="#FFF" stop-opacity="0.23529412" offset="0.036262"/>
+ <stop stop-color="#FFF" stop-opacity="0.15686275" offset="0.66667"/>
+ <stop stop-color="#FFF" stop-opacity="0.39215687" offset="1"/>
+ </linearGradient>
+ <linearGradient id="linearGradient4352" y2="14.148" gradientUnits="userSpaceOnUse" x2="33.715" gradientTransform="translate(-15.883902,-1.6069009)" y1="26.955" x1="33.715">
+ <stop stop-color="#FFF" offset="0"/>
+ <stop stop-color="#FFF" stop-opacity="0.23529412" offset="0.38322"/>
+ <stop stop-color="#FFF" stop-opacity="0.15686275" offset="0.95056"/>
+ <stop stop-color="#FFF" stop-opacity="0.39215687" offset="1"/>
+ </linearGradient>
+ <linearGradient id="linearGradient4338" y2="35.642" gradientUnits="userSpaceOnUse" x2="29.465" gradientTransform="translate(-15.883902,-1.6069009)" y1="13.12" x1="29.465">
+ <stop stop-color="#FFF" offset="0"/>
+ <stop stop-color="#FFF" stop-opacity="0.23529412" offset="0.2789"/>
+ <stop stop-color="#FFF" stop-opacity="0.15686275" offset="0.95056"/>
+ <stop stop-color="#FFF" stop-opacity="0.39215687" offset="1"/>
+ </linearGradient>
+ <radialGradient id="radialGradient3352" xlink:href="#linearGradient3846-5" gradientUnits="userSpaceOnUse" cy="23.403" cx="9.966" gradientTransform="matrix(0,3.4561718,-4.1186673,0,121.20805,-33.840698)" r="13.931"/>
+ <linearGradient id="linearGradient3846-5">
+ <stop stop-color="#fff3cb" offset="0"/>
+ <stop stop-color="#fdde76" offset="0.26238"/>
+ <stop stop-color="#f9c440" offset="0.66094"/>
+ <stop stop-color="#e48b20" offset="1"/>
+ </linearGradient>
+ <linearGradient id="linearGradient3354" y2="8.4049" xlink:href="#linearGradient3856-6" gradientUnits="userSpaceOnUse" x2="21.483" gradientTransform="matrix(1.6508808,0,0,1.6568311,-9.7968269,-13.801098)" y1="35.376" x1="21.483"/>
+ <linearGradient id="linearGradient3856-6">
+ <stop stop-color="#b67926" offset="0"/>
+ <stop stop-color="#eab41a" offset="1"/>
+ </linearGradient>
+ <linearGradient id="linearGradient3797" y2="0.4976" gradientUnits="userSpaceOnUse" x2="23.749" y1="44.759" x1="23.749">
+ <stop stop-color="#a3a3a3" offset="0"/>
+ <stop stop-color="#bababa" offset="1"/>
+ </linearGradient>
+ <linearGradient id="linearGradient3988" y2="43" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(0.89189189,0,0,1.1351351,2.5945999,-4.7432314)" y1="5.5641" x1="24">
+ <stop stop-color="#FFF" offset="0"/>
+ <stop stop-color="#FFF" stop-opacity="0.23529412" offset="0.036262"/>
+ <stop stop-color="#FFF" stop-opacity="0.15686275" offset="0.95056"/>
+ <stop stop-color="#FFF" stop-opacity="0.39215687" offset="1"/>
+ </linearGradient>
+ <linearGradient id="linearGradient3322" y2="47.013" gradientUnits="userSpaceOnUse" x2="25.132" gradientTransform="matrix(1,0,0,0.9561695,-9.9999999e-8,-1.9149218)" y1="0.98521" x1="25.132">
+ <stop stop-color="#f4f4f4" offset="0"/>
+ <stop stop-color="#dbdbdb" offset="1"/>
+ </linearGradient>
+ <linearGradient id="linearGradient3324" y2="2.9062" gradientUnits="userSpaceOnUse" x2="-51.786" gradientTransform="matrix(0.8074968,0,0,0.8948322,59.410232,-2.9805531)" y1="50.786" x1="-51.786">
+ <stop stop-color="#a0a0a0" offset="0"/>
+ <stop stop-color="#bebebe" offset="1"/>
+ </linearGradient>
+ <radialGradient id="radialGradient3327" xlink:href="#linearGradient5060" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(0.02303995,0,0,0.01470022,26.360882,37.040176)" r="117.14"/>
+ <linearGradient id="linearGradient5060">
+ <stop stop-color="#000" offset="0"/>
+ <stop stop-color="#000" stop-opacity="0" offset="1"/>
+ </linearGradient>
+ <radialGradient id="radialGradient3330" xlink:href="#linearGradient5060" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-0.02303994,0,0,0.01470022,21.62311,37.040176)" r="117.14"/>
+ <linearGradient id="linearGradient4474" y2="609.51" gradientUnits="userSpaceOnUse" x2="302.86" gradientTransform="matrix(0.06732488,0,0,0.01470022,-0.3411391,37.040146)" y1="366.65" x1="302.86">
+ <stop stop-color="#000" stop-opacity="0" offset="0"/>
+ <stop stop-color="#000" offset="0.5"/>
+ <stop stop-color="#000" stop-opacity="0" offset="1"/>
+ </linearGradient>
+ </defs>
+ <metadata>
+ <rdf:RDF>
+ <cc:Work rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+ <dc:title/>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g transform="matrix(0.66666667,0,0,0.66666667,0,0.00184133)">
+ <rect opacity="0.3" fill-rule="nonzero" height="3.5701" width="32.508" y="42.43" x="7.7378" fill="url(#linearGradient4474)"/>
+ <path opacity="0.3" d="m7.7378,42.43v3.5699c-1.1865,0.0067-2.8684-0.79982-2.8684-1.7852,0-0.98533,1.324-1.7847,2.8684-1.7847z" fill-rule="nonzero" fill="url(#radialGradient3330)"/>
+ <path opacity="0.3" d="m40.246,42.43v3.5699c1.1865,0.0067,2.8684-0.79982,2.8684-1.7852,0-0.98533-1.324-1.7847-2.8684-1.7847z" fill-rule="nonzero" fill="url(#radialGradient3327)"/>
+ <path stroke-linejoin="round" d="M6.5,0.4972c8.02,0,35,0.0028,35,0.0028l0.000042,44.003h-35v-44.006z" stroke-dashoffset="0" stroke="url(#linearGradient3324)" stroke-linecap="butt" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="0.99992186" fill="url(#linearGradient3322)"/>
+ <path stroke-linejoin="round" d="m40.5,43.5-33,0,0-42,33,0z" stroke-dashoffset="0" stroke="url(#linearGradient3988)" stroke-linecap="round" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="1" fill="none"/>
+ <path d="m11,21,0,1,2.3438,0,0-1h-2.344zm0,4,0,1,2.75,0,0-1-2.75,0zm0,2,0,1,2.9375,0,0-1h-5.282zm0,2,0,1,2.5312,0,0-1h-4.875zm0,2.1562,0,0.96875,2.2188,0,0-0.96875-2.2188,0zm0.406-10.156v1h2.25v-1h-2.25zm-2.75,2,0,1,1,0,0-1-1,0zm3.1562,2,0,1,1.8438,0,0-1-1.8438,0zm0.125,2,0,1,2.7188,0,0-1-2.7188,0zm-0.34375,2,0,1,2.0625,0,0-1-2.0625,0zm-0.375,2.1562,0,0.96875,2.125,0,0-0.96875-2.125,0zm-2.562,2.844v1h4.2812v-1h-4.281zm0,2,0,1,3.6875,0,0-1h-3.688zm3.9688,0,0,1,1.7812,0,0-1-1.7812,0zm-0.625,2,0,1,3.3438,0,0-1-3.3438,0zm-3.344,0h3.0367v1h-3.037v-1zm3.4062-22,0,1,5.5938,0,0-1-5.5938,0zm0.03125,2,0,1,5.0938,0,0-1-5.0938,0zm1.1875,16,0,1,4.5938,0,0-1-4.5938,0zm4.9375,0,0,1,1.8125,0,0-1-1.8125,0zm2.1562,0,0,1,4.3125,0,0-1-4.3125,0zm4.6562,0,0,1,2.9688,0,0-1-2.9688,0zm3.2812,0,0,1,1.1562,0,0-1-1.1562,0zm1.5,0,0,1,0.6875,0,0-1-0.6875,0zm1,0,0,1,1.8438,0,0-1-1.8438,0zm-16.031,2,0,1,0.8125,0,0-1-0.8125,0zm1.0312,0,0,1,1.625,0,0-1-1.625,0zm1.875,0,0,1,1.625,0,0-1-1.625,0zm2.125,0,0,1,2.5938,0,0-1-2.5938,0zm2.9062,0,0,1,3.375,0,0-1-3.375,0zm3.8438,0,0,1,2.2812,0,0-1-2.2812,0zm2.5625,0,0,1h0.532v-1h-0.531zm-20.468-20v1h3.0625v-1h-3.062zm0,2,0,1,3.0938,0,0-1h-3.094zm0-11,0,1,2.375,0,0-1-2.375,0zm2.6875,0,0,1,2.25,0,0-1-2.25,0zm2.5625,0,0,1,1.9688,0,0-1-1.9688,0zm2.2812,0,0,1,0.875,0,0-1-0.875,0zm1.1875,0,0,1,1.9375,0,0-1-1.9375,0zm2.2812,0,0,1,5,0,0-1-5,0zm-11,2l0.001,1h3.7812v-1h-3.7812zm4.1562,0,0,1,1.8125,0,0-1-1.8125,0zm2.1562,0,0,1,0.84375,0,0-1-0.84375,0zm1.2188,0,0,1,1.625,0,0-1-1.625,0zm2,0,0,1,1.625,0,0-1-1.625,0zm1.9688,0,0,1,2.6562,0,0-1-2.6562,0zm3.0312,0,0,1,3.4688,0,0-1-3.4688,0zm-14.53,2v1h4.1875v-1h-4.188zm4.5,0,0,1,4.5,0,0-1-4.5,0zm-4.5,2,0,1,2.3125,0,0-1h-2.312zm2.625,0,0,1,2.1562,0,0-1-2.1562,0zm2.4688,0,0,1,1.9062,0,0-1-1.9062,0zm3.8125,5,0,1,1.9062,0,0-1-1.9062,0zm2.2188,0,0,1,1.9062,0,0-1-1.9062,0zm2.2188,0,0,1,2.75,0,0-1-2.75,0zm3.0938,0,0,1,0.5625,0,0-1-0.5625,0zm-7.438,7v1h2.3438v-1h-2.344zm2.6562,0,0,1,2.1875,0,0-1-2.1875,0zm2.5,0,0,1h1.844v-1h-1.844zm-5.156,2v1h1.875v-1h-1.875zm2.1875,0,0,1,4.8125,0,0-1-4.8125,0zm5.125,0,0,1,3.6875,0,0-1-3.6875,0zm-7.313,2v1h2.4375v-1h-2.438zm2.7812,0,0,1,4.2812,0,0-1-4.2812,0zm4.5938,0,0,1,2.9375,0,0-1-2.9375,0zm-7.375,2.125v0.96875h1.875v-0.96875h-1.875zm2.1875,0,0,0.96875,1.9062,0,0-0.96875-1.9062,0zm2.2188,0,0,0.96875,2.7188,0,0-0.96875-2.7188,0zm3.0312,0,0,0.96875,0.5625,0,0-0.96875-0.5625,0zm0.875,0,0,0.96875,3.5312,0,0-0.96875-3.5312,0zm-8.375,6.875,0,1,2.4375,0,0-1-2.4375,0zm2.75,0,0,1,2.25,0,0-1-2.25,0zm2.5938,0,0,1,1.9375,0,0-1-1.9375,0zm2.25,0,0,1,3.0938,0,0-1-3.0938,0zm3.4375,0,0,1,5.0312,0,0-1-5.0312,0z" fill="url(#linearGradient3797)"/>
+ <g stroke-linejoin="round" style="color:#000000;letter-spacing:0px;word-spacing:0px;enable-background:accumulate;" font-weight="bold" font-family="Droid Sans" fill-rule="nonzero" line-height="125%" stroke-dashoffset="0" font-size="32px" font-style="normal" stroke="url(#linearGradient3354)" stroke-linecap="butt" stroke-miterlimit="4" font-stretch="normal" font-variant="normal" stroke-width="0.9922713" fill="url(#radialGradient3352)">
+ <path d="m25.746,18.293,4.5664,0,2.4609,8.5996,0.60156,2.2695c0.03645-0.2552,0.07747-0.51497,0.12305-0.7793,0.04556-0.26432,0.09569-0.52408,0.15039-0.7793,0.06379-0.26432,0.1276-0.5013,0.19141-0.71094l2.4062-8.5996h4.5938l-6.043,17.24c-0.56511,1.6133-1.3353,2.8118-2.3105,3.5957-0.97527,0.78385-2.1966,1.1758-3.6641,1.1758-0.47396-0.000006-0.88412-0.02735-1.2305-0.08203-0.34636-0.04558-0.64258-0.09571-0.88867-0.15039v-3.3086c0.1914,0.04557,0.43294,0.08658,0.72461,0.12305,0.29166,0.03646,0.597,0.05468,0.91602,0.05469,0.4375-0.000003,0.81119-0.05925,1.1211-0.17773,0.30989-0.11849,0.57421-0.28711,0.79297-0.50586,0.22786-0.20964,0.41927-0.46484,0.57422-0.76562,0.16406-0.30078,0.30533-0.63802,0.42383-1.0117l0.25977-0.76562-5.7695-15.422m-11.406,3.1914,0.95312,0c1.3646,0.000012,2.3906-0.27082,3.0781-0.8125,0.6979-0.54165,1.0469-1.4219,1.0469-2.6406-0.000013-1.1354-0.31251-1.9739-0.9375-2.5156-0.6146-0.54165-1.5833-0.81248-2.9062-0.8125h-1.2344v6.7812m9.9844-3.625c-0.000018,1-0.15106,1.9583-0.45312,2.875-0.3021,0.91668-0.8021,1.724-1.5,2.4219-0.68752,0.69793-1.599,1.2552-2.7344,1.6719-1.125,0.41668-2.5208,0.62501-4.1875,0.625h-1.1094v8.125h-4.8438v-22.844h6.3438c1.4687,0.000023,2.7344,0.16669,3.7969,0.5,1.0729,0.32294,1.9531,0.79169,2.6406,1.4062,0.6979,0.60419,1.2135,1.349,1.5469,2.2344,0.33332,0.87502,0.49998,1.8698,0.5,2.9844" stroke="url(#linearGradient3354)" fill="url(#radialGradient3352)"/>
+ </g>
+ <path stroke-linejoin="round" opacity="0.8" style="color:#000000;enable-background:accumulate;" d="m10.469,11.719,0,20.875,2.9062,0,0-7.1562a0.97158,0.97158,0,0,1,0.96875,-0.96875h1.0938c1.5857,0.000008,2.8653-0.20009,3.8438-0.5625,1.0403-0.38177,1.8488-0.8716,2.4062-1.4375,0.60221-0.60221,0.9956-1.2593,1.25-2.0312,0.26608-0.80746,0.40623-1.6502,0.40625-2.5625-0.000016-1.0177-0.1544-1.913-0.4375-2.6562-0.28511-0.75726-0.68346-1.3533-1.25-1.8438a0.97158,0.97158,0,0,1,-0.031,-0.03c-0.5457-0.48779-1.2973-0.86009-2.2812-1.1562-0.94313-0.29586-2.1047-0.46873-3.5-0.46875h-5.375z" stroke-dashoffset="0" stroke="url(#linearGradient4338)" stroke-linecap="butt" stroke-miterlimit="4" stroke-width="1" fill="none"/>
+ <path stroke-linejoin="round" opacity="0.8" style="color:#000000;enable-background:accumulate;" d="m14.188,13.719a0.97158,0.97158,0,0,1,0.15625,0h1.2188c1.444,0.000021,2.6588,0.30588,3.5312,1.0625,0.0069,0.006,0.02437-0.0061,0.03125,0l-0.03125,0.03125c0.8717,0.76818,1.2812,1.915,1.2812,3.2188-0.000015,1.3862-0.43158,2.6369-1.4062,3.4062h-0.03125c-0.93629,0.7268-2.1746,1.0313-3.6562,1.0312h-0.9375a0.97158,0.97158,0,0,1,-0.969,-0.969v-6.8125a0.97158,0.97158,0,0,1,0.8125,-0.96875z" stroke-dashoffset="0" stroke="url(#linearGradient4352)" stroke-linecap="butt" stroke-miterlimit="4" stroke-width="1" fill="none"/>
+ <path stroke-linejoin="round" opacity="0.8" style="color:#000000;enable-background:accumulate;" d="m27.156,19.25,5.2812,14.125c0.08288,0.21909,0.08288,0.46841,0,0.6875l-0.25,0.6875-0.03125,0.0625c-0.11452,0.35874-0.24034,0.75454-0.4375,1.125-0.0067,0.01252-0.02443,0.01874-0.03125,0.03125-0.21274,0.39778-0.48826,0.72429-0.75,0.96875-0.01011,0.01011-0.02099,0.02128-0.03125,0.03125-0.30722,0.29848-0.68482,0.53114-1.0938,0.6875-0.43825,0.16756-0.9291,0.25-1.4688,0.25-0.23646-0.000002-0.44385-0.01211-0.65625-0.03125v1.375c0.01198,0.0016,0.01908-0.0016,0.03125,0,0.01042-0.000168,0.02083-0.000168,0.03125,0,0.30338,0.0479,0.64191,0.09374,1.0625,0.09375,1.2893-0.000006,2.3062-0.33575,3.0938-0.96875,0.79412-0.63827,1.4766-1.6621,2-3.1562l5.594-15.969h-2.5l-2.2188,7.9062c0.000168,0.01042,0.000168,0.02083,0,0.03125-0.05961,0.19584-0.12825,0.37949-0.1875,0.625-0.05465,0.25498-0.08383,0.47993-0.125,0.71875-0.04289,0.24875-0.09138,0.48621-0.125,0.71875-0.0011,0.0099,0.001,0.02129,0,0.03125l-1.0312,1.5625c-0.488-0.552-0.84-1.577-1.188-2.313-0.058-0.485-0.153-0.926-0.281-1.343l-2.282-7.938z" stroke-dashoffset="0" stroke="url(#linearGradient4326)" stroke-linecap="butt" stroke-miterlimit="4" stroke-width="1" fill="none"/>
+ </g>
+</svg>
diff --git a/core/img/filetypes/text.png b/core/img/filetypes/text.png
index 813f712f726c935f9adf8d2f2dd0d7683791ef11..6b069c82c119a5bc115cd657b9752215b8cd1044 100644
Binary files a/core/img/filetypes/text.png and b/core/img/filetypes/text.png differ
diff --git a/core/img/filetypes/text.svg b/core/img/filetypes/text.svg
new file mode 100644
index 0000000000000000000000000000000000000000..69a1bcd98c3305fec018e5565d917db2e0ff3669
--- /dev/null
+++ b/core/img/filetypes/text.svg
@@ -0,0 +1,43 @@
+<?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="32px" width="32px" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <defs>
+ <linearGradient id="e" y2="3.3639" gradientUnits="userSpaceOnUse" x2="22.004" gradientTransform="matrix(.66858 0 0 .67037 -.67962 -2.3083)" y1="47.813" x1="22.004">
+ <stop stop-color="#aaa" offset="0"/>
+ <stop stop-color="#c8c8c8" offset="1"/>
+ </linearGradient>
+ <linearGradient id="g" y2="43" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(.56757 0 0 .72973 2.3784 -2.5135)" y1="5.5641" x1="24">
+ <stop stop-color="#fff" offset="0"/>
+ <stop stop-color="#fff" stop-opacity=".23529" offset=".036262"/>
+ <stop stop-color="#fff" stop-opacity=".15686" offset=".95056"/>
+ <stop stop-color="#fff" stop-opacity=".39216" offset="1"/>
+ </linearGradient>
+ <linearGradient id="f" y2="47.013" gradientUnits="userSpaceOnUse" x2="25.132" gradientTransform="matrix(.65714 0 0 .63012 .22856 -1.0896)" y1=".98521" x1="25.132">
+ <stop stop-color="#f4f4f4" offset="0"/>
+ <stop stop-color="#dbdbdb" offset="1"/>
+ </linearGradient>
+ <radialGradient id="c" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(.015663 0 0 .0082353 17.61 25.981)" r="117.14"/>
+ <linearGradient id="a">
+ <stop offset="0"/>
+ <stop stop-opacity="0" offset="1"/>
+ </linearGradient>
+ <radialGradient id="b" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-.015663 0 0 .0082353 14.39 25.981)" r="117.14"/>
+ <linearGradient id="d" y2="609.51" gradientUnits="userSpaceOnUse" y1="366.65" gradientTransform="matrix(.045769 0 0 .0082353 -.54232 25.981)" x2="302.86" x1="302.86">
+ <stop stop-opacity="0" offset="0"/>
+ <stop offset=".5"/>
+ <stop stop-opacity="0" offset="1"/>
+ </linearGradient>
+ </defs>
+ <g>
+ <g>
+ <rect opacity=".15" height="2" width="22.1" y="29" x="4.95" fill="url(#d)"/>
+ <path opacity=".15" d="m4.95 29v1.9999c-0.80662 0.0038-1.95-0.44807-1.95-1.0001 0-0.552 0.90012-0.99982 1.95-0.99982z" fill="url(#b)"/>
+ <path opacity=".15" d="m27.05 29v1.9999c0.80661 0.0038 1.95-0.44807 1.95-1.0001 0-0.552-0.90012-0.99982-1.95-0.99982z" fill="url(#c)"/>
+ </g>
+ <path d="m4.5 0.49996c5.2705 0 23 0.00185 23 0.00185l0.000028 28.998h-23v-29z" fill="url(#f)"/>
+ </g>
+ <g fill="none">
+ <path stroke-linejoin="round" d="m26.5 28.5h-21v-27h21z" stroke="url(#g)" stroke-linecap="round"/>
+ <path opacity=".3" stroke-linejoin="round" d="m4.5 0.49996c5.2705 0 23 0.00185 23 0.00185l0.000028 28.998h-23v-29z" stroke="#000" stroke-width=".99992"/>
+ <path d="m8 5.5677h1.567zm1.7968 0h1.4625zm1.6924 0h1.2954zm1.5043 0h0.56412zm0.79394 0h1.2536zm1.5043 0h3.3011zm3.5101 0h2.5281zm2.737 0h0.77305zm-13.539 1.9218h2.0684zm2.2774 0h3.3847zm3.5936 0h1.6506zm1.8595 0h1.5461zm1.755 0h1.3163zm1.5252 0 2.0684 0.020955zm2.2565 0.020955h3.3638zm-13.266 1.9895h2.8624zm3.0922 0h3.0922zm3.3011 0h1.2327zm1.4416 0h2.9042zm3.0922 0h1.9849zm2.2147 0h0.79394zm1.0029 0h0.43876zm0.66858 0h1.2327zm-14.813 2h1.0656zm1.3998 0h3.9488zm-1.3998 3h2.6325zm2.8415 0h2.8206zm3.0295 0h1.0864zm1.2954 0h2.6534zm2.8624 0h3.3429zm3.5727 0h1.2327zm-13.602 2h2.8624zm3.0922 0h3.0922zm3.3011 0h1.2327zm1.4416 0h2.9042zm3.0922 0h1.9849zm2.2147 0h0.79394zm1.0029 0h0.43876zm0.66858 0h1.2327zm-14.813 2h2.4445zm2.7161 0h1.17zm1.379 0h0.58501zm0.81484 0h1.0656zm1.2954 0h1.0864zm1.2954 0h1.7341zm1.964 0h2.2565zm2.4654 0h1.5043zm1.7132 0h0.37608zm-13.643 2.9895h2.0684zm2.2774 0h3.3847zm3.5936 0h1.6506zm1.8595 0h1.5461zm1.755 0h1.3163zm1.5252 0 2.0684 0.02095zm2.2565 0.02095h3.3638zm-13.266 1.989h2.5908zm2.8206 0h0.81484zm1.0238 0h1.8595zm2.0684 0h2.737zm2.9668 0h1.8595zm2.0475 0h0.39697zm0.6059 0h2.3609zm2.6117 0h1.2327zm-14.145 2h2.5908zm2.8206 0h1.17zm1.379 0h1.8386zm2.0475 0h1.9849zm2.2147 0h0.79394zm1.0029 0h0.43876zm0.66858 0h1.2327z" stroke="url(#e)" stroke-width="1px"/>
+ </g>
+</svg>
diff --git a/core/img/filetypes/video.png b/core/img/filetypes/video.png
index b0ce7bb198a3b268bd634d2b26e9b710f3797d37..045754df26fa90c64237a817fe5a151b1aa18ab7 100644
Binary files a/core/img/filetypes/video.png and b/core/img/filetypes/video.png differ
diff --git a/core/img/filetypes/video.svg b/core/img/filetypes/video.svg
new file mode 100644
index 0000000000000000000000000000000000000000..67691369ac9e5e4f49303395da82eb4e900cf2f7
--- /dev/null
+++ b/core/img/filetypes/video.svg
@@ -0,0 +1,85 @@
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <defs>
+ <radialGradient id="radialGradient4384" xlink:href="#linearGradient5747" gradientUnits="userSpaceOnUse" cy="43.5" cx="4.993" gradientTransform="matrix(1.6030273,0,0,0.59999988,541.99052,860.76219)" r="2.5"/>
+ <linearGradient id="linearGradient5747">
+ <stop stop-color="#000" offset="0"/>
+ <stop stop-color="#000" stop-opacity="0" offset="1"/>
+ </linearGradient>
+ <radialGradient id="radialGradient4386" xlink:href="#linearGradient5747" gradientUnits="userSpaceOnUse" cy="43.5" cx="4.993" gradientTransform="matrix(1.6030273,0,0,0.59999988,-535.0095,-912.96218)" r="2.5"/>
+ <linearGradient id="linearGradient4388" y2="39.999" xlink:href="#linearGradient5747" spreadMethod="reflect" gradientUnits="userSpaceOnUse" x2="25.058" gradientTransform="matrix(0.82142859,0,0,0.42857134,518.78572,868.21933)" y1="43.544" x1="25.058"/>
+ <radialGradient id="radialGradient4390" gradientUnits="userSpaceOnUse" cy="8.4498" cx="7.4957" gradientTransform="matrix(-0.00959868,1.5579153,-1.486926,-0.02419163,551.13616,849.77731)" r="20">
+ <stop stop-color="#f8b17e" offset="0"/>
+ <stop stop-color="#e35d4f" offset="0.26238"/>
+ <stop stop-color="#c6262e" offset="0.66094"/>
+ <stop stop-color="#690b54" offset="1"/>
+ </radialGradient>
+ <linearGradient id="linearGradient4392" y2="860.36" xlink:href="#linearGradient3173" gradientUnits="userSpaceOnUse" x2="547" y1="887.36" x1="547"/>
+ <linearGradient id="linearGradient3173" y2="3.899" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(2.641026,0,0,2.641026,0.6153903,-60.384616)" y1="44" x1="24">
+ <stop stop-color="#791235" offset="0"/>
+ <stop stop-color="#bf1d09" offset="1"/>
+ </linearGradient>
+ <linearGradient id="linearGradient4394" y2="43" xlink:href="#linearGradient3128" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(0.37837838,0,0,0.64864865,529.41891,858.29461)" y1="5" x1="24"/>
+ <linearGradient id="linearGradient3128" y2="43" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(2.7297298,0,0,2.7297298,-1.5135111,-62.513486)" y1="5.3301" x1="24">
+ <stop stop-color="#FFF" offset="0"/>
+ <stop stop-color="#FFF" stop-opacity="0.23529412" offset="0.029825"/>
+ <stop stop-color="#FFF" stop-opacity="0.15686275" offset="0.96141"/>
+ <stop stop-color="#FFF" stop-opacity="0.39215687" offset="1"/>
+ </linearGradient>
+ <linearGradient id="linearGradient4396" y2="43" xlink:href="#linearGradient3128" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(0.10810808,0,0,0.64864865,524.90556,858.29461)" y1="5" x1="24"/>
+ <linearGradient id="linearGradient4398" y2="812.36" xlink:href="#linearGradient5761" gradientUnits="userSpaceOnUse" x2="532" gradientTransform="matrix(0.79999998,0,0,0.79999998,-1306.0622,-122.38971)" y1="812.36" x1="526"/>
+ <linearGradient id="linearGradient5761">
+ <stop stop-color="#FFF" offset="0"/>
+ <stop stop-color="#FFF" stop-opacity="0" offset="1"/>
+ </linearGradient>
+ <linearGradient id="linearGradient4400" y2="812.36" xlink:href="#linearGradient5761" gradientUnits="userSpaceOnUse" x2="532" gradientTransform="matrix(0.79999998,0,0,0.79999998,-1300.0622,-122.38971)" y1="812.36" x1="526"/>
+ <linearGradient id="linearGradient4402" y2="812.36" xlink:href="#linearGradient5761" gradientUnits="userSpaceOnUse" x2="532" gradientTransform="matrix(0.79999998,0,0,0.79999998,-1294.0622,-122.38971)" y1="812.36" x1="526"/>
+ <linearGradient id="linearGradient4404" y2="812.36" xlink:href="#linearGradient5761" gradientUnits="userSpaceOnUse" x2="532" gradientTransform="matrix(0.79999998,0,0,0.79999998,-1288.0622,-122.38971)" y1="812.36" x1="526"/>
+ <linearGradient id="linearGradient4406" y2="43" xlink:href="#linearGradient3128" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(-0.10810808,0,0,0.64864865,552.09444,858.29461)" y1="5" x1="24"/>
+ <linearGradient id="linearGradient4408" y2="812.36" xlink:href="#linearGradient5761" gradientUnits="userSpaceOnUse" x2="532" gradientTransform="matrix(0.79999998,0,0,0.79999998,-1306.0622,-1199.3897)" y1="812.36" x1="526"/>
+ <linearGradient id="linearGradient4410" y2="812.36" xlink:href="#linearGradient5761" gradientUnits="userSpaceOnUse" x2="532" gradientTransform="matrix(0.79999998,0,0,0.79999998,-1300.0622,-1199.3897)" y1="812.36" x1="526"/>
+ <linearGradient id="linearGradient4412" y2="812.36" xlink:href="#linearGradient5761" gradientUnits="userSpaceOnUse" x2="532" gradientTransform="matrix(0.79999998,0,0,0.79999998,-1294.0622,-1199.3897)" y1="812.36" x1="526"/>
+ <linearGradient id="linearGradient4414" y2="812.36" xlink:href="#linearGradient5761" gradientUnits="userSpaceOnUse" x2="532" gradientTransform="matrix(0.79999998,0,0,0.79999998,-1288.0622,-1199.3897)" y1="812.36" x1="526"/>
+ <linearGradient id="linearGradient4417" y2="448.3" xlink:href="#linearGradient3173" gradientUnits="userSpaceOnUse" x2="598.77" y1="475.7" x1="598.77"/>
+ </defs>
+ <metadata>
+ <rdf:RDF>
+ <cc:Work rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+ <dc:title/>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g transform="translate(0,-1020.3622)">
+ <g transform="translate(-523,163.00004)">
+ <rect opacity="0.4" height="3" width="4" y="885.36" x="550" fill="url(#radialGradient4384)"/>
+ <rect opacity="0.4" transform="scale(-1,-1)" height="3" width="4" y="-888.36" x="-527" fill="url(#radialGradient4386)"/>
+ <rect opacity="0.4" height="3" width="23" y="885.36" x="527" fill="url(#linearGradient4388)"/>
+ <rect stroke-linejoin="round" style="enable-background:accumulate;color:#000000;" stroke-dasharray="none" fill-rule="nonzero" stroke-dashoffset="0" height="26" width="16" stroke="url(#linearGradient4392)" stroke-linecap="round" stroke-miterlimit="4" y="860.86" x="530.5" stroke-width="1" fill="url(#radialGradient4390)"/>
+ <rect opacity="0.5" stroke-linejoin="round" stroke-dasharray="none" stroke-dashoffset="0" height="24" width="14" stroke="url(#linearGradient4394)" stroke-linecap="round" stroke-miterlimit="4" y="861.86" x="531.5" stroke-width="1" fill="none"/>
+ <path stroke-linejoin="miter" style="enable-background:accumulate;color:#000000;" d="m525.5,860.86c-0.554,0-1,0.446-1,1v24c0,0.554,0.446,1,1,1h2,2,1v-1-2-20-2-1h-1-2-2zm1,3,1,0,1,0,0,2-2,0,0-2zm0,6,2,0,0,2-2,0,0-2zm0,6,2,0,0,2-2,0,0-2zm0,6,2,0,0,2-1,0-1,0,0-2z" fill-opacity="0.78431373" fill-rule="nonzero" stroke-dashoffset="0" stroke="#000" stroke-linecap="round" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="0.99999994" fill="#000"/>
+ <path opacity="0.3" stroke-linejoin="miter" d="m525.5,861.86,0,24,1,0,3,0,0-3,0-18,0-3-3,0-1,0z" stroke-dashoffset="0" stroke="url(#linearGradient4396)" stroke-linecap="round" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="1" fill="none"/>
+ <rect opacity="0.12" stroke-linejoin="round" stroke-dasharray="none" transform="matrix(0,-1,1,0,0,0)" stroke-dashoffset="0" rx="1" ry="1" height="4" width="4" stroke="url(#linearGradient4398)" stroke-linecap="butt" stroke-miterlimit="4" y="525.5" x="-884.86" stroke-width="1" fill="none"/>
+ <rect opacity="0.12" stroke-linejoin="round" stroke-dasharray="none" transform="matrix(0,-1,1,0,0,0)" stroke-dashoffset="0" rx="1" ry="1" height="4" width="4" stroke="url(#linearGradient4400)" stroke-linecap="butt" stroke-miterlimit="4" y="525.5" x="-878.86" stroke-width="1" fill="none"/>
+ <rect opacity="0.12" stroke-linejoin="round" stroke-dasharray="none" transform="matrix(0,-1,1,0,0,0)" stroke-dashoffset="0" rx="1" ry="1" height="4" width="4" stroke="url(#linearGradient4402)" stroke-linecap="butt" stroke-miterlimit="4" y="525.5" x="-872.86" stroke-width="1" fill="none"/>
+ <rect opacity="0.12" stroke-linejoin="round" stroke-dasharray="none" transform="matrix(0,-1,1,0,0,0)" stroke-dashoffset="0" rx="1" ry="1" height="4" width="4" stroke="url(#linearGradient4404)" stroke-linecap="butt" stroke-miterlimit="4" y="525.5" x="-866.86" stroke-width="1" fill="none"/>
+ <rect opacity="0.4" fill-rule="evenodd" rx="1" ry="1" height="3" width="3" y="863.36" x="526" fill="#000"/>
+ <rect opacity="0.4" fill-rule="evenodd" rx="1" ry="1" height="3" width="3" y="869.36" x="526" fill="#000"/>
+ <rect opacity="0.4" fill-rule="evenodd" rx="1" ry="1" height="3" width="3" y="875.36" x="526" fill="#000"/>
+ <rect opacity="0.4" fill-rule="evenodd" rx="1" ry="1" height="3" width="3" y="881.36" x="526" fill="#000"/>
+ <path stroke-linejoin="miter" style="enable-background:accumulate;color:#000000;" d="m551.5,860.86c0.554,0,1,0.446,1,1v24c0,0.554-0.446,1-1,1h-2-2-1v-1-2-20-2-1h1,2,2zm-1,3-1,0-1,0,0,2,2,0,0-2zm0,6-2,0,0,2,2,0,0-2zm0,6-2,0,0,2,2,0,0-2zm0,6-2,0,0,2,1,0,1,0,0-2z" fill-opacity="0.78431373" fill-rule="nonzero" stroke-dashoffset="0" stroke="#000" stroke-linecap="round" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="0.99999994" fill="#000"/>
+ <path opacity="0.3" stroke-linejoin="miter" d="m551.5,861.86,0,24-1,0-3,0,0-3,0-18,0-3,3,0,1,0z" stroke-dashoffset="0" stroke="url(#linearGradient4406)" stroke-linecap="round" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="1" fill="none"/>
+ <rect opacity="0.12" stroke-linejoin="round" stroke-dasharray="none" transform="matrix(0,-1,-1,0,0,0)" stroke-dashoffset="0" rx="1" ry="1" height="4" width="4" stroke="url(#linearGradient4408)" stroke-linecap="butt" stroke-miterlimit="4" y="-551.5" x="-884.86" stroke-width="1" fill="none"/>
+ <rect opacity="0.12" stroke-linejoin="round" stroke-dasharray="none" transform="matrix(0,-1,-1,0,0,0)" stroke-dashoffset="0" rx="1" ry="1" height="4" width="4" stroke="url(#linearGradient4410)" stroke-linecap="butt" stroke-miterlimit="4" y="-551.5" x="-878.86" stroke-width="1" fill="none"/>
+ <rect opacity="0.12" stroke-linejoin="round" stroke-dasharray="none" transform="matrix(0,-1,-1,0,0,0)" stroke-dashoffset="0" rx="1" ry="1" height="4" width="4" stroke="url(#linearGradient4412)" stroke-linecap="butt" stroke-miterlimit="4" y="-551.5" x="-872.86" stroke-width="1" fill="none"/>
+ <rect opacity="0.12" stroke-linejoin="round" stroke-dasharray="none" transform="matrix(0,-1,-1,0,0,0)" stroke-dashoffset="0" rx="1" ry="1" height="4" width="4" stroke="url(#linearGradient4414)" stroke-linecap="butt" stroke-miterlimit="4" y="-551.5" x="-866.86" stroke-width="1" fill="none"/>
+ <rect opacity="0.4" transform="scale(-1,1)" fill-rule="evenodd" rx="1" ry="1" height="3" width="3" y="863.36" x="-551" fill="#000"/>
+ <rect opacity="0.4" transform="scale(-1,1)" fill-rule="evenodd" rx="1" ry="1" height="3" width="3" y="869.36" x="-551" fill="#000"/>
+ <rect opacity="0.4" transform="scale(-1,1)" fill-rule="evenodd" rx="1" ry="1" height="3" width="3" y="875.36" x="-551" fill="#000"/>
+ <rect opacity="0.4" transform="scale(-1,1)" fill-rule="evenodd" rx="1" ry="1" height="3" width="3" y="881.36" x="-551" fill="#000"/>
+ <path opacity="0.31999996" stroke-linejoin="round" d="m599.62,474.79,0-25.573l22.14,12.78z" fill-rule="evenodd" transform="matrix(0.45152364,0,0,0.43013404,262.75848,675.64025)" stroke="url(#linearGradient4417)" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="2.26912189" fill="url(#linearGradient4417)"/>
+ <path stroke-linejoin="round" d="m599.62,474.79,0-25.573l22.14,12.78z" fill-rule="evenodd" transform="matrix(0.36121892,0,0,0.35192785,317.90678,710.77151)" stroke="#FFF" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="2.80470967" fill="#fafafa"/>
+ </g>
+ </g>
+</svg>
diff --git a/core/img/filetypes/web.png b/core/img/filetypes/web.png
new file mode 100644
index 0000000000000000000000000000000000000000..c380231264555a13531b8fc6b1ed9d5c1f533a4e
Binary files /dev/null and b/core/img/filetypes/web.png differ
diff --git a/core/img/filetypes/web.svg b/core/img/filetypes/web.svg
new file mode 100644
index 0000000000000000000000000000000000000000..67775a2233b6b2786c383e7e6430e570013d34c6
--- /dev/null
+++ b/core/img/filetypes/web.svg
@@ -0,0 +1,45 @@
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <metadata>
+ <rdf:RDF>
+ <cc:Work rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+ <dc:title/>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs>
+ <radialGradient id="radialGradient2418" gradientUnits="userSpaceOnUse" cy="24.149" cx="17.814" gradientTransform="matrix(-2.643979,0,2.93653e-8,2.534421,78.72514,-37.986139)" r="9.125">
+ <stop stop-color="#FFF" offset="0"/>
+ <stop stop-color="#b6b6b6" offset="1"/>
+ </radialGradient>
+ <linearGradient id="linearGradient3036" y2="-1.4615" gradientUnits="userSpaceOnUse" x2="62.2" gradientTransform="matrix(1.4102489,0,0,1.4102168,-71.718053,20.951038)" y1="-12.489" x1="62.2">
+ <stop stop-color="#FFF" offset="0"/>
+ <stop stop-color="#FFF" stop-opacity="0" offset="1"/>
+ </linearGradient>
+ <radialGradient id="radialGradient3040" gradientUnits="userSpaceOnUse" cy="-8.7256" cx="61.24" gradientTransform="matrix(0,2.3489394,-2.3489382,0,-4.4959784,-137.19908)" r="9.7553">
+ <stop stop-color="#51cfee" offset="0"/>
+ <stop stop-color="#49a3d2" offset="0.26238"/>
+ <stop stop-color="#3470b4" offset="0.70495"/>
+ <stop stop-color="#273567" offset="1"/>
+ </radialGradient>
+ <linearGradient id="linearGradient3042" y2="2.6887" gradientUnits="userSpaceOnUse" x2="20" gradientTransform="matrix(0.65334267,0,0,0.65332778,0.05996007,0.58024139)" y1="43" x1="20">
+ <stop stop-color="#254b6d" offset="0"/>
+ <stop stop-color="#415b73" offset="0.5"/>
+ <stop stop-color="#6195b5" offset="1"/>
+ </linearGradient>
+ <radialGradient id="radialGradient3045" gradientUnits="userSpaceOnUse" cy="4.625" cx="62.625" gradientTransform="matrix(1.4431373,0,0,0.58310714,-74.376473,23.107603)" r="10.625">
+ <stop stop-color="#000" offset="0"/>
+ <stop stop-color="#000" stop-opacity="0" offset="1"/>
+ </radialGradient>
+ </defs>
+ <path opacity="0.4" d="m31.333,25.804a15.333,6.1955,0,0,1,-30.667,0,15.333,6.1955,0,1,1,30.667,0z" fill-rule="evenodd" fill="url(#radialGradient3045)"/>
+ <path d="M29,15.999c0,7.18-5.821,13.001-13,13.001-7.1793,0-13-5.821-13-13.001,0-7.179,5.8207-12.999,13-12.999,7.179,0,13,5.8199,13,12.999z" fill-rule="nonzero" stroke="url(#linearGradient3042)" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="0.66666669" fill="url(#radialGradient3040)"/>
+ <path opacity="0.4" d="M16.219,3.4688l-1.563,0.1874-1.75,0.4688c0.148-0.0517,0.316-0.1067,0.469-0.1562l-0.219-0.3438-0.656,0.0938-0.344,0.3124-0.531,0.0938-0.469,0.2188-0.218,0.0937-0.063,0.0937-0.344,0.0626-0.219,0.4374-0.25-0.5312-0.0932,0.2188,0.0312,0.5937-0.4062,0.375-0.25,0.6563h0.5l0.2182-0.4376,0.063-0.1562c0.228-0.1612,0.456-0.3448,0.687-0.5l0.532,0.1875c0.08,0.055,0.169,0.101,0.25,0.1563l-1.532,0.3124,0.5,0.375h0.126c-1.3646,1.3155-3.5724,3.8488-4.1255,8.2808,0.024,0.113,0.4375,0.782,0.4375,0.782l1,0.562,0.9688,0.282,0.4374,0.531,0.6558,0.5,0.376-0.094,0.281,0.156v0.094l-0.375,1-0.282,0.437,0.094,0.188-0.2498,0.812,0.8438,1.532,0.844,0.75,0.406,0.531-0.062,1.125,0.281,0.656-0.281,1.219c-0.005,0.013-0.019,0.032,0,0.094,0.036,0.123,1.5,0.944,1.593,0.875,0.093-0.071,0.188-0.125,0.188-0.125l-0.094-0.281,0.375-0.344,0.156-0.375,0.594-0.219,0.469-1.156-0.125-0.344,0.312-0.469,0.719-0.187,0.375-0.844-0.094-1.062,0.563-0.782,0.093-0.812c-0.771-0.384-1.546-0.793-2.312-1.188l-0.375-0.718-0.687-0.157-0.407-1.031-0.906,0.125-0.813-0.594-0.843,0.75v0.094c-0.256-0.074-0.585-0.079-0.8128-0.219l-0.1562-0.531v-0.594l-0.5938,0.063c0.0471-0.374,0.1089-0.752,0.1563-1.125h-0.3437l-0.3438,0.437-0.3125,0.156-0.4687-0.281-0.0313-0.562,0.0937-0.657,0.6876-0.531h0.5624l0.125-0.312,0.6876,0.156,0.5002,0.656,0.093-1.093,0.907-0.719,0.312-0.813,0.688-0.25,0.343-0.562,0.876-0.1565,0.406-0.625h-1.282l0.813-0.375h0.563l0.718-0.25,0.156,0.6875,0.313-0.5-0.375-0.25,0.094-0.2812-0.282-0.2813-0.312-0.0625,0.062-0.3438-0.218-0.4687-0.156,0.0625,0.468-0.7188c0.759-0.2351,1.44-0.4872,2.156-0.8124l-0.062,0.3124,0.375,0.25,0.625-0.4374-0.312-0.3438-0.438,0.2188-0.125-0.0313c0.031-0.0142,0.063-0.0168,0.094-0.0313l0.625-1.625-1.375-0.5624zm-3.563,0.7812l-0.344,0.3125,0.876,0.5937,0.593-0.1874-0.406,0.2812h-0.063l0.219,0.1562v0.4688l-0.469,0.5,0.126,0.25-0.5,0.875,0.031,0.3125-0.5,0.2187-0.313,0.6876-0.156-0.6563-0.875-0.3437-0.156-0.5,1.187-0.6876,0.438-0.4062c0.019,0.0129,0.043,0.0183,0.062,0.0312l0.5-0.4687-0.437-0.1875v-0.0312l-0.063-0.0313-0.062,0.0313-0.032-0.0313,0.063-0.0313-0.094-0.0312-0.219-0.4688-1-0.125-0.031-0.0937,0.438,0.0625,0.25-0.25,0.531-0.0938c0.128-0.0622,0.277-0.1055,0.406-0.1562zm-0.281,1.1562l0.031,0.0313,0.906-0.1875-0.124-0.0938-0.813,0.25zm11.687,0l-0.25,0.1563v0.3437l-0.937,0.5938,0.187,0.875,0.532-0.375,0.344,0.375,0.374,0.2188,0.25-0.6563-0.124-0.375,0.124-0.2813,0.282-0.25c-0.251-0.2223-0.515-0.4216-0.782-0.625zm-12.437,0.25l-0.063,0.1876s-0.398,0.0687-0.5,0.0937c-0.019,0.018-0.042,0.0438-0.062,0.0625v-0.1562l0.625-0.1876zm13.5,0.625l-0.031,0.0626v0.5c0.162-0.0442,0.335-0.0728,0.5-0.0938-0.154-0.159-0.308-0.3175-0.469-0.4688zm-3.687,0.0626v0.3437l0.218,0.25v0.5313l-0.125,0.7187,0.594-0.125,0.406-0.4063-0.375-0.375c-0.124-0.3308-0.251-0.6201-0.406-0.9374h-0.312zm4.218,0.4687l-0.5,0.375-0.062,0.25-0.719,0.625-0.719-0.1875v-0.4375l-0.344,0.2187,0.157,0.4063h-0.531l-0.313,0.5-0.344,0.4063-0.656,0.125,0.375,0.375,0.094,0.375h-0.469l-0.625,0.3442v1h0.281l0.281,0.281,0.594-0.281,0.219-0.594,0.469-0.282,0.094-0.218,0.718-0.1878,0.406,0.4378,0.407,0.25-0.25,0.468,0.406-0.093,0.187-0.5-0.5-0.5628h0.219l0.5,0.4058,0.063,0.532,0.437,0.5,0.125-0.719,0.219-0.125c0.239,0.249,0.423,0.563,0.625,0.844l0.75,0.031,0.406,0.281-0.187,0.282-0.438,0.406h-0.625l-0.812-0.282-0.438,0.063-0.312,0.344-0.906-0.907-0.626-0.187-0.937,0.125-0.813,0.219c-0.462,0.524-0.937,1.049-1.374,1.593l-0.5,1.282,0.25,0.281-0.469,0.625,0.5,1.156c0.412,0.467,0.838,0.94,1.25,1.406l0.593-0.531,0.25,0.313,0.657-0.406,0.219,0.25h0.656l0.375,0.406-0.219,0.781,0.469,0.531-0.031,0.875,0.343,0.657-0.25,0.562c-0.024,0.404-0.062,0.815-0.062,1.219,0.198,0.547,0.406,1.073,0.593,1.625l0.126,0.875v0.469h0.218c0.885-0.838,1.651-1.794,2.282-2.844,0.482-0.804,0.881-1.661,1.187-2.563v-0.656l0.437-0.937c0.179-0.869,0.282-1.768,0.282-2.688,0-3.561-1.408-6.7926-3.688-9.1875zm-4.718,0.25l-0.344,0.125,0.094,0.6563,0.468-0.25-0.218-0.5313zm6.593,5.9375l0.531,0.625,0.657,1.406,0.406,0.438-0.187,0.469,0.343,0.437c-0.165,0.011-0.33,0.031-0.5,0.031-0.308-0.649-0.546-1.32-0.781-2l-0.406-0.437-0.219-0.813,0.156-0.156z" fill-rule="nonzero" fill="#000"/>
+ <path opacity="0.4" d="m28.333,15.999c0,6.812-5.5222,12.334-12.333,12.334-6.8111,0-12.333-5.5221-12.333-12.334-0.0003-6.811,5.5216-12.332,12.333-12.332,6.8107,0,12.333,5.5215,12.333,12.333z" stroke="url(#linearGradient3036)" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="0.66666704" fill="none"/>
+ <g transform="matrix(0.66660406,-0.00913426,0.00913426,0.66660406,-0.1924644,0.35723586)" stroke-dashoffset="0" stroke-linecap="butt" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="1">
+ <path stroke-linejoin="round" d="m30.5,20.937,17,16.5-7.75,0.25s3.25,6.75,3.25,6.75c1,3-3.5,4.125-4.25,1.875,0,0-3-6.75-3-6.75l-5.5,5.875,0.25-24.5z" fill-rule="evenodd" stroke="#666" fill="url(#radialGradient2418)"/>
+ <path opacity="0.4" stroke-linejoin="miter" d="m31.657,23.379,13.476,13.186-6.9219,0.27746s3.8721,7.7566,3.8721,7.7566c0.40273,1.6501-2.0283,2.4126-2.5071,1.1529,0,0-3.6831-7.845-3.6831-7.845l-4.4247,4.7083,0.18907-19.236z" stroke="#FFF" fill="none"/>
+ </g>
+</svg>
diff --git a/core/img/filetypes/x-.png b/core/img/filetypes/x-.png
deleted file mode 100644
index 8443c23eb944cf8ef49c9d13cd496502f46f1885..0000000000000000000000000000000000000000
Binary files a/core/img/filetypes/x-.png and /dev/null differ
diff --git a/core/img/filetypes/x-office-document.png b/core/img/filetypes/x-office-document.png
new file mode 100644
index 0000000000000000000000000000000000000000..fcd28e9a292f84e04b7ae031755b3b9823aabf64
Binary files /dev/null and b/core/img/filetypes/x-office-document.png differ
diff --git a/core/img/filetypes/x-office-document.svg b/core/img/filetypes/x-office-document.svg
new file mode 100644
index 0000000000000000000000000000000000000000..fc51a3a1b70291f286f4aae9413b85afecd81049
--- /dev/null
+++ b/core/img/filetypes/x-office-document.svg
@@ -0,0 +1,60 @@
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32px" width="32px" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <defs>
+ <linearGradient id="linearGradient3128" y2="43" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(0.66891894,0,0,0.72972973,1.8209495,-2.513506)" y1="5.5641" x1="24">
+ <stop stop-color="#FFF" offset="0"/>
+ <stop stop-color="#FFF" stop-opacity="0.23529412" offset="0.036262"/>
+ <stop stop-color="#FFF" stop-opacity="0.15686275" offset="0.95056"/>
+ <stop stop-color="#FFF" stop-opacity="0.39215687" offset="1"/>
+ </linearGradient>
+ <radialGradient id="radialGradient3134" fx="7.2758" gradientUnits="userSpaceOnUse" cy="9.9571" cx="7.8061" gradientTransform="matrix(-1.1778817e-7,4.3521887,-5.895642,-1.3064099e-7,75.941947,-39.43508)" r="12.672">
+ <stop stop-color="#90dbec" offset="0"/>
+ <stop stop-color="#55c1ec" offset="0.26238"/>
+ <stop stop-color="#3689e6" offset="0.70495"/>
+ <stop stop-color="#2b63a0" offset="1"/>
+ </radialGradient>
+ <linearGradient id="linearGradient3071" y2="6.0421" gradientUnits="userSpaceOnUse" y1="36.042" gradientTransform="translate(-2.9820961,-6.0420673)" x2="21.982" x1="21.982">
+ <stop stop-color="#AAA" offset="0"/>
+ <stop stop-color="#c8c8c8" offset="1"/>
+ </linearGradient>
+ <linearGradient id="linearGradient3119" y2="43" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(0.56756757,0,0,0.72972971,2.378382,-2.5135063)" y1="5.5641" x1="24">
+ <stop stop-color="#FFF" offset="0"/>
+ <stop stop-color="#FFF" stop-opacity="0.23529412" offset="0.036262"/>
+ <stop stop-color="#FFF" stop-opacity="0.15686275" offset="0.95056"/>
+ <stop stop-color="#FFF" stop-opacity="0.39215687" offset="1"/>
+ </linearGradient>
+ <linearGradient id="linearGradient3122" y2="47.013" gradientUnits="userSpaceOnUse" x2="25.132" gradientTransform="matrix(0.65714319,0,0,0.63012397,0.228556,-1.0896478)" y1="0.98521" x1="25.132">
+ <stop stop-color="#f4f4f4" offset="0"/>
+ <stop stop-color="#dbdbdb" offset="1"/>
+ </linearGradient>
+ <radialGradient id="radialGradient3045" xlink:href="#linearGradient5060" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(0.01566318,0,0,0.00823529,17.610433,25.980565)" r="117.14"/>
+ <linearGradient id="linearGradient5060">
+ <stop stop-color="#000" offset="0"/>
+ <stop stop-color="#000" stop-opacity="0" offset="1"/>
+ </linearGradient>
+ <radialGradient id="radialGradient3048" xlink:href="#linearGradient5060" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-0.01566318,0,0,0.00823529,14.389566,25.980565)" r="117.14"/>
+ <linearGradient id="linearGradient3936" y2="609.51" gradientUnits="userSpaceOnUse" y1="366.65" gradientTransform="matrix(0.04576928,0,0,0.00823529,-0.5423243,25.980548)" x2="302.86" x1="302.86">
+ <stop stop-color="#000" stop-opacity="0" offset="0"/>
+ <stop stop-color="#000" offset="0.5"/>
+ <stop stop-color="#000" stop-opacity="0" offset="1"/>
+ </linearGradient>
+ </defs>
+ <metadata>
+ <rdf:RDF>
+ <cc:Work rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+ <dc:title/>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <rect opacity="0.15" fill-rule="nonzero" height="2" width="22.1" y="29" x="4.95" fill="url(#linearGradient3936)"/>
+ <path opacity="0.15" d="m4.95,29v1.9999c-0.80662,0.0038-1.95-0.44807-1.95-1.0001,0-0.552,0.90012-0.99982,1.95-0.99982z" fill-rule="nonzero" fill="url(#radialGradient3048)"/>
+ <path opacity="0.15" d="m27.05,29v1.9999c0.80661,0.0038,1.95-0.44807,1.95-1.0001,0-0.552-0.90012-0.99982-1.95-0.99982z" fill-rule="nonzero" fill="url(#radialGradient3045)"/>
+ <path d="m4.5,0.49996c5.2705,0,23,0.00185,23,0.00185l0.000028,28.998h-23v-29z" fill="url(#linearGradient3122)"/>
+ <path stroke-linejoin="round" d="m26.5,28.5-21,0,0-27,21,0z" stroke-dashoffset="0" stroke="url(#linearGradient3119)" stroke-linecap="round" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="0.99999994" fill="none"/>
+ <path stroke-linejoin="miter" d="m11,5.505,1.3436,0zm1.6874,0,2.1875,0zm2.5312,0,1.9375,0zm2.25,0,0.84375,0zm1.1875,0,1.875,0zm2.25,0,3.0938,0zm-9.9061,2,2.6561,0zm3.0624,0,1.75,0zm2.0625,0,0.875,0zm1.2188,0,1.5938,0zm1.9375,0,1.625,0zm1.9375,0,2.5938,0zm-10.219,1.995,3.2811,0zm3.6249,0,4.625,0zm4.9375,0,1.8438,0zm-9.906,2h1.5938zm1.0936,0,5.9062,0zm-1.0936,3.0372,2.0936,0zm2.4061,0,5.0625,0zm5.375,0,2.4688,0zm2.7812,0,2.3125,0zm-10.562,1.963h1.3436zm1.6874,0,2.1562,0zm2.5312,0,1.9375,0zm2.25,0,0.84375,0zm1.1875,0,1.875,0zm2.25,0,3.0938,0zm-9.9061,2.0753,3.2811,0zm3.6249,0,4.625,0zm4.9375,0,1.8438,0zm-8.562,2.925h2.0936zm2.4061,0,5.0625,0zm5.375,0,2.4688,0zm-7.7811,2,2.8749,0zm3.2186,0,1.2188,0zm1.5312,0,2.7812,0zm3.0938,0,4.0938,0zm-7.8436,2,2.8749,0zm3.2186,0,1.75,0zm2.0625,0,2.75,0zm3.0625,0,2.9688,0z" stroke="url(#linearGradient3071)" stroke-linecap="butt" stroke-width="1px" fill="none"/>
+ <path style="enable-background:accumulate;color:#000000;" d="m8.0261,29.5h-3.3605c-0.31067-0.34338-0.074432-1.0251-0.14825-1.5112v-27.322l0.043327-0.11794,0.10492-0.048698h3.3084" fill-rule="nonzero" fill="url(#radialGradient3134)"/>
+ <path opacity="0.5" stroke-linejoin="round" d="m8.5,28.5-3,0,0-27,3,0" stroke-dashoffset="0" stroke="url(#linearGradient3128)" stroke-linecap="butt" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="0.99999994" fill="none"/>
+ <path opacity="0.3" stroke-linejoin="round" d="m4.5,0.49996c5.2705,0,23,0.00185,23,0.00185l0.000028,28.998h-23v-29z" stroke-dashoffset="0" stroke="#000" stroke-linecap="butt" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="0.99992186" fill="none"/>
+</svg>
diff --git a/core/img/filetypes/x-office-presentation.png b/core/img/filetypes/x-office-presentation.png
new file mode 100644
index 0000000000000000000000000000000000000000..7ee552ba7c80dd6f285a4acd5b4a2cba62c140a9
Binary files /dev/null and b/core/img/filetypes/x-office-presentation.png differ
diff --git a/core/img/filetypes/x-office-presentation.svg b/core/img/filetypes/x-office-presentation.svg
new file mode 100644
index 0000000000000000000000000000000000000000..821798d50fdac40fc08e567e0d75260ec62cd1b9
--- /dev/null
+++ b/core/img/filetypes/x-office-presentation.svg
@@ -0,0 +1,109 @@
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <defs>
+ <linearGradient id="linearGradient5060">
+ <stop stop-color="#000" offset="0"/>
+ <stop stop-color="#000" stop-opacity="0" offset="1"/>
+ </linearGradient>
+ <linearGradient id="linearGradient3012" y2="43" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(0.72972916,0,0,0.56756756,-1.5145621,3.3783836)" y1="3.5542" x1="24">
+ <stop stop-color="#FFF" offset="0"/>
+ <stop stop-color="#FFF" stop-opacity="0.23529412" offset="0.11257"/>
+ <stop stop-color="#FFF" stop-opacity="0.15686275" offset="0.95056"/>
+ <stop stop-color="#FFF" stop-opacity="0.39215687" offset="1"/>
+ </linearGradient>
+ <linearGradient id="linearGradient3015" y2="47.013" gradientUnits="userSpaceOnUse" x2="25.132" gradientTransform="matrix(0.82857173,0,0,0.49975339,-3.8857226,4.2392369)" y1="0.98521" x1="25.132">
+ <stop stop-color="#f4f4f4" offset="0"/>
+ <stop stop-color="#dbdbdb" offset="1"/>
+ </linearGradient>
+ <linearGradient id="linearGradient3017" y2="2.9062" gradientUnits="userSpaceOnUse" x2="-51.786" gradientTransform="matrix(0.66906899,0,0,0.46769474,45.339917,3.6822722)" y1="50.786" x1="-51.786">
+ <stop stop-color="#a0a0a0" offset="0"/>
+ <stop stop-color="#bebebe" offset="1"/>
+ </linearGradient>
+ <radialGradient id="radialGradient3020" xlink:href="#linearGradient5060" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(0.01927775,0,0,0.0082353,17.982069,24.980564)" r="117.14"/>
+ <radialGradient id="radialGradient3023" xlink:href="#linearGradient5060" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-0.01927775,0,0,0.0082353,14.01793,24.980564)" r="117.14"/>
+ <linearGradient id="linearGradient3026" y2="609.51" gradientUnits="userSpaceOnUse" x2="302.86" gradientTransform="matrix(0.05633135,0,0,0.0082353,-4.3597632,24.980547)" y1="366.65" x1="302.86">
+ <stop stop-color="#000" stop-opacity="0" offset="0"/>
+ <stop stop-color="#000" offset="0.5"/>
+ <stop stop-color="#000" stop-opacity="0" offset="1"/>
+ </linearGradient>
+ <linearGradient id="linearGradient3076" y2="43" gradientUnits="userSpaceOnUse" y1="5.5641" gradientTransform="matrix(0.66891892,0,0,0.56756756,-1.17905,3.378385)" x2="24" x1="24">
+ <stop stop-color="#FFF" offset="0"/>
+ <stop stop-color="#FFF" stop-opacity="0.23529412" offset="0.036262"/>
+ <stop stop-color="#FFF" stop-opacity="0.15686275" offset="0.95056"/>
+ <stop stop-color="#FFF" stop-opacity="0.39215687" offset="1"/>
+ </linearGradient>
+ <radialGradient id="radialGradient3192" gradientUnits="userSpaceOnUse" fx="7.2758" cx="7.8061" cy="9.9571" r="12.672" gradientTransform="matrix(-1.3251168e-7,3.451736,-6.6325968,-1.0361182e-7,81.872186,-26.172651)">
+ <stop stop-color="#f9c590" offset="0"/>
+ <stop stop-color="#f19860" offset="0.39698"/>
+ <stop stop-color="#ce5d36" offset="1"/>
+ </radialGradient>
+ <linearGradient id="linearGradient3194" y2="0.91791" gradientUnits="userSpaceOnUse" y1="47.935" gradientTransform="matrix(0.81962722,0,0,0.52284254,-3.8315518,5.2357996)" x2="25" x1="25">
+ <stop stop-color="#71171c" offset="0"/>
+ <stop stop-color="#ed8137" offset="1"/>
+ </linearGradient>
+ <clipPath id="clipPath3877">
+ <path style="enable-background:accumulate;color:#000000;" fill-rule="nonzero" fill="#FFF" d="m10.751-0.72642,19.105,0.025195,0,10.481-19.105-0.025202z"/>
+ </clipPath>
+ <linearGradient id="linearGradient3514" y2="25.647" gradientUnits="userSpaceOnUse" x2="22.004" gradientTransform="matrix(1.3394176,0,0,-1.9826305,-11.198083,94.86293)" y1="63.218" x1="22.004">
+ <stop stop-color="#AAA" offset="0"/>
+ <stop stop-color="#c8c8c8" offset="1"/>
+ </linearGradient>
+ <linearGradient id="linearGradient3550" y2="37.546" gradientUnits="userSpaceOnUse" x2="25.132" gradientTransform="matrix(1.081295,0,0,0.62485417,-6.1734925,-3.6471464)" y1="15.285" x1="25.132">
+ <stop stop-color="#f4f4f4" offset="0"/>
+ <stop stop-color="#dbdbdb" offset="1"/>
+ </linearGradient>
+ <linearGradient id="linearGradient3552" y2="17.555" gradientUnits="userSpaceOnUse" x2="-51.786" gradientTransform="matrix(0.87314224,0,0,0.58477041,58.066492,-4.3435334)" y1="41.798" x1="-51.786">
+ <stop stop-color="#AAA" offset="0"/>
+ <stop stop-color="#c8c8c8" offset="1"/>
+ </linearGradient>
+ <linearGradient id="linearGradient3554" y2="35.721" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(1.0820661,0,0,0.61449222,-5.6480107,-2.535845)" y1="14.203" x1="24">
+ <stop stop-color="#FFF" offset="0"/>
+ <stop stop-color="#FFF" stop-opacity="0" offset="1"/>
+ </linearGradient>
+ <linearGradient id="linearGradient3556" y2="37.546" gradientUnits="userSpaceOnUse" x2="25.132" gradientTransform="matrix(1,0,0,0.9561695,-0.49905668,-2.9300489)" y1="15.285" x1="25.132">
+ <stop stop-color="#f4f4f4" offset="0"/>
+ <stop stop-color="#dbdbdb" offset="1"/>
+ </linearGradient>
+ <linearGradient id="linearGradient3558" y2="17.555" gradientUnits="userSpaceOnUse" x2="-51.786" gradientTransform="matrix(0.8074968,0,0,0.8948322,58.911175,-3.9956799)" y1="41.798" x1="-51.786">
+ <stop stop-color="#AAA" offset="0"/>
+ <stop stop-color="#c8c8c8" offset="1"/>
+ </linearGradient>
+ <linearGradient id="linearGradient3560" y2="35.721" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(1.0351164,0,0,0.9866216,-0.70291674,-2.1699512)" y1="14.203" x1="24">
+ <stop stop-color="#FFF" offset="0"/>
+ <stop stop-color="#FFF" stop-opacity="0" offset="1"/>
+ </linearGradient>
+ </defs>
+ <metadata>
+ <rdf:RDF>
+ <cc:Work rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+ <dc:title/>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <rect opacity="0.15" fill-rule="nonzero" height="2" width="27.2" y="28" x="2.4" fill="url(#linearGradient3026)"/>
+ <path opacity="0.15" d="m2.4,28v1.9999c-0.9928,0.004-2.4-0.448-2.4-1s1.1078-1,2.4-1z" fill-rule="nonzero" fill="url(#radialGradient3023)"/>
+ <path opacity="0.15" d="m29.6,28v1.9999c0.99276,0.0038,2.4-0.44808,2.4-1.0001,0-0.552-1.1078-0.99982-2.4-0.99982z" fill-rule="nonzero" fill="url(#radialGradient3020)"/>
+ <g stroke-linejoin="round" opacity="0.5" clip-path="url(#clipPath3877)" stroke-dashoffset="0" transform="matrix(1.6122259,0,0,1.1260917,-16.324081,-7.0128768)" stroke-linecap="butt" stroke-miterlimit="4">
+ <path style="enable-background:accumulate;color:#000000;" d="m13.531,7.5891,13.037,0,0,24.901-13.037,0z" fill-rule="nonzero" stroke="url(#linearGradient3558)" stroke-width="0.74210644" fill="url(#linearGradient3556)"/>
+ <path opacity="0.6" style="enable-background:accumulate;color:#000000;" d="m14.31,9.4115,11.413,0,0,22.194-11.413,0z" stroke="url(#linearGradient3560)" stroke-width="0.74210638" fill="none"/>
+ </g>
+ <g stroke-linejoin="round" stroke-dashoffset="0" transform="translate(0,1)" stroke-linecap="butt" stroke-miterlimit="4" stroke-width="0.9999218">
+ <path opacity="0.75" style="enable-background:accumulate;color:#000000;" d="m3.5,2.5,25,0.037621,0,16.962-24.859,0z" fill-rule="nonzero" stroke="url(#linearGradient3552)" fill="url(#linearGradient3550)"/>
+ <path opacity="0.45" style="enable-background:accumulate;color:#000000;" d="m4.5,3.5,23,0.016517-0.11298,14.984-22.701,0z" stroke="url(#linearGradient3554)" fill="none"/>
+ </g>
+ <path stroke-linejoin="round" d="m1.5,5.5c6.6454,0,29,0.00149,29,0.00149l0.000036,22.999h-29v-23z" stroke-dashoffset="0" stroke="url(#linearGradient3017)" stroke-linecap="butt" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="0.9999218" fill="url(#linearGradient3015)"/>
+ <path stroke-linejoin="miter" d="m29.5,27.5-27,0,0-21h27z" stroke-dashoffset="0" stroke="url(#linearGradient3012)" stroke-linecap="round" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="0.99999994" fill="none"/>
+ <path stroke-linejoin="round" style="enable-background:accumulate;color:#000000;" d="m6,28.5h-4.3138c-0.3495-0.27233-0.083736-0.81302-0.16678-1.1986v-21.669l0.048743-0.093529,0.11803-0.038626h4.2551" fill-rule="nonzero" stroke-dashoffset="0" stroke="url(#linearGradient3194)" stroke-linecap="butt" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="1" fill="url(#radialGradient3192)"/>
+ <path opacity="0.5" stroke-linejoin="round" d="m5.5,27.5-3,0,0-21,3,0" stroke-dashoffset="0" stroke="url(#linearGradient3076)" stroke-linecap="round" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="0.99999994" fill="none"/>
+ <path stroke-linejoin="miter" d="m11,8.5,4,0" stroke="#AAA" stroke-linecap="butt" stroke-width="1px" fill="none"/>
+ <path stroke-linejoin="miter" d="m16,8.5,2,0" stroke="#AAA" stroke-linecap="butt" stroke-width="1px" fill="none"/>
+ <path stroke-linejoin="miter" d="m19,8.5,1,0" stroke="#AAA" stroke-linecap="butt" stroke-width="1px" fill="none"/>
+ <path stroke-linejoin="miter" d="m21,8.5,2,0" stroke="#AAA" stroke-linecap="butt" stroke-width="1px" fill="none"/>
+ <g transform="matrix(1.1415362,0,0,1.1415362,-13.519352,-19.587007)" fill-rule="nonzero">
+ <path opacity="0.4" style="enable-background:accumulate;color:#000000;" d="m34.75,25.813a3.8795,3.8795,0,1,1,-2.0522,-3.4222l-1.8273,3.4222z" transform="matrix(1.57008,0,0,1.57008,-16.477866,-6.8527053)" fill="#FFF"/>
+ <path opacity="0.15" style="enable-background:accumulate;color:#000000;" d="m34.75,25.813a3.8795,3.8795,0,1,1,-2.0522,-3.4222l-1.8273,3.4222z" transform="matrix(1.57008,0,0,1.57008,-16.477866,-7.6014805)" fill="#000"/>
+ </g>
+ <path style="baseline-shift:baseline;block-progression:tb;color:#000000;direction:ltr;text-indent:0;text-align:start;enable-background:accumulate;text-transform:none;" fill="url(#linearGradient3514)" d="m7.1562,25,0-1,2.2188,0,0,1zm2.6562,0,0-1,6.3438,0,0,1zm-2.6562-4,0-1,2.9688,0,0,1zm3.7188,0,0-1,2.3438,0,0,1zm2.9375,0,0-1,1.1875,0,0,1zm-6.6562-4,0-1,3.2812,0,0,1zm3.875,0,0-1,1.6562,0,0,1zm2.2188,0,0-1,1.75,0,0,1zm-6.0938-4,0-1,3.2812,0,0,1zm3.9062,0,0-1,2.3438,0,0,1z"/>
+</svg>
diff --git a/core/img/filetypes/x-office-spreadsheet.png b/core/img/filetypes/x-office-spreadsheet.png
new file mode 100644
index 0000000000000000000000000000000000000000..dfdc74a8bf660ebd02baa99b0cf40d48478dd032
Binary files /dev/null and b/core/img/filetypes/x-office-spreadsheet.png differ
diff --git a/core/img/filetypes/x-office-spreadsheet.svg b/core/img/filetypes/x-office-spreadsheet.svg
new file mode 100644
index 0000000000000000000000000000000000000000..af40bb252a2035c8cbe08aae5c9297e02087fa0b
--- /dev/null
+++ b/core/img/filetypes/x-office-spreadsheet.svg
@@ -0,0 +1,64 @@
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32px" width="32px" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <defs>
+ <linearGradient id="linearGradient3119" y2="43" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(0.56756757,0,0,0.72972971,2.378382,-2.5135063)" y1="5.5641" x1="24">
+ <stop stop-color="#FFF" offset="0"/>
+ <stop stop-color="#FFF" stop-opacity="0.23529412" offset="0.036262"/>
+ <stop stop-color="#FFF" stop-opacity="0.15686275" offset="0.95056"/>
+ <stop stop-color="#FFF" stop-opacity="0.39215687" offset="1"/>
+ </linearGradient>
+ <linearGradient id="linearGradient3122" y2="47.013" gradientUnits="userSpaceOnUse" x2="25.132" gradientTransform="matrix(0.65714319,0,0,0.63012397,0.228556,-1.0896478)" y1="0.98521" x1="25.132">
+ <stop stop-color="#f4f4f4" offset="0"/>
+ <stop stop-color="#dbdbdb" offset="1"/>
+ </linearGradient>
+ <linearGradient id="linearGradient3124" y2="2.9062" gradientUnits="userSpaceOnUse" x2="-51.786" gradientTransform="matrix(0.53064102,0,0,0.58970216,39.269585,-1.7919079)" y1="50.786" x1="-51.786">
+ <stop stop-color="#a0a0a0" offset="0"/>
+ <stop stop-color="#bebebe" offset="1"/>
+ </linearGradient>
+ <radialGradient id="radialGradient3045" xlink:href="#linearGradient5060" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(0.01566318,0,0,0.00823529,17.610433,25.980565)" r="117.14"/>
+ <linearGradient id="linearGradient5060">
+ <stop stop-color="#000" offset="0"/>
+ <stop stop-color="#000" stop-opacity="0" offset="1"/>
+ </linearGradient>
+ <radialGradient id="radialGradient3048" xlink:href="#linearGradient5060" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-0.01566318,0,0,0.00823529,14.389566,25.980565)" r="117.14"/>
+ <linearGradient id="linearGradient3180" y2="609.51" gradientUnits="userSpaceOnUse" y1="366.65" gradientTransform="matrix(0.04576928,0,0,0.00823529,-0.5423243,25.980548)" x2="302.86" x1="302.86">
+ <stop stop-color="#000" stop-opacity="0" offset="0"/>
+ <stop stop-color="#000" offset="0.5"/>
+ <stop stop-color="#000" stop-opacity="0" offset="1"/>
+ </linearGradient>
+ <linearGradient id="linearGradient3522">
+ <stop stop-color="#a3c0d0" offset="0"/>
+ <stop stop-color="#5a8caa" offset="1"/>
+ </linearGradient>
+ <linearGradient id="linearGradient3160" y2="46.562" xlink:href="#linearGradient3522" gradientUnits="userSpaceOnUse" x2="19.515" gradientTransform="matrix(0.66297508,0,0,0.5353155,-0.83152673,1.3896027)" y1="12.443" x1="19.515"/>
+ <linearGradient id="linearGradient3163" y2="46.562" xlink:href="#linearGradient3522" gradientUnits="userSpaceOnUse" x2="19.515" gradientTransform="matrix(0.5348003,0,0,0.65679881,2.2155346,-0.57397791)" y1="12.443" x1="19.515"/>
+ </defs>
+ <metadata>
+ <rdf:RDF>
+ <cc:Work rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+ <dc:title/>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <rect opacity="0.15" fill-rule="nonzero" height="2" width="22.1" y="29" x="4.95" fill="url(#linearGradient3180)"/>
+ <path opacity="0.15" d="m4.95,29v1.9999c-0.80662,0.0038-1.95-0.44807-1.95-1.0001,0-0.552,0.90012-0.99982,1.95-0.99982z" fill-rule="nonzero" fill="url(#radialGradient3048)"/>
+ <path opacity="0.15" d="m27.05,29v1.9999c0.80661,0.0038,1.95-0.44807,1.95-1.0001,0-0.552-0.90012-0.99982-1.95-0.99982z" fill-rule="nonzero" fill="url(#radialGradient3045)"/>
+ <path stroke-linejoin="round" d="m4.5,0.49996c5.2705,0,23,0.00185,23,0.00185l0.000028,28.998h-23v-29z" stroke-dashoffset="0" stroke="url(#linearGradient3124)" stroke-linecap="butt" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="0.99992186" fill="url(#linearGradient3122)"/>
+ <path stroke-linejoin="round" d="m26.5,28.5-21,0,0-27,21,0z" stroke-dashoffset="0" stroke="url(#linearGradient3119)" stroke-linecap="round" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="0.99999994" fill="none"/>
+ <path d="m8.5605,7.7356,3.0828,0,0,17.645-3.0828,0,0-17.645z" fill="url(#linearGradient3163)"/>
+ <path d="m11,6,12.036,0,0,2-12.036,0,0-2z" fill="url(#linearGradient3160)"/>
+ <rect height="2.0746" width="3.0786" y="5.9254" x="8.0005" fill="#c0d4df"/>
+ <path stroke-linejoin="miter" d="m15.5,5.5,0,20" stroke-opacity="0.3241762" stroke="#2c465d" stroke-linecap="butt" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="0.99999994" fill="none"/>
+ <path stroke-linejoin="miter" d="m23.333,8.5-14.667,0" stroke="#6c6c6c" stroke-linecap="butt" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="1" fill="none"/>
+ <path stroke-linejoin="miter" d="m23.334,10.5-14.667,0" stroke-opacity="0.3241762" stroke="#2c465d" stroke-linecap="butt" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="0.99999994" fill="none"/>
+ <path stroke-linejoin="miter" d="m23.5,13.5-15,0" stroke-opacity="0.3241762" stroke="#2c465d" stroke-linecap="butt" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="0.99999994" fill="none"/>
+ <path stroke-linejoin="miter" d="m23.5,16.5-15,0" stroke-opacity="0.3241762" stroke="#2c465d" stroke-linecap="butt" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="0.99999994" fill="none"/>
+ <path stroke-linejoin="miter" d="m23.5,19.5-15,0" stroke-opacity="0.3241762" stroke="#2c465d" stroke-linecap="butt" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="0.99999994" fill="none"/>
+ <path opacity="0.2" stroke-linejoin="round" d="M8.5005,6.5093,22.447,6.4907" fill-rule="evenodd" stroke="#FFF" stroke-linecap="square" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="1" fill="#FFF"/>
+ <path stroke-linejoin="miter" d="m11.5,5.5,0,20" stroke="#6c6c6c" stroke-linecap="butt" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="0.99999994" fill="none"/>
+ <rect stroke-linejoin="miter" stroke-dasharray="none" stroke-dashoffset="0" height="19.998" width="14.998" stroke="#6c6c6c" stroke-linecap="square" stroke-miterlimit="4" y="5.5011" x="8.5011" stroke-width="1.0022" fill="none"/>
+ <path stroke-linejoin="miter" d="m23.5,22.5-15,0" stroke-opacity="0.3241762" stroke="#2c465d" stroke-linecap="butt" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="0.99999994" fill="none"/>
+ <path stroke-linejoin="miter" d="m19.5,5.5,0,20" stroke-opacity="0.3241762" stroke="#2c465d" stroke-linecap="butt" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="0.99999994" fill="none"/>
+</svg>
diff --git a/core/js/avatar.js b/core/js/avatar.js
new file mode 100644
index 0000000000000000000000000000000000000000..57e6daa0930251fba4fa314bf36864e5209da8f2
--- /dev/null
+++ b/core/js/avatar.js
@@ -0,0 +1,11 @@
+$(document).ready(function(){
+ 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.avatar.js b/core/js/jquery.avatar.js
new file mode 100644
index 0000000000000000000000000000000000000000..88a4c25d1eecfc401f7a684d6228a086eb8df44a
--- /dev/null
+++ b/core/js/jquery.avatar.js
@@ -0,0 +1,87 @@
+/**
+ * Copyright (c) 2013 Christopher Schäpers <christopher@schaepers.it>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+/**
+ * This plugin inserts the right avatar for the user, depending on, whether a
+ * custom avatar is uploaded - which it uses then - or not, and display a
+ * placeholder with the first letter of the users name instead.
+ * For this it queries the core_avatar_get route, thus this plugin is fit very
+ * tightly for owncloud, and it may not work anywhere else.
+ *
+ * You may use this on any <div></div>
+ * Here I'm using <div class="avatardiv"></div> as an example.
+ *
+ * There are 4 ways to call this:
+ *
+ * 1. $('.avatardiv').avatar('jdoe', 128);
+ * This will make the div to jdoe's fitting avatar, with a size of 128px.
+ *
+ * 2. $('.avatardiv').avatar('jdoe');
+ * This will make the div to jdoe's fitting avatar. If the div aready has a
+ * height, it will be used for the avatars size. Otherwise this plugin will
+ * search for 'size' DOM data, to use for avatar size. If neither are available
+ * it will default to 64px.
+ *
+ * 3. $('.avatardiv').avatar();
+ * This will search the DOM for 'user' data, to use as the username. If there
+ * is no username available it will default to a placeholder with the value of
+ * "x". The size will be determined the same way, as the second example.
+ *
+ * 4. $('.avatardiv').avatar('jdoe', 128, true);
+ * This will behave like the first example, except it will also append random
+ * hashes to the custom avatar images, to force image reloading in IE8.
+ */
+
+(function ($) {
+ $.fn.avatar = function(user, size, ie8fix) {
+ if (typeof(size) === 'undefined') {
+ if (this.height() > 0) {
+ size = this.height();
+ } else if (this.data('size') > 0) {
+ size = this.data('size');
+ } else {
+ size = 64;
+ }
+ }
+
+ this.height(size);
+ this.width(size);
+
+ if (typeof(user) === 'undefined') {
+ if (typeof(this.data('user')) !== 'undefined') {
+ user = this.data('user');
+ } else {
+ this.placeholder('x');
+ return;
+ }
+ }
+
+ // sanitize
+ user = user.replace(/\//g,'');
+
+ var $div = this;
+
+ OC.Router.registerLoadedCallback(function() {
+ var url = OC.Router.generate('core_avatar_get', {user: user, size: size})+'?requesttoken='+oc_requesttoken;
+ $.get(url, function(result) {
+ if (typeof(result) === 'object') {
+ if (result.data && result.data.displayname) {
+ $div.placeholder(user, result.data.displayname);
+ } else {
+ $div.placeholder(user);
+ }
+ } else {
+ if (ie8fix === true) {
+ $div.html('<img src="'+url+'#'+Math.floor(Math.random()*1000)+'">');
+ } else {
+ $div.html('<img src="'+url+'">');
+ }
+ }
+ });
+ });
+ };
+}(jQuery));
diff --git a/core/js/jquery.ocdialog.js b/core/js/jquery.ocdialog.js
index bafbd0e0e9f9dbe69f9f47e117a6b2aeef9c506f..02cd6ac146635895de58127b0f38a03b0d1a88eb 100644
--- a/core/js/jquery.ocdialog.js
+++ b/core/js/jquery.ocdialog.js
@@ -39,7 +39,8 @@
return;
}
// Escape
- if(event.keyCode === 27 && self.options.closeOnEscape) {
+ if(event.keyCode === 27 && event.type === 'keydown' && self.options.closeOnEscape) {
+ event.stopImmediatePropagation();
self.close();
return false;
}
@@ -83,24 +84,28 @@
var self = this;
switch(key) {
case 'title':
- var $title = $('<h3 class="oc-dialog-title">' + this.options.title
- + '</h3>'); //<hr class="oc-dialog-separator" />');
if(this.$title) {
- this.$title.replaceWith($title);
+ this.$title.text(value);
} else {
+ var $title = $('<h3 class="oc-dialog-title">'
+ + value
+ + '</h3>');
this.$title = $title.prependTo(this.$dialog);
}
this._setSizes();
break;
case 'buttons':
- var $buttonrow = $('<div class="oc-dialog-buttonrow" />');
if(this.$buttonrow) {
- this.$buttonrow.replaceWith($buttonrow);
+ this.$buttonrow.empty();
} else {
+ var $buttonrow = $('<div class="oc-dialog-buttonrow" />');
this.$buttonrow = $buttonrow.appendTo(this.$dialog);
}
$.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;
@@ -124,6 +129,8 @@
$closeButton.on('click', function() {
self.close();
});
+ } else {
+ this.$dialog.find('.oc-dialog-close').remove();
}
break;
case 'width':
diff --git a/core/js/js.js b/core/js/js.js
index d580b6113e6eb667e1012bc598a596954155cc81..b7f7ff1ac15b53ac86ffbd7e0c761abe3ad655ee 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -321,6 +321,38 @@ var OC={
var date = new Date(1000*mtime);
return date.getDate()+'.'+(date.getMonth()+1)+'.'+date.getFullYear()+', '+date.getHours()+':'+date.getMinutes();
},
+ /**
+ * Parses a URL query string into a JS map
+ * @param queryString query string in the format param1=1234¶m2=abcde¶m3=xyz
+ * @return map containing key/values matching the URL parameters
+ */
+ parseQueryString:function(queryString){
+ var parts,
+ components,
+ result = {},
+ key,
+ value;
+ if (!queryString){
+ return null;
+ }
+ if (queryString[0] === '?'){
+ queryString = queryString.substr(1);
+ }
+ parts = queryString.split('&');
+ for (var i = 0; i < parts.length; i++){
+ components = parts[i].split('=');
+ if (!components.length){
+ continue;
+ }
+ key = decodeURIComponent(components[0]);
+ if (!key){
+ continue;
+ }
+ value = components[1];
+ result[key] = value && decodeURIComponent(value);
+ }
+ return result;
+ },
/**
* Opens a popup with the setting for an app.
* @param appid String. The ID of the app e.g. 'calendar', 'contacts' or 'files'.
@@ -431,9 +463,16 @@ OC.Notification={
OC.Breadcrumb={
container:null,
- crumbs:[],
show:function(dir, leafname, leaflink){
- OC.Breadcrumb.clear();
+ if(!this.container){//default
+ this.container=$('#controls');
+ }
+ this._show(this.container, dir, leafname, leaflink);
+ },
+ _show:function(container, dir, leafname, leaflink){
+ var self = this;
+
+ this._clear(container);
// show home + path in subdirectories
if (dir && dir !== '/') {
@@ -450,8 +489,7 @@ OC.Breadcrumb={
crumbImg.attr('src',OC.imagePath('core','places/home'));
crumbLink.append(crumbImg);
crumb.append(crumbLink);
- OC.Breadcrumb.container.prepend(crumb);
- OC.Breadcrumb.crumbs.push(crumb);
+ container.prepend(crumb);
//add path parts
var segments = dir.split('/');
@@ -460,20 +498,23 @@ OC.Breadcrumb={
if (name !== '') {
pathurl = pathurl+'/'+name;
var link = OC.linkTo('files','index.php')+'?dir='+encodeURIComponent(pathurl);
- OC.Breadcrumb.push(name, link);
+ self._push(container, name, link);
}
});
}
//add leafname
if (leafname && leaflink) {
- OC.Breadcrumb.push(leafname, leaflink);
+ this._push(container, leafname, leaflink);
}
},
push:function(name, link){
- if(!OC.Breadcrumb.container){//default
- OC.Breadcrumb.container=$('#controls');
+ if(!this.container){//default
+ this.container=$('#controls');
}
+ return this._push(OC.Breadcrumb.container, name, link);
+ },
+ _push:function(container, name, link){
var crumb=$('<div/>');
crumb.addClass('crumb').addClass('last');
@@ -482,30 +523,30 @@ OC.Breadcrumb={
crumbLink.text(name);
crumb.append(crumbLink);
- var existing=OC.Breadcrumb.container.find('div.crumb');
+ var existing=container.find('div.crumb');
if(existing.length){
existing.removeClass('last');
existing.last().after(crumb);
}else{
- OC.Breadcrumb.container.prepend(crumb);
+ container.prepend(crumb);
}
- OC.Breadcrumb.crumbs.push(crumb);
return crumb;
},
pop:function(){
- if(!OC.Breadcrumb.container){//default
- OC.Breadcrumb.container=$('#controls');
+ if(!this.container){//default
+ this.container=$('#controls');
}
- OC.Breadcrumb.container.find('div.crumb').last().remove();
- OC.Breadcrumb.container.find('div.crumb').last().addClass('last');
- OC.Breadcrumb.crumbs.pop();
+ this.container.find('div.crumb').last().remove();
+ this.container.find('div.crumb').last().addClass('last');
},
clear:function(){
- if(!OC.Breadcrumb.container){//default
- OC.Breadcrumb.container=$('#controls');
+ if(!this.container){//default
+ this.container=$('#controls');
}
- OC.Breadcrumb.container.find('div.crumb').remove();
- OC.Breadcrumb.crumbs=[];
+ this._clear(this.container);
+ },
+ _clear:function(container) {
+ container.find('div.crumb').remove();
}
};
@@ -682,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{
@@ -709,7 +756,6 @@ $(document).ready(function(){
});
label.hide();
};
- setShowPassword($('#password'), $('label[for=show]'));
setShowPassword($('#adminpass'), $('label[for=show]'));
setShowPassword($('#pass2'), $('label[for=personal-show]'));
setShowPassword($('#dbpass'), $('label[for=dbpassword]'));
@@ -762,6 +808,7 @@ $(document).ready(function(){
$('.password .action').tipsy({gravity:'se', fade:true, live:true});
$('#upload').tipsy({gravity:'w', fade:true});
$('.selectedActions a').tipsy({gravity:'s', fade:true, live:true});
+ $('a.action.delete').tipsy({gravity:'e', fade:true, live:true});
$('a.action').tipsy({gravity:'s', fade:true, live:true});
$('td .modified').tipsy({gravity:'s', fade:true, live:true});
@@ -799,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
@@ -865,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();
@@ -880,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 4092b8d074612ee13ce4cc3aaaa84dc211a53ec4..ac37b109e76a2ea17c6f7e101e5747f8aae1cbc3 100644
--- a/core/js/oc-dialogs.js
+++ b/core/js/oc-dialogs.js
@@ -77,7 +77,7 @@ var OCdialogs = {
self.$filePicker = $tmpl.octemplate({
dialog_name: dialog_name,
title: title
- }).data('path', '');
+ }).data('path', '').data('multiselect', multiselect).data('mimetype', mimetype_filter);
if (modal === undefined) {
modal = false;
@@ -100,7 +100,7 @@ var OCdialogs = {
self._handlePickerClick(event, $(this));
});
self._fillFilePicker('');
- }).data('multiselect', multiselect).data('mimetype',mimetype_filter);
+ });
// build buttons
var functionToCall = function() {
@@ -139,8 +139,12 @@ var OCdialogs = {
}
});
})
- .fail(function() {
- alert(t('core', 'Error loading file picker template'));
+ .fail(function(status, error) {
+ // If the method is called while navigating away
+ // from the page, it is probably not needed ;)
+ if(status !== 0) {
+ alert(t('core', 'Error loading file picker template: {error}', {error: error}));
+ }
});
},
/**
@@ -206,10 +210,255 @@ var OCdialogs = {
});
OCdialogs.dialogs_counter++;
})
- .fail(function() {
- alert(t('core', 'Error loading file picker template'));
+ .fail(function(status, error) {
+ // If the method is called while navigating away from
+ // the page, we still want to deliver the message.
+ if(status === 0) {
+ alert(title + ': ' + content);
+ } else {
+ alert(t('core', 'Error loading message template: {error}', {error: error}));
+ }
});
},
+ _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) {
@@ -219,8 +468,8 @@ var OCdialogs = {
self.$listTmpl = self.$filePickerTemplate.find('.filelist li:first-child').detach();
defer.resolve(self.$filePickerTemplate);
})
- .fail(function() {
- defer.reject();
+ .fail(function(jqXHR, textStatus, errorThrown) {
+ defer.reject(jqXHR.status, errorThrown);
});
} else {
defer.resolve(this.$filePickerTemplate);
@@ -235,18 +484,41 @@ var OCdialogs = {
self.$messageTemplate = $(tmpl);
defer.resolve(self.$messageTemplate);
})
- .fail(function() {
- defer.reject();
+ .fail(function(jqXHR, textStatus, errorThrown) {
+ defer.reject(jqXHR.status, errorThrown);
});
} else {
defer.resolve(this.$messageTemplate);
}
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];
+ }
+
return $.getJSON(
OC.filePath('files', 'ajax', 'rawlist.php'),
- {dir: dir, mimetype: mimeType}
+ {
+ dir: dir,
+ mimetypes: JSON.stringify(mimeType)
+ }
);
},
_determineValue: function(element) {
diff --git a/core/js/oc-requesttoken.js b/core/js/oc-requesttoken.js
index 6cc6b5a855b91fbb9da302e6ffb6c7313efd0003..0d7f40c592abfc3fa139e2eca29b67209fa859af 100644
--- a/core/js/oc-requesttoken.js
+++ b/core/js/oc-requesttoken.js
@@ -1,3 +1,4 @@
-$(document).bind('ajaxSend', function(elm, xhr, s) {
+$(document).on('ajaxSend',function(elm, xhr, s) {
xhr.setRequestHeader('requesttoken', oc_requesttoken);
});
+
diff --git a/core/js/octemplate.js b/core/js/octemplate.js
index e69c6cc56e066fed3a03c3054fdfa040da2300c0..46ffa9765741e25b2d86f31728a74db3ac6e1784 100644
--- a/core/js/octemplate.js
+++ b/core/js/octemplate.js
@@ -60,9 +60,10 @@
var self = this;
if(typeof this.options.escapeFunction === 'function') {
- for (var key = 0; key < this.vars.length; key++) {
- if(typeof this.vars[key] === 'string') {
- this.vars[key] = self.options.escapeFunction(this.vars[key]);
+ var keys = Object.keys(this.vars);
+ for (var key = 0; key < keys.length; key++) {
+ if(typeof this.vars[keys[key]] === 'string') {
+ this.vars[keys[key]] = self.options.escapeFunction(this.vars[keys[key]]);
}
}
}
@@ -85,7 +86,7 @@
}
},
options: {
- escapeFunction: function(str) {return $('<i></i>').text(str).html();}
+ escapeFunction: escapeHTML
}
};
diff --git a/core/js/placeholder.js b/core/js/placeholder.js
new file mode 100644
index 0000000000000000000000000000000000000000..ee2a8ce84c42b1fa0996abe6fc82fbc3492d8d5a
--- /dev/null
+++ b/core/js/placeholder.js
@@ -0,0 +1,73 @@
+/**
+ * ownCloud
+ *
+ * @author Morris Jobke
+ * @copyright 2013 Morris Jobke <morris.jobke@gmail.com>
+ *
+ * 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/>.
+ *
+ */
+
+/*
+ * Adds a background color to the element called on and adds the first character
+ * of the passed in string. This string is also the seed for the generation of
+ * the background color.
+ *
+ * You have following HTML:
+ *
+ * <div id="albumart"></div>
+ *
+ * And call this from Javascript:
+ *
+ * $('#albumart').placeholder('The Album Title');
+ *
+ * Which will result in:
+ *
+ * <div id="albumart" style="background-color: hsl(123, 90%, 65%); ... ">T</div>
+ *
+ * You may also call it like this, to have a different background, than the seed:
+ *
+ * $('#albumart').placeholder('The Album Title', 'Album Title');
+ *
+ * Resulting in:
+ *
+ * <div id="albumart" style="background-color: hsl(123, 90%, 65%); ... ">A</div>
+ *
+ */
+
+(function ($) {
+ $.fn.placeholder = function(seed, text) {
+ // set optional argument "text" to value of "seed" if undefined
+ text = text || seed;
+
+ var hash = md5(seed),
+ maxRange = parseInt('ffffffffffffffffffffffffffffffff', 16),
+ hue = parseInt(hash, 16) / maxRange * 256,
+ height = this.height();
+ this.css('background-color', 'hsl(' + hue + ', 90%, 65%)');
+
+ // CSS rules
+ this.css('color', '#fff');
+ this.css('font-weight', 'bold');
+ this.css('text-align', 'center');
+
+ // calculate the height
+ this.css('line-height', height + 'px');
+ this.css('font-size', (height * 0.55) + 'px');
+
+ if(seed !== null && seed.length) {
+ this.html(text[0].toUpperCase());
+ }
+ };
+}(jQuery));
diff --git a/core/js/share.js b/core/js/share.js
index 27c16f38b92d0d8da9d2e3b321efd68a3d884541..82f5da0baea0f5f610b9f2ea1c4c8e6080981a91 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -174,10 +174,10 @@ OC.Share={
var allowPublicUploadStatus = false;
$.each(data.shares, function(key, value) {
- if (allowPublicUploadStatus) {
+ if (value.share_type === OC.Share.SHARE_TYPE_LINK) {
+ allowPublicUploadStatus = (value.permissions & OC.PERMISSION_CREATE) ? true : false;
return true;
}
- allowPublicUploadStatus = (value.permissions & OC.PERMISSION_CREATE) ? true : false;
});
html += '<input id="shareWith" type="text" placeholder="'+t('core', 'Share with')+'" />';
@@ -233,6 +233,7 @@ OC.Share={
// } else {
$.get(OC.filePath('core', 'ajax', 'share.php'), { fetch: 'getShareWith', search: search.term, itemShares: OC.Share.itemShares }, function(result) {
if (result.status == 'success' && result.data.length > 0) {
+ $( "#shareWith" ).autocomplete( "option", "autoFocus", true );
response(result.data);
} else {
// Suggest sharing via email if valid email address
@@ -240,6 +241,7 @@ OC.Share={
// if (pattern.test(search.term)) {
// response([{label: t('core', 'Share via email:')+' '+search.term, value: {shareType: OC.Share.SHARE_TYPE_EMAIL, shareWith: search.term}}]);
// } else {
+ $( "#shareWith" ).autocomplete( "option", "autoFocus", false );
response([t('core', 'No people found')]);
// }
}
@@ -423,7 +425,7 @@ OC.Share={
dateFormat : 'dd-mm-yy'
});
}
-}
+};
$(document).ready(function() {
@@ -481,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 {
@@ -512,7 +514,7 @@ $(document).ready(function() {
$(document).on('change', '#dropdown .permissions', function() {
if ($(this).attr('name') == 'edit') {
- var li = $(this).parent().parent()
+ var li = $(this).parent().parent();
var checkboxes = $('.permissions', li);
var checked = $(this).is(':checked');
// Check/uncheck Create, Update, and Delete checkboxes if Edit is checked/unck
@@ -601,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
new file mode 100644
index 0000000000000000000000000000000000000000..2cbbaa45ca708af81c9ba205949910e6be3c48d4
--- /dev/null
+++ b/core/l10n/ach.php
@@ -0,0 +1,9 @@
+<?php
+$TRANSLATIONS = array(
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n day ago_::_%n days ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("",""),
+"_{count} file conflict_::_{count} file conflicts_" => array("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/core/l10n/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 84f076f3018a8aeb26bc6cda326d3412ccb737b0..f61014e19e14097f4cd718a8325dd2897ad3af88 100644
--- a/core/l10n/ar.php
+++ b/core/l10n/ar.php
@@ -1,5 +1,6 @@
<?php
$TRANSLATIONS = array(
+"group" => "مجموعة",
"Category type not provided." => "نوع التصنيف لم يدخل",
"No category to add?" => "ألا توجد فئة للإضافة؟",
"This category already exists: %s" => "هذا التصنيف موجود مسبقا : %s",
@@ -43,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." => "اسم التطبيق غير محدد.",
@@ -81,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 abff5bbbdb4b4db9889d26457e568dc93ad03cf9..938d668b362beb2c085996fcd42a51bfbccb414a 100644
--- a/core/l10n/ca.php
+++ b/core/l10n/ca.php
@@ -1,6 +1,13 @@
<?php
$TRANSLATIONS = array(
"%s shared »%s« with you" => "%s ha compartit »%s« amb tu",
+"group" => "grup",
+"Turned on maintenance mode" => "Activat el mode de manteniment",
+"Turned off maintenance mode" => "Desactivat el mode de manteniment",
+"Updated database" => "Actualitzada la base de dades",
+"Updating filecache, this may take really long..." => "Actualitzant la memòria de cau del fitxers, això pot trigar molt...",
+"Updated filecache" => "Actualitzada la memòria de cau dels fitxers",
+"... %d%% done ..." => "... %d%% fet ...",
"Category type not provided." => "No s'ha especificat el tipus de categoria.",
"No category to add?" => "No voleu afegir cap categoria?",
"This category already exists: %s" => "Aquesta categoria ja existeix: %s",
@@ -9,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",
@@ -41,10 +53,20 @@ $TRANSLATIONS = array(
"last year" => "l'any passat",
"years ago" => "anys enrere",
"Choose" => "Escull",
-"Error loading file picker template" => "Error en carregar la plantilla del seleccionador de fitxers",
+"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ó.",
@@ -126,7 +148,6 @@ $TRANSLATIONS = array(
"Finish setup" => "Acaba la configuració",
"%s is available. Get more information on how to update." => "%s està disponible. Obtingueu més informació de com actualitzar.",
"Log out" => "Surt",
-"More apps" => "Més aplicacions",
"Automatic logon rejected!" => "L'ha rebutjat l'acceditació automàtica!",
"If you did not change your password recently, your account may be compromised!" => "Se no heu canviat la contrasenya recentment el vostre compte pot estar compromès!",
"Please change your password to secure your account again." => "Canvieu la contrasenya de nou per assegurar el vostre compte.",
diff --git a/core/l10n/cs_CZ.php b/core/l10n/cs_CZ.php
index 78614eef0e7f721ab140ca9839019d36887af45d..8b63079c87aeb39923919c7dac1517ebe991eb73 100644
--- a/core/l10n/cs_CZ.php
+++ b/core/l10n/cs_CZ.php
@@ -1,6 +1,13 @@
<?php
$TRANSLATIONS = array(
"%s shared »%s« with you" => "%s s vámi sdílí »%s«",
+"group" => "skupina",
+"Turned on maintenance mode" => "Zapnut režim údržby",
+"Turned off maintenance mode" => "Vypnut režim údržby",
+"Updated database" => "Zaktualizována databáze",
+"Updating filecache, this may take really long..." => "Aktualizuji souborovou mezipaměť, toto může trvat opravdu dlouho...",
+"Updated filecache" => "Aktualizována souborová mezipaměť",
+"... %d%% done ..." => "... %d%% dokončeno ...",
"Category type not provided." => "Nezadán typ kategorie.",
"No category to add?" => "Žádná kategorie k přidání?",
"This category already exists: %s" => "Kategorie již existuje: %s",
@@ -9,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ý",
@@ -41,10 +53,16 @@ $TRANSLATIONS = array(
"last year" => "minulý rok",
"years ago" => "před lety",
"Choose" => "Vybrat",
-"Error loading file picker template" => "Chyba při načítání šablony výběru souborů",
+"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("","",""),
+"One file conflict" => "Jeden konflikt souboru",
+"Which files do you want to keep?" => "Které soubory chcete ponechat?",
+"Cancel" => "Zrušit",
+"Continue" => "Pokračovat",
"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.",
@@ -126,7 +144,6 @@ $TRANSLATIONS = array(
"Finish setup" => "Dokončit nastavení",
"%s is available. Get more information on how to update." => "%s je dostupná. Získejte více informací k postupu aktualizace.",
"Log out" => "Odhlásit se",
-"More apps" => "Více aplikací",
"Automatic logon rejected!" => "Automatické přihlášení odmítnuto!",
"If you did not change your password recently, your account may be compromised!" => "Pokud jste v nedávné době neměnili své heslo, Váš účet může být kompromitován!",
"Please change your password to secure your account again." => "Změňte, prosím, své heslo pro opětovné zabezpečení Vašeho účtu.",
diff --git a/core/l10n/cy_GB.php b/core/l10n/cy_GB.php
index 442970fbb0b10f43bcbbc9937882c5b93bdfbb59..78eb6ba96981ee0a9fb54d749ab1072490a36473 100644
--- a/core/l10n/cy_GB.php
+++ b/core/l10n/cy_GB.php
@@ -1,5 +1,6 @@
<?php
$TRANSLATIONS = array(
+"group" => "grŵp",
"Category type not provided." => "Math o gategori heb ei ddarparu.",
"No category to add?" => "Dim categori i'w ychwanegu?",
"This category already exists: %s" => "Mae'r categori hwn eisoes yn bodoli: %s",
@@ -43,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 79ccc20d495065a5cbe6f2ac943796512d23a4dd..8938f2107fa2312d19c78d7918dc692ef9fb878a 100644
--- a/core/l10n/da.php
+++ b/core/l10n/da.php
@@ -1,6 +1,13 @@
<?php
$TRANSLATIONS = array(
"%s shared »%s« with you" => "%s delte »%s« med sig",
+"group" => "gruppe",
+"Turned on maintenance mode" => "Startede vedligeholdelsestilstand",
+"Turned off maintenance mode" => "standsede vedligeholdelsestilstand",
+"Updated database" => "Opdaterede database",
+"Updating filecache, this may take really long..." => "Opdatere filcache, dette kan tage rigtigt lang tid...",
+"Updated filecache" => "Opdaterede filcache",
+"... %d%% done ..." => "... %d%% færdig ...",
"Category type not provided." => "Kategori typen ikke er fastsat.",
"No category to add?" => "Ingen kategori at tilføje?",
"This category already exists: %s" => "Kategorien eksisterer allerede: %s",
@@ -9,6 +16,8 @@ $TRANSLATIONS = array(
"Error adding %s to favorites." => "Fejl ved tilføjelse af %s til favoritter.",
"No categories selected for deletion." => "Ingen kategorier valgt",
"Error removing %s from favorites." => "Fejl ved fjernelse af %s fra favoritter.",
+"Unknown filetype" => "Ukendt filtype",
+"Invalid image" => "Ugyldigt billede",
"Sunday" => "Søndag",
"Monday" => "Mandag",
"Tuesday" => "Tirsdag",
@@ -41,10 +50,11 @@ $TRANSLATIONS = array(
"last year" => "sidste år",
"years ago" => "år siden",
"Choose" => "Vælg",
-"Error loading file picker template" => "Fejl ved indlæsning af filvælger skabelon",
"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.",
@@ -126,7 +136,6 @@ $TRANSLATIONS = array(
"Finish setup" => "Afslut opsætning",
"%s is available. Get more information on how to update." => "%s er tilgængelig. Få mere information om, hvordan du opdaterer.",
"Log out" => "Log ud",
-"More apps" => "Flere programmer",
"Automatic logon rejected!" => "Automatisk login afvist!",
"If you did not change your password recently, your account may be compromised!" => "Hvis du ikke har ændret din adgangskode for nylig, har nogen muligvis tiltvunget sig adgang til din konto!",
"Please change your password to secure your account again." => "Skift adgangskode for at sikre din konto igen.",
diff --git a/core/l10n/de.php b/core/l10n/de.php
index 2fe2f56412417b0633d90f3068765d0280fd2c9f..b5ff8826ad8c2a82b5e422aee0219f62817ab335 100644
--- a/core/l10n/de.php
+++ b/core/l10n/de.php
@@ -1,6 +1,13 @@
<?php
$TRANSLATIONS = array(
"%s shared »%s« with you" => "%s teilte »%s« mit Ihnen",
+"group" => "Gruppe",
+"Turned on maintenance mode" => "Wartungsmodus eingeschaltet",
+"Turned off maintenance mode" => "Wartungsmodus ausgeschaltet",
+"Updated database" => "Datenbank aktualisiert",
+"Updating filecache, this may take really long..." => "Aktualisiere Dateicache, dies könnte eine Weile dauern...",
+"Updated filecache" => "Dateicache aktualisiert",
+"... %d%% done ..." => "... %d%% erledigt ...",
"Category type not provided." => "Kategorie nicht angegeben.",
"No category to add?" => "Keine Kategorie hinzuzufügen?",
"This category already exists: %s" => "Die Kategorie '%s' existiert bereits.",
@@ -9,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",
@@ -41,10 +53,20 @@ $TRANSLATIONS = array(
"last year" => "Letztes Jahr",
"years ago" => "Vor Jahren",
"Choose" => "Auswählen",
-"Error loading file picker template" => "Dateiauswahltemplate konnte nicht geladen werden",
+"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.",
@@ -126,7 +148,6 @@ $TRANSLATIONS = array(
"Finish setup" => "Installation abschließen",
"%s is available. Get more information on how to update." => "%s ist verfügbar. Holen Sie weitere Informationen zu Aktualisierungen ein.",
"Log out" => "Abmelden",
-"More apps" => "Mehr Apps",
"Automatic logon rejected!" => "Automatischer Login zurückgewiesen!",
"If you did not change your password recently, your account may be compromised!" => "Wenn Du Dein Passwort nicht vor kurzem geändert hast, könnte Dein\nAccount kompromittiert sein!",
"Please change your password to secure your account again." => "Bitte ändere Dein Passwort, um Deinen Account wieder zu schützen.",
diff --git a/core/l10n/de_AT.php b/core/l10n/de_AT.php
index c0e3e80f0a37ef6db75c77020cf3093f392768b9..ffcdde48d47cbbe4730b36aec880f7e1642688fb 100644
--- a/core/l10n/de_AT.php
+++ b/core/l10n/de_AT.php
@@ -4,6 +4,6 @@ $TRANSLATIONS = array(
"_%n hour ago_::_%n hours ago_" => array("",""),
"_%n day ago_::_%n days ago_" => array("",""),
"_%n month ago_::_%n months ago_" => array("",""),
-"More apps" => "Mehr Apps"
+"_{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 d93158c62de74d4815633c443039501e1a164581..1fc6f6b7e1e5d7d7b38a2e95909d8be41022c5c7 100644
--- a/core/l10n/de_CH.php
+++ b/core/l10n/de_CH.php
@@ -1,6 +1,7 @@
<?php
$TRANSLATIONS = array(
"%s shared »%s« with you" => "%s teilt »%s« mit Ihnen",
+"group" => "Gruppe",
"Category type not provided." => "Kategorie nicht angegeben.",
"No category to add?" => "Keine Kategorie hinzuzufügen?",
"This category already exists: %s" => "Die nachfolgende Kategorie existiert bereits: %s",
@@ -41,10 +42,11 @@ $TRANSLATIONS = array(
"last year" => "Letztes Jahr",
"years ago" => "Vor Jahren",
"Choose" => "Auswählen",
-"Error loading file picker template" => "Es ist ein Fehler in der Vorlage des Datei-Auswählers aufgetreten.",
"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.",
@@ -126,7 +128,6 @@ $TRANSLATIONS = array(
"Finish setup" => "Installation abschliessen",
"%s is available. Get more information on how to update." => "%s ist verfügbar. Holen Sie weitere Informationen zu Aktualisierungen ein.",
"Log out" => "Abmelden",
-"More apps" => "Mehr Apps",
"Automatic logon rejected!" => "Automatische Anmeldung verweigert!",
"If you did not change your password recently, your account may be compromised!" => "Wenn Sie Ihr Passwort nicht vor kurzem geändert haben, könnte Ihr\nAccount kompromittiert sein!",
"Please change your password to secure your account again." => "Bitte ändern Sie Ihr Passwort, um Ihr Konto wieder zu sichern.",
diff --git a/core/l10n/de_DE.php b/core/l10n/de_DE.php
index 60f5418727a5ec22acdedee4651497a4c1190f77..5b9b199f416d60d5a1ec4fc614fbee41e2c05315 100644
--- a/core/l10n/de_DE.php
+++ b/core/l10n/de_DE.php
@@ -1,6 +1,13 @@
<?php
$TRANSLATIONS = array(
"%s shared »%s« with you" => "%s geteilt »%s« mit Ihnen",
+"group" => "Gruppe",
+"Turned on maintenance mode" => "Wartungsmodus eingeschaltet ",
+"Turned off maintenance mode" => "Wartungsmodus ausgeschaltet",
+"Updated database" => "Datenbank aktualisiert",
+"Updating filecache, this may take really long..." => "Aktualisiere Dateicache, dies könnte eine Weile dauern...",
+"Updated filecache" => "Dateicache aktualisiert",
+"... %d%% done ..." => "... %d%% erledigt ...",
"Category type not provided." => "Kategorie nicht angegeben.",
"No category to add?" => "Keine Kategorie hinzuzufügen?",
"This category already exists: %s" => "Die nachfolgende Kategorie existiert bereits: %s",
@@ -9,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",
@@ -41,10 +53,20 @@ $TRANSLATIONS = array(
"last year" => "Letztes Jahr",
"years ago" => "Vor Jahren",
"Choose" => "Auswählen",
-"Error loading file picker template" => "Es ist ein Fehler in der Vorlage des Datei-Auswählers aufgetreten.",
+"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.",
@@ -126,7 +148,6 @@ $TRANSLATIONS = array(
"Finish setup" => "Installation abschließen",
"%s is available. Get more information on how to update." => "%s ist verfügbar. Holen Sie weitere Informationen zu Aktualisierungen ein.",
"Log out" => "Abmelden",
-"More apps" => "Mehr Apps",
"Automatic logon rejected!" => "Automatische Anmeldung verweigert!",
"If you did not change your password recently, your account may be compromised!" => "Wenn Sie Ihr Passwort nicht vor kurzem geändert haben, könnte Ihr\nAccount kompromittiert sein!",
"Please change your password to secure your account again." => "Bitte ändern Sie Ihr Passwort, um Ihr Konto wieder zu sichern.",
diff --git a/core/l10n/el.php b/core/l10n/el.php
index 51a3a68d788237fd4ae5a780bb3baad972d5983b..7fc58ca3527bbe0dc85f8782df282778b3a6ab62 100644
--- a/core/l10n/el.php
+++ b/core/l10n/el.php
@@ -1,6 +1,7 @@
<?php
$TRANSLATIONS = array(
"%s shared »%s« with you" => "Ο %s διαμοιράστηκε μαζί σας το »%s«",
+"group" => "ομάδα",
"Category type not provided." => "Δεν δώθηκε τύπος κατηγορίας.",
"No category to add?" => "Δεν έχετε κατηγορία να προσθέσετε;",
"This category already exists: %s" => "Αυτή η κατηγορία υπάρχει ήδη: %s",
@@ -41,10 +42,11 @@ $TRANSLATIONS = array(
"last year" => "τελευταίο χρόνο",
"years ago" => "χρόνια πριν",
"Choose" => "Επιλέξτε",
-"Error loading file picker template" => "Σφάλμα φόρτωσης αρχείου επιλογέα προτύπου",
"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
new file mode 100644
index 0000000000000000000000000000000000000000..bb26f1469dd9c4fe7b6e81d62cd153e392358c11
--- /dev/null
+++ b/core/l10n/en_GB.php
@@ -0,0 +1,161 @@
+<?php
+$TRANSLATIONS = array(
+"%s shared »%s« with you" => "%s shared \"%s\" with you",
+"group" => "group",
+"Turned on maintenance mode" => "Turned on maintenance mode",
+"Turned off maintenance mode" => "Turned off maintenance mode",
+"Updated database" => "Updated database",
+"Updating filecache, this may take really long..." => "Updating filecache, this may take a really long time...",
+"Updated filecache" => "Updated filecache",
+"... %d%% done ..." => "... %d%% done ...",
+"Category type not provided." => "Category type not provided.",
+"No category to add?" => "No category to add?",
+"This category already exists: %s" => "This category already exists: %s",
+"Object type not provided." => "Object type not provided.",
+"%s ID not provided." => "%s ID not provided.",
+"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",
+"Wednesday" => "Wednesday",
+"Thursday" => "Thursday",
+"Friday" => "Friday",
+"Saturday" => "Saturday",
+"January" => "January",
+"February" => "February",
+"March" => "March",
+"April" => "April",
+"May" => "May",
+"June" => "June",
+"July" => "July",
+"August" => "August",
+"September" => "September",
+"October" => "October",
+"November" => "November",
+"December" => "December",
+"Settings" => "Settings",
+"seconds ago" => "seconds 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 ago_::_%n days ago_" => array("%n day ago","%n days ago"),
+"last month" => "last month",
+"_%n month ago_::_%n months ago_" => array("%n month ago","%n months ago"),
+"months ago" => "months ago",
+"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.",
+"The required file {file} is not installed!" => "The required file {file} is not installed!",
+"Shared" => "Shared",
+"Share" => "Share",
+"Error while sharing" => "Error whilst sharing",
+"Error while unsharing" => "Error whilst unsharing",
+"Error while changing permissions" => "Error whilst changing permissions",
+"Shared with you and the group {group} by {owner}" => "Shared with you and the group {group} by {owner}",
+"Shared with you by {owner}" => "Shared with you by {owner}",
+"Share with" => "Share with",
+"Share with link" => "Share with link",
+"Password protect" => "Password protect",
+"Password" => "Password",
+"Allow Public Upload" => "Allow Public Upload",
+"Email link to person" => "Email link to person",
+"Send" => "Send",
+"Set expiration date" => "Set expiration date",
+"Expiration date" => "Expiration date",
+"Share via email:" => "Share via email:",
+"No people found" => "No people found",
+"Resharing is not allowed" => "Resharing is not allowed",
+"Shared in {item} with {user}" => "Shared in {item} with {user}",
+"Unshare" => "Unshare",
+"can edit" => "can edit",
+"access control" => "access control",
+"create" => "create",
+"update" => "update",
+"delete" => "delete",
+"share" => "share",
+"Password protected" => "Password protected",
+"Error unsetting expiration date" => "Error unsetting expiration date",
+"Error setting expiration date" => "Error setting expiration date",
+"Sending ..." => "Sending ...",
+"Email sent" => "Email sent",
+"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>.",
+"The update was successful. Redirecting you to ownCloud now." => "The update was successful. Redirecting you to ownCloud now.",
+"%s password reset" => "%s password reset",
+"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.",
+"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",
+"Request reset" => "Request reset",
+"Your password was reset" => "Your password was reset",
+"To login page" => "To login page",
+"New password" => "New password",
+"Reset password" => "Reset password",
+"Personal" => "Personal",
+"Users" => "Users",
+"Apps" => "Apps",
+"Admin" => "Admin",
+"Help" => "Help",
+"Access forbidden" => "Access denied",
+"Cloud not found" => "Cloud not found",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!",
+"Edit categories" => "Edit categories",
+"Add" => "Add",
+"Security Warning" => "Security Warning",
+"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)",
+"Please update your PHP installation to use %s securely." => "Please update your PHP installation to use %s securely.",
+"No secure random number generator is available, please enable the PHP OpenSSL extension." => "No secure random number generator is available, please enable the PHP OpenSSL extension.",
+"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account.",
+"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Your data directory and files are probably accessible from the internet because the .htaccess file does not work.",
+"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>.",
+"Create an <strong>admin account</strong>" => "Create an <strong>admin account</strong>",
+"Advanced" => "Advanced",
+"Data folder" => "Data folder",
+"Configure the database" => "Configure the database",
+"will be used" => "will be used",
+"Database user" => "Database user",
+"Database password" => "Database password",
+"Database name" => "Database name",
+"Database tablespace" => "Database tablespace",
+"Database host" => "Database host",
+"Finish setup" => "Finish setup",
+"%s is available. Get more information on how to update." => "%s is available. Get more information on how to update.",
+"Log out" => "Log out",
+"Automatic logon rejected!" => "Automatic logon rejected!",
+"If you did not change your password recently, your account may be compromised!" => "If you did not change your password recently, your account may be compromised!",
+"Please change your password to secure your account again." => "Please change your password to secure your account again.",
+"Lost your password?" => "Lost your password?",
+"remember" => "remember",
+"Log in" => "Log in",
+"Alternative Logins" => "Alternative Logins",
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Hey there,<br><br>just letting you know that %s shared \"%s\" with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!",
+"Updating ownCloud to version %s, this may take a while." => "Updating ownCloud to version %s, this may take a while."
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/eo.php b/core/l10n/eo.php
index fc688b103a6e1102cf6597fe2ab0e82835b7425e..712f97538f3455879b804494aef7e1f27f5dd56a 100644
--- a/core/l10n/eo.php
+++ b/core/l10n/eo.php
@@ -1,6 +1,7 @@
<?php
$TRANSLATIONS = array(
"%s shared »%s« with you" => "%s kunhavigis “%s” kun vi",
+"group" => "grupo",
"Category type not provided." => "Ne proviziĝis tipon de kategorio.",
"No category to add?" => "Ĉu neniu kategorio estas aldonota?",
"This category already exists: %s" => "Tiu kategorio jam ekzistas: %s",
@@ -44,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 9e7f56566833e31181c791aabb7782edbda03b74..3aa0c3f732c6472562f344f48bf0718fd6c61bef 100644
--- a/core/l10n/es.php
+++ b/core/l10n/es.php
@@ -1,6 +1,13 @@
<?php
$TRANSLATIONS = array(
-"%s shared »%s« with you" => "%s compatido »%s« contigo",
+"%s shared »%s« with you" => "%s ha compatido »%s« contigo",
+"group" => "grupo",
+"Turned on maintenance mode" => "Modo mantenimiento activado",
+"Turned off maintenance mode" => "Modo mantenimiento desactivado",
+"Updated database" => "Base de datos actualizada",
+"Updating filecache, this may take really long..." => "Actualizando caché de archivos, esto puede tardar bastante tiempo...",
+"Updated filecache" => "Caché de archivos actualizada",
+"... %d%% done ..." => "... %d%% hecho ...",
"Category type not provided." => "Tipo de categoría no proporcionado.",
"No category to add?" => "¿Ninguna categoría para añadir?",
"This category already exists: %s" => "Esta categoría ya existe: %s",
@@ -29,31 +36,32 @@ $TRANSLATIONS = array(
"November" => "Noviembre",
"December" => "Diciembre",
"Settings" => "Ajustes",
-"seconds ago" => "hace segundos",
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
+"seconds ago" => "segundos antes",
+"_%n minute ago_::_%n minutes ago_" => array("Hace %n minuto","Hace %n minutos"),
+"_%n hour ago_::_%n hours ago_" => array("Hace %n hora","Hace %n horas"),
"today" => "hoy",
"yesterday" => "ayer",
-"_%n day ago_::_%n days ago_" => array("",""),
+"_%n day ago_::_%n days ago_" => array("Hace %n día","Hace %n días"),
"last month" => "el mes pasado",
-"_%n month ago_::_%n months ago_" => array("",""),
-"months ago" => "hace meses",
+"_%n month ago_::_%n months ago_" => array("Hace %n mes","Hace %n meses"),
+"months ago" => "meses antes",
"last year" => "el año pasado",
-"years ago" => "hace años",
+"years ago" => "años antes",
"Choose" => "Seleccionar",
-"Error loading file picker template" => "Error cargando la plantilla del seleccionador de archivos",
"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.",
-"The required file {file} is not installed!" => "¡El fichero requerido {file} no está instalado!",
+"The required file {file} is not installed!" => "¡El fichero {file} es necesario y no está instalado!",
"Shared" => "Compartido",
"Share" => "Compartir",
-"Error while sharing" => "Error mientras comparte",
-"Error while unsharing" => "Error mientras se deja de compartir",
-"Error while changing permissions" => "Error mientras se cambia permisos",
+"Error while sharing" => "Error al compartir",
+"Error while unsharing" => "Error al dejar de compartir",
+"Error while changing permissions" => "Error al cambiar permisos",
"Shared with you and the group {group} by {owner}" => "Compartido contigo y el grupo {group} por {owner}",
"Shared with you by {owner}" => "Compartido contigo por {owner}",
"Share with" => "Compartir con",
@@ -83,6 +91,7 @@ $TRANSLATIONS = array(
"Email sent" => "Correo electrónico enviado",
"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "La actualización ha fracasado. Por favor, informe de este problema a la <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">Comunidad de ownCloud</a>.",
"The update was successful. Redirecting you to ownCloud now." => "La actualización se ha realizado con éxito. Redireccionando a ownCloud ahora.",
+"%s password reset" => "%s restablecer contraseña",
"Use the following link to reset your password: {link}" => "Utilice el siguiente enlace para restablecer su contraseña: {link}",
"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 ." => "El enlace para restablecer la contraseña ha sido enviada a su correo electrónico. <br> Si no lo recibe en un plazo razonable de tiempo, revise su carpeta de spam / correo no deseado. <br> Si no está allí, pregunte a su administrador local.",
"Request failed!<br>Did you make sure your email/username was right?" => "La petición ha fallado! <br> ¿Está seguro de que su dirección de correo electrónico o nombre de usuario era correcto?",
@@ -100,9 +109,9 @@ $TRANSLATIONS = array(
"Apps" => "Aplicaciones",
"Admin" => "Administración",
"Help" => "Ayuda",
-"Access forbidden" => "Acceso prohibido",
+"Access forbidden" => "Acceso denegado",
"Cloud not found" => "No se encuentra la nube",
-"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Oye,⏎ sólo te hago saber que %s compartido %s contigo.⏎ Míralo: %s ⏎Disfrutalo!",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Hey,\n\nsólo te hago saber que %s ha compartido %s contigo.\nEcha un ojo en: %s\n\n¡Un saludo!",
"Edit categories" => "Editar categorías",
"Add" => "Agregar",
"Security Warning" => "Advertencia de seguridad",
@@ -126,13 +135,13 @@ $TRANSLATIONS = array(
"%s is available. Get more information on how to update." => "%s esta disponible. Obtener mas información de como actualizar.",
"Log out" => "Salir",
"Automatic logon rejected!" => "¡Inicio de sesión automático rechazado!",
-"If you did not change your password recently, your account may be compromised!" => "Si usted no ha cambiado su contraseña recientemente, ¡puede que su cuenta esté comprometida!",
+"If you did not change your password recently, your account may be compromised!" => "Si no ha cambiado su contraseña recientemente, ¡puede que su cuenta esté comprometida!",
"Please change your password to secure your account again." => "Por favor cambie su contraseña para asegurar su cuenta nuevamente.",
"Lost your password?" => "¿Ha perdido su contraseña?",
"remember" => "recordar",
"Log in" => "Entrar",
"Alternative Logins" => "Inicios de sesión alternativos",
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Oye,<br><br>sólo te hago saber que %s compartido %s contigo,<br><a href=\"%s\">\nMíralo!</a><br><br>Disfrutalo!",
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Hey,<br><br>sólo te hago saber que %s ha compartido %s contigo.<br><a href=\"%s\">¡Echa un ojo!</a><br><br>¡Un saludo!",
"Updating ownCloud to version %s, this may take a while." => "Actualizando ownCloud a la versión %s, esto puede demorar un tiempo."
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/es_AR.php b/core/l10n/es_AR.php
index cd51ba2f441e38a9f7ca8b23d014c747195a5632..6dce47f760d08dbdfb5600e3343fa29a46f1fcca 100644
--- a/core/l10n/es_AR.php
+++ b/core/l10n/es_AR.php
@@ -1,6 +1,13 @@
<?php
$TRANSLATIONS = array(
"%s shared »%s« with you" => "%s compartió \"%s\" con vos",
+"group" => "grupo",
+"Turned on maintenance mode" => "Modo de mantenimiento activado",
+"Turned off maintenance mode" => "Modo de mantenimiento desactivado",
+"Updated database" => "Base de datos actualizada",
+"Updating filecache, this may take really long..." => "Actualizando caché de archivos, esto puede tardar mucho tiempo...",
+"Updated filecache" => "Caché de archivos actualizada",
+"... %d%% done ..." => "... %d%% hecho ...",
"Category type not provided." => "Tipo de categoría no provisto. ",
"No category to add?" => "¿Ninguna categoría para añadir?",
"This category already exists: %s" => "Esta categoría ya existe: %s",
@@ -30,21 +37,22 @@ $TRANSLATIONS = array(
"December" => "diciembre",
"Settings" => "Configuración",
"seconds ago" => "segundos atrás",
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n minute ago_::_%n minutes ago_" => array("Hace %n minuto","Hace %n minutos"),
+"_%n hour ago_::_%n hours ago_" => array("Hace %n hora","Hace %n horas"),
"today" => "hoy",
"yesterday" => "ayer",
-"_%n day ago_::_%n days ago_" => array("",""),
+"_%n day ago_::_%n days ago_" => array("Hace %n día","Hace %n días"),
"last month" => "el mes pasado",
-"_%n month ago_::_%n months ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("Hace %n mes","Hace %n meses"),
"months ago" => "meses atrás",
"last year" => "el año pasado",
"years ago" => "años atrás",
"Choose" => "Elegir",
-"Error loading file picker template" => "Error al cargar la plantilla del seleccionador de archivos",
"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.",
@@ -83,6 +91,7 @@ $TRANSLATIONS = array(
"Email sent" => "e-mail mandado",
"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "La actualización no pudo ser completada. Por favor, reportá el inconveniente a la comunidad <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud</a>.",
"The update was successful. Redirecting you to ownCloud now." => "La actualización fue exitosa. Estás siendo redirigido a ownCloud.",
+"%s password reset" => "%s restablecer contraseña",
"Use the following link to reset your password: {link}" => "Usá este enlace para restablecer tu contraseña: {link}",
"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 ." => "El enlace para restablecer la contraseña fue enviada a tu e-mail. <br> Si no lo recibís en un plazo de tiempo razonable, revisá tu carpeta de spam / correo no deseado. <br> Si no está ahí, preguntale a tu administrador.",
"Request failed!<br>Did you make sure your email/username was right?" => "¡Error en el pedido! <br> ¿Estás seguro de que tu dirección de correo electrónico o nombre de usuario son correcto?",
@@ -107,9 +116,11 @@ $TRANSLATIONS = array(
"Add" => "Agregar",
"Security Warning" => "Advertencia de seguridad",
"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "La versión de PHP que tenés, es vulnerable al ataque de byte NULL (CVE-2006-7243)",
+"Please update your PHP installation to use %s securely." => "Por favor, actualizá tu instalación PHP para poder usar %s de manera segura.",
"No secure random number generator is available, please enable the PHP OpenSSL extension." => "No hay disponible ningún generador de números aleatorios seguro. Por favor, habilitá la extensión OpenSSL de PHP.",
"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Sin un generador de números aleatorios seguro un atacante podría predecir las pruebas de reinicio de tu contraseña y tomar control de tu cuenta.",
"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Tu directorio de datos y tus archivos probablemente son accesibles a través de internet, ya que el archivo .htaccess no está funcionando.",
+"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Para información sobre cómo configurar apropiadamente tu servidor, por favor mirá la <a href=\"%s\" target=\"_blank\">documentación</a>.",
"Create an <strong>admin account</strong>" => "Crear una <strong>cuenta de administrador</strong>",
"Advanced" => "Avanzado",
"Data folder" => "Directorio de almacenamiento",
diff --git a/core/l10n/es_MX.php b/core/l10n/es_MX.php
new file mode 100644
index 0000000000000000000000000000000000000000..ffcdde48d47cbbe4730b36aec880f7e1642688fb
--- /dev/null
+++ b/core/l10n/es_MX.php
@@ -0,0 +1,9 @@
+<?php
+$TRANSLATIONS = array(
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n day ago_::_%n days ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("",""),
+"_{count} file conflict_::_{count} file conflicts_" => array("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/et_EE.php b/core/l10n/et_EE.php
index a13ed03222117347f53a8e8865a5b367a352db23..17ce89543a6514a6973d042bcee8db63527d1ddf 100644
--- a/core/l10n/et_EE.php
+++ b/core/l10n/et_EE.php
@@ -1,6 +1,13 @@
<?php
$TRANSLATIONS = array(
"%s shared »%s« with you" => "%s jagas sinuga »%s«",
+"group" => "grupp",
+"Turned on maintenance mode" => "Haldusreziimis",
+"Turned off maintenance mode" => "Haldusreziim lõpetatud",
+"Updated database" => "Uuendatud andmebaas",
+"Updating filecache, this may take really long..." => "Uuendan failipuhvrit, see võib kesta väga kaua...",
+"Updated filecache" => "Uuendatud failipuhver",
+"... %d%% done ..." => "... %d%% tehtud ...",
"Category type not provided." => "Kategooria tüüp puudub.",
"No category to add?" => "Pole kategooriat, mida lisada?",
"This category already exists: %s" => "See kategooria on juba olemas: %s",
@@ -9,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",
@@ -41,10 +53,13 @@ $TRANSLATIONS = array(
"last year" => "viimasel aastal",
"years ago" => "aastat tagasi",
"Choose" => "Vali",
-"Error loading file picker template" => "Viga failivalija malli laadimisel",
+"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.",
@@ -126,7 +141,6 @@ $TRANSLATIONS = array(
"Finish setup" => "Lõpeta seadistamine",
"%s is available. Get more information on how to update." => "%s on saadaval. Vaata lähemalt kuidas uuendada.",
"Log out" => "Logi välja",
-"More apps" => "Rohkem rakendusi",
"Automatic logon rejected!" => "Automaatne sisselogimine lükati tagasi!",
"If you did not change your password recently, your account may be compromised!" => "Kui sa ei muutnud oma parooli hiljuti, siis võib su kasutajakonto olla ohustatud!",
"Please change your password to secure your account again." => "Palun muuda parooli, et oma kasutajakonto uuesti turvata.",
diff --git a/core/l10n/eu.php b/core/l10n/eu.php
index 83b8fca1eabd93da410dcfb471ab3050f9fde8a6..1e6594adf6fec37102183fdd14e008218c661a68 100644
--- a/core/l10n/eu.php
+++ b/core/l10n/eu.php
@@ -1,6 +1,7 @@
<?php
$TRANSLATIONS = array(
"%s shared »%s« with you" => "%s-ek »%s« zurekin partekatu du",
+"group" => "taldea",
"Category type not provided." => "Kategoria mota ez da zehaztu.",
"No category to add?" => "Ez dago gehitzeko kategoriarik?",
"This category already exists: %s" => "Kategoria hau dagoeneko existitzen da: %s",
@@ -41,10 +42,11 @@ $TRANSLATIONS = array(
"last year" => "joan den urtean",
"years ago" => "urte",
"Choose" => "Aukeratu",
-"Error loading file picker template" => "Errorea fitxategi hautatzaile txantiloiak kargatzerakoan",
"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.",
@@ -126,7 +128,6 @@ $TRANSLATIONS = array(
"Finish setup" => "Bukatu konfigurazioa",
"%s is available. Get more information on how to update." => "%s erabilgarri dago. Eguneratzeaz argibide gehiago eskuratu.",
"Log out" => "Saioa bukatu",
-"More apps" => "App gehiago",
"Automatic logon rejected!" => "Saio hasiera automatikoa ez onartuta!",
"If you did not change your password recently, your account may be compromised!" => "Zure pasahitza orain dela gutxi ez baduzu aldatu, zure kontua arriskuan egon daiteke!",
"Please change your password to secure your account again." => "Mesedez aldatu zure pasahitza zure kontua berriz segurtatzeko.",
diff --git a/core/l10n/fa.php b/core/l10n/fa.php
index a9e17a194ae085c8aedce48ee529d0440bdeec98..930a5b0dcbce4b9809bb6af1cbd64355401d9958 100644
--- a/core/l10n/fa.php
+++ b/core/l10n/fa.php
@@ -1,6 +1,7 @@
<?php
$TRANSLATIONS = array(
"%s shared »%s« with you" => "%s به اشتراک گذاشته شده است »%s« توسط شما",
+"group" => "گروه",
"Category type not provided." => "نوع دسته بندی ارائه نشده است.",
"No category to add?" => "آیا گروه دیگری برای افزودن ندارید",
"This category already exists: %s" => "این دسته هم اکنون وجود دارد: %s",
@@ -41,10 +42,11 @@ $TRANSLATIONS = array(
"last year" => "سال قبل",
"years ago" => "سالهای قبل",
"Choose" => "انتخاب کردن",
-"Error loading file picker template" => "خطا در بارگذاری قالب انتخاب کننده فایل",
"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 d3cfe01293e1e0fe0256a4332b414233f7f00d4f..cf215159c39564cdf9e72f745c64c5024b942e2d 100644
--- a/core/l10n/fi_FI.php
+++ b/core/l10n/fi_FI.php
@@ -1,12 +1,22 @@
<?php
$TRANSLATIONS = array(
"%s shared »%s« with you" => "%s jakoi kohteen »%s« kanssasi",
+"group" => "ryhmä",
+"Turned on maintenance mode" => "Siirrytty ylläpitotilaan",
+"Turned off maintenance mode" => "Ylläpitotila laitettu pois päältä",
+"Updated database" => "Tietokanta ajan tasalla",
+"Updating filecache, this may take really long..." => "Päivitetään tiedostojen välimuistia, tämä saattaa kestää todella kauan...",
+"Updated filecache" => "Tiedostojen välimuisti päivitetty",
+"... %d%% done ..." => "... %d%% valmis ...",
"Category type not provided." => "Luokan tyyppiä ei määritelty.",
"No category to add?" => "Ei lisättävää luokkaa?",
"This category already exists: %s" => "Luokka on jo olemassa: %s",
"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",
@@ -42,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!",
@@ -64,6 +79,7 @@ $TRANSLATIONS = array(
"Share via email:" => "Jaa sähköpostilla:",
"No people found" => "Henkilöitä ei löytynyt",
"Resharing is not allowed" => "Jakaminen uudelleen ei ole salittu",
+"Shared in {item} with {user}" => "{item} on jaettu {user} kanssa",
"Unshare" => "Peru jakaminen",
"can edit" => "voi muokata",
"access control" => "Pääsyn hallinta",
@@ -78,6 +94,7 @@ $TRANSLATIONS = array(
"Email sent" => "Sähköposti lähetetty",
"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Päivitys epäonnistui. Ilmoita ongelmasta <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud-yhteisölle</a>.",
"The update was successful. Redirecting you to ownCloud now." => "Päivitys onnistui. Selain ohjautuu nyt ownCloudiisi.",
+"%s password reset" => "%s salasanan nollaus",
"Use the following link to reset your password: {link}" => "Voit palauttaa salasanasi seuraavassa osoitteessa: {link}",
"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Linkki salasanan nollaamiseen on lähetetty sähköpostiisi.<br>Jos et saa viestiä pian, tarkista roskapostikansiosi.<br>Jos et löydä viestiä roskapostinkaan seasta, ota yhteys ylläpitäjään.",
"Request failed!<br>Did you make sure your email/username was right?" => "Pyyntö epäonnistui!<br>Olihan sähköpostiosoitteesi/käyttäjätunnuksesi oikein?",
@@ -118,7 +135,6 @@ $TRANSLATIONS = array(
"Finish setup" => "Viimeistele asennus",
"%s is available. Get more information on how to update." => "%s on saatavilla. Lue lisätietoja, miten päivitys asennetaan.",
"Log out" => "Kirjaudu ulos",
-"More apps" => "Lisää sovelluksia",
"Automatic logon rejected!" => "Automaattinen sisäänkirjautuminen hylättiin!",
"If you did not change your password recently, your account may be compromised!" => "Jos et vaihtanut salasanaasi äskettäin, tilisi saattaa olla murrettu.",
"Please change your password to secure your account again." => "Vaihda salasanasi suojataksesi tilisi uudelleen.",
diff --git a/core/l10n/fr.php b/core/l10n/fr.php
index 3f85cb1503fb4fb58c7245e02cd689a1e87ef9f3..e7cb75e53f0aceb0327b57d0e3d2c48d7597cc82 100644
--- a/core/l10n/fr.php
+++ b/core/l10n/fr.php
@@ -1,6 +1,13 @@
<?php
$TRANSLATIONS = array(
"%s shared »%s« with you" => "%s partagé »%s« avec vous",
+"group" => "groupe",
+"Turned on maintenance mode" => "Basculé en mode maintenance",
+"Turned off maintenance mode" => "Basculé en mode production (non maintenance)",
+"Updated database" => "Base de données mise à jour",
+"Updating filecache, this may take really long..." => "En cours de mise à jour de cache de fichiers. Cette opération peut être très longue...",
+"Updated filecache" => "Cache de fichier mis à jour",
+"... %d%% done ..." => "... %d%% effectué ...",
"Category type not provided." => "Type de catégorie non spécifié.",
"No category to add?" => "Pas de catégorie à ajouter ?",
"This category already exists: %s" => "Cette catégorie existe déjà : %s",
@@ -9,6 +16,11 @@ $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",
+"No temporary profile picture available, try again" => "Aucune image temporaire disponible pour le profil. Essayez à nouveau.",
+"No crop data provided" => "Aucune donnée de culture fournie",
"Sunday" => "Dimanche",
"Monday" => "Lundi",
"Tuesday" => "Mardi",
@@ -30,21 +42,31 @@ $TRANSLATIONS = array(
"December" => "décembre",
"Settings" => "Paramètres",
"seconds ago" => "il y a quelques secondes",
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n minute ago_::_%n minutes ago_" => array("il y a %n minute","il y a %n minutes"),
+"_%n hour ago_::_%n hours ago_" => array("Il y a %n heure","Il y a %n heures"),
"today" => "aujourd'hui",
"yesterday" => "hier",
-"_%n day ago_::_%n days ago_" => array("",""),
+"_%n day ago_::_%n days ago_" => array("il y a %n jour","il y a %n jours"),
"last month" => "le mois dernier",
-"_%n month ago_::_%n months ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("Il y a %n mois","Il y a %n mois"),
"months ago" => "il y a plusieurs mois",
"last year" => "l'année dernière",
"years ago" => "il y a plusieurs années",
"Choose" => "Choisir",
-"Error loading file picker template" => "Erreur de chargement du modèle du sélecteur de fichier",
+"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",
+"Continue" => "Poursuivre",
+"(all selected)" => "(tous sélectionnés)",
+"({count} selected)" => "({count} sélectionnés)",
+"Error loading file exists template" => "Erreur de chargement du modèle de fichier existant",
"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é.",
@@ -83,6 +105,7 @@ $TRANSLATIONS = array(
"Email sent" => "Email envoyé",
"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "La mise à jour a échoué. Veuillez signaler ce problème à la <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">communauté ownCloud</a>.",
"The update was successful. Redirecting you to ownCloud now." => "La mise à jour a réussi. Vous êtes redirigé maintenant vers ownCloud.",
+"%s password reset" => "Réinitialisation de votre mot de passe %s",
"Use the following link to reset your password: {link}" => "Utilisez le lien suivant pour réinitialiser votre mot de passe : {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 ." => "Le lien permettant de réinitialiser votre mot de passe vous a été transmis.<br>Si vous ne le recevez pas dans un délai raisonnable, vérifier votre boîte de pourriels.<br>Au besoin, contactez votre administrateur local.",
"Request failed!<br>Did you make sure your email/username was right?" => "Requête en échec!<br>Avez-vous vérifié vos courriel/nom d'utilisateur?",
@@ -107,9 +130,11 @@ $TRANSLATIONS = array(
"Add" => "Ajouter",
"Security Warning" => "Avertissement de sécurité",
"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Votre version de PHP est vulnérable à l'attaque par caractère NULL (CVE-2006-7243)",
+"Please update your PHP installation to use %s securely." => "Veuillez mettre à jour votre installation PHP pour utiliser %s de façon sécurisée.",
"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Aucun générateur de nombre aléatoire sécurisé n'est disponible, veuillez activer l'extension PHP OpenSSL",
"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Sans générateur de nombre aléatoire sécurisé, un attaquant peut être en mesure de prédire les jetons de réinitialisation du mot de passe, et ainsi prendre le contrôle de votre compte utilisateur.",
"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Votre répertoire data est certainement accessible depuis l'internet car le fichier .htaccess ne semble pas fonctionner",
+"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Pour les informations de configuration de votre serveur, veuillez lire la <a href=\"%s\" target=\"_blank\">documentation</a>.",
"Create an <strong>admin account</strong>" => "Créer un <strong>compte administrateur</strong>",
"Advanced" => "Avancé",
"Data folder" => "Répertoire des données",
diff --git a/core/l10n/gl.php b/core/l10n/gl.php
index 9db68bbbd059ea34b4efc032f5bf32baebaa2a90..e3be94537e5a02207c3f3b8753c152f61b8f6de5 100644
--- a/core/l10n/gl.php
+++ b/core/l10n/gl.php
@@ -1,6 +1,13 @@
<?php
$TRANSLATIONS = array(
"%s shared »%s« with you" => "%s compartiu «%s» con vostede",
+"group" => "grupo",
+"Turned on maintenance mode" => "Modo de mantemento activado",
+"Turned off maintenance mode" => "Modo de mantemento desactivado",
+"Updated database" => "Base de datos actualizada",
+"Updating filecache, this may take really long..." => "Actualizando o ficheiro da caché, isto pode levar bastante tempo...",
+"Updated filecache" => "Ficheiro da caché actualizado",
+"... %d%% done ..." => "... %d%% feito ...",
"Category type not provided." => "Non se indicou o tipo de categoría",
"No category to add?" => "Sen categoría que engadir?",
"This category already exists: %s" => "Esta categoría xa existe: %s",
@@ -9,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",
@@ -41,10 +53,20 @@ $TRANSLATIONS = array(
"last year" => "último ano",
"years ago" => "anos atrás",
"Choose" => "Escoller",
-"Error loading file picker template" => "Produciuse un erro ao cargar o modelo do selector de ficheiros",
+"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.",
@@ -126,7 +148,6 @@ $TRANSLATIONS = array(
"Finish setup" => "Rematar a configuración",
"%s is available. Get more information on how to update." => "%s está dispoñíbel. Obteña máis información sobre como actualizar.",
"Log out" => "Desconectar",
-"More apps" => "Máis aplicativos",
"Automatic logon rejected!" => "Rexeitouse a entrada automática",
"If you did not change your password recently, your account may be compromised!" => "Se non fixo recentemente cambios de contrasinal é posíbel que a súa conta estea comprometida!",
"Please change your password to secure your account again." => "Cambie de novo o seu contrasinal para asegurar a súa conta.",
diff --git a/core/l10n/he.php b/core/l10n/he.php
index c9c6e1f750758c2ec0dfbdf6d1729f6b47bb6c39..704755da07f33fedbdfe7cc7a5570693f66f1e46 100644
--- a/core/l10n/he.php
+++ b/core/l10n/he.php
@@ -1,6 +1,7 @@
<?php
$TRANSLATIONS = array(
"%s shared »%s« with you" => "%s שיתף/שיתפה איתך את »%s«",
+"group" => "קבוצה",
"Category type not provided." => "סוג הקטגוריה לא סופק.",
"No category to add?" => "אין קטגוריה להוספה?",
"This category already exists: %s" => "הקטגוריה הבאה כבר קיימת: %s",
@@ -41,10 +42,11 @@ $TRANSLATIONS = array(
"last year" => "שנה שעברה",
"years ago" => "שנים",
"Choose" => "בחירה",
-"Error loading file picker template" => "שגיאה בטעינת תבנית בחירת הקבצים",
"Yes" => "כן",
"No" => "לא",
"Ok" => "בסדר",
+"_{count} file conflict_::_{count} file conflicts_" => array("",""),
+"Cancel" => "ביטול",
"The object type is not specified." => "סוג הפריט לא צוין.",
"Error" => "שגיאה",
"The app name is not specified." => "שם היישום לא צוין.",
@@ -122,7 +124,6 @@ $TRANSLATIONS = array(
"Finish setup" => "סיום התקנה",
"%s is available. Get more information on how to update." => "%s זמינה להורדה. ניתן ללחוץ כדי לקבל מידע נוסף כיצד לעדכן.",
"Log out" => "התנתקות",
-"More apps" => "יישומים נוספים",
"Automatic logon rejected!" => "בקשת הכניסה האוטומטית נדחתה!",
"If you did not change your password recently, your account may be compromised!" => "אם לא שינית את ססמתך לאחרונה, יתכן שחשבונך נפגע!",
"Please change your password to secure your account again." => "נא לשנות את הססמה שלך כדי לאבטח את חשבונך מחדש.",
diff --git a/core/l10n/hi.php b/core/l10n/hi.php
index 00cb5926d70ce9255c018f32930cf2ba5952f572..e783ec88d1771ac29f05ef076e53f64e7cf1909e 100644
--- a/core/l10n/hi.php
+++ b/core/l10n/hi.php
@@ -1,5 +1,15 @@
<?php
$TRANSLATIONS = array(
+"Category type not provided." => "कैटेगरी प्रकार उपलब्ध नहीं है",
+"This category already exists: %s" => "यह कैटेगरी पहले से ही मौजूद है: %s",
+"Object type not provided." => "ऑब्जेक्ट प्रकार नहीं दिया हुआ",
+"Sunday" => "रविवार",
+"Monday" => "सोमवार",
+"Tuesday" => "मंगलवार",
+"Wednesday" => "बुधवार",
+"Thursday" => "बृहस्पतिवार",
+"Friday" => "शुक्रवार",
+"Saturday" => "शनिवार",
"January" => "जनवरी",
"February" => "फरवरी",
"March" => "मार्च",
@@ -17,10 +27,15 @@ $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}",
"You will receive a link to reset your password via Email." => "पासवर्ड बदलने कि लिंक आपको ई-मेल द्वारा भेजी जायेगी|",
"Username" => "प्रयोक्ता का नाम",
@@ -31,6 +46,8 @@ $TRANSLATIONS = array(
"Apps" => "Apps",
"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 c231d7f9a444c49c568ba8465eb749036248ee71..107a5f04c05dd2a7dfb5fa2bead82dcd12622e89 100644
--- a/core/l10n/hu_HU.php
+++ b/core/l10n/hu_HU.php
@@ -1,6 +1,13 @@
<?php
$TRANSLATIONS = array(
"%s shared »%s« with you" => "%s megosztotta Önnel ezt: »%s«",
+"group" => "csoport",
+"Turned on maintenance mode" => "A karbantartási mód bekapcsolva",
+"Turned off maintenance mode" => "A karbantartási mód kikapcsolva",
+"Updated database" => "Frissítet adatbázis",
+"Updating filecache, this may take really long..." => "A filecache frissítése folyamatban, ez a folyamat hosszabb ideig is eltarthat...",
+"Updated filecache" => "Filecache frissítve",
+"... %d%% done ..." => "... %d%% kész ...",
"Category type not provided." => "Nincs megadva a kategória típusa.",
"No category to add?" => "Nincs hozzáadandó kategória?",
"This category already exists: %s" => "Ez a kategória már létezik: %s",
@@ -9,6 +16,11 @@ $TRANSLATIONS = array(
"Error adding %s to favorites." => "Nem sikerült a kedvencekhez adni ezt: %s",
"No categories selected for deletion." => "Nincs törlésre jelölt kategória",
"Error removing %s from favorites." => "Nem sikerült a kedvencekből törölni ezt: %s",
+"No image or file provided" => "Nincs kép vagy file megadva",
+"Unknown filetype" => "Ismeretlen file tipús",
+"Invalid image" => "Hibás kép",
+"No temporary profile picture available, try again" => "Az átmeneti profil kép nem elérhető, próbáld újra",
+"No crop data provided" => "Vágáshoz nincs adat megadva",
"Sunday" => "vasárnap",
"Monday" => "hétfő",
"Tuesday" => "kedd",
@@ -41,10 +53,20 @@ $TRANSLATIONS = array(
"last year" => "tavaly",
"years ago" => "több éve",
"Choose" => "Válasszon",
-"Error loading file picker template" => "Nem sikerült betölteni a fájlkiválasztó sablont",
+"Error loading file picker template: {error}" => "Nem sikerült betölteni a fájlkiválasztó sablont: {error}",
"Yes" => "Igen",
"No" => "Nem",
"Ok" => "Ok",
+"Error loading message template: {error}" => "Nem sikerült betölteni az üzenet sablont: {error}",
+"_{count} file conflict_::_{count} file conflicts_" => array("",""),
+"One file conflict" => "Egy file ütközik",
+"Which files do you want to keep?" => "Melyik file-okat akarod megtartani?",
+"If you select both versions, the copied file will have a number added to its name." => "Ha kiválasztod mindazokaz a verziókat, a másolt fileok neve sorszámozva lesz.",
+"Cancel" => "Mégsem",
+"Continue" => "Folytatás",
+"(all selected)" => "(all selected)",
+"({count} selected)" => "({count} kiválasztva)",
+"Error loading file exists template" => "Hiba a létező sablon betöltésekor",
"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.",
@@ -83,6 +105,7 @@ $TRANSLATIONS = array(
"Email sent" => "Az emailt elküldtük",
"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "A frissítés nem sikerült. Kérem értesítse erről a problémáról az <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud közösséget</a>.",
"The update was successful. Redirecting you to ownCloud now." => "A frissítés sikeres volt. Visszairányítjuk az ownCloud szolgáltatáshoz.",
+"%s password reset" => "%s jelszó visszaállítás",
"Use the following link to reset your password: {link}" => "Használja ezt a linket a jelszó ismételt beállításához: {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 ." => "Emailben fog kapni egy linket, amivel új jelszót tud majd beállítani magának. <br>Ha a levél nem jött meg, holott úgy érzi, hogy már meg kellett volna érkeznie, akkor ellenőrizze a spam/levélszemét mappáját. <br>Ha ott sincsen, akkor érdeklődjön a rendszergazdánál.",
"Request failed!<br>Did you make sure your email/username was right?" => "A kérést nem sikerült teljesíteni! <br>Biztos, hogy jó emailcímet/felhasználónevet adott meg?",
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 fc6cb788fb01ffc3fe07d6be992244c92504aa6c..69993d440559660065600969dbd4ecbe10f99ef9 100644
--- a/core/l10n/id.php
+++ b/core/l10n/id.php
@@ -1,5 +1,6 @@
<?php
$TRANSLATIONS = array(
+"group" => "grup",
"Category type not provided." => "Tipe kategori tidak diberikan.",
"No category to add?" => "Tidak ada kategori yang akan ditambahkan?",
"This category already exists: %s" => "Kategori ini sudah ada: %s",
@@ -43,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 8c09b4e90fb0705af2e0fbc3324aadb15bbdef67..bd2fad79c87e0ca659b765f8e13257530b68e669 100644
--- a/core/l10n/it.php
+++ b/core/l10n/it.php
@@ -1,6 +1,13 @@
<?php
$TRANSLATIONS = array(
"%s shared »%s« with you" => "%s ha condiviso «%s» con te",
+"group" => "gruppo",
+"Turned on maintenance mode" => "Modalità di manutenzione attivata",
+"Turned off maintenance mode" => "Modalità di manutenzione disattivata",
+"Updated database" => "Database aggiornato",
+"Updating filecache, this may take really long..." => "Aggiornamento della cache dei file in corso, potrebbe richiedere molto tempo...",
+"Updated filecache" => "Cache dei file aggiornata",
+"... %d%% done ..." => "... %d%% completato ...",
"Category type not provided." => "Tipo di categoria non fornito.",
"No category to add?" => "Nessuna categoria da aggiungere?",
"This category already exists: %s" => "Questa categoria esiste già: %s",
@@ -9,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ì",
@@ -41,10 +53,20 @@ $TRANSLATIONS = array(
"last year" => "anno scorso",
"years ago" => "anni fa",
"Choose" => "Scegli",
-"Error loading file picker template" => "Errore durante il caricamento del modello del selezionatore di file",
+"Error loading file picker template: {error}" => "Errore durante il caricamento del modello del selettore file: {error}",
"Yes" => "Sì",
"No" => "No",
"Ok" => "Ok",
+"Error loading message template: {error}" => "Errore durante il 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 file in conflitto",
+"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, sarà aggiunto un numero al nome del file copiato.",
+"Cancel" => "Annulla",
+"Continue" => "Continua",
+"(all selected)" => "(tutti i 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.",
@@ -126,7 +148,6 @@ $TRANSLATIONS = array(
"Finish setup" => "Termina la configurazione",
"%s is available. Get more information on how to update." => "%s è disponibile. Ottieni ulteriori informazioni sull'aggiornamento.",
"Log out" => "Esci",
-"More apps" => "Altre applicazioni",
"Automatic logon rejected!" => "Accesso automatico rifiutato.",
"If you did not change your password recently, your account may be compromised!" => "Se non hai cambiato la password recentemente, il tuo account potrebbe essere compromesso.",
"Please change your password to secure your account again." => "Cambia la password per rendere nuovamente sicuro il tuo account.",
diff --git a/core/l10n/ja_JP.php b/core/l10n/ja_JP.php
index 31d2f92eff245f267b29181d7d0c5be95ee66149..110e5b2120106280453aa1e8ca29e062de747649 100644
--- a/core/l10n/ja_JP.php
+++ b/core/l10n/ja_JP.php
@@ -1,6 +1,13 @@
<?php
$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",
@@ -9,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" => "火",
@@ -41,10 +53,20 @@ $TRANSLATIONS = array(
"last year" => "一年前",
"years ago" => "年前",
"Choose" => "選択",
-"Error loading file picker template" => "ファイルピッカーのテンプレートの読み込みエラー",
+"Error loading file picker template: {error}" => "ファイル選択テンプレートの読み込みエラー: {error}",
"Yes" => "はい",
"No" => "いいえ",
"Ok" => "OK",
+"Error loading message template: {error}" => "メッセージテンプレートの読み込みエラー: {error}",
+"_{count} file conflict_::_{count} file conflicts_" => array("{count} ファイルが競合"),
+"One file conflict" => "1ファイルが競合",
+"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." => "アプリ名がしていされていません。",
@@ -126,7 +148,6 @@ $TRANSLATIONS = array(
"Finish setup" => "セットアップを完了します",
"%s is available. Get more information on how to update." => "%s が利用可能です。更新方法に関してさらに情報を取得して下さい。",
"Log out" => "ログアウト",
-"More apps" => "他のアプリ",
"Automatic logon rejected!" => "自動ログインは拒否されました！",
"If you did not change your password recently, your account may be compromised!" => "最近パスワードを変更していない場合、あなたのアカウントは危険にさらされているかもしれません。",
"Please change your password to secure your account again." => "アカウント保護の為、パスワードを再度の変更をお願いいたします。",
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 0f4b23906d6364e544e4fd8fb554073a94e37f78..e051f9ce1d208df3d78cc7e54f3ebc8d40b72f5f 100644
--- a/core/l10n/ka_GE.php
+++ b/core/l10n/ka_GE.php
@@ -1,5 +1,6 @@
<?php
$TRANSLATIONS = array(
+"group" => "ჯგუფი",
"Category type not provided." => "კატეგორიის ტიპი არ არის განხილული.",
"No category to add?" => "არ არის კატეგორია დასამატებლად?",
"This category already exists: %s" => "კატეგორია უკვე არსებობს: %s",
@@ -43,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
new file mode 100644
index 0000000000000000000000000000000000000000..dbedde7e637fc27c397b763e7b58eeca8338d6d2
--- /dev/null
+++ b/core/l10n/km.php
@@ -0,0 +1,9 @@
+<?php
+$TRANSLATIONS = array(
+"_%n minute ago_::_%n minutes ago_" => array(""),
+"_%n hour ago_::_%n hours ago_" => array(""),
+"_%n day ago_::_%n days ago_" => array(""),
+"_%n month ago_::_%n months ago_" => array(""),
+"_{count} file conflict_::_{count} file conflicts_" => array("")
+);
+$PLURAL_FORMS = "nplurals=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 c4b6b9f091bcbeaa68966534c0e9bc28ea4860be..947f5e9ee26492fb4d4a071921407d12a3df99d9 100644
--- a/core/l10n/ko.php
+++ b/core/l10n/ko.php
@@ -1,5 +1,6 @@
<?php
$TRANSLATIONS = array(
+"group" => "그룹",
"Category type not provided." => "분류 형식이 제공되지 않았습니다.",
"No category to add?" => "추가할 분류가 없습니까?",
"This category already exists: %s" => "분류가 이미 존재합니다: %s",
@@ -43,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 a2a0ff22ef618237418f2416e42b223af963d2d1..2feb6db272318fe7e6a9187fdb042858a1edf1a4 100644
--- a/core/l10n/ku_IQ.php
+++ b/core/l10n/ku_IQ.php
@@ -5,7 +5,9 @@ $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" => "وشەی تێپەربو",
"Username" => "ناوی بهکارهێنهر",
"New password" => "وشەی نهێنی نوێ",
diff --git a/core/l10n/lb.php b/core/l10n/lb.php
index 8a5a28957c43b2744d6b1d4eb6f89033d9f2ab4d..9e127d867c68b8128690fc1d707c1838a0c48c19 100644
--- a/core/l10n/lb.php
+++ b/core/l10n/lb.php
@@ -1,6 +1,7 @@
<?php
$TRANSLATIONS = array(
"%s shared »%s« with you" => "Den/D' %s huet »%s« mat dir gedeelt",
+"group" => "Grupp",
"Category type not provided." => "Typ vun der Kategorie net uginn.",
"No category to add?" => "Keng Kategorie fir bäizesetzen?",
"This category already exists: %s" => "Dës Kategorie existéiert schon: %s",
@@ -41,10 +42,11 @@ $TRANSLATIONS = array(
"last year" => "Lescht Joer",
"years ago" => "Joren hir",
"Choose" => "Auswielen",
-"Error loading file picker template" => "Feeler beim Luede vun der Virlag fir d'Fichiers-Selektioun",
"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 84678c1c208303b6e1804a0b8575e7db28d11d66..610e7aeadebcfebe3a2b3184c97649b6c57ff39d 100644
--- a/core/l10n/lt_LT.php
+++ b/core/l10n/lt_LT.php
@@ -1,6 +1,13 @@
<?php
$TRANSLATIONS = array(
"%s shared »%s« with you" => "%s pasidalino »%s« su tavimi",
+"group" => "grupė",
+"Turned on maintenance mode" => "Įjungta priežiūros veiksena",
+"Turned off maintenance mode" => "Išjungta priežiūros veiksena",
+"Updated database" => "Atnaujinta duomenų bazė",
+"Updating filecache, this may take really long..." => "Atnaujinama failų talpykla, tai gali užtrukti labai ilgai...",
+"Updated filecache" => "Atnaujinta failų talpykla",
+"... %d%% done ..." => "... %d%% atlikta ...",
"Category type not provided." => "Kategorija nenurodyta.",
"No category to add?" => "Nepridėsite jokios kategorijos?",
"This category already exists: %s" => "Ši kategorija jau egzistuoja: %s",
@@ -9,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",
@@ -34,17 +46,27 @@ $TRANSLATIONS = array(
"_%n hour ago_::_%n hours ago_" => array("prieš %n valandą","prieš %n valandų","prieš %n valandų"),
"today" => "šiandien",
"yesterday" => "vakar",
-"_%n day ago_::_%n days ago_" => array("","",""),
+"_%n day ago_::_%n days ago_" => array("prieš %n dieną","prieš %n dienas","prieš %n dienų"),
"last month" => "praeitą mėnesį",
"_%n month ago_::_%n months ago_" => array("prieš %n mėnesį","prieš %n mėnesius","prieš %n mėnesių"),
"months ago" => "prieš mėnesį",
"last year" => "praeitais metais",
"years ago" => "prieš metus",
"Choose" => "Pasirinkite",
-"Error loading file picker template" => "Klaida pakraunant failų naršyklę",
+"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("{count} failas konfliktuoja","{count} failai konfliktuoja","{count} failų konfliktų"),
+"One file conflict" => "Vienas failo konfliktas",
+"Which files do you want to keep?" => "Kuriuos failus norite laikyti?",
+"If you select both versions, the copied file will have a number added to its name." => "Jei pasirenkate abi versijas, nukopijuotas failas turės pridėtą numerį pavadinime.",
+"Cancel" => "Atšaukti",
+"Continue" => "Tęsti",
+"(all selected)" => "(visi pažymėti)",
+"({count} selected)" => "({count} pažymėtų)",
+"Error loading file exists template" => "Klaida įkeliant esančių failų ruošinį",
"The object type is not specified." => "Objekto tipas nenurodytas.",
"Error" => "Klaida",
"The app name is not specified." => "Nenurodytas programos pavadinimas.",
@@ -60,6 +82,7 @@ $TRANSLATIONS = array(
"Share with link" => "Dalintis nuoroda",
"Password protect" => "Apsaugotas slaptažodžiu",
"Password" => "Slaptažodis",
+"Allow Public Upload" => "Leisti viešą įkėlimą",
"Email link to person" => "Nusiųsti nuorodą paštu",
"Send" => "Siųsti",
"Set expiration date" => "Nustatykite galiojimo laiką",
@@ -88,6 +111,7 @@ $TRANSLATIONS = array(
"Request failed!<br>Did you make sure your email/username was right?" => "Klaida!<br>Ar tikrai jūsų el paštas/vartotojo vardas buvo teisingi?",
"You will receive a link to reset your password via Email." => "Elektroniniu paštu gausite nuorodą, su kuria galėsite iš naujo nustatyti slaptažodį.",
"Username" => "Prisijungimo vardas",
+"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?" => "Jūsų failai yra užšifruoti. Jei neįjungėte atstatymo rakto, nebus galimybės atstatyti duomenų po slaptažodžio atstatymo. Jei nesate tikri ką daryti, prašome susisiekti su administratoriumi prie tęsiant. Ar tikrai tęsti?",
"Yes, I really want to reset my password now" => "Taip, aš tikrai noriu atnaujinti slaptažodį",
"Request reset" => "Prašyti nustatymo iš najo",
"Your password was reset" => "Jūsų slaptažodis buvo nustatytas iš naujo",
@@ -101,13 +125,16 @@ $TRANSLATIONS = array(
"Help" => "Pagalba",
"Access forbidden" => "Priėjimas draudžiamas",
"Cloud not found" => "Negalima rasti",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Labas,\n\nInformuojame, kad %s pasidalino su Jumis %s.\nPažiūrėkite: %s\n\nLinkėjimai!",
"Edit categories" => "Redaguoti kategorijas",
"Add" => "Pridėti",
"Security Warning" => "Saugumo pranešimas",
"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Jūsų PHP versija yra pažeidžiama prieš NULL Byte ataką (CVE-2006-7243)",
+"Please update your PHP installation to use %s securely." => "Prašome atnaujinti savo PHP, kad saugiai naudoti %s.",
"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Saugaus atsitiktinių skaičių generatoriaus nėra, prašome įjungti PHP OpenSSL modulį.",
"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Be saugaus atsitiktinių skaičių generatoriaus, piktavaliai gali atspėti Jūsų slaptažodį ir pasisavinti paskyrą.",
"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Jūsų failai yra tikriausiai prieinami per internetą nes .htaccess failas neveikia.",
+"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Kad gauti informaciją apie tai kaip tinkamai sukonfigūruoti savo serverį, prašome skaityti <a href=\"%s\" target=\"_blank\">dokumentaciją</a>.",
"Create an <strong>admin account</strong>" => "Sukurti <strong>administratoriaus paskyrą</strong>",
"Advanced" => "Išplėstiniai",
"Data folder" => "Duomenų katalogas",
@@ -121,7 +148,6 @@ $TRANSLATIONS = array(
"Finish setup" => "Baigti diegimą",
"%s is available. Get more information on how to update." => "%s yra prieinama. Gaukite daugiau informacijos apie atnaujinimą.",
"Log out" => "Atsijungti",
-"More apps" => "Daugiau programų",
"Automatic logon rejected!" => "Automatinis prisijungimas atmestas!",
"If you did not change your password recently, your account may be compromised!" => "Jei paskutinių metu nekeitėte savo slaptažodžio, Jūsų paskyra gali būti pavojuje!",
"Please change your password to secure your account again." => "Prašome pasikeisti slaptažodį dar kartą, dėl paskyros saugumo.",
@@ -129,6 +155,7 @@ $TRANSLATIONS = array(
"remember" => "prisiminti",
"Log in" => "Prisijungti",
"Alternative Logins" => "Alternatyvūs prisijungimai",
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Labas,<br><br>tik informuojame, kad %s pasidalino su Jumis »%s«.<br><a href=\"%s\">Peržiūrėk!</a><br><br>Linkėjimai!",
"Updating ownCloud to version %s, this may take a while." => "Atnaujinama ownCloud į %s versiją. tai gali šiek tiek užtrukti."
);
$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/core/l10n/lv.php b/core/l10n/lv.php
index 6deb5dfda9fb099161c2737fa93872a3e0d7acb8..6bdbeaf5e209e3e2b1e0c40ce05ab2aeed744267 100644
--- a/core/l10n/lv.php
+++ b/core/l10n/lv.php
@@ -1,6 +1,7 @@
<?php
$TRANSLATIONS = array(
"%s shared »%s« with you" => "%s kopīgots »%s« ar jums",
+"group" => "grupa",
"Category type not provided." => "Kategorijas tips nav norādīts.",
"No category to add?" => "Nav kategoriju, ko pievienot?",
"This category already exists: %s" => "Šāda kategorija jau eksistē — %s",
@@ -41,10 +42,11 @@ $TRANSLATIONS = array(
"last year" => "gājušajā gadā",
"years ago" => "gadus atpakaļ",
"Choose" => "Izvēlieties",
-"Error loading file picker template" => "Kļūda ielādējot datņu ņēmēja veidni",
"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.",
@@ -126,7 +128,6 @@ $TRANSLATIONS = array(
"Finish setup" => "Pabeigt iestatīšanu",
"%s is available. Get more information on how to update." => "%s ir pieejams. Uzziniet vairāk kā atjaunināt.",
"Log out" => "Izrakstīties",
-"More apps" => "Vairāk programmu",
"Automatic logon rejected!" => "Automātiskā ierakstīšanās ir noraidīta!",
"If you did not change your password recently, your account may be compromised!" => "Ja neesat pēdējā laikā mainījis paroli, iespējams, ka jūsu konts ir kompromitēts.",
"Please change your password to secure your account again." => "Lūdzu, nomainiet savu paroli, lai atkal nodrošinātu savu kontu.",
diff --git a/core/l10n/mk.php b/core/l10n/mk.php
index e2416dc052cbb15690efa212e128a31be09655d8..1c998bb636a9ffed923cc8d8c3f32ddcd9d68258 100644
--- a/core/l10n/mk.php
+++ b/core/l10n/mk.php
@@ -1,5 +1,6 @@
<?php
$TRANSLATIONS = array(
+"group" => "група",
"Category type not provided." => "Не беше доставен тип на категорија.",
"No category to add?" => "Нема категорија да се додаде?",
"Object type not provided." => "Не беше доставен тип на објект.",
@@ -42,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 393dc0d7d1160e3469c4ae5e4e67c14b87b85a4c..01dec8855743dcc8ae57e9e1c9b52404b4208961 100644
--- a/core/l10n/nb_NO.php
+++ b/core/l10n/nb_NO.php
@@ -1,6 +1,7 @@
<?php
$TRANSLATIONS = array(
"%s shared »%s« with you" => "%s delte »%s« med deg",
+"group" => "gruppe",
"No category to add?" => "Ingen kategorier å legge til?",
"This category already exists: %s" => "Denne kategorien finnes allerede: %s",
"No categories selected for deletion." => "Ingen kategorier merket for sletting.",
@@ -39,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 46375756de42ed708d0b8c67fe612a8990b06148..3dcdeaedec243af7ae09404f4161464fd1db9e3e 100644
--- a/core/l10n/nl.php
+++ b/core/l10n/nl.php
@@ -1,6 +1,13 @@
<?php
$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",
@@ -9,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",
@@ -41,10 +53,13 @@ $TRANSLATIONS = array(
"last year" => "vorig jaar",
"years ago" => "jaar geleden",
"Choose" => "Kies",
-"Error loading file picker template" => "Fout bij laden van bestandsselectie sjabloon",
+"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.",
@@ -126,7 +141,6 @@ $TRANSLATIONS = array(
"Finish setup" => "Installatie afronden",
"%s is available. Get more information on how to update." => "%s is beschikbaar. Verkrijg meer informatie over het bijwerken.",
"Log out" => "Afmelden",
-"More apps" => "Meer applicaties",
"Automatic logon rejected!" => "Automatische aanmelding geweigerd!",
"If you did not change your password recently, your account may be compromised!" => "Als je je wachtwoord niet onlangs heeft aangepast, kan je account overgenomen zijn!",
"Please change your password to secure your account again." => "Wijzig je wachtwoord zodat je account weer beveiligd is.",
diff --git a/core/l10n/nn_NO.php b/core/l10n/nn_NO.php
index f73cb96076efedbf46b2018c7a823e9fa79d2b1b..d596605dbcd4c10bacea5c647be200592b379c65 100644
--- a/core/l10n/nn_NO.php
+++ b/core/l10n/nn_NO.php
@@ -1,5 +1,13 @@
<?php
$TRANSLATIONS = array(
+"%s shared »%s« with you" => "%s delte «%s» med deg",
+"group" => "gruppe",
+"Turned on maintenance mode" => "Skrudde på vedlikehaldsmodus",
+"Turned off maintenance mode" => "Skrudde av vedlikehaldsmodus",
+"Updated database" => "Database oppdatert",
+"Updating filecache, this may take really long..." => "Oppdaterer mellomlager; dette kan ta ei god stund …",
+"Updated filecache" => "Mellomlager oppdatert",
+"... %d%% done ..." => "… %d %% ferdig …",
"Category type not provided." => "Ingen kategoritype.",
"No category to add?" => "Ingen kategori å leggja til?",
"This category already exists: %s" => "Denne kategorien finst alt: %s",
@@ -8,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",
@@ -29,20 +42,31 @@ $TRANSLATIONS = array(
"December" => "Desember",
"Settings" => "Innstillingar",
"seconds ago" => "sekund sidan",
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n minute ago_::_%n minutes ago_" => array("%n minutt sidan","%n minutt sidan"),
+"_%n hour ago_::_%n hours ago_" => array("%n time sidan","%n timar sidan"),
"today" => "i dag",
"yesterday" => "i går",
-"_%n day ago_::_%n days ago_" => array("",""),
+"_%n day ago_::_%n days ago_" => array("%n dag sidan","%n dagar sidan"),
"last month" => "førre månad",
-"_%n month ago_::_%n months ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("%n månad sidan","%n månadar sidan"),
"months ago" => "månadar sidan",
"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.",
@@ -58,6 +82,7 @@ $TRANSLATIONS = array(
"Share with link" => "Del med lenkje",
"Password protect" => "Passordvern",
"Password" => "Passord",
+"Allow Public Upload" => "Tillat offentleg opplasting",
"Email link to person" => "Send lenkja over e-post",
"Send" => "Send",
"Set expiration date" => "Set utløpsdato",
@@ -80,11 +105,14 @@ $TRANSLATIONS = array(
"Email sent" => "E-post sendt",
"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Oppdateringa feila. Ver venleg og rapporter feilen til <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud-fellesskapet</a>.",
"The update was successful. Redirecting you to ownCloud now." => "Oppdateringa er fullført. Sender deg vidare til ownCloud no.",
+"%s password reset" => "%s passordnullstilling",
"Use the following link to reset your password: {link}" => "Klikk følgjande lenkje til å nullstilla passordet ditt: {link}",
"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 ." => "Lenkja til å nullstilla passordet med er sendt til e-posten din.<br>Sjå i spam-/søppelmappa di viss du ikkje ser e-posten innan rimeleg tid.<br>Spør din lokale administrator viss han ikkje er der heller.",
"Request failed!<br>Did you make sure your email/username was right?" => "Førespurnaden feila!<br>Er du viss på at du skreiv inn rett e-post/brukarnamn?",
"You will receive a link to reset your password via Email." => "Du vil få ein e-post med ei lenkje for å nullstilla passordet.",
"Username" => "Brukarnamn",
+"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?" => "Filene dine er krypterte. Viss du ikkje har skrudd på gjenopprettingsnøkkelen, finst det ingen måte å få tilbake dataa dine når passordet ditt er nullstilt. Viss du ikkje er sikker på kva du skal gjera bør du spørja administratoren din før du går vidare. Vil du verkeleg fortsetja?",
+"Yes, I really want to reset my password now" => "Ja, eg vil nullstilla passordet mitt no",
"Request reset" => "Be om nullstilling",
"Your password was reset" => "Passordet ditt er nullstilt",
"To login page" => "Til innloggingssida",
@@ -97,13 +125,16 @@ $TRANSLATIONS = array(
"Help" => "Hjelp",
"Access forbidden" => "Tilgang forbudt",
"Cloud not found" => "Fann ikkje skyen",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Hei der,\n\nnemner berre at %s delte %s med deg.\nSjå det her: %s\n\nMe talast!",
"Edit categories" => "Endra kategoriar",
"Add" => "Legg til",
"Security Warning" => "Tryggleiksåtvaring",
"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "PHP-utgåva di er sårbar for NULL-byteåtaket (CVE-2006-7243)",
+"Please update your PHP installation to use %s securely." => "Ver venleg og oppdater PHP-installasjonen din til å brukar %s trygt.",
"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Ingen tilgjengeleg tilfeldig nummer-generator, ver venleg og aktiver OpenSSL-utvidinga i PHP.",
"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Utan ein trygg tilfeldig nummer-generator er det enklare for ein åtakar å gjetta seg fram til passordnullstillingskodar og dimed ta over kontoen din.",
"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Datamappa og filene dine er sannsynlegvis tilgjengelege frå Internett sidan .htaccess-fila ikkje fungerer.",
+"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Ver venleg og les <a href=\"%s\" target=\"_blank\">dokumentasjonen</a> for meir informasjon om korleis du konfigurerer tenaren din.",
"Create an <strong>admin account</strong>" => "Lag ein <strong>admin-konto</strong>",
"Advanced" => "Avansert",
"Data folder" => "Datamappe",
@@ -124,6 +155,7 @@ $TRANSLATIONS = array(
"remember" => "hugs",
"Log in" => "Logg inn",
"Alternative Logins" => "Alternative innloggingar",
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Hei der,<br><br>nemner berre at %s delte «%s» med deg.<br><a href=\"%s\">Sjå det!</a><br><br>Me talast!<",
"Updating ownCloud to version %s, this may take a while." => "Oppdaterer ownCloud til utgåve %s, dette kan ta ei stund."
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/nqo.php b/core/l10n/nqo.php
new file mode 100644
index 0000000000000000000000000000000000000000..dbedde7e637fc27c397b763e7b58eeca8338d6d2
--- /dev/null
+++ b/core/l10n/nqo.php
@@ -0,0 +1,9 @@
+<?php
+$TRANSLATIONS = array(
+"_%n minute ago_::_%n minutes ago_" => array(""),
+"_%n hour ago_::_%n hours ago_" => array(""),
+"_%n day ago_::_%n days ago_" => array(""),
+"_%n month ago_::_%n months ago_" => array(""),
+"_{count} file conflict_::_{count} file conflicts_" => array("")
+);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/oc.php b/core/l10n/oc.php
index 68bf2f89a2a3d339d763f553f68e2884856a5095..fd84d0b2e3079a8c627622861cb766822caca378 100644
--- a/core/l10n/oc.php
+++ b/core/l10n/oc.php
@@ -1,5 +1,6 @@
<?php
$TRANSLATIONS = array(
+"group" => "grop",
"No category to add?" => "Pas de categoria d'ajustar ?",
"No categories selected for deletion." => "Pas de categorias seleccionadas per escafar.",
"Sunday" => "Dimenge",
@@ -37,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 9be10f535b74d72d79a26d8ba1d9a217896f3dcc..ad467fe100ea0198e5c1f38712662d9dad420b24 100644
--- a/core/l10n/pl.php
+++ b/core/l10n/pl.php
@@ -1,6 +1,13 @@
<?php
$TRANSLATIONS = array(
"%s shared »%s« with you" => "%s Współdzielone »%s« z tobą",
+"group" => "grupa",
+"Turned on maintenance mode" => "Włączony tryb konserwacji",
+"Turned off maintenance mode" => "Wyłączony tryb konserwacji",
+"Updated database" => "Zaktualizuj bazę",
+"Updating filecache, this may take really long..." => "Aktualizowanie filecache, to może potrwać bardzo długo...",
+"Updated filecache" => "Zaktualizuj filecache",
+"... %d%% done ..." => "... %d%% udane ...",
"Category type not provided." => "Nie podano typu kategorii.",
"No category to add?" => "Brak kategorii do dodania?",
"This category already exists: %s" => "Ta kategoria już istnieje: %s",
@@ -9,6 +16,8 @@ $TRANSLATIONS = array(
"Error adding %s to favorites." => "Błąd podczas dodawania %s do ulubionych.",
"No categories selected for deletion." => "Nie zaznaczono kategorii do usunięcia.",
"Error removing %s from favorites." => "Błąd podczas usuwania %s z ulubionych.",
+"Unknown filetype" => "Nieznany typ pliku",
+"Invalid image" => "Nieprawidłowe zdjęcie",
"Sunday" => "Niedziela",
"Monday" => "Poniedziałek",
"Tuesday" => "Wtorek",
@@ -30,21 +39,26 @@ $TRANSLATIONS = array(
"December" => "Grudzień",
"Settings" => "Ustawienia",
"seconds ago" => "sekund temu",
-"_%n minute ago_::_%n minutes ago_" => array("","",""),
-"_%n hour ago_::_%n hours ago_" => array("","",""),
+"_%n minute ago_::_%n minutes ago_" => array("%n minute temu","%n minut temu","%n minut temu"),
+"_%n hour ago_::_%n hours ago_" => array("%n godzine temu","%n godzin temu","%n godzin temu"),
"today" => "dziś",
"yesterday" => "wczoraj",
-"_%n day ago_::_%n days ago_" => array("","",""),
+"_%n day ago_::_%n days ago_" => array("%n dzień temu","%n dni temu","%n dni temu"),
"last month" => "w zeszłym miesiącu",
-"_%n month ago_::_%n months ago_" => array("","",""),
+"_%n month ago_::_%n months ago_" => array("%n miesiąc temu","%n miesięcy temu","%n miesięcy temu"),
"months ago" => "miesięcy temu",
"last year" => "w zeszłym roku",
"years ago" => "lat temu",
"Choose" => "Wybierz",
-"Error loading file picker template" => "Błąd podczas ładowania pliku wybranego szablonu",
"Yes" => "Tak",
"No" => "Nie",
"Ok" => "OK",
+"_{count} file conflict_::_{count} file conflicts_" => array("{count} konfliktów plików","{count} konfliktów plików","{count} konfliktów plików"),
+"One file conflict" => "Konflikt pliku",
+"Cancel" => "Anuluj",
+"Continue" => "Kontynuuj ",
+"(all selected)" => "(wszystkie zaznaczone)",
+"({count} selected)" => "({count} zaznaczonych)",
"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.",
@@ -83,6 +97,7 @@ $TRANSLATIONS = array(
"Email sent" => "E-mail wysłany",
"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Aktualizacja zakończyła się niepowodzeniem. Zgłoś ten problem <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">spoleczności ownCloud</a>.",
"The update was successful. Redirecting you to ownCloud now." => "Aktualizacji zakończyła się powodzeniem. Przekierowuję do ownCloud.",
+"%s password reset" => "%s reset hasła",
"Use the following link to reset your password: {link}" => "Użyj tego odnośnika by zresetować hasło: {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 ." => "Link do zresetowania hasła została wysłana na adres email. <br> Jeśli nie otrzymasz go w najbliższym czasie, sprawdź folder ze spamem. <br> Jeśli go tam nie ma zwrócić się do administratora tego ownCloud-a.",
"Request failed!<br>Did you make sure your email/username was right?" => "Żądanie niepowiodło się!<br>Czy Twój email/nazwa użytkownika są poprawne?",
@@ -125,7 +140,6 @@ $TRANSLATIONS = array(
"Finish setup" => "Zakończ konfigurowanie",
"%s is available. Get more information on how to update." => "%s jest dostępna. Dowiedz się więcej na temat aktualizacji.",
"Log out" => "Wyloguj",
-"More apps" => "Więcej aplikacji",
"Automatic logon rejected!" => "Automatyczne logowanie odrzucone!",
"If you did not change your password recently, your account may be compromised!" => "Jeśli hasło było dawno niezmieniane, twoje konto może być zagrożone!",
"Please change your password to secure your account again." => "Zmień swoje hasło, aby ponownie zabezpieczyć swoje konto.",
diff --git a/core/l10n/pt_BR.php b/core/l10n/pt_BR.php
index 8446e5270a709edb6fb878d297569a5e46667eca..5f8903a8ff5071779af5b8fb24f0f6afac6066cb 100644
--- a/core/l10n/pt_BR.php
+++ b/core/l10n/pt_BR.php
@@ -1,6 +1,13 @@
<?php
$TRANSLATIONS = array(
"%s shared »%s« with you" => "%s compartilhou »%s« com você",
+"group" => "grupo",
+"Turned on maintenance mode" => "Ativar modo de manutenção",
+"Turned off maintenance mode" => "Desligar o modo de manutenção",
+"Updated database" => "Atualizar o banco de dados",
+"Updating filecache, this may take really long..." => "Atualizar cahe de arquivos, isto pode levar algum tempo...",
+"Updated filecache" => "Atualizar cache de arquivo",
+"... %d%% done ..." => "... %d%% concluído ...",
"Category type not provided." => "Tipo de categoria não fornecido.",
"No category to add?" => "Nenhuma categoria a adicionar?",
"This category already exists: %s" => "Esta categoria já existe: %s",
@@ -9,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",
@@ -30,21 +42,31 @@ $TRANSLATIONS = array(
"December" => "dezembro",
"Settings" => "Ajustes",
"seconds ago" => "segundos atrás",
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n minute ago_::_%n minutes ago_" => array(" ha %n minuto","ha %n minutos"),
+"_%n hour ago_::_%n hours ago_" => array("ha %n hora","ha %n horas"),
"today" => "hoje",
"yesterday" => "ontem",
-"_%n day ago_::_%n days ago_" => array("",""),
+"_%n day ago_::_%n days ago_" => array("ha %n dia","ha %n dias"),
"last month" => "último mês",
-"_%n month ago_::_%n months ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("ha %n mês","ha %n meses"),
"months ago" => "meses atrás",
"last year" => "último ano",
"years ago" => "anos atrás",
"Choose" => "Escolha",
-"Error loading file picker template" => "Template selecionador Erro ao carregar arquivo",
+"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.",
@@ -126,7 +148,6 @@ $TRANSLATIONS = array(
"Finish setup" => "Concluir configuração",
"%s is available. Get more information on how to update." => "%s está disponível. Obtenha mais informações sobre como atualizar.",
"Log out" => "Sair",
-"More apps" => "Mais aplicativos",
"Automatic logon rejected!" => "Entrada Automática no Sistema Rejeitada!",
"If you did not change your password recently, your account may be compromised!" => "Se você não mudou a sua senha recentemente, a sua conta pode estar comprometida!",
"Please change your password to secure your account again." => "Por favor troque sua senha para tornar sua conta segura novamente.",
diff --git a/core/l10n/pt_PT.php b/core/l10n/pt_PT.php
index 25ddaa322d5a0f3b3361ae1cd385eb8ab363bcde..977d8e38cb27536e25a2f74c60f3c71c7fef23da 100644
--- a/core/l10n/pt_PT.php
+++ b/core/l10n/pt_PT.php
@@ -1,6 +1,13 @@
<?php
$TRANSLATIONS = array(
"%s shared »%s« with you" => "%s partilhado »%s« contigo",
+"group" => "grupo",
+"Turned on maintenance mode" => "Activado o modo de manutenção",
+"Turned off maintenance mode" => "Desactivado o modo de manutenção",
+"Updated database" => "Base de dados actualizada",
+"Updating filecache, this may take really long..." => "A actualizar o cache dos ficheiros, poderá demorar algum tempo...",
+"Updated filecache" => "Actualizado o cache dos ficheiros",
+"... %d%% done ..." => "... %d%% feito ...",
"Category type not provided." => "Tipo de categoria não fornecido",
"No category to add?" => "Nenhuma categoria para adicionar?",
"This category already exists: %s" => "A categoria já existe: %s",
@@ -9,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",
@@ -30,21 +41,23 @@ $TRANSLATIONS = array(
"December" => "Dezembro",
"Settings" => "Configurações",
"seconds ago" => "Minutos atrás",
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n minute ago_::_%n minutes ago_" => array("%n minuto atrás","%n minutos atrás"),
+"_%n hour ago_::_%n hours ago_" => array("%n hora atrás","%n horas atrás"),
"today" => "hoje",
"yesterday" => "ontem",
-"_%n day ago_::_%n days ago_" => array("",""),
+"_%n day ago_::_%n days ago_" => array("%n dia atrás","%n dias atrás"),
"last month" => "ultímo mês",
-"_%n month ago_::_%n months ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("%n mês atrás","%n meses atrás"),
"months ago" => "meses atrás",
"last year" => "ano passado",
"years ago" => "anos atrás",
"Choose" => "Escolha",
-"Error loading file picker template" => "Erro ao carregar arquivo do separador modelo",
"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",
@@ -83,6 +96,7 @@ $TRANSLATIONS = array(
"Email sent" => "E-mail enviado",
"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "A actualização falhou. Por favor reporte este incidente seguindo este link <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>.",
"The update was successful. Redirecting you to ownCloud now." => "A actualização foi concluída com sucesso. Vai ser redireccionado para o ownCloud agora.",
+"%s password reset" => "%s reposição da password",
"Use the following link to reset your password: {link}" => "Use o seguinte endereço para repor a sua 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 ." => "O link para fazer reset à sua password foi enviado para o seu e-mail. <br> Se não o recebeu dentro um espaço de tempo aceitável, por favor verifique a sua pasta de SPAM.<br> Se não o encontrar, por favor contacte o seu administrador.",
"Request failed!<br>Did you make sure your email/username was right?" => "O pedido falhou! <br> Tem a certeza que introduziu o seu email/username correcto?",
diff --git a/core/l10n/ro.php b/core/l10n/ro.php
index 7e33003bcce760aa8bc46c3b88f0ec125d3e6d88..12fbfa5f0ca4a0bc609a3fa262ada234e8db6560 100644
--- a/core/l10n/ro.php
+++ b/core/l10n/ro.php
@@ -1,6 +1,8 @@
<?php
$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",
@@ -9,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",
@@ -30,21 +34,26 @@ $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ă",
"last year" => "ultimul an",
"years ago" => "ani în urmă",
"Choose" => "Alege",
-"Error loading file picker template" => "Eroare la încărcarea șablonului selectorului de fișiere",
"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 8c29c8d26f6dc180db27a104a1c559c1e1c5a5f3..1b3133a1a6f002ec85bfd565630020f1f1ba4f34 100644
--- a/core/l10n/ru.php
+++ b/core/l10n/ru.php
@@ -1,6 +1,13 @@
<?php
$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",
@@ -9,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" => "Вторник",
@@ -41,10 +53,20 @@ $TRANSLATIONS = array(
"last year" => "в прошлом году",
"years ago" => "несколько лет назад",
"Choose" => "Выбрать",
-"Error loading file picker template" => "Ошибка при загрузке файла выбора шаблона",
+"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,15 +140,14 @@ $TRANSLATIONS = array(
"Data folder" => "Директория с данными",
"Configure the database" => "Настройка базы данных",
"will be used" => "будет использовано",
-"Database user" => "Имя пользователя для базы данных",
-"Database password" => "Пароль для базы данных",
+"Database user" => "Пользователь базы данных",
+"Database password" => "Пароль базы данных",
"Database name" => "Название базы данных",
"Database tablespace" => "Табличое пространство базы данных",
"Database host" => "Хост базы данных",
"Finish setup" => "Завершить установку",
"%s is available. Get more information on how to update." => "%s доступно. Получить дополнительную информацию о порядке обновления.",
"Log out" => "Выйти",
-"More apps" => "Ещё приложения",
"Automatic logon rejected!" => "Автоматический вход в систему отключен!",
"If you did not change your password recently, your account may be compromised!" => "Если Вы недавно не меняли свой пароль, то Ваша учетная запись может быть скомпрометирована!",
"Please change your password to secure your account again." => "Пожалуйста, смените пароль, чтобы обезопасить свою учетную запись.",
diff --git a/core/l10n/si_LK.php b/core/l10n/si_LK.php
index 475cdf5613a5a15a20889da7dea3efedfe93baf1..2d922657ea0a84274fd22ff4bd4c9e4717f341f3 100644
--- a/core/l10n/si_LK.php
+++ b/core/l10n/si_LK.php
@@ -1,5 +1,6 @@
<?php
$TRANSLATIONS = array(
+"group" => "කණ්ඩායම",
"No categories selected for deletion." => "මකා දැමීම සඳහා ප්රවර්ගයන් තෝරා නොමැත.",
"Sunday" => "ඉරිදා",
"Monday" => "සඳුදා",
@@ -36,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 5fff18e7d6fe09d62a7fb53e050dacd27bb9d463..ac45947459b2d329c94ca7ba8f7b7de55fcfb9fe 100644
--- a/core/l10n/sk_SK.php
+++ b/core/l10n/sk_SK.php
@@ -1,6 +1,13 @@
<?php
$TRANSLATIONS = array(
"%s shared »%s« with you" => "%s s Vami zdieľa »%s«",
+"group" => "skupina",
+"Turned on maintenance mode" => "Mód údržby zapnutý",
+"Turned off maintenance mode" => "Mód údržby vypnutý",
+"Updated database" => "Databáza aktualizovaná",
+"Updating filecache, this may take really long..." => "Aktualizácia \"filecache\", toto môže trvať dlhšie...",
+"Updated filecache" => "\"Filecache\" aktualizovaná",
+"... %d%% done ..." => "... %d%% dokončených ...",
"Category type not provided." => "Neposkytnutý typ kategórie.",
"No category to add?" => "Žiadna kategória pre pridanie?",
"This category already exists: %s" => "Kategória: %s už existuje.",
@@ -41,10 +48,11 @@ $TRANSLATIONS = array(
"last year" => "minulý rok",
"years ago" => "pred rokmi",
"Choose" => "Výber",
-"Error loading file picker template" => "Chyba pri načítaní šablóny výberu súborov",
"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.",
@@ -126,7 +134,6 @@ $TRANSLATIONS = array(
"Finish setup" => "Dokončiť inštaláciu",
"%s is available. Get more information on how to update." => "%s je dostupná. Získajte viac informácií k postupu aktualizáce.",
"Log out" => "Odhlásiť",
-"More apps" => "Viac aplikácií",
"Automatic logon rejected!" => "Automatické prihlásenie bolo zamietnuté!",
"If you did not change your password recently, your account may be compromised!" => "V nedávnej dobe ste nezmenili svoje heslo, Váš účet môže byť kompromitovaný.",
"Please change your password to secure your account again." => "Prosím, zmeňte svoje heslo pre opätovné zabezpečenie Vášho účtu",
diff --git a/core/l10n/sl.php b/core/l10n/sl.php
index 0b72f1dc4e4455ab161c5e99f2660bba68a516c8..84cd83fa2f3700e86afc1051670476e9b5d12478 100644
--- a/core/l10n/sl.php
+++ b/core/l10n/sl.php
@@ -1,6 +1,7 @@
<?php
$TRANSLATIONS = array(
"%s shared »%s« with you" => "%s je delil »%s« z vami",
+"group" => "skupina",
"Category type not provided." => "Vrsta kategorije ni podana.",
"No category to add?" => "Ali ni kategorije za dodajanje?",
"This category already exists: %s" => "Kategorija že obstaja: %s",
@@ -41,10 +42,11 @@ $TRANSLATIONS = array(
"last year" => "lansko leto",
"years ago" => "let nazaj",
"Choose" => "Izbor",
-"Error loading file picker template" => "Napaka pri nalaganju predloge za izbor dokumenta",
"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 3057ac2c6896643d0e28a8d9b9108a4614a15543..e0fde3f1297bef7a7f25b2b48e7eca307d0ba856 100644
--- a/core/l10n/sq.php
+++ b/core/l10n/sq.php
@@ -1,5 +1,13 @@
<?php
$TRANSLATIONS = array(
+"%s shared »%s« with you" => "%s ndau »%s« me ju",
+"group" => "grupi",
+"Turned on maintenance mode" => "Mënyra e mirëmbajtjes u aktivizua",
+"Turned off maintenance mode" => "Mënyra e mirëmbajtjes u çaktivizua",
+"Updated database" => "Database-i u azhurnua",
+"Updating filecache, this may take really long..." => "Po azhurnoj memorjen e skedarëve, mund të zgjasi pak...",
+"Updated filecache" => "Memorja e skedarëve u azhornua",
+"... %d%% done ..." => "... %d%% u krye ...",
"Category type not provided." => "Mungon tipi i kategorisë.",
"No category to add?" => "Asnjë kategori për të shtuar?",
"This category already exists: %s" => "Kjo kategori tashmë ekziston: %s",
@@ -29,21 +37,22 @@ $TRANSLATIONS = array(
"December" => "Dhjetor",
"Settings" => "Parametra",
"seconds ago" => "sekonda më parë",
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n minute ago_::_%n minutes ago_" => array("%n minut më parë","%n minuta më parë"),
+"_%n hour ago_::_%n hours ago_" => array("%n orë më parë","%n orë më parë"),
"today" => "sot",
"yesterday" => "dje",
-"_%n day ago_::_%n days ago_" => array("",""),
+"_%n day ago_::_%n days ago_" => array("%n ditë më parë","%n ditë më parë"),
"last month" => "muajin e shkuar",
-"_%n month ago_::_%n months ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("%n muaj më parë","%n muaj më parë"),
"months ago" => "muaj më parë",
"last year" => "vitin e shkuar",
"years ago" => "vite më parë",
"Choose" => "Zgjidh",
-"Error loading file picker template" => "Veprim i gabuar gjatë ngarkimit të modelit të zgjedhësit të skedarëve",
"Yes" => "Po",
"No" => "Jo",
"Ok" => "Në rregull",
+"_{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.",
@@ -82,11 +91,13 @@ $TRANSLATIONS = array(
"Email sent" => "Email-i u dërgua",
"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Azhurnimi dështoi. Ju lutemi njoftoni për këtë problem <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">komunitetin ownCloud</a>.",
"The update was successful. Redirecting you to ownCloud now." => "Azhurnimi u krye. Tani do t'ju kaloj tek ownCloud-i.",
+"%s password reset" => "Kodi i %s -it u rivendos",
"Use the following link to reset your password: {link}" => "Përdorni lidhjen në vijim për të rivendosur kodin: {link}",
"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 ." => "Lidhja për rivendosjen e kodit tuaj u dërgua tek email-i juaj.<br>Nëqoftëse nuk e merrni brenda një kohe të arsyeshme, kontrolloni dosjet e postës së padëshirueshme (spam).<br>Nëqoftëse nuk është as aty, pyesni administratorin tuaj lokal.",
"Request failed!<br>Did you make sure your email/username was right?" => "Kërkesa dështoi!<br>A u siguruat që email-i/përdoruesi juaj ishte i saktë?",
"You will receive a link to reset your password via Email." => "Do t'iu vijë një email që përmban një lidhje për ta rivendosur kodin.",
"Username" => "Përdoruesi",
+"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?" => "Skedarët tuaj janë të kodifikuar. Nëqoftëse nuk keni aktivizuar çelësin e restaurimit, të dhënat tuaja nuk do të jenë të arritshme pasi të keni rivendosur kodin. Nëqoftëse nuk jeni i sigurt, ju lutemi kontaktoni administratorin tuaj para se të vazhdoni. Jeni i sigurt që dëshironi të vazhdoni?",
"Yes, I really want to reset my password now" => "Po, dua ta rivendos kodin tani",
"Request reset" => "Bëj kërkesë për rivendosjen",
"Your password was reset" => "Kodi yt u rivendos",
@@ -105,9 +116,11 @@ $TRANSLATIONS = array(
"Add" => "Shto",
"Security Warning" => "Paralajmërim sigurie",
"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Versioni juaj i PHP-së është i cënueshëm nga sulmi NULL Byte (CVE-2006-7243)",
+"Please update your PHP installation to use %s securely." => "Ju lutem azhurnoni instalimin tuaj të PHP-së që të përdorni %s -in në mënyrë të sigurt.",
"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Nuk disponohet asnjë krijues numrash të rastësishëm, ju lutem aktivizoni shtesën PHP OpenSSL.",
"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Pa një krijues numrash të rastësishëm të sigurt një person i huaj mund të jetë në gjendje të parashikojë kodin dhe të marri llogarinë tuaj.",
"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Dosja dhe skedarët e të dhënave tuaja mbase janë të arritshme nga interneti sepse skedari .htaccess nuk po punon.",
+"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Për më shumë informacion mbi konfigurimin e duhur të serverit tuaj, ju lutem shikoni <a href=\"%s\" target=\"_blank\">dokumentacionin</a>.",
"Create an <strong>admin account</strong>" => "Krijo një <strong>llogari administruesi</strong>",
"Advanced" => "Të përparuara",
"Data folder" => "Emri i dosjes",
@@ -119,6 +132,7 @@ $TRANSLATIONS = array(
"Database tablespace" => "Tablespace-i i database-it",
"Database host" => "Pozicioni (host) i database-it",
"Finish setup" => "Mbaro setup-in",
+"%s is available. Get more information on how to update." => "%s është i disponueshëm. Merrni më shumë informacione mbi azhurnimin.",
"Log out" => "Dalje",
"Automatic logon rejected!" => "Hyrja automatike u refuzua!",
"If you did not change your password recently, your account may be compromised!" => "Nqse nuk keni ndryshuar kodin kohët e fundit, llogaria juaj mund të jetë komprometuar.",
@@ -127,6 +141,7 @@ $TRANSLATIONS = array(
"remember" => "kujto",
"Log in" => "Hyrje",
"Alternative Logins" => "Hyrje alternative",
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Tungjatjeta,<br><br>duam t'ju njoftojmë që %s ka ndarë »%s« me ju.<br><a href=\"%s\">Shikojeni!</a><br><br>Përshëndetje!",
"Updating ownCloud to version %s, this may take a while." => "Po azhurnoj ownCloud-in me versionin %s. Mund të zgjasi pak."
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/sr.php b/core/l10n/sr.php
index 3de06c70883f61977742b6b08acfc9b9f9b99273..064984cca5f26d93460040f6253a17ee9a8451c0 100644
--- a/core/l10n/sr.php
+++ b/core/l10n/sr.php
@@ -1,5 +1,6 @@
<?php
$TRANSLATIONS = array(
+"group" => "група",
"Category type not provided." => "Врста категорије није унет.",
"No category to add?" => "Додати још неку категорију?",
"Object type not provided." => "Врста објекта није унета.",
@@ -42,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 cda76a520b4064488b33cf3dcde4ca4b816cc0c2..0ea3259df68ada7ac7e18179dd8748df8308fd2a 100644
--- a/core/l10n/sv.php
+++ b/core/l10n/sv.php
@@ -1,6 +1,13 @@
<?php
$TRANSLATIONS = array(
"%s shared »%s« with you" => "%s delade »%s« med dig",
+"group" => "Grupp",
+"Turned on maintenance mode" => "Aktiverade underhållsläge",
+"Turned off maintenance mode" => "Deaktiverade underhållsläge",
+"Updated database" => "Uppdaterade databasen",
+"Updating filecache, this may take really long..." => "Uppdaterar filcache, det kan ta lång tid...",
+"Updated filecache" => "Uppdaterade filcache",
+"... %d%% done ..." => "... %d%% klart ...",
"Category type not provided." => "Kategorityp inte angiven.",
"No category to add?" => "Ingen kategori att lägga till?",
"This category already exists: %s" => "Denna kategori finns redan: %s",
@@ -9,6 +16,11 @@ $TRANSLATIONS = array(
"Error adding %s to favorites." => "Fel vid tillägg av %s till favoriter.",
"No categories selected for deletion." => "Inga kategorier valda för radering.",
"Error removing %s from favorites." => "Fel vid borttagning av %s från favoriter.",
+"No image or file provided" => "Ingen bild eller fil har tillhandahållits",
+"Unknown filetype" => "Okänd filtyp",
+"Invalid image" => "Ogiltig bild",
+"No temporary profile picture available, try again" => "Ingen temporär profilbild finns tillgänglig, försök igen",
+"No crop data provided" => "Ingen beskärdata har angivits",
"Sunday" => "Söndag",
"Monday" => "Måndag",
"Tuesday" => "Tisdag",
@@ -41,10 +53,20 @@ $TRANSLATIONS = array(
"last year" => "förra året",
"years ago" => "år sedan",
"Choose" => "Välj",
-"Error loading file picker template" => "Fel vid inläsning av filväljarens mall",
+"Error loading file picker template: {error}" => "Fel uppstod för filväljarmall: {error}",
"Yes" => "Ja",
"No" => "Nej",
"Ok" => "Ok",
+"Error loading message template: {error}" => "Fel uppstod under inläsningen av meddelandemallen: {error}",
+"_{count} file conflict_::_{count} file conflicts_" => array("{count} filkonflikt","{count} filkonflikter"),
+"One file conflict" => "En filkonflikt",
+"Which files do you want to keep?" => "Vilken fil vill du behålla?",
+"If you select both versions, the copied file will have a number added to its name." => "Om du väljer båda versionerna kommer de kopierade filerna ha nummer tillagda i filnamnet.",
+"Cancel" => "Avbryt",
+"Continue" => "Fortsätt",
+"(all selected)" => "(Alla valda)",
+"({count} selected)" => "({count} valda)",
+"Error loading file exists template" => "Fel uppstod filmall existerar",
"The object type is not specified." => "Objekttypen är inte specificerad.",
"Error" => "Fel",
"The app name is not specified." => " Namnet på appen är inte specificerad.",
@@ -126,7 +148,6 @@ $TRANSLATIONS = array(
"Finish setup" => "Avsluta installation",
"%s is available. Get more information on how to update." => "%s är tillgänglig. Få mer information om hur du går tillväga för att uppdatera.",
"Log out" => "Logga ut",
-"More apps" => "Fler appar",
"Automatic logon rejected!" => "Automatisk inloggning inte tillåten!",
"If you did not change your password recently, your account may be compromised!" => "Om du inte har ändrat ditt lösenord nyligen så kan ditt konto vara manipulerat!",
"Please change your password to secure your account again." => "Ändra genast lösenord för att säkra ditt konto.",
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 3fc461d4284c18c185c31f56b4b56ad81b348fc8..43c7f451e499f7c47c33597483b6433e335ef9b1 100644
--- a/core/l10n/ta_LK.php
+++ b/core/l10n/ta_LK.php
@@ -1,5 +1,6 @@
<?php
$TRANSLATIONS = array(
+"group" => "குழு",
"Category type not provided." => "பிரிவு வகைகள் வழங்கப்படவில்லை",
"No category to add?" => "சேர்ப்பதற்கான வகைகள் இல்லையா?",
"Object type not provided." => "பொருள் வகை வழங்கப்படவில்லை",
@@ -42,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 bb5181fd9e61fa35b8b0e17f9de82d1af6076062..8eab771822d3d0071d21b86b4cf01e763143b78a 100644
--- a/core/l10n/th_TH.php
+++ b/core/l10n/th_TH.php
@@ -1,5 +1,6 @@
<?php
$TRANSLATIONS = array(
+"group" => "กลุ่มผู้ใช้งาน",
"Category type not provided." => "ยังไม่ได้ระบุชนิดของหมวดหมู่",
"No category to add?" => "ไม่มีหมวดหมู่ที่ต้องการเพิ่ม?",
"Object type not provided." => "ชนิดของวัตถุยังไม่ได้ถูกระบุ",
@@ -42,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 dde8a1bd97a991777f80928d82cd562d0620cc89..d8d9709949c9ad137bcb4a3e1ae6cc3b48db1a95 100644
--- a/core/l10n/tr.php
+++ b/core/l10n/tr.php
@@ -1,6 +1,13 @@
<?php
$TRANSLATIONS = array(
"%s shared »%s« with you" => "%s sizinle »%s« paylaşımında bulundu",
+"group" => "grup",
+"Turned on maintenance mode" => "Bakım kipi etkinleştirildi",
+"Turned off maintenance mode" => "Bakım kipi kapatıldı",
+"Updated database" => "Veritabanı güncellendi",
+"Updating filecache, this may take really long..." => "Dosya önbelleği güncelleniyor. Bu, gerçekten uzun sürebilir.",
+"Updated filecache" => "Dosya önbelleği güncellendi",
+"... %d%% done ..." => "%%%d tamamlandı ...",
"Category type not provided." => "Kategori türü girilmedi.",
"No category to add?" => "Eklenecek kategori yok?",
"This category already exists: %s" => "Bu kategori zaten mevcut: %s",
@@ -41,10 +48,11 @@ $TRANSLATIONS = array(
"last year" => "geçen yıl",
"years ago" => "yıl önce",
"Choose" => "seç",
-"Error loading file picker template" => "Seçici şablon dosya yüklemesinde hata",
"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.",
@@ -126,7 +134,6 @@ $TRANSLATIONS = array(
"Finish setup" => "Kurulumu tamamla",
"%s is available. Get more information on how to update." => "%s mevcuttur. Güncelleştirme hakkında daha fazla bilgi alın.",
"Log out" => "Çıkış yap",
-"More apps" => "Daha fazla Uygulama",
"Automatic logon rejected!" => "Otomatik oturum açma reddedildi!",
"If you did not change your password recently, your account may be compromised!" => "Yakın zamanda parolanızı değiştirmedi iseniz hesabınız riske girebilir.",
"Please change your password to secure your account again." => "Hesabınızı korumak için lütfen parolanızı değiştirin.",
diff --git a/core/l10n/ug.php b/core/l10n/ug.php
index 5cbb90d15f9e6e042a92dda4cbb01cc1a2b8c8e1..36023cb165338e4d80aa6818f366987e683573d0 100644
--- a/core/l10n/ug.php
+++ b/core/l10n/ug.php
@@ -1,5 +1,6 @@
<?php
$TRANSLATIONS = array(
+"group" => "گۇرۇپپا",
"Sunday" => "يەكشەنبە",
"Monday" => "دۈشەنبە",
"Tuesday" => "سەيشەنبە",
@@ -29,6 +30,8 @@ $TRANSLATIONS = array(
"Yes" => "ھەئە",
"No" => "ياق",
"Ok" => "جەزملە",
+"_{count} file conflict_::_{count} file conflicts_" => array(""),
+"Cancel" => "ۋاز كەچ",
"Error" => "خاتالىق",
"Share" => "ھەمبەھىر",
"Share with" => "ھەمبەھىر",
@@ -45,6 +48,7 @@ $TRANSLATIONS = array(
"Help" => "ياردەم",
"Edit categories" => "تۈر تەھرىر",
"Add" => "قوش",
+"Security Warning" => "بىخەتەرلىك ئاگاھلاندۇرۇش",
"Advanced" => "ئالىي",
"Finish setup" => "تەڭشەك تامام",
"Log out" => "تىزىمدىن چىق"
diff --git a/core/l10n/uk.php b/core/l10n/uk.php
index 6fcb23d0a32e7944d95b259ee2eb4e209842329f..23207654731654d15d7812547fdd33e54be0222b 100644
--- a/core/l10n/uk.php
+++ b/core/l10n/uk.php
@@ -1,5 +1,6 @@
<?php
$TRANSLATIONS = array(
+"group" => "група",
"Category type not provided." => "Не вказано тип категорії.",
"No category to add?" => "Відсутні категорії для додавання?",
"This category already exists: %s" => "Ця категорія вже існує: %s",
@@ -43,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 305839b476024fedea12246312e13ecc7ae68da0..1c99aad9a4d3264b5a0b21ac6279bf361eccb6f9 100644
--- a/core/l10n/vi.php
+++ b/core/l10n/vi.php
@@ -1,5 +1,6 @@
<?php
$TRANSLATIONS = array(
+"group" => "nhóm",
"Category type not provided." => "Kiểu hạng mục không được cung cấp.",
"No category to add?" => "Không có danh mục được thêm?",
"This category already exists: %s" => "Danh mục này đã tồn tại: %s",
@@ -43,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 a5a63e248586d77f0668ed9a738d1b728edcecfc..04c4630b2221d3d87b7d308a456e32454f7fe7c5 100644
--- a/core/l10n/zh_CN.php
+++ b/core/l10n/zh_CN.php
@@ -1,6 +1,13 @@
<?php
$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",
@@ -31,23 +38,24 @@ $TRANSLATIONS = array(
"Settings" => "设置",
"seconds ago" => "秒前",
"_%n minute ago_::_%n minutes ago_" => array("%n 分钟前"),
-"_%n hour ago_::_%n hours ago_" => array(""),
+"_%n hour ago_::_%n hours ago_" => array("%n 小时前"),
"today" => "今天",
"yesterday" => "昨天",
-"_%n day ago_::_%n days ago_" => array(""),
+"_%n day ago_::_%n days ago_" => array("%n 天前"),
"last month" => "上月",
-"_%n month ago_::_%n months ago_" => array(""),
+"_%n month ago_::_%n months ago_" => array("%n 月前"),
"months ago" => "月前",
"last year" => "去年",
"years ago" => "年前",
"Choose" => "选择(&C)...",
-"Error loading file picker template" => "加载文件选择器模板出错",
"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名称。",
+"The app name is not specified." => "未指定应用名称。",
"The required file {file} is not installed!" => "所需文件{file}未安装！",
"Shared" => "已共享",
"Share" => "分享",
@@ -83,6 +91,7 @@ $TRANSLATIONS = array(
"Email sent" => "邮件已发送",
"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "更新不成功。请汇报将此问题汇报给 <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud 社区</a>。",
"The update was successful. Redirecting you to ownCloud now." => "更新成功。正在重定向至 ownCloud。",
+"%s password reset" => "重置 %s 的密码",
"Use the following link to reset your password: {link}" => "使用以下链接重置您的密码：{link}",
"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>如果您觉得在合理的时间内还未收到邮件，请查看 spam/junk 目录。<br>如果没有在那里，请询问您的本地管理员。",
"Request failed!<br>Did you make sure your email/username was right?" => "请求失败<br>您确定您的邮箱/用户名是正确的？",
@@ -107,9 +116,11 @@ $TRANSLATIONS = array(
"Add" => "增加",
"Security Warning" => "安全警告",
"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "你的PHP版本容易受到空字节攻击 (CVE-2006-7243)",
+"Please update your PHP installation to use %s securely." => "为保证安全使用 %s 请更新您的PHP。",
"No secure random number generator is available, please enable the PHP OpenSSL extension." => "随机数生成器无效，请启用PHP的OpenSSL扩展",
"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "没有安全随机码生成器，攻击者可能会猜测密码重置信息从而窃取您的账户",
"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "您的数据目录和文件可能可以直接被互联网访问，因为 .htaccess 并未正常工作。",
+"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "关于如何配置服务器，请参见 <a href=\"%s\" target=\"_blank\">此文档</a>。",
"Create an <strong>admin account</strong>" => "创建<strong>管理员账号</strong>",
"Advanced" => "高级",
"Data folder" => "数据目录",
diff --git a/core/l10n/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 e1493452d8633e22d2486b18a2b047a1228ee6e7..759a4fdc35e57b416f41fbcec7c6966fb91fabe2 100644
--- a/core/l10n/zh_TW.php
+++ b/core/l10n/zh_TW.php
@@ -1,10 +1,17 @@
<?php
$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",
-"Object type not provided." => "不支援的物件類型",
+"This category already exists: %s" => "分類已經存在：%s",
+"Object type not provided." => "未指定物件類型",
"%s ID not provided." => "未提供 %s ID 。",
"Error adding %s to favorites." => "加入 %s 到最愛時發生錯誤。",
"No categories selected for deletion." => "沒有選擇要刪除的分類。",
@@ -41,10 +48,11 @@ $TRANSLATIONS = array(
"last year" => "去年",
"years ago" => "幾年前",
"Choose" => "選擇",
-"Error loading file picker template" => "載入檔案選擇器樣板發生錯誤",
"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 名稱。",
@@ -56,20 +64,20 @@ $TRANSLATIONS = array(
"Error while changing permissions" => "修改權限時發生錯誤",
"Shared with you and the group {group} by {owner}" => "由 {owner} 分享給您和 {group}",
"Shared with you by {owner}" => "{owner} 已經和您分享",
-"Share with" => "與...分享",
+"Share with" => "分享給別人",
"Share with link" => "使用連結分享",
"Password protect" => "密碼保護",
"Password" => "密碼",
"Allow Public Upload" => "允許任何人上傳",
"Email link to person" => "將連結 email 給別人",
"Send" => "寄出",
-"Set expiration date" => "設置到期日",
+"Set expiration date" => "指定到期日",
"Expiration date" => "到期日",
"Share via email:" => "透過電子郵件分享：",
"No people found" => "沒有找到任何人",
"Resharing is not allowed" => "不允許重新分享",
"Shared in {item} with {user}" => "已和 {user} 分享 {item}",
-"Unshare" => "取消共享",
+"Unshare" => "取消分享",
"can edit" => "可編輯",
"access control" => "存取控制",
"create" => "建立",
@@ -77,15 +85,15 @@ $TRANSLATIONS = array(
"delete" => "刪除",
"share" => "分享",
"Password protected" => "受密碼保護",
-"Error unsetting expiration date" => "解除過期日設定失敗",
-"Error setting expiration date" => "錯誤的到期日設定",
-"Sending ..." => "正在傳送...",
+"Error unsetting expiration date" => "取消到期日設定失敗",
+"Error setting expiration date" => "設定到期日發生錯誤",
+"Sending ..." => "正在傳送…",
"Email sent" => "Email 已寄出",
"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "升級失敗，請將此問題回報 <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud 社群</a>。",
"The update was successful. Redirecting you to ownCloud now." => "升級成功，正將您重新導向至 ownCloud 。",
"%s password reset" => "%s 密碼重設",
"Use the following link to reset your password: {link}" => "請至以下連結重設您的密碼： {link}",
-"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "重設密碼的連結已經寄至您的電子郵件信箱，如果您過了一段時間還是沒有收到它，請檢查看看它是不是被放到垃圾郵件了，如果還是沒有的話，請聯絡您的 ownCloud 系統管理員。",
+"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "重設密碼的連結已經寄至您的電子郵件信箱，如果您過了一段時間還是沒有收到它，請檢查看看它是不是被歸為垃圾郵件了，如果還是沒有的話，請聯絡您的 ownCloud 系統管理員。",
"Request failed!<br>Did you make sure your email/username was right?" => "請求失敗！<br>您確定填入的電子郵件地址或是帳號名稱是正確的嗎？",
"You will receive a link to reset your password via Email." => "重設密碼的連結將會寄到您的電子郵件信箱。",
"Username" => "使用者名稱",
@@ -102,8 +110,8 @@ $TRANSLATIONS = array(
"Admin" => "管理",
"Help" => "說明",
"Access forbidden" => "存取被拒",
-"Cloud not found" => "未發現雲端",
-"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "嗨，\n\n通知您，%s 與您分享了 %s 。\n看一下：%s",
+"Cloud not found" => "找不到網頁",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "嗨，\n\n通知您一聲，%s 與您分享了 %s 。\n您可以到 %s 看看",
"Edit categories" => "編輯分類",
"Add" => "增加",
"Security Warning" => "安全性警告",
@@ -115,7 +123,7 @@ $TRANSLATIONS = array(
"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "請參考<a href=\"%s\" target=\"_blank\">說明文件</a>以瞭解如何正確設定您的伺服器。",
"Create an <strong>admin account</strong>" => "建立一個<strong>管理者帳號</strong>",
"Advanced" => "進階",
-"Data folder" => "資料夾",
+"Data folder" => "資料儲存位置",
"Configure the database" => "設定資料庫",
"will be used" => "將會使用",
"Database user" => "資料庫使用者",
@@ -126,15 +134,14 @@ $TRANSLATIONS = array(
"Finish setup" => "完成設定",
"%s is available. Get more information on how to update." => "%s 已經釋出，瞭解更多資訊以進行更新。",
"Log out" => "登出",
-"More apps" => "更多 Apps",
"Automatic logon rejected!" => "自動登入被拒！",
"If you did not change your password recently, your account may be compromised!" => "如果您最近並未更改密碼，您的帳號可能已經遭到入侵！",
"Please change your password to secure your account again." => "請更改您的密碼以再次取得您帳戶的控制權。",
"Lost your password?" => "忘記密碼？",
"remember" => "記住",
"Log in" => "登入",
-"Alternative Logins" => "替代登入方法",
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "嗨，<br><br>通知您，%s 與您分享了 %s ，<br><a href=\"%s\">看一下吧</a>",
-"Updating ownCloud to version %s, this may take a while." => "正在將 Owncloud 升級至版本 %s ，這可能需要一點時間。"
+"Alternative Logins" => "其他登入方法",
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "嗨，<br><br>通知您一聲，%s 與您分享了 %s ，<br><a href=\"%s\">看一下吧</a>",
+"Updating ownCloud to version %s, this may take a while." => "正在將 ownCloud 升級至版本 %s ，這可能需要一點時間。"
);
$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/lostpassword/controller.php b/core/lostpassword/controller.php
index 74a5be2b96f002c4dcd28ccef8f4214d4a4563c3..3c8099591a111891c2d9a58fbfe4134207c05a59 100644
--- a/core/lostpassword/controller.php
+++ b/core/lostpassword/controller.php
@@ -5,11 +5,12 @@
* later.
* See the COPYING-README file.
*/
+namespace OC\Core\LostPassword;
-class OC_Core_LostPassword_Controller {
+class Controller {
protected static function displayLostPasswordPage($error, $requested) {
- $isEncrypted = OC_App::isEnabled('files_encryption');
- OC_Template::printGuestPage('core/lostpassword', 'lostpassword',
+ $isEncrypted = \OC_App::isEnabled('files_encryption');
+ \OC_Template::printGuestPage('core/lostpassword', 'lostpassword',
array('error' => $error,
'requested' => $requested,
'isEncrypted' => $isEncrypted));
@@ -19,12 +20,12 @@ class OC_Core_LostPassword_Controller {
$route_args = array();
$route_args['token'] = $args['token'];
$route_args['user'] = $args['user'];
- OC_Template::printGuestPage('core/lostpassword', 'resetpassword',
+ \OC_Template::printGuestPage('core/lostpassword', 'resetpassword',
array('success' => $success, 'args' => $route_args));
}
protected static function checkToken($user, $token) {
- return OC_Preferences::getValue($user, 'owncloud', 'lostpassword') === hash('sha256', $token);
+ return \OC_Preferences::getValue($user, 'owncloud', 'lostpassword') === hash('sha256', $token);
}
public static function index($args) {
@@ -33,7 +34,7 @@ class OC_Core_LostPassword_Controller {
public static function sendEmail($args) {
- $isEncrypted = OC_App::isEnabled('files_encryption');
+ $isEncrypted = \OC_App::isEnabled('files_encryption');
if(!$isEncrypted || isset($_POST['continue'])) {
$continue = true;
@@ -41,26 +42,26 @@ class OC_Core_LostPassword_Controller {
$continue = false;
}
- if (OC_User::userExists($_POST['user']) && $continue) {
- $token = hash('sha256', OC_Util::generate_random_bytes(30).OC_Config::getValue('passwordsalt', ''));
- OC_Preferences::setValue($_POST['user'], 'owncloud', 'lostpassword',
+ if (\OC_User::userExists($_POST['user']) && $continue) {
+ $token = hash('sha256', \OC_Util::generateRandomBytes(30).\OC_Config::getValue('passwordsalt', ''));
+ \OC_Preferences::setValue($_POST['user'], 'owncloud', 'lostpassword',
hash('sha256', $token)); // Hash the token again to prevent timing attacks
- $email = OC_Preferences::getValue($_POST['user'], 'settings', 'email', '');
+ $email = \OC_Preferences::getValue($_POST['user'], 'settings', 'email', '');
if (!empty($email)) {
- $link = OC_Helper::linkToRoute('core_lostpassword_reset',
+ $link = \OC_Helper::linkToRoute('core_lostpassword_reset',
array('user' => $_POST['user'], 'token' => $token));
- $link = OC_Helper::makeURLAbsolute($link);
+ $link = \OC_Helper::makeURLAbsolute($link);
- $tmpl = new OC_Template('core/lostpassword', 'email');
+ $tmpl = new \OC_Template('core/lostpassword', 'email');
$tmpl->assign('link', $link, false);
$msg = $tmpl->fetchPage();
- $l = OC_L10N::get('core');
- $from = OCP\Util::getDefaultEmailAddress('lostpassword-noreply');
+ $l = \OC_L10N::get('core');
+ $from = \OCP\Util::getDefaultEmailAddress('lostpassword-noreply');
try {
- $defaults = new OC_Defaults();
- OC_Mail::send($email, $_POST['user'], $l->t('%s password reset', array($defaults->getName())), $msg, $from, $defaults->getName());
+ $defaults = new \OC_Defaults();
+ \OC_Mail::send($email, $_POST['user'], $l->t('%s password reset', array($defaults->getName())), $msg, $from, $defaults->getName());
} catch (Exception $e) {
- OC_Template::printErrorPage( 'A problem occurs during sending the e-mail please contact your administrator.');
+ \OC_Template::printErrorPage( 'A problem occurs during sending the e-mail please contact your administrator.');
}
self::displayLostPasswordPage(false, true);
} else {
@@ -84,9 +85,9 @@ class OC_Core_LostPassword_Controller {
public static function resetPassword($args) {
if (self::checkToken($args['user'], $args['token'])) {
if (isset($_POST['password'])) {
- if (OC_User::setPassword($args['user'], $_POST['password'])) {
- OC_Preferences::deleteKey($args['user'], 'owncloud', 'lostpassword');
- OC_User::unsetMagicInCookie();
+ if (\OC_User::setPassword($args['user'], $_POST['password'])) {
+ \OC_Preferences::deleteKey($args['user'], 'owncloud', 'lostpassword');
+ \OC_User::unsetMagicInCookie();
self::displayResetPasswordPage(true, $args);
} else {
self::displayResetPasswordPage(false, $args);
diff --git a/core/minimizer.php b/core/minimizer.php
index 4da9037c41308afeeae59a09cd2bfd27051fc49f..eeeddf86a814be9aa10528daf1b7b64b13b4e3e5 100644
--- a/core/minimizer.php
+++ b/core/minimizer.php
@@ -5,11 +5,11 @@ OC_App::loadApps();
if ($service == 'core.css') {
$minimizer = new OC_Minimizer_CSS();
- $files = OC_TemplateLayout::findStylesheetFiles(OC_Util::$core_styles);
+ $files = OC_TemplateLayout::findStylesheetFiles(OC_Util::$coreStyles);
$minimizer->output($files, $service);
}
else if ($service == 'core.js') {
$minimizer = new OC_Minimizer_JS();
- $files = OC_TemplateLayout::findJavascriptFiles(OC_Util::$core_scripts);
+ $files = OC_TemplateLayout::findJavascriptFiles(OC_Util::$coreScripts);
$minimizer->output($files, $service);
}
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/core/routes.php b/core/routes.php
index dd8222d4378e5d3c1c0538624801e437f39df530..57e25c0f1f7371576aeeece169f8225941b2d116 100644
--- a/core/routes.php
+++ b/core/routes.php
@@ -42,20 +42,37 @@ $this->create('js_config', '/core/js/config.js')
// Routing
$this->create('core_ajax_routes', '/core/routes.json')
->action('OC_Router', 'JSRoutes');
-
-OC::$CLASSPATH['OC_Core_LostPassword_Controller'] = 'core/lostpassword/controller.php';
+$this->create('core_ajax_preview', '/core/preview.png')
+ ->actionInclude('core/ajax/preview.php');
$this->create('core_lostpassword_index', '/lostpassword/')
->get()
- ->action('OC_Core_LostPassword_Controller', 'index');
+ ->action('OC\Core\LostPassword\Controller', 'index');
$this->create('core_lostpassword_send_email', '/lostpassword/')
->post()
- ->action('OC_Core_LostPassword_Controller', 'sendEmail');
+ ->action('OC\Core\LostPassword\Controller', 'sendEmail');
$this->create('core_lostpassword_reset', '/lostpassword/reset/{token}/{user}')
->get()
- ->action('OC_Core_LostPassword_Controller', 'reset');
+ ->action('OC\Core\LostPassword\Controller', 'reset');
$this->create('core_lostpassword_reset_password', '/lostpassword/reset/{token}/{user}')
->post()
- ->action('OC_Core_LostPassword_Controller', 'resetPassword');
+ ->action('OC\Core\LostPassword\Controller', 'resetPassword');
+
+// Avatar routes
+$this->create('core_avatar_get_tmp', '/avatar/tmp')
+ ->get()
+ ->action('OC\Core\Avatar\Controller', 'getTmpAvatar');
+$this->create('core_avatar_get', '/avatar/{user}/{size}')
+ ->get()
+ ->action('OC\Core\Avatar\Controller', 'getAvatar');
+$this->create('core_avatar_post', '/avatar/')
+ ->post()
+ ->action('OC\Core\Avatar\Controller', 'postAvatar');
+$this->create('core_avatar_delete', '/avatar/')
+ ->delete()
+ ->action('OC\Core\Avatar\Controller', 'deleteAvatar');
+$this->create('core_avatar_post_cropped', '/avatar/cropped')
+ ->post()
+ ->action('OC\Core\Avatar\Controller', 'postCroppedAvatar');
// Not specifically routed
$this->create('app_css', '/apps/{app}/{file}')
diff --git a/core/setup.php b/core/setup.php
index 40e30db533aaca594be9586975a22eeadebd22b1..4758c23b045ea214bdb8048258cf4e3b024aee7f 100644
--- a/core/setup.php
+++ b/core/setup.php
@@ -33,8 +33,8 @@ $opts = array(
'hasOracle' => $hasOracle,
'hasMSSQL' => $hasMSSQL,
'directory' => $datadir,
- 'secureRNG' => OC_Util::secureRNG_available(),
- 'htaccessWorking' => OC_Util::ishtaccessworking(),
+ 'secureRNG' => OC_Util::secureRNGAvailable(),
+ 'htaccessWorking' => OC_Util::isHtAccessWorking(),
'vulnerableToNullByte' => $vulnerableToNullByte,
'errors' => array(),
);
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 3c1114492cb3d59362015f6ad483714f56d572cf..71bec11d219b7bfb342a413f76b729f8a8e3095c 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -49,6 +49,9 @@
<span id="expand" tabindex="0" role="link">
<span id="expandDisplayName"><?php p(trim($_['user_displayname']) != '' ? $_['user_displayname'] : $_['user_uid']) ?></span>
<img class="svg" src="<?php print_unescaped(image_path('', 'actions/caret.svg')); ?>" />
+ <?php if ($_['enableAvatars']): ?>
+ <div class="avatardiv"></div>
+ <?php endif; ?>
</span>
<div id="expanddiv">
<?php foreach($_['settingsnavigation'] as $entry):?>
@@ -78,6 +81,7 @@
<nav><div id="navigation">
<ul id="apps" class="svg">
+ <div class="wrapper"><!-- for sticky footer of apps management -->
<?php foreach($_['navigation'] as $entry): ?>
<li data-id="<?php p($entry['id']); ?>">
<a href="<?php print_unescaped($entry['href']); ?>" title=""
@@ -89,15 +93,19 @@
</a>
</li>
<?php endforeach; ?>
+ <?php if(OC_User::isAdminUser(OC_User::getUser())): ?>
+ <div class="push"></div><!-- for for sticky footer of apps management -->
+ <?php endif; ?>
+ </div>
- <!-- show "More apps" link to app administration directly in app navigation -->
+ <!-- show "More apps" link to app administration directly in app navigation, as sticky footer -->
<?php if(OC_User::isAdminUser(OC_User::getUser())): ?>
<li id="apps-management">
<a href="<?php print_unescaped(OC_Helper::linkToRoute('settings_apps').'?installed'); ?>" title=""
<?php if( $entry['active'] ): ?> class="active"<?php endif; ?>>
<img class="icon svg" src="<?php print_unescaped(OC_Helper::imagePath('settings', 'apps.svg')); ?>"/>
<span>
- <?php p($l->t('More apps')); ?>
+ <?php p($l->t('Apps')); ?>
</span>
</a>
</li>
diff --git a/core/templates/login.php b/core/templates/login.php
index 9143510f75732046ffa104f07c4228205d9d3175..06f64d41e39e24e5efd9490eef5215b664f17cc9 100644
--- a/core/templates/login.php
+++ b/core/templates/login.php
@@ -21,12 +21,10 @@
</p>
<p class="infield groupbottom">
- <input type="password" name="password" id="password" value="" data-typetoggle="#show" placeholder=""
+ <input type="password" name="password" id="password" value="" placeholder=""
required<?php p($_['user_autofocus'] ? '' : ' autofocus'); ?> />
<label for="password" class="infield"><?php p($l->t('Password')); ?></label>
<img class="svg" id="password-icon" src="<?php print_unescaped(image_path('', 'actions/password.svg')); ?>" alt=""/>
- <input type="checkbox" id="show" name="show" />
- <label for="show"></label>
</p>
<?php if (isset($_['invalidpassword']) && ($_['invalidpassword'])): ?>
@@ -34,9 +32,10 @@
<?php p($l->t('Lost your password?')); ?>
</a>
<?php endif; ?>
-
+ <?php if ($_['rememberLoginAllowed'] === true) : ?>
<input type="checkbox" name="remember_login" value="1" id="remember_login" checked />
<label for="remember_login"><?php p($l->t('remember')); ?></label>
+ <?php endif; ?>
<input type="hidden" name="timezone-offset" id="timezone-offset"/>
<input type="submit" id="submit" class="login primary" value="<?php p($l->t('Log in')); ?>"/>
</fieldset>
diff --git a/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 f926ab44cd4064d466e033a336c9b31d96e7d71d..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>
@@ -383,7 +383,7 @@
<name>user</name>
<type>text</type>
<default></default>
- <notnull>true</notnull>
+ <notnull>false</notnull>
<length>64</length>
</field>
@@ -397,8 +397,6 @@
<index>
<name>id_user_index</name>
- <unique>true</unique>
- <primary>true</primary>
<field>
<name>fileid</name>
<sorting>ascending</sorting>
diff --git a/index.php b/index.php
index 90fd3efcc96e060e5f31875e6b7f12e03791e3f6..40063fa6e05b44305807b88926d331e6477b5bba 100755
--- a/index.php
+++ b/index.php
@@ -31,7 +31,7 @@ try {
} catch (Exception $ex) {
//show the user a detailed error page
- OC_Response::setStatus(OC_Response::STATUS_INTERNAL_SERVER_ERROR);
\OCP\Util::writeLog('index', $ex->getMessage(), \OCP\Util::FATAL);
+ OC_Response::setStatus(OC_Response::STATUS_INTERNAL_SERVER_ERROR);
OC_Template::printExceptionErrorPage($ex);
}
diff --git a/l10n/ach/core.po b/l10n/ach/core.po
new file mode 100644
index 0000000000000000000000000000000000000000..070293766e8d780b6bff86c813b19e34dc1b43fe
--- /dev/null
+++ b/l10n/ach/core.po
@@ -0,0 +1,711 @@
+# 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: Acoli (http://www.transifex.com/projects/p/owncloud/language/ach/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ach\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/ach/files.po b/l10n/ach/files.po
new file mode 100644
index 0000000000000000000000000000000000000000..b8a81660f4d313cce3166f790deac20af47592f8
--- /dev/null
+++ b/l10n/ach/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: Acoli (http://www.transifex.com/projects/p/owncloud/language/ach/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ach\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/ach/files_encryption.po b/l10n/ach/files_encryption.po
new file mode 100644
index 0000000000000000000000000000000000000000..bc509f34dc4b245fbcf598e1d6de38a523e2de20
--- /dev/null
+++ b/l10n/ach/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-07 04:39-0400\n"
+"PO-Revision-Date: 2013-09-07 07:27+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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ach\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:51
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:52
+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
+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/ach/files_external.po b/l10n/ach/files_external.po
new file mode 100644
index 0000000000000000000000000000000000000000..f3808f1199dc8ce74917312c2f127cdbe10bbdbe
--- /dev/null
+++ b/l10n/ach/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-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-07 07:27+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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ach\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/ach/files_sharing.po b/l10n/ach/files_sharing.po
new file mode 100644
index 0000000000000000000000000000000000000000..a6aa642bca6eef26a044405f4f83c96f91a169df
--- /dev/null
+++ b/l10n/ach/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-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-07 07:27+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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ach\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/ach/files_trashbin.po b/l10n/ach/files_trashbin.po
new file mode 100644
index 0000000000000000000000000000000000000000..327f892ea05e9bb711c58a3faea0436fe8886671
--- /dev/null
+++ b/l10n/ach/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-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-07 07:27+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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ach\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:184 templates/index.php:17
+msgid "Name"
+msgstr ""
+
+#: js/trash.js:185 templates/index.php:27
+msgid "Deleted"
+msgstr ""
+
+#: js/trash.js:193
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/trash.js:199
+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:20 templates/index.php:22
+msgid "Restore"
+msgstr ""
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr ""
+
+#: templates/part.breadcrumb.php:9
+msgid "Deleted Files"
+msgstr ""
diff --git a/l10n/ach/files_versions.po b/l10n/ach/files_versions.po
new file mode 100644
index 0000000000000000000000000000000000000000..71bc81dabab19682cb7ead6ffc58a6766db1521c
--- /dev/null
+++ b/l10n/ach/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-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-07 07:27+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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ach\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/ach/lib.po b/l10n/ach/lib.po
new file mode 100644
index 0000000000000000000000000000000000000000..efa6747b0fb17c06e3b730b49f090a382bfd0d76
--- /dev/null
+++ b/l10n/ach/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-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ach\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/ach/settings.po b/l10n/ach/settings.po
new file mode 100644
index 0000000000000000000000000000000000000000..591268ad3876e2a936da818d7090bc24d954d2d8
--- /dev/null
+++ b/l10n/ach/settings.po
@@ -0,0 +1,601 @@
+# 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: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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ach\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/ach/user_ldap.po b/l10n/ach/user_ldap.po
new file mode 100644
index 0000000000000000000000000000000000000000..8c2514234b3303e0ad50bc7a99a7b9749996090b
--- /dev/null
+++ b/l10n/ach/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-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-07 07:27+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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ach\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/ach/user_webdavauth.po b/l10n/ach/user_webdavauth.po
new file mode 100644
index 0000000000000000000000000000000000000000..f4fa10e1a4eb9e8bead981c6428bf8f3488f1f9f
--- /dev/null
+++ b/l10n/ach/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-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-07 07:27+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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ach\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/af_ZA/core.po b/l10n/af_ZA/core.po
index aedec2161270e889b6957179ca06449119b374c1..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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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"
@@ -22,6 +22,10 @@ msgstr ""
msgid "%s shared »%s« with you"
msgstr ""
+#: ajax/share.php:227
+msgid "group"
+msgstr ""
+
#: ajax/update.php:11
msgid "Turned on maintenance mode"
msgstr ""
@@ -86,6 +90,26 @@ msgstr ""
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 ""
@@ -162,59 +186,59 @@ msgstr ""
msgid "December"
msgstr ""
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "Instellings"
-#: js/js.js:812
+#: js/js.js:866
msgid "seconds ago"
msgstr ""
-#: js/js.js:813
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:814
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:815
+#: js/js.js:869
msgid "today"
msgstr ""
-#: js/js.js:816
+#: js/js.js:870
msgid "yesterday"
msgstr ""
-#: js/js.js:817
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:818
+#: js/js.js:872
msgid "last month"
msgstr ""
-#: js/js.js:819
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:820
+#: js/js.js:874
msgid "months ago"
msgstr ""
-#: js/js.js:821
+#: js/js.js:875
msgid "last year"
msgstr ""
-#: js/js.js:822
+#: js/js.js:876
msgid "years ago"
msgstr ""
@@ -222,22 +246,66 @@ msgstr ""
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:195
+#: 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."
@@ -247,7 +315,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:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr ""
@@ -267,7 +335,7 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr ""
@@ -323,67 +391,67 @@ msgstr ""
msgid "Expiration date"
msgstr ""
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr ""
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr ""
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr ""
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr ""
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr ""
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr ""
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr ""
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr ""
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr ""
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr ""
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr ""
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr ""
@@ -398,7 +466,7 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr ""
@@ -467,7 +535,7 @@ msgstr "Persoonlik"
msgid "Users"
msgstr "Gebruikers"
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "Toepassings"
@@ -596,14 +664,10 @@ msgstr "Maak opstelling klaar"
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "Teken uit"
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr ""
@@ -618,19 +682,19 @@ msgstr ""
msgid "Please change your password to secure your account again."
msgstr ""
-#: templates/login.php:34
+#: templates/login.php:32
msgid "Lost your password?"
msgstr "Jou wagwoord verloor?"
-#: templates/login.php:39
+#: templates/login.php:37
msgid "remember"
msgstr "onthou"
-#: templates/login.php:41
+#: templates/login.php:39
msgid "Log in"
msgstr "Teken aan"
-#: templates/login.php:47
+#: templates/login.php:45
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/af_ZA/files.po b/l10n/af_ZA/files.po
index 460b687ed7db94320ff25f9cab6bdd4ac4dff4b2..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-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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,7 +74,15 @@ msgstr ""
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:123
+#: 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 ""
@@ -82,149 +90,157 @@ 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: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:277 js/file-upload.js:293 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:465
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr ""
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr ""
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr ""
-#: js/filelist.js:303
+#: js/filelist.js:416
msgid "suggest name"
msgstr ""
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr ""
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr ""
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "undo"
msgstr ""
-#: js/filelist.js:453
-msgid "Uploading %n file"
-msgid_plural "Uploading %n files"
+#: 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:518
-msgid "files uploading"
+#: 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/files.js:52
+#: 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: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 ""
-#: js/files.js:580
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/files.js:586
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-
#: lib/app.php:73
#, php-format
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 ""
@@ -260,84 +276,68 @@ 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 ""
-#: templates/part.list.php:74
-msgid "directory"
-msgstr ""
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr ""
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr ""
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr ""
-
#: templates/upgrade.php:2
msgid "Upgrading filesystem cache..."
msgstr ""
diff --git a/l10n/af_ZA/files_sharing.po b/l10n/af_ZA/files_sharing.po
index a51530f213fa95a095d6e7a11a7db8c90f8f1290..1aa1c35c8b1ee28915a194ba056806db07574b98 100644
--- a/l10n/af_ZA/files_sharing.po
+++ b/l10n/af_ZA/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-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\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"
"Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
"MIME-Version: 1.0\n"
@@ -63,7 +63,7 @@ msgstr ""
msgid "%s shared the file %s with you"
msgstr ""
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr ""
@@ -75,6 +75,6 @@ msgstr ""
msgid "Cancel upload"
msgstr ""
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr ""
diff --git a/l10n/af_ZA/lib.po b/l10n/af_ZA/lib.po
index 7ecb600f305bf3680b1f5f46c97c9c29be9c5a0a..39af3220442c403183158ba0f65840b4923d0aa8 100644
--- a/l10n/af_ZA/lib.po
+++ b/l10n/af_ZA/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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\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"
"Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
"MIME-Version: 1.0\n"
@@ -48,11 +48,23 @@ msgstr "Gebruikers"
msgid "Admin"
msgstr "Admin"
-#: app.php:837
+#: 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 "webdienste onder jou beheer"
@@ -105,37 +117,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: 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:150
+#: 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:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -264,51 +276,51 @@ msgstr ""
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr ""
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr ""
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr ""
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr ""
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr ""
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr ""
diff --git a/l10n/af_ZA/settings.po b/l10n/af_ZA/settings.po
index 97f1665f351849889ce24f51cb14f835a03c7a8c..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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+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,55 +84,88 @@ msgstr ""
msgid "Couldn't update app."
msgstr ""
-#: js/apps.js:35
+#: 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:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr ""
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr ""
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr ""
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr ""
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr ""
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr ""
-#: js/personal.js:150
+#: 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:172
+#: js/personal.js:287
msgid "Saving..."
msgstr ""
@@ -148,16 +181,16 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: 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:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr ""
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr ""
@@ -177,7 +210,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr ""
@@ -343,11 +376,11 @@ msgstr ""
msgid "Less"
msgstr ""
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr ""
-#: templates/admin.php:246 templates/personal.php:143
+#: 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 "
@@ -414,7 +447,7 @@ msgstr ""
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:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "Wagwoord"
@@ -438,7 +471,7 @@ msgstr "Nuwe wagwoord"
msgid "Change password"
msgstr ""
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr ""
@@ -454,38 +487,66 @@ msgstr ""
msgid "Fill in an email address to enable password recovery"
msgstr ""
-#: templates/personal.php:85 templates/personal.php:86
-msgid "Language"
+#: 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:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:106
+#: 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:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr ""
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -511,30 +572,30 @@ msgstr ""
msgid "Default Storage"
msgstr ""
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr ""
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr ""
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "Gebruikersnaam"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr ""
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr ""
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr ""
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr ""
diff --git a/l10n/af_ZA/user_ldap.po b/l10n/af_ZA/user_ldap.po
index b4f237d610944c50290306287d7b46986a053000..4c25c9eb18781e7f90a6a04c6c49dceb14071d9c 100644
--- a/l10n/af_ZA/user_ldap.po
+++ b/l10n/af_ZA/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\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"
"Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ar/core.po b/l10n/ar/core.po
index c06bc5e8584ddc2e7b1e6a8c45f39f2a44387026..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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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"
@@ -22,6 +23,10 @@ msgstr ""
msgid "%s shared »%s« with you"
msgstr ""
+#: ajax/share.php:227
+msgid "group"
+msgstr "مجموعة"
+
#: ajax/update.php:11
msgid "Turned on maintenance mode"
msgstr ""
@@ -86,6 +91,26 @@ msgstr "لم يتم اختيار فئة للحذف"
msgid "Error removing %s from favorites."
msgstr "خطأ في حذف %s من المفضلة"
+#: 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 "الاحد"
@@ -162,15 +187,15 @@ msgstr "تشرين الثاني"
msgid "December"
msgstr "كانون الاول"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "إعدادات"
-#: js/js.js:812
+#: js/js.js:866
msgid "seconds ago"
msgstr "منذ ثواني"
-#: js/js.js:813
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
@@ -180,7 +205,7 @@ msgstr[3] ""
msgstr[4] ""
msgstr[5] ""
-#: js/js.js:814
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
@@ -190,15 +215,15 @@ msgstr[3] ""
msgstr[4] ""
msgstr[5] ""
-#: js/js.js:815
+#: js/js.js:869
msgid "today"
msgstr "اليوم"
-#: js/js.js:816
+#: js/js.js:870
msgid "yesterday"
msgstr "يوم أمس"
-#: js/js.js:817
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
@@ -208,11 +233,11 @@ msgstr[3] ""
msgstr[4] ""
msgstr[5] ""
-#: js/js.js:818
+#: js/js.js:872
msgid "last month"
msgstr "الشهر الماضي"
-#: js/js.js:819
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
@@ -222,15 +247,15 @@ msgstr[3] ""
msgstr[4] ""
msgstr[5] ""
-#: js/js.js:820
+#: js/js.js:874
msgid "months ago"
msgstr "شهر مضى"
-#: js/js.js:821
+#: js/js.js:875
msgid "last year"
msgstr "السنةالماضية"
-#: js/js.js:822
+#: js/js.js:876
msgid "years ago"
msgstr "سنة مضت"
@@ -238,22 +263,70 @@ msgstr "سنة مضت"
msgid "Choose"
msgstr "اختيار"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "نعم"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "لا"
-#: js/oc-dialogs.js:195
+#: 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] ""
+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."
@@ -263,7 +336,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:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "خطأ"
@@ -283,7 +356,7 @@ msgstr "مشارك"
msgid "Share"
msgstr "شارك"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr "حصل خطأ عند عملية المشاركة"
@@ -339,67 +412,67 @@ msgstr "تعيين تاريخ إنتهاء الصلاحية"
msgid "Expiration date"
msgstr "تاريخ إنتهاء الصلاحية"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "مشاركة عبر البريد الإلكتروني:"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "لم يتم العثور على أي شخص"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "لا يسمح بعملية إعادة المشاركة"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr "شورك في {item} مع {user}"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "إلغاء مشاركة"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "التحرير مسموح"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "ضبط الوصول"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "إنشاء"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "تحديث"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "حذف"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "مشاركة"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "محمي بكلمة السر"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr "حصل خطأ عند عملية إزالة تاريخ إنتهاء الصلاحية"
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr "حصل خطأ عند عملية تعيين تاريخ إنتهاء الصلاحية"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr "جاري الارسال ..."
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr "تم ارسال البريد الالكتروني"
@@ -414,7 +487,7 @@ msgstr "حصل خطأ في عملية التحديث, يرجى ارسال تقر
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "تم التحديث بنجاح , يتم اعادة توجيهك الان الى Owncloud"
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr ""
@@ -428,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."
@@ -483,7 +556,7 @@ msgstr "شخصي"
msgid "Users"
msgstr "المستخدمين"
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "التطبيقات"
@@ -612,14 +685,10 @@ msgstr "انهاء التعديلات"
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "الخروج"
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "تم رفض تسجيل الدخول التلقائي!"
@@ -634,19 +703,19 @@ msgstr "قد يكون حسابك في خطر إن لم تقم بإعادة تع
msgid "Please change your password to secure your account again."
msgstr "الرجاء إعادة تعيين كلمة السر لتأمين حسابك."
-#: templates/login.php:34
+#: templates/login.php:32
msgid "Lost your password?"
msgstr "هل نسيت كلمة السر؟"
-#: templates/login.php:39
+#: templates/login.php:37
msgid "remember"
msgstr "تذكر"
-#: templates/login.php:41
+#: templates/login.php:39
msgid "Log in"
msgstr "أدخل"
-#: templates/login.php:47
+#: templates/login.php:45
msgid "Alternative Logins"
msgstr "اسماء دخول بديلة"
diff --git a/l10n/ar/files.po b/l10n/ar/files.po
index c814f86a38a14aeb1a6e548811530c25c3fe1374..5e431360f9609e2d6010baf2ca7e2459dbef29a2 100644
--- a/l10n/ar/files.po
+++ b/l10n/ar/files.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# ibrahim_9090 <ibrahim9090@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
@@ -29,11 +30,11 @@ msgstr "فشل في نقل %s"
#: ajax/upload.php:16 ajax/upload.php:45
msgid "Unable to set upload directory."
-msgstr ""
+msgstr "غير قادر على تحميل المجلد"
#: ajax/upload.php:22
msgid "Invalid Token"
-msgstr ""
+msgstr "علامة غير صالحة"
#: ajax/upload.php:59
msgid "No file was uploaded. Unknown error"
@@ -74,7 +75,15 @@ msgstr "خطأ في الكتابة على القرص الصلب"
msgid "Not enough storage available"
msgstr "لا يوجد مساحة تخزينية كافية"
-#: ajax/upload.php:123
+#: 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 "مسار غير صحيح."
@@ -82,76 +91,104 @@ 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 ""
+msgstr "لا توجد مساحة كافية"
-#: js/file-upload.js:64
+#: 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 "عنوان ال URL لا يجوز أن يكون فارغا."
-#: 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 ""
+msgstr "تسمية ملف غير صالحة. استخدام الاسم \"shared\" محجوز بواسطة ownCloud"
-#: js/file-upload.js:277 js/file-upload.js:293 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:465
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "قيد الانتظار"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{new_name} موجود مسبقا"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "استبدال"
-#: js/filelist.js:303
+#: js/filelist.js:416
msgid "suggest name"
msgstr "اقترح إسم"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "إلغاء"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr "استبدل {new_name} بـ {old_name}"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "undo"
msgstr "تراجع"
-#: js/filelist.js:453
+#: 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[3] ""
+msgstr[4] ""
+msgstr[5] ""
+
+#: 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[3] ""
+msgstr[4] ""
+msgstr[5] ""
+
+#: js/filelist.js:541
+msgid "{dirs} and {files}"
+msgstr "{dirs} و {files}"
+
+#: js/filelist.js:731 js/filelist.js:769
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
@@ -161,82 +198,62 @@ msgstr[3] ""
msgstr[4] ""
msgstr[5] ""
-#: js/filelist.js:518
-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 ""
+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 "معدل"
-#: js/files.js:580
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-msgstr[5] ""
-
-#: js/files.js:586
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-msgstr[5] ""
-
#: lib/app.php:73
#, php-format
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 "رفع"
@@ -272,84 +289,68 @@ 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: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 "الفحص الحالي"
-#: templates/part.list.php:74
-msgid "directory"
-msgstr ""
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr ""
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr ""
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr ""
-
#: templates/upgrade.php:2
msgid "Upgrading filesystem cache..."
msgstr "تحديث ذاكرة التخزين المؤقت(الكاش) الخاصة بملفات النظام ..."
diff --git a/l10n/ar/files_sharing.po b/l10n/ar/files_sharing.po
index af3920e09499ac03765d95339b031c0e5a525eb6..df2684b93db32385abb7beb322abfc3880ccb511 100644
--- a/l10n/ar/files_sharing.po
+++ b/l10n/ar/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:01+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"
@@ -63,7 +63,7 @@ msgstr "%s شارك المجلد %s معك"
msgid "%s shared the file %s with you"
msgstr "%s شارك الملف %s معك"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "تحميل"
@@ -75,6 +75,6 @@ msgstr "رفع"
msgid "Cancel upload"
msgstr "إلغاء رفع الملفات"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "لا يوجد عرض مسبق لـ"
diff --git a/l10n/ar/lib.po b/l10n/ar/lib.po
index 849305d0f32f0bd8b9642a324971805d59b36624..0cc9b5b1c8c730a7b61bd052c39509739e9e903c 100644
--- a/l10n/ar/lib.po
+++ b/l10n/ar/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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\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"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
@@ -48,11 +48,23 @@ msgstr "المستخدمين"
msgid "Admin"
msgstr "المدير"
-#: app.php:837
+#: 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 "خدمات الشبكة تحت سيطرتك"
@@ -105,37 +117,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: 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:150
+#: 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:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -264,11 +276,11 @@ msgstr "اعدادات خادمك غير صحيحة بشكل تسمح لك بم
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "الرجاء التحقق من <a href='%s'>دليل التنصيب</a>."
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "منذ ثواني"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
@@ -278,7 +290,7 @@ msgstr[3] ""
msgstr[4] ""
msgstr[5] ""
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
@@ -288,15 +300,15 @@ msgstr[3] ""
msgstr[4] ""
msgstr[5] ""
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "اليوم"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "يوم أمس"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
@@ -306,11 +318,11 @@ msgstr[3] ""
msgstr[4] ""
msgstr[5] ""
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "الشهر الماضي"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
@@ -320,11 +332,11 @@ msgstr[3] ""
msgstr[4] ""
msgstr[5] ""
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "السنةالماضية"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "سنة مضت"
diff --git a/l10n/ar/settings.po b/l10n/ar/settings.po
index a3d217bb4e9e4e87ec8684668b1bda4c62f61f44..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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+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,55 +84,88 @@ msgstr "فشل إزالة المستخدم من المجموعة %s"
msgid "Couldn't update app."
msgstr "تعذر تحديث التطبيق."
-#: js/apps.js:35
+#: 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:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr "إيقاف"
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr "تفعيل"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr "الرجاء الانتظار ..."
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr "جاري التحديث ..."
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr "حصل خطأ أثناء تحديث التطبيق"
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "خطأ"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr "حدث"
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr "تم التحديث بنجاح"
-#: js/personal.js:150
+#: 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:172
+#: js/personal.js:287
msgid "Saving..."
msgstr "جاري الحفظ..."
@@ -148,16 +181,16 @@ msgstr "تراجع"
msgid "Unable to remove user"
msgstr "تعذر حذف المستخدم"
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: 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:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "مدير المجموعة"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "إلغاء"
@@ -177,7 +210,7 @@ msgstr "حصل خطأ اثناء انشاء مستخدم"
msgid "A valid password must be provided"
msgstr "يجب ادخال كلمة مرور صحيحة"
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "__language_name__"
@@ -343,11 +376,11 @@ msgstr "المزيد"
msgid "Less"
msgstr "أقل"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "إصدار"
-#: templates/admin.php:246 templates/personal.php:143
+#: 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 "
@@ -414,7 +447,7 @@ msgstr "ابدأ خطوات بداية التشغيل من جديد"
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "تم إستهلاك <strong>%s</strong> من المتوفر <strong>%s</strong>"
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "كلمة المرور"
@@ -438,7 +471,7 @@ msgstr "كلمات سر جديدة"
msgid "Change password"
msgstr "عدل كلمة السر"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr "اسم الحساب"
@@ -454,38 +487,66 @@ msgstr "عنوانك البريدي"
msgid "Fill in an email address to enable password recovery"
msgstr "أدخل عنوانك البريدي لتفعيل استرجاع كلمة المرور"
-#: templates/personal.php:85 templates/personal.php:86
+#: 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:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "ساعد في الترجمه"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: 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:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "التشفير"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -511,30 +572,30 @@ msgstr ""
msgid "Default Storage"
msgstr "وحدة التخزين الافتراضية"
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr "غير محدود"
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "شيء آخر"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "إسم المستخدم"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr "وحدة التخزين"
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr "تغيير اسم الحساب"
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr "اعداد كلمة مرور جديدة"
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr "افتراضي"
diff --git a/l10n/ar/user_ldap.po b/l10n/ar/user_ldap.po
index d760e3d0e438ca49287a54adc10f014c6c5d0cef..c18c2b146fe341b84a48f449e0d61ae74bebde01 100644
--- a/l10n/ar/user_ldap.po
+++ b/l10n/ar/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\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"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/be/core.po b/l10n/be/core.po
index c474afadeeee7e5939fd305e39dfe3d5d4c05ae4..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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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"
@@ -22,6 +22,10 @@ msgstr ""
msgid "%s shared »%s« with you"
msgstr ""
+#: ajax/share.php:227
+msgid "group"
+msgstr ""
+
#: ajax/update.php:11
msgid "Turned on maintenance mode"
msgstr ""
@@ -86,6 +90,26 @@ msgstr ""
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 ""
@@ -162,15 +186,15 @@ msgstr ""
msgid "December"
msgstr ""
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr ""
-#: js/js.js:812
+#: js/js.js:866
msgid "seconds ago"
msgstr ""
-#: js/js.js:813
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
@@ -178,7 +202,7 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: js/js.js:814
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
@@ -186,15 +210,15 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: js/js.js:815
+#: js/js.js:869
msgid "today"
msgstr ""
-#: js/js.js:816
+#: js/js.js:870
msgid "yesterday"
msgstr ""
-#: js/js.js:817
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
@@ -202,11 +226,11 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: js/js.js:818
+#: js/js.js:872
msgid "last month"
msgstr ""
-#: js/js.js:819
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
@@ -214,15 +238,15 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: js/js.js:820
+#: js/js.js:874
msgid "months ago"
msgstr ""
-#: js/js.js:821
+#: js/js.js:875
msgid "last year"
msgstr ""
-#: js/js.js:822
+#: js/js.js:876
msgid "years ago"
msgstr ""
@@ -230,22 +254,68 @@ msgstr ""
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:195
+#: 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] ""
+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."
@@ -255,7 +325,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:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr ""
@@ -275,7 +345,7 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr ""
@@ -331,67 +401,67 @@ msgstr ""
msgid "Expiration date"
msgstr ""
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr ""
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr ""
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr ""
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr ""
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr ""
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr ""
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr ""
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr ""
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr ""
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr ""
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr ""
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr ""
@@ -406,7 +476,7 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr ""
@@ -475,7 +545,7 @@ msgstr ""
msgid "Users"
msgstr ""
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr ""
@@ -604,14 +674,10 @@ msgstr "Завяршыць ўстаноўку."
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr ""
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr ""
@@ -626,19 +692,19 @@ msgstr ""
msgid "Please change your password to secure your account again."
msgstr ""
-#: templates/login.php:34
+#: templates/login.php:32
msgid "Lost your password?"
msgstr ""
-#: templates/login.php:39
+#: templates/login.php:37
msgid "remember"
msgstr ""
-#: templates/login.php:41
+#: templates/login.php:39
msgid "Log in"
msgstr ""
-#: templates/login.php:47
+#: templates/login.php:45
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/be/files.po b/l10n/be/files.po
index 69819ec5ac3e67f724883e9780f1a6657ccda232..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-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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,7 +74,15 @@ msgstr ""
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:123
+#: 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 ""
@@ -82,155 +90,163 @@ 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: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:277 js/file-upload.js:293 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:465
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr ""
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr ""
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr ""
-#: js/filelist.js:303
+#: js/filelist.js:416
msgid "suggest name"
msgstr ""
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr ""
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr ""
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "undo"
msgstr ""
-#: js/filelist.js:453
-msgid "Uploading %n file"
-msgid_plural "Uploading %n files"
+#: 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[3] ""
-#: js/filelist.js:518
-msgid "files uploading"
+#: 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[3] ""
+
+#: js/filelist.js:541
+msgid "{dirs} and {files}"
msgstr ""
-#: js/files.js:52
+#: js/filelist.js:731 js/filelist.js:769
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: 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 ""
-#: js/files.js:580
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-
-#: js/files.js:586
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-
#: lib/app.php:73
#, php-format
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 ""
@@ -266,84 +282,68 @@ 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 ""
-#: templates/part.list.php:74
-msgid "directory"
-msgstr ""
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr ""
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr ""
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr ""
-
#: templates/upgrade.php:2
msgid "Upgrading filesystem cache..."
msgstr ""
diff --git a/l10n/be/lib.po b/l10n/be/lib.po
index 965d701fc2e4296d1d306949d98f0a38a1ad0905..cba5a16eb98b2a7425bd8db27f0f84de20523a7d 100644
--- a/l10n/be/lib.po
+++ b/l10n/be/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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\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"
"Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
"MIME-Version: 1.0\n"
@@ -48,11 +48,23 @@ msgstr ""
msgid "Admin"
msgstr ""
-#: app.php:837
+#: 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 ""
@@ -105,37 +117,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: 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:150
+#: 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:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -264,11 +276,11 @@ msgstr ""
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr ""
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
@@ -276,7 +288,7 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
@@ -284,15 +296,15 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr ""
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr ""
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
@@ -300,11 +312,11 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr ""
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
@@ -312,11 +324,11 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr ""
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr ""
diff --git a/l10n/be/settings.po b/l10n/be/settings.po
index 8bb3a339cac2a77d77419e76a5ed17417f0034ca..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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+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,55 +84,88 @@ msgstr ""
msgid "Couldn't update app."
msgstr ""
-#: js/apps.js:35
+#: 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:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr ""
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr ""
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr ""
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr ""
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr ""
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr ""
-#: js/personal.js:150
+#: 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:172
+#: js/personal.js:287
msgid "Saving..."
msgstr ""
@@ -148,16 +181,16 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: 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:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr ""
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr ""
@@ -177,7 +210,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr ""
@@ -343,11 +376,11 @@ msgstr ""
msgid "Less"
msgstr ""
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr ""
-#: templates/admin.php:246 templates/personal.php:143
+#: 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 "
@@ -414,7 +447,7 @@ msgstr ""
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:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr ""
@@ -438,7 +471,7 @@ msgstr ""
msgid "Change password"
msgstr ""
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr ""
@@ -454,38 +487,66 @@ msgstr ""
msgid "Fill in an email address to enable password recovery"
msgstr ""
-#: templates/personal.php:85 templates/personal.php:86
-msgid "Language"
+#: 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:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:106
+#: 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:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr ""
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -511,30 +572,30 @@ msgstr ""
msgid "Default Storage"
msgstr ""
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr ""
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr ""
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr ""
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr ""
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr ""
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr ""
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr ""
diff --git a/l10n/bg_BG/core.po b/l10n/bg_BG/core.po
index 641f5322a7441c67d1109b7248ec9aaeee37dc00..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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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"
@@ -22,6 +22,10 @@ msgstr ""
msgid "%s shared »%s« with you"
msgstr ""
+#: ajax/share.php:227
+msgid "group"
+msgstr ""
+
#: ajax/update.php:11
msgid "Turned on maintenance mode"
msgstr ""
@@ -86,6 +90,26 @@ msgstr "Няма избрани категории за изтриване"
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 "Неделя"
@@ -162,59 +186,59 @@ msgstr "Ноември"
msgid "December"
msgstr "Декември"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "Настройки"
-#: js/js.js:812
+#: js/js.js:866
msgid "seconds ago"
msgstr "преди секунди"
-#: js/js.js:813
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:814
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:815
+#: js/js.js:869
msgid "today"
msgstr "днес"
-#: js/js.js:816
+#: js/js.js:870
msgid "yesterday"
msgstr "вчера"
-#: js/js.js:817
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:818
+#: js/js.js:872
msgid "last month"
msgstr "последният месец"
-#: js/js.js:819
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:820
+#: js/js.js:874
msgid "months ago"
msgstr ""
-#: js/js.js:821
+#: js/js.js:875
msgid "last year"
msgstr "последната година"
-#: js/js.js:822
+#: js/js.js:876
msgid "years ago"
msgstr "последните години"
@@ -222,22 +246,66 @@ msgstr "последните години"
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "Да"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "Не"
-#: js/oc-dialogs.js:195
+#: 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."
@@ -247,7 +315,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:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "Грешка"
@@ -267,7 +335,7 @@ msgstr ""
msgid "Share"
msgstr "Споделяне"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr ""
@@ -323,67 +391,67 @@ msgstr ""
msgid "Expiration date"
msgstr ""
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr ""
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr ""
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr ""
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr ""
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr ""
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "създаване"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr ""
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr ""
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr ""
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr ""
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr ""
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr ""
@@ -398,7 +466,7 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr ""
@@ -467,7 +535,7 @@ msgstr "Лични"
msgid "Users"
msgstr "Потребители"
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "Приложения"
@@ -596,14 +664,10 @@ msgstr "Завършване на настройките"
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "Изход"
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr ""
@@ -618,19 +682,19 @@ msgstr ""
msgid "Please change your password to secure your account again."
msgstr ""
-#: templates/login.php:34
+#: templates/login.php:32
msgid "Lost your password?"
msgstr "Забравена парола?"
-#: templates/login.php:39
+#: templates/login.php:37
msgid "remember"
msgstr "запомни"
-#: templates/login.php:41
+#: templates/login.php:39
msgid "Log in"
msgstr "Вход"
-#: templates/login.php:47
+#: templates/login.php:45
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/bg_BG/files.po b/l10n/bg_BG/files.po
index 033c103f0e56bd8e27d75bf9356eecf07f6b2bc1..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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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,7 +74,15 @@ msgstr "Възникна проблем при запис в диска"
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:123
+#: 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 "Невалидна директория."
@@ -82,149 +90,157 @@ 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: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:277 js/file-upload.js:293 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:465
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "Чакащо"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr ""
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "препокриване"
-#: js/filelist.js:303
+#: js/filelist.js:416
msgid "suggest name"
msgstr ""
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "отказ"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr ""
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "undo"
msgstr "възтановяване"
-#: js/filelist.js:453
-msgid "Uploading %n file"
-msgid_plural "Uploading %n files"
+#: 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:518
-msgid "files uploading"
+#: 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/files.js:52
+#: 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: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 "Променено"
-#: js/files.js:580
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/files.js:586
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-
#: lib/app.php:73
#, php-format
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 "Качване"
@@ -260,84 +276,68 @@ 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 ""
-#: templates/part.list.php:74
-msgid "directory"
-msgstr ""
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr ""
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr "файл"
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr ""
-
#: templates/upgrade.php:2
msgid "Upgrading filesystem cache..."
msgstr ""
diff --git a/l10n/bg_BG/files_sharing.po b/l10n/bg_BG/files_sharing.po
index ee8f206c9c251d24125c47f84fa06789f1c11b94..20f297f9cdcd1c3defeca0fa9d59b83b995202c4 100644
--- a/l10n/bg_BG/files_sharing.po
+++ b/l10n/bg_BG/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00: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"
@@ -63,7 +63,7 @@ msgstr "%s сподели папката %s с Вас"
msgid "%s shared the file %s with you"
msgstr "%s сподели файла %s с Вас"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "Изтегляне"
@@ -75,6 +75,6 @@ msgstr "Качване"
msgid "Cancel upload"
msgstr "Спри качването"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "Няма наличен преглед за"
diff --git a/l10n/bg_BG/lib.po b/l10n/bg_BG/lib.po
index 234bc905f5a0911155bb1b25cb9c5e64e3f34b81..6ee938f5ab948f89812cebb1d341777bac7efa43 100644
--- a/l10n/bg_BG/lib.po
+++ b/l10n/bg_BG/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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\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"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
@@ -49,11 +49,23 @@ msgstr "Потребители"
msgid "Admin"
msgstr "Админ"
-#: app.php:837
+#: 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 "уеб услуги под Ваш контрол"
@@ -106,37 +118,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: 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:150
+#: 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:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -265,51 +277,51 @@ msgstr "Вашият web сървър все още не е удачно нас
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Моля направете повторна справка с <a href='%s'>ръководството за инсталиране</a>."
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "преди секунди"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "днес"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "вчера"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "последният месец"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "последната година"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "последните години"
diff --git a/l10n/bg_BG/settings.po b/l10n/bg_BG/settings.po
index c26480360dc4c546544866e2835fdbea2830362c..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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+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,55 +84,88 @@ msgstr ""
msgid "Couldn't update app."
msgstr ""
-#: js/apps.js:35
+#: 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}"
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr "Изключено"
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr "Включено"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr "Моля почакайте...."
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr "Обновява се..."
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "Грешка"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr "Обновяване"
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr "Обновено"
-#: js/personal.js:150
+#: 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:172
+#: js/personal.js:287
msgid "Saving..."
msgstr "Записване..."
@@ -148,16 +181,16 @@ msgstr "възтановяване"
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: 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:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr ""
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "Изтриване"
@@ -177,7 +210,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "__language_name__"
@@ -343,11 +376,11 @@ msgstr "Още"
msgid "Less"
msgstr "По-малко"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "Версия"
-#: templates/admin.php:246 templates/personal.php:143
+#: 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 "
@@ -414,7 +447,7 @@ msgstr "Покажи настройките за първоначално зар
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:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "Парола"
@@ -438,7 +471,7 @@ msgstr "Нова парола"
msgid "Change password"
msgstr "Промяна на паролата"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr "Екранно име"
@@ -454,38 +487,66 @@ msgstr "Вашия email адрес"
msgid "Fill in an email address to enable password recovery"
msgstr "Въведете е-поща за възстановяване на паролата"
-#: templates/personal.php:85 templates/personal.php:86
+#: 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:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "Помогнете с превода"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: 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:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "Криптиране"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -511,30 +572,30 @@ msgstr ""
msgid "Default Storage"
msgstr "Хранилище по подразбиране"
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr "Неограничено"
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "Други"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "Потребител"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr "Хранилище"
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr ""
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr ""
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr "По подразбиране"
diff --git a/l10n/bg_BG/user_ldap.po b/l10n/bg_BG/user_ldap.po
index 00d80cb160ec770bb413741f03c3b4f0d7c3a05c..8401703d7c0c36cd2c36517e3538c37994f6928b 100644
--- a/l10n/bg_BG/user_ldap.po
+++ b/l10n/bg_BG/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\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"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/bn_BD/core.po b/l10n/bn_BD/core.po
index 29b5dea54e5896abe6f37b4d2b9a2f2100a0fb6e..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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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"
@@ -22,6 +22,10 @@ msgstr ""
msgid "%s shared »%s« with you"
msgstr ""
+#: ajax/share.php:227
+msgid "group"
+msgstr ""
+
#: ajax/update.php:11
msgid "Turned on maintenance mode"
msgstr ""
@@ -86,6 +90,26 @@ msgstr "মুছে ফেলার জন্য কনো ক্যাটে
msgid "Error removing %s from favorites."
msgstr "প্রিয় থেকে %s সরিয়ে ফেলতে সমস্যা দেখা দিয়েছে।"
+#: 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 "রবিবার"
@@ -162,59 +186,59 @@ msgstr "নভেম্বর"
msgid "December"
msgstr "ডিসেম্বর"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "নিয়ামকসমূহ"
-#: js/js.js:812
+#: js/js.js:866
msgid "seconds ago"
msgstr "সেকেন্ড পূর্বে"
-#: js/js.js:813
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:814
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:815
+#: js/js.js:869
msgid "today"
msgstr "আজ"
-#: js/js.js:816
+#: js/js.js:870
msgid "yesterday"
msgstr "গতকাল"
-#: js/js.js:817
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:818
+#: js/js.js:872
msgid "last month"
msgstr "গত মাস"
-#: js/js.js:819
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:820
+#: js/js.js:874
msgid "months ago"
msgstr "মাস পূর্বে"
-#: js/js.js:821
+#: js/js.js:875
msgid "last year"
msgstr "গত বছর"
-#: js/js.js:822
+#: js/js.js:876
msgid "years ago"
msgstr "বছর পূর্বে"
@@ -222,22 +246,66 @@ msgstr "বছর পূর্বে"
msgid "Choose"
msgstr "বেছে নিন"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "হ্যাঁ"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "না"
-#: js/oc-dialogs.js:195
+#: 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."
@@ -247,7 +315,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:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "সমস্যা"
@@ -267,7 +335,7 @@ msgstr "ভাগাভাগিকৃত"
msgid "Share"
msgstr "ভাগাভাগি কর"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr "ভাগাভাগি করতে সমস্যা দেখা দিয়েছে "
@@ -323,67 +391,67 @@ msgstr "মেয়াদোত্তীর্ণ হওয়ার তারিখ
msgid "Expiration date"
msgstr "মেয়াদোত্তীর্ণ হওয়ার তারিখ"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "ই-মেইলের মাধ্যমে ভাগাভাগি করুনঃ"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "কোন ব্যক্তি খুঁজে পাওয়া গেল না"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "পূনঃরায় ভাগাভাগি অনুমোদিত নয়"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr "{user} এর সাথে {item} ভাগাভাগি করা হয়েছে"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "ভাগাভাগি বাতিল "
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "সম্পাদনা করতে পারবেন"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "অধিগম্যতা নিয়ন্ত্রণ"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "তৈরী করুন"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "পরিবর্ধন কর"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "মুছে ফেল"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "ভাগাভাগি কর"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "কূটশব্দদ্বারা সুরক্ষিত"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr "মেয়াদোত্তীর্ণ হওয়ার তারিখ নির্ধারণ বাতিল করতে সমস্যা দেখা দিয়েছে"
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr "মেয়াদোত্তীর্ণ হওয়ার তারিখ নির্ধারণ করতে সমস্যা দেখা দিয়েছে"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr "পাঠানো হচ্ছে......"
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr "ই-মেইল পাঠানো হয়েছে"
@@ -398,7 +466,7 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr ""
@@ -467,7 +535,7 @@ msgstr "ব্যক্তিগত"
msgid "Users"
msgstr "ব্যবহারকারী"
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "অ্যাপ"
@@ -596,14 +664,10 @@ msgstr "সেটআপ সুসম্পন্ন কর"
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "প্রস্থান"
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr ""
@@ -618,19 +682,19 @@ msgstr ""
msgid "Please change your password to secure your account again."
msgstr ""
-#: templates/login.php:34
+#: templates/login.php:32
msgid "Lost your password?"
msgstr "কূটশব্দ হারিয়েছেন?"
-#: templates/login.php:39
+#: templates/login.php:37
msgid "remember"
msgstr "মনে রাখ"
-#: templates/login.php:41
+#: templates/login.php:39
msgid "Log in"
msgstr "প্রবেশ"
-#: templates/login.php:47
+#: templates/login.php:45
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/bn_BD/files.po b/l10n/bn_BD/files.po
index 0422f92b57584f5ed96ed642a0ae95de2d2acb57..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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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,7 +74,15 @@ msgstr "ডিস্কে লিখতে ব্যর্থ"
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:123
+#: 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 "ভুল ডিরেক্টরি"
@@ -82,149 +90,157 @@ 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: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 "URL ফাঁকা রাখা যাবে না।"
-#: 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:277 js/file-upload.js:293 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:465
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "মুলতুবি"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{new_name} টি বিদ্যমান"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "প্রতিস্থাপন"
-#: js/filelist.js:303
+#: js/filelist.js:416
msgid "suggest name"
msgstr "নাম সুপারিশ করুন"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "বাতিল"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr "{new_name} কে {old_name} নামে প্রতিস্থাপন করা হয়েছে"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "undo"
msgstr "ক্রিয়া প্রত্যাহার"
-#: js/filelist.js:453
-msgid "Uploading %n file"
-msgid_plural "Uploading %n files"
+#: 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:518
-msgid "files uploading"
+#: 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/files.js:52
+#: 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: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 "পরিবর্তিত"
-#: js/files.js:580
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/files.js:586
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-
#: lib/app.php:73
#, php-format
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 "আপলোড"
@@ -260,84 +276,68 @@ 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: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 "বর্তমান স্ক্যানিং"
-#: templates/part.list.php:74
-msgid "directory"
-msgstr ""
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr ""
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr ""
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr ""
-
#: templates/upgrade.php:2
msgid "Upgrading filesystem cache..."
msgstr ""
diff --git a/l10n/bn_BD/files_sharing.po b/l10n/bn_BD/files_sharing.po
index 13ff8fcdf45d62a8e4fb1e41ac6a43e22b429437..f44908ae2c1f765b567f245e736ef1e7e6d7bf65 100644
--- a/l10n/bn_BD/files_sharing.po
+++ b/l10n/bn_BD/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00: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"
@@ -63,7 +63,7 @@ msgstr "%s আপনার সাথে %s ফোল্ডারটি ভাগ
msgid "%s shared the file %s with you"
msgstr "%s আপনার সাথে %s ফাইলটি ভাগাভাগি করেছেন"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "ডাউনলোড"
@@ -75,6 +75,6 @@ msgstr "আপলোড"
msgid "Cancel upload"
msgstr "আপলোড বাতিল কর"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "এর জন্য কোন প্রাকবীক্ষণ সুলভ নয়"
diff --git a/l10n/bn_BD/lib.po b/l10n/bn_BD/lib.po
index 358cea2fd495803a2b408a07eac4ecceea186135..40a6b3b7470763ace4e87cd02ff3e1e55b2f83a7 100644
--- a/l10n/bn_BD/lib.po
+++ b/l10n/bn_BD/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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\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"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
@@ -48,11 +48,23 @@ msgstr "ব্যবহারকারী"
msgid "Admin"
msgstr "প্রশাসন"
-#: app.php:837
+#: 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 "ওয়েব সার্ভিস আপনার হাতের মুঠোয়"
@@ -105,37 +117,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: 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:150
+#: 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:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -264,51 +276,51 @@ msgstr ""
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "সেকেন্ড পূর্বে"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "আজ"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "গতকাল"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "গত মাস"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "গত বছর"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "বছর পূর্বে"
diff --git a/l10n/bn_BD/settings.po b/l10n/bn_BD/settings.po
index 1f3fa4e093e50a0e79830c21af1d799d16e5e403..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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+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,55 +84,88 @@ msgstr "%s গোষ্ঠী থেকে ব্যবহারকারীক
msgid "Couldn't update app."
msgstr ""
-#: js/apps.js:35
+#: 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:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr "নিষ্ক্রিয়"
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr "সক্রিয় "
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr ""
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "সমস্যা"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr "পরিবর্ধন"
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr ""
-#: js/personal.js:150
+#: 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:172
+#: js/personal.js:287
msgid "Saving..."
msgstr "সংরক্ষণ করা হচ্ছে.."
@@ -148,16 +181,16 @@ msgstr "ক্রিয়া প্রত্যাহার"
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: 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:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "গোষ্ঠী প্রশাসক"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "মুছে"
@@ -177,7 +210,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "__language_name__"
@@ -343,11 +376,11 @@ msgstr "বেশী"
msgid "Less"
msgstr "কম"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "ভার্সন"
-#: templates/admin.php:246 templates/personal.php:143
+#: 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 "
@@ -414,7 +447,7 @@ msgstr "প্রথমবার চালানোর যাদুকর পূ
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "আপনি ব্যবহার করছেন <strong>%s</strong>, সুলভ <strong>%s</strong> এর মধ্যে।"
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "কূটশব্দ"
@@ -438,7 +471,7 @@ msgstr "নতুন কূটশব্দ"
msgid "Change password"
msgstr "কূটশব্দ পরিবর্তন করুন"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr ""
@@ -454,38 +487,66 @@ msgstr "আপনার ই-মেইল ঠিকানা"
msgid "Fill in an email address to enable password recovery"
msgstr "কূটশব্দ পূনরূদ্ধার সক্রিয় করার জন্য ই-মেইল ঠিকানাটি পূরণ করুন"
-#: templates/personal.php:85 templates/personal.php:86
+#: 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:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "অনুবাদ করতে সহায়তা করুন"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: 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:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "সংকেতায়ন"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -511,30 +572,30 @@ msgstr ""
msgid "Default Storage"
msgstr "পূর্বনির্ধারিত সংরক্ষণাগার"
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr "অসীম"
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "অন্যান্য"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "ব্যবহারকারী"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr "সংরক্ষণাগার"
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr ""
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr ""
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr "পূর্বনির্ধারিত"
diff --git a/l10n/bn_BD/user_ldap.po b/l10n/bn_BD/user_ldap.po
index 3a816ab1ca742b4780500ec9ab5f300a1f8bd66e..8448b210a449bc46f99c7071220f2acb82f7ed7a 100644
--- a/l10n/bn_BD/user_ldap.po
+++ b/l10n/bn_BD/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\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"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/bs/core.po b/l10n/bs/core.po
index 4a81d1ca6f0a55ee0fde0ea945630a93cfb8b411..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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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"
@@ -22,6 +22,10 @@ msgstr ""
msgid "%s shared »%s« with you"
msgstr ""
+#: ajax/share.php:227
+msgid "group"
+msgstr ""
+
#: ajax/update.php:11
msgid "Turned on maintenance mode"
msgstr ""
@@ -86,6 +90,26 @@ msgstr ""
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 ""
@@ -162,63 +186,63 @@ msgstr ""
msgid "December"
msgstr ""
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr ""
-#: js/js.js:812
+#: js/js.js:866
msgid "seconds ago"
msgstr ""
-#: js/js.js:813
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:814
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:815
+#: js/js.js:869
msgid "today"
msgstr ""
-#: js/js.js:816
+#: js/js.js:870
msgid "yesterday"
msgstr ""
-#: js/js.js:817
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:818
+#: js/js.js:872
msgid "last month"
msgstr ""
-#: js/js.js:819
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:820
+#: js/js.js:874
msgid "months ago"
msgstr ""
-#: js/js.js:821
+#: js/js.js:875
msgid "last year"
msgstr ""
-#: js/js.js:822
+#: js/js.js:876
msgid "years ago"
msgstr ""
@@ -226,22 +250,67 @@ msgstr ""
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:195
+#: 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] ""
+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."
@@ -251,7 +320,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:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr ""
@@ -271,7 +340,7 @@ msgstr ""
msgid "Share"
msgstr "Podijeli"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr ""
@@ -327,67 +396,67 @@ msgstr ""
msgid "Expiration date"
msgstr ""
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr ""
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr ""
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr ""
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr ""
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr ""
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr ""
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr ""
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr ""
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr ""
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr ""
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr ""
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr ""
@@ -402,7 +471,7 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr ""
@@ -471,7 +540,7 @@ msgstr ""
msgid "Users"
msgstr ""
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr ""
@@ -600,14 +669,10 @@ msgstr ""
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr ""
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr ""
@@ -622,19 +687,19 @@ msgstr ""
msgid "Please change your password to secure your account again."
msgstr ""
-#: templates/login.php:34
+#: templates/login.php:32
msgid "Lost your password?"
msgstr ""
-#: templates/login.php:39
+#: templates/login.php:37
msgid "remember"
msgstr ""
-#: templates/login.php:41
+#: templates/login.php:39
msgid "Log in"
msgstr ""
-#: templates/login.php:47
+#: templates/login.php:45
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/bs/files.po b/l10n/bs/files.po
index 29f748a5dc2e5f6c292f06c405afcb252f45ba9f..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-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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,7 +74,15 @@ msgstr ""
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:123
+#: 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 ""
@@ -82,152 +90,160 @@ 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: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:277 js/file-upload.js:293 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:465
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr ""
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr ""
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr ""
-#: js/filelist.js:303
+#: js/filelist.js:416
msgid "suggest name"
msgstr ""
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr ""
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr ""
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "undo"
msgstr ""
-#: js/filelist.js:453
-msgid "Uploading %n file"
-msgid_plural "Uploading %n files"
+#: 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:518
-msgid "files uploading"
+#: 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:541
+msgid "{dirs} and {files}"
msgstr ""
-#: js/files.js:52
+#: js/filelist.js:731 js/filelist.js:769
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: 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 ""
-#: js/files.js:580
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: js/files.js:586
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
#: lib/app.php:73
#, php-format
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 ""
@@ -263,84 +279,68 @@ 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 ""
-#: templates/part.list.php:74
-msgid "directory"
-msgstr ""
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr ""
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr ""
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr ""
-
#: templates/upgrade.php:2
msgid "Upgrading filesystem cache..."
msgstr ""
diff --git a/l10n/bs/lib.po b/l10n/bs/lib.po
index 88246efdb6b80f6ff64a61bff053e76f0b4e773c..721908ee79ab78dcdb042c691eac63ebb87ae840 100644
--- a/l10n/bs/lib.po
+++ b/l10n/bs/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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\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"
"Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n"
"MIME-Version: 1.0\n"
@@ -48,11 +48,23 @@ msgstr ""
msgid "Admin"
msgstr ""
-#: app.php:837
+#: 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 ""
@@ -105,37 +117,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: 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:150
+#: 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:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -264,55 +276,55 @@ msgstr ""
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr ""
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr ""
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr ""
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr ""
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr ""
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr ""
diff --git a/l10n/bs/settings.po b/l10n/bs/settings.po
index 47c09790f2ea29211b54b9e032ac49919d3ac6f1..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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+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,55 +84,88 @@ msgstr ""
msgid "Couldn't update app."
msgstr ""
-#: js/apps.js:35
+#: 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:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr ""
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr ""
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr ""
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr ""
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr ""
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr ""
-#: js/personal.js:150
+#: 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:172
+#: js/personal.js:287
msgid "Saving..."
msgstr "Spašavam..."
@@ -148,16 +181,16 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: 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:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr ""
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr ""
@@ -177,7 +210,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr ""
@@ -343,11 +376,11 @@ msgstr ""
msgid "Less"
msgstr ""
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr ""
-#: templates/admin.php:246 templates/personal.php:143
+#: 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 "
@@ -414,7 +447,7 @@ msgstr ""
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:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr ""
@@ -438,7 +471,7 @@ msgstr ""
msgid "Change password"
msgstr ""
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr ""
@@ -454,38 +487,66 @@ msgstr ""
msgid "Fill in an email address to enable password recovery"
msgstr ""
-#: templates/personal.php:85 templates/personal.php:86
-msgid "Language"
+#: 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:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:106
+#: 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:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr ""
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -511,30 +572,30 @@ msgstr ""
msgid "Default Storage"
msgstr ""
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr ""
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr ""
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr ""
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr ""
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr ""
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr ""
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr ""
diff --git a/l10n/ca/core.po b/l10n/ca/core.po
index f63e5e77091654459ae90798a256f83c0cd5b537..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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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"
@@ -24,30 +24,34 @@ msgstr ""
msgid "%s shared »%s« with you"
msgstr "%s ha compartit »%s« amb tu"
+#: ajax/share.php:227
+msgid "group"
+msgstr "grup"
+
#: ajax/update.php:11
msgid "Turned on maintenance mode"
-msgstr ""
+msgstr "Activat el mode de manteniment"
#: ajax/update.php:14
msgid "Turned off maintenance mode"
-msgstr ""
+msgstr "Desactivat el mode de manteniment"
#: ajax/update.php:17
msgid "Updated database"
-msgstr ""
+msgstr "Actualitzada la base de dades"
#: ajax/update.php:20
msgid "Updating filecache, this may take really long..."
-msgstr ""
+msgstr "Actualitzant la memòria de cau del fitxers, això pot trigar molt..."
#: ajax/update.php:23
msgid "Updated filecache"
-msgstr ""
+msgstr "Actualitzada la memòria de cau dels fitxers"
#: ajax/update.php:26
#, php-format
msgid "... %d%% done ..."
-msgstr ""
+msgstr "... %d%% fet ..."
#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
msgid "Category type not provided."
@@ -88,6 +92,26 @@ msgstr "No hi ha categories per eliminar."
msgid "Error removing %s from favorites."
msgstr "Error en eliminar %s dels preferits."
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr "No s'han proporcionat imatges o fitxers"
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr "Tipus de fitxer desconegut"
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr "Imatge no vàlida"
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr "No hi ha imatge temporal de perfil disponible, torneu a intentar-ho"
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr "No heu proporcionat dades del retall"
+
#: js/config.php:32
msgid "Sunday"
msgstr "Diumenge"
@@ -164,59 +188,59 @@ msgstr "Novembre"
msgid "December"
msgstr "Desembre"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "Configuració"
-#: js/js.js:812
+#: js/js.js:866
msgid "seconds ago"
msgstr "segons enrere"
-#: js/js.js:813
+#: 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:814
+#: 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:815
+#: js/js.js:869
msgid "today"
msgstr "avui"
-#: js/js.js:816
+#: js/js.js:870
msgid "yesterday"
msgstr "ahir"
-#: js/js.js:817
+#: 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:818
+#: js/js.js:872
msgid "last month"
msgstr "el mes passat"
-#: js/js.js:819
+#: 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:820
+#: js/js.js:874
msgid "months ago"
msgstr "mesos enrere"
-#: js/js.js:821
+#: js/js.js:875
msgid "last year"
msgstr "l'any passat"
-#: js/js.js:822
+#: js/js.js:876
msgid "years ago"
msgstr "anys enrere"
@@ -224,22 +248,66 @@ msgstr "anys enrere"
msgid "Choose"
msgstr "Escull"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
-msgstr "Error en carregar la plantilla del seleccionador de fitxers"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
+msgstr "Error en carregar la plantilla de càrrega de fitxers: {error}"
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "Sí"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "No"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr "D'acord"
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+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
msgid "The object type is not specified."
@@ -249,7 +317,7 @@ msgstr "No s'ha especificat el tipus d'objecte."
#: 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:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "Error"
@@ -269,7 +337,7 @@ msgstr "Compartit"
msgid "Share"
msgstr "Comparteix"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr "Error en compartir"
@@ -325,67 +393,67 @@ msgstr "Estableix la data de venciment"
msgid "Expiration date"
msgstr "Data de venciment"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "Comparteix per correu electrònic"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "No s'ha trobat ningú"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "No es permet compartir de nou"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr "Compartit en {item} amb {user}"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "Deixa de compartir"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "pot editar"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "control d'accés"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "crea"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "actualitza"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "elimina"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "comparteix"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "Protegeix amb contrasenya"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr "Error en eliminar la data de venciment"
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr "Error en establir la data de venciment"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr "Enviant..."
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr "El correu electrónic s'ha enviat"
@@ -400,7 +468,7 @@ msgstr "L'actualització ha estat incorrecte. Comuniqueu aquest error a <a href=
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "L'actualització ha estat correcte. Ara us redirigim a ownCloud."
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr "restableix la contrasenya %s"
@@ -469,7 +537,7 @@ msgstr "Personal"
msgid "Users"
msgstr "Usuaris"
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "Aplicacions"
@@ -598,14 +666,10 @@ msgstr "Acaba la configuració"
msgid "%s is available. Get more information on how to update."
msgstr "%s està disponible. Obtingueu més informació de com actualitzar."
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "Surt"
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr "Més aplicacions"
-
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "L'ha rebutjat l'acceditació automàtica!"
@@ -620,19 +684,19 @@ msgstr "Se no heu canviat la contrasenya recentment el vostre compte pot estar c
msgid "Please change your password to secure your account again."
msgstr "Canvieu la contrasenya de nou per assegurar el vostre compte."
-#: templates/login.php:34
+#: templates/login.php:32
msgid "Lost your password?"
msgstr "Heu perdut la contrasenya?"
-#: templates/login.php:39
+#: templates/login.php:37
msgid "remember"
msgstr "recorda'm"
-#: templates/login.php:41
+#: templates/login.php:39
msgid "Log in"
msgstr "Inici de sessió"
-#: templates/login.php:47
+#: templates/login.php:45
msgid "Alternative Logins"
msgstr "Acreditacions alternatives"
diff --git a/l10n/ca/files.po b/l10n/ca/files.po
index 66e2e24f2ab0b0ad0e772d0d2850a499e9f9e551..82091cf75b36b3e4691d1e2f2139d2c0fcd68c6d 100644
--- a/l10n/ca/files.po
+++ b/l10n/ca/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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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 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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -76,157 +76,173 @@ msgstr "Ha fallat en escriure al disc"
msgid "Not enough storage available"
msgstr "No hi ha prou espai disponible"
-#: ajax/upload.php:123
+#: 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: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:167
+#: 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:241
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr "La URL no pot ser buida"
-#: 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 "Nom de carpeta no vàlid. L'ús de 'Shared' està reservat per Owncloud"
-#: js/file-upload.js:277 js/file-upload.js:293 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 "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:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "Pendent"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{new_name} ja existeix"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "substitueix"
-#: js/filelist.js:303
+#: js/filelist.js:416
msgid "suggest name"
msgstr "sugereix un nom"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "cancel·la"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr "s'ha substituït {old_name} per {new_name}"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "undo"
msgstr "desfés"
-#: js/filelist.js:453
+#: 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: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:541
+msgid "{dirs} and {files}"
+msgstr "{dirs} i {files}"
+
+#: 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:518
-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:562 templates/index.php:67
+#: 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:563 templates/index.php:78
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "Mida"
-#: js/files.js:564 templates/index.php:80
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr "Modificat"
-#: js/files.js:580
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] "%n carpeta"
-msgstr[1] "%n carpetes"
-
-#: js/files.js:586
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] "%n fitxer"
-msgstr[1] "%n fitxers"
-
#: lib/app.php:73
#, php-format
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"
@@ -262,84 +278,68 @@ 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:73
+#: templates/index.php:67
msgid "Download"
msgstr "Baixa"
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr "Deixa de compartir"
-#: templates/index.php:91 templates/index.php:92
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "Esborra"
-#: templates/index.php:105
+#: templates/index.php:100
msgid "Upload too large"
msgstr "La pujada és massa gran"
-#: 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 "Els fitxers que esteu intentant pujar excedeixen la mida màxima de pujada del servidor"
-#: templates/index.php:112
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr "S'estan escanejant els fitxers, espereu"
-#: templates/index.php:115
+#: templates/index.php:110
msgid "Current scanning"
msgstr "Actualment escanejant"
-#: templates/part.list.php:74
-msgid "directory"
-msgstr "directori"
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr "directoris"
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr "fitxer"
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr "fitxers"
-
#: templates/upgrade.php:2
msgid "Upgrading filesystem cache..."
msgstr "Actualitzant la memòria de cau del sistema de fitxers..."
diff --git a/l10n/ca/files_sharing.po b/l10n/ca/files_sharing.po
index 04c76283088d137af98ed628f99b0e70238ee74f..4e4d3419baef02bba17aa3748733380cb162667b 100644
--- a/l10n/ca/files_sharing.po
+++ b/l10n/ca/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:01+0000\n"
"Last-Translator: rogerc\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
@@ -64,7 +64,7 @@ msgstr "%s ha compartit la carpeta %s amb vós"
msgid "%s shared the file %s with you"
msgstr "%s ha compartit el fitxer %s amb vós"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "Baixa"
@@ -76,6 +76,6 @@ msgstr "Puja"
msgid "Cancel upload"
msgstr "Cancel·la la pujada"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "No hi ha vista prèvia disponible per a"
diff --git a/l10n/ca/lib.po b/l10n/ca/lib.po
index 6e9651339a2fa1f4b3908eceab6bb84fdc8881bd..c82e5efacb6ed72d492e653c99490ff73a044c21 100644
--- a/l10n/ca/lib.po
+++ b/l10n/ca/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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-26 13:40+0000\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"
@@ -49,11 +49,23 @@ msgstr "Usuaris"
msgid "Admin"
msgstr "Administració"
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "Ha fallat l'actualització \"%s\"."
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr "Les imatges de perfil personals encara no funcionen amb encriptació"
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr "Tipus de fitxer desconegut"
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr "Imatge no vàlida"
+
#: defaults.php:35
msgid "web services under your control"
msgstr "controleu els vostres serveis web"
@@ -106,37 +118,37 @@ msgstr "Els fitxers del tipus %s no són compatibles"
msgid "Failed to open archive when installing app"
msgstr "Ha fallat l'obertura del fitxer en instal·lar l'aplicació"
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr "L'aplicació no proporciona un fitxer info.xml"
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr "L'aplicació no es pot instal·lar perquè hi ha codi no autoritzat en l'aplicació"
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr "L'aplicació no es pot instal·lar perquè no és compatible amb aquesta versió d'ownCloud"
-#: installer.php:144
+#: 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 "L'aplicació no es pot instal·lar perquè conté l'etiqueta <shipped>vertader</shipped> que no es permet per aplicacions no enviades"
-#: installer.php:150
+#: 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 "L'aplicació no es pot instal·lar perquè la versió a info.xml/version no és la mateixa que la versió indicada des de la botiga d'aplicacions"
-#: installer.php:160
+#: installer.php:162
msgid "App directory already exists"
msgstr "La carpeta de l'aplicació ja existeix"
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr "No es pot crear la carpeta de l'aplicació. Arregleu els permisos. %s"
@@ -265,51 +277,51 @@ msgstr "El servidor web no està configurat correctament per permetre la sincron
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Comproveu les <a href='%s'>guies d'instal·lació</a>."
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "segons enrere"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "fa %n minut"
msgstr[1] "fa %n minuts"
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "fa %n hora"
msgstr[1] "fa %n hores"
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "avui"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "ahir"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] "fa %n dia"
msgstr[1] "fa %n dies"
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "el mes passat"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "fa %n mes"
msgstr[1] "fa %n mesos"
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "l'any passat"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "anys enrere"
diff --git a/l10n/ca/settings.po b/l10n/ca/settings.po
index 00860a8a12d11a7084842db099f09f3998ae0a3e..1053dcb2434dd984f9431d48d6e3070d331d320d 100644
--- a/l10n/ca/settings.po
+++ b/l10n/ca/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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-26 13:31+0000\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"
@@ -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,55 +86,88 @@ msgstr "No es pot eliminar l'usuari del grup %s"
msgid "Couldn't update app."
msgstr "No s'ha pogut actualitzar l'aplicació."
-#: js/apps.js:35
+#: 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}"
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr "Desactiva"
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr "Habilita"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr "Espereu..."
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr "Error en desactivar l'aplicació"
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr "Error en activar l'aplicació"
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr "Actualitzant..."
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr "Error en actualitzar l'aplicació"
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "Error"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr "Actualitza"
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr "Actualitzada"
-#: js/personal.js:150
+#: js/personal.js:220
+msgid "Select a profile picture"
+msgstr "Seleccioneu una imatge de perfil"
+
+#: 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:172
+#: js/personal.js:287
msgid "Saving..."
msgstr "Desant..."
@@ -150,16 +183,16 @@ msgstr "desfés"
msgid "Unable to remove user"
msgstr "No s'ha pogut eliminar l'usuari"
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "Grups"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "Grup Admin"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "Esborra"
@@ -179,7 +212,7 @@ msgstr "Error en crear l'usuari"
msgid "A valid password must be provided"
msgstr "Heu de facilitar una contrasenya vàlida"
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "Català"
@@ -345,11 +378,11 @@ msgstr "Més"
msgid "Less"
msgstr "Menys"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "Versió"
-#: templates/admin.php:246 templates/personal.php:143
+#: 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 "
@@ -416,7 +449,7 @@ msgstr "Torna a mostrar l'assistent de primera execució"
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Heu utilitzat <strong>%s</strong> d'un total disponible de <strong>%s</strong>"
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "Contrasenya"
@@ -440,7 +473,7 @@ msgstr "Contrasenya nova"
msgid "Change password"
msgstr "Canvia la contrasenya"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr "Nom a mostrar"
@@ -456,38 +489,66 @@ msgstr "Correu electrònic"
msgid "Fill in an email address to enable password recovery"
msgstr "Ompliu el correu electrònic per activar la recuperació de contrasenya"
-#: templates/personal.php:85 templates/personal.php:86
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr "Foto de perfil"
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr "Puja'n una de nova"
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr "Selecciona'n una de nova dels fitxers"
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr "Elimina imatge"
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr "Pot ser png o jpg. Idealment quadrada, però podreu retallar-la."
+
+#: templates/personal.php:97
+msgid "Abort"
+msgstr "Cancel·la"
+
+#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr "Selecciona com a imatge de perfil"
+
+#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
msgstr "Idioma"
-#: templates/personal.php:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "Ajudeu-nos amb la traducció"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: 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 "Useu aquesta adreça per <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">accedir als fitxers via WebDAV</a>"
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "Xifrat"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr "L'aplicació d'encriptació ja no està activada, desencripteu tots els vostres fitxers."
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr "Contrasenya d'accés"
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr "Desencripta tots els fitxers"
@@ -513,30 +574,30 @@ msgstr "Escriviu la contrasenya de recuperació per a poder recuperar els fitxer
msgid "Default Storage"
msgstr "Emmagatzemament per defecte"
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr "Il·limitat"
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "Un altre"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "Nom d'usuari"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr "Emmagatzemament"
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr "canvia el nom a mostrar"
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr "estableix nova contrasenya"
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr "Per defecte"
diff --git a/l10n/ca/user_ldap.po b/l10n/ca/user_ldap.po
index 102b8a3d7bbec67594c477b62d18f431c658e9db..902aea9b33ab007d3b9ff812738a376d490c80ea 100644
--- a/l10n/ca/user_ldap.po
+++ b/l10n/ca/user_ldap.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-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-26 13:31+0000\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-05 11:51+0000\n"
"Last-Translator: rogerc\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/cs_CZ/core.po b/l10n/cs_CZ/core.po
index 18e39dc80baf07ed632d52011c6eda72411dff0a..914c6bcc2079c4c5742d66ab20e77dc7b7f74e96 100644
--- a/l10n/cs_CZ/core.po
+++ b/l10n/cs_CZ/core.po
@@ -4,6 +4,7 @@
#
# Translators:
# janinko <janinko.g@gmail.com>, 2013
+# dibalaj <dibalaj@dibalaj.cz>, 2013
# Honza K. <honza889@gmail.com>, 2013
# Martin <fireball@atlas.cz>, 2013
# pstast <petr@stastny.eu>, 2013
@@ -12,9 +13,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-30 10:16-0400\n"
+"PO-Revision-Date: 2013-09-29 16:57+0000\n"
+"Last-Translator: dibalaj <dibalaj@dibalaj.cz>\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"
@@ -27,30 +28,34 @@ msgstr ""
msgid "%s shared »%s« with you"
msgstr "%s s vámi sdílí »%s«"
+#: ajax/share.php:227
+msgid "group"
+msgstr "skupina"
+
#: ajax/update.php:11
msgid "Turned on maintenance mode"
-msgstr ""
+msgstr "Zapnut režim údržby"
#: ajax/update.php:14
msgid "Turned off maintenance mode"
-msgstr ""
+msgstr "Vypnut režim údržby"
#: ajax/update.php:17
msgid "Updated database"
-msgstr ""
+msgstr "Zaktualizována databáze"
#: ajax/update.php:20
msgid "Updating filecache, this may take really long..."
-msgstr ""
+msgstr "Aktualizuji souborovou mezipaměť, toto může trvat opravdu dlouho..."
#: ajax/update.php:23
msgid "Updated filecache"
-msgstr ""
+msgstr "Aktualizována souborová mezipaměť"
#: ajax/update.php:26
#, php-format
msgid "... %d%% done ..."
-msgstr ""
+msgstr "... %d%% dokončeno ..."
#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
msgid "Category type not provided."
@@ -91,6 +96,26 @@ msgstr "Žádné kategorie nebyly vybrány ke smazání."
msgid "Error removing %s from favorites."
msgstr "Chyba při odebírání %s z oblíbených."
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr "Soubor nebo obrázek nebyl zadán"
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr "Neznámý typ souboru"
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr "Chybný obrázek"
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr "Dočasný profilový obrázek není k dispozici, zkuste to znovu"
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr "Nebyla poskytnuta data pro oříznutí obrázku"
+
#: js/config.php:32
msgid "Sunday"
msgstr "Neděle"
@@ -167,63 +192,63 @@ msgstr "Listopad"
msgid "December"
msgstr "Prosinec"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "Nastavení"
-#: js/js.js:812
+#: js/js.js:866
msgid "seconds ago"
msgstr "před pár vteřinami"
-#: js/js.js:813
+#: 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:814
+#: 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:815
+#: js/js.js:869
msgid "today"
msgstr "dnes"
-#: js/js.js:816
+#: js/js.js:870
msgid "yesterday"
msgstr "včera"
-#: js/js.js:817
+#: 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:818
+#: js/js.js:872
msgid "last month"
msgstr "minulý měsíc"
-#: js/js.js:819
+#: 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:820
+#: js/js.js:874
msgid "months ago"
msgstr "před měsíci"
-#: js/js.js:821
+#: js/js.js:875
msgid "last year"
msgstr "minulý rok"
-#: js/js.js:822
+#: js/js.js:876
msgid "years ago"
msgstr "před lety"
@@ -231,22 +256,67 @@ msgstr "před lety"
msgid "Choose"
msgstr "Vybrat"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
-msgstr "Chyba při načítání šablony výběru souborů"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
+msgstr "Chyba při nahrávání šablony výběru souborů: {error}"
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "Ano"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "Ne"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
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 "Jeden konflikt souboru"
+
+#: js/oc-dialogs.js:367
+msgid "Which files do you want to keep?"
+msgstr "Které soubory chcete ponechat?"
+
+#: 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 "Pokračovat"
+
+#: 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."
@@ -256,7 +326,7 @@ msgstr "Není určen typ objektu."
#: 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:643 js/share.js:655
+#: js/share.js:656 js/share.js:668
msgid "Error"
msgstr "Chyba"
@@ -276,7 +346,7 @@ msgstr "Sdílené"
msgid "Share"
msgstr "Sdílet"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:696
msgid "Error while sharing"
msgstr "Chyba při sdílení"
@@ -332,67 +402,67 @@ msgstr "Nastavit datum vypršení platnosti"
msgid "Expiration date"
msgstr "Datum vypršení platnosti"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "Sdílet e-mailem:"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "Žádní lidé nenalezeni"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "Sdílení již sdílené položky není povoleno"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr "Sdíleno v {item} s {user}"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "Zrušit sdílení"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "lze upravovat"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "řízení přístupu"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "vytvořit"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "aktualizovat"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "smazat"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "sdílet"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:643
msgid "Password protected"
msgstr "Chráněno heslem"
-#: js/share.js:643
+#: js/share.js:656
msgid "Error unsetting expiration date"
msgstr "Chyba při odstraňování data vypršení platnosti"
-#: js/share.js:655
+#: js/share.js:668
msgid "Error setting expiration date"
msgstr "Chyba při nastavení data vypršení platnosti"
-#: js/share.js:670
+#: js/share.js:683
msgid "Sending ..."
msgstr "Odesílám ..."
-#: js/share.js:681
+#: js/share.js:694
msgid "Email sent"
msgstr "E-mail odeslán"
@@ -407,7 +477,7 @@ msgstr "Aktualizace neproběhla úspěšně. Nahlaste prosím problém do <a hre
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Aktualizace byla úspěšná. Přesměrovávám na ownCloud."
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr "reset hesla %s"
@@ -476,7 +546,7 @@ msgstr "Osobní"
msgid "Users"
msgstr "Uživatelé"
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "Aplikace"
@@ -605,14 +675,10 @@ msgstr "Dokončit nastavení"
msgid "%s is available. Get more information on how to update."
msgstr "%s je dostupná. Získejte více informací k postupu aktualizace."
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "Odhlásit se"
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr "Více aplikací"
-
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "Automatické přihlášení odmítnuto!"
@@ -627,19 +693,19 @@ msgstr "Pokud jste v nedávné době neměnili své heslo, Váš účet může b
msgid "Please change your password to secure your account again."
msgstr "Změňte, prosím, své heslo pro opětovné zabezpečení Vašeho účtu."
-#: templates/login.php:34
+#: templates/login.php:32
msgid "Lost your password?"
msgstr "Ztratili jste své heslo?"
-#: templates/login.php:39
+#: templates/login.php:37
msgid "remember"
msgstr "zapamatovat"
-#: templates/login.php:41
+#: templates/login.php:39
msgid "Log in"
msgstr "Přihlásit"
-#: templates/login.php:47
+#: templates/login.php:45
msgid "Alternative Logins"
msgstr "Alternativní přihlášení"
diff --git a/l10n/cs_CZ/files.po b/l10n/cs_CZ/files.po
index 9659af9c1d9d1d4aa580402c79db289410414b31..5cff84e574f2a9e5345a690ac3bd63f6b67e503c 100644
--- a/l10n/cs_CZ/files.po
+++ b/l10n/cs_CZ/files.po
@@ -3,6 +3,7 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# dibalaj <dibalaj@dibalaj.cz>, 2013
# Honza K. <honza889@gmail.com>, 2013
# cvanca <mrs.jenkins.oh.yeah@gmail.com>, 2013
# pstast <petr@stastny.eu>, 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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-30 10:14-0400\n"
+"PO-Revision-Date: 2013-09-29 16:54+0000\n"
+"Last-Translator: dibalaj <dibalaj@dibalaj.cz>\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,160 +79,176 @@ msgstr "Zápis na disk selhal"
msgid "Not enough storage available"
msgstr "Nedostatek dostupného úložného prostoru"
-#: ajax/upload.php:123
+#: 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 "Neplatný adresář"
-#: appinfo/app.php:12
+#: appinfo/app.php:11
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: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 "Probíhá odesílání souboru. Opuštění stránky způsobí zrušení nahrávání."
-#: js/file-upload.js:241
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr "URL nemůže být prázdná."
-#: 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 "Název složky nelze použít. Použití názvu 'Shared' je ownCloudem rezervováno"
-#: js/file-upload.js:277 js/file-upload.js:293 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 "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:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "Nevyřízené"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{new_name} již existuje"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "nahradit"
-#: js/filelist.js:303
+#: js/filelist.js:416
msgid "suggest name"
msgstr "navrhnout název"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "zrušit"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr "nahrazeno {new_name} s {old_name}"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "undo"
msgstr "vrátit zpět"
-#: js/filelist.js:453
+#: 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: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:541
+msgid "{dirs} and {files}"
+msgstr "{dirs} a {files}"
+
+#: 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:518
-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 zrušeno, soubory jsou však stále zašifrované. Běžte prosím do osobního nastavení, kde si složky odšifrujete."
+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:562 templates/index.php:67
+#: js/files.js:507 js/files.js:545
+msgid "Error moving file"
+msgstr "Chyba při přesunu souboru"
+
+#: js/files.js:558 templates/index.php:61
msgid "Name"
msgstr "Název"
-#: js/files.js:563 templates/index.php:78
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "Velikost"
-#: js/files.js:564 templates/index.php:80
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr "Upraveno"
-#: js/files.js:580
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] "%n složka"
-msgstr[1] "%n složky"
-msgstr[2] "%n složek"
-
-#: js/files.js:586
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] "%n soubor"
-msgstr[1] "%n soubory"
-msgstr[2] "%n souborů"
-
#: lib/app.php:73
#, php-format
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"
@@ -267,84 +284,68 @@ 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:73
+#: templates/index.php:67
msgid "Download"
msgstr "Stáhnout"
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr "Zrušit sdílení"
-#: templates/index.php:91 templates/index.php:92
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "Smazat"
-#: templates/index.php:105
+#: templates/index.php:100
msgid "Upload too large"
msgstr "Odesílaný soubor je příliš velký"
-#: 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 "Soubory, které se snažíte odeslat, překračují limit velikosti odesílání na tomto serveru."
-#: templates/index.php:112
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr "Soubory se prohledávají, prosím čekejte."
-#: templates/index.php:115
+#: templates/index.php:110
msgid "Current scanning"
msgstr "Aktuální prohledávání"
-#: templates/part.list.php:74
-msgid "directory"
-msgstr "adresář"
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr "adresáře"
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr "soubor"
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr "soubory"
-
#: templates/upgrade.php:2
msgid "Upgrading filesystem cache..."
msgstr "Aktualizuji mezipaměť souborového systému..."
diff --git a/l10n/cs_CZ/files_sharing.po b/l10n/cs_CZ/files_sharing.po
index 58fe5480946a1c5be54f8106f19afc527d5cd806..5b180f5c5591a25230b085eb39fcfe33273c5209 100644
--- a/l10n/cs_CZ/files_sharing.po
+++ b/l10n/cs_CZ/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:01+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"
@@ -64,7 +64,7 @@ msgstr "%s s Vámi sdílí složku %s"
msgid "%s shared the file %s with you"
msgstr "%s s Vámi sdílí soubor %s"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "Stáhnout"
@@ -76,6 +76,6 @@ msgstr "Odeslat"
msgid "Cancel upload"
msgstr "Zrušit odesílání"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "Náhled není dostupný pro"
diff --git a/l10n/cs_CZ/lib.po b/l10n/cs_CZ/lib.po
index d64ce09fe359402fe0d4d2e57f67fa99726f5891..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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+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"
@@ -25,11 +25,11 @@ msgstr ""
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
-msgstr ""
+msgstr "Aplikace \"%s\" nemůže být nainstalována, protože není kompatibilní s touto verzí ownCloud."
#: app.php:250
msgid "No app name specified"
-msgstr ""
+msgstr "Nebyl zadan název aplikace"
#: app.php:361
msgid "Help"
@@ -51,11 +51,23 @@ msgstr "Uživatelé"
msgid "Admin"
msgstr "Administrace"
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "Selhala aktualizace verze \"%s\"."
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr "Vlastní profilové obrázky zatím nefungují v kombinaci se šifrováním"
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr "Neznámý typ souboru"
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr "Chybný obrázek"
+
#: defaults.php:35
msgid "web services under your control"
msgstr "webové služby pod Vaší kontrolou"
@@ -89,59 +101,59 @@ msgstr "Stáhněte soubory po menších částech, samostatně, nebo se obraťte
#: installer.php:63
msgid "No source specified when installing app"
-msgstr ""
+msgstr "Nebyl zadán zdroj při instalaci aplikace"
#: installer.php:70
msgid "No href specified when installing app from http"
-msgstr ""
+msgstr "Nebyl zadán odkaz pro instalaci aplikace z HTTP"
#: installer.php:75
msgid "No path specified when installing app from local file"
-msgstr ""
+msgstr "Nebyla zadána cesta pro instalaci aplikace z místního souboru"
#: installer.php:89
#, php-format
msgid "Archives of type %s are not supported"
-msgstr ""
+msgstr "Archivy typu %s nejsou podporovány"
#: installer.php:103
msgid "Failed to open archive when installing app"
-msgstr ""
+msgstr "Chyba při otevírání archivu během instalace aplikace"
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
-msgstr ""
+msgstr "Aplikace neposkytuje soubor info.xml"
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
-msgstr ""
+msgstr "Aplikace nemůže být nainstalována, protože obsahuje nepovolený kód"
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
-msgstr ""
+msgstr "Aplikace nemůže být nainstalována, protože není kompatibilní s touto verzí ownCloud"
-#: installer.php:144
+#: 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 "Aplikace nemůže být nainstalována, protože obsahuje značku\n<shipped>\n\ntrue\n</shipped>\n\ncož není povoleno pro nedodávané aplikace"
-#: installer.php:150
+#: 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 "Aplikace nemůže být nainstalována, protože verze uvedená v info.xml/version nesouhlasí s verzí oznámenou z úložiště aplikací."
-#: installer.php:160
+#: installer.php:162
msgid "App directory already exists"
-msgstr ""
+msgstr "Adresář aplikace již existuje"
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
-msgstr ""
+msgstr "Nelze vytvořit složku aplikace. Opravte práva souborů. %s"
#: json.php:28
msgid "Application is not enabled"
@@ -267,55 +279,55 @@ msgstr "Váš webový server není správně nastaven pro umožnění synchroniz
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Zkonzultujte, prosím, <a href='%s'>průvodce instalací</a>."
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "před pár sekundami"
-#: template/functions.php:81
+#: template/functions.php:97
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"
-#: template/functions.php:82
+#: template/functions.php:98
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"
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "dnes"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "včera"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] "před %n dnem"
msgstr[1] "před %n dny"
msgstr[2] "před %n dny"
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "minulý měsíc"
-#: template/functions.php:87
+#: template/functions.php:103
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"
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "minulý rok"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "před lety"
diff --git a/l10n/cs_CZ/settings.po b/l10n/cs_CZ/settings.po
index 9cb3b6446f8b1f03ef7d934e7633b942526ab62d..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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+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,55 +88,88 @@ msgstr "Nelze odebrat uživatele ze skupiny %s"
msgid "Couldn't update app."
msgstr "Nelze aktualizovat aplikaci."
-#: js/apps.js:35
+#: 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}"
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr "Zakázat"
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr "Povolit"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr "Čekejte prosím..."
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
-msgstr ""
+msgstr "Chyba při zakazování aplikace"
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
-msgstr ""
+msgstr "Chyba při povolování aplikace"
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr "Aktualizuji..."
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr "Chyba při aktualizaci aplikace"
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "Chyba"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr "Aktualizovat"
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr "Aktualizováno"
-#: js/personal.js:150
+#: js/personal.js:220
+msgid "Select a profile picture"
+msgstr "Vyberte profilový obrázek"
+
+#: js/personal.js:265
msgid "Decrypting files... Please wait, this can take some time."
-msgstr "Probíhá odšifrování souborů... Prosíme počkejte, tato operace může trvat několik minut."
+msgstr "Probíhá dešifrování souborů... Čekejte prosím, tato operace může trvat nějakou dobu."
-#: js/personal.js:172
+#: js/personal.js:287
msgid "Saving..."
msgstr "Ukládám..."
@@ -152,16 +185,16 @@ msgstr "vrátit zpět"
msgid "Unable to remove user"
msgstr "Nelze odebrat uživatele"
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "Skupiny"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "Správa skupiny"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "Smazat"
@@ -181,7 +214,7 @@ msgstr "Chyba při vytváření užiatele"
msgid "A valid password must be provided"
msgstr "Musíte zadat platné heslo"
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "Česky"
@@ -347,11 +380,11 @@ msgstr "Více"
msgid "Less"
msgstr "Méně"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "Verze"
-#: templates/admin.php:246 templates/personal.php:143
+#: 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 "
@@ -418,7 +451,7 @@ msgstr "Znovu zobrazit průvodce prvním spuštěním"
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Používáte <strong>%s</strong> z <strong>%s</strong> dostupných"
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "Heslo"
@@ -442,7 +475,7 @@ msgstr "Nové heslo"
msgid "Change password"
msgstr "Změnit heslo"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr "Zobrazované jméno"
@@ -458,38 +491,66 @@ msgstr "Vaše e-mailová adresa"
msgid "Fill in an email address to enable password recovery"
msgstr "Pro povolení obnovy hesla vyplňte e-mailovou adresu"
-#: templates/personal.php:85 templates/personal.php:86
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr "Profilová fotka"
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr "Nahrát nový"
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr "Vyberte nový ze souborů"
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr "Odebrat obrázek"
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr "png nebo jpg, nejlépe čtvercový, ale budete mít možnost jej oříznout."
+
+#: templates/personal.php:97
+msgid "Abort"
+msgstr "Přerušit"
+
+#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr "Vybrat jako profilový obrázek"
+
+#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
msgstr "Jazyk"
-#: templates/personal.php:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "Pomoci s překladem"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: 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 "Použijte <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">tuto adresu pro přístup k vašim souborům přes WebDAV</a>"
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "Šifrování"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
-msgstr "Šifrovací aplikace již není spuštěna, odšifrujte všechny své soubory"
+msgstr "Šifrovací aplikace již není zapnuta, odšifrujte všechny své soubory"
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
-msgstr "Heslo"
+msgstr "Přihlašovací heslo"
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr "Odšifrovat všechny soubory"
@@ -515,30 +576,30 @@ msgstr "Zadejte heslo obnovy pro obnovení souborů uživatele při změně hesl
msgid "Default Storage"
msgstr "Výchozí úložiště"
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr "Neomezeně"
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "Jiný"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "Uživatelské jméno"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr "Úložiště"
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr "změnit zobrazované jméno"
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr "nastavit nové heslo"
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr "Výchozí"
diff --git a/l10n/cs_CZ/user_ldap.po b/l10n/cs_CZ/user_ldap.po
index 6245bd4e833e4f1264e259aa519c87b7f61861b3..69340de29b3fe05e745dec5e5ae35386c11ef57b 100644
--- a/l10n/cs_CZ/user_ldap.po
+++ b/l10n/cs_CZ/user_ldap.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-08-21 08:11-0400\n"
-"PO-Revision-Date: 2013-08-20 17:00+0000\n"
-"Last-Translator: cvanca <mrs.jenkins.oh.yeah@gmail.com>\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-05 11:51+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"
@@ -159,7 +159,7 @@ msgstr "Filtr přihlášení uživatelů"
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action. Example: \"uid=%%uid\""
-msgstr "Určuje použitý filtr, při pokusu o přihlášení. %%uid nahrazuje uživatelské jméno v činnosti přihlášení. Příklad \"uid=%%uid\""
+msgstr "Určuje použitý filtr při pokusu o přihlášení. %%uid nahrazuje uživatelské jméno v činnosti přihlášení. Příklad: \"uid=%%uid\""
#: templates/settings.php:55
msgid "User List Filter"
@@ -169,7 +169,7 @@ msgstr "Filtr seznamu uživatelů"
msgid ""
"Defines the filter to apply, when retrieving users (no placeholders). "
"Example: \"objectClass=person\""
-msgstr "Určuje použitý filtr pro získávaní uživatelů (bez zástupných znaků). Příklad: \"objectClass=person\""
+msgstr "Určuje použitý filtr při získávání uživatelů (bez zástupných znaků). Příklad: \"objectClass=person\""
#: templates/settings.php:59
msgid "Group Filter"
@@ -179,7 +179,7 @@ msgstr "Filtr skupin"
msgid ""
"Defines the filter to apply, when retrieving groups (no placeholders). "
"Example: \"objectClass=posixGroup\""
-msgstr "Určuje použitý filtr, pro získávaní skupin (bez zástupných znaků). Příklad: \"objectClass=posixGroup\""
+msgstr "Určuje použitý filtr při získávání skupin (bez zástupných znaků). Příklad: \"objectClass=posixGroup\""
#: templates/settings.php:66
msgid "Connection Settings"
diff --git a/l10n/cy_GB/core.po b/l10n/cy_GB/core.po
index 97781ef6a337f808d605052a2b2a2d0de5d6e629..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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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"
@@ -23,6 +23,10 @@ msgstr ""
msgid "%s shared »%s« with you"
msgstr ""
+#: ajax/share.php:227
+msgid "group"
+msgstr "grŵp"
+
#: ajax/update.php:11
msgid "Turned on maintenance mode"
msgstr ""
@@ -87,6 +91,26 @@ msgstr "Ni ddewiswyd categorïau i'w dileu."
msgid "Error removing %s from favorites."
msgstr "Gwall wrth dynnu %s o ffefrynnau."
+#: 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 "Sul"
@@ -163,15 +187,15 @@ msgstr "Tachwedd"
msgid "December"
msgstr "Rhagfyr"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "Gosodiadau"
-#: js/js.js:812
+#: js/js.js:866
msgid "seconds ago"
msgstr "eiliad yn ôl"
-#: js/js.js:813
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
@@ -179,7 +203,7 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: js/js.js:814
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
@@ -187,15 +211,15 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: js/js.js:815
+#: js/js.js:869
msgid "today"
msgstr "heddiw"
-#: js/js.js:816
+#: js/js.js:870
msgid "yesterday"
msgstr "ddoe"
-#: js/js.js:817
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
@@ -203,11 +227,11 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: js/js.js:818
+#: js/js.js:872
msgid "last month"
msgstr "mis diwethaf"
-#: js/js.js:819
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
@@ -215,15 +239,15 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: js/js.js:820
+#: js/js.js:874
msgid "months ago"
msgstr "misoedd yn ôl"
-#: js/js.js:821
+#: js/js.js:875
msgid "last year"
msgstr "y llynedd"
-#: js/js.js:822
+#: js/js.js:876
msgid "years ago"
msgstr "blwyddyn yn ôl"
@@ -231,22 +255,68 @@ msgstr "blwyddyn yn ôl"
msgid "Choose"
msgstr "Dewisiwch"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "Ie"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "Na"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr "Iawn"
+#: 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] ""
+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."
@@ -256,7 +326,7 @@ msgstr "Nid yw'r math o wrthrych wedi cael ei nodi."
#: 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:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "Gwall"
@@ -276,7 +346,7 @@ msgstr "Rhannwyd"
msgid "Share"
msgstr "Rhannu"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr "Gwall wrth rannu"
@@ -332,67 +402,67 @@ msgstr "Gosod dyddiad dod i ben"
msgid "Expiration date"
msgstr "Dyddiad dod i ben"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "Rhannu drwy e-bost:"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "Heb ganfod pobl"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "Does dim hawl ail-rannu"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr "Rhannwyd yn {item} â {user}"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "Dad-rannu"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "yn gallu golygu"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "rheolaeth mynediad"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "creu"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "diweddaru"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "dileu"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "rhannu"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "Diogelwyd â chyfrinair"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr "Gwall wrth ddad-osod dyddiad dod i ben"
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr "Gwall wrth osod dyddiad dod i ben"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr "Yn anfon ..."
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr "Anfonwyd yr e-bost"
@@ -407,7 +477,7 @@ msgstr "Methodd y diweddariad. Adroddwch y mater hwn i <a href=\"https://github.
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Roedd y diweddariad yn llwyddiannus. Cewch eich ailgyfeirio i ownCloud nawr."
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr ""
@@ -476,7 +546,7 @@ msgstr "Personol"
msgid "Users"
msgstr "Defnyddwyr"
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "Pecynnau"
@@ -605,14 +675,10 @@ msgstr "Gorffen sefydlu"
msgid "%s is available. Get more information on how to update."
msgstr "%s ar gael. Mwy o wybodaeth am sut i ddiweddaru."
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "Allgofnodi"
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "Gwrthodwyd mewngofnodi awtomatig!"
@@ -627,19 +693,19 @@ msgstr "Os na wnaethoch chi newid eich cyfrinair yn ddiweddar, gall eich cyfrif
msgid "Please change your password to secure your account again."
msgstr "Newidiwch eich cyfrinair i ddiogleu eich cyfrif eto."
-#: templates/login.php:34
+#: templates/login.php:32
msgid "Lost your password?"
msgstr "Wedi colli'ch cyfrinair?"
-#: templates/login.php:39
+#: templates/login.php:37
msgid "remember"
msgstr "cofio"
-#: templates/login.php:41
+#: templates/login.php:39
msgid "Log in"
msgstr "Mewngofnodi"
-#: templates/login.php:47
+#: templates/login.php:45
msgid "Alternative Logins"
msgstr "Mewngofnodiadau Amgen"
diff --git a/l10n/cy_GB/files.po b/l10n/cy_GB/files.po
index 3d8d0f81fb78ba2f31771c619034f2c19960f990..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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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,7 +74,15 @@ msgstr "Methwyd ysgrifennu i'r ddisg"
msgid "Not enough storage available"
msgstr "Dim digon o le storio ar gael"
-#: ajax/upload.php:123
+#: 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 "Cyfeiriadur annilys."
@@ -82,76 +90,100 @@ 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: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 "Mae ffeiliau'n cael eu llwytho i fyny. Bydd gadael y dudalen hon nawr yn diddymu'r broses."
-#: js/file-upload.js:241
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr "Does dim hawl cael URL gwag."
-#: 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:277 js/file-upload.js:293 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 "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:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "I ddod"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{new_name} yn bodoli'n barod"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "amnewid"
-#: js/filelist.js:303
+#: js/filelist.js:416
msgid "suggest name"
msgstr "awgrymu enw"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "diddymu"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr "newidiwyd {new_name} yn lle {old_name}"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "undo"
msgstr "dadwneud"
-#: js/filelist.js:453
+#: 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[3] ""
+
+#: 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[3] ""
+
+#: 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] ""
@@ -159,78 +191,62 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: js/filelist.js:518
-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: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 "Enw"
-#: js/files.js:563 templates/index.php:78
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "Maint"
-#: js/files.js:564 templates/index.php:80
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr "Addaswyd"
-#: js/files.js:580
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-
-#: js/files.js:586
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-
#: lib/app.php:73
#, php-format
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"
@@ -266,84 +282,68 @@ 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:73
+#: templates/index.php:67
msgid "Download"
msgstr "Llwytho i lawr"
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr "Dad-rannu"
-#: templates/index.php:91 templates/index.php:92
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "Dileu"
-#: templates/index.php:105
+#: templates/index.php:100
msgid "Upload too large"
msgstr "Maint llwytho i fyny'n rhy fawr"
-#: 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 "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:112
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr "Arhoswch, mae ffeiliau'n cael eu sganio."
-#: templates/index.php:115
+#: templates/index.php:110
msgid "Current scanning"
msgstr "Sganio cyfredol"
-#: templates/part.list.php:74
-msgid "directory"
-msgstr ""
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr ""
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr ""
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr ""
-
#: templates/upgrade.php:2
msgid "Upgrading filesystem cache..."
msgstr "Uwchraddio storfa system ffeiliau..."
diff --git a/l10n/cy_GB/files_sharing.po b/l10n/cy_GB/files_sharing.po
index 40a26ec13c0a60a8286a32f2c624b91a37c753a3..11970a0b13941268f31f7e758376aed9b9fd6b5d 100644
--- a/l10n/cy_GB/files_sharing.po
+++ b/l10n/cy_GB/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00: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"
@@ -63,7 +63,7 @@ msgstr "Rhannodd %s blygell %s â chi"
msgid "%s shared the file %s with you"
msgstr "Rhannodd %s ffeil %s â chi"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "Llwytho i lawr"
@@ -75,6 +75,6 @@ msgstr "Llwytho i fyny"
msgid "Cancel upload"
msgstr "Diddymu llwytho i fyny"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "Does dim rhagolwg ar gael ar gyfer"
diff --git a/l10n/cy_GB/lib.po b/l10n/cy_GB/lib.po
index 0ccf38477371f8957d9beb714086fc443b8a4989..63e302b3190324dbdb73bf08ee076310687af45c 100644
--- a/l10n/cy_GB/lib.po
+++ b/l10n/cy_GB/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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\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"
"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
"MIME-Version: 1.0\n"
@@ -48,11 +48,23 @@ msgstr "Defnyddwyr"
msgid "Admin"
msgstr "Gweinyddu"
-#: app.php:837
+#: 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 "gwasanaethau gwe a reolir gennych"
@@ -105,37 +117,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: 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:150
+#: 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:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -264,11 +276,11 @@ msgstr "Nid yw eich gweinydd wedi'i gyflunio eto i ganiatáu cydweddu ffeiliau o
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Gwiriwch y <a href='%s'>canllawiau gosod</a> eto."
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "eiliad yn ôl"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
@@ -276,7 +288,7 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
@@ -284,15 +296,15 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "heddiw"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "ddoe"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
@@ -300,11 +312,11 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "mis diwethaf"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
@@ -312,11 +324,11 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "y llynedd"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "blwyddyn yn ôl"
diff --git a/l10n/cy_GB/settings.po b/l10n/cy_GB/settings.po
index e74e9a473f8c38fad7a2abb279cceaefa67160a8..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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+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,55 +84,88 @@ msgstr ""
msgid "Couldn't update app."
msgstr ""
-#: js/apps.js:35
+#: 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:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr ""
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr ""
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr ""
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "Gwall"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr ""
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr ""
-#: js/personal.js:150
+#: 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:172
+#: js/personal.js:287
msgid "Saving..."
msgstr "Yn cadw..."
@@ -148,16 +181,16 @@ msgstr "dadwneud"
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "Grwpiau"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr ""
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "Dileu"
@@ -177,7 +210,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr ""
@@ -343,11 +376,11 @@ msgstr ""
msgid "Less"
msgstr ""
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr ""
-#: templates/admin.php:246 templates/personal.php:143
+#: 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 "
@@ -414,7 +447,7 @@ msgstr ""
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:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "Cyfrinair"
@@ -438,7 +471,7 @@ msgstr "Cyfrinair newydd"
msgid "Change password"
msgstr ""
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr ""
@@ -454,38 +487,66 @@ msgstr ""
msgid "Fill in an email address to enable password recovery"
msgstr ""
-#: templates/personal.php:85 templates/personal.php:86
-msgid "Language"
+#: 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:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:106
+#: 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:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "Amgryptiad"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -511,30 +572,30 @@ msgstr ""
msgid "Default Storage"
msgstr ""
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr ""
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "Arall"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "Enw defnyddiwr"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr ""
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr ""
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr ""
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr ""
diff --git a/l10n/cy_GB/user_ldap.po b/l10n/cy_GB/user_ldap.po
index a42f865fb36a020f7602edb954ba35838cc05202..3756eac182a21c1925d4faf31087407326076903 100644
--- a/l10n/cy_GB/user_ldap.po
+++ b/l10n/cy_GB/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\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"
"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/da/core.po b/l10n/da/core.po
index 3566470055f24e276242f6a98276a00ab6e96128..89530e074562234a7f497a4149c6e4833921c7ad 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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+0000\n"
+"POT-Creation-Date: 2013-09-27 00:01-0400\n"
+"PO-Revision-Date: 2013-09-24 17:20+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"
@@ -26,30 +26,34 @@ msgstr ""
msgid "%s shared »%s« with you"
msgstr "%s delte »%s« med sig"
+#: ajax/share.php:227
+msgid "group"
+msgstr "gruppe"
+
#: ajax/update.php:11
msgid "Turned on maintenance mode"
-msgstr ""
+msgstr "Startede vedligeholdelsestilstand"
#: ajax/update.php:14
msgid "Turned off maintenance mode"
-msgstr ""
+msgstr "standsede vedligeholdelsestilstand"
#: ajax/update.php:17
msgid "Updated database"
-msgstr ""
+msgstr "Opdaterede database"
#: ajax/update.php:20
msgid "Updating filecache, this may take really long..."
-msgstr ""
+msgstr "Opdatere filcache, dette kan tage rigtigt lang tid..."
#: ajax/update.php:23
msgid "Updated filecache"
-msgstr ""
+msgstr "Opdaterede filcache"
#: ajax/update.php:26
#, php-format
msgid "... %d%% done ..."
-msgstr ""
+msgstr "... %d%% færdig ..."
#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
msgid "Category type not provided."
@@ -90,6 +94,26 @@ msgstr "Ingen kategorier valgt"
msgid "Error removing %s from favorites."
msgstr "Fejl ved fjernelse af %s fra favoritter."
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr "Ukendt filtype"
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr "Ugyldigt billede"
+
+#: 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 "Søndag"
@@ -166,59 +190,59 @@ msgstr "November"
msgid "December"
msgstr "December"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "Indstillinger"
-#: js/js.js:812
+#: js/js.js:866
msgid "seconds ago"
msgstr "sekunder siden"
-#: js/js.js:813
+#: 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:814
+#: 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:815
+#: js/js.js:869
msgid "today"
msgstr "i dag"
-#: js/js.js:816
+#: js/js.js:870
msgid "yesterday"
msgstr "i går"
-#: js/js.js:817
+#: 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:818
+#: js/js.js:872
msgid "last month"
msgstr "sidste måned"
-#: js/js.js:819
+#: 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:820
+#: js/js.js:874
msgid "months ago"
msgstr "måneder siden"
-#: js/js.js:821
+#: js/js.js:875
msgid "last year"
msgstr "sidste år"
-#: js/js.js:822
+#: js/js.js:876
msgid "years ago"
msgstr "år siden"
@@ -226,22 +250,66 @@ msgstr "år siden"
msgid "Choose"
msgstr "Vælg"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
-msgstr "Fejl ved indlæsning af filvælger skabelon"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
+msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "Ja"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "Nej"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
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] ""
+
+#: 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."
@@ -251,7 +319,7 @@ msgstr "Objekttypen er ikke angivet."
#: 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:643 js/share.js:655
+#: js/share.js:656 js/share.js:668
msgid "Error"
msgstr "Fejl"
@@ -271,7 +339,7 @@ msgstr "Delt"
msgid "Share"
msgstr "Del"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:696
msgid "Error while sharing"
msgstr "Fejl under deling"
@@ -327,67 +395,67 @@ msgstr "Vælg udløbsdato"
msgid "Expiration date"
msgstr "Udløbsdato"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "Del via email:"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "Ingen personer fundet"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "Videredeling ikke tilladt"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr "Delt i {item} med {user}"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "Fjern deling"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "kan redigere"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "Adgangskontrol"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "opret"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "opdater"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "slet"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "del"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:643
msgid "Password protected"
msgstr "Beskyttet med adgangskode"
-#: js/share.js:643
+#: js/share.js:656
msgid "Error unsetting expiration date"
msgstr "Fejl ved fjernelse af udløbsdato"
-#: js/share.js:655
+#: js/share.js:668
msgid "Error setting expiration date"
msgstr "Fejl under sætning af udløbsdato"
-#: js/share.js:670
+#: js/share.js:683
msgid "Sending ..."
msgstr "Sender ..."
-#: js/share.js:681
+#: js/share.js:694
msgid "Email sent"
msgstr "E-mail afsendt"
@@ -402,7 +470,7 @@ msgstr "Opdateringen blev ikke udført korrekt. Rapporter venligst problemet til
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Opdateringen blev udført korrekt. Du bliver nu viderestillet til ownCloud."
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr "%s adgangskode nulstillet"
@@ -471,7 +539,7 @@ msgstr "Personligt"
msgid "Users"
msgstr "Brugere"
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "Apps"
@@ -600,14 +668,10 @@ msgstr "Afslut opsætning"
msgid "%s is available. Get more information on how to update."
msgstr "%s er tilgængelig. Få mere information om, hvordan du opdaterer."
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "Log ud"
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr "Flere programmer"
-
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "Automatisk login afvist!"
@@ -622,19 +686,19 @@ msgstr "Hvis du ikke har ændret din adgangskode for nylig, har nogen muligvis t
msgid "Please change your password to secure your account again."
msgstr "Skift adgangskode for at sikre din konto igen."
-#: templates/login.php:34
+#: templates/login.php:32
msgid "Lost your password?"
msgstr "Mistet dit kodeord?"
-#: templates/login.php:39
+#: templates/login.php:37
msgid "remember"
msgstr "husk"
-#: templates/login.php:41
+#: templates/login.php:39
msgid "Log in"
msgstr "Log ind"
-#: templates/login.php:47
+#: templates/login.php:45
msgid "Alternative Logins"
msgstr "Alternative logins"
diff --git a/l10n/da/files.po b/l10n/da/files.po
index 218518cb6ede1b0eb4fd3aed6ca1d352ff73e4b1..b6cf95c8d9c8bce02cb1bb77f711d54587d067ed 100644
--- a/l10n/da/files.po
+++ b/l10n/da/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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
@@ -77,7 +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:123
+#: 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 "Ugyldig mappe."
@@ -85,149 +93,157 @@ 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: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 "Fil upload kører. Hvis du forlader siden nu, vil uploadet blive annuleret."
-#: js/file-upload.js:241
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr "URLen kan ikke være tom."
-#: 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 "Ugyldigt mappenavn. Brug af 'Shared' er forbeholdt af ownCloud"
-#: js/file-upload.js:277 js/file-upload.js:293 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 "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:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "Afventer"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{new_name} eksisterer allerede"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "erstat"
-#: js/filelist.js:303
+#: js/filelist.js:416
msgid "suggest name"
msgstr "foreslå navn"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "fortryd"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr "erstattede {new_name} med {old_name}"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "undo"
msgstr "fortryd"
-#: js/filelist.js:453
+#: 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: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:541
+msgid "{dirs} and {files}"
+msgstr "{dirs} og {files}"
+
+#: 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:518
-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: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 "Navn"
-#: js/files.js:563 templates/index.php:78
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "Størrelse"
-#: js/files.js:564 templates/index.php:80
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr "Ændret"
-#: js/files.js:580
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] "%n mappe"
-msgstr[1] "%n mapper"
-
-#: js/files.js:586
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] "%n fil"
-msgstr[1] "%n filer"
-
#: lib/app.php:73
#, php-format
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"
@@ -263,84 +279,68 @@ 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: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 "Fjern deling"
-#: templates/index.php:91 templates/index.php:92
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "Slet"
-#: templates/index.php:105
+#: templates/index.php:100
msgid "Upload too large"
msgstr "Upload er for stor"
-#: 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 "Filerne, du prøver at uploade, er større end den maksimale størrelse for fil-upload på denne server."
-#: templates/index.php:112
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr "Filerne bliver indlæst, vent venligst."
-#: templates/index.php:115
+#: templates/index.php:110
msgid "Current scanning"
msgstr "Indlæser"
-#: templates/part.list.php:74
-msgid "directory"
-msgstr "mappe"
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr "Mapper"
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr "fil"
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr "filer"
-
#: templates/upgrade.php:2
msgid "Upgrading filesystem cache..."
msgstr "Opgraderer filsystems cachen..."
diff --git a/l10n/da/files_sharing.po b/l10n/da/files_sharing.po
index a6dc9237e089627d7b93ee18b7860a6515b58de3..d5bee700f160998ac0887c9058a1f6253215038c 100644
--- a/l10n/da/files_sharing.po
+++ b/l10n/da/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:01+0000\n"
"Last-Translator: Sappe\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
@@ -64,7 +64,7 @@ msgstr "%s delte mappen %s med dig"
msgid "%s shared the file %s with you"
msgstr "%s delte filen %s med dig"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "Download"
@@ -76,6 +76,6 @@ msgstr "Upload"
msgid "Cancel upload"
msgstr "Fortryd upload"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "Forhåndsvisning ikke tilgængelig for"
diff --git a/l10n/da/lib.po b/l10n/da/lib.po
index 7873b58ef50f6294ec634f334c40d9c30fca15ed..7d01d7a9691a614870f7f688fc6c9e43804ab26f 100644
--- a/l10n/da/lib.po
+++ b/l10n/da/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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-27 00:01-0400\n"
+"PO-Revision-Date: 2013-09-24 17:20+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,11 +25,11 @@ msgstr ""
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
-msgstr ""
+msgstr "App'en \"%s\" kan ikke blive installeret, da den ikke er kompatibel med denne version af ownCloud."
#: app.php:250
msgid "No app name specified"
-msgstr ""
+msgstr "Intet app-navn angivet"
#: app.php:361
msgid "Help"
@@ -51,11 +51,23 @@ msgstr "Brugere"
msgid "Admin"
msgstr "Admin"
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "Upgradering af \"%s\" fejlede"
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr "Personligt profilbillede virker endnu ikke sammen med kryptering"
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr "Ukendt filtype"
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr "Ugyldigt billede"
+
#: defaults.php:35
msgid "web services under your control"
msgstr "Webtjenester under din kontrol"
@@ -89,59 +101,59 @@ msgstr "Download filerne i små bider, seperat, eller kontakt venligst din admin
#: installer.php:63
msgid "No source specified when installing app"
-msgstr ""
+msgstr "Ingen kilde angivet under installation af app"
#: installer.php:70
msgid "No href specified when installing app from http"
-msgstr ""
+msgstr "Ingen href angivet under installation af app via http"
#: installer.php:75
msgid "No path specified when installing app from local file"
-msgstr ""
+msgstr "Ingen sti angivet under installation af app fra lokal fil"
#: installer.php:89
#, php-format
msgid "Archives of type %s are not supported"
-msgstr ""
+msgstr "Arkiver af type %s understøttes ikke"
#: installer.php:103
msgid "Failed to open archive when installing app"
-msgstr ""
+msgstr "Kunne ikke åbne arkiv under installation af appen"
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
-msgstr ""
+msgstr "Der følger ingen info.xml-fil med appen"
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
-msgstr ""
+msgstr "Appen kan ikke installeres, da den indeholder ikke-tilladt kode"
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
-msgstr ""
+msgstr "Appen kan ikke installeres, da den ikke er kompatibel med denne version af ownCloud."
-#: installer.php:144
+#: 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 "Appen kan ikke installeres, da den indeholder taget\n<shipped>\n\ntrue\n</shipped>\n\nhvilket ikke er tilladt for ikke-medfølgende apps"
-#: installer.php:150
+#: 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 "App kan ikke installeres, da versionen i info.xml/version ikke er den samme som versionen rapporteret fra app-storen"
-#: installer.php:160
+#: installer.php:162
msgid "App directory already exists"
-msgstr ""
+msgstr "App-mappe findes allerede"
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
-msgstr ""
+msgstr "Kan ikke oprette app-mappe. Ret tilladelser. %s"
#: json.php:28
msgid "Application is not enabled"
@@ -155,15 +167,15 @@ msgstr "Adgangsfejl"
msgid "Token expired. Please reload page."
msgstr "Adgang er udløbet. Genindlæs siden."
-#: 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 "SMS"
-#: search/provider/file.php:29
+#: search/provider/file.php:30
msgid "Images"
msgstr "Billeder"
@@ -267,51 +279,51 @@ msgstr "Din webserver er endnu ikke sat op til at tillade fil synkronisering for
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Dobbelttjek venligst <a href='%s'>installations vejledningerne</a>."
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "sekunder siden"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n minut siden"
msgstr[1] "%n minutter siden"
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n time siden"
msgstr[1] "%n timer siden"
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "i dag"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "i går"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] "%n dag siden"
msgstr[1] "%n dage siden"
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "sidste måned"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n måned siden"
msgstr[1] "%n måneder siden"
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "sidste år"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "år siden"
diff --git a/l10n/da/settings.po b/l10n/da/settings.po
index f3bdc23e48657d1b34f093c2f984d50f6b4713c9..e5f2b57e882248d17c45975d4b6fc255dbff8bce 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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-27 00:01-0400\n"
+"PO-Revision-Date: 2013-09-24 17:00+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,55 +87,88 @@ msgstr "Brugeren kan ikke fjernes fra gruppen %s"
msgid "Couldn't update app."
msgstr "Kunne ikke opdatere app'en."
-#: js/apps.js:35
+#: 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 "Kunne ikke ændre kodeord"
+
+#: js/apps.js:43
msgid "Update to {appversion}"
msgstr "Opdatér til {appversion}"
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:110
msgid "Disable"
msgstr "Deaktiver"
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
msgid "Enable"
msgstr "Aktiver"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr "Vent venligst..."
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:101
msgid "Error while disabling app"
-msgstr ""
+msgstr "Kunne ikke deaktivere app"
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:100 js/apps.js:114 js/apps.js:115
msgid "Error while enabling app"
-msgstr ""
+msgstr "Kunne ikke aktivere app"
-#: js/apps.js:115
+#: js/apps.js:125
msgid "Updating...."
msgstr "Opdaterer...."
-#: js/apps.js:118
+#: js/apps.js:128
msgid "Error while updating app"
msgstr "Der opstod en fejl under app opgraderingen"
-#: js/apps.js:118
+#: js/apps.js:128
msgid "Error"
msgstr "Fejl"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:129 templates/apps.php:43
msgid "Update"
msgstr "Opdater"
-#: js/apps.js:122
+#: js/apps.js:132
msgid "Updated"
msgstr "Opdateret"
-#: js/personal.js:150
+#: js/personal.js:220
+msgid "Select a profile picture"
+msgstr "Vælg et profilbillede"
+
+#: 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:172
+#: js/personal.js:287
msgid "Saving..."
msgstr "Gemmer..."
@@ -151,16 +184,16 @@ msgstr "fortryd"
msgid "Unable to remove user"
msgstr "Kan ikke fjerne bruger"
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "Grupper"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "Gruppe Administrator"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "Slet"
@@ -180,7 +213,7 @@ msgstr "Fejl ved oprettelse af bruger"
msgid "A valid password must be provided"
msgstr "En gyldig adgangskode skal angives"
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "Dansk"
@@ -346,11 +379,11 @@ msgstr "Mere"
msgid "Less"
msgstr "Mindre"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "Version"
-#: templates/admin.php:246 templates/personal.php:143
+#: 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 "
@@ -417,7 +450,7 @@ msgstr "Vis Første Kørsels Guiden igen."
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Du har brugt <strong>%s</strong> af den tilgængelige <strong>%s</strong>"
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "Kodeord"
@@ -441,7 +474,7 @@ msgstr "Nyt kodeord"
msgid "Change password"
msgstr "Skift kodeord"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr "Skærmnavn"
@@ -457,38 +490,66 @@ msgstr "Din emailadresse"
msgid "Fill in an email address to enable password recovery"
msgstr "Indtast en emailadresse for at kunne få påmindelse om adgangskode"
-#: templates/personal.php:85 templates/personal.php:86
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr "Profilbillede"
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr "Upload nyt"
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr "Vælg nyt fra Filer"
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr "Fjern billede"
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr "Enten png eller jpg. Ideelt firkantet men du har mulighed for at beskære det. "
+
+#: templates/personal.php:97
+msgid "Abort"
+msgstr "Afbryd"
+
+#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr "Vælg som profilbillede"
+
+#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
msgstr "Sprog"
-#: templates/personal.php:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "Hjælp med oversættelsen"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: 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 "Anvend denne adresse til at <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">tilgå dine filer via WebDAV</a>"
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "Kryptering"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr "Krypterings app'en er ikke længere aktiv. Dekrypter alle dine filer. "
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr "Log-in kodeord"
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr "Dekrypter alle Filer "
@@ -514,30 +575,30 @@ msgstr "Indtast et gendannelse kodeord for, at kunne gendanne brugerens filer ve
msgid "Default Storage"
msgstr "Standard opbevaring"
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr "Ubegrænset"
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "Andet"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "Brugernavn"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr "Opbevaring"
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr "skift skærmnavn"
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr "skift kodeord"
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr "Standard"
diff --git a/l10n/da/user_ldap.po b/l10n/da/user_ldap.po
index 1d75484a1d35f00ea98f21aa1b4830079bd9b728..656890881c2551f5db1521ad41793ce25737339f 100644
--- a/l10n/da/user_ldap.po
+++ b/l10n/da/user_ldap.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-23 20:16-0400\n"
-"PO-Revision-Date: 2013-08-22 20:00+0000\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-05 11:51+0000\n"
"Last-Translator: Sappe\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/de/core.po b/l10n/de/core.po
index f802b39ac3e26e45acfb9e7fca928b8fb572f11b..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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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"
@@ -30,30 +30,34 @@ msgstr ""
msgid "%s shared »%s« with you"
msgstr "%s teilte »%s« mit Ihnen"
+#: ajax/share.php:227
+msgid "group"
+msgstr "Gruppe"
+
#: ajax/update.php:11
msgid "Turned on maintenance mode"
-msgstr ""
+msgstr "Wartungsmodus eingeschaltet"
#: ajax/update.php:14
msgid "Turned off maintenance mode"
-msgstr ""
+msgstr "Wartungsmodus ausgeschaltet"
#: ajax/update.php:17
msgid "Updated database"
-msgstr ""
+msgstr "Datenbank aktualisiert"
#: ajax/update.php:20
msgid "Updating filecache, this may take really long..."
-msgstr ""
+msgstr "Aktualisiere Dateicache, dies könnte eine Weile dauern..."
#: ajax/update.php:23
msgid "Updated filecache"
-msgstr ""
+msgstr "Dateicache aktualisiert"
#: ajax/update.php:26
#, php-format
msgid "... %d%% done ..."
-msgstr ""
+msgstr "... %d%% erledigt ..."
#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
msgid "Category type not provided."
@@ -94,6 +98,26 @@ msgstr "Es wurde keine Kategorien zum Löschen ausgewählt."
msgid "Error removing %s from favorites."
msgstr "Fehler beim Entfernen von %s von den Favoriten."
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr "Kein Bild oder Datei zur Verfügung gestellt"
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr "Unbekannter Dateityp"
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr "Ungültiges Bild"
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr "Kein temporäres Profilbild verfügbar, bitte versuche es nochmal"
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr "Keine Zuschnittdaten zur Verfügung gestellt"
+
#: js/config.php:32
msgid "Sunday"
msgstr "Sonntag"
@@ -170,59 +194,59 @@ msgstr "November"
msgid "December"
msgstr "Dezember"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "Einstellungen"
-#: js/js.js:812
+#: js/js.js:866
msgid "seconds ago"
msgstr "Gerade eben"
-#: js/js.js:813
+#: 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:814
+#: 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:815
+#: js/js.js:869
msgid "today"
msgstr "Heute"
-#: js/js.js:816
+#: js/js.js:870
msgid "yesterday"
msgstr "Gestern"
-#: js/js.js:817
+#: 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:818
+#: js/js.js:872
msgid "last month"
msgstr "Letzten Monat"
-#: js/js.js:819
+#: 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:820
+#: js/js.js:874
msgid "months ago"
msgstr "Vor Monaten"
-#: js/js.js:821
+#: js/js.js:875
msgid "last year"
msgstr "Letztes Jahr"
-#: js/js.js:822
+#: js/js.js:876
msgid "years ago"
msgstr "Vor Jahren"
@@ -230,22 +254,66 @@ msgstr "Vor Jahren"
msgid "Choose"
msgstr "Auswählen"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
-msgstr "Dateiauswahltemplate konnte nicht geladen werden"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
+msgstr "Fehler beim Laden der Dateiauswahlvorlage: {error}"
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "Ja"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "Nein"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr "OK"
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+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
msgid "The object type is not specified."
@@ -255,7 +323,7 @@ msgstr "Der Objekttyp ist nicht angegeben."
#: 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:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "Fehler"
@@ -275,7 +343,7 @@ msgstr "Geteilt"
msgid "Share"
msgstr "Teilen"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr "Fehler beim Teilen"
@@ -331,67 +399,67 @@ msgstr "Setze ein Ablaufdatum"
msgid "Expiration date"
msgstr "Ablaufdatum"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "Über eine E-Mail teilen:"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "Niemand gefunden"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "Weiterverteilen ist nicht erlaubt"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr "Für {user} in {item} freigegeben"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "Freigabe aufheben"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "kann bearbeiten"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "Zugriffskontrolle"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "erstellen"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "aktualisieren"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "löschen"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "teilen"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "Durch ein Passwort geschützt"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr "Fehler beim Entfernen des Ablaufdatums"
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr "Fehler beim Setzen des Ablaufdatums"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr "Sende ..."
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr "E-Mail wurde verschickt"
@@ -406,7 +474,7 @@ msgstr "Das Update ist fehlgeschlagen. Bitte melde dieses Problem an die <a href
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Das Update war erfolgreich. Du wirst nun zu ownCloud weitergeleitet."
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr "%s-Passwort zurücksetzen"
@@ -475,7 +543,7 @@ msgstr "Persönlich"
msgid "Users"
msgstr "Benutzer"
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "Apps"
@@ -604,14 +672,10 @@ msgstr "Installation abschließen"
msgid "%s is available. Get more information on how to update."
msgstr "%s ist verfügbar. Holen Sie weitere Informationen zu Aktualisierungen ein."
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "Abmelden"
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr "Mehr Apps"
-
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "Automatischer Login zurückgewiesen!"
@@ -626,19 +690,19 @@ msgstr "Wenn Du Dein Passwort nicht vor kurzem geändert hast, könnte Dein\nAcc
msgid "Please change your password to secure your account again."
msgstr "Bitte ändere Dein Passwort, um Deinen Account wieder zu schützen."
-#: templates/login.php:34
+#: templates/login.php:32
msgid "Lost your password?"
msgstr "Passwort vergessen?"
-#: templates/login.php:39
+#: templates/login.php:37
msgid "remember"
msgstr "merken"
-#: templates/login.php:41
+#: templates/login.php:39
msgid "Log in"
msgstr "Einloggen"
-#: templates/login.php:47
+#: templates/login.php:45
msgid "Alternative Logins"
msgstr "Alternative Logins"
diff --git a/l10n/de/files.po b/l10n/de/files.po
index a18eb37b0da131f255c233f8e1a2c4905e32256e..06bce6446387eb8109c664cdc080e6f07909f97b 100644
--- a/l10n/de/files.po
+++ b/l10n/de/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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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 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"
@@ -80,157 +80,173 @@ msgstr "Fehler beim Schreiben auf die Festplatte"
msgid "Not enough storage available"
msgstr "Nicht genug Speicher vorhanden."
-#: ajax/upload.php:123
+#: 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: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:167
+#: 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:241
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr "Die URL darf nicht leer sein."
-#: 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 "Der Ordnername ist ungültig. Nur ownCloud kann den Ordner \"Shared\" anlegen"
-#: js/file-upload.js:277 js/file-upload.js:293 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 "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:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "Ausstehend"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{new_name} existiert bereits"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "ersetzen"
-#: js/filelist.js:303
+#: js/filelist.js:416
msgid "suggest name"
msgstr "Namen vorschlagen"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "abbrechen"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr "{old_name} ersetzt durch {new_name}"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "undo"
msgstr "rückgängig machen"
-#: js/filelist.js:453
+#: 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: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:541
+msgid "{dirs} and {files}"
+msgstr "{dirs} und {files}"
+
+#: 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:518
-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:562 templates/index.php:67
+#: 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:563 templates/index.php:78
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "Größe"
-#: js/files.js:564 templates/index.php:80
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr "Geändert"
-#: js/files.js:580
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] "%n Ordner"
-msgstr[1] "%n Ordner"
-
-#: js/files.js:586
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] "%n Datei"
-msgstr[1] "%n Dateien"
-
#: lib/app.php:73
#, php-format
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"
@@ -266,84 +282,68 @@ 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:73
+#: templates/index.php:67
msgid "Download"
msgstr "Herunterladen"
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr "Freigabe aufheben"
-#: templates/index.php:91 templates/index.php:92
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "Löschen"
-#: templates/index.php:105
+#: templates/index.php:100
msgid "Upload too large"
msgstr "Der Upload ist zu groß"
-#: 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 "Die Datei überschreitet die Maximalgröße für Uploads auf diesem Server."
-#: templates/index.php:112
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr "Dateien werden gescannt, bitte warten."
-#: templates/index.php:115
+#: templates/index.php:110
msgid "Current scanning"
msgstr "Scanne"
-#: templates/part.list.php:74
-msgid "directory"
-msgstr "Verzeichnis"
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr "Verzeichnisse"
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr "Datei"
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr "Dateien"
-
#: templates/upgrade.php:2
msgid "Upgrading filesystem cache..."
msgstr "Dateisystem-Cache wird aktualisiert ..."
diff --git a/l10n/de/files_sharing.po b/l10n/de/files_sharing.po
index 656a195b2f72247d17cc345081938417e9468878..ad1e84807eadd85a3bdfaba6db4ecc644bed0b83 100644
--- a/l10n/de/files_sharing.po
+++ b/l10n/de/files_sharing.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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:01+0000\n"
"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
"Language-Team: German <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
@@ -65,7 +65,7 @@ msgstr "%s hat den Ordner %s mit Dir geteilt"
msgid "%s shared the file %s with you"
msgstr "%s hat die Datei %s mit Dir geteilt"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "Download"
@@ -77,6 +77,6 @@ msgstr "Hochladen"
msgid "Cancel upload"
msgstr "Upload abbrechen"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "Es ist keine Vorschau verfügbar für"
diff --git a/l10n/de/lib.po b/l10n/de/lib.po
index fff88cd0e310260e73251d032f90fc7b05a2ec49..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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 10:05+0000\n"
-"Last-Translator: noxin <transifex.com@davidmainzer.com>\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"
@@ -30,7 +30,7 @@ msgstr "Applikation \"%s\" kann nicht installiert werden, da sie mit dieser ownC
#: app.php:250
msgid "No app name specified"
-msgstr "Es wurde kein App-Name angegeben"
+msgstr "Es wurde kein Applikation-Name angegeben"
#: app.php:361
msgid "Help"
@@ -52,11 +52,23 @@ msgstr "Benutzer"
msgid "Admin"
msgstr "Administration"
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "Konnte \"%s\" nicht aktualisieren."
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr "Individuelle Profilbilder werden noch nicht von der Verschlüsselung unterstützt"
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr "Unbekannter Dateityp"
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr "Ungültiges Bild"
+
#: defaults.php:35
msgid "web services under your control"
msgstr "Web-Services unter Deiner Kontrolle"
@@ -94,7 +106,7 @@ msgstr "Für die Installation der Applikation wurde keine Quelle angegeben"
#: installer.php:70
msgid "No href specified when installing app from http"
-msgstr "href wurde nicht angegeben um die Applikation per http zu installieren"
+msgstr "Der Link (href) wurde nicht angegeben um die Applikation per http zu installieren"
#: installer.php:75
msgid "No path specified when installing app from local file"
@@ -107,39 +119,39 @@ msgstr "Archive vom Typ %s werden nicht unterstützt"
#: installer.php:103
msgid "Failed to open archive when installing app"
-msgstr "Das Archive konnte bei der Installation der Applikation nicht geöffnet werden"
+msgstr "Das Archiv konnte bei der Installation der Applikation nicht geöffnet werden"
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr "Die Applikation enthält keine info,xml Datei"
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr "Die Applikation kann auf Grund von unerlaubten Code nicht installiert werden"
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
-msgstr ""
+msgstr "Die Anwendung konnte nicht installiert werden, weil Sie nicht mit dieser Version von ownCloud kompatibel ist."
-#: installer.php:144
+#: 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 "Die Applikation konnte nicht installiert werden, da diese das <shipped>true</shipped> Tag beinhaltet und dieses, bei nicht mitausgelieferten Applikationen, nicht erlaubt ist ist"
-#: installer.php:150
+#: 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 "Die Applikation konnte nicht installiert werden, da die Version in der info.xml nicht die gleiche Version wie im App-Store ist"
-#: installer.php:160
+#: installer.php:162
msgid "App directory already exists"
msgstr "Das Applikationsverzeichnis existiert bereits"
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr "Es kann kein Applikationsordner erstellt werden. Bitte passen sie die Berechtigungen an. %s"
@@ -268,51 +280,51 @@ msgstr "Dein Web-Server ist noch nicht für Datei-Synchronisation bereit, weil d
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Bitte prüfe die <a href='%s'>Installationsanleitungen</a>."
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "Gerade eben"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] "Vor %n Minuten"
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] "Vor %n Stunden"
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "Heute"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "Gestern"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] "Vor %n Tagen"
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "Letzten Monat"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] "Vor %n Monaten"
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "Letztes Jahr"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "Vor Jahren"
diff --git a/l10n/de/settings.po b/l10n/de/settings.po
index dbf98f0bf851d1c90f705bdbc3f4ab5a285a4c32..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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+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,55 +89,88 @@ msgstr "Der Benutzer konnte nicht aus der Gruppe %s entfernt werden"
msgid "Couldn't update app."
msgstr "Die App konnte nicht aktualisiert werden."
-#: js/apps.js:35
+#: 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}"
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr "Deaktivieren"
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr "Aktivieren"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr "Bitte warten..."
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
-msgstr ""
+msgstr "Beim Deaktivieren der Applikation ist ein Fehler aufgetreten"
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
-msgstr ""
+msgstr "Beim Aktivieren der Applikation ist ein Fehler aufgetreten"
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr "Aktualisierung..."
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr "Fehler beim Aktualisieren der App"
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "Fehler"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr "Aktualisierung durchführen"
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr "Aktualisiert"
-#: js/personal.js:150
+#: js/personal.js:220
+msgid "Select a profile picture"
+msgstr "Wähle ein Profilbild"
+
+#: 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:172
+#: js/personal.js:287
msgid "Saving..."
msgstr "Speichern..."
@@ -153,16 +186,16 @@ msgstr "rückgängig machen"
msgid "Unable to remove user"
msgstr "Benutzer konnte nicht entfernt werden."
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "Gruppen"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "Gruppenadministrator"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "Löschen"
@@ -182,7 +215,7 @@ msgstr "Beim Anlegen des Benutzers ist ein Fehler aufgetreten"
msgid "A valid password must be provided"
msgstr "Es muss ein gültiges Passwort angegeben werden"
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "Deutsch (Persönlich)"
@@ -348,11 +381,11 @@ msgstr "Mehr"
msgid "Less"
msgstr "Weniger"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "Version"
-#: templates/admin.php:246 templates/personal.php:143
+#: 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 "
@@ -419,7 +452,7 @@ msgstr "Erstinstallation erneut durchführen"
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Du verwendest <strong>%s</strong> der verfügbaren <strong>%s<strong>"
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "Passwort"
@@ -443,7 +476,7 @@ msgstr "Neues Passwort"
msgid "Change password"
msgstr "Passwort ändern"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr "Anzeigename"
@@ -459,38 +492,66 @@ msgstr "Deine E-Mail-Adresse"
msgid "Fill in an email address to enable password recovery"
msgstr "Trage eine E-Mail-Adresse ein, um die Passwort-Wiederherstellung zu aktivieren."
-#: templates/personal.php:85 templates/personal.php:86
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr "Profilbild"
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr "Neues hochladen"
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr "Neues aus den Dateien wählen"
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr "Bild entfernen"
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr "Entweder PNG oder JPG. Im Idealfall quadratisch, aber du kannst es zuschneiden."
+
+#: templates/personal.php:97
+msgid "Abort"
+msgstr "Abbrechen"
+
+#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr "Als Profilbild wählen"
+
+#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
msgstr "Sprache"
-#: templates/personal.php:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "Hilf bei der Übersetzung"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: 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 "Verwenden Sie diese Adresse, um <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">via WebDAV auf Ihre Dateien zuzugreifen</a>"
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "Verschlüsselung"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr "Die Anwendung zur Verschlüsselung ist nicht länger aktiv, all Ihre Dateien werden entschlüsselt."
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr "Login-Passwort"
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr "Alle Dateien entschlüsseln"
@@ -516,30 +577,30 @@ msgstr "Geben Sie das Wiederherstellungspasswort ein, um die Benutzerdateien wä
msgid "Default Storage"
msgstr "Standard-Speicher"
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr "Unbegrenzt"
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "Andere"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "Benutzername"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr "Speicher"
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr "Anzeigenamen ändern"
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr "Neues Passwort setzen"
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr "Standard"
diff --git a/l10n/de/user_ldap.po b/l10n/de/user_ldap.po
index 36a8e3174131463c5adfa6f924e64a99dd190c98..aa8ba6bb140b628d11ce1a8cda389b430f95b07b 100644
--- a/l10n/de/user_ldap.po
+++ b/l10n/de/user_ldap.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-08-21 08:11-0400\n"
-"PO-Revision-Date: 2013-08-20 12:50+0000\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-05 11:51+0000\n"
"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
"Language-Team: German <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/de/user_webdavauth.po b/l10n/de/user_webdavauth.po
index b9ceaaa95d0253133b38e9a58788bff3f4081e55..cc36dab1befa8898c9c87775a8201961423bb9ff 100644
--- a/l10n/de/user_webdavauth.po
+++ b/l10n/de/user_webdavauth.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-07-29 01:56-0400\n"
-"PO-Revision-Date: 2013-07-28 16:10+0000\n"
-"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
+"POT-Creation-Date: 2013-08-30 09:32-0400\n"
+"PO-Revision-Date: 2013-08-29 20:16+0000\n"
+"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
"Language-Team: German <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/de_AT/core.po b/l10n/de_AT/core.po
index d6a26eb7c40178321cc44370e962ee553fef08a9..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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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"
@@ -23,6 +23,10 @@ msgstr ""
msgid "%s shared »%s« with you"
msgstr ""
+#: ajax/share.php:227
+msgid "group"
+msgstr ""
+
#: ajax/update.php:11
msgid "Turned on maintenance mode"
msgstr ""
@@ -87,6 +91,26 @@ msgstr ""
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 ""
@@ -163,59 +187,59 @@ msgstr ""
msgid "December"
msgstr ""
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr ""
-#: js/js.js:812
+#: js/js.js:866
msgid "seconds ago"
msgstr ""
-#: js/js.js:813
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:814
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:815
+#: js/js.js:869
msgid "today"
msgstr ""
-#: js/js.js:816
+#: js/js.js:870
msgid "yesterday"
msgstr ""
-#: js/js.js:817
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:818
+#: js/js.js:872
msgid "last month"
msgstr ""
-#: js/js.js:819
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:820
+#: js/js.js:874
msgid "months ago"
msgstr ""
-#: js/js.js:821
+#: js/js.js:875
msgid "last year"
msgstr ""
-#: js/js.js:822
+#: js/js.js:876
msgid "years ago"
msgstr ""
@@ -223,22 +247,66 @@ msgstr ""
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:195
+#: 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."
@@ -248,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:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr ""
@@ -268,7 +336,7 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr ""
@@ -324,67 +392,67 @@ msgstr ""
msgid "Expiration date"
msgstr ""
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr ""
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr ""
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr ""
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr ""
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr ""
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr ""
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr ""
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr ""
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr ""
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr ""
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr ""
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr ""
@@ -399,7 +467,7 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr ""
@@ -468,7 +536,7 @@ msgstr ""
msgid "Users"
msgstr ""
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr ""
@@ -597,14 +665,10 @@ msgstr ""
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr ""
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr "Mehr Apps"
-
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr ""
@@ -619,19 +683,19 @@ msgstr ""
msgid "Please change your password to secure your account again."
msgstr ""
-#: templates/login.php:34
+#: templates/login.php:32
msgid "Lost your password?"
msgstr ""
-#: templates/login.php:39
+#: templates/login.php:37
msgid "remember"
msgstr ""
-#: templates/login.php:41
+#: templates/login.php:39
msgid "Log in"
msgstr ""
-#: templates/login.php:47
+#: templates/login.php:45
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/de_AT/files.po b/l10n/de_AT/files.po
index 4476d1f102fd2d4346c9189d03c93bb118ec10fc..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-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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,7 +74,15 @@ msgstr ""
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:123
+#: 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 ""
@@ -82,149 +90,157 @@ 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: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:277 js/file-upload.js:293 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:465
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr ""
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr ""
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr ""
-#: js/filelist.js:303
+#: js/filelist.js:416
msgid "suggest name"
msgstr ""
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr ""
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr ""
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "undo"
msgstr ""
-#: js/filelist.js:453
-msgid "Uploading %n file"
-msgid_plural "Uploading %n files"
+#: 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:518
-msgid "files uploading"
+#: 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/files.js:52
+#: 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: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 ""
-#: js/files.js:580
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/files.js:586
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-
#: lib/app.php:73
#, php-format
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 ""
@@ -260,84 +276,68 @@ 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 ""
-#: templates/part.list.php:74
-msgid "directory"
-msgstr ""
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr ""
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr ""
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr ""
-
#: templates/upgrade.php:2
msgid "Upgrading filesystem cache..."
msgstr ""
diff --git a/l10n/de_AT/lib.po b/l10n/de_AT/lib.po
index 7666303833e80ccb4cecd04073f454c4db4946a9..7f3e0eafd0461c44d16d441b3a610390ef38c87c 100644
--- a/l10n/de_AT/lib.po
+++ b/l10n/de_AT/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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\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"
"Language-Team: German (Austria) (http://www.transifex.com/projects/p/owncloud/language/de_AT/)\n"
"MIME-Version: 1.0\n"
@@ -48,11 +48,23 @@ msgstr ""
msgid "Admin"
msgstr ""
-#: app.php:837
+#: 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 ""
@@ -105,37 +117,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: 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:150
+#: 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:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -264,51 +276,51 @@ msgstr ""
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr ""
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr ""
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr ""
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr ""
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr ""
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr ""
diff --git a/l10n/de_AT/settings.po b/l10n/de_AT/settings.po
index 11e3ea1c60bdd35f394140bcd4d3b2742afac39c..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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+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,55 +85,88 @@ msgstr ""
msgid "Couldn't update app."
msgstr ""
-#: js/apps.js:35
+#: 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:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr ""
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr ""
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr ""
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr ""
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr ""
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr ""
-#: js/personal.js:150
+#: 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:172
+#: js/personal.js:287
msgid "Saving..."
msgstr ""
@@ -148,16 +182,16 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: 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:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr ""
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr ""
@@ -177,9 +211,9 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
-msgstr ""
+msgstr "Deutsch (Österreich)"
#: templates/admin.php:15
msgid "Security Warning"
@@ -343,11 +377,11 @@ msgstr ""
msgid "Less"
msgstr ""
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr ""
-#: templates/admin.php:246 templates/personal.php:143
+#: 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 "
@@ -414,7 +448,7 @@ msgstr ""
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:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr ""
@@ -438,7 +472,7 @@ msgstr ""
msgid "Change password"
msgstr ""
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr ""
@@ -454,38 +488,66 @@ msgstr ""
msgid "Fill in an email address to enable password recovery"
msgstr ""
-#: templates/personal.php:85 templates/personal.php:86
-msgid "Language"
+#: 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:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:106
+#: 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:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr ""
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -511,30 +573,30 @@ msgstr ""
msgid "Default Storage"
msgstr ""
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr ""
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr ""
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr ""
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr ""
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr ""
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr ""
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr ""
diff --git a/l10n/de_CH/core.po b/l10n/de_CH/core.po
index a296bfa8c9e0f736f5b6453daca87245829b6c57..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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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"
@@ -31,6 +31,10 @@ msgstr ""
msgid "%s shared »%s« with you"
msgstr "%s teilt »%s« mit Ihnen"
+#: ajax/share.php:227
+msgid "group"
+msgstr "Gruppe"
+
#: ajax/update.php:11
msgid "Turned on maintenance mode"
msgstr ""
@@ -95,6 +99,26 @@ msgstr "Es wurden keine Kategorien zum Löschen ausgewählt."
msgid "Error removing %s from favorites."
msgstr "Fehler beim Entfernen von %s von den Favoriten."
+#: 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 "Sonntag"
@@ -171,59 +195,59 @@ msgstr "November"
msgid "December"
msgstr "Dezember"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "Einstellungen"
-#: js/js.js:812
+#: js/js.js:866
msgid "seconds ago"
msgstr "Gerade eben"
-#: js/js.js:813
+#: 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:814
+#: 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:815
+#: js/js.js:869
msgid "today"
msgstr "Heute"
-#: js/js.js:816
+#: js/js.js:870
msgid "yesterday"
msgstr "Gestern"
-#: js/js.js:817
+#: 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:818
+#: js/js.js:872
msgid "last month"
msgstr "Letzten Monat"
-#: js/js.js:819
+#: 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:820
+#: js/js.js:874
msgid "months ago"
msgstr "Vor Monaten"
-#: js/js.js:821
+#: js/js.js:875
msgid "last year"
msgstr "Letztes Jahr"
-#: js/js.js:822
+#: js/js.js:876
msgid "years ago"
msgstr "Vor Jahren"
@@ -231,22 +255,66 @@ msgstr "Vor Jahren"
msgid "Choose"
msgstr "Auswählen"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
-msgstr "Es ist ein Fehler in der Vorlage des Datei-Auswählers aufgetreten."
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
+msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "Ja"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "Nein"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
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] ""
+
+#: 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."
@@ -256,7 +324,7 @@ msgstr "Der Objekttyp ist nicht angegeben."
#: 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:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "Fehler"
@@ -276,7 +344,7 @@ msgstr "Geteilt"
msgid "Share"
msgstr "Teilen"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr "Fehler beim Teilen"
@@ -332,67 +400,67 @@ msgstr "Ein Ablaufdatum setzen"
msgid "Expiration date"
msgstr "Ablaufdatum"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "Mittels einer E-Mail teilen:"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "Niemand gefunden"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "Das Weiterverteilen ist nicht erlaubt"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr "Freigegeben in {item} von {user}"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "Freigabe aufheben"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "kann bearbeiten"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "Zugriffskontrolle"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "erstellen"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "aktualisieren"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "löschen"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "teilen"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "Passwortgeschützt"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr "Fehler beim Entfernen des Ablaufdatums"
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr "Fehler beim Setzen des Ablaufdatums"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr "Sende ..."
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr "Email gesendet"
@@ -407,7 +475,7 @@ msgstr "Das Update ist fehlgeschlagen. Bitte melden Sie dieses Problem an die <a
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Das Update war erfolgreich. Sie werden nun zu ownCloud weitergeleitet."
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr "%s-Passwort zurücksetzen"
@@ -476,7 +544,7 @@ msgstr "Persönlich"
msgid "Users"
msgstr "Benutzer"
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "Apps"
@@ -605,14 +673,10 @@ msgstr "Installation abschliessen"
msgid "%s is available. Get more information on how to update."
msgstr "%s ist verfügbar. Holen Sie weitere Informationen zu Aktualisierungen ein."
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "Abmelden"
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr "Mehr Apps"
-
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "Automatische Anmeldung verweigert!"
@@ -627,19 +691,19 @@ msgstr "Wenn Sie Ihr Passwort nicht vor kurzem geändert haben, könnte Ihr\nAcc
msgid "Please change your password to secure your account again."
msgstr "Bitte ändern Sie Ihr Passwort, um Ihr Konto wieder zu sichern."
-#: templates/login.php:34
+#: templates/login.php:32
msgid "Lost your password?"
msgstr "Passwort vergessen?"
-#: templates/login.php:39
+#: templates/login.php:37
msgid "remember"
msgstr "merken"
-#: templates/login.php:41
+#: templates/login.php:39
msgid "Log in"
msgstr "Einloggen"
-#: templates/login.php:47
+#: templates/login.php:45
msgid "Alternative Logins"
msgstr "Alternative Logins"
diff --git a/l10n/de_CH/files.po b/l10n/de_CH/files.po
index fae903c9a3a39a09c4ce4f2c42b13c07b88fb540..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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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,7 +83,15 @@ msgstr "Fehler beim Schreiben auf die Festplatte"
msgid "Not enough storage available"
msgstr "Nicht genug Speicher vorhanden."
-#: ajax/upload.php:123
+#: 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 "Ungültiges Verzeichnis."
@@ -91,149 +99,157 @@ 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: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 "Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upload abgebrochen."
-#: js/file-upload.js:241
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr "Die URL darf nicht leer sein."
-#: 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 "Ungültiger Ordnername. Die Verwendung von «Shared» ist ownCloud vorbehalten."
-#: js/file-upload.js:277 js/file-upload.js:293 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 "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:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "Ausstehend"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{new_name} existiert bereits"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "ersetzen"
-#: js/filelist.js:303
+#: js/filelist.js:416
msgid "suggest name"
msgstr "Namen vorschlagen"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "abbrechen"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr "{old_name} wurde ersetzt durch {new_name}"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "undo"
msgstr "rückgängig machen"
-#: js/filelist.js:453
+#: 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: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: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] "%n Datei wird hochgeladen"
msgstr[1] "%n Dateien werden hochgeladen"
-#: js/filelist.js:518
-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: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 "Name"
-#: js/files.js:563 templates/index.php:78
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "Grösse"
-#: js/files.js:564 templates/index.php:80
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr "Geändert"
-#: js/files.js:580
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] "%n Ordner"
-
-#: js/files.js:586
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] "%n Dateien"
-
#: lib/app.php:73
#, php-format
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"
@@ -269,84 +285,68 @@ 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:73
+#: templates/index.php:67
msgid "Download"
msgstr "Herunterladen"
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr "Freigabe aufheben"
-#: templates/index.php:91 templates/index.php:92
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "Löschen"
-#: templates/index.php:105
+#: templates/index.php:100
msgid "Upload too large"
msgstr "Der Upload ist zu gross"
-#: 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 "Die Datei überschreitet die Maximalgrösse für Uploads auf diesem Server."
-#: templates/index.php:112
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr "Dateien werden gescannt, bitte warten."
-#: templates/index.php:115
+#: templates/index.php:110
msgid "Current scanning"
msgstr "Scanne"
-#: templates/part.list.php:74
-msgid "directory"
-msgstr "Verzeichnis"
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr "Verzeichnisse"
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr "Datei"
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr "Dateien"
-
#: templates/upgrade.php:2
msgid "Upgrading filesystem cache..."
msgstr "Dateisystem-Cache wird aktualisiert ..."
diff --git a/l10n/de_CH/files_sharing.po b/l10n/de_CH/files_sharing.po
index 95b2c5d60fca6420185610df978f727a390c7401..8616c16eb645c54d4bac9be4fce641bf96b2d2b6 100644
--- a/l10n/de_CH/files_sharing.po
+++ b/l10n/de_CH/files_sharing.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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:01+0000\n"
"Last-Translator: FlorianScholz <work@bgstyle.de>\n"
"Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n"
"MIME-Version: 1.0\n"
@@ -66,7 +66,7 @@ msgstr "%s hat den Ordner %s mit Ihnen geteilt"
msgid "%s shared the file %s with you"
msgstr "%s hat die Datei %s mit Ihnen geteilt"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "Herunterladen"
@@ -78,6 +78,6 @@ msgstr "Hochladen"
msgid "Cancel upload"
msgstr "Upload abbrechen"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "Es ist keine Vorschau verfügbar für"
diff --git a/l10n/de_CH/lib.po b/l10n/de_CH/lib.po
index 11d2f26f5a497f193b48659156954ce7c5fa618b..ff7512d924018515c8a78becd42b3c613ba536ee 100644
--- a/l10n/de_CH/lib.po
+++ b/l10n/de_CH/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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 06:30+0000\n"
-"Last-Translator: FlorianScholz <work@bgstyle.de>\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"
"Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -52,11 +52,23 @@ msgstr "Benutzer"
msgid "Admin"
msgstr "Administrator"
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "Konnte \"%s\" nicht aktualisieren."
+#: 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 "Web-Services unter Ihrer Kontrolle"
@@ -109,37 +121,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr "Anwendung kann wegen nicht erlaubten Codes nicht installiert werden"
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: 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:150
+#: 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:160
+#: installer.php:162
msgid "App directory already exists"
msgstr "Anwendungsverzeichnis existiert bereits"
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -268,51 +280,51 @@ msgstr "Ihr Web-Server ist noch nicht für eine Datei-Synchronisation konfigurie
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Bitte prüfen Sie die <a href='%s'>Installationsanleitungen</a>."
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "Gerade eben"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] "Vor %n Minuten"
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] "Vor %n Stunden"
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "Heute"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "Gestern"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] "Vor %n Tagen"
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "Letzten Monat"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] "Vor %n Monaten"
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "Letztes Jahr"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "Vor Jahren"
diff --git a/l10n/de_CH/settings.po b/l10n/de_CH/settings.po
index 5e184ab89b919653e459cda0417b8abcc5a512e3..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,9 +16,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 06:30+0000\n"
-"Last-Translator: FlorianScholz <work@bgstyle.de>\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"
"Content-Type: text/plain; charset=UTF-8\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,55 +93,88 @@ msgstr "Der Benutzer konnte nicht aus der Gruppe %s entfernt werden"
msgid "Couldn't update app."
msgstr "Die App konnte nicht aktualisiert werden."
-#: js/apps.js:35
+#: 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}"
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr "Deaktivieren"
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr "Aktivieren"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr "Bitte warten...."
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr "Fehler während der Deaktivierung der Anwendung"
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr "Fehler während der Aktivierung der Anwendung"
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr "Update..."
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr "Es ist ein Fehler während des Updates aufgetreten"
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "Fehler"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr "Update durchführen"
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr "Aktualisiert"
-#: js/personal.js:150
+#: 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 "Entschlüssel Dateien ... Bitte warten Sie, denn dieser Vorgang kann einige Zeit beanspruchen."
-#: js/personal.js:172
+#: js/personal.js:287
msgid "Saving..."
msgstr "Speichern..."
@@ -156,16 +190,16 @@ msgstr "rückgängig machen"
msgid "Unable to remove user"
msgstr "Der Benutzer konnte nicht entfernt werden."
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "Gruppen"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "Gruppenadministrator"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "Löschen"
@@ -185,9 +219,9 @@ msgstr "Beim Erstellen des Benutzers ist ein Fehler aufgetreten"
msgid "A valid password must be provided"
msgstr "Es muss ein gültiges Passwort angegeben werden"
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
-msgstr "Deutsch (Förmlich: Sie)"
+msgstr "Deutsch (Schweiz)"
#: templates/admin.php:15
msgid "Security Warning"
@@ -351,11 +385,11 @@ msgstr "Mehr"
msgid "Less"
msgstr "Weniger"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "Version"
-#: templates/admin.php:246 templates/personal.php:143
+#: 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 "
@@ -422,7 +456,7 @@ msgstr "Den Einrichtungsassistenten erneut anzeigen"
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Sie verwenden <strong>%s</strong> der verfügbaren <strong>%s</strong>"
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "Passwort"
@@ -446,7 +480,7 @@ msgstr "Neues Passwort"
msgid "Change password"
msgstr "Passwort ändern"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr "Anzeigename"
@@ -462,38 +496,66 @@ msgstr "Ihre E-Mail-Adresse"
msgid "Fill in an email address to enable password recovery"
msgstr "Bitte tragen Sie eine E-Mail-Adresse ein, um die Passwort-Wiederherstellung zu aktivieren."
-#: templates/personal.php:85 templates/personal.php:86
+#: 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 "Sprache"
-#: templates/personal.php:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "Helfen Sie bei der Übersetzung"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: 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 "Verwenden Sie diese Adresse, um <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">auf ihre Dateien per WebDAV zuzugreifen</a>."
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "Verschlüsselung"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr "Die Anwendung zur Verschlüsselung ist nicht länger aktiv, all Ihre Dateien werden entschlüsselt. "
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr "Login-Passwort"
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr "Alle Dateien entschlüsseln"
@@ -519,30 +581,30 @@ msgstr "Geben Sie das Wiederherstellungspasswort ein, um die Benutzerdateien wä
msgid "Default Storage"
msgstr "Standard-Speicher"
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr "Unbegrenzt"
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "Andere"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "Benutzername"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr "Speicher"
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr "Anzeigenamen ändern"
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr "Neues Passwort setzen"
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr "Standard"
diff --git a/l10n/de_CH/user_ldap.po b/l10n/de_CH/user_ldap.po
index 0267d804b6fe8c6d1c5ec8b2b726db3827ce9dd9..04763d8c636bded0e66be510ca4637c08621f27c 100644
--- a/l10n/de_CH/user_ldap.po
+++ b/l10n/de_CH/user_ldap.po
@@ -15,8 +15,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 06:30+0000\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-05 11:51+0000\n"
"Last-Translator: FlorianScholz <work@bgstyle.de>\n"
"Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/de_DE/core.po b/l10n/de_DE/core.po
index ebd32decb87ae24794f7c14958ecc97b010fc57c..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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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"
@@ -30,30 +30,34 @@ msgstr ""
msgid "%s shared »%s« with you"
msgstr "%s geteilt »%s« mit Ihnen"
+#: ajax/share.php:227
+msgid "group"
+msgstr "Gruppe"
+
#: ajax/update.php:11
msgid "Turned on maintenance mode"
-msgstr ""
+msgstr "Wartungsmodus eingeschaltet "
#: ajax/update.php:14
msgid "Turned off maintenance mode"
-msgstr ""
+msgstr "Wartungsmodus ausgeschaltet"
#: ajax/update.php:17
msgid "Updated database"
-msgstr ""
+msgstr "Datenbank aktualisiert"
#: ajax/update.php:20
msgid "Updating filecache, this may take really long..."
-msgstr ""
+msgstr "Aktualisiere Dateicache, dies könnte eine Weile dauern..."
#: ajax/update.php:23
msgid "Updated filecache"
-msgstr ""
+msgstr "Dateicache aktualisiert"
#: ajax/update.php:26
#, php-format
msgid "... %d%% done ..."
-msgstr ""
+msgstr "... %d%% erledigt ..."
#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
msgid "Category type not provided."
@@ -94,6 +98,26 @@ msgstr "Es wurden keine Kategorien zum Löschen ausgewählt."
msgid "Error removing %s from favorites."
msgstr "Fehler beim Entfernen von %s von den Favoriten."
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr "Kein Bild oder Datei zur Verfügung gestellt"
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr "Unbekannter Dateityp"
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr "Ungültiges Bild"
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr "Kein temporäres Profilbild verfügbar, bitte versuchen Sie es nochmal"
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr "Keine Zuschnittdaten zur Verfügung gestellt"
+
#: js/config.php:32
msgid "Sunday"
msgstr "Sonntag"
@@ -170,59 +194,59 @@ msgstr "November"
msgid "December"
msgstr "Dezember"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "Einstellungen"
-#: js/js.js:812
+#: js/js.js:866
msgid "seconds ago"
msgstr "Gerade eben"
-#: js/js.js:813
+#: 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:814
+#: 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:815
+#: js/js.js:869
msgid "today"
msgstr "Heute"
-#: js/js.js:816
+#: js/js.js:870
msgid "yesterday"
msgstr "Gestern"
-#: js/js.js:817
+#: 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:818
+#: js/js.js:872
msgid "last month"
msgstr "Letzten Monat"
-#: js/js.js:819
+#: 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:820
+#: js/js.js:874
msgid "months ago"
msgstr "Vor Monaten"
-#: js/js.js:821
+#: js/js.js:875
msgid "last year"
msgstr "Letztes Jahr"
-#: js/js.js:822
+#: js/js.js:876
msgid "years ago"
msgstr "Vor Jahren"
@@ -230,22 +254,66 @@ msgstr "Vor Jahren"
msgid "Choose"
msgstr "Auswählen"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
-msgstr "Es ist ein Fehler in der Vorlage des Datei-Auswählers aufgetreten."
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
+msgstr "Fehler beim Laden der Dateiauswahlvorlage: {error}"
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "Ja"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "Nein"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr "OK"
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+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
msgid "The object type is not specified."
@@ -255,7 +323,7 @@ msgstr "Der Objekttyp ist nicht angegeben."
#: 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:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "Fehler"
@@ -275,7 +343,7 @@ msgstr "Geteilt"
msgid "Share"
msgstr "Teilen"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr "Fehler beim Teilen"
@@ -331,67 +399,67 @@ msgstr "Ein Ablaufdatum setzen"
msgid "Expiration date"
msgstr "Ablaufdatum"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "Mittels einer E-Mail teilen:"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "Niemand gefunden"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "Das Weiterverteilen ist nicht erlaubt"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr "Freigegeben in {item} von {user}"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "Freigabe aufheben"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "kann bearbeiten"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "Zugriffskontrolle"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "erstellen"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "aktualisieren"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "löschen"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "teilen"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "Passwortgeschützt"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr "Fehler beim Entfernen des Ablaufdatums"
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr "Fehler beim Setzen des Ablaufdatums"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr "Sende ..."
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr "Email gesendet"
@@ -406,7 +474,7 @@ msgstr "Das Update ist fehlgeschlagen. Bitte melden Sie dieses Problem an die <a
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Das Update war erfolgreich. Sie werden nun zu ownCloud weitergeleitet."
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr "%s-Passwort zurücksetzen"
@@ -475,7 +543,7 @@ msgstr "Persönlich"
msgid "Users"
msgstr "Benutzer"
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "Apps"
@@ -604,14 +672,10 @@ msgstr "Installation abschließen"
msgid "%s is available. Get more information on how to update."
msgstr "%s ist verfügbar. Holen Sie weitere Informationen zu Aktualisierungen ein."
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "Abmelden"
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr "Mehr Apps"
-
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "Automatische Anmeldung verweigert!"
@@ -626,19 +690,19 @@ msgstr "Wenn Sie Ihr Passwort nicht vor kurzem geändert haben, könnte Ihr\nAcc
msgid "Please change your password to secure your account again."
msgstr "Bitte ändern Sie Ihr Passwort, um Ihr Konto wieder zu sichern."
-#: templates/login.php:34
+#: templates/login.php:32
msgid "Lost your password?"
msgstr "Passwort vergessen?"
-#: templates/login.php:39
+#: templates/login.php:37
msgid "remember"
msgstr "merken"
-#: templates/login.php:41
+#: templates/login.php:39
msgid "Log in"
msgstr "Einloggen"
-#: templates/login.php:47
+#: templates/login.php:45
msgid "Alternative Logins"
msgstr "Alternative Logins"
diff --git a/l10n/de_DE/files.po b/l10n/de_DE/files.po
index 03c2d0b576ce567263e939368692433be851be13..ce852eb583f656cf5e097b31239fa1e82a247c53 100644
--- a/l10n/de_DE/files.po
+++ b/l10n/de_DE/files.po
@@ -7,6 +7,7 @@
# SteinQuadrat, 2013
# I Robot <owncloud-bot@tmit.eu>, 2013
# Marcel Kühlhorn <susefan93@gmx.de>, 2013
+# Mario Siegmann <mario_siegmann@web.de>, 2013
# traductor <transifex-2.7.mensaje@spamgourmet.com>, 2013
# noxin <transifex.com@davidmainzer.com>, 2013
# Mirodin <blobbyjj@ymail.com>, 2013
@@ -15,9 +16,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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 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"
@@ -82,157 +83,173 @@ msgstr "Fehler beim Schreiben auf die Festplatte"
msgid "Not enough storage available"
msgstr "Nicht genug Speicher vorhanden."
-#: ajax/upload.php:123
+#: 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: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:167
+#: 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:241
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr "Die URL darf nicht leer sein."
-#: 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 "Ungültiger Ordnername. Die Verwendung von \"Shared\" ist ownCloud vorbehalten."
-#: js/file-upload.js:277 js/file-upload.js:293 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 "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:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "Ausstehend"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{new_name} existiert bereits"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "ersetzen"
-#: js/filelist.js:303
+#: js/filelist.js:416
msgid "suggest name"
msgstr "Namen vorschlagen"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "abbrechen"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr "{old_name} wurde ersetzt durch {new_name}"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "undo"
msgstr "rückgängig machen"
-#: js/filelist.js:453
+#: 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: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:541
+msgid "{dirs} and {files}"
+msgstr "{dirs} und {files}"
+
+#: 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:518
-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:562 templates/index.php:67
+#: 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:563 templates/index.php:78
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "Größe"
-#: js/files.js:564 templates/index.php:80
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr "Geändert"
-#: js/files.js:580
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] "%n Ordner"
-msgstr[1] "%n Ordner"
-
-#: js/files.js:586
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] "%n Datei"
-msgstr[1] "%n Dateien"
-
#: lib/app.php:73
#, php-format
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"
@@ -268,84 +285,68 @@ 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:73
+#: templates/index.php:67
msgid "Download"
msgstr "Herunterladen"
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr "Freigabe aufheben"
-#: templates/index.php:91 templates/index.php:92
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "Löschen"
-#: templates/index.php:105
+#: templates/index.php:100
msgid "Upload too large"
msgstr "Der Upload ist zu groß"
-#: 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 "Die Datei überschreitet die Maximalgröße für Uploads auf diesem Server."
-#: templates/index.php:112
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr "Dateien werden gescannt, bitte warten."
-#: templates/index.php:115
+#: templates/index.php:110
msgid "Current scanning"
msgstr "Scanne"
-#: templates/part.list.php:74
-msgid "directory"
-msgstr "Verzeichnis"
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr "Verzeichnisse"
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr "Datei"
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr "Dateien"
-
#: templates/upgrade.php:2
msgid "Upgrading filesystem cache..."
msgstr "Dateisystem-Cache wird aktualisiert ..."
diff --git a/l10n/de_DE/files_sharing.po b/l10n/de_DE/files_sharing.po
index 51ed893dda77f62e4b070f866ff166dc6e8c7078..efed1ad727abc30ef95b3a79a74f661965b1083c 100644
--- a/l10n/de_DE/files_sharing.po
+++ b/l10n/de_DE/files_sharing.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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:01+0000\n"
"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
"Language-Team: German (Germany) <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
@@ -65,7 +65,7 @@ msgstr "%s hat den Ordner %s mit Ihnen geteilt"
msgid "%s shared the file %s with you"
msgstr "%s hat die Datei %s mit Ihnen geteilt"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "Herunterladen"
@@ -77,6 +77,6 @@ msgstr "Hochladen"
msgid "Cancel upload"
msgstr "Upload abbrechen"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "Es ist keine Vorschau verfügbar für"
diff --git a/l10n/de_DE/lib.po b/l10n/de_DE/lib.po
index 567fcc9a526630fed4367414851518d5b13fd156..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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 12:00+0000\n"
-"Last-Translator: traductor <transifex-2.7.mensaje@spamgourmet.com>\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"
@@ -25,11 +25,11 @@ msgstr ""
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
-msgstr ""
+msgstr "Applikation \"%s\" kann nicht installiert werden, da sie mit dieser ownCloud Version nicht kompatibel ist."
#: app.php:250
msgid "No app name specified"
-msgstr ""
+msgstr "Es wurde kein Applikation-Name angegeben"
#: app.php:361
msgid "Help"
@@ -51,11 +51,23 @@ msgstr "Benutzer"
msgid "Admin"
msgstr "Administrator"
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "Konnte \"%s\" nicht aktualisieren."
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr "Individuelle Profilbilder werden noch nicht von der Verschlüsselung unterstützt"
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr "Unbekannter Dateityp"
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr "Ungültiges Bild"
+
#: defaults.php:35
msgid "web services under your control"
msgstr "Web-Services unter Ihrer Kontrolle"
@@ -89,15 +101,15 @@ msgstr "Laden Sie die Dateien in kleineren, separaten, Stücken herunter oder bi
#: installer.php:63
msgid "No source specified when installing app"
-msgstr ""
+msgstr "Für die Installation der Applikation wurde keine Quelle angegeben"
#: installer.php:70
msgid "No href specified when installing app from http"
-msgstr ""
+msgstr "Der Link (href) wurde nicht angegeben um die Applikation per http zu installieren"
#: installer.php:75
msgid "No path specified when installing app from local file"
-msgstr ""
+msgstr "Bei der Installation der Applikation aus einer lokalen Datei wurde kein Pfad angegeben"
#: installer.php:89
#, php-format
@@ -106,39 +118,39 @@ msgstr "Archive des Typs %s werden nicht unterstützt."
#: installer.php:103
msgid "Failed to open archive when installing app"
-msgstr ""
+msgstr "Das Archiv konnte bei der Installation der Applikation nicht geöffnet werden"
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
-msgstr ""
+msgstr "Die Applikation enthält keine info,xml Datei"
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
-msgstr ""
+msgstr "Die Applikation kann auf Grund von unerlaubten Code nicht installiert werden"
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr "Die Anwendung konnte nicht installiert werden, weil Sie nicht mit dieser Version von ownCloud kompatibel ist."
-#: installer.php:144
+#: 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 "Die Applikation konnte nicht installiert werden, da diese das <shipped>true</shipped> Tag beinhaltet und dieses, bei nicht mitausgelieferten Applikationen, nicht erlaubt ist ist"
-#: installer.php:150
+#: 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 "Die Applikation konnte nicht installiert werden, da die Version in der info.xml nicht die gleiche Version wie im App-Store ist"
-#: installer.php:160
+#: installer.php:162
msgid "App directory already exists"
msgstr "Der Ordner für die Anwendung existiert bereits."
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr "Der Ordner für die Anwendung konnte nicht angelegt werden. Bitte überprüfen Sie die Ordner- und Dateirechte und passen Sie diese entsprechend an. %s"
@@ -267,51 +279,51 @@ msgstr "Ihr Web-Server ist noch nicht für eine Datei-Synchronisation konfigurie
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Bitte prüfen Sie die <a href='%s'>Installationsanleitungen</a>."
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "Gerade eben"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "Vor %n Minute"
msgstr[1] "Vor %n Minuten"
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "Vor %n Stunde"
msgstr[1] "Vor %n Stunden"
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "Heute"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "Gestern"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] "Vor %n Tag"
msgstr[1] "Vor %n Tagen"
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "Letzten Monat"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "Vor %n Monat"
msgstr[1] "Vor %n Monaten"
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "Letztes Jahr"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "Vor Jahren"
diff --git a/l10n/de_DE/settings.po b/l10n/de_DE/settings.po
index 0eb0623b9f79518fc508f5d9650a909359af476b..3a889bcbca6b35a5b76cd3dc715e1bb33f8f1b73 100644
--- a/l10n/de_DE/settings.po
+++ b/l10n/de_DE/settings.po
@@ -14,9 +14,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 12:00+0000\n"
-"Last-Translator: traductor <transifex-2.7.mensaje@spamgourmet.com>\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"
"Content-Type: text/plain; charset=UTF-8\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,55 +91,88 @@ msgstr "Der Benutzer konnte nicht aus der Gruppe %s entfernt werden"
msgid "Couldn't update app."
msgstr "Die App konnte nicht aktualisiert werden."
-#: js/apps.js:35
+#: 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}"
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr "Deaktivieren"
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr "Aktivieren"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr "Bitte warten...."
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
-msgstr "Beim deaktivieren der Applikation ist ein Fehler aufgetreten."
+msgstr "Beim Deaktivieren der Applikation ist ein Fehler aufgetreten"
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
-msgstr "Beim aktivieren der Applikation ist ein Fehler aufgetreten."
+msgstr "Beim Aktivieren der Applikation ist ein Fehler aufgetreten"
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr "Update..."
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr "Es ist ein Fehler während des Updates aufgetreten"
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "Fehler"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr "Update durchführen"
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr "Aktualisiert"
-#: js/personal.js:150
+#: js/personal.js:220
+msgid "Select a profile picture"
+msgstr "Wählen Sie ein Profilbild"
+
+#: 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:172
+#: js/personal.js:287
msgid "Saving..."
msgstr "Speichern..."
@@ -155,16 +188,16 @@ msgstr "rückgängig machen"
msgid "Unable to remove user"
msgstr "Der Benutzer konnte nicht entfernt werden."
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "Gruppen"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "Gruppenadministrator"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "Löschen"
@@ -184,7 +217,7 @@ msgstr "Beim Erstellen des Benutzers ist ein Fehler aufgetreten"
msgid "A valid password must be provided"
msgstr "Es muss ein gültiges Passwort angegeben werden"
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "Deutsch (Förmlich: Sie)"
@@ -350,11 +383,11 @@ msgstr "Mehr"
msgid "Less"
msgstr "Weniger"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "Version"
-#: templates/admin.php:246 templates/personal.php:143
+#: 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 "
@@ -421,7 +454,7 @@ msgstr "Den Einrichtungsassistenten erneut anzeigen"
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Sie verwenden <strong>%s</strong> der verfügbaren <strong>%s</strong>"
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "Passwort"
@@ -445,7 +478,7 @@ msgstr "Neues Passwort"
msgid "Change password"
msgstr "Passwort ändern"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr "Anzeigename"
@@ -461,38 +494,66 @@ msgstr "Ihre E-Mail-Adresse"
msgid "Fill in an email address to enable password recovery"
msgstr "Bitte tragen Sie eine E-Mail-Adresse ein, um die Passwort-Wiederherstellung zu aktivieren."
-#: templates/personal.php:85 templates/personal.php:86
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr "Profilbild"
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr "Neues hochladen"
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr "Neues aus den Dateien wählen"
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr "Bild entfernen"
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr "Entweder PNG oder JPG. Im Idealfall quadratisch, aber Sie können es zuschneiden."
+
+#: templates/personal.php:97
+msgid "Abort"
+msgstr "Abbrechen"
+
+#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr "Als Profilbild wählen"
+
+#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
msgstr "Sprache"
-#: templates/personal.php:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "Helfen Sie bei der Übersetzung"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: 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 "Verwenden Sie diese Adresse, um <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">auf ihre Dateien per WebDAV zuzugreifen</a>."
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "Verschlüsselung"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr "Die Anwendung zur Verschlüsselung ist nicht länger aktiv, all Ihre Dateien werden entschlüsselt. "
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr "Login-Passwort"
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr "Alle Dateien entschlüsseln"
@@ -518,30 +579,30 @@ msgstr "Geben Sie das Wiederherstellungspasswort ein, um die Benutzerdateien wä
msgid "Default Storage"
msgstr "Standard-Speicher"
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr "Unbegrenzt"
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "Andere"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "Benutzername"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr "Speicher"
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr "Anzeigenamen ändern"
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr "Neues Passwort setzen"
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr "Standard"
diff --git a/l10n/de_DE/user_ldap.po b/l10n/de_DE/user_ldap.po
index aa03bac5ff2fd819736fe5769cd7024112bdbad5..09f58790782a203fe77bc5501e82fe882d22efa6 100644
--- a/l10n/de_DE/user_ldap.po
+++ b/l10n/de_DE/user_ldap.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-08-21 08:11-0400\n"
-"PO-Revision-Date: 2013-08-20 07:00+0000\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-05 11:51+0000\n"
"Last-Translator: noxin <transifex.com@davidmainzer.com>\n"
"Language-Team: German (Germany) <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/el/core.po b/l10n/el/core.po
index 1d48f92c642d895ed5e3fd2f10ff08abc2aae557..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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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"
@@ -29,6 +29,10 @@ msgstr ""
msgid "%s shared »%s« with you"
msgstr "Ο %s διαμοιράστηκε μαζί σας το »%s«"
+#: ajax/share.php:227
+msgid "group"
+msgstr "ομάδα"
+
#: ajax/update.php:11
msgid "Turned on maintenance mode"
msgstr ""
@@ -93,6 +97,26 @@ msgstr "Δεν επιλέχτηκαν κατηγορίες για διαγραφ
msgid "Error removing %s from favorites."
msgstr "Σφάλμα αφαίρεσης %s από τα αγαπημένα."
+#: 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 "Κυριακή"
@@ -169,59 +193,59 @@ msgstr "Νοέμβριος"
msgid "December"
msgstr "Δεκέμβριος"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "Ρυθμίσεις"
-#: js/js.js:812
+#: js/js.js:866
msgid "seconds ago"
msgstr "δευτερόλεπτα πριν"
-#: js/js.js:813
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:814
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:815
+#: js/js.js:869
msgid "today"
msgstr "σήμερα"
-#: js/js.js:816
+#: js/js.js:870
msgid "yesterday"
msgstr "χτες"
-#: js/js.js:817
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:818
+#: js/js.js:872
msgid "last month"
msgstr "τελευταίο μήνα"
-#: js/js.js:819
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:820
+#: js/js.js:874
msgid "months ago"
msgstr "μήνες πριν"
-#: js/js.js:821
+#: js/js.js:875
msgid "last year"
msgstr "τελευταίο χρόνο"
-#: js/js.js:822
+#: js/js.js:876
msgid "years ago"
msgstr "χρόνια πριν"
@@ -229,22 +253,66 @@ msgstr "χρόνια πριν"
msgid "Choose"
msgstr "Επιλέξτε"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
-msgstr "Σφάλμα φόρτωσης αρχείου επιλογέα προτύπου"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
+msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "Ναι"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "Όχι"
-#: js/oc-dialogs.js:195
+#: 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."
@@ -254,7 +322,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:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "Σφάλμα"
@@ -274,7 +342,7 @@ msgstr "Κοινόχρηστα"
msgid "Share"
msgstr "Διαμοιρασμός"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr "Σφάλμα κατά τον διαμοιρασμό"
@@ -330,67 +398,67 @@ msgstr "Ορισμός ημ. λήξης"
msgid "Expiration date"
msgstr "Ημερομηνία λήξης"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "Διαμοιρασμός μέσω email:"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "Δεν βρέθηκε άνθρωπος"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "Ξαναμοιρασμός δεν επιτρέπεται"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr "Διαμοιρασμός του {item} με τον {user}"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "Σταμάτημα διαμοιρασμού"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "δυνατότητα αλλαγής"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "έλεγχος πρόσβασης"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "δημιουργία"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "ενημέρωση"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "διαγραφή"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "διαμοιρασμός"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "Προστασία με συνθηματικό"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr "Σφάλμα κατά την διαγραφή της ημ. λήξης"
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr "Σφάλμα κατά τον ορισμό ημ. λήξης"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr "Αποστολή..."
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr "Το Email απεστάλη "
@@ -405,7 +473,7 @@ msgstr "Η ενημέρωση ήταν ανεπιτυχής. Παρακαλώ σ
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Η ενημέρωση ήταν επιτυχής. Μετάβαση στο ownCloud."
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr ""
@@ -474,7 +542,7 @@ msgstr "Προσωπικά"
msgid "Users"
msgstr "Χρήστες"
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "Εφαρμογές"
@@ -603,14 +671,10 @@ msgstr "Ολοκλήρωση εγκατάστασης"
msgid "%s is available. Get more information on how to update."
msgstr "%s είναι διαθέσιμη. Δείτε περισσότερες πληροφορίες στο πώς να αναβαθμίσετε."
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "Αποσύνδεση"
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "Απορρίφθηκε η αυτόματη σύνδεση!"
@@ -625,19 +689,19 @@ msgstr "Εάν δεν αλλάξατε το συνθηματικό σας προ
msgid "Please change your password to secure your account again."
msgstr "Παρακαλώ αλλάξτε το συνθηματικό σας για να ασφαλίσετε πάλι τον λογαριασμό σας."
-#: templates/login.php:34
+#: templates/login.php:32
msgid "Lost your password?"
msgstr "Ξεχάσατε το συνθηματικό σας;"
-#: templates/login.php:39
+#: templates/login.php:37
msgid "remember"
msgstr "απομνημόνευση"
-#: templates/login.php:41
+#: templates/login.php:39
msgid "Log in"
msgstr "Είσοδος"
-#: templates/login.php:47
+#: templates/login.php:45
msgid "Alternative Logins"
msgstr "Εναλλακτικές Συνδέσεις"
diff --git a/l10n/el/files.po b/l10n/el/files.po
index 2ae026cfed02ebac4964706f7fd07f742b0d2a52..87c112acc670ac2b71e8c37587c4b0dcf5632a37 100644
--- a/l10n/el/files.po
+++ b/l10n/el/files.po
@@ -5,13 +5,15 @@
# Translators:
# Efstathios Iosifidis <iefstathios@gmail.com>, 2013
# Efstathios Iosifidis <iosifidis@opensuse.org>, 2013
+# gtsamis <gtsamis@yahoo.com>, 2013
+# frerisp <petrosfreris@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-27 00:01-0400\n"
+"PO-Revision-Date: 2013-09-25 12:10+0000\n"
+"Last-Translator: gtsamis <gtsamis@yahoo.com>\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -76,157 +78,173 @@ msgstr "Αποτυχία εγγραφής στο δίσκο"
msgid "Not enough storage available"
msgstr "Μη επαρκής διαθέσιμος αποθηκευτικός χώρος"
-#: ajax/upload.php:123
+#: 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
+#: 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 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: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 "Η URL δεν μπορεί να είναι κενή."
-#: 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 "Μη έγκυρο όνομα φακέλου. Η χρήση του 'Κοινόχρηστος' χρησιμοποιείται από το ownCloud"
-#: js/file-upload.js:277 js/file-upload.js:293 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:465
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "Εκκρεμεί"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{new_name} υπάρχει ήδη"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "αντικατέστησε"
-#: js/filelist.js:303
+#: js/filelist.js:416
msgid "suggest name"
msgstr "συνιστώμενο όνομα"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "ακύρωση"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr "αντικαταστάθηκε το {new_name} με {old_name}"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "undo"
msgstr "αναίρεση"
-#: js/filelist.js:453
+#: 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: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: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] ""
+msgstr[0] "Ανέβασμα %n αρχείου"
+msgstr[1] "Ανέβασμα %n αρχείων"
-#: js/filelist.js:518
-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: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 "Τροποποιήθηκε"
-#: js/files.js:580
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/files.js:586
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-
#: lib/app.php:73
#, php-format
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 "Μεταφόρτωση"
@@ -262,84 +280,68 @@ 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: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 "Τρέχουσα ανίχνευση"
-#: templates/part.list.php:74
-msgid "directory"
-msgstr "κατάλογος"
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr "κατάλογοι"
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr "αρχείο"
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr "αρχεία"
-
#: templates/upgrade.php:2
msgid "Upgrading filesystem cache..."
msgstr "Ενημέρωση της μνήμης cache του συστήματος αρχείων..."
diff --git a/l10n/el/files_sharing.po b/l10n/el/files_sharing.po
index 79341a4119386f9e457e3db7dda9dd574acea01c..7185b97f8542ceb6aad14ab2682e3293494bb011 100644
--- a/l10n/el/files_sharing.po
+++ b/l10n/el/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:01+0000\n"
"Last-Translator: Efstathios Iosifidis <iefstathios@gmail.com>\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
@@ -64,7 +64,7 @@ msgstr "%s μοιράστηκε τον φάκελο %s μαζί σας"
msgid "%s shared the file %s with you"
msgstr "%s μοιράστηκε το αρχείο %s μαζί σας"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "Λήψη"
@@ -76,6 +76,6 @@ msgstr "Μεταφόρτωση"
msgid "Cancel upload"
msgstr "Ακύρωση αποστολής"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "Δεν υπάρχει διαθέσιμη προεπισκόπηση για"
diff --git a/l10n/el/files_trashbin.po b/l10n/el/files_trashbin.po
index 9419e249a1fb5b6145bf3667cdbd4d3a3300965b..d1043567c1beb64b0882c18823622f558407997c 100644
--- a/l10n/el/files_trashbin.po
+++ b/l10n/el/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-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-08-30 09:32-0400\n"
+"PO-Revision-Date: 2013-08-30 09:00+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,43 +28,43 @@ msgstr "Αδύνατη η μόνιμη διαγραφή του %s"
msgid "Couldn't restore %s"
msgstr "Αδυναμία επαναφοράς %s"
-#: 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 "Σφάλμα"
-#: 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:184 templates/index.php:17
msgid "Name"
msgstr "Όνομα"
-#: js/trash.js:183 templates/index.php:27
+#: js/trash.js:185 templates/index.php:27
msgid "Deleted"
msgstr "Διαγράφηκε"
-#: js/trash.js:191
+#: js/trash.js:193
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
-msgstr[1] ""
+msgstr[1] "%n φάκελοι"
-#: js/trash.js:197
+#: js/trash.js:199
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
-msgstr[1] ""
+msgstr[1] "%n αρχεία"
-#: lib/trash.php:819 lib/trash.php:821
+#: lib/trash.php:814 lib/trash.php:816
msgid "restored"
msgstr "έγινε επαναφορά"
diff --git a/l10n/el/lib.po b/l10n/el/lib.po
index 5ef86707792afaaeda3ece1451a3e9c7191896cf..e26684eae7f872e552140a81709ea9b08c38a449 100644
--- a/l10n/el/lib.po
+++ b/l10n/el/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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\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"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
@@ -49,11 +49,23 @@ msgstr "Χρήστες"
msgid "Admin"
msgstr "Διαχειριστής"
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "Αποτυχία αναβάθμισης του \"%s\"."
+#: 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 "υπηρεσίες δικτύου υπό τον έλεγχό σας"
@@ -106,37 +118,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: 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:150
+#: 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:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -265,51 +277,51 @@ msgstr "Ο διακομιστής σας δεν έχει ρυθμιστεί κα
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Ελέγξτε ξανά τις <a href='%s'>οδηγίες εγκατάστασης</a>."
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "δευτερόλεπτα πριν"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "σήμερα"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "χτες"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "τελευταίο μήνα"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "τελευταίο χρόνο"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "χρόνια πριν"
diff --git a/l10n/el/settings.po b/l10n/el/settings.po
index c8580902be2c220bce9ccd79c68dc0f407a161b1..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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+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,55 +90,88 @@ msgstr "Αδυναμία αφαίρεσης χρήστη από την ομάδ
msgid "Couldn't update app."
msgstr "Αδυναμία ενημέρωσης εφαρμογής"
-#: js/apps.js:35
+#: 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}"
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr "Απενεργοποίηση"
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr "Ενεργοποίηση"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr "Παρακαλώ περιμένετε..."
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr "Ενημέρωση..."
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr "Σφάλμα κατά την ενημέρωση της εφαρμογής"
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "Σφάλμα"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr "Ενημέρωση"
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr "Ενημερώθηκε"
-#: js/personal.js:150
+#: 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:172
+#: js/personal.js:287
msgid "Saving..."
msgstr "Γίνεται αποθήκευση..."
@@ -154,16 +187,16 @@ msgstr "αναίρεση"
msgid "Unable to remove user"
msgstr "Αδυναμία αφαίρεση χρήστη"
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: 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:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "Ομάδα Διαχειριστών"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "Διαγραφή"
@@ -183,7 +216,7 @@ msgstr "Σφάλμα δημιουργίας χρήστη"
msgid "A valid password must be provided"
msgstr "Πρέπει να δοθεί έγκυρο συνθηματικό"
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "__όνομα_γλώσσας__"
@@ -349,11 +382,11 @@ msgstr "Περισσότερα"
msgid "Less"
msgstr "Λιγότερα"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "Έκδοση"
-#: templates/admin.php:246 templates/personal.php:143
+#: 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 "
@@ -420,7 +453,7 @@ msgstr "Προβολή Πρώτης Εκτέλεσης Οδηγού πάλι"
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Χρησιμοποιήσατε <strong>%s</strong> από διαθέσιμα <strong>%s</strong>"
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "Συνθηματικό"
@@ -444,7 +477,7 @@ msgstr "Νέο συνθηματικό"
msgid "Change password"
msgstr "Αλλαγή συνθηματικού"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr "Όνομα εμφάνισης"
@@ -460,38 +493,66 @@ msgstr "Η διεύθυνση ηλεκτρονικού ταχυδρομείου
msgid "Fill in an email address to enable password recovery"
msgstr "Συμπληρώστε μια διεύθυνση ηλεκτρονικού ταχυδρομείου για να ενεργοποιηθεί η ανάκτηση συνθηματικού"
-#: templates/personal.php:85 templates/personal.php:86
+#: 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:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "Βοηθήστε στη μετάφραση"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: 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 "Χρήση αυτής της διεύθυνσης για <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">πρόσβαση των αρχείων σας μέσω WebDAV</a>"
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "Κρυπτογράφηση"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -517,30 +578,30 @@ msgstr "Εισάγετε το συνθηματικό ανάκτησης ώστε
msgid "Default Storage"
msgstr "Προκαθορισμένη Αποθήκευση "
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr "Απεριόριστο"
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "Άλλο"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "Όνομα χρήστη"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr "Αποθήκευση"
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr "αλλαγή ονόματος εμφάνισης"
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr "επιλογή νέου κωδικού"
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr "Προκαθορισμένο"
diff --git a/l10n/el/user_ldap.po b/l10n/el/user_ldap.po
index f01616c71f53bde8d14664033c8aa3e4b79cebcf..ac03107faae4a3c3fc8bacc3366299cc771cea22 100644
--- a/l10n/el/user_ldap.po
+++ b/l10n/el/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\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"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/en@pirate/core.po b/l10n/en@pirate/core.po
index f2ee458fc91f47926cdeed2923e97157828f5aa7..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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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"
@@ -23,6 +23,10 @@ msgstr ""
msgid "%s shared »%s« with you"
msgstr ""
+#: ajax/share.php:227
+msgid "group"
+msgstr ""
+
#: ajax/update.php:11
msgid "Turned on maintenance mode"
msgstr ""
@@ -87,6 +91,26 @@ msgstr ""
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 ""
@@ -163,59 +187,59 @@ msgstr ""
msgid "December"
msgstr ""
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr ""
-#: js/js.js:812
+#: js/js.js:866
msgid "seconds ago"
msgstr ""
-#: js/js.js:813
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:814
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:815
+#: js/js.js:869
msgid "today"
msgstr ""
-#: js/js.js:816
+#: js/js.js:870
msgid "yesterday"
msgstr ""
-#: js/js.js:817
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:818
+#: js/js.js:872
msgid "last month"
msgstr ""
-#: js/js.js:819
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:820
+#: js/js.js:874
msgid "months ago"
msgstr ""
-#: js/js.js:821
+#: js/js.js:875
msgid "last year"
msgstr ""
-#: js/js.js:822
+#: js/js.js:876
msgid "years ago"
msgstr ""
@@ -223,22 +247,66 @@ msgstr ""
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:195
+#: 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."
@@ -248,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:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr ""
@@ -268,7 +336,7 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr ""
@@ -324,67 +392,67 @@ msgstr ""
msgid "Expiration date"
msgstr ""
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr ""
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr ""
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr ""
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr ""
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr ""
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr ""
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr ""
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr ""
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr ""
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr ""
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr ""
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr ""
@@ -399,7 +467,7 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr ""
@@ -468,7 +536,7 @@ msgstr ""
msgid "Users"
msgstr ""
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr ""
@@ -597,14 +665,10 @@ msgstr ""
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr ""
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr ""
@@ -619,19 +683,19 @@ msgstr ""
msgid "Please change your password to secure your account again."
msgstr ""
-#: templates/login.php:34
+#: templates/login.php:32
msgid "Lost your password?"
msgstr ""
-#: templates/login.php:39
+#: templates/login.php:37
msgid "remember"
msgstr ""
-#: templates/login.php:41
+#: templates/login.php:39
msgid "Log in"
msgstr ""
-#: templates/login.php:47
+#: templates/login.php:45
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/en@pirate/files.po b/l10n/en@pirate/files.po
index c5bb03e57e355ef8727dc0d2b5e679649ef58802..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-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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,7 +74,15 @@ msgstr ""
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:123
+#: 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 ""
@@ -82,149 +90,157 @@ 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: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:277 js/file-upload.js:293 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:465
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr ""
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr ""
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr ""
-#: js/filelist.js:303
+#: js/filelist.js:416
msgid "suggest name"
msgstr ""
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr ""
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr ""
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "undo"
msgstr ""
-#: js/filelist.js:453
-msgid "Uploading %n file"
-msgid_plural "Uploading %n files"
+#: 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:518
-msgid "files uploading"
+#: 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/files.js:52
+#: 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: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 ""
-#: js/files.js:580
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/files.js:586
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-
#: lib/app.php:73
#, php-format
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 ""
@@ -260,84 +276,68 @@ 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 ""
-#: templates/part.list.php:74
-msgid "directory"
-msgstr ""
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr ""
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr ""
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr ""
-
#: templates/upgrade.php:2
msgid "Upgrading filesystem cache..."
msgstr ""
diff --git a/l10n/en@pirate/files_sharing.po b/l10n/en@pirate/files_sharing.po
index 35c76d3b04b57d57e3a02198a0dae15bbf64024a..4663eb69623970ef2a1c08a6cf50704fab201adb 100644
--- a/l10n/en@pirate/files_sharing.po
+++ b/l10n/en@pirate/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\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"
"Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
"MIME-Version: 1.0\n"
@@ -64,7 +64,7 @@ msgstr "%s shared the folder %s with you"
msgid "%s shared the file %s with you"
msgstr "%s shared the file %s with you"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "Download"
@@ -76,6 +76,6 @@ msgstr ""
msgid "Cancel upload"
msgstr ""
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "No preview available for"
diff --git a/l10n/en@pirate/lib.po b/l10n/en@pirate/lib.po
index 6cc0184b836f221c27d999d65f257beabb87b6b9..53ee952f6168d5de2c2bd7bc261c424a1dd811bf 100644
--- a/l10n/en@pirate/lib.po
+++ b/l10n/en@pirate/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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\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"
"Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
"MIME-Version: 1.0\n"
@@ -48,11 +48,23 @@ msgstr ""
msgid "Admin"
msgstr ""
-#: app.php:837
+#: 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 "web services under your control"
@@ -105,37 +117,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: 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:150
+#: 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:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -264,51 +276,51 @@ msgstr ""
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr ""
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr ""
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr ""
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr ""
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr ""
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr ""
diff --git a/l10n/en@pirate/settings.po b/l10n/en@pirate/settings.po
index 95bb346d1a15adeaa93461a4d9e6aeecb2be42b7..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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+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,55 +84,88 @@ msgstr ""
msgid "Couldn't update app."
msgstr ""
-#: js/apps.js:35
+#: 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:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr ""
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr ""
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr ""
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr ""
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr ""
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr ""
-#: js/personal.js:150
+#: 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:172
+#: js/personal.js:287
msgid "Saving..."
msgstr ""
@@ -148,16 +181,16 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: 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:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr ""
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr ""
@@ -177,7 +210,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr ""
@@ -343,11 +376,11 @@ msgstr ""
msgid "Less"
msgstr ""
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr ""
-#: templates/admin.php:246 templates/personal.php:143
+#: 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 "
@@ -414,7 +447,7 @@ msgstr ""
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:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "Passcode"
@@ -438,7 +471,7 @@ msgstr ""
msgid "Change password"
msgstr ""
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr ""
@@ -454,38 +487,66 @@ msgstr ""
msgid "Fill in an email address to enable password recovery"
msgstr ""
-#: templates/personal.php:85 templates/personal.php:86
-msgid "Language"
+#: 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:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:106
+#: 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:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr ""
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -511,30 +572,30 @@ msgstr ""
msgid "Default Storage"
msgstr ""
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr ""
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr ""
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr ""
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr ""
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr ""
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr ""
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr ""
diff --git a/l10n/en@pirate/user_ldap.po b/l10n/en@pirate/user_ldap.po
index 9c7f4649db75f997dd3e0cf28d1b31ed3aaf9a26..22391f10ba9c2d78534d6df9205a818211b69c09 100644
--- a/l10n/en@pirate/user_ldap.po
+++ b/l10n/en@pirate/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\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"
"Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/en_GB/core.po b/l10n/en_GB/core.po
new file mode 100644
index 0000000000000000000000000000000000000000..f9b0f0d24fa9aa0f3a1e0ab69e6dbb75dc985d50
--- /dev/null
+++ b/l10n/en_GB/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:
+# mnestis <transifex@mnestis.net>, 2013
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\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"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en_GB\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/share.php:97
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr "%s shared \"%s\" with you"
+
+#: ajax/share.php:227
+msgid "group"
+msgstr "group"
+
+#: ajax/update.php:11
+msgid "Turned on maintenance mode"
+msgstr "Turned on maintenance mode"
+
+#: ajax/update.php:14
+msgid "Turned off maintenance mode"
+msgstr "Turned off maintenance mode"
+
+#: ajax/update.php:17
+msgid "Updated database"
+msgstr "Updated database"
+
+#: ajax/update.php:20
+msgid "Updating filecache, this may take really long..."
+msgstr "Updating filecache, this may take a really long time..."
+
+#: ajax/update.php:23
+msgid "Updated filecache"
+msgstr "Updated filecache"
+
+#: ajax/update.php:26
+#, php-format
+msgid "... %d%% done ..."
+msgstr "... %d%% done ..."
+
+#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
+msgid "Category type not provided."
+msgstr "Category type not provided."
+
+#: ajax/vcategories/add.php:30
+msgid "No category to add?"
+msgstr "No category to add?"
+
+#: ajax/vcategories/add.php:37
+#, php-format
+msgid "This category already exists: %s"
+msgstr "This category already exists: %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 "Object type not provided."
+
+#: ajax/vcategories/addToFavorites.php:30
+#: ajax/vcategories/removeFromFavorites.php:30
+#, php-format
+msgid "%s ID not provided."
+msgstr "%s ID not provided."
+
+#: ajax/vcategories/addToFavorites.php:35
+#, php-format
+msgid "Error adding %s to favorites."
+msgstr "Error adding %s to favourites."
+
+#: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
+msgid "No categories selected for deletion."
+msgstr "No categories selected for deletion."
+
+#: ajax/vcategories/removeFromFavorites.php:35
+#, php-format
+msgid "Error removing %s from favorites."
+msgstr "Error removing %s from favourites."
+
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr "No image or file provided"
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr "Unknown filetype"
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr "Invalid image"
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr "No temporary profile picture available, try again"
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr "No crop data provided"
+
+#: js/config.php:32
+msgid "Sunday"
+msgstr "Sunday"
+
+#: js/config.php:33
+msgid "Monday"
+msgstr "Monday"
+
+#: js/config.php:34
+msgid "Tuesday"
+msgstr "Tuesday"
+
+#: js/config.php:35
+msgid "Wednesday"
+msgstr "Wednesday"
+
+#: js/config.php:36
+msgid "Thursday"
+msgstr "Thursday"
+
+#: js/config.php:37
+msgid "Friday"
+msgstr "Friday"
+
+#: js/config.php:38
+msgid "Saturday"
+msgstr "Saturday"
+
+#: js/config.php:43
+msgid "January"
+msgstr "January"
+
+#: js/config.php:44
+msgid "February"
+msgstr "February"
+
+#: js/config.php:45
+msgid "March"
+msgstr "March"
+
+#: js/config.php:46
+msgid "April"
+msgstr "April"
+
+#: js/config.php:47
+msgid "May"
+msgstr "May"
+
+#: js/config.php:48
+msgid "June"
+msgstr "June"
+
+#: js/config.php:49
+msgid "July"
+msgstr "July"
+
+#: js/config.php:50
+msgid "August"
+msgstr "August"
+
+#: js/config.php:51
+msgid "September"
+msgstr "September"
+
+#: js/config.php:52
+msgid "October"
+msgstr "October"
+
+#: js/config.php:53
+msgid "November"
+msgstr "November"
+
+#: js/config.php:54
+msgid "December"
+msgstr "December"
+
+#: js/js.js:387
+msgid "Settings"
+msgstr "Settings"
+
+#: js/js.js:866
+msgid "seconds ago"
+msgstr "seconds ago"
+
+#: 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:868
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] "%n hour ago"
+msgstr[1] "%n hours ago"
+
+#: js/js.js:869
+msgid "today"
+msgstr "today"
+
+#: js/js.js:870
+msgid "yesterday"
+msgstr "yesterday"
+
+#: 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:872
+msgid "last month"
+msgstr "last month"
+
+#: 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:874
+msgid "months ago"
+msgstr "months ago"
+
+#: js/js.js:875
+msgid "last year"
+msgstr "last year"
+
+#: js/js.js:876
+msgid "years ago"
+msgstr "years ago"
+
+#: js/oc-dialogs.js:123
+msgid "Choose"
+msgstr "Choose"
+
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
+msgstr "Error loading file picker template: {error}"
+
+#: js/oc-dialogs.js:172
+msgid "Yes"
+msgstr "Yes"
+
+#: js/oc-dialogs.js:182
+msgid "No"
+msgstr "No"
+
+#: js/oc-dialogs.js:199
+msgid "Ok"
+msgstr "OK"
+
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+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
+msgid "The object type is not specified."
+msgstr "The object type is not specified."
+
+#: 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:656 js/share.js:668
+msgid "Error"
+msgstr "Error"
+
+#: js/oc-vcategories.js:179
+msgid "The app name is not specified."
+msgstr "The app name is not specified."
+
+#: js/oc-vcategories.js:194
+msgid "The required file {file} is not installed!"
+msgstr "The required file {file} is not installed!"
+
+#: js/share.js:30 js/share.js:45 js/share.js:87
+msgid "Shared"
+msgstr "Shared"
+
+#: js/share.js:90
+msgid "Share"
+msgstr "Share"
+
+#: js/share.js:131 js/share.js:696
+msgid "Error while sharing"
+msgstr "Error whilst sharing"
+
+#: js/share.js:142
+msgid "Error while unsharing"
+msgstr "Error whilst unsharing"
+
+#: js/share.js:149
+msgid "Error while changing permissions"
+msgstr "Error whilst changing permissions"
+
+#: js/share.js:158
+msgid "Shared with you and the group {group} by {owner}"
+msgstr "Shared with you and the group {group} by {owner}"
+
+#: js/share.js:160
+msgid "Shared with you by {owner}"
+msgstr "Shared with you by {owner}"
+
+#: js/share.js:183
+msgid "Share with"
+msgstr "Share with"
+
+#: js/share.js:188
+msgid "Share with link"
+msgstr "Share with link"
+
+#: js/share.js:191
+msgid "Password protect"
+msgstr "Password protect"
+
+#: js/share.js:193 templates/installation.php:57 templates/login.php:26
+msgid "Password"
+msgstr "Password"
+
+#: js/share.js:198
+msgid "Allow Public Upload"
+msgstr "Allow Public Upload"
+
+#: js/share.js:202
+msgid "Email link to person"
+msgstr "Email link to person"
+
+#: js/share.js:203
+msgid "Send"
+msgstr "Send"
+
+#: js/share.js:208
+msgid "Set expiration date"
+msgstr "Set expiration date"
+
+#: js/share.js:209
+msgid "Expiration date"
+msgstr "Expiration date"
+
+#: js/share.js:242
+msgid "Share via email:"
+msgstr "Share via email:"
+
+#: js/share.js:245
+msgid "No people found"
+msgstr "No people found"
+
+#: js/share.js:283
+msgid "Resharing is not allowed"
+msgstr "Resharing is not allowed"
+
+#: js/share.js:319
+msgid "Shared in {item} with {user}"
+msgstr "Shared in {item} with {user}"
+
+#: js/share.js:340
+msgid "Unshare"
+msgstr "Unshare"
+
+#: js/share.js:352
+msgid "can edit"
+msgstr "can edit"
+
+#: js/share.js:354
+msgid "access control"
+msgstr "access control"
+
+#: js/share.js:357
+msgid "create"
+msgstr "create"
+
+#: js/share.js:360
+msgid "update"
+msgstr "update"
+
+#: js/share.js:363
+msgid "delete"
+msgstr "delete"
+
+#: js/share.js:366
+msgid "share"
+msgstr "share"
+
+#: js/share.js:400 js/share.js:643
+msgid "Password protected"
+msgstr "Password protected"
+
+#: js/share.js:656
+msgid "Error unsetting expiration date"
+msgstr "Error unsetting expiration date"
+
+#: js/share.js:668
+msgid "Error setting expiration date"
+msgstr "Error setting expiration date"
+
+#: js/share.js:683
+msgid "Sending ..."
+msgstr "Sending ..."
+
+#: js/share.js:694
+msgid "Email sent"
+msgstr "Email sent"
+
+#: 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 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>."
+
+#: js/update.js:21
+msgid "The update was successful. Redirecting you to ownCloud now."
+msgstr "The update was successful. Redirecting you to ownCloud now."
+
+#: lostpassword/controller.php:62
+#, php-format
+msgid "%s password reset"
+msgstr "%s password reset"
+
+#: lostpassword/templates/email.php:2
+msgid "Use the following link to reset your password: {link}"
+msgstr "Use the following link to reset your password: {link}"
+
+#: 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 "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 ."
+
+#: lostpassword/templates/lostpassword.php:12
+msgid "Request failed!<br>Did you make sure your email/username was right?"
+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."
+
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
+#: templates/login.php:19
+msgid "Username"
+msgstr "Username"
+
+#: 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 "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?"
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr "Yes, I really want to reset my password now"
+
+#: lostpassword/templates/lostpassword.php:27
+msgid "Request reset"
+msgstr "Request reset"
+
+#: lostpassword/templates/resetpassword.php:4
+msgid "Your password was reset"
+msgstr "Your password was reset"
+
+#: lostpassword/templates/resetpassword.php:5
+msgid "To login page"
+msgstr "To login page"
+
+#: lostpassword/templates/resetpassword.php:8
+msgid "New password"
+msgstr "New password"
+
+#: lostpassword/templates/resetpassword.php:11
+msgid "Reset password"
+msgstr "Reset password"
+
+#: strings.php:5
+msgid "Personal"
+msgstr "Personal"
+
+#: strings.php:6
+msgid "Users"
+msgstr "Users"
+
+#: strings.php:7 templates/layout.user.php:108
+msgid "Apps"
+msgstr "Apps"
+
+#: strings.php:8
+msgid "Admin"
+msgstr "Admin"
+
+#: strings.php:9
+msgid "Help"
+msgstr "Help"
+
+#: templates/403.php:12
+msgid "Access forbidden"
+msgstr "Access denied"
+
+#: templates/404.php:15
+msgid "Cloud not found"
+msgstr "Cloud not found"
+
+#: 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 "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!"
+
+#: templates/edit_categories_dialog.php:4
+msgid "Edit categories"
+msgstr "Edit categories"
+
+#: templates/edit_categories_dialog.php:16
+msgid "Add"
+msgstr "Add"
+
+#: templates/installation.php:24 templates/installation.php:31
+#: templates/installation.php:38
+msgid "Security Warning"
+msgstr "Security Warning"
+
+#: templates/installation.php:25
+msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
+msgstr "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
+
+#: templates/installation.php:26
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
+msgstr "Please update your PHP installation to use %s securely."
+
+#: templates/installation.php:32
+msgid ""
+"No secure random number generator is available, please enable the PHP "
+"OpenSSL extension."
+msgstr "No secure random number generator is available, please enable the PHP OpenSSL extension."
+
+#: 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 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account."
+
+#: templates/installation.php:39
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr "Your data directory and files are probably accessible from the internet because the .htaccess file does not work."
+
+#: 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 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>."
+
+#: templates/installation.php:47
+msgid "Create an <strong>admin account</strong>"
+msgstr "Create an <strong>admin account</strong>"
+
+#: templates/installation.php:65
+msgid "Advanced"
+msgstr "Advanced"
+
+#: templates/installation.php:67
+msgid "Data folder"
+msgstr "Data folder"
+
+#: templates/installation.php:77
+msgid "Configure the database"
+msgstr "Configure the database"
+
+#: 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 "will be used"
+
+#: templates/installation.php:140
+msgid "Database user"
+msgstr "Database user"
+
+#: templates/installation.php:147
+msgid "Database password"
+msgstr "Database password"
+
+#: templates/installation.php:152
+msgid "Database name"
+msgstr "Database name"
+
+#: templates/installation.php:160
+msgid "Database tablespace"
+msgstr "Database tablespace"
+
+#: templates/installation.php:167
+msgid "Database host"
+msgstr "Database host"
+
+#: templates/installation.php:175
+msgid "Finish setup"
+msgstr "Finish setup"
+
+#: templates/layout.user.php:41
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr "%s is available. Get more information on how to update."
+
+#: templates/layout.user.php:69
+msgid "Log out"
+msgstr "Log out"
+
+#: templates/login.php:9
+msgid "Automatic logon rejected!"
+msgstr "Automatic logon rejected!"
+
+#: templates/login.php:10
+msgid ""
+"If you did not change your password recently, your account may be "
+"compromised!"
+msgstr "If you did not change your password recently, your account may be compromised!"
+
+#: templates/login.php:12
+msgid "Please change your password to secure your account again."
+msgstr "Please change your password to secure your account again."
+
+#: templates/login.php:32
+msgid "Lost your password?"
+msgstr "Lost your password?"
+
+#: templates/login.php:37
+msgid "remember"
+msgstr "remember"
+
+#: templates/login.php:39
+msgid "Log in"
+msgstr "Log in"
+
+#: templates/login.php:45
+msgid "Alternative Logins"
+msgstr "Alternative Logins"
+
+#: 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 "Hey there,<br><br>just letting you know that %s shared \"%s\" with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!"
+
+#: templates/update.php:3
+#, php-format
+msgid "Updating ownCloud to version %s, this may take a while."
+msgstr "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/en_GB/files.po b/l10n/en_GB/files.po
new file mode 100644
index 0000000000000000000000000000000000000000..bf8e9374348519fed92117ba8310a4e3cbaac06f
--- /dev/null
+++ b/l10n/en_GB/files.po
@@ -0,0 +1,344 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+# mnestis <transifex@mnestis.net>, 2013
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en_GB\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 "Could not move %s - File with this name already exists"
+
+#: ajax/move.php:27 ajax/move.php:30
+#, php-format
+msgid "Could not move %s"
+msgstr "Could not move %s"
+
+#: ajax/upload.php:16 ajax/upload.php:45
+msgid "Unable to set upload directory."
+msgstr "Unable to set upload directory."
+
+#: ajax/upload.php:22
+msgid "Invalid Token"
+msgstr "Invalid Token"
+
+#: ajax/upload.php:59
+msgid "No file was uploaded. Unknown error"
+msgstr "No file was uploaded. Unknown error"
+
+#: ajax/upload.php:66
+msgid "There is no error, the file uploaded with success"
+msgstr "There is no error, the file uploaded successfully"
+
+#: ajax/upload.php:67
+msgid ""
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
+msgstr "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
+
+#: ajax/upload.php:69
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form"
+msgstr "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"
+
+#: ajax/upload.php:70
+msgid "The uploaded file was only partially uploaded"
+msgstr "The uploaded file was only partially uploaded"
+
+#: ajax/upload.php:71
+msgid "No file was uploaded"
+msgstr "No file was uploaded"
+
+#: ajax/upload.php:72
+msgid "Missing a temporary folder"
+msgstr "Missing a temporary folder"
+
+#: ajax/upload.php:73
+msgid "Failed to write to disk"
+msgstr "Failed to write to disk"
+
+#: ajax/upload.php:91
+msgid "Not enough storage available"
+msgstr "Not enough storage available"
+
+#: 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: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:11
+msgid "Files"
+msgstr "Files"
+
+#: 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:255
+msgid "Not enough space available"
+msgstr "Not enough space available"
+
+#: js/file-upload.js:322
+msgid "Upload cancelled."
+msgstr "Upload cancelled."
+
+#: 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:520
+msgid "URL cannot be empty."
+msgstr "URL cannot be empty."
+
+#: 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:557 js/file-upload.js:573 js/files.js:507 js/files.js:545
+msgid "Error"
+msgstr "Error"
+
+#: js/fileactions.js:119
+msgid "Share"
+msgstr "Share"
+
+#: js/fileactions.js:131
+msgid "Delete permanently"
+msgstr "Delete permanently"
+
+#: js/fileactions.js:197
+msgid "Rename"
+msgstr "Rename"
+
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
+msgid "Pending"
+msgstr "Pending"
+
+#: js/filelist.js:416 js/filelist.js:418
+msgid "{new_name} already exists"
+msgstr "{new_name} already exists"
+
+#: js/filelist.js:416 js/filelist.js:418
+msgid "replace"
+msgstr "replace"
+
+#: js/filelist.js:416
+msgid "suggest name"
+msgstr "suggest name"
+
+#: js/filelist.js:416 js/filelist.js:418
+msgid "cancel"
+msgstr "cancel"
+
+#: js/filelist.js:463
+msgid "replaced {new_name} with {old_name}"
+msgstr "replaced {new_name} with {old_name}"
+
+#: js/filelist.js:463
+msgid "undo"
+msgstr "undo"
+
+#: 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: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:541
+msgid "{dirs} and {files}"
+msgstr "{dirs} and {files}"
+
+#: 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/files.js:25
+msgid "'.' is an invalid file name."
+msgstr "'.' is an invalid file name."
+
+#: js/files.js:29
+msgid "File name cannot be empty."
+msgstr "File name cannot be empty."
+
+#: js/files.js:37
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr "Invalid name: '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed."
+
+#: 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:55
+msgid "Your storage is almost full ({usedSpacePercent}%)"
+msgstr "Your storage is almost full ({usedSpacePercent}%)"
+
+#: 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: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: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:559 templates/index.php:73
+msgid "Size"
+msgstr "Size"
+
+#: js/files.js:560 templates/index.php:75
+msgid "Modified"
+msgstr "Modified"
+
+#: lib/app.php:73
+#, php-format
+msgid "%s could not be renamed"
+msgstr "%s could not be renamed"
+
+#: lib/helper.php:11 templates/index.php:17
+msgid "Upload"
+msgstr "Upload"
+
+#: templates/admin.php:5
+msgid "File handling"
+msgstr "File handling"
+
+#: templates/admin.php:7
+msgid "Maximum upload size"
+msgstr "Maximum upload size"
+
+#: templates/admin.php:10
+msgid "max. possible: "
+msgstr "max. possible: "
+
+#: templates/admin.php:15
+msgid "Needed for multi-file and folder downloads."
+msgstr "Needed for multi-file and folder downloads."
+
+#: templates/admin.php:17
+msgid "Enable ZIP-download"
+msgstr "Enable ZIP-download"
+
+#: templates/admin.php:20
+msgid "0 is unlimited"
+msgstr "0 is unlimited"
+
+#: templates/admin.php:22
+msgid "Maximum input size for ZIP files"
+msgstr "Maximum input size for ZIP files"
+
+#: templates/admin.php:26
+msgid "Save"
+msgstr "Save"
+
+#: templates/index.php:6
+msgid "New"
+msgstr "New"
+
+#: templates/index.php:9
+msgid "Text file"
+msgstr "Text file"
+
+#: templates/index.php:11
+msgid "Folder"
+msgstr "Folder"
+
+#: templates/index.php:13
+msgid "From link"
+msgstr "From link"
+
+#: templates/index.php:33
+msgid "Deleted files"
+msgstr "Deleted files"
+
+#: templates/index.php:39
+msgid "Cancel upload"
+msgstr "Cancel upload"
+
+#: templates/index.php:45
+msgid "You don’t have write permissions here."
+msgstr "You don’t have write permission here."
+
+#: templates/index.php:50
+msgid "Nothing in here. Upload something!"
+msgstr "Nothing in here. Upload something!"
+
+#: templates/index.php:67
+msgid "Download"
+msgstr "Download"
+
+#: templates/index.php:80 templates/index.php:81
+msgid "Unshare"
+msgstr "Unshare"
+
+#: templates/index.php:86 templates/index.php:87
+msgid "Delete"
+msgstr "Delete"
+
+#: templates/index.php:100
+msgid "Upload too large"
+msgstr "Upload too large"
+
+#: 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:107
+msgid "Files are being scanned, please wait."
+msgstr "Files are being scanned, please wait."
+
+#: templates/index.php:110
+msgid "Current scanning"
+msgstr "Current scanning"
+
+#: templates/upgrade.php:2
+msgid "Upgrading filesystem cache..."
+msgstr "Upgrading filesystem cache..."
diff --git a/l10n/en_GB/files_encryption.po b/l10n/en_GB/files_encryption.po
new file mode 100644
index 0000000000000000000000000000000000000000..b81a0ff62ab101b9efc856a30303e05adff98848
--- /dev/null
+++ b/l10n/en_GB/files_encryption.po
@@ -0,0 +1,177 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+# mnestis <transifex@mnestis.net>, 2013
+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-29 16:50+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"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en_GB\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr "Recovery key enabled successfully"
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr "Could not enable recovery key. Please check your recovery key password!"
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr "Recovery key disabled successfully"
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr "Could not disable recovery key. Please check your recovery key password!"
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr "Password changed successfully."
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr "Could not change the password. Maybe the old password was incorrect."
+
+#: ajax/updatePrivateKeyPassword.php:51
+msgid "Private key password successfully updated."
+msgstr "Private key password updated successfully."
+
+#: ajax/updatePrivateKeyPassword.php:53
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr "Could not update the private key password. Maybe the old password was not correct."
+
+#: 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 "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."
+
+#: hooks/hooks.php:41
+msgid "Missing requirements."
+msgstr "Missing requirements."
+
+#: hooks/hooks.php:42
+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 "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."
+
+#: hooks/hooks.php:249
+msgid "Following users are not set up for encryption:"
+msgstr "Following users are not set up for encryption:"
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "Saving..."
+
+#: templates/invalid_private_key.php:5
+msgid ""
+"Your private key is not valid! Maybe the your password was changed from "
+"outside."
+msgstr "Your private key is not valid! Maybe the your password was changed externally."
+
+#: templates/invalid_private_key.php:7
+msgid "You can unlock your private key in your "
+msgstr "You can unlock your private key in your "
+
+#: templates/invalid_private_key.php:7
+msgid "personal settings"
+msgstr "personal settings"
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
+msgid "Encryption"
+msgstr "Encryption"
+
+#: templates/settings-admin.php:10
+msgid ""
+"Enable recovery key (allow to recover users files in case of password loss):"
+msgstr "Enable recovery key (allow to recover users files in case of password loss):"
+
+#: templates/settings-admin.php:14
+msgid "Recovery key password"
+msgstr "Recovery key password"
+
+#: templates/settings-admin.php:21 templates/settings-personal.php:54
+msgid "Enabled"
+msgstr "Enabled"
+
+#: templates/settings-admin.php:29 templates/settings-personal.php:62
+msgid "Disabled"
+msgstr "Disabled"
+
+#: templates/settings-admin.php:34
+msgid "Change recovery key password:"
+msgstr "Change recovery key password:"
+
+#: templates/settings-admin.php:41
+msgid "Old Recovery key password"
+msgstr "Old Recovery key password"
+
+#: templates/settings-admin.php:48
+msgid "New Recovery key password"
+msgstr "New Recovery key password"
+
+#: templates/settings-admin.php:53
+msgid "Change Password"
+msgstr "Change Password"
+
+#: templates/settings-personal.php:11
+msgid "Your private key password no longer match your log-in password:"
+msgstr "Your private key password no longer match your login password:"
+
+#: templates/settings-personal.php:14
+msgid "Set your old private key password to your current log-in password."
+msgstr "Set your old private key password to your current login password."
+
+#: templates/settings-personal.php:16
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr " If you don't remember your old password you can ask your administrator to recover your files."
+
+#: templates/settings-personal.php:24
+msgid "Old log-in password"
+msgstr "Old login password"
+
+#: templates/settings-personal.php:30
+msgid "Current log-in password"
+msgstr "Current login password"
+
+#: templates/settings-personal.php:35
+msgid "Update Private Key Password"
+msgstr "Update Private Key Password"
+
+#: templates/settings-personal.php:45
+msgid "Enable password recovery:"
+msgstr "Enable password recovery:"
+
+#: 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 "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss"
+
+#: templates/settings-personal.php:63
+msgid "File recovery settings updated"
+msgstr "File recovery settings updated"
+
+#: templates/settings-personal.php:64
+msgid "Could not update file recovery"
+msgstr "Could not update file recovery"
diff --git a/l10n/en_GB/files_external.po b/l10n/en_GB/files_external.po
new file mode 100644
index 0000000000000000000000000000000000000000..6190c958520e668424f15466702eae9eaa6ab2c3
--- /dev/null
+++ b/l10n/en_GB/files_external.po
@@ -0,0 +1,124 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+# mnestis <transifex@mnestis.net>, 2013
+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-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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en_GB\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 "Access granted"
+
+#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+msgid "Error configuring Dropbox storage"
+msgstr "Error configuring Dropbox storage"
+
+#: js/dropbox.js:65 js/google.js:86
+msgid "Grant access"
+msgstr "Grant access"
+
+#: js/dropbox.js:101
+msgid "Please provide a valid Dropbox app key and secret."
+msgstr "Please provide a valid Dropbox app key and secret."
+
+#: js/google.js:42 js/google.js:121
+msgid "Error configuring Google Drive storage"
+msgstr "Error configuring Google Drive storage"
+
+#: 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 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it."
+
+#: 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 "<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."
+
+#: 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 "<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."
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr "External Storage"
+
+#: templates/settings.php:9 templates/settings.php:28
+msgid "Folder name"
+msgstr "Folder name"
+
+#: templates/settings.php:10
+msgid "External storage"
+msgstr "External storage"
+
+#: templates/settings.php:11
+msgid "Configuration"
+msgstr "Configuration"
+
+#: templates/settings.php:12
+msgid "Options"
+msgstr "Options"
+
+#: templates/settings.php:13
+msgid "Applicable"
+msgstr "Applicable"
+
+#: templates/settings.php:33
+msgid "Add storage"
+msgstr "Add storage"
+
+#: templates/settings.php:90
+msgid "None set"
+msgstr "None set"
+
+#: templates/settings.php:91
+msgid "All Users"
+msgstr "All Users"
+
+#: templates/settings.php:92
+msgid "Groups"
+msgstr "Groups"
+
+#: templates/settings.php:100
+msgid "Users"
+msgstr "Users"
+
+#: templates/settings.php:113 templates/settings.php:114
+#: templates/settings.php:149 templates/settings.php:150
+msgid "Delete"
+msgstr "Delete"
+
+#: templates/settings.php:129
+msgid "Enable User External Storage"
+msgstr "Enable User External Storage"
+
+#: templates/settings.php:130
+msgid "Allow users to mount their own external storage"
+msgstr "Allow users to mount their own external storage"
+
+#: templates/settings.php:141
+msgid "SSL root certificates"
+msgstr "SSL root certificates"
+
+#: templates/settings.php:159
+msgid "Import Root Certificate"
+msgstr "Import Root Certificate"
diff --git a/l10n/en_GB/files_sharing.po b/l10n/en_GB/files_sharing.po
new file mode 100644
index 0000000000000000000000000000000000000000..a0f4b32037f646e1965bcd31f6f3d47393ed5b6d
--- /dev/null
+++ b/l10n/en_GB/files_sharing.po
@@ -0,0 +1,81 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+# mnestis <transifex@mnestis.net>, 2013
+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-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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en_GB\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: templates/authenticate.php:4
+msgid "The password is wrong. Try again."
+msgstr "The password is wrong. Try again."
+
+#: templates/authenticate.php:7
+msgid "Password"
+msgstr "Password"
+
+#: templates/authenticate.php:9
+msgid "Submit"
+msgstr "Submit"
+
+#: templates/part.404.php:3
+msgid "Sorry, this link doesn’t seem to work anymore."
+msgstr "Sorry, this link doesn’t seem to work anymore."
+
+#: templates/part.404.php:4
+msgid "Reasons might be:"
+msgstr "Reasons might be:"
+
+#: templates/part.404.php:6
+msgid "the item was removed"
+msgstr "the item was removed"
+
+#: templates/part.404.php:7
+msgid "the link expired"
+msgstr "the link expired"
+
+#: templates/part.404.php:8
+msgid "sharing is disabled"
+msgstr "sharing is disabled"
+
+#: templates/part.404.php:10
+msgid "For more info, please ask the person who sent this link."
+msgstr "For more info, please ask the person who sent this link."
+
+#: templates/public.php:15
+#, php-format
+msgid "%s shared the folder %s with you"
+msgstr "%s shared the folder %s with you"
+
+#: templates/public.php:18
+#, php-format
+msgid "%s shared the file %s with you"
+msgstr "%s shared the file %s with you"
+
+#: templates/public.php:26 templates/public.php:92
+msgid "Download"
+msgstr "Download"
+
+#: templates/public.php:43 templates/public.php:46
+msgid "Upload"
+msgstr "Upload"
+
+#: templates/public.php:56
+msgid "Cancel upload"
+msgstr "Cancel upload"
+
+#: templates/public.php:89
+msgid "No preview available for"
+msgstr "No preview available for"
diff --git a/l10n/en_GB/files_trashbin.po b/l10n/en_GB/files_trashbin.po
new file mode 100644
index 0000000000000000000000000000000000000000..6b87c1ddd491eb1735c1b63b833e144ca47c83f9
--- /dev/null
+++ b/l10n/en_GB/files_trashbin.po
@@ -0,0 +1,85 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+# mnestis <transifex@mnestis.net>, 2013
+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-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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en_GB\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/delete.php:42
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr "Couldn't delete %s permanently"
+
+#: ajax/undelete.php:42
+#, php-format
+msgid "Couldn't restore %s"
+msgstr "Couldn't restore %s"
+
+#: js/trash.js:7 js/trash.js:102
+msgid "perform restore operation"
+msgstr "perform restore operation"
+
+#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148
+msgid "Error"
+msgstr "Error"
+
+#: js/trash.js:37
+msgid "delete file permanently"
+msgstr "delete file permanently"
+
+#: js/trash.js:129
+msgid "Delete permanently"
+msgstr "Delete permanently"
+
+#: js/trash.js:190 templates/index.php:21
+msgid "Name"
+msgstr "Name"
+
+#: js/trash.js:191 templates/index.php:31
+msgid "Deleted"
+msgstr "Deleted"
+
+#: js/trash.js:199
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] "%n folder"
+msgstr[1] "%n folders"
+
+#: js/trash.js:205
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] "%n file"
+msgstr[1] "%n files"
+
+#: lib/trash.php:814 lib/trash.php:816
+msgid "restored"
+msgstr "restored"
+
+#: templates/index.php:9
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr "Nothing in here. Your recycle bin is empty!"
+
+#: templates/index.php:24 templates/index.php:26
+msgid "Restore"
+msgstr "Restore"
+
+#: templates/index.php:34 templates/index.php:35
+msgid "Delete"
+msgstr "Delete"
+
+#: templates/part.breadcrumb.php:9
+msgid "Deleted Files"
+msgstr "Deleted Files"
diff --git a/l10n/en_GB/files_versions.po b/l10n/en_GB/files_versions.po
new file mode 100644
index 0000000000000000000000000000000000000000..cc791b517d362736d8e6f09e78b315c906ac48f5
--- /dev/null
+++ b/l10n/en_GB/files_versions.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+# mnestis <transifex@mnestis.net>, 2013
+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-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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en_GB\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/rollbackVersion.php:13
+#, php-format
+msgid "Could not revert: %s"
+msgstr "Could not revert: %s"
+
+#: js/versions.js:7
+msgid "Versions"
+msgstr "Versions"
+
+#: js/versions.js:53
+msgid "Failed to revert {file} to revision {timestamp}."
+msgstr "Failed to revert {file} to revision {timestamp}."
+
+#: js/versions.js:79
+msgid "More versions..."
+msgstr "More versions..."
+
+#: js/versions.js:116
+msgid "No other versions available"
+msgstr "No other versions available"
+
+#: js/versions.js:145
+msgid "Restore"
+msgstr "Restore"
diff --git a/l10n/en_GB/lib.po b/l10n/en_GB/lib.po
new file mode 100644
index 0000000000000000000000000000000000000000..14e6d1c7a8b64f60c4aaffc3102e4116b259d959
--- /dev/null
+++ b/l10n/en_GB/lib.po
@@ -0,0 +1,335 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+# mnestis <transifex@mnestis.net>, 2013
+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-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"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en_GB\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 \"%s\" can't be installed because it is not compatible with this version of ownCloud."
+
+#: app.php:250
+msgid "No app name specified"
+msgstr "No app name specified"
+
+#: app.php:361
+msgid "Help"
+msgstr "Help"
+
+#: app.php:374
+msgid "Personal"
+msgstr "Personal"
+
+#: app.php:385
+msgid "Settings"
+msgstr "Settings"
+
+#: app.php:397
+msgid "Users"
+msgstr "Users"
+
+#: app.php:410
+msgid "Admin"
+msgstr "Admin"
+
+#: app.php:839
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr "Failed to upgrade \"%s\"."
+
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr "Custom profile pictures don't work with encryption yet"
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr "Unknown filetype"
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr "Invalid image"
+
+#: defaults.php:35
+msgid "web services under your control"
+msgstr "web services under your control"
+
+#: files.php:66 files.php:98
+#, php-format
+msgid "cannot open \"%s\""
+msgstr "cannot open \"%s\""
+
+#: files.php:226
+msgid "ZIP download is turned off."
+msgstr "ZIP download is turned off."
+
+#: files.php:227
+msgid "Files need to be downloaded one by one."
+msgstr "Files need to be downloaded one by one."
+
+#: files.php:228 files.php:256
+msgid "Back to Files"
+msgstr "Back to Files"
+
+#: files.php:253
+msgid "Selected files too large to generate zip file."
+msgstr "Selected files too large to generate zip file."
+
+#: files.php:254
+msgid ""
+"Download the files in smaller chunks, seperately or kindly ask your "
+"administrator."
+msgstr "Download the files in smaller chunks, seperately or kindly ask your administrator."
+
+#: installer.php:63
+msgid "No source specified when installing app"
+msgstr "No source specified when installing app"
+
+#: installer.php:70
+msgid "No href specified when installing app from http"
+msgstr "No href specified when installing app from http"
+
+#: installer.php:75
+msgid "No path specified when installing app from local file"
+msgstr "No path specified when installing app from local file"
+
+#: installer.php:89
+#, php-format
+msgid "Archives of type %s are not supported"
+msgstr "Archives of type %s are not supported"
+
+#: installer.php:103
+msgid "Failed to open archive when installing app"
+msgstr "Failed to open archive when installing app"
+
+#: installer.php:125
+msgid "App does not provide an info.xml file"
+msgstr "App does not provide an info.xml file"
+
+#: installer.php:131
+msgid "App can't be installed because of not allowed code in the App"
+msgstr "App can't be installed because of unallowed code in the App"
+
+#: installer.php:140
+msgid ""
+"App can't be installed because it is not compatible with this version of "
+"ownCloud"
+msgstr "App can't be installed because it is not compatible with this version of 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 "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped 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 "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store"
+
+#: installer.php:162
+msgid "App directory already exists"
+msgstr "App directory already exists"
+
+#: installer.php:175
+#, php-format
+msgid "Can't create app folder. Please fix permissions. %s"
+msgstr "Can't create app folder. Please fix permissions. %s"
+
+#: json.php:28
+msgid "Application is not enabled"
+msgstr "Application is not enabled"
+
+#: json.php:39 json.php:62 json.php:73
+msgid "Authentication error"
+msgstr "Authentication error"
+
+#: json.php:51
+msgid "Token expired. Please reload page."
+msgstr "Token expired. Please reload page."
+
+#: search/provider/file.php:17 search/provider/file.php:35
+msgid "Files"
+msgstr "Files"
+
+#: search/provider/file.php:26 search/provider/file.php:33
+msgid "Text"
+msgstr "Text"
+
+#: search/provider/file.php:29
+msgid "Images"
+msgstr "Images"
+
+#: setup/abstractdatabase.php:22
+#, php-format
+msgid "%s enter the database username."
+msgstr "%s enter the database username."
+
+#: setup/abstractdatabase.php:25
+#, php-format
+msgid "%s enter the database name."
+msgstr "%s enter the database name."
+
+#: setup/abstractdatabase.php:28
+#, php-format
+msgid "%s you may not use dots in the database name"
+msgstr "%s you may not use dots in the database name"
+
+#: setup/mssql.php:20
+#, php-format
+msgid "MS SQL username and/or password not valid: %s"
+msgstr "MS SQL username and/or password not valid: %s"
+
+#: 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 "You need to enter either an existing account or the administrator."
+
+#: setup/mysql.php:12
+msgid "MySQL username and/or password not valid"
+msgstr "MySQL username and/or password not valid"
+
+#: 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 "DB Error: \"%s\""
+
+#: 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 "Offending command was: \"%s\""
+
+#: setup/mysql.php:85
+#, php-format
+msgid "MySQL user '%s'@'localhost' exists already."
+msgstr "MySQL user '%s'@'localhost' exists already."
+
+#: setup/mysql.php:86
+msgid "Drop this user from MySQL"
+msgstr "Drop this user from MySQL"
+
+#: setup/mysql.php:91
+#, php-format
+msgid "MySQL user '%s'@'%%' already exists"
+msgstr "MySQL user '%s'@'%%' already exists"
+
+#: setup/mysql.php:92
+msgid "Drop this user from MySQL."
+msgstr "Drop this user from MySQL."
+
+#: setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr "Oracle connection could not be established"
+
+#: setup/oci.php:41 setup/oci.php:113
+msgid "Oracle username and/or password not valid"
+msgstr "Oracle username and/or password not valid"
+
+#: setup/oci.php:173 setup/oci.php:205
+#, php-format
+msgid "Offending command was: \"%s\", name: %s, password: %s"
+msgstr "Offending command was: \"%s\", name: %s, password: %s"
+
+#: setup/postgresql.php:23 setup/postgresql.php:69
+msgid "PostgreSQL username and/or password not valid"
+msgstr "PostgreSQL username and/or password not valid"
+
+#: setup.php:28
+msgid "Set an admin username."
+msgstr "Set an admin username."
+
+#: setup.php:31
+msgid "Set an admin password."
+msgstr "Set an admin password."
+
+#: 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 "Your web server is not yet properly setup to allow files synchronisation because the WebDAV interface seems to be broken."
+
+#: setup.php:185
+#, php-format
+msgid "Please double check the <a href='%s'>installation guides</a>."
+msgstr "Please double check the <a href='%s'>installation guides</a>."
+
+#: template/functions.php:96
+msgid "seconds ago"
+msgstr "seconds ago"
+
+#: template/functions.php:97
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+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] "%n hour ago"
+msgstr[1] "%n hours ago"
+
+#: template/functions.php:99
+msgid "today"
+msgstr "today"
+
+#: template/functions.php:100
+msgid "yesterday"
+msgstr "yesterday"
+
+#: template/functions.php:101
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] "%n day go"
+msgstr[1] "%n days ago"
+
+#: template/functions.php:102
+msgid "last month"
+msgstr "last month"
+
+#: template/functions.php:103
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] "%n month ago"
+msgstr[1] "%n months ago"
+
+#: template/functions.php:104
+msgid "last year"
+msgstr "last year"
+
+#: template/functions.php:105
+msgid "years ago"
+msgstr "years ago"
+
+#: template.php:297
+msgid "Caused by:"
+msgstr "Caused by:"
+
+#: vcategories.php:188 vcategories.php:249
+#, php-format
+msgid "Could not find category \"%s\""
+msgstr "Could not find category \"%s\""
diff --git a/l10n/en_GB/settings.po b/l10n/en_GB/settings.po
new file mode 100644
index 0000000000000000000000000000000000000000..bcc1f4f64a0bcfd6e3cfa32aeed0df32deade797
--- /dev/null
+++ b/l10n/en_GB/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:
+# mnestis <transifex@mnestis.net>, 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: 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"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en_GB\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/apps/ocs.php:20
+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 changepassword/controller.php:55
+msgid "Authentication error"
+msgstr "Authentication error"
+
+#: ajax/changedisplayname.php:31
+msgid "Your display name has been changed."
+msgstr "Your display name has been changed."
+
+#: ajax/changedisplayname.php:34
+msgid "Unable to change display name"
+msgstr "Unable to change display name"
+
+#: ajax/creategroup.php:10
+msgid "Group already exists"
+msgstr "Group already exists"
+
+#: ajax/creategroup.php:19
+msgid "Unable to add group"
+msgstr "Unable to add group"
+
+#: ajax/lostpassword.php:12
+msgid "Email saved"
+msgstr "Email saved"
+
+#: ajax/lostpassword.php:14
+msgid "Invalid email"
+msgstr "Invalid email"
+
+#: ajax/removegroup.php:13
+msgid "Unable to delete group"
+msgstr "Unable to delete group"
+
+#: ajax/removeuser.php:25
+msgid "Unable to delete user"
+msgstr "Unable to delete user"
+
+#: ajax/setlanguage.php:15
+msgid "Language changed"
+msgstr "Language changed"
+
+#: ajax/setlanguage.php:17 ajax/setlanguage.php:20
+msgid "Invalid request"
+msgstr "Invalid request"
+
+#: ajax/togglegroups.php:12
+msgid "Admins can't remove themself from the admin group"
+msgstr "Admins can't remove themselves from the admin group"
+
+#: ajax/togglegroups.php:30
+#, php-format
+msgid "Unable to add user to group %s"
+msgstr "Unable to add user to group %s"
+
+#: ajax/togglegroups.php:36
+#, php-format
+msgid "Unable to remove user from group %s"
+msgstr "Unable to remove user from group %s"
+
+#: ajax/updateapp.php:14
+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}"
+
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
+msgid "Disable"
+msgstr "Disable"
+
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
+msgid "Enable"
+msgstr "Enable"
+
+#: js/apps.js:71
+msgid "Please wait...."
+msgstr "Please wait...."
+
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
+msgid "Error while disabling app"
+msgstr "Error whilst disabling app"
+
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
+msgid "Error while enabling app"
+msgstr "Error whilst enabling app"
+
+#: js/apps.js:123
+msgid "Updating...."
+msgstr "Updating...."
+
+#: js/apps.js:126
+msgid "Error while updating app"
+msgstr "Error whilst updating app"
+
+#: js/apps.js:126
+msgid "Error"
+msgstr "Error"
+
+#: js/apps.js:127 templates/apps.php:43
+msgid "Update"
+msgstr "Update"
+
+#: js/apps.js:130
+msgid "Updated"
+msgstr "Updated"
+
+#: js/personal.js:220
+msgid "Select a profile picture"
+msgstr "Select a profile picture"
+
+#: 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:287
+msgid "Saving..."
+msgstr "Saving..."
+
+#: js/users.js:47
+msgid "deleted"
+msgstr "deleted"
+
+#: js/users.js:47
+msgid "undo"
+msgstr "undo"
+
+#: js/users.js:79
+msgid "Unable to remove user"
+msgstr "Unable to remove user"
+
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
+msgid "Groups"
+msgstr "Groups"
+
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
+msgid "Group Admin"
+msgstr "Group Admin"
+
+#: js/users.js:120 templates/users.php:170
+msgid "Delete"
+msgstr "Delete"
+
+#: js/users.js:277
+msgid "add group"
+msgstr "add group"
+
+#: js/users.js:436
+msgid "A valid username must be provided"
+msgstr "A valid username must be provided"
+
+#: js/users.js:437 js/users.js:443 js/users.js:458
+msgid "Error creating user"
+msgstr "Error creating user"
+
+#: js/users.js:442
+msgid "A valid password must be provided"
+msgstr "A valid password must be provided"
+
+#: personal.php:45 personal.php:46
+msgid "__language_name__"
+msgstr "__language_name__"
+
+#: templates/admin.php:15
+msgid "Security Warning"
+msgstr "Security Warning"
+
+#: 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 "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."
+
+#: templates/admin.php:29
+msgid "Setup Warning"
+msgstr "Setup Warning"
+
+#: 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 "Your web server is not yet properly setup to allow files synchronisation because the WebDAV interface seems to be broken."
+
+#: templates/admin.php:33
+#, php-format
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
+msgstr "Please double check the <a href=\"%s\">installation guides</a>."
+
+#: templates/admin.php:44
+msgid "Module 'fileinfo' missing"
+msgstr "Module 'fileinfo' missing"
+
+#: 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 "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"
+msgstr "Locale not working"
+
+#: 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 "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."
+
+#: templates/admin.php:75
+msgid "Internet connection not working"
+msgstr "Internet connection not working"
+
+#: 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 "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."
+
+#: templates/admin.php:92
+msgid "Cron"
+msgstr "Cron"
+
+#: templates/admin.php:99
+msgid "Execute one task with each page loaded"
+msgstr "Execute one task with each page loaded"
+
+#: templates/admin.php:107
+msgid ""
+"cron.php is registered at a webcron service to call cron.php once a minute "
+"over http."
+msgstr "cron.php is registered at a webcron service to call cron.php once a minute over http."
+
+#: templates/admin.php:115
+msgid "Use systems cron service to call the cron.php file once a minute."
+msgstr "Use systems cron service to call the cron.php file once a minute."
+
+#: templates/admin.php:120
+msgid "Sharing"
+msgstr "Sharing"
+
+#: templates/admin.php:126
+msgid "Enable Share API"
+msgstr "Enable Share API"
+
+#: templates/admin.php:127
+msgid "Allow apps to use the Share API"
+msgstr "Allow apps to use the Share API"
+
+#: templates/admin.php:134
+msgid "Allow links"
+msgstr "Allow links"
+
+#: templates/admin.php:135
+msgid "Allow users to share items to the public with links"
+msgstr "Allow users to share items to the public with links"
+
+#: templates/admin.php:143
+msgid "Allow public uploads"
+msgstr "Allow public uploads"
+
+#: templates/admin.php:144
+msgid ""
+"Allow users to enable others to upload into their publicly shared folders"
+msgstr "Allow users to enable others to upload into their publicly shared folders"
+
+#: templates/admin.php:152
+msgid "Allow resharing"
+msgstr "Allow resharing"
+
+#: templates/admin.php:153
+msgid "Allow users to share items shared with them again"
+msgstr "Allow users to share items shared with them again"
+
+#: templates/admin.php:160
+msgid "Allow users to share with anyone"
+msgstr "Allow users to share with anyone"
+
+#: templates/admin.php:163
+msgid "Allow users to only share with users in their groups"
+msgstr "Allow users to only share with users in their groups"
+
+#: templates/admin.php:170
+msgid "Security"
+msgstr "Security"
+
+#: templates/admin.php:183
+msgid "Enforce HTTPS"
+msgstr "Enforce HTTPS"
+
+#: templates/admin.php:185
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
+msgstr "Forces the clients to connect to %s via an encrypted connection."
+
+#: templates/admin.php:191
+#, php-format
+msgid ""
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
+msgstr "Please connect to your %s via HTTPS to enable or disable the SSL enforcement."
+
+#: templates/admin.php:203
+msgid "Log"
+msgstr "Log"
+
+#: templates/admin.php:204
+msgid "Log level"
+msgstr "Log level"
+
+#: templates/admin.php:235
+msgid "More"
+msgstr "More"
+
+#: templates/admin.php:236
+msgid "Less"
+msgstr "Less"
+
+#: templates/admin.php:242 templates/personal.php:161
+msgid "Version"
+msgstr "Version"
+
+#: 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 "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"
+msgstr "Add your App"
+
+#: templates/apps.php:28
+msgid "More Apps"
+msgstr "More Apps"
+
+#: templates/apps.php:33
+msgid "Select an App"
+msgstr "Select an App"
+
+#: templates/apps.php:39
+msgid "See application page at apps.owncloud.com"
+msgstr "See application page at apps.owncloud.com"
+
+#: templates/apps.php:41
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+msgstr "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+
+#: templates/help.php:4
+msgid "User Documentation"
+msgstr "User Documentation"
+
+#: templates/help.php:6
+msgid "Administrator Documentation"
+msgstr "Administrator Documentation"
+
+#: templates/help.php:9
+msgid "Online Documentation"
+msgstr "Online Documentation"
+
+#: templates/help.php:11
+msgid "Forum"
+msgstr "Forum"
+
+#: templates/help.php:14
+msgid "Bugtracker"
+msgstr "Bugtracker"
+
+#: templates/help.php:17
+msgid "Commercial Support"
+msgstr "Commercial Support"
+
+#: templates/personal.php:8
+msgid "Get the apps to sync your files"
+msgstr "Get the apps to sync your files"
+
+#: templates/personal.php:19
+msgid "Show First Run Wizard again"
+msgstr "Show First Run Wizard again"
+
+#: templates/personal.php:27
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+msgid "Password"
+msgstr "Password"
+
+#: templates/personal.php:40
+msgid "Your password was changed"
+msgstr "Your password was changed"
+
+#: templates/personal.php:41
+msgid "Unable to change your password"
+msgstr "Unable to change your password"
+
+#: templates/personal.php:42
+msgid "Current password"
+msgstr "Current password"
+
+#: templates/personal.php:44
+msgid "New password"
+msgstr "New password"
+
+#: templates/personal.php:46
+msgid "Change password"
+msgstr "Change password"
+
+#: templates/personal.php:58 templates/users.php:88
+msgid "Display Name"
+msgstr "Display Name"
+
+#: templates/personal.php:73
+msgid "Email"
+msgstr "Email"
+
+#: templates/personal.php:75
+msgid "Your email address"
+msgstr "Your email address"
+
+#: templates/personal.php:76
+msgid "Fill in an email address to enable password recovery"
+msgstr "Fill in an email address to enable password recovery"
+
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr "Profile picture"
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr "Upload new"
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr "Select new from Files"
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr "Remove image"
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr "Either png or jpg. Ideally square but you will be able to crop it."
+
+#: templates/personal.php:97
+msgid "Abort"
+msgstr "Abort"
+
+#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr "Choose as profile image"
+
+#: templates/personal.php:106 templates/personal.php:107
+msgid "Language"
+msgstr "Language"
+
+#: templates/personal.php:119
+msgid "Help translate"
+msgstr "Help translate"
+
+#: templates/personal.php:125
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: 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 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>"
+
+#: templates/personal.php:138
+msgid "Encryption"
+msgstr "Encryption"
+
+#: templates/personal.php:140
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr "The encryption app is no longer enabled, decrypt all your files"
+
+#: templates/personal.php:146
+msgid "Log-in password"
+msgstr "Log-in password"
+
+#: templates/personal.php:151
+msgid "Decrypt all Files"
+msgstr "Decrypt all Files"
+
+#: templates/users.php:21
+msgid "Login Name"
+msgstr "Login Name"
+
+#: templates/users.php:30
+msgid "Create"
+msgstr "Create"
+
+#: templates/users.php:36
+msgid "Admin Recovery Password"
+msgstr "Admin Recovery Password"
+
+#: templates/users.php:37 templates/users.php:38
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr "Enter the recovery password in order to recover the user's files during password change"
+
+#: templates/users.php:42
+msgid "Default Storage"
+msgstr "Default Storage"
+
+#: templates/users.php:48 templates/users.php:148
+msgid "Unlimited"
+msgstr "Unlimited"
+
+#: templates/users.php:66 templates/users.php:163
+msgid "Other"
+msgstr "Other"
+
+#: templates/users.php:87
+msgid "Username"
+msgstr "Username"
+
+#: templates/users.php:94
+msgid "Storage"
+msgstr "Storage"
+
+#: templates/users.php:108
+msgid "change display name"
+msgstr "change display name"
+
+#: templates/users.php:112
+msgid "set new password"
+msgstr "set new password"
+
+#: templates/users.php:143
+msgid "Default"
+msgstr "Default"
diff --git a/l10n/en_GB/user_ldap.po b/l10n/en_GB/user_ldap.po
new file mode 100644
index 0000000000000000000000000000000000000000..419452929a171c42e58233090353613ba839436e
--- /dev/null
+++ b/l10n/en_GB/user_ldap.po
@@ -0,0 +1,407 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+# mnestis <transifex@mnestis.net>, 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: 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"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en_GB\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr "Failed to clear the mappings."
+
+#: ajax/deleteConfiguration.php:34
+msgid "Failed to delete the server configuration"
+msgstr "Failed to delete the server configuration"
+
+#: ajax/testConfiguration.php:36
+msgid "The configuration is valid and the connection could be established!"
+msgstr "The configuration is valid and the connection could be established!"
+
+#: ajax/testConfiguration.php:39
+msgid ""
+"The configuration is valid, but the Bind failed. Please check the server "
+"settings and credentials."
+msgstr "The configuration is valid, but the Bind failed. Please check the server settings and credentials."
+
+#: ajax/testConfiguration.php:43
+msgid ""
+"The configuration is invalid. Please look in the ownCloud log for further "
+"details."
+msgstr "The configuration is invalid. Please look in the ownCloud log for further details."
+
+#: js/settings.js:66
+msgid "Deletion failed"
+msgstr "Deletion failed"
+
+#: js/settings.js:82
+msgid "Take over settings from recent server configuration?"
+msgstr "Take over settings from recent server configuration?"
+
+#: js/settings.js:83
+msgid "Keep settings?"
+msgstr "Keep settings?"
+
+#: js/settings.js:97
+msgid "Cannot add server configuration"
+msgstr "Cannot add server configuration"
+
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr "mappings cleared"
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "Success"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Error"
+
+#: js/settings.js:141
+msgid "Connection test succeeded"
+msgstr "Connection test succeeded"
+
+#: js/settings.js:146
+msgid "Connection test failed"
+msgstr "Connection test failed"
+
+#: js/settings.js:156
+msgid "Do you really want to delete the current Server Configuration?"
+msgstr "Do you really want to delete the current Server Configuration?"
+
+#: js/settings.js:157
+msgid "Confirm Deletion"
+msgstr "Confirm Deletion"
+
+#: 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 "<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."
+
+#: 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 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it."
+
+#: templates/settings.php:16
+msgid "Server configuration"
+msgstr "Server configuration"
+
+#: templates/settings.php:32
+msgid "Add Server Configuration"
+msgstr "Add Server Configuration"
+
+#: templates/settings.php:37
+msgid "Host"
+msgstr "Host"
+
+#: templates/settings.php:39
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr "You can omit the protocol, except you require SSL. Then start with ldaps://"
+
+#: templates/settings.php:40
+msgid "Base DN"
+msgstr "Base DN"
+
+#: templates/settings.php:41
+msgid "One Base DN per line"
+msgstr "One Base DN per line"
+
+#: templates/settings.php:42
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr "You can specify Base DN for users and groups in the Advanced tab"
+
+#: templates/settings.php:44
+msgid "User DN"
+msgstr "User DN"
+
+#: 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 "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."
+
+#: templates/settings.php:47
+msgid "Password"
+msgstr "Password"
+
+#: templates/settings.php:50
+msgid "For anonymous access, leave DN and Password empty."
+msgstr "For anonymous access, leave DN and Password empty."
+
+#: templates/settings.php:51
+msgid "User Login Filter"
+msgstr "User Login Filter"
+
+#: 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 "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\""
+
+#: templates/settings.php:55
+msgid "User List Filter"
+msgstr "User List Filter"
+
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
+msgstr "Defines the filter to apply, when retrieving users (no placeholders). Example: \"objectClass=person\""
+
+#: templates/settings.php:59
+msgid "Group Filter"
+msgstr "Group Filter"
+
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
+msgstr "Defines the filter to apply, when retrieving groups (no placeholders). Example: \"objectClass=posixGroup\""
+
+#: templates/settings.php:66
+msgid "Connection Settings"
+msgstr "Connection Settings"
+
+#: templates/settings.php:68
+msgid "Configuration Active"
+msgstr "Configuration Active"
+
+#: templates/settings.php:68
+msgid "When unchecked, this configuration will be skipped."
+msgstr "When unchecked, this configuration will be skipped."
+
+#: templates/settings.php:69
+msgid "Port"
+msgstr "Port"
+
+#: templates/settings.php:70
+msgid "Backup (Replica) Host"
+msgstr "Backup (Replica) Host"
+
+#: templates/settings.php:70
+msgid ""
+"Give an optional backup host. It must be a replica of the main LDAP/AD "
+"server."
+msgstr "Give an optional backup host. It must be a replica of the main LDAP/AD server."
+
+#: templates/settings.php:71
+msgid "Backup (Replica) Port"
+msgstr "Backup (Replica) Port"
+
+#: templates/settings.php:72
+msgid "Disable Main Server"
+msgstr "Disable Main Server"
+
+#: templates/settings.php:72
+msgid "Only connect to the replica server."
+msgstr "Only connect to the replica server."
+
+#: templates/settings.php:73
+msgid "Use TLS"
+msgstr "Use TLS"
+
+#: templates/settings.php:73
+msgid "Do not use it additionally for LDAPS connections, it will fail."
+msgstr "Do not use it additionally for LDAPS connections, it will fail."
+
+#: templates/settings.php:74
+msgid "Case insensitve LDAP server (Windows)"
+msgstr "Case insensitve LDAP server (Windows)"
+
+#: templates/settings.php:75
+msgid "Turn off SSL certificate validation."
+msgstr "Turn off SSL certificate validation."
+
+#: 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 "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."
+
+#: templates/settings.php:76
+msgid "Cache Time-To-Live"
+msgstr "Cache Time-To-Live"
+
+#: templates/settings.php:76
+msgid "in seconds. A change empties the cache."
+msgstr "in seconds. A change empties the cache."
+
+#: templates/settings.php:78
+msgid "Directory Settings"
+msgstr "Directory Settings"
+
+#: templates/settings.php:80
+msgid "User Display Name Field"
+msgstr "User Display Name Field"
+
+#: templates/settings.php:80
+msgid "The LDAP attribute to use to generate the user's display name."
+msgstr "The LDAP attribute to use to generate the user's display name."
+
+#: templates/settings.php:81
+msgid "Base User Tree"
+msgstr "Base User Tree"
+
+#: templates/settings.php:81
+msgid "One User Base DN per line"
+msgstr "One User Base DN per line"
+
+#: templates/settings.php:82
+msgid "User Search Attributes"
+msgstr "User Search Attributes"
+
+#: templates/settings.php:82 templates/settings.php:85
+msgid "Optional; one attribute per line"
+msgstr "Optional; one attribute per line"
+
+#: templates/settings.php:83
+msgid "Group Display Name Field"
+msgstr "Group Display Name Field"
+
+#: templates/settings.php:83
+msgid "The LDAP attribute to use to generate the groups's display name."
+msgstr "The LDAP attribute to use to generate the group's display name."
+
+#: templates/settings.php:84
+msgid "Base Group Tree"
+msgstr "Base Group Tree"
+
+#: templates/settings.php:84
+msgid "One Group Base DN per line"
+msgstr "One Group Base DN per line"
+
+#: templates/settings.php:85
+msgid "Group Search Attributes"
+msgstr "Group Search Attributes"
+
+#: templates/settings.php:86
+msgid "Group-Member association"
+msgstr "Group-Member association"
+
+#: templates/settings.php:88
+msgid "Special Attributes"
+msgstr "Special Attributes"
+
+#: templates/settings.php:90
+msgid "Quota Field"
+msgstr "Quota Field"
+
+#: templates/settings.php:91
+msgid "Quota Default"
+msgstr "Quota Default"
+
+#: templates/settings.php:91
+msgid "in bytes"
+msgstr "in bytes"
+
+#: templates/settings.php:92
+msgid "Email Field"
+msgstr "Email Field"
+
+#: templates/settings.php:93
+msgid "User Home Folder Naming Rule"
+msgstr "User Home Folder Naming Rule"
+
+#: templates/settings.php:93
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute."
+
+#: templates/settings.php:98
+msgid "Internal Username"
+msgstr "Internal Username"
+
+#: 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 "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."
+
+#: templates/settings.php:100
+msgid "Internal Username Attribute:"
+msgstr "Internal Username Attribute:"
+
+#: templates/settings.php:101
+msgid "Override UUID detection"
+msgstr "Override UUID detection"
+
+#: 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 "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."
+
+#: templates/settings.php:103
+msgid "UUID Attribute:"
+msgstr "UUID Attribute:"
+
+#: templates/settings.php:104
+msgid "Username-LDAP User Mapping"
+msgstr "Username-LDAP User Mapping"
+
+#: 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 "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."
+
+#: templates/settings.php:106
+msgid "Clear Username-LDAP User Mapping"
+msgstr "Clear Username-LDAP User Mapping"
+
+#: templates/settings.php:106
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr "Clear Groupname-LDAP Group Mapping"
+
+#: templates/settings.php:108
+msgid "Test Configuration"
+msgstr "Test Configuration"
+
+#: templates/settings.php:108
+msgid "Help"
+msgstr "Help"
diff --git a/l10n/en_GB/user_webdavauth.po b/l10n/en_GB/user_webdavauth.po
new file mode 100644
index 0000000000000000000000000000000000000000..7688c63036a6ce69553304c1036dc08fb0de4e7f
--- /dev/null
+++ b/l10n/en_GB/user_webdavauth.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+# mnestis <transifex@mnestis.net>, 2013
+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-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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en_GB\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr "WebDAV Authentication"
+
+#: templates/settings.php:4
+msgid "Address: "
+msgstr "Address: "
+
+#: 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 "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."
diff --git a/l10n/eo/core.po b/l10n/eo/core.po
index bb093524fc056805e0a785226171bd42e05e8468..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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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"
@@ -24,6 +24,10 @@ msgstr ""
msgid "%s shared »%s« with you"
msgstr "%s kunhavigis “%s” kun vi"
+#: ajax/share.php:227
+msgid "group"
+msgstr "grupo"
+
#: ajax/update.php:11
msgid "Turned on maintenance mode"
msgstr ""
@@ -88,6 +92,26 @@ msgstr "Neniu kategorio elektiĝis por forigo."
msgid "Error removing %s from favorites."
msgstr "Eraro dum forigo de %s el favoratoj."
+#: 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 "dimanĉo"
@@ -164,59 +188,59 @@ msgstr "Novembro"
msgid "December"
msgstr "Decembro"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "Agordo"
-#: js/js.js:812
+#: js/js.js:866
msgid "seconds ago"
msgstr "sekundoj antaŭe"
-#: js/js.js:813
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:814
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:815
+#: js/js.js:869
msgid "today"
msgstr "hodiaŭ"
-#: js/js.js:816
+#: js/js.js:870
msgid "yesterday"
msgstr "hieraŭ"
-#: js/js.js:817
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:818
+#: js/js.js:872
msgid "last month"
msgstr "lastamonate"
-#: js/js.js:819
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:820
+#: js/js.js:874
msgid "months ago"
msgstr "monatoj antaŭe"
-#: js/js.js:821
+#: js/js.js:875
msgid "last year"
msgstr "lastajare"
-#: js/js.js:822
+#: js/js.js:876
msgid "years ago"
msgstr "jaroj antaŭe"
@@ -224,22 +248,66 @@ msgstr "jaroj antaŭe"
msgid "Choose"
msgstr "Elekti"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "Jes"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "Ne"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr "Akcepti"
+#: 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 "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."
@@ -249,7 +317,7 @@ msgstr "Ne indikiĝis tipo de la objekto."
#: 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:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "Eraro"
@@ -269,7 +337,7 @@ msgstr "Dividita"
msgid "Share"
msgstr "Kunhavigi"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr "Eraro dum kunhavigo"
@@ -325,67 +393,67 @@ msgstr "Agordi limdaton"
msgid "Expiration date"
msgstr "Limdato"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "Kunhavigi per retpoŝto:"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "Ne troviĝis gento"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "Rekunhavigo ne permesatas"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr "Kunhavigita en {item} kun {user}"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "Malkunhavigi"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "povas redakti"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "alirkontrolo"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "krei"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "ĝisdatigi"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "forigi"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "kunhavigi"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "Protektita per pasvorto"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr "Eraro dum malagordado de limdato"
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr "Eraro dum agordado de limdato"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr "Sendante..."
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr "La retpoŝtaĵo sendiĝis"
@@ -400,7 +468,7 @@ msgstr "La ĝisdatigo estis malsukcese. Bonvolu raporti tiun problemon al la <a
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "La ĝisdatigo estis sukcesa. Alidirektante nun al ownCloud."
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr ""
@@ -469,7 +537,7 @@ msgstr "Persona"
msgid "Users"
msgstr "Uzantoj"
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "Aplikaĵoj"
@@ -598,14 +666,10 @@ msgstr "Fini la instalon"
msgid "%s is available. Get more information on how to update."
msgstr "%s haveblas. Ekhavi pli da informo pri kiel ĝisdatigi."
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "Elsaluti"
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "La aŭtomata ensaluto malakceptiĝis!"
@@ -620,19 +684,19 @@ msgstr "Se vi ne ŝanĝis vian pasvorton lastatempe, via konto eble kompromitas!
msgid "Please change your password to secure your account again."
msgstr "Bonvolu ŝanĝi vian pasvorton por sekurigi vian konton ree."
-#: templates/login.php:34
+#: templates/login.php:32
msgid "Lost your password?"
msgstr "Ĉu vi perdis vian pasvorton?"
-#: templates/login.php:39
+#: templates/login.php:37
msgid "remember"
msgstr "memori"
-#: templates/login.php:41
+#: templates/login.php:39
msgid "Log in"
msgstr "Ensaluti"
-#: templates/login.php:47
+#: templates/login.php:45
msgid "Alternative Logins"
msgstr "Alternativaj ensalutoj"
diff --git a/l10n/eo/files.po b/l10n/eo/files.po
index 6ca34ebb8123f56f339c232f9364caf49a438572..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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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,7 +75,15 @@ msgstr "Malsukcesis skribo al disko"
msgid "Not enough storage available"
msgstr "Ne haveblas sufiĉa memoro"
-#: ajax/upload.php:123
+#: 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 "Nevalida dosierujo."
@@ -83,149 +91,157 @@ 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: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 "Dosieralŝuto plenumiĝas. Lasi la paĝon nun nuligus la alŝuton."
-#: js/file-upload.js:241
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr "URL ne povas esti malplena."
-#: 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 "Nevalida dosierujnomo. La uzo de “Shared” estas rezervita de ownCloud."
-#: js/file-upload.js:277 js/file-upload.js:293 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 "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:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "Traktotaj"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{new_name} jam ekzistas"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "anstataŭigi"
-#: js/filelist.js:303
+#: js/filelist.js:416
msgid "suggest name"
msgstr "sugesti nomon"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "nuligi"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr "anstataŭiĝis {new_name} per {old_name}"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "undo"
msgstr "malfari"
-#: js/filelist.js:453
+#: 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/filelist.js:518
-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: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 "Nomo"
-#: js/files.js:563 templates/index.php:78
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "Grando"
-#: js/files.js:564 templates/index.php:80
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr "Modifita"
-#: js/files.js:580
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/files.js:586
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-
#: lib/app.php:73
#, php-format
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"
@@ -261,84 +277,68 @@ 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:73
+#: templates/index.php:67
msgid "Download"
msgstr "Elŝuti"
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr "Malkunhavigi"
-#: templates/index.php:91 templates/index.php:92
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "Forigi"
-#: templates/index.php:105
+#: templates/index.php:100
msgid "Upload too large"
msgstr "Alŝuto tro larĝa"
-#: 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 "La dosieroj, kiujn vi provas alŝuti, transpasas la maksimuman grandon por dosieralŝutoj en ĉi tiu servilo."
-#: templates/index.php:112
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr "Dosieroj estas skanataj, bonvolu atendi."
-#: templates/index.php:115
+#: templates/index.php:110
msgid "Current scanning"
msgstr "Nuna skano"
-#: templates/part.list.php:74
-msgid "directory"
-msgstr ""
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr ""
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr "dosiero"
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr "dosieroj"
-
#: templates/upgrade.php:2
msgid "Upgrading filesystem cache..."
msgstr "Ĝisdatiĝas dosiersistema kaŝmemoro..."
diff --git a/l10n/eo/files_sharing.po b/l10n/eo/files_sharing.po
index 215f134b838028cb60ff8b8aa21cb382c820165c..cc9cb10772a832d3345f784047e1be90fb5aa07e 100644
--- a/l10n/eo/files_sharing.po
+++ b/l10n/eo/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00: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"
@@ -63,7 +63,7 @@ msgstr "%s kunhavigis la dosierujon %s kun vi"
msgid "%s shared the file %s with you"
msgstr "%s kunhavigis la dosieron %s kun vi"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "Elŝuti"
@@ -75,6 +75,6 @@ msgstr "Alŝuti"
msgid "Cancel upload"
msgstr "Nuligi alŝuton"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "Ne haveblas antaŭvido por"
diff --git a/l10n/eo/lib.po b/l10n/eo/lib.po
index 4f336569e993cf129e2f919d8d5770b96ed4a319..355fcf739840dea8af368efa5fabebfa7f731254 100644
--- a/l10n/eo/lib.po
+++ b/l10n/eo/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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\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"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
@@ -49,11 +49,23 @@ msgstr "Uzantoj"
msgid "Admin"
msgstr "Administranto"
-#: app.php:837
+#: 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 "TTT-servoj regataj de vi"
@@ -106,37 +118,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: 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:150
+#: 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:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -265,51 +277,51 @@ msgstr "Via TTT-servilo ankoraŭ ne ĝuste agordiĝis por permesi sinkronigi dos
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Bonvolu duoble kontroli la <a href='%s'>gvidilon por instalo</a>."
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "sekundoj antaŭe"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "hodiaŭ"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "hieraŭ"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "lastamonate"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "lastajare"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "jaroj antaŭe"
diff --git a/l10n/eo/settings.po b/l10n/eo/settings.po
index e45c1e0d27b9a96b7939aa25948d84cb5ceec570..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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+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,55 +84,88 @@ msgstr "Ne eblis forigi la uzantan el la grupo %s"
msgid "Couldn't update app."
msgstr ""
-#: js/apps.js:35
+#: 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:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr "Malkapabligi"
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr "Kapabligi"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr ""
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "Eraro"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr "Ĝisdatigi"
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr ""
-#: js/personal.js:150
+#: 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:172
+#: js/personal.js:287
msgid "Saving..."
msgstr "Konservante..."
@@ -148,16 +181,16 @@ msgstr "malfari"
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "Grupoj"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "Grupadministranto"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "Forigi"
@@ -177,7 +210,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "Esperanto"
@@ -343,11 +376,11 @@ msgstr "Pli"
msgid "Less"
msgstr "Malpli"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "Eldono"
-#: templates/admin.php:246 templates/personal.php:143
+#: 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 "
@@ -414,7 +447,7 @@ msgstr ""
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Vi uzas <strong>%s</strong> el la haveblaj <strong>%s</strong>"
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "Pasvorto"
@@ -438,7 +471,7 @@ msgstr "Nova pasvorto"
msgid "Change password"
msgstr "Ŝanĝi la pasvorton"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr ""
@@ -454,38 +487,66 @@ msgstr "Via retpoŝta adreso"
msgid "Fill in an email address to enable password recovery"
msgstr "Enigu retpoŝtadreson por kapabligi pasvortan restaŭron"
-#: templates/personal.php:85 templates/personal.php:86
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr "Profila bildo"
+
+#: 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 "Lingvo"
-#: templates/personal.php:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "Helpu traduki"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: 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:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "Ĉifrado"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -511,30 +572,30 @@ msgstr ""
msgid "Default Storage"
msgstr "Defaŭlta konservejo"
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr "Senlima"
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "Alia"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "Uzantonomo"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr "Konservejo"
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr ""
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr ""
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr "Defaŭlta"
diff --git a/l10n/eo/user_ldap.po b/l10n/eo/user_ldap.po
index 40492891983125ecacd5d325241b976232b56b04..ea6f21e2c8888bf7961c2482bc790eccdc85a219 100644
--- a/l10n/eo/user_ldap.po
+++ b/l10n/eo/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\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"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/es/core.po b/l10n/es/core.po
index e9cb5b8f9a038b27cd0c42d0618c73a6e26cebc8..5e96058e82f7255f6df62da85563fe0cd978917f 100644
--- a/l10n/es/core.po
+++ b/l10n/es/core.po
@@ -8,6 +8,7 @@
# I Robot <owncloud-bot@tmit.eu>, 2013
# msoko <sokolovitch@yahoo.com>, 2013
# pablomillaquen <pablomillaquen@gmail.com>, 2013
+# Korrosivo <yo@rubendelcampo.es>, 2013
# saskarip <saskarip@gmail.com>, 2013
# saskarip <saskarip@gmail.com>, 2013
# iGerli <stefano@aerosoles.net>, 2013
@@ -16,8 +17,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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"
@@ -29,32 +30,36 @@ msgstr ""
#: ajax/share.php:97
#, php-format
msgid "%s shared »%s« with you"
-msgstr "%s compatido »%s« contigo"
+msgstr "%s ha compatido »%s« contigo"
+
+#: ajax/share.php:227
+msgid "group"
+msgstr "grupo"
#: ajax/update.php:11
msgid "Turned on maintenance mode"
-msgstr ""
+msgstr "Modo mantenimiento activado"
#: ajax/update.php:14
msgid "Turned off maintenance mode"
-msgstr ""
+msgstr "Modo mantenimiento desactivado"
#: ajax/update.php:17
msgid "Updated database"
-msgstr ""
+msgstr "Base de datos actualizada"
#: ajax/update.php:20
msgid "Updating filecache, this may take really long..."
-msgstr ""
+msgstr "Actualizando caché de archivos, esto puede tardar bastante tiempo..."
#: ajax/update.php:23
msgid "Updated filecache"
-msgstr ""
+msgstr "Caché de archivos actualizada"
#: ajax/update.php:26
#, php-format
msgid "... %d%% done ..."
-msgstr ""
+msgstr "... %d%% hecho ..."
#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
msgid "Category type not provided."
@@ -95,6 +100,26 @@ msgstr "No hay categorías seleccionadas para borrar."
msgid "Error removing %s from favorites."
msgstr "Error eliminando %s de los favoritos."
+#: 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 "Domingo"
@@ -171,82 +196,126 @@ msgstr "Noviembre"
msgid "December"
msgstr "Diciembre"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "Ajustes"
-#: js/js.js:812
+#: js/js.js:866
msgid "seconds ago"
-msgstr "hace segundos"
+msgstr "segundos antes"
-#: js/js.js:813
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Hace %n minuto"
+msgstr[1] "Hace %n minutos"
-#: js/js.js:814
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Hace %n hora"
+msgstr[1] "Hace %n horas"
-#: js/js.js:815
+#: js/js.js:869
msgid "today"
msgstr "hoy"
-#: js/js.js:816
+#: js/js.js:870
msgid "yesterday"
msgstr "ayer"
-#: js/js.js:817
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Hace %n día"
+msgstr[1] "Hace %n días"
-#: js/js.js:818
+#: js/js.js:872
msgid "last month"
msgstr "el mes pasado"
-#: js/js.js:819
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Hace %n mes"
+msgstr[1] "Hace %n meses"
-#: js/js.js:820
+#: js/js.js:874
msgid "months ago"
-msgstr "hace meses"
+msgstr "meses antes"
-#: js/js.js:821
+#: js/js.js:875
msgid "last year"
msgstr "el año pasado"
-#: js/js.js:822
+#: js/js.js:876
msgid "years ago"
-msgstr "hace años"
+msgstr "años antes"
#: js/oc-dialogs.js:123
msgid "Choose"
msgstr "Seleccionar"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
-msgstr "Error cargando la plantilla del seleccionador de archivos"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
+msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "Sí"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "No"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr "Aceptar"
+#: 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 "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."
@@ -256,7 +325,7 @@ msgstr "El tipo de objeto no está especificado."
#: 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:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "Error"
@@ -266,7 +335,7 @@ msgstr "El nombre de la aplicación no está especificado."
#: js/oc-vcategories.js:194
msgid "The required file {file} is not installed!"
-msgstr "¡El fichero requerido {file} no está instalado!"
+msgstr "¡El fichero {file} es necesario y no está instalado!"
#: js/share.js:30 js/share.js:45 js/share.js:87
msgid "Shared"
@@ -276,17 +345,17 @@ msgstr "Compartido"
msgid "Share"
msgstr "Compartir"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
-msgstr "Error mientras comparte"
+msgstr "Error al compartir"
#: js/share.js:142
msgid "Error while unsharing"
-msgstr "Error mientras se deja de compartir"
+msgstr "Error al dejar de compartir"
#: js/share.js:149
msgid "Error while changing permissions"
-msgstr "Error mientras se cambia permisos"
+msgstr "Error al cambiar permisos"
#: js/share.js:158
msgid "Shared with you and the group {group} by {owner}"
@@ -332,67 +401,67 @@ msgstr "Establecer fecha de caducidad"
msgid "Expiration date"
msgstr "Fecha de caducidad"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "Compartir por correo electrónico:"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "No se encontró gente"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "No se permite compartir de nuevo"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr "Compartido en {item} con {user}"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "Dejar de compartir"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "puede editar"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "control de acceso"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "crear"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "actualizar"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "eliminar"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "compartir"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "Protegido con contraseña"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr "Error eliminando fecha de caducidad"
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr "Error estableciendo fecha de caducidad"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr "Enviando..."
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr "Correo electrónico enviado"
@@ -407,10 +476,10 @@ msgstr "La actualización ha fracasado. Por favor, informe de este problema a la
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "La actualización se ha realizado con éxito. Redireccionando a ownCloud ahora."
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
-msgstr ""
+msgstr "%s restablecer contraseña"
#: lostpassword/templates/email.php:2
msgid "Use the following link to reset your password: {link}"
@@ -476,7 +545,7 @@ msgstr "Personal"
msgid "Users"
msgstr "Usuarios"
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "Aplicaciones"
@@ -490,7 +559,7 @@ msgstr "Ayuda"
#: templates/403.php:12
msgid "Access forbidden"
-msgstr "Acceso prohibido"
+msgstr "Acceso denegado"
#: templates/404.php:15
msgid "Cloud not found"
@@ -505,7 +574,7 @@ msgid ""
"View it: %s\n"
"\n"
"Cheers!"
-msgstr "Oye,⏎ sólo te hago saber que %s compartido %s contigo.⏎ Míralo: %s ⏎Disfrutalo!"
+msgstr "Hey,\n\nsólo te hago saber que %s ha compartido %s contigo.\nEcha un ojo en: %s\n\n¡Un saludo!"
#: templates/edit_categories_dialog.php:4
msgid "Edit categories"
@@ -605,14 +674,10 @@ msgstr "Completar la instalación"
msgid "%s is available. Get more information on how to update."
msgstr "%s esta disponible. Obtener mas información de como actualizar."
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "Salir"
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "¡Inicio de sesión automático rechazado!"
@@ -621,25 +686,25 @@ msgstr "¡Inicio de sesión automático rechazado!"
msgid ""
"If you did not change your password recently, your account may be "
"compromised!"
-msgstr "Si usted no ha cambiado su contraseña recientemente, ¡puede que su cuenta esté comprometida!"
+msgstr "Si no ha cambiado su contraseña recientemente, ¡puede que su cuenta esté comprometida!"
#: templates/login.php:12
msgid "Please change your password to secure your account again."
msgstr "Por favor cambie su contraseña para asegurar su cuenta nuevamente."
-#: templates/login.php:34
+#: templates/login.php:32
msgid "Lost your password?"
msgstr "¿Ha perdido su contraseña?"
-#: templates/login.php:39
+#: templates/login.php:37
msgid "remember"
msgstr "recordar"
-#: templates/login.php:41
+#: templates/login.php:39
msgid "Log in"
msgstr "Entrar"
-#: templates/login.php:47
+#: templates/login.php:45
msgid "Alternative Logins"
msgstr "Inicios de sesión alternativos"
@@ -648,7 +713,7 @@ msgstr "Inicios de sesión alternativos"
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 "Oye,<br><br>sólo te hago saber que %s compartido %s contigo,<br><a href=\"%s\">\nMíralo!</a><br><br>Disfrutalo!"
+msgstr "Hey,<br><br>sólo te hago saber que %s ha compartido %s contigo.<br><a href=\"%s\">¡Echa un ojo!</a><br><br>¡Un saludo!"
#: templates/update.php:3
#, php-format
diff --git a/l10n/es/files.po b/l10n/es/files.po
index b396e7708121669d9a24c9bc97a2749bf3662d15..a4058e8958c7e29d4294dabfbf61af090f1eec6a 100644
--- a/l10n/es/files.po
+++ b/l10n/es/files.po
@@ -7,13 +7,14 @@
# ggam <ggam@brainleakage.com>, 2013
# mikelanabitarte <mikelanabitarte@gmail.com>, 2013
# qdneren <renanqd@yahoo.com.mx>, 2013
+# Korrosivo <yo@rubendelcampo.es>, 2013
# saskarip <saskarip@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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 (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
@@ -79,7 +80,15 @@ msgstr "Falló al escribir al disco"
msgid "Not enough storage available"
msgstr "No hay suficiente espacio disponible"
-#: ajax/upload.php:123
+#: 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 "Directorio inválido."
@@ -87,149 +96,157 @@ 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: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 "La subida del archivo está en proceso. Si sale de la página ahora cancelará la subida."
-#: js/file-upload.js:241
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr "La URL no puede estar vacía."
-#: 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 "Nombre de carpeta invalido. El uso de \"Shared\" está reservado por ownCloud"
-#: js/file-upload.js:277 js/file-upload.js:293 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 "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:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "Pendiente"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{new_name} ya existe"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "reemplazar"
-#: js/filelist.js:303
+#: js/filelist.js:416
msgid "suggest name"
msgstr "sugerir nombre"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "cancelar"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr "reemplazado {new_name} con {old_name}"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "undo"
msgstr "deshacer"
-#: js/filelist.js:453
-msgid "Uploading %n file"
-msgid_plural "Uploading %n files"
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
+msgid "%n folder"
+msgid_plural "%n folders"
msgstr[0] ""
-msgstr[1] ""
+msgstr[1] "%n carpetas"
-#: js/filelist.js:518
-msgid "files uploading"
-msgstr "subiendo archivos"
+#: 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:541
+msgid "{dirs} and {files}"
+msgstr "{dirs} y {files}"
+
+#: 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/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 ""
+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: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 "Nombre"
-#: js/files.js:563 templates/index.php:78
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "Tamaño"
-#: js/files.js:564 templates/index.php:80
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr "Modificado"
-#: js/files.js:580
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/files.js:586
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-
#: lib/app.php:73
#, php-format
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"
@@ -265,84 +282,68 @@ 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:73
+#: templates/index.php:67
msgid "Download"
msgstr "Descargar"
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr "Dejar de compartir"
-#: templates/index.php:91 templates/index.php:92
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "Eliminar"
-#: templates/index.php:105
+#: templates/index.php:100
msgid "Upload too large"
msgstr "Subida demasido grande"
-#: 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 "Los archivos que estás intentando subir sobrepasan el tamaño máximo permitido en este servidor."
-#: templates/index.php:112
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr "Los archivos están siendo escaneados, por favor espere."
-#: templates/index.php:115
+#: templates/index.php:110
msgid "Current scanning"
msgstr "Escaneo actual"
-#: templates/part.list.php:74
-msgid "directory"
-msgstr "carpeta"
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr "carpetas"
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr "archivo"
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr "archivos"
-
#: templates/upgrade.php:2
msgid "Upgrading filesystem cache..."
msgstr "Actualizando caché del sistema de archivos"
diff --git a/l10n/es/files_encryption.po b/l10n/es/files_encryption.po
index 7d0a9ee023695c312f78d59098c55fd856492282..e32866e30113b8fb588bd628a6f7705771521b1c 100644
--- a/l10n/es/files_encryption.po
+++ b/l10n/es/files_encryption.po
@@ -14,9 +14,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-21 08:10-0400\n"
-"PO-Revision-Date: 2013-08-19 19:20+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-05 07:36-0400\n"
+"PO-Revision-Date: 2013-09-03 18:20+0000\n"
+"Last-Translator: Korrosivo <yo@rubendelcampo.es>\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"
@@ -68,20 +68,20 @@ msgid ""
"files."
msgstr "¡Su clave privada no es válida! Tal vez su contraseña ha sido cambiada desde fuera. Puede actualizar su clave privada en sus opciones personales para recuperar el acceso a sus ficheros."
-#: hooks/hooks.php:41
+#: hooks/hooks.php:51
msgid "Missing requirements."
msgstr "Requisitos incompletos."
-#: hooks/hooks.php:42
+#: hooks/hooks.php:52
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 ""
+msgstr "Por favor, asegúrese de que PHP 5.3.3 o posterior está instalado y que la extensión OpenSSL de PHP está habilitada y configurada correctamente. Por el momento, la aplicación de cifrado ha sido deshabilitada."
-#: hooks/hooks.php:249
+#: hooks/hooks.php:250
msgid "Following users are not set up for encryption:"
-msgstr ""
+msgstr "Los siguientes usuarios no han sido configurados para el cifrado:"
#: js/settings-admin.js:11
msgid "Saving..."
diff --git a/l10n/es/files_sharing.po b/l10n/es/files_sharing.po
index 31ba6d42fae2491c4d20a7577ac7c04e160b25d9..26442ede404f6f510c24a04d2ce0a722917e6b31 100644
--- a/l10n/es/files_sharing.po
+++ b/l10n/es/files_sharing.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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
-"Last-Translator: Art O. Pal <artopal@fastmail.fm>\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"
"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"
@@ -33,7 +33,7 @@ msgstr "Enviar"
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
-msgstr "Este enlace parece no funcionar más."
+msgstr "Vaya, este enlace parece que no volverá a funcionar."
#: templates/part.404.php:4
msgid "Reasons might be:"
@@ -65,7 +65,7 @@ msgstr "%s compartió la carpeta %s contigo"
msgid "%s shared the file %s with you"
msgstr "%s compartió el fichero %s contigo"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "Descargar"
@@ -77,6 +77,6 @@ msgstr "Subir"
msgid "Cancel upload"
msgstr "Cancelar subida"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "No hay vista previa disponible para"
diff --git a/l10n/es/files_trashbin.po b/l10n/es/files_trashbin.po
index beb34a8115ec05a6a26c126fb9b2abb01638064d..2f439a315fdb2a9fe58cdc0523c076812dbfce4d 100644
--- a/l10n/es/files_trashbin.po
+++ b/l10n/es/files_trashbin.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-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-05 07:36-0400\n"
+"PO-Revision-Date: 2013-09-03 18:16+0000\n"
+"Last-Translator: Korrosivo <yo@rubendelcampo.es>\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"
@@ -29,43 +29,43 @@ msgstr "No se puede eliminar %s permanentemente"
msgid "Couldn't restore %s"
msgstr "No se puede restaurar %s"
-#: js/trash.js:7 js/trash.js:100
+#: js/trash.js:7 js/trash.js:102
msgid "perform restore operation"
msgstr "restaurar"
-#: 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 "Error"
-#: js/trash.js:36
+#: js/trash.js:37
msgid "delete file permanently"
msgstr "eliminar archivo permanentemente"
-#: js/trash.js:127
+#: js/trash.js:129
msgid "Delete permanently"
msgstr "Eliminar permanentemente"
-#: js/trash.js:182 templates/index.php:17
+#: js/trash.js:184 templates/index.php:17
msgid "Name"
msgstr "Nombre"
-#: js/trash.js:183 templates/index.php:27
+#: js/trash.js:185 templates/index.php:27
msgid "Deleted"
msgstr "Eliminado"
-#: js/trash.js:191
+#: js/trash.js:193
msgid "%n folder"
msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n carpeta"
+msgstr[1] "%n carpetas"
-#: js/trash.js:197
+#: js/trash.js:199
msgid "%n file"
msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n archivo"
+msgstr[1] "%n archivos"
-#: lib/trash.php:819 lib/trash.php:821
+#: lib/trash.php:814 lib/trash.php:816
msgid "restored"
msgstr "recuperado"
diff --git a/l10n/es/files_versions.po b/l10n/es/files_versions.po
index 2c3194d68707062921fe825544b4522549527d8f..fa132a31fb73d53fdfa5f101b9288b03967af674 100644
--- a/l10n/es/files_versions.po
+++ b/l10n/es/files_versions.po
@@ -4,13 +4,14 @@
#
# Translators:
# Rodrigo Rodríguez <roirobo@ubuntu.org.ni>, 2013
+# Korrosivo <yo@rubendelcampo.es>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-13 09:11-0400\n"
-"PO-Revision-Date: 2013-08-13 05:50+0000\n"
-"Last-Translator: Rodrigo Rodríguez <roirobo@ubuntu.org.ni>\n"
+"POT-Creation-Date: 2013-09-05 07:36-0400\n"
+"PO-Revision-Date: 2013-09-03 18:20+0000\n"
+"Last-Translator: Korrosivo <yo@rubendelcampo.es>\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"
@@ -33,12 +34,12 @@ msgstr "No se ha podido revertir {archivo} a revisión {timestamp}."
#: js/versions.js:79
msgid "More versions..."
-msgstr "Más..."
+msgstr "Más versiones..."
#: js/versions.js:116
msgid "No other versions available"
msgstr "No hay otras versiones disponibles"
-#: js/versions.js:149
+#: js/versions.js:145
msgid "Restore"
msgstr "Recuperar"
diff --git a/l10n/es/lib.po b/l10n/es/lib.po
index 45ab92b80c16c979f4f5860b08871a1b35f216f9..319d9f9f13be6dd00912e7ea0f14cc68333d8924 100644
--- a/l10n/es/lib.po
+++ b/l10n/es/lib.po
@@ -3,14 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Dharth <emilpg@gmail.com>, 2013
# pablomillaquen <pablomillaquen@gmail.com>, 2013
+# Korrosivo <yo@rubendelcampo.es>, 2013
# xhiena <xhiena@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\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"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
@@ -24,11 +26,11 @@ msgstr ""
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
-msgstr ""
+msgstr "La aplicación \"%s\" no puede ser instalada porque no es compatible con esta versión de ownCloud"
#: app.php:250
msgid "No app name specified"
-msgstr ""
+msgstr "No se ha especificado nombre de la aplicación"
#: app.php:361
msgid "Help"
@@ -50,11 +52,23 @@ msgstr "Usuarios"
msgid "Admin"
msgstr "Administración"
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "Falló la actualización \"%s\"."
+#: 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 "Servicios web bajo su control"
@@ -88,59 +102,59 @@ msgstr "Descargue los archivos en trozos más pequeños, por separado o solicít
#: installer.php:63
msgid "No source specified when installing app"
-msgstr ""
+msgstr "No se ha especificado origen cuando se ha instalado la aplicación"
#: installer.php:70
msgid "No href specified when installing app from http"
-msgstr ""
+msgstr "No href especificado cuando se ha instalado la aplicación"
#: installer.php:75
msgid "No path specified when installing app from local file"
-msgstr ""
+msgstr "Sin path especificado cuando se ha instalado la aplicación desde el fichero local"
#: installer.php:89
#, php-format
msgid "Archives of type %s are not supported"
-msgstr ""
+msgstr "Ficheros de tipo %s no son soportados"
#: installer.php:103
msgid "Failed to open archive when installing app"
-msgstr ""
+msgstr "Fallo de apertura de fichero mientras se instala la aplicación"
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
-msgstr ""
+msgstr "La aplicación no suministra un fichero info.xml"
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
-msgstr ""
+msgstr "La aplicación no puede ser instalada por tener código no autorizado en la aplicación"
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
-msgstr ""
+msgstr "La aplicación no se puede instalar porque no es compatible con esta versión de ownCloud"
-#: installer.php:144
+#: 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 "La aplicación no se puede instalar porque contiene la etiqueta\n<shipped>\ntrue\n</shipped>\nque no está permitida para aplicaciones no distribuidas"
-#: installer.php:150
+#: 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 "La aplicación no puede ser instalada por que la versión en info.xml/version no es la misma que la establecida en la app store"
-#: installer.php:160
+#: installer.php:162
msgid "App directory already exists"
-msgstr ""
+msgstr "El directorio de la aplicación ya existe"
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
-msgstr ""
+msgstr "No se puede crear la carpeta de la aplicación. Corrija los permisos. %s"
#: json.php:28
msgid "Application is not enabled"
@@ -179,7 +193,7 @@ msgstr "%s ingresar el nombre de la base de datos"
#: setup/abstractdatabase.php:28
#, php-format
msgid "%s you may not use dots in the database name"
-msgstr "%s no se puede utilizar puntos en el nombre de la base de datos"
+msgstr "%s puede utilizar puntos en el nombre de la base de datos"
#: setup/mssql.php:20
#, php-format
@@ -266,51 +280,51 @@ msgstr "Su servidor web aún no está configurado adecuadamente para permitir si
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Por favor, vuelva a comprobar las <a href='%s'>guías de instalación</a>."
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "hace segundos"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Hace %n minuto"
+msgstr[1] "Hace %n minutos"
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Hace %n hora"
+msgstr[1] "Hace %n horas"
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "hoy"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "ayer"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Hace %n día"
+msgstr[1] "Hace %n días"
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "mes pasado"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Hace %n mes"
+msgstr[1] "Hace %n meses"
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "año pasado"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "hace años"
diff --git a/l10n/es/settings.po b/l10n/es/settings.po
index 10adfedf5005432c70fb97b5f15f92864d27d4c9..f11743ea9540e9259807146b56064850ce611a49 100644
--- a/l10n/es/settings.po
+++ b/l10n/es/settings.po
@@ -4,19 +4,21 @@
#
# 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
# qdneren <renanqd@yahoo.com.mx>, 2013
+# Korrosivo <yo@rubendelcampo.es>, 2013
# saskarip <saskarip@gmail.com>, 2013
# scambra <sergio@programatica.es>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-26 08:01+0000\n"
-"Last-Translator: eadeprado <eadeprado@outlook.com>\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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -29,13 +31,13 @@ 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"
#: ajax/changedisplayname.php:31
msgid "Your display name has been changed."
-msgstr "Su nombre fue cambiado."
+msgstr "Su nombre de usuario ha sido cambiado."
#: ajax/changedisplayname.php:34
msgid "Unable to change display name"
@@ -91,55 +93,88 @@ msgstr "No se pudo eliminar al usuario del grupo %s"
msgid "Couldn't update app."
msgstr "No se pudo actualizar la aplicacion."
-#: js/apps.js:35
+#: 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}"
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr "Desactivar"
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr "Activar"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr "Espere, por favor...."
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
-msgstr ""
+msgstr "Error mientras se desactivaba la aplicación"
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
-msgstr ""
+msgstr "Error mientras se activaba la aplicación"
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr "Actualizando...."
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr "Error mientras se actualizaba la aplicación"
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "Error"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr "Actualizar"
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr "Actualizado"
-#: js/personal.js:150
+#: js/personal.js:220
+msgid "Select a profile picture"
+msgstr "Seleccionar una imagen de perfil"
+
+#: js/personal.js:265
msgid "Decrypting files... Please wait, this can take some time."
-msgstr ""
+msgstr "Descifrando archivos... Espere por favor, esto puede llevar algo de tiempo."
-#: js/personal.js:172
+#: js/personal.js:287
msgid "Saving..."
msgstr "Guardando..."
@@ -155,16 +190,16 @@ msgstr "deshacer"
msgid "Unable to remove user"
msgstr "No se puede eliminar el usuario"
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "Grupos"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "Administrador del Grupo"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "Eliminar"
@@ -184,7 +219,7 @@ msgstr "Error al crear usuario"
msgid "A valid password must be provided"
msgstr "Se debe proporcionar una contraseña valida"
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "Castellano"
@@ -199,7 +234,7 @@ msgid ""
"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 "Su directorio de datos y sus archivos probablemente están accesibles desde Internet. El archivo .htaccess no está funcionando. Nosotros le sugerimos encarecidamente que configure su servidor web de modo que el directorio de datos ya no sea accesible o que mueva el directorio de datos fuera de la raíz de documentos del servidor web."
+msgstr "Probablemente se puede acceder a su directorio de datos y sus archivos desde Internet. El archivo .htaccess no está funcionando. Nosotros le sugerimos encarecidamente que configure su servidor web de modo que el directorio de datos ya no sea accesible o que mueva el directorio de datos fuera de la raíz de documentos del servidor web."
#: templates/admin.php:29
msgid "Setup Warning"
@@ -218,13 +253,13 @@ msgstr "Por favor, vuelva a comprobar las <a href='%s'>guías de instalación</a
#: templates/admin.php:44
msgid "Module 'fileinfo' missing"
-msgstr "Módulo 'fileinfo' perdido"
+msgstr "No se ha encontrado el módulo \"fileinfo\""
#: 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 "El modulo PHP 'fileinfo' no se encuentra. Le recomendamos encarecidamente que habilite este módulo para obtener mejores resultados con la detección del mime-type"
+msgstr "No se ha encontrado el modulo PHP 'fileinfo'. Le recomendamos encarecidamente que habilite este módulo para obtener mejores resultados con la detección del mime-type"
#: templates/admin.php:58
msgid "Locale not working"
@@ -287,7 +322,7 @@ msgstr "Permitir enlaces"
#: templates/admin.php:135
msgid "Allow users to share items to the public with links"
-msgstr "Permitir a los usuarios compartir elementos al público con enlaces"
+msgstr "Permitir a los usuarios compartir elementos con el público mediante enlaces"
#: templates/admin.php:143
msgid "Allow public uploads"
@@ -350,11 +385,11 @@ msgstr "Más"
msgid "Less"
msgstr "Menos"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "Versión"
-#: templates/admin.php:246 templates/personal.php:143
+#: 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 "
@@ -378,11 +413,11 @@ msgstr "Seleccionar una aplicación"
#: templates/apps.php:39
msgid "See application page at apps.owncloud.com"
-msgstr "Echa un vistazo a la web de aplicaciones apps.owncloud.com"
+msgstr "Ver la página de aplicaciones en apps.owncloud.com"
#: templates/apps.php:41
msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
-msgstr "<span class=\"licence\"></span>-licenciado por <span class=\"author\"></span>"
+msgstr "<span class=\"licence\"></span>-licencia otorgada por <span class=\"author\"></span>"
#: templates/help.php:4
msgid "User Documentation"
@@ -414,14 +449,14 @@ msgstr "Obtener las aplicaciones para sincronizar sus archivos"
#: templates/personal.php:19
msgid "Show First Run Wizard again"
-msgstr "Mostrar asistente para iniciar otra vez"
+msgstr "Mostrar asistente para iniciar de nuevo"
#: templates/personal.php:27
#, php-format
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Ha usado <strong>%s</strong> de los <strong>%s</strong> disponibles"
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "Contraseña"
@@ -445,7 +480,7 @@ msgstr "Nueva contraseña"
msgid "Change password"
msgstr "Cambiar contraseña"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr "Nombre a mostrar"
@@ -461,40 +496,68 @@ msgstr "Su dirección de correo"
msgid "Fill in an email address to enable password recovery"
msgstr "Escriba una dirección de correo electrónico para restablecer la contraseña"
-#: templates/personal.php:85 templates/personal.php:86
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr "Foto del perfil"
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr "Subir nuevo"
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr "Seleccionar nuevo desde Ficheros"
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr "Borrar imagen"
+
+#: 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 "Abortar"
+
+#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr "Seleccionar como imagen de perfil"
+
+#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
msgstr "Idioma"
-#: templates/personal.php:98
+#: templates/personal.php:119
msgid "Help translate"
-msgstr "Ayúdnos a traducir"
+msgstr "Ayúdanos a traducir"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: 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 "Utilice esta dirección para<a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">acceder a sus archivos a través de WebDAV</a>"
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "Cifrado"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
-msgstr ""
+msgstr "La aplicación de cifrado no está activada, descifre sus archivos"
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
-msgstr ""
+msgstr "Contraseña de acceso"
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
-msgstr ""
+msgstr "Descifrar archivos"
#: templates/users.php:21
msgid "Login Name"
@@ -518,30 +581,30 @@ msgstr "Introduzca la contraseña de recuperación para recuperar los archivos d
msgid "Default Storage"
msgstr "Almacenamiento predeterminado"
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr "Ilimitado"
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "Otro"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "Nombre de usuario"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr "Almacenamiento"
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr "Cambiar nombre a mostrar"
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr "Configurar nueva contraseña"
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr "Predeterminado"
diff --git a/l10n/es/user_ldap.po b/l10n/es/user_ldap.po
index a823ac157489a2d6b4b98daa976f844dd5d18c26..5751894003734cb1c83d865760554127f3fa4827 100644
--- a/l10n/es/user_ldap.po
+++ b/l10n/es/user_ldap.po
@@ -6,14 +6,15 @@
# Agustin Ferrario <agustin.ferrario@hotmail.com.ar>, 2013
# ordenet <roberto@ordenet.com>, 2013
# Rodrigo Rodríguez <roirobo@ubuntu.org.ni>, 2013
+# Korrosivo <yo@rubendelcampo.es>, 2013
# xhiena <xhiena@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-05 18:23+0000\n"
+"Last-Translator: Korrosivo <yo@rubendelcampo.es>\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"
@@ -94,7 +95,7 @@ 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 ""
+msgstr "<b>Advertencia:</b> Las apps user_ldap y user_webdavauth son incompatibles. Puede que experimente un comportamiento inesperado. Pregunte al su administrador de sistemas para desactivar uno de ellos."
#: templates/settings.php:12
msgid ""
@@ -159,7 +160,7 @@ msgstr "Filtro de inicio de sesión de usuario"
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action. Example: \"uid=%%uid\""
-msgstr ""
+msgstr "Define el filtro a aplicar cuando se intenta identificar. %%uid remplazará al nombre de usuario en el proceso de identificación. Por ejemplo: \"uid=%%uid\""
#: templates/settings.php:55
msgid "User List Filter"
@@ -169,7 +170,7 @@ msgstr "Lista de filtros de usuario"
msgid ""
"Defines the filter to apply, when retrieving users (no placeholders). "
"Example: \"objectClass=person\""
-msgstr ""
+msgstr "Define el filtro a aplicar, cuando se obtienen usuarios (sin comodines). Por ejemplo: \"objectClass=person\""
#: templates/settings.php:59
msgid "Group Filter"
@@ -179,7 +180,7 @@ msgstr "Filtro de grupo"
msgid ""
"Defines the filter to apply, when retrieving groups (no placeholders). "
"Example: \"objectClass=posixGroup\""
-msgstr ""
+msgstr "Define el filtro a aplicar, cuando se obtienen grupos (sin comodines). Por ejemplo: \"objectClass=posixGroup\""
#: templates/settings.php:66
msgid "Connection Settings"
@@ -217,7 +218,7 @@ msgstr "Deshabilitar servidor principal"
#: templates/settings.php:72
msgid "Only connect to the replica server."
-msgstr ""
+msgstr "Conectar sólo con el servidor de réplica."
#: templates/settings.php:73
msgid "Use TLS"
@@ -240,7 +241,7 @@ msgstr "Apagar la validación por certificado 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 "No se recomienda, ¡utilízalo únicamente para pruebas! Si la conexión únicamente funciona con esta opción, importa el certificado SSL del servidor LDAP en tu servidor %s."
#: templates/settings.php:76
msgid "Cache Time-To-Live"
@@ -260,7 +261,7 @@ msgstr "Campo de nombre de usuario a mostrar"
#: templates/settings.php:80
msgid "The LDAP attribute to use to generate the user's display name."
-msgstr ""
+msgstr "El campo LDAP a usar para generar el nombre para mostrar del usuario."
#: templates/settings.php:81
msgid "Base User Tree"
@@ -284,7 +285,7 @@ msgstr "Campo de nombre de grupo a mostrar"
#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the groups's display name."
-msgstr ""
+msgstr "El campo LDAP a usar para generar el nombre para mostrar del grupo."
#: templates/settings.php:84
msgid "Base Group Tree"
@@ -350,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 "El nombre de usuario interno será creado de forma predeterminada desde el atributo UUID. Esto asegura que el nombre de usuario es único y los caracteres no necesitan ser convertidos. En el nombre de usuario interno sólo se pueden usar estos caracteres: [ a-zA-Z0-9_.@- ]. El resto de caracteres son sustituidos por su correspondiente en ASCII o simplemente omitidos. En caso de duplicidades, se añadirá o incrementará un número. El nombre de usuario interno es usado para identificar un usuario. Es también el nombre predeterminado para la carpeta personal del usuario en ownCloud. También es parte de URLs remotas, por ejemplo, para todos los servicios *DAV. Con esta configuración el comportamiento predeterminado puede ser cambiado. Para conseguir un comportamiento similar a como era antes de ownCloud 5, introduzca el campo del nombre para mostrar del usuario en la siguiente caja. Déjelo vacío para el comportamiento predeterminado. Los cambios solo tendrán efecto en los usuarios LDAP mapeados (añadidos) recientemente."
#: templates/settings.php:100
msgid "Internal Username Attribute:"
@@ -369,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 "Por defecto, el atributo UUID es autodetectado. Este atributo es usado para identificar indudablemente usuarios y grupos LDAP. Además, el nombre de usuario interno será creado en base al UUID, si no ha sido especificado otro comportamiento arriba. Puedes sobrescribir la configuración y pasar un atributo de tu elección. Debes asegurarte de que el atributo de tu elección sea accesible por los usuarios y grupos y ser único. Déjalo en blanco para usar el comportamiento por defecto. Los cambios tendrán efecto solo en los usuarios y grupos de LDAP mapeados (añadidos) recientemente."
#: templates/settings.php:103
msgid "UUID Attribute:"
@@ -391,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 "Los usuarios son usados para almacenar y asignar (meta) datos. Con el fin de identificar de forma precisa y reconocer usuarios, cada usuario de LDAP tendrá un nombre de usuario interno. Esto requiere un mapeo entre el nombre de usuario y el usuario del LDAP. El nombre de usuario creado es mapeado respecto al UUID del usuario en el LDAP. De forma adicional, el DN es cacheado para reducir la interacción entre el LDAP, pero no es usado para identificar. Si el DN cambia, los cambios serán aplicados. El nombre de usuario interno es usado por encima de todo. Limpiar los mapeos dejará restos por todas partes, no es sensible a configuración, ¡afecta a todas las configuraciones del LDAP! Nunca limpies los mapeos en un entorno de producción, únicamente en una fase de desarrollo o experimental."
#: templates/settings.php:106
msgid "Clear Username-LDAP User Mapping"
diff --git a/l10n/es/user_webdavauth.po b/l10n/es/user_webdavauth.po
index b880f91c7a99d4de78296d5ccb11eddadcfeb56b..a1d0cf3900ae7b44b9fbce9d8b0b5cdc52016a53 100644
--- a/l10n/es/user_webdavauth.po
+++ b/l10n/es/user_webdavauth.po
@@ -7,14 +7,15 @@
# Art O. Pal <artopal@fastmail.fm>, 2012
# pggx999 <pggx999@gmail.com>, 2012
# Rodrigo Rodríguez <roirobo@ubuntu.org.ni>, 2013
+# Korrosivo <yo@rubendelcampo.es>, 2013
# saskarip <saskarip@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-13 09:11-0400\n"
-"PO-Revision-Date: 2013-08-13 05:50+0000\n"
-"Last-Translator: Rodrigo Rodríguez <roirobo@ubuntu.org.ni>\n"
+"POT-Creation-Date: 2013-09-05 07:36-0400\n"
+"PO-Revision-Date: 2013-09-03 18:30+0000\n"
+"Last-Translator: Korrosivo <yo@rubendelcampo.es>\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"
@@ -24,7 +25,7 @@ msgstr ""
#: templates/settings.php:3
msgid "WebDAV Authentication"
-msgstr "Autenticación de WevDAV"
+msgstr "Autenticación mediante WevDAV"
#: templates/settings.php:4
msgid "Address: "
@@ -35,4 +36,4 @@ 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 "onwCloud enviará las credenciales de usuario a esta dirección. Este complemento verifica la respuesta e interpretará los códigos de respuesta HTTP 401 y 403 como credenciales inválidas y todas las otras respuestas como credenciales válidas."
+msgstr "Las credenciales de usuario se enviarán a esta dirección. Este complemento verifica la respuesta e interpretará los códigos de respuesta HTTP 401 y 403 como credenciales inválidas y todas las otras respuestas como credenciales válidas."
diff --git a/l10n/es_AR/core.po b/l10n/es_AR/core.po
index 12e5b363df9cb0b12bad100d282f5e48648a25fb..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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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"
@@ -23,30 +23,34 @@ msgstr ""
msgid "%s shared »%s« with you"
msgstr "%s compartió \"%s\" con vos"
+#: ajax/share.php:227
+msgid "group"
+msgstr "grupo"
+
#: ajax/update.php:11
msgid "Turned on maintenance mode"
-msgstr ""
+msgstr "Modo de mantenimiento activado"
#: ajax/update.php:14
msgid "Turned off maintenance mode"
-msgstr ""
+msgstr "Modo de mantenimiento desactivado"
#: ajax/update.php:17
msgid "Updated database"
-msgstr ""
+msgstr "Base de datos actualizada"
#: ajax/update.php:20
msgid "Updating filecache, this may take really long..."
-msgstr ""
+msgstr "Actualizando caché de archivos, esto puede tardar mucho tiempo..."
#: ajax/update.php:23
msgid "Updated filecache"
-msgstr ""
+msgstr "Caché de archivos actualizada"
#: ajax/update.php:26
#, php-format
msgid "... %d%% done ..."
-msgstr ""
+msgstr "... %d%% hecho ..."
#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
msgid "Category type not provided."
@@ -87,6 +91,26 @@ msgstr "No se seleccionaron categorías para borrar."
msgid "Error removing %s from favorites."
msgstr "Error al borrar %s de favoritos. "
+#: 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 "Domingo"
@@ -163,59 +187,59 @@ msgstr "noviembre"
msgid "December"
msgstr "diciembre"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "Configuración"
-#: js/js.js:812
+#: js/js.js:866
msgid "seconds ago"
msgstr "segundos atrás"
-#: js/js.js:813
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Hace %n minuto"
+msgstr[1] "Hace %n minutos"
-#: js/js.js:814
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Hace %n hora"
+msgstr[1] "Hace %n horas"
-#: js/js.js:815
+#: js/js.js:869
msgid "today"
msgstr "hoy"
-#: js/js.js:816
+#: js/js.js:870
msgid "yesterday"
msgstr "ayer"
-#: js/js.js:817
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Hace %n día"
+msgstr[1] "Hace %n días"
-#: js/js.js:818
+#: js/js.js:872
msgid "last month"
msgstr "el mes pasado"
-#: js/js.js:819
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Hace %n mes"
+msgstr[1] "Hace %n meses"
-#: js/js.js:820
+#: js/js.js:874
msgid "months ago"
msgstr "meses atrás"
-#: js/js.js:821
+#: js/js.js:875
msgid "last year"
msgstr "el año pasado"
-#: js/js.js:822
+#: js/js.js:876
msgid "years ago"
msgstr "años atrás"
@@ -223,22 +247,66 @@ msgstr "años atrás"
msgid "Choose"
msgstr "Elegir"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
-msgstr "Error al cargar la plantilla del seleccionador de archivos"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
+msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "Sí"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "No"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr "Aceptar"
+#: 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 "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."
@@ -248,7 +316,7 @@ msgstr "El tipo de objeto no está especificado. "
#: 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:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "Error"
@@ -268,7 +336,7 @@ msgstr "Compartido"
msgid "Share"
msgstr "Compartir"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr "Error al compartir"
@@ -324,67 +392,67 @@ msgstr "Asignar fecha de vencimiento"
msgid "Expiration date"
msgstr "Fecha de vencimiento"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "Compartir a través de e-mail:"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "No se encontraron usuarios"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "No se permite volver a compartir"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr "Compartido en {item} con {user}"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "Dejar de compartir"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "podés editar"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "control de acceso"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "crear"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "actualizar"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "borrar"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "compartir"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "Protegido por contraseña"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr "Error al remover la fecha de vencimiento"
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr "Error al asignar fecha de vencimiento"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr "Mandando..."
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr "e-mail mandado"
@@ -399,10 +467,10 @@ msgstr "La actualización no pudo ser completada. Por favor, reportá el inconve
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "La actualización fue exitosa. Estás siendo redirigido a ownCloud."
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
-msgstr ""
+msgstr "%s restablecer contraseña"
#: lostpassword/templates/email.php:2
msgid "Use the following link to reset your password: {link}"
@@ -468,7 +536,7 @@ msgstr "Personal"
msgid "Users"
msgstr "Usuarios"
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "Apps"
@@ -519,7 +587,7 @@ msgstr "La versión de PHP que tenés, es vulnerable al ataque de byte NULL (CVE
#: templates/installation.php:26
#, php-format
msgid "Please update your PHP installation to use %s securely."
-msgstr ""
+msgstr "Por favor, actualizá tu instalación PHP para poder usar %s de manera segura."
#: templates/installation.php:32
msgid ""
@@ -544,7 +612,7 @@ msgstr "Tu directorio de datos y tus archivos probablemente son accesibles a tra
msgid ""
"For information how to properly configure your server, please see the <a "
"href=\"%s\" target=\"_blank\">documentation</a>."
-msgstr ""
+msgstr "Para información sobre cómo configurar apropiadamente tu servidor, por favor mirá la <a href=\"%s\" target=\"_blank\">documentación</a>."
#: templates/installation.php:47
msgid "Create an <strong>admin account</strong>"
@@ -597,14 +665,10 @@ msgstr "Completar la instalación"
msgid "%s is available. Get more information on how to update."
msgstr "%s está disponible. Obtené más información sobre cómo actualizar."
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "Cerrar la sesión"
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "¡El inicio de sesión automático fue rechazado!"
@@ -619,19 +683,19 @@ msgstr "¡Si no cambiaste tu contraseña recientemente, puede ser que tu cuenta
msgid "Please change your password to secure your account again."
msgstr "Por favor, cambiá tu contraseña para incrementar la seguridad de tu cuenta."
-#: templates/login.php:34
+#: templates/login.php:32
msgid "Lost your password?"
msgstr "¿Perdiste tu contraseña?"
-#: templates/login.php:39
+#: templates/login.php:37
msgid "remember"
msgstr "recordame"
-#: templates/login.php:41
+#: templates/login.php:39
msgid "Log in"
msgstr "Iniciar sesión"
-#: templates/login.php:47
+#: templates/login.php:45
msgid "Alternative Logins"
msgstr "Nombre alternativos de usuarios"
diff --git a/l10n/es_AR/files.po b/l10n/es_AR/files.po
index 013ab1b95dd37dbdd34af8b18952288a071dcf74..f502ba71685d650b478b77f3d70a653605f29c4f 100644
--- a/l10n/es_AR/files.po
+++ b/l10n/es_AR/files.po
@@ -5,12 +5,14 @@
# Translators:
# Agustin Ferrario <agustin.ferrario@hotmail.com.ar>, 2013
# cjtess <claudio.tessone@gmail.com>, 2013
+# cnngimenez, 2013
+# juliabis, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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 (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
@@ -76,7 +78,15 @@ msgstr "Error al escribir en el disco"
msgid "Not enough storage available"
msgstr "No hay suficiente almacenamiento"
-#: ajax/upload.php:123
+#: 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 "Directorio inválido."
@@ -84,149 +94,157 @@ 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: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 "La subida del archivo está en proceso. Si salís de la página ahora, la subida se cancelará."
-#: js/file-upload.js:241
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr "La URL no puede estar vacía"
-#: 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 "Nombre de directorio inválido. El uso de \"Shared\" está reservado por ownCloud"
-#: js/file-upload.js:277 js/file-upload.js:293 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 "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:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "Pendientes"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{new_name} ya existe"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "reemplazar"
-#: js/filelist.js:303
+#: js/filelist.js:416
msgid "suggest name"
msgstr "sugerir nombre"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "cancelar"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr "se reemplazó {new_name} con {old_name}"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "undo"
msgstr "deshacer"
-#: js/filelist.js:453
+#: 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: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:541
+msgid "{dirs} and {files}"
+msgstr "{carpetas} y {archivos}"
+
+#: js/filelist.js:731 js/filelist.js:769
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/filelist.js:518
-msgid "files uploading"
-msgstr "Subiendo archivos"
+msgstr[0] "Subiendo %n archivo"
+msgstr[1] "Subiendo %n 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 ""
+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: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 "Nombre"
-#: js/files.js:563 templates/index.php:78
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "Tamaño"
-#: js/files.js:564 templates/index.php:80
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr "Modificado"
-#: js/files.js:580
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/files.js:586
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-
#: lib/app.php:73
#, php-format
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"
@@ -262,84 +280,68 @@ 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:73
+#: templates/index.php:67
msgid "Download"
msgstr "Descargar"
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr "Dejar de compartir"
-#: templates/index.php:91 templates/index.php:92
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "Borrar"
-#: templates/index.php:105
+#: templates/index.php:100
msgid "Upload too large"
msgstr "El tamaño del archivo que querés subir es demasiado grande"
-#: 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 "Los archivos que intentás subir sobrepasan el tamaño máximo "
-#: templates/index.php:112
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr "Se están escaneando los archivos, por favor esperá."
-#: templates/index.php:115
+#: templates/index.php:110
msgid "Current scanning"
msgstr "Escaneo actual"
-#: templates/part.list.php:74
-msgid "directory"
-msgstr "directorio"
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr "directorios"
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr "archivo"
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr "archivos"
-
#: templates/upgrade.php:2
msgid "Upgrading filesystem cache..."
msgstr "Actualizando el cache del sistema de archivos"
diff --git a/l10n/es_AR/files_encryption.po b/l10n/es_AR/files_encryption.po
index 7c6c7ae472c8b4eb6cbf3f92da16edfc58906ebd..c01c38b8342c7fd7e2855425e8a4858e8faaf112 100644
--- a/l10n/es_AR/files_encryption.po
+++ b/l10n/es_AR/files_encryption.po
@@ -4,13 +4,14 @@
#
# Translators:
# cjtess <claudio.tessone@gmail.com>, 2013
+# cnngimenez, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-21 08:10-0400\n"
-"PO-Revision-Date: 2013-08-19 19:20+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-07 04:39-0400\n"
+"PO-Revision-Date: 2013-09-06 20:20+0000\n"
+"Last-Translator: cnngimenez\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"
@@ -62,20 +63,20 @@ msgid ""
"files."
msgstr "¡Tu clave privada no es válida! Tal vez tu contraseña fue cambiada desde fuera del sistema de ownCloud (por ej. desde tu cuenta de sistema). Podés actualizar tu clave privada en la sección de \"configuración personal\", para recuperar el acceso a tus archivos."
-#: hooks/hooks.php:41
+#: hooks/hooks.php:51
msgid "Missing requirements."
msgstr "Requisitos incompletos."
-#: hooks/hooks.php:42
+#: hooks/hooks.php:52
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 ""
+msgstr "Por favor, asegúrese de que PHP 5.3.3 o una versión más reciente esté instalado y que OpenSSL junto con la extensión PHP esté habilitado y configurado apropiadamente. Por ahora, la aplicación de encriptación ha sido deshabilitada."
-#: hooks/hooks.php:249
+#: hooks/hooks.php:250
msgid "Following users are not set up for encryption:"
-msgstr ""
+msgstr "Los siguientes usuarios no fueron configurados para encriptar:"
#: js/settings-admin.js:11
msgid "Saving..."
diff --git a/l10n/es_AR/files_sharing.po b/l10n/es_AR/files_sharing.po
index b2d33b62c5910320af67f2b500b4af2f8ee928c0..cea65819e726030c263f40f880c9271f24f00d16 100644
--- a/l10n/es_AR/files_sharing.po
+++ b/l10n/es_AR/files_sharing.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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:01+0000\n"
+"Last-Translator: cjtess <claudio.tessone@gmail.com>\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"
@@ -32,27 +32,27 @@ msgstr "Enviar"
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
-msgstr ""
+msgstr "Perdón, este enlace parece no funcionar más."
#: templates/part.404.php:4
msgid "Reasons might be:"
-msgstr ""
+msgstr "Las causas podrían ser:"
#: templates/part.404.php:6
msgid "the item was removed"
-msgstr ""
+msgstr "el elemento fue borrado"
#: templates/part.404.php:7
msgid "the link expired"
-msgstr ""
+msgstr "el enlace expiró"
#: templates/part.404.php:8
msgid "sharing is disabled"
-msgstr ""
+msgstr "compartir está desactivado"
#: templates/part.404.php:10
msgid "For more info, please ask the person who sent this link."
-msgstr ""
+msgstr "Para mayor información, contactá a la persona que te mandó el enlace."
#: templates/public.php:15
#, php-format
@@ -64,7 +64,7 @@ msgstr "%s compartió la carpeta %s con vos"
msgid "%s shared the file %s with you"
msgstr "%s compartió el archivo %s con vos"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "Descargar"
@@ -76,6 +76,6 @@ msgstr "Subir"
msgid "Cancel upload"
msgstr "Cancelar subida"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "La vista preliminar no está disponible para"
diff --git a/l10n/es_AR/files_trashbin.po b/l10n/es_AR/files_trashbin.po
index bdec790f40d33688902c48111d45168bec0d14b6..cf833c421a973e893adf19b510e7c60f64028c2c 100644
--- a/l10n/es_AR/files_trashbin.po
+++ b/l10n/es_AR/files_trashbin.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# cjtess <claudio.tessone@gmail.com>, 2013
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"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-10 10:41-0400\n"
+"PO-Revision-Date: 2013-09-10 13:50+0000\n"
+"Last-Translator: cjtess <claudio.tessone@gmail.com>\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"
@@ -27,45 +28,45 @@ msgstr "No fue posible borrar %s de manera permanente"
msgid "Couldn't restore %s"
msgstr "No se pudo restaurar %s"
-#: js/trash.js:7 js/trash.js:100
+#: js/trash.js:7 js/trash.js:102
msgid "perform restore operation"
msgstr "Restaurar"
-#: 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 "Error"
-#: js/trash.js:36
+#: js/trash.js:37
msgid "delete file permanently"
msgstr "Borrar archivo de manera permanente"
-#: js/trash.js:127
+#: js/trash.js:129
msgid "Delete permanently"
msgstr "Borrar de manera permanente"
-#: js/trash.js:182 templates/index.php:17
+#: js/trash.js:184 templates/index.php:17
msgid "Name"
msgstr "Nombre"
-#: js/trash.js:183 templates/index.php:27
+#: js/trash.js:185 templates/index.php:27
msgid "Deleted"
msgstr "Borrado"
-#: js/trash.js:191
+#: js/trash.js:193
msgid "%n folder"
msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n directorio"
+msgstr[1] "%n directorios"
-#: js/trash.js:197
+#: js/trash.js:199
msgid "%n file"
msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n archivo"
+msgstr[1] "%n archivos"
-#: lib/trash.php:819 lib/trash.php:821
+#: lib/trash.php:814 lib/trash.php:816
msgid "restored"
-msgstr ""
+msgstr "recuperado"
#: templates/index.php:9
msgid "Nothing in here. Your trash bin is empty!"
diff --git a/l10n/es_AR/files_versions.po b/l10n/es_AR/files_versions.po
index 47441f17a35d4c18c6b2d9e82edc363333ee955b..91f5d7e581fc5a9b3fb8b09cfb8f1075638f0226 100644
--- a/l10n/es_AR/files_versions.po
+++ b/l10n/es_AR/files_versions.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# cnngimenez, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-28 01:56-0400\n"
-"PO-Revision-Date: 2013-07-27 06:10+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-06 20:00+0000\n"
+"Last-Translator: cnngimenez\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"
@@ -28,16 +29,16 @@ msgstr "Versiones"
#: js/versions.js:53
msgid "Failed to revert {file} to revision {timestamp}."
-msgstr ""
+msgstr "Falló al revertir {file} a la revisión {timestamp}."
#: js/versions.js:79
msgid "More versions..."
-msgstr ""
+msgstr "Más versiones..."
#: js/versions.js:116
msgid "No other versions available"
-msgstr ""
+msgstr "No hay más versiones disponibles"
-#: js/versions.js:149
+#: js/versions.js:145
msgid "Restore"
msgstr "Recuperar"
diff --git a/l10n/es_AR/lib.po b/l10n/es_AR/lib.po
index 1ae0a4d355b84525b641a0b6364c54c9fad68e2c..17cc36ca73214629b1e7b17274290df6570b70c0 100644
--- a/l10n/es_AR/lib.po
+++ b/l10n/es_AR/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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\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"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
@@ -23,11 +23,11 @@ msgstr ""
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
-msgstr ""
+msgstr "La app \"%s\" no puede ser instalada porque no es compatible con esta versión de ownCloud"
#: app.php:250
msgid "No app name specified"
-msgstr ""
+msgstr "No fue especificado el nombre de la app"
#: app.php:361
msgid "Help"
@@ -49,11 +49,23 @@ msgstr "Usuarios"
msgid "Admin"
msgstr "Administración"
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "No se pudo actualizar \"%s\"."
+#: 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 "servicios web sobre los que tenés control"
@@ -87,59 +99,59 @@ msgstr "Descargá los archivos en partes más chicas, de forma separada, o pedí
#: installer.php:63
msgid "No source specified when installing app"
-msgstr ""
+msgstr "No se especificó el origen al instalar la app"
#: installer.php:70
msgid "No href specified when installing app from http"
-msgstr ""
+msgstr "No se especificó href al instalar la app"
#: installer.php:75
msgid "No path specified when installing app from local file"
-msgstr ""
+msgstr "No se especificó PATH al instalar la app desde el archivo local"
#: installer.php:89
#, php-format
msgid "Archives of type %s are not supported"
-msgstr ""
+msgstr "No hay soporte para archivos de tipo %s"
#: installer.php:103
msgid "Failed to open archive when installing app"
-msgstr ""
+msgstr "Error al abrir archivo mientras se instalaba la app"
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
-msgstr ""
+msgstr "La app no suministra un archivo info.xml"
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
-msgstr ""
+msgstr "No puede ser instalada la app por tener código no autorizado"
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
-msgstr ""
+msgstr "No se puede instalar la app porque no es compatible con esta versión de ownCloud"
-#: installer.php:144
+#: 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 "La app no se puede instalar porque contiene la etiqueta <shipped>true</shipped> que no está permitida para apps no distribuidas"
-#: installer.php:150
+#: 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 "La app no puede ser instalada porque la versión en info.xml/version no es la misma que la establecida en el app store"
-#: installer.php:160
+#: installer.php:162
msgid "App directory already exists"
-msgstr ""
+msgstr "El directorio de la app ya existe"
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
-msgstr ""
+msgstr "No se puede crear el directorio para la app. Corregí los permisos. %s"
#: json.php:28
msgid "Application is not enabled"
@@ -265,51 +277,51 @@ msgstr "Tu servidor web no está configurado todavía para permitir sincronizaci
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Por favor, comprobá nuevamente la <a href='%s'>guía de instalación</a>."
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "segundos atrás"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Hace %n minuto"
+msgstr[1] "Hace %n minutos"
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Hace %n hora"
+msgstr[1] "Hace %n horas"
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "hoy"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "ayer"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Hace %n día"
+msgstr[1] "Hace %n días"
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "el mes pasado"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Hace %n mes"
+msgstr[1] "Hace %n meses"
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "el año pasado"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "años atrás"
diff --git a/l10n/es_AR/settings.po b/l10n/es_AR/settings.po
index 94c0ce3af87f14979a634de4cb59a98a5dece76d..faf86eb46038a9ef441f0b098b6f1d20de403c8f 100644
--- a/l10n/es_AR/settings.po
+++ b/l10n/es_AR/settings.po
@@ -5,12 +5,13 @@
# Translators:
# Agustin Ferrario <agustin.ferrario@hotmail.com.ar>, 2013
# cjtess <claudio.tessone@gmail.com>, 2013
+# cnngimenez, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+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"
@@ -24,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"
@@ -86,55 +87,88 @@ msgstr "No es posible borrar al usuario del grupo %s"
msgid "Couldn't update app."
msgstr "No se pudo actualizar la App."
-#: js/apps.js:35
+#: 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}"
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr "Desactivar"
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr "Activar"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr "Por favor, esperá...."
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
-msgstr ""
+msgstr "Se ha producido un error mientras se deshabilitaba la aplicación"
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
-msgstr ""
+msgstr "Se ha producido un error mientras se habilitaba la aplicación"
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr "Actualizando...."
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr "Error al actualizar App"
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "Error"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr "Actualizar"
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr "Actualizado"
-#: js/personal.js:150
-msgid "Decrypting files... Please wait, this can take some time."
+#: js/personal.js:220
+msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:172
+#: 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:287
msgid "Saving..."
msgstr "Guardando..."
@@ -150,16 +184,16 @@ msgstr "deshacer"
msgid "Unable to remove user"
msgstr "Imposible borrar usuario"
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "Grupos"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "Grupo Administrador"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "Borrar"
@@ -179,7 +213,7 @@ msgstr "Error creando usuario"
msgid "A valid password must be provided"
msgstr "Debe ingresar una contraseña válida"
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "Castellano (Argentina)"
@@ -194,7 +228,7 @@ msgid ""
"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 ""
+msgstr "El directorio de datos y tus archivos probablemente sean accesibles desde Internet. El archivo .htaccess no funciona. Sugerimos fuertemente que configures tu servidor web de forma tal que el archivo de directorios no sea accesible o muevas el mismo fuera de la raíz de los documentos del servidor web."
#: templates/admin.php:29
msgid "Setup Warning"
@@ -209,7 +243,7 @@ msgstr "Tu servidor web no está configurado todavía para permitir sincronizaci
#: templates/admin.php:33
#, php-format
msgid "Please double check the <a href=\"%s\">installation guides</a>."
-msgstr ""
+msgstr "Por favor, cheque bien la <a href=\"%s\">guía de instalación</a>."
#: templates/admin.php:44
msgid "Module 'fileinfo' missing"
@@ -231,7 +265,7 @@ 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 ""
+msgstr "No se pudo asignar la localización del sistema a %s. Esto significa que puede haber problemas con ciertos caracteres en los nombres de los archivos. Recomendamos fuertemente instalar los paquetes de sistema requeridos para poder dar soporte a %s."
#: templates/admin.php:75
msgid "Internet connection not working"
@@ -244,7 +278,7 @@ msgid ""
"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 ""
+msgstr "El servidor no posee una conexión a Internet activa. Esto significa que algunas características como el montaje de un almacenamiento externo, las notificaciones acerca de actualizaciones o la instalación de aplicaciones de terceros no funcionarán. El acceso a archivos de forma remota y el envío de correos con notificaciones es posible que tampoco funcionen. Sugerimos habilitar la conexión a Internet para este servidor si deseas tener todas estas características."
#: templates/admin.php:92
msgid "Cron"
@@ -258,11 +292,11 @@ msgstr "Ejecutá una tarea con cada pagina cargada."
msgid ""
"cron.php is registered at a webcron service to call cron.php once a minute "
"over http."
-msgstr ""
+msgstr "cron.php está registrado al servicio webcron para que sea llamado una vez por cada minuto sobre http."
#: templates/admin.php:115
msgid "Use systems cron service to call the cron.php file once a minute."
-msgstr ""
+msgstr "Usa el servicio cron del sistema para ejecutar al archivo cron.php por cada minuto."
#: templates/admin.php:120
msgid "Sharing"
@@ -320,14 +354,14 @@ msgstr "Forzar HTTPS"
#: templates/admin.php:185
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
-msgstr ""
+msgstr "Fuerza al cliente a conectarse a %s por medio de una conexión encriptada."
#: templates/admin.php:191
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
-msgstr ""
+msgstr "Por favor conéctese a su %s por medio de HTTPS para habilitar o deshabilitar la característica SSL"
#: templates/admin.php:203
msgid "Log"
@@ -345,11 +379,11 @@ msgstr "Más"
msgid "Less"
msgstr "Menos"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "Versión"
-#: templates/admin.php:246 templates/personal.php:143
+#: 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 "
@@ -416,7 +450,7 @@ msgstr "Mostrar de nuevo el asistente de primera ejecución"
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Usás <strong>%s</strong> de los <strong>%s</strong> disponibles"
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "Contraseña"
@@ -440,7 +474,7 @@ msgstr "Nueva contraseña:"
msgid "Change password"
msgstr "Cambiar contraseña"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr "Nombre a mostrar"
@@ -456,40 +490,68 @@ msgstr "Tu dirección de e-mail"
msgid "Fill in an email address to enable password recovery"
msgstr "Escribí una dirección de e-mail para restablecer la contraseña"
-#: templates/personal.php:85 templates/personal.php:86
+#: 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 "Abortar"
+
+#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
msgstr "Idioma"
-#: templates/personal.php:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "Ayudanos a traducir"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: 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 "Usá esta dirección para <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">acceder a tus archivos a través de WebDAV</a>"
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "Encriptación"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
-msgstr ""
+msgstr "La aplicación de encriptación ya no está habilitada, desencriptando todos los archivos"
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
-msgstr ""
+msgstr "Clave de acceso"
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
-msgstr ""
+msgstr "Desencriptar todos los archivos"
#: templates/users.php:21
msgid "Login Name"
@@ -513,30 +575,30 @@ msgstr "Ingresá la contraseña de recuperación para recuperar los archivos de
msgid "Default Storage"
msgstr "Almacenamiento Predeterminado"
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr "Ilimitado"
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "Otros"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "Nombre de usuario"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr "Almacenamiento"
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr "Cambiar el nombre mostrado"
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr "Configurar nueva contraseña"
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr "Predeterminado"
diff --git a/l10n/es_AR/user_ldap.po b/l10n/es_AR/user_ldap.po
index 2e1635a672f2daeaa647e5f202c0db0481bb1320..fbe5fabbcf3d59730d52f6ce0e0aa56eefd4ac21 100644
--- a/l10n/es_AR/user_ldap.po
+++ b/l10n/es_AR/user_ldap.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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-13 21:47-0400\n"
+"PO-Revision-Date: 2013-09-11 11:00+0000\n"
+"Last-Translator: cjtess <claudio.tessone@gmail.com>\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"
@@ -91,7 +91,7 @@ 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 ""
+msgstr "<b>Advertencia:</b> Las apps user_ldap y user_webdavauth son incompatibles. Puede ser que experimentes comportamientos inesperados. Pedile al administrador que desactive uno de ellos."
#: templates/settings.php:12
msgid ""
@@ -156,7 +156,7 @@ msgstr "Filtro de inicio de sesión de usuario"
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action. Example: \"uid=%%uid\""
-msgstr ""
+msgstr "Define el filtro a aplicar cuando se intenta ingresar. %%uid remplaza el nombre de usuario en el proceso de identificación. Por ejemplo: \"uid=%%uid\""
#: templates/settings.php:55
msgid "User List Filter"
@@ -166,7 +166,7 @@ msgstr "Lista de filtros de usuario"
msgid ""
"Defines the filter to apply, when retrieving users (no placeholders). "
"Example: \"objectClass=person\""
-msgstr ""
+msgstr "Define el filtro a aplicar al obtener usuarios (sin comodines). Por ejemplo: \"objectClass=person\""
#: templates/settings.php:59
msgid "Group Filter"
@@ -176,7 +176,7 @@ msgstr "Filtro de grupo"
msgid ""
"Defines the filter to apply, when retrieving groups (no placeholders). "
"Example: \"objectClass=posixGroup\""
-msgstr ""
+msgstr "Define el filtro a aplicar al obtener grupos (sin comodines). Por ejemplo: \"objectClass=posixGroup\""
#: templates/settings.php:66
msgid "Connection Settings"
@@ -214,7 +214,7 @@ msgstr "Deshabilitar el Servidor Principal"
#: templates/settings.php:72
msgid "Only connect to the replica server."
-msgstr ""
+msgstr "Conectarse únicamente al servidor de réplica."
#: templates/settings.php:73
msgid "Use TLS"
@@ -237,7 +237,7 @@ msgstr "Desactivar la validación por certificado 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 "No es recomendado, ¡Usalo solamente para pruebas! Si la conexión únicamente funciona con esta opción, importá el certificado SSL del servidor LDAP en tu servidor %s."
#: templates/settings.php:76
msgid "Cache Time-To-Live"
@@ -257,7 +257,7 @@ msgstr "Campo de nombre de usuario a mostrar"
#: templates/settings.php:80
msgid "The LDAP attribute to use to generate the user's display name."
-msgstr ""
+msgstr "El atributo LDAP a usar para generar el nombre de usuario mostrado."
#: templates/settings.php:81
msgid "Base User Tree"
@@ -281,7 +281,7 @@ msgstr "Campo de nombre de grupo a mostrar"
#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the groups's display name."
-msgstr ""
+msgstr "El atributo LDAP a usar para generar el nombre de grupo mostrado."
#: templates/settings.php:84
msgid "Base Group Tree"
@@ -347,7 +347,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 "Por defecto, el nombre de usuario interno es creado a partir del atributo UUID. Esto asegura que el nombre de usuario es único y no es necesaria una conversión de caracteres. El nombre de usuario interno sólo se pueden usar estos caracteres: [ a-zA-Z0-9_.@- ]. El resto de caracteres son sustituidos por su correspondiente en ASCII o simplemente omitidos. En caso colisiones, se agregará o incrementará un número. El nombre de usuario interno es usado para identificar un usuario. Es también el nombre predeterminado para el directorio personal del usuario en ownCloud. También es parte de las URLs remotas, por ejemplo, para los servicios *DAV. Con esta opción, se puede cambiar el comportamiento por defecto. Para conseguir un comportamiento similar a versiones anteriores a ownCloud 5, ingresá el atributo del nombre mostrado en el campo siguiente. Dejalo vacío para el comportamiento por defecto. Los cambios solo tendrán efecto en los nuevos usuarios LDAP mapeados (agregados)."
#: templates/settings.php:100
msgid "Internal Username Attribute:"
@@ -366,7 +366,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 "Por defecto, el atributo UUID es detectado automáticamente. Este atributo es usado para identificar de manera certera usuarios y grupos LDAP. Además, el nombre de usuario interno será creado en base al UUID, si no fue especificado otro comportamiento más arriba. Podés sobrescribir la configuración y pasar un atributo de tu elección. Tenés que asegurarte que el atributo de tu elección sea accesible por los usuarios y grupos y que sea único. Dejalo en blanco para usar el comportamiento por defecto. Los cambios tendrán efecto sólo en los nuevos usuarios y grupos de LDAP mapeados (agregados)."
#: templates/settings.php:103
msgid "UUID Attribute:"
@@ -388,7 +388,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 "Los usuarios son usados para almacenar y asignar datos (metadatos). Con el fin de identificar de forma precisa y reconocer usuarios, a cada usuario de LDAP se será asignado un nombre de usuario interno. Esto requiere un mapeo entre el nombre de usuario y el usuario del LDAP. El nombre de usuario creado es mapeado respecto al UUID del usuario en el LDAP. De forma adicional, el DN es dejado en caché para reducir la interacción entre el LDAP, pero no es usado para la identificación. Si el DN cambia, los cambios van a ser aplicados. El nombre de usuario interno es usado en todos los lugares. Vaciar los mapeos, deja restos por todas partes. Vaciar los mapeos, no es sensible a configuración, ¡afecta a todas las configuraciones del LDAP! Nunca limpies los mapeos en un entorno de producción, solamente en fase de desarrollo o experimental."
#: templates/settings.php:106
msgid "Clear Username-LDAP User Mapping"
diff --git a/l10n/es_AR/user_webdavauth.po b/l10n/es_AR/user_webdavauth.po
index e40f809b1bfd1cf3cca2ea888ab743f73bca0bdc..ce23b27c7bf4f3c0db16c5efe9efe278051f89cb 100644
--- a/l10n/es_AR/user_webdavauth.po
+++ b/l10n/es_AR/user_webdavauth.po
@@ -6,13 +6,14 @@
# Agustin Ferrario <agustin.ferrario@hotmail.com.ar>, 2012
# cjtess <claudio.tessone@gmail.com>, 2013
# cjtess <claudio.tessone@gmail.com>, 2012
+# cnngimenez, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-27 01:56-0400\n"
-"PO-Revision-Date: 2013-07-27 05:57+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-06 19:30+0000\n"
+"Last-Translator: cnngimenez\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"
@@ -22,15 +23,15 @@ msgstr ""
#: templates/settings.php:3
msgid "WebDAV Authentication"
-msgstr "Autenticación de WevDAV"
+msgstr "Autenticación de WebDAV"
#: templates/settings.php:4
msgid "Address: "
-msgstr ""
+msgstr "Dirección:"
#: 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 ""
+msgstr "Las credenciales del usuario serán enviadas a esta dirección. Este plug-in verificará la respuesta e interpretará los códigos de estado HTTP 401 y 403 como credenciales inválidas y cualquier otra respuesta como válida."
diff --git a/l10n/es_MX/core.po b/l10n/es_MX/core.po
new file mode 100644
index 0000000000000000000000000000000000000000..d351beb1b75e7a83daf99191e1793c12f5492579
--- /dev/null
+++ b/l10n/es_MX/core.po
@@ -0,0 +1,711 @@
+# 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: Spanish (Mexico) (http://www.transifex.com/projects/p/owncloud/language/es_MX/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_MX\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/es_MX/files.po b/l10n/es_MX/files.po
new file mode 100644
index 0000000000000000000000000000000000000000..7405f7a77b613c39666949060f713ff4b00311b6
--- /dev/null
+++ b/l10n/es_MX/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: Spanish (Mexico) (http://www.transifex.com/projects/p/owncloud/language/es_MX/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_MX\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/es_MX/files_encryption.po b/l10n/es_MX/files_encryption.po
new file mode 100644
index 0000000000000000000000000000000000000000..0aa9dac64883faeae3eb2474b6bb356751e8ac06
--- /dev/null
+++ b/l10n/es_MX/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-07 04:39-0400\n"
+"PO-Revision-Date: 2013-09-07 07:27+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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_MX\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:51
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:52
+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
+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/es_MX/files_external.po b/l10n/es_MX/files_external.po
new file mode 100644
index 0000000000000000000000000000000000000000..a6b6cd618ba31a6379366a8d9c996d412a48fb24
--- /dev/null
+++ b/l10n/es_MX/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-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-07 07:27+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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_MX\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/es_MX/files_sharing.po b/l10n/es_MX/files_sharing.po
new file mode 100644
index 0000000000000000000000000000000000000000..3cce6ac339f6dccbec4367a40743b3a00e25d3c6
--- /dev/null
+++ b/l10n/es_MX/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-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-07 07:27+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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_MX\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/es_MX/files_trashbin.po b/l10n/es_MX/files_trashbin.po
new file mode 100644
index 0000000000000000000000000000000000000000..42fb8a7b1f2564304bbedfff5281774910f52cb9
--- /dev/null
+++ b/l10n/es_MX/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-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-07 07:27+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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_MX\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:184 templates/index.php:17
+msgid "Name"
+msgstr ""
+
+#: js/trash.js:185 templates/index.php:27
+msgid "Deleted"
+msgstr ""
+
+#: js/trash.js:193
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/trash.js:199
+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:20 templates/index.php:22
+msgid "Restore"
+msgstr ""
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr ""
+
+#: templates/part.breadcrumb.php:9
+msgid "Deleted Files"
+msgstr ""
diff --git a/l10n/es_MX/files_versions.po b/l10n/es_MX/files_versions.po
new file mode 100644
index 0000000000000000000000000000000000000000..b1866ae6ce36c3fb67a411a143c462f866ff66bc
--- /dev/null
+++ b/l10n/es_MX/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-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-07 07:27+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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_MX\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/es_MX/lib.po b/l10n/es_MX/lib.po
new file mode 100644
index 0000000000000000000000000000000000000000..7861d1b48366b8a0854741acd721ee82601adc93
--- /dev/null
+++ b/l10n/es_MX/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-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_MX\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/es_MX/settings.po b/l10n/es_MX/settings.po
new file mode 100644
index 0000000000000000000000000000000000000000..7b7e92dc23dad4c9619df0f305b382b2101fbad1
--- /dev/null
+++ b/l10n/es_MX/settings.po
@@ -0,0 +1,601 @@
+# 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: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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_MX\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/es_MX/user_ldap.po b/l10n/es_MX/user_ldap.po
new file mode 100644
index 0000000000000000000000000000000000000000..54dc1b5192a24d82cb3aa2951de574bbf386d12e
--- /dev/null
+++ b/l10n/es_MX/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-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-07 07:27+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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_MX\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/es_MX/user_webdavauth.po b/l10n/es_MX/user_webdavauth.po
new file mode 100644
index 0000000000000000000000000000000000000000..9948a588c8b0b02431fe53d52b20d78cd65fe105
--- /dev/null
+++ b/l10n/es_MX/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-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-07 07:27+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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_MX\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/et_EE/core.po b/l10n/et_EE/core.po
index ffd48b28988e046d1f85b9409a558ee51577d26e..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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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"
@@ -24,30 +24,34 @@ msgstr ""
msgid "%s shared »%s« with you"
msgstr "%s jagas sinuga »%s«"
+#: ajax/share.php:227
+msgid "group"
+msgstr "grupp"
+
#: ajax/update.php:11
msgid "Turned on maintenance mode"
-msgstr ""
+msgstr "Haldusreziimis"
#: ajax/update.php:14
msgid "Turned off maintenance mode"
-msgstr ""
+msgstr "Haldusreziim lõpetatud"
#: ajax/update.php:17
msgid "Updated database"
-msgstr ""
+msgstr "Uuendatud andmebaas"
#: ajax/update.php:20
msgid "Updating filecache, this may take really long..."
-msgstr ""
+msgstr "Uuendan failipuhvrit, see võib kesta väga kaua..."
#: ajax/update.php:23
msgid "Updated filecache"
-msgstr ""
+msgstr "Uuendatud failipuhver"
#: ajax/update.php:26
#, php-format
msgid "... %d%% done ..."
-msgstr ""
+msgstr "... %d%% tehtud ..."
#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
msgid "Category type not provided."
@@ -88,6 +92,26 @@ msgstr "Kustutamiseks pole kategooriat valitud."
msgid "Error removing %s from favorites."
msgstr "Viga %s eemaldamisel lemmikutest."
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr "Ühtegi pilti või faili ei pakutud"
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr "Tundmatu failitüüp"
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr "Vigane pilt"
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr "Ühtegi ajutist profiili pilti pole saadaval, proovi uuesti"
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr "Lõikeandmeid ei leitud"
+
#: js/config.php:32
msgid "Sunday"
msgstr "Pühapäev"
@@ -164,59 +188,59 @@ msgstr "November"
msgid "December"
msgstr "Detsember"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "Seaded"
-#: js/js.js:812
+#: js/js.js:866
msgid "seconds ago"
msgstr "sekundit tagasi"
-#: js/js.js:813
+#: 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:814
+#: 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:815
+#: js/js.js:869
msgid "today"
msgstr "täna"
-#: js/js.js:816
+#: js/js.js:870
msgid "yesterday"
msgstr "eile"
-#: js/js.js:817
+#: 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:818
+#: js/js.js:872
msgid "last month"
msgstr "viimasel kuul"
-#: js/js.js:819
+#: 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:820
+#: js/js.js:874
msgid "months ago"
msgstr "kuu tagasi"
-#: js/js.js:821
+#: js/js.js:875
msgid "last year"
msgstr "viimasel aastal"
-#: js/js.js:822
+#: js/js.js:876
msgid "years ago"
msgstr "aastat tagasi"
@@ -224,22 +248,66 @@ msgstr "aastat tagasi"
msgid "Choose"
msgstr "Vali"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
-msgstr "Viga failivalija malli laadimisel"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
+msgstr "Viga faili valija malli laadimisel: {error}"
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "Jah"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "Ei"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
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
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -249,7 +317,7 @@ msgstr "Objekti tüüp pole määratletud."
#: 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:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "Viga"
@@ -269,7 +337,7 @@ msgstr "Jagatud"
msgid "Share"
msgstr "Jaga"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr "Viga jagamisel"
@@ -325,67 +393,67 @@ msgstr "Määra aegumise kuupäev"
msgid "Expiration date"
msgstr "Aegumise kuupäev"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "Jaga e-postiga:"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "Ühtegi inimest ei leitud"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "Edasijagamine pole lubatud"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr "Jagatud {item} kasutajaga {user}"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "Lõpeta jagamine"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "saab muuta"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "ligipääsukontroll"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "loo"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "uuenda"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "kustuta"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "jaga"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "Parooliga kaitstud"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr "Viga aegumise kuupäeva eemaldamisel"
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr "Viga aegumise kuupäeva määramisel"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr "Saatmine ..."
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr "E-kiri on saadetud"
@@ -400,7 +468,7 @@ msgstr "Uuendus ebaõnnestus. Palun teavita probleemidest <a href=\"https://git
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Uuendus oli edukas. Kohe suunatakse Sind ownCloudi."
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr "%s parooli lähtestus"
@@ -469,7 +537,7 @@ msgstr "Isiklik"
msgid "Users"
msgstr "Kasutajad"
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "Rakendused"
@@ -598,14 +666,10 @@ msgstr "Lõpeta seadistamine"
msgid "%s is available. Get more information on how to update."
msgstr "%s on saadaval. Vaata lähemalt kuidas uuendada."
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "Logi välja"
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr "Rohkem rakendusi"
-
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "Automaatne sisselogimine lükati tagasi!"
@@ -620,19 +684,19 @@ msgstr "Kui sa ei muutnud oma parooli hiljuti, siis võib su kasutajakonto olla
msgid "Please change your password to secure your account again."
msgstr "Palun muuda parooli, et oma kasutajakonto uuesti turvata."
-#: templates/login.php:34
+#: templates/login.php:32
msgid "Lost your password?"
msgstr "Kaotasid oma parooli?"
-#: templates/login.php:39
+#: templates/login.php:37
msgid "remember"
msgstr "pea meeles"
-#: templates/login.php:41
+#: templates/login.php:39
msgid "Log in"
msgstr "Logi sisse"
-#: templates/login.php:47
+#: templates/login.php:45
msgid "Alternative Logins"
msgstr "Alternatiivsed sisselogimisviisid"
diff --git a/l10n/et_EE/files.po b/l10n/et_EE/files.po
index 647475a3a19c6399bc4ec3e4e359a71f067be5db..52bcf2de8f04e82466ccc2940d99a846869586a7 100644
--- a/l10n/et_EE/files.po
+++ b/l10n/et_EE/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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
@@ -76,7 +76,15 @@ msgstr "Kettale kirjutamine ebaõnnestus"
msgid "Not enough storage available"
msgstr "Saadaval pole piisavalt ruumi"
-#: ajax/upload.php:123
+#: 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 "Vigane kaust."
@@ -84,149 +92,157 @@ 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: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 "Faili üleslaadimine on töös. Lehelt lahkumine katkestab selle üleslaadimise."
-#: js/file-upload.js:241
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr "URL ei saa olla tühi."
-#: 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 "Vigane kausta nimi. 'Shared' kasutamine on reserveeritud ownCloud poolt."
-#: js/file-upload.js:277 js/file-upload.js:293 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 "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:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "Ootel"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{new_name} on juba olemas"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "asenda"
-#: js/filelist.js:303
+#: js/filelist.js:416
msgid "suggest name"
msgstr "soovita nime"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "loobu"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr "asendas nime {old_name} nimega {new_name}"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "undo"
msgstr "tagasi"
-#: js/filelist.js:453
+#: 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: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:541
+msgid "{dirs} and {files}"
+msgstr "{dirs} ja {files}"
+
+#: 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:518
-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: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 "Nimi"
-#: js/files.js:563 templates/index.php:78
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "Suurus"
-#: js/files.js:564 templates/index.php:80
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr "Muudetud"
-#: js/files.js:580
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] "%n kataloog"
-msgstr[1] "%n kataloogi"
-
-#: js/files.js:586
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] "%n fail"
-msgstr[1] "%n faili"
-
#: lib/app.php:73
#, php-format
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"
@@ -262,84 +278,68 @@ 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:73
+#: templates/index.php:67
msgid "Download"
msgstr "Lae alla"
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr "Lõpeta jagamine"
-#: templates/index.php:91 templates/index.php:92
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "Kustuta"
-#: templates/index.php:105
+#: templates/index.php:100
msgid "Upload too large"
msgstr "Üleslaadimine on liiga suur"
-#: 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 "Failid, mida sa proovid üles laadida, ületab serveri poolt üleslaetavatele failidele määratud maksimaalse suuruse."
-#: templates/index.php:112
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr "Faile skannitakse, palun oota."
-#: templates/index.php:115
+#: templates/index.php:110
msgid "Current scanning"
msgstr "Praegune skannimine"
-#: templates/part.list.php:74
-msgid "directory"
-msgstr "kaust"
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr "kaustad"
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr "fail"
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr "faili"
-
#: templates/upgrade.php:2
msgid "Upgrading filesystem cache..."
msgstr "Failisüsteemi puhvri uuendamine..."
diff --git a/l10n/et_EE/files_sharing.po b/l10n/et_EE/files_sharing.po
index 557d32037ad89444915ba3094e0ed8ce9da9964d..438e1fb60a32ad7e5883aa4814f2b48df03e9063 100644
--- a/l10n/et_EE/files_sharing.po
+++ b/l10n/et_EE/files_sharing.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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:01+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"
@@ -65,7 +65,7 @@ msgstr "%s jagas sinuga kausta %s"
msgid "%s shared the file %s with you"
msgstr "%s jagas sinuga faili %s"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "Lae alla"
@@ -77,6 +77,6 @@ msgstr "Lae üles"
msgid "Cancel upload"
msgstr "Tühista üleslaadimine"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "Eelvaadet pole saadaval"
diff --git a/l10n/et_EE/lib.po b/l10n/et_EE/lib.po
index 4e49c86def2301f9ddf93ea7d2583bab33e5b5a4..70416438c1697bb616156da03333adfece834c5c 100644
--- a/l10n/et_EE/lib.po
+++ b/l10n/et_EE/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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-26 05:20+0000\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"
@@ -50,11 +50,23 @@ msgstr "Kasutajad"
msgid "Admin"
msgstr "Admin"
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "Ebaõnnestunud uuendus \"%s\"."
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr "Kohandatud profiili pildid ei toimi veel koos krüpteeringuga"
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr "Tundmatu failitüüp"
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr "Vigane pilt"
+
#: defaults.php:35
msgid "web services under your control"
msgstr "veebitenused sinu kontrolli all"
@@ -107,37 +119,37 @@ msgstr "%s tüüpi arhiivid pole toetatud"
msgid "Failed to open archive when installing app"
msgstr "Arhiivi avamine ebaõnnestus rakendi paigalduse käigus"
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr "Rakend ei paku ühtegi info.xml faili"
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr "Rakendit ei saa paigaldada, kuna sisaldab lubamatud koodi"
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr "Rakendit ei saa paigaldada, kuna see pole ühilduv selle ownCloud versiooniga."
-#: installer.php:144
+#: 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 "Rakendit ei saa paigaldada, kuna see sisaldab \n<shipped>\n\ntrue\n</shipped>\nmärgendit, mis pole lubatud mitte veetud (non shipped) rakendites"
-#: installer.php:150
+#: 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 "Rakendit ei saa paigaldada, kuna selle versioon info.xml/version pole sama, mis on märgitud rakendite laos."
-#: installer.php:160
+#: installer.php:162
msgid "App directory already exists"
msgstr "Rakendi kataloog on juba olemas"
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr "Ei saa luua rakendi kataloogi. Palun korrigeeri õigusi. %s"
@@ -266,51 +278,51 @@ msgstr "Veebiserveri ei ole veel korralikult seadistatud võimaldamaks failide s
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Palun tutvu veelkord <a href='%s'>paigalduse juhenditega</a>."
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "sekundit tagasi"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] "%n minutit tagasi"
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] "%n tundi tagasi"
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "täna"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "eile"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] "%n päeva tagasi"
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "viimasel kuul"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] "%n kuud tagasi"
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "viimasel aastal"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "aastat tagasi"
diff --git a/l10n/et_EE/settings.po b/l10n/et_EE/settings.po
index 26f50de9298fbe6389c44c368243e526020d47dd..72d666a7d0bca3b7d2bf895d3f7de6c08144698e 100644
--- a/l10n/et_EE/settings.po
+++ b/l10n/et_EE/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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-26 05:10+0000\n"
-"Last-Translator: pisike.sipelgas <pisike.sipelgas@gmail.com>\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"
"Content-Type: text/plain; charset=UTF-8\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,55 +86,88 @@ msgstr "Kasutajat ei saa eemaldada grupist %s"
msgid "Couldn't update app."
msgstr "Rakenduse uuendamine ebaõnnestus."
-#: js/apps.js:35
+#: 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}"
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr "Lülita välja"
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr "Lülita sisse"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr "Palun oota..."
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr "Viga rakendi keelamisel"
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr "Viga rakendi lubamisel"
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr "Uuendamine..."
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr "Viga rakenduse uuendamisel"
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "Viga"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr "Uuenda"
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr "Uuendatud"
-#: js/personal.js:150
+#: js/personal.js:220
+msgid "Select a profile picture"
+msgstr "Vali profiili pilt"
+
+#: 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:172
+#: js/personal.js:287
msgid "Saving..."
msgstr "Salvestamine..."
@@ -150,16 +183,16 @@ msgstr "tagasi"
msgid "Unable to remove user"
msgstr "Kasutaja eemaldamine ebaõnnestus"
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "Grupid"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "Grupi admin"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "Kustuta"
@@ -179,7 +212,7 @@ msgstr "Viga kasutaja loomisel"
msgid "A valid password must be provided"
msgstr "Sisesta nõuetele vastav parool"
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "Eesti"
@@ -345,11 +378,11 @@ msgstr "Rohkem"
msgid "Less"
msgstr "Vähem"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "Versioon"
-#: templates/admin.php:246 templates/personal.php:143
+#: 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 "
@@ -416,7 +449,7 @@ msgstr "Näita veelkord Esmase Käivituse Juhendajat"
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Kasutad <strong>%s</strong> saadavalolevast <strong>%s</strong>"
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "Parool"
@@ -440,7 +473,7 @@ msgstr "Uus parool"
msgid "Change password"
msgstr "Muuda parooli"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr "Näidatav nimi"
@@ -456,38 +489,66 @@ msgstr "Sinu e-posti aadress"
msgid "Fill in an email address to enable password recovery"
msgstr "Parooli taastamise sisse lülitamiseks sisesta e-posti aadress"
-#: templates/personal.php:85 templates/personal.php:86
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr "Profiili pilt"
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr "Laadi uus"
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr "Vali failidest uus"
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr "Eemalda pilt"
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr "Kas png või jpg. Võimalikult ruudukujuline, kuid Sul on võimalus veel lõigata."
+
+#: templates/personal.php:97
+msgid "Abort"
+msgstr "Katkesta"
+
+#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr "Vali kui profiili pilt"
+
+#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
msgstr "Keel"
-#: templates/personal.php:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "Aita tõlkida"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: 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 "Kasuta seda aadressi <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">oma failidele ligipääsuks WebDAV kaudu</a>"
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "Krüpteerimine"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr "Küpteeringu rakend pole lubatud, dekrüpteeri kõik oma failid"
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr "Sisselogimise parool"
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr "Dekrüpteeri kõik failid"
@@ -513,30 +574,30 @@ msgstr "Sisesta taasteparool kasutaja failide taastamiseks paroolivahetuse käig
msgid "Default Storage"
msgstr "Vaikimisi maht"
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr "Piiramatult"
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "Muu"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "Kasutajanimi"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr "Maht"
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr "muuda näidatavat nime"
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr "määra uus parool"
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr "Vaikeväärtus"
diff --git a/l10n/et_EE/user_ldap.po b/l10n/et_EE/user_ldap.po
index f0267918f4d3ff4f7806f2bcfb51a1b60dca3d51..bdc18ee7dba2d96261d67095384f7411ee590d8b 100644
--- a/l10n/et_EE/user_ldap.po
+++ b/l10n/et_EE/user_ldap.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-08-22 10:36-0400\n"
-"PO-Revision-Date: 2013-08-22 09:40+0000\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-05 11:51+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"
diff --git a/l10n/eu/core.po b/l10n/eu/core.po
index f74e5e305921d124a53252fcdfbb549576f2bcc6..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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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"
@@ -24,6 +24,10 @@ msgstr ""
msgid "%s shared »%s« with you"
msgstr "%s-ek »%s« zurekin partekatu du"
+#: ajax/share.php:227
+msgid "group"
+msgstr "taldea"
+
#: ajax/update.php:11
msgid "Turned on maintenance mode"
msgstr ""
@@ -88,6 +92,26 @@ msgstr "Ez da ezabatzeko kategoriarik hautatu."
msgid "Error removing %s from favorites."
msgstr "Errorea gertatu da %s gogokoetatik ezabatzean."
+#: 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 "Igandea"
@@ -164,59 +188,59 @@ msgstr "Azaroa"
msgid "December"
msgstr "Abendua"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "Ezarpenak"
-#: js/js.js:812
+#: js/js.js:866
msgid "seconds ago"
msgstr "segundu"
-#: js/js.js:813
+#: 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:814
+#: 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:815
+#: js/js.js:869
msgid "today"
msgstr "gaur"
-#: js/js.js:816
+#: js/js.js:870
msgid "yesterday"
msgstr "atzo"
-#: js/js.js:817
+#: 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:818
+#: js/js.js:872
msgid "last month"
msgstr "joan den hilabetean"
-#: js/js.js:819
+#: 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:820
+#: js/js.js:874
msgid "months ago"
msgstr "hilabete"
-#: js/js.js:821
+#: js/js.js:875
msgid "last year"
msgstr "joan den urtean"
-#: js/js.js:822
+#: js/js.js:876
msgid "years ago"
msgstr "urte"
@@ -224,22 +248,66 @@ msgstr "urte"
msgid "Choose"
msgstr "Aukeratu"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
-msgstr "Errorea fitxategi hautatzaile txantiloiak kargatzerakoan"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
+msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "Bai"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "Ez"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr "Ados"
+#: 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 "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."
@@ -249,7 +317,7 @@ msgstr "Objetu mota ez dago zehaztuta."
#: 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:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "Errorea"
@@ -269,7 +337,7 @@ msgstr "Elkarbanatuta"
msgid "Share"
msgstr "Elkarbanatu"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr "Errore bat egon da elkarbanatzean"
@@ -325,67 +393,67 @@ msgstr "Ezarri muga data"
msgid "Expiration date"
msgstr "Muga data"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "Elkarbanatu eposta bidez:"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "Ez da inor aurkitu"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "Berriz elkarbanatzea ez dago baimendua"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr "{user}ekin {item}-n elkarbanatuta"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "Ez elkarbanatu"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "editatu dezake"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "sarrera kontrola"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "sortu"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "eguneratu"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "ezabatu"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "elkarbanatu"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "Pasahitzarekin babestuta"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr "Errorea izan da muga data kentzean"
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr "Errore bat egon da muga data ezartzean"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr "Bidaltzen ..."
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr "Eposta bidalia"
@@ -400,7 +468,7 @@ msgstr "Eguneraketa ez da ongi egin. Mesedez egin arazoaren txosten bat <a href=
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Eguneraketa ongi egin da. Orain zure ownClouderea berbideratua izango zara."
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr "%s pasahitza berrezarri"
@@ -469,7 +537,7 @@ msgstr "Pertsonala"
msgid "Users"
msgstr "Erabiltzaileak"
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "Aplikazioak"
@@ -598,14 +666,10 @@ msgstr "Bukatu konfigurazioa"
msgid "%s is available. Get more information on how to update."
msgstr "%s erabilgarri dago. Eguneratzeaz argibide gehiago eskuratu."
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "Saioa bukatu"
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr "App gehiago"
-
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "Saio hasiera automatikoa ez onartuta!"
@@ -620,19 +684,19 @@ msgstr "Zure pasahitza orain dela gutxi ez baduzu aldatu, zure kontua arriskuan
msgid "Please change your password to secure your account again."
msgstr "Mesedez aldatu zure pasahitza zure kontua berriz segurtatzeko."
-#: templates/login.php:34
+#: templates/login.php:32
msgid "Lost your password?"
msgstr "Galdu duzu pasahitza?"
-#: templates/login.php:39
+#: templates/login.php:37
msgid "remember"
msgstr "gogoratu"
-#: templates/login.php:41
+#: templates/login.php:39
msgid "Log in"
msgstr "Hasi saioa"
-#: templates/login.php:47
+#: templates/login.php:45
msgid "Alternative Logins"
msgstr "Beste erabiltzaile izenak"
diff --git a/l10n/eu/files.po b/l10n/eu/files.po
index 878b37729c734711f1e3bbc11cbbd70819bcbde5..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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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,7 +76,15 @@ msgstr "Errore bat izan da diskoan idazterakoan"
msgid "Not enough storage available"
msgstr "Ez dago behar aina leku erabilgarri,"
-#: ajax/upload.php:123
+#: 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 "Baliogabeko karpeta."
@@ -84,149 +92,157 @@ 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: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 "Fitxategien igoera martxan da. Orria orain uzteak igoera ezeztatutko du."
-#: js/file-upload.js:241
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr "URLa ezin da hutsik egon."
-#: 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 "Karpeta izne baliogabea. \"Shared\" karpeta erabilpena OwnCloudentzat erreserbaturik dago."
-#: js/file-upload.js:277 js/file-upload.js:293 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 "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:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "Zain"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{new_name} dagoeneko existitzen da"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "ordeztu"
-#: js/filelist.js:303
+#: js/filelist.js:416
msgid "suggest name"
msgstr "aholkatu izena"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "ezeztatu"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr " {new_name}-k {old_name} ordezkatu du"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "undo"
msgstr "desegin"
-#: js/filelist.js:453
+#: 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: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: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] "Fitxategi %n igotzen"
msgstr[1] "%n fitxategi igotzen"
-#: js/filelist.js:518
-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: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 "Izena"
-#: js/files.js:563 templates/index.php:78
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "Tamaina"
-#: js/files.js:564 templates/index.php:80
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr "Aldatuta"
-#: js/files.js:580
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] "karpeta %n"
-msgstr[1] "%n karpeta"
-
-#: js/files.js:586
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] "fitxategi %n"
-msgstr[1] "%n fitxategi"
-
#: lib/app.php:73
#, php-format
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"
@@ -262,84 +278,68 @@ 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:73
+#: templates/index.php:67
msgid "Download"
msgstr "Deskargatu"
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr "Ez elkarbanatu"
-#: templates/index.php:91 templates/index.php:92
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "Ezabatu"
-#: templates/index.php:105
+#: templates/index.php:100
msgid "Upload too large"
msgstr "Igoera handiegia da"
-#: 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 "Igotzen saiatzen ari zaren fitxategiak zerbitzari honek igotzeko onartzen duena baino handiagoak dira."
-#: templates/index.php:112
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr "Fitxategiak eskaneatzen ari da, itxoin mezedez."
-#: templates/index.php:115
+#: templates/index.php:110
msgid "Current scanning"
msgstr "Orain eskaneatzen ari da"
-#: templates/part.list.php:74
-msgid "directory"
-msgstr "direktorioa"
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr "direktorioak"
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr "fitxategia"
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr "fitxategiak"
-
#: templates/upgrade.php:2
msgid "Upgrading filesystem cache..."
msgstr "Fitxategi sistemaren katxea eguneratzen..."
diff --git a/l10n/eu/files_sharing.po b/l10n/eu/files_sharing.po
index 36bdac1c072c9857d516932b26f76ab010930f32..ce629410a61ed944d7064f3d29b5c21fdd9c7d18 100644
--- a/l10n/eu/files_sharing.po
+++ b/l10n/eu/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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:10+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:01+0000\n"
"Last-Translator: asieriko <asieriko@gmail.com>\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
@@ -64,7 +64,7 @@ msgstr "%sk zurekin %s karpeta elkarbanatu du"
msgid "%s shared the file %s with you"
msgstr "%sk zurekin %s fitxategia elkarbanatu du"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "Deskargatu"
@@ -76,6 +76,6 @@ msgstr "Igo"
msgid "Cancel upload"
msgstr "Ezeztatu igoera"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "Ez dago aurrebista eskuragarririk hauentzat "
diff --git a/l10n/eu/lib.po b/l10n/eu/lib.po
index cb9bb315d4a99e6cbae6b825b66ecd9dae0dfcdf..017ba3930fdcbda0ceed168b497eb87eafb74e74 100644
--- a/l10n/eu/lib.po
+++ b/l10n/eu/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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\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"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
@@ -50,11 +50,23 @@ msgstr "Erabiltzaileak"
msgid "Admin"
msgstr "Admin"
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "Ezin izan da \"%s\" eguneratu."
+#: 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 "web zerbitzuak zure kontrolpean"
@@ -107,37 +119,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: 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:150
+#: 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:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -266,51 +278,51 @@ msgstr "Zure web zerbitzaria ez dago oraindik ongi konfiguratuta fitxategien sin
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Mesedez begiratu <a href='%s'>instalazio gidak</a>."
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "segundu"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "orain dela minutu %n"
msgstr[1] "orain dela %n minutu"
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "orain dela ordu %n"
msgstr[1] "orain dela %n ordu"
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "gaur"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "atzo"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] "orain dela egun %n"
msgstr[1] "orain dela %n egun"
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "joan den hilabetean"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "orain dela hilabete %n"
msgstr[1] "orain dela %n hilabete"
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "joan den urtean"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "urte"
diff --git a/l10n/eu/settings.po b/l10n/eu/settings.po
index 617d57288fee8a3792e1b1b435d80ddfb6ef508d..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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+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,55 +86,88 @@ msgstr "Ezin izan da erabiltzailea %s taldetik ezabatu"
msgid "Couldn't update app."
msgstr "Ezin izan da aplikazioa eguneratu."
-#: js/apps.js:35
+#: 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"
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr "Ez-gaitu"
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr "Gaitu"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr "Itxoin mesedez..."
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr "Eguneratzen..."
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr "Errorea aplikazioa eguneratzen zen bitartean"
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "Errorea"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr "Eguneratu"
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr "Eguneratuta"
-#: js/personal.js:150
+#: 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:172
+#: js/personal.js:287
msgid "Saving..."
msgstr "Gordetzen..."
@@ -150,16 +183,16 @@ msgstr "desegin"
msgid "Unable to remove user"
msgstr "Ezin izan da erabiltzailea aldatu"
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "Taldeak"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "Talde administradorea"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "Ezabatu"
@@ -179,7 +212,7 @@ msgstr "Errore bat egon da erabiltzailea sortzean"
msgid "A valid password must be provided"
msgstr "Baliozko pasahitza eman behar da"
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "Euskera"
@@ -345,11 +378,11 @@ msgstr "Gehiago"
msgid "Less"
msgstr "Gutxiago"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "Bertsioa"
-#: templates/admin.php:246 templates/personal.php:143
+#: 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 "
@@ -416,7 +449,7 @@ msgstr "Erakutsi berriz Lehenengo Aldiko Morroia"
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Dagoeneko <strong>%s</strong> erabili duzu eskuragarri duzun <strong>%s</strong>etatik"
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "Pasahitza"
@@ -440,7 +473,7 @@ msgstr "Pasahitz berria"
msgid "Change password"
msgstr "Aldatu pasahitza"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr "Bistaratze Izena"
@@ -456,38 +489,66 @@ msgstr "Zure e-posta"
msgid "Fill in an email address to enable password recovery"
msgstr "Idatz ezazu e-posta bat pasahitza berreskuratu ahal izateko"
-#: templates/personal.php:85 templates/personal.php:86
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr "Profilaren irudia"
+
+#: 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 "Hizkuntza"
-#: templates/personal.php:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "Lagundu itzultzen"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: 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 "<a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">helbidea erabili zure fitxategiak WebDAV bidez eskuratzeko</a>"
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "Enkriptazioa"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -513,30 +574,30 @@ msgstr "berreskuratze pasahitza idatzi pasahitz aldaketan erabiltzaileen fitxate
msgid "Default Storage"
msgstr "Lehenetsitako Biltegiratzea"
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr "Mugarik gabe"
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "Bestelakoa"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "Erabiltzaile izena"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr "Biltegiratzea"
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr "aldatu bistaratze izena"
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr "ezarri pasahitz berria"
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr "Lehenetsia"
diff --git a/l10n/eu/user_ldap.po b/l10n/eu/user_ldap.po
index e9c2fb101c7813bac5145b12573ebe27818ad9a8..7712a3e1d1820702340fc20e5949033305ab2338 100644
--- a/l10n/eu/user_ldap.po
+++ b/l10n/eu/user_ldap.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-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\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"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fa/core.po b/l10n/fa/core.po
index 514c10f57f2442c635abbeaf0eb9ca789ab0f1e5..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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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"
@@ -23,6 +23,10 @@ msgstr ""
msgid "%s shared »%s« with you"
msgstr "%s به اشتراک گذاشته شده است »%s« توسط شما"
+#: ajax/share.php:227
+msgid "group"
+msgstr "گروه"
+
#: ajax/update.php:11
msgid "Turned on maintenance mode"
msgstr ""
@@ -87,6 +91,26 @@ msgstr "هیج دسته ای برای پاک شدن انتخاب نشده است
msgid "Error removing %s from favorites."
msgstr "خطای پاک کردن %s از علاقه مندی ها."
+#: 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 "یکشنبه"
@@ -163,55 +187,55 @@ msgstr "نوامبر"
msgid "December"
msgstr "دسامبر"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "تنظیمات"
-#: js/js.js:812
+#: js/js.js:866
msgid "seconds ago"
msgstr "ثانیهها پیش"
-#: js/js.js:813
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: js/js.js:814
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: js/js.js:815
+#: js/js.js:869
msgid "today"
msgstr "امروز"
-#: js/js.js:816
+#: js/js.js:870
msgid "yesterday"
msgstr "دیروز"
-#: js/js.js:817
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
-#: js/js.js:818
+#: js/js.js:872
msgid "last month"
msgstr "ماه قبل"
-#: js/js.js:819
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: js/js.js:820
+#: js/js.js:874
msgid "months ago"
msgstr "ماههای قبل"
-#: js/js.js:821
+#: js/js.js:875
msgid "last year"
msgstr "سال قبل"
-#: js/js.js:822
+#: js/js.js:876
msgid "years ago"
msgstr "سالهای قبل"
@@ -219,22 +243,65 @@ msgstr "سالهای قبل"
msgid "Choose"
msgstr "انتخاب کردن"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
-msgstr "خطا در بارگذاری قالب انتخاب کننده فایل"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
+msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "بله"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "نه"
-#: js/oc-dialogs.js:195
+#: 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] ""
+
+#: 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."
@@ -244,7 +311,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:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "خطا"
@@ -264,7 +331,7 @@ msgstr "اشتراک گذاشته شده"
msgid "Share"
msgstr "اشتراکگذاری"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr "خطا درحال به اشتراک گذاشتن"
@@ -320,67 +387,67 @@ msgstr "تنظیم تاریخ انقضا"
msgid "Expiration date"
msgstr "تاریخ انقضا"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "از طریق ایمیل به اشتراک بگذارید :"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "کسی یافت نشد"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "اشتراک گذاری مجدد مجاز نمی باشد"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr "به اشتراک گذاشته شده در {بخش} با {کاربر}"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "لغو اشتراک"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "می توان ویرایش کرد"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "کنترل دسترسی"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "ایجاد"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "به روز"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "پاک کردن"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "به اشتراک گذاشتن"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "نگهداری از رمز عبور"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr "خطا در تنظیم نکردن تاریخ انقضا "
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr "خطا در تنظیم تاریخ انقضا"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr "درحال ارسال ..."
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr "ایمیل ارسال شد"
@@ -395,7 +462,7 @@ msgstr "به روز رسانی ناموفق بود. لطفا این خطا را
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "به روزرسانی موفقیت آمیز بود. در حال انتقال شما به OwnCloud."
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr ""
@@ -464,7 +531,7 @@ msgstr "شخصی"
msgid "Users"
msgstr "کاربران"
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr " برنامه ها"
@@ -593,14 +660,10 @@ msgstr "اتمام نصب"
msgid "%s is available. Get more information on how to update."
msgstr "%s در دسترس است. برای چگونگی به روز رسانی اطلاعات بیشتر را دریافت نمایید."
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "خروج"
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "ورود به سیستم اتوماتیک ردشد!"
@@ -615,19 +678,19 @@ msgstr "اگر شما اخیرا رمزعبور را تغییر نداده ای
msgid "Please change your password to secure your account again."
msgstr "لطفا رمز عبور خود را تغییر دهید تا مجددا حساب شما در امان باشد."
-#: templates/login.php:34
+#: templates/login.php:32
msgid "Lost your password?"
msgstr "آیا گذرواژه تان را به یاد نمی آورید؟"
-#: templates/login.php:39
+#: templates/login.php:37
msgid "remember"
msgstr "بیاد آوری"
-#: templates/login.php:41
+#: templates/login.php:39
msgid "Log in"
msgstr "ورود"
-#: templates/login.php:47
+#: templates/login.php:45
msgid "Alternative Logins"
msgstr "ورود متناوب"
diff --git a/l10n/fa/files.po b/l10n/fa/files.po
index 4487cf2fcb085ea167e418f23362e3a460f18033..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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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,7 +75,15 @@ msgstr "نوشتن بر روی دیسک سخت ناموفق بود"
msgid "Not enough storage available"
msgstr "فضای کافی در دسترس نیست"
-#: ajax/upload.php:123
+#: 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 "فهرست راهنما نامعتبر می باشد."
@@ -83,146 +91,154 @@ 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: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 "URL نمی تواند خالی باشد."
-#: 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 "نام پوشه نامعتبر است. استفاده از 'به اشتراک گذاشته شده' متعلق به ownCloud میباشد."
-#: js/file-upload.js:277 js/file-upload.js:293 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:465
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "در انتظار"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{نام _جدید} در حال حاضر وجود دارد."
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "جایگزین"
-#: js/filelist.js:303
+#: js/filelist.js:416
msgid "suggest name"
msgstr "پیشنهاد نام"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "لغو"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr "{نام_جدید} با { نام_قدیمی} جایگزین شد."
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "undo"
msgstr "بازگشت"
-#: js/filelist.js:453
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+
+#: 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] ""
-#: js/filelist.js:518
-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: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 "تاریخ"
-#: js/files.js:580
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-
-#: js/files.js:586
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-
#: lib/app.php:73
#, php-format
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 "بارگزاری"
@@ -258,84 +274,68 @@ 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 "سایز فایل برای آپلود زیاد است(م.تنظیمات در php.ini)"
-#: 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 "فایلها بیش از حد تعیین شده در این سرور هستند\nمترجم:با تغییر فایل php,ini میتوان این محدودیت را برطرف کرد"
-#: 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 "بازرسی کنونی"
-#: templates/part.list.php:74
-msgid "directory"
-msgstr "پوشه"
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr "پوشه ها"
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr "پرونده"
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr "پرونده ها"
-
#: templates/upgrade.php:2
msgid "Upgrading filesystem cache..."
msgstr "بهبود فایل سیستمی ذخیره گاه..."
diff --git a/l10n/fa/files_sharing.po b/l10n/fa/files_sharing.po
index 84ebd4737a295ad3a415c194b07a511c594caeb3..14a3c4edfa7251c355aa1dfc224b8d3efb227092 100644
--- a/l10n/fa/files_sharing.po
+++ b/l10n/fa/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00: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"
@@ -64,7 +64,7 @@ msgstr "%sپوشه %s را با شما به اشتراک گذاشت"
msgid "%s shared the file %s with you"
msgstr "%sفایل %s را با شما به اشتراک گذاشت"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "دانلود"
@@ -76,6 +76,6 @@ msgstr "بارگزاری"
msgid "Cancel upload"
msgstr "متوقف کردن بار گذاری"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "هیچگونه پیش نمایشی موجود نیست"
diff --git a/l10n/fa/lib.po b/l10n/fa/lib.po
index 565794cd0d15ebcc542b255adfd1c5b0830fc9ac..e395df54b9c3498bfa6955ab940c41e1c8d81461 100644
--- a/l10n/fa/lib.po
+++ b/l10n/fa/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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\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"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
@@ -49,11 +49,23 @@ msgstr "کاربران"
msgid "Admin"
msgstr "مدیر"
-#: app.php:837
+#: 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 "سرویس های تحت وب در کنترل شما"
@@ -106,37 +118,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: 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:150
+#: 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:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -265,47 +277,47 @@ msgstr "احتمالاً وب سرور شما طوری تنظیم نشده اس
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "لطفاً دوباره <a href='%s'>راهنمای نصب</a>را بررسی کنید."
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "ثانیهها پیش"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "امروز"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "دیروز"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "ماه قبل"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "سال قبل"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "سالهای قبل"
diff --git a/l10n/fa/settings.po b/l10n/fa/settings.po
index 015429708da2f85f7aec7dd36f0d3efccb62d2c8..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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+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,55 +85,88 @@ msgstr "امکان حذف کاربر از گروه %s نیست"
msgid "Couldn't update app."
msgstr "برنامه را نمی توان به هنگام ساخت."
-#: js/apps.js:35
+#: 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}"
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr "غیرفعال"
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr "فعال"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr "لطفا صبر کنید ..."
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr "در حال بروز رسانی..."
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr "خطا در هنگام بهنگام سازی برنامه"
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "خطا"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr "به روز رسانی"
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr "بروز رسانی انجام شد"
-#: js/personal.js:150
+#: 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:172
+#: js/personal.js:287
msgid "Saving..."
msgstr "در حال ذخیره سازی..."
@@ -149,16 +182,16 @@ msgstr "بازگشت"
msgid "Unable to remove user"
msgstr "حذف کاربر امکان پذیر نیست"
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: 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:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "گروه مدیران"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "حذف"
@@ -178,7 +211,7 @@ msgstr "خطا در ایجاد کاربر"
msgid "A valid password must be provided"
msgstr "رمز عبور صحیح باید وارد شود"
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "__language_name__"
@@ -344,11 +377,11 @@ msgstr "بیشتر"
msgid "Less"
msgstr "کمتر"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "نسخه"
-#: templates/admin.php:246 templates/personal.php:143
+#: 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 "
@@ -415,7 +448,7 @@ msgstr "راهبری کمکی اجرای اول را دوباره نمایش ب
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "شما استفاده کردید از <strong>%s</strong> از میزان در دسترس <strong>%s</strong>"
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "گذرواژه"
@@ -439,7 +472,7 @@ msgstr "گذرواژه جدید"
msgid "Change password"
msgstr "تغییر گذر واژه"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr "نام نمایشی"
@@ -455,38 +488,66 @@ msgstr "پست الکترونیکی شما"
msgid "Fill in an email address to enable password recovery"
msgstr "پست الکترونیکی را پرکنید تا بازیابی گذرواژه فعال شود"
-#: templates/personal.php:85 templates/personal.php:86
+#: 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:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "به ترجمه آن کمک کنید"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: 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 "استفاده ابن آدرس <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\"> برای دسترسی فایل های شما از طریق WebDAV </a>"
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "رمزگذاری"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -512,30 +573,30 @@ msgstr "در حین تغییر رمز عبور به منظور بازیابی ف
msgid "Default Storage"
msgstr "ذخیره سازی پیش فرض"
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr "نامحدود"
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "دیگر"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "نام کاربری"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr "حافظه"
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr "تغییر نام نمایشی"
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr "تنظیم کلمه عبور جدید"
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr "پیش فرض"
diff --git a/l10n/fa/user_ldap.po b/l10n/fa/user_ldap.po
index dabbd41a9cecf5bae2759eb17686b14096e8ddc7..9496f28720188d6dbd5f48741d9144acfd015419 100644
--- a/l10n/fa/user_ldap.po
+++ b/l10n/fa/user_ldap.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-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\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"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fi_FI/core.po b/l10n/fi_FI/core.po
index 92a3e60065d38ee7a9f0857f9af812d1f1f8c528..2a2872e255064f2b9055f652039ca48935301792 100644
--- a/l10n/fi_FI/core.po
+++ b/l10n/fi_FI/core.po
@@ -4,13 +4,14 @@
#
# Translators:
# Jiri Grönroos <jiri.gronroos@iki.fi>, 2013
+# ioxo <vahakangas@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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"
@@ -23,30 +24,34 @@ msgstr ""
msgid "%s shared »%s« with you"
msgstr "%s jakoi kohteen »%s« kanssasi"
+#: ajax/share.php:227
+msgid "group"
+msgstr "ryhmä"
+
#: ajax/update.php:11
msgid "Turned on maintenance mode"
-msgstr ""
+msgstr "Siirrytty ylläpitotilaan"
#: ajax/update.php:14
msgid "Turned off maintenance mode"
-msgstr ""
+msgstr "Ylläpitotila laitettu pois päältä"
#: ajax/update.php:17
msgid "Updated database"
-msgstr ""
+msgstr "Tietokanta ajan tasalla"
#: ajax/update.php:20
msgid "Updating filecache, this may take really long..."
-msgstr ""
+msgstr "Päivitetään tiedostojen välimuistia, tämä saattaa kestää todella kauan..."
#: ajax/update.php:23
msgid "Updated filecache"
-msgstr ""
+msgstr "Tiedostojen välimuisti päivitetty"
#: ajax/update.php:26
#, php-format
msgid "... %d%% done ..."
-msgstr ""
+msgstr "... %d%% valmis ..."
#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
msgid "Category type not provided."
@@ -87,6 +92,26 @@ msgstr "Luokkia ei valittu poistettavaksi."
msgid "Error removing %s from favorites."
msgstr "Virhe poistaessa kohdetta %s suosikeista."
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr "Tuntematon tiedostotyyppi"
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr "Virhellinen kuva"
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr "Väliaikaista profiilikuvaa ei ole käytettävissä, yritä uudelleen"
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr ""
+
#: js/config.php:32
msgid "Sunday"
msgstr "sunnuntai"
@@ -163,59 +188,59 @@ msgstr "marraskuu"
msgid "December"
msgstr "joulukuu"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "Asetukset"
-#: js/js.js:812
+#: js/js.js:866
msgid "seconds ago"
msgstr "sekuntia sitten"
-#: js/js.js:813
+#: 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:814
+#: 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:815
+#: js/js.js:869
msgid "today"
msgstr "tänään"
-#: js/js.js:816
+#: js/js.js:870
msgid "yesterday"
msgstr "eilen"
-#: js/js.js:817
+#: 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:818
+#: js/js.js:872
msgid "last month"
msgstr "viime kuussa"
-#: js/js.js:819
+#: 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:820
+#: js/js.js:874
msgid "months ago"
msgstr "kuukautta sitten"
-#: js/js.js:821
+#: js/js.js:875
msgid "last year"
msgstr "viime vuonna"
-#: js/js.js:822
+#: js/js.js:876
msgid "years ago"
msgstr "vuotta sitten"
@@ -223,22 +248,66 @@ msgstr "vuotta sitten"
msgid "Choose"
msgstr "Valitse"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "Kyllä"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "Ei"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
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] ""
+
+#: 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."
@@ -248,7 +317,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:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "Virhe"
@@ -268,7 +337,7 @@ msgstr "Jaettu"
msgid "Share"
msgstr "Jaa"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr "Virhe jaettaessa"
@@ -324,67 +393,67 @@ msgstr "Aseta päättymispäivä"
msgid "Expiration date"
msgstr "Päättymispäivä"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "Jaa sähköpostilla:"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "Henkilöitä ei löytynyt"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "Jakaminen uudelleen ei ole salittu"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
-msgstr ""
+msgstr "{item} on jaettu {user} kanssa"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "Peru jakaminen"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "voi muokata"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "Pääsyn hallinta"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "luo"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "päivitä"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "poista"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "jaa"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "Salasanasuojattu"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr "Virhe purettaessa eräpäivää"
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr "Virhe päättymispäivää asettaessa"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr "Lähetetään..."
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr "Sähköposti lähetetty"
@@ -399,10 +468,10 @@ msgstr "Päivitys epäonnistui. Ilmoita ongelmasta <a href=\"https://github.com/
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Päivitys onnistui. Selain ohjautuu nyt ownCloudiisi."
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
-msgstr ""
+msgstr "%s salasanan nollaus"
#: lostpassword/templates/email.php:2
msgid "Use the following link to reset your password: {link}"
@@ -468,7 +537,7 @@ msgstr "Henkilökohtainen"
msgid "Users"
msgstr "Käyttäjät"
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "Sovellukset"
@@ -597,14 +666,10 @@ msgstr "Viimeistele asennus"
msgid "%s is available. Get more information on how to update."
msgstr "%s on saatavilla. Lue lisätietoja, miten päivitys asennetaan."
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "Kirjaudu ulos"
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr "Lisää sovelluksia"
-
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "Automaattinen sisäänkirjautuminen hylättiin!"
@@ -619,19 +684,19 @@ msgstr "Jos et vaihtanut salasanaasi äskettäin, tilisi saattaa olla murrettu."
msgid "Please change your password to secure your account again."
msgstr "Vaihda salasanasi suojataksesi tilisi uudelleen."
-#: templates/login.php:34
+#: templates/login.php:32
msgid "Lost your password?"
msgstr "Unohditko salasanasi?"
-#: templates/login.php:39
+#: templates/login.php:37
msgid "remember"
msgstr "muista"
-#: templates/login.php:41
+#: templates/login.php:39
msgid "Log in"
msgstr "Kirjaudu sisään"
-#: templates/login.php:47
+#: templates/login.php:45
msgid "Alternative Logins"
msgstr "Vaihtoehtoiset kirjautumiset"
diff --git a/l10n/fi_FI/files.po b/l10n/fi_FI/files.po
index cd30a9df4bfb345859929d6e762243b328026a63..3e4e67e31d9c1c13f6223f9739dceb0e6a381dc6 100644
--- a/l10n/fi_FI/files.po
+++ b/l10n/fi_FI/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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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 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"
@@ -75,157 +75,173 @@ msgstr "Levylle kirjoitus epäonnistui"
msgid "Not enough storage available"
msgstr "Tallennustilaa ei ole riittävästi käytettävissä"
-#: ajax/upload.php:123
+#: 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 "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:167
+#: 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:241
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr "Verkko-osoite ei voi olla tyhjä"
-#: 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:277 js/file-upload.js:293 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 "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:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "Odottaa"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{new_name} on jo olemassa"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "korvaa"
-#: js/filelist.js:303
+#: js/filelist.js:416
msgid "suggest name"
msgstr "ehdota nimeä"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "peru"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr ""
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "undo"
msgstr "kumoa"
-#: js/filelist.js:453
+#: 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: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:541
+msgid "{dirs} and {files}"
+msgstr "{dirs} ja {files}"
+
+#: 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:518
-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:562 templates/index.php:67
+#: 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:563 templates/index.php:78
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "Koko"
-#: js/files.js:564 templates/index.php:80
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr "Muokattu"
-#: js/files.js:580
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] "%n kansio"
-msgstr[1] "%n kansiota"
-
-#: js/files.js:586
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] "%n tiedosto"
-msgstr[1] "%n tiedostoa"
-
#: lib/app.php:73
#, php-format
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ä"
@@ -261,84 +277,68 @@ 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:73
+#: templates/index.php:67
msgid "Download"
msgstr "Lataa"
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr "Peru jakaminen"
-#: templates/index.php:91 templates/index.php:92
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "Poista"
-#: templates/index.php:105
+#: templates/index.php:100
msgid "Upload too large"
msgstr "Lähetettävä tiedosto on liian suuri"
-#: 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 "Lähetettäväksi valitsemasi tiedostot ylittävät palvelimen salliman tiedostokoon rajan."
-#: templates/index.php:112
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr "Tiedostoja tarkistetaan, odota hetki."
-#: templates/index.php:115
+#: templates/index.php:110
msgid "Current scanning"
msgstr "Tämänhetkinen tutkinta"
-#: templates/part.list.php:74
-msgid "directory"
-msgstr "kansio"
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr "kansiota"
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr "tiedosto"
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr "tiedostoa"
-
#: templates/upgrade.php:2
msgid "Upgrading filesystem cache..."
msgstr "Päivitetään tiedostojärjestelmän välimuistia..."
diff --git a/l10n/fi_FI/files_encryption.po b/l10n/fi_FI/files_encryption.po
index d9687472967084f6e524c345987a26767a0b9d8d..b3dea67b9279f7e211e9a3da8bda5db413a51882 100644
--- a/l10n/fi_FI/files_encryption.po
+++ b/l10n/fi_FI/files_encryption.po
@@ -3,14 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# muro <janne.morsky@metropolia.fi>, 2013
# Jiri Grönroos <jiri.gronroos@iki.fi>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-21 08:10-0400\n"
-"PO-Revision-Date: 2013-08-19 19:20+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-10 10:41-0400\n"
+"PO-Revision-Date: 2013-09-09 19:20+0000\n"
+"Last-Translator: muro <janne.morsky@metropolia.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"
@@ -20,7 +21,7 @@ msgstr ""
#: ajax/adminrecovery.php:29
msgid "Recovery key successfully enabled"
-msgstr ""
+msgstr "Palautusavain kytketty päälle onnistuneesti"
#: ajax/adminrecovery.php:34
msgid ""
@@ -62,20 +63,20 @@ msgid ""
"files."
msgstr ""
-#: hooks/hooks.php:41
+#: hooks/hooks.php:51
msgid "Missing requirements."
msgstr ""
-#: hooks/hooks.php:42
+#: hooks/hooks.php:52
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:249
+#: hooks/hooks.php:250
msgid "Following users are not set up for encryption:"
-msgstr ""
+msgstr "Seuraavat käyttäjät eivät ole määrittäneet salausta:"
#: js/settings-admin.js:11
msgid "Saving..."
@@ -93,7 +94,7 @@ msgstr ""
#: templates/invalid_private_key.php:7
msgid "personal settings"
-msgstr ""
+msgstr "henkilökohtaiset asetukset"
#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
@@ -106,7 +107,7 @@ msgstr ""
#: templates/settings-admin.php:14
msgid "Recovery key password"
-msgstr ""
+msgstr "Palautusavaimen salasana"
#: templates/settings-admin.php:21 templates/settings-personal.php:54
msgid "Enabled"
@@ -118,15 +119,15 @@ msgstr "Ei käytössä"
#: templates/settings-admin.php:34
msgid "Change recovery key password:"
-msgstr ""
+msgstr "Vaihda palautusavaimen salasana:"
#: templates/settings-admin.php:41
msgid "Old Recovery key password"
-msgstr ""
+msgstr "Vanha palautusavaimen salasana"
#: templates/settings-admin.php:48
msgid "New Recovery key password"
-msgstr ""
+msgstr "Uusi palautusavaimen salasana"
#: templates/settings-admin.php:53
msgid "Change Password"
@@ -148,11 +149,11 @@ msgstr ""
#: templates/settings-personal.php:24
msgid "Old log-in password"
-msgstr ""
+msgstr "Vanha kirjautumis-salasana"
#: templates/settings-personal.php:30
msgid "Current log-in password"
-msgstr ""
+msgstr "Nykyinen kirjautumis-salasana"
#: templates/settings-personal.php:35
msgid "Update Private Key Password"
@@ -160,7 +161,7 @@ msgstr ""
#: templates/settings-personal.php:45
msgid "Enable password recovery:"
-msgstr ""
+msgstr "Ota salasanan palautus käyttöön:"
#: templates/settings-personal.php:47
msgid ""
diff --git a/l10n/fi_FI/files_sharing.po b/l10n/fi_FI/files_sharing.po
index fd6c9d78d87ea92087cc4b820fae100065db080b..a2ffb0fc8272e8557ec31bf7b4a1fc1686dd4804 100644
--- a/l10n/fi_FI/files_sharing.po
+++ b/l10n/fi_FI/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:01+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"
@@ -64,7 +64,7 @@ msgstr "%s jakoi kansion %s kanssasi"
msgid "%s shared the file %s with you"
msgstr "%s jakoi tiedoston %s kanssasi"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "Lataa"
@@ -76,6 +76,6 @@ msgstr "Lähetä"
msgid "Cancel upload"
msgstr "Peru lähetys"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "Ei esikatselua kohteelle"
diff --git a/l10n/fi_FI/lib.po b/l10n/fi_FI/lib.po
index fcd9edec0e477412c282d3f62277e09b5bf34fbd..41e7241ad3d22d3042fe141715fc1fe7bb4e383c 100644
--- a/l10n/fi_FI/lib.po
+++ b/l10n/fi_FI/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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-26 06:20+0000\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"
@@ -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"
@@ -49,10 +49,22 @@ msgstr "Käyttäjät"
msgid "Admin"
msgstr "Ylläpitäjä"
-#: app.php:837
+#: 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 "Omavalintaiset profiilikuvat eivät toimi salauksen kanssa vielä"
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr "Tuntematon tiedostotyyppi"
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr "Virheellinen kuva"
#: defaults.php:35
msgid "web services under your control"
@@ -106,37 +118,37 @@ msgstr "Tyypin %s arkistot eivät ole tuettuja"
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr "Sovellus ei sisällä info.xml-tiedostoa"
-#: installer.php:129
+#: 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:138
+#: 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:144
+#: 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:150
+#: 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:160
+#: installer.php:162
msgid "App directory already exists"
msgstr "Sovelluskansio on jo olemassa"
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr "Sovelluskansion luominen ei onnistu. Korjaa käyttöoikeudet. %s"
@@ -265,51 +277,51 @@ msgstr ""
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Lue tarkasti <a href='%s'>asennusohjeet</a>."
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "sekuntia sitten"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n minuutti sitten"
msgstr[1] "%n minuuttia sitten"
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n tunti sitten"
msgstr[1] "%n tuntia sitten"
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "tänään"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "eilen"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] "%n päivä sitten"
msgstr[1] "%n päivää sitten"
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "viime kuussa"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n kuukausi sitten"
msgstr[1] "%n kuukautta sitten"
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "viime vuonna"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "vuotta sitten"
diff --git a/l10n/fi_FI/settings.po b/l10n/fi_FI/settings.po
index 92f6acfd299cc84a429752e8192e3a8b353fc6ce..2b9b270367a7d780f64ae7b1cf5fbc7214ea56f1 100644
--- a/l10n/fi_FI/settings.po
+++ b/l10n/fi_FI/settings.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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-26 06:20+0000\n"
-"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\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"
"Content-Type: text/plain; charset=UTF-8\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,55 +85,88 @@ msgstr "Käyttäjän poistaminen ryhmästä %s ei onnistu"
msgid "Couldn't update app."
msgstr "Sovelluksen päivitys epäonnistui."
-#: js/apps.js:35
+#: 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}"
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr "Poista käytöstä"
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr "Käytä"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr "Odota hetki..."
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr "Virhe poistaessa sovellusta käytöstä"
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr "Virhe ottaessa sovellusta käyttöön"
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr "Päivitetään..."
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr "Virhe sovellusta päivittäessä"
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "Virhe"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr "Päivitä"
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr "Päivitetty"
-#: js/personal.js:150
+#: js/personal.js:220
+msgid "Select a profile picture"
+msgstr "Valitse profiilikuva"
+
+#: 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:172
+#: js/personal.js:287
msgid "Saving..."
msgstr "Tallennetaan..."
@@ -149,16 +182,16 @@ msgstr "kumoa"
msgid "Unable to remove user"
msgstr "Käyttäjän poistaminen ei onnistunut"
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "Ryhmät"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "Ryhmän ylläpitäjä"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "Poista"
@@ -178,7 +211,7 @@ msgstr "Virhe käyttäjää luotaessa"
msgid "A valid password must be provided"
msgstr "Anna kelvollinen salasana"
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "_kielen_nimi_"
@@ -344,11 +377,11 @@ msgstr "Enemmän"
msgid "Less"
msgstr "Vähemmän"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "Versio"
-#: templates/admin.php:246 templates/personal.php:143
+#: 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 "
@@ -415,7 +448,7 @@ msgstr "Näytä ensimmäisen käyttökerran avustaja uudelleen"
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Käytössäsi on <strong>%s</strong>/<strong>%s</strong>"
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "Salasana"
@@ -439,7 +472,7 @@ msgstr "Uusi salasana"
msgid "Change password"
msgstr "Vaihda salasana"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr "Näyttönimi"
@@ -455,38 +488,66 @@ msgstr "Sähköpostiosoitteesi"
msgid "Fill in an email address to enable password recovery"
msgstr "Anna sähköpostiosoitteesi, jotta unohdettu salasana on mahdollista palauttaa"
-#: templates/personal.php:85 templates/personal.php:86
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr "Profiilikuva"
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr "Lähetä uusi"
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr "Valitse uusi tiedostoista"
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr "Poista kuva"
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr "Joko png- tai jpg-kuva. Mieluite neliö, voit kuitenkin rajata kuvaa."
+
+#: templates/personal.php:97
+msgid "Abort"
+msgstr "Keskeytä"
+
+#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr "Valitse profiilikuvaksi"
+
+#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
msgstr "Kieli"
-#: templates/personal.php:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "Auta kääntämisessä"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: 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 "Käytä tätä osoitetta <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">päästäksesi käsiksi tiedostoihisi WebDAVin kautta</a>"
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "Salaus"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr "Salaussovellus ei ole enää käytössä, pura kaikkien tiedostojesi salaus"
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr "Pura kaikkien tiedostojen salaus"
@@ -512,30 +573,30 @@ msgstr ""
msgid "Default Storage"
msgstr "Oletustallennustila"
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr "Rajoittamaton"
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "Muu"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "Käyttäjätunnus"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr "Tallennustila"
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr "vaihda näyttönimi"
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr "aseta uusi salasana"
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr "Oletus"
diff --git a/l10n/fi_FI/user_ldap.po b/l10n/fi_FI/user_ldap.po
index 394517b92922190ca254c25d5f85ec6d1c9072f8..fb7a03660481ab92d2144928a992e16d4d279b2c 100644
--- a/l10n/fi_FI/user_ldap.po
+++ b/l10n/fi_FI/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\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"
"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fr/core.po b/l10n/fr/core.po
index 93732ea30ea586a90ff4212c21e1539bb3226ff3..bce932689a0cdf4f56ceebabbe402c662c368bcc 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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-27 00:01-0400\n"
+"PO-Revision-Date: 2013-09-26 15:10+0000\n"
+"Last-Translator: Christophe Lherieau <skimpax@gmail.com>\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"
@@ -27,30 +28,34 @@ msgstr ""
msgid "%s shared »%s« with you"
msgstr "%s partagé »%s« avec vous"
+#: ajax/share.php:227
+msgid "group"
+msgstr "groupe"
+
#: ajax/update.php:11
msgid "Turned on maintenance mode"
-msgstr ""
+msgstr "Basculé en mode maintenance"
#: ajax/update.php:14
msgid "Turned off maintenance mode"
-msgstr ""
+msgstr "Basculé en mode production (non maintenance)"
#: ajax/update.php:17
msgid "Updated database"
-msgstr ""
+msgstr "Base de données mise à jour"
#: ajax/update.php:20
msgid "Updating filecache, this may take really long..."
-msgstr ""
+msgstr "En cours de mise à jour de cache de fichiers. Cette opération peut être très longue..."
#: ajax/update.php:23
msgid "Updated filecache"
-msgstr ""
+msgstr "Cache de fichier mis à jour"
#: ajax/update.php:26
#, php-format
msgid "... %d%% done ..."
-msgstr ""
+msgstr "... %d%% effectué ..."
#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
msgid "Category type not provided."
@@ -91,6 +96,26 @@ msgstr "Pas de catégorie sélectionnée pour la suppression."
msgid "Error removing %s from favorites."
msgstr "Erreur lors de la suppression de %s des favoris."
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr "Aucune image ou fichier fourni"
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr "Type de fichier inconnu"
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr "Image invalide"
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr "Aucune image temporaire disponible pour le profil. Essayez à nouveau."
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr "Aucune donnée de culture fournie"
+
#: js/config.php:32
msgid "Sunday"
msgstr "Dimanche"
@@ -167,59 +192,59 @@ msgstr "novembre"
msgid "December"
msgstr "décembre"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "Paramètres"
-#: js/js.js:812
+#: js/js.js:866
msgid "seconds ago"
msgstr "il y a quelques secondes"
-#: js/js.js:813
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "il y a %n minute"
+msgstr[1] "il y a %n minutes"
-#: js/js.js:814
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Il y a %n heure"
+msgstr[1] "Il y a %n heures"
-#: js/js.js:815
+#: js/js.js:869
msgid "today"
msgstr "aujourd'hui"
-#: js/js.js:816
+#: js/js.js:870
msgid "yesterday"
msgstr "hier"
-#: js/js.js:817
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "il y a %n jour"
+msgstr[1] "il y a %n jours"
-#: js/js.js:818
+#: js/js.js:872
msgid "last month"
msgstr "le mois dernier"
-#: js/js.js:819
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Il y a %n mois"
+msgstr[1] "Il y a %n mois"
-#: js/js.js:820
+#: js/js.js:874
msgid "months ago"
msgstr "il y a plusieurs mois"
-#: js/js.js:821
+#: js/js.js:875
msgid "last year"
msgstr "l'année dernière"
-#: js/js.js:822
+#: js/js.js:876
msgid "years ago"
msgstr "il y a plusieurs années"
@@ -227,22 +252,66 @@ msgstr "il y a plusieurs années"
msgid "Choose"
msgstr "Choisir"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
-msgstr "Erreur de chargement du modèle du sélecteur de fichier"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
+msgstr "Erreur de chargement du modèle de sélectionneur de fichiers : {error}"
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "Oui"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "Non"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
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 "Poursuivre"
+
+#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+msgid "(all selected)"
+msgstr "(tous sélectionnés)"
+
+#: 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 "Erreur de chargement du modèle de fichier existant"
+
#: 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."
@@ -252,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:643 js/share.js:655
+#: js/share.js:656 js/share.js:668
msgid "Error"
msgstr "Erreur"
@@ -272,7 +341,7 @@ msgstr "Partagé"
msgid "Share"
msgstr "Partager"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:696
msgid "Error while sharing"
msgstr "Erreur lors de la mise en partage"
@@ -328,67 +397,67 @@ msgstr "Spécifier la date d'expiration"
msgid "Expiration date"
msgstr "Date d'expiration"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "Partager via e-mail :"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "Aucun utilisateur trouvé"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "Le repartage n'est pas autorisé"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr "Partagé dans {item} avec {user}"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "Ne plus partager"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "édition autorisée"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "contrôle des accès"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "créer"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "mettre à jour"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "supprimer"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "partager"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:643
msgid "Password protected"
msgstr "Protégé par un mot de passe"
-#: js/share.js:643
+#: 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:655
+#: js/share.js:668
msgid "Error setting expiration date"
msgstr "Erreur lors de la spécification de la date d'expiration"
-#: js/share.js:670
+#: js/share.js:683
msgid "Sending ..."
msgstr "En cours d'envoi ..."
-#: js/share.js:681
+#: js/share.js:694
msgid "Email sent"
msgstr "Email envoyé"
@@ -403,10 +472,10 @@ msgstr "La mise à jour a échoué. Veuillez signaler ce problème à la <a href
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "La mise à jour a réussi. Vous êtes redirigé maintenant vers ownCloud."
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
-msgstr ""
+msgstr "Réinitialisation de votre mot de passe %s"
#: lostpassword/templates/email.php:2
msgid "Use the following link to reset your password: {link}"
@@ -472,7 +541,7 @@ msgstr "Personnel"
msgid "Users"
msgstr "Utilisateurs"
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "Applications"
@@ -523,7 +592,7 @@ msgstr "Votre version de PHP est vulnérable à l'attaque par caractère NULL (C
#: templates/installation.php:26
#, php-format
msgid "Please update your PHP installation to use %s securely."
-msgstr ""
+msgstr "Veuillez mettre à jour votre installation PHP pour utiliser %s de façon sécurisée."
#: templates/installation.php:32
msgid ""
@@ -548,7 +617,7 @@ msgstr "Votre répertoire data est certainement accessible depuis l'internet car
msgid ""
"For information how to properly configure your server, please see the <a "
"href=\"%s\" target=\"_blank\">documentation</a>."
-msgstr ""
+msgstr "Pour les informations de configuration de votre serveur, veuillez lire la <a href=\"%s\" target=\"_blank\">documentation</a>."
#: templates/installation.php:47
msgid "Create an <strong>admin account</strong>"
@@ -601,14 +670,10 @@ msgstr "Terminer l'installation"
msgid "%s is available. Get more information on how to update."
msgstr "%s est disponible. Obtenez plus d'informations sur la façon de mettre à jour."
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "Se déconnecter"
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "Connexion automatique rejetée !"
@@ -623,19 +688,19 @@ msgstr "Si vous n'avez pas changé votre mot de passe récemment, votre compte r
msgid "Please change your password to secure your account again."
msgstr "Veuillez changer votre mot de passe pour sécuriser à nouveau votre compte."
-#: templates/login.php:34
+#: templates/login.php:32
msgid "Lost your password?"
msgstr "Mot de passe perdu ?"
-#: templates/login.php:39
+#: templates/login.php:37
msgid "remember"
msgstr "se souvenir de moi"
-#: templates/login.php:41
+#: templates/login.php:39
msgid "Log in"
msgstr "Connexion"
-#: templates/login.php:47
+#: templates/login.php:45
msgid "Alternative Logins"
msgstr "Logins alternatifs"
diff --git a/l10n/fr/files.po b/l10n/fr/files.po
index 79cb84b3af24cc86dfb298f404da9bc0e0506964..72963e3573fd773385e070bf64815be0cf51340e 100644
--- a/l10n/fr/files.po
+++ b/l10n/fr/files.po
@@ -6,13 +6,14 @@
# Adalberto Rodrigues <rodrigues_adalberto@yahoo.fr>, 2013
# Christophe Lherieau <skimpax@gmail.com>, 2013
# MathieuP <mathieu.payrol@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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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: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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -49,13 +50,13 @@ msgstr "Aucune erreur, le fichier a été envoyé avec succès."
#: ajax/upload.php:67
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
-msgstr "Le fichier envoyé dépasse la valeur upload_max_filesize située dans le fichier php.ini:"
+msgstr "Le fichier envoyé dépasse l'instruction upload_max_filesize située dans le fichier php.ini:"
#: ajax/upload.php:69
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
-msgstr "Le fichier envoyé dépasse la directive MAX_FILE_SIZE qui est spécifiée dans le formulaire HTML."
+msgstr "Le fichier envoyé dépasse l'instruction MAX_FILE_SIZE qui est spécifiée dans le formulaire HTML."
#: ajax/upload.php:70
msgid "The uploaded file was only partially uploaded"
@@ -77,157 +78,173 @@ msgstr "Erreur d'écriture sur le disque"
msgid "Not enough storage available"
msgstr "Plus assez d'espace de stockage disponible"
-#: ajax/upload.php:123
+#: 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: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:167
+#: 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:241
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr "L'URL ne peut-être vide"
-#: 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 "Nom de dossier invalide. L'utilisation du mot 'Shared' est réservée à Owncloud"
-#: js/file-upload.js:277 js/file-upload.js:293 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 "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:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "En attente"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{new_name} existe déjà"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "remplacer"
-#: js/filelist.js:303
+#: js/filelist.js:416
msgid "suggest name"
msgstr "Suggérer un nom"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "annuler"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr "{new_name} a été remplacé par {old_name}"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "undo"
msgstr "annuler"
-#: js/filelist.js:453
+#: 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: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:541
+msgid "{dirs} and {files}"
+msgstr "{dir} et {files}"
+
+#: js/filelist.js:731 js/filelist.js:769
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Téléversement de %n fichier"
+msgstr[1] "Téléversement de %n fichiers"
-#: js/filelist.js:518
-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 ""
+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:562 templates/index.php:67
+#: 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:563 templates/index.php:78
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "Taille"
-#: js/files.js:564 templates/index.php:80
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr "Modifié"
-#: js/files.js:580
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/files.js:586
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-
#: lib/app.php:73
#, php-format
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"
@@ -263,84 +280,68 @@ 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:73
+#: templates/index.php:67
msgid "Download"
msgstr "Télécharger"
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr "Ne plus partager"
-#: templates/index.php:91 templates/index.php:92
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "Supprimer"
-#: templates/index.php:105
+#: templates/index.php:100
msgid "Upload too large"
msgstr "Téléversement trop volumineux"
-#: 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 "Les fichiers que vous essayez d'envoyer dépassent la taille maximale permise par ce serveur."
-#: templates/index.php:112
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr "Les fichiers sont en cours d'analyse, veuillez patienter."
-#: templates/index.php:115
+#: templates/index.php:110
msgid "Current scanning"
msgstr "Analyse en cours"
-#: templates/part.list.php:74
-msgid "directory"
-msgstr "dossier"
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr "dossiers"
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr "fichier"
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr "fichiers"
-
#: templates/upgrade.php:2
msgid "Upgrading filesystem cache..."
msgstr "Mise à niveau du cache du système de fichier"
diff --git a/l10n/fr/files_encryption.po b/l10n/fr/files_encryption.po
index 174e4d3f3a3835a8cff1d75e7a1d1a35f31fd1da..6616ed62275b217e12987118a2fab04a56f163f8 100644
--- a/l10n/fr/files_encryption.po
+++ b/l10n/fr/files_encryption.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-08-21 08:10-0400\n"
-"PO-Revision-Date: 2013-08-19 19:20+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-03 07:42-0400\n"
+"PO-Revision-Date: 2013-09-03 10:00+0000\n"
+"Last-Translator: Christophe Lherieau <skimpax@gmail.com>\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"
@@ -65,20 +65,20 @@ msgid ""
"files."
msgstr "Votre clé de sécurité privée n'est pas valide! Il est probable que votre mot de passe ait été changé sans passer par le système ownCloud (par éxemple: le serveur de votre entreprise). Ain d'avoir à nouveau accès à vos fichiers cryptés, vous pouvez mettre à jour votre clé de sécurité privée dans les paramètres personnels de votre compte."
-#: hooks/hooks.php:41
+#: hooks/hooks.php:51
msgid "Missing requirements."
msgstr "Système minimum requis non respecté."
-#: hooks/hooks.php:42
+#: hooks/hooks.php:52
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 ""
+msgstr "Veuillez vous assurer qu'une version de PHP 5.3.3 ou supérieure est installée et qu'OpenSSL et son extension PHP sont activés et configurés correctement. En attendant, l'application de chiffrement été désactivée."
-#: hooks/hooks.php:249
+#: hooks/hooks.php:250
msgid "Following users are not set up for encryption:"
-msgstr ""
+msgstr "Les utilisateurs suivants ne sont pas configurés pour le chiffrement :"
#: js/settings-admin.js:11
msgid "Saving..."
diff --git a/l10n/fr/files_sharing.po b/l10n/fr/files_sharing.po
index c6eae4ea599c179fd4d986e8a1bd901ad8dd5a27..c9b74a2e271fe41a5a71bb322d8e1b7b4871c272 100644
--- a/l10n/fr/files_sharing.po
+++ b/l10n/fr/files_sharing.po
@@ -4,13 +4,14 @@
#
# Translators:
# square <benben390-390@yahoo.fr>, 2013
+# Christophe Lherieau <skimpax@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:01+0000\n"
+"Last-Translator: Christophe Lherieau <skimpax@gmail.com>\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"
@@ -32,27 +33,27 @@ msgstr "Envoyer"
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
-msgstr ""
+msgstr "Désolé, mais le lien semble ne plus fonctionner."
#: templates/part.404.php:4
msgid "Reasons might be:"
-msgstr ""
+msgstr "Les raisons peuvent être :"
#: templates/part.404.php:6
msgid "the item was removed"
-msgstr ""
+msgstr "l'item a été supprimé"
#: templates/part.404.php:7
msgid "the link expired"
-msgstr ""
+msgstr "le lien a expiré"
#: templates/part.404.php:8
msgid "sharing is disabled"
-msgstr ""
+msgstr "le partage est désactivé"
#: templates/part.404.php:10
msgid "For more info, please ask the person who sent this link."
-msgstr ""
+msgstr "Pour plus d'informations, veuillez contacter la personne qui a envoyé ce lien."
#: templates/public.php:15
#, php-format
@@ -64,7 +65,7 @@ msgstr "%s a partagé le répertoire %s avec vous"
msgid "%s shared the file %s with you"
msgstr "%s a partagé le fichier %s avec vous"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "Télécharger"
@@ -76,6 +77,6 @@ msgstr "Envoyer"
msgid "Cancel upload"
msgstr "Annuler l'envoi"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "Pas d'aperçu disponible pour"
diff --git a/l10n/fr/files_trashbin.po b/l10n/fr/files_trashbin.po
index 464c518b8a506ee4312ee18675d0f142b3d14b44..52238114518a7d377641da8faea59cafbf63aa8d 100644
--- a/l10n/fr/files_trashbin.po
+++ b/l10n/fr/files_trashbin.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Christophe Lherieau <skimpax@gmail.com>, 2013
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"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-03 07:43-0400\n"
+"PO-Revision-Date: 2013-09-03 09:30+0000\n"
+"Last-Translator: Christophe Lherieau <skimpax@gmail.com>\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"
@@ -27,45 +28,45 @@ msgstr "Impossible d'effacer %s de façon permanente"
msgid "Couldn't restore %s"
msgstr "Impossible de restaurer %s"
-#: js/trash.js:7 js/trash.js:100
+#: js/trash.js:7 js/trash.js:102
msgid "perform restore operation"
msgstr "effectuer l'opération de restauration"
-#: 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 "Erreur"
-#: js/trash.js:36
+#: js/trash.js:37
msgid "delete file permanently"
msgstr "effacer définitivement le fichier"
-#: js/trash.js:127
+#: js/trash.js:129
msgid "Delete permanently"
msgstr "Supprimer de façon définitive"
-#: js/trash.js:182 templates/index.php:17
+#: js/trash.js:184 templates/index.php:17
msgid "Name"
msgstr "Nom"
-#: js/trash.js:183 templates/index.php:27
+#: js/trash.js:185 templates/index.php:27
msgid "Deleted"
msgstr "Effacé"
-#: js/trash.js:191
+#: js/trash.js:193
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
-msgstr[1] ""
+msgstr[1] "%n dossiers"
-#: js/trash.js:197
+#: js/trash.js:199
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
-msgstr[1] ""
+msgstr[1] "%n fichiers"
-#: lib/trash.php:819 lib/trash.php:821
+#: lib/trash.php:814 lib/trash.php:816
msgid "restored"
-msgstr ""
+msgstr "restauré"
#: templates/index.php:9
msgid "Nothing in here. Your trash bin is empty!"
diff --git a/l10n/fr/files_versions.po b/l10n/fr/files_versions.po
index 79799c762b91f912fa86c48cf9700a9040e8e91f..d5ea6a33082dc05478859ed5a3bbfee8e8067d2c 100644
--- a/l10n/fr/files_versions.po
+++ b/l10n/fr/files_versions.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Christophe Lherieau <skimpax@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-28 01:56-0400\n"
-"PO-Revision-Date: 2013-07-27 06:10+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-03 07:43-0400\n"
+"PO-Revision-Date: 2013-09-03 11:10+0000\n"
+"Last-Translator: Christophe Lherieau <skimpax@gmail.com>\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"
@@ -28,16 +29,16 @@ msgstr "Versions"
#: js/versions.js:53
msgid "Failed to revert {file} to revision {timestamp}."
-msgstr ""
+msgstr "Échec du retour du fichier {file} à la révision {timestamp}."
#: js/versions.js:79
msgid "More versions..."
-msgstr ""
+msgstr "Plus de versions..."
#: js/versions.js:116
msgid "No other versions available"
-msgstr ""
+msgstr "Aucune autre version disponible"
-#: js/versions.js:149
+#: js/versions.js:145
msgid "Restore"
msgstr "Restaurer"
diff --git a/l10n/fr/lib.po b/l10n/fr/lib.po
index 5bd611ff2680e33eda73794fa29872a409bd14c2..792ec31010552bf3dc7a96dd04df132e5cb4cee3 100644
--- a/l10n/fr/lib.po
+++ b/l10n/fr/lib.po
@@ -3,14 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# 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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+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"
@@ -23,11 +25,11 @@ msgstr ""
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
-msgstr ""
+msgstr "L'application \"%s\" ne peut être installée car elle n'est pas compatible avec cette version de ownCloud."
#: app.php:250
msgid "No app name specified"
-msgstr ""
+msgstr "Aucun nom d'application spécifié"
#: app.php:361
msgid "Help"
@@ -49,10 +51,22 @@ msgstr "Utilisateurs"
msgid "Admin"
msgstr "Administration"
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
-msgstr ""
+msgstr "Echec de la mise à niveau \"%s\"."
+
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr "Les images de profil personnalisées ne fonctionnent pas encore avec le système de chiffrement."
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr "Type de fichier inconnu"
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr "Image invalide"
#: defaults.php:35
msgid "web services under your control"
@@ -61,7 +75,7 @@ msgstr "services web sous votre contrôle"
#: files.php:66 files.php:98
#, php-format
msgid "cannot open \"%s\""
-msgstr ""
+msgstr "impossible d'ouvrir \"%s\""
#: files.php:226
msgid "ZIP download is turned off."
@@ -83,63 +97,63 @@ msgstr "Les fichiers sélectionnés sont trop volumineux pour être compressés.
msgid ""
"Download the files in smaller chunks, seperately or kindly ask your "
"administrator."
-msgstr ""
+msgstr "Télécharger les fichiers en parties plus petites, séparément ou demander avec bienveillance à votre administrateur."
#: installer.php:63
msgid "No source specified when installing app"
-msgstr ""
+msgstr "Aucune source spécifiée pour installer l'application"
#: installer.php:70
msgid "No href specified when installing app from http"
-msgstr ""
+msgstr "Aucun href spécifié pour installer l'application par http"
#: installer.php:75
msgid "No path specified when installing app from local file"
-msgstr ""
+msgstr "Aucun chemin spécifié pour installer l'application depuis un fichier local"
#: installer.php:89
#, php-format
msgid "Archives of type %s are not supported"
-msgstr ""
+msgstr "Les archives de type %s ne sont pas supportées"
#: installer.php:103
msgid "Failed to open archive when installing app"
-msgstr ""
+msgstr "Échec de l'ouverture de l'archive lors de l'installation de l'application"
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
-msgstr ""
+msgstr "L'application ne fournit pas de fichier info.xml"
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
-msgstr ""
+msgstr "L'application ne peut être installée car elle contient du code non-autorisé"
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
-msgstr ""
+msgstr "L'application ne peut être installée car elle n'est pas compatible avec cette version de ownCloud"
-#: installer.php:144
+#: 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 "L'application ne peut être installée car elle contient la balise <shipped>true</shipped> qui n'est pas autorisée pour les applications non-diffusées"
-#: installer.php:150
+#: 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 "L'application ne peut être installée car la version de info.xml/version n'est identique à celle indiquée sur l'app store"
-#: installer.php:160
+#: installer.php:162
msgid "App directory already exists"
-msgstr ""
+msgstr "Le dossier de l'application existe déjà"
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
-msgstr ""
+msgstr "Impossible de créer le dossier de l'application. Corrigez les droits d'accès. %s"
#: json.php:28
msgid "Application is not enabled"
@@ -153,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"
@@ -265,57 +279,57 @@ msgstr "Votre serveur web, n'est pas correctement configuré pour permettre la s
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Veuillez vous référer au <a href='%s'>guide d'installation</a>."
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "il y a quelques secondes"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-msgstr[1] ""
+msgstr[1] "il y a %n minutes"
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-msgstr[1] ""
+msgstr[1] "Il y a %n heures"
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "aujourd'hui"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "hier"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
-msgstr[1] ""
+msgstr[1] "il y a %n jours"
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "le mois dernier"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-msgstr[1] ""
+msgstr[1] "Il y a %n mois"
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "l'année dernière"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "il y a plusieurs années"
#: template.php:297
msgid "Caused by:"
-msgstr ""
+msgstr "Causé par :"
#: vcategories.php:188 vcategories.php:249
#, php-format
diff --git a/l10n/fr/settings.po b/l10n/fr/settings.po
index bd79bb2891d7edae6f57511fad3fc9478206ce94..21918cf68dabf59b248822b88aef61e0dd826802 100644
--- a/l10n/fr/settings.po
+++ b/l10n/fr/settings.po
@@ -6,14 +6,16 @@
# 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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-27 00:01-0400\n"
+"PO-Revision-Date: 2013-09-26 15:00+0000\n"
+"Last-Translator: Christophe Lherieau <skimpax@gmail.com>\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"
@@ -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,55 +90,88 @@ msgstr "Impossible de supprimer l'utilisateur du groupe %s"
msgid "Couldn't update app."
msgstr "Impossible de mettre à jour l'application"
-#: js/apps.js:35
+#: 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 "Veuillez fournir un mot de passe administrateur de récupération de données, sinon toutes les données de l'utilisateur seront perdues"
+
+#: changepassword/controller.php:79
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr "Mot de passe administrateur de récupération de données invalide. Veuillez vérifier le mot de passe et essayer à nouveau."
+
+#: changepassword/controller.php:87
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr "L'infrastructure d'arrière-plan ne supporte pas la modification de mot de passe, mais la clef de chiffrement des utilisateurs a été mise à jour avec succès."
+
+#: 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}"
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:110
msgid "Disable"
msgstr "Désactiver"
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
msgid "Enable"
msgstr "Activer"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr "Veuillez patienter…"
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:101
msgid "Error while disabling app"
-msgstr ""
+msgstr "Erreur lors de la désactivation de l'application"
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:100 js/apps.js:114 js/apps.js:115
msgid "Error while enabling app"
-msgstr ""
+msgstr "Erreur lors de l'activation de l'application"
-#: js/apps.js:115
+#: js/apps.js:125
msgid "Updating...."
msgstr "Mise à jour..."
-#: js/apps.js:118
+#: js/apps.js:128
msgid "Error while updating app"
msgstr "Erreur lors de la mise à jour de l'application"
-#: js/apps.js:118
+#: js/apps.js:128
msgid "Error"
msgstr "Erreur"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:129 templates/apps.php:43
msgid "Update"
msgstr "Mettre à jour"
-#: js/apps.js:122
+#: js/apps.js:132
msgid "Updated"
msgstr "Mise à jour effectuée avec succès"
-#: js/personal.js:150
+#: js/personal.js:220
+msgid "Select a profile picture"
+msgstr "Selectionner une photo de profil "
+
+#: js/personal.js:265
msgid "Decrypting files... Please wait, this can take some time."
-msgstr ""
+msgstr "Déchiffrement en cours... Cela peut prendre un certain temps."
-#: js/personal.js:172
+#: js/personal.js:287
msgid "Saving..."
msgstr "Enregistrement..."
@@ -152,16 +187,16 @@ msgstr "annuler"
msgid "Unable to remove user"
msgstr "Impossible de retirer l'utilisateur"
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "Groupes"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "Groupe Admin"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "Supprimer"
@@ -181,7 +216,7 @@ msgstr "Erreur lors de la création de l'utilisateur"
msgid "A valid password must be provided"
msgstr "Un mot de passe valide doit être saisi"
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "Français"
@@ -196,7 +231,7 @@ msgid ""
"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 ""
+msgstr "Votre dossier de données et vos fichiers sont probablement accessibles depuis internet. Le fichier .htaccess ne fonctionne pas. Nous vous recommandons vivement de configurer votre serveur web de façon à ce que ce dossier de données ne soit plus accessible, ou bien de le déplacer à l'extérieur de la racine du serveur web."
#: templates/admin.php:29
msgid "Setup Warning"
@@ -211,7 +246,7 @@ msgstr "Votre serveur web, n'est pas correctement configuré pour permettre la s
#: templates/admin.php:33
#, php-format
msgid "Please double check the <a href=\"%s\">installation guides</a>."
-msgstr ""
+msgstr "Veuillez consulter à nouveau les <a href=\"%s\">guides d'installation</a>."
#: templates/admin.php:44
msgid "Module 'fileinfo' missing"
@@ -233,7 +268,7 @@ 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 ""
+msgstr "Le localisation du système n'a pu être configurée à %s. Cela signifie qu'il pourrait y avoir des problèmes avec certains caractères dans les noms de fichiers. Il est fortement recommandé d'installer les paquets requis pour le support de %s."
#: templates/admin.php:75
msgid "Internet connection not working"
@@ -246,7 +281,7 @@ msgid ""
"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 ""
+msgstr "Ce serveur ne peut se connecter à internet. Cela signifie que certaines fonctionnalités, telles que le montage de supports de stockage distants, les notifications de mises à jour ou l'installation d'applications tierces ne fonctionneront pas. L'accès aux fichiers à distance, ainsi que les notifications par mails ne seront pas fonctionnels également. Il est recommandé d'activer la connexion internet pour ce serveur si vous souhaitez disposer de l'ensemble des fonctionnalités offertes."
#: templates/admin.php:92
msgid "Cron"
@@ -260,11 +295,11 @@ msgstr "Exécute une tâche à chaque chargement de page"
msgid ""
"cron.php is registered at a webcron service to call cron.php once a minute "
"over http."
-msgstr ""
+msgstr "cron.php est enregistré en tant que service webcron pour appeler cron.php une fois par minute via http."
#: templates/admin.php:115
msgid "Use systems cron service to call the cron.php file once a minute."
-msgstr ""
+msgstr "Utilise le service cron du système pour appeler cron.php une fois par minute."
#: templates/admin.php:120
msgid "Sharing"
@@ -288,12 +323,12 @@ msgstr "Autoriser les utilisateurs à partager des éléments publiquement à l'
#: templates/admin.php:143
msgid "Allow public uploads"
-msgstr ""
+msgstr "Autoriser les téléversements publics"
#: templates/admin.php:144
msgid ""
"Allow users to enable others to upload into their publicly shared folders"
-msgstr ""
+msgstr "Permet d'autoriser les autres utilisateurs à téléverser dans le dossier partagé public de l'utilisateur"
#: templates/admin.php:152
msgid "Allow resharing"
@@ -322,14 +357,14 @@ msgstr "Forcer HTTPS"
#: templates/admin.php:185
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
-msgstr ""
+msgstr "Forcer les clients à se connecter à %s via une connexion chiffrée."
#: templates/admin.php:191
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
-msgstr ""
+msgstr "Veuillez vous connecter à cette instance %s via HTTPS pour activer ou désactiver SSL."
#: templates/admin.php:203
msgid "Log"
@@ -347,11 +382,11 @@ msgstr "Plus"
msgid "Less"
msgstr "Moins"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "Version"
-#: templates/admin.php:246 templates/personal.php:143
+#: 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 "
@@ -418,7 +453,7 @@ msgstr "Revoir le premier lancement de l'installeur"
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Vous avez utilisé <strong>%s</strong> des <strong>%s<strong> disponibles"
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "Mot de passe"
@@ -442,7 +477,7 @@ msgstr "Nouveau mot de passe"
msgid "Change password"
msgstr "Changer de mot de passe"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr "Nom affiché"
@@ -458,40 +493,68 @@ msgstr "Votre adresse e-mail"
msgid "Fill in an email address to enable password recovery"
msgstr "Entrez votre adresse e-mail pour permettre la réinitialisation du mot de passe"
-#: templates/personal.php:85 templates/personal.php:86
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr "Photo de profil"
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr "Télécharger nouveau"
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr "Sélectionner un nouveau depuis les documents"
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr "Supprimer l'image"
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr "Soit png ou jpg. idéalement carée mais vous pourrez la recadrer ."
+
+#: templates/personal.php:97
+msgid "Abort"
+msgstr "Abandonner"
+
+#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr "Choisir en temps que photo de profil "
+
+#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
msgstr "Langue"
-#: templates/personal.php:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "Aidez à traduire"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: 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 "Utilisez cette adresse pour <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">accéder à vos fichiers via WebDAV</a>"
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "Chiffrement"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
-msgstr ""
+msgstr "L'application de chiffrement n'est plus activée, déchiffrez tous vos fichiers"
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
-msgstr ""
+msgstr "Mot de passe de connexion"
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
-msgstr ""
+msgstr "Déchiffrer tous les fichiers"
#: templates/users.php:21
msgid "Login Name"
@@ -515,30 +578,30 @@ msgstr "Entrer le mot de passe de récupération dans le but de récupérer les
msgid "Default Storage"
msgstr "Support de stockage par défaut"
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr "Illimité"
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "Autre"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "Nom d'utilisateur"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr "Support de stockage"
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr "Changer le nom affiché"
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr "Changer le mot de passe"
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr "Défaut"
diff --git a/l10n/fr/user_ldap.po b/l10n/fr/user_ldap.po
index 9729b2532b7027fc7639028a1cac18bc31606b66..5d5731c15756684cc9e41ce3d6f20b06628ea718 100644
--- a/l10n/fr/user_ldap.po
+++ b/l10n/fr/user_ldap.po
@@ -3,14 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Christophe Lherieau <skimpax@gmail.com>, 2013
# plachance <patlachance@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-05 11:51+0000\n"
+"Last-Translator: Christophe Lherieau <skimpax@gmail.com>\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"
@@ -91,7 +92,7 @@ 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 ""
+msgstr "<b>Avertissement :</b> Les applications user_ldap et user_webdavauth sont incompatibles. Des dysfonctionnements peuvent survenir. Contactez votre administrateur système pour qu'il désactive l'une d'elles."
#: templates/settings.php:12
msgid ""
@@ -156,7 +157,7 @@ msgstr "Modèle d'authentification utilisateurs"
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action. Example: \"uid=%%uid\""
-msgstr ""
+msgstr "Définit le filtre à appliquer lors d'une tentative de connexion. %%uid remplace le nom d'utilisateur lors de la connexion. Exemple : \"uid=%%uid\""
#: templates/settings.php:55
msgid "User List Filter"
@@ -166,7 +167,7 @@ msgstr "Filtre d'utilisateurs"
msgid ""
"Defines the filter to apply, when retrieving users (no placeholders). "
"Example: \"objectClass=person\""
-msgstr ""
+msgstr "Définit le filtre à appliquer lors de la récupération des utilisateurs. Exemple : \"objectClass=person\""
#: templates/settings.php:59
msgid "Group Filter"
@@ -176,7 +177,7 @@ msgstr "Filtre de groupes"
msgid ""
"Defines the filter to apply, when retrieving groups (no placeholders). "
"Example: \"objectClass=posixGroup\""
-msgstr ""
+msgstr "Définit le filtre à appliquer lors de la récupération des groupes. Exemple : \"objectClass=posixGroup\""
#: templates/settings.php:66
msgid "Connection Settings"
@@ -214,7 +215,7 @@ msgstr "Désactiver le serveur principal"
#: templates/settings.php:72
msgid "Only connect to the replica server."
-msgstr ""
+msgstr "Se connecter uniquement au serveur de replica."
#: templates/settings.php:73
msgid "Use TLS"
@@ -237,7 +238,7 @@ msgstr "Désactiver la validation du certificat 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 "Non recommandé, à utiliser à des fins de tests uniquement. Si la connexion ne fonctionne qu'avec cette option, importez le certificat SSL du serveur LDAP dans le serveur %s."
#: templates/settings.php:76
msgid "Cache Time-To-Live"
@@ -257,7 +258,7 @@ msgstr "Champ \"nom d'affichage\" de l'utilisateur"
#: templates/settings.php:80
msgid "The LDAP attribute to use to generate the user's display name."
-msgstr ""
+msgstr "L'attribut LDAP utilisé pour générer le nom d'utilisateur affiché."
#: templates/settings.php:81
msgid "Base User Tree"
@@ -281,7 +282,7 @@ msgstr "Champ \"nom d'affichage\" du groupe"
#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the groups's display name."
-msgstr ""
+msgstr "L'attribut LDAP utilisé pour générer le nom de groupe affiché."
#: templates/settings.php:84
msgid "Base Group Tree"
@@ -347,7 +348,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 "Par défaut le nom d'utilisateur interne sera créé à partir de l'attribut UUID. Ceci permet d'assurer que le nom d'utilisateur est unique et que les caractères ne nécessitent pas de conversion. Le nom d'utilisateur interne doit contenir uniquement les caractères suivants : [ a-zA-Z0-9_.@- ]. Les autres caractères sont remplacés par leur correspondance ASCII ou simplement omis. En cas de collision, un nombre est incrémenté/décrémenté. Le nom d'utilisateur interne est utilisé pour identifier l'utilisateur au sein du système. C'est aussi le nom par défaut du répertoire utilisateur dans ownCloud. C'est aussi le port d'URLs distants, par exemple pour tous les services *DAV. Le comportement par défaut peut être modifié à l'aide de ce paramètre. Pour obtenir un comportement similaire aux versions précédentes à ownCloud 5, saisir le nom d'utilisateur à afficher dans le champ suivant. Laissez à blanc pour le comportement par défaut. Les modifications prendront effet seulement pour les nouveaux (ajoutés) utilisateurs LDAP."
#: templates/settings.php:100
msgid "Internal Username Attribute:"
@@ -366,7 +367,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 "Par défaut, l'attribut UUID est automatiquement détecté. Cet attribut est utilisé pour identifier les utilisateurs et groupes de façon fiable. Un nom d'utilisateur interne basé sur l'UUID sera automatiquement créé, sauf s'il est spécifié autrement ci-dessus. Vous pouvez modifier ce comportement et définir l'attribut de votre choix. Vous devez alors vous assurer que l'attribut de votre choix peut être récupéré pour les utilisateurs ainsi que pour les groupes et qu'il soit unique. Laisser à blanc pour le comportement par défaut. Les modifications seront effectives uniquement pour les nouveaux (ajoutés) utilisateurs et groupes LDAP."
#: templates/settings.php:103
msgid "UUID Attribute:"
@@ -388,7 +389,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 "Les noms d'utilisateurs sont utilisés pour le stockage et l'assignation de (meta) données. Pour identifier et reconnaitre précisément les utilisateurs, chaque utilisateur LDAP aura un nom interne spécifique. Cela requiert l'association d'un nom d'utilisateur ownCloud à un nom d'utilisateur LDAP. Le nom d'utilisateur créé est associé à l'attribut UUID de l'utilisateur LDAP. Par ailleurs, le DN est mémorisé en cache pour limiter les interactions LDAP mais il n'est pas utilisé pour l'identification. Si le DN est modifié, ces modifications seront retrouvées. Seul le nom interne à ownCloud est utilisé au sein du produit. Supprimer les associations créera des orphelins et l'action affectera toutes les configurations LDAP. NE JAMAIS SUPPRIMER LES ASSOCIATIONS EN ENVIRONNEMENT DE PRODUCTION, mais uniquement sur des environnements de tests et d'expérimentation."
#: templates/settings.php:106
msgid "Clear Username-LDAP User Mapping"
diff --git a/l10n/fr/user_webdavauth.po b/l10n/fr/user_webdavauth.po
index c4a85dce02d633c714b9b663aba6abcf42838438..ef68307bdd258d6def05cee60eb131750d0a4cdf 100644
--- a/l10n/fr/user_webdavauth.po
+++ b/l10n/fr/user_webdavauth.po
@@ -5,17 +5,18 @@
# Translators:
# Adalberto Rodrigues <rodrigues_adalberto@yahoo.fr>, 2013
# Christophe Lherieau <skimpax@gmail.com>, 2013
-# mishka <mishka.lazzlo@gmail.com>, 2013
+# mishka, 2013
# ouafnico <nicolas@shivaserv.fr>, 2012
+# ogre_sympathique <ogre.sympathique@speed.1s.fr>, 2013
# Robert Di Rosa <>, 2012
# Romain DEP. <rom1dep@gmail.com>, 2012-2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-27 01:56-0400\n"
-"PO-Revision-Date: 2013-07-27 05:57+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-06 13:50+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"
@@ -29,11 +30,11 @@ msgstr "Authentification WebDAV"
#: templates/settings.php:4
msgid "Address: "
-msgstr ""
+msgstr "Adresse :"
#: 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 ""
+msgstr "Les informations de connexion de l'utilisateur seront envoyées à cette adresse. Ce module analyse le code de la réponse HTTP et considère les codes 401 et 403 comme une authentification invalide et tout autre valeur comme une authentification valide."
diff --git a/l10n/gl/core.po b/l10n/gl/core.po
index 76e182a5b18efd160b52dc3bdcbe9d4931ac64a5..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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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"
@@ -23,30 +23,34 @@ msgstr ""
msgid "%s shared »%s« with you"
msgstr "%s compartiu «%s» con vostede"
+#: ajax/share.php:227
+msgid "group"
+msgstr "grupo"
+
#: ajax/update.php:11
msgid "Turned on maintenance mode"
-msgstr ""
+msgstr "Modo de mantemento activado"
#: ajax/update.php:14
msgid "Turned off maintenance mode"
-msgstr ""
+msgstr "Modo de mantemento desactivado"
#: ajax/update.php:17
msgid "Updated database"
-msgstr ""
+msgstr "Base de datos actualizada"
#: ajax/update.php:20
msgid "Updating filecache, this may take really long..."
-msgstr ""
+msgstr "Actualizando o ficheiro da caché, isto pode levar bastante tempo..."
#: ajax/update.php:23
msgid "Updated filecache"
-msgstr ""
+msgstr "Ficheiro da caché actualizado"
#: ajax/update.php:26
#, php-format
msgid "... %d%% done ..."
-msgstr ""
+msgstr "... %d%% feito ..."
#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
msgid "Category type not provided."
@@ -87,6 +91,26 @@ msgstr "Non se seleccionaron categorías para eliminación."
msgid "Error removing %s from favorites."
msgstr "Produciuse un erro ao eliminar %s dos favoritos."
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr "Non forneceu ningunha imaxe ou ficheiro"
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr "Tipo de ficheiro descoñecido"
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr "Imaxe incorrecta"
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr "Non hai unha imaxe temporal de perfil dispoñíbel, volva tentalo"
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr "Non indicou como recortar"
+
#: js/config.php:32
msgid "Sunday"
msgstr "Domingo"
@@ -163,59 +187,59 @@ msgstr "novembro"
msgid "December"
msgstr "decembro"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "Axustes"
-#: js/js.js:812
+#: js/js.js:866
msgid "seconds ago"
msgstr "segundos atrás"
-#: js/js.js:813
+#: 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:814
+#: 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:815
+#: js/js.js:869
msgid "today"
msgstr "hoxe"
-#: js/js.js:816
+#: js/js.js:870
msgid "yesterday"
msgstr "onte"
-#: js/js.js:817
+#: 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:818
+#: js/js.js:872
msgid "last month"
msgstr "último mes"
-#: js/js.js:819
+#: 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:820
+#: js/js.js:874
msgid "months ago"
msgstr "meses atrás"
-#: js/js.js:821
+#: js/js.js:875
msgid "last year"
msgstr "último ano"
-#: js/js.js:822
+#: js/js.js:876
msgid "years ago"
msgstr "anos atrás"
@@ -223,22 +247,66 @@ msgstr "anos atrás"
msgid "Choose"
msgstr "Escoller"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
-msgstr "Produciuse un erro ao cargar o modelo do selector de ficheiros"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
+msgstr "Produciuse un erro ao cargar o modelo do selector: {error}"
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "Si"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "Non"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr "Aceptar"
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+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
msgid "The object type is not specified."
@@ -248,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:643 js/share.js:655
+#: js/share.js:656 js/share.js:668
msgid "Error"
msgstr "Erro"
@@ -268,7 +336,7 @@ msgstr "Compartir"
msgid "Share"
msgstr "Compartir"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:696
msgid "Error while sharing"
msgstr "Produciuse un erro ao compartir"
@@ -324,67 +392,67 @@ msgstr "Definir a data de caducidade"
msgid "Expiration date"
msgstr "Data de caducidade"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "Compartir por correo:"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "Non se atopou xente"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "Non se permite volver a compartir"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr "Compartido en {item} con {user}"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "Deixar de compartir"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "pode editar"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "control de acceso"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "crear"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "actualizar"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "eliminar"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "compartir"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:643
msgid "Password protected"
msgstr "Protexido con contrasinal"
-#: js/share.js:643
+#: js/share.js:656
msgid "Error unsetting expiration date"
msgstr "Produciuse un erro ao retirar a data de caducidade"
-#: js/share.js:655
+#: js/share.js:668
msgid "Error setting expiration date"
msgstr "Produciuse un erro ao definir a data de caducidade"
-#: js/share.js:670
+#: js/share.js:683
msgid "Sending ..."
msgstr "Enviando..."
-#: js/share.js:681
+#: js/share.js:694
msgid "Email sent"
msgstr "Correo enviado"
@@ -399,7 +467,7 @@ msgstr "A actualización non foi satisfactoria, informe deste problema á <a hr
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "A actualización realizouse correctamente. Redirixíndoo agora á ownCloud."
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr "Restabelecer o contrasinal %s"
@@ -468,7 +536,7 @@ msgstr "Persoal"
msgid "Users"
msgstr "Usuarios"
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "Aplicativos"
@@ -597,14 +665,10 @@ msgstr "Rematar a configuración"
msgid "%s is available. Get more information on how to update."
msgstr "%s está dispoñíbel. Obteña máis información sobre como actualizar."
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "Desconectar"
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr "Máis aplicativos"
-
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "Rexeitouse a entrada automática"
@@ -619,19 +683,19 @@ msgstr "Se non fixo recentemente cambios de contrasinal é posíbel que a súa c
msgid "Please change your password to secure your account again."
msgstr "Cambie de novo o seu contrasinal para asegurar a súa conta."
-#: templates/login.php:34
+#: templates/login.php:32
msgid "Lost your password?"
msgstr "Perdeu o contrasinal?"
-#: templates/login.php:39
+#: templates/login.php:37
msgid "remember"
msgstr "lembrar"
-#: templates/login.php:41
+#: templates/login.php:39
msgid "Log in"
msgstr "Conectar"
-#: templates/login.php:47
+#: templates/login.php:45
msgid "Alternative Logins"
msgstr "Accesos alternativos"
diff --git a/l10n/gl/files.po b/l10n/gl/files.po
index ddf953cadeba55035be6a5e268803609b15eeae3..33e76e84873d4681ee7e72e25428a0a9dc5df899 100644
--- a/l10n/gl/files.po
+++ b/l10n/gl/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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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"
@@ -75,157 +75,173 @@ msgstr "Produciuse un erro ao escribir no disco"
msgid "Not enough storage available"
msgstr "Non hai espazo de almacenamento abondo"
-#: ajax/upload.php:123
+#: 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: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:167
+#: 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:241
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr "O URL non pode quedar baleiro."
-#: 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 "Nome de cartafol incorrecto. O uso de «Compartido» e «Shared» está reservado para o ownClod"
-#: js/file-upload.js:277 js/file-upload.js:293 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 "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:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "Pendentes"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "Xa existe un {new_name}"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "substituír"
-#: js/filelist.js:303
+#: js/filelist.js:416
msgid "suggest name"
msgstr "suxerir nome"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "cancelar"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr "substituír {new_name} por {old_name}"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "undo"
msgstr "desfacer"
-#: js/filelist.js:453
+#: 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: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:541
+msgid "{dirs} and {files}"
+msgstr "{dirs} e {files}"
+
+#: 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:518
-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:562 templates/index.php:67
+#: 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:563 templates/index.php:78
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "Tamaño"
-#: js/files.js:564 templates/index.php:80
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr "Modificado"
-#: js/files.js:580
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] "%n cartafol"
-msgstr[1] "%n cartafoles"
-
-#: js/files.js:586
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] "%n ficheiro"
-msgstr[1] "%n ficheiros"
-
#: lib/app.php:73
#, php-format
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"
@@ -261,84 +277,68 @@ 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:73
+#: templates/index.php:67
msgid "Download"
msgstr "Descargar"
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr "Deixar de compartir"
-#: templates/index.php:91 templates/index.php:92
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "Eliminar"
-#: templates/index.php:105
+#: templates/index.php:100
msgid "Upload too large"
msgstr "Envío demasiado grande"
-#: 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 "Os ficheiros que tenta enviar exceden do tamaño máximo permitido neste servidor"
-#: templates/index.php:112
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr "Estanse analizando os ficheiros. Agarde."
-#: templates/index.php:115
+#: templates/index.php:110
msgid "Current scanning"
msgstr "Análise actual"
-#: templates/part.list.php:74
-msgid "directory"
-msgstr "directorio"
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr "directorios"
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr "ficheiro"
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr "ficheiros"
-
#: templates/upgrade.php:2
msgid "Upgrading filesystem cache..."
msgstr "Anovando a caché do sistema de ficheiros..."
diff --git a/l10n/gl/files_sharing.po b/l10n/gl/files_sharing.po
index 887502a08beefc4f215bf7b8131b508bd9658f6a..bd0b79c5d8bec456428c4b8a08fc081eecb7983f 100644
--- a/l10n/gl/files_sharing.po
+++ b/l10n/gl/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:01+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"
@@ -64,7 +64,7 @@ msgstr "%s compartiu o cartafol %s con vostede"
msgid "%s shared the file %s with you"
msgstr "%s compartiu o ficheiro %s con vostede"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "Descargar"
@@ -76,6 +76,6 @@ msgstr "Enviar"
msgid "Cancel upload"
msgstr "Cancelar o envío"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "Sen vista previa dispoñíbel para"
diff --git a/l10n/gl/lib.po b/l10n/gl/lib.po
index 08a5c6653919e8d2b90133bee055950e2604eb8c..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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+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"
@@ -23,11 +23,11 @@ msgstr ""
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
-msgstr ""
+msgstr "Non é posíbel instalar o aplicativo «%s» por non seren compatíbel con esta versión do ownCloud."
#: app.php:250
msgid "No app name specified"
-msgstr ""
+msgstr "Non se especificou o nome do aplicativo"
#: app.php:361
msgid "Help"
@@ -49,11 +49,23 @@ msgstr "Usuarios"
msgid "Admin"
msgstr "Administración"
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "Non foi posíbel anovar «%s»."
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr "As imaxes personalizadas de perfil aínda non funcionan co cifrado"
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr "Tipo de ficheiro descoñecido"
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr "Imaxe incorrecta"
+
#: defaults.php:35
msgid "web services under your control"
msgstr "servizos web baixo o seu control"
@@ -87,59 +99,59 @@ msgstr "Descargue os ficheiros en cachos máis pequenos e por separado, ou pída
#: installer.php:63
msgid "No source specified when installing app"
-msgstr ""
+msgstr "Non foi especificada ningunha orixe ao instalar aplicativos"
#: installer.php:70
msgid "No href specified when installing app from http"
-msgstr ""
+msgstr "Non foi especificada ningunha href ao instalar aplicativos"
#: installer.php:75
msgid "No path specified when installing app from local file"
-msgstr ""
+msgstr "Non foi especificada ningunha ruta ao instalar aplicativos desde un ficheiro local"
#: installer.php:89
#, php-format
msgid "Archives of type %s are not supported"
-msgstr ""
+msgstr "Os arquivos do tipo %s non están admitidos"
#: installer.php:103
msgid "Failed to open archive when installing app"
-msgstr ""
+msgstr "Non foi posíbel abrir o arquivo ao instalar aplicativos"
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
-msgstr ""
+msgstr "O aplicativo non fornece un ficheiro info.xml"
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
-msgstr ""
+msgstr "Non é posíbel instalar o aplicativo por mor de conter código non permitido"
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
-msgstr ""
+msgstr "Non é posíbel instalar o aplicativo por non seren compatíbel con esta versión do ownCloud."
-#: installer.php:144
+#: 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 "Non é posíbel instalar o aplicativo por conter a etiqueta\n<shipped>\n\ntrue\n</shipped>\nque non está permitida para os aplicativos non enviados"
-#: installer.php:150
+#: 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 "Non é posíbel instalar o aplicativo xa que a versión en info.xml/version non é a mesma que a versión informada desde a App Store"
-#: installer.php:160
+#: installer.php:162
msgid "App directory already exists"
-msgstr ""
+msgstr "Xa existe o directorio do aplicativo"
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
-msgstr ""
+msgstr "Non é posíbel crear o cartafol de aplicativos. Corrixa os permisos. %s"
#: json.php:28
msgid "Application is not enabled"
@@ -265,51 +277,51 @@ msgstr "O seu servidor web non está aínda configurado adecuadamente para permi
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Volva comprobar as <a href='%s'>guías de instalación</a>"
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "segundos atrás"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "hai %n minuto"
msgstr[1] "hai %n minutos"
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "hai %n hora"
msgstr[1] "hai %n horas"
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "hoxe"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "onte"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] "hai %n día"
msgstr[1] "hai %n días"
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "último mes"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "hai %n mes"
msgstr[1] "hai %n meses"
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "último ano"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "anos atrás"
diff --git a/l10n/gl/settings.po b/l10n/gl/settings.po
index fda92370b3369ed2354565e14adcd21875e40a78..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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+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,55 +85,88 @@ msgstr "Non é posíbel eliminar o usuario do grupo %s"
msgid "Couldn't update app."
msgstr "Non foi posíbel actualizar o aplicativo."
-#: js/apps.js:35
+#: 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}"
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr "Desactivar"
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr "Activar"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr "Agarde..."
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
-msgstr ""
+msgstr "Produciuse un erro ao desactivar o aplicativo"
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
-msgstr ""
+msgstr "Produciuse un erro ao activar o aplicativo"
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr "Actualizando..."
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr "Produciuse un erro mentres actualizaba o aplicativo"
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "Erro"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr "Actualizar"
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr "Actualizado"
-#: js/personal.js:150
+#: js/personal.js:220
+msgid "Select a profile picture"
+msgstr "Seleccione unha imaxe para o perfil"
+
+#: 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:172
+#: js/personal.js:287
msgid "Saving..."
msgstr "Gardando..."
@@ -149,16 +182,16 @@ msgstr "desfacer"
msgid "Unable to remove user"
msgstr "Non é posíbel retirar o usuario"
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "Grupos"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "Grupo Admin"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "Eliminar"
@@ -178,7 +211,7 @@ msgstr "Produciuse un erro ao crear o usuario"
msgid "A valid password must be provided"
msgstr "Debe fornecer un contrasinal"
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "Galego"
@@ -344,11 +377,11 @@ msgstr "Máis"
msgid "Less"
msgstr "Menos"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "Versión"
-#: templates/admin.php:246 templates/personal.php:143
+#: 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 "
@@ -415,7 +448,7 @@ msgstr "Amosar o axudante da primeira execución outra vez"
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Ten en uso <strong>%s</strong> do total dispoñíbel de <strong>%s</strong>"
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "Contrasinal"
@@ -439,7 +472,7 @@ msgstr "Novo contrasinal"
msgid "Change password"
msgstr "Cambiar o contrasinal"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr "Amosar o nome"
@@ -455,38 +488,66 @@ msgstr "O seu enderezo de correo"
msgid "Fill in an email address to enable password recovery"
msgstr "Escriba un enderezo de correo para activar o contrasinal de recuperación"
-#: templates/personal.php:85 templates/personal.php:86
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr "Imaxe do perfil"
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr "Novo envío"
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr "Seleccione unha nova de ficheiros"
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr "Retirar a imaxe"
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr "Calquera png ou jpg. É preferíbel que sexa cadrada, mais poderá recortala."
+
+#: templates/personal.php:97
+msgid "Abort"
+msgstr "Cancelar"
+
+#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr "Escolla unha imaxe para o perfil"
+
+#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
msgstr "Idioma"
-#: templates/personal.php:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "Axude na tradución"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: 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 "Empregue esta ligazón <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">para acceder aos sus ficheiros mediante WebDAV</a>"
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "Cifrado"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr "o aplicativo de cifrado non está activado, descifrar todos os ficheiros"
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr "Contrasinal de acceso"
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr "Descifrar todos os ficheiros"
@@ -512,30 +573,30 @@ msgstr "Introduza o contrasinal de recuperación para recuperar os ficheiros dos
msgid "Default Storage"
msgstr "Almacenamento predeterminado"
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr "Sen límites"
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "Outro"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "Nome de usuario"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr "Almacenamento"
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr "cambiar o nome visíbel"
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr "estabelecer un novo contrasinal"
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr "Predeterminado"
diff --git a/l10n/gl/user_ldap.po b/l10n/gl/user_ldap.po
index 5e1d0d000e339fd4f5cbbce657b9c5615ffad5bb..54fdccd2c352a75999ddeff9c1ded9735f9e42a5 100644
--- a/l10n/gl/user_ldap.po
+++ b/l10n/gl/user_ldap.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-21 08:11-0400\n"
-"PO-Revision-Date: 2013-08-20 11:20+0000\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-05 11:51+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"
diff --git a/l10n/he/core.po b/l10n/he/core.po
index 05f1282b4d183e2486aa556077676069df5b9c34..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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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"
@@ -24,6 +24,10 @@ msgstr ""
msgid "%s shared »%s« with you"
msgstr "%s שיתף/שיתפה איתך את »%s«"
+#: ajax/share.php:227
+msgid "group"
+msgstr "קבוצה"
+
#: ajax/update.php:11
msgid "Turned on maintenance mode"
msgstr ""
@@ -88,6 +92,26 @@ msgstr "לא נבחרו קטגוריות למחיקה"
msgid "Error removing %s from favorites."
msgstr "שגיאה בהסרת %s מהמועדפים."
+#: 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 "יום ראשון"
@@ -164,59 +188,59 @@ msgstr "נובמבר"
msgid "December"
msgstr "דצמבר"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "הגדרות"
-#: js/js.js:812
+#: js/js.js:866
msgid "seconds ago"
msgstr "שניות"
-#: js/js.js:813
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "לפני %n דקה"
msgstr[1] "לפני %n דקות"
-#: js/js.js:814
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "לפני %n שעה"
msgstr[1] "לפני %n שעות"
-#: js/js.js:815
+#: js/js.js:869
msgid "today"
msgstr "היום"
-#: js/js.js:816
+#: js/js.js:870
msgid "yesterday"
msgstr "אתמול"
-#: js/js.js:817
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "לפני %n יום"
msgstr[1] "לפני %n ימים"
-#: js/js.js:818
+#: js/js.js:872
msgid "last month"
msgstr "חודש שעבר"
-#: js/js.js:819
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "לפני %n חודש"
msgstr[1] "לפני %n חודשים"
-#: js/js.js:820
+#: js/js.js:874
msgid "months ago"
msgstr "חודשים"
-#: js/js.js:821
+#: js/js.js:875
msgid "last year"
msgstr "שנה שעברה"
-#: js/js.js:822
+#: js/js.js:876
msgid "years ago"
msgstr "שנים"
@@ -224,22 +248,66 @@ msgstr "שנים"
msgid "Choose"
msgstr "בחירה"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
-msgstr "שגיאה בטעינת תבנית בחירת הקבצים"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
+msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "כן"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "לא"
-#: js/oc-dialogs.js:195
+#: 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."
@@ -249,7 +317,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:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "שגיאה"
@@ -269,7 +337,7 @@ msgstr "שותף"
msgid "Share"
msgstr "שתף"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr "שגיאה במהלך השיתוף"
@@ -325,67 +393,67 @@ msgstr "הגדרת תאריך תפוגה"
msgid "Expiration date"
msgstr "תאריך התפוגה"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "שיתוף באמצעות דוא״ל:"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "לא נמצאו אנשים"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "אסור לעשות שיתוף מחדש"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr "שותף תחת {item} עם {user}"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "הסר שיתוף"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "ניתן לערוך"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "בקרת גישה"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "יצירה"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "עדכון"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "מחיקה"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "שיתוף"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "מוגן בססמה"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr "אירעה שגיאה בביטול תאריך התפוגה"
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr "אירעה שגיאה בעת הגדרת תאריך התפוגה"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr "מתבצעת שליחה ..."
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr "הודעת הדוא״ל נשלחה"
@@ -400,7 +468,7 @@ msgstr "תהליך העדכון לא הושלם בהצלחה. נא דווח את
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "תהליך העדכון הסתיים בהצלחה. עכשיו מנתב אותך אל ownCloud."
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr ""
@@ -469,7 +537,7 @@ msgstr "אישי"
msgid "Users"
msgstr "משתמשים"
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "יישומים"
@@ -598,14 +666,10 @@ msgstr "סיום התקנה"
msgid "%s is available. Get more information on how to update."
msgstr "%s זמינה להורדה. ניתן ללחוץ כדי לקבל מידע נוסף כיצד לעדכן."
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "התנתקות"
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr "יישומים נוספים"
-
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "בקשת הכניסה האוטומטית נדחתה!"
@@ -620,19 +684,19 @@ msgstr "אם לא שינית את ססמתך לאחרונה, יתכן שחשבו
msgid "Please change your password to secure your account again."
msgstr "נא לשנות את הססמה שלך כדי לאבטח את חשבונך מחדש."
-#: templates/login.php:34
+#: templates/login.php:32
msgid "Lost your password?"
msgstr "שכחת את ססמתך?"
-#: templates/login.php:39
+#: templates/login.php:37
msgid "remember"
msgstr "שמירת הססמה"
-#: templates/login.php:41
+#: templates/login.php:39
msgid "Log in"
msgstr "כניסה"
-#: templates/login.php:47
+#: templates/login.php:45
msgid "Alternative Logins"
msgstr "כניסות אלטרנטיביות"
diff --git a/l10n/he/files.po b/l10n/he/files.po
index 3d889a551266fe9b43f1d0b0ca2dbc89e169ca67..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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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,7 +75,15 @@ msgstr "הכתיבה לכונן נכשלה"
msgid "Not enough storage available"
msgstr "אין די שטח פנוי באחסון"
-#: ajax/upload.php:123
+#: 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 "תיקייה שגויה."
@@ -83,149 +91,157 @@ 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: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:277 js/file-upload.js:293 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:465
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "ממתין"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{new_name} כבר קיים"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "החלפה"
-#: js/filelist.js:303
+#: js/filelist.js:416
msgid "suggest name"
msgstr "הצעת שם"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "ביטול"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr "{new_name} הוחלף ב־{old_name}"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "undo"
msgstr "ביטול"
-#: js/filelist.js:453
+#: 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/filelist.js:518
-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 "זמן שינוי"
-#: js/files.js:580
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/files.js:586
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-
#: lib/app.php:73
#, php-format
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 "העלאה"
@@ -261,84 +277,68 @@ 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: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 "הסריקה הנוכחית"
-#: templates/part.list.php:74
-msgid "directory"
-msgstr ""
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr ""
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr "קובץ"
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr "קבצים"
-
#: templates/upgrade.php:2
msgid "Upgrading filesystem cache..."
msgstr ""
diff --git a/l10n/he/files_sharing.po b/l10n/he/files_sharing.po
index 0af4dee2ecc82ad8f11523eee9656588441fb955..c181aa3c1eeef2b0c1ec4634d57c8920c9dcbec0 100644
--- a/l10n/he/files_sharing.po
+++ b/l10n/he/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00: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"
@@ -63,7 +63,7 @@ msgstr "%s שיתף עמך את התיקייה %s"
msgid "%s shared the file %s with you"
msgstr "%s שיתף עמך את הקובץ %s"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "הורדה"
@@ -75,6 +75,6 @@ msgstr "העלאה"
msgid "Cancel upload"
msgstr "ביטול ההעלאה"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "אין תצוגה מקדימה זמינה עבור"
diff --git a/l10n/he/lib.po b/l10n/he/lib.po
index d344f07c5972ed59b3c0f9acc4856e51348c0075..d5ee81ab17acec454730f9ed001312ee9035e87f 100644
--- a/l10n/he/lib.po
+++ b/l10n/he/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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\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"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
@@ -48,11 +48,23 @@ msgstr "משתמשים"
msgid "Admin"
msgstr "מנהל"
-#: app.php:837
+#: 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 "שירותי רשת תחת השליטה שלך"
@@ -105,37 +117,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: 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:150
+#: 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:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -264,51 +276,51 @@ msgstr "שרת האינטרנט שלך אינו מוגדר לצורכי סנכר
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "נא לעיין שוב ב<a href='%s'>מדריכי ההתקנה</a>."
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "שניות"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] "לפני %n דקות"
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] "לפני %n שעות"
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "היום"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "אתמול"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] "לפני %n ימים"
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "חודש שעבר"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] "לפני %n חודשים"
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "שנה שעברה"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "שנים"
diff --git a/l10n/he/settings.po b/l10n/he/settings.po
index 767a3252701fb173061b5f3dee73f74b3d124bc5..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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+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,55 +85,88 @@ msgstr "לא ניתן להסיר משתמש מהקבוצה %s"
msgid "Couldn't update app."
msgstr "לא ניתן לעדכן את היישום."
-#: js/apps.js:35
+#: 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}"
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr "בטל"
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr "הפעלה"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr "נא להמתין…"
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr "מתבצע עדכון…"
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr "אירעה שגיאה בעת עדכון היישום"
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "שגיאה"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr "עדכון"
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr "מעודכן"
-#: js/personal.js:150
+#: 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:172
+#: js/personal.js:287
msgid "Saving..."
msgstr "שמירה…"
@@ -149,16 +182,16 @@ msgstr "ביטול"
msgid "Unable to remove user"
msgstr "לא ניתן להסיר את המשתמש"
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: 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:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "מנהל הקבוצה"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "מחיקה"
@@ -178,7 +211,7 @@ msgstr "יצירת המשתמש נכשלה"
msgid "A valid password must be provided"
msgstr "יש לספק ססמה תקנית"
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "עברית"
@@ -344,11 +377,11 @@ msgstr "יותר"
msgid "Less"
msgstr "פחות"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "גרסא"
-#: templates/admin.php:246 templates/personal.php:143
+#: 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 "
@@ -415,7 +448,7 @@ msgstr "הצגת אשף ההפעלה הראשונית שוב"
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "השתמשת ב־<strong>%s</strong> מתוך <strong>%s</strong> הזמינים לך"
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "סיסמא"
@@ -439,7 +472,7 @@ msgstr "ססמה חדשה"
msgid "Change password"
msgstr "שינוי ססמה"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr "שם תצוגה"
@@ -455,38 +488,66 @@ msgstr "כתובת הדוא״ל שלך"
msgid "Fill in an email address to enable password recovery"
msgstr "נא למלא את כתובת הדוא״ל שלך כדי לאפשר שחזור ססמה"
-#: templates/personal.php:85 templates/personal.php:86
+#: 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:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "עזרה בתרגום"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: 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:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "הצפנה"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -512,30 +573,30 @@ msgstr ""
msgid "Default Storage"
msgstr "אחסון בררת המחדל"
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr "ללא הגבלה"
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "אחר"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "שם משתמש"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr "אחסון"
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr "החלפת שם התצוגה"
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr "הגדרת ססמה חדשה"
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr "בררת מחדל"
diff --git a/l10n/he/user_ldap.po b/l10n/he/user_ldap.po
index af6906d1973e5bd97cf4c838605e3854dd627d19..23b74eb81c3d2e917a409c4cde56f0a812b12486 100644
--- a/l10n/he/user_ldap.po
+++ b/l10n/he/user_ldap.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-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\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"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hi/core.po b/l10n/hi/core.po
index 4e3345632b43a5b280e5aa2ec94ef92e23763f62..834b2c48eba68cf6084af191c90cffdd754c8c77 100644
--- a/l10n/hi/core.po
+++ b/l10n/hi/core.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Debanjum <debanjum@gmail.com>, 2013
# rktaiwala <rktaiwala@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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"
@@ -23,6 +24,10 @@ msgstr ""
msgid "%s shared »%s« with you"
msgstr ""
+#: ajax/share.php:227
+msgid "group"
+msgstr ""
+
#: ajax/update.php:11
msgid "Turned on maintenance mode"
msgstr ""
@@ -50,7 +55,7 @@ msgstr ""
#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
msgid "Category type not provided."
-msgstr ""
+msgstr "कैटेगरी प्रकार उपलब्ध नहीं है"
#: ajax/vcategories/add.php:30
msgid "No category to add?"
@@ -59,13 +64,13 @@ msgstr ""
#: ajax/vcategories/add.php:37
#, php-format
msgid "This category already exists: %s"
-msgstr ""
+msgstr "यह कैटेगरी पहले से ही मौजूद है: %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 "ऑब्जेक्ट प्रकार नहीं दिया हुआ"
#: ajax/vcategories/addToFavorites.php:30
#: ajax/vcategories/removeFromFavorites.php:30
@@ -87,33 +92,53 @@ msgstr ""
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 ""
+msgstr "रविवार"
#: js/config.php:33
msgid "Monday"
-msgstr ""
+msgstr "सोमवार"
#: js/config.php:34
msgid "Tuesday"
-msgstr ""
+msgstr "मंगलवार"
#: js/config.php:35
msgid "Wednesday"
-msgstr ""
+msgstr "बुधवार"
#: js/config.php:36
msgid "Thursday"
-msgstr ""
+msgstr "बृहस्पतिवार"
#: js/config.php:37
msgid "Friday"
-msgstr ""
+msgstr "शुक्रवार"
#: js/config.php:38
msgid "Saturday"
-msgstr ""
+msgstr "शनिवार"
#: js/config.php:43
msgid "January"
@@ -163,59 +188,59 @@ msgstr "नवंबर"
msgid "December"
msgstr "दिसम्बर"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "सेटिंग्स"
-#: js/js.js:812
+#: js/js.js:866
msgid "seconds ago"
msgstr ""
-#: js/js.js:813
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:814
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:815
+#: js/js.js:869
msgid "today"
msgstr ""
-#: js/js.js:816
+#: js/js.js:870
msgid "yesterday"
msgstr ""
-#: js/js.js:817
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:818
+#: js/js.js:872
msgid "last month"
msgstr ""
-#: js/js.js:819
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:820
+#: js/js.js:874
msgid "months ago"
msgstr ""
-#: js/js.js:821
+#: js/js.js:875
msgid "last year"
msgstr ""
-#: js/js.js:822
+#: js/js.js:876
msgid "years ago"
msgstr ""
@@ -223,22 +248,66 @@ msgstr ""
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:195
+#: 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."
@@ -248,7 +317,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:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "त्रुटि"
@@ -268,7 +337,7 @@ msgstr ""
msgid "Share"
msgstr "साझा करें"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr ""
@@ -314,7 +383,7 @@ msgstr ""
#: js/share.js:203
msgid "Send"
-msgstr ""
+msgstr "भेजें"
#: js/share.js:208
msgid "Set expiration date"
@@ -324,69 +393,69 @@ msgstr ""
msgid "Expiration date"
msgstr ""
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr ""
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
-msgstr ""
+msgstr "कोई व्यक्ति नहीं मिले "
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr ""
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr ""
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr ""
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr ""
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr ""
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr ""
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr ""
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr ""
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
-msgstr ""
+msgstr "भेजा जा रहा है"
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
-msgstr ""
+msgstr "ईमेल भेज दिया गया है "
#: js/update.js:17
msgid ""
@@ -399,7 +468,7 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr ""
@@ -468,7 +537,7 @@ msgstr "यक्तिगत"
msgid "Users"
msgstr "उपयोगकर्ता"
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "Apps"
@@ -505,12 +574,12 @@ msgstr ""
#: templates/edit_categories_dialog.php:16
msgid "Add"
-msgstr ""
+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)"
@@ -597,14 +666,10 @@ msgstr "सेटअप समाप्त करे"
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "लोग आउट"
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr ""
@@ -619,19 +684,19 @@ msgstr ""
msgid "Please change your password to secure your account again."
msgstr ""
-#: templates/login.php:34
+#: templates/login.php:32
msgid "Lost your password?"
msgstr ""
-#: templates/login.php:39
+#: templates/login.php:37
msgid "remember"
msgstr "याद रखें"
-#: templates/login.php:41
+#: templates/login.php:39
msgid "Log in"
msgstr ""
-#: templates/login.php:47
+#: templates/login.php:45
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/hi/files.po b/l10n/hi/files.po
index 0255297a18f46cf5574f29dcb3058d3c6bf6fc56..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-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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,7 +74,15 @@ msgstr ""
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:123
+#: 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 ""
@@ -82,151 +90,159 @@ 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: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:277 js/file-upload.js:293 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:465
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr ""
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr ""
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr ""
-#: js/filelist.js:303
+#: js/filelist.js:416
msgid "suggest name"
msgstr ""
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr ""
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr ""
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "undo"
msgstr ""
-#: js/filelist.js:453
-msgid "Uploading %n file"
-msgid_plural "Uploading %n files"
+#: 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:518
-msgid "files uploading"
+#: js/filelist.js:541
+msgid "{dirs} and {files}"
msgstr ""
-#: js/files.js:52
+#: 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: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 ""
-#: js/files.js:580
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/files.js:586
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-
#: lib/app.php:73
#, php-format
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"
@@ -260,84 +276,68 @@ 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 ""
-#: templates/part.list.php:74
-msgid "directory"
-msgstr ""
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr ""
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr ""
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr ""
-
#: templates/upgrade.php:2
msgid "Upgrading filesystem cache..."
msgstr ""
diff --git a/l10n/hi/files_sharing.po b/l10n/hi/files_sharing.po
index 1b0fd22ba82c2f86e728ac94180966b0c029dd25..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-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+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"
@@ -63,18 +63,18 @@ msgstr ""
msgid "%s shared the file %s with you"
msgstr ""
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr ""
#: templates/public.php:43 templates/public.php:46
msgid "Upload"
-msgstr ""
+msgstr "अपलोड "
#: templates/public.php:56
msgid "Cancel upload"
msgstr ""
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr ""
diff --git a/l10n/hi/lib.po b/l10n/hi/lib.po
index 60c81ec7b5a025757813a17e88e6b0a569519a28..e930c1b8889a3d7b18cd22ccb932abda4b2c988c 100644
--- a/l10n/hi/lib.po
+++ b/l10n/hi/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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\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"
"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
"MIME-Version: 1.0\n"
@@ -48,11 +48,23 @@ msgstr "उपयोगकर्ता"
msgid "Admin"
msgstr ""
-#: app.php:837
+#: 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 ""
@@ -105,37 +117,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: 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:150
+#: 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:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -264,51 +276,51 @@ msgstr ""
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr ""
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr ""
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr ""
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr ""
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr ""
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr ""
diff --git a/l10n/hi/settings.po b/l10n/hi/settings.po
index dc541066ba0c7530c4360263549081f34c94856a..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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+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,55 +84,88 @@ msgstr ""
msgid "Couldn't update app."
msgstr ""
-#: js/apps.js:35
+#: 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:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr ""
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr ""
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr ""
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "त्रुटि"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr "अद्यतन"
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr ""
-#: js/personal.js:150
+#: 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:172
+#: js/personal.js:287
msgid "Saving..."
msgstr ""
@@ -148,16 +181,16 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: 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:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr ""
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr ""
@@ -177,13 +210,13 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr ""
#: templates/admin.php:15
msgid "Security Warning"
-msgstr ""
+msgstr "सुरक्षा चेतावनी "
#: templates/admin.php:18
msgid ""
@@ -343,11 +376,11 @@ msgstr ""
msgid "Less"
msgstr ""
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr ""
-#: templates/admin.php:246 templates/personal.php:143
+#: 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 "
@@ -414,7 +447,7 @@ msgstr ""
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:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "पासवर्ड"
@@ -438,7 +471,7 @@ msgstr "नया पासवर्ड"
msgid "Change password"
msgstr ""
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr ""
@@ -454,38 +487,66 @@ msgstr ""
msgid "Fill in an email address to enable password recovery"
msgstr ""
-#: templates/personal.php:85 templates/personal.php:86
-msgid "Language"
+#: 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:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:106
+#: 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:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr ""
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -511,30 +572,30 @@ msgstr ""
msgid "Default Storage"
msgstr ""
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr ""
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr ""
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "प्रयोक्ता का नाम"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr ""
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr ""
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr ""
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr ""
diff --git a/l10n/hi/user_ldap.po b/l10n/hi/user_ldap.po
index 053000fe64ca35a2d0c0ad71f803557e1e7eff8b..61c20ec61715010595ab6be6d57e3ef8a82cceae 100644
--- a/l10n/hi/user_ldap.po
+++ b/l10n/hi/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\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"
"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hr/core.po b/l10n/hr/core.po
index befdae3d874ae45a0e8151881ba40527302218a7..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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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"
@@ -22,6 +22,10 @@ msgstr ""
msgid "%s shared »%s« with you"
msgstr ""
+#: ajax/share.php:227
+msgid "group"
+msgstr ""
+
#: ajax/update.php:11
msgid "Turned on maintenance mode"
msgstr ""
@@ -86,6 +90,26 @@ msgstr "Niti jedna kategorija nije odabrana za brisanje."
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 "nedelja"
@@ -162,63 +186,63 @@ msgstr "Studeni"
msgid "December"
msgstr "Prosinac"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "Postavke"
-#: js/js.js:812
+#: js/js.js:866
msgid "seconds ago"
msgstr "sekundi prije"
-#: js/js.js:813
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:814
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:815
+#: js/js.js:869
msgid "today"
msgstr "danas"
-#: js/js.js:816
+#: js/js.js:870
msgid "yesterday"
msgstr "jučer"
-#: js/js.js:817
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:818
+#: js/js.js:872
msgid "last month"
msgstr "prošli mjesec"
-#: js/js.js:819
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:820
+#: js/js.js:874
msgid "months ago"
msgstr "mjeseci"
-#: js/js.js:821
+#: js/js.js:875
msgid "last year"
msgstr "prošlu godinu"
-#: js/js.js:822
+#: js/js.js:876
msgid "years ago"
msgstr "godina"
@@ -226,22 +250,67 @@ msgstr "godina"
msgid "Choose"
msgstr "Izaberi"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "Da"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "Ne"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr "U redu"
+#: 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 "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."
@@ -251,7 +320,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:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "Greška"
@@ -271,7 +340,7 @@ msgstr ""
msgid "Share"
msgstr "Podijeli"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr "Greška prilikom djeljenja"
@@ -327,67 +396,67 @@ msgstr "Postavi datum isteka"
msgid "Expiration date"
msgstr "Datum isteka"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "Dijeli preko email-a:"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "Osobe nisu pronađene"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "Ponovo dijeljenje nije dopušteno"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "Makni djeljenje"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "može mjenjat"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "kontrola pristupa"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "kreiraj"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "ažuriraj"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "izbriši"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "djeli"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "Zaštita lozinkom"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr "Greška prilikom brisanja datuma isteka"
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr "Greška prilikom postavljanja datuma isteka"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr ""
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr ""
@@ -402,7 +471,7 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr ""
@@ -471,7 +540,7 @@ msgstr "Osobno"
msgid "Users"
msgstr "Korisnici"
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "Aplikacije"
@@ -600,14 +669,10 @@ msgstr "Završi postavljanje"
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "Odjava"
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr ""
@@ -622,19 +687,19 @@ msgstr ""
msgid "Please change your password to secure your account again."
msgstr ""
-#: templates/login.php:34
+#: templates/login.php:32
msgid "Lost your password?"
msgstr "Izgubili ste lozinku?"
-#: templates/login.php:39
+#: templates/login.php:37
msgid "remember"
msgstr "zapamtiti"
-#: templates/login.php:41
+#: templates/login.php:39
msgid "Log in"
msgstr "Prijava"
-#: templates/login.php:47
+#: templates/login.php:45
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/hr/files.po b/l10n/hr/files.po
index ad81139bafe6252732935bb4290d3f388a206e67..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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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,7 +74,15 @@ msgstr "Neuspjelo pisanje na disk"
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:123
+#: 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 ""
@@ -82,152 +90,160 @@ 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: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 "Učitavanje datoteke. Napuštanjem stranice će prekinuti učitavanje."
-#: 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:277 js/file-upload.js:293 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 "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:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "U tijeku"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr ""
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "zamjeni"
-#: js/filelist.js:303
+#: js/filelist.js:416
msgid "suggest name"
msgstr "predloži ime"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "odustani"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr ""
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "undo"
msgstr "vrati"
-#: js/filelist.js:453
+#: 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: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: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] ""
msgstr[2] ""
-#: js/filelist.js:518
-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: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 "Zadnja promjena"
-#: js/files.js:580
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: js/files.js:586
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
#: lib/app.php:73
#, php-format
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"
@@ -263,84 +279,68 @@ 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:73
+#: templates/index.php:67
msgid "Download"
msgstr "Preuzimanje"
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr "Makni djeljenje"
-#: templates/index.php:91 templates/index.php:92
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "Obriši"
-#: templates/index.php:105
+#: templates/index.php:100
msgid "Upload too large"
msgstr "Prijenos je preobiman"
-#: 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 "Datoteke koje pokušavate prenijeti prelaze maksimalnu veličinu za prijenos datoteka na ovom poslužitelju."
-#: templates/index.php:112
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr "Datoteke se skeniraju, molimo pričekajte."
-#: templates/index.php:115
+#: templates/index.php:110
msgid "Current scanning"
msgstr "Trenutno skeniranje"
-#: templates/part.list.php:74
-msgid "directory"
-msgstr ""
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr ""
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr "datoteka"
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr "datoteke"
-
#: templates/upgrade.php:2
msgid "Upgrading filesystem cache..."
msgstr ""
diff --git a/l10n/hr/files_sharing.po b/l10n/hr/files_sharing.po
index ee7cc3cc6798c042c4f8c3376a2a21fc7273dda9..308e9e9875577f4c756aa2ffc2cce487896b3a45 100644
--- a/l10n/hr/files_sharing.po
+++ b/l10n/hr/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00: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"
@@ -63,7 +63,7 @@ msgstr ""
msgid "%s shared the file %s with you"
msgstr ""
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "Preuzimanje"
@@ -75,6 +75,6 @@ msgstr "Učitaj"
msgid "Cancel upload"
msgstr "Prekini upload"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr ""
diff --git a/l10n/hr/lib.po b/l10n/hr/lib.po
index 5072e42a3070c371ddd5387c461de70b7b7155a6..4450ee5f5d90f9877ef5ad3c8baea96a10d9dc26 100644
--- a/l10n/hr/lib.po
+++ b/l10n/hr/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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\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"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
@@ -48,11 +48,23 @@ msgstr "Korisnici"
msgid "Admin"
msgstr "Administrator"
-#: app.php:837
+#: 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 "web usluge pod vašom kontrolom"
@@ -105,37 +117,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: 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:150
+#: 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:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -264,55 +276,55 @@ msgstr ""
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "sekundi prije"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "danas"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "jučer"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "prošli mjesec"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "prošlu godinu"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "godina"
diff --git a/l10n/hr/settings.po b/l10n/hr/settings.po
index a1d1484aab7b058151529304acd8c4cd2e9034c2..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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+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,55 +84,88 @@ msgstr ""
msgid "Couldn't update app."
msgstr ""
-#: js/apps.js:35
+#: 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:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr "Isključi"
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr "Uključi"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr ""
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "Greška"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr ""
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr ""
-#: js/personal.js:150
+#: 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:172
+#: js/personal.js:287
msgid "Saving..."
msgstr "Spremanje..."
@@ -148,16 +181,16 @@ msgstr "vrati"
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "Grupe"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "Grupa Admin"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "Obriši"
@@ -177,7 +210,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "__ime_jezika__"
@@ -343,11 +376,11 @@ msgstr "više"
msgid "Less"
msgstr ""
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr ""
-#: templates/admin.php:246 templates/personal.php:143
+#: 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 "
@@ -414,7 +447,7 @@ msgstr ""
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:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "Lozinka"
@@ -438,7 +471,7 @@ msgstr "Nova lozinka"
msgid "Change password"
msgstr "Izmjena lozinke"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr ""
@@ -454,38 +487,66 @@ msgstr "Vaša e-mail adresa"
msgid "Fill in an email address to enable password recovery"
msgstr "Ispunite vase e-mail adresa kako bi se omogućilo oporavak lozinke"
-#: templates/personal.php:85 templates/personal.php:86
+#: 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 "Jezik"
-#: templates/personal.php:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "Pomoć prevesti"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:106
+#: 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:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr ""
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -511,30 +572,30 @@ msgstr ""
msgid "Default Storage"
msgstr ""
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr ""
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "ostali"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "Korisničko ime"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr ""
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr ""
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr ""
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr ""
diff --git a/l10n/hr/user_ldap.po b/l10n/hr/user_ldap.po
index bbd09586144e99b65de885af17ee9a4dbc8ed7c9..1d665b257f679dcdf59bb1f6e66b7867b1ff3a2f 100644
--- a/l10n/hr/user_ldap.po
+++ b/l10n/hr/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\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"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hu_HU/core.po b/l10n/hu_HU/core.po
index f8d7f328ab3595237b89cf996c73035c07f13a78..9a7a4428b56fd3083d20abeff75570e4543bb995 100644
--- a/l10n/hu_HU/core.po
+++ b/l10n/hu_HU/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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-30 10:16-0400\n"
+"PO-Revision-Date: 2013-09-30 00:42+0000\n"
+"Last-Translator: ebela <bela@dandre.hu>\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -24,30 +24,34 @@ msgstr ""
msgid "%s shared »%s« with you"
msgstr "%s megosztotta Önnel ezt: »%s«"
+#: ajax/share.php:227
+msgid "group"
+msgstr "csoport"
+
#: ajax/update.php:11
msgid "Turned on maintenance mode"
-msgstr ""
+msgstr "A karbantartási mód bekapcsolva"
#: ajax/update.php:14
msgid "Turned off maintenance mode"
-msgstr ""
+msgstr "A karbantartási mód kikapcsolva"
#: ajax/update.php:17
msgid "Updated database"
-msgstr ""
+msgstr "Frissítet adatbázis"
#: ajax/update.php:20
msgid "Updating filecache, this may take really long..."
-msgstr ""
+msgstr "A filecache frissítése folyamatban, ez a folyamat hosszabb ideig is eltarthat..."
#: ajax/update.php:23
msgid "Updated filecache"
-msgstr ""
+msgstr "Filecache frissítve"
#: ajax/update.php:26
#, php-format
msgid "... %d%% done ..."
-msgstr ""
+msgstr "... %d%% kész ..."
#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
msgid "Category type not provided."
@@ -88,6 +92,26 @@ msgstr "Nincs törlésre jelölt kategória"
msgid "Error removing %s from favorites."
msgstr "Nem sikerült a kedvencekből törölni ezt: %s"
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr "Nincs kép vagy file megadva"
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr "Ismeretlen file tipús"
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr "Hibás kép"
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr "Az átmeneti profil kép nem elérhető, próbáld újra"
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr "Vágáshoz nincs adat megadva"
+
#: js/config.php:32
msgid "Sunday"
msgstr "vasárnap"
@@ -164,59 +188,59 @@ msgstr "november"
msgid "December"
msgstr "december"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "Beállítások"
-#: js/js.js:812
+#: js/js.js:866
msgid "seconds ago"
msgstr "pár másodperce"
-#: js/js.js:813
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:814
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:815
+#: js/js.js:869
msgid "today"
msgstr "ma"
-#: js/js.js:816
+#: js/js.js:870
msgid "yesterday"
msgstr "tegnap"
-#: js/js.js:817
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:818
+#: js/js.js:872
msgid "last month"
msgstr "múlt hónapban"
-#: js/js.js:819
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:820
+#: js/js.js:874
msgid "months ago"
msgstr "több hónapja"
-#: js/js.js:821
+#: js/js.js:875
msgid "last year"
msgstr "tavaly"
-#: js/js.js:822
+#: js/js.js:876
msgid "years ago"
msgstr "több éve"
@@ -224,22 +248,66 @@ msgstr "több éve"
msgid "Choose"
msgstr "Válasszon"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
-msgstr "Nem sikerült betölteni a fájlkiválasztó sablont"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
+msgstr "Nem sikerült betölteni a fájlkiválasztó sablont: {error}"
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "Igen"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "Nem"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr "Ok"
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+msgstr "Nem sikerült betölteni az üzenet sablont: {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 "Egy file ütközik"
+
+#: js/oc-dialogs.js:367
+msgid "Which files do you want to keep?"
+msgstr "Melyik file-okat akarod megtartani?"
+
+#: js/oc-dialogs.js:368
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr "Ha kiválasztod mindazokaz a verziókat, a másolt fileok neve sorszámozva lesz."
+
+#: js/oc-dialogs.js:376
+msgid "Cancel"
+msgstr "Mégsem"
+
+#: js/oc-dialogs.js:386
+msgid "Continue"
+msgstr "Folytatás"
+
+#: 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} kiválasztva)"
+
+#: js/oc-dialogs.js:457
+msgid "Error loading file exists template"
+msgstr "Hiba a létező sablon betöltésekor"
+
#: 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."
@@ -249,7 +317,7 @@ msgstr "Az objektum típusa nincs megadva."
#: 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:643 js/share.js:655
+#: js/share.js:656 js/share.js:668
msgid "Error"
msgstr "Hiba"
@@ -269,7 +337,7 @@ msgstr "Megosztott"
msgid "Share"
msgstr "Megosztás"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:696
msgid "Error while sharing"
msgstr "Nem sikerült létrehozni a megosztást"
@@ -325,67 +393,67 @@ msgstr "Legyen lejárati idő"
msgid "Expiration date"
msgstr "A lejárati idő"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "Megosztás emaillel:"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "Nincs találat"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "Ezt az állományt csak a tulajdonosa oszthatja meg másokkal"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr "Megosztva {item}-ben {user}-rel"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "A megosztás visszavonása"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "módosíthat"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "jogosultság"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "létrehoz"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "szerkeszt"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "töröl"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "megoszt"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:643
msgid "Password protected"
msgstr "Jelszóval van védve"
-#: js/share.js:643
+#: js/share.js:656
msgid "Error unsetting expiration date"
msgstr "Nem sikerült a lejárati időt törölni"
-#: js/share.js:655
+#: js/share.js:668
msgid "Error setting expiration date"
msgstr "Nem sikerült a lejárati időt beállítani"
-#: js/share.js:670
+#: js/share.js:683
msgid "Sending ..."
msgstr "Küldés ..."
-#: js/share.js:681
+#: js/share.js:694
msgid "Email sent"
msgstr "Az emailt elküldtük"
@@ -400,10 +468,10 @@ msgstr "A frissítés nem sikerült. Kérem értesítse erről a problémáról
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "A frissítés sikeres volt. Visszairányítjuk az ownCloud szolgáltatáshoz."
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
-msgstr ""
+msgstr "%s jelszó visszaállítás"
#: lostpassword/templates/email.php:2
msgid "Use the following link to reset your password: {link}"
@@ -469,7 +537,7 @@ msgstr "Személyes"
msgid "Users"
msgstr "Felhasználók"
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "Alkalmazások"
@@ -598,14 +666,10 @@ msgstr "A beállítások befejezése"
msgid "%s is available. Get more information on how to update."
msgstr "%s rendelkezésre áll. További információ a frissítéshez."
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "Kilépés"
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "Az automatikus bejelentkezés sikertelen!"
@@ -620,19 +684,19 @@ msgstr "Ha mostanában nem módosította a jelszavát, akkor lehetséges, hogy i
msgid "Please change your password to secure your account again."
msgstr "A biztonsága érdekében változtassa meg a jelszavát!"
-#: templates/login.php:34
+#: templates/login.php:32
msgid "Lost your password?"
msgstr "Elfelejtette a jelszavát?"
-#: templates/login.php:39
+#: templates/login.php:37
msgid "remember"
msgstr "emlékezzen"
-#: templates/login.php:41
+#: templates/login.php:39
msgid "Log in"
msgstr "Bejelentkezés"
-#: templates/login.php:47
+#: templates/login.php:45
msgid "Alternative Logins"
msgstr "Alternatív bejelentkezés"
diff --git a/l10n/hu_HU/files.po b/l10n/hu_HU/files.po
index 9ea607c824bc2b53b66621dcd68e4beb0c590330..e61d77e5cb26ed4d9a525256523df645ff4652f9 100644
--- a/l10n/hu_HU/files.po
+++ b/l10n/hu_HU/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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-27 00:01-0400\n"
+"PO-Revision-Date: 2013-09-24 18:40+0000\n"
+"Last-Translator: Laszlo Tornoci <torlasz@gmail.com>\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -75,157 +75,173 @@ 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:123
+#: ajax/upload.php:120 ajax/upload.php:143
+msgid "Upload failed. Could not get file info."
+msgstr "A feltöltés nem sikerült. Az állományt leíró információk nem érhetők el."
+
+#: ajax/upload.php:136
+msgid "Upload failed. Could not find uploaded file"
+msgstr "A feltöltés nem sikerült. Nem található a feltöltendő állomány."
+
+#: ajax/upload.php:160
msgid "Invalid directory."
msgstr "Érvénytelen mappa."
-#: appinfo/app.php:12
+#: appinfo/app.php:11
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 "A(z) {filename} állomány nem tölthető fel, mert ez vagy egy mappa, vagy pedig 0 bájtból áll."
-#: 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:167
+#: js/file-upload.js:356
+msgid "Could not get result from server."
+msgstr "A kiszolgálótól nem kapható meg az eredmény."
+
+#: 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:241
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr "Az URL nem lehet semmi."
-#: 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 "Érvénytelen mappanév. A 'Shared' az ownCloud számára fenntartott elnevezés"
-#: js/file-upload.js:277 js/file-upload.js:293 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 "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:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "Folyamatban"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{new_name} már létezik"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "írjuk fölül"
-#: js/filelist.js:303
+#: js/filelist.js:416
msgid "suggest name"
msgstr "legyen más neve"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "mégse"
-#: js/filelist.js:350
+#: 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:350
+#: js/filelist.js:463
msgid "undo"
msgstr "visszavonás"
-#: js/filelist.js:453
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] "%n mappa"
+msgstr[1] "%n mappa"
+
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] "%n állomány"
+msgstr[1] "%n állomány"
+
+#: js/filelist.js:541
+msgid "{dirs} and {files}"
+msgstr "{dirs} és {files}"
+
+#: js/filelist.js:731 js/filelist.js:769
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n állomány feltöltése"
+msgstr[1] "%n állomány feltöltése"
-#: js/filelist.js:518
-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 ""
+msgstr "A titkosítási funkciót kikapcsolták, de az Ön állományai még mindig titkosított állapotban vannak. A személyes beállításoknál tudja a titkosítást feloldani."
-#: 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:562 templates/index.php:67
+#: js/files.js:507 js/files.js:545
+msgid "Error moving file"
+msgstr "Az állomány áthelyezése nem sikerült."
+
+#: js/files.js:558 templates/index.php:61
msgid "Name"
msgstr "Név"
-#: js/files.js:563 templates/index.php:78
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "Méret"
-#: js/files.js:564 templates/index.php:80
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr "Módosítva"
-#: js/files.js:580
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/files.js:586
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-
#: lib/app.php:73
#, php-format
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"
@@ -261,84 +277,68 @@ 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:73
+#: templates/index.php:67
msgid "Download"
msgstr "Letöltés"
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr "A megosztás visszavonása"
-#: templates/index.php:91 templates/index.php:92
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "Törlés"
-#: templates/index.php:105
+#: templates/index.php:100
msgid "Upload too large"
msgstr "A feltöltés túl nagy"
-#: 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 "A feltöltendő állományok mérete meghaladja a kiszolgálón megengedett maximális méretet."
-#: templates/index.php:112
+#: 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:115
+#: templates/index.php:110
msgid "Current scanning"
msgstr "Ellenőrzés alatt"
-#: templates/part.list.php:74
-msgid "directory"
-msgstr "mappa"
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr "mappa"
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr "fájl"
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr "fájlok"
-
#: templates/upgrade.php:2
msgid "Upgrading filesystem cache..."
msgstr "A fájlrendszer gyorsítótárának frissítése zajlik..."
diff --git a/l10n/hu_HU/files_encryption.po b/l10n/hu_HU/files_encryption.po
index 7f282b4ac5674a3f389149fed6342cf19e171972..b21350959cba30be1af2cb0fdd85c24cf113c7ea 100644
--- a/l10n/hu_HU/files_encryption.po
+++ b/l10n/hu_HU/files_encryption.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# blackc0de <complic@vipmail.hu>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-21 08:10-0400\n"
-"PO-Revision-Date: 2013-08-19 19:20+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-03 07:42-0400\n"
+"PO-Revision-Date: 2013-09-01 19:30+0000\n"
+"Last-Translator: blackc0de <complic@vipmail.hu>\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -28,7 +29,7 @@ msgstr ""
#: ajax/adminrecovery.php:48
msgid "Recovery key successfully disabled"
-msgstr ""
+msgstr "Visszaállítási kulcs sikeresen kikapcsolva"
#: ajax/adminrecovery.php:53
msgid ""
@@ -37,11 +38,11 @@ msgstr ""
#: ajax/changeRecoveryPassword.php:49
msgid "Password successfully changed."
-msgstr ""
+msgstr "Jelszó sikeresen megváltoztatva."
#: ajax/changeRecoveryPassword.php:51
msgid "Could not change the password. Maybe the old password was not correct."
-msgstr ""
+msgstr "A jelszót nem lehet megváltoztatni! Lehet, hogy hibás volt a régi jelszó."
#: ajax/updatePrivateKeyPassword.php:51
msgid "Private key password successfully updated."
@@ -61,18 +62,18 @@ msgid ""
"files."
msgstr ""
-#: hooks/hooks.php:41
+#: hooks/hooks.php:51
msgid "Missing requirements."
msgstr ""
-#: hooks/hooks.php:42
+#: hooks/hooks.php:52
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 ""
+msgstr "Kérlek győződj meg arról, hogy PHP 5.3.3 vagy annál frissebb van telepítve, valamint a PHP-hez tartozó OpenSSL bővítmény be van-e kapcsolva és az helyesen van-e konfigurálva! Ki lett kapcsolva ideiglenesen a titkosító alkalmazás."
-#: hooks/hooks.php:249
+#: hooks/hooks.php:250
msgid "Following users are not set up for encryption:"
msgstr ""
@@ -92,7 +93,7 @@ msgstr ""
#: templates/invalid_private_key.php:7
msgid "personal settings"
-msgstr ""
+msgstr "személyes beállítások"
#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
@@ -109,11 +110,11 @@ msgstr ""
#: templates/settings-admin.php:21 templates/settings-personal.php:54
msgid "Enabled"
-msgstr ""
+msgstr "Bekapcsolva"
#: templates/settings-admin.php:29 templates/settings-personal.php:62
msgid "Disabled"
-msgstr ""
+msgstr "Kikapcsolva"
#: templates/settings-admin.php:34
msgid "Change recovery key password:"
@@ -129,7 +130,7 @@ msgstr ""
#: templates/settings-admin.php:53
msgid "Change Password"
-msgstr ""
+msgstr "Jelszó megváltoztatása"
#: templates/settings-personal.php:11
msgid "Your private key password no longer match your log-in password:"
@@ -147,19 +148,19 @@ msgstr ""
#: templates/settings-personal.php:24
msgid "Old log-in password"
-msgstr ""
+msgstr "Régi bejelentkezési jelszó"
#: templates/settings-personal.php:30
msgid "Current log-in password"
-msgstr ""
+msgstr "Jelenlegi bejelentkezési jelszó"
#: templates/settings-personal.php:35
msgid "Update Private Key Password"
-msgstr ""
+msgstr "Privát kulcs jelszó frissítése"
#: templates/settings-personal.php:45
msgid "Enable password recovery:"
-msgstr ""
+msgstr "Jelszó-visszaállítás bekapcsolása"
#: templates/settings-personal.php:47
msgid ""
diff --git a/l10n/hu_HU/files_sharing.po b/l10n/hu_HU/files_sharing.po
index 43059eac1fccd50975dcc3c6dbeee459a30cd0c0..ae03dc98f23c6b6958875aef42c3e228564c9618 100644
--- a/l10n/hu_HU/files_sharing.po
+++ b/l10n/hu_HU/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:01+0000\n"
"Last-Translator: Laszlo Tornoci <torlasz@gmail.com>\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
@@ -64,7 +64,7 @@ msgstr "%s megosztotta Önnel ezt a mappát: %s"
msgid "%s shared the file %s with you"
msgstr "%s megosztotta Önnel ezt az állományt: %s"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "Letöltés"
@@ -76,6 +76,6 @@ msgstr "Feltöltés"
msgid "Cancel upload"
msgstr "A feltöltés megszakítása"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "Nem áll rendelkezésre előnézet ehhez: "
diff --git a/l10n/hu_HU/files_trashbin.po b/l10n/hu_HU/files_trashbin.po
index 4e5d7207c9f4bb4bedb0aa36e22c49f68a51a26e..d0d6f3bc51a10c4df5cfadd6569727931a25965e 100644
--- a/l10n/hu_HU/files_trashbin.po
+++ b/l10n/hu_HU/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-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-09-27 00:01-0400\n"
+"PO-Revision-Date: 2013-09-24 18:40+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"
@@ -28,43 +28,43 @@ msgstr "Nem sikerült %s végleges törlése"
msgid "Couldn't restore %s"
msgstr "Nem sikerült %s visszaállítása"
-#: js/trash.js:7 js/trash.js:100
+#: js/trash.js:7 js/trash.js:102
msgid "perform restore operation"
msgstr "a visszaállítás végrehajtása"
-#: 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 "Hiba"
-#: js/trash.js:36
+#: js/trash.js:37
msgid "delete file permanently"
msgstr "az állomány végleges törlése"
-#: js/trash.js:127
+#: js/trash.js:129
msgid "Delete permanently"
msgstr "Végleges törlés"
-#: js/trash.js:182 templates/index.php:17
+#: js/trash.js:190 templates/index.php:21
msgid "Name"
msgstr "Név"
-#: js/trash.js:183 templates/index.php:27
+#: js/trash.js:191 templates/index.php:31
msgid "Deleted"
msgstr "Törölve"
-#: js/trash.js:191
+#: js/trash.js:199
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
-msgstr[1] ""
+msgstr[1] "%n mappa"
-#: js/trash.js:197
+#: js/trash.js:205
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
-msgstr[1] ""
+msgstr[1] "%n állomány"
-#: lib/trash.php:819 lib/trash.php:821
+#: lib/trashbin.php:814 lib/trashbin.php:816
msgid "restored"
msgstr "visszaállítva"
@@ -72,11 +72,11 @@ msgstr "visszaállítva"
msgid "Nothing in here. Your trash bin is empty!"
msgstr "Itt nincs semmi. Az Ön szemetes mappája üres!"
-#: templates/index.php:20 templates/index.php:22
+#: templates/index.php:24 templates/index.php:26
msgid "Restore"
msgstr "Visszaállítás"
-#: templates/index.php:30 templates/index.php:31
+#: templates/index.php:34 templates/index.php:35
msgid "Delete"
msgstr "Törlés"
diff --git a/l10n/hu_HU/lib.po b/l10n/hu_HU/lib.po
index 58c1b28f6cdd8a245126280c7b4042d4f8a4d711..57212087ee511580e5b71ff55212490c08bd491f 100644
--- a/l10n/hu_HU/lib.po
+++ b/l10n/hu_HU/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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-30 10:16-0400\n"
+"PO-Revision-Date: 2013-09-30 00:50+0000\n"
+"Last-Translator: ebela <bela@dandre.hu>\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,42 +19,54 @@ msgstr ""
"Language: hu_HU\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:239
+#: app.php:237
#, php-format
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
msgstr ""
-#: app.php:250
+#: app.php:248
msgid "No app name specified"
-msgstr ""
+msgstr "Nincs az alkalmazás név megadva."
-#: app.php:361
+#: app.php:352
msgid "Help"
msgstr "Súgó"
-#: app.php:374
+#: app.php:365
msgid "Personal"
msgstr "Személyes"
-#: app.php:385
+#: app.php:376
msgid "Settings"
msgstr "Beállítások"
-#: app.php:397
+#: app.php:388
msgid "Users"
msgstr "Felhasználók"
-#: app.php:410
+#: app.php:401
msgid "Admin"
msgstr "Adminsztráció"
-#: app.php:837
+#: app.php:832
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "Sikertelen Frissítés \"%s\"."
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr ""
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr "Ismeretlen file tipús"
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr "Hibás kép"
+
#: defaults.php:35
msgid "web services under your control"
msgstr "webszolgáltatások saját kézben"
@@ -107,40 +119,40 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
-msgstr ""
+msgstr "Az alkalmazás nem szolgáltatott info.xml file-t"
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
-msgstr ""
+msgstr "Az alalmazás nem telepíthető, mert nem kompatibilis az ownClod ezzel a verziójával."
-#: installer.php:144
+#: 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:150
+#: 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:160
+#: installer.php:162
msgid "App directory already exists"
-msgstr ""
+msgstr "Az alkalmazás mappája már létezik"
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
-msgstr ""
+msgstr "Nem lehetett létrehozni az alkalmzás mappáját. Kérlek ellenőrizd a jogosultásgokat. %s"
#: json.php:28
msgid "Application is not enabled"
@@ -154,15 +166,15 @@ msgstr "Azonosítási hiba"
msgid "Token expired. Please reload page."
msgstr "A token lejárt. Frissítse az oldalt."
-#: search/provider/file.php:17 search/provider/file.php:35
+#: search/provider/file.php:18 search/provider/file.php:36
msgid "Files"
msgstr "Fájlok"
-#: search/provider/file.php:26 search/provider/file.php:33
+#: search/provider/file.php:27 search/provider/file.php:34
msgid "Text"
msgstr "Szöveg"
-#: search/provider/file.php:29
+#: search/provider/file.php:30
msgid "Images"
msgstr "Képek"
@@ -266,59 +278,59 @@ msgstr "Az Ön webkiszolgálója nincs megfelelően beállítva az állományok
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Kérjük tüzetesen tanulmányozza át a <a href='%s'>telepítési útmutatót</a>."
-#: template/functions.php:80
+#: tags.php:194
+#, php-format
+msgid "Could not find category \"%s\""
+msgstr "Ez a kategória nem található: \"%s\""
+
+#: template/functions.php:96
msgid "seconds ago"
msgstr "pár másodperce"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "ma"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "tegnap"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "múlt hónapban"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "tavaly"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "több éve"
#: template.php:297
msgid "Caused by:"
msgstr "Okozta:"
-
-#: vcategories.php:188 vcategories.php:249
-#, php-format
-msgid "Could not find category \"%s\""
-msgstr "Ez a kategória nem található: \"%s\""
diff --git a/l10n/hu_HU/settings.po b/l10n/hu_HU/settings.po
index a04fb4488eaf95400b06472ae7006d82ef904af7..f1bb5c03cfe5311e98077ca85ca553401eecca5f 100644
--- a/l10n/hu_HU/settings.po
+++ b/l10n/hu_HU/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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-30 10:17-0400\n"
+"PO-Revision-Date: 2013-09-30 00:21+0000\n"
+"Last-Translator: ebela <bela@dandre.hu>\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\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 "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,55 +87,88 @@ 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."
-#: js/apps.js:35
+#: changepassword/controller.php:20
+msgid "Wrong password"
+msgstr "Hibás jelszó"
+
+#: changepassword/controller.php:42
+msgid "No user supplied"
+msgstr "Nincs felhasználó által mellékelve"
+
+#: changepassword/controller.php:74
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr "Add meg az admin helyreállító jelszót, máskülönben az összes felhasználói adat elveszik."
+
+#: changepassword/controller.php:79
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr "Hibás admin helyreállítási jelszó. Ellenörizd a jelszót és próbáld újra."
+
+#: changepassword/controller.php:87
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr "A back-end nem támogatja a jelszó módosítást, de felhasználó titkosítási kulcsa sikeresen frissítve lett."
+
+#: changepassword/controller.php:92 changepassword/controller.php:103
+msgid "Unable to change password"
+msgstr "Nem sikerült megváltoztatni a jelszót"
+
+#: js/apps.js:43
msgid "Update to {appversion}"
msgstr "Frissítés erre a verzióra: {appversion}"
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:110
msgid "Disable"
msgstr "Letiltás"
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
msgid "Enable"
msgstr "engedélyezve"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr "Kérem várjon..."
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:101
msgid "Error while disabling app"
-msgstr ""
+msgstr "Hiba az alkalmazás kikapcsolása közben"
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:100 js/apps.js:114 js/apps.js:115
msgid "Error while enabling app"
-msgstr ""
+msgstr "Hiba az alalmazás engedélyezése közben"
-#: js/apps.js:115
+#: js/apps.js:125
msgid "Updating...."
msgstr "Frissítés folyamatban..."
-#: js/apps.js:118
+#: js/apps.js:128
msgid "Error while updating app"
msgstr "Hiba történt a programfrissítés közben"
-#: js/apps.js:118
+#: js/apps.js:128
msgid "Error"
msgstr "Hiba"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:129 templates/apps.php:43
msgid "Update"
msgstr "Frissítés"
-#: js/apps.js:122
+#: js/apps.js:132
msgid "Updated"
msgstr "Frissítve"
-#: js/personal.js:150
+#: js/personal.js:221
+msgid "Select a profile picture"
+msgstr "Válassz profil képet"
+
+#: js/personal.js:266
msgid "Decrypting files... Please wait, this can take some time."
-msgstr ""
+msgstr "File-ok kititkosítása folyamatban... Kérlek várj, ez hosszabb ideig is eltarthat ..."
-#: js/personal.js:172
+#: js/personal.js:288
msgid "Saving..."
msgstr "Mentés..."
@@ -151,16 +184,16 @@ msgstr "visszavonás"
msgid "Unable to remove user"
msgstr "A felhasználót nem sikerült eltávolítáni"
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "Csoportok"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "Csoportadminisztrátor"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "Törlés"
@@ -180,7 +213,7 @@ msgstr "A felhasználó nem hozható létre"
msgid "A valid password must be provided"
msgstr "Érvényes jelszót kell megadnia"
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "__language_name__"
@@ -346,11 +379,11 @@ msgstr "Több"
msgid "Less"
msgstr "Kevesebb"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "Verzió"
-#: templates/admin.php:246 templates/personal.php:143
+#: 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 "
@@ -417,7 +450,7 @@ msgstr "Nézzük meg újra az első bejelentkezéskori segítséget!"
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Az Ön tárterület-felhasználása jelenleg: <strong>%s</strong>. Maximálisan ennyi áll rendelkezésére: <strong>%s</strong>"
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "Jelszó"
@@ -441,7 +474,7 @@ msgstr "Az új jelszó"
msgid "Change password"
msgstr "A jelszó megváltoztatása"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr "A megjelenített név"
@@ -457,40 +490,68 @@ msgstr "Az Ön email címe"
msgid "Fill in an email address to enable password recovery"
msgstr "Adja meg az email címét, hogy jelszó-emlékeztetőt kérhessen, ha elfelejtette a jelszavát!"
-#: templates/personal.php:85 templates/personal.php:86
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr "Profilkép"
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr "Új feltöltése"
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr "Új kiválasztása Fileokból"
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr "Kép eltávolítása"
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr "Egyaránt png vagy jpg. Az ideális ha négyzet alaku, de késöbb még átszabható"
+
+#: templates/personal.php:97
+msgid "Abort"
+msgstr "Megszakítás"
+
+#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr "Válassz profil képet"
+
+#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
msgstr "Nyelv"
-#: templates/personal.php:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "Segítsen a fordításban!"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: 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 "Ezt a címet használja, ha <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">WebDAV-on keresztül szeretné elérni az állományait</a>"
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "Titkosítás"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
-msgstr ""
+msgstr "A titkosító alkalmzás a továbbiakban nincs engedélyezve, kititkosítja az összes fileodat"
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
-msgstr ""
+msgstr "Bejelentkezési jelszó"
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
-msgstr ""
+msgstr "Kititkosítja az összes file-t"
#: templates/users.php:21
msgid "Login Name"
@@ -514,30 +575,30 @@ msgstr "Adja meg az adatok visszanyeréséhez szükséges jelszót arra az esetr
msgid "Default Storage"
msgstr "Alapértelmezett tárhely"
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr "Korlátlan"
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "Más"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "Felhasználónév"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr "Tárhely"
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr "a megjelenített név módosítása"
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr "új jelszó beállítása"
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr "Alapértelmezett"
diff --git a/l10n/hu_HU/user_ldap.po b/l10n/hu_HU/user_ldap.po
index 166a16c7f8179cb4b72c4b142f17804a455821b8..b1d5e5391c8ec1b7fa202118ceeeb8fd36fee781 100644
--- a/l10n/hu_HU/user_ldap.po
+++ b/l10n/hu_HU/user_ldap.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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-30 10:16-0400\n"
+"PO-Revision-Date: 2013-09-30 00:22+0000\n"
+"Last-Translator: ebela <bela@dandre.hu>\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -92,7 +92,7 @@ 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 ""
+msgstr "<b>Figyelem:</b> a user_ldap és user_webdavauth alkalmazások nem kompatibilisek. Együttes használatuk váratlan eredményekhez vezethet. Kérje meg a rendszergazdát, hogy a kettő közül kapcsolja ki az egyiket."
#: templates/settings.php:12
msgid ""
@@ -157,7 +157,7 @@ msgstr "Szűrő a bejelentkezéshez"
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action. Example: \"uid=%%uid\""
-msgstr ""
+msgstr "Ez a szűrő érvényes a bejelentkezés megkísérlésekor. Ekkor az %%uid változó helyére a bejelentkezési név kerül. Például: \"uid=%%uid\""
#: templates/settings.php:55
msgid "User List Filter"
@@ -167,7 +167,7 @@ msgstr "A felhasználók szűrője"
msgid ""
"Defines the filter to apply, when retrieving users (no placeholders). "
"Example: \"objectClass=person\""
-msgstr ""
+msgstr "Ez a szűrő érvényes a felhasználók listázásakor (nincs helyettesíthető változó). Például: \"objectClass=person\""
#: templates/settings.php:59
msgid "Group Filter"
@@ -177,7 +177,7 @@ msgstr "A csoportok szűrője"
msgid ""
"Defines the filter to apply, when retrieving groups (no placeholders). "
"Example: \"objectClass=posixGroup\""
-msgstr ""
+msgstr "Ez a szűrő érvényes a csoportok listázásakor (nincs helyettesíthető változó). Például: \"objectClass=posixGroup\""
#: templates/settings.php:66
msgid "Connection Settings"
@@ -215,7 +215,7 @@ msgstr "A fő szerver kihagyása"
#: templates/settings.php:72
msgid "Only connect to the replica server."
-msgstr ""
+msgstr "Csak a másodlagos (másolati) kiszolgálóhoz kapcsolódjunk."
#: templates/settings.php:73
msgid "Use TLS"
@@ -238,7 +238,7 @@ msgstr "Ne ellenőrizzük az SSL-tanúsítvány érvényességét"
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 "Használata nem javasolt (kivéve tesztelési céllal). Ha a kapcsolat csak ezzel a beállítással működik, akkor importálja az LDAP-kiszolgáló SSL tanúsítványát a(z) %s kiszolgálóra!"
#: templates/settings.php:76
msgid "Cache Time-To-Live"
@@ -258,7 +258,7 @@ msgstr "A felhasználónév mezője"
#: templates/settings.php:80
msgid "The LDAP attribute to use to generate the user's display name."
-msgstr ""
+msgstr "Ebből az LDAP attribútumból képződik a felhasználó megjelenítendő neve."
#: templates/settings.php:81
msgid "Base User Tree"
@@ -282,7 +282,7 @@ msgstr "A csoport nevének mezője"
#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the groups's display name."
-msgstr ""
+msgstr "Ebből az LDAP attribútumból képződik a csoport megjelenítendő neve."
#: templates/settings.php:84
msgid "Base Group Tree"
@@ -348,7 +348,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 "Alapértelmezetten a belső felhasználónév az UUID tulajdonságból jön létre. Ez biztosítja a felhasználónév egyediségét és hogy a nem kell konvertálni a karaktereket benne. A belső felhasználónévnél a megkötés az, hogy csak a következő karakterek engdélyezettek benne: [ a-zA-Z0-9_.@- ]. Ezeken a karaktereken kivül minden karakter le lesz cserélve az adott karakter ASCII kódtáblában használható párjára vagy ha ilyen nincs akkor egyszerűen ki lesz hagyva. Ha így mégis ütköznének a nevek akkor hozzá lesz füzve egy folyamatosan növekvő számláló rész. A belső felhasználónevet lehet használni a felhasználó azonosítására a programon belül. Illetve ez lesz az alapáértelmezett neve a felhasználó kezdő könyvtárának az ownCloud-ban. Illetve..............................."
#: templates/settings.php:100
msgid "Internal Username Attribute:"
diff --git a/l10n/hu_HU/user_webdavauth.po b/l10n/hu_HU/user_webdavauth.po
index fd49829f9c598ac1c8caced3085c68eb23c32d69..35d7f6c9136ef78a6b357c1a3f36c10d77d5a142 100644
--- a/l10n/hu_HU/user_webdavauth.po
+++ b/l10n/hu_HU/user_webdavauth.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-07-27 01:56-0400\n"
-"PO-Revision-Date: 2013-07-27 05:57+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-30 10:16-0400\n"
+"PO-Revision-Date: 2013-09-30 00:32+0000\n"
+"Last-Translator: ebela <bela@dandre.hu>\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -25,11 +25,11 @@ msgstr "WebDAV hitelesítés"
#: templates/settings.php:4
msgid "Address: "
-msgstr ""
+msgstr "Címek:"
#: 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 ""
+msgstr "A felhasználói hitelesítő adatai el lesznek küldve erre a címre. Ez a bővítőmodul leellenőrzi a választ és ha a HTTP hibakód nem 401 vagy 403 azaz érvénytelen a hitelesítő adat, akkor minden más válasz érvényes lesz."
diff --git a/l10n/hy/core.po b/l10n/hy/core.po
index 22460f69ddf04647015c024bbb53516d322327f8..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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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"
@@ -22,6 +22,10 @@ msgstr ""
msgid "%s shared »%s« with you"
msgstr ""
+#: ajax/share.php:227
+msgid "group"
+msgstr ""
+
#: ajax/update.php:11
msgid "Turned on maintenance mode"
msgstr ""
@@ -86,6 +90,26 @@ msgstr ""
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 "Կիրակի"
@@ -162,59 +186,59 @@ msgstr "Նոյեմբեր"
msgid "December"
msgstr "Դեկտեմբեր"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr ""
-#: js/js.js:812
+#: js/js.js:866
msgid "seconds ago"
msgstr ""
-#: js/js.js:813
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:814
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:815
+#: js/js.js:869
msgid "today"
msgstr ""
-#: js/js.js:816
+#: js/js.js:870
msgid "yesterday"
msgstr ""
-#: js/js.js:817
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:818
+#: js/js.js:872
msgid "last month"
msgstr ""
-#: js/js.js:819
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:820
+#: js/js.js:874
msgid "months ago"
msgstr ""
-#: js/js.js:821
+#: js/js.js:875
msgid "last year"
msgstr ""
-#: js/js.js:822
+#: js/js.js:876
msgid "years ago"
msgstr ""
@@ -222,22 +246,66 @@ msgstr ""
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:195
+#: 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."
@@ -247,7 +315,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:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr ""
@@ -267,7 +335,7 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr ""
@@ -323,67 +391,67 @@ msgstr ""
msgid "Expiration date"
msgstr ""
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr ""
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr ""
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr ""
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr ""
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr ""
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr ""
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr ""
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr ""
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr ""
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr ""
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr ""
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr ""
@@ -398,7 +466,7 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr ""
@@ -467,7 +535,7 @@ msgstr ""
msgid "Users"
msgstr ""
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr ""
@@ -596,14 +664,10 @@ msgstr ""
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr ""
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr ""
@@ -618,19 +682,19 @@ msgstr ""
msgid "Please change your password to secure your account again."
msgstr ""
-#: templates/login.php:34
+#: templates/login.php:32
msgid "Lost your password?"
msgstr ""
-#: templates/login.php:39
+#: templates/login.php:37
msgid "remember"
msgstr ""
-#: templates/login.php:41
+#: templates/login.php:39
msgid "Log in"
msgstr ""
-#: templates/login.php:47
+#: templates/login.php:45
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/hy/files.po b/l10n/hy/files.po
index e645c744ff4017647d38d74951a1005f322d4eca..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-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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,7 +74,15 @@ msgstr ""
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:123
+#: 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 ""
@@ -82,149 +90,157 @@ 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: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:277 js/file-upload.js:293 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:465
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr ""
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr ""
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr ""
-#: js/filelist.js:303
+#: js/filelist.js:416
msgid "suggest name"
msgstr ""
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr ""
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr ""
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "undo"
msgstr ""
-#: js/filelist.js:453
-msgid "Uploading %n file"
-msgid_plural "Uploading %n files"
+#: 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:518
-msgid "files uploading"
+#: 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/files.js:52
+#: 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: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 ""
-#: js/files.js:580
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/files.js:586
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-
#: lib/app.php:73
#, php-format
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 ""
@@ -260,84 +276,68 @@ 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 ""
-#: templates/part.list.php:74
-msgid "directory"
-msgstr ""
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr ""
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr ""
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr ""
-
#: templates/upgrade.php:2
msgid "Upgrading filesystem cache..."
msgstr ""
diff --git a/l10n/hy/lib.po b/l10n/hy/lib.po
index 63acadec4f140b172f61c695d4bc9ed0024fa4e4..d1e8def17c4dd41a922e9edd5adff3fe0b34c49b 100644
--- a/l10n/hy/lib.po
+++ b/l10n/hy/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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\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"
"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
"MIME-Version: 1.0\n"
@@ -48,11 +48,23 @@ msgstr ""
msgid "Admin"
msgstr ""
-#: app.php:837
+#: 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 ""
@@ -105,37 +117,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: 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:150
+#: 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:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -264,51 +276,51 @@ msgstr ""
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr ""
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr ""
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr ""
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr ""
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr ""
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr ""
diff --git a/l10n/hy/settings.po b/l10n/hy/settings.po
index fe701e6fee7bf23e77c75aaa5e7a6683b2b2550b..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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+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,55 +84,88 @@ msgstr ""
msgid "Couldn't update app."
msgstr ""
-#: js/apps.js:35
+#: 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:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr ""
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr ""
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr ""
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr ""
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr ""
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr ""
-#: js/personal.js:150
+#: 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:172
+#: js/personal.js:287
msgid "Saving..."
msgstr ""
@@ -148,16 +181,16 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: 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:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr ""
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "Ջնջել"
@@ -177,7 +210,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr ""
@@ -343,11 +376,11 @@ msgstr ""
msgid "Less"
msgstr ""
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr ""
-#: templates/admin.php:246 templates/personal.php:143
+#: 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 "
@@ -414,7 +447,7 @@ msgstr ""
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:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr ""
@@ -438,7 +471,7 @@ msgstr ""
msgid "Change password"
msgstr ""
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr ""
@@ -454,38 +487,66 @@ msgstr ""
msgid "Fill in an email address to enable password recovery"
msgstr ""
-#: templates/personal.php:85 templates/personal.php:86
-msgid "Language"
+#: 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:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:106
+#: 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:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr ""
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -511,30 +572,30 @@ msgstr ""
msgid "Default Storage"
msgstr ""
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr ""
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "Այլ"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr ""
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr ""
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr ""
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr ""
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr ""
diff --git a/l10n/ia/core.po b/l10n/ia/core.po
index 72f712753e1e6fcda258e1849ea34b1c890f8b8d..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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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"
@@ -22,6 +22,10 @@ msgstr ""
msgid "%s shared »%s« with you"
msgstr ""
+#: ajax/share.php:227
+msgid "group"
+msgstr ""
+
#: ajax/update.php:11
msgid "Turned on maintenance mode"
msgstr ""
@@ -86,6 +90,26 @@ msgstr ""
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 "Dominica"
@@ -162,59 +186,59 @@ msgstr "Novembre"
msgid "December"
msgstr "Decembre"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "Configurationes"
-#: js/js.js:812
+#: js/js.js:866
msgid "seconds ago"
msgstr ""
-#: js/js.js:813
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:814
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:815
+#: js/js.js:869
msgid "today"
msgstr ""
-#: js/js.js:816
+#: js/js.js:870
msgid "yesterday"
msgstr ""
-#: js/js.js:817
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:818
+#: js/js.js:872
msgid "last month"
msgstr ""
-#: js/js.js:819
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:820
+#: js/js.js:874
msgid "months ago"
msgstr ""
-#: js/js.js:821
+#: js/js.js:875
msgid "last year"
msgstr ""
-#: js/js.js:822
+#: js/js.js:876
msgid "years ago"
msgstr ""
@@ -222,22 +246,66 @@ msgstr ""
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:195
+#: 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 "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."
@@ -247,7 +315,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:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "Error"
@@ -267,7 +335,7 @@ msgstr ""
msgid "Share"
msgstr "Compartir"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr ""
@@ -323,67 +391,67 @@ msgstr ""
msgid "Expiration date"
msgstr ""
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr ""
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr ""
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr ""
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr ""
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr ""
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr ""
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr ""
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr ""
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr ""
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr ""
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr ""
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr ""
@@ -398,7 +466,7 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr ""
@@ -467,7 +535,7 @@ msgstr "Personal"
msgid "Users"
msgstr "Usatores"
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "Applicationes"
@@ -596,14 +664,10 @@ msgstr ""
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "Clauder le session"
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr ""
@@ -618,19 +682,19 @@ msgstr ""
msgid "Please change your password to secure your account again."
msgstr ""
-#: templates/login.php:34
+#: templates/login.php:32
msgid "Lost your password?"
msgstr "Tu perdeva le contrasigno?"
-#: templates/login.php:39
+#: templates/login.php:37
msgid "remember"
msgstr "memora"
-#: templates/login.php:41
+#: templates/login.php:39
msgid "Log in"
msgstr "Aperir session"
-#: templates/login.php:47
+#: templates/login.php:45
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/ia/files.po b/l10n/ia/files.po
index 6000c6cf607cad244378927a44663377d96be178..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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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,7 +74,15 @@ msgstr ""
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:123
+#: 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 ""
@@ -82,149 +90,157 @@ 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: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:277 js/file-upload.js:293 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 "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:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr ""
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr ""
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr ""
-#: js/filelist.js:303
+#: js/filelist.js:416
msgid "suggest name"
msgstr ""
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr ""
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr ""
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "undo"
msgstr ""
-#: js/filelist.js:453
-msgid "Uploading %n file"
-msgid_plural "Uploading %n files"
+#: 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:518
-msgid "files uploading"
+#: 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/files.js:52
+#: 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: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 "Nomine"
-#: js/files.js:563 templates/index.php:78
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "Dimension"
-#: js/files.js:564 templates/index.php:80
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr "Modificate"
-#: js/files.js:580
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/files.js:586
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-
#: lib/app.php:73
#, php-format
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"
@@ -260,84 +276,68 @@ 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:73
+#: templates/index.php:67
msgid "Download"
msgstr "Discargar"
-#: 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 "Deler"
-#: templates/index.php:105
+#: templates/index.php:100
msgid "Upload too large"
msgstr "Incargamento troppo longe"
-#: 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 ""
-#: templates/part.list.php:74
-msgid "directory"
-msgstr ""
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr ""
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr ""
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr ""
-
#: templates/upgrade.php:2
msgid "Upgrading filesystem cache..."
msgstr ""
diff --git a/l10n/ia/files_sharing.po b/l10n/ia/files_sharing.po
index 6fb91fb6c7ead5c350d2a969084e7a51b70efec3..83dfe3acf59faeff12865047ce6c5a6847b6a655 100644
--- a/l10n/ia/files_sharing.po
+++ b/l10n/ia/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00: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"
@@ -63,7 +63,7 @@ msgstr ""
msgid "%s shared the file %s with you"
msgstr ""
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "Discargar"
@@ -75,6 +75,6 @@ msgstr "Incargar"
msgid "Cancel upload"
msgstr ""
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr ""
diff --git a/l10n/ia/lib.po b/l10n/ia/lib.po
index 5a963a58e296dd4978857774c4aae956b4f566d0..3f1800a5b6a5b8b5c1cf280767c539dddedce4b1 100644
--- a/l10n/ia/lib.po
+++ b/l10n/ia/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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\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"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
@@ -48,11 +48,23 @@ msgstr "Usatores"
msgid "Admin"
msgstr "Administration"
-#: app.php:837
+#: 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 "servicios web sub tu controlo"
@@ -105,37 +117,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: 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:150
+#: 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:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -264,51 +276,51 @@ msgstr ""
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr ""
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr ""
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr ""
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr ""
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr ""
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr ""
diff --git a/l10n/ia/settings.po b/l10n/ia/settings.po
index d43c46e1de059d3e0db297876d9311af931f4c6e..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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+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,55 +84,88 @@ msgstr ""
msgid "Couldn't update app."
msgstr ""
-#: js/apps.js:35
+#: 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:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr ""
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr ""
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr ""
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "Error"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr "Actualisar"
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr ""
-#: js/personal.js:150
+#: 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:172
+#: js/personal.js:287
msgid "Saving..."
msgstr ""
@@ -148,16 +181,16 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "Gruppos"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr ""
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "Deler"
@@ -177,7 +210,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "Interlingua"
@@ -343,11 +376,11 @@ msgstr "Plus"
msgid "Less"
msgstr ""
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr ""
-#: templates/admin.php:246 templates/personal.php:143
+#: 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 "
@@ -414,7 +447,7 @@ msgstr ""
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:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "Contrasigno"
@@ -438,7 +471,7 @@ msgstr "Nove contrasigno"
msgid "Change password"
msgstr "Cambiar contrasigno"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr ""
@@ -454,38 +487,66 @@ msgstr "Tu adresse de e-posta"
msgid "Fill in an email address to enable password recovery"
msgstr ""
-#: templates/personal.php:85 templates/personal.php:86
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr "Imagine de profilo"
+
+#: 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 "Linguage"
-#: templates/personal.php:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "Adjuta a traducer"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:106
+#: 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:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr ""
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -511,30 +572,30 @@ msgstr ""
msgid "Default Storage"
msgstr ""
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr ""
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "Altere"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "Nomine de usator"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr ""
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr ""
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr ""
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr ""
diff --git a/l10n/ia/user_ldap.po b/l10n/ia/user_ldap.po
index a8bd30ff193071d82c7413148017b935511a9220..d67d3ec71b9409291f393db32f578e39377c97b1 100644
--- a/l10n/ia/user_ldap.po
+++ b/l10n/ia/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\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"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/id/core.po b/l10n/id/core.po
index 52e9cf631dad2e5a2a98d52216f493b4a0eeb713..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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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"
@@ -22,6 +22,10 @@ msgstr ""
msgid "%s shared »%s« with you"
msgstr ""
+#: ajax/share.php:227
+msgid "group"
+msgstr "grup"
+
#: ajax/update.php:11
msgid "Turned on maintenance mode"
msgstr ""
@@ -86,6 +90,26 @@ msgstr "Tidak ada kategori terpilih untuk dihapus."
msgid "Error removing %s from favorites."
msgstr "Galat ketika menghapus %s dari favorit"
+#: 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 "Minggu"
@@ -162,55 +186,55 @@ msgstr "November"
msgid "December"
msgstr "Desember"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "Setelan"
-#: js/js.js:812
+#: js/js.js:866
msgid "seconds ago"
msgstr "beberapa detik yang lalu"
-#: js/js.js:813
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: js/js.js:814
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: js/js.js:815
+#: js/js.js:869
msgid "today"
msgstr "hari ini"
-#: js/js.js:816
+#: js/js.js:870
msgid "yesterday"
msgstr "kemarin"
-#: js/js.js:817
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
-#: js/js.js:818
+#: js/js.js:872
msgid "last month"
msgstr "bulan kemarin"
-#: js/js.js:819
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: js/js.js:820
+#: js/js.js:874
msgid "months ago"
msgstr "beberapa bulan lalu"
-#: js/js.js:821
+#: js/js.js:875
msgid "last year"
msgstr "tahun kemarin"
-#: js/js.js:822
+#: js/js.js:876
msgid "years ago"
msgstr "beberapa tahun lalu"
@@ -218,22 +242,65 @@ msgstr "beberapa tahun lalu"
msgid "Choose"
msgstr "Pilih"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "Ya"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "Tidak"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr "Oke"
+#: 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] ""
+
+#: 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."
@@ -243,7 +310,7 @@ msgstr "Tipe objek tidak ditentukan."
#: 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:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "Galat"
@@ -263,7 +330,7 @@ msgstr "Dibagikan"
msgid "Share"
msgstr "Bagikan"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr "Galat ketika membagikan"
@@ -319,67 +386,67 @@ msgstr "Setel tanggal kedaluwarsa"
msgid "Expiration date"
msgstr "Tanggal kedaluwarsa"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "Bagian lewat email:"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "Tidak ada orang ditemukan"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "Berbagi ulang tidak diizinkan"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr "Dibagikan dalam {item} dengan {user}"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "Batalkan berbagi"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "dapat mengedit"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "kontrol akses"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "buat"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "perbarui"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "hapus"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "bagikan"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "Dilindungi sandi"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr "Galat ketika menghapus tanggal kedaluwarsa"
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr "Galat ketika menyetel tanggal kedaluwarsa"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr "Mengirim ..."
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr "Email terkirim"
@@ -394,7 +461,7 @@ msgstr "Pembaruan gagal. Silakan laporkan masalah ini ke <a href=\"https://githu
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Pembaruan sukses. Anda akan diarahkan ulang ke ownCloud."
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr ""
@@ -463,7 +530,7 @@ msgstr "Pribadi"
msgid "Users"
msgstr "Pengguna"
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "Aplikasi"
@@ -592,14 +659,10 @@ msgstr "Selesaikan instalasi"
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "Keluar"
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "Masuk otomatis ditolak!"
@@ -614,19 +677,19 @@ msgstr "Jika tidak pernah mengubah sandi Anda baru-baru ini, akun Anda mungkin d
msgid "Please change your password to secure your account again."
msgstr "Mohon ubah sandi Anda untuk mengamankan kembali akun Anda."
-#: templates/login.php:34
+#: templates/login.php:32
msgid "Lost your password?"
msgstr "Lupa sandi?"
-#: templates/login.php:39
+#: templates/login.php:37
msgid "remember"
msgstr "selalu masuk"
-#: templates/login.php:41
+#: templates/login.php:39
msgid "Log in"
msgstr "Masuk"
-#: templates/login.php:47
+#: templates/login.php:45
msgid "Alternative Logins"
msgstr "Cara Alternatif untuk Masuk"
diff --git a/l10n/id/files.po b/l10n/id/files.po
index 467e1dd2a345590f13a06690ffa99764d62bb850..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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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,7 +74,15 @@ msgstr "Gagal menulis ke disk"
msgid "Not enough storage available"
msgstr "Ruang penyimpanan tidak mencukupi"
-#: ajax/upload.php:123
+#: 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 "Direktori tidak valid."
@@ -82,146 +90,154 @@ 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: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 "Berkas sedang diunggah. Meninggalkan halaman ini akan membatalkan proses."
-#: js/file-upload.js:241
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr "URL tidak boleh kosong"
-#: 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:277 js/file-upload.js:293 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 "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:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "Menunggu"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{new_name} sudah ada"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "ganti"
-#: js/filelist.js:303
+#: js/filelist.js:416
msgid "suggest name"
msgstr "sarankan nama"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "batalkan"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr "mengganti {new_name} dengan {old_name}"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "undo"
msgstr "urungkan"
-#: js/filelist.js:453
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+
+#: 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] ""
-#: js/filelist.js:518
-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: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 "Nama"
-#: js/files.js:563 templates/index.php:78
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "Ukuran"
-#: js/files.js:564 templates/index.php:80
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr "Dimodifikasi"
-#: js/files.js:580
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-
-#: js/files.js:586
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-
#: lib/app.php:73
#, php-format
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"
@@ -257,84 +273,68 @@ 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:73
+#: templates/index.php:67
msgid "Download"
msgstr "Unduh"
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr "Batalkan berbagi"
-#: templates/index.php:91 templates/index.php:92
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "Hapus"
-#: templates/index.php:105
+#: templates/index.php:100
msgid "Upload too large"
msgstr "Yang diunggah terlalu besar"
-#: 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 "Berkas yang dicoba untuk diunggah melebihi ukuran maksimum pengunggahan berkas di server ini."
-#: templates/index.php:112
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr "Berkas sedang dipindai, silakan tunggu."
-#: templates/index.php:115
+#: templates/index.php:110
msgid "Current scanning"
msgstr "Yang sedang dipindai"
-#: templates/part.list.php:74
-msgid "directory"
-msgstr ""
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr ""
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr "berkas"
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr "berkas-berkas"
-
#: templates/upgrade.php:2
msgid "Upgrading filesystem cache..."
msgstr "Meningkatkan tembolok sistem berkas..."
diff --git a/l10n/id/files_sharing.po b/l10n/id/files_sharing.po
index 1a7fb0fbb081806e14ad5c49cc2f52e0481f667d..4c5ff880016877c7dfbfb786bf0f63320bdeb6e8 100644
--- a/l10n/id/files_sharing.po
+++ b/l10n/id/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00: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"
@@ -63,7 +63,7 @@ msgstr "%s membagikan folder %s dengan Anda"
msgid "%s shared the file %s with you"
msgstr "%s membagikan file %s dengan Anda"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "Unduh"
@@ -75,6 +75,6 @@ msgstr "Unggah"
msgid "Cancel upload"
msgstr "Batal pengunggahan"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "Tidak ada pratinjau tersedia untuk"
diff --git a/l10n/id/lib.po b/l10n/id/lib.po
index 1b7a594f547209a21a3c6209494cca7af0ed2251..8aa1ab9b7cee1072c233cf947e6b4c5b409b7f0f 100644
--- a/l10n/id/lib.po
+++ b/l10n/id/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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\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"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
@@ -48,11 +48,23 @@ msgstr "Pengguna"
msgid "Admin"
msgstr "Admin"
-#: app.php:837
+#: 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 "layanan web dalam kontrol Anda"
@@ -105,37 +117,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: 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:150
+#: 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:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -264,47 +276,47 @@ msgstr "Web server Anda belum dikonfigurasikan dengan baik untuk mengizinkan sin
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Silakan periksa ulang <a href='%s'>panduan instalasi</a>."
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "beberapa detik yang lalu"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "hari ini"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "kemarin"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "bulan kemarin"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "tahun kemarin"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "beberapa tahun lalu"
diff --git a/l10n/id/settings.po b/l10n/id/settings.po
index 4940f179f89996a76c7d0d36ff6ab4c5c09b0cad..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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+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,55 +84,88 @@ msgstr "Tidak dapat menghapus pengguna dari grup %s"
msgid "Couldn't update app."
msgstr "Tidak dapat memperbarui aplikasi."
-#: js/apps.js:35
+#: 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}"
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr "Nonaktifkan"
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr "aktifkan"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr "Mohon tunggu...."
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr "Memperbarui...."
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr "Gagal ketika memperbarui aplikasi"
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "Galat"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr "Perbarui"
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr "Diperbarui"
-#: js/personal.js:150
+#: 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:172
+#: js/personal.js:287
msgid "Saving..."
msgstr "Menyimpan..."
@@ -148,16 +181,16 @@ msgstr "urungkan"
msgid "Unable to remove user"
msgstr "Tidak dapat menghapus pengguna"
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "Grup"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "Admin Grup"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "Hapus"
@@ -177,7 +210,7 @@ msgstr "Gagal membuat pengguna"
msgid "A valid password must be provided"
msgstr "Tuliskan sandi yang valid"
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "__language_name__"
@@ -343,11 +376,11 @@ msgstr "Lainnya"
msgid "Less"
msgstr "Ciutkan"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "Versi"
-#: templates/admin.php:246 templates/personal.php:143
+#: 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 "
@@ -414,7 +447,7 @@ msgstr "Tampilkan Penuntun Konfigurasi Awal"
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Anda telah menggunakan <strong>%s</strong> dari total <strong>%s</strong>"
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "Sandi"
@@ -438,7 +471,7 @@ msgstr "Sandi baru"
msgid "Change password"
msgstr "Ubah sandi"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr "Nama Tampilan"
@@ -454,38 +487,66 @@ msgstr "Alamat email Anda"
msgid "Fill in an email address to enable password recovery"
msgstr "Masukkan alamat email untuk mengaktifkan pemulihan sandi"
-#: templates/personal.php:85 templates/personal.php:86
+#: 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 "Bahasa"
-#: templates/personal.php:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "Bantu menerjemahkan"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: 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:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "Enkripsi"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -511,30 +572,30 @@ msgstr ""
msgid "Default Storage"
msgstr "Penyimpanan Baku"
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr "Tak terbatas"
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "Lainnya"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "Nama pengguna"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr "Penyimpanan"
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr "ubah nama tampilan"
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr "setel sandi baru"
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr "Baku"
diff --git a/l10n/id/user_ldap.po b/l10n/id/user_ldap.po
index e165b0b8d33f0ad70a144410cb0a15891e85c3d0..bb775d8df95e66822118619aa445aadea6fa96c2 100644
--- a/l10n/id/user_ldap.po
+++ b/l10n/id/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\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"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/is/core.po b/l10n/is/core.po
index fd37488550a7169a2a4ff838394610431216f69a..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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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"
@@ -23,6 +23,10 @@ msgstr ""
msgid "%s shared »%s« with you"
msgstr ""
+#: ajax/share.php:227
+msgid "group"
+msgstr ""
+
#: ajax/update.php:11
msgid "Turned on maintenance mode"
msgstr ""
@@ -87,6 +91,26 @@ msgstr "Enginn flokkur valinn til eyðingar."
msgid "Error removing %s from favorites."
msgstr "Villa við að fjarlægja %s úr eftirlæti."
+#: 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 "Sunnudagur"
@@ -163,59 +187,59 @@ msgstr "Nóvember"
msgid "December"
msgstr "Desember"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "Stillingar"
-#: js/js.js:812
+#: js/js.js:866
msgid "seconds ago"
msgstr "sek."
-#: js/js.js:813
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:814
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:815
+#: js/js.js:869
msgid "today"
msgstr "í dag"
-#: js/js.js:816
+#: js/js.js:870
msgid "yesterday"
msgstr "í gær"
-#: js/js.js:817
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:818
+#: js/js.js:872
msgid "last month"
msgstr "síðasta mánuði"
-#: js/js.js:819
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:820
+#: js/js.js:874
msgid "months ago"
msgstr "mánuðir síðan"
-#: js/js.js:821
+#: js/js.js:875
msgid "last year"
msgstr "síðasta ári"
-#: js/js.js:822
+#: js/js.js:876
msgid "years ago"
msgstr "einhverjum árum"
@@ -223,22 +247,66 @@ msgstr "einhverjum árum"
msgid "Choose"
msgstr "Veldu"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "Já"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "Nei"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr "Í lagi"
+#: 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 "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."
@@ -248,7 +316,7 @@ msgstr "Tegund ekki tilgreind"
#: 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:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "Villa"
@@ -268,7 +336,7 @@ msgstr "Deilt"
msgid "Share"
msgstr "Deila"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr "Villa við deilingu"
@@ -324,67 +392,67 @@ msgstr "Setja gildistíma"
msgid "Expiration date"
msgstr "Gildir til"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "Deila með tölvupósti:"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "Engir notendur fundust"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "Endurdeiling er ekki leyfð"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr "Deilt með {item} ásamt {user}"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "Hætta deilingu"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "getur breytt"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "aðgangsstýring"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "mynda"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "uppfæra"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "eyða"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "deila"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "Verja með lykilorði"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr "Villa við að aftengja gildistíma"
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr "Villa við að setja gildistíma"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr "Sendi ..."
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr "Tölvupóstur sendur"
@@ -399,7 +467,7 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Uppfærslan heppnaðist. Beini þér til ownCloud nú."
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr ""
@@ -468,7 +536,7 @@ msgstr "Um mig"
msgid "Users"
msgstr "Notendur"
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "Forrit"
@@ -597,14 +665,10 @@ msgstr "Virkja uppsetningu"
msgid "%s is available. Get more information on how to update."
msgstr "%s er til boða. Fáðu meiri upplýsingar um hvernig þú uppfærir."
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "Útskrá"
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "Sjálfvirkri innskráningu hafnað!"
@@ -619,19 +683,19 @@ msgstr "Ef þú breyttir ekki lykilorðinu þínu fyrir skömmu, er mögulegt a
msgid "Please change your password to secure your account again."
msgstr "Vinsamlegast breyttu lykilorðinu þínu til að tryggja öryggi þitt."
-#: templates/login.php:34
+#: templates/login.php:32
msgid "Lost your password?"
msgstr "Týndir þú lykilorðinu?"
-#: templates/login.php:39
+#: templates/login.php:37
msgid "remember"
msgstr "muna eftir mér"
-#: templates/login.php:41
+#: templates/login.php:39
msgid "Log in"
msgstr "<strong>Skrá inn</strong>"
-#: templates/login.php:47
+#: templates/login.php:45
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/is/files.po b/l10n/is/files.po
index 64dc57bc97f684b91b081493a9163e9b51708ac9..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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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,7 +74,15 @@ msgstr "Tókst ekki að skrifa á disk"
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:123
+#: 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 "Ógild mappa."
@@ -82,149 +90,157 @@ 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: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 "Innsending í gangi. Ef þú ferð af þessari síðu mun innsending misheppnast."
-#: js/file-upload.js:241
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr "Vefslóð má ekki vera tóm."
-#: 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:277 js/file-upload.js:293 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 "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:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "Bíður"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{new_name} er þegar til"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "yfirskrifa"
-#: js/filelist.js:303
+#: js/filelist.js:416
msgid "suggest name"
msgstr "stinga upp á nafni"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "hætta við"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr "yfirskrifaði {new_name} með {old_name}"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "undo"
msgstr "afturkalla"
-#: js/filelist.js:453
-msgid "Uploading %n file"
-msgid_plural "Uploading %n files"
+#: 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:518
-msgid "files uploading"
+#: 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/files.js:52
+#: 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 "'.' 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: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 "Nafn"
-#: js/files.js:563 templates/index.php:78
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "Stærð"
-#: js/files.js:564 templates/index.php:80
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr "Breytt"
-#: js/files.js:580
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/files.js:586
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-
#: lib/app.php:73
#, php-format
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"
@@ -260,84 +276,68 @@ 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:73
+#: templates/index.php:67
msgid "Download"
msgstr "Niðurhal"
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr "Hætta deilingu"
-#: templates/index.php:91 templates/index.php:92
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "Eyða"
-#: templates/index.php:105
+#: templates/index.php:100
msgid "Upload too large"
msgstr "Innsend skrá er of stór"
-#: 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 "Skrárnar sem þú ert að senda inn eru stærri en hámarks innsendingarstærð á þessum netþjóni."
-#: templates/index.php:112
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr "Verið er að skima skrár, vinsamlegast hinkraðu."
-#: templates/index.php:115
+#: templates/index.php:110
msgid "Current scanning"
msgstr "Er að skima"
-#: templates/part.list.php:74
-msgid "directory"
-msgstr ""
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr ""
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr ""
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr ""
-
#: templates/upgrade.php:2
msgid "Upgrading filesystem cache..."
msgstr ""
diff --git a/l10n/is/files_sharing.po b/l10n/is/files_sharing.po
index 20e744006b83ae3f38db3568d4ef8992d941cf9f..bfd1462e0561c1a47870de6038994ffafffa28e7 100644
--- a/l10n/is/files_sharing.po
+++ b/l10n/is/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00: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"
@@ -63,7 +63,7 @@ msgstr "%s deildi möppunni %s með þér"
msgid "%s shared the file %s with you"
msgstr "%s deildi skránni %s með þér"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "Niðurhal"
@@ -75,6 +75,6 @@ msgstr "Senda inn"
msgid "Cancel upload"
msgstr "Hætta við innsendingu"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "Yfirlit ekki í boði fyrir"
diff --git a/l10n/is/lib.po b/l10n/is/lib.po
index a1bfd8deb4bdb614bc8968e8f03e4ab06eba62c4..c814613bdc2fe0a12dc156cb9ce0ce88f9c8a6b7 100644
--- a/l10n/is/lib.po
+++ b/l10n/is/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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\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"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
@@ -48,11 +48,23 @@ msgstr "Notendur"
msgid "Admin"
msgstr "Stjórnun"
-#: app.php:837
+#: 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 "vefþjónusta undir þinni stjórn"
@@ -105,37 +117,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: 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:150
+#: 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:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -264,51 +276,51 @@ msgstr ""
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "sek."
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "í dag"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "í gær"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "síðasta mánuði"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "síðasta ári"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "einhverjum árum"
diff --git a/l10n/is/settings.po b/l10n/is/settings.po
index 5f777e83b7c378901e1fe9d85df0e4544b19c13c..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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+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,55 +85,88 @@ msgstr "Ekki tókst að fjarlægja notanda úr hópnum %s"
msgid "Couldn't update app."
msgstr ""
-#: js/apps.js:35
+#: 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:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr "Gera óvirkt"
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr "Virkja"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr "Andartak...."
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr "Uppfæri..."
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "Villa"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr "Uppfæra"
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr "Uppfært"
-#: js/personal.js:150
+#: 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:172
+#: js/personal.js:287
msgid "Saving..."
msgstr "Er að vista ..."
@@ -149,16 +182,16 @@ msgstr "afturkalla"
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "Hópar"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "Hópstjóri"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "Eyða"
@@ -178,7 +211,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "__nafn_tungumáls__"
@@ -344,11 +377,11 @@ msgstr "Meira"
msgid "Less"
msgstr "Minna"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "Útgáfa"
-#: templates/admin.php:246 templates/personal.php:143
+#: 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 "
@@ -415,7 +448,7 @@ msgstr ""
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Þú hefur notað <strong>%s</strong> af tiltæku <strong>%s</strong>"
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "Lykilorð"
@@ -439,7 +472,7 @@ msgstr "Nýtt lykilorð"
msgid "Change password"
msgstr "Breyta lykilorði"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr "Vísa nafn"
@@ -455,38 +488,66 @@ msgstr "Netfangið þitt"
msgid "Fill in an email address to enable password recovery"
msgstr "Sláðu inn netfangið þitt til að virkja endurheimt á lykilorði"
-#: templates/personal.php:85 templates/personal.php:86
+#: 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 "Tungumál"
-#: templates/personal.php:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "Hjálpa við þýðingu"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: 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:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "Dulkóðun"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -512,30 +573,30 @@ msgstr ""
msgid "Default Storage"
msgstr "Sjálfgefin gagnageymsla"
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr "Ótakmarkað"
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "Annað"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "Notendanafn"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr "gagnapláss"
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr ""
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr ""
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr "Sjálfgefið"
diff --git a/l10n/is/user_ldap.po b/l10n/is/user_ldap.po
index 389e4c206efd965edd34912525eda86e23a23719..5f4609f359bbae18b85765961add4cd3df3debd6 100644
--- a/l10n/is/user_ldap.po
+++ b/l10n/is/user_ldap.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-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\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"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/it/core.po b/l10n/it/core.po
index 7510ac70b56bc7db624f8ca7515b25c076978555..a5586707e43675c73575defaada6de1811419f55 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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-29 00:02-0400\n"
+"PO-Revision-Date: 2013-09-27 18:30+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"
@@ -25,30 +26,34 @@ msgstr ""
msgid "%s shared »%s« with you"
msgstr "%s ha condiviso «%s» con te"
+#: ajax/share.php:227
+msgid "group"
+msgstr "gruppo"
+
#: ajax/update.php:11
msgid "Turned on maintenance mode"
-msgstr ""
+msgstr "Modalità di manutenzione attivata"
#: ajax/update.php:14
msgid "Turned off maintenance mode"
-msgstr ""
+msgstr "Modalità di manutenzione disattivata"
#: ajax/update.php:17
msgid "Updated database"
-msgstr ""
+msgstr "Database aggiornato"
#: ajax/update.php:20
msgid "Updating filecache, this may take really long..."
-msgstr ""
+msgstr "Aggiornamento della cache dei file in corso, potrebbe richiedere molto tempo..."
#: ajax/update.php:23
msgid "Updated filecache"
-msgstr ""
+msgstr "Cache dei file aggiornata"
#: ajax/update.php:26
#, php-format
msgid "... %d%% done ..."
-msgstr ""
+msgstr "... %d%% completato ..."
#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
msgid "Category type not provided."
@@ -89,6 +94,26 @@ msgstr "Nessuna categoria selezionata per l'eliminazione."
msgid "Error removing %s from favorites."
msgstr "Errore durante la rimozione di %s dai preferiti."
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr "Non è stata fornita alcun immagine o file"
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr "Tipo di file sconosciuto"
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr "Immagine non valida"
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr "Nessuna immagine di profilo provvisoria disponibile, riprova"
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr "Dati di ritaglio non forniti"
+
#: js/config.php:32
msgid "Sunday"
msgstr "Domenica"
@@ -165,59 +190,59 @@ msgstr "Novembre"
msgid "December"
msgstr "Dicembre"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "Impostazioni"
-#: js/js.js:812
+#: js/js.js:866
msgid "seconds ago"
msgstr "secondi fa"
-#: js/js.js:813
+#: 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:814
+#: 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:815
+#: js/js.js:869
msgid "today"
msgstr "oggi"
-#: js/js.js:816
+#: js/js.js:870
msgid "yesterday"
msgstr "ieri"
-#: js/js.js:817
+#: 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:818
+#: js/js.js:872
msgid "last month"
msgstr "mese scorso"
-#: js/js.js:819
+#: 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:820
+#: js/js.js:874
msgid "months ago"
msgstr "mesi fa"
-#: js/js.js:821
+#: js/js.js:875
msgid "last year"
msgstr "anno scorso"
-#: js/js.js:822
+#: js/js.js:876
msgid "years ago"
msgstr "anni fa"
@@ -225,22 +250,66 @@ msgstr "anni fa"
msgid "Choose"
msgstr "Scegli"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
-msgstr "Errore durante il caricamento del modello del selezionatore di file"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
+msgstr "Errore durante il caricamento del modello del selettore file: {error}"
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "Sì"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "No"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr "Ok"
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+msgstr "Errore durante il 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 file in conflitto"
+
+#: 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, sarà 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 i 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
msgid "The object type is not specified."
@@ -250,7 +319,7 @@ msgstr "Il tipo di oggetto non è specificato."
#: 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:643 js/share.js:655
+#: js/share.js:656 js/share.js:668
msgid "Error"
msgstr "Errore"
@@ -270,7 +339,7 @@ msgstr "Condivisi"
msgid "Share"
msgstr "Condividi"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:696
msgid "Error while sharing"
msgstr "Errore durante la condivisione"
@@ -326,67 +395,67 @@ msgstr "Imposta data di scadenza"
msgid "Expiration date"
msgstr "Data di scadenza"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "Condividi tramite email:"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "Non sono state trovate altre persone"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "La ri-condivisione non è consentita"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr "Condiviso in {item} con {user}"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "Rimuovi condivisione"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "può modificare"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "controllo d'accesso"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "creare"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "aggiornare"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "elimina"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "condividi"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:643
msgid "Password protected"
msgstr "Protetta da password"
-#: js/share.js:643
+#: js/share.js:656
msgid "Error unsetting expiration date"
msgstr "Errore durante la rimozione della data di scadenza"
-#: js/share.js:655
+#: js/share.js:668
msgid "Error setting expiration date"
msgstr "Errore durante l'impostazione della data di scadenza"
-#: js/share.js:670
+#: js/share.js:683
msgid "Sending ..."
msgstr "Invio in corso..."
-#: js/share.js:681
+#: js/share.js:694
msgid "Email sent"
msgstr "Messaggio inviato"
@@ -401,7 +470,7 @@ msgstr "L'aggiornamento non è riuscito. Segnala il problema alla <a href=\"http
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "L'aggiornamento è stato effettuato correttamente. Stai per essere reindirizzato a ownCloud."
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr "Ripristino password di %s"
@@ -470,7 +539,7 @@ msgstr "Personale"
msgid "Users"
msgstr "Utenti"
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "Applicazioni"
@@ -599,14 +668,10 @@ msgstr "Termina la configurazione"
msgid "%s is available. Get more information on how to update."
msgstr "%s è disponibile. Ottieni ulteriori informazioni sull'aggiornamento."
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "Esci"
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr "Altre applicazioni"
-
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "Accesso automatico rifiutato."
@@ -621,19 +686,19 @@ msgstr "Se non hai cambiato la password recentemente, il tuo account potrebbe es
msgid "Please change your password to secure your account again."
msgstr "Cambia la password per rendere nuovamente sicuro il tuo account."
-#: templates/login.php:34
+#: templates/login.php:32
msgid "Lost your password?"
msgstr "Hai perso la password?"
-#: templates/login.php:39
+#: templates/login.php:37
msgid "remember"
msgstr "ricorda"
-#: templates/login.php:41
+#: templates/login.php:39
msgid "Log in"
msgstr "Accedi"
-#: templates/login.php:47
+#: templates/login.php:45
msgid "Alternative Logins"
msgstr "Accessi alternativi"
diff --git a/l10n/it/files.po b/l10n/it/files.po
index 465bb80784f05a187417810076d8681f869ced8a..3b8b0f65394b9c77b6b4902b41bedb771dbbbbeb 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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-30 10:14-0400\n"
+"PO-Revision-Date: 2013-09-30 12:15+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"
@@ -76,157 +76,173 @@ msgstr "Scrittura su disco non riuscita"
msgid "Not enough storage available"
msgstr "Spazio di archiviazione insufficiente"
-#: ajax/upload.php:123
+#: ajax/upload.php:120 ajax/upload.php:143
+msgid "Upload failed. Could not get file info."
+msgstr "Caricamento non riuscito. Impossibile ottenere informazioni sul file."
+
+#: ajax/upload.php:136
+msgid "Upload failed. Could not find uploaded file"
+msgstr "Caricamento non riuscito. Impossibile trovare il 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 ha una dimensione 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:167
+#: 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:241
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr "L'URL non può essere vuoto."
-#: 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 "Nome della cartella non valido. L'uso di 'Shared' è riservato a ownCloud"
-#: js/file-upload.js:277 js/file-upload.js:293 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 "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:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "In corso"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{new_name} esiste già"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "sostituisci"
-#: js/filelist.js:303
+#: js/filelist.js:416
msgid "suggest name"
msgstr "suggerisci nome"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "annulla"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr "sostituito {new_name} con {old_name}"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "undo"
msgstr "annulla"
-#: js/filelist.js:453
+#: 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: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:541
+msgid "{dirs} and {files}"
+msgstr "{dirs} e {files}"
+
+#: 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:518
-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:562 templates/index.php:67
+#: 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:563 templates/index.php:78
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "Dimensione"
-#: js/files.js:564 templates/index.php:80
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr "Modificato"
-#: js/files.js:580
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] "%n cartella"
-msgstr[1] "%n cartelle"
-
-#: js/files.js:586
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] "%n file"
-msgstr[1] "%n file"
-
#: lib/app.php:73
#, php-format
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"
@@ -262,84 +278,68 @@ 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:73
+#: templates/index.php:67
msgid "Download"
msgstr "Scarica"
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr "Rimuovi condivisione"
-#: templates/index.php:91 templates/index.php:92
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "Elimina"
-#: templates/index.php:105
+#: templates/index.php:100
msgid "Upload too large"
msgstr "Caricamento troppo grande"
-#: 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 "I file che stai provando a caricare superano la dimensione massima consentita su questo server."
-#: templates/index.php:112
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr "Scansione dei file in corso, attendi"
-#: templates/index.php:115
+#: templates/index.php:110
msgid "Current scanning"
msgstr "Scansione corrente"
-#: templates/part.list.php:74
-msgid "directory"
-msgstr "cartella"
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr "cartelle"
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr "file"
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr "file"
-
#: templates/upgrade.php:2
msgid "Upgrading filesystem cache..."
msgstr "Aggiornamento della cache del filesystem in corso..."
diff --git a/l10n/it/files_sharing.po b/l10n/it/files_sharing.po
index f314ab509b10b01abc6b541fb6515942caeb01a7..01ae61c6aea21327bf43d549c37f2b8a83457695 100644
--- a/l10n/it/files_sharing.po
+++ b/l10n/it/files_sharing.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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:01+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"
@@ -65,7 +65,7 @@ msgstr "%s ha condiviso la cartella %s con te"
msgid "%s shared the file %s with you"
msgstr "%s ha condiviso il file %s con te"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "Scarica"
@@ -77,6 +77,6 @@ msgstr "Carica"
msgid "Cancel upload"
msgstr "Annulla il caricamento"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "Nessuna anteprima disponibile per"
diff --git a/l10n/it/lib.po b/l10n/it/lib.po
index 84dacdb52d2104697de4d695eb447525d231decb..27b7c76e85e1ba49620f6c453fc9b39281adc9f3 100644
--- a/l10n/it/lib.po
+++ b/l10n/it/lib.po
@@ -4,14 +4,15 @@
#
# Translators:
# Francesco Capuano <francesco@capu.it>, 2013
+# polxmod <paolo.velati@gmail.com>, 2013
# Vincenzo Reale <vinx.reale@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+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"
@@ -24,11 +25,11 @@ msgstr ""
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
-msgstr ""
+msgstr "L'applicazione \"%s\" non può essere installata poiché non è compatibile con questa versione di ownCloud."
#: app.php:250
msgid "No app name specified"
-msgstr ""
+msgstr "Il nome dell'applicazione non è specificato"
#: app.php:361
msgid "Help"
@@ -50,11 +51,23 @@ msgstr "Utenti"
msgid "Admin"
msgstr "Admin"
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "Aggiornamento non riuscito \"%s\"."
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr "Le immagini personalizzate del profilo non funzionano ancora con la cifratura"
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr "Tipo di file sconosciuto"
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr "Immagine non valida"
+
#: defaults.php:35
msgid "web services under your control"
msgstr "servizi web nelle tue mani"
@@ -88,59 +101,59 @@ msgstr "Scarica i file in blocchi più piccoli, separatamente o chiedi al tuo am
#: installer.php:63
msgid "No source specified when installing app"
-msgstr ""
+msgstr "Nessuna fonte specificata durante l'installazione dell'applicazione"
#: installer.php:70
msgid "No href specified when installing app from http"
-msgstr ""
+msgstr "Nessun href specificato durante l'installazione dell'applicazione da http"
#: installer.php:75
msgid "No path specified when installing app from local file"
-msgstr ""
+msgstr "Nessun percorso specificato durante l'installazione dell'applicazione da file locale"
#: installer.php:89
#, php-format
msgid "Archives of type %s are not supported"
-msgstr ""
+msgstr "Gli archivi di tipo %s non sono supportati"
#: installer.php:103
msgid "Failed to open archive when installing app"
-msgstr ""
+msgstr "Apertura archivio non riuscita durante l'installazione dell'applicazione"
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
-msgstr ""
+msgstr "L'applicazione non fornisce un file info.xml"
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
-msgstr ""
+msgstr "L'applicazione non può essere installata a causa di codice non consentito al suo interno"
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
-msgstr ""
+msgstr "L'applicazione non può essere installata poiché non è compatibile con questa versione di ownCloud"
-#: installer.php:144
+#: 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 "L'applicazione non può essere installata poiché contiene il tag <shipped>true<shipped> che non è permesso alle applicazioni non shipped"
-#: installer.php:150
+#: 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 "L'applicazione non può essere installata poiché la versione in info.xml/version non è la stessa riportata dall'app store"
-#: installer.php:160
+#: installer.php:162
msgid "App directory already exists"
-msgstr ""
+msgstr "La cartella dell'applicazione esiste già"
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
-msgstr ""
+msgstr "Impossibile creare la cartella dell'applicazione. Correggi i permessi. %s"
#: json.php:28
msgid "Application is not enabled"
@@ -154,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"
@@ -266,51 +279,51 @@ msgstr "Il tuo server web non è configurato correttamente per consentire la sin
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Leggi attentamente le <a href='%s'>guide d'installazione</a>."
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "secondi fa"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n minuto fa"
msgstr[1] "%n minuti fa"
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n ora fa"
msgstr[1] "%n ore fa"
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "oggi"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "ieri"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] "%n giorno fa"
msgstr[1] "%n giorni fa"
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "mese scorso"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n mese fa"
msgstr[1] "%n mesi fa"
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "anno scorso"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "anni fa"
diff --git a/l10n/it/settings.po b/l10n/it/settings.po
index 57cb219901f5cc08801355ea0b4bd09e05396e58..8248b45ef2445294ca1bcbb0d1c6773952ac36d8 100644
--- a/l10n/it/settings.po
+++ b/l10n/it/settings.po
@@ -5,14 +5,15 @@
# Translators:
# Francesco Apruzzese <cescoap@gmail.com>, 2013
# idetao <marcxosm@gmail.com>, 2013
+# polxmod <paolo.velati@gmail.com>, 2013
# Vincenzo Reale <vinx.reale@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-30 10:17-0400\n"
+"PO-Revision-Date: 2013-09-30 12:15+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"
@@ -25,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"
@@ -87,55 +88,88 @@ msgstr "Impossibile rimuovere l'utente dal gruppo %s"
msgid "Couldn't update app."
msgstr "Impossibile aggiornate l'applicazione."
-#: js/apps.js:35
+#: 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}"
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:110
msgid "Disable"
msgstr "Disabilita"
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
msgid "Enable"
msgstr "Abilita"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr "Attendere..."
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:101
msgid "Error while disabling app"
-msgstr ""
+msgstr "Errore durante la disattivazione"
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:100 js/apps.js:114 js/apps.js:115
msgid "Error while enabling app"
-msgstr ""
+msgstr "Errore durante l'attivazione"
-#: js/apps.js:115
+#: js/apps.js:125
msgid "Updating...."
msgstr "Aggiornamento in corso..."
-#: js/apps.js:118
+#: js/apps.js:128
msgid "Error while updating app"
msgstr "Errore durante l'aggiornamento"
-#: js/apps.js:118
+#: js/apps.js:128
msgid "Error"
msgstr "Errore"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:129 templates/apps.php:43
msgid "Update"
msgstr "Aggiorna"
-#: js/apps.js:122
+#: js/apps.js:132
msgid "Updated"
msgstr "Aggiornato"
-#: js/personal.js:150
+#: js/personal.js:221
+msgid "Select a profile picture"
+msgstr "Seleziona un'immagine del profilo"
+
+#: js/personal.js:266
msgid "Decrypting files... Please wait, this can take some time."
msgstr "Decifratura dei file in corso... Attendi, potrebbe richiedere del tempo."
-#: js/personal.js:172
+#: js/personal.js:288
msgid "Saving..."
msgstr "Salvataggio in corso..."
@@ -151,16 +185,16 @@ msgstr "annulla"
msgid "Unable to remove user"
msgstr "Impossibile rimuovere l'utente"
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "Gruppi"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "Gruppi amministrati"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "Elimina"
@@ -180,7 +214,7 @@ msgstr "Errore durante la creazione dell'utente"
msgid "A valid password must be provided"
msgstr "Deve essere fornita una password valida"
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "Italiano"
@@ -346,11 +380,11 @@ msgstr "Altro"
msgid "Less"
msgstr "Meno"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "Versione"
-#: templates/admin.php:246 templates/personal.php:143
+#: 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 "
@@ -417,7 +451,7 @@ msgstr "Mostra nuovamente la procedura di primo avvio"
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Hai utilizzato <strong>%s</strong> dei <strong>%s</strong> disponibili"
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "Password"
@@ -441,7 +475,7 @@ msgstr "Nuova password"
msgid "Change password"
msgstr "Modifica password"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr "Nome visualizzato"
@@ -457,38 +491,66 @@ msgstr "Il tuo indirizzo email"
msgid "Fill in an email address to enable password recovery"
msgstr "Inserisci il tuo indirizzo email per abilitare il recupero della password"
-#: templates/personal.php:85 templates/personal.php:86
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr "Immagine del profilo"
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr "Carica nuova"
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr "Seleziona nuova da file"
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr "Rimuovi immagine"
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr "Sia png che jpg. Preferibilmente quadrata, ma potrai ritagliarla."
+
+#: templates/personal.php:97
+msgid "Abort"
+msgstr "Interrompi"
+
+#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr "Scegli come immagine del profilo"
+
+#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
msgstr "Lingua"
-#: templates/personal.php:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "Migliora la traduzione"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: 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 "Utilizza questo indirizzo per <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">accedere ai tuoi file via WebDAV</a>"
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "Cifratura"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr "L'applicazione di cifratura non è più abilitata, decifra tutti i tuoi file"
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr "Password di accesso"
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr "Decifra tutti i file"
@@ -514,30 +576,30 @@ msgstr "Digita la password di ripristino per recuperare i file degli utenti dura
msgid "Default Storage"
msgstr "Archiviazione predefinita"
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr "Illimitata"
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "Altro"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "Nome utente"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr "Archiviazione"
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr "cambia il nome visualizzato"
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr "imposta una nuova password"
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr "Predefinito"
diff --git a/l10n/it/user_ldap.po b/l10n/it/user_ldap.po
index e39ae95e863f676085c68878e473699d27771a20..5e50a6b6e6532abfd1a2a81e5c9b4db34c08dda7 100644
--- a/l10n/it/user_ldap.po
+++ b/l10n/it/user_ldap.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-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 06:40+0000\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-05 11:51+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"
diff --git a/l10n/ja_JP/core.po b/l10n/ja_JP/core.po
index e8a091e75a7079666465521c6385ff0848eaeee5..73ad535aee2d066a2cb0b53b8bd97bee70ee36df 100644
--- a/l10n/ja_JP/core.po
+++ b/l10n/ja_JP/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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-30 10:16-0400\n"
+"PO-Revision-Date: 2013-09-30 06:25+0000\n"
+"Last-Translator: Daisuke Deguchi <ddeguchi@nagoya-u.jp>\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"
@@ -26,30 +26,34 @@ msgstr ""
msgid "%s shared »%s« with you"
msgstr "%sが あなたと »%s«を共有しました"
+#: ajax/share.php:227
+msgid "group"
+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."
@@ -90,6 +94,26 @@ msgstr "削除するカテゴリが選択されていません。"
msgid "Error removing %s from favorites."
msgstr "お気に入りから %s の削除エラー"
+#: 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 "日"
@@ -166,55 +190,55 @@ msgstr "11月"
msgid "December"
msgstr "12月"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "設定"
-#: js/js.js:812
+#: js/js.js:866
msgid "seconds ago"
msgstr "数秒前"
-#: js/js.js:813
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n 分前"
-#: js/js.js:814
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n 時間後"
-#: js/js.js:815
+#: js/js.js:869
msgid "today"
msgstr "今日"
-#: js/js.js:816
+#: js/js.js:870
msgid "yesterday"
msgstr "昨日"
-#: js/js.js:817
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n 日後"
-#: js/js.js:818
+#: js/js.js:872
msgid "last month"
msgstr "一月前"
-#: js/js.js:819
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n カ月後"
-#: js/js.js:820
+#: js/js.js:874
msgid "months ago"
msgstr "月前"
-#: js/js.js:821
+#: js/js.js:875
msgid "last year"
msgstr "一年前"
-#: js/js.js:822
+#: js/js.js:876
msgid "years ago"
msgstr "年前"
@@ -222,22 +246,65 @@ msgstr "年前"
msgid "Choose"
msgstr "選択"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
-msgstr "ファイルピッカーのテンプレートの読み込みエラー"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
+msgstr "ファイル選択テンプレートの読み込みエラー: {error}"
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "はい"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "いいえ"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
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] "{count} ファイルが競合"
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr "1ファイルが競合"
+
+#: 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
msgid "The object type is not specified."
@@ -247,7 +314,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:643 js/share.js:655
+#: js/share.js:656 js/share.js:668
msgid "Error"
msgstr "エラー"
@@ -267,7 +334,7 @@ msgstr "共有中"
msgid "Share"
msgstr "共有"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:696
msgid "Error while sharing"
msgstr "共有でエラー発生"
@@ -323,67 +390,67 @@ msgstr "有効期限を設定"
msgid "Expiration date"
msgstr "有効期限"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "メール経由で共有:"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "ユーザーが見つかりません"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "再共有は許可されていません"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr "{item} 内で {user} と共有中"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "共有解除"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "編集可能"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "アクセス権限"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "作成"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "更新"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "削除"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "共有"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:643
msgid "Password protected"
msgstr "パスワード保護"
-#: js/share.js:643
+#: js/share.js:656
msgid "Error unsetting expiration date"
msgstr "有効期限の未設定エラー"
-#: js/share.js:655
+#: js/share.js:668
msgid "Error setting expiration date"
msgstr "有効期限の設定でエラー発生"
-#: js/share.js:670
+#: js/share.js:683
msgid "Sending ..."
msgstr "送信中..."
-#: js/share.js:681
+#: js/share.js:694
msgid "Email sent"
msgstr "メールを送信しました"
@@ -398,7 +465,7 @@ msgstr "更新に成功しました。この問題を <a href=\"https://github.c
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "更新に成功しました。今すぐownCloudにリダイレクトします。"
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr "%s パスワードリセット"
@@ -467,7 +534,7 @@ msgstr "個人"
msgid "Users"
msgstr "ユーザ"
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "アプリ"
@@ -596,14 +663,10 @@ msgstr "セットアップを完了します"
msgid "%s is available. Get more information on how to update."
msgstr "%s が利用可能です。更新方法に関してさらに情報を取得して下さい。"
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "ログアウト"
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr "他のアプリ"
-
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "自動ログインは拒否されました！"
@@ -618,19 +681,19 @@ msgstr "最近パスワードを変更していない場合、あなたのアカ
msgid "Please change your password to secure your account again."
msgstr "アカウント保護の為、パスワードを再度の変更をお願いいたします。"
-#: templates/login.php:34
+#: templates/login.php:32
msgid "Lost your password?"
msgstr "パスワードを忘れましたか？"
-#: templates/login.php:39
+#: templates/login.php:37
msgid "remember"
msgstr "パスワードを記憶する"
-#: templates/login.php:41
+#: templates/login.php:39
msgid "Log in"
msgstr "ログイン"
-#: templates/login.php:47
+#: templates/login.php:45
msgid "Alternative Logins"
msgstr "代替ログイン"
diff --git a/l10n/ja_JP/files.po b/l10n/ja_JP/files.po
index 9212428332321146c771377c6803d319d97a0666..23062b05965b6fe278adb748fd258b90a53271ad 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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-30 10:14-0400\n"
+"PO-Revision-Date: 2013-09-30 06:27+0000\n"
+"Last-Translator: Daisuke Deguchi <ddeguchi@nagoya-u.jp>\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,154 +79,170 @@ msgstr "ディスクへの書き込みに失敗しました"
msgid "Not enough storage available"
msgstr "ストレージに十分な空き容量がありません"
-#: ajax/upload.php:123
+#: 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
+#: 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 "ディレクトリもしくは0バイトのため {filename} をアップロードできません"
-#: 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: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 "URLは空にできません。"
-#: 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 "無効なフォルダ名です。'Shared' の利用はownCloudで予約済みです"
-#: js/file-upload.js:277 js/file-upload.js:293 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:465
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "中断"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{new_name} はすでに存在しています"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "置き換え"
-#: js/filelist.js:303
+#: js/filelist.js:416
msgid "suggest name"
msgstr "推奨名称"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "キャンセル"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr "{old_name} を {new_name} に置換"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "undo"
msgstr "元に戻す"
-#: js/filelist.js:453
+#: 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:534 js/filelist.js:600 js/files.js:582
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] "%n個のファイル"
+
+#: js/filelist.js:541
+msgid "{dirs} and {files}"
+msgstr "{dirs} と {files}"
+
+#: js/filelist.js:731 js/filelist.js:769
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "%n 個のファイルをアップロード中"
-#: js/filelist.js:518
-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: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 "変更"
-#: js/files.js:580
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] "%n個のフォルダ"
-
-#: js/files.js:586
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] "%n個のファイル"
-
#: lib/app.php:73
#, php-format
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 "アップロード"
@@ -262,84 +278,68 @@ 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: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 "スキャン中"
-#: templates/part.list.php:74
-msgid "directory"
-msgstr "ディレクトリ"
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr "ディレクトリ"
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr "ファイル"
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr "ファイル"
-
#: templates/upgrade.php:2
msgid "Upgrading filesystem cache..."
msgstr "ファイルシステムキャッシュを更新中..."
diff --git a/l10n/ja_JP/files_sharing.po b/l10n/ja_JP/files_sharing.po
index a2bd99586b9935c8c62650514e8668e3f095b8ec..71e37cb9fda29e8c730c9fccb786b5e317e00749 100644
--- a/l10n/ja_JP/files_sharing.po
+++ b/l10n/ja_JP/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:01+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"
@@ -64,7 +64,7 @@ msgstr "%s はフォルダー %s をあなたと共有中です"
msgid "%s shared the file %s with you"
msgstr "%s はファイル %s をあなたと共有中です"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "ダウンロード"
@@ -76,6 +76,6 @@ msgstr "アップロード"
msgid "Cancel upload"
msgstr "アップロードをキャンセル"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "プレビューはありません"
diff --git a/l10n/ja_JP/lib.po b/l10n/ja_JP/lib.po
index 3d14cbeb36de1f97b0fa3aace23bda1e8db8c68d..6b0484f521d94f4656e0dc090bf73e87a1641d02 100644
--- a/l10n/ja_JP/lib.po
+++ b/l10n/ja_JP/lib.po
@@ -3,15 +3,17 @@
# 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
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+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"
@@ -24,11 +26,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"
@@ -50,11 +52,23 @@ msgstr "ユーザ"
msgid "Admin"
msgstr "管理"
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "\"%s\" へのアップグレードに失敗しました。"
+#: 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 "管理下のウェブサービス"
@@ -88,59 +102,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 "アプリインストール時のhttpの URL が未指定"
#: 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:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
-msgstr ""
+msgstr "アプリにinfo.xmlファイルが入っていません"
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
-msgstr ""
+msgstr "アプリで許可されないコードが入っているのが原因でアプリがインストールできません"
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
-msgstr ""
+msgstr "アプリは、このバージョンのownCloudと互換性がない為、インストールできません。"
-#: installer.php:144
+#: 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アプリには許可されない<shipped>true</shipped>タグが含まれているためにアプリをインストール出来ません。"
-#: installer.php:150
+#: 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:160
+#: installer.php:162
msgid "App directory already exists"
-msgstr ""
+msgstr "アプリディレクトリは既に存在します"
-#: installer.php:173
+#: 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"
@@ -154,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 "画像"
@@ -266,47 +280,47 @@ msgstr "WebDAVインタフェースが動作していないと考えられるた
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "<a href='%s'>インストールガイド</a>をよく確認してください。"
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "数秒前"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n 分前"
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n 時間後"
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "今日"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "昨日"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] "%n 日後"
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "一月前"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n カ月後"
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "一年前"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "年前"
diff --git a/l10n/ja_JP/settings.po b/l10n/ja_JP/settings.po
index f61f73ba2284b05891c4c002020d947413f652e9..9414aa1720c0e7f67532967b9a00b2b71e2682f4 100644
--- a/l10n/ja_JP/settings.po
+++ b/l10n/ja_JP/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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-30 10:17-0400\n"
+"PO-Revision-Date: 2013-09-30 06:33+0000\n"
+"Last-Translator: Daisuke Deguchi <ddeguchi@nagoya-u.jp>\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"
@@ -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,55 +87,88 @@ msgstr "ユーザをグループ %s から削除できません"
msgid "Couldn't update app."
msgstr "アプリを更新出来ませんでした。"
-#: js/apps.js:35
+#: 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} に更新"
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:110
msgid "Disable"
msgstr "無効"
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
msgid "Enable"
msgstr "有効化"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr "しばらくお待ちください。"
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:101
msgid "Error while disabling app"
-msgstr ""
+msgstr "アプリ無効化中にエラーが発生"
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:100 js/apps.js:114 js/apps.js:115
msgid "Error while enabling app"
-msgstr ""
+msgstr "アプリ有効化中にエラーが発生"
-#: js/apps.js:115
+#: js/apps.js:125
msgid "Updating...."
msgstr "更新中...."
-#: js/apps.js:118
+#: js/apps.js:128
msgid "Error while updating app"
msgstr "アプリの更新中にエラーが発生"
-#: js/apps.js:118
+#: js/apps.js:128
msgid "Error"
msgstr "エラー"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:129 templates/apps.php:43
msgid "Update"
msgstr "更新"
-#: js/apps.js:122
+#: js/apps.js:132
msgid "Updated"
msgstr "更新済み"
-#: js/personal.js:150
+#: js/personal.js:221
+msgid "Select a profile picture"
+msgstr "プロファイル画像を選択"
+
+#: js/personal.js:266
msgid "Decrypting files... Please wait, this can take some time."
msgstr "ファイルを複合中... しばらくお待ちください、この処理には少し時間がかかるかもしれません。"
-#: js/personal.js:172
+#: js/personal.js:288
msgid "Saving..."
msgstr "保存中..."
@@ -151,16 +184,16 @@ msgstr "元に戻す"
msgid "Unable to remove user"
msgstr "ユーザを削除出来ません"
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: 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:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "グループ管理者"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "削除"
@@ -180,7 +213,7 @@ msgstr "ユーザ作成エラー"
msgid "A valid password must be provided"
msgstr "有効なパスワードを指定する必要があります"
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "Japanese (日本語)"
@@ -346,11 +379,11 @@ msgstr "もっと見る"
msgid "Less"
msgstr "閉じる"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "バージョン"
-#: templates/admin.php:246 templates/personal.php:143
+#: 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 "
@@ -417,7 +450,7 @@ msgstr "初回ウィザードを再表示する"
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "現在、<strong>%s</strong> / <strong>%s</strong> を利用しています"
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "パスワード"
@@ -441,7 +474,7 @@ msgstr "新しいパスワードを入力"
msgid "Change password"
msgstr "パスワードを変更"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr "表示名"
@@ -457,38 +490,66 @@ msgstr "あなたのメールアドレス"
msgid "Fill in an email address to enable password recovery"
msgstr "※パスワード回復を有効にするにはメールアドレスの入力が必要です"
-#: templates/personal.php:85 templates/personal.php:86
+#: 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 "png と jpg のいずれか。正方形が理想ですが、切り取って加工することも可能です。"
+
+#: 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:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "翻訳に協力する"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: 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 "<a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">WebDAV経由でファイルにアクセス</a>するにはこのアドレスを利用してください"
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "暗号化"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr "暗号化アプリはもはや有効ではありません、すべてのファイルを複合してください"
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr "ログインパスワード"
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr "すべてのファイルを複合する"
@@ -514,30 +575,30 @@ msgstr "パスワード変更の間のユーザーのファイルを回復する
msgid "Default Storage"
msgstr "デフォルトストレージ"
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr "無制限"
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "その他"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "ユーザー名"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr "ストレージ"
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr "表示名を変更"
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr "新しいパスワードを設定"
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr "デフォルト"
diff --git a/l10n/ja_JP/user_ldap.po b/l10n/ja_JP/user_ldap.po
index cbbbfc99a47c4cdce8f16ccc139729eda74ff5c9..9b1f34b05cf7f9b9a7a8fb3fa2075e842d51f47f 100644
--- a/l10n/ja_JP/user_ldap.po
+++ b/l10n/ja_JP/user_ldap.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-08-21 08:11-0400\n"
-"PO-Revision-Date: 2013-08-20 09:10+0000\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-05 11:51+0000\n"
"Last-Translator: Daisuke Deguchi <ddeguchi@nagoya-u.jp>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ka/core.po b/l10n/ka/core.po
index d913c55a78d84c7ad04bc4a9bd2dec756f7f83c5..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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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"
@@ -22,6 +22,10 @@ msgstr ""
msgid "%s shared »%s« with you"
msgstr ""
+#: ajax/share.php:227
+msgid "group"
+msgstr ""
+
#: ajax/update.php:11
msgid "Turned on maintenance mode"
msgstr ""
@@ -86,6 +90,26 @@ msgstr ""
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 ""
@@ -162,55 +186,55 @@ msgstr ""
msgid "December"
msgstr ""
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr ""
-#: js/js.js:812
+#: js/js.js:866
msgid "seconds ago"
msgstr "წამის წინ"
-#: js/js.js:813
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: js/js.js:814
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: js/js.js:815
+#: js/js.js:869
msgid "today"
msgstr "დღეს"
-#: js/js.js:816
+#: js/js.js:870
msgid "yesterday"
msgstr "გუშინ"
-#: js/js.js:817
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
-#: js/js.js:818
+#: js/js.js:872
msgid "last month"
msgstr ""
-#: js/js.js:819
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: js/js.js:820
+#: js/js.js:874
msgid "months ago"
msgstr ""
-#: js/js.js:821
+#: js/js.js:875
msgid "last year"
msgstr ""
-#: js/js.js:822
+#: js/js.js:876
msgid "years ago"
msgstr ""
@@ -218,22 +242,65 @@ msgstr ""
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:195
+#: 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] ""
+
+#: 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."
@@ -243,7 +310,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:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr ""
@@ -263,7 +330,7 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr ""
@@ -319,67 +386,67 @@ msgstr ""
msgid "Expiration date"
msgstr ""
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr ""
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr ""
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr ""
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr ""
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr ""
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr ""
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr ""
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr ""
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr ""
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr ""
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr ""
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr ""
@@ -394,7 +461,7 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr ""
@@ -463,7 +530,7 @@ msgstr "პერსონა"
msgid "Users"
msgstr "მომხმარებლები"
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr ""
@@ -592,14 +659,10 @@ msgstr ""
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr ""
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr ""
@@ -614,19 +677,19 @@ msgstr ""
msgid "Please change your password to secure your account again."
msgstr ""
-#: templates/login.php:34
+#: templates/login.php:32
msgid "Lost your password?"
msgstr ""
-#: templates/login.php:39
+#: templates/login.php:37
msgid "remember"
msgstr ""
-#: templates/login.php:41
+#: templates/login.php:39
msgid "Log in"
msgstr ""
-#: templates/login.php:47
+#: templates/login.php:45
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/ka/files.po b/l10n/ka/files.po
index 168581e96b03c2840566b2fc3a4cdf88fc8e5806..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-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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,7 +74,15 @@ msgstr ""
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:123
+#: 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 ""
@@ -82,146 +90,154 @@ 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: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:277 js/file-upload.js:293 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:465
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr ""
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr ""
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr ""
-#: js/filelist.js:303
+#: js/filelist.js:416
msgid "suggest name"
msgstr ""
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr ""
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr ""
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "undo"
msgstr ""
-#: js/filelist.js:453
-msgid "Uploading %n file"
-msgid_plural "Uploading %n files"
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
+msgid "%n folder"
+msgid_plural "%n folders"
msgstr[0] ""
-#: js/filelist.js:518
-msgid "files uploading"
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+
+#: js/filelist.js:541
+msgid "{dirs} and {files}"
msgstr ""
-#: js/files.js:52
+#: js/filelist.js:731 js/filelist.js:769
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+
+#: 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 ""
-#: js/files.js:580
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-
-#: js/files.js:586
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-
#: lib/app.php:73
#, php-format
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 ""
@@ -257,84 +273,68 @@ 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 ""
-#: templates/part.list.php:74
-msgid "directory"
-msgstr ""
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr ""
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr ""
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr ""
-
#: templates/upgrade.php:2
msgid "Upgrading filesystem cache..."
msgstr ""
diff --git a/l10n/ka/files_sharing.po b/l10n/ka/files_sharing.po
index 64ba60942076c8ff7e519a2fd0d7a734eebba611..efd2890682d94b122f50e50d47f728273511c2ed 100644
--- a/l10n/ka/files_sharing.po
+++ b/l10n/ka/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\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"
"Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
"MIME-Version: 1.0\n"
@@ -63,7 +63,7 @@ msgstr ""
msgid "%s shared the file %s with you"
msgstr ""
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "გადმოწერა"
@@ -75,6 +75,6 @@ msgstr ""
msgid "Cancel upload"
msgstr ""
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr ""
diff --git a/l10n/ka/lib.po b/l10n/ka/lib.po
index d28838e8f0c55d487b6673e2cdc94e1ed7b7b6b5..13336d9871dffe56d954bbe3d7000c89ea243afd 100644
--- a/l10n/ka/lib.po
+++ b/l10n/ka/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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\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"
"Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
"MIME-Version: 1.0\n"
@@ -48,11 +48,23 @@ msgstr "მომხმარებლები"
msgid "Admin"
msgstr "ადმინისტრატორი"
-#: app.php:837
+#: 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 ""
@@ -105,37 +117,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: 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:150
+#: 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:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -264,47 +276,47 @@ msgstr ""
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "წამის წინ"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "დღეს"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "გუშინ"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr ""
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr ""
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr ""
diff --git a/l10n/ka/settings.po b/l10n/ka/settings.po
index 079d74339ac94f29192c0e717ec5f2a3e2d5924a..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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+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,55 +84,88 @@ msgstr ""
msgid "Couldn't update app."
msgstr ""
-#: js/apps.js:35
+#: 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:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr ""
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr ""
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr ""
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr ""
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr ""
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr ""
-#: js/personal.js:150
+#: 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:172
+#: js/personal.js:287
msgid "Saving..."
msgstr ""
@@ -148,16 +181,16 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: 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:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr ""
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr ""
@@ -177,7 +210,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr ""
@@ -343,11 +376,11 @@ msgstr ""
msgid "Less"
msgstr ""
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr ""
-#: templates/admin.php:246 templates/personal.php:143
+#: 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 "
@@ -414,7 +447,7 @@ msgstr ""
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:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "პაროლი"
@@ -438,7 +471,7 @@ msgstr ""
msgid "Change password"
msgstr ""
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr ""
@@ -454,38 +487,66 @@ msgstr ""
msgid "Fill in an email address to enable password recovery"
msgstr ""
-#: templates/personal.php:85 templates/personal.php:86
-msgid "Language"
+#: 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:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:106
+#: 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:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr ""
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -511,30 +572,30 @@ msgstr ""
msgid "Default Storage"
msgstr ""
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr ""
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr ""
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr ""
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr ""
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr ""
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr ""
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr ""
diff --git a/l10n/ka/user_ldap.po b/l10n/ka/user_ldap.po
index 537446f5b40060e10555818ee45d50731ef96f41..69f4675a9c6b605cbba8bf73cc9c4ec96b147aac 100644
--- a/l10n/ka/user_ldap.po
+++ b/l10n/ka/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\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"
"Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ka_GE/core.po b/l10n/ka_GE/core.po
index 6dee08e0240d2683e1dc23462e64dfe1b3c99bea..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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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"
@@ -22,6 +22,10 @@ msgstr ""
msgid "%s shared »%s« with you"
msgstr ""
+#: ajax/share.php:227
+msgid "group"
+msgstr "ჯგუფი"
+
#: ajax/update.php:11
msgid "Turned on maintenance mode"
msgstr ""
@@ -86,6 +90,26 @@ msgstr "სარედაქტირებელი კატეგორი
msgid "Error removing %s from favorites."
msgstr "შეცდომა %s–ის ფევორიტებიდან წაშლის დროს."
+#: 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 "კვირა"
@@ -162,55 +186,55 @@ msgstr "ნოემბერი"
msgid "December"
msgstr "დეკემბერი"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "პარამეტრები"
-#: js/js.js:812
+#: js/js.js:866
msgid "seconds ago"
msgstr "წამის წინ"
-#: js/js.js:813
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: js/js.js:814
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: js/js.js:815
+#: js/js.js:869
msgid "today"
msgstr "დღეს"
-#: js/js.js:816
+#: js/js.js:870
msgid "yesterday"
msgstr "გუშინ"
-#: js/js.js:817
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
-#: js/js.js:818
+#: js/js.js:872
msgid "last month"
msgstr "გასულ თვეში"
-#: js/js.js:819
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: js/js.js:820
+#: js/js.js:874
msgid "months ago"
msgstr "თვის წინ"
-#: js/js.js:821
+#: js/js.js:875
msgid "last year"
msgstr "ბოლო წელს"
-#: js/js.js:822
+#: js/js.js:876
msgid "years ago"
msgstr "წლის წინ"
@@ -218,22 +242,65 @@ msgstr "წლის წინ"
msgid "Choose"
msgstr "არჩევა"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "კი"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "არა"
-#: js/oc-dialogs.js:195
+#: 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] ""
+
+#: 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."
@@ -243,7 +310,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:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "შეცდომა"
@@ -263,7 +330,7 @@ msgstr "გაზიარებული"
msgid "Share"
msgstr "გაზიარება"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr "შეცდომა გაზიარების დროს"
@@ -319,67 +386,67 @@ msgstr "მიუთითე ვადის გასვლის დრო"
msgid "Expiration date"
msgstr "ვადის გასვლის დრო"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "გააზიარე მეილზე"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "მომხმარებელი არ არის ნაპოვნი"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "მეორეჯერ გაზიარება არ არის დაშვებული"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr "გაზიარდა {item}–ში {user}–ის მიერ"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "გაუზიარებადი"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "შეგიძლია შეცვლა"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "დაშვების კონტროლი"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "შექმნა"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "განახლება"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "წაშლა"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "გაზიარება"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "პაროლით დაცული"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr "შეცდომა ვადის გასვლის მოხსნის დროს"
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr "შეცდომა ვადის გასვლის მითითების დროს"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr "გაგზავნა ...."
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr "იმეილი გაიგზავნა"
@@ -394,7 +461,7 @@ msgstr "განახლება ვერ განხორციელდ
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "განახლება ვერ განხორციელდა. გადამისამართება თქვენს ownCloud–ზე."
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr ""
@@ -463,7 +530,7 @@ msgstr "პირადი"
msgid "Users"
msgstr "მომხმარებელი"
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "აპლიკაციები"
@@ -592,14 +659,10 @@ msgstr "კონფიგურაციის დასრულება"
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "გამოსვლა"
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "ავტომატური შესვლა უარყოფილია!"
@@ -614,19 +677,19 @@ msgstr "თუ თქვენ არ შეცვლით პაროლს,
msgid "Please change your password to secure your account again."
msgstr "გთხოვთ შეცვალოთ თქვენი პაროლი, თქვენი ანგარიშის დასაცავად."
-#: templates/login.php:34
+#: templates/login.php:32
msgid "Lost your password?"
msgstr "დაგავიწყდათ პაროლი?"
-#: templates/login.php:39
+#: templates/login.php:37
msgid "remember"
msgstr "დამახსოვრება"
-#: templates/login.php:41
+#: templates/login.php:39
msgid "Log in"
msgstr "შესვლა"
-#: templates/login.php:47
+#: templates/login.php:45
msgid "Alternative Logins"
msgstr "ალტერნატიული Login–ი"
diff --git a/l10n/ka_GE/files.po b/l10n/ka_GE/files.po
index a2608f179528df70ec7db9ab1745c0b51da765e1..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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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,7 +74,15 @@ msgstr "შეცდომა დისკზე ჩაწერისას"
msgid "Not enough storage available"
msgstr "საცავში საკმარისი ადგილი არ არის"
-#: ajax/upload.php:123
+#: 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 "დაუშვებელი დირექტორია."
@@ -82,146 +90,154 @@ 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: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 "URL არ შეიძლება იყოს ცარიელი."
-#: 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:277 js/file-upload.js:293 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:465
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "მოცდის რეჟიმში"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{new_name} უკვე არსებობს"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "შეცვლა"
-#: js/filelist.js:303
+#: js/filelist.js:416
msgid "suggest name"
msgstr "სახელის შემოთავაზება"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "უარყოფა"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr "{new_name} შეცვლილია {old_name}–ით"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "undo"
msgstr "დაბრუნება"
-#: js/filelist.js:453
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+
+#: 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] ""
-#: js/filelist.js:518
-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: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 "შეცვლილია"
-#: js/files.js:580
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-
-#: js/files.js:586
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-
#: lib/app.php:73
#, php-format
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 "ატვირთვა"
@@ -257,84 +273,68 @@ 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: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 "მიმდინარე სკანირება"
-#: templates/part.list.php:74
-msgid "directory"
-msgstr ""
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr ""
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr ""
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr ""
-
#: templates/upgrade.php:2
msgid "Upgrading filesystem cache..."
msgstr "ფაილური სისტემის ქეშის განახლება...."
diff --git a/l10n/ka_GE/files_sharing.po b/l10n/ka_GE/files_sharing.po
index 65b24c1c116509de4d187d28903c20f0a1a9b5eb..c53f2326209db86a7e68939452a97fa8afe61b27 100644
--- a/l10n/ka_GE/files_sharing.po
+++ b/l10n/ka_GE/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00: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"
@@ -63,7 +63,7 @@ msgstr "%s–მა გაგიზიარათ ფოლდერი %s"
msgid "%s shared the file %s with you"
msgstr "%s–მა გაგიზიარათ ფაილი %s"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "ჩამოტვირთვა"
@@ -75,6 +75,6 @@ msgstr "ატვირთვა"
msgid "Cancel upload"
msgstr "ატვირთვის გაუქმება"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "წინასწარი დათვალიერება შეუძლებელია"
diff --git a/l10n/ka_GE/lib.po b/l10n/ka_GE/lib.po
index 0eda718d060ffc26d6a4b9b91c349acf8de5b8bd..b2793d66c77a06184ae15707a4a9f152c2205537 100644
--- a/l10n/ka_GE/lib.po
+++ b/l10n/ka_GE/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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\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"
"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
"MIME-Version: 1.0\n"
@@ -48,11 +48,23 @@ msgstr "მომხმარებელი"
msgid "Admin"
msgstr "ადმინისტრატორი"
-#: app.php:837
+#: 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 "web services under your control"
@@ -105,37 +117,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: 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:150
+#: 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:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -264,47 +276,47 @@ msgstr "თქვენი web სერვერი არ არის კო
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "გთხოვთ გადაათვალიეროთ <a href='%s'>ინსტალაციის გზამკვლევი</a>."
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "წამის წინ"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "დღეს"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "გუშინ"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "გასულ თვეში"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "ბოლო წელს"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "წლის წინ"
diff --git a/l10n/ka_GE/settings.po b/l10n/ka_GE/settings.po
index 793b41c51aa853ebaacee00b8a9954edd9be9c7b..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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+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,55 +85,88 @@ msgstr "მომხმარებლის წაშლა ვერ მოხ
msgid "Couldn't update app."
msgstr "ვერ მოხერხდა აპლიკაციის განახლება."
-#: js/apps.js:35
+#: 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}–მდე"
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr "გამორთვა"
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr "ჩართვა"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr "დაიცადეთ...."
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr "მიმდინარეობს განახლება...."
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr "შეცდომა აპლიკაციის განახლების დროს"
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "შეცდომა"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr "განახლება"
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr "განახლებულია"
-#: js/personal.js:150
+#: 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:172
+#: js/personal.js:287
msgid "Saving..."
msgstr "შენახვა..."
@@ -149,16 +182,16 @@ msgstr "დაბრუნება"
msgid "Unable to remove user"
msgstr "მომხმარებლის წაშლა ვერ მოხერხდა"
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: 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:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "ჯგუფის ადმინისტრატორი"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "წაშლა"
@@ -178,7 +211,7 @@ msgstr "შეცდომა მომხმარებლის შექმ
msgid "A valid password must be provided"
msgstr "უნდა მიუთითოთ არსებული პაროლი"
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "__language_name__"
@@ -344,11 +377,11 @@ msgstr "უფრო მეტი"
msgid "Less"
msgstr "უფრო ნაკლები"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "ვერსია"
-#: templates/admin.php:246 templates/personal.php:143
+#: 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 "
@@ -415,7 +448,7 @@ msgstr "მაჩვენე თავიდან გაშვებული
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "თქვენ გამოყენებული გაქვთ <strong>%s</strong> –ი –<strong>%s<strong>–დან"
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "პაროლი"
@@ -439,7 +472,7 @@ msgstr "ახალი პაროლი"
msgid "Change password"
msgstr "პაროლის შეცვლა"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr "დისპლეის სახელი"
@@ -455,38 +488,66 @@ msgstr "თქვენი იმეილ მისამართი"
msgid "Fill in an email address to enable password recovery"
msgstr "შეავსეთ იმეილ მისამართის ველი პაროლის აღსადგენად"
-#: templates/personal.php:85 templates/personal.php:86
+#: 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:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "თარგმნის დახმარება"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: 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:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "ენკრიპცია"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -512,30 +573,30 @@ msgstr ""
msgid "Default Storage"
msgstr "საწყისი საცავი"
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr "ულიმიტო"
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "სხვა"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "მომხმარებლის სახელი"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr "საცავი"
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr "შეცვალე დისფლეის სახელი"
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr "დააყენეთ ახალი პაროლი"
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr "საწყისი პარამეტრები"
diff --git a/l10n/ka_GE/user_ldap.po b/l10n/ka_GE/user_ldap.po
index da010f03eeeb26c24e21febbe5372fc54cdb23be..36128b4046d2916266f7bad6e99e3c27bbeec13d 100644
--- a/l10n/ka_GE/user_ldap.po
+++ b/l10n/ka_GE/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\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"
"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/km/core.po b/l10n/km/core.po
new file mode 100644
index 0000000000000000000000000000000000000000..437612ba9d98ffaa5a8eb89a6e4b447780093b07
--- /dev/null
+++ b/l10n/km/core.po
@@ -0,0 +1,706 @@
+# 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: Khmer (http://www.transifex.com/projects/p/owncloud/language/km/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: km\n"
+"Plural-Forms: nplurals=1; plural=0;\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] ""
+
+#: js/js.js:868
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+
+#: 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] ""
+
+#: js/js.js:872
+msgid "last month"
+msgstr ""
+
+#: js/js.js:873
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+
+#: 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] ""
+
+#: 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/km/files.po b/l10n/km/files.po
new file mode 100644
index 0000000000000000000000000000000000000000..a6b9b1775e166ec41166f8ee0099913f15b3e974
--- /dev/null
+++ b/l10n/km/files.po
@@ -0,0 +1,340 @@
+# 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: Khmer (http://www.transifex.com/projects/p/owncloud/language/km/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: km\n"
+"Plural-Forms: nplurals=1; plural=0;\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] ""
+
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+
+#: 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] ""
+
+#: 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/km/files_encryption.po b/l10n/km/files_encryption.po
new file mode 100644
index 0000000000000000000000000000000000000000..95e07fb95576817618172620d4fda6a46ccbe30f
--- /dev/null
+++ b/l10n/km/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-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-12 11:11+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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: km\n"
+"Plural-Forms: nplurals=1; plural=0;\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:51
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:52
+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
+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/km/files_external.po b/l10n/km/files_external.po
new file mode 100644
index 0000000000000000000000000000000000000000..bca243c45970e35f39facedd0bf362f48049bc52
--- /dev/null
+++ b/l10n/km/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-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-12 11:11+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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: km\n"
+"Plural-Forms: nplurals=1; plural=0;\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/km/files_sharing.po b/l10n/km/files_sharing.po
new file mode 100644
index 0000000000000000000000000000000000000000..f12cf3ccbe1ffc8151eacc0383c524cac7bdc864
--- /dev/null
+++ b/l10n/km/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-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-12 11:11+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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: km\n"
+"Plural-Forms: nplurals=1; plural=0;\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/km/files_trashbin.po b/l10n/km/files_trashbin.po
new file mode 100644
index 0000000000000000000000000000000000000000..f3aa613a53e7d3d7de878e140d61b581ba378fb5
--- /dev/null
+++ b/l10n/km/files_trashbin.po
@@ -0,0 +1,82 @@
+# 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-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-12 11:11+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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: km\n"
+"Plural-Forms: nplurals=1; plural=0;\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:184 templates/index.php:17
+msgid "Name"
+msgstr ""
+
+#: js/trash.js:185 templates/index.php:27
+msgid "Deleted"
+msgstr ""
+
+#: js/trash.js:193
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+
+#: js/trash.js:199
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+
+#: 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:20 templates/index.php:22
+msgid "Restore"
+msgstr ""
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr ""
+
+#: templates/part.breadcrumb.php:9
+msgid "Deleted Files"
+msgstr ""
diff --git a/l10n/km/files_versions.po b/l10n/km/files_versions.po
new file mode 100644
index 0000000000000000000000000000000000000000..f9b37bb0cc3fbce5033ce70287eb31a571fdc4ee
--- /dev/null
+++ b/l10n/km/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-13 21:47-0400\n"
+"PO-Revision-Date: 2013-09-12 11:11+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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: km\n"
+"Plural-Forms: nplurals=1; plural=0;\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/km/lib.po b/l10n/km/lib.po
new file mode 100644
index 0000000000000000000000000000000000000000..9937427d825a38eb06bea2d4477c6e921b11a32f
--- /dev/null
+++ b/l10n/km/lib.po
@@ -0,0 +1,330 @@
+# 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-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: km\n"
+"Plural-Forms: nplurals=1; plural=0;\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] ""
+
+#: template/functions.php:98
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+
+#: 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] ""
+
+#: template/functions.php:102
+msgid "last month"
+msgstr ""
+
+#: template/functions.php:103
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+
+#: 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/km/settings.po b/l10n/km/settings.po
new file mode 100644
index 0000000000000000000000000000000000000000..c46c22d8be39e2f83cb671efd65beb52ae139717
--- /dev/null
+++ b/l10n/km/settings.po
@@ -0,0 +1,601 @@
+# 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: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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: km\n"
+"Plural-Forms: nplurals=1; plural=0;\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/km/user_ldap.po b/l10n/km/user_ldap.po
new file mode 100644
index 0000000000000000000000000000000000000000..c6be8c9e68f30d4685f755b0b60accba727dccd7
--- /dev/null
+++ b/l10n/km/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-13 21:47-0400\n"
+"PO-Revision-Date: 2013-09-12 11:11+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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: km\n"
+"Plural-Forms: nplurals=1; plural=0;\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/km/user_webdavauth.po b/l10n/km/user_webdavauth.po
new file mode 100644
index 0000000000000000000000000000000000000000..1b1ffbc4311482d6ba11d1ea94b8381a4787f969
--- /dev/null
+++ b/l10n/km/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-13 21:47-0400\n"
+"PO-Revision-Date: 2013-09-12 11:11+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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: km\n"
+"Plural-Forms: nplurals=1; plural=0;\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/kn/core.po b/l10n/kn/core.po
index 173c3cebfdfde5330f55404214b34f6b024babca..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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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"
@@ -22,6 +22,10 @@ msgstr ""
msgid "%s shared »%s« with you"
msgstr ""
+#: ajax/share.php:227
+msgid "group"
+msgstr ""
+
#: ajax/update.php:11
msgid "Turned on maintenance mode"
msgstr ""
@@ -86,6 +90,26 @@ msgstr ""
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 ""
@@ -162,55 +186,55 @@ msgstr ""
msgid "December"
msgstr ""
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr ""
-#: js/js.js:812
+#: js/js.js:866
msgid "seconds ago"
msgstr ""
-#: js/js.js:813
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: js/js.js:814
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: js/js.js:815
+#: js/js.js:869
msgid "today"
msgstr ""
-#: js/js.js:816
+#: js/js.js:870
msgid "yesterday"
msgstr ""
-#: js/js.js:817
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
-#: js/js.js:818
+#: js/js.js:872
msgid "last month"
msgstr ""
-#: js/js.js:819
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: js/js.js:820
+#: js/js.js:874
msgid "months ago"
msgstr ""
-#: js/js.js:821
+#: js/js.js:875
msgid "last year"
msgstr ""
-#: js/js.js:822
+#: js/js.js:876
msgid "years ago"
msgstr ""
@@ -218,22 +242,65 @@ msgstr ""
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:195
+#: 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] ""
+
+#: 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."
@@ -243,7 +310,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:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr ""
@@ -263,7 +330,7 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr ""
@@ -319,67 +386,67 @@ msgstr ""
msgid "Expiration date"
msgstr ""
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr ""
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr ""
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr ""
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr ""
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr ""
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr ""
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr ""
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr ""
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr ""
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr ""
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr ""
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr ""
@@ -394,7 +461,7 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr ""
@@ -463,7 +530,7 @@ msgstr ""
msgid "Users"
msgstr ""
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr ""
@@ -592,14 +659,10 @@ msgstr ""
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr ""
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr ""
@@ -614,19 +677,19 @@ msgstr ""
msgid "Please change your password to secure your account again."
msgstr ""
-#: templates/login.php:34
+#: templates/login.php:32
msgid "Lost your password?"
msgstr ""
-#: templates/login.php:39
+#: templates/login.php:37
msgid "remember"
msgstr ""
-#: templates/login.php:41
+#: templates/login.php:39
msgid "Log in"
msgstr ""
-#: templates/login.php:47
+#: templates/login.php:45
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/kn/files.po b/l10n/kn/files.po
index 293b737fe12fa1b92b653b2898902739b21a18e4..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-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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,7 +74,15 @@ msgstr ""
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:123
+#: 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 ""
@@ -82,146 +90,154 @@ 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: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:277 js/file-upload.js:293 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:465
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr ""
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr ""
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr ""
-#: js/filelist.js:303
+#: js/filelist.js:416
msgid "suggest name"
msgstr ""
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr ""
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr ""
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "undo"
msgstr ""
-#: js/filelist.js:453
-msgid "Uploading %n file"
-msgid_plural "Uploading %n files"
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
+msgid "%n folder"
+msgid_plural "%n folders"
msgstr[0] ""
-#: js/filelist.js:518
-msgid "files uploading"
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+
+#: js/filelist.js:541
+msgid "{dirs} and {files}"
msgstr ""
-#: js/files.js:52
+#: js/filelist.js:731 js/filelist.js:769
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+
+#: 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 ""
-#: js/files.js:580
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-
-#: js/files.js:586
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-
#: lib/app.php:73
#, php-format
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 ""
@@ -257,84 +273,68 @@ 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 ""
-#: templates/part.list.php:74
-msgid "directory"
-msgstr ""
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr ""
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr ""
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr ""
-
#: templates/upgrade.php:2
msgid "Upgrading filesystem cache..."
msgstr ""
diff --git a/l10n/kn/lib.po b/l10n/kn/lib.po
index 73fe472ef52d9b30565113a33cc8f237789ea0b8..c760138d383eb5118b4f011716ce24dcfb99586b 100644
--- a/l10n/kn/lib.po
+++ b/l10n/kn/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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\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"
"Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
"MIME-Version: 1.0\n"
@@ -48,11 +48,23 @@ msgstr ""
msgid "Admin"
msgstr ""
-#: app.php:837
+#: 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 ""
@@ -105,37 +117,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: 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:150
+#: 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:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -264,47 +276,47 @@ msgstr ""
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr ""
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr ""
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr ""
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr ""
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr ""
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr ""
diff --git a/l10n/kn/settings.po b/l10n/kn/settings.po
index e875108d7cde5ed3e8011eb4ede631a64b7d8d3c..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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+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,55 +84,88 @@ msgstr ""
msgid "Couldn't update app."
msgstr ""
-#: js/apps.js:35
+#: 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:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr ""
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr ""
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr ""
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr ""
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr ""
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr ""
-#: js/personal.js:150
+#: 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:172
+#: js/personal.js:287
msgid "Saving..."
msgstr ""
@@ -148,16 +181,16 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: 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:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr ""
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr ""
@@ -177,7 +210,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr ""
@@ -343,11 +376,11 @@ msgstr ""
msgid "Less"
msgstr ""
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr ""
-#: templates/admin.php:246 templates/personal.php:143
+#: 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 "
@@ -414,7 +447,7 @@ msgstr ""
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:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr ""
@@ -438,7 +471,7 @@ msgstr ""
msgid "Change password"
msgstr ""
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr ""
@@ -454,38 +487,66 @@ msgstr ""
msgid "Fill in an email address to enable password recovery"
msgstr ""
-#: templates/personal.php:85 templates/personal.php:86
-msgid "Language"
+#: 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:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:106
+#: 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:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr ""
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -511,30 +572,30 @@ msgstr ""
msgid "Default Storage"
msgstr ""
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr ""
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr ""
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr ""
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr ""
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr ""
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr ""
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr ""
diff --git a/l10n/ko/core.po b/l10n/ko/core.po
index 3c34da3d738546350f2699c98456a9d6e9dec46a..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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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"
@@ -24,6 +24,10 @@ msgstr ""
msgid "%s shared »%s« with you"
msgstr ""
+#: ajax/share.php:227
+msgid "group"
+msgstr "그룹"
+
#: ajax/update.php:11
msgid "Turned on maintenance mode"
msgstr ""
@@ -88,6 +92,26 @@ msgstr "삭제할 분류를 선택하지 않았습니다. "
msgid "Error removing %s from favorites."
msgstr "책갈피에서 %s을(를) 삭제할 수 없었습니다."
+#: 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 "일요일"
@@ -164,55 +188,55 @@ msgstr "11월"
msgid "December"
msgstr "12월"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "설정"
-#: js/js.js:812
+#: js/js.js:866
msgid "seconds ago"
msgstr "초 전"
-#: js/js.js:813
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n분 전 "
-#: js/js.js:814
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n시간 전 "
-#: js/js.js:815
+#: js/js.js:869
msgid "today"
msgstr "오늘"
-#: js/js.js:816
+#: js/js.js:870
msgid "yesterday"
msgstr "어제"
-#: js/js.js:817
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n일 전 "
-#: js/js.js:818
+#: js/js.js:872
msgid "last month"
msgstr "지난 달"
-#: js/js.js:819
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n달 전 "
-#: js/js.js:820
+#: js/js.js:874
msgid "months ago"
msgstr "개월 전"
-#: js/js.js:821
+#: js/js.js:875
msgid "last year"
msgstr "작년"
-#: js/js.js:822
+#: js/js.js:876
msgid "years ago"
msgstr "년 전"
@@ -220,22 +244,65 @@ msgstr "년 전"
msgid "Choose"
msgstr "선택"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "예"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "아니요"
-#: js/oc-dialogs.js:195
+#: 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] ""
+
+#: 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."
@@ -245,7 +312,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:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "오류"
@@ -265,7 +332,7 @@ msgstr "공유됨"
msgid "Share"
msgstr "공유"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr "공유하는 중 오류 발생"
@@ -321,67 +388,67 @@ msgstr "만료 날짜 설정"
msgid "Expiration date"
msgstr "만료 날짜"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "이메일로 공유:"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "발견된 사람 없음"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "다시 공유할 수 없습니다"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr "{user} 님과 {item}에서 공유 중"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "공유 해제"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "편집 가능"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "접근 제어"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "생성"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "업데이트"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "삭제"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "공유"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "암호로 보호됨"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr "만료 날짜 해제 오류"
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr "만료 날짜 설정 오류"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr "전송 중..."
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr "이메일 발송됨"
@@ -396,7 +463,7 @@ msgstr "업데이트가 실패하였습니다. 이 문제를 <a href=\"https://g
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "업데이트가 성공하였습니다. ownCloud로 돌아갑니다."
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr ""
@@ -465,7 +532,7 @@ msgstr "개인"
msgid "Users"
msgstr "사용자"
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "앱"
@@ -594,14 +661,10 @@ msgstr "설치 완료"
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "로그아웃"
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "자동 로그인이 거부되었습니다!"
@@ -616,19 +679,19 @@ msgstr "최근에 암호를 변경하지 않았다면 계정이 탈취되었을
msgid "Please change your password to secure your account again."
msgstr "계정의 안전을 위하여 암호를 변경하십시오."
-#: templates/login.php:34
+#: templates/login.php:32
msgid "Lost your password?"
msgstr "암호를 잊으셨습니까?"
-#: templates/login.php:39
+#: templates/login.php:37
msgid "remember"
msgstr "기억하기"
-#: templates/login.php:41
+#: templates/login.php:39
msgid "Log in"
msgstr "로그인"
-#: templates/login.php:47
+#: templates/login.php:45
msgid "Alternative Logins"
msgstr "대체 "
diff --git a/l10n/ko/files.po b/l10n/ko/files.po
index 6141204cfa29d1b024f23b607e75e1e06bfbe15f..d3f72518cc7ec8a6917fb91b37c826c348353391 100644
--- a/l10n/ko/files.po
+++ b/l10n/ko/files.po
@@ -3,15 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Sungjin Gang <potopro@gmail.com>, 2013
-# Sungjin Gang <potopro@gmail.com>, 2013
+# ujuc Gang <potopro@gmail.com>, 2013
+# ujuc Gang <potopro@gmail.com>, 2013
+# smallsnail <bjh13579@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-30 10:14-0400\n"
+"PO-Revision-Date: 2013-09-29 10:06+0000\n"
+"Last-Translator: smallsnail <bjh13579@gmail.com>\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -31,11 +32,11 @@ msgstr "%s 항목을 이딩시키지 못하였음"
#: ajax/upload.php:16 ajax/upload.php:45
msgid "Unable to set upload directory."
-msgstr ""
+msgstr "업로드 디렉터리를 정할수 없습니다"
#: ajax/upload.php:22
msgid "Invalid Token"
-msgstr ""
+msgstr "잘못된 토큰"
#: ajax/upload.php:59
msgid "No file was uploaded. Unknown error"
@@ -76,154 +77,170 @@ msgstr "디스크에 쓰지 못했습니다"
msgid "Not enough storage available"
msgstr "저장소가 용량이 충분하지 않습니다."
-#: ajax/upload.php:123
+#: 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
+#: 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 "디렉터리 및 빈 파일은 업로드할 수 없습니다"
+#: 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: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 "URL을 입력해야 합니다."
-#: 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 ""
+msgstr "유효하지 않은 폴더명입니다. \"Shared\" 이름의 사용은 OwnCloud 가 이미 예약하고 있습니다."
-#: js/file-upload.js:277 js/file-upload.js:293 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:465
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "대기 중"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{new_name}이(가) 이미 존재함"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "바꾸기"
-#: js/filelist.js:303
+#: js/filelist.js:416
msgid "suggest name"
msgstr "이름 제안"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "취소"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr "{old_name}이(가) {new_name}(으)로 대체됨"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "undo"
msgstr "되돌리기"
-#: js/filelist.js:453
+#: 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:534 js/filelist.js:600 js/files.js:582
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] "파일 %n 개"
+
+#: js/filelist.js:541
+msgid "{dirs} and {files}"
+msgstr "{dirs} 그리고 {files}"
+
+#: js/filelist.js:731 js/filelist.js:769
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
-msgstr[0] ""
+msgstr[0] "%n 개의 파일을 업로드중"
-#: js/filelist.js:518
-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: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 "수정됨"
-#: js/files.js:580
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-
-#: js/files.js:586
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-
#: lib/app.php:73
#, php-format
msgid "%s could not be renamed"
-msgstr ""
+msgstr "%s 의 이름을 변경할수 없습니다"
-#: lib/helper.php:11 templates/index.php:18
+#: lib/helper.php:11 templates/index.php:17
msgid "Upload"
msgstr "업로드"
@@ -259,84 +276,68 @@ 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: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 "현재 검색"
-#: templates/part.list.php:74
-msgid "directory"
-msgstr ""
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr ""
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr "파일"
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr "파일"
-
#: templates/upgrade.php:2
msgid "Upgrading filesystem cache..."
msgstr "파일 시스템 캐시 업그레이드 중..."
diff --git a/l10n/ko/files_sharing.po b/l10n/ko/files_sharing.po
index 6de0e6cf3d2cddc20ed32dc279d456a0a0d421c2..da94ad321107391e1cd8d25755d00d873171900e 100644
--- a/l10n/ko/files_sharing.po
+++ b/l10n/ko/files_sharing.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# smallsnail <bjh13579@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-30 10:16-0400\n"
+"PO-Revision-Date: 2013-09-29 10:14+0000\n"
+"Last-Translator: smallsnail <bjh13579@gmail.com>\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,7 +20,7 @@ msgstr ""
#: templates/authenticate.php:4
msgid "The password is wrong. Try again."
-msgstr ""
+msgstr "비밀번호가 틀립니다. 다시 입력해주세요."
#: templates/authenticate.php:7
msgid "Password"
@@ -31,27 +32,27 @@ msgstr "제출"
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
-msgstr ""
+msgstr "죄송합니다만 이 링크는 더이상 작동되지 않습니다."
#: templates/part.404.php:4
msgid "Reasons might be:"
-msgstr ""
+msgstr "이유는 다음과 같을 수 있습니다:"
#: templates/part.404.php:6
msgid "the item was removed"
-msgstr ""
+msgstr "이 항목은 삭제되었습니다"
#: templates/part.404.php:7
msgid "the link expired"
-msgstr ""
+msgstr "링크가 만료되었습니다"
#: templates/part.404.php:8
msgid "sharing is disabled"
-msgstr ""
+msgstr "공유가 비활성되었습니다"
#: templates/part.404.php:10
msgid "For more info, please ask the person who sent this link."
-msgstr ""
+msgstr "더 자세한 설명은 링크를 보내신 분에게 여쭤보십시오"
#: templates/public.php:15
#, php-format
@@ -63,7 +64,7 @@ msgstr "%s 님이 폴더 %s을(를) 공유하였습니다"
msgid "%s shared the file %s with you"
msgstr "%s 님이 파일 %s을(를) 공유하였습니다"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "다운로드"
@@ -75,6 +76,6 @@ msgstr "업로드"
msgid "Cancel upload"
msgstr "업로드 취소"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "다음 항목을 미리 볼 수 없음:"
diff --git a/l10n/ko/files_trashbin.po b/l10n/ko/files_trashbin.po
index 3e48f534a18e85e32eea1c454e0f115b58a6bf52..4d39e2d9acdad8ebd099d633e836d9188057c233 100644
--- a/l10n/ko/files_trashbin.po
+++ b/l10n/ko/files_trashbin.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# smallsnail <bjh13579@gmail.com>, 2013
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"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-30 10:16-0400\n"
+"PO-Revision-Date: 2013-09-29 07:38+0000\n"
+"Last-Translator: smallsnail <bjh13579@gmail.com>\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,63 +21,63 @@ msgstr ""
#: ajax/delete.php:42
#, php-format
msgid "Couldn't delete %s permanently"
-msgstr ""
+msgstr "%s를 영구적으로 삭제할수 없습니다"
#: ajax/undelete.php:42
#, php-format
msgid "Couldn't restore %s"
-msgstr ""
+msgstr "%s를 복원할수 없습니다"
-#: js/trash.js:7 js/trash.js:100
+#: js/trash.js:7 js/trash.js:102
msgid "perform restore operation"
-msgstr ""
+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 "오류"
-#: js/trash.js:36
+#: js/trash.js:37
msgid "delete file permanently"
-msgstr ""
+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 "이름"
-#: js/trash.js:183 templates/index.php:27
+#: js/trash.js:191 templates/index.php:31
msgid "Deleted"
-msgstr ""
+msgstr "삭제됨"
-#: js/trash.js:191
+#: js/trash.js:199
msgid "%n folder"
msgid_plural "%n folders"
-msgstr[0] ""
+msgstr[0] "폴더 %n개"
-#: js/trash.js:197
+#: js/trash.js:205
msgid "%n file"
msgid_plural "%n files"
-msgstr[0] ""
+msgstr[0] "파일 %n개 "
-#: lib/trash.php:819 lib/trash.php:821
+#: lib/trashbin.php:814 lib/trashbin.php:816
msgid "restored"
-msgstr ""
+msgstr "복원됨"
#: templates/index.php:9
msgid "Nothing in here. Your trash bin is empty!"
-msgstr ""
+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 "삭제"
#: templates/part.breadcrumb.php:9
msgid "Deleted Files"
-msgstr ""
+msgstr "삭제된 파일들"
diff --git a/l10n/ko/files_versions.po b/l10n/ko/files_versions.po
index 19ec188ee6c09997312cec52b88b40ba8f6485ca..1a9375ae40014933b127b5c1be3d1f6f144a0fb5 100644
--- a/l10n/ko/files_versions.po
+++ b/l10n/ko/files_versions.po
@@ -4,13 +4,14 @@
#
# Translators:
# Shinjo Park <kde@peremen.name>, 2013
+# smallsnail <bjh13579@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-28 01:56-0400\n"
-"PO-Revision-Date: 2013-07-27 06:10+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-30 10:16-0400\n"
+"PO-Revision-Date: 2013-09-29 10:18+0000\n"
+"Last-Translator: smallsnail <bjh13579@gmail.com>\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -29,16 +30,16 @@ msgstr "버전"
#: js/versions.js:53
msgid "Failed to revert {file} to revision {timestamp}."
-msgstr ""
+msgstr "{timestamp} 판의 {file}로 돌리는데 실패했습니다."
#: js/versions.js:79
msgid "More versions..."
-msgstr ""
+msgstr "더 많은 버전들..."
#: js/versions.js:116
msgid "No other versions available"
-msgstr ""
+msgstr "다른 버전을 사용할수 없습니다"
-#: js/versions.js:149
+#: js/versions.js:145
msgid "Restore"
msgstr "복원"
diff --git a/l10n/ko/lib.po b/l10n/ko/lib.po
index f320d2ae96d63c3f1a6689dfbdc9a793d5cb3c68..ca05c5e13306f6aa14c116bf10e30dd63541f72d 100644
--- a/l10n/ko/lib.po
+++ b/l10n/ko/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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-26 09:30+0000\n"
-"Last-Translator: chohy <chohy@yahoo.com>\n"
+"POT-Creation-Date: 2013-09-30 10:16-0400\n"
+"PO-Revision-Date: 2013-09-29 07:46+0000\n"
+"Last-Translator: smallsnail <bjh13579@gmail.com>\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,42 +19,54 @@ msgstr ""
"Language: ko\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: app.php:239
+#: app.php:237
#, php-format
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
msgstr "현재 ownCloud 버전과 호환되지 않기 때문에 \"%s\" 앱을 설치할 수 없습니다."
-#: app.php:250
+#: app.php:248
msgid "No app name specified"
msgstr "앱 이름이 지정되지 않았습니다."
-#: app.php:361
+#: app.php:352
msgid "Help"
msgstr "도움말"
-#: app.php:374
+#: app.php:365
msgid "Personal"
msgstr "개인"
-#: app.php:385
+#: app.php:376
msgid "Settings"
msgstr "설정"
-#: app.php:397
+#: app.php:388
msgid "Users"
msgstr "사용자"
-#: app.php:410
+#: app.php:401
msgid "Admin"
msgstr "관리자"
-#: app.php:837
+#: app.php:832
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "\"%s\" 업그레이드에 실패했습니다."
+#: 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 "내가 관리하는 웹 서비스"
@@ -84,7 +96,7 @@ msgstr "선택한 파일들은 ZIP 파일을 생성하기에 너무 큽니다."
msgid ""
"Download the files in smaller chunks, seperately or kindly ask your "
"administrator."
-msgstr ""
+msgstr "작은 조각들 안에 들어있는 파일들을 받고자 하신다면, 나누어서 받으시거나 혹은 시스템 관리자에게 정중하게 물어보십시오"
#: installer.php:63
msgid "No source specified when installing app"
@@ -107,37 +119,37 @@ msgstr "%s 타입 아카이브는 지원되지 않습니다."
msgid "Failed to open archive when installing app"
msgstr "앱을 설치할 때 아카이브를 열지 못했습니다."
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr "앱에서 info.xml 파일이 제공되지 않았습니다."
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr "앱에 허용되지 않는 코드가 있어서 앱을 설치할 수 없습니다. "
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr "현재 ownCloud 버전과 호환되지 않기 때문에 앱을 설치할 수 없습니다."
-#: installer.php:144
+#: 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 "출하되지 않은 앱에 허용되지 않는 <shipped>true</shipped> 태그를 포함하고 있기 때문에 앱을 설치할 수 없습니다."
-#: installer.php:150
+#: 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 "info.xml/version에 포함된 버전과 앱 스토어에 보고된 버전이 같지 않아서 앱을 설치할 수 없습니다. "
-#: installer.php:160
+#: installer.php:162
msgid "App directory already exists"
msgstr "앱 디렉토리가 이미 존재합니다. "
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr "앱 폴더를 만들 수 없습니다. 권한을 수정하십시오. %s "
@@ -154,15 +166,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 "그림"
@@ -266,55 +278,55 @@ msgstr "WebDAV 인터페이스가 제대로 작동하지 않습니다. 웹 서
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "<a href='%s'>설치 가이드</a>를 다시 한 번 확인하십시오."
-#: template/functions.php:80
+#: tags.php:194
+#, php-format
+msgid "Could not find category \"%s\""
+msgstr "분류 \"%s\"을(를) 찾을 수 없습니다."
+
+#: template/functions.php:96
msgid "seconds ago"
msgstr "초 전"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n분 전 "
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n시간 전 "
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "오늘"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "어제"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] "%n일 전 "
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "지난 달"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n달 전 "
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "작년"
-#: template/functions.php:89
+#: 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 "분류 \"%s\"을(를) 찾을 수 없습니다."
diff --git a/l10n/ko/settings.po b/l10n/ko/settings.po
index 9556c8739f3c50d09493879f520cf77d1caa5c6e..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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+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,55 +85,88 @@ msgstr "그룹 %s에서 사용자를 삭제할 수 없음"
msgid "Couldn't update app."
msgstr "앱을 업데이트할 수 없습니다."
-#: js/apps.js:35
+#: 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}(으)로 업데이트"
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr "비활성화"
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr "사용함"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr "기다려 주십시오...."
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr "업데이트 중...."
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr "앱을 업데이트하는 중 오류 발생"
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "오류"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr "업데이트"
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr "업데이트됨"
-#: js/personal.js:150
+#: 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:172
+#: js/personal.js:287
msgid "Saving..."
msgstr "저장 중..."
@@ -149,16 +182,16 @@ msgstr "실행 취소"
msgid "Unable to remove user"
msgstr "사용자를 삭제할 수 없음"
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: 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:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "그룹 관리자"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "삭제"
@@ -178,7 +211,7 @@ msgstr "사용자 생성 오류"
msgid "A valid password must be provided"
msgstr "올바른 암호를 입력해야 함"
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "한국어"
@@ -344,11 +377,11 @@ msgstr "더 중요함"
msgid "Less"
msgstr "덜 중요함"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "버전"
-#: templates/admin.php:246 templates/personal.php:143
+#: 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 "
@@ -415,7 +448,7 @@ msgstr "첫 실행 마법사 다시 보이기"
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "현재 공간 중 <strong>%s</strong>/<strong>%s</strong>을(를) 사용 중입니다"
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "암호"
@@ -439,7 +472,7 @@ msgstr "새 암호"
msgid "Change password"
msgstr "암호 변경"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr "표시 이름"
@@ -455,38 +488,66 @@ msgstr "이메일 주소"
msgid "Fill in an email address to enable password recovery"
msgstr "암호 찾기 기능을 사용하려면 이메일 주소를 입력하십시오"
-#: templates/personal.php:85 templates/personal.php:86
+#: 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:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "번역 돕기"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: 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:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "암호화"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -512,30 +573,30 @@ msgstr "암호 변경 시 변경된 사용자 파일을 복구하려면 복구
msgid "Default Storage"
msgstr "기본 저장소"
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr "무제한"
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "기타"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "사용자 이름"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr "저장소"
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr "표시 이름 변경"
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr "새 암호 설정"
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr "기본값"
diff --git a/l10n/ko/user_ldap.po b/l10n/ko/user_ldap.po
index 903dc63b87f59b0b3d65b5425a815f018bf6a84a..1766fef5754c9f90bb3ffc7f69c7cc2fa1d71a4c 100644
--- a/l10n/ko/user_ldap.po
+++ b/l10n/ko/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\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"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ku_IQ/core.po b/l10n/ku_IQ/core.po
index 450c02ae9f93b1a3816f6d0b1710ca6b82f3a84c..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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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"
@@ -22,6 +22,10 @@ msgstr ""
msgid "%s shared »%s« with you"
msgstr ""
+#: ajax/share.php:227
+msgid "group"
+msgstr ""
+
#: ajax/update.php:11
msgid "Turned on maintenance mode"
msgstr ""
@@ -86,6 +90,26 @@ msgstr ""
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 ""
@@ -162,59 +186,59 @@ msgstr ""
msgid "December"
msgstr ""
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "دهستكاری"
-#: js/js.js:812
+#: js/js.js:866
msgid "seconds ago"
msgstr ""
-#: js/js.js:813
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:814
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:815
+#: js/js.js:869
msgid "today"
msgstr ""
-#: js/js.js:816
+#: js/js.js:870
msgid "yesterday"
msgstr ""
-#: js/js.js:817
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:818
+#: js/js.js:872
msgid "last month"
msgstr ""
-#: js/js.js:819
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:820
+#: js/js.js:874
msgid "months ago"
msgstr ""
-#: js/js.js:821
+#: js/js.js:875
msgid "last year"
msgstr ""
-#: js/js.js:822
+#: js/js.js:876
msgid "years ago"
msgstr ""
@@ -222,22 +246,66 @@ msgstr ""
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:195
+#: 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."
@@ -247,7 +315,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:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "ههڵه"
@@ -265,9 +333,9 @@ msgstr ""
#: js/share.js:90
msgid "Share"
-msgstr ""
+msgstr "هاوبەشی کردن"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr ""
@@ -323,67 +391,67 @@ msgstr ""
msgid "Expiration date"
msgstr ""
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr ""
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr ""
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr ""
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr ""
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr ""
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr ""
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr ""
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr ""
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr ""
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr ""
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr ""
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr ""
@@ -398,7 +466,7 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr ""
@@ -467,7 +535,7 @@ msgstr ""
msgid "Users"
msgstr "بهكارهێنهر"
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "بهرنامهكان"
@@ -596,14 +664,10 @@ msgstr "كۆتایی هات دهستكاریهكان"
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "چوونەدەرەوە"
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr ""
@@ -618,19 +682,19 @@ msgstr ""
msgid "Please change your password to secure your account again."
msgstr ""
-#: templates/login.php:34
+#: templates/login.php:32
msgid "Lost your password?"
msgstr ""
-#: templates/login.php:39
+#: templates/login.php:37
msgid "remember"
msgstr ""
-#: templates/login.php:41
+#: templates/login.php:39
msgid "Log in"
msgstr ""
-#: templates/login.php:47
+#: templates/login.php:45
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/ku_IQ/files.po b/l10n/ku_IQ/files.po
index b8a21fbbfc6c2381eba0639d27d19075c910a813..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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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,7 +74,15 @@ msgstr ""
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:123
+#: 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 ""
@@ -82,149 +90,157 @@ 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: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:277 js/file-upload.js:293 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 ""
+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:465
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr ""
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr ""
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr ""
-#: js/filelist.js:303
+#: js/filelist.js:416
msgid "suggest name"
msgstr ""
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr ""
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr ""
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "undo"
msgstr ""
-#: js/filelist.js:453
-msgid "Uploading %n file"
-msgid_plural "Uploading %n files"
+#: 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:518
-msgid "files uploading"
+#: 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/files.js:52
+#: 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: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 ""
-#: js/files.js:580
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/files.js:586
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-
#: lib/app.php:73
#, php-format
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 "بارکردن"
@@ -260,84 +276,68 @@ 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 ""
-#: templates/part.list.php:74
-msgid "directory"
-msgstr ""
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr ""
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr ""
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr ""
-
#: templates/upgrade.php:2
msgid "Upgrading filesystem cache..."
msgstr ""
diff --git a/l10n/ku_IQ/files_sharing.po b/l10n/ku_IQ/files_sharing.po
index 83b88021ea2ed7aec7202bc1fb3faefacd629e34..d1abf7c6c827036a9720f1f75089a31cfe0e0a7e 100644
--- a/l10n/ku_IQ/files_sharing.po
+++ b/l10n/ku_IQ/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:01+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"
@@ -63,7 +63,7 @@ msgstr "%s دابهشی کردووه بوخچهی %s لهگهڵ
msgid "%s shared the file %s with you"
msgstr "%s دابهشی کردووه پهڕگهیی %s لهگهڵ تۆ"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "داگرتن"
@@ -75,6 +75,6 @@ msgstr "بارکردن"
msgid "Cancel upload"
msgstr ""
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "هیچ پێشبینیهك ئاماده نیه بۆ"
diff --git a/l10n/ku_IQ/lib.po b/l10n/ku_IQ/lib.po
index 06a8f2c010f49870717a1a69eee55dc5b602e87d..448dd823748fccc416069916bea3c6933d103969 100644
--- a/l10n/ku_IQ/lib.po
+++ b/l10n/ku_IQ/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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\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"
"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
"MIME-Version: 1.0\n"
@@ -48,11 +48,23 @@ msgstr "بهكارهێنهر"
msgid "Admin"
msgstr "بهڕێوهبهری سهرهكی"
-#: app.php:837
+#: 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 "ڕاژهی وێب لهژێر چاودێریت دایه"
@@ -105,37 +117,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: 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:150
+#: 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:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -264,51 +276,51 @@ msgstr ""
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr ""
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr ""
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr ""
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr ""
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr ""
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr ""
diff --git a/l10n/ku_IQ/settings.po b/l10n/ku_IQ/settings.po
index 943ca690406b46cf4fdea4583e875a9fa9578bba..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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+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 ""
@@ -64,7 +64,7 @@ msgstr ""
#: ajax/setlanguage.php:17 ajax/setlanguage.php:20
msgid "Invalid request"
-msgstr ""
+msgstr "داواکارى نادروستە"
#: ajax/togglegroups.php:12
msgid "Admins can't remove themself from the admin group"
@@ -84,55 +84,88 @@ msgstr ""
msgid "Couldn't update app."
msgstr ""
-#: js/apps.js:35
+#: 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:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr ""
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr "چالاککردن"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr ""
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "ههڵه"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr "نوێکردنهوه"
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr ""
-#: js/personal.js:150
+#: 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:172
+#: js/personal.js:287
msgid "Saving..."
msgstr "پاشکهوتدهکات..."
@@ -148,16 +181,16 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: 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:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr ""
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr ""
@@ -177,7 +210,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr ""
@@ -343,11 +376,11 @@ msgstr ""
msgid "Less"
msgstr ""
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr ""
-#: templates/admin.php:246 templates/personal.php:143
+#: 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 "
@@ -414,7 +447,7 @@ msgstr ""
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:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "وشەی تێپەربو"
@@ -438,7 +471,7 @@ msgstr "وشەی نهێنی نوێ"
msgid "Change password"
msgstr ""
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr ""
@@ -454,38 +487,66 @@ msgstr ""
msgid "Fill in an email address to enable password recovery"
msgstr ""
-#: templates/personal.php:85 templates/personal.php:86
-msgid "Language"
+#: 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:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:106
+#: 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:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "نهێنیکردن"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -511,30 +572,30 @@ msgstr ""
msgid "Default Storage"
msgstr ""
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr ""
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr ""
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "ناوی بهکارهێنهر"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr ""
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr ""
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr ""
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr ""
diff --git a/l10n/ku_IQ/user_ldap.po b/l10n/ku_IQ/user_ldap.po
index c2ca53a1932263f426c9818cde00569e1bd0552d..724271784b6a2b65a4180ae91ca5e67d12c4e56d 100644
--- a/l10n/ku_IQ/user_ldap.po
+++ b/l10n/ku_IQ/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\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"
"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/lb/core.po b/l10n/lb/core.po
index a657f8989ded12fb3f510d989cbd0fdfc3b6da9e..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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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"
@@ -23,6 +23,10 @@ msgstr ""
msgid "%s shared »%s« with you"
msgstr "Den/D' %s huet »%s« mat dir gedeelt"
+#: ajax/share.php:227
+msgid "group"
+msgstr "Grupp"
+
#: ajax/update.php:11
msgid "Turned on maintenance mode"
msgstr ""
@@ -87,6 +91,26 @@ msgstr "Keng Kategorien ausgewielt fir ze läschen."
msgid "Error removing %s from favorites."
msgstr "Feeler beim läsche vun %s aus de Favoritten."
+#: 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 "Sonndeg"
@@ -163,59 +187,59 @@ msgstr "November"
msgid "December"
msgstr "Dezember"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "Astellungen"
-#: js/js.js:812
+#: js/js.js:866
msgid "seconds ago"
msgstr "Sekonnen hir"
-#: js/js.js:813
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:814
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:815
+#: js/js.js:869
msgid "today"
msgstr "haut"
-#: js/js.js:816
+#: js/js.js:870
msgid "yesterday"
msgstr "gëschter"
-#: js/js.js:817
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:818
+#: js/js.js:872
msgid "last month"
msgstr "leschte Mount"
-#: js/js.js:819
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:820
+#: js/js.js:874
msgid "months ago"
msgstr "Méint hir"
-#: js/js.js:821
+#: js/js.js:875
msgid "last year"
msgstr "Lescht Joer"
-#: js/js.js:822
+#: js/js.js:876
msgid "years ago"
msgstr "Joren hir"
@@ -223,22 +247,66 @@ msgstr "Joren hir"
msgid "Choose"
msgstr "Auswielen"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
-msgstr "Feeler beim Luede vun der Virlag fir d'Fichiers-Selektioun"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
+msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "Jo"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "Nee"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
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] ""
+
+#: 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."
@@ -248,7 +316,7 @@ msgstr "Den Typ vum Object ass net uginn."
#: 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:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "Feeler"
@@ -268,7 +336,7 @@ msgstr "Gedeelt"
msgid "Share"
msgstr "Deelen"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr "Feeler beim Deelen"
@@ -324,67 +392,67 @@ msgstr "Verfallsdatum setzen"
msgid "Expiration date"
msgstr "Verfallsdatum"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "Via E-Mail deelen:"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "Keng Persoune fonnt"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "Weiderdeelen ass net erlaabt"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr "Gedeelt an {item} mat {user}"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "Net méi deelen"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "kann änneren"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "Zougrëffskontroll"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "erstellen"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "aktualiséieren"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "läschen"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "deelen"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "Passwuertgeschützt"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr "Feeler beim Läsche vum Verfallsdatum"
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr "Feeler beim Setze vum Verfallsdatum"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr "Gëtt geschéckt..."
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr "Email geschéckt"
@@ -399,7 +467,7 @@ msgstr "Den Update war net erfollegräich. Mell dëse Problem w.e.gl der<a href=
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Den Update war erfollegräich. Du gëss elo bei d'ownCloud ëmgeleet."
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr ""
@@ -468,7 +536,7 @@ msgstr "Perséinlech"
msgid "Users"
msgstr "Benotzer"
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "Applikatiounen"
@@ -597,14 +665,10 @@ msgstr "Installatioun ofschléissen"
msgid "%s is available. Get more information on how to update."
msgstr "%s ass verfügbar. Kréi méi Informatiounen doriwwer wéi d'Aktualiséierung ofleeft."
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "Ofmellen"
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "Automatesch Umeldung ofgeleent!"
@@ -619,19 +683,19 @@ msgstr "Falls du däi Passwuert net viru kuerzem geännert hues, kéint däin Ac
msgid "Please change your password to secure your account again."
msgstr "Änner w.e.gl däi Passwuert fir däin Account nees ofzesécheren."
-#: templates/login.php:34
+#: templates/login.php:32
msgid "Lost your password?"
msgstr "Passwuert vergiess?"
-#: templates/login.php:39
+#: templates/login.php:37
msgid "remember"
msgstr "verhalen"
-#: templates/login.php:41
+#: templates/login.php:39
msgid "Log in"
msgstr "Umellen"
-#: templates/login.php:47
+#: templates/login.php:45
msgid "Alternative Logins"
msgstr "Alternativ Umeldungen"
diff --git a/l10n/lb/files.po b/l10n/lb/files.po
index 2b25a70819b99decc6e56afdf0ac962fbeb24c90..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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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,7 +74,15 @@ msgstr "Konnt net op den Disk schreiwen"
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:123
+#: 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 ""
@@ -82,149 +90,157 @@ 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: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 "File Upload am gaang. Wann's de des Säit verléiss gëtt den Upload ofgebrach."
-#: 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:277 js/file-upload.js:293 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 "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:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr ""
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr ""
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "ersetzen"
-#: js/filelist.js:303
+#: js/filelist.js:416
msgid "suggest name"
msgstr ""
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "ofbriechen"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr ""
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "undo"
msgstr "réckgängeg man"
-#: js/filelist.js:453
-msgid "Uploading %n file"
-msgid_plural "Uploading %n files"
+#: 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:518
-msgid "files uploading"
+#: 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/files.js:52
+#: 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: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 "Numm"
-#: js/files.js:563 templates/index.php:78
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "Gréisst"
-#: js/files.js:564 templates/index.php:80
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr "Geännert"
-#: js/files.js:580
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/files.js:586
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-
#: lib/app.php:73
#, php-format
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"
@@ -260,84 +276,68 @@ 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: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 "Net méi deelen"
-#: templates/index.php:91 templates/index.php:92
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "Läschen"
-#: templates/index.php:105
+#: templates/index.php:100
msgid "Upload too large"
msgstr "Upload ze grouss"
-#: 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 "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:112
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr "Fichieren gi gescannt, war weg."
-#: templates/index.php:115
+#: templates/index.php:110
msgid "Current scanning"
msgstr "Momentane Scan"
-#: templates/part.list.php:74
-msgid "directory"
-msgstr ""
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr ""
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr "Datei"
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr "Dateien"
-
#: templates/upgrade.php:2
msgid "Upgrading filesystem cache..."
msgstr ""
diff --git a/l10n/lb/files_sharing.po b/l10n/lb/files_sharing.po
index caaaa536d104a5eb16e41ff09e4beedeec08dc55..3fba12cda24d0874476dbd6fc9d3064c9081beac 100644
--- a/l10n/lb/files_sharing.po
+++ b/l10n/lb/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00: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"
@@ -64,7 +64,7 @@ msgstr "%s huet den Dossier %s mad der gedeelt"
msgid "%s shared the file %s with you"
msgstr "%s deelt den Fichier %s mad dir"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "Download"
@@ -76,6 +76,6 @@ msgstr "Eroplueden"
msgid "Cancel upload"
msgstr "Upload ofbriechen"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "Keeng Preview do fir"
diff --git a/l10n/lb/lib.po b/l10n/lb/lib.po
index e8a02a77cbbeb6184d511ce08966e70e4ec8ed75..bd8ee7af792695e0393d0cb5e424e9c43658ca9f 100644
--- a/l10n/lb/lib.po
+++ b/l10n/lb/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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\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"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
@@ -49,11 +49,23 @@ msgstr "Benotzer"
msgid "Admin"
msgstr "Admin"
-#: app.php:837
+#: 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 "Web-Servicer ënnert denger Kontroll"
@@ -106,37 +118,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: 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:150
+#: 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:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -265,51 +277,51 @@ msgstr ""
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "Sekonnen hir"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "haut"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "gëschter"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "Läschte Mount"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "Läscht Joer"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "Joren hier"
diff --git a/l10n/lb/settings.po b/l10n/lb/settings.po
index 195b886e8d6d4a5102f158b0a029c76218cbb5ef..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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+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,55 +85,88 @@ msgstr ""
msgid "Couldn't update app."
msgstr ""
-#: js/apps.js:35
+#: 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:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr "Ofschalten"
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr "Aschalten"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr ""
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "Fehler"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr ""
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr ""
-#: js/personal.js:150
+#: 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:172
+#: js/personal.js:287
msgid "Saving..."
msgstr "Speicheren..."
@@ -149,16 +182,16 @@ msgstr "réckgängeg man"
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "Gruppen"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "Gruppen Admin"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "Läschen"
@@ -178,7 +211,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "__language_name__"
@@ -344,11 +377,11 @@ msgstr "Méi"
msgid "Less"
msgstr ""
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr ""
-#: templates/admin.php:246 templates/personal.php:143
+#: 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 "
@@ -415,7 +448,7 @@ msgstr ""
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:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "Passwuert"
@@ -439,7 +472,7 @@ msgstr "Neit Passwuert"
msgid "Change password"
msgstr "Passwuert änneren"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr ""
@@ -455,38 +488,66 @@ msgstr "Deng Email Adress"
msgid "Fill in an email address to enable password recovery"
msgstr "Gëff eng Email Adress an fir d'Passwuert recovery ze erlaben"
-#: templates/personal.php:85 templates/personal.php:86
+#: 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 "Sprooch"
-#: templates/personal.php:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "Hëllef iwwersetzen"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:106
+#: 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:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr ""
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -512,30 +573,30 @@ msgstr ""
msgid "Default Storage"
msgstr ""
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr ""
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "Aner"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "Benotzernumm"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr ""
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr ""
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr ""
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr ""
diff --git a/l10n/lb/user_ldap.po b/l10n/lb/user_ldap.po
index 291529dde43de73da6eb3ff9799ea2e34d4078ba..5b73ccc321a130a4dfe2946f85b605d22d22383b 100644
--- a/l10n/lb/user_ldap.po
+++ b/l10n/lb/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\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"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/lt_LT/core.po b/l10n/lt_LT/core.po
index 7921e349d8489c3350c1fd65e55bb35f5e49bd36..4a22a7c94823bb76f855c3d3c006813ab6dc4624 100644
--- a/l10n/lt_LT/core.po
+++ b/l10n/lt_LT/core.po
@@ -3,6 +3,7 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Liudas Ališauskas <liudas.alisauskas@gmail.com>, 2013
# mambuta <vspyshkin@gmail.com>, 2013
# Roman Deniobe <rms200x@gmail.com>, 2013
# fizikiukas <fizikiukas@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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-30 10:16-0400\n"
+"PO-Revision-Date: 2013-09-29 07:58+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"
@@ -25,30 +26,34 @@ msgstr ""
msgid "%s shared »%s« with you"
msgstr "%s pasidalino »%s« su tavimi"
+#: ajax/share.php:227
+msgid "group"
+msgstr "grupė"
+
#: ajax/update.php:11
msgid "Turned on maintenance mode"
-msgstr ""
+msgstr "Įjungta priežiūros veiksena"
#: ajax/update.php:14
msgid "Turned off maintenance mode"
-msgstr ""
+msgstr "Išjungta priežiūros veiksena"
#: ajax/update.php:17
msgid "Updated database"
-msgstr ""
+msgstr "Atnaujinta duomenų bazė"
#: ajax/update.php:20
msgid "Updating filecache, this may take really long..."
-msgstr ""
+msgstr "Atnaujinama failų talpykla, tai gali užtrukti labai ilgai..."
#: ajax/update.php:23
msgid "Updated filecache"
-msgstr ""
+msgstr "Atnaujinta failų talpykla"
#: ajax/update.php:26
#, php-format
msgid "... %d%% done ..."
-msgstr ""
+msgstr "... %d%% atlikta ..."
#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
msgid "Category type not provided."
@@ -89,6 +94,26 @@ msgstr "Trynimui nepasirinkta jokia kategorija."
msgid "Error removing %s from favorites."
msgstr "Klaida ištrinant %s iš jūsų mėgstamiausius."
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr "Nenurodytas paveikslėlis ar failas"
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr "Nežinomas failo tipas"
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr "Netinkamas paveikslėlis"
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr "Nėra laikino profilio paveikslėlio, bandykite dar kartą"
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr "Nenurodyti apkirpimo duomenys"
+
#: js/config.php:32
msgid "Sunday"
msgstr "Sekmadienis"
@@ -165,63 +190,63 @@ msgstr "Lapkritis"
msgid "December"
msgstr "Gruodis"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "Nustatymai"
-#: js/js.js:812
+#: js/js.js:866
msgid "seconds ago"
msgstr "prieš sekundę"
-#: js/js.js:813
+#: 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:814
+#: 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:815
+#: js/js.js:869
msgid "today"
msgstr "šiandien"
-#: js/js.js:816
+#: js/js.js:870
msgid "yesterday"
msgstr "vakar"
-#: js/js.js:817
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "prieš %n dieną"
+msgstr[1] "prieš %n dienas"
+msgstr[2] "prieš %n dienų"
-#: js/js.js:818
+#: js/js.js:872
msgid "last month"
msgstr "praeitą mėnesį"
-#: js/js.js:819
+#: 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:820
+#: js/js.js:874
msgid "months ago"
msgstr "prieš mėnesį"
-#: js/js.js:821
+#: js/js.js:875
msgid "last year"
msgstr "praeitais metais"
-#: js/js.js:822
+#: js/js.js:876
msgid "years ago"
msgstr "prieš metus"
@@ -229,22 +254,67 @@ msgstr "prieš metus"
msgid "Choose"
msgstr "Pasirinkite"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
-msgstr "Klaida pakraunant failų naršyklę"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
+msgstr "Klaida įkeliant failo parinkimo ruošinį: {error}"
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "Taip"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "Ne"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
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] "{count} failas konfliktuoja"
+msgstr[1] "{count} failai konfliktuoja"
+msgstr[2] "{count} failų konfliktų"
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr "Vienas failo konfliktas"
+
+#: js/oc-dialogs.js:367
+msgid "Which files do you want to keep?"
+msgstr "Kuriuos failus norite laikyti?"
+
+#: js/oc-dialogs.js:368
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr "Jei pasirenkate abi versijas, nukopijuotas failas turės pridėtą numerį pavadinime."
+
+#: js/oc-dialogs.js:376
+msgid "Cancel"
+msgstr "Atšaukti"
+
+#: js/oc-dialogs.js:386
+msgid "Continue"
+msgstr "Tęsti"
+
+#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+msgid "(all selected)"
+msgstr "(visi pažymėti)"
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "({count} selected)"
+msgstr "({count} pažymėtų)"
+
+#: js/oc-dialogs.js:457
+msgid "Error loading file exists template"
+msgstr "Klaida įkeliant esančių failų ruošinį"
+
#: 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."
@@ -254,7 +324,7 @@ msgstr "Objekto tipas nenurodytas."
#: 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:643 js/share.js:655
+#: js/share.js:656 js/share.js:668
msgid "Error"
msgstr "Klaida"
@@ -274,7 +344,7 @@ msgstr "Dalinamasi"
msgid "Share"
msgstr "Dalintis"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:696
msgid "Error while sharing"
msgstr "Klaida, dalijimosi metu"
@@ -312,7 +382,7 @@ msgstr "Slaptažodis"
#: js/share.js:198
msgid "Allow Public Upload"
-msgstr ""
+msgstr "Leisti viešą įkėlimą"
#: js/share.js:202
msgid "Email link to person"
@@ -330,67 +400,67 @@ msgstr "Nustatykite galiojimo laiką"
msgid "Expiration date"
msgstr "Galiojimo laikas"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "Dalintis per el. paštą:"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "Žmonių nerasta"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "Dalijinasis išnaujo negalimas"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr "Pasidalino {item} su {user}"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "Nebesidalinti"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "gali redaguoti"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "priėjimo kontrolė"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "sukurti"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "atnaujinti"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "ištrinti"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "dalintis"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:643
msgid "Password protected"
msgstr "Apsaugota slaptažodžiu"
-#: js/share.js:643
+#: js/share.js:656
msgid "Error unsetting expiration date"
msgstr "Klaida nuimant galiojimo laiką"
-#: js/share.js:655
+#: js/share.js:668
msgid "Error setting expiration date"
msgstr "Klaida nustatant galiojimo laiką"
-#: js/share.js:670
+#: js/share.js:683
msgid "Sending ..."
msgstr "Siunčiama..."
-#: js/share.js:681
+#: js/share.js:694
msgid "Email sent"
msgstr "Laiškas išsiųstas"
@@ -405,7 +475,7 @@ msgstr "Atnaujinimas buvo nesėkmingas. PApie tai prašome pranešti the <a href
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Atnaujinimas buvo sėkmingas. Nukreipiame į jūsų ownCloud."
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr "%s slaptažodžio atnaujinimas"
@@ -440,7 +510,7 @@ msgid ""
"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 ""
+msgstr "Jūsų failai yra užšifruoti. Jei neįjungėte atstatymo rakto, nebus galimybės atstatyti duomenų po slaptažodžio atstatymo. Jei nesate tikri ką daryti, prašome susisiekti su administratoriumi prie tęsiant. Ar tikrai tęsti?"
#: lostpassword/templates/lostpassword.php:24
msgid "Yes, I really want to reset my password now"
@@ -474,7 +544,7 @@ msgstr "Asmeniniai"
msgid "Users"
msgstr "Vartotojai"
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "Programos"
@@ -503,7 +573,7 @@ msgid ""
"View it: %s\n"
"\n"
"Cheers!"
-msgstr ""
+msgstr "Labas,\n\nInformuojame, kad %s pasidalino su Jumis %s.\nPažiūrėkite: %s\n\nLinkėjimai!"
#: templates/edit_categories_dialog.php:4
msgid "Edit categories"
@@ -525,7 +595,7 @@ msgstr "Jūsų PHP versija yra pažeidžiama prieš NULL Byte ataką (CVE-2006-7
#: templates/installation.php:26
#, php-format
msgid "Please update your PHP installation to use %s securely."
-msgstr ""
+msgstr "Prašome atnaujinti savo PHP, kad saugiai naudoti %s."
#: templates/installation.php:32
msgid ""
@@ -550,7 +620,7 @@ msgstr "Jūsų failai yra tikriausiai prieinami per internetą nes .htaccess fai
msgid ""
"For information how to properly configure your server, please see the <a "
"href=\"%s\" target=\"_blank\">documentation</a>."
-msgstr ""
+msgstr "Kad gauti informaciją apie tai kaip tinkamai sukonfigūruoti savo serverį, prašome skaityti <a href=\"%s\" target=\"_blank\">dokumentaciją</a>."
#: templates/installation.php:47
msgid "Create an <strong>admin account</strong>"
@@ -603,14 +673,10 @@ msgstr "Baigti diegimą"
msgid "%s is available. Get more information on how to update."
msgstr "%s yra prieinama. Gaukite daugiau informacijos apie atnaujinimą."
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "Atsijungti"
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr "Daugiau programų"
-
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "Automatinis prisijungimas atmestas!"
@@ -625,19 +691,19 @@ msgstr "Jei paskutinių metu nekeitėte savo slaptažodžio, Jūsų paskyra gali
msgid "Please change your password to secure your account again."
msgstr "Prašome pasikeisti slaptažodį dar kartą, dėl paskyros saugumo."
-#: templates/login.php:34
+#: templates/login.php:32
msgid "Lost your password?"
msgstr "Pamiršote slaptažodį?"
-#: templates/login.php:39
+#: templates/login.php:37
msgid "remember"
msgstr "prisiminti"
-#: templates/login.php:41
+#: templates/login.php:39
msgid "Log in"
msgstr "Prisijungti"
-#: templates/login.php:47
+#: templates/login.php:45
msgid "Alternative Logins"
msgstr "Alternatyvūs prisijungimai"
@@ -646,7 +712,7 @@ msgstr "Alternatyvūs prisijungimai"
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 ""
+msgstr "Labas,<br><br>tik informuojame, kad %s pasidalino su Jumis »%s«.<br><a href=\"%s\">Peržiūrėk!</a><br><br>Linkėjimai!"
#: templates/update.php:3
#, php-format
diff --git a/l10n/lt_LT/files.po b/l10n/lt_LT/files.po
index d6f81df72fda0cfb1b03135b44434c523f63206c..829d61188a31a491a0179d017fce7f38ad3335cc 100644
--- a/l10n/lt_LT/files.po
+++ b/l10n/lt_LT/files.po
@@ -3,14 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Liudas Ališauskas <liudas.alisauskas@gmail.com>, 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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-30 10:14-0400\n"
+"PO-Revision-Date: 2013-09-29 08:46+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"
@@ -30,11 +31,11 @@ msgstr "Nepavyko perkelti %s"
#: ajax/upload.php:16 ajax/upload.php:45
msgid "Unable to set upload directory."
-msgstr ""
+msgstr "Nepavyksta nustatyti įkėlimų katalogo."
#: ajax/upload.php:22
msgid "Invalid Token"
-msgstr ""
+msgstr "Netinkamas ženklas"
#: ajax/upload.php:59
msgid "No file was uploaded. Unknown error"
@@ -75,160 +76,176 @@ msgstr "Nepavyko įrašyti į diską"
msgid "Not enough storage available"
msgstr "Nepakanka vietos serveryje"
-#: ajax/upload.php:123
+#: ajax/upload.php:120 ajax/upload.php:143
+msgid "Upload failed. Could not get file info."
+msgstr "Įkėlimas nepavyko. Nepavyko gauti failo informacijos."
+
+#: ajax/upload.php:136
+msgid "Upload failed. Could not find uploaded file"
+msgstr "Įkėlimas nepavyko. Nepavyko rasti įkelto failo"
+
+#: ajax/upload.php:160
msgid "Invalid directory."
msgstr "Neteisingas aplankas"
-#: appinfo/app.php:12
+#: appinfo/app.php:11
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 "Nepavyksta įkelti {filename}, nes tai katalogas arba yra 0 baitų dydžio"
-#: 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:167
+#: js/file-upload.js:356
+msgid "Could not get result from server."
+msgstr "Nepavyko gauti rezultato iš serverio."
+
+#: 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:241
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr "URL negali būti tuščias."
-#: 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 "Negalimas aplanko pavadinimas. 'Shared' pavadinimas yra rezervuotas ownCloud"
-#: js/file-upload.js:277 js/file-upload.js:293 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 "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:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "Laukiantis"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{new_name} jau egzistuoja"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "pakeisti"
-#: js/filelist.js:303
+#: js/filelist.js:416
msgid "suggest name"
msgstr "pasiūlyti pavadinimą"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "atšaukti"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr "pakeiskite {new_name} į {old_name}"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "undo"
msgstr "anuliuoti"
-#: js/filelist.js:453
+#: 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: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:541
+msgid "{dirs} and {files}"
+msgstr "{dirs} ir {files}"
+
+#: js/filelist.js:731 js/filelist.js:769
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Įkeliamas %n failas"
+msgstr[1] "Įkeliami %n failai"
+msgstr[2] "Įkeliama %n failų"
-#: js/filelist.js:518
-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 ""
+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:562 templates/index.php:67
+#: js/files.js:507 js/files.js:545
+msgid "Error moving file"
+msgstr "Klaida perkeliant failą"
+
+#: js/files.js:558 templates/index.php:61
msgid "Name"
msgstr "Pavadinimas"
-#: js/files.js:563 templates/index.php:78
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "Dydis"
-#: js/files.js:564 templates/index.php:80
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr "Pakeista"
-#: js/files.js:580
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: js/files.js:586
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
#: lib/app.php:73
#, php-format
msgid "%s could not be renamed"
-msgstr ""
+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"
@@ -264,84 +281,68 @@ 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:73
+#: templates/index.php:67
msgid "Download"
msgstr "Atsisiųsti"
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr "Nebesidalinti"
-#: templates/index.php:91 templates/index.php:92
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "Ištrinti"
-#: templates/index.php:105
+#: templates/index.php:100
msgid "Upload too large"
msgstr "Įkėlimui failas per didelis"
-#: 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 "Bandomų įkelti failų dydis viršija maksimalų, kuris leidžiamas šiame serveryje"
-#: templates/index.php:112
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr "Skenuojami failai, prašome palaukti."
-#: templates/index.php:115
+#: templates/index.php:110
msgid "Current scanning"
msgstr "Šiuo metu skenuojama"
-#: templates/part.list.php:74
-msgid "directory"
-msgstr ""
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr ""
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr "failas"
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr "failai"
-
#: templates/upgrade.php:2
msgid "Upgrading filesystem cache..."
msgstr "Atnaujinamas sistemos kešavimas..."
diff --git a/l10n/lt_LT/files_encryption.po b/l10n/lt_LT/files_encryption.po
index b8b075046ac2945d2834950b06bbccc1ccdb488f..b37c78e711c2985e0fddd0e7980a75d02ac03bff 100644
--- a/l10n/lt_LT/files_encryption.po
+++ b/l10n/lt_LT/files_encryption.po
@@ -3,14 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Liudas Ališauskas <liudas.alisauskas@gmail.com>, 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-08-21 08:10-0400\n"
-"PO-Revision-Date: 2013-08-19 19:20+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-13 08:20+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"
@@ -46,13 +47,13 @@ msgstr "Slaptažodis nebuvo pakeistas. Gali būti, kad buvo neteisingai suvestas
#: ajax/updatePrivateKeyPassword.php:51
msgid "Private key password successfully updated."
-msgstr ""
+msgstr "Privataus rakto slaptažodis buvo sėkmingai atnaujintas."
#: ajax/updatePrivateKeyPassword.php:53
msgid ""
"Could not update the private key password. Maybe the old password was not "
"correct."
-msgstr ""
+msgstr "Nepavyko atnaujinti privataus rakto slaptažodžio. Gali būti, kad buvo neteisingai suvestas senasis."
#: files/error.php:7
msgid ""
@@ -60,22 +61,22 @@ msgid ""
"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 ""
+msgstr "Jūsų privatus raktas yra netinkamas! Panašu, kad Jūsų slaptažodis buvo pakeistas išorėje ownCloud sistemos (pvz. Jūsų organizacijos kataloge). Galite atnaujinti savo privataus rakto slaptažodį savo asmeniniuose nustatymuose, kad atkurti prieigą prie savo šifruotų failų."
-#: hooks/hooks.php:41
+#: hooks/hooks.php:51
msgid "Missing requirements."
-msgstr ""
+msgstr "Trūkstami laukai."
-#: hooks/hooks.php:42
+#: hooks/hooks.php:52
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 ""
+msgstr "Prašome įsitikinti, kad PHP 5.3.3 ar naujesnė yra įdiegta ir kad OpenSSL kartu su PHP plėtiniu yra šjungti ir teisingai sukonfigūruoti. Kol kas šifravimo programa bus išjungta."
-#: hooks/hooks.php:249
+#: hooks/hooks.php:250
msgid "Following users are not set up for encryption:"
-msgstr ""
+msgstr "Sekantys naudotojai nenustatyti šifravimui:"
#: js/settings-admin.js:11
msgid "Saving..."
@@ -85,15 +86,15 @@ msgstr "Saugoma..."
msgid ""
"Your private key is not valid! Maybe the your password was changed from "
"outside."
-msgstr ""
+msgstr "Jūsų privatus raktas yra netinkamas! Galbūt Jūsų slaptažodis buvo pakeistas iš išorės?"
#: templates/invalid_private_key.php:7
msgid "You can unlock your private key in your "
-msgstr ""
+msgstr "Galite atrakinti savo privatų raktą savo"
#: templates/invalid_private_key.php:7
msgid "personal settings"
-msgstr ""
+msgstr "asmeniniai nustatymai"
#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
@@ -102,11 +103,11 @@ msgstr "Šifravimas"
#: templates/settings-admin.php:10
msgid ""
"Enable recovery key (allow to recover users files in case of password loss):"
-msgstr ""
+msgstr "Įjunkite atkūrimo raktą, (leisti atkurti naudotojų failus praradus slaptažodį):"
#: templates/settings-admin.php:14
msgid "Recovery key password"
-msgstr ""
+msgstr "Atkūrimo rakto slaptažodis"
#: templates/settings-admin.php:21 templates/settings-personal.php:54
msgid "Enabled"
@@ -118,15 +119,15 @@ msgstr "Išjungta"
#: templates/settings-admin.php:34
msgid "Change recovery key password:"
-msgstr ""
+msgstr "Pakeisti atkūrimo rakto slaptažodį:"
#: templates/settings-admin.php:41
msgid "Old Recovery key password"
-msgstr ""
+msgstr "Senas atkūrimo rakto slaptažodis"
#: templates/settings-admin.php:48
msgid "New Recovery key password"
-msgstr ""
+msgstr "Naujas atkūrimo rakto slaptažodis"
#: templates/settings-admin.php:53
msgid "Change Password"
@@ -134,43 +135,43 @@ msgstr "Pakeisti slaptažodį"
#: templates/settings-personal.php:11
msgid "Your private key password no longer match your log-in password:"
-msgstr ""
+msgstr "Privatus rakto slaptažodis daugiau neatitinka Jūsų prisijungimo slaptažodžio:"
#: templates/settings-personal.php:14
msgid "Set your old private key password to your current log-in password."
-msgstr ""
+msgstr "Nustatyti Jūsų privataus rakto slaptažodį į Jūsų dabartinį prisijungimo."
#: templates/settings-personal.php:16
msgid ""
" If you don't remember your old password you can ask your administrator to "
"recover your files."
-msgstr ""
+msgstr "Jei nepamenate savo seno slaptažodžio, galite paprašyti administratoriaus atkurti Jūsų failus."
#: templates/settings-personal.php:24
msgid "Old log-in password"
-msgstr ""
+msgstr "Senas prisijungimo slaptažodis"
#: templates/settings-personal.php:30
msgid "Current log-in password"
-msgstr ""
+msgstr "Dabartinis prisijungimo slaptažodis"
#: templates/settings-personal.php:35
msgid "Update Private Key Password"
-msgstr ""
+msgstr "Atnaujinti privataus rakto slaptažodį"
#: templates/settings-personal.php:45
msgid "Enable password recovery:"
-msgstr ""
+msgstr "Įjungti slaptažodžio atkūrimą:"
#: 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 ""
+msgstr "Įjungus šią funkciją jums bus suteiktas pakartotinis priėjimas prie Jūsų šifruotų failų pamiršus slaptažodį."
#: templates/settings-personal.php:63
msgid "File recovery settings updated"
-msgstr "Failų atstatymo nustatymai pakeisti"
+msgstr "Failų atkūrimo nustatymai pakeisti"
#: templates/settings-personal.php:64
msgid "Could not update file recovery"
diff --git a/l10n/lt_LT/files_sharing.po b/l10n/lt_LT/files_sharing.po
index 20ba007ff210d3bbe00ce4e130a57e03bded2e0e..1ce65e7a0668fa03fb58a8d4d13bd9bc07bd3e75 100644
--- a/l10n/lt_LT/files_sharing.po
+++ b/l10n/lt_LT/files_sharing.po
@@ -3,14 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Liudas Ališauskas <liudas.alisauskas@gmail.com>, 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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:01+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"
@@ -20,7 +21,7 @@ msgstr ""
#: templates/authenticate.php:4
msgid "The password is wrong. Try again."
-msgstr ""
+msgstr "Netinka slaptažodis: Bandykite dar kartą."
#: templates/authenticate.php:7
msgid "Password"
@@ -32,27 +33,27 @@ msgstr "Išsaugoti"
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
-msgstr ""
+msgstr "Atleiskite, panašu, kad nuoroda yra neveiksni."
#: templates/part.404.php:4
msgid "Reasons might be:"
-msgstr ""
+msgstr "Galimos priežastys:"
#: templates/part.404.php:6
msgid "the item was removed"
-msgstr ""
+msgstr "elementas buvo pašalintas"
#: templates/part.404.php:7
msgid "the link expired"
-msgstr ""
+msgstr "baigėsi nuorodos galiojimo laikas"
#: templates/part.404.php:8
msgid "sharing is disabled"
-msgstr ""
+msgstr "dalinimasis yra išjungtas"
#: templates/part.404.php:10
msgid "For more info, please ask the person who sent this link."
-msgstr ""
+msgstr "Dėl tikslesnės informacijos susisiekite su asmeniu atsiuntusiu nuorodą."
#: templates/public.php:15
#, php-format
@@ -64,7 +65,7 @@ msgstr "%s pasidalino su jumis %s aplanku"
msgid "%s shared the file %s with you"
msgstr "%s pasidalino su jumis %s failu"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "Atsisiųsti"
@@ -76,6 +77,6 @@ msgstr "Įkelti"
msgid "Cancel upload"
msgstr "Atšaukti siuntimą"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "Peržiūra nėra galima"
diff --git a/l10n/lt_LT/files_trashbin.po b/l10n/lt_LT/files_trashbin.po
index febfc2f1b015d78dc37da7715d22a538fc576160..5e630911f656927be3a391b532f3e14c188d8081 100644
--- a/l10n/lt_LT/files_trashbin.po
+++ b/l10n/lt_LT/files_trashbin.po
@@ -3,14 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Liudas Ališauskas <liudas.alisauskas@gmail.com>, 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-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-12 20:30+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"
@@ -28,47 +29,47 @@ msgstr "Nepavyko negrįžtamai ištrinti %s"
msgid "Couldn't restore %s"
msgstr "Nepavyko atkurti %s"
-#: js/trash.js:7 js/trash.js:100
+#: js/trash.js:7 js/trash.js:102
msgid "perform restore operation"
msgstr "atkurti"
-#: 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 "Klaida"
-#: js/trash.js:36
+#: js/trash.js:37
msgid "delete file permanently"
msgstr "failą ištrinti negrįžtamai"
-#: js/trash.js:127
+#: js/trash.js:129
msgid "Delete permanently"
msgstr "Ištrinti negrįžtamai"
-#: js/trash.js:182 templates/index.php:17
+#: js/trash.js:184 templates/index.php:17
msgid "Name"
msgstr "Pavadinimas"
-#: js/trash.js:183 templates/index.php:27
+#: js/trash.js:185 templates/index.php:27
msgid "Deleted"
msgstr "Ištrinti"
-#: js/trash.js:191
+#: js/trash.js:193
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-msgstr[2] ""
+msgstr[2] "%n aplankų"
-#: js/trash.js:197
+#: js/trash.js:199
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-msgstr[2] ""
+msgstr[2] "%n failų"
-#: lib/trash.php:819 lib/trash.php:821
+#: lib/trash.php:814 lib/trash.php:816
msgid "restored"
-msgstr ""
+msgstr "atstatyta"
#: templates/index.php:9
msgid "Nothing in here. Your trash bin is empty!"
diff --git a/l10n/lt_LT/files_versions.po b/l10n/lt_LT/files_versions.po
index d3d119b1c3fd3f7eb575b3660bc9ed79f2a1e367..e7bf83a2ed485d3f78614f41bf3713dbea2dfa57 100644
--- a/l10n/lt_LT/files_versions.po
+++ b/l10n/lt_LT/files_versions.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Liudas Ališauskas <liudas.alisauskas@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-28 01:56-0400\n"
-"PO-Revision-Date: 2013-07-27 06:10+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-13 21:47-0400\n"
+"PO-Revision-Date: 2013-09-12 20:00+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"
@@ -28,16 +29,16 @@ msgstr "Versijos"
#: js/versions.js:53
msgid "Failed to revert {file} to revision {timestamp}."
-msgstr ""
+msgstr "Nepavyko atstatyti {file} į būseną {timestamp}."
#: js/versions.js:79
msgid "More versions..."
-msgstr ""
+msgstr "Daugiau versijų..."
#: js/versions.js:116
msgid "No other versions available"
-msgstr ""
+msgstr "Nėra daugiau versijų"
-#: js/versions.js:149
+#: js/versions.js:145
msgid "Restore"
msgstr "Atstatyti"
diff --git a/l10n/lt_LT/lib.po b/l10n/lt_LT/lib.po
index 21df78c7b6a8a27fef0e185446248a243d006511..811ca96268b83abd8adf7d0792ea00f1cc413574 100644
--- a/l10n/lt_LT/lib.po
+++ b/l10n/lt_LT/lib.po
@@ -4,13 +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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-26 20: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-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"
@@ -23,11 +26,11 @@ msgstr ""
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
-msgstr ""
+msgstr "Programa „%s“ negali būti įdiegta, nes yra nesuderinama su šia ownCloud versija."
#: app.php:250
msgid "No app name specified"
-msgstr ""
+msgstr "Nenurodytas programos pavadinimas"
#: app.php:361
msgid "Help"
@@ -49,10 +52,22 @@ msgstr "Vartotojai"
msgid "Admin"
msgstr "Administravimas"
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
-msgstr ""
+msgstr "Nepavyko pakelti „%s“ versijos."
+
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr "Saviti profilio paveiksliukai dar neveikia su šifravimu"
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr "Nežinomas failo tipas"
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr "Netinkamas paveikslėlis"
#: defaults.php:35
msgid "web services under your control"
@@ -61,7 +76,7 @@ msgstr "jūsų valdomos web paslaugos"
#: files.php:66 files.php:98
#, php-format
msgid "cannot open \"%s\""
-msgstr ""
+msgstr "nepavyksta atverti „%s“"
#: files.php:226
msgid "ZIP download is turned off."
@@ -83,63 +98,63 @@ msgstr "Pasirinkti failai per dideli archyvavimui į ZIP."
msgid ""
"Download the files in smaller chunks, seperately or kindly ask your "
"administrator."
-msgstr ""
+msgstr "Atsisiųskite failus mažesnėmis dalimis atskirai, arba mandagiai prašykite savo administratoriaus."
#: installer.php:63
msgid "No source specified when installing app"
-msgstr ""
+msgstr "Nenurodytas šaltinis diegiant programą"
#: installer.php:70
msgid "No href specified when installing app from http"
-msgstr ""
+msgstr "Nenurodytas href diegiant programą iš http"
#: installer.php:75
msgid "No path specified when installing app from local file"
-msgstr ""
+msgstr "Nenurodytas kelias diegiant programą iš vietinio failo"
#: installer.php:89
#, php-format
msgid "Archives of type %s are not supported"
-msgstr ""
+msgstr "%s tipo archyvai nepalaikomi"
#: installer.php:103
msgid "Failed to open archive when installing app"
-msgstr ""
+msgstr "Nepavyko atverti archyvo diegiant programą"
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
-msgstr ""
+msgstr "Programa nepateikia info.xml failo"
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
-msgstr ""
+msgstr "Programa negali būti įdiegta, nes turi neleistiną kodą"
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
-msgstr ""
+msgstr "Programa negali būti įdiegta, nes yra nesuderinama su šia ownCloud versija"
-#: installer.php:144
+#: 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 "Programa negali būti įdiegta, nes turi <shipped>true</shipped> žymę, kuri yra neleistina ne kartu platinamoms programoms"
-#: installer.php:150
+#: 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 "Programa negali būti įdiegta, nes versija pateikta info.xml/version nesutampa su versija deklaruota programų saugykloje"
-#: installer.php:160
+#: installer.php:162
msgid "App directory already exists"
-msgstr ""
+msgstr "Programos aplankas jau egzistuoja"
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
-msgstr ""
+msgstr "Nepavyksta sukurti aplanko. Prašome pataisyti leidimus. %s"
#: json.php:28
msgid "Application is not enabled"
@@ -168,31 +183,31 @@ msgstr "Paveikslėliai"
#: setup/abstractdatabase.php:22
#, php-format
msgid "%s enter the database username."
-msgstr ""
+msgstr "%s įrašykite duombazės naudotojo vardą."
#: setup/abstractdatabase.php:25
#, php-format
msgid "%s enter the database name."
-msgstr ""
+msgstr "%s įrašykite duombazės pavadinimą."
#: setup/abstractdatabase.php:28
#, php-format
msgid "%s you may not use dots in the database name"
-msgstr ""
+msgstr "%s negalite naudoti taškų duombazės pavadinime"
#: setup/mssql.php:20
#, php-format
msgid "MS SQL username and/or password not valid: %s"
-msgstr ""
+msgstr "MS SQL naudotojo vardas ir/arba slaptažodis netinka: %s"
#: 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 ""
+msgstr "Turite prisijungti su egzistuojančia paskyra arba su administratoriumi."
#: setup/mysql.php:12
msgid "MySQL username and/or password not valid"
-msgstr ""
+msgstr "Neteisingas MySQL naudotojo vardas ir/arba slaptažodis"
#: 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
@@ -201,7 +216,7 @@ msgstr ""
#: setup/postgresql.php:125 setup/postgresql.php:134
#, php-format
msgid "DB Error: \"%s\""
-msgstr ""
+msgstr "DB klaida: \"%s\""
#: 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
@@ -209,119 +224,119 @@ msgstr ""
#: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135
#, php-format
msgid "Offending command was: \"%s\""
-msgstr ""
+msgstr "Vykdyta komanda buvo: \"%s\""
#: setup/mysql.php:85
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
-msgstr ""
+msgstr "MySQL naudotojas '%s'@'localhost' jau egzistuoja."
#: setup/mysql.php:86
msgid "Drop this user from MySQL"
-msgstr ""
+msgstr "Pašalinti šį naudotoją iš MySQL"
#: setup/mysql.php:91
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
-msgstr ""
+msgstr "MySQL naudotojas '%s'@'%%' jau egzistuoja"
#: setup/mysql.php:92
msgid "Drop this user from MySQL."
-msgstr ""
+msgstr "Pašalinti šį naudotoją iš MySQL."
#: setup/oci.php:34
msgid "Oracle connection could not be established"
-msgstr ""
+msgstr "Nepavyko sukurti Oracle ryšio"
#: setup/oci.php:41 setup/oci.php:113
msgid "Oracle username and/or password not valid"
-msgstr ""
+msgstr "Neteisingas Oracle naudotojo vardas ir/arba slaptažodis"
#: setup/oci.php:173 setup/oci.php:205
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
-msgstr ""
+msgstr "Vykdyta komanda buvo: \"%s\", name: %s, password: %s"
#: setup/postgresql.php:23 setup/postgresql.php:69
msgid "PostgreSQL username and/or password not valid"
-msgstr ""
+msgstr "Neteisingas PostgreSQL naudotojo vardas ir/arba slaptažodis"
#: setup.php:28
msgid "Set an admin username."
-msgstr ""
+msgstr "Nustatyti administratoriaus naudotojo vardą."
#: setup.php:31
msgid "Set an admin password."
-msgstr ""
+msgstr "Nustatyti administratoriaus slaptažodį."
#: 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 ""
+msgstr "Jūsų serveris nėra tvarkingai nustatytas leisti failų sinchronizaciją, nes WebDAV sąsaja panašu, kad yra sugadinta."
#: setup.php:185
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr ""
+msgstr "Prašome pažiūrėkite dar kartą <a href='%s'>diegimo instrukcijas</a>."
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "prieš sekundę"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] " prieš %n minučių"
+msgstr[0] "prieš %n min."
+msgstr[1] "Prieš % minutes"
+msgstr[2] "Prieš %n minučių"
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] "prieš %n valandų"
+msgstr[0] "Prieš %n valandą"
+msgstr[1] "Prieš %n valandas"
+msgstr[2] "Prieš %n valandų"
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "šiandien"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "vakar"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Prieš %n dieną"
+msgstr[1] "Prieš %n dienas"
+msgstr[2] "Prieš %n dienų"
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "praeitą mėnesį"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] "prieš %n mėnesių"
+msgstr[0] "Prieš %n mėnesį"
+msgstr[1] "Prieš %n mėnesius"
+msgstr[2] "Prieš %n mėnesių"
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "praeitais metais"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "prieš metus"
#: template.php:297
msgid "Caused by:"
-msgstr ""
+msgstr "Iššaukė:"
#: vcategories.php:188 vcategories.php:249
#, php-format
msgid "Could not find category \"%s\""
-msgstr ""
+msgstr "Nepavyko rasti kategorijos „%s“"
diff --git a/l10n/lt_LT/settings.po b/l10n/lt_LT/settings.po
index 9f10ee721e5f76593980c3b4453d6e9235cc2c16..ff719fb19fe07ea24b1bbfd894bc8a43fe686e3d 100644
--- a/l10n/lt_LT/settings.po
+++ b/l10n/lt_LT/settings.po
@@ -4,13 +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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-30 10:17-0400\n"
+"PO-Revision-Date: 2013-09-29 08:49+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"
@@ -23,17 +26,17 @@ 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"
#: ajax/changedisplayname.php:31
msgid "Your display name has been changed."
-msgstr ""
+msgstr "Jūsų rodomas vardas buvo pakeistas."
#: ajax/changedisplayname.php:34
msgid "Unable to change display name"
-msgstr ""
+msgstr "Nepavyksta pakeisti rodomą vardą"
#: ajax/creategroup.php:10
msgid "Group already exists"
@@ -69,7 +72,7 @@ msgstr "Klaidinga užklausa"
#: ajax/togglegroups.php:12
msgid "Admins can't remove themself from the admin group"
-msgstr ""
+msgstr "Administratoriai negali pašalinti savęs iš administratorių grupės"
#: ajax/togglegroups.php:30
#, php-format
@@ -85,55 +88,88 @@ msgstr "Nepavyko ištrinti vartotojo iš grupės %s"
msgid "Couldn't update app."
msgstr "Nepavyko atnaujinti programos."
-#: js/apps.js:35
+#: changepassword/controller.php:20
+msgid "Wrong password"
+msgstr "Neteisingas slaptažodis"
+
+#: changepassword/controller.php:42
+msgid "No user supplied"
+msgstr "Nepateiktas naudotojas"
+
+#: changepassword/controller.php:74
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr "Prašome įvesti administratoriaus atkūrimo slaptažodį, kitaip visi naudotojo suomenys bus prarasti"
+
+#: changepassword/controller.php:79
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr "Netinkamas administratoriau atkūrimo slaptažodis. Prašome pasitikrinti ir bandyti vėl."
+
+#: changepassword/controller.php:87
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr "Sistema nepalaiko slaptažodžio keitimo, bet naudotojo šifravimo raktas buvo sėkmingai atnaujintas."
+
+#: changepassword/controller.php:92 changepassword/controller.php:103
+msgid "Unable to change password"
+msgstr "Nepavyksta pakeisti slaptažodžio"
+
+#: js/apps.js:43
msgid "Update to {appversion}"
msgstr "Atnaujinti iki {appversion}"
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:110
msgid "Disable"
msgstr "Išjungti"
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
msgid "Enable"
msgstr "Įjungti"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr "Prašome palaukti..."
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:101
msgid "Error while disabling app"
-msgstr ""
+msgstr "Klaida išjungiant programą"
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:100 js/apps.js:114 js/apps.js:115
msgid "Error while enabling app"
-msgstr ""
+msgstr "Klaida įjungiant programą"
-#: js/apps.js:115
+#: js/apps.js:125
msgid "Updating...."
msgstr "Atnaujinama..."
-#: js/apps.js:118
+#: js/apps.js:128
msgid "Error while updating app"
msgstr "Įvyko klaida atnaujinant programą"
-#: js/apps.js:118
+#: js/apps.js:128
msgid "Error"
msgstr "Klaida"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:129 templates/apps.php:43
msgid "Update"
msgstr "Atnaujinti"
-#: js/apps.js:122
+#: js/apps.js:132
msgid "Updated"
msgstr "Atnaujinta"
-#: js/personal.js:150
+#: js/personal.js:221
+msgid "Select a profile picture"
+msgstr "Pažymėkite profilio paveikslėlį"
+
+#: js/personal.js:266
msgid "Decrypting files... Please wait, this can take some time."
-msgstr ""
+msgstr "Iššifruojami failai... Prašome palaukti, tai gali užtrukti."
-#: js/personal.js:172
+#: js/personal.js:288
msgid "Saving..."
msgstr "Saugoma..."
@@ -149,16 +185,16 @@ msgstr "anuliuoti"
msgid "Unable to remove user"
msgstr "Nepavyko ištrinti vartotojo"
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "Grupės"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
-msgstr ""
+msgstr "Grupės administratorius"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "Ištrinti"
@@ -178,7 +214,7 @@ msgstr "Klaida kuriant vartotoją"
msgid "A valid password must be provided"
msgstr "Slaptažodis turi būti tinkamas"
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "Kalba"
@@ -193,22 +229,22 @@ msgid ""
"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 ""
+msgstr "Jūsų duomenų katalogas ir Jūsų failai turbūt yra pasiekiami per internetą. Failas .htaccess neveikia. Mes labai rekomenduojame sukonfigūruoti serverį taip, kad katalogas nebūtų daugiau pasiekiamas, arba iškelkite duomenis kitur iš webserverio šakninio aplanko."
#: templates/admin.php:29
msgid "Setup Warning"
-msgstr ""
+msgstr "Nustatyti perspėjimą"
#: 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 ""
+msgstr "Jūsų serveris nėra tvarkingai nustatytas leisti failų sinchronizaciją, nes WebDAV sąsaja panašu, kad yra sugadinta."
#: templates/admin.php:33
#, php-format
msgid "Please double check the <a href=\"%s\">installation guides</a>."
-msgstr ""
+msgstr "Prašome pažiūrėkite dar kartą <a href=\"%s\">diegimo instrukcijas</a>."
#: templates/admin.php:44
msgid "Module 'fileinfo' missing"
@@ -218,11 +254,11 @@ msgstr "Trūksta 'fileinfo' modulio"
msgid ""
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
"module to get best results with mime-type detection."
-msgstr ""
+msgstr "Trūksta PHP modulio „fileinfo“. Labai rekomenduojame įjungti šį modulį, kad gauti geriausius rezultatus nustatant mime-tipą."
#: templates/admin.php:58
msgid "Locale not working"
-msgstr ""
+msgstr "Lokalė neveikia"
#: templates/admin.php:63
#, php-format
@@ -230,11 +266,11 @@ 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 ""
+msgstr "Negalima nustatyti sistemos lokalės į %s. Tai reiškia, kad gali būti problemų su tam tikrais simboliais failų pavadinimuose. Labai rekomenduojame įdiegti reikalingus paketus Jūsų sistemoje, kad palaikyti %s."
#: templates/admin.php:75
msgid "Internet connection not working"
-msgstr ""
+msgstr "Nėra interneto ryšio"
#: templates/admin.php:78
msgid ""
@@ -243,7 +279,7 @@ msgid ""
"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 ""
+msgstr "Šis serveris neturi veikiančio ryšio. Tai reiškia, kas kai kurios funkcijos kaip išorinės saugyklos prijungimas, perspėjimai apie atnaujinimus ar trečių šalių programų įdiegimas neveikia. Failų pasiekimas iš kitur ir pranešimų siuntimas el. paštu gali taip pat neveikti. Rekomenduojame įjungti interneto ryšį šiame serveryje, jei norite naudoti visas funkcijas."
#: templates/admin.php:92
msgid "Cron"
@@ -251,17 +287,17 @@ msgstr "Cron"
#: templates/admin.php:99
msgid "Execute one task with each page loaded"
-msgstr ""
+msgstr "Įvykdyti vieną užduotį su kiekvieno puslapio įkėlimu"
#: templates/admin.php:107
msgid ""
"cron.php is registered at a webcron service to call cron.php once a minute "
"over http."
-msgstr ""
+msgstr "cron.php yra registruotas tinklapio suplanuotų užduočių paslaugose, kad iškviesti cron.php kartą per minutę per http."
#: templates/admin.php:115
msgid "Use systems cron service to call the cron.php file once a minute."
-msgstr ""
+msgstr "Naudoti sistemos planuotų užduočių paslaugą, kad iškvieti cron.php kartą per minutę."
#: templates/admin.php:120
msgid "Sharing"
@@ -269,11 +305,11 @@ msgstr "Dalijimasis"
#: templates/admin.php:126
msgid "Enable Share API"
-msgstr ""
+msgstr "Įjungti Share API"
#: templates/admin.php:127
msgid "Allow apps to use the Share API"
-msgstr ""
+msgstr "Leidžia programoms naudoti Share API"
#: templates/admin.php:134
msgid "Allow links"
@@ -281,16 +317,16 @@ msgstr "Lesti nuorodas"
#: templates/admin.php:135
msgid "Allow users to share items to the public with links"
-msgstr ""
+msgstr "Leisti naudotojams viešai dalintis elementais su nuorodomis"
#: templates/admin.php:143
msgid "Allow public uploads"
-msgstr ""
+msgstr "Leisti viešus įkėlimus"
#: templates/admin.php:144
msgid ""
"Allow users to enable others to upload into their publicly shared folders"
-msgstr ""
+msgstr "Leisti naudotojams įgalinti kitus įkelti į savo viešai dalinamus aplankus"
#: templates/admin.php:152
msgid "Allow resharing"
@@ -298,15 +334,15 @@ msgstr "Leisti dalintis"
#: templates/admin.php:153
msgid "Allow users to share items shared with them again"
-msgstr ""
+msgstr "Leisti naudotojams toliau dalintis elementais pasidalintais su jais"
#: templates/admin.php:160
msgid "Allow users to share with anyone"
-msgstr ""
+msgstr "Leisti naudotojams dalintis su bet kuo"
#: templates/admin.php:163
msgid "Allow users to only share with users in their groups"
-msgstr ""
+msgstr "Leisti naudotojams dalintis tik su naudotojais savo grupėje"
#: templates/admin.php:170
msgid "Security"
@@ -314,19 +350,19 @@ msgstr "Saugumas"
#: templates/admin.php:183
msgid "Enforce HTTPS"
-msgstr ""
+msgstr "Reikalauti HTTPS"
#: templates/admin.php:185
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
-msgstr ""
+msgstr "Verčia klientus jungtis prie %s per šifruotą ryšį."
#: templates/admin.php:191
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
-msgstr ""
+msgstr "Prašome prisijungti prie savo %s per HTTPS, kad įjungti ar išjungti SSL reikalavimą."
#: templates/admin.php:203
msgid "Log"
@@ -344,11 +380,11 @@ msgstr "Daugiau"
msgid "Less"
msgstr "Mažiau"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "Versija"
-#: templates/admin.php:246 templates/personal.php:143
+#: 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 "
@@ -356,7 +392,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 ""
+msgstr "Sukurta <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud bendruomenės</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">pirminis kodas</a> platinamas pagal <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
#: templates/apps.php:13
msgid "Add your App"
@@ -372,7 +408,7 @@ msgstr "Pasirinkite programą"
#: templates/apps.php:39
msgid "See application page at apps.owncloud.com"
-msgstr ""
+msgstr "Žiūrėti programos puslapį svetainėje apps.owncloud.com"
#: templates/apps.php:41
msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
@@ -380,15 +416,15 @@ msgstr "<span class=\"licence\"></span>- autorius<span class=\"author\"></span>"
#: templates/help.php:4
msgid "User Documentation"
-msgstr ""
+msgstr "Naudotojo dokumentacija"
#: templates/help.php:6
msgid "Administrator Documentation"
-msgstr ""
+msgstr "Administratoriaus dokumentacija"
#: templates/help.php:9
msgid "Online Documentation"
-msgstr ""
+msgstr "Dokumentacija tinkle"
#: templates/help.php:11
msgid "Forum"
@@ -400,7 +436,7 @@ msgstr "Klaidų sekimas"
#: templates/help.php:17
msgid "Commercial Support"
-msgstr ""
+msgstr "Komercinis palaikymas"
#: templates/personal.php:8
msgid "Get the apps to sync your files"
@@ -408,14 +444,14 @@ msgstr "Atsisiųskite programėlių, kad sinchronizuotumėte savo failus"
#: templates/personal.php:19
msgid "Show First Run Wizard again"
-msgstr ""
+msgstr "Rodyti pirmo karto vedlį dar kartą"
#: templates/personal.php:27
#, php-format
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr ""
+msgstr "Jūs naudojate <strong>%s</strong> iš galimų <strong>%s</strong>"
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "Slaptažodis"
@@ -439,9 +475,9 @@ msgstr "Naujas slaptažodis"
msgid "Change password"
msgstr "Pakeisti slaptažodį"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
-msgstr ""
+msgstr "Rodyti vardą"
#: templates/personal.php:73
msgid "Email"
@@ -455,40 +491,68 @@ msgstr "Jūsų el. pašto adresas"
msgid "Fill in an email address to enable password recovery"
msgstr "Pamiršto slaptažodžio atkūrimui įveskite savo el. pašto adresą"
-#: templates/personal.php:85 templates/personal.php:86
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr "Profilio paveikslėlis"
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr "Įkelti naują"
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr "Pasirinkti naują iš failų"
+
+#: templates/personal.php:93
+msgid "Remove image"
+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 "Arba png arba jpg. Geriausia kvadratinį, bet galėsite jį apkarpyti."
+
+#: templates/personal.php:97
+msgid "Abort"
+msgstr "Atšaukti"
+
+#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr "Pasirinkite profilio paveiksliuką"
+
+#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
msgstr "Kalba"
-#: templates/personal.php:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "Padėkite išversti"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: 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 ""
+msgstr "Naudokite šį adresą, kad <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">pasiekti savo failus per WebDAV</a>"
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "Šifravimas"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
-msgstr ""
+msgstr "Šifravimo programa nebėra įjungta, iššifruokite visus savo failus"
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
-msgstr ""
+msgstr "Prisijungimo slaptažodis"
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
-msgstr ""
+msgstr "Iššifruoti visus failus"
#: templates/users.php:21
msgid "Login Name"
@@ -500,42 +564,42 @@ msgstr "Sukurti"
#: templates/users.php:36
msgid "Admin Recovery Password"
-msgstr ""
+msgstr "Administracinis atkūrimo slaptažodis"
#: templates/users.php:37 templates/users.php:38
msgid ""
"Enter the recovery password in order to recover the users files during "
"password change"
-msgstr ""
+msgstr "Įveskite atkūrimo slaptažodį, kad atkurti naudotojo failus keičiant slaptažodį"
#: templates/users.php:42
msgid "Default Storage"
-msgstr ""
+msgstr "Numatytas saugojimas"
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr "Neribota"
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "Kita"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "Prisijungimo vardas"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
-msgstr ""
+msgstr "Saugojimas"
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
-msgstr ""
+msgstr "keisti rodomą vardą"
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr "nustatyti naują slaptažodį"
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr "Numatytasis"
diff --git a/l10n/lt_LT/user_ldap.po b/l10n/lt_LT/user_ldap.po
index af344de49a733f77928ba8bd05920499ac582fc1..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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+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,15 +101,15 @@ 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"
-msgstr ""
+msgstr "Mazgas"
#: templates/settings.php:39
msgid ""
@@ -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/lt_LT/user_webdavauth.po b/l10n/lt_LT/user_webdavauth.po
index 72eda2b521ba3bfa6b9007b232c7778522e49aef..fae87f29dda365612e24a742bbf3da72f4de76bc 100644
--- a/l10n/lt_LT/user_webdavauth.po
+++ b/l10n/lt_LT/user_webdavauth.po
@@ -3,14 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Liudas Ališauskas <liudas.alisauskas@gmail.com>, 2013
# Min2liz <min2lizz@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-27 01:56-0400\n"
-"PO-Revision-Date: 2013-07-27 05:57+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-13 21:47-0400\n"
+"PO-Revision-Date: 2013-09-13 08:20+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"
@@ -20,15 +21,15 @@ msgstr ""
#: templates/settings.php:3
msgid "WebDAV Authentication"
-msgstr "WebDAV autorizavimas"
+msgstr "WebDAV autentikacija"
#: templates/settings.php:4
msgid "Address: "
-msgstr ""
+msgstr "Adresas:"
#: 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 ""
+msgstr "Naudotojo duomenys bus nusiųsti šiuo adresu. Šis įskiepis patikrins gautą atsakymą ir interpretuos HTTP būsenos kodą 401 ir 403 kaip negaliojančius duomenis, ir visus kitus gautus atsakymus kaip galiojančius duomenis. "
diff --git a/l10n/lv/core.po b/l10n/lv/core.po
index 9e421bf6a58e019b923c1dcc8e8b26e8fdaebfaf..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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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"
@@ -23,6 +23,10 @@ msgstr ""
msgid "%s shared »%s« with you"
msgstr "%s kopīgots »%s« ar jums"
+#: ajax/share.php:227
+msgid "group"
+msgstr "grupa"
+
#: ajax/update.php:11
msgid "Turned on maintenance mode"
msgstr ""
@@ -87,6 +91,26 @@ msgstr "Neviena kategorija nav izvēlēta dzēšanai."
msgid "Error removing %s from favorites."
msgstr "Kļūda, izņemot %s no izlases."
+#: 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 "Svētdiena"
@@ -163,63 +187,63 @@ msgstr "Novembris"
msgid "December"
msgstr "Decembris"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "Iestatījumi"
-#: js/js.js:812
+#: js/js.js:866
msgid "seconds ago"
msgstr "sekundes atpakaļ"
-#: js/js.js:813
+#: 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:814
+#: 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:815
+#: js/js.js:869
msgid "today"
msgstr "šodien"
-#: js/js.js:816
+#: js/js.js:870
msgid "yesterday"
msgstr "vakar"
-#: js/js.js:817
+#: 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:818
+#: js/js.js:872
msgid "last month"
msgstr "pagājušajā mēnesī"
-#: js/js.js:819
+#: 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:820
+#: js/js.js:874
msgid "months ago"
msgstr "mēnešus atpakaļ"
-#: js/js.js:821
+#: js/js.js:875
msgid "last year"
msgstr "gājušajā gadā"
-#: js/js.js:822
+#: js/js.js:876
msgid "years ago"
msgstr "gadus atpakaļ"
@@ -227,22 +251,67 @@ msgstr "gadus atpakaļ"
msgid "Choose"
msgstr "Izvēlieties"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
-msgstr "Kļūda ielādējot datņu ņēmēja veidni"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
+msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "Jā"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "Nē"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr "Labi"
+#: 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 "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."
@@ -252,7 +321,7 @@ msgstr "Nav norādīts objekta tips."
#: 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:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "Kļūda"
@@ -272,7 +341,7 @@ msgstr "Kopīgs"
msgid "Share"
msgstr "Dalīties"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr "Kļūda, daloties"
@@ -328,67 +397,67 @@ msgstr "Iestaties termiņa datumu"
msgid "Expiration date"
msgstr "Termiņa datums"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "Dalīties, izmantojot e-pastu:"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "Nav atrastu cilvēku"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "Atkārtota dalīšanās nav atļauta"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr "Dalījās ar {item} ar {user}"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "Pārtraukt dalīšanos"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "var rediģēt"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "piekļuves vadība"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "izveidot"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "atjaunināt"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "dzēst"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "dalīties"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "Aizsargāts ar paroli"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr "Kļūda, noņemot termiņa datumu"
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr "Kļūda, iestatot termiņa datumu"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr "Sūta..."
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr "Vēstule nosūtīta"
@@ -403,7 +472,7 @@ msgstr "Atjaunināšana beidzās nesekmīgi. Lūdzu, ziņojiet par šo problēmu
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Atjaunināšana beidzās sekmīgi. Tagad pārsūta jūs uz ownCloud."
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr "%s paroles maiņa"
@@ -472,7 +541,7 @@ msgstr "Personīgi"
msgid "Users"
msgstr "Lietotāji"
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "Lietotnes"
@@ -601,14 +670,10 @@ msgstr "Pabeigt iestatīšanu"
msgid "%s is available. Get more information on how to update."
msgstr "%s ir pieejams. Uzziniet vairāk kā atjaunināt."
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "Izrakstīties"
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr "Vairāk programmu"
-
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "Automātiskā ierakstīšanās ir noraidīta!"
@@ -623,19 +688,19 @@ msgstr "Ja neesat pēdējā laikā mainījis paroli, iespējams, ka jūsu konts
msgid "Please change your password to secure your account again."
msgstr "Lūdzu, nomainiet savu paroli, lai atkal nodrošinātu savu kontu."
-#: templates/login.php:34
+#: templates/login.php:32
msgid "Lost your password?"
msgstr "Aizmirsāt paroli?"
-#: templates/login.php:39
+#: templates/login.php:37
msgid "remember"
msgstr "atcerēties"
-#: templates/login.php:41
+#: templates/login.php:39
msgid "Log in"
msgstr "Ierakstīties"
-#: templates/login.php:47
+#: templates/login.php:45
msgid "Alternative Logins"
msgstr "Alternatīvās pieteikšanās"
diff --git a/l10n/lv/files.po b/l10n/lv/files.po
index a8d25e9c41dff79790bb297f5cb12750e32019f2..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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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,7 +75,15 @@ msgstr "Neizdevās saglabāt diskā"
msgid "Not enough storage available"
msgstr "Nav pietiekami daudz vietas"
-#: ajax/upload.php:123
+#: 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 "Nederīga direktorija."
@@ -83,152 +91,160 @@ 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: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 "Notiek augšupielāde. Pametot lapu tagad, tiks atcelta augšupielāde."
-#: js/file-upload.js:241
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr "URL nevar būt tukšs."
-#: 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 "Kļūdains mapes nosaukums. 'Shared' lietošana ir rezervēta no ownCloud"
-#: js/file-upload.js:277 js/file-upload.js:293 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 "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:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "Gaida savu kārtu"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{new_name} jau eksistē"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "aizvietot"
-#: js/filelist.js:303
+#: js/filelist.js:416
msgid "suggest name"
msgstr "ieteiktais nosaukums"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "atcelt"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr "aizvietoja {new_name} ar {old_name}"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "undo"
msgstr "atsaukt"
-#: js/filelist.js:453
+#: 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: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: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] "%n"
msgstr[1] "Augšupielāde %n failu"
msgstr[2] "Augšupielāde %n failus"
-#: js/filelist.js:518
-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: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 "Nosaukums"
-#: js/files.js:563 templates/index.php:78
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "Izmērs"
-#: js/files.js:564 templates/index.php:80
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr "Mainīts"
-#: js/files.js:580
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] "%n mapes"
-msgstr[1] "%n mape"
-msgstr[2] "%n mapes"
-
-#: js/files.js:586
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] "%n faili"
-msgstr[1] "%n fails"
-msgstr[2] "%n faili"
-
#: lib/app.php:73
#, php-format
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"
@@ -264,84 +280,68 @@ 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:73
+#: templates/index.php:67
msgid "Download"
msgstr "Lejupielādēt"
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr "Pārtraukt dalīšanos"
-#: templates/index.php:91 templates/index.php:92
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "Dzēst"
-#: templates/index.php:105
+#: templates/index.php:100
msgid "Upload too large"
msgstr "Datne ir par lielu, lai to augšupielādētu"
-#: 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 "Augšupielādējamās datnes pārsniedz servera pieļaujamo datņu augšupielādes apjomu"
-#: templates/index.php:112
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr "Datnes šobrīd tiek caurskatītas, lūdzu, uzgaidiet."
-#: templates/index.php:115
+#: templates/index.php:110
msgid "Current scanning"
msgstr "Šobrīd tiek caurskatīts"
-#: templates/part.list.php:74
-msgid "directory"
-msgstr "direktorija"
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr "direktorijas"
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr "fails"
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr "faili"
-
#: templates/upgrade.php:2
msgid "Upgrading filesystem cache..."
msgstr "Uzlabo datņu sistēmas kešatmiņu..."
diff --git a/l10n/lv/files_sharing.po b/l10n/lv/files_sharing.po
index 71c4b1fd73fa99649157d83ce04fed405ad8c6aa..036cfaf96077f4a57cf0334080a952f15837c59e 100644
--- a/l10n/lv/files_sharing.po
+++ b/l10n/lv/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00: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"
@@ -63,7 +63,7 @@ msgstr "%s ar jums dalījās ar mapi %s"
msgid "%s shared the file %s with you"
msgstr "%s ar jums dalījās ar datni %s"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "Lejupielādēt"
@@ -75,6 +75,6 @@ msgstr "Augšupielādēt"
msgid "Cancel upload"
msgstr "Atcelt augšupielādi"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "Nav pieejams priekšskatījums priekš"
diff --git a/l10n/lv/lib.po b/l10n/lv/lib.po
index 4e466109777939dd878db0842b98cd8b64927c63..1c2c3f45c586d894490e8f31633837edc9894aca 100644
--- a/l10n/lv/lib.po
+++ b/l10n/lv/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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\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"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
@@ -49,11 +49,23 @@ msgstr "Lietotāji"
msgid "Admin"
msgstr "Administratori"
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "Kļūda atjauninot \"%s\""
+#: 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 "tīmekļa servisi tavā varā"
@@ -106,37 +118,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: 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:150
+#: 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:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -265,55 +277,55 @@ msgstr "Jūsu serveris vēl nav pareizi iestatīts, lai ļautu sinhronizēt datn
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Lūdzu, vēlreiz pārbaudiet <a href='%s'>instalēšanas palīdzību</a>."
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "sekundes atpakaļ"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] "Pirms %n minūtēm"
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] "Pirms %n stundām"
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "šodien"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "vakar"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] "Pirms %n dienām"
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "pagājušajā mēnesī"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] "Pirms %n mēnešiem"
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "gājušajā gadā"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "gadus atpakaļ"
diff --git a/l10n/lv/settings.po b/l10n/lv/settings.po
index d3122ddf8608fd4cc29a9e763d6173cbec1ed9f6..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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+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,55 +85,88 @@ msgstr "Nevar izņemt lietotāju no grupas %s"
msgid "Couldn't update app."
msgstr "Nevarēja atjaunināt lietotni."
-#: js/apps.js:35
+#: 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}"
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr "Deaktivēt"
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr "Aktivēt"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr "Lūdzu, uzgaidiet...."
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr "Atjaunina...."
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr "Kļūda, atjauninot lietotni"
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "Kļūda"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr "Atjaunināt"
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr "Atjaunināta"
-#: js/personal.js:150
+#: 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 "Atšifrēju failus... Uzgaidiet tas var ilgt kādu laiku."
-#: js/personal.js:172
+#: js/personal.js:287
msgid "Saving..."
msgstr "Saglabā..."
@@ -149,16 +182,16 @@ msgstr "atsaukt"
msgid "Unable to remove user"
msgstr "Nevar izņemt lietotāju"
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "Grupas"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "Grupas administrators"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "Dzēst"
@@ -178,7 +211,7 @@ msgstr "Kļūda, veidojot lietotāju"
msgid "A valid password must be provided"
msgstr "Jānorāda derīga parole"
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "__valodas_nosaukums__"
@@ -344,11 +377,11 @@ msgstr "Vairāk"
msgid "Less"
msgstr "Mazāk"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "Versija"
-#: templates/admin.php:246 templates/personal.php:143
+#: 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 "
@@ -415,7 +448,7 @@ msgstr "Vēlreiz rādīt pirmās palaišanas vedni"
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Jūs lietojat <strong>%s</strong> no pieejamajiem <strong>%s</strong>"
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "Parole"
@@ -439,7 +472,7 @@ msgstr "Jauna parole"
msgid "Change password"
msgstr "Mainīt paroli"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr "Redzamais vārds"
@@ -455,38 +488,66 @@ msgstr "Jūsu e-pasta adrese"
msgid "Fill in an email address to enable password recovery"
msgstr "Ievadiet e-pasta adresi, lai vēlāk varētu atgūt paroli, ja būs nepieciešamība"
-#: templates/personal.php:85 templates/personal.php:86
+#: 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 "Valoda"
-#: templates/personal.php:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "Palīdzi tulkot"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: 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 "Lietojiet šo adresi <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">lai piekļūtu saviem failiem ar WebDAV</a>"
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "Šifrēšana"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr "Šifrēšanas lietotne ir atslēgta, atšifrējiet visus jūsu failus"
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr "Pieslēgšanās parole"
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr "Atšifrēt visus failus"
@@ -512,30 +573,30 @@ msgstr "Ievadiet atgūšanas paroli, lai varētu atgūt lietotāja failus parole
msgid "Default Storage"
msgstr "Noklusējuma krātuve"
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr "Neierobežota"
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "Cits"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "Lietotājvārds"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr "Krātuve"
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr "mainīt redzamo vārdu"
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr "iestatīt jaunu paroli"
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr "Noklusējuma"
diff --git a/l10n/lv/user_ldap.po b/l10n/lv/user_ldap.po
index 3811f911bae52fbaf906358a351dc8fe314abc8b..cd344fb96ce1897a2f729dfac40bc39a4ee5b75b 100644
--- a/l10n/lv/user_ldap.po
+++ b/l10n/lv/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\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"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/mk/core.po b/l10n/mk/core.po
index 5a6ba24801b82de876b3fd3b38f770b7d61d2af4..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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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"
@@ -22,6 +22,10 @@ msgstr ""
msgid "%s shared »%s« with you"
msgstr ""
+#: ajax/share.php:227
+msgid "group"
+msgstr "група"
+
#: ajax/update.php:11
msgid "Turned on maintenance mode"
msgstr ""
@@ -86,6 +90,26 @@ msgstr "Не е одбрана категорија за бришење."
msgid "Error removing %s from favorites."
msgstr "Грешка при бришење на %s од омилени."
+#: 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 "Недела"
@@ -162,59 +186,59 @@ msgstr "Ноември"
msgid "December"
msgstr "Декември"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "Подесувања"
-#: js/js.js:812
+#: js/js.js:866
msgid "seconds ago"
msgstr "пред секунди"
-#: js/js.js:813
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:814
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:815
+#: js/js.js:869
msgid "today"
msgstr "денеска"
-#: js/js.js:816
+#: js/js.js:870
msgid "yesterday"
msgstr "вчера"
-#: js/js.js:817
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:818
+#: js/js.js:872
msgid "last month"
msgstr "минатиот месец"
-#: js/js.js:819
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:820
+#: js/js.js:874
msgid "months ago"
msgstr "пред месеци"
-#: js/js.js:821
+#: js/js.js:875
msgid "last year"
msgstr "минатата година"
-#: js/js.js:822
+#: js/js.js:876
msgid "years ago"
msgstr "пред години"
@@ -222,22 +246,66 @@ msgstr "пред години"
msgid "Choose"
msgstr "Избери"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "Да"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "Не"
-#: js/oc-dialogs.js:195
+#: 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."
@@ -247,7 +315,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:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "Грешка"
@@ -267,7 +335,7 @@ msgstr ""
msgid "Share"
msgstr "Сподели"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr "Грешка при споделување"
@@ -323,67 +391,67 @@ msgstr "Постави рок на траење"
msgid "Expiration date"
msgstr "Рок на траење"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "Сподели по е-пошта:"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "Не се најдени луѓе"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "Повторно споделување не е дозволено"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr "Споделено во {item} со {user}"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "Не споделувај"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "може да се измени"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "контрола на пристап"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "креирај"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "ажурирај"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "избриши"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "сподели"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "Заштитено со лозинка"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr "Грешка при тргање на рокот на траење"
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr "Грешка при поставување на рок на траење"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr "Праќање..."
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr "Е-порака пратена"
@@ -398,7 +466,7 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr ""
@@ -467,7 +535,7 @@ msgstr "Лично"
msgid "Users"
msgstr "Корисници"
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "Аппликации"
@@ -596,14 +664,10 @@ msgstr "Заврши го подесувањето"
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "Одјава"
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "Одбиена автоматска најава!"
@@ -618,19 +682,19 @@ msgstr "Ако не сте ја промениле лозинката во ск
msgid "Please change your password to secure your account again."
msgstr "Ве молам сменете ја лозинката да ја обезбедите вашата сметка повторно."
-#: templates/login.php:34
+#: templates/login.php:32
msgid "Lost your password?"
msgstr "Ја заборавивте лозинката?"
-#: templates/login.php:39
+#: templates/login.php:37
msgid "remember"
msgstr "запамти"
-#: templates/login.php:41
+#: templates/login.php:39
msgid "Log in"
msgstr "Најава"
-#: templates/login.php:47
+#: templates/login.php:45
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/mk/files.po b/l10n/mk/files.po
index 32514622d6d8543482a640426f89cbb414b4dbe2..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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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,7 +74,15 @@ msgstr "Неуспеав да запишам на диск"
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:123
+#: 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 ""
@@ -82,149 +90,157 @@ 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: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:277 js/file-upload.js:293 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:465
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "Чека"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{new_name} веќе постои"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "замени"
-#: js/filelist.js:303
+#: js/filelist.js:416
msgid "suggest name"
msgstr "предложи име"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "откажи"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr "заменета {new_name} со {old_name}"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "undo"
msgstr "врати"
-#: js/filelist.js:453
-msgid "Uploading %n file"
-msgid_plural "Uploading %n files"
+#: 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:518
-msgid "files uploading"
+#: 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/files.js:52
+#: 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: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 "Променето"
-#: js/files.js:580
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/files.js:586
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-
#: lib/app.php:73
#, php-format
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 "Подигни"
@@ -260,84 +276,68 @@ 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: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 "Моментално скенирам"
-#: templates/part.list.php:74
-msgid "directory"
-msgstr ""
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr ""
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr "датотека"
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr "датотеки"
-
#: templates/upgrade.php:2
msgid "Upgrading filesystem cache..."
msgstr ""
diff --git a/l10n/mk/files_sharing.po b/l10n/mk/files_sharing.po
index f669e2ffd241caf9af8a7f797b25bc9cea4fe38a..97b8547bc7789e10c89222e301cf07184b249cf9 100644
--- a/l10n/mk/files_sharing.po
+++ b/l10n/mk/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00: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"
@@ -63,7 +63,7 @@ msgstr "%s ја сподели папката %s со Вас"
msgid "%s shared the file %s with you"
msgstr "%s ја сподели датотеката %s со Вас"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "Преземи"
@@ -75,6 +75,6 @@ msgstr "Подигни"
msgid "Cancel upload"
msgstr "Откажи прикачување"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "Нема достапно преглед за"
diff --git a/l10n/mk/lib.po b/l10n/mk/lib.po
index 9ea277ce4a99b4c545573c5c4f1d7c7e1f981b10..f87e0ecc9071ea5fe12c9cadce5cbde2e11881da 100644
--- a/l10n/mk/lib.po
+++ b/l10n/mk/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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\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"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
@@ -48,11 +48,23 @@ msgstr "Корисници"
msgid "Admin"
msgstr "Админ"
-#: app.php:837
+#: 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 "веб сервиси под Ваша контрола"
@@ -105,37 +117,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: 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:150
+#: 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:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -264,51 +276,51 @@ msgstr ""
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "пред секунди"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "денеска"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "вчера"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "минатиот месец"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "минатата година"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "пред години"
diff --git a/l10n/mk/settings.po b/l10n/mk/settings.po
index f607774bbaf7f396750b9c386c9a8791f7e79a1f..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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+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,55 +84,88 @@ msgstr "Неможе да избришам корисник од група %s"
msgid "Couldn't update app."
msgstr ""
-#: js/apps.js:35
+#: 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:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr "Оневозможи"
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr "Овозможи"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr ""
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "Грешка"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr "Ажурирај"
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr ""
-#: js/personal.js:150
+#: 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:172
+#: js/personal.js:287
msgid "Saving..."
msgstr "Снимам..."
@@ -148,16 +181,16 @@ msgstr "врати"
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: 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:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "Администратор на група"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "Избриши"
@@ -177,7 +210,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "__language_name__"
@@ -343,11 +376,11 @@ msgstr "Повеќе"
msgid "Less"
msgstr "Помалку"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "Верзија"
-#: templates/admin.php:246 templates/personal.php:143
+#: 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 "
@@ -414,7 +447,7 @@ msgstr ""
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Имате искористено <strong>%s</strong> од достапните <strong>%s</strong>"
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "Лозинка"
@@ -438,7 +471,7 @@ msgstr "Нова лозинка"
msgid "Change password"
msgstr "Смени лозинка"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr ""
@@ -454,38 +487,66 @@ msgstr "Вашата адреса за е-пошта"
msgid "Fill in an email address to enable password recovery"
msgstr "Пополни ја адресата за е-пошта за да може да ја обновуваш лозинката"
-#: templates/personal.php:85 templates/personal.php:86
+#: 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:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "Помогни во преводот"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: 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:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "Енкрипција"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -511,30 +572,30 @@ msgstr ""
msgid "Default Storage"
msgstr ""
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr ""
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "Останато"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "Корисничко име"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr ""
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr ""
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr ""
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr ""
diff --git a/l10n/mk/user_ldap.po b/l10n/mk/user_ldap.po
index 323404d636423ebc55dc05450a5490f78c89f264..c1df01027fb0a3b75f8e56a27b94606b60906daa 100644
--- a/l10n/mk/user_ldap.po
+++ b/l10n/mk/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\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"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ml_IN/core.po b/l10n/ml_IN/core.po
index 9ad45f5453d44ad0f2982b05b39fccbbe6b889b9..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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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"
@@ -22,6 +22,10 @@ msgstr ""
msgid "%s shared »%s« with you"
msgstr ""
+#: ajax/share.php:227
+msgid "group"
+msgstr ""
+
#: ajax/update.php:11
msgid "Turned on maintenance mode"
msgstr ""
@@ -86,6 +90,26 @@ msgstr ""
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 ""
@@ -162,59 +186,59 @@ msgstr ""
msgid "December"
msgstr ""
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr ""
-#: js/js.js:812
+#: js/js.js:866
msgid "seconds ago"
msgstr ""
-#: js/js.js:813
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:814
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:815
+#: js/js.js:869
msgid "today"
msgstr ""
-#: js/js.js:816
+#: js/js.js:870
msgid "yesterday"
msgstr ""
-#: js/js.js:817
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:818
+#: js/js.js:872
msgid "last month"
msgstr ""
-#: js/js.js:819
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:820
+#: js/js.js:874
msgid "months ago"
msgstr ""
-#: js/js.js:821
+#: js/js.js:875
msgid "last year"
msgstr ""
-#: js/js.js:822
+#: js/js.js:876
msgid "years ago"
msgstr ""
@@ -222,22 +246,66 @@ msgstr ""
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:195
+#: 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."
@@ -247,7 +315,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:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr ""
@@ -267,7 +335,7 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr ""
@@ -323,67 +391,67 @@ msgstr ""
msgid "Expiration date"
msgstr ""
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr ""
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr ""
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr ""
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr ""
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr ""
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr ""
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr ""
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr ""
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr ""
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr ""
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr ""
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr ""
@@ -398,7 +466,7 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr ""
@@ -467,7 +535,7 @@ msgstr ""
msgid "Users"
msgstr ""
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr ""
@@ -596,14 +664,10 @@ msgstr ""
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr ""
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr ""
@@ -618,19 +682,19 @@ msgstr ""
msgid "Please change your password to secure your account again."
msgstr ""
-#: templates/login.php:34
+#: templates/login.php:32
msgid "Lost your password?"
msgstr ""
-#: templates/login.php:39
+#: templates/login.php:37
msgid "remember"
msgstr ""
-#: templates/login.php:41
+#: templates/login.php:39
msgid "Log in"
msgstr ""
-#: templates/login.php:47
+#: templates/login.php:45
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/ml_IN/files.po b/l10n/ml_IN/files.po
index 141b28bd7607e559fdc4884919e5e91957497957..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-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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,7 +74,15 @@ msgstr ""
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:123
+#: 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 ""
@@ -82,149 +90,157 @@ 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: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:277 js/file-upload.js:293 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:465
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr ""
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr ""
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr ""
-#: js/filelist.js:303
+#: js/filelist.js:416
msgid "suggest name"
msgstr ""
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr ""
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr ""
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "undo"
msgstr ""
-#: js/filelist.js:453
-msgid "Uploading %n file"
-msgid_plural "Uploading %n files"
+#: 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:518
-msgid "files uploading"
+#: 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/files.js:52
+#: 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: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 ""
-#: js/files.js:580
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/files.js:586
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-
#: lib/app.php:73
#, php-format
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 ""
@@ -260,84 +276,68 @@ 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 ""
-#: templates/part.list.php:74
-msgid "directory"
-msgstr ""
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr ""
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr ""
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr ""
-
#: templates/upgrade.php:2
msgid "Upgrading filesystem cache..."
msgstr ""
diff --git a/l10n/ml_IN/lib.po b/l10n/ml_IN/lib.po
index 98bbc764f021005e5379c07976df6283c7c4c3c1..0068185b81e2ac331ee193593129c30cf970c26e 100644
--- a/l10n/ml_IN/lib.po
+++ b/l10n/ml_IN/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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\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"
"Language-Team: Malayalam (India) (http://www.transifex.com/projects/p/owncloud/language/ml_IN/)\n"
"MIME-Version: 1.0\n"
@@ -48,11 +48,23 @@ msgstr ""
msgid "Admin"
msgstr ""
-#: app.php:837
+#: 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 ""
@@ -105,37 +117,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: 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:150
+#: 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:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -264,51 +276,51 @@ msgstr ""
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr ""
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr ""
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr ""
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr ""
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr ""
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr ""
diff --git a/l10n/ml_IN/settings.po b/l10n/ml_IN/settings.po
index 67536fd94e77ba7510481852cfe8d2403d6487b3..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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+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,55 +84,88 @@ msgstr ""
msgid "Couldn't update app."
msgstr ""
-#: js/apps.js:35
+#: 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:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr ""
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr ""
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr ""
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr ""
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr ""
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr ""
-#: js/personal.js:150
+#: 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:172
+#: js/personal.js:287
msgid "Saving..."
msgstr ""
@@ -148,16 +181,16 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: 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:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr ""
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr ""
@@ -177,7 +210,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr ""
@@ -343,11 +376,11 @@ msgstr ""
msgid "Less"
msgstr ""
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr ""
-#: templates/admin.php:246 templates/personal.php:143
+#: 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 "
@@ -414,7 +447,7 @@ msgstr ""
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:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr ""
@@ -438,7 +471,7 @@ msgstr ""
msgid "Change password"
msgstr ""
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr ""
@@ -454,38 +487,66 @@ msgstr ""
msgid "Fill in an email address to enable password recovery"
msgstr ""
-#: templates/personal.php:85 templates/personal.php:86
-msgid "Language"
+#: 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:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:106
+#: 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:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr ""
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -511,30 +572,30 @@ msgstr ""
msgid "Default Storage"
msgstr ""
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr ""
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr ""
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr ""
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr ""
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr ""
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr ""
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr ""
diff --git a/l10n/ms_MY/core.po b/l10n/ms_MY/core.po
index 93497a4ddd9ded374e85085dd854d4a801abe2e7..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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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"
@@ -22,6 +22,10 @@ msgstr ""
msgid "%s shared »%s« with you"
msgstr ""
+#: ajax/share.php:227
+msgid "group"
+msgstr ""
+
#: ajax/update.php:11
msgid "Turned on maintenance mode"
msgstr ""
@@ -86,6 +90,26 @@ msgstr "Tiada kategori dipilih untuk dibuang."
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 "Ahad"
@@ -162,55 +186,55 @@ msgstr "November"
msgid "December"
msgstr "Disember"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "Tetapan"
-#: js/js.js:812
+#: js/js.js:866
msgid "seconds ago"
msgstr ""
-#: js/js.js:813
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: js/js.js:814
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: js/js.js:815
+#: js/js.js:869
msgid "today"
msgstr ""
-#: js/js.js:816
+#: js/js.js:870
msgid "yesterday"
msgstr ""
-#: js/js.js:817
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
-#: js/js.js:818
+#: js/js.js:872
msgid "last month"
msgstr ""
-#: js/js.js:819
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: js/js.js:820
+#: js/js.js:874
msgid "months ago"
msgstr ""
-#: js/js.js:821
+#: js/js.js:875
msgid "last year"
msgstr ""
-#: js/js.js:822
+#: js/js.js:876
msgid "years ago"
msgstr ""
@@ -218,22 +242,65 @@ msgstr ""
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "Ya"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "Tidak"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
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] ""
+
+#: 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."
@@ -243,7 +310,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:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "Ralat"
@@ -263,7 +330,7 @@ msgstr ""
msgid "Share"
msgstr "Kongsi"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr ""
@@ -319,67 +386,67 @@ msgstr ""
msgid "Expiration date"
msgstr ""
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr ""
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr ""
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr ""
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr ""
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr ""
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr ""
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr ""
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr ""
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr ""
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr ""
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr ""
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr ""
@@ -394,7 +461,7 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr ""
@@ -463,7 +530,7 @@ msgstr "Peribadi"
msgid "Users"
msgstr "Pengguna"
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "Aplikasi"
@@ -592,14 +659,10 @@ msgstr "Setup selesai"
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "Log keluar"
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr ""
@@ -614,19 +677,19 @@ msgstr ""
msgid "Please change your password to secure your account again."
msgstr ""
-#: templates/login.php:34
+#: templates/login.php:32
msgid "Lost your password?"
msgstr "Hilang kata laluan?"
-#: templates/login.php:39
+#: templates/login.php:37
msgid "remember"
msgstr "ingat"
-#: templates/login.php:41
+#: templates/login.php:39
msgid "Log in"
msgstr "Log masuk"
-#: templates/login.php:47
+#: templates/login.php:45
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/ms_MY/files.po b/l10n/ms_MY/files.po
index a199e2b8aca5645335df4a441bb6de0d15960bd7..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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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,7 +74,15 @@ msgstr "Gagal untuk disimpan"
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:123
+#: 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 ""
@@ -82,146 +90,154 @@ 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: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:277 js/file-upload.js:293 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 "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:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "Dalam proses"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr ""
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "ganti"
-#: js/filelist.js:303
+#: js/filelist.js:416
msgid "suggest name"
msgstr ""
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "Batal"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr ""
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "undo"
msgstr ""
-#: js/filelist.js:453
-msgid "Uploading %n file"
-msgid_plural "Uploading %n files"
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
+msgid "%n file"
+msgid_plural "%n files"
msgstr[0] ""
-#: js/filelist.js:518
-msgid "files uploading"
+#: js/filelist.js:541
+msgid "{dirs} and {files}"
msgstr ""
-#: js/files.js:52
+#: js/filelist.js:731 js/filelist.js:769
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+
+#: 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 "Nama"
-#: js/files.js:563 templates/index.php:78
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "Saiz"
-#: js/files.js:564 templates/index.php:80
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr "Dimodifikasi"
-#: js/files.js:580
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-
-#: js/files.js:586
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-
#: lib/app.php:73
#, php-format
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"
@@ -257,84 +273,68 @@ 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:73
+#: templates/index.php:67
msgid "Download"
msgstr "Muat turun"
-#: 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 "Padam"
-#: templates/index.php:105
+#: templates/index.php:100
msgid "Upload too large"
msgstr "Muatnaik terlalu besar"
-#: 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 "Fail yang cuba dimuat naik melebihi saiz maksimum fail upload server"
-#: templates/index.php:112
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr "Fail sedang diimbas, harap bersabar."
-#: templates/index.php:115
+#: templates/index.php:110
msgid "Current scanning"
msgstr "Imbasan semasa"
-#: templates/part.list.php:74
-msgid "directory"
-msgstr ""
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr ""
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr "fail"
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr "fail"
-
#: templates/upgrade.php:2
msgid "Upgrading filesystem cache..."
msgstr ""
diff --git a/l10n/ms_MY/files_sharing.po b/l10n/ms_MY/files_sharing.po
index 7ce6237f3d070617aa3a4c32c84dd6da0cafe90c..67cf9aabfb3743efa0add93d65eeb3fe58b557ff 100644
--- a/l10n/ms_MY/files_sharing.po
+++ b/l10n/ms_MY/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00: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"
@@ -63,7 +63,7 @@ msgstr ""
msgid "%s shared the file %s with you"
msgstr ""
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "Muat turun"
@@ -75,6 +75,6 @@ msgstr "Muat naik"
msgid "Cancel upload"
msgstr "Batal muat naik"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr ""
diff --git a/l10n/ms_MY/lib.po b/l10n/ms_MY/lib.po
index 637bea9f33c1a1fdb790dad6c2bebdb21234a7b5..2d0d010262befec2b7ad3b17b447dca4240ace9d 100644
--- a/l10n/ms_MY/lib.po
+++ b/l10n/ms_MY/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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\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"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
@@ -48,11 +48,23 @@ msgstr "Pengguna"
msgid "Admin"
msgstr "Admin"
-#: app.php:837
+#: 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 "Perkhidmatan web di bawah kawalan anda"
@@ -105,37 +117,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: 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:150
+#: 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:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -264,47 +276,47 @@ msgstr ""
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr ""
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr ""
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr ""
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr ""
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr ""
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr ""
diff --git a/l10n/ms_MY/settings.po b/l10n/ms_MY/settings.po
index f809ae9063263d4c29b59cf3db750dcfc4a29e62..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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+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,55 +84,88 @@ msgstr ""
msgid "Couldn't update app."
msgstr ""
-#: js/apps.js:35
+#: 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:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr "Nyahaktif"
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr "Aktif"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr ""
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "Ralat"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr "Kemaskini"
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr ""
-#: js/personal.js:150
+#: 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:172
+#: js/personal.js:287
msgid "Saving..."
msgstr "Simpan..."
@@ -148,16 +181,16 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "Kumpulan"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr ""
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "Padam"
@@ -177,7 +210,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "_nama_bahasa_"
@@ -343,11 +376,11 @@ msgstr "Lanjutan"
msgid "Less"
msgstr ""
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr ""
-#: templates/admin.php:246 templates/personal.php:143
+#: 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 "
@@ -414,7 +447,7 @@ msgstr ""
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:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "Kata laluan"
@@ -438,7 +471,7 @@ msgstr "Kata laluan baru"
msgid "Change password"
msgstr "Ubah kata laluan"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr ""
@@ -454,38 +487,66 @@ msgstr "Alamat emel anda"
msgid "Fill in an email address to enable password recovery"
msgstr "Isi alamat emel anda untuk membolehkan pemulihan kata laluan"
-#: templates/personal.php:85 templates/personal.php:86
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr "Gambar profil"
+
+#: 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 "Bahasa"
-#: templates/personal.php:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "Bantu terjemah"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:106
+#: 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:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr ""
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -511,30 +572,30 @@ msgstr ""
msgid "Default Storage"
msgstr ""
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr ""
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "Lain"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "Nama pengguna"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr ""
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr ""
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr ""
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr ""
diff --git a/l10n/ms_MY/user_ldap.po b/l10n/ms_MY/user_ldap.po
index de6d8fa0134ec750e153958307ea7e249c435c11..403d5ac2ff3d13b628d0ea8a1fd898579716f1df 100644
--- a/l10n/ms_MY/user_ldap.po
+++ b/l10n/ms_MY/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\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"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/my_MM/core.po b/l10n/my_MM/core.po
index 9731f51472595226feccf5312843c1b12346e2bd..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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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"
@@ -22,6 +22,10 @@ msgstr ""
msgid "%s shared »%s« with you"
msgstr ""
+#: ajax/share.php:227
+msgid "group"
+msgstr ""
+
#: ajax/update.php:11
msgid "Turned on maintenance mode"
msgstr ""
@@ -86,6 +90,26 @@ msgstr "ဖျက်ရန်အတွက်ခေါင်းစဉ်မရွ
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 ""
@@ -162,55 +186,55 @@ msgstr "နိုဝင်ဘာ"
msgid "December"
msgstr "ဒီဇင်ဘာ"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr ""
-#: js/js.js:812
+#: js/js.js:866
msgid "seconds ago"
msgstr "စက္ကန့်အနည်းငယ်က"
-#: js/js.js:813
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: js/js.js:814
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: js/js.js:815
+#: js/js.js:869
msgid "today"
msgstr "ယနေ့"
-#: js/js.js:816
+#: js/js.js:870
msgid "yesterday"
msgstr "မနေ့က"
-#: js/js.js:817
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
-#: js/js.js:818
+#: js/js.js:872
msgid "last month"
msgstr "ပြီးခဲ့သောလ"
-#: js/js.js:819
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: js/js.js:820
+#: js/js.js:874
msgid "months ago"
msgstr ""
-#: js/js.js:821
+#: js/js.js:875
msgid "last year"
msgstr "မနှစ်က"
-#: js/js.js:822
+#: js/js.js:876
msgid "years ago"
msgstr "နှစ် အရင်က"
@@ -218,22 +242,65 @@ msgstr "နှစ် အရင်က"
msgid "Choose"
msgstr "ရွေးချယ်"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "ဟုတ်"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "မဟုတ်ဘူး"
-#: js/oc-dialogs.js:195
+#: 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] ""
+
+#: 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."
@@ -243,7 +310,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:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr ""
@@ -263,7 +330,7 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr ""
@@ -319,67 +386,67 @@ msgstr "သက်တမ်းကုန်ဆုံးမည့်ရက်သတ
msgid "Expiration date"
msgstr "သက်တမ်းကုန်ဆုံးမည့်ရက်"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "အီးမေးလ်ဖြင့်ဝေမျှမည် -"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr ""
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "ပြန်လည်ဝေမျှခြင်းခွင့်မပြုပါ"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr ""
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "ပြင်ဆင်နိုင်"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr ""
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "ဖန်တီးမည်"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr ""
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "ဖျက်မည်"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "ဝေမျှမည်"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "စကားဝှက်ဖြင့်ကာကွယ်ထားသည်"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr ""
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr ""
@@ -394,7 +461,7 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr ""
@@ -463,7 +530,7 @@ msgstr ""
msgid "Users"
msgstr "သုံးစွဲသူ"
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "Apps"
@@ -592,14 +659,10 @@ msgstr "တပ်ဆင်ခြင်းပြီးပါပြီ။"
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr ""
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr ""
@@ -614,19 +677,19 @@ msgstr ""
msgid "Please change your password to secure your account again."
msgstr ""
-#: templates/login.php:34
+#: templates/login.php:32
msgid "Lost your password?"
msgstr "သင်၏စကားဝှက်ပျောက်သွားပြီလား။"
-#: templates/login.php:39
+#: templates/login.php:37
msgid "remember"
msgstr "မှတ်မိစေသည်"
-#: templates/login.php:41
+#: templates/login.php:39
msgid "Log in"
msgstr "ဝင်ရောက်ရန်"
-#: templates/login.php:47
+#: templates/login.php:45
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/my_MM/files.po b/l10n/my_MM/files.po
index b3e7927bbee72fe2c03811870aa031c875b7b54c..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-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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,7 +74,15 @@ msgstr ""
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:123
+#: 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 ""
@@ -82,146 +90,154 @@ 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: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:277 js/file-upload.js:293 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:465
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr ""
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr ""
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr ""
-#: js/filelist.js:303
+#: js/filelist.js:416
msgid "suggest name"
msgstr ""
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr ""
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr ""
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "undo"
msgstr ""
-#: js/filelist.js:453
-msgid "Uploading %n file"
-msgid_plural "Uploading %n files"
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
+msgid "%n folder"
+msgid_plural "%n folders"
msgstr[0] ""
-#: js/filelist.js:518
-msgid "files uploading"
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+
+#: js/filelist.js:541
+msgid "{dirs} and {files}"
msgstr ""
-#: js/files.js:52
+#: js/filelist.js:731 js/filelist.js:769
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+
+#: 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 ""
-#: js/files.js:580
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-
-#: js/files.js:586
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-
#: lib/app.php:73
#, php-format
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 ""
@@ -257,84 +273,68 @@ 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 ""
-#: templates/part.list.php:74
-msgid "directory"
-msgstr ""
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr ""
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr ""
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr ""
-
#: templates/upgrade.php:2
msgid "Upgrading filesystem cache..."
msgstr ""
diff --git a/l10n/my_MM/files_sharing.po b/l10n/my_MM/files_sharing.po
index 77d34ee18f778b258671b7042f0eb4a8301b6929..6b5c6c97692d1e1f957f0a504b975f4e0d986b4f 100644
--- a/l10n/my_MM/files_sharing.po
+++ b/l10n/my_MM/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\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"
"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
"MIME-Version: 1.0\n"
@@ -63,7 +63,7 @@ msgstr ""
msgid "%s shared the file %s with you"
msgstr ""
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "ဒေါင်းလုတ်"
@@ -75,6 +75,6 @@ msgstr ""
msgid "Cancel upload"
msgstr ""
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr ""
diff --git a/l10n/my_MM/lib.po b/l10n/my_MM/lib.po
index 4e6fa87d98938749b4184775fc042632a1298985..a5faefbbddf071d487dead4ccb4c9a06e33a0f59 100644
--- a/l10n/my_MM/lib.po
+++ b/l10n/my_MM/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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\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"
"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
"MIME-Version: 1.0\n"
@@ -48,11 +48,23 @@ msgstr "သုံးစွဲသူ"
msgid "Admin"
msgstr "အက်ဒမင်"
-#: app.php:837
+#: 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 "သင်၏ထိန်းချုပ်မှု့အောက်တွင်ရှိသော Web services"
@@ -105,37 +117,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: 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:150
+#: 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:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -264,47 +276,47 @@ msgstr ""
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "စက္ကန့်အနည်းငယ်က"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "ယနေ့"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "မနေ့က"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "ပြီးခဲ့သောလ"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "မနှစ်က"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "နှစ် အရင်က"
diff --git a/l10n/my_MM/settings.po b/l10n/my_MM/settings.po
index 94670f111b4e310d355e16fe96365604037c9706..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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+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,55 +84,88 @@ msgstr ""
msgid "Couldn't update app."
msgstr ""
-#: js/apps.js:35
+#: 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:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr ""
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr ""
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr ""
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr ""
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr ""
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr ""
-#: js/personal.js:150
+#: 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:172
+#: js/personal.js:287
msgid "Saving..."
msgstr ""
@@ -148,16 +181,16 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: 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:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr ""
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr ""
@@ -177,7 +210,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr ""
@@ -343,11 +376,11 @@ msgstr ""
msgid "Less"
msgstr ""
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr ""
-#: templates/admin.php:246 templates/personal.php:143
+#: 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 "
@@ -414,7 +447,7 @@ msgstr ""
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:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "စကားဝှက်"
@@ -438,7 +471,7 @@ msgstr "စကားဝှက်အသစ်"
msgid "Change password"
msgstr ""
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr ""
@@ -454,38 +487,66 @@ msgstr ""
msgid "Fill in an email address to enable password recovery"
msgstr ""
-#: templates/personal.php:85 templates/personal.php:86
-msgid "Language"
+#: 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:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:106
+#: 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:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr ""
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -511,30 +572,30 @@ msgstr ""
msgid "Default Storage"
msgstr ""
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr ""
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr ""
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "သုံးစွဲသူအမည်"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr ""
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr ""
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr ""
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr ""
diff --git a/l10n/my_MM/user_ldap.po b/l10n/my_MM/user_ldap.po
index 62ed04aa882661d73232e77db87b58d6982b3853..cb30d0ff0f7fa010808b254c25917dc45478a7c9 100644
--- a/l10n/my_MM/user_ldap.po
+++ b/l10n/my_MM/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\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"
"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/nb_NO/core.po b/l10n/nb_NO/core.po
index 2c6871c83f3c7f551e70f98029feb72881f6f0f9..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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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"
@@ -23,6 +23,10 @@ msgstr ""
msgid "%s shared »%s« with you"
msgstr "%s delte »%s« med deg"
+#: ajax/share.php:227
+msgid "group"
+msgstr "gruppe"
+
#: ajax/update.php:11
msgid "Turned on maintenance mode"
msgstr ""
@@ -87,6 +91,26 @@ msgstr "Ingen kategorier merket for sletting."
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 "Søndag"
@@ -163,59 +187,59 @@ msgstr "November"
msgid "December"
msgstr "Desember"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "Innstillinger"
-#: js/js.js:812
+#: js/js.js:866
msgid "seconds ago"
msgstr "sekunder siden"
-#: js/js.js:813
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:814
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:815
+#: js/js.js:869
msgid "today"
msgstr "i dag"
-#: js/js.js:816
+#: js/js.js:870
msgid "yesterday"
msgstr "i går"
-#: js/js.js:817
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:818
+#: js/js.js:872
msgid "last month"
msgstr "forrige måned"
-#: js/js.js:819
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:820
+#: js/js.js:874
msgid "months ago"
msgstr "måneder siden"
-#: js/js.js:821
+#: js/js.js:875
msgid "last year"
msgstr "forrige år"
-#: js/js.js:822
+#: js/js.js:876
msgid "years ago"
msgstr "år siden"
@@ -223,22 +247,66 @@ msgstr "år siden"
msgid "Choose"
msgstr "Velg"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "Ja"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "Nei"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
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] ""
+
+#: 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."
@@ -248,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:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "Feil"
@@ -268,7 +336,7 @@ msgstr "Delt"
msgid "Share"
msgstr "Del"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr "Feil under deling"
@@ -324,67 +392,67 @@ msgstr "Set utløpsdato"
msgid "Expiration date"
msgstr "Utløpsdato"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "Del på epost"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "Ingen personer funnet"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "Avslutt deling"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "kan endre"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "tilgangskontroll"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "opprett"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "oppdater"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "slett"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "del"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "Passordbeskyttet"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr "Kan ikke sette utløpsdato"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr "Sender..."
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr "E-post sendt"
@@ -399,7 +467,7 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr ""
@@ -468,7 +536,7 @@ msgstr "Personlig"
msgid "Users"
msgstr "Brukere"
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "Apper"
@@ -597,14 +665,10 @@ msgstr "Fullfør oppsetting"
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "Logg ut"
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "Automatisk pålogging avvist!"
@@ -619,19 +683,19 @@ msgstr "Hvis du ikke har endret passordet ditt nylig kan kontoen din være kompr
msgid "Please change your password to secure your account again."
msgstr "Vennligst skift passord for å gjøre kontoen din sikker igjen."
-#: templates/login.php:34
+#: templates/login.php:32
msgid "Lost your password?"
msgstr "Mistet passordet ditt?"
-#: templates/login.php:39
+#: templates/login.php:37
msgid "remember"
msgstr "husk"
-#: templates/login.php:41
+#: templates/login.php:39
msgid "Log in"
msgstr "Logg inn"
-#: templates/login.php:47
+#: templates/login.php:45
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/nb_NO/files.po b/l10n/nb_NO/files.po
index 4485c7620123b5d8e9c20dba7ac242bd04aa297a..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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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,7 +77,15 @@ msgstr "Klarte ikke å skrive til disk"
msgid "Not enough storage available"
msgstr "Ikke nok lagringsplass"
-#: ajax/upload.php:123
+#: 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 "Ugyldig katalog."
@@ -85,149 +93,157 @@ 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: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 "Filopplasting pågår. Forlater du siden nå avbrytes opplastingen."
-#: js/file-upload.js:241
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr "URL-en kan ikke være tom."
-#: 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 "Ugyldig mappenavn. Bruk av \"Shared\" er reservert av ownCloud."
-#: js/file-upload.js:277 js/file-upload.js:293 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 "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:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "Ventende"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{new_name} finnes allerede"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "erstatt"
-#: js/filelist.js:303
+#: js/filelist.js:416
msgid "suggest name"
msgstr "foreslå navn"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "avbryt"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr "erstattet {new_name} med {old_name}"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "undo"
msgstr "angre"
-#: js/filelist.js:453
+#: 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: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: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] "Laster opp %n fil"
msgstr[1] "Laster opp %n filer"
-#: js/filelist.js:518
-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: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 "Navn"
-#: js/files.js:563 templates/index.php:78
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "Størrelse"
-#: js/files.js:564 templates/index.php:80
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr "Endret"
-#: js/files.js:580
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] "%n mappe"
-msgstr[1] "%n mapper"
-
-#: js/files.js:586
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] "%n fil"
-msgstr[1] "%n filer"
-
#: lib/app.php:73
#, php-format
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"
@@ -263,84 +279,68 @@ 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:73
+#: templates/index.php:67
msgid "Download"
msgstr "Last ned"
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr "Avslutt deling"
-#: templates/index.php:91 templates/index.php:92
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "Slett"
-#: templates/index.php:105
+#: templates/index.php:100
msgid "Upload too large"
msgstr "Filen er for stor"
-#: 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 "Filene du prøver å laste opp er for store for å laste opp til denne serveren."
-#: templates/index.php:112
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr "Skanner filer, vennligst vent."
-#: templates/index.php:115
+#: templates/index.php:110
msgid "Current scanning"
msgstr "Pågående skanning"
-#: templates/part.list.php:74
-msgid "directory"
-msgstr "katalog"
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr "kataloger"
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr "fil"
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr "filer"
-
#: templates/upgrade.php:2
msgid "Upgrading filesystem cache..."
msgstr "Oppgraderer filsystemets mellomlager..."
diff --git a/l10n/nb_NO/files_sharing.po b/l10n/nb_NO/files_sharing.po
index ccc3611f7268dd24a1973687b8056140f00fbad0..02cbd3e982f2892ff3ce1e5fde75910ce3f7fdac 100644
--- a/l10n/nb_NO/files_sharing.po
+++ b/l10n/nb_NO/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00: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"
@@ -64,7 +64,7 @@ msgstr "%s delte mappen %s med deg"
msgid "%s shared the file %s with you"
msgstr "%s delte filen %s med deg"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "Last ned"
@@ -76,6 +76,6 @@ msgstr "Last opp"
msgid "Cancel upload"
msgstr "Avbryt opplasting"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "Forhåndsvisning ikke tilgjengelig for"
diff --git a/l10n/nb_NO/lib.po b/l10n/nb_NO/lib.po
index 1341b39baedf541b2450afd60ad5a7031c95ee4d..1fa0543983ba9b71d433a2df5ac59447b510d2d9 100644
--- a/l10n/nb_NO/lib.po
+++ b/l10n/nb_NO/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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\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"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
@@ -48,11 +48,23 @@ msgstr "Brukere"
msgid "Admin"
msgstr "Admin"
-#: app.php:837
+#: 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 "web tjenester du kontrollerer"
@@ -105,37 +117,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: 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:150
+#: 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:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -264,51 +276,51 @@ msgstr "Din nettservev er ikke konfigurert korrekt for filsynkronisering. WebDAV
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Vennligst dobbelsjekk <a href='%s'>installasjonsguiden</a>."
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "sekunder siden"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "i dag"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "i går"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "forrige måned"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "forrige år"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "år siden"
diff --git a/l10n/nb_NO/settings.po b/l10n/nb_NO/settings.po
index 98c0ccd925010b8dbeb7bc7158bcfc26b7537e7c..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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+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,55 +86,88 @@ msgstr "Kan ikke slette bruker fra gruppen %s"
msgid "Couldn't update app."
msgstr "Kunne ikke oppdatere app."
-#: js/apps.js:35
+#: 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}"
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr "Slå avBehandle "
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr "Aktiver"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr "Vennligst vent..."
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr "Oppdaterer..."
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr "Feil ved oppdatering av app"
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "Feil"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr "Oppdater"
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr "Oppdatert"
-#: js/personal.js:150
+#: 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:172
+#: js/personal.js:287
msgid "Saving..."
msgstr "Lagrer..."
@@ -150,16 +183,16 @@ msgstr "angre"
msgid "Unable to remove user"
msgstr "Kunne ikke slette bruker"
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "Grupper"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "Gruppeadministrator"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "Slett"
@@ -179,7 +212,7 @@ msgstr "Feil ved oppretting av bruker"
msgid "A valid password must be provided"
msgstr "Oppgi et gyldig passord"
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "__language_name__"
@@ -345,11 +378,11 @@ msgstr "Mer"
msgid "Less"
msgstr "Mindre"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "Versjon"
-#: templates/admin.php:246 templates/personal.php:143
+#: 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 "
@@ -416,7 +449,7 @@ msgstr "Vis \"Førstegangs veiveiseren\" på nytt"
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Du har brukt <strong>%s</strong> av tilgjengelig <strong>%s</strong>"
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "Passord"
@@ -440,7 +473,7 @@ msgstr "Nytt passord"
msgid "Change password"
msgstr "Endre passord"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr "Visningsnavn"
@@ -456,38 +489,66 @@ msgstr "Din e-postadresse"
msgid "Fill in an email address to enable password recovery"
msgstr "Oppi epostadressen du vil tilbakestille passordet for"
-#: templates/personal.php:85 templates/personal.php:86
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr "Profilbilde"
+
+#: 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 "Språk"
-#: templates/personal.php:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "Bidra til oversettelsen"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: 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 "Bruk denne adressen for å <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">få tilgang til filene dine via WebDAV</a>"
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "Kryptering"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -513,30 +574,30 @@ msgstr ""
msgid "Default Storage"
msgstr "Standard lager"
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr "Ubegrenset"
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "Annet"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "Brukernavn"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr "Lager"
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr "endre visningsnavn"
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr "sett nytt passord"
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr "Standard"
diff --git a/l10n/nb_NO/user_ldap.po b/l10n/nb_NO/user_ldap.po
index 037b92065940ed5532aba8ce7d3f8a7b78fd936e..52aa1d44d42d2cc0323aec63e1ab4c58a7c87b72 100644
--- a/l10n/nb_NO/user_ldap.po
+++ b/l10n/nb_NO/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\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"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ne/core.po b/l10n/ne/core.po
index fe95a400040a17db60c255ad16b79a541130008b..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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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"
@@ -22,6 +22,10 @@ msgstr ""
msgid "%s shared »%s« with you"
msgstr ""
+#: ajax/share.php:227
+msgid "group"
+msgstr ""
+
#: ajax/update.php:11
msgid "Turned on maintenance mode"
msgstr ""
@@ -86,6 +90,26 @@ msgstr ""
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 ""
@@ -162,59 +186,59 @@ msgstr ""
msgid "December"
msgstr ""
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr ""
-#: js/js.js:812
+#: js/js.js:866
msgid "seconds ago"
msgstr ""
-#: js/js.js:813
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:814
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:815
+#: js/js.js:869
msgid "today"
msgstr ""
-#: js/js.js:816
+#: js/js.js:870
msgid "yesterday"
msgstr ""
-#: js/js.js:817
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:818
+#: js/js.js:872
msgid "last month"
msgstr ""
-#: js/js.js:819
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:820
+#: js/js.js:874
msgid "months ago"
msgstr ""
-#: js/js.js:821
+#: js/js.js:875
msgid "last year"
msgstr ""
-#: js/js.js:822
+#: js/js.js:876
msgid "years ago"
msgstr ""
@@ -222,22 +246,66 @@ msgstr ""
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:195
+#: 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."
@@ -247,7 +315,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:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr ""
@@ -267,7 +335,7 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr ""
@@ -323,67 +391,67 @@ msgstr ""
msgid "Expiration date"
msgstr ""
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr ""
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr ""
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr ""
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr ""
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr ""
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr ""
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr ""
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr ""
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr ""
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr ""
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr ""
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr ""
@@ -398,7 +466,7 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr ""
@@ -467,7 +535,7 @@ msgstr ""
msgid "Users"
msgstr ""
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr ""
@@ -596,14 +664,10 @@ msgstr ""
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr ""
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr ""
@@ -618,19 +682,19 @@ msgstr ""
msgid "Please change your password to secure your account again."
msgstr ""
-#: templates/login.php:34
+#: templates/login.php:32
msgid "Lost your password?"
msgstr ""
-#: templates/login.php:39
+#: templates/login.php:37
msgid "remember"
msgstr ""
-#: templates/login.php:41
+#: templates/login.php:39
msgid "Log in"
msgstr ""
-#: templates/login.php:47
+#: templates/login.php:45
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/ne/files.po b/l10n/ne/files.po
index f5777db036d4c5dcb571885c64e477da09fa0f13..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-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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,7 +74,15 @@ msgstr ""
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:123
+#: 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 ""
@@ -82,149 +90,157 @@ 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: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:277 js/file-upload.js:293 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:465
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr ""
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr ""
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr ""
-#: js/filelist.js:303
+#: js/filelist.js:416
msgid "suggest name"
msgstr ""
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr ""
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr ""
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "undo"
msgstr ""
-#: js/filelist.js:453
-msgid "Uploading %n file"
-msgid_plural "Uploading %n files"
+#: 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:518
-msgid "files uploading"
+#: 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/files.js:52
+#: 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: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 ""
-#: js/files.js:580
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/files.js:586
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-
#: lib/app.php:73
#, php-format
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 ""
@@ -260,84 +276,68 @@ 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 ""
-#: templates/part.list.php:74
-msgid "directory"
-msgstr ""
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr ""
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr ""
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr ""
-
#: templates/upgrade.php:2
msgid "Upgrading filesystem cache..."
msgstr ""
diff --git a/l10n/ne/lib.po b/l10n/ne/lib.po
index a938ce906cd21599ec456299e3166ceeea72d21e..a45524a68a8677f52883446785d8e65dc5236f99 100644
--- a/l10n/ne/lib.po
+++ b/l10n/ne/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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\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"
"Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
"MIME-Version: 1.0\n"
@@ -48,11 +48,23 @@ msgstr ""
msgid "Admin"
msgstr ""
-#: app.php:837
+#: 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 ""
@@ -105,37 +117,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: 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:150
+#: 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:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -264,51 +276,51 @@ msgstr ""
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr ""
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr ""
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr ""
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr ""
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr ""
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr ""
diff --git a/l10n/ne/settings.po b/l10n/ne/settings.po
index 95b359633edb8c3d9c2ca0e2c551ec260dcf962c..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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+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,55 +84,88 @@ msgstr ""
msgid "Couldn't update app."
msgstr ""
-#: js/apps.js:35
+#: 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:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr ""
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr ""
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr ""
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr ""
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr ""
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr ""
-#: js/personal.js:150
+#: 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:172
+#: js/personal.js:287
msgid "Saving..."
msgstr ""
@@ -148,16 +181,16 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: 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:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr ""
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr ""
@@ -177,7 +210,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr ""
@@ -343,11 +376,11 @@ msgstr ""
msgid "Less"
msgstr ""
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr ""
-#: templates/admin.php:246 templates/personal.php:143
+#: 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 "
@@ -414,7 +447,7 @@ msgstr ""
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:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr ""
@@ -438,7 +471,7 @@ msgstr ""
msgid "Change password"
msgstr ""
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr ""
@@ -454,38 +487,66 @@ msgstr ""
msgid "Fill in an email address to enable password recovery"
msgstr ""
-#: templates/personal.php:85 templates/personal.php:86
-msgid "Language"
+#: 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:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:106
+#: 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:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr ""
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -511,30 +572,30 @@ msgstr ""
msgid "Default Storage"
msgstr ""
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr ""
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr ""
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr ""
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr ""
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr ""
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr ""
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr ""
diff --git a/l10n/nl/core.po b/l10n/nl/core.po
index 171e8aa635e97605d12a7b54829d59f6fd1a73c6..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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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"
@@ -25,30 +25,34 @@ msgstr ""
msgid "%s shared »%s« with you"
msgstr "%s deelde »%s« met jou"
+#: ajax/share.php:227
+msgid "group"
+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."
@@ -89,6 +93,26 @@ msgstr "Geen categorie geselecteerd voor verwijdering."
msgid "Error removing %s from favorites."
msgstr "Verwijderen %s van favorieten is mislukt."
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr "Geen afbeelding of bestand opgegeven"
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr "Onbekend bestandsformaat"
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr "Ongeldige afbeelding"
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr "Geen tijdelijke profielafbeelding beschikbaar. Probeer het opnieuw"
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr "Geen bijsnijdingsgegevens opgegeven"
+
#: js/config.php:32
msgid "Sunday"
msgstr "zondag"
@@ -165,59 +189,59 @@ msgstr "november"
msgid "December"
msgstr "december"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "Instellingen"
-#: js/js.js:812
+#: js/js.js:866
msgid "seconds ago"
msgstr "seconden geleden"
-#: js/js.js:813
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] "%n minuten geleden"
-#: js/js.js:814
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] "%n uur geleden"
-#: js/js.js:815
+#: js/js.js:869
msgid "today"
msgstr "vandaag"
-#: js/js.js:816
+#: js/js.js:870
msgid "yesterday"
msgstr "gisteren"
-#: js/js.js:817
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] "%n dagen geleden"
-#: js/js.js:818
+#: js/js.js:872
msgid "last month"
msgstr "vorige maand"
-#: js/js.js:819
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] "%n maanden geleden"
-#: js/js.js:820
+#: js/js.js:874
msgid "months ago"
msgstr "maanden geleden"
-#: js/js.js:821
+#: js/js.js:875
msgid "last year"
msgstr "vorig jaar"
-#: js/js.js:822
+#: js/js.js:876
msgid "years ago"
msgstr "jaar geleden"
@@ -225,22 +249,66 @@ msgstr "jaar geleden"
msgid "Choose"
msgstr "Kies"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
-msgstr "Fout bij laden van bestandsselectie sjabloon"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
+msgstr "Fout bij laden bestandenselecteur sjabloon: {error}"
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "Ja"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "Nee"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
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
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -250,7 +318,7 @@ msgstr "Het object type is niet gespecificeerd."
#: 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:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "Fout"
@@ -270,7 +338,7 @@ msgstr "Gedeeld"
msgid "Share"
msgstr "Delen"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr "Fout tijdens het delen"
@@ -326,67 +394,67 @@ msgstr "Stel vervaldatum in"
msgid "Expiration date"
msgstr "Vervaldatum"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "Deel via e-mail:"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "Geen mensen gevonden"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "Verder delen is niet toegestaan"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr "Gedeeld in {item} met {user}"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "Stop met delen"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "kan wijzigen"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "toegangscontrole"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "creëer"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "bijwerken"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "verwijderen"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "deel"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "Wachtwoord beveiligd"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr "Fout tijdens het verwijderen van de verval datum"
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr "Fout tijdens het instellen van de vervaldatum"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr "Versturen ..."
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr "E-mail verzonden"
@@ -401,7 +469,7 @@ msgstr "De update is niet geslaagd. Meld dit probleem aan bij de <a href=\"https
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "De update is geslaagd. Je wordt teruggeleid naar je eigen ownCloud."
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr "%s wachtwoord reset"
@@ -470,7 +538,7 @@ msgstr "Persoonlijk"
msgid "Users"
msgstr "Gebruikers"
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "Apps"
@@ -599,14 +667,10 @@ msgstr "Installatie afronden"
msgid "%s is available. Get more information on how to update."
msgstr "%s is beschikbaar. Verkrijg meer informatie over het bijwerken."
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "Afmelden"
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr "Meer applicaties"
-
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "Automatische aanmelding geweigerd!"
@@ -621,19 +685,19 @@ msgstr "Als je je wachtwoord niet onlangs heeft aangepast, kan je account overge
msgid "Please change your password to secure your account again."
msgstr "Wijzig je wachtwoord zodat je account weer beveiligd is."
-#: templates/login.php:34
+#: templates/login.php:32
msgid "Lost your password?"
msgstr "Wachtwoord vergeten?"
-#: templates/login.php:39
+#: templates/login.php:37
msgid "remember"
msgstr "onthoud gegevens"
-#: templates/login.php:41
+#: templates/login.php:39
msgid "Log in"
msgstr "Meld je aan"
-#: templates/login.php:47
+#: templates/login.php:45
msgid "Alternative Logins"
msgstr "Alternatieve inlogs"
diff --git a/l10n/nl/files.po b/l10n/nl/files.po
index 963583df01ef50c827760b87a7d8aaad252097d5..68d1ce8e06bdea155bc011f62214f072eae3d725 100644
--- a/l10n/nl/files.po
+++ b/l10n/nl/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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
@@ -76,7 +76,15 @@ msgstr "Schrijven naar schijf mislukt"
msgid "Not enough storage available"
msgstr "Niet genoeg opslagruimte beschikbaar"
-#: ajax/upload.php:123
+#: 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 "Ongeldige directory."
@@ -84,149 +92,157 @@ 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: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 "Bestandsupload is bezig. Wanneer de pagina nu verlaten wordt, stopt de upload."
-#: js/file-upload.js:241
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr "URL kan niet leeg zijn."
-#: 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 "Ongeldige mapnaam. Gebruik van 'Gedeeld' is voorbehouden aan Owncloud zelf"
-#: js/file-upload.js:277 js/file-upload.js:293 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 "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:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "In behandeling"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{new_name} bestaat al"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "vervang"
-#: js/filelist.js:303
+#: js/filelist.js:416
msgid "suggest name"
msgstr "Stel een naam voor"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "annuleren"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr "verving {new_name} met {old_name}"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "undo"
msgstr "ongedaan maken"
-#: js/filelist.js:453
+#: 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: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:541
+msgid "{dirs} and {files}"
+msgstr "{dirs} en {files}"
+
+#: 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:518
-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: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 "Naam"
-#: js/files.js:563 templates/index.php:78
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "Grootte"
-#: js/files.js:564 templates/index.php:80
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr "Aangepast"
-#: js/files.js:580
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] "%n mappen"
-
-#: js/files.js:586
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] "%n bestanden"
-
#: lib/app.php:73
#, php-format
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"
@@ -262,84 +278,68 @@ 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:73
+#: templates/index.php:67
msgid "Download"
msgstr "Downloaden"
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr "Stop met delen"
-#: templates/index.php:91 templates/index.php:92
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "Verwijder"
-#: templates/index.php:105
+#: templates/index.php:100
msgid "Upload too large"
msgstr "Upload is te groot"
-#: 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 "De bestanden die u probeert te uploaden zijn groter dan de maximaal toegestane bestandsgrootte voor deze server."
-#: templates/index.php:112
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr "Bestanden worden gescand, even wachten."
-#: templates/index.php:115
+#: templates/index.php:110
msgid "Current scanning"
msgstr "Er wordt gescand"
-#: templates/part.list.php:74
-msgid "directory"
-msgstr "directory"
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr "directories"
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr "bestand"
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr "bestanden"
-
#: templates/upgrade.php:2
msgid "Upgrading filesystem cache..."
msgstr "Upgraden bestandssysteem cache..."
diff --git a/l10n/nl/files_sharing.po b/l10n/nl/files_sharing.po
index a9f681aaee2ce036889178f1b40335ef6e1c8757..1acf14b32977ee1b5c727e6178c24a9d4cbc19c2 100644
--- a/l10n/nl/files_sharing.po
+++ b/l10n/nl/files_sharing.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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:01+0000\n"
"Last-Translator: Len <lenny@weijl.org>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
@@ -65,7 +65,7 @@ msgstr "%s deelt de map %s met u"
msgid "%s shared the file %s with you"
msgstr "%s deelt het bestand %s met u"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "Downloaden"
@@ -77,6 +77,6 @@ msgstr "Uploaden"
msgid "Cancel upload"
msgstr "Upload afbreken"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "Geen voorbeeldweergave beschikbaar voor"
diff --git a/l10n/nl/lib.po b/l10n/nl/lib.po
index 08fe305989ff5ca5e8e87acabfa3bd45a7e84368..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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:30+0000\n"
-"Last-Translator: kwillems <kwillems@zonnet.nl>\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"
@@ -51,11 +51,23 @@ msgstr "Gebruikers"
msgid "Admin"
msgstr "Beheerder"
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "Upgrade \"%s\" mislukt."
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr "Maatwerk profielafbeelding werkt nog niet met versleuteling"
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr "Onbekend bestandsformaat"
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr "Ongeldige afbeelding"
+
#: defaults.php:35
msgid "web services under your control"
msgstr "Webdiensten in eigen beheer"
@@ -89,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:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
-msgstr ""
+msgstr "De app heeft geen info.xml bestand"
-#: installer.php:129
+#: 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:138
+#: 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:144
+#: 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:150
+#: 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:160
+#: installer.php:162
msgid "App directory already exists"
-msgstr ""
+msgstr "App directory bestaat al"
-#: installer.php:173
+#: 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"
@@ -267,51 +279,51 @@ msgstr "Uw webserver is nog niet goed ingesteld voor bestandssynchronisatie omda
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Controleer de <a href='%s'>installatiehandleiding</a> goed."
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "seconden geleden"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n minuut geleden"
msgstr[1] "%n minuten geleden"
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n uur geleden"
msgstr[1] "%n uur geleden"
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "vandaag"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "gisteren"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] "%n dag terug"
msgstr[1] "%n dagen geleden"
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "vorige maand"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n maand geleden"
msgstr[1] "%n maanden geleden"
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "vorig jaar"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "jaar geleden"
diff --git a/l10n/nl/settings.po b/l10n/nl/settings.po
index fef0b93014e54be6d7af25a51d9fa11f575767ff..68edba7080a90edb42cc9bf83458d7fee7734129 100644
--- a/l10n/nl/settings.po
+++ b/l10n/nl/settings.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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:30+0000\n"
-"Last-Translator: kwillems <kwillems@zonnet.nl>\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"
"Content-Type: text/plain; charset=UTF-8\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,55 +88,88 @@ msgstr "Niet in staat om gebruiker te verwijderen uit groep %s"
msgid "Couldn't update app."
msgstr "Kon de app niet bijwerken."
-#: js/apps.js:35
+#: 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}"
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr "Uitschakelen"
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr "Activeer"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr "Even geduld aub...."
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr "Fout tijdens het uitzetten van het programma"
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr "Fout tijdens het aanzetten van het programma"
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr "Bijwerken...."
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr "Fout bij bijwerken app"
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "Fout"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr "Bijwerken"
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr "Bijgewerkt"
-#: js/personal.js:150
+#: js/personal.js:220
+msgid "Select a profile picture"
+msgstr "Kies een profielafbeelding"
+
+#: 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:172
+#: js/personal.js:287
msgid "Saving..."
msgstr "Opslaan"
@@ -152,16 +185,16 @@ msgstr "ongedaan maken"
msgid "Unable to remove user"
msgstr "Kon gebruiker niet verwijderen"
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "Groepen"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "Groep beheerder"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "Verwijder"
@@ -181,7 +214,7 @@ msgstr "Fout bij aanmaken gebruiker"
msgid "A valid password must be provided"
msgstr "Er moet een geldig wachtwoord worden opgegeven"
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "Nederlands"
@@ -347,11 +380,11 @@ msgstr "Meer"
msgid "Less"
msgstr "Minder"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "Versie"
-#: templates/admin.php:246 templates/personal.php:143
+#: 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 "
@@ -418,7 +451,7 @@ msgstr "Toon de Eerste start Wizard opnieuw"
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Je hebt <strong>%s</strong> gebruikt van de beschikbare <strong>%s<strong>"
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "Wachtwoord"
@@ -442,7 +475,7 @@ msgstr "Nieuw"
msgid "Change password"
msgstr "Wijzig wachtwoord"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr "Weergavenaam"
@@ -458,38 +491,66 @@ msgstr "Uw e-mailadres"
msgid "Fill in an email address to enable password recovery"
msgstr "Vul een mailadres in om je wachtwoord te kunnen herstellen"
-#: templates/personal.php:85 templates/personal.php:86
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr "Profielafbeelding"
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr "Upload een nieuwe"
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr "Selecteer een nieuwe vanuit bestanden"
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr "Verwijder afbeelding"
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr "Of png, of jpg. Bij voorkeur vierkant, maar u kunt bijsnijden."
+
+#: templates/personal.php:97
+msgid "Abort"
+msgstr "Afbreken"
+
+#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr "Kies als profielafbeelding"
+
+#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
msgstr "Taal"
-#: templates/personal.php:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "Help met vertalen"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: 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 "Gebruik dit adres <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">toegang tot uw bestanden via WebDAV</a>"
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "Versleuteling"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr "De encryptie-appplicatie is niet meer aanwezig, decodeer al uw bestanden"
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr "Inlog-wachtwoord"
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr "Decodeer alle bestanden"
@@ -515,30 +576,30 @@ msgstr "Voer het herstel wachtwoord in om de gebruikersbestanden terug te halen
msgid "Default Storage"
msgstr "Standaard Opslaglimiet"
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr "Ongelimiteerd"
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "Anders"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "Gebruikersnaam"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr "Opslaglimiet"
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr "wijzig weergavenaam"
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr "Instellen nieuw wachtwoord"
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr "Standaard"
diff --git a/l10n/nl/user_ldap.po b/l10n/nl/user_ldap.po
index 61ed6bb4d8406466a9dbf790307d68b2f1292b45..b0ecf57ce45f48850b95ba9f1e47a7b24f365e63 100644
--- a/l10n/nl/user_ldap.po
+++ b/l10n/nl/user_ldap.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-08-23 20:16-0400\n"
-"PO-Revision-Date: 2013-08-23 16:30+0000\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-05 11:51+0000\n"
"Last-Translator: kwillems <kwillems@zonnet.nl>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/nn_NO/core.po b/l10n/nn_NO/core.po
index 4c578036d797f040bff3957a8081d8ad2a43ae9a..e16776a09863157188574d46f7c9bf1cefbc4957 100644
--- a/l10n/nn_NO/core.po
+++ b/l10n/nn_NO/core.po
@@ -5,13 +5,14 @@
# 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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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"
@@ -22,32 +23,36 @@ msgstr ""
#: ajax/share.php:97
#, php-format
msgid "%s shared »%s« with you"
-msgstr ""
+msgstr "%s delte «%s» med deg"
+
+#: ajax/share.php:227
+msgid "group"
+msgstr "gruppe"
#: ajax/update.php:11
msgid "Turned on maintenance mode"
-msgstr ""
+msgstr "Skrudde på vedlikehaldsmodus"
#: ajax/update.php:14
msgid "Turned off maintenance mode"
-msgstr ""
+msgstr "Skrudde av vedlikehaldsmodus"
#: ajax/update.php:17
msgid "Updated database"
-msgstr ""
+msgstr "Database oppdatert"
#: ajax/update.php:20
msgid "Updating filecache, this may take really long..."
-msgstr ""
+msgstr "Oppdaterer mellomlager; dette kan ta ei god stund …"
#: ajax/update.php:23
msgid "Updated filecache"
-msgstr ""
+msgstr "Mellomlager oppdatert"
#: ajax/update.php:26
#, php-format
msgid "... %d%% done ..."
-msgstr ""
+msgstr "… %d %% ferdig …"
#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
msgid "Category type not provided."
@@ -88,6 +93,26 @@ msgstr "Ingen kategoriar valt for sletting."
msgid "Error removing %s from favorites."
msgstr "Klarte ikkje fjerna %s frå favorittar."
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr "Inga bilete eller fil gitt"
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr "Ukjend filtype"
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr "Ugyldig bilete"
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr "Inga midlertidig profilbilete tilgjengeleg, prøv igjen"
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr "Ingen beskjeringsdata gitt"
+
#: js/config.php:32
msgid "Sunday"
msgstr "Søndag"
@@ -164,59 +189,59 @@ msgstr "November"
msgid "December"
msgstr "Desember"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "Innstillingar"
-#: js/js.js:812
+#: js/js.js:866
msgid "seconds ago"
msgstr "sekund sidan"
-#: js/js.js:813
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n minutt sidan"
+msgstr[1] "%n minutt sidan"
-#: js/js.js:814
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n time sidan"
+msgstr[1] "%n timar sidan"
-#: js/js.js:815
+#: js/js.js:869
msgid "today"
msgstr "i dag"
-#: js/js.js:816
+#: js/js.js:870
msgid "yesterday"
msgstr "i går"
-#: js/js.js:817
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n dag sidan"
+msgstr[1] "%n dagar sidan"
-#: js/js.js:818
+#: js/js.js:872
msgid "last month"
msgstr "førre månad"
-#: js/js.js:819
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n månad sidan"
+msgstr[1] "%n månadar sidan"
-#: js/js.js:820
+#: js/js.js:874
msgid "months ago"
msgstr "månadar sidan"
-#: js/js.js:821
+#: js/js.js:875
msgid "last year"
msgstr "i fjor"
-#: js/js.js:822
+#: js/js.js:876
msgid "years ago"
msgstr "år sidan"
@@ -224,22 +249,66 @@ msgstr "år sidan"
msgid "Choose"
msgstr "Vel"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
-msgstr ""
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
+msgstr "Klarte ikkje å lasta filplukkarmal: {error}"
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "Ja"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "Nei"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr "Greitt"
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+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
msgid "The object type is not specified."
@@ -249,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:643 js/share.js:655
+#: js/share.js:656 js/share.js:668
msgid "Error"
msgstr "Feil"
@@ -269,7 +338,7 @@ msgstr "Delt"
msgid "Share"
msgstr "Del"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:696
msgid "Error while sharing"
msgstr "Feil ved deling"
@@ -307,7 +376,7 @@ msgstr "Passord"
#: js/share.js:198
msgid "Allow Public Upload"
-msgstr ""
+msgstr "Tillat offentleg opplasting"
#: js/share.js:202
msgid "Email link to person"
@@ -325,67 +394,67 @@ msgstr "Set utløpsdato"
msgid "Expiration date"
msgstr "Utløpsdato"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "Del over e-post:"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "Fann ingen personar"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "Vidaredeling er ikkje tillate"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr "Delt i {item} med {brukar}"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "Udel"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "kan endra"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "tilgangskontroll"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "lag"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "oppdater"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "slett"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "del"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:643
msgid "Password protected"
msgstr "Passordverna"
-#: js/share.js:643
+#: js/share.js:656
msgid "Error unsetting expiration date"
msgstr "Klarte ikkje fjerna utløpsdato"
-#: js/share.js:655
+#: js/share.js:668
msgid "Error setting expiration date"
msgstr "Klarte ikkje setja utløpsdato"
-#: js/share.js:670
+#: js/share.js:683
msgid "Sending ..."
msgstr "Sender …"
-#: js/share.js:681
+#: js/share.js:694
msgid "Email sent"
msgstr "E-post sendt"
@@ -400,10 +469,10 @@ msgstr "Oppdateringa feila. Ver venleg og rapporter feilen til <a href=\"https:/
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Oppdateringa er fullført. Sender deg vidare til ownCloud no."
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
-msgstr ""
+msgstr "%s passordnullstilling"
#: lostpassword/templates/email.php:2
msgid "Use the following link to reset your password: {link}"
@@ -435,11 +504,11 @@ msgid ""
"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 ""
+msgstr "Filene dine er krypterte. Viss du ikkje har skrudd på gjenopprettingsnøkkelen, finst det ingen måte å få tilbake dataa dine når passordet ditt er nullstilt. Viss du ikkje er sikker på kva du skal gjera bør du spørja administratoren din før du går vidare. Vil du verkeleg fortsetja?"
#: lostpassword/templates/lostpassword.php:24
msgid "Yes, I really want to reset my password now"
-msgstr ""
+msgstr "Ja, eg vil nullstilla passordet mitt no"
#: lostpassword/templates/lostpassword.php:27
msgid "Request reset"
@@ -469,7 +538,7 @@ msgstr "Personleg"
msgid "Users"
msgstr "Brukarar"
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "Program"
@@ -498,7 +567,7 @@ msgid ""
"View it: %s\n"
"\n"
"Cheers!"
-msgstr ""
+msgstr "Hei der,\n\nnemner berre at %s delte %s med deg.\nSjå det her: %s\n\nMe talast!"
#: templates/edit_categories_dialog.php:4
msgid "Edit categories"
@@ -520,7 +589,7 @@ msgstr "PHP-utgåva di er sårbar for NULL-byteåtaket (CVE-2006-7243)"
#: templates/installation.php:26
#, php-format
msgid "Please update your PHP installation to use %s securely."
-msgstr ""
+msgstr "Ver venleg og oppdater PHP-installasjonen din til å brukar %s trygt."
#: templates/installation.php:32
msgid ""
@@ -545,7 +614,7 @@ msgstr "Datamappa og filene dine er sannsynlegvis tilgjengelege frå Internett s
msgid ""
"For information how to properly configure your server, please see the <a "
"href=\"%s\" target=\"_blank\">documentation</a>."
-msgstr ""
+msgstr "Ver venleg og les <a href=\"%s\" target=\"_blank\">dokumentasjonen</a> for meir informasjon om korleis du konfigurerer tenaren din."
#: templates/installation.php:47
msgid "Create an <strong>admin account</strong>"
@@ -598,14 +667,10 @@ msgstr "Fullfør oppsettet"
msgid "%s is available. Get more information on how to update."
msgstr "%s er tilgjengeleg. Få meir informasjon om korleis du oppdaterer."
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "Logg ut"
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "Automatisk innlogging avvist!"
@@ -620,19 +685,19 @@ msgstr "Viss du ikkje endra passordet ditt nyleg, så kan kontoen din vera kompr
msgid "Please change your password to secure your account again."
msgstr "Ver venleg og endra passordet for å gjera kontoen din trygg igjen."
-#: templates/login.php:34
+#: templates/login.php:32
msgid "Lost your password?"
msgstr "Gløymt passordet?"
-#: templates/login.php:39
+#: templates/login.php:37
msgid "remember"
msgstr "hugs"
-#: templates/login.php:41
+#: templates/login.php:39
msgid "Log in"
msgstr "Logg inn"
-#: templates/login.php:47
+#: templates/login.php:45
msgid "Alternative Logins"
msgstr "Alternative innloggingar"
@@ -641,7 +706,7 @@ msgstr "Alternative innloggingar"
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 ""
+msgstr "Hei der,<br><br>nemner berre at %s delte «%s» med deg.<br><a href=\"%s\">Sjå det!</a><br><br>Me talast!<"
#: templates/update.php:3
#, php-format
diff --git a/l10n/nn_NO/files.po b/l10n/nn_NO/files.po
index 1a2e3f21ed4ed4711c6f07a94451ee0f34da31e8..dc82bdca1b74917dde1234f75ffaf338a70332d1 100644
--- a/l10n/nn_NO/files.po
+++ b/l10n/nn_NO/files.po
@@ -5,13 +5,14 @@
# 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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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: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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -31,11 +32,11 @@ msgstr "Klarte ikkje flytta %s"
#: ajax/upload.php:16 ajax/upload.php:45
msgid "Unable to set upload directory."
-msgstr ""
+msgstr "Klarte ikkje å endra opplastingsmappa."
#: ajax/upload.php:22
msgid "Invalid Token"
-msgstr ""
+msgstr "Ugyldig token"
#: ajax/upload.php:59
msgid "No file was uploaded. Unknown error"
@@ -76,157 +77,173 @@ msgstr "Klarte ikkje skriva til disk"
msgid "Not enough storage available"
msgstr "Ikkje nok lagringsplass tilgjengeleg"
-#: ajax/upload.php:123
+#: 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: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:167
+#: 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:241
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr "Nettadressa kan ikkje vera tom."
-#: 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 "Ugyldig mappenamn. Mappa «Shared» er reservert av ownCloud"
-#: js/file-upload.js:277 js/file-upload.js:293 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 "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:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "Under vegs"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{new_name} finst allereie"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "byt ut"
-#: js/filelist.js:303
+#: js/filelist.js:416
msgid "suggest name"
msgstr "føreslå namn"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "avbryt"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr "bytte ut {new_name} med {old_name}"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "undo"
msgstr "angre"
-#: js/filelist.js:453
+#: 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: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:541
+msgid "{dirs} and {files}"
+msgstr "{dirs} og {files}"
+
+#: js/filelist.js:731 js/filelist.js:769
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Lastar opp %n fil"
+msgstr[1] "Lastar opp %n filer"
-#: js/filelist.js:518
-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 ""
+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:562 templates/index.php:67
+#: 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:563 templates/index.php:78
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "Storleik"
-#: js/files.js:564 templates/index.php:80
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr "Endra"
-#: js/files.js:580
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/files.js:586
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-
#: lib/app.php:73
#, php-format
msgid "%s could not be renamed"
-msgstr ""
+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"
@@ -262,84 +279,68 @@ 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:73
+#: templates/index.php:67
msgid "Download"
msgstr "Last ned"
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr "Udel"
-#: templates/index.php:91 templates/index.php:92
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "Slett"
-#: templates/index.php:105
+#: templates/index.php:100
msgid "Upload too large"
msgstr "For stor opplasting"
-#: 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 "Filene du prøver å lasta opp er større enn maksgrensa til denne tenaren."
-#: templates/index.php:112
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr "Skannar filer, ver venleg og vent."
-#: templates/index.php:115
+#: templates/index.php:110
msgid "Current scanning"
msgstr "Køyrande skanning"
-#: templates/part.list.php:74
-msgid "directory"
-msgstr ""
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr ""
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr ""
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr ""
-
#: templates/upgrade.php:2
msgid "Upgrading filesystem cache..."
msgstr "Oppgraderer mellomlageret av filsystemet …"
diff --git a/l10n/nn_NO/files_encryption.po b/l10n/nn_NO/files_encryption.po
index f1295711ff8aa1c023811d6ac517b366a8c6ca9b..112217447c87552c888cd3a5adeb78cbd45de0bc 100644
--- a/l10n/nn_NO/files_encryption.po
+++ b/l10n/nn_NO/files_encryption.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-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-09 11:59+0000\n"
+"POT-Creation-Date: 2013-09-08 21:36-0400\n"
+"PO-Revision-Date: 2013-09-08 17:40+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,18 +61,18 @@ msgid ""
"files."
msgstr ""
-#: hooks/hooks.php:44
+#: hooks/hooks.php:51
msgid "Missing requirements."
msgstr ""
-#: hooks/hooks.php:45
+#: hooks/hooks.php:52
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:263
+#: hooks/hooks.php:250
msgid "Following users are not set up for encryption:"
msgstr ""
@@ -96,7 +96,7 @@ msgstr ""
#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
-msgstr ""
+msgstr "Kryptering"
#: templates/settings-admin.php:10
msgid ""
diff --git a/l10n/nn_NO/files_sharing.po b/l10n/nn_NO/files_sharing.po
index 53090ff185e5f6312ee952ab8d76333f403b34b7..4b5c1c4d3ae512c9a1542fd9f732e2b8adadc072 100644
--- a/l10n/nn_NO/files_sharing.po
+++ b/l10n/nn_NO/files_sharing.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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:01+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"
@@ -20,7 +20,7 @@ msgstr ""
#: templates/authenticate.php:4
msgid "The password is wrong. Try again."
-msgstr ""
+msgstr "Passordet er gale. Prøv igjen."
#: templates/authenticate.php:7
msgid "Password"
@@ -32,27 +32,27 @@ msgstr "Send"
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
-msgstr ""
+msgstr "Orsak, denne lenkja fungerer visst ikkje lenger."
#: templates/part.404.php:4
msgid "Reasons might be:"
-msgstr ""
+msgstr "Moglege grunnar:"
#: templates/part.404.php:6
msgid "the item was removed"
-msgstr ""
+msgstr "fila/mappa er fjerna"
#: templates/part.404.php:7
msgid "the link expired"
-msgstr ""
+msgstr "lenkja har gått ut på dato"
#: templates/part.404.php:8
msgid "sharing is disabled"
-msgstr ""
+msgstr "deling er slått av"
#: templates/part.404.php:10
msgid "For more info, please ask the person who sent this link."
-msgstr ""
+msgstr "Spør den som sende deg lenkje om du vil ha meir informasjon."
#: templates/public.php:15
#, php-format
@@ -64,7 +64,7 @@ msgstr "%s delte mappa %s med deg"
msgid "%s shared the file %s with you"
msgstr "%s delte fila %s med deg"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "Last ned"
@@ -76,6 +76,6 @@ msgstr "Last opp"
msgid "Cancel upload"
msgstr "Avbryt opplasting"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "Inga førehandsvising tilgjengeleg for"
diff --git a/l10n/nn_NO/files_trashbin.po b/l10n/nn_NO/files_trashbin.po
index c10ee6cd50721a6edd112bfa9c773292c32beedd..8a6b4412c287fe2a80138134d039772a6627badf 100644
--- a/l10n/nn_NO/files_trashbin.po
+++ b/l10n/nn_NO/files_trashbin.po
@@ -4,13 +4,14 @@
#
# Translators:
# 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-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-08 21:36-0400\n"
+"PO-Revision-Date: 2013-09-08 15: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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -28,45 +29,45 @@ msgstr "Klarte ikkje sletta %s for godt"
msgid "Couldn't restore %s"
msgstr "Klarte ikkje gjenoppretta %s"
-#: js/trash.js:7 js/trash.js:100
+#: js/trash.js:7 js/trash.js:102
msgid "perform restore operation"
msgstr "utfør gjenoppretting"
-#: 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 "Feil"
-#: js/trash.js:36
+#: js/trash.js:37
msgid "delete file permanently"
msgstr "slett fila for godt"
-#: js/trash.js:127
+#: js/trash.js:129
msgid "Delete permanently"
msgstr "Slett for godt"
-#: js/trash.js:182 templates/index.php:17
+#: js/trash.js:184 templates/index.php:17
msgid "Name"
msgstr "Namn"
-#: js/trash.js:183 templates/index.php:27
+#: js/trash.js:185 templates/index.php:27
msgid "Deleted"
msgstr "Sletta"
-#: js/trash.js:191
+#: js/trash.js:193
msgid "%n folder"
msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n mappe"
+msgstr[1] "%n mapper"
-#: js/trash.js:197
+#: js/trash.js:199
msgid "%n file"
msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n fil"
+msgstr[1] "%n filer"
-#: lib/trash.php:819 lib/trash.php:821
+#: lib/trash.php:814 lib/trash.php:816
msgid "restored"
-msgstr ""
+msgstr "gjenoppretta"
#: templates/index.php:9
msgid "Nothing in here. Your trash bin is empty!"
diff --git a/l10n/nn_NO/files_versions.po b/l10n/nn_NO/files_versions.po
index a6e633a4c28456595ec253f4c497cb459384e5a0..bb94b8df8e78148f5f47f86b22d2a0a4c1aa1a1e 100644
--- a/l10n/nn_NO/files_versions.po
+++ b/l10n/nn_NO/files_versions.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-07-28 01:56-0400\n"
-"PO-Revision-Date: 2013-07-27 06:10+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-10 10:41-0400\n"
+"PO-Revision-Date: 2013-09-09 07:50+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"
@@ -29,16 +29,16 @@ msgstr "Utgåver"
#: js/versions.js:53
msgid "Failed to revert {file} to revision {timestamp}."
-msgstr ""
+msgstr "Klarte ikkje å tilbakestilla {file} til utgåva {timestamp}."
#: js/versions.js:79
msgid "More versions..."
-msgstr ""
+msgstr "Fleire utgåver …"
#: js/versions.js:116
msgid "No other versions available"
-msgstr ""
+msgstr "Ingen andre utgåver tilgjengeleg"
-#: js/versions.js:149
+#: js/versions.js:145
msgid "Restore"
msgstr "Gjenopprett"
diff --git a/l10n/nn_NO/lib.po b/l10n/nn_NO/lib.po
index 5829746af2992452568e5dc1a30d593053cb4ea0..9e73f6fe6aa9165b968b984866d6c0b7f4e5a6cb 100644
--- a/l10n/nn_NO/lib.po
+++ b/l10n/nn_NO/lib.po
@@ -4,12 +4,13 @@
#
# Translators:
# 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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+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"
@@ -49,11 +50,23 @@ msgstr "Brukarar"
msgid "Admin"
msgstr "Administrer"
-#: app.php:837
+#: 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 "Ukjend filtype"
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr "Ugyldig bilete"
+
#: defaults.php:35
msgid "web services under your control"
msgstr "Vev tjenester under din kontroll"
@@ -106,37 +119,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: 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:150
+#: 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:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -153,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 ""
@@ -263,53 +276,53 @@ msgstr "Tenaren din er ikkje enno rett innstilt til å tilby filsynkronisering s
#: setup.php:185
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr "Ver vennleg og dobbeltsjekk <a href='%s'>installasjonsrettleiinga</a>."
+msgstr "Ver venleg og dobbeltsjekk <a href='%s'>installasjonsrettleiinga</a>."
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "sekund sidan"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-msgstr[1] ""
+msgstr[1] "%n minutt sidan"
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-msgstr[1] ""
+msgstr[1] "%n timar sidan"
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "i dag"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "i går"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
-msgstr[1] ""
+msgstr[1] "%n dagar sidan"
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "førre månad"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-msgstr[1] ""
+msgstr[1] "%n månadar sidan"
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "i fjor"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "år sidan"
diff --git a/l10n/nn_NO/settings.po b/l10n/nn_NO/settings.po
index f46da15c6e295971207d988140ba24ad002db597..761b9f46275e14fbc81700f1979c6d1df9e14748 100644
--- a/l10n/nn_NO/settings.po
+++ b/l10n/nn_NO/settings.po
@@ -5,13 +5,14 @@
# 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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+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"
@@ -24,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"
@@ -86,55 +87,88 @@ msgstr "Klarte ikkje fjerna brukaren frå gruppa %s"
msgid "Couldn't update app."
msgstr "Klarte ikkje oppdatera programmet."
-#: js/apps.js:35
+#: 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:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:110
msgid "Disable"
msgstr "Slå av"
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
msgid "Enable"
msgstr "Slå på"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr "Ver venleg og vent …"
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:101
msgid "Error while disabling app"
-msgstr ""
+msgstr "Klarte ikkje å skru av programmet"
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:100 js/apps.js:114 js/apps.js:115
msgid "Error while enabling app"
-msgstr ""
+msgstr "Klarte ikkje å skru på programmet"
-#: js/apps.js:115
+#: js/apps.js:125
msgid "Updating...."
msgstr "Oppdaterer …"
-#: js/apps.js:118
+#: js/apps.js:128
msgid "Error while updating app"
msgstr "Feil ved oppdatering av app"
-#: js/apps.js:118
+#: js/apps.js:128
msgid "Error"
msgstr "Feil"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:129 templates/apps.php:43
msgid "Update"
msgstr "Oppdater"
-#: js/apps.js:122
+#: js/apps.js:132
msgid "Updated"
msgstr "Oppdatert"
-#: js/personal.js:150
+#: js/personal.js:220
+msgid "Select a profile picture"
+msgstr "Vel eit profilbilete"
+
+#: js/personal.js:265
msgid "Decrypting files... Please wait, this can take some time."
-msgstr ""
+msgstr "Dekrypterer filer … Ver venleg og vent, dette kan ta ei stund."
-#: js/personal.js:172
+#: js/personal.js:287
msgid "Saving..."
msgstr "Lagrar …"
@@ -150,16 +184,16 @@ msgstr "angra"
msgid "Unable to remove user"
msgstr "Klarte ikkje fjerna brukaren"
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "Grupper"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "Gruppestyrar"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "Slett"
@@ -179,7 +213,7 @@ msgstr "Feil ved oppretting av brukar"
msgid "A valid password must be provided"
msgstr "Du må oppgje eit gyldig passord"
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "Nynorsk"
@@ -194,7 +228,7 @@ msgid ""
"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 ""
+msgstr "Datamappa og filene dine er sannsynlegvis leselege frå nettet. Fila .htaccess fungerer ikkje. Me rår deg sterkt til å konfigurera vevtenaren din sånn at datamappa di ikkje lenger er tilgjengeleg; alternativt kan du flytta datamappa ut av dokumentrot til vevtenaren."
#: templates/admin.php:29
msgid "Setup Warning"
@@ -209,7 +243,7 @@ msgstr "Tenaren din er ikkje enno rett innstilt til å tilby filsynkronisering s
#: templates/admin.php:33
#, php-format
msgid "Please double check the <a href=\"%s\">installation guides</a>."
-msgstr ""
+msgstr "Ver venleg og dobbeltsjekk <a href=\"%s\">installasjonsrettleiinga</a>."
#: templates/admin.php:44
msgid "Module 'fileinfo' missing"
@@ -231,7 +265,7 @@ 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 ""
+msgstr "Klarte ikkje endra regionaldata for systemet til %s. Dette vil seia at det kan verta problem med visse teikn i filnamn. Me rår deg sterkt til å installera dei kravde pakkene på systemet ditt så du får støtte for %s."
#: templates/admin.php:75
msgid "Internet connection not working"
@@ -244,7 +278,7 @@ msgid ""
"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 ""
+msgstr "Denne tenaren har ikkje ei fungerande nettilkopling. Dette vil seia at visse funksjonar, som montering av ekstern lagring, meldingar om oppdateringar eller installering av tredjepartsprogram, ikkje vil fungera. Det kan òg henda at du ikkje får tilgang til filene dine utanfrå, eller ikkje får sendt varslingsepostar. Me rår deg til å skru på nettilkoplinga for denne tenaren viss du ønskjer desse funksjonane."
#: templates/admin.php:92
msgid "Cron"
@@ -258,11 +292,11 @@ msgstr "Utfør éi oppgåve for kvar sidelasting"
msgid ""
"cron.php is registered at a webcron service to call cron.php once a minute "
"over http."
-msgstr ""
+msgstr "Ei webcron-teneste er stilt inn til å kalla cron.php ein gong i minuttet over http."
#: templates/admin.php:115
msgid "Use systems cron service to call the cron.php file once a minute."
-msgstr ""
+msgstr "Bruk cron-tenesta til systemet for å kalla cron.php-fila ein gong i minuttet."
#: templates/admin.php:120
msgid "Sharing"
@@ -286,12 +320,12 @@ msgstr "La brukarar dela ting offentleg med lenkjer"
#: templates/admin.php:143
msgid "Allow public uploads"
-msgstr ""
+msgstr "Tillat offentlege opplastingar"
#: templates/admin.php:144
msgid ""
"Allow users to enable others to upload into their publicly shared folders"
-msgstr ""
+msgstr "La brukarar tillata andre å lasta opp i deira offentleg delte mapper"
#: templates/admin.php:152
msgid "Allow resharing"
@@ -320,14 +354,14 @@ msgstr "Krev HTTPS"
#: templates/admin.php:185
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
-msgstr ""
+msgstr "Tvingar klientar til å kopla til %s med ei kryptert tilkopling."
#: templates/admin.php:191
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
-msgstr ""
+msgstr "Ver venleg å kopla til %s med HTTPS (eller skru av SSL-kravet)."
#: templates/admin.php:203
msgid "Log"
@@ -345,11 +379,11 @@ msgstr "Meir"
msgid "Less"
msgstr "Mindre"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "Utgåve"
-#: templates/admin.php:246 templates/personal.php:143
+#: 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 "
@@ -416,7 +450,7 @@ msgstr "Vis Oppstartvegvisaren igjen"
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Du har brukt <strong>%s</strong> av dine tilgjengelege <strong>%s</strong>"
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "Passord"
@@ -440,7 +474,7 @@ msgstr "Nytt passord"
msgid "Change password"
msgstr "Endra passord"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr "Visingsnamn"
@@ -456,40 +490,68 @@ msgstr "Di epost-adresse"
msgid "Fill in an email address to enable password recovery"
msgstr "Fyll inn e-postadressa di for å gjera passordgjenoppretting mogleg"
-#: templates/personal.php:85 templates/personal.php:86
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr "Profilbilete"
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr "Last opp ny"
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr "Vel ny frå Filer"
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr "Fjern bilete"
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr "Anten PNG eller JPG. Helst kvadratisk, men du får moglegheita til å beskjera det."
+
+#: templates/personal.php:97
+msgid "Abort"
+msgstr "Avbryt"
+
+#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr "Vel som profilbilete"
+
+#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
msgstr "Språk"
-#: templates/personal.php:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "Hjelp oss å omsetja"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: 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 ""
+msgstr "Bruk denne adressa for å <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">henta filene dine over WebDAV</a>"
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
-msgstr ""
+msgstr "Kryptering"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
-msgstr ""
+msgstr "Krypteringsprogrammet er ikkje lenger slått på, dekrypter alle filene dine"
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
-msgstr ""
+msgstr "Innloggingspassord"
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
-msgstr ""
+msgstr "Dekrypter alle filene"
#: templates/users.php:21
msgid "Login Name"
@@ -501,42 +563,42 @@ msgstr "Lag"
#: templates/users.php:36
msgid "Admin Recovery Password"
-msgstr ""
+msgstr "Gjenopprettingspassord for administrator"
#: templates/users.php:37 templates/users.php:38
msgid ""
"Enter the recovery password in order to recover the users files during "
"password change"
-msgstr ""
+msgstr "Skriv inn gjenopprettingspassordet brukt for å gjenoppretta brukarfilene ved passordendring"
#: templates/users.php:42
msgid "Default Storage"
msgstr "Standardlagring"
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr "Ubegrensa"
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "Anna"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "Brukarnamn"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr "Lagring"
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr "endra visingsnamn"
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr "lag nytt passord"
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr "Standard"
diff --git a/l10n/nn_NO/user_ldap.po b/l10n/nn_NO/user_ldap.po
index 8ded31122dfd0a4a11a66f81a6f3787a68252ef1..50449bc4e8a30951e13437bfd08046a16e778b7b 100644
--- a/l10n/nn_NO/user_ldap.po
+++ b/l10n/nn_NO/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"POT-Creation-Date: 2013-09-10 10:41-0400\n"
+"PO-Revision-Date: 2013-09-09 09:20+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"
@@ -108,7 +108,7 @@ msgstr ""
#: templates/settings.php:37
msgid "Host"
-msgstr ""
+msgstr "Tenar"
#: templates/settings.php:39
msgid ""
diff --git a/l10n/nn_NO/user_webdavauth.po b/l10n/nn_NO/user_webdavauth.po
index 05d3c32b03d66dd889d700e02ee579bde2bfeed8..59e481b97fdc248e5297420da7553127204ce40a 100644
--- a/l10n/nn_NO/user_webdavauth.po
+++ b/l10n/nn_NO/user_webdavauth.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-07-27 01:56-0400\n"
-"PO-Revision-Date: 2013-07-27 05:57+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-10 10:41-0400\n"
+"PO-Revision-Date: 2013-09-09 07:50+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"
@@ -24,11 +24,11 @@ msgstr "WebDAV-autentisering"
#: templates/settings.php:4
msgid "Address: "
-msgstr ""
+msgstr "Adresse:"
#: 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 ""
+msgstr "Innloggingsinformasjon blir sendt til denne nettadressa. Dette programtillegget kontrollerer svaret og tolkar HTTP-statuskodane 401 og 403 som ugyldige, og alle andre svar som gyldige."
diff --git a/l10n/nqo/core.po b/l10n/nqo/core.po
new file mode 100644
index 0000000000000000000000000000000000000000..e50801d30bab899fe77bbe766ab2a2cd8a4ba137
--- /dev/null
+++ b/l10n/nqo/core.po
@@ -0,0 +1,706 @@
+# 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: N'ko (http://www.transifex.com/projects/p/owncloud/language/nqo/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nqo\n"
+"Plural-Forms: nplurals=1; plural=0;\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] ""
+
+#: js/js.js:868
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+
+#: 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] ""
+
+#: js/js.js:872
+msgid "last month"
+msgstr ""
+
+#: js/js.js:873
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+
+#: 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] ""
+
+#: 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/nqo/files.po b/l10n/nqo/files.po
new file mode 100644
index 0000000000000000000000000000000000000000..4749e89f2645d1d866c22b173d48b797c353ea84
--- /dev/null
+++ b/l10n/nqo/files.po
@@ -0,0 +1,340 @@
+# 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: N'ko (http://www.transifex.com/projects/p/owncloud/language/nqo/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nqo\n"
+"Plural-Forms: nplurals=1; plural=0;\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] ""
+
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+
+#: 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] ""
+
+#: 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/nqo/files_encryption.po b/l10n/nqo/files_encryption.po
new file mode 100644
index 0000000000000000000000000000000000000000..3c4beade2a4c3182f51467bb7a6f299dedb8c806
--- /dev/null
+++ b/l10n/nqo/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-07 04:39-0400\n"
+"PO-Revision-Date: 2013-09-07 07:28+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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nqo\n"
+"Plural-Forms: nplurals=1; plural=0;\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:51
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:52
+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
+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/nqo/files_external.po b/l10n/nqo/files_external.po
new file mode 100644
index 0000000000000000000000000000000000000000..bb48f60af6ea4327cb75177d70fcb3c747714a64
--- /dev/null
+++ b/l10n/nqo/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-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-07 07:28+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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nqo\n"
+"Plural-Forms: nplurals=1; plural=0;\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/nqo/files_sharing.po b/l10n/nqo/files_sharing.po
new file mode 100644
index 0000000000000000000000000000000000000000..8c548248cff1854e126126c5949f1ba6b35eb95e
--- /dev/null
+++ b/l10n/nqo/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-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-07 07:28+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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nqo\n"
+"Plural-Forms: nplurals=1; plural=0;\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/nqo/files_trashbin.po b/l10n/nqo/files_trashbin.po
new file mode 100644
index 0000000000000000000000000000000000000000..8c737c0b7573e81407e187aab8e6a7a82aca9d96
--- /dev/null
+++ b/l10n/nqo/files_trashbin.po
@@ -0,0 +1,82 @@
+# 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-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-07 07:28+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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nqo\n"
+"Plural-Forms: nplurals=1; plural=0;\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:184 templates/index.php:17
+msgid "Name"
+msgstr ""
+
+#: js/trash.js:185 templates/index.php:27
+msgid "Deleted"
+msgstr ""
+
+#: js/trash.js:193
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+
+#: js/trash.js:199
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+
+#: 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:20 templates/index.php:22
+msgid "Restore"
+msgstr ""
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr ""
+
+#: templates/part.breadcrumb.php:9
+msgid "Deleted Files"
+msgstr ""
diff --git a/l10n/nqo/files_versions.po b/l10n/nqo/files_versions.po
new file mode 100644
index 0000000000000000000000000000000000000000..2ced8c6105d5ae7ae0460ab76006088a28ae22d6
--- /dev/null
+++ b/l10n/nqo/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-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-07 07:28+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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nqo\n"
+"Plural-Forms: nplurals=1; plural=0;\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/nqo/lib.po b/l10n/nqo/lib.po
new file mode 100644
index 0000000000000000000000000000000000000000..6f2612e081723bed36702f55ac278f6739fc5a63
--- /dev/null
+++ b/l10n/nqo/lib.po
@@ -0,0 +1,330 @@
+# 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-16 11:33-0400\n"
+"PO-Revision-Date: 2013-09-16 15:34+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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nqo\n"
+"Plural-Forms: nplurals=1; plural=0;\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] ""
+
+#: template/functions.php:98
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+
+#: 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] ""
+
+#: template/functions.php:102
+msgid "last month"
+msgstr ""
+
+#: template/functions.php:103
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+
+#: 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/nqo/settings.po b/l10n/nqo/settings.po
new file mode 100644
index 0000000000000000000000000000000000000000..aafbac399b08451fff752ad403cd908028722bcc
--- /dev/null
+++ b/l10n/nqo/settings.po
@@ -0,0 +1,601 @@
+# 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: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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nqo\n"
+"Plural-Forms: nplurals=1; plural=0;\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/nqo/user_ldap.po b/l10n/nqo/user_ldap.po
new file mode 100644
index 0000000000000000000000000000000000000000..d377705d79dba1e7a448a345c616cf0bd476538a
--- /dev/null
+++ b/l10n/nqo/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-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-07 07:28+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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nqo\n"
+"Plural-Forms: nplurals=1; plural=0;\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/nqo/user_webdavauth.po b/l10n/nqo/user_webdavauth.po
new file mode 100644
index 0000000000000000000000000000000000000000..c509260cd3b361b257a8d46978820caa47b5d063
--- /dev/null
+++ b/l10n/nqo/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-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-07 07:28+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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nqo\n"
+"Plural-Forms: nplurals=1; plural=0;\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/oc/core.po b/l10n/oc/core.po
index 2bae53a78ec6db2c06fc6b0fc02d647084a41c2c..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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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"
@@ -22,6 +22,10 @@ msgstr ""
msgid "%s shared »%s« with you"
msgstr ""
+#: ajax/share.php:227
+msgid "group"
+msgstr "grop"
+
#: ajax/update.php:11
msgid "Turned on maintenance mode"
msgstr ""
@@ -86,6 +90,26 @@ msgstr "Pas de categorias seleccionadas per escafar."
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 "Dimenge"
@@ -162,59 +186,59 @@ msgstr "Novembre"
msgid "December"
msgstr "Decembre"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "Configuracion"
-#: js/js.js:812
+#: js/js.js:866
msgid "seconds ago"
msgstr "segonda a"
-#: js/js.js:813
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:814
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:815
+#: js/js.js:869
msgid "today"
msgstr "uèi"
-#: js/js.js:816
+#: js/js.js:870
msgid "yesterday"
msgstr "ièr"
-#: js/js.js:817
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:818
+#: js/js.js:872
msgid "last month"
msgstr "mes passat"
-#: js/js.js:819
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:820
+#: js/js.js:874
msgid "months ago"
msgstr "meses a"
-#: js/js.js:821
+#: js/js.js:875
msgid "last year"
msgstr "an passat"
-#: js/js.js:822
+#: js/js.js:876
msgid "years ago"
msgstr "ans a"
@@ -222,22 +246,66 @@ msgstr "ans a"
msgid "Choose"
msgstr "Causís"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "Òc"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "Non"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr "D'accòrdi"
+#: 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 "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."
@@ -247,7 +315,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:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "Error"
@@ -267,7 +335,7 @@ msgstr ""
msgid "Share"
msgstr "Parteja"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr "Error al partejar"
@@ -323,67 +391,67 @@ msgstr "Met la data d'expiracion"
msgid "Expiration date"
msgstr "Data d'expiracion"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "Parteja tras corrièl :"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "Deguns trobat"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "Tornar partejar es pas permis"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "Pas partejador"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "pòt modificar"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "Contraròtle d'acces"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "crea"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "met a jorn"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "escafa"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "parteja"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "Parat per senhal"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr "Error al metre de la data d'expiracion"
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr "Error setting expiration date"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr ""
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr ""
@@ -398,7 +466,7 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr ""
@@ -467,7 +535,7 @@ msgstr "Personal"
msgid "Users"
msgstr "Usancièrs"
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "Apps"
@@ -596,14 +664,10 @@ msgstr "Configuracion acabada"
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "Sortida"
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr ""
@@ -618,19 +682,19 @@ msgstr ""
msgid "Please change your password to secure your account again."
msgstr ""
-#: templates/login.php:34
+#: templates/login.php:32
msgid "Lost your password?"
msgstr "L'as perdut lo senhal ?"
-#: templates/login.php:39
+#: templates/login.php:37
msgid "remember"
msgstr "bremba-te"
-#: templates/login.php:41
+#: templates/login.php:39
msgid "Log in"
msgstr "Dintrada"
-#: templates/login.php:47
+#: templates/login.php:45
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/oc/files.po b/l10n/oc/files.po
index 457161c53ac5fa55254537ac3ecb6b80197af37c..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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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,7 +74,15 @@ msgstr "L'escriptura sul disc a fracassat"
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:123
+#: 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 ""
@@ -82,149 +90,157 @@ 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: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 "Un amontcargar es a se far. Daissar aquesta pagina ara tamparà lo cargament. "
-#: 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:277 js/file-upload.js:293 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 "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:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "Al esperar"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr ""
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "remplaça"
-#: js/filelist.js:303
+#: js/filelist.js:416
msgid "suggest name"
msgstr "nom prepausat"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "anulla"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr ""
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "undo"
msgstr "defar"
-#: js/filelist.js:453
+#: 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/filelist.js:518
-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: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 "Nom"
-#: js/files.js:563 templates/index.php:78
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "Talha"
-#: js/files.js:564 templates/index.php:80
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr "Modificat"
-#: js/files.js:580
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/files.js:586
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-
#: lib/app.php:73
#, php-format
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"
@@ -260,84 +276,68 @@ 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:73
+#: templates/index.php:67
msgid "Download"
msgstr "Avalcarga"
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr "Pas partejador"
-#: templates/index.php:91 templates/index.php:92
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "Escafa"
-#: templates/index.php:105
+#: templates/index.php:100
msgid "Upload too large"
msgstr "Amontcargament tròp gròs"
-#: 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 "Los fichièrs que sias a amontcargar son tròp pesucs per la talha maxi pel servidor."
-#: templates/index.php:112
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr "Los fiichièrs son a èsser explorats, "
-#: templates/index.php:115
+#: templates/index.php:110
msgid "Current scanning"
msgstr "Exploracion en cors"
-#: templates/part.list.php:74
-msgid "directory"
-msgstr ""
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr ""
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr "fichièr"
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr "fichièrs"
-
#: templates/upgrade.php:2
msgid "Upgrading filesystem cache..."
msgstr ""
diff --git a/l10n/oc/files_sharing.po b/l10n/oc/files_sharing.po
index 253801f6c9f075e167561a814d3d1776a9fa7f50..a94307e4bfd08313201b25d3ec9f1262d48b571f 100644
--- a/l10n/oc/files_sharing.po
+++ b/l10n/oc/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00: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"
@@ -63,7 +63,7 @@ msgstr ""
msgid "%s shared the file %s with you"
msgstr ""
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "Avalcarga"
@@ -75,6 +75,6 @@ msgstr "Amontcarga"
msgid "Cancel upload"
msgstr " Anulla l'amontcargar"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr ""
diff --git a/l10n/oc/lib.po b/l10n/oc/lib.po
index 5cbb1c5e010fad58ff96d5db0af889c963f8cfd0..a1e7d21d338a51b440a381256644d43f1b771cfd 100644
--- a/l10n/oc/lib.po
+++ b/l10n/oc/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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\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"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
"MIME-Version: 1.0\n"
@@ -48,11 +48,23 @@ msgstr "Usancièrs"
msgid "Admin"
msgstr "Admin"
-#: app.php:837
+#: 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 "Services web jos ton contraròtle"
@@ -105,37 +117,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: 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:150
+#: 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:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -264,51 +276,51 @@ msgstr ""
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "segonda a"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "uèi"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "ièr"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "mes passat"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "an passat"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "ans a"
diff --git a/l10n/oc/settings.po b/l10n/oc/settings.po
index 6a06eef3b99025ffe30966ed78454fbfab30fab6..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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+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,55 +84,88 @@ msgstr "Pas capable de tira un usancièr del grop %s"
msgid "Couldn't update app."
msgstr ""
-#: js/apps.js:35
+#: 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:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr "Desactiva"
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr "Activa"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr ""
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "Error"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr ""
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr ""
-#: js/personal.js:150
+#: 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:172
+#: js/personal.js:287
msgid "Saving..."
msgstr "Enregistra..."
@@ -148,16 +181,16 @@ msgstr "defar"
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "Grops"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "Grop Admin"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "Escafa"
@@ -177,7 +210,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "__language_name__"
@@ -343,11 +376,11 @@ msgstr "Mai d'aquò"
msgid "Less"
msgstr ""
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr ""
-#: templates/admin.php:246 templates/personal.php:143
+#: 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 "
@@ -414,7 +447,7 @@ msgstr ""
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:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "Senhal"
@@ -438,7 +471,7 @@ msgstr "Senhal novèl"
msgid "Change password"
msgstr "Cambia lo senhal"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr ""
@@ -454,38 +487,66 @@ msgstr "Ton adreiça de corrièl"
msgid "Fill in an email address to enable password recovery"
msgstr "Emplena una adreiça de corrièl per permetre lo mandadís del senhal perdut"
-#: templates/personal.php:85 templates/personal.php:86
+#: 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 "Lenga"
-#: templates/personal.php:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "Ajuda a la revirada"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:106
+#: 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:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr ""
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -511,30 +572,30 @@ msgstr ""
msgid "Default Storage"
msgstr ""
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr ""
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "Autres"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "Non d'usancièr"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr ""
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr ""
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr ""
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr ""
diff --git a/l10n/oc/user_ldap.po b/l10n/oc/user_ldap.po
index b4c7072825e2639dde124a457eeea5a36e5049b0..48c4e281c6dd65ba497e0ff0c60d78123c64863f 100644
--- a/l10n/oc/user_ldap.po
+++ b/l10n/oc/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\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"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
"MIME-Version: 1.0\n"
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 54e1e74503cc46571ceceacc7f3ab49aaeee9e63..d3f781b0e4da2e5c4433189b1094515be628dbd2 100644
--- a/l10n/pl/core.po
+++ b/l10n/pl/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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-30 10:16-0400\n"
+"PO-Revision-Date: 2013-09-30 12:27+0000\n"
+"Last-Translator: Cyryl Sochacki <cyrylsochacki@gmail.com>\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"
@@ -24,30 +24,34 @@ msgstr ""
msgid "%s shared »%s« with you"
msgstr "%s Współdzielone »%s« z tobą"
+#: ajax/share.php:227
+msgid "group"
+msgstr "grupa"
+
#: ajax/update.php:11
msgid "Turned on maintenance mode"
-msgstr ""
+msgstr "Włączony tryb konserwacji"
#: ajax/update.php:14
msgid "Turned off maintenance mode"
-msgstr ""
+msgstr "Wyłączony tryb konserwacji"
#: ajax/update.php:17
msgid "Updated database"
-msgstr ""
+msgstr "Zaktualizuj bazę"
#: ajax/update.php:20
msgid "Updating filecache, this may take really long..."
-msgstr ""
+msgstr "Aktualizowanie filecache, to może potrwać bardzo długo..."
#: ajax/update.php:23
msgid "Updated filecache"
-msgstr ""
+msgstr "Zaktualizuj filecache"
#: ajax/update.php:26
#, php-format
msgid "... %d%% done ..."
-msgstr ""
+msgstr "... %d%% udane ..."
#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
msgid "Category type not provided."
@@ -88,6 +92,26 @@ msgstr "Nie zaznaczono kategorii do usunięcia."
msgid "Error removing %s from favorites."
msgstr "Błąd podczas usuwania %s z ulubionych."
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr "Nieznany typ pliku"
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr "Nieprawidłowe zdjęcie"
+
+#: 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 "Niedziela"
@@ -164,63 +188,63 @@ msgstr "Listopad"
msgid "December"
msgstr "Grudzień"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "Ustawienia"
-#: js/js.js:812
+#: js/js.js:866
msgid "seconds ago"
msgstr "sekund temu"
-#: js/js.js:813
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%n minute temu"
+msgstr[1] "%n minut temu"
+msgstr[2] "%n minut temu"
-#: js/js.js:814
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%n godzine temu"
+msgstr[1] "%n godzin temu"
+msgstr[2] "%n godzin temu"
-#: js/js.js:815
+#: js/js.js:869
msgid "today"
msgstr "dziś"
-#: js/js.js:816
+#: js/js.js:870
msgid "yesterday"
msgstr "wczoraj"
-#: js/js.js:817
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%n dzień temu"
+msgstr[1] "%n dni temu"
+msgstr[2] "%n dni temu"
-#: js/js.js:818
+#: js/js.js:872
msgid "last month"
msgstr "w zeszłym miesiącu"
-#: js/js.js:819
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%n miesiąc temu"
+msgstr[1] "%n miesięcy temu"
+msgstr[2] "%n miesięcy temu"
-#: js/js.js:820
+#: js/js.js:874
msgid "months ago"
msgstr "miesięcy temu"
-#: js/js.js:821
+#: js/js.js:875
msgid "last year"
msgstr "w zeszłym roku"
-#: js/js.js:822
+#: js/js.js:876
msgid "years ago"
msgstr "lat temu"
@@ -228,22 +252,67 @@ msgstr "lat temu"
msgid "Choose"
msgstr "Wybierz"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
-msgstr "Błąd podczas ładowania pliku wybranego szablonu"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
+msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "Tak"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "Nie"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
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] "{count} konfliktów plików"
+msgstr[1] "{count} konfliktów plików"
+msgstr[2] "{count} konfliktów plików"
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr "Konflikt pliku"
+
+#: 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 "Kontynuuj "
+
+#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+msgid "(all selected)"
+msgstr "(wszystkie zaznaczone)"
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "({count} selected)"
+msgstr "({count} zaznaczonych)"
+
+#: 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."
@@ -253,7 +322,7 @@ msgstr "Nie określono typu obiektu."
#: 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:643 js/share.js:655
+#: js/share.js:656 js/share.js:668
msgid "Error"
msgstr "Błąd"
@@ -273,7 +342,7 @@ msgstr "Udostępniono"
msgid "Share"
msgstr "Udostępnij"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:696
msgid "Error while sharing"
msgstr "Błąd podczas współdzielenia"
@@ -329,67 +398,67 @@ msgstr "Ustaw datę wygaśnięcia"
msgid "Expiration date"
msgstr "Data wygaśnięcia"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "Współdziel poprzez e-mail:"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "Nie znaleziono ludzi"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "Współdzielenie nie jest możliwe"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr "Współdzielone w {item} z {user}"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "Zatrzymaj współdzielenie"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "może edytować"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "kontrola dostępu"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "utwórz"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "uaktualnij"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "usuń"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "współdziel"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:643
msgid "Password protected"
msgstr "Zabezpieczone hasłem"
-#: js/share.js:643
+#: js/share.js:656
msgid "Error unsetting expiration date"
msgstr "Błąd podczas usuwania daty wygaśnięcia"
-#: js/share.js:655
+#: js/share.js:668
msgid "Error setting expiration date"
msgstr "Błąd podczas ustawiania daty wygaśnięcia"
-#: js/share.js:670
+#: js/share.js:683
msgid "Sending ..."
msgstr "Wysyłanie..."
-#: js/share.js:681
+#: js/share.js:694
msgid "Email sent"
msgstr "E-mail wysłany"
@@ -404,10 +473,10 @@ msgstr "Aktualizacja zakończyła się niepowodzeniem. Zgłoś ten problem <a hr
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Aktualizacji zakończyła się powodzeniem. Przekierowuję do ownCloud."
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
-msgstr ""
+msgstr "%s reset hasła"
#: lostpassword/templates/email.php:2
msgid "Use the following link to reset your password: {link}"
@@ -473,7 +542,7 @@ msgstr "Osobiste"
msgid "Users"
msgstr "Użytkownicy"
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "Aplikacje"
@@ -602,14 +671,10 @@ msgstr "Zakończ konfigurowanie"
msgid "%s is available. Get more information on how to update."
msgstr "%s jest dostępna. Dowiedz się więcej na temat aktualizacji."
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "Wyloguj"
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr "Więcej aplikacji"
-
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "Automatyczne logowanie odrzucone!"
@@ -624,19 +689,19 @@ msgstr "Jeśli hasło było dawno niezmieniane, twoje konto może być zagrożon
msgid "Please change your password to secure your account again."
msgstr "Zmień swoje hasło, aby ponownie zabezpieczyć swoje konto."
-#: templates/login.php:34
+#: templates/login.php:32
msgid "Lost your password?"
msgstr "Nie pamiętasz hasła?"
-#: templates/login.php:39
+#: templates/login.php:37
msgid "remember"
msgstr "pamiętaj"
-#: templates/login.php:41
+#: templates/login.php:39
msgid "Log in"
msgstr "Zaloguj"
-#: templates/login.php:47
+#: templates/login.php:45
msgid "Alternative Logins"
msgstr "Alternatywne loginy"
diff --git a/l10n/pl/files.po b/l10n/pl/files.po
index 201660307ed7a73b7b1672efaff3c8400096ac28..a88ee97ad7e89bf66341e6eb7e34aa273b5eb5cd 100644
--- a/l10n/pl/files.po
+++ b/l10n/pl/files.po
@@ -4,14 +4,15 @@
#
# Translators:
# Cyryl Sochacki <cyrylsochacki@gmail.com>, 2013
+# Mariusz Fik <fisiu@opensuse.org>, 2013
# adbrand <pkwiecin@adbrand.pl>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-30 10:14-0400\n"
+"PO-Revision-Date: 2013-09-30 12:24+0000\n"
+"Last-Translator: Cyryl Sochacki <cyrylsochacki@gmail.com>\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"
@@ -76,160 +77,176 @@ msgstr "Błąd zapisu na dysk"
msgid "Not enough storage available"
msgstr "Za mało dostępnego miejsca"
-#: ajax/upload.php:123
+#: ajax/upload.php:120 ajax/upload.php:143
+msgid "Upload failed. Could not get file info."
+msgstr "Nieudane przesłanie. Nie można pobrać informacji o pliku."
+
+#: ajax/upload.php:136
+msgid "Upload failed. Could not find uploaded file"
+msgstr "Nieudane przesłanie. Nie można znaleźć przesyłanego pliku"
+
+#: ajax/upload.php:160
msgid "Invalid directory."
msgstr "Zła ścieżka."
-#: appinfo/app.php:12
+#: appinfo/app.php:11
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 "Nie można przesłać {filename} być może jest katalogiem lub posiada 0 bajtów"
-#: 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:167
+#: js/file-upload.js:356
+msgid "Could not get result from server."
+msgstr "Nie można uzyskać wyniku z serwera."
+
+#: 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:241
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr "URL nie może być pusty."
-#: 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 "Nieprawidłowa nazwa folderu. Wykorzystanie 'Shared' jest zarezerwowane przez ownCloud"
-#: js/file-upload.js:277 js/file-upload.js:293 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 "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:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "Oczekujące"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{new_name} już istnieje"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "zastąp"
-#: js/filelist.js:303
+#: js/filelist.js:416
msgid "suggest name"
msgstr "zasugeruj nazwę"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "anuluj"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr "zastąpiono {new_name} przez {old_name}"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "undo"
msgstr "cofnij"
-#: js/filelist.js:453
+#: 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: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:541
+msgid "{dirs} and {files}"
+msgstr "{katalogi} and {pliki}"
+
+#: js/filelist.js:731 js/filelist.js:769
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Wysyłanie %n pliku"
+msgstr[1] "Wysyłanie %n plików"
+msgstr[2] "Wysyłanie %n plików"
-#: js/filelist.js:518
-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 ""
+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:562 templates/index.php:67
+#: js/files.js:507 js/files.js:545
+msgid "Error moving file"
+msgstr "Błąd prz przenoszeniu pliku"
+
+#: js/files.js:558 templates/index.php:61
msgid "Name"
msgstr "Nazwa"
-#: js/files.js:563 templates/index.php:78
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "Rozmiar"
-#: js/files.js:564 templates/index.php:80
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr "Modyfikacja"
-#: js/files.js:580
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: js/files.js:586
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
#: lib/app.php:73
#, php-format
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"
@@ -265,84 +282,68 @@ 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:73
+#: templates/index.php:67
msgid "Download"
msgstr "Pobierz"
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr "Zatrzymaj współdzielenie"
-#: templates/index.php:91 templates/index.php:92
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "Usuń"
-#: templates/index.php:105
+#: templates/index.php:100
msgid "Upload too large"
msgstr "Ładowany plik jest za duży"
-#: 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 "Pliki, które próbujesz przesłać, przekraczają maksymalną dopuszczalną wielkość."
-#: templates/index.php:112
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr "Skanowanie plików, proszę czekać."
-#: templates/index.php:115
+#: templates/index.php:110
msgid "Current scanning"
msgstr "Aktualnie skanowane"
-#: templates/part.list.php:74
-msgid "directory"
-msgstr "Katalog"
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr "Katalogi"
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr "plik"
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr "pliki"
-
#: templates/upgrade.php:2
msgid "Upgrading filesystem cache..."
msgstr "Uaktualnianie plików pamięci podręcznej..."
diff --git a/l10n/pl/files_sharing.po b/l10n/pl/files_sharing.po
index 8241e75f710a0500a495832824ec67a0b6da1ccc..0598448aa83d75c9582771ad59a1ddb153fdd1db 100644
--- a/l10n/pl/files_sharing.po
+++ b/l10n/pl/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:01+0000\n"
"Last-Translator: Cyryl Sochacki <cyrylsochacki@gmail.com>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
@@ -64,7 +64,7 @@ msgstr "%s współdzieli folder z tobą %s"
msgid "%s shared the file %s with you"
msgstr "%s współdzieli z tobą plik %s"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "Pobierz"
@@ -76,6 +76,6 @@ msgstr "Wyślij"
msgid "Cancel upload"
msgstr "Anuluj wysyłanie"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "Podgląd nie jest dostępny dla"
diff --git a/l10n/pl/files_trashbin.po b/l10n/pl/files_trashbin.po
index fd82c9bdd6ddd777e02399adbd5d31fdcf35458c..d06393b1c89b8f51fad4bdb9cae6e73d17eb63ef 100644
--- a/l10n/pl/files_trashbin.po
+++ b/l10n/pl/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-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"POT-Creation-Date: 2013-09-05 07:36-0400\n"
+"PO-Revision-Date: 2013-09-04 22:20+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"
@@ -28,45 +28,45 @@ msgstr "Nie można trwale usunąć %s"
msgid "Couldn't restore %s"
msgstr "Nie można przywrócić %s"
-#: js/trash.js:7 js/trash.js:100
+#: js/trash.js:7 js/trash.js:102
msgid "perform restore operation"
msgstr "wykonywanie operacji przywracania"
-#: 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 "Błąd"
-#: js/trash.js:36
+#: js/trash.js:37
msgid "delete file permanently"
msgstr "trwale usuń plik"
-#: js/trash.js:127
+#: js/trash.js:129
msgid "Delete permanently"
msgstr "Trwale usuń"
-#: js/trash.js:182 templates/index.php:17
+#: js/trash.js:184 templates/index.php:17
msgid "Name"
msgstr "Nazwa"
-#: js/trash.js:183 templates/index.php:27
+#: js/trash.js:185 templates/index.php:27
msgid "Deleted"
msgstr "Usunięte"
-#: js/trash.js:191
+#: js/trash.js:193
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-msgstr[2] ""
+msgstr[2] "%n katalogów"
-#: js/trash.js:197
+#: js/trash.js:199
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-msgstr[2] ""
+msgstr[2] "%n plików"
-#: lib/trash.php:819 lib/trash.php:821
+#: lib/trash.php:814 lib/trash.php:816
msgid "restored"
msgstr "przywrócony"
diff --git a/l10n/pl/lib.po b/l10n/pl/lib.po
index d44b5a180f122e17a74de60c23cbc53ee557ef29..9e29c51c5a9e8a08335e00b55c5ea2955e1741f0 100644
--- a/l10n/pl/lib.po
+++ b/l10n/pl/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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-30 10:16-0400\n"
+"PO-Revision-Date: 2013-09-30 12:26+0000\n"
+"Last-Translator: Cyryl Sochacki <cyrylsochacki@gmail.com>\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"
@@ -18,42 +18,54 @@ msgstr ""
"Language: pl\n"
"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: app.php:239
+#: app.php:237
#, php-format
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
-msgstr ""
+msgstr "Aplikacja \"%s\" nie może zostać zainstalowana, ponieważ nie jest zgodna z tą wersją ownCloud."
-#: app.php:250
+#: app.php:248
msgid "No app name specified"
-msgstr ""
+msgstr "Nie określono nazwy aplikacji"
-#: app.php:361
+#: app.php:352
msgid "Help"
msgstr "Pomoc"
-#: app.php:374
+#: app.php:365
msgid "Personal"
msgstr "Osobiste"
-#: app.php:385
+#: app.php:376
msgid "Settings"
msgstr "Ustawienia"
-#: app.php:397
+#: app.php:388
msgid "Users"
msgstr "Użytkownicy"
-#: app.php:410
+#: app.php:401
msgid "Admin"
msgstr "Administrator"
-#: app.php:837
+#: app.php:832
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "Błąd przy aktualizacji \"%s\"."
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr "Domyślny profil zdjęć nie działa z szyfrowaniem jeszcze"
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr "Nieznany typ pliku"
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr "Błędne zdjęcie"
+
#: defaults.php:35
msgid "web services under your control"
msgstr "Kontrolowane serwisy"
@@ -87,59 +99,59 @@ msgstr "Pobierz pliki w mniejszy kawałkach, oddzielnie lub poproś administrato
#: installer.php:63
msgid "No source specified when installing app"
-msgstr ""
+msgstr "Nie określono źródła podczas instalacji aplikacji"
#: installer.php:70
msgid "No href specified when installing app from http"
-msgstr ""
+msgstr "Nie określono linku skąd aplikacja ma być zainstalowana"
#: installer.php:75
msgid "No path specified when installing app from local file"
-msgstr ""
+msgstr "Nie określono lokalnego pliku z którego miała być instalowana aplikacja"
#: installer.php:89
#, php-format
msgid "Archives of type %s are not supported"
-msgstr ""
+msgstr "Typ archiwum %s nie jest obsługiwany"
#: installer.php:103
msgid "Failed to open archive when installing app"
-msgstr ""
+msgstr "Nie udało się otworzyć archiwum podczas instalacji aplikacji"
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
-msgstr ""
+msgstr "Aplikacja nie posiada pliku info.xml"
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
-msgstr ""
+msgstr "Aplikacja nie może być zainstalowany ponieważ nie dopuszcza kod w aplikacji"
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
-msgstr ""
+msgstr "Aplikacja nie może zostać zainstalowana ponieważ jest niekompatybilna z tą wersja ownCloud"
-#: installer.php:144
+#: 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 "Aplikacja nie może być zainstalowana ponieważ true tag nie jest <shipped>true</shipped> , co nie jest dozwolone dla aplikacji nie wysłanych"
-#: installer.php:150
+#: 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 "Nie można zainstalować aplikacji, ponieważ w wersji info.xml/version nie jest taka sama, jak wersja z app store"
-#: installer.php:160
+#: installer.php:162
msgid "App directory already exists"
-msgstr ""
+msgstr "Katalog aplikacji już isnieje"
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
-msgstr ""
+msgstr "Nie mogę utworzyć katalogu aplikacji. Proszę popraw uprawnienia. %s"
#: json.php:28
msgid "Application is not enabled"
@@ -153,15 +165,15 @@ msgstr "Błąd uwierzytelniania"
msgid "Token expired. Please reload page."
msgstr "Token wygasł. Proszę ponownie załadować stronę."
-#: search/provider/file.php:17 search/provider/file.php:35
+#: search/provider/file.php:18 search/provider/file.php:36
msgid "Files"
msgstr "Pliki"
-#: search/provider/file.php:26 search/provider/file.php:33
+#: search/provider/file.php:27 search/provider/file.php:34
msgid "Text"
msgstr "Połączenie tekstowe"
-#: search/provider/file.php:29
+#: search/provider/file.php:30
msgid "Images"
msgstr "Obrazy"
@@ -265,63 +277,63 @@ msgstr "Serwer internetowy nie jest jeszcze poprawnie skonfigurowany, aby umożl
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Sprawdź ponownie <a href='%s'>przewodniki instalacji</a>."
-#: template/functions.php:80
+#: tags.php:194
+#, php-format
+msgid "Could not find category \"%s\""
+msgstr "Nie można odnaleźć kategorii \"%s\""
+
+#: template/functions.php:96
msgid "seconds ago"
msgstr "sekund temu"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%n minute temu"
+msgstr[1] "%n minut temu"
+msgstr[2] "%n minut temu"
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%n godzinę temu"
+msgstr[1] "%n godzin temu"
+msgstr[2] "%n godzin temu"
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "dziś"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "wczoraj"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%n dzień temu"
+msgstr[1] "%n dni temu"
+msgstr[2] "%n dni temu"
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "w zeszłym miesiącu"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%n miesiąc temu"
+msgstr[1] "%n miesięcy temu"
+msgstr[2] "%n miesięcy temu"
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "w zeszłym roku"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "lat temu"
#: template.php:297
msgid "Caused by:"
msgstr "Spowodowane przez:"
-
-#: vcategories.php:188 vcategories.php:249
-#, php-format
-msgid "Could not find category \"%s\""
-msgstr "Nie można odnaleźć kategorii \"%s\""
diff --git a/l10n/pl/settings.po b/l10n/pl/settings.po
index 13437f51c48ce887d4db36b7e4075e18a1e4664a..830b2045a3fdd06dfbf99fa8ce8904dda511b6e3 100644
--- a/l10n/pl/settings.po
+++ b/l10n/pl/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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-30 10:17-0400\n"
+"PO-Revision-Date: 2013-09-30 12:15+0000\n"
+"Last-Translator: Cyryl Sochacki <cyrylsochacki@gmail.com>\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"
@@ -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,55 +86,88 @@ msgstr "Nie można usunąć użytkownika z grupy %s"
msgid "Couldn't update app."
msgstr "Nie można uaktualnić aplikacji."
-#: js/apps.js:35
+#: changepassword/controller.php:20
+msgid "Wrong password"
+msgstr "Złe hasło"
+
+#: 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 "Nie można zmienić hasła"
+
+#: js/apps.js:43
msgid "Update to {appversion}"
msgstr "Aktualizacja do {appversion}"
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:110
msgid "Disable"
msgstr "Wyłącz"
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
msgid "Enable"
msgstr "Włącz"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr "Proszę czekać..."
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:101
msgid "Error while disabling app"
-msgstr ""
+msgstr "Błąd podczas wyłączania aplikacji"
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:100 js/apps.js:114 js/apps.js:115
msgid "Error while enabling app"
-msgstr ""
+msgstr "Błąd podczas włączania aplikacji"
-#: js/apps.js:115
+#: js/apps.js:125
msgid "Updating...."
msgstr "Aktualizacja w toku..."
-#: js/apps.js:118
+#: js/apps.js:128
msgid "Error while updating app"
msgstr "Błąd podczas aktualizacji aplikacji"
-#: js/apps.js:118
+#: js/apps.js:128
msgid "Error"
msgstr "Błąd"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:129 templates/apps.php:43
msgid "Update"
msgstr "Aktualizuj"
-#: js/apps.js:122
+#: js/apps.js:132
msgid "Updated"
msgstr "Zaktualizowano"
-#: js/personal.js:150
+#: js/personal.js:221
+msgid "Select a profile picture"
+msgstr "Wybierz zdjęcie profilu"
+
+#: js/personal.js:266
msgid "Decrypting files... Please wait, this can take some time."
-msgstr ""
+msgstr "Odszyfrowuje pliki... Proszę czekać, to może zająć jakiś czas."
-#: js/personal.js:172
+#: js/personal.js:288
msgid "Saving..."
msgstr "Zapisywanie..."
@@ -150,16 +183,16 @@ msgstr "cofnij"
msgid "Unable to remove user"
msgstr "Nie można usunąć użytkownika"
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "Grupy"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "Administrator grupy"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "Usuń"
@@ -179,7 +212,7 @@ msgstr "Błąd podczas tworzenia użytkownika"
msgid "A valid password must be provided"
msgstr "Należy podać prawidłowe hasło"
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "polski"
@@ -194,7 +227,7 @@ msgid ""
"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 ""
+msgstr "Twój katalog danych i pliki są prawdopodobnie dostępne z Internetu. Plik .htaccess, który dostarcza ownCloud nie działa. Sugerujemy, aby skonfigurować serwer WWW w taki sposób, aby katalog danych nie był dostępny lub przenieść katalog danych poza główny katalog serwera WWW."
#: templates/admin.php:29
msgid "Setup Warning"
@@ -231,7 +264,7 @@ 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 ""
+msgstr "System lokalny nie może włączyć ustawień regionalnych %s. Może to oznaczać, że wystąpiły problemy z niektórymi znakami w nazwach plików. Zalecamy instalację wymaganych pakietów na tym systemie w celu wsparcia %s."
#: templates/admin.php:75
msgid "Internet connection not working"
@@ -244,7 +277,7 @@ msgid ""
"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 ""
+msgstr "Ten serwer OwnCloud nie ma połączenia z Internetem. Oznacza to, że niektóre z funkcji, takich jak montowanie zewnętrznych zasobów, powiadomienia o aktualizacji lub 3-cie aplikacje mogą nie działać. Dostęp do plików z zewnątrz i wysyłanie powiadomienia e-mail nie może również działać. Sugerujemy, aby włączyć połączenia internetowego dla tego serwera, jeśli chcesz mieć wszystkie opcje."
#: templates/admin.php:92
msgid "Cron"
@@ -258,11 +291,11 @@ msgstr "Wykonuj jedno zadanie wraz z każdą wczytaną stroną"
msgid ""
"cron.php is registered at a webcron service to call cron.php once a minute "
"over http."
-msgstr ""
+msgstr "cron.php jest zarejestrowany w serwisie webcron do uruchamiania cron.php raz na minutę przez http."
#: templates/admin.php:115
msgid "Use systems cron service to call the cron.php file once a minute."
-msgstr ""
+msgstr "Użyj systemowego cron-a do uruchamiania cron.php raz na minutę."
#: templates/admin.php:120
msgid "Sharing"
@@ -291,7 +324,7 @@ msgstr "Pozwól na publiczne wczytywanie"
#: templates/admin.php:144
msgid ""
"Allow users to enable others to upload into their publicly shared folders"
-msgstr ""
+msgstr "Użytkownicy mogą włączyć dla innych wgrywanie do ich publicznych katalogów"
#: templates/admin.php:152
msgid "Allow resharing"
@@ -327,7 +360,7 @@ msgstr "Wymusza na klientach na łączenie się %s za pośrednictwem połączeni
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
-msgstr ""
+msgstr "Proszę połącz się do twojego %s za pośrednictwem protokołu HTTPS, aby włączyć lub wyłączyć stosowanie protokołu SSL."
#: templates/admin.php:203
msgid "Log"
@@ -345,11 +378,11 @@ msgstr "Więcej"
msgid "Less"
msgstr "Mniej"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "Wersja"
-#: templates/admin.php:246 templates/personal.php:143
+#: 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 "
@@ -416,7 +449,7 @@ msgstr "Uruchom ponownie kreatora pierwszego uruchomienia"
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Wykorzystujesz <strong>%s</strong> z dostępnych <strong>%s</strong>"
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "Hasło"
@@ -440,7 +473,7 @@ msgstr "Nowe hasło"
msgid "Change password"
msgstr "Zmień hasło"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr "Wyświetlana nazwa"
@@ -456,40 +489,68 @@ msgstr "Twój adres e-mail"
msgid "Fill in an email address to enable password recovery"
msgstr "Podaj adres e-mail, aby uzyskać możliwość odzyskania hasła"
-#: templates/personal.php:85 templates/personal.php:86
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr "Zdjęcie profilu"
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr "Wczytaj nowe"
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr "Wybierz nowe z plików"
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr "Usuń zdjęcie"
+
+#: 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 "Anuluj"
+
+#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr "Wybierz zdjęcie profilu"
+
+#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
msgstr "Język"
-#: templates/personal.php:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "Pomóż w tłumaczeniu"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: 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 ""
+msgstr "Użyj tego adresu do <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">dostępu do twoich plików przez WebDAV</a>"
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "Szyfrowanie"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
-msgstr ""
+msgstr "Aplikacja szyfrowanie nie jest włączona, odszyfruj wszystkie plik"
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
-msgstr ""
+msgstr "Hasło logowania"
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
-msgstr ""
+msgstr "Odszyfruj wszystkie pliki"
#: templates/users.php:21
msgid "Login Name"
@@ -513,30 +574,30 @@ msgstr "Wpisz hasło odzyskiwania, aby odzyskać pliki użytkowników podczas zm
msgid "Default Storage"
msgstr "Magazyn domyślny"
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr "Bez limitu"
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "Inne"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "Nazwa użytkownika"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr "Magazyn"
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr "zmień wyświetlaną nazwę"
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr "ustaw nowe hasło"
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr "Domyślny"
diff --git a/l10n/pl/user_ldap.po b/l10n/pl/user_ldap.po
index f2571b2fb2ac683d8979a2d4672d17aff1a22579..fc5af2df2130b7aeaf2827362eb0e49cfc6b4142 100644
--- a/l10n/pl/user_ldap.po
+++ b/l10n/pl/user_ldap.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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-05 11:40+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"
diff --git a/l10n/pt_BR/core.po b/l10n/pt_BR/core.po
index bb1c6966b30ecd2d945ce6e69b592cf9917de739..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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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"
@@ -24,30 +24,34 @@ msgstr ""
msgid "%s shared »%s« with you"
msgstr "%s compartilhou »%s« com você"
+#: ajax/share.php:227
+msgid "group"
+msgstr "grupo"
+
#: ajax/update.php:11
msgid "Turned on maintenance mode"
-msgstr ""
+msgstr "Ativar modo de manutenção"
#: ajax/update.php:14
msgid "Turned off maintenance mode"
-msgstr ""
+msgstr "Desligar o modo de manutenção"
#: ajax/update.php:17
msgid "Updated database"
-msgstr ""
+msgstr "Atualizar o banco de dados"
#: ajax/update.php:20
msgid "Updating filecache, this may take really long..."
-msgstr ""
+msgstr "Atualizar cahe de arquivos, isto pode levar algum tempo..."
#: ajax/update.php:23
msgid "Updated filecache"
-msgstr ""
+msgstr "Atualizar cache de arquivo"
#: ajax/update.php:26
#, php-format
msgid "... %d%% done ..."
-msgstr ""
+msgstr "... %d%% concluído ..."
#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
msgid "Category type not provided."
@@ -88,6 +92,26 @@ msgstr "Nenhuma categoria selecionada para remoção."
msgid "Error removing %s from favorites."
msgstr "Erro ao remover %s dos favoritos."
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr "Nenhuma imagem ou arquivo fornecido"
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr "Tipo de arquivo desconhecido"
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr "Imagem inválida"
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr "Sem imagem no perfil temporário disponível, tente novamente"
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr "Nenhum dado para coleta foi fornecido"
+
#: js/config.php:32
msgid "Sunday"
msgstr "Domingo"
@@ -164,59 +188,59 @@ msgstr "novembro"
msgid "December"
msgstr "dezembro"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "Ajustes"
-#: js/js.js:812
+#: js/js.js:866
msgid "seconds ago"
msgstr "segundos atrás"
-#: js/js.js:813
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] " ha %n minuto"
+msgstr[1] "ha %n minutos"
-#: js/js.js:814
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "ha %n hora"
+msgstr[1] "ha %n horas"
-#: js/js.js:815
+#: js/js.js:869
msgid "today"
msgstr "hoje"
-#: js/js.js:816
+#: js/js.js:870
msgid "yesterday"
msgstr "ontem"
-#: js/js.js:817
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "ha %n dia"
+msgstr[1] "ha %n dias"
-#: js/js.js:818
+#: js/js.js:872
msgid "last month"
msgstr "último mês"
-#: js/js.js:819
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "ha %n mês"
+msgstr[1] "ha %n meses"
-#: js/js.js:820
+#: js/js.js:874
msgid "months ago"
msgstr "meses atrás"
-#: js/js.js:821
+#: js/js.js:875
msgid "last year"
msgstr "último ano"
-#: js/js.js:822
+#: js/js.js:876
msgid "years ago"
msgstr "anos atrás"
@@ -224,22 +248,66 @@ msgstr "anos atrás"
msgid "Choose"
msgstr "Escolha"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
-msgstr "Template selecionador Erro ao carregar arquivo"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
+msgstr "Erro no seletor de carregamento modelo de arquivos: {error}"
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "Sim"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "Não"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr "Ok"
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+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
msgid "The object type is not specified."
@@ -249,7 +317,7 @@ msgstr "O tipo de objeto não foi especificado."
#: 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:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "Erro"
@@ -269,7 +337,7 @@ msgstr "Compartilhados"
msgid "Share"
msgstr "Compartilhar"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr "Erro ao compartilhar"
@@ -325,67 +393,67 @@ msgstr "Definir data de expiração"
msgid "Expiration date"
msgstr "Data de expiração"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "Compartilhar via e-mail:"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "Nenhuma pessoa encontrada"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "Não é permitido re-compartilhar"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr "Compartilhado em {item} com {user}"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "Descompartilhar"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "pode editar"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "controle de acesso"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "criar"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "atualizar"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "remover"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "compartilhar"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "Protegido com senha"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr "Erro ao remover data de expiração"
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr "Erro ao definir data de expiração"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr "Enviando ..."
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr "E-mail enviado"
@@ -400,7 +468,7 @@ msgstr "A atualização falhou. Por favor, relate este problema para a <a href=\
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "A atualização teve êxito. Você será redirecionado ao ownCloud agora."
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr "%s redefinir senha"
@@ -469,7 +537,7 @@ msgstr "Pessoal"
msgid "Users"
msgstr "Usuários"
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "Aplicações"
@@ -598,14 +666,10 @@ msgstr "Concluir configuração"
msgid "%s is available. Get more information on how to update."
msgstr "%s está disponível. Obtenha mais informações sobre como atualizar."
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "Sair"
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr "Mais aplicativos"
-
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "Entrada Automática no Sistema Rejeitada!"
@@ -620,19 +684,19 @@ msgstr "Se você não mudou a sua senha recentemente, a sua conta pode estar com
msgid "Please change your password to secure your account again."
msgstr "Por favor troque sua senha para tornar sua conta segura novamente."
-#: templates/login.php:34
+#: templates/login.php:32
msgid "Lost your password?"
msgstr "Esqueceu sua senha?"
-#: templates/login.php:39
+#: templates/login.php:37
msgid "remember"
msgstr "lembrar"
-#: templates/login.php:41
+#: templates/login.php:39
msgid "Log in"
msgstr "Fazer login"
-#: templates/login.php:47
+#: templates/login.php:45
msgid "Alternative Logins"
msgstr "Logins alternativos"
diff --git a/l10n/pt_BR/files.po b/l10n/pt_BR/files.po
index 1b16070f4ea010c901ebf8ae40cacd985f021a84..1b491703bdd63ab43659d3e1dff79abf93821b85 100644
--- a/l10n/pt_BR/files.po
+++ b/l10n/pt_BR/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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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-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"
@@ -77,157 +77,173 @@ msgstr "Falha ao escrever no disco"
msgid "Not enough storage available"
msgstr "Espaço de armazenamento insuficiente"
-#: ajax/upload.php:123
+#: 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: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:167
+#: 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:241
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr "URL não pode ficar em branco"
-#: 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 "Nome de pasta inválido. O uso do nome 'Compartilhado' é reservado ao ownCloud"
-#: js/file-upload.js:277 js/file-upload.js:293 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 "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:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "Pendente"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{new_name} já existe"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "substituir"
-#: js/filelist.js:303
+#: js/filelist.js:416
msgid "suggest name"
msgstr "sugerir nome"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "cancelar"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr "Substituído {old_name} por {new_name} "
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "undo"
msgstr "desfazer"
-#: js/filelist.js:453
+#: 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: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:541
+msgid "{dirs} and {files}"
+msgstr "{dirs} e {files}"
+
+#: js/filelist.js:731 js/filelist.js:769
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Enviando %n arquivo"
+msgstr[1] "Enviando %n arquivos"
-#: js/filelist.js:518
-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 ""
+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:562 templates/index.php:67
+#: 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:563 templates/index.php:78
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "Tamanho"
-#: js/files.js:564 templates/index.php:80
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr "Modificado"
-#: js/files.js:580
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/files.js:586
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-
#: lib/app.php:73
#, php-format
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"
@@ -263,84 +279,68 @@ 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:73
+#: templates/index.php:67
msgid "Download"
msgstr "Baixar"
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr "Descompartilhar"
-#: templates/index.php:91 templates/index.php:92
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "Excluir"
-#: templates/index.php:105
+#: templates/index.php:100
msgid "Upload too large"
msgstr "Upload muito grande"
-#: 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 "Os arquivos que você está tentando carregar excedeu o tamanho máximo para arquivos no servidor."
-#: templates/index.php:112
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr "Arquivos sendo escaneados, por favor aguarde."
-#: templates/index.php:115
+#: templates/index.php:110
msgid "Current scanning"
msgstr "Scanning atual"
-#: templates/part.list.php:74
-msgid "directory"
-msgstr "diretório"
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr "diretórios"
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr "arquivo"
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr "arquivos"
-
#: templates/upgrade.php:2
msgid "Upgrading filesystem cache..."
msgstr "Atualizando cache do sistema de arquivos..."
diff --git a/l10n/pt_BR/files_sharing.po b/l10n/pt_BR/files_sharing.po
index 511813205a79521007826eb3582df9534d79a81f..0c110ef8250e79718ce737ccb773f5c520793d9b 100644
--- a/l10n/pt_BR/files_sharing.po
+++ b/l10n/pt_BR/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:01+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"
@@ -64,7 +64,7 @@ msgstr "%s compartilhou a pasta %s com você"
msgid "%s shared the file %s with you"
msgstr "%s compartilhou o arquivo %s com você"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "Baixar"
@@ -76,6 +76,6 @@ msgstr "Upload"
msgid "Cancel upload"
msgstr "Cancelar upload"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "Nenhuma visualização disponível para"
diff --git a/l10n/pt_BR/files_trashbin.po b/l10n/pt_BR/files_trashbin.po
index 3464db7a91185e6c94b42ccbafd79b6076f7c718..3b2ef25c158ba14a035550a8a7eba184b7b01493 100644
--- a/l10n/pt_BR/files_trashbin.po
+++ b/l10n/pt_BR/files_trashbin.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-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-10 10:41-0400\n"
+"PO-Revision-Date: 2013-09-10 13:30+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"
@@ -28,43 +28,43 @@ msgstr "Não foi possível excluir %s permanentemente"
msgid "Couldn't restore %s"
msgstr "Não foi possível restaurar %s"
-#: js/trash.js:7 js/trash.js:100
+#: js/trash.js:7 js/trash.js:102
msgid "perform restore operation"
msgstr "realizar operação de restauração"
-#: 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 "Erro"
-#: js/trash.js:36
+#: js/trash.js:37
msgid "delete file permanently"
msgstr "excluir arquivo permanentemente"
-#: js/trash.js:127
+#: js/trash.js:129
msgid "Delete permanently"
msgstr "Excluir permanentemente"
-#: js/trash.js:182 templates/index.php:17
+#: js/trash.js:184 templates/index.php:17
msgid "Name"
msgstr "Nome"
-#: js/trash.js:183 templates/index.php:27
+#: js/trash.js:185 templates/index.php:27
msgid "Deleted"
msgstr "Excluído"
-#: js/trash.js:191
+#: js/trash.js:193
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
-msgstr[1] ""
+msgstr[1] "%n pastas"
-#: js/trash.js:197
+#: js/trash.js:199
msgid "%n file"
msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n arquivo"
+msgstr[1] "%n arquivos"
-#: lib/trash.php:819 lib/trash.php:821
+#: lib/trash.php:814 lib/trash.php:816
msgid "restored"
msgstr "restaurado"
diff --git a/l10n/pt_BR/lib.po b/l10n/pt_BR/lib.po
index d35e68a4ec15f79a4da0318e5ac71198366f5364..315979949498424652cdeffe3f1f7bf856922fcd 100644
--- a/l10n/pt_BR/lib.po
+++ b/l10n/pt_BR/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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-26 12:50+0000\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"
@@ -49,11 +49,23 @@ msgstr "Usuários"
msgid "Admin"
msgstr "Admin"
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "Falha na atualização de \"%s\"."
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr "Fotos de perfil personalizados ainda não funcionam com criptografia"
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr "Tipo de arquivo desconhecido"
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr "Imagem inválida"
+
#: defaults.php:35
msgid "web services under your control"
msgstr "serviços web sob seu controle"
@@ -106,37 +118,37 @@ msgstr "Arquivos do tipo %s não são suportados"
msgid "Failed to open archive when installing app"
msgstr "Falha para abrir o arquivo enquanto instalava o aplicativo"
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr "O aplicativo não fornece um arquivo info.xml"
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr "O aplicativo não pode ser instalado por causa do código não permitido no Aplivativo"
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr "O aplicativo não pode ser instalado porque não é compatível com esta versão do ownCloud"
-#: installer.php:144
+#: 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 "O aplicativo não pode ser instalado porque ele contém a marca <shipped>verdadeiro</shipped> que não é permitido para aplicações não embarcadas"
-#: installer.php:150
+#: 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 "O aplicativo não pode ser instalado porque a versão em info.xml /versão não é a mesma que a versão relatada na App Store"
-#: installer.php:160
+#: installer.php:162
msgid "App directory already exists"
msgstr "Diretório App já existe"
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr "Não é possível criar pasta app. Corrija as permissões. %s"
@@ -265,51 +277,51 @@ msgstr "Seu servidor web não está configurado corretamente para permitir sincr
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Por favor, confira os <a href='%s'>guias de instalação</a>."
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "segundos atrás"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-msgstr[1] ""
+msgstr[1] "ha %n minutos"
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-msgstr[1] ""
+msgstr[1] "ha %n horas"
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "hoje"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "ontem"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
-msgstr[1] ""
+msgstr[1] "ha %n dias"
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "último mês"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-msgstr[1] ""
+msgstr[1] "ha %n meses"
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "último ano"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "anos atrás"
diff --git a/l10n/pt_BR/settings.po b/l10n/pt_BR/settings.po
index 4214958d1ab6f0098650e90ed3e7b01bd3429c64..c8608696d6129c5450f2d0bd65dba1e64b8adc39 100644
--- a/l10n/pt_BR/settings.po
+++ b/l10n/pt_BR/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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-26 12:21+0000\n"
-"Last-Translator: Flávio Veras <flaviove@gmail.com>\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"
"Content-Type: text/plain; charset=UTF-8\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,55 +86,88 @@ 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."
-#: js/apps.js:35
+#: 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}"
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr "Desabilitar"
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr "Habilitar"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr "Por favor, aguarde..."
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr "Erro enquanto desabilitava o aplicativo"
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr "Erro enquanto habilitava o aplicativo"
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr "Atualizando..."
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr "Erro ao atualizar aplicativo"
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "Erro"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr "Atualizar"
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr "Atualizado"
-#: js/personal.js:150
+#: js/personal.js:220
+msgid "Select a profile picture"
+msgstr "Selecione uma imagem para o perfil"
+
+#: 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:172
+#: js/personal.js:287
msgid "Saving..."
msgstr "Salvando..."
@@ -150,16 +183,16 @@ msgstr "desfazer"
msgid "Unable to remove user"
msgstr "Impossível remover usuário"
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "Grupos"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "Grupo Administrativo"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "Excluir"
@@ -179,7 +212,7 @@ msgstr "Erro ao criar usuário"
msgid "A valid password must be provided"
msgstr "Forneça uma senha válida"
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "Português (Brasil)"
@@ -345,11 +378,11 @@ msgstr "Mais"
msgid "Less"
msgstr "Menos"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "Versão"
-#: templates/admin.php:246 templates/personal.php:143
+#: 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 "
@@ -416,7 +449,7 @@ msgstr "Mostrar este Assistente de novo"
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Você usou <strong>%s</strong> do seu espaço de <strong>%s</strong>"
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "Senha"
@@ -440,7 +473,7 @@ msgstr "Nova senha"
msgid "Change password"
msgstr "Alterar senha"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr "Nome de Exibição"
@@ -456,38 +489,66 @@ msgstr "Seu endereço de e-mail"
msgid "Fill in an email address to enable password recovery"
msgstr "Preencha um endereço de e-mail para habilitar a recuperação de senha"
-#: templates/personal.php:85 templates/personal.php:86
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr "Imagem para o perfil"
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr "Enviar nova foto"
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr "Selecinar uma nova dos Arquivos"
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr "Remover imagem"
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr "Ou png ou jpg. O ideal é quadrado, mas você vai ser capaz de cortá-la."
+
+#: templates/personal.php:97
+msgid "Abort"
+msgstr "Abortar"
+
+#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr "Escolha como imagem para o perfil"
+
+#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
msgstr "Idioma"
-#: templates/personal.php:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "Ajude a traduzir"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: 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 "Use esse endereço para <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">acessar seus arquivos via WebDAV</a>"
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "Criptografia"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr "O aplicativo de encriptação não está mais ativo, decripti todos os seus arquivos"
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr "Senha de login"
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr "Decripti todos os Arquivos"
@@ -513,30 +574,30 @@ msgstr "Digite a senha de recuperação para recuperar os arquivos dos usuários
msgid "Default Storage"
msgstr "Armazenamento Padrão"
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr "Ilimitado"
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "Outro"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "Nome de Usuário"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr "Armazenamento"
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr "alterar nome de exibição"
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr "definir nova senha"
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr "Padrão"
diff --git a/l10n/pt_BR/user_ldap.po b/l10n/pt_BR/user_ldap.po
index b2edb3b335ac97ce885aae1331b2fc316e5481e5..e54db81dd8330336a989fc41099871de8737fd0b 100644
--- a/l10n/pt_BR/user_ldap.po
+++ b/l10n/pt_BR/user_ldap.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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-26 12:30+0000\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-05 11:51+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"
diff --git a/l10n/pt_PT/core.po b/l10n/pt_PT/core.po
index 2977abfcd415cb6b6235bcfc780000ffedc418f8..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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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"
@@ -26,30 +27,34 @@ msgstr ""
msgid "%s shared »%s« with you"
msgstr "%s partilhado »%s« contigo"
+#: ajax/share.php:227
+msgid "group"
+msgstr "grupo"
+
#: ajax/update.php:11
msgid "Turned on maintenance mode"
-msgstr ""
+msgstr "Activado o modo de manutenção"
#: ajax/update.php:14
msgid "Turned off maintenance mode"
-msgstr ""
+msgstr "Desactivado o modo de manutenção"
#: ajax/update.php:17
msgid "Updated database"
-msgstr ""
+msgstr "Base de dados actualizada"
#: ajax/update.php:20
msgid "Updating filecache, this may take really long..."
-msgstr ""
+msgstr "A actualizar o cache dos ficheiros, poderá demorar algum tempo..."
#: ajax/update.php:23
msgid "Updated filecache"
-msgstr ""
+msgstr "Actualizado o cache dos ficheiros"
#: ajax/update.php:26
#, php-format
msgid "... %d%% done ..."
-msgstr ""
+msgstr "... %d%% feito ..."
#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
msgid "Category type not provided."
@@ -90,6 +95,26 @@ msgstr "Nenhuma categoria seleccionada para eliminar."
msgid "Error removing %s from favorites."
msgstr "Erro a remover %s dos favoritos."
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr "Não foi selecionado nenhum ficheiro para importar"
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr "Ficheiro desconhecido"
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr "Imagem inválida"
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr "Foto temporária de perfil indisponível, tente novamente"
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr ""
+
#: js/config.php:32
msgid "Sunday"
msgstr "Domingo"
@@ -166,59 +191,59 @@ msgstr "Novembro"
msgid "December"
msgstr "Dezembro"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "Configurações"
-#: js/js.js:812
+#: js/js.js:866
msgid "seconds ago"
msgstr "Minutos atrás"
-#: js/js.js:813
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n minuto atrás"
+msgstr[1] "%n minutos atrás"
-#: js/js.js:814
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n hora atrás"
+msgstr[1] "%n horas atrás"
-#: js/js.js:815
+#: js/js.js:869
msgid "today"
msgstr "hoje"
-#: js/js.js:816
+#: js/js.js:870
msgid "yesterday"
msgstr "ontem"
-#: js/js.js:817
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n dia atrás"
+msgstr[1] "%n dias atrás"
-#: js/js.js:818
+#: js/js.js:872
msgid "last month"
msgstr "ultímo mês"
-#: js/js.js:819
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n mês atrás"
+msgstr[1] "%n meses atrás"
-#: js/js.js:820
+#: js/js.js:874
msgid "months ago"
msgstr "meses atrás"
-#: js/js.js:821
+#: js/js.js:875
msgid "last year"
msgstr "ano passado"
-#: js/js.js:822
+#: js/js.js:876
msgid "years ago"
msgstr "anos atrás"
@@ -226,22 +251,66 @@ msgstr "anos atrás"
msgid "Choose"
msgstr "Escolha"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
-msgstr "Erro ao carregar arquivo do separador modelo"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
+msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "Sim"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "Não"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
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
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
@@ -251,7 +320,7 @@ msgstr "O tipo de objecto não foi especificado"
#: 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:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "Erro"
@@ -271,7 +340,7 @@ msgstr "Partilhado"
msgid "Share"
msgstr "Partilhar"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr "Erro ao partilhar"
@@ -327,67 +396,67 @@ msgstr "Especificar data de expiração"
msgid "Expiration date"
msgstr "Data de expiração"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "Partilhar via email:"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "Não foi encontrado ninguém"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "Não é permitido partilhar de novo"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr "Partilhado em {item} com {user}"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "Deixar de partilhar"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "pode editar"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "Controlo de acesso"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "criar"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "actualizar"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "apagar"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "partilhar"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "Protegido com palavra-passe"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr "Erro ao retirar a data de expiração"
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr "Erro ao aplicar a data de expiração"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr "A Enviar..."
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr "E-mail enviado"
@@ -402,10 +471,10 @@ msgstr "A actualização falhou. Por favor reporte este incidente seguindo este
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "A actualização foi concluída com sucesso. Vai ser redireccionado para o ownCloud agora."
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
-msgstr ""
+msgstr "%s reposição da password"
#: lostpassword/templates/email.php:2
msgid "Use the following link to reset your password: {link}"
@@ -471,7 +540,7 @@ msgstr "Pessoal"
msgid "Users"
msgstr "Utilizadores"
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "Aplicações"
@@ -600,14 +669,10 @@ msgstr "Acabar instalação"
msgid "%s is available. Get more information on how to update."
msgstr "%s está disponível. Tenha mais informações como actualizar."
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "Sair"
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "Login automático rejeitado!"
@@ -622,19 +687,19 @@ msgstr "Se não mudou a sua palavra-passe recentemente, a sua conta pode ter sid
msgid "Please change your password to secure your account again."
msgstr "Por favor mude a sua palavra-passe para assegurar a sua conta de novo."
-#: templates/login.php:34
+#: templates/login.php:32
msgid "Lost your password?"
msgstr "Esqueceu-se da sua password?"
-#: templates/login.php:39
+#: templates/login.php:37
msgid "remember"
msgstr "lembrar"
-#: templates/login.php:41
+#: templates/login.php:39
msgid "Log in"
msgstr "Entrar"
-#: templates/login.php:47
+#: templates/login.php:45
msgid "Alternative Logins"
msgstr "Contas de acesso alternativas"
diff --git a/l10n/pt_PT/files.po b/l10n/pt_PT/files.po
index 8d4a96c779cb68e24e27aa76c7107b1d5f055c41..7a35987288855c2f70278e21c25cc1b773a23f60 100644
--- a/l10n/pt_PT/files.po
+++ b/l10n/pt_PT/files.po
@@ -5,12 +5,13 @@
# Translators:
# bmgmatias <bmgmatias@gmail.com>, 2013
# FernandoMASilva, 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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
@@ -76,7 +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:123
+#: 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 "Directório Inválido"
@@ -84,149 +93,157 @@ 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: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 "Envio de ficheiro em progresso. Irá cancelar o envio se sair da página agora."
-#: js/file-upload.js:241
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr "O URL não pode estar vazio."
-#: 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 "Nome da pasta inválido. Palavra 'Shared' é reservado pela ownCloud"
-#: js/file-upload.js:277 js/file-upload.js:293 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 "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:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "Pendente"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "O nome {new_name} já existe"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "substituir"
-#: js/filelist.js:303
+#: js/filelist.js:416
msgid "suggest name"
msgstr "sugira um nome"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "cancelar"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr "substituido {new_name} por {old_name}"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "undo"
msgstr "desfazer"
-#: js/filelist.js:453
+#: 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: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:541
+msgid "{dirs} and {files}"
+msgstr "{dirs} e {files}"
+
+#: js/filelist.js:731 js/filelist.js:769
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/filelist.js:518
-msgid "files uploading"
-msgstr "A enviar os ficheiros"
+msgstr[0] "A carregar %n ficheiro"
+msgstr[1] "A carregar %n 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 ""
+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: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 "Nome"
-#: js/files.js:563 templates/index.php:78
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "Tamanho"
-#: js/files.js:564 templates/index.php:80
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr "Modificado"
-#: js/files.js:580
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/files.js:586
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-
#: lib/app.php:73
#, php-format
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"
@@ -262,84 +279,68 @@ 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:73
+#: templates/index.php:67
msgid "Download"
msgstr "Transferir"
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr "Deixar de partilhar"
-#: templates/index.php:91 templates/index.php:92
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "Eliminar"
-#: templates/index.php:105
+#: templates/index.php:100
msgid "Upload too large"
msgstr "Upload muito grande"
-#: 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 "Os ficheiro que está a tentar enviar excedem o tamanho máximo de envio neste servidor."
-#: templates/index.php:112
+#: 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:115
+#: templates/index.php:110
msgid "Current scanning"
msgstr "Análise actual"
-#: templates/part.list.php:74
-msgid "directory"
-msgstr "diretório"
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr "diretórios"
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr "ficheiro"
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr "ficheiros"
-
#: templates/upgrade.php:2
msgid "Upgrading filesystem cache..."
msgstr "Atualizar cache do sistema de ficheiros..."
diff --git a/l10n/pt_PT/files_sharing.po b/l10n/pt_PT/files_sharing.po
index 200f818e9f3f1d0e94e59ac34a3f0b0cad7e10d8..7db55d8e767733f17c67b6db5ae47f279e975f10 100644
--- a/l10n/pt_PT/files_sharing.po
+++ b/l10n/pt_PT/files_sharing.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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:01+0000\n"
"Last-Translator: Helder Meneses <helder.meneses@gmail.com>\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
@@ -65,7 +65,7 @@ msgstr "%s partilhou a pasta %s consigo"
msgid "%s shared the file %s with you"
msgstr "%s partilhou o ficheiro %s consigo"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "Transferir"
@@ -77,6 +77,6 @@ msgstr "Carregar"
msgid "Cancel upload"
msgstr "Cancelar envio"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "Não há pré-visualização para"
diff --git a/l10n/pt_PT/files_trashbin.po b/l10n/pt_PT/files_trashbin.po
index e23fb508d18da523cbf0f46542e76830bb7d8575..64a86f404cfcf1212a92765ede6f108ae4c3b763 100644
--- a/l10n/pt_PT/files_trashbin.po
+++ b/l10n/pt_PT/files_trashbin.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-08-15 04:47-0400\n"
-"PO-Revision-Date: 2013-08-15 08:48+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-01 13:27-0400\n"
+"PO-Revision-Date: 2013-08-31 14:50+0000\n"
+"Last-Translator: Helder Meneses <helder.meneses@gmail.com>\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"
@@ -28,43 +28,43 @@ msgstr "Não foi possível eliminar %s de forma permanente"
msgid "Couldn't restore %s"
msgstr "Não foi possível restaurar %s"
-#: js/trash.js:7 js/trash.js:100
+#: js/trash.js:7 js/trash.js:102
msgid "perform restore operation"
msgstr "executar a operação de restauro"
-#: 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 "Erro"
-#: js/trash.js:36
+#: js/trash.js:37
msgid "delete file permanently"
msgstr "Eliminar permanentemente o(s) ficheiro(s)"
-#: js/trash.js:127
+#: js/trash.js:129
msgid "Delete permanently"
msgstr "Eliminar permanentemente"
-#: js/trash.js:182 templates/index.php:17
+#: js/trash.js:184 templates/index.php:17
msgid "Name"
msgstr "Nome"
-#: js/trash.js:183 templates/index.php:27
+#: js/trash.js:185 templates/index.php:27
msgid "Deleted"
msgstr "Apagado"
-#: js/trash.js:191
+#: js/trash.js:193
msgid "%n folder"
msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n pasta"
+msgstr[1] "%n pastas"
-#: js/trash.js:197
+#: js/trash.js:199
msgid "%n file"
msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n ficheiro"
+msgstr[1] "%n ficheiros"
-#: lib/trash.php:819 lib/trash.php:821
+#: lib/trash.php:814 lib/trash.php:816
msgid "restored"
msgstr "Restaurado"
diff --git a/l10n/pt_PT/lib.po b/l10n/pt_PT/lib.po
index b7393d9b03aa7ea74fbae09921528ec5a422b02d..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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+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"
@@ -49,11 +49,23 @@ msgstr "Utilizadores"
msgid "Admin"
msgstr "Admin"
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "A actualização \"%s\" falhou."
+#: avatar.php:56
+msgid "Custom profile pictures don't work with encryption yet"
+msgstr ""
+
+#: avatar.php:64
+msgid "Unknown filetype"
+msgstr "Ficheiro desconhecido"
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr "Imagem inválida"
+
#: defaults.php:35
msgid "web services under your control"
msgstr "serviços web sob o seu controlo"
@@ -106,37 +118,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: 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:150
+#: 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:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -153,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"
@@ -265,51 +277,51 @@ msgstr "O seu servidor web não está configurado correctamente para autorizar s
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Por favor verifique <a href='%s'>installation guides</a>."
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "Minutos atrás"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-msgstr[1] ""
+msgstr[1] "%n minutos atrás"
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-msgstr[1] ""
+msgstr[1] "%n horas atrás"
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "hoje"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "ontem"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
-msgstr[1] ""
+msgstr[1] "%n dias atrás"
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "ultímo mês"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-msgstr[1] ""
+msgstr[1] "%n meses atrás"
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "ano passado"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "anos atrás"
diff --git a/l10n/pt_PT/settings.po b/l10n/pt_PT/settings.po
index 3e43edd89450278b4dcd07da18d4d88afad97948..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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+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,55 +88,88 @@ msgstr "Impossível apagar utilizador do grupo %s"
msgid "Couldn't update app."
msgstr "Não foi possível actualizar a aplicação."
-#: js/apps.js:35
+#: 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}"
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr "Desactivar"
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr "Activar"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr "Por favor aguarde..."
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
-msgstr ""
+msgstr "Erro enquanto desactivava a aplicação"
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
-msgstr ""
+msgstr "Erro enquanto activava a aplicação"
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr "A Actualizar..."
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr "Erro enquanto actualizava a aplicação"
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "Erro"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr "Actualizar"
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr "Actualizado"
-#: js/personal.js:150
-msgid "Decrypting files... Please wait, this can take some time."
+#: js/personal.js:220
+msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:172
+#: 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:287
msgid "Saving..."
msgstr "A guardar..."
@@ -152,16 +185,16 @@ msgstr "desfazer"
msgid "Unable to remove user"
msgstr "Não foi possível remover o utilizador"
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "Grupos"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "Grupo Administrador"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "Eliminar"
@@ -181,7 +214,7 @@ msgstr "Erro a criar utilizador"
msgid "A valid password must be provided"
msgstr "Uma password válida deve ser fornecida"
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "__language_name__"
@@ -347,11 +380,11 @@ msgstr "Mais"
msgid "Less"
msgstr "Menos"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "Versão"
-#: templates/admin.php:246 templates/personal.php:143
+#: 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 "
@@ -418,7 +451,7 @@ msgstr "Mostrar novamente Wizard de Arranque Inicial"
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Usou <strong>%s</strong> do disponivel <strong>%s</strong>"
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "Password"
@@ -442,7 +475,7 @@ msgstr "Nova palavra-chave"
msgid "Change password"
msgstr "Alterar palavra-chave"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr "Nome público"
@@ -458,40 +491,68 @@ msgstr "O seu endereço de email"
msgid "Fill in an email address to enable password recovery"
msgstr "Preencha com o seu endereço de email para ativar a recuperação da palavra-chave"
-#: templates/personal.php:85 templates/personal.php:86
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr "Foto do perfil"
+
+#: 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 "Abortar"
+
+#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
msgstr "Idioma"
-#: templates/personal.php:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "Ajude a traduzir"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: 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 "Use este endereço para <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">aceder aos seus ficheiros via WebDav</a>"
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "Encriptação"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
-msgstr ""
+msgstr "A aplicação de encriptação não se encontra mais disponível, desencripte o seu ficheiro"
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
-msgstr ""
+msgstr "Password de entrada"
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
-msgstr ""
+msgstr "Desencriptar todos os ficheiros"
#: templates/users.php:21
msgid "Login Name"
@@ -515,30 +576,30 @@ msgstr "Digite a senha de recuperação, a fim de recuperar os arquivos de usuá
msgid "Default Storage"
msgstr "Armazenamento Padrão"
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr "Ilimitado"
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "Outro"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "Nome de utilizador"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr "Armazenamento"
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr "modificar nome exibido"
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr "definir nova palavra-passe"
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr "Padrão"
diff --git a/l10n/pt_PT/user_ldap.po b/l10n/pt_PT/user_ldap.po
index 435fb6260982231c4f1a6fbdbb35e76856d9b3bc..03ef1f30c99aebfab54f05000f295823131c6509 100644
--- a/l10n/pt_PT/user_ldap.po
+++ b/l10n/pt_PT/user_ldap.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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\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"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ro/core.po b/l10n/ro/core.po
index 0086ac5350a309b422c21f59b54548fb4d2238c3..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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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"
@@ -26,6 +26,10 @@ msgstr ""
msgid "%s shared »%s« with you"
msgstr "%s Partajat »%s« cu tine de"
+#: ajax/share.php:227
+msgid "group"
+msgstr "grup"
+
#: ajax/update.php:11
msgid "Turned on maintenance mode"
msgstr ""
@@ -36,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..."
@@ -90,6 +94,26 @@ msgstr "Nicio categorie selectată pentru ștergere."
msgid "Error removing %s from favorites."
msgstr "Eroare la ștergerea %s din favorite."
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr "Tip fișier necunoscut"
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr "Imagine invalidă"
+
+#: 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 "Duminică"
@@ -166,63 +190,63 @@ msgstr "Noiembrie"
msgid "December"
msgstr "Decembrie"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "Setări"
-#: js/js.js:812
+#: js/js.js:866
msgid "seconds ago"
msgstr "secunde în urmă"
-#: js/js.js:813
+#: 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:814
+#: 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:815
+#: js/js.js:869
msgid "today"
msgstr "astăzi"
-#: js/js.js:816
+#: js/js.js:870
msgid "yesterday"
msgstr "ieri"
-#: js/js.js:817
+#: 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:818
+#: js/js.js:872
msgid "last month"
msgstr "ultima lună"
-#: js/js.js:819
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:820
+#: js/js.js:874
msgid "months ago"
msgstr "luni în urmă"
-#: js/js.js:821
+#: js/js.js:875
msgid "last year"
msgstr "ultimul an"
-#: js/js.js:822
+#: js/js.js:876
msgid "years ago"
msgstr "ani în urmă"
@@ -230,22 +254,67 @@ msgstr "ani în urmă"
msgid "Choose"
msgstr "Alege"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
-msgstr "Eroare la încărcarea șablonului selectorului de fișiere"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
+msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "Da"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "Nu"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
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 "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."
@@ -255,7 +324,7 @@ msgstr "Tipul obiectului nu este specificat."
#: 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:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "Eroare"
@@ -275,7 +344,7 @@ msgstr "Partajat"
msgid "Share"
msgstr "Partajează"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr "Eroare la partajare"
@@ -331,67 +400,67 @@ msgstr "Specifică data expirării"
msgid "Expiration date"
msgstr "Data expirării"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "Distribuie prin email:"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "Nici o persoană găsită"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "Repartajarea nu este permisă"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr "Distribuie in {item} si {user}"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "Anulare partajare"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "poate edita"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "control acces"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "creare"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "actualizare"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "ștergere"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "partajare"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "Protejare cu parolă"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr "Eroare la anularea datei de expirare"
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr "Eroare la specificarea datei de expirare"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr "Se expediază..."
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr "Mesajul a fost expediat"
@@ -406,7 +475,7 @@ msgstr "Actualizarea a eșuat! Raportați problema către <a href=\"https://gith
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Actualizare reușită. Ești redirecționat către ownCloud."
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr ""
@@ -475,7 +544,7 @@ msgstr "Personal"
msgid "Users"
msgstr "Utilizatori"
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "Aplicații"
@@ -604,14 +673,10 @@ msgstr "Finalizează instalarea"
msgid "%s is available. Get more information on how to update."
msgstr "%s este disponibil. Vezi mai multe informații despre procesul de actualizare."
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "Ieșire"
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "Autentificare automată respinsă!"
@@ -626,19 +691,19 @@ msgstr "Dacă nu ți-ai schimbat parola recent, contul tău ar putea fi compromi
msgid "Please change your password to secure your account again."
msgstr "Te rog schimbă-ți parola pentru a-ți securiza din nou contul."
-#: templates/login.php:34
+#: templates/login.php:32
msgid "Lost your password?"
msgstr "Ai uitat parola?"
-#: templates/login.php:39
+#: templates/login.php:37
msgid "remember"
msgstr "amintește"
-#: templates/login.php:41
+#: templates/login.php:39
msgid "Log in"
msgstr "Autentificare"
-#: templates/login.php:47
+#: templates/login.php:45
msgid "Alternative Logins"
msgstr "Conectări alternative"
diff --git a/l10n/ro/files.po b/l10n/ro/files.po
index 83791045a814a382d66b9498b571758f34e1e076..85ce986ea03d688e71cdadcde0e42befc8d28d29 100644
--- a/l10n/ro/files.po
+++ b/l10n/ro/files.po
@@ -3,16 +3,18 @@
# 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
# 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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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 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"
@@ -49,7 +51,7 @@ msgstr "Nu a apărut nici o eroare, fișierul a fost încărcat cu succes"
#: ajax/upload.php:67
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
-msgstr "Fisierul incarcat depaseste upload_max_filesize permisi in php.ini: "
+msgstr "Fisierul incarcat depaseste marimea maxima permisa in php.ini: "
#: ajax/upload.php:69
msgid ""
@@ -67,170 +69,186 @@ msgstr "Nu a fost încărcat nici un fișier"
#: ajax/upload.php:72
msgid "Missing a temporary folder"
-msgstr "Lipsește un director temporar"
+msgstr "Lipsește un dosar temporar"
#: ajax/upload.php:73
msgid "Failed to write to disk"
-msgstr "Eroare la scriere pe disc"
+msgstr "Eroare la scrierea discului"
#: ajax/upload.php:91
msgid "Not enough storage available"
msgstr "Nu este suficient spațiu disponibil"
-#: ajax/upload.php:123
+#: 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: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 "Director invalid."
+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 "Nu s-a putut încărca fișierul tău deoarece pare să fie un director 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:167
+#: 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:241
+#: js/file-upload.js:520
msgid "URL cannot be empty."
-msgstr "Adresa URL nu poate fi goală."
+msgstr "Adresa URL nu poate fi golita"
-#: 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 "Nume de dosar invalid. Utilizarea 'Shared' e rezervată de ownCloud"
-#: js/file-upload.js:277 js/file-upload.js:293 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 "Eroare"
-#: js/fileactions.js:116
+#: js/fileactions.js:119
msgid "Share"
-msgstr "Partajează"
+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:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
-msgstr "În așteptare"
+msgstr "in timpul"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{new_name} deja exista"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "înlocuire"
-#: js/filelist.js:303
+#: js/filelist.js:416
msgid "suggest name"
msgstr "sugerează nume"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "anulare"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr "{new_name} inlocuit cu {old_name}"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "undo"
msgstr "Anulează ultima acțiune"
-#: js/filelist.js:453
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] "%n director"
+msgstr[1] "%n directoare"
+msgstr[2] "%n directoare"
+
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] "%n fișier"
+msgstr[1] "%n fișiere"
+msgstr[2] "%n fișiere"
+
+#: js/filelist.js:541
+msgid "{dirs} and {files}"
+msgstr "{dirs} și {files}"
+
+#: js/filelist.js:731 js/filelist.js:769
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Se încarcă %n fișier."
+msgstr[1] "Se încarcă %n fișiere."
+msgstr[2] "Se încarcă %n fișiere."
-#: js/filelist.js:518
-msgid "files uploading"
-msgstr "fișiere se încarcă"
-
-#: 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 invalid, '\\', '/', '<', '>', ':', '\"', '|', '?' si '*' nu sunt permise."
+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, nu mai puteti incarca s-au sincroniza alte fisiere."
+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 ({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 ""
+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 "Se pregătește descărcarea. Aceasta poate să dureze ceva timp dacă fișierele sunt mari."
+msgstr "in curs de descarcare. Aceasta poate să dureze ceva timp dacă fișierele sunt mari."
+
+#: js/files.js:507 js/files.js:545
+msgid "Error moving file"
+msgstr "Eroare la mutarea fișierului"
-#: js/files.js:562 templates/index.php:67
+#: js/files.js:558 templates/index.php:61
msgid "Name"
msgstr "Nume"
-#: js/files.js:563 templates/index.php:78
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "Dimensiune"
-#: js/files.js:564 templates/index.php:80
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr "Modificat"
-#: js/files.js:580
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: js/files.js:586
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
#: lib/app.php:73
#, php-format
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"
@@ -248,11 +266,11 @@ msgstr "max. posibil:"
#: templates/admin.php:15
msgid "Needed for multi-file and folder downloads."
-msgstr "Necesar pentru descărcarea mai multor fișiere și a dosarelor"
+msgstr "necesar la descarcarea mai multor liste si fisiere"
#: templates/admin.php:17
msgid "Enable ZIP-download"
-msgstr "Activează descărcare fișiere compresate"
+msgstr "permite descarcarea codurilor ZIP"
#: templates/admin.php:20
msgid "0 is unlimited"
@@ -266,84 +284,68 @@ 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 "Fișier text"
+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 sterge fisiere aici."
+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:73
+#: templates/index.php:67
msgid "Download"
msgstr "Descarcă"
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
-msgstr "Anulare partajare"
+msgstr "Anulare"
-#: templates/index.php:91 templates/index.php:92
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "Șterge"
-#: templates/index.php:105
+#: templates/index.php:100
msgid "Upload too large"
msgstr "Fișierul încărcat este prea mare"
-#: 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 "Fișierul care l-ai încărcat a depășită limita maximă admisă la încărcare pe acest server."
-#: templates/index.php:112
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
-msgstr "Fișierele sunt scanate, te rog așteptă."
+msgstr "Fișierele sunt scanate, asteptati va rog"
-#: templates/index.php:115
+#: templates/index.php:110
msgid "Current scanning"
msgstr "În curs de scanare"
-#: templates/part.list.php:74
-msgid "directory"
-msgstr "catalog"
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr "cataloage"
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr "fișier"
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr "fișiere"
-
#: templates/upgrade.php:2
msgid "Upgrading filesystem cache..."
msgstr "Modernizare fisiere de sistem cache.."
diff --git a/l10n/ro/files_sharing.po b/l10n/ro/files_sharing.po
index 34575f9a246881104342d3be0d9e78613464fd00..e0a966d6e0fe66e8f0e35dc260f30903221e6bd6 100644
--- a/l10n/ro/files_sharing.po
+++ b/l10n/ro/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:01+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"
@@ -64,7 +64,7 @@ msgstr "%s a partajat directorul %s cu tine"
msgid "%s shared the file %s with you"
msgstr "%s a partajat fișierul %s cu tine"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "Descarcă"
@@ -76,6 +76,6 @@ msgstr "Încărcare"
msgid "Cancel upload"
msgstr "Anulează încărcarea"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "Nici o previzualizare disponibilă pentru "
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 2a84e7235cfcaa2a1aa7bc95bbc70125df596302..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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+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"
@@ -49,11 +49,23 @@ msgstr "Utilizatori"
msgid "Admin"
msgstr "Admin"
-#: app.php:837
+#: 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 "Tip fișier necunoscut"
+
+#: avatar.php:69
+msgid "Invalid image"
+msgstr "Imagine invalidă"
+
#: defaults.php:35
msgid "web services under your control"
msgstr "servicii web controlate de tine"
@@ -106,37 +118,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: 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:150
+#: 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:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -153,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"
@@ -265,55 +277,55 @@ msgstr "Serverul de web nu este încă setat corespunzător pentru a permite sin
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Vă rugăm să verificați <a href='%s'>ghiduri de instalare</a>."
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "secunde în urmă"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-msgstr[2] ""
+msgstr[2] "acum %n minute"
-#: template/functions.php:82
+#: 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:83
+#: template/functions.php:99
msgid "today"
msgstr "astăzi"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "ieri"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-msgstr[2] ""
+msgstr[2] "acum %n zile"
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "ultima lună"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "ultimul an"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "ani în urmă"
diff --git a/l10n/ro/settings.po b/l10n/ro/settings.po
index 1e816b50f094ed4977dd1a24843b098027ff2498..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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+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,55 +86,88 @@ msgstr "Nu s-a putut elimina utilizatorul din grupul %s"
msgid "Couldn't update app."
msgstr "Aplicaţia nu s-a putut actualiza."
-#: js/apps.js:35
+#: 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}"
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr "Dezactivați"
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr "Activare"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr "Aşteptaţi vă rog...."
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr "Actualizare în curs...."
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr "Eroare în timpul actualizării aplicaţiei"
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "Eroare"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr "Actualizare"
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr "Actualizat"
-#: js/personal.js:150
+#: 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:172
+#: js/personal.js:287
msgid "Saving..."
msgstr "Se salvează..."
@@ -149,16 +183,16 @@ msgstr "Anulează ultima acțiune"
msgid "Unable to remove user"
msgstr "Imposibil de eliminat utilizatorul"
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "Grupuri"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "Grupul Admin "
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "Șterge"
@@ -178,7 +212,7 @@ msgstr "Eroare la crearea utilizatorului"
msgid "A valid password must be provided"
msgstr "Trebuie să furnizaţi o parolă validă"
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "_language_name_"
@@ -285,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 ""
@@ -344,11 +378,11 @@ msgstr "Mai mult"
msgid "Less"
msgstr "Mai puțin"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "Versiunea"
-#: templates/admin.php:246 templates/personal.php:143
+#: 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 "
@@ -415,7 +449,7 @@ msgstr ""
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Ați utilizat <strong>%s</strong> din <strong>%s</strong> disponibile"
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "Parolă"
@@ -439,7 +473,7 @@ msgstr "Noua parolă"
msgid "Change password"
msgstr "Schimbă parola"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr ""
@@ -455,38 +489,66 @@ msgstr "Adresa ta de email"
msgid "Fill in an email address to enable password recovery"
msgstr "Completează o adresă de mail pentru a-ți putea recupera parola"
-#: templates/personal.php:85 templates/personal.php:86
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr "Imagine de profil"
+
+#: 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 "Înlătură imagine"
+
+#: 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 "Alege drept imagine de profil"
+
+#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
msgstr "Limba"
-#: templates/personal.php:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "Ajută la traducere"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: 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:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "Încriptare"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -512,30 +574,30 @@ msgstr ""
msgid "Default Storage"
msgstr "Stocare implicită"
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr "Nelimitată"
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "Altele"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "Nume utilizator"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr "Stocare"
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
-msgstr ""
+msgstr "schimbă numele afișat"
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
-msgstr ""
+msgstr "setează parolă nouă"
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr "Implicită"
diff --git a/l10n/ro/user_ldap.po b/l10n/ro/user_ldap.po
index db4843a8a903215e685b9183c9feb4da3ff70aa3..e97322cda88a074bc43bdd4ec62a52557f7c90b1 100644
--- a/l10n/ro/user_ldap.po
+++ b/l10n/ro/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\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"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ru/core.po b/l10n/ru/core.po
index 8858c4414898f9b6d7f7ca67bd2e41a99c6f5972..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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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"
@@ -30,30 +33,34 @@ msgstr ""
msgid "%s shared »%s« with you"
msgstr "%s поделился »%s« с вами"
+#: ajax/share.php:227
+msgid "group"
+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."
@@ -94,6 +101,26 @@ msgstr "Нет категорий для удаления."
msgid "Error removing %s from favorites."
msgstr "Ошибка удаления %s из избранного"
+#: 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 "Воскресенье"
@@ -170,63 +197,63 @@ msgstr "Ноябрь"
msgid "December"
msgstr "Декабрь"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "Конфигурация"
-#: js/js.js:812
+#: js/js.js:866
msgid "seconds ago"
msgstr "несколько секунд назад"
-#: js/js.js:813
+#: 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:814
+#: 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:815
+#: js/js.js:869
msgid "today"
msgstr "сегодня"
-#: js/js.js:816
+#: js/js.js:870
msgid "yesterday"
msgstr "вчера"
-#: js/js.js:817
+#: 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:818
+#: js/js.js:872
msgid "last month"
msgstr "в прошлом месяце"
-#: js/js.js:819
+#: 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:820
+#: js/js.js:874
msgid "months ago"
msgstr "несколько месяцев назад"
-#: js/js.js:821
+#: js/js.js:875
msgid "last year"
msgstr "в прошлом году"
-#: js/js.js:822
+#: js/js.js:876
msgid "years ago"
msgstr "несколько лет назад"
@@ -234,22 +261,67 @@ msgstr "несколько лет назад"
msgid "Choose"
msgstr "Выбрать"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
-msgstr "Ошибка при загрузке файла выбора шаблона"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
+msgstr "Ошибка при загрузке шаблона выбора файлов: {error}"
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "Да"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "Нет"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr "Ок"
+#: 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] "{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
msgid "The object type is not specified."
@@ -259,7 +331,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:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "Ошибка"
@@ -279,7 +351,7 @@ msgstr "Общие"
msgid "Share"
msgstr "Открыть доступ"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr "Ошибка при открытии доступа"
@@ -335,67 +407,67 @@ msgstr "Установить срок доступа"
msgid "Expiration date"
msgstr "Дата окончания"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "Поделится через электронную почту:"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "Ни один человек не найден"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "Общий доступ не разрешен"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr "Общий доступ к {item} с {user}"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "Закрыть общий доступ"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "может редактировать"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "контроль доступа"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "создать"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "обновить"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "удалить"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "открыть доступ"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "Защищено паролем"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr "Ошибка при отмене срока доступа"
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr "Ошибка при установке срока доступа"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr "Отправляется ..."
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr "Письмо отправлено"
@@ -410,7 +482,7 @@ msgstr "При обновлении произошла ошибка. Пожал
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Обновление прошло успешно. Перенаправляемся в Ваш ownCloud..."
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr "%s сброс пароля"
@@ -479,7 +551,7 @@ msgstr "Личное"
msgid "Users"
msgstr "Пользователи"
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "Приложения"
@@ -581,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"
@@ -608,14 +680,10 @@ msgstr "Завершить установку"
msgid "%s is available. Get more information on how to update."
msgstr "%s доступно. Получить дополнительную информацию о порядке обновления."
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "Выйти"
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr "Ещё приложения"
-
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "Автоматический вход в систему отключен!"
@@ -630,19 +698,19 @@ msgstr "Если Вы недавно не меняли свой пароль, т
msgid "Please change your password to secure your account again."
msgstr "Пожалуйста, смените пароль, чтобы обезопасить свою учетную запись."
-#: templates/login.php:34
+#: templates/login.php:32
msgid "Lost your password?"
msgstr "Забыли пароль?"
-#: templates/login.php:39
+#: templates/login.php:37
msgid "remember"
msgstr "запомнить"
-#: templates/login.php:41
+#: templates/login.php:39
msgid "Log in"
msgstr "Войти"
-#: templates/login.php:47
+#: templates/login.php:45
msgid "Alternative Logins"
msgstr "Альтернативные имена пользователя"
diff --git a/l10n/ru/files.po b/l10n/ru/files.po
index 50051315f029597d5ba826f3fdbec2706ba13a3d..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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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,160 +81,176 @@ msgstr "Ошибка записи на диск"
msgid "Not enough storage available"
msgstr "Недостаточно доступного места в хранилище"
-#: ajax/upload.php:123
+#: 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
+#: 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: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 "Неправильное имя каталога. Имя 'Shared' зарезервировано."
-#: js/file-upload.js:277 js/file-upload.js:293 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:465
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "Ожидание"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{new_name} уже существует"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "заменить"
-#: js/filelist.js:303
+#: js/filelist.js:416
msgid "suggest name"
msgstr "предложить название"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "отмена"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr "заменено {new_name} на {old_name}"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "undo"
msgstr "отмена"
-#: js/filelist.js:453
+#: 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: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:541
+msgid "{dirs} and {files}"
+msgstr "{dirs} и {files}"
+
+#: 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:518
-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: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 "Изменён"
-#: js/files.js:580
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] "%n папка"
-msgstr[1] "%n папки"
-msgstr[2] "%n папок"
-
-#: js/files.js:586
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] "%n файл"
-msgstr[1] "%n файла"
-msgstr[2] "%n файлов"
-
#: lib/app.php:73
#, php-format
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,84 +286,68 @@ 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: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 "Текущее сканирование"
-#: templates/part.list.php:74
-msgid "directory"
-msgstr "директория"
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr "директории"
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr "файл"
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr "файлы"
-
#: templates/upgrade.php:2
msgid "Upgrading filesystem cache..."
msgstr "Обновление кэша файловой системы..."
diff --git a/l10n/ru/files_sharing.po b/l10n/ru/files_sharing.po
index 5553e3a10ad1e9043379022b310efe90837fbd98..13ded27e566458e29c5128f7f03006aaf0aa3905 100644
--- a/l10n/ru/files_sharing.po
+++ b/l10n/ru/files_sharing.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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:01+0000\n"
"Last-Translator: Den4md <denstarr@mail.md>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
@@ -65,7 +65,7 @@ msgstr "%s открыл доступ к папке %s для Вас"
msgid "%s shared the file %s with you"
msgstr "%s открыл доступ к файлу %s для Вас"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "Скачать"
@@ -77,6 +77,6 @@ msgstr "Загрузка"
msgid "Cancel upload"
msgstr "Отмена загрузки"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "Предпросмотр недоступен для"
diff --git a/l10n/ru/lib.po b/l10n/ru/lib.po
index 70d8b918f39aa177a72be1933e894867db0a71c7..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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+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"
@@ -51,11 +54,23 @@ msgstr "Пользователи"
msgid "Admin"
msgstr "Admin"
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "Не смог обновить \"%s\"."
+#: 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 "веб-сервисы под вашим управлением"
@@ -89,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:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
-msgstr ""
+msgstr "Приложение не имеет файла info.xml"
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
-msgstr ""
+msgstr "Приложение невозможно установить. В нем содержится запрещенный код."
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
-msgstr ""
+msgstr "Приложение невозможно установить. Не совместимо с текущей версией ownCloud."
-#: installer.php:144
+#: 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:150
+#: 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:160
+#: installer.php:162
msgid "App directory already exists"
-msgstr ""
+msgstr "Папка приложения уже существует"
-#: installer.php:173
+#: 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"
@@ -155,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 "Изображения"
@@ -267,55 +282,55 @@ msgstr "Ваш веб сервер до сих пор не настроен пр
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Пожалуйста, дважды просмотрите <a href='%s'>инструкции по установке</a>."
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "несколько секунд назад"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n минута назад"
msgstr[1] "%n минуты назад"
msgstr[2] "%n минут назад"
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n час назад"
msgstr[1] "%n часа назад"
msgstr[2] "%n часов назад"
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "сегодня"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "вчера"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] "%n день назад"
msgstr[1] "%n дня назад"
msgstr[2] "%n дней назад"
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "в прошлом месяце"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n месяц назад"
msgstr[1] "%n месяца назад"
msgstr[2] "%n месяцев назад"
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "в прошлом году"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "несколько лет назад"
diff --git a/l10n/ru/settings.po b/l10n/ru/settings.po
index 2777eaad80fa03ff174d9ad6f9596523e34a0f47..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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-26 07:10+0000\n"
-"Last-Translator: Aleksey Grigoryev <alexvamp@gmail.com>\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,55 +93,88 @@ msgstr "Невозможно удалить пользователя из гру
msgid "Couldn't update app."
msgstr "Невозможно обновить приложение"
-#: js/apps.js:35
+#: 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:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr "Выключить"
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr "Включить"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr "Подождите..."
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
-msgstr ""
+msgstr "Ошибка отключения приложения"
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
-msgstr ""
+msgstr "Ошибка включения приложения"
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr "Обновление..."
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr "Ошибка при обновлении приложения"
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "Ошибка"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr "Обновить"
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr "Обновлено"
-#: js/personal.js:150
+#: 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:172
+#: js/personal.js:287
msgid "Saving..."
msgstr "Сохранение..."
@@ -155,16 +190,16 @@ msgstr "отмена"
msgid "Unable to remove user"
msgstr "Невозможно удалить пользователя"
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: 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:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "Группа Администраторы"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "Удалить"
@@ -184,7 +219,7 @@ msgstr "Ошибка создания пользователя"
msgid "A valid password must be provided"
msgstr "Укажите валидный пароль"
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "Русский "
@@ -350,11 +385,11 @@ msgstr "Больше"
msgid "Less"
msgstr "Меньше"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "Версия"
-#: templates/admin.php:246 templates/personal.php:143
+#: 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 "
@@ -421,7 +456,7 @@ msgstr "Показать помощник настройки"
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Вы использовали <strong>%s</strong> из доступных <strong>%s</strong>"
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "Пароль"
@@ -445,7 +480,7 @@ msgstr "Новый пароль"
msgid "Change password"
msgstr "Сменить пароль"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr "Отображаемое имя"
@@ -461,40 +496,68 @@ msgstr "Ваш адрес электронной почты"
msgid "Fill in an email address to enable password recovery"
msgstr "Введите адрес электронной почты чтобы появилась возможность восстановления пароля"
-#: templates/personal.php:85 templates/personal.php:86
+#: 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 "Либо png, либо jpg. Изображение должно быть квадратным, но вы сможете обрезать его позже."
+
+#: 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:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "Помочь с переводом"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: 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 "Используйте этот адрес чтобы получить доступ к вашим файлам через WebDav - <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">"
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "Шифрование"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
-msgstr ""
+msgstr "Приложение шифрования не активно, отмените шифрование всех ваших файлов."
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
-msgstr ""
+msgstr "Пароль входа"
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
-msgstr ""
+msgstr "Снять шифрование со всех файлов"
#: templates/users.php:21
msgid "Login Name"
@@ -518,30 +581,30 @@ msgstr "Введите пароль для того, чтобы восстано
msgid "Default Storage"
msgstr "Хранилище по-умолчанию"
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr "Неограниченно"
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "Другое"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "Имя пользователя"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr "Хранилище"
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr "изменить отображаемое имя"
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr "установить новый пароль"
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr "По умолчанию"
diff --git a/l10n/ru/user_ldap.po b/l10n/ru/user_ldap.po
index f47972aa0b7637e661c1d40c1d097c1bde09104f..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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+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 c5c0acad459df2af4e960577b57beb35f5ed968a..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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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"
@@ -22,6 +22,10 @@ msgstr ""
msgid "%s shared »%s« with you"
msgstr ""
+#: ajax/share.php:227
+msgid "group"
+msgstr "කණ්ඩායම"
+
#: ajax/update.php:11
msgid "Turned on maintenance mode"
msgstr ""
@@ -86,6 +90,26 @@ msgstr "මකා දැමීම සඳහා ප්රවර්ගයන්
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 "ඉරිදා"
@@ -162,59 +186,59 @@ msgstr "නොවැම්බර්"
msgid "December"
msgstr "දෙසැම්බර්"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "සිටුවම්"
-#: js/js.js:812
+#: js/js.js:866
msgid "seconds ago"
msgstr "තත්පරයන්ට පෙර"
-#: js/js.js:813
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:814
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:815
+#: js/js.js:869
msgid "today"
msgstr "අද"
-#: js/js.js:816
+#: js/js.js:870
msgid "yesterday"
msgstr "ඊයේ"
-#: js/js.js:817
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:818
+#: js/js.js:872
msgid "last month"
msgstr "පෙර මාසයේ"
-#: js/js.js:819
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:820
+#: js/js.js:874
msgid "months ago"
msgstr "මාස කීපයකට පෙර"
-#: js/js.js:821
+#: js/js.js:875
msgid "last year"
msgstr "පෙර අවුරුද්දේ"
-#: js/js.js:822
+#: js/js.js:876
msgid "years ago"
msgstr "අවුරුදු කීපයකට පෙර"
@@ -222,22 +246,66 @@ msgstr "අවුරුදු කීපයකට පෙර"
msgid "Choose"
msgstr "තෝරන්න"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "ඔව්"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "එපා"
-#: js/oc-dialogs.js:195
+#: 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."
@@ -247,7 +315,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:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "දෝෂයක්"
@@ -267,7 +335,7 @@ msgstr ""
msgid "Share"
msgstr "බෙදා හදා ගන්න"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr ""
@@ -323,67 +391,67 @@ msgstr "කල් ඉකුත් විමේ දිනය දමන්න"
msgid "Expiration date"
msgstr "කල් ඉකුත් විමේ දිනය"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "විද්යුත් තැපෑල මඟින් බෙදාගන්න: "
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr ""
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "නොබෙදු"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "සංස්කරණය කළ හැක"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "ප්රවේශ පාලනය"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "සදන්න"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "යාවත්කාලීන කරන්න"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "මකන්න"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "බෙදාහදාගන්න"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "මුර පදයකින් ආරක්ශාකර ඇත"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr "කල් ඉකුත් දිනය ඉවත් කිරීමේ දෝෂයක්"
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr "කල් ඉකුත් දිනය ස්ථාපනය කිරීමේ දෝෂයක්"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr ""
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr ""
@@ -398,7 +466,7 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr ""
@@ -467,7 +535,7 @@ msgstr "පෞද්ගලික"
msgid "Users"
msgstr "පරිශීලකයන්"
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "යෙදුම්"
@@ -596,14 +664,10 @@ msgstr "ස්ථාපනය කිරීම අවසන් කරන්න"
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "නික්මීම"
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr ""
@@ -618,19 +682,19 @@ msgstr ""
msgid "Please change your password to secure your account again."
msgstr ""
-#: templates/login.php:34
+#: templates/login.php:32
msgid "Lost your password?"
msgstr "මුරපදය අමතකද?"
-#: templates/login.php:39
+#: templates/login.php:37
msgid "remember"
msgstr "මතක තබාගන්න"
-#: templates/login.php:41
+#: templates/login.php:39
msgid "Log in"
msgstr "ප්රවේශවන්න"
-#: templates/login.php:47
+#: templates/login.php:45
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/si_LK/files.po b/l10n/si_LK/files.po
index eaf1115c621267d29b9f328a94dd295b5e0363a8..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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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,7 +74,15 @@ msgstr "තැටිගත කිරීම අසාර්ථකයි"
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:123
+#: 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 ""
@@ -82,149 +90,157 @@ 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: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:277 js/file-upload.js:293 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:465
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr ""
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr ""
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "ප්රතිස්ථාපනය කරන්න"
-#: js/filelist.js:303
+#: js/filelist.js:416
msgid "suggest name"
msgstr "නමක් යෝජනා කරන්න"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "අත් හරින්න"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr ""
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "undo"
msgstr "නිෂ්ප්රභ කරන්න"
-#: js/filelist.js:453
-msgid "Uploading %n file"
-msgid_plural "Uploading %n files"
+#: 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:518
-msgid "files uploading"
+#: 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/files.js:52
+#: 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: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 "වෙනස් කළ"
-#: js/files.js:580
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/files.js:586
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-
#: lib/app.php:73
#, php-format
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 "උඩුගත කරන්න"
@@ -260,84 +276,68 @@ 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: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 "වර්තමාන පරික්ෂාව"
-#: templates/part.list.php:74
-msgid "directory"
-msgstr ""
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr ""
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr "ගොනුව"
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr "ගොනු"
-
#: templates/upgrade.php:2
msgid "Upgrading filesystem cache..."
msgstr ""
diff --git a/l10n/si_LK/files_sharing.po b/l10n/si_LK/files_sharing.po
index b281c905bc236514f08d99df85e834f711d1f680..c09a00ba7075c57e22443824072611a5a88498fa 100644
--- a/l10n/si_LK/files_sharing.po
+++ b/l10n/si_LK/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00: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"
@@ -63,7 +63,7 @@ msgstr "%s ඔබව %s ෆෝල්ඩරයට හවුල් කරගත්
msgid "%s shared the file %s with you"
msgstr "%s ඔබ සමඟ %s ගොනුව බෙදාහදාගත්තේය"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "බාන්න"
@@ -75,6 +75,6 @@ msgstr "උඩුගත කරන්න"
msgid "Cancel upload"
msgstr "උඩුගත කිරීම අත් හරින්න"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "පූර්වදර්ශනයක් නොමැත"
diff --git a/l10n/si_LK/lib.po b/l10n/si_LK/lib.po
index ef707dcafd0bdafaabe9a9148a259b48779199d0..befb81f4fa0d481f911a1da248b7c320002bb8ea 100644
--- a/l10n/si_LK/lib.po
+++ b/l10n/si_LK/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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\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"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
"MIME-Version: 1.0\n"
@@ -48,11 +48,23 @@ msgstr "පරිශීලකයන්"
msgid "Admin"
msgstr "පරිපාලක"
-#: app.php:837
+#: 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 "ඔබට පාලනය කළ හැකි වෙබ් සේවාවන්"
@@ -105,37 +117,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: 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:150
+#: 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:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -264,51 +276,51 @@ msgstr ""
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "තත්පරයන්ට පෙර"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "අද"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "ඊයේ"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "පෙර මාසයේ"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "පෙර අවුරුද්දේ"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "අවුරුදු කීපයකට පෙර"
diff --git a/l10n/si_LK/settings.po b/l10n/si_LK/settings.po
index 0aaa56ad95d04db9a65cf2df5e2e5c0abb9fa270..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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+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,55 +84,88 @@ msgstr "පරිශීලකයා %s කණ්ඩායමින් ඉවත
msgid "Couldn't update app."
msgstr ""
-#: js/apps.js:35
+#: 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:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr "අක්රිය කරන්න"
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr "සක්රිය කරන්න"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr ""
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "දෝෂයක්"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr "යාවත්කාල කිරීම"
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr ""
-#: js/personal.js:150
+#: 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:172
+#: js/personal.js:287
msgid "Saving..."
msgstr "සුරැකෙමින් පවතී..."
@@ -148,16 +181,16 @@ msgstr "නිෂ්ප්රභ කරන්න"
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: 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:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "කාණ්ඩ පරිපාලක"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "මකා දමන්න"
@@ -177,7 +210,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr ""
@@ -343,11 +376,11 @@ msgstr "වැඩි"
msgid "Less"
msgstr "අඩු"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr ""
-#: templates/admin.php:246 templates/personal.php:143
+#: 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 "
@@ -414,7 +447,7 @@ msgstr ""
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:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "මුර පදය"
@@ -438,7 +471,7 @@ msgstr "නව මුරපදය"
msgid "Change password"
msgstr "මුරපදය වෙනස් කිරීම"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr ""
@@ -454,38 +487,66 @@ msgstr "ඔබගේ විද්යුත් තැපෑල"
msgid "Fill in an email address to enable password recovery"
msgstr "මුරපද ප්රතිස්ථාපනය සඳහා විද්යුත් තැපැල් විස්තර ලබා දෙන්න"
-#: templates/personal.php:85 templates/personal.php:86
+#: 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:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "පරිවර්ථන සහය"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:106
+#: 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:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "ගුප්ත කේතනය"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -511,30 +572,30 @@ msgstr ""
msgid "Default Storage"
msgstr ""
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr ""
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "වෙනත්"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "පරිශීලක නම"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr ""
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr ""
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr ""
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr ""
diff --git a/l10n/si_LK/user_ldap.po b/l10n/si_LK/user_ldap.po
index d45dc54134082e738a8f06d1767ee3533e5a4779..9628a98779c7e89c383a82a6ef6c12636454076a 100644
--- a/l10n/si_LK/user_ldap.po
+++ b/l10n/si_LK/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\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"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sk/core.po b/l10n/sk/core.po
index 66e30ab46ba1123b7085405f751b4a76a6b06851..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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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"
@@ -22,6 +22,10 @@ msgstr ""
msgid "%s shared »%s« with you"
msgstr ""
+#: ajax/share.php:227
+msgid "group"
+msgstr ""
+
#: ajax/update.php:11
msgid "Turned on maintenance mode"
msgstr ""
@@ -86,6 +90,26 @@ msgstr ""
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 ""
@@ -162,63 +186,63 @@ msgstr ""
msgid "December"
msgstr ""
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr ""
-#: js/js.js:812
+#: js/js.js:866
msgid "seconds ago"
msgstr ""
-#: js/js.js:813
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:814
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:815
+#: js/js.js:869
msgid "today"
msgstr ""
-#: js/js.js:816
+#: js/js.js:870
msgid "yesterday"
msgstr ""
-#: js/js.js:817
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:818
+#: js/js.js:872
msgid "last month"
msgstr ""
-#: js/js.js:819
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:820
+#: js/js.js:874
msgid "months ago"
msgstr ""
-#: js/js.js:821
+#: js/js.js:875
msgid "last year"
msgstr ""
-#: js/js.js:822
+#: js/js.js:876
msgid "years ago"
msgstr ""
@@ -226,22 +250,67 @@ msgstr ""
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:195
+#: 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] ""
+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."
@@ -251,7 +320,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:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr ""
@@ -271,7 +340,7 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr ""
@@ -327,67 +396,67 @@ msgstr ""
msgid "Expiration date"
msgstr ""
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr ""
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr ""
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr ""
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr ""
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr ""
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr ""
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr ""
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr ""
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr ""
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr ""
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr ""
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr ""
@@ -402,7 +471,7 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr ""
@@ -471,7 +540,7 @@ msgstr ""
msgid "Users"
msgstr ""
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr ""
@@ -600,14 +669,10 @@ msgstr ""
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr ""
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr ""
@@ -622,19 +687,19 @@ msgstr ""
msgid "Please change your password to secure your account again."
msgstr ""
-#: templates/login.php:34
+#: templates/login.php:32
msgid "Lost your password?"
msgstr ""
-#: templates/login.php:39
+#: templates/login.php:37
msgid "remember"
msgstr ""
-#: templates/login.php:41
+#: templates/login.php:39
msgid "Log in"
msgstr ""
-#: templates/login.php:47
+#: templates/login.php:45
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/sk/files.po b/l10n/sk/files.po
index 42edcfa625bad690b524d2a296430499b6a35dc1..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-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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,7 +74,15 @@ msgstr ""
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:123
+#: 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 ""
@@ -82,152 +90,160 @@ 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: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:277 js/file-upload.js:293 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:465
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr ""
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr ""
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr ""
-#: js/filelist.js:303
+#: js/filelist.js:416
msgid "suggest name"
msgstr ""
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr ""
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr ""
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "undo"
msgstr ""
-#: js/filelist.js:453
-msgid "Uploading %n file"
-msgid_plural "Uploading %n files"
+#: 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:518
-msgid "files uploading"
+#: 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:541
+msgid "{dirs} and {files}"
msgstr ""
-#: js/files.js:52
+#: js/filelist.js:731 js/filelist.js:769
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: 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 ""
-#: js/files.js:580
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: js/files.js:586
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
#: lib/app.php:73
#, php-format
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 ""
@@ -263,84 +279,68 @@ 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 ""
-#: templates/part.list.php:74
-msgid "directory"
-msgstr ""
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr ""
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr ""
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr ""
-
#: templates/upgrade.php:2
msgid "Upgrading filesystem cache..."
msgstr ""
diff --git a/l10n/sk/lib.po b/l10n/sk/lib.po
index a2deec2de35d029bc43314a8c283b1198a2a1427..27f317215a56ae049443eba77b4b7b760179e751 100644
--- a/l10n/sk/lib.po
+++ b/l10n/sk/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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\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"
"Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
"MIME-Version: 1.0\n"
@@ -48,11 +48,23 @@ msgstr ""
msgid "Admin"
msgstr ""
-#: app.php:837
+#: 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 ""
@@ -105,37 +117,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: 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:150
+#: 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:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -264,55 +276,55 @@ msgstr ""
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr ""
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr ""
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr ""
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr ""
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr ""
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr ""
diff --git a/l10n/sk/settings.po b/l10n/sk/settings.po
index a5b82a490e7b1537656ed7aded47dbf75bfc9bd0..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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+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,55 +84,88 @@ msgstr ""
msgid "Couldn't update app."
msgstr ""
-#: js/apps.js:35
+#: 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:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr ""
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr ""
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr ""
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr ""
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr ""
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr ""
-#: js/personal.js:150
+#: 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:172
+#: js/personal.js:287
msgid "Saving..."
msgstr ""
@@ -148,16 +181,16 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: 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:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr ""
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr ""
@@ -177,7 +210,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr ""
@@ -343,11 +376,11 @@ msgstr ""
msgid "Less"
msgstr ""
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr ""
-#: templates/admin.php:246 templates/personal.php:143
+#: 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 "
@@ -414,7 +447,7 @@ msgstr ""
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:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr ""
@@ -438,7 +471,7 @@ msgstr ""
msgid "Change password"
msgstr ""
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr ""
@@ -454,38 +487,66 @@ msgstr ""
msgid "Fill in an email address to enable password recovery"
msgstr ""
-#: templates/personal.php:85 templates/personal.php:86
-msgid "Language"
+#: 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:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:106
+#: 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:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr ""
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -511,30 +572,30 @@ msgstr ""
msgid "Default Storage"
msgstr ""
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr ""
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr ""
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr ""
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr ""
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr ""
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr ""
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr ""
diff --git a/l10n/sk_SK/core.po b/l10n/sk_SK/core.po
index cd5b6a9b34ad6b633660e4a5e834c3642ea4d93d..7c9758b4cc8ad3929153bfbf60a2aa839594f321 100644
--- a/l10n/sk_SK/core.po
+++ b/l10n/sk_SK/core.po
@@ -4,12 +4,13 @@
#
# Translators:
# mhh <marian.hvolka@stuba.sk>, 2013
+# martin, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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"
@@ -23,30 +24,34 @@ msgstr ""
msgid "%s shared »%s« with you"
msgstr "%s s Vami zdieľa »%s«"
+#: ajax/share.php:227
+msgid "group"
+msgstr "skupina"
+
#: ajax/update.php:11
msgid "Turned on maintenance mode"
-msgstr ""
+msgstr "Mód údržby zapnutý"
#: ajax/update.php:14
msgid "Turned off maintenance mode"
-msgstr ""
+msgstr "Mód údržby vypnutý"
#: ajax/update.php:17
msgid "Updated database"
-msgstr ""
+msgstr "Databáza aktualizovaná"
#: ajax/update.php:20
msgid "Updating filecache, this may take really long..."
-msgstr ""
+msgstr "Aktualizácia \"filecache\", toto môže trvať dlhšie..."
#: ajax/update.php:23
msgid "Updated filecache"
-msgstr ""
+msgstr "\"Filecache\" aktualizovaná"
#: ajax/update.php:26
#, php-format
msgid "... %d%% done ..."
-msgstr ""
+msgstr "... %d%% dokončených ..."
#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
msgid "Category type not provided."
@@ -87,6 +92,26 @@ msgstr "Neboli vybrané žiadne kategórie pre odstránenie."
msgid "Error removing %s from favorites."
msgstr "Chyba pri odstraňovaní %s z obľúbených položiek."
+#: 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 "Nedeľa"
@@ -163,63 +188,63 @@ msgstr "November"
msgid "December"
msgstr "December"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "Nastavenia"
-#: js/js.js:812
+#: js/js.js:866
msgid "seconds ago"
msgstr "pred sekundami"
-#: js/js.js:813
+#: 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:814
+#: 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:815
+#: js/js.js:869
msgid "today"
msgstr "dnes"
-#: js/js.js:816
+#: js/js.js:870
msgid "yesterday"
msgstr "včera"
-#: js/js.js:817
+#: 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:818
+#: js/js.js:872
msgid "last month"
msgstr "minulý mesiac"
-#: js/js.js:819
+#: 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:820
+#: js/js.js:874
msgid "months ago"
msgstr "pred mesiacmi"
-#: js/js.js:821
+#: js/js.js:875
msgid "last year"
msgstr "minulý rok"
-#: js/js.js:822
+#: js/js.js:876
msgid "years ago"
msgstr "pred rokmi"
@@ -227,22 +252,67 @@ msgstr "pred rokmi"
msgid "Choose"
msgstr "Výber"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
-msgstr "Chyba pri načítaní šablóny výberu súborov"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
+msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "Áno"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "Nie"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
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 "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."
@@ -252,7 +322,7 @@ msgstr "Nešpecifikovaný typ objektu."
#: 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:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "Chyba"
@@ -272,7 +342,7 @@ msgstr "Zdieľané"
msgid "Share"
msgstr "Zdieľať"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr "Chyba počas zdieľania"
@@ -328,67 +398,67 @@ msgstr "Nastaviť dátum expirácie"
msgid "Expiration date"
msgstr "Dátum expirácie"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "Zdieľať cez e-mail:"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "Používateľ nenájdený"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "Zdieľanie už zdieľanej položky nie je povolené"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr "Zdieľané v {item} s {user}"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "Zrušiť zdieľanie"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "môže upraviť"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "prístupové práva"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "vytvoriť"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "aktualizovať"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "vymazať"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "zdieľať"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "Chránené heslom"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr "Chyba pri odstraňovaní dátumu expirácie"
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr "Chyba pri nastavení dátumu expirácie"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr "Odosielam ..."
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr "Email odoslaný"
@@ -403,7 +473,7 @@ msgstr "Aktualizácia nebola úspešná. Problém nahláste na <a href=\"https:/
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Aktualizácia bola úspešná. Presmerovávam na prihlasovaciu stránku."
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr "reset hesla %s"
@@ -472,7 +542,7 @@ msgstr "Osobné"
msgid "Users"
msgstr "Používatelia"
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "Aplikácie"
@@ -601,14 +671,10 @@ msgstr "Dokončiť inštaláciu"
msgid "%s is available. Get more information on how to update."
msgstr "%s je dostupná. Získajte viac informácií k postupu aktualizáce."
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "Odhlásiť"
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr "Viac aplikácií"
-
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "Automatické prihlásenie bolo zamietnuté!"
@@ -623,19 +689,19 @@ msgstr "V nedávnej dobe ste nezmenili svoje heslo, Váš účet môže byť kom
msgid "Please change your password to secure your account again."
msgstr "Prosím, zmeňte svoje heslo pre opätovné zabezpečenie Vášho účtu"
-#: templates/login.php:34
+#: templates/login.php:32
msgid "Lost your password?"
msgstr "Zabudli ste heslo?"
-#: templates/login.php:39
+#: templates/login.php:37
msgid "remember"
msgstr "zapamätať"
-#: templates/login.php:41
+#: templates/login.php:39
msgid "Log in"
msgstr "Prihlásiť sa"
-#: templates/login.php:47
+#: templates/login.php:45
msgid "Alternative Logins"
msgstr "Alternatívne prihlasovanie"
diff --git a/l10n/sk_SK/files.po b/l10n/sk_SK/files.po
index 82282ef230f698107d039b098619042333121f44..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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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,7 +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:123
+#: 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 "Neplatný priečinok."
@@ -83,152 +91,160 @@ 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: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 "Opustenie stránky zruší práve prebiehajúce odosielanie súboru."
-#: js/file-upload.js:241
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr "URL nemôže byť prázdne."
-#: 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 "Neplatný názov priečinka. Názov \"Shared\" je rezervovaný pre ownCloud"
-#: js/file-upload.js:277 js/file-upload.js:293 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 "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:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "Prebieha"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{new_name} už existuje"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "nahradiť"
-#: js/filelist.js:303
+#: js/filelist.js:416
msgid "suggest name"
msgstr "pomôcť s menom"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "zrušiť"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr "prepísaný {new_name} súborom {old_name}"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "undo"
msgstr "vrátiť"
-#: js/filelist.js:453
+#: 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: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: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] "Nahrávam %n súbor"
msgstr[1] "Nahrávam %n súbory"
msgstr[2] "Nahrávam %n súborov"
-#: js/filelist.js:518
-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: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 "Názov"
-#: js/files.js:563 templates/index.php:78
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "Veľkosť"
-#: js/files.js:564 templates/index.php:80
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr "Upravené"
-#: js/files.js:580
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] "%n priečinok"
-msgstr[1] "%n priečinky"
-msgstr[2] "%n priečinkov"
-
-#: js/files.js:586
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] "%n súbor"
-msgstr[1] "%n súbory"
-msgstr[2] "%n súborov"
-
#: lib/app.php:73
#, php-format
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ť"
@@ -264,84 +280,68 @@ 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:73
+#: templates/index.php:67
msgid "Download"
msgstr "Sťahovanie"
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr "Zrušiť zdieľanie"
-#: templates/index.php:91 templates/index.php:92
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "Zmazať"
-#: templates/index.php:105
+#: templates/index.php:100
msgid "Upload too large"
msgstr "Nahrávanie je príliš veľké"
-#: 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 "Súbory, ktoré sa snažíte nahrať, presahujú maximálnu veľkosť pre nahratie súborov na tento server."
-#: templates/index.php:112
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr "Čakajte, súbory sú prehľadávané."
-#: templates/index.php:115
+#: templates/index.php:110
msgid "Current scanning"
msgstr "Práve prezerané"
-#: templates/part.list.php:74
-msgid "directory"
-msgstr "priečinok"
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr "priečinky"
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr "súbor"
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr "súbory"
-
#: templates/upgrade.php:2
msgid "Upgrading filesystem cache..."
msgstr "Aktualizujem medzipamäť súborového systému..."
diff --git a/l10n/sk_SK/files_encryption.po b/l10n/sk_SK/files_encryption.po
index 40a9ba181d6d4f486604cc35a839d594c9218327..7353664590fef4d6f53816798214a162fed5c755 100644
--- a/l10n/sk_SK/files_encryption.po
+++ b/l10n/sk_SK/files_encryption.po
@@ -4,13 +4,14 @@
#
# Translators:
# mhh <marian.hvolka@stuba.sk>, 2013
+# martin, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-21 08:10-0400\n"
-"PO-Revision-Date: 2013-08-19 19:20+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-30 09:31-0400\n"
+"PO-Revision-Date: 2013-08-28 18:40+0000\n"
+"Last-Translator: martin\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -60,22 +61,22 @@ msgid ""
"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 ""
+msgstr "Váš privátny kľúč je nesprávny! Pravdepodobne bolo zmenené vaše heslo mimo systému ownCloud (napr. váš korporátny adresár). Môžte aktualizovať vaše heslo privátneho kľúča v osobných nastaveniach za účelom obnovenia prístupu k zašifrovaným súborom."
#: hooks/hooks.php:41
msgid "Missing requirements."
-msgstr ""
+msgstr "Chýbajúce požiadavky."
#: hooks/hooks.php:42
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 ""
+msgstr "Prosím uistite sa, že PHP verzie 5.3.3 alebo novšej je nainštalované a tiež, že OpenSSL knižnica spolu z PHP rozšírením je povolená a konfigurovaná správne. Nateraz bola aplikácia šifrovania zablokovaná."
#: hooks/hooks.php:249
msgid "Following users are not set up for encryption:"
-msgstr ""
+msgstr "Nasledujúci používatelia nie sú nastavení pre šifrovanie:"
#: js/settings-admin.js:11
msgid "Saving..."
@@ -89,7 +90,7 @@ msgstr "Váš súkromný kľúč je neplatný. Možno bolo Vaše heslo zmenené
#: templates/invalid_private_key.php:7
msgid "You can unlock your private key in your "
-msgstr ""
+msgstr "Môžte odomknúť váš privátny kľúč v"
#: templates/invalid_private_key.php:7
msgid "personal settings"
@@ -102,11 +103,11 @@ msgstr "Šifrovanie"
#: templates/settings-admin.php:10
msgid ""
"Enable recovery key (allow to recover users files in case of password loss):"
-msgstr ""
+msgstr "Povoliť obnovovací kľúč (umožňuje obnoviť používateľské súbory v prípade straty hesla):"
#: templates/settings-admin.php:14
msgid "Recovery key password"
-msgstr ""
+msgstr "Heslo obnovovacieho kľúča"
#: templates/settings-admin.php:21 templates/settings-personal.php:54
msgid "Enabled"
@@ -118,15 +119,15 @@ msgstr "Zakázané"
#: templates/settings-admin.php:34
msgid "Change recovery key password:"
-msgstr ""
+msgstr "Zmeniť heslo obnovovacieho kľúča:"
#: templates/settings-admin.php:41
msgid "Old Recovery key password"
-msgstr ""
+msgstr "Staré heslo obnovovacieho kľúča"
#: templates/settings-admin.php:48
msgid "New Recovery key password"
-msgstr ""
+msgstr "Nové heslo obnovovacieho kľúča"
#: templates/settings-admin.php:53
msgid "Change Password"
diff --git a/l10n/sk_SK/files_sharing.po b/l10n/sk_SK/files_sharing.po
index 1a88ff07b4c02830c5450da1321b43b429c4917e..8d7b07737fe0d20e97f614ab8927fb9039e1021b 100644
--- a/l10n/sk_SK/files_sharing.po
+++ b/l10n/sk_SK/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:01+0000\n"
"Last-Translator: mhh <marian.hvolka@stuba.sk>\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
@@ -64,7 +64,7 @@ msgstr "%s zdieľa s vami priečinok %s"
msgid "%s shared the file %s with you"
msgstr "%s zdieľa s vami súbor %s"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "Sťahovanie"
@@ -76,6 +76,6 @@ msgstr "Odoslať"
msgid "Cancel upload"
msgstr "Zrušiť odosielanie"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "Žiaden náhľad k dispozícii pre"
diff --git a/l10n/sk_SK/lib.po b/l10n/sk_SK/lib.po
index b40d282cddc71ce949a87b8c3b4d8c06ede7ed35..8d4dc2dc8911717c37e6d489bc06b1d3a47a2963 100644
--- a/l10n/sk_SK/lib.po
+++ b/l10n/sk_SK/lib.po
@@ -4,12 +4,13 @@
#
# Translators:
# mhh <marian.hvolka@stuba.sk>, 2013
+# martin, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\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"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
@@ -23,11 +24,11 @@ msgstr ""
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
-msgstr ""
+msgstr "Aplikácia \"%s\" nemôže byť nainštalovaná kvôli nekompatibilite z danou verziou ownCloudu."
#: app.php:250
msgid "No app name specified"
-msgstr ""
+msgstr "Nešpecifikované meno aplikácie"
#: app.php:361
msgid "Help"
@@ -49,11 +50,23 @@ msgstr "Používatelia"
msgid "Admin"
msgstr "Administrátor"
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "Zlyhala aktualizácia \"%s\"."
+#: 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 "webové služby pod Vašou kontrolou"
@@ -87,59 +100,59 @@ msgstr "Stiahnite súbory po menších častiach, samostatne, alebo sa obráťte
#: installer.php:63
msgid "No source specified when installing app"
-msgstr ""
+msgstr "Nešpecifikovaný zdroj pri inštalácii aplikácie"
#: installer.php:70
msgid "No href specified when installing app from http"
-msgstr ""
+msgstr "Nešpecifikovaný atribút \"href\" pri inštalácii aplikácie pomocou protokolu \"http\""
#: installer.php:75
msgid "No path specified when installing app from local file"
-msgstr ""
+msgstr "Nešpecifikovaná cesta pri inštalácii aplikácie z lokálneho súboru"
#: installer.php:89
#, php-format
msgid "Archives of type %s are not supported"
-msgstr ""
+msgstr "Typ archívu %s nie je podporovaný"
#: installer.php:103
msgid "Failed to open archive when installing app"
-msgstr ""
+msgstr "Zlyhanie pri otváraní archívu počas inštalácie aplikácie"
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
-msgstr ""
+msgstr "Aplikácia neposkytuje súbor info.xml"
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
-msgstr ""
+msgstr "Aplikácia nemôže byť inštalovaná pre nepovolený kód v aplikácii"
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
-msgstr ""
+msgstr "Aplikácia nemôže byť inštalovaná pre nekompatibilitu z danou verziou ownCloudu"
-#: installer.php:144
+#: 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 "Aplikácia nemôže byť inštalovaná pretože obsahuje <shipped>pravý</shipped> štítok, ktorý nie je povolený pre zaslané \"shipped\" aplikácie"
-#: installer.php:150
+#: 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 "Aplikácia nemôže byť inštalovaná pretože verzia v info.xml/version nezodpovedá verzii špecifikovanej v aplikačnom obchode"
-#: installer.php:160
+#: installer.php:162
msgid "App directory already exists"
-msgstr ""
+msgstr "Aplikačný adresár už existuje"
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
-msgstr ""
+msgstr "Nemožno vytvoriť aplikačný priečinok. Prosím upravte povolenia. %s"
#: json.php:28
msgid "Application is not enabled"
@@ -265,55 +278,55 @@ msgstr "Váš webový server nie je správne nastavený na synchronizáciu, pret
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Prosím skontrolujte <a href='%s'>inštalačnú príručku</a>."
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "pred sekundami"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] "pred %n minútami"
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] "pred %n hodinami"
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "dnes"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "včera"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] "pred %n dňami"
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "minulý mesiac"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] "pred %n mesiacmi"
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "minulý rok"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "pred rokmi"
diff --git a/l10n/sk_SK/settings.po b/l10n/sk_SK/settings.po
index 456e726abfd23f308cccc84a3c93e35e4e90ef5b..961d19a242b52b4679a126964a6ed9326713bbd5 100644
--- a/l10n/sk_SK/settings.po
+++ b/l10n/sk_SK/settings.po
@@ -4,12 +4,13 @@
#
# Translators:
# mhh <marian.hvolka@stuba.sk>, 2013
+# martin, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+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"
@@ -23,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"
@@ -85,55 +86,88 @@ msgstr "Nie je možné odstrániť používateľa zo skupiny %s"
msgid "Couldn't update app."
msgstr "Nemožno aktualizovať aplikáciu."
-#: js/apps.js:35
+#: 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}"
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr "Zakázať"
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr "Zapnúť"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr "Čakajte prosím..."
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
-msgstr ""
+msgstr "Chyba pri zablokovaní aplikácie"
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
-msgstr ""
+msgstr "Chyba pri povoľovaní aplikácie"
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr "Aktualizujem..."
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr "chyba pri aktualizácii aplikácie"
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "Chyba"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr "Aktualizovať"
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr "Aktualizované"
-#: js/personal.js:150
+#: 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 "Dešifrujem súbory ... Počkajte prosím, môže to chvíľu trvať."
-#: js/personal.js:172
+#: js/personal.js:287
msgid "Saving..."
msgstr "Ukladám..."
@@ -149,16 +183,16 @@ msgstr "vrátiť"
msgid "Unable to remove user"
msgstr "Nemožno odobrať používateľa"
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "Skupiny"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "Správca skupiny"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "Zmazať"
@@ -178,7 +212,7 @@ msgstr "Chyba pri vytváraní používateľa"
msgid "A valid password must be provided"
msgstr "Musíte zadať platné heslo"
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "Slovensky"
@@ -344,11 +378,11 @@ msgstr "Viac"
msgid "Less"
msgstr "Menej"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "Verzia"
-#: templates/admin.php:246 templates/personal.php:143
+#: 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 "
@@ -415,7 +449,7 @@ msgstr "Znovu zobraziť sprievodcu prvým spustením"
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Použili ste <strong>%s</strong> z <strong>%s</strong> dostupných "
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "Heslo"
@@ -439,7 +473,7 @@ msgstr "Nové heslo"
msgid "Change password"
msgstr "Zmeniť heslo"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr "Zobrazované meno"
@@ -455,38 +489,66 @@ msgstr "Vaša emailová adresa"
msgid "Fill in an email address to enable password recovery"
msgstr "Vyplňte emailovú adresu pre aktivovanie obnovy hesla"
-#: templates/personal.php:85 templates/personal.php:86
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr "Profilová fotka"
+
+#: 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 "Jazyk"
-#: templates/personal.php:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "Pomôcť s prekladom"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: 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 "Použite túto adresu <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">pre prístup k súborom cez WebDAV</a>"
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "Šifrovanie"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
-msgstr ""
+msgstr "Šifrovacia aplikácia nie je povolená, dešifrujte všetky vaše súbory"
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr "Prihlasovacie heslo"
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr "Dešifrovať všetky súbory"
@@ -512,30 +574,30 @@ msgstr "Zadajte heslo pre obnovenie súborov používateľa pri zmene hesla"
msgid "Default Storage"
msgstr "Predvolené úložisko"
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr "Nelimitované"
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "Iné"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "Meno používateľa"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr "Úložisko"
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr "zmeniť zobrazované meno"
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr "nastaviť nové heslo"
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr "Predvolené"
diff --git a/l10n/sk_SK/user_ldap.po b/l10n/sk_SK/user_ldap.po
index 0c495d4dbcc64e0903ad25001eac23325499e33f..4c4d7f82839074f8218ca6deddcecd84f25e34e3 100644
--- a/l10n/sk_SK/user_ldap.po
+++ b/l10n/sk_SK/user_ldap.po
@@ -4,13 +4,14 @@
#
# Translators:
# mhh <marian.hvolka@stuba.sk>, 2013
+# martin, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-05 11:51+0000\n"
+"Last-Translator: martin\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -156,7 +157,7 @@ msgstr "Filter prihlásenia používateľov"
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action. Example: \"uid=%%uid\""
-msgstr ""
+msgstr "Určuje použitý filter, pri pokuse o prihlásenie. %%uid nahradzuje používateľské meno v činnosti prihlásenia. Napríklad: \"uid=%%uid\""
#: templates/settings.php:55
msgid "User List Filter"
@@ -166,7 +167,7 @@ msgstr "Filter zoznamov používateľov"
msgid ""
"Defines the filter to apply, when retrieving users (no placeholders). "
"Example: \"objectClass=person\""
-msgstr ""
+msgstr "Definuje použitý filter, pri získavaní používateľov (bez \"placeholderov\"). Napríklad: \"objectClass=osoba\""
#: templates/settings.php:59
msgid "Group Filter"
@@ -176,7 +177,7 @@ msgstr "Filter skupiny"
msgid ""
"Defines the filter to apply, when retrieving groups (no placeholders). "
"Example: \"objectClass=posixGroup\""
-msgstr ""
+msgstr "Definuje použitý filter, pri získavaní skupín (bez \"placeholderov\"). Napríklad: \"objectClass=posixSkupina\""
#: templates/settings.php:66
msgid "Connection Settings"
@@ -237,7 +238,7 @@ msgstr "Vypnúť overovanie SSL certifikátu."
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 "Neodporúčané, použite iba pri testovaní! Pokiaľ spojenie funguje iba z daným nastavením, importujte SSL certifikát LDAP servera do vášho %s servera."
#: templates/settings.php:76
msgid "Cache Time-To-Live"
diff --git a/l10n/sl/core.po b/l10n/sl/core.po
index 1f8428968ed674b08ad3195696b4f4fcbd683dd2..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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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"
@@ -24,6 +24,10 @@ msgstr ""
msgid "%s shared »%s« with you"
msgstr "%s je delil »%s« z vami"
+#: ajax/share.php:227
+msgid "group"
+msgstr "skupina"
+
#: ajax/update.php:11
msgid "Turned on maintenance mode"
msgstr ""
@@ -88,6 +92,26 @@ msgstr "Za izbris ni izbrana nobena kategorija."
msgid "Error removing %s from favorites."
msgstr "Napaka odstranjevanja %s iz priljubljenih predmetov."
+#: 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 "nedelja"
@@ -164,15 +188,15 @@ msgstr "november"
msgid "December"
msgstr "december"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "Nastavitve"
-#: js/js.js:812
+#: js/js.js:866
msgid "seconds ago"
msgstr "pred nekaj sekundami"
-#: js/js.js:813
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
@@ -180,7 +204,7 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: js/js.js:814
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
@@ -188,15 +212,15 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: js/js.js:815
+#: js/js.js:869
msgid "today"
msgstr "danes"
-#: js/js.js:816
+#: js/js.js:870
msgid "yesterday"
msgstr "včeraj"
-#: js/js.js:817
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
@@ -204,11 +228,11 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: js/js.js:818
+#: js/js.js:872
msgid "last month"
msgstr "zadnji mesec"
-#: js/js.js:819
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
@@ -216,15 +240,15 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: js/js.js:820
+#: js/js.js:874
msgid "months ago"
msgstr "mesecev nazaj"
-#: js/js.js:821
+#: js/js.js:875
msgid "last year"
msgstr "lansko leto"
-#: js/js.js:822
+#: js/js.js:876
msgid "years ago"
msgstr "let nazaj"
@@ -232,22 +256,68 @@ msgstr "let nazaj"
msgid "Choose"
msgstr "Izbor"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
-msgstr "Napaka pri nalaganju predloge za izbor dokumenta"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
+msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "Da"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "Ne"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr "V redu"
+#: 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] ""
+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."
@@ -257,7 +327,7 @@ msgstr "Vrsta predmeta ni podana."
#: 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:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "Napaka"
@@ -277,7 +347,7 @@ msgstr "V souporabi"
msgid "Share"
msgstr "Souporaba"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr "Napaka med souporabo"
@@ -333,67 +403,67 @@ msgstr "Nastavi datum preteka"
msgid "Expiration date"
msgstr "Datum preteka"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "Souporaba preko elektronske pošte:"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "Ni najdenih uporabnikov"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "Nadaljnja souporaba ni dovoljena"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr "V souporabi v {item} z {user}"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "Prekliči souporabo"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "lahko ureja"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "nadzor dostopa"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "ustvari"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "posodobi"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "izbriši"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "določi souporabo"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "Zaščiteno z geslom"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr "Napaka brisanja datuma preteka"
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr "Napaka med nastavljanjem datuma preteka"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr "Pošiljanje ..."
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr "Elektronska pošta je poslana"
@@ -408,7 +478,7 @@ msgstr "Posodobitev ni uspela. Pošljite poročilo o napaki na sistemu <a href=\
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Posodobitev je uspešno končana. Stran bo preusmerjena na oblak ownCloud."
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr ""
@@ -477,7 +547,7 @@ msgstr "Osebno"
msgid "Users"
msgstr "Uporabniki"
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "Programi"
@@ -606,14 +676,10 @@ msgstr "Končaj namestitev"
msgid "%s is available. Get more information on how to update."
msgstr "%s je na voljo. Pridobite več podrobnosti za posodobitev."
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "Odjava"
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "Samodejno prijavljanje je zavrnjeno!"
@@ -628,19 +694,19 @@ msgstr "V primeru, da gesla za dostop že nekaj časa niste spremenili, je raču
msgid "Please change your password to secure your account again."
msgstr "Spremenite geslo za izboljšanje zaščite računa."
-#: templates/login.php:34
+#: templates/login.php:32
msgid "Lost your password?"
msgstr "Ali ste pozabili geslo?"
-#: templates/login.php:39
+#: templates/login.php:37
msgid "remember"
msgstr "zapomni si"
-#: templates/login.php:41
+#: templates/login.php:39
msgid "Log in"
msgstr "Prijava"
-#: templates/login.php:47
+#: templates/login.php:45
msgid "Alternative Logins"
msgstr "Druge prijavne možnosti"
diff --git a/l10n/sl/files.po b/l10n/sl/files.po
index bf44c66320a26da08408b05036f77558fdf9627f..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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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,7 +75,15 @@ msgstr "Pisanje na disk je spodletelo"
msgid "Not enough storage available"
msgstr "Na voljo ni dovolj prostora"
-#: ajax/upload.php:123
+#: 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 "Neveljavna mapa."
@@ -83,76 +91,100 @@ 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: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 "V teku je pošiljanje datoteke. Če zapustite to stran zdaj, bo pošiljanje preklicano."
-#: js/file-upload.js:241
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr "Naslov URL ne sme biti prazna vrednost."
-#: 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 "Ime mape je neveljavno. Uporaba oznake \"Souporaba\" je rezervirana za ownCloud"
-#: js/file-upload.js:277 js/file-upload.js:293 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 "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:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "V čakanju ..."
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{new_name} že obstaja"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "zamenjaj"
-#: js/filelist.js:303
+#: js/filelist.js:416
msgid "suggest name"
msgstr "predlagaj ime"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "prekliči"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr "preimenovano ime {new_name} z imenom {old_name}"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "undo"
msgstr "razveljavi"
-#: js/filelist.js:453
+#: 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[3] ""
+
+#: 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[3] ""
+
+#: 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] ""
@@ -160,78 +192,62 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: js/filelist.js:518
-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: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 "Velikost"
-#: js/files.js:564 templates/index.php:80
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr "Spremenjeno"
-#: js/files.js:580
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-
-#: js/files.js:586
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-
#: lib/app.php:73
#, php-format
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"
@@ -267,84 +283,68 @@ 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:73
+#: templates/index.php:67
msgid "Download"
msgstr "Prejmi"
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr "Prekliči souporabo"
-#: templates/index.php:91 templates/index.php:92
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "Izbriši"
-#: templates/index.php:105
+#: templates/index.php:100
msgid "Upload too large"
msgstr "Prekoračenje omejitve velikosti"
-#: 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 "Datoteke, ki jih želite poslati, presegajo največjo dovoljeno velikost na strežniku."
-#: templates/index.php:112
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr "Poteka preučevanje datotek, počakajte ..."
-#: templates/index.php:115
+#: templates/index.php:110
msgid "Current scanning"
msgstr "Trenutno poteka preučevanje"
-#: templates/part.list.php:74
-msgid "directory"
-msgstr "direktorij"
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr "direktoriji"
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr "datoteka"
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr "datoteke"
-
#: templates/upgrade.php:2
msgid "Upgrading filesystem cache..."
msgstr "Nadgrajevanje predpomnilnika datotečnega sistema ..."
diff --git a/l10n/sl/files_sharing.po b/l10n/sl/files_sharing.po
index 4ee20dcd09f6f40e0cc5c6f638de08e302945a25..b038230f56a4e1e552e3d1ef8d237fc80838acab 100644
--- a/l10n/sl/files_sharing.po
+++ b/l10n/sl/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00: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"
@@ -63,7 +63,7 @@ msgstr "Oseba %s je določila mapo %s za souporabo"
msgid "%s shared the file %s with you"
msgstr "Oseba %s je določila datoteko %s za souporabo"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "Prejmi"
@@ -75,6 +75,6 @@ msgstr "Pošlji"
msgid "Cancel upload"
msgstr "Prekliči pošiljanje"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "Predogled ni na voljo za"
diff --git a/l10n/sl/lib.po b/l10n/sl/lib.po
index 38ac1137b6fd5b6fb4af7926ee9000185aaf4818..871f8629966cffebc40264e7460dae38d71510cc 100644
--- a/l10n/sl/lib.po
+++ b/l10n/sl/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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\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"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
@@ -49,11 +49,23 @@ msgstr "Uporabniki"
msgid "Admin"
msgstr "Skrbništvo"
-#: app.php:837
+#: 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 "spletne storitve pod vašim nadzorom"
@@ -106,37 +118,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: 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:150
+#: 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:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -265,11 +277,11 @@ msgstr "Spletni stražnik še ni ustrezno nastavljen in ne omogoča usklajevanja
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Preverite <a href='%s'>navodila namestitve</a>."
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "pred nekaj sekundami"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
@@ -277,7 +289,7 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
@@ -285,15 +297,15 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "danes"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "včeraj"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
@@ -301,11 +313,11 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "zadnji mesec"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
@@ -313,11 +325,11 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "lansko leto"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "let nazaj"
diff --git a/l10n/sl/settings.po b/l10n/sl/settings.po
index 2ffd3e80111d74400b848e2283e6cc862df9993a..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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+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,55 +86,88 @@ msgstr "Uporabnika ni mogoče odstraniti iz skupine %s"
msgid "Couldn't update app."
msgstr "Programa ni mogoče posodobiti."
-#: js/apps.js:35
+#: 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}"
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr "Onemogoči"
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr "Omogoči"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr "Počakajte ..."
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr "Poteka posodabljanje ..."
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr "Prišlo je do napake med posodabljanjem programa."
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "Napaka"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr "Posodobi"
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr "Posodobljeno"
-#: js/personal.js:150
+#: 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:172
+#: js/personal.js:287
msgid "Saving..."
msgstr "Poteka shranjevanje ..."
@@ -150,16 +183,16 @@ msgstr "razveljavi"
msgid "Unable to remove user"
msgstr "Uporabnika ni mogoče odstraniti"
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "Skupine"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "Skrbnik skupine"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "Izbriši"
@@ -179,7 +212,7 @@ msgstr "Napaka ustvarjanja uporabnika"
msgid "A valid password must be provided"
msgstr "Navedeno mora biti veljavno geslo"
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "Slovenščina"
@@ -345,11 +378,11 @@ msgstr "Več"
msgid "Less"
msgstr "Manj"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "Različica"
-#: templates/admin.php:246 templates/personal.php:143
+#: 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 "
@@ -416,7 +449,7 @@ msgstr "Zaženi čarovnika prvega zagona"
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Uporabljenega je <strong>%s</strong> od razpoložljivih <strong>%s</strong> prostora."
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "Geslo"
@@ -440,7 +473,7 @@ msgstr "Novo geslo"
msgid "Change password"
msgstr "Spremeni geslo"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr "Prikazano ime"
@@ -456,38 +489,66 @@ msgstr "Osebni elektronski naslov"
msgid "Fill in an email address to enable password recovery"
msgstr "Vpišite osebni elektronski naslov in s tem omogočite obnovitev gesla"
-#: templates/personal.php:85 templates/personal.php:86
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr "Slika profila"
+
+#: 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 "Jezik"
-#: templates/personal.php:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "Sodelujte pri prevajanju"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: 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:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "Šifriranje"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -513,30 +574,30 @@ msgstr "Vnesite geslo za obnovitev, ki ga boste uporabljali za obnovitev datotek
msgid "Default Storage"
msgstr "Privzeta shramba"
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr "Neomejeno"
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "Drugo"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "Uporabniško ime"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr "Shramba"
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr "spremeni prikazano ime"
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr "nastavi novo geslo"
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr "Privzeto"
diff --git a/l10n/sl/user_ldap.po b/l10n/sl/user_ldap.po
index cc6fa550f76b8e39935fe26e8b2af0b0f1c9ba7b..4a826a92f8c417b5282199dbbf168c5908677cb2 100644
--- a/l10n/sl/user_ldap.po
+++ b/l10n/sl/user_ldap.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-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\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"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sq/core.po b/l10n/sq/core.po
index 2424d24dbe6d9d17374564ed7367270a84ee5d34..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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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"
@@ -22,32 +22,36 @@ msgstr ""
#: ajax/share.php:97
#, php-format
msgid "%s shared »%s« with you"
-msgstr ""
+msgstr "%s ndau »%s« me ju"
+
+#: ajax/share.php:227
+msgid "group"
+msgstr "grupi"
#: ajax/update.php:11
msgid "Turned on maintenance mode"
-msgstr ""
+msgstr "Mënyra e mirëmbajtjes u aktivizua"
#: ajax/update.php:14
msgid "Turned off maintenance mode"
-msgstr ""
+msgstr "Mënyra e mirëmbajtjes u çaktivizua"
#: ajax/update.php:17
msgid "Updated database"
-msgstr ""
+msgstr "Database-i u azhurnua"
#: ajax/update.php:20
msgid "Updating filecache, this may take really long..."
-msgstr ""
+msgstr "Po azhurnoj memorjen e skedarëve, mund të zgjasi pak..."
#: ajax/update.php:23
msgid "Updated filecache"
-msgstr ""
+msgstr "Memorja e skedarëve u azhornua"
#: ajax/update.php:26
#, php-format
msgid "... %d%% done ..."
-msgstr ""
+msgstr "... %d%% u krye ..."
#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
msgid "Category type not provided."
@@ -88,6 +92,26 @@ msgstr "Nuk selektuar për tu eliminuar asnjë kategori."
msgid "Error removing %s from favorites."
msgstr "Veprim i gabuar gjatë heqjes së %s nga të parapëlqyerat."
+#: 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 "E djelë"
@@ -164,59 +188,59 @@ msgstr "Nëntor"
msgid "December"
msgstr "Dhjetor"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "Parametra"
-#: js/js.js:812
+#: js/js.js:866
msgid "seconds ago"
msgstr "sekonda më parë"
-#: js/js.js:813
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n minut më parë"
+msgstr[1] "%n minuta më parë"
-#: js/js.js:814
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n orë më parë"
+msgstr[1] "%n orë më parë"
-#: js/js.js:815
+#: js/js.js:869
msgid "today"
msgstr "sot"
-#: js/js.js:816
+#: js/js.js:870
msgid "yesterday"
msgstr "dje"
-#: js/js.js:817
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n ditë më parë"
+msgstr[1] "%n ditë më parë"
-#: js/js.js:818
+#: js/js.js:872
msgid "last month"
msgstr "muajin e shkuar"
-#: js/js.js:819
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n muaj më parë"
+msgstr[1] "%n muaj më parë"
-#: js/js.js:820
+#: js/js.js:874
msgid "months ago"
msgstr "muaj më parë"
-#: js/js.js:821
+#: js/js.js:875
msgid "last year"
msgstr "vitin e shkuar"
-#: js/js.js:822
+#: js/js.js:876
msgid "years ago"
msgstr "vite më parë"
@@ -224,22 +248,66 @@ msgstr "vite më parë"
msgid "Choose"
msgstr "Zgjidh"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
-msgstr "Veprim i gabuar gjatë ngarkimit të modelit të zgjedhësit të skedarëve"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
+msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "Po"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "Jo"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr "Në rregull"
+#: 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 "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."
@@ -249,7 +317,7 @@ msgstr "Nuk është specifikuar tipi i objektit."
#: 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:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "Veprim i gabuar"
@@ -269,7 +337,7 @@ msgstr "Ndarë"
msgid "Share"
msgstr "Nda"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr "Veprim i gabuar gjatë ndarjes"
@@ -325,67 +393,67 @@ msgstr "Cakto datën e përfundimit"
msgid "Expiration date"
msgstr "Data e përfundimit"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "Nda me email:"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "Nuk u gjet asnjë person"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "Rindarja nuk lejohet"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr "Ndarë në {item} me {user}"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "Hiq ndarjen"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "mund të ndryshosh"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "kontrollimi i hyrjeve"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "krijo"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "azhurno"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "elimino"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "nda"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "Mbrojtur me kod"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr "Veprim i gabuar gjatë heqjes së datës së përfundimit"
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr "Veprim i gabuar gjatë caktimit të datës së përfundimit"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr "Duke dërguar..."
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr "Email-i u dërgua"
@@ -400,10 +468,10 @@ msgstr "Azhurnimi dështoi. Ju lutemi njoftoni për këtë problem <a href=\"htt
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Azhurnimi u krye. Tani do t'ju kaloj tek ownCloud-i."
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
-msgstr ""
+msgstr "Kodi i %s -it u rivendos"
#: lostpassword/templates/email.php:2
msgid "Use the following link to reset your password: {link}"
@@ -435,7 +503,7 @@ msgid ""
"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 ""
+msgstr "Skedarët tuaj janë të kodifikuar. Nëqoftëse nuk keni aktivizuar çelësin e restaurimit, të dhënat tuaja nuk do të jenë të arritshme pasi të keni rivendosur kodin. Nëqoftëse nuk jeni i sigurt, ju lutemi kontaktoni administratorin tuaj para se të vazhdoni. Jeni i sigurt që dëshironi të vazhdoni?"
#: lostpassword/templates/lostpassword.php:24
msgid "Yes, I really want to reset my password now"
@@ -469,7 +537,7 @@ msgstr "Personale"
msgid "Users"
msgstr "Përdoruesit"
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "App"
@@ -520,7 +588,7 @@ msgstr "Versioni juaj i PHP-së është i cënueshëm nga sulmi NULL Byte (CVE-2
#: templates/installation.php:26
#, php-format
msgid "Please update your PHP installation to use %s securely."
-msgstr ""
+msgstr "Ju lutem azhurnoni instalimin tuaj të PHP-së që të përdorni %s -in në mënyrë të sigurt."
#: templates/installation.php:32
msgid ""
@@ -545,7 +613,7 @@ msgstr "Dosja dhe skedarët e të dhënave tuaja mbase janë të arritshme nga i
msgid ""
"For information how to properly configure your server, please see the <a "
"href=\"%s\" target=\"_blank\">documentation</a>."
-msgstr ""
+msgstr "Për më shumë informacion mbi konfigurimin e duhur të serverit tuaj, ju lutem shikoni <a href=\"%s\" target=\"_blank\">dokumentacionin</a>."
#: templates/installation.php:47
msgid "Create an <strong>admin account</strong>"
@@ -596,16 +664,12 @@ msgstr "Mbaro setup-in"
#: templates/layout.user.php:41
#, php-format
msgid "%s is available. Get more information on how to update."
-msgstr ""
+msgstr "%s është i disponueshëm. Merrni më shumë informacione mbi azhurnimin."
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "Dalje"
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "Hyrja automatike u refuzua!"
@@ -620,19 +684,19 @@ msgstr "Nqse nuk keni ndryshuar kodin kohët e fundit, llogaria juaj mund të je
msgid "Please change your password to secure your account again."
msgstr "Ju lutemi, ndryshoni kodin për ta siguruar përsëri llogarinë tuaj."
-#: templates/login.php:34
+#: templates/login.php:32
msgid "Lost your password?"
msgstr "Ke humbur kodin?"
-#: templates/login.php:39
+#: templates/login.php:37
msgid "remember"
msgstr "kujto"
-#: templates/login.php:41
+#: templates/login.php:39
msgid "Log in"
msgstr "Hyrje"
-#: templates/login.php:47
+#: templates/login.php:45
msgid "Alternative Logins"
msgstr "Hyrje alternative"
@@ -641,7 +705,7 @@ msgstr "Hyrje alternative"
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 ""
+msgstr "Tungjatjeta,<br><br>duam t'ju njoftojmë që %s ka ndarë »%s« me ju.<br><a href=\"%s\">Shikojeni!</a><br><br>Përshëndetje!"
#: templates/update.php:3
#, php-format
diff --git a/l10n/sq/files.po b/l10n/sq/files.po
index 2816c2a5d6ca3b1f8503859999a49abc00f6d09c..a5b9a669e2950e3b88cf92508e47d9a15938f916 100644
--- a/l10n/sq/files.po
+++ b/l10n/sq/files.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Odeen <rapid_odeen@zoho.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
"MIME-Version: 1.0\n"
@@ -29,11 +30,11 @@ msgstr "%s nuk u spostua"
#: ajax/upload.php:16 ajax/upload.php:45
msgid "Unable to set upload directory."
-msgstr ""
+msgstr "Nuk është i mundur caktimi i dosjes së ngarkimit."
#: ajax/upload.php:22
msgid "Invalid Token"
-msgstr ""
+msgstr "Përmbajtje e pavlefshme"
#: ajax/upload.php:59
msgid "No file was uploaded. Unknown error"
@@ -74,7 +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:123
+#: 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 "Dosje e pavlefshme."
@@ -82,149 +91,157 @@ 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: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 "Ngarkimi i skedarit është në vazhdim. Nqse ndërroni faqen tani ngarkimi do të anulohet."
-#: js/file-upload.js:241
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr "URL-i nuk mund të jetë bosh."
-#: 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 ""
+msgstr "Emri i dosjes është i pavlefshëm. Përdorimi i \"Shared\" është i rezervuar nga Owncloud-i"
-#: js/file-upload.js:277 js/file-upload.js:293 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 "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:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "Pezulluar"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{new_name} ekziston"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "zëvëndëso"
-#: js/filelist.js:303
+#: js/filelist.js:416
msgid "suggest name"
msgstr "sugjero një emër"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "anulo"
-#: js/filelist.js:350
+#: 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:350
+#: js/filelist.js:463
msgid "undo"
msgstr "anulo"
-#: js/filelist.js:453
+#: 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: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:541
+msgid "{dirs} and {files}"
+msgstr "{dirs} dhe {files}"
+
+#: js/filelist.js:731 js/filelist.js:769
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Po ngarkoj %n skedar"
+msgstr[1] "Po ngarkoj %n skedarë"
-#: js/filelist.js:518
-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 ""
+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: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 "Emri"
-#: js/files.js:563 templates/index.php:78
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "Dimensioni"
-#: js/files.js:564 templates/index.php:80
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr "Modifikuar"
-#: js/files.js:580
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/files.js:586
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-
#: lib/app.php:73
#, php-format
msgid "%s could not be renamed"
-msgstr ""
+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"
@@ -260,84 +277,68 @@ 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:73
+#: templates/index.php:67
msgid "Download"
msgstr "Shkarko"
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr "Hiq ndarjen"
-#: templates/index.php:91 templates/index.php:92
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "Elimino"
-#: templates/index.php:105
+#: templates/index.php:100
msgid "Upload too large"
msgstr "Ngarkimi është shumë i madh"
-#: 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 "Skedarët që doni të ngarkoni tejkalojnë dimensionet maksimale për ngarkimet në këtë server."
-#: templates/index.php:112
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr "Skedarët po analizohen, ju lutemi pritni."
-#: templates/index.php:115
+#: templates/index.php:110
msgid "Current scanning"
msgstr "Analizimi aktual"
-#: templates/part.list.php:74
-msgid "directory"
-msgstr ""
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr ""
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr ""
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr ""
-
#: templates/upgrade.php:2
msgid "Upgrading filesystem cache..."
msgstr "Po përmirësoj memorjen e filesystem-it..."
diff --git a/l10n/sq/files_sharing.po b/l10n/sq/files_sharing.po
index 4e5d0ed5b8d3f55ccfc712477521423d0ec7892c..e1a91f7789c8f1bc0de8c9364305cc85f416618a 100644
--- a/l10n/sq/files_sharing.po
+++ b/l10n/sq/files_sharing.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Odeen <rapid_odeen@zoho.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:01+0000\n"
+"Last-Translator: Odeen <rapid_odeen@zoho.com>\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"
@@ -19,7 +20,7 @@ msgstr ""
#: templates/authenticate.php:4
msgid "The password is wrong. Try again."
-msgstr ""
+msgstr "Kodi është i gabuar. Provojeni përsëri."
#: templates/authenticate.php:7
msgid "Password"
@@ -31,27 +32,27 @@ msgstr "Parashtro"
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
-msgstr ""
+msgstr "Ju kërkojmë ndjesë, kjo lidhje duket sikur nuk punon më."
#: templates/part.404.php:4
msgid "Reasons might be:"
-msgstr ""
+msgstr "Arsyet mund të jenë:"
#: templates/part.404.php:6
msgid "the item was removed"
-msgstr ""
+msgstr "elementi është eliminuar"
#: templates/part.404.php:7
msgid "the link expired"
-msgstr ""
+msgstr "lidhja ka skaduar"
#: templates/part.404.php:8
msgid "sharing is disabled"
-msgstr ""
+msgstr "ndarja është çaktivizuar"
#: templates/part.404.php:10
msgid "For more info, please ask the person who sent this link."
-msgstr ""
+msgstr "Për më shumë informacione, ju lutem pyesni personin që iu dërgoi këtë lidhje."
#: templates/public.php:15
#, php-format
@@ -63,7 +64,7 @@ msgstr "%s ndau me ju dosjen %s"
msgid "%s shared the file %s with you"
msgstr "%s ndau me ju skedarin %s"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "Shkarko"
@@ -75,6 +76,6 @@ msgstr "Ngarko"
msgid "Cancel upload"
msgstr "Anulo ngarkimin"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "Shikimi paraprak nuk është i mundur për"
diff --git a/l10n/sq/files_trashbin.po b/l10n/sq/files_trashbin.po
index cd243657ba0acb936ab6dd8a53837159075c6f28..a359590d5750bf0b4a934db21d775b57bfeef0a3 100644
--- a/l10n/sq/files_trashbin.po
+++ b/l10n/sq/files_trashbin.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Odeen <rapid_odeen@zoho.com>, 2013
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"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-10 10:41-0400\n"
+"PO-Revision-Date: 2013-09-09 23:00+0000\n"
+"Last-Translator: Odeen <rapid_odeen@zoho.com>\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"
@@ -27,45 +28,45 @@ msgstr "Nuk munda ta eliminoj përfundimisht %s"
msgid "Couldn't restore %s"
msgstr "Nuk munda ta rivendos %s"
-#: js/trash.js:7 js/trash.js:100
+#: js/trash.js:7 js/trash.js:102
msgid "perform restore operation"
msgstr "ekzekuto operacionin e rivendosjes"
-#: 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 "Veprim i gabuar"
-#: js/trash.js:36
+#: js/trash.js:37
msgid "delete file permanently"
msgstr "eliminoje përfundimisht skedarin"
-#: js/trash.js:127
+#: js/trash.js:129
msgid "Delete permanently"
msgstr "Elimino përfundimisht"
-#: js/trash.js:182 templates/index.php:17
+#: js/trash.js:184 templates/index.php:17
msgid "Name"
msgstr "Emri"
-#: js/trash.js:183 templates/index.php:27
+#: js/trash.js:185 templates/index.php:27
msgid "Deleted"
msgstr "Eliminuar"
-#: js/trash.js:191
+#: js/trash.js:193
msgid "%n folder"
msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n dosje"
+msgstr[1] "%n dosje"
-#: js/trash.js:197
+#: js/trash.js:199
msgid "%n file"
msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n skedar"
+msgstr[1] "%n skedarë"
-#: lib/trash.php:819 lib/trash.php:821
+#: lib/trash.php:814 lib/trash.php:816
msgid "restored"
-msgstr ""
+msgstr "rivendosur"
#: templates/index.php:9
msgid "Nothing in here. Your trash bin is empty!"
diff --git a/l10n/sq/lib.po b/l10n/sq/lib.po
index 84fd768e0f8321b4e380d9a0f20bfb9e0dc3de0c..e10fb8cdfd900bf6d47d36ace9a330d3a99f8678 100644
--- a/l10n/sq/lib.po
+++ b/l10n/sq/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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\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"
"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
"MIME-Version: 1.0\n"
@@ -48,11 +48,23 @@ msgstr "Përdoruesit"
msgid "Admin"
msgstr "Admin"
-#: app.php:837
+#: 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 "shërbime web nën kontrollin tënd"
@@ -105,37 +117,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: 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:150
+#: 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:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -264,51 +276,51 @@ msgstr "Serveri web i juaji nuk është konfiguruar akoma për të lejuar sinkro
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Ju lutemi kontrolloni mirë <a href='%s'>shoqëruesin e instalimit</a>."
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "sekonda më parë"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-msgstr[1] ""
+msgstr[1] "%n minuta më parë"
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-msgstr[1] ""
+msgstr[1] "%n orë më parë"
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "sot"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "dje"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
-msgstr[1] ""
+msgstr[1] "%n ditë më parë"
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "muajin e shkuar"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-msgstr[1] ""
+msgstr[1] "%n muaj më parë"
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "vitin e shkuar"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "vite më parë"
diff --git a/l10n/sq/settings.po b/l10n/sq/settings.po
index 9e65797efea8cb03b2b9334e0af1b877b572dfeb..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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+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"
@@ -64,7 +64,7 @@ msgstr ""
#: ajax/setlanguage.php:17 ajax/setlanguage.php:20
msgid "Invalid request"
-msgstr ""
+msgstr "Kërkesë e pavlefshme"
#: ajax/togglegroups.php:12
msgid "Admins can't remove themself from the admin group"
@@ -84,55 +84,88 @@ msgstr ""
msgid "Couldn't update app."
msgstr ""
-#: js/apps.js:35
+#: 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:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr ""
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr ""
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr ""
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "Veprim i gabuar"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr "Azhurno"
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr ""
-#: js/personal.js:150
+#: 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:172
+#: js/personal.js:287
msgid "Saving..."
msgstr ""
@@ -148,16 +181,16 @@ msgstr "anulo"
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: 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:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr ""
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "Elimino"
@@ -177,7 +210,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr ""
@@ -343,11 +376,11 @@ msgstr ""
msgid "Less"
msgstr ""
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr ""
-#: templates/admin.php:246 templates/personal.php:143
+#: 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 "
@@ -414,7 +447,7 @@ msgstr ""
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:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "Kodi"
@@ -438,7 +471,7 @@ msgstr "Kodi i ri"
msgid "Change password"
msgstr ""
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr ""
@@ -454,38 +487,66 @@ msgstr ""
msgid "Fill in an email address to enable password recovery"
msgstr ""
-#: templates/personal.php:85 templates/personal.php:86
-msgid "Language"
+#: 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:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:106
+#: 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:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr ""
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -511,30 +572,30 @@ msgstr ""
msgid "Default Storage"
msgstr ""
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr ""
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
-msgstr ""
+msgstr "Të tjera"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "Përdoruesi"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr ""
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr ""
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr ""
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr ""
diff --git a/l10n/sq/user_ldap.po b/l10n/sq/user_ldap.po
index f8f129da269d61452849ca8de847ca999eb8cd03..89615eb99c3f072bfdf03dcf65050b7a5c1515a2 100644
--- a/l10n/sq/user_ldap.po
+++ b/l10n/sq/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\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"
"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sr/core.po b/l10n/sr/core.po
index 08526acf64e7fb90a6b65a4fdfe62df954d2dfc4..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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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"
@@ -22,6 +22,10 @@ msgstr ""
msgid "%s shared »%s« with you"
msgstr ""
+#: ajax/share.php:227
+msgid "group"
+msgstr "група"
+
#: ajax/update.php:11
msgid "Turned on maintenance mode"
msgstr ""
@@ -86,6 +90,26 @@ msgstr "Ни једна категорија није означена за бр
msgid "Error removing %s from favorites."
msgstr "Грешка приликом уклањања %s из омиљених"
+#: 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 "Недеља"
@@ -162,63 +186,63 @@ msgstr "Новембар"
msgid "December"
msgstr "Децембар"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "Поставке"
-#: js/js.js:812
+#: js/js.js:866
msgid "seconds ago"
msgstr "пре неколико секунди"
-#: js/js.js:813
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:814
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:815
+#: js/js.js:869
msgid "today"
msgstr "данас"
-#: js/js.js:816
+#: js/js.js:870
msgid "yesterday"
msgstr "јуче"
-#: js/js.js:817
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:818
+#: js/js.js:872
msgid "last month"
msgstr "прошлог месеца"
-#: js/js.js:819
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:820
+#: js/js.js:874
msgid "months ago"
msgstr "месеци раније"
-#: js/js.js:821
+#: js/js.js:875
msgid "last year"
msgstr "прошле године"
-#: js/js.js:822
+#: js/js.js:876
msgid "years ago"
msgstr "година раније"
@@ -226,22 +250,67 @@ msgstr "година раније"
msgid "Choose"
msgstr "Одабери"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "Да"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "Не"
-#: js/oc-dialogs.js:195
+#: 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] ""
+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."
@@ -251,7 +320,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:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "Грешка"
@@ -271,7 +340,7 @@ msgstr ""
msgid "Share"
msgstr "Дели"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr "Грешка у дељењу"
@@ -327,67 +396,67 @@ msgstr "Постави датум истека"
msgid "Expiration date"
msgstr "Датум истека"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "Подели поштом:"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "Особе нису пронађене."
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "Поновно дељење није дозвољено"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr "Подељено унутар {item} са {user}"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "Укини дељење"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "може да мења"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "права приступа"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "направи"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "ажурирај"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "обриши"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "подели"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "Заштићено лозинком"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr "Грешка код поништавања датума истека"
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr "Грешка код постављања датума истека"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr "Шаљем..."
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr "Порука је послата"
@@ -402,7 +471,7 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr ""
@@ -471,7 +540,7 @@ msgstr "Лично"
msgid "Users"
msgstr "Корисници"
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "Апликације"
@@ -600,14 +669,10 @@ msgstr "Заврши подешавање"
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "Одјава"
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "Аутоматска пријава је одбијена!"
@@ -622,19 +687,19 @@ msgstr "Ако ускоро не промените лозинку ваш нал
msgid "Please change your password to secure your account again."
msgstr "Промените лозинку да бисте обезбедили налог."
-#: templates/login.php:34
+#: templates/login.php:32
msgid "Lost your password?"
msgstr "Изгубили сте лозинку?"
-#: templates/login.php:39
+#: templates/login.php:37
msgid "remember"
msgstr "упамти"
-#: templates/login.php:41
+#: templates/login.php:39
msgid "Log in"
msgstr "Пријава"
-#: templates/login.php:47
+#: templates/login.php:45
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/sr/files.po b/l10n/sr/files.po
index e6d5664fac3b71ca3ad24006033d00f6a3d35767..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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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,7 +74,15 @@ msgstr "Не могу да пишем на диск"
msgid "Not enough storage available"
msgstr "Нема довољно простора"
-#: ajax/upload.php:123
+#: 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 "неисправна фасцикла."
@@ -82,152 +90,160 @@ 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: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:277 js/file-upload.js:293 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:465
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "На чекању"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{new_name} већ постоји"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "замени"
-#: js/filelist.js:303
+#: js/filelist.js:416
msgid "suggest name"
msgstr "предложи назив"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "откажи"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr "замењено {new_name} са {old_name}"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "undo"
msgstr "опозови"
-#: js/filelist.js:453
+#: 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: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: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] ""
msgstr[2] ""
-#: js/filelist.js:518
-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: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 "Измењено"
-#: js/files.js:580
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: js/files.js:586
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
#: lib/app.php:73
#, php-format
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 "Отпреми"
@@ -263,84 +279,68 @@ 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: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 "Тренутно скенирање"
-#: templates/part.list.php:74
-msgid "directory"
-msgstr ""
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr ""
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr ""
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr ""
-
#: templates/upgrade.php:2
msgid "Upgrading filesystem cache..."
msgstr "Дограђујем кеш система датотека…"
diff --git a/l10n/sr/files_sharing.po b/l10n/sr/files_sharing.po
index 0b670840b6048404aba67d0a8e7d45c18490e8fb..db4a7eeb22e5ee6432a7b4f4f8b96b5fc3fc9fcd 100644
--- a/l10n/sr/files_sharing.po
+++ b/l10n/sr/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00: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"
@@ -63,7 +63,7 @@ msgstr ""
msgid "%s shared the file %s with you"
msgstr ""
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "Преузми"
@@ -75,6 +75,6 @@ msgstr "Отпреми"
msgid "Cancel upload"
msgstr "Прекини отпремање"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr ""
diff --git a/l10n/sr/lib.po b/l10n/sr/lib.po
index 1a0c5931797b5e9cdb8a10d95657d93fdc1c58cd..60393d5c2a634f53eeff0e8813fe6f429b374e87 100644
--- a/l10n/sr/lib.po
+++ b/l10n/sr/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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\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"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
@@ -48,11 +48,23 @@ msgstr "Корисници"
msgid "Admin"
msgstr "Администратор"
-#: app.php:837
+#: 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 "веб сервиси под контролом"
@@ -105,37 +117,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: 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:150
+#: 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:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -264,55 +276,55 @@ msgstr "Ваш веб сервер тренутно не подржава син
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Погледајте <a href='%s'>водиче за инсталацију</a>."
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "пре неколико секунди"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "данас"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "јуче"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "прошлог месеца"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "прошле године"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "година раније"
diff --git a/l10n/sr/settings.po b/l10n/sr/settings.po
index 1bbe0a101e5f978acc9a47670bc04de083d43ea3..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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+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,55 +84,88 @@ msgstr "Не могу да уклоним корисника из групе %s"
msgid "Couldn't update app."
msgstr "Не могу да ажурирам апликацију."
-#: js/apps.js:35
+#: 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}"
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr "Искључи"
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr "Омогући"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr "Сачекајте…"
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr "Ажурирам…"
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr "Грешка при ажурирању апликације"
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "Грешка"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr "Ажурирај"
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr "Ажурирано"
-#: js/personal.js:150
+#: 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:172
+#: js/personal.js:287
msgid "Saving..."
msgstr "Чување у току..."
@@ -148,16 +181,16 @@ msgstr "опозови"
msgid "Unable to remove user"
msgstr "Не могу да уклоним корисника"
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: 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:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "Управник групе"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "Обриши"
@@ -177,7 +210,7 @@ msgstr "Грешка при прављењу корисника"
msgid "A valid password must be provided"
msgstr "Морате унети исправну лозинку"
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "__language_name__"
@@ -343,11 +376,11 @@ msgstr "Више"
msgid "Less"
msgstr "Мање"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "Верзија"
-#: templates/admin.php:246 templates/personal.php:143
+#: 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 "
@@ -414,7 +447,7 @@ msgstr "Поново прикажи чаробњак за прво покрет
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Искористили сте <strong>%s</strong> од дозвољених <strong>%s</strong>"
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "Лозинка"
@@ -438,7 +471,7 @@ msgstr "Нова лозинка"
msgid "Change password"
msgstr "Измени лозинку"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr "Име за приказ"
@@ -454,38 +487,66 @@ msgstr "Ваша адреса е-поште"
msgid "Fill in an email address to enable password recovery"
msgstr "Ун"
-#: templates/personal.php:85 templates/personal.php:86
+#: 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:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr " Помозите у превођењу"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: 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:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "Шифровање"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -511,30 +572,30 @@ msgstr ""
msgid "Default Storage"
msgstr "Подразумевано складиште"
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr "Неограничено"
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "Друго"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "Корисничко име"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr "Складиште"
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr "промени име за приказ"
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr "постави нову лозинку"
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr "Подразумевано"
diff --git a/l10n/sr/user_ldap.po b/l10n/sr/user_ldap.po
index a563a3a7ca595239591916ce12d3b04cb90a3822..57813276079fdef71d2e2042d04eef05aba2a271 100644
--- a/l10n/sr/user_ldap.po
+++ b/l10n/sr/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\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"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sr@latin/core.po b/l10n/sr@latin/core.po
index c8f19598939e6b54e77e71edf6df1979868aabff..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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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"
@@ -22,6 +23,10 @@ msgstr ""
msgid "%s shared »%s« with you"
msgstr ""
+#: ajax/share.php:227
+msgid "group"
+msgstr ""
+
#: ajax/update.php:11
msgid "Turned on maintenance mode"
msgstr ""
@@ -49,41 +54,61 @@ 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 "Greška u uklanjanju %s iz omiljeno."
+
+#: 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
@@ -162,146 +187,191 @@ msgstr "Novembar"
msgid "December"
msgstr "Decembar"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "Podešavanja"
-#: js/js.js:812
+#: js/js.js:866
msgid "seconds ago"
-msgstr ""
+msgstr "Pre par sekundi"
-#: js/js.js:813
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:814
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:815
+#: js/js.js:869
msgid "today"
-msgstr ""
+msgstr "Danas"
-#: js/js.js:816
+#: js/js.js:870
msgid "yesterday"
-msgstr ""
+msgstr "juče"
-#: js/js.js:817
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:818
+#: js/js.js:872
msgid "last month"
-msgstr ""
+msgstr "prošlog meseca"
-#: js/js.js:819
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:820
+#: js/js.js:874
msgid "months ago"
-msgstr ""
+msgstr "pre nekoliko meseci"
-#: js/js.js:821
+#: js/js.js:875
msgid "last year"
-msgstr ""
+msgstr "prošle godine"
-#: js/js.js:822
+#: 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:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
-msgstr ""
+msgstr "Da"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
-msgstr ""
+msgstr "Ne"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
+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
#: 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:643 js/share.js:655
+#: 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:683
+#: 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"
@@ -313,103 +383,103 @@ 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:241
+#: js/share.js:242
msgid "Share via email:"
-msgstr ""
+msgstr "Deli putem e-maila"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
-msgstr ""
+msgstr "Nema pronađenih ljudi"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
-msgstr ""
+msgstr "Dalje deljenje nije dozvoljeno"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
-msgstr ""
+msgstr "Deljeno u {item} sa {user}"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
-msgstr ""
+msgstr "Ukljoni deljenje"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
-msgstr ""
+msgstr "dozvoljene izmene"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
-msgstr ""
+msgstr "kontrola pristupa"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
-msgstr ""
+msgstr "napravi"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
-msgstr ""
+msgstr "ažuriranje"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
-msgstr ""
+msgstr "brisanje"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
-msgstr ""
+msgstr "deljenje"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
-msgstr ""
+msgstr "Zaštćeno lozinkom"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
-msgstr ""
+msgstr "Greška u uklanjanju datuma isteka"
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
-msgstr ""
+msgstr "Greška u postavljanju datuma isteka"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
-msgstr ""
+msgstr "Slanje..."
-#: js/share.js:681
+#: 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:61
+#: 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 ""
+msgstr "Koristite sledeći link za reset lozinke: {link}"
#: lostpassword/templates/lostpassword.php:4
msgid ""
@@ -453,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"
@@ -471,7 +541,7 @@ msgstr "Lično"
msgid "Users"
msgstr "Korisnici"
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "Programi"
@@ -485,7 +555,7 @@ msgstr "Pomoć"
#: templates/403.php:12
msgid "Access forbidden"
-msgstr ""
+msgstr "Pristup zabranjen"
#: templates/404.php:15
msgid "Cloud not found"
@@ -504,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
@@ -528,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
@@ -559,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"
@@ -585,7 +655,7 @@ msgstr "Ime baze"
#: templates/installation.php:160
msgid "Database tablespace"
-msgstr ""
+msgstr "tablespace baze"
#: templates/installation.php:167
msgid "Database host"
@@ -600,17 +670,13 @@ msgstr "Završi podešavanje"
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "Odjava"
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
#: templates/login.php:9
msgid "Automatic logon rejected!"
-msgstr ""
+msgstr "Automatsko logovanje odbijeno!"
#: templates/login.php:10
msgid ""
@@ -622,19 +688,19 @@ msgstr ""
msgid "Please change your password to secure your account again."
msgstr ""
-#: templates/login.php:34
+#: templates/login.php:32
msgid "Lost your password?"
msgstr "Izgubili ste lozinku?"
-#: templates/login.php:39
+#: templates/login.php:37
msgid "remember"
msgstr "upamti"
-#: templates/login.php:41
+#: templates/login.php:39
msgid "Log in"
msgstr ""
-#: templates/login.php:47
+#: templates/login.php:45
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/sr@latin/files.po b/l10n/sr@latin/files.po
index 0e1c4986995a1f9fd01ac10cc67b4662cbf89f40..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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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,7 +74,15 @@ msgstr ""
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:123
+#: 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 ""
@@ -82,152 +90,160 @@ 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: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:277 js/file-upload.js:293 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 ""
+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:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr ""
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr ""
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr ""
-#: js/filelist.js:303
+#: js/filelist.js:416
msgid "suggest name"
msgstr ""
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr ""
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr ""
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "undo"
msgstr ""
-#: js/filelist.js:453
-msgid "Uploading %n file"
-msgid_plural "Uploading %n files"
+#: 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:518
-msgid "files uploading"
+#: 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:541
+msgid "{dirs} and {files}"
msgstr ""
-#: js/files.js:52
+#: js/filelist.js:731 js/filelist.js:769
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: 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 "Zadnja izmena"
-#: js/files.js:580
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: js/files.js:586
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
#: lib/app.php:73
#, php-format
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"
@@ -263,84 +279,68 @@ 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:73
+#: templates/index.php:67
msgid "Download"
msgstr "Preuzmi"
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
-msgstr ""
+msgstr "Ukljoni deljenje"
-#: templates/index.php:91 templates/index.php:92
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "Obriši"
-#: templates/index.php:105
+#: templates/index.php:100
msgid "Upload too large"
msgstr "Pošiljka je prevelika"
-#: 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 "Fajlovi koje želite da pošaljete prevazilaze ograničenje maksimalne veličine pošiljke na ovom serveru."
-#: 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 ""
-#: templates/part.list.php:74
-msgid "directory"
-msgstr ""
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr ""
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr ""
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr ""
-
#: templates/upgrade.php:2
msgid "Upgrading filesystem cache..."
msgstr ""
diff --git a/l10n/sr@latin/files_sharing.po b/l10n/sr@latin/files_sharing.po
index 370cbd5e775f5a34349e008483ca63050904dec7..875bfffa7f314a54aa1b0cb3e1ffc92cd0247559 100644
--- a/l10n/sr@latin/files_sharing.po
+++ b/l10n/sr@latin/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00: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"
@@ -63,7 +63,7 @@ msgstr ""
msgid "%s shared the file %s with you"
msgstr ""
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "Preuzmi"
@@ -75,6 +75,6 @@ msgstr "Pošalji"
msgid "Cancel upload"
msgstr ""
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
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 9448ebc4c40d5f6eab6f21108909fcc62995e04b..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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+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"
@@ -48,11 +48,23 @@ msgstr "Korisnici"
msgid "Admin"
msgstr "Adninistracija"
-#: app.php:837
+#: 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 ""
@@ -105,37 +117,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: 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:150
+#: 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:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -152,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 ""
@@ -264,57 +276,57 @@ msgstr ""
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
-msgstr ""
+msgstr "Pre par sekundi"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
-msgstr ""
+msgstr "Danas"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
-msgstr ""
+msgstr "juče"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
-msgstr ""
+msgstr "prošlog meseca"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
-msgstr ""
+msgstr "prošle godine"
-#: template/functions.php:89
+#: 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 cdf4509a43eb591f29f4da85a37bf82a0441804e..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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+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,55 +84,88 @@ msgstr ""
msgid "Couldn't update app."
msgstr ""
-#: js/apps.js:35
+#: 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:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr ""
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr ""
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr ""
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
-msgstr ""
+msgstr "Greška"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr ""
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr ""
-#: js/personal.js:150
+#: 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:172
+#: js/personal.js:287
msgid "Saving..."
msgstr ""
@@ -148,16 +181,16 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "Grupe"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr ""
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "Obriši"
@@ -177,13 +210,13 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr ""
#: templates/admin.php:15
msgid "Security Warning"
-msgstr ""
+msgstr "Bezbednosno upozorenje"
#: templates/admin.php:18
msgid ""
@@ -343,11 +376,11 @@ msgstr ""
msgid "Less"
msgstr ""
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr ""
-#: templates/admin.php:246 templates/personal.php:143
+#: 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 "
@@ -414,7 +447,7 @@ msgstr ""
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:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "Lozinka"
@@ -438,7 +471,7 @@ msgstr "Nova lozinka"
msgid "Change password"
msgstr "Izmeni lozinku"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr ""
@@ -454,38 +487,66 @@ msgstr ""
msgid "Fill in an email address to enable password recovery"
msgstr ""
-#: templates/personal.php:85 templates/personal.php:86
+#: 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 "Jezik"
-#: templates/personal.php:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr ""
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:106
+#: 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:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr ""
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -511,30 +572,30 @@ msgstr ""
msgid "Default Storage"
msgstr ""
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr ""
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "Drugo"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "Korisničko ime"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr ""
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr ""
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr ""
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr ""
diff --git a/l10n/sr@latin/user_ldap.po b/l10n/sr@latin/user_ldap.po
index 883e7aae577c518bcd4759bae17cb583c4bbb243..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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+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 0b137ab6018e8eef7aaef8312ff265c1095d0548..3d94872f70d4df2a081a446bc5a2fcca057aebb9 100644
--- a/l10n/sv/core.po
+++ b/l10n/sv/core.po
@@ -3,6 +3,7 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Daniel Sandman <revoltism@gmail.com>, 2013
# Gunnar Norin <blittan@xbmc.org>, 2013
# medialabs, 2013
# Magnus Höglund <magnus@linux.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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-29 00:02-0400\n"
+"PO-Revision-Date: 2013-09-28 02:02+0000\n"
+"Last-Translator: Daniel Sandman <revoltism@gmail.com>\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"
@@ -26,30 +27,34 @@ msgstr ""
msgid "%s shared »%s« with you"
msgstr "%s delade »%s« med dig"
+#: ajax/share.php:227
+msgid "group"
+msgstr "Grupp"
+
#: ajax/update.php:11
msgid "Turned on maintenance mode"
-msgstr ""
+msgstr "Aktiverade underhållsläge"
#: ajax/update.php:14
msgid "Turned off maintenance mode"
-msgstr ""
+msgstr "Deaktiverade underhållsläge"
#: ajax/update.php:17
msgid "Updated database"
-msgstr ""
+msgstr "Uppdaterade databasen"
#: ajax/update.php:20
msgid "Updating filecache, this may take really long..."
-msgstr ""
+msgstr "Uppdaterar filcache, det kan ta lång tid..."
#: ajax/update.php:23
msgid "Updated filecache"
-msgstr ""
+msgstr "Uppdaterade filcache"
#: ajax/update.php:26
#, php-format
msgid "... %d%% done ..."
-msgstr ""
+msgstr "... %d%% klart ..."
#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
msgid "Category type not provided."
@@ -90,6 +95,26 @@ msgstr "Inga kategorier valda för radering."
msgid "Error removing %s from favorites."
msgstr "Fel vid borttagning av %s från favoriter."
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr "Ingen bild eller fil har tillhandahållits"
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr "Okänd filtyp"
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr "Ogiltig bild"
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr "Ingen temporär profilbild finns tillgänglig, försök igen"
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr "Ingen beskärdata har angivits"
+
#: js/config.php:32
msgid "Sunday"
msgstr "Söndag"
@@ -166,59 +191,59 @@ msgstr "November"
msgid "December"
msgstr "December"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "Inställningar"
-#: js/js.js:812
+#: js/js.js:866
msgid "seconds ago"
msgstr "sekunder sedan"
-#: js/js.js:813
+#: 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:814
+#: 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:815
+#: js/js.js:869
msgid "today"
msgstr "i dag"
-#: js/js.js:816
+#: js/js.js:870
msgid "yesterday"
msgstr "i går"
-#: js/js.js:817
+#: 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:818
+#: js/js.js:872
msgid "last month"
msgstr "förra månaden"
-#: js/js.js:819
+#: 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:820
+#: js/js.js:874
msgid "months ago"
msgstr "månader sedan"
-#: js/js.js:821
+#: js/js.js:875
msgid "last year"
msgstr "förra året"
-#: js/js.js:822
+#: js/js.js:876
msgid "years ago"
msgstr "år sedan"
@@ -226,22 +251,66 @@ msgstr "år sedan"
msgid "Choose"
msgstr "Välj"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
-msgstr "Fel vid inläsning av filväljarens mall"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
+msgstr "Fel uppstod för filväljarmall: {error}"
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "Ja"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "Nej"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr "Ok"
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+msgstr "Fel uppstod under inläsningen av meddelandemallen: {error}"
+
+#: js/oc-dialogs.js:347
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] "{count} filkonflikt"
+msgstr[1] "{count} filkonflikter"
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr "En filkonflikt"
+
+#: js/oc-dialogs.js:367
+msgid "Which files do you want to keep?"
+msgstr "Vilken fil vill du behålla?"
+
+#: js/oc-dialogs.js:368
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr "Om du väljer båda versionerna kommer de kopierade filerna ha nummer tillagda i filnamnet."
+
+#: js/oc-dialogs.js:376
+msgid "Cancel"
+msgstr "Avbryt"
+
+#: js/oc-dialogs.js:386
+msgid "Continue"
+msgstr "Fortsätt"
+
+#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+msgid "(all selected)"
+msgstr "(Alla valda)"
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "({count} selected)"
+msgstr "({count} valda)"
+
+#: js/oc-dialogs.js:457
+msgid "Error loading file exists template"
+msgstr "Fel uppstod filmall existerar"
+
#: 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."
@@ -251,7 +320,7 @@ msgstr "Objekttypen är inte specificerad."
#: 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:643 js/share.js:655
+#: js/share.js:656 js/share.js:668
msgid "Error"
msgstr "Fel"
@@ -271,7 +340,7 @@ msgstr "Delad"
msgid "Share"
msgstr "Dela"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:696
msgid "Error while sharing"
msgstr "Fel vid delning"
@@ -327,67 +396,67 @@ msgstr "Sätt utgångsdatum"
msgid "Expiration date"
msgstr "Utgångsdatum"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "Dela via e-post:"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "Hittar inga användare"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "Dela vidare är inte tillåtet"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr "Delad i {item} med {user}"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "Sluta dela"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "kan redigera"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "åtkomstkontroll"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "skapa"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "uppdatera"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "radera"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "dela"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:643
msgid "Password protected"
msgstr "Lösenordsskyddad"
-#: js/share.js:643
+#: js/share.js:656
msgid "Error unsetting expiration date"
msgstr "Fel vid borttagning av utgångsdatum"
-#: js/share.js:655
+#: js/share.js:668
msgid "Error setting expiration date"
msgstr "Fel vid sättning av utgångsdatum"
-#: js/share.js:670
+#: js/share.js:683
msgid "Sending ..."
msgstr "Skickar ..."
-#: js/share.js:681
+#: js/share.js:694
msgid "Email sent"
msgstr "E-post skickat"
@@ -402,7 +471,7 @@ msgstr "Uppdateringen misslyckades. Rapportera detta problem till <a href=\"http
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Uppdateringen lyckades. Du omdirigeras nu till OwnCloud."
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr "%s återställ lösenord"
@@ -471,7 +540,7 @@ msgstr "Personligt"
msgid "Users"
msgstr "Användare"
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "Program"
@@ -600,14 +669,10 @@ msgstr "Avsluta installation"
msgid "%s is available. Get more information on how to update."
msgstr "%s är tillgänglig. Få mer information om hur du går tillväga för att uppdatera."
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "Logga ut"
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr "Fler appar"
-
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "Automatisk inloggning inte tillåten!"
@@ -622,19 +687,19 @@ msgstr "Om du inte har ändrat ditt lösenord nyligen så kan ditt konto vara ma
msgid "Please change your password to secure your account again."
msgstr "Ändra genast lösenord för att säkra ditt konto."
-#: templates/login.php:34
+#: templates/login.php:32
msgid "Lost your password?"
msgstr "Glömt ditt lösenord?"
-#: templates/login.php:39
+#: templates/login.php:37
msgid "remember"
msgstr "kom ihåg"
-#: templates/login.php:41
+#: templates/login.php:39
msgid "Log in"
msgstr "Logga in"
-#: templates/login.php:47
+#: templates/login.php:45
msgid "Alternative Logins"
msgstr "Alternativa inloggningar"
diff --git a/l10n/sv/files.po b/l10n/sv/files.po
index b9cbd6f04abde274c4a418a3208349f4c00d5797..3fe12b46d57223948dd35ebc24f1f1fe491d3082 100644
--- a/l10n/sv/files.po
+++ b/l10n/sv/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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
@@ -78,7 +78,15 @@ msgstr "Misslyckades spara till disk"
msgid "Not enough storage available"
msgstr "Inte tillräckligt med lagringsutrymme tillgängligt"
-#: ajax/upload.php:123
+#: 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 "Felaktig mapp."
@@ -86,149 +94,157 @@ 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: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 "Filuppladdning pågår. Lämnar du sidan så avbryts uppladdningen."
-#: js/file-upload.js:241
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr "URL kan inte vara tom."
-#: 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 "Ogiltigt mappnamn. Användning av 'Shared' är reserverad av ownCloud"
-#: js/file-upload.js:277 js/file-upload.js:293 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 "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:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "Väntar"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{new_name} finns redan"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "ersätt"
-#: js/filelist.js:303
+#: js/filelist.js:416
msgid "suggest name"
msgstr "föreslå namn"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "avbryt"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr "ersatt {new_name} med {old_name}"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "undo"
msgstr "ångra"
-#: js/filelist.js:453
+#: 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: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:541
+msgid "{dirs} and {files}"
+msgstr "{dirs} och {files}"
+
+#: 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:518
-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: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 "Namn"
-#: js/files.js:563 templates/index.php:78
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "Storlek"
-#: js/files.js:564 templates/index.php:80
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr "Ändrad"
-#: js/files.js:580
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] "%n mapp"
-msgstr[1] "%n mappar"
-
-#: js/files.js:586
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] "%n fil"
-msgstr[1] "%n filer"
-
#: lib/app.php:73
#, php-format
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"
@@ -264,84 +280,68 @@ 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:73
+#: templates/index.php:67
msgid "Download"
msgstr "Ladda ner"
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr "Sluta dela"
-#: templates/index.php:91 templates/index.php:92
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "Radera"
-#: templates/index.php:105
+#: templates/index.php:100
msgid "Upload too large"
msgstr "För stor uppladdning"
-#: 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 "Filerna du försöker ladda upp överstiger den maximala storleken för filöverföringar på servern."
-#: templates/index.php:112
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr "Filer skannas, var god vänta"
-#: templates/index.php:115
+#: templates/index.php:110
msgid "Current scanning"
msgstr "Aktuell skanning"
-#: templates/part.list.php:74
-msgid "directory"
-msgstr "mapp"
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr "mappar"
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr "fil"
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr "filer"
-
#: templates/upgrade.php:2
msgid "Upgrading filesystem cache..."
msgstr "Uppgraderar filsystemets cache..."
diff --git a/l10n/sv/files_sharing.po b/l10n/sv/files_sharing.po
index 05283db1ee5f3fe34b016270ec6a2df66fa82ce5..2716b5f204cca7e4d0df4b5950bb73dd476b3377 100644
--- a/l10n/sv/files_sharing.po
+++ b/l10n/sv/files_sharing.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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:01+0000\n"
"Last-Translator: Magnus Höglund <magnus@linux.com>\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
@@ -65,7 +65,7 @@ msgstr "%s delade mappen %s med dig"
msgid "%s shared the file %s with you"
msgstr "%s delade filen %s med dig"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "Ladda ner"
@@ -77,6 +77,6 @@ msgstr "Ladda upp"
msgid "Cancel upload"
msgstr "Avbryt uppladdning"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "Ingen förhandsgranskning tillgänglig för"
diff --git a/l10n/sv/lib.po b/l10n/sv/lib.po
index 3230a1c404b05117e5dbf433946f46eb86f1c3e6..8865b3f1d8d84a0451d56b530c8a76dda0106f73 100644
--- a/l10n/sv/lib.po
+++ b/l10n/sv/lib.po
@@ -4,13 +4,14 @@
#
# Translators:
# medialabs, 2013
+# Magnus Höglund <magnus@linux.com>, 2013
# medialabs, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\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"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
@@ -24,11 +25,11 @@ msgstr ""
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
-msgstr ""
+msgstr "Appen \"%s\" kan inte installeras eftersom att den inte är kompatibel med denna version av ownCloud."
#: app.php:250
msgid "No app name specified"
-msgstr ""
+msgstr "Inget appnamn angivet"
#: app.php:361
msgid "Help"
@@ -50,11 +51,23 @@ msgstr "Användare"
msgid "Admin"
msgstr "Admin"
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "Misslyckades med att uppgradera \"%s\"."
+#: 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 "webbtjänster under din kontroll"
@@ -88,59 +101,59 @@ msgstr "Ladda ner filerna i mindre bitar, separat eller fråga din administratö
#: installer.php:63
msgid "No source specified when installing app"
-msgstr ""
+msgstr "Ingen källa angiven vid installation av app "
#: installer.php:70
msgid "No href specified when installing app from http"
-msgstr ""
+msgstr "Ingen href angiven vid installation av app från http"
#: installer.php:75
msgid "No path specified when installing app from local file"
-msgstr ""
+msgstr "Ingen sökväg angiven vid installation av app från lokal fil"
#: installer.php:89
#, php-format
msgid "Archives of type %s are not supported"
-msgstr ""
+msgstr "Arkiv av typen %s stöds ej"
#: installer.php:103
msgid "Failed to open archive when installing app"
-msgstr ""
+msgstr "Kunde inte öppna arkivet när appen skulle installeras"
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
-msgstr ""
+msgstr "Appen har ingen info.xml fil"
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
-msgstr ""
+msgstr "Appen kan inte installeras eftersom att den innehåller otillåten kod"
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
-msgstr ""
+msgstr "Appen kan inte installeras eftersom att den inte är kompatibel med denna version av ownCloud"
-#: installer.php:144
+#: 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 "Appen kan inte installeras eftersom att den innehåller etiketten <shipped>true</shipped> vilket inte är tillåtet för icke inkluderade appar"
-#: installer.php:150
+#: 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 "Appen kan inte installeras eftersom versionen i info.xml inte är samma som rapporteras från app store"
-#: installer.php:160
+#: installer.php:162
msgid "App directory already exists"
-msgstr ""
+msgstr "Appens mapp finns redan"
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
-msgstr ""
+msgstr "Kan inte skapa appens mapp. Var god åtgärda rättigheterna. %s"
#: json.php:28
msgid "Application is not enabled"
@@ -266,51 +279,51 @@ msgstr "Din webbserver är inte korrekt konfigurerad för att tillåta filsynkro
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Var god kontrollera <a href='%s'>installationsguiden</a>."
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "sekunder sedan"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n minut sedan"
msgstr[1] "%n minuter sedan"
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n timme sedan"
msgstr[1] "%n timmar sedan"
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "i dag"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "i går"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] "%n dag sedan"
msgstr[1] "%n dagar sedan"
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "förra månaden"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n månad sedan"
msgstr[1] "%n månader sedan"
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "förra året"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "år sedan"
diff --git a/l10n/sv/settings.po b/l10n/sv/settings.po
index 4c57d855cc26a0900f624a1635be3a4103e9272b..a0a193043a0c7532be27fe0a995c208f1f6fb267 100644
--- a/l10n/sv/settings.po
+++ b/l10n/sv/settings.po
@@ -3,6 +3,7 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Daniel Sandman <revoltism@gmail.com>, 2013
# Gunnar Norin <blittan@xbmc.org>, 2013
# Jan Busk, 2013
# Jan Busk, 2013
@@ -13,9 +14,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-29 00:02-0400\n"
+"PO-Revision-Date: 2013-09-28 01:44+0000\n"
+"Last-Translator: Daniel Sandman <revoltism@gmail.com>\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"
@@ -28,7 +29,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,55 +91,88 @@ msgstr "Kan inte radera användare från gruppen %s"
msgid "Couldn't update app."
msgstr "Kunde inte uppdatera appen."
-#: js/apps.js:35
+#: changepassword/controller.php:20
+msgid "Wrong password"
+msgstr "Fel lösenord"
+
+#: changepassword/controller.php:42
+msgid "No user supplied"
+msgstr "Ingen användare angiven"
+
+#: changepassword/controller.php:74
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr "Ange ett återställningslösenord för administratören. Annars kommer all användardata förloras"
+
+#: changepassword/controller.php:79
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr "Felaktigt återställningslösenord för administratör. Kolla lösenordet och prova igen."
+
+#: changepassword/controller.php:87
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr "Gränssnittet stödjer inte byte av lösenord, men användarnas krypteringsnyckel blev uppdaterad."
+
+#: changepassword/controller.php:92 changepassword/controller.php:103
+msgid "Unable to change password"
+msgstr "Kunde inte ändra lösenord"
+
+#: js/apps.js:43
msgid "Update to {appversion}"
msgstr "Uppdatera till {appversion}"
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:110
msgid "Disable"
msgstr "Deaktivera"
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
msgid "Enable"
msgstr "Aktivera"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr "Var god vänta..."
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:101
msgid "Error while disabling app"
-msgstr ""
+msgstr "Fel vid inaktivering av app"
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:100 js/apps.js:114 js/apps.js:115
msgid "Error while enabling app"
-msgstr ""
+msgstr "Fel vid aktivering av app"
-#: js/apps.js:115
+#: js/apps.js:125
msgid "Updating...."
msgstr "Uppdaterar..."
-#: js/apps.js:118
+#: js/apps.js:128
msgid "Error while updating app"
msgstr "Fel uppstod vid uppdatering av appen"
-#: js/apps.js:118
+#: js/apps.js:128
msgid "Error"
msgstr "Fel"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:129 templates/apps.php:43
msgid "Update"
msgstr "Uppdatera"
-#: js/apps.js:122
+#: js/apps.js:132
msgid "Updated"
msgstr "Uppdaterad"
-#: js/personal.js:150
+#: js/personal.js:221
+msgid "Select a profile picture"
+msgstr "Välj en profilbild"
+
+#: js/personal.js:266
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:172
+#: js/personal.js:288
msgid "Saving..."
msgstr "Sparar..."
@@ -154,16 +188,16 @@ msgstr "ångra"
msgid "Unable to remove user"
msgstr "Kan inte ta bort användare"
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "Grupper"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "Gruppadministratör"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "Radera"
@@ -183,7 +217,7 @@ msgstr "Fel vid skapande av användare"
msgid "A valid password must be provided"
msgstr "Ett giltigt lösenord måste anges"
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "__language_name__"
@@ -349,11 +383,11 @@ msgstr "Mer"
msgid "Less"
msgstr "Mindre"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "Version"
-#: templates/admin.php:246 templates/personal.php:143
+#: 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 "
@@ -420,7 +454,7 @@ msgstr "Visa Första uppstarts-guiden igen"
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Du har använt <strong>%s</strong> av tillgängliga <strong>%s</strong>"
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "Lösenord"
@@ -444,7 +478,7 @@ msgstr "Nytt lösenord"
msgid "Change password"
msgstr "Ändra lösenord"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr "Visningsnamn"
@@ -460,38 +494,66 @@ msgstr "Din e-postadress"
msgid "Fill in an email address to enable password recovery"
msgstr "Fyll i en e-postadress för att aktivera återställning av lösenord"
-#: templates/personal.php:85 templates/personal.php:86
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr "Profilbild"
+
+#: templates/personal.php:90
+msgid "Upload new"
+msgstr "Ladda upp ny"
+
+#: templates/personal.php:92
+msgid "Select new from Files"
+msgstr "Välj ny från filer"
+
+#: templates/personal.php:93
+msgid "Remove image"
+msgstr "Radera bild"
+
+#: templates/personal.php:94
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr "Antingen png eller jpg. Helst fyrkantig, men du kommer att kunna beskära den."
+
+#: templates/personal.php:97
+msgid "Abort"
+msgstr "Avbryt"
+
+#: templates/personal.php:98
+msgid "Choose as profile image"
+msgstr "Välj som profilbild"
+
+#: templates/personal.php:106 templates/personal.php:107
msgid "Language"
msgstr "Språk"
-#: templates/personal.php:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "Hjälp att översätta"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: 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 "Använd denna adress för att <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">komma åt dina filer via WebDAV</a>"
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "Kryptering"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr "Appen för kryptering är inte längre aktiverad, dekryptera alla dina filer"
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr "Inloggningslösenord"
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr "Dekryptera alla filer"
@@ -517,30 +579,30 @@ msgstr "Enter the recovery password in order to recover the users files during p
msgid "Default Storage"
msgstr "Förvald lagring"
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr "Obegränsad"
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "Annat"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "Användarnamn"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr "Lagring"
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr "ändra visningsnamn"
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr "ange nytt lösenord"
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr "Förvald"
diff --git a/l10n/sv/user_ldap.po b/l10n/sv/user_ldap.po
index f29bad549d307efbaf4e5867145e912bc0ac3631..48d8dddb418961bf77797590c90e943fba482198 100644
--- a/l10n/sv/user_ldap.po
+++ b/l10n/sv/user_ldap.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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-05 11:51+0000\n"
+"Last-Translator: Magnus Höglund <magnus@linux.com>\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"
@@ -158,7 +158,7 @@ msgstr "Filter logga in användare"
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action. Example: \"uid=%%uid\""
-msgstr ""
+msgstr "Definierar filter som tillämpas vid inloggning. %%uid ersätter användarnamn vid inloggningen. Exempel: \"uid=%%uid\""
#: templates/settings.php:55
msgid "User List Filter"
@@ -168,7 +168,7 @@ msgstr "Filter lista användare"
msgid ""
"Defines the filter to apply, when retrieving users (no placeholders). "
"Example: \"objectClass=person\""
-msgstr ""
+msgstr "Definierar filter som tillämpas vid sökning efter användare (inga platshållare). Exempel: \"objectClass=person\""
#: templates/settings.php:59
msgid "Group Filter"
@@ -178,7 +178,7 @@ msgstr "Gruppfilter"
msgid ""
"Defines the filter to apply, when retrieving groups (no placeholders). "
"Example: \"objectClass=posixGroup\""
-msgstr ""
+msgstr "Definierar filter som tillämpas vid sökning efter grupper (inga platshållare). Exempel: \"objectClass=posixGroup\""
#: templates/settings.php:66
msgid "Connection Settings"
@@ -239,7 +239,7 @@ msgstr "Stäng av verifiering av SSL-certifikat."
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 "Rekommenderas inte, använd endast för test! Om anslutningen bara fungerar med denna inställning behöver du importera LDAP-serverns SSL-certifikat till din %s server."
#: templates/settings.php:76
msgid "Cache Time-To-Live"
diff --git a/l10n/sw_KE/core.po b/l10n/sw_KE/core.po
index d2936e463c64eb1e41d30ef4ba5805f05d0f7e79..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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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"
@@ -22,6 +22,10 @@ msgstr ""
msgid "%s shared »%s« with you"
msgstr ""
+#: ajax/share.php:227
+msgid "group"
+msgstr ""
+
#: ajax/update.php:11
msgid "Turned on maintenance mode"
msgstr ""
@@ -86,6 +90,26 @@ msgstr ""
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 ""
@@ -162,59 +186,59 @@ msgstr ""
msgid "December"
msgstr ""
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr ""
-#: js/js.js:812
+#: js/js.js:866
msgid "seconds ago"
msgstr ""
-#: js/js.js:813
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:814
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:815
+#: js/js.js:869
msgid "today"
msgstr ""
-#: js/js.js:816
+#: js/js.js:870
msgid "yesterday"
msgstr ""
-#: js/js.js:817
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:818
+#: js/js.js:872
msgid "last month"
msgstr ""
-#: js/js.js:819
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:820
+#: js/js.js:874
msgid "months ago"
msgstr ""
-#: js/js.js:821
+#: js/js.js:875
msgid "last year"
msgstr ""
-#: js/js.js:822
+#: js/js.js:876
msgid "years ago"
msgstr ""
@@ -222,22 +246,66 @@ msgstr ""
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:195
+#: 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."
@@ -247,7 +315,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:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr ""
@@ -267,7 +335,7 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr ""
@@ -323,67 +391,67 @@ msgstr ""
msgid "Expiration date"
msgstr ""
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr ""
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr ""
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr ""
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr ""
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr ""
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr ""
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr ""
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr ""
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr ""
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr ""
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr ""
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr ""
@@ -398,7 +466,7 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr ""
@@ -467,7 +535,7 @@ msgstr ""
msgid "Users"
msgstr ""
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr ""
@@ -596,14 +664,10 @@ msgstr ""
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr ""
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr ""
@@ -618,19 +682,19 @@ msgstr ""
msgid "Please change your password to secure your account again."
msgstr ""
-#: templates/login.php:34
+#: templates/login.php:32
msgid "Lost your password?"
msgstr ""
-#: templates/login.php:39
+#: templates/login.php:37
msgid "remember"
msgstr ""
-#: templates/login.php:41
+#: templates/login.php:39
msgid "Log in"
msgstr ""
-#: templates/login.php:47
+#: templates/login.php:45
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/sw_KE/files.po b/l10n/sw_KE/files.po
index aa0606fc49fef5464f9e1521cf0e734822d14781..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-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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,7 +74,15 @@ msgstr ""
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:123
+#: 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 ""
@@ -82,149 +90,157 @@ 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: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:277 js/file-upload.js:293 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:465
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr ""
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr ""
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr ""
-#: js/filelist.js:303
+#: js/filelist.js:416
msgid "suggest name"
msgstr ""
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr ""
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr ""
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "undo"
msgstr ""
-#: js/filelist.js:453
-msgid "Uploading %n file"
-msgid_plural "Uploading %n files"
+#: 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:518
-msgid "files uploading"
+#: 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/files.js:52
+#: 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: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 ""
-#: js/files.js:580
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/files.js:586
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-
#: lib/app.php:73
#, php-format
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 ""
@@ -260,84 +276,68 @@ 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 ""
-#: templates/part.list.php:74
-msgid "directory"
-msgstr ""
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr ""
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr ""
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr ""
-
#: templates/upgrade.php:2
msgid "Upgrading filesystem cache..."
msgstr ""
diff --git a/l10n/sw_KE/lib.po b/l10n/sw_KE/lib.po
index 8b725f24b816fd0680e60164c6010e3e3b2743be..1c9b03e91746b9fcfed38d9fa689055f1157d976 100644
--- a/l10n/sw_KE/lib.po
+++ b/l10n/sw_KE/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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\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"
"Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
"MIME-Version: 1.0\n"
@@ -48,11 +48,23 @@ msgstr ""
msgid "Admin"
msgstr ""
-#: app.php:837
+#: 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 ""
@@ -105,37 +117,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: 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:150
+#: 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:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -264,51 +276,51 @@ msgstr ""
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr ""
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr ""
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr ""
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr ""
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr ""
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr ""
diff --git a/l10n/sw_KE/settings.po b/l10n/sw_KE/settings.po
index efcf28d104af4f21e32f06132c77650ce2adc5a5..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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+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,55 +84,88 @@ msgstr ""
msgid "Couldn't update app."
msgstr ""
-#: js/apps.js:35
+#: 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:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr ""
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr ""
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr ""
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr ""
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr ""
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr ""
-#: js/personal.js:150
+#: 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:172
+#: js/personal.js:287
msgid "Saving..."
msgstr ""
@@ -148,16 +181,16 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: 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:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr ""
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr ""
@@ -177,7 +210,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr ""
@@ -343,11 +376,11 @@ msgstr ""
msgid "Less"
msgstr ""
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr ""
-#: templates/admin.php:246 templates/personal.php:143
+#: 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 "
@@ -414,7 +447,7 @@ msgstr ""
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:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr ""
@@ -438,7 +471,7 @@ msgstr ""
msgid "Change password"
msgstr ""
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr ""
@@ -454,38 +487,66 @@ msgstr ""
msgid "Fill in an email address to enable password recovery"
msgstr ""
-#: templates/personal.php:85 templates/personal.php:86
-msgid "Language"
+#: 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:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:106
+#: 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:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr ""
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -511,30 +572,30 @@ msgstr ""
msgid "Default Storage"
msgstr ""
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr ""
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr ""
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr ""
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr ""
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr ""
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr ""
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr ""
diff --git a/l10n/ta_LK/core.po b/l10n/ta_LK/core.po
index d0cd9f81d705a217d52924f9c8702be986bb0ade..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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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"
@@ -22,6 +22,10 @@ msgstr ""
msgid "%s shared »%s« with you"
msgstr ""
+#: ajax/share.php:227
+msgid "group"
+msgstr "குழு"
+
#: ajax/update.php:11
msgid "Turned on maintenance mode"
msgstr ""
@@ -86,6 +90,26 @@ msgstr "நீக்குவதற்கு எந்தப் பிரிவ
msgid "Error removing %s from favorites."
msgstr "விருப்பத்திலிருந்து %s ஐ அகற்றுவதில் வழு.உஇஇ"
+#: 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 "ஞாயிற்றுக்கிழமை"
@@ -162,59 +186,59 @@ msgstr "கார்த்திகை"
msgid "December"
msgstr "மார்கழி"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "அமைப்புகள்"
-#: js/js.js:812
+#: js/js.js:866
msgid "seconds ago"
msgstr "செக்கன்களுக்கு முன்"
-#: js/js.js:813
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:814
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:815
+#: js/js.js:869
msgid "today"
msgstr "இன்று"
-#: js/js.js:816
+#: js/js.js:870
msgid "yesterday"
msgstr "நேற்று"
-#: js/js.js:817
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:818
+#: js/js.js:872
msgid "last month"
msgstr "கடந்த மாதம்"
-#: js/js.js:819
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:820
+#: js/js.js:874
msgid "months ago"
msgstr "மாதங்களுக்கு முன்"
-#: js/js.js:821
+#: js/js.js:875
msgid "last year"
msgstr "கடந்த வருடம்"
-#: js/js.js:822
+#: js/js.js:876
msgid "years ago"
msgstr "வருடங்களுக்கு முன்"
@@ -222,22 +246,66 @@ msgstr "வருடங்களுக்கு முன்"
msgid "Choose"
msgstr "தெரிவுசெய்க "
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "ஆம்"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "இல்லை"
-#: js/oc-dialogs.js:195
+#: 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."
@@ -247,7 +315,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:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "வழு"
@@ -267,7 +335,7 @@ msgstr ""
msgid "Share"
msgstr "பகிர்வு"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr "பகிரும் போதான வழு"
@@ -323,67 +391,67 @@ msgstr "காலாவதி தேதியை குறிப்பிடு
msgid "Expiration date"
msgstr "காலவதியாகும் திகதி"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "மின்னஞ்சலினூடான பகிர்வு: "
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "நபர்கள் யாரும் இல்லை"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "மீள்பகிர்வதற்கு அனுமதி இல்லை "
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr "{பயனாளர்} உடன் {உருப்படி} பகிரப்பட்டுள்ளது"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "பகிரப்படாதது"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "தொகுக்க முடியும்"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "கட்டுப்பாடான அணுகல்"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "உருவவாக்கல்"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "இற்றைப்படுத்தல்"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "நீக்குக"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "பகிர்தல்"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "கடவுச்சொல் பாதுகாக்கப்பட்டது"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr "காலாவதியாகும் திகதியை குறிப்பிடாமைக்கான வழு"
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr "காலாவதியாகும் திகதியை குறிப்பிடுவதில் வழு"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr ""
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr ""
@@ -398,7 +466,7 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr ""
@@ -467,7 +535,7 @@ msgstr "தனிப்பட்ட"
msgid "Users"
msgstr "பயனாளர்"
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "செயலிகள்"
@@ -596,14 +664,10 @@ msgstr "அமைப்பை முடிக்க"
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "விடுபதிகை செய்க"
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "தன்னிச்சையான புகுபதிகை நிராகரிப்பட்டது!"
@@ -618,19 +682,19 @@ msgstr "உங்களுடைய கடவுச்சொல்லை அண
msgid "Please change your password to secure your account again."
msgstr "உங்களுடைய கணக்கை மீண்டும் பாதுகாக்க தயவுசெய்து உங்களுடைய கடவுச்சொல்லை மாற்றவும்."
-#: templates/login.php:34
+#: templates/login.php:32
msgid "Lost your password?"
msgstr "உங்கள் கடவுச்சொல்லை தொலைத்துவிட்டீர்களா?"
-#: templates/login.php:39
+#: templates/login.php:37
msgid "remember"
msgstr "ஞாபகப்படுத்துக"
-#: templates/login.php:41
+#: templates/login.php:39
msgid "Log in"
msgstr "புகுபதிகை"
-#: templates/login.php:47
+#: templates/login.php:45
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/ta_LK/files.po b/l10n/ta_LK/files.po
index 79dfa233f953e3ced88ae08b81781cbfe743beec..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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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,7 +74,15 @@ msgstr "வட்டில் எழுத முடியவில்லை"
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:123
+#: 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 ""
@@ -82,149 +90,157 @@ 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: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 "URL வெறுமையாக இருக்கமுடியாது."
-#: 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:277 js/file-upload.js:293 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:465
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "நிலுவையிலுள்ள"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{new_name} ஏற்கனவே உள்ளது"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "மாற்றிடுக"
-#: js/filelist.js:303
+#: js/filelist.js:416
msgid "suggest name"
msgstr "பெயரை பரிந்துரைக்க"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "இரத்து செய்க"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr "{new_name} ஆனது {old_name} இனால் மாற்றப்பட்டது"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "undo"
msgstr "முன் செயல் நீக்கம் "
-#: js/filelist.js:453
-msgid "Uploading %n file"
-msgid_plural "Uploading %n files"
+#: 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:518
-msgid "files uploading"
+#: 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/files.js:52
+#: 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: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 "மாற்றப்பட்டது"
-#: js/files.js:580
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/files.js:586
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-
#: lib/app.php:73
#, php-format
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 "பதிவேற்றுக"
@@ -260,84 +276,68 @@ 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: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 "தற்போது வருடப்படுபவை"
-#: templates/part.list.php:74
-msgid "directory"
-msgstr ""
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr ""
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr ""
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr ""
-
#: templates/upgrade.php:2
msgid "Upgrading filesystem cache..."
msgstr ""
diff --git a/l10n/ta_LK/files_sharing.po b/l10n/ta_LK/files_sharing.po
index 6f439f6a08fa6f28f9065cab48d0cdb584edec95..73a4ffdeae2216a3af721432b985fbdf192806bc 100644
--- a/l10n/ta_LK/files_sharing.po
+++ b/l10n/ta_LK/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00: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"
@@ -63,7 +63,7 @@ msgstr "%s கோப்புறையானது %s உடன் பகிர
msgid "%s shared the file %s with you"
msgstr "%s கோப்பானது %s உடன் பகிரப்பட்டது"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "பதிவிறக்குக"
@@ -75,6 +75,6 @@ msgstr "பதிவேற்றுக"
msgid "Cancel upload"
msgstr "பதிவேற்றலை இரத்து செய்க"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "அதற்கு முன்னோக்கு ஒன்றும் இல்லை"
diff --git a/l10n/ta_LK/lib.po b/l10n/ta_LK/lib.po
index 12cde4a741f979e7004e72eb11de435153326925..13095e3d78d5e693921bb875b2cac3fa9564c1b8 100644
--- a/l10n/ta_LK/lib.po
+++ b/l10n/ta_LK/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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\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"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
@@ -48,11 +48,23 @@ msgstr "பயனாளர்"
msgid "Admin"
msgstr "நிர்வாகம்"
-#: app.php:837
+#: 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 "வலைய சேவைகள் உங்களுடைய கட்டுப்பாட்டின் கீழ் உள்ளது"
@@ -105,37 +117,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: 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:150
+#: 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:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -264,51 +276,51 @@ msgstr ""
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "செக்கன்களுக்கு முன்"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "இன்று"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "நேற்று"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "கடந்த மாதம்"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "கடந்த வருடம்"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "வருடங்களுக்கு முன்"
diff --git a/l10n/ta_LK/settings.po b/l10n/ta_LK/settings.po
index 6397e7f2b9f9226dbeb6237d10aa74653482fc8c..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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+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,55 +84,88 @@ msgstr "குழு %s இலிருந்து பயனாளரை நீ
msgid "Couldn't update app."
msgstr ""
-#: js/apps.js:35
+#: 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:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr "இயலுமைப்ப"
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr "இயலுமைப்படுத்துக"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr ""
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "வழு"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr "இற்றைப்படுத்தல்"
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr ""
-#: js/personal.js:150
+#: 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:172
+#: js/personal.js:287
msgid "Saving..."
msgstr "சேமிக்கப்படுகிறது..."
@@ -148,16 +181,16 @@ msgstr "முன் செயல் நீக்கம் "
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: 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:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "குழு நிர்வாகி"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "நீக்குக"
@@ -177,7 +210,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "_மொழி_பெயர்_"
@@ -343,11 +376,11 @@ msgstr "மேலதிக"
msgid "Less"
msgstr "குறைவான"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr ""
-#: templates/admin.php:246 templates/personal.php:143
+#: 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 "
@@ -414,7 +447,7 @@ msgstr ""
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "நீங்கள் <strong>%s</strong> இலுள்ள <strong>%s</strong>பயன்படுத்தியுள்ளீர்கள்"
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "கடவுச்சொல்"
@@ -438,7 +471,7 @@ msgstr "புதிய கடவுச்சொல்"
msgid "Change password"
msgstr "கடவுச்சொல்லை மாற்றுக"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr ""
@@ -454,38 +487,66 @@ msgstr "உங்களுடைய மின்னஞ்சல் முகவ
msgid "Fill in an email address to enable password recovery"
msgstr "கடவுச்சொல் மீள் பெறுவதை இயலுமைப்படுத்துவதற்கு மின்னஞ்சல் முகவரியை இயலுமைப்படுத்துக"
-#: templates/personal.php:85 templates/personal.php:86
+#: 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:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "மொழிபெயர்க்க உதவி"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:106
+#: 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:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "மறைக்குறியீடு"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -511,30 +572,30 @@ msgstr ""
msgid "Default Storage"
msgstr ""
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr ""
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "மற்றவை"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "பயனாளர் பெயர்"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr ""
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr ""
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr ""
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr ""
diff --git a/l10n/ta_LK/user_ldap.po b/l10n/ta_LK/user_ldap.po
index 971037c405620b2031ebfb6e0074cf203886f013..3df1b0da627ecdea4e62a9bc573600ef5760034e 100644
--- a/l10n/ta_LK/user_ldap.po
+++ b/l10n/ta_LK/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\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"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/te/core.po b/l10n/te/core.po
index 0c79b701dcd3119328efb2bdf56811759c0d8ed0..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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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"
@@ -22,6 +22,10 @@ msgstr ""
msgid "%s shared »%s« with you"
msgstr ""
+#: ajax/share.php:227
+msgid "group"
+msgstr ""
+
#: ajax/update.php:11
msgid "Turned on maintenance mode"
msgstr ""
@@ -86,6 +90,26 @@ msgstr ""
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 "ఆదివారం"
@@ -162,59 +186,59 @@ msgstr "నవంబర్"
msgid "December"
msgstr "డిసెంబర్"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "అమరికలు"
-#: js/js.js:812
+#: js/js.js:866
msgid "seconds ago"
msgstr "క్షణాల క్రితం"
-#: js/js.js:813
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:814
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:815
+#: js/js.js:869
msgid "today"
msgstr "ఈరోజు"
-#: js/js.js:816
+#: js/js.js:870
msgid "yesterday"
msgstr "నిన్న"
-#: js/js.js:817
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:818
+#: js/js.js:872
msgid "last month"
msgstr "పోయిన నెల"
-#: js/js.js:819
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:820
+#: js/js.js:874
msgid "months ago"
msgstr "నెలల క్రితం"
-#: js/js.js:821
+#: js/js.js:875
msgid "last year"
msgstr "పోయిన సంవత్సరం"
-#: js/js.js:822
+#: js/js.js:876
msgid "years ago"
msgstr "సంవత్సరాల క్రితం"
@@ -222,22 +246,66 @@ msgstr "సంవత్సరాల క్రితం"
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "అవును"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "కాదు"
-#: js/oc-dialogs.js:195
+#: 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."
@@ -247,7 +315,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:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "పొరపాటు"
@@ -267,7 +335,7 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr ""
@@ -323,67 +391,67 @@ msgstr ""
msgid "Expiration date"
msgstr "కాలం చెల్లు తేదీ"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr ""
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr ""
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr ""
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr ""
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr ""
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr ""
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr ""
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "తొలగించు"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr ""
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr ""
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr ""
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr ""
@@ -398,7 +466,7 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr ""
@@ -467,7 +535,7 @@ msgstr ""
msgid "Users"
msgstr "వాడుకరులు"
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr ""
@@ -596,14 +664,10 @@ msgstr ""
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "నిష్క్రమించు"
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr ""
@@ -618,19 +682,19 @@ msgstr ""
msgid "Please change your password to secure your account again."
msgstr ""
-#: templates/login.php:34
+#: templates/login.php:32
msgid "Lost your password?"
msgstr "మీ సంకేతపదం పోయిందా?"
-#: templates/login.php:39
+#: templates/login.php:37
msgid "remember"
msgstr ""
-#: templates/login.php:41
+#: templates/login.php:39
msgid "Log in"
msgstr ""
-#: templates/login.php:47
+#: templates/login.php:45
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/te/files.po b/l10n/te/files.po
index bfc6052c32b6ff04979432139f130f5e866d2dba..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-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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,7 +74,15 @@ msgstr ""
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:123
+#: 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 ""
@@ -82,149 +90,157 @@ 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: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:277 js/file-upload.js:293 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:465
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr ""
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr ""
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr ""
-#: js/filelist.js:303
+#: js/filelist.js:416
msgid "suggest name"
msgstr ""
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "రద్దుచేయి"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr ""
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "undo"
msgstr ""
-#: js/filelist.js:453
-msgid "Uploading %n file"
-msgid_plural "Uploading %n files"
+#: 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:518
-msgid "files uploading"
+#: 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/files.js:52
+#: 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: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 ""
-#: js/files.js:580
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/files.js:586
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-
#: lib/app.php:73
#, php-format
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 ""
@@ -260,84 +276,68 @@ 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 ""
-#: templates/part.list.php:74
-msgid "directory"
-msgstr ""
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr ""
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr ""
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr ""
-
#: templates/upgrade.php:2
msgid "Upgrading filesystem cache..."
msgstr ""
diff --git a/l10n/te/files_sharing.po b/l10n/te/files_sharing.po
index ed863a3da3141cba61a13e91a379f86a40829627..3e0c6d01743ab4c0b835e46676df25064db880b4 100644
--- a/l10n/te/files_sharing.po
+++ b/l10n/te/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-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\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"
"Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
"MIME-Version: 1.0\n"
@@ -63,7 +63,7 @@ msgstr ""
msgid "%s shared the file %s with you"
msgstr ""
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr ""
@@ -75,6 +75,6 @@ msgstr ""
msgid "Cancel upload"
msgstr ""
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr ""
diff --git a/l10n/te/lib.po b/l10n/te/lib.po
index 601b9e7b00e72dda1bb21486c30da78a4a3e6241..6bea113344d111d175a518dc14b4dd426ccdfa95 100644
--- a/l10n/te/lib.po
+++ b/l10n/te/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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\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"
"Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
"MIME-Version: 1.0\n"
@@ -48,11 +48,23 @@ msgstr "వాడుకరులు"
msgid "Admin"
msgstr ""
-#: app.php:837
+#: 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 ""
@@ -105,37 +117,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: 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:150
+#: 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:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -264,51 +276,51 @@ msgstr ""
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "క్షణాల క్రితం"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "ఈరోజు"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "నిన్న"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "పోయిన నెల"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "పోయిన సంవత్సరం"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "సంవత్సరాల క్రితం"
diff --git a/l10n/te/settings.po b/l10n/te/settings.po
index 13caf52b176a9acf81808ce853ecbdbe782ba227..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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+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,55 +84,88 @@ msgstr ""
msgid "Couldn't update app."
msgstr ""
-#: js/apps.js:35
+#: 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:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr ""
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr ""
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr ""
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "పొరపాటు"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr ""
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr ""
-#: js/personal.js:150
+#: 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:172
+#: js/personal.js:287
msgid "Saving..."
msgstr ""
@@ -148,16 +181,16 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: 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:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr ""
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "తొలగించు"
@@ -177,7 +210,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr ""
@@ -343,11 +376,11 @@ msgstr "మరిన్ని"
msgid "Less"
msgstr ""
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr ""
-#: templates/admin.php:246 templates/personal.php:143
+#: 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 "
@@ -414,7 +447,7 @@ msgstr ""
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:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "సంకేతపదం"
@@ -438,7 +471,7 @@ msgstr "కొత్త సంకేతపదం"
msgid "Change password"
msgstr ""
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr ""
@@ -454,38 +487,66 @@ msgstr "మీ ఈమెయిలు చిరునామా"
msgid "Fill in an email address to enable password recovery"
msgstr ""
-#: templates/personal.php:85 templates/personal.php:86
+#: 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:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr ""
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:106
+#: 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:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr ""
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -511,30 +572,30 @@ msgstr ""
msgid "Default Storage"
msgstr ""
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr ""
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr ""
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "వాడుకరి పేరు"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr ""
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr ""
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr ""
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr ""
diff --git a/l10n/te/user_ldap.po b/l10n/te/user_ldap.po
index ae1d36e9c5978d7558ca86aaf8495fa616ae311a..f187c04b451425b5703ca92087e63f5819a919be 100644
--- a/l10n/te/user_ldap.po
+++ b/l10n/te/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\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"
"Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 9748d786fd9e5efb2703694809dd4521266dd48f..687b168209c8d5070bd04c13b193d92345c73db8 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-08-27 11:18-0400\n"
+"POT-Creation-Date: 2013-09-30 10:16-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"
@@ -23,6 +23,10 @@ msgstr ""
msgid "%s shared »%s« with you"
msgstr ""
+#: ajax/share.php:227
+msgid "group"
+msgstr ""
+
#: ajax/update.php:11
msgid "Turned on maintenance mode"
msgstr ""
@@ -87,6 +91,26 @@ msgstr ""
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 ""
@@ -163,59 +187,59 @@ msgstr ""
msgid "December"
msgstr ""
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr ""
-#: js/js.js:812
+#: js/js.js:866
msgid "seconds ago"
msgstr ""
-#: js/js.js:813
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:814
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:815
+#: js/js.js:869
msgid "today"
msgstr ""
-#: js/js.js:816
+#: js/js.js:870
msgid "yesterday"
msgstr ""
-#: js/js.js:817
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:818
+#: js/js.js:872
msgid "last month"
msgstr ""
-#: js/js.js:819
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:820
+#: js/js.js:874
msgid "months ago"
msgstr ""
-#: js/js.js:821
+#: js/js.js:875
msgid "last year"
msgstr ""
-#: js/js.js:822
+#: js/js.js:876
msgid "years ago"
msgstr ""
@@ -223,22 +247,66 @@ msgstr ""
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:195
+#: 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."
@@ -248,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:643 js/share.js:655
+#: js/share.js:656 js/share.js:668
msgid "Error"
msgstr ""
@@ -268,7 +336,7 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:696
msgid "Error while sharing"
msgstr ""
@@ -324,67 +392,67 @@ msgstr ""
msgid "Expiration date"
msgstr ""
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr ""
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr ""
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr ""
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr ""
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr ""
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr ""
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr ""
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr ""
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr ""
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:643
msgid "Password protected"
msgstr ""
-#: js/share.js:643
+#: js/share.js:656
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:655
+#: js/share.js:668
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:670
+#: js/share.js:683
msgid "Sending ..."
msgstr ""
-#: js/share.js:681
+#: js/share.js:694
msgid "Email sent"
msgstr ""
@@ -399,7 +467,7 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr ""
@@ -468,7 +536,7 @@ msgstr ""
msgid "Users"
msgstr ""
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr ""
@@ -597,14 +665,10 @@ msgstr ""
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr ""
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr ""
@@ -619,19 +683,19 @@ msgstr ""
msgid "Please change your password to secure your account again."
msgstr ""
-#: templates/login.php:34
+#: templates/login.php:32
msgid "Lost your password?"
msgstr ""
-#: templates/login.php:39
+#: templates/login.php:37
msgid "remember"
msgstr ""
-#: templates/login.php:41
+#: templates/login.php:39
msgid "Log in"
msgstr ""
-#: templates/login.php:47
+#: templates/login.php:45
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 42827509e9689e504ca827262c74111f0da0f73f..5a5cf056beb95345b3f102aca16096d3c40f6617 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-08-27 11:18-0400\n"
+"POT-Creation-Date: 2013-09-30 10:14-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,157 +75,173 @@ msgstr ""
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:123
+#: 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
+#: 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:64
+#: 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:277 js/file-upload.js:293 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:465
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr ""
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr ""
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr ""
-#: js/filelist.js:303
+#: js/filelist.js:416
msgid "suggest name"
msgstr ""
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr ""
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr ""
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "undo"
msgstr ""
-#: js/filelist.js:453
-msgid "Uploading %n file"
-msgid_plural "Uploading %n files"
+#: 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:518
-msgid "files uploading"
+#: 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/files.js:52
+#: 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: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 ""
-#: js/files.js:580
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/files.js:586
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-
#: lib/app.php:73
#, php-format
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 ""
@@ -261,84 +277,68 @@ 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 ""
-#: templates/part.list.php:74
-msgid "directory"
-msgstr ""
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr ""
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr ""
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr ""
-
#: templates/upgrade.php:2
msgid "Upgrading filesystem cache..."
msgstr ""
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index 4ef21df3b2785ffbdde4c48f0c22d6478571024c..312f7f29bb0e6b1072fd30fb41faf9d0844adbe5 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-08-27 11:18-0400\n"
+"POT-Creation-Date: 2013-09-30 10:15-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:41
+#: hooks/hooks.php:53
msgid "Missing requirements."
msgstr ""
-#: hooks/hooks.php:42
+#: 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:249
+#: 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 0fb852ce25e223747ead12ddf7f236b19c6aa0eb..0ec2c070912ef82fb275d28310360758cc17d338 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-08-27 11:18-0400\n"
+"POT-Creation-Date: 2013-09-30 10:16-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 deda7dac0cac3066bb6497a120eaec8fe909c567..77c296c9a7c49a3c554cef885caea5e5b0bdf409 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-08-27 11:18-0400\n"
+"POT-Creation-Date: 2013-09-30 10:16-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"
@@ -63,7 +63,7 @@ msgstr ""
msgid "%s shared the file %s with you"
msgstr ""
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr ""
@@ -75,6 +75,6 @@ msgstr ""
msgid "Cancel upload"
msgstr ""
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr ""
diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot
index f8a39c581cef68adf9f7640a063d96565c17c954..b379edf9e9310d38f1a6affa8f582b368ab787cd 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-08-27 11:18-0400\n"
+"POT-Creation-Date: 2013-09-30 10:16-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"
@@ -28,43 +28,43 @@ 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 ""
-#: 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 ""
-#: 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] ""
-#: js/trash.js:197
+#: js/trash.js:205
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-#: lib/trash.php:819 lib/trash.php:821
+#: lib/trashbin.php:814 lib/trashbin.php:816
msgid "restored"
msgstr ""
@@ -72,11 +72,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 ""
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index a275a8ced5d49f5d49c6aa4792c7a107eb180f31..4d7bff6e8b69a372cec83c842b494d1bfd536ff8 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-08-27 11:18-0400\n"
+"POT-Creation-Date: 2013-09-30 10:16-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 7d21647abc7e5ca15c07c94ddb96719830b3ea3f..cdaf465ab302912b24aea53c00e7da465514ed12 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-08-27 11:18-0400\n"
+"POT-Creation-Date: 2013-09-30 10:16-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"
@@ -18,42 +18,54 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-#: app.php:239
+#: app.php:237
#, php-format
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version "
"of ownCloud."
msgstr ""
-#: app.php:250
+#: app.php:248
msgid "No app name specified"
msgstr ""
-#: app.php:361
+#: app.php:352
msgid "Help"
msgstr ""
-#: app.php:374
+#: app.php:365
msgid "Personal"
msgstr ""
-#: app.php:385
+#: app.php:376
msgid "Settings"
msgstr ""
-#: app.php:397
+#: app.php:388
msgid "Users"
msgstr ""
-#: app.php:410
+#: app.php:401
msgid "Admin"
msgstr ""
-#: app.php:837
+#: app.php:832
#, 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 ""
@@ -106,37 +118,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: 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:150
+#: 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:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -153,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 ""
@@ -265,59 +277,59 @@ msgstr ""
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: template/functions.php:80
+#: tags.php:194
+#, php-format
+msgid "Could not find category \"%s\""
+msgstr ""
+
+#: template/functions.php:96
msgid "seconds ago"
msgstr ""
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr ""
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr ""
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr ""
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr ""
-#: template/functions.php:89
+#: 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/templates/settings.pot b/l10n/templates/settings.pot
index 182d33bd7fc8b3e7a8c01557d78c142c7e9f495a..af2b7236802602fb44637ae239db1678b694dcf5 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-08-27 11:18-0400\n"
+"POT-Creation-Date: 2013-09-30 10:17-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,55 +84,87 @@ msgstr ""
msgid "Couldn't update app."
msgstr ""
-#: js/apps.js:35
+#: 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:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:110
msgid "Disable"
msgstr ""
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
msgid "Enable"
msgstr ""
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr ""
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:101
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:100 js/apps.js:114 js/apps.js:115
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:125
msgid "Updating...."
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:128
msgid "Error while updating app"
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:128
msgid "Error"
msgstr ""
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:129 templates/apps.php:43
msgid "Update"
msgstr ""
-#: js/apps.js:122
+#: js/apps.js:132
msgid "Updated"
msgstr ""
-#: js/personal.js:150
+#: js/personal.js:221
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:266
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:172
+#: js/personal.js:288
msgid "Saving..."
msgstr ""
@@ -148,16 +180,16 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: 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:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr ""
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr ""
@@ -177,7 +209,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr ""
@@ -342,11 +374,11 @@ msgstr ""
msgid "Less"
msgstr ""
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr ""
-#: templates/admin.php:246 templates/personal.php:143
+#: 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\" "
@@ -413,7 +445,7 @@ msgstr ""
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:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr ""
@@ -437,7 +469,7 @@ msgstr ""
msgid "Change password"
msgstr ""
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr ""
@@ -453,38 +485,66 @@ msgstr ""
msgid "Fill in an email address to enable password recovery"
msgstr ""
-#: templates/personal.php:85 templates/personal.php:86
-msgid "Language"
+#: 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:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:106
+#: 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:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr ""
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -510,30 +570,30 @@ msgstr ""
msgid "Default Storage"
msgstr ""
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr ""
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr ""
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr ""
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr ""
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr ""
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr ""
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr ""
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index 5e4bf621940481e63a91bc981eb89df66fd74706..ca738710f5cd80ee3485cdef0b33cde76b1202d5 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-08-27 11:18-0400\n"
+"POT-Creation-Date: 2013-09-30 10:16-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 155df0e56d8406075a573f98def0e48342f8713b..d3a899a1fe57978a0223a9adf4a9b13077b839a3 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-08-27 11:18-0400\n"
+"POT-Creation-Date: 2013-09-30 10:16-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 c633f99ca63b813e2783e7580d94733de8c439f8..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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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"
@@ -22,6 +22,10 @@ msgstr ""
msgid "%s shared »%s« with you"
msgstr ""
+#: ajax/share.php:227
+msgid "group"
+msgstr "กลุ่มผู้ใช้งาน"
+
#: ajax/update.php:11
msgid "Turned on maintenance mode"
msgstr ""
@@ -86,6 +90,26 @@ msgstr "ยังไม่ได้เลือกหมวดหมู่ที
msgid "Error removing %s from favorites."
msgstr "เกิดข้อผิดพลาดในการลบ %s ออกจากรายการโปรด"
+#: 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 "วันอาทิตย์"
@@ -162,55 +186,55 @@ msgstr "พฤศจิกายน"
msgid "December"
msgstr "ธันวาคม"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "ตั้งค่า"
-#: js/js.js:812
+#: js/js.js:866
msgid "seconds ago"
msgstr "วินาที ก่อนหน้านี้"
-#: js/js.js:813
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: js/js.js:814
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: js/js.js:815
+#: js/js.js:869
msgid "today"
msgstr "วันนี้"
-#: js/js.js:816
+#: js/js.js:870
msgid "yesterday"
msgstr "เมื่อวานนี้"
-#: js/js.js:817
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
-#: js/js.js:818
+#: js/js.js:872
msgid "last month"
msgstr "เดือนที่แล้ว"
-#: js/js.js:819
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: js/js.js:820
+#: js/js.js:874
msgid "months ago"
msgstr "เดือน ที่ผ่านมา"
-#: js/js.js:821
+#: js/js.js:875
msgid "last year"
msgstr "ปีที่แล้ว"
-#: js/js.js:822
+#: js/js.js:876
msgid "years ago"
msgstr "ปี ที่ผ่านมา"
@@ -218,22 +242,65 @@ msgstr "ปี ที่ผ่านมา"
msgid "Choose"
msgstr "เลือก"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "ตกลง"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "ไม่ตกลง"
-#: js/oc-dialogs.js:195
+#: 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] ""
+
+#: 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."
@@ -243,7 +310,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:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "ข้อผิดพลาด"
@@ -263,7 +330,7 @@ msgstr "แชร์แล้ว"
msgid "Share"
msgstr "แชร์"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr "เกิดข้อผิดพลาดในระหว่างการแชร์ข้อมูล"
@@ -319,67 +386,67 @@ msgstr "กำหนดวันที่หมดอายุ"
msgid "Expiration date"
msgstr "วันที่หมดอายุ"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "แชร์ผ่านทางอีเมล"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "ไม่พบบุคคลที่ต้องการ"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "ไม่อนุญาตให้แชร์ข้อมูลซ้ำได้"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr "ได้แชร์ {item} ให้กับ {user}"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "ยกเลิกการแชร์"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "สามารถแก้ไข"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "ระดับควบคุมการเข้าใช้งาน"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "สร้าง"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "อัพเดท"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "ลบ"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "แชร์"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "ใส่รหัสผ่านไว้"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr "เกิดข้อผิดพลาดในการยกเลิกการตั้งค่าวันที่หมดอายุ"
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr "เกิดข้อผิดพลาดในการตั้งค่าวันที่หมดอายุ"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr "กำลังส่ง..."
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr "ส่งอีเมล์แล้ว"
@@ -394,7 +461,7 @@ msgstr "การอัพเดทไม่เป็นผลสำเร็จ
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "การอัพเดทเสร็จเรียบร้อยแล้ว กำลังเปลี่ยนเส้นทางไปที่ ownCloud อยู่ในขณะนี้"
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr ""
@@ -463,7 +530,7 @@ msgstr "ส่วนตัว"
msgid "Users"
msgstr "ผู้ใช้งาน"
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "แอปฯ"
@@ -592,14 +659,10 @@ msgstr "ติดตั้งเรียบร้อยแล้ว"
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "ออกจากระบบ"
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "การเข้าสู่ระบบอัตโนมัติถูกปฏิเสธแล้ว"
@@ -614,19 +677,19 @@ msgstr "หากคุณยังไม่ได้เปลี่ยนรห
msgid "Please change your password to secure your account again."
msgstr "กรุณาเปลี่ยนรหัสผ่านของคุณอีกครั้ง เพื่อป้องกันบัญชีของคุณให้ปลอดภัย"
-#: templates/login.php:34
+#: templates/login.php:32
msgid "Lost your password?"
msgstr "ลืมรหัสผ่าน?"
-#: templates/login.php:39
+#: templates/login.php:37
msgid "remember"
msgstr "จำรหัสผ่าน"
-#: templates/login.php:41
+#: templates/login.php:39
msgid "Log in"
msgstr "เข้าสู่ระบบ"
-#: templates/login.php:47
+#: templates/login.php:45
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/th_TH/files.po b/l10n/th_TH/files.po
index b690a1127d580cb8da9b8cab76bbc56a8ac3313d..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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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,7 +74,15 @@ msgstr "เขียนข้อมูลลงแผ่นดิสก์ล้
msgid "Not enough storage available"
msgstr "เหลือพื้นที่ไม่เพียงสำหรับใช้งาน"
-#: ajax/upload.php:123
+#: 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 "ไดเร็กทอรี่ไม่ถูกต้อง"
@@ -82,146 +90,154 @@ 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: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 "URL ไม่สามารถเว้นว่างได้"
-#: 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:277 js/file-upload.js:293 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:465
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "อยู่ระหว่างดำเนินการ"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{new_name} มีอยู่แล้วในระบบ"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "แทนที่"
-#: js/filelist.js:303
+#: js/filelist.js:416
msgid "suggest name"
msgstr "แนะนำชื่อ"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "ยกเลิก"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr "แทนที่ {new_name} ด้วย {old_name} แล้ว"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "undo"
msgstr "เลิกทำ"
-#: js/filelist.js:453
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+
+#: 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] ""
-#: js/filelist.js:518
-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: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 "แก้ไขแล้ว"
-#: js/files.js:580
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-
-#: js/files.js:586
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-
#: lib/app.php:73
#, php-format
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 "อัพโหลด"
@@ -257,84 +273,68 @@ 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: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 "ไฟล์ที่กำลังสแกนอยู่ขณะนี้"
-#: templates/part.list.php:74
-msgid "directory"
-msgstr ""
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr ""
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr "ไฟล์"
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr "ไฟล์"
-
#: templates/upgrade.php:2
msgid "Upgrading filesystem cache..."
msgstr "กำลังอัพเกรดหน่วยความจำแคชของระบบไฟล์..."
diff --git a/l10n/th_TH/files_sharing.po b/l10n/th_TH/files_sharing.po
index ba9c49aba204c33f98e0be8c220f5c9f726152cd..467e3de3d83265550e0b8a6db3a32d7775407809 100644
--- a/l10n/th_TH/files_sharing.po
+++ b/l10n/th_TH/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00: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"
@@ -63,7 +63,7 @@ msgstr "%s ได้แชร์โฟลเดอร์ %s ให้กับ
msgid "%s shared the file %s with you"
msgstr "%s ได้แชร์ไฟล์ %s ให้กับคุณ"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "ดาวน์โหลด"
@@ -75,6 +75,6 @@ msgstr "อัพโหลด"
msgid "Cancel upload"
msgstr "ยกเลิกการอัพโหลด"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "ไม่สามารถดูตัวอย่างได้สำหรับ"
diff --git a/l10n/th_TH/lib.po b/l10n/th_TH/lib.po
index e882a1fb160ab3430957a6fc9fb72e020b2e3ee1..0866886c95a29db613736faf3c0ae8288acbe72a 100644
--- a/l10n/th_TH/lib.po
+++ b/l10n/th_TH/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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\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"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
@@ -48,11 +48,23 @@ msgstr "ผู้ใช้งาน"
msgid "Admin"
msgstr "ผู้ดูแล"
-#: app.php:837
+#: 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 "เว็บเซอร์วิสที่คุณควบคุมการใช้งานได้"
@@ -105,37 +117,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: 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:150
+#: 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:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -264,47 +276,47 @@ msgstr ""
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "วินาที ก่อนหน้านี้"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "วันนี้"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "เมื่อวานนี้"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "เดือนที่แล้ว"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "ปีที่แล้ว"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "ปี ที่ผ่านมา"
diff --git a/l10n/th_TH/settings.po b/l10n/th_TH/settings.po
index e08c6a264a2d8f436edebd6738268d0dbb6fdd55..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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+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,55 +84,88 @@ msgstr "ไม่สามารถลบผู้ใช้งานออกจ
msgid "Couldn't update app."
msgstr "ไม่สามารถอัพเดทแอปฯ"
-#: js/apps.js:35
+#: 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}"
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr "ปิดใช้งาน"
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr "เปิดใช้งาน"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr "กรุณารอสักครู่..."
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr "กำลังอัพเดทข้อมูล..."
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr "เกิดข้อผิดพลาดในระหว่างการอัพเดทแอปฯ"
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "ข้อผิดพลาด"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr "อัพเดท"
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr "อัพเดทแล้ว"
-#: js/personal.js:150
+#: 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:172
+#: js/personal.js:287
msgid "Saving..."
msgstr "กำลังบันทึกข้อมูล..."
@@ -148,16 +181,16 @@ msgstr "เลิกทำ"
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: 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:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "ผู้ดูแลกลุ่ม"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "ลบ"
@@ -177,7 +210,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "ภาษาไทย"
@@ -343,11 +376,11 @@ msgstr "มาก"
msgid "Less"
msgstr "น้อย"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "รุ่น"
-#: templates/admin.php:246 templates/personal.php:143
+#: 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 "
@@ -414,7 +447,7 @@ msgstr "แสดงหน้าจอวิซาร์ดนำทางคร
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "คุณได้ใช้งานไปแล้ว <strong>%s</strong> จากจำนวนที่สามารถใช้ได้ <strong>%s</strong>"
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "รหัสผ่าน"
@@ -438,7 +471,7 @@ msgstr "รหัสผ่านใหม่"
msgid "Change password"
msgstr "เปลี่ยนรหัสผ่าน"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr "ชื่อที่ต้องการแสดง"
@@ -454,38 +487,66 @@ msgstr "ที่อยู่อีเมล์ของคุณ"
msgid "Fill in an email address to enable password recovery"
msgstr "กรอกที่อยู่อีเมล์ของคุณเพื่อเปิดให้มีการกู้คืนรหัสผ่านได้"
-#: templates/personal.php:85 templates/personal.php:86
+#: 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:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "ช่วยกันแปล"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: 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:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "การเข้ารหัส"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -511,30 +572,30 @@ msgstr ""
msgid "Default Storage"
msgstr "พื้นที่จำกัดข้อมูลเริ่มต้น"
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr "ไม่จำกัดจำนวน"
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "อื่นๆ"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "ชื่อผู้ใช้งาน"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr "พื้นที่จัดเก็บข้อมูล"
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr "เปลี่ยนชื่อที่ต้องการให้แสดง"
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr "ตั้งค่ารหัสผ่านใหม่"
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr "ค่าเริ่มต้น"
diff --git a/l10n/th_TH/user_ldap.po b/l10n/th_TH/user_ldap.po
index d1f63c56b87e98e349adcfdb7fd141630f20d576..f1de28b8322e47778a326306ea5015c8e2f67ccc 100644
--- a/l10n/th_TH/user_ldap.po
+++ b/l10n/th_TH/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\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"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/tr/core.po b/l10n/tr/core.po
index 9cdba88e1f1989c254f3f8cf60fcaafa0b480ed2..286f827c66c9b51ac36004a643c7817035094fc8 100644
--- a/l10n/tr/core.po
+++ b/l10n/tr/core.po
@@ -3,14 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Fatih Aşıcı <fatih.asici@gmail.com>, 2013
# ismail yenigül <ismail.yenigul@surgate.com>, 2013
# tridinebandim, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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"
@@ -24,30 +25,34 @@ msgstr ""
msgid "%s shared »%s« with you"
msgstr "%s sizinle »%s« paylaşımında bulundu"
+#: ajax/share.php:227
+msgid "group"
+msgstr "grup"
+
#: ajax/update.php:11
msgid "Turned on maintenance mode"
-msgstr ""
+msgstr "Bakım kipi etkinleştirildi"
#: ajax/update.php:14
msgid "Turned off maintenance mode"
-msgstr ""
+msgstr "Bakım kipi kapatıldı"
#: ajax/update.php:17
msgid "Updated database"
-msgstr ""
+msgstr "Veritabanı güncellendi"
#: ajax/update.php:20
msgid "Updating filecache, this may take really long..."
-msgstr ""
+msgstr "Dosya önbelleği güncelleniyor. Bu, gerçekten uzun sürebilir."
#: ajax/update.php:23
msgid "Updated filecache"
-msgstr ""
+msgstr "Dosya önbelleği güncellendi"
#: ajax/update.php:26
#, php-format
msgid "... %d%% done ..."
-msgstr ""
+msgstr "%%%d tamamlandı ..."
#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
msgid "Category type not provided."
@@ -88,6 +93,26 @@ msgstr "Silmek için bir kategori seçilmedi"
msgid "Error removing %s from favorites."
msgstr "%s favorilere çıkarılırken hata oluştu"
+#: 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 "Pazar"
@@ -164,59 +189,59 @@ msgstr "Kasım"
msgid "December"
msgstr "Aralık"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "Ayarlar"
-#: js/js.js:812
+#: js/js.js:866
msgid "seconds ago"
msgstr "saniye önce"
-#: js/js.js:813
+#: 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:814
+#: 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:815
+#: js/js.js:869
msgid "today"
msgstr "bugün"
-#: js/js.js:816
+#: js/js.js:870
msgid "yesterday"
msgstr "dün"
-#: js/js.js:817
+#: 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:818
+#: js/js.js:872
msgid "last month"
msgstr "geçen ay"
-#: js/js.js:819
+#: 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:820
+#: js/js.js:874
msgid "months ago"
msgstr "ay önce"
-#: js/js.js:821
+#: js/js.js:875
msgid "last year"
msgstr "geçen yıl"
-#: js/js.js:822
+#: js/js.js:876
msgid "years ago"
msgstr "yıl önce"
@@ -224,22 +249,66 @@ msgstr "yıl önce"
msgid "Choose"
msgstr "seç"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
-msgstr "Seçici şablon dosya yüklemesinde hata"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
+msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "Evet"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "Hayır"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr "Tamam"
+#: 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 "İ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."
@@ -249,7 +318,7 @@ msgstr "Nesne türü belirtilmemiş."
#: 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:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "Hata"
@@ -269,7 +338,7 @@ msgstr "Paylaşılan"
msgid "Share"
msgstr "Paylaş"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr "Paylaşım sırasında hata "
@@ -325,67 +394,67 @@ msgstr "Son kullanma tarihini ayarla"
msgid "Expiration date"
msgstr "Son kullanım tarihi"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "Eposta ile paylaş"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "Kişi bulunamadı"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "Tekrar paylaşmaya izin verilmiyor"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr " {item} içinde {user} ile paylaşılanlarlar"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "Paylaşılmayan"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "düzenleyebilir"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "erişim kontrolü"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "oluştur"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "güncelle"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "sil"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "paylaş"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "Paralo korumalı"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr "Geçerlilik tarihi tanımlama kaldırma hatası"
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr "Geçerlilik tarihi tanımlama hatası"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr "Gönderiliyor..."
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr "Eposta gönderildi"
@@ -400,7 +469,7 @@ msgstr "Güncelleme başarılı olmadı. Lütfen bu hatayı bildirin <a href=\"h
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Güncelleme başarılı. ownCloud'a yönlendiriliyor."
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr "%s parola sıfırlama"
@@ -469,7 +538,7 @@ msgstr "Kişisel"
msgid "Users"
msgstr "Kullanıcılar"
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "Uygulamalar"
@@ -598,14 +667,10 @@ msgstr "Kurulumu tamamla"
msgid "%s is available. Get more information on how to update."
msgstr "%s mevcuttur. Güncelleştirme hakkında daha fazla bilgi alın."
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "Çıkış yap"
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr "Daha fazla Uygulama"
-
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "Otomatik oturum açma reddedildi!"
@@ -620,19 +685,19 @@ msgstr "Yakın zamanda parolanızı değiştirmedi iseniz hesabınız riske gire
msgid "Please change your password to secure your account again."
msgstr "Hesabınızı korumak için lütfen parolanızı değiştirin."
-#: templates/login.php:34
+#: templates/login.php:32
msgid "Lost your password?"
msgstr "Parolanızı mı unuttunuz?"
-#: templates/login.php:39
+#: templates/login.php:37
msgid "remember"
msgstr "hatırla"
-#: templates/login.php:41
+#: templates/login.php:39
msgid "Log in"
msgstr "Giriş yap"
-#: templates/login.php:47
+#: templates/login.php:45
msgid "Alternative Logins"
msgstr "Alternatif Girişler"
diff --git a/l10n/tr/files.po b/l10n/tr/files.po
index 5f272c31eb8547659fde40afe81fe5f5c3068f68..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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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,7 +77,15 @@ msgstr "Diske yazılamadı"
msgid "Not enough storage available"
msgstr "Yeterli disk alanı yok"
-#: ajax/upload.php:123
+#: 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 "Geçersiz dizin."
@@ -85,149 +93,157 @@ 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: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 "Dosya yükleme işlemi sürüyor. Şimdi sayfadan ayrılırsanız işleminiz iptal olur."
-#: js/file-upload.js:241
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr "URL boş olamaz."
-#: 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 "Geçersiz dizin adı. 'Shared' dizin ismi kullanımı ownCloud tarafından rezerve edilmiştir."
-#: js/file-upload.js:277 js/file-upload.js:293 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 "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:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "Bekliyor"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{new_name} zaten mevcut"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "değiştir"
-#: js/filelist.js:303
+#: js/filelist.js:416
msgid "suggest name"
msgstr "Öneri ad"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "iptal"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr "{new_name} ismi {old_name} ile değiştirildi"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "undo"
msgstr "geri al"
-#: js/filelist.js:453
+#: 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: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: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] "%n dosya yükleniyor"
msgstr[1] "%n dosya yükleniyor"
-#: js/filelist.js:518
-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: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 "İsim"
-#: js/files.js:563 templates/index.php:78
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "Boyut"
-#: js/files.js:564 templates/index.php:80
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr "Değiştirilme"
-#: js/files.js:580
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] "%n dizin"
-msgstr[1] "%n dizin"
-
-#: js/files.js:586
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] "%n dosya"
-msgstr[1] "%n dosya"
-
#: lib/app.php:73
#, php-format
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"
@@ -263,84 +279,68 @@ 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:73
+#: templates/index.php:67
msgid "Download"
msgstr "İndir"
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr "Paylaşılmayan"
-#: templates/index.php:91 templates/index.php:92
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "Sil"
-#: templates/index.php:105
+#: templates/index.php:100
msgid "Upload too large"
msgstr "Yükleme çok büyük"
-#: 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 "Yüklemeye çalıştığınız dosyalar bu sunucudaki maksimum yükleme boyutunu aşıyor."
-#: templates/index.php:112
+#: templates/index.php:107
msgid "Files are being scanned, please wait."
msgstr "Dosyalar taranıyor, lütfen bekleyin."
-#: templates/index.php:115
+#: templates/index.php:110
msgid "Current scanning"
msgstr "Güncel tarama"
-#: templates/part.list.php:74
-msgid "directory"
-msgstr "dizin"
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr "dizinler"
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr "dosya"
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr "dosyalar"
-
#: templates/upgrade.php:2
msgid "Upgrading filesystem cache..."
msgstr "Sistem dosyası önbelleği güncelleniyor"
diff --git a/l10n/tr/files_sharing.po b/l10n/tr/files_sharing.po
index a2ea28b6b5eebfcd98733eb019125894b57bb610..eea57d4dbd17455db191603b02c73da0f6b9023c 100644
--- a/l10n/tr/files_sharing.po
+++ b/l10n/tr/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00: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"
@@ -63,7 +63,7 @@ msgstr "%s sizinle paylaşılan %s klasör"
msgid "%s shared the file %s with you"
msgstr "%s sizinle paylaşılan %s klasör"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "İndir"
@@ -75,6 +75,6 @@ msgstr "Yükle"
msgid "Cancel upload"
msgstr "Yüklemeyi iptal et"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "Kullanılabilir önizleme yok"
diff --git a/l10n/tr/lib.po b/l10n/tr/lib.po
index 45e5b713bb1d7b3934795e39390950295a1c4301..7eadae253b4cf078dd3a613252170c34543cb254 100644
--- a/l10n/tr/lib.po
+++ b/l10n/tr/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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 11:40+0000\n"
-"Last-Translator: ismail yenigül <ismail.yenigul@surgate.com>\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"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -50,11 +50,23 @@ msgstr "Kullanıcılar"
msgid "Admin"
msgstr "Yönetici"
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "\"%s\" yükseltme başarısız oldu."
+#: 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 "Bilgileriniz güvenli ve şifreli"
@@ -107,37 +119,37 @@ msgstr "%s arşiv tipi desteklenmiyor"
msgid "Failed to open archive when installing app"
msgstr "Uygulama kuruluyorken arşiv dosyası açılamadı"
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr "Uygulama info.xml dosyası sağlamıyor"
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr "Uygulamada izin verilmeyeden kodlar olduğu için kurulamıyor."
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr "Owncloud versiyonunuz ile uyumsuz olduğu için uygulama kurulamıyor."
-#: installer.php:144
+#: 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 "Uygulama kurulamıyor. Çünkü \"non shipped\" uygulamalar için <shipped>true</shipped> tag içermektedir."
-#: installer.php:150
+#: 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 "Uygulama kurulamıyor çünkü info.xml/version ile uygulama marketde belirtilen sürüm aynı değil."
-#: installer.php:160
+#: installer.php:162
msgid "App directory already exists"
msgstr "App dizini zaten mevcut"
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr "app dizini oluşturulamıyor. Lütfen izinleri düzeltin. %s"
@@ -266,51 +278,51 @@ msgstr "Web sunucunuz dosya transferi için düzgün bir şekilde yapılandırı
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Lütfen <a href='%s'>kurulum kılavuzlarını</a> iki kez kontrol edin."
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "saniye önce"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] "%n dakika önce"
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] "%n saat önce"
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "bugün"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "dün"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] "%n gün önce"
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "geçen ay"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] "%n ay önce"
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "geçen yıl"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "yıl önce"
diff --git a/l10n/tr/settings.po b/l10n/tr/settings.po
index ae9145f21209667cdd85ca6d0c10e13f9baf10a2..8d168dd065d7db93937376c52b29e97d2cb47d56 100644
--- a/l10n/tr/settings.po
+++ b/l10n/tr/settings.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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 00:50+0000\n"
-"Last-Translator: volkangezer <volkangezer@gmail.com>\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"
"Content-Type: text/plain; charset=UTF-8\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,55 +88,88 @@ msgstr "%s grubundan kullanıcı kaldırılamıyor"
msgid "Couldn't update app."
msgstr "Uygulama güncellenemedi."
-#: js/apps.js:35
+#: 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"
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr "Etkin değil"
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr "Etkinleştir"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr "Lütfen bekleyin...."
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr "Uygulama devre dışı bırakılırken hata"
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr "Uygulama etkinleştirilirken hata"
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr "Güncelleniyor...."
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr "Uygulama güncellenirken hata"
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "Hata"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr "Güncelleme"
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr "Güncellendi"
-#: js/personal.js:150
+#: 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 "Dosyaların şifresi çözülüyor... Lütfen bekleyin, bu biraz zaman alabilir."
-#: js/personal.js:172
+#: js/personal.js:287
msgid "Saving..."
msgstr "Kaydediliyor..."
@@ -152,16 +185,16 @@ msgstr "geri al"
msgid "Unable to remove user"
msgstr "Kullanıcı kaldırılamıyor"
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "Gruplar"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "Yönetici Grubu "
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "Sil"
@@ -181,7 +214,7 @@ msgstr "Kullanıcı oluşturulurken hata"
msgid "A valid password must be provided"
msgstr "Geçerli bir parola mutlaka sağlanmalı"
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "Türkçe"
@@ -347,11 +380,11 @@ msgstr "Daha fazla"
msgid "Less"
msgstr "Az"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "Sürüm"
-#: templates/admin.php:246 templates/personal.php:143
+#: 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 "
@@ -418,7 +451,7 @@ msgstr "İlk Çalıştırma Sihirbazını yeniden göster"
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Kullandığınız:<strong>%s</strong> seçilebilecekler: <strong>%s</strong>"
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "Parola"
@@ -442,7 +475,7 @@ msgstr "Yeni parola"
msgid "Change password"
msgstr "Parola değiştir"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr "Ekran Adı"
@@ -458,38 +491,66 @@ msgstr "Eposta adresiniz"
msgid "Fill in an email address to enable password recovery"
msgstr "Parola kurtarmayı etkinleştirmek için bir eposta adresi girin"
-#: templates/personal.php:85 templates/personal.php:86
+#: templates/personal.php:86
+msgid "Profile picture"
+msgstr "Profil resmi"
+
+#: 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 "Dil"
-#: templates/personal.php:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "Çevirilere yardım edin"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: 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 " <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">Dosyalarınıza WebDAV üzerinen erişme </a> için bu adresi kullanın"
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "Şifreleme"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr "Şifreleme uygulaması artık etkin değil, tüm dosyanın şifresini çöz"
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr "Oturum açma parolası"
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr "Tüm dosyaların şifresini çözme"
@@ -515,30 +576,30 @@ msgstr "Parola değiştirme sırasında kullanıcı dosyalarını kurtarmak içi
msgid "Default Storage"
msgstr "Varsayılan Depolama"
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr "Limitsiz"
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "Diğer"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "Kullanıcı Adı"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr "Depolama"
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr "ekran adını değiştir"
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr "yeni parola belirle"
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr "Varsayılan"
diff --git a/l10n/tr/user_ldap.po b/l10n/tr/user_ldap.po
index b9254262c515d609e777a779e8aee3ce822b49f7..69f083c6084d9693ea62dfd15787b8e8035b941b 100644
--- a/l10n/tr/user_ldap.po
+++ b/l10n/tr/user_ldap.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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\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"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ug/core.po b/l10n/ug/core.po
index 367645fae74db2979254ae15b72657faaf1a5833..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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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"
@@ -22,6 +22,10 @@ msgstr ""
msgid "%s shared »%s« with you"
msgstr ""
+#: ajax/share.php:227
+msgid "group"
+msgstr "گۇرۇپپا"
+
#: ajax/update.php:11
msgid "Turned on maintenance mode"
msgstr ""
@@ -86,6 +90,26 @@ msgstr ""
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 "يەكشەنبە"
@@ -162,55 +186,55 @@ msgstr "ئوغلاق"
msgid "December"
msgstr "كۆنەك"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "تەڭشەكلەر"
-#: js/js.js:812
+#: js/js.js:866
msgid "seconds ago"
msgstr ""
-#: js/js.js:813
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: js/js.js:814
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: js/js.js:815
+#: js/js.js:869
msgid "today"
msgstr "بۈگۈن"
-#: js/js.js:816
+#: js/js.js:870
msgid "yesterday"
msgstr "تۈنۈگۈن"
-#: js/js.js:817
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
-#: js/js.js:818
+#: js/js.js:872
msgid "last month"
msgstr ""
-#: js/js.js:819
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: js/js.js:820
+#: js/js.js:874
msgid "months ago"
msgstr ""
-#: js/js.js:821
+#: js/js.js:875
msgid "last year"
msgstr ""
-#: js/js.js:822
+#: js/js.js:876
msgid "years ago"
msgstr ""
@@ -218,22 +242,65 @@ msgstr ""
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "ھەئە"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "ياق"
-#: js/oc-dialogs.js:195
+#: 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] ""
+
+#: 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."
@@ -243,7 +310,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:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "خاتالىق"
@@ -263,7 +330,7 @@ msgstr ""
msgid "Share"
msgstr "ھەمبەھىر"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr ""
@@ -319,67 +386,67 @@ msgstr ""
msgid "Expiration date"
msgstr ""
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr ""
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr ""
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "ھەمبەھىرلىمە"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr ""
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr ""
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr ""
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr ""
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "ئۆچۈر"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "ھەمبەھىر"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr ""
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr ""
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr ""
@@ -394,7 +461,7 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr ""
@@ -463,7 +530,7 @@ msgstr "شەخسىي"
msgid "Users"
msgstr "ئىشلەتكۈچىلەر"
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "ئەپلەر"
@@ -505,7 +572,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)"
@@ -592,14 +659,10 @@ msgstr "تەڭشەك تامام"
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "تىزىمدىن چىق"
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr ""
@@ -614,19 +677,19 @@ msgstr ""
msgid "Please change your password to secure your account again."
msgstr ""
-#: templates/login.php:34
+#: templates/login.php:32
msgid "Lost your password?"
msgstr ""
-#: templates/login.php:39
+#: templates/login.php:37
msgid "remember"
msgstr ""
-#: templates/login.php:41
+#: templates/login.php:39
msgid "Log in"
msgstr ""
-#: templates/login.php:47
+#: templates/login.php:45
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/ug/files.po b/l10n/ug/files.po
index bedb7ab4dab4b9b22abdfcb72f3c4e8a0545a214..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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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,7 +74,15 @@ msgstr "دىسكىغا يازالمىدى"
msgid "Not enough storage available"
msgstr "يېتەرلىك ساقلاش بوشلۇقى يوق"
-#: ajax/upload.php:123
+#: 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 ""
@@ -82,146 +90,154 @@ 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: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 "ھۆججەت يۈكلەش مەشغۇلاتى ئېلىپ بېرىلىۋاتىدۇ. Leaving the page now will cancel the upload."
-#: 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:277 js/file-upload.js:293 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:465
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "كۈتۈۋاتىدۇ"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{new_name} مەۋجۇت"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "ئالماشتۇر"
-#: js/filelist.js:303
+#: js/filelist.js:416
msgid "suggest name"
msgstr "تەۋسىيە ئات"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "ۋاز كەچ"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr ""
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "undo"
msgstr "يېنىۋال"
-#: js/filelist.js:453
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+
+#: 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] ""
-#: js/filelist.js:518
-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 "ئۆزگەرتكەن"
-#: js/files.js:580
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-
-#: js/files.js:586
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-
#: lib/app.php:73
#, php-format
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 "يۈكلە"
@@ -257,84 +273,68 @@ 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: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 ""
-#: templates/part.list.php:74
-msgid "directory"
-msgstr ""
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr ""
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr ""
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr ""
-
#: templates/upgrade.php:2
msgid "Upgrading filesystem cache..."
msgstr "ھۆججەت سىستېما غەملىكىنى يۈكسەلدۈرۈۋاتىدۇ…"
diff --git a/l10n/ug/files_sharing.po b/l10n/ug/files_sharing.po
index cf512bccd1913b01e7a7926aba7e2c24afe8a4c9..b1dd5be96431f8c3c289a6677d49f844799da575 100644
--- a/l10n/ug/files_sharing.po
+++ b/l10n/ug/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:01+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Uighur <uqkun@outlook.com>\n"
"MIME-Version: 1.0\n"
@@ -64,7 +64,7 @@ msgstr ""
msgid "%s shared the file %s with you"
msgstr ""
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "چۈشۈر"
@@ -76,6 +76,6 @@ msgstr "يۈكلە"
msgid "Cancel upload"
msgstr "يۈكلەشتىن ۋاز كەچ"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr ""
diff --git a/l10n/ug/lib.po b/l10n/ug/lib.po
index 3c833cb1694db4085e82424b390bd0867f36f976..27e9f375db1c396768f3d3eec1a09e1c43cea266 100644
--- a/l10n/ug/lib.po
+++ b/l10n/ug/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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\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"
"Language-Team: Uighur <uqkun@outlook.com>\n"
"MIME-Version: 1.0\n"
@@ -48,11 +48,23 @@ msgstr "ئىشلەتكۈچىلەر"
msgid "Admin"
msgstr ""
-#: app.php:837
+#: 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 ""
@@ -105,37 +117,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: 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:150
+#: 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:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -257,54 +269,54 @@ msgstr ""
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
-msgstr ""
+msgstr "سىزنىڭ تور مۇلازىمېتىرىڭىز ھۆججەت قەدەمداشلاشقا يول قويىدىغان قىلىپ توغرا تەڭشەلمەپتۇ، چۈنكى WebDAV نىڭ ئېغىزى بۇزۇلغاندەك تۇرىدۇ."
#: setup.php:185
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr ""
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "بۈگۈن"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "تۈنۈگۈن"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr ""
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr ""
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr ""
diff --git a/l10n/ug/settings.po b/l10n/ug/settings.po
index ee0402683bd60ab73d953ffbf38635e52b711d4c..84bd5ebb2a5f004221150ef074cfafed9931b8f9 100644
--- a/l10n/ug/settings.po
+++ b/l10n/ug/settings.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Abduqadir Abliz <sahran.ug@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+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"
@@ -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 "سالاھىيەت دەلىللەش خاتالىقى"
@@ -68,7 +69,7 @@ msgstr "ئىناۋەتسىز ئىلتىماس"
#: ajax/togglegroups.php:12
msgid "Admins can't remove themself from the admin group"
-msgstr ""
+msgstr "باشقۇرغۇچى ئۆزىنى باشقۇرۇش گۇرۇپپىسىدىن چىقىرىۋېتەلمەيدۇ"
#: ajax/togglegroups.php:30
#, php-format
@@ -84,55 +85,88 @@ msgstr "ئىشلەتكۈچىنى %s گۇرۇپپىدىن چىقىرىۋېتەل
msgid "Couldn't update app."
msgstr "ئەپنى يېڭىلىيالمايدۇ."
-#: js/apps.js:35
+#: 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} غا يېڭىلايدۇ"
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr "چەكلە"
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr "قوزغات"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr "سەل كۈتۈڭ…"
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr "يېڭىلاۋاتىدۇ…"
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr "ئەپنى يېڭىلاۋاتقاندا خاتالىق كۆرۈلدى"
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "خاتالىق"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr "يېڭىلا"
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr "يېڭىلاندى"
-#: js/personal.js:150
+#: 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:172
+#: js/personal.js:287
msgid "Saving..."
msgstr "ساقلاۋاتىدۇ…"
@@ -148,16 +182,16 @@ msgstr "يېنىۋال"
msgid "Unable to remove user"
msgstr "ئىشلەتكۈچىنى چىقىرىۋېتەلمەيدۇ"
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: 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:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "گۇرۇپپا باشقۇرغۇچى"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "ئۆچۈر"
@@ -167,23 +201,23 @@ msgstr "گۇرۇپپا قوش"
#: js/users.js:436
msgid "A valid username must be provided"
-msgstr ""
+msgstr "چوقۇم ئىناۋەتلىك ئىشلەتكۈچى ئىسمىدىن بىرنى تەمىنلەش كېرەك"
#: js/users.js:437 js/users.js:443 js/users.js:458
msgid "Error creating user"
-msgstr ""
+msgstr "ئىشلەتكۈچى قۇرۇۋاتقاندا خاتالىق كۆرۈلدى"
#: js/users.js:442
msgid "A valid password must be provided"
-msgstr ""
+msgstr "چوقۇم ئىناۋەتلىك ئىم تەمىنلەش كېرەك"
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
-msgstr ""
+msgstr "ئۇيغۇرچە"
#: templates/admin.php:15
msgid "Security Warning"
-msgstr ""
+msgstr "بىخەتەرلىك ئاگاھلاندۇرۇش"
#: templates/admin.php:18
msgid ""
@@ -196,13 +230,13 @@ msgstr ""
#: templates/admin.php:29
msgid "Setup Warning"
-msgstr ""
+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 ""
+msgstr "سىزنىڭ تور مۇلازىمېتىرىڭىز ھۆججەت قەدەمداشلاشقا يول قويىدىغان قىلىپ توغرا تەڭشەلمەپتۇ، چۈنكى WebDAV نىڭ ئېغىزى بۇزۇلغاندەك تۇرىدۇ."
#: templates/admin.php:33
#, php-format
@@ -211,7 +245,7 @@ msgstr ""
#: templates/admin.php:44
msgid "Module 'fileinfo' missing"
-msgstr ""
+msgstr "بۆلەك «ھۆججەت ئۇچۇرى» يوقالغان"
#: templates/admin.php:47
msgid ""
@@ -343,11 +377,11 @@ msgstr "تېخىمۇ كۆپ"
msgid "Less"
msgstr "ئاز"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "نەشرى"
-#: templates/admin.php:246 templates/personal.php:143
+#: 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 "
@@ -414,7 +448,7 @@ msgstr ""
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:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "ئىم"
@@ -438,7 +472,7 @@ msgstr "يېڭى ئىم"
msgid "Change password"
msgstr "ئىم ئۆزگەرت"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr "كۆرسىتىش ئىسمى"
@@ -454,38 +488,66 @@ msgstr "تورخەت ئادرېسىڭىز"
msgid "Fill in an email address to enable password recovery"
msgstr "ئىم ئەسلىگە كەلتۈرۈشتە ئىشلىتىدىغان تور خەت ئادرېسىنى تولدۇرۇڭ"
-#: templates/personal.php:85 templates/personal.php:86
+#: 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:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "تەرجىمىگە ياردەم"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: 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:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "شىفىرلاش"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -511,30 +573,30 @@ msgstr ""
msgid "Default Storage"
msgstr "كۆڭۈلدىكى ساقلىغۇچ"
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr "چەكسىز"
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "باشقا"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "ئىشلەتكۈچى ئاتى"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr "ساقلىغۇچ"
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr "كۆرسىتىدىغان ئىسىمنى ئۆزگەرت"
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr "يېڭى ئىم تەڭشە"
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr "كۆڭۈلدىكى"
diff --git a/l10n/ug/user_ldap.po b/l10n/ug/user_ldap.po
index fa2c51ddd269510b07fba7502ce72faa0e8f86bc..ad88262b4408b7769642bf47f73a452f0484688f 100644
--- a/l10n/ug/user_ldap.po
+++ b/l10n/ug/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\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"
"Language-Team: Uighur <uqkun@outlook.com>\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/uk/core.po b/l10n/uk/core.po
index 5242a384d616464687b5db166ad61600b7334d15..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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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"
@@ -22,6 +22,10 @@ msgstr ""
msgid "%s shared »%s« with you"
msgstr ""
+#: ajax/share.php:227
+msgid "group"
+msgstr "група"
+
#: ajax/update.php:11
msgid "Turned on maintenance mode"
msgstr ""
@@ -86,6 +90,26 @@ msgstr "Жодної категорії не обрано для видален
msgid "Error removing %s from favorites."
msgstr "Помилка при видалені %s із обраного."
+#: 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 "Неділя"
@@ -162,63 +186,63 @@ msgstr "Листопад"
msgid "December"
msgstr "Грудень"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "Налаштування"
-#: js/js.js:812
+#: js/js.js:866
msgid "seconds ago"
msgstr "секунди тому"
-#: js/js.js:813
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:814
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:815
+#: js/js.js:869
msgid "today"
msgstr "сьогодні"
-#: js/js.js:816
+#: js/js.js:870
msgid "yesterday"
msgstr "вчора"
-#: js/js.js:817
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:818
+#: js/js.js:872
msgid "last month"
msgstr "минулого місяця"
-#: js/js.js:819
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:820
+#: js/js.js:874
msgid "months ago"
msgstr "місяці тому"
-#: js/js.js:821
+#: js/js.js:875
msgid "last year"
msgstr "минулого року"
-#: js/js.js:822
+#: js/js.js:876
msgid "years ago"
msgstr "роки тому"
@@ -226,22 +250,67 @@ msgstr "роки тому"
msgid "Choose"
msgstr "Обрати"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "Так"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "Ні"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
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 "Відмінити"
+
+#: 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."
@@ -251,7 +320,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:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "Помилка"
@@ -271,7 +340,7 @@ msgstr "Опубліковано"
msgid "Share"
msgstr "Поділитися"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr "Помилка під час публікації"
@@ -327,67 +396,67 @@ msgstr "Встановити термін дії"
msgid "Expiration date"
msgstr "Термін дії"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "Опублікувати через Ел. пошту:"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "Жодної людини не знайдено"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "Пере-публікація не дозволяється"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr "Опубліковано {item} для {user}"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "Закрити доступ"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "може редагувати"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "контроль доступу"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "створити"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "оновити"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "видалити"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "опублікувати"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "Захищено паролем"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr "Помилка при відміні терміна дії"
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr "Помилка при встановленні терміна дії"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr "Надсилання..."
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr "Ел. пошта надіслана"
@@ -402,7 +471,7 @@ msgstr "Оновлення виконалось неуспішно. Будь л
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Оновлення виконалось успішно. Перенаправляємо вас на ownCloud."
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr ""
@@ -471,7 +540,7 @@ msgstr "Особисте"
msgid "Users"
msgstr "Користувачі"
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "Додатки"
@@ -600,14 +669,10 @@ msgstr "Завершити налаштування"
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "Вихід"
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "Автоматичний вхід в систему відхилений!"
@@ -622,19 +687,19 @@ msgstr "Якщо Ви не міняли пароль останнім часом
msgid "Please change your password to secure your account again."
msgstr "Будь ласка, змініть свій пароль, щоб знову захистити Ваш обліковий запис."
-#: templates/login.php:34
+#: templates/login.php:32
msgid "Lost your password?"
msgstr "Забули пароль?"
-#: templates/login.php:39
+#: templates/login.php:37
msgid "remember"
msgstr "запам'ятати"
-#: templates/login.php:41
+#: templates/login.php:39
msgid "Log in"
msgstr "Вхід"
-#: templates/login.php:47
+#: templates/login.php:45
msgid "Alternative Logins"
msgstr "Альтернативні Логіни"
diff --git a/l10n/uk/files.po b/l10n/uk/files.po
index 7510ca1284d642cbbaa9894ee670cf6334930dc8..d269f620d94b4d1e90b3029694630190c18c5ba5 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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-29 00:02-0400\n"
+"PO-Revision-Date: 2013-09-27 19:42+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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -30,7 +30,7 @@ msgstr "Не вдалося перемістити %s"
#: ajax/upload.php:16 ajax/upload.php:45
msgid "Unable to set upload directory."
-msgstr ""
+msgstr "Не вдалося встановити каталог завантаження."
#: ajax/upload.php:22
msgid "Invalid Token"
@@ -75,160 +75,176 @@ msgstr "Невдалося записати на диск"
msgid "Not enough storage available"
msgstr "Місця більше немає"
-#: ajax/upload.php:123
+#: 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
+#: 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 ""
-#: 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: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 "URL не може бути пустим."
-#: 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 ""
+msgstr "Неправильне ім'я теки. Використання 'Shared' зарезервовано ownCloud"
-#: js/file-upload.js:277 js/file-upload.js:293 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:465
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "Очікування"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{new_name} вже існує"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "заміна"
-#: js/filelist.js:303
+#: js/filelist.js:416
msgid "suggest name"
msgstr "запропонуйте назву"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "відміна"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr "замінено {new_name} на {old_name}"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "undo"
msgstr "відмінити"
-#: js/filelist.js:453
+#: 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: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: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] ""
msgstr[2] ""
-#: js/filelist.js:518
-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: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 "Змінено"
-#: js/files.js:580
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: js/files.js:586
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
#: lib/app.php:73
#, php-format
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 "Вивантажити"
@@ -264,84 +280,68 @@ 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 "Папка"
+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 "Поточне сканування"
-#: templates/part.list.php:74
-msgid "directory"
-msgstr "каталог"
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr "каталоги"
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr "файл"
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr "файли"
-
#: templates/upgrade.php:2
msgid "Upgrading filesystem cache..."
msgstr "Оновлення кеша файлової системи..."
diff --git a/l10n/uk/files_encryption.po b/l10n/uk/files_encryption.po
index a75abaf30c8a45fc3990fd9136521f422c965579..6957679f93fe75c85f37f8971a466db769359286 100644
--- a/l10n/uk/files_encryption.po
+++ b/l10n/uk/files_encryption.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# zubr139 <zubr139@ukr.net>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-21 08:10-0400\n"
-"PO-Revision-Date: 2013-08-19 19:20+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-29 00:02-0400\n"
+"PO-Revision-Date: 2013-09-27 19:12+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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -61,18 +62,18 @@ msgid ""
"files."
msgstr ""
-#: hooks/hooks.php:41
+#: hooks/hooks.php:53
msgid "Missing requirements."
msgstr ""
-#: hooks/hooks.php:42
+#: 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:249
+#: hooks/hooks.php:255
msgid "Following users are not set up for encryption:"
msgstr ""
@@ -92,7 +93,7 @@ msgstr ""
#: templates/invalid_private_key.php:7
msgid "personal settings"
-msgstr ""
+msgstr "особисті налаштування"
#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
@@ -129,7 +130,7 @@ msgstr ""
#: templates/settings-admin.php:53
msgid "Change Password"
-msgstr ""
+msgstr "Змінити Пароль"
#: templates/settings-personal.php:11
msgid "Your private key password no longer match your log-in password:"
diff --git a/l10n/uk/files_sharing.po b/l10n/uk/files_sharing.po
index 884b5932450e30d0a9530d1a4ff31d0010929fe9..c12dc78801e6908db1f52d7e7ec5c484f05e852c 100644
--- a/l10n/uk/files_sharing.po
+++ b/l10n/uk/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00: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"
@@ -63,7 +63,7 @@ msgstr "%s опублікував каталог %s для Вас"
msgid "%s shared the file %s with you"
msgstr "%s опублікував файл %s для Вас"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "Завантажити"
@@ -75,6 +75,6 @@ msgstr "Вивантажити"
msgid "Cancel upload"
msgstr "Перервати завантаження"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "Попередній перегляд недоступний для"
diff --git a/l10n/uk/lib.po b/l10n/uk/lib.po
index cb5c568e21ba3b8b27884f83048aa3328290cacc..af53a22d88cb9fd219bc28c5c38d289bc92e9b64 100644
--- a/l10n/uk/lib.po
+++ b/l10n/uk/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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\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"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
@@ -48,11 +48,23 @@ msgstr "Користувачі"
msgid "Admin"
msgstr "Адмін"
-#: app.php:837
+#: 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 "підконтрольні Вам веб-сервіси"
@@ -105,37 +117,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: 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:150
+#: 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:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -264,55 +276,55 @@ msgstr "Ваш Web-сервер ще не налаштований належн
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Будь ласка, перевірте <a href='%s'>інструкції по встановленню</a>."
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "секунди тому"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "сьогодні"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "вчора"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "минулого місяця"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "минулого року"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "роки тому"
diff --git a/l10n/uk/settings.po b/l10n/uk/settings.po
index 8aaa83fd2a5a66d4e403791b9811110747996feb..912467cac901b92e2f7c63bb138375394e55ea6d 100644
--- a/l10n/uk/settings.po
+++ b/l10n/uk/settings.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# zubr139 <zubr139@ukr.net>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-29 00:02-0400\n"
+"PO-Revision-Date: 2013-09-27 19:43+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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -22,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 "Помилка автентифікації"
@@ -32,7 +33,7 @@ msgstr ""
#: ajax/changedisplayname.php:34
msgid "Unable to change display name"
-msgstr "Не вдалося змінити зображене ім'я"
+msgstr "Не вдалося змінити ім'я"
#: ajax/creategroup.php:10
msgid "Group already exists"
@@ -84,55 +85,88 @@ msgstr "Не вдалося видалити користувача із гру
msgid "Couldn't update app."
msgstr "Не вдалося оновити програму. "
-#: js/apps.js:35
+#: 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}"
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:110
msgid "Disable"
msgstr "Вимкнути"
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
msgid "Enable"
msgstr "Включити"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr "Зачекайте, будь ласка..."
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:101
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:100 js/apps.js:114 js/apps.js:115
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:125
msgid "Updating...."
msgstr "Оновлюється..."
-#: js/apps.js:118
+#: js/apps.js:128
msgid "Error while updating app"
msgstr "Помилка при оновленні програми"
-#: js/apps.js:118
+#: js/apps.js:128
msgid "Error"
msgstr "Помилка"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:129 templates/apps.php:43
msgid "Update"
msgstr "Оновити"
-#: js/apps.js:122
+#: js/apps.js:132
msgid "Updated"
msgstr "Оновлено"
-#: js/personal.js:150
+#: js/personal.js:221
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:266
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:172
+#: js/personal.js:288
msgid "Saving..."
msgstr "Зберігаю..."
@@ -148,16 +182,16 @@ msgstr "відмінити"
msgid "Unable to remove user"
msgstr "Неможливо видалити користувача"
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: 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:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "Адміністратор групи"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "Видалити"
@@ -177,7 +211,7 @@ msgstr "Помилка при створенні користувача"
msgid "A valid password must be provided"
msgstr "Потрібно задати вірний пароль"
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "__language_name__"
@@ -343,11 +377,11 @@ msgstr "Більше"
msgid "Less"
msgstr "Менше"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "Версія"
-#: templates/admin.php:246 templates/personal.php:143
+#: 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 "
@@ -414,7 +448,7 @@ msgstr "Показувати Майстер Налаштувань знову"
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Ви використали <strong>%s</strong> із доступних <strong>%s</strong>"
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "Пароль"
@@ -438,7 +472,7 @@ msgstr "Новий пароль"
msgid "Change password"
msgstr "Змінити пароль"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr "Показати Ім'я"
@@ -454,38 +488,66 @@ msgstr "Ваша адреса електронної пошти"
msgid "Fill in an email address to enable password recovery"
msgstr "Введіть адресу електронної пошти для відновлення паролю"
-#: templates/personal.php:85 templates/personal.php:86
+#: 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:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "Допомогти з перекладом"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: 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:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "Шифрування"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -511,30 +573,30 @@ msgstr ""
msgid "Default Storage"
msgstr "сховище за замовчуванням"
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr "Необмежено"
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "Інше"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "Ім'я користувача"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr "Сховище"
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
-msgstr "змінити зображене ім'я"
+msgstr "змінити ім'я"
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr "встановити новий пароль"
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr "За замовчуванням"
diff --git a/l10n/uk/user_ldap.po b/l10n/uk/user_ldap.po
index 9f05e0918b780403b87b3976fc791babcf18015e..db0bfc141d0820d12cc2c7b998b3530946ed537d 100644
--- a/l10n/uk/user_ldap.po
+++ b/l10n/uk/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\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"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/uk/user_webdavauth.po b/l10n/uk/user_webdavauth.po
index b4c80edd14eed51962e97feaf726d6a7aa60adac..7f61f7a3e37c105655cc118c4ab4f2f510de1493 100644
--- a/l10n/uk/user_webdavauth.po
+++ b/l10n/uk/user_webdavauth.po
@@ -5,14 +5,15 @@
# Translators:
# skoptev <skoptev@ukr.net>, 2012
# volodya327 <volodya327@gmail.com>, 2012
+# zubr139 <zubr139@ukr.net>, 2013
# volodya327 <volodya327@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-27 01:56-0400\n"
-"PO-Revision-Date: 2013-07-27 05:57+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: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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -26,7 +27,7 @@ msgstr "Аутентифікація WebDAV"
#: templates/settings.php:4
msgid "Address: "
-msgstr ""
+msgstr "Адреса:"
#: templates/settings.php:7
msgid ""
diff --git a/l10n/ur_PK/core.po b/l10n/ur_PK/core.po
index 292342a9802d3bbc8ab4efee86ec483e8a14ce2c..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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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"
@@ -22,6 +22,10 @@ msgstr ""
msgid "%s shared »%s« with you"
msgstr ""
+#: ajax/share.php:227
+msgid "group"
+msgstr ""
+
#: ajax/update.php:11
msgid "Turned on maintenance mode"
msgstr ""
@@ -86,6 +90,26 @@ msgstr "ختم کرنے کے لیے کسی زمرہ جات کا انتخاب ن
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 ""
@@ -162,59 +186,59 @@ msgstr "نومبر"
msgid "December"
msgstr "دسمبر"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "سیٹینگز"
-#: js/js.js:812
+#: js/js.js:866
msgid "seconds ago"
msgstr ""
-#: js/js.js:813
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:814
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:815
+#: js/js.js:869
msgid "today"
msgstr ""
-#: js/js.js:816
+#: js/js.js:870
msgid "yesterday"
msgstr ""
-#: js/js.js:817
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:818
+#: js/js.js:872
msgid "last month"
msgstr ""
-#: js/js.js:819
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:820
+#: js/js.js:874
msgid "months ago"
msgstr ""
-#: js/js.js:821
+#: js/js.js:875
msgid "last year"
msgstr ""
-#: js/js.js:822
+#: js/js.js:876
msgid "years ago"
msgstr ""
@@ -222,22 +246,66 @@ msgstr ""
msgid "Choose"
msgstr "منتخب کریں"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "ہاں"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "نہیں"
-#: js/oc-dialogs.js:195
+#: 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."
@@ -247,7 +315,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:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "ایرر"
@@ -267,7 +335,7 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr "شئیرنگ کے دوران ایرر"
@@ -323,67 +391,67 @@ msgstr "تاریخ معیاد سیٹ کریں"
msgid "Expiration date"
msgstr "تاریخ معیاد"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr ""
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "کوئی لوگ نہیں ملے۔"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "دوبارہ شئیر کرنے کی اجازت نہیں"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "شئیرنگ ختم کریں"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "ایڈٹ کر سکے"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "اسیس کنٹرول"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "نیا بنائیں"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "اپ ڈیٹ"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "ختم کریں"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "شئیر کریں"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "پاسورڈ سے محفوظ کیا گیا ہے"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr ""
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr ""
@@ -398,7 +466,7 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr ""
@@ -467,7 +535,7 @@ msgstr "ذاتی"
msgid "Users"
msgstr "یوزرز"
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "ایپز"
@@ -596,14 +664,10 @@ msgstr "سیٹ اپ ختم کریں"
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "لاگ آؤٹ"
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr ""
@@ -618,19 +682,19 @@ msgstr ""
msgid "Please change your password to secure your account again."
msgstr ""
-#: templates/login.php:34
+#: templates/login.php:32
msgid "Lost your password?"
msgstr "کیا آپ پاسورڈ بھول گئے ہیں؟"
-#: templates/login.php:39
+#: templates/login.php:37
msgid "remember"
msgstr "یاد رکھیں"
-#: templates/login.php:41
+#: templates/login.php:39
msgid "Log in"
msgstr "لاگ ان"
-#: templates/login.php:47
+#: templates/login.php:45
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/ur_PK/files.po b/l10n/ur_PK/files.po
index d3669262ad1d75259670ffc11b66de665551ac14..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-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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,7 +74,15 @@ msgstr ""
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:123
+#: 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 ""
@@ -82,149 +90,157 @@ 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: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:277 js/file-upload.js:293 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:465
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr ""
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr ""
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr ""
-#: js/filelist.js:303
+#: js/filelist.js:416
msgid "suggest name"
msgstr ""
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr ""
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr ""
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "undo"
msgstr ""
-#: js/filelist.js:453
-msgid "Uploading %n file"
-msgid_plural "Uploading %n files"
+#: 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:518
-msgid "files uploading"
+#: 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/files.js:52
+#: 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: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 ""
-#: js/files.js:580
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/files.js:586
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-
#: lib/app.php:73
#, php-format
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 ""
@@ -260,84 +276,68 @@ 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 ""
-#: templates/part.list.php:74
-msgid "directory"
-msgstr ""
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr ""
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr ""
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr ""
-
#: templates/upgrade.php:2
msgid "Upgrading filesystem cache..."
msgstr ""
diff --git a/l10n/ur_PK/files_sharing.po b/l10n/ur_PK/files_sharing.po
index 6880222c4ce145a89ba35099537beb0eab24af9f..0d12edb3665e285b629c75f93f6e3b74a6c61bf5 100644
--- a/l10n/ur_PK/files_sharing.po
+++ b/l10n/ur_PK/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-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\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"
"Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
"MIME-Version: 1.0\n"
@@ -63,7 +63,7 @@ msgstr ""
msgid "%s shared the file %s with you"
msgstr ""
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr ""
@@ -75,6 +75,6 @@ msgstr ""
msgid "Cancel upload"
msgstr ""
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr ""
diff --git a/l10n/ur_PK/lib.po b/l10n/ur_PK/lib.po
index ac5dc324885da9fd4455c2607136f40e7351d749..a5cf0b44cdd18161b7c33329cd10e221934c0281 100644
--- a/l10n/ur_PK/lib.po
+++ b/l10n/ur_PK/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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\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"
"Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
"MIME-Version: 1.0\n"
@@ -48,11 +48,23 @@ msgstr "یوزرز"
msgid "Admin"
msgstr "ایڈمن"
-#: app.php:837
+#: 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 "آپ کے اختیار میں ویب سروسیز"
@@ -105,37 +117,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: 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:150
+#: 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:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -264,51 +276,51 @@ msgstr ""
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr ""
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr ""
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr ""
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr ""
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr ""
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr ""
diff --git a/l10n/ur_PK/settings.po b/l10n/ur_PK/settings.po
index 256bc2a51e79d2bab17b0892c37312f27e5e8b6f..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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+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,55 +84,88 @@ msgstr ""
msgid "Couldn't update app."
msgstr ""
-#: js/apps.js:35
+#: 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:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr ""
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr ""
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr ""
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "ایرر"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr ""
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr ""
-#: js/personal.js:150
+#: 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:172
+#: js/personal.js:287
msgid "Saving..."
msgstr ""
@@ -148,16 +181,16 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: 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:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr ""
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr ""
@@ -177,7 +210,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr ""
@@ -343,11 +376,11 @@ msgstr ""
msgid "Less"
msgstr ""
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr ""
-#: templates/admin.php:246 templates/personal.php:143
+#: 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 "
@@ -414,7 +447,7 @@ msgstr ""
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:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "پاسورڈ"
@@ -438,7 +471,7 @@ msgstr "نیا پاسورڈ"
msgid "Change password"
msgstr ""
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr ""
@@ -454,38 +487,66 @@ msgstr ""
msgid "Fill in an email address to enable password recovery"
msgstr ""
-#: templates/personal.php:85 templates/personal.php:86
-msgid "Language"
+#: 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:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:106
+#: 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:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr ""
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -511,30 +572,30 @@ msgstr ""
msgid "Default Storage"
msgstr ""
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr ""
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr ""
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "یوزر نیم"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr ""
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr ""
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr ""
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr ""
diff --git a/l10n/ur_PK/user_ldap.po b/l10n/ur_PK/user_ldap.po
index 085620de421b1ab441081fc90ba5f205b413bd07..fd54d8167be69059178e9dae354e051f6118616f 100644
--- a/l10n/ur_PK/user_ldap.po
+++ b/l10n/ur_PK/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\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"
"Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/vi/core.po b/l10n/vi/core.po
index bf28004b7d1fc3818702824423c292e8cbaa6dc3..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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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"
@@ -23,6 +23,10 @@ msgstr ""
msgid "%s shared »%s« with you"
msgstr ""
+#: ajax/share.php:227
+msgid "group"
+msgstr "nhóm"
+
#: ajax/update.php:11
msgid "Turned on maintenance mode"
msgstr ""
@@ -87,6 +91,26 @@ msgstr "Bạn chưa chọn mục để xóa"
msgid "Error removing %s from favorites."
msgstr "Lỗi xóa %s từ mục yêu thích."
+#: 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 "Chủ nhật"
@@ -163,55 +187,55 @@ msgstr "Tháng 11"
msgid "December"
msgstr "Tháng 12"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "Cài đặt"
-#: js/js.js:812
+#: js/js.js:866
msgid "seconds ago"
msgstr "vài giây trước"
-#: js/js.js:813
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: js/js.js:814
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: js/js.js:815
+#: js/js.js:869
msgid "today"
msgstr "hôm nay"
-#: js/js.js:816
+#: js/js.js:870
msgid "yesterday"
msgstr "hôm qua"
-#: js/js.js:817
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
-#: js/js.js:818
+#: js/js.js:872
msgid "last month"
msgstr "tháng trước"
-#: js/js.js:819
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: js/js.js:820
+#: js/js.js:874
msgid "months ago"
msgstr "tháng trước"
-#: js/js.js:821
+#: js/js.js:875
msgid "last year"
msgstr "năm trước"
-#: js/js.js:822
+#: js/js.js:876
msgid "years ago"
msgstr "năm trước"
@@ -219,22 +243,65 @@ msgstr "năm trước"
msgid "Choose"
msgstr "Chọn"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "Có"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "Không"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
msgstr "Đồng ý"
+#: 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] ""
+
+#: 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."
@@ -244,7 +311,7 @@ msgstr "Loại đối tượng không được chỉ định."
#: 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:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "Lỗi"
@@ -264,7 +331,7 @@ msgstr "Được chia sẻ"
msgid "Share"
msgstr "Chia sẻ"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr "Lỗi trong quá trình chia sẻ"
@@ -320,67 +387,67 @@ msgstr "Đặt ngày kết thúc"
msgid "Expiration date"
msgstr "Ngày kết thúc"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "Chia sẻ thông qua email"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "Không tìm thấy người nào"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "Chia sẻ lại không được cho phép"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr "Đã được chia sẽ trong {item} với {user}"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "Bỏ chia sẻ"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "có thể chỉnh sửa"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "quản lý truy cập"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "tạo"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "cập nhật"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "xóa"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "chia sẻ"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "Mật khẩu bảo vệ"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr "Lỗi không thiết lập ngày kết thúc"
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr "Lỗi cấu hình ngày kết thúc"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr "Đang gởi ..."
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr "Email đã được gửi"
@@ -395,7 +462,7 @@ msgstr "Cập nhật không thành công . Vui lòng thông báo đến <a href=
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Cập nhật thành công .Hệ thống sẽ đưa bạn tới ownCloud."
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr ""
@@ -464,7 +531,7 @@ msgstr "Cá nhân"
msgid "Users"
msgstr "Người dùng"
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "Ứng dụng"
@@ -593,14 +660,10 @@ msgstr "Cài đặt hoàn tất"
msgid "%s is available. Get more information on how to update."
msgstr "%s còn trống. Xem thêm thông tin cách cập nhật."
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "Đăng xuất"
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "Tự động đăng nhập đã bị từ chối !"
@@ -615,19 +678,19 @@ msgstr "Nếu bạn không thay đổi mật khẩu gần đây của bạn, tà
msgid "Please change your password to secure your account again."
msgstr "Vui lòng thay đổi mật khẩu của bạn để đảm bảo tài khoản của bạn một lần nữa."
-#: templates/login.php:34
+#: templates/login.php:32
msgid "Lost your password?"
msgstr "Bạn quên mật khẩu ?"
-#: templates/login.php:39
+#: templates/login.php:37
msgid "remember"
msgstr "ghi nhớ"
-#: templates/login.php:41
+#: templates/login.php:39
msgid "Log in"
msgstr "Đăng nhập"
-#: templates/login.php:47
+#: templates/login.php:45
msgid "Alternative Logins"
msgstr "Đăng nhập khác"
diff --git a/l10n/vi/files.po b/l10n/vi/files.po
index 5f7330c3bc470b6267031f1f16f61d16ab16e20e..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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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,7 +75,15 @@ msgstr "Không thể ghi "
msgid "Not enough storage available"
msgstr "Không đủ không gian lưu trữ"
-#: ajax/upload.php:123
+#: 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 "Thư mục không hợp lệ"
@@ -83,146 +91,154 @@ 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: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 "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:241
+#: js/file-upload.js:520
msgid "URL cannot be empty."
msgstr "URL không được để trống."
-#: 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:277 js/file-upload.js:293 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 "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:49 js/filelist.js:52 js/filelist.js:465
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "Đang chờ"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{new_name} đã tồn tại"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "thay thế"
-#: js/filelist.js:303
+#: js/filelist.js:416
msgid "suggest name"
msgstr "tên gợi ý"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "hủy"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr "đã thay thế {new_name} bằng {old_name}"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "undo"
msgstr "lùi lại"
-#: js/filelist.js:453
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+
+#: 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] ""
-#: js/filelist.js:518
-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: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 "Tên"
-#: js/files.js:563 templates/index.php:78
+#: js/files.js:559 templates/index.php:73
msgid "Size"
msgstr "Kích cỡ"
-#: js/files.js:564 templates/index.php:80
+#: js/files.js:560 templates/index.php:75
msgid "Modified"
msgstr "Thay đổi"
-#: js/files.js:580
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-
-#: js/files.js:586
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-
#: lib/app.php:73
#, php-format
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"
@@ -258,84 +274,68 @@ 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:73
+#: templates/index.php:67
msgid "Download"
msgstr "Tải về"
-#: templates/index.php:85 templates/index.php:86
+#: templates/index.php:80 templates/index.php:81
msgid "Unshare"
msgstr "Bỏ chia sẻ"
-#: templates/index.php:91 templates/index.php:92
+#: templates/index.php:86 templates/index.php:87
msgid "Delete"
msgstr "Xóa"
-#: templates/index.php:105
+#: templates/index.php:100
msgid "Upload too large"
msgstr "Tập tin tải lên quá lớn"
-#: 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 "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:112
+#: 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:115
+#: templates/index.php:110
msgid "Current scanning"
msgstr "Hiện tại đang quét"
-#: templates/part.list.php:74
-msgid "directory"
-msgstr ""
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr ""
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr "file"
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr "files"
-
#: templates/upgrade.php:2
msgid "Upgrading filesystem cache..."
msgstr "Đang nâng cấp bộ nhớ đệm cho tập tin hệ thống..."
diff --git a/l10n/vi/files_sharing.po b/l10n/vi/files_sharing.po
index 9d990191532f720dea46f3cd64eb3f9c500ff453..f370ab63c638bbcedf46b588a96cf960d7d03c40 100644
--- a/l10n/vi/files_sharing.po
+++ b/l10n/vi/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00: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"
@@ -63,7 +63,7 @@ msgstr "%s đã chia sẻ thư mục %s với bạn"
msgid "%s shared the file %s with you"
msgstr "%s đã chia sẻ tập tin %s với bạn"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "Tải về"
@@ -75,6 +75,6 @@ msgstr "Tải lên"
msgid "Cancel upload"
msgstr "Hủy upload"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "Không có xem trước cho"
diff --git a/l10n/vi/lib.po b/l10n/vi/lib.po
index bce957d996a177d321e3adc0ebded1e2923add99..7ad119bbb6f4c4e07e9b5dca4da105078be0a9a3 100644
--- a/l10n/vi/lib.po
+++ b/l10n/vi/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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\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"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
@@ -48,11 +48,23 @@ msgstr "Người dùng"
msgid "Admin"
msgstr "Quản trị"
-#: app.php:837
+#: 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 "dịch vụ web dưới sự kiểm soát của bạn"
@@ -105,37 +117,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: 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:150
+#: 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:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -264,47 +276,47 @@ msgstr ""
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "vài giây trước"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "hôm nay"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "hôm qua"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "tháng trước"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "năm trước"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "năm trước"
diff --git a/l10n/vi/settings.po b/l10n/vi/settings.po
index 13a831ade8c878775e3fd09005d30b57da377641..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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+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,55 +84,88 @@ 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"
-#: js/apps.js:35
+#: 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}"
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr "Tắt"
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr "Bật"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr "Xin hãy đợi..."
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr "Đang cập nhật..."
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr "Lỗi khi cập nhật ứng dụng"
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "Lỗi"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr "Cập nhật"
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr "Đã cập nhật"
-#: js/personal.js:150
+#: 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:172
+#: js/personal.js:287
msgid "Saving..."
msgstr "Đang lưu..."
@@ -148,16 +181,16 @@ msgstr "lùi lại"
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: js/users.js:92 templates/users.php:26 templates/users.php:90
+#: templates/users.php:118
msgid "Groups"
msgstr "Nhóm"
-#: js/users.js:97 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "Nhóm quản trị"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "Xóa"
@@ -177,7 +210,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "__Ngôn ngữ___"
@@ -343,11 +376,11 @@ msgstr "hơn"
msgid "Less"
msgstr "ít"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "Phiên bản"
-#: templates/admin.php:246 templates/personal.php:143
+#: 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 "
@@ -414,7 +447,7 @@ msgstr "Hiện lại việc chạy đồ thuật khởi đầu"
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Bạn đã sử dụng <strong>%s </ strong> có sẵn <strong> %s </ strong>"
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "Mật khẩu"
@@ -438,7 +471,7 @@ msgstr "Mật khẩu mới"
msgid "Change password"
msgstr "Đổi mật khẩu"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr "Tên hiển thị"
@@ -454,38 +487,66 @@ msgstr "Email của bạn"
msgid "Fill in an email address to enable password recovery"
msgstr "Nhập địa chỉ email của bạn để khôi phục lại mật khẩu"
-#: templates/personal.php:85 templates/personal.php:86
+#: 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 "Ngôn ngữ"
-#: templates/personal.php:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "Hỗ trợ dịch thuật"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: 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:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "Mã hóa"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -511,30 +572,30 @@ msgstr ""
msgid "Default Storage"
msgstr "Bộ nhớ mặc định"
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr "Không giới hạn"
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "Khác"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "Tên đăng nhập"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr "Bộ nhớ"
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr "Thay đổi tên hiển thị"
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr "đặt mật khẩu mới"
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr "Mặc định"
diff --git a/l10n/vi/user_ldap.po b/l10n/vi/user_ldap.po
index 350cf0c3a2d9ac8cdcf13be48904ac62b2027c8e..e926fbc3d814a460c44c703901d495b2f86ca7e7 100644
--- a/l10n/vi/user_ldap.po
+++ b/l10n/vi/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\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"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_CN/core.po b/l10n/zh_CN/core.po
index cfa34c88a6d7c8d1adc2fdad4207768d89276392..f321e4cfc4b406ee70a70195ab4b5ad7aba7bc3f 100644
--- a/l10n/zh_CN/core.po
+++ b/l10n/zh_CN/core.po
@@ -3,14 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Xuetian Weng <wengxt@gmail.com>, 2013
# zhangmin <zm1990s@gmail.com>, 2013
# zhangmin <zm1990s@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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"
@@ -24,30 +25,34 @@ msgstr ""
msgid "%s shared »%s« with you"
msgstr "%s 向您分享了 »%s«"
+#: ajax/share.php:227
+msgid "group"
+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."
@@ -88,6 +93,26 @@ msgstr "没有选择要删除的类别"
msgid "Error removing %s from favorites."
msgstr "从收藏夹中移除%s时出错。"
+#: 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 "星期日"
@@ -164,55 +189,55 @@ msgstr "十一月"
msgid "December"
msgstr "十二月"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "设置"
-#: js/js.js:812
+#: js/js.js:866
msgid "seconds ago"
msgstr "秒前"
-#: js/js.js:813
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n 分钟前"
-#: js/js.js:814
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
-msgstr[0] ""
+msgstr[0] "%n 小时前"
-#: js/js.js:815
+#: js/js.js:869
msgid "today"
msgstr "今天"
-#: js/js.js:816
+#: js/js.js:870
msgid "yesterday"
msgstr "昨天"
-#: js/js.js:817
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
-msgstr[0] ""
+msgstr[0] "%n 天前"
-#: js/js.js:818
+#: js/js.js:872
msgid "last month"
msgstr "上月"
-#: js/js.js:819
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
-msgstr[0] ""
+msgstr[0] "%n 月前"
-#: js/js.js:820
+#: js/js.js:874
msgid "months ago"
msgstr "月前"
-#: js/js.js:821
+#: js/js.js:875
msgid "last year"
msgstr "去年"
-#: js/js.js:822
+#: js/js.js:876
msgid "years ago"
msgstr "年前"
@@ -220,22 +245,65 @@ msgstr "年前"
msgid "Choose"
msgstr "选择(&C)..."
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
-msgstr "加载文件选择器模板出错"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
+msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "是"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "否"
-#: js/oc-dialogs.js:195
+#: 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] ""
+
+#: 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."
@@ -245,13 +313,13 @@ 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:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "错误"
#: js/oc-vcategories.js:179
msgid "The app name is not specified."
-msgstr "未指定App名称。"
+msgstr "未指定应用名称。"
#: js/oc-vcategories.js:194
msgid "The required file {file} is not installed!"
@@ -265,7 +333,7 @@ msgstr "已共享"
msgid "Share"
msgstr "分享"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr "共享时出错"
@@ -321,67 +389,67 @@ msgstr "设置过期日期"
msgid "Expiration date"
msgstr "过期日期"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "通过Email共享"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "未找到此人"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "不允许二次共享"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr "在 {item} 与 {user} 共享。"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "取消共享"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "可以修改"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "访问控制"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "创建"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "更新"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "删除"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "共享"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "密码已受保护"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr "取消设置过期日期时出错"
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr "设置过期日期时出错"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr "正在发送..."
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr "邮件已发送"
@@ -396,10 +464,10 @@ msgstr "更新不成功。请汇报将此问题汇报给 <a href=\"https://gith
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "更新成功。正在重定向至 ownCloud。"
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
-msgstr ""
+msgstr "重置 %s 的密码"
#: lostpassword/templates/email.php:2
msgid "Use the following link to reset your password: {link}"
@@ -465,7 +533,7 @@ msgstr "个人"
msgid "Users"
msgstr "用户"
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "应用"
@@ -516,7 +584,7 @@ msgstr "你的PHP版本容易受到空字节攻击 (CVE-2006-7243)"
#: templates/installation.php:26
#, php-format
msgid "Please update your PHP installation to use %s securely."
-msgstr ""
+msgstr "为保证安全使用 %s 请更新您的PHP。"
#: templates/installation.php:32
msgid ""
@@ -541,7 +609,7 @@ msgstr "您的数据目录和文件可能可以直接被互联网访问，因为
msgid ""
"For information how to properly configure your server, please see the <a "
"href=\"%s\" target=\"_blank\">documentation</a>."
-msgstr ""
+msgstr "关于如何配置服务器，请参见 <a href=\"%s\" target=\"_blank\">此文档</a>。"
#: templates/installation.php:47
msgid "Create an <strong>admin account</strong>"
@@ -594,14 +662,10 @@ msgstr "安装完成"
msgid "%s is available. Get more information on how to update."
msgstr "%s 可用。获取更多关于如何升级的信息。"
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "注销"
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "自动登录被拒绝！"
@@ -616,19 +680,19 @@ msgstr "如果您没有最近修改您的密码，您的帐户可能会受到影
msgid "Please change your password to secure your account again."
msgstr "请修改您的密码，以保护您的账户安全。"
-#: templates/login.php:34
+#: templates/login.php:32
msgid "Lost your password?"
msgstr "忘记密码？"
-#: templates/login.php:39
+#: templates/login.php:37
msgid "remember"
msgstr "记住"
-#: templates/login.php:41
+#: templates/login.php:39
msgid "Log in"
msgstr "登录"
-#: templates/login.php:47
+#: templates/login.php:45
msgid "Alternative Logins"
msgstr "其他登录方式"
diff --git a/l10n/zh_CN/files.po b/l10n/zh_CN/files.po
index d35b319b1c6bc8a71c392552f5ffffffdc6ed7aa..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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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,7 +77,15 @@ msgstr "写入磁盘失败"
msgid "Not enough storage available"
msgstr "没有足够的存储空间"
-#: ajax/upload.php:123
+#: 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 "无效文件夹。"
@@ -85,146 +93,154 @@ 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: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 "URL不能为空"
-#: 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 "无效的文件夹名。”Shared“ 是 Owncloud 预留的文件夹"
-#: js/file-upload.js:277 js/file-upload.js:293 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:465
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "等待"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{new_name} 已存在"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "替换"
-#: js/filelist.js:303
+#: js/filelist.js:416
msgid "suggest name"
msgstr "建议名称"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "取消"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr "已将 {old_name}替换成 {new_name}"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "undo"
msgstr "撤销"
-#: js/filelist.js:453
+#: 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:534 js/filelist.js:600 js/files.js:582
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] "%n个文件"
+
+#: 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] ""
-#: js/filelist.js:518
-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: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 "修改日期"
-#: js/files.js:580
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] "%n 文件夹"
-
-#: js/files.js:586
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] "%n个文件"
-
#: lib/app.php:73
#, php-format
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 "上传"
@@ -260,84 +276,68 @@ 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: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 "当前扫描"
-#: templates/part.list.php:74
-msgid "directory"
-msgstr ""
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr ""
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr "文件"
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr "文件"
-
#: templates/upgrade.php:2
msgid "Upgrading filesystem cache..."
msgstr "正在更新文件系统缓存..."
diff --git a/l10n/zh_CN/files_sharing.po b/l10n/zh_CN/files_sharing.po
index b526299a397531047ef2ccd81da76c9633dec2e1..5887baf02b772940017e9cd9541265a1dfbb96d0 100644
--- a/l10n/zh_CN/files_sharing.po
+++ b/l10n/zh_CN/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:01+0000\n"
"Last-Translator: waterone <suiy02@gmail.com>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
@@ -64,7 +64,7 @@ msgstr "%s与您共享了%s文件夹"
msgid "%s shared the file %s with you"
msgstr "%s与您共享了%s文件"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "下载"
@@ -76,6 +76,6 @@ msgstr "上传"
msgid "Cancel upload"
msgstr "取消上传"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "没有预览"
diff --git a/l10n/zh_CN/lib.po b/l10n/zh_CN/lib.po
index 28e19119a91e333a4c7dbb091e1e226e5c80554a..6d3267bb037b7503b67651a12faacbc3a6001caf 100644
--- a/l10n/zh_CN/lib.po
+++ b/l10n/zh_CN/lib.po
@@ -5,12 +5,13 @@
# Translators:
# Charlie Mak <makchamhim72@gmail.com>, 2013
# modokwang <modokwang@gmail.com>, 2013
+# Xuetian Weng <wengxt@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\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"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
@@ -50,11 +51,23 @@ msgstr "用户"
msgid "Admin"
msgstr "管理"
-#: app.php:837
+#: 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 "您控制的web服务"
@@ -107,37 +120,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
-msgstr ""
+msgstr "应用未提供 info.xml 文件"
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: 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:150
+#: 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:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -266,47 +279,47 @@ msgstr "您的Web服务器尚未正确设置以允许文件同步, 因为WebDAV
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "请认真检查<a href='%s'>安装指南</a>."
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "秒前"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n 分钟前"
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
-msgstr[0] ""
+msgstr[0] "%n 小时前"
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "今天"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "昨天"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
-msgstr[0] ""
+msgstr[0] "%n 天前"
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "上月"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
-msgstr[0] ""
+msgstr[0] "%n 月前"
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "去年"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "年前"
diff --git a/l10n/zh_CN/settings.po b/l10n/zh_CN/settings.po
index 7258511fab354d6a477d8afe1c2ec9285dd861df..fc3228827b0d9cd0f3a8ca14f14411619481a439 100644
--- a/l10n/zh_CN/settings.po
+++ b/l10n/zh_CN/settings.po
@@ -6,13 +6,14 @@
# m13253 <m13253@hotmail.com>, 2013
# waterone <suiy02@gmail.com>, 2013
# modokwang <modokwang@gmail.com>, 2013
+# Xuetian Weng <wengxt@gmail.com>, 2013
# zhangmin <zm1990s@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+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"
@@ -26,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 "认证出错"
@@ -88,55 +89,88 @@ msgstr "无法从组%s中移除用户"
msgid "Couldn't update app."
msgstr "无法更新 app。"
-#: js/apps.js:35
+#: 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}"
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr "禁用"
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr "开启"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr "请稍等...."
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
-msgstr ""
+msgstr "禁用 app 时出错"
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
-msgstr ""
+msgstr "启用 app 时出错"
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr "正在更新...."
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr "更新 app 时出错"
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "错误"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr "更新"
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr "已更新"
-#: js/personal.js:150
-msgid "Decrypting files... Please wait, this can take some time."
+#: js/personal.js:220
+msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:172
+#: js/personal.js:265
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr "正在解密文件... 请稍等，可能需要一些时间。"
+
+#: js/personal.js:287
msgid "Saving..."
msgstr "保存中"
@@ -152,16 +186,16 @@ msgstr "撤销"
msgid "Unable to remove user"
msgstr "无法移除用户"
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: 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:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "组管理员"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "删除"
@@ -181,7 +215,7 @@ msgstr "创建用户出错"
msgid "A valid password must be provided"
msgstr "必须提供合法的密码"
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "简体中文"
@@ -347,11 +381,11 @@ msgstr "更多"
msgid "Less"
msgstr "更少"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "版本"
-#: templates/admin.php:246 templates/personal.php:143
+#: 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 "
@@ -418,7 +452,7 @@ msgstr "再次显示首次运行向导"
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "你已使用 <strong>%s</strong>，有效空间 <strong>%s</strong>"
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "密码"
@@ -442,7 +476,7 @@ msgstr "新密码"
msgid "Change password"
msgstr "修改密码"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr "显示名称"
@@ -458,40 +492,68 @@ msgstr "您的电子邮件"
msgid "Fill in an email address to enable password recovery"
msgstr "填写电子邮件地址以启用密码恢复功能"
-#: templates/personal.php:85 templates/personal.php:86
+#: 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:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "帮助翻译"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: 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 "使用该链接 <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">通过WebDAV访问你的文件</a>"
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "加密"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
-msgstr ""
+msgstr "加密 app 未启用，将解密您所有文件"
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
-msgstr ""
+msgstr "登录密码"
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
-msgstr ""
+msgstr "解密所有文件"
#: templates/users.php:21
msgid "Login Name"
@@ -515,30 +577,30 @@ msgstr "输入恢复密码来在更改密码的时候恢复用户文件"
msgid "Default Storage"
msgstr "默认存储"
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr "无限"
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "其它"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "用户名"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr "存储"
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr "修改显示名称"
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr "设置新密码"
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr "默认"
diff --git a/l10n/zh_CN/user_ldap.po b/l10n/zh_CN/user_ldap.po
index f10526434317ec306a4cf380251a4ad18a317421..22c5379e5583a28d4df5f7f74a25bc90ef38d22e 100644
--- a/l10n/zh_CN/user_ldap.po
+++ b/l10n/zh_CN/user_ldap.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-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\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"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_CN/user_webdavauth.po b/l10n/zh_CN/user_webdavauth.po
index c3a8727e4b6eeec499f850ccf695f574637536f2..754dd58d6e514f51f9b1ba57cf17ba9d5bd00a28 100644
--- a/l10n/zh_CN/user_webdavauth.po
+++ b/l10n/zh_CN/user_webdavauth.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-07-27 01:56-0400\n"
-"PO-Revision-Date: 2013-07-27 05:57+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-28 06:22-0400\n"
+"PO-Revision-Date: 2013-08-27 19:10+0000\n"
+"Last-Translator: Xuetian Weng <wengxt@gmail.com>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -28,11 +28,11 @@ msgstr "WebDAV 认证"
#: templates/settings.php:4
msgid "Address: "
-msgstr ""
+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 ""
+msgstr "用户的身份将会被发送到此 URL。这个插件检查返回值并且将 HTTP 状态编码 401 和 403 解释为非法身份，其他所有返回值为合法身份。"
diff --git a/l10n/zh_HK/core.po b/l10n/zh_HK/core.po
index da4034263701ad181af19301da16782b1f3d8c2a..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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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"
@@ -22,6 +22,10 @@ msgstr ""
msgid "%s shared »%s« with you"
msgstr ""
+#: ajax/share.php:227
+msgid "group"
+msgstr ""
+
#: ajax/update.php:11
msgid "Turned on maintenance mode"
msgstr ""
@@ -86,6 +90,26 @@ msgstr ""
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 "星期日"
@@ -162,55 +186,55 @@ msgstr "十一月"
msgid "December"
msgstr "十二月"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "設定"
-#: js/js.js:812
+#: js/js.js:866
msgid "seconds ago"
msgstr ""
-#: js/js.js:813
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: js/js.js:814
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: js/js.js:815
+#: js/js.js:869
msgid "today"
msgstr "今日"
-#: js/js.js:816
+#: js/js.js:870
msgid "yesterday"
msgstr "昨日"
-#: js/js.js:817
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
-#: js/js.js:818
+#: js/js.js:872
msgid "last month"
msgstr "前一月"
-#: js/js.js:819
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: js/js.js:820
+#: js/js.js:874
msgid "months ago"
msgstr "個月之前"
-#: js/js.js:821
+#: js/js.js:875
msgid "last year"
msgstr ""
-#: js/js.js:822
+#: js/js.js:876
msgid "years ago"
msgstr ""
@@ -218,22 +242,65 @@ msgstr ""
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "Yes"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "No"
-#: js/oc-dialogs.js:195
+#: js/oc-dialogs.js:199
msgid "Ok"
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] ""
+
+#: 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."
@@ -243,7 +310,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:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "錯誤"
@@ -263,7 +330,7 @@ msgstr "已分享"
msgid "Share"
msgstr "分享"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr "分享時發生錯誤"
@@ -319,67 +386,67 @@ msgstr "設定分享期限"
msgid "Expiration date"
msgstr "分享期限"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "以電郵分享"
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "找不到"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
msgstr "取消分享"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr ""
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr ""
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "新增"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "更新"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "刪除"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "分享"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "密碼保護"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
msgstr "傳送中"
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr "郵件已傳"
@@ -394,7 +461,7 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "更新成功, 正"
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr ""
@@ -463,7 +530,7 @@ msgstr "個人"
msgid "Users"
msgstr "用戶"
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "軟件"
@@ -592,14 +659,10 @@ msgstr ""
msgid "%s is available. Get more information on how to update."
msgstr ""
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "登出"
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr ""
-
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "自動登入被拒"
@@ -614,19 +677,19 @@ msgstr "如果你近期未曾更改密碼, 你的帳號可能被洩露!"
msgid "Please change your password to secure your account again."
msgstr "請更改你的密碼以保護你的帳戶"
-#: templates/login.php:34
+#: templates/login.php:32
msgid "Lost your password?"
msgstr "忘記密碼"
-#: templates/login.php:39
+#: templates/login.php:37
msgid "remember"
msgstr "記住"
-#: templates/login.php:41
+#: templates/login.php:39
msgid "Log in"
msgstr "登入"
-#: templates/login.php:47
+#: templates/login.php:45
msgid "Alternative Logins"
msgstr ""
diff --git a/l10n/zh_HK/files.po b/l10n/zh_HK/files.po
index dc0fe5ad6fb7481162d03375a5cf690e18caabb5..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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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,7 +74,15 @@ msgstr ""
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:123
+#: 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 ""
@@ -82,146 +90,154 @@ 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: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:277 js/file-upload.js:293 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:465
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr ""
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr ""
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr ""
-#: js/filelist.js:303
+#: js/filelist.js:416
msgid "suggest name"
msgstr ""
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr ""
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr ""
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "undo"
msgstr ""
-#: js/filelist.js:453
-msgid "Uploading %n file"
-msgid_plural "Uploading %n files"
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
+msgid "%n folder"
+msgid_plural "%n folders"
msgstr[0] ""
-#: js/filelist.js:518
-msgid "files uploading"
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+
+#: js/filelist.js:541
+msgid "{dirs} and {files}"
msgstr ""
-#: js/files.js:52
+#: js/filelist.js:731 js/filelist.js:769
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+
+#: 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 ""
-#: js/files.js:580
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-
-#: js/files.js:586
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-
#: lib/app.php:73
#, php-format
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 "上傳"
@@ -257,84 +273,68 @@ 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 ""
-#: templates/part.list.php:74
-msgid "directory"
-msgstr ""
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr ""
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr ""
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr ""
-
#: templates/upgrade.php:2
msgid "Upgrading filesystem cache..."
msgstr ""
diff --git a/l10n/zh_HK/files_sharing.po b/l10n/zh_HK/files_sharing.po
index 1ab84440f23185ee1b49999ad15ced6eb00d8357..51163c90a96fc9d5a74c504f1953cc33cc6e1a61 100644
--- a/l10n/zh_HK/files_sharing.po
+++ b/l10n/zh_HK/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00: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"
@@ -63,7 +63,7 @@ msgstr ""
msgid "%s shared the file %s with you"
msgstr ""
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "下載"
@@ -75,6 +75,6 @@ msgstr "上傳"
msgid "Cancel upload"
msgstr ""
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr ""
diff --git a/l10n/zh_HK/lib.po b/l10n/zh_HK/lib.po
index c6fa7c451a4730ec05c79eb3aa3a987447331a9f..22b7a3e57b444982c02df99d10fd597ec151f0e6 100644
--- a/l10n/zh_HK/lib.po
+++ b/l10n/zh_HK/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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+0000\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"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
@@ -48,11 +48,23 @@ msgstr "用戶"
msgid "Admin"
msgstr "管理"
-#: app.php:837
+#: 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 ""
@@ -105,37 +117,37 @@ msgstr ""
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:144
+#: 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:150
+#: 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:160
+#: installer.php:162
msgid "App directory already exists"
msgstr ""
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -264,47 +276,47 @@ msgstr ""
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr ""
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "今日"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "昨日"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] ""
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "前一月"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr ""
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr ""
diff --git a/l10n/zh_HK/settings.po b/l10n/zh_HK/settings.po
index 3d0d5b1326567bffaadcb70ff4cdb41fe16061ed..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-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-25 23:18+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,55 +84,88 @@ msgstr ""
msgid "Couldn't update app."
msgstr ""
-#: js/apps.js:35
+#: 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:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr ""
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr ""
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr ""
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr ""
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr ""
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr ""
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "錯誤"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr ""
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr ""
-#: js/personal.js:150
+#: 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:172
+#: js/personal.js:287
msgid "Saving..."
msgstr ""
@@ -148,16 +181,16 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: 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:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr ""
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "刪除"
@@ -177,7 +210,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr ""
@@ -343,11 +376,11 @@ msgstr ""
msgid "Less"
msgstr ""
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr ""
-#: templates/admin.php:246 templates/personal.php:143
+#: 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 "
@@ -414,7 +447,7 @@ msgstr ""
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:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "密碼"
@@ -438,7 +471,7 @@ msgstr "新密碼"
msgid "Change password"
msgstr ""
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr ""
@@ -454,38 +487,66 @@ msgstr ""
msgid "Fill in an email address to enable password recovery"
msgstr ""
-#: templates/personal.php:85 templates/personal.php:86
-msgid "Language"
+#: 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:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:106
+#: 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:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "加密"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr ""
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr ""
@@ -511,30 +572,30 @@ msgstr ""
msgid "Default Storage"
msgstr ""
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr ""
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr ""
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "用戶名稱"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr ""
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr ""
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr ""
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr ""
diff --git a/l10n/zh_HK/user_ldap.po b/l10n/zh_HK/user_ldap.po
index 98bb432413746d2df62d08ec4410b77283fa8f28..ecd9fd8d4c154f9e1f70e3b65127f0bcd972b167 100644
--- a/l10n/zh_HK/user_ldap.po
+++ b/l10n/zh_HK/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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-19 19:07+0000\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"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_TW/core.po b/l10n/zh_TW/core.po
index ddf0a2225d9bf5d03f3b318f5205c1358fd84a9e..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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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"
@@ -24,30 +24,34 @@ msgstr ""
msgid "%s shared »%s« with you"
msgstr "%s 與您分享了 %s"
+#: ajax/share.php:227
+msgid "group"
+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."
@@ -60,13 +64,13 @@ msgstr "沒有可增加的分類？"
#: ajax/vcategories/add.php:37
#, php-format
msgid "This category already exists: %s"
-msgstr "分類已經存在： %s"
+msgstr "分類已經存在：%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 "未指定物件類型"
#: ajax/vcategories/addToFavorites.php:30
#: ajax/vcategories/removeFromFavorites.php:30
@@ -88,6 +92,26 @@ msgstr "沒有選擇要刪除的分類。"
msgid "Error removing %s from favorites."
msgstr "從最愛移除 %s 時發生錯誤。"
+#: 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 "週日"
@@ -164,55 +188,55 @@ msgstr "十一月"
msgid "December"
msgstr "十二月"
-#: js/js.js:355
+#: js/js.js:387
msgid "Settings"
msgstr "設定"
-#: js/js.js:812
+#: js/js.js:866
msgid "seconds ago"
msgstr "幾秒前"
-#: js/js.js:813
+#: js/js.js:867
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n 分鐘前"
-#: js/js.js:814
+#: js/js.js:868
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n 小時前"
-#: js/js.js:815
+#: js/js.js:869
msgid "today"
msgstr "今天"
-#: js/js.js:816
+#: js/js.js:870
msgid "yesterday"
msgstr "昨天"
-#: js/js.js:817
+#: js/js.js:871
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n 天前"
-#: js/js.js:818
+#: js/js.js:872
msgid "last month"
msgstr "上個月"
-#: js/js.js:819
+#: js/js.js:873
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n 個月前"
-#: js/js.js:820
+#: js/js.js:874
msgid "months ago"
msgstr "幾個月前"
-#: js/js.js:821
+#: js/js.js:875
msgid "last year"
msgstr "去年"
-#: js/js.js:822
+#: js/js.js:876
msgid "years ago"
msgstr "幾年前"
@@ -220,22 +244,65 @@ msgstr "幾年前"
msgid "Choose"
msgstr "選擇"
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
-msgid "Error loading file picker template"
-msgstr "載入檔案選擇器樣板發生錯誤"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
+msgstr ""
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "Yes"
msgstr "是"
-#: js/oc-dialogs.js:178
+#: js/oc-dialogs.js:182
msgid "No"
msgstr "否"
-#: js/oc-dialogs.js:195
+#: 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] ""
+
+#: 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."
@@ -245,7 +312,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:643 js/share.js:655
+#: js/share.js:645 js/share.js:657
msgid "Error"
msgstr "錯誤"
@@ -265,7 +332,7 @@ msgstr "已分享"
msgid "Share"
msgstr "分享"
-#: js/share.js:131 js/share.js:683
+#: js/share.js:131 js/share.js:685
msgid "Error while sharing"
msgstr "分享時發生錯誤"
@@ -287,7 +354,7 @@ msgstr "{owner} 已經和您分享"
#: js/share.js:183
msgid "Share with"
-msgstr "與...分享"
+msgstr "分享給別人"
#: js/share.js:188
msgid "Share with link"
@@ -315,73 +382,73 @@ msgstr "寄出"
#: js/share.js:208
msgid "Set expiration date"
-msgstr "設置到期日"
+msgstr "指定到期日"
#: js/share.js:209
msgid "Expiration date"
msgstr "到期日"
-#: js/share.js:241
+#: js/share.js:242
msgid "Share via email:"
msgstr "透過電子郵件分享："
-#: js/share.js:243
+#: js/share.js:245
msgid "No people found"
msgstr "沒有找到任何人"
-#: js/share.js:281
+#: js/share.js:283
msgid "Resharing is not allowed"
msgstr "不允許重新分享"
-#: js/share.js:317
+#: js/share.js:319
msgid "Shared in {item} with {user}"
msgstr "已和 {user} 分享 {item}"
-#: js/share.js:338
+#: js/share.js:340
msgid "Unshare"
-msgstr "取消共享"
+msgstr "取消分享"
-#: js/share.js:350
+#: js/share.js:352
msgid "can edit"
msgstr "可編輯"
-#: js/share.js:352
+#: js/share.js:354
msgid "access control"
msgstr "存取控制"
-#: js/share.js:355
+#: js/share.js:357
msgid "create"
msgstr "建立"
-#: js/share.js:358
+#: js/share.js:360
msgid "update"
msgstr "更新"
-#: js/share.js:361
+#: js/share.js:363
msgid "delete"
msgstr "刪除"
-#: js/share.js:364
+#: js/share.js:366
msgid "share"
msgstr "分享"
-#: js/share.js:398 js/share.js:630
+#: js/share.js:400 js/share.js:632
msgid "Password protected"
msgstr "受密碼保護"
-#: js/share.js:643
+#: js/share.js:645
msgid "Error unsetting expiration date"
-msgstr "解除過期日設定失敗"
+msgstr "取消到期日設定失敗"
-#: js/share.js:655
+#: js/share.js:657
msgid "Error setting expiration date"
-msgstr "錯誤的到期日設定"
+msgstr "設定到期日發生錯誤"
-#: js/share.js:670
+#: js/share.js:672
msgid "Sending ..."
-msgstr "正在傳送..."
+msgstr "正在傳送…"
-#: js/share.js:681
+#: js/share.js:683
msgid "Email sent"
msgstr "Email 已寄出"
@@ -396,7 +463,7 @@ msgstr "升級失敗，請將此問題回報 <a href=\"https://github.com/ownclo
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "升級成功，正將您重新導向至 ownCloud 。"
-#: lostpassword/controller.php:61
+#: lostpassword/controller.php:62
#, php-format
msgid "%s password reset"
msgstr "%s 密碼重設"
@@ -410,7 +477,7 @@ 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 "重設密碼的連結已經寄至您的電子郵件信箱，如果您過了一段時間還是沒有收到它，請檢查看看它是不是被放到垃圾郵件了，如果還是沒有的話，請聯絡您的 ownCloud 系統管理員。"
+msgstr "重設密碼的連結已經寄至您的電子郵件信箱，如果您過了一段時間還是沒有收到它，請檢查看看它是不是被歸為垃圾郵件了，如果還是沒有的話，請聯絡您的 ownCloud 系統管理員。"
#: lostpassword/templates/lostpassword.php:12
msgid "Request failed!<br>Did you make sure your email/username was right?"
@@ -465,7 +532,7 @@ msgstr "個人"
msgid "Users"
msgstr "使用者"
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:108
msgid "Apps"
msgstr "應用程式"
@@ -483,7 +550,7 @@ msgstr "存取被拒"
#: templates/404.php:15
msgid "Cloud not found"
-msgstr "未發現雲端"
+msgstr "找不到網頁"
#: templates/altmail.php:2
#, php-format
@@ -494,7 +561,7 @@ msgid ""
"View it: %s\n"
"\n"
"Cheers!"
-msgstr "嗨，\n\n通知您，%s 與您分享了 %s 。\n看一下：%s"
+msgstr "嗨，\n\n通知您一聲，%s 與您分享了 %s 。\n您可以到 %s 看看"
#: templates/edit_categories_dialog.php:4
msgid "Edit categories"
@@ -553,7 +620,7 @@ msgstr "進階"
#: templates/installation.php:67
msgid "Data folder"
-msgstr "資料夾"
+msgstr "資料儲存位置"
#: templates/installation.php:77
msgid "Configure the database"
@@ -594,14 +661,10 @@ msgstr "完成設定"
msgid "%s is available. Get more information on how to update."
msgstr "%s 已經釋出，瞭解更多資訊以進行更新。"
-#: templates/layout.user.php:66
+#: templates/layout.user.php:69
msgid "Log out"
msgstr "登出"
-#: templates/layout.user.php:100
-msgid "More apps"
-msgstr "更多 Apps"
-
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "自動登入被拒！"
@@ -616,30 +679,30 @@ msgstr "如果您最近並未更改密碼，您的帳號可能已經遭到入侵
msgid "Please change your password to secure your account again."
msgstr "請更改您的密碼以再次取得您帳戶的控制權。"
-#: templates/login.php:34
+#: templates/login.php:32
msgid "Lost your password?"
msgstr "忘記密碼？"
-#: templates/login.php:39
+#: templates/login.php:37
msgid "remember"
msgstr "記住"
-#: templates/login.php:41
+#: templates/login.php:39
msgid "Log in"
msgstr "登入"
-#: templates/login.php:47
+#: templates/login.php:45
msgid "Alternative Logins"
-msgstr "替代登入方法"
+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 "嗨，<br><br>通知您，%s 與您分享了 %s ，<br><a href=\"%s\">看一下吧</a>"
+msgstr "嗨，<br><br>通知您一聲，%s 與您分享了 %s ，<br><a href=\"%s\">看一下吧</a>"
#: templates/update.php:3
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "正在將 Owncloud 升級至版本 %s ，這可能需要一點時間。"
+msgstr "正在將 ownCloud 升級至版本 %s ，這可能需要一點時間。"
diff --git a/l10n/zh_TW/files.po b/l10n/zh_TW/files.po
index 59f8bf9186744147b080850bd13684734da5f13f..60f8fdf7a0d9e27f103383d652fdff47d1a645de 100644
--- a/l10n/zh_TW/files.po
+++ b/l10n/zh_TW/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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-27 15:18+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 (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
@@ -21,7 +21,7 @@ msgstr ""
#: ajax/move.php:17
#, php-format
msgid "Could not move %s - File with this name already exists"
-msgstr "無法移動 %s - 同名的檔案已經存在"
+msgstr "無法移動 %s ，同名的檔案已經存在"
#: ajax/move.php:27 ajax/move.php:30
#, php-format
@@ -30,7 +30,7 @@ msgstr "無法移動 %s"
#: ajax/upload.php:16 ajax/upload.php:45
msgid "Unable to set upload directory."
-msgstr "無法設定上傳目錄。"
+msgstr "無法設定上傳目錄"
#: ajax/upload.php:22
msgid "Invalid Token"
@@ -38,11 +38,11 @@ msgstr "無效的 token"
#: ajax/upload.php:59
msgid "No file was uploaded. Unknown error"
-msgstr "沒有檔案被上傳。未知的錯誤。"
+msgstr "沒有檔案被上傳，原因未知"
#: ajax/upload.php:66
msgid "There is no error, the file uploaded with success"
-msgstr "無錯誤，檔案上傳成功"
+msgstr "一切都順利，檔案上傳成功"
#: ajax/upload.php:67
msgid ""
@@ -75,154 +75,170 @@ msgstr "寫入硬碟失敗"
msgid "Not enough storage available"
msgstr "儲存空間不足"
-#: ajax/upload.php:123
+#: 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 "無效的資料夾。"
+msgstr "無效的資料夾"
#: appinfo/app.php:12
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: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 "檔案上傳中。離開此頁面將會取消上傳。"
+msgstr "檔案上傳中，離開此頁面將會取消上傳。"
-#: js/file-upload.js:241
+#: js/file-upload.js:520
msgid "URL cannot be empty."
-msgstr "URL 不能為空白。"
+msgstr "URL 不能為空"
-#: 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 "無效的資料夾名稱，'Shared' 的使用被 ownCloud 保留"
-#: js/file-upload.js:277 js/file-upload.js:293 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:465
+#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788
msgid "Pending"
msgstr "等候中"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "{new_name} already exists"
msgstr "{new_name} 已經存在"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "replace"
msgstr "取代"
-#: js/filelist.js:303
+#: js/filelist.js:416
msgid "suggest name"
msgstr "建議檔名"
-#: js/filelist.js:303 js/filelist.js:305
+#: js/filelist.js:416 js/filelist.js:418
msgid "cancel"
msgstr "取消"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "replaced {new_name} with {old_name}"
msgstr "使用 {new_name} 取代 {old_name}"
-#: js/filelist.js:350
+#: js/filelist.js:463
msgid "undo"
msgstr "復原"
-#: js/filelist.js:453
+#: 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:534 js/filelist.js:600 js/files.js:582
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] "%n 個檔案"
+
+#: js/filelist.js:541
+msgid "{dirs} and {files}"
+msgstr "{dirs} 和 {files}"
+
+#: js/filelist.js:731 js/filelist.js:769
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "%n 個檔案正在上傳"
-#: js/filelist.js:518
-msgid "files uploading"
-msgstr "檔案正在上傳中"
-
-#: js/files.js:52
+#: js/files.js:25
msgid "'.' is an invalid file name."
-msgstr "'.' 是不合法的檔名。"
+msgstr "'.' 是不合法的檔名"
-#: js/files.js:56
+#: js/files.js:29
msgid "File name cannot be empty."
-msgstr "檔名不能為空。"
+msgstr "檔名不能為空"
-#: js/files.js:64
+#: js/files.js:37
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
-msgstr "檔名不合法，不允許 '\\', '/', '<', '>', ':', '\"', '|', '?' 和 '*' 。"
+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: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 "修改"
-
-#: js/files.js:580
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] "%n 個資料夾"
-
-#: js/files.js:586
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] "%n 個檔案"
+msgstr "修改時間"
#: lib/app.php:73
#, php-format
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 "上傳"
@@ -232,7 +248,7 @@ msgstr "檔案處理"
#: templates/admin.php:7
msgid "Maximum upload size"
-msgstr "最大上傳檔案大小"
+msgstr "上傳限制"
#: templates/admin.php:10
msgid "max. possible: "
@@ -240,11 +256,11 @@ msgstr "最大允許："
#: templates/admin.php:15
msgid "Needed for multi-file and folder downloads."
-msgstr "針對多檔案和目錄下載是必填的。"
+msgstr "下載多檔案和目錄時，此項是必填的。"
#: templates/admin.php:17
msgid "Enable ZIP-download"
-msgstr "啟用 Zip 下載"
+msgstr "啟用 ZIP 下載"
#: templates/admin.php:20
msgid "0 is unlimited"
@@ -252,90 +268,74 @@ msgstr "0代表沒有限制"
#: templates/admin.php:22
msgid "Maximum input size for ZIP files"
-msgstr "針對 ZIP 檔案最大輸入大小"
+msgstr "ZIP 壓縮前的原始大小限制"
#: templates/admin.php:26
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 "已刪除的檔案"
+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 "您在這裡沒有編輯權。"
+msgstr "您在這裡沒有編輯權"
-#: templates/index.php:59
+#: templates/index.php:50
msgid "Nothing in here. Upload something!"
-msgstr "這裡什麼也沒有，上傳一些東西吧！"
+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 "取消共享"
+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 "您試圖上傳的檔案已超過伺服器的最大檔案大小限制。"
+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 "目前掃描"
-
-#: templates/part.list.php:74
-msgid "directory"
-msgstr "目錄"
-
-#: templates/part.list.php:76
-msgid "directories"
-msgstr "目錄"
-
-#: templates/part.list.php:85
-msgid "file"
-msgstr "檔案"
-
-#: templates/part.list.php:87
-msgid "files"
-msgstr "檔案"
+msgstr "正在掃描"
#: templates/upgrade.php:2
msgid "Upgrading filesystem cache..."
-msgstr "正在升級檔案系統快取..."
+msgstr "正在升級檔案系統快取…"
diff --git a/l10n/zh_TW/files_sharing.po b/l10n/zh_TW/files_sharing.po
index 37faace2e6e476b9327b87a6369f0cf99f02e15f..c59207bb90f5153f16dd173ed0198a244f376717 100644
--- a/l10n/zh_TW/files_sharing.po
+++ b/l10n/zh_TW/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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-26 04:20+0000\n"
+"POT-Creation-Date: 2013-09-13 21:46-0400\n"
+"PO-Revision-Date: 2013-09-14 00:01+0000\n"
"Last-Translator: pellaeon <nfsmwlin@gmail.com>\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
@@ -20,7 +20,7 @@ msgstr ""
#: templates/authenticate.php:4
msgid "The password is wrong. Try again."
-msgstr "請檢查您的密碼並再試一次。"
+msgstr "請檢查您的密碼並再試一次"
#: templates/authenticate.php:7
msgid "Password"
@@ -32,7 +32,7 @@ msgstr "送出"
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
-msgstr "抱歉，這連結看來已經不能用了。"
+msgstr "抱歉，此連結已經失效"
#: templates/part.404.php:4
msgid "Reasons might be:"
@@ -64,7 +64,7 @@ msgstr "%s 和您分享了資料夾 %s "
msgid "%s shared the file %s with you"
msgstr "%s 和您分享了檔案 %s"
-#: templates/public.php:26 templates/public.php:88
+#: templates/public.php:26 templates/public.php:92
msgid "Download"
msgstr "下載"
@@ -76,6 +76,6 @@ msgstr "上傳"
msgid "Cancel upload"
msgstr "取消上傳"
-#: templates/public.php:85
+#: templates/public.php:89
msgid "No preview available for"
msgstr "無法預覽"
diff --git a/l10n/zh_TW/files_trashbin.po b/l10n/zh_TW/files_trashbin.po
index 53c5a7baec14cf702338c0814e9454aff560a294..57f79d287d91d5f7bffa65954787e19fc6c771cd 100644
--- a/l10n/zh_TW/files_trashbin.po
+++ b/l10n/zh_TW/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-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-26 04:00+0000\n"
+"POT-Creation-Date: 2013-09-01 13:27-0400\n"
+"PO-Revision-Date: 2013-09-01 13:20+0000\n"
"Last-Translator: pellaeon <nfsmwlin@gmail.com>\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
@@ -28,47 +28,47 @@ msgstr "無法永久刪除 %s"
msgid "Couldn't restore %s"
msgstr "無法還原 %s"
-#: 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 "錯誤"
-#: 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:184 templates/index.php:17
msgid "Name"
msgstr "名稱"
-#: js/trash.js:183 templates/index.php:27
+#: js/trash.js:185 templates/index.php:27
msgid "Deleted"
msgstr "已刪除"
-#: js/trash.js:191
+#: js/trash.js:193
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "%n 個資料夾"
-#: js/trash.js:197
+#: js/trash.js:199
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "%n 個檔案"
-#: lib/trash.php:819 lib/trash.php:821
+#: 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 "您的垃圾桶是空的！"
+msgstr "您的回收桶是空的！"
#: templates/index.php:20 templates/index.php:22
msgid "Restore"
diff --git a/l10n/zh_TW/lib.po b/l10n/zh_TW/lib.po
index 9f1a0e4503917db4c0bba5b568825182417853f0..93ad380deccaf74ddc2b3367432b2dad41a69807 100644
--- a/l10n/zh_TW/lib.po
+++ b/l10n/zh_TW/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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-26 04:10+0000\n"
-"Last-Translator: pellaeon <nfsmwlin@gmail.com>\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"
"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"
@@ -49,11 +49,23 @@ msgstr "使用者"
msgid "Admin"
msgstr "管理"
-#: app.php:837
+#: app.php:839
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "升級失敗：%s"
+#: 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 "由您控制的網路服務"
@@ -106,37 +118,37 @@ msgstr "不支援 %s 格式的壓縮檔"
msgid "Failed to open archive when installing app"
msgstr "安裝應用程式時無法開啓壓縮檔"
-#: installer.php:123
+#: installer.php:125
msgid "App does not provide an info.xml file"
msgstr "應用程式沒有提供 info.xml 檔案"
-#: installer.php:129
+#: installer.php:131
msgid "App can't be installed because of not allowed code in the App"
msgstr "無法安裝應用程式因為在當中找到危險的代碼"
-#: installer.php:138
+#: installer.php:140
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr "無法安裝應用程式因為它和此版本的 ownCloud 不相容。"
-#: installer.php:144
+#: 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 "無法安裝應用程式，因為它包含了 <shipped>true</shipped> 標籤，在未發行的應用程式當中這是不允許的"
-#: installer.php:150
+#: 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 "無法安裝應用程式，因為它在 info.xml/version 宣告的版本與 app store 當中記載的版本不同"
-#: installer.php:160
+#: installer.php:162
msgid "App directory already exists"
msgstr "應用程式目錄已經存在"
-#: installer.php:173
+#: installer.php:175
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr "無法建立應用程式目錄，請檢查權限：%s"
@@ -265,47 +277,47 @@ msgstr "您的網頁伺服器尚未被正確設定來進行檔案同步，因為
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "請參考<a href='%s'>安裝指南</a>。"
-#: template/functions.php:80
+#: template/functions.php:96
msgid "seconds ago"
msgstr "幾秒前"
-#: template/functions.php:81
+#: template/functions.php:97
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n 分鐘前"
-#: template/functions.php:82
+#: template/functions.php:98
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n 小時前"
-#: template/functions.php:83
+#: template/functions.php:99
msgid "today"
msgstr "今天"
-#: template/functions.php:84
+#: template/functions.php:100
msgid "yesterday"
msgstr "昨天"
-#: template/functions.php:85
+#: template/functions.php:101
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] "%n 天前"
-#: template/functions.php:86
+#: template/functions.php:102
msgid "last month"
msgstr "上個月"
-#: template/functions.php:87
+#: template/functions.php:103
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n 個月前"
-#: template/functions.php:88
+#: template/functions.php:104
msgid "last year"
msgstr "去年"
-#: template/functions.php:89
+#: template/functions.php:105
msgid "years ago"
msgstr "幾年前"
diff --git a/l10n/zh_TW/settings.po b/l10n/zh_TW/settings.po
index 9ba8be581baebf87bef7d3e65ecee91042f42104..5c24961e5cb323bf56bf9d2263e11a5ac45e8f2a 100644
--- a/l10n/zh_TW/settings.po
+++ b/l10n/zh_TW/settings.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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-26 04:10+0000\n"
-"Last-Translator: pellaeon <nfsmwlin@gmail.com>\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"
"Content-Type: text/plain; charset=UTF-8\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,55 +85,88 @@ msgstr "使用者移出群組 %s 錯誤"
msgid "Couldn't update app."
msgstr "無法更新應用程式"
-#: js/apps.js:35
+#: 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}"
-#: js/apps.js:41 js/apps.js:74 js/apps.js:100
+#: js/apps.js:49 js/apps.js:82 js/apps.js:108
msgid "Disable"
msgstr "停用"
-#: js/apps.js:41 js/apps.js:81 js/apps.js:94 js/apps.js:109
+#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
msgid "Enable"
msgstr "啟用"
-#: js/apps.js:63
+#: js/apps.js:71
msgid "Please wait...."
msgstr "請稍候..."
-#: js/apps.js:71 js/apps.js:72 js/apps.js:92
+#: js/apps.js:79 js/apps.js:80 js/apps.js:100
msgid "Error while disabling app"
msgstr "停用應用程式錯誤"
-#: js/apps.js:91 js/apps.js:104 js/apps.js:105
+#: js/apps.js:99 js/apps.js:112 js/apps.js:113
msgid "Error while enabling app"
msgstr "啓用應用程式錯誤"
-#: js/apps.js:115
+#: js/apps.js:123
msgid "Updating...."
msgstr "更新中..."
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error while updating app"
msgstr "更新應用程式錯誤"
-#: js/apps.js:118
+#: js/apps.js:126
msgid "Error"
msgstr "錯誤"
-#: js/apps.js:119 templates/apps.php:43
+#: js/apps.js:127 templates/apps.php:43
msgid "Update"
msgstr "更新"
-#: js/apps.js:122
+#: js/apps.js:130
msgid "Updated"
msgstr "已更新"
-#: js/personal.js:150
+#: 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:172
+#: js/personal.js:287
msgid "Saving..."
msgstr "儲存中..."
@@ -149,16 +182,16 @@ msgstr "復原"
msgid "Unable to remove user"
msgstr "無法刪除用戶"
-#: js/users.js:92 templates/users.php:26 templates/users.php:87
-#: templates/users.php:112
+#: 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:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:92 templates/users.php:130
msgid "Group Admin"
msgstr "群組管理員"
-#: js/users.js:120 templates/users.php:164
+#: js/users.js:120 templates/users.php:170
msgid "Delete"
msgstr "刪除"
@@ -178,7 +211,7 @@ msgstr "建立用戶時出現錯誤"
msgid "A valid password must be provided"
msgstr "一定要提供一個有效的密碼"
-#: personal.php:40 personal.php:41
+#: personal.php:45 personal.php:46
msgid "__language_name__"
msgstr "__language_name__"
@@ -344,11 +377,11 @@ msgstr "更多"
msgid "Less"
msgstr "更少"
-#: templates/admin.php:242 templates/personal.php:140
+#: templates/admin.php:242 templates/personal.php:161
msgid "Version"
msgstr "版本"
-#: templates/admin.php:246 templates/personal.php:143
+#: 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 "
@@ -356,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 "由 <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud 社群</a>開發，<a href=\"https://github.com/owncloud\" target=\"_blank\">原始碼</a>在 <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> 許可證下發布。"
+msgstr "由 <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud 社群</a>開發，<a href=\"https://github.com/owncloud\" target=\"_blank\">原始碼</a>在 <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> 授權許可下發布。"
#: templates/apps.php:13
msgid "Add your App"
@@ -415,7 +448,7 @@ msgstr "再次顯示首次使用精靈"
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "您已經使用了 <strong>%s</strong> ，目前可用空間為 <strong>%s</strong>"
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
msgid "Password"
msgstr "密碼"
@@ -439,7 +472,7 @@ msgstr "新密碼"
msgid "Change password"
msgstr "變更密碼"
-#: templates/personal.php:58 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:88
msgid "Display Name"
msgstr "顯示名稱"
@@ -455,38 +488,66 @@ msgstr "您的電子郵件信箱"
msgid "Fill in an email address to enable password recovery"
msgstr "請填入電子郵件信箱以便回復密碼"
-#: templates/personal.php:85 templates/personal.php:86
+#: 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:98
+#: templates/personal.php:119
msgid "Help translate"
msgstr "幫助翻譯"
-#: templates/personal.php:104
+#: templates/personal.php:125
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:106
+#: 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 "使用<a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">這個網址</a>來透過 WebDAV 存取您的檔案"
+msgstr "以上的 WebDAV 位址可以讓您<a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">透過 WebDAV 協定存取檔案</a>"
-#: templates/personal.php:117
+#: templates/personal.php:138
msgid "Encryption"
msgstr "加密"
-#: templates/personal.php:119
+#: templates/personal.php:140
msgid "The encryption app is no longer enabled, decrypt all your file"
msgstr "加密應用程式已經停用，請您解密您所有的檔案"
-#: templates/personal.php:125
+#: templates/personal.php:146
msgid "Log-in password"
msgstr "登入密碼"
-#: templates/personal.php:130
+#: templates/personal.php:151
msgid "Decrypt all Files"
msgstr "解密所有檔案"
@@ -512,30 +573,30 @@ msgstr "為了修改密碼時能夠取回使用者資料，請輸入另一組還
msgid "Default Storage"
msgstr "預設儲存區"
-#: templates/users.php:48 templates/users.php:142
+#: templates/users.php:48 templates/users.php:148
msgid "Unlimited"
msgstr "無限制"
-#: templates/users.php:66 templates/users.php:157
+#: templates/users.php:66 templates/users.php:163
msgid "Other"
msgstr "其他"
-#: templates/users.php:84
+#: templates/users.php:87
msgid "Username"
msgstr "使用者名稱"
-#: templates/users.php:91
+#: templates/users.php:94
msgid "Storage"
msgstr "儲存區"
-#: templates/users.php:102
+#: templates/users.php:108
msgid "change display name"
msgstr "修改顯示名稱"
-#: templates/users.php:106
+#: templates/users.php:112
msgid "set new password"
msgstr "設定新密碼"
-#: templates/users.php:137
+#: templates/users.php:143
msgid "Default"
msgstr "預設"
diff --git a/l10n/zh_TW/user_ldap.po b/l10n/zh_TW/user_ldap.po
index fd00e191fde285bf38477f3357baed051acb1b66..50beca64ee57462303b741967abc63e8fd033ee8 100644
--- a/l10n/zh_TW/user_ldap.po
+++ b/l10n/zh_TW/user_ldap.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-08-27 11:18-0400\n"
-"PO-Revision-Date: 2013-08-26 06:10+0000\n"
+"POT-Creation-Date: 2013-09-07 04:40-0400\n"
+"PO-Revision-Date: 2013-09-05 11:51+0000\n"
"Last-Translator: pellaeon <nfsmwlin@gmail.com>\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
diff --git a/lib/allconfig.php b/lib/allconfig.php
new file mode 100644
index 0000000000000000000000000000000000000000..72aabf60793b8caf84cdd93e5760a022ce0de9b4
--- /dev/null
+++ b/lib/allconfig.php
@@ -0,0 +1,77 @@
+<?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;
+
+/**
+ * Class to combine all the configuration options ownCloud offers
+ */
+class AllConfig implements \OCP\IConfig {
+ /**
+ * Sets a new system wide value
+ * @param string $key the key of the value, under which will be saved
+ * @param string $value the value that should be stored
+ * @todo need a use case for this
+ */
+// public function setSystemValue($key, $value) {
+// \OCP\Config::setSystemValue($key, $value);
+// }
+
+ /**
+ * Looks up a system wide defined value
+ * @param string $key the key of the value, under which it was saved
+ * @return string the saved value
+ */
+ public function getSystemValue($key) {
+ return \OCP\Config::getSystemValue($key, '');
+ }
+
+
+ /**
+ * Writes a new app wide value
+ * @param string $appName the appName that we want to store the value under
+ * @param string $key the key of the value, under which will be saved
+ * @param string $value the value that should be stored
+ */
+ public function setAppValue($appName, $key, $value) {
+ \OCP\Config::setAppValue($appName, $key, $value);
+ }
+
+ /**
+ * Looks up an app wide defined value
+ * @param string $appName the appName that we stored the value under
+ * @param string $key the key of the value, under which it was saved
+ * @return string the saved value
+ */
+ public function getAppValue($appName, $key) {
+ return \OCP\Config::getAppValue($appName, $key, '');
+ }
+
+
+ /**
+ * Set a user defined value
+ * @param string $userId the userId of the user that we want to store the value under
+ * @param string $appName the appName that we want to store the value under
+ * @param string $key the key under which the value is being stored
+ * @param string $value the value that you want to store
+ */
+ public function setUserValue($userId, $appName, $key, $value) {
+ \OCP\Config::setUserValue($userId, $appName, $key, $value);
+ }
+
+ /**
+ * Shortcut for getting a user defined value
+ * @param string $userId the userId of the user that we want to store the value under
+ * @param string $appName the appName that we stored the value under
+ * @param string $key the key under which the value is being stored
+ */
+ public function getUserValue($userId, $appName, $key){
+ return \OCP\Config::getUserValue($userId, $appName, $key);
+ }
+}
diff --git a/lib/app.php b/lib/app.php
index 8f5dd1d685ee6f8a7b250717812d69644c2fad74..0ab1ee57f631654cffcde66de4040b78ac23550e 100644
--- a/lib/app.php
+++ b/lib/app.php
@@ -27,8 +27,6 @@
* upgrading and removing apps.
*/
class OC_App{
- static private $activeapp = '';
- static private $navigation = array();
static private $settingsForms = array();
static private $adminForms = array();
static private $personalForms = array();
@@ -73,11 +71,11 @@ class OC_App{
if (!defined('DEBUG') || !DEBUG) {
if (is_null($types)
- && empty(OC_Util::$core_scripts)
- && empty(OC_Util::$core_styles)) {
- OC_Util::$core_scripts = OC_Util::$scripts;
+ && empty(OC_Util::$coreScripts)
+ && empty(OC_Util::$coreStyles)) {
+ OC_Util::$coreScripts = OC_Util::$scripts;
OC_Util::$scripts = array();
- OC_Util::$core_styles = OC_Util::$styles;
+ OC_Util::$coreStyles = OC_Util::$styles;
OC_Util::$styles = array();
}
}
@@ -271,7 +269,7 @@ class OC_App{
/**
* @brief adds an entry to the navigation
- * @param string $data array containing the data
+ * @param array $data array containing the data
* @return bool
*
* This function adds a new entry to the navigation visible to users. $data
@@ -287,11 +285,7 @@ class OC_App{
* the navigation. Lower values come first.
*/
public static function addNavigationEntry( $data ) {
- $data['active']=false;
- if(!isset($data['icon'])) {
- $data['icon']='';
- }
- OC_App::$navigation[] = $data;
+ OC::$server->getNavigationManager()->add($data);
return true;
}
@@ -305,9 +299,7 @@ class OC_App{
* highlighting the current position of the user.
*/
public static function setActiveNavigationEntry( $id ) {
- // load all the apps, to make sure we have all the navigation entries
- self::loadApps();
- self::$activeapp = $id;
+ OC::$server->getNavigationManager()->setActiveEntry($id);
return true;
}
@@ -315,15 +307,14 @@ class OC_App{
* @brief Get the navigation entries for the $app
* @param string $app app
* @return array of the $data added with addNavigationEntry
+ *
+ * Warning: destroys the existing entries
*/
public static function getAppNavigationEntries($app) {
if(is_file(self::getAppPath($app).'/appinfo/app.php')) {
- $save = self::$navigation;
- self::$navigation = array();
+ OC::$server->getNavigationManager()->clear();
require $app.'/appinfo/app.php';
- $app_entries = self::$navigation;
- self::$navigation = $save;
- return $app_entries;
+ return OC::$server->getNavigationManager()->getAll();
}
return array();
}
@@ -336,7 +327,7 @@ class OC_App{
* setActiveNavigationEntry
*/
public static function getActiveNavigationEntry() {
- return self::$activeapp;
+ return OC::$server->getNavigationManager()->getActiveEntry();
}
/**
@@ -419,8 +410,9 @@ class OC_App{
// This is private as well. It simply works, so don't ask for more details
private static function proceedNavigation( $list ) {
+ $activeapp = OC::$server->getNavigationManager()->getActiveEntry();
foreach( $list as &$naventry ) {
- if( $naventry['id'] == self::$activeapp ) {
+ if( $naventry['id'] == $activeapp ) {
$naventry['active'] = true;
}
else{
@@ -572,7 +564,8 @@ class OC_App{
* - active: boolean, signals if the user is on this navigation entry
*/
public static function getNavigation() {
- $navigation = self::proceedNavigation( self::$navigation );
+ $entries = OC::$server->getNavigationManager()->getAll();
+ $navigation = self::proceedNavigation( $entries );
return $navigation;
}
@@ -667,14 +660,16 @@ class OC_App{
}
$dh = opendir( $apps_dir['path'] );
- while (($file = readdir($dh)) !== false) {
+ if(is_resource($dh)) {
+ while (($file = readdir($dh)) !== false) {
- if ($file[0] != '.' and is_file($apps_dir['path'].'/'.$file.'/appinfo/app.php')) {
+ if ($file[0] != '.' and is_file($apps_dir['path'].'/'.$file.'/appinfo/app.php')) {
- $apps[] = $file;
+ $apps[] = $file;
- }
+ }
+ }
}
}
@@ -868,10 +863,10 @@ class OC_App{
/**
- * Compares the app version with the owncloud version to see if the app
+ * Compares the app version with the owncloud version to see if the app
* requires a newer version than the currently active one
* @param array $owncloudVersions array with 3 entries: major minor bugfix
- * @param string $appRequired the required version from the xml
+ * @param string $appRequired the required version from the xml
* major.minor.bugfix
* @return boolean true if compatible, otherwise false
*/
diff --git a/lib/appframework/app.php b/lib/appframework/app.php
new file mode 100644
index 0000000000000000000000000000000000000000..7ff55bb809d1ddcfeef1142547878a8fcf3e1805
--- /dev/null
+++ b/lib/appframework/app.php
@@ -0,0 +1,98 @@
+<?php
+
+/**
+ * ownCloud - App Framework
+ *
+ * @author Bernhard Posselt
+ * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ *
+ * 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/>.
+ *
+ */
+
+
+namespace OC\AppFramework;
+
+use OC\AppFramework\DependencyInjection\DIContainer;
+use OCP\AppFramework\IAppContainer;
+
+
+/**
+ * Entry point for every request in your app. You can consider this as your
+ * public static void main() method
+ *
+ * Handles all the dependency injection, controllers and output flow
+ */
+class App {
+
+
+ /**
+ * Shortcut for calling a controller method and printing the result
+ * @param string $controllerName the name of the controller under which it is
+ * stored in the DI container
+ * @param string $methodName the method that you want to call
+ * @param array $urlParams an array with variables extracted from the routes
+ * @param DIContainer $container an instance of a pimple container.
+ */
+ public static function main($controllerName, $methodName, array $urlParams,
+ IAppContainer $container) {
+ $container['urlParams'] = $urlParams;
+ $controller = $container[$controllerName];
+
+ // initialize the dispatcher and run all the middleware before the controller
+ $dispatcher = $container['Dispatcher'];
+
+ list($httpHeaders, $responseHeaders, $output) =
+ $dispatcher->dispatch($controller, $methodName);
+
+ if(!is_null($httpHeaders)) {
+ header($httpHeaders);
+ }
+
+ foreach($responseHeaders as $name => $value) {
+ header($name . ': ' . $value);
+ }
+
+ if(!is_null($output)) {
+ header('Content-Length: ' . strlen($output));
+ print($output);
+ }
+
+ }
+
+ /**
+ * Shortcut for calling a controller method and printing the result.
+ * Similar to App:main except that no headers will be sent.
+ * This should be used for example when registering sections via
+ * \OC\AppFramework\Core\API::registerAdmin()
+ *
+ * @param string $controllerName the name of the controller under which it is
+ * stored in the DI container
+ * @param string $methodName the method that you want to call
+ * @param array $urlParams an array with variables extracted from the routes
+ * @param DIContainer $container an instance of a pimple container.
+ */
+ public static function part($controllerName, $methodName, array $urlParams,
+ DIContainer $container){
+
+ $container['urlParams'] = $urlParams;
+ $controller = $container[$controllerName];
+
+ $dispatcher = $container['Dispatcher'];
+
+ list(, , $output) = $dispatcher->dispatch($controller, $methodName);
+ return $output;
+ }
+
+}
diff --git a/lib/appframework/controller/controller.php b/lib/appframework/controller/controller.php
new file mode 100644
index 0000000000000000000000000000000000000000..0ea0a38cc090e36906de3a9782edc603a8567481
--- /dev/null
+++ b/lib/appframework/controller/controller.php
@@ -0,0 +1,142 @@
+<?php
+
+/**
+ * ownCloud - App Framework
+ *
+ * @author Bernhard Posselt
+ * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ *
+ * 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/>.
+ *
+ */
+
+
+namespace OC\AppFramework\Controller;
+
+use OC\AppFramework\Http\Request;
+use OC\AppFramework\Core\API;
+use OCP\AppFramework\Http\TemplateResponse;
+
+
+/**
+ * Base class to inherit your controllers from
+ */
+abstract class Controller {
+
+ /**
+ * @var API instance of the api layer
+ */
+ protected $api;
+
+ protected $request;
+
+ /**
+ * @param API $api an api wrapper instance
+ * @param Request $request an instance of the request
+ */
+ public function __construct(API $api, Request $request){
+ $this->api = $api;
+ $this->request = $request;
+ }
+
+
+ /**
+ * Lets you access post and get parameters by the index
+ * @param string $key the key which you want to access in the URL Parameter
+ * placeholder, $_POST or $_GET array.
+ * The priority how they're returned is the following:
+ * 1. URL parameters
+ * 2. POST parameters
+ * 3. GET parameters
+ * @param mixed $default If the key is not found, this value will be returned
+ * @return mixed the content of the array
+ */
+ public function params($key, $default=null){
+ return $this->request->getParam($key, $default);
+ }
+
+
+ /**
+ * Returns all params that were received, be it from the request
+ * (as GET or POST) or throuh the URL by the route
+ * @return array the array with all parameters
+ */
+ public function getParams() {
+ return $this->request->getParams();
+ }
+
+
+ /**
+ * Returns the method of the request
+ * @return string the method of the request (POST, GET, etc)
+ */
+ public function method() {
+ return $this->request->getMethod();
+ }
+
+
+ /**
+ * Shortcut for accessing an uploaded file through the $_FILES array
+ * @param string $key the key that will be taken from the $_FILES array
+ * @return array the file in the $_FILES element
+ */
+ public function getUploadedFile($key) {
+ return $this->request->getUploadedFile($key);
+ }
+
+
+ /**
+ * Shortcut for getting env variables
+ * @param string $key the key that will be taken from the $_ENV array
+ * @return array the value in the $_ENV element
+ */
+ public function env($key) {
+ return $this->request->getEnv($key);
+ }
+
+
+ /**
+ * Shortcut for getting cookie variables
+ * @param string $key the key that will be taken from the $_COOKIE array
+ * @return array the value in the $_COOKIE element
+ */
+ public function cookie($key) {
+ return $this->request->getCookie($key);
+ }
+
+
+ /**
+ * Shortcut for rendering a template
+ * @param string $templateName the name of the template
+ * @param array $params the template parameters in key => value structure
+ * @param string $renderAs user renders a full page, blank only your template
+ * admin an entry in the admin settings
+ * @param array $headers set additional headers in name/value pairs
+ * @return \OCP\AppFramework\Http\TemplateResponse containing the page
+ */
+ public function render($templateName, array $params=array(),
+ $renderAs='user', array $headers=array()){
+ $response = new TemplateResponse($this->api, $templateName);
+ $response->setParams($params);
+ $response->renderAs($renderAs);
+
+ foreach($headers as $name => $value){
+ $response->addHeader($name, $value);
+ }
+
+ return $response;
+ }
+
+
+}
diff --git a/lib/appframework/core/api.php b/lib/appframework/core/api.php
new file mode 100644
index 0000000000000000000000000000000000000000..39522ee3dd5ce2e4ab6add7a8808206ee2faf5d7
--- /dev/null
+++ b/lib/appframework/core/api.php
@@ -0,0 +1,348 @@
+<?php
+
+/**
+ * ownCloud - App Framework
+ *
+ * @author Bernhard Posselt
+ * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ *
+ * 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/>.
+ *
+ */
+
+
+namespace OC\AppFramework\Core;
+use OCP\AppFramework\IApi;
+
+
+/**
+ * This is used to wrap the owncloud static api calls into an object to make the
+ * code better abstractable for use in the dependency injection container
+ *
+ * Should you find yourself in need for more methods, simply inherit from this
+ * class and add your methods
+ */
+class API implements IApi{
+
+ private $appName;
+
+ /**
+ * constructor
+ * @param string $appName the name of your application
+ */
+ public function __construct($appName){
+ $this->appName = $appName;
+ }
+
+
+ /**
+ * Gets the userid of the current user
+ * @return string the user id of the current user
+ */
+ public function getUserId(){
+ return \OCP\User::getUser();
+ }
+
+
+ /**
+ * Adds a new javascript file
+ * @param string $scriptName the name of the javascript in js/ without the suffix
+ * @param string $appName the name of the app, defaults to the current one
+ */
+ public function addScript($scriptName, $appName=null){
+ if($appName === null){
+ $appName = $this->appName;
+ }
+ \OCP\Util::addScript($appName, $scriptName);
+ }
+
+
+ /**
+ * Adds a new css file
+ * @param string $styleName the name of the css file in css/without the suffix
+ * @param string $appName the name of the app, defaults to the current one
+ */
+ public function addStyle($styleName, $appName=null){
+ if($appName === null){
+ $appName = $this->appName;
+ }
+ \OCP\Util::addStyle($appName, $styleName);
+ }
+
+
+ /**
+ * shorthand for addScript for files in the 3rdparty directory
+ * @param string $name the name of the file without the suffix
+ */
+ public function add3rdPartyScript($name){
+ \OCP\Util::addScript($this->appName . '/3rdparty', $name);
+ }
+
+
+ /**
+ * shorthand for addStyle for files in the 3rdparty directory
+ * @param string $name the name of the file without the suffix
+ */
+ public function add3rdPartyStyle($name){
+ \OCP\Util::addStyle($this->appName . '/3rdparty', $name);
+ }
+
+
+ /**
+ * Returns the translation object
+ * @return \OC_L10N the translation object
+ */
+ public function getTrans(){
+ # TODO: use public api
+ return \OC_L10N::get($this->appName);
+ }
+
+
+ /**
+ * Returns the URL for a route
+ * @param string $routeName the name of the route
+ * @param array $arguments an array with arguments which will be filled into the url
+ * @return string the url
+ */
+ public function linkToRoute($routeName, $arguments=array()){
+ return \OCP\Util::linkToRoute($routeName, $arguments);
+ }
+
+
+ /**
+ * Returns an URL for an image or file
+ * @param string $file the name of the file
+ * @param string $appName the name of the app, defaults to the current one
+ */
+ public function linkTo($file, $appName=null){
+ if($appName === null){
+ $appName = $this->appName;
+ }
+ return \OCP\Util::linkTo($appName, $file);
+ }
+
+
+ /**
+ * Returns the link to an image, like link to but only with prepending img/
+ * @param string $file the name of the file
+ * @param string $appName the name of the app, defaults to the current one
+ */
+ public function imagePath($file, $appName=null){
+ if($appName === null){
+ $appName = $this->appName;
+ }
+ return \OCP\Util::imagePath($appName, $file);
+ }
+
+
+ /**
+ * Makes an URL absolute
+ * @param string $url the url
+ * @return string the absolute url
+ */
+ public function getAbsoluteURL($url){
+ # TODO: use public api
+ return \OC_Helper::makeURLAbsolute($url);
+ }
+
+
+ /**
+ * links to a file
+ * @param string $file the name of the file
+ * @param string $appName the name of the app, defaults to the current one
+ * @deprecated replaced with linkToRoute()
+ * @return string the url
+ */
+ public function linkToAbsolute($file, $appName=null){
+ if($appName === null){
+ $appName = $this->appName;
+ }
+ return \OCP\Util::linkToAbsolute($appName, $file);
+ }
+
+
+ /**
+ * Checks if the CSRF check was correct
+ * @return bool true if CSRF check passed
+ */
+ public function passesCSRFCheck(){
+ # TODO: use public api
+ return \OC_Util::isCallRegistered();
+ }
+
+
+ /**
+ * Checks if an app is enabled
+ * @param string $appName the name of an app
+ * @return bool true if app is enabled
+ */
+ public function isAppEnabled($appName){
+ return \OCP\App::isEnabled($appName);
+ }
+
+
+ /**
+ * Writes a function into the error log
+ * @param string $msg the error message to be logged
+ * @param int $level the error level
+ */
+ public function log($msg, $level=null){
+ switch($level){
+ case 'debug':
+ $level = \OCP\Util::DEBUG;
+ break;
+ case 'info':
+ $level = \OCP\Util::INFO;
+ break;
+ case 'warn':
+ $level = \OCP\Util::WARN;
+ break;
+ case 'fatal':
+ $level = \OCP\Util::FATAL;
+ break;
+ default:
+ $level = \OCP\Util::ERROR;
+ break;
+ }
+ \OCP\Util::writeLog($this->appName, $msg, $level);
+ }
+
+
+ /**
+ * turns an owncloud path into a path on the filesystem
+ * @param string path the path to the file on the oc filesystem
+ * @return string the filepath in the filesystem
+ */
+ public function getLocalFilePath($path){
+ # TODO: use public api
+ return \OC_Filesystem::getLocalFile($path);
+ }
+
+
+ /**
+ * used to return and open a new eventsource
+ * @return \OC_EventSource a new open EventSource class
+ */
+ public function openEventSource(){
+ # TODO: use public api
+ return new \OC_EventSource();
+ }
+
+ /**
+ * @brief connects a function to a hook
+ * @param string $signalClass class name of emitter
+ * @param string $signalName name of signal
+ * @param string $slotClass class name of slot
+ * @param string $slotName name of slot, in another word, this is the
+ * name of the method that will be called when registered
+ * signal is emitted.
+ * @return bool, always true
+ */
+ public function connectHook($signalClass, $signalName, $slotClass, $slotName) {
+ return \OCP\Util::connectHook($signalClass, $signalName, $slotClass, $slotName);
+ }
+
+ /**
+ * @brief Emits a signal. To get data from the slot use references!
+ * @param string $signalClass class name of emitter
+ * @param string $signalName name of signal
+ * @param array $params defautl: array() array with additional data
+ * @return bool, true if slots exists or false if not
+ */
+ public function emitHook($signalClass, $signalName, $params = array()) {
+ return \OCP\Util::emitHook($signalClass, $signalName, $params);
+ }
+
+ /**
+ * @brief clear hooks
+ * @param string $signalClass
+ * @param string $signalName
+ */
+ public function clearHook($signalClass=false, $signalName=false) {
+ if ($signalClass) {
+ \OC_Hook::clear($signalClass, $signalName);
+ }
+ }
+
+ /**
+ * Gets the content of an URL by using CURL or a fallback if it is not
+ * installed
+ * @param string $url the url that should be fetched
+ * @return string the content of the webpage
+ */
+ public function getUrlContent($url) {
+ return \OC_Util::getUrlContent($url);
+ }
+
+ /**
+ * Register a backgroundjob task
+ * @param string $className full namespace and class name of the class
+ * @param string $methodName the name of the static method that should be
+ * called
+ */
+ public function addRegularTask($className, $methodName) {
+ \OCP\Backgroundjob::addRegularTask($className, $methodName);
+ }
+
+ /**
+ * Returns a template
+ * @param string $templateName the name of the template
+ * @param string $renderAs how it should be rendered
+ * @param string $appName the name of the app
+ * @return \OCP\Template a new template
+ */
+ public function getTemplate($templateName, $renderAs='user', $appName=null){
+ if($appName === null){
+ $appName = $this->appName;
+ }
+
+ if($renderAs === 'blank'){
+ return new \OCP\Template($appName, $templateName);
+ } else {
+ return new \OCP\Template($appName, $templateName, $renderAs);
+ }
+ }
+
+
+ /**
+ * Tells ownCloud to include a template in the admin overview
+ * @param string $mainPath the path to the main php file without the php
+ * suffix, relative to your apps directory! not the template directory
+ * @param string $appName the name of the app, defaults to the current one
+ */
+ public function registerAdmin($mainPath, $appName=null) {
+ if($appName === null){
+ $appName = $this->appName;
+ }
+
+ \OCP\App::registerAdmin($appName, $mainPath);
+ }
+
+
+ /**
+ * get the filesystem info
+ *
+ * @param string $path
+ * @return array with the following keys:
+ * - size
+ * - mtime
+ * - mimetype
+ * - encrypted
+ * - versioned
+ */
+ public function getFileInfo($path) {
+ return \OC\Files\Filesystem::getFileInfo($path);
+ }
+
+}
diff --git a/lib/appframework/dependencyinjection/dicontainer.php b/lib/appframework/dependencyinjection/dicontainer.php
new file mode 100644
index 0000000000000000000000000000000000000000..3755d45fa092dd1b44f8dfc62f9f3eafee23c536
--- /dev/null
+++ b/lib/appframework/dependencyinjection/dicontainer.php
@@ -0,0 +1,146 @@
+<?php
+
+/**
+ * ownCloud - App Framework
+ *
+ * @author Bernhard Posselt
+ * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ *
+ * 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/>.
+ *
+ */
+
+
+namespace OC\AppFramework\DependencyInjection;
+
+use OC\AppFramework\Http\Http;
+use OC\AppFramework\Http\Request;
+use OC\AppFramework\Http\Dispatcher;
+use OC\AppFramework\Core\API;
+use OC\AppFramework\Middleware\MiddlewareDispatcher;
+use OC\AppFramework\Middleware\Security\SecurityMiddleware;
+use OC\AppFramework\Utility\SimpleContainer;
+use OC\AppFramework\Utility\TimeFactory;
+use OCP\AppFramework\IApi;
+use OCP\AppFramework\IAppContainer;
+use OCP\AppFramework\IMiddleWare;
+use OCP\IServerContainer;
+
+
+class DIContainer extends SimpleContainer implements IAppContainer{
+
+ /**
+ * @var array
+ */
+ private $middleWares = array();
+
+ /**
+ * Put your class dependencies in here
+ * @param string $appName the name of the app
+ */
+ public function __construct($appName){
+
+ $this['AppName'] = $appName;
+
+ $this->registerParameter('ServerContainer', \OC::$server);
+
+ $this['API'] = $this->share(function($c){
+ return new API($c['AppName']);
+ });
+
+ /**
+ * Http
+ */
+ $this['Request'] = $this->share(function($c) {
+ /** @var $c SimpleContainer */
+ /** @var $server IServerContainer */
+ $server = $c->query('ServerContainer');
+ return $server->getRequest();
+ });
+
+ $this['Protocol'] = $this->share(function($c){
+ if(isset($_SERVER['SERVER_PROTOCOL'])) {
+ return new Http($_SERVER, $_SERVER['SERVER_PROTOCOL']);
+ } else {
+ return new Http($_SERVER);
+ }
+ });
+
+ $this['Dispatcher'] = $this->share(function($c) {
+ return new Dispatcher($c['Protocol'], $c['MiddlewareDispatcher']);
+ });
+
+
+ /**
+ * Middleware
+ */
+ $this['SecurityMiddleware'] = $this->share(function($c){
+ return new SecurityMiddleware($c['API'], $c['Request']);
+ });
+
+ $this['MiddlewareDispatcher'] = $this->share(function($c){
+ $dispatcher = new MiddlewareDispatcher();
+ $dispatcher->registerMiddleware($c['SecurityMiddleware']);
+
+ foreach($this->middleWares as $middleWare) {
+ $dispatcher->registerMiddleware($middleWare);
+ }
+
+ return $dispatcher;
+ });
+
+
+ /**
+ * Utilities
+ */
+ $this['TimeFactory'] = $this->share(function($c){
+ return new TimeFactory();
+ });
+
+
+ }
+
+
+ /**
+ * @return IApi
+ */
+ function getCoreApi()
+ {
+ return $this->query('API');
+ }
+
+ /**
+ * @return \OCP\IServerContainer
+ */
+ function getServer()
+ {
+ return $this->query('ServerContainer');
+ }
+
+ /**
+ * @param IMiddleWare $middleWare
+ * @return boolean
+ */
+ function registerMiddleWare(IMiddleWare $middleWare) {
+ array_push($this->middleWares, $middleWare);
+ }
+
+ /**
+ * used to return the appname of the set application
+ * @return string the name of your application
+ */
+ function getAppName() {
+ return $this->query('AppName');
+ }
+}
diff --git a/lib/appframework/http/dispatcher.php b/lib/appframework/http/dispatcher.php
new file mode 100644
index 0000000000000000000000000000000000000000..ea57a6860cc27ea4fa4b3c9c8f8ba0a8a8db7666
--- /dev/null
+++ b/lib/appframework/http/dispatcher.php
@@ -0,0 +1,100 @@
+<?php
+
+/**
+ * ownCloud - App Framework
+ *
+ * @author Bernhard Posselt, Thomas Tanghus, Bart Visscher
+ * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ *
+ * 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/>.
+ *
+ */
+
+
+namespace OC\AppFramework\Http;
+
+use \OC\AppFramework\Controller\Controller;
+use \OC\AppFramework\Middleware\MiddlewareDispatcher;
+
+
+/**
+ * Class to dispatch the request to the middleware dispatcher
+ */
+class Dispatcher {
+
+ private $middlewareDispatcher;
+ private $protocol;
+
+
+ /**
+ * @param Http $protocol the http protocol with contains all status headers
+ * @param MiddlewareDispatcher $middlewareDispatcher the dispatcher which
+ * runs the middleware
+ */
+ public function __construct(Http $protocol,
+ MiddlewareDispatcher $middlewareDispatcher) {
+ $this->protocol = $protocol;
+ $this->middlewareDispatcher = $middlewareDispatcher;
+ }
+
+
+ /**
+ * Handles a request and calls the dispatcher on the controller
+ * @param Controller $controller the controller which will be called
+ * @param string $methodName the method name which will be called on
+ * the controller
+ * @return array $array[0] contains a string with the http main header,
+ * $array[1] contains headers in the form: $key => value, $array[2] contains
+ * the response output
+ */
+ public function dispatch(Controller $controller, $methodName) {
+ $out = array(null, array(), null);
+
+ try {
+
+ $this->middlewareDispatcher->beforeController($controller,
+ $methodName);
+ $response = $controller->$methodName();
+
+ // if an exception appears, the middleware checks if it can handle the
+ // exception and creates a response. If no response is created, it is
+ // assumed that theres no middleware who can handle it and the error is
+ // thrown again
+ } catch(\Exception $exception){
+ $response = $this->middlewareDispatcher->afterException(
+ $controller, $methodName, $exception);
+ if (is_null($response)) {
+ throw $exception;
+ }
+ }
+
+ $response = $this->middlewareDispatcher->afterController(
+ $controller, $methodName, $response);
+
+ // get the output which should be printed and run the after output
+ // middleware to modify the response
+ $output = $response->render();
+ $out[2] = $this->middlewareDispatcher->beforeOutput(
+ $controller, $methodName, $output);
+
+ // depending on the cache object the headers need to be changed
+ $out[0] = $this->protocol->getStatusHeader($response->getStatus(),
+ $response->getLastModified(), $response->getETag());
+ $out[1] = $response->getHeaders();
+
+ return $out;
+ }
+
+
+}
diff --git a/lib/appframework/http/downloadresponse.php b/lib/appframework/http/downloadresponse.php
new file mode 100644
index 0000000000000000000000000000000000000000..67b9542dba6956dc9ef919b809edf5195917a6e7
--- /dev/null
+++ b/lib/appframework/http/downloadresponse.php
@@ -0,0 +1,50 @@
+<?php
+
+/**
+ * ownCloud - App Framework
+ *
+ * @author Bernhard Posselt
+ * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ *
+ * 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/>.
+ *
+ */
+
+
+namespace OC\AppFramework\Http;
+
+
+/**
+ * Prompts the user to download the a file
+ */
+class DownloadResponse extends \OCP\AppFramework\Http\Response {
+
+ private $filename;
+ private $contentType;
+
+ /**
+ * Creates a response that prompts the user to download the file
+ * @param string $filename the name that the downloaded file should have
+ * @param string $contentType the mimetype that the downloaded file should have
+ */
+ public function __construct($filename, $contentType) {
+ $this->filename = $filename;
+ $this->contentType = $contentType;
+
+ $this->addHeader('Content-Disposition', 'attachment; filename="' . $filename . '"');
+ $this->addHeader('Content-Type', $contentType);
+ }
+
+
+}
diff --git a/lib/appframework/http/http.php b/lib/appframework/http/http.php
new file mode 100644
index 0000000000000000000000000000000000000000..e00dc9cdc4a2514a34e13e958cd904fd8e858952
--- /dev/null
+++ b/lib/appframework/http/http.php
@@ -0,0 +1,148 @@
+<?php
+
+/**
+ * ownCloud - App Framework
+ *
+ * @author Bernhard Posselt, Thomas Tanghus, Bart Visscher
+ * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ *
+ * 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/>.
+ *
+ */
+
+
+namespace OC\AppFramework\Http;
+
+
+class Http extends \OCP\AppFramework\Http\Http{
+
+ private $server;
+ private $protocolVersion;
+ protected $headers;
+
+ /**
+ * @param $_SERVER $server
+ * @param string $protocolVersion the http version to use defaults to HTTP/1.1
+ */
+ public function __construct($server, $protocolVersion='HTTP/1.1') {
+ $this->server = $server;
+ $this->protocolVersion = $protocolVersion;
+
+ $this->headers = array(
+ self::STATUS_CONTINUE => 'Continue',
+ self::STATUS_SWITCHING_PROTOCOLS => 'Switching Protocols',
+ self::STATUS_PROCESSING => 'Processing',
+ self::STATUS_OK => 'OK',
+ self::STATUS_CREATED => 'Created',
+ self::STATUS_ACCEPTED => 'Accepted',
+ self::STATUS_NON_AUTHORATIVE_INFORMATION => 'Non-Authorative Information',
+ self::STATUS_NO_CONTENT => 'No Content',
+ self::STATUS_RESET_CONTENT => 'Reset Content',
+ self::STATUS_PARTIAL_CONTENT => 'Partial Content',
+ self::STATUS_MULTI_STATUS => 'Multi-Status', // RFC 4918
+ self::STATUS_ALREADY_REPORTED => 'Already Reported', // RFC 5842
+ self::STATUS_IM_USED => 'IM Used', // RFC 3229
+ self::STATUS_MULTIPLE_CHOICES => 'Multiple Choices',
+ self::STATUS_MOVED_PERMANENTLY => 'Moved Permanently',
+ self::STATUS_FOUND => 'Found',
+ self::STATUS_SEE_OTHER => 'See Other',
+ self::STATUS_NOT_MODIFIED => 'Not Modified',
+ self::STATUS_USE_PROXY => 'Use Proxy',
+ self::STATUS_RESERVED => 'Reserved',
+ self::STATUS_TEMPORARY_REDIRECT => 'Temporary Redirect',
+ self::STATUS_BAD_REQUEST => 'Bad request',
+ self::STATUS_UNAUTHORIZED => 'Unauthorized',
+ self::STATUS_PAYMENT_REQUIRED => 'Payment Required',
+ self::STATUS_FORBIDDEN => 'Forbidden',
+ self::STATUS_NOT_FOUND => 'Not Found',
+ self::STATUS_METHOD_NOT_ALLOWED => 'Method Not Allowed',
+ self::STATUS_NOT_ACCEPTABLE => 'Not Acceptable',
+ self::STATUS_PROXY_AUTHENTICATION_REQUIRED => 'Proxy Authentication Required',
+ self::STATUS_REQUEST_TIMEOUT => 'Request Timeout',
+ self::STATUS_CONFLICT => 'Conflict',
+ self::STATUS_GONE => 'Gone',
+ self::STATUS_LENGTH_REQUIRED => 'Length Required',
+ self::STATUS_PRECONDITION_FAILED => 'Precondition failed',
+ self::STATUS_REQUEST_ENTITY_TOO_LARGE => 'Request Entity Too Large',
+ self::STATUS_REQUEST_URI_TOO_LONG => 'Request-URI Too Long',
+ self::STATUS_UNSUPPORTED_MEDIA_TYPE => 'Unsupported Media Type',
+ self::STATUS_REQUEST_RANGE_NOT_SATISFIABLE => 'Requested Range Not Satisfiable',
+ self::STATUS_EXPECTATION_FAILED => 'Expectation Failed',
+ self::STATUS_IM_A_TEAPOT => 'I\'m a teapot', // RFC 2324
+ self::STATUS_UNPROCESSABLE_ENTITY => 'Unprocessable Entity', // RFC 4918
+ self::STATUS_LOCKED => 'Locked', // RFC 4918
+ self::STATUS_FAILED_DEPENDENCY => 'Failed Dependency', // RFC 4918
+ self::STATUS_UPGRADE_REQUIRED => 'Upgrade required',
+ self::STATUS_PRECONDITION_REQUIRED => 'Precondition required', // draft-nottingham-http-new-status
+ self::STATUS_TOO_MANY_REQUESTS => 'Too Many Requests', // draft-nottingham-http-new-status
+ self::STATUS_REQUEST_HEADER_FIELDS_TOO_LARGE => 'Request Header Fields Too Large', // draft-nottingham-http-new-status
+ self::STATUS_INTERNAL_SERVER_ERROR => 'Internal Server Error',
+ self::STATUS_NOT_IMPLEMENTED => 'Not Implemented',
+ self::STATUS_BAD_GATEWAY => 'Bad Gateway',
+ self::STATUS_SERVICE_UNAVAILABLE => 'Service Unavailable',
+ self::STATUS_GATEWAY_TIMEOUT => 'Gateway Timeout',
+ self::STATUS_HTTP_VERSION_NOT_SUPPORTED => 'HTTP Version not supported',
+ self::STATUS_VARIANT_ALSO_NEGOTIATES => 'Variant Also Negotiates',
+ self::STATUS_INSUFFICIENT_STORAGE => 'Insufficient Storage', // RFC 4918
+ self::STATUS_LOOP_DETECTED => 'Loop Detected', // RFC 5842
+ self::STATUS_BANDWIDTH_LIMIT_EXCEEDED => 'Bandwidth Limit Exceeded', // non-standard
+ self::STATUS_NOT_EXTENDED => 'Not extended',
+ self::STATUS_NETWORK_AUTHENTICATION_REQUIRED => 'Network Authentication Required', // draft-nottingham-http-new-status
+ );
+ }
+
+
+ /**
+ * Gets the correct header
+ * @param Http::CONSTANT $status the constant from the Http class
+ * @param \DateTime $lastModified formatted last modified date
+ * @param string $Etag the etag
+ */
+ public function getStatusHeader($status, \DateTime $lastModified=null,
+ $ETag=null) {
+
+ if(!is_null($lastModified)) {
+ $lastModified = $lastModified->format(\DateTime::RFC2822);
+ }
+
+ // if etag or lastmodified have not changed, return a not modified
+ if ((isset($this->server['HTTP_IF_NONE_MATCH'])
+ && trim($this->server['HTTP_IF_NONE_MATCH']) === $ETag)
+
+ ||
+
+ (isset($this->server['HTTP_IF_MODIFIED_SINCE'])
+ && trim($this->server['HTTP_IF_MODIFIED_SINCE']) ===
+ $lastModified)) {
+
+ $status = self::STATUS_NOT_MODIFIED;
+ }
+
+ // we have one change currently for the http 1.0 header that differs
+ // from 1.1: STATUS_TEMPORARY_REDIRECT should be STATUS_FOUND
+ // if this differs any more, we want to create childclasses for this
+ if($status === self::STATUS_TEMPORARY_REDIRECT
+ && $this->protocolVersion === 'HTTP/1.0') {
+
+ $status = self::STATUS_FOUND;
+ }
+
+ return $this->protocolVersion . ' ' . $status . ' ' .
+ $this->headers[$status];
+ }
+
+
+}
+
+
diff --git a/lib/appframework/http/redirectresponse.php b/lib/appframework/http/redirectresponse.php
new file mode 100644
index 0000000000000000000000000000000000000000..688447f16180c2943a704cad0c95009d1d627841
--- /dev/null
+++ b/lib/appframework/http/redirectresponse.php
@@ -0,0 +1,56 @@
+<?php
+
+/**
+ * ownCloud - App Framework
+ *
+ * @author Bernhard Posselt
+ * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ *
+ * 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/>.
+ *
+ */
+
+
+namespace OC\AppFramework\Http;
+
+use OCP\AppFramework\Http\Response;
+
+
+/**
+ * Redirects to a different URL
+ */
+class RedirectResponse extends Response {
+
+ private $redirectURL;
+
+ /**
+ * Creates a response that redirects to a url
+ * @param string $redirectURL the url to redirect to
+ */
+ public function __construct($redirectURL) {
+ $this->redirectURL = $redirectURL;
+ $this->setStatus(Http::STATUS_TEMPORARY_REDIRECT);
+ $this->addHeader('Location', $redirectURL);
+ }
+
+
+ /**
+ * @return string the url to redirect
+ */
+ public function getRedirectURL() {
+ return $this->redirectURL;
+ }
+
+
+}
diff --git a/lib/appframework/http/request.php b/lib/appframework/http/request.php
new file mode 100644
index 0000000000000000000000000000000000000000..34605acdfead8b7073f19702fd6965799e1b776c
--- /dev/null
+++ b/lib/appframework/http/request.php
@@ -0,0 +1,307 @@
+<?php
+/**
+ * ownCloud - Request
+ *
+ * @author Thomas Tanghus
+ * @copyright 2013 Thomas Tanghus (thomas@tanghus.net)
+ *
+ * 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/>.
+ *
+ */
+
+namespace OC\AppFramework\Http;
+
+use OCP\IRequest;
+
+/**
+ * Class for accessing variables in the request.
+ * This class provides an immutable object with request variables.
+ */
+
+class Request implements \ArrayAccess, \Countable, IRequest {
+
+ protected $items = array();
+ protected $allowedKeys = array(
+ 'get',
+ 'post',
+ 'files',
+ 'server',
+ 'env',
+ 'cookies',
+ 'urlParams',
+ 'params',
+ 'parameters',
+ 'method'
+ );
+
+ /**
+ * @param array $vars An associative array with the following optional values:
+ * @param array 'params' the parsed json array
+ * @param array 'urlParams' the parameters which were matched from the URL
+ * @param array 'get' the $_GET array
+ * @param array 'post' the $_POST array
+ * @param array 'files' the $_FILES array
+ * @param array 'server' the $_SERVER array
+ * @param array 'env' the $_ENV array
+ * @param array 'session' the $_SESSION array
+ * @param array 'cookies' the $_COOKIE array
+ * @param string 'method' the request method (GET, POST etc)
+ * @see http://www.php.net/manual/en/reserved.variables.php
+ */
+ public function __construct(array $vars=array()) {
+
+ foreach($this->allowedKeys as $name) {
+ $this->items[$name] = isset($vars[$name])
+ ? $vars[$name]
+ : array();
+ }
+
+ $this->items['parameters'] = array_merge(
+ $this->items['params'],
+ $this->items['get'],
+ $this->items['post'],
+ $this->items['urlParams']
+ );
+
+ }
+
+ // Countable method.
+ public function count() {
+ return count(array_keys($this->items['parameters']));
+ }
+
+ /**
+ * ArrayAccess methods
+ *
+ * Gives access to the combined GET, POST and urlParams arrays
+ *
+ * Examples:
+ *
+ * $var = $request['myvar'];
+ *
+ * or
+ *
+ * if(!isset($request['myvar']) {
+ * // Do something
+ * }
+ *
+ * $request['myvar'] = 'something'; // This throws an exception.
+ *
+ * @param string $offset The key to lookup
+ * @return string|null
+ */
+ public function offsetExists($offset) {
+ return isset($this->items['parameters'][$offset]);
+ }
+
+ /**
+ * @see offsetExists
+ */
+ public function offsetGet($offset) {
+ return isset($this->items['parameters'][$offset])
+ ? $this->items['parameters'][$offset]
+ : null;
+ }
+
+ /**
+ * @see offsetExists
+ */
+ public function offsetSet($offset, $value) {
+ throw new \RuntimeException('You cannot change the contents of the request object');
+ }
+
+ /**
+ * @see offsetExists
+ */
+ public function offsetUnset($offset) {
+ throw new \RuntimeException('You cannot change the contents of the request object');
+ }
+
+ // Magic property accessors
+ public function __set($name, $value) {
+ throw new \RuntimeException('You cannot change the contents of the request object');
+ }
+
+ /**
+ * Access request variables by method and name.
+ * Examples:
+ *
+ * $request->post['myvar']; // Only look for POST variables
+ * $request->myvar; or $request->{'myvar'}; or $request->{$myvar}
+ * Looks in the combined GET, POST and urlParams array.
+ *
+ * if($request->method !== 'POST') {
+ * throw new Exception('This function can only be invoked using POST');
+ * }
+ *
+ * @param string $name The key to look for.
+ * @return mixed|null
+ */
+ public function __get($name) {
+ switch($name) {
+ case 'get':
+ case 'post':
+ case 'files':
+ case 'server':
+ case 'env':
+ case 'cookies':
+ case 'parameters':
+ case 'params':
+ case 'urlParams':
+ return isset($this->items[$name])
+ ? $this->items[$name]
+ : null;
+ break;
+ case 'method':
+ return $this->items['method'];
+ break;
+ default;
+ return isset($this[$name])
+ ? $this[$name]
+ : null;
+ break;
+ }
+ }
+
+
+ public function __isset($name) {
+ return isset($this->items['parameters'][$name]);
+ }
+
+
+ public function __unset($id) {
+ throw new \RunTimeException('You cannot change the contents of the request object');
+ }
+
+ /**
+ * Returns the value for a specific http header.
+ *
+ * This method returns null if the header did not exist.
+ *
+ * @param string $name
+ * @return string
+ */
+ public function getHeader($name) {
+
+ $name = strtoupper(str_replace(array('-'),array('_'),$name));
+ if (isset($this->server['HTTP_' . $name])) {
+ return $this->server['HTTP_' . $name];
+ }
+
+ // There's a few headers that seem to end up in the top-level
+ // server array.
+ switch($name) {
+ case 'CONTENT_TYPE' :
+ case 'CONTENT_LENGTH' :
+ if (isset($this->server[$name])) {
+ return $this->server[$name];
+ }
+ break;
+
+ }
+
+ return null;
+ }
+
+ /**
+ * Lets you access post and get parameters by the index
+ * In case of json requests the encoded json body is accessed
+ *
+ * @param string $key the key which you want to access in the URL Parameter
+ * placeholder, $_POST or $_GET array.
+ * The priority how they're returned is the following:
+ * 1. URL parameters
+ * 2. POST parameters
+ * 3. GET parameters
+ * @param mixed $default If the key is not found, this value will be returned
+ * @return mixed the content of the array
+ */
+ public function getParam($key, $default = null) {
+ return isset($this->parameters[$key])
+ ? $this->parameters[$key]
+ : $default;
+ }
+
+ /**
+ * Returns all params that were received, be it from the request
+ * (as GET or POST) or throuh the URL by the route
+ * @return array the array with all parameters
+ */
+ public function getParams() {
+ return $this->parameters;
+ }
+
+ /**
+ * Returns the method of the request
+ * @return string the method of the request (POST, GET, etc)
+ */
+ public function getMethod() {
+ return $this->method;
+ }
+
+ /**
+ * Shortcut for accessing an uploaded file through the $_FILES array
+ * @param string $key the key that will be taken from the $_FILES array
+ * @return array the file in the $_FILES element
+ */
+ public function getUploadedFile($key) {
+ return isset($this->files[$key]) ? $this->files[$key] : null;
+ }
+
+ /**
+ * Shortcut for getting env variables
+ * @param string $key the key that will be taken from the $_ENV array
+ * @return array the value in the $_ENV element
+ */
+ public function getEnv($key) {
+ return isset($this->env[$key]) ? $this->env[$key] : null;
+ }
+
+ /**
+ * Shortcut for getting cookie variables
+ * @param string $key the key that will be taken from the $_COOKIE array
+ * @return array the value in the $_COOKIE element
+ */
+ function getCookie($key) {
+ return isset($this->cookies[$key]) ? $this->cookies[$key] : null;
+ }
+
+ /**
+ * Returns the request body content.
+ *
+ * @param Boolean $asResource If true, a resource will be returned
+ *
+ * @return string|resource The request body content or a resource to read the body stream.
+ *
+ * @throws \LogicException
+ */
+ function getContent($asResource = false) {
+ return null;
+// if (false === $this->content || (true === $asResource && null !== $this->content)) {
+// throw new \LogicException('getContent() can only be called once when using the resource return type.');
+// }
+//
+// if (true === $asResource) {
+// $this->content = false;
+//
+// return fopen('php://input', 'rb');
+// }
+//
+// if (null === $this->content) {
+// $this->content = file_get_contents('php://input');
+// }
+//
+// return $this->content;
+ }
+}
diff --git a/lib/appframework/middleware/middleware.php b/lib/appframework/middleware/middleware.php
new file mode 100644
index 0000000000000000000000000000000000000000..b12c03c3eb8da3627077f148679bc5d8aa8dd09e
--- /dev/null
+++ b/lib/appframework/middleware/middleware.php
@@ -0,0 +1,100 @@
+<?php
+
+/**
+ * ownCloud - App Framework
+ *
+ * @author Bernhard Posselt
+ * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ *
+ * 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/>.
+ *
+ */
+
+
+namespace OC\AppFramework\Middleware;
+
+use OCP\AppFramework\Http\Response;
+
+
+/**
+ * Middleware is used to provide hooks before or after controller methods and
+ * deal with possible exceptions raised in the controller methods.
+ * They're modeled after Django's middleware system:
+ * https://docs.djangoproject.com/en/dev/topics/http/middleware/
+ */
+abstract class Middleware {
+
+
+ /**
+ * This is being run in normal order before the controller is being
+ * called which allows several modifications and checks
+ *
+ * @param Controller $controller the controller that is being called
+ * @param string $methodName the name of the method that will be called on
+ * the controller
+ */
+ public function beforeController($controller, $methodName){
+
+ }
+
+
+ /**
+ * This is being run when either the beforeController method or the
+ * controller method itself is throwing an exception. The middleware is
+ * asked in reverse order to handle the exception and to return a response.
+ * If the response is null, it is assumed that the exception could not be
+ * handled and the error will be thrown again
+ *
+ * @param Controller $controller the controller that is being called
+ * @param string $methodName the name of the method that will be called on
+ * the controller
+ * @param \Exception $exception the thrown exception
+ * @throws \Exception the passed in exception if it cant handle it
+ * @return Response a Response object in case that the exception was handled
+ */
+ public function afterException($controller, $methodName, \Exception $exception){
+ throw $exception;
+ }
+
+
+ /**
+ * This is being run after a successful controllermethod call and allows
+ * the manipulation of a Response object. The middleware is run in reverse order
+ *
+ * @param Controller $controller the controller that is being called
+ * @param string $methodName the name of the method that will be called on
+ * the controller
+ * @param Response $response the generated response from the controller
+ * @return Response a Response object
+ */
+ public function afterController($controller, $methodName, Response $response){
+ return $response;
+ }
+
+
+ /**
+ * This is being run after the response object has been rendered and
+ * allows the manipulation of the output. The middleware is run in reverse order
+ *
+ * @param Controller $controller the controller that is being called
+ * @param string $methodName the name of the method that will be called on
+ * the controller
+ * @param string $output the generated output from a response
+ * @return string the output that should be printed
+ */
+ public function beforeOutput($controller, $methodName, $output){
+ return $output;
+ }
+
+}
diff --git a/lib/appframework/middleware/middlewaredispatcher.php b/lib/appframework/middleware/middlewaredispatcher.php
new file mode 100644
index 0000000000000000000000000000000000000000..70ab108e6b884d8404504a2db5bc246c3c2aa578
--- /dev/null
+++ b/lib/appframework/middleware/middlewaredispatcher.php
@@ -0,0 +1,159 @@
+<?php
+
+/**
+ * ownCloud - App Framework
+ *
+ * @author Bernhard Posselt
+ * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ *
+ * 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/>.
+ *
+ */
+
+
+namespace OC\AppFramework\Middleware;
+
+use OC\AppFramework\Controller\Controller;
+use OCP\AppFramework\Http\Response;
+
+
+/**
+ * This class is used to store and run all the middleware in correct order
+ */
+class MiddlewareDispatcher {
+
+ /**
+ * @var array array containing all the middlewares
+ */
+ private $middlewares;
+
+ /**
+ * @var int counter which tells us what middlware was executed once an
+ * exception occurs
+ */
+ private $middlewareCounter;
+
+
+ /**
+ * Constructor
+ */
+ public function __construct(){
+ $this->middlewares = array();
+ $this->middlewareCounter = 0;
+ }
+
+
+ /**
+ * Adds a new middleware
+ * @param Middleware $middleware the middleware which will be added
+ */
+ public function registerMiddleware(Middleware $middleWare){
+ array_push($this->middlewares, $middleWare);
+ }
+
+
+ /**
+ * returns an array with all middleware elements
+ * @return array the middlewares
+ */
+ public function getMiddlewares(){
+ return $this->middlewares;
+ }
+
+
+ /**
+ * This is being run in normal order before the controller is being
+ * called which allows several modifications and checks
+ *
+ * @param Controller $controller the controller that is being called
+ * @param string $methodName the name of the method that will be called on
+ * the controller
+ */
+ public function beforeController(Controller $controller, $methodName){
+ // we need to count so that we know which middlewares we have to ask in
+ // case theres an exception
+ for($i=0; $i<count($this->middlewares); $i++){
+ $this->middlewareCounter++;
+ $middleware = $this->middlewares[$i];
+ $middleware->beforeController($controller, $methodName);
+ }
+ }
+
+
+ /**
+ * This is being run when either the beforeController method or the
+ * controller method itself is throwing an exception. The middleware is asked
+ * in reverse order to handle the exception and to return a response.
+ * If the response is null, it is assumed that the exception could not be
+ * handled and the error will be thrown again
+ *
+ * @param Controller $controller the controller that is being called
+ * @param string $methodName the name of the method that will be called on
+ * the controller
+ * @param \Exception $exception the thrown exception
+ * @return Response a Response object if the middleware can handle the
+ * exception
+ * @throws \Exception the passed in exception if it cant handle it
+ */
+ public function afterException(Controller $controller, $methodName, \Exception $exception){
+ for($i=$this->middlewareCounter-1; $i>=0; $i--){
+ $middleware = $this->middlewares[$i];
+ try {
+ return $middleware->afterException($controller, $methodName, $exception);
+ } catch(\Exception $exception){
+ continue;
+ }
+ }
+ throw $exception;
+ }
+
+
+ /**
+ * This is being run after a successful controllermethod call and allows
+ * the manipulation of a Response object. The middleware is run in reverse order
+ *
+ * @param Controller $controller the controller that is being called
+ * @param string $methodName the name of the method that will be called on
+ * the controller
+ * @param Response $response the generated response from the controller
+ * @return Response a Response object
+ */
+ public function afterController(Controller $controller, $methodName, Response $response){
+ for($i=count($this->middlewares)-1; $i>=0; $i--){
+ $middleware = $this->middlewares[$i];
+ $response = $middleware->afterController($controller, $methodName, $response);
+ }
+ return $response;
+ }
+
+
+ /**
+ * This is being run after the response object has been rendered and
+ * allows the manipulation of the output. The middleware is run in reverse order
+ *
+ * @param Controller $controller the controller that is being called
+ * @param string $methodName the name of the method that will be called on
+ * the controller
+ * @param string $output the generated output from a response
+ * @return string the output that should be printed
+ */
+ public function beforeOutput(Controller $controller, $methodName, $output){
+ for($i=count($this->middlewares)-1; $i>=0; $i--){
+ $middleware = $this->middlewares[$i];
+ $output = $middleware->beforeOutput($controller, $methodName, $output);
+ }
+ return $output;
+ }
+
+}
diff --git a/lib/appframework/middleware/security/securityexception.php b/lib/appframework/middleware/security/securityexception.php
new file mode 100644
index 0000000000000000000000000000000000000000..b32a2769ff5c3975e2ee5545fccceaad8d61215b
--- /dev/null
+++ b/lib/appframework/middleware/security/securityexception.php
@@ -0,0 +1,41 @@
+<?php
+
+/**
+ * ownCloud - App Framework
+ *
+ * @author Bernhard Posselt
+ * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ *
+ * 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/>.
+ *
+ */
+
+
+namespace OC\AppFramework\Middleware\Security;
+
+
+/**
+ * Thrown when the security middleware encounters a security problem
+ */
+class SecurityException extends \Exception {
+
+ /**
+ * @param string $msg the security error message
+ * @param bool $ajax true if it resulted because of an ajax request
+ */
+ public function __construct($msg, $code = 0) {
+ parent::__construct($msg, $code);
+ }
+
+}
diff --git a/lib/appframework/middleware/security/securitymiddleware.php b/lib/appframework/middleware/security/securitymiddleware.php
new file mode 100644
index 0000000000000000000000000000000000000000..4f1447e1afba11ffea26f40792be80c392b053b3
--- /dev/null
+++ b/lib/appframework/middleware/security/securitymiddleware.php
@@ -0,0 +1,136 @@
+<?php
+
+/**
+ * ownCloud - App Framework
+ *
+ * @author Bernhard Posselt
+ * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ *
+ * 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/>.
+ *
+ */
+
+
+namespace OC\AppFramework\Middleware\Security;
+
+use OC\AppFramework\Controller\Controller;
+use OC\AppFramework\Http\Http;
+use OC\AppFramework\Http\Request;
+use OC\AppFramework\Http\RedirectResponse;
+use OC\AppFramework\Utility\MethodAnnotationReader;
+use OC\AppFramework\Middleware\Middleware;
+use OC\AppFramework\Core\API;
+use OCP\AppFramework\Http\Response;
+use OCP\AppFramework\Http\JSONResponse;
+
+
+/**
+ * Used to do all the authentication and checking stuff for a controller method
+ * It reads out the annotations of a controller method and checks which if
+ * security things should be checked and also handles errors in case a security
+ * check fails
+ */
+class SecurityMiddleware extends Middleware {
+
+ private $api;
+
+ /**
+ * @var \OC\AppFramework\Http\Request
+ */
+ private $request;
+
+ /**
+ * @param API $api an instance of the api
+ */
+ public function __construct(API $api, Request $request){
+ $this->api = $api;
+ $this->request = $request;
+ }
+
+
+ /**
+ * This runs all the security checks before a method call. The
+ * security checks are determined by inspecting the controller method
+ * annotations
+ * @param string/Controller $controller the controllername or string
+ * @param string $methodName the name of the method
+ * @throws SecurityException when a security check fails
+ */
+ public function beforeController($controller, $methodName){
+
+ // get annotations from comments
+ $annotationReader = new MethodAnnotationReader($controller, $methodName);
+
+ // this will set the current navigation entry of the app, use this only
+ // for normal HTML requests and not for AJAX requests
+ $this->api->activateNavigationEntry();
+
+ // security checks
+ $isPublicPage = $annotationReader->hasAnnotation('PublicPage');
+ if(!$isPublicPage) {
+ if(!$this->api->isLoggedIn()) {
+ throw new SecurityException('Current user is not logged in', Http::STATUS_UNAUTHORIZED);
+ }
+
+ if(!$annotationReader->hasAnnotation('NoAdminRequired')) {
+ if(!$this->api->isAdminUser($this->api->getUserId())) {
+ throw new SecurityException('Logged in user must be an admin', Http::STATUS_FORBIDDEN);
+ }
+ }
+ }
+
+ if(!$annotationReader->hasAnnotation('NoCSRFRequired')) {
+ if(!$this->api->passesCSRFCheck()) {
+ throw new SecurityException('CSRF check failed', Http::STATUS_PRECONDITION_FAILED);
+ }
+ }
+
+ }
+
+
+ /**
+ * If an SecurityException is being caught, ajax requests return a JSON error
+ * response and non ajax requests redirect to the index
+ * @param Controller $controller the controller that is being called
+ * @param string $methodName the name of the method that will be called on
+ * the controller
+ * @param \Exception $exception the thrown exception
+ * @throws \Exception the passed in exception if it cant handle it
+ * @return Response a Response object or null in case that the exception could not be handled
+ */
+ public function afterException($controller, $methodName, \Exception $exception){
+ if($exception instanceof SecurityException){
+
+ if (stripos($this->request->getHeader('Accept'),'html')===false) {
+
+ $response = new JSONResponse(
+ array('message' => $exception->getMessage()),
+ $exception->getCode()
+ );
+ $this->api->log($exception->getMessage(), 'debug');
+ } else {
+
+ $url = $this->api->linkToAbsolute('index.php', ''); // TODO: replace with link to route
+ $response = new RedirectResponse($url);
+ $this->api->log($exception->getMessage(), 'debug');
+ }
+
+ return $response;
+
+ }
+
+ throw $exception;
+ }
+
+}
diff --git a/lib/appframework/routing/routeactionhandler.php b/lib/appframework/routing/routeactionhandler.php
new file mode 100644
index 0000000000000000000000000000000000000000..7fb56f14eab7db7395b0bd4dcd70ed1812f32a44
--- /dev/null
+++ b/lib/appframework/routing/routeactionhandler.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * ownCloud - App Framework
+ *
+ * @author Thomas Müller
+ * @copyright 2013 Thomas Müller thomas.mueller@tmit.eu
+ *
+ * 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/>.
+ *
+ */
+
+namespace OC\AppFramework\routing;
+
+use \OC\AppFramework\App;
+use \OC\AppFramework\DependencyInjection\DIContainer;
+
+class RouteActionHandler {
+ private $controllerName;
+ private $actionName;
+ private $container;
+
+ public function __construct(DIContainer $container, $controllerName, $actionName) {
+ $this->controllerName = $controllerName;
+ $this->actionName = $actionName;
+ $this->container = $container;
+ }
+
+ public function __invoke($params) {
+ App::main($this->controllerName, $this->actionName, $params, $this->container);
+ }
+}
diff --git a/lib/appframework/routing/routeconfig.php b/lib/appframework/routing/routeconfig.php
new file mode 100644
index 0000000000000000000000000000000000000000..53ab11bf2f599770d0d8f2bce8a0a97400fb4d24
--- /dev/null
+++ b/lib/appframework/routing/routeconfig.php
@@ -0,0 +1,186 @@
+<?php
+/**
+ * ownCloud - App Framework
+ *
+ * @author Thomas Müller
+ * @copyright 2013 Thomas Müller thomas.mueller@tmit.eu
+ *
+ * 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/>.
+ *
+ */
+
+namespace OC\AppFramework\routing;
+
+use OC\AppFramework\DependencyInjection\DIContainer;
+
+/**
+ * Class RouteConfig
+ * @package OC\AppFramework\routing
+ */
+class RouteConfig {
+ private $container;
+ private $router;
+ private $routes;
+ private $appName;
+
+ /**
+ * @param \OC\AppFramework\DependencyInjection\DIContainer $container
+ * @param \OC_Router $router
+ * @param string $pathToYml
+ * @internal param $appName
+ */
+ public function __construct(DIContainer $container, \OC_Router $router, $routes) {
+ $this->routes = $routes;
+ $this->container = $container;
+ $this->router = $router;
+ $this->appName = $container['AppName'];
+ }
+
+ /**
+ * The routes and resource will be registered to the \OC_Router
+ */
+ public function register() {
+
+ // parse simple
+ $this->processSimpleRoutes($this->routes);
+
+ // parse resources
+ $this->processResources($this->routes);
+ }
+
+ /**
+ * Creates one route base on the give configuration
+ * @param $routes
+ * @throws \UnexpectedValueException
+ */
+ private function processSimpleRoutes($routes)
+ {
+ $simpleRoutes = isset($routes['routes']) ? $routes['routes'] : array();
+ foreach ($simpleRoutes as $simpleRoute) {
+ $name = $simpleRoute['name'];
+ $url = $simpleRoute['url'];
+ $verb = isset($simpleRoute['verb']) ? strtoupper($simpleRoute['verb']) : 'GET';
+
+ $split = explode('#', $name, 2);
+ if (count($split) != 2) {
+ throw new \UnexpectedValueException('Invalid route name');
+ }
+ $controller = $split[0];
+ $action = $split[1];
+
+ $controllerName = $this->buildControllerName($controller);
+ $actionName = $this->buildActionName($action);
+
+ // register the route
+ $handler = new RouteActionHandler($this->container, $controllerName, $actionName);
+ $this->router->create($this->appName.'.'.$controller.'.'.$action, $url)->method($verb)->action($handler);
+ }
+ }
+
+ /**
+ * For a given name and url restful routes are created:
+ * - index
+ * - show
+ * - new
+ * - create
+ * - update
+ * - destroy
+ *
+ * @param $routes
+ */
+ private function processResources($routes)
+ {
+ // declaration of all restful actions
+ $actions = array(
+ array('name' => 'index', 'verb' => 'GET', 'on-collection' => true),
+ array('name' => 'show', 'verb' => 'GET'),
+ array('name' => 'create', 'verb' => 'POST', 'on-collection' => true),
+ array('name' => 'update', 'verb' => 'PUT'),
+ array('name' => 'destroy', 'verb' => 'DELETE'),
+ );
+
+ $resources = isset($routes['resources']) ? $routes['resources'] : array();
+ foreach ($resources as $resource => $config) {
+
+ // the url parameter used as id to the resource
+ $resourceId = $this->buildResourceId($resource);
+ foreach($actions as $action) {
+ $url = $config['url'];
+ $method = $action['name'];
+ $verb = isset($action['verb']) ? strtoupper($action['verb']) : 'GET';
+ $collectionAction = isset($action['on-collection']) ? $action['on-collection'] : false;
+ if (!$collectionAction) {
+ $url = $url . '/' . $resourceId;
+ }
+ if (isset($action['url-postfix'])) {
+ $url = $url . '/' . $action['url-postfix'];
+ }
+
+ $controller = $resource;
+
+ $controllerName = $this->buildControllerName($controller);
+ $actionName = $this->buildActionName($method);
+
+ $routeName = $this->appName . '.' . strtolower($resource) . '.' . strtolower($method);
+
+ $this->router->create($routeName, $url)->method($verb)->action(
+ new RouteActionHandler($this->container, $controllerName, $actionName)
+ );
+ }
+ }
+ }
+
+ /**
+ * Based on a given route name the controller name is generated
+ * @param $controller
+ * @return string
+ */
+ private function buildControllerName($controller)
+ {
+ return $this->underScoreToCamelCase(ucfirst($controller)) . 'Controller';
+ }
+
+ /**
+ * Based on the action part of the route name the controller method name is generated
+ * @param $action
+ * @return string
+ */
+ private function buildActionName($action) {
+ return $this->underScoreToCamelCase($action);
+ }
+
+ /**
+ * Generates the id used in the url part o the route url
+ * @param $resource
+ * @return string
+ */
+ private function buildResourceId($resource) {
+ return '{'.$this->underScoreToCamelCase(rtrim($resource, 's')).'Id}';
+ }
+
+ /**
+ * Underscored strings are converted to camel case strings
+ * @param $str string
+ * @return string
+ */
+ private function underScoreToCamelCase($str) {
+ $pattern = "/_[a-z]?/";
+ return preg_replace_callback(
+ $pattern,
+ function ($matches) {
+ return strtoupper(ltrim($matches[0], "_"));
+ },
+ $str);
+ }
+}
diff --git a/lib/appframework/utility/methodannotationreader.php b/lib/appframework/utility/methodannotationreader.php
new file mode 100644
index 0000000000000000000000000000000000000000..42060a0852987206de1d023df0b51654149022ca
--- /dev/null
+++ b/lib/appframework/utility/methodannotationreader.php
@@ -0,0 +1,61 @@
+<?php
+
+/**
+ * ownCloud - App Framework
+ *
+ * @author Bernhard Posselt
+ * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ *
+ * 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/>.
+ *
+ */
+
+
+namespace OC\AppFramework\Utility;
+
+
+/**
+ * Reads and parses annotations from doc comments
+ */
+class MethodAnnotationReader {
+
+ private $annotations;
+
+ /**
+ * @param object $object an object or classname
+ * @param string $method the method which we want to inspect for annotations
+ */
+ public function __construct($object, $method){
+ $this->annotations = array();
+
+ $reflection = new \ReflectionMethod($object, $method);
+ $docs = $reflection->getDocComment();
+
+ // extract everything prefixed by @ and first letter uppercase
+ preg_match_all('/@([A-Z]\w+)/', $docs, $matches);
+ $this->annotations = $matches[1];
+ }
+
+
+ /**
+ * Check if a method contains an annotation
+ * @param string $name the name of the annotation
+ * @return bool true if the annotation is found
+ */
+ public function hasAnnotation($name){
+ return in_array($name, $this->annotations);
+ }
+
+
+}
diff --git a/lib/appframework/utility/simplecontainer.php b/lib/appframework/utility/simplecontainer.php
new file mode 100644
index 0000000000000000000000000000000000000000..a51ace83a3759fb73b3f75b8455301ba5075f549
--- /dev/null
+++ b/lib/appframework/utility/simplecontainer.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace OC\AppFramework\Utility;
+
+// register 3rdparty autoloaders
+require_once __DIR__ . '/../../../3rdparty/Pimple/Pimple.php';
+
+/**
+ * Class SimpleContainer
+ *
+ * SimpleContainer is a simple implementation of IContainer on basis of \Pimple
+ */
+class SimpleContainer extends \Pimple implements \OCP\IContainer {
+
+ /**
+ * @param string $name name of the service to query for
+ * @return object registered service for the given $name
+ */
+ public function query($name) {
+ return $this->offsetGet($name);
+ }
+
+ function registerParameter($name, $value)
+ {
+ $this[$name] = $value;
+ }
+
+ /**
+ * The given closure is call the first time the given service is queried.
+ * The closure has to return the instance for the given service.
+ * Created instance will be cached in case $shared is true.
+ *
+ * @param string $name name of the service to register another backend for
+ * @param callable $closure the closure to be called on service creation
+ */
+ function registerService($name, \Closure $closure, $shared = true)
+ {
+ if ($shared) {
+ $this[$name] = \Pimple::share($closure);
+ } else {
+ $this[$name] = $closure;
+ }
+ }
+}
diff --git a/lib/appframework/utility/timefactory.php b/lib/appframework/utility/timefactory.php
new file mode 100644
index 0000000000000000000000000000000000000000..2c3dd6cf5e3182e7c73a01964241b55b1edeb134
--- /dev/null
+++ b/lib/appframework/utility/timefactory.php
@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * ownCloud - App Framework
+ *
+ * @author Bernhard Posselt
+ * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ *
+ * 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/>.
+ *
+ */
+
+
+namespace OC\AppFramework\Utility;
+
+
+/**
+ * Needed to mock calls to time()
+ */
+class TimeFactory {
+
+
+ /**
+ * @return int the result of a call to time()
+ */
+ public function getTime() {
+ return time();
+ }
+
+
+}
diff --git a/lib/archive.php b/lib/archive.php
index 364cd5a74a1c9a880cef6400da70c0cc124c1ce5..85bfae57295d64e6bb49731519e360ae744db1cf 100644
--- a/lib/archive.php
+++ b/lib/archive.php
@@ -119,7 +119,8 @@ abstract class OC_Archive{
* @return bool
*/
function addRecursive($path, $source) {
- if($dh=opendir($source)) {
+ $dh = opendir($source);
+ if(is_resource($dh)) {
$this->addFolder($path);
while (($file = readdir($dh)) !== false) {
if($file=='.' or $file=='..') {
diff --git a/lib/avatar.php b/lib/avatar.php
new file mode 100644
index 0000000000000000000000000000000000000000..f20980c364b0290c1b98f218d2997156732389d2
--- /dev/null
+++ b/lib/avatar.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * Copyright (c) 2013 Christopher Schäpers <christopher@schaepers.it>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+/**
+ * This class gets and sets users avatars.
+ */
+
+class OC_Avatar {
+
+ private $view;
+
+ /**
+ * @brief constructor
+ * @param $user string user to do avatar-management with
+ */
+ public function __construct ($user) {
+ $this->view = new \OC\Files\View('/'.$user);
+ }
+
+ /**
+ * @brief get the users avatar
+ * @param $size integer size in px of the avatar, defaults to 64
+ * @return boolean|\OC_Image containing the avatar or false if there's no image
+ */
+ public function get ($size = 64) {
+ if ($this->view->file_exists('avatar.jpg')) {
+ $ext = 'jpg';
+ } elseif ($this->view->file_exists('avatar.png')) {
+ $ext = 'png';
+ } else {
+ return false;
+ }
+
+ $avatar = new OC_Image();
+ $avatar->loadFromData($this->view->file_get_contents('avatar.'.$ext));
+ $avatar->resize($size);
+ return $avatar;
+ }
+
+ /**
+ * @brief sets the users avatar
+ * @param $data mixed imagedata or path to set a new avatar
+ * @throws Exception if the provided file is not a jpg or png image
+ * @throws Exception if the provided image is not valid
+ * @throws \OC\NotSquareException if the image is not square
+ * @return void
+ */
+ public function set ($data) {
+ if (\OC_App::isEnabled('files_encryption')) {
+ $l = \OC_L10N::get('lib');
+ throw new \Exception($l->t("Custom profile pictures don't work with encryption yet"));
+ }
+
+ $img = new OC_Image($data);
+ $type = substr($img->mimeType(), -3);
+ if ($type === 'peg') { $type = 'jpg'; }
+ if ($type !== 'jpg' && $type !== 'png') {
+ $l = \OC_L10N::get('lib');
+ throw new \Exception($l->t("Unknown filetype"));
+ }
+
+ if (!$img->valid()) {
+ $l = \OC_L10N::get('lib');
+ throw new \Exception($l->t("Invalid image"));
+ }
+
+ if (!($img->height() === $img->width())) {
+ throw new \OC\NotSquareException();
+ }
+
+ $this->view->unlink('avatar.jpg');
+ $this->view->unlink('avatar.png');
+ $this->view->file_put_contents('avatar.'.$type, $data);
+ }
+
+ /**
+ * @brief remove the users avatar
+ * @return void
+ */
+ public function remove () {
+ $this->view->unlink('avatar.jpg');
+ $this->view->unlink('avatar.png');
+ }
+}
diff --git a/lib/base.php b/lib/base.php
index 2613e88d0537ae66a5f80c719d9fd35457088fd6..036051119de5148d8da1d377e74fc1243ddcdf1d 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -84,6 +84,11 @@ class OC {
*/
public static $loader = null;
+ /**
+ * @var \OC\Server
+ */
+ public static $server = null;
+
public static function initPaths() {
// calculate the root directories
OC::$SERVERROOT = str_replace("\\", '/', substr(__DIR__, 0, -4));
@@ -257,20 +262,30 @@ class OC {
OC_Util::addScript("compatibility");
OC_Util::addScript("jquery.ocdialog");
OC_Util::addScript("oc-dialogs");
- OC_Util::addScript("octemplate");
OC_Util::addScript("js");
+ OC_Util::addScript("octemplate");
OC_Util::addScript("eventsource");
OC_Util::addScript("config");
//OC_Util::addScript( "multiselect" );
OC_Util::addScript('search', 'result');
OC_Util::addScript('router');
+ OC_Util::addScript("oc-requesttoken");
+
+ // avatars
+ if (\OC_Config::getValue('enable_avatars', true) === true) {
+ \OC_Util::addScript('placeholder');
+ \OC_Util::addScript('3rdparty', 'md5/md5.min');
+ \OC_Util::addScript('jquery.avatar');
+ \OC_Util::addScript('avatar');
+ }
OC_Util::addStyle("styles");
+ OC_Util::addStyle("apps");
+ OC_Util::addStyle("fixes");
OC_Util::addStyle("multiselect");
OC_Util::addStyle("jquery-ui-1.10.0.custom");
OC_Util::addStyle("jquery-tipsy");
OC_Util::addStyle("jquery.ocdialog");
- OC_Util::addScript("oc-requesttoken");
}
public static function initSession() {
@@ -356,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');
@@ -415,7 +431,7 @@ class OC {
}
self::initPaths();
- OC_Util::issetlocaleworking();
+ OC_Util::isSetLocaleWorking();
// set debug mode if an xdebug session is active
if (!defined('DEBUG') || !DEBUG) {
@@ -440,6 +456,9 @@ class OC {
stream_wrapper_register('quota', 'OC\Files\Stream\Quota');
stream_wrapper_register('oc', 'OC\Files\Stream\OC');
+ // setup the basic server
+ self::$server = new \OC\Server();
+
self::initTemplateEngine();
if (!self::$CLI) {
self::initSession();
@@ -490,7 +509,9 @@ class OC {
self::registerCacheHooks();
self::registerFilesystemHooks();
+ self::registerPreviewHooks();
self::registerShareHooks();
+ self::registerLogRotate();
//make sure temporary files are cleaned up
register_shutdown_function(array('OC_Helper', 'cleanTmp'));
@@ -525,7 +546,7 @@ class OC {
}
// write error into log if locale can't be set
- if (OC_Util::issetlocaleworking() == false) {
+ if (OC_Util::isSetLocaleWorking() == false) {
OC_Log::write('core',
'setting locale to en_US.UTF-8/en_US.UTF8 failed. Support is probably not installed on your system',
OC_Log::ERROR);
@@ -544,11 +565,28 @@ class OC {
if (OC_Config::getValue('installed', false)) { //don't try to do this before we are properly setup
// register cache cleanup jobs
try { //if this is executed before the upgrade to the new backgroundjob system is completed it will throw an exception
- \OCP\BackgroundJob::registerJob('OC_Cache_FileGlobalGC');
+ \OCP\BackgroundJob::registerJob('OC\Cache\FileGlobalGC');
+ } catch (Exception $e) {
+
+ }
+ // NOTE: This will be replaced to use OCP
+ $userSession = \OC_User::getUserSession();
+ $userSession->listen('postLogin', '\OC\Cache\File', 'loginListener');
+ }
+ }
+
+ /**
+ * register hooks for the cache
+ */
+ public static function registerLogRotate() {
+ if (OC_Config::getValue('installed', false) && OC_Config::getValue('log_rotate_size', false)) {
+ //don't try to do this before we are properly setup
+ // register cache cleanup jobs
+ try { //if this is executed before the upgrade to the new backgroundjob system is completed it will throw an exception
+ \OCP\BackgroundJob::registerJob('OC\Log\Rotate', OC_Config::getValue("datadirectory", OC::$SERVERROOT.'/data').'/owncloud.log');
} catch (Exception $e) {
}
- OC_Hook::connect('OC_User', 'post_login', 'OC_Cache_File', 'loginListener');
}
}
@@ -561,6 +599,14 @@ class OC {
OC_Hook::connect('OC_Filesystem', 'rename', 'OC_Filesystem', 'isBlacklisted');
}
+ /**
+ * register hooks for previews
+ */
+ public static function registerPreviewHooks() {
+ OC_Hook::connect('OC_Filesystem', 'post_write', 'OC\Preview', 'post_write');
+ OC_Hook::connect('OC_Filesystem', 'delete', 'OC\Preview', 'post_delete');
+ }
+
/**
* register hooks for sharing
*/
@@ -669,12 +715,15 @@ class OC {
$app = $param['app'];
$file = $param['file'];
$app_path = OC_App::getAppPath($app);
- $file = $app_path . '/' . $file;
- unset($app, $app_path);
- if (file_exists($file)) {
- require_once $file;
- return true;
+ if (OC_App::isEnabled($app) && $app_path !== false) {
+ $file = $app_path . '/' . $file;
+ unset($app, $app_path);
+ if (file_exists($file)) {
+ require_once $file;
+ return true;
+ }
}
+ header('HTTP/1.0 404 Not Found');
return false;
}
@@ -721,6 +770,7 @@ class OC {
|| !isset($_COOKIE["oc_token"])
|| !isset($_COOKIE["oc_username"])
|| !$_COOKIE["oc_remember_login"]
+ || !OC_Util::rememberLoginAllowed()
) {
return false;
}
@@ -738,7 +788,7 @@ class OC {
if (in_array($_COOKIE['oc_token'], $tokens, true)) {
// replace successfully used token with a new one
OC_Preferences::deleteKey($_COOKIE['oc_username'], 'login_token', $_COOKIE['oc_token']);
- $token = OC_Util::generate_random_bytes(32);
+ $token = OC_Util::generateRandomBytes(32);
OC_Preferences::setValue($_COOKIE['oc_username'], 'login_token', $token, time());
OC_User::setMagicInCookie($_COOKIE['oc_username'], $token);
// login
@@ -772,14 +822,15 @@ class OC {
self::$session->set('timezone', $_POST['timezone-offset']);
}
- self::cleanupLoginTokens($_POST['user']);
+ $userid = OC_User::getUser();
+ self::cleanupLoginTokens($userid);
if (!empty($_POST["remember_login"])) {
if (defined("DEBUG") && DEBUG) {
OC_Log::write('core', 'Setting remember login to cookie', OC_Log::DEBUG);
}
- $token = OC_Util::generate_random_bytes(32);
- OC_Preferences::setValue($_POST['user'], 'login_token', $token, time());
- OC_User::setMagicInCookie($_POST["user"], $token);
+ $token = OC_Util::generateRandomBytes(32);
+ OC_Preferences::setValue($userid, 'login_token', $token, time());
+ OC_User::setMagicInCookie($userid, $token);
} else {
OC_User::unsetMagicInCookie();
}
diff --git a/lib/cache.php b/lib/cache.php
index 48b9964ba9d19dd0713f3b5d188e0daa9b20e4e0..a311f10a00fa4736136ab6a1e6bf3c5e3b7166d9 100644
--- a/lib/cache.php
+++ b/lib/cache.php
@@ -6,34 +6,36 @@
* See the COPYING-README file.
*/
-class OC_Cache {
+namespace OC;
+
+class Cache {
/**
- * @var OC_Cache $user_cache
+ * @var Cache $user_cache
*/
static protected $user_cache;
/**
- * @var OC_Cache $global_cache
+ * @var Cache $global_cache
*/
static protected $global_cache;
/**
* get the global cache
- * @return OC_Cache
+ * @return Cache
*/
static public function getGlobalCache() {
if (!self::$global_cache) {
- self::$global_cache = new OC_Cache_FileGlobal();
+ self::$global_cache = new Cache\FileGlobal();
}
return self::$global_cache;
}
/**
* get the user cache
- * @return OC_Cache
+ * @return Cache
*/
static public function getUserCache() {
if (!self::$user_cache) {
- self::$user_cache = new OC_Cache_File();
+ self::$user_cache = new Cache\File();
}
return self::$user_cache;
}
@@ -85,7 +87,7 @@ class OC_Cache {
/**
* clear the user cache of all entries starting with a prefix
- * @param string prefix (optional)
+ * @param string $prefix (optional)
* @return bool
*/
static public function clear($prefix='') {
@@ -93,6 +95,11 @@ class OC_Cache {
return $user_cache->clear($prefix);
}
+ /**
+ * creates cache key based on the files given
+ * @param $files
+ * @return string
+ */
static public function generateCacheKeyFromFiles($files) {
$key = '';
sort($files);
diff --git a/lib/cache/broker.php b/lib/cache/broker.php
index a161dbfa3bb1c2664b9eb4ab25c0ddf57da90633..9b7e837e1bc96f4c4fbb32e2f607142438c23d8b 100644
--- a/lib/cache/broker.php
+++ b/lib/cache/broker.php
@@ -6,8 +6,18 @@
* See the COPYING-README file.
*/
-class OC_Cache_Broker {
+namespace OC\Cache;
+
+class Broker {
+
+ /**
+ * @var \OC\Cache
+ */
protected $fast_cache;
+
+ /**
+ * @var \OC\Cache
+ */
protected $slow_cache;
public function __construct($fast_cache, $slow_cache) {
diff --git a/lib/cache/file.php b/lib/cache/file.php
index 9fee6034a714d34a250727af701a9b4fdf331098..2ab914d17b891b421fd573a1ad98edc233d52a99 100644
--- a/lib/cache/file.php
+++ b/lib/cache/file.php
@@ -6,24 +6,25 @@
* See the COPYING-README file.
*/
+namespace OC\Cache;
-class OC_Cache_File{
+class File {
protected $storage;
protected function getStorage() {
if (isset($this->storage)) {
return $this->storage;
}
- if(OC_User::isLoggedIn()) {
- \OC\Files\Filesystem::initMountPoints(OC_User::getUser());
+ if(\OC_User::isLoggedIn()) {
+ \OC\Files\Filesystem::initMountPoints(\OC_User::getUser());
$subdir = 'cache';
- $view = new \OC\Files\View('/'.OC_User::getUser());
+ $view = new \OC\Files\View('/' . \OC_User::getUser());
if(!$view->file_exists($subdir)) {
$view->mkdir($subdir);
}
- $this->storage = new \OC\Files\View('/'.OC_User::getUser().'/'.$subdir);
+ $this->storage = new \OC\Files\View('/' . \OC_User::getUser().'/'.$subdir);
return $this->storage;
}else{
- OC_Log::write('core', 'Can\'t get cache storage, user not logged in', OC_Log::ERROR);
+ \OC_Log::write('core', 'Can\'t get cache storage, user not logged in', \OC_Log::ERROR);
return false;
}
}
@@ -80,9 +81,11 @@ class OC_Cache_File{
$storage = $this->getStorage();
if($storage and $storage->is_dir('/')) {
$dh=$storage->opendir('/');
- while (($file = readdir($dh)) !== false) {
- if($file!='.' and $file!='..' and ($prefix==='' || strpos($file, $prefix) === 0)) {
- $storage->unlink('/'.$file);
+ if(is_resource($dh)) {
+ while (($file = readdir($dh)) !== false) {
+ if($file!='.' and $file!='..' and ($prefix==='' || strpos($file, $prefix) === 0)) {
+ $storage->unlink('/'.$file);
+ }
}
}
}
@@ -94,6 +97,9 @@ class OC_Cache_File{
if($storage and $storage->is_dir('/')) {
$now = time();
$dh=$storage->opendir('/');
+ if(!is_resource($dh)) {
+ return null;
+ }
while (($file = readdir($dh)) !== false) {
if($file!='.' and $file!='..') {
$mtime = $storage->filemtime('/'.$file);
diff --git a/lib/cache/fileglobal.php b/lib/cache/fileglobal.php
index 2fbd8ca3edbd0b5ae30cecda282ceecbf65ee207..bd049bba4d0a5ebc2c0bb56bc807cce26fb2e2c4 100644
--- a/lib/cache/fileglobal.php
+++ b/lib/cache/fileglobal.php
@@ -6,10 +6,11 @@
* See the COPYING-README file.
*/
+namespace OC\Cache;
-class OC_Cache_FileGlobal{
+class FileGlobal {
static protected function getCacheDir() {
- $cache_dir = get_temp_dir().'/owncloud-'.OC_Util::getInstanceId().'/';
+ $cache_dir = get_temp_dir().'/owncloud-' . \OC_Util::getInstanceId().'/';
if (!is_dir($cache_dir)) {
mkdir($cache_dir);
}
@@ -69,30 +70,34 @@ class OC_Cache_FileGlobal{
$prefix = $this->fixKey($prefix);
if($cache_dir and is_dir($cache_dir)) {
$dh=opendir($cache_dir);
- while (($file = readdir($dh)) !== false) {
- if($file!='.' and $file!='..' and ($prefix==='' || strpos($file, $prefix) === 0)) {
- unlink($cache_dir.$file);
+ if(is_resource($dh)) {
+ while (($file = readdir($dh)) !== false) {
+ if($file!='.' and $file!='..' and ($prefix==='' || strpos($file, $prefix) === 0)) {
+ unlink($cache_dir.$file);
+ }
}
}
}
}
static public function gc() {
- $last_run = OC_AppConfig::getValue('core', 'global_cache_gc_lastrun', 0);
+ $last_run = \OC_AppConfig::getValue('core', 'global_cache_gc_lastrun', 0);
$now = time();
if (($now - $last_run) < 300) {
// only do cleanup every 5 minutes
return;
}
- OC_AppConfig::setValue('core', 'global_cache_gc_lastrun', $now);
+ \OC_AppConfig::setValue('core', 'global_cache_gc_lastrun', $now);
$cache_dir = self::getCacheDir();
if($cache_dir and is_dir($cache_dir)) {
$dh=opendir($cache_dir);
- while (($file = readdir($dh)) !== false) {
- if($file!='.' and $file!='..') {
- $mtime = filemtime($cache_dir.$file);
- if ($mtime < $now) {
- unlink($cache_dir.$file);
+ if(is_resource($dh)) {
+ while (($file = readdir($dh)) !== false) {
+ if($file!='.' and $file!='..') {
+ $mtime = filemtime($cache_dir.$file);
+ if ($mtime < $now) {
+ unlink($cache_dir.$file);
+ }
}
}
}
diff --git a/lib/cache/fileglobalgc.php b/lib/cache/fileglobalgc.php
index a29c31f9063087a49dd9d0d3c498d1e1fe23e68d..399dd5e6f9468f5595596fd9d64a87d988628779 100644
--- a/lib/cache/fileglobalgc.php
+++ b/lib/cache/fileglobalgc.php
@@ -1,8 +1,9 @@
<?php
+namespace OC\Cache;
-class OC_Cache_FileGlobalGC extends \OC\BackgroundJob\Job{
+class FileGlobalGC extends \OC\BackgroundJob\Job{
public function run($argument){
- OC_Cache_FileGlobal::gc();
+ FileGlobal::gc();
}
}
diff --git a/lib/cache/usercache.php b/lib/cache/usercache.php
new file mode 100644
index 0000000000000000000000000000000000000000..baa8820700b9c652e0ed0e39bf4b1f008c61d26b
--- /dev/null
+++ b/lib/cache/usercache.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * Copyright (c) 2013 Thomas Tanghus (thomas@tanghus.net)
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+namespace OC\Cache;
+
+/**
+ * This interface defines method for accessing the file based user cache.
+ */
+class UserCache implements \OCP\ICache {
+
+ /**
+ * @var \OC\Cache\File $userCache
+ */
+ protected $userCache;
+
+ public function __construct() {
+ $this->userCache = new File();
+ }
+
+ /**
+ * Get a value from the user cache
+ *
+ * @param string $key
+ * @return mixed
+ */
+ public function get($key) {
+ return $this->userCache->get($key);
+ }
+
+ /**
+ * Set a value in the user cache
+ *
+ * @param string $key
+ * @param mixed $value
+ * @param int $ttl Time To Live in seconds. Defaults to 60*60*24
+ * @return bool
+ */
+ public function set($key, $value, $ttl = 0) {
+ if (empty($key)) {
+ return false;
+ }
+ return $this->userCache->set($key, $value, $ttl);
+ }
+
+ /**
+ * Check if a value is set in the user cache
+ *
+ * @param string $key
+ * @return bool
+ */
+ public function hasKey($key) {
+ return $this->userCache->hasKey($key);
+ }
+
+ /**
+ * Remove an item from the user cache
+ *
+ * @param string $key
+ * @return bool
+ */
+ public function remove($key) {
+ return $this->userCache->remove($key);
+ }
+
+ /**
+ * clear the user cache of all entries starting with a prefix
+ * @param string $prefix (optional)
+ * @return bool
+ */
+ public function clear($prefix = '') {
+ return $this->userCache->clear($prefix);
+ }
+}
diff --git a/lib/connector/sabre/aborteduploaddetectionplugin.php b/lib/connector/sabre/aborteduploaddetectionplugin.php
new file mode 100644
index 0000000000000000000000000000000000000000..15dca3a680976ca6fe88b746e1334ade73b218ee
--- /dev/null
+++ b/lib/connector/sabre/aborteduploaddetectionplugin.php
@@ -0,0 +1,101 @@
+<?php
+/**
+ * Copyright (c) 2013 Thomas Müller <thomas.mueller@tmit.eu>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+/**
+ * Class OC_Connector_Sabre_AbortedUploadDetectionPlugin
+ *
+ * This plugin will verify if the uploaded data has been stored completely.
+ * This is done by comparing the content length of the request with the file size on storage.
+ */
+class OC_Connector_Sabre_AbortedUploadDetectionPlugin extends Sabre_DAV_ServerPlugin {
+
+ /**
+ * Reference to main server object
+ *
+ * @var Sabre_DAV_Server
+ */
+ private $server;
+
+ /**
+ * is kept public to allow overwrite for unit testing
+ *
+ * @var \OC\Files\View
+ */
+ public $fileView;
+
+ /**
+ * This initializes the plugin.
+ *
+ * This function is called by Sabre_DAV_Server, after
+ * addPlugin is called.
+ *
+ * This method should set up the requires event subscriptions.
+ *
+ * @param Sabre_DAV_Server $server
+ */
+ public function initialize(Sabre_DAV_Server $server) {
+
+ $this->server = $server;
+
+ $server->subscribeEvent('afterCreateFile', array($this, 'verifyContentLength'), 10);
+ $server->subscribeEvent('afterWriteContent', array($this, 'verifyContentLength'), 10);
+ }
+
+ /**
+ * @param $filePath
+ * @param Sabre_DAV_INode $node
+ * @throws Sabre_DAV_Exception_BadRequest
+ */
+ public function verifyContentLength($filePath, Sabre_DAV_INode $node = null) {
+
+ // ownCloud chunked upload will be handled in its own plugin
+ $chunkHeader = $this->server->httpRequest->getHeader('OC-Chunked');
+ if ($chunkHeader) {
+ return;
+ }
+
+ // compare expected and actual size
+ $expected = $this->getLength();
+ if (!$expected) {
+ return;
+ }
+ $actual = $this->getFileView()->filesize($filePath);
+ if ($actual != $expected) {
+ $this->getFileView()->unlink($filePath);
+ throw new Sabre_DAV_Exception_BadRequest('expected filesize ' . $expected . ' got ' . $actual);
+ }
+
+ }
+
+ /**
+ * @return string
+ */
+ public function getLength()
+ {
+ $req = $this->server->httpRequest;
+ $length = $req->getHeader('X-Expected-Entity-Length');
+ if (!$length) {
+ $length = $req->getHeader('Content-Length');
+ }
+
+ return $length;
+ }
+
+ /**
+ * @return \OC\Files\View
+ */
+ public function getFileView()
+ {
+ if (is_null($this->fileView)) {
+ // initialize fileView
+ $this->fileView = \OC\Files\Filesystem::getView();
+ }
+
+ return $this->fileView;
+ }
+}
diff --git a/lib/connector/sabre/directory.php b/lib/connector/sabre/directory.php
index 66cd2fcd4e3b6beaec89116024f641062f2ea3a4..382bdf06df1f272e311e5fd2e0fca8f30f539860 100644
--- a/lib/connector/sabre/directory.php
+++ b/lib/connector/sabre/directory.php
@@ -74,21 +74,14 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node implements Sa
\OC\Files\Filesystem::file_put_contents($partpath, $data);
- //detect aborted upload
- if (isset ($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] === 'PUT' ) {
- if (isset($_SERVER['CONTENT_LENGTH'])) {
- $expected = $_SERVER['CONTENT_LENGTH'];
- $actual = \OC\Files\Filesystem::filesize($partpath);
- if ($actual != $expected) {
- \OC\Files\Filesystem::unlink($partpath);
- throw new Sabre_DAV_Exception_BadRequest(
- 'expected filesize ' . $expected . ' got ' . $actual);
- }
- }
- }
-
// rename to correct path
- \OC\Files\Filesystem::rename($partpath, $newPath);
+ $renameOkay = \OC\Files\Filesystem::rename($partpath, $newPath);
+ $fileExists = \OC\Files\Filesystem::file_exists($newPath);
+ if ($renameOkay === false || $fileExists === false) {
+ \OC_Log::write('webdav', '\OC\Files\Filesystem::rename() failed', \OC_Log::ERROR);
+ \OC\Files\Filesystem::unlink($partpath);
+ throw new Sabre_DAV_Exception();
+ }
// allow sync clients to send the mtime along in a header
$mtime = OC_Request::hasModificationTime();
@@ -236,7 +229,7 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node implements Sa
$storageInfo = OC_Helper::getStorageInfo($this->path);
return array(
$storageInfo['used'],
- $storageInfo['total']
+ $storageInfo['free']
);
}
diff --git a/lib/connector/sabre/file.php b/lib/connector/sabre/file.php
index 61bdcd5e0ae297f37eeadf067f6667a99b524cd5..433b11485523f786851d20a9c8e9292f94379af3 100644
--- a/lib/connector/sabre/file.php
+++ b/lib/connector/sabre/file.php
@@ -74,7 +74,14 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements Sabre_D
}
// rename to correct path
- \OC\Files\Filesystem::rename($partpath, $this->path);
+ $renameOkay = \OC\Files\Filesystem::rename($partpath, $this->path);
+ $fileExists = \OC\Files\Filesystem::file_exists($this->path);
+ if ($renameOkay === false || $fileExists === false) {
+ \OC_Log::write('webdav', '\OC\Files\Filesystem::rename() failed', \OC_Log::ERROR);
+ \OC\Files\Filesystem::unlink($partpath);
+ throw new Sabre_DAV_Exception();
+ }
+
//allow sync clients to send the mtime along in a header
$mtime = OC_Request::hasModificationTime();
diff --git a/lib/connector/sabre/node.php b/lib/connector/sabre/node.php
index 0bffa58af78b9efe3a3688c0afb749054b34a1e3..29b7f9e53a5ba8d569e6ce0762e28e47360ca6e6 100644
--- a/lib/connector/sabre/node.php
+++ b/lib/connector/sabre/node.php
@@ -78,6 +78,11 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr
*/
public function setName($name) {
+ // rename is only allowed if the update privilege is granted
+ if (!\OC\Files\Filesystem::isUpdatable($this->path)) {
+ throw new \Sabre_DAV_Exception_Forbidden();
+ }
+
list($parentPath, ) = Sabre_DAV_URLUtil::splitPath($this->path);
list(, $newName) = Sabre_DAV_URLUtil::splitPath($name);
@@ -135,6 +140,12 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr
* Even if the modification time is set to a custom value the access time is set to now.
*/
public function touch($mtime) {
+
+ // touch is only allowed if the update privilege is granted
+ if (!\OC\Files\Filesystem::isUpdatable($this->path)) {
+ throw new \Sabre_DAV_Exception_Forbidden();
+ }
+
\OC\Files\Filesystem::touch($this->path, $mtime);
}
diff --git a/lib/connector/sabre/objecttree.php b/lib/connector/sabre/objecttree.php
index b298813a202c6a5e62b5419f12ba22fb5048af9b..80c3840b99d9fa95bd34bc7a4625a124b54e9cc0 100644
--- a/lib/connector/sabre/objecttree.php
+++ b/lib/connector/sabre/objecttree.php
@@ -11,6 +11,14 @@ namespace OC\Connector\Sabre;
use OC\Files\Filesystem;
class ObjectTree extends \Sabre_DAV_ObjectTree {
+
+ /**
+ * keep this public to allow mock injection during unit test
+ *
+ * @var \OC\Files\View
+ */
+ public $fileView;
+
/**
* Returns the INode object for the requested path
*
@@ -21,14 +29,16 @@ class ObjectTree extends \Sabre_DAV_ObjectTree {
public function getNodeForPath($path) {
$path = trim($path, '/');
- if (isset($this->cache[$path])) return $this->cache[$path];
+ if (isset($this->cache[$path])) {
+ return $this->cache[$path];
+ }
// Is it the root node?
if (!strlen($path)) {
return $this->rootNode;
}
- $info = Filesystem::getFileInfo($path);
+ $info = $this->getFileView()->getFileInfo($path);
if (!$info) {
throw new \Sabre_DAV_Exception_NotFound('File with name ' . $path . ' could not be located');
@@ -64,7 +74,25 @@ class ObjectTree extends \Sabre_DAV_ObjectTree {
list($sourceDir,) = \Sabre_DAV_URLUtil::splitPath($sourcePath);
list($destinationDir,) = \Sabre_DAV_URLUtil::splitPath($destinationPath);
- Filesystem::rename($sourcePath, $destinationPath);
+ // check update privileges
+ $fs = $this->getFileView();
+ if (!$fs->isUpdatable($sourcePath)) {
+ throw new \Sabre_DAV_Exception_Forbidden();
+ }
+ if ($sourceDir !== $destinationDir) {
+ // for a full move we need update privileges on sourcePath and sourceDir as well as destinationDir
+ if (!$fs->isUpdatable($sourceDir)) {
+ throw new \Sabre_DAV_Exception_Forbidden();
+ }
+ if (!$fs->isUpdatable($destinationDir)) {
+ throw new \Sabre_DAV_Exception_Forbidden();
+ }
+ }
+
+ $renameOkay = $fs->rename($sourcePath, $destinationPath);
+ if (!$renameOkay) {
+ throw new \Sabre_DAV_Exception_Forbidden('');
+ }
$this->markDirty($sourceDir);
$this->markDirty($destinationDir);
@@ -88,15 +116,27 @@ class ObjectTree extends \Sabre_DAV_ObjectTree {
} else {
Filesystem::mkdir($destination);
$dh = Filesystem::opendir($source);
- while (($subnode = readdir($dh)) !== false) {
+ if(is_resource($dh)) {
+ while (($subnode = readdir($dh)) !== false) {
- if ($subnode == '.' || $subnode == '..') continue;
- $this->copy($source . '/' . $subnode, $destination . '/' . $subnode);
+ if ($subnode == '.' || $subnode == '..') continue;
+ $this->copy($source . '/' . $subnode, $destination . '/' . $subnode);
+ }
}
}
list($destinationDir,) = \Sabre_DAV_URLUtil::splitPath($destination);
$this->markDirty($destinationDir);
}
+
+ /**
+ * @return \OC\Files\View
+ */
+ public function getFileView() {
+ if (is_null($this->fileView)) {
+ $this->fileView = \OC\Files\Filesystem::getView();
+ }
+ return $this->fileView;
+ }
}
diff --git a/lib/contactsmanager.php b/lib/contactsmanager.php
new file mode 100644
index 0000000000000000000000000000000000000000..fc6745b450506b063afe027cb8f3578d2e53093d
--- /dev/null
+++ b/lib/contactsmanager.php
@@ -0,0 +1,145 @@
+<?php
+/**
+ * ownCloud
+ *
+ * @author Thomas Müller
+ * @copyright 2013 Thomas Müller thomas.mueller@tmit.eu
+ *
+ * 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/>.
+ *
+ */
+
+namespace OC {
+
+ class ContactsManager implements \OCP\Contacts\IManager {
+
+ /**
+ * This function is used to search and find contacts within the users address books.
+ * In case $pattern is empty all contacts will be returned.
+ *
+ * @param string $pattern which should match within the $searchProperties
+ * @param array $searchProperties defines the properties within the query pattern should match
+ * @param array $options - for future use. One should always have options!
+ * @return array of contacts which are arrays of key-value-pairs
+ */
+ public function search($pattern, $searchProperties = array(), $options = array()) {
+ $result = array();
+ foreach($this->address_books as $address_book) {
+ $r = $address_book->search($pattern, $searchProperties, $options);
+ $result = array_merge($result, $r);
+ }
+
+ return $result;
+ }
+
+ /**
+ * This function can be used to delete the contact identified by the given id
+ *
+ * @param object $id the unique identifier to a contact
+ * @param $address_book_key
+ * @return bool successful or not
+ */
+ public function delete($id, $address_book_key) {
+ if (!array_key_exists($address_book_key, $this->address_books))
+ return null;
+
+ $address_book = $this->address_books[$address_book_key];
+ if ($address_book->getPermissions() & \OCP\PERMISSION_DELETE)
+ return null;
+
+ return $address_book->delete($id);
+ }
+
+ /**
+ * This function is used to create a new contact if 'id' is not given or not present.
+ * Otherwise the contact will be updated by replacing the entire data set.
+ *
+ * @param array $properties this array if key-value-pairs defines a contact
+ * @param $address_book_key string to identify the address book in which the contact shall be created or updated
+ * @return array representing the contact just created or updated
+ */
+ public function createOrUpdate($properties, $address_book_key) {
+
+ if (!array_key_exists($address_book_key, $this->address_books))
+ return null;
+
+ $address_book = $this->address_books[$address_book_key];
+ if ($address_book->getPermissions() & \OCP\PERMISSION_CREATE)
+ return null;
+
+ return $address_book->createOrUpdate($properties);
+ }
+
+ /**
+ * Check if contacts are available (e.g. contacts app enabled)
+ *
+ * @return bool true if enabled, false if not
+ */
+ public function isEnabled() {
+ return !empty($this->address_books);
+ }
+
+ /**
+ * @param \OCP\IAddressBook $address_book
+ */
+ public function registerAddressBook(\OCP\IAddressBook $address_book) {
+ $this->address_books[$address_book->getKey()] = $address_book;
+ }
+
+ /**
+ * @param \OCP\IAddressBook $address_book
+ */
+ public function unregisterAddressBook(\OCP\IAddressBook $address_book) {
+ unset($this->address_books[$address_book->getKey()]);
+ }
+
+ /**
+ * @return array
+ */
+ public function getAddressBooks() {
+ $result = array();
+ foreach($this->address_books as $address_book) {
+ $result[$address_book->getKey()] = $address_book->getDisplayName();
+ }
+
+ return $result;
+ }
+
+ /**
+ * removes all registered address book instances
+ */
+ public function clear() {
+ $this->address_books = array();
+ }
+
+ /**
+ * @var \OCP\IAddressBook[] which holds all registered address books
+ */
+ private $address_books = array();
+
+ /**
+ * In order to improve lazy loading a closure can be registered which will be called in case
+ * address books are actually requested
+ *
+ * @param string $key
+ * @param \Closure $callable
+ */
+ function register($key, \Closure $callable)
+ {
+ //
+ //TODO: implement me
+ //
+ }
+ }
+}
diff --git a/lib/db.php b/lib/db.php
index ebd012c72f812f29cfed7e6da469471bb762aedb..1e5d12649df0be92dedd794e5408cb7fade84b33 100644
--- a/lib/db.php
+++ b/lib/db.php
@@ -75,6 +75,7 @@ class OC_DB {
// do nothing if the connection already has been established
if (!self::$connection) {
$config = new \Doctrine\DBAL\Configuration();
+ $eventManager = new \Doctrine\Common\EventManager();
switch($type) {
case 'sqlite':
case 'sqlite3':
@@ -86,6 +87,7 @@ class OC_DB {
'driver' => 'pdo_sqlite',
);
$connectionParams['adapter'] = '\OC\DB\AdapterSqlite';
+ $connectionParams['wrapperClass'] = 'OC\DB\Connection';
break;
case 'mysql':
$connectionParams = array(
@@ -98,6 +100,7 @@ class OC_DB {
'driver' => 'pdo_mysql',
);
$connectionParams['adapter'] = '\OC\DB\Adapter';
+ $connectionParams['wrapperClass'] = 'OC\DB\Connection';
break;
case 'pgsql':
$connectionParams = array(
@@ -109,6 +112,7 @@ class OC_DB {
'driver' => 'pdo_pgsql',
);
$connectionParams['adapter'] = '\OC\DB\AdapterPgSql';
+ $connectionParams['wrapperClass'] = 'OC\DB\Connection';
break;
case 'oci':
$connectionParams = array(
@@ -123,6 +127,8 @@ 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':
$connectionParams = array(
@@ -135,14 +141,14 @@ 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);
+ self::$connection = \Doctrine\DBAL\DriverManager::getConnection($connectionParams, $config, $eventManager);
if ($type === 'sqlite' || $type === 'sqlite3') {
// Sqlite doesn't handle query caching and schema changes
// TODO: find a better way to handle this
@@ -329,18 +335,6 @@ class OC_DB {
self::$connection->commit();
}
- /**
- * @brief Disconnect
- *
- * This is good bye, good bye, yeah!
- */
- public static function disconnect() {
- // Cut connection if required
- if(self::$connection) {
- self::$connection->close();
- }
- }
-
/**
* @brief saves database schema to xml file
* @param string $file name of file
diff --git a/lib/db/connection.php b/lib/db/connection.php
index 2581969dbd0a34a7a1ab3d61e381f49810943095..2d3193a148a46fa84cd38b31879612f22d64a708 100644
--- a/lib/db/connection.php
+++ b/lib/db/connection.php
@@ -12,7 +12,7 @@ use Doctrine\DBAL\Configuration;
use Doctrine\DBAL\Cache\QueryCacheProfile;
use Doctrine\Common\EventManager;
-class Connection extends \Doctrine\DBAL\Connection {
+class Connection extends \Doctrine\DBAL\Connection implements \OCP\IDBConnection {
/**
* @var string $tablePrefix
*/
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/filechunking.php b/lib/filechunking.php
index e6d69273a44a6e08e4ad1bcf728c6cea78808ea2..313a6ee87d2975d6139b2a3a8691a63d6994784e 100644
--- a/lib/filechunking.php
+++ b/lib/filechunking.php
@@ -29,7 +29,7 @@ class OC_FileChunking {
protected function getCache() {
if (!isset($this->cache)) {
- $this->cache = new OC_Cache_File();
+ $this->cache = new \OC\Cache\File();
}
return $this->cache;
}
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 87fa7c1365a2ecd3fa2a805d28a83d5f1ead3006..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,20 +191,22 @@ class Scanner extends BasicEmitter {
$newChildren = array();
if ($this->storage->is_dir($path) && ($dh = $this->storage->opendir($path))) {
\OC_DB::beginTransaction();
- while (($file = readdir($dh)) !== false) {
- $child = ($path) ? $path . '/' . $file : $file;
- if (!Filesystem::isIgnoredDir($file)) {
- $newChildren[] = $file;
- $data = $this->scanFile($child, $reuse, true);
- if ($data) {
- if ($data['size'] === -1) {
- if ($recursive === self::SCAN_RECURSIVE) {
- $childQueue[] = $child;
- } else {
- $size = -1;
+ if (is_resource($dh)) {
+ while (($file = readdir($dh)) !== false) {
+ $child = ($path) ? $path . '/' . $file : $file;
+ if (!Filesystem::isIgnoredDir($file)) {
+ $newChildren[] = $file;
+ $data = $this->scanFile($child, $reuse, true);
+ if ($data) {
+ if ($data['size'] === -1) {
+ if ($recursive === self::SCAN_RECURSIVE) {
+ $childQueue[] = $child;
+ } else {
+ $size = -1;
+ }
+ } else if ($size !== -1) {
+ $size += $data['size'];
}
- } else if ($size !== -1) {
- $size += $data['size'];
}
}
}
diff --git a/lib/files/node/file.php b/lib/files/node/file.php
new file mode 100644
index 0000000000000000000000000000000000000000..75d5e0166b638139d962f1056af8b6a9f7802772
--- /dev/null
+++ b/lib/files/node/file.php
@@ -0,0 +1,155 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\Files\Node;
+
+use OCP\Files\NotPermittedException;
+
+class File extends Node implements \OCP\Files\File {
+ /**
+ * @return string
+ * @throws \OCP\Files\NotPermittedException
+ */
+ public function getContent() {
+ if ($this->checkPermissions(\OCP\PERMISSION_READ)) {
+ /**
+ * @var \OC\Files\Storage\Storage $storage;
+ */
+ return $this->view->file_get_contents($this->path);
+ } else {
+ throw new NotPermittedException();
+ }
+ }
+
+ /**
+ * @param string $data
+ * @throws \OCP\Files\NotPermittedException
+ */
+ public function putContent($data) {
+ if ($this->checkPermissions(\OCP\PERMISSION_UPDATE)) {
+ $this->sendHooks(array('preWrite'));
+ $this->view->file_put_contents($this->path, $data);
+ $this->sendHooks(array('postWrite'));
+ } else {
+ throw new NotPermittedException();
+ }
+ }
+
+ /**
+ * @return string
+ */
+ public function getMimeType() {
+ return $this->view->getMimeType($this->path);
+ }
+
+ /**
+ * @param string $mode
+ * @return resource
+ * @throws \OCP\Files\NotPermittedException
+ */
+ public function fopen($mode) {
+ $preHooks = array();
+ $postHooks = array();
+ $requiredPermissions = \OCP\PERMISSION_READ;
+ switch ($mode) {
+ case 'r+':
+ case 'rb+':
+ case 'w+':
+ case 'wb+':
+ case 'x+':
+ case 'xb+':
+ case 'a+':
+ case 'ab+':
+ case 'w':
+ case 'wb':
+ case 'x':
+ case 'xb':
+ case 'a':
+ case 'ab':
+ $preHooks[] = 'preWrite';
+ $postHooks[] = 'postWrite';
+ $requiredPermissions |= \OCP\PERMISSION_UPDATE;
+ break;
+ }
+
+ if ($this->checkPermissions($requiredPermissions)) {
+ $this->sendHooks($preHooks);
+ $result = $this->view->fopen($this->path, $mode);
+ $this->sendHooks($postHooks);
+ return $result;
+ } else {
+ throw new NotPermittedException();
+ }
+ }
+
+ public function delete() {
+ if ($this->checkPermissions(\OCP\PERMISSION_DELETE)) {
+ $this->sendHooks(array('preDelete'));
+ $this->view->unlink($this->path);
+ $nonExisting = new NonExistingFile($this->root, $this->view, $this->path);
+ $this->root->emit('\OC\Files', 'postDelete', array($nonExisting));
+ $this->exists = false;
+ } else {
+ throw new NotPermittedException();
+ }
+ }
+
+ /**
+ * @param string $targetPath
+ * @throws \OCP\Files\NotPermittedException
+ * @return \OC\Files\Node\Node
+ */
+ public function copy($targetPath) {
+ $targetPath = $this->normalizePath($targetPath);
+ $parent = $this->root->get(dirname($targetPath));
+ if ($parent instanceof Folder and $this->isValidPath($targetPath) and $parent->isCreatable()) {
+ $nonExisting = new NonExistingFile($this->root, $this->view, $targetPath);
+ $this->root->emit('\OC\Files', 'preCopy', array($this, $nonExisting));
+ $this->root->emit('\OC\Files', 'preWrite', array($nonExisting));
+ $this->view->copy($this->path, $targetPath);
+ $targetNode = $this->root->get($targetPath);
+ $this->root->emit('\OC\Files', 'postCopy', array($this, $targetNode));
+ $this->root->emit('\OC\Files', 'postWrite', array($targetNode));
+ return $targetNode;
+ } else {
+ throw new NotPermittedException();
+ }
+ }
+
+ /**
+ * @param string $targetPath
+ * @throws \OCP\Files\NotPermittedException
+ * @return \OC\Files\Node\Node
+ */
+ public function move($targetPath) {
+ $targetPath = $this->normalizePath($targetPath);
+ $parent = $this->root->get(dirname($targetPath));
+ if ($parent instanceof Folder and $this->isValidPath($targetPath) and $parent->isCreatable()) {
+ $nonExisting = new NonExistingFile($this->root, $this->view, $targetPath);
+ $this->root->emit('\OC\Files', 'preRename', array($this, $nonExisting));
+ $this->root->emit('\OC\Files', 'preWrite', array($nonExisting));
+ $this->view->rename($this->path, $targetPath);
+ $targetNode = $this->root->get($targetPath);
+ $this->root->emit('\OC\Files', 'postRename', array($this, $targetNode));
+ $this->root->emit('\OC\Files', 'postWrite', array($targetNode));
+ $this->path = $targetPath;
+ return $targetNode;
+ } else {
+ throw new NotPermittedException();
+ }
+ }
+
+ /**
+ * @param string $type
+ * @param bool $raw
+ * @return string
+ */
+ public function hash($type, $raw = false) {
+ return $this->view->hash($type, $this->path, $raw);
+ }
+}
diff --git a/lib/files/node/folder.php b/lib/files/node/folder.php
new file mode 100644
index 0000000000000000000000000000000000000000..923f53821b2b2fea687e56d0c358237072cbce65
--- /dev/null
+++ b/lib/files/node/folder.php
@@ -0,0 +1,382 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\Files\Node;
+
+use OC\Files\Cache\Cache;
+use OC\Files\Cache\Scanner;
+use OCP\Files\NotFoundException;
+use OCP\Files\NotPermittedException;
+
+class Folder extends Node implements \OCP\Files\Folder {
+ /**
+ * @param string $path path relative to the folder
+ * @return string
+ * @throws \OCP\Files\NotPermittedException
+ */
+ public function getFullPath($path) {
+ if (!$this->isValidPath($path)) {
+ throw new NotPermittedException();
+ }
+ return $this->path . $this->normalizePath($path);
+ }
+
+ /**
+ * @param string $path
+ * @throws \OCP\Files\NotFoundException
+ * @return string
+ */
+ public function getRelativePath($path) {
+ if ($this->path === '' or $this->path === '/') {
+ return $this->normalizePath($path);
+ }
+ if (strpos($path, $this->path) !== 0) {
+ throw new NotFoundException();
+ } else {
+ $path = substr($path, strlen($this->path));
+ if (strlen($path) === 0) {
+ return '/';
+ } else {
+ return $this->normalizePath($path);
+ }
+ }
+ }
+
+ /**
+ * check if a node is a (grand-)child of the folder
+ *
+ * @param \OC\Files\Node\Node $node
+ * @return bool
+ */
+ public function isSubNode($node) {
+ return strpos($node->getPath(), $this->path . '/') === 0;
+ }
+
+ /**
+ * get the content of this directory
+ *
+ * @throws \OCP\Files\NotFoundException
+ * @return Node[]
+ */
+ public function getDirectoryListing() {
+ $result = array();
+
+ /**
+ * @var \OC\Files\Storage\Storage $storage
+ */
+ list($storage, $internalPath) = $this->view->resolvePath($this->path);
+ if ($storage) {
+ $cache = $storage->getCache($internalPath);
+ $permissionsCache = $storage->getPermissionsCache($internalPath);
+
+ //trigger cache update check
+ $this->view->getFileInfo($this->path);
+
+ $files = $cache->getFolderContents($internalPath);
+ $permissions = $permissionsCache->getDirectoryPermissions($this->getId(), $this->root->getUser()->getUID());
+ } else {
+ $files = array();
+ }
+
+ //add a folder for any mountpoint in this directory and add the sizes of other mountpoints to the folders
+ $mounts = $this->root->getMountsIn($this->path);
+ $dirLength = strlen($this->path);
+ foreach ($mounts as $mount) {
+ $subStorage = $mount->getStorage();
+ if ($subStorage) {
+ $subCache = $subStorage->getCache('');
+
+ if ($subCache->getStatus('') === Cache::NOT_FOUND) {
+ $subScanner = $subStorage->getScanner('');
+ $subScanner->scanFile('');
+ }
+
+ $rootEntry = $subCache->get('');
+ if ($rootEntry) {
+ $relativePath = trim(substr($mount->getMountPoint(), $dirLength), '/');
+ if ($pos = strpos($relativePath, '/')) {
+ //mountpoint inside subfolder add size to the correct folder
+ $entryName = substr($relativePath, 0, $pos);
+ foreach ($files as &$entry) {
+ if ($entry['name'] === $entryName) {
+ if ($rootEntry['size'] >= 0) {
+ $entry['size'] += $rootEntry['size'];
+ } else {
+ $entry['size'] = -1;
+ }
+ }
+ }
+ } else { //mountpoint in this folder, add an entry for it
+ $rootEntry['name'] = $relativePath;
+ $rootEntry['storageObject'] = $subStorage;
+
+ //remove any existing entry with the same name
+ foreach ($files as $i => $file) {
+ if ($file['name'] === $rootEntry['name']) {
+ $files[$i] = null;
+ break;
+ }
+ }
+ $files[] = $rootEntry;
+ }
+ }
+ }
+ }
+
+ foreach ($files as $file) {
+ if ($file) {
+ if (isset($permissions[$file['fileid']])) {
+ $file['permissions'] = $permissions[$file['fileid']];
+ }
+ $node = $this->createNode($this->path . '/' . $file['name'], $file);
+ $result[] = $node;
+ }
+ }
+
+ return $result;
+ }
+
+ /**
+ * @param string $path
+ * @param array $info
+ * @return File|Folder
+ */
+ protected function createNode($path, $info = array()) {
+ if (!isset($info['mimetype'])) {
+ $isDir = $this->view->is_dir($path);
+ } else {
+ $isDir = $info['mimetype'] === 'httpd/unix-directory';
+ }
+ if ($isDir) {
+ return new Folder($this->root, $this->view, $path);
+ } else {
+ return new File($this->root, $this->view, $path);
+ }
+ }
+
+ /**
+ * Get the node at $path
+ *
+ * @param string $path
+ * @return \OC\Files\Node\Node
+ * @throws \OCP\Files\NotFoundException
+ */
+ public function get($path) {
+ return $this->root->get($this->getFullPath($path));
+ }
+
+ /**
+ * @param string $path
+ * @return bool
+ */
+ public function nodeExists($path) {
+ try {
+ $this->get($path);
+ return true;
+ } catch (NotFoundException $e) {
+ return false;
+ }
+ }
+
+ /**
+ * @param string $path
+ * @return \OC\Files\Node\Folder
+ * @throws \OCP\Files\NotPermittedException
+ */
+ public function newFolder($path) {
+ if ($this->checkPermissions(\OCP\PERMISSION_CREATE)) {
+ $fullPath = $this->getFullPath($path);
+ $nonExisting = new NonExistingFolder($this->root, $this->view, $fullPath);
+ $this->root->emit('\OC\Files', 'preWrite', array($nonExisting));
+ $this->root->emit('\OC\Files', 'preCreate', array($nonExisting));
+ $this->view->mkdir($fullPath);
+ $node = new Folder($this->root, $this->view, $fullPath);
+ $this->root->emit('\OC\Files', 'postWrite', array($node));
+ $this->root->emit('\OC\Files', 'postCreate', array($node));
+ return $node;
+ } else {
+ throw new NotPermittedException();
+ }
+ }
+
+ /**
+ * @param string $path
+ * @return \OC\Files\Node\File
+ * @throws \OCP\Files\NotPermittedException
+ */
+ public function newFile($path) {
+ if ($this->checkPermissions(\OCP\PERMISSION_CREATE)) {
+ $fullPath = $this->getFullPath($path);
+ $nonExisting = new NonExistingFile($this->root, $this->view, $fullPath);
+ $this->root->emit('\OC\Files', 'preWrite', array($nonExisting));
+ $this->root->emit('\OC\Files', 'preCreate', array($nonExisting));
+ $this->view->touch($fullPath);
+ $node = new File($this->root, $this->view, $fullPath);
+ $this->root->emit('\OC\Files', 'postWrite', array($node));
+ $this->root->emit('\OC\Files', 'postCreate', array($node));
+ return $node;
+ } else {
+ throw new NotPermittedException();
+ }
+ }
+
+ /**
+ * search for files with the name matching $query
+ *
+ * @param string $query
+ * @return \OC\Files\Node\Node[]
+ */
+ public function search($query) {
+ return $this->searchCommon('%' . $query . '%', 'search');
+ }
+
+ /**
+ * search for files by mimetype
+ *
+ * @param string $mimetype
+ * @return Node[]
+ */
+ public function searchByMime($mimetype) {
+ return $this->searchCommon($mimetype, 'searchByMime');
+ }
+
+ /**
+ * @param string $query
+ * @param string $method
+ * @return \OC\Files\Node\Node[]
+ */
+ private function searchCommon($query, $method) {
+ $files = array();
+ $rootLength = strlen($this->path);
+ /**
+ * @var \OC\Files\Storage\Storage $storage
+ */
+ list($storage, $internalPath) = $this->view->resolvePath($this->path);
+ $internalRootLength = strlen($internalPath);
+
+ $cache = $storage->getCache('');
+
+ $results = $cache->$method($query);
+ foreach ($results as $result) {
+ if ($internalRootLength === 0 or substr($result['path'], 0, $internalRootLength) === $internalPath) {
+ $result['internalPath'] = $result['path'];
+ $result['path'] = substr($result['path'], $internalRootLength);
+ $result['storage'] = $storage;
+ $files[] = $result;
+ }
+ }
+
+ $mounts = $this->root->getMountsIn($this->path);
+ foreach ($mounts as $mount) {
+ $storage = $mount->getStorage();
+ if ($storage) {
+ $cache = $storage->getCache('');
+
+ $relativeMountPoint = substr($mount->getMountPoint(), $rootLength);
+ $results = $cache->$method($query);
+ foreach ($results as $result) {
+ $result['internalPath'] = $result['path'];
+ $result['path'] = $relativeMountPoint . $result['path'];
+ $result['storage'] = $storage;
+ $files[] = $result;
+ }
+ }
+ }
+
+ $result = array();
+ foreach ($files as $file) {
+ $result[] = $this->createNode($this->normalizePath($this->path . '/' . $file['path']), $file);
+ }
+
+ return $result;
+ }
+
+ /**
+ * @param $id
+ * @return \OC\Files\Node\Node[]
+ */
+ public function getById($id) {
+ $nodes = $this->root->getById($id);
+ $result = array();
+ foreach ($nodes as $node) {
+ $pathPart = substr($node->getPath(), 0, strlen($this->getPath()) + 1);
+ if ($this->path === '/' or $pathPart === $this->getPath() . '/') {
+ $result[] = $node;
+ }
+ }
+ return $result;
+ }
+
+ public function getFreeSpace() {
+ return $this->view->free_space($this->path);
+ }
+
+ /**
+ * @return bool
+ */
+ public function isCreatable() {
+ return $this->checkPermissions(\OCP\PERMISSION_CREATE);
+ }
+
+ public function delete() {
+ if ($this->checkPermissions(\OCP\PERMISSION_DELETE)) {
+ $this->sendHooks(array('preDelete'));
+ $this->view->rmdir($this->path);
+ $nonExisting = new NonExistingFolder($this->root, $this->view, $this->path);
+ $this->root->emit('\OC\Files', 'postDelete', array($nonExisting));
+ $this->exists = false;
+ } else {
+ throw new NotPermittedException();
+ }
+ }
+
+ /**
+ * @param string $targetPath
+ * @throws \OCP\Files\NotPermittedException
+ * @return \OC\Files\Node\Node
+ */
+ public function copy($targetPath) {
+ $targetPath = $this->normalizePath($targetPath);
+ $parent = $this->root->get(dirname($targetPath));
+ if ($parent instanceof Folder and $this->isValidPath($targetPath) and $parent->isCreatable()) {
+ $nonExisting = new NonExistingFolder($this->root, $this->view, $targetPath);
+ $this->root->emit('\OC\Files', 'preCopy', array($this, $nonExisting));
+ $this->root->emit('\OC\Files', 'preWrite', array($nonExisting));
+ $this->view->copy($this->path, $targetPath);
+ $targetNode = $this->root->get($targetPath);
+ $this->root->emit('\OC\Files', 'postCopy', array($this, $targetNode));
+ $this->root->emit('\OC\Files', 'postWrite', array($targetNode));
+ return $targetNode;
+ } else {
+ throw new NotPermittedException();
+ }
+ }
+
+ /**
+ * @param string $targetPath
+ * @throws \OCP\Files\NotPermittedException
+ * @return \OC\Files\Node\Node
+ */
+ public function move($targetPath) {
+ $targetPath = $this->normalizePath($targetPath);
+ $parent = $this->root->get(dirname($targetPath));
+ if ($parent instanceof Folder and $this->isValidPath($targetPath) and $parent->isCreatable()) {
+ $nonExisting = new NonExistingFolder($this->root, $this->view, $targetPath);
+ $this->root->emit('\OC\Files', 'preRename', array($this, $nonExisting));
+ $this->root->emit('\OC\Files', 'preWrite', array($nonExisting));
+ $this->view->rename($this->path, $targetPath);
+ $targetNode = $this->root->get($targetPath);
+ $this->root->emit('\OC\Files', 'postRename', array($this, $targetNode));
+ $this->root->emit('\OC\Files', 'postWrite', array($targetNode));
+ $this->path = $targetPath;
+ return $targetNode;
+ } else {
+ throw new NotPermittedException();
+ }
+ }
+}
diff --git a/lib/files/node/node.php b/lib/files/node/node.php
new file mode 100644
index 0000000000000000000000000000000000000000..063e2424a64d351e358ef30b789e0bfe73ed79df
--- /dev/null
+++ b/lib/files/node/node.php
@@ -0,0 +1,245 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\Files\Node;
+
+use OC\Files\Cache\Cache;
+use OC\Files\Cache\Scanner;
+use OCP\Files\NotFoundException;
+use OCP\Files\NotPermittedException;
+
+class Node implements \OCP\Files\Node {
+ /**
+ * @var \OC\Files\View $view
+ */
+ protected $view;
+
+ /**
+ * @var \OC\Files\Node\Root $root
+ */
+ protected $root;
+
+ /**
+ * @var string $path
+ */
+ protected $path;
+
+ /**
+ * @param \OC\Files\View $view
+ * @param \OC\Files\Node\Root Root $root
+ * @param string $path
+ */
+ public function __construct($root, $view, $path) {
+ $this->view = $view;
+ $this->root = $root;
+ $this->path = $path;
+ }
+
+ /**
+ * @param string[] $hooks
+ */
+ protected function sendHooks($hooks) {
+ foreach ($hooks as $hook) {
+ $this->root->emit('\OC\Files', $hook, array($this));
+ }
+ }
+
+ /**
+ * @param int $permissions
+ * @return bool
+ */
+ protected function checkPermissions($permissions) {
+ return ($this->getPermissions() & $permissions) === $permissions;
+ }
+
+ /**
+ * @param string $targetPath
+ * @throws \OCP\Files\NotPermittedException
+ * @return \OC\Files\Node\Node
+ */
+ public function move($targetPath) {
+ return;
+ }
+
+ public function delete() {
+ return;
+ }
+
+ /**
+ * @param string $targetPath
+ * @return \OC\Files\Node\Node
+ */
+ public function copy($targetPath) {
+ return;
+ }
+
+ /**
+ * @param int $mtime
+ * @throws \OCP\Files\NotPermittedException
+ */
+ public function touch($mtime = null) {
+ if ($this->checkPermissions(\OCP\PERMISSION_UPDATE)) {
+ $this->sendHooks(array('preTouch'));
+ $this->view->touch($this->path, $mtime);
+ $this->sendHooks(array('postTouch'));
+ } else {
+ throw new NotPermittedException();
+ }
+ }
+
+ /**
+ * @return \OC\Files\Storage\Storage
+ * @throws \OCP\Files\NotFoundException
+ */
+ public function getStorage() {
+ list($storage,) = $this->view->resolvePath($this->path);
+ return $storage;
+ }
+
+ /**
+ * @return string
+ */
+ public function getPath() {
+ return $this->path;
+ }
+
+ /**
+ * @return string
+ */
+ public function getInternalPath() {
+ list(, $internalPath) = $this->view->resolvePath($this->path);
+ return $internalPath;
+ }
+
+ /**
+ * @return int
+ */
+ public function getId() {
+ $info = $this->view->getFileInfo($this->path);
+ return $info['fileid'];
+ }
+
+ /**
+ * @return array
+ */
+ public function stat() {
+ return $this->view->stat($this->path);
+ }
+
+ /**
+ * @return int
+ */
+ public function getMTime() {
+ return $this->view->filemtime($this->path);
+ }
+
+ /**
+ * @return int
+ */
+ public function getSize() {
+ return $this->view->filesize($this->path);
+ }
+
+ /**
+ * @return string
+ */
+ public function getEtag() {
+ $info = $this->view->getFileInfo($this->path);
+ return $info['etag'];
+ }
+
+ /**
+ * @return int
+ */
+ public function getPermissions() {
+ $info = $this->view->getFileInfo($this->path);
+ return $info['permissions'];
+ }
+
+ /**
+ * @return bool
+ */
+ public function isReadable() {
+ return $this->checkPermissions(\OCP\PERMISSION_READ);
+ }
+
+ /**
+ * @return bool
+ */
+ public function isUpdateable() {
+ return $this->checkPermissions(\OCP\PERMISSION_UPDATE);
+ }
+
+ /**
+ * @return bool
+ */
+ public function isDeletable() {
+ return $this->checkPermissions(\OCP\PERMISSION_DELETE);
+ }
+
+ /**
+ * @return bool
+ */
+ public function isShareable() {
+ return $this->checkPermissions(\OCP\PERMISSION_SHARE);
+ }
+
+ /**
+ * @return Node
+ */
+ public function getParent() {
+ return $this->root->get(dirname($this->path));
+ }
+
+ /**
+ * @return string
+ */
+ public function getName() {
+ return basename($this->path);
+ }
+
+ /**
+ * @param string $path
+ * @return string
+ */
+ protected function normalizePath($path) {
+ if ($path === '' or $path === '/') {
+ return '/';
+ }
+ //no windows style slashes
+ $path = str_replace('\\', '/', $path);
+ //add leading slash
+ if ($path[0] !== '/') {
+ $path = '/' . $path;
+ }
+ //remove duplicate slashes
+ while (strpos($path, '//') !== false) {
+ $path = str_replace('//', '/', $path);
+ }
+ //remove trailing slash
+ $path = rtrim($path, '/');
+
+ return $path;
+ }
+
+ /**
+ * check if the requested path is valid
+ *
+ * @param string $path
+ * @return bool
+ */
+ public function isValidPath($path) {
+ if (!$path || $path[0] !== '/') {
+ $path = '/' . $path;
+ }
+ if (strstr($path, '/../') || strrchr($path, '/') === '/..') {
+ return false;
+ }
+ return true;
+ }
+}
diff --git a/lib/files/node/nonexistingfile.php b/lib/files/node/nonexistingfile.php
new file mode 100644
index 0000000000000000000000000000000000000000..d45076f7feee3940057304d245fc278228f196c7
--- /dev/null
+++ b/lib/files/node/nonexistingfile.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\Files\Node;
+
+use OCP\Files\NotFoundException;
+
+class NonExistingFile extends File {
+ /**
+ * @param string $newPath
+ * @throws \OCP\Files\NotFoundException
+ */
+ public function rename($newPath) {
+ throw new NotFoundException();
+ }
+
+ public function delete() {
+ throw new NotFoundException();
+ }
+
+ public function copy($newPath) {
+ throw new NotFoundException();
+ }
+
+ public function touch($mtime = null) {
+ throw new NotFoundException();
+ }
+
+ public function getId() {
+ throw new NotFoundException();
+ }
+
+ public function stat() {
+ throw new NotFoundException();
+ }
+
+ public function getMTime() {
+ throw new NotFoundException();
+ }
+
+ public function getSize() {
+ throw new NotFoundException();
+ }
+
+ public function getEtag() {
+ throw new NotFoundException();
+ }
+
+ public function getPermissions() {
+ throw new NotFoundException();
+ }
+
+ public function isReadable() {
+ throw new NotFoundException();
+ }
+
+ public function isUpdateable() {
+ throw new NotFoundException();
+ }
+
+ public function isDeletable() {
+ throw new NotFoundException();
+ }
+
+ public function isShareable() {
+ throw new NotFoundException();
+ }
+
+ public function getContent() {
+ throw new NotFoundException();
+ }
+
+ public function putContent($data) {
+ throw new NotFoundException();
+ }
+
+ public function getMimeType() {
+ throw new NotFoundException();
+ }
+
+ public function fopen($mode) {
+ throw new NotFoundException();
+ }
+}
diff --git a/lib/files/node/nonexistingfolder.php b/lib/files/node/nonexistingfolder.php
new file mode 100644
index 0000000000000000000000000000000000000000..0346cbf1e2127456e345a49c8b09343e168a3e43
--- /dev/null
+++ b/lib/files/node/nonexistingfolder.php
@@ -0,0 +1,113 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\Files\Node;
+
+use OCP\Files\NotFoundException;
+
+class NonExistingFolder extends Folder {
+ /**
+ * @param string $newPath
+ * @throws \OCP\Files\NotFoundException
+ */
+ public function rename($newPath) {
+ throw new NotFoundException();
+ }
+
+ public function delete() {
+ throw new NotFoundException();
+ }
+
+ public function copy($newPath) {
+ throw new NotFoundException();
+ }
+
+ public function touch($mtime = null) {
+ throw new NotFoundException();
+ }
+
+ public function getId() {
+ throw new NotFoundException();
+ }
+
+ public function stat() {
+ throw new NotFoundException();
+ }
+
+ public function getMTime() {
+ throw new NotFoundException();
+ }
+
+ public function getSize() {
+ throw new NotFoundException();
+ }
+
+ public function getEtag() {
+ throw new NotFoundException();
+ }
+
+ public function getPermissions() {
+ throw new NotFoundException();
+ }
+
+ public function isReadable() {
+ throw new NotFoundException();
+ }
+
+ public function isUpdateable() {
+ throw new NotFoundException();
+ }
+
+ public function isDeletable() {
+ throw new NotFoundException();
+ }
+
+ public function isShareable() {
+ throw new NotFoundException();
+ }
+
+ public function get($path) {
+ throw new NotFoundException();
+ }
+
+ public function getDirectoryListing() {
+ throw new NotFoundException();
+ }
+
+ public function nodeExists($path) {
+ return false;
+ }
+
+ public function newFolder($path) {
+ throw new NotFoundException();
+ }
+
+ public function newFile($path) {
+ throw new NotFoundException();
+ }
+
+ public function search($pattern) {
+ throw new NotFoundException();
+ }
+
+ public function searchByMime($mime) {
+ throw new NotFoundException();
+ }
+
+ public function getById($id) {
+ throw new NotFoundException();
+ }
+
+ public function getFreeSpace() {
+ throw new NotFoundException();
+ }
+
+ public function isCreatable() {
+ throw new NotFoundException();
+ }
+}
diff --git a/lib/files/node/root.php b/lib/files/node/root.php
new file mode 100644
index 0000000000000000000000000000000000000000..e3d58476e9ce68b4784b395a22345c17ac4d68a5
--- /dev/null
+++ b/lib/files/node/root.php
@@ -0,0 +1,337 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\Files\Node;
+
+use OC\Files\Cache\Cache;
+use OC\Files\Cache\Scanner;
+use OC\Files\Mount\Manager;
+use OC\Files\Mount\Mount;
+use OCP\Files\NotFoundException;
+use OCP\Files\NotPermittedException;
+use OC\Hooks\Emitter;
+use OC\Hooks\PublicEmitter;
+
+/**
+ * Class Root
+ *
+ * Hooks available in scope \OC\Files
+ * - preWrite(\OCP\Files\Node $node)
+ * - postWrite(\OCP\Files\Node $node)
+ * - preCreate(\OCP\Files\Node $node)
+ * - postCreate(\OCP\Files\Node $node)
+ * - preDelete(\OCP\Files\Node $node)
+ * - postDelete(\OCP\Files\Node $node)
+ * - preTouch(\OC\FilesP\Node $node, int $mtime)
+ * - postTouch(\OCP\Files\Node $node)
+ * - preCopy(\OCP\Files\Node $source, \OCP\Files\Node $target)
+ * - postCopy(\OCP\Files\Node $source, \OCP\Files\Node $target)
+ * - preRename(\OCP\Files\Node $source, \OCP\Files\Node $target)
+ * - postRename(\OCP\Files\Node $source, \OCP\Files\Node $target)
+ *
+ * @package OC\Files\Node
+ */
+class Root extends Folder implements Emitter {
+
+ /**
+ * @var \OC\Files\Mount\Manager $mountManager
+ */
+ private $mountManager;
+
+ /**
+ * @var \OC\Hooks\PublicEmitter
+ */
+ private $emitter;
+
+ /**
+ * @var \OC\User\User $user
+ */
+ private $user;
+
+ /**
+ * @param \OC\Files\Mount\Manager $manager
+ * @param \OC\Files\View $view
+ * @param \OC\User\User $user
+ */
+ public function __construct($manager, $view, $user) {
+ parent::__construct($this, $view, '');
+ $this->mountManager = $manager;
+ $this->user = $user;
+ $this->emitter = new PublicEmitter();
+ }
+
+ /**
+ * Get the user for which the filesystem is setup
+ *
+ * @return \OC\User\User
+ */
+ public function getUser() {
+ return $this->user;
+ }
+
+ /**
+ * @param string $scope
+ * @param string $method
+ * @param callable $callback
+ */
+ public function listen($scope, $method, $callback) {
+ $this->emitter->listen($scope, $method, $callback);
+ }
+
+ /**
+ * @param string $scope optional
+ * @param string $method optional
+ * @param callable $callback optional
+ */
+ public function removeListener($scope = null, $method = null, $callback = null) {
+ $this->emitter->removeListener($scope, $method, $callback);
+ }
+
+ /**
+ * @param string $scope
+ * @param string $method
+ * @param array $arguments
+ */
+ public function emit($scope, $method, $arguments = array()) {
+ $this->emitter->emit($scope, $method, $arguments);
+ }
+
+ /**
+ * @param \OC\Files\Storage\Storage $storage
+ * @param string $mountPoint
+ * @param array $arguments
+ */
+ public function mount($storage, $mountPoint, $arguments = array()) {
+ $mount = new Mount($storage, $mountPoint, $arguments);
+ $this->mountManager->addMount($mount);
+ }
+
+ /**
+ * @param string $mountPoint
+ * @return \OC\Files\Mount\Mount
+ */
+ public function getMount($mountPoint) {
+ return $this->mountManager->find($mountPoint);
+ }
+
+ /**
+ * @param string $mountPoint
+ * @return \OC\Files\Mount\Mount[]
+ */
+ public function getMountsIn($mountPoint) {
+ return $this->mountManager->findIn($mountPoint);
+ }
+
+ /**
+ * @param string $storageId
+ * @return \OC\Files\Mount\Mount[]
+ */
+ public function getMountByStorageId($storageId) {
+ return $this->mountManager->findByStorageId($storageId);
+ }
+
+ /**
+ * @param int $numericId
+ * @return Mount[]
+ */
+ public function getMountByNumericStorageId($numericId) {
+ return $this->mountManager->findByNumericId($numericId);
+ }
+
+ /**
+ * @param \OC\Files\Mount\Mount $mount
+ */
+ public function unMount($mount) {
+ $this->mountManager->remove($mount);
+ }
+
+ /**
+ * @param string $path
+ * @throws \OCP\Files\NotFoundException
+ * @throws \OCP\Files\NotPermittedException
+ * @return Node
+ */
+ public function get($path) {
+ $path = $this->normalizePath($path);
+ if ($this->isValidPath($path)) {
+ $fullPath = $this->getFullPath($path);
+ if ($this->view->file_exists($fullPath)) {
+ return $this->createNode($fullPath);
+ } else {
+ throw new NotFoundException();
+ }
+ } else {
+ throw new NotPermittedException();
+ }
+ }
+
+ /**
+ * search file by id
+ *
+ * An array is returned because in the case where a single storage is mounted in different places the same file
+ * can exist in different places
+ *
+ * @param int $id
+ * @throws \OCP\Files\NotFoundException
+ * @return Node[]
+ */
+ public function getById($id) {
+ $result = Cache::getById($id);
+ if (is_null($result)) {
+ throw new NotFoundException();
+ } else {
+ list($storageId, $internalPath) = $result;
+ $nodes = array();
+ $mounts = $this->mountManager->findByStorageId($storageId);
+ foreach ($mounts as $mount) {
+ $nodes[] = $this->get($mount->getMountPoint() . $internalPath);
+ }
+ return $nodes;
+ }
+
+ }
+
+ //most operations cant be done on the root
+
+ /**
+ * @param string $targetPath
+ * @throws \OCP\Files\NotPermittedException
+ * @return \OC\Files\Node\Node
+ */
+ public function rename($targetPath) {
+ throw new NotPermittedException();
+ }
+
+ public function delete() {
+ throw new NotPermittedException();
+ }
+
+ /**
+ * @param string $targetPath
+ * @throws \OCP\Files\NotPermittedException
+ * @return \OC\Files\Node\Node
+ */
+ public function copy($targetPath) {
+ throw new NotPermittedException();
+ }
+
+ /**
+ * @param int $mtime
+ * @throws \OCP\Files\NotPermittedException
+ */
+ public function touch($mtime = null) {
+ throw new NotPermittedException();
+ }
+
+ /**
+ * @return \OC\Files\Storage\Storage
+ * @throws \OCP\Files\NotFoundException
+ */
+ public function getStorage() {
+ throw new NotFoundException();
+ }
+
+ /**
+ * @return string
+ */
+ public function getPath() {
+ return '/';
+ }
+
+ /**
+ * @return string
+ */
+ public function getInternalPath() {
+ return '';
+ }
+
+ /**
+ * @return int
+ */
+ public function getId() {
+ return null;
+ }
+
+ /**
+ * @return array
+ */
+ public function stat() {
+ return null;
+ }
+
+ /**
+ * @return int
+ */
+ public function getMTime() {
+ return null;
+ }
+
+ /**
+ * @return int
+ */
+ public function getSize() {
+ return null;
+ }
+
+ /**
+ * @return string
+ */
+ public function getEtag() {
+ return null;
+ }
+
+ /**
+ * @return int
+ */
+ public function getPermissions() {
+ return \OCP\PERMISSION_CREATE;
+ }
+
+ /**
+ * @return bool
+ */
+ public function isReadable() {
+ return false;
+ }
+
+ /**
+ * @return bool
+ */
+ public function isUpdateable() {
+ return false;
+ }
+
+ /**
+ * @return bool
+ */
+ public function isDeletable() {
+ return false;
+ }
+
+ /**
+ * @return bool
+ */
+ public function isShareable() {
+ return false;
+ }
+
+ /**
+ * @return Node
+ * @throws \OCP\Files\NotFoundException
+ */
+ public function getParent() {
+ throw new NotFoundException();
+ }
+
+ /**
+ * @return string
+ */
+ public function getName() {
+ return '';
+ }
+}
diff --git a/lib/files/storage/common.php b/lib/files/storage/common.php
index 01560f34fdef0d30149399c86e9e08c061db0984..a5b79f0e96763df55e01cf3f70aa45ec56f39f4f 100644
--- a/lib/files/storage/common.php
+++ b/lib/files/storage/common.php
@@ -142,13 +142,15 @@ abstract class Common implements \OC\Files\Storage\Storage {
return false;
} else {
$directoryHandle = $this->opendir($directory);
- while (($contents = readdir($directoryHandle)) !== false) {
- if (!\OC\Files\Filesystem::isIgnoredDir($contents)) {
- $path = $directory . '/' . $contents;
- if ($this->is_dir($path)) {
- $this->deleteAll($path);
- } else {
- $this->unlink($path);
+ if(is_resource($directoryHandle)) {
+ while (($contents = readdir($directoryHandle)) !== false) {
+ if (!\OC\Files\Filesystem::isIgnoredDir($contents)) {
+ $path = $directory . '/' . $contents;
+ if ($this->is_dir($path)) {
+ $this->deleteAll($path);
+ } else {
+ $this->unlink($path);
+ }
}
}
}
@@ -224,7 +226,8 @@ abstract class Common implements \OC\Files\Storage\Storage {
}
private function addLocalFolder($path, $target) {
- if ($dh = $this->opendir($path)) {
+ $dh = $this->opendir($path);
+ if(is_resource($dh)) {
while (($file = readdir($dh)) !== false) {
if ($file !== '.' and $file !== '..') {
if ($this->is_dir($path . '/' . $file)) {
@@ -242,7 +245,7 @@ abstract class Common implements \OC\Files\Storage\Storage {
protected function searchInDir($query, $dir = '') {
$files = array();
$dh = $this->opendir($dir);
- if ($dh) {
+ if (is_resource($dh)) {
while (($item = readdir($dh)) !== false) {
if ($item == '.' || $item == '..') continue;
if (strstr(strtolower($item), strtolower($query)) !== false) {
diff --git a/lib/files/storage/mappedlocal.php b/lib/files/storage/mappedlocal.php
index fbf1b4ebf966b98af1bc67e79a926c5fb93e74a3..ba5ac4191c5b9b1fc595fb472c2c17125bd0a2d4 100644
--- a/lib/files/storage/mappedlocal.php
+++ b/lib/files/storage/mappedlocal.php
@@ -65,16 +65,18 @@ class MappedLocal extends \OC\Files\Storage\Common{
$logicalPath = $this->mapper->physicalToLogic($physicalPath);
$dh = opendir($physicalPath);
- while (($file = readdir($dh)) !== false) {
- if ($file === '.' or $file === '..') {
- continue;
- }
+ if(is_resource($dh)) {
+ while (($file = readdir($dh)) !== false) {
+ if ($file === '.' or $file === '..') {
+ continue;
+ }
- $logicalFilePath = $this->mapper->physicalToLogic($physicalPath.'/'.$file);
+ $logicalFilePath = $this->mapper->physicalToLogic($physicalPath.'/'.$file);
- $file= $this->mapper->stripRootFolder($logicalFilePath, $logicalPath);
- $file = $this->stripLeading($file);
- $files[]= $file;
+ $file= $this->mapper->stripRootFolder($logicalFilePath, $logicalPath);
+ $file = $this->stripLeading($file);
+ $files[]= $file;
+ }
}
\OC\Files\Stream\Dir::register('local-win32'.$path, $files);
diff --git a/lib/files/storage/storage.php b/lib/files/storage/storage.php
index c96caebf4af6307d22fc3ebb375f46e0792ae770..b673bb9a32d0dd5ff624cb87a7a83807cf7d700a 100644
--- a/lib/files/storage/storage.php
+++ b/lib/files/storage/storage.php
@@ -13,7 +13,7 @@ namespace OC\Files\Storage;
*
* All paths passed to the storage are relative to the storage and should NOT have a leading slash.
*/
-interface Storage {
+interface Storage extends \OCP\Files\Storage {
/**
* $parameters is a free form array with the configuration options needed to construct the storage
*
diff --git a/lib/files/utils/scanner.php b/lib/files/utils/scanner.php
index f0dc41ffad3fe040190338e83383e4d97f5707fa..2cad7dd77bd53caa21b567d907302f6960771fe2 100644
--- a/lib/files/utils/scanner.php
+++ b/lib/files/utils/scanner.php
@@ -72,6 +72,9 @@ class Scanner extends PublicEmitter {
public function backgroundScan($dir) {
$mounts = $this->getMounts($dir);
foreach ($mounts as $mount) {
+ if (is_null($mount->getStorage())) {
+ continue;
+ }
$scanner = $mount->getStorage()->getScanner();
$this->attachListener($mount);
$scanner->backgroundScan();
@@ -81,6 +84,9 @@ class Scanner extends PublicEmitter {
public function scan($dir) {
$mounts = $this->getMounts($dir);
foreach ($mounts as $mount) {
+ if (is_null($mount->getStorage())) {
+ continue;
+ }
$scanner = $mount->getStorage()->getScanner();
$this->attachListener($mount);
$scanner->scan('', \OC\Files\Cache\Scanner::SCAN_RECURSIVE, \OC\Files\Cache\Scanner::REUSE_ETAG);
diff --git a/lib/files/view.php b/lib/files/view.php
index bb737f19ef823695f8958492490ca2b50e092ba9..aa08a5f7cc9f2ad48ec756068283281850ff6d22 100644
--- a/lib/files/view.php
+++ b/lib/files/view.php
@@ -30,7 +30,7 @@ class View {
private $internal_path_cache = array();
private $storage_cache = array();
- public function __construct($root) {
+ public function __construct($root = '') {
$this->fakeRoot = $root;
}
@@ -249,6 +249,7 @@ class View {
$hooks = array('touch');
if (!$this->file_exists($path)) {
+ $hooks[] = 'create';
$hooks[] = 'write';
}
$result = $this->basicOperation('touch', $path, $hooks, $mtime);
@@ -267,18 +268,18 @@ class View {
$absolutePath = Filesystem::normalizePath($this->getAbsolutePath($path));
if (\OC_FileProxy::runPreProxies('file_put_contents', $absolutePath, $data)
and Filesystem::isValidPath($path)
- and !Filesystem::isFileBlacklisted($path)
+ and !Filesystem::isFileBlacklisted($path)
) {
$path = $this->getRelativePath($absolutePath);
$exists = $this->file_exists($path);
$run = true;
- if ($this->fakeRoot == Filesystem::getRoot() && !Cache\Scanner::isPartialFile($path)) {
+ if ($this->shouldEmitHooks($path)) {
if (!$exists) {
\OC_Hook::emit(
Filesystem::CLASSNAME,
Filesystem::signal_create,
array(
- Filesystem::signal_param_path => $path,
+ Filesystem::signal_param_path => $this->getHookPath($path),
Filesystem::signal_param_run => &$run
)
);
@@ -287,7 +288,7 @@ class View {
Filesystem::CLASSNAME,
Filesystem::signal_write,
array(
- Filesystem::signal_param_path => $path,
+ Filesystem::signal_param_path => $this->getHookPath($path),
Filesystem::signal_param_run => &$run
)
);
@@ -300,18 +301,18 @@ class View {
list ($count, $result) = \OC_Helper::streamCopy($data, $target);
fclose($target);
fclose($data);
- if ($this->fakeRoot == Filesystem::getRoot() && !Cache\Scanner::isPartialFile($path) && $result !== false) {
+ if ($this->shouldEmitHooks($path) && $result !== false) {
if (!$exists) {
\OC_Hook::emit(
Filesystem::CLASSNAME,
Filesystem::signal_post_create,
- array(Filesystem::signal_param_path => $path)
+ array(Filesystem::signal_param_path => $this->getHookPath($path))
);
}
\OC_Hook::emit(
Filesystem::CLASSNAME,
Filesystem::signal_post_write,
- array(Filesystem::signal_param_path => $path)
+ array(Filesystem::signal_param_path => $this->getHookPath($path))
);
}
\OC_FileProxy::runPostProxies('file_put_contents', $absolutePath, $count);
@@ -332,7 +333,7 @@ class View {
}
public function deleteAll($directory, $empty = false) {
- return $this->basicOperation('deleteAll', $directory, array('delete'), $empty);
+ return $this->rmdir($directory);
}
public function rename($path1, $path2) {
@@ -353,21 +354,21 @@ class View {
return false;
}
$run = true;
- if ($this->fakeRoot == Filesystem::getRoot() && (Cache\Scanner::isPartialFile($path1) && !Cache\Scanner::isPartialFile($path2))) {
+ if ($this->shouldEmitHooks() && (Cache\Scanner::isPartialFile($path1) && !Cache\Scanner::isPartialFile($path2))) {
// if it was a rename from a part file to a regular file it was a write and not a rename operation
\OC_Hook::emit(
Filesystem::CLASSNAME, Filesystem::signal_write,
array(
- Filesystem::signal_param_path => $path2,
+ Filesystem::signal_param_path => $this->getHookPath($path2),
Filesystem::signal_param_run => &$run
)
);
- } elseif ($this->fakeRoot == Filesystem::getRoot()) {
+ } elseif ($this->shouldEmitHooks()) {
\OC_Hook::emit(
Filesystem::CLASSNAME, Filesystem::signal_rename,
array(
- Filesystem::signal_param_oldpath => $path1,
- Filesystem::signal_param_newpath => $path2,
+ Filesystem::signal_param_oldpath => $this->getHookPath($path1),
+ Filesystem::signal_param_newpath => $this->getHookPath($path2),
Filesystem::signal_param_run => &$run
)
);
@@ -407,22 +408,22 @@ class View {
}
}
}
- if ($this->fakeRoot == Filesystem::getRoot() && (Cache\Scanner::isPartialFile($path1) && !Cache\Scanner::isPartialFile($path2)) && $result !== false) {
+ if ($this->shouldEmitHooks() && (Cache\Scanner::isPartialFile($path1) && !Cache\Scanner::isPartialFile($path2)) && $result !== false) {
// if it was a rename from a part file to a regular file it was a write and not a rename operation
\OC_Hook::emit(
Filesystem::CLASSNAME,
Filesystem::signal_post_write,
array(
- Filesystem::signal_param_path => $path2,
+ Filesystem::signal_param_path => $this->getHookPath($path2),
)
);
- } elseif ($this->fakeRoot == Filesystem::getRoot() && $result !== false) {
+ } elseif ($this->shouldEmitHooks() && $result !== false) {
\OC_Hook::emit(
Filesystem::CLASSNAME,
Filesystem::signal_post_rename,
array(
- Filesystem::signal_param_oldpath => $path1,
- Filesystem::signal_param_newpath => $path2
+ Filesystem::signal_param_oldpath => $this->getHookPath($path1),
+ Filesystem::signal_param_newpath => $this->getHookPath($path2)
)
);
}
@@ -454,13 +455,13 @@ class View {
}
$run = true;
$exists = $this->file_exists($path2);
- if ($this->fakeRoot == Filesystem::getRoot()) {
+ if ($this->shouldEmitHooks()) {
\OC_Hook::emit(
Filesystem::CLASSNAME,
Filesystem::signal_copy,
array(
- Filesystem::signal_param_oldpath => $path1,
- Filesystem::signal_param_newpath => $path2,
+ Filesystem::signal_param_oldpath => $this->getHookPath($path1),
+ Filesystem::signal_param_newpath => $this->getHookPath($path2),
Filesystem::signal_param_run => &$run
)
);
@@ -469,7 +470,7 @@ class View {
Filesystem::CLASSNAME,
Filesystem::signal_create,
array(
- Filesystem::signal_param_path => $path2,
+ Filesystem::signal_param_path => $this->getHookPath($path2),
Filesystem::signal_param_run => &$run
)
);
@@ -479,7 +480,7 @@ class View {
Filesystem::CLASSNAME,
Filesystem::signal_write,
array(
- Filesystem::signal_param_path => $path2,
+ Filesystem::signal_param_path => $this->getHookPath($path2),
Filesystem::signal_param_run => &$run
)
);
@@ -499,9 +500,11 @@ class View {
} else {
if ($this->is_dir($path1) && ($dh = $this->opendir($path1))) {
$result = $this->mkdir($path2);
- while (($file = readdir($dh)) !== false) {
- if (!Filesystem::isIgnoredDir($file)) {
- $result = $this->copy($path1 . '/' . $file, $path2 . '/' . $file);
+ if (is_resource($dh)) {
+ while (($file = readdir($dh)) !== false) {
+ if (!Filesystem::isIgnoredDir($file)) {
+ $result = $this->copy($path1 . '/' . $file, $path2 . '/' . $file);
+ }
}
}
} else {
@@ -510,26 +513,26 @@ class View {
list($count, $result) = \OC_Helper::streamCopy($source, $target);
}
}
- if ($this->fakeRoot == Filesystem::getRoot() && $result !== false) {
+ if ($this->shouldEmitHooks() && $result !== false) {
\OC_Hook::emit(
Filesystem::CLASSNAME,
Filesystem::signal_post_copy,
array(
- Filesystem::signal_param_oldpath => $path1,
- Filesystem::signal_param_newpath => $path2
+ Filesystem::signal_param_oldpath => $this->getHookPath($path1),
+ Filesystem::signal_param_newpath => $this->getHookPath($path2)
)
);
if (!$exists) {
\OC_Hook::emit(
Filesystem::CLASSNAME,
Filesystem::signal_post_create,
- array(Filesystem::signal_param_path => $path2)
+ array(Filesystem::signal_param_path => $this->getHookPath($path2))
);
}
\OC_Hook::emit(
Filesystem::CLASSNAME,
Filesystem::signal_post_write,
- array(Filesystem::signal_param_path => $path2)
+ array(Filesystem::signal_param_path => $this->getHookPath($path2))
);
}
return $result;
@@ -620,11 +623,11 @@ class View {
if ($path == null) {
return false;
}
- if (Filesystem::$loaded && $this->fakeRoot == Filesystem::getRoot()) {
+ if ($this->shouldEmitHooks($path)) {
\OC_Hook::emit(
Filesystem::CLASSNAME,
Filesystem::signal_read,
- array(Filesystem::signal_param_path => $path)
+ array(Filesystem::signal_param_path => $this->getHookPath($path))
);
}
list($storage, $internalPath) = Filesystem::resolvePath($absolutePath . $postFix);
@@ -658,7 +661,7 @@ class View {
$absolutePath = Filesystem::normalizePath($this->getAbsolutePath($path));
if (\OC_FileProxy::runPreProxies($operation, $absolutePath, $extraParam)
and Filesystem::isValidPath($path)
- and !Filesystem::isFileBlacklisted($path)
+ and !Filesystem::isFileBlacklisted($path)
) {
$path = $this->getRelativePath($absolutePath);
if ($path == null) {
@@ -674,7 +677,7 @@ class View {
$result = $storage->$operation($internalPath);
}
$result = \OC_FileProxy::runPostProxies($operation, $this->getAbsolutePath($path), $result);
- if (Filesystem::$loaded and $this->fakeRoot == Filesystem::getRoot() && $result !== false) {
+ if ($this->shouldEmitHooks($path) && $result !== false) {
if ($operation != 'fopen') { //no post hooks for fopen, the file stream is still open
$this->runHooks($hooks, $path, true);
}
@@ -685,10 +688,35 @@ class View {
return null;
}
+ /**
+ * get the path relative to the default root for hook usage
+ *
+ * @param string $path
+ * @return string
+ */
+ private function getHookPath($path) {
+ if (!Filesystem::getView()) {
+ return $path;
+ }
+ return Filesystem::getView()->getRelativePath($this->getAbsolutePath($path));
+ }
+
+ private function shouldEmitHooks($path = '') {
+ if ($path && Cache\Scanner::isPartialFile($path)) {
+ return false;
+ }
+ if (!Filesystem::$loaded) {
+ return false;
+ }
+ $defaultRoot = Filesystem::getRoot();
+ return (strlen($this->fakeRoot) >= strlen($defaultRoot)) && (substr($this->fakeRoot, 0, strlen($defaultRoot)) === $defaultRoot);
+ }
+
private function runHooks($hooks, $path, $post = false) {
+ $path = $this->getHookPath($path);
$prefix = ($post) ? 'post_' : '';
$run = true;
- if (Filesystem::$loaded and $this->fakeRoot == Filesystem::getRoot() && !Cache\Scanner::isPartialFile($path)) {
+ if ($this->shouldEmitHooks($path)) {
foreach ($hooks as $hook) {
if ($hook != 'read') {
\OC_Hook::emit(
@@ -947,7 +975,7 @@ class View {
/**
* search for files by mimetype
*
- * @param string $query
+ * @param string $mimetype
* @return array
*/
public function searchByMime($mimetype) {
@@ -970,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;
}
@@ -984,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/helper.php b/lib/helper.php
index dd2476eda5cf87c6e76c20b71c49421cf0372842..66e7acb407a7d69d7f7c17353f911c9af1e1b9d5 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -185,7 +185,38 @@ class OC_Helper {
* Returns the path to the image of this file type.
*/
public static function mimetypeIcon($mimetype) {
- $alias = array('application/xml' => 'code/xml');
+ $alias = array(
+ 'application/xml' => 'code/xml',
+ 'application/msword' => 'x-office/document',
+ 'application/vnd.openxmlformats-officedocument.wordprocessingml.document' => 'x-office/document',
+ 'application/vnd.openxmlformats-officedocument.wordprocessingml.template' => 'x-office/document',
+ 'application/vnd.ms-word.document.macroEnabled.12' => 'x-office/document',
+ 'application/vnd.ms-word.template.macroEnabled.12' => 'x-office/document',
+ 'application/vnd.oasis.opendocument.text' => 'x-office/document',
+ 'application/vnd.oasis.opendocument.text-template' => 'x-office/document',
+ 'application/vnd.oasis.opendocument.text-web' => 'x-office/document',
+ 'application/vnd.oasis.opendocument.text-master' => 'x-office/document',
+ 'application/vnd.ms-powerpoint' => 'x-office/presentation',
+ 'application/vnd.openxmlformats-officedocument.presentationml.presentation' => 'x-office/presentation',
+ 'application/vnd.openxmlformats-officedocument.presentationml.template' => 'x-office/presentation',
+ 'application/vnd.openxmlformats-officedocument.presentationml.slideshow' => 'x-office/presentation',
+ 'application/vnd.ms-powerpoint.addin.macroEnabled.12' => 'x-office/presentation',
+ 'application/vnd.ms-powerpoint.presentation.macroEnabled.12' => 'x-office/presentation',
+ 'application/vnd.ms-powerpoint.template.macroEnabled.12' => 'x-office/presentation',
+ 'application/vnd.ms-powerpoint.slideshow.macroEnabled.12' => 'x-office/presentation',
+ 'application/vnd.oasis.opendocument.presentation' => 'x-office/presentation',
+ 'application/vnd.oasis.opendocument.presentation-template' => 'x-office/presentation',
+ 'application/vnd.ms-excel' => 'x-office/spreadsheet',
+ 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' => 'x-office/spreadsheet',
+ 'application/vnd.openxmlformats-officedocument.spreadsheetml.template' => 'x-office/spreadsheet',
+ 'application/vnd.ms-excel.sheet.macroEnabled.12' => 'x-office/spreadsheet',
+ 'application/vnd.ms-excel.template.macroEnabled.12' => 'x-office/spreadsheet',
+ 'application/vnd.ms-excel.addin.macroEnabled.12' => 'x-office/spreadsheet',
+ 'application/vnd.ms-excel.sheet.binary.macroEnabled.12' => 'x-office/spreadsheet',
+ 'application/vnd.oasis.opendocument.spreadsheet' => 'x-office/spreadsheet',
+ 'application/vnd.oasis.opendocument.spreadsheet-template' => 'x-office/spreadsheet',
+ );
+
if (isset($alias[$mimetype])) {
$mimetype = $alias[$mimetype];
}
@@ -201,6 +232,14 @@ class OC_Helper {
self::$mimetypeIcons[$mimetype] = OC::$WEBROOT . '/core/img/filetypes/folder.png';
return OC::$WEBROOT . '/core/img/filetypes/folder.png';
}
+ if ($mimetype === 'dir-shared') {
+ self::$mimetypeIcons[$mimetype] = OC::$WEBROOT . '/core/img/filetypes/folder-shared.png';
+ return OC::$WEBROOT . '/core/img/filetypes/folder-shared.png';
+ }
+ if ($mimetype === 'dir-external') {
+ self::$mimetypeIcons[$mimetype] = OC::$WEBROOT . '/core/img/filetypes/folder-external.png';
+ return OC::$WEBROOT . '/core/img/filetypes/folder-external.png';
+ }
// Icon exists?
if (file_exists(OC::$SERVERROOT . '/core/img/filetypes/' . $icon . '.png')) {
@@ -219,6 +258,21 @@ class OC_Helper {
}
}
+ /**
+ * @brief get path to preview of file
+ * @param string $path path
+ * @return string the url
+ *
+ * Returns the path to the preview of the file.
+ */
+ public static function previewIcon($path) {
+ return self::linkToRoute( 'core_ajax_preview', array('x' => 36, 'y' => 36, 'file' => urlencode($path) ));
+ }
+
+ public static function publicPreviewIcon( $path, $token ) {
+ return self::linkToRoute( 'core_ajax_public_preview', array('x' => 36, 'y' => 36, 'file' => urlencode($path), 't' => $token));
+ }
+
/**
* @brief Make a human file size
* @param int $bytes file size in bytes
@@ -228,7 +282,6 @@ class OC_Helper {
*/
public static function humanFileSize($bytes) {
if ($bytes < 0) {
- $l = OC_L10N::get('lib');
return "?";
}
if ($bytes < 1024) {
@@ -242,10 +295,17 @@ class OC_Helper {
if ($bytes < 1024) {
return "$bytes MB";
}
+ $bytes = round($bytes / 1024, 1);
+ if ($bytes < 1024) {
+ return "$bytes GB";
+ }
+ $bytes = round($bytes / 1024, 1);
+ if ($bytes < 1024) {
+ return "$bytes TB";
+ }
- // Wow, heavy duty for owncloud
$bytes = round($bytes / 1024, 1);
- return "$bytes GB";
+ return "$bytes PB";
}
/**
@@ -295,17 +355,19 @@ class OC_Helper {
if (!is_dir($path))
return chmod($path, $filemode);
$dh = opendir($path);
- while (($file = readdir($dh)) !== false) {
- if ($file != '.' && $file != '..') {
- $fullpath = $path . '/' . $file;
- if (is_link($fullpath))
- return false;
- elseif (!is_dir($fullpath) && !@chmod($fullpath, $filemode))
- return false; elseif (!self::chmodr($fullpath, $filemode))
- return false;
+ if(is_resource($dh)) {
+ while (($file = readdir($dh)) !== false) {
+ if ($file != '.' && $file != '..') {
+ $fullpath = $path . '/' . $file;
+ if (is_link($fullpath))
+ return false;
+ elseif (!is_dir($fullpath) && !@chmod($fullpath, $filemode))
+ return false; elseif (!self::chmodr($fullpath, $filemode))
+ return false;
+ }
}
+ closedir($dh);
}
- closedir($dh);
if (@chmod($path, $filemode))
return true;
else
@@ -603,9 +665,11 @@ class OC_Helper {
// if oc-noclean is empty delete it
$isTmpDirNoCleanEmpty = true;
$tmpDirNoClean = opendir($tmpDirNoCleanName);
- while (false !== ($file = readdir($tmpDirNoClean))) {
- if (!\OC\Files\Filesystem::isIgnoredDir($file)) {
- $isTmpDirNoCleanEmpty = false;
+ if(is_resource($tmpDirNoClean)) {
+ while (false !== ($file = readdir($tmpDirNoClean))) {
+ if (!\OC\Files\Filesystem::isIgnoredDir($file)) {
+ $isTmpDirNoCleanEmpty = false;
+ }
}
}
if ($isTmpDirNoCleanEmpty) {
@@ -648,7 +712,7 @@ class OC_Helper {
$newpath = $path . '/' . $filename;
if ($view->file_exists($newpath)) {
if (preg_match_all('/\((\d+)\)/', $name, $matches, PREG_OFFSET_CAPTURE)) {
- //Replace the last "(number)" with "(number+1)"
+ //Replace the last "(number)" with "(number+1)"
$last_match = count($matches[0]) - 1;
$counter = $matches[1][$last_match][0] + 1;
$offset = $matches[0][$last_match][1];
@@ -659,7 +723,7 @@ class OC_Helper {
}
do {
if ($offset) {
- //Replace the last "(number)" with "(number+1)"
+ //Replace the last "(number)" with "(number+1)"
$newname = substr_replace($name, '(' . $counter . ')', $offset, $match_length);
} else {
$newname = $name . ' (' . $counter . ')';
@@ -858,10 +922,8 @@ class OC_Helper {
} else {
$total = $free; //either unknown or unlimited
}
- if ($total == 0) {
- $total = 1; // prevent division by zero
- }
- if ($total >= 0) {
+ if ($total > 0) {
+ // prevent division by zero or error codes (negative values)
$relative = round(($used / $total) * 10000) / 100;
} else {
$relative = 0;
diff --git a/lib/image.php b/lib/image.php
index 4bc38e20e56898f751d9463e13072653dd9aa767..7761a3c7737f3f80722c8f8cb62b0720d4b9c235 100644
--- a/lib/image.php
+++ b/lib/image.php
@@ -25,24 +25,27 @@
*/
class OC_Image {
protected $resource = false; // tmp resource.
- protected $imagetype = IMAGETYPE_PNG; // Default to png if file type isn't evident.
- protected $bit_depth = 24;
- protected $filepath = null;
+ protected $imageType = IMAGETYPE_PNG; // Default to png if file type isn't evident.
+ protected $mimeType = "image/png"; // Default to png
+ protected $bitDepth = 24;
+ protected $filePath = null;
+
+ private $fileInfo;
/**
* @brief Get mime type for an image file.
* @param $filepath The path to a local image file.
* @returns string The mime type if the it could be determined, otherwise an empty string.
*/
- static public function getMimeTypeForFile($filepath) {
+ static public function getMimeTypeForFile($filePath) {
// exif_imagetype throws "read error!" if file is less than 12 byte
- if (filesize($filepath) > 11) {
- $imagetype = exif_imagetype($filepath);
+ if (filesize($filePath) > 11) {
+ $imageType = exif_imagetype($filePath);
}
else {
- $imagetype = false;
+ $imageType = false;
}
- return $imagetype ? image_type_to_mime_type($imagetype) : '';
+ return $imageType ? image_type_to_mime_type($imageType) : '';
}
/**
@@ -50,14 +53,19 @@ class OC_Image {
* @param $imageref The path to a local file, a base64 encoded string or a resource created by an imagecreate* function.
* @returns bool False on error
*/
- public function __construct($imageref = null) {
+ public function __construct($imageRef = null) {
//OC_Log::write('core',__METHOD__.'(): start', OC_Log::DEBUG);
if(!extension_loaded('gd') || !function_exists('gd_info')) {
OC_Log::write('core', __METHOD__.'(): GD module not installed', OC_Log::ERROR);
return false;
}
- if(!is_null($imageref)) {
- $this->load($imageref);
+
+ if (\OC_Util::fileInfoLoaded()) {
+ $this->fileInfo = new finfo(FILEINFO_MIME_TYPE);
+ }
+
+ if(!is_null($imageRef)) {
+ $this->load($imageRef);
}
}
@@ -74,7 +82,7 @@ class OC_Image {
* @returns int
*/
public function mimeType() {
- return $this->valid() ? image_type_to_mime_type($this->imagetype) : '';
+ return $this->valid() ? $this->mimeType : '';
}
/**
@@ -157,30 +165,30 @@ class OC_Image {
* @returns bool
*/
- public function save($filepath=null) {
- if($filepath === null && $this->filepath === null) {
+ public function save($filePath=null) {
+ if($filePath === null && $this->filePath === null) {
OC_Log::write('core', __METHOD__.'(): called with no path.', OC_Log::ERROR);
return false;
- } elseif($filepath === null && $this->filepath !== null) {
- $filepath = $this->filepath;
+ } elseif($filePath === null && $this->filePath !== null) {
+ $filePath = $this->filePath;
}
- return $this->_output($filepath);
+ return $this->_output($filePath);
}
/**
* @brief Outputs/saves the image.
*/
- private function _output($filepath=null) {
- if($filepath) {
- if (!file_exists(dirname($filepath)))
- mkdir(dirname($filepath), 0777, true);
- if(!is_writable(dirname($filepath))) {
+ private function _output($filePath=null) {
+ if($filePath) {
+ if (!file_exists(dirname($filePath)))
+ mkdir(dirname($filePath), 0777, true);
+ if(!is_writable(dirname($filePath))) {
OC_Log::write('core',
- __METHOD__.'(): Directory \''.dirname($filepath).'\' is not writable.',
+ __METHOD__.'(): Directory \''.dirname($filePath).'\' is not writable.',
OC_Log::ERROR);
return false;
- } elseif(is_writable(dirname($filepath)) && file_exists($filepath) && !is_writable($filepath)) {
- OC_Log::write('core', __METHOD__.'(): File \''.$filepath.'\' is not writable.', OC_Log::ERROR);
+ } elseif(is_writable(dirname($filePath)) && file_exists($filePath) && !is_writable($filePath)) {
+ OC_Log::write('core', __METHOD__.'(): File \''.$filePath.'\' is not writable.', OC_Log::ERROR);
return false;
}
}
@@ -188,30 +196,30 @@ class OC_Image {
return false;
}
- $retval = false;
- switch($this->imagetype) {
+ $retVal = false;
+ switch($this->imageType) {
case IMAGETYPE_GIF:
- $retval = imagegif($this->resource, $filepath);
+ $retVal = imagegif($this->resource, $filePath);
break;
case IMAGETYPE_JPEG:
- $retval = imagejpeg($this->resource, $filepath);
+ $retVal = imagejpeg($this->resource, $filePath);
break;
case IMAGETYPE_PNG:
- $retval = imagepng($this->resource, $filepath);
+ $retVal = imagepng($this->resource, $filePath);
break;
case IMAGETYPE_XBM:
- $retval = imagexbm($this->resource, $filepath);
+ $retVal = imagexbm($this->resource, $filePath);
break;
case IMAGETYPE_WBMP:
- $retval = imagewbmp($this->resource, $filepath);
+ $retVal = imagewbmp($this->resource, $filePath);
break;
case IMAGETYPE_BMP:
- $retval = imagebmp($this->resource, $filepath, $this->bit_depth);
+ $retVal = imagebmp($this->resource, $filePath, $this->bitDepth);
break;
default:
- $retval = imagepng($this->resource, $filepath);
+ $retVal = imagepng($this->resource, $filePath);
}
- return $retval;
+ return $retVal;
}
/**
@@ -233,7 +241,21 @@ class OC_Image {
*/
function data() {
ob_start();
- $res = imagepng($this->resource);
+ switch ($this->mimeType) {
+ case "image/png":
+ $res = imagepng($this->resource);
+ break;
+ case "image/jpeg":
+ $res = imagejpeg($this->resource);
+ break;
+ case "image/gif":
+ $res = imagegif($this->resource);
+ break;
+ default:
+ $res = imagepng($this->resource);
+ OC_Log::write('core', 'OC_Image->data. Couldn\'t guess mimetype, defaulting to png', OC_Log::INFO);
+ break;
+ }
if (!$res) {
OC_Log::write('core', 'OC_Image->data. Error getting image data.', OC_Log::ERROR);
}
@@ -261,11 +283,11 @@ class OC_Image {
OC_Log::write('core', 'OC_Image->fixOrientation() No image loaded.', OC_Log::DEBUG);
return -1;
}
- if(is_null($this->filepath) || !is_readable($this->filepath)) {
+ if(is_null($this->filePath) || !is_readable($this->filePath)) {
OC_Log::write('core', 'OC_Image->fixOrientation() No readable file path set.', OC_Log::DEBUG);
return -1;
}
- $exif = @exif_read_data($this->filepath, 'IFD0');
+ $exif = @exif_read_data($this->filePath, 'IFD0');
if(!$exif) {
return -1;
}
@@ -351,19 +373,19 @@ class OC_Image {
* @param $imageref The path to a local file, a base64 encoded string or a resource created by an imagecreate* function or a file resource (file handle ).
* @returns An image resource or false on error
*/
- public function load($imageref) {
- if(is_resource($imageref)) {
- if(get_resource_type($imageref) == 'gd') {
- $this->resource = $imageref;
+ public function load($imageRef) {
+ if(is_resource($imageRef)) {
+ if(get_resource_type($imageRef) == 'gd') {
+ $this->resource = $imageRef;
return $this->resource;
- } elseif(in_array(get_resource_type($imageref), array('file', 'stream'))) {
- return $this->loadFromFileHandle($imageref);
+ } elseif(in_array(get_resource_type($imageRef), array('file', 'stream'))) {
+ return $this->loadFromFileHandle($imageRef);
}
- } elseif($this->loadFromFile($imageref) !== false) {
+ } elseif($this->loadFromFile($imageRef) !== false) {
return $this->resource;
- } elseif($this->loadFromBase64($imageref) !== false) {
+ } elseif($this->loadFromBase64($imageRef) !== false) {
return $this->resource;
- } elseif($this->loadFromData($imageref) !== false) {
+ } elseif($this->loadFromData($imageRef) !== false) {
return $this->resource;
} else {
OC_Log::write('core', __METHOD__.'(): couldn\'t load anything. Giving up!', OC_Log::DEBUG);
@@ -390,62 +412,62 @@ class OC_Image {
* @param $imageref The path to a local file.
* @returns An image resource or false on error
*/
- public function loadFromFile($imagepath=false) {
+ public function loadFromFile($imagePath=false) {
// exif_imagetype throws "read error!" if file is less than 12 byte
- if(!@is_file($imagepath) || !file_exists($imagepath) || filesize($imagepath) < 12 || !is_readable($imagepath)) {
+ if(!@is_file($imagePath) || !file_exists($imagePath) || filesize($imagePath) < 12 || !is_readable($imagePath)) {
// Debug output disabled because this method is tried before loadFromBase64?
- OC_Log::write('core', 'OC_Image->loadFromFile, couldn\'t load: '.$imagepath, OC_Log::DEBUG);
+ OC_Log::write('core', 'OC_Image->loadFromFile, couldn\'t load: '.$imagePath, OC_Log::DEBUG);
return false;
}
- $itype = exif_imagetype($imagepath);
- switch($itype) {
+ $iType = exif_imagetype($imagePath);
+ switch ($iType) {
case IMAGETYPE_GIF:
if (imagetypes() & IMG_GIF) {
- $this->resource = imagecreatefromgif($imagepath);
+ $this->resource = imagecreatefromgif($imagePath);
} else {
OC_Log::write('core',
- 'OC_Image->loadFromFile, GIF images not supported: '.$imagepath,
+ 'OC_Image->loadFromFile, GIF images not supported: '.$imagePath,
OC_Log::DEBUG);
}
break;
case IMAGETYPE_JPEG:
if (imagetypes() & IMG_JPG) {
- $this->resource = imagecreatefromjpeg($imagepath);
+ $this->resource = imagecreatefromjpeg($imagePath);
} else {
OC_Log::write('core',
- 'OC_Image->loadFromFile, JPG images not supported: '.$imagepath,
+ 'OC_Image->loadFromFile, JPG images not supported: '.$imagePath,
OC_Log::DEBUG);
}
break;
case IMAGETYPE_PNG:
if (imagetypes() & IMG_PNG) {
- $this->resource = imagecreatefrompng($imagepath);
+ $this->resource = imagecreatefrompng($imagePath);
} else {
OC_Log::write('core',
- 'OC_Image->loadFromFile, PNG images not supported: '.$imagepath,
+ 'OC_Image->loadFromFile, PNG images not supported: '.$imagePath,
OC_Log::DEBUG);
}
break;
case IMAGETYPE_XBM:
if (imagetypes() & IMG_XPM) {
- $this->resource = imagecreatefromxbm($imagepath);
+ $this->resource = imagecreatefromxbm($imagePath);
} else {
OC_Log::write('core',
- 'OC_Image->loadFromFile, XBM/XPM images not supported: '.$imagepath,
+ 'OC_Image->loadFromFile, XBM/XPM images not supported: '.$imagePath,
OC_Log::DEBUG);
}
break;
case IMAGETYPE_WBMP:
if (imagetypes() & IMG_WBMP) {
- $this->resource = imagecreatefromwbmp($imagepath);
+ $this->resource = imagecreatefromwbmp($imagePath);
} else {
OC_Log::write('core',
- 'OC_Image->loadFromFile, WBMP images not supported: '.$imagepath,
+ 'OC_Image->loadFromFile, WBMP images not supported: '.$imagePath,
OC_Log::DEBUG);
}
break;
case IMAGETYPE_BMP:
- $this->resource = $this->imagecreatefrombmp($imagepath);
+ $this->resource = $this->imagecreatefrombmp($imagePath);
break;
/*
case IMAGETYPE_TIFF_II: // (intel byte order)
@@ -474,14 +496,15 @@ class OC_Image {
default:
// this is mostly file created from encrypted file
- $this->resource = imagecreatefromstring(\OC\Files\Filesystem::file_get_contents(\OC\Files\Filesystem::getLocalPath($imagepath)));
- $itype = IMAGETYPE_PNG;
+ $this->resource = imagecreatefromstring(\OC\Files\Filesystem::file_get_contents(\OC\Files\Filesystem::getLocalPath($imagePath)));
+ $iType = IMAGETYPE_PNG;
OC_Log::write('core', 'OC_Image->loadFromFile, Default', OC_Log::DEBUG);
break;
}
if($this->valid()) {
- $this->imagetype = $itype;
- $this->filepath = $imagepath;
+ $this->imageType = $iType;
+ $this->mimeType = image_type_to_mime_type($iType);
+ $this->filePath = $imagePath;
}
return $this->resource;
}
@@ -496,6 +519,14 @@ class OC_Image {
return false;
}
$this->resource = @imagecreatefromstring($str);
+ if ($this->fileInfo) {
+ $this->mimeType = $this->fileInfo->buffer($str);
+ }
+ if(is_resource($this->resource)) {
+ imagealphablending($this->resource, false);
+ imagesavealpha($this->resource, true);
+ }
+
if(!$this->resource) {
OC_Log::write('core', 'OC_Image->loadFromData, couldn\'t load', OC_Log::DEBUG);
return false;
@@ -515,6 +546,9 @@ class OC_Image {
$data = base64_decode($str);
if($data) { // try to load from string data
$this->resource = @imagecreatefromstring($data);
+ if ($this->fileInfo) {
+ $this->mimeType = $this->fileInfo->buffer($data);
+ }
if(!$this->resource) {
OC_Log::write('core', 'OC_Image->loadFromBase64, couldn\'t load', OC_Log::DEBUG);
return false;
@@ -534,16 +568,16 @@ class OC_Image {
* </p>
* @return resource an image resource identifier on success, <b>FALSE</b> on errors.
*/
- private function imagecreatefrombmp($filename) {
- if (!($fh = fopen($filename, 'rb'))) {
- trigger_error('imagecreatefrombmp: Can not open ' . $filename, E_USER_WARNING);
+ private function imagecreatefrombmp($fileName) {
+ if (!($fh = fopen($fileName, 'rb'))) {
+ trigger_error('imagecreatefrombmp: Can not open ' . $fileName, E_USER_WARNING);
return false;
}
// read file header
$meta = unpack('vtype/Vfilesize/Vreserved/Voffset', fread($fh, 14));
// check for bitmap
if ($meta['type'] != 19778) {
- trigger_error('imagecreatefrombmp: ' . $filename . ' is not a bitmap!', E_USER_WARNING);
+ trigger_error('imagecreatefrombmp: ' . $fileName . ' is not a bitmap!', E_USER_WARNING);
return false;
}
// read image header
@@ -554,7 +588,7 @@ class OC_Image {
}
// set bytes and padding
$meta['bytes'] = $meta['bits'] / 8;
- $this->bit_depth = $meta['bits']; //remember the bit depth for the imagebmp call
+ $this->bitDepth = $meta['bits']; //remember the bit depth for the imagebmp call
$meta['decal'] = 4 - (4 * (($meta['width'] * $meta['bytes'] / 4)- floor($meta['width'] * $meta['bytes'] / 4)));
if ($meta['decal'] == 4) {
$meta['decal'] = 0;
@@ -590,7 +624,7 @@ class OC_Image {
$p = 0;
$vide = chr(0);
$y = $meta['height'] - 1;
- $error = 'imagecreatefrombmp: ' . $filename . ' has not enough data!';
+ $error = 'imagecreatefrombmp: ' . $fileName . ' has not enough data!';
// loop through the image data beginning with the lower left corner
while ($y >= 0) {
$x = 0;
@@ -653,7 +687,7 @@ class OC_Image {
break;
default:
trigger_error('imagecreatefrombmp: '
- . $filename . ' has ' . $meta['bits'] . ' bits and this is not supported!',
+ . $fileName . ' has ' . $meta['bits'] . ' bits and this is not supported!',
E_USER_WARNING);
return false;
}
@@ -673,24 +707,24 @@ class OC_Image {
* @param $maxsize The maximum size of either the width or height.
* @returns bool
*/
- public function resize($maxsize) {
+ public function resize($maxSize) {
if(!$this->valid()) {
OC_Log::write('core', __METHOD__.'(): No image loaded', OC_Log::ERROR);
return false;
}
- $width_orig=imageSX($this->resource);
- $height_orig=imageSY($this->resource);
- $ratio_orig = $width_orig/$height_orig;
+ $widthOrig=imageSX($this->resource);
+ $heightOrig=imageSY($this->resource);
+ $ratioOrig = $widthOrig/$heightOrig;
- if ($ratio_orig > 1) {
- $new_height = round($maxsize/$ratio_orig);
- $new_width = $maxsize;
+ if ($ratioOrig > 1) {
+ $newHeight = round($maxSize/$ratioOrig);
+ $newWidth = $maxSize;
} else {
- $new_width = round($maxsize*$ratio_orig);
- $new_height = $maxsize;
+ $newWidth = round($maxSize*$ratioOrig);
+ $newHeight = $maxSize;
}
- $this->preciseResize(round($new_width), round($new_height));
+ $this->preciseResize(round($newWidth), round($newHeight));
return true;
}
@@ -699,8 +733,8 @@ class OC_Image {
OC_Log::write('core', __METHOD__.'(): No image loaded', OC_Log::ERROR);
return false;
}
- $width_orig=imageSX($this->resource);
- $height_orig=imageSY($this->resource);
+ $widthOrig=imageSX($this->resource);
+ $heightOrig=imageSY($this->resource);
$process = imagecreatetruecolor($width, $height);
if ($process == false) {
@@ -710,13 +744,13 @@ class OC_Image {
}
// preserve transparency
- if($this->imagetype == IMAGETYPE_GIF or $this->imagetype == IMAGETYPE_PNG) {
+ if($this->imageType == IMAGETYPE_GIF or $this->imageType == IMAGETYPE_PNG) {
imagecolortransparent($process, imagecolorallocatealpha($process, 0, 0, 0, 127));
imagealphablending($process, false);
imagesavealpha($process, true);
}
- imagecopyresampled($process, $this->resource, 0, 0, 0, 0, $width, $height, $width_orig, $height_orig);
+ imagecopyresampled($process, $this->resource, 0, 0, 0, 0, $width, $height, $widthOrig, $heightOrig);
if ($process == false) {
OC_Log::write('core', __METHOD__.'(): Error resampling process image '.$width.'x'.$height, OC_Log::ERROR);
imagedestroy($process);
@@ -737,19 +771,19 @@ class OC_Image {
OC_Log::write('core', 'OC_Image->centerCrop, No image loaded', OC_Log::ERROR);
return false;
}
- $width_orig=imageSX($this->resource);
- $height_orig=imageSY($this->resource);
- if($width_orig === $height_orig and $size==0) {
+ $widthOrig=imageSX($this->resource);
+ $heightOrig=imageSY($this->resource);
+ if($widthOrig === $heightOrig and $size==0) {
return true;
}
- $ratio_orig = $width_orig/$height_orig;
- $width = $height = min($width_orig, $height_orig);
+ $ratioOrig = $widthOrig/$heightOrig;
+ $width = $height = min($widthOrig, $heightOrig);
- if ($ratio_orig > 1) {
- $x = ($width_orig/2) - ($width/2);
+ if ($ratioOrig > 1) {
+ $x = ($widthOrig/2) - ($width/2);
$y = 0;
} else {
- $y = ($height_orig/2) - ($height/2);
+ $y = ($heightOrig/2) - ($height/2);
$x = 0;
}
if($size>0) {
@@ -767,7 +801,7 @@ class OC_Image {
}
// preserve transparency
- if($this->imagetype == IMAGETYPE_GIF or $this->imagetype == IMAGETYPE_PNG) {
+ if($this->imageType == IMAGETYPE_GIF or $this->imageType == IMAGETYPE_PNG) {
imagecolortransparent($process, imagecolorallocatealpha($process, 0, 0, 0, 127));
imagealphablending($process, false);
imagesavealpha($process, true);
@@ -827,9 +861,9 @@ class OC_Image {
OC_Log::write('core', __METHOD__.'(): No image loaded', OC_Log::ERROR);
return false;
}
- $width_orig=imageSX($this->resource);
- $height_orig=imageSY($this->resource);
- $ratio = $width_orig/$height_orig;
+ $widthOrig=imageSX($this->resource);
+ $heightOrig=imageSY($this->resource);
+ $ratio = $widthOrig/$heightOrig;
$newWidth = min($maxWidth, $ratio*$maxHeight);
$newHeight = min($maxHeight, $maxWidth/$ratio);
@@ -863,7 +897,7 @@ if ( ! function_exists( 'imagebmp') ) {
* @param int $compression [optional]
* @return bool <b>TRUE</b> on success or <b>FALSE</b> on failure.
*/
- function imagebmp($im, $filename='', $bit=24, $compression=0) {
+ function imagebmp($im, $fileName='', $bit=24, $compression=0) {
if (!in_array($bit, array(1, 4, 8, 16, 24, 32))) {
$bit = 24;
}
@@ -874,14 +908,14 @@ if ( ! function_exists( 'imagebmp') ) {
imagetruecolortopalette($im, true, $bits);
$width = imagesx($im);
$height = imagesy($im);
- $colors_num = imagecolorstotal($im);
- $rgb_quad = '';
+ $colorsNum = imagecolorstotal($im);
+ $rgbQuad = '';
if ($bit <= 8) {
- for ($i = 0; $i < $colors_num; $i++) {
+ for ($i = 0; $i < $colorsNum; $i++) {
$colors = imagecolorsforindex($im, $i);
- $rgb_quad .= chr($colors['blue']) . chr($colors['green']) . chr($colors['red']) . "\0";
+ $rgbQuad .= chr($colors['blue']) . chr($colors['green']) . chr($colors['red']) . "\0";
}
- $bmp_data = '';
+ $bmpData = '';
if ($compression == 0 || $bit < 8) {
$compression = 0;
$extra = '';
@@ -899,35 +933,35 @@ if ( ! function_exists( 'imagebmp') ) {
$bin |= $index << $k;
$i++;
}
- $bmp_data .= chr($bin);
+ $bmpData .= chr($bin);
}
- $bmp_data .= $extra;
+ $bmpData .= $extra;
}
}
// RLE8
else if ($compression == 1 && $bit == 8) {
for ($j = $height - 1; $j >= 0; $j--) {
- $last_index = "\0";
- $same_num = 0;
+ $lastIndex = "\0";
+ $sameNum = 0;
for ($i = 0; $i <= $width; $i++) {
$index = imagecolorat($im, $i, $j);
- if ($index !== $last_index || $same_num > 255) {
- if ($same_num != 0) {
- $bmp_data .= chr($same_num) . chr($last_index);
+ if ($index !== $lastIndex || $sameNum > 255) {
+ if ($sameNum != 0) {
+ $bmpData .= chr($same_num) . chr($lastIndex);
}
- $last_index = $index;
- $same_num = 1;
+ $lastIndex = $index;
+ $sameNum = 1;
}
else {
- $same_num++;
+ $sameNum++;
}
}
- $bmp_data .= "\0\0";
+ $bmpData .= "\0\0";
}
- $bmp_data .= "\0\1";
+ $bmpData .= "\0\1";
}
- $size_quad = strlen($rgb_quad);
- $size_data = strlen($bmp_data);
+ $sizeQuad = strlen($rgbQuad);
+ $sizeData = strlen($bmpData);
}
else {
$extra = '';
@@ -935,7 +969,7 @@ if ( ! function_exists( 'imagebmp') ) {
if ($padding % 4 != 0) {
$extra = str_repeat("\0", $padding);
}
- $bmp_data = '';
+ $bmpData = '';
for ($j = $height - 1; $j >= 0; $j--) {
for ($i = 0; $i < $width; $i++) {
$index = imagecolorat($im, $i, $j);
@@ -945,27 +979,27 @@ if ( ! function_exists( 'imagebmp') ) {
$bin |= ($colors['red'] >> 3) << 10;
$bin |= ($colors['green'] >> 3) << 5;
$bin |= $colors['blue'] >> 3;
- $bmp_data .= pack("v", $bin);
+ $bmpData .= pack("v", $bin);
}
else {
- $bmp_data .= pack("c*", $colors['blue'], $colors['green'], $colors['red']);
+ $bmpData .= pack("c*", $colors['blue'], $colors['green'], $colors['red']);
}
}
- $bmp_data .= $extra;
+ $bmpData .= $extra;
}
- $size_quad = 0;
- $size_data = strlen($bmp_data);
- $colors_num = 0;
- }
- $file_header = 'BM' . pack('V3', 54 + $size_quad + $size_data, 0, 54 + $size_quad);
- $info_header = pack('V3v2V*', 0x28, $width, $height, 1, $bit, $compression, $size_data, 0, 0, $colors_num, 0);
- if ($filename != '') {
- $fp = fopen($filename, 'wb');
- fwrite($fp, $file_header . $info_header . $rgb_quad . $bmp_data);
+ $sizeQuad = 0;
+ $sizeData = strlen($bmpData);
+ $colorsNum = 0;
+ }
+ $fileHeader = 'BM' . pack('V3', 54 + $sizeQuad + $sizeData, 0, 54 + $sizeQuad);
+ $infoHeader = pack('V3v2V*', 0x28, $width, $height, 1, $bit, $compression, $sizeData, 0, 0, $colorsNum, 0);
+ if ($fileName != '') {
+ $fp = fopen($fileName, 'wb');
+ fwrite($fp, $fileHeader . $infoHeader . $rgbQuad . $bmpData);
fclose($fp);
return true;
}
- echo $file_header . $info_header. $rgb_quad . $bmp_data;
+ echo $fileHeader . $infoHeader. $rgbQuad . $bmpData;
return true;
}
}
@@ -977,8 +1011,8 @@ if ( ! function_exists( 'exif_imagetype' ) ) {
* @param string $filename
* @return string|boolean
*/
- function exif_imagetype ( $filename ) {
- if ( ( $info = getimagesize( $filename ) ) !== false ) {
+ function exif_imagetype ( $fileName ) {
+ if ( ( $info = getimagesize( $fileName ) ) !== false ) {
return $info[2];
}
return false;
diff --git a/lib/installer.php b/lib/installer.php
index b9684eaeea051967af9b09dfcdd84b41c38fe5b6..e082c7eeee9d0772ee40011f9ae1e5378ccbff5f 100644
--- a/lib/installer.php
+++ b/lib/installer.php
@@ -107,10 +107,12 @@ class OC_Installer{
if(!is_file($extractDir.'/appinfo/info.xml')) {
//try to find it in a subdir
$dh=opendir($extractDir);
- while (($folder = readdir($dh)) !== false) {
- if($folder[0]!='.' and is_dir($extractDir.'/'.$folder)) {
- if(is_file($extractDir.'/'.$folder.'/appinfo/info.xml')) {
- $extractDir.='/'.$folder;
+ if(is_resource($dh)) {
+ while (($folder = readdir($dh)) !== false) {
+ if($folder[0]!='.' and is_dir($extractDir.'/'.$folder)) {
+ if(is_file($extractDir.'/'.$folder.'/appinfo/info.xml')) {
+ $extractDir.='/'.$folder;
+ }
}
}
}
@@ -426,6 +428,7 @@ class OC_Installer{
'OC_API::',
'OC_App::',
'OC_AppConfig::',
+ 'OC_Avatar',
'OC_BackgroundJob::',
'OC_Config::',
'OC_DB::',
diff --git a/lib/l10n/ach.php b/lib/l10n/ach.php
new file mode 100644
index 0000000000000000000000000000000000000000..406ff5f5a26bac1dc6a395e62978681336ec099b
--- /dev/null
+++ b/lib/l10n/ach.php
@@ -0,0 +1,8 @@
+<?php
+$TRANSLATIONS = array(
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n day go_::_%n days ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
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 1a80fc78bb63b6e16a1254753c2a546871d7d900..ed31ae795298eed30cd0bbde520730dd46563862 100644
--- a/lib/l10n/cs_CZ.php
+++ b/lib/l10n/cs_CZ.php
@@ -1,11 +1,16 @@
<?php
$TRANSLATIONS = array(
+"App \"%s\" can't be installed because it is not compatible with this version of ownCloud." => "Aplikace \"%s\" nemůže být nainstalována, protože není kompatibilní s touto verzí ownCloud.",
+"No app name specified" => "Nebyl zadan název aplikace",
"Help" => "Nápověda",
"Personal" => "Osobní",
"Settings" => "Nastavení",
"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.",
@@ -13,6 +18,18 @@ $TRANSLATIONS = array(
"Back to Files" => "Zpět k souborům",
"Selected files too large to generate zip file." => "Vybrané soubory jsou příliš velké pro vytvoření ZIP souboru.",
"Download the files in smaller chunks, seperately or kindly ask your administrator." => "Stáhněte soubory po menších částech, samostatně, nebo se obraťte na správce.",
+"No source specified when installing app" => "Nebyl zadán zdroj při instalaci aplikace",
+"No href specified when installing app from http" => "Nebyl zadán odkaz pro instalaci aplikace z HTTP",
+"No path specified when installing app from local file" => "Nebyla zadána cesta pro instalaci aplikace z místního souboru",
+"Archives of type %s are not supported" => "Archivy typu %s nejsou podporovány",
+"Failed to open archive when installing app" => "Chyba při otevírání archivu během instalace aplikace",
+"App does not provide an info.xml file" => "Aplikace neposkytuje soubor info.xml",
+"App can't be installed because of not allowed code in the App" => "Aplikace nemůže být nainstalována, protože obsahuje nepovolený kód",
+"App can't be installed because it is not compatible with this version of ownCloud" => "Aplikace nemůže být nainstalována, protože není kompatibilní s touto verzí ownCloud",
+"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" => "Aplikace nemůže být nainstalována, protože obsahuje značku\n<shipped>\n\ntrue\n</shipped>\n\ncož není povoleno pro nedodávané aplikace",
+"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "Aplikace nemůže být nainstalována, protože verze uvedená v info.xml/version nesouhlasí s verzí oznámenou z úložiště aplikací.",
+"App directory already exists" => "Adresář aplikace již existuje",
+"Can't create app folder. Please fix permissions. %s" => "Nelze vytvořit složku aplikace. Opravte práva souborů. %s",
"Application is not enabled" => "Aplikace není povolena",
"Authentication error" => "Chyba ověření",
"Token expired. Please reload page." => "Token vypršel. Obnovte prosím stránku.",
diff --git a/lib/l10n/da.php b/lib/l10n/da.php
index 78859b087459853c4fa6bae7247d63ed43a58e9f..05a43f42ed93a3aa4020263893f423ed07b5aaae 100644
--- a/lib/l10n/da.php
+++ b/lib/l10n/da.php
@@ -1,11 +1,16 @@
<?php
$TRANSLATIONS = array(
+"App \"%s\" can't be installed because it is not compatible with this version of ownCloud." => "App'en \"%s\" kan ikke blive installeret, da den ikke er kompatibel med denne version af ownCloud.",
+"No app name specified" => "Intet app-navn angivet",
"Help" => "Hjælp",
"Personal" => "Personligt",
"Settings" => "Indstillinger",
"Users" => "Brugere",
"Admin" => "Admin",
"Failed to upgrade \"%s\"." => "Upgradering af \"%s\" fejlede",
+"Custom profile pictures don't work with encryption yet" => "Personligt profilbillede virker endnu ikke sammen med kryptering",
+"Unknown filetype" => "Ukendt filtype",
+"Invalid image" => "Ugyldigt billede",
"web services under your control" => "Webtjenester under din kontrol",
"cannot open \"%s\"" => "Kan ikke åbne \"%s\"",
"ZIP download is turned off." => "ZIP-download er slået fra.",
@@ -13,6 +18,18 @@ $TRANSLATIONS = array(
"Back to Files" => "Tilbage til Filer",
"Selected files too large to generate zip file." => "De markerede filer er for store til at generere en ZIP-fil.",
"Download the files in smaller chunks, seperately or kindly ask your administrator." => "Download filerne i små bider, seperat, eller kontakt venligst din administrator.",
+"No source specified when installing app" => "Ingen kilde angivet under installation af app",
+"No href specified when installing app from http" => "Ingen href angivet under installation af app via http",
+"No path specified when installing app from local file" => "Ingen sti angivet under installation af app fra lokal fil",
+"Archives of type %s are not supported" => "Arkiver af type %s understøttes ikke",
+"Failed to open archive when installing app" => "Kunne ikke åbne arkiv under installation af appen",
+"App does not provide an info.xml file" => "Der følger ingen info.xml-fil med appen",
+"App can't be installed because of not allowed code in the App" => "Appen kan ikke installeres, da den indeholder ikke-tilladt kode",
+"App can't be installed because it is not compatible with this version of ownCloud" => "Appen kan ikke installeres, da den ikke er kompatibel med denne version af ownCloud.",
+"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" => "Appen kan ikke installeres, da den indeholder taget\n<shipped>\n\ntrue\n</shipped>\n\nhvilket ikke er tilladt for ikke-medfølgende 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" => "App kan ikke installeres, da versionen i info.xml/version ikke er den samme som versionen rapporteret fra app-storen",
+"App directory already exists" => "App-mappe findes allerede",
+"Can't create app folder. Please fix permissions. %s" => "Kan ikke oprette app-mappe. Ret tilladelser. %s",
"Application is not enabled" => "Programmet er ikke aktiveret",
"Authentication error" => "Adgangsfejl",
"Token expired. Please reload page." => "Adgang er udløbet. Genindlæs siden.",
diff --git a/lib/l10n/de.php b/lib/l10n/de.php
index 8670e1175c65eb810f748669e6c661f9bb5397da..87e7a67b47bc0ca5edeb7bff110d9175618e1cd1 100644
--- a/lib/l10n/de.php
+++ b/lib/l10n/de.php
@@ -1,13 +1,16 @@
<?php
$TRANSLATIONS = array(
"App \"%s\" can't be installed because it is not compatible with this version of ownCloud." => "Applikation \"%s\" kann nicht installiert werden, da sie mit dieser ownCloud Version nicht kompatibel ist.",
-"No app name specified" => "Es wurde kein App-Name angegeben",
+"No app name specified" => "Es wurde kein Applikation-Name angegeben",
"Help" => "Hilfe",
"Personal" => "Persönlich",
"Settings" => "Einstellungen",
"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.",
@@ -16,12 +19,15 @@ $TRANSLATIONS = array(
"Selected files too large to generate zip file." => "Die gewählten Dateien sind zu groß, um eine ZIP-Datei zu erstellen.",
"Download the files in smaller chunks, seperately or kindly ask your administrator." => "Lade die Dateien in kleineren, separaten, Stücken herunter oder bitte deinen Administrator.",
"No source specified when installing app" => "Für die Installation der Applikation wurde keine Quelle angegeben",
-"No href specified when installing app from http" => "href wurde nicht angegeben um die Applikation per http zu installieren",
+"No href specified when installing app from http" => "Der Link (href) wurde nicht angegeben um die Applikation per http zu installieren",
"No path specified when installing app from local file" => "Bei der Installation der Applikation aus einer lokalen Datei wurde kein Pfad angegeben",
"Archives of type %s are not supported" => "Archive vom Typ %s werden nicht unterstützt",
-"Failed to open archive when installing app" => "Das Archive konnte bei der Installation der Applikation nicht geöffnet werden",
+"Failed to open archive when installing app" => "Das Archiv konnte bei der Installation der Applikation nicht geöffnet werden",
"App does not provide an info.xml file" => "Die Applikation enthält keine info,xml Datei",
"App can't be installed because of not allowed code in the App" => "Die Applikation kann auf Grund von unerlaubten Code nicht installiert werden",
+"App can't be installed because it is not compatible with this version of ownCloud" => "Die Anwendung konnte nicht installiert werden, weil Sie nicht mit dieser Version von ownCloud kompatibel ist.",
+"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" => "Die Applikation konnte nicht installiert werden, da diese das <shipped>true</shipped> Tag beinhaltet und dieses, bei nicht mitausgelieferten Applikationen, nicht erlaubt ist ist",
+"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "Die Applikation konnte nicht installiert werden, da die Version in der info.xml nicht die gleiche Version wie im App-Store ist",
"App directory already exists" => "Das Applikationsverzeichnis existiert bereits",
"Can't create app folder. Please fix permissions. %s" => "Es kann kein Applikationsordner erstellt werden. Bitte passen sie die Berechtigungen an. %s",
"Application is not enabled" => "Die Anwendung ist nicht aktiviert",
diff --git a/lib/l10n/de_DE.php b/lib/l10n/de_DE.php
index eafd76b7ee9055bc87245c6d1ff10224b07c65ae..09be0eea22de34f7fb9a0cb64576de4442a6d322 100644
--- a/lib/l10n/de_DE.php
+++ b/lib/l10n/de_DE.php
@@ -1,11 +1,16 @@
<?php
$TRANSLATIONS = array(
+"App \"%s\" can't be installed because it is not compatible with this version of ownCloud." => "Applikation \"%s\" kann nicht installiert werden, da sie mit dieser ownCloud Version nicht kompatibel ist.",
+"No app name specified" => "Es wurde kein Applikation-Name angegeben",
"Help" => "Hilfe",
"Personal" => "Persönlich",
"Settings" => "Einstellungen",
"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.",
@@ -13,8 +18,16 @@ $TRANSLATIONS = array(
"Back to Files" => "Zurück zu \"Dateien\"",
"Selected files too large to generate zip file." => "Die gewählten Dateien sind zu groß, um eine ZIP-Datei zu erstellen.",
"Download the files in smaller chunks, seperately or kindly ask your administrator." => "Laden Sie die Dateien in kleineren, separaten, Stücken herunter oder bitten Sie Ihren Administrator.",
+"No source specified when installing app" => "Für die Installation der Applikation wurde keine Quelle angegeben",
+"No href specified when installing app from http" => "Der Link (href) wurde nicht angegeben um die Applikation per http zu installieren",
+"No path specified when installing app from local file" => "Bei der Installation der Applikation aus einer lokalen Datei wurde kein Pfad angegeben",
"Archives of type %s are not supported" => "Archive des Typs %s werden nicht unterstützt.",
+"Failed to open archive when installing app" => "Das Archiv konnte bei der Installation der Applikation nicht geöffnet werden",
+"App does not provide an info.xml file" => "Die Applikation enthält keine info,xml Datei",
+"App can't be installed because of not allowed code in the App" => "Die Applikation kann auf Grund von unerlaubten Code nicht installiert werden",
"App can't be installed because it is not compatible with this version of ownCloud" => "Die Anwendung konnte nicht installiert werden, weil Sie nicht mit dieser Version von ownCloud kompatibel ist.",
+"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" => "Die Applikation konnte nicht installiert werden, da diese das <shipped>true</shipped> Tag beinhaltet und dieses, bei nicht mitausgelieferten Applikationen, nicht erlaubt ist ist",
+"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "Die Applikation konnte nicht installiert werden, da die Version in der info.xml nicht die gleiche Version wie im App-Store ist",
"App directory already exists" => "Der Ordner für die Anwendung existiert bereits.",
"Can't create app folder. Please fix permissions. %s" => "Der Ordner für die Anwendung konnte nicht angelegt werden. Bitte überprüfen Sie die Ordner- und Dateirechte und passen Sie diese entsprechend an. %s",
"Application is not enabled" => "Die Anwendung ist nicht aktiviert",
diff --git a/lib/l10n/en_GB.php b/lib/l10n/en_GB.php
new file mode 100644
index 0000000000000000000000000000000000000000..d02f553eda8e08f415d4bcc499b89b5855517414
--- /dev/null
+++ b/lib/l10n/en_GB.php
@@ -0,0 +1,72 @@
+<?php
+$TRANSLATIONS = array(
+"App \"%s\" can't be installed because it is not compatible with this version of ownCloud." => "App \"%s\" can't be installed because it is not compatible with this version of ownCloud.",
+"No app name specified" => "No app name specified",
+"Help" => "Help",
+"Personal" => "Personal",
+"Settings" => "Settings",
+"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.",
+"Files need to be downloaded one by one." => "Files need to be downloaded one by one.",
+"Back to Files" => "Back to Files",
+"Selected files too large to generate zip file." => "Selected files too large to generate zip file.",
+"Download the files in smaller chunks, seperately or kindly ask your administrator." => "Download the files in smaller chunks, seperately or kindly ask your administrator.",
+"No source specified when installing app" => "No source specified when installing app",
+"No href specified when installing app from http" => "No href specified when installing app from http",
+"No path specified when installing app from local file" => "No path specified when installing app from local file",
+"Archives of type %s are not supported" => "Archives of type %s are not supported",
+"Failed to open archive when installing app" => "Failed to open archive when installing app",
+"App does not provide an info.xml file" => "App does not provide an info.xml file",
+"App can't be installed because of not allowed code in the App" => "App can't be installed because of unallowed code in the App",
+"App can't be installed because it is not compatible with this version of ownCloud" => "App can't be installed because it is not compatible with this version of ownCloud",
+"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" => "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped 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" => "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store",
+"App directory already exists" => "App directory already exists",
+"Can't create app folder. Please fix permissions. %s" => "Can't create app folder. Please fix permissions. %s",
+"Application is not enabled" => "Application is not enabled",
+"Authentication error" => "Authentication error",
+"Token expired. Please reload page." => "Token expired. Please reload page.",
+"Files" => "Files",
+"Text" => "Text",
+"Images" => "Images",
+"%s enter the database username." => "%s enter the database username.",
+"%s enter the database name." => "%s enter the database name.",
+"%s you may not use dots in the database name" => "%s you may not use dots in the database name",
+"MS SQL username and/or password not valid: %s" => "MS SQL username and/or password not valid: %s",
+"You need to enter either an existing account or the administrator." => "You need to enter either an existing account or the administrator.",
+"MySQL username and/or password not valid" => "MySQL username and/or password not valid",
+"DB Error: \"%s\"" => "DB Error: \"%s\"",
+"Offending command was: \"%s\"" => "Offending command was: \"%s\"",
+"MySQL user '%s'@'localhost' exists already." => "MySQL user '%s'@'localhost' exists already.",
+"Drop this user from MySQL" => "Drop this user from MySQL",
+"MySQL user '%s'@'%%' already exists" => "MySQL user '%s'@'%%' already exists",
+"Drop this user from MySQL." => "Drop this user from MySQL.",
+"Oracle connection could not be established" => "Oracle connection could not be established",
+"Oracle username and/or password not valid" => "Oracle username and/or password not valid",
+"Offending command was: \"%s\", name: %s, password: %s" => "Offending command was: \"%s\", name: %s, password: %s",
+"PostgreSQL username and/or password not valid" => "PostgreSQL username and/or password not valid",
+"Set an admin username." => "Set an admin username.",
+"Set an admin password." => "Set an admin password.",
+"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 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 day go","%n days ago"),
+"last month" => "last month",
+"_%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:",
+"Could not find category \"%s\"" => "Could not find category \"%s\""
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/es.php b/lib/l10n/es.php
index 14bbf6f6a13fedb6e447e1715f11413c46612b71..047d5d955bb9adffefb77388b1f935aa59f0bfb8 100644
--- a/lib/l10n/es.php
+++ b/lib/l10n/es.php
@@ -1,5 +1,7 @@
<?php
$TRANSLATIONS = array(
+"App \"%s\" can't be installed because it is not compatible with this version of ownCloud." => "La aplicación \"%s\" no puede ser instalada porque no es compatible con esta versión de ownCloud",
+"No app name specified" => "No se ha especificado nombre de la aplicación",
"Help" => "Ayuda",
"Personal" => "Personal",
"Settings" => "Ajustes",
@@ -13,6 +15,18 @@ $TRANSLATIONS = array(
"Back to Files" => "Volver a Archivos",
"Selected files too large to generate zip file." => "Los archivos seleccionados son demasiado grandes para generar el archivo zip.",
"Download the files in smaller chunks, seperately or kindly ask your administrator." => "Descargue los archivos en trozos más pequeños, por separado o solicítelos amablemente su administrador.",
+"No source specified when installing app" => "No se ha especificado origen cuando se ha instalado la aplicación",
+"No href specified when installing app from http" => "No href especificado cuando se ha instalado la aplicación",
+"No path specified when installing app from local file" => "Sin path especificado cuando se ha instalado la aplicación desde el fichero local",
+"Archives of type %s are not supported" => "Ficheros de tipo %s no son soportados",
+"Failed to open archive when installing app" => "Fallo de apertura de fichero mientras se instala la aplicación",
+"App does not provide an info.xml file" => "La aplicación no suministra un fichero info.xml",
+"App can't be installed because of not allowed code in the App" => "La aplicación no puede ser instalada por tener código no autorizado en la aplicación",
+"App can't be installed because it is not compatible with this version of ownCloud" => "La aplicación no se puede instalar porque no es compatible con esta versión de ownCloud",
+"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" => "La aplicación no se puede instalar porque contiene la etiqueta\n<shipped>\ntrue\n</shipped>\nque no está permitida para aplicaciones no distribuidas",
+"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "La aplicación no puede ser instalada por que la versión en info.xml/version no es la misma que la establecida en la app store",
+"App directory already exists" => "El directorio de la aplicación ya existe",
+"Can't create app folder. Please fix permissions. %s" => "No se puede crear la carpeta de la aplicación. Corrija los permisos. %s",
"Application is not enabled" => "La aplicación no está habilitada",
"Authentication error" => "Error de autenticación",
"Token expired. Please reload page." => "Token expirado. Por favor, recarga la página.",
@@ -21,7 +35,7 @@ $TRANSLATIONS = array(
"Images" => "Imágenes",
"%s enter the database username." => "%s ingresar el usuario de la base de datos.",
"%s enter the database name." => "%s ingresar el nombre de la base de datos",
-"%s you may not use dots in the database name" => "%s no se puede utilizar puntos en el nombre de la base de datos",
+"%s you may not use dots in the database name" => "%s puede utilizar puntos en el nombre de la base de datos",
"MS SQL username and/or password not valid: %s" => "Usuario y/o contraseña de MS SQL no válidos: %s",
"You need to enter either an existing account or the administrator." => "Tiene que ingresar una cuenta existente o la del administrador.",
"MySQL username and/or password not valid" => "Usuario y/o contraseña de MySQL no válidos",
@@ -40,13 +54,13 @@ $TRANSLATIONS = array(
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Su servidor web aún no está configurado adecuadamente para permitir sincronización de archivos ya que la interfaz WebDAV parece no estar funcionando.",
"Please double check the <a href='%s'>installation guides</a>." => "Por favor, vuelva a comprobar las <a href='%s'>guías de instalación</a>.",
"seconds ago" => "hace segundos",
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n minute ago_::_%n minutes ago_" => array("Hace %n minuto","Hace %n minutos"),
+"_%n hour ago_::_%n hours ago_" => array("Hace %n hora","Hace %n horas"),
"today" => "hoy",
"yesterday" => "ayer",
-"_%n day go_::_%n days ago_" => array("",""),
+"_%n day go_::_%n days ago_" => array("Hace %n día","Hace %n días"),
"last month" => "mes pasado",
-"_%n month ago_::_%n months ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("Hace %n mes","Hace %n meses"),
"last year" => "año pasado",
"years ago" => "hace años",
"Caused by:" => "Causado por:",
diff --git a/lib/l10n/es_AR.php b/lib/l10n/es_AR.php
index 26f1e4ecd5e987253a07862e623c80c60ef609b2..f637eb403ed2113597517995ef7ecb8a3ed5036f 100644
--- a/lib/l10n/es_AR.php
+++ b/lib/l10n/es_AR.php
@@ -1,5 +1,7 @@
<?php
$TRANSLATIONS = array(
+"App \"%s\" can't be installed because it is not compatible with this version of ownCloud." => "La app \"%s\" no puede ser instalada porque no es compatible con esta versión de ownCloud",
+"No app name specified" => "No fue especificado el nombre de la app",
"Help" => "Ayuda",
"Personal" => "Personal",
"Settings" => "Configuración",
@@ -13,6 +15,18 @@ $TRANSLATIONS = array(
"Back to Files" => "Volver a Archivos",
"Selected files too large to generate zip file." => "Los archivos seleccionados son demasiado grandes para generar el archivo zip.",
"Download the files in smaller chunks, seperately or kindly ask your administrator." => "Descargá los archivos en partes más chicas, de forma separada, o pedíselos al administrador",
+"No source specified when installing app" => "No se especificó el origen al instalar la app",
+"No href specified when installing app from http" => "No se especificó href al instalar la app",
+"No path specified when installing app from local file" => "No se especificó PATH al instalar la app desde el archivo local",
+"Archives of type %s are not supported" => "No hay soporte para archivos de tipo %s",
+"Failed to open archive when installing app" => "Error al abrir archivo mientras se instalaba la app",
+"App does not provide an info.xml file" => "La app no suministra un archivo info.xml",
+"App can't be installed because of not allowed code in the App" => "No puede ser instalada la app por tener código no autorizado",
+"App can't be installed because it is not compatible with this version of ownCloud" => "No se puede instalar la app porque no es compatible con esta versión de ownCloud",
+"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" => "La app no se puede instalar porque contiene la etiqueta <shipped>true</shipped> que no está permitida para apps no distribuidas",
+"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "La app no puede ser instalada porque la versión en info.xml/version no es la misma que la establecida en el app store",
+"App directory already exists" => "El directorio de la app ya existe",
+"Can't create app folder. Please fix permissions. %s" => "No se puede crear el directorio para la app. Corregí los permisos. %s",
"Application is not enabled" => "La aplicación no está habilitada",
"Authentication error" => "Error al autenticar",
"Token expired. Please reload page." => "Token expirado. Por favor, recargá la página.",
@@ -40,13 +54,13 @@ $TRANSLATIONS = array(
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Tu servidor web no está configurado todavía para permitir sincronización de archivos porque la interfaz WebDAV parece no funcionar.",
"Please double check the <a href='%s'>installation guides</a>." => "Por favor, comprobá nuevamente la <a href='%s'>guía de instalación</a>.",
"seconds ago" => "segundos atrás",
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n minute ago_::_%n minutes ago_" => array("Hace %n minuto","Hace %n minutos"),
+"_%n hour ago_::_%n hours ago_" => array("Hace %n hora","Hace %n horas"),
"today" => "hoy",
"yesterday" => "ayer",
-"_%n day go_::_%n days ago_" => array("",""),
+"_%n day go_::_%n days ago_" => array("Hace %n día","Hace %n días"),
"last month" => "el mes pasado",
-"_%n month ago_::_%n months ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("Hace %n mes","Hace %n meses"),
"last year" => "el año pasado",
"years ago" => "años atrás",
"Caused by:" => "Provocado por:",
diff --git a/lib/l10n/es_MX.php b/lib/l10n/es_MX.php
new file mode 100644
index 0000000000000000000000000000000000000000..15f78e0bce6d7e36688d2913f6affa4c17472a65
--- /dev/null
+++ b/lib/l10n/es_MX.php
@@ -0,0 +1,8 @@
+<?php
+$TRANSLATIONS = array(
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n day go_::_%n days ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
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 cfcca28d5f85b6867f50f8bae57d2c2b9673b2e4..ab3d618849e8a6aaa4f63aaa18b21b76202f4c7a 100644
--- a/lib/l10n/fr.php
+++ b/lib/l10n/fr.php
@@ -1,15 +1,35 @@
<?php
$TRANSLATIONS = array(
+"App \"%s\" can't be installed because it is not compatible with this version of ownCloud." => "L'application \"%s\" ne peut être installée car elle n'est pas compatible avec cette version de ownCloud.",
+"No app name specified" => "Aucun nom d'application spécifié",
"Help" => "Aide",
"Personal" => "Personnel",
"Settings" => "Paramètres",
"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é.",
"Files need to be downloaded one by one." => "Les fichiers nécessitent d'être téléchargés un par un.",
"Back to Files" => "Retour aux Fichiers",
"Selected files too large to generate zip file." => "Les fichiers sélectionnés sont trop volumineux pour être compressés.",
+"Download the files in smaller chunks, seperately or kindly ask your administrator." => "Télécharger les fichiers en parties plus petites, séparément ou demander avec bienveillance à votre administrateur.",
+"No source specified when installing app" => "Aucune source spécifiée pour installer l'application",
+"No href specified when installing app from http" => "Aucun href spécifié pour installer l'application par http",
+"No path specified when installing app from local file" => "Aucun chemin spécifié pour installer l'application depuis un fichier local",
+"Archives of type %s are not supported" => "Les archives de type %s ne sont pas supportées",
+"Failed to open archive when installing app" => "Échec de l'ouverture de l'archive lors de l'installation de l'application",
+"App does not provide an info.xml file" => "L'application ne fournit pas de fichier info.xml",
+"App can't be installed because of not allowed code in the App" => "L'application ne peut être installée car elle contient du code non-autorisé",
+"App can't be installed because it is not compatible with this version of ownCloud" => "L'application ne peut être installée car elle n'est pas compatible avec cette version de ownCloud",
+"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" => "L'application ne peut être installée car elle contient la balise <shipped>true</shipped> qui n'est pas autorisée pour les applications non-diffusées",
+"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "L'application ne peut être installée car la version de info.xml/version n'est identique à celle indiquée sur l'app store",
+"App directory already exists" => "Le dossier de l'application existe déjà",
+"Can't create app folder. Please fix permissions. %s" => "Impossible de créer le dossier de l'application. Corrigez les droits d'accès. %s",
"Application is not enabled" => "L'application n'est pas activée",
"Authentication error" => "Erreur d'authentification",
"Token expired. Please reload page." => "La session a expiré. Veuillez recharger la page.",
@@ -37,15 +57,16 @@ $TRANSLATIONS = array(
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Votre serveur web, n'est pas correctement configuré pour permettre la synchronisation des fichiers, car l'interface WebDav ne fonctionne pas comme il faut.",
"Please double check the <a href='%s'>installation guides</a>." => "Veuillez vous référer au <a href='%s'>guide d'installation</a>.",
"seconds ago" => "il y a quelques secondes",
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n minute ago_::_%n minutes ago_" => array("","il y a %n minutes"),
+"_%n hour ago_::_%n hours ago_" => array("","Il y a %n heures"),
"today" => "aujourd'hui",
"yesterday" => "hier",
-"_%n day go_::_%n days ago_" => array("",""),
+"_%n day go_::_%n days ago_" => array("","il y a %n jours"),
"last month" => "le mois dernier",
-"_%n month ago_::_%n months ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("","Il y a %n mois"),
"last year" => "l'année dernière",
"years ago" => "il y a plusieurs années",
+"Caused by:" => "Causé par :",
"Could not find category \"%s\"" => "Impossible de trouver la catégorie \"%s\""
);
$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/lib/l10n/gl.php b/lib/l10n/gl.php
index 4d92e89ebbaffe0204468a09571bbca0b15b7671..406272d690fca4416d3aa5b0f771cdd49450a87e 100644
--- a/lib/l10n/gl.php
+++ b/lib/l10n/gl.php
@@ -1,11 +1,16 @@
<?php
$TRANSLATIONS = array(
+"App \"%s\" can't be installed because it is not compatible with this version of ownCloud." => "Non é posíbel instalar o aplicativo «%s» por non seren compatíbel con esta versión do ownCloud.",
+"No app name specified" => "Non se especificou o nome do aplicativo",
"Help" => "Axuda",
"Personal" => "Persoal",
"Settings" => "Axustes",
"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.",
@@ -13,6 +18,18 @@ $TRANSLATIONS = array(
"Back to Files" => "Volver aos ficheiros",
"Selected files too large to generate zip file." => "Os ficheiros seleccionados son demasiado grandes como para xerar un ficheiro zip.",
"Download the files in smaller chunks, seperately or kindly ask your administrator." => "Descargue os ficheiros en cachos máis pequenos e por separado, ou pídallos amabelmente ao seu administrador.",
+"No source specified when installing app" => "Non foi especificada ningunha orixe ao instalar aplicativos",
+"No href specified when installing app from http" => "Non foi especificada ningunha href ao instalar aplicativos",
+"No path specified when installing app from local file" => "Non foi especificada ningunha ruta ao instalar aplicativos desde un ficheiro local",
+"Archives of type %s are not supported" => "Os arquivos do tipo %s non están admitidos",
+"Failed to open archive when installing app" => "Non foi posíbel abrir o arquivo ao instalar aplicativos",
+"App does not provide an info.xml file" => "O aplicativo non fornece un ficheiro info.xml",
+"App can't be installed because of not allowed code in the App" => "Non é posíbel instalar o aplicativo por mor de conter código non permitido",
+"App can't be installed because it is not compatible with this version of ownCloud" => "Non é posíbel instalar o aplicativo por non seren compatíbel con esta versión do ownCloud.",
+"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" => "Non é posíbel instalar o aplicativo por conter a etiqueta\n<shipped>\n\ntrue\n</shipped>\nque non está permitida para os aplicativos non enviados",
+"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "Non é posíbel instalar o aplicativo xa que a versión en info.xml/version non é a mesma que a versión informada desde a App Store",
+"App directory already exists" => "Xa existe o directorio do aplicativo",
+"Can't create app folder. Please fix permissions. %s" => "Non é posíbel crear o cartafol de aplicativos. Corrixa os permisos. %s",
"Application is not enabled" => "O aplicativo non está activado",
"Authentication error" => "Produciuse un erro de autenticación",
"Token expired. Please reload page." => "Testemuña caducada. Recargue a páxina.",
diff --git a/lib/l10n/hu_HU.php b/lib/l10n/hu_HU.php
index 7ec7621a6553c24efd9495baee9755f88389439a..e944291caee069b4c43bef8958a376ae85a95345 100644
--- a/lib/l10n/hu_HU.php
+++ b/lib/l10n/hu_HU.php
@@ -1,11 +1,14 @@
<?php
$TRANSLATIONS = array(
+"No app name specified" => "Nincs az alkalmazás név megadva.",
"Help" => "Súgó",
"Personal" => "Személyes",
"Settings" => "Beállítások",
"Users" => "Felhasználók",
"Admin" => "Adminsztráció",
"Failed to upgrade \"%s\"." => "Sikertelen Frissítés \"%s\".",
+"Unknown filetype" => "Ismeretlen file tipús",
+"Invalid image" => "Hibás kép",
"web services under your control" => "webszolgáltatások saját kézben",
"cannot open \"%s\"" => "nem sikerült megnyitni \"%s\"",
"ZIP download is turned off." => "A ZIP-letöltés nincs engedélyezve.",
@@ -13,6 +16,10 @@ $TRANSLATIONS = array(
"Back to Files" => "Vissza a Fájlokhoz",
"Selected files too large to generate zip file." => "A kiválasztott fájlok túl nagyok a zip tömörítéshez.",
"Download the files in smaller chunks, seperately or kindly ask your administrator." => "Tölts le a fileokat kisebb chunkokban, kölün vagy kérj segitséget a rendszergazdádtól.",
+"App does not provide an info.xml file" => "Az alkalmazás nem szolgáltatott info.xml file-t",
+"App can't be installed because it is not compatible with this version of ownCloud" => "Az alalmazás nem telepíthető, mert nem kompatibilis az ownClod ezzel a verziójával.",
+"App directory already exists" => "Az alkalmazás mappája már létezik",
+"Can't create app folder. Please fix permissions. %s" => "Nem lehetett létrehozni az alkalmzás mappáját. Kérlek ellenőrizd a jogosultásgokat. %s",
"Application is not enabled" => "Az alkalmazás nincs engedélyezve",
"Authentication error" => "Azonosítási hiba",
"Token expired. Please reload page." => "A token lejárt. Frissítse az oldalt.",
@@ -39,6 +46,7 @@ $TRANSLATIONS = array(
"Set an admin password." => "Állítson be egy jelszót az adminisztrációhoz.",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Az Ön webkiszolgálója nincs megfelelően beállítva az állományok szinkronizálásához, mert a WebDAV-elérés úgy tűnik, nem működik.",
"Please double check the <a href='%s'>installation guides</a>." => "Kérjük tüzetesen tanulmányozza át a <a href='%s'>telepítési útmutatót</a>.",
+"Could not find category \"%s\"" => "Ez a kategória nem található: \"%s\"",
"seconds ago" => "pár másodperce",
"_%n minute ago_::_%n minutes ago_" => array("",""),
"_%n hour ago_::_%n hours ago_" => array("",""),
@@ -49,7 +57,6 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("",""),
"last year" => "tavaly",
"years ago" => "több éve",
-"Caused by:" => "Okozta:",
-"Could not find category \"%s\"" => "Ez a kategória nem található: \"%s\""
+"Caused by:" => "Okozta:"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/it.php b/lib/l10n/it.php
index 983152a14ca4524772246fadf00353ddf5a7cc37..b00789bc86f73bb1fb1d7a1de02ec7f8cc1811c3 100644
--- a/lib/l10n/it.php
+++ b/lib/l10n/it.php
@@ -1,11 +1,16 @@
<?php
$TRANSLATIONS = array(
+"App \"%s\" can't be installed because it is not compatible with this version of ownCloud." => "L'applicazione \"%s\" non può essere installata poiché non è compatibile con questa versione di ownCloud.",
+"No app name specified" => "Il nome dell'applicazione non è specificato",
"Help" => "Aiuto",
"Personal" => "Personale",
"Settings" => "Impostazioni",
"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.",
@@ -13,6 +18,18 @@ $TRANSLATIONS = array(
"Back to Files" => "Torna ai file",
"Selected files too large to generate zip file." => "I file selezionati sono troppo grandi per generare un file zip.",
"Download the files in smaller chunks, seperately or kindly ask your administrator." => "Scarica i file in blocchi più piccoli, separatamente o chiedi al tuo amministratore.",
+"No source specified when installing app" => "Nessuna fonte specificata durante l'installazione dell'applicazione",
+"No href specified when installing app from http" => "Nessun href specificato durante l'installazione dell'applicazione da http",
+"No path specified when installing app from local file" => "Nessun percorso specificato durante l'installazione dell'applicazione da file locale",
+"Archives of type %s are not supported" => "Gli archivi di tipo %s non sono supportati",
+"Failed to open archive when installing app" => "Apertura archivio non riuscita durante l'installazione dell'applicazione",
+"App does not provide an info.xml file" => "L'applicazione non fornisce un file info.xml",
+"App can't be installed because of not allowed code in the App" => "L'applicazione non può essere installata a causa di codice non consentito al suo interno",
+"App can't be installed because it is not compatible with this version of ownCloud" => "L'applicazione non può essere installata poiché non è compatibile con questa versione di ownCloud",
+"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" => "L'applicazione non può essere installata poiché contiene il tag <shipped>true<shipped> che non è permesso alle applicazioni non 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" => "L'applicazione non può essere installata poiché la versione in info.xml/version non è la stessa riportata dall'app store",
+"App directory already exists" => "La cartella dell'applicazione esiste già",
+"Can't create app folder. Please fix permissions. %s" => "Impossibile creare la cartella dell'applicazione. Correggi i permessi. %s",
"Application is not enabled" => "L'applicazione non è abilitata",
"Authentication error" => "Errore di autenticazione",
"Token expired. Please reload page." => "Token scaduto. Ricarica la pagina.",
diff --git a/lib/l10n/ja_JP.php b/lib/l10n/ja_JP.php
index 902170524b98ed84813b1a0a53c27cd4ab674bf7..b9e6a0e69248674747e93acdb6a1971c5b3a0e74 100644
--- a/lib/l10n/ja_JP.php
+++ b/lib/l10n/ja_JP.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" => "管理",
"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" => "アプリインストール時のhttpの URL が未指定",
+"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アプリには許可されない<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/km.php b/lib/l10n/km.php
new file mode 100644
index 0000000000000000000000000000000000000000..e7b09649a240500e39096daf02b7cc137312f444
--- /dev/null
+++ b/lib/l10n/km.php
@@ -0,0 +1,8 @@
+<?php
+$TRANSLATIONS = array(
+"_%n minute ago_::_%n minutes ago_" => array(""),
+"_%n hour ago_::_%n hours ago_" => array(""),
+"_%n day go_::_%n days ago_" => array(""),
+"_%n month ago_::_%n months ago_" => array("")
+);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/lib/l10n/ko.php b/lib/l10n/ko.php
index eec5be65abd5d4a48974f3688a99c4781587aea1..3ef39fefa602d3e1f2da40eb3c65ca9967aea6e1 100644
--- a/lib/l10n/ko.php
+++ b/lib/l10n/ko.php
@@ -8,12 +8,16 @@ $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 다운로드가 비활성화되었습니다.",
"Files need to be downloaded one by one." => "파일을 개별적으로 다운로드해야 합니다.",
"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" => "http에서 앱을 설치할 대 href가 지정되지 않았습니다.",
"No path specified when installing app from local file" => "로컬 파일에서 앱을 설치할 때 경로가 지정되지 않았습니다.",
@@ -52,6 +56,7 @@ $TRANSLATIONS = array(
"Set an admin password." => "관리자 비밀번호 설정",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "WebDAV 인터페이스가 제대로 작동하지 않습니다. 웹 서버에서 파일 동기화를 사용할 수 있도록 설정이 제대로 되지 않은 것 같습니다.",
"Please double check the <a href='%s'>installation guides</a>." => "<a href='%s'>설치 가이드</a>를 다시 한 번 확인하십시오.",
+"Could not find category \"%s\"" => "분류 \"%s\"을(를) 찾을 수 없습니다.",
"seconds ago" => "초 전",
"_%n minute ago_::_%n minutes ago_" => array("%n분 전 "),
"_%n hour ago_::_%n hours ago_" => array("%n시간 전 "),
@@ -62,7 +67,6 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("%n달 전 "),
"last year" => "작년",
"years ago" => "년 전",
-"Caused by:" => "원인: ",
-"Could not find category \"%s\"" => "분류 \"%s\"을(를) 찾을 수 없습니다."
+"Caused by:" => "원인: "
);
$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/lib/l10n/lt_LT.php b/lib/l10n/lt_LT.php
index 242b0a231063dfea2d15763918900aad3dbb8075..db8d96c1018505e5310eecd47ac225938d84b9c6 100644
--- a/lib/l10n/lt_LT.php
+++ b/lib/l10n/lt_LT.php
@@ -1,30 +1,72 @@
<?php
$TRANSLATIONS = array(
+"App \"%s\" can't be installed because it is not compatible with this version of ownCloud." => "Programa „%s“ negali būti įdiegta, nes yra nesuderinama su šia ownCloud versija.",
+"No app name specified" => "Nenurodytas programos pavadinimas",
"Help" => "Pagalba",
"Personal" => "Asmeniniai",
"Settings" => "Nustatymai",
"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.",
"Files need to be downloaded one by one." => "Failai turi būti parsiunčiami vienas po kito.",
"Back to Files" => "Atgal į Failus",
"Selected files too large to generate zip file." => "Pasirinkti failai per dideli archyvavimui į ZIP.",
+"Download the files in smaller chunks, seperately or kindly ask your administrator." => "Atsisiųskite failus mažesnėmis dalimis atskirai, arba mandagiai prašykite savo administratoriaus.",
+"No source specified when installing app" => "Nenurodytas šaltinis diegiant programą",
+"No href specified when installing app from http" => "Nenurodytas href diegiant programą iš http",
+"No path specified when installing app from local file" => "Nenurodytas kelias diegiant programą iš vietinio failo",
+"Archives of type %s are not supported" => "%s tipo archyvai nepalaikomi",
+"Failed to open archive when installing app" => "Nepavyko atverti archyvo diegiant programą",
+"App does not provide an info.xml file" => "Programa nepateikia info.xml failo",
+"App can't be installed because of not allowed code in the App" => "Programa negali būti įdiegta, nes turi neleistiną kodą",
+"App can't be installed because it is not compatible with this version of ownCloud" => "Programa negali būti įdiegta, nes yra nesuderinama su šia ownCloud versija",
+"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" => "Programa negali būti įdiegta, nes turi <shipped>true</shipped> žymę, kuri yra neleistina ne kartu platinamoms programoms",
+"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "Programa negali būti įdiegta, nes versija pateikta info.xml/version nesutampa su versija deklaruota programų saugykloje",
+"App directory already exists" => "Programos aplankas jau egzistuoja",
+"Can't create app folder. Please fix permissions. %s" => "Nepavyksta sukurti aplanko. Prašome pataisyti leidimus. %s",
"Application is not enabled" => "Programa neįjungta",
"Authentication error" => "Autentikacijos klaida",
"Token expired. Please reload page." => "Sesija baigėsi. Prašome perkrauti puslapį.",
"Files" => "Failai",
"Text" => "Žinučių",
"Images" => "Paveikslėliai",
+"%s enter the database username." => "%s įrašykite duombazės naudotojo vardą.",
+"%s enter the database name." => "%s įrašykite duombazės pavadinimą.",
+"%s you may not use dots in the database name" => "%s negalite naudoti taškų duombazės pavadinime",
+"MS SQL username and/or password not valid: %s" => "MS SQL naudotojo vardas ir/arba slaptažodis netinka: %s",
+"You need to enter either an existing account or the administrator." => "Turite prisijungti su egzistuojančia paskyra arba su administratoriumi.",
+"MySQL username and/or password not valid" => "Neteisingas MySQL naudotojo vardas ir/arba slaptažodis",
+"DB Error: \"%s\"" => "DB klaida: \"%s\"",
+"Offending command was: \"%s\"" => "Vykdyta komanda buvo: \"%s\"",
+"MySQL user '%s'@'localhost' exists already." => "MySQL naudotojas '%s'@'localhost' jau egzistuoja.",
+"Drop this user from MySQL" => "Pašalinti šį naudotoją iš MySQL",
+"MySQL user '%s'@'%%' already exists" => "MySQL naudotojas '%s'@'%%' jau egzistuoja",
+"Drop this user from MySQL." => "Pašalinti šį naudotoją iš MySQL.",
+"Oracle connection could not be established" => "Nepavyko sukurti Oracle ryšio",
+"Oracle username and/or password not valid" => "Neteisingas Oracle naudotojo vardas ir/arba slaptažodis",
+"Offending command was: \"%s\", name: %s, password: %s" => "Vykdyta komanda buvo: \"%s\", name: %s, password: %s",
+"PostgreSQL username and/or password not valid" => "Neteisingas PostgreSQL naudotojo vardas ir/arba slaptažodis",
+"Set an admin username." => "Nustatyti administratoriaus naudotojo vardą.",
+"Set an admin password." => "Nustatyti administratoriaus slaptažodį.",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Jūsų serveris nėra tvarkingai nustatytas leisti failų sinchronizaciją, nes WebDAV sąsaja panašu, kad yra sugadinta.",
+"Please double check the <a href='%s'>installation guides</a>." => "Prašome pažiūrėkite dar kartą <a href='%s'>diegimo instrukcijas</a>.",
"seconds ago" => "prieš sekundę",
-"_%n minute ago_::_%n minutes ago_" => array("",""," prieš %n minučių"),
-"_%n hour ago_::_%n hours ago_" => array("","","prieš %n valandų"),
+"_%n minute ago_::_%n minutes ago_" => array("prieš %n min.","Prieš % minutes","Prieš %n minučių"),
+"_%n hour ago_::_%n hours ago_" => array("Prieš %n valandą","Prieš %n valandas","Prieš %n valandų"),
"today" => "šiandien",
"yesterday" => "vakar",
-"_%n day go_::_%n days ago_" => array("","",""),
+"_%n day go_::_%n days ago_" => array("Prieš %n dieną","Prieš %n dienas","Prieš %n dienų"),
"last month" => "praeitą mėnesį",
-"_%n month ago_::_%n months ago_" => array("","","prieš %n mėnesių"),
+"_%n month ago_::_%n months ago_" => array("Prieš %n mėnesį","Prieš %n mėnesius","Prieš %n mėnesių"),
"last year" => "praeitais metais",
-"years ago" => "prieš metus"
+"years ago" => "prieš metus",
+"Caused by:" => "Iššaukė:",
+"Could not find category \"%s\"" => "Nepavyko rasti kategorijos „%s“"
);
$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/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 28b4f7b7d945b8d74cc0d9b68a9408a042a808df..e8bf8dfdef46ad74f49f927f695a0c8e076375bf 100644
--- a/lib/l10n/nn_NO.php
+++ b/lib/l10n/nn_NO.php
@@ -5,20 +5,22 @@ $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",
"Text" => "Tekst",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Tenaren din er ikkje enno rett innstilt til å tilby filsynkronisering sidan WebDAV-grensesnittet ser ut til å vera øydelagt.",
-"Please double check the <a href='%s'>installation guides</a>." => "Ver vennleg og dobbeltsjekk <a href='%s'>installasjonsrettleiinga</a>.",
+"Please double check the <a href='%s'>installation guides</a>." => "Ver venleg og dobbeltsjekk <a href='%s'>installasjonsrettleiinga</a>.",
"seconds ago" => "sekund sidan",
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n minute ago_::_%n minutes ago_" => array("","%n minutt sidan"),
+"_%n hour ago_::_%n hours ago_" => array("","%n timar sidan"),
"today" => "i dag",
"yesterday" => "i går",
-"_%n day go_::_%n days ago_" => array("",""),
+"_%n day go_::_%n days ago_" => array("","%n dagar sidan"),
"last month" => "førre månad",
-"_%n month ago_::_%n months ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("","%n månadar sidan"),
"last year" => "i fjor",
"years ago" => "år sidan"
);
diff --git a/lib/l10n/nqo.php b/lib/l10n/nqo.php
new file mode 100644
index 0000000000000000000000000000000000000000..e7b09649a240500e39096daf02b7cc137312f444
--- /dev/null
+++ b/lib/l10n/nqo.php
@@ -0,0 +1,8 @@
+<?php
+$TRANSLATIONS = array(
+"_%n minute ago_::_%n minutes ago_" => array(""),
+"_%n hour ago_::_%n hours ago_" => array(""),
+"_%n day go_::_%n days ago_" => array(""),
+"_%n month ago_::_%n months ago_" => array("")
+);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
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/pl.php b/lib/l10n/pl.php
index 984043aa0bea587021ffa75e1bdb51f21953a5a2..270559b4e5067cef01a25103a5b8a32f971d0058 100644
--- a/lib/l10n/pl.php
+++ b/lib/l10n/pl.php
@@ -1,11 +1,16 @@
<?php
$TRANSLATIONS = array(
+"App \"%s\" can't be installed because it is not compatible with this version of ownCloud." => "Aplikacja \"%s\" nie może zostać zainstalowana, ponieważ nie jest zgodna z tą wersją ownCloud.",
+"No app name specified" => "Nie określono nazwy aplikacji",
"Help" => "Pomoc",
"Personal" => "Osobiste",
"Settings" => "Ustawienia",
"Users" => "Użytkownicy",
"Admin" => "Administrator",
"Failed to upgrade \"%s\"." => "Błąd przy aktualizacji \"%s\".",
+"Custom profile pictures don't work with encryption yet" => "Domyślny profil zdjęć nie działa z szyfrowaniem jeszcze",
+"Unknown filetype" => "Nieznany typ pliku",
+"Invalid image" => "Błędne zdjęcie",
"web services under your control" => "Kontrolowane serwisy",
"cannot open \"%s\"" => "Nie można otworzyć \"%s\"",
"ZIP download is turned off." => "Pobieranie ZIP jest wyłączone.",
@@ -13,6 +18,18 @@ $TRANSLATIONS = array(
"Back to Files" => "Wróć do plików",
"Selected files too large to generate zip file." => "Wybrane pliki są zbyt duże, aby wygenerować plik zip.",
"Download the files in smaller chunks, seperately or kindly ask your administrator." => "Pobierz pliki w mniejszy kawałkach, oddzielnie lub poproś administratora o zwiększenie limitu.",
+"No source specified when installing app" => "Nie określono źródła podczas instalacji aplikacji",
+"No href specified when installing app from http" => "Nie określono linku skąd aplikacja ma być zainstalowana",
+"No path specified when installing app from local file" => "Nie określono lokalnego pliku z którego miała być instalowana aplikacja",
+"Archives of type %s are not supported" => "Typ archiwum %s nie jest obsługiwany",
+"Failed to open archive when installing app" => "Nie udało się otworzyć archiwum podczas instalacji aplikacji",
+"App does not provide an info.xml file" => "Aplikacja nie posiada pliku info.xml",
+"App can't be installed because of not allowed code in the App" => "Aplikacja nie może być zainstalowany ponieważ nie dopuszcza kod w aplikacji",
+"App can't be installed because it is not compatible with this version of ownCloud" => "Aplikacja nie może zostać zainstalowana ponieważ jest niekompatybilna z tą wersja ownCloud",
+"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" => "Aplikacja nie może być zainstalowana ponieważ true tag nie jest <shipped>true</shipped> , co nie jest dozwolone dla aplikacji nie wysłanych",
+"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "Nie można zainstalować aplikacji, ponieważ w wersji info.xml/version nie jest taka sama, jak wersja z app store",
+"App directory already exists" => "Katalog aplikacji już isnieje",
+"Can't create app folder. Please fix permissions. %s" => "Nie mogę utworzyć katalogu aplikacji. Proszę popraw uprawnienia. %s",
"Application is not enabled" => "Aplikacja nie jest włączona",
"Authentication error" => "Błąd uwierzytelniania",
"Token expired. Please reload page." => "Token wygasł. Proszę ponownie załadować stronę.",
@@ -39,17 +56,17 @@ $TRANSLATIONS = array(
"Set an admin password." => "Ustaw hasło administratora.",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Serwer internetowy nie jest jeszcze poprawnie skonfigurowany, aby umożliwić synchronizację plików, ponieważ interfejs WebDAV wydaje się być uszkodzony.",
"Please double check the <a href='%s'>installation guides</a>." => "Sprawdź ponownie <a href='%s'>przewodniki instalacji</a>.",
+"Could not find category \"%s\"" => "Nie można odnaleźć kategorii \"%s\"",
"seconds ago" => "sekund temu",
-"_%n minute ago_::_%n minutes ago_" => array("","",""),
-"_%n hour ago_::_%n hours ago_" => array("","",""),
+"_%n minute ago_::_%n minutes ago_" => array("%n minute temu","%n minut temu","%n minut temu"),
+"_%n hour ago_::_%n hours ago_" => array("%n godzinę temu","%n godzin temu","%n godzin temu"),
"today" => "dziś",
"yesterday" => "wczoraj",
-"_%n day go_::_%n days ago_" => array("","",""),
+"_%n day go_::_%n days ago_" => array("%n dzień temu","%n dni temu","%n dni temu"),
"last month" => "w zeszłym miesiącu",
-"_%n month ago_::_%n months ago_" => array("","",""),
+"_%n month ago_::_%n months ago_" => array("%n miesiąc temu","%n miesięcy temu","%n miesięcy temu"),
"last year" => "w zeszłym roku",
"years ago" => "lat temu",
-"Caused by:" => "Spowodowane przez:",
-"Could not find category \"%s\"" => "Nie można odnaleźć kategorii \"%s\""
+"Caused by:" => "Spowodowane przez:"
);
$PLURAL_FORMS = "nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/lib/l10n/pt_BR.php b/lib/l10n/pt_BR.php
index a2379ca4883d76afac2edb367797f87a7ab0fff9..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.",
@@ -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." => "Seu servidor web não está configurado corretamente para permitir sincronização de arquivos porque a interface WebDAV parece estar quebrada.",
"Please double check the <a href='%s'>installation guides</a>." => "Por favor, confira os <a href='%s'>guias de instalação</a>.",
"seconds ago" => "segundos atrás",
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n minute ago_::_%n minutes ago_" => array("","ha %n minutos"),
+"_%n hour ago_::_%n hours ago_" => array("","ha %n horas"),
"today" => "hoje",
"yesterday" => "ontem",
-"_%n day go_::_%n days ago_" => array("",""),
+"_%n day go_::_%n days ago_" => array("","ha %n dias"),
"last month" => "último mês",
-"_%n month ago_::_%n months ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("","ha %n meses"),
"last year" => "último ano",
"years ago" => "anos atrás",
"Caused by:" => "Causados por:",
diff --git a/lib/l10n/pt_PT.php b/lib/l10n/pt_PT.php
index c8a2f78cbf5991460244534ef305bb41d167c207..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.",
@@ -40,13 +42,13 @@ $TRANSLATIONS = array(
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "O seu servidor web não está configurado correctamente para autorizar sincronização de ficheiros, pois o interface WebDAV parece estar com problemas.",
"Please double check the <a href='%s'>installation guides</a>." => "Por favor verifique <a href='%s'>installation guides</a>.",
"seconds ago" => "Minutos atrás",
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n minute ago_::_%n minutes ago_" => array("","%n minutos atrás"),
+"_%n hour ago_::_%n hours ago_" => array("","%n horas atrás"),
"today" => "hoje",
"yesterday" => "ontem",
-"_%n day go_::_%n days ago_" => array("",""),
+"_%n day go_::_%n days ago_" => array("","%n dias atrás"),
"last month" => "ultímo mês",
-"_%n month ago_::_%n months ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("","%n meses atrás"),
"last year" => "ano passado",
"years ago" => "anos atrás",
"Caused by:" => "Causado por:",
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/sk_SK.php b/lib/l10n/sk_SK.php
index 4101af247c2187141b382f35aade087c85dbd6ec..13487b039d68c79f660a825f883706c9155f2a0f 100644
--- a/lib/l10n/sk_SK.php
+++ b/lib/l10n/sk_SK.php
@@ -1,5 +1,7 @@
<?php
$TRANSLATIONS = array(
+"App \"%s\" can't be installed because it is not compatible with this version of ownCloud." => "Aplikácia \"%s\" nemôže byť nainštalovaná kvôli nekompatibilite z danou verziou ownCloudu.",
+"No app name specified" => "Nešpecifikované meno aplikácie",
"Help" => "Pomoc",
"Personal" => "Osobné",
"Settings" => "Nastavenia",
@@ -13,6 +15,18 @@ $TRANSLATIONS = array(
"Back to Files" => "Späť na súbory",
"Selected files too large to generate zip file." => "Zvolené súbory sú príliš veľké na vygenerovanie zip súboru.",
"Download the files in smaller chunks, seperately or kindly ask your administrator." => "Stiahnite súbory po menších častiach, samostatne, alebo sa obráťte na správcu.",
+"No source specified when installing app" => "Nešpecifikovaný zdroj pri inštalácii aplikácie",
+"No href specified when installing app from http" => "Nešpecifikovaný atribút \"href\" pri inštalácii aplikácie pomocou protokolu \"http\"",
+"No path specified when installing app from local file" => "Nešpecifikovaná cesta pri inštalácii aplikácie z lokálneho súboru",
+"Archives of type %s are not supported" => "Typ archívu %s nie je podporovaný",
+"Failed to open archive when installing app" => "Zlyhanie pri otváraní archívu počas inštalácie aplikácie",
+"App does not provide an info.xml file" => "Aplikácia neposkytuje súbor info.xml",
+"App can't be installed because of not allowed code in the App" => "Aplikácia nemôže byť inštalovaná pre nepovolený kód v aplikácii",
+"App can't be installed because it is not compatible with this version of ownCloud" => "Aplikácia nemôže byť inštalovaná pre nekompatibilitu z danou verziou ownCloudu",
+"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" => "Aplikácia nemôže byť inštalovaná pretože obsahuje <shipped>pravý</shipped> štítok, ktorý nie je povolený pre zaslané \"shipped\" aplikácie",
+"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "Aplikácia nemôže byť inštalovaná pretože verzia v info.xml/version nezodpovedá verzii špecifikovanej v aplikačnom obchode",
+"App directory already exists" => "Aplikačný adresár už existuje",
+"Can't create app folder. Please fix permissions. %s" => "Nemožno vytvoriť aplikačný priečinok. Prosím upravte povolenia. %s",
"Application is not enabled" => "Aplikácia nie je zapnutá",
"Authentication error" => "Chyba autentifikácie",
"Token expired. Please reload page." => "Token vypršal. Obnovte, prosím, stránku.",
diff --git a/lib/l10n/sq.php b/lib/l10n/sq.php
index c2447b7ea230371f3feb9887f4e9cb25b986bb36..edaa1df2b86b08b71afdb26cedca4bdfafe96f67 100644
--- a/lib/l10n/sq.php
+++ b/lib/l10n/sq.php
@@ -36,13 +36,13 @@ $TRANSLATIONS = array(
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Serveri web i juaji nuk është konfiguruar akoma për të lejuar sinkronizimin e skedarëve sepse ndërfaqja WebDAV mund të jetë e dëmtuar.",
"Please double check the <a href='%s'>installation guides</a>." => "Ju lutemi kontrolloni mirë <a href='%s'>shoqëruesin e instalimit</a>.",
"seconds ago" => "sekonda më parë",
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n minute ago_::_%n minutes ago_" => array("","%n minuta më parë"),
+"_%n hour ago_::_%n hours ago_" => array("","%n orë më parë"),
"today" => "sot",
"yesterday" => "dje",
-"_%n day go_::_%n days ago_" => array("",""),
+"_%n day go_::_%n days ago_" => array("","%n ditë më parë"),
"last month" => "muajin e shkuar",
-"_%n month ago_::_%n months ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("","%n muaj më parë"),
"last year" => "vitin e shkuar",
"years ago" => "vite më parë",
"Could not find category \"%s\"" => "Kategoria \"%s\" nuk u gjet"
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/l10n/sv.php b/lib/l10n/sv.php
index dd54e6ca5d320e74ecf531bff33f68ebba738b74..e7c3420a85ba9ee9a4f9a822444862d6ad2478d7 100644
--- a/lib/l10n/sv.php
+++ b/lib/l10n/sv.php
@@ -1,5 +1,7 @@
<?php
$TRANSLATIONS = array(
+"App \"%s\" can't be installed because it is not compatible with this version of ownCloud." => "Appen \"%s\" kan inte installeras eftersom att den inte är kompatibel med denna version av ownCloud.",
+"No app name specified" => "Inget appnamn angivet",
"Help" => "Hjälp",
"Personal" => "Personligt",
"Settings" => "Inställningar",
@@ -13,6 +15,18 @@ $TRANSLATIONS = array(
"Back to Files" => "Tillbaka till Filer",
"Selected files too large to generate zip file." => "Valda filer är för stora för att skapa zip-fil.",
"Download the files in smaller chunks, seperately or kindly ask your administrator." => "Ladda ner filerna i mindre bitar, separat eller fråga din administratör.",
+"No source specified when installing app" => "Ingen källa angiven vid installation av app ",
+"No href specified when installing app from http" => "Ingen href angiven vid installation av app från http",
+"No path specified when installing app from local file" => "Ingen sökväg angiven vid installation av app från lokal fil",
+"Archives of type %s are not supported" => "Arkiv av typen %s stöds ej",
+"Failed to open archive when installing app" => "Kunde inte öppna arkivet när appen skulle installeras",
+"App does not provide an info.xml file" => "Appen har ingen info.xml fil",
+"App can't be installed because of not allowed code in the App" => "Appen kan inte installeras eftersom att den innehåller otillåten kod",
+"App can't be installed because it is not compatible with this version of ownCloud" => "Appen kan inte installeras eftersom att den inte är kompatibel med denna version av ownCloud",
+"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" => "Appen kan inte installeras eftersom att den innehåller etiketten <shipped>true</shipped> vilket inte är tillåtet för icke inkluderade appar",
+"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "Appen kan inte installeras eftersom versionen i info.xml inte är samma som rapporteras från app store",
+"App directory already exists" => "Appens mapp finns redan",
+"Can't create app folder. Please fix permissions. %s" => "Kan inte skapa appens mapp. Var god åtgärda rättigheterna. %s",
"Application is not enabled" => "Applikationen är inte aktiverad",
"Authentication error" => "Fel vid autentisering",
"Token expired. Please reload page." => "Ogiltig token. Ladda om sidan.",
diff --git a/lib/l10n/ug.php b/lib/l10n/ug.php
index 731ad904d7e7480a3c094a52d6ab1ed4b095ff3b..e2cf38ecc8c810f9dbb36a7a63b8f62860529254 100644
--- a/lib/l10n/ug.php
+++ b/lib/l10n/ug.php
@@ -8,6 +8,7 @@ $TRANSLATIONS = array(
"Files" => "ھۆججەتلەر",
"Text" => "قىسقا ئۇچۇر",
"Images" => "سۈرەتلەر",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "سىزنىڭ تور مۇلازىمېتىرىڭىز ھۆججەت قەدەمداشلاشقا يول قويىدىغان قىلىپ توغرا تەڭشەلمەپتۇ، چۈنكى WebDAV نىڭ ئېغىزى بۇزۇلغاندەك تۇرىدۇ.",
"_%n minute ago_::_%n minutes ago_" => array(""),
"_%n hour ago_::_%n hours ago_" => array(""),
"today" => "بۈگۈن",
diff --git a/lib/l10n/zh_CN.php b/lib/l10n/zh_CN.php
index 03bd48de74b83c93e8b770568d902f0c131f20f5..2c34356ea10a00e137591d75b551f5e0e756e4ff 100644
--- a/lib/l10n/zh_CN.php
+++ b/lib/l10n/zh_CN.php
@@ -10,6 +10,7 @@ $TRANSLATIONS = array(
"Files need to be downloaded one by one." => "需要逐一下载文件",
"Back to Files" => "回到文件",
"Selected files too large to generate zip file." => "选择的文件太大，无法生成 zip 文件。",
+"App does not provide an info.xml file" => "应用未提供 info.xml 文件",
"Application is not enabled" => "应用程序未启用",
"Authentication error" => "认证出错",
"Token expired. Please reload page." => "Token 过期，请刷新页面。",
@@ -38,12 +39,12 @@ $TRANSLATIONS = array(
"Please double check the <a href='%s'>installation guides</a>." => "请认真检查<a href='%s'>安装指南</a>.",
"seconds ago" => "秒前",
"_%n minute ago_::_%n minutes ago_" => array("%n 分钟前"),
-"_%n hour ago_::_%n hours ago_" => array(""),
+"_%n hour ago_::_%n hours ago_" => array("%n 小时前"),
"today" => "今天",
"yesterday" => "昨天",
-"_%n day go_::_%n days ago_" => array(""),
+"_%n day go_::_%n days ago_" => array("%n 天前"),
"last month" => "上月",
-"_%n month ago_::_%n months ago_" => array(""),
+"_%n month ago_::_%n months ago_" => array("%n 月前"),
"last year" => "去年",
"years ago" => "年前",
"Could not find category \"%s\"" => "无法找到分类 \"%s\""
diff --git a/lib/legacy/cache.php b/lib/legacy/cache.php
new file mode 100644
index 0000000000000000000000000000000000000000..f915eb516b1e538c5db80b91b5fc17f1382426f2
--- /dev/null
+++ b/lib/legacy/cache.php
@@ -0,0 +1,10 @@
+<?php
+/**
+ * Copyright (c) 2013 Thomas Tanghus (thomas@tanghus.net)
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+class OC_Cache extends \OC\Cache {
+}
\ No newline at end of file
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/log/rotate.php b/lib/log/rotate.php
new file mode 100644
index 0000000000000000000000000000000000000000..bf23ad588b349abd059f82b853c58487ed0a63be
--- /dev/null
+++ b/lib/log/rotate.php
@@ -0,0 +1,35 @@
+<?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\Log;
+
+/**
+ * This rotates the current logfile to a new name, this way the total log usage
+ * will stay limited and older entries are available for a while longer.
+ * For more professional log management set the 'logfile' config to a different
+ * location and manage that with your own tools.
+ */
+class Rotate extends \OC\BackgroundJob\Job {
+ private $max_log_size;
+ public function run($logFile) {
+ $this->max_log_size = \OC_Config::getValue('log_rotate_size', false);
+ if ($this->max_log_size) {
+ $filesize = @filesize($logFile);
+ if ($filesize >= $this->max_log_size) {
+ $this->rotate($logFile);
+ }
+ }
+ }
+
+ protected function rotate($logfile) {
+ $rotatedLogfile = $logfile.'.1';
+ rename($logfile, $rotatedLogfile);
+ $msg = 'Log file "'.$logfile.'" was over '.$this->max_log_size.' bytes, moved to "'.$rotatedLogfile.'"';
+ \OC_Log::write('OC\Log\Rotate', $msg, \OC_Log::WARN);
+ }
+}
diff --git a/lib/migration/content.php b/lib/migration/content.php
index 2d8268a1d74b2a08fbcd15cea3d25ff18e20fc34..4413d722731db4666d344c6b20cf9e9671fae073 100644
--- a/lib/migration/content.php
+++ b/lib/migration/content.php
@@ -191,7 +191,8 @@ class OC_Migration_Content{
if( !file_exists( $dir ) ) {
return false;
}
- if ($dirhandle = opendir($dir)) {
+ $dirhandle = opendir($dir);
+ if(is_resource($dirhandle)) {
while (false !== ( $file = readdir($dirhandle))) {
if (( $file != '.' ) && ( $file != '..' )) {
diff --git a/lib/navigationmanager.php b/lib/navigationmanager.php
new file mode 100644
index 0000000000000000000000000000000000000000..1f657b9ad80fd8b47edf0c381efd09132dd1ae15
--- /dev/null
+++ b/lib/navigationmanager.php
@@ -0,0 +1,64 @@
+<?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;
+
+/**
+ * Manages the ownCloud navigation
+ */
+class NavigationManager implements \OCP\INavigationManager {
+ protected $entries = array();
+ protected $activeEntry;
+
+ /**
+ * Creates a new navigation entry
+ * @param array $entry containing: id, name, order, icon and href key
+ */
+ public function add(array $entry) {
+ $entry['active'] = false;
+ if(!isset($entry['icon'])) {
+ $entry['icon'] = '';
+ }
+ $this->entries[] = $entry;
+ }
+
+ /**
+ * @brief returns all the added Menu entries
+ * @return array of the added entries
+ */
+ public function getAll() {
+ return $this->entries;
+ }
+
+ /**
+ * @brief removes all the entries
+ */
+ public function clear() {
+ $this->entries = array();
+ }
+
+ /**
+ * Sets the current navigation entry of the currently running app
+ * @param string $id of the app entry to activate (from added $entry)
+ */
+ public function setActiveEntry($id) {
+ $this->activeEntry = $id;
+ }
+
+ /**
+ * @brief gets the active Menu entry
+ * @return string id or empty string
+ *
+ * This function returns the id of the active navigation entry (set by
+ * setActiveEntry
+ */
+ public function getActiveEntry() {
+ return $this->activeEntry;
+ }
+}
diff --git a/lib/notsquareexception.php b/lib/notsquareexception.php
new file mode 100644
index 0000000000000000000000000000000000000000..03dba8fb25f216feb72519d9985e30e735c1d2c7
--- /dev/null
+++ b/lib/notsquareexception.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * Copyright (c) 2013 Christopher Schäpers <christopher@schaepers.it>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC;
+
+class NotSquareException extends \Exception {
+}
diff --git a/lib/ocs/activity.php b/lib/ocs/activity.php
deleted file mode 100644
index c30e21018d33921afdda06d540f79bbf4e1159b4..0000000000000000000000000000000000000000
--- a/lib/ocs/activity.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
-* ownCloud
-*
-* @author Frank Karlitschek
-* @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/>.
-*
-*/
-
-class OC_OCS_Activity {
-
- public static function activityGet($parameters){
- // TODO
- }
-}
diff --git a/lib/ocsclient.php b/lib/ocsclient.php
index 67966fe7cd0ee07ee19b4fdd88b345a24b6e7792..e35556d92b80abc253ca7ed884c08a8dae13a3f6 100644
--- a/lib/ocsclient.php
+++ b/lib/ocsclient.php
@@ -45,16 +45,6 @@ class OC_OCSClient{
return($url);
}
- /**
- * @brief Get the url of the OCS KB server.
- * @returns string of the KB server
- * This function returns the url of the OCS knowledge base server. It´s
- * possible to set it in the config file or it will fallback to the default
- */
- private static function getKBURL() {
- $url = OC_Config::getValue('knowledgebaseurl', 'http://api.apps.owncloud.com/v1');
- return($url);
- }
/**
* @brief Get the content of an OCS url call.
@@ -219,44 +209,5 @@ class OC_OCSClient{
}
- /**
- * @brief Get all the knowledgebase entries from the OCS server
- * @returns array with q and a data
- *
- * This function returns a list of all the knowledgebase entries from the OCS server
- */
- public static function getKnownledgebaseEntries($page, $pagesize, $search='') {
- $kbe = array('totalitems' => 0);
- if(OC_Config::getValue('knowledgebaseenabled', true)) {
- $p = (int) $page;
- $s = (int) $pagesize;
- $searchcmd = '';
- if ($search) {
- $searchcmd = '&search='.urlencode($search);
- }
- $url = OC_OCSClient::getKBURL().'/knowledgebase/data?type=150&page='. $p .'&pagesize='. $s . $searchcmd;
- $xml = OC_OCSClient::getOCSresponse($url);
- $data = @simplexml_load_string($xml);
- if($data===false) {
- OC_Log::write('core', 'Unable to parse knowledgebase content', OC_Log::FATAL);
- return null;
- }
- $tmp = $data->data->content;
- for($i = 0; $i < count($tmp); $i++) {
- $kbe[] = array(
- 'id' => $tmp[$i]->id,
- 'name' => $tmp[$i]->name,
- 'description' => $tmp[$i]->description,
- 'answer' => $tmp[$i]->answer,
- 'preview1' => $tmp[$i]->smallpreviewpic1,
- 'detailpage' => $tmp[$i]->detailpage
- );
- }
- $kbe['totalitems'] = $data->meta->totalitems;
- }
- return $kbe;
- }
-
-
}
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/preview.php b/lib/preview.php
new file mode 100755
index 0000000000000000000000000000000000000000..266f7795f12f420402c9809b67cbcc376e51444e
--- /dev/null
+++ b/lib/preview.php
@@ -0,0 +1,630 @@
+<?php
+/**
+ * Copyright (c) 2013 Frank Karlitschek frank@owncloud.org
+ * Copyright (c) 2013 Georg Ehrke georg@ownCloud.com
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ *
+ * Thumbnails:
+ * structure of filename:
+ * /data/user/thumbnails/pathhash/x-y.png
+ *
+ */
+namespace OC;
+
+require_once 'preview/image.php';
+require_once 'preview/movies.php';
+require_once 'preview/mp3.php';
+require_once 'preview/pdf.php';
+require_once 'preview/svg.php';
+require_once 'preview/txt.php';
+require_once 'preview/unknown.php';
+require_once 'preview/office.php';
+
+class Preview {
+ //the thumbnail folder
+ const THUMBNAILS_FOLDER = 'thumbnails';
+
+ //config
+ private $maxScaleFactor;
+ private $configMaxX;
+ private $configMaxY;
+
+ //fileview object
+ private $fileView = null;
+ private $userView = null;
+
+ //vars
+ private $file;
+ private $maxX;
+ private $maxY;
+ private $scalingup;
+
+ //preview images object
+ /**
+ * @var \OC_Image
+ */
+ private $preview;
+
+ //preview providers
+ static private $providers = array();
+ static private $registeredProviders = array();
+
+ /**
+ * @brief check if thumbnail or bigger version of thumbnail of file is cached
+ * @param string $user userid - if no user is given, OC_User::getUser will be used
+ * @param string $root path of root
+ * @param string $file The path to the file where you want a thumbnail from
+ * @param int $maxX The maximum X size of the thumbnail. It can be smaller depending on the shape of the image
+ * @param int $maxY The maximum Y size of the thumbnail. It can be smaller depending on the shape of the image
+ * @param bool $scalingUp Disable/Enable upscaling of previews
+ * @return mixed (bool / string)
+ * false if thumbnail does not exist
+ * path to thumbnail if thumbnail exists
+ */
+ public function __construct($user='', $root='/', $file='', $maxX=1, $maxY=1, $scalingUp=true) {
+ //set config
+ $this->configMaxX = \OC_Config::getValue('preview_max_x', null);
+ $this->configMaxY = \OC_Config::getValue('preview_max_y', null);
+ $this->maxScaleFactor = \OC_Config::getValue('preview_max_scale_factor', 2);
+
+ //save parameters
+ $this->setFile($file);
+ $this->setMaxX($maxX);
+ $this->setMaxY($maxY);
+ $this->setScalingUp($scalingUp);
+
+ //init fileviews
+ if($user === ''){
+ $user = \OC_User::getUser();
+ }
+ $this->fileView = new \OC\Files\View('/' . $user . '/' . $root);
+ $this->userView = new \OC\Files\View('/' . $user);
+
+ $this->preview = null;
+
+ //check if there are preview backends
+ if(empty(self::$providers)) {
+ self::initProviders();
+ }
+
+ if(empty(self::$providers)) {
+ \OC_Log::write('core', 'No preview providers exist', \OC_Log::ERROR);
+ throw new \Exception('No preview providers');
+ }
+ }
+
+ /**
+ * @brief returns the path of the file you want a thumbnail from
+ * @return string
+ */
+ public function getFile() {
+ return $this->file;
+ }
+
+ /**
+ * @brief returns the max width of the preview
+ * @return integer
+ */
+ public function getMaxX() {
+ return $this->maxX;
+ }
+
+ /**
+ * @brief returns the max height of the preview
+ * @return integer
+ */
+ public function getMaxY() {
+ return $this->maxY;
+ }
+
+ /**
+ * @brief returns whether or not scalingup is enabled
+ * @return bool
+ */
+ public function getScalingUp() {
+ return $this->scalingup;
+ }
+
+ /**
+ * @brief returns the name of the thumbnailfolder
+ * @return string
+ */
+ public function getThumbnailsFolder() {
+ return self::THUMBNAILS_FOLDER;
+ }
+
+ /**
+ * @brief returns the max scale factor
+ * @return integer
+ */
+ public function getMaxScaleFactor() {
+ return $this->maxScaleFactor;
+ }
+
+ /**
+ * @brief returns the max width set in ownCloud's config
+ * @return integer
+ */
+ public function getConfigMaxX() {
+ return $this->configMaxX;
+ }
+
+ /**
+ * @brief returns the max height set in ownCloud's config
+ * @return integer
+ */
+ public function getConfigMaxY() {
+ return $this->configMaxY;
+ }
+
+ /**
+ * @brief set the path of the file you want a thumbnail from
+ * @param string $file
+ * @return $this
+ */
+ public function setFile($file) {
+ $this->file = $file;
+ return $this;
+ }
+
+ /**
+ * @brief set the the max width of the preview
+ * @param int $maxX
+ * @return $this
+ */
+ public function setMaxX($maxX=1) {
+ if($maxX <= 0) {
+ throw new \Exception('Cannot set width of 0 or smaller!');
+ }
+ $configMaxX = $this->getConfigMaxX();
+ if(!is_null($configMaxX)) {
+ if($maxX > $configMaxX) {
+ \OC_Log::write('core', 'maxX reduced from ' . $maxX . ' to ' . $configMaxX, \OC_Log::DEBUG);
+ $maxX = $configMaxX;
+ }
+ }
+ $this->maxX = $maxX;
+ return $this;
+ }
+
+ /**
+ * @brief set the the max height of the preview
+ * @param int $maxY
+ * @return $this
+ */
+ public function setMaxY($maxY=1) {
+ if($maxY <= 0) {
+ throw new \Exception('Cannot set height of 0 or smaller!');
+ }
+ $configMaxY = $this->getConfigMaxY();
+ if(!is_null($configMaxY)) {
+ if($maxY > $configMaxY) {
+ \OC_Log::write('core', 'maxX reduced from ' . $maxY . ' to ' . $configMaxY, \OC_Log::DEBUG);
+ $maxY = $configMaxY;
+ }
+ }
+ $this->maxY = $maxY;
+ return $this;
+ }
+
+ /**
+ * @brief set whether or not scalingup is enabled
+ * @param bool $scalingUp
+ * @return $this
+ */
+ public function setScalingup($scalingUp) {
+ if($this->getMaxScaleFactor() === 1) {
+ $scalingUp = false;
+ }
+ $this->scalingup = $scalingUp;
+ return $this;
+ }
+
+ /**
+ * @brief check if all parameters are valid
+ * @return bool
+ */
+ public function isFileValid() {
+ $file = $this->getFile();
+ if($file === '') {
+ \OC_Log::write('core', 'No filename passed', \OC_Log::DEBUG);
+ return false;
+ }
+
+ if(!$this->fileView->file_exists($file)) {
+ \OC_Log::write('core', 'File:"' . $file . '" not found', \OC_Log::DEBUG);
+ return false;
+ }
+
+ return true;
+ }
+
+ /**
+ * @brief deletes previews of a file with specific x and y
+ * @return bool
+ */
+ public function deletePreview() {
+ $file = $this->getFile();
+
+ $fileInfo = $this->fileView->getFileInfo($file);
+ $fileId = $fileInfo['fileid'];
+
+ $previewPath = $this->getThumbnailsFolder() . '/' . $fileId . '/' . $this->getMaxX() . '-' . $this->getMaxY() . '.png';
+ $this->userView->unlink($previewPath);
+ return !$this->userView->file_exists($previewPath);
+ }
+
+ /**
+ * @brief deletes all previews of a file
+ * @return bool
+ */
+ public function deleteAllPreviews() {
+ $file = $this->getFile();
+
+ $fileInfo = $this->fileView->getFileInfo($file);
+ $fileId = $fileInfo['fileid'];
+
+ $previewPath = $this->getThumbnailsFolder() . '/' . $fileId . '/';
+ $this->userView->deleteAll($previewPath);
+ $this->userView->rmdir($previewPath);
+ return !$this->userView->is_dir($previewPath);
+ }
+
+ /**
+ * @brief check if thumbnail or bigger version of thumbnail of file is cached
+ * @return mixed (bool / string)
+ * false if thumbnail does not exist
+ * path to thumbnail if thumbnail exists
+ */
+ private function isCached() {
+ $file = $this->getFile();
+ $maxX = $this->getMaxX();
+ $maxY = $this->getMaxY();
+ $scalingUp = $this->getScalingUp();
+ $maxScaleFactor = $this->getMaxScaleFactor();
+
+ $fileInfo = $this->fileView->getFileInfo($file);
+ $fileId = $fileInfo['fileid'];
+
+ if(is_null($fileId)) {
+ return false;
+ }
+
+ $previewPath = $this->getThumbnailsFolder() . '/' . $fileId . '/';
+ if(!$this->userView->is_dir($previewPath)) {
+ return false;
+ }
+
+ //does a preview with the wanted height and width already exist?
+ if($this->userView->file_exists($previewPath . $maxX . '-' . $maxY . '.png')) {
+ return $previewPath . $maxX . '-' . $maxY . '.png';
+ }
+
+ $wantedAspectRatio = (float) ($maxX / $maxY);
+
+ //array for usable cached thumbnails
+ $possibleThumbnails = array();
+
+ $allThumbnails = $this->userView->getDirectoryContent($previewPath);
+ foreach($allThumbnails as $thumbnail) {
+ $name = rtrim($thumbnail['name'], '.png');
+ $size = explode('-', $name);
+ $x = (int) $size[0];
+ $y = (int) $size[1];
+
+ $aspectRatio = (float) ($x / $y);
+ if($aspectRatio !== $wantedAspectRatio) {
+ continue;
+ }
+
+ if($x < $maxX || $y < $maxY) {
+ if($scalingUp) {
+ $scalefactor = $maxX / $x;
+ if($scalefactor > $maxScaleFactor) {
+ continue;
+ }
+ }else{
+ continue;
+ }
+ }
+ $possibleThumbnails[$x] = $thumbnail['path'];
+ }
+
+ if(count($possibleThumbnails) === 0) {
+ return false;
+ }
+
+ if(count($possibleThumbnails) === 1) {
+ return current($possibleThumbnails);
+ }
+
+ ksort($possibleThumbnails);
+
+ if(key(reset($possibleThumbnails)) > $maxX) {
+ return current(reset($possibleThumbnails));
+ }
+
+ if(key(end($possibleThumbnails)) < $maxX) {
+ return current(end($possibleThumbnails));
+ }
+
+ foreach($possibleThumbnails as $width => $path) {
+ if($width < $maxX) {
+ continue;
+ }else{
+ return $path;
+ }
+ }
+ }
+
+ /**
+ * @brief return a preview of a file
+ * @return \OC_Image
+ */
+ public function getPreview() {
+ if(!is_null($this->preview) && $this->preview->valid()){
+ return $this->preview;
+ }
+
+ $this->preview = null;
+ $file = $this->getFile();
+ $maxX = $this->getMaxX();
+ $maxY = $this->getMaxY();
+ $scalingUp = $this->getScalingUp();
+
+ $fileInfo = $this->fileView->getFileInfo($file);
+ $fileId = $fileInfo['fileid'];
+
+ $cached = $this->isCached();
+
+ if($cached) {
+ $image = new \OC_Image($this->userView->file_get_contents($cached, 'r'));
+ $this->preview = $image->valid() ? $image : null;
+ $this->resizeAndCrop();
+ }
+
+ if(is_null($this->preview)) {
+ $mimetype = $this->fileView->getMimeType($file);
+ $preview = null;
+
+ foreach(self::$providers as $supportedMimetype => $provider) {
+ if(!preg_match($supportedMimetype, $mimetype)) {
+ continue;
+ }
+
+ \OC_Log::write('core', 'Generating preview for "' . $file . '" with "' . get_class($provider) . '"', \OC_Log::DEBUG);
+
+ $preview = $provider->getThumbnail($file, $maxX, $maxY, $scalingUp, $this->fileView);
+
+ if(!($preview instanceof \OC_Image)) {
+ continue;
+ }
+
+ $this->preview = $preview;
+ $this->resizeAndCrop();
+
+ $previewPath = $this->getThumbnailsFolder() . '/' . $fileId . '/';
+ $cachePath = $previewPath . $maxX . '-' . $maxY . '.png';
+
+ if($this->userView->is_dir($this->getThumbnailsFolder() . '/') === false) {
+ $this->userView->mkdir($this->getThumbnailsFolder() . '/');
+ }
+
+ if($this->userView->is_dir($previewPath) === false) {
+ $this->userView->mkdir($previewPath);
+ }
+
+ $this->userView->file_put_contents($cachePath, $preview->data());
+
+ break;
+ }
+ }
+
+ if(is_null($this->preview)) {
+ $this->preview = new \OC_Image();
+ }
+
+ return $this->preview;
+ }
+
+ /**
+ * @brief show preview
+ * @return void
+ */
+ public function showPreview() {
+ \OCP\Response::enableCaching(3600 * 24); // 24 hours
+ if(is_null($this->preview)) {
+ $this->getPreview();
+ }
+ $this->preview->show();
+ return;
+ }
+
+ /**
+ * @brief show preview
+ * @return void
+ */
+ public function show() {
+ $this->showPreview();
+ return;
+ }
+
+ /**
+ * @brief resize, crop and fix orientation
+ * @return void
+ */
+ private function resizeAndCrop() {
+ $image = $this->preview;
+ $x = $this->getMaxX();
+ $y = $this->getMaxY();
+ $scalingUp = $this->getScalingUp();
+ $maxscalefactor = $this->getMaxScaleFactor();
+
+ if(!($image instanceof \OC_Image)) {
+ \OC_Log::write('core', '$this->preview is not an instance of OC_Image', \OC_Log::DEBUG);
+ return;
+ }
+
+ $image->fixOrientation();
+
+ $realx = (int) $image->width();
+ $realy = (int) $image->height();
+
+ if($x === $realx && $y === $realy) {
+ $this->preview = $image;
+ return;
+ }
+
+ $factorX = $x / $realx;
+ $factorY = $y / $realy;
+
+ if($factorX >= $factorY) {
+ $factor = $factorX;
+ }else{
+ $factor = $factorY;
+ }
+
+ if($scalingUp === false) {
+ if($factor > 1) {
+ $factor = 1;
+ }
+ }
+
+ if(!is_null($maxscalefactor)) {
+ if($factor > $maxscalefactor) {
+ \OC_Log::write('core', 'scalefactor reduced from ' . $factor . ' to ' . $maxscalefactor, \OC_Log::DEBUG);
+ $factor = $maxscalefactor;
+ }
+ }
+
+ $newXsize = (int) ($realx * $factor);
+ $newYsize = (int) ($realy * $factor);
+
+ $image->preciseResize($newXsize, $newYsize);
+
+ if($newXsize === $x && $newYsize === $y) {
+ $this->preview = $image;
+ return;
+ }
+
+ if($newXsize >= $x && $newYsize >= $y) {
+ $cropX = floor(abs($x - $newXsize) * 0.5);
+ //don't crop previews on the Y axis, this sucks if it's a document.
+ //$cropY = floor(abs($y - $newYsize) * 0.5);
+ $cropY = 0;
+
+ $image->crop($cropX, $cropY, $x, $y);
+
+ $this->preview = $image;
+ return;
+ }
+
+ if($newXsize < $x || $newYsize < $y) {
+ if($newXsize > $x) {
+ $cropX = floor(($newXsize - $x) * 0.5);
+ $image->crop($cropX, 0, $x, $newYsize);
+ }
+
+ if($newYsize > $y) {
+ $cropY = floor(($newYsize - $y) * 0.5);
+ $image->crop(0, $cropY, $newXsize, $y);
+ }
+
+ $newXsize = (int) $image->width();
+ $newYsize = (int) $image->height();
+
+ //create transparent background layer
+ $backgroundlayer = imagecreatetruecolor($x, $y);
+ $white = imagecolorallocate($backgroundlayer, 255, 255, 255);
+ imagefill($backgroundlayer, 0, 0, $white);
+
+ $image = $image->resource();
+
+ $mergeX = floor(abs($x - $newXsize) * 0.5);
+ $mergeY = floor(abs($y - $newYsize) * 0.5);
+
+ imagecopy($backgroundlayer, $image, $mergeX, $mergeY, 0, 0, $newXsize, $newYsize);
+
+ //$black = imagecolorallocate(0,0,0);
+ //imagecolortransparent($transparentlayer, $black);
+
+ $image = new \OC_Image($backgroundlayer);
+
+ $this->preview = $image;
+ return;
+ }
+ }
+
+ /**
+ * @brief register a new preview provider to be used
+ * @param string $provider class name of a Preview_Provider
+ * @param array $options
+ * @return void
+ */
+ public static function registerProvider($class, $options=array()) {
+ self::$registeredProviders[]=array('class'=>$class, 'options'=>$options);
+ }
+
+ /**
+ * @brief create instances of all the registered preview providers
+ * @return void
+ */
+ private static function initProviders() {
+ if(!\OC_Config::getValue('enable_previews', true)) {
+ $provider = new Preview\Unknown(array());
+ self::$providers = array($provider->getMimeType() => $provider);
+ return;
+ }
+
+ if(count(self::$providers)>0) {
+ return;
+ }
+
+ foreach(self::$registeredProviders as $provider) {
+ $class=$provider['class'];
+ $options=$provider['options'];
+
+ $object = new $class($options);
+
+ self::$providers[$object->getMimeType()] = $object;
+ }
+
+ $keys = array_map('strlen', array_keys(self::$providers));
+ array_multisort($keys, SORT_DESC, self::$providers);
+ }
+
+ public static function post_write($args) {
+ self::post_delete($args);
+ }
+
+ public static function post_delete($args) {
+ $path = $args['path'];
+ if(substr($path, 0, 1) === '/') {
+ $path = substr($path, 1);
+ }
+ $preview = new Preview(\OC_User::getUser(), 'files/', $path);
+ $preview->deleteAllPreviews();
+ }
+
+ public static function isMimeSupported($mimetype) {
+ if(!\OC_Config::getValue('enable_previews', true)) {
+ return false;
+ }
+
+ //check if there are preview backends
+ if(empty(self::$providers)) {
+ self::initProviders();
+ }
+
+ //remove last element because it has the mimetype *
+ $providers = array_slice(self::$providers, 0, -1);
+ foreach($providers as $supportedMimetype => $provider) {
+ if(preg_match($supportedMimetype, $mimetype)) {
+ return true;
+ }
+ }
+ return false;
+ }
+}
diff --git a/lib/preview/image.php b/lib/preview/image.php
new file mode 100644
index 0000000000000000000000000000000000000000..9aec967282d5768c29941ec4367da06a73c825a0
--- /dev/null
+++ b/lib/preview/image.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Copyright (c) 2013 Frank Karlitschek frank@owncloud.org
+ * Copyright (c) 2013 Georg Ehrke georg@ownCloud.com
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+namespace OC\Preview;
+
+class Image extends Provider {
+
+ public function getMimeType() {
+ return '/image\/.*/';
+ }
+
+ public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) {
+ //get fileinfo
+ $fileInfo = $fileview->getFileInfo($path);
+ if(!$fileInfo) {
+ return false;
+ }
+
+ //check if file is encrypted
+ if($fileInfo['encrypted'] === true) {
+ $image = new \OC_Image(stream_get_contents($fileview->fopen($path, 'r')));
+ }else{
+ $image = new \OC_Image();
+ $image->loadFromFile($fileview->getLocalFile($path));
+ }
+
+ return $image->valid() ? $image : false;
+ }
+}
+
+\OC\Preview::registerProvider('OC\Preview\Image');
\ No newline at end of file
diff --git a/lib/preview/movies.php b/lib/preview/movies.php
new file mode 100644
index 0000000000000000000000000000000000000000..c318137ff0e06b9ca24836b60455114938003954
--- /dev/null
+++ b/lib/preview/movies.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Copyright (c) 2013 Frank Karlitschek frank@owncloud.org
+ * Copyright (c) 2013 Georg Ehrke georg@ownCloud.com
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+namespace OC\Preview;
+
+$isShellExecEnabled = !in_array('shell_exec', explode(', ', ini_get('disable_functions')));
+$whichAVCONV = shell_exec('which avconv');
+$isAVCONVAvailable = !empty($whichAVCONV);
+
+if($isShellExecEnabled && $isAVCONVAvailable) {
+
+ class Movie extends Provider {
+
+ public function getMimeType() {
+ return '/video\/.*/';
+ }
+
+ public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) {
+ $absPath = \OC_Helper::tmpFile();
+ $tmpPath = \OC_Helper::tmpFile();
+
+ $handle = $fileview->fopen($path, 'rb');
+
+ $firstmb = stream_get_contents($handle, 1048576); //1024 * 1024 = 1048576
+ file_put_contents($absPath, $firstmb);
+
+ //$cmd = 'ffmpeg -y -i ' . escapeshellarg($absPath) . ' -f mjpeg -vframes 1 -ss 1 -s ' . escapeshellarg($maxX) . 'x' . escapeshellarg($maxY) . ' ' . $tmpPath;
+ $cmd = 'avconv -an -y -ss 1 -i ' . escapeshellarg($absPath) . ' -f mjpeg -vframes 1 ' . escapeshellarg($tmpPath);
+
+ shell_exec($cmd);
+
+ $image = new \OC_Image($tmpPath);
+
+ unlink($absPath);
+ unlink($tmpPath);
+
+ return $image->valid() ? $image : false;
+ }
+ }
+
+ \OC\Preview::registerProvider('OC\Preview\Movie');
+}
\ No newline at end of file
diff --git a/lib/preview/mp3.php b/lib/preview/mp3.php
new file mode 100644
index 0000000000000000000000000000000000000000..1eed566315c7bb187f25cb35b1b69b0695760efe
--- /dev/null
+++ b/lib/preview/mp3.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Copyright (c) 2013 Georg Ehrke georg@ownCloud.com
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+namespace OC\Preview;
+
+class MP3 extends Provider {
+
+ public function getMimeType() {
+ return '/audio\/mpeg/';
+ }
+
+ public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) {
+ require_once('getid3/getid3.php');
+
+ $getID3 = new \getID3();
+
+ $tmpPath = $fileview->toTmpFile($path);
+
+ $tags = $getID3->analyze($tmpPath);
+ \getid3_lib::CopyTagsToComments($tags);
+ if(isset($tags['id3v2']['APIC'][0]['data'])) {
+ $picture = @$tags['id3v2']['APIC'][0]['data'];
+ unlink($tmpPath);
+ $image = new \OC_Image($picture);
+ return $image->valid() ? $image : $this->getNoCoverThumbnail();
+ }
+
+ return $this->getNoCoverThumbnail();
+ }
+
+ private function getNoCoverThumbnail() {
+ $icon = \OC::$SERVERROOT . '/core/img/filetypes/audio.png';
+
+ if(!file_exists($icon)) {
+ return false;
+ }
+
+ $image = new \OC_Image($icon);
+ return $image->valid() ? $image : false;
+ }
+
+}
+
+\OC\Preview::registerProvider('OC\Preview\MP3');
\ No newline at end of file
diff --git a/lib/preview/office-cl.php b/lib/preview/office-cl.php
new file mode 100644
index 0000000000000000000000000000000000000000..112909d652352c9d806a0fd98adeee4e8b806d93
--- /dev/null
+++ b/lib/preview/office-cl.php
@@ -0,0 +1,134 @@
+<?php
+/**
+ * Copyright (c) 2013 Georg Ehrke georg@ownCloud.com
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+namespace OC\Preview;
+
+//we need imagick to convert
+class Office extends Provider {
+
+ private $cmd;
+
+ public function getMimeType() {
+ return null;
+ }
+
+ public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) {
+ $this->initCmd();
+ if(is_null($this->cmd)) {
+ return false;
+ }
+
+ $absPath = $fileview->toTmpFile($path);
+
+ $tmpDir = get_temp_dir();
+
+ $defaultParameters = ' --headless --nologo --nofirststartwizard --invisible --norestore -convert-to pdf -outdir ';
+ $clParameters = \OCP\Config::getSystemValue('preview_office_cl_parameters', $defaultParameters);
+
+ $exec = $this->cmd . $clParameters . escapeshellarg($tmpDir) . ' ' . escapeshellarg($absPath);
+ $export = 'export HOME=/' . $tmpDir;
+
+ shell_exec($export . "\n" . $exec);
+
+ //create imagick object from pdf
+ try{
+ $pdf = new \imagick($absPath . '.pdf' . '[0]');
+ $pdf->setImageFormat('jpg');
+ } catch (\Exception $e) {
+ unlink($absPath);
+ unlink($absPath . '.pdf');
+ \OC_Log::write('core', $e->getmessage(), \OC_Log::ERROR);
+ return false;
+ }
+
+ $image = new \OC_Image($pdf);
+
+ unlink($absPath);
+ unlink($absPath . '.pdf');
+
+ return $image->valid() ? $image : false;
+ }
+
+ private function initCmd() {
+ $cmd = '';
+
+ if(is_string(\OC_Config::getValue('preview_libreoffice_path', null))) {
+ $cmd = \OC_Config::getValue('preview_libreoffice_path', null);
+ }
+
+ $whichLibreOffice = shell_exec('which libreoffice');
+ if($cmd === '' && !empty($whichLibreOffice)) {
+ $cmd = 'libreoffice';
+ }
+
+ $whichOpenOffice = shell_exec('which openoffice');
+ if($cmd === '' && !empty($whichOpenOffice)) {
+ $cmd = 'openoffice';
+ }
+
+ if($cmd === '') {
+ $cmd = null;
+ }
+
+ $this->cmd = $cmd;
+ }
+}
+
+//.doc, .dot
+class MSOfficeDoc extends Office {
+
+ public function getMimeType() {
+ return '/application\/msword/';
+ }
+
+}
+
+\OC\Preview::registerProvider('OC\Preview\MSOfficeDoc');
+
+//.docm, .dotm, .xls(m), .xlt(m), .xla(m), .ppt(m), .pot(m), .pps(m), .ppa(m)
+class MSOffice2003 extends Office {
+
+ public function getMimeType() {
+ return '/application\/vnd.ms-.*/';
+ }
+
+}
+
+\OC\Preview::registerProvider('OC\Preview\MSOffice2003');
+
+//.docx, .dotx, .xlsx, .xltx, .pptx, .potx, .ppsx
+class MSOffice2007 extends Office {
+
+ public function getMimeType() {
+ return '/application\/vnd.openxmlformats-officedocument.*/';
+ }
+
+}
+
+\OC\Preview::registerProvider('OC\Preview\MSOffice2007');
+
+//.odt, .ott, .oth, .odm, .odg, .otg, .odp, .otp, .ods, .ots, .odc, .odf, .odb, .odi, .oxt
+class OpenDocument extends Office {
+
+ public function getMimeType() {
+ return '/application\/vnd.oasis.opendocument.*/';
+ }
+
+}
+
+\OC\Preview::registerProvider('OC\Preview\OpenDocument');
+
+//.sxw, .stw, .sxc, .stc, .sxd, .std, .sxi, .sti, .sxg, .sxm
+class StarOffice extends Office {
+
+ public function getMimeType() {
+ return '/application\/vnd.sun.xml.*/';
+ }
+
+}
+
+\OC\Preview::registerProvider('OC\Preview\StarOffice');
\ No newline at end of file
diff --git a/lib/preview/office-fallback.php b/lib/preview/office-fallback.php
new file mode 100644
index 0000000000000000000000000000000000000000..e69ab0ab8cbe95b3e663ed40de633d2c0a29738c
--- /dev/null
+++ b/lib/preview/office-fallback.php
@@ -0,0 +1,142 @@
+<?php
+/**
+ * Copyright (c) 2013 Georg Ehrke georg@ownCloud.com
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+namespace OC\Preview;
+
+/* //There is no (good) php-only solution for converting 2003 word documents to pdfs / pngs ...
+class DOC extends Provider {
+
+ public function getMimeType() {
+ return '/application\/msword/';
+ }
+
+ public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) {
+ require_once('');
+ }
+
+}
+
+\OC\Preview::registerProvider('OC\Preview\DOC');
+*/
+
+class DOCX extends Provider {
+
+ public function getMimeType() {
+ return '/application\/vnd.openxmlformats-officedocument.wordprocessingml.document/';
+ }
+
+ public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) {
+ require_once('phpdocx/classes/TransformDoc.inc');
+
+ $tmpDoc = $fileview->toTmpFile($path);
+
+ $transformdoc = new \TransformDoc();
+ $transformdoc->setStrFile($tmpDoc);
+ $transformdoc->generatePDF($tmpDoc);
+
+ $pdf = new \imagick($tmpDoc . '[0]');
+ $pdf->setImageFormat('jpg');
+
+ unlink($tmpDoc);
+
+ $image = new \OC_Image($pdf);
+
+ return $image->valid() ? $image : false;
+ }
+
+}
+
+\OC\Preview::registerProvider('OC\Preview\DOCX');
+
+class MSOfficeExcel extends Provider {
+
+ public function getMimeType() {
+ return null;
+ }
+
+ public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) {
+ require_once('PHPExcel/Classes/PHPExcel.php');
+ require_once('PHPExcel/Classes/PHPExcel/IOFactory.php');
+
+ $absPath = $fileview->toTmpFile($path);
+ $tmpPath = \OC_Helper::tmpFile();
+
+ $rendererName = \PHPExcel_Settings::PDF_RENDERER_DOMPDF;
+ $rendererLibraryPath = \OC::$THIRDPARTYROOT . '/3rdparty/dompdf';
+
+ \PHPExcel_Settings::setPdfRenderer($rendererName, $rendererLibraryPath);
+
+ $phpexcel = new \PHPExcel($absPath);
+ $excel = \PHPExcel_IOFactory::createWriter($phpexcel, 'PDF');
+ $excel->save($tmpPath);
+
+ $pdf = new \imagick($tmpPath . '[0]');
+ $pdf->setImageFormat('jpg');
+
+ unlink($absPath);
+ unlink($tmpPath);
+
+ $image = new \OC_Image($pdf);
+
+ return $image->valid() ? $image : false;
+ }
+
+}
+
+class XLS extends MSOfficeExcel {
+
+ public function getMimeType() {
+ return '/application\/vnd.ms-excel/';
+ }
+
+}
+
+\OC\Preview::registerProvider('OC\Preview\XLS');
+
+class XLSX extends MSOfficeExcel {
+
+ public function getMimeType() {
+ return '/application\/vnd.openxmlformats-officedocument.spreadsheetml.sheet/';
+ }
+
+}
+
+\OC\Preview::registerProvider('OC\Preview\XLSX');
+
+/* //There is no (good) php-only solution for converting powerpoint documents to pdfs / pngs ...
+class MSOfficePowerPoint extends Provider {
+
+ public function getMimeType() {
+ return null;
+ }
+
+ public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) {
+ return false;
+ }
+
+}
+
+class PPT extends MSOfficePowerPoint {
+
+ public function getMimeType() {
+ return '/application\/vnd.ms-powerpoint/';
+ }
+
+}
+
+\OC\Preview::registerProvider('OC\Preview\PPT');
+
+class PPTX extends MSOfficePowerPoint {
+
+ public function getMimeType() {
+ return '/application\/vnd.openxmlformats-officedocument.presentationml.presentation/';
+ }
+
+}
+
+\OC\Preview::registerProvider('OC\Preview\PPTX');
+*/
\ No newline at end of file
diff --git a/lib/preview/office.php b/lib/preview/office.php
new file mode 100644
index 0000000000000000000000000000000000000000..5287bbd6ac1c61ec47f580e88cf05718595124b5
--- /dev/null
+++ b/lib/preview/office.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright (c) 2013 Georg Ehrke georg@ownCloud.com
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+//both, libreoffice backend and php fallback, need imagick
+if (extension_loaded('imagick')) {
+ $isShellExecEnabled = !in_array('shell_exec', explode(', ', ini_get('disable_functions')));
+ $whichLibreOffice = shell_exec('which libreoffice');
+ $isLibreOfficeAvailable = !empty($whichLibreOffice);
+ $whichOpenOffice = shell_exec('which libreoffice');
+ $isOpenOfficeAvailable = !empty($whichOpenOffice);
+ //let's see if there is libreoffice or openoffice on this machine
+ if($isShellExecEnabled && ($isLibreOfficeAvailable || $isOpenOfficeAvailable || is_string(\OC_Config::getValue('preview_libreoffice_path', null)))) {
+ require_once('office-cl.php');
+ }else{
+ //in case there isn't, use our fallback
+ require_once('office-fallback.php');
+ }
+}
\ No newline at end of file
diff --git a/lib/preview/pdf.php b/lib/preview/pdf.php
new file mode 100644
index 0000000000000000000000000000000000000000..cc974b68818662a8ebe9e0c15c14760af9bc26fd
--- /dev/null
+++ b/lib/preview/pdf.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Copyright (c) 2013 Georg Ehrke georg@ownCloud.com
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+namespace OC\Preview;
+
+if (extension_loaded('imagick')) {
+
+ class PDF extends Provider {
+
+ public function getMimeType() {
+ return '/application\/pdf/';
+ }
+
+ public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) {
+ $tmpPath = $fileview->toTmpFile($path);
+
+ //create imagick object from pdf
+ try{
+ $pdf = new \imagick($tmpPath . '[0]');
+ $pdf->setImageFormat('jpg');
+ } catch (\Exception $e) {
+ \OC_Log::write('core', $e->getmessage(), \OC_Log::ERROR);
+ return false;
+ }
+
+ unlink($tmpPath);
+
+ //new image object
+ $image = new \OC_Image($pdf);
+ //check if image object is valid
+ return $image->valid() ? $image : false;
+ }
+ }
+
+ \OC\Preview::registerProvider('OC\Preview\PDF');
+}
diff --git a/lib/preview/provider.php b/lib/preview/provider.php
new file mode 100644
index 0000000000000000000000000000000000000000..e4a730bafc8b3de7f08de41d7e98a5466e33fa4f
--- /dev/null
+++ b/lib/preview/provider.php
@@ -0,0 +1,19 @@
+<?php
+namespace OC\Preview;
+
+abstract class Provider {
+ private $options;
+
+ public function __construct($options) {
+ $this->options=$options;
+ }
+
+ abstract public function getMimeType();
+
+ /**
+ * search for $query
+ * @param string $query
+ * @return
+ */
+ abstract public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview);
+}
diff --git a/lib/preview/svg.php b/lib/preview/svg.php
new file mode 100644
index 0000000000000000000000000000000000000000..b49e51720fa140f304d7ddd71c38e371de2cc30c
--- /dev/null
+++ b/lib/preview/svg.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright (c) 2013 Georg Ehrke georg@ownCloud.com
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+namespace OC\Preview;
+
+if (extension_loaded('imagick')) {
+
+ class SVG extends Provider {
+
+ public function getMimeType() {
+ return '/image\/svg\+xml/';
+ }
+
+ public function getThumbnail($path,$maxX,$maxY,$scalingup,$fileview) {
+ try{
+ $svg = new \Imagick();
+ $svg->setBackgroundColor(new \ImagickPixel('transparent'));
+
+ $content = stream_get_contents($fileview->fopen($path, 'r'));
+ if(substr($content, 0, 5) !== '<?xml') {
+ $content = '<?xml version="1.0" encoding="UTF-8" standalone="no"?>' . $content;
+ }
+
+ $svg->readImageBlob($content);
+ $svg->setImageFormat('png32');
+ } catch (\Exception $e) {
+ \OC_Log::write('core', $e->getmessage(), \OC_Log::ERROR);
+ return false;
+ }
+
+
+ //new image object
+ $image = new \OC_Image();
+ $image->loadFromData($svg);
+ //check if image object is valid
+ return $image->valid() ? $image : false;
+ }
+ }
+
+ \OC\Preview::registerProvider('OC\Preview\SVG');
+
+}
\ No newline at end of file
diff --git a/lib/preview/txt.php b/lib/preview/txt.php
new file mode 100644
index 0000000000000000000000000000000000000000..77e728eb3644d41476f2c38e3e07c0c5bd10388d
--- /dev/null
+++ b/lib/preview/txt.php
@@ -0,0 +1,83 @@
+<?php
+/**
+ * Copyright (c) 2013 Georg Ehrke georg@ownCloud.com
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+namespace OC\Preview;
+
+class TXT extends Provider {
+
+ private static $blacklist = array(
+ 'text/calendar',
+ 'text/vcard',
+ );
+
+ public function getMimeType() {
+ return '/text\/.*/';
+ }
+
+ public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) {
+ $mimetype = $fileview->getMimeType($path);
+ if(in_array($mimetype, self::$blacklist)) {
+ return false;
+ }
+
+ $content = $fileview->fopen($path, 'r');
+ $content = stream_get_contents($content);
+
+ //don't create previews of empty text files
+ if(trim($content) === '') {
+ return false;
+ }
+
+ $lines = preg_split("/\r\n|\n|\r/", $content);
+
+ $fontSize = 5; //5px
+ $lineSize = ceil($fontSize * 1.25);
+
+ $image = imagecreate($maxX, $maxY);
+ imagecolorallocate($image, 255, 255, 255);
+ $textColor = imagecolorallocate($image, 0, 0, 0);
+
+ foreach($lines as $index => $line) {
+ $index = $index + 1;
+
+ $x = (int) 1;
+ $y = (int) ($index * $lineSize) - $fontSize;
+
+ imagestring($image, 1, $x, $y, $line, $textColor);
+
+ if(($index * $lineSize) >= $maxY) {
+ break;
+ }
+ }
+
+ $image = new \OC_Image($image);
+
+ return $image->valid() ? $image : false;
+ }
+}
+
+\OC\Preview::registerProvider('OC\Preview\TXT');
+
+class PHP extends TXT {
+
+ public function getMimeType() {
+ return '/application\/x-php/';
+ }
+
+}
+
+\OC\Preview::registerProvider('OC\Preview\PHP');
+
+class JavaScript extends TXT {
+
+ public function getMimeType() {
+ return '/application\/javascript/';
+ }
+
+}
+
+\OC\Preview::registerProvider('OC\Preview\JavaScript');
\ No newline at end of file
diff --git a/lib/preview/unknown.php b/lib/preview/unknown.php
new file mode 100644
index 0000000000000000000000000000000000000000..9e6cd68d401bae46ac24c38af26b8e9de56d0ee8
--- /dev/null
+++ b/lib/preview/unknown.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Copyright (c) 2013 Frank Karlitschek frank@owncloud.org
+ * Copyright (c) 2013 Georg Ehrke georg@ownCloud.com
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+namespace OC\Preview;
+
+class Unknown extends Provider {
+
+ public function getMimeType() {
+ return '/.*/';
+ }
+
+ public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) {
+ $mimetype = $fileview->getMimeType($path);
+
+ $path = \OC_Helper::mimetypeIcon($mimetype);
+ $path = \OC::$SERVERROOT . substr($path, strlen(\OC::$WEBROOT));
+
+ return new \OC_Image($path);
+ }
+}
+
+\OC\Preview::registerProvider('OC\Preview\Unknown');
\ No newline at end of file
diff --git a/lib/previewmanager.php b/lib/previewmanager.php
new file mode 100755
index 0000000000000000000000000000000000000000..ac9a866a75b71d04f86afe114df11e4dbe58d89d
--- /dev/null
+++ b/lib/previewmanager.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Copyright (c) 2013 Thomas Müller thomas.mueller@tmit.eu
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ *
+ */
+namespace OC;
+
+use OCP\image;
+use OCP\IPreview;
+
+class PreviewManager implements IPreview {
+ /**
+ * @brief return a preview of a file
+ * @param string $file The path to the file where you want a thumbnail from
+ * @param int $maxX The maximum X size of the thumbnail. It can be smaller depending on the shape of the image
+ * @param int $maxY The maximum Y size of the thumbnail. It can be smaller depending on the shape of the image
+ * @param boolean $scaleUp Scale smaller images up to the thumbnail size or not. Might look ugly
+ * @return \OCP\Image
+ */
+ function createPreview($file, $maxX = 100, $maxY = 75, $scaleUp = false)
+ {
+ $preview = new \OC\Preview('', '/', $file, $maxX, $maxY, $scaleUp);
+ return $preview->getPreview();
+ }
+
+ /**
+ * @brief returns true if the passed mime type is supported
+ * @param string $mimeType
+ * @return boolean
+ */
+ function isMimeSupported($mimeType = '*')
+ {
+ return \OC\Preview::isMimeSupported($mimeType);
+ }
+}
diff --git a/lib/public/app.php b/lib/public/app.php
index a1ecf524cc84110440378a9452aad77b05068a49..0a5721b334e090413c7c9429795fa35d0c566b22 100644
--- a/lib/public/app.php
+++ b/lib/public/app.php
@@ -35,10 +35,10 @@ namespace OCP;
*/
class App {
/**
- * @brief Makes owncloud aware of this app
+ * @brief Makes ownCloud aware of this app
* @brief This call is deprecated and not necessary to use.
* @param $data array with all information
- * @returns true/false
+ * @returns boolean
*
* @deprecated this method is deprecated
* Do not call it anymore
@@ -52,7 +52,7 @@ class App {
/**
* @brief adds an entry to the navigation
* @param $data array containing the data
- * @returns true/false
+ * @returns boolean
*
* This function adds a new entry to the navigation visible to users. $data
* is an associative array.
@@ -72,8 +72,8 @@ class App {
/**
* @brief marks a navigation entry as active
- * @param $id id of the entry
- * @returns true/false
+ * @param $id string id of the entry
+ * @returns boolean
*
* This function sets a navigation entry as active and removes the 'active'
* property from all other entries. The templates can use this for
@@ -104,7 +104,7 @@ class App {
/**
* @brief Read app metadata from the info.xml file
* @param string $app id of the app or the path of the info.xml file
- * @param boolean path (optional)
+ * @param boolean $path (optional)
* @returns array
*/
public static function getAppInfo( $app, $path=false ) {
@@ -114,7 +114,7 @@ class App {
/**
* @brief checks whether or not an app is enabled
* @param $app app
- * @returns true/false
+ * @returns boolean
*
* This function checks whether or not an app is enabled.
*/
@@ -133,7 +133,7 @@ class App {
/**
* @brief Get the last version of the app, either from appinfo/version or from appinfo/info.xml
* @param $app app
- * @returns true/false
+ * @returns boolean
*/
public static function getAppVersion( $app ) {
return \OC_App::getAppVersion( $app );
diff --git a/lib/public/appframework/app.php b/lib/public/appframework/app.php
new file mode 100644
index 0000000000000000000000000000000000000000..d97c5c81848861b6b6aea43ea23bddfdcdc3f32b
--- /dev/null
+++ b/lib/public/appframework/app.php
@@ -0,0 +1,81 @@
+<?php
+/**
+ * ownCloud
+ *
+ * @author Thomas Müller
+ * @copyright 2013 Thomas Müller deepdiver@owncloud.com
+ *
+ * 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/>.
+ *
+ */
+
+namespace OCP\AppFramework;
+
+
+/**
+ * Class App
+ * @package OCP\AppFramework
+ *
+ * Any application must inherit this call - all controller instances to be used are
+ * to be registered using IContainer::registerService
+ */
+class App {
+ public function __construct($appName) {
+ $this->container = new \OC\AppFramework\DependencyInjection\DIContainer($appName);
+ }
+
+ private $container;
+
+ /**
+ * @return IAppContainer
+ */
+ public function getContainer() {
+ return $this->container;
+ }
+
+ /**
+ * This function is called by the routing component to fire up the frameworks dispatch mechanism.
+ *
+ * Example code in routes.php of the task app:
+ * $this->create('tasks_index', '/')->get()->action(
+ * function($params){
+ * $app = new TaskApp();
+ * $app->dispatch('PageController', 'index', $params);
+ * }
+ * );
+ *
+ *
+ * Example for for TaskApp implementation:
+ * class TaskApp extends \OCP\AppFramework\App {
+ *
+ * public function __construct(){
+ * parent::__construct('tasks');
+ *
+ * $this->getContainer()->registerService('PageController', function(IAppContainer $c){
+ * $a = $c->query('API');
+ * $r = $c->query('Request');
+ * return new PageController($a, $r);
+ * });
+ * }
+ * }
+ *
+ * @param string $controllerName the name of the controller under which it is
+ * stored in the DI container
+ * @param string $methodName the method that you want to call
+ * @param array $urlParams an array with variables extracted from the routes
+ */
+ public function dispatch($controllerName, $methodName, array $urlParams) {
+ \OC\AppFramework\App::main($controllerName, $methodName, $urlParams, $this->container);
+ }
+}
diff --git a/lib/public/appframework/http/http.php b/lib/public/appframework/http/http.php
new file mode 100644
index 0000000000000000000000000000000000000000..9eafe782726ac58d78042a7dc90a439eb30b51aa
--- /dev/null
+++ b/lib/public/appframework/http/http.php
@@ -0,0 +1,89 @@
+<?php
+
+/**
+ * ownCloud - App Framework
+ *
+ * @author Bernhard Posselt, Thomas Tanghus, Bart Visscher
+ * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ *
+ * 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/>.
+ *
+ */
+
+
+namespace OCP\AppFramework\Http;
+
+
+class Http {
+
+ const STATUS_CONTINUE = 100;
+ const STATUS_SWITCHING_PROTOCOLS = 101;
+ const STATUS_PROCESSING = 102;
+ const STATUS_OK = 200;
+ const STATUS_CREATED = 201;
+ const STATUS_ACCEPTED = 202;
+ const STATUS_NON_AUTHORATIVE_INFORMATION = 203;
+ const STATUS_NO_CONTENT = 204;
+ const STATUS_RESET_CONTENT = 205;
+ const STATUS_PARTIAL_CONTENT = 206;
+ const STATUS_MULTI_STATUS = 207;
+ const STATUS_ALREADY_REPORTED = 208;
+ const STATUS_IM_USED = 226;
+ const STATUS_MULTIPLE_CHOICES = 300;
+ const STATUS_MOVED_PERMANENTLY = 301;
+ const STATUS_FOUND = 302;
+ const STATUS_SEE_OTHER = 303;
+ const STATUS_NOT_MODIFIED = 304;
+ const STATUS_USE_PROXY = 305;
+ const STATUS_RESERVED = 306;
+ const STATUS_TEMPORARY_REDIRECT = 307;
+ const STATUS_BAD_REQUEST = 400;
+ const STATUS_UNAUTHORIZED = 401;
+ const STATUS_PAYMENT_REQUIRED = 402;
+ const STATUS_FORBIDDEN = 403;
+ const STATUS_NOT_FOUND = 404;
+ const STATUS_METHOD_NOT_ALLOWED = 405;
+ const STATUS_NOT_ACCEPTABLE = 406;
+ const STATUS_PROXY_AUTHENTICATION_REQUIRED = 407;
+ const STATUS_REQUEST_TIMEOUT = 408;
+ const STATUS_CONFLICT = 409;
+ const STATUS_GONE = 410;
+ const STATUS_LENGTH_REQUIRED = 411;
+ const STATUS_PRECONDITION_FAILED = 412;
+ const STATUS_REQUEST_ENTITY_TOO_LARGE = 413;
+ const STATUS_REQUEST_URI_TOO_LONG = 414;
+ const STATUS_UNSUPPORTED_MEDIA_TYPE = 415;
+ const STATUS_REQUEST_RANGE_NOT_SATISFIABLE = 416;
+ const STATUS_EXPECTATION_FAILED = 417;
+ const STATUS_IM_A_TEAPOT = 418;
+ const STATUS_UNPROCESSABLE_ENTITY = 422;
+ const STATUS_LOCKED = 423;
+ const STATUS_FAILED_DEPENDENCY = 424;
+ const STATUS_UPGRADE_REQUIRED = 426;
+ const STATUS_PRECONDITION_REQUIRED = 428;
+ const STATUS_TOO_MANY_REQUESTS = 429;
+ const STATUS_REQUEST_HEADER_FIELDS_TOO_LARGE = 431;
+ const STATUS_INTERNAL_SERVER_ERROR = 500;
+ const STATUS_NOT_IMPLEMENTED = 501;
+ const STATUS_BAD_GATEWAY = 502;
+ const STATUS_SERVICE_UNAVAILABLE = 503;
+ const STATUS_GATEWAY_TIMEOUT = 504;
+ const STATUS_HTTP_VERSION_NOT_SUPPORTED = 505;
+ const STATUS_VARIANT_ALSO_NEGOTIATES = 506;
+ const STATUS_INSUFFICIENT_STORAGE = 507;
+ const STATUS_LOOP_DETECTED = 508;
+ const STATUS_BANDWIDTH_LIMIT_EXCEEDED = 509;
+ const STATUS_NOT_EXTENDED = 510;
+ const STATUS_NETWORK_AUTHENTICATION_REQUIRED = 511;
+}
diff --git a/lib/public/appframework/http/jsonresponse.php b/lib/public/appframework/http/jsonresponse.php
new file mode 100644
index 0000000000000000000000000000000000000000..085fdbed2f9da300aa400bae218d35dde4176873
--- /dev/null
+++ b/lib/public/appframework/http/jsonresponse.php
@@ -0,0 +1,74 @@
+<?php
+
+/**
+ * ownCloud - App Framework
+ *
+ * @author Bernhard Posselt
+ * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ *
+ * 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/>.
+ *
+ */
+
+
+namespace OCP\AppFramework\Http;
+
+
+/**
+ * A renderer for JSON calls
+ */
+class JSONResponse extends Response {
+
+ protected $data;
+
+
+ /**
+ * @param array|object $data the object or array that should be transformed
+ * @param int $statusCode the Http status code, defaults to 200
+ */
+ public function __construct($data=array(), $statusCode=Http::STATUS_OK) {
+ $this->data = $data;
+ $this->setStatus($statusCode);
+ $this->addHeader('X-Content-Type-Options', 'nosniff');
+ $this->addHeader('Content-type', 'application/json; charset=utf-8');
+ }
+
+
+ /**
+ * Returns the rendered json
+ * @return string the rendered json
+ */
+ public function render(){
+ return json_encode($this->data);
+ }
+
+ /**
+ * Sets values in the data json array
+ * @param array|object $params an array or object which will be transformed
+ * to JSON
+ */
+ public function setData($data){
+ $this->data = $data;
+ }
+
+
+ /**
+ * Used to get the set parameters
+ * @return array the data
+ */
+ public function getData(){
+ return $this->data;
+ }
+
+}
diff --git a/lib/public/appframework/http/response.php b/lib/public/appframework/http/response.php
new file mode 100644
index 0000000000000000000000000000000000000000..644772589484e1e1a0236e38ccb151f6ba4344ee
--- /dev/null
+++ b/lib/public/appframework/http/response.php
@@ -0,0 +1,169 @@
+<?php
+
+/**
+ * ownCloud - App Framework
+ *
+ * @author Bernhard Posselt, Thomas Tanghus, Bart Visscher
+ * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ *
+ * 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/>.
+ *
+ */
+
+
+namespace OCP\AppFramework\Http;
+
+
+/**
+ * Base class for responses. Also used to just send headers
+ */
+class Response {
+
+ /**
+ * @var array default headers
+ */
+ private $headers = array(
+ 'Cache-Control' => 'no-cache, must-revalidate'
+ );
+
+
+ /**
+ * @var string
+ */
+ private $status = Http::STATUS_OK;
+
+
+ /**
+ * @var \DateTime
+ */
+ private $lastModified;
+
+
+ /**
+ * @var string
+ */
+ private $ETag;
+
+
+ /**
+ * Caches the response
+ * @param int $cacheSeconds the amount of seconds that should be cached
+ * if 0 then caching will be disabled
+ */
+ public function cacheFor($cacheSeconds) {
+
+ if($cacheSeconds > 0) {
+ $this->addHeader('Cache-Control', 'max-age=' . $cacheSeconds .
+ ', must-revalidate');
+ } else {
+ $this->addHeader('Cache-Control', 'no-cache, must-revalidate');
+ }
+
+ }
+
+
+ /**
+ * Adds a new header to the response that will be called before the render
+ * function
+ * @param string $name The name of the HTTP header
+ * @param string $value The value, null will delete it
+ */
+ public function addHeader($name, $value) {
+ if(is_null($value)) {
+ unset($this->headers[$name]);
+ } else {
+ $this->headers[$name] = $value;
+ }
+ }
+
+
+ /**
+ * Returns the set headers
+ * @return array the headers
+ */
+ public function getHeaders() {
+ $mergeWith = array();
+
+ if($this->lastModified) {
+ $mergeWith['Last-Modified'] =
+ $this->lastModified->format(\DateTime::RFC2822);
+ }
+
+ if($this->ETag) {
+ $mergeWith['ETag'] = '"' . $this->ETag . '"';
+ }
+
+ return array_merge($mergeWith, $this->headers);
+ }
+
+
+ /**
+ * By default renders no output
+ * @return null
+ */
+ public function render() {
+ return null;
+ }
+
+
+ /**
+ * Set response status
+ * @param int $status a HTTP status code, see also the STATUS constants
+ */
+ public function setStatus($status) {
+ $this->status = $status;
+ }
+
+
+ /**
+ * Get response status
+ */
+ public function getStatus() {
+ return $this->status;
+ }
+
+
+ /**
+ * @return string the etag
+ */
+ public function getETag() {
+ return $this->ETag;
+ }
+
+
+ /**
+ * @return string RFC2822 formatted last modified date
+ */
+ public function getLastModified() {
+ return $this->lastModified;
+ }
+
+
+ /**
+ * @param string $ETag
+ */
+ public function setETag($ETag) {
+ $this->ETag = $ETag;
+ }
+
+
+ /**
+ * @param \DateTime $lastModified
+ */
+ public function setLastModified($lastModified) {
+ $this->lastModified = $lastModified;
+ }
+
+
+}
diff --git a/lib/public/appframework/http/templateresponse.php b/lib/public/appframework/http/templateresponse.php
new file mode 100644
index 0000000000000000000000000000000000000000..97678c96cbaffb6cc592516fe6b3c2b0e3235350
--- /dev/null
+++ b/lib/public/appframework/http/templateresponse.php
@@ -0,0 +1,126 @@
+<?php
+
+/**
+ * ownCloud - App Framework
+ *
+ * @author Bernhard Posselt
+ * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ *
+ * 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/>.
+ *
+ */
+
+
+namespace OCP\AppFramework\Http;
+
+use OC\AppFramework\Core\API;
+
+
+/**
+ * Response for a normal template
+ */
+class TemplateResponse extends Response {
+
+ protected $templateName;
+ protected $params;
+ protected $api;
+ protected $renderAs;
+ protected $appName;
+
+ /**
+ * @param API $api an API instance
+ * @param string $templateName the name of the template
+ * @param string $appName optional if you want to include a template from
+ * a different app
+ */
+ public function __construct(API $api, $templateName, $appName=null) {
+ $this->templateName = $templateName;
+ $this->appName = $appName;
+ $this->api = $api;
+ $this->params = array();
+ $this->renderAs = 'user';
+ }
+
+
+ /**
+ * Sets template parameters
+ * @param array $params an array with key => value structure which sets template
+ * variables
+ */
+ public function setParams(array $params){
+ $this->params = $params;
+ }
+
+
+ /**
+ * Used for accessing the set parameters
+ * @return array the params
+ */
+ public function getParams(){
+ return $this->params;
+ }
+
+
+ /**
+ * Used for accessing the name of the set template
+ * @return string the name of the used template
+ */
+ public function getTemplateName(){
+ return $this->templateName;
+ }
+
+
+ /**
+ * Sets the template page
+ * @param string $renderAs admin, user or blank. Admin also prints the admin
+ * settings header and footer, user renders the normal
+ * normal page including footer and header and blank
+ * just renders the plain template
+ */
+ public function renderAs($renderAs){
+ $this->renderAs = $renderAs;
+ }
+
+
+ /**
+ * Returns the set renderAs
+ * @return string the renderAs value
+ */
+ public function getRenderAs(){
+ return $this->renderAs;
+ }
+
+
+ /**
+ * Returns the rendered html
+ * @return string the rendered html
+ */
+ public function render(){
+
+ if($this->appName !== null){
+ $appName = $this->appName;
+ } else {
+ $appName = $this->api->getAppName();
+ }
+
+ $template = $this->api->getTemplate($this->templateName, $this->renderAs, $appName);
+
+ foreach($this->params as $key => $value){
+ $template->assign($key, $value);
+ }
+
+ return $template->fetchPage();
+ }
+
+}
diff --git a/lib/public/appframework/iapi.php b/lib/public/appframework/iapi.php
new file mode 100644
index 0000000000000000000000000000000000000000..fa6af5f596593c6ba1d6b3e42c20f89a063c9d92
--- /dev/null
+++ b/lib/public/appframework/iapi.php
@@ -0,0 +1,151 @@
+<?php
+
+/**
+ * ownCloud - App Framework
+ *
+ * @author Bernhard Posselt
+ * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ *
+ * 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/>.
+ *
+ */
+
+
+namespace OCP\AppFramework;
+
+
+/**
+ * A few very basic and frequently used API functions are combined in here
+ */
+interface IApi {
+
+
+ /**
+ * Gets the userid of the current user
+ * @return string the user id of the current user
+ */
+ function getUserId();
+
+
+ /**
+ * Adds a new javascript file
+ * @param string $scriptName the name of the javascript in js/ without the suffix
+ * @param string $appName the name of the app, defaults to the current one
+ */
+ function addScript($scriptName, $appName = null);
+
+
+ /**
+ * Adds a new css file
+ * @param string $styleName the name of the css file in css/without the suffix
+ * @param string $appName the name of the app, defaults to the current one
+ */
+ function addStyle($styleName, $appName = null);
+
+
+ /**
+ * shorthand for addScript for files in the 3rdparty directory
+ * @param string $name the name of the file without the suffix
+ */
+ function add3rdPartyScript($name);
+
+
+ /**
+ * shorthand for addStyle for files in the 3rdparty directory
+ * @param string $name the name of the file without the suffix
+ */
+ function add3rdPartyStyle($name);
+
+ /**
+ * Returns the translation object
+ * @return \OC_L10N the translation object
+ *
+ * FIXME: returns private object / should be retrieved from teh ServerContainer
+ */
+ function getTrans();
+
+
+ /**
+ * Returns the URL for a route
+ * @param string $routeName the name of the route
+ * @param array $arguments an array with arguments which will be filled into the url
+ * @return string the url
+ */
+ function linkToRoute($routeName, $arguments=array());
+
+
+ /**
+ * Returns an URL for an image or file
+ * @param string $file the name of the file
+ * @param string $appName the name of the app, defaults to the current one
+ */
+ function linkTo($file, $appName=null);
+
+
+ /**
+ * Returns the link to an image, like link to but only with prepending img/
+ * @param string $file the name of the file
+ * @param string $appName the name of the app, defaults to the current one
+ */
+ function imagePath($file, $appName = null);
+
+
+ /**
+ * Makes an URL absolute
+ * @param string $url the url
+ * @return string the absolute url
+ *
+ * FIXME: function should live in Request / Response
+ */
+ function getAbsoluteURL($url);
+
+
+ /**
+ * links to a file
+ * @param string $file the name of the file
+ * @param string $appName the name of the app, defaults to the current one
+ * @deprecated replaced with linkToRoute()
+ * @return string the url
+ */
+ function linkToAbsolute($file, $appName = null);
+
+
+ /**
+ * Checks if an app is enabled
+ * @param string $appName the name of an app
+ * @return bool true if app is enabled
+ */
+ public function isAppEnabled($appName);
+
+
+ /**
+ * Writes a function into the error log
+ * @param string $msg the error message to be logged
+ * @param int $level the error level
+ *
+ * FIXME: add logger instance to ServerContainer
+ */
+ function log($msg, $level = null);
+
+
+ /**
+ * Returns a template
+ * @param string $templateName the name of the template
+ * @param string $renderAs how it should be rendered
+ * @param string $appName the name of the app
+ * @return \OCP\Template a new template
+ */
+ function getTemplate($templateName, $renderAs='user', $appName=null);
+
+}
diff --git a/lib/public/appframework/iappcontainer.php b/lib/public/appframework/iappcontainer.php
new file mode 100644
index 0000000000000000000000000000000000000000..7d3b4b3bac7587331ff003322369f205830d6a20
--- /dev/null
+++ b/lib/public/appframework/iappcontainer.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * ownCloud
+ *
+ * @author Thomas Müller
+ * @copyright 2013 Thomas Müller deepdiver@owncloud.com
+ *
+ * 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/>.
+ *
+ */
+
+namespace OCP\AppFramework;
+
+use OCP\AppFramework\IApi;
+use OCP\IContainer;
+
+/**
+ * Class IAppContainer
+ * @package OCP\AppFramework
+ *
+ * This container interface provides short cuts for app developers to access predefined app service.
+ */
+interface IAppContainer extends IContainer{
+
+ /**
+ * used to return the appname of the set application
+ * @return string the name of your application
+ */
+ function getAppName();
+
+ /**
+ * @return IApi
+ */
+ function getCoreApi();
+
+ /**
+ * @return \OCP\IServerContainer
+ */
+ function getServer();
+
+ /**
+ * @param IMiddleWare $middleWare
+ * @return boolean
+ */
+ function registerMiddleWare(IMiddleWare $middleWare);
+}
diff --git a/lib/public/appframework/imiddleware.php b/lib/public/appframework/imiddleware.php
new file mode 100644
index 0000000000000000000000000000000000000000..1e76d3bbe499d75e2541360fdad3422bf5b3a922
--- /dev/null
+++ b/lib/public/appframework/imiddleware.php
@@ -0,0 +1,88 @@
+<?php
+
+/**
+ * ownCloud - App Framework
+ *
+ * @author Bernhard Posselt
+ * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ *
+ * 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/>.
+ *
+ */
+
+
+namespace OCP\AppFramework;
+use OCP\AppFramework\Http\Response;
+
+
+/**
+ * Middleware is used to provide hooks before or after controller methods and
+ * deal with possible exceptions raised in the controller methods.
+ * They're modeled after Django's middleware system:
+ * https://docs.djangoproject.com/en/dev/topics/http/middleware/
+ */
+interface IMiddleWare {
+
+
+ /**
+ * This is being run in normal order before the controller is being
+ * called which allows several modifications and checks
+ *
+ * @param Controller $controller the controller that is being called
+ * @param string $methodName the name of the method that will be called on
+ * the controller
+ */
+ function beforeController($controller, $methodName);
+
+
+ /**
+ * This is being run when either the beforeController method or the
+ * controller method itself is throwing an exception. The middleware is
+ * asked in reverse order to handle the exception and to return a response.
+ * If the response is null, it is assumed that the exception could not be
+ * handled and the error will be thrown again
+ *
+ * @param Controller $controller the controller that is being called
+ * @param string $methodName the name of the method that will be called on
+ * the controller
+ * @param \Exception $exception the thrown exception
+ * @throws \Exception the passed in exception if it cant handle it
+ * @return Response a Response object in case that the exception was handled
+ */
+ function afterException($controller, $methodName, \Exception $exception);
+
+ /**
+ * This is being run after a successful controller method call and allows
+ * the manipulation of a Response object. The middleware is run in reverse order
+ *
+ * @param Controller $controller the controller that is being called
+ * @param string $methodName the name of the method that will be called on
+ * the controller
+ * @param Response $response the generated response from the controller
+ * @return Response a Response object
+ */
+ function afterController($controller, $methodName, Response $response);
+
+ /**
+ * This is being run after the response object has been rendered and
+ * allows the manipulation of the output. The middleware is run in reverse order
+ *
+ * @param Controller $controller the controller that is being called
+ * @param string $methodName the name of the method that will be called on
+ * the controller
+ * @param string $output the generated output from a response
+ * @return string the output that should be printed
+ */
+ function beforeOutput($controller, $methodName, $output);
+}
diff --git a/lib/public/contacts.php b/lib/public/contacts.php
index 88d812e735a857b79e47cb85b712ab9801836711..1b61d7aa4ff22b6201a8bfe407eaec0b7f8ddf9b 100644
--- a/lib/public/contacts.php
+++ b/lib/public/contacts.php
@@ -90,13 +90,8 @@ namespace OCP {
* @return array of contacts which are arrays of key-value-pairs
*/
public static function search($pattern, $searchProperties = array(), $options = array()) {
- $result = array();
- foreach(self::$address_books as $address_book) {
- $r = $address_book->search($pattern, $searchProperties, $options);
- $result = array_merge($result, $r);
- }
-
- return $result;
+ $cm = \OC::$server->getContactsManager();
+ return $cm->search($pattern, $searchProperties, $options);
}
/**
@@ -107,14 +102,8 @@ namespace OCP {
* @return bool successful or not
*/
public static function delete($id, $address_book_key) {
- if (!array_key_exists($address_book_key, self::$address_books))
- return null;
-
- $address_book = self::$address_books[$address_book_key];
- if ($address_book->getPermissions() & \OCP\PERMISSION_DELETE)
- return null;
-
- return $address_book->delete($id);
+ $cm = \OC::$server->getContactsManager();
+ return $cm->delete($id, $address_book_key);
}
/**
@@ -126,15 +115,8 @@ namespace OCP {
* @return array representing the contact just created or updated
*/
public static function createOrUpdate($properties, $address_book_key) {
-
- if (!array_key_exists($address_book_key, self::$address_books))
- return null;
-
- $address_book = self::$address_books[$address_book_key];
- if ($address_book->getPermissions() & \OCP\PERMISSION_CREATE)
- return null;
-
- return $address_book->createOrUpdate($properties);
+ $cm = \OC::$server->getContactsManager();
+ return $cm->search($properties, $address_book_key);
}
/**
@@ -143,45 +125,40 @@ namespace OCP {
* @return bool true if enabled, false if not
*/
public static function isEnabled() {
- return !empty(self::$address_books);
+ $cm = \OC::$server->getContactsManager();
+ return $cm->isEnabled();
}
/**
* @param \OCP\IAddressBook $address_book
*/
public static function registerAddressBook(\OCP\IAddressBook $address_book) {
- self::$address_books[$address_book->getKey()] = $address_book;
+ $cm = \OC::$server->getContactsManager();
+ return $cm->registerAddressBook($address_book);
}
/**
* @param \OCP\IAddressBook $address_book
*/
public static function unregisterAddressBook(\OCP\IAddressBook $address_book) {
- unset(self::$address_books[$address_book->getKey()]);
+ $cm = \OC::$server->getContactsManager();
+ return $cm->unregisterAddressBook($address_book);
}
/**
* @return array
*/
public static function getAddressBooks() {
- $result = array();
- foreach(self::$address_books as $address_book) {
- $result[$address_book->getKey()] = $address_book->getDisplayName();
- }
-
- return $result;
+ $cm = \OC::$server->getContactsManager();
+ return $cm->getAddressBooks();
}
/**
* removes all registered address book instances
*/
public static function clear() {
- self::$address_books = array();
+ $cm = \OC::$server->getContactsManager();
+ $cm->clear();
}
-
- /**
- * @var \OCP\IAddressBook[] which holds all registered address books
- */
- private static $address_books = array();
}
}
diff --git a/lib/public/contacts/imanager.php b/lib/public/contacts/imanager.php
new file mode 100644
index 0000000000000000000000000000000000000000..3bfbca7be501ecee5b502277a3ae74294e2c6315
--- /dev/null
+++ b/lib/public/contacts/imanager.php
@@ -0,0 +1,150 @@
+<?php
+/**
+ * ownCloud
+ *
+ * @author Thomas Müller
+ * @copyright 2013 Thomas Müller thomas.mueller@tmit.eu
+ *
+ * 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/>.
+ *
+ */
+
+/**
+ * Public interface of ownCloud for apps to use.
+ * Contacts Class
+ *
+ */
+
+// use OCP namespace for all classes that are considered public.
+// This means that they should be used by apps instead of the internal ownCloud classes
+namespace OCP\Contacts {
+
+ /**
+ * This class provides access to the contacts app. Use this class exclusively if you want to access contacts.
+ *
+ * Contacts in general will be expressed as an array of key-value-pairs.
+ * The keys will match the property names defined in https://tools.ietf.org/html/rfc2426#section-1
+ *
+ * Proposed workflow for working with contacts:
+ * - search for the contacts
+ * - manipulate the results array
+ * - createOrUpdate will save the given contacts overwriting the existing data
+ *
+ * For updating it is mandatory to keep the id.
+ * Without an id a new contact will be created.
+ *
+ */
+ interface IManager {
+
+ /**
+ * This function is used to search and find contacts within the users address books.
+ * In case $pattern is empty all contacts will be returned.
+ *
+ * Example:
+ * Following function shows how to search for contacts for the name and the email address.
+ *
+ * public static function getMatchingRecipient($term) {
+ * $cm = \OC::$server->getContactsManager();
+ * // The API is not active -> nothing to do
+ * if (!$cm->isEnabled()) {
+ * return array();
+ * }
+ *
+ * $result = $cm->search($term, array('FN', 'EMAIL'));
+ * $receivers = array();
+ * foreach ($result as $r) {
+ * $id = $r['id'];
+ * $fn = $r['FN'];
+ * $email = $r['EMAIL'];
+ * if (!is_array($email)) {
+ * $email = array($email);
+ * }
+ *
+ * // loop through all email addresses of this contact
+ * foreach ($email as $e) {
+ * $displayName = $fn . " <$e>";
+ * $receivers[] = array(
+ * 'id' => $id,
+ * 'label' => $displayName,
+ * 'value' => $displayName);
+ * }
+ * }
+ *
+ * return $receivers;
+ * }
+ *
+ *
+ * @param string $pattern which should match within the $searchProperties
+ * @param array $searchProperties defines the properties within the query pattern should match
+ * @param array $options - for future use. One should always have options!
+ * @return array of contacts which are arrays of key-value-pairs
+ */
+ function search($pattern, $searchProperties = array(), $options = array());
+
+ /**
+ * This function can be used to delete the contact identified by the given id
+ *
+ * @param object $id the unique identifier to a contact
+ * @param $address_book_key
+ * @return bool successful or not
+ */
+ function delete($id, $address_book_key);
+
+ /**
+ * This function is used to create a new contact if 'id' is not given or not present.
+ * Otherwise the contact will be updated by replacing the entire data set.
+ *
+ * @param array $properties this array if key-value-pairs defines a contact
+ * @param $address_book_key string to identify the address book in which the contact shall be created or updated
+ * @return array representing the contact just created or updated
+ */
+ function createOrUpdate($properties, $address_book_key);
+
+ /**
+ * Check if contacts are available (e.g. contacts app enabled)
+ *
+ * @return bool true if enabled, false if not
+ */
+ function isEnabled();
+
+ /**
+ * @param \OCP\IAddressBook $address_book
+ */
+ function registerAddressBook(\OCP\IAddressBook $address_book);
+
+ /**
+ * @param \OCP\IAddressBook $address_book
+ */
+ function unregisterAddressBook(\OCP\IAddressBook $address_book);
+
+ /**
+ * In order to improve lazy loading a closure can be registered which will be called in case
+ * address books are actually requested
+ *
+ * @param string $key
+ * @param \Closure $callable
+ */
+ function register($key, \Closure $callable);
+
+ /**
+ * @return array
+ */
+ function getAddressBooks();
+
+ /**
+ * removes all registered address book instances
+ */
+ function clear();
+ }
+}
diff --git a/lib/public/db.php b/lib/public/db.php
index 932e79d9ef1755828ea34751881911d47a3ad4e2..9512cca2d19d30398eb85de376b80fef6630b686 100644
--- a/lib/public/db.php
+++ b/lib/public/db.php
@@ -102,4 +102,15 @@ class DB {
public static function isError($result) {
return(\OC_DB::isError($result));
}
+
+ /**
+ * returns the error code and message as a string for logging
+ * works with DoctrineException
+ * @param mixed $error
+ * @return string
+ */
+ public static function getErrorMessage($error) {
+ return(\OC_DB::getErrorMessage($error));
+ }
+
}
diff --git a/lib/public/files/alreadyexistsexception.php b/lib/public/files/alreadyexistsexception.php
new file mode 100644
index 0000000000000000000000000000000000000000..32947c7a5c309614eee6dd9e9b2a0ee904e730a5
--- /dev/null
+++ b/lib/public/files/alreadyexistsexception.php
@@ -0,0 +1,11 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OCP\Files;
+
+class AlreadyExistsException extends \Exception {}
diff --git a/lib/public/files/file.php b/lib/public/files/file.php
new file mode 100644
index 0000000000000000000000000000000000000000..916b2edd6c45ab44259debc25797a269c5360da8
--- /dev/null
+++ b/lib/public/files/file.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OCP\Files;
+
+interface File extends Node {
+ /**
+ * Get the content of the file as string
+ *
+ * @return string
+ * @throws \OCP\Files\NotPermittedException
+ */
+ public function getContent();
+
+ /**
+ * Write to the file from string data
+ *
+ * @param string $data
+ * @throws \OCP\Files\NotPermittedException
+ */
+ public function putContent($data);
+
+ /**
+ * Get the mimetype of the file
+ *
+ * @return string
+ */
+ public function getMimeType();
+
+ /**
+ * Open the file as stream, resulting resource can be operated as stream like the result from php's own fopen
+ *
+ * @param string $mode
+ * @return resource
+ * @throws \OCP\Files\NotPermittedException
+ */
+ public function fopen($mode);
+
+ /**
+ * Compute the hash of the file
+ * Type of hash is set with $type and can be anything supported by php's hash_file
+ *
+ * @param string $type
+ * @param bool $raw
+ * @return string
+ */
+ public function hash($type, $raw = false);
+}
diff --git a/lib/public/files/folder.php b/lib/public/files/folder.php
new file mode 100644
index 0000000000000000000000000000000000000000..da7f20fd3666afec5117a0c032123201bebeb071
--- /dev/null
+++ b/lib/public/files/folder.php
@@ -0,0 +1,119 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OCP\Files;
+
+interface Folder extends Node {
+ /**
+ * Get the full path of an item in the folder within owncloud's filesystem
+ *
+ * @param string $path relative path of an item in the folder
+ * @return string
+ * @throws \OCP\Files\NotPermittedException
+ */
+ public function getFullPath($path);
+
+ /**
+ * Get the path of an item in the folder relative to the folder
+ *
+ * @param string $path absolute path of an item in the folder
+ * @throws \OCP\Files\NotFoundException
+ * @return string
+ */
+ public function getRelativePath($path);
+
+ /**
+ * check if a node is a (grand-)child of the folder
+ *
+ * @param \OCP\Files\Node $node
+ * @return bool
+ */
+ public function isSubNode($node);
+
+ /**
+ * get the content of this directory
+ *
+ * @throws \OCP\Files\NotFoundException
+ * @return \OCP\Files\Node[]
+ */
+ public function getDirectoryListing();
+
+ /**
+ * Get the node at $path
+ *
+ * @param string $path relative path of the file or folder
+ * @return \OCP\Files\Node
+ * @throws \OCP\Files\NotFoundException
+ */
+ public function get($path);
+
+ /**
+ * Check if a file or folder exists in the folder
+ *
+ * @param string $path relative path of the file or folder
+ * @return bool
+ */
+ public function nodeExists($path);
+
+ /**
+ * Create a new folder
+ *
+ * @param string $path relative path of the new folder
+ * @return \OCP\Files\Folder
+ * @throws \OCP\Files\NotPermittedException
+ */
+ public function newFolder($path);
+
+ /**
+ * Create a new file
+ *
+ * @param string $path relative path of the new file
+ * @return \OCP\Files\File
+ * @throws \OCP\Files\NotPermittedException
+ */
+ public function newFile($path);
+
+ /**
+ * search for files with the name matching $query
+ *
+ * @param string $query
+ * @return \OCP\Files\Node[]
+ */
+ public function search($query);
+
+ /**
+ * search for files by mimetype
+ * $mimetype can either be a full mimetype (image/png) or a wildcard mimetype (image)
+ *
+ * @param string $mimetype
+ * @return \OCP\Files\Node[]
+ */
+ public function searchByMime($mimetype);
+
+ /**
+ * get a file or folder inside the folder by it's internal id
+ *
+ * @param int $id
+ * @return \OCP\Files\Node[]
+ */
+ public function getById($id);
+
+ /**
+ * Get the amount of free space inside the folder
+ *
+ * @return int
+ */
+ public function getFreeSpace();
+
+ /**
+ * Check if new files or folders can be created within the folder
+ *
+ * @return bool
+ */
+ public function isCreatable();
+}
diff --git a/lib/public/files/node.php b/lib/public/files/node.php
new file mode 100644
index 0000000000000000000000000000000000000000..b3ddf6de6212bee19708747caa32fb02debf853f
--- /dev/null
+++ b/lib/public/files/node.php
@@ -0,0 +1,159 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OCP\Files;
+
+interface Node {
+ /**
+ * Move the file or folder to a new location
+ *
+ * @param string $targetPath the absolute target path
+ * @throws \OCP\Files\NotPermittedException
+ * @return \OCP\Files\Node
+ */
+ public function move($targetPath);
+
+ /**
+ * Delete the file or folder
+ */
+ public function delete();
+
+ /**
+ * Cope the file or folder to a new location
+ *
+ * @param string $targetPath the absolute target path
+ * @return \OCP\Files\Node
+ */
+ public function copy($targetPath);
+
+ /**
+ * Change the modified date of the file or folder
+ * If $mtime is omitted the current time will be used
+ *
+ * @param int $mtime (optional) modified date as unix timestamp
+ * @throws \OCP\Files\NotPermittedException
+ */
+ public function touch($mtime = null);
+
+ /**
+ * Get the storage backend the file or folder is stored on
+ *
+ * @return \OCP\Files\Storage
+ * @throws \OCP\Files\NotFoundException
+ */
+ public function getStorage();
+
+ /**
+ * Get the full path of the file or folder
+ *
+ * @return string
+ */
+ public function getPath();
+
+ /**
+ * Get the path of the file or folder relative to the mountpoint of it's storage
+ *
+ * @return string
+ */
+ public function getInternalPath();
+
+ /**
+ * Get the internal file id for the file or folder
+ *
+ * @return int
+ */
+ public function getId();
+
+ /**
+ * Get metadata of the file or folder
+ * The returned array contains the following values:
+ * - mtime
+ * - size
+ *
+ * @return array
+ */
+ public function stat();
+
+ /**
+ * Get the modified date of the file or folder as unix timestamp
+ *
+ * @return int
+ */
+ public function getMTime();
+
+ /**
+ * Get the size of the file or folder in bytes
+ *
+ * @return int
+ */
+ public function getSize();
+
+ /**
+ * Get the Etag of the file or folder
+ * The Etag is an string id used to detect changes to a file or folder,
+ * every time the file or folder is changed the Etag will change to
+ *
+ * @return string
+ */
+ public function getEtag();
+
+
+ /**
+ * Get the permissions of the file or folder as a combination of one or more of the following constants:
+ * - \OCP\PERMISSION_READ
+ * - \OCP\PERMISSION_UPDATE
+ * - \OCP\PERMISSION_CREATE
+ * - \OCP\PERMISSION_DELETE
+ * - \OCP\PERMISSION_SHARE
+ *
+ * @return int
+ */
+ public function getPermissions();
+
+ /**
+ * Check if the file or folder is readable
+ *
+ * @return bool
+ */
+ public function isReadable();
+
+ /**
+ * Check if the file or folder is writable
+ *
+ * @return bool
+ */
+ public function isUpdateable();
+
+ /**
+ * Check if the file or folder is deletable
+ *
+ * @return bool
+ */
+ public function isDeletable();
+
+ /**
+ * Check if the file or folder is shareable
+ *
+ * @return bool
+ */
+ public function isShareable();
+
+ /**
+ * Get the parent folder of the file or folder
+ *
+ * @return Folder
+ */
+ public function getParent();
+
+ /**
+ * Get the filename of the file or folder
+ *
+ * @return string
+ */
+ public function getName();
+}
diff --git a/lib/public/files/notenoughspaceexception.php b/lib/public/files/notenoughspaceexception.php
new file mode 100644
index 0000000000000000000000000000000000000000..e51806666ad139e2c3b9c3e91b1d3738c9fc7d0e
--- /dev/null
+++ b/lib/public/files/notenoughspaceexception.php
@@ -0,0 +1,11 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OCP\Files;
+
+class NotEnoughSpaceException extends \Exception {}
diff --git a/lib/public/files/notfoundexception.php b/lib/public/files/notfoundexception.php
new file mode 100644
index 0000000000000000000000000000000000000000..1ff426a40c6e405a0c5c9ffa812c747b230add73
--- /dev/null
+++ b/lib/public/files/notfoundexception.php
@@ -0,0 +1,11 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OCP\Files;
+
+class NotFoundException extends \Exception {}
diff --git a/lib/public/files/notpermittedexception.php b/lib/public/files/notpermittedexception.php
new file mode 100644
index 0000000000000000000000000000000000000000..0509de7e8291b580d01f948c4253929c8f7f6ae3
--- /dev/null
+++ b/lib/public/files/notpermittedexception.php
@@ -0,0 +1,11 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OCP\Files;
+
+class NotPermittedException extends \Exception {}
diff --git a/lib/public/files/storage.php b/lib/public/files/storage.php
new file mode 100644
index 0000000000000000000000000000000000000000..f32f20734836c998803ddbb52dee3135241d636a
--- /dev/null
+++ b/lib/public/files/storage.php
@@ -0,0 +1,297 @@
+<?php
+/**
+ * Copyright (c) 2012 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OCP\Files;
+
+/**
+ * Provide a common interface to all different storage options
+ *
+ * All paths passed to the storage are relative to the storage and should NOT have a leading slash.
+ */
+interface Storage {
+ /**
+ * $parameters is a free form array with the configuration options needed to construct the storage
+ *
+ * @param array $parameters
+ */
+ public function __construct($parameters);
+
+ /**
+ * Get the identifier for the storage,
+ * the returned id should be the same for every storage object that is created with the same parameters
+ * and two storage objects with the same id should refer to two storages that display the same files.
+ *
+ * @return string
+ */
+ public function getId();
+
+ /**
+ * see http://php.net/manual/en/function.mkdir.php
+ *
+ * @param string $path
+ * @return bool
+ */
+ public function mkdir($path);
+
+ /**
+ * see http://php.net/manual/en/function.rmdir.php
+ *
+ * @param string $path
+ * @return bool
+ */
+ public function rmdir($path);
+
+ /**
+ * see http://php.net/manual/en/function.opendir.php
+ *
+ * @param string $path
+ * @return resource
+ */
+ public function opendir($path);
+
+ /**
+ * see http://php.net/manual/en/function.is_dir.php
+ *
+ * @param string $path
+ * @return bool
+ */
+ public function is_dir($path);
+
+ /**
+ * see http://php.net/manual/en/function.is_file.php
+ *
+ * @param string $path
+ * @return bool
+ */
+ public function is_file($path);
+
+ /**
+ * see http://php.net/manual/en/function.stat.php
+ * only the following keys are required in the result: size and mtime
+ *
+ * @param string $path
+ * @return array
+ */
+ public function stat($path);
+
+ /**
+ * see http://php.net/manual/en/function.filetype.php
+ *
+ * @param string $path
+ * @return bool
+ */
+ public function filetype($path);
+
+ /**
+ * see http://php.net/manual/en/function.filesize.php
+ * The result for filesize when called on a folder is required to be 0
+ *
+ * @param string $path
+ * @return int
+ */
+ public function filesize($path);
+
+ /**
+ * check if a file can be created in $path
+ *
+ * @param string $path
+ * @return bool
+ */
+ public function isCreatable($path);
+
+ /**
+ * check if a file can be read
+ *
+ * @param string $path
+ * @return bool
+ */
+ public function isReadable($path);
+
+ /**
+ * check if a file can be written to
+ *
+ * @param string $path
+ * @return bool
+ */
+ public function isUpdatable($path);
+
+ /**
+ * check if a file can be deleted
+ *
+ * @param string $path
+ * @return bool
+ */
+ public function isDeletable($path);
+
+ /**
+ * check if a file can be shared
+ *
+ * @param string $path
+ * @return bool
+ */
+ public function isSharable($path);
+
+ /**
+ * get the full permissions of a path.
+ * Should return a combination of the PERMISSION_ constants defined in lib/public/constants.php
+ *
+ * @param string $path
+ * @return int
+ */
+ public function getPermissions($path);
+
+ /**
+ * see http://php.net/manual/en/function.file_exists.php
+ *
+ * @param string $path
+ * @return bool
+ */
+ public function file_exists($path);
+
+ /**
+ * see http://php.net/manual/en/function.filemtime.php
+ *
+ * @param string $path
+ * @return int
+ */
+ public function filemtime($path);
+
+ /**
+ * see http://php.net/manual/en/function.file_get_contents.php
+ *
+ * @param string $path
+ * @return string
+ */
+ public function file_get_contents($path);
+
+ /**
+ * see http://php.net/manual/en/function.file_put_contents.php
+ *
+ * @param string $path
+ * @param string $data
+ * @return bool
+ */
+ public function file_put_contents($path, $data);
+
+ /**
+ * see http://php.net/manual/en/function.unlink.php
+ *
+ * @param string $path
+ * @return bool
+ */
+ public function unlink($path);
+
+ /**
+ * see http://php.net/manual/en/function.rename.php
+ *
+ * @param string $path1
+ * @param string $path2
+ * @return bool
+ */
+ public function rename($path1, $path2);
+
+ /**
+ * see http://php.net/manual/en/function.copy.php
+ *
+ * @param string $path1
+ * @param string $path2
+ * @return bool
+ */
+ public function copy($path1, $path2);
+
+ /**
+ * see http://php.net/manual/en/function.fopen.php
+ *
+ * @param string $path
+ * @param string $mode
+ * @return resource
+ */
+ public function fopen($path, $mode);
+
+ /**
+ * get the mimetype for a file or folder
+ * The mimetype for a folder is required to be "httpd/unix-directory"
+ *
+ * @param string $path
+ * @return string
+ */
+ public function getMimeType($path);
+
+ /**
+ * see http://php.net/manual/en/function.hash-file.php
+ *
+ * @param string $type
+ * @param string $path
+ * @param bool $raw
+ * @return string
+ */
+ public function hash($type, $path, $raw = false);
+
+ /**
+ * see http://php.net/manual/en/function.free_space.php
+ *
+ * @param string $path
+ * @return int
+ */
+ public function free_space($path);
+
+ /**
+ * search for occurrences of $query in file names
+ *
+ * @param string $query
+ * @return array
+ */
+ public function search($query);
+
+ /**
+ * see http://php.net/manual/en/function.touch.php
+ * If the backend does not support the operation, false should be returned
+ *
+ * @param string $path
+ * @param int $mtime
+ * @return bool
+ */
+ public function touch($path, $mtime = null);
+
+ /**
+ * get the path to a local version of the file.
+ * The local version of the file can be temporary and doesn't have to be persistent across requests
+ *
+ * @param string $path
+ * @return string
+ */
+ public function getLocalFile($path);
+
+ /**
+ * get the path to a local version of the folder.
+ * The local version of the folder can be temporary and doesn't have to be persistent across requests
+ *
+ * @param string $path
+ * @return string
+ */
+ public function getLocalFolder($path);
+ /**
+ * check if a file or folder has been updated since $time
+ *
+ * @param string $path
+ * @param int $time
+ * @return bool
+ *
+ * hasUpdated for folders should return at least true if a file inside the folder is add, removed or renamed.
+ * returning true for other changes in the folder is optional
+ */
+ public function hasUpdated($path, $time);
+
+ /**
+ * get the ETag for a file or folder
+ *
+ * @param string $path
+ * @return string
+ */
+ public function getETag($path);
+}
diff --git a/lib/public/icache.php b/lib/public/icache.php
new file mode 100644
index 0000000000000000000000000000000000000000..436ee71b2b99e511fe239bda82d5c7d9bce50a6b
--- /dev/null
+++ b/lib/public/icache.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Copyright (c) 2013 Thomas Tanghus (thomas@tanghus.net)
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+namespace OCP;
+
+/**
+ * This interface defines method for accessing the file based user cache.
+ */
+interface ICache {
+
+ /**
+ * Get a value from the user cache
+ *
+ * @param string $key
+ * @return mixed
+ */
+ public function get($key);
+
+ /**
+ * Set a value in the user cache
+ *
+ * @param string $key
+ * @param mixed $value
+ * @param int $ttl Time To Live in seconds. Defaults to 60*60*24
+ * @return bool
+ */
+ public function set($key, $value, $ttl = 0);
+
+ /**
+ * Check if a value is set in the user cache
+ *
+ * @param string $key
+ * @return bool
+ */
+ public function hasKey($key);
+
+ /**
+ * Remove an item from the user cache
+ *
+ * @param string $key
+ * @return bool
+ */
+ public function remove($key);
+
+ /**
+ * clear the user cache of all entries starting with a prefix
+ * @param string $prefix (optional)
+ * @return bool
+ */
+ public function clear($prefix = '');
+}
diff --git a/lib/public/iconfig.php b/lib/public/iconfig.php
new file mode 100644
index 0000000000000000000000000000000000000000..850bddf6935fce77b22c71b597481f77fb67c8bb
--- /dev/null
+++ b/lib/public/iconfig.php
@@ -0,0 +1,65 @@
+<?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 OCP;
+
+/**
+ * Access to all the configuration options ownCloud offers
+ */
+interface IConfig {
+ /**
+ * Sets a new system wide value
+ * @param string $key the key of the value, under which will be saved
+ * @param string $value the value that should be stored
+ * @todo need a use case for this
+ */
+// public function setSystemValue($key, $value);
+
+ /**
+ * Looks up a system wide defined value
+ * @param string $key the key of the value, under which it was saved
+ * @return string the saved value
+ */
+ public function getSystemValue($key);
+
+
+ /**
+ * Writes a new app wide value
+ * @param string $appName the appName that we want to store the value under
+ * @param string $key the key of the value, under which will be saved
+ * @param string $value the value that should be stored
+ */
+ public function setAppValue($appName, $key, $value);
+
+ /**
+ * Looks up an app wide defined value
+ * @param string $appName the appName that we stored the value under
+ * @param string $key the key of the value, under which it was saved
+ * @return string the saved value
+ */
+ public function getAppValue($appName, $key);
+
+
+ /**
+ * Set a user defined value
+ * @param string $userId the userId of the user that we want to store the value under
+ * @param string $appName the appName that we want to store the value under
+ * @param string $key the key under which the value is being stored
+ * @param string $value the value that you want to store
+ */
+ public function setUserValue($userId, $appName, $key, $value);
+
+ /**
+ * Shortcut for getting a user defined value
+ * @param string $userId the userId of the user that we want to store the value under
+ * @param string $appName the appName that we stored the value under
+ * @param string $key the key under which the value is being stored
+ */
+ public function getUserValue($userId, $appName, $key);
+}
diff --git a/lib/public/icontainer.php b/lib/public/icontainer.php
new file mode 100644
index 0000000000000000000000000000000000000000..d43c1c90f11dbca405f259a442a3d829cfbae509
--- /dev/null
+++ b/lib/public/icontainer.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * ownCloud
+ *
+ * @author Thomas Müller
+ * @copyright 2013 Thomas Müller deepdiver@owncloud.com
+ *
+ * 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/>.
+ *
+ */
+
+namespace OCP;
+
+/**
+ * Class IContainer
+ *
+ * IContainer is the basic interface to be used for any internal dependency injection mechanism
+ *
+ * @package OCP
+ */
+interface IContainer {
+
+ /**
+ * Look up a service for a given name in the container.
+ *
+ * @param string $name
+ * @return mixed
+ */
+ function query($name);
+
+ /**
+ * A value is stored in the container with it's corresponding name
+ *
+ * @param string $name
+ * @param mixed $value
+ * @return void
+ */
+ function registerParameter($name, $value);
+
+ /**
+ * A service is registered in the container where a closure is passed in which will actually
+ * create the service on demand.
+ * In case the parameter $shared is set to true (the default usage) the once created service will remain in
+ * memory and be reused on subsequent calls.
+ * In case the parameter is false the service will be recreated on every call.
+ *
+ * @param string $name
+ * @param callable $closure
+ * @param bool $shared
+ * @return void
+ */
+ function registerService($name, \Closure $closure, $shared = true);
+}
diff --git a/lib/public/idbconnection.php b/lib/public/idbconnection.php
new file mode 100644
index 0000000000000000000000000000000000000000..c741a0f061ac19d49614c1bd547759e1e366ba87
--- /dev/null
+++ b/lib/public/idbconnection.php
@@ -0,0 +1,74 @@
+<?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 OCP;
+
+/**
+ * TODO: Description
+ */
+interface IDBConnection {
+ /**
+ * Used to abstract the owncloud database access away
+ * @param string $sql the sql query with ? placeholder for params
+ * @param int $limit the maximum number of rows
+ * @param int $offset from which row we want to start
+ * @return \Doctrine\DBAL\Driver\Statement The prepared statement.
+ */
+ public function prepare($sql, $limit=null, $offset=null);
+
+ /**
+ * Used to get the id of the just inserted element
+ * @param string $tableName the name of the table where we inserted the item
+ * @return int the id of the inserted element
+ */
+ public function lastInsertId($table = null);
+
+ /**
+ * @brief Insert a row if a matching row doesn't exists.
+ * @param $table string The table name (will replace *PREFIX*) to perform the replace on.
+ * @param $input array
+ *
+ * The input array if in the form:
+ *
+ * array ( 'id' => array ( 'value' => 6,
+ * 'key' => true
+ * ),
+ * 'name' => array ('value' => 'Stoyan'),
+ * 'family' => array ('value' => 'Stefanov'),
+ * 'birth_date' => array ('value' => '1975-06-20')
+ * );
+ * @return bool
+ *
+ */
+ public function insertIfNotExist($table, $input);
+
+ /**
+ * @brief Start a transaction
+ * @return bool TRUE on success or FALSE on failure
+ */
+ public function beginTransaction();
+
+ /**
+ * @brief Commit the database changes done during a transaction that is in progress
+ * @return bool TRUE on success or FALSE on failure
+ */
+ public function commit();
+
+ /**
+ * @brief Rollback the database changes done during a transaction that is in progress
+ * @return bool TRUE on success or FALSE on failure
+ */
+ public function rollBack();
+
+ /**
+ * returns the error code and message as a string for logging
+ * @return string
+ */
+ public function getError();
+}
diff --git a/lib/public/inavigationmanager.php b/lib/public/inavigationmanager.php
new file mode 100644
index 0000000000000000000000000000000000000000..f89e790c1d0f6bbf70f8cf51db8a12c194781a83
--- /dev/null
+++ b/lib/public/inavigationmanager.php
@@ -0,0 +1,27 @@
+<?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 OCP;
+
+/**
+ * Manages the ownCloud navigation
+ */
+interface INavigationManager {
+ /**
+ * Creates a new navigation entry
+ * @param array $entry containing: id, name, order, icon and href key
+ */
+ public function add(array $entry);
+
+ /**
+ * Sets the current navigation entry of the currently running app
+ * @param string $appId id of the app entry to activate (from added $entry)
+ */
+ public function setActiveEntry($appId);
+}
diff --git a/lib/public/ipreview.php b/lib/public/ipreview.php
new file mode 100644
index 0000000000000000000000000000000000000000..b01e7f5b539918f7cee5549af7233080511daabe
--- /dev/null
+++ b/lib/public/ipreview.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Copyright (c) 2013 Frank Karlitschek frank@owncloud.org
+ * Copyright (c) 2013 Georg Ehrke georg@ownCloud.com
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+namespace OCP;
+
+/**
+ * This class provides functions to render and show thumbnails and previews of files
+ */
+interface IPreview
+{
+
+ /**
+ * @brief return a preview of a file
+ * @param string $file The path to the file where you want a thumbnail from
+ * @param int $maxX The maximum X size of the thumbnail. It can be smaller depending on the shape of the image
+ * @param int $maxY The maximum Y size of the thumbnail. It can be smaller depending on the shape of the image
+ * @param boolean $scaleUp Scale smaller images up to the thumbnail size or not. Might look ugly
+ * @return \OCP\Image
+ */
+ function createPreview($file, $maxX = 100, $maxY = 75, $scaleUp = false);
+
+
+ /**
+ * @brief returns true if the passed mime type is supported
+ * @param string $mimeType
+ * @return boolean
+ */
+ function isMimeSupported($mimeType = '*');
+
+}
diff --git a/lib/public/irequest.php b/lib/public/irequest.php
new file mode 100644
index 0000000000000000000000000000000000000000..9f335b06f2ac85093f6ff92f6749d8dbd48d2129
--- /dev/null
+++ b/lib/public/irequest.php
@@ -0,0 +1,96 @@
+<?php
+/**
+ * ownCloud
+ *
+ * @author Thomas Müller
+ * @copyright 2013 Thomas Müller deepdiver@owncloud.com
+ *
+ * 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/>.
+ *
+ */
+
+namespace OCP;
+
+
+interface IRequest {
+
+ function getHeader($name);
+
+ /**
+ * Lets you access post and get parameters by the index
+ * In case of json requests the encoded json body is accessed
+ *
+ * @param string $key the key which you want to access in the URL Parameter
+ * placeholder, $_POST or $_GET array.
+ * The priority how they're returned is the following:
+ * 1. URL parameters
+ * 2. POST parameters
+ * 3. GET parameters
+ * @param mixed $default If the key is not found, this value will be returned
+ * @return mixed the content of the array
+ */
+ public function getParam($key, $default = null);
+
+
+ /**
+ * Returns all params that were received, be it from the request
+ *
+ * (as GET or POST) or through the URL by the route
+ * @return array the array with all parameters
+ */
+ public function getParams();
+
+ /**
+ * Returns the method of the request
+ *
+ * @return string the method of the request (POST, GET, etc)
+ */
+ public function getMethod();
+
+ /**
+ * Shortcut for accessing an uploaded file through the $_FILES array
+ *
+ * @param string $key the key that will be taken from the $_FILES array
+ * @return array the file in the $_FILES element
+ */
+ public function getUploadedFile($key);
+
+
+ /**
+ * Shortcut for getting env variables
+ *
+ * @param string $key the key that will be taken from the $_ENV array
+ * @return array the value in the $_ENV element
+ */
+ public function getEnv($key);
+
+
+ /**
+ * Shortcut for getting cookie variables
+ *
+ * @param string $key the key that will be taken from the $_COOKIE array
+ * @return array the value in the $_COOKIE element
+ */
+ function getCookie($key);
+
+
+ /**
+ * Returns the request body content.
+ *
+ * @param Boolean $asResource If true, a resource will be returned
+ * @return string|resource The request body content or a resource to read the body stream.
+ * @throws \LogicException
+ */
+ function getContent($asResource = false);
+}
diff --git a/lib/public/iservercontainer.php b/lib/public/iservercontainer.php
new file mode 100644
index 0000000000000000000000000000000000000000..f4045faefeff98ed52343d0b63b86a02b055b473
--- /dev/null
+++ b/lib/public/iservercontainer.php
@@ -0,0 +1,125 @@
+<?php
+/**
+ * ownCloud
+ *
+ * @author Thomas Müller
+ * @copyright 2013 Thomas Müller deepdiver@owncloud.com
+ *
+ * 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/>.
+ *
+ */
+
+namespace OCP;
+
+
+/**
+ * Class IServerContainer
+ * @package OCP
+ *
+ * This container holds all ownCloud services
+ */
+interface IServerContainer {
+
+ /**
+ * The contacts manager will act as a broker between consumers for contacts information and
+ * providers which actual deliver the contact information.
+ *
+ * @return \OCP\Contacts\IManager
+ */
+ function getContactsManager();
+
+ /**
+ * The current request object holding all information about the request currently being processed
+ * is returned from this method.
+ * In case the current execution was not initiated by a web request null is returned
+ *
+ * @return \OCP\IRequest|null
+ */
+ function getRequest();
+
+ /**
+ * Returns the preview manager which can create preview images for a given file
+ *
+ * @return \OCP\IPreview
+ */
+ function getPreviewManager();
+
+ /**
+ * Returns the tag manager which can get and set tags for different object types
+ *
+ * @see \OCP\ITagManager::load()
+ * @return \OCP\ITagManager
+ */
+ function getTagManager();
+
+ /**
+ * Returns the root folder of ownCloud's data directory
+ *
+ * @return \OCP\Files\Folder
+ */
+ function getRootFolder();
+
+ /**
+ * Returns a view to ownCloud's files folder
+ *
+ * @return \OCP\Files\Folder
+ */
+ function getUserFolder();
+
+ /**
+ * Returns an app-specific view in ownClouds data directory
+ *
+ * @return \OCP\Files\Folder
+ */
+ function getAppFolder();
+
+ /**
+ * Returns the user session
+ *
+ * @return \OCP\IUserSession
+ */
+ function getUserSession();
+
+ /**
+ * @return \OCP\INavigationManager
+ */
+ function getNavigationManager();
+
+ /**
+ * @return \OCP\IConfig
+ */
+ function getConfig();
+
+ /**
+ * Returns an ICache instance
+ *
+ * @return \OCP\ICache
+ */
+ function getCache();
+
+ /**
+ * Returns the current session
+ *
+ * @return \OCP\ISession
+ */
+ function getSession();
+
+ /**
+ * Returns the current session
+ *
+ * @return \OCP\IDBConnection
+ */
+ function getDatabaseConnection();
+
+}
diff --git a/lib/public/isession.php b/lib/public/isession.php
new file mode 100644
index 0000000000000000000000000000000000000000..0a77b0c823b042cef5d840bc66723bcf4adc2bea
--- /dev/null
+++ b/lib/public/isession.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Copyright (c) 2013 Thomas Tanghus (thomas@tanghus.net)
+ * @author Thomas Tanghus
+ * @author Robin Appelman
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OCP;
+
+/**
+ * Interface ISession
+ *
+ * wrap PHP's internal session handling into the ISession interface
+ */
+interface ISession {
+
+ /**
+ * Set a value in the session
+ *
+ * @param string $key
+ * @param mixed $value
+ */
+ public function set($key, $value);
+
+ /**
+ * Get a value from the session
+ *
+ * @param string $key
+ * @return mixed should return null if $key does not exist
+ */
+ public function get($key);
+
+ /**
+ * Check if a named key exists in the session
+ *
+ * @param string $key
+ * @return bool
+ */
+ public function exists($key);
+
+ /**
+ * Remove a $key/$value pair from the session
+ *
+ * @param string $key
+ */
+ public function remove($key);
+
+ /**
+ * Reset and recreate the session
+ */
+ public function clear();
+
+}
diff --git a/lib/public/itagmanager.php b/lib/public/itagmanager.php
new file mode 100644
index 0000000000000000000000000000000000000000..07e1d12fc0f53ee132d3b546d89534b72e7d0743
--- /dev/null
+++ b/lib/public/itagmanager.php
@@ -0,0 +1,48 @@
+<?php
+/**
+* ownCloud
+*
+* @author Thomas Tanghus
+* @copyright 2013 Thomas Tanghus <thomas@tanghus.net>
+*
+* 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/>.
+*
+*/
+
+/**
+ * Factory class creating instances of \OCP\ITags
+ *
+ * A tag can be e.g. 'Family', 'Work', 'Chore', 'Special Occation' or
+ * anything else that is either parsed from a vobject or that the user chooses
+ * to add.
+ * Tag names are not case-sensitive, but will be saved with the case they
+ * are entered in. If a user already has a tag 'family' for a type, and
+ * tries to add a tag named 'Family' it will be silently ignored.
+ */
+
+namespace OCP;
+
+interface ITagManager {
+
+ /**
+ * Create a new \OCP\ITags instance and load tags from db.
+ *
+ * @see \OCP\ITags
+ * @param string $type The type identifier e.g. 'contact' or 'event'.
+ * @param array $defaultTags An array of default tags to be used if none are stored.
+ * @return \OCP\ITags
+ */
+ public function load($type, $defaultTags=array());
+
+}
\ No newline at end of file
diff --git a/lib/public/itags.php b/lib/public/itags.php
new file mode 100644
index 0000000000000000000000000000000000000000..5b1ebd189da25e4fb11ea168eb7a614a9930f5fd
--- /dev/null
+++ b/lib/public/itags.php
@@ -0,0 +1,164 @@
+<?php
+/**
+* ownCloud
+*
+* @author Thomas Tanghus
+* @copyright 2013 Thomas Tanghus <thomas@tanghus.net>
+*
+* 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/>.
+*
+*/
+
+namespace OCP;
+
+// FIXME: Where should I put this? Or should it be implemented as a Listener?
+\OC_Hook::connect('OC_User', 'post_deleteUser', 'OC\Tags', 'post_deleteUser');
+
+/**
+ * Class for easily tagging objects by their id
+ *
+ * A tag can be e.g. 'Family', 'Work', 'Chore', 'Special Occation' or
+ * anything else that is either parsed from a vobject or that the user chooses
+ * to add.
+ * Tag names are not case-sensitive, but will be saved with the case they
+ * are entered in. If a user already has a tag 'family' for a type, and
+ * tries to add a tag named 'Family' it will be silently ignored.
+ */
+
+interface ITags {
+
+ /**
+ * Check if any tags are saved for this type and user.
+ *
+ * @return boolean.
+ */
+ public function isEmpty();
+
+ /**
+ * Get the tags for a specific user.
+ *
+ * This returns an array with id/name maps:
+ * [
+ * ['id' => 0, 'name' = 'First tag'],
+ * ['id' => 1, 'name' = 'Second tag'],
+ * ]
+ *
+ * @returns array
+ */
+ public function getTags();
+
+ /**
+ * Get the a list if items tagged with $tag.
+ *
+ * Throws an exception if the tag could not be found.
+ *
+ * @param string|integer $tag Tag id or name.
+ * @return array An array of object ids or false on error.
+ */
+ public function getIdsForTag($tag);
+
+ /**
+ * Checks whether a tag is already saved.
+ *
+ * @param string $name The name to check for.
+ * @return bool
+ */
+ public function hasTag($name);
+
+ /**
+ * Add a new tag.
+ *
+ * @param string $name A string with a name of the tag
+ * @return int the id of the added tag or false if it already exists.
+ */
+ public function add($name);
+
+ /**
+ * Rename tag.
+ *
+ * @param string $from The name of the existing tag
+ * @param string $to The new name of the tag.
+ * @return bool
+ */
+ public function rename($from, $to);
+
+ /**
+ * Add a list of new tags.
+ *
+ * @param string[] $names A string with a name or an array of strings containing
+ * the name(s) of the to add.
+ * @param bool $sync When true, save the tags
+ * @param int|null $id int Optional object id to add to this|these tag(s)
+ * @return bool Returns false on error.
+ */
+ public function addMultiple($names, $sync=false, $id = null);
+
+ /**
+ * Delete tag/object relations from the db
+ *
+ * @param array $ids The ids of the objects
+ * @return boolean Returns false on error.
+ */
+ public function purgeObjects(array $ids);
+
+ /**
+ * Get favorites for an object type
+ *
+ * @return array An array of object ids.
+ */
+ public function getFavorites();
+
+ /**
+ * Add an object to favorites
+ *
+ * @param int $objid The id of the object
+ * @return boolean
+ */
+ public function addToFavorites($objid);
+
+ /**
+ * Remove an object from favorites
+ *
+ * @param int $objid The id of the object
+ * @return boolean
+ */
+ public function removeFromFavorites($objid);
+
+ /**
+ * Creates a tag/object relation.
+ *
+ * @param int $objid The id of the object
+ * @param int|string $tag The id or name of the tag
+ * @return boolean Returns false on database error.
+ */
+ public function tagAs($objid, $tag);
+
+ /**
+ * Delete single tag/object relation from the db
+ *
+ * @param int $objid The id of the object
+ * @param int|string $tag The id or name of the tag
+ * @return boolean
+ */
+ public function unTag($objid, $tag);
+
+ /**
+ * Delete tags from the
+ *
+ * @param string[] $names An array of tags to delete
+ * @return bool Returns false on error
+ */
+ public function delete($names);
+
+}
\ No newline at end of file
diff --git a/lib/public/iusersession.php b/lib/public/iusersession.php
new file mode 100644
index 0000000000000000000000000000000000000000..5dc1ecf71e647b14dba6676f5f6d59d2853e2687
--- /dev/null
+++ b/lib/public/iusersession.php
@@ -0,0 +1,30 @@
+<?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 OCP;
+
+/**
+ * User session
+ */
+interface IUserSession {
+ /**
+ * Do a user login
+ * @param string $user the username
+ * @param string $password the password
+ * @return bool true if successful
+ */
+ public function login($user, $password);
+
+ /**
+ * @brief Logs the user out including all the session data
+ * Logout, destroys session
+ */
+ public function logout();
+
+}
diff --git a/lib/public/share.php b/lib/public/share.php
index b38208bc67fcfdce4f09952f33d7fdab2c162e07..6c5783f1179014c8897514a5df4c3008d2d25171 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;
-
+
}
/**
@@ -140,8 +140,13 @@ class Share {
$source = -1;
$cache = false;
- $view = new \OC\Files\View('/' . $user . '/files/');
- $meta = $view->getFileInfo(\OC\Files\Filesystem::normalizePath($path));
+ $view = new \OC\Files\View('/' . $user . '/files');
+ if ($view->file_exists($path)) {
+ $meta = $view->getFileInfo($path);
+ } else {
+ // if the file doesn't exists yet we start with the parent folder
+ $meta = $view->getFileInfo(dirname($path));
+ }
if($meta !== false) {
$source = $meta['fileid'];
@@ -251,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
@@ -288,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;
}
/**
@@ -445,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']);
}
@@ -455,15 +472,18 @@ 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
if (isset($oldToken)) {
$token = $oldToken;
} else {
- $token = \OC_Util::generate_random_bytes(self::TOKEN_LENGTH);
+ $token = \OC_Util::generateRandomBytes(self::TOKEN_LENGTH);
}
$result = self::put($itemType, $itemSource, $shareType, $shareWith, $uidOwner, $permissions,
null, $token);
@@ -740,10 +760,10 @@ class Share {
/**
* @brief Get the backend class for the specified item type
- * @param string Item type
- * @return Sharing backend object
+ * @param string $itemType
+ * @return Share_Backend
*/
- private static function getBackend($itemType) {
+ public static function getBackend($itemType) {
if (isset(self::$backends[$itemType])) {
return self::$backends[$itemType];
} else if (isset(self::$backendTypes[$itemType]['class'])) {
diff --git a/lib/public/template.php b/lib/public/template.php
index ab1089c332d659088c0ad69067a03af90fb3959c..3b1a4ed4906763fae906314ec3fcc436c86e4771 100644
--- a/lib/public/template.php
+++ b/lib/public/template.php
@@ -54,6 +54,25 @@ function mimetype_icon( $mimetype ) {
return(\mimetype_icon( $mimetype ));
}
+/**
+ * @brief make preview_icon available as a simple function
+ * Returns the path to the preview of the image.
+ * @param $path path of file
+ * @returns link to the preview
+ */
+function preview_icon( $path ) {
+ return(\preview_icon( $path ));
+}
+
+/**
+ * @brief make publicpreview_icon available as a simple function
+ * Returns the path to the preview of the image.
+ * @param $path path of file
+ * @returns link to the preview
+ */
+function publicPreview_icon ( $path, $token ) {
+ return(\publicPreview_icon( $path, $token ));
+}
/**
* @brief make OC_Helper::humanFileSize available as a simple function
diff --git a/lib/public/user.php b/lib/public/user.php
index 23ff991642dfb7e9c457bb34c5c5698c9eaeceb0..576a64d70489d0f5deb2f573d645a316e3968a8c 100644
--- a/lib/public/user.php
+++ b/lib/public/user.php
@@ -102,7 +102,7 @@ class User {
* @brief Check if the password is correct
* @param $uid The username
* @param $password The password
- * @returns true/false
+ * @returns mixed username on success, false otherwise
*
* Check if the password is correct without logging in the user
*/
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/lib/server.php b/lib/server.php
new file mode 100644
index 0000000000000000000000000000000000000000..cabb15324ec36169ff0d950211bf95af008ae3a4
--- /dev/null
+++ b/lib/server.php
@@ -0,0 +1,255 @@
+<?php
+
+namespace OC;
+
+use OC\AppFramework\Http\Request;
+use OC\AppFramework\Utility\SimpleContainer;
+use OC\Cache\UserCache;
+use OC\Files\Node\Root;
+use OC\Files\View;
+use OCP\IServerContainer;
+
+/**
+ * Class Server
+ * @package OC
+ *
+ * TODO: hookup all manager classes
+ */
+class Server extends SimpleContainer implements IServerContainer {
+
+ function __construct() {
+ $this->registerService('ContactsManager', function($c) {
+ return new ContactsManager();
+ });
+ $this->registerService('Request', function($c) {
+ $params = array();
+
+ // we json decode the body only in case of content type json
+ if (isset($_SERVER['CONTENT_TYPE']) && stripos($_SERVER['CONTENT_TYPE'],'json') !== false ) {
+ $params = json_decode(file_get_contents('php://input'), true);
+ $params = is_array($params) ? $params: array();
+ }
+
+ return new Request(
+ array(
+ 'get' => $_GET,
+ 'post' => $_POST,
+ 'files' => $_FILES,
+ 'server' => $_SERVER,
+ 'env' => $_ENV,
+ 'cookies' => $_COOKIE,
+ 'method' => (isset($_SERVER) && isset($_SERVER['REQUEST_METHOD']))
+ ? $_SERVER['REQUEST_METHOD']
+ : null,
+ 'params' => $params,
+ 'urlParams' => $c['urlParams']
+ )
+ );
+ });
+ $this->registerService('PreviewManager', function($c) {
+ return new PreviewManager();
+ });
+ $this->registerService('TagManager', function($c) {
+ $user = \OC_User::getUser();
+ return new TagManager($user);
+ });
+ $this->registerService('RootFolder', function($c) {
+ // TODO: get user and user manager from container as well
+ $user = \OC_User::getUser();
+ /** @var $c SimpleContainer */
+ $userManager = $c->query('UserManager');
+ $user = $userManager->get($user);
+ $manager = \OC\Files\Filesystem::getMountManager();
+ $view = new View();
+ return new Root($manager, $view, $user);
+ });
+ $this->registerService('UserManager', function($c) {
+ return new \OC\User\Manager();
+ });
+ $this->registerService('UserSession', function($c) {
+ /** @var $c SimpleContainer */
+ $manager = $c->query('UserManager');
+ $userSession = new \OC\User\Session($manager, \OC::$session);
+ $userSession->listen('\OC\User', 'preCreateUser', function ($uid, $password) {
+ \OC_Hook::emit('OC_User', 'pre_createUser', array('run' => true, 'uid' => $uid, 'password' => $password));
+ });
+ $userSession->listen('\OC\User', 'postCreateUser', function ($user, $password) {
+ /** @var $user \OC\User\User */
+ \OC_Hook::emit('OC_User', 'post_createUser', array('uid' => $user->getUID(), 'password' => $password));
+ });
+ $userSession->listen('\OC\User', 'preDelete', function ($user) {
+ /** @var $user \OC\User\User */
+ \OC_Hook::emit('OC_User', 'pre_deleteUser', array('run' => true, 'uid' => $user->getUID()));
+ });
+ $userSession->listen('\OC\User', 'postDelete', function ($user) {
+ /** @var $user \OC\User\User */
+ \OC_Hook::emit('OC_User', 'post_deleteUser', array('uid' => $user->getUID()));
+ });
+ $userSession->listen('\OC\User', 'preSetPassword', function ($user, $password, $recoveryPassword) {
+ /** @var $user \OC\User\User */
+ \OC_Hook::emit('OC_User', 'pre_setPassword', array('run' => true, 'uid' => $user->getUID(), 'password' => $password, 'recoveryPassword' => $recoveryPassword));
+ });
+ $userSession->listen('\OC\User', 'postSetPassword', function ($user, $password, $recoveryPassword) {
+ /** @var $user \OC\User\User */
+ \OC_Hook::emit('OC_User', 'post_setPassword', array('run' => true, 'uid' => $user->getUID(), 'password' => $password, 'recoveryPassword' => $recoveryPassword));
+ });
+ $userSession->listen('\OC\User', 'preLogin', function ($uid, $password) {
+ \OC_Hook::emit('OC_User', 'pre_login', array('run' => true, 'uid' => $uid, 'password' => $password));
+ });
+ $userSession->listen('\OC\User', 'postLogin', function ($user, $password) {
+ /** @var $user \OC\User\User */
+ \OC_Hook::emit('OC_User', 'post_login', array('run' => true, 'uid' => $user->getUID(), 'password' => $password));
+ });
+ $userSession->listen('\OC\User', 'logout', function () {
+ \OC_Hook::emit('OC_User', 'logout', array());
+ });
+ return $userSession;
+ });
+ $this->registerService('NavigationManager', function($c) {
+ return new \OC\NavigationManager();
+ });
+ $this->registerService('AllConfig', function($c) {
+ return new \OC\AllConfig();
+ });
+ $this->registerService('UserCache', function($c) {
+ return new UserCache();
+ });
+ }
+
+ /**
+ * @return \OCP\Contacts\IManager
+ */
+ function getContactsManager() {
+ return $this->query('ContactsManager');
+ }
+
+ /**
+ * The current request object holding all information about the request
+ * currently being processed is returned from this method.
+ * In case the current execution was not initiated by a web request null is returned
+ *
+ * @return \OCP\IRequest|null
+ */
+ function getRequest() {
+ return $this->query('Request');
+ }
+
+ /**
+ * Returns the preview manager which can create preview images for a given file
+ *
+ * @return \OCP\IPreview
+ */
+ function getPreviewManager() {
+ return $this->query('PreviewManager');
+ }
+
+ /**
+ * Returns the tag manager which can get and set tags for different object types
+ *
+ * @see \OCP\ITagManager::load()
+ * @return \OCP\ITagManager
+ */
+ function getTagManager() {
+ return $this->query('TagManager');
+ }
+
+ /**
+ * Returns the root folder of ownCloud's data directory
+ *
+ * @return \OCP\Files\Folder
+ */
+ function getRootFolder() {
+ return $this->query('RootFolder');
+ }
+
+ /**
+ * Returns a view to ownCloud's files folder
+ *
+ * @return \OCP\Files\Folder
+ */
+ function getUserFolder() {
+
+ $dir = '/files';
+ $root = $this->getRootFolder();
+ $folder = null;
+ if(!$root->nodeExists($dir)) {
+ $folder = $root->newFolder($dir);
+ } else {
+ $folder = $root->get($dir);
+ }
+ return $folder;
+ }
+
+ /**
+ * Returns an app-specific view in ownClouds data directory
+ *
+ * @return \OCP\Files\Folder
+ */
+ function getAppFolder() {
+
+ $dir = '/' . \OC_App::getCurrentApp();
+ $root = $this->getRootFolder();
+ $folder = null;
+ if(!$root->nodeExists($dir)) {
+ $folder = $root->newFolder($dir);
+ } else {
+ $folder = $root->get($dir);
+ }
+ return $folder;
+ }
+
+ /**
+ * @return \OC\User\Manager
+ */
+ function getUserManager() {
+ return $this->query('UserManager');
+ }
+
+ /**
+ * @return \OC\User\Session
+ */
+ function getUserSession() {
+ return $this->query('UserSession');
+ }
+
+ /**
+ * @return \OC\NavigationManager
+ */
+ function getNavigationManager() {
+ return $this->query('NavigationManager');
+ }
+
+ /**
+ * @return \OC\Config
+ */
+ function getConfig() {
+ return $this->query('AllConfig');
+ }
+
+ /**
+ * Returns an ICache instance
+ *
+ * @return \OCP\ICache
+ */
+ function getCache() {
+ return $this->query('UserCache');
+ }
+
+ /**
+ * Returns the current session
+ *
+ * @return \OCP\ISession
+ */
+ function getSession() {
+ return \OC::$session;
+ }
+
+ /**
+ * Returns the current session
+ *
+ * @return \OCP\IDBConnection
+ */
+ function getDatabaseConnection() {
+ return \OC_DB::getConnection();
+ }
+}
diff --git a/lib/session/session.php b/lib/session/session.php
index 55515f57a87d186adb11c407655b50f943350eda..c55001eccaca570e9381679646be0526855580ee 100644
--- a/lib/session/session.php
+++ b/lib/session/session.php
@@ -8,7 +8,7 @@
namespace OC\Session;
-abstract class Session implements \ArrayAccess {
+abstract class Session implements \ArrayAccess, \OCP\ISession {
/**
* $name serves as a namespace for the session keys
*
diff --git a/lib/setup.php b/lib/setup.php
index 05a49890976f6d5d9b0d4855218081f6922aadc4..6bf3c88370f653d4067b59e833e8938e073d7b19 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -61,7 +61,7 @@ class OC_Setup {
}
//generate a random salt that is used to salt the local user passwords
- $salt = OC_Util::generate_random_bytes(30);
+ $salt = OC_Util::generateRandomBytes(30);
OC_Config::setValue('passwordsalt', $salt);
//write the config file
diff --git a/lib/setup/mysql.php b/lib/setup/mysql.php
index 0cf04fde5a1ca17c68c6d04ec61e66a3f8c32b11..d97b6d2602fac048aa187ed9407d379b6786c612 100644
--- a/lib/setup/mysql.php
+++ b/lib/setup/mysql.php
@@ -23,7 +23,7 @@ class MySQL extends AbstractDatabase {
$this->dbuser=substr('oc_'.$username, 0, 16);
if($this->dbuser!=$oldUser) {
//hash the password so we don't need to store the admin config in the config file
- $this->dbpassword=\OC_Util::generate_random_bytes(30);
+ $this->dbpassword=\OC_Util::generateRandomBytes(30);
$this->createDBUser($connection);
diff --git a/lib/setup/oci.php b/lib/setup/oci.php
index 86b53de45a49513d9021be521b145874f89db953..326d7a005317321940ee563894329d95ced0cdb3 100644
--- a/lib/setup/oci.php
+++ b/lib/setup/oci.php
@@ -65,7 +65,7 @@ class OCI extends AbstractDatabase {
//add prefix to the oracle user name to prevent collisions
$this->dbuser='oc_'.$username;
//create a new password so we don't need to store the admin config in the config file
- $this->dbpassword=\OC_Util::generate_random_bytes(30);
+ $this->dbpassword=\OC_Util::generateRandomBytes(30);
//oracle passwords are treated as identifiers:
// must start with aphanumeric char
diff --git a/lib/setup/postgresql.php b/lib/setup/postgresql.php
index 49fcbf0326e5e23b655a5683b357acf86e5c7a50..89d328ada19cc0392f43069a6cfa1383e1852676 100644
--- a/lib/setup/postgresql.php
+++ b/lib/setup/postgresql.php
@@ -33,7 +33,7 @@ class PostgreSQL extends AbstractDatabase {
//add prefix to the postgresql user name to prevent collisions
$this->dbuser='oc_'.$username;
//create a new password so we don't need to store the admin config in the config file
- $this->dbpassword=\OC_Util::generate_random_bytes(30);
+ $this->dbpassword=\OC_Util::generateRandomBytes(30);
$this->createDBUser($connection);
diff --git a/lib/tagmanager.php b/lib/tagmanager.php
new file mode 100644
index 0000000000000000000000000000000000000000..9a371a11253f524c7148336a22df896f4b60514a
--- /dev/null
+++ b/lib/tagmanager.php
@@ -0,0 +1,68 @@
+<?php
+/**
+* ownCloud
+*
+* @author Thomas Tanghus
+* @copyright 2013 Thomas Tanghus <thomas@tanghus.net>
+*
+* 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/>.
+*
+*/
+
+/**
+ * Factory class creating instances of \OCP\ITags
+ *
+ * A tag can be e.g. 'Family', 'Work', 'Chore', 'Special Occation' or
+ * anything else that is either parsed from a vobject or that the user chooses
+ * to add.
+ * Tag names are not case-sensitive, but will be saved with the case they
+ * are entered in. If a user already has a tag 'family' for a type, and
+ * tries to add a tag named 'Family' it will be silently ignored.
+ */
+
+namespace OC;
+
+class TagManager implements \OCP\ITagManager {
+
+ /**
+ * User
+ *
+ * @var string
+ */
+ private $user = null;
+
+ /**
+ * Constructor.
+ *
+ * @param string $user The user whos data the object will operate on.
+ */
+ public function __construct($user) {
+
+ $this->user = $user;
+
+ }
+
+ /**
+ * Create a new \OCP\ITags instance and load tags from db.
+ *
+ * @see \OCP\ITags
+ * @param string $type The type identifier e.g. 'contact' or 'event'.
+ * @param array $defaultTags An array of default tags to be used if none are stored.
+ * @return \OCP\ITags
+ */
+ public function load($type, $defaultTags=array()) {
+ return new Tags($this->user, $type, $defaultTags);
+ }
+
+}
\ No newline at end of file
diff --git a/lib/tags.php b/lib/tags.php
new file mode 100644
index 0000000000000000000000000000000000000000..9fdb35a7d6e54c0021db3ba9c693756cceb8e8a9
--- /dev/null
+++ b/lib/tags.php
@@ -0,0 +1,642 @@
+<?php
+/**
+* ownCloud
+*
+* @author Thomas Tanghus
+* @copyright 2012-2013 Thomas Tanghus <thomas@tanghus.net>
+* @copyright 2012 Bart Visscher bartv@thisnet.nl
+*
+* 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/>.
+*
+*/
+
+/**
+ * Class for easily tagging objects by their id
+ *
+ * A tag can be e.g. 'Family', 'Work', 'Chore', 'Special Occation' or
+ * anything else that is either parsed from a vobject or that the user chooses
+ * to add.
+ * Tag names are not case-sensitive, but will be saved with the case they
+ * are entered in. If a user already has a tag 'family' for a type, and
+ * tries to add a tag named 'Family' it will be silently ignored.
+ */
+
+namespace OC;
+
+class Tags implements \OCP\ITags {
+
+ /**
+ * Tags
+ *
+ * @var array
+ */
+ private $tags = array();
+
+ /**
+ * Used for storing objectid/categoryname pairs while rescanning.
+ *
+ * @var array
+ */
+ private static $relations = array();
+
+ /**
+ * Type
+ *
+ * @var string
+ */
+ private $type = null;
+
+ /**
+ * User
+ *
+ * @var string
+ */
+ private $user = null;
+
+ const TAG_TABLE = '*PREFIX*vcategory';
+ const RELATION_TABLE = '*PREFIX*vcategory_to_object';
+
+ const TAG_FAVORITE = '_$!<Favorite>!$_';
+
+ /**
+ * Constructor.
+ *
+ * @param string $user The user whos data the object will operate on.
+ */
+ public function __construct($user, $type, $defaultTags = array()) {
+ $this->user = $user;
+ $this->type = $type;
+ $this->loadTags($defaultTags);
+ }
+
+ /**
+ * Load tags from db.
+ *
+ * @param string $type The type identifier e.g. 'contact' or 'event'.
+ * @param array $defaultTags An array of default tags to be used if none are stored.
+ */
+ protected function loadTags($defaultTags=array()) {
+ $this->tags = array();
+ $result = null;
+ $sql = 'SELECT `id`, `category` FROM `' . self::TAG_TABLE . '` '
+ . 'WHERE `uid` = ? AND `type` = ? ORDER BY `category`';
+ try {
+ $stmt = \OCP\DB::prepare($sql);
+ $result = $stmt->execute(array($this->user, $this->type));
+ if (\OCP\DB::isError($result)) {
+ \OCP\Util::writeLog('core', __METHOD__. ', DB error: ' . \OCP\DB::getErrorMessage($result), \OCP\Util::ERROR);
+ }
+ } catch(\Exception $e) {
+ \OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(),
+ \OCP\Util::ERROR);
+ }
+
+ if(!is_null($result)) {
+ while( $row = $result->fetchRow()) {
+ $this->tags[$row['id']] = $row['category'];
+ }
+ }
+
+ if(count($defaultTags) > 0 && count($this->tags) === 0) {
+ $this->addMultiple($defaultTags, true);
+ }
+ \OCP\Util::writeLog('core', __METHOD__.', tags: ' . print_r($this->tags, true),
+ \OCP\Util::DEBUG);
+
+ }
+
+ /**
+ * Check if any tags are saved for this type and user.
+ *
+ * @return boolean.
+ */
+ public function isEmpty() {
+ $sql = 'SELECT COUNT(*) FROM `' . self::TAG_TABLE . '` '
+ . 'WHERE `uid` = ? AND `type` = ?';
+ try {
+ $stmt = \OCP\DB::prepare($sql);
+ $result = $stmt->execute(array($this->user, $this->type));
+ if (\OCP\DB::isError($result)) {
+ \OCP\Util::writeLog('core', __METHOD__. ', DB error: ' . \OCP\DB::getErrorMessage($result), \OCP\Util::ERROR);
+ return false;
+ }
+ return ((int)$result->fetchOne() === 0);
+ } catch(\Exception $e) {
+ \OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(),
+ \OCP\Util::ERROR);
+ return false;
+ }
+ }
+
+ /**
+ * Get the tags for a specific user.
+ *
+ * This returns an array with id/name maps:
+ * [
+ * ['id' => 0, 'name' = 'First tag'],
+ * ['id' => 1, 'name' = 'Second tag'],
+ * ]
+ *
+ * @return array
+ */
+ public function getTags() {
+ if(!count($this->tags)) {
+ return array();
+ }
+
+ $tags = array_values($this->tags);
+ uasort($tags, 'strnatcasecmp');
+ $tagMap = array();
+
+ foreach($tags as $tag) {
+ if($tag !== self::TAG_FAVORITE) {
+ $tagMap[] = array(
+ 'id' => $this->array_searchi($tag, $this->tags),
+ 'name' => $tag
+ );
+ }
+ }
+ return $tagMap;
+
+ }
+
+ /**
+ * Get the a list if items tagged with $tag.
+ *
+ * Throws an exception if the tag could not be found.
+ *
+ * @param string|integer $tag Tag id or name.
+ * @return array An array of object ids or false on error.
+ */
+ public function getIdsForTag($tag) {
+ $result = null;
+ if(is_numeric($tag)) {
+ $tagId = $tag;
+ } elseif(is_string($tag)) {
+ $tag = trim($tag);
+ $tagId = $this->array_searchi($tag, $this->tags);
+ }
+
+ if($tagId === false) {
+ $l10n = \OC_L10N::get('core');
+ throw new \Exception(
+ $l10n->t('Could not find category "%s"', $tag)
+ );
+ }
+
+ $ids = array();
+ $sql = 'SELECT `objid` FROM `' . self::RELATION_TABLE
+ . '` WHERE `categoryid` = ?';
+
+ try {
+ $stmt = \OCP\DB::prepare($sql);
+ $result = $stmt->execute(array($tagId));
+ if (\OCP\DB::isError($result)) {
+ \OCP\Util::writeLog('core', __METHOD__. 'DB error: ' . \OCP\DB::getErrorMessage($result), \OCP\Util::ERROR);
+ return false;
+ }
+ } catch(\Exception $e) {
+ \OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(),
+ \OCP\Util::ERROR);
+ return false;
+ }
+
+ if(!is_null($result)) {
+ while( $row = $result->fetchRow()) {
+ $ids[] = (int)$row['objid'];
+ }
+ }
+
+ return $ids;
+ }
+
+ /**
+ * Checks whether a tag is already saved.
+ *
+ * @param string $name The name to check for.
+ * @return bool
+ */
+ public function hasTag($name) {
+ return $this->in_arrayi($name, $this->tags);
+ }
+
+ /**
+ * Add a new tag.
+ *
+ * @param string $name A string with a name of the tag
+ * @return int the id of the added tag or false if it already exists.
+ */
+ public function add($name) {
+ $name = trim($name);
+
+ if($this->hasTag($name)) {
+ \OCP\Util::writeLog('core', __METHOD__.', name: ' . $name. ' exists already', \OCP\Util::DEBUG);
+ return false;
+ }
+ try {
+ $result = \OCP\DB::insertIfNotExist(
+ self::TAG_TABLE,
+ array(
+ 'uid' => $this->user,
+ 'type' => $this->type,
+ 'category' => $name,
+ )
+ );
+ if (\OCP\DB::isError($result)) {
+ \OCP\Util::writeLog('core', __METHOD__. 'DB error: ' . \OCP\DB::getErrorMessage($result), \OCP\Util::ERROR);
+ return false;
+ } elseif((int)$result === 0) {
+ \OCP\Util::writeLog('core', __METHOD__.', Tag already exists: ' . $name, \OCP\Util::DEBUG);
+ return false;
+ }
+ } catch(\Exception $e) {
+ \OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(),
+ \OCP\Util::ERROR);
+ return false;
+ }
+ $id = \OCP\DB::insertid(self::TAG_TABLE);
+ \OCP\Util::writeLog('core', __METHOD__.', id: ' . $id, \OCP\Util::DEBUG);
+ $this->tags[$id] = $name;
+ return $id;
+ }
+
+ /**
+ * Rename tag.
+ *
+ * @param string $from The name of the existing tag
+ * @param string $to The new name of the tag.
+ * @return bool
+ */
+ public function rename($from, $to) {
+ $from = trim($from);
+ $to = trim($to);
+ $id = $this->array_searchi($from, $this->tags);
+ if($id === false) {
+ \OCP\Util::writeLog('core', __METHOD__.', tag: ' . $from. ' does not exist', \OCP\Util::DEBUG);
+ return false;
+ }
+
+ $sql = 'UPDATE `' . self::TAG_TABLE . '` SET `category` = ? '
+ . 'WHERE `uid` = ? AND `type` = ? AND `id` = ?';
+ try {
+ $stmt = \OCP\DB::prepare($sql);
+ $result = $stmt->execute(array($to, $this->user, $this->type, $id));
+ if (\OCP\DB::isError($result)) {
+ \OCP\Util::writeLog('core', __METHOD__. 'DB error: ' . \OCP\DB::getErrorMessage($result), \OCP\Util::ERROR);
+ return false;
+ }
+ } catch(\Exception $e) {
+ \OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(),
+ \OCP\Util::ERROR);
+ return false;
+ }
+ $this->tags[$id] = $to;
+ return true;
+ }
+
+ /**
+ * Add a list of new tags.
+ *
+ * @param string[] $names A string with a name or an array of strings containing
+ * the name(s) of the to add.
+ * @param bool $sync When true, save the tags
+ * @param int|null $id int Optional object id to add to this|these tag(s)
+ * @return bool Returns false on error.
+ */
+ public function addMultiple($names, $sync=false, $id = null) {
+ if(!is_array($names)) {
+ $names = array($names);
+ }
+ $names = array_map('trim', $names);
+ $newones = array();
+ foreach($names as $name) {
+ if(($this->in_arrayi(
+ $name, $this->tags) == false) && $name !== '') {
+ $newones[] = $name;
+ }
+ if(!is_null($id) ) {
+ // Insert $objectid, $categoryid pairs if not exist.
+ self::$relations[] = array('objid' => $id, 'tag' => $name);
+ }
+ }
+ $this->tags = array_merge($this->tags, $newones);
+ if($sync === true) {
+ $this->save();
+ }
+
+ return true;
+ }
+
+ /**
+ * Save the list of tags and their object relations
+ */
+ protected function save() {
+ if(is_array($this->tags)) {
+ foreach($this->tags as $tag) {
+ try {
+ \OCP\DB::insertIfNotExist(self::TAG_TABLE,
+ array(
+ 'uid' => $this->user,
+ 'type' => $this->type,
+ 'category' => $tag,
+ ));
+ } catch(\Exception $e) {
+ \OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(),
+ \OCP\Util::ERROR);
+ }
+ }
+ // reload tags to get the proper ids.
+ $this->loadTags();
+ // Loop through temporarily cached objectid/tagname pairs
+ // and save relations.
+ $tags = $this->tags;
+ // For some reason this is needed or array_search(i) will return 0..?
+ ksort($tags);
+ foreach(self::$relations as $relation) {
+ $tagId = $this->array_searchi($relation['tag'], $tags);
+ \OCP\Util::writeLog('core', __METHOD__ . 'catid, ' . $relation['tag'] . ' ' . $tagId, \OCP\Util::DEBUG);
+ if($tagId) {
+ try {
+ \OCP\DB::insertIfNotExist(self::RELATION_TABLE,
+ array(
+ 'objid' => $relation['objid'],
+ 'categoryid' => $tagId,
+ 'type' => $this->type,
+ ));
+ } catch(\Exception $e) {
+ \OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(),
+ \OCP\Util::ERROR);
+ }
+ }
+ }
+ self::$relations = array(); // reset
+ } else {
+ \OCP\Util::writeLog('core', __METHOD__.', $this->tags is not an array! '
+ . print_r($this->tags, true), \OCP\Util::ERROR);
+ }
+ }
+
+ /**
+ * Delete tags and tag/object relations for a user.
+ *
+ * For hooking up on post_deleteUser
+ *
+ * @param array
+ */
+ public static function post_deleteUser($arguments) {
+ // Find all objectid/tagId pairs.
+ $result = null;
+ try {
+ $stmt = \OCP\DB::prepare('SELECT `id` FROM `' . self::TAG_TABLE . '` '
+ . 'WHERE `uid` = ?');
+ $result = $stmt->execute(array($arguments['uid']));
+ if (\OCP\DB::isError($result)) {
+ \OCP\Util::writeLog('core', __METHOD__. 'DB error: ' . \OCP\DB::getErrorMessage($result), \OCP\Util::ERROR);
+ }
+ } catch(\Exception $e) {
+ \OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(),
+ \OCP\Util::ERROR);
+ }
+
+ if(!is_null($result)) {
+ try {
+ $stmt = \OCP\DB::prepare('DELETE FROM `' . self::RELATION_TABLE . '` '
+ . 'WHERE `categoryid` = ?');
+ while( $row = $result->fetchRow()) {
+ try {
+ $stmt->execute(array($row['id']));
+ } catch(\Exception $e) {
+ \OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(),
+ \OCP\Util::ERROR);
+ }
+ }
+ } catch(\Exception $e) {
+ \OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(),
+ \OCP\Util::ERROR);
+ }
+ }
+ try {
+ $stmt = \OCP\DB::prepare('DELETE FROM `' . self::TAG_TABLE . '` '
+ . 'WHERE `uid` = ?');
+ $result = $stmt->execute(array($arguments['uid']));
+ if (\OCP\DB::isError($result)) {
+ \OCP\Util::writeLog('core', __METHOD__. ', DB error: ' . \OCP\DB::getErrorMessage($result), \OCP\Util::ERROR);
+ }
+ } catch(\Exception $e) {
+ \OCP\Util::writeLog('core', __METHOD__ . ', exception: '
+ . $e->getMessage(), \OCP\Util::ERROR);
+ }
+ }
+
+ /**
+ * Delete tag/object relations from the db
+ *
+ * @param array $ids The ids of the objects
+ * @return boolean Returns false on error.
+ */
+ public function purgeObjects(array $ids) {
+ if(count($ids) === 0) {
+ // job done ;)
+ return true;
+ }
+ $updates = $ids;
+ try {
+ $query = 'DELETE FROM `' . self::RELATION_TABLE . '` ';
+ $query .= 'WHERE `objid` IN (' . str_repeat('?,', count($ids)-1) . '?) ';
+ $query .= 'AND `type`= ?';
+ $updates[] = $this->type;
+ $stmt = \OCP\DB::prepare($query);
+ $result = $stmt->execute($updates);
+ if (\OCP\DB::isError($result)) {
+ \OCP\Util::writeLog('core', __METHOD__. 'DB error: ' . \OCP\DB::getErrorMessage($result), \OCP\Util::ERROR);
+ return false;
+ }
+ } catch(\Exception $e) {
+ \OCP\Util::writeLog('core', __METHOD__.', exception: ' . $e->getMessage(),
+ \OCP\Util::ERROR);
+ return false;
+ }
+ return true;
+ }
+
+ /**
+ * Get favorites for an object type
+ *
+ * @return array An array of object ids.
+ */
+ public function getFavorites() {
+ try {
+ return $this->getIdsForTag(self::TAG_FAVORITE);
+ } catch(\Exception $e) {
+ \OCP\Util::writeLog('core', __METHOD__.', exception: ' . $e->getMessage(),
+ \OCP\Util::ERROR);
+ return array();
+ }
+ }
+
+ /**
+ * Add an object to favorites
+ *
+ * @param int $objid The id of the object
+ * @return boolean
+ */
+ public function addToFavorites($objid) {
+ if(!$this->hasTag(self::TAG_FAVORITE)) {
+ $this->add(self::TAG_FAVORITE, true);
+ }
+ return $this->tagAs($objid, self::TAG_FAVORITE, $this->type);
+ }
+
+ /**
+ * Remove an object from favorites
+ *
+ * @param int $objid The id of the object
+ * @return boolean
+ */
+ public function removeFromFavorites($objid) {
+ return $this->unTag($objid, self::TAG_FAVORITE, $this->type);
+ }
+
+ /**
+ * Creates a tag/object relation.
+ *
+ * @param int $objid The id of the object
+ * @param int|string $tag The id or name of the tag
+ * @return boolean Returns false on database error.
+ */
+ public function tagAs($objid, $tag) {
+ if(is_string($tag) && !is_numeric($tag)) {
+ $tag = trim($tag);
+ if(!$this->hasTag($tag)) {
+ $this->add($tag, true);
+ }
+ $tagId = $this->array_searchi($tag, $this->tags);
+ } else {
+ $tagId = $tag;
+ }
+ try {
+ \OCP\DB::insertIfNotExist(self::RELATION_TABLE,
+ array(
+ 'objid' => $objid,
+ 'categoryid' => $tagId,
+ 'type' => $this->type,
+ ));
+ } catch(\Exception $e) {
+ \OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(),
+ \OCP\Util::ERROR);
+ return false;
+ }
+ return true;
+ }
+
+ /**
+ * Delete single tag/object relation from the db
+ *
+ * @param int $objid The id of the object
+ * @param int|string $tag The id or name of the tag
+ * @return boolean
+ */
+ public function unTag($objid, $tag) {
+ if(is_string($tag) && !is_numeric($tag)) {
+ $tag = trim($tag);
+ $tagId = $this->array_searchi($tag, $this->tags);
+ } else {
+ $tagId = $tag;
+ }
+
+ try {
+ $sql = 'DELETE FROM `' . self::RELATION_TABLE . '` '
+ . 'WHERE `objid` = ? AND `categoryid` = ? AND `type` = ?';
+ $stmt = \OCP\DB::prepare($sql);
+ $stmt->execute(array($objid, $tagId, $this->type));
+ } catch(\Exception $e) {
+ \OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(),
+ \OCP\Util::ERROR);
+ return false;
+ }
+ return true;
+ }
+
+ /**
+ * Delete tags from the
+ *
+ * @param string[] $names An array of tags to delete
+ * @return bool Returns false on error
+ */
+ public function delete($names) {
+ if(!is_array($names)) {
+ $names = array($names);
+ }
+
+ $names = array_map('trim', $names);
+
+ \OCP\Util::writeLog('core', __METHOD__ . ', before: '
+ . print_r($this->tags, true), \OCP\Util::DEBUG);
+ foreach($names as $name) {
+ $id = null;
+
+ if($this->hasTag($name)) {
+ $id = $this->array_searchi($name, $this->tags);
+ unset($this->tags[$id]);
+ }
+ try {
+ $stmt = \OCP\DB::prepare('DELETE FROM `' . self::TAG_TABLE . '` WHERE '
+ . '`uid` = ? AND `type` = ? AND `category` = ?');
+ $result = $stmt->execute(array($this->user, $this->type, $name));
+ if (\OCP\DB::isError($result)) {
+ \OCP\Util::writeLog('core', __METHOD__. 'DB error: ' . \OCP\DB::getErrorMessage($result), \OCP\Util::ERROR);
+ }
+ } catch(\Exception $e) {
+ \OCP\Util::writeLog('core', __METHOD__ . ', exception: '
+ . $e->getMessage(), \OCP\Util::ERROR);
+ return false;
+ }
+ if(!is_null($id) && $id !== false) {
+ try {
+ $sql = 'DELETE FROM `' . self::RELATION_TABLE . '` '
+ . 'WHERE `categoryid` = ?';
+ $stmt = \OCP\DB::prepare($sql);
+ $result = $stmt->execute(array($id));
+ if (\OCP\DB::isError($result)) {
+ \OCP\Util::writeLog('core',
+ __METHOD__. 'DB error: ' . \OCP\DB::getErrorMessage($result),
+ \OCP\Util::ERROR);
+ return false;
+ }
+ } catch(\Exception $e) {
+ \OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(),
+ \OCP\Util::ERROR);
+ return false;
+ }
+ }
+ }
+ return true;
+ }
+
+ // case-insensitive in_array
+ private function in_arrayi($needle, $haystack) {
+ if(!is_array($haystack)) {
+ return false;
+ }
+ return in_array(strtolower($needle), array_map('strtolower', $haystack));
+ }
+
+ // case-insensitive array_search
+ private function array_searchi($needle, $haystack) {
+ if(!is_array($haystack)) {
+ return false;
+ }
+ return array_search(strtolower($needle), array_map('strtolower', $haystack));
+ }
+}
diff --git a/lib/template/functions.php b/lib/template/functions.php
index 717e197c1cb1b73466b31041e58d9d0fbb65fc40..501f8081bff9969d2d3b4b4317c03176d92d0395 100644
--- a/lib/template/functions.php
+++ b/lib/template/functions.php
@@ -58,6 +58,22 @@ function mimetype_icon( $mimetype ) {
return OC_Helper::mimetypeIcon( $mimetype );
}
+/**
+ * @brief make preview_icon available as a simple function
+ * Returns the path to the preview of the image.
+ * @param $path path of file
+ * @returns link to the preview
+ *
+ * For further information have a look at OC_Helper::previewIcon
+ */
+function preview_icon( $path ) {
+ return OC_Helper::previewIcon( $path );
+}
+
+function publicPreview_icon ( $path, $token ) {
+ return OC_Helper::publicPreviewIcon( $path, $token );
+}
+
/**
* @brief make OC_Helper::humanFileSize available as a simple function
* @param int $bytes size in bytes
diff --git a/lib/templatelayout.php b/lib/templatelayout.php
index 0024c9d4960dc5383ca5f2657a25e5ba2964d459..625f3424a0473ce9dbde867bdb276683df6b9fb9 100644
--- a/lib/templatelayout.php
+++ b/lib/templatelayout.php
@@ -46,6 +46,7 @@ class OC_TemplateLayout extends OC_Template {
$user_displayname = OC_User::getDisplayName();
$this->assign( 'user_displayname', $user_displayname );
$this->assign( 'user_uid', OC_User::getUser() );
+ $this->assign('enableAvatars', \OC_Config::getValue('enable_avatars', true));
} else if ($renderas == 'guest' || $renderas == 'error') {
parent::__construct('core', 'layout.guest');
} else {
@@ -58,7 +59,7 @@ class OC_TemplateLayout extends OC_Template {
if (OC_Config::getValue('installed', false) && $renderas!='error') {
$this->append( 'jsfiles', OC_Helper::linkToRoute('js_config') . $versionParameter);
}
- if (!empty(OC_Util::$core_scripts)) {
+ if (!empty(OC_Util::$coreScripts)) {
$this->append( 'jsfiles', OC_Helper::linkToRemoteBase('core.js', false) . $versionParameter);
}
foreach($jsfiles as $info) {
@@ -71,7 +72,7 @@ class OC_TemplateLayout extends OC_Template {
// Add the css files
$cssfiles = self::findStylesheetFiles(OC_Util::$styles);
$this->assign('cssfiles', array());
- if (!empty(OC_Util::$core_styles)) {
+ if (!empty(OC_Util::$coreStyles)) {
$this->append( 'cssfiles', OC_Helper::linkToRemoteBase('core.css', false) . $versionParameter);
}
foreach($cssfiles as $info) {
diff --git a/lib/user.php b/lib/user.php
index 93c7c9d4cd504120ddb2bfdcb094dd0cfb8f613a..15e807088b4c8e731116d978f94f74ee4217c65a 100644
--- a/lib/user.php
+++ b/lib/user.php
@@ -37,54 +37,15 @@
* logout()
*/
class OC_User {
- public static $userSession = null;
-
public static function getUserSession() {
- if (!self::$userSession) {
- $manager = new \OC\User\Manager();
- self::$userSession = new \OC\User\Session($manager, \OC::$session);
- self::$userSession->listen('\OC\User', 'preCreateUser', function ($uid, $password) {
- \OC_Hook::emit('OC_User', 'pre_createUser', array('run' => true, 'uid' => $uid, 'password' => $password));
- });
- self::$userSession->listen('\OC\User', 'postCreateUser', function ($user, $password) {
- /** @var $user \OC\User\User */
- \OC_Hook::emit('OC_User', 'post_createUser', array('uid' => $user->getUID(), 'password' => $password));
- });
- self::$userSession->listen('\OC\User', 'preDelete', function ($user) {
- /** @var $user \OC\User\User */
- \OC_Hook::emit('OC_User', 'pre_deleteUser', array('run' => true, 'uid' => $user->getUID()));
- });
- self::$userSession->listen('\OC\User', 'postDelete', function ($user) {
- /** @var $user \OC\User\User */
- \OC_Hook::emit('OC_User', 'post_deleteUser', array('uid' => $user->getUID()));
- });
- self::$userSession->listen('\OC\User', 'preSetPassword', function ($user, $password, $recoveryPassword) {
- /** @var $user \OC\User\User */
- OC_Hook::emit('OC_User', 'pre_setPassword', array('run' => true, 'uid' => $user->getUID(), 'password' => $password, 'recoveryPassword' => $recoveryPassword));
- });
- self::$userSession->listen('\OC\User', 'postSetPassword', function ($user, $password, $recoveryPassword) {
- /** @var $user \OC\User\User */
- OC_Hook::emit('OC_User', 'post_setPassword', array('run' => true, 'uid' => $user->getUID(), 'password' => $password, 'recoveryPassword' => $recoveryPassword));
- });
- self::$userSession->listen('\OC\User', 'preLogin', function ($uid, $password) {
- \OC_Hook::emit('OC_User', 'pre_login', array('run' => true, 'uid' => $uid, 'password' => $password));
- });
- self::$userSession->listen('\OC\User', 'postLogin', function ($user, $password) {
- /** @var $user \OC\User\User */
- \OC_Hook::emit('OC_User', 'post_login', array('run' => true, 'uid' => $user->getUID(), 'password' => $password));
- });
- self::$userSession->listen('\OC\User', 'logout', function () {
- \OC_Hook::emit('OC_User', 'logout', array());
- });
- }
- return self::$userSession;
+ return OC::$server->getUserSession();
}
/**
* @return \OC\User\Manager
*/
public static function getManager() {
- return self::getUserSession()->getManager();
+ return OC::$server->getUserManager();
}
private static $_backends = array();
@@ -177,6 +138,7 @@ class OC_User {
* setup the configured backends in config.php
*/
public static function setupBackends() {
+ OC_App::loadApps(array('prelogin'));
$backends = OC_Config::getValue('user_backends', array());
foreach ($backends as $i => $config) {
$class = $config['class'];
@@ -353,7 +315,7 @@ class OC_User {
* generates a password
*/
public static function generatePassword() {
- return OC_Util::generate_random_bytes(30);
+ return OC_Util::generateRandomBytes(30);
}
/**
@@ -410,22 +372,18 @@ class OC_User {
* @brief Check if the password is correct
* @param string $uid The username
* @param string $password The password
- * @return bool
+ * @return mixed user id a string on success, false otherwise
*
* Check if the password is correct without logging in the user
* returns the user id or false
*/
public static function checkPassword($uid, $password) {
- $user = self::getManager()->get($uid);
- if ($user) {
- if ($user->checkPassword($password)) {
- return $user->getUID();
- } else {
- return false;
- }
- } else {
- return false;
+ $manager = self::getManager();
+ $username = $manager->checkPassword($uid, $password);
+ if ($username !== false) {
+ return $username->getUID();
}
+ return false;
}
/**
diff --git a/lib/user/http.php b/lib/user/http.php
index 1e044ed4188ae99a930110fbf05ad2f29ae6d4cb..e99afe59ba718f8947151194f9cdd2b9179eb7d3 100644
--- a/lib/user/http.php
+++ b/lib/user/http.php
@@ -79,7 +79,11 @@ class OC_User_HTTP extends OC_User_Backend {
curl_close($ch);
- return $status==200;
+ if($status === 200) {
+ return $uid;
+ }
+
+ return false;
}
/**
diff --git a/lib/user/manager.php b/lib/user/manager.php
index 8dc9bfe27297a31cad756eeceaf3f74cd25ef095..13286bc28a48ad964ca7278de0373c554e8654c9 100644
--- a/lib/user/manager.php
+++ b/lib/user/manager.php
@@ -118,6 +118,25 @@ class Manager extends PublicEmitter {
return ($user !== null);
}
+ /**
+ * Check if the password is valid for the user
+ *
+ * @param $loginname
+ * @param $password
+ * @return mixed the User object on success, false otherwise
+ */
+ public function checkPassword($loginname, $password) {
+ foreach ($this->backends as $backend) {
+ if($backend->implementsActions(\OC_USER_BACKEND_CHECK_PASSWORD)) {
+ $uid = $backend->checkPassword($loginname, $password);
+ if ($uid !== false) {
+ return $this->getUserObject($uid, $backend);
+ }
+ }
+ }
+ return false;
+ }
+
/**
* search by user id
*
diff --git a/lib/user/session.php b/lib/user/session.php
index 9a6c669e935a8010c8c593c93a59f561c8a6df48..525c65ab8a15e3b86af5bacb0c704f368c7840db 100644
--- a/lib/user/session.php
+++ b/lib/user/session.php
@@ -27,7 +27,7 @@ use OC\Hooks\Emitter;
*
* @package OC\User
*/
-class Session implements Emitter {
+class Session implements Emitter, \OCP\IUserSession {
/**
* @var \OC\User\Manager $manager
*/
@@ -121,15 +121,16 @@ class Session implements Emitter {
*/
public function login($uid, $password) {
$this->manager->emit('\OC\User', 'preLogin', array($uid, $password));
- $user = $this->manager->get($uid);
- if ($user) {
- $result = $user->checkPassword($password);
- if ($result and $user->isEnabled()) {
- $this->setUser($user);
- $this->manager->emit('\OC\User', 'postLogin', array($user, $password));
- return true;
- } else {
- return false;
+ $user = $this->manager->checkPassword($uid, $password);
+ if($user !== false) {
+ if (!is_null($user)) {
+ if ($user->isEnabled()) {
+ $this->setUser($user);
+ $this->manager->emit('\OC\User', 'postLogin', array($user, $password));
+ return true;
+ } else {
+ return false;
+ }
}
} else {
return false;
diff --git a/lib/user/user.php b/lib/user/user.php
index 8115c43198cde309baac391334dca7ab1ef3ba56..e5f842944f105c021c6cd29643c34d50dba1ae7b 100644
--- a/lib/user/user.php
+++ b/lib/user/user.php
@@ -105,24 +105,6 @@ class User {
return !($result === false);
}
- /**
- * Check if the password is valid for the user
- *
- * @param $password
- * @return bool
- */
- public function checkPassword($password) {
- if ($this->backend->implementsActions(\OC_USER_BACKEND_CHECK_PASSWORD)) {
- $result = $this->backend->checkPassword($this->uid, $password);
- if ($result !== false) {
- $this->uid = $result;
- }
- return !($result === false);
- } else {
- return false;
- }
- }
-
/**
* Set the password of the user
*
diff --git a/lib/util.php b/lib/util.php
index 5bfa7d74228966f38fa023b9e87cde83a4fbc576..36969f096fa922ee9a323e8b2c29f23305a9ef13 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -11,12 +11,18 @@ class OC_Util {
public static $headers=array();
private static $rootMounted=false;
private static $fsSetup=false;
- public static $core_styles=array();
- public static $core_scripts=array();
+ public static $coreStyles=array();
+ public static $coreScripts=array();
- // Can be set up
- public static function setupFS( $user = '' ) {// configure the initial filesystem based on the configuration
- if(self::$fsSetup) {//setting up the filesystem twice can only lead to trouble
+ /**
+ * @brief Can be set up
+ * @param string $user
+ * @return boolean
+ * @description configure the initial filesystem based on the configuration
+ */
+ public static function setupFS( $user = '' ) {
+ //setting up the filesystem twice can only lead to trouble
+ if(self::$fsSetup) {
return false;
}
@@ -37,15 +43,16 @@ class OC_Util {
self::$fsSetup=true;
}
- $CONFIG_DATADIRECTORY = OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" );
+ $configDataDirectory = OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" );
//first set up the local "root" storage
\OC\Files\Filesystem::initMounts();
if(!self::$rootMounted) {
- \OC\Files\Filesystem::mount('\OC\Files\Storage\Local', array('datadir'=>$CONFIG_DATADIRECTORY), '/');
- self::$rootMounted=true;
+ \OC\Files\Filesystem::mount('\OC\Files\Storage\Local', array('datadir'=>$configDataDirectory), '/');
+ self::$rootMounted = true;
}
- if( $user != "" ) { //if we aren't logged in, there is no use to set up the filesystem
+ //if we aren't logged in, there is no use to set up the filesystem
+ if( $user != "" ) {
$quota = self::getUserQuota($user);
if ($quota !== \OC\Files\SPACE_UNLIMITED) {
\OC\Files\Filesystem::addStorageWrapper(function($mountPoint, $storage) use ($quota, $user) {
@@ -56,19 +63,19 @@ class OC_Util {
}
});
}
- $user_dir = '/'.$user.'/files';
- $user_root = OC_User::getHome($user);
- $userdirectory = $user_root . '/files';
- if( !is_dir( $userdirectory )) {
- mkdir( $userdirectory, 0755, true );
+ $userDir = '/'.$user.'/files';
+ $userRoot = OC_User::getHome($user);
+ $userDirectory = $userRoot . '/files';
+ if( !is_dir( $userDirectory )) {
+ mkdir( $userDirectory, 0755, true );
}
//jail the user into his "home" directory
- \OC\Files\Filesystem::init($user, $user_dir);
+ \OC\Files\Filesystem::init($user, $userDir);
$fileOperationProxy = new OC_FileProxy_FileOperations();
OC_FileProxy::register($fileOperationProxy);
- OC_Hook::emit('OC_Filesystem', 'setup', array('user' => $user, 'user_dir' => $user_dir));
+ OC_Hook::emit('OC_Filesystem', 'setup', array('user' => $user, 'user_dir' => $userDir));
}
return true;
}
@@ -85,14 +92,17 @@ class OC_Util {
}
}
+ /**
+ * @return void
+ */
public static function tearDownFS() {
\OC\Files\Filesystem::tearDown();
self::$fsSetup=false;
- self::$rootMounted=false;
+ self::$rootMounted=false;
}
/**
- * get the current installed version of ownCloud
+ * @brief get the current installed version of ownCloud
* @return array
*/
public static function getVersion() {
@@ -101,7 +111,7 @@ class OC_Util {
}
/**
- * get the current installed version string of ownCloud
+ * @brief get the current installed version string of ownCloud
* @return string
*/
public static function getVersionString() {
@@ -110,7 +120,7 @@ class OC_Util {
}
/**
- * get the current installed edition of ownCloud. There is the community
+ * @description get the current installed edition of ownCloud. There is the community
* edition that just returns an empty string and the enterprise edition
* that returns "Enterprise".
* @return string
@@ -153,103 +163,117 @@ class OC_Util {
}
/**
- * add a javascript file
+ * @brief add a javascript file
*
- * @param appid $application
- * @param filename $file
+ * @param string $application
+ * @param filename $file
+ * @return void
*/
public static function addScript( $application, $file = null ) {
- if( is_null( $file )) {
+ if ( is_null( $file )) {
$file = $application;
$application = "";
}
- if( !empty( $application )) {
+ if ( !empty( $application )) {
self::$scripts[] = "$application/js/$file";
- }else{
+ } else {
self::$scripts[] = "js/$file";
}
}
/**
- * add a css file
+ * @brief add a css file
*
- * @param appid $application
- * @param filename $file
+ * @param string $application
+ * @param filename $file
+ * @return void
*/
public static function addStyle( $application, $file = null ) {
- if( is_null( $file )) {
+ if ( is_null( $file )) {
$file = $application;
$application = "";
}
- if( !empty( $application )) {
+ if ( !empty( $application )) {
self::$styles[] = "$application/css/$file";
- }else{
+ } else {
self::$styles[] = "css/$file";
}
}
/**
* @brief Add a custom element to the header
- * @param string tag tag name of the element
+ * @param string $tag tag name of the element
* @param array $attributes array of attributes for the element
* @param string $text the text content for the element
+ * @return void
*/
public static function addHeader( $tag, $attributes, $text='') {
- self::$headers[] = array('tag'=>$tag, 'attributes'=>$attributes, 'text'=>$text);
+ self::$headers[] = array(
+ 'tag'=>$tag,
+ 'attributes'=>$attributes,
+ 'text'=>$text
+ );
}
/**
- * formats a timestamp in the "right" way
+ * @brief formats a timestamp in the "right" way
*
- * @param int timestamp $timestamp
- * @param bool dateOnly option to omit time from the result
+ * @param int $timestamp
+ * @param bool $dateOnly option to omit time from the result
+ * @return string timestamp
+ * @description adjust to clients timezone if we know it
*/
public static function formatDate( $timestamp, $dateOnly=false) {
- if(\OC::$session->exists('timezone')) {//adjust to clients timezone if we know it
+ if(\OC::$session->exists('timezone')) {
$systemTimeZone = intval(date('O'));
- $systemTimeZone=(round($systemTimeZone/100, 0)*60)+($systemTimeZone%100);
- $clientTimeZone=\OC::$session->get('timezone')*60;
- $offset=$clientTimeZone-$systemTimeZone;
- $timestamp=$timestamp+$offset*60;
+ $systemTimeZone = (round($systemTimeZone/100, 0)*60) + ($systemTimeZone%100);
+ $clientTimeZone = \OC::$session->get('timezone')*60;
+ $offset = $clientTimeZone - $systemTimeZone;
+ $timestamp = $timestamp + $offset*60;
}
- $l=OC_L10N::get('lib');
+ $l = OC_L10N::get('lib');
return $l->l($dateOnly ? 'date' : 'datetime', $timestamp);
}
/**
- * check if the current server configuration is suitable for ownCloud
+ * @brief check if the current server configuration is suitable for ownCloud
* @return array arrays with error messages and hints
*/
public static function checkServer() {
// Assume that if checkServer() succeeded before in this session, then all is fine.
- if(\OC::$session->exists('checkServer_suceeded') && \OC::$session->get('checkServer_suceeded'))
+ if(\OC::$session->exists('checkServer_suceeded') && \OC::$session->get('checkServer_suceeded')) {
return array();
+ }
- $errors=array();
+ $errors = array();
$defaults = new \OC_Defaults();
- $web_server_restart= false;
+ $webServerRestart = false;
//check for database drivers
if(!(is_callable('sqlite_open') or class_exists('SQLite3'))
and !is_callable('mysql_connect')
and !is_callable('pg_connect')
and !is_callable('oci_connect')) {
- $errors[]=array('error'=>'No database drivers (sqlite, mysql, or postgresql) installed.',
- 'hint'=>'');//TODO: sane hint
- $web_server_restart= true;
+ $errors[] = array(
+ 'error'=>'No database drivers (sqlite, mysql, or postgresql) installed.',
+ 'hint'=>'' //TODO: sane hint
+ );
+ $webServerRestart = true;
}
- //common hint for all file permissons error messages
+ //common hint for all file permissions error messages
$permissionsHint = 'Permissions can usually be fixed by '
- .'<a href="' . $defaults->getDocBaseUrl() . '/server/5.0/admin_manual/installation/installation_source.html#set-the-directory-permissions" target="_blank">giving the webserver write access to the root directory</a>.';
+ .'<a href="' . $defaults->getDocBaseUrl() . '/server/5.0/admin_manual/installation/installation_source.html'
+ .'#set-the-directory-permissions" target="_blank">giving the webserver write access to the root directory</a>.';
// Check if config folder is writable.
if(!is_writable(OC::$SERVERROOT."/config/") or !is_readable(OC::$SERVERROOT."/config/")) {
$errors[] = array(
'error' => "Can't write into config directory",
'hint' => 'This can usually be fixed by '
- .'<a href="' . $defaults->getDocBaseUrl() . '/server/5.0/admin_manual/installation/installation_source.html#set-the-directory-permissions" target="_blank">giving the webserver write access to the config directory</a>.'
+ .'<a href="' . $defaults->getDocBaseUrl() . '/server/5.0/admin_manual/installation/installation_source.html'
+ .'#set-the-directory-permissions" target="_blank">giving the webserver write access to the config directory</a>.'
);
}
@@ -261,7 +285,8 @@ class OC_Util {
$errors[] = array(
'error' => "Can't write into apps directory",
'hint' => 'This can usually be fixed by '
- .'<a href="' . $defaults->getDocBaseUrl() . '/server/5.0/admin_manual/installation/installation_source.html#set-the-directory-permissions" target="_blank">giving the webserver write access to the apps directory</a> '
+ .'<a href="' . $defaults->getDocBaseUrl() . '/server/5.0/admin_manual/installation/installation_source.html'
+ .'#set-the-directory-permissions" target="_blank">giving the webserver write access to the apps directory</a> '
.'or disabling the appstore in the config file.'
);
}
@@ -276,94 +301,131 @@ class OC_Util {
$errors[] = array(
'error' => "Can't create data directory (".$CONFIG_DATADIRECTORY.")",
'hint' => 'This can usually be fixed by '
- .'<a href="' . $defaults->getDocBaseUrl() . '/server/5.0/admin_manual/installation/installation_source.html#set-the-directory-permissions" target="_blank">giving the webserver write access to the root directory</a>.'
+ .'<a href="' . $defaults->getDocBaseUrl() . '/server/5.0/admin_manual/installation/installation_source.html'
+ .'#set-the-directory-permissions" target="_blank">giving the webserver write access to the root directory</a>.'
);
}
} else if(!is_writable($CONFIG_DATADIRECTORY) or !is_readable($CONFIG_DATADIRECTORY)) {
- $errors[]=array('error'=>'Data directory ('.$CONFIG_DATADIRECTORY.') not writable by ownCloud',
- 'hint'=>$permissionsHint);
+ $errors[] = array(
+ 'error'=>'Data directory ('.$CONFIG_DATADIRECTORY.') not writable by ownCloud',
+ 'hint'=>$permissionsHint
+ );
} else {
$errors = array_merge($errors, self::checkDataDirectoryPermissions($CONFIG_DATADIRECTORY));
}
+
+ $moduleHint = "Please ask your server administrator to install the module.";
// check if all required php modules are present
if(!class_exists('ZipArchive')) {
- $errors[]=array('error'=>'PHP module zip not installed.',
- 'hint'=>'Please ask your server administrator to install the module.');
- $web_server_restart=true;
+ $errors[] = array(
+ 'error'=>'PHP module zip not installed.',
+ 'hint'=>$moduleHint
+ );
+ $webServerRestart = true;
}
if(!class_exists('DOMDocument')) {
- $errors[] = array('error' => 'PHP module dom not installed.',
- 'hint' => 'Please ask your server administrator to install the module.');
- $web_server_restart =true;
+ $errors[] = array(
+ 'error' => 'PHP module dom not installed.',
+ 'hint' => $moduleHint
+ );
+ $webServerRestart =true;
}
if(!function_exists('xml_parser_create')) {
- $errors[] = array('error' => 'PHP module libxml not installed.',
- 'hint' => 'Please ask your server administrator to install the module.');
- $web_server_restart =true;
+ $errors[] = array(
+ 'error' => 'PHP module libxml not installed.',
+ 'hint' => $moduleHint
+ );
+ $webServerRestart = true;
}
if(!function_exists('mb_detect_encoding')) {
- $errors[]=array('error'=>'PHP module mb multibyte not installed.',
- 'hint'=>'Please ask your server administrator to install the module.');
- $web_server_restart=true;
+ $errors[] = array(
+ 'error'=>'PHP module mb multibyte not installed.',
+ 'hint'=>$moduleHint
+ );
+ $webServerRestart = true;
}
if(!function_exists('ctype_digit')) {
- $errors[]=array('error'=>'PHP module ctype is not installed.',
- 'hint'=>'Please ask your server administrator to install the module.');
- $web_server_restart=true;
+ $errors[] = array(
+ 'error'=>'PHP module ctype is not installed.',
+ 'hint'=>$moduleHint
+ );
+ $webServerRestart = true;
}
if(!function_exists('json_encode')) {
- $errors[]=array('error'=>'PHP module JSON is not installed.',
- 'hint'=>'Please ask your server administrator to install the module.');
- $web_server_restart=true;
+ $errors[] = array(
+ 'error'=>'PHP module JSON is not installed.',
+ 'hint'=>$moduleHint
+ );
+ $webServerRestart = true;
}
if(!extension_loaded('gd') || !function_exists('gd_info')) {
- $errors[]=array('error'=>'PHP module GD is not installed.',
- 'hint'=>'Please ask your server administrator to install the module.');
- $web_server_restart=true;
+ $errors[] = array(
+ 'error'=>'PHP module GD is not installed.',
+ 'hint'=>$moduleHint
+ );
+ $webServerRestart = true;
}
if(!function_exists('gzencode')) {
- $errors[]=array('error'=>'PHP module zlib is not installed.',
- 'hint'=>'Please ask your server administrator to install the module.');
- $web_server_restart=true;
+ $errors[] = array(
+ 'error'=>'PHP module zlib is not installed.',
+ 'hint'=>$moduleHint
+ );
+ $webServerRestart = true;
}
if(!function_exists('iconv')) {
- $errors[]=array('error'=>'PHP module iconv is not installed.',
- 'hint'=>'Please ask your server administrator to install the module.');
- $web_server_restart=true;
+ $errors[] = array(
+ 'error'=>'PHP module iconv is not installed.',
+ 'hint'=>$moduleHint
+ );
+ $webServerRestart = true;
}
if(!function_exists('simplexml_load_string')) {
- $errors[]=array('error'=>'PHP module SimpleXML is not installed.',
- 'hint'=>'Please ask your server administrator to install the module.');
- $web_server_restart=true;
+ $errors[] = array(
+ 'error'=>'PHP module SimpleXML is not installed.',
+ 'hint'=>$moduleHint
+ );
+ $webServerRestart = true;
}
- if(floatval(phpversion())<5.3) {
- $errors[]=array('error'=>'PHP 5.3 is required.',
+ if(floatval(phpversion()) < 5.3) {
+ $errors[] = array(
+ 'error'=>'PHP 5.3 is required.',
'hint'=>'Please ask your server administrator to update PHP to version 5.3 or higher.'
- .' PHP 5.2 is no longer supported by ownCloud and the PHP community.');
- $web_server_restart=true;
+ .' PHP 5.2 is no longer supported by ownCloud and the PHP community.'
+ );
+ $webServerRestart = true;
}
if(!defined('PDO::ATTR_DRIVER_NAME')) {
- $errors[]=array('error'=>'PHP PDO module is not installed.',
- 'hint'=>'Please ask your server administrator to install the module.');
- $web_server_restart=true;
+ $errors[] = array(
+ 'error'=>'PHP PDO module is not installed.',
+ 'hint'=>$moduleHint
+ );
+ $webServerRestart = true;
}
if (((strtolower(@ini_get('safe_mode')) == 'on')
|| (strtolower(@ini_get('safe_mode')) == 'yes')
|| (strtolower(@ini_get('safe_mode')) == 'true')
|| (ini_get("safe_mode") == 1 ))) {
- $errors[]=array('error'=>'PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly.',
- 'hint'=>'PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config.');
- $web_server_restart=true;
+ $errors[] = array(
+ 'error'=>'PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly.',
+ 'hint'=>'PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. '
+ .'Please ask your server administrator to disable it in php.ini or in your webserver config.'
+ );
+ $webServerRestart = true;
}
if (get_magic_quotes_gpc() == 1 ) {
- $errors[]=array('error'=>'Magic Quotes is enabled. ownCloud requires that it is disabled to work properly.',
- 'hint'=>'Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config.');
- $web_server_restart=true;
+ $errors[] = array(
+ 'error'=>'Magic Quotes is enabled. ownCloud requires that it is disabled to work properly.',
+ 'hint'=>'Magic Quotes is a deprecated and mostly useless setting that should be disabled. '
+ .'Please ask your server administrator to disable it in php.ini or in your webserver config.'
+ );
+ $webServerRestart = true;
}
- if($web_server_restart) {
- $errors[]=array('error'=>'PHP modules have been installed, but they are still listed as missing?',
- 'hint'=>'Please ask your server administrator to restart the web server.');
+ if($webServerRestart) {
+ $errors[] = array(
+ 'error'=>'PHP modules have been installed, but they are still listed as missing?',
+ 'hint'=>'Please ask your server administrator to restart the web server.'
+ );
}
// Cache the result of this function
@@ -381,39 +443,49 @@ class OC_Util {
$encryptedFiles = false;
if (OC_App::isEnabled('files_encryption') === false) {
$view = new OC\Files\View('/' . OCP\User::getUser());
- if ($view->file_exists('/files_encryption/keyfiles')) {
- $encryptedFiles = true;
+ $keyfilePath = '/files_encryption/keyfiles';
+ if ($view->is_dir($keyfilePath)) {
+ $dircontent = $view->getDirectoryContent($keyfilePath);
+ if (!empty($dircontent)) {
+ $encryptedFiles = true;
+ }
}
}
-
+
return $encryptedFiles;
}
-
+
/**
- * Check for correct file permissions of data directory
- * @return array arrays with error messages and hints
- */
+ * @brief Check for correct file permissions of data directory
+ * @paran string $dataDirectory
+ * @return array arrays with error messages and hints
+ */
public static function checkDataDirectoryPermissions($dataDirectory) {
$errors = array();
- if (stristr(PHP_OS, 'WIN')) {
+ if (self::runningOnWindows()) {
//TODO: permissions checks for windows hosts
} else {
$permissionsModHint = 'Please change the permissions to 0770 so that the directory'
.' cannot be listed by other users.';
- $prems = substr(decoct(@fileperms($dataDirectory)), -3);
- if (substr($prems, -1) != '0') {
+ $perms = substr(decoct(@fileperms($dataDirectory)), -3);
+ if (substr($perms, -1) != '0') {
OC_Helper::chmodr($dataDirectory, 0770);
clearstatcache();
- $prems = substr(decoct(@fileperms($dataDirectory)), -3);
- if (substr($prems, 2, 1) != '0') {
- $errors[] = array('error' => 'Data directory ('.$dataDirectory.') is readable for other users',
- 'hint' => $permissionsModHint);
+ $perms = substr(decoct(@fileperms($dataDirectory)), -3);
+ if (substr($perms, 2, 1) != '0') {
+ $errors[] = array(
+ 'error' => 'Data directory ('.$dataDirectory.') is readable for other users',
+ 'hint' => $permissionsModHint
+ );
}
}
}
return $errors;
}
+ /**
+ * @return void
+ */
public static function displayLoginPage($errors = array()) {
$parameters = array();
foreach( $errors as $key => $value ) {
@@ -427,17 +499,19 @@ class OC_Util {
$parameters['user_autofocus'] = true;
}
if (isset($_REQUEST['redirect_url'])) {
- $redirect_url = $_REQUEST['redirect_url'];
- $parameters['redirect_url'] = urlencode($redirect_url);
+ $redirectUrl = $_REQUEST['redirect_url'];
+ $parameters['redirect_url'] = urlencode($redirectUrl);
}
$parameters['alt_login'] = OC_App::getAlternativeLogIns();
+ $parameters['rememberLoginAllowed'] = self::rememberLoginAllowed();
OC_Template::printGuestPage("", "login", $parameters);
}
/**
- * Check if the app is enabled, redirects to home if not
+ * @brief Check if the app is enabled, redirects to home if not
+ * @return void
*/
public static function checkAppEnabled($app) {
if( !OC_App::isEnabled($app)) {
@@ -449,18 +523,21 @@ class OC_Util {
/**
* Check if the user is logged in, redirects to home if not. With
* redirect URL parameter to the request URI.
+ * @return void
*/
public static function checkLoggedIn() {
// Check if we are a user
if( !OC_User::isLoggedIn()) {
header( 'Location: '.OC_Helper::linkToAbsolute( '', 'index.php',
- array('redirect_url' => OC_Request::requestUri())));
+ array('redirectUrl' => OC_Request::requestUri())
+ ));
exit();
}
}
/**
- * Check if the user is a admin, redirects to home if not
+ * @brief Check if the user is a admin, redirects to home if not
+ * @return void
*/
public static function checkAdminUser() {
if( !OC_User::isAdminUser(OC_User::getUser())) {
@@ -470,7 +547,28 @@ class OC_Util {
}
/**
- * Check if the user is a subadmin, redirects to home if not
+ * Check if it is allowed to remember login.
+ *
+ * @note Every app can set 'rememberlogin' to 'false' to disable the remember login feature
+ *
+ * @return bool
+ */
+ public static function rememberLoginAllowed() {
+
+ $apps = OC_App::getEnabledApps();
+
+ foreach ($apps as $app) {
+ $appInfo = OC_App::getAppInfo($app);
+ if (isset($appInfo['rememberlogin']) && $appInfo['rememberlogin'] === 'false') {
+ return false;
+ }
+
+ }
+ return true;
+ }
+
+ /**
+ * @brief Check if the user is a subadmin, redirects to home if not
* @return array $groups where the current user is subadmin
*/
public static function checkSubAdminUser() {
@@ -482,7 +580,8 @@ class OC_Util {
}
/**
- * Redirect to the user default page
+ * @brief Redirect to the user default page
+ * @return void
*/
public static function redirectToDefaultPage() {
if(isset($_REQUEST['redirect_url'])) {
@@ -490,13 +589,11 @@ class OC_Util {
}
else if (isset(OC::$REQUESTEDAPP) && !empty(OC::$REQUESTEDAPP)) {
$location = OC_Helper::linkToAbsolute( OC::$REQUESTEDAPP, 'index.php' );
- }
- else {
- $defaultpage = OC_Appconfig::getValue('core', 'defaultpage');
- if ($defaultpage) {
- $location = OC_Helper::makeURLAbsolute(OC::$WEBROOT.'/'.$defaultpage);
- }
- else {
+ } else {
+ $defaultPage = OC_Appconfig::getValue('core', 'defaultpage');
+ if ($defaultPage) {
+ $location = OC_Helper::makeURLAbsolute(OC::$WEBROOT.'/'.$defaultPage);
+ } else {
$location = OC_Helper::linkToAbsolute( 'files', 'index.php' );
}
}
@@ -505,28 +602,28 @@ class OC_Util {
exit();
}
- /**
- * get an id unique for this instance
- * @return string
- */
- public static function getInstanceId() {
- $id = OC_Config::getValue('instanceid', null);
- if(is_null($id)) {
- // We need to guarantee at least one letter in instanceid so it can be used as the session_name
- $id = 'oc' . OC_Util::generate_random_bytes(10);
- OC_Config::setValue('instanceid', $id);
- }
- return $id;
- }
+ /**
+ * @brief get an id unique for this instance
+ * @return string
+ */
+ public static function getInstanceId() {
+ $id = OC_Config::getValue('instanceid', null);
+ if(is_null($id)) {
+ // We need to guarantee at least one letter in instanceid so it can be used as the session_name
+ $id = 'oc' . self::generateRandomBytes(10);
+ OC_Config::setValue('instanceid', $id);
+ }
+ return $id;
+ }
/**
* @brief Static lifespan (in seconds) when a request token expires.
* @see OC_Util::callRegister()
* @see OC_Util::isCallRegistered()
* @description
- * Also required for the client side to compute the piont in time when to
+ * Also required for the client side to compute the point in time when to
* request a fresh token. The client will do so when nearly 97% of the
- * timespan coded here has expired.
+ * time span coded here has expired.
*/
public static $callLifespan = 3600; // 3600 secs = 1 hour
@@ -546,7 +643,7 @@ class OC_Util {
// Check if a token exists
if(!\OC::$session->exists('requesttoken')) {
// No valid token found, generate a new one.
- $requestToken = self::generate_random_bytes(20);
+ $requestToken = self::generateRandomBytes(20);
\OC::$session->set('requesttoken', $requestToken);
} else {
// Valid token already exists, send it
@@ -567,11 +664,11 @@ class OC_Util {
}
if(isset($_GET['requesttoken'])) {
- $token=$_GET['requesttoken'];
+ $token = $_GET['requesttoken'];
} elseif(isset($_POST['requesttoken'])) {
- $token=$_POST['requesttoken'];
+ $token = $_POST['requesttoken'];
} elseif(isset($_SERVER['HTTP_REQUESTTOKEN'])) {
- $token=$_SERVER['HTTP_REQUESTTOKEN'];
+ $token = $_SERVER['HTTP_REQUESTTOKEN'];
} else {
//no token found.
return false;
@@ -589,11 +686,12 @@ class OC_Util {
/**
* @brief Check an ajax get/post call if the request token is valid. exit if not.
- * Todo: Write howto
+ * @todo Write howto
+ * @return void
*/
public static function callCheck() {
if(!OC_Util::isCallRegistered()) {
- exit;
+ exit();
}
}
@@ -603,27 +701,28 @@ class OC_Util {
* This function is used to sanitize HTML and should be applied on any
* string or array of strings before displaying it on a web page.
*
- * @param string or array of strings
+ * @param string|array of strings
* @return array with sanitized strings or a single sanitized string, depends on the input parameter.
*/
public static function sanitizeHTML( &$value ) {
if (is_array($value)) {
array_walk_recursive($value, 'OC_Util::sanitizeHTML');
} else {
- $value = htmlentities((string)$value, ENT_QUOTES, 'UTF-8'); //Specify encoding for PHP<5.4
+ //Specify encoding for PHP<5.4
+ $value = htmlentities((string)$value, ENT_QUOTES, 'UTF-8');
}
return $value;
}
-
+
/**
* @brief Public function to encode url parameters
*
* This function is used to encode path to file before output.
* Encoding is done according to RFC 3986 with one exception:
- * Character '/' is preserved as is.
+ * Character '/' is preserved as is.
*
* @param string $component part of URI to encode
- * @return string
+ * @return string
*/
public static function encodePath($component) {
$encoded = rawurlencode($component);
@@ -632,48 +731,52 @@ class OC_Util {
}
/**
- * Check if the htaccess file is working by creating a test file in the data directory and trying to access via http
+ * @brief Check if the htaccess file is working
+ * @return bool
+ * @description Check if the htaccess file is working by creating a test
+ * file in the data directory and trying to access via http
*/
- public static function ishtaccessworking() {
+ public static function isHtAccessWorking() {
// testdata
- $filename='/htaccesstest.txt';
- $testcontent='testcontent';
+ $fileName = '/htaccesstest.txt';
+ $testContent = 'testcontent';
// creating a test file
- $testfile = OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" ).'/'.$filename;
+ $testFile = OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" ).'/'.$fileName;
- if(file_exists($testfile)) {// already running this test, possible recursive call
+ if(file_exists($testFile)) {// already running this test, possible recursive call
return false;
}
- $fp = @fopen($testfile, 'w');
- @fwrite($fp, $testcontent);
+ $fp = @fopen($testFile, 'w');
+ @fwrite($fp, $testContent);
@fclose($fp);
// accessing the file via http
- $url = OC_Helper::makeURLAbsolute(OC::$WEBROOT.'/data'.$filename);
+ $url = OC_Helper::makeURLAbsolute(OC::$WEBROOT.'/data'.$fileName);
$fp = @fopen($url, 'r');
$content=@fread($fp, 2048);
@fclose($fp);
// cleanup
- @unlink($testfile);
+ @unlink($testFile);
// does it work ?
- if($content==$testcontent) {
- return(false);
- }else{
- return(true);
+ if($content==$testContent) {
+ return false;
+ } else {
+ return true;
}
}
/**
- * we test if webDAV is working properly
- *
+ * @brief test if webDAV is working properly
+ * @return bool
+ * @description
* The basic assumption is that if the server returns 401/Not Authenticated for an unauthenticated PROPFIND
* the web server it self is setup properly.
*
- * Why not an authenticated PROFIND and other verbs?
+ * Why not an authenticated PROPFIND and other verbs?
* - We don't have the password available
* - We have no idea about other auth methods implemented (e.g. OAuth with Bearer header)
*
@@ -686,12 +789,6 @@ class OC_Util {
'baseUri' => OC_Helper::linkToRemote('webdav'),
);
- // save the old timeout so that we can restore it later
- $old_timeout=ini_get("default_socket_timeout");
-
- // use a 5 sec timeout for the check. Should be enough for local requests.
- ini_set("default_socket_timeout", 5);
-
$client = new \Sabre_DAV_Client($settings);
// for this self test we don't care if the ssl certificate is self signed and the peer cannot be verified.
@@ -701,24 +798,22 @@ class OC_Util {
try {
// test PROPFIND
$client->propfind('', array('{DAV:}resourcetype'));
- } catch(\Sabre_DAV_Exception_NotAuthenticated $e) {
+ } catch (\Sabre_DAV_Exception_NotAuthenticated $e) {
$return = true;
- } catch(\Exception $e) {
+ } catch (\Exception $e) {
OC_Log::write('core', 'isWebDAVWorking: NO - Reason: '.$e->getMessage(). ' ('.get_class($e).')', OC_Log::WARN);
$return = false;
}
- // restore the original timeout
- ini_set("default_socket_timeout", $old_timeout);
-
return $return;
}
/**
- * Check if the setlocal call doesn't work. This can happen if the right
+ * Check if the setlocal call does not work. This can happen if the right
* local packages are not available on the server.
+ * @return bool
*/
- public static function issetlocaleworking() {
+ public static function isSetLocaleWorking() {
// setlocale test is pointless on Windows
if (OC_Util::runningOnWindows() ) {
return true;
@@ -732,7 +827,7 @@ class OC_Util {
}
/**
- * Check if the PHP module fileinfo is loaded.
+ * @brief Check if the PHP module fileinfo is loaded.
* @return bool
*/
public static function fileInfoLoaded() {
@@ -740,7 +835,8 @@ class OC_Util {
}
/**
- * Check if the ownCloud server can connect to the internet
+ * @brief Check if the ownCloud server can connect to the internet
+ * @return bool
*/
public static function isInternetConnectionWorking() {
// in case there is no internet connection on purpose return false
@@ -753,30 +849,29 @@ class OC_Util {
if ($connected) {
fclose($connected);
return true;
- }else{
-
+ } else {
// second try in case one server is down
$connected = @fsockopen("apps.owncloud.com", 80);
if ($connected) {
fclose($connected);
return true;
- }else{
+ } else {
return false;
}
-
}
-
}
-
+
/**
- * Check if the connection to the internet is disabled on purpose
+ * @brief Check if the connection to the internet is disabled on purpose
+ * @return bool
*/
public static function isInternetConnectionEnabled(){
return \OC_Config::getValue("has_internet_connection", true);
}
/**
- * clear all levels of output buffering
+ * @brief clear all levels of output buffering
+ * @return void
*/
public static function obEnd(){
while (ob_get_level()) {
@@ -786,47 +881,47 @@ class OC_Util {
/**
- * @brief Generates a cryptographical secure pseudorandom string
- * @param Int with the length of the random string
+ * @brief Generates a cryptographic secure pseudo-random string
+ * @param Int $length of the random string
* @return String
- * Please also update secureRNG_available if you change something here
+ * Please also update secureRNGAvailable if you change something here
*/
- public static function generate_random_bytes($length = 30) {
-
+ public static function generateRandomBytes($length = 30) {
// Try to use openssl_random_pseudo_bytes
- if(function_exists('openssl_random_pseudo_bytes')) {
- $pseudo_byte = bin2hex(openssl_random_pseudo_bytes($length, $strong));
+ if (function_exists('openssl_random_pseudo_bytes')) {
+ $pseudoByte = bin2hex(openssl_random_pseudo_bytes($length, $strong));
if($strong == true) {
- return substr($pseudo_byte, 0, $length); // Truncate it to match the length
+ return substr($pseudoByte, 0, $length); // Truncate it to match the length
}
}
// Try to use /dev/urandom
- $fp = @file_get_contents('/dev/urandom', false, null, 0, $length);
- if ($fp !== false) {
- $string = substr(bin2hex($fp), 0, $length);
- return $string;
+ if (!self::runningOnWindows()) {
+ $fp = @file_get_contents('/dev/urandom', false, null, 0, $length);
+ if ($fp !== false) {
+ $string = substr(bin2hex($fp), 0, $length);
+ return $string;
+ }
}
// Fallback to mt_rand()
$characters = '0123456789';
$characters .= 'abcdefghijklmnopqrstuvwxyz';
$charactersLength = strlen($characters)-1;
- $pseudo_byte = "";
+ $pseudoByte = "";
// Select some random characters
for ($i = 0; $i < $length; $i++) {
- $pseudo_byte .= $characters[mt_rand(0, $charactersLength)];
+ $pseudoByte .= $characters[mt_rand(0, $charactersLength)];
}
- return $pseudo_byte;
+ return $pseudoByte;
}
/**
* @brief Checks if a secure random number generator is available
* @return bool
*/
- public static function secureRNG_available() {
-
+ public static function secureRNGAvailable() {
// Check openssl_random_pseudo_bytes
if(function_exists('openssl_random_pseudo_bytes')) {
openssl_random_pseudo_bytes(1, $strong);
@@ -836,9 +931,11 @@ class OC_Util {
}
// Check /dev/urandom
- $fp = @file_get_contents('/dev/urandom', false, null, 0, 1);
- if ($fp !== false) {
- return true;
+ if (!self::runningOnWindows()) {
+ $fp = @file_get_contents('/dev/urandom', false, null, 0, 1);
+ if ($fp !== false) {
+ return true;
+ }
}
return false;
@@ -851,11 +948,8 @@ class OC_Util {
* This function get the content of a page via curl, if curl is enabled.
* If not, file_get_element is used.
*/
-
public static function getUrlContent($url){
-
- if (function_exists('curl_init')) {
-
+ if (function_exists('curl_init')) {
$curl = curl_init();
curl_setopt($curl, CURLOPT_HEADER, 0);
@@ -866,10 +960,10 @@ class OC_Util {
curl_setopt($curl, CURLOPT_MAXREDIRS, 10);
curl_setopt($curl, CURLOPT_USERAGENT, "ownCloud Server Crawler");
- if(OC_Config::getValue('proxy', '')<>'') {
+ if(OC_Config::getValue('proxy', '') != '') {
curl_setopt($curl, CURLOPT_PROXY, OC_Config::getValue('proxy'));
}
- if(OC_Config::getValue('proxyuserpwd', '')<>'') {
+ if(OC_Config::getValue('proxyuserpwd', '') != '') {
curl_setopt($curl, CURLOPT_PROXYUSERPWD, OC_Config::getValue('proxyuserpwd'));
}
$data = curl_exec($curl);
@@ -878,7 +972,7 @@ class OC_Util {
} else {
$contextArray = null;
- if(OC_Config::getValue('proxy', '')<>'') {
+ if(OC_Config::getValue('proxy', '') != '') {
$contextArray = array(
'http' => array(
'timeout' => 10,
@@ -893,11 +987,10 @@ class OC_Util {
);
}
-
$ctx = stream_context_create(
$contextArray
);
- $data=@file_get_contents($url, 0, $ctx);
+ $data = @file_get_contents($url, 0, $ctx);
}
return $data;
@@ -910,7 +1003,6 @@ class OC_Util {
return (substr(PHP_OS, 0, 3) === "WIN");
}
-
/**
* Handles the case that there may not be a theme, then check if a "default"
* theme exists and take that one
@@ -920,20 +1012,19 @@ class OC_Util {
$theme = OC_Config::getValue("theme", '');
if($theme === '') {
-
if(is_dir(OC::$SERVERROOT . '/themes/default')) {
$theme = 'default';
}
-
}
return $theme;
}
/**
- * Clear the opcode cache if one exists
+ * @brief Clear the opcode cache if one exists
* This is necessary for writing to the config file
- * in case the opcode cache doesn't revalidate files
+ * in case the opcode cache does not re-validate files
+ * @return void
*/
public static function clearOpcodeCache() {
// APC
@@ -972,8 +1063,10 @@ class OC_Util {
return $value;
}
- public static function basename($file)
- {
+ /**
+ * @return string
+ */
+ public static function basename($file) {
$file = rtrim($file, '/');
$t = explode('/', $file);
return array_pop($t);
diff --git a/lib/vcategories.php b/lib/vcategories.php
deleted file mode 100644
index 8403695835973d7b73e1c381d66c604c8fe0e6c2..0000000000000000000000000000000000000000
--- a/lib/vcategories.php
+++ /dev/null
@@ -1,821 +0,0 @@
-<?php
-/**
-* ownCloud
-*
-* @author Thomas Tanghus
-* @copyright 2012 Thomas Tanghus <thomas@tanghus.net>
-* @copyright 2012 Bart Visscher bartv@thisnet.nl
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-* License as published by the Free Software Foundation; either
-* version 3 of the License, or any later version.
-*
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-*
-* You should have received a copy of the GNU Affero General Public
-* License along with this library. If not, see <http://www.gnu.org/licenses/>.
-*
-*/
-
-OC_Hook::connect('OC_User', 'post_deleteUser', 'OC_VCategories', 'post_deleteUser');
-
-/**
- * Class for easy access to categories in VCARD, VEVENT, VTODO and VJOURNAL.
- * A Category can be e.g. 'Family', 'Work', 'Chore', 'Special Occation' or
- * anything else that is either parsed from a vobject or that the user chooses
- * to add.
- * Category names are not case-sensitive, but will be saved with the case they
- * are entered in. If a user already has a category 'family' for a type, and
- * tries to add a category named 'Family' it will be silently ignored.
- */
-class OC_VCategories {
-
- /**
- * Categories
- */
- private $categories = array();
-
- /**
- * Used for storing objectid/categoryname pairs while rescanning.
- */
- private static $relations = array();
-
- private $type = null;
- private $user = null;
-
- const CATEGORY_TABLE = '*PREFIX*vcategory';
- const RELATION_TABLE = '*PREFIX*vcategory_to_object';
-
- const CATEGORY_FAVORITE = '_$!<Favorite>!$_';
-
- const FORMAT_LIST = 0;
- const FORMAT_MAP = 1;
-
- /**
- * @brief Constructor.
- * @param $type The type identifier e.g. 'contact' or 'event'.
- * @param $user The user whos data the object will operate on. This
- * parameter should normally be omitted but to make an app able to
- * update categories for all users it is made possible to provide it.
- * @param $defcategories An array of default categories to be used if none is stored.
- */
- public function __construct($type, $user=null, $defcategories=array()) {
- $this->type = $type;
- $this->user = is_null($user) ? OC_User::getUser() : $user;
-
- $this->loadCategories();
- OCP\Util::writeLog('core', __METHOD__ . ', categories: '
- . print_r($this->categories, true),
- OCP\Util::DEBUG
- );
-
- if($defcategories && count($this->categories) === 0) {
- $this->addMulti($defcategories, true);
- }
- }
-
- /**
- * @brief Load categories from db.
- */
- private function loadCategories() {
- $this->categories = array();
- $result = null;
- $sql = 'SELECT `id`, `category` FROM `' . self::CATEGORY_TABLE . '` '
- . 'WHERE `uid` = ? AND `type` = ? ORDER BY `category`';
- try {
- $stmt = OCP\DB::prepare($sql);
- $result = $stmt->execute(array($this->user, $this->type));
- if (OC_DB::isError($result)) {
- OC_Log::write('core', __METHOD__. 'DB error: ' . OC_DB::getErrorMessage($result), OC_Log::ERROR);
- }
- } catch(Exception $e) {
- OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(),
- OCP\Util::ERROR);
- }
-
- if(!is_null($result)) {
- while( $row = $result->fetchRow()) {
- // The keys are prefixed because array_search wouldn't work otherwise :-/
- $this->categories[$row['id']] = $row['category'];
- }
- }
- OCP\Util::writeLog('core', __METHOD__.', categories: ' . print_r($this->categories, true),
- OCP\Util::DEBUG);
- }
-
-
- /**
- * @brief Check if any categories are saved for this type and user.
- * @returns boolean.
- * @param $type The type identifier e.g. 'contact' or 'event'.
- * @param $user The user whos categories will be checked. If not set current user will be used.
- */
- public static function isEmpty($type, $user = null) {
- $user = is_null($user) ? OC_User::getUser() : $user;
- $sql = 'SELECT COUNT(*) FROM `' . self::CATEGORY_TABLE . '` '
- . 'WHERE `uid` = ? AND `type` = ?';
- try {
- $stmt = OCP\DB::prepare($sql);
- $result = $stmt->execute(array($user, $type));
- if (OC_DB::isError($result)) {
- OC_Log::write('core', __METHOD__. 'DB error: ' . OC_DB::getErrorMessage($result), OC_Log::ERROR);
- return false;
- }
- return ($result->numRows() === 0);
- } catch(Exception $e) {
- OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(),
- OCP\Util::ERROR);
- return false;
- }
- }
-
- /**
- * @brief Get the categories for a specific user.
- * @param
- * @returns array containing the categories as strings.
- */
- public function categories($format = null) {
- if(!$this->categories) {
- return array();
- }
- $categories = array_values($this->categories);
- uasort($categories, 'strnatcasecmp');
- if($format == self::FORMAT_MAP) {
- $catmap = array();
- foreach($categories as $category) {
- if($category !== self::CATEGORY_FAVORITE) {
- $catmap[] = array(
- 'id' => $this->array_searchi($category, $this->categories),
- 'name' => $category
- );
- }
- }
- return $catmap;
- }
-
- // Don't add favorites to normal categories.
- $favpos = array_search(self::CATEGORY_FAVORITE, $categories);
- if($favpos !== false) {
- return array_splice($categories, $favpos);
- } else {
- return $categories;
- }
- }
-
- /**
- * Get the a list if items belonging to $category.
- *
- * Throws an exception if the category could not be found.
- *
- * @param string|integer $category Category id or name.
- * @returns array An array of object ids or false on error.
- */
- public function idsForCategory($category) {
- $result = null;
- if(is_numeric($category)) {
- $catid = $category;
- } elseif(is_string($category)) {
- $catid = $this->array_searchi($category, $this->categories);
- }
- OCP\Util::writeLog('core', __METHOD__.', category: '.$catid.' '.$category, OCP\Util::DEBUG);
- if($catid === false) {
- $l10n = OC_L10N::get('core');
- throw new Exception(
- $l10n->t('Could not find category "%s"', $category)
- );
- }
-
- $ids = array();
- $sql = 'SELECT `objid` FROM `' . self::RELATION_TABLE
- . '` WHERE `categoryid` = ?';
-
- try {
- $stmt = OCP\DB::prepare($sql);
- $result = $stmt->execute(array($catid));
- if (OC_DB::isError($result)) {
- OC_Log::write('core', __METHOD__. 'DB error: ' . OC_DB::getErrorMessage($result), OC_Log::ERROR);
- return false;
- }
- } catch(Exception $e) {
- OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(),
- OCP\Util::ERROR);
- return false;
- }
-
- if(!is_null($result)) {
- while( $row = $result->fetchRow()) {
- $ids[] = (int)$row['objid'];
- }
- }
-
- return $ids;
- }
-
- /**
- * Get the a list if items belonging to $category.
- *
- * Throws an exception if the category could not be found.
- *
- * @param string|integer $category Category id or name.
- * @param array $tableinfo Array in the form {'tablename' => table, 'fields' => ['field1', 'field2']}
- * @param int $limit
- * @param int $offset
- *
- * This generic method queries a table assuming that the id
- * field is called 'id' and the table name provided is in
- * the form '*PREFIX*table_name'.
- *
- * If the category name cannot be resolved an exception is thrown.
- *
- * TODO: Maybe add the getting permissions for objects?
- *
- * @returns array containing the resulting items or false on error.
- */
- public function itemsForCategory($category, $tableinfo, $limit = null, $offset = null) {
- $result = null;
- if(is_numeric($category)) {
- $catid = $category;
- } elseif(is_string($category)) {
- $catid = $this->array_searchi($category, $this->categories);
- }
- OCP\Util::writeLog('core', __METHOD__.', category: '.$catid.' '.$category, OCP\Util::DEBUG);
- if($catid === false) {
- $l10n = OC_L10N::get('core');
- throw new Exception(
- $l10n->t('Could not find category "%s"', $category)
- );
- }
- $fields = '';
- foreach($tableinfo['fields'] as $field) {
- $fields .= '`' . $tableinfo['tablename'] . '`.`' . $field . '`,';
- }
- $fields = substr($fields, 0, -1);
-
- $items = array();
- $sql = 'SELECT `' . self::RELATION_TABLE . '`.`categoryid`, ' . $fields
- . ' FROM `' . $tableinfo['tablename'] . '` JOIN `'
- . self::RELATION_TABLE . '` ON `' . $tableinfo['tablename']
- . '`.`id` = `' . self::RELATION_TABLE . '`.`objid` WHERE `'
- . self::RELATION_TABLE . '`.`categoryid` = ?';
-
- try {
- $stmt = OCP\DB::prepare($sql, $limit, $offset);
- $result = $stmt->execute(array($catid));
- if (OC_DB::isError($result)) {
- OC_Log::write('core', __METHOD__. 'DB error: ' . OC_DB::getErrorMessage($result), OC_Log::ERROR);
- return false;
- }
- } catch(Exception $e) {
- OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(),
- OCP\Util::ERROR);
- return false;
- }
-
- if(!is_null($result)) {
- while( $row = $result->fetchRow()) {
- $items[] = $row;
- }
- }
- //OCP\Util::writeLog('core', __METHOD__.', count: ' . count($items), OCP\Util::DEBUG);
- //OCP\Util::writeLog('core', __METHOD__.', sql: ' . $sql, OCP\Util::DEBUG);
-
- return $items;
- }
-
- /**
- * @brief Checks whether a category is already saved.
- * @param $name The name to check for.
- * @returns bool
- */
- public function hasCategory($name) {
- return $this->in_arrayi($name, $this->categories);
- }
-
- /**
- * @brief Add a new category.
- * @param $name A string with a name of the category
- * @returns int the id of the added category or false if it already exists.
- */
- public function add($name) {
- OCP\Util::writeLog('core', __METHOD__.', name: ' . $name, OCP\Util::DEBUG);
- if($this->hasCategory($name)) {
- OCP\Util::writeLog('core', __METHOD__.', name: ' . $name. ' exists already', OCP\Util::DEBUG);
- return false;
- }
- try {
- OCP\DB::insertIfNotExist(self::CATEGORY_TABLE,
- array(
- 'uid' => $this->user,
- 'type' => $this->type,
- 'category' => $name,
- ));
- } catch(Exception $e) {
- OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(),
- OCP\Util::ERROR);
- return false;
- }
- $id = OCP\DB::insertid(self::CATEGORY_TABLE);
- OCP\Util::writeLog('core', __METHOD__.', id: ' . $id, OCP\Util::DEBUG);
- $this->categories[$id] = $name;
- return $id;
- }
-
- /**
- * @brief Rename category.
- * @param string $from The name of the existing category
- * @param string $to The new name of the category.
- * @returns bool
- */
- public function rename($from, $to) {
- $id = $this->array_searchi($from, $this->categories);
- if($id === false) {
- OCP\Util::writeLog('core', __METHOD__.', category: ' . $from. ' does not exist', OCP\Util::DEBUG);
- return false;
- }
-
- $sql = 'UPDATE `' . self::CATEGORY_TABLE . '` SET `category` = ? '
- . 'WHERE `uid` = ? AND `type` = ? AND `id` = ?';
- try {
- $stmt = OCP\DB::prepare($sql);
- $result = $stmt->execute(array($to, $this->user, $this->type, $id));
- if (OC_DB::isError($result)) {
- OC_Log::write('core', __METHOD__. 'DB error: ' . OC_DB::getErrorMessage($result), OC_Log::ERROR);
- return false;
- }
- } catch(Exception $e) {
- OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(),
- OCP\Util::ERROR);
- return false;
- }
- $this->categories[$id] = $to;
- return true;
- }
-
- /**
- * @brief Add a new category.
- * @param $names A string with a name or an array of strings containing
- * the name(s) of the categor(y|ies) to add.
- * @param $sync bool When true, save the categories
- * @param $id int Optional object id to add to this|these categor(y|ies)
- * @returns bool Returns false on error.
- */
- public function addMulti($names, $sync=false, $id = null) {
- if(!is_array($names)) {
- $names = array($names);
- }
- $names = array_map('trim', $names);
- $newones = array();
- foreach($names as $name) {
- if(($this->in_arrayi(
- $name, $this->categories) == false) && $name != '') {
- $newones[] = $name;
- }
- if(!is_null($id) ) {
- // Insert $objectid, $categoryid pairs if not exist.
- self::$relations[] = array('objid' => $id, 'category' => $name);
- }
- }
- $this->categories = array_merge($this->categories, $newones);
- if($sync === true) {
- $this->save();
- }
-
- return true;
- }
-
- /**
- * @brief Extracts categories from a vobject and add the ones not already present.
- * @param $vobject The instance of OC_VObject to load the categories from.
- */
- public function loadFromVObject($id, $vobject, $sync=false) {
- $this->addMulti($vobject->getAsArray('CATEGORIES'), $sync, $id);
- }
-
- /**
- * @brief Reset saved categories and rescan supplied vobjects for categories.
- * @param $objects An array of vobjects (as text).
- * To get the object array, do something like:
- * // For Addressbook:
- * $categories = new OC_VCategories('contacts');
- * $stmt = OC_DB::prepare( 'SELECT `carddata` FROM `*PREFIX*contacts_cards`' );
- * $result = $stmt->execute();
- * $objects = array();
- * if(!is_null($result)) {
- * while( $row = $result->fetchRow()){
- * $objects[] = array($row['id'], $row['carddata']);
- * }
- * }
- * $categories->rescan($objects);
- */
- public function rescan($objects, $sync=true, $reset=true) {
-
- if($reset === true) {
- $result = null;
- // Find all objectid/categoryid pairs.
- try {
- $stmt = OCP\DB::prepare('SELECT `id` FROM `' . self::CATEGORY_TABLE . '` '
- . 'WHERE `uid` = ? AND `type` = ?');
- $result = $stmt->execute(array($this->user, $this->type));
- if (OC_DB::isError($result)) {
- OC_Log::write('core', __METHOD__. 'DB error: ' . OC_DB::getErrorMessage($result), OC_Log::ERROR);
- return false;
- }
- } catch(Exception $e) {
- OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(),
- OCP\Util::ERROR);
- }
-
- // And delete them.
- if(!is_null($result)) {
- $stmt = OCP\DB::prepare('DELETE FROM `' . self::RELATION_TABLE . '` '
- . 'WHERE `categoryid` = ? AND `type`= ?');
- while( $row = $result->fetchRow()) {
- $stmt->execute(array($row['id'], $this->type));
- }
- }
- try {
- $stmt = OCP\DB::prepare('DELETE FROM `' . self::CATEGORY_TABLE . '` '
- . 'WHERE `uid` = ? AND `type` = ?');
- $result = $stmt->execute(array($this->user, $this->type));
- if (OC_DB::isError($result)) {
- OC_Log::write('core', __METHOD__. 'DB error: ' . OC_DB::getErrorMessage($result), OC_Log::ERROR);
- return;
- }
- } catch(Exception $e) {
- OCP\Util::writeLog('core', __METHOD__ . ', exception: '
- . $e->getMessage(), OCP\Util::ERROR);
- return;
- }
- $this->categories = array();
- }
- // Parse all the VObjects
- foreach($objects as $object) {
- $vobject = OC_VObject::parse($object[1]);
- if(!is_null($vobject)) {
- // Load the categories
- $this->loadFromVObject($object[0], $vobject, $sync);
- } else {
- OC_Log::write('core', __METHOD__ . ', unable to parse. ID: ' . ', '
- . substr($object, 0, 100) . '(...)', OC_Log::DEBUG);
- }
- }
- $this->save();
- }
-
- /**
- * @brief Save the list with categories
- */
- private function save() {
- if(is_array($this->categories)) {
- foreach($this->categories as $category) {
- try {
- OCP\DB::insertIfNotExist(self::CATEGORY_TABLE,
- array(
- 'uid' => $this->user,
- 'type' => $this->type,
- 'category' => $category,
- ));
- } catch(Exception $e) {
- OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(),
- OCP\Util::ERROR);
- }
- }
- // reload categories to get the proper ids.
- $this->loadCategories();
- // Loop through temporarily cached objectid/categoryname pairs
- // and save relations.
- $categories = $this->categories;
- // For some reason this is needed or array_search(i) will return 0..?
- ksort($categories);
- foreach(self::$relations as $relation) {
- $catid = $this->array_searchi($relation['category'], $categories);
- OC_Log::write('core', __METHOD__ . 'catid, ' . $relation['category'] . ' ' . $catid, OC_Log::DEBUG);
- if($catid) {
- try {
- OCP\DB::insertIfNotExist(self::RELATION_TABLE,
- array(
- 'objid' => $relation['objid'],
- 'categoryid' => $catid,
- 'type' => $this->type,
- ));
- } catch(Exception $e) {
- OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(),
- OCP\Util::ERROR);
- }
- }
- }
- self::$relations = array(); // reset
- } else {
- OC_Log::write('core', __METHOD__.', $this->categories is not an array! '
- . print_r($this->categories, true), OC_Log::ERROR);
- }
- }
-
- /**
- * @brief Delete categories and category/object relations for a user.
- * For hooking up on post_deleteUser
- * @param string $uid The user id for which entries should be purged.
- */
- public static function post_deleteUser($arguments) {
- // Find all objectid/categoryid pairs.
- $result = null;
- try {
- $stmt = OCP\DB::prepare('SELECT `id` FROM `' . self::CATEGORY_TABLE . '` '
- . 'WHERE `uid` = ?');
- $result = $stmt->execute(array($arguments['uid']));
- if (OC_DB::isError($result)) {
- OC_Log::write('core', __METHOD__. 'DB error: ' . OC_DB::getErrorMessage($result), OC_Log::ERROR);
- }
- } catch(Exception $e) {
- OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(),
- OCP\Util::ERROR);
- }
-
- if(!is_null($result)) {
- try {
- $stmt = OCP\DB::prepare('DELETE FROM `' . self::RELATION_TABLE . '` '
- . 'WHERE `categoryid` = ?');
- while( $row = $result->fetchRow()) {
- try {
- $stmt->execute(array($row['id']));
- } catch(Exception $e) {
- OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(),
- OCP\Util::ERROR);
- }
- }
- } catch(Exception $e) {
- OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(),
- OCP\Util::ERROR);
- }
- }
- try {
- $stmt = OCP\DB::prepare('DELETE FROM `' . self::CATEGORY_TABLE . '` '
- . 'WHERE `uid` = ?');
- $result = $stmt->execute(array($arguments['uid']));
- if (OC_DB::isError($result)) {
- OC_Log::write('core', __METHOD__. 'DB error: ' . OC_DB::getErrorMessage($result), OC_Log::ERROR);
- }
- } catch(Exception $e) {
- OCP\Util::writeLog('core', __METHOD__ . ', exception: '
- . $e->getMessage(), OCP\Util::ERROR);
- }
- }
-
- /**
- * @brief Delete category/object relations from the db
- * @param array $ids The ids of the objects
- * @param string $type The type of object (event/contact/task/journal).
- * Defaults to the type set in the instance
- * @returns boolean Returns false on error.
- */
- public function purgeObjects(array $ids, $type = null) {
- $type = is_null($type) ? $this->type : $type;
- if(count($ids) === 0) {
- // job done ;)
- return true;
- }
- $updates = $ids;
- try {
- $query = 'DELETE FROM `' . self::RELATION_TABLE . '` ';
- $query .= 'WHERE `objid` IN (' . str_repeat('?,', count($ids)-1) . '?) ';
- $query .= 'AND `type`= ?';
- $updates[] = $type;
- $stmt = OCP\DB::prepare($query);
- $result = $stmt->execute($updates);
- if (OC_DB::isError($result)) {
- OC_Log::write('core', __METHOD__. 'DB error: ' . OC_DB::getErrorMessage($result), OC_Log::ERROR);
- return false;
- }
- } catch(Exception $e) {
- OCP\Util::writeLog('core', __METHOD__.', exception: ' . $e->getMessage(),
- OCP\Util::ERROR);
- return false;
- }
- return true;
- }
-
- /**
- * Get favorites for an object type
- *
- * @param string $type The type of object (event/contact/task/journal).
- * Defaults to the type set in the instance
- * @returns array An array of object ids.
- */
- public function getFavorites($type = null) {
- $type = is_null($type) ? $this->type : $type;
-
- try {
- return $this->idsForCategory(self::CATEGORY_FAVORITE);
- } catch(Exception $e) {
- // No favorites
- return array();
- }
- }
-
- /**
- * Add an object to favorites
- *
- * @param int $objid The id of the object
- * @param string $type The type of object (event/contact/task/journal).
- * Defaults to the type set in the instance
- * @returns boolean
- */
- public function addToFavorites($objid, $type = null) {
- $type = is_null($type) ? $this->type : $type;
- if(!$this->hasCategory(self::CATEGORY_FAVORITE)) {
- $this->add(self::CATEGORY_FAVORITE, true);
- }
- return $this->addToCategory($objid, self::CATEGORY_FAVORITE, $type);
- }
-
- /**
- * Remove an object from favorites
- *
- * @param int $objid The id of the object
- * @param string $type The type of object (event/contact/task/journal).
- * Defaults to the type set in the instance
- * @returns boolean
- */
- public function removeFromFavorites($objid, $type = null) {
- $type = is_null($type) ? $this->type : $type;
- return $this->removeFromCategory($objid, self::CATEGORY_FAVORITE, $type);
- }
-
- /**
- * @brief Creates a category/object relation.
- * @param int $objid The id of the object
- * @param int|string $category The id or name of the category
- * @param string $type The type of object (event/contact/task/journal).
- * Defaults to the type set in the instance
- * @returns boolean Returns false on database error.
- */
- public function addToCategory($objid, $category, $type = null) {
- $type = is_null($type) ? $this->type : $type;
- if(is_string($category) && !is_numeric($category)) {
- if(!$this->hasCategory($category)) {
- $this->add($category, true);
- }
- $categoryid = $this->array_searchi($category, $this->categories);
- } else {
- $categoryid = $category;
- }
- try {
- OCP\DB::insertIfNotExist(self::RELATION_TABLE,
- array(
- 'objid' => $objid,
- 'categoryid' => $categoryid,
- 'type' => $type,
- ));
- } catch(Exception $e) {
- OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(),
- OCP\Util::ERROR);
- return false;
- }
- return true;
- }
-
- /**
- * @brief Delete single category/object relation from the db
- * @param int $objid The id of the object
- * @param int|string $category The id or name of the category
- * @param string $type The type of object (event/contact/task/journal).
- * Defaults to the type set in the instance
- * @returns boolean
- */
- public function removeFromCategory($objid, $category, $type = null) {
- $type = is_null($type) ? $this->type : $type;
- $categoryid = (is_string($category) && !is_numeric($category))
- ? $this->array_searchi($category, $this->categories)
- : $category;
- try {
- $sql = 'DELETE FROM `' . self::RELATION_TABLE . '` '
- . 'WHERE `objid` = ? AND `categoryid` = ? AND `type` = ?';
- OCP\Util::writeLog('core', __METHOD__.', sql: ' . $objid . ' ' . $categoryid . ' ' . $type,
- OCP\Util::DEBUG);
- $stmt = OCP\DB::prepare($sql);
- $stmt->execute(array($objid, $categoryid, $type));
- } catch(Exception $e) {
- OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(),
- OCP\Util::ERROR);
- return false;
- }
- return true;
- }
-
- /**
- * @brief Delete categories from the db and from all the vobject supplied
- * @param $names An array of categories to delete
- * @param $objects An array of arrays with [id,vobject] (as text) pairs suitable for updating the apps object table.
- */
- public function delete($names, array &$objects=null) {
- if(!is_array($names)) {
- $names = array($names);
- }
-
- OC_Log::write('core', __METHOD__ . ', before: '
- . print_r($this->categories, true), OC_Log::DEBUG);
- foreach($names as $name) {
- $id = null;
- OC_Log::write('core', __METHOD__.', '.$name, OC_Log::DEBUG);
- if($this->hasCategory($name)) {
- $id = $this->array_searchi($name, $this->categories);
- unset($this->categories[$id]);
- }
- try {
- $stmt = OCP\DB::prepare('DELETE FROM `' . self::CATEGORY_TABLE . '` WHERE '
- . '`uid` = ? AND `type` = ? AND `category` = ?');
- $result = $stmt->execute(array($this->user, $this->type, $name));
- if (OC_DB::isError($result)) {
- OC_Log::write('core', __METHOD__. 'DB error: ' . OC_DB::getErrorMessage($result), OC_Log::ERROR);
- }
- } catch(Exception $e) {
- OCP\Util::writeLog('core', __METHOD__ . ', exception: '
- . $e->getMessage(), OCP\Util::ERROR);
- }
- if(!is_null($id) && $id !== false) {
- try {
- $sql = 'DELETE FROM `' . self::RELATION_TABLE . '` '
- . 'WHERE `categoryid` = ?';
- $stmt = OCP\DB::prepare($sql);
- $result = $stmt->execute(array($id));
- if (OC_DB::isError($result)) {
- OC_Log::write('core',
- __METHOD__. 'DB error: ' . OC_DB::getErrorMessage($result),
- OC_Log::ERROR);
- }
- } catch(Exception $e) {
- OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(),
- OCP\Util::ERROR);
- return false;
- }
- }
- }
- OC_Log::write('core', __METHOD__.', after: '
- . print_r($this->categories, true), OC_Log::DEBUG);
- if(!is_null($objects)) {
- foreach($objects as $key=>&$value) {
- $vobject = OC_VObject::parse($value[1]);
- if(!is_null($vobject)) {
- $object = null;
- $componentname = '';
- if (isset($vobject->VEVENT)) {
- $object = $vobject->VEVENT;
- $componentname = 'VEVENT';
- } else
- if (isset($vobject->VTODO)) {
- $object = $vobject->VTODO;
- $componentname = 'VTODO';
- } else
- if (isset($vobject->VJOURNAL)) {
- $object = $vobject->VJOURNAL;
- $componentname = 'VJOURNAL';
- } else {
- $object = $vobject;
- }
- $categories = $object->getAsArray('CATEGORIES');
- foreach($names as $name) {
- $idx = $this->array_searchi($name, $categories);
- if($idx !== false) {
- OC_Log::write('core', __METHOD__
- .', unsetting: '
- . $categories[$this->array_searchi($name, $categories)],
- OC_Log::DEBUG);
- unset($categories[$this->array_searchi($name, $categories)]);
- }
- }
-
- $object->setString('CATEGORIES', implode(',', $categories));
- if($vobject !== $object) {
- $vobject[$componentname] = $object;
- }
- $value[1] = $vobject->serialize();
- $objects[$key] = $value;
- } else {
- OC_Log::write('core', __METHOD__
- .', unable to parse. ID: ' . $value[0] . ', '
- . substr($value[1], 0, 50) . '(...)', OC_Log::DEBUG);
- }
- }
- }
- }
-
- // case-insensitive in_array
- private function in_arrayi($needle, $haystack) {
- if(!is_array($haystack)) {
- return false;
- }
- return in_array(strtolower($needle), array_map('strtolower', $haystack));
- }
-
- // case-insensitive array_search
- private function array_searchi($needle, $haystack) {
- if(!is_array($haystack)) {
- return false;
- }
- return array_search(strtolower($needle), array_map('strtolower', $haystack));
- }
-}
diff --git a/ocs/routes.php b/ocs/routes.php
index 283c9af6924cc848377d9b492016d80a89180de7..c4a74d779001cefe6c4623dc55c038447373913c 100644
--- a/ocs/routes.php
+++ b/ocs/routes.php
@@ -21,14 +21,6 @@ OC_API::register(
'core',
OC_API::GUEST_AUTH
);
-// Activity
-OC_API::register(
- 'get',
- '/activity',
- array('OC_OCS_Activity', 'activityGet'),
- 'core',
- OC_API::USER_AUTH
- );
// Privatedata
OC_API::register(
'get',
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/admin.php b/settings/admin.php
index 869729a9e4102a532e06baffc0fe0320ffc6bcdb..dd36790907df7621733938c032479ce648cba290 100755
--- a/settings/admin.php
+++ b/settings/admin.php
@@ -15,7 +15,7 @@ OC_App::setActiveNavigationEntry( "admin" );
$tmpl = new OC_Template( 'settings', 'admin', 'user');
$forms=OC_App::getForms('admin');
-$htaccessworking=OC_Util::ishtaccessworking();
+$htaccessworking=OC_Util::isHtAccessWorking();
$entries=OC_Log_Owncloud::getEntries(3);
$entriesremain = count(OC_Log_Owncloud::getEntries(4)) > 3;
@@ -25,7 +25,7 @@ $tmpl->assign('entries', $entries);
$tmpl->assign('entriesremain', $entriesremain);
$tmpl->assign('htaccessworking', $htaccessworking);
$tmpl->assign('internetconnectionworking', OC_Util::isInternetConnectionEnabled() ? OC_Util::isInternetConnectionWorking() : false);
-$tmpl->assign('islocaleworking', OC_Util::issetlocaleworking());
+$tmpl->assign('islocaleworking', OC_Util::isSetLocaleWorking());
$tmpl->assign('isWebDavWorking', OC_Util::isWebDAVWorking());
$tmpl->assign('has_fileinfo', OC_Util::fileInfoLoaded());
$tmpl->assign('backgroundjobs_mode', OC_Appconfig::getValue('core', 'backgroundjobs_mode', 'ajax'));
diff --git a/settings/ajax/changepassword.php b/settings/ajax/changepassword.php
deleted file mode 100644
index d409904ebc72ee1703b2b1280cf24942aec8d196..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['password']) ? $_POST['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/css/settings.css b/settings/css/settings.css
index d5ffe44848266db87d8333ee8a894b857319119d..57a43180a43a5e9b5f2e2d54ecb6add952ab24bf 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -21,6 +21,10 @@ input#openid, input#webdav { width:20em; }
input#identity { width:20em; }
#email { width: 17em; }
+#avatar .warning {
+ width: 350px;
+}
+
.msg.success{ color:#fff; background-color:#0f0; padding:3px; text-shadow:1px 1px #000; }
.msg.error{ color:#fff; background-color:#f00; padding:3px; text-shadow:1px 1px #000; }
diff --git a/settings/js/apps.js b/settings/js/apps.js
index d9817aff6b6791e3376a91d642c6508d749b5907..a55c55e24cf4ccd64462fe722754570490d6fef2 100644
--- a/settings/js/apps.js
+++ b/settings/js/apps.js
@@ -27,7 +27,15 @@ OC.Settings.Apps = OC.Settings.Apps || {
}
page.find('small.externalapp').attr('style', 'visibility:visible');
page.find('span.author').text(app.author);
- page.find('span.licence').text(app.license);
+
+ // FIXME licenses of downloaded apps go into app.licence, licenses of not-downloaded apps into app.license
+ var appLicense = '';
+ if (typeof(app.licence) !== 'undefined') {
+ appLicense = app.licence;
+ } else if (typeof(app.license) !== 'undefined') {
+ appLicense = app.license;
+ }
+ page.find('span.licence').text(appLicense);
if (app.update !== false) {
page.find('input.update').show();
@@ -76,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'));
@@ -96,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'));
}
@@ -150,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();
}
}
});
@@ -161,7 +171,7 @@ OC.Settings.Apps = OC.Settings.Apps || {
var navEntries=response.nav_entries;
for(var i=0; i< navEntries.length; i++){
var entry = navEntries[i];
- var container = $('#apps');
+ var container = $('#apps .wrapper');
if(container.children('li[data-id="'+entry.id+'"]').length === 0){
var li=$('<li></li>');
@@ -173,10 +183,10 @@ OC.Settings.Apps = OC.Settings.Apps || {
a.prepend(filename);
a.prepend(img);
li.append(a);
- // prepend the new app before the 'More apps' function
- $('#apps-management').before(li);
+ // append the new app as last item in the list (.push is from sticky footer)
+ $('#apps .wrapper .push').before(li);
// scroll the app navigation down so the newly added app is seen
- $('#navigation').animate({ scrollTop: $('#apps').height() }, 'slow');
+ $('#navigation').animate({ scrollTop: $('#navigation').height() }, 'slow');
// draw attention to the newly added app entry by flashing it twice
container.children('li[data-id="'+entry.id+'"]').animate({opacity:.3}).animate({opacity:1}).animate({opacity:.3}).animate({opacity:1});
diff --git a/settings/js/personal.js b/settings/js/personal.js
index 8ad26c086b51839879a2830f8b478a9177286c4e..a923b47573145e16d2c8dca45b1cef76734afc5a 100644
--- a/settings/js/personal.js
+++ b/settings/js/personal.js
@@ -34,6 +34,7 @@ function changeDisplayName(){
$('#oldDisplayName').text($('#displayName').val());
// update displayName on the top right expand button
$('#expandDisplayName').text($('#displayName').val());
+ updateAvatar();
}
else{
$('#newdisplayname').val(data.data.displayName);
@@ -44,6 +45,78 @@ function changeDisplayName(){
}
}
+function updateAvatar () {
+ $headerdiv = $('#header .avatardiv');
+ $displaydiv = $('#displayavatar .avatardiv');
+
+ $headerdiv.css({'background-color': ''});
+ $headerdiv.avatar(OC.currentUser, 32, true);
+ $displaydiv.css({'background-color': ''});
+ $displaydiv.avatar(OC.currentUser, 128, true);
+}
+
+function showAvatarCropper() {
+ $cropper = $('#cropper');
+ $cropper.prepend("<img>");
+ $cropperImage = $('#cropper img');
+
+ $cropperImage.attr('src', OC.Router.generate('core_avatar_get_tmp')+'?requesttoken='+oc_requesttoken+'#'+Math.floor(Math.random()*1000));
+
+ // Looks weird, but on('load', ...) doesn't work in IE8
+ $cropperImage.ready(function(){
+ $('#displayavatar').hide();
+ $cropper.show();
+
+ $cropperImage.Jcrop({
+ onChange: saveCoords,
+ onSelect: saveCoords,
+ aspectRatio: 1,
+ boxHeight: 500,
+ boxWidth: 500,
+ setSelect: [0, 0, 300, 300]
+ });
+ });
+}
+
+function sendCropData() {
+ cleanCropper();
+
+ var cropperdata = $('#cropper').data();
+ var data = {
+ x: cropperdata.x,
+ y: cropperdata.y,
+ w: cropperdata.w,
+ h: cropperdata.h
+ };
+ $.post(OC.Router.generate('core_avatar_post_cropped'), {crop: data}, avatarResponseHandler);
+}
+
+function saveCoords(c) {
+ $('#cropper').data(c);
+}
+
+function cleanCropper() {
+ $cropper = $('#cropper');
+ $('#displayavatar').show();
+ $cropper.hide();
+ $('.jcrop-holder').remove();
+ $('#cropper img').removeData('Jcrop').removeAttr('style').removeAttr('src');
+ $('#cropper img').remove();
+}
+
+function avatarResponseHandler(data) {
+ $warning = $('#avatar .warning');
+ $warning.hide();
+ if (data.status === "success") {
+ updateAvatar();
+ } else if (data.data === "notsquare") {
+ showAvatarCropper();
+ } else {
+ $warning.show();
+ $warning.text(data.data.message);
+ }
+}
+
$(document).ready(function(){
$("#passwordbutton").click( function(){
if ($('#pass1').val() !== '' && $('#pass2').val() !== '') {
@@ -52,14 +125,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();
}
});
@@ -94,7 +170,7 @@ $(document).ready(function(){
$("#languageinput").chosen();
// Show only the not selectable optgroup
// Choosen only shows optgroup-labels if there are options in the optgroup
- $(".languagedivider").remove();
+ $(".languagedivider").hide();
$("#languageinput").change( function(){
// Serialize the data
@@ -128,6 +204,46 @@ $(document).ready(function(){
}
});
+ var uploadparms = {
+ done: function(e, data) {
+ avatarResponseHandler(data.result);
+ }
+ };
+
+ $('#uploadavatarbutton').click(function(){
+ $('#uploadavatar').click();
+ });
+
+ $('#uploadavatar').fileupload(uploadparms);
+
+ $('#selectavatar').click(function(){
+ OC.dialogs.filepicker(
+ t('settings', "Select a profile picture"),
+ function(path){
+ $.post(OC.Router.generate('core_avatar_post'), {path: path}, avatarResponseHandler);
+ },
+ false,
+ ["image/png", "image/jpeg"]
+ );
+ });
+
+ $('#removeavatar').click(function(){
+ $.ajax({
+ type: 'DELETE',
+ url: OC.Router.generate('core_avatar_delete'),
+ success: function(msg) {
+ updateAvatar();
+ }
+ });
+ });
+
+ $('#abortcropperbutton').click(function(){
+ cleanCropper();
+ });
+
+ $('#sendcropperbutton').click(function(){
+ sendCropData();
+ });
} );
OC.Encryption = {
diff --git a/settings/js/users.js b/settings/js/users.js
index ab08d7099c6160d49ec61bca85bf833ce69519d7..48c4529527ba93913e1de425797a5dfd546a6a8d 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -91,13 +91,13 @@ var UserList = {
tr.find('td.displayName > span').text(displayname);
var groupsSelect = $('<select multiple="multiple" class="groupsselect" data-placehoder="Groups" title="' + t('settings', 'Groups') + '"></select>')
.attr('data-username', username)
- .attr('data-user-groups', [groups]);
+ .data('user-groups', groups);
tr.find('td.groups').empty();
if (tr.find('td.subadmins').length > 0) {
var subadminSelect = $('<select multiple="multiple" class="subadminsselect" data-placehoder="subadmins" title="' + t('settings', 'Group Admin') + '">')
.attr('data-username', username)
- .attr('data-user-groups', [groups])
- .attr('data-subadmin', [subadmin]);
+ .data('user-groups', groups)
+ .data('subadmin', subadmin);
tr.find('td.subadmins').empty();
}
$.each(this.availableGroups, function (i, group) {
@@ -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 a6288e471fdff8a4a22f71d3c10e94b45267c8a5..9873d4d20acf62a2eda0eeea94c3d2394ad5ca19 100644
--- a/settings/l10n/cs_CZ.php
+++ b/settings/l10n/cs_CZ.php
@@ -16,16 +16,25 @@ $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",
"Please wait...." => "Čekejte prosím...",
+"Error while disabling app" => "Chyba při zakazování aplikace",
+"Error while enabling app" => "Chyba při povolování aplikace",
"Updating...." => "Aktualizuji...",
"Error while updating app" => "Chyba při aktualizaci aplikace",
"Error" => "Chyba",
"Update" => "Aktualizovat",
"Updated" => "Aktualizováno",
-"Decrypting files... Please wait, this can take some time." => "Probíhá odšifrování souborů... Prosíme počkejte, tato operace může trvat několik minut.",
+"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",
"undo" => "vrátit zpět",
@@ -98,13 +107,20 @@ $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",
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Použijte <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">tuto adresu pro přístup k vašim souborům přes WebDAV</a>",
"Encryption" => "Šifrování",
-"The encryption app is no longer enabled, decrypt all your file" => "Šifrovací aplikace již není spuštěna, odšifrujte všechny své soubory",
-"Log-in password" => "Heslo",
+"The encryption app is no longer enabled, decrypt all your file" => "Šifrovací aplikace již není zapnuta, odšifrujte všechny své soubory",
+"Log-in password" => "Přihlašovací heslo",
"Decrypt all Files" => "Odšifrovat všechny soubory",
"Login Name" => "Přihlašovací jméno",
"Create" => "Vytvořit",
diff --git a/settings/l10n/da.php b/settings/l10n/da.php
index f352dd459f93dc938c36c3923c234e9044678fc1..f86559d6752b121d3cff35b75eb7cdad7cd37da7 100644
--- a/settings/l10n/da.php
+++ b/settings/l10n/da.php
@@ -16,15 +16,24 @@ $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.",
+"Unable to change password" => "Kunne ikke ændre kodeord",
"Update to {appversion}" => "Opdatér til {appversion}",
"Disable" => "Deaktiver",
"Enable" => "Aktiver",
"Please wait...." => "Vent venligst...",
+"Error while disabling app" => "Kunne ikke deaktivere app",
+"Error while enabling app" => "Kunne ikke aktivere app",
"Updating...." => "Opdaterer....",
"Error while updating app" => "Der opstod en fejl under app opgraderingen",
"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",
@@ -98,6 +107,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 2c30e51017c05110144a9c6677d428b19527507d..ae2165873ea9b2256b3e9465dfde8af2dfe8423d 100644
--- a/settings/l10n/de.php
+++ b/settings/l10n/de.php
@@ -16,15 +16,24 @@ $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",
"Please wait...." => "Bitte warten...",
+"Error while disabling app" => "Beim Deaktivieren der Applikation ist ein Fehler aufgetreten",
+"Error while enabling app" => "Beim Aktivieren der Applikation ist ein Fehler aufgetreten",
"Updating...." => "Aktualisierung...",
"Error while updating app" => "Fehler beim Aktualisieren der App",
"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",
@@ -98,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 c14e5a3606a5fca5b819721fdeb5cac10444ea01..924792aa62b720ca6156b23fd674e8c74d5d7811 100644
--- a/settings/l10n/de_DE.php
+++ b/settings/l10n/de_DE.php
@@ -16,17 +16,24 @@ $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",
"Please wait...." => "Bitte warten....",
-"Error while disabling app" => "Beim deaktivieren der Applikation ist ein Fehler aufgetreten.",
-"Error while enabling app" => "Beim aktivieren der Applikation ist ein Fehler aufgetreten.",
+"Error while disabling app" => "Beim Deaktivieren der Applikation ist ein Fehler aufgetreten",
+"Error while enabling app" => "Beim Aktivieren der Applikation ist ein Fehler aufgetreten",
"Updating...." => "Update...",
"Error while updating app" => "Es ist ein Fehler während des Updates aufgetreten",
"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
new file mode 100644
index 0000000000000000000000000000000000000000..abbc92709e56688b9c50b480392307bc151f22ee
--- /dev/null
+++ b/settings/l10n/en_GB.php
@@ -0,0 +1,138 @@
+<?php
+$TRANSLATIONS = array(
+"Unable to load list from App Store" => "Unable to load list from App Store",
+"Authentication error" => "Authentication error",
+"Your display name has been changed." => "Your display name has been changed.",
+"Unable to change display name" => "Unable to change display name",
+"Group already exists" => "Group already exists",
+"Unable to add group" => "Unable to add group",
+"Email saved" => "Email saved",
+"Invalid email" => "Invalid email",
+"Unable to delete group" => "Unable to delete group",
+"Unable to delete user" => "Unable to delete user",
+"Language changed" => "Language changed",
+"Invalid request" => "Invalid request",
+"Admins can't remove themself from the admin group" => "Admins can't remove themselves from the admin group",
+"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",
+"Please wait...." => "Please wait....",
+"Error while disabling app" => "Error whilst disabling app",
+"Error while enabling app" => "Error whilst enabling app",
+"Updating...." => "Updating....",
+"Error while updating app" => "Error whilst updating app",
+"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",
+"undo" => "undo",
+"Unable to remove user" => "Unable to remove user",
+"Groups" => "Groups",
+"Group Admin" => "Group Admin",
+"Delete" => "Delete",
+"add group" => "add group",
+"A valid username must be provided" => "A valid username must be provided",
+"Error creating user" => "Error creating user",
+"A valid password must be provided" => "A valid password must be provided",
+"__language_name__" => "__language_name__",
+"Security Warning" => "Security Warning",
+"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." => "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.",
+"Setup Warning" => "Setup Warning",
+"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 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",
+"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." => "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.",
+"Cron" => "Cron",
+"Execute one task with each page loaded" => "Execute one task with each page loaded",
+"cron.php is registered at a webcron service to call cron.php once a minute over http." => "cron.php is registered at a webcron service to call cron.php once a minute over http.",
+"Use systems cron service to call the cron.php file once a minute." => "Use systems cron service to call the cron.php file once a minute.",
+"Sharing" => "Sharing",
+"Enable Share API" => "Enable Share API",
+"Allow apps to use the Share API" => "Allow apps to use the Share API",
+"Allow links" => "Allow links",
+"Allow users to share items to the public with links" => "Allow users to share items to the public with links",
+"Allow public uploads" => "Allow public uploads",
+"Allow users to enable others to upload into their publicly shared folders" => "Allow users to enable others to upload into their publicly shared folders",
+"Allow resharing" => "Allow resharing",
+"Allow users to share items shared with them again" => "Allow users to share items shared with them again",
+"Allow users to share with anyone" => "Allow users to share with anyone",
+"Allow users to only share with users in their groups" => "Allow users to only share with users in their groups",
+"Security" => "Security",
+"Enforce HTTPS" => "Enforce HTTPS",
+"Forces the clients to connect to %s via an encrypted connection." => "Forces the clients to connect to %s via an encrypted connection.",
+"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Please connect to your %s via HTTPS to enable or disable the SSL enforcement.",
+"Log" => "Log",
+"Log level" => "Log level",
+"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 Licence\">AGPL</abbr></a>.",
+"Add your App" => "Add your App",
+"More Apps" => "More Apps",
+"Select an App" => "Select an App",
+"See application page at apps.owncloud.com" => "See application page at apps.owncloud.com",
+"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>",
+"User Documentation" => "User Documentation",
+"Administrator Documentation" => "Administrator Documentation",
+"Online Documentation" => "Online Documentation",
+"Forum" => "Forum",
+"Bugtracker" => "Bugtracker",
+"Commercial Support" => "Commercial Support",
+"Get the apps to sync your files" => "Get the apps to sync your files",
+"Show First Run Wizard again" => "Show First Run Wizard again",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "You have used <strong>%s</strong> of the available <strong>%s</strong>",
+"Password" => "Password",
+"Your password was changed" => "Your password was changed",
+"Unable to change your password" => "Unable to change your password",
+"Current password" => "Current password",
+"New password" => "New password",
+"Change password" => "Change password",
+"Display Name" => "Display Name",
+"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",
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>",
+"Encryption" => "Encryption",
+"The encryption app is no longer enabled, decrypt all your file" => "The encryption app is no longer enabled, decrypt all your files",
+"Log-in password" => "Log-in password",
+"Decrypt all Files" => "Decrypt all Files",
+"Login Name" => "Login Name",
+"Create" => "Create",
+"Admin Recovery Password" => "Admin Recovery Password",
+"Enter the recovery password in order to recover the users files during password change" => "Enter the recovery password in order to recover the user's files during password change",
+"Default Storage" => "Default Storage",
+"Unlimited" => "Unlimited",
+"Other" => "Other",
+"Username" => "Username",
+"Storage" => "Storage",
+"change display name" => "change display name",
+"set new password" => "set new password",
+"Default" => "Default"
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
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 4f3099b8c24c376c7fc48f60510daa9cc108d851..b20a4acb29971c1696fb55df5d6228ae33060b3a 100644
--- a/settings/l10n/es.php
+++ b/settings/l10n/es.php
@@ -2,7 +2,7 @@
$TRANSLATIONS = array(
"Unable to load list from App Store" => "Imposible cargar la lista desde el App Store",
"Authentication error" => "Error de autenticación",
-"Your display name has been changed." => "Su nombre fue cambiado.",
+"Your display name has been changed." => "Su nombre de usuario ha sido cambiado.",
"Unable to change display name" => "No se pudo cambiar el nombre de usuario",
"Group already exists" => "El grupo ya existe",
"Unable to add group" => "No se pudo añadir el grupo",
@@ -16,15 +16,22 @@ $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",
"Please wait...." => "Espere, por favor....",
+"Error while disabling app" => "Error mientras se desactivaba la aplicación",
+"Error while enabling app" => "Error mientras se activaba la aplicación",
"Updating...." => "Actualizando....",
"Error while updating app" => "Error mientras se actualizaba la aplicación",
"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",
"undo" => "deshacer",
@@ -38,12 +45,12 @@ $TRANSLATIONS = array(
"A valid password must be provided" => "Se debe proporcionar una contraseña valida",
"__language_name__" => "Castellano",
"Security Warning" => "Advertencia de seguridad",
-"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." => "Su directorio de datos y sus archivos probablemente están accesibles desde Internet. El archivo .htaccess no está funcionando. Nosotros le sugerimos encarecidamente que configure su servidor web de modo que el directorio de datos ya no sea accesible o que mueva el directorio de datos fuera de la raíz de documentos del servidor web.",
+"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." => "Probablemente se puede acceder a su directorio de datos y sus archivos desde Internet. El archivo .htaccess no está funcionando. Nosotros le sugerimos encarecidamente que configure su servidor web de modo que el directorio de datos ya no sea accesible o que mueva el directorio de datos fuera de la raíz de documentos del servidor web.",
"Setup Warning" => "Advertencia de configuración",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Su servidor web aún no está configurado adecuadamente para permitir la sincronización de archivos ya que la interfaz WebDAV parece no estar funcionando.",
"Please double check the <a href=\"%s\">installation guides</a>." => "Por favor, vuelva a comprobar las <a href='%s'>guías de instalación</a>.",
-"Module 'fileinfo' missing" => "Módulo 'fileinfo' perdido",
-"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "El modulo PHP 'fileinfo' no se encuentra. Le recomendamos encarecidamente que habilite este módulo para obtener mejores resultados con la detección del mime-type",
+"Module 'fileinfo' missing" => "No se ha encontrado el módulo \"fileinfo\"",
+"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "No se ha encontrado el modulo PHP 'fileinfo'. Le recomendamos encarecidamente que habilite este módulo para obtener mejores resultados con la detección del mime-type",
"Locale not working" => "La configuración regional no está funcionando",
"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." => "La configuración regional del sistema no se puede ajustar a %s. Esto significa que puede haber problemas con ciertos caracteres en los nombres de archivo. Le recomendamos instalar los paquetes necesarios en el sistema para soportar % s.",
"Internet connection not working" => "La conexion a internet no esta funcionando",
@@ -56,7 +63,7 @@ $TRANSLATIONS = array(
"Enable Share API" => "Activar API de Compartición",
"Allow apps to use the Share API" => "Permitir a las aplicaciones utilizar la API de Compartición",
"Allow links" => "Permitir enlaces",
-"Allow users to share items to the public with links" => "Permitir a los usuarios compartir elementos al público con enlaces",
+"Allow users to share items to the public with links" => "Permitir a los usuarios compartir elementos con el público mediante enlaces",
"Allow public uploads" => "Permitir subidas públicas",
"Allow users to enable others to upload into their publicly shared folders" => "Permitir a los usuarios habilitar a otros para subir archivos en sus carpetas compartidas públicamente",
"Allow resharing" => "Permitir re-compartición",
@@ -76,8 +83,8 @@ $TRANSLATIONS = array(
"Add your App" => "Añade tu aplicación",
"More Apps" => "Más aplicaciones",
"Select an App" => "Seleccionar una aplicación",
-"See application page at apps.owncloud.com" => "Echa un vistazo a la web de aplicaciones apps.owncloud.com",
-"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licenciado por <span class=\"author\"></span>",
+"See application page at apps.owncloud.com" => "Ver la página de aplicaciones en apps.owncloud.com",
+"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licencia otorgada por <span class=\"author\"></span>",
"User Documentation" => "Documentación de usuario",
"Administrator Documentation" => "Documentación de adminstrador",
"Online Documentation" => "Documentación en linea",
@@ -85,7 +92,7 @@ $TRANSLATIONS = array(
"Bugtracker" => "Rastreador de fallos",
"Commercial Support" => "Soporte comercial",
"Get the apps to sync your files" => "Obtener las aplicaciones para sincronizar sus archivos",
-"Show First Run Wizard again" => "Mostrar asistente para iniciar otra vez",
+"Show First Run Wizard again" => "Mostrar asistente para iniciar de nuevo",
"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Ha usado <strong>%s</strong> de los <strong>%s</strong> disponibles",
"Password" => "Contraseña",
"Your password was changed" => "Su contraseña ha sido cambiada",
@@ -97,11 +104,20 @@ $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údnos a traducir",
+"Help translate" => "Ayúdanos a traducir",
"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>" => "Utilice esta dirección para<a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">acceder a sus archivos a través de WebDAV</a>",
"Encryption" => "Cifrado",
+"The encryption app is no longer enabled, decrypt all your file" => "La aplicación de cifrado no está activada, descifre sus archivos",
+"Log-in password" => "Contraseña de acceso",
+"Decrypt all Files" => "Descifrar archivos",
"Login Name" => "Nombre de usuario",
"Create" => "Crear",
"Admin Recovery Password" => "Recuperación de la contraseña de administración",
diff --git a/settings/l10n/es_AR.php b/settings/l10n/es_AR.php
index f4f50e5949afd889c2f2d787080f92ddefa7c96d..aba4b604a2dc4888e60e05931a98752e1510bb33 100644
--- a/settings/l10n/es_AR.php
+++ b/settings/l10n/es_AR.php
@@ -20,11 +20,14 @@ $TRANSLATIONS = array(
"Disable" => "Desactivar",
"Enable" => "Activar",
"Please wait...." => "Por favor, esperá....",
+"Error while disabling app" => "Se ha producido un error mientras se deshabilitaba la aplicación",
+"Error while enabling app" => "Se ha producido un error mientras se habilitaba la aplicación",
"Updating...." => "Actualizando....",
"Error while updating app" => "Error al actualizar App",
"Error" => "Error",
"Update" => "Actualizar",
"Updated" => "Actualizado",
+"Decrypting files... Please wait, this can take some time." => "Desencriptando archivos... Por favor espere, esto puede tardar.",
"Saving..." => "Guardando...",
"deleted" => "borrado",
"undo" => "deshacer",
@@ -38,14 +41,20 @@ $TRANSLATIONS = array(
"A valid password must be provided" => "Debe ingresar una contraseña válida",
"__language_name__" => "Castellano (Argentina)",
"Security Warning" => "Advertencia de seguridad",
+"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." => "El directorio de datos y tus archivos probablemente sean accesibles desde Internet. El archivo .htaccess no funciona. Sugerimos fuertemente que configures tu servidor web de forma tal que el archivo de directorios no sea accesible o muevas el mismo fuera de la raíz de los documentos del servidor web.",
"Setup Warning" => "Alerta de Configuración",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Tu servidor web no está configurado todavía para permitir sincronización de archivos porque la interfaz WebDAV parece no funcionar.",
+"Please double check the <a href=\"%s\">installation guides</a>." => "Por favor, cheque bien la <a href=\"%s\">guía de instalación</a>.",
"Module 'fileinfo' missing" => "El módulo 'fileinfo' no existe",
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "El módulo PHP 'fileinfo' no existe. Es recomendable que actives este módulo para obtener mejores resultados con la detección mime-type",
"Locale not working" => "\"Locale\" no está funcionando",
+"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." => "No se pudo asignar la localización del sistema a %s. Esto significa que puede haber problemas con ciertos caracteres en los nombres de los archivos. Recomendamos fuertemente instalar los paquetes de sistema requeridos para poder dar soporte a %s.",
"Internet connection not working" => "La conexión a Internet no esta funcionando. ",
+"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." => "El servidor no posee una conexión a Internet activa. Esto significa que algunas características como el montaje de un almacenamiento externo, las notificaciones acerca de actualizaciones o la instalación de aplicaciones de terceros no funcionarán. El acceso a archivos de forma remota y el envío de correos con notificaciones es posible que tampoco funcionen. Sugerimos habilitar la conexión a Internet para este servidor si deseas tener todas estas características.",
"Cron" => "Cron",
"Execute one task with each page loaded" => "Ejecutá una tarea con cada pagina cargada.",
+"cron.php is registered at a webcron service to call cron.php once a minute over http." => "cron.php está registrado al servicio webcron para que sea llamado una vez por cada minuto sobre http.",
+"Use systems cron service to call the cron.php file once a minute." => "Usa el servicio cron del sistema para ejecutar al archivo cron.php por cada minuto.",
"Sharing" => "Compartiendo",
"Enable Share API" => "Habilitar Share API",
"Allow apps to use the Share API" => "Permitir a las aplicaciones usar la Share API",
@@ -59,6 +68,8 @@ $TRANSLATIONS = array(
"Allow users to only share with users in their groups" => "Permitir a los usuarios compartir sólo con los de sus mismos grupos",
"Security" => "Seguridad",
"Enforce HTTPS" => "Forzar HTTPS",
+"Forces the clients to connect to %s via an encrypted connection." => "Fuerza al cliente a conectarse a %s por medio de una conexión encriptada.",
+"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Por favor conéctese a su %s por medio de HTTPS para habilitar o deshabilitar la característica SSL",
"Log" => "Log",
"Log level" => "Nivel de Log",
"More" => "Más",
@@ -89,11 +100,15 @@ $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",
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Usá esta dirección para <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">acceder a tus archivos a través de WebDAV</a>",
"Encryption" => "Encriptación",
+"The encryption app is no longer enabled, decrypt all your file" => "La aplicación de encriptación ya no está habilitada, desencriptando todos los archivos",
+"Log-in password" => "Clave de acceso",
+"Decrypt all Files" => "Desencriptar todos los archivos",
"Login Name" => "Nombre de Usuario",
"Create" => "Crear",
"Admin Recovery Password" => "Recuperación de contraseña de administrador",
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 536cac96568f46e5f842aff485c22c519c24aa42..10a7d764bc89b82567c248a023273bab9a98e281 100644
--- a/settings/l10n/fr.php
+++ b/settings/l10n/fr.php
@@ -16,15 +16,25 @@ $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",
+"Please provide an admin recovery password, otherwise all user data will be lost" => "Veuillez fournir un mot de passe administrateur de récupération de données, sinon toutes les données de l'utilisateur seront perdues",
+"Wrong admin recovery password. Please check the password and try again." => "Mot de passe administrateur de récupération de données invalide. Veuillez vérifier le mot de passe et essayer à nouveau.",
+"Back-end doesn't support password change, but the users encryption key was successfully updated." => "L'infrastructure d'arrière-plan ne supporte pas la modification de mot de passe, mais la clef de chiffrement des utilisateurs a été mise à jour avec succès.",
+"Unable to change password" => "Impossible de modifier le mot de passe",
"Update to {appversion}" => "Mettre à jour vers {appversion}",
"Disable" => "Désactiver",
"Enable" => "Activer",
"Please wait...." => "Veuillez patienter…",
+"Error while disabling app" => "Erreur lors de la désactivation de l'application",
+"Error while enabling app" => "Erreur lors de l'activation de l'application",
"Updating...." => "Mise à jour...",
"Error while updating app" => "Erreur lors de la mise à jour de l'application",
"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é",
"undo" => "annuler",
@@ -38,25 +48,35 @@ $TRANSLATIONS = array(
"A valid password must be provided" => "Un mot de passe valide doit être saisi",
"__language_name__" => "Français",
"Security Warning" => "Avertissement de sécurité",
+"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." => "Votre dossier de données et vos fichiers sont probablement accessibles depuis internet. Le fichier .htaccess ne fonctionne pas. Nous vous recommandons vivement de configurer votre serveur web de façon à ce que ce dossier de données ne soit plus accessible, ou bien de le déplacer à l'extérieur de la racine du serveur web.",
"Setup Warning" => "Avertissement, problème de configuration",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Votre serveur web, n'est pas correctement configuré pour permettre la synchronisation des fichiers, car l'interface WebDav ne fonctionne pas comme il faut.",
+"Please double check the <a href=\"%s\">installation guides</a>." => "Veuillez consulter à nouveau les <a href=\"%s\">guides d'installation</a>.",
"Module 'fileinfo' missing" => "Module 'fileinfo' manquant",
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Le module PHP 'fileinfo' est manquant. Il est vivement recommandé de l'activer afin d'obtenir de meilleurs résultats pour la détection des types de fichiers.",
"Locale not working" => "Localisation non fonctionnelle",
+"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." => "Le localisation du système n'a pu être configurée à %s. Cela signifie qu'il pourrait y avoir des problèmes avec certains caractères dans les noms de fichiers. Il est fortement recommandé d'installer les paquets requis pour le support de %s.",
"Internet connection not working" => "La connexion internet ne fonctionne pas",
+"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." => "Ce serveur ne peut se connecter à internet. Cela signifie que certaines fonctionnalités, telles que le montage de supports de stockage distants, les notifications de mises à jour ou l'installation d'applications tierces ne fonctionneront pas. L'accès aux fichiers à distance, ainsi que les notifications par mails ne seront pas fonctionnels également. Il est recommandé d'activer la connexion internet pour ce serveur si vous souhaitez disposer de l'ensemble des fonctionnalités offertes.",
"Cron" => "Cron",
"Execute one task with each page loaded" => "Exécute une tâche à chaque chargement de page",
+"cron.php is registered at a webcron service to call cron.php once a minute over http." => "cron.php est enregistré en tant que service webcron pour appeler cron.php une fois par minute via http.",
+"Use systems cron service to call the cron.php file once a minute." => "Utilise le service cron du système pour appeler cron.php une fois par minute.",
"Sharing" => "Partage",
"Enable Share API" => "Activer l'API de partage",
"Allow apps to use the Share API" => "Autoriser les applications à utiliser l'API de partage",
"Allow links" => "Autoriser les liens",
"Allow users to share items to the public with links" => "Autoriser les utilisateurs à partager des éléments publiquement à l'aide de liens",
+"Allow public uploads" => "Autoriser les téléversements publics",
+"Allow users to enable others to upload into their publicly shared folders" => "Permet d'autoriser les autres utilisateurs à téléverser dans le dossier partagé public de l'utilisateur",
"Allow resharing" => "Autoriser le repartage",
"Allow users to share items shared with them again" => "Autoriser les utilisateurs à partager des éléments qui ont été partagés avec eux",
"Allow users to share with anyone" => "Autoriser les utilisateurs à partager avec tout le monde",
"Allow users to only share with users in their groups" => "Autoriser les utilisateurs à partager avec des utilisateurs de leur groupe uniquement",
"Security" => "Sécurité",
"Enforce HTTPS" => "Forcer HTTPS",
+"Forces the clients to connect to %s via an encrypted connection." => "Forcer les clients à se connecter à %s via une connexion chiffrée.",
+"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Veuillez vous connecter à cette instance %s via HTTPS pour activer ou désactiver SSL.",
"Log" => "Log",
"Log level" => "Niveau de log",
"More" => "Plus",
@@ -87,11 +107,21 @@ $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",
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Utilisez cette adresse pour <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">accéder à vos fichiers via WebDAV</a>",
"Encryption" => "Chiffrement",
+"The encryption app is no longer enabled, decrypt all your file" => "L'application de chiffrement n'est plus activée, déchiffrez tous vos fichiers",
+"Log-in password" => "Mot de passe de connexion",
+"Decrypt all Files" => "Déchiffrer tous les fichiers",
"Login Name" => "Nom de la connexion",
"Create" => "Créer",
"Admin Recovery Password" => "Récupération du mot de passe administrateur",
diff --git a/settings/l10n/gl.php b/settings/l10n/gl.php
index fb51d793c69d7de97e270261bf2d6c6a93f3ad58..62a2f7b8739225469f3773c4f333bd8a0c8f3e52 100644
--- a/settings/l10n/gl.php
+++ b/settings/l10n/gl.php
@@ -16,15 +16,24 @@ $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",
"Please wait...." => "Agarde...",
+"Error while disabling app" => "Produciuse un erro ao desactivar o aplicativo",
+"Error while enabling app" => "Produciuse un erro ao activar o aplicativo",
"Updating...." => "Actualizando...",
"Error while updating app" => "Produciuse un erro mentres actualizaba o aplicativo",
"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",
@@ -98,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..cba844e7818ac60793a625757065bd8c57d74a3d 100644
--- a/settings/l10n/hu_HU.php
+++ b/settings/l10n/hu_HU.php
@@ -16,15 +16,25 @@ $TRANSLATIONS = array(
"Unable to add user to group %s" => "A felhasználó nem adható hozzá ehhez a csoporthoz: %s",
"Unable to remove user from group %s" => "A felhasználó nem távolítható el ebből a csoportból: %s",
"Couldn't update app." => "A program frissítése nem sikerült.",
+"Wrong password" => "Hibás jelszó",
+"No user supplied" => "Nincs felhasználó által mellékelve",
+"Please provide an admin recovery password, otherwise all user data will be lost" => "Add meg az admin helyreállító jelszót, máskülönben az összes felhasználói adat elveszik.",
+"Wrong admin recovery password. Please check the password and try again." => "Hibás admin helyreállítási jelszó. Ellenörizd a jelszót és próbáld újra.",
+"Back-end doesn't support password change, but the users encryption key was successfully updated." => "A back-end nem támogatja a jelszó módosítást, de felhasználó titkosítási kulcsa sikeresen frissítve lett.",
+"Unable to change password" => "Nem sikerült megváltoztatni a jelszót",
"Update to {appversion}" => "Frissítés erre a verzióra: {appversion}",
"Disable" => "Letiltás",
"Enable" => "engedélyezve",
"Please wait...." => "Kérem várjon...",
+"Error while disabling app" => "Hiba az alkalmazás kikapcsolása közben",
+"Error while enabling app" => "Hiba az alalmazás engedélyezése közben",
"Updating...." => "Frissítés folyamatban...",
"Error while updating app" => "Hiba történt a programfrissítés közben",
"Error" => "Hiba",
"Update" => "Frissítés",
"Updated" => "Frissítve",
+"Select a profile picture" => "Válassz profil képet",
+"Decrypting files... Please wait, this can take some time." => "File-ok kititkosítása folyamatban... Kérlek várj, ez hosszabb ideig is eltarthat ...",
"Saving..." => "Mentés...",
"deleted" => "törölve",
"undo" => "visszavonás",
@@ -97,11 +107,21 @@ $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",
+"Upload new" => "Új feltöltése",
+"Select new from Files" => "Új kiválasztása Fileokból",
+"Remove image" => "Kép eltávolítása",
+"Either png or jpg. Ideally square but you will be able to crop it." => "Egyaránt png vagy jpg. Az ideális ha négyzet alaku, de késöbb még átszabható",
+"Abort" => "Megszakítás",
+"Choose as profile image" => "Válassz profil képet",
"Language" => "Nyelv",
"Help translate" => "Segítsen a fordításban!",
"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>" => "Ezt a címet használja, ha <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">WebDAV-on keresztül szeretné elérni az állományait</a>",
"Encryption" => "Titkosítás",
+"The encryption app is no longer enabled, decrypt all your file" => "A titkosító alkalmzás a továbbiakban nincs engedélyezve, kititkosítja az összes fileodat",
+"Log-in password" => "Bejelentkezési jelszó",
+"Decrypt all Files" => "Kititkosítja az összes file-t",
"Login Name" => "Bejelentkezési név",
"Create" => "Létrehozás",
"Admin Recovery Password" => "A jelszóvisszaállítás adminisztrációja",
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 0fda1309395dcca70ec2fde6ba61c0cc5b53e3ad..fc91bc5f170f506fa834959ec918f334fc442c57 100644
--- a/settings/l10n/it.php
+++ b/settings/l10n/it.php
@@ -16,15 +16,24 @@ $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",
"Please wait...." => "Attendere...",
+"Error while disabling app" => "Errore durante la disattivazione",
+"Error while enabling app" => "Errore durante l'attivazione",
"Updating...." => "Aggiornamento in corso...",
"Error while updating app" => "Errore durante l'aggiornamento",
"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",
@@ -98,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 8bbdc222e437fb5d9d495dd317fdec31c3a599bd..bfaa9827b21f36cca1a2550c819803f3c79c86ee 100644
--- a/settings/l10n/ja_JP.php
+++ b/settings/l10n/ja_JP.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}" => "{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,6 +107,13 @@ $TRANSLATIONS = array(
"Email" => "メール",
"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",
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/ku_IQ.php b/settings/l10n/ku_IQ.php
index 4549dcea52c0bd895814c974fa5c770f8455e655..d0a8abea7133b59f93167758456743caf829c8e5 100644
--- a/settings/l10n/ku_IQ.php
+++ b/settings/l10n/ku_IQ.php
@@ -1,5 +1,6 @@
<?php
$TRANSLATIONS = array(
+"Invalid request" => "داواکارى نادروستە",
"Enable" => "چالاککردن",
"Error" => "ههڵه",
"Update" => "نوێکردنهوه",
diff --git a/settings/l10n/lt_LT.php b/settings/l10n/lt_LT.php
index da0fb8f56b5402e8d65e21ccf261ffe49a4bac43..df0247fc27e3511d1400054899cd38abe7cb4fdd 100644
--- a/settings/l10n/lt_LT.php
+++ b/settings/l10n/lt_LT.php
@@ -2,6 +2,8 @@
$TRANSLATIONS = array(
"Unable to load list from App Store" => "Neįmanoma įkelti sąrašo iš Programų Katalogo",
"Authentication error" => "Autentikacijos klaida",
+"Your display name has been changed." => "Jūsų rodomas vardas buvo pakeistas.",
+"Unable to change display name" => "Nepavyksta pakeisti rodomą vardą",
"Group already exists" => "Grupė jau egzistuoja",
"Unable to add group" => "Nepavyko pridėti grupės",
"Email saved" => "El. paštas išsaugotas",
@@ -10,23 +12,35 @@ $TRANSLATIONS = array(
"Unable to delete user" => "Nepavyko ištrinti vartotojo",
"Language changed" => "Kalba pakeista",
"Invalid request" => "Klaidinga užklausa",
+"Admins can't remove themself from the admin group" => "Administratoriai negali pašalinti savęs iš administratorių grupės",
"Unable to add user to group %s" => "Nepavyko pridėti vartotojo prie grupės %s",
"Unable to remove user from group %s" => "Nepavyko ištrinti vartotojo iš grupės %s",
"Couldn't update app." => "Nepavyko atnaujinti programos.",
+"Wrong password" => "Neteisingas slaptažodis",
+"No user supplied" => "Nepateiktas naudotojas",
+"Please provide an admin recovery password, otherwise all user data will be lost" => "Prašome įvesti administratoriaus atkūrimo slaptažodį, kitaip visi naudotojo suomenys bus prarasti",
+"Wrong admin recovery password. Please check the password and try again." => "Netinkamas administratoriau atkūrimo slaptažodis. Prašome pasitikrinti ir bandyti vėl.",
+"Back-end doesn't support password change, but the users encryption key was successfully updated." => "Sistema nepalaiko slaptažodžio keitimo, bet naudotojo šifravimo raktas buvo sėkmingai atnaujintas.",
+"Unable to change password" => "Nepavyksta pakeisti slaptažodžio",
"Update to {appversion}" => "Atnaujinti iki {appversion}",
"Disable" => "Išjungti",
"Enable" => "Įjungti",
"Please wait...." => "Prašome palaukti...",
+"Error while disabling app" => "Klaida išjungiant programą",
+"Error while enabling app" => "Klaida įjungiant programą",
"Updating...." => "Atnaujinama...",
"Error while updating app" => "Įvyko klaida atnaujinant programą",
"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",
"undo" => "anuliuoti",
"Unable to remove user" => "Nepavyko ištrinti vartotojo",
"Groups" => "Grupės",
+"Group Admin" => "Grupės administratorius",
"Delete" => "Ištrinti",
"add group" => "pridėti grupę",
"A valid username must be provided" => "Vartotojo vardas turi būti tinkamas",
@@ -34,42 +48,90 @@ $TRANSLATIONS = array(
"A valid password must be provided" => "Slaptažodis turi būti tinkamas",
"__language_name__" => "Kalba",
"Security Warning" => "Saugumo pranešimas",
+"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." => "Jūsų duomenų katalogas ir Jūsų failai turbūt yra pasiekiami per internetą. Failas .htaccess neveikia. Mes labai rekomenduojame sukonfigūruoti serverį taip, kad katalogas nebūtų daugiau pasiekiamas, arba iškelkite duomenis kitur iš webserverio šakninio aplanko.",
+"Setup Warning" => "Nustatyti perspėjimą",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Jūsų serveris nėra tvarkingai nustatytas leisti failų sinchronizaciją, nes WebDAV sąsaja panašu, kad yra sugadinta.",
+"Please double check the <a href=\"%s\">installation guides</a>." => "Prašome pažiūrėkite dar kartą <a href=\"%s\">diegimo instrukcijas</a>.",
"Module 'fileinfo' missing" => "Trūksta 'fileinfo' modulio",
+"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Trūksta PHP modulio „fileinfo“. Labai rekomenduojame įjungti šį modulį, kad gauti geriausius rezultatus nustatant mime-tipą.",
+"Locale not working" => "Lokalė neveikia",
+"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." => "Negalima nustatyti sistemos lokalės į %s. Tai reiškia, kad gali būti problemų su tam tikrais simboliais failų pavadinimuose. Labai rekomenduojame įdiegti reikalingus paketus Jūsų sistemoje, kad palaikyti %s.",
+"Internet connection not working" => "Nėra interneto ryšio",
+"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." => "Šis serveris neturi veikiančio ryšio. Tai reiškia, kas kai kurios funkcijos kaip išorinės saugyklos prijungimas, perspėjimai apie atnaujinimus ar trečių šalių programų įdiegimas neveikia. Failų pasiekimas iš kitur ir pranešimų siuntimas el. paštu gali taip pat neveikti. Rekomenduojame įjungti interneto ryšį šiame serveryje, jei norite naudoti visas funkcijas.",
"Cron" => "Cron",
+"Execute one task with each page loaded" => "Įvykdyti vieną užduotį su kiekvieno puslapio įkėlimu",
+"cron.php is registered at a webcron service to call cron.php once a minute over http." => "cron.php yra registruotas tinklapio suplanuotų užduočių paslaugose, kad iškviesti cron.php kartą per minutę per http.",
+"Use systems cron service to call the cron.php file once a minute." => "Naudoti sistemos planuotų užduočių paslaugą, kad iškvieti cron.php kartą per minutę.",
"Sharing" => "Dalijimasis",
+"Enable Share API" => "Įjungti Share API",
+"Allow apps to use the Share API" => "Leidžia programoms naudoti Share API",
"Allow links" => "Lesti nuorodas",
+"Allow users to share items to the public with links" => "Leisti naudotojams viešai dalintis elementais su nuorodomis",
+"Allow public uploads" => "Leisti viešus įkėlimus",
+"Allow users to enable others to upload into their publicly shared folders" => "Leisti naudotojams įgalinti kitus įkelti į savo viešai dalinamus aplankus",
"Allow resharing" => "Leisti dalintis",
+"Allow users to share items shared with them again" => "Leisti naudotojams toliau dalintis elementais pasidalintais su jais",
+"Allow users to share with anyone" => "Leisti naudotojams dalintis su bet kuo",
+"Allow users to only share with users in their groups" => "Leisti naudotojams dalintis tik su naudotojais savo grupėje",
"Security" => "Saugumas",
+"Enforce HTTPS" => "Reikalauti HTTPS",
+"Forces the clients to connect to %s via an encrypted connection." => "Verčia klientus jungtis prie %s per šifruotą ryšį.",
+"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Prašome prisijungti prie savo %s per HTTPS, kad įjungti ar išjungti SSL reikalavimą.",
"Log" => "Žurnalas",
"Log level" => "Žurnalo išsamumas",
"More" => "Daugiau",
"Less" => "Mažiau",
"Version" => "Versija",
+"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>." => "Sukurta <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud bendruomenės</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">pirminis kodas</a> platinamas pagal <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
"Add your App" => "Pridėti programėlę",
"More Apps" => "Daugiau aplikacijų",
"Select an App" => "Pasirinkite programą",
+"See application page at apps.owncloud.com" => "Žiūrėti programos puslapį svetainėje apps.owncloud.com",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>- autorius<span class=\"author\"></span>",
+"User Documentation" => "Naudotojo dokumentacija",
+"Administrator Documentation" => "Administratoriaus dokumentacija",
+"Online Documentation" => "Dokumentacija tinkle",
"Forum" => "Forumas",
"Bugtracker" => "Klaidų sekimas",
+"Commercial Support" => "Komercinis palaikymas",
"Get the apps to sync your files" => "Atsisiųskite programėlių, kad sinchronizuotumėte savo failus",
+"Show First Run Wizard again" => "Rodyti pirmo karto vedlį dar kartą",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Jūs naudojate <strong>%s</strong> iš galimų <strong>%s</strong>",
"Password" => "Slaptažodis",
"Your password was changed" => "Jūsų slaptažodis buvo pakeistas",
"Unable to change your password" => "Neįmanoma pakeisti slaptažodžio",
"Current password" => "Dabartinis slaptažodis",
"New password" => "Naujas slaptažodis",
"Change password" => "Pakeisti slaptažodį",
+"Display Name" => "Rodyti vardą",
"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",
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Naudokite šį adresą, kad <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">pasiekti savo failus per WebDAV</a>",
"Encryption" => "Šifravimas",
+"The encryption app is no longer enabled, decrypt all your file" => "Šifravimo programa nebėra įjungta, iššifruokite visus savo failus",
+"Log-in password" => "Prisijungimo slaptažodis",
+"Decrypt all Files" => "Iššifruoti visus failus",
"Login Name" => "Vartotojo vardas",
"Create" => "Sukurti",
+"Admin Recovery Password" => "Administracinis atkūrimo slaptažodis",
+"Enter the recovery password in order to recover the users files during password change" => "Įveskite atkūrimo slaptažodį, kad atkurti naudotojo failus keičiant slaptažodį",
+"Default Storage" => "Numatytas saugojimas",
"Unlimited" => "Neribota",
"Other" => "Kita",
"Username" => "Prisijungimo vardas",
+"Storage" => "Saugojimas",
+"change display name" => "keisti rodomą vardą",
"set new password" => "nustatyti naują slaptažodį",
"Default" => "Numatytasis"
);
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 438e21d5bcf49f99570373e7ed0d303025df80b2..9eb31a887bd3c0a27e69b34565fd45e1b6c22122 100644
--- a/settings/l10n/nn_NO.php
+++ b/settings/l10n/nn_NO.php
@@ -16,15 +16,25 @@ $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å",
"Please wait...." => "Ver venleg og vent …",
+"Error while disabling app" => "Klarte ikkje å skru av programmet",
+"Error while enabling app" => "Klarte ikkje å skru på programmet",
"Updating...." => "Oppdaterer …",
"Error while updating app" => "Feil ved oppdatering av app",
"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",
"undo" => "angra",
@@ -38,25 +48,35 @@ $TRANSLATIONS = array(
"A valid password must be provided" => "Du må oppgje eit gyldig passord",
"__language_name__" => "Nynorsk",
"Security Warning" => "Tryggleiksåtvaring",
+"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." => "Datamappa og filene dine er sannsynlegvis leselege frå nettet. Fila .htaccess fungerer ikkje. Me rår deg sterkt til å konfigurera vevtenaren din sånn at datamappa di ikkje lenger er tilgjengeleg; alternativt kan du flytta datamappa ut av dokumentrot til vevtenaren.",
"Setup Warning" => "Oppsettsåtvaring",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Tenaren din er ikkje enno rett innstilt til å tilby filsynkronisering sidan WebDAV-grensesnittet ser ut til å vera øydelagt.",
+"Please double check the <a href=\"%s\">installation guides</a>." => "Ver venleg og dobbeltsjekk <a href=\"%s\">installasjonsrettleiinga</a>.",
"Module 'fileinfo' missing" => "Modulen «fileinfo» manglar",
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP-modulen «fileinfo» manglar. Me rår sterkt til å slå på denne modulen for å best mogleg oppdaga MIME-typar.",
"Locale not working" => "Regionaldata fungerer ikkje",
+"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." => "Klarte ikkje endra regionaldata for systemet til %s. Dette vil seia at det kan verta problem med visse teikn i filnamn. Me rår deg sterkt til å installera dei kravde pakkene på systemet ditt så du får støtte for %s.",
"Internet connection not working" => "Nettilkoplinga fungerer ikkje",
+"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." => "Denne tenaren har ikkje ei fungerande nettilkopling. Dette vil seia at visse funksjonar, som montering av ekstern lagring, meldingar om oppdateringar eller installering av tredjepartsprogram, ikkje vil fungera. Det kan òg henda at du ikkje får tilgang til filene dine utanfrå, eller ikkje får sendt varslingsepostar. Me rår deg til å skru på nettilkoplinga for denne tenaren viss du ønskjer desse funksjonane.",
"Cron" => "Cron",
"Execute one task with each page loaded" => "Utfør éi oppgåve for kvar sidelasting",
+"cron.php is registered at a webcron service to call cron.php once a minute over http." => "Ei webcron-teneste er stilt inn til å kalla cron.php ein gong i minuttet over http.",
+"Use systems cron service to call the cron.php file once a minute." => "Bruk cron-tenesta til systemet for å kalla cron.php-fila ein gong i minuttet.",
"Sharing" => "Deling",
"Enable Share API" => "Slå på API-et for deling",
"Allow apps to use the Share API" => "La app-ar bruka API-et til deling",
"Allow links" => "Tillat lenkjer",
"Allow users to share items to the public with links" => "La brukarar dela ting offentleg med lenkjer",
+"Allow public uploads" => "Tillat offentlege opplastingar",
+"Allow users to enable others to upload into their publicly shared folders" => "La brukarar tillata andre å lasta opp i deira offentleg delte mapper",
"Allow resharing" => "Tillat vidaredeling",
"Allow users to share items shared with them again" => "La brukarar vidaredela delte ting",
"Allow users to share with anyone" => "La brukarar dela med kven som helst",
"Allow users to only share with users in their groups" => "La brukarar dela berre med brukarar i deira grupper",
"Security" => "Tryggleik",
"Enforce HTTPS" => "Krev HTTPS",
+"Forces the clients to connect to %s via an encrypted connection." => "Tvingar klientar til å kopla til %s med ei kryptert tilkopling.",
+"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Ver venleg å kopla til %s med HTTPS (eller skru av SSL-kravet).",
"Log" => "Logg",
"Log level" => "Log nivå",
"More" => "Meir",
@@ -87,11 +107,25 @@ $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",
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Bruk denne adressa for å <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">henta filene dine over WebDAV</a>",
+"Encryption" => "Kryptering",
+"The encryption app is no longer enabled, decrypt all your file" => "Krypteringsprogrammet er ikkje lenger slått på, dekrypter alle filene dine",
+"Log-in password" => "Innloggingspassord",
+"Decrypt all Files" => "Dekrypter alle filene",
"Login Name" => "Innloggingsnamn",
"Create" => "Lag",
+"Admin Recovery Password" => "Gjenopprettingspassord for administrator",
+"Enter the recovery password in order to recover the users files during password change" => "Skriv inn gjenopprettingspassordet brukt for å gjenoppretta brukarfilene ved passordendring",
"Default Storage" => "Standardlagring",
"Unlimited" => "Ubegrensa",
"Other" => "Anna",
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 1d8619de7e730982360ff05d72b9e098b7cde37b..6cce72df4b6d64847ea3c17fdea04aea1cba4189 100644
--- a/settings/l10n/pl.php
+++ b/settings/l10n/pl.php
@@ -16,15 +16,21 @@ $TRANSLATIONS = array(
"Unable to add user to group %s" => "Nie można dodać użytkownika do grupy %s",
"Unable to remove user from group %s" => "Nie można usunąć użytkownika z grupy %s",
"Couldn't update app." => "Nie można uaktualnić aplikacji.",
+"Wrong password" => "Złe hasło",
+"Unable to change password" => "Nie można zmienić hasła",
"Update to {appversion}" => "Aktualizacja do {appversion}",
"Disable" => "Wyłącz",
"Enable" => "Włącz",
"Please wait...." => "Proszę czekać...",
+"Error while disabling app" => "Błąd podczas wyłączania aplikacji",
+"Error while enabling app" => "Błąd podczas włączania aplikacji",
"Updating...." => "Aktualizacja w toku...",
"Error while updating app" => "Błąd podczas aktualizacji aplikacji",
"Error" => "Błąd",
"Update" => "Aktualizuj",
"Updated" => "Zaktualizowano",
+"Select a profile picture" => "Wybierz zdjęcie profilu",
+"Decrypting files... Please wait, this can take some time." => "Odszyfrowuje pliki... Proszę czekać, to może zająć jakiś czas.",
"Saving..." => "Zapisywanie...",
"deleted" => "usunięto",
"undo" => "cofnij",
@@ -38,21 +44,27 @@ $TRANSLATIONS = array(
"A valid password must be provided" => "Należy podać prawidłowe hasło",
"__language_name__" => "polski",
"Security Warning" => "Ostrzeżenie o zabezpieczeniach",
+"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." => "Twój katalog danych i pliki są prawdopodobnie dostępne z Internetu. Plik .htaccess, który dostarcza ownCloud nie działa. Sugerujemy, aby skonfigurować serwer WWW w taki sposób, aby katalog danych nie był dostępny lub przenieść katalog danych poza główny katalog serwera WWW.",
"Setup Warning" => "Ostrzeżenia konfiguracji",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Serwer internetowy nie jest jeszcze poprawnie skonfigurowany, aby umożliwić synchronizację plików, ponieważ interfejs WebDAV wydaje się być uszkodzony.",
"Please double check the <a href=\"%s\">installation guides</a>." => "Proszę sprawdź ponownie <a href=\"%s\">przewodnik instalacji</a>.",
"Module 'fileinfo' missing" => "Brak modułu „fileinfo”",
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Brak modułu PHP „fileinfo”. Zalecamy włączenie tego modułu, aby uzyskać najlepsze wyniki podczas wykrywania typów MIME.",
"Locale not working" => "Lokalizacja nie działa",
+"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 lokalny nie może włączyć ustawień regionalnych %s. Może to oznaczać, że wystąpiły problemy z niektórymi znakami w nazwach plików. Zalecamy instalację wymaganych pakietów na tym systemie w celu wsparcia %s.",
"Internet connection not working" => "Połączenie internetowe nie działa",
+"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." => "Ten serwer OwnCloud nie ma połączenia z Internetem. Oznacza to, że niektóre z funkcji, takich jak montowanie zewnętrznych zasobów, powiadomienia o aktualizacji lub 3-cie aplikacje mogą nie działać. Dostęp do plików z zewnątrz i wysyłanie powiadomienia e-mail nie może również działać. Sugerujemy, aby włączyć połączenia internetowego dla tego serwera, jeśli chcesz mieć wszystkie opcje.",
"Cron" => "Cron",
"Execute one task with each page loaded" => "Wykonuj jedno zadanie wraz z każdą wczytaną stroną",
+"cron.php is registered at a webcron service to call cron.php once a minute over http." => "cron.php jest zarejestrowany w serwisie webcron do uruchamiania cron.php raz na minutę przez http.",
+"Use systems cron service to call the cron.php file once a minute." => "Użyj systemowego cron-a do uruchamiania cron.php raz na minutę.",
"Sharing" => "Udostępnianie",
"Enable Share API" => "Włącz API udostępniania",
"Allow apps to use the Share API" => "Zezwalaj aplikacjom na korzystanie z API udostępniania",
"Allow links" => "Zezwalaj na odnośniki",
"Allow users to share items to the public with links" => "Zezwalaj użytkownikom na publiczne współdzielenie zasobów za pomocą odnośników",
"Allow public uploads" => "Pozwól na publiczne wczytywanie",
+"Allow users to enable others to upload into their publicly shared folders" => "Użytkownicy mogą włączyć dla innych wgrywanie do ich publicznych katalogów",
"Allow resharing" => "Zezwalaj na ponowne udostępnianie",
"Allow users to share items shared with them again" => "Zezwalaj użytkownikom na ponowne współdzielenie zasobów już z nimi współdzielonych",
"Allow users to share with anyone" => "Zezwalaj użytkownikom na współdzielenie z kimkolwiek",
@@ -60,6 +72,7 @@ $TRANSLATIONS = array(
"Security" => "Bezpieczeństwo",
"Enforce HTTPS" => "Wymuś HTTPS",
"Forces the clients to connect to %s via an encrypted connection." => "Wymusza na klientach na łączenie się %s za pośrednictwem połączenia szyfrowanego.",
+"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Proszę połącz się do twojego %s za pośrednictwem protokołu HTTPS, aby włączyć lub wyłączyć stosowanie protokołu SSL.",
"Log" => "Logi",
"Log level" => "Poziom logów",
"More" => "Więcej",
@@ -90,10 +103,20 @@ $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",
+"Upload new" => "Wczytaj nowe",
+"Select new from Files" => "Wybierz nowe z plików",
+"Remove image" => "Usuń zdjęcie",
+"Abort" => "Anuluj",
+"Choose as profile image" => "Wybierz zdjęcie profilu",
"Language" => "Język",
"Help translate" => "Pomóż w tłumaczeniu",
"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>" => "Użyj tego adresu do <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">dostępu do twoich plików przez WebDAV</a>",
"Encryption" => "Szyfrowanie",
+"The encryption app is no longer enabled, decrypt all your file" => "Aplikacja szyfrowanie nie jest włączona, odszyfruj wszystkie plik",
+"Log-in password" => "Hasło logowania",
+"Decrypt all Files" => "Odszyfruj wszystkie pliki",
"Login Name" => "Login",
"Create" => "Utwórz",
"Admin Recovery Password" => "Odzyskiwanie hasła administratora",
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 d72bca799dd679e63d66ecf7a7a1d5c754342588..b664d2be3db7ca554bb2b2814729e826e9404574 100644
--- a/settings/l10n/pt_PT.php
+++ b/settings/l10n/pt_PT.php
@@ -20,11 +20,14 @@ $TRANSLATIONS = array(
"Disable" => "Desactivar",
"Enable" => "Activar",
"Please wait...." => "Por favor aguarde...",
+"Error while disabling app" => "Erro enquanto desactivava a aplicação",
+"Error while enabling app" => "Erro enquanto activava a aplicação",
"Updating...." => "A Actualizar...",
"Error while updating app" => "Erro enquanto actualizava a aplicação",
"Error" => "Erro",
"Update" => "Actualizar",
"Updated" => "Actualizado",
+"Decrypting files... Please wait, this can take some time." => "A desencriptar os ficheiros... Por favor aguarde, esta operação pode demorar algum tempo.",
"Saving..." => "A guardar...",
"deleted" => "apagado",
"undo" => "desfazer",
@@ -97,11 +100,16 @@ $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",
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Use este endereço para <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">aceder aos seus ficheiros via WebDav</a>",
"Encryption" => "Encriptação",
+"The encryption app is no longer enabled, decrypt all your file" => "A aplicação de encriptação não se encontra mais disponível, desencripte o seu ficheiro",
+"Log-in password" => "Password de entrada",
+"Decrypt all Files" => "Desencriptar todos os ficheiros",
"Login Name" => "Nome de utilizador",
"Create" => "Criar",
"Admin Recovery Password" => "Recuperar password de administrador",
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 0d22ad10741e6cde863497b5fcfb9d2f505aeba4..cd44e5f94c52f24d6afb3aec412ed9230acf6bc0 100644
--- a/settings/l10n/sk_SK.php
+++ b/settings/l10n/sk_SK.php
@@ -20,6 +20,8 @@ $TRANSLATIONS = array(
"Disable" => "Zakázať",
"Enable" => "Zapnúť",
"Please wait...." => "Čakajte prosím...",
+"Error while disabling app" => "Chyba pri zablokovaní aplikácie",
+"Error while enabling app" => "Chyba pri povoľovaní aplikácie",
"Updating...." => "Aktualizujem...",
"Error while updating app" => "chyba pri aktualizácii aplikácie",
"Error" => "Chyba",
@@ -98,11 +100,13 @@ $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",
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Použite túto adresu <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">pre prístup k súborom cez WebDAV</a>",
"Encryption" => "Šifrovanie",
+"The encryption app is no longer enabled, decrypt all your file" => "Šifrovacia aplikácia nie je povolená, dešifrujte všetky vaše súbory",
"Log-in password" => "Prihlasovacie heslo",
"Decrypt all Files" => "Dešifrovať všetky súbory",
"Login Name" => "Prihlasovacie meno",
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/sq.php b/settings/l10n/sq.php
index facffb9ba18280bd6131585ee8bd303a6f849c61..d4726a29bb6e22c77a3ad459597ef4011e2f6f03 100644
--- a/settings/l10n/sq.php
+++ b/settings/l10n/sq.php
@@ -1,6 +1,7 @@
<?php
$TRANSLATIONS = array(
"Authentication error" => "Veprim i gabuar gjatë vërtetimit të identitetit",
+"Invalid request" => "Kërkesë e pavlefshme",
"Error" => "Veprim i gabuar",
"Update" => "Azhurno",
"undo" => "anulo",
@@ -11,6 +12,7 @@ $TRANSLATIONS = array(
"Password" => "Kodi",
"New password" => "Kodi i ri",
"Email" => "Email-i",
+"Other" => "Të tjera",
"Username" => "Përdoruesi"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
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 b7a280625c866ee19afae969310131a1fbf75225..4f8ad376db73977c93ac7d75c1ed8636219083e1 100644
--- a/settings/l10n/sv.php
+++ b/settings/l10n/sv.php
@@ -16,15 +16,24 @@ $TRANSLATIONS = array(
"Unable to add user to group %s" => "Kan inte lägga till användare i gruppen %s",
"Unable to remove user from group %s" => "Kan inte radera användare från gruppen %s",
"Couldn't update app." => "Kunde inte uppdatera appen.",
+"Wrong password" => "Fel lösenord",
+"No user supplied" => "Ingen användare angiven",
+"Please provide an admin recovery password, otherwise all user data will be lost" => "Ange ett återställningslösenord för administratören. Annars kommer all användardata förloras",
+"Wrong admin recovery password. Please check the password and try again." => "Felaktigt återställningslösenord för administratör. Kolla lösenordet och prova igen.",
+"Back-end doesn't support password change, but the users encryption key was successfully updated." => "Gränssnittet stödjer inte byte av lösenord, men användarnas krypteringsnyckel blev uppdaterad.",
+"Unable to change password" => "Kunde inte ändra lösenord",
"Update to {appversion}" => "Uppdatera till {appversion}",
"Disable" => "Deaktivera",
"Enable" => "Aktivera",
"Please wait...." => "Var god vänta...",
+"Error while disabling app" => "Fel vid inaktivering av app",
+"Error while enabling app" => "Fel vid aktivering av app",
"Updating...." => "Uppdaterar...",
"Error while updating app" => "Fel uppstod vid uppdatering av appen",
"Error" => "Fel",
"Update" => "Uppdatera",
"Updated" => "Uppdaterad",
+"Select a profile picture" => "Välj en profilbild",
"Decrypting files... Please wait, this can take some time." => "Dekrypterar filer... Vänligen vänta, detta kan ta en stund.",
"Saving..." => "Sparar...",
"deleted" => "raderad",
@@ -98,6 +107,13 @@ $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",
+"Upload new" => "Ladda upp ny",
+"Select new from Files" => "Välj ny från filer",
+"Remove image" => "Radera bild",
+"Either png or jpg. Ideally square but you will be able to crop it." => "Antingen png eller jpg. Helst fyrkantig, men du kommer att kunna beskära den.",
+"Abort" => "Avbryt",
+"Choose as profile image" => "Välj som 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/ug.php b/settings/l10n/ug.php
index b62b0a7930e511a63d2aca920128e70ad1325e9c..df9b7e988c1b13af695fb41e3c2e66ffc026411c 100644
--- a/settings/l10n/ug.php
+++ b/settings/l10n/ug.php
@@ -12,6 +12,7 @@ $TRANSLATIONS = array(
"Unable to delete user" => "ئىشلەتكۈچىنى ئۆچۈرەلمىدى",
"Language changed" => "تىل ئۆزگەردى",
"Invalid request" => "ئىناۋەتسىز ئىلتىماس",
+"Admins can't remove themself from the admin group" => "باشقۇرغۇچى ئۆزىنى باشقۇرۇش گۇرۇپپىسىدىن چىقىرىۋېتەلمەيدۇ",
"Unable to add user to group %s" => "ئىشلەتكۈچىنى %s گۇرۇپپىغا قوشالمايدۇ",
"Unable to remove user from group %s" => "ئىشلەتكۈچىنى %s گۇرۇپپىدىن چىقىرىۋېتەلمەيدۇ",
"Couldn't update app." => "ئەپنى يېڭىلىيالمايدۇ.",
@@ -32,6 +33,14 @@ $TRANSLATIONS = array(
"Group Admin" => "گۇرۇپپا باشقۇرغۇچى",
"Delete" => "ئۆچۈر",
"add group" => "گۇرۇپپا قوش",
+"A valid username must be provided" => "چوقۇم ئىناۋەتلىك ئىشلەتكۈچى ئىسمىدىن بىرنى تەمىنلەش كېرەك",
+"Error creating user" => "ئىشلەتكۈچى قۇرۇۋاتقاندا خاتالىق كۆرۈلدى",
+"A valid password must be provided" => "چوقۇم ئىناۋەتلىك ئىم تەمىنلەش كېرەك",
+"__language_name__" => "ئۇيغۇرچە",
+"Security Warning" => "بىخەتەرلىك ئاگاھلاندۇرۇش",
+"Setup Warning" => "ئاگاھلاندۇرۇش تەڭشەك",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "سىزنىڭ تور مۇلازىمېتىرىڭىز ھۆججەت قەدەمداشلاشقا يول قويىدىغان قىلىپ توغرا تەڭشەلمەپتۇ، چۈنكى WebDAV نىڭ ئېغىزى بۇزۇلغاندەك تۇرىدۇ.",
+"Module 'fileinfo' missing" => "بۆلەك «ھۆججەت ئۇچۇرى» يوقالغان",
"Sharing" => "ھەمبەھىر",
"Security" => "بىخەتەرلىك",
"Log" => "خاتىرە",
diff --git a/settings/l10n/uk.php b/settings/l10n/uk.php
index 314b7de6574368901c6537ef59dc404f49194867..adb46e3ee847b486c40ce470f76fd8a7cf549313 100644
--- a/settings/l10n/uk.php
+++ b/settings/l10n/uk.php
@@ -2,7 +2,7 @@
$TRANSLATIONS = array(
"Unable to load list from App Store" => "Не вдалося завантажити список з App Store",
"Authentication error" => "Помилка автентифікації",
-"Unable to change display name" => "Не вдалося змінити зображене ім'я",
+"Unable to change display name" => "Не вдалося змінити ім'я",
"Group already exists" => "Група вже існує",
"Unable to add group" => "Не вдалося додати групу",
"Email saved" => "Адресу збережено",
@@ -97,7 +97,7 @@ $TRANSLATIONS = array(
"Other" => "Інше",
"Username" => "Ім'я користувача",
"Storage" => "Сховище",
-"change display name" => "змінити зображене ім'я",
+"change display name" => "змінити ім'я",
"set new password" => "встановити новий пароль",
"Default" => "За замовчуванням"
);
diff --git a/settings/l10n/zh_CN.php b/settings/l10n/zh_CN.php
index 82dc8774dfcd2dddea95bbecb8595e3905339074..659c5bea1a601036a26e186cc364b51daf884f9c 100644
--- a/settings/l10n/zh_CN.php
+++ b/settings/l10n/zh_CN.php
@@ -20,11 +20,14 @@ $TRANSLATIONS = array(
"Disable" => "禁用",
"Enable" => "开启",
"Please wait...." => "请稍等....",
+"Error while disabling app" => "禁用 app 时出错",
+"Error while enabling app" => "启用 app 时出错",
"Updating...." => "正在更新....",
"Error while updating app" => "更新 app 时出错",
"Error" => "错误",
"Update" => "更新",
"Updated" => "已更新",
+"Decrypting files... Please wait, this can take some time." => "正在解密文件... 请稍等，可能需要一些时间。",
"Saving..." => "保存中",
"deleted" => "已经删除",
"undo" => "撤销",
@@ -97,11 +100,15 @@ $TRANSLATIONS = array(
"Email" => "电子邮件",
"Your email address" => "您的电子邮件",
"Fill in an email address to enable password recovery" => "填写电子邮件地址以启用密码恢复功能",
+"Profile picture" => "联系人图片",
"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>" => "使用该链接 <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">通过WebDAV访问你的文件</a>",
"Encryption" => "加密",
+"The encryption app is no longer enabled, decrypt all your file" => "加密 app 未启用，将解密您所有文件",
+"Log-in password" => "登录密码",
+"Decrypt all Files" => "解密所有文件",
"Login Name" => "登录名称",
"Create" => "创建",
"Admin Recovery Password" => "管理恢复密码",
diff --git a/settings/l10n/zh_TW.php b/settings/l10n/zh_TW.php
index 5cd3679751b3d2187a1d1724b66fb4b40a75f373..add2f1fe0029836d392f7cb8d9d8d3f20a9c37a7 100644
--- a/settings/l10n/zh_TW.php
+++ b/settings/l10n/zh_TW.php
@@ -75,7 +75,7 @@ $TRANSLATIONS = array(
"More" => "更多",
"Less" => "更少",
"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>." => "由 <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud 社群</a>開發，<a href=\"https://github.com/owncloud\" target=\"_blank\">原始碼</a>在 <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>." => "由 <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud 社群</a>開發，<a href=\"https://github.com/owncloud\" target=\"_blank\">原始碼</a>在 <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> 授權許可下發布。",
"Add your App" => "添加你的 App",
"More Apps" => "更多Apps",
"Select an App" => "選擇一個應用程式",
@@ -100,10 +100,11 @@ $TRANSLATIONS = array(
"Email" => "信箱",
"Your email address" => "您的電子郵件信箱",
"Fill in an email address to enable password recovery" => "請填入電子郵件信箱以便回復密碼",
+"Profile picture" => "個人資料照片",
"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>" => "使用<a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">這個網址</a>來透過 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\">透過 WebDAV 協定存取檔案</a>",
"Encryption" => "加密",
"The encryption app is no longer enabled, decrypt all your file" => "加密應用程式已經停用，請您解密您所有的檔案",
"Log-in password" => "登入密碼",
diff --git a/settings/personal.php b/settings/personal.php
index 112eaa3c748425e2538f60ef9f87e3c08614960b..670e18e20ef56497951ac5dc7489146b8423b322 100644
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -15,6 +15,11 @@ OC_Util::addScript( 'settings', 'personal' );
OC_Util::addStyle( 'settings', 'settings' );
OC_Util::addScript( '3rdparty', 'chosen/chosen.jquery.min' );
OC_Util::addStyle( '3rdparty', 'chosen' );
+\OC_Util::addScript('files', 'jquery.fileupload');
+if (\OC_Config::getValue('enable_avatars', true) === true) {
+ \OC_Util::addScript('3rdparty/Jcrop', 'jquery.Jcrop.min');
+ \OC_Util::addStyle('3rdparty/Jcrop', 'jquery.Jcrop.min');
+}
OC_App::setActiveNavigationEntry( 'personal' );
$storageInfo=OC_Helper::getStorageInfo('/');
@@ -84,6 +89,7 @@ $tmpl->assign('passwordChangeSupported', OC_User::canUserChangePassword(OC_User:
$tmpl->assign('displayNameChangeSupported', OC_User::canUserChangeDisplayName(OC_User::getUser()));
$tmpl->assign('displayName', OC_User::getDisplayName());
$tmpl->assign('enableDecryptAll' , $enableDecryptAll);
+$tmpl->assign('enableAvatars', \OC_Config::getValue('enable_avatars', true));
$forms=OC_App::getForms('personal');
$tmpl->assign('forms', array());
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/settings/templates/personal.php b/settings/templates/personal.php
index bad88142da9fb7526788f866dc5c72c16728865a..d2ca8154f160bdf20754e773c7c29588030c75c0 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -40,7 +40,7 @@ if($_['passwordChangeSupported']) {
<div id="passwordchanged"><?php echo $l->t('Your password was changed');?></div>
<div id="passworderror"><?php echo $l->t('Unable to change your password');?></div>
<input type="password" id="pass1" name="oldpassword" placeholder="<?php echo $l->t('Current password');?>" />
- <input type="password" id="pass2" name="password"
+ <input type="password" id="pass2" name="personal-password"
placeholder="<?php echo $l->t('New password');?>" data-typetoggle="#personal-show" />
<input type="checkbox" id="personal-show" name="show" /><label for="personal-show"></label>
<input id="passwordbutton" type="submit" value="<?php echo $l->t('Change password');?>" />
@@ -80,6 +80,27 @@ if($_['passwordChangeSupported']) {
}
?>
+<?php if ($_['enableAvatars']): ?>
+<form id="avatar" method="post" action="<?php p(\OC_Helper::linkToRoute('core_avatar_post')); ?>">
+ <fieldset class="personalblock">
+ <legend><strong><?php p($l->t('Profile picture')); ?></strong></legend>
+ <div id="displayavatar">
+ <div class="avatardiv"></div><br>
+ <div class="warning hidden"></div>
+ <div class="inlineblock button" id="uploadavatarbutton"><?php p($l->t('Upload new')); ?></div>
+ <input type="file" class="hidden" name="files[]" id="uploadavatar">
+ <div class="inlineblock button" id="selectavatar"><?php p($l->t('Select new from Files')); ?></div>
+ <div class="inlineblock button" id="removeavatar"><?php p($l->t('Remove image')); ?></div><br>
+ <?php p($l->t('Either png or jpg. Ideally square but you will be able to crop it.')); ?>
+ </div>
+ <div id="cropper" class="hidden">
+ <div class="inlineblock button" id="abortcropperbutton"><?php p($l->t('Abort')); ?></div>
+ <div class="inlineblock button primary" id="sendcropperbutton"><?php p($l->t('Choose as profile image')); ?></div>
+ </div>
+ </fieldset>
+</form>
+<?php endif; ?>
+
<form>
<fieldset class="personalblock">
<legend><strong><?php p($l->t('Language'));?></strong></legend>
diff --git a/settings/templates/users.php b/settings/templates/users.php
index 22450fdf25f4332a81e3ae82cf9ac6e4026b6c65..747d052a7bd959c7f99b534261f2db2e1f6a9627 100644
--- a/settings/templates/users.php
+++ b/settings/templates/users.php
@@ -81,6 +81,9 @@ $_['subadmingroups'] = array_flip($items);
<table class="hascontrols" data-groups="<?php p(json_encode($allGroups));?>">
<thead>
<tr>
+ <?php if ($_['enableAvatars']): ?>
+ <th id='headerAvatar'></th>
+ <?php endif; ?>
<th id='headerName'><?php p($l->t('Username'))?></th>
<th id="headerDisplayName"><?php p($l->t( 'Display Name' )); ?></th>
<th id="headerPassword"><?php p($l->t( 'Password' )); ?></th>
@@ -96,6 +99,9 @@ $_['subadmingroups'] = array_flip($items);
<?php foreach($_["users"] as $user): ?>
<tr data-uid="<?php p($user["name"]) ?>"
data-displayName="<?php p($user["displayName"]) ?>">
+ <?php if ($_['enableAvatars']): ?>
+ <td class="avatar"><div class="avatardiv"></div></td>
+ <?php endif; ?>
<td class="name"><?php p($user["name"]); ?></td>
<td class="displayName"><span><?php p($user["displayName"]); ?></span> <img class="svg action"
src="<?php p(image_path('core', 'actions/rename.svg'))?>"
diff --git a/settings/users.php b/settings/users.php
index 213d1eecfda01ef0d921531705dc923619fbcbbf..2f1c63a0b59856900109f277c0ff93e5aa3366bd 100644
--- a/settings/users.php
+++ b/settings/users.php
@@ -81,4 +81,5 @@ $tmpl->assign( 'quota_preset', $quotaPreset);
$tmpl->assign( 'default_quota', $defaultQuota);
$tmpl->assign( 'defaultQuotaIsUserDefined', $defaultQuotaIsUserDefined);
$tmpl->assign( 'recoveryAdminEnabled', $recoveryAdminEnabled);
+$tmpl->assign('enableAvatars', \OC_Config::getValue('enable_avatars', true));
$tmpl->printPage();
diff --git a/status.php b/status.php
index 179fe3f49f2070f37a2b0f2a60092eabdbc1e06e..88422100f14cf96afb6b637ecb139520efa8807e 100644
--- a/status.php
+++ b/status.php
@@ -33,8 +33,11 @@ try {
'version'=>implode('.', OC_Util::getVersion()),
'versionstring'=>OC_Util::getVersionString(),
'edition'=>OC_Util::getEditionString());
-
- echo(json_encode($values));
+ if (OC::$CLI) {
+ print_r($values);
+ } else {
+ echo(json_encode($values));
+ }
} catch (Exception $ex) {
OC_Response::setStatus(OC_Response::STATUS_INTERNAL_SERVER_ERROR);
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index fb667263e45474a3dab4b0c2f26eaa4eee36f071..581cfcff9f304ffcc7704b0c3920157aa4859eac 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -1,7 +1,5 @@
<?php
-global $RUNTIME_NOAPPS;
-$RUNTIME_NOAPPS = true;
define('PHPUNIT_RUN', 1);
diff --git a/tests/data/db_structure.xml b/tests/data/db_structure.xml
index 8f6dc5e2ecd539b9571ec8a66da28563c97208e7..2e83bbb78c7577d3aef0c5b6039f12598ef36073 100644
--- a/tests/data/db_structure.xml
+++ b/tests/data/db_structure.xml
@@ -178,4 +178,25 @@
</declaration>
</table>
+ <table>
+ <name>*dbprefix*timestamp</name>
+ <declaration>
+ <field>
+ <name>id</name>
+ <autoincrement>1</autoincrement>
+ <type>integer</type>
+ <default>0</default>
+ <notnull>true</notnull>
+ <length>4</length>
+ </field>
+
+ <field>
+ <name>timestamptest</name>
+ <type>timestamp</type>
+ <default></default>
+ <notnull>false</notnull>
+ </field>
+ </declaration>
+ </table>
+
</database>
diff --git a/tests/data/db_structure2.xml b/tests/data/db_structure2.xml
index 6f12f81f477d94cb7a118288d9a41c0285f0ccdc..bbfb24985cb1c67c4628f4b10448b0df35bc56d9 100644
--- a/tests/data/db_structure2.xml
+++ b/tests/data/db_structure2.xml
@@ -75,4 +75,25 @@
</table>
+ <table>
+ <name>*dbprefix*timestamp</name>
+ <declaration>
+ <field>
+ <name>id</name>
+ <autoincrement>1</autoincrement>
+ <type>integer</type>
+ <default>0</default>
+ <notnull>true</notnull>
+ <length>4</length>
+ </field>
+
+ <field>
+ <name>timestamptest</name>
+ <type>timestamp</type>
+ <default></default>
+ <notnull>false</notnull>
+ </field>
+ </declaration>
+ </table>
+
</database>
diff --git a/tests/data/testavatar.png b/tests/data/testavatar.png
new file mode 100644
index 0000000000000000000000000000000000000000..24770fb634f028fbff8c0625e987ead5bb0471c9
Binary files /dev/null and b/tests/data/testavatar.png differ
diff --git a/tests/data/testcal.ics b/tests/data/testcal.ics
new file mode 100644
index 0000000000000000000000000000000000000000..e05f01ba1c2755e9c7f02a6959e107fc2d97c61a
--- /dev/null
+++ b/tests/data/testcal.ics
@@ -0,0 +1,13 @@
+BEGIN:VCALENDAR
+PRODID:-//some random cal software//EN
+VERSION:2.0
+BEGIN:VEVENT
+CREATED:20130102T120000Z
+LAST-MODIFIED:20130102T120000Z
+DTSTAMP:20130102T120000Z
+UID:f106ecdf-c716-43ef-9d94-4e6f19f2fcfb
+SUMMARY:a test cal file
+DTSTART;VALUE=DATE:20130101
+DTEND;VALUE=DATE:20130102
+END:VEVENT
+END:VCALENDAR
\ No newline at end of file
diff --git a/tests/data/testcontact.vcf b/tests/data/testcontact.vcf
new file mode 100644
index 0000000000000000000000000000000000000000..2af963d6916eecf7d2ee39a2c3018f64b171c6e6
--- /dev/null
+++ b/tests/data/testcontact.vcf
@@ -0,0 +1,6 @@
+BEGIN:VCARD
+VERSION:3.0
+PRODID:-//some random contact software//EN
+N:def;abc;;;
+FN:abc def
+END:VCARD
\ No newline at end of file
diff --git a/tests/lib/appframework/AppTest.php b/tests/lib/appframework/AppTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..80abaefc43b0a4e285a982facc079b61d6a1e6d5
--- /dev/null
+++ b/tests/lib/appframework/AppTest.php
@@ -0,0 +1,99 @@
+<?php
+
+/**
+ * ownCloud - App Framework
+ *
+ * @author Bernhard Posselt
+ * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ *
+ * 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/>.
+ *
+ */
+
+
+namespace OC\AppFramework;
+
+
+class AppTest extends \PHPUnit_Framework_TestCase {
+
+ private $container;
+ private $api;
+ private $controller;
+ private $dispatcher;
+ private $params;
+ private $headers;
+ private $output;
+ private $controllerName;
+ private $controllerMethod;
+
+ protected function setUp() {
+ $this->container = new \OC\AppFramework\DependencyInjection\DIContainer('test');
+ $this->controller = $this->getMockBuilder(
+ 'OC\AppFramework\Controller\Controller')
+ ->disableOriginalConstructor()
+ ->getMock();
+ $this->dispatcher = $this->getMockBuilder(
+ 'OC\AppFramework\Http\Dispatcher')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+
+ $this->headers = array('key' => 'value');
+ $this->output = 'hi';
+ $this->controllerName = 'Controller';
+ $this->controllerMethod = 'method';
+
+ $this->container[$this->controllerName] = $this->controller;
+ $this->container['Dispatcher'] = $this->dispatcher;
+ }
+
+
+ public function testControllerNameAndMethodAreBeingPassed(){
+ $return = array(null, array(), null);
+ $this->dispatcher->expects($this->once())
+ ->method('dispatch')
+ ->with($this->equalTo($this->controller),
+ $this->equalTo($this->controllerMethod))
+ ->will($this->returnValue($return));
+
+ $this->expectOutputString('');
+
+ App::main($this->controllerName, $this->controllerMethod, array(),
+ $this->container);
+ }
+
+
+ /*
+ FIXME: this complains about shit headers which are already sent because
+ of the content length. Would be cool if someone could fix this
+
+ public function testOutputIsPrinted(){
+ $return = array(null, array(), $this->output);
+ $this->dispatcher->expects($this->once())
+ ->method('dispatch')
+ ->with($this->equalTo($this->controller),
+ $this->equalTo($this->controllerMethod))
+ ->will($this->returnValue($return));
+
+ $this->expectOutputString($this->output);
+
+ App::main($this->controllerName, $this->controllerMethod, array(),
+ $this->container);
+ }
+ */
+
+ // FIXME: if someone manages to test the headers output, I'd be grateful
+
+
+}
diff --git a/tests/lib/appframework/controller/ControllerTest.php b/tests/lib/appframework/controller/ControllerTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..4441bddfca9f4685385744aafa29671592222843
--- /dev/null
+++ b/tests/lib/appframework/controller/ControllerTest.php
@@ -0,0 +1,155 @@
+<?php
+
+/**
+ * ownCloud - App Framework
+ *
+ * @author Bernhard Posselt
+ * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ *
+ * 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/>.
+ *
+ */
+
+
+namespace Test\AppFramework\Controller;
+
+use OC\AppFramework\Http\Request;
+use OC\AppFramework\Controller\Controller;
+use OCP\AppFramework\Http\TemplateResponse;
+
+
+//require_once __DIR__ . "/../classloader.php";
+
+
+class ChildController extends Controller {};
+
+class ControllerTest extends \PHPUnit_Framework_TestCase {
+
+ /**
+ * @var Controller
+ */
+ private $controller;
+ private $api;
+
+ protected function setUp(){
+ $request = new Request(
+ array(
+ 'get' => array('name' => 'John Q. Public', 'nickname' => 'Joey'),
+ 'post' => array('name' => 'Jane Doe', 'nickname' => 'Janey'),
+ 'urlParams' => array('name' => 'Johnny Weissmüller'),
+ 'files' => array('file' => 'filevalue'),
+ 'env' => array('PATH' => 'daheim'),
+ 'session' => array('sezession' => 'kein'),
+ 'method' => 'hi',
+ )
+ );
+
+ $this->api = $this->getMock('OC\AppFramework\Core\API',
+ array('getAppName'), array('test'));
+ $this->api->expects($this->any())
+ ->method('getAppName')
+ ->will($this->returnValue('apptemplate_advanced'));
+
+ $this->controller = new ChildController($this->api, $request);
+ }
+
+
+ public function testParamsGet(){
+ $this->assertEquals('Johnny Weissmüller', $this->controller->params('name', 'Tarzan'));
+ }
+
+
+ public function testParamsGetDefault(){
+ $this->assertEquals('Tarzan', $this->controller->params('Ape Man', 'Tarzan'));
+ }
+
+
+ public function testParamsFile(){
+ $this->assertEquals('filevalue', $this->controller->params('file', 'filevalue'));
+ }
+
+
+ public function testGetUploadedFile(){
+ $this->assertEquals('filevalue', $this->controller->getUploadedFile('file'));
+ }
+
+
+
+ public function testGetUploadedFileDefault(){
+ $this->assertEquals('default', $this->controller->params('files', 'default'));
+ }
+
+
+ public function testGetParams(){
+ $params = array(
+ 'name' => 'Johnny Weissmüller',
+ 'nickname' => 'Janey',
+ );
+
+ $this->assertEquals($params, $this->controller->getParams());
+ }
+
+
+ public function testRender(){
+ $this->assertTrue($this->controller->render('') instanceof TemplateResponse);
+ }
+
+
+ public function testSetParams(){
+ $params = array('john' => 'foo');
+ $response = $this->controller->render('home', $params);
+
+ $this->assertEquals($params, $response->getParams());
+ }
+
+
+ public function testRenderRenderAs(){
+ $ocTpl = $this->getMock('Template', array('fetchPage'));
+ $ocTpl->expects($this->once())
+ ->method('fetchPage');
+
+ $api = $this->getMock('OC\AppFramework\Core\API',
+ array('getAppName', 'getTemplate'), array('app'));
+ $api->expects($this->any())
+ ->method('getAppName')
+ ->will($this->returnValue('app'));
+ $api->expects($this->once())
+ ->method('getTemplate')
+ ->with($this->equalTo('home'), $this->equalTo('admin'), $this->equalTo('app'))
+ ->will($this->returnValue($ocTpl));
+
+ $this->controller = new ChildController($api, new Request());
+ $this->controller->render('home', array(), 'admin')->render();
+ }
+
+
+ public function testRenderHeaders(){
+ $headers = array('one', 'two');
+ $response = $this->controller->render('', array(), '', $headers);
+
+ $this->assertTrue(in_array($headers[0], $response->getHeaders()));
+ $this->assertTrue(in_array($headers[1], $response->getHeaders()));
+ }
+
+
+ public function testGetRequestMethod(){
+ $this->assertEquals('hi', $this->controller->method());
+ }
+
+
+ public function testGetEnvVariable(){
+ $this->assertEquals('daheim', $this->controller->env('PATH'));
+ }
+
+}
diff --git a/tests/lib/appframework/dependencyinjection/DIContainerTest.php b/tests/lib/appframework/dependencyinjection/DIContainerTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..25fdd202839340ad233dff21caff16b8bb01e3b8
--- /dev/null
+++ b/tests/lib/appframework/dependencyinjection/DIContainerTest.php
@@ -0,0 +1,98 @@
+<?php
+
+/**
+ * ownCloud - App Framework
+ *
+ * @author Bernhard Posselt
+ * @author Morris Jobke
+ * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ * @copyright 2013 Morris Jobke morris.jobke@gmail.com
+ *
+ * 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/>.
+ *
+ */
+
+
+namespace OC\AppFramework\DependencyInjection;
+
+use \OC\AppFramework\Http\Request;
+
+
+//require_once(__DIR__ . "/../classloader.php");
+
+
+class DIContainerTest extends \PHPUnit_Framework_TestCase {
+
+ private $container;
+
+ protected function setUp(){
+ $this->container = new DIContainer('name');
+ $this->api = $this->getMock('OC\AppFramework\Core\API', array('getTrans'), array('hi'));
+ }
+
+ private function exchangeAPI(){
+ $this->api->expects($this->any())
+ ->method('getTrans')
+ ->will($this->returnValue('yo'));
+ $this->container['API'] = $this->api;
+ }
+
+ public function testProvidesAPI(){
+ $this->assertTrue(isset($this->container['API']));
+ }
+
+
+ public function testProvidesRequest(){
+ $this->assertTrue(isset($this->container['Request']));
+ }
+
+
+ public function testProvidesSecurityMiddleware(){
+ $this->assertTrue(isset($this->container['SecurityMiddleware']));
+ }
+
+
+ public function testProvidesMiddlewareDispatcher(){
+ $this->assertTrue(isset($this->container['MiddlewareDispatcher']));
+ }
+
+
+ public function testProvidesAppName(){
+ $this->assertTrue(isset($this->container['AppName']));
+ }
+
+
+ public function testAppNameIsSetCorrectly(){
+ $this->assertEquals('name', $this->container['AppName']);
+ }
+
+
+ public function testMiddlewareDispatcherIncludesSecurityMiddleware(){
+ $this->container['Request'] = new Request();
+ $security = $this->container['SecurityMiddleware'];
+ $dispatcher = $this->container['MiddlewareDispatcher'];
+
+ $this->assertContains($security, $dispatcher->getMiddlewares());
+ }
+
+
+ public function testMiddlewareDispatcherDoesNotIncludeTwigWhenTplDirectoryNotSet(){
+ $this->container['Request'] = new Request();
+ $this->exchangeAPI();
+ $dispatcher = $this->container['MiddlewareDispatcher'];
+
+ $this->assertEquals(1, count($dispatcher->getMiddlewares()));
+ }
+
+}
diff --git a/tests/lib/appframework/http/DispatcherTest.php b/tests/lib/appframework/http/DispatcherTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..849b0ca97a68dcb1bb0456c0c87e1750427065cd
--- /dev/null
+++ b/tests/lib/appframework/http/DispatcherTest.php
@@ -0,0 +1,218 @@
+<?php
+
+/**
+ * ownCloud - App Framework
+ *
+ * @author Bernhard Posselt
+ * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ *
+ * 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/>.
+ *
+ */
+
+
+namespace OC\AppFramework\Http;
+
+use OC\AppFramework\Core\API;
+use OC\AppFramework\Middleware\MiddlewareDispatcher;
+
+//require_once(__DIR__ . "/../classloader.php");
+
+
+class DispatcherTest extends \PHPUnit_Framework_TestCase {
+
+
+ private $middlewareDispatcher;
+ private $dispatcher;
+ private $controllerMethod;
+ private $response;
+ private $lastModified;
+ private $etag;
+ private $http;
+
+ protected function setUp() {
+ $this->controllerMethod = 'test';
+
+ $api = $this->getMockBuilder(
+ '\OC\AppFramework\Core\API')
+ ->disableOriginalConstructor()
+ ->getMock();
+ $request = $this->getMockBuilder(
+ '\OC\AppFramework\Http\Request')
+ ->disableOriginalConstructor()
+ ->getMock();
+ $this->http = $this->getMockBuilder(
+ '\OC\AppFramework\Http\Http')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $this->middlewareDispatcher = $this->getMockBuilder(
+ '\OC\AppFramework\Middleware\MiddlewareDispatcher')
+ ->disableOriginalConstructor()
+ ->getMock();
+ $this->controller = $this->getMock(
+ '\OC\AppFramework\Controller\Controller',
+ array($this->controllerMethod), array($api, $request));
+
+ $this->dispatcher = new Dispatcher(
+ $this->http, $this->middlewareDispatcher);
+
+ $this->response = $this->getMockBuilder(
+ '\OCP\AppFramework\Http\Response')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $this->lastModified = new \DateTime(null, new \DateTimeZone('GMT'));
+ $this->etag = 'hi';
+ }
+
+
+ private function setMiddlewareExpections($out=null,
+ $httpHeaders=null, $responseHeaders=array(),
+ $ex=false, $catchEx=true) {
+
+ if($ex) {
+ $exception = new \Exception();
+ $this->middlewareDispatcher->expects($this->once())
+ ->method('beforeController')
+ ->with($this->equalTo($this->controller),
+ $this->equalTo($this->controllerMethod))
+ ->will($this->throwException($exception));
+ if($catchEx) {
+ $this->middlewareDispatcher->expects($this->once())
+ ->method('afterException')
+ ->with($this->equalTo($this->controller),
+ $this->equalTo($this->controllerMethod),
+ $this->equalTo($exception))
+ ->will($this->returnValue($this->response));
+ } else {
+ $this->middlewareDispatcher->expects($this->once())
+ ->method('afterException')
+ ->with($this->equalTo($this->controller),
+ $this->equalTo($this->controllerMethod),
+ $this->equalTo($exception))
+ ->will($this->returnValue(null));
+ return;
+ }
+ } else {
+ $this->middlewareDispatcher->expects($this->once())
+ ->method('beforeController')
+ ->with($this->equalTo($this->controller),
+ $this->equalTo($this->controllerMethod));
+ $this->controller->expects($this->once())
+ ->method($this->controllerMethod)
+ ->will($this->returnValue($this->response));
+ }
+
+ $this->response->expects($this->once())
+ ->method('render')
+ ->will($this->returnValue($out));
+ $this->response->expects($this->once())
+ ->method('getStatus')
+ ->will($this->returnValue(Http::STATUS_OK));
+ $this->response->expects($this->once())
+ ->method('getLastModified')
+ ->will($this->returnValue($this->lastModified));
+ $this->response->expects($this->once())
+ ->method('getETag')
+ ->will($this->returnValue($this->etag));
+ $this->response->expects($this->once())
+ ->method('getHeaders')
+ ->will($this->returnValue($responseHeaders));
+ $this->http->expects($this->once())
+ ->method('getStatusHeader')
+ ->with($this->equalTo(Http::STATUS_OK),
+ $this->equalTo($this->lastModified),
+ $this->equalTo($this->etag))
+ ->will($this->returnValue($httpHeaders));
+
+ $this->middlewareDispatcher->expects($this->once())
+ ->method('afterController')
+ ->with($this->equalTo($this->controller),
+ $this->equalTo($this->controllerMethod),
+ $this->equalTo($this->response))
+ ->will($this->returnValue($this->response));
+
+ $this->middlewareDispatcher->expects($this->once())
+ ->method('afterController')
+ ->with($this->equalTo($this->controller),
+ $this->equalTo($this->controllerMethod),
+ $this->equalTo($this->response))
+ ->will($this->returnValue($this->response));
+
+ $this->middlewareDispatcher->expects($this->once())
+ ->method('beforeOutput')
+ ->with($this->equalTo($this->controller),
+ $this->equalTo($this->controllerMethod),
+ $this->equalTo($out))
+ ->will($this->returnValue($out));
+
+
+ }
+
+
+ public function testDispatcherReturnsArrayWith2Entries() {
+ $this->setMiddlewareExpections();
+
+ $response = $this->dispatcher->dispatch($this->controller,
+ $this->controllerMethod);
+ $this->assertNull($response[0]);
+ $this->assertEquals(array(), $response[1]);
+ $this->assertNull($response[2]);
+ }
+
+
+ public function testHeadersAndOutputAreReturned(){
+ $out = 'yo';
+ $httpHeaders = 'Http';
+ $responseHeaders = array('hell' => 'yeah');
+ $this->setMiddlewareExpections($out, $httpHeaders, $responseHeaders);
+
+ $response = $this->dispatcher->dispatch($this->controller,
+ $this->controllerMethod);
+
+ $this->assertEquals($httpHeaders, $response[0]);
+ $this->assertEquals($responseHeaders, $response[1]);
+ $this->assertEquals($out, $response[2]);
+ }
+
+
+ public function testExceptionCallsAfterException() {
+ $out = 'yo';
+ $httpHeaders = 'Http';
+ $responseHeaders = array('hell' => 'yeah');
+ $this->setMiddlewareExpections($out, $httpHeaders, $responseHeaders, true);
+
+ $response = $this->dispatcher->dispatch($this->controller,
+ $this->controllerMethod);
+
+ $this->assertEquals($httpHeaders, $response[0]);
+ $this->assertEquals($responseHeaders, $response[1]);
+ $this->assertEquals($out, $response[2]);
+ }
+
+
+ public function testExceptionThrowsIfCanNotBeHandledByAfterException() {
+ $out = 'yo';
+ $httpHeaders = 'Http';
+ $responseHeaders = array('hell' => 'yeah');
+ $this->setMiddlewareExpections($out, $httpHeaders, $responseHeaders, true, false);
+
+ $this->setExpectedException('\Exception');
+ $response = $this->dispatcher->dispatch($this->controller,
+ $this->controllerMethod);
+
+ }
+
+}
diff --git a/tests/lib/appframework/http/DownloadResponseTest.php b/tests/lib/appframework/http/DownloadResponseTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..64fe7992b6a83d8f50d345ab61d79e1805ac8b9f
--- /dev/null
+++ b/tests/lib/appframework/http/DownloadResponseTest.php
@@ -0,0 +1,51 @@
+<?php
+
+/**
+ * ownCloud - App Framework
+ *
+ * @author Bernhard Posselt
+ * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ *
+ * 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/>.
+ *
+ */
+
+
+namespace OC\AppFramework\Http;
+
+
+//require_once(__DIR__ . "/../classloader.php");
+
+
+class ChildDownloadResponse extends DownloadResponse {};
+
+
+class DownloadResponseTest extends \PHPUnit_Framework_TestCase {
+
+ protected $response;
+
+ protected function setUp(){
+ $this->response = new ChildDownloadResponse('file', 'content');
+ }
+
+
+ public function testHeaders() {
+ $headers = $this->response->getHeaders();
+
+ $this->assertContains('attachment; filename="file"', $headers['Content-Disposition']);
+ $this->assertContains('content', $headers['Content-Type']);
+ }
+
+
+}
diff --git a/tests/lib/appframework/http/HttpTest.php b/tests/lib/appframework/http/HttpTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..382d511b116449aa0ecda0047db07110ebbd93ad
--- /dev/null
+++ b/tests/lib/appframework/http/HttpTest.php
@@ -0,0 +1,87 @@
+<?php
+
+/**
+ * ownCloud - App Framework
+ *
+ * @author Bernhard Posselt
+ * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ *
+ * 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/>.
+ *
+ */
+
+
+namespace OC\AppFramework\Http;
+
+
+//require_once(__DIR__ . "/../classloader.php");
+
+
+
+class HttpTest extends \PHPUnit_Framework_TestCase {
+
+ private $server;
+ private $http;
+
+ protected function setUp(){
+ $this->server = array();
+ $this->http = new Http($this->server);
+ }
+
+
+ public function testProtocol() {
+ $header = $this->http->getStatusHeader(Http::STATUS_TEMPORARY_REDIRECT);
+ $this->assertEquals('HTTP/1.1 307 Temporary Redirect', $header);
+ }
+
+
+ public function testProtocol10() {
+ $this->http = new Http($this->server, 'HTTP/1.0');
+ $header = $this->http->getStatusHeader(Http::STATUS_OK);
+ $this->assertEquals('HTTP/1.0 200 OK', $header);
+ }
+
+
+ public function testEtagMatchReturnsNotModified() {
+ $http = new Http(array('HTTP_IF_NONE_MATCH' => 'hi'));
+
+ $header = $http->getStatusHeader(Http::STATUS_OK, null, 'hi');
+ $this->assertEquals('HTTP/1.1 304 Not Modified', $header);
+ }
+
+
+ public function testLastModifiedMatchReturnsNotModified() {
+ $dateTime = new \DateTime(null, new \DateTimeZone('GMT'));
+ $dateTime->setTimestamp('12');
+
+ $http = new Http(
+ array(
+ 'HTTP_IF_MODIFIED_SINCE' => 'Thu, 01 Jan 1970 00:00:12 +0000')
+ );
+
+ $header = $http->getStatusHeader(Http::STATUS_OK, $dateTime);
+ $this->assertEquals('HTTP/1.1 304 Not Modified', $header);
+ }
+
+
+
+ public function testTempRedirectBecomesFoundInHttp10() {
+ $http = new Http(array(), 'HTTP/1.0');
+
+ $header = $http->getStatusHeader(Http::STATUS_TEMPORARY_REDIRECT);
+ $this->assertEquals('HTTP/1.0 302 Found', $header);
+ }
+ // TODO: write unittests for http codes
+
+}
diff --git a/tests/lib/appframework/http/JSONResponseTest.php b/tests/lib/appframework/http/JSONResponseTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..534c54cbcee726f473c1b55d59162d95b20e01bb
--- /dev/null
+++ b/tests/lib/appframework/http/JSONResponseTest.php
@@ -0,0 +1,98 @@
+<?php
+
+/**
+ * ownCloud - App Framework
+ *
+ * @author Bernhard Posselt
+ * @author Morris Jobke
+ * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ * @copyright 2013 Morris Jobke morris.jobke@gmail.com
+ *
+ * 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/>.
+ *
+ */
+
+
+namespace OC\AppFramework\Http;
+
+
+use OCP\AppFramework\Http\JSONResponse;
+
+//require_once(__DIR__ . "/../classloader.php");
+
+
+
+class JSONResponseTest extends \PHPUnit_Framework_TestCase {
+
+ /**
+ * @var JSONResponse
+ */
+ private $json;
+
+ protected function setUp() {
+ $this->json = new JSONResponse();
+ }
+
+
+ public function testHeader() {
+ $headers = $this->json->getHeaders();
+ $this->assertEquals('application/json; charset=utf-8', $headers['Content-type']);
+ }
+
+
+ public function testSetData() {
+ $params = array('hi', 'yo');
+ $this->json->setData($params);
+
+ $this->assertEquals(array('hi', 'yo'), $this->json->getData());
+ }
+
+
+ public function testSetRender() {
+ $params = array('test' => 'hi');
+ $this->json->setData($params);
+
+ $expected = '{"test":"hi"}';
+
+ $this->assertEquals($expected, $this->json->render());
+ }
+
+
+ public function testRender() {
+ $params = array('test' => 'hi');
+ $this->json->setData($params);
+
+ $expected = '{"test":"hi"}';
+
+ $this->assertEquals($expected, $this->json->render());
+ }
+
+
+ public function testShouldHaveXContentHeaderByDefault() {
+ $headers = $this->json->getHeaders();
+ $this->assertEquals('nosniff', $headers['X-Content-Type-Options']);
+ }
+
+
+ public function testConstructorAllowsToSetData() {
+ $data = array('hi');
+ $code = 300;
+ $response = new JSONResponse($data, $code);
+
+ $expected = '["hi"]';
+ $this->assertEquals($expected, $response->render());
+ $this->assertEquals($code, $response->getStatus());
+ }
+
+}
diff --git a/tests/lib/appframework/http/RedirectResponseTest.php b/tests/lib/appframework/http/RedirectResponseTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..1946655b0fa54ea6c95ab9cdb3fff6e0fbefe2a9
--- /dev/null
+++ b/tests/lib/appframework/http/RedirectResponseTest.php
@@ -0,0 +1,55 @@
+<?php
+
+/**
+ * ownCloud - App Framework
+ *
+ * @author Bernhard Posselt
+ * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ *
+ * 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/>.
+ *
+ */
+
+
+namespace OC\AppFramework\Http;
+
+
+//require_once(__DIR__ . "/../classloader.php");
+
+
+
+class RedirectResponseTest extends \PHPUnit_Framework_TestCase {
+
+
+ protected $response;
+
+ protected function setUp(){
+ $this->response = new RedirectResponse('/url');
+ }
+
+
+ public function testHeaders() {
+ $headers = $this->response->getHeaders();
+ $this->assertEquals('/url', $headers['Location']);
+ $this->assertEquals(Http::STATUS_TEMPORARY_REDIRECT,
+ $this->response->getStatus());
+ }
+
+
+ public function testGetRedirectUrl(){
+ $this->assertEquals('/url', $this->response->getRedirectUrl());
+ }
+
+
+}
diff --git a/tests/lib/appframework/http/RequestTest.php b/tests/lib/appframework/http/RequestTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..0371c870cf292682b70a35a35fac70d3020f2468
--- /dev/null
+++ b/tests/lib/appframework/http/RequestTest.php
@@ -0,0 +1,76 @@
+<?php
+/**
+ * Copyright (c) 2013 Thomas Tanghus (thomas@tanghus.net)
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\AppFramework\Http;
+
+
+class RequestTest extends \PHPUnit_Framework_TestCase {
+
+ public function testRequestAccessors() {
+ $vars = array(
+ 'get' => array('name' => 'John Q. Public', 'nickname' => 'Joey'),
+ );
+
+ $request = new Request($vars);
+
+ // Countable
+ $this->assertEquals(2, count($request));
+ // Array access
+ $this->assertEquals('Joey', $request['nickname']);
+ // "Magic" accessors
+ $this->assertEquals('Joey', $request->{'nickname'});
+ $this->assertTrue(isset($request['nickname']));
+ $this->assertTrue(isset($request->{'nickname'}));
+ $this->assertEquals(false, isset($request->{'flickname'}));
+ // Only testing 'get', but same approach for post, files etc.
+ $this->assertEquals('Joey', $request->get['nickname']);
+ // Always returns null if variable not set.
+ $this->assertEquals(null, $request->{'flickname'});
+ }
+
+ // urlParams has precedence over POST which has precedence over GET
+ public function testPrecedence() {
+ $vars = array(
+ 'get' => array('name' => 'John Q. Public', 'nickname' => 'Joey'),
+ 'post' => array('name' => 'Jane Doe', 'nickname' => 'Janey'),
+ 'urlParams' => array('user' => 'jw', 'name' => 'Johnny Weissmüller'),
+ );
+
+ $request = new Request($vars);
+
+ $this->assertEquals(3, count($request));
+ $this->assertEquals('Janey', $request->{'nickname'});
+ $this->assertEquals('Johnny Weissmüller', $request->{'name'});
+ }
+
+
+ /**
+ * @expectedException RuntimeException
+ */
+ public function testImmutableArrayAccess() {
+ $vars = array(
+ 'get' => array('name' => 'John Q. Public', 'nickname' => 'Joey'),
+ );
+
+ $request = new Request($vars);
+ $request['nickname'] = 'Janey';
+ }
+
+ /**
+ * @expectedException RuntimeException
+ */
+ public function testImmutableMagicAccess() {
+ $vars = array(
+ 'get' => array('name' => 'John Q. Public', 'nickname' => 'Joey'),
+ );
+
+ $request = new Request($vars);
+ $request->{'nickname'} = 'Janey';
+ }
+
+}
diff --git a/tests/lib/appframework/http/ResponseTest.php b/tests/lib/appframework/http/ResponseTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..7e09086f80172d3f4bd0a9245434560347b47363
--- /dev/null
+++ b/tests/lib/appframework/http/ResponseTest.php
@@ -0,0 +1,120 @@
+<?php
+
+/**
+ * ownCloud - App Framework
+ *
+ * @author Bernhard Posselt
+ * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ *
+ * 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/>.
+ *
+ */
+
+
+namespace OC\AppFramework\Http;
+
+
+use OCP\AppFramework\Http\Response;
+
+
+class ResponseTest extends \PHPUnit_Framework_TestCase {
+
+ /**
+ * @var \OCP\AppFramework\Http\Response
+ */
+ private $childResponse;
+
+ protected function setUp(){
+ $this->childResponse = new Response();
+ }
+
+
+ public function testAddHeader(){
+ $this->childResponse->addHeader('hello', 'world');
+ $headers = $this->childResponse->getHeaders();
+ $this->assertEquals('world', $headers['hello']);
+ }
+
+
+ public function testAddHeaderValueNullDeletesIt(){
+ $this->childResponse->addHeader('hello', 'world');
+ $this->childResponse->addHeader('hello', null);
+ $this->assertEquals(1, count($this->childResponse->getHeaders()));
+ }
+
+
+ public function testCacheHeadersAreDisabledByDefault(){
+ $headers = $this->childResponse->getHeaders();
+ $this->assertEquals('no-cache, must-revalidate', $headers['Cache-Control']);
+ }
+
+
+ public function testRenderReturnNullByDefault(){
+ $this->assertEquals(null, $this->childResponse->render());
+ }
+
+
+ public function testGetStatus() {
+ $default = $this->childResponse->getStatus();
+
+ $this->childResponse->setStatus(Http::STATUS_NOT_FOUND);
+
+ $this->assertEquals(Http::STATUS_OK, $default);
+ $this->assertEquals(Http::STATUS_NOT_FOUND, $this->childResponse->getStatus());
+ }
+
+
+ public function testGetEtag() {
+ $this->childResponse->setEtag('hi');
+ $this->assertEquals('hi', $this->childResponse->getEtag());
+ }
+
+
+ public function testGetLastModified() {
+ $lastModified = new \DateTime(null, new \DateTimeZone('GMT'));
+ $lastModified->setTimestamp(1);
+ $this->childResponse->setLastModified($lastModified);
+ $this->assertEquals($lastModified, $this->childResponse->getLastModified());
+ }
+
+
+
+ public function testCacheSecondsZero() {
+ $this->childResponse->cacheFor(0);
+
+ $headers = $this->childResponse->getHeaders();
+ $this->assertEquals('no-cache, must-revalidate', $headers['Cache-Control']);
+ }
+
+
+ public function testCacheSeconds() {
+ $this->childResponse->cacheFor(33);
+
+ $headers = $this->childResponse->getHeaders();
+ $this->assertEquals('max-age=33, must-revalidate',
+ $headers['Cache-Control']);
+ }
+
+
+
+ public function testEtagLastModifiedHeaders() {
+ $lastModified = new \DateTime(null, new \DateTimeZone('GMT'));
+ $lastModified->setTimestamp(1);
+ $this->childResponse->setLastModified($lastModified);
+ $headers = $this->childResponse->getHeaders();
+ $this->assertEquals('Thu, 01 Jan 1970 00:00:01 +0000', $headers['Last-Modified']);
+ }
+
+
+}
diff --git a/tests/lib/appframework/http/TemplateResponseTest.php b/tests/lib/appframework/http/TemplateResponseTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..3c6d29cd3392bfcb1a7c9b07923a1578a7abe212
--- /dev/null
+++ b/tests/lib/appframework/http/TemplateResponseTest.php
@@ -0,0 +1,161 @@
+<?php
+
+/**
+ * ownCloud - App Framework
+ *
+ * @author Bernhard Posselt
+ * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ *
+ * 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/>.
+ *
+ */
+
+
+namespace OC\AppFramework\Http;
+
+use OCP\AppFramework\Http\TemplateResponse;
+
+
+class TemplateResponseTest extends \PHPUnit_Framework_TestCase {
+
+ /**
+ * @var \OCP\AppFramework\Http\TemplateResponse
+ */
+ private $tpl;
+
+ /**
+ * @var \OCP\AppFramework\IApi
+ */
+ private $api;
+
+ protected function setUp() {
+ $this->api = $this->getMock('OC\AppFramework\Core\API',
+ array('getAppName'), array('test'));
+ $this->api->expects($this->any())
+ ->method('getAppName')
+ ->will($this->returnValue('app'));
+
+ $this->tpl = new TemplateResponse($this->api, 'home');
+ }
+
+
+ public function testSetParams(){
+ $params = array('hi' => 'yo');
+ $this->tpl->setParams($params);
+
+ $this->assertEquals(array('hi' => 'yo'), $this->tpl->getParams());
+ }
+
+
+ public function testGetTemplateName(){
+ $this->assertEquals('home', $this->tpl->getTemplateName());
+ }
+
+
+ public function testRender(){
+ $ocTpl = $this->getMock('Template', array('fetchPage'));
+ $ocTpl->expects($this->once())
+ ->method('fetchPage');
+
+ $api = $this->getMock('OC\AppFramework\Core\API',
+ array('getAppName', 'getTemplate'), array('app'));
+ $api->expects($this->any())
+ ->method('getAppName')
+ ->will($this->returnValue('app'));
+ $api->expects($this->once())
+ ->method('getTemplate')
+ ->with($this->equalTo('home'), $this->equalTo('user'), $this->equalTo('app'))
+ ->will($this->returnValue($ocTpl));
+
+ $tpl = new TemplateResponse($api, 'home');
+
+ $tpl->render();
+ }
+
+
+ public function testRenderAssignsParams(){
+ $params = array('john' => 'doe');
+
+ $ocTpl = $this->getMock('Template', array('assign', 'fetchPage'));
+ $ocTpl->expects($this->once())
+ ->method('assign')
+ ->with($this->equalTo('john'), $this->equalTo('doe'));
+
+ $api = $this->getMock('OC\AppFramework\Core\API',
+ array('getAppName', 'getTemplate'), array('app'));
+ $api->expects($this->any())
+ ->method('getAppName')
+ ->will($this->returnValue('app'));
+ $api->expects($this->once())
+ ->method('getTemplate')
+ ->with($this->equalTo('home'), $this->equalTo('user'), $this->equalTo('app'))
+ ->will($this->returnValue($ocTpl));
+
+ $tpl = new TemplateResponse($api, 'home');
+ $tpl->setParams($params);
+
+ $tpl->render();
+ }
+
+
+ public function testRenderDifferentApp(){
+ $ocTpl = $this->getMock('Template', array('fetchPage'));
+ $ocTpl->expects($this->once())
+ ->method('fetchPage');
+
+ $api = $this->getMock('OC\AppFramework\Core\API',
+ array('getAppName', 'getTemplate'), array('app'));
+ $api->expects($this->any())
+ ->method('getAppName')
+ ->will($this->returnValue('app'));
+ $api->expects($this->once())
+ ->method('getTemplate')
+ ->with($this->equalTo('home'), $this->equalTo('user'), $this->equalTo('app2'))
+ ->will($this->returnValue($ocTpl));
+
+ $tpl = new TemplateResponse($api, 'home', 'app2');
+
+ $tpl->render();
+ }
+
+
+ public function testRenderDifferentRenderAs(){
+ $ocTpl = $this->getMock('Template', array('fetchPage'));
+ $ocTpl->expects($this->once())
+ ->method('fetchPage');
+
+ $api = $this->getMock('OC\AppFramework\Core\API',
+ array('getAppName', 'getTemplate'), array('app'));
+ $api->expects($this->any())
+ ->method('getAppName')
+ ->will($this->returnValue('app'));
+ $api->expects($this->once())
+ ->method('getTemplate')
+ ->with($this->equalTo('home'), $this->equalTo('admin'), $this->equalTo('app'))
+ ->will($this->returnValue($ocTpl));
+
+ $tpl = new TemplateResponse($api, 'home');
+ $tpl->renderAs('admin');
+
+ $tpl->render();
+ }
+
+
+ public function testGetRenderAs(){
+ $render = 'myrender';
+ $this->tpl->renderAs($render);
+ $this->assertEquals($render, $this->tpl->getRenderAs());
+ }
+
+}
diff --git a/tests/lib/appframework/middleware/MiddlewareDispatcherTest.php b/tests/lib/appframework/middleware/MiddlewareDispatcherTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..43727846dcf3863af85aa4b14f272d060b805ec6
--- /dev/null
+++ b/tests/lib/appframework/middleware/MiddlewareDispatcherTest.php
@@ -0,0 +1,285 @@
+<?php
+
+/**
+ * ownCloud - App Framework
+ *
+ * @author Bernhard Posselt
+ * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ *
+ * 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/>.
+ *
+ */
+
+
+namespace OC\AppFramework;
+
+use OC\AppFramework\Http\Request;
+use OC\AppFramework\Middleware\Middleware;
+use OC\AppFramework\Middleware\MiddlewareDispatcher;
+use OCP\AppFramework\Http\Response;
+
+
+// needed to test ordering
+class TestMiddleware extends Middleware {
+ public static $beforeControllerCalled = 0;
+ public static $afterControllerCalled = 0;
+ public static $afterExceptionCalled = 0;
+ public static $beforeOutputCalled = 0;
+
+ public $beforeControllerOrder = 0;
+ public $afterControllerOrder = 0;
+ public $afterExceptionOrder = 0;
+ public $beforeOutputOrder = 0;
+
+ public $controller;
+ public $methodName;
+ public $exception;
+ public $response;
+ public $output;
+
+ private $beforeControllerThrowsEx;
+
+ public function __construct($beforeControllerThrowsEx) {
+ self::$beforeControllerCalled = 0;
+ self::$afterControllerCalled = 0;
+ self::$afterExceptionCalled = 0;
+ self::$beforeOutputCalled = 0;
+ $this->beforeControllerThrowsEx = $beforeControllerThrowsEx;
+ }
+
+ public function beforeController($controller, $methodName){
+ self::$beforeControllerCalled++;
+ $this->beforeControllerOrder = self::$beforeControllerCalled;
+ $this->controller = $controller;
+ $this->methodName = $methodName;
+ if($this->beforeControllerThrowsEx){
+ throw new \Exception();
+ }
+ }
+
+ public function afterException($controller, $methodName, \Exception $exception){
+ self::$afterExceptionCalled++;
+ $this->afterExceptionOrder = self::$afterExceptionCalled;
+ $this->controller = $controller;
+ $this->methodName = $methodName;
+ $this->exception = $exception;
+ parent::afterException($controller, $methodName, $exception);
+ }
+
+ public function afterController($controller, $methodName, Response $response){
+ self::$afterControllerCalled++;
+ $this->afterControllerOrder = self::$afterControllerCalled;
+ $this->controller = $controller;
+ $this->methodName = $methodName;
+ $this->response = $response;
+ return parent::afterController($controller, $methodName, $response);
+ }
+
+ public function beforeOutput($controller, $methodName, $output){
+ self::$beforeOutputCalled++;
+ $this->beforeOutputOrder = self::$beforeOutputCalled;
+ $this->controller = $controller;
+ $this->methodName = $methodName;
+ $this->output = $output;
+ return parent::beforeOutput($controller, $methodName, $output);
+ }
+}
+
+
+class MiddlewareDispatcherTest extends \PHPUnit_Framework_TestCase {
+
+ public $exception;
+ public $response;
+ private $out;
+ private $method;
+ private $controller;
+
+ /**
+ * @var MiddlewareDispatcher
+ */
+ private $dispatcher;
+
+
+ public function setUp() {
+ $this->dispatcher = new MiddlewareDispatcher();
+ $this->controller = $this->getControllerMock();
+ $this->method = 'method';
+ $this->response = new Response();
+ $this->out = 'hi';
+ $this->exception = new \Exception();
+ }
+
+
+ private function getAPIMock(){
+ return $this->getMock('OC\AppFramework\Core\API',
+ array('getAppName'), array('app'));
+ }
+
+
+ private function getControllerMock(){
+ return $this->getMock('OC\AppFramework\Controller\Controller', array('method'),
+ array($this->getAPIMock(), new Request()));
+ }
+
+
+ private function getMiddleware($beforeControllerThrowsEx=false){
+ $m1 = new TestMiddleware($beforeControllerThrowsEx);
+ $this->dispatcher->registerMiddleware($m1);
+ return $m1;
+ }
+
+
+ public function testAfterExceptionShouldReturnResponseOfMiddleware(){
+ $response = new Response();
+ $m1 = $this->getMock('\OC\AppFramework\Middleware\Middleware',
+ array('afterException', 'beforeController'));
+ $m1->expects($this->never())
+ ->method('afterException');
+
+ $m2 = $this->getMock('OC\AppFramework\Middleware\Middleware',
+ array('afterException', 'beforeController'));
+ $m2->expects($this->once())
+ ->method('afterException')
+ ->will($this->returnValue($response));
+
+ $this->dispatcher->registerMiddleware($m1);
+ $this->dispatcher->registerMiddleware($m2);
+
+ $this->dispatcher->beforeController($this->controller, $this->method);
+ $this->assertEquals($response, $this->dispatcher->afterException($this->controller, $this->method, $this->exception));
+ }
+
+
+ public function testAfterExceptionShouldThrowAgainWhenNotHandled(){
+ $m1 = new TestMiddleware(false);
+ $m2 = new TestMiddleware(true);
+
+ $this->dispatcher->registerMiddleware($m1);
+ $this->dispatcher->registerMiddleware($m2);
+
+ $this->setExpectedException('\Exception');
+ $this->dispatcher->beforeController($this->controller, $this->method);
+ $this->dispatcher->afterException($this->controller, $this->method, $this->exception);
+ }
+
+
+ public function testBeforeControllerCorrectArguments(){
+ $m1 = $this->getMiddleware();
+ $this->dispatcher->beforeController($this->controller, $this->method);
+
+ $this->assertEquals($this->controller, $m1->controller);
+ $this->assertEquals($this->method, $m1->methodName);
+ }
+
+
+ public function testAfterControllerCorrectArguments(){
+ $m1 = $this->getMiddleware();
+
+ $this->dispatcher->afterController($this->controller, $this->method, $this->response);
+
+ $this->assertEquals($this->controller, $m1->controller);
+ $this->assertEquals($this->method, $m1->methodName);
+ $this->assertEquals($this->response, $m1->response);
+ }
+
+
+ public function testAfterExceptionCorrectArguments(){
+ $m1 = $this->getMiddleware();
+
+ $this->setExpectedException('\Exception');
+
+ $this->dispatcher->beforeController($this->controller, $this->method);
+ $this->dispatcher->afterException($this->controller, $this->method, $this->exception);
+
+ $this->assertEquals($this->controller, $m1->controller);
+ $this->assertEquals($this->method, $m1->methodName);
+ $this->assertEquals($this->exception, $m1->exception);
+ }
+
+
+ public function testBeforeOutputCorrectArguments(){
+ $m1 = $this->getMiddleware();
+
+ $this->dispatcher->beforeOutput($this->controller, $this->method, $this->out);
+
+ $this->assertEquals($this->controller, $m1->controller);
+ $this->assertEquals($this->method, $m1->methodName);
+ $this->assertEquals($this->out, $m1->output);
+ }
+
+
+ public function testBeforeControllerOrder(){
+ $m1 = $this->getMiddleware();
+ $m2 = $this->getMiddleware();
+
+ $this->dispatcher->beforeController($this->controller, $this->method);
+
+ $this->assertEquals(1, $m1->beforeControllerOrder);
+ $this->assertEquals(2, $m2->beforeControllerOrder);
+ }
+
+ public function testAfterControllerOrder(){
+ $m1 = $this->getMiddleware();
+ $m2 = $this->getMiddleware();
+
+ $this->dispatcher->afterController($this->controller, $this->method, $this->response);
+
+ $this->assertEquals(2, $m1->afterControllerOrder);
+ $this->assertEquals(1, $m2->afterControllerOrder);
+ }
+
+
+ public function testAfterExceptionOrder(){
+ $m1 = $this->getMiddleware();
+ $m2 = $this->getMiddleware();
+
+ $this->setExpectedException('\Exception');
+ $this->dispatcher->beforeController($this->controller, $this->method);
+ $this->dispatcher->afterException($this->controller, $this->method, $this->exception);
+
+ $this->assertEquals(1, $m1->afterExceptionOrder);
+ $this->assertEquals(1, $m2->afterExceptionOrder);
+ }
+
+
+ public function testBeforeOutputOrder(){
+ $m1 = $this->getMiddleware();
+ $m2 = $this->getMiddleware();
+
+ $this->dispatcher->beforeOutput($this->controller, $this->method, $this->out);
+
+ $this->assertEquals(2, $m1->beforeOutputOrder);
+ $this->assertEquals(1, $m2->beforeOutputOrder);
+ }
+
+
+ public function testExceptionShouldRunAfterExceptionOfOnlyPreviouslyExecutedMiddlewares(){
+ $m1 = $this->getMiddleware();
+ $m2 = $this->getMiddleware(true);
+ $m3 = $this->getMock('\OC\AppFramework\Middleware\Middleware');
+ $m3->expects($this->never())
+ ->method('afterException');
+ $m3->expects($this->never())
+ ->method('beforeController');
+ $m3->expects($this->never())
+ ->method('afterController');
+
+ $this->dispatcher->registerMiddleware($m3);
+
+ $this->dispatcher->beforeOutput($this->controller, $this->method, $this->out);
+
+ $this->assertEquals(2, $m1->beforeOutputOrder);
+ $this->assertEquals(1, $m2->beforeOutputOrder);
+ }
+}
diff --git a/tests/lib/appframework/middleware/MiddlewareTest.php b/tests/lib/appframework/middleware/MiddlewareTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..5e2930ac6a36a426127e164286ae1093a8006680
--- /dev/null
+++ b/tests/lib/appframework/middleware/MiddlewareTest.php
@@ -0,0 +1,83 @@
+<?php
+
+/**
+ * ownCloud - App Framework
+ *
+ * @author Bernhard Posselt
+ * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ *
+ * 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/>.
+ *
+ */
+
+
+namespace OC\AppFramework;
+
+use OC\AppFramework\Http\Request;
+use OC\AppFramework\Middleware\Middleware;
+
+
+class ChildMiddleware extends Middleware {};
+
+
+class MiddlewareTest extends \PHPUnit_Framework_TestCase {
+
+ /**
+ * @var Middleware
+ */
+ private $middleware;
+ private $controller;
+ private $exception;
+ private $api;
+
+ protected function setUp(){
+ $this->middleware = new ChildMiddleware();
+
+ $this->api = $this->getMock('OC\AppFramework\Core\API',
+ array(), array('test'));
+
+ $this->controller = $this->getMock('OC\AppFramework\Controller\Controller',
+ array(), array($this->api, new Request()));
+ $this->exception = new \Exception();
+ $this->response = $this->getMock('OCP\AppFramework\Http\Response');
+ }
+
+
+ public function testBeforeController() {
+ $this->middleware->beforeController($this->controller, null);
+ $this->assertNull(null);
+ }
+
+
+ public function testAfterExceptionRaiseAgainWhenUnhandled() {
+ $this->setExpectedException('Exception');
+ $afterEx = $this->middleware->afterException($this->controller, null, $this->exception);
+ }
+
+
+ public function testAfterControllerReturnResponseWhenUnhandled() {
+ $response = $this->middleware->afterController($this->controller, null, $this->response);
+
+ $this->assertEquals($this->response, $response);
+ }
+
+
+ public function testBeforeOutputReturnOutputhenUnhandled() {
+ $output = $this->middleware->beforeOutput($this->controller, null, 'test');
+
+ $this->assertEquals('test', $output);
+ }
+
+
+}
diff --git a/tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php b/tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..3ed44282a7b0b3a625fd6ef88a2a67e90464123c
--- /dev/null
+++ b/tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php
@@ -0,0 +1,296 @@
+<?php
+
+/**
+ * ownCloud - App Framework
+ *
+ * @author Bernhard Posselt
+ * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ *
+ * 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/>.
+ *
+ */
+
+
+namespace OC\AppFramework\Middleware\Security;
+
+use OC\AppFramework\Http\Http;
+use OC\AppFramework\Http\Request;
+use OC\AppFramework\Http\RedirectResponse;
+use OCP\AppFramework\Http\JSONResponse;
+
+
+class SecurityMiddlewareTest extends \PHPUnit_Framework_TestCase {
+
+ private $middleware;
+ private $controller;
+ private $secException;
+ private $secAjaxException;
+ private $request;
+
+ public function setUp() {
+ $api = $this->getMock('OC\AppFramework\Core\API', array(), array('test'));
+ $this->controller = $this->getMock('OC\AppFramework\Controller\Controller',
+ array(), array($api, new Request()));
+
+ $this->request = new Request();
+ $this->middleware = new SecurityMiddleware($api, $this->request);
+ $this->secException = new SecurityException('hey', false);
+ $this->secAjaxException = new SecurityException('hey', true);
+ }
+
+
+ private function getAPI(){
+ return $this->getMock('OC\AppFramework\Core\API',
+ array('isLoggedIn', 'passesCSRFCheck', 'isAdminUser',
+ 'isSubAdminUser', 'activateNavigationEntry',
+ 'getUserId'),
+ array('app'));
+ }
+
+
+ private function checkNavEntry($method, $shouldBeActivated=false){
+ $api = $this->getAPI();
+
+ if($shouldBeActivated){
+ $api->expects($this->once())
+ ->method('activateNavigationEntry');
+ } else {
+ $api->expects($this->never())
+ ->method('activateNavigationEntry');
+ }
+
+ $sec = new SecurityMiddleware($api, $this->request);
+ $sec->beforeController('\OC\AppFramework\Middleware\Security\SecurityMiddlewareTest', $method);
+ }
+
+
+ /**
+ * @PublicPage
+ * @NoCSRFRequired
+ */
+ public function testSetNavigationEntry(){
+ $this->checkNavEntry('testSetNavigationEntry', true);
+ }
+
+
+ private function ajaxExceptionStatus($method, $test, $status) {
+ $api = $this->getAPI();
+ $api->expects($this->any())
+ ->method($test)
+ ->will($this->returnValue(false));
+
+ // isAdminUser requires isLoggedIn call to return true
+ if ($test === 'isAdminUser') {
+ $api->expects($this->any())
+ ->method('isLoggedIn')
+ ->will($this->returnValue(true));
+ }
+
+ $sec = new SecurityMiddleware($api, $this->request);
+
+ try {
+ $sec->beforeController('\OC\AppFramework\Middleware\Security\SecurityMiddlewareTest',
+ $method);
+ } catch (SecurityException $ex){
+ $this->assertEquals($status, $ex->getCode());
+ }
+ }
+
+ public function testAjaxStatusLoggedInCheck() {
+ $this->ajaxExceptionStatus(
+ 'testAjaxStatusLoggedInCheck',
+ 'isLoggedIn',
+ Http::STATUS_UNAUTHORIZED
+ );
+ }
+
+ /**
+ * @NoCSRFRequired
+ * @NoAdminRequired
+ */
+ public function testAjaxNotAdminCheck() {
+ $this->ajaxExceptionStatus(
+ 'testAjaxNotAdminCheck',
+ 'isAdminUser',
+ Http::STATUS_FORBIDDEN
+ );
+ }
+
+ /**
+ * @PublicPage
+ */
+ public function testAjaxStatusCSRFCheck() {
+ $this->ajaxExceptionStatus(
+ 'testAjaxStatusCSRFCheck',
+ 'passesCSRFCheck',
+ Http::STATUS_PRECONDITION_FAILED
+ );
+ }
+
+ /**
+ * @PublicPage
+ * @NoCSRFRequired
+ */
+ public function testAjaxStatusAllGood() {
+ $this->ajaxExceptionStatus(
+ 'testAjaxStatusAllGood',
+ 'isLoggedIn',
+ 0
+ );
+ $this->ajaxExceptionStatus(
+ 'testAjaxStatusAllGood',
+ 'isAdminUser',
+ 0
+ );
+ $this->ajaxExceptionStatus(
+ 'testAjaxStatusAllGood',
+ 'isSubAdminUser',
+ 0
+ );
+ $this->ajaxExceptionStatus(
+ 'testAjaxStatusAllGood',
+ 'passesCSRFCheck',
+ 0
+ );
+ }
+
+
+ /**
+ * @PublicPage
+ * @NoCSRFRequired
+ */
+ public function testNoChecks(){
+ $api = $this->getAPI();
+ $api->expects($this->never())
+ ->method('passesCSRFCheck')
+ ->will($this->returnValue(true));
+ $api->expects($this->never())
+ ->method('isAdminUser')
+ ->will($this->returnValue(true));
+ $api->expects($this->never())
+ ->method('isLoggedIn')
+ ->will($this->returnValue(true));
+
+ $sec = new SecurityMiddleware($api, $this->request);
+ $sec->beforeController('\OC\AppFramework\Middleware\Security\SecurityMiddlewareTest',
+ 'testNoChecks');
+ }
+
+
+ private function securityCheck($method, $expects, $shouldFail=false){
+ $api = $this->getAPI();
+ $api->expects($this->once())
+ ->method($expects)
+ ->will($this->returnValue(!$shouldFail));
+
+ // admin check requires login
+ if ($expects === 'isAdminUser') {
+ $api->expects($this->once())
+ ->method('isLoggedIn')
+ ->will($this->returnValue(true));
+ }
+
+ $sec = new SecurityMiddleware($api, $this->request);
+
+ if($shouldFail){
+ $this->setExpectedException('\OC\AppFramework\Middleware\Security\SecurityException');
+ } else {
+ $this->setExpectedException(null);
+ }
+
+ $sec->beforeController('\OC\AppFramework\Middleware\Security\SecurityMiddlewareTest', $method);
+ }
+
+
+ /**
+ * @PublicPage
+ */
+ public function testCsrfCheck(){
+ $this->securityCheck('testCsrfCheck', 'passesCSRFCheck');
+ }
+
+
+ /**
+ * @PublicPage
+ */
+ public function testFailCsrfCheck(){
+ $this->securityCheck('testFailCsrfCheck', 'passesCSRFCheck', true);
+ }
+
+
+ /**
+ * @NoCSRFRequired
+ * @NoAdminRequired
+ */
+ public function testLoggedInCheck(){
+ $this->securityCheck('testLoggedInCheck', 'isLoggedIn');
+ }
+
+
+ /**
+ * @NoCSRFRequired
+ * @NoAdminRequired
+ */
+ public function testFailLoggedInCheck(){
+ $this->securityCheck('testFailLoggedInCheck', 'isLoggedIn', true);
+ }
+
+
+ /**
+ * @NoCSRFRequired
+ */
+ public function testIsAdminCheck(){
+ $this->securityCheck('testIsAdminCheck', 'isAdminUser');
+ }
+
+
+ /**
+ * @NoCSRFRequired
+ */
+ public function testFailIsAdminCheck(){
+ $this->securityCheck('testFailIsAdminCheck', 'isAdminUser', true);
+ }
+
+
+ public function testAfterExceptionNotCaughtThrowsItAgain(){
+ $ex = new \Exception();
+ $this->setExpectedException('\Exception');
+ $this->middleware->afterException($this->controller, 'test', $ex);
+ }
+
+
+ public function testAfterExceptionReturnsRedirect(){
+ $api = $this->getMock('OC\AppFramework\Core\API', array(), array('test'));
+ $this->controller = $this->getMock('OC\AppFramework\Controller\Controller',
+ array(), array($api, new Request()));
+
+ $this->request = new Request(
+ array('server' => array('HTTP_ACCEPT' => 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8')));
+ $this->middleware = new SecurityMiddleware($api, $this->request);
+ $response = $this->middleware->afterException($this->controller, 'test',
+ $this->secException);
+
+ $this->assertTrue($response instanceof RedirectResponse);
+ }
+
+
+ public function testAfterAjaxExceptionReturnsJSONError(){
+ $response = $this->middleware->afterException($this->controller, 'test',
+ $this->secAjaxException);
+
+ $this->assertTrue($response instanceof JSONResponse);
+ }
+
+
+}
diff --git a/tests/lib/appframework/routing/RoutingTest.php b/tests/lib/appframework/routing/RoutingTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..a7aa922db12becd05a88115ca7608275d466f70f
--- /dev/null
+++ b/tests/lib/appframework/routing/RoutingTest.php
@@ -0,0 +1,213 @@
+<?php
+
+namespace OC\AppFramework\Routing;
+
+use OC\AppFramework\DependencyInjection\DIContainer;
+use OC\AppFramework\routing\RouteConfig;
+
+
+class RouteConfigTest extends \PHPUnit_Framework_TestCase
+{
+
+ public function testSimpleRoute()
+ {
+ $routes = array('routes' => array(
+ array('name' => 'folders#open', 'url' => '/folders/{folderId}/open', 'verb' => 'GET')
+ ));
+
+ $this->assertSimpleRoute($routes, 'folders.open', 'GET', '/folders/{folderId}/open', 'FoldersController', 'open');
+ }
+
+ public function testSimpleRouteWithMissingVerb()
+ {
+ $routes = array('routes' => array(
+ array('name' => 'folders#open', 'url' => '/folders/{folderId}/open')
+ ));
+
+ $this->assertSimpleRoute($routes, 'folders.open', 'GET', '/folders/{folderId}/open', 'FoldersController', 'open');
+ }
+
+ public function testSimpleRouteWithLowercaseVerb()
+ {
+ $routes = array('routes' => array(
+ array('name' => 'folders#open', 'url' => '/folders/{folderId}/open', 'verb' => 'delete')
+ ));
+
+ $this->assertSimpleRoute($routes, 'folders.open', 'DELETE', '/folders/{folderId}/open', 'FoldersController', 'open');
+ }
+
+ /**
+ * @expectedException \UnexpectedValueException
+ */
+ public function testSimpleRouteWithBrokenName()
+ {
+ $routes = array('routes' => array(
+ array('name' => 'folders_open', 'url' => '/folders/{folderId}/open', 'verb' => 'delete')
+ ));
+
+ // router mock
+ $router = $this->getMock("\OC_Router", array('create'));
+
+ // load route configuration
+ $container = new DIContainer('app1');
+ $config = new RouteConfig($container, $router, $routes);
+
+ $config->register();
+ }
+
+ public function testSimpleRouteWithUnderScoreNames()
+ {
+ $routes = array('routes' => array(
+ array('name' => 'admin_folders#open_current', 'url' => '/folders/{folderId}/open', 'verb' => 'delete')
+ ));
+
+ $this->assertSimpleRoute($routes, 'admin_folders.open_current', 'DELETE', '/folders/{folderId}/open', 'AdminFoldersController', 'openCurrent');
+ }
+
+ public function testResource()
+ {
+ $routes = array('resources' => array('accounts' => array('url' => '/accounts')));
+
+ $this->assertResource($routes, 'accounts', '/accounts', 'AccountsController', 'accountId');
+ }
+
+ public function testResourceWithUnderScoreName()
+ {
+ $routes = array('resources' => array('admin_accounts' => array('url' => '/admin/accounts')));
+
+ $this->assertResource($routes, 'admin_accounts', '/admin/accounts', 'AdminAccountsController', 'adminAccountId');
+ }
+
+ private function assertSimpleRoute($routes, $name, $verb, $url, $controllerName, $actionName)
+ {
+ // route mocks
+ $route = $this->mockRoute($verb, $controllerName, $actionName);
+
+ // router mock
+ $router = $this->getMock("\OC_Router", array('create'));
+
+ // we expect create to be called once:
+ $router
+ ->expects($this->once())
+ ->method('create')
+ ->with($this->equalTo('app1.' . $name), $this->equalTo($url))
+ ->will($this->returnValue($route));
+
+ // load route configuration
+ $container = new DIContainer('app1');
+ $config = new RouteConfig($container, $router, $routes);
+
+ $config->register();
+ }
+
+ private function assertResource($yaml, $resourceName, $url, $controllerName, $paramName)
+ {
+ // router mock
+ $router = $this->getMock("\OC_Router", array('create'));
+
+ // route mocks
+ $indexRoute = $this->mockRoute('GET', $controllerName, 'index');
+ $showRoute = $this->mockRoute('GET', $controllerName, 'show');
+ $createRoute = $this->mockRoute('POST', $controllerName, 'create');
+ $updateRoute = $this->mockRoute('PUT', $controllerName, 'update');
+ $destroyRoute = $this->mockRoute('DELETE', $controllerName, 'destroy');
+
+ $urlWithParam = $url . '/{' . $paramName . '}';
+
+ // we expect create to be called once:
+ $router
+ ->expects($this->at(0))
+ ->method('create')
+ ->with($this->equalTo('app1.' . $resourceName . '.index'), $this->equalTo($url))
+ ->will($this->returnValue($indexRoute));
+
+ $router
+ ->expects($this->at(1))
+ ->method('create')
+ ->with($this->equalTo('app1.' . $resourceName . '.show'), $this->equalTo($urlWithParam))
+ ->will($this->returnValue($showRoute));
+
+ $router
+ ->expects($this->at(2))
+ ->method('create')
+ ->with($this->equalTo('app1.' . $resourceName . '.create'), $this->equalTo($url))
+ ->will($this->returnValue($createRoute));
+
+ $router
+ ->expects($this->at(3))
+ ->method('create')
+ ->with($this->equalTo('app1.' . $resourceName . '.update'), $this->equalTo($urlWithParam))
+ ->will($this->returnValue($updateRoute));
+
+ $router
+ ->expects($this->at(4))
+ ->method('create')
+ ->with($this->equalTo('app1.' . $resourceName . '.destroy'), $this->equalTo($urlWithParam))
+ ->will($this->returnValue($destroyRoute));
+
+ // load route configuration
+ $container = new DIContainer('app1');
+ $config = new RouteConfig($container, $router, $yaml);
+
+ $config->register();
+ }
+
+ /**
+ * @param $verb
+ * @param $controllerName
+ * @param $actionName
+ * @return \PHPUnit_Framework_MockObject_MockObject
+ */
+ private function mockRoute($verb, $controllerName, $actionName)
+ {
+ $container = new DIContainer('app1');
+ $route = $this->getMock("\OC_Route", array('method', 'action'), array(), '', false);
+ $route
+ ->expects($this->exactly(1))
+ ->method('method')
+ ->with($this->equalTo($verb))
+ ->will($this->returnValue($route));
+
+ $route
+ ->expects($this->exactly(1))
+ ->method('action')
+ ->with($this->equalTo(new RouteActionHandler($container, $controllerName, $actionName)))
+ ->will($this->returnValue($route));
+ return $route;
+ }
+
+}
+
+/*
+#
+# sample routes.yaml for ownCloud
+#
+# the section simple describes one route
+
+routes:
+ - name: folders#open
+ url: /folders/{folderId}/open
+ verb: GET
+ # controller: name.split()[0]
+ # action: name.split()[1]
+
+# for a resource following actions will be generated:
+# - index
+# - create
+# - show
+# - update
+# - destroy
+# - new
+resources:
+ accounts:
+ url: /accounts
+
+ folders:
+ url: /accounts/{accountId}/folders
+ # actions can be used to define additional actions on the resource
+ actions:
+ - name: validate
+ verb: GET
+ on-collection: false
+
+ * */
diff --git a/tests/lib/appframework/utility/MethodAnnotationReaderTest.php b/tests/lib/appframework/utility/MethodAnnotationReaderTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..c68812aa5c76dbcb3c76ea4a1d0e50893c368c98
--- /dev/null
+++ b/tests/lib/appframework/utility/MethodAnnotationReaderTest.php
@@ -0,0 +1,55 @@
+<?php
+
+/**
+ * ownCloud - App Framework
+ *
+ * @author Bernhard Posselt
+ * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ *
+ * 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/>.
+ *
+ */
+
+
+namespace OC\AppFramework\Utility;
+
+
+class MethodAnnotationReaderTest extends \PHPUnit_Framework_TestCase {
+
+
+ /**
+ * @Annotation
+ */
+ public function testReadAnnotation(){
+ $reader = new MethodAnnotationReader('\OC\AppFramework\Utility\MethodAnnotationReaderTest',
+ 'testReadAnnotation');
+
+ $this->assertTrue($reader->hasAnnotation('Annotation'));
+ }
+
+
+ /**
+ * @Annotation
+ * @param test
+ */
+ public function testReadAnnotationNoLowercase(){
+ $reader = new MethodAnnotationReader('\OC\AppFramework\Utility\MethodAnnotationReaderTest',
+ 'testReadAnnotationNoLowercase');
+
+ $this->assertTrue($reader->hasAnnotation('Annotation'));
+ $this->assertFalse($reader->hasAnnotation('param'));
+ }
+
+
+}
diff --git a/tests/lib/avatar.php b/tests/lib/avatar.php
new file mode 100644
index 0000000000000000000000000000000000000000..1c5195f8eb1952d6174c8c7c04770509ee0cbfb0
--- /dev/null
+++ b/tests/lib/avatar.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright (c) 2013 Christopher Schäpers <christopher@schaepers.it>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+class Test_Avatar extends PHPUnit_Framework_TestCase {
+
+ public function testAvatar() {
+ $this->markTestSkipped("Setting custom avatars with encryption doesn't work yet");
+
+ $avatar = new \OC_Avatar(\OC_User::getUser());
+
+ $this->assertEquals(false, $avatar->get());
+
+ $expected = new OC_Image(\OC::$SERVERROOT.'/tests/data/testavatar.png');
+ $avatar->set($expected->data());
+ $expected->resize(64);
+ $this->assertEquals($expected->data(), $avatar->get()->data());
+
+ $avatar->remove();
+ $this->assertEquals(false, $avatar->get());
+ }
+}
diff --git a/tests/lib/cache.php b/tests/lib/cache.php
index 3dcf39f7d605df9b0c325264b25414c6f8d037e5..8fefa25f65d97f55468cd3835b33dd5031d30f3c 100644
--- a/tests/lib/cache.php
+++ b/tests/lib/cache.php
@@ -8,7 +8,7 @@
abstract class Test_Cache extends PHPUnit_Framework_TestCase {
/**
- * @var OC_Cache cache;
+ * @var \OC\Cache cache;
*/
protected $instance;
diff --git a/tests/lib/cache/file.php b/tests/lib/cache/file.php
index 038cb21b2576a54ac1b76d635a3279951a0a94d5..3767c83fcb1c28d76153c0e6de733ee4705d728a 100644
--- a/tests/lib/cache/file.php
+++ b/tests/lib/cache/file.php
@@ -20,7 +20,9 @@
*
*/
-class Test_Cache_File extends Test_Cache {
+namespace Test\Cache;
+
+class FileCache extends \Test_Cache {
private $user;
private $datadir;
@@ -30,8 +32,8 @@ class Test_Cache_File extends Test_Cache {
public function setUp() {
//clear all proxies and hooks so we can do clean testing
- OC_FileProxy::clearProxies();
- OC_Hook::clear('OC_Filesystem');
+ \OC_FileProxy::clearProxies();
+ \OC_Hook::clear('OC_Filesystem');
//disabled atm
//enable only the encryption hook if needed
@@ -44,27 +46,27 @@ class Test_Cache_File extends Test_Cache {
$storage = new \OC\Files\Storage\Temporary(array());
\OC\Files\Filesystem::mount($storage,array(),'/');
$datadir = str_replace('local::', '', $storage->getId());
- $this->datadir = OC_Config::getValue('datadirectory', OC::$SERVERROOT.'/data');
- OC_Config::setValue('datadirectory', $datadir);
+ $this->datadir = \OC_Config::getValue('datadirectory', \OC::$SERVERROOT.'/data');
+ \OC_Config::setValue('datadirectory', $datadir);
- OC_User::clearBackends();
- OC_User::useBackend(new OC_User_Dummy());
+ \OC_User::clearBackends();
+ \OC_User::useBackend(new \OC_User_Dummy());
//login
- OC_User::createUser('test', 'test');
+ \OC_User::createUser('test', 'test');
- $this->user=OC_User::getUser();
- OC_User::setUserId('test');
+ $this->user = \OC_User::getUser();
+ \OC_User::setUserId('test');
//set up the users dir
- $rootView=new \OC\Files\View('');
+ $rootView = new \OC\Files\View('');
$rootView->mkdir('/test');
- $this->instance=new OC_Cache_File();
+ $this->instance=new \OC\Cache\File();
}
public function tearDown() {
- OC_User::setUserId($this->user);
- OC_Config::setValue('datadirectory', $this->datadir);
+ \OC_User::setUserId($this->user);
+ \OC_Config::setValue('datadirectory', $this->datadir);
}
}
diff --git a/tests/lib/cache/usercache.php b/tests/lib/cache/usercache.php
new file mode 100644
index 0000000000000000000000000000000000000000..21b7f848ab6d85f4a4ce83c6a71cf414826b423d
--- /dev/null
+++ b/tests/lib/cache/usercache.php
@@ -0,0 +1,68 @@
+<?php
+/**
+* ownCloud
+*
+* @author Robin Appelman
+* @copyright 2012 Robin Appelman icewind@owncloud.com
+*
+* 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/>.
+*
+*/
+
+namespace Test\Cache;
+
+class UserCache extends \Test_Cache {
+ private $user;
+ private $datadir;
+
+ public function setUp() {
+ //clear all proxies and hooks so we can do clean testing
+ \OC_FileProxy::clearProxies();
+ \OC_Hook::clear('OC_Filesystem');
+
+ //disabled atm
+ //enable only the encryption hook if needed
+ //if(OC_App::isEnabled('files_encryption')) {
+ // OC_FileProxy::register(new OC_FileProxy_Encryption());
+ //}
+
+ //set up temporary storage
+ \OC\Files\Filesystem::clearMounts();
+ $storage = new \OC\Files\Storage\Temporary(array());
+ \OC\Files\Filesystem::mount($storage,array(),'/');
+ $datadir = str_replace('local::', '', $storage->getId());
+ $this->datadir = \OC_Config::getValue('datadirectory', \OC::$SERVERROOT.'/data');
+ \OC_Config::setValue('datadirectory', $datadir);
+
+ \OC_User::clearBackends();
+ \OC_User::useBackend(new \OC_User_Dummy());
+
+ //login
+ \OC_User::createUser('test', 'test');
+
+ $this->user = \OC_User::getUser();
+ \OC_User::setUserId('test');
+
+ //set up the users dir
+ $rootView=new \OC\Files\View('');
+ $rootView->mkdir('/test');
+
+ $this->instance=new \OC\Cache\UserCache();
+ }
+
+ public function tearDown() {
+ \OC_User::setUserId($this->user);
+ \OC_Config::setValue('datadirectory', $this->datadir);
+ }
+}
diff --git a/tests/lib/connector/sabre/aborteduploaddetectionplugin.php b/tests/lib/connector/sabre/aborteduploaddetectionplugin.php
new file mode 100644
index 0000000000000000000000000000000000000000..bef0e4c4d7d13aab36fe1e1f8446da8238ce7e9c
--- /dev/null
+++ b/tests/lib/connector/sabre/aborteduploaddetectionplugin.php
@@ -0,0 +1,97 @@
+<?php
+/**
+ * Copyright (c) 2013 Thomas Müller <thomas.mueller@tmit.eu>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+class Test_OC_Connector_Sabre_AbortedUploadDetectionPlugin extends PHPUnit_Framework_TestCase {
+
+ /**
+ * @var Sabre_DAV_Server
+ */
+ private $server;
+
+ /**
+ * @var OC_Connector_Sabre_AbortedUploadDetectionPlugin
+ */
+ private $plugin;
+
+ public function setUp() {
+ $this->server = new Sabre_DAV_Server();
+ $this->plugin = new OC_Connector_Sabre_AbortedUploadDetectionPlugin();
+ $this->plugin->initialize($this->server);
+ }
+
+ /**
+ * @dataProvider lengthProvider
+ */
+ public function testLength($expected, $headers)
+ {
+ $this->server->httpRequest = new Sabre_HTTP_Request($headers);
+ $length = $this->plugin->getLength();
+ $this->assertEquals($expected, $length);
+ }
+
+ /**
+ * @dataProvider verifyContentLengthProvider
+ */
+ public function testVerifyContentLength($fileSize, $headers)
+ {
+ $this->plugin->fileView = $this->buildFileViewMock($fileSize);
+
+ $this->server->httpRequest = new Sabre_HTTP_Request($headers);
+ $this->plugin->verifyContentLength('foo.txt');
+ $this->assertTrue(true);
+ }
+
+ /**
+ * @dataProvider verifyContentLengthFailedProvider
+ * @expectedException Sabre_DAV_Exception_BadRequest
+ */
+ public function testVerifyContentLengthFailed($fileSize, $headers)
+ {
+ $this->plugin->fileView = $this->buildFileViewMock($fileSize);
+
+ // we expect unlink to be called
+ $this->plugin->fileView->expects($this->once())->method('unlink');
+
+
+ $this->server->httpRequest = new Sabre_HTTP_Request($headers);
+ $this->plugin->verifyContentLength('foo.txt');
+ }
+
+ public function verifyContentLengthProvider() {
+ return array(
+ array(1024, array()),
+ array(1024, array('HTTP_X_EXPECTED_ENTITY_LENGTH' => '1024')),
+ array(512, array('HTTP_CONTENT_LENGTH' => '512')),
+ );
+ }
+
+ public function verifyContentLengthFailedProvider() {
+ return array(
+ array(1025, array('HTTP_X_EXPECTED_ENTITY_LENGTH' => '1024')),
+ array(525, array('HTTP_CONTENT_LENGTH' => '512')),
+ );
+ }
+
+ public function lengthProvider() {
+ return array(
+ array(null, array()),
+ array(1024, array('HTTP_X_EXPECTED_ENTITY_LENGTH' => '1024')),
+ array(512, array('HTTP_CONTENT_LENGTH' => '512')),
+ array(2048, array('HTTP_X_EXPECTED_ENTITY_LENGTH' => '2048', 'HTTP_CONTENT_LENGTH' => '1024')),
+ );
+ }
+
+ private function buildFileViewMock($fileSize) {
+ // mock filesysten
+ $view = $this->getMock('\OC\Files\View', array('filesize', 'unlink'), array(), '', FALSE);
+ $view->expects($this->any())->method('filesize')->withAnyParameters()->will($this->returnValue($fileSize));
+
+ return $view;
+ }
+
+}
diff --git a/tests/lib/connector/sabre/objecttree.php b/tests/lib/connector/sabre/objecttree.php
new file mode 100644
index 0000000000000000000000000000000000000000..1d76bb596766035b264b4ebf9ce67efd6e615460
--- /dev/null
+++ b/tests/lib/connector/sabre/objecttree.php
@@ -0,0 +1,87 @@
+<?php
+/**
+ * Copyright (c) 2013 Thomas Müller <thomas.mueller@tmit.eu>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace Test\OC\Connector\Sabre;
+
+
+use OC_Connector_Sabre_Directory;
+use PHPUnit_Framework_TestCase;
+use Sabre_DAV_Exception_Forbidden;
+
+class TestDoubleFileView extends \OC\Files\View{
+
+ public function __construct($updatables, $canRename = true) {
+ $this->updatables = $updatables;
+ $this->canRename = $canRename;
+ }
+
+ public function isUpdatable($path) {
+ return $this->updatables[$path];
+ }
+
+ public function rename($path1, $path2) {
+ return $this->canRename;
+ }
+}
+
+class ObjectTree extends PHPUnit_Framework_TestCase {
+
+ /**
+ * @dataProvider moveFailedProvider
+ * @expectedException Sabre_DAV_Exception_Forbidden
+ */
+ public function testMoveFailed($source, $dest, $updatables) {
+ $this->moveTest($source, $dest, $updatables);
+ }
+
+ /**
+ * @dataProvider moveSuccessProvider
+ */
+ public function testMoveSuccess($source, $dest, $updatables) {
+ $this->moveTest($source, $dest, $updatables);
+ $this->assertTrue(true);
+ }
+
+ function moveFailedProvider() {
+ return array(
+ array('a/b', 'a/c', array('a' => false, 'a/b' => false, 'a/c' => false)),
+ array('a/b', 'b/b', array('a' => false, 'a/b' => false, 'b' => false, 'b/b' => false)),
+ array('a/b', 'b/b', array('a' => false, 'a/b' => true, 'b' => false, 'b/b' => false)),
+ array('a/b', 'b/b', array('a' => true, 'a/b' => true, 'b' => false, 'b/b' => false)),
+ );
+ }
+
+ function moveSuccessProvider() {
+ return array(
+ array('a/b', 'a/c', array('a' => false, 'a/b' => true, 'a/c' => false)),
+ array('a/b', 'b/b', array('a' => true, 'a/b' => true, 'b' => true, 'b/b' => false)),
+ );
+ }
+
+ /**
+ * @param $source
+ * @param $dest
+ * @param $updatables
+ */
+ private function moveTest($source, $dest, $updatables) {
+ $rootDir = new OC_Connector_Sabre_Directory('');
+ $objectTree = $this->getMock('\OC\Connector\Sabre\ObjectTree',
+ array('nodeExists', 'getNodeForPath'),
+ array($rootDir));
+
+ $objectTree->expects($this->once())
+ ->method('getNodeForPath')
+ ->with($this->identicalTo($source))
+ ->will($this->returnValue(false));
+
+ /** @var $objectTree \OC\Connector\Sabre\ObjectTree */
+ $objectTree->fileView = new TestDoubleFileView($updatables);
+ $objectTree->move($source, $dest);
+ }
+
+}
diff --git a/tests/lib/db.php b/tests/lib/db.php
index 51edbf7b309bdfd9c6608aa7ebbb23311511ed2e..c87bee4ab99781cad34878f1622d7c306607a9e7 100644
--- a/tests/lib/db.php
+++ b/tests/lib/db.php
@@ -15,7 +15,7 @@ class Test_DB extends PHPUnit_Framework_TestCase {
public function setUp() {
$dbfile = OC::$SERVERROOT.'/tests/data/db_structure.xml';
- $r = '_'.OC_Util::generate_random_bytes('4').'_';
+ $r = '_'.OC_Util::generateRandomBytes('4').'_';
$content = file_get_contents( $dbfile );
$content = str_replace( '*dbprefix*', '*dbprefix*'.$r, $content );
file_put_contents( self::$schema_file, $content );
@@ -145,4 +145,42 @@ class Test_DB extends PHPUnit_Framework_TestCase {
$this->assertEquals(1, $result->numRows());
}
+
+ /**
+ * Tests whether the database is configured so it accepts and returns dates
+ * in the expected format.
+ */
+ public function testTimestampDateFormat() {
+ $table = '*PREFIX*'.$this->test_prefix.'timestamp';
+ $column = 'timestamptest';
+
+ $expectedFormat = 'Y-m-d H:i:s';
+ $expected = new \DateTime;
+
+ $query = OC_DB::prepare("INSERT INTO `$table` (`$column`) VALUES (?)");
+ $result = $query->execute(array($expected->format($expectedFormat)));
+ $this->assertEquals(
+ 1,
+ $result,
+ "Database failed to accept dates in the format '$expectedFormat'."
+ );
+
+ $id = OC_DB::insertid($table);
+ $query = OC_DB::prepare("SELECT * FROM `$table` WHERE `id` = ?");
+ $result = $query->execute(array($id));
+ $row = $result->fetchRow();
+
+ $actual = \DateTime::createFromFormat($expectedFormat, $row[$column]);
+ $this->assertInstanceOf(
+ '\DateTime',
+ $actual,
+ "Database failed to return dates in the format '$expectedFormat'."
+ );
+
+ $this->assertEquals(
+ $expected,
+ $actual,
+ 'Failed asserting that the returned date is the same as the inserted.'
+ );
+ }
}
diff --git a/tests/lib/dbschema.php b/tests/lib/dbschema.php
index c2e55eabf4b6b18026fec3732c135f2d1365cd90..7de90c047caa091bb370e8a642f8933b835efa6c 100644
--- a/tests/lib/dbschema.php
+++ b/tests/lib/dbschema.php
@@ -16,7 +16,7 @@ class Test_DBSchema extends PHPUnit_Framework_TestCase {
$dbfile = OC::$SERVERROOT.'/tests/data/db_structure.xml';
$dbfile2 = OC::$SERVERROOT.'/tests/data/db_structure2.xml';
- $r = '_'.OC_Util::generate_random_bytes('4').'_';
+ $r = '_'.OC_Util::generateRandomBytes('4').'_';
$content = file_get_contents( $dbfile );
$content = str_replace( '*dbprefix*', '*dbprefix*'.$r, $content );
file_put_contents( $this->schema_file, $content );
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/node/file.php b/tests/lib/files/node/file.php
new file mode 100644
index 0000000000000000000000000000000000000000..76938a0dcc8bcb44601d60974c6e035a2b433915
--- /dev/null
+++ b/tests/lib/files/node/file.php
@@ -0,0 +1,664 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace Test\Files\Node;
+
+use OCP\Files\NotFoundException;
+use OCP\Files\NotPermittedException;
+use OC\Files\View;
+
+class File extends \PHPUnit_Framework_TestCase {
+ private $user;
+
+ public function setUp() {
+ $this->user = new \OC\User\User('', new \OC_User_Dummy);
+ }
+
+ public function testDelete() {
+ $manager = $this->getMock('\OC\Files\Mount\Manager');
+
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+
+ $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user));
+ $root->expects($this->exactly(2))
+ ->method('emit')
+ ->will($this->returnValue(true));
+ $root->expects($this->any())
+ ->method('getUser')
+ ->will($this->returnValue($this->user));
+
+ $view->expects($this->once())
+ ->method('getFileInfo')
+ ->with('/bar/foo')
+ ->will($this->returnValue(array('permissions' => \OCP\PERMISSION_ALL)));
+
+ $view->expects($this->once())
+ ->method('unlink')
+ ->with('/bar/foo')
+ ->will($this->returnValue(true));
+
+ $node = new \OC\Files\Node\File($root, $view, '/bar/foo');
+ $node->delete();
+ }
+
+ public function testDeleteHooks() {
+ $test = $this;
+ $hooksRun = 0;
+ /**
+ * @param \OC\Files\Node\File $node
+ */
+ $preListener = function ($node) use (&$test, &$hooksRun) {
+ $test->assertInstanceOf('\OC\Files\Node\File', $node);
+ $test->assertEquals('foo', $node->getInternalPath());
+ $test->assertEquals('/bar/foo', $node->getPath());
+ $test->assertEquals(1, $node->getId());
+ $hooksRun++;
+ };
+
+ /**
+ * @param \OC\Files\Node\File $node
+ */
+ $postListener = function ($node) use (&$test, &$hooksRun) {
+ $test->assertInstanceOf('\OC\Files\Node\NonExistingFile', $node);
+ $test->assertEquals('foo', $node->getInternalPath());
+ $test->assertEquals('/bar/foo', $node->getPath());
+ $hooksRun++;
+ };
+
+ /**
+ * @var \OC\Files\Mount\Manager $manager
+ */
+ $manager = $this->getMock('\OC\Files\Mount\Manager');
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = new \OC\Files\Node\Root($manager, $view, $this->user);
+ $root->listen('\OC\Files', 'preDelete', $preListener);
+ $root->listen('\OC\Files', 'postDelete', $postListener);
+
+ $view->expects($this->any())
+ ->method('getFileInfo')
+ ->with('/bar/foo')
+ ->will($this->returnValue(array('permissions' => \OCP\PERMISSION_ALL, 'fileid' => 1)));
+
+ $view->expects($this->once())
+ ->method('unlink')
+ ->with('/bar/foo')
+ ->will($this->returnValue(true));
+
+ $view->expects($this->any())
+ ->method('resolvePath')
+ ->with('/bar/foo')
+ ->will($this->returnValue(array(null, 'foo')));
+
+ $node = new \OC\Files\Node\File($root, $view, '/bar/foo');
+ $node->delete();
+ $this->assertEquals(2, $hooksRun);
+ }
+
+ /**
+ * @expectedException \OCP\Files\NotPermittedException
+ */
+ public function testDeleteNotPermitted() {
+ $manager = $this->getMock('\OC\Files\Mount\Manager');
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user));
+
+ $root->expects($this->any())
+ ->method('getUser')
+ ->will($this->returnValue($this->user));
+
+ $view->expects($this->once())
+ ->method('getFileInfo')
+ ->with('/bar/foo')
+ ->will($this->returnValue(array('permissions' => \OCP\PERMISSION_READ)));
+
+ $node = new \OC\Files\Node\File($root, $view, '/bar/foo');
+ $node->delete();
+ }
+
+ public function testGetContent() {
+ /**
+ * @var \OC\Files\Mount\Manager $manager
+ */
+ $manager = $this->getMock('\OC\Files\Mount\Manager');
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = new \OC\Files\Node\Root($manager, $view, $this->user);
+
+ $hook = function ($file) {
+ throw new \Exception('Hooks are not supposed to be called');
+ };
+
+ $root->listen('\OC\Files', 'preWrite', $hook);
+ $root->listen('\OC\Files', 'postWrite', $hook);
+
+ $view->expects($this->once())
+ ->method('file_get_contents')
+ ->with('/bar/foo')
+ ->will($this->returnValue('bar'));
+
+ $view->expects($this->once())
+ ->method('getFileInfo')
+ ->with('/bar/foo')
+ ->will($this->returnValue(array('permissions' => \OCP\PERMISSION_READ)));
+
+ $node = new \OC\Files\Node\File($root, $view, '/bar/foo');
+ $this->assertEquals('bar', $node->getContent());
+ }
+
+ /**
+ * @expectedException \OCP\Files\NotPermittedException
+ */
+ public function testGetContentNotPermitted() {
+ $manager = $this->getMock('\OC\Files\Mount\Manager');
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user));
+
+ $root->expects($this->any())
+ ->method('getUser')
+ ->will($this->returnValue($this->user));
+
+ $view->expects($this->once())
+ ->method('getFileInfo')
+ ->with('/bar/foo')
+ ->will($this->returnValue(array('permissions' => 0)));
+
+ $node = new \OC\Files\Node\File($root, $view, '/bar/foo');
+ $node->getContent();
+ }
+
+ public function testPutContent() {
+ $manager = $this->getMock('\OC\Files\Mount\Manager');
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user));
+
+ $root->expects($this->any())
+ ->method('getUser')
+ ->will($this->returnValue($this->user));
+
+ $view->expects($this->once())
+ ->method('getFileInfo')
+ ->with('/bar/foo')
+ ->will($this->returnValue(array('permissions' => \OCP\PERMISSION_ALL)));
+
+ $view->expects($this->once())
+ ->method('file_put_contents')
+ ->with('/bar/foo', 'bar')
+ ->will($this->returnValue(true));
+
+ $node = new \OC\Files\Node\File($root, $view, '/bar/foo');
+ $node->putContent('bar');
+ }
+
+ /**
+ * @expectedException \OCP\Files\NotPermittedException
+ */
+ public function testPutContentNotPermitted() {
+ $manager = $this->getMock('\OC\Files\Mount\Manager');
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user));
+
+ $view->expects($this->once())
+ ->method('getFileInfo')
+ ->with('/bar/foo')
+ ->will($this->returnValue(array('permissions' => \OCP\PERMISSION_READ)));
+
+ $node = new \OC\Files\Node\File($root, $view, '/bar/foo');
+ $node->putContent('bar');
+ }
+
+ public function testGetMimeType() {
+ $manager = $this->getMock('\OC\Files\Mount\Manager');
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user));
+
+ $view->expects($this->once())
+ ->method('getMimeType')
+ ->with('/bar/foo')
+ ->will($this->returnValue('text/plain'));
+
+ $node = new \OC\Files\Node\File($root, $view, '/bar/foo');
+ $this->assertEquals('text/plain', $node->getMimeType());
+ }
+
+ public function testFOpenRead() {
+ $stream = fopen('php://memory', 'w+');
+ fwrite($stream, 'bar');
+ rewind($stream);
+
+ /**
+ * @var \OC\Files\Mount\Manager $manager
+ */
+ $manager = $this->getMock('\OC\Files\Mount\Manager');
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = new \OC\Files\Node\Root($manager, $view, $this->user);
+
+ $hook = function ($file) {
+ throw new \Exception('Hooks are not supposed to be called');
+ };
+
+ $root->listen('\OC\Files', 'preWrite', $hook);
+ $root->listen('\OC\Files', 'postWrite', $hook);
+
+ $view->expects($this->once())
+ ->method('fopen')
+ ->with('/bar/foo', 'r')
+ ->will($this->returnValue($stream));
+
+ $view->expects($this->once())
+ ->method('getFileInfo')
+ ->with('/bar/foo')
+ ->will($this->returnValue(array('permissions' => \OCP\PERMISSION_ALL)));
+
+ $node = new \OC\Files\Node\File($root, $view, '/bar/foo');
+ $fh = $node->fopen('r');
+ $this->assertEquals($stream, $fh);
+ $this->assertEquals('bar', fread($fh, 3));
+ }
+
+ public function testFOpenWrite() {
+ $stream = fopen('php://memory', 'w+');
+
+ /**
+ * @var \OC\Files\Mount\Manager $manager
+ */
+ $manager = $this->getMock('\OC\Files\Mount\Manager');
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = new \OC\Files\Node\Root($manager, new $view, $this->user);
+
+ $hooksCalled = 0;
+ $hook = function ($file) use (&$hooksCalled) {
+ $hooksCalled++;
+ };
+
+ $root->listen('\OC\Files', 'preWrite', $hook);
+ $root->listen('\OC\Files', 'postWrite', $hook);
+
+ $view->expects($this->once())
+ ->method('fopen')
+ ->with('/bar/foo', 'w')
+ ->will($this->returnValue($stream));
+
+ $view->expects($this->once())
+ ->method('getFileInfo')
+ ->with('/bar/foo')
+ ->will($this->returnValue(array('permissions' => \OCP\PERMISSION_ALL)));
+
+ $node = new \OC\Files\Node\File($root, $view, '/bar/foo');
+ $fh = $node->fopen('w');
+ $this->assertEquals($stream, $fh);
+ fwrite($fh, 'bar');
+ rewind($fh);
+ $this->assertEquals('bar', fread($stream, 3));
+ $this->assertEquals(2, $hooksCalled);
+ }
+
+ /**
+ * @expectedException \OCP\Files\NotPermittedException
+ */
+ public function testFOpenReadNotPermitted() {
+ /**
+ * @var \OC\Files\Mount\Manager $manager
+ */
+ $manager = $this->getMock('\OC\Files\Mount\Manager');
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = new \OC\Files\Node\Root($manager, $view, $this->user);
+
+ $hook = function ($file) {
+ throw new \Exception('Hooks are not supposed to be called');
+ };
+
+ $view->expects($this->once())
+ ->method('getFileInfo')
+ ->with('/bar/foo')
+ ->will($this->returnValue(array('permissions' => 0)));
+
+ $node = new \OC\Files\Node\File($root, $view, '/bar/foo');
+ $node->fopen('r');
+ }
+
+ /**
+ * @expectedException \OCP\Files\NotPermittedException
+ */
+ public function testFOpenReadWriteNoReadPermissions() {
+ /**
+ * @var \OC\Files\Mount\Manager $manager
+ */
+ $manager = $this->getMock('\OC\Files\Mount\Manager');
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = new \OC\Files\Node\Root($manager, $view, $this->user);
+
+ $hook = function () {
+ throw new \Exception('Hooks are not supposed to be called');
+ };
+
+ $view->expects($this->once())
+ ->method('getFileInfo')
+ ->with('/bar/foo')
+ ->will($this->returnValue(array('permissions' => \OCP\PERMISSION_UPDATE)));
+
+ $node = new \OC\Files\Node\File($root, $view, '/bar/foo');
+ $node->fopen('w');
+ }
+
+ /**
+ * @expectedException \OCP\Files\NotPermittedException
+ */
+ public function testFOpenReadWriteNoWritePermissions() {
+ /**
+ * @var \OC\Files\Mount\Manager $manager
+ */
+ $manager = $this->getMock('\OC\Files\Mount\Manager');
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = new \OC\Files\Node\Root($manager, new $view, $this->user);
+
+ $hook = function () {
+ throw new \Exception('Hooks are not supposed to be called');
+ };
+
+ $view->expects($this->once())
+ ->method('getFileInfo')
+ ->with('/bar/foo')
+ ->will($this->returnValue(array('permissions' => \OCP\PERMISSION_READ)));
+
+ $node = new \OC\Files\Node\File($root, $view, '/bar/foo');
+ $node->fopen('w');
+ }
+
+ public function testCopySameStorage() {
+ /**
+ * @var \OC\Files\Mount\Manager $manager
+ */
+ $manager = $this->getMock('\OC\Files\Mount\Manager');
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user));
+
+ $view->expects($this->any())
+ ->method('copy')
+ ->with('/bar/foo', '/bar/asd');
+
+ $view->expects($this->any())
+ ->method('getFileInfo')
+ ->will($this->returnValue(array('permissions' => \OCP\PERMISSION_ALL, 'fileid' => 3)));
+
+ $node = new \OC\Files\Node\File($root, $view, '/bar/foo');
+ $parentNode = new \OC\Files\Node\Folder($root, $view, '/bar');
+ $newNode = new \OC\Files\Node\File($root, $view, '/bar/asd');
+
+ $root->expects($this->exactly(2))
+ ->method('get')
+ ->will($this->returnValueMap(array(
+ array('/bar/asd', $newNode),
+ array('/bar', $parentNode)
+ )));
+
+ $target = $node->copy('/bar/asd');
+ $this->assertInstanceOf('\OC\Files\Node\File', $target);
+ $this->assertEquals(3, $target->getId());
+ }
+
+ /**
+ * @expectedException \OCP\Files\NotPermittedException
+ */
+ public function testCopyNotPermitted() {
+ /**
+ * @var \OC\Files\Mount\Manager $manager
+ */
+ $manager = $this->getMock('\OC\Files\Mount\Manager');
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user));
+ /**
+ * @var \OC\Files\Storage\Storage | \PHPUnit_Framework_MockObject_MockObject $storage
+ */
+ $storage = $this->getMock('\OC\Files\Storage\Storage');
+
+ $root->expects($this->never())
+ ->method('getMount');
+
+ $storage->expects($this->never())
+ ->method('copy');
+
+ $view->expects($this->any())
+ ->method('getFileInfo')
+ ->will($this->returnValue(array('permissions' => \OCP\PERMISSION_READ, 'fileid' => 3)));
+
+ $node = new \OC\Files\Node\File($root, $view, '/bar/foo');
+ $parentNode = new \OC\Files\Node\Folder($root, $view, '/bar');
+
+ $root->expects($this->once())
+ ->method('get')
+ ->will($this->returnValueMap(array(
+ array('/bar', $parentNode)
+ )));
+
+ $node->copy('/bar/asd');
+ }
+
+ /**
+ * @expectedException \OCP\Files\NotFoundException
+ */
+ public function testCopyNoParent() {
+ /**
+ * @var \OC\Files\Mount\Manager $manager
+ */
+ $manager = $this->getMock('\OC\Files\Mount\Manager');
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user));
+
+ $view->expects($this->never())
+ ->method('copy');
+
+ $node = new \OC\Files\Node\File($root, $view, '/bar/foo');
+
+ $root->expects($this->once())
+ ->method('get')
+ ->with('/bar/asd')
+ ->will($this->throwException(new NotFoundException()));
+
+ $node->copy('/bar/asd/foo');
+ }
+
+ /**
+ * @expectedException \OCP\Files\NotPermittedException
+ */
+ public function testCopyParentIsFile() {
+ /**
+ * @var \OC\Files\Mount\Manager $manager
+ */
+ $manager = $this->getMock('\OC\Files\Mount\Manager');
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user));
+
+ $view->expects($this->never())
+ ->method('copy');
+
+ $node = new \OC\Files\Node\File($root, $view, '/bar/foo');
+ $parentNode = new \OC\Files\Node\File($root, $view, '/bar');
+
+ $root->expects($this->once())
+ ->method('get')
+ ->will($this->returnValueMap(array(
+ array('/bar', $parentNode)
+ )));
+
+ $node->copy('/bar/asd');
+ }
+
+ public function testMoveSameStorage() {
+ /**
+ * @var \OC\Files\Mount\Manager $manager
+ */
+ $manager = $this->getMock('\OC\Files\Mount\Manager');
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user));
+
+ $view->expects($this->any())
+ ->method('rename')
+ ->with('/bar/foo', '/bar/asd');
+
+ $view->expects($this->any())
+ ->method('getFileInfo')
+ ->will($this->returnValue(array('permissions' => \OCP\PERMISSION_ALL, 'fileid' => 1)));
+
+ $node = new \OC\Files\Node\File($root, $view, '/bar/foo');
+ $parentNode = new \OC\Files\Node\Folder($root, $view, '/bar');
+
+ $root->expects($this->any())
+ ->method('get')
+ ->will($this->returnValueMap(array(array('/bar', $parentNode), array('/bar/asd', $node))));
+
+ $target = $node->move('/bar/asd');
+ $this->assertInstanceOf('\OC\Files\Node\File', $target);
+ $this->assertEquals(1, $target->getId());
+ $this->assertEquals('/bar/asd', $node->getPath());
+ }
+
+ /**
+ * @expectedException \OCP\Files\NotPermittedException
+ */
+ public function testMoveNotPermitted() {
+ /**
+ * @var \OC\Files\Mount\Manager $manager
+ */
+ $manager = $this->getMock('\OC\Files\Mount\Manager');
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user));
+
+ $view->expects($this->any())
+ ->method('getFileInfo')
+ ->will($this->returnValue(array('permissions' => \OCP\PERMISSION_READ)));
+
+ $view->expects($this->never())
+ ->method('rename');
+
+ $node = new \OC\Files\Node\File($root, $view, '/bar/foo');
+ $parentNode = new \OC\Files\Node\Folder($root, $view, '/bar');
+
+ $root->expects($this->once())
+ ->method('get')
+ ->with('/bar')
+ ->will($this->returnValue($parentNode));
+
+ $node->move('/bar/asd');
+ }
+
+ /**
+ * @expectedException \OCP\Files\NotFoundException
+ */
+ public function testMoveNoParent() {
+ /**
+ * @var \OC\Files\Mount\Manager $manager
+ */
+ $manager = $this->getMock('\OC\Files\Mount\Manager');
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user));
+ /**
+ * @var \OC\Files\Storage\Storage | \PHPUnit_Framework_MockObject_MockObject $storage
+ */
+ $storage = $this->getMock('\OC\Files\Storage\Storage');
+
+ $storage->expects($this->never())
+ ->method('rename');
+
+ $node = new \OC\Files\Node\File($root, $view, '/bar/foo');
+ $parentNode = new \OC\Files\Node\Folder($root, $view, '/bar');
+
+ $root->expects($this->once())
+ ->method('get')
+ ->with('/bar')
+ ->will($this->throwException(new NotFoundException()));
+
+ $node->move('/bar/asd');
+ }
+
+ /**
+ * @expectedException \OCP\Files\NotPermittedException
+ */
+ public function testMoveParentIsFile() {
+ /**
+ * @var \OC\Files\Mount\Manager $manager
+ */
+ $manager = $this->getMock('\OC\Files\Mount\Manager');
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user));
+
+ $view->expects($this->never())
+ ->method('rename');
+
+ $node = new \OC\Files\Node\File($root, $view, '/bar/foo');
+ $parentNode = new \OC\Files\Node\File($root, $view, '/bar');
+
+ $root->expects($this->once())
+ ->method('get')
+ ->with('/bar')
+ ->will($this->returnValue($parentNode));
+
+ $node->move('/bar/asd');
+ }
+}
diff --git a/tests/lib/files/node/folder.php b/tests/lib/files/node/folder.php
new file mode 100644
index 0000000000000000000000000000000000000000..b1589a276ba4cacca3dfcecc707e5287b3c103fa
--- /dev/null
+++ b/tests/lib/files/node/folder.php
@@ -0,0 +1,479 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace Test\Files\Node;
+
+use OC\Files\Cache\Cache;
+use OC\Files\Node\Node;
+use OCP\Files\NotFoundException;
+use OCP\Files\NotPermittedException;
+use OC\Files\View;
+
+class Folder extends \PHPUnit_Framework_TestCase {
+ private $user;
+
+ public function setUp() {
+ $this->user = new \OC\User\User('', new \OC_User_Dummy);
+ }
+
+ public function testDelete() {
+ $manager = $this->getMock('\OC\Files\Mount\Manager');
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user));
+ $root->expects($this->any())
+ ->method('getUser')
+ ->will($this->returnValue($this->user));
+ $root->expects($this->exactly(2))
+ ->method('emit')
+ ->will($this->returnValue(true));
+
+ $view->expects($this->any())
+ ->method('getFileInfo')
+ ->will($this->returnValue(array('permissions' => \OCP\PERMISSION_ALL)));
+
+ $view->expects($this->once())
+ ->method('rmdir')
+ ->with('/bar/foo')
+ ->will($this->returnValue(true));
+
+ $node = new \OC\Files\Node\Folder($root, $view, '/bar/foo');
+ $node->delete();
+ }
+
+ public function testDeleteHooks() {
+ $test = $this;
+ $hooksRun = 0;
+ /**
+ * @param \OC\Files\Node\File $node
+ */
+ $preListener = function ($node) use (&$test, &$hooksRun) {
+ $test->assertInstanceOf('\OC\Files\Node\Folder', $node);
+ $test->assertEquals('foo', $node->getInternalPath());
+ $test->assertEquals('/bar/foo', $node->getPath());
+ $hooksRun++;
+ };
+
+ /**
+ * @param \OC\Files\Node\File $node
+ */
+ $postListener = function ($node) use (&$test, &$hooksRun) {
+ $test->assertInstanceOf('\OC\Files\Node\NonExistingFolder', $node);
+ $test->assertEquals('foo', $node->getInternalPath());
+ $test->assertEquals('/bar/foo', $node->getPath());
+ $hooksRun++;
+ };
+
+ /**
+ * @var \OC\Files\Mount\Manager $manager
+ */
+ $manager = $this->getMock('\OC\Files\Mount\Manager');
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = new \OC\Files\Node\Root($manager, $view, $this->user);
+ $root->listen('\OC\Files', 'preDelete', $preListener);
+ $root->listen('\OC\Files', 'postDelete', $postListener);
+
+ $view->expects($this->any())
+ ->method('getFileInfo')
+ ->will($this->returnValue(array('permissions' => \OCP\PERMISSION_ALL, 'fileid' => 1)));
+
+ $view->expects($this->once())
+ ->method('rmdir')
+ ->with('/bar/foo')
+ ->will($this->returnValue(true));
+
+ $view->expects($this->any())
+ ->method('resolvePath')
+ ->with('/bar/foo')
+ ->will($this->returnValue(array(null, 'foo')));
+
+ $node = new \OC\Files\Node\Folder($root, $view, '/bar/foo');
+ $node->delete();
+ $this->assertEquals(2, $hooksRun);
+ }
+
+ /**
+ * @expectedException \OCP\Files\NotPermittedException
+ */
+ public function testDeleteNotPermitted() {
+ $manager = $this->getMock('\OC\Files\Mount\Manager');
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user));
+ $root->expects($this->any())
+ ->method('getUser')
+ ->will($this->returnValue($this->user));
+
+ $view->expects($this->once())
+ ->method('getFileInfo')
+ ->with('/bar/foo')
+ ->will($this->returnValue(array('permissions' => \OCP\PERMISSION_READ)));
+
+ $node = new \OC\Files\Node\Folder($root, $view, '/bar/foo');
+ $node->delete();
+ }
+
+ public function testGetDirectoryContent() {
+ $manager = $this->getMock('\OC\Files\Mount\Manager');
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user));
+ $root->expects($this->any())
+ ->method('getUser')
+ ->will($this->returnValue($this->user));
+
+ /**
+ * @var \OC\Files\Storage\Storage | \PHPUnit_Framework_MockObject_MockObject $storage
+ */
+ $storage = $this->getMock('\OC\Files\Storage\Storage');
+
+ $cache = $this->getMock('\OC\Files\Cache\Cache', array(), array(''));
+ $cache->expects($this->any())
+ ->method('getStatus')
+ ->with('foo')
+ ->will($this->returnValue(Cache::COMPLETE));
+
+ $cache->expects($this->once())
+ ->method('getFolderContents')
+ ->with('foo')
+ ->will($this->returnValue(array(
+ array('fileid' => 2, 'path' => '/bar/foo/asd', 'name' => 'asd', 'size' => 100, 'mtime' => 50, 'mimetype' => 'text/plain'),
+ array('fileid' => 3, 'path' => '/bar/foo/qwerty', 'name' => 'qwerty', 'size' => 200, 'mtime' => 55, 'mimetype' => 'httpd/unix-directory')
+ )));
+
+ $permissionsCache = $this->getMock('\OC\Files\Cache\Permissions', array(), array('/'));
+ $permissionsCache->expects($this->once())
+ ->method('getDirectoryPermissions')
+ ->will($this->returnValue(array(2 => \OCP\PERMISSION_ALL)));
+
+ $root->expects($this->once())
+ ->method('getMountsIn')
+ ->with('/bar/foo')
+ ->will($this->returnValue(array()));
+
+ $storage->expects($this->any())
+ ->method('getPermissionsCache')
+ ->will($this->returnValue($permissionsCache));
+ $storage->expects($this->any())
+ ->method('getCache')
+ ->will($this->returnValue($cache));
+
+ $view->expects($this->any())
+ ->method('resolvePath')
+ ->with('/bar/foo')
+ ->will($this->returnValue(array($storage, 'foo')));
+
+ $node = new \OC\Files\Node\Folder($root, $view, '/bar/foo');
+ $children = $node->getDirectoryListing();
+ $this->assertEquals(2, count($children));
+ $this->assertInstanceOf('\OC\Files\Node\File', $children[0]);
+ $this->assertInstanceOf('\OC\Files\Node\Folder', $children[1]);
+ $this->assertEquals('asd', $children[0]->getName());
+ $this->assertEquals('qwerty', $children[1]->getName());
+ }
+
+ public function testGet() {
+ $manager = $this->getMock('\OC\Files\Mount\Manager');
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user));
+ $root->expects($this->any())
+ ->method('getUser')
+ ->will($this->returnValue($this->user));
+
+ $root->expects($this->once())
+ ->method('get')
+ ->with('/bar/foo/asd');
+
+ $node = new \OC\Files\Node\Folder($root, $view, '/bar/foo');
+ $node->get('asd');
+ }
+
+ public function testNodeExists() {
+ $manager = $this->getMock('\OC\Files\Mount\Manager');
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user));
+ $root->expects($this->any())
+ ->method('getUser')
+ ->will($this->returnValue($this->user));
+
+ $child = new \OC\Files\Node\Folder($root, $view, '/bar/foo/asd');
+
+ $root->expects($this->once())
+ ->method('get')
+ ->with('/bar/foo/asd')
+ ->will($this->returnValue($child));
+
+ $node = new \OC\Files\Node\Folder($root, $view, '/bar/foo');
+ $this->assertTrue($node->nodeExists('asd'));
+ }
+
+ public function testNodeExistsNotExists() {
+ $manager = $this->getMock('\OC\Files\Mount\Manager');
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user));
+ $root->expects($this->any())
+ ->method('getUser')
+ ->will($this->returnValue($this->user));
+
+ $root->expects($this->once())
+ ->method('get')
+ ->with('/bar/foo/asd')
+ ->will($this->throwException(new NotFoundException()));
+
+ $node = new \OC\Files\Node\Folder($root, $view, '/bar/foo');
+ $this->assertFalse($node->nodeExists('asd'));
+ }
+
+ public function testNewFolder() {
+ $manager = $this->getMock('\OC\Files\Mount\Manager');
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user));
+ $root->expects($this->any())
+ ->method('getUser')
+ ->will($this->returnValue($this->user));
+
+ $view->expects($this->once())
+ ->method('getFileInfo')
+ ->with('/bar/foo')
+ ->will($this->returnValue(array('permissions' => \OCP\PERMISSION_ALL)));
+
+ $view->expects($this->once())
+ ->method('mkdir')
+ ->with('/bar/foo/asd')
+ ->will($this->returnValue(true));
+
+ $node = new \OC\Files\Node\Folder($root, $view, '/bar/foo');
+ $child = new \OC\Files\Node\Folder($root, $view, '/bar/foo/asd');
+ $result = $node->newFolder('asd');
+ $this->assertEquals($child, $result);
+ }
+
+ /**
+ * @expectedException \OCP\Files\NotPermittedException
+ */
+ public function testNewFolderNotPermitted() {
+ $manager = $this->getMock('\OC\Files\Mount\Manager');
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user));
+ $root->expects($this->any())
+ ->method('getUser')
+ ->will($this->returnValue($this->user));
+
+ $view->expects($this->once())
+ ->method('getFileInfo')
+ ->with('/bar/foo')
+ ->will($this->returnValue(array('permissions' => \OCP\PERMISSION_READ)));
+
+ $node = new \OC\Files\Node\Folder($root, $view, '/bar/foo');
+ $node->newFolder('asd');
+ }
+
+ public function testNewFile() {
+ $manager = $this->getMock('\OC\Files\Mount\Manager');
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user));
+ $root->expects($this->any())
+ ->method('getUser')
+ ->will($this->returnValue($this->user));
+
+ $view->expects($this->once())
+ ->method('getFileInfo')
+ ->with('/bar/foo')
+ ->will($this->returnValue(array('permissions' => \OCP\PERMISSION_ALL)));
+
+ $view->expects($this->once())
+ ->method('touch')
+ ->with('/bar/foo/asd')
+ ->will($this->returnValue(true));
+
+ $node = new \OC\Files\Node\Folder($root, $view, '/bar/foo');
+ $child = new \OC\Files\Node\File($root, $view, '/bar/foo/asd');
+ $result = $node->newFile('asd');
+ $this->assertEquals($child, $result);
+ }
+
+ /**
+ * @expectedException \OCP\Files\NotPermittedException
+ */
+ public function testNewFileNotPermitted() {
+ $manager = $this->getMock('\OC\Files\Mount\Manager');
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user));
+ $root->expects($this->any())
+ ->method('getUser')
+ ->will($this->returnValue($this->user));
+
+ $view->expects($this->once())
+ ->method('getFileInfo')
+ ->with('/bar/foo')
+ ->will($this->returnValue(array('permissions' => \OCP\PERMISSION_READ)));
+
+ $node = new \OC\Files\Node\Folder($root, $view, '/bar/foo');
+ $node->newFile('asd');
+ }
+
+ public function testGetFreeSpace() {
+ $manager = $this->getMock('\OC\Files\Mount\Manager');
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user));
+ $root->expects($this->any())
+ ->method('getUser')
+ ->will($this->returnValue($this->user));
+
+ $view->expects($this->once())
+ ->method('free_space')
+ ->with('/bar/foo')
+ ->will($this->returnValue(100));
+
+ $node = new \OC\Files\Node\Folder($root, $view, '/bar/foo');
+ $this->assertEquals(100, $node->getFreeSpace());
+ }
+
+ public function testSearch() {
+ $manager = $this->getMock('\OC\Files\Mount\Manager');
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user));
+ $root->expects($this->any())
+ ->method('getUser')
+ ->will($this->returnValue($this->user));
+ $storage = $this->getMock('\OC\Files\Storage\Storage');
+ $cache = $this->getMock('\OC\Files\Cache\Cache', array(), array(''));
+
+ $storage->expects($this->once())
+ ->method('getCache')
+ ->will($this->returnValue($cache));
+
+ $cache->expects($this->once())
+ ->method('search')
+ ->with('%qw%')
+ ->will($this->returnValue(array(
+ array('fileid' => 3, 'path' => 'foo/qwerty', 'name' => 'qwerty', 'size' => 200, 'mtime' => 55, 'mimetype' => 'text/plain')
+ )));
+
+ $root->expects($this->once())
+ ->method('getMountsIn')
+ ->with('/bar/foo')
+ ->will($this->returnValue(array()));
+
+ $view->expects($this->once())
+ ->method('resolvePath')
+ ->will($this->returnValue(array($storage, 'foo')));
+
+ $node = new \OC\Files\Node\Folder($root, $view, '/bar/foo');
+ $result = $node->search('qw');
+ $this->assertEquals(1, count($result));
+ $this->assertEquals('/bar/foo/qwerty', $result[0]->getPath());
+ }
+
+ public function testSearchSubStorages() {
+ $manager = $this->getMock('\OC\Files\Mount\Manager');
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user));
+ $root->expects($this->any())
+ ->method('getUser')
+ ->will($this->returnValue($this->user));
+ $storage = $this->getMock('\OC\Files\Storage\Storage');
+ $cache = $this->getMock('\OC\Files\Cache\Cache', array(), array(''));
+ $subCache = $this->getMock('\OC\Files\Cache\Cache', array(), array(''));
+ $subStorage = $this->getMock('\OC\Files\Storage\Storage');
+ $subMount = $this->getMock('\OC\Files\Mount\Mount', array(), array(null, ''));
+
+ $subMount->expects($this->once())
+ ->method('getStorage')
+ ->will($this->returnValue($subStorage));
+
+ $subMount->expects($this->once())
+ ->method('getMountPoint')
+ ->will($this->returnValue('/bar/foo/bar/'));
+
+ $storage->expects($this->once())
+ ->method('getCache')
+ ->will($this->returnValue($cache));
+
+ $subStorage->expects($this->once())
+ ->method('getCache')
+ ->will($this->returnValue($subCache));
+
+ $cache->expects($this->once())
+ ->method('search')
+ ->with('%qw%')
+ ->will($this->returnValue(array(
+ array('fileid' => 3, 'path' => 'foo/qwerty', 'name' => 'qwerty', 'size' => 200, 'mtime' => 55, 'mimetype' => 'text/plain')
+ )));
+
+ $subCache->expects($this->once())
+ ->method('search')
+ ->with('%qw%')
+ ->will($this->returnValue(array(
+ array('fileid' => 4, 'path' => 'asd/qweasd', 'name' => 'qweasd', 'size' => 200, 'mtime' => 55, 'mimetype' => 'text/plain')
+ )));
+
+ $root->expects($this->once())
+ ->method('getMountsIn')
+ ->with('/bar/foo')
+ ->will($this->returnValue(array($subMount)));
+
+ $view->expects($this->once())
+ ->method('resolvePath')
+ ->will($this->returnValue(array($storage, 'foo')));
+
+
+ $node = new \OC\Files\Node\Folder($root, $view, '/bar/foo');
+ $result = $node->search('qw');
+ $this->assertEquals(2, count($result));
+ }
+
+ public function testIsSubNode() {
+ $file = new Node(null, null, '/foo/bar');
+ $folder = new \OC\Files\Node\Folder(null, null, '/foo');
+ $this->assertTrue($folder->isSubNode($file));
+ $this->assertFalse($folder->isSubNode($folder));
+
+ $file = new Node(null, null, '/foobar');
+ $this->assertFalse($folder->isSubNode($file));
+ }
+}
diff --git a/tests/lib/files/node/integration.php b/tests/lib/files/node/integration.php
new file mode 100644
index 0000000000000000000000000000000000000000..14e1d05853d9c133d532d8700a14373dcd43a0e2
--- /dev/null
+++ b/tests/lib/files/node/integration.php
@@ -0,0 +1,122 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace Test\Files\Node;
+
+use OC\Files\Cache\Cache;
+use OC\Files\Mount\Manager;
+use OC\Files\Node\Root;
+use OCP\Files\NotFoundException;
+use OCP\Files\NotPermittedException;
+use OC\Files\Storage\Temporary;
+use OC\Files\View;
+use OC\User\User;
+
+class IntegrationTests extends \PHPUnit_Framework_TestCase {
+ /**
+ * @var \OC\Files\Node\Root $root
+ */
+ private $root;
+
+ /**
+ * @var \OC\Files\Storage\Storage[]
+ */
+ private $storages;
+
+ /**
+ * @var \OC\Files\View $view
+ */
+ private $view;
+
+ public function setUp() {
+ \OC\Files\Filesystem::init('', '');
+ \OC\Files\Filesystem::clearMounts();
+ $manager = \OC\Files\Filesystem::getMountManager();
+
+ \OC_Hook::clear('OC_Filesystem');
+
+ \OC_Hook::connect('OC_Filesystem', 'post_write', '\OC\Files\Cache\Updater', 'writeHook');
+ \OC_Hook::connect('OC_Filesystem', 'post_delete', '\OC\Files\Cache\Updater', 'deleteHook');
+ \OC_Hook::connect('OC_Filesystem', 'post_rename', '\OC\Files\Cache\Updater', 'renameHook');
+ \OC_Hook::connect('OC_Filesystem', 'post_touch', '\OC\Files\Cache\Updater', 'touchHook');
+
+ $user = new User(uniqid('user'), new \OC_User_Dummy);
+ \OC_User::setUserId($user->getUID());
+ $this->view = new View();
+ $this->root = new Root($manager, $this->view, $user);
+ $storage = new Temporary(array());
+ $subStorage = new Temporary(array());
+ $this->storages[] = $storage;
+ $this->storages[] = $subStorage;
+ $this->root->mount($storage, '/');
+ $this->root->mount($subStorage, '/substorage/');
+ }
+
+ public function tearDown() {
+ foreach ($this->storages as $storage) {
+ $storage->getCache()->clear();
+ }
+ \OC\Files\Filesystem::clearMounts();
+ }
+
+ public function testBasicFile() {
+ $file = $this->root->newFile('/foo.txt');
+ $this->assertCount(2, $this->root->getDirectoryListing());
+ $this->assertTrue($this->root->nodeExists('/foo.txt'));
+ $id = $file->getId();
+ $this->assertInstanceOf('\OC\Files\Node\File', $file);
+ $file->putContent('qwerty');
+ $this->assertEquals('text/plain', $file->getMimeType());
+ $this->assertEquals('qwerty', $file->getContent());
+ $this->assertFalse($this->root->nodeExists('/bar.txt'));
+ $file->move('/bar.txt');
+ $this->assertFalse($this->root->nodeExists('/foo.txt'));
+ $this->assertTrue($this->root->nodeExists('/bar.txt'));
+ $this->assertEquals('bar.txt', $file->getName());
+ $this->assertEquals('bar.txt', $file->getInternalPath());
+
+ $file->move('/substorage/bar.txt');
+ $this->assertNotEquals($id, $file->getId());
+ $this->assertEquals('qwerty', $file->getContent());
+ }
+
+ public function testBasicFolder() {
+ $folder = $this->root->newFolder('/foo');
+ $this->assertTrue($this->root->nodeExists('/foo'));
+ $file = $folder->newFile('/bar');
+ $this->assertTrue($this->root->nodeExists('/foo/bar'));
+ $file->putContent('qwerty');
+
+ $listing = $folder->getDirectoryListing();
+ $this->assertEquals(1, count($listing));
+ $this->assertEquals($file->getId(), $listing[0]->getId());
+ $this->assertEquals($file->getStorage(), $listing[0]->getStorage());
+
+
+ $rootListing = $this->root->getDirectoryListing();
+ $this->assertEquals(2, count($rootListing));
+
+ $folder->move('/asd');
+ /**
+ * @var \OC\Files\Node\File $file
+ */
+ $file = $folder->get('/bar');
+ $this->assertInstanceOf('\OC\Files\Node\File', $file);
+ $this->assertFalse($this->root->nodeExists('/foo/bar'));
+ $this->assertTrue($this->root->nodeExists('/asd/bar'));
+ $this->assertEquals('qwerty', $file->getContent());
+ $folder->move('/substorage/foo');
+ /**
+ * @var \OC\Files\Node\File $file
+ */
+ $file = $folder->get('/bar');
+ $this->assertInstanceOf('\OC\Files\Node\File', $file);
+ $this->assertTrue($this->root->nodeExists('/substorage/foo/bar'));
+ $this->assertEquals('qwerty', $file->getContent());
+ }
+}
diff --git a/tests/lib/files/node/node.php b/tests/lib/files/node/node.php
new file mode 100644
index 0000000000000000000000000000000000000000..cf5fec30522124ec39d6745d8f01e5555d757348
--- /dev/null
+++ b/tests/lib/files/node/node.php
@@ -0,0 +1,330 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace Test\Files\Node;
+
+class Node extends \PHPUnit_Framework_TestCase {
+ private $user;
+
+ public function setUp() {
+ $this->user = new \OC\User\User('', new \OC_User_Dummy);
+ }
+
+ public function testStat() {
+ $manager = $this->getMock('\OC\Files\Mount\Manager');
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user));
+ $root->expects($this->any())
+ ->method('getUser')
+ ->will($this->returnValue($this->user));
+
+ $stat = array(
+ 'fileid' => 1,
+ 'size' => 100,
+ 'etag' => 'qwerty',
+ 'mtime' => 50,
+ 'permissions' => 0
+ );
+
+ $view->expects($this->once())
+ ->method('stat')
+ ->with('/bar/foo')
+ ->will($this->returnValue($stat));
+
+ $node = new \OC\Files\Node\File($root, $view, '/bar/foo');
+ $this->assertEquals($stat, $node->stat());
+ }
+
+ public function testGetId() {
+ $manager = $this->getMock('\OC\Files\Mount\Manager');
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user));
+ $root->expects($this->any())
+ ->method('getUser')
+ ->will($this->returnValue($this->user));
+
+ $stat = array(
+ 'fileid' => 1,
+ 'size' => 100,
+ 'etag' => 'qwerty',
+ 'mtime' => 50
+ );
+
+ $view->expects($this->once())
+ ->method('getFileInfo')
+ ->with('/bar/foo')
+ ->will($this->returnValue($stat));
+
+ $node = new \OC\Files\Node\File($root, $view, '/bar/foo');
+ $this->assertEquals(1, $node->getId());
+ }
+
+ public function testGetSize() {
+ $manager = $this->getMock('\OC\Files\Mount\Manager');
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user));
+ $root->expects($this->any())
+ ->method('getUser')
+ ->will($this->returnValue($this->user));
+
+ $view->expects($this->once())
+ ->method('filesize')
+ ->with('/bar/foo')
+ ->will($this->returnValue(100));
+
+ $node = new \OC\Files\Node\File($root, $view, '/bar/foo');
+ $this->assertEquals(100, $node->getSize());
+ }
+
+ public function testGetEtag() {
+ $manager = $this->getMock('\OC\Files\Mount\Manager');
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user));
+ $root->expects($this->any())
+ ->method('getUser')
+ ->will($this->returnValue($this->user));
+
+ $stat = array(
+ 'fileid' => 1,
+ 'size' => 100,
+ 'etag' => 'qwerty',
+ 'mtime' => 50
+ );
+
+ $view->expects($this->once())
+ ->method('getFileInfo')
+ ->with('/bar/foo')
+ ->will($this->returnValue($stat));
+
+ $node = new \OC\Files\Node\File($root, $view, '/bar/foo');
+ $this->assertEquals('qwerty', $node->getEtag());
+ }
+
+ public function testGetMTime() {
+ $manager = $this->getMock('\OC\Files\Mount\Manager');
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user));
+ $root->expects($this->any())
+ ->method('getUser')
+ ->will($this->returnValue($this->user));
+ /**
+ * @var \OC\Files\Storage\Storage | \PHPUnit_Framework_MockObject_MockObject $storage
+ */
+ $storage = $this->getMock('\OC\Files\Storage\Storage');
+
+ $view->expects($this->once())
+ ->method('filemtime')
+ ->with('/bar/foo')
+ ->will($this->returnValue(50));
+
+ $node = new \OC\Files\Node\File($root, $view, '/bar/foo');
+ $this->assertEquals(50, $node->getMTime());
+ }
+
+ public function testGetStorage() {
+ $manager = $this->getMock('\OC\Files\Mount\Manager');
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user));
+ $root->expects($this->any())
+ ->method('getUser')
+ ->will($this->returnValue($this->user));
+ /**
+ * @var \OC\Files\Storage\Storage | \PHPUnit_Framework_MockObject_MockObject $storage
+ */
+ $storage = $this->getMock('\OC\Files\Storage\Storage');
+
+ $view->expects($this->once())
+ ->method('resolvePath')
+ ->with('/bar/foo')
+ ->will($this->returnValue(array($storage, 'foo')));
+
+
+ $node = new \OC\Files\Node\File($root, $view, '/bar/foo');
+ $this->assertEquals($storage, $node->getStorage());
+ }
+
+ public function testGetPath() {
+ $manager = $this->getMock('\OC\Files\Mount\Manager');
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user));
+ $root->expects($this->any())
+ ->method('getUser')
+ ->will($this->returnValue($this->user));
+
+ $node = new \OC\Files\Node\File($root, $view, '/bar/foo');
+ $this->assertEquals('/bar/foo', $node->getPath());
+ }
+
+ public function testGetInternalPath() {
+ $manager = $this->getMock('\OC\Files\Mount\Manager');
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user));
+ $root->expects($this->any())
+ ->method('getUser')
+ ->will($this->returnValue($this->user));
+ /**
+ * @var \OC\Files\Storage\Storage | \PHPUnit_Framework_MockObject_MockObject $storage
+ */
+ $storage = $this->getMock('\OC\Files\Storage\Storage');
+
+ $view->expects($this->once())
+ ->method('resolvePath')
+ ->with('/bar/foo')
+ ->will($this->returnValue(array($storage, 'foo')));
+
+
+ $node = new \OC\Files\Node\File($root, $view, '/bar/foo');
+ $this->assertEquals('foo', $node->getInternalPath());
+ }
+
+ public function testGetName() {
+ $manager = $this->getMock('\OC\Files\Mount\Manager');
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user));
+ $root->expects($this->any())
+ ->method('getUser')
+ ->will($this->returnValue($this->user));
+
+ $node = new \OC\Files\Node\File($root, $view, '/bar/foo');
+ $this->assertEquals('foo', $node->getName());
+ }
+
+ public function testTouchSetMTime() {
+ $manager = $this->getMock('\OC\Files\Mount\Manager');
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user));
+ $root->expects($this->any())
+ ->method('getUser')
+ ->will($this->returnValue($this->user));
+
+ $view->expects($this->once())
+ ->method('touch')
+ ->with('/bar/foo', 100)
+ ->will($this->returnValue(true));
+
+ $view->expects($this->once())
+ ->method('filemtime')
+ ->with('/bar/foo')
+ ->will($this->returnValue(100));
+
+ $view->expects($this->once())
+ ->method('getFileInfo')
+ ->with('/bar/foo')
+ ->will($this->returnValue(array('permissions' => \OCP\PERMISSION_ALL)));
+
+ $node = new \OC\Files\Node\Node($root, $view, '/bar/foo');
+ $node->touch(100);
+ $this->assertEquals(100, $node->getMTime());
+ }
+
+ public function testTouchHooks() {
+ $test = $this;
+ $hooksRun = 0;
+ /**
+ * @param \OC\Files\Node\File $node
+ */
+ $preListener = function ($node) use (&$test, &$hooksRun) {
+ $test->assertEquals('foo', $node->getInternalPath());
+ $test->assertEquals('/bar/foo', $node->getPath());
+ $hooksRun++;
+ };
+
+ /**
+ * @param \OC\Files\Node\File $node
+ */
+ $postListener = function ($node) use (&$test, &$hooksRun) {
+ $test->assertEquals('foo', $node->getInternalPath());
+ $test->assertEquals('/bar/foo', $node->getPath());
+ $hooksRun++;
+ };
+
+ /**
+ * @var \OC\Files\Mount\Manager $manager
+ */
+ $manager = $this->getMock('\OC\Files\Mount\Manager');
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = new \OC\Files\Node\Root($manager, $view, $this->user);
+ $root->listen('\OC\Files', 'preTouch', $preListener);
+ $root->listen('\OC\Files', 'postTouch', $postListener);
+
+ $view->expects($this->once())
+ ->method('touch')
+ ->with('/bar/foo', 100)
+ ->will($this->returnValue(true));
+
+ $view->expects($this->any())
+ ->method('resolvePath')
+ ->with('/bar/foo')
+ ->will($this->returnValue(array(null, 'foo')));
+
+ $view->expects($this->any())
+ ->method('getFileInfo')
+ ->with('/bar/foo')
+ ->will($this->returnValue(array('permissions' => \OCP\PERMISSION_ALL)));
+
+ $node = new \OC\Files\Node\Node($root, $view, '/bar/foo');
+ $node->touch(100);
+ $this->assertEquals(2, $hooksRun);
+ }
+
+ /**
+ * @expectedException \OCP\Files\NotPermittedException
+ */
+ public function testTouchNotPermitted() {
+ $manager = $this->getMock('\OC\Files\Mount\Manager');
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user));
+ $root->expects($this->any())
+ ->method('getUser')
+ ->will($this->returnValue($this->user));
+
+ $view->expects($this->any())
+ ->method('getFileInfo')
+ ->with('/bar/foo')
+ ->will($this->returnValue(array('permissions' => \OCP\PERMISSION_READ)));
+
+ $node = new \OC\Files\Node\Node($root, $view, '/bar/foo');
+ $node->touch(100);
+ }
+}
diff --git a/tests/lib/files/node/root.php b/tests/lib/files/node/root.php
new file mode 100644
index 0000000000000000000000000000000000000000..97eaf7f716267fc812fa7267d5a0844938ea2047
--- /dev/null
+++ b/tests/lib/files/node/root.php
@@ -0,0 +1,106 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace Test\Files\Node;
+
+use OC\Files\Cache\Cache;
+use OCP\Files\NotPermittedException;
+use OC\Files\Mount\Manager;
+
+class Root extends \PHPUnit_Framework_TestCase {
+ private $user;
+
+ public function setUp() {
+ $this->user = new \OC\User\User('', new \OC_User_Dummy);
+ }
+
+ public function testGet() {
+ $manager = new Manager();
+ /**
+ * @var \OC\Files\Storage\Storage $storage
+ */
+ $storage = $this->getMock('\OC\Files\Storage\Storage');
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = new \OC\Files\Node\Root($manager, $view, $this->user);
+
+ $view->expects($this->once())
+ ->method('getFileInfo')
+ ->with('/bar/foo')
+ ->will($this->returnValue(array('fileid' => 10, 'path' => 'bar/foo', 'name', 'mimetype' => 'text/plain')));
+
+ $view->expects($this->once())
+ ->method('is_dir')
+ ->with('/bar/foo')
+ ->will($this->returnValue(false));
+
+ $view->expects($this->once())
+ ->method('file_exists')
+ ->with('/bar/foo')
+ ->will($this->returnValue(true));
+
+ $root->mount($storage, '');
+ $node = $root->get('/bar/foo');
+ $this->assertEquals(10, $node->getId());
+ $this->assertInstanceOf('\OC\Files\Node\File', $node);
+ }
+
+ /**
+ * @expectedException \OCP\Files\NotFoundException
+ */
+ public function testGetNotFound() {
+ $manager = new Manager();
+ /**
+ * @var \OC\Files\Storage\Storage $storage
+ */
+ $storage = $this->getMock('\OC\Files\Storage\Storage');
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = new \OC\Files\Node\Root($manager, $view, $this->user);
+
+ $view->expects($this->once())
+ ->method('file_exists')
+ ->with('/bar/foo')
+ ->will($this->returnValue(false));
+
+ $root->mount($storage, '');
+ $root->get('/bar/foo');
+ }
+
+ /**
+ * @expectedException \OCP\Files\NotPermittedException
+ */
+ public function testGetInvalidPath() {
+ $manager = new Manager();
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = new \OC\Files\Node\Root($manager, $view, $this->user);
+
+ $root->get('/../foo');
+ }
+
+ /**
+ * @expectedException \OCP\Files\NotFoundException
+ */
+ public function testGetNoStorages() {
+ $manager = new Manager();
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = new \OC\Files\Node\Root($manager, $view, $this->user);
+
+ $root->get('/bar/foo');
+ }
+}
diff --git a/tests/lib/files/view.php b/tests/lib/files/view.php
index 3bac9e770aa1b73fa81bd0b162a3c83618bdc8ce..3043f132b73ea118af1e7bcd1f6e4f752c613f70 100644
--- a/tests/lib/files/view.php
+++ b/tests/lib/files/view.php
@@ -25,7 +25,7 @@ class View extends \PHPUnit_Framework_TestCase {
//login
\OC_User::createUser('test', 'test');
- $this->user=\OC_User::getUser();
+ $this->user = \OC_User::getUser();
\OC_User::setUserId('test');
\OC\Files\Filesystem::clearMounts();
@@ -325,8 +325,51 @@ class View extends \PHPUnit_Framework_TestCase {
$this->assertEquals($cachedData['storage_mtime'], $cachedData['mtime']);
}
+ /**
+ * @medium
+ */
+ function testViewHooks() {
+ $storage1 = $this->getTestStorage();
+ $storage2 = $this->getTestStorage();
+ $defaultRoot = \OC\Files\Filesystem::getRoot();
+ \OC\Files\Filesystem::mount($storage1, array(), '/');
+ \OC\Files\Filesystem::mount($storage2, array(), $defaultRoot . '/substorage');
+ \OC_Hook::connect('OC_Filesystem', 'post_write', $this, 'dummyHook');
+
+ $rootView = new \OC\Files\View('');
+ $subView = new \OC\Files\View($defaultRoot . '/substorage');
+ $this->hookPath = null;
+
+ $rootView->file_put_contents('/foo.txt', 'asd');
+ $this->assertNull($this->hookPath);
+
+ $subView->file_put_contents('/foo.txt', 'asd');
+ $this->assertNotNull($this->hookPath);
+ $this->assertEquals('/substorage/foo.txt', $this->hookPath);
+ }
+
+ private $hookPath;
+
+ function dummyHook($params) {
+ $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/helper.php b/tests/lib/helper.php
index 67b5a3d43ecc509bd56822e0df00341ea05cb881..b4d896e51967effe1b6a1b55b08f936e9a27fedb 100644
--- a/tests/lib/helper.php
+++ b/tests/lib/helper.php
@@ -8,40 +8,42 @@
class Test_Helper extends PHPUnit_Framework_TestCase {
- function testHumanFileSize() {
- $result = OC_Helper::humanFileSize(0);
- $expected = '0 B';
- $this->assertEquals($result, $expected);
-
- $result = OC_Helper::humanFileSize(1024);
- $expected = '1 kB';
- $this->assertEquals($result, $expected);
-
- $result = OC_Helper::humanFileSize(10000000);
- $expected = '9.5 MB';
- $this->assertEquals($result, $expected);
-
- $result = OC_Helper::humanFileSize(500000000000);
- $expected = '465.7 GB';
- $this->assertEquals($result, $expected);
+ /**
+ * @dataProvider humanFileSizeProvider
+ */
+ public function testHumanFileSize($expected, $input)
+ {
+ $result = OC_Helper::humanFileSize($input);
+ $this->assertEquals($expected, $result);
}
- function testComputerFileSize() {
- $result = OC_Helper::computerFileSize("0 B");
- $expected = '0.0';
- $this->assertEquals($result, $expected);
-
- $result = OC_Helper::computerFileSize("1 kB");
- $expected = '1024.0';
- $this->assertEquals($result, $expected);
+ public function humanFileSizeProvider()
+ {
+ return array(
+ array('0 B', 0),
+ array('1 kB', 1024),
+ array('9.5 MB', 10000000),
+ array('465.7 GB', 500000000000),
+ array('454.7 TB', 500000000000000),
+ array('444.1 PB', 500000000000000000),
+ );
+ }
- $result = OC_Helper::computerFileSize("9.5 MB");
- $expected = '9961472.0';
- $this->assertEquals($result, $expected);
+ /**
+ * @dataProvider computerFileSizeProvider
+ */
+ function testComputerFileSize($expected, $input) {
+ $result = OC_Helper::computerFileSize($input);
+ $this->assertEquals($expected, $result);
+ }
- $result = OC_Helper::computerFileSize("465.7 GB");
- $expected = '500041567436.8';
- $this->assertEquals($result, $expected);
+ function computerFileSizeProvider(){
+ return array(
+ array(0.0, "0 B"),
+ array(1024.0, "1 kB"),
+ array(9961472.0, "9.5 MB"),
+ array(500041567436.8, "465.7 GB"),
+ );
}
function testGetMimeType() {
diff --git a/tests/lib/image.php b/tests/lib/image.php
index 0583c300075b87c88faf0b42689bdefad27e91ed..4aba1b0bc61e56fd46eb7dfaebac55273aed2a34 100644
--- a/tests/lib/image.php
+++ b/tests/lib/image.php
@@ -7,6 +7,10 @@
*/
class Test_Image extends PHPUnit_Framework_TestCase {
+ public static function tearDownAfterClass() {
+ unlink(OC::$SERVERROOT.'/tests/data/testimage2.png');
+ unlink(OC::$SERVERROOT.'/tests/data/testimage2.jpg');
+ }
public function testGetMimeTypeForFile() {
$mimetype = \OC_Image::getMimeTypeForFile(OC::$SERVERROOT.'/tests/data/testimage.png');
@@ -55,7 +59,6 @@ class Test_Image extends PHPUnit_Framework_TestCase {
}
public function testMimeType() {
- $this->markTestSkipped("When loading from data or base64, imagetype is always image/png, see #4258.");
$img = new \OC_Image(OC::$SERVERROOT.'/tests/data/testimage.png');
$this->assertEquals('image/png', $img->mimeType());
@@ -102,35 +105,50 @@ class Test_Image extends PHPUnit_Framework_TestCase {
$img->resize(16);
$img->save(OC::$SERVERROOT.'/tests/data/testimage2.png');
$this->assertEquals(file_get_contents(OC::$SERVERROOT.'/tests/data/testimage2.png'), $img->data());
+
+ $img = new \OC_Image(OC::$SERVERROOT.'/tests/data/testimage.jpg');
+ $img->resize(128);
+ $img->save(OC::$SERVERROOT.'/tests/data/testimage2.jpg');
+ $this->assertEquals(file_get_contents(OC::$SERVERROOT.'/tests/data/testimage2.jpg'), $img->data());
}
public function testData() {
- $this->markTestSkipped("\OC_Image->data() converts to png before outputting data, see #4258.");
$img = new \OC_Image(OC::$SERVERROOT.'/tests/data/testimage.png');
- $expected = file_get_contents(OC::$SERVERROOT.'/tests/data/testimage.png');
+ $raw = imagecreatefromstring(file_get_contents(OC::$SERVERROOT.'/tests/data/testimage.png'));
+ ob_start();
+ imagepng($raw);
+ $expected = ob_get_clean();
$this->assertEquals($expected, $img->data());
$img = new \OC_Image(OC::$SERVERROOT.'/tests/data/testimage.jpg');
- $expected = file_get_contents(OC::$SERVERROOT.'/tests/data/testimage.jpg');
+ $raw = imagecreatefromstring(file_get_contents(OC::$SERVERROOT.'/tests/data/testimage.jpg'));
+ ob_start();
+ imagejpeg($raw);
+ $expected = ob_get_clean();
$this->assertEquals($expected, $img->data());
$img = new \OC_Image(OC::$SERVERROOT.'/tests/data/testimage.gif');
- $expected = file_get_contents(OC::$SERVERROOT.'/tests/data/testimage.gif');
+ $raw = imagecreatefromstring(file_get_contents(OC::$SERVERROOT.'/tests/data/testimage.gif'));
+ ob_start();
+ imagegif($raw);
+ $expected = ob_get_clean();
$this->assertEquals($expected, $img->data());
}
+ /**
+ * @depends testData
+ */
public function testToString() {
- $this->markTestSkipped("\OC_Image->data() converts to png before outputting data, see #4258.");
$img = new \OC_Image(OC::$SERVERROOT.'/tests/data/testimage.png');
- $expected = base64_encode(file_get_contents(OC::$SERVERROOT.'/tests/data/testimage.png'));
+ $expected = base64_encode($img->data());
$this->assertEquals($expected, (string)$img);
$img = new \OC_Image(file_get_contents(OC::$SERVERROOT.'/tests/data/testimage.jpg'));
- $expected = base64_encode(file_get_contents(OC::$SERVERROOT.'/tests/data/testimage.jpg'));
+ $expected = base64_encode($img->data());
$this->assertEquals($expected, (string)$img);
$img = new \OC_Image(OC::$SERVERROOT.'/tests/data/testimage.gif');
- $expected = base64_encode(file_get_contents(OC::$SERVERROOT.'/tests/data/testimage.gif'));
+ $expected = base64_encode($img->data());
$this->assertEquals($expected, (string)$img);
}
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/preview.php b/tests/lib/preview.php
new file mode 100644
index 0000000000000000000000000000000000000000..d0cdd2c44fba78c7031333e4132117a70f3a9344
--- /dev/null
+++ b/tests/lib/preview.php
@@ -0,0 +1,149 @@
+<?php
+/**
+ * Copyright (c) 2013 Georg Ehrke <georg@ownCloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace Test;
+
+class Preview extends \PHPUnit_Framework_TestCase {
+
+ public function testIsPreviewDeleted() {
+ $user = $this->initFS();
+
+ $rootView = new \OC\Files\View('');
+ $rootView->mkdir('/'.$user);
+ $rootView->mkdir('/'.$user.'/files');
+
+ $samplefile = '/'.$user.'/files/test.txt';
+
+ $rootView->file_put_contents($samplefile, 'dummy file data');
+
+ $x = 50;
+ $y = 50;
+
+ $preview = new \OC\Preview($user, 'files/', 'test.txt', $x, $y);
+ $preview->getPreview();
+
+ $fileinfo = $rootView->getFileInfo($samplefile);
+ $fileid = $fileinfo['fileid'];
+
+ $thumbcachefile = '/' . $user . '/' . \OC\Preview::THUMBNAILS_FOLDER . '/' . $fileid . '/' . $x . '-' . $y . '.png';
+
+ $this->assertEquals($rootView->file_exists($thumbcachefile), true);
+
+ $preview->deletePreview();
+
+ $this->assertEquals($rootView->file_exists($thumbcachefile), false);
+ }
+
+ public function testAreAllPreviewsDeleted() {
+ $user = $this->initFS();
+
+ $rootView = new \OC\Files\View('');
+ $rootView->mkdir('/'.$user);
+ $rootView->mkdir('/'.$user.'/files');
+
+ $samplefile = '/'.$user.'/files/test.txt';
+
+ $rootView->file_put_contents($samplefile, 'dummy file data');
+
+ $x = 50;
+ $y = 50;
+
+ $preview = new \OC\Preview($user, 'files/', 'test.txt', $x, $y);
+ $preview->getPreview();
+
+ $fileinfo = $rootView->getFileInfo($samplefile);
+ $fileid = $fileinfo['fileid'];
+
+ $thumbcachefolder = '/' . $user . '/' . \OC\Preview::THUMBNAILS_FOLDER . '/' . $fileid . '/';
+
+ $this->assertEquals($rootView->is_dir($thumbcachefolder), true);
+
+ $preview->deleteAllPreviews();
+
+ $this->assertEquals($rootView->is_dir($thumbcachefolder), false);
+ }
+
+ public function testIsMaxSizeWorking() {
+ $user = $this->initFS();
+
+ $maxX = 250;
+ $maxY = 250;
+
+ \OC_Config::setValue('preview_max_x', $maxX);
+ \OC_Config::setValue('preview_max_y', $maxY);
+
+ $rootView = new \OC\Files\View('');
+ $rootView->mkdir('/'.$user);
+ $rootView->mkdir('/'.$user.'/files');
+
+ $samplefile = '/'.$user.'/files/test.txt';
+
+ $rootView->file_put_contents($samplefile, 'dummy file data');
+
+ $preview = new \OC\Preview($user, 'files/', 'test.txt', 1000, 1000);
+ $image = $preview->getPreview();
+
+ $this->assertEquals($image->width(), $maxX);
+ $this->assertEquals($image->height(), $maxY);
+ }
+
+ public function txtBlacklist() {
+ $txt = 'random text file';
+ $ics = file_get_contents(__DIR__ . '/../data/testcal.ics');
+ $vcf = file_get_contents(__DIR__ . '/../data/testcontact.vcf');
+
+ return array(
+ array('txt', $txt, false),
+ array('ics', $ics, true),
+ array('vcf', $vcf, true),
+ );
+ }
+
+ /**
+ * @dataProvider txtBlacklist
+ */
+ public function testIsTransparent($extension, $data, $expectedResult) {
+ $user = $this->initFS();
+
+ $rootView = new \OC\Files\View('');
+ $rootView->mkdir('/'.$user);
+ $rootView->mkdir('/'.$user.'/files');
+
+ $x = 32;
+ $y = 32;
+
+ $sample = '/'.$user.'/files/test.'.$extension;
+ $rootView->file_put_contents($sample, $data);
+ $preview = new \OC\Preview($user, 'files/', 'test.'.$extension, $x, $y);
+ $image = $preview->getPreview();
+ $resource = $image->resource();
+
+ //http://stackoverflow.com/questions/5702953/imagecolorat-and-transparency
+ $colorIndex = imagecolorat($resource, 1, 1);
+ $colorInfo = imagecolorsforindex($resource, $colorIndex);
+ $this->assertEquals(
+ $expectedResult,
+ $colorInfo['alpha'] === 127,
+ 'Failed asserting that only previews for text files are transparent.'
+ );
+ }
+
+ private function initFS() {
+ if(\OC\Files\Filesystem::getView()){
+ $user = \OC_User::getUser();
+ }else{
+ $user=uniqid();
+ \OC_User::setUserId($user);
+ \OC\Files\Filesystem::init($user, '/'.$user.'/files');
+ }
+
+ \OC\Files\Filesystem::mount('OC\Files\Storage\Temporary', array(), '/');
+
+ return $user;
+ }
+}
diff --git a/tests/lib/share/share.php b/tests/lib/share/share.php
index e7d441a7e780db7ff1c8d20a0a498c8d4a8863a3..8e9eef65d320fad8bb5d8f4af1211f78c9ae0fb0 100644
--- a/tests/lib/share/share.php
+++ b/tests/lib/share/share.php
@@ -29,6 +29,8 @@ class Test_Share extends PHPUnit_Framework_TestCase {
protected $group1;
protected $group2;
protected $resharing;
+ protected $dateInFuture;
+ protected $dateInPast;
public function setUp() {
OC_User::clearBackends();
@@ -58,6 +60,12 @@ class Test_Share extends PHPUnit_Framework_TestCase {
OC::registerShareHooks();
$this->resharing = OC_Appconfig::getValue('core', 'shareapi_allow_resharing', 'yes');
OC_Appconfig::setValue('core', 'shareapi_allow_resharing', 'yes');
+
+ // 20 Minutes in the past, 20 minutes in the future.
+ $now = time();
+ $dateFormat = 'Y-m-d H:i:s';
+ $this->dateInPast = date($dateFormat, $now - 20 * 60);
+ $this->dateInFuture = date($dateFormat, $now + 20 * 60);
}
public function tearDown() {
@@ -121,6 +129,26 @@ class Test_Share extends PHPUnit_Framework_TestCase {
}
}
+ protected function shareUserOneTestFileWithUserTwo() {
+ OC_User::setUserId($this->user1);
+ $this->assertTrue(
+ OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\PERMISSION_READ),
+ 'Failed asserting that user 1 successfully shared text.txt with user 2.'
+ );
+ $this->assertEquals(
+ array('test.txt'),
+ OCP\Share::getItemShared('test', 'test.txt', Test_Share_Backend::FORMAT_SOURCE),
+ 'Failed asserting that test.txt is a shared file of user 1.'
+ );
+
+ OC_User::setUserId($this->user2);
+ $this->assertEquals(
+ array('test.txt'),
+ OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_SOURCE),
+ 'Failed asserting that user 2 has access to test.txt after initial sharing.'
+ );
+ }
+
public function testShareWithUser() {
// Invalid shares
$message = 'Sharing test.txt failed, because the user '.$this->user1.' is the item owner';
@@ -146,10 +174,7 @@ class Test_Share extends PHPUnit_Framework_TestCase {
}
// Valid share
- $this->assertTrue(OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\PERMISSION_READ));
- $this->assertEquals(array('test.txt'), OCP\Share::getItemShared('test', 'test.txt', Test_Share_Backend::FORMAT_SOURCE));
- OC_User::setUserId($this->user2);
- $this->assertEquals(array('test.txt'), OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_SOURCE));
+ $this->shareUserOneTestFileWithUserTwo();
// Attempt to share again
OC_User::setUserId($this->user1);
@@ -264,6 +289,66 @@ class Test_Share extends PHPUnit_Framework_TestCase {
$this->assertEquals(array('test1.txt'), OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET));
}
+ public function testShareWithUserExpirationExpired() {
+ $this->shareUserOneTestFileWithUserTwo();
+
+ OC_User::setUserId($this->user1);
+ $this->assertTrue(
+ OCP\Share::setExpirationDate('test', 'test.txt', $this->dateInPast),
+ 'Failed asserting that user 1 successfully set an expiration date for the test.txt share.'
+ );
+
+ OC_User::setUserId($this->user2);
+ $this->assertFalse(
+ OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_SOURCE),
+ 'Failed asserting that user 2 no longer has access to test.txt after expiration.'
+ );
+ }
+
+ public function testShareWithUserExpirationValid() {
+ $this->shareUserOneTestFileWithUserTwo();
+
+ OC_User::setUserId($this->user1);
+ $this->assertTrue(
+ OCP\Share::setExpirationDate('test', 'test.txt', $this->dateInFuture),
+ 'Failed asserting that user 1 successfully set an expiration date for the test.txt share.'
+ );
+
+ OC_User::setUserId($this->user2);
+ $this->assertEquals(
+ array('test.txt'),
+ OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_SOURCE),
+ 'Failed asserting that user 2 still has access to test.txt after expiration date has been set.'
+ );
+ }
+
+ protected function shareUserOneTestFileWithGroupOne() {
+ OC_User::setUserId($this->user1);
+ $this->assertTrue(
+ OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_GROUP, $this->group1, OCP\PERMISSION_READ),
+ 'Failed asserting that user 1 successfully shared text.txt with group 1.'
+ );
+ $this->assertEquals(
+ array('test.txt'),
+ OCP\Share::getItemShared('test', 'test.txt', Test_Share_Backend::FORMAT_SOURCE),
+ 'Failed asserting that test.txt is a shared file of user 1.'
+ );
+
+ OC_User::setUserId($this->user2);
+ $this->assertEquals(
+ array('test.txt'),
+ OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_SOURCE),
+ 'Failed asserting that user 2 has access to test.txt after initial sharing.'
+ );
+
+ OC_User::setUserId($this->user3);
+ $this->assertEquals(
+ array('test.txt'),
+ OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_SOURCE),
+ 'Failed asserting that user 3 has access to test.txt after initial sharing.'
+ );
+ }
+
public function testShareWithGroup() {
// Invalid shares
$message = 'Sharing test.txt failed, because the group foobar does not exist';
@@ -285,12 +370,7 @@ class Test_Share extends PHPUnit_Framework_TestCase {
OC_Appconfig::setValue('core', 'shareapi_share_policy', $policy);
// Valid share
- $this->assertTrue(OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_GROUP, $this->group1, OCP\PERMISSION_READ));
- $this->assertEquals(array('test.txt'), OCP\Share::getItemShared('test', 'test.txt', Test_Share_Backend::FORMAT_SOURCE));
- OC_User::setUserId($this->user2);
- $this->assertEquals(array('test.txt'), OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_SOURCE));
- OC_User::setUserId($this->user3);
- $this->assertEquals(array('test.txt'), OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_SOURCE));
+ $this->shareUserOneTestFileWithGroupOne();
// Attempt to share again
OC_User::setUserId($this->user1);
@@ -410,4 +490,97 @@ class Test_Share extends PHPUnit_Framework_TestCase {
$this->assertEquals(array(), OCP\Share::getItemsShared('test'));
}
+ public function testShareWithGroupExpirationExpired() {
+ $this->shareUserOneTestFileWithGroupOne();
+
+ OC_User::setUserId($this->user1);
+ $this->assertTrue(
+ OCP\Share::setExpirationDate('test', 'test.txt', $this->dateInPast),
+ 'Failed asserting that user 1 successfully set an expiration date for the test.txt share.'
+ );
+
+ OC_User::setUserId($this->user2);
+ $this->assertFalse(
+ OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_SOURCE),
+ 'Failed asserting that user 2 no longer has access to test.txt after expiration.'
+ );
+
+ OC_User::setUserId($this->user3);
+ $this->assertFalse(
+ OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_SOURCE),
+ 'Failed asserting that user 3 no longer has access to test.txt after expiration.'
+ );
+ }
+
+ public function testShareWithGroupExpirationValid() {
+ $this->shareUserOneTestFileWithGroupOne();
+
+ OC_User::setUserId($this->user1);
+ $this->assertTrue(
+ OCP\Share::setExpirationDate('test', 'test.txt', $this->dateInFuture),
+ 'Failed asserting that user 1 successfully set an expiration date for the test.txt share.'
+ );
+
+ OC_User::setUserId($this->user2);
+ $this->assertEquals(
+ array('test.txt'),
+ OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_SOURCE),
+ 'Failed asserting that user 2 still has access to test.txt after expiration date has been set.'
+ );
+
+ OC_User::setUserId($this->user3);
+ $this->assertEquals(
+ array('test.txt'),
+ OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_SOURCE),
+ '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.'
+ );
+ }
}
diff --git a/tests/lib/tags.php b/tests/lib/tags.php
new file mode 100644
index 0000000000000000000000000000000000000000..97e3734cfda6826c0a9b93bed95540ebf4ad1379
--- /dev/null
+++ b/tests/lib/tags.php
@@ -0,0 +1,166 @@
+<?php
+/**
+* ownCloud
+*
+* @author Thomas Tanghus
+* @copyright 2012-13 Thomas Tanghus (thomas@tanghus.net)
+*
+* 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/>.
+*
+*/
+
+class Test_Tags extends PHPUnit_Framework_TestCase {
+
+ protected $objectType;
+ protected $user;
+ protected $backupGlobals = FALSE;
+
+ public function setUp() {
+
+ OC_User::clearBackends();
+ OC_User::useBackend('dummy');
+ $this->user = uniqid('user_');
+ $this->objectType = uniqid('type_');
+ OC_User::createUser($this->user, 'pass');
+ OC_User::setUserId($this->user);
+ $this->tagMgr = new OC\TagManager($this->user);
+
+ }
+
+ public function tearDown() {
+ //$query = OC_DB::prepare('DELETE FROM `*PREFIX*vcategories` WHERE `item_type` = ?');
+ //$query->execute(array('test'));
+ }
+
+ public function testInstantiateWithDefaults() {
+ $defaultTags = array('Friends', 'Family', 'Work', 'Other');
+
+ $tagger = $this->tagMgr->load($this->objectType, $defaultTags);
+
+ $this->assertEquals(4, count($tagger->getTags()));
+ }
+
+ public function testAddTags() {
+ $tags = array('Friends', 'Family', 'Work', 'Other');
+
+ $tagger = $this->tagMgr->load($this->objectType);
+
+ foreach($tags as $tag) {
+ $result = $tagger->add($tag);
+ $this->assertGreaterThan(0, $result, 'add() returned an ID <= 0');
+ $this->assertTrue((bool)$result);
+ }
+
+ $this->assertFalse($tagger->add('Family'));
+ $this->assertFalse($tagger->add('fAMILY'));
+
+ $this->assertCount(4, $tagger->getTags(), 'Wrong number of added tags');
+ }
+
+ public function testAddMultiple() {
+ $tags = array('Friends', 'Family', 'Work', 'Other');
+
+ $tagger = $this->tagMgr->load($this->objectType);
+
+ foreach($tags as $tag) {
+ $this->assertFalse($tagger->hasTag($tag));
+ }
+
+ $result = $tagger->addMultiple($tags);
+ $this->assertTrue((bool)$result);
+
+ foreach($tags as $tag) {
+ $this->assertTrue($tagger->hasTag($tag));
+ }
+
+ $this->assertCount(4, $tagger->getTags(), 'Not all tags added');
+ }
+
+ public function testIsEmpty() {
+ $tagger = $this->tagMgr->load($this->objectType);
+
+ $this->assertEquals(0, count($tagger->getTags()));
+ $this->assertTrue($tagger->isEmpty());
+
+ $result = $tagger->add('Tag');
+ $this->assertGreaterThan(0, $result, 'add() returned an ID <= 0');
+ $this->assertNotEquals(false, $result, 'add() returned false');
+ $this->assertFalse($tagger->isEmpty());
+ }
+
+ public function testdeleteTags() {
+ $defaultTags = array('Friends', 'Family', 'Work', 'Other');
+ $tagger = $this->tagMgr->load($this->objectType, $defaultTags);
+
+ $this->assertEquals(4, count($tagger->getTags()));
+
+ $tagger->delete('family');
+ $this->assertEquals(3, count($tagger->getTags()));
+
+ $tagger->delete(array('Friends', 'Work', 'Other'));
+ $this->assertEquals(0, count($tagger->getTags()));
+
+ }
+
+ public function testRenameTag() {
+ $defaultTags = array('Friends', 'Family', 'Wrok', 'Other');
+ $tagger = $this->tagMgr->load($this->objectType, $defaultTags);
+
+ $this->assertTrue($tagger->rename('Wrok', 'Work'));
+ $this->assertTrue($tagger->hasTag('Work'));
+ $this->assertFalse($tagger->hastag('Wrok'));
+ $this->assertFalse($tagger->rename('Wrok', 'Work'));
+
+ }
+
+ public function testTagAs() {
+ $objids = array(1, 2, 3, 4, 5, 6, 7, 8, 9);
+
+ $tagger = $this->tagMgr->load($this->objectType);
+
+ foreach($objids as $id) {
+ $tagger->tagAs($id, 'Family');
+ }
+
+ $this->assertEquals(1, count($tagger->getTags()));
+ $this->assertEquals(9, count($tagger->getIdsForTag('Family')));
+ }
+
+ /**
+ * @depends testTagAs
+ */
+ public function testUnTag() {
+ $objIds = array(1, 2, 3, 4, 5, 6, 7, 8, 9);
+
+ // Is this "legal"?
+ $this->testTagAs();
+ $tagger = $this->tagMgr->load($this->objectType);
+
+ foreach($objIds as $id) {
+ $this->assertTrue(in_array($id, $tagger->getIdsForTag('Family')));
+ $tagger->unTag($id, 'Family');
+ $this->assertFalse(in_array($id, $tagger->getIdsForTag('Family')));
+ }
+
+ $this->assertEquals(1, count($tagger->getTags()));
+ $this->assertEquals(0, count($tagger->getIdsForTag('Family')));
+ }
+
+ public function testFavorite() {
+ $tagger = $this->tagMgr->load($this->objectType);
+ $this->assertTrue($tagger->addToFavorites(1));
+ $this->assertTrue($tagger->removeFromFavorites(1));
+ }
+
+}
diff --git a/tests/lib/user.php b/tests/lib/user.php
new file mode 100644
index 0000000000000000000000000000000000000000..66c7f3f0d747a93c1b1437f14a9d5309470473eb
--- /dev/null
+++ b/tests/lib/user.php
@@ -0,0 +1,43 @@
+<?php
+
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace Test;
+
+use OC\Hooks\PublicEmitter;
+
+class User extends \PHPUnit_Framework_TestCase {
+
+ public function testCheckPassword() {
+ /**
+ * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend
+ */
+ $backend = $this->getMock('\OC_User_Dummy');
+ $backend->expects($this->once())
+ ->method('checkPassword')
+ ->with($this->equalTo('foo'), $this->equalTo('bar'))
+ ->will($this->returnValue('foo'));
+
+ $backend->expects($this->any())
+ ->method('implementsActions')
+ ->will($this->returnCallback(function ($actions) {
+ if ($actions === \OC_USER_BACKEND_CHECK_PASSWORD) {
+ return true;
+ } else {
+ return false;
+ }
+ }));
+
+ $manager = \OC_User::getManager();
+ $manager->registerBackend($backend);
+
+ $uid = \OC_User::checkPassword('foo', 'bar');
+ $this->assertEquals($uid, 'foo');
+ }
+
+}
\ No newline at end of file
diff --git a/tests/lib/user/manager.php b/tests/lib/user/manager.php
index bc49f6db4b281e3c58b2d9051c923c06a04f1d30..00901dd4115c7e83aa4af3859b71957fbfa73dfb 100644
--- a/tests/lib/user/manager.php
+++ b/tests/lib/user/manager.php
@@ -98,6 +98,51 @@ class Manager extends \PHPUnit_Framework_TestCase {
$this->assertTrue($manager->userExists('foo'));
}
+ public function testCheckPassword() {
+ /**
+ * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend
+ */
+ $backend = $this->getMock('\OC_User_Dummy');
+ $backend->expects($this->once())
+ ->method('checkPassword')
+ ->with($this->equalTo('foo'), $this->equalTo('bar'))
+ ->will($this->returnValue(true));
+
+ $backend->expects($this->any())
+ ->method('implementsActions')
+ ->will($this->returnCallback(function ($actions) {
+ if ($actions === \OC_USER_BACKEND_CHECK_PASSWORD) {
+ return true;
+ } else {
+ return false;
+ }
+ }));
+
+ $manager = new \OC\User\Manager();
+ $manager->registerBackend($backend);
+
+ $user = $manager->checkPassword('foo', 'bar');
+ $this->assertTrue($user instanceof \OC\User\User);
+ }
+
+ public function testCheckPasswordNotSupported() {
+ /**
+ * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend
+ */
+ $backend = $this->getMock('\OC_User_Dummy');
+ $backend->expects($this->never())
+ ->method('checkPassword');
+
+ $backend->expects($this->any())
+ ->method('implementsActions')
+ ->will($this->returnValue(false));
+
+ $manager = new \OC\User\Manager();
+ $manager->registerBackend($backend);
+
+ $this->assertFalse($manager->checkPassword('foo', 'bar'));
+ }
+
public function testGetOneBackendExists() {
/**
* @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend
diff --git a/tests/lib/user/session.php b/tests/lib/user/session.php
index 274e9e2831eea8bce10721625458fb5d9f85a442..e457a7bda30218463cec7fb1bfdf56ed0e5e8e97 100644
--- a/tests/lib/user/session.php
+++ b/tests/lib/user/session.php
@@ -61,10 +61,6 @@ class Session extends \PHPUnit_Framework_TestCase {
$backend = $this->getMock('OC_User_Dummy');
$user = $this->getMock('\OC\User\User', array(), array('foo', $backend));
- $user->expects($this->once())
- ->method('checkPassword')
- ->with('bar')
- ->will($this->returnValue(true));
$user->expects($this->once())
->method('isEnabled')
->will($this->returnValue(true));
@@ -73,8 +69,8 @@ class Session extends \PHPUnit_Framework_TestCase {
->will($this->returnValue('foo'));
$manager->expects($this->once())
- ->method('get')
- ->with('foo')
+ ->method('checkPassword')
+ ->with('foo', 'bar')
->will($this->returnValue($user));
$userSession = new \OC\User\Session($manager, $session);
@@ -92,17 +88,13 @@ class Session extends \PHPUnit_Framework_TestCase {
$backend = $this->getMock('OC_User_Dummy');
$user = $this->getMock('\OC\User\User', array(), array('foo', $backend));
- $user->expects($this->once())
- ->method('checkPassword')
- ->with('bar')
- ->will($this->returnValue(true));
$user->expects($this->once())
->method('isEnabled')
->will($this->returnValue(false));
$manager->expects($this->once())
- ->method('get')
- ->with('foo')
+ ->method('checkPassword')
+ ->with('foo', 'bar')
->will($this->returnValue($user));
$userSession = new \OC\User\Session($manager, $session);
@@ -119,17 +111,13 @@ class Session extends \PHPUnit_Framework_TestCase {
$backend = $this->getMock('OC_User_Dummy');
$user = $this->getMock('\OC\User\User', array(), array('foo', $backend));
- $user->expects($this->once())
- ->method('checkPassword')
- ->with('bar')
- ->will($this->returnValue(false));
$user->expects($this->never())
->method('isEnabled');
$manager->expects($this->once())
- ->method('get')
- ->with('foo')
- ->will($this->returnValue($user));
+ ->method('checkPassword')
+ ->with('foo', 'bar')
+ ->will($this->returnValue(false));
$userSession = new \OC\User\Session($manager, $session);
$userSession->login('foo', 'bar');
@@ -145,9 +133,9 @@ class Session extends \PHPUnit_Framework_TestCase {
$backend = $this->getMock('OC_User_Dummy');
$manager->expects($this->once())
- ->method('get')
- ->with('foo')
- ->will($this->returnValue(null));
+ ->method('checkPassword')
+ ->with('foo', 'bar')
+ ->will($this->returnValue(false));
$userSession = new \OC\User\Session($manager, $session);
$userSession->login('foo', 'bar');
diff --git a/tests/lib/user/user.php b/tests/lib/user/user.php
index b0d170cbfc56db3016e1859084d1dd8f6c64cdae..de5ccbf38c101912de766d1c0eeb67a20cba27fc 100644
--- a/tests/lib/user/user.php
+++ b/tests/lib/user/user.php
@@ -100,46 +100,6 @@ class User extends \PHPUnit_Framework_TestCase {
$this->assertTrue($user->delete());
}
- public function testCheckPassword() {
- /**
- * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend
- */
- $backend = $this->getMock('\OC_User_Dummy');
- $backend->expects($this->once())
- ->method('checkPassword')
- ->with($this->equalTo('foo'), $this->equalTo('bar'))
- ->will($this->returnValue(true));
-
- $backend->expects($this->any())
- ->method('implementsActions')
- ->will($this->returnCallback(function ($actions) {
- if ($actions === \OC_USER_BACKEND_CHECK_PASSWORD) {
- return true;
- } else {
- return false;
- }
- }));
-
- $user = new \OC\User\User('foo', $backend);
- $this->assertTrue($user->checkPassword('bar'));
- }
-
- public function testCheckPasswordNotSupported() {
- /**
- * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend
- */
- $backend = $this->getMock('\OC_User_Dummy');
- $backend->expects($this->never())
- ->method('checkPassword');
-
- $backend->expects($this->any())
- ->method('implementsActions')
- ->will($this->returnValue(false));
-
- $user = new \OC\User\User('foo', $backend);
- $this->assertFalse($user->checkPassword('bar'));
- }
-
public function testGetHome() {
/**
* @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend
diff --git a/tests/lib/util.php b/tests/lib/util.php
index 13aa49c8c6f606164a657e08ad1664e4c588bd82..d607a3e77256ec02ae75beb29cc761b6762e9bad 100644
--- a/tests/lib/util.php
+++ b/tests/lib/util.php
@@ -71,8 +71,8 @@ class Test_Util extends PHPUnit_Framework_TestCase {
$this->assertTrue(\OC_Util::isInternetConnectionEnabled());
}
- function testGenerate_random_bytes() {
- $result = strlen(OC_Util::generate_random_bytes(59));
+ function testGenerateRandomBytes() {
+ $result = strlen(OC_Util::generateRandomBytes(59));
$this->assertEquals(59, $result);
}
diff --git a/tests/lib/vcategories.php b/tests/lib/vcategories.php
deleted file mode 100644
index df5f600f20da3a479daacea277dbb8fe953498f9..0000000000000000000000000000000000000000
--- a/tests/lib/vcategories.php
+++ /dev/null
@@ -1,128 +0,0 @@
-<?php
-/**
-* ownCloud
-*
-* @author Thomas Tanghus
-* @copyright 2012 Thomas Tanghus (thomas@tanghus.net)
-*
-* 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/>.
-*
-*/
-
-//require_once("../lib/template.php");
-
-class Test_VCategories extends PHPUnit_Framework_TestCase {
-
- protected $objectType;
- protected $user;
- protected $backupGlobals = FALSE;
-
- public function setUp() {
-
- OC_User::clearBackends();
- OC_User::useBackend('dummy');
- $this->user = uniqid('user_');
- $this->objectType = uniqid('type_');
- OC_User::createUser($this->user, 'pass');
- OC_User::setUserId($this->user);
-
- }
-
- public function tearDown() {
- //$query = OC_DB::prepare('DELETE FROM `*PREFIX*vcategories` WHERE `item_type` = ?');
- //$query->execute(array('test'));
- }
-
- public function testInstantiateWithDefaults() {
- $defcategories = array('Friends', 'Family', 'Work', 'Other');
-
- $catmgr = new OC_VCategories($this->objectType, $this->user, $defcategories);
-
- $this->assertEquals(4, count($catmgr->categories()));
- }
-
- public function testAddCategories() {
- $categories = array('Friends', 'Family', 'Work', 'Other');
-
- $catmgr = new OC_VCategories($this->objectType, $this->user);
-
- foreach($categories as $category) {
- $result = $catmgr->add($category);
- $this->assertTrue((bool)$result);
- }
-
- $this->assertFalse($catmgr->add('Family'));
- $this->assertFalse($catmgr->add('fAMILY'));
-
- $this->assertEquals(4, count($catmgr->categories()));
- }
-
- public function testdeleteCategories() {
- $defcategories = array('Friends', 'Family', 'Work', 'Other');
- $catmgr = new OC_VCategories($this->objectType, $this->user, $defcategories);
- $this->assertEquals(4, count($catmgr->categories()));
-
- $catmgr->delete('family');
- $this->assertEquals(3, count($catmgr->categories()));
-
- $catmgr->delete(array('Friends', 'Work', 'Other'));
- $this->assertEquals(0, count($catmgr->categories()));
-
- }
-
- public function testrenameCategory() {
- $defcategories = array('Friends', 'Family', 'Wrok', 'Other');
- $catmgr = new OC_VCategories($this->objectType, $this->user, $defcategories);
-
- $this->assertTrue($catmgr->rename('Wrok', 'Work'));
- $this->assertTrue($catmgr->hasCategory('Work'));
- $this->assertFalse($catmgr->hasCategory('Wrok'));
- $this->assertFalse($catmgr->rename('Wrok', 'Work'));
-
- }
-
- public function testAddToCategory() {
- $objids = array(1, 2, 3, 4, 5, 6, 7, 8, 9);
-
- $catmgr = new OC_VCategories($this->objectType, $this->user);
-
- foreach($objids as $id) {
- $catmgr->addToCategory($id, 'Family');
- }
-
- $this->assertEquals(1, count($catmgr->categories()));
- $this->assertEquals(9, count($catmgr->idsForCategory('Family')));
- }
-
- /**
- * @depends testAddToCategory
- */
- public function testRemoveFromCategory() {
- $objids = array(1, 2, 3, 4, 5, 6, 7, 8, 9);
-
- // Is this "legal"?
- $this->testAddToCategory();
- $catmgr = new OC_VCategories($this->objectType, $this->user);
-
- foreach($objids as $id) {
- $this->assertTrue(in_array($id, $catmgr->idsForCategory('Family')));
- $catmgr->removeFromCategory($id, 'Family');
- $this->assertFalse(in_array($id, $catmgr->idsForCategory('Family')));
- }
-
- $this->assertEquals(1, count($catmgr->categories()));
- $this->assertEquals(0, count($catmgr->idsForCategory('Family')));
- }
-
-}
diff --git a/tests/phpunit.xml.dist b/tests/phpunit.xml.dist
index 25dfc64cfeb748a9f5f8fbff820c1c8be86ba826..71a4ff2762c1737778cfa1d4b30a3eb15b19086f 100644
--- a/tests/phpunit.xml.dist
+++ b/tests/phpunit.xml.dist
@@ -11,7 +11,21 @@
<directory suffix=".php">..</directory>
<exclude>
<directory suffix=".php">../3rdparty</directory>
+ <directory suffix=".php">../apps/files/l10n</directory>
+ <directory suffix=".php">../apps/files_external/l10n</directory>
+ <directory suffix=".php">../apps/files_external/3rdparty</directory>
+ <directory suffix=".php">../apps/files_versions/l10n</directory>
+ <directory suffix=".php">../apps/files_encryption/l10n</directory>
+ <directory suffix=".php">../apps/files_encryption/3rdparty</directory>
+ <directory suffix=".php">../apps/files_sharing/l10n</directory>
+ <directory suffix=".php">../apps/files_trashbin/l10n</directory>
+ <directory suffix=".php">../apps/user_ldap/l10n</directory>
+ <directory suffix=".php">../apps/user_webdavauth/l10n</directory>
<directory suffix=".php">../lib/MDB2</directory>
+ <directory suffix=".php">../lib/l10n</directory>
+ <directory suffix=".php">../core/l10n</directory>
+ <directory suffix=".php">../settings/l10n</directory>
+ <directory suffix=".php">../tests</directory>
</exclude>
</whitelist>
</filter>